diff --git a/.danger.php b/.danger.php
new file mode 100644
index 00000000000..94a01534447
--- /dev/null
+++ b/.danger.php
@@ -0,0 +1,72 @@
+<?php declare(strict_types=1);
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+use Danger\Config;
+use Danger\Context;
+use Danger\Platform\Github\Github;
+use Danger\Platform\Gitlab\Gitlab;
+use Danger\Rule\CommitRegex;
+use Danger\Rule\Condition;
+use Danger\Rule\DisallowRepeatedCommits;
+use Danger\Struct\File;
+
+return (new Config())
+    ->useThreadOn(Config::REPORT_LEVEL_WARNING)
+    ->useRule(new DisallowRepeatedCommits())
+    ->useRule(function (Context $context): void {
+        $files = $context->platform->pullRequest->getFiles();
+
+        if ($files->matches('UPGRADE-*.md')->count() === 0) {
+            $context->warning('The Pull Request doesn\'t contain any changes to the Upgrade file');
+        }
+    })
+    ->useRule(new CommitRegex(
+                '/(?m)(?mi)^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test){1}(\([\w\-\.]+\))?(!)?: ([\w ])+([\s\S]*)/m',
+                'The commit title `###MESSAGE###` does not match our requirements. Please follow: www.conventionalcommits.org'
+            )
+    )
+    ->useRule(function (Context $context): void {
+        $files = $context->platform->pullRequest->getFiles();
+
+        $invalidFiles = [];
+
+        foreach ($files as $file) {
+            if ($file->status !== File::STATUS_REMOVED && preg_match('/^([-\.\w\/]+)$/', $file->name) === 0) {
+                $invalidFiles[] = $file->name;
+            }
+        }
+
+        if (count($invalidFiles) > 0) {
+            $context->failure(
+                'The following filenames contain invalid special characters, please use only alphanumeric characters, dots, dashes and underscores: <br/>'
+                . print_r($invalidFiles, true)
+            );
+        }
+    })
+    ->after(function (Context $context): void {
+        if ($context->platform instanceof Github && $context->hasFailures()) {
+            $context->platform->addLabels('Incomplete');
+        }
+    })
+;
diff --git a/.env.dist b/.env.dist
index c4354a094b3..47a394e7d80 100644
--- a/.env.dist
+++ b/.env.dist
@@ -5,4 +5,6 @@ DB_NAME=shopware
 DB_PORT=3306
 SW_HOST=localhost
 SW_BASE_PATH=
+SELENIUM_HOST=selenium
 ELASTICSEARCH_HOST=elasticsearch
+SMTP_HOST=smtp
diff --git a/.envrc b/.envrc
new file mode 100644
index 00000000000..5dae8de001a
--- /dev/null
+++ b/.envrc
@@ -0,0 +1,4 @@
+watch_file devenv.nix 
+watch_file devenv.yaml 
+watch_file devenv.lock
+eval "$(devenv print-dev-env)"
\ No newline at end of file
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 078e69fd989..2c1cc28a207 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -19,3 +19,10 @@ e04304b7987986a9d7e35750fba62263978b8405
 
 # SW-20660 - use typecast instead of intval, strval, doubleval and floatval
 e1d0b23fba81d3c80e80f2881ab38bf9d7f6397a
+
+# New license header
+3a73921085d70b87f9a71ff46c4c9035beec8ca0
+633e5ec44fabdbbbf73580a0ec857a4fb14030f9
+
+# Update PHP-CS-Fixer
+cbbc9a6e6896903f7bd6d26730c05256f3d3563b
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000000..a9b92dca4fa
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,25 @@
+**.yaml export-ignore
+**.yaml export-ignore
+**.md export-ignore
+**.gitkeep export-ignore
+/config.php export-ignore
+.gitlab-ci.yml export-ignore
+.github/ export-ignore
+.gitignore export-ignore
+.git-blame-ignore-revs export-ignore
+.editorconfig export-ignore
+.php-cs-fixer.php export-ignore
+.envrc export-ignore
+.phpstan.neon export-ignore
+.phpstan-baseline.neon export-ignore
+build/ export-ignore
+tests/ export-ignore
+dev-ops/ export-ignore
+.git export-ignore
+devenv* export-ignore
+snippets/backend/plugins/ export-ignore
+.env.dist export-ignore
+Makefile export-ignore
+.make* export-ignore
+vendor-bin/ export-ignore
+.danger.php export-ignore
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 00000000000..92f5265572d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,49 @@
+name: Bug report 🐛
+description: Existing feature does not behave as expected.
+labels: [Bug]
+body:
+    - type: markdown
+      attributes:
+          value: |
+              Thanks for taking the time to fill out this bug report!
+    - type: textarea
+      id: description
+      attributes:
+        label: "Description"
+        description: Please enter an explicit description of your issue
+        placeholder: Short and explicit description of your incident...
+      validations:
+        required: true
+    - type: input
+      id: php-version
+      attributes:
+          label: PHP Version
+      validations:
+          required: true
+    - type: input
+      id: shopware-version
+      attributes:
+          label: Shopware Version
+      validations:
+          required: true
+    - type: textarea
+      id: steps-to-reproduce
+      attributes:
+          label: How to reproduce
+          description: Tell us how the bug can be reproduced
+      validations:
+          required: true
+    - type: textarea
+      id: expected-behaviour
+      attributes:
+          label: Expected behaviour
+          description: What did you expect to happen?
+      validations:
+          required: true
+    - type: textarea
+      id: actual-behaviour
+      attributes:
+          label: Actual behaviour
+          description: Please describe the issue
+      validations:
+          required: true
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000000..3ba13e0cec6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1 @@
+blank_issues_enabled: false
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 00000000000..c67fc99c4b6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,35 @@
+name: Feature request 🚀
+description: Suggest an idea for this project
+labels: [Feature]
+body:
+    - type: input
+      id: reference_issues
+      attributes:
+          label: "Reference Issues"
+          description: Common issues
+          placeholder: "#Issues IDs"
+      validations:
+          required: false
+    - type: textarea
+      id: summary
+      attributes:
+          label: "Summary"
+          description: Provide a brief explanation of the feature
+          placeholder: Describe in a few lines your feature request
+      validations:
+          required: true
+    - type: textarea
+      id: basic_example
+      attributes:
+          label: "Basic Example"
+          description: Indicate here some basic examples of your feature.
+          placeholder: A few specific words about your feature request.
+      validations:
+          required: false
+    - type: textarea
+      id: additional_context
+      attributes:
+          label: "Additional context"
+          description: Add any other context or screenshots about the feature request here.
+      validations:
+          required: false
diff --git a/.github/check-mysql.sh b/.github/check-mysql.sh
new file mode 100755
index 00000000000..d1bd25db679
--- /dev/null
+++ b/.github/check-mysql.sh
@@ -0,0 +1,4 @@
+while ! mysqladmin ping -u shopware -pshopware; do
+    echo Check mysql
+	sleep 5
+done
diff --git a/.github/deleted_files.php b/.github/deleted_files.php
new file mode 100755
index 00000000000..0865a28ce82
--- /dev/null
+++ b/.github/deleted_files.php
@@ -0,0 +1,102 @@
+#!/usr/bin/env php
+<?php
+$longOpts  = [
+    'input:',
+];
+$parsedArgs = getopt('', $longOpts);
+
+if (!array_key_exists('input', $parsedArgs)) {
+    exit('"output" argument is required');
+}
+
+$basePath = realpath($parsedArgs['input']);
+
+if (!$basePath) {
+    throw new \Exception('Can not find path');
+}
+
+define('BASE_DIR', $basePath);
+
+$output = '';
+chdir(BASE_DIR);
+
+exec('git log --pretty=format: --name-only | LC_ALL=C sort -u', $output);
+
+// Whitelisted paths are never deleted
+$whitelist = array(
+    // plugins that are provided by a dummy now
+
+    'engine/Shopware/Plugins/Default/Backend/SwagBepado',
+    'engine/Shopware/Plugins/Default/Core/CouchCommerce/',
+    'engine/Shopware/Plugins/Default/Backend/HeidelActions/',
+    'engine/Shopware/Plugins/Default/Frontend/MoptPaymentPayone',
+    'engine/Shopware/Plugins/Default/Frontend/SwagDhl',
+    'engine/Shopware/Plugins/Default/Frontend/SwagPaymentKlarna',
+    'engine/Shopware/Plugins/Default/Frontend/HeidelPayment/',
+    'engine/Shopware/Plugins/Default/Frontend/PaymentSofort/',
+    'engine/Shopware/Plugins/Default/Frontend/SofortPayment/',
+    'engine/Shopware/Plugins/Default/Frontend/PaymentSkrill/',
+    'engine/Shopware/Plugins/Default/Frontend/PigmbhRatePAYPayment/',
+    'engine/Shopware/Plugins/Default/Frontend/PigmbhKlarnaPayment/',
+    'engine/Shopware/Plugins/Default/Frontend/PiPaymorrowPayment/',
+    'engine/Shopware/Plugins/Default/Frontend/SwagPaymentBillsafe/',
+    'engine/Shopware/Plugins/Default/Frontend/SwagTrustedShopsExcellence/',
+    'engine/Shopware/Plugins/Default/Frontend/SwagPaymentPaypal/',
+    'engine/Shopware/Plugins/Default/Frontend/BuiswPaymentPayone',
+    'engine/Shopware/Controllers/Frontend/CSRFToken.php',
+    'engine/Shopware/Bundle/SearchBundle/Condition/isAvailableCondition.php',
+
+    # Fix for case insensitive file systems
+    'engine/Shopware/Components/DependencyInjection/controllers',
+    'engine/Library/Zend/Validate/Barcode/Intelligentmail.php',
+    'engine/Shopware/Bundle/SitemapBundle/Controllers/Frontend/SitemapIndexXml.php',
+
+    'engine/Shopware/Plugins/Community',
+    'engine/Shopware/Plugins/Local',
+
+    'update',
+
+    'config_',
+    '_sql/migrations',
+
+    // The .htacces must not be deleted. Changes to this file are handled by \Shopware\Recovery\Update\UpdateHtaccess.
+    '.htaccess',
+);
+
+$deleteDirs = [];
+foreach ($output as $line){
+    $line = trim($line);
+    if (empty($line)) {
+        continue;
+    }
+
+    foreach ($whitelist as $whitelistElem) {
+        if (strpos($line, $whitelistElem) === 0) {
+            continue 2;
+        }
+    }
+
+    if (file_exists(BASE_DIR . '/' . $line)) {
+        continue;
+    }
+
+    $deleteDirs[getDeleteDir($line)] = true;
+}
+
+/**
+ * @param string $filePath
+ *
+ * @return string
+ */
+function getDeleteDir($filePath) {
+    $checkdir = BASE_DIR . '/' . dirname($filePath);
+    if (file_exists($checkdir)) {
+        return trim($filePath);
+    } else {
+        return getDeleteDir(dirname($filePath));
+    }
+}
+
+$deleteDirs = array_keys($deleteDirs);
+
+echo implode( "\n", $deleteDirs);
diff --git a/.github/deleted_files_vendor.sh b/.github/deleted_files_vendor.sh
new file mode 100755
index 00000000000..807370701c1
--- /dev/null
+++ b/.github/deleted_files_vendor.sh
@@ -0,0 +1,77 @@
+#!/usr/bin/env bash
+
+function main() {
+while getopts "ho:n:d:" OPTION
+do
+case $OPTION in
+h)
+usage
+exit 1
+;;
+o)
+original_dir=`realpath $OPTARG`/
+;;
+n)
+new_dir=`realpath $OPTARG`/
+;;
+?)
+usage
+exit
+;;
+*)
+usage
+exit
+;;
+esac
+done
+
+if [[ -z "${original_dir:-}" ]]; then
+echo "The original directory not set (-o)."
+exit 1;
+fi
+
+if [[ -z "${new_dir:-}" ]]; then
+echo "The new directory not set (-n)."
+exit 1;
+fi
+
+if [ ! -d "$new_dir" ]; then
+echo "The new directory $new_dir does not exist."
+exit 1;
+fi
+
+if [ ! -d "$original_dir" ]; then
+echo "The original directory ($original_dir) does not exist."
+exit 1;
+fi
+
+diff_directories_find_deleted "${original_dir}" "${new_dir}"
+}
+
+function diff_directories_find_deleted() {
+local originalDir=$1; shift
+local newDir=$1; shift
+
+local cutDir=$(dirname ${originalDir})
+
+diff -rq "${originalDir}" "${newDir}" |
+grep "^Only in ${originalDir}" |
+sed -n 's/://p'  |
+awk '{print $3"/"$4}' |
+sed "s|${cutDir}||" |
+sed "s|^/||" |
+sed "s|//|/|"
+}
+
+function usage() {
+cat << EOF
+usage: $0 options
+
+OPTIONS:
+-h      Show this message
+-o      Original directory
+-n      New directory
+EOF
+}
+
+main "$@"
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000000..420b992b62c
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,18 @@
+version: 2
+updates:
+    -   package-ecosystem: "composer"
+        directories:
+            - "/"
+            - "/recovery/common"
+        schedule:
+            interval: "weekly"
+    -   package-ecosystem: "github-actions"
+        directory: "/.github/workflows"
+        schedule:
+            interval: "weekly"
+    -   package-ecosystem: "npm"
+        directories:
+            - "/themes"
+            - "/themes/Frontend/Responsive"
+        schedule:
+            interval: "weekly"
diff --git a/.github/setup-db.sh b/.github/setup-db.sh
deleted file mode 100755
index 7d0d9d23dc1..00000000000
--- a/.github/setup-db.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-# debug
-set -x
-# verbose
-set -v
-
-STARTPARAMS=""
-DB=$1
-
-if [[ $DB == "mysql:8.0" ]]; then
-    STARTPARAMS="mysqld --default-authentication-plugin=mysql_native_password"
-fi
-
-docker run -it --mount type=tmpfs,destination=/var/lib/mysql --name=mysqld -d -e MYSQL_ALLOW_EMPTY_PASSWORD=yes -e MYSQL_USER=shopware -e MYSQL_PASSWORD=shopware -e MYSQL_DATABASE=shopware -p3306:3306 ${DB} ${STARTPARAMS}
-sleep 5
-
-mysql() {
-    docker exec mysqld mysql "${@}"
-}
-while :
-do
-    sleep 5
-    mysql -e 'select version()'
-    if [ $? = 0 ]; then
-        break
-    fi
-    echo "server logs"
-    docker logs --tail 5 mysqld
-done
-
-mysql -e 'select VERSION()'
diff --git a/.github/setup-es.sh b/.github/setup-es.sh
deleted file mode 100755
index 68d3d19f0a8..00000000000
--- a/.github/setup-es.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-ELASTICSEARCH=$1
-
-docker pull ${ELASTICSEARCH}
-docker run -it --name=elasticsearch -e "discovery.type=single-node" -d -p 9200:9200 ${ELASTICSEARCH}
diff --git a/.github/workflows/check-code.yml b/.github/workflows/check-code.yml
deleted file mode 100644
index a16259c8e14..00000000000
--- a/.github/workflows/check-code.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: Check Code
-
-on:
-  push:
-  pull_request:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    env:
-        DB_USER: shopware
-        DB_PASSWORD: shopware
-        DB_HOST: 127.0.0.1
-        DB_PORT: 3306
-        DB_NAME: shopware
-        SW_HOST: localhost
-        SW_BASE_PATH: ""
-        ELASTICSEARCH_HOST: elasticsearch
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - uses: shivammathur/setup-php@v2
-      with:
-        php-version: '7.4'
-        tools: composer, prestissimo
-        coverage: none
-
-    - name: Start MySQL
-      run: ./.github/setup-db.sh mysql:5.7
-
-    - name: Install Shopware
-      run: make init
-
-    - name: Check code
-      run: make check-code
diff --git a/.github/workflows/check-js-code.yml b/.github/workflows/check-js-code.yml
new file mode 100644
index 00000000000..5300b98939e
--- /dev/null
+++ b/.github/workflows/check-js-code.yml
@@ -0,0 +1,23 @@
+name: Check JS code and run Jest tests
+
+on:
+    workflow_call:
+
+permissions:
+    contents: read
+
+concurrency:
+    group: js-lint-and-jest-${{ github.ref }}-${{ github.workflow }}
+    cancel-in-progress: true
+
+jobs:
+    js:
+        runs-on: ubuntu-latest
+        steps:
+            -   uses: actions/checkout@v7
+
+            -   name: Check JS Code
+                run: make check-js-code
+
+            -   name: Run Jest tests
+                run: make test-jest
diff --git a/.github/workflows/check-php-code.yml b/.github/workflows/check-php-code.yml
new file mode 100644
index 00000000000..21dfbc5baf9
--- /dev/null
+++ b/.github/workflows/check-php-code.yml
@@ -0,0 +1,73 @@
+name: Check PHP code
+
+on:
+    workflow_call:
+
+permissions:
+    contents: read
+
+concurrency:
+    group: php-unit-${{ github.ref }}-${{ github.workflow }}
+    cancel-in-progress: true
+
+jobs:
+    php:
+        runs-on: ubuntu-latest
+        env:
+            SW_HOST: localhost:8000
+            DB_HOST: 127.0.0.1
+            DB_PORT: 3306
+            DB_USER: root
+            DB_PASSWORD: root
+            DB_NAME: shopware
+            MAILER_DSN: smtp://localhost:1025
+            SW_BASE_PATH: ''
+            SELENIUM_HOST: localhost
+            SMTP_HOST: localhost
+        services:
+            database:
+                image: mysql:8.0
+                env:
+                    MYSQL_ROOT_PASSWORD: root
+                    MYSQL_DATABASE: shopware
+                options: '--mount="type=tmpfs,destination=/var/lib/mysql" --health-cmd="mysqladmin ping -h 127.0.0.1" --health-interval=5s --health-timeout=2s --health-retries=3'
+                ports:
+                    - "3306:3306"
+        steps:
+            -   uses: actions/checkout@v7
+
+            -   name: Setup PHP
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: '7.4'
+
+            -   name: Cache CS-Fixer
+                uses: actions/cache@v5
+                with:
+                    path: var/cache/php-cs-fixer
+                    key: ${{ runner.os }}-php-cs-fixer-${{ hashFiles('vendor-bin/cs-fixer/composer.lock') }}
+                    restore-keys: |
+                        ${{ runner.os }}-php-cs-fixer-
+
+            -   name: Cache PHPStan
+                uses: actions/cache@v5
+                with:
+                    path: var/cache/phpstan
+                    key: ${{ runner.os }}-phpstan-${{ hashFiles('composer.lock') }}
+                    restore-keys: |
+                        ${{ runner.os }}-phpstan-
+
+            -   name: Get Composer Cache Directory
+                id: composer-cache
+                run: |
+                    echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+            -   uses: actions/cache@v5
+                with:
+                    path: ${{ steps.composer-cache.outputs.dir }}
+                    key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+                    restore-keys: |
+                        ${{ runner.os }}-composer-
+
+            -   run: make init
+            -   run: make check-code
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index dccd7cf2fd6..86ed900bc0c 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -1,36 +1,46 @@
 name: "CodeQL"
 on:
-    push:
     pull_request:
+    push:
+        branches:
+            - "5.7"
     schedule:
-        - cron: '0 6 * * 4'
+        -   cron: '0 2 * * *'
+
+permissions:
+    contents: read
+
+concurrency:
+    group: code-ql-${{ github.ref }}-${{ github.workflow }}
+    cancel-in-progress: true
 
 jobs:
     analyze:
+        permissions:
+            actions: read  # for github/codeql-action/init to get workflow details
+            contents: read  # for actions/checkout to fetch code
+            security-events: write  # for github/codeql-action/autobuild to send a status report
         name: Analyze
         runs-on: ubuntu-latest
 
         strategy:
             fail-fast: false
             matrix:
-                language: ['javascript']
+                language: [ 'javascript' ]
 
         steps:
-            - name: Checkout repository
-              uses: actions/checkout@v2
-              with:
-                  fetch-depth: 2
-
-            - run: git checkout HEAD^2
-              if: ${{ github.event_name == 'pull_request' }}
+            -   name: Checkout repository
+                uses: actions/checkout@v7
+                with:
+                    fetch-depth: 2
 
-            - name: Initialize CodeQL
-              uses: github/codeql-action/init@v1
-              with:
-                  languages: ${{ matrix.language }}
+            -   name: Initialize CodeQL
+                uses: github/codeql-action/init@v4
+                with:
+                    languages: ${{ matrix.language }}
 
-            - name: Autobuild
-              uses: github/codeql-action/autobuild@v1
+            -   name: Autobuild
+                uses: github/codeql-action/autobuild@v4
 
-            - name: Perform CodeQL Analysis
-              uses: github/codeql-action/analyze@v1
+            -   name: Perform CodeQL Analysis
+                uses: github/codeql-action/analyze@v4
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
new file mode 100644
index 00000000000..b179d1b73c6
--- /dev/null
+++ b/.github/workflows/create-release.yml
@@ -0,0 +1,141 @@
+name: Create release package
+on:
+    workflow_dispatch:
+        branches:
+            - "**"
+    push:
+        tags:
+            - "*"
+    schedule:
+        -   cron:
+                '0 1 * * *'
+
+jobs:
+    create-install-package:
+        env:
+            PACKAGE_PREFIX: install
+            PACKAGE_DELIMITER: _
+            DB_NAME: Shopware
+            DB_USER: root
+            DB_PORT: 4406
+            DB_HOST: 127.0.0.1
+            DB_PASSWORD: root
+
+        services:
+            mysql:
+                image: mysql:5.6
+                ports:
+                    - 4406:3306
+                env:
+                    MYSQL_ROOT_PASSWORD: root
+
+        runs-on: ubuntu-22.04
+        steps:
+            -   name: Create version
+                run: |
+                    TAG=${{ github.ref_name }}
+                    echo "VERSION=$(echo ${TAG#v} | cut -d "-" -f 1)" >> $GITHUB_ENV
+                    echo "VERSION_TEXT=$(echo ${TAG#v} | cut -d "-" -s -f 2)" >> $GITHUB_ENV
+                shell: bash
+
+            -   name: Clone
+                uses: actions/checkout@v7
+
+            -   name: Set current date as env variable
+                run: echo "REVISION=$(git log -1 --format="%at" | xargs -I{} date -d @{} +'%Y%m%d%H%M')" >> $GITHUB_ENV
+
+            -   name: Get Composer Cache Directory
+                id: composer-cache
+                run: |
+                    echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+            -   uses: actions/cache@v5
+                with:
+                    path: ${{ steps.composer-cache.outputs.dir }}
+                    key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+                    restore-keys: |
+                        ${{ runner.os }}-composer-
+
+            -   name: Install Composer
+                run: |
+                    composer install --no-dev
+                    composer install --no-dev -d recovery/common/
+
+            -   name: Replace placeholder
+                run: |
+                    sed -i 's=___VERSION___=${{ env.VERSION }}=g' engine/Shopware/Kernel.php
+                    sed -i 's=___VERSION_TEXT___=${{ env.VERSION_TEXT }}=g' engine/Shopware/Kernel.php
+                    sed -i 's=___REVISION___=${{ env.REVISION }}=g' engine/Shopware/Kernel.php
+                    sed -i 's=___VERSION___=${{ env.VERSION }}=g' recovery/install/data/version
+                    sed -i 's=___VERSION_TEXT___=${{ env.VERSION_TEXT }}=g' recovery/install/data/version
+                shell: bash
+
+            -   name: Create hash files
+                run: |
+                    mkdir -p engine/Shopware/Components/Check/Data
+                    find engine/Shopware themes -type f \( -iname '*.php' -o -iname '*.tpl' -o -iname '*.js' -o -iname '*.less' \) -print0 | xargs -0 md5sum | sort -k 2 -d > engine/Shopware/Components/Check/Data/Files.md5sums
+
+            -   name: Download CaRoot
+                run: |
+                    wget -O engine/Shopware/Components/HttpClient/cacert.pem https://raw.githubusercontent.com/bagder/ca-bundle/master/ca-bundle.crt
+
+            -   name: Create database
+                run: |
+                    mysql -u root -proot -P ${{ env.DB_PORT }} -h ${{ env.DB_HOST }} -e "DROP DATABASE IF EXISTS ${{ env.DB_NAME }}; CREATE DATABASE ${{ env.DB_NAME }} CHARACTER SET utf8 COLLATE utf8_unicode_ci;"
+
+            -   name: Load latest sql
+                run: |
+                    mysql -u root -proot -P ${{ env.DB_PORT }} -h ${{ env.DB_HOST }}  ${{ env.DB_NAME }} < _sql/install/latest.sql
+
+            -   name: Generate new sql
+                run: |
+                    make config
+                    php bin/console sw:migrations:migrate --mode=install
+                    php bin/console sw:snippets:to:sql ./recovery/install/data/sql/snippets.sql --force --include-default-plugins --update=false
+
+            -   name: Save sql
+                run: |
+                    mysqldump --column-statistics=0 --quick  -u root -proot -P ${{ env.DB_PORT }} -h ${{ env.DB_HOST }}  ${{ env.DB_NAME }} > recovery/install/data/sql/install.sql
+
+            -   name: Copy Config
+                run: |
+                    mv config.php.dist config.php
+                    chmod 0664 config.php
+
+            -   name: Copy htaccess
+                run: |
+                    mv .htaccess.dist .htaccess
+                    chmod 0664 .htaccess
+
+            -   name: Configure git
+                run: |
+                    git config --global user.name "shopware5"
+                    git config --global user.email "<>"
+
+            -   name: Create Zip
+                run: |
+                    rm -rf _sql
+                    git add .
+                    git commit -m "Create release package"
+                    git archive -v -o ${{ env.PACKAGE_PREFIX }}.zip HEAD
+                    zip -r ${{ env.PACKAGE_PREFIX }}.zip vendor recovery/common/vendor .htaccess config.php recovery/install/data/sql/install.sql recovery/install/data/sql/snippets.sql
+
+            -   run: echo "SHA=$(sha1sum ${{ env.PACKAGE_PREFIX }}.zip | awk '{print $1}')" >> $GITHUB_ENV
+
+            -   name: Rename Zip
+                run: |
+                    mv ${{ env.PACKAGE_PREFIX }}.zip ${{ env.PACKAGE_PREFIX }}${{ env.PACKAGE_DELIMITER }}${{ env.SHA }}.zip
+
+            -   name: Archive results
+                if: always()
+                uses: actions/upload-artifact@v7
+                with:
+                    path: ${{ env.PACKAGE_PREFIX }}${{ env.PACKAGE_DELIMITER }}${{ env.SHA }}.zip
+
+            -   name: Push to release
+                uses: xresloader/upload-to-github-release@v1.6.2
+                env:
+                    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                with:
+                    file: "*.zip"
+                    tags: true
+                    draft: true
diff --git a/.github/workflows/create-update.yml b/.github/workflows/create-update.yml
new file mode 100644
index 00000000000..2424f4b8813
--- /dev/null
+++ b/.github/workflows/create-update.yml
@@ -0,0 +1,140 @@
+name: Create update package
+
+on:
+    workflow_dispatch:
+        branches:
+            - "**"
+    push:
+        tags:
+            - "*"
+    schedule:
+        -   cron:
+                '0 1 * * *'
+
+jobs:
+    create-update-package:
+        env:
+            PACKAGE_PREFIX: 'update'
+            PACKAGE_DELIMITER: _
+            UPDATE_ASSET_DIR: './update-assets/'
+
+        runs-on: ubuntu-22.04
+
+        steps:
+            -   name: Create version
+                run: |
+                    TAG=${{ github.ref_name }}
+                    echo "VERSION=$(echo ${TAG#v} | cut -d "-" -f 1)" >> $GITHUB_ENV
+                    echo "VERSION_TEXT=$(echo ${TAG#v} | cut -d "-" -s -f 2)" >> $GITHUB_ENV
+                shell: bash
+
+            -   name: Clone
+                uses: actions/checkout@v7
+
+            -   name: Set current date as env variable
+                run: echo "REVISION=$(git log -1 --format="%at" | xargs -I{} date -d @{} +'%Y%m%d%H%M')" >> $GITHUB_ENV
+
+            -   name: Get Composer Cache Directory
+                id: composer-cache
+                run: |
+                    echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+            -   uses: actions/cache@v5
+                with:
+                    path: ${{ steps.composer-cache.outputs.dir }}
+                    key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+                    restore-keys: |
+                        ${{ runner.os }}-composer-
+
+            -   name: Install Composer
+                run: |
+                    composer install --no-dev
+                    cd recovery/common && composer install --no-dev
+
+            -   name: Download last package
+                run: |
+                    mkdir ./output
+                    LATEST_RELEASE=$(curl -L -s -H 'Accept: application/json' https://github.com/shopware5/shopware/releases/latest)
+                    LATEST_VERSION_ID=$(echo $LATEST_RELEASE | sed -e 's/.*"id":\([^",]*\).*/\1/')
+                    ASSETS=$(curl -L -s -H 'Accept: application/json' https://api.github.com/repos/shopware5/shopware/releases/$LATEST_VERSION_ID/assets)
+                    ARTIFACT_URL=$(echo $ASSETS | sed -e 's/.*"browser_download_url": "\([^",]*install[^",]*\)".*/\1/')
+                    wget -O install.zip $ARTIFACT_URL
+                    unzip install.zip -d ./output/release
+
+            -   name: Replace placeholder
+                run: |
+                    sed -i 's=___VERSION___=${{ env.VERSION }}=g' engine/Shopware/Kernel.php
+                    sed -i 's=___VERSION_TEXT___=${{ env.VERSION_TEXT }}=g' engine/Shopware/Kernel.php
+                    sed -i 's=___REVISION___=${{ env.REVISION }}=g' engine/Shopware/Kernel.php
+                    sed -i 's=___VERSION___=${{ env.VERSION }}=g' recovery/install/data/version
+                    sed -i 's=___VERSION_TEXT___=${{ env.VERSION_TEXT }}=g' recovery/install/data/version
+                shell: bash
+
+            -   name: Create update asset dir
+                run: |
+                    mkdir ${{ env.UPDATE_ASSET_DIR }}
+
+            -   name: Create version file
+                run: |
+                    echo "${{ github.ref_name }} ${{ env.REVISION }}" > ${{ env.UPDATE_ASSET_DIR }}version
+
+            -   name: Generate cleanup list
+                run: php ./.github/deleted_files.php --input=$(pwd) > ${{ env.UPDATE_ASSET_DIR }}cleanup.txt
+
+            -   run: cat ${{ env.UPDATE_ASSET_DIR }}cleanup.txt
+
+            -   name: Generate cleanup list
+                run: ./.github/deleted_files_vendor.sh -o $(pwd)/output/release/vendor -n $(pwd)/vendor $(pwd) >> ${{ env.UPDATE_ASSET_DIR }}cleanup.txt
+            -   run: cat ${{ env.UPDATE_ASSET_DIR }}cleanup.txt
+
+            -   name: Copy Migrations
+                run: |
+                    mv ./_sql/migrations ${{ env.UPDATE_ASSET_DIR }}migrations
+
+            -   name: Dump SQL file with snippets
+                run: |
+                    php bin/console sw:snippets:to:sql ${{ env.UPDATE_ASSET_DIR }}snippets.sql --force --include-default-plugins --force
+
+            -   name: Create hash files
+                run: |
+                    mkdir -p engine/Shopware/Components/Check/Data
+                    find engine/Shopware themes -type f \( -iname '*.php' -o -iname '*.tpl' -o -iname '*.js' -o -iname '*.less' \) -print0 | xargs -0 md5sum | sort -k 2 -d > engine/Shopware/Components/Check/Data/Files.md5sums
+
+            -   name: Download CaRoot
+                run: |
+                    wget -O ./engine/Shopware/Components/HttpClient/cacert.pem https://raw.githubusercontent.com/bagder/ca-bundle/master/ca-bundle.crt
+
+            -   name: Configure git
+                run: |
+                    git config --global user.name "shopware5"
+                    git config --global user.email "<>"
+
+            -   name: Create Zip
+                run: |
+                    rm install.zip
+                    rm -rf ./output/release
+                    rm -rf _sql
+                    git add .
+                    git commit -m "Create release package"
+                    git archive -v -o ${{ env.PACKAGE_PREFIX }}.zip HEAD
+                    zip -r ${{ env.PACKAGE_PREFIX }}.zip ./vendor ./recovery/common/vendor ${{ env.UPDATE_ASSET_DIR }} ${{ env.UPDATE_ASSET_DIR }}version  ${{ env.UPDATE_ASSET_DIR }}cleanup.txt ${{ env.UPDATE_ASSET_DIR }}snippets.sql
+
+            -   run: echo "SHA=$(sha1sum ${{ env.PACKAGE_PREFIX }}.zip | awk '{print $1}')" >> $GITHUB_ENV
+
+            -   name: Rename Zip
+                run: |
+                    mv ${{ env.PACKAGE_PREFIX }}.zip ${{ env.PACKAGE_PREFIX }}${{ env.PACKAGE_DELIMITER }}${{ env.SHA }}.zip
+
+            -   name: Archive results
+                if: always()
+                uses: actions/upload-artifact@v7
+                with:
+                    path: ${{ env.PACKAGE_PREFIX }}${{ env.PACKAGE_DELIMITER }}${{ env.SHA }}.zip
+
+            -   name: Push to release
+                uses: xresloader/upload-to-github-release@v1.6.2
+                env:
+                    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                with:
+                    file: "*.zip"
+                    tags: true
+                    draft: true
diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
new file mode 100644
index 00000000000..e647f456491
--- /dev/null
+++ b/.github/workflows/danger.yml
@@ -0,0 +1,23 @@
+name: Danger
+
+on:
+    pull_request_target:
+
+concurrency:
+    group: danger-php-${{ github.ref }}-${{ github.workflow }}
+    cancel-in-progress: true
+
+jobs:
+    check:
+        runs-on: ubuntu-latest
+        steps:
+            -   name: Clone
+                uses: actions/checkout@v7
+
+            -   name: Danger
+                uses: docker://ghcr.io/shyim/danger-php:latest
+                with:
+                    args: ci
+                env:
+                    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                    GITHUB_PULL_REQUEST_ID: ${{ github.event.pull_request.number }}
diff --git a/.github/workflows/end-to-end.yml b/.github/workflows/end-to-end.yml
new file mode 100644
index 00000000000..2c930ef03e0
--- /dev/null
+++ b/.github/workflows/end-to-end.yml
@@ -0,0 +1,144 @@
+name: End-to-End
+
+on:
+    workflow_call:
+
+permissions:
+    contents: read
+
+concurrency:
+    group: end-to-end-${{ github.ref }}-${{ github.workflow }}
+    cancel-in-progress: true
+
+jobs:
+    Mink:
+        strategy:
+            matrix:
+                MINK_TAG: [
+                    'account',
+                    'checkout1',
+                    'checkout2',
+                    'detail',
+                    'listing',
+                    'note',
+                    'sitemap',
+                    'misc',
+                    'backend'
+                ]
+        runs-on: ubuntu-latest
+        env:
+            SW_HOST: localhost:8080
+            DB_HOST: 127.0.0.1
+            DB_PORT: 3306
+            DB_USER: root
+            DB_PASSWORD: root
+            DB_NAME: shopware
+            MAILER_DSN: smtp://localhost:1025
+            SW_BASE_PATH: ''
+            SELENIUM_HOST: localhost
+            SMTP_HOST: localhost
+        services:
+            database:
+                image: mysql:8.0
+                env:
+                    MYSQL_ROOT_PASSWORD: root
+                    MYSQL_DATABASE: shopware
+                options: '--mount="type=tmpfs,destination=/var/lib/mysql" --health-cmd="mysqladmin ping -h 127.0.0.1" --health-interval=5s --health-timeout=2s --health-retries=3'
+                ports:
+                    - "3306:3306"
+            mail:
+                image: axllent/mailpit
+                ports:
+                    - "1025:1025"
+        steps:
+            -   uses: actions/checkout@v7
+
+            -   name: Setup PHP
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: '8.2'
+
+            -   name: Install Caddy
+                run: |
+                    set -e
+                    wget -q https://github.com/caddyserver/caddy/releases/download/v2.7.6/caddy_2.7.6_linux_amd64.tar.gz
+                    tar xfv caddy_2.7.6_linux_amd64.tar.gz
+                    sudo mv caddy /usr/local/bin
+
+            -   name: Start PHP-FPM
+                run: |
+                    set -e
+                    set -x
+                    cat <<EOF > fpm.conf
+                    [global]
+                    error_log = /dev/fd/2
+                    daemonize = no
+
+                    [www]
+                    listen = 127.0.0.1:5068
+                    listen.allowed_clients = 127.0.0.1
+                    pm = dynamic
+                    pm.max_children = 5
+                    pm.start_servers = 2
+                    pm.min_spare_servers = 1
+                    pm.max_spare_servers = 3
+                    pm.status_path = /__php-fpm-status__
+
+                    ; Ensure worker stdout and stderr are sent to the main error log
+                    catch_workers_output = yes
+
+                    php_admin_value[error_log] = /dev/fd/2
+                    php_admin_flag[log_errors] = on
+
+                    ; we want to expose env vars (like in FOO=bar symfony server:start)
+                    clear_env = no
+
+                    env['PGGSSENCMODE'] = disable
+                    env['LC_ALL'] = C
+                    EOF
+                    php-fpm --nodaemonize --fpm-config fpm.conf &
+
+            -   name: Start Caddy
+                run: |
+                    cat <<EOF > Caddyfile
+                    :8080 {
+                        root * .
+                        php_fastcgi 127.0.0.1:5068 {
+                            index shopware.php
+                        }
+                        file_server
+                    }
+                    EOF
+                    caddy run --config Caddyfile &
+
+            -   name: Start Selenium
+                run: docker run -d --network host --shm-size 3g selenium/standalone-chrome:94.0
+
+            -   name: Get Composer Cache Directory
+                id: composer-cache
+                run: |
+                    echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+            -   name: Cache Composer dependencies
+                uses: actions/cache@v5
+                with:
+                    path: ${{ steps.composer-cache.outputs.dir }}
+                    key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+                    restore-keys: |
+                        ${{ runner.os }}-composer-
+
+            -   name: Install Shopware
+                run: make init
+
+            -   name: Prepare Mink tests
+                run: make prepare-mink
+
+            -   name: Run Mink tests
+                run: vendor/bin/behat -vv --config=tests/Mink/behat.yml --format=pretty --out=std --tags ${{ matrix.MINK_TAG }}
+
+            -   name: Archive results
+                if: always()
+                uses: actions/upload-artifact@v7
+                with:
+                    name: build-data-${{ matrix.MINK_TAG }}
+                    path: build/logs
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index 1ca3d560230..8e208b19964 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -1,105 +1,187 @@
-name: PHPUnit
-
+name: Php Unit
 on:
-  push:
-  pull_request:
-
+    workflow_call:
+permissions:
+    contents: read
+concurrency:
+    group: php-unit-${{ github.ref }}-${{ github.workflow }}
+    cancel-in-progress: true
 jobs:
-  php:
-    strategy:
-      matrix:
-        php: ['7.4', '8.0']
-    runs-on: ubuntu-latest
-    env:
-        DB_USER: shopware
-        DB_PASSWORD: shopware
-        DB_HOST: 127.0.0.1
-        DB_PORT: 3306
-        DB_NAME: shopware
-        SW_HOST: localhost
-        SW_BASE_PATH: ""
-        ELASTICSEARCH_HOST: elasticsearch
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - uses: shivammathur/setup-php@v2
-      with:
-        php-version: ${{ matrix.php }}
-        tools: composer, prestissimo
-        coverage: none
-
-    - name: Start MySQL
-      run: ./.github/setup-db.sh mysql:5.7
-
-    - name: PHPUnit
-      run: make test-phpunit
-
-  mysql:
-    strategy:
-      matrix:
-        mysql: ['mysql:8.0', 'mariadb:10.1', 'mariadb:10.4']
-    runs-on: ubuntu-latest
-    env:
-        DB_USER: shopware
-        DB_PASSWORD: shopware
-        DB_HOST: 127.0.0.1
-        DB_PORT: 3306
-        DB_NAME: shopware
-        SW_HOST: localhost
-        SW_BASE_PATH: ""
-        ELASTICSEARCH_HOST: elasticsearch
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - uses: shivammathur/setup-php@v2
-      with:
-        php-version: '7.4'
-        tools: composer, prestissimo
-        coverage: none
-
-    - name: Start MySQL
-      run: ./.github/setup-db.sh ${{ matrix.mysql }}
-
-    - name: PHPUnit
-      run: make test-phpunit
-
-  es:
-    strategy:
-      matrix:
-        elasticsearch: ['elastic/elasticsearch:7.0.0']
-    runs-on: ubuntu-latest
-    env:
-        DB_USER: shopware
-        DB_PASSWORD: shopware
-        DB_HOST: 127.0.0.1
-        DB_PORT: 3306
-        DB_NAME: shopware
-        SW_HOST: localhost
-        SW_BASE_PATH: ""
-        ELASTICSEARCH_HOST: elasticsearch
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - uses: shivammathur/setup-php@v2
-      with:
-        php-version: '7.4'
-        tools: composer, prestissimo
-        coverage: none
-
-    - name: Start MySQL
-      run: ./.github/setup-db.sh mysql:5.7
-
-    - name: Start Elasticsearch
-      run: ./.github/setup-es.sh ${{ matrix.elasticsearch }}
-
-    - name: Setup DNS
-      run: sudo echo "127.0.0.1 elasticsearch" | sudo tee -a /etc/hosts
-
-    - name: Install Shopware
-      run: make init
-
-    - name: PHPUnit
-      run: make test-phpunit-elasticsearch
+    php:
+        env:
+            SW_HOST: localhost:8000
+            DB_HOST: 127.0.0.1
+            DB_PORT: 3306
+            DB_USER: root
+            DB_PASSWORD: root
+            DB_NAME: shopware
+            MAILER_DSN: smtp://localhost:1025
+            SW_BASE_PATH: ''
+            SELENIUM_HOST: localhost
+            SMTP_HOST: localhost
+        services:
+            database:
+                image: mysql:8.0
+                env:
+                    MYSQL_ROOT_PASSWORD: root
+                    MYSQL_DATABASE: shopware
+                options: '--mount="type=tmpfs,destination=/var/lib/mysql" --health-cmd="mysqladmin ping -h 127.0.0.1" --health-interval=5s --health-timeout=2s --health-retries=3'
+                ports:
+                    - "3306:3306"
+        strategy:
+            matrix:
+                php:
+                    - '7.4'
+                    - '8.0'
+                    - '8.1'
+                    - '8.2'
+                    - '8.3'
+        runs-on: ubuntu-latest
+        steps:
+            -   uses: actions/checkout@v7
+            -   name: Setup PHP
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: '${{ matrix.php }}'
+            -   name: Get Composer Cache Directory
+                id: composer-cache
+                run: |
+                    echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+            -   uses: actions/cache@v5
+                with:
+                    path: ${{ steps.composer-cache.outputs.dir }}
+                    key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+                    restore-keys: |
+                        ${{ runner.os }}-composer-
+            -   run: composer update 'laminas/*' cocur/slugify
+            -   run: make test-phpunit
+    mysql:
+        strategy:
+            matrix:
+                mysql:
+                    - 'mariadb:10.4'
+                    - 'mariadb:10.11'
+                    - 'mysql:5.7'
+                    - 'mysql:8.4'
+        env:
+            SW_HOST: localhost:8000
+            DB_HOST: 127.0.0.1
+            DB_PORT: 3306
+            DB_USER: root
+            DB_PASSWORD: root
+            DB_NAME: shopware
+            MAILER_DSN: smtp://localhost:1025
+            SW_BASE_PATH: ''
+            SELENIUM_HOST: localhost
+            SMTP_HOST: localhost
+        services:
+            database:
+                image: ${{ matrix.mysql}}
+                env:
+                    MYSQL_ROOT_PASSWORD: root
+                    MYSQL_DATABASE: shopware
+                options: '--mount="type=tmpfs,destination=/var/lib/mysql" --health-cmd="mysqladmin ping -h 127.0.0.1" --health-interval=5s --health-timeout=2s --health-retries=3'
+                ports:
+                    - "3306:3306"
+        runs-on: ubuntu-latest
+        steps:
+            -   uses: actions/checkout@v7
+            -   name: Setup PHP
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: '8.2'
+            -   name: Get Composer Cache Directory
+                id: composer-cache
+                run: |
+                    echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+            -   uses: actions/cache@v5
+                with:
+                    path: ${{ steps.composer-cache.outputs.dir }}
+                    key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+                    restore-keys: |
+                        ${{ runner.os }}-composer-
+            -   run: make test-phpunit
+    Code-Coverage:
+        runs-on: ubuntu-latest
+        env:
+            TESTSUITE: 'all'
+            SW_HOST: localhost:8000
+            DB_HOST: 127.0.0.1
+            DB_PORT: 3306
+            DB_USER: root
+            DB_PASSWORD: root
+            DB_NAME: shopware
+            MAILER_DSN: smtp://localhost:1025
+            SW_BASE_PATH: ''
+            SELENIUM_HOST: localhost
+            SMTP_HOST: localhost
+        services:
+            database:
+                image: mysql:8.0
+                env:
+                    MYSQL_ROOT_PASSWORD: root
+                    MYSQL_DATABASE: shopware
+                options: '--mount="type=tmpfs,destination=/var/lib/mysql" --health-cmd="mysqladmin ping -h 127.0.0.1" --health-interval=5s --health-timeout=2s --health-retries=3'
+                ports:
+                    - "3306:3306"
+        steps:
+            -   uses: actions/checkout@v7
+            -   name: Setup PHP
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: '8.2'
+                    extensions: pcov
+            -   name: Get Composer Cache Directory
+                id: composer-cache
+                run: |
+                    echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+            -   uses: actions/cache@v5
+                with:
+                    path: ${{ steps.composer-cache.outputs.dir }}
+                    key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+                    restore-keys: |
+                        ${{ runner.os }}-composer-
+            -   run: make test-phpunit-coverage-statistic
+    es:
+        runs-on: ubuntu-latest
+        env:
+            ELASTICSEARCH_HOST: localhost:9200
+            SW_HOST: localhost:8000
+            DB_HOST: 127.0.0.1
+            DB_PORT: 3306
+            DB_USER: root
+            DB_PASSWORD: root
+            DB_NAME: shopware
+            MAILER_DSN: smtp://localhost:1025
+            SW_BASE_PATH: ''
+            SELENIUM_HOST: localhost
+            SMTP_HOST: localhost
+        services:
+            elasticsearch:
+                image: elastic/elasticsearch:7.8.0
+                env:
+                    discovery.type: single-node
+                ports:
+                    - "9200:9200"
+            database:
+                image: mysql:8.0
+                env:
+                    MYSQL_ROOT_PASSWORD: root
+                    MYSQL_DATABASE: shopware
+                options: '--mount="type=tmpfs,destination=/var/lib/mysql" --health-cmd="mysqladmin ping -h 127.0.0.1" --health-interval=5s --health-timeout=2s --health-retries=3'
+                ports:
+                    - "3306:3306"
+        steps:
+            -   uses: actions/checkout@v7
+            -   name: Get Composer Cache Directory
+                id: composer-cache
+                run: |
+                    echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+            -   uses: actions/cache@v5
+                with:
+                    path: ${{ steps.composer-cache.outputs.dir }}
+                    key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+                    restore-keys: |
+                        ${{ runner.os }}-composer-
+            -   run: make init
+            -   run: make test-phpunit-elasticsearch
diff --git a/.github/workflows/tests-launcher.yml b/.github/workflows/tests-launcher.yml
new file mode 100644
index 00000000000..b2b1c5eea29
--- /dev/null
+++ b/.github/workflows/tests-launcher.yml
@@ -0,0 +1,33 @@
+name: Run
+
+on:
+    workflow_dispatch:
+    pull_request:
+    push:
+        branches:
+            - "5.7"
+    schedule:
+        -   cron: '0 2 * * *'
+
+jobs:
+    check-php-code:
+        name: PHPStan and CSFixer
+        uses: ./.github/workflows/check-php-code.yml
+        secrets: inherit
+
+    check-js-code:
+        name: JsLinter and Jest tests
+        uses: ./.github/workflows/check-js-code.yml
+        secrets: inherit
+
+    php-unit:
+        name: PHPUnit tests
+        uses: ./.github/workflows/phpunit.yml
+        secrets: inherit
+        needs: [ check-php-code, check-js-code ]
+
+    e2e-tests:
+        name: E2E
+        uses: ./.github/workflows/end-to-end.yml
+        secrets: inherit
+        needs: [ php-unit ]
diff --git a/.gitignore b/.gitignore
index ad968e9daf7..1f83030b382 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,6 +79,7 @@ Thumbs.db
 /files/import_cron
 /files/import_export
 /files/552211cce724117c3178e3d22bec532ec/
+/files/backup/multi_edit/*
 
 # Snippet exports
 /snippetsExport/
@@ -104,3 +105,8 @@ tests/phpunit-full-coverage.xml
 # scripts
 !/build/composer-post-install-cmd.sh
 !/build/composer-post-update-cmd.sh
+
+# Devenv
+.devenv*
+devenv.local.nix
+
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index 8338d6d9cca..00000000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,270 +0,0 @@
-variables:
-    DOCKER_DRIVER: overlay2
-    DOCKER_HOST: "tcp://docker:2375"
-    DOCKER_TLS_CERTDIR: "/certs"
-    MYSQL_ROOT_PASSWORD: app
-    MYSQL_USER: app
-    MYSQL_PASSWORD: app
-    MYSQL_DATABASE: shopware
-    GIT_STRATEGY: clone
-    GIT_DEPTH: 1
-    ARTIFACTS_ROOT: "$CI_PROJECT_DIR/build/artifacts"
-    DB_USER: "app"
-    DB_PASSWORD: "app"
-    DB_HOST: "mysql"
-    DB_PORT: 3306
-    DB_NAME: shopware
-    SW_HOST: "localhost"
-    SW_BASE_PATH: ""
-    ELASTICSEARCH_HOST: elasticsearch
-
-workflow:
-    rules:
-        - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-        - if: '$CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS'
-          when: never
-        - if: '$CI_COMMIT_BRANCH'
-
-.composer-cache: &composer-cache
-    key:
-        files:
-            - 'composer.lock'
-            - 'recovery/common/composer.lock'
-    paths:
-        - 'vendor/'
-        - 'recovery/common/vendor/'
-        - 'vendor-bin/'
-        - '.htaccess'
-        - '.make.install.composer-dependencies'
-    policy: pull-push
-
-.npm-cache: &npm-cache
-    key:
-        files:
-            - 'themes/package-lock.json'
-            - 'themes/Frontend/Responsive/package-lock.json'
-    paths:
-        - 'themes/node_modules/'
-        - 'themes/Frontend/Responsive/node_modules/'
-        - '.make.install.npm-dependencies'
-    policy: pull-push
-
-stages:
-    - Prepare Files
-    - Static analysis
-    - PHPUnit
-    - End-to-end testing
-    - Security
-    - Build Image
-
-default:
-    image: gitlab.shopware.com:5005/shopware/5/product/image/continuous:7.4
-
-# Stage: Prepare Files
-
-Install Required PHP Files:
-    tags:
-        - t3.nano
-    stage: Prepare Files
-    script:
-        - make .make.install.composer-dependencies
-    cache:
-        <<: *composer-cache
-
-Install Required JS Files:
-    tags:
-        - t3.nano
-    image: node:alpine
-    stage: Prepare Files
-    before_script:
-        - apk add --no-cache make bash
-    script:
-        - make .make.install.npm-dependencies
-    cache:
-        <<: *npm-cache
-
-PHP analyze:
-    tags:
-        - m5.large
-    cache:
-        - <<: *composer-cache
-          policy: pull
-    stage: Static analysis
-    before_script:
-        - make init
-    script:
-        - make check-code
-    services:
-        -   name: mysql:5.7
-            alias: mysql
-
-JavaScript checks:
-    tags:
-        - t3.nano
-    cache:
-        - <<: *npm-cache
-          policy: pull
-    stage: Static analysis
-    image: node:alpine
-    before_script:
-        - apk add bash make
-    script:
-        - make check-js-code
-        - make test-jest
-
-.phpunit_base:
-    tags:
-        - t3.medium
-    cache:
-        - <<: *composer-cache
-          policy: pull
-    before_script: # TODO: (SW-26726) Remove this and see if anything breaks.
-        - sed -i -e "s;__ROOT__;$CI_PROJECT_DIR;g" /etc/nginx/sites-enabled/shopware.conf
-        - /usr/bin/supervisord -c /etc/supervisord.conf &>/dev/null &
-        # https://gitlab.com/gitlab-org/gitlab-foss/-/issues/27921#note_38132416
-        - eval export DB_USER DB_PASSWORD DB_HOST DB_PORT DB_NAME SW_HOST SW_BASE_PATH ELASTICSEARCH_HOST
-    stage: PHPUnit
-    services:
-        -   name: mysql:5.7
-            alias: mysql
-    script:
-        - make test-phpunit
-    artifacts:
-        expire_in: 1 week
-        reports:
-            junit: ${ARTIFACTS_ROOT}/test-log.xml
-
-.phpunit_es_base:
-    tags:
-        - t3.medium
-    extends: .phpunit_base
-    script:
-        - make init
-        - make test-phpunit-elasticsearch
-
-    artifacts:
-        expire_in: 1 week
-        reports:
-            junit: ${ARTIFACTS_ROOT}/test-log.xml
-
-Code Coverage:
-    extends: .phpunit_base
-    image: gitlab.shopware.com:5005/shopware/5/product/image/continuous:8.0
-    script:
-        - make test-phpunit-coverage-cobertura
-    artifacts:
-        paths:
-            - ${ARTIFACTS_ROOT}/*
-        expire_in: 1 week
-        reports:
-            junit: ${ARTIFACTS_ROOT}/phpunit.junit.xml
-            cobertura: ${ARTIFACTS_ROOT}/*.cobertura.xml
-    parallel:
-        matrix:
-            - TESTSUITE: ['unit', 'functional']
-
-Code Coverage Statistic:
-    extends: .phpunit_base
-    image: gitlab.shopware.com:5005/shopware/5/product/image/continuous:8.0
-    variables:
-        TESTSUITE: 'all'
-    script:
-        - make test-phpunit-coverage-statistic | sed -E -n '1,/^\s*Lines:\s*([0-9]+(\.[0-9]+)?)%/ p' # See: https://gitlab.shopware.com/shopware/6/product/platform/-/blob/trunk/.gitlab/stages/02-unit.yml#L92
-    coverage: '/^\s*Lines:\s*(\d+(?:\.\d+)?%)/'
-
-PHP 7.4:
-    extends: .phpunit_base
-
-PHP 8.1:
-    extends: .phpunit_base
-    image: gitlab.shopware.com:5005/shopware/5/product/image/continuous:8.1
-
-MySQL 8.0:
-    extends: .phpunit_base
-    services:
-        -   name: mysql:8.0.19
-            alias: mysql
-            command: [ "mysqld", "--character-set-server=utf8mb4", "--collation-server=utf8mb4_unicode_ci", "--default-authentication-plugin=mysql_native_password", "--sql-require-primary-key=ON" ]
-
-MariaDB 10.1:
-    extends: .phpunit_base
-    services:
-        -   name: mariadb:10.1
-            alias: mysql
-
-MariaDB 10.5:
-    extends: .phpunit_base
-    services:
-        -   name: mariadb:10.5
-            alias: mysql
-
-Elasticsearch 7:
-    extends: .phpunit_es_base
-    image: gitlab.shopware.com:5005/shopware/5/product/image/continuous:7.4
-    services:
-        -   name: mysql:8.0.19
-            alias: mysql
-            command: [ "mysqld", "--character-set-server=utf8mb4", "--collation-server=utf8mb4_unicode_ci", "--default-authentication-plugin=mysql_native_password" ]
-        -   name: docker.elastic.co/elasticsearch/elasticsearch:7.9.1
-            alias: elasticsearch
-            command: [ "bin/elasticsearch", "-Expack.security.enabled=false", "-Ediscovery.type=single-node" ]
-
-.mink_base:
-    tags:
-        - m5.large
-    extends: .phpunit_base
-    stage: End-to-end testing
-    artifacts:
-        when: always
-        expire_in: 1 week
-        paths:
-            - ${ARTIFACTS_ROOT}/**
-            - build/logs/**
-        reports:
-            junit: ${ARTIFACTS_ROOT}/mink/*.xml
-    script:
-        - apk add --no-cache sudo
-        - export SW_HOST=$(hostname -i)
-        - make init
-        - make prepare-mink
-        - chown -R www-data:www-data .
-        - sudo -E -u www-data vendor/bin/behat -vv --config=tests/Mink/behat.yml --format=pretty --out=std --format=junit --out=${ARTIFACTS_ROOT}/mink --tags ${MINK_TAG}
-    services:
-        -   name: selenium/standalone-chrome:84.0
-            alias: selenium
-        -   name: mailhog/mailhog
-            alias: smtp
-        -   name: mysql:8.0.19
-            alias: mysql
-            command: [ "mysqld", "--character-set-server=utf8mb4", "--collation-server=utf8mb4_unicode_ci", "--default-authentication-plugin=mysql_native_password" ]
-
-Mink:
-    extends: .mink_base
-    image: "gitlab.shopware.com:5005/shopware/5/product/image/continuous:$IMAGE_TAG"
-    parallel:
-      matrix:
-        - IMAGE_TAG: [ '7.4', '8.0' ]
-          MINK_TAG: [ 'account', 'checkout1', 'checkout2', 'detail', 'listing', 'note', 'sitemap', 'misc', 'backend' ]
-    rules:
-        - if: '$CI_PIPELINE_SOURCE == "schedule"'
-        - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $IMAGE_TAG != "8.0"'
-        - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-          when: manual
-          allow_failure: true
-
-Build Image:
-    stage: Build Image
-    inherit:
-        variables: false
-    variables:
-        UPSTREAM_REF_NAME: '$CI_COMMIT_REF_NAME'
-        UPSTREAM_COMMIT_SHA: '$CI_COMMIT_SHORT_SHA'
-        UPSTREAM_CI_COMMIT_REF_PROTECTED: '$CI_COMMIT_REF_PROTECTED'
-        PHP_VERSION: '8.0'
-        COMPOSER_VERSION: '2'
-        NODE_VERSION: '18'
-    trigger:
-        project: shopware/5/product/image
-        branch: master
-    rules:
-       - if: '$CI_COMMIT_REF_PROTECTED == "true"'
diff --git a/.htaccess.dist b/.htaccess.dist
index 0508839a356..2739fc3113f 100644
--- a/.htaccess.dist
+++ b/.htaccess.dist
@@ -39,7 +39,7 @@ RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]
     RedirectMatch 404 /(web\/cache\/(config_\d+\.json|all.less))$
 
     # Restrict access to theme configurations
-    RedirectMatch 404 /themes/(.*)(.*\.lock|package\.json|\.gitignore|Gruntfile\.js|all\.less|node_modules\/.*)$
+    RedirectMatch 404 /themes/(.*)(.(lock|package)\.json|\.gitignore|Gruntfile\.js|all\.less|node_modules\/.*)$
 </IfModule>
 
 # Staging environment
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
index 1ec0bd9f361..8661ed3065f 100644
--- a/.php-cs-fixer.php
+++ b/.php-cs-fixer.php
@@ -1,6 +1,29 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 use PhpCsFixer\Config;
+use PhpCsFixer\Runner\Parallel\ParallelConfigFactory;
 use PhpCsFixerCustomFixers\Fixer\NoUselessCommentFixer;
 use PhpCsFixerCustomFixers\Fixer\NoUselessDirnameCallFixer;
 use PhpCsFixerCustomFixers\Fixer\NoUselessParenthesisFixer;
@@ -11,10 +34,10 @@
 use PhpCsFixerCustomFixers\Fixer\PhpUnitDedicatedAssertFixer;
 use PhpCsFixerCustomFixers\Fixer\SingleSpaceAfterStatementFixer;
 use PhpCsFixerCustomFixers\Fixer\SingleSpaceBeforeStatementFixer;
-use PhpCsFixerCustomFixers\Fixer\NoSuperfluousConcatenationFixer;
 use PhpCsFixerCustomFixers\Fixers;
 
 $finder = PhpCsFixer\Finder::create()
+    ->in(__DIR__ . '/_sql/migrations')
     ->in(__DIR__ . '/engine/Shopware')
     ->in(__DIR__ . '/tests')
     ->in(__DIR__ . '/recovery')
@@ -30,29 +53,29 @@
 Shopware 5
 Copyright (c) shopware AG
 
-According to our dual licensing model, this program can be used either
-under the terms of the GNU Affero General Public License, version 3,
-or under a proprietary license.
+According to our licensing model, this program can be used
+under the terms of the GNU Affero General Public License, version 3.
 
 The texts of the GNU Affero General Public License with an additional
-permission and of our proprietary license can be found at and
-in the LICENSE file you have received along with this program.
+permission can be found at and in the LICENSE file you have received
+along with this program.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU Affero General Public License for more details.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+See the GNU Affero General Public License for more details.
 
 "Shopware" is a registered trademark of shopware AG.
 The licensing of the program under the AGPLv3 does not imply a
-trademark license. Therefore any rights, title and interest in
-our trademarks remain entirely with us.
+trademark license. Therefore, any rights, title and interest in
+our trademarks remain entirely with the shopware AG.
 EOF;
 
 return (new Config())
     ->registerCustomFixers(new Fixers())
     ->setRiskyAllowed(true)
     ->setCacheFile('var/cache/php-cs-fixer')
+    ->setParallelConfig(ParallelConfigFactory::detect())
     ->setRules([
         '@PSR12' => true,
         '@Symfony' => true,
@@ -67,15 +90,17 @@
         'global_namespace_import' => true,
         'header_comment' => ['header' => $header, 'separate' => 'bottom', 'comment_type' => 'PHPDoc'],
         'modernize_types_casting' => true,
-        'native_function_invocation' => true,
+        'native_function_invocation' => ['exclude' => ['ini_get'], 'strict' => false],
         'no_alias_functions' => true,
         'no_useless_else' => true,
         'no_useless_return' => true,
         'no_superfluous_phpdoc_tags' => true,
+        'nullable_type_declaration_for_default_null_value' => true,
         'operator_linebreak' => ['only_booleans' => true],
         'ordered_class_elements' => true,
         'phpdoc_line_span' => true,
         'phpdoc_order' => true,
+        'phpdoc_separation' => ['groups' => [['ORM\*', 'Assert\*', 'ShopwareAssert\*'], ['deprecated', 'link', 'see', 'since'], ['author', 'copyright', 'license'], ['category', 'package', 'subpackage'], ['property', 'property-read', 'property-write']]],
         'phpdoc_summary' => false,
         'phpdoc_var_annotation_correct_order' => true,
         'php_unit_dedicate_assert' => true,
@@ -91,7 +116,6 @@
         SingleSpaceAfterStatementFixer::name() => true,
         SingleSpaceBeforeStatementFixer::name() => true,
         PhpdocParamTypeFixer::name() => true,
-        NoSuperfluousConcatenationFixer::name() => true,
         NoUselessStrlenFixer::name() => true,
         NoUselessParenthesisFixer::name() => true,
         PhpUnitDedicatedAssertFixer::name() => true,
diff --git a/.phpstan-baseline.neon b/.phpstan-baseline.neon
index a8f0456385c..16d91c325bc 100644
--- a/.phpstan-baseline.neon
+++ b/.phpstan-baseline.neon
@@ -1,4449 +1,4374 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^Parameter \\#1 \\$newInstance of function Shopware expects Shopware\\|null, Enlight_Application\\|null given\\.$#"
+			message: "#^Cannot access offset 'value' on array\\{name\\: string, value\\: string\\}\\|false\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Application.php
+			path: _sql/migrations/1204-add-variant-filter.php
 
 		-
-			message: "#^Method Enlight_Class\\:\\:Instance\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration1204\\:\\:getExistingSortingTranslation\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Class.php
+			path: _sql/migrations/1204-add-variant-filter.php
 
 		-
-			message: "#^Method Enlight_Class\\:\\:Instance\\(\\) should return Enlight_Class but returns object\\.$#"
+			message: "#^Method Migrations_Migration1204\\:\\:importFacetTranslations\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Class.php
+			path: _sql/migrations/1204-add-variant-filter.php
 
 		-
-			message: "#^Method Enlight_Class\\:\\:__call\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$translationShopId of method Migrations_Migration1204\\:\\:getExistingSortingTranslation\\(\\) expects int, string given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Class.php
+			path: _sql/migrations/1204-add-variant-filter.php
 
 		-
-			message: "#^Method Enlight_Class\\:\\:__call\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#2 \\$localeId of method Migrations_Migration1204\\:\\:getExistingSortingTranslation\\(\\) expects int, string\\|null given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Class.php
+			path: _sql/migrations/1204-add-variant-filter.php
 
 		-
-			message: "#^Method Enlight_Class\\:\\:__callStatic\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$variable_representation of function unserialize expects string, string\\|null given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Class.php
+			path: _sql/migrations/1207-add-new-seo-alias-for-variants.php
 
 		-
-			message: "#^Method Enlight_Class\\:\\:__callStatic\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#1 \\$str of function strtolower expects string, int\\|string\\|false\\|null given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Class.php
+			path: _sql/migrations/1226-add-blog-comment-mailtemplate.php
 
 		-
-			message: "#^Method Enlight_Class\\:\\:__get\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$str of function strtolower expects string, int\\|string\\|false\\|null given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Class.php
+			path: _sql/migrations/1229-accountless-optin-switch.php
 
 		-
-			message: "#^Method Enlight_Class\\:\\:__set\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration1407\\:\\:addConfigElementTranslation\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Class.php
+			path: _sql/migrations/1407-add-english-translations.php
 
 		-
-			message: "#^Method Enlight_Class\\:\\:__set\\(\\) has parameter \\$value with no type specified\\.$#"
+			message: "#^Method Migrations_Migration1407\\:\\:alterHolidays\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Class.php
+			path: _sql/migrations/1407-add-english-translations.php
 
 		-
-			message: "#^Method Enlight_Class\\:\\:getClassName\\(\\) has parameter \\$class with no type specified\\.$#"
+			message: "#^Method Migrations_Migration1407\\:\\:correctTypoInHolidays\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Class.php
+			path: _sql/migrations/1407-add-english-translations.php
 
 		-
-			message: "#^Method Enlight_Class\\:\\:resetInstance\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$str of function strtolower expects string, int\\|string\\|false\\|null given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Class.php
+			path: _sql/migrations/1426-add-blog-comment-mailtemplate.php
 
 		-
-			message: "#^Method Enlight_Class\\:\\:resetInstance\\(\\) has parameter \\$class with no type specified\\.$#"
+			message: "#^Parameter \\#1 \\$str of function strtolower expects string, int\\|string\\|false\\|null given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Class.php
+			path: _sql/migrations/1429-accountless-optin-switch.php
 
 		-
-			message: "#^Property Enlight_Class\\:\\:\\$instances type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration1436\\:\\:createEnglishDocumentMailTemplates\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Class.php
+			path: _sql/migrations/1436-document-type-mail-templates.php
 
 		-
-			message: "#^Method Enlight_Collection_ArrayCollection\\:\\:__call\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration1436\\:\\:createGermanDocumentMailTemplates\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Collection/ArrayCollection.php
+			path: _sql/migrations/1436-document-type-mail-templates.php
 
 		-
-			message: "#^Method Enlight_Collection_ArrayCollection\\:\\:__call\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration1436\\:\\:updateTypeOfDefaultDocumentMailTemplate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Collection/ArrayCollection.php
+			path: _sql/migrations/1436-document-type-mail-templates.php
 
 		-
-			message: "#^Method Enlight_Collection_ArrayCollection\\:\\:__get\\(\\) has no return type specified\\.$#"
+			message: "#^Cannot call method fetchAll\\(\\) on PDOStatement\\|false\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Collection/ArrayCollection.php
+			path: _sql/migrations/1439-change-back-document-id-to-tmp.php
 
 		-
-			message: "#^Method Enlight_Collection_ArrayCollection\\:\\:__set\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration1439\\:\\:isMySql8\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Collection/ArrayCollection.php
+			path: _sql/migrations/1439-change-back-document-id-to-tmp.php
 
 		-
-			message: "#^Method Enlight_Collection_ArrayCollection\\:\\:__set\\(\\) has parameter \\$value with no type specified\\.$#"
+			message: "#^Cannot call method fetchAll\\(\\) on PDOStatement\\|false\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Collection/ArrayCollection.php
+			path: _sql/migrations/1440-change-document-id-to-lowercase.php
 
 		-
-			message: "#^Method Enlight_Collection_ArrayCollection\\:\\:set\\(\\) has parameter \\$value with no type specified\\.$#"
+			message: "#^Property Migrations_Migration1444\\:\\:\\$mailer has no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Collection/ArrayCollection.php
+			path: _sql/migrations/1444-userfriendly-mail-options.php
 
 		-
-			message: "#^Interface Enlight_Collection_Collection extends generic interface ArrayAccess but does not specify its types\\: TKey, TValue$#"
+			message: "#^Property Migrations_Migration1444\\:\\:\\$mailerAuth has no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Collection/Collection.php
+			path: _sql/migrations/1444-userfriendly-mail-options.php
 
 		-
-			message: "#^Interface Enlight_Collection_Collection extends generic interface IteratorAggregate but does not specify its types\\: TKey, TValue$#"
+			message: "#^Property Migrations_Migration1444\\:\\:\\$mailerSecure has no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Collection/Collection.php
+			path: _sql/migrations/1444-userfriendly-mail-options.php
 
 		-
-			message: "#^Call to an undefined method Zend_Auth_Adapter_Interface\\:\\:refresh\\(\\)\\.$#"
+			message: "#^Method Migrations_Migration1450\\:\\:saveNewCountry\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Auth.php
+			path: _sql/migrations/1450-add-missing-countries.php
 
 		-
-			message: "#^Method Enlight_Components_Auth\\:\\:getInstance\\(\\) should return Enlight_Components_Auth but returns Zend_Auth\\.$#"
+			message: "#^Method Migrations_Migration1450\\:\\:saveNewCountry\\(\\) has parameter \\$newCountry with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Auth.php
+			path: _sql/migrations/1450-add-missing-countries.php
 
 		-
-			message: "#^Method Enlight_Components_Auth_Adapter_DbTable\\:\\:updateExpiry\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#3 \\$defaultLocale of method Migrations_Migration1450\\:\\:saveNewCountry\\(\\) expects string, int\\|string\\|false\\|null given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Auth/Adapter/DbTable.php
+			path: _sql/migrations/1450-add-missing-countries.php
 
 		-
-			message: "#^Method Enlight_Components_Cron_Adapter\\:\\:startJob\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration1454\\:\\:addShopIdToBlogComment\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Cron/Adapter.php
+			path: _sql/migrations/1454-add-category-shop-association.php
 
 		-
-			message: "#^Method Enlight_Components_Cron_Adapter_DBAL\\:\\:isJobStillOverdue\\(\\) has parameter \\$jobId with no type specified\\.$#"
+			message: "#^Method Migrations_Migration1454\\:\\:addShopsColumnToCategory\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Cron/Adapter/DBAL.php
+			path: _sql/migrations/1454-add-category-shop-association.php
 
 		-
-			message: "#^Method Enlight_Components_Cron_Adapter_DBAL\\:\\:startJob\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration1454\\:\\:createBlogConfigForm\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Cron/Adapter/DBAL.php
+			path: _sql/migrations/1454-add-category-shop-association.php
 
 		-
-			message: "#^Method Enlight_Components_Cron_Adapter_DBAL\\:\\:updateJob\\(\\) should return Enlight_Components_Cron_Manager but return statement is missing\\.$#"
+			message: "#^Method Migrations_Migration1454\\:\\:createSubshopBlogCommentElement\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Cron/Adapter/DBAL.php
+			path: _sql/migrations/1454-add-category-shop-association.php
 
 		-
-			message: "#^Negated boolean expression is always false\\.$#"
+			message: "#^Cannot call method fetchAll\\(\\) on PDOStatement\\|false\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Cron/Adapter/DBAL.php
+			path: _sql/migrations/1611-change-order-details-id-column.php
 
 		-
-			message: "#^Parameter \\#2 \\$value of method Enlight_Components_Cron_Adapter_DBAL\\:\\:getJobByColumn\\(\\) expects string, int given\\.$#"
+			message: "#^Parameter \\#1 \\$array of function array_column expects array, array\\|false given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Cron/Adapter/DBAL.php
+			path: _sql/migrations/1611-change-order-details-id-column.php
 
 		-
-			message: "#^Strict comparison using \\=\\=\\= between int and null will always evaluate to false\\.$#"
+			message: "#^Method Migrations_Migration1625\\:\\:getDefaultLocale\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Cron/Adapter/DBAL.php
+			path: _sql/migrations/1625-add-sort-by-articlenumber.php
+
+		-
+			message: "#^Unsafe access to private constant Migrations_Migration1625\\:\\:LANGUAGE_ENGLISH through static\\:\\:\\.$#"
+			count: 1
+			path: _sql/migrations/1625-add-sort-by-articlenumber.php
 
 		-
-			message: "#^Ternary operator condition is always true\\.$#"
+			message: "#^Unsafe access to private constant Migrations_Migration1625\\:\\:LANGUAGE_GERMAN through static\\:\\:\\.$#"
 			count: 3
-			path: engine/Library/Enlight/Components/Cron/Adapter/DBAL.php
+			path: _sql/migrations/1625-add-sort-by-articlenumber.php
 
 		-
-			message: "#^Method Enlight_Components_Cron_Job\\:\\:__construct\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
+			message: "#^Cannot call method fetch\\(\\) on PDOStatement\\|false\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Cron/Job.php
+			path: _sql/migrations/1626-add password_change_date.php
 
 		-
-			message: "#^Method Enlight_Components_Cron_Job\\:\\:__get\\(\\) has no return type specified\\.$#"
+			message: "#^Cannot call method fetch\\(\\) on PDOStatement\\|false\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Cron/Job.php
+			path: _sql/migrations/1631-add-shop-id-column-to-blogs.php
 
 		-
-			message: "#^Method Enlight_Components_Cron_Job\\:\\:get\\(\\) has no return type specified\\.$#"
+			message: "#^Argument of an invalid type array\\|false supplied for foreach, only iterables are supported\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Cron/Job.php
+			path: _sql/migrations/1632-add-acl-privilege-requirements.php
 
 		-
-			message: "#^Method Enlight_Components_Cron_Job\\:\\:get\\(\\) has parameter \\$default with no type specified\\.$#"
+			message: "#^Method Migrations_Migration1632\\:\\:addDependencyTable\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Cron/Job.php
+			path: _sql/migrations/1632-add-acl-privilege-requirements.php
 
 		-
-			message: "#^Method Enlight_Components_Cron_Job\\:\\:get\\(\\) has parameter \\$name with no type specified\\.$#"
+			message: "#^Method Migrations_Migration1632\\:\\:addPrivilegeRequirements\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Cron/Job.php
+			path: _sql/migrations/1632-add-acl-privilege-requirements.php
 
 		-
-			message: "#^Method Enlight_Components_Cron_Job\\:\\:getDisableOnError\\(\\) should return int but returns bool\\.$#"
+			message: "#^Method Migrations_Migration1632\\:\\:addPrivilegeRequirements\\(\\) has parameter \\$privilegeMapping with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Cron/Job.php
+			path: _sql/migrations/1632-add-acl-privilege-requirements.php
 
 		-
-			message: "#^Method Enlight_Components_Cron_Job\\:\\:getEnd\\(\\) should return Zend_Date but returns string\\.$#"
+			message: "#^Method Migrations_Migration1632\\:\\:addPrivilegeRequirements\\(\\) has parameter \\$requirementMatrix with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Cron/Job.php
+			path: _sql/migrations/1632-add-acl-privilege-requirements.php
 
 		-
-			message: "#^Method Enlight_Components_Cron_Job\\:\\:getNext\\(\\) should return Zend_Date but returns string\\.$#"
+			message: "#^Method Migrations_Migration1632\\:\\:getPrivilegeMapping\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Cron/Job.php
+			path: _sql/migrations/1632-add-acl-privilege-requirements.php
 
 		-
-			message: "#^Method Enlight_Components_Cron_Job\\:\\:getStart\\(\\) should return Zend_Date but returns string\\.$#"
+			message: "#^Method Migrations_Migration1632\\:\\:getRequirementMatrix\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Cron/Job.php
+			path: _sql/migrations/1632-add-acl-privilege-requirements.php
 
 		-
-			message: "#^Method Enlight_Components_Cron_Job\\:\\:setData\\(\\) has parameter \\$data with no type specified\\.$#"
+			message: "#^Method Migrations_Migration1649\\:\\:getConfigValue\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Cron/Job.php
+			path: _sql/migrations/1649-add-cookie-consent-manager-site.php
 
 		-
-			message: "#^Method Enlight_Components_Cron_Job\\:\\:setOptions\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$variable_representation of function unserialize expects string, int\\<min, \\-1\\>\\|int\\<1, max\\>\\|string given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Cron/Job.php
+			path: _sql/migrations/1649-add-cookie-consent-manager-site.php
 
 		-
-			message: "#^Method Enlight_Components_Cron_Job\\:\\:setOptions\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#1 \\$entry of method Migrations_Migration1701\\:\\:addCacheEntry\\(\\) expects string, int\\|string\\|false\\|null given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Cron/Job.php
+			path: _sql/migrations/1701-add-http-cache-events-and-routes-for-forms.php
 
 		-
-			message: "#^Property Enlight_Components_Cron_Job\\:\\:\\$active \\(int\\) does not accept bool\\.$#"
+			message: "#^Parameter \\#1 \\$botConfiguration of method Migrations_Migration1716\\:\\:getFilteredBotList\\(\\) expects string, string\\|null given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Cron/Job.php
+			path: _sql/migrations/1716-fixing-bot-detection-huawei.php
 
 		-
-			message: "#^Property Enlight_Components_Cron_Job\\:\\:\\$active \\(int\\) does not accept default value of type true\\.$#"
+			message: "#^Method Migrations_Migration218\\:\\:deletePluginByName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Cron/Job.php
+			path: _sql/migrations/218-remove-old-debug-plugins.php
 
 		-
-			message: "#^Property Enlight_Components_Cron_Job\\:\\:\\$data \\(string\\) does not accept default value of type array\\.$#"
+			message: "#^Method Migrations_Migration218\\:\\:deletePluginByName\\(\\) has parameter \\$name with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Cron/Job.php
+			path: _sql/migrations/218-remove-old-debug-plugins.php
 
 		-
-			message: "#^Property Enlight_Components_Cron_Job\\:\\:\\$end \\(string\\) does not accept Zend_Date\\|null\\.$#"
+			message: "#^Method Migrations_Migration221\\:\\:deletePluginByName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Cron/Job.php
+			path: _sql/migrations/221-remove-log-plugin.php
 
 		-
-			message: "#^Property Enlight_Components_Cron_Job\\:\\:\\$options type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration221\\:\\:deletePluginByName\\(\\) has parameter \\$name with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Cron/Job.php
+			path: _sql/migrations/221-remove-log-plugin.php
 
 		-
-			message: "#^Method Enlight_Components_Cron_Manager\\:\\:disableJob\\(\\) should return Enlight_Components_Cron_Adapter but returns Enlight_Components_Cron_Manager\\.$#"
+			message: "#^Cannot call method fetchAll\\(\\) on PDOStatement\\|false\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Cron/Manager.php
+			path: _sql/migrations/367-mobile-statistics.php
 
 		-
-			message: "#^Method Enlight_Components_Cron_Manager\\:\\:endJob\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$variable_representation of function unserialize expects string, string\\|null given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Cron/Manager.php
+			path: _sql/migrations/370-optimize-performance.php
 
 		-
-			message: "#^Method Enlight_Components_Cron_Manager\\:\\:runJob\\(\\) should return Enlight_Event_EventArgs but returns Enlight_Event_EventArgs\\|null\\.$#"
+			message: "#^Method Migrations_Migration372\\:\\:addAcl\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Cron/Manager.php
+			path: _sql/migrations/372-setup-multi-edit.php
 
 		-
-			message: "#^PHPDoc tag @param for parameter \\$eventManager with type Enlight_Event_EventManager\\|null is not subtype of native type Enlight_Event_EventManager\\.$#"
+			message: "#^Method Migrations_Migration372\\:\\:addSampleData\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Cron/Manager.php
+			path: _sql/migrations/372-setup-multi-edit.php
 
 		-
-			message: "#^Parameter \\#1 \\$end of method Enlight_Components_Cron_Job\\:\\:setEnd\\(\\) expects string\\|Zend_Date\\|null, int\\|string given\\.$#"
+			message: "#^Method Migrations_Migration372\\:\\:createTables\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Cron/Manager.php
+			path: _sql/migrations/372-setup-multi-edit.php
 
 		-
-			message: "#^Parameter \\#1 \\$next of method Enlight_Components_Cron_Job\\:\\:setNext\\(\\) expects string\\|Zend_Date\\|null, float\\|int\\|string given\\.$#"
+			message: "#^Cannot call method fetch\\(\\) on PDOStatement\\|false\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Cron/Manager.php
+			path: _sql/migrations/386-import-multiedit-plugin-tables.php
 
 		-
-			message: "#^Property Enlight_Components_Cron_Manager\\:\\:\\$eventArgsClass has no type specified\\.$#"
+			message: "#^Method Migrations_Migration408\\:\\:cleanUp\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Cron/Manager.php
+			path: _sql/migrations/408-variant-price-surcharge-refactor.php
 
 		-
-			message: "#^Property Enlight_Components_Cron_Manager\\:\\:\\$eventManager \\(Enlight_Event_EventManager\\) does not accept Enlight_Event_EventManager\\|null\\.$#"
+			message: "#^Method Migrations_Migration408\\:\\:createNewTable\\(\\) should return string but return statement is missing\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Cron/Manager.php
+			path: _sql/migrations/408-variant-price-surcharge-refactor.php
 
 		-
-			message: "#^Cannot call method errorInfo\\(\\) on object\\|resource\\|null\\.$#"
+			message: "#^Method Migrations_Migration408\\:\\:migrateData\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Db/Adapter/Pdo/Mysql.php
+			path: _sql/migrations/408-variant-price-surcharge-refactor.php
 
 		-
-			message: "#^Method Enlight_Components_Db_Adapter_Pdo_Mysql\\:\\:createFromDbalConnectionAndConfig\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration408\\:\\:prepareOldData\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Db/Adapter/Pdo/Mysql.php
+			path: _sql/migrations/408-variant-price-surcharge-refactor.php
 
 		-
-			message: "#^Method Enlight_Components_Db_Adapter_Pdo_Mysql\\:\\:executeQuery\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration410\\:\\:addVideoElementFields\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Db/Adapter/Pdo/Mysql.php
+			path: _sql/migrations/410-add-emotion-fields.php
 
 		-
-			message: "#^Method Enlight_Components_Db_Adapter_Pdo_Mysql\\:\\:executeQuery\\(\\) has parameter \\$types with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration414\\:\\:addProductBoxLayoutColumn\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Db/Adapter/Pdo/Mysql.php
+			path: _sql/migrations/414-add-product-box-layout.php
 
 		-
-			message: "#^Method Enlight_Components_Db_Adapter_Pdo_Mysql\\:\\:executeUpdate\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration414\\:\\:addSearchProductBoxLayoutSwitch\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Db/Adapter/Pdo/Mysql.php
+			path: _sql/migrations/414-add-product-box-layout.php
 
 		-
-			message: "#^Method Enlight_Components_Db_Adapter_Pdo_Mysql\\:\\:executeUpdate\\(\\) has parameter \\$types with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration416\\:\\:removeCapabilityDummy\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Db/Adapter/Pdo/Mysql.php
+			path: _sql/migrations/416-remove-dummy-plugins.php
 
 		-
-			message: "#^Method Enlight_Components_Db_Adapter_Pdo_Mysql\\:\\:query\\(\\) has parameter \\$bind with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration416\\:\\:removeDummyDownloadUrl\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Db/Adapter/Pdo/Mysql.php
+			path: _sql/migrations/416-remove-dummy-plugins.php
 
 		-
-			message: "#^Negated boolean expression is always false\\.$#"
+			message: "#^Method Migrations_Migration416\\:\\:removeDummyPlugins\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Db/Adapter/Pdo/Mysql.php
+			path: _sql/migrations/416-remove-dummy-plugins.php
 
 		-
-			message: "#^Method Enlight_Components_Mail\\:\\:IsHTML\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration420\\:\\:deleteListeners\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Mail.php
+			path: _sql/migrations/420-remove-plugin-manager.php
 
 		-
-			message: "#^Method Enlight_Components_Mail\\:\\:__set\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration420\\:\\:deleteMenuItem\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Mail.php
+			path: _sql/migrations/420-remove-plugin-manager.php
 
 		-
-			message: "#^Method Enlight_Components_Mail\\:\\:__set\\(\\) has parameter \\$value with no type specified\\.$#"
+			message: "#^Method Migrations_Migration420\\:\\:deletePlugin\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Mail.php
+			path: _sql/migrations/420-remove-plugin-manager.php
 
 		-
-			message: "#^Method Enlight_Components_Mail\\:\\:getAsscociations\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration420\\:\\:fetchPluginId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Mail.php
+			path: _sql/migrations/420-remove-plugin-manager.php
 
 		-
-			message: "#^Method Enlight_Components_Mail\\:\\:getTo\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration421\\:\\:deleteConfigElements\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Mail.php
+			path: _sql/migrations/421-remove-store-api-plugin.php
 
 		-
-			message: "#^Method Enlight_Components_Mail\\:\\:setAssociations\\(\\) has parameter \\$associations with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration421\\:\\:deleteListeners\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Mail.php
+			path: _sql/migrations/421-remove-store-api-plugin.php
 
 		-
-			message: "#^Method Enlight_Components_Mail\\:\\:setTemplateName\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration421\\:\\:deletePlugin\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Mail.php
+			path: _sql/migrations/421-remove-store-api-plugin.php
 
 		-
-			message: "#^Property Enlight_Components_Mail\\:\\:\\$_plainBody \\(null\\) does not accept string\\.$#"
+			message: "#^Method Migrations_Migration421\\:\\:fetchPluginId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Mail.php
+			path: _sql/migrations/421-remove-store-api-plugin.php
 
 		-
-			message: "#^Property Enlight_Components_Mail\\:\\:\\$asscociations type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration425\\:\\:deleteOldTemplates\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Mail.php
+			path: _sql/migrations/425-remove-old-templates.php
 
 		-
-			message: "#^Class Enlight_Components_Session_Namespace implements generic interface ArrayAccess but does not specify its types\\: TKey, TValue$#"
+			message: "#^Method Migrations_Migration432\\:\\:up\\(\\) with return type void returns true but should not return anything\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Session/Namespace.php
+			path: _sql/migrations/432-html5-tags-for-snippets.php
 
 		-
-			message: "#^Method Enlight_Components_Session_Namespace\\:\\:__get\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration437\\:\\:getDefaultTranslationValues\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Session/Namespace.php
+			path: _sql/migrations/437-add-dirty-flag-email-translations.php
 
 		-
-			message: "#^Method Enlight_Components_Session_Namespace\\:\\:__set\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration437\\:\\:setEmailDirtyFlag\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Session/Namespace.php
+			path: _sql/migrations/437-add-dirty-flag-email-translations.php
 
 		-
-			message: "#^Method Enlight_Components_Session_Namespace\\:\\:__set\\(\\) has parameter \\$value with no type specified\\.$#"
+			message: "#^Method Migrations_Migration437\\:\\:setEmailTranslationDirtyFlag\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Session/Namespace.php
+			path: _sql/migrations/437-add-dirty-flag-email-translations.php
 
 		-
-			message: "#^Method Enlight_Components_Session_Namespace\\:\\:__unset\\(\\) with return type void returns mixed but should not return anything\\.$#"
+			message: "#^Method Migrations_Migration437\\:\\:setEmailTranslationsDirtyFlag\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Session/Namespace.php
+			path: _sql/migrations/437-add-dirty-flag-email-translations.php
 
 		-
-			message: "#^Method Enlight_Components_Session_Namespace\\:\\:clear\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration437\\:\\:setEmailsDirtyFlag\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Session/Namespace.php
+			path: _sql/migrations/437-add-dirty-flag-email-translations.php
 
 		-
-			message: "#^Method Enlight_Components_Session_Namespace\\:\\:ensureBackendSessionClosed\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration438\\:\\:addConfigFields\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Session/Namespace.php
+			path: _sql/migrations/438-add-email-template-header-footer-fields.php
 
 		-
-			message: "#^Method Enlight_Components_Session_Namespace\\:\\:ensureBackendSessionClosed\\(\\) has parameter \\$container with no type specified\\.$#"
+			message: "#^Method Migrations_Migration438\\:\\:fixContextData\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Session/Namespace.php
+			path: _sql/migrations/438-add-email-template-header-footer-fields.php
 
 		-
-			message: "#^Method Enlight_Components_Session_Namespace\\:\\:ensureFrontendSessionClosed\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration438\\:\\:updateEmailTemplate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Session/Namespace.php
+			path: _sql/migrations/438-add-email-template-header-footer-fields.php
 
 		-
-			message: "#^Method Enlight_Components_Session_Namespace\\:\\:ensureFrontendSessionClosed\\(\\) has parameter \\$container with no type specified\\.$#"
+			message: "#^Method Migrations_Migration438\\:\\:updateEmailTemplateTranslation\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Session/Namespace.php
+			path: _sql/migrations/438-add-email-template-header-footer-fields.php
 
 		-
-			message: "#^Method Enlight_Components_Session_Namespace\\:\\:ensureSessionClosed\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration438\\:\\:updateTemplate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Session/Namespace.php
+			path: _sql/migrations/438-add-email-template-header-footer-fields.php
 
 		-
-			message: "#^Method Enlight_Components_Session_Namespace\\:\\:ensureSessionClosed\\(\\) has parameter \\$container with no type specified\\.$#"
+			message: "#^Method Migrations_Migration438\\:\\:updateTemplates\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Session/Namespace.php
+			path: _sql/migrations/438-add-email-template-header-footer-fields.php
 
 		-
-			message: "#^Method Enlight_Components_Session_Namespace\\:\\:ensureSessionClosed\\(\\) has parameter \\$sessionServiceName with no type specified\\.$#"
+			message: "#^Method Migrations_Migration438\\:\\:updateTranslation\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Session/Namespace.php
+			path: _sql/migrations/438-add-email-template-header-footer-fields.php
 
 		-
-			message: "#^Method Enlight_Components_Session_Namespace\\:\\:unsetAll\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration438\\:\\:updateTranslations\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Session/Namespace.php
+			path: _sql/migrations/438-add-email-template-header-footer-fields.php
 
 		-
-			message: "#^Method Enlight_Components_Table\\:\\:_getReferenceMapNormalized\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#1 \\$content of method Migrations_Migration438\\:\\:convertTemplateHtml\\(\\) expects string, string\\|null given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Table.php
+			path: _sql/migrations/438-add-email-template-header-footer-fields.php
 
 		-
-			message: "#^Method Enlight_Components_Test_Plugin_TestCase\\:\\:createEventArgs\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration440\\:\\:updateTemplate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Test/Plugin/TestCase.php
+			path: _sql/migrations/440-fix-sorder-email-template.php
 
 		-
-			message: "#^Method Enlight_Components_Test_Plugin_TestCase\\:\\:createEventArgs\\(\\) has parameter \\$name with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration440\\:\\:updateTemplates\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Components/Test/Plugin/TestCase.php
+			path: _sql/migrations/440-fix-sorder-email-template.php
 
 		-
-			message: "#^Class Enlight_Config implements generic interface ArrayAccess but does not specify its types\\: TKey, TValue$#"
+			message: "#^Method Migrations_Migration440\\:\\:updateTranslation\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config.php
+			path: _sql/migrations/440-fix-sorder-email-template.php
 
 		-
-			message: "#^Method Enlight_Config\\:\\:__construct\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration440\\:\\:updateTranslations\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config.php
+			path: _sql/migrations/440-fix-sorder-email-template.php
 
 		-
-			message: "#^Method Enlight_Config\\:\\:getDirtyFields\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration444\\:\\:addImprintToBottomGroup\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config.php
+			path: _sql/migrations/444-add-imprint-to-bottom-shop-group.php
 
 		-
-			message: "#^Method Enlight_Config\\:\\:setExtends\\(\\) has parameter \\$extends with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration450\\:\\:updateAlbumSettings\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config.php
+			path: _sql/migrations/450-add-high-dpi-album-settings.php
 
 		-
-			message: "#^Method Enlight_Config\\:\\:setSection\\(\\) has parameter \\$section with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration450\\:\\:updateArticleAlbum\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config.php
+			path: _sql/migrations/450-add-high-dpi-album-settings.php
 
 		-
-			message: "#^Method Enlight_Config_Adapter\\:\\:__construct\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration450\\:\\:updateBannerAlbum\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config/Adapter.php
+			path: _sql/migrations/450-add-high-dpi-album-settings.php
 
 		-
-			message: "#^Method Enlight_Config_Adapter\\:\\:setOptions\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration450\\:\\:updateBlogAlbum\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config/Adapter.php
+			path: _sql/migrations/450-add-high-dpi-album-settings.php
 
 		-
-			message: "#^Method Enlight_Config_Adapter_DbTable\\:\\:delete\\(\\) has parameter \\$fields with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration450\\:\\:updateEmotionAlbum\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config/Adapter/DbTable.php
+			path: _sql/migrations/450-add-high-dpi-album-settings.php
 
 		-
-			message: "#^Method Enlight_Config_Adapter_DbTable\\:\\:readSection\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration458\\:\\:deleteConfigElements\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config/Adapter/DbTable.php
+			path: _sql/migrations/458-remove-selfhealing-plugin.php
 
 		-
-			message: "#^Method Enlight_Config_Adapter_DbTable\\:\\:setOptions\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration458\\:\\:deleteListeners\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config/Adapter/DbTable.php
+			path: _sql/migrations/458-remove-selfhealing-plugin.php
 
 		-
-			message: "#^Offset string on non\\-empty\\-array\\<int, string\\> in empty\\(\\) does not exist\\.$#"
+			message: "#^Method Migrations_Migration458\\:\\:deletePlugin\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config/Adapter/DbTable.php
+			path: _sql/migrations/458-remove-selfhealing-plugin.php
 
 		-
-			message: "#^Offset string on non\\-empty\\-array\\<int, string\\> in isset\\(\\) does not exist\\.$#"
-			count: 2
-			path: engine/Library/Enlight/Config/Adapter/DbTable.php
+			message: "#^Method Migrations_Migration458\\:\\:fetchPluginId\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: _sql/migrations/458-remove-selfhealing-plugin.php
 
 		-
-			message: "#^Parameter \\#1 \\$name of method Enlight_Config_Adapter_DbTable\\:\\:getTable\\(\\) expects null, string\\|null given\\.$#"
-			count: 3
-			path: engine/Library/Enlight/Config/Adapter/DbTable.php
+			message: "#^Method Migrations_Migration461\\:\\:updateTemplate\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: _sql/migrations/461-fix-sorder-email-thumbnails.php
 
 		-
-			message: "#^Return type \\(Enlight_Config_Adapter_DbTable\\) of method Enlight_Config_Adapter_DbTable\\:\\:read\\(\\) should be compatible with return type \\(Enlight_Config_Adapter_File\\) of method Enlight_Config_Adapter\\:\\:read\\(\\)$#"
+			message: "#^Method Migrations_Migration461\\:\\:updateTemplates\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config/Adapter/DbTable.php
+			path: _sql/migrations/461-fix-sorder-email-thumbnails.php
 
 		-
-			message: "#^Return type \\(Enlight_Config_Adapter_DbTable\\) of method Enlight_Config_Adapter_DbTable\\:\\:write\\(\\) should be compatible with return type \\(Enlight_Config_Adapter_File\\) of method Enlight_Config_Adapter\\:\\:write\\(\\)$#"
+			message: "#^Method Migrations_Migration461\\:\\:updateTranslation\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config/Adapter/DbTable.php
+			path: _sql/migrations/461-fix-sorder-email-thumbnails.php
 
 		-
-			message: "#^Method Enlight_Config_Adapter_File\\:\\:addConfigDir\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration461\\:\\:updateTranslations\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config/Adapter/File.php
+			path: _sql/migrations/461-fix-sorder-email-thumbnails.php
 
 		-
-			message: "#^Method Enlight_Config_Adapter_File\\:\\:setOptions\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration474\\:\\:updateTemplate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config/Adapter/File.php
+			path: _sql/migrations/474-switch-zipcode-city-emails.php
 
 		-
-			message: "#^Property Enlight_Config_Adapter_File\\:\\:\\$_configDir type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration474\\:\\:updateTemplate\\(\\) has parameter \\$contentHtml with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config/Adapter/File.php
+			path: _sql/migrations/474-switch-zipcode-city-emails.php
 
 		-
-			message: "#^Class Enlight_Config_BaseConfig implements generic interface Iterator but does not specify its types\\: TKey, TValue$#"
+			message: "#^Method Migrations_Migration474\\:\\:updateTemplates\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config/BaseConfig.php
+			path: _sql/migrations/474-switch-zipcode-city-emails.php
 
 		-
-			message: "#^Method Enlight_Config_BaseConfig\\:\\:__construct\\(\\) has parameter \\$array with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration474\\:\\:updateTranslation\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config/BaseConfig.php
+			path: _sql/migrations/474-switch-zipcode-city-emails.php
 
 		-
-			message: "#^Method Enlight_Config_BaseConfig\\:\\:_arrayMergeRecursive\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration474\\:\\:updateTranslation\\(\\) has parameter \\$contentHtml with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config/BaseConfig.php
+			path: _sql/migrations/474-switch-zipcode-city-emails.php
 
 		-
-			message: "#^Method Enlight_Config_BaseConfig\\:\\:getExtends\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration474\\:\\:updateTranslations\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config/BaseConfig.php
+			path: _sql/migrations/474-switch-zipcode-city-emails.php
 
 		-
-			message: "#^Method Enlight_Config_BaseConfig\\:\\:toArray\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration475\\:\\:insertTranslation\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config/BaseConfig.php
+			path: _sql/migrations/475-add-missing-emails.php
 
 		-
-			message: "#^Property Enlight_Config_BaseConfig\\:\\:\\$_extends type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration475\\:\\:updateEmail\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config/BaseConfig.php
+			path: _sql/migrations/475-add-missing-emails.php
 
 		-
-			message: "#^Method Enlight_Config_Format_Ini\\:\\:__construct\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration476\\:\\:addLessCompatibleFlag\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config/Format/Ini.php
+			path: _sql/migrations/476-add-less-compatible-flag.php
 
 		-
-			message: "#^Method Enlight_Config_Format_Ini\\:\\:__construct\\(\\) has parameter \\$section with no type specified\\.$#"
+			message: "#^Parameter \\#2 \\$haystack of function in_array expects array, array\\|false given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config/Format/Ini.php
+			path: _sql/migrations/476-add-less-compatible-flag.php
 
 		-
-			message: "#^Method Enlight_Config_Format_Ini\\:\\:_loadIniFile\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration477\\:\\:deleteConfigElements\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config/Format/Ini.php
+			path: _sql/migrations/477-disable-tag-cloud-for-installation.php
 
 		-
-			message: "#^Method Enlight_Config_Format_Ini\\:\\:_parseIniFile\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration477\\:\\:deleteListeners\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config/Format/Ini.php
+			path: _sql/migrations/477-disable-tag-cloud-for-installation.php
 
 		-
-			message: "#^Method Enlight_Config_Format_Ini\\:\\:_parseIniFile\\(\\) should return array but returns array\\|false\\.$#"
+			message: "#^Method Migrations_Migration477\\:\\:fetchPluginId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config/Format/Ini.php
+			path: _sql/migrations/477-disable-tag-cloud-for-installation.php
 
 		-
-			message: "#^Method Enlight_Config_Format_Ini\\:\\:_processKey\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration477\\:\\:uninstallPlugin\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config/Format/Ini.php
+			path: _sql/migrations/477-disable-tag-cloud-for-installation.php
 
 		-
-			message: "#^Method Enlight_Config_Format_Ini\\:\\:_processKey\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration485\\:\\:updateAlbumIcon\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config/Format/Ini.php
+			path: _sql/migrations/485-add-new-sprites-media-manager-albums.php
 
 		-
-			message: "#^Method Enlight_Config_Format_Ini\\:\\:_processSection\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration485\\:\\:updateAlbumIcon\\(\\) has parameter \\$albumId with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config/Format/Ini.php
+			path: _sql/migrations/485-add-new-sprites-media-manager-albums.php
 
 		-
-			message: "#^Method Enlight_Config_Format_Ini\\:\\:_processSection\\(\\) has parameter \\$iniArray with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration485\\:\\:updateAlbumIcon\\(\\) has parameter \\$icon with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config/Format/Ini.php
+			path: _sql/migrations/485-add-new-sprites-media-manager-albums.php
 
 		-
-			message: "#^Method Enlight_Config_Format_Ini\\:\\:_processSection\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration486\\:\\:createMobileSitemapElement\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config/Format/Ini.php
+			path: _sql/migrations/486-generate-mobile-sitemap.php
 
 		-
-			message: "#^Method Enlight_Config_Writer_Ini\\:\\:_addBranch\\(\\) has parameter \\$parents with no type specified\\.$#"
+			message: "#^Method Migrations_Migration486\\:\\:createSitemapForm\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config/Writer/Ini.php
+			path: _sql/migrations/486-generate-mobile-sitemap.php
 
 		-
-			message: "#^Method Enlight_Config_Writer_Ini\\:\\:_prepareValue\\(\\) has parameter \\$value with no type specified\\.$#"
+			message: "#^Method Migrations_Migration489\\:\\:updateProductMenu\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config/Writer/Ini.php
+			path: _sql/migrations/489-fix-backend-menu-icons.php
 
 		-
-			message: "#^Method Enlight_Config_Writer_Ini\\:\\:_prepareValue\\(\\) should return string but returns float\\|int\\.$#"
+			message: "#^Method Migrations_Migration490\\:\\:updateTemplate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config/Writer/Ini.php
+			path: _sql/migrations/490-fix-email-templates-images-height.php
 
 		-
-			message: "#^Method Enlight_Config_Writer_Ini\\:\\:setNestSeparator\\(\\) has parameter \\$separator with no type specified\\.$#"
+			message: "#^Method Migrations_Migration493\\:\\:removeTranslations\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config/Writer/Ini.php
+			path: _sql/migrations/493-remove-mail-translations.php
 
 		-
-			message: "#^PHPDoc tag @param has invalid value \\(Enlight_Config_BaseConfig\\)\\: Unexpected token \"\\\\n     \\*\", expected variable at offset 220$#"
+			message: "#^Method Migrations_Migration497\\:\\:updateTemplate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config/Writer/Ini.php
+			path: _sql/migrations/497-fix-email-payment-method-description.php
 
 		-
-			message: "#^Method Enlight_Config_Writer_Writer\\:\\:__construct\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration503\\:\\:insertConfigElementTranslations\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config/Writer/Writer.php
+			path: _sql/migrations/503-rename-multi-edit.php
 
 		-
-			message: "#^Method Enlight_Config_Writer_Writer\\:\\:setOptions\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration503\\:\\:insertConfigElements\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config/Writer/Writer.php
+			path: _sql/migrations/503-rename-multi-edit.php
 
 		-
-			message: "#^Property Enlight_Config_Writer_Writer\\:\\:\\$_skipOptions type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration503\\:\\:insertConfigForm\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Config/Writer/Writer.php
+			path: _sql/migrations/503-rename-multi-edit.php
 
 		-
-			message: "#^Method Enlight_Controller_Action\\:\\:__call\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration503\\:\\:updateMultiEditName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Action.php
+			path: _sql/migrations/503-rename-multi-edit.php
 
 		-
-			message: "#^Method Enlight_Controller_Action\\:\\:__call\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration600\\:\\:updateDescription\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Action.php
+			path: _sql/migrations/600-add-support-max-generated-similar-products.php
 
 		-
-			message: "#^Method Enlight_Controller_Action\\:\\:createForm\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration600\\:\\:updateTranslatedDescription\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Action.php
+			path: _sql/migrations/600-add-support-max-generated-similar-products.php
 
 		-
-			message: "#^Method Enlight_Controller_Action\\:\\:createForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
+			message: "#^Method Migrations_Migration603\\:\\:createEmotionComponent\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Action.php
+			path: _sql/migrations/603-add-product-streams.php
 
 		-
-			message: "#^Method Enlight_Controller_Action\\:\\:dispatch\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration604\\:\\:getSnippetName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Action.php
+			path: _sql/migrations/604-move-discount-surchage-names-into-snippets.php
 
 		-
-			message: "#^Method Enlight_Controller_Action\\:\\:forward\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration604\\:\\:getSnippetName\\(\\) has parameter \\$configName with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Action.php
+			path: _sql/migrations/604-move-discount-surchage-names-into-snippets.php
 
 		-
-			message: "#^Method Enlight_Controller_Action\\:\\:forward\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration604\\:\\:hideBasicSettings\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Action.php
+			path: _sql/migrations/604-move-discount-surchage-names-into-snippets.php
 
 		-
-			message: "#^Method Enlight_Controller_Action\\:\\:get\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration604\\:\\:migrateCoreSettingsToSnippets\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Action.php
+			path: _sql/migrations/604-move-discount-surchage-names-into-snippets.php
 
 		-
-			message: "#^Method Enlight_Controller_Action\\:\\:getActionArguments\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration605\\:\\:insertConfigElementTranslations\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Action.php
+			path: _sql/migrations/605-add-and-search-config.php
 
 		-
-			message: "#^Method Enlight_Controller_Action\\:\\:initController\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration605\\:\\:insertConfigElements\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Action.php
+			path: _sql/migrations/605-add-and-search-config.php
 
 		-
-			message: "#^Method Enlight_Controller_Action\\:\\:redirect\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration608\\:\\:up\\(\\) with return type void returns string but should not return anything\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Action.php
+			path: _sql/migrations/608-fix-product-stream-icon.php
 
 		-
-			message: "#^Method Enlight_Controller_Action\\:\\:redirect\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration609\\:\\:addAlbum\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Action.php
+			path: _sql/migrations/609-add-media-recycling.php
 
 		-
-			message: "#^Method Enlight_Controller_Action\\:\\:redirect\\(\\) has parameter \\$url with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration609\\:\\:createCronJob\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Action.php
+			path: _sql/migrations/609-add-media-recycling.php
 
 		-
-			message: "#^Method Enlight_Controller_Action\\:\\:setContainer\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration616\\:\\:updateProductStreamEmotionField\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Action.php
+			path: _sql/migrations/616-product-stream-emotion-field.php
 
 		-
-			message: "#^Parameter \\#2 \\$controller of method Symfony\\\\Component\\\\HttpKernel\\\\Controller\\\\ArgumentResolver\\:\\:getArguments\\(\\) expects callable\\(\\)\\: mixed, array\\{\\$this\\(Enlight_Controller_Action\\), string\\} given\\.$#"
+			message: "#^Method Migrations_Migration620\\:\\:addTimedDeliveryColumn\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Action.php
+			path: _sql/migrations/620-add-delivered-in-future-column.php
 
 		-
-			message: "#^Property Enlight_Controller_Action\\:\\:\\$container \\(Shopware\\\\Components\\\\DependencyInjection\\\\Container\\) does not accept Shopware\\\\Components\\\\DependencyInjection\\\\Container\\|null\\.$#"
+			message: "#^Parameter \\#2 \\$haystack of function in_array expects array, array\\|false given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Action.php
+			path: _sql/migrations/620-add-delivered-in-future-column.php
 
 		-
-			message: "#^Property Enlight_Controller_Action\\:\\:\\$view \\(Enlight_View_Default\\) does not accept Enlight_View\\.$#"
+			message: "#^Method Migrations_Migration625\\:\\:updateProductMenu\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Action.php
+			path: _sql/migrations/625-rename-feedback.php
 
 		-
-			message: "#^Method Enlight_Controller_Dispatcher\\:\\:dispatch\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration626\\:\\:replaceOldVarSyntax\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Dispatcher.php
+			path: _sql/migrations/626-fix-email-template-variables.php
 
 		-
-			message: "#^Property Enlight_Controller_Dispatcher\\:\\:\\$response \\(Enlight_Controller_Response_Response\\) does not accept Enlight_Controller_Response_Response\\|null\\.$#"
+			message: "#^Method Migrations_Migration626\\:\\:replaceOldVarSyntax\\(\\) has parameter \\$content with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Dispatcher.php
+			path: _sql/migrations/626-fix-email-template-variables.php
 
 		-
-			message: "#^Cannot clone object\\|null\\.$#"
+			message: "#^Method Migrations_Migration636\\:\\:updateCmsSupport\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Dispatcher/Default.php
+			path: _sql/migrations/636-streamline-german-email-wording.php
 
 		-
-			message: "#^Method Enlight_Controller_Dispatcher_Default\\:\\:__construct\\(\\) has parameter \\$controllers with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration636\\:\\:updateCmsSupportFields\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Dispatcher/Default.php
+			path: _sql/migrations/636-streamline-german-email-wording.php
 
 		-
-			message: "#^Method Enlight_Controller_Dispatcher_Default\\:\\:dispatch\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration636\\:\\:updateCoreConfigElements\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Dispatcher/Default.php
+			path: _sql/migrations/636-streamline-german-email-wording.php
 
 		-
-			message: "#^Method Enlight_Controller_Dispatcher_Default\\:\\:getModules\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration636\\:\\:updateCoreConfigForms\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Dispatcher/Default.php
+			path: _sql/migrations/636-streamline-german-email-wording.php
 
 		-
-			message: "#^Method Enlight_Controller_Dispatcher_Default\\:\\:setModules\\(\\) has parameter \\$modules with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration636\\:\\:updateCoreMenu\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Dispatcher/Default.php
+			path: _sql/migrations/636-streamline-german-email-wording.php
 
 		-
-			message: "#^Parameter \\#1 \\$classname of function class_exists expects string, string\\|null given\\.$#"
+			message: "#^Method Migrations_Migration636\\:\\:updateEmailTemplateHtml\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Dispatcher/Default.php
+			path: _sql/migrations/636-streamline-german-email-wording.php
 
 		-
-			message: "#^Parameter \\#1 \\$content of method Enlight_Controller_Response_Response\\:\\:appendBody\\(\\) expects string, string\\|false given\\.$#"
+			message: "#^Method Migrations_Migration636\\:\\:updateFormLabels\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Dispatcher/Default.php
+			path: _sql/migrations/636-streamline-german-email-wording.php
 
 		-
-			message: "#^Parameter \\#1 \\$request of method Enlight_Controller_Action\\:\\:initController\\(\\) expects Enlight_Controller_Request_RequestHttp, Enlight_Controller_Request_Request given\\.$#"
+			message: "#^Method Migrations_Migration636\\:\\:updateTemplateHtml\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Dispatcher/Default.php
+			path: _sql/migrations/636-streamline-german-email-wording.php
 
 		-
-			message: "#^Parameter \\#2 \\$response of method Enlight_Controller_Action\\:\\:initController\\(\\) expects Enlight_Controller_Response_ResponseHttp, Enlight_Controller_Response_Response given\\.$#"
+			message: "#^Method Migrations_Migration703\\:\\:addComponentFields\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Dispatcher/Default.php
+			path: _sql/migrations/703-activate-html-code-widget-by-default.php
 
 		-
-			message: "#^Property Enlight_Controller_Dispatcher_Default\\:\\:\\$controllers type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration703\\:\\:addComponentToLibrary\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Dispatcher/Default.php
+			path: _sql/migrations/703-activate-html-code-widget-by-default.php
 
 		-
-			message: "#^Property Enlight_Controller_Dispatcher_Default\\:\\:\\$modules type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration703\\:\\:fetchComponentId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Dispatcher/Default.php
+			path: _sql/migrations/703-activate-html-code-widget-by-default.php
 
 		-
-			message: "#^Method Enlight_Controller_Front\\:\\:Dispatcher\\(\\) should return Enlight_Controller_Dispatcher_Default but returns Enlight_Controller_Dispatcher\\.$#"
+			message: "#^Method Migrations_Migration703\\:\\:renameHtmlElement\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Front.php
+			path: _sql/migrations/703-activate-html-code-widget-by-default.php
 
 		-
-			message: "#^Method Enlight_Controller_Front\\:\\:getParam\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration705\\:\\:emptyCustomTemplates\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Front.php
+			path: _sql/migrations/705-rename-category-template-column.php
 
 		-
-			message: "#^Method Enlight_Controller_Front\\:\\:getParam\\(\\) has parameter \\$name with no type specified\\.$#"
+			message: "#^Method Migrations_Migration705\\:\\:updateCustomTemplates\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Front.php
+			path: _sql/migrations/705-rename-category-template-column.php
 
 		-
-			message: "#^Method Enlight_Controller_Front\\:\\:getParams\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration705\\:\\:updateSnippets\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Front.php
+			path: _sql/migrations/705-rename-category-template-column.php
 
 		-
-			message: "#^Method Enlight_Controller_Front\\:\\:setParam\\(\\) has parameter \\$value with no type specified\\.$#"
+			message: "#^Method Migrations_Migration708\\:\\:convertAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Front.php
+			path: _sql/migrations/708-attribute-administration.php
 
 		-
-			message: "#^Method Enlight_Controller_Front\\:\\:setParams\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration708\\:\\:convertAttribute\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Front.php
+			path: _sql/migrations/708-attribute-administration.php
 
 		-
-			message: "#^Method Enlight_Controller_Front\\:\\:setRequest\\(\\) has parameter \\$request with no type specified\\.$#"
+			message: "#^Method Migrations_Migration709\\:\\:changeConfusingVatLabel\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Front.php
+			path: _sql/migrations/709-add-user-addresses.php
 
 		-
-			message: "#^Method Enlight_Controller_Front\\:\\:setResponse\\(\\) has parameter \\$response with no type specified\\.$#"
+			message: "#^Method Migrations_Migration709\\:\\:createAddressTable\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Front.php
+			path: _sql/migrations/709-add-user-addresses.php
 
 		-
-			message: "#^Negated boolean expression is always false\\.$#"
-			count: 4
-			path: engine/Library/Enlight/Controller/Front.php
+			message: "#^Method Migrations_Migration709\\:\\:createDefaultShippingBillingRelations\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: _sql/migrations/709-add-user-addresses.php
 
 		-
-			message: "#^PHPDoc tag @param for parameter \\$plugins with type Enlight_Plugin_Namespace\\|string is not subtype of native type Enlight_Plugin_Namespace\\|null\\.$#"
+			message: "#^Method Migrations_Migration709\\:\\:removeCompanySalutation\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Front.php
+			path: _sql/migrations/709-add-user-addresses.php
 
 		-
-			message: "#^Parameter \\#1 \\$request of method Symfony\\\\Component\\\\HttpFoundation\\\\RequestStack\\:\\:push\\(\\) expects Symfony\\\\Component\\\\HttpFoundation\\\\Request, Enlight_Controller_Request_Request given\\.$#"
+			message: "#^Method Migrations_Migration711\\:\\:createMigrationFields\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Front.php
+			path: _sql/migrations/711-create-address-migrate-table.php
 
 		-
-			message: "#^Property Enlight_Controller_Front\\:\\:\\$invokeParams type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration719\\:\\:applyAttributeSchema\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Front.php
+			path: _sql/migrations/719-create-address-attribute-tables.php
 
 		-
-			message: "#^Property Enlight_Controller_Front\\:\\:\\$plugins \\(Enlight_Plugin_Namespace_Loader\\) does not accept Enlight_Plugin_Namespace\\.$#"
+			message: "#^Method Migrations_Migration719\\:\\:createAddressAttributeTable\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Front.php
+			path: _sql/migrations/719-create-address-attribute-tables.php
 
 		-
-			message: "#^Property Enlight_Controller_Front\\:\\:\\$response \\(Enlight_Controller_Response_ResponseHttp\\) does not accept Enlight_Controller_Response_Response\\.$#"
+			message: "#^Method Migrations_Migration775\\:\\:createUniqueIndex\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Front.php
+			path: _sql/migrations/775-add-asset-version-config-element.php
 
 		-
-			message: "#^Method Enlight_Controller_Plugins_Json_Bootstrap\\:\\:convertDateTime\\(\\) has no return type specified\\.$#"
+			message: "#^Cannot call method rowCount\\(\\) on PDOStatement\\|false\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php
+			path: _sql/migrations/776-fix-alter-ignore-migrations.php
 
 		-
-			message: "#^Method Enlight_Controller_Plugins_Json_Bootstrap\\:\\:convertDateTime\\(\\) has parameter \\$key with no type specified\\.$#"
+			message: "#^Method Migrations_Migration779\\:\\:fixCustomerBlacklists\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php
+			path: _sql/migrations/779-fixing-bot-detection-ios.php
 
 		-
-			message: "#^Method Enlight_Controller_Plugins_Json_Bootstrap\\:\\:convertToJson\\(\\) has parameter \\$data with no type specified\\.$#"
+			message: "#^Method Migrations_Migration779\\:\\:fixStandardBlacklist\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php
+			path: _sql/migrations/779-fixing-bot-detection-ios.php
 
 		-
-			message: "#^Method Enlight_Controller_Plugins_Json_Bootstrap\\:\\:convertToJson\\(\\) should return string but returns string\\|null\\.$#"
+			message: "#^Parameter \\#1 \\$botConfiguration of method Migrations_Migration779\\:\\:getFilteredBotList\\(\\) expects string, string\\|null given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php
+			path: _sql/migrations/779-fixing-bot-detection-ios.php
 
 		-
-			message: "#^Method Enlight_Controller_Plugins_Json_Bootstrap\\:\\:convertToUtf8\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration785\\:\\:addConnectMenu\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php
+			path: _sql/migrations/785-add-connect-default-menu.php
 
 		-
-			message: "#^Method Enlight_Controller_Plugins_Json_Bootstrap\\:\\:convertToUtf8\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration785\\:\\:updateHelpMenuPosition\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php
+			path: _sql/migrations/785-add-connect-default-menu.php
 
 		-
-			message: "#^Method Enlight_Controller_Plugins_Json_Bootstrap\\:\\:init\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration792\\:\\:deletePluginFormEntry\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php
+			path: _sql/migrations/792-add-send-registration-email-confirmation-config.php
 
 		-
-			message: "#^Method Enlight_Controller_Plugins_Json_Bootstrap\\:\\:onPostDispatch\\(\\) should return bool but empty return statement found\\.$#"
-			count: 2
-			path: engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php
+			message: "#^Parameter \\#1 \\$string of method PDO\\:\\:quote\\(\\) expects string, int\\<min, \\-1\\>\\|int\\<1, max\\>\\|string given\\.$#"
+			count: 1
+			path: _sql/migrations/796-add-uniqueid-config-element.php
 
 		-
-			message: "#^Method Enlight_Controller_Plugins_Json_Bootstrap\\:\\:onPostDispatch\\(\\) should return bool but return statement is missing\\.$#"
+			message: "#^Method Migrations_Migration799\\:\\:prepare\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php
+			path: _sql/migrations/799-attribute-translation-fix-1-of-10.php
 
 		-
-			message: "#^Possibly invalid array key type array\\|string\\.$#"
+			message: "#^Method Migrations_Migration813\\:\\:migrateBackendSession\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php
+			path: _sql/migrations/813-session-expiry.php
 
 		-
-			message: "#^Property Enlight_Controller_Plugins_Json_Bootstrap\\:\\:\\$padding \\(string\\) does not accept bool\\.$#"
+			message: "#^Method Migrations_Migration813\\:\\:migrateFrontendSession\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php
+			path: _sql/migrations/813-session-expiry.php
 
 		-
-			message: "#^Property Enlight_Controller_Plugins_Json_Bootstrap\\:\\:\\$padding \\(string\\) does not accept null\\.$#"
+			message: "#^Method Migrations_Migration900\\:\\:cleanupLastArticlesTable\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php
+			path: _sql/migrations/900-add-last-articles-config-elements.php
 
 		-
-			message: "#^Property Enlight_Controller_Plugins_Json_Bootstrap\\:\\:\\$padding \\(string\\) does not accept string\\|null\\.$#"
+			message: "#^Method Migrations_Migration900\\:\\:removeLastArticlesPlugin\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php
+			path: _sql/migrations/900-add-last-articles-config-elements.php
 
 		-
-			message: "#^Property Enlight_Controller_Plugins_Json_Bootstrap\\:\\:\\$renderer \\(bool\\) does not accept null\\.$#"
+			message: "#^Method Migrations_Migration900\\:\\:renameConfigElementKeys\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php
+			path: _sql/migrations/900-add-last-articles-config-elements.php
 
 		-
-			message: "#^Strict comparison using \\=\\=\\= between Enlight_Plugin_PluginCollection and null will always evaluate to false\\.$#"
+			message: "#^Method Migrations_Migration902\\:\\:removeAclPermissions\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php
+			path: _sql/migrations/902-remove-import-export-legacy-module.php
 
 		-
-			message: "#^Strict comparison using \\=\\=\\= between string and true will always evaluate to false\\.$#"
+			message: "#^Method Migrations_Migration902\\:\\:removeMenuEntry\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php
+			path: _sql/migrations/902-remove-import-export-legacy-module.php
 
 		-
-			message: "#^Method Enlight_Controller_Plugins_JsonRequest_Bootstrap\\:\\:getPadding\\(\\) should return string but returns bool\\.$#"
+			message: "#^Method Migrations_Migration903\\:\\:addNewMenuEntry\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/JsonRequest/Bootstrap.php
+			path: _sql/migrations/903-add-menu-import-export-advanced.php
 
 		-
-			message: "#^Method Enlight_Controller_Plugins_JsonRequest_Bootstrap\\:\\:init\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration903\\:\\:fetchContentMenuId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/JsonRequest/Bootstrap.php
+			path: _sql/migrations/903-add-menu-import-export-advanced.php
 
 		-
-			message: "#^Method Enlight_Controller_Plugins_JsonRequest_Bootstrap\\:\\:onPreDispatch\\(\\) should return bool but return statement is missing\\.$#"
+			message: "#^Method Migrations_Migration917\\:\\:addCategorySortings\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/JsonRequest/Bootstrap.php
+			path: _sql/migrations/917-add-sorting-module.php
 
 		-
-			message: "#^Method Enlight_Controller_Plugins_JsonRequest_Bootstrap\\:\\:setPadding\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration917\\:\\:addDefaultSortings\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/JsonRequest/Bootstrap.php
+			path: _sql/migrations/917-add-sorting-module.php
 
 		-
-			message: "#^Method Enlight_Controller_Plugins_JsonRequest_Bootstrap\\:\\:setPadding\\(\\) has parameter \\$padding with no type specified\\.$#"
+			message: "#^Method Migrations_Migration917\\:\\:addSearchConfiguration\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/JsonRequest/Bootstrap.php
+			path: _sql/migrations/917-add-sorting-module.php
 
 		-
-			message: "#^Method Enlight_Controller_Plugins_JsonRequest_Bootstrap\\:\\:setParseParams\\(\\) has parameter \\$parseParams with no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration917\\:\\:addSortingModule\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/JsonRequest/Bootstrap.php
+			path: _sql/migrations/917-add-sorting-module.php
 
 		-
-			message: "#^Parameter \\#1 \\$spec of method Enlight_Controller_Request_RequestHttp\\:\\:setPost\\(\\) expects array\\|string, bool given\\.$#"
+			message: "#^Method Migrations_Migration917\\:\\:addSortingsToProductStreams\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/JsonRequest/Bootstrap.php
+			path: _sql/migrations/917-add-sorting-module.php
 
 		-
-			message: "#^Property Enlight_Controller_Plugins_JsonRequest_Bootstrap\\:\\:\\$padding \\(bool\\) does not accept null\\.$#"
+			message: "#^Method Migrations_Migration917\\:\\:getExistingSortingTranslations\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/JsonRequest/Bootstrap.php
+			path: _sql/migrations/917-add-sorting-module.php
 
 		-
-			message: "#^Property Enlight_Controller_Plugins_JsonRequest_Bootstrap\\:\\:\\$parseParams type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration917\\:\\:importProductStreamSortings\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/JsonRequest/Bootstrap.php
+			path: _sql/migrations/917-add-sorting-module.php
 
 		-
-			message: "#^Strict comparison using \\=\\=\\= between Enlight_Plugin_PluginCollection and null will always evaluate to false\\.$#"
+			message: "#^Method Migrations_Migration917\\:\\:importSortingTranslations\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/JsonRequest/Bootstrap.php
+			path: _sql/migrations/917-add-sorting-module.php
 
 		-
-			message: "#^Call to an undefined method Enlight_Event_EventArgs\\:\\:getSubject\\(\\)\\.$#"
+			message: "#^Method Migrations_Migration917\\:\\:moveCategoryDefaultSorting\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/ScriptRenderer/Bootstrap.php
+			path: _sql/migrations/917-add-sorting-module.php
 
 		-
-			message: "#^Method Enlight_Controller_Plugins_ScriptRenderer_Bootstrap\\:\\:camelCaseToUnderScore\\(\\) should return string but returns string\\|null\\.$#"
+			message: "#^Parameter \\#1 \\$sorting of method Migrations_Migration917\\:\\:getIdOfStreamSorting\\(\\) expects string, string\\|null given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/ScriptRenderer/Bootstrap.php
+			path: _sql/migrations/917-add-sorting-module.php
 
 		-
-			message: "#^Method Enlight_Controller_Plugins_ScriptRenderer_Bootstrap\\:\\:getTemplateName\\(\\) should return string but returns null\\.$#"
+			message: "#^Parameter \\#1 \\$str of function md5 expects string, string\\|null given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/ScriptRenderer/Bootstrap.php
+			path: _sql/migrations/917-add-sorting-module.php
 
 		-
-			message: "#^Method Enlight_Controller_Plugins_ScriptRenderer_Bootstrap\\:\\:init\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$translationShopId of method Migrations_Migration917\\:\\:getExistingSortingTranslations\\(\\) expects int, string given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/ScriptRenderer/Bootstrap.php
+			path: _sql/migrations/917-add-sorting-module.php
 
 		-
-			message: "#^Method Enlight_Controller_Plugins_ScriptRenderer_Bootstrap\\:\\:onPreDispatch\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#2 \\$localeId of method Migrations_Migration917\\:\\:getExistingSortingTranslations\\(\\) expects int, string\\|null given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/ScriptRenderer/Bootstrap.php
+			path: _sql/migrations/917-add-sorting-module.php
 
 		-
-			message: "#^Parameter \\#1 \\$str of function trim expects string, array\\|string\\|null given\\.$#"
+			message: "#^Parameter \\#3 \\$subject of function str_replace expects array\\|string, string\\|null given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/ScriptRenderer/Bootstrap.php
+			path: _sql/migrations/917-add-sorting-module.php
 
 		-
-			message: "#^Parameter \\#3 \\$subject of function preg_replace expects array\\|string, string\\|null given\\.$#"
-			count: 2
-			path: engine/Library/Enlight/Controller/Plugins/ScriptRenderer/Bootstrap.php
+			message: "#^Method Migrations_Migration918\\:\\:addCategoryConfig\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: _sql/migrations/918-add-facet-module.php
 
 		-
-			message: "#^Property Enlight_Controller_Plugins_ScriptRenderer_Bootstrap\\:\\:\\$headers type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration918\\:\\:addModule\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/ScriptRenderer/Bootstrap.php
+			path: _sql/migrations/918-add-facet-module.php
 
 		-
-			message: "#^Property Enlight_Controller_Plugins_ScriptRenderer_Bootstrap\\:\\:\\$viewRenderer \\(Enlight_Controller_Plugins_ViewRenderer_Bootstrap\\) does not accept Enlight_Plugin_Bootstrap\\|Enlight_Plugin_Namespace\\|null\\.$#"
+			message: "#^Method Migrations_Migration918\\:\\:addNewCategoryFilterParam\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/ScriptRenderer/Bootstrap.php
+			path: _sql/migrations/918-add-facet-module.php
 
 		-
-			message: "#^Strict comparison using \\=\\=\\= between string and null will always evaluate to false\\.$#"
+			message: "#^Method Migrations_Migration918\\:\\:createSearchFacets\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/ScriptRenderer/Bootstrap.php
+			path: _sql/migrations/918-add-facet-module.php
 
 		-
-			message: "#^Call to an undefined method Enlight_Event_EventArgs\\:\\:getSubject\\(\\)\\.$#"
-			count: 2
-			path: engine/Library/Enlight/Controller/Plugins/ViewRenderer/Bootstrap.php
+			message: "#^Method Migrations_Migration918\\:\\:getExistingSortingTranslations\\(\\) return type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: _sql/migrations/918-add-facet-module.php
 
 		-
-			message: "#^Method Enlight_Controller_Plugins_ViewRenderer_Bootstrap\\:\\:init\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration918\\:\\:importDefaultFacets\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/ViewRenderer/Bootstrap.php
+			path: _sql/migrations/918-add-facet-module.php
 
 		-
-			message: "#^Method Enlight_Controller_Plugins_ViewRenderer_Bootstrap\\:\\:initEngine\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration918\\:\\:importFacetTranslations\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/ViewRenderer/Bootstrap.php
+			path: _sql/migrations/918-add-facet-module.php
 
 		-
-			message: "#^Method Enlight_Controller_Plugins_ViewRenderer_Bootstrap\\:\\:initView\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$translationShopId of method Migrations_Migration918\\:\\:getExistingSortingTranslations\\(\\) expects int, string given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/ViewRenderer/Bootstrap.php
+			path: _sql/migrations/918-add-facet-module.php
 
 		-
-			message: "#^Method Enlight_Controller_Plugins_ViewRenderer_Bootstrap\\:\\:onActionInit\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$variable_representation of function unserialize expects string, string\\|null given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/ViewRenderer/Bootstrap.php
+			path: _sql/migrations/918-add-facet-module.php
 
 		-
-			message: "#^Method Enlight_Controller_Plugins_ViewRenderer_Bootstrap\\:\\:onDispatchLoopStartup\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#2 \\$localeId of method Migrations_Migration918\\:\\:getExistingSortingTranslations\\(\\) expects int, string\\|null given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/ViewRenderer/Bootstrap.php
+			path: _sql/migrations/918-add-facet-module.php
 
 		-
-			message: "#^Method Enlight_Controller_Plugins_ViewRenderer_Bootstrap\\:\\:onPostDispatch\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration919\\:\\:addVariantSelectionProductElement\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/ViewRenderer/Bootstrap.php
+			path: _sql/migrations/919-change-article-emotion-elements.php
 
 		-
-			message: "#^Method Enlight_Controller_Plugins_ViewRenderer_Bootstrap\\:\\:onPreDispatch\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration919\\:\\:addVariantSelectionProductSlider\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/ViewRenderer/Bootstrap.php
+			path: _sql/migrations/919-change-article-emotion-elements.php
 
 		-
-			message: "#^Method Enlight_View_Default\\:\\:render\\(\\) invoked with 1 parameter, 0 required\\.$#"
+			message: "#^Method Migrations_Migration919\\:\\:changeSelectedProductsOfProductSlider\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/ViewRenderer/Bootstrap.php
+			path: _sql/migrations/919-change-article-emotion-elements.php
 
 		-
-			message: "#^Negated boolean expression is always false\\.$#"
+			message: "#^Method Migrations_Migration919\\:\\:convertSelectedProductsOfProductSlider\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/ViewRenderer/Bootstrap.php
+			path: _sql/migrations/919-change-article-emotion-elements.php
 
 		-
-			message: "#^PHPDoc tag @return has invalid value \\(\\)\\: Unexpected token \"\\\\n     \", expected type at offset 278$#"
+			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|null given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Plugins/ViewRenderer/Bootstrap.php
+			path: _sql/migrations/919-change-article-emotion-elements.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_Request\\:\\:__get\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration926\\:\\:createPresetsTable\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/Request.php
+			path: _sql/migrations/926-add-emotion-presets.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_Request\\:\\:__set\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration926\\:\\:createPresetsTranslationTable\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/Request.php
+			path: _sql/migrations/926-add-emotion-presets.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_Request\\:\\:__set\\(\\) has parameter \\$value with no type specified\\.$#"
+			message: "#^Method Migrations_Migration940\\:\\:updateMenuEntry\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/Request.php
+			path: _sql/migrations/940-fix-import-export-menu-entry.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_Request\\:\\:get\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration944\\:\\:replaceTranslations\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/Request.php
+			path: _sql/migrations/944-update-german-translations.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_Request\\:\\:getAttribute\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration961\\:\\:fixEmailDirtyFlag\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/Request.php
+			path: _sql/migrations/961-update-email-templates.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_Request\\:\\:getParam\\(\\) has no return type specified\\.$#"
+			message: "#^Method Migrations_Migration961\\:\\:updateEmailFooterHtml\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/Request.php
+			path: _sql/migrations/961-update-email-templates.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_Request\\:\\:getParam\\(\\) has parameter \\$key with no type specified\\.$#"
+			message: "#^Method Migrations_Migration961\\:\\:updateEmailFooterPlain\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/Request.php
+			path: _sql/migrations/961-update-email-templates.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_Request\\:\\:getParamSources\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Migrations_Migration961\\:\\:updateEmailTemplates\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/Request.php
+			path: _sql/migrations/961-update-email-templates.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_Request\\:\\:getParams\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Cannot call method fetch\\(\\) on PDOStatement\\|false\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/Request.php
+			path: _sql/migrations/common/AttributeTranslationMigrationHelper.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_Request\\:\\:getUserParam\\(\\) has no return type specified\\.$#"
+			message: "#^Cannot call method fetchAll\\(\\) on PDOStatement\\|false\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/Request.php
+			path: _sql/migrations/common/AttributeTranslationMigrationHelper.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_Request\\:\\:getUserParams\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method AttributeTranslationMigrationHelper\\:\\:filter\\(\\) has parameter \\$columns with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/Request.php
+			path: _sql/migrations/common/AttributeTranslationMigrationHelper.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_Request\\:\\:replacePost\\(\\) has no return type specified\\.$#"
+			message: "#^Method AttributeTranslationMigrationHelper\\:\\:filter\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/Request.php
+			path: _sql/migrations/common/AttributeTranslationMigrationHelper.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_Request\\:\\:replacePost\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method AttributeTranslationMigrationHelper\\:\\:filter\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/Request.php
+			path: _sql/migrations/common/AttributeTranslationMigrationHelper.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_Request\\:\\:set\\(\\) has no return type specified\\.$#"
+			message: "#^Method AttributeTranslationMigrationHelper\\:\\:getUpdatedTranslations\\(\\) has parameter \\$rows with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/Request.php
+			path: _sql/migrations/common/AttributeTranslationMigrationHelper.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_Request\\:\\:set\\(\\) has parameter \\$value with no type specified\\.$#"
+			message: "#^Method AttributeTranslationMigrationHelper\\:\\:underscoreToCamelCase\\(\\) should return string but returns string\\|null\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/Request.php
+			path: _sql/migrations/common/AttributeTranslationMigrationHelper.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_Request\\:\\:setAttribute\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$array of function array_column expects array, array\\|false given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/Request.php
+			path: _sql/migrations/common/AttributeTranslationMigrationHelper.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_Request\\:\\:setBaseUrl\\(\\) has parameter \\$baseUrl with no type specified\\.$#"
+			message: "#^Variable \\$rows in empty\\(\\) always exists and is not falsy\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/Request.php
+			path: _sql/migrations/common/AttributeTranslationMigrationHelper.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_Request\\:\\:setHeader\\(\\) has parameter \\$value with no type specified\\.$#"
+			message: "#^Argument of an invalid type array\\|false supplied for foreach, only iterables are supported\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/Request.php
+			path: _sql/migrations/common/MigrationHelper.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_Request\\:\\:setParam\\(\\) has parameter \\$key with no type specified\\.$#"
+			message: "#^Method SitemapConfigMigrationHelper\\:\\:migrateCustomUrls\\(\\) has parameter \\$customUrls with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/Request.php
+			path: _sql/migrations/common/SitemapConfigMigrationHelper.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_Request\\:\\:setParam\\(\\) has parameter \\$value with no type specified\\.$#"
+			message: "#^Method SitemapConfigMigrationHelper\\:\\:migrateExcludedUrls\\(\\) has parameter \\$excludedUrls with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/Request.php
+			path: _sql/migrations/common/SitemapConfigMigrationHelper.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_Request\\:\\:setParamSources\\(\\) has parameter \\$paramSources with no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#1 \\$newInstance of function Shopware expects Shopware\\|null, Enlight_Application\\|null given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/Request.php
+			path: engine/Library/Enlight/Application.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_Request\\:\\:setParams\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Library/Enlight/Controller/Request/Request.php
+			message: "#^Method Enlight_Class\\:\\:Instance\\(\\) should return TClass of object but returns object\\.$#"
+			count: 2
+			path: engine/Library/Enlight/Class.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_Request\\:\\:setPost\\(\\) has parameter \\$spec with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Class\\:\\:__call\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/Request.php
+			path: engine/Library/Enlight/Class.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_Request\\:\\:setQuery\\(\\) has parameter \\$spec with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Class\\:\\:__call\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/Request.php
+			path: engine/Library/Enlight/Class.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_Request\\:\\:unsetAttribute\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Class\\:\\:__callStatic\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/Request.php
+			path: engine/Library/Enlight/Class.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:__get\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Class\\:\\:__callStatic\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
+			path: engine/Library/Enlight/Class.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:__set\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Class\\:\\:__get\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
+			path: engine/Library/Enlight/Class.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:__set\\(\\) has parameter \\$value with no type specified\\.$#"
+			message: "#^Method Enlight_Class\\:\\:__set\\(\\) has parameter \\$value with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
+			path: engine/Library/Enlight/Class.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:getAttribute\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Class\\:\\:getClassName\\(\\) has parameter \\$class with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
+			path: engine/Library/Enlight/Class.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:getParam\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Class\\:\\:resetInstance\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
+			path: engine/Library/Enlight/Class.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:getParam\\(\\) has parameter \\$key with no type specified\\.$#"
+			message: "#^Method Enlight_Class\\:\\:resetInstance\\(\\) has parameter \\$class with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
+			path: engine/Library/Enlight/Class.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:getParamSources\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Collection_ArrayCollection\\:\\:__call\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
+			path: engine/Library/Enlight/Collection/ArrayCollection.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:getParams\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Collection_ArrayCollection\\:\\:__call\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
+			path: engine/Library/Enlight/Collection/ArrayCollection.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:getUserParam\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Collection_ArrayCollection\\:\\:__get\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
+			path: engine/Library/Enlight/Collection/ArrayCollection.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:getUserParams\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Collection_ArrayCollection\\:\\:__set\\(\\) has parameter \\$value with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
+			path: engine/Library/Enlight/Collection/ArrayCollection.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:replacePost\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Collection_ArrayCollection\\:\\:set\\(\\) has parameter \\$value with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
+			path: engine/Library/Enlight/Collection/ArrayCollection.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:replacePost\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Interface Enlight_Collection_Collection extends generic interface ArrayAccess but does not specify its types\\: TKey, TValue$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
+			path: engine/Library/Enlight/Collection/Collection.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:set\\(\\) has no return type specified\\.$#"
+			message: "#^Interface Enlight_Collection_Collection extends generic interface IteratorAggregate but does not specify its types\\: TKey, TValue$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
+			path: engine/Library/Enlight/Collection/Collection.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:set\\(\\) has parameter \\$value with no type specified\\.$#"
+			message: "#^Call to an undefined method Zend_Auth_Adapter_Interface\\:\\:refresh\\(\\)\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
+			path: engine/Library/Enlight/Components/Auth.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:setAttribute\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Components_Auth\\:\\:getInstance\\(\\) should return Enlight_Components_Auth but returns Zend_Auth\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
+			path: engine/Library/Enlight/Components/Auth.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:setBaseUrl\\(\\) has parameter \\$baseUrl with no type specified\\.$#"
+			message: "#^Method Enlight_Components_Auth_Adapter_DbTable\\:\\:updateExpiry\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
+			path: engine/Library/Enlight/Components/Auth/Adapter/DbTable.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:setFiles\\(\\) has parameter \\$files with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
+			message: "#^Argument \\#0 expects a constant string, got string$#"
+			count: 4
+			path: engine/Library/Enlight/Components/Cron/Adapter/DBAL.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:setHeader\\(\\) has parameter \\$value with no type specified\\.$#"
+			message: "#^Method Enlight_Components_Cron_Job\\:\\:__construct\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
+			path: engine/Library/Enlight/Components/Cron/Job.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:setParam\\(\\) has parameter \\$key with no type specified\\.$#"
+			message: "#^Method Enlight_Components_Cron_Job\\:\\:__get\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
+			path: engine/Library/Enlight/Components/Cron/Job.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:setParam\\(\\) has parameter \\$value with no type specified\\.$#"
+			message: "#^Method Enlight_Components_Cron_Job\\:\\:get\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
+			path: engine/Library/Enlight/Components/Cron/Job.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:setParamSources\\(\\) has parameter \\$paramSources with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Components_Cron_Job\\:\\:get\\(\\) has parameter \\$default with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
+			path: engine/Library/Enlight/Components/Cron/Job.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:setParams\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Components_Cron_Job\\:\\:get\\(\\) has parameter \\$name with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
+			path: engine/Library/Enlight/Components/Cron/Job.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:setPost\\(\\) has parameter \\$spec with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Components_Cron_Job\\:\\:getDisableOnError\\(\\) should return int but returns bool\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
+			path: engine/Library/Enlight/Components/Cron/Job.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:setQuery\\(\\) has parameter \\$spec with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Components_Cron_Job\\:\\:getEnd\\(\\) should return Zend_Date but returns string\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
+			path: engine/Library/Enlight/Components/Cron/Job.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:unsetAttribute\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Components_Cron_Job\\:\\:getNext\\(\\) should return Zend_Date but returns string\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
+			path: engine/Library/Enlight/Components/Cron/Job.php
 
 		-
-			message: "#^Property Enlight_Controller_Request_RequestHttp\\:\\:\\$_params type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Components_Cron_Job\\:\\:getStart\\(\\) should return Zend_Date but returns string\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
+			path: engine/Library/Enlight/Components/Cron/Job.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_RequestTestCase\\:\\:clearAll\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Components_Cron_Job\\:\\:setData\\(\\) has parameter \\$data with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestTestCase.php
+			path: engine/Library/Enlight/Components/Cron/Job.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_RequestTestCase\\:\\:getClientIp\\(\\) should return string but returns string\\|null\\.$#"
+			message: "#^Method Enlight_Components_Cron_Job\\:\\:setOptions\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestTestCase.php
+			path: engine/Library/Enlight/Components/Cron/Job.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_RequestTestCase\\:\\:getHeader\\(\\) has parameter \\$default with no type specified\\.$#"
+			message: "#^Method Enlight_Components_Cron_Job\\:\\:setOptions\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestTestCase.php
+			path: engine/Library/Enlight/Components/Cron/Job.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_RequestTestCase\\:\\:getHeaders\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Enlight_Components_Cron_Job\\:\\:\\$active \\(int\\) does not accept bool\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestTestCase.php
+			path: engine/Library/Enlight/Components/Cron/Job.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_RequestTestCase\\:\\:getRawBody\\(\\) should return string\\|null but returns resource\\|string\\|false\\|null\\.$#"
+			message: "#^Property Enlight_Components_Cron_Job\\:\\:\\$active \\(int\\) does not accept default value of type true\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestTestCase.php
+			path: engine/Library/Enlight/Components/Cron/Job.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_RequestTestCase\\:\\:setCookie\\(\\) has parameter \\$value with no type specified\\.$#"
+			message: "#^Property Enlight_Components_Cron_Job\\:\\:\\$data \\(string\\) does not accept default value of type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestTestCase.php
+			path: engine/Library/Enlight/Components/Cron/Job.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_RequestTestCase\\:\\:setCookies\\(\\) has parameter \\$cookies with no value type specified in iterable type array\\.$#"
+			message: "#^Property Enlight_Components_Cron_Job\\:\\:\\$end \\(string\\) does not accept Zend_Date\\|null\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestTestCase.php
+			path: engine/Library/Enlight/Components/Cron/Job.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_RequestTestCase\\:\\:setDeviceType\\(\\) has no return type specified\\.$#"
+			message: "#^Property Enlight_Components_Cron_Job\\:\\:\\$options type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestTestCase.php
+			path: engine/Library/Enlight/Components/Cron/Job.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_RequestTestCase\\:\\:setHeaders\\(\\) has parameter \\$headers with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Components_Cron_Manager\\:\\:endJob\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestTestCase.php
+			path: engine/Library/Enlight/Components/Cron/Manager.php
 
 		-
-			message: "#^Property Enlight_Controller_Request_RequestTestCase\\:\\:\\$_serverParams type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Components_Cron_Manager\\:\\:runJob\\(\\) should return Enlight_Event_EventArgs but returns Enlight_Event_EventArgs\\|null\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Request/RequestTestCase.php
+			path: engine/Library/Enlight/Components/Cron/Manager.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_Response\\:\\:getBody\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^PHPDoc tag @param for parameter \\$eventManager with type Enlight_Event_EventManager\\|null is not subtype of native type Enlight_Event_EventManager\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/Response.php
+			path: engine/Library/Enlight/Components/Cron/Manager.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_Response\\:\\:getCookies\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#1 \\$end of method Enlight_Components_Cron_Job\\:\\:setEnd\\(\\) expects string\\|Zend_Date\\|null, int\\|string given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/Response.php
+			path: engine/Library/Enlight/Components/Cron/Manager.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_Response\\:\\:getExceptionByCode\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$next of method Enlight_Components_Cron_Job\\:\\:setNext\\(\\) expects string\\|Zend_Date\\|null, float\\|int\\|string given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/Response.php
+			path: engine/Library/Enlight/Components/Cron/Manager.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_Response\\:\\:getExceptionByCode\\(\\) has parameter \\$code with no type specified\\.$#"
+			message: "#^Property Enlight_Components_Cron_Manager\\:\\:\\$eventArgsClass has no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/Response.php
+			path: engine/Library/Enlight/Components/Cron/Manager.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_Response\\:\\:getExceptionByMessage\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Enlight_Components_Cron_Manager\\:\\:\\$eventManager \\(Enlight_Event_EventManager\\) does not accept Enlight_Event_EventManager\\|null\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/Response.php
+			path: engine/Library/Enlight/Components/Cron/Manager.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_Response\\:\\:getExceptionByType\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Cannot call method errorInfo\\(\\) on object\\|resource\\|null\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/Response.php
+			path: engine/Library/Enlight/Components/Db/Adapter/Pdo/Mysql.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_Response\\:\\:getHeaders\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Components_Db_Adapter_Pdo_Mysql\\:\\:createFromDbalConnectionAndConfig\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/Response.php
+			path: engine/Library/Enlight/Components/Db/Adapter/Pdo/Mysql.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_Response\\:\\:prepend\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Components_Db_Adapter_Pdo_Mysql\\:\\:executeQuery\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/Response.php
+			path: engine/Library/Enlight/Components/Db/Adapter/Pdo/Mysql.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_Response\\:\\:setBody\\(\\) has parameter \\$content with no type specified\\.$#"
+			message: "#^Method Enlight_Components_Db_Adapter_Pdo_Mysql\\:\\:executeQuery\\(\\) has parameter \\$types with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/Response.php
+			path: engine/Library/Enlight/Components/Db/Adapter/Pdo/Mysql.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:__toString\\(\\) should return string but returns string\\|false\\.$#"
+			message: "#^Method Enlight_Components_Db_Adapter_Pdo_Mysql\\:\\:executeUpdate\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
+			path: engine/Library/Enlight/Components/Db/Adapter/Pdo/Mysql.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:clearRawHeader\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Components_Db_Adapter_Pdo_Mysql\\:\\:executeUpdate\\(\\) has parameter \\$types with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
+			path: engine/Library/Enlight/Components/Db/Adapter/Pdo/Mysql.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:clearRawHeader\\(\\) has parameter \\$headerRaw with no type specified\\.$#"
+			message: "#^Method Enlight_Components_Db_Adapter_Pdo_Mysql\\:\\:query\\(\\) has parameter \\$bind with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
+			path: engine/Library/Enlight/Components/Db/Adapter/Pdo/Mysql.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:clearRawHeaders\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Components_Mail\\:\\:IsHTML\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
+			path: engine/Library/Enlight/Components/Mail.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:getBody\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Components_Mail\\:\\:__set\\(\\) has parameter \\$value with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
+			path: engine/Library/Enlight/Components/Mail.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:getCookies\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Components_Mail\\:\\:getAsscociations\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
+			path: engine/Library/Enlight/Components/Mail.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:getExceptionByCode\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Components_Mail\\:\\:getTo\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
+			path: engine/Library/Enlight/Components/Mail.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:getExceptionByCode\\(\\) has parameter \\$code with no type specified\\.$#"
+			message: "#^Method Enlight_Components_Mail\\:\\:setAssociations\\(\\) has parameter \\$associations with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
+			path: engine/Library/Enlight/Components/Mail.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:getExceptionByMessage\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Components_Mail\\:\\:setTemplateName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
+			path: engine/Library/Enlight/Components/Mail.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:getExceptionByType\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Enlight_Components_Mail\\:\\:\\$_plainBody \\(null\\) does not accept string\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
+			path: engine/Library/Enlight/Components/Mail.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:getHeaders\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Enlight_Components_Mail\\:\\:\\$asscociations type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
+			path: engine/Library/Enlight/Components/Mail.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:getRawHeaderParts\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Class Enlight_Components_Session_Namespace implements generic interface ArrayAccess but does not specify its types\\: TKey, TValue$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
+			path: engine/Library/Enlight/Components/Session/Namespace.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:getRawHeaders\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Components_Session_Namespace\\:\\:__get\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
+			path: engine/Library/Enlight/Components/Session/Namespace.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:outputBody\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Components_Session_Namespace\\:\\:__set\\(\\) has parameter \\$value with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
+			path: engine/Library/Enlight/Components/Session/Namespace.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:prepend\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Components_Session_Namespace\\:\\:__unset\\(\\) with return type void returns mixed but should not return anything\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
+			path: engine/Library/Enlight/Components/Session/Namespace.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:removeCookie\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Components_Session_Namespace\\:\\:clear\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
+			path: engine/Library/Enlight/Components/Session/Namespace.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:renderExceptions\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Components_Session_Namespace\\:\\:ensureBackendSessionClosed\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
+			path: engine/Library/Enlight/Components/Session/Namespace.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:renderExceptions\\(\\) has parameter \\$flag with no type specified\\.$#"
+			message: "#^Method Enlight_Components_Session_Namespace\\:\\:ensureBackendSessionClosed\\(\\) has parameter \\$container with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
+			path: engine/Library/Enlight/Components/Session/Namespace.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:sendCookies\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Components_Session_Namespace\\:\\:ensureFrontendSessionClosed\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
+			path: engine/Library/Enlight/Components/Session/Namespace.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:sendResponse\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Components_Session_Namespace\\:\\:ensureFrontendSessionClosed\\(\\) has parameter \\$container with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
+			path: engine/Library/Enlight/Components/Session/Namespace.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:setBody\\(\\) has parameter \\$content with no type specified\\.$#"
+			message: "#^Method Enlight_Components_Session_Namespace\\:\\:ensureSessionClosed\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
+			path: engine/Library/Enlight/Components/Session/Namespace.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:setRawHeader\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Components_Session_Namespace\\:\\:ensureSessionClosed\\(\\) has parameter \\$container with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
+			path: engine/Library/Enlight/Components/Session/Namespace.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:setRawHeader\\(\\) has parameter \\$value with no type specified\\.$#"
+			message: "#^Method Enlight_Components_Session_Namespace\\:\\:ensureSessionClosed\\(\\) has parameter \\$sessionServiceName with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
+			path: engine/Library/Enlight/Components/Session/Namespace.php
 
 		-
-			message: "#^Parameter \\#1 \\(array\\|string\\|null\\) of echo cannot be converted to string\\.$#"
+			message: "#^Method Enlight_Components_Session_Namespace\\:\\:unsetAll\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
+			path: engine/Library/Enlight/Components/Session/Namespace.php
 
 		-
-			message: "#^Parameter \\#2 \\$path of method Symfony\\\\Component\\\\HttpFoundation\\\\ResponseHeaderBag\\:\\:removeCookie\\(\\) expects string, string\\|null given\\.$#"
+			message: "#^Method Enlight_Components_Table\\:\\:_getReferenceMapNormalized\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
+			path: engine/Library/Enlight/Components/Table.php
 
 		-
-			message: "#^Property Symfony\\\\Component\\\\HttpFoundation\\\\Response\\:\\:\\$content \\(string\\) does not accept null\\.$#"
+			message: "#^Method Enlight_Components_Test_Plugin_TestCase\\:\\:createEventArgs\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
+			path: engine/Library/Enlight/Components/Test/Plugin/TestCase.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_ResponseTestCase\\:\\:getBody\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Components_Test_Plugin_TestCase\\:\\:createEventArgs\\(\\) has parameter \\$name with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/ResponseTestCase.php
+			path: engine/Library/Enlight/Components/Test/Plugin/TestCase.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_ResponseTestCase\\:\\:getCookie\\(\\) has no return type specified\\.$#"
+			message: "#^Class Enlight_Config implements generic interface ArrayAccess but does not specify its types\\: TKey, TValue$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/ResponseTestCase.php
+			path: engine/Library/Enlight/Config.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_ResponseTestCase\\:\\:getFullCookie\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Config\\:\\:__construct\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/ResponseTestCase.php
+			path: engine/Library/Enlight/Config.php
 
 		-
-			message: "#^Method Enlight_Controller_Response_ResponseTestCase\\:\\:getHeader\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Config\\:\\:getDirtyFields\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Response/ResponseTestCase.php
+			path: engine/Library/Enlight/Config.php
 
 		-
-			message: "#^Method Enlight_Controller_Router\\:\\:setGlobalParam\\(\\) has parameter \\$value with no type specified\\.$#"
+			message: "#^Method Enlight_Config\\:\\:setExtends\\(\\) has parameter \\$extends with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Router.php
+			path: engine/Library/Enlight/Config.php
 
 		-
-			message: "#^Property Enlight_Controller_Router\\:\\:\\$globalParams type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Config\\:\\:setSection\\(\\) has parameter \\$section with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Controller/Router.php
+			path: engine/Library/Enlight/Config.php
 
 		-
-			message: "#^Method Enlight_Event_EventArgs\\:\\:__construct\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Config_Adapter\\:\\:__construct\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/EventArgs.php
+			path: engine/Library/Enlight/Config/Adapter.php
 
 		-
-			message: "#^Method Enlight_Event_EventArgs\\:\\:getReturn\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Config_Adapter\\:\\:setOptions\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/EventArgs.php
+			path: engine/Library/Enlight/Config/Adapter.php
 
 		-
-			message: "#^Method Enlight_Event_EventArgs\\:\\:setName\\(\\) has parameter \\$name with no type specified\\.$#"
+			message: "#^Method Enlight_Config_Adapter_DbTable\\:\\:delete\\(\\) has parameter \\$fields with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/EventArgs.php
+			path: engine/Library/Enlight/Config/Adapter/DbTable.php
 
 		-
-			message: "#^Method Enlight_Event_EventArgs\\:\\:setName\\(\\) should return string but return statement is missing\\.$#"
+			message: "#^Method Enlight_Config_Adapter_DbTable\\:\\:readSection\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/EventArgs.php
+			path: engine/Library/Enlight/Config/Adapter/DbTable.php
 
 		-
-			message: "#^Method Enlight_Event_EventArgs\\:\\:setReturn\\(\\) has parameter \\$return with no type specified\\.$#"
+			message: "#^Method Enlight_Config_Adapter_DbTable\\:\\:setOptions\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/EventArgs.php
+			path: engine/Library/Enlight/Config/Adapter/DbTable.php
 
 		-
-			message: "#^PHPDoc tag @param for parameter \\$args with type array\\|null is not subtype of native type array\\.$#"
-			count: 1
-			path: engine/Library/Enlight/Event/EventArgs.php
+			message: "#^Parameter \\#1 \\$name of method Enlight_Config_Adapter_DbTable\\:\\:getTable\\(\\) expects null, string\\|null given\\.$#"
+			count: 3
+			path: engine/Library/Enlight/Config/Adapter/DbTable.php
 
 		-
-			message: "#^Method Enlight_Event_EventHandler\\:\\:__construct\\(\\) has parameter \\$plugin with no type specified\\.$#"
+			message: "#^Return type \\(Enlight_Config_Adapter_DbTable\\) of method Enlight_Config_Adapter_DbTable\\:\\:read\\(\\) should be compatible with return type \\(Enlight_Config_Adapter_File\\) of method Enlight_Config_Adapter\\:\\:read\\(\\)$#"
 			count: 1
-			path: engine/Library/Enlight/Event/EventHandler.php
+			path: engine/Library/Enlight/Config/Adapter/DbTable.php
 
 		-
-			message: "#^Method Enlight_Event_EventHandler\\:\\:getPlugin\\(\\) has no return type specified\\.$#"
+			message: "#^Return type \\(Enlight_Config_Adapter_DbTable\\) of method Enlight_Config_Adapter_DbTable\\:\\:write\\(\\) should be compatible with return type \\(Enlight_Config_Adapter_File\\) of method Enlight_Config_Adapter\\:\\:write\\(\\)$#"
 			count: 1
-			path: engine/Library/Enlight/Event/EventHandler.php
+			path: engine/Library/Enlight/Config/Adapter/DbTable.php
 
 		-
-			message: "#^Method Enlight_Event_EventHandler\\:\\:setPlugin\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Config_Adapter_File\\:\\:addConfigDir\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/EventHandler.php
+			path: engine/Library/Enlight/Config/Adapter/File.php
 
 		-
-			message: "#^Method Enlight_Event_EventHandler\\:\\:setPlugin\\(\\) has parameter \\$plugin with no type specified\\.$#"
+			message: "#^Method Enlight_Config_Adapter_File\\:\\:setOptions\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/EventHandler.php
+			path: engine/Library/Enlight/Config/Adapter/File.php
 
 		-
-			message: "#^Method Enlight_Event_EventHandler\\:\\:toArray\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Enlight_Config_Adapter_File\\:\\:\\$_configDir type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/EventHandler.php
+			path: engine/Library/Enlight/Config/Adapter/File.php
 
 		-
-			message: "#^Property Enlight_Event_EventHandler\\:\\:\\$plugin has no type specified\\.$#"
+			message: "#^Class Enlight_Config_BaseConfig implements generic interface Iterator but does not specify its types\\: TKey, TValue$#"
 			count: 1
-			path: engine/Library/Enlight/Event/EventHandler.php
+			path: engine/Library/Enlight/Config/BaseConfig.php
 
 		-
-			message: "#^Method Enlight_Event_EventManager\\:\\:buildEventArgs\\(\\) has parameter \\$eventArgs with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Config_BaseConfig\\:\\:__construct\\(\\) has parameter \\$array with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/EventManager.php
+			path: engine/Library/Enlight/Config/BaseConfig.php
 
 		-
-			message: "#^Method Enlight_Event_EventManager\\:\\:collect\\(\\) has parameter \\$collection with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			message: "#^Method Enlight_Config_BaseConfig\\:\\:_arrayMergeRecursive\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/EventManager.php
+			path: engine/Library/Enlight/Config/BaseConfig.php
 
 		-
-			message: "#^Method Enlight_Event_EventManager\\:\\:collect\\(\\) has parameter \\$eventArgs with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Config_BaseConfig\\:\\:getExtends\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/EventManager.php
+			path: engine/Library/Enlight/Config/BaseConfig.php
 
 		-
-			message: "#^Method Enlight_Event_EventManager\\:\\:collect\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Enlight_Config_BaseConfig\\:\\:toArray\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/EventManager.php
+			path: engine/Library/Enlight/Config/BaseConfig.php
 
 		-
-			message: "#^Method Enlight_Event_EventManager\\:\\:filter\\(\\) has parameter \\$eventArgs with no value type specified in iterable type array\\.$#"
+			message: "#^Property Enlight_Config_BaseConfig\\:\\:\\$_extends type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/EventManager.php
+			path: engine/Library/Enlight/Config/BaseConfig.php
 
 		-
-			message: "#^Method Enlight_Event_EventManager\\:\\:getEvents\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Config_Format_Ini\\:\\:__construct\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/EventManager.php
+			path: engine/Library/Enlight/Config/Format/Ini.php
 
 		-
-			message: "#^Method Enlight_Event_EventManager\\:\\:getListeners\\(\\) has parameter \\$event with no type specified\\.$#"
+			message: "#^Method Enlight_Config_Format_Ini\\:\\:__construct\\(\\) has parameter \\$section with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/EventManager.php
+			path: engine/Library/Enlight/Config/Format/Ini.php
 
 		-
-			message: "#^Method Enlight_Event_EventManager\\:\\:notify\\(\\) has parameter \\$eventArgs with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Config_Format_Ini\\:\\:_loadIniFile\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/EventManager.php
+			path: engine/Library/Enlight/Config/Format/Ini.php
 
 		-
-			message: "#^Method Enlight_Event_EventManager\\:\\:notifyUntil\\(\\) has parameter \\$eventArgs with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Config_Format_Ini\\:\\:_parseIniFile\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/EventManager.php
+			path: engine/Library/Enlight/Config/Format/Ini.php
 
 		-
-			message: "#^Method Enlight_Event_EventManager\\:\\:registerSubscriber\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Config_Format_Ini\\:\\:_parseIniFile\\(\\) should return array but returns array\\|false\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/EventManager.php
+			path: engine/Library/Enlight/Config/Format/Ini.php
 
 		-
-			message: "#^Method Enlight_Event_Handler\\:\\:__construct\\(\\) has parameter \\$event with no type specified\\.$#"
+			message: "#^Method Enlight_Config_Format_Ini\\:\\:_processKey\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/Handler.php
+			path: engine/Library/Enlight/Config/Format/Ini.php
 
 		-
-			message: "#^Method Enlight_Event_Handler\\:\\:execute\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Config_Format_Ini\\:\\:_processKey\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/Handler.php
+			path: engine/Library/Enlight/Config/Format/Ini.php
 
 		-
-			message: "#^Method Enlight_Event_Handler_Default\\:\\:execute\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Config_Format_Ini\\:\\:_processSection\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/Handler/Default.php
+			path: engine/Library/Enlight/Config/Format/Ini.php
 
 		-
-			message: "#^Method Enlight_Event_Handler_Default\\:\\:toArray\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Config_Format_Ini\\:\\:_processSection\\(\\) has parameter \\$iniArray with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/Handler/Default.php
+			path: engine/Library/Enlight/Config/Format/Ini.php
 
 		-
-			message: "#^Parameter \\#1 \\$listener of method Enlight_Event_Handler_Default\\:\\:setListener\\(\\) expects array\\<int, object\\|string\\>\\|\\(callable\\(\\)\\: mixed\\), array\\<int, \\(callable\\(\\)\\: mixed\\)\\|object\\|string\\>\\|\\(callable\\(\\)\\: mixed\\) given\\.$#"
+			message: "#^Method Enlight_Config_Format_Ini\\:\\:_processSection\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/Handler/Default.php
+			path: engine/Library/Enlight/Config/Format/Ini.php
 
 		-
-			message: "#^Parameter \\#1 \\$position of method Enlight_Event_Handler\\:\\:setPosition\\(\\) expects int, int\\|null given\\.$#"
+			message: "#^Method Enlight_Config_Writer_Ini\\:\\:_addBranch\\(\\) has parameter \\$parents with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/Handler/Default.php
+			path: engine/Library/Enlight/Config/Writer/Ini.php
 
 		-
-			message: "#^Method Enlight_Event_Handler_Plugin\\:\\:Plugin\\(\\) should return Enlight_Plugin_Bootstrap but returns Enlight_Plugin_Bootstrap\\|Enlight_Plugin_Namespace\\|null\\.$#"
+			message: "#^Method Enlight_Config_Writer_Ini\\:\\:_prepareValue\\(\\) has parameter \\$value with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/Handler/Plugin.php
+			path: engine/Library/Enlight/Config/Writer/Ini.php
 
 		-
-			message: "#^Method Enlight_Event_Handler_Plugin\\:\\:execute\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Config_Writer_Ini\\:\\:_prepareValue\\(\\) should return string but returns float\\|int\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/Handler/Plugin.php
+			path: engine/Library/Enlight/Config/Writer/Ini.php
 
 		-
-			message: "#^Method Enlight_Event_Handler_Plugin\\:\\:toArray\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Config_Writer_Ini\\:\\:setNestSeparator\\(\\) has parameter \\$separator with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/Handler/Plugin.php
+			path: engine/Library/Enlight/Config/Writer/Ini.php
 
 		-
-			message: "#^Parameter \\#1 \\$position of method Enlight_Event_Handler\\:\\:setPosition\\(\\) expects int, int\\|null given\\.$#"
+			message: "#^Method Enlight_Config_Writer_Writer\\:\\:__construct\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/Handler/Plugin.php
+			path: engine/Library/Enlight/Config/Writer/Writer.php
 
 		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
+			message: "#^Method Enlight_Config_Writer_Writer\\:\\:setOptions\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/Handler/Plugin.php
+			path: engine/Library/Enlight/Config/Writer/Writer.php
 
 		-
-			message: "#^Variable \\$plugin might not be defined\\.$#"
+			message: "#^Property Enlight_Config_Writer_Writer\\:\\:\\$_skipOptions type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/Handler/Plugin.php
+			path: engine/Library/Enlight/Config/Writer/Writer.php
 
 		-
-			message: "#^Method Enlight_Event_Subscriber\\:\\:getListeners\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Action\\:\\:__call\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/Subscriber.php
+			path: engine/Library/Enlight/Controller/Action.php
 
 		-
-			message: "#^Method Enlight_Event_Subscriber_Array\\:\\:__construct\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Action\\:\\:__call\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/Subscriber/Array.php
+			path: engine/Library/Enlight/Controller/Action.php
 
 		-
-			message: "#^Method Enlight_Event_Subscriber_Array\\:\\:getListeners\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Action\\:\\:createForm\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/Subscriber/Array.php
+			path: engine/Library/Enlight/Controller/Action.php
 
 		-
-			message: "#^Parameter \\#2 \\$offset of function array_splice expects int, int\\|string given\\.$#"
+			message: "#^Method Enlight_Controller_Action\\:\\:createForm\\(\\) has parameter \\$type with generic interface Symfony\\\\Component\\\\Form\\\\FormTypeInterface but does not specify its types\\: TData$#"
 			count: 1
-			path: engine/Library/Enlight/Event/Subscriber/Array.php
+			path: engine/Library/Enlight/Controller/Action.php
 
 		-
-			message: "#^Property Enlight_Event_Subscriber_Array\\:\\:\\$listeners type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Action\\:\\:createForm\\(\\) return type with generic interface Symfony\\\\Component\\\\Form\\\\FormInterface does not specify its types\\: TData$#"
 			count: 1
-			path: engine/Library/Enlight/Event/Subscriber/Array.php
+			path: engine/Library/Enlight/Controller/Action.php
 
 		-
-			message: "#^Access to an undefined property Enlight_Config\\:\\:\\$listener\\.$#"
+			message: "#^Method Enlight_Controller_Action\\:\\:dispatch\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/Subscriber/Config.php
-
-		-
-			message: "#^Access to an undefined property Enlight_Config\\:\\:\\$listeners\\.$#"
-			count: 2
-			path: engine/Library/Enlight/Event/Subscriber/Config.php
+			path: engine/Library/Enlight/Controller/Action.php
 
 		-
-			message: "#^Access to an undefined property Enlight_Config\\:\\:\\$name\\.$#"
+			message: "#^Method Enlight_Controller_Action\\:\\:forward\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/Subscriber/Config.php
+			path: engine/Library/Enlight/Controller/Action.php
 
 		-
-			message: "#^Access to an undefined property Enlight_Config\\:\\:\\$position\\.$#"
+			message: "#^Method Enlight_Controller_Action\\:\\:forward\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/Subscriber/Config.php
+			path: engine/Library/Enlight/Controller/Action.php
 
 		-
-			message: "#^Method Enlight_Event_Subscriber_Config\\:\\:__construct\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Action\\:\\:get\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/Subscriber/Config.php
+			path: engine/Library/Enlight/Controller/Action.php
 
 		-
-			message: "#^Method Enlight_Event_Subscriber_Config\\:\\:getListeners\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Action\\:\\:getActionArguments\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/Subscriber/Config.php
+			path: engine/Library/Enlight/Controller/Action.php
 
 		-
-			message: "#^Parameter \\#2 \\$offset of function array_splice expects int, int\\|string given\\.$#"
+			message: "#^Method Enlight_Controller_Action\\:\\:initController\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/Subscriber/Config.php
+			path: engine/Library/Enlight/Controller/Action.php
 
 		-
-			message: "#^Property Enlight_Event_Subscriber_Config\\:\\:\\$listeners type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Action\\:\\:redirect\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/Subscriber/Config.php
+			path: engine/Library/Enlight/Controller/Action.php
 
 		-
-			message: "#^Access to an undefined property Enlight_Config\\:\\:\\$listener\\.$#"
+			message: "#^Method Enlight_Controller_Action\\:\\:redirect\\(\\) has parameter \\$url with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/Subscriber/Plugin.php
+			path: engine/Library/Enlight/Controller/Action.php
 
 		-
-			message: "#^Access to an undefined property Enlight_Config\\:\\:\\$listeners\\.$#"
-			count: 2
-			path: engine/Library/Enlight/Event/Subscriber/Plugin.php
+			message: "#^Parameter \\#2 \\$controller of method Symfony\\\\Component\\\\HttpKernel\\\\Controller\\\\ArgumentResolver\\:\\:getArguments\\(\\) expects callable\\(\\)\\: mixed, array\\{\\$this\\(Enlight_Controller_Action\\), string\\} given\\.$#"
+			count: 1
+			path: engine/Library/Enlight/Controller/Action.php
 
 		-
-			message: "#^Access to an undefined property Enlight_Config\\:\\:\\$name\\.$#"
+			message: "#^Property Enlight_Controller_Action\\:\\:\\$container \\(Shopware\\\\Components\\\\DependencyInjection\\\\Container\\) does not accept Shopware\\\\Components\\\\DependencyInjection\\\\Container\\|null\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/Subscriber/Plugin.php
+			path: engine/Library/Enlight/Controller/Action.php
 
 		-
-			message: "#^Access to an undefined property Enlight_Config\\:\\:\\$plugin\\.$#"
+			message: "#^Property Enlight_Controller_Action\\:\\:\\$view \\(Enlight_View_Default\\) does not accept Enlight_View\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/Subscriber/Plugin.php
+			path: engine/Library/Enlight/Controller/Action.php
 
 		-
-			message: "#^Access to an undefined property Enlight_Config\\:\\:\\$position\\.$#"
+			message: "#^Method Enlight_Controller_Dispatcher\\:\\:dispatch\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/Subscriber/Plugin.php
+			path: engine/Library/Enlight/Controller/Dispatcher.php
 
 		-
-			message: "#^Method Enlight_Event_Subscriber_Plugin\\:\\:__construct\\(\\) has parameter \\$namespace with no type specified\\.$#"
+			message: "#^Property Enlight_Controller_Dispatcher\\:\\:\\$response \\(Enlight_Controller_Response_Response\\) does not accept Enlight_Controller_Response_Response\\|null\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/Subscriber/Plugin.php
+			path: engine/Library/Enlight/Controller/Dispatcher.php
 
 		-
-			message: "#^Method Enlight_Event_Subscriber_Plugin\\:\\:toArray\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Cannot clone object\\|null\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Event/Subscriber/Plugin.php
+			path: engine/Library/Enlight/Controller/Dispatcher/Default.php
 
 		-
-			message: "#^Method Enlight_Hook_HookArgs\\:\\:__construct\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Dispatcher_Default\\:\\:__construct\\(\\) has parameter \\$controllers with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Hook/HookArgs.php
+			path: engine/Library/Enlight/Controller/Dispatcher/Default.php
 
 		-
-			message: "#^Method Enlight_Hook_HookArgs\\:\\:__construct\\(\\) has parameter \\$subject with no type specified\\.$#"
+			message: "#^Method Enlight_Controller_Dispatcher_Default\\:\\:dispatch\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Hook/HookArgs.php
+			path: engine/Library/Enlight/Controller/Dispatcher/Default.php
 
 		-
-			message: "#^Method Enlight_Hook_HookArgs\\:\\:getArgs\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Dispatcher_Default\\:\\:getModules\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Hook/HookArgs.php
+			path: engine/Library/Enlight/Controller/Dispatcher/Default.php
 
 		-
-			message: "#^Method Enlight_Hook_HookArgs\\:\\:set\\(\\) has parameter \\$value with no type specified\\.$#"
+			message: "#^Method Enlight_Controller_Dispatcher_Default\\:\\:setModules\\(\\) has parameter \\$modules with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Hook/HookArgs.php
+			path: engine/Library/Enlight/Controller/Dispatcher/Default.php
 
 		-
-			message: "#^Property Enlight_Hook_HookArgs\\:\\:\\$_subject has no type specified\\.$#"
+			message: "#^Parameter \\#1 \\$classname of function class_exists expects string, string\\|null given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Hook/HookArgs.php
+			path: engine/Library/Enlight/Controller/Dispatcher/Default.php
 
 		-
-			message: "#^Method Enlight_Hook_HookExecutionContext\\:\\:__construct\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#1 \\$content of method Enlight_Controller_Response_Response\\:\\:appendBody\\(\\) expects string, string\\|false given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Hook/HookExecutionContext.php
+			path: engine/Library/Enlight/Controller/Dispatcher/Default.php
 
 		-
-			message: "#^Method Enlight_Hook_HookExecutionContext\\:\\:execute\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$request of method Enlight_Controller_Action\\:\\:initController\\(\\) expects Enlight_Controller_Request_RequestHttp, Enlight_Controller_Request_Request given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Hook/HookExecutionContext.php
+			path: engine/Library/Enlight/Controller/Dispatcher/Default.php
 
 		-
-			message: "#^Method Enlight_Hook_HookExecutionContext\\:\\:executeReplaceChain\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#2 \\$response of method Enlight_Controller_Action\\:\\:initController\\(\\) expects Enlight_Controller_Response_ResponseHttp, Enlight_Controller_Response_Response given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Hook/HookExecutionContext.php
+			path: engine/Library/Enlight/Controller/Dispatcher/Default.php
 
 		-
-			message: "#^Method Enlight_Hook_HookExecutionContext\\:\\:executeReplaceChain\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
+			message: "#^Property Enlight_Controller_Dispatcher_Default\\:\\:\\$controllers type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Hook/HookExecutionContext.php
+			path: engine/Library/Enlight/Controller/Dispatcher/Default.php
 
 		-
-			message: "#^Parameter \\#1 \\$name of method Enlight_Hook_HookManager\\:\\:getAlias\\(\\) expects string, class\\-string\\|false given\\.$#"
+			message: "#^Property Enlight_Controller_Dispatcher_Default\\:\\:\\$modules type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Hook/HookExecutionContext.php
+			path: engine/Library/Enlight/Controller/Dispatcher/Default.php
 
 		-
-			message: "#^Method Enlight_Hook_HookManager\\:\\:__construct\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
+			message: "#^Property Enlight_Controller_Front\\:\\:\\$plugins \\(Enlight_Plugin_Namespace_Loader\\) does not accept Enlight_Plugin_Namespace\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Hook/HookManager.php
+			path: engine/Library/Enlight/Controller/Front.php
 
 		-
-			message: "#^Method Enlight_Hook_HookManager\\:\\:executeHooks\\(\\) has no return type specified\\.$#"
+			message: "#^Property Enlight_Controller_Front\\:\\:\\$response \\(Enlight_Controller_Response_ResponseHttp\\|null\\) does not accept Enlight_Controller_Response_Response\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Hook/HookManager.php
+			path: engine/Library/Enlight/Controller/Front.php
 
 		-
-			message: "#^Method Enlight_Hook_HookManager\\:\\:executeHooks\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Plugins_Json_Bootstrap\\:\\:convertToJson\\(\\) has parameter \\$data with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Hook/HookManager.php
+			path: engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php
 
 		-
-			message: "#^Method Enlight_Hook_HookManager\\:\\:getProxy\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Controller_Plugins_Json_Bootstrap\\:\\:convertToJson\\(\\) should return string but returns string\\|null\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Hook/HookManager.php
+			path: engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php
 
 		-
-			message: "#^Method Enlight_Hook_HookManager\\:\\:getProxyFactory\\(\\) should return Enlight_Hook_ProxyFactory but returns Enlight_Hook_ProxyFactory\\|null\\.$#"
+			message: "#^Method Enlight_Controller_Plugins_Json_Bootstrap\\:\\:convertToUtf8\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Hook/HookManager.php
+			path: engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php
 
 		-
-			message: "#^Property Enlight_Hook_HookManager\\:\\:\\$aliases type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Plugins_Json_Bootstrap\\:\\:convertToUtf8\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Hook/HookManager.php
+			path: engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php
 
 		-
-			message: "#^Method Enlight_Hook_Proxy\\:\\:__executeOriginalMethod\\(\\) has no return type specified\\.$#"
+			message: "#^Possibly invalid array key type array\\|string\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Hook/Proxy.php
+			path: engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php
 
 		-
-			message: "#^Method Enlight_Hook_Proxy\\:\\:__executeOriginalMethod\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Plugins_JsonRequest_Bootstrap\\:\\:setParseParams\\(\\) has parameter \\$parseParams with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Hook/Proxy.php
+			path: engine/Library/Enlight/Controller/Plugins/JsonRequest/Bootstrap.php
 
 		-
-			message: "#^Method Enlight_Hook_Proxy\\:\\:__popHookExecutionContext\\(\\) has no return type specified\\.$#"
+			message: "#^Property Enlight_Controller_Plugins_JsonRequest_Bootstrap\\:\\:\\$parseParams type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Hook/Proxy.php
+			path: engine/Library/Enlight/Controller/Plugins/JsonRequest/Bootstrap.php
 
 		-
-			message: "#^Method Enlight_Hook_Proxy\\:\\:__pushHookExecutionContext\\(\\) has no return type specified\\.$#"
+			message: "#^Call to an undefined method Enlight_Event_EventArgs\\:\\:getSubject\\(\\)\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Hook/Proxy.php
+			path: engine/Library/Enlight/Controller/Plugins/ScriptRenderer/Bootstrap.php
 
 		-
-			message: "#^Method Enlight_Hook_Proxy\\:\\:executeParent\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Controller_Plugins_ScriptRenderer_Bootstrap\\:\\:camelCaseToUnderScore\\(\\) should return string but returns string\\|null\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Hook/Proxy.php
+			path: engine/Library/Enlight/Controller/Plugins/ScriptRenderer/Bootstrap.php
 
 		-
-			message: "#^Method Enlight_Hook_Proxy\\:\\:executeParent\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Plugins_ScriptRenderer_Bootstrap\\:\\:getTemplateName\\(\\) should return string but returns null\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Hook/Proxy.php
+			path: engine/Library/Enlight/Controller/Plugins/ScriptRenderer/Bootstrap.php
 
 		-
-			message: "#^Cannot call method getName\\(\\) on ReflectionType\\|null\\.$#"
+			message: "#^Method Enlight_Controller_Plugins_ScriptRenderer_Bootstrap\\:\\:init\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Hook/ProxyFactory.php
+			path: engine/Library/Enlight/Controller/Plugins/ScriptRenderer/Bootstrap.php
 
 		-
-			message: "#^Method Enlight_Hook_ProxyFactory\\:\\:clearCache\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Controller_Plugins_ScriptRenderer_Bootstrap\\:\\:onPreDispatch\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Hook/ProxyFactory.php
+			path: engine/Library/Enlight/Controller/Plugins/ScriptRenderer/Bootstrap.php
 
 		-
-			message: "#^Method Enlight_Hook_ProxyFactory\\:\\:createMethodGenerator\\(\\) should return ProxyManager\\\\Generator\\\\MethodGenerator but returns Laminas\\\\Code\\\\Generator\\\\MethodGenerator\\.$#"
-			count: 1
-			path: engine/Library/Enlight/Hook/ProxyFactory.php
+			message: "#^Parameter \\#3 \\$subject of function preg_replace expects array\\|string, string\\|null given\\.$#"
+			count: 2
+			path: engine/Library/Enlight/Controller/Plugins/ScriptRenderer/Bootstrap.php
 
 		-
-			message: "#^Method Enlight_Hook_ProxyFactory\\:\\:getHookedMethods\\(\\) has parameter \\$class with generic class ReflectionClass but does not specify its types\\: T$#"
+			message: "#^Property Enlight_Controller_Plugins_ScriptRenderer_Bootstrap\\:\\:\\$headers type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Hook/ProxyFactory.php
+			path: engine/Library/Enlight/Controller/Plugins/ScriptRenderer/Bootstrap.php
 
 		-
-			message: "#^Method Enlight_Hook_ProxyFactory\\:\\:writeProxyClass\\(\\) has no return type specified\\.$#"
+			message: "#^Property Enlight_Controller_Plugins_ScriptRenderer_Bootstrap\\:\\:\\$viewRenderer \\(Enlight_Controller_Plugins_ViewRenderer_Bootstrap\\) does not accept Enlight_Plugin_Bootstrap\\|Enlight_Plugin_Namespace\\|null\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Hook/ProxyFactory.php
+			path: engine/Library/Enlight/Controller/Plugins/ScriptRenderer/Bootstrap.php
 
 		-
-			message: "#^Method Enlight_Loader\\:\\:autoload\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Library/Enlight/Loader.php
+			message: "#^Call to an undefined method Enlight_Event_EventArgs\\:\\:getSubject\\(\\)\\.$#"
+			count: 2
+			path: engine/Library/Enlight/Controller/Plugins/ViewRenderer/Bootstrap.php
 
 		-
-			message: "#^Method Enlight_Loader\\:\\:explodeIncludePath\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Plugins_ViewRenderer_Bootstrap\\:\\:init\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Loader.php
+			path: engine/Library/Enlight/Controller/Plugins/ViewRenderer/Bootstrap.php
 
 		-
-			message: "#^Method Enlight_Loader\\:\\:explodeIncludePath\\(\\) should return array but returns array\\<int, string\\>\\|false\\.$#"
+			message: "#^Method Enlight_Controller_Plugins_ViewRenderer_Bootstrap\\:\\:initEngine\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Loader.php
+			path: engine/Library/Enlight/Controller/Plugins/ViewRenderer/Bootstrap.php
 
 		-
-			message: "#^Method Enlight_Loader\\:\\:loadClass\\(\\) has parameter \\$class with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Plugins_ViewRenderer_Bootstrap\\:\\:initView\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Loader.php
+			path: engine/Library/Enlight/Controller/Plugins/ViewRenderer/Bootstrap.php
 
 		-
-			message: "#^Method Enlight_Loader\\:\\:loadFile\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Controller_Plugins_ViewRenderer_Bootstrap\\:\\:onActionInit\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Loader.php
+			path: engine/Library/Enlight/Controller/Plugins/ViewRenderer/Bootstrap.php
 
 		-
-			message: "#^Method Enlight_Loader\\:\\:setIncludePath\\(\\) has parameter \\$path with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Plugins_ViewRenderer_Bootstrap\\:\\:onPostDispatch\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Loader.php
+			path: engine/Library/Enlight/Controller/Plugins/ViewRenderer/Bootstrap.php
 
 		-
-			message: "#^Parameter \\#1 \\$callback of function array_map expects \\(callable\\(mixed\\)\\: mixed\\)\\|null, array\\{\\$this\\(Enlight_Loader\\), 'Enlight_Loader\\:…'\\} given\\.$#"
+			message: "#^Method Enlight_Controller_Plugins_ViewRenderer_Bootstrap\\:\\:onPreDispatch\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Loader.php
+			path: engine/Library/Enlight/Controller/Plugins/ViewRenderer/Bootstrap.php
 
 		-
-			message: "#^Property Enlight_Loader\\:\\:\\$namespaces type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_View_Default\\:\\:render\\(\\) invoked with 1 parameter, 0 required\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Loader.php
+			path: engine/Library/Enlight/Controller/Plugins/ViewRenderer/Bootstrap.php
 
 		-
-			message: "#^Method Enlight_Plugin_Bootstrap\\:\\:afterInit\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Controller_Request_Request\\:\\:__get\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Plugin/Bootstrap.php
+			path: engine/Library/Enlight/Controller/Request/Request.php
 
 		-
-			message: "#^Method Enlight_Plugin_Bootstrap\\:\\:get\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Controller_Request_Request\\:\\:__set\\(\\) has parameter \\$value with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Plugin/Bootstrap.php
+			path: engine/Library/Enlight/Controller/Request/Request.php
 
 		-
-			message: "#^Property Enlight_Plugin_Bootstrap\\:\\:\\$collection \\(Enlight_Plugin_PluginCollection\\) does not accept Enlight_Plugin_PluginCollection\\|null\\.$#"
+			message: "#^Method Enlight_Controller_Request_Request\\:\\:get\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Plugin/Bootstrap.php
+			path: engine/Library/Enlight/Controller/Request/Request.php
 
 		-
-			message: "#^Method Enlight_Plugin_Bootstrap_Config\\:\\:install\\(\\) should return bool but return statement is missing\\.$#"
+			message: "#^Method Enlight_Controller_Request_Request\\:\\:getAttribute\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Plugin/Bootstrap/Config.php
+			path: engine/Library/Enlight/Controller/Request/Request.php
 
 		-
-			message: "#^Parameter \\#1 \\$event of class Enlight_Event_Handler_Plugin constructor expects string, Enlight_Event_Handler\\|Enlight_Hook_HookHandler\\|string given\\.$#"
+			message: "#^Method Enlight_Controller_Request_Request\\:\\:getParam\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Plugin/Bootstrap/Config.php
+			path: engine/Library/Enlight/Controller/Request/Request.php
 
 		-
-			message: "#^Parameter \\#4 \\$listener of class Enlight_Event_Handler_Plugin constructor expects string\\|null, \\(callable\\)\\|string\\|null given\\.$#"
+			message: "#^Method Enlight_Controller_Request_Request\\:\\:getParam\\(\\) has parameter \\$key with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Plugin/Bootstrap/Config.php
+			path: engine/Library/Enlight/Controller/Request/Request.php
 
 		-
-			message: "#^Property Enlight_Plugin_Bootstrap_Config\\:\\:\\$config \\(Enlight_Config\\) does not accept array\\|Enlight_Config\\.$#"
+			message: "#^Method Enlight_Controller_Request_Request\\:\\:getParamSources\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Plugin/Bootstrap/Config.php
+			path: engine/Library/Enlight/Controller/Request/Request.php
 
 		-
-			message: "#^Property Enlight_Plugin_Namespace\\:\\:\\$manager \\(Enlight_Plugin_PluginManager\\) does not accept Enlight_Plugin_PluginCollection\\.$#"
+			message: "#^Method Enlight_Controller_Request_Request\\:\\:getParams\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Plugin/Namespace.php
+			path: engine/Library/Enlight/Controller/Request/Request.php
 
 		-
-			message: "#^Access to an undefined property Enlight_Config\\:\\:\\$listeners\\.$#"
+			message: "#^Method Enlight_Controller_Request_Request\\:\\:getUserParam\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Plugin/Namespace/Config.php
+			path: engine/Library/Enlight/Controller/Request/Request.php
 
 		-
-			message: "#^Access to an undefined property Enlight_Config\\:\\:\\$plugins\\.$#"
-			count: 6
-			path: engine/Library/Enlight/Plugin/Namespace/Config.php
+			message: "#^Method Enlight_Controller_Request_Request\\:\\:getUserParams\\(\\) return type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Library/Enlight/Controller/Request/Request.php
 
 		-
-			message: "#^Method Enlight_Plugin_Namespace_Config\\:\\:Subscriber\\(\\) should return Enlight_Event_Subscriber_Plugin but returns Enlight_Event_Subscriber\\.$#"
+			message: "#^Method Enlight_Controller_Request_Request\\:\\:replacePost\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Plugin/Namespace/Config.php
+			path: engine/Library/Enlight/Controller/Request/Request.php
 
 		-
-			message: "#^Method Enlight_Plugin_Namespace_Config\\:\\:getConfig\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Request_Request\\:\\:replacePost\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Plugin/Namespace/Config.php
+			path: engine/Library/Enlight/Controller/Request/Request.php
 
 		-
-			message: "#^Method Enlight_Plugin_Namespace_Config\\:\\:getConfig\\(\\) return type has no value type specified in iterable type array\\|Enlight_Config\\.$#"
+			message: "#^Method Enlight_Controller_Request_Request\\:\\:set\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Plugin/Namespace/Config.php
+			path: engine/Library/Enlight/Controller/Request/Request.php
 
 		-
-			message: "#^Method Enlight_Plugin_Namespace_Config\\:\\:initStorage\\(\\) should return Enlight_Config but return statement is missing\\.$#"
+			message: "#^Method Enlight_Controller_Request_Request\\:\\:set\\(\\) has parameter \\$value with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Plugin/Namespace/Config.php
+			path: engine/Library/Enlight/Controller/Request/Request.php
 
 		-
-			message: "#^Method Enlight_Plugin_Namespace_Config\\:\\:setConfig\\(\\) has parameter \\$config with no type specified\\.$#"
+			message: "#^Method Enlight_Controller_Request_Request\\:\\:setAttribute\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Plugin/Namespace/Config.php
+			path: engine/Library/Enlight/Controller/Request/Request.php
 
 		-
-			message: "#^Method Enlight_Plugin_Namespace_Config\\:\\:setConfig\\(\\) has parameter \\$name with no type specified\\.$#"
+			message: "#^Method Enlight_Controller_Request_Request\\:\\:setBaseUrl\\(\\) has parameter \\$baseUrl with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Plugin/Namespace/Config.php
+			path: engine/Library/Enlight/Controller/Request/Request.php
 
 		-
-			message: "#^Method Enlight_Plugin_Namespace_Config\\:\\:toArray\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Request_Request\\:\\:setHeader\\(\\) has parameter \\$value with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Plugin/Namespace/Config.php
+			path: engine/Library/Enlight/Controller/Request/Request.php
 
 		-
-			message: "#^Parameter \\#2 \\$options of class Enlight_Event_Subscriber_Plugin constructor expects null, Enlight_Config given\\.$#"
+			message: "#^Method Enlight_Controller_Request_Request\\:\\:setParam\\(\\) has parameter \\$key with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Plugin/Namespace/Config.php
+			path: engine/Library/Enlight/Controller/Request/Request.php
 
 		-
-			message: "#^Method Enlight_Plugin_Namespace_Loader\\:\\:load\\(\\) should return Enlight_Plugin_PluginCollection but return statement is missing\\.$#"
+			message: "#^Method Enlight_Controller_Request_Request\\:\\:setParam\\(\\) has parameter \\$value with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Plugin/Namespace/Loader.php
+			path: engine/Library/Enlight/Controller/Request/Request.php
 
 		-
-			message: "#^Method Enlight_Plugin_Namespace_Loader\\:\\:loadAll\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Controller_Request_Request\\:\\:setParamSources\\(\\) has parameter \\$paramSources with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Plugin/Namespace/Loader.php
+			path: engine/Library/Enlight/Controller/Request/Request.php
 
 		-
-			message: "#^Property Enlight_Plugin_Namespace_Loader\\:\\:\\$prefixPaths type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Request_Request\\:\\:setParams\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Plugin/Namespace/Loader.php
+			path: engine/Library/Enlight/Controller/Request/Request.php
 
 		-
-			message: "#^Class Enlight_Plugin_PluginCollection implements generic interface IteratorAggregate but does not specify its types\\: TKey, TValue$#"
+			message: "#^Method Enlight_Controller_Request_Request\\:\\:setPost\\(\\) has parameter \\$spec with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Plugin/PluginCollection.php
+			path: engine/Library/Enlight/Controller/Request/Request.php
 
 		-
-			message: "#^Method Enlight_Plugin_PluginCollection\\:\\:__call\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Request_Request\\:\\:setQuery\\(\\) has parameter \\$spec with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Plugin/PluginCollection.php
+			path: engine/Library/Enlight/Controller/Request/Request.php
 
 		-
-			message: "#^Method Enlight_Plugin_PluginCollection\\:\\:__call\\(\\) should return Enlight_Plugin_Bootstrap\\|Enlight_Plugin_Namespace but returns Enlight_Plugin_Bootstrap\\|Enlight_Plugin_Namespace\\|null\\.$#"
+			message: "#^Method Enlight_Controller_Request_Request\\:\\:unsetAttribute\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Plugin/PluginCollection.php
+			path: engine/Library/Enlight/Controller/Request/Request.php
 
 		-
-			message: "#^Method Enlight_Plugin_PluginCollection\\:\\:load\\(\\) has parameter \\$name with no type specified\\.$#"
+			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:__get\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Plugin/PluginCollection.php
+			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
 
 		-
-			message: "#^Method Enlight_Plugin_PluginCollection\\:\\:load\\(\\) has parameter \\$throwException with no type specified\\.$#"
+			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:__set\\(\\) has parameter \\$value with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Plugin/PluginCollection.php
+			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
 
 		-
-			message: "#^Method Enlight_Template_Default\\:\\:Engine\\(\\) should return Enlight_Template_Manager but returns Smarty\\.$#"
+			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:getAttribute\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Default.php
+			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
 
 		-
-			message: "#^Method Enlight_Template_Default\\:\\:assign\\(\\) has parameter \\$tpl_var with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:getParam\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Default.php
+			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
 
 		-
-			message: "#^Method Enlight_Template_Default\\:\\:clearAssign\\(\\) has parameter \\$tpl_var with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:getParam\\(\\) has parameter \\$key with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Default.php
+			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
 
 		-
-			message: "#^Method Enlight_Template_Default\\:\\:extendsBlock\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:getParamSources\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Default.php
+			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
 
 		-
-			message: "#^Method Enlight_Template_Default\\:\\:extendsBlock\\(\\) has parameter \\$content with no type specified\\.$#"
+			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:getParams\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Default.php
+			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
 
 		-
-			message: "#^Method Enlight_Template_Default\\:\\:extendsBlock\\(\\) has parameter \\$spec with no type specified\\.$#"
+			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:getUserParam\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Default.php
+			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
 
 		-
-			message: "#^Method Enlight_Template_Default\\:\\:extendsTemplate\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:getUserParams\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Default.php
+			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
 
 		-
-			message: "#^Parameter \\#1 \\$varname of method Smarty_Internal_Data\\:\\:assignGlobal\\(\\) expects string, array\\|string given\\.$#"
+			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:replacePost\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Default.php
+			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
 
 		-
-			message: "#^Access to an undefined property Smarty_Security\\:\\:\\$smarty\\.$#"
+			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:replacePost\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Manager.php
+			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
 
 		-
-			message: "#^If condition is always true\\.$#"
+			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:set\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Manager.php
+			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
 
 		-
-			message: "#^Method Enlight_Template_Manager\\:\\:__construct\\(\\) has parameter \\$backendOptions with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:set\\(\\) has parameter \\$value with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Manager.php
+			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
 
 		-
-			message: "#^Method Enlight_Template_Manager\\:\\:__construct\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:setAttribute\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Manager.php
+			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
 
 		-
-			message: "#^Method Enlight_Template_Manager\\:\\:setOptions\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:setBaseUrl\\(\\) has parameter \\$baseUrl with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Manager.php
+			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
 
 		-
-			message: "#^Method Enlight_Template_Manager\\:\\:setTemplateDir\\(\\) has parameter \\$template_dir with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:setFiles\\(\\) has parameter \\$files with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Manager.php
+			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
 
 		-
-			message: "#^Property Smarty\\:\\:\\$start_time \\(int\\) does not accept float\\.$#"
+			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:setHeader\\(\\) has parameter \\$value with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Manager.php
+			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
 
 		-
-			message: "#^Function mb_str_replace not found\\.$#"
+			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:setParam\\(\\) has parameter \\$key with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/block.replace.php
+			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
 
 		-
-			message: "#^Function smarty_block_replace\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:setParam\\(\\) has parameter \\$value with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/block.replace.php
+			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
 
 		-
-			message: "#^Function smarty_block_replace\\(\\) has parameter \\$smarty with no type specified\\.$#"
+			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:setParamSources\\(\\) has parameter \\$paramSources with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/block.replace.php
+			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
 
 		-
-			message: "#^Function smarty_block_replace\\(\\) should return string but empty return statement found\\.$#"
+			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:setParams\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/block.replace.php
+			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
 
 		-
-			message: "#^Function smarty_block_stripLines\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:setPost\\(\\) has parameter \\$spec with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/block.stripLines.php
+			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
 
 		-
-			message: "#^Function smarty_block_stripLines\\(\\) never returns void so it can be removed from the return type\\.$#"
+			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:setQuery\\(\\) has parameter \\$spec with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/block.stripLines.php
+			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
 
 		-
-			message: "#^Method Smarty_Compiler_Config\\:\\:compile\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Request_RequestHttp\\:\\:unsetAttribute\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/compiler.config.php
+			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
 
 		-
-			message: "#^Method Smarty_Compiler_Config\\:\\:compile\\(\\) should return string but returns null\\.$#"
+			message: "#^Property Enlight_Controller_Request_RequestHttp\\:\\:\\$_params type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/compiler.config.php
+			path: engine/Library/Enlight/Controller/Request/RequestHttp.php
 
 		-
-			message: "#^Property Smarty_Compiler_Config\\:\\:\\$optional_attributes type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Request_RequestTestCase\\:\\:clearAll\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/compiler.config.php
+			path: engine/Library/Enlight/Controller/Request/RequestTestCase.php
 
 		-
-			message: "#^Property Smarty_Compiler_Config\\:\\:\\$required_attributes type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Request_RequestTestCase\\:\\:getClientIp\\(\\) should return string but returns string\\|null\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/compiler.config.php
+			path: engine/Library/Enlight/Controller/Request/RequestTestCase.php
 
 		-
-			message: "#^Method Smarty_Compiler_DnsPrefetch\\:\\:compile\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Request_RequestTestCase\\:\\:getHeader\\(\\) has parameter \\$default with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/compiler.dnsPrefetch.php
+			path: engine/Library/Enlight/Controller/Request/RequestTestCase.php
 
 		-
-			message: "#^Property Smarty_Compiler_DnsPrefetch\\:\\:\\$optional_attributes type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Request_RequestTestCase\\:\\:getHeaders\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/compiler.dnsPrefetch.php
+			path: engine/Library/Enlight/Controller/Request/RequestTestCase.php
 
 		-
-			message: "#^Property Smarty_Compiler_DnsPrefetch\\:\\:\\$required_attributes type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Request_RequestTestCase\\:\\:getRawBody\\(\\) should return string\\|null but returns resource\\|string\\|false\\|null\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/compiler.dnsPrefetch.php
+			path: engine/Library/Enlight/Controller/Request/RequestTestCase.php
 
 		-
-			message: "#^Access to an undefined property object\\:\\:\\$smarty\\.$#"
+			message: "#^Method Enlight_Controller_Request_RequestTestCase\\:\\:setCookie\\(\\) has parameter \\$value with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/compiler.link.php
+			path: engine/Library/Enlight/Controller/Request/RequestTestCase.php
 
 		-
-			message: "#^Method Smarty_Compiler_Link\\:\\:compile\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Request_RequestTestCase\\:\\:setCookies\\(\\) has parameter \\$cookies with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/compiler.link.php
+			path: engine/Library/Enlight/Controller/Request/RequestTestCase.php
 
 		-
-			message: "#^Method Smarty_Compiler_Link\\:\\:compile\\(\\) should return string but returns false\\.$#"
+			message: "#^Method Enlight_Controller_Request_RequestTestCase\\:\\:setDeviceType\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/compiler.link.php
+			path: engine/Library/Enlight/Controller/Request/RequestTestCase.php
 
 		-
-			message: "#^Parameter \\#2 \\$template of function smarty_function_flink expects string, object given\\.$#"
+			message: "#^Method Enlight_Controller_Request_RequestTestCase\\:\\:setHeaders\\(\\) has parameter \\$headers with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/compiler.link.php
+			path: engine/Library/Enlight/Controller/Request/RequestTestCase.php
 
 		-
-			message: "#^Property Smarty_Compiler_Link\\:\\:\\$option_flags type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Enlight_Controller_Request_RequestTestCase\\:\\:\\$_serverParams type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/compiler.link.php
+			path: engine/Library/Enlight/Controller/Request/RequestTestCase.php
 
 		-
-			message: "#^Property Smarty_Compiler_Link\\:\\:\\$required_attributes type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Response_Response\\:\\:getBody\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/compiler.link.php
+			path: engine/Library/Enlight/Controller/Response/Response.php
 
 		-
-			message: "#^Method Smarty_Compiler_Media\\:\\:compile\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Response_Response\\:\\:getCookies\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/compiler.media.php
+			path: engine/Library/Enlight/Controller/Response/Response.php
 
 		-
-			message: "#^Method Smarty_Compiler_Media\\:\\:compile\\(\\) should return string but returns false\\.$#"
+			message: "#^Method Enlight_Controller_Response_Response\\:\\:getExceptionByCode\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/compiler.media.php
+			path: engine/Library/Enlight/Controller/Response/Response.php
 
 		-
-			message: "#^Method Smarty_Compiler_Media\\:\\:parseAttributes\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Response_Response\\:\\:getExceptionByCode\\(\\) has parameter \\$code with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/compiler.media.php
+			path: engine/Library/Enlight/Controller/Response/Response.php
 
 		-
-			message: "#^Method Smarty_Compiler_Media\\:\\:parseAttributes\\(\\) should return string but returns array\\.$#"
+			message: "#^Method Enlight_Controller_Response_Response\\:\\:getExceptionByMessage\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/compiler.media.php
+			path: engine/Library/Enlight/Controller/Response/Response.php
 
 		-
-			message: "#^Offset 'path' does not exist on string\\.$#"
+			message: "#^Method Enlight_Controller_Response_Response\\:\\:getExceptionByType\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/compiler.media.php
+			path: engine/Library/Enlight/Controller/Response/Response.php
 
 		-
-			message: "#^Property Smarty_Compiler_Media\\:\\:\\$required_attributes type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Response_Response\\:\\:getHeaders\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/compiler.media.php
+			path: engine/Library/Enlight/Controller/Response/Response.php
 
 		-
-			message: "#^Method Smarty_Compiler_Preconnect\\:\\:compile\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Response_Response\\:\\:prepend\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/compiler.preconnect.php
+			path: engine/Library/Enlight/Controller/Response/Response.php
 
 		-
-			message: "#^Property Smarty_Compiler_Preconnect\\:\\:\\$optional_attributes type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Response_Response\\:\\:setBody\\(\\) has parameter \\$content with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/compiler.preconnect.php
+			path: engine/Library/Enlight/Controller/Response/Response.php
 
 		-
-			message: "#^Property Smarty_Compiler_Preconnect\\:\\:\\$required_attributes type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:__toString\\(\\) should return string but returns string\\|false\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/compiler.preconnect.php
+			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
 
 		-
-			message: "#^Method Smarty_Compiler_Prefetch\\:\\:compile\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:clearRawHeader\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/compiler.prefetch.php
+			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
 
 		-
-			message: "#^Property Smarty_Compiler_Prefetch\\:\\:\\$optional_attributes type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:clearRawHeader\\(\\) has parameter \\$headerRaw with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/compiler.prefetch.php
+			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
 
 		-
-			message: "#^Property Smarty_Compiler_Prefetch\\:\\:\\$required_attributes type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:clearRawHeaders\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/compiler.prefetch.php
+			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
 
 		-
-			message: "#^Method Smarty_Compiler_Preload\\:\\:compile\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:getBody\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/compiler.preload.php
+			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
 
 		-
-			message: "#^Property Smarty_Compiler_Preload\\:\\:\\$optional_attributes type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:getCookies\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/compiler.preload.php
+			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
 
 		-
-			message: "#^Property Smarty_Compiler_Preload\\:\\:\\$required_attributes type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:getExceptionByCode\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/compiler.preload.php
+			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
 
 		-
-			message: "#^Method Smarty_Compiler_Prerender\\:\\:compile\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:getExceptionByCode\\(\\) has parameter \\$code with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/compiler.prerender.php
+			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
 
 		-
-			message: "#^Property Smarty_Compiler_Prerender\\:\\:\\$optional_attributes type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:getExceptionByMessage\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/compiler.prerender.php
+			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
 
 		-
-			message: "#^Property Smarty_Compiler_Prerender\\:\\:\\$required_attributes type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:getExceptionByType\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/compiler.prerender.php
+			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
 
 		-
-			message: "#^Method Smarty_Compiler_Timestamp\\:\\:compile\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:getHeaders\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/compiler.timestamp.php
+			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
 
 		-
-			message: "#^Method Smarty_Compiler_Url\\:\\:compile\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:getRawHeaderParts\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/compiler.url.php
+			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
 
 		-
-			message: "#^Property Smarty_Compiler_Url\\:\\:\\$option_flags type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:getRawHeaders\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/compiler.url.php
+			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
 
 		-
-			message: "#^Property Smarty_Compiler_Url\\:\\:\\$optional_attributes type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:outputBody\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/compiler.url.php
+			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
 
 		-
-			message: "#^Function smarty_function_action\\(\\) has parameter \\$params with no type specified\\.$#"
+			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:prepend\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/function.action.php
+			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
 
 		-
-			message: "#^Function smarty_function_action\\(\\) should return string but returns array\\|string\\|null\\.$#"
+			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:removeCookie\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/function.action.php
+			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
 
 		-
-			message: "#^Parameter \\#1 \\$request of method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:renderEsiTag\\(\\) expects Enlight_Controller_Request_RequestHttp, Enlight_Controller_Request_Request given\\.$#"
+			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:renderExceptions\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/function.action.php
+			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
 
 		-
-			message: "#^Parameter \\#1 \\$request of method Symfony\\\\Component\\\\HttpFoundation\\\\RequestStack\\:\\:push\\(\\) expects Symfony\\\\Component\\\\HttpFoundation\\\\Request, Enlight_Controller_Request_Request given\\.$#"
+			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:renderExceptions\\(\\) has parameter \\$flag with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/function.action.php
+			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
 
 		-
-			message: "#^Cannot call method assign\\(\\) on string\\.$#"
-			count: 2
-			path: engine/Library/Enlight/Template/Plugins/function.compileJavascript.php
+			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:sendCookies\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
 
 		-
-			message: "#^Function smarty_function_compileJavascript\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:sendResponse\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/function.compileJavascript.php
+			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
 
 		-
-			message: "#^Function smarty_function_compileJavascript\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:setBody\\(\\) has parameter \\$content with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/function.compileJavascript.php
+			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
 
 		-
-			message: "#^Parameter \\#2 \\$template of method Shopware\\\\Components\\\\Theme\\\\Compiler\\:\\:compileJavascript\\(\\) expects Shopware\\\\Models\\\\Shop\\\\Template, Shopware\\\\Models\\\\Shop\\\\Template\\|null given\\.$#"
+			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:setRawHeader\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/function.compileJavascript.php
+			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
 
 		-
-			message: "#^Cannot call method assign\\(\\) on array\\.$#"
-			count: 2
-			path: engine/Library/Enlight/Template/Plugins/function.compileLess.php
+			message: "#^Method Enlight_Controller_Response_ResponseHttp\\:\\:setRawHeader\\(\\) has parameter \\$value with no type specified\\.$#"
+			count: 1
+			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
 
 		-
-			message: "#^Function smarty_function_compileLess\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\(array\\|string\\|null\\) of echo cannot be converted to string\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/function.compileLess.php
+			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
 
 		-
-			message: "#^Function smarty_function_compileLess\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#2 \\$path of method Symfony\\\\Component\\\\HttpFoundation\\\\ResponseHeaderBag\\:\\:removeCookie\\(\\) expects string, string\\|null given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/function.compileLess.php
+			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
 
 		-
-			message: "#^Function smarty_function_compileLess\\(\\) has parameter \\$template with no value type specified in iterable type array\\.$#"
+			message: "#^Property Symfony\\\\Component\\\\HttpFoundation\\\\Response\\:\\:\\$content \\(string\\) does not accept null\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/function.compileLess.php
+			path: engine/Library/Enlight/Controller/Response/ResponseHttp.php
 
 		-
-			message: "#^Parameter \\#2 \\$template of method Shopware\\\\Components\\\\Theme\\\\Compiler\\:\\:compileLess\\(\\) expects Shopware\\\\Models\\\\Shop\\\\Template, Shopware\\\\Models\\\\Shop\\\\Template\\|null given\\.$#"
+			message: "#^Method Enlight_Controller_Response_ResponseTestCase\\:\\:getBody\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/function.compileLess.php
+			path: engine/Library/Enlight/Controller/Response/ResponseTestCase.php
 
 		-
-			message: "#^Function smarty_function_controllerAction\\(\\) has parameter \\$params with no type specified\\.$#"
+			message: "#^Method Enlight_Controller_Response_ResponseTestCase\\:\\:getCookie\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/function.controllerAction.php
+			path: engine/Library/Enlight/Controller/Response/ResponseTestCase.php
 
 		-
-			message: "#^Function smarty_function_controllerAction\\(\\) should return string but returns string\\|null\\.$#"
+			message: "#^Method Enlight_Controller_Response_ResponseTestCase\\:\\:getFullCookie\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/function.controllerAction.php
+			path: engine/Library/Enlight/Controller/Response/ResponseTestCase.php
 
 		-
-			message: "#^Function smarty_function_controllerName\\(\\) has parameter \\$params with no type specified\\.$#"
+			message: "#^Method Enlight_Controller_Response_ResponseTestCase\\:\\:getHeader\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/function.controllerName.php
+			path: engine/Library/Enlight/Controller/Response/ResponseTestCase.php
 
 		-
-			message: "#^Function smarty_function_controllerName\\(\\) should return string but returns string\\|null\\.$#"
+			message: "#^Method Enlight_Controller_Router\\:\\:setGlobalParam\\(\\) has parameter \\$value with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/function.controllerName.php
+			path: engine/Library/Enlight/Controller/Router.php
 
 		-
-			message: "#^Function smarty_function_encoding\\(\\) has no return type specified\\.$#"
+			message: "#^Property Enlight_Controller_Router\\:\\:\\$globalParams type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/function.encoding.php
+			path: engine/Library/Enlight/Controller/Router.php
 
 		-
-			message: "#^Function smarty_function_encoding\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Event_EventArgs\\:\\:__construct\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/function.encoding.php
+			path: engine/Library/Enlight/Event/EventArgs.php
 
 		-
-			message: "#^Function smarty_function_encoding\\(\\) has parameter \\$smarty with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Event_EventArgs\\:\\:getReturn\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/function.encoding.php
+			path: engine/Library/Enlight/Event/EventArgs.php
 
 		-
-			message: "#^Function smarty_function_fetchContent\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Event_EventArgs\\:\\:setName\\(\\) has parameter \\$name with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/function.fetchContent.php
+			path: engine/Library/Enlight/Event/EventArgs.php
 
 		-
-			message: "#^Function smarty_function_fetchContent\\(\\) has parameter \\$parameters with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Event_EventArgs\\:\\:setName\\(\\) should return string but return statement is missing\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/function.fetchContent.php
+			path: engine/Library/Enlight/Event/EventArgs.php
 
 		-
-			message: "#^Cannot access property \\$smarty on string\\.$#"
-			count: 2
-			path: engine/Library/Enlight/Template/Plugins/function.flink.php
+			message: "#^Method Enlight_Event_EventArgs\\:\\:setReturn\\(\\) has parameter \\$return with no type specified\\.$#"
+			count: 1
+			path: engine/Library/Enlight/Event/EventArgs.php
 
 		-
-			message: "#^Function smarty_function_flink\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
+			message: "#^PHPDoc tag @param for parameter \\$args with type array\\|null is not subtype of native type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/function.flink.php
+			path: engine/Library/Enlight/Event/EventArgs.php
 
 		-
-			message: "#^Call to an undefined method object\\:\\:assign\\(\\)\\.$#"
+			message: "#^Method Enlight_Event_EventHandler\\:\\:__construct\\(\\) has parameter \\$plugin with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/function.partition.php
+			path: engine/Library/Enlight/Event/EventHandler.php
 
 		-
-			message: "#^Function smarty_function_partition\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Event_EventHandler\\:\\:getPlugin\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/function.partition.php
+			path: engine/Library/Enlight/Event/EventHandler.php
 
 		-
-			message: "#^Function smarty_function_partition\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Event_EventHandler\\:\\:setPlugin\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/function.partition.php
+			path: engine/Library/Enlight/Event/EventHandler.php
 
 		-
-			message: "#^Parameter \\#2 \\$offset of function array_slice expects int, float\\|int given\\.$#"
+			message: "#^Method Enlight_Event_EventHandler\\:\\:setPlugin\\(\\) has parameter \\$plugin with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/function.partition.php
+			path: engine/Library/Enlight/Event/EventHandler.php
 
 		-
-			message: "#^Parameter \\#3 \\$length of function array_slice expects int\\|null, float given\\.$#"
+			message: "#^Method Enlight_Event_EventHandler\\:\\:toArray\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/function.partition.php
+			path: engine/Library/Enlight/Event/EventHandler.php
 
 		-
-			message: "#^Call to an undefined method object\\:\\:assign\\(\\)\\.$#"
+			message: "#^Property Enlight_Event_EventHandler\\:\\:\\$plugin has no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/function.slice.php
+			path: engine/Library/Enlight/Event/EventHandler.php
 
 		-
-			message: "#^Function smarty_function_slice\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Event_EventManager\\:\\:collect\\(\\) has parameter \\$collection with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/function.slice.php
+			path: engine/Library/Enlight/Event/EventManager.php
 
 		-
-			message: "#^Function smarty_function_slice\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Event_EventManager\\:\\:collect\\(\\) has parameter \\$eventArgs with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/function.slice.php
+			path: engine/Library/Enlight/Event/EventManager.php
 
 		-
-			message: "#^Function smarty_function_themeTimestamp\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Event_EventManager\\:\\:collect\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/function.themeTimestamp.php
+			path: engine/Library/Enlight/Event/EventManager.php
 
 		-
-			message: "#^Function smarty_function_themeTimestamp\\(\\) has parameter \\$params with no type specified\\.$#"
+			message: "#^Method Enlight_Event_EventManager\\:\\:filter\\(\\) has parameter \\$eventArgs with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/function.themeTimestamp.php
+			path: engine/Library/Enlight/Event/EventManager.php
 
 		-
-			message: "#^Function smarty_function_themeTimestamp\\(\\) has parameter \\$template with no type specified\\.$#"
+			message: "#^Method Enlight_Event_EventManager\\:\\:getEvents\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/function.themeTimestamp.php
+			path: engine/Library/Enlight/Event/EventManager.php
 
 		-
-			message: "#^Function smarty_modifier_array_unset\\(\\) has parameter \\$keys with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Event_EventManager\\:\\:getListeners\\(\\) has parameter \\$event with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/modifier.array_unset.php
+			path: engine/Library/Enlight/Event/EventManager.php
 
 		-
-			message: "#^Function smarty_modifier_array_unset\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Event_EventManager\\:\\:notify\\(\\) has parameter \\$eventArgs with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/modifier.array_unset.php
+			path: engine/Library/Enlight/Event/EventManager.php
 
 		-
-			message: "#^Function smarty_modifier_array_unset\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Event_EventManager\\:\\:notifyUntil\\(\\) has parameter \\$eventArgs with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/modifier.array_unset.php
+			path: engine/Library/Enlight/Event/EventManager.php
 
 		-
-			message: "#^Function smarty_modifier_count\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Event_EventManager\\:\\:registerSubscriber\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/modifier.count.php
+			path: engine/Library/Enlight/Event/EventManager.php
 
 		-
-			message: "#^Function smarty_modifier_count\\(\\) has parameter \\$value with no type specified\\.$#"
+			message: "#^Method Enlight_Event_Handler\\:\\:__construct\\(\\) has parameter \\$event with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/modifier.count.php
+			path: engine/Library/Enlight/Event/Handler.php
 
 		-
-			message: "#^Function smarty_modifier_currency\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Event_Handler\\:\\:execute\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/modifier.currency.php
+			path: engine/Library/Enlight/Event/Handler.php
 
 		-
-			message: "#^Parameter \\#3 \\$subject of function str_replace expects array\\|string, float given\\.$#"
+			message: "#^Method Enlight_Event_Handler_Default\\:\\:execute\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/modifier.currency.php
+			path: engine/Library/Enlight/Event/Handler/Default.php
 
 		-
-			message: "#^Parameter \\#1 \\$date of class Zend_Date constructor expects array\\|int\\|string\\|Zend_Date\\|null, DateTime\\|int\\|false given\\.$#"
+			message: "#^Method Enlight_Event_Handler_Default\\:\\:toArray\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/modifier.date.php
+			path: engine/Library/Enlight/Event/Handler/Default.php
 
 		-
-			message: "#^Function smarty_modifier_number\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$listener of method Enlight_Event_Handler_Default\\:\\:setListener\\(\\) expects array\\<int, object\\|string\\>\\|\\(callable\\(\\)\\: mixed\\), array\\<int, \\(callable\\(\\)\\: mixed\\)\\|object\\|string\\>\\|\\(callable\\(\\)\\: mixed\\) given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/modifier.number.php
+			path: engine/Library/Enlight/Event/Handler/Default.php
 
 		-
-			message: "#^Function smarty_modifier_number\\(\\) has parameter \\$format with no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#1 \\$position of method Enlight_Event_Handler\\:\\:setPosition\\(\\) expects int, int\\|null given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/modifier.number.php
+			path: engine/Library/Enlight/Event/Handler/Default.php
 
 		-
-			message: "#^Function smarty_modifier_tax\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Event_Handler_Plugin\\:\\:execute\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/modifier.tax.php
+			path: engine/Library/Enlight/Event/Handler/Plugin.php
 
 		-
-			message: "#^Cannot call method getTranslation\\(\\) on string\\|Zend_Locale\\.$#"
+			message: "#^Method Enlight_Event_Handler_Plugin\\:\\:toArray\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/modifier.translate.php
+			path: engine/Library/Enlight/Event/Handler/Plugin.php
 
 		-
-			message: "#^Function smarty_modifiercompiler_template_exists\\(\\) has parameter \\$compiler with no type specified\\.$#"
+			message: "#^Parameter \\#1 \\$position of method Enlight_Event_Handler\\:\\:setPosition\\(\\) expects int, int\\|null given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/modifiercompiler.template_exists.php
+			path: engine/Library/Enlight/Event/Handler/Plugin.php
 
 		-
-			message: "#^Function smarty_modifiercompiler_template_exists\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
+			message: "#^Unreachable statement \\- code above always terminates\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/modifiercompiler.template_exists.php
+			path: engine/Library/Enlight/Event/Handler/Plugin.php
 
 		-
-			message: "#^Cannot access property \\$handler on array\\.$#"
+			message: "#^Method Enlight_Event_Subscriber\\:\\:getListeners\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/resource.parent.php
+			path: engine/Library/Enlight/Event/Subscriber.php
 
 		-
-			message: "#^Cannot access property \\$parent on Smarty_Internal_Template\\|null\\.$#"
+			message: "#^Method Enlight_Event_Subscriber_Array\\:\\:__construct\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/resource.parent.php
+			path: engine/Library/Enlight/Event/Subscriber/Array.php
 
 		-
-			message: "#^Method Smarty_Resource_Parent\\:\\:populate\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Event_Subscriber_Array\\:\\:getListeners\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/resource.parent.php
+			path: engine/Library/Enlight/Event/Subscriber/Array.php
 
 		-
-			message: "#^Property Smarty_Resource_Parent\\:\\:\\$index has no type specified\\.$#"
+			message: "#^Parameter \\#2 \\$offset of function array_splice expects int, int\\|string given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/resource.parent.php
+			path: engine/Library/Enlight/Event/Subscriber/Array.php
 
 		-
-			message: "#^Property Smarty_Template_Source\\:\\:\\$components \\(array\\) does not accept Smarty_Template_Source\\.$#"
+			message: "#^Property Enlight_Event_Subscriber_Array\\:\\:\\$listeners type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/resource.parent.php
+			path: engine/Library/Enlight/Event/Subscriber/Array.php
 
 		-
-			message: "#^Property Smarty_Template_Source\\:\\:\\$template \\(bool\\) does not accept Smarty_Internal_Template\\|null\\.$#"
+			message: "#^Access to an undefined property Enlight_Config\\:\\:\\$listener\\.$#"
 			count: 1
-			path: engine/Library/Enlight/Template/Plugins/resource.parent.php
+			path: engine/Library/Enlight/Event/Subscriber/Config.php
 
 		-
-			message: "#^Method Enlight_View\\:\\:__set\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Library/Enlight/View.php
+			message: "#^Access to an undefined property Enlight_Config\\:\\:\\$listeners\\.$#"
+			count: 2
+			path: engine/Library/Enlight/Event/Subscriber/Config.php
 
 		-
-			message: "#^Method Enlight_View\\:\\:__set\\(\\) has parameter \\$name with no type specified\\.$#"
+			message: "#^Access to an undefined property Enlight_Config\\:\\:\\$name\\.$#"
 			count: 1
-			path: engine/Library/Enlight/View.php
+			path: engine/Library/Enlight/Event/Subscriber/Config.php
 
 		-
-			message: "#^Method Enlight_View\\:\\:__set\\(\\) has parameter \\$value with no type specified\\.$#"
+			message: "#^Access to an undefined property Enlight_Config\\:\\:\\$position\\.$#"
 			count: 1
-			path: engine/Library/Enlight/View.php
+			path: engine/Library/Enlight/Event/Subscriber/Config.php
 
 		-
-			message: "#^Method Enlight_View\\:\\:addTemplateDir\\(\\) has parameter \\$path with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Event_Subscriber_Config\\:\\:__construct\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/View.php
+			path: engine/Library/Enlight/Event/Subscriber/Config.php
 
 		-
-			message: "#^Method Enlight_View\\:\\:setTemplateDir\\(\\) has parameter \\$path with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Event_Subscriber_Config\\:\\:getListeners\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/View.php
+			path: engine/Library/Enlight/Event/Subscriber/Config.php
 
 		-
-			message: "#^Method Enlight_View_Cache\\:\\:addCacheId\\(\\) has parameter \\$cache_id with no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#2 \\$offset of function array_splice expects int, int\\|string given\\.$#"
 			count: 1
-			path: engine/Library/Enlight/View/Cache.php
+			path: engine/Library/Enlight/Event/Subscriber/Config.php
 
 		-
-			message: "#^Method Enlight_View_Cache\\:\\:setCacheId\\(\\) has parameter \\$cache_id with no value type specified in iterable type array\\.$#"
+			message: "#^Property Enlight_Event_Subscriber_Config\\:\\:\\$listeners type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/View/Cache.php
+			path: engine/Library/Enlight/Event/Subscriber/Config.php
 
 		-
-			message: "#^Method Enlight_View_Default\\:\\:addCacheId\\(\\) has parameter \\$cache_id with no value type specified in iterable type array\\.$#"
+			message: "#^Access to an undefined property Enlight_Config\\:\\:\\$listener\\.$#"
 			count: 1
-			path: engine/Library/Enlight/View/Default.php
+			path: engine/Library/Enlight/Event/Subscriber/Plugin.php
 
 		-
-			message: "#^Method Enlight_View_Default\\:\\:assign\\(\\) has parameter \\$spec with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Library/Enlight/View/Default.php
+			message: "#^Access to an undefined property Enlight_Config\\:\\:\\$listeners\\.$#"
+			count: 2
+			path: engine/Library/Enlight/Event/Subscriber/Plugin.php
 
 		-
-			message: "#^Method Enlight_View_Default\\:\\:createTemplate\\(\\) should return Enlight_Template_Default but returns object\\.$#"
+			message: "#^Access to an undefined property Enlight_Config\\:\\:\\$name\\.$#"
 			count: 1
-			path: engine/Library/Enlight/View/Default.php
+			path: engine/Library/Enlight/Event/Subscriber/Plugin.php
 
 		-
-			message: "#^Method Enlight_View_Default\\:\\:extendsBlock\\(\\) has parameter \\$content with no type specified\\.$#"
+			message: "#^Access to an undefined property Enlight_Config\\:\\:\\$plugin\\.$#"
 			count: 1
-			path: engine/Library/Enlight/View/Default.php
+			path: engine/Library/Enlight/Event/Subscriber/Plugin.php
 
 		-
-			message: "#^Method Enlight_View_Default\\:\\:extendsBlock\\(\\) has parameter \\$spec with no type specified\\.$#"
+			message: "#^Access to an undefined property Enlight_Config\\:\\:\\$position\\.$#"
 			count: 1
-			path: engine/Library/Enlight/View/Default.php
+			path: engine/Library/Enlight/Event/Subscriber/Plugin.php
 
 		-
-			message: "#^Method Enlight_View_Default\\:\\:setCacheId\\(\\) has parameter \\$cache_id with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Event_Subscriber_Plugin\\:\\:__construct\\(\\) has parameter \\$namespace with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/View/Default.php
+			path: engine/Library/Enlight/Event/Subscriber/Plugin.php
 
 		-
-			message: "#^Method Enlight_View_Default\\:\\:setTemplateDir\\(\\) has parameter \\$path with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Event_Subscriber_Plugin\\:\\:toArray\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/View/Default.php
+			path: engine/Library/Enlight/Event/Subscriber/Plugin.php
 
 		-
-			message: "#^Parameter \\#1 \\$cacheId of method Enlight_Template_Default\\:\\:addCacheId\\(\\) expects null, array\\|string given\\.$#"
+			message: "#^Method Enlight_Hook_HookArgs\\:\\:__construct\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/View/Default.php
+			path: engine/Library/Enlight/Hook/HookArgs.php
 
 		-
-			message: "#^Parameter \\#1 \\$cacheId of method Enlight_Template_Default\\:\\:setCacheId\\(\\) expects null, array\\|string\\|null given\\.$#"
+			message: "#^Method Enlight_Hook_HookArgs\\:\\:__construct\\(\\) has parameter \\$subject with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/View/Default.php
+			path: engine/Library/Enlight/Hook/HookArgs.php
 
 		-
-			message: "#^Parameter \\#3 \\$nocache of method Enlight_Template_Default\\:\\:assign\\(\\) expects bool, bool\\|null given\\.$#"
+			message: "#^Method Enlight_Hook_HookArgs\\:\\:getArgs\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/View/Default.php
+			path: engine/Library/Enlight/Hook/HookArgs.php
 
 		-
-			message: "#^Parameter \\#3 \\$nocache of method Smarty_Internal_Data\\:\\:assign\\(\\) expects bool, bool\\|null given\\.$#"
+			message: "#^Method Enlight_Hook_HookArgs\\:\\:set\\(\\) has parameter \\$value with no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/View/Default.php
+			path: engine/Library/Enlight/Hook/HookArgs.php
 
 		-
-			message: "#^Property Enlight_View_Default\\:\\:\\$scope \\(int\\) does not accept int\\|null\\.$#"
+			message: "#^Property Enlight_Hook_HookArgs\\:\\:\\$_subject has no type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/View/Default.php
+			path: engine/Library/Enlight/Hook/HookArgs.php
 
 		-
-			message: "#^Property Enlight_View_Default\\:\\:\\$template \\(Enlight_Template_Default\\|null\\) does not accept object\\.$#"
+			message: "#^Method Enlight_Hook_HookExecutionContext\\:\\:__construct\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Library/Enlight/View/Default.php
+			path: engine/Library/Enlight/Hook/HookExecutionContext.php
 
 		-
-			message: "#^Return type \\(Enlight_Template_Default\\) of method Enlight_View_Default\\:\\:clearAssign\\(\\) should be compatible with return type \\(Enlight_View\\) of method Enlight_View\\:\\:clearAssign\\(\\)$#"
+			message: "#^Method Enlight_Hook_HookExecutionContext\\:\\:execute\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Library/Enlight/View/Default.php
+			path: engine/Library/Enlight/Hook/HookExecutionContext.php
 
 		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\:\\:load\\(\\)\\.$#"
+			message: "#^Method Enlight_Hook_HookExecutionContext\\:\\:executeReplaceChain\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bootstrap.php
+			path: engine/Library/Enlight/Hook/HookExecutionContext.php
 
 		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\:\\:reset\\(\\)\\.$#"
+			message: "#^Method Enlight_Hook_HookExecutionContext\\:\\:executeReplaceChain\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bootstrap.php
+			path: engine/Library/Enlight/Hook/HookExecutionContext.php
 
 		-
-			message: "#^Method Shopware_Bootstrap\\:\\:__call\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#1 \\$name of method Enlight_Hook_HookManager\\:\\:getAlias\\(\\) expects string, class\\-string\\|false given\\.$#"
 			count: 1
-			path: engine/Shopware/Bootstrap.php
+			path: engine/Library/Enlight/Hook/HookExecutionContext.php
 
 		-
-			message: "#^Method Shopware_Bootstrap\\:\\:getResource\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Hook_HookManager\\:\\:__construct\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bootstrap.php
+			path: engine/Library/Enlight/Hook/HookManager.php
 
 		-
-			message: "#^Method Shopware_Bootstrap\\:\\:registerResource\\(\\) has parameter \\$resource with no type specified\\.$#"
+			message: "#^Method Enlight_Hook_HookManager\\:\\:executeHooks\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bootstrap.php
+			path: engine/Library/Enlight/Hook/HookManager.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Constraint\\\\CurrentPasswordValidator\\:\\:validate\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Hook_HookManager\\:\\:executeHooks\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Constraint/CurrentPasswordValidator.php
+			path: engine/Library/Enlight/Hook/HookManager.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Constraint\\\\CustomerEmailValidator\\:\\:addError\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Hook_HookManager\\:\\:getProxy\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Constraint/CustomerEmailValidator.php
+			path: engine/Library/Enlight/Hook/HookManager.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Constraint\\\\CustomerEmailValidator\\:\\:getSnippet\\(\\) has parameter \\$snippet with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Hook_HookManager\\:\\:getProxyFactory\\(\\) should return Enlight_Hook_ProxyFactory but returns Enlight_Hook_ProxyFactory\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Constraint/CustomerEmailValidator.php
+			path: engine/Library/Enlight/Hook/HookManager.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Constraint\\\\CustomerEmailValidator\\:\\:validate\\(\\) has no return type specified\\.$#"
+			message: "#^Property Enlight_Hook_HookManager\\:\\:\\$aliases type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Constraint/CustomerEmailValidator.php
+			path: engine/Library/Enlight/Hook/HookManager.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Constraint\\\\FormEmailValidator\\:\\:getSnippet\\(\\) has parameter \\$snippet with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Hook_Proxy\\:\\:__executeOriginalMethod\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Constraint/FormEmailValidator.php
+			path: engine/Library/Enlight/Hook/Proxy.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Constraint\\\\FormEmailValidator\\:\\:validate\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Hook_Proxy\\:\\:__executeOriginalMethod\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Constraint/FormEmailValidator.php
+			path: engine/Library/Enlight/Hook/Proxy.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Constraint\\\\PasswordValidator\\:\\:getSnippet\\(\\) has parameter \\$snippet with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Hook_Proxy\\:\\:__popHookExecutionContext\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Constraint/PasswordValidator.php
+			path: engine/Library/Enlight/Hook/Proxy.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Constraint\\\\PasswordValidator\\:\\:validate\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Hook_Proxy\\:\\:__pushHookExecutionContext\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Constraint/PasswordValidator.php
+			path: engine/Library/Enlight/Hook/Proxy.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Form\\\\Account\\\\AddressFormType\\:\\:addCompanyValidation\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Hook_Proxy\\:\\:executeParent\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Form/Account/AddressFormType.php
+			path: engine/Library/Enlight/Hook/Proxy.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Form\\\\Account\\\\AddressFormType\\:\\:addCountryStateValidation\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Hook_Proxy\\:\\:executeParent\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Form/Account/AddressFormType.php
+			path: engine/Library/Enlight/Hook/Proxy.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Form\\\\Account\\\\AddressFormType\\:\\:addVatIdValidation\\(\\) has no return type specified\\.$#"
+			message: "#^Cannot call method getName\\(\\) on ReflectionType\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Form/Account/AddressFormType.php
+			path: engine/Library/Enlight/Hook/ProxyFactory.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Form\\\\Account\\\\AddressFormType\\:\\:buildForm\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Hook_ProxyFactory\\:\\:clearCache\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Form/Account/AddressFormType.php
+			path: engine/Library/Enlight/Hook/ProxyFactory.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Form\\\\Account\\\\AddressFormType\\:\\:configureOptions\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Hook_ProxyFactory\\:\\:createMethodGenerator\\(\\) should return ProxyManager\\\\Generator\\\\MethodGenerator but returns Laminas\\\\Code\\\\Generator\\\\MethodGenerator\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Form/Account/AddressFormType.php
+			path: engine/Library/Enlight/Hook/ProxyFactory.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Form\\\\Account\\\\AttributeFormType\\:\\:configureOptions\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Hook_ProxyFactory\\:\\:getHookedMethods\\(\\) has parameter \\$class with generic class ReflectionClass but does not specify its types\\: T$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Form/Account/AttributeFormType.php
+			path: engine/Library/Enlight/Hook/ProxyFactory.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Form\\\\Account\\\\EmailUpdateFormType\\:\\:buildForm\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Hook_ProxyFactory\\:\\:writeProxyClass\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Form/Account/EmailUpdateFormType.php
+			path: engine/Library/Enlight/Hook/ProxyFactory.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Form\\\\Account\\\\EmailUpdateFormType\\:\\:configureOptions\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Loader\\:\\:autoload\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Form/Account/EmailUpdateFormType.php
+			path: engine/Library/Enlight/Loader.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Form\\\\Account\\\\PasswordUpdateFormType\\:\\:buildForm\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Loader\\:\\:explodeIncludePath\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Form/Account/PasswordUpdateFormType.php
+			path: engine/Library/Enlight/Loader.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Form\\\\Account\\\\PasswordUpdateFormType\\:\\:configureOptions\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Loader\\:\\:explodeIncludePath\\(\\) should return array but returns array\\<int, string\\>\\|false\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Form/Account/PasswordUpdateFormType.php
+			path: engine/Library/Enlight/Loader.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Form\\\\Account\\\\PersonalFormType\\:\\:buildForm\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Loader\\:\\:loadClass\\(\\) has parameter \\$class with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Form/Account/PersonalFormType.php
+			path: engine/Library/Enlight/Loader.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Form\\\\Account\\\\PersonalFormType\\:\\:configureOptions\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Loader\\:\\:loadFile\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Form/Account/PersonalFormType.php
+			path: engine/Library/Enlight/Loader.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Form\\\\Account\\\\PersonalFormType\\:\\:getSnippet\\(\\) has parameter \\$snippet with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Loader\\:\\:setIncludePath\\(\\) has parameter \\$path with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Form/Account/PersonalFormType.php
+			path: engine/Library/Enlight/Loader.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Form\\\\Account\\\\ProfileUpdateFormType\\:\\:buildForm\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$callback of function array_map expects \\(callable\\(mixed\\)\\: mixed\\)\\|null, array\\{\\$this\\(Enlight_Loader\\), 'Enlight_Loader\\:…'\\} given\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Form/Account/ProfileUpdateFormType.php
+			path: engine/Library/Enlight/Loader.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Form\\\\Account\\\\ProfileUpdateFormType\\:\\:configureOptions\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#2 \\$callback of function array_filter expects \\(callable\\(string\\)\\: bool\\)\\|null, 'strlen' given\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Form/Account/ProfileUpdateFormType.php
+			path: engine/Library/Enlight/Loader.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Form\\\\Account\\\\ProfileUpdateFormType\\:\\:getSnippet\\(\\) has parameter \\$snippet with no value type specified in iterable type array\\.$#"
+			message: "#^Property Enlight_Loader\\:\\:\\$namespaces type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Form/Account/ProfileUpdateFormType.php
+			path: engine/Library/Enlight/Loader.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Form\\\\Account\\\\ResetPasswordFormType\\:\\:buildForm\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Plugin_Bootstrap_Config\\:\\:install\\(\\) should return bool but return statement is missing\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Form/Account/ResetPasswordFormType.php
+			path: engine/Library/Enlight/Plugin/Bootstrap/Config.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Form\\\\Account\\\\ResetPasswordFormType\\:\\:configureOptions\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$event of class Enlight_Event_Handler_Plugin constructor expects string, Enlight_Event_Handler\\|Enlight_Hook_HookHandler\\|string given\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Form/Account/ResetPasswordFormType.php
+			path: engine/Library/Enlight/Plugin/Bootstrap/Config.php
 
 		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
-			count: 2
-			path: engine/Shopware/Bundle/AccountBundle/Service/AddressService.php
+			message: "#^Parameter \\#4 \\$listener of class Enlight_Event_Handler_Plugin constructor expects string\\|null, \\(callable\\)\\|string\\|null given\\.$#"
+			count: 1
+			path: engine/Library/Enlight/Plugin/Bootstrap/Config.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\AddressService\\:\\:create\\(\\) has no return type specified\\.$#"
+			message: "#^Property Enlight_Plugin_Bootstrap_Config\\:\\:\\$config \\(Enlight_Config\\) does not accept array\\|Enlight_Config\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Service/AddressService.php
+			path: engine/Library/Enlight/Plugin/Bootstrap/Config.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\AddressService\\:\\:delete\\(\\) has no return type specified\\.$#"
+			message: "#^Property Enlight_Plugin_Namespace\\:\\:\\$manager \\(Enlight_Plugin_PluginManager\\) does not accept Enlight_Plugin_PluginCollection\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Service/AddressService.php
+			path: engine/Library/Enlight/Plugin/Namespace.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\AddressService\\:\\:setDefaultBillingAddress\\(\\) has no return type specified\\.$#"
+			message: "#^Access to an undefined property Enlight_Config\\:\\:\\$listeners\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Service/AddressService.php
+			path: engine/Library/Enlight/Plugin/Namespace/Config.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\AddressService\\:\\:setDefaultShippingAddress\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Service/AddressService.php
+			message: "#^Access to an undefined property Enlight_Config\\:\\:\\$plugins\\.$#"
+			count: 6
+			path: engine/Library/Enlight/Plugin/Namespace/Config.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\AddressService\\:\\:update\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Plugin_Namespace_Config\\:\\:Subscriber\\(\\) should return Enlight_Event_Subscriber_Plugin but returns Enlight_Event_Subscriber\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Service/AddressService.php
+			path: engine/Library/Enlight/Plugin/Namespace/Config.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\AddressServiceInterface\\:\\:create\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Plugin_Namespace_Config\\:\\:getConfig\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Service/AddressServiceInterface.php
+			path: engine/Library/Enlight/Plugin/Namespace/Config.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\AddressServiceInterface\\:\\:delete\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Plugin_Namespace_Config\\:\\:getConfig\\(\\) return type has no value type specified in iterable type array\\|Enlight_Config\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Service/AddressServiceInterface.php
+			path: engine/Library/Enlight/Plugin/Namespace/Config.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\AddressServiceInterface\\:\\:setDefaultBillingAddress\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Plugin_Namespace_Config\\:\\:initStorage\\(\\) should return Enlight_Config but return statement is missing\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Service/AddressServiceInterface.php
+			path: engine/Library/Enlight/Plugin/Namespace/Config.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\AddressServiceInterface\\:\\:setDefaultShippingAddress\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Plugin_Namespace_Config\\:\\:setConfig\\(\\) has parameter \\$config with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Service/AddressServiceInterface.php
+			path: engine/Library/Enlight/Plugin/Namespace/Config.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\AddressServiceInterface\\:\\:update\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Plugin_Namespace_Config\\:\\:setConfig\\(\\) has parameter \\$name with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Service/AddressServiceInterface.php
+			path: engine/Library/Enlight/Plugin/Namespace/Config.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\CustomerService\\:\\:update\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Plugin_Namespace_Config\\:\\:toArray\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Service/CustomerService.php
+			path: engine/Library/Enlight/Plugin/Namespace/Config.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\CustomerServiceInterface\\:\\:update\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#2 \\$options of class Enlight_Event_Subscriber_Plugin constructor expects null, Enlight_Config given\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Service/CustomerServiceInterface.php
+			path: engine/Library/Enlight/Plugin/Namespace/Config.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\CustomerUnlockService\\:\\:unlock\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Plugin_Namespace_Loader\\:\\:load\\(\\) should return Enlight_Plugin_PluginCollection but return statement is missing\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Service/CustomerUnlockService.php
+			path: engine/Library/Enlight/Plugin/Namespace/Loader.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\CustomerUnlockServiceInterface\\:\\:unlock\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Plugin_Namespace_Loader\\:\\:loadAll\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Service/CustomerUnlockServiceInterface.php
+			path: engine/Library/Enlight/Plugin/Namespace/Loader.php
 
 		-
-			message: "#^Call to an undefined method Enlight_Controller_Router\\:\\:setContext\\(\\)\\.$#"
+			message: "#^Property Enlight_Plugin_Namespace_Loader\\:\\:\\$prefixPaths type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Service/RegisterService.php
+			path: engine/Library/Enlight/Plugin/Namespace/Loader.php
 
 		-
-			message: "#^Cannot call method format\\(\\) on DateTimeInterface\\|null\\.$#"
+			message: "#^Class Enlight_Plugin_PluginCollection implements generic interface IteratorAggregate but does not specify its types\\: TKey, TValue$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Service/RegisterService.php
+			path: engine/Library/Enlight/Plugin/PluginCollection.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\RegisterService\\:\\:register\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Plugin_PluginCollection\\:\\:__call\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Service/RegisterService.php
+			path: engine/Library/Enlight/Plugin/PluginCollection.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\RegisterServiceInterface\\:\\:register\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Plugin_PluginCollection\\:\\:__call\\(\\) should return Enlight_Plugin_Bootstrap\\|Enlight_Plugin_Namespace but returns Enlight_Plugin_Bootstrap\\|Enlight_Plugin_Namespace\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Service/RegisterServiceInterface.php
+			path: engine/Library/Enlight/Plugin/PluginCollection.php
 
 		-
-			message: "#^Access to an undefined property Enlight_Components_Session_Namespace\\:\\:\\$sOneTimeAccount\\.$#"
+			message: "#^Method Enlight_Plugin_PluginCollection\\:\\:load\\(\\) has parameter \\$name with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Service/StoreFrontCustomerGreetingService.php
+			path: engine/Library/Enlight/Plugin/PluginCollection.php
 
 		-
-			message: "#^Access to an undefined property Enlight_Components_Session_Namespace\\:\\:\\$userInfo\\.$#"
+			message: "#^Method Enlight_Plugin_PluginCollection\\:\\:load\\(\\) has parameter \\$throwException with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Service/StoreFrontCustomerGreetingService.php
+			path: engine/Library/Enlight/Plugin/PluginCollection.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\StoreFrontCustomerGreetingService\\:\\:fetch\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Template_Default\\:\\:Engine\\(\\) should return Enlight_Template_Manager but returns Smarty\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Service/StoreFrontCustomerGreetingService.php
+			path: engine/Library/Enlight/Template/Default.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\StoreFrontCustomerGreetingService\\:\\:fetchUserInfo\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Template_Default\\:\\:assign\\(\\) has parameter \\$tpl_var with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Service/StoreFrontCustomerGreetingService.php
+			path: engine/Library/Enlight/Template/Default.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\StoreFrontCustomerGreetingService\\:\\:fetchUserInfo\\(\\) should return array\\|null but returns array\\<string, mixed\\>\\|false\\.$#"
+			message: "#^Method Enlight_Template_Default\\:\\:clearAssign\\(\\) has parameter \\$tpl_var with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Service/StoreFrontCustomerGreetingService.php
+			path: engine/Library/Enlight/Template/Default.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\StoreFrontCustomerGreetingServiceInterface\\:\\:fetch\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_Template_Default\\:\\:extendsBlock\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Service/StoreFrontCustomerGreetingServiceInterface.php
+			path: engine/Library/Enlight/Template/Default.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\Validator\\\\AddressValidator\\:\\:validate\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Template_Default\\:\\:extendsBlock\\(\\) has parameter \\$content with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Service/Validator/AddressValidator.php
+			path: engine/Library/Enlight/Template/Default.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\Validator\\\\AddressValidatorInterface\\:\\:validate\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Template_Default\\:\\:extendsBlock\\(\\) has parameter \\$spec with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Service/Validator/AddressValidatorInterface.php
+			path: engine/Library/Enlight/Template/Default.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\Validator\\\\CustomerValidator\\:\\:validate\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Template_Default\\:\\:extendsTemplate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Service/Validator/CustomerValidator.php
+			path: engine/Library/Enlight/Template/Default.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\Validator\\\\CustomerValidatorInterface\\:\\:validate\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$varname of method Smarty_Internal_Data\\:\\:assignGlobal\\(\\) expects string, array\\|string given\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Service/Validator/CustomerValidatorInterface.php
+			path: engine/Library/Enlight/Template/Default.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Type\\\\SalutationType\\:\\:configureOptions\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Template_Manager\\:\\:__construct\\(\\) has parameter \\$backendOptions with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AccountBundle/Type/SalutationType.php
+			path: engine/Library/Enlight/Template/Manager.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_AttributeData\\:\\:listAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Template_Manager\\:\\:__construct\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/AttributeData.php
+			path: engine/Library/Enlight/Template/Manager.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_AttributeData\\:\\:loadDataAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Template_Manager\\:\\:setOptions\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/AttributeData.php
+			path: engine/Library/Enlight/Template/Manager.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_AttributeData\\:\\:saveDataAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_Template_Manager\\:\\:setTemplateDir\\(\\) has parameter \\$template_dir with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/AttributeData.php
+			path: engine/Library/Enlight/Template/Manager.php
 
 		-
-			message: "#^Parameter \\#1 \\$arrayStore of method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setArrayStore\\(\\) expects string, string\\|false given\\.$#"
+			message: "#^Property Smarty\\:\\:\\$start_time \\(int\\) does not accept float\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/AttributeData.php
+			path: engine/Library/Enlight/Template/Manager.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_Attributes\\:\\:addAclPermission\\(\\) has no return type specified\\.$#"
+			message: "#^Function mb_str_replace not found\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/Attributes.php
+			path: engine/Library/Enlight/Template/Plugins/block.replace.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_Attributes\\:\\:columnNameExistsAction\\(\\) has no return type specified\\.$#"
+			message: "#^Function smarty_block_replace\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/Attributes.php
+			path: engine/Library/Enlight/Template/Plugins/block.replace.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_Attributes\\:\\:createAction\\(\\) has no return type specified\\.$#"
+			message: "#^Function smarty_block_replace\\(\\) has parameter \\$smarty with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/Attributes.php
+			path: engine/Library/Enlight/Template/Plugins/block.replace.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_Attributes\\:\\:deleteAction\\(\\) has no return type specified\\.$#"
+			message: "#^Function smarty_block_replace\\(\\) should return string but empty return statement found\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/Attributes.php
+			path: engine/Library/Enlight/Template/Plugins/block.replace.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_Attributes\\:\\:generateModelsAction\\(\\) has no return type specified\\.$#"
+			message: "#^Function smarty_block_stripLines\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/Attributes.php
+			path: engine/Library/Enlight/Template/Plugins/block.stripLines.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_Attributes\\:\\:getColumnAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Smarty_Compiler_Config\\:\\:compile\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/Attributes.php
+			path: engine/Library/Enlight/Template/Plugins/compiler.config.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_Attributes\\:\\:getEntitiesAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Smarty_Compiler_Config\\:\\:compile\\(\\) should return string but returns null\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/Attributes.php
+			path: engine/Library/Enlight/Template/Plugins/compiler.config.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_Attributes\\:\\:getTablesAction\\(\\) has no return type specified\\.$#"
+			message: "#^Property Smarty_Compiler_Config\\:\\:\\$optional_attributes type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/Attributes.php
+			path: engine/Library/Enlight/Template/Plugins/compiler.config.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_Attributes\\:\\:getTypesAction\\(\\) has no return type specified\\.$#"
+			message: "#^Property Smarty_Compiler_Config\\:\\:\\$required_attributes type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/Attributes.php
+			path: engine/Library/Enlight/Template/Plugins/compiler.config.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_Attributes\\:\\:resetDataAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Smarty_Compiler_DnsPrefetch\\:\\:compile\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/Attributes.php
+			path: engine/Library/Enlight/Template/Plugins/compiler.dnsPrefetch.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_Attributes\\:\\:updateAction\\(\\) has no return type specified\\.$#"
+			message: "#^Property Smarty_Compiler_DnsPrefetch\\:\\:\\$optional_attributes type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/Attributes.php
+			path: engine/Library/Enlight/Template/Plugins/compiler.dnsPrefetch.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_EntitySearch\\:\\:searchAction\\(\\) has no return type specified\\.$#"
+			message: "#^Property Smarty_Compiler_DnsPrefetch\\:\\:\\$required_attributes type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/EntitySearch.php
+			path: engine/Library/Enlight/Template/Plugins/compiler.dnsPrefetch.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\DependencyInjection\\\\Compiler\\\\StaticResourcesCompilerPass\\:\\:process\\(\\) has no return type specified\\.$#"
+			message: "#^Access to an undefined property object\\:\\:\\$smarty\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/DependencyInjection/Compiler/StaticResourcesCompilerPass.php
+			path: engine/Library/Enlight/Template/Plugins/compiler.link.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\CustomerRepository\\:\\:getMapping\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Smarty_Compiler_Link\\:\\:compile\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Repository/CustomerRepository.php
+			path: engine/Library/Enlight/Template/Plugins/compiler.link.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\CustomerRepository\\:\\:getTextFieldWithRawData\\(\\) has no return type specified\\.$#"
+			message: "#^Method Smarty_Compiler_Link\\:\\:compile\\(\\) should return string but returns false\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Repository/CustomerRepository.php
+			path: engine/Library/Enlight/Template/Plugins/compiler.link.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\GenericRepository\\:\\:get\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#2 \\$template of function smarty_function_flink expects string, object given\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Repository/GenericRepository.php
+			path: engine/Library/Enlight/Template/Plugins/compiler.link.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\GenericRepository\\:\\:getList\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Smarty_Compiler_Link\\:\\:\\$option_flags type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Repository/GenericRepository.php
+			path: engine/Library/Enlight/Template/Plugins/compiler.link.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\OrderRepository\\:\\:getMapping\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Smarty_Compiler_Link\\:\\:\\$required_attributes type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Repository/OrderRepository.php
+			path: engine/Library/Enlight/Template/Plugins/compiler.link.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\OrderRepository\\:\\:getTextFieldWithRawData\\(\\) has no return type specified\\.$#"
+			message: "#^Method Smarty_Compiler_Media\\:\\:compile\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Repository/OrderRepository.php
+			path: engine/Library/Enlight/Template/Plugins/compiler.media.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\ProductRepository\\:\\:getMapping\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Smarty_Compiler_Media\\:\\:compile\\(\\) should return string but returns false\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Repository/ProductRepository.php
+			path: engine/Library/Enlight/Template/Plugins/compiler.media.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\RepositoryInterface\\:\\:get\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Smarty_Compiler_Media\\:\\:parseAttributes\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Repository/RepositoryInterface.php
+			path: engine/Library/Enlight/Template/Plugins/compiler.media.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\RepositoryInterface\\:\\:getList\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Smarty_Compiler_Media\\:\\:parseAttributes\\(\\) should return string but returns array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Repository/RepositoryInterface.php
+			path: engine/Library/Enlight/Template/Plugins/compiler.media.php
 
 		-
-			message: "#^Property Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\SearchCriteria\\:\\:\\$params type has no value type specified in iterable type array\\.$#"
+			message: "#^Offset 'path' does not exist on string\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Repository/SearchCriteria.php
+			path: engine/Library/Enlight/Template/Plugins/compiler.media.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\SearchResult\\:\\:__construct\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Property Smarty_Compiler_Media\\:\\:\\$required_attributes type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Repository/SearchResult.php
+			path: engine/Library/Enlight/Template/Plugins/compiler.media.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\SearchResult\\:\\:getData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Smarty_Compiler_Preconnect\\:\\:compile\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Repository/SearchResult.php
+			path: engine/Library/Enlight/Template/Plugins/compiler.preconnect.php
 
 		-
-			message: "#^Property Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\SearchResult\\:\\:\\$data type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Smarty_Compiler_Preconnect\\:\\:\\$optional_attributes type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Repository/SearchResult.php
+			path: engine/Library/Enlight/Template/Plugins/compiler.preconnect.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\Searcher\\\\CustomerSearcher\\:\\:getSearchFields\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Smarty_Compiler_Preconnect\\:\\:\\$required_attributes type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/CustomerSearcher.php
+			path: engine/Library/Enlight/Template/Plugins/compiler.preconnect.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\Searcher\\\\GenericSearcher\\:\\:addSearchTermCondition\\(\\) has no return type specified\\.$#"
+			message: "#^Method Smarty_Compiler_Prefetch\\:\\:compile\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/GenericSearcher.php
+			path: engine/Library/Enlight/Template/Plugins/compiler.prefetch.php
 
 		-
-			message: "#^Parameter \\#2 \\$term of method Shopware\\\\Components\\\\Model\\\\SearchBuilder\\:\\:addSearchTerm\\(\\) expects string, string\\|null given\\.$#"
+			message: "#^Property Smarty_Compiler_Prefetch\\:\\:\\$optional_attributes type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/GenericSearcher.php
+			path: engine/Library/Enlight/Template/Plugins/compiler.prefetch.php
 
 		-
-			message: "#^Property Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\Searcher\\\\GenericSearcher\\:\\:\\$searchBuilder \\(Shopware\\\\Components\\\\Model\\\\SearchBuilder\\) does not accept Shopware\\\\Components\\\\Model\\\\SearchBuilder\\|null\\.$#"
+			message: "#^Property Smarty_Compiler_Prefetch\\:\\:\\$required_attributes type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/GenericSearcher.php
+			path: engine/Library/Enlight/Template/Plugins/compiler.prefetch.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\Searcher\\\\OrderSearcher\\:\\:getSearchFields\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Smarty_Compiler_Preload\\:\\:compile\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/OrderSearcher.php
+			path: engine/Library/Enlight/Template/Plugins/compiler.preload.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\Searcher\\\\PremiumSearcher\\:\\:getSearchFields\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Smarty_Compiler_Preload\\:\\:\\$optional_attributes type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/PremiumSearcher.php
+			path: engine/Library/Enlight/Template/Plugins/compiler.preload.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\Searcher\\\\ProductSearcher\\:\\:getSearchFields\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Smarty_Compiler_Preload\\:\\:\\$required_attributes type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/ProductSearcher.php
+			path: engine/Library/Enlight/Template/Plugins/compiler.preload.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\Searcher\\\\PropertyOptionSearcher\\:\\:getSearchFields\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Smarty_Compiler_Prerender\\:\\:compile\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/PropertyOptionSearcher.php
+			path: engine/Library/Enlight/Template/Plugins/compiler.prerender.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:getElasticSearchType\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Smarty_Compiler_Prerender\\:\\:\\$optional_attributes type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
+			path: engine/Library/Enlight/Template/Plugins/compiler.prerender.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setArrayStore\\(\\) has no return type specified\\.$#"
+			message: "#^Property Smarty_Compiler_Prerender\\:\\:\\$required_attributes type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
+			path: engine/Library/Enlight/Template/Plugins/compiler.prerender.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setColumnName\\(\\) has no return type specified\\.$#"
+			message: "#^Method Smarty_Compiler_Timestamp\\:\\:compile\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
+			path: engine/Library/Enlight/Template/Plugins/compiler.timestamp.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setColumnType\\(\\) has no return type specified\\.$#"
+			message: "#^Method Smarty_Compiler_Url\\:\\:compile\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
+			path: engine/Library/Enlight/Template/Plugins/compiler.url.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setConfigured\\(\\) has no return type specified\\.$#"
+			message: "#^Property Smarty_Compiler_Url\\:\\:\\$option_flags type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
+			path: engine/Library/Enlight/Template/Plugins/compiler.url.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setCore\\(\\) has no return type specified\\.$#"
+			message: "#^Property Smarty_Compiler_Url\\:\\:\\$optional_attributes type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
+			path: engine/Library/Enlight/Template/Plugins/compiler.url.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setCustom\\(\\) has no return type specified\\.$#"
+			message: "#^Function smarty_function_action\\(\\) has parameter \\$params with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
+			path: engine/Library/Enlight/Template/Plugins/function.action.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setDbalType\\(\\) has no return type specified\\.$#"
+			message: "#^Function smarty_function_action\\(\\) should return string but returns array\\|string\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
+			path: engine/Library/Enlight/Template/Plugins/function.action.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setDefaultValue\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$request of method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:renderEsiTag\\(\\) expects Enlight_Controller_Request_RequestHttp, Enlight_Controller_Request_Request given\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
+			path: engine/Library/Enlight/Template/Plugins/function.action.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setDisplayInBackend\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$request of method Symfony\\\\Component\\\\HttpFoundation\\\\RequestStack\\:\\:push\\(\\) expects Symfony\\\\Component\\\\HttpFoundation\\\\Request, Enlight_Controller_Request_Request given\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
+			path: engine/Library/Enlight/Template/Plugins/function.action.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setElasticSearchType\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
+			message: "#^Cannot call method assign\\(\\) on string\\.$#"
+			count: 2
+			path: engine/Library/Enlight/Template/Plugins/function.compileJavascript.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setElasticSearchType\\(\\) has parameter \\$elasticSearchType with no value type specified in iterable type array\\.$#"
+			message: "#^Function smarty_function_compileJavascript\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
+			path: engine/Library/Enlight/Template/Plugins/function.compileJavascript.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setEntity\\(\\) has no return type specified\\.$#"
+			message: "#^Function smarty_function_compileJavascript\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
+			path: engine/Library/Enlight/Template/Plugins/function.compileJavascript.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setHelpText\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#2 \\$template of method Shopware\\\\Components\\\\Theme\\\\Compiler\\:\\:compileJavascript\\(\\) expects Shopware\\\\Models\\\\Shop\\\\Template, Shopware\\\\Models\\\\Shop\\\\Template\\|null given\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
+			path: engine/Library/Enlight/Template/Plugins/function.compileJavascript.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
+			message: "#^Cannot call method assign\\(\\) on array\\.$#"
+			count: 2
+			path: engine/Library/Enlight/Template/Plugins/function.compileLess.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setIdentifier\\(\\) has no return type specified\\.$#"
+			message: "#^Function smarty_function_compileLess\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
+			path: engine/Library/Enlight/Template/Plugins/function.compileLess.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setLabel\\(\\) has no return type specified\\.$#"
+			message: "#^Function smarty_function_compileLess\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
+			path: engine/Library/Enlight/Template/Plugins/function.compileLess.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setPosition\\(\\) has no return type specified\\.$#"
+			message: "#^Function smarty_function_compileLess\\(\\) has parameter \\$template with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
+			path: engine/Library/Enlight/Template/Plugins/function.compileLess.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setSqlType\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#2 \\$template of method Shopware\\\\Components\\\\Theme\\\\Compiler\\:\\:compileLess\\(\\) expects Shopware\\\\Models\\\\Shop\\\\Template, Shopware\\\\Models\\\\Shop\\\\Template\\|null given\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
+			path: engine/Library/Enlight/Template/Plugins/function.compileLess.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setSupportText\\(\\) has no return type specified\\.$#"
+			message: "#^Function smarty_function_controllerAction\\(\\) has parameter \\$params with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
+			path: engine/Library/Enlight/Template/Plugins/function.controllerAction.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setTableName\\(\\) has no return type specified\\.$#"
+			message: "#^Function smarty_function_controllerAction\\(\\) should return string but returns string\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
+			path: engine/Library/Enlight/Template/Plugins/function.controllerAction.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setTranslatable\\(\\) has no return type specified\\.$#"
+			message: "#^Function smarty_function_controllerName\\(\\) has parameter \\$params with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
+			path: engine/Library/Enlight/Template/Plugins/function.controllerName.php
 
 		-
-			message: "#^Property Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:\\$elasticSearchType type has no value type specified in iterable type array\\.$#"
+			message: "#^Function smarty_function_controllerName\\(\\) should return string but returns string\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
+			path: engine/Library/Enlight/Template/Plugins/function.controllerName.php
 
 		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\|null\\.$#"
+			message: "#^Function smarty_function_encoding\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/CrudService.php
+			path: engine/Library/Enlight/Template/Plugins/function.encoding.php
 
 		-
-			message: "#^Cannot call method getTableName\\(\\) on Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\|null\\.$#"
+			message: "#^Function smarty_function_encoding\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/CrudService.php
+			path: engine/Library/Enlight/Template/Plugins/function.encoding.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\CrudService\\:\\:changeAttribute\\(\\) has no return type specified\\.$#"
+			message: "#^Function smarty_function_encoding\\(\\) has parameter \\$smarty with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/CrudService.php
+			path: engine/Library/Enlight/Template/Plugins/function.encoding.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\CrudService\\:\\:changeAttribute\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Function smarty_function_fetchContent\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/CrudService.php
+			path: engine/Library/Enlight/Template/Plugins/function.fetchContent.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\CrudService\\:\\:createAttribute\\(\\) has no return type specified\\.$#"
+			message: "#^Function smarty_function_fetchContent\\(\\) has parameter \\$parameters with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/CrudService.php
+			path: engine/Library/Enlight/Template/Plugins/function.fetchContent.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\CrudService\\:\\:createAttribute\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/CrudService.php
+			message: "#^Cannot access property \\$smarty on string\\.$#"
+			count: 2
+			path: engine/Library/Enlight/Template/Plugins/function.flink.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\CrudService\\:\\:delete\\(\\) has no return type specified\\.$#"
+			message: "#^Function smarty_function_flink\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/CrudService.php
+			path: engine/Library/Enlight/Template/Plugins/function.flink.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\CrudService\\:\\:getTableConfiguration\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Call to an undefined method object\\:\\:assign\\(\\)\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/CrudService.php
+			path: engine/Library/Enlight/Template/Plugins/function.partition.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\CrudService\\:\\:update\\(\\) has no return type specified\\.$#"
+			message: "#^Function smarty_function_partition\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/CrudService.php
+			path: engine/Library/Enlight/Template/Plugins/function.partition.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\CrudService\\:\\:update\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Function smarty_function_partition\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/CrudService.php
+			path: engine/Library/Enlight/Template/Plugins/function.partition.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\CrudService\\:\\:updateConfig\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#2 \\$offset of function array_slice expects int, float\\|int given\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/CrudService.php
+			path: engine/Library/Enlight/Template/Plugins/function.partition.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\CrudService\\:\\:updateConfig\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#3 \\$length of function array_slice expects int\\|null, float given\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/CrudService.php
+			path: engine/Library/Enlight/Template/Plugins/function.partition.php
 
 		-
-			message: "#^Parameter \\#1 \\$config of method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\CrudService\\:\\:schemaChanged\\(\\) expects Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct, Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\|null given\\.$#"
+			message: "#^Call to an undefined method object\\:\\:assign\\(\\)\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/CrudService.php
+			path: engine/Library/Enlight/Template/Plugins/function.slice.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\CrudServiceInterface\\:\\:delete\\(\\) has no return type specified\\.$#"
+			message: "#^Function smarty_function_slice\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/CrudServiceInterface.php
+			path: engine/Library/Enlight/Template/Plugins/function.slice.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\CrudServiceInterface\\:\\:update\\(\\) has no return type specified\\.$#"
+			message: "#^Function smarty_function_slice\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/CrudServiceInterface.php
+			path: engine/Library/Enlight/Template/Plugins/function.slice.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\CrudServiceInterface\\:\\:update\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Function smarty_function_themeTimestamp\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/CrudServiceInterface.php
+			path: engine/Library/Enlight/Template/Plugins/function.themeTimestamp.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataLoader\\:\\:load\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Function smarty_function_themeTimestamp\\(\\) has parameter \\$params with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/DataLoader.php
+			path: engine/Library/Enlight/Template/Plugins/function.themeTimestamp.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataLoader\\:\\:loadTranslations\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Function smarty_function_themeTimestamp\\(\\) has parameter \\$template with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/DataLoader.php
+			path: engine/Library/Enlight/Template/Plugins/function.themeTimestamp.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataLoaderInterface\\:\\:load\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Function smarty_modifier_array_unset\\(\\) has parameter \\$keys with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/DataLoaderInterface.php
+			path: engine/Library/Enlight/Template/Plugins/modifier.array_unset.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataLoaderInterface\\:\\:loadTranslations\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Function smarty_modifier_array_unset\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/DataLoaderInterface.php
+			path: engine/Library/Enlight/Template/Plugins/modifier.array_unset.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataPersister\\:\\:cloneAttribute\\(\\) has no return type specified\\.$#"
+			message: "#^Function smarty_modifier_array_unset\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/DataPersister.php
+			path: engine/Library/Enlight/Template/Plugins/modifier.array_unset.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataPersister\\:\\:cloneAttributeTranslations\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$date of class Zend_Date constructor expects array\\|int\\|string\\|Zend_Date\\|null, DateTime\\|int\\|false given\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/DataPersister.php
+			path: engine/Library/Enlight/Template/Plugins/modifier.date.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataPersister\\:\\:create\\(\\) has no return type specified\\.$#"
+			message: "#^Function smarty_modifier_number\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/DataPersister.php
+			path: engine/Library/Enlight/Template/Plugins/modifier.number.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataPersister\\:\\:create\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Function smarty_modifier_number\\(\\) has parameter \\$format with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/DataPersister.php
+			path: engine/Library/Enlight/Template/Plugins/modifier.number.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataPersister\\:\\:filter\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Function smarty_modifier_tax\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/DataPersister.php
+			path: engine/Library/Enlight/Template/Plugins/modifier.tax.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataPersister\\:\\:filter\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Cannot call method getTranslation\\(\\) on string\\|Zend_Locale\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/DataPersister.php
+			path: engine/Library/Enlight/Template/Plugins/modifier.translate.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataPersister\\:\\:isValidDate\\(\\) has no return type specified\\.$#"
+			message: "#^Function smarty_modifiercompiler_template_exists\\(\\) has parameter \\$compiler with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/DataPersister.php
+			path: engine/Library/Enlight/Template/Plugins/modifiercompiler.template_exists.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataPersister\\:\\:isValidDate\\(\\) has parameter \\$date with no type specified\\.$#"
+			message: "#^Function smarty_modifiercompiler_template_exists\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/DataPersister.php
+			path: engine/Library/Enlight/Template/Plugins/modifiercompiler.template_exists.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataPersister\\:\\:persist\\(\\) has no return type specified\\.$#"
+			message: "#^Cannot access property \\$handler on array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/DataPersister.php
+			path: engine/Library/Enlight/Template/Plugins/resource.parent.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataPersister\\:\\:persist\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Cannot access property \\$parent on Smarty_Internal_Template\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/DataPersister.php
+			path: engine/Library/Enlight/Template/Plugins/resource.parent.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataPersister\\:\\:saveTranslation\\(\\) has no return type specified\\.$#"
+			message: "#^Method Smarty_Resource_Parent\\:\\:populate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/DataPersister.php
+			path: engine/Library/Enlight/Template/Plugins/resource.parent.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataPersister\\:\\:saveTranslation\\(\\) has parameter \\$translation with no value type specified in iterable type array\\.$#"
+			message: "#^Property Smarty_Resource_Parent\\:\\:\\$index has no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/DataPersister.php
+			path: engine/Library/Enlight/Template/Plugins/resource.parent.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataPersister\\:\\:update\\(\\) has no return type specified\\.$#"
+			message: "#^Property Smarty_Template_Source\\:\\:\\$components \\(array\\) does not accept Smarty_Template_Source\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/DataPersister.php
+			path: engine/Library/Enlight/Template/Plugins/resource.parent.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataPersister\\:\\:update\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Property Smarty_Template_Source\\:\\:\\$template \\(bool\\) does not accept Smarty_Internal_Template\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/DataPersister.php
+			path: engine/Library/Enlight/Template/Plugins/resource.parent.php
 
 		-
-			message: "#^Parameter \\#2 \\$foreignKey of method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataLoaderInterface\\:\\:load\\(\\) expects int, int\\<min, \\-1\\>\\|int\\<1, max\\>\\|string given\\.$#"
+			message: "#^Method Enlight_View\\:\\:__set\\(\\) has parameter \\$name with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/DataPersister.php
+			path: engine/Library/Enlight/View.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataPersisterInterface\\:\\:cloneAttribute\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_View\\:\\:__set\\(\\) has parameter \\$value with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/DataPersisterInterface.php
+			path: engine/Library/Enlight/View.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataPersisterInterface\\:\\:cloneAttributeTranslations\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_View\\:\\:addTemplateDir\\(\\) has parameter \\$path with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/DataPersisterInterface.php
+			path: engine/Library/Enlight/View.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataPersisterInterface\\:\\:persist\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_View\\:\\:setTemplateDir\\(\\) has parameter \\$path with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/DataPersisterInterface.php
+			path: engine/Library/Enlight/View.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataPersisterInterface\\:\\:persist\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_View_Cache\\:\\:addCacheId\\(\\) has parameter \\$cache_id with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/DataPersisterInterface.php
+			path: engine/Library/Enlight/View/Cache.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\SchemaOperator\\:\\:changeColumn\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_View_Cache\\:\\:setCacheId\\(\\) has parameter \\$cache_id with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/SchemaOperator.php
+			path: engine/Library/Enlight/View/Cache.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\SchemaOperator\\:\\:createColumn\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_View_Default\\:\\:addCacheId\\(\\) has parameter \\$cache_id with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/SchemaOperator.php
+			path: engine/Library/Enlight/View/Default.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\SchemaOperator\\:\\:dropColumn\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_View_Default\\:\\:assign\\(\\) has parameter \\$spec with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/SchemaOperator.php
+			path: engine/Library/Enlight/View/Default.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\SchemaOperator\\:\\:resetColumn\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_View_Default\\:\\:createTemplate\\(\\) should return Enlight_Template_Default but returns object\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/SchemaOperator.php
+			path: engine/Library/Enlight/View/Default.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\SchemaOperator\\:\\:validate\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_View_Default\\:\\:extendsBlock\\(\\) has parameter \\$content with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/SchemaOperator.php
+			path: engine/Library/Enlight/View/Default.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\SchemaOperator\\:\\:validateField\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_View_Default\\:\\:extendsBlock\\(\\) has parameter \\$spec with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/SchemaOperator.php
+			path: engine/Library/Enlight/View/Default.php
 
 		-
-			message: "#^Property Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\SchemaOperator\\:\\:\\$nameBlacklist type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Enlight_View_Default\\:\\:setCacheId\\(\\) has parameter \\$cache_id with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/SchemaOperator.php
+			path: engine/Library/Enlight/View/Default.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\SchemaOperatorInterface\\:\\:changeColumn\\(\\) has no return type specified\\.$#"
+			message: "#^Method Enlight_View_Default\\:\\:setTemplateDir\\(\\) has parameter \\$path with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/SchemaOperatorInterface.php
+			path: engine/Library/Enlight/View/Default.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\SchemaOperatorInterface\\:\\:createColumn\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$cacheId of method Enlight_Template_Default\\:\\:addCacheId\\(\\) expects null, array\\|string given\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/SchemaOperatorInterface.php
+			path: engine/Library/Enlight/View/Default.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\SchemaOperatorInterface\\:\\:dropColumn\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$cacheId of method Enlight_Template_Default\\:\\:setCacheId\\(\\) expects null, array\\|string\\|null given\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/SchemaOperatorInterface.php
+			path: engine/Library/Enlight/View/Default.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\SchemaOperatorInterface\\:\\:resetColumn\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#3 \\$nocache of method Enlight_Template_Default\\:\\:assign\\(\\) expects bool, bool\\|null given\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/SchemaOperatorInterface.php
+			path: engine/Library/Enlight/View/Default.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\TableMapping\\:\\:__construct\\(\\) has parameter \\$tableMapping with no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#3 \\$nocache of method Smarty_Internal_Data\\:\\:assign\\(\\) expects bool, bool\\|null given\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/TableMapping.php
+			path: engine/Library/Enlight/View/Default.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\TableMapping\\:\\:getAttributeTables\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Enlight_View_Default\\:\\:\\$scope \\(int\\) does not accept int\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/TableMapping.php
+			path: engine/Library/Enlight/View/Default.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\TableMapping\\:\\:getDependingTables\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Enlight_View_Default\\:\\:\\$template \\(Enlight_Template_Default\\|null\\) does not accept object\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/TableMapping.php
+			path: engine/Library/Enlight/View/Default.php
 
 		-
-			message: "#^Property Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\TableMapping\\:\\:\\$tables type has no value type specified in iterable type array\\.$#"
+			message: "#^Return type \\(Enlight_Template_Default\\) of method Enlight_View_Default\\:\\:clearAssign\\(\\) should be compatible with return type \\(Enlight_View\\) of method Enlight_View\\:\\:clearAssign\\(\\)$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/TableMapping.php
+			path: engine/Library/Enlight/View/Default.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\TableMappingInterface\\:\\:getAttributeTables\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\:\\:load\\(\\)\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/TableMappingInterface.php
+			path: engine/Shopware/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\TableMappingInterface\\:\\:getDependingTables\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\:\\:reset\\(\\)\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/TableMappingInterface.php
+			path: engine/Shopware/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\TypeMapping\\:\\:getEntities\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware_Bootstrap\\:\\:__call\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/TypeMapping.php
+			path: engine/Shopware/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\TypeMapping\\:\\:getTypes\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware_Bootstrap\\:\\:getResource\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/TypeMapping.php
+			path: engine/Shopware/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\TypeMapping\\:\\:unifiedToElasticSearch\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware_Bootstrap\\:\\:registerResource\\(\\) has parameter \\$resource with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/TypeMapping.php
+			path: engine/Shopware/Bootstrap.php
 
 		-
-			message: "#^Property Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\TypeMapping\\:\\:\\$types type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Constraint\\\\CurrentPasswordValidator\\:\\:validate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/TypeMapping.php
+			path: engine/Shopware/Bundle/AccountBundle/Constraint/CurrentPasswordValidator.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\TypeMappingInterface\\:\\:getEntities\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Constraint\\\\CustomerEmailValidator\\:\\:addError\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/TypeMappingInterface.php
+			path: engine/Shopware/Bundle/AccountBundle/Constraint/CustomerEmailValidator.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\TypeMappingInterface\\:\\:getTypes\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Constraint\\\\CustomerEmailValidator\\:\\:getSnippet\\(\\) has parameter \\$snippet with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/TypeMappingInterface.php
+			path: engine/Shopware/Bundle/AccountBundle/Constraint/CustomerEmailValidator.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\TypeMappingInterface\\:\\:unifiedToElasticSearch\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Constraint\\\\CustomerEmailValidator\\:\\:validate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/AttributeBundle/Service/TypeMappingInterface.php
+			path: engine/Shopware/Bundle/AccountBundle/Constraint/CustomerEmailValidator.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\BenchmarkCollector\\:\\:get\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Constraint\\\\PasswordValidator\\:\\:getSnippet\\(\\) has parameter \\$snippet with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/BenchmarkCollector.php
+			path: engine/Shopware/Bundle/AccountBundle/Constraint/PasswordValidator.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\BenchmarkCollector\\:\\:moveShopData\\(\\) has parameter \\$providerData with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Constraint\\\\PasswordValidator\\:\\:validate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/BenchmarkCollector.php
+			path: engine/Shopware/Bundle/AccountBundle/Constraint/PasswordValidator.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\BenchmarkCollector\\:\\:moveShopData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Form\\\\Account\\\\AttributeFormType\\:\\:configureOptions\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/BenchmarkCollector.php
+			path: engine/Shopware/Bundle/AccountBundle/Form/Account/AttributeFormType.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\BenchmarkCollector\\:\\:moveUpdatedOrdersData\\(\\) has parameter \\$providerData with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Form\\\\Account\\\\EmailUpdateFormType\\:\\:buildForm\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/BenchmarkCollector.php
+			path: engine/Shopware/Bundle/AccountBundle/Form/Account/EmailUpdateFormType.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\BenchmarkCollector\\:\\:moveUpdatedOrdersData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Form\\\\Account\\\\EmailUpdateFormType\\:\\:configureOptions\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/BenchmarkCollector.php
+			path: engine/Shopware/Bundle/AccountBundle/Form/Account/EmailUpdateFormType.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\BenchmarkCollectorInterface\\:\\:get\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Form\\\\Account\\\\PasswordUpdateFormType\\:\\:buildForm\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/BenchmarkCollectorInterface.php
+			path: engine/Shopware/Bundle/AccountBundle/Form/Account/PasswordUpdateFormType.php
 
 		-
-			message: "#^Cannot call method warning\\(\\) on Psr\\\\Log\\\\LoggerInterface\\|null\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Form\\\\Account\\\\PasswordUpdateFormType\\:\\:configureOptions\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/BusinessIntelligenceClient.php
+			path: engine/Shopware/Bundle/AccountBundle/Form/Account/PasswordUpdateFormType.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\BusinessIntelligenceClient\\:\\:verifyResponseSignature\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Form\\\\Account\\\\PersonalFormType\\:\\:buildForm\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/BusinessIntelligenceClient.php
+			path: engine/Shopware/Bundle/AccountBundle/Form/Account/PersonalFormType.php
 
 		-
-			message: "#^Parameter \\#2 \\$signature of method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\BenchmarkEncryption\\:\\:isSignatureValid\\(\\) expects string, array\\|string given\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Form\\\\Account\\\\PersonalFormType\\:\\:configureOptions\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/BusinessIntelligenceClient.php
+			path: engine/Shopware/Bundle/AccountBundle/Form/Account/PersonalFormType.php
 
 		-
-			message: "#^Call to an undefined method DateTimeInterface\\:\\:add\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Form\\\\Account\\\\PersonalFormType\\:\\:getSnippet\\(\\) has parameter \\$snippet with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Commands/ReceiveStatisticsCommand.php
+			path: engine/Shopware/Bundle/AccountBundle/Form/Account/PersonalFormType.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Commands\\\\ReceiveStatisticsCommand\\:\\:configure\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Form\\\\Account\\\\ProfileUpdateFormType\\:\\:buildForm\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Commands/ReceiveStatisticsCommand.php
+			path: engine/Shopware/Bundle/AccountBundle/Form/Account/ProfileUpdateFormType.php
 
 		-
-			message: "#^Call to an undefined method DateTimeInterface\\:\\:add\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Form\\\\Account\\\\ProfileUpdateFormType\\:\\:configureOptions\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Commands/SendStatisticsCommand.php
+			path: engine/Shopware/Bundle/AccountBundle/Form/Account/ProfileUpdateFormType.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Commands\\\\SendStatisticsCommand\\:\\:configure\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Form\\\\Account\\\\ProfileUpdateFormType\\:\\:getSnippet\\(\\) has parameter \\$snippet with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Commands/SendStatisticsCommand.php
+			path: engine/Shopware/Bundle/AccountBundle/Form/Account/ProfileUpdateFormType.php
 
 		-
-			message: "#^Cannot call method getShopId\\(\\) on Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Struct\\\\BusinessIntelligenceResponse\\|null\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Form\\\\Account\\\\ResetPasswordFormType\\:\\:buildForm\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Controllers/Backend/Benchmark.php
+			path: engine/Shopware/Bundle/AccountBundle/Form/Account/ResetPasswordFormType.php
 
 		-
-			message: "#^Cannot call method getShopId\\(\\) on Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Struct\\\\StatisticsResponse\\|null\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Form\\\\Account\\\\ResetPasswordFormType\\:\\:configureOptions\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Controllers/Backend/Benchmark.php
+			path: engine/Shopware/Bundle/AccountBundle/Form/Account/ResetPasswordFormType.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_Benchmark\\:\\:checkBenchmarksAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Controllers/Backend/Benchmark.php
+			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
+			count: 2
+			path: engine/Shopware/Bundle/AccountBundle/Service/AddressService.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_Benchmark\\:\\:disableBenchmarkTeaserAction\\(\\) has no return type specified\\.$#"
+			message: "#^Call to an undefined method Enlight_Controller_Router\\:\\:setContext\\(\\)\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Controllers/Backend/Benchmark.php
+			path: engine/Shopware/Bundle/AccountBundle/Service/RegisterService.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_Benchmark\\:\\:getShopConfigsAction\\(\\) has no return type specified\\.$#"
+			message: "#^Cannot call method format\\(\\) on DateTimeInterface\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Controllers/Backend/Benchmark.php
+			path: engine/Shopware/Bundle/AccountBundle/Service/RegisterService.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_Benchmark\\:\\:saveIndustryAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AccountBundle\\\\Type\\\\SalutationType\\:\\:configureOptions\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Controllers/Backend/Benchmark.php
+			path: engine/Shopware/Bundle/AccountBundle/Type/SalutationType.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_Benchmark\\:\\:saveTypeAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Backend_AttributeData\\:\\:listAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Controllers/Backend/Benchmark.php
+			path: engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/AttributeData.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_Benchmark\\:\\:setActiveAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Backend_AttributeData\\:\\:loadDataAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Controllers/Backend/Benchmark.php
+			path: engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/AttributeData.php
 
 		-
-			message: "#^Cannot access property \\$id on Shopware_Components_Auth\\|null\\.$#"
+			message: "#^Method Shopware_Controllers_Backend_AttributeData\\:\\:saveDataAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Controllers/Backend/BenchmarkLocalOverview.php
+			path: engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/AttributeData.php
 
 		-
-			message: "#^Cannot call method getIdentity\\(\\) on Shopware_Components_Auth\\|null\\.$#"
+			message: "#^Parameter \\#1 \\$arrayStore of method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setArrayStore\\(\\) expects string, string\\|false given\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Controllers/Backend/BenchmarkLocalOverview.php
+			path: engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/AttributeData.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_BenchmarkLocalOverview\\:\\:getShops\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware_Controllers_Backend_Attributes\\:\\:columnNameExistsAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Controllers/Backend/BenchmarkLocalOverview.php
+			path: engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/Attributes.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_BenchmarkLocalOverview\\:\\:renderAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Backend_Attributes\\:\\:createAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Controllers/Backend/BenchmarkLocalOverview.php
+			path: engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/Attributes.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_BenchmarkOverview\\:\\:enableMenu\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Backend_Attributes\\:\\:deleteAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Controllers/Backend/BenchmarkOverview.php
+			path: engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/Attributes.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_BenchmarkOverview\\:\\:getShopsAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Backend_Attributes\\:\\:generateModelsAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Controllers/Backend/BenchmarkOverview.php
+			path: engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/Attributes.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_BenchmarkOverview\\:\\:handleSettings\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Backend_Attributes\\:\\:getColumnAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Controllers/Backend/BenchmarkOverview.php
+			path: engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/Attributes.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_BenchmarkOverview\\:\\:indexAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Backend_Attributes\\:\\:getEntitiesAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Controllers/Backend/BenchmarkOverview.php
+			path: engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/Attributes.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_BenchmarkOverview\\:\\:loadCachedFile\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Backend_Attributes\\:\\:getTablesAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Controllers/Backend/BenchmarkOverview.php
+			path: engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/Attributes.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_BenchmarkOverview\\:\\:renderAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Backend_Attributes\\:\\:getTypesAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Controllers/Backend/BenchmarkOverview.php
+			path: engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/Attributes.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_BenchmarkOverview\\:\\:saveIndustryAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Backend_Attributes\\:\\:resetDataAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Controllers/Backend/BenchmarkOverview.php
+			path: engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/Attributes.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\DependencyInjection\\\\Compiler\\\\MatcherCompilerPass\\:\\:process\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Backend_Attributes\\:\\:updateAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/DependencyInjection/Compiler/MatcherCompilerPass.php
+			path: engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/Attributes.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Hydrator\\\\BusinessIntelligenceResponseHydrator\\:\\:hydrate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware_Controllers_Backend_EntitySearch\\:\\:searchAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Hydrator/BusinessIntelligenceResponseHydrator.php
+			path: engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/EntitySearch.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Hydrator\\\\HydratorInterface\\:\\:hydrate\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\DependencyInjection\\\\Compiler\\\\StaticResourcesCompilerPass\\:\\:process\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Hydrator/HydratorInterface.php
+			path: engine/Shopware/Bundle/AttributeBundle/DependencyInjection/Compiler/StaticResourcesCompilerPass.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Hydrator\\\\HydratorInterface\\:\\:hydrate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\CustomerRepository\\:\\:getMapping\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Hydrator/HydratorInterface.php
+			path: engine/Shopware/Bundle/AttributeBundle/Repository/CustomerRepository.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Hydrator\\\\StatisticsResponseHydrator\\:\\:hydrate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\CustomerRepository\\:\\:getTextFieldWithRawData\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Hydrator/StatisticsResponseHydrator.php
+			path: engine/Shopware/Bundle/AttributeBundle/Repository/CustomerRepository.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\AnalyticsProvider\\:\\:getConfig\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\GenericRepository\\:\\:get\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/AnalyticsProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Repository/GenericRepository.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\AnalyticsProvider\\:\\:getVisitsList\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\GenericRepository\\:\\:getList\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/AnalyticsProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Repository/GenericRepository.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\AnalyticsProvider\\:\\:getVisitsPerDevice\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\OrderRepository\\:\\:getMapping\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/AnalyticsProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Repository/OrderRepository.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\CategoriesProvider\\:\\:buildTree\\(\\) has parameter \\$categories with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\OrderRepository\\:\\:getTextFieldWithRawData\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/CategoriesProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Repository/OrderRepository.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\CategoriesProvider\\:\\:buildTree\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\ProductRepository\\:\\:getMapping\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/CategoriesProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Repository/ProductRepository.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\CategoriesProvider\\:\\:getCategoryIds\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\RepositoryInterface\\:\\:get\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/CategoriesProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Repository/RepositoryInterface.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\CategoriesProvider\\:\\:getCategoryProductData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\RepositoryInterface\\:\\:getList\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/CategoriesProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Repository/RepositoryInterface.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\CategoriesProvider\\:\\:getCategoryTree\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\SearchCriteria\\:\\:\\$params type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/CategoriesProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Repository/SearchCriteria.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\CategoriesProvider\\:\\:getProductsInCategoriesCounts\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\SearchResult\\:\\:__construct\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/CategoriesProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Repository/SearchResult.php
 
 		-
-			message: "#^Property Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\CategoriesProvider\\:\\:\\$categoryIds type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\SearchResult\\:\\:getData\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/CategoriesProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Repository/SearchResult.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\CustomersProvider\\:\\:getConfig\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\SearchResult\\:\\:\\$data type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/CustomersProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Repository/SearchResult.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\CustomersProvider\\:\\:getCustomersBasicList\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\Searcher\\\\CustomerSearcher\\:\\:getSearchFields\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/CustomersProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/CustomerSearcher.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\CustomersProvider\\:\\:getCustomersList\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\Searcher\\\\GenericSearcher\\:\\:addSearchTermCondition\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/CustomersProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/GenericSearcher.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\CustomersProvider\\:\\:getTurnOverPerCustomer\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#2 \\$term of method Shopware\\\\Components\\\\Model\\\\SearchBuilder\\:\\:addSearchTerm\\(\\) expects string, string\\|null given\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/CustomersProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/GenericSearcher.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\CustomersProvider\\:\\:matchGenders\\(\\) has parameter \\$customer with no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\Searcher\\\\GenericSearcher\\:\\:\\$searchBuilder \\(Shopware\\\\Components\\\\Model\\\\SearchBuilder\\) does not accept Shopware\\\\Components\\\\Model\\\\SearchBuilder\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/CustomersProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/GenericSearcher.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\CustomersProvider\\:\\:matchGenders\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\Searcher\\\\OrderSearcher\\:\\:getSearchFields\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/CustomersProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/OrderSearcher.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\EmotionsProvider\\:\\:getElementUsages\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\Searcher\\\\PremiumSearcher\\:\\:getSearchFields\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/EmotionsProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/PremiumSearcher.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\EmotionsProvider\\:\\:getEmotionIds\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\Searcher\\\\ProductSearcher\\:\\:getSearchFields\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/EmotionsProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/ProductSearcher.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\EmotionsProvider\\:\\:getViewportUsages\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\Searcher\\\\PropertyOptionSearcher\\:\\:getSearchFields\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/EmotionsProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/PropertyOptionSearcher.php
 
 		-
-			message: "#^Property Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\EmotionsProvider\\:\\:\\$emotionIds type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:getElasticSearchType\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/EmotionsProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\ManufacturerProvider\\:\\:getPossibleCategoryIds\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setArrayStore\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/ManufacturerProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\ManufacturerProvider\\:\\:getProductIds\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setColumnName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/ManufacturerProvider.php
-
-		-
-			message: "#^Cannot call method format\\(\\) on DateTime\\|false\\.$#"
-			count: 2
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/OrdersProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\OrdersProvider\\:\\:getBillingCountry\\(\\) has parameter \\$orderIds with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setColumnType\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/OrdersProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\OrdersProvider\\:\\:getBillingCountry\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setConfigured\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/OrdersProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\OrdersProvider\\:\\:getCustomerData\\(\\) has parameter \\$customerIds with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setCore\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/OrdersProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\OrdersProvider\\:\\:getCustomerData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setCustom\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/OrdersProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\OrdersProvider\\:\\:getDispatchData\\(\\) has parameter \\$dispatchIds with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setDbalType\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/OrdersProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\OrdersProvider\\:\\:getDispatchData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setDefaultValue\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/OrdersProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\OrdersProvider\\:\\:getOrderConfig\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/OrdersProvider.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\OrdersProvider\\:\\:getOrderData\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/OrdersProvider.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\OrdersProvider\\:\\:getOrderData\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/OrdersProvider.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\OrdersProvider\\:\\:getOrderDetails\\(\\) has parameter \\$orderIds with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/OrdersProvider.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\OrdersProvider\\:\\:getOrderDetails\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/OrdersProvider.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\OrdersProvider\\:\\:getOrdersBasicData\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/OrdersProvider.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\OrdersProvider\\:\\:getOrdersBasicData\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/OrdersProvider.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\OrdersProvider\\:\\:getOrdersList\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/OrdersProvider.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\OrdersProvider\\:\\:getPaymentData\\(\\) has parameter \\$paymentIds with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/OrdersProvider.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\OrdersProvider\\:\\:getPaymentData\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/OrdersProvider.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\OrdersProvider\\:\\:getShippingCountry\\(\\) has parameter \\$orderIds with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/OrdersProvider.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\OrdersProvider\\:\\:getShippingCountry\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/OrdersProvider.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\OrdersProvider\\:\\:getUniqueColumnValues\\(\\) has parameter \\$dataSet with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/OrdersProvider.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\OrdersProvider\\:\\:getUniqueColumnValues\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/OrdersProvider.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\OrdersProvider\\:\\:hydrateData\\(\\) has parameter \\$orderData with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setDisplayInBackend\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/OrdersProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\OrdersProvider\\:\\:hydrateData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setElasticSearchType\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/OrdersProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\OrdersProvider\\:\\:isValidDate\\(\\) should return bool but returns int\\|false\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setElasticSearchType\\(\\) has parameter \\$elasticSearchType with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/OrdersProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\OrdersProvider\\:\\:matchGenders\\(\\) has parameter \\$customer with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setEntity\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/OrdersProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\OrdersProvider\\:\\:matchGenders\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setHelpText\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/OrdersProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\PaymentsProvider\\:\\:getMatchedPaymentUsages\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/PaymentsProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\PaymentsProvider\\:\\:getPaymentUsages\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setIdentifier\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/PaymentsProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\PaymentsProvider\\:\\:getPossiblePaymentIds\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setLabel\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/PaymentsProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
 
 		-
-			message: "#^Property Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\PaymentsProvider\\:\\:\\$paymentIds type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setPosition\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/PaymentsProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\PluginsProvider\\:\\:getShopwarePlugins\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setSqlType\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/PluginsProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\ProductsProvider\\:\\:getBasicProductData\\(\\) has parameter \\$productIds with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setSupportText\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/ProductsProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\ProductsProvider\\:\\:getBasicProductData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setTableName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/ProductsProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\ProductsProvider\\:\\:getConfig\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:setTranslatable\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/ProductsProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\ProductsProvider\\:\\:getImagesPerProduct\\(\\) has parameter \\$productIds with no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\ConfigurationStruct\\:\\:\\$elasticSearchType type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/ProductsProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\ProductsProvider\\:\\:getImagesPerProduct\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\CrudService\\:\\:changeAttribute\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/ProductsProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/CrudService.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\ProductsProvider\\:\\:getPossibleCategoryIds\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\CrudService\\:\\:createAttribute\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/ProductsProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/CrudService.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\ProductsProvider\\:\\:getProductIds\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\CrudService\\:\\:getTableConfiguration\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/ProductsProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/CrudService.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\ProductsProvider\\:\\:getProductList\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\CrudService\\:\\:update\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/ProductsProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/CrudService.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\ProductsProvider\\:\\:getVariantsForProducts\\(\\) has parameter \\$productIds with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\CrudService\\:\\:updateConfig\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/ProductsProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/CrudService.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\ProductsProvider\\:\\:getVariantsForProducts\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\CrudServiceInterface\\:\\:update\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/ProductsProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/CrudServiceInterface.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\ShipmentsProvider\\:\\:getMatchedShipmentList\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataLoader\\:\\:load\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/ShipmentsProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/DataLoader.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\ShipmentsProvider\\:\\:getMatchedShipmentUsages\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataLoader\\:\\:loadTranslations\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/ShipmentsProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/DataLoader.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\ShipmentsProvider\\:\\:getPossibleCategoryIds\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataLoaderInterface\\:\\:load\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/ShipmentsProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/DataLoaderInterface.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\ShipmentsProvider\\:\\:getShipmentIds\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataLoaderInterface\\:\\:loadTranslations\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/ShipmentsProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/DataLoaderInterface.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\ShipmentsProvider\\:\\:getShipmentList\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataPersister\\:\\:create\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/ShipmentsProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/DataPersister.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\ShipmentsProvider\\:\\:getShipmentUsages\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataPersister\\:\\:create\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/ShipmentsProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/DataPersister.php
 
 		-
-			message: "#^Property Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\ShipmentsProvider\\:\\:\\$shipmentIds type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataPersister\\:\\:filter\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/ShipmentsProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/DataPersister.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\ShopwareProvider\\:\\:getExtensions\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataPersister\\:\\:filter\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/ShopwareProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/DataPersister.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\UpdatedOrdersProvider\\:\\:getOrdersBasicData\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataPersister\\:\\:isValidDate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/UpdatedOrdersProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/DataPersister.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Provider\\\\UpdatedOrdersProvider\\:\\:getOrdersBasicData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataPersister\\:\\:isValidDate\\(\\) has parameter \\$date with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Provider/UpdatedOrdersProvider.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/DataPersister.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Service\\\\BenchmarkStatisticsService\\:\\:fetchBenchmarkData\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataPersister\\:\\:persist\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Service/BenchmarkStatisticsService.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/DataPersister.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Service\\\\BenchmarkStatisticsService\\:\\:sendStatisticsData\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataPersister\\:\\:saveTranslation\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Service/BenchmarkStatisticsService.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/DataPersister.php
 
 		-
-			message: "#^Parameter \\#1 \\$token of class Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Struct\\\\BusinessIntelligenceRequest constructor expects string, string\\|null given\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataPersister\\:\\:saveTranslation\\(\\) has parameter \\$translation with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Service/BusinessIntelligenceService.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/DataPersister.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Service\\\\MatcherService\\:\\:__construct\\(\\) has parameter \\$matchers with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataPersister\\:\\:update\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Service/MatcherService.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/DataPersister.php
 
 		-
-			message: "#^Property Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Service\\\\MatcherService\\:\\:\\$matchers type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataPersister\\:\\:update\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Service/MatcherService.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/DataPersister.php
 
 		-
-			message: "#^Property Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Service\\\\MatcherService\\:\\:\\$storage type has no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#2 \\$foreignKey of method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataLoaderInterface\\:\\:load\\(\\) expects int, int\\<min, \\-1\\>\\|int\\<1, max\\>\\|string given\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Service/MatcherService.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/DataPersister.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Service\\\\StatisticsService\\:\\:handleLastUpdatedOrdersDate\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataPersisterInterface\\:\\:persist\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Service/StatisticsService.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/DataPersisterInterface.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Service\\\\StatisticsService\\:\\:handleLastUpdatedOrdersDate\\(\\) has parameter \\$benchmarkData with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\TableMapping\\:\\:__construct\\(\\) has parameter \\$tableMapping with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Service/StatisticsService.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/TableMapping.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Service\\\\StatisticsService\\:\\:updateLastIds\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\TableMapping\\:\\:getAttributeTables\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Service/StatisticsService.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/TableMapping.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Service\\\\StatisticsService\\:\\:updateLastIds\\(\\) has parameter \\$benchmarkData with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\TableMapping\\:\\:getDependingTables\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Service/StatisticsService.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/TableMapping.php
 
 		-
-			message: "#^Parameter \\#1 \\$data of class Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Struct\\\\StatisticsRequest constructor expects string, string\\|false given\\.$#"
+			message: "#^Property Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\TableMapping\\:\\:\\$tables type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Service/StatisticsService.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/TableMapping.php
 
 		-
-			message: "#^Parameter \\#1 \\$lastUpdatedOrdersDate of method Shopware\\\\Models\\\\Benchmark\\\\BenchmarkConfig\\:\\:setLastUpdatedOrdersDate\\(\\) expects DateTimeInterface\\|null, DateTime\\|false given\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\TableMappingInterface\\:\\:getAttributeTables\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Service/StatisticsService.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/TableMappingInterface.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Service\\\\TranslationService\\:\\:getAll\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\TableMappingInterface\\:\\:getDependingTables\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Service/TranslationService.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/TableMappingInterface.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Service\\\\TranslationService\\:\\:loadCategories\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\TypeMapping\\:\\:getEntities\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Service/TranslationService.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/TypeMapping.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Service\\\\TranslationService\\:\\:loadTimeUnits\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\TypeMapping\\:\\:getTypes\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Service/TranslationService.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/TypeMapping.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\StatisticsClient\\:\\:resetBenchmarkConfig\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\TypeMapping\\:\\:unifiedToElasticSearch\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/StatisticsClient.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/TypeMapping.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Struct\\\\BusinessIntelligenceResponse\\:\\:setShopId\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\TypeMapping\\:\\:\\$types type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Struct/BusinessIntelligenceResponse.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/TypeMapping.php
 
 		-
-			message: "#^Property Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Struct\\\\BusinessIntelligenceResponse\\:\\:\\$shopId \\(int\\) does not accept int\\|null\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\TypeMappingInterface\\:\\:getEntities\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Struct/BusinessIntelligenceResponse.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/TypeMappingInterface.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Struct\\\\StatisticsResponse\\:\\:setShopId\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\TypeMappingInterface\\:\\:getTypes\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Struct/StatisticsResponse.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/TypeMappingInterface.php
 
 		-
-			message: "#^Property Shopware\\\\Bundle\\\\BenchmarkBundle\\\\Struct\\\\StatisticsResponse\\:\\:\\$shopId \\(int\\) does not accept int\\|null\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\TypeMappingInterface\\:\\:unifiedToElasticSearch\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/BenchmarkBundle/Struct/StatisticsResponse.php
+			path: engine/Shopware/Bundle/AttributeBundle/Service/TypeMappingInterface.php
 
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\ContentTypeBundle\\\\Controller\\\\Api\\\\ContentType\\:\\:indexAction\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
@@ -4475,41 +4400,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/ContentTypeBundle/Controller/Backend/ContentType.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ContentTypeBundle\\\\Controller\\\\Backend\\\\ContentType\\:\\:setContainer\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ContentTypeBundle/Controller/Backend/ContentType.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ContentTypeBundle\\\\Controller\\\\Backend\\\\ContentTypeManager\\:\\:__construct\\(\\) has parameter \\$fieldAlias with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ContentTypeBundle/Controller/Backend/ContentTypeManager.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ContentTypeBundle\\\\Controller\\\\Backend\\\\ContentTypeManager\\:\\:convertExtJsToStruct\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ContentTypeBundle/Controller/Backend/ContentTypeManager.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ContentTypeBundle\\\\Controller\\\\Backend\\\\ContentTypeManager\\:\\:getDetail\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ContentTypeBundle/Controller/Backend/ContentTypeManager.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ContentTypeBundle\\\\Controller\\\\Backend\\\\ContentTypeManager\\:\\:getUrls\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ContentTypeBundle/Controller/Backend/ContentTypeManager.php
-
-		-
-			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ContentTypeBundle/Controller/Backend/ContentTypeManager.php
-
-		-
-			message: "#^Property Shopware\\\\Bundle\\\\ContentTypeBundle\\\\Controller\\\\Backend\\\\ContentTypeManager\\:\\:\\$fieldAlias type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ContentTypeBundle/Controller/Backend/ContentTypeManager.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\ContentTypeBundle\\\\Controller\\\\Frontend\\\\ContentType\\:\\:getBreadcrumb\\(\\) has parameter \\$item with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -4710,11 +4600,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/ContentTypeBundle/Services/DatabaseContentTypeSynchronizer.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ContentTypeBundle\\\\Services\\\\DatabaseContentTypeSynchronizer\\:\\:updateContentTypesTable\\(\\) has parameter \\$types with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ContentTypeBundle/Services/DatabaseContentTypeSynchronizer.php
-
 		-
 			message: "#^Property Shopware\\\\Bundle\\\\ContentTypeBundle\\\\Services\\\\DatabaseContentTypeSynchronizer\\:\\:\\$fieldAlias type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -4795,6 +4680,11 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/ContentTypeBundle/Services/MenuSynchronizerInterface.php
 
+		-
+			message: "#^Argument \\#0 expects a constant string, got string$#"
+			count: 3
+			path: engine/Shopware/Bundle/ContentTypeBundle/Services/Repository.php
+
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\ContentTypeBundle\\\\Services\\\\Repository\\:\\:buildQuery\\(\\) has parameter \\$filters with no type specified\\.$#"
 			count: 1
@@ -5305,11 +5195,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/AnalyzedCustomer.php
 
-		-
-			message: "#^Cannot access offset 'static' on non\\-empty\\-array\\|true\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CronJobSubscriber.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\Indexing\\\\CronJobSubscriber\\:\\:fetchStreams\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -5420,61 +5305,11 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerOrderGateway.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\Indexing\\\\CustomerOrderHydrator\\:\\:explodeAndFilter\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerOrderHydrator.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\Indexing\\\\CustomerOrderHydrator\\:\\:explodeAndFilter\\(\\) has parameter \\$value with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerOrderHydrator.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\Indexing\\\\CustomerOrderHydrator\\:\\:hydrate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerOrderHydrator.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\Indexing\\\\CustomerOrderHydrator\\:\\:hydrate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerOrderHydrator.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\Indexing\\\\CustomerProvider\\:\\:get\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerProvider.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\Indexing\\\\CustomerProvider\\:\\:get\\(\\) has parameter \\$customerIds with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerProvider.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\Indexing\\\\CustomerProviderInterface\\:\\:get\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerProviderInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\Indexing\\\\CustomerProviderInterface\\:\\:get\\(\\) has parameter \\$customerIds with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerProviderInterface.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\Indexing\\\\SearchIndexer\\:\\:buildData\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/SearchIndexer.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\Indexing\\\\SearchIndexer\\:\\:cleanupIndex\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/SearchIndexer.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\Indexing\\\\SearchIndexer\\:\\:clearIndex\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/SearchIndexer.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\Indexing\\\\SearchIndexer\\:\\:createInsertQuery\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -5490,61 +5325,11 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/SearchIndexer.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\Indexing\\\\SearchIndexer\\:\\:populate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/SearchIndexer.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\Indexing\\\\SearchIndexerInterface\\:\\:cleanupIndex\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/SearchIndexerInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\Indexing\\\\SearchIndexerInterface\\:\\:clearIndex\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/SearchIndexerInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\Indexing\\\\SearchIndexerInterface\\:\\:populate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/SearchIndexerInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\BacklogProcessor\\:\\:add\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/BacklogProcessor.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\BacklogProcessor\\:\\:process\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/BacklogProcessor.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\BacklogProcessor\\:\\:writeBacklog\\(\\) has no return type specified\\.$#"
 			count: 1
 			path: engine/Shopware/Bundle/ESIndexingBundle/BacklogProcessor.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\BacklogProcessorInterface\\:\\:add\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/BacklogProcessorInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\BacklogProcessorInterface\\:\\:process\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/BacklogProcessorInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\BacklogReader\\:\\:setLastBacklogId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/BacklogReader.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\BacklogReaderInterface\\:\\:setLastBacklogId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/BacklogReaderInterface.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\ClientFactory\\:\\:createClient\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -5625,21 +5410,11 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/ESIndexingBundle/Console/ConsoleEvaluationHelper.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\Console\\\\ConsoleEvaluationHelper\\:\\:addResult\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/Console/ConsoleEvaluationHelper.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\Console\\\\ConsoleEvaluationHelper\\:\\:addResult\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Bundle/ESIndexingBundle/Console/ConsoleEvaluationHelper.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\Console\\\\ConsoleEvaluationHelper\\:\\:finish\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/Console/ConsoleEvaluationHelper.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\Console\\\\ConsoleEvaluationHelper\\:\\:handleItem\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -5655,56 +5430,11 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/ESIndexingBundle/Console/ConsoleEvaluationHelper.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\Console\\\\ConsoleEvaluationHelper\\:\\:setActive\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/Console/ConsoleEvaluationHelper.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\Console\\\\ConsoleEvaluationHelper\\:\\:setOutput\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/Console/ConsoleEvaluationHelper.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\Console\\\\ConsoleEvaluationHelper\\:\\:setStopOnError\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/Console/ConsoleEvaluationHelper.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\Console\\\\EvaluationHelperInterface\\:\\:addResult\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/Console/EvaluationHelperInterface.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\Console\\\\EvaluationHelperInterface\\:\\:addResult\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Bundle/ESIndexingBundle/Console/EvaluationHelperInterface.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\Console\\\\EvaluationHelperInterface\\:\\:finish\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/Console/EvaluationHelperInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\Console\\\\EvaluationHelperInterface\\:\\:setActive\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/Console/EvaluationHelperInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\Console\\\\EvaluationHelperInterface\\:\\:setOutput\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/Console/EvaluationHelperInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\Console\\\\EvaluationHelperInterface\\:\\:setStopOnError\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/Console/EvaluationHelperInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\DataIndexerInterface\\:\\:populate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/DataIndexerInterface.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\DependencyInjection\\\\Factory\\\\ShopIndexerFactory\\:\\:__construct\\(\\) has parameter \\$indexer with no value type specified in iterable type Traversable\\.$#"
 			count: 1
@@ -5720,46 +5450,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/ESIndexingBundle/DependencyInjection/Factory/ShopIndexerFactory.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\EsClientInterface\\:\\:bulk\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/EsClientInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\EsClientInterface\\:\\:bulk\\(\\) has parameter \\$params with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/EsClientInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\EsClientInterface\\:\\:info\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/EsClientInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\EsClientInterface\\:\\:info\\(\\) has parameter \\$params with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/EsClientInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\EsClientInterface\\:\\:search\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/EsClientInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\EsClientInterface\\:\\:search\\(\\) has parameter \\$params with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/EsClientInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\EsClientInterface\\:\\:setEvaluation\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/EsClientInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\EsClientInterface\\:\\:setLogger\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/EsClientInterface.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\EsClientLogger\\:\\:__call\\(\\) has parameter \\$arguments with no type specified\\.$#"
 			count: 1
@@ -5815,16 +5505,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/ESIndexingBundle/EsClientLogger.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\EsClientLogger\\:\\:setEvaluation\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/EsClientLogger.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\EsClientLogger\\:\\:setLogger\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/EsClientLogger.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\EsSearch\\:\\:addFilter\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -5880,11 +5560,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/ESIndexingBundle/Product/ProductIndexer.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\Product\\\\ProductIndexer\\:\\:populate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/Product/ProductIndexer.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\Product\\\\ProductListingVariationLoader\\:\\:arrayCombinations\\(\\) has parameter \\$array with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -6225,21 +5900,11 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/ESIndexingBundle/Product/ProductProvider.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\Product\\\\ProductSynchronizer\\:\\:synchronize\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/Product/ProductSynchronizer.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\Property\\\\PropertyIndexer\\:\\:indexProperties\\(\\) has no return type specified\\.$#"
 			count: 1
 			path: engine/Shopware/Bundle/ESIndexingBundle/Property/PropertyIndexer.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\Property\\\\PropertyIndexer\\:\\:populate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/Property/PropertyIndexer.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\Property\\\\PropertyMapping\\:\\:get\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -6260,11 +5925,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/ESIndexingBundle/Property/PropertyProvider.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\Property\\\\PropertySynchronizer\\:\\:synchronize\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/Property/PropertySynchronizer.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\ProviderInterface\\:\\:get\\(\\) has parameter \\$identifiers with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -6285,11 +5945,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/ESIndexingBundle/ShopIndexer.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\ShopIndexer\\:\\:cleanupIndices\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/ShopIndexer.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\ShopIndexer\\:\\:createAlias\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -6300,11 +5955,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/ESIndexingBundle/ShopIndexer.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\ShopIndexer\\:\\:index\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/ShopIndexer.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\ShopIndexer\\:\\:index\\(\\) has parameter \\$indexNames with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -6325,16 +5975,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/ESIndexingBundle/ShopIndexer.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\ShopIndexerInterface\\:\\:cleanupIndices\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/ShopIndexerInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\ShopIndexerInterface\\:\\:index\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/ShopIndexerInterface.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\ShopIndexerInterface\\:\\:index\\(\\) has parameter \\$indexes with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -6600,11 +6240,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/ESIndexingBundle/Subscriber/ORMBacklogSubscriber.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\SynchronizerInterface\\:\\:synchronize\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/ESIndexingBundle/SynchronizerInterface.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\TextMapping\\\\TextMappingES6\\:\\:getAttributeRawField\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -6760,11 +6395,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/EmotionBundle/Service/Gateway/Hydrator/EmotionElementHydrator.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Service\\\\Gateway\\\\Hydrator\\\\EmotionHydrator\\:\\:assignTemplate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Service/Gateway/Hydrator/EmotionHydrator.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Service\\\\Gateway\\\\Hydrator\\\\EmotionHydrator\\:\\:assignTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -6775,31 +6405,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/EmotionBundle/Service/Gateway/Hydrator/EmotionHydrator.php
 
-		-
-			message: "#^Parameter \\#1 \\$createDate of method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setCreateDate\\(\\) expects DateTimeInterface, DateTime\\|false\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Service/Gateway/Hydrator/EmotionHydrator.php
-
-		-
-			message: "#^Parameter \\#1 \\$modifiedDate of method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setModifiedDate\\(\\) expects DateTimeInterface, DateTime\\|false\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Service/Gateway/Hydrator/EmotionHydrator.php
-
-		-
-			message: "#^Parameter \\#1 \\$parentId of method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setParentId\\(\\) expects int, int\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Service/Gateway/Hydrator/EmotionHydrator.php
-
-		-
-			message: "#^Parameter \\#1 \\$validFrom of method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setValidFrom\\(\\) expects DateTimeInterface, DateTime\\|false\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Service/Gateway/Hydrator/EmotionHydrator.php
-
-		-
-			message: "#^Parameter \\#1 \\$validTo of method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setValidTo\\(\\) expects DateTimeInterface, DateTime\\|false\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Service/Gateway/Hydrator/EmotionHydrator.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Service\\\\StoreFrontEmotionDeviceConfiguration\\:\\:getCategoryConfiguration\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -7015,166 +6620,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/EmotionBundle/Struct/ElementViewport.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setActive\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setArticleHeight\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setCategories\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setCategoryIds\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setCellHeight\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setCellSpacing\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setCols\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setCreateDate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setDevices\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setElements\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setFullscreen\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setIsLandingPage\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setIsPreview\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setMode\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setModifiedDate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setName\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setParentId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setPosition\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setPreviewSecret\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setRows\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setSeoDescription\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setSeoKeywords\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setSeoTitle\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setShopIds\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setShops\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setShowListing\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setTemplate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setTemplateId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setUserId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setValidFrom\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\:\\:setValidTo\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\EmotionTemplate\\:\\:setFile\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -7240,6 +6685,11 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/EsBackendBundle/BacklogService.php
 
+		-
+			message: "#^Query error\\: Column \"s_es_backend_backlog\\.entity_id\" expects value type int, got type int\\|null$#"
+			count: 1
+			path: engine/Shopware/Bundle/EsBackendBundle/BacklogService.php
+
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\EsBackendBundle\\\\BacklogServiceInterface\\:\\:cleanup\\(\\) has parameter \\$ids with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -7290,26 +6740,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/EsBackendBundle/EsAwareRepository.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EsBackendBundle\\\\EsBackendIndexer\\:\\:cleanupIndices\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EsBackendBundle/EsBackendIndexer.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EsBackendBundle\\\\EsBackendIndexer\\:\\:index\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EsBackendBundle/EsBackendIndexer.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EsBackendBundle\\\\EsBackendIndexer\\:\\:indexEntities\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EsBackendBundle/EsBackendIndexer.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EsBackendBundle\\\\EsBackendIndexer\\:\\:indexEntities\\(\\) has parameter \\$ids with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EsBackendBundle/EsBackendIndexer.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\EsBackendBundle\\\\IndexFactory\\:\\:__construct\\(\\) has parameter \\$indexConfig with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -7356,12 +6786,7 @@ parameters:
 			path: engine/Shopware/Bundle/EsBackendBundle/Searcher/GenericSearcher.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\EsBackendBundle\\\\Struct\\\\Backlog\\:\\:__construct\\(\\) has parameter \\$entity_id with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/EsBackendBundle/Struct/Backlog.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\EsBackendBundle\\\\Struct\\\\Backlog\\:\\:toArray\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\EsBackendBundle\\\\Struct\\\\Backlog\\:\\:toArray\\(\\) should return array\\{entity\\: string, entity_id\\: int\\|null, time\\: string\\} but returns array\\<string, mixed\\>\\.$#"
 			count: 1
 			path: engine/Shopware/Bundle/EsBackendBundle/Struct/Backlog.php
 
@@ -7440,11 +6865,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/FormBundle/StringRendererService.php
 
-		-
-			message: "#^Property Shopware\\\\Bundle\\\\FormBundle\\\\StringRendererService\\:\\:\\$whiteListTypeArray type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/FormBundle/StringRendererService.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\FormBundle\\\\StringRendererServiceInterface\\:\\:render\\(\\) has parameter \\$sElement with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -7695,16 +7115,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/MediaBundle/Adapters/LocalAdapterFactory.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\MediaBundle\\\\CacheOptimizerService\\:\\:optimize\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/MediaBundle/CacheOptimizerService.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\MediaBundle\\\\CdnOptimizerService\\:\\:optimize\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/MediaBundle/CdnOptimizerService.php
-
 		-
 			message: "#^Parameter \\#2 \\$resource of method League\\\\Flysystem\\\\FilesystemInterface\\:\\:updateStream\\(\\) expects resource, resource\\|false given\\.$#"
 			count: 1
@@ -7820,11 +7230,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/MediaBundle/MediaMigration.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\MediaBundle\\\\MediaReplaceService\\:\\:replace\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/MediaBundle/MediaReplaceService.php
-
 		-
 			message: "#^Parameter \\#1 \\$fileSize of method Shopware\\\\Models\\\\Media\\\\Media\\:\\:setFileSize\\(\\) expects int, int\\<0, max\\>\\|false given\\.$#"
 			count: 1
@@ -7835,11 +7240,6 @@ parameters:
 			count: 2
 			path: engine/Shopware/Bundle/MediaBundle/MediaReplaceService.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\MediaBundle\\\\MediaReplaceServiceInterface\\:\\:replace\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/MediaBundle/MediaReplaceServiceInterface.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\MediaBundle\\\\MediaService\\:\\:__construct\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -7890,11 +7290,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/MediaBundle/Optimizer/BinaryOptimizer.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\MediaBundle\\\\Optimizer\\\\BinaryOptimizer\\:\\:run\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/MediaBundle/Optimizer/BinaryOptimizer.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\MediaBundle\\\\Optimizer\\\\GuetzliOptimizer\\:\\:getCommandArguments\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -7930,11 +7325,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/MediaBundle/Optimizer/OptimizerInterface.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\MediaBundle\\\\Optimizer\\\\OptimizerInterface\\:\\:run\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/MediaBundle/Optimizer/OptimizerInterface.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\MediaBundle\\\\Optimizer\\\\OptipngOptimizer\\:\\:getCommandArguments\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -7975,16 +7365,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/MediaBundle/OptimizerService.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\MediaBundle\\\\OptimizerService\\:\\:optimize\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/MediaBundle/OptimizerService.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\MediaBundle\\\\OptimizerServiceInterface\\:\\:optimize\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/MediaBundle/OptimizerServiceInterface.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\MediaBundle\\\\Strategy\\\\Md5Strategy\\:\\:encode\\(\\) should return string but returns string\\|null\\.$#"
 			count: 1
@@ -8020,26 +7400,6 @@ parameters:
 			count: 2
 			path: engine/Shopware/Bundle/OrderBundle/Service/StockService.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\OrderBundle\\\\Subscriber\\\\OrderRecalculationSubscriber\\:\\:postPersist\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/OrderBundle/Subscriber/OrderRecalculationSubscriber.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\OrderBundle\\\\Subscriber\\\\OrderRecalculationSubscriber\\:\\:preRemove\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/OrderBundle/Subscriber/OrderRecalculationSubscriber.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\OrderBundle\\\\Subscriber\\\\OrderRecalculationSubscriber\\:\\:preUpdate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/OrderBundle/Subscriber/OrderRecalculationSubscriber.php
-
-		-
-			message: "#^Parameter \\#1 \\$order of method Shopware\\\\Bundle\\\\OrderBundle\\\\Service\\\\CalculationServiceInterface\\:\\:recalculateOrderTotals\\(\\) expects Shopware\\\\Models\\\\Order\\\\Order, Shopware\\\\Models\\\\Order\\\\Order\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/OrderBundle/Subscriber/OrderRecalculationSubscriber.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\OrderBundle\\\\Subscriber\\\\ProductStockSubscriber\\:\\:postPersist\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -8190,41 +7550,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/InstallerService.php
 
-		-
-			message: "#^Cannot access offset 'name' on array\\|false\\.$#"
-			count: 4
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/LegacyPluginExtractor.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\LegacyPluginExtractor\\:\\:assertNoDirectoryTraversal\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/LegacyPluginExtractor.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\LegacyPluginExtractor\\:\\:assertPrefix\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/LegacyPluginExtractor.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\LegacyPluginExtractor\\:\\:assertValid\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/LegacyPluginExtractor.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\LegacyPluginExtractor\\:\\:clearOpcodeCache\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/LegacyPluginExtractor.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\LegacyPluginExtractor\\:\\:extract\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/LegacyPluginExtractor.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\LegacyPluginExtractor\\:\\:validatePluginZip\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/LegacyPluginExtractor.php
-
 		-
 			message: "#^Cannot call method Collection\\(\\) on Shopware_Components_Plugin_Bootstrap\\|null\\.$#"
 			count: 3
@@ -8330,126 +7655,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginCategoryService.php
 
-		-
-			message: "#^Cannot access offset 'name' on array\\|false\\.$#"
-			count: 3
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginExtractor.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginExtractor\\:\\:assertNoDirectoryTraversal\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginExtractor.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginExtractor\\:\\:assertPrefix\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginExtractor.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginExtractor\\:\\:clearOpcodeCache\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginExtractor.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginExtractor\\:\\:extract\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginExtractor.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginExtractor\\:\\:validatePluginRequirements\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginExtractor.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginExtractor\\:\\:validatePluginZip\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginExtractor.php
-
-		-
-			message: "#^Parameter \\#1 \\$files of method Symfony\\\\Component\\\\Filesystem\\\\Filesystem\\:\\:remove\\(\\) expects iterable\\|string, string\\|true given\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginExtractor.php
-
-		-
-			message: "#^Parameter \\#1 \\$oldFile of method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginExtractor\\:\\:createBackupFile\\(\\) expects string\\|false, bool\\|string given\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginExtractor.php
-
-		-
-			message: "#^Parameter \\#1 \\$origin of method Symfony\\\\Component\\\\Filesystem\\\\Filesystem\\:\\:rename\\(\\) expects string, string\\|true given\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginExtractor.php
-
-		-
-			message: "#^Parameter \\#2 \\$target of method Symfony\\\\Component\\\\Filesystem\\\\Filesystem\\:\\:rename\\(\\) expects string, bool\\|string given\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginExtractor.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginInstaller\\:\\:installCronjob\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginInstaller\\:\\:installForm\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginInstaller\\:\\:installMenu\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginInstaller\\:\\:installResources\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginInstaller\\:\\:installSnippets\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginInstaller\\:\\:refreshPluginList\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginInstaller\\:\\:removeCrontabEntries\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginInstaller\\:\\:removeEmotionComponents\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginInstaller\\:\\:removeEventSubscribers\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginInstaller\\:\\:removeFormsAndElements\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginInstaller\\:\\:removeMenuEntries\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginInstaller\\:\\:removeSnippets\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginInstaller\\:\\:removeTemplates\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginLicenceService\\:\\:cleanupLocalLicenseInformation\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -8500,6 +7705,11 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginLicenceService.php
 
+		-
+			message: "#^Query error\\: Column \"s_core_licenses\\.id\" expects value type int, got type mixed$#"
+			count: 1
+			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginLicenceService.php
+
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginStoreService\\:\\:getLicences\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -8515,61 +7725,11 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginViewService.php
 
-		-
-			message: "#^Cannot access offset 'name' on array\\|false\\.$#"
-			count: 2
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginZipDetector.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\UniqueIdGenerator\\\\UniqueIdGenerator\\:\\:storeUniqueIdInDb\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/UniqueIdGenerator/UniqueIdGenerator.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Struct\\\\BasketPositionStruct\\:\\:setPlugin\\(\\) has no return type specified\\.$#"
 			count: 1
 			path: engine/Shopware/Bundle/PluginInstallerBundle/Struct/BasketPositionStruct.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Struct\\\\CategoryStruct\\:\\:getName\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Struct/CategoryStruct.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Struct\\\\CategoryStruct\\:\\:getName\\(\\) should return array but returns array\\|string\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Struct/CategoryStruct.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Struct\\\\CategoryStruct\\:\\:setChildren\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Struct/CategoryStruct.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Struct\\\\CategoryStruct\\:\\:setId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Struct/CategoryStruct.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Struct\\\\CategoryStruct\\:\\:setName\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Struct/CategoryStruct.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Struct\\\\CategoryStruct\\:\\:setName\\(\\) has parameter \\$name with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Struct/CategoryStruct.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Struct\\\\CategoryStruct\\:\\:setParentId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Struct/CategoryStruct.php
-
-		-
-			message: "#^Property Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Struct\\\\CategoryStruct\\:\\:\\$name type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Struct/CategoryStruct.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Struct\\\\CommentStruct\\:\\:setAuthor\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -9130,61 +8290,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/PluginInstallerBundle/Struct/UpdateResultStruct.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\BatchProductNumberSearch\\:\\:getBaseProductsByCriteriaList\\(\\) has parameter \\$criteriaList with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundle/BatchProductNumberSearch.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\BatchProductNumberSearch\\:\\:getBaseProductsByCriteriaList\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundle/BatchProductNumberSearch.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\BatchProductNumberSearch\\:\\:getOptimizedCriteriaListPosition\\(\\) has parameter \\$criteriaList with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundle/BatchProductNumberSearch.php
-
-		-
-			message: "#^Property Shopware\\\\Bundle\\\\SearchBundle\\\\BatchProductNumberSearch\\:\\:\\$pointer type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundle/BatchProductNumberSearch.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\BatchProductNumberSearchRequest\\:\\:getCriteriaList\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundle/BatchProductNumberSearchRequest.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\BatchProductNumberSearchRequest\\:\\:getProductNumbers\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundle/BatchProductNumberSearchRequest.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\BatchProductNumberSearchRequest\\:\\:setCriteria\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundle/BatchProductNumberSearchRequest.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\BatchProductNumberSearchRequest\\:\\:setProductNumbers\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundle/BatchProductNumberSearchRequest.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\BatchProductNumberSearchRequest\\:\\:setProductNumbers\\(\\) has parameter \\$numbers with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundle/BatchProductNumberSearchRequest.php
-
-		-
-			message: "#^Property Shopware\\\\Bundle\\\\SearchBundle\\\\BatchProductNumberSearchRequest\\:\\:\\$criteriaList type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundle/BatchProductNumberSearchRequest.php
-
-		-
-			message: "#^Property Shopware\\\\Bundle\\\\SearchBundle\\\\BatchProductNumberSearchRequest\\:\\:\\$productNumberList type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundle/BatchProductNumberSearchRequest.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\BatchProductNumberSearchResult\\:\\:__construct\\(\\) has parameter \\$storage with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -9255,86 +8360,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/SearchBundle/Condition/VariantCondition.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\CriteriaRequestHandler\\\\CoreCriteriaRequestHandler\\:\\:addCategoryCondition\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/CoreCriteriaRequestHandler.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\CriteriaRequestHandler\\\\CoreCriteriaRequestHandler\\:\\:addCustomerGroupCondition\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/CoreCriteriaRequestHandler.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\CriteriaRequestHandler\\\\CoreCriteriaRequestHandler\\:\\:addHeightCondition\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/CoreCriteriaRequestHandler.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\CriteriaRequestHandler\\\\CoreCriteriaRequestHandler\\:\\:addImmediateDeliveryCondition\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/CoreCriteriaRequestHandler.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\CriteriaRequestHandler\\\\CoreCriteriaRequestHandler\\:\\:addIsAvailableCondition\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/CoreCriteriaRequestHandler.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\CriteriaRequestHandler\\\\CoreCriteriaRequestHandler\\:\\:addLengthCondition\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/CoreCriteriaRequestHandler.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\CriteriaRequestHandler\\\\CoreCriteriaRequestHandler\\:\\:addLimit\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/CoreCriteriaRequestHandler.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\CriteriaRequestHandler\\\\CoreCriteriaRequestHandler\\:\\:addManufacturerCondition\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/CoreCriteriaRequestHandler.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\CriteriaRequestHandler\\\\CoreCriteriaRequestHandler\\:\\:addOffset\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/CoreCriteriaRequestHandler.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\CriteriaRequestHandler\\\\CoreCriteriaRequestHandler\\:\\:addPriceCondition\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/CoreCriteriaRequestHandler.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\CriteriaRequestHandler\\\\CoreCriteriaRequestHandler\\:\\:addRatingCondition\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/CoreCriteriaRequestHandler.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\CriteriaRequestHandler\\\\CoreCriteriaRequestHandler\\:\\:addSearchCondition\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/CoreCriteriaRequestHandler.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\CriteriaRequestHandler\\\\CoreCriteriaRequestHandler\\:\\:addShippingFreeCondition\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/CoreCriteriaRequestHandler.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\CriteriaRequestHandler\\\\CoreCriteriaRequestHandler\\:\\:addWeightCondition\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/CoreCriteriaRequestHandler.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\CriteriaRequestHandler\\\\CoreCriteriaRequestHandler\\:\\:addWidthCondition\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/CoreCriteriaRequestHandler.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\CriteriaRequestHandler\\\\CoreCriteriaRequestHandler\\:\\:handleRequest\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/CoreCriteriaRequestHandler.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\CriteriaRequestHandler\\\\FacetCriteriaRequestHandler\\:\\:handleCombinedConditionFacet\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -9345,11 +8370,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/FacetCriteriaRequestHandler.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\CriteriaRequestHandler\\\\FacetCriteriaRequestHandler\\:\\:handleRequest\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/FacetCriteriaRequestHandler.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\CriteriaRequestHandler\\\\PropertyCriteriaRequestHandler\\:\\:getGroupedFilters\\(\\) has parameter \\$filters with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -9360,16 +8380,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/PropertyCriteriaRequestHandler.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\CriteriaRequestHandler\\\\PropertyCriteriaRequestHandler\\:\\:handleRequest\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/PropertyCriteriaRequestHandler.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\CriteriaRequestHandler\\\\SortingCriteriaRequestHandler\\:\\:handleRequest\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/SortingCriteriaRequestHandler.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\CriteriaRequestHandler\\\\VariantCriteriaRequestHandler\\:\\:addVariantCondition\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -9385,16 +8395,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/VariantCriteriaRequestHandler.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\CriteriaRequestHandler\\\\VariantCriteriaRequestHandler\\:\\:handleRequest\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/VariantCriteriaRequestHandler.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\CriteriaRequestHandlerInterface\\:\\:handleRequest\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandlerInterface.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\Facet\\\\CombinedConditionFacet\\:\\:__construct\\(\\) has parameter \\$conditions with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -9465,16 +8465,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/SearchBundle/FacetResult/BooleanFacetResult.php
 
-		-
-			message: "#^Comparison operation \"\\=\\=\" between array and int\\|null results in an error\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundle/FacetResult/CategoryTreeFacetResultBuilder.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\FacetResult\\\\CategoryTreeFacetResultBuilder\\:\\:getCategoriesOfParent\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundle/FacetResult/CategoryTreeFacetResultBuilder.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\SearchBundle\\\\FacetResult\\\\FacetResultGroup\\:\\:setFacetResults\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -9600,36 +8590,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/SearchBundleDBAL/ListingPriceTable.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundleDBAL\\\\PriceHelper\\:\\:joinAvailableVariant\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundleDBAL/PriceHelper.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundleDBAL\\\\PriceHelper\\:\\:joinDefaultPrices\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundleDBAL/PriceHelper.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundleDBAL\\\\PriceHelper\\:\\:joinPrices\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundleDBAL/PriceHelper.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundleDBAL\\\\PriceHelperInterface\\:\\:joinAvailableVariant\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundleDBAL/PriceHelperInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundleDBAL\\\\PriceHelperInterface\\:\\:joinDefaultPrices\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundleDBAL/PriceHelperInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundleDBAL\\\\PriceHelperInterface\\:\\:joinPrices\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundleDBAL/PriceHelperInterface.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\SearchBundleDBAL\\\\ProductNumberSearch\\:\\:assertCollectionIsInstanceOf\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -9740,21 +8700,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/SearchBundleDBAL/SearchBundleDBALSubscriber.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundleDBAL\\\\SearchTerm\\\\SearchIndexer\\:\\:build\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/SearchIndexer.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundleDBAL\\\\SearchTerm\\\\SearchIndexer\\:\\:cleanupIndex\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/SearchIndexer.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundleDBAL\\\\SearchTerm\\\\SearchIndexer\\:\\:cleanupKeywords\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/SearchIndexer.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\SearchBundleDBAL\\\\SearchTerm\\\\SearchIndexer\\:\\:getSearchTables\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -9770,41 +8715,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/SearchIndexer.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundleDBAL\\\\SearchTerm\\\\SearchIndexer\\:\\:setNextUpdateTimestamp\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/SearchIndexer.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundleDBAL\\\\SearchTerm\\\\SearchIndexer\\:\\:validate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/SearchIndexer.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundleDBAL\\\\SearchTerm\\\\SearchIndexerInterface\\:\\:build\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/SearchIndexerInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundleDBAL\\\\SearchTerm\\\\SearchIndexerInterface\\:\\:validate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/SearchIndexerInterface.php
-
-		-
-			message: "#^Cannot call method getTerm\\(\\) on Shopware\\\\Bundle\\\\SearchBundle\\\\ConditionInterface\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/SearchTermLogger.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundleDBAL\\\\SearchTerm\\\\SearchTermLogger\\:\\:logResult\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/SearchTermLogger.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundleDBAL\\\\SearchTerm\\\\SearchTermLoggerInterface\\:\\:logResult\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/SearchTermLoggerInterface.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\SearchBundleDBAL\\\\SearchTerm\\\\SearchTermQueryBuilder\\:\\:addAndSearchLogic\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -9860,46 +8770,11 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/SearchBundleDBAL/VariantHelper.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundleDBAL\\\\VariantHelper\\:\\:joinPrices\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundleDBAL/VariantHelper.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\SearchBundleDBAL\\\\VariantHelper\\:\\:joinSalePrices\\(\\) has no return type specified\\.$#"
 			count: 1
 			path: engine/Shopware/Bundle/SearchBundleDBAL/VariantHelper.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundleDBAL\\\\VariantHelper\\:\\:joinVariantCondition\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundleDBAL/VariantHelper.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundleDBAL\\\\VariantHelper\\:\\:joinVariants\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundleDBAL/VariantHelper.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundleDBAL\\\\VariantHelperInterface\\:\\:joinPrices\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundleDBAL/VariantHelperInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundleDBAL\\\\VariantHelperInterface\\:\\:joinVariantCondition\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundleDBAL/VariantHelperInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SearchBundleDBAL\\\\VariantHelperInterface\\:\\:joinVariants\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SearchBundleDBAL/VariantHelperInterface.php
-
-		-
-			message: "#^If condition is always true\\.$#"
-			count: 2
-			path: engine/Shopware/Bundle/SearchBundleES/CombinedConditionQueryBuilder.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\SearchBundleES\\\\CombinedConditionQueryBuilder\\:\\:build\\(\\) has parameter \\$conditions with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -10025,6 +8900,16 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/SitemapBundle/ConfigHandler/Database.php
 
+		-
+			message: "#^Query error\\: Argument \\#1 is not a constant array, got array\\<mixed~'id', mixed\\>&hasOffsetValue\\('identifier', mixed~''\\)$#"
+			count: 1
+			path: engine/Shopware/Bundle/SitemapBundle/ConfigHandler/Database.php
+
+		-
+			message: "#^Query error\\: Argument \\#1 is not a constant array, got array\\<mixed~'id', mixed\\>&hasOffsetValue\\('last_mod', mixed\\)$#"
+			count: 1
+			path: engine/Shopware/Bundle/SitemapBundle/ConfigHandler/Database.php
+
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\SitemapBundle\\\\ConfigHandler\\\\File\\:\\:__construct\\(\\) has parameter \\$sitemapConfig with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -10121,9 +9006,9 @@ parameters:
 			path: engine/Shopware/Bundle/SitemapBundle/Service/FilterContainerFactory.php
 
 		-
-			message: "#^Method Shopware\\\\Bundle\\\\SitemapBundle\\\\Service\\\\SitemapExporter\\:\\:generate\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Bundle\\\\SitemapBundle\\\\Service\\\\LinkFilter\\:\\:filterLink\\(\\) has @param\\-out PHPDoc tag for parameter \\$userParams with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Bundle/SitemapBundle/Service/SitemapExporter.php
+			path: engine/Shopware/Bundle/SitemapBundle/Service/LinkFilter.php
 
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\SitemapBundle\\\\Service\\\\SitemapWriter\\:\\:moveFiles\\(\\) has no return type specified\\.$#"
@@ -10145,21 +9030,11 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/SitemapBundle/Service/SitemapWriter.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SitemapBundle\\\\Service\\\\UrlFilter\\:\\:addFilterContainer\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SitemapBundle/Service/UrlFilter.php
-
 		-
 			message: "#^Property Shopware\\\\Bundle\\\\SitemapBundle\\\\Service\\\\UrlFilter\\:\\:\\$filterContainers type has no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Bundle/SitemapBundle/Service/UrlFilter.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SitemapBundle\\\\SitemapExporterInterface\\:\\:generate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SitemapBundle/SitemapExporterInterface.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\SitemapBundle\\\\SitemapWriterInterface\\:\\:writeFile\\(\\) has parameter \\$urls with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -10235,11 +9110,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/SitemapBundle/UrlFilter/FilterInterface.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\SitemapBundle\\\\UrlFilterInterface\\:\\:addFilterContainer\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/SitemapBundle/UrlFilterInterface.php
-
 		-
 			message: "#^Cannot access offset 'size' on array\\|false\\.$#"
 			count: 1
@@ -10780,46 +9650,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/ProductStreamHydrator.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Gateway\\\\DBAL\\\\Hydrator\\\\PropertyHydrator\\:\\:hydrateGroup\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/PropertyHydrator.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Gateway\\\\DBAL\\\\Hydrator\\\\PropertyHydrator\\:\\:hydrateOption\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/PropertyHydrator.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Gateway\\\\DBAL\\\\Hydrator\\\\PropertyHydrator\\:\\:hydrateSet\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/PropertyHydrator.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Gateway\\\\DBAL\\\\Hydrator\\\\PropertyHydrator\\:\\:hydrateValues\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/PropertyHydrator.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Gateway\\\\DBAL\\\\Hydrator\\\\PropertyHydrator\\:\\:sortGroups\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/PropertyHydrator.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Gateway\\\\DBAL\\\\Hydrator\\\\PropertyHydrator\\:\\:sortOptions\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/PropertyHydrator.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Gateway\\\\DBAL\\\\Hydrator\\\\PropertyHydrator\\:\\:sortOptionsByPosition\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/PropertyHydrator.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Gateway\\\\DBAL\\\\Hydrator\\\\PropertyHydrator\\:\\:sortOptionsNumercialValue\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/PropertyHydrator.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Gateway\\\\DBAL\\\\Hydrator\\\\ShopHydrator\\:\\:hydrate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -12846,7 +11676,7 @@ parameters:
 			path: engine/Shopware/Bundle/StoreFrontBundle/Struct/ShopPage.php
 
 		-
-			message: "#^Argument of an invalid type Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\Struct supplied for foreach, only iterables are supported\\.$#"
+			message: "#^Argument of an invalid type \\$this\\(Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\Struct\\) supplied for foreach, only iterables are supported\\.$#"
 			count: 1
 			path: engine/Shopware/Bundle/StoreFrontBundle/Struct/Struct.php
 
@@ -12935,11 +11765,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Commands/CacheClearCommand.php
 
-		-
-			message: "#^Argument of an invalid type array\\|false supplied for foreach, only iterables are supported\\.$#"
-			count: 1
-			path: engine/Shopware/Commands/CloneCategoryTreeCommand.php
-
 		-
 			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Category\\\\Category\\|null\\.$#"
 			count: 1
@@ -13025,26 +11850,11 @@ parameters:
 			count: 1
 			path: engine/Shopware/Commands/DatabaseSetupCommand.php
 
-		-
-			message: "#^Method Shopware\\\\Commands\\\\FirstRunWizardDisableCommand\\:\\:configure\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Commands/FirstRunWizardDisableCommand.php
-
-		-
-			message: "#^Method Shopware\\\\Commands\\\\FirstRunWizardEnableCommand\\:\\:configure\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Commands/FirstRunWizardEnableCommand.php
-
 		-
 			message: "#^Method Shopware\\\\Commands\\\\GenerateAttributesCommand\\:\\:configure\\(\\) has no return type specified\\.$#"
 			count: 1
 			path: engine/Shopware/Commands/GenerateAttributesCommand.php
 
-		-
-			message: "#^Variable \\$versions in empty\\(\\) always exists and is not falsy\\.$#"
-			count: 1
-			path: engine/Shopware/Commands/GenerateMigrationCommand.php
-
 		-
 			message: "#^Method Shopware\\\\Commands\\\\GenerateProductFeedCommand\\:\\:completeArgumentValues\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -13300,11 +12110,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Commands/PluginListCommand.php
 
-		-
-			message: "#^Method Shopware\\\\Commands\\\\PluginListCommand\\:\\:configure\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Commands/PluginListCommand.php
-
 		-
 			message: "#^Method Shopware\\\\Commands\\\\PluginRefreshCommand\\:\\:configure\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -13445,11 +12250,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Commands/ShopwareCommand.php
 
-		-
-			message: "#^Method Shopware\\\\Commands\\\\ShopwareCommand\\:\\:setContainer\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Commands/ShopwareCommand.php
-
 		-
 			message: "#^Parameter \\#1 \\$input of method Shopware\\\\Commands\\\\ShopwareCommand\\:\\:completeInputByQueryingProperty\\(\\) expects string, int\\|string given\\.$#"
 			count: 3
@@ -13770,56 +12570,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Commands/ThemeSynchronizeCommand.php
 
-		-
-			message: "#^Method Shopware\\\\Commands\\\\ThumbnailCleanupCommand\\:\\:configure\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Commands/ThumbnailCleanupCommand.php
-
-		-
-			message: "#^Method Shopware\\\\Commands\\\\ThumbnailCleanupCommand\\:\\:deleteThumbnails\\(\\) has parameter \\$thumbnailFiles with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Commands/ThumbnailCleanupCommand.php
-
-		-
-			message: "#^Method Shopware\\\\Commands\\\\ThumbnailCleanupCommand\\:\\:indexFile\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Commands/ThumbnailCleanupCommand.php
-
-		-
-			message: "#^Method Shopware\\\\Commands\\\\ThumbnailCleanupCommand\\:\\:processFilesIn\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Commands/ThumbnailCleanupCommand.php
-
-		-
-			message: "#^Method Shopware\\\\Commands\\\\ThumbnailCleanupCommand\\:\\:removeThumbnails\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Commands/ThumbnailCleanupCommand.php
-
-		-
-			message: "#^Method Shopware\\\\Commands\\\\ThumbnailCleanupCommand\\:\\:searchThumbnails\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Commands/ThumbnailCleanupCommand.php
-
-		-
-			message: "#^PHPDoc tag @var for variable \\$contents has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Commands/ThumbnailCleanupCommand.php
-
-		-
-			message: "#^Parameter \\#1 \\$key of function array_key_exists expects int\\|string, string\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Commands/ThumbnailCleanupCommand.php
-
-		-
-			message: "#^Property Shopware\\\\Commands\\\\ThumbnailCleanupCommand\\:\\:\\$baseFiles type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Commands/ThumbnailCleanupCommand.php
-
-		-
-			message: "#^Property Shopware\\\\Commands\\\\ThumbnailCleanupCommand\\:\\:\\$thumbnailFiles type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Commands/ThumbnailCleanupCommand.php
-
 		-
 			message: "#^Method Shopware\\\\Commands\\\\ThumbnailGenerateCommand\\:\\:completeArgumentValues\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -13900,16 +12650,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Acl.php
 
-		-
-			message: "#^Access to an undefined property Enlight_Controller_Response_Response\\:\\:\\$headers\\.$#"
-			count: 1
-			path: engine/Shopware/Components/AddLinkHeaderSubscriber.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\BatchInterface\\:\\:getIdByData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/BatchInterface.php
-
 		-
 			message: "#^Cannot call method setAcl\\(\\) on object\\|null\\.$#"
 			count: 1
@@ -14025,66 +12765,16 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Api/Resource/Article.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:getArticleCategories\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:getArticleConfiguratorSet\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:getArticleDownloads\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:getArticleImages\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:getArticleLinks\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:getArticleRelated\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:getArticleSeoCategories\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Components/Api/Resource/Article.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:getArticleSimilar\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:getArticleVariants\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:getAttributeProperties\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Components/Api/Resource/Article.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:getFullResult\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:getIdByData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:getList\\(\\) has parameter \\$criteria with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -14125,11 +12815,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Api/Resource/Article.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:getSingleResult\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:getSingleTranslation\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -14160,136 +12845,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Api/Resource/Article.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:prepareArticleAssociatedData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:prepareArticleAssociatedData\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:prepareAssociatedData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:prepareAssociatedData\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:prepareAttributeAssociatedData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:prepareAttributeAssociatedData\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:prepareAvoidCustomerGroups\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:prepareAvoidCustomerGroups\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:prepareCategoryAssociatedData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:prepareCategoryAssociatedData\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:prepareConfiguratorSet\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:prepareConfiguratorSet\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:prepareDownloadsAssociatedData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:prepareDownloadsAssociatedData\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:prepareImageAssociatedData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:prepareImageAssociatedData\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:prepareMainDetail\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:prepareMainDetail\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:preparePropertyValuesData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:preparePropertyValuesData\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:prepareRelatedAssociatedData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:prepareRelatedAssociatedData\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:prepareSeoCategoryAssociatedData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:prepareSeoCategoryAssociatedData\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:prepareSimilarAssociatedData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:prepareSimilarAssociatedData\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:prepareVariants\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -14300,11 +12855,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Api/Resource/Article.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:removeArticleDetails\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Article.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:resetProductCategoryAssignment\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -14420,11 +12970,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Api/Resource/Cache.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Cache\\:\\:getIdByData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Cache.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Cache\\:\\:getList\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -14590,86 +13135,21 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Api/Resource/CustomerGroup.php
 
-		-
-			message: "#^Cannot access offset 'freezeUp' on non\\-empty\\-array\\|true\\.$#"
-			count: 2
-			path: engine/Shopware/Components/Api/Resource/CustomerStream.php
-
-		-
-			message: "#^Cannot access offset 'static' on non\\-empty\\-array\\|true\\.$#"
-			count: 2
-			path: engine/Shopware/Components/Api/Resource/CustomerStream.php
-
-		-
-			message: "#^Cannot call method getConditions\\(\\) on Shopware\\\\Models\\\\CustomerStream\\\\CustomerStream\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/CustomerStream.php
-
-		-
-			message: "#^Cannot call method getFreezeUp\\(\\) on Shopware\\\\Models\\\\CustomerStream\\\\CustomerStream\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/CustomerStream.php
-
-		-
-			message: "#^Cannot call method isStatic\\(\\) on Shopware\\\\Models\\\\CustomerStream\\\\CustomerStream\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/CustomerStream.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\CustomerStream\\:\\:cleanupIndexSearchIndex\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/CustomerStream.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\CustomerStream\\:\\:create\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Components/Api/Resource/CustomerStream.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\CustomerStream\\:\\:delete\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/CustomerStream.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\CustomerStream\\:\\:getConditions\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Components/Api/Resource/CustomerStream.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\CustomerStream\\:\\:getList\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/CustomerStream.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\CustomerStream\\:\\:getOne\\(\\) has parameter \\$limit with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/CustomerStream.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\CustomerStream\\:\\:indexStream\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/CustomerStream.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\CustomerStream\\:\\:insertCustomers\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/CustomerStream.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\CustomerStream\\:\\:insertCustomers\\(\\) has parameter \\$customerIds with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Components/Api/Resource/CustomerStream.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\CustomerStream\\:\\:prepareData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/CustomerStream.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\CustomerStream\\:\\:prepareData\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/CustomerStream.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\CustomerStream\\:\\:update\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -14680,31 +13160,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Api/Resource/CustomerStream.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\CustomerStream\\:\\:validateStream\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/CustomerStream.php
-
-		-
-			message: "#^Parameter \\#1 \\$entity of method Doctrine\\\\ORM\\\\EntityManager\\:\\:remove\\(\\) expects object, Shopware\\\\Models\\\\CustomerStream\\\\CustomerStream\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/CustomerStream.php
-
-		-
-			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/CustomerStream.php
-
-		-
-			message: "#^Parameter \\#1 \\$streamId of method Shopware\\\\Components\\\\Api\\\\Resource\\\\CustomerStream\\:\\:getConditions\\(\\) expects int, int\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/CustomerStream.php
-
-		-
-			message: "#^Parameter \\#3 \\$conditions of method Shopware\\\\Components\\\\Api\\\\Resource\\\\CustomerStream\\:\\:updateFrozenState\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/CustomerStream.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\EmotionPreset\\:\\:create\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -14895,111 +13350,11 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Api/Resource/Media.php
 
-		-
-			message: "#^Parameter \\#1 \\$filename of function unlink expects string, string\\|false given\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Media.php
-
 		-
 			message: "#^Parameter \\#1 \\$path of method Shopware\\\\Models\\\\Media\\\\Media\\:\\:setPath\\(\\) expects string, string\\|null given\\.$#"
 			count: 1
 			path: engine/Shopware/Components/Api/Resource/Media.php
 
-		-
-			message: "#^Parameter \\#2 \\$baseFilename of method Shopware\\\\Components\\\\Api\\\\Resource\\\\Media\\:\\:load\\(\\) expects string\\|null, bool\\|string given\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Media.php
-
-		-
-			message: "#^Parameter \\#2 \\$filename of method Shopware\\\\Components\\\\Api\\\\Resource\\\\Media\\:\\:prepareFilePath\\(\\) expects string, bool\\|string given\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Media.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Order\\:\\:create\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Order.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Order\\:\\:getList\\(\\) has parameter \\$criteria with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Order.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Order\\:\\:getList\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Order.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Order\\:\\:getList\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Order.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Order\\:\\:getOne\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Order.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Order\\:\\:getOneByNumber\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Order.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Order\\:\\:prepareCreateAddresses\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Order.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Order\\:\\:prepareCreateOrderData\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Order.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Order\\:\\:prepareCreateOrderData\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Order.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Order\\:\\:prepareCreateOrderDetailsData\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Order.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Order\\:\\:prepareCreateOrderDetailsData\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Order.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Order\\:\\:prepareOrderData\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Order.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Order\\:\\:prepareOrderData\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Order.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Order\\:\\:prepareOrderDetailsData\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Order.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Order\\:\\:prepareOrderDetailsData\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Order.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Order\\:\\:update\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Order.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Order\\:\\:updateByNumber\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Order.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\PaymentMethods\\:\\:create\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -15105,41 +13460,11 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Api/Resource/Shop.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Shop\\:\\:prepareShopData\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Shop.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Shop\\:\\:prepareShopData\\(\\) has parameter \\$params with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Shop.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Shop\\:\\:prepareShopData\\(\\) has parameter \\$shop with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Shop.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Shop\\:\\:update\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Components/Api/Resource/Shop.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Translation\\:\\:checkRequirements\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Translation.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Translation\\:\\:checkRequirements\\(\\) has parameter \\$checkData with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Translation.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Translation\\:\\:checkRequirements\\(\\) has parameter \\$data with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Translation.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Translation\\:\\:create\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -15160,31 +13485,16 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Api/Resource/Translation.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Translation\\:\\:getIdByData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Translation.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Translation\\:\\:getObjectTranslation\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Components/Api/Resource/Translation.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Translation\\:\\:getRepository\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Translation.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Translation\\:\\:saveTranslation\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Components/Api/Resource/Translation.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Translation\\:\\:setTranslationComponent\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Translation.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Translation\\:\\:update\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -15195,11 +13505,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Api/Resource/Translation.php
 
-		-
-			message: "#^Property Shopware\\\\Components\\\\Api\\\\Resource\\\\Translation\\:\\:\\$repository with generic class Doctrine\\\\ORM\\\\EntityRepository does not specify its types\\: TEntityClass$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Translation.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\User\\:\\:create\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -15260,16 +13565,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Api/Resource/Variant.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Variant\\:\\:considerTaxInput\\(\\) has parameter \\$variant with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Variant.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Variant\\:\\:considerTaxInput\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Variant.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Variant\\:\\:create\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -15290,46 +13585,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Api/Resource/Variant.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Variant\\:\\:getAvailableGroup\\(\\) has parameter \\$availableGroups with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Variant.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Variant\\:\\:getAvailableGroup\\(\\) has parameter \\$groupData with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Variant.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Variant\\:\\:getAvailableMediaImage\\(\\) has parameter \\$availableImages with generic interface Doctrine\\\\Common\\\\Collections\\\\Collection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Variant.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Variant\\:\\:getAvailableMediaImage\\(\\) has parameter \\$availableImages with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Variant.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Variant\\:\\:getAvailableMediaImage\\(\\) has parameter \\$availableImages with no value type specified in iterable type array\\|Doctrine\\\\Common\\\\Collections\\\\Collection\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Variant.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Variant\\:\\:getAvailableOption\\(\\) has parameter \\$availableOptions with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Variant.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Variant\\:\\:getAvailableOption\\(\\) has parameter \\$optionData with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Variant.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Variant\\:\\:getIdByData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Variant.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Variant\\:\\:getList\\(\\) has parameter \\$criteria with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -15390,16 +13645,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Api/Resource/Variant.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Variant\\:\\:mergePriceData\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Variant.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Variant\\:\\:mergePriceData\\(\\) has parameter \\$priceData with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Variant.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Api\\\\Resource\\\\Variant\\:\\:prepareAttributeAssociation\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -15495,26 +13740,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Api/Resource/Variant.php
 
-		-
-			message: "#^PHPDoc tag @var for variable \\$variant has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Variant.php
-
-		-
-			message: "#^Parameter \\#1 \\$articleImage of method Shopware\\\\Components\\\\Api\\\\Resource\\\\Variant\\:\\:createVariantImage\\(\\) expects Shopware\\\\Models\\\\Article\\\\Image, Shopware\\\\Models\\\\Article\\\\Image\\|true given\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Variant.php
-
-		-
-			message: "#^Parameter \\#1 \\$variant of method Shopware\\\\Components\\\\Api\\\\Resource\\\\Variant\\:\\:considerTaxInput\\(\\) expects array, array\\|Shopware\\\\Models\\\\Article\\\\Detail given\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Variant.php
-
-		-
-			message: "#^Parameter \\#2 \\$image of method Shopware\\\\Components\\\\Api\\\\Resource\\\\Variant\\:\\:createImageMappingForOptions\\(\\) expects Shopware\\\\Models\\\\Article\\\\Image, Shopware\\\\Models\\\\Article\\\\Image\\|true given\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Api/Resource/Variant.php
-
 		-
 			message: "#^Parameter \\#4 \\$tax of method Shopware\\\\Components\\\\Api\\\\Resource\\\\Variant\\:\\:preparePriceAssociation\\(\\) expects Shopware\\\\Models\\\\Tax\\\\Tax, Shopware\\\\Models\\\\Tax\\\\Tax\\|null given\\.$#"
 			count: 1
@@ -15570,31 +13795,11 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Auth.php
 
-		-
-			message: "#^Cannot access property \\$username on bool\\|stdClass\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Auth/Adapter/Default.php
-
 		-
 			message: "#^Method Shopware_Components_Auth_Adapter_Default\\:\\:_authenticateValidateResult\\(\\) has parameter \\$resultIdentity with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Components/Auth/Adapter/Default.php
 
-		-
-			message: "#^Method Shopware_Components_Auth_Adapter_Default\\:\\:rehash\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Auth/Adapter/Default.php
-
-		-
-			message: "#^Method Shopware_Components_Auth_Adapter_Default\\:\\:updateExpiry\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Auth/Adapter/Default.php
-
-		-
-			message: "#^Method Shopware_Components_Auth_Adapter_Default\\:\\:updateHash\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Auth/Adapter/Default.php
-
 		-
 			message: "#^Property Shopware_Components_Auth_Adapter_Default\\:\\:\\$conditions type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -15630,11 +13835,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Auth/Constraint/UserNameValidator.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Auth\\\\Validator\\\\UserValidator\\:\\:validate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Auth/Validator/UserValidator.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Auth\\\\Validator\\\\UserValidator\\:\\:validateField\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -15645,11 +13845,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Auth/Validator/UserValidator.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Auth\\\\Validator\\\\UserValidatorInterface\\:\\:validate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Auth/Validator/UserValidatorInterface.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Backend\\\\GlobalSearch\\:\\:getArticles\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -15690,6 +13885,11 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/BasketSignature/BasketPersister.php
 
+		-
+			message: "#^Query error\\: Column \"s_order_basket_signatures\\.basket\" expects value type string, got type non\\-empty\\-string\\|false$#"
+			count: 1
+			path: engine/Shopware/Components/BasketSignature/BasketPersister.php
+
 		-
 			message: "#^Method Shopware\\\\Components\\\\BasketSignature\\\\CleanupSignatureSubscriber\\:\\:cleanup\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -15720,16 +13920,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/CacheManager.php
 
-		-
-			message: "#^Cannot access offset 'memory_usage' on array\\|false\\.$#"
-			count: 2
-			path: engine/Shopware/Components/CacheManager.php
-
-		-
-			message: "#^Cannot access offset 'opcache_statistics' on array\\|false\\.$#"
-			count: 1
-			path: engine/Shopware/Components/CacheManager.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\CacheManager\\:\\:__construct\\(\\) has parameter \\$cacheConfig with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -15851,24 +14041,24 @@ parameters:
 			path: engine/Shopware/Components/CacheSubscriber.php
 
 		-
-			message: "#^Method Shopware\\\\Components\\\\Cart\\\\BasketHelper\\:\\:addProportionalDiscount\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Components\\\\Cart\\\\BasketHelper\\:\\:getPositionPrices\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Components/Cart/BasketHelper.php
 
 		-
-			message: "#^Method Shopware\\\\Components\\\\Cart\\\\BasketHelper\\:\\:getPositionPrices\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Components\\\\Cart\\\\BasketHelperInterface\\:\\:getPositionPrices\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Components/Cart/BasketHelper.php
+			path: engine/Shopware/Components/Cart/BasketHelperInterface.php
 
 		-
-			message: "#^Method Shopware\\\\Components\\\\Cart\\\\BasketHelperInterface\\:\\:addProportionalDiscount\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_order_basket\\.sessionID\" expects value type string\\|null, got type mixed$#"
 			count: 1
-			path: engine/Shopware/Components/Cart/BasketHelperInterface.php
+			path: engine/Shopware/Components/Cart/CartMigration.php
 
 		-
-			message: "#^Method Shopware\\\\Components\\\\Cart\\\\BasketHelperInterface\\:\\:getPositionPrices\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Column \"s_order_basket\\.userID\" expects value type int, got type mixed$#"
 			count: 1
-			path: engine/Shopware/Components/Cart/BasketHelperInterface.php
+			path: engine/Shopware/Components/Cart/CartMigration.php
 
 		-
 			message: "#^Method Shopware\\\\Components\\\\Cart\\\\CartOrderNumberProvider\\:\\:getAll\\(\\) return type has no value type specified in iterable type array\\.$#"
@@ -15886,12 +14076,12 @@ parameters:
 			path: engine/Shopware/Components/Cart/CartOrderNumberProviderInterface.php
 
 		-
-			message: "#^Property Shopware\\\\Components\\\\Cart\\\\CartPersistService\\:\\:\\$cart type has no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Argument \\#1 is not a constant array, got array\\<string, mixed\\>$#"
 			count: 1
 			path: engine/Shopware/Components/Cart/CartPersistService.php
 
 		-
-			message: "#^Property Shopware\\\\Components\\\\Cart\\\\CartPersistService\\:\\:\\$cartAttributes type has no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Argument \\#1 is not a constant array, got non\\-empty\\-array\\<string, mixed\\>&hasOffsetValue\\('basketID', int\\|string\\|false\\)$#"
 			count: 1
 			path: engine/Shopware/Components/Cart/CartPersistService.php
 
@@ -16075,11 +14265,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Cart/Struct/DiscountContext.php
 
-		-
-			message: "#^Property Shopware\\\\Components\\\\Cart\\\\Struct\\\\Price\\:\\:\\$tax \\(float\\) does not accept float\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Cart/Struct/Price.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Cart\\\\TaxAggregator\\:\\:positionsTaxSum\\(\\) has parameter \\$cart with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -16200,11 +14385,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Check/Requirements.php
 
-		-
-			message: "#^Cannot call method fetchColumn\\(\\) on PDOStatement\\|false\\.$#"
-			count: 2
-			path: engine/Shopware/Components/Check/Requirements.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Check\\\\Requirements\\:\\:handleMaxCompatibleVersion\\(\\) has parameter \\$check with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -16325,11 +14505,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Compatibility/LegacyStructConverter.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Compatibility\\\\LegacyStructConverter\\:\\:convertPriceStruct\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Compatibility/LegacyStructConverter.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Compatibility\\\\LegacyStructConverter\\:\\:convertProductPriceStruct\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -16400,16 +14575,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Compatibility/LegacyStructConverter.php
 
-		-
-			message: "#^Negated boolean expression is always false\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Compatibility/LegacyStructConverter.php
-
-		-
-			message: "#^Parameter \\#1 \\$date of method Shopware\\\\Components\\\\Compatibility\\\\LegacyStructConverter\\:\\:dateToString\\(\\) expects DateTimeInterface\\|string, DateTimeInterface\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Compatibility/LegacyStructConverter.php
-
 		-
 			message: "#^Parameter \\#1 \\$id of method Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Service\\\\CategoryServiceInterface\\:\\:get\\(\\) expects int, int\\|null given\\.$#"
 			count: 1
@@ -16445,31 +14610,11 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Config.php
 
-		-
-			message: "#^Method Shopware_Components_Config\\:\\:__get\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Config.php
-
-		-
-			message: "#^Method Shopware_Components_Config\\:\\:__set\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Config.php
-
 		-
 			message: "#^Method Shopware_Components_Config\\:\\:__set\\(\\) has parameter \\$value with no type specified\\.$#"
 			count: 1
 			path: engine/Shopware/Components/Config.php
 
-		-
-			message: "#^Method Shopware_Components_Config\\:\\:get\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Config.php
-
-		-
-			message: "#^Method Shopware_Components_Config\\:\\:get\\(\\) has parameter \\$default with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Config.php
-
 		-
 			message: "#^Method Shopware_Components_Config\\:\\:getByNamespace\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -16505,11 +14650,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/ConfigLoader.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\ConfigWriter\\:\\:get\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/ConfigWriter.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\ConfigWriter\\:\\:insert\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -16646,7 +14786,7 @@ parameters:
 			path: engine/Shopware/Components/CustomerStream/CookieSubscriber.php
 
 		-
-			message: "#^Strict comparison using \\=\\=\\= between Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\ShopContextInterface and null will always evaluate to false\\.$#"
+			message: "#^Query error\\: Column \"s_user\\.id\" expects value type int, got type mixed$#"
 			count: 1
 			path: engine/Shopware/Components/CustomerStream/CookieSubscriber.php
 
@@ -16655,26 +14795,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/CustomerStream/CustomerStreamCriteriaFactory.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\CustomerStream\\\\StreamIndexer\\:\\:clearStreamIndex\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/CustomerStream/StreamIndexer.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\CustomerStream\\\\StreamIndexer\\:\\:populate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/CustomerStream/StreamIndexer.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\CustomerStream\\\\StreamIndexerInterface\\:\\:clearStreamIndex\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/CustomerStream/StreamIndexerInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\CustomerStream\\\\StreamIndexerInterface\\:\\:populate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/CustomerStream/StreamIndexerInterface.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\DependencyInjection\\\\Bridge\\\\Cache\\:\\:createAutomaticBackend\\(\\) has parameter \\$backendOptions with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -16705,31 +14825,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/DependencyInjection/Bridge/Config.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\DependencyInjection\\\\Bridge\\\\Db\\:\\:buildConnectionString\\(\\) has parameter \\$dbConfig with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/DependencyInjection/Bridge/Db.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\DependencyInjection\\\\Bridge\\\\Db\\:\\:createDbalConnection\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/DependencyInjection/Bridge/Db.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\DependencyInjection\\\\Bridge\\\\Db\\:\\:createEnlightDbAdapter\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/DependencyInjection/Bridge/Db.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\DependencyInjection\\\\Bridge\\\\Db\\:\\:createPDO\\(\\) has parameter \\$dbConfig with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/DependencyInjection/Bridge/Db.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\DependencyInjection\\\\Bridge\\\\Front\\:\\:factory\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/DependencyInjection/Bridge/Front.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\DependencyInjection\\\\Bridge\\\\Mail\\:\\:factory\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -16746,8 +14841,8 @@ parameters:
 			path: engine/Shopware/Components/DependencyInjection/Bridge/MailTransport.php
 
 		-
-			message: "#^Method Shopware\\\\Components\\\\DependencyInjection\\\\Bridge\\\\MailTransport\\:\\:factory\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
-			count: 1
+			message: "#^Unable to resolve the template type TClass in call to method static method Enlight_Class\\:\\:Instance\\(\\)$#"
+			count: 2
 			path: engine/Shopware/Components/DependencyInjection/Bridge/MailTransport.php
 
 		-
@@ -16815,11 +14910,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/DependencyInjection/Bridge/Session.php
 
-		-
-			message: "#^Call to an undefined method Enlight_Template_Manager\\:\\:setDefaultResourceType\\(\\)\\.$#"
-			count: 1
-			path: engine/Shopware/Components/DependencyInjection/Bridge/Template.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\DependencyInjection\\\\Bridge\\\\Template\\:\\:factory\\(\\) has parameter \\$backendOptions with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -16885,11 +14975,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/DependencyInjection/Container.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\DependencyInjection\\\\ContainerAwareInterface\\:\\:setContainer\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/DependencyInjection/ContainerAwareInterface.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\DependencyInjection\\\\ProxyFactory\\:\\:getProxy\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -17065,16 +15150,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Document.php
 
-		-
-			message: "#^Parameter \\#1 \\$filename of function fopen expects string, string\\|false given\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Document.php
-
-		-
-			message: "#^Parameter \\#1 \\$filename of function unlink expects string, string\\|false given\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Document.php
-
 		-
 			message: "#^Parameter \\#1 \\$template of method Shopware\\\\Components\\\\Theme\\\\Inheritance\\:\\:getTemplateDirectories\\(\\) expects Shopware\\\\Models\\\\Shop\\\\Template, Shopware\\\\Models\\\\Shop\\\\Template\\|null given\\.$#"
 			count: 1
@@ -17110,101 +15185,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Emotion/ComponentInstaller.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Emotion\\\\DeviceConfiguration\\:\\:get\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Emotion/DeviceConfiguration.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Emotion\\\\DeviceConfiguration\\:\\:getById\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Emotion/DeviceConfiguration.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Emotion\\\\DeviceConfiguration\\:\\:getChildrenLandingPages\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Emotion/DeviceConfiguration.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Emotion\\\\DeviceConfiguration\\:\\:getEmotionsByVisibility\\(\\) has parameter \\$emotions with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Emotion/DeviceConfiguration.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Emotion\\\\DeviceConfiguration\\:\\:getEmotionsByVisibility\\(\\) has parameter \\$visibility with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Emotion/DeviceConfiguration.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Emotion\\\\DeviceConfiguration\\:\\:getEmotionsByVisibility\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Emotion/DeviceConfiguration.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Emotion\\\\DeviceConfiguration\\:\\:getLandingPage\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Emotion/DeviceConfiguration.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Emotion\\\\DeviceConfiguration\\:\\:getLandingPageShops\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Emotion/DeviceConfiguration.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Emotion\\\\DeviceConfiguration\\:\\:getLandingPageShops\\(\\) should return array but returns array\\|false\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Emotion/DeviceConfiguration.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Emotion\\\\DeviceConfiguration\\:\\:getListingEmotions\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Emotion/DeviceConfiguration.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Emotion\\\\DeviceConfiguration\\:\\:getMasterLandingPage\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Emotion/DeviceConfiguration.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Emotion\\\\DeviceConfiguration\\:\\:sortEmotionsByPositionAndId\\(\\) has parameter \\$emotions with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Emotion/DeviceConfiguration.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Emotion\\\\DeviceConfiguration\\:\\:sortEmotionsByPositionAndId\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Emotion/DeviceConfiguration.php
-
-		-
-			message: "#^Parameter \\#1 \\$emotions of method Shopware\\\\Components\\\\Emotion\\\\DeviceConfiguration\\:\\:sortEmotionsByPositionAndId\\(\\) expects array, array\\|false given\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Emotion/DeviceConfiguration.php
-
-		-
-			message: "#^Parameter \\#2 \\$array of function array_map expects array, array\\|false given\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Emotion/DeviceConfiguration.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Emotion\\\\DeviceConfigurationInterface\\:\\:get\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Emotion/DeviceConfigurationInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Emotion\\\\DeviceConfigurationInterface\\:\\:getById\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Emotion/DeviceConfigurationInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Emotion\\\\DeviceConfigurationInterface\\:\\:getLandingPage\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Emotion/DeviceConfigurationInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Emotion\\\\DeviceConfigurationInterface\\:\\:getLandingPageShops\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Emotion/DeviceConfigurationInterface.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Emotion\\\\EmotionComponentViewSubscriber\\:\\:registerBackendTemplates\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -17230,11 +15210,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Emotion/EmotionImporter.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Emotion\\\\EmotionImporter\\:\\:cleanupImport\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Emotion/EmotionImporter.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Emotion\\\\EmotionImporter\\:\\:extractEmotionArchive\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -17250,11 +15225,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Emotion/EmotionImporter.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Emotion\\\\EmotionImporterInterface\\:\\:cleanupImport\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Emotion/EmotionImporterInterface.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Emotion\\\\EmotionTranslationImporter\\:\\:getLocaleMapping\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -17675,11 +15645,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Emotion/Preset/PresetDataSynchronizer.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Emotion\\\\Preset\\\\PresetDataSynchronizer\\:\\:importElementAssets\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Emotion/Preset/PresetDataSynchronizer.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Emotion\\\\Preset\\\\PresetDataSynchronizer\\:\\:registerComponentHandlers\\(\\) has parameter \\$defaultComponentHandlers with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -17710,36 +15675,6 @@ parameters:
 			count: 3
 			path: engine/Shopware/Components/Emotion/Preset/PresetDataSynchronizer.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Emotion\\\\Preset\\\\PresetDataSynchronizerInterface\\:\\:importElementAssets\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Emotion/Preset/PresetDataSynchronizerInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Emotion\\\\Preset\\\\PresetInstaller\\:\\:installOrUpdate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Emotion/Preset/PresetInstaller.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Emotion\\\\Preset\\\\PresetInstaller\\:\\:uninstall\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Emotion/Preset/PresetInstaller.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Emotion\\\\Preset\\\\PresetInstallerInterface\\:\\:installOrUpdate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Emotion/Preset/PresetInstallerInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Emotion\\\\Preset\\\\PresetInstallerInterface\\:\\:uninstall\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Emotion/Preset/PresetInstallerInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Emotion\\\\Preset\\\\PresetInstallerInterface\\:\\:uninstall\\(\\) has parameter \\$presetNames with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Emotion/Preset/PresetInstallerInterface.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Emotion\\\\Preset\\\\PresetLoader\\:\\:getComponentData\\(\\) has parameter \\$collectedComponents with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -18165,16 +16100,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/HttpCache/AppCache.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\HttpCache\\\\AppCache\\:\\:__construct\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/HttpCache/AppCache.php
-
-		-
-			message: "#^Property Shopware\\\\Components\\\\HttpCache\\\\AppCache\\:\\:\\$options type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/HttpCache/AppCache.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\HttpCache\\\\BlackHoleStore\\:\\:cleanup\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -18716,29 +16641,19 @@ parameters:
 			path: engine/Shopware/Components/Log/Formatter/WildfireFormatter.php
 
 		-
-			message: "#^Method Shopware\\\\Components\\\\Log\\\\Handler\\\\DoctrineDBALHandler\\:\\:__construct\\(\\) has parameter \\$columnMap with no value type specified in iterable type array\\.$#"
+			message: "#^Argument \\#0 expects a constant string, got string$#"
 			count: 1
 			path: engine/Shopware/Components/Log/Handler/DoctrineDBALHandler.php
 
 		-
-			message: "#^Property Shopware\\\\Components\\\\Log\\\\Handler\\\\DoctrineDBALHandler\\:\\:\\$columnMap type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Components\\\\Log\\\\Handler\\\\DoctrineDBALHandler\\:\\:__construct\\(\\) has parameter \\$columnMap with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Components/Log/Handler/DoctrineDBALHandler.php
 
 		-
-			message: "#^Method Shopware\\\\Components\\\\Log\\\\Parser\\\\LogfileParser\\:\\:parseLogFile\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Log/Parser/LogfileParser.php
-
-		-
-			message: "#^Parameter \\#2 \\$offset of class LimitIterator constructor expects int, int\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Log/Parser/LogfileParser.php
-
-		-
-			message: "#^Parameter \\#3 \\$limit of class LimitIterator constructor expects int, int\\|null given\\.$#"
+			message: "#^Property Shopware\\\\Components\\\\Log\\\\Handler\\\\DoctrineDBALHandler\\:\\:\\$columnMap type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Components/Log/Parser/LogfileParser.php
+			path: engine/Shopware/Components/Log/Handler/DoctrineDBALHandler.php
 
 		-
 			message: "#^Access to an undefined property object\\:\\:\\$id\\.$#"
@@ -18775,11 +16690,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/LogawareReflectionHelper.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\LogawareReflectionHelper\\:\\:unserialize\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/LogawareReflectionHelper.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Logger\\:\\:table\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -18835,36 +16745,11 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/ManualSorting/ProductLoaderInterface.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Migrations\\\\AbstractMigration\\:\\:getSql\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Migrations/AbstractMigration.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Migrations\\\\AbstractMigration\\:\\:up\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Migrations/AbstractMigration.php
-
-		-
-			message: "#^Parameter \\#1 \\$path of function basename expects string, string\\|false given\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Migrations/AbstractMigration.php
-
-		-
-			message: "#^Property Shopware\\\\Components\\\\Migrations\\\\AbstractMigration\\:\\:\\$sql type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Migrations/AbstractMigration.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Migrations\\\\AbstractPluginMigration\\:\\:down\\(\\) has no return type specified\\.$#"
 			count: 1
 			path: engine/Shopware/Components/Migrations/AbstractPluginMigration.php
 
-		-
-			message: "#^Cannot call method fetchColumn\\(\\) on PDOStatement\\|false\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Migrations/Manager.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Migrations\\\\Manager\\:\\:apply\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -18940,16 +16825,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Model/Cache.php
 
-		-
-			message: "#^Cannot call method fetch\\(\\) on PDOStatement\\|false\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Model/CategoryDenormalization.php
-
-		-
-			message: "#^Cannot call method fetchColumn\\(\\) on PDOStatement\\|false\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Model/CategoryDenormalization.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Model\\\\CategoryDenormalization\\:\\:addAssignment\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -19110,11 +16985,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Model/DBAL/Result.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Model\\\\EventSubscriber\\:\\:getEntityName\\(\\) should return string but returns class\\-string\\<Shopware\\\\Components\\\\Model\\\\ModelEntity\\>\\|false\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Model/EventSubscriber.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Model\\\\Generator\\:\\:createTableMapping\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -19285,11 +17155,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Model/ModelManager.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Model\\\\ModelManager\\:\\:serializeEntity\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Model/ModelManager.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Model\\\\ModelManager\\:\\:toArray\\(\\) has parameter \\$entity with no value type specified in iterable type Traversable\\.$#"
 			count: 1
@@ -19375,16 +17240,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/MultiEdit/Resource/Product.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\:\\:batchProcess\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/Product.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\:\\:createQueue\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/Product.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\:\\:createQueue\\(\\) has parameter \\$filterArray with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -19395,16 +17250,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/MultiEdit/Resource/Product.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\:\\:deleteBackup\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/Product.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\:\\:filter\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/Product.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\:\\:filter\\(\\) has parameter \\$orderBy with no type specified\\.$#"
 			count: 1
@@ -19415,61 +17260,16 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/MultiEdit/Resource/Product.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\:\\:getBatchColumns\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/Product.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\:\\:getColumnConfig\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/Product.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\:\\:getGrammar\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/Product.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\:\\:getValuesFor\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/Product.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\:\\:getValuesFor\\(\\) has parameter \\$queryConfig with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Components/MultiEdit/Resource/Product.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\:\\:listBackups\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/Product.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\:\\:restoreBackup\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/Product.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\:\\:save\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/Product.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\:\\:save\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Components/MultiEdit/Resource/Product.php
 
-		-
-			message: "#^Unable to resolve the template type T in call to method Doctrine\\\\ORM\\\\EntityManager\\:\\:find\\(\\)$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/Product.php
-
-		-
-			message: "#^Unable to resolve the template type T in call to method Doctrine\\\\ORM\\\\EntityManager\\:\\:getRepository\\(\\)$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/Product.php
-
 		-
 			message: "#^Argument of an invalid type array\\<int, string\\>\\|false supplied for foreach, only iterables are supported\\.$#"
 			count: 2
@@ -19545,11 +17345,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/MultiEdit/Resource/Product/Backup.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\\\Backup\\:\\:getList\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/Product/Backup.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\\\Backup\\:\\:getPrefixFromTable\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -19560,11 +17355,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/MultiEdit/Resource/Product/Backup.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\\\Backup\\:\\:restore\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/Product/Backup.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\\\Backup\\:\\:saveBackup\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -19605,16 +17395,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/MultiEdit/Resource/Product/BatchProcess.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\\\BatchProcess\\:\\:batchProcess\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/Product/BatchProcess.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\\\BatchProcess\\:\\:getEditableColumns\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/Product/BatchProcess.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\\\BatchProcess\\:\\:getQueue\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -19630,26 +17410,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/MultiEdit/Resource/Product/BatchProcess.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\\\DqlHelper\\:\\:addInfo\\(\\) has parameter \\$articles with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/Product/DqlHelper.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\\\DqlHelper\\:\\:addInfo\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/Product/DqlHelper.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\\\DqlHelper\\:\\:buildColumnInfo\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/Product/DqlHelper.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\\\DqlHelper\\:\\:buildMapping\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/Product/DqlHelper.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\\\DqlHelper\\:\\:formatValue\\(\\) has parameter \\$field with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -19675,16 +17435,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/MultiEdit/Resource/Product/DqlHelper.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\\\DqlHelper\\:\\:getColumnsForProductListing\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/Product/DqlHelper.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\\\DqlHelper\\:\\:getDefaultColumns\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/Product/DqlHelper.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\\\DqlHelper\\:\\:getDqlFromTokens\\(\\) has parameter \\$tokens with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -19695,11 +17445,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/MultiEdit/Resource/Product/DqlHelper.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\\\DqlHelper\\:\\:getEntityForPrefix\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/Product/DqlHelper.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\\\DqlHelper\\:\\:getIdForForeignEntity\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -19730,16 +17475,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/MultiEdit/Resource/Product/DqlHelper.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\\\DqlHelper\\:\\:getProductForListing\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/Product/DqlHelper.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\\\DqlHelper\\:\\:getProductsForListing\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/Product/DqlHelper.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\\\DqlHelper\\:\\:groupOperations\\(\\) has parameter \\$operations with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -19765,11 +17500,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/MultiEdit/Resource/Product/DqlHelper.php
 
-		-
-			message: "#^Property Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\\\DqlHelper\\:\\:\\$columnInfo has no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/Product/DqlHelper.php
-
 		-
 			message: "#^Property Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\\\DqlHelper\\:\\:\\$columns has no type specified\\.$#"
 			count: 1
@@ -19785,11 +17515,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/MultiEdit/Resource/Product/DqlHelper.php
 
-		-
-			message: "#^Property Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\\\DqlHelper\\:\\:\\$prefixToEntity has no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/Product/DqlHelper.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\\\Filter\\:\\:filter\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -19800,11 +17525,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/MultiEdit/Resource/Product/Filter.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\\\Filter\\:\\:filter\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/Product/Filter.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\\\Filter\\:\\:filterArrayToString\\(\\) has parameter \\$filterArray with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -19840,26 +17560,11 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/MultiEdit/Resource/Product/Filter.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\\\Filter\\:\\:getPaginatedResult\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/Product/Filter.php
-
 		-
 			message: "#^Parameter \\#2 \\$orderBy of method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\\\Filter\\:\\:getFilterQueryBuilder\\(\\) expects array, array\\|null given\\.$#"
 			count: 1
 			path: engine/Shopware/Components/MultiEdit/Resource/Product/Filter.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\\\Grammar\\:\\:generateAttributesFromColumns\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/Product/Grammar.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\\\Grammar\\:\\:getGrammar\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/Product/Grammar.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\\\Queue\\:\\:create\\(\\) has parameter \\$filterArray with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -19870,11 +17575,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/MultiEdit/Resource/Product/Queue.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\\\Queue\\:\\:create\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/Product/Queue.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\\\Queue\\:\\:pop\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -19895,21 +17595,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/MultiEdit/Resource/Product/Value.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\Product\\\\Value\\:\\:getValuesFor\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/Product/Value.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\ResourceInterface\\:\\:batchProcess\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/ResourceInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\ResourceInterface\\:\\:createQueue\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/ResourceInterface.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\ResourceInterface\\:\\:createQueue\\(\\) has parameter \\$filterArray with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -19920,16 +17605,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/MultiEdit/Resource/ResourceInterface.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\ResourceInterface\\:\\:deleteBackup\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/ResourceInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\ResourceInterface\\:\\:filter\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/ResourceInterface.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\ResourceInterface\\:\\:filter\\(\\) has parameter \\$orderBy with no type specified\\.$#"
 			count: 1
@@ -19940,91 +17615,31 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/MultiEdit/Resource/ResourceInterface.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\ResourceInterface\\:\\:getBatchColumns\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/ResourceInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\ResourceInterface\\:\\:getColumnConfig\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/ResourceInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\ResourceInterface\\:\\:getGrammar\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/ResourceInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\ResourceInterface\\:\\:getValuesFor\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/ResourceInterface.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\ResourceInterface\\:\\:getValuesFor\\(\\) has parameter \\$queryConfig with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Components/MultiEdit/Resource/ResourceInterface.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\ResourceInterface\\:\\:listBackups\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/ResourceInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\ResourceInterface\\:\\:restoreBackup\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/ResourceInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\ResourceInterface\\:\\:save\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/MultiEdit/Resource/ResourceInterface.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\MultiEdit\\\\Resource\\\\ResourceInterface\\:\\:save\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Components/MultiEdit/Resource/ResourceInterface.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\OptinService\\:\\:add\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/OptinService.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\OptinService\\:\\:add\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Components/OptinService.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\OptinService\\:\\:delete\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/OptinService.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\OptinServiceInterface\\:\\:add\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/OptinServiceInterface.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\OptinServiceInterface\\:\\:add\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Components/OptinServiceInterface.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\OptinServiceInterface\\:\\:delete\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/OptinServiceInterface.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Password\\\\Encoder\\\\Argon2i\\:\\:__construct\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Components/Password/Encoder/Argon2i.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Password\\\\Encoder\\\\Argon2i\\:\\:encodePassword\\(\\) should return string but returns string\\|false\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Password/Encoder/Argon2i.php
-
 		-
 			message: "#^Property Shopware\\\\Components\\\\Password\\\\Encoder\\\\Argon2i\\:\\:\\$options type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -20035,11 +17650,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Password/Encoder/Argon2id.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Password\\\\Encoder\\\\Argon2id\\:\\:encodePassword\\(\\) should return string but returns string\\|false\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Password/Encoder/Argon2id.php
-
 		-
 			message: "#^Property Shopware\\\\Components\\\\Password\\\\Encoder\\\\Argon2id\\:\\:\\$options type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -20050,11 +17660,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Password/Encoder/Bcrypt.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Password\\\\Encoder\\\\Bcrypt\\:\\:encodePassword\\(\\) should return string but returns string\\|false\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Password/Encoder/Bcrypt.php
-
 		-
 			message: "#^Property Shopware\\\\Components\\\\Password\\\\Encoder\\\\Bcrypt\\:\\:\\$options type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -20080,16 +17685,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Password/Manager.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Password\\\\Manager\\:\\:addEncoder\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Password/Manager.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Password\\\\Manager\\:\\:getCompatibleEncoders\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Password/Manager.php
-
 		-
 			message: "#^Property Symfony\\\\Component\\\\HttpKernel\\\\Bundle\\\\Bundle\\:\\:\\$container \\(Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\) does not accept Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\|null\\.$#"
 			count: 1
@@ -20270,31 +17865,16 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Plugin/Configuration/Layers/AbstractShopConfigurationLayer.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Plugin\\\\Configuration\\\\Layers\\\\AbstractShopConfigurationLayer\\:\\:writeValues\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Plugin/Configuration/Layers/AbstractShopConfigurationLayer.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Plugin\\\\Configuration\\\\Layers\\\\ConfigurationLayerInterface\\:\\:readValues\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Components/Plugin/Configuration/Layers/ConfigurationLayerInterface.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Plugin\\\\Configuration\\\\Layers\\\\ConfigurationLayerInterface\\:\\:writeValues\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Plugin/Configuration/Layers/ConfigurationLayerInterface.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Plugin\\\\Configuration\\\\Layers\\\\DefaultLayer\\:\\:readValues\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Components/Plugin/Configuration/Layers/DefaultLayer.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Plugin\\\\Configuration\\\\Layers\\\\DefaultLayer\\:\\:writeValues\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Plugin/Configuration/Layers/DefaultLayer.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Plugin\\\\Configuration\\\\Layers\\\\DefaultShopLayer\\:\\:readValues\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -20321,62 +17901,12 @@ parameters:
 			path: engine/Shopware/Components/Plugin/Configuration/ReaderInterface.php
 
 		-
-			message: "#^Method Shopware\\\\Components\\\\Plugin\\\\Configuration\\\\Writer\\:\\:setByPluginName\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Plugin/Configuration/Writer.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Plugin\\\\Configuration\\\\Writer\\:\\:setByPluginName\\(\\) has parameter \\$elements with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Plugin/Configuration/Writer.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Plugin\\\\Configuration\\\\Writer\\:\\:setByPluginName\\(\\) has parameter \\$shopId with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Plugin/Configuration/Writer.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Plugin\\\\Configuration\\\\WriterInterface\\:\\:setByPluginName\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Plugin/Configuration/WriterInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Plugin\\\\Configuration\\\\WriterInterface\\:\\:setByPluginName\\(\\) has parameter \\$elements with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Plugin/Configuration/WriterInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Plugin\\\\Configuration\\\\WriterInterface\\:\\:setByPluginName\\(\\) has parameter \\$shopId with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Plugin/Configuration/WriterInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Plugin\\\\CronjobSynchronizer\\:\\:addCronjob\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Plugin/CronjobSynchronizer.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Plugin\\\\CronjobSynchronizer\\:\\:addCronjob\\(\\) has parameter \\$cronjob with no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Argument \\#1 is not a constant array, got array\\<string, mixed\\>&hasOffsetValue\\('pluginID', int\\)$#"
 			count: 1
 			path: engine/Shopware/Components/Plugin/CronjobSynchronizer.php
 
 		-
-			message: "#^Method Shopware\\\\Components\\\\Plugin\\\\CronjobSynchronizer\\:\\:removeNotExistingEntries\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Plugin/CronjobSynchronizer.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Plugin\\\\CronjobSynchronizer\\:\\:removeNotExistingEntries\\(\\) has parameter \\$cronjobActions with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Plugin/CronjobSynchronizer.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Plugin\\\\CronjobSynchronizer\\:\\:synchronize\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Plugin/CronjobSynchronizer.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Plugin\\\\CronjobSynchronizer\\:\\:synchronize\\(\\) has parameter \\$cronjobs with no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Argument \\#1 is not a constant array, got non\\-empty\\-array\\<string, mixed\\>&hasOffsetValue\\('end', DateTime\\)&hasOffsetValue\\('next', DateTime\\)&hasOffsetValue\\('pluginID', int\\)$#"
 			count: 1
 			path: engine/Shopware/Components/Plugin/CronjobSynchronizer.php
 
@@ -20430,41 +17960,21 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Plugin/FormSynchronizer.php
 
-		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Shop\\\\Locale\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Plugin/MenuSynchronizer.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Plugin\\\\MenuSynchronizer\\:\\:createMenuItem\\(\\) has parameter \\$menuItem with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Components/Plugin/MenuSynchronizer.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Plugin\\\\MenuSynchronizer\\:\\:removeNotExistingEntries\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Plugin/MenuSynchronizer.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Plugin\\\\MenuSynchronizer\\:\\:removeNotExistingEntries\\(\\) has parameter \\$menuNames with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Components/Plugin/MenuSynchronizer.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Plugin\\\\MenuSynchronizer\\:\\:saveMenuTranslation\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Plugin/MenuSynchronizer.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Plugin\\\\MenuSynchronizer\\:\\:saveMenuTranslation\\(\\) has parameter \\$labels with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Components/Plugin/MenuSynchronizer.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Plugin\\\\MenuSynchronizer\\:\\:synchronize\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Plugin/MenuSynchronizer.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Plugin\\\\MenuSynchronizer\\:\\:synchronize\\(\\) has parameter \\$menu with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -20535,6 +18045,71 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Plugin/Namespace.php
 
+		-
+			message: "#^Query error\\: Column \"s_core_plugins\\.added\" expects value type string, got type DateTimeInterface$#"
+			count: 1
+			path: engine/Shopware/Components/Plugin/Namespace.php
+
+		-
+			message: "#^Query error\\: Column \"s_core_plugins\\.capability_enable\" expects value type int, got type bool$#"
+			count: 2
+			path: engine/Shopware/Components/Plugin/Namespace.php
+
+		-
+			message: "#^Query error\\: Column \"s_core_plugins\\.capability_install\" expects value type int, got type bool$#"
+			count: 2
+			path: engine/Shopware/Components/Plugin/Namespace.php
+
+		-
+			message: "#^Query error\\: Column \"s_core_plugins\\.capability_secure_uninstall\" expects value type int, got type bool$#"
+			count: 2
+			path: engine/Shopware/Components/Plugin/Namespace.php
+
+		-
+			message: "#^Query error\\: Column \"s_core_plugins\\.capability_update\" expects value type int, got type bool$#"
+			count: 2
+			path: engine/Shopware/Components/Plugin/Namespace.php
+
+		-
+			message: "#^Query error\\: Column \"s_core_plugins\\.description\" expects value type string\\|null, got type mixed$#"
+			count: 2
+			path: engine/Shopware/Components/Plugin/Namespace.php
+
+		-
+			message: "#^Query error\\: Column \"s_core_plugins\\.license\" expects value type string\\|null, got type mixed$#"
+			count: 2
+			path: engine/Shopware/Components/Plugin/Namespace.php
+
+		-
+			message: "#^Query error\\: Column \"s_core_plugins\\.link\" expects value type string\\|null, got type mixed$#"
+			count: 2
+			path: engine/Shopware/Components/Plugin/Namespace.php
+
+		-
+			message: "#^Query error\\: Column \"s_core_plugins\\.refresh_date\" expects value type string\\|null, got type DateTimeInterface$#"
+			count: 2
+			path: engine/Shopware/Components/Plugin/Namespace.php
+
+		-
+			message: "#^Query error\\: Column \"s_core_plugins\\.support\" expects value type string\\|null, got type mixed$#"
+			count: 2
+			path: engine/Shopware/Components/Plugin/Namespace.php
+
+		-
+			message: "#^Query error\\: Column \"s_core_plugins\\.update_date\" expects value type string\\|null, got type mixed$#"
+			count: 2
+			path: engine/Shopware/Components/Plugin/Namespace.php
+
+		-
+			message: "#^Query error\\: Column \"s_core_plugins\\.update_source\" expects value type string\\|null, got type mixed$#"
+			count: 2
+			path: engine/Shopware/Components/Plugin/Namespace.php
+
+		-
+			message: "#^Query error\\: Column \"s_core_plugins\\.update_version\" expects value type string\\|null, got type mixed$#"
+			count: 2
+			path: engine/Shopware/Components/Plugin/Namespace.php
+
 		-
 			message: "#^Method Shopware\\\\Components\\\\Plugin\\\\PaymentInstaller\\:\\:createOrUpdate\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -20565,6 +18140,16 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Plugin/ResourceSubscriber.php
 
+		-
+			message: "#^Cannot assign offset non\\-falsy\\-string to array\\<string, array\\<int, string\\|null\\>\\>\\|string\\|null\\.$#"
+			count: 1
+			path: engine/Shopware/Components/Plugin/XmlPluginInfoReader.php
+
+		-
+			message: "#^Cannot assign offset string to array\\<string, array\\<string, array\\<int, string\\|null\\>\\>\\|string\\|null\\>\\|string\\|null\\.$#"
+			count: 1
+			path: engine/Shopware/Components/Plugin/XmlPluginInfoReader.php
+
 		-
 			message: "#^Method Shopware\\\\Components\\\\Plugin\\\\XmlPluginInfoReader\\:\\:parseInfo\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -20655,6 +18240,16 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Plugin/XmlReader/XmlPluginReader.php
 
+		-
+			message: "#^Cannot assign offset non\\-falsy\\-string to array\\<string, array\\<int, string\\|null\\>\\>\\|string\\.$#"
+			count: 1
+			path: engine/Shopware/Components/Plugin/XmlReader/XmlPluginReader.php
+
+		-
+			message: "#^Cannot assign offset string to array\\<string, array\\<string, array\\<int, string\\|null\\>\\>\\|string\\>\\|string\\.$#"
+			count: 1
+			path: engine/Shopware/Components/Plugin/XmlReader/XmlPluginReader.php
+
 		-
 			message: "#^Method Shopware\\\\Components\\\\Plugin\\\\XmlReader\\\\XmlPluginReader\\:\\:parseBlacklist\\(\\) has parameter \\$items with generic class DOMNodeList but does not specify its types\\: TNode$#"
 			count: 1
@@ -20680,11 +18275,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Plugin/XmlReader/XmlReaderBase.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Plugin\\\\XmlReader\\\\XmlReaderBase\\:\\:getChildren\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Plugin/XmlReader/XmlReaderBase.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Plugin\\\\XmlReader\\\\XmlReaderBase\\:\\:parseFile\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -20710,21 +18300,11 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Plugin/XmlReader/XmlReaderBase.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Plugin\\\\XmlReader\\\\XmlReaderBase\\:\\:parseTranslatableElement\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Plugin/XmlReader/XmlReaderBase.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Plugin\\\\XmlReader\\\\XmlReaderBase\\:\\:parseTranslatableNodeList\\(\\) has parameter \\$list with generic class DOMNodeList but does not specify its types\\: TNode$#"
 			count: 1
 			path: engine/Shopware/Components/Plugin/XmlReader/XmlReaderBase.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Plugin\\\\XmlReader\\\\XmlReaderBase\\:\\:parseTranslatableNodeList\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Plugin/XmlReader/XmlReaderBase.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Plugin\\\\XmlReader\\\\XmlReaderBase\\:\\:read\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -20760,31 +18340,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Privacy/PrivacyCleanupCronSubscriber.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Privacy\\\\PrivacyService\\:\\:cleanupCanceledOrders\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Privacy/PrivacyService.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Privacy\\\\PrivacyService\\:\\:cleanupGuestUsers\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Privacy/PrivacyService.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Privacy\\\\PrivacyServiceInterface\\:\\:cleanupCanceledOrders\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Privacy/PrivacyServiceInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Privacy\\\\PrivacyServiceInterface\\:\\:cleanupGuestUsers\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Privacy/PrivacyServiceInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\ProductStream\\\\FacetFilter\\:\\:add\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/ProductStream/FacetFilter.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\ProductStream\\\\FacetFilter\\:\\:removeStreamPropertyConditions\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -20800,26 +18355,11 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/ProductStream/FacetFilter.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\ProductStream\\\\FacetFilterInterface\\:\\:add\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/ProductStream/FacetFilterInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\ProductStream\\\\Repository\\:\\:assignConditions\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/ProductStream/Repository.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\ProductStream\\\\Repository\\:\\:assignConditions\\(\\) has parameter \\$productStream with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Components/ProductStream/Repository.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\ProductStream\\\\Repository\\:\\:assignSortings\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/ProductStream/Repository.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\ProductStream\\\\Repository\\:\\:assignSortings\\(\\) has parameter \\$productStream with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -20830,31 +18370,11 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/ProductStream/Repository.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\ProductStream\\\\Repository\\:\\:getStreamById\\(\\) should return array but returns array\\<string, mixed\\>\\|false\\.$#"
-			count: 1
-			path: engine/Shopware/Components/ProductStream/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\ProductStream\\\\Repository\\:\\:prepareConditionStream\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/ProductStream/Repository.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\ProductStream\\\\Repository\\:\\:prepareConditionStream\\(\\) has parameter \\$productStream with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Components/ProductStream/Repository.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\ProductStream\\\\Repository\\:\\:prepareCriteria\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/ProductStream/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\ProductStream\\\\Repository\\:\\:prepareSelectionStream\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/ProductStream/Repository.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\ProductStream\\\\Repository\\:\\:prepareSelectionStream\\(\\) has parameter \\$productStream with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -20865,11 +18385,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/ProductStream/Repository.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\ProductStream\\\\RepositoryInterface\\:\\:prepareCriteria\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/ProductStream/RepositoryInterface.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\ProductStream\\\\RepositoryInterface\\:\\:unserialize\\(\\) has parameter \\$serializedConditions with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -21030,11 +18545,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/ShopRegistrationService.php
 
-		-
-			message: "#^Argument of an invalid type array\\|false supplied for foreach, only iterables are supported\\.$#"
-			count: 1
-			path: engine/Shopware/Components/SitePageMenu.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\SitePageMenu\\:\\:assignSeoUrls\\(\\) has parameter \\$menu with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -21070,16 +18580,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/SitePageMenu.php
 
-		-
-			message: "#^Variable \\$activePages in empty\\(\\) always exists and is not falsy\\.$#"
-			count: 1
-			path: engine/Shopware/Components/SitePageMenu.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\SitemapXMLRepository\\:\\:filterLink\\(\\) has parameter \\$userParams with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/SitemapXMLRepository.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\SitemapXMLRepository\\:\\:getSitemapContent\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -21231,12 +18731,12 @@ parameters:
 			path: engine/Shopware/Components/Snippet/Writer/DatabaseWriter.php
 
 		-
-			message: "#^Method Shopware\\\\Components\\\\Snippet\\\\Writer\\\\QueryWriter\\:\\:generateInsertQueries\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Column \"s_core_snippets\\.id\" expects value type int, got type mixed$#"
 			count: 1
-			path: engine/Shopware/Components/Snippet/Writer/QueryWriter.php
+			path: engine/Shopware/Components/Snippet/Writer/DatabaseWriter.php
 
 		-
-			message: "#^Method Shopware\\\\Components\\\\Snippet\\\\Writer\\\\QueryWriter\\:\\:generateUpdateInsertQueries\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Components\\\\Snippet\\\\Writer\\\\QueryWriter\\:\\:generateInsertQueries\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Components/Snippet/Writer/QueryWriter.php
 
@@ -21605,46 +19105,11 @@ parameters:
 			count: 2
 			path: engine/Shopware/Components/Theme/Compiler.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Theme\\\\Compiler\\:\\:clearDirectory\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Theme/Compiler.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Theme\\\\Compiler\\:\\:clearDirectory\\(\\) has parameter \\$names with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Components/Theme/Compiler.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Theme\\\\Compiler\\:\\:clearThemeCache\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Theme/Compiler.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Theme\\\\Compiler\\:\\:compile\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Theme/Compiler.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Theme\\\\Compiler\\:\\:compileJavascript\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Theme/Compiler.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Theme\\\\Compiler\\:\\:compileLess\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Theme/Compiler.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Theme\\\\Compiler\\:\\:compileLessDefinition\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Theme/Compiler.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Theme\\\\Compiler\\:\\:createThemeTimestamp\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Theme/Compiler.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Theme\\\\Compiler\\:\\:getCompilerConfiguration\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -21655,11 +19120,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Theme/Compiler.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Theme\\\\Compiler\\:\\:recompile\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Theme/Compiler.php
-
 		-
 			message: "#^Parameter \\#1 \\$template of method Shopware\\\\Components\\\\Theme\\\\Compiler\\:\\:getConfig\\(\\) expects Shopware\\\\Models\\\\Shop\\\\Template, Shopware\\\\Models\\\\Shop\\\\Template\\|null given\\.$#"
 			count: 1
@@ -21710,11 +19170,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Theme/Compiler.php
 
-		-
-			message: "#^Strict comparison using \\=\\=\\= between int and null will always evaluate to false\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Theme/Compiler.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Theme\\\\ConfigSet\\:\\:__construct\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -22320,11 +19775,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Theme/Util.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Thumbnail\\\\Manager\\:\\:createMediaThumbnail\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Thumbnail/Manager.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Thumbnail\\\\Manager\\:\\:createMediaThumbnail\\(\\) has parameter \\$thumbnailSizes with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -22340,36 +19790,16 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Thumbnail/Manager.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Thumbnail\\\\Manager\\:\\:getMediaThumbnails\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Thumbnail/Manager.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Thumbnail\\\\Manager\\:\\:getThumbnailSizesFromMedia\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Components/Thumbnail/Manager.php
 
 		-
-			message: "#^Method Shopware\\\\Components\\\\Thumbnail\\\\Manager\\:\\:removeMediaThumbnails\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Components\\\\Thumbnail\\\\Manager\\:\\:uniformThumbnailSizes\\(\\) should return array\\<array\\{width\\: int, height\\: int\\}\\> but returns array\\<array\\<int\\|string\\>\\|int\\|string\\>\\.$#"
 			count: 1
 			path: engine/Shopware/Components/Thumbnail/Manager.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Thumbnail\\\\Manager\\:\\:stringSizeToArray\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Thumbnail/Manager.php
-
-		-
-			message: "#^Method Shopware\\\\Components\\\\Thumbnail\\\\Manager\\:\\:uniformThumbnailSizes\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Components/Thumbnail/Manager.php
-
-		-
-			message: "#^Parameter \\#3 \\$subject of function str_replace expects array\\|string, bool\\|string given\\.$#"
-			count: 2
-			path: engine/Shopware/Components/Thumbnail/Manager.php
-
 		-
 			message: "#^Method Shopware_Components_Translation\\:\\:addProductTranslation\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -22626,7 +20056,7 @@ parameters:
 			path: engine/Shopware/Controllers/Api/Translations.php
 
 		-
-			message: "#^Else branch is unreachable because previous condition is always true\\.$#"
+			message: "#^Strict comparison using \\!\\=\\= between int\\<1, max\\> and 0 will always evaluate to true\\.$#"
 			count: 1
 			path: engine/Shopware/Controllers/Backend/Analytics.php
 
@@ -22635,16 +20065,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Backend/Application.php
 
-		-
-			message: "#^Method Shopware_Controllers_Backend_Application\\:\\:resolveExtJsData\\(\\) should return array\\<string, mixed\\> but returns array\\<int\\|string, mixed\\>\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Application.php
-
-		-
-			message: "#^Unable to resolve the template type T in call to method Doctrine\\\\ORM\\\\EntityManager\\:\\:find\\(\\)$#"
-			count: 2
-			path: engine/Shopware/Controllers/Backend/Application.php
-
 		-
 			message: "#^Access to an undefined property Enlight_Controller_Request_RequestHttp\\:\\:\\$param\\.$#"
 			count: 1
@@ -22670,14 +20090,9 @@ parameters:
 			count: 2
 			path: engine/Shopware/Controllers/Backend/Article.php
 
-		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\|null\\.$#"
-			count: 2
-			path: engine/Shopware/Controllers/Backend/Article.php
-
 		-
 			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Article\\\\Detail\\|null\\.$#"
-			count: 4
+			count: 3
 			path: engine/Shopware/Controllers/Backend/Article.php
 
 		-
@@ -22685,21 +20100,11 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Backend/Article.php
 
-		-
-			message: "#^Cannot call method getOptions\\(\\) on Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Article.php
-
 		-
 			message: "#^Cannot call method setArticle\\(\\) on Shopware\\\\Models\\\\Article\\\\Detail\\|null\\.$#"
 			count: 1
 			path: engine/Shopware/Controllers/Backend/Article.php
 
-		-
-			message: "#^Cannot call method setKind\\(\\) on Shopware\\\\Models\\\\Article\\\\Detail\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Article.php
-
 		-
 			message: "#^Method Shopware_Controllers_Backend_Article\\:\\:acceptMainDataAction\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -23120,11 +20525,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Backend/Article.php
 
-		-
-			message: "#^Method Shopware_Controllers_Backend_Article\\:\\:loadAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Article.php
-
 		-
 			message: "#^Method Shopware_Controllers_Backend_Article\\:\\:loadStoresAction\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -23455,11 +20855,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Backend/Article.php
 
-		-
-			message: "#^Method Shopware_Controllers_Backend_Article\\:\\:saveMediaMappingAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Article.php
-
 		-
 			message: "#^Method Shopware_Controllers_Backend_Article\\:\\:saveSerialsAction\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -23480,11 +20875,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Backend/Article.php
 
-		-
-			message: "#^Method Shopware_Controllers_Backend_Article\\:\\:swapDetailTranslations\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Article.php
-
 		-
 			message: "#^Method Shopware_Controllers_Backend_Article\\:\\:uploadEsdFileAction\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -23505,11 +20895,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Backend/Article.php
 
-		-
-			message: "#^Parameter \\#2 \\$oldMainDetail of method Shopware_Controllers_Backend_Article\\:\\:swapDetailTranslations\\(\\) expects Shopware\\\\Models\\\\Article\\\\Detail, Shopware\\\\Models\\\\Article\\\\Detail\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Article.php
-
 		-
 			message: "#^Parameter \\#3 \\$tax of method Shopware_Controllers_Backend_Article\\:\\:preparePricesAssociatedData\\(\\) expects Shopware\\\\Models\\\\Tax\\\\Tax, Shopware\\\\Models\\\\Tax\\\\Tax\\|null given\\.$#"
 			count: 1
@@ -23525,26 +20910,11 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Backend/Article.php
 
-		-
-			message: "#^Method Shopware_Controllers_Backend_ArticleList\\:\\:addAdditionalText\\(\\) has parameter \\$result with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/ArticleList.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_ArticleList\\:\\:addAdditionalText\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/ArticleList.php
-
 		-
 			message: "#^Method Shopware_Controllers_Backend_ArticleList\\:\\:batchAction\\(\\) has no return type specified\\.$#"
 			count: 1
 			path: engine/Shopware/Controllers/Backend/ArticleList.php
 
-		-
-			message: "#^Method Shopware_Controllers_Backend_ArticleList\\:\\:buildListProducts\\(\\) has parameter \\$result with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/ArticleList.php
-
 		-
 			message: "#^Method Shopware_Controllers_Backend_ArticleList\\:\\:columnConfigAction\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -23630,16 +21000,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Backend/ArticleList.php
 
-		-
-			message: "#^Method Shopware_Controllers_Backend_ArticleList\\:\\:translateFilter\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/ArticleList.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_ArticleList\\:\\:translateFilter\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/ArticleList.php
-
 		-
 			message: "#^PHPDoc tag @var for variable \\$operations has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -23690,11 +21050,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Backend/ArticlePriceVariation.php
 
-		-
-			message: "#^Parameter \\#1 \\$configuratorSet of method Shopware\\\\Models\\\\Article\\\\Configurator\\\\PriceVariation\\:\\:setConfiguratorSet\\(\\) expects Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set, Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/ArticlePriceVariation.php
-
 		-
 			message: "#^Access to an undefined property Enlight_Controller_Request_RequestHttp\\:\\:\\$id\\.$#"
 			count: 1
@@ -23785,11 +21140,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Backend/Base.php
 
-		-
-			message: "#^Method Shopware_Controllers_Backend_Base\\:\\:getAvailableCaptchasAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Base.php
-
 		-
 			message: "#^Method Shopware_Controllers_Backend_Base\\:\\:getAvailableHashesAction\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -24090,11 +21440,6 @@ parameters:
 			count: 4
 			path: engine/Shopware/Controllers/Backend/Blog.php
 
-		-
-			message: "#^Method Shopware_Controllers_Backend_CSRFToken\\:\\:generateAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/CSRFToken.php
-
 		-
 			message: "#^Call to an undefined method Zend_Cache_Backend\\:\\:getCapabilities\\(\\)\\.$#"
 			count: 1
@@ -24145,61 +21490,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Backend/Cache.php
 
-		-
-			message: "#^Method Shopware_Controllers_Backend_CanceledOrder\\:\\:convertOrderAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/CanceledOrder.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_CanceledOrder\\:\\:deleteOrderAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/CanceledOrder.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_CanceledOrder\\:\\:getArticleAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/CanceledOrder.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_CanceledOrder\\:\\:getBasketAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/CanceledOrder.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_CanceledOrder\\:\\:getFreeVoucherCode\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/CanceledOrder.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_CanceledOrder\\:\\:getOrderAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/CanceledOrder.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_CanceledOrder\\:\\:getStatisticsAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/CanceledOrder.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_CanceledOrder\\:\\:getViewportsAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/CanceledOrder.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_CanceledOrder\\:\\:getVoucherAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/CanceledOrder.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_CanceledOrder\\:\\:sendCanceledQuestionMailAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/CanceledOrder.php
-
-		-
-			message: "#^Offset 0 does not exist on array\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/CanceledOrder.php
-
 		-
 			message: "#^Access to an undefined property Enlight_Controller_Request_RequestHttp\\:\\:\\$usedIds\\.$#"
 			count: 1
@@ -24395,136 +21685,11 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Backend/Config.php
 
-		-
-			message: "#^Method Shopware_Controllers_Backend_Config\\:\\:createDocumentElements\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Config.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Config\\:\\:createDocumentElements\\(\\) has parameter \\$model with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Config.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Config\\:\\:createSalutationSnippets\\(\\) has parameter \\$elementData with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Config.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Config\\:\\:deleteTableValuesAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Config.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Config\\:\\:deleteValuesAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Config.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Config\\:\\:getFormAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Config.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Config\\:\\:getListAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Config.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Config\\:\\:getNavigationAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Config.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Config\\:\\:getSnippetsForLocales\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Config.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Config\\:\\:getSnippetsForLocales\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Config.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Config\\:\\:getTableListAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Config.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Config\\:\\:getTranslation\\(\\) has parameter \\$tryLocales with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Config.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Config\\:\\:getTranslation\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Config.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Config\\:\\:getValuesAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Config.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Config\\:\\:prepareValue\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Config.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Config\\:\\:prepareValue\\(\\) has parameter \\$elementData with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Config.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Config\\:\\:prepareValue\\(\\) has parameter \\$value with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Config.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Config\\:\\:saveElement\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Config.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Config\\:\\:saveElement\\(\\) has parameter \\$elementData with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Config.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Config\\:\\:saveFormAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Config.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Config\\:\\:saveTableValuesAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Config.php
-
 		-
 			message: "#^Method Shopware_Controllers_Backend_Config\\:\\:saveTaxRules\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Controllers/Backend/Config.php
 
-		-
-			message: "#^Method Shopware_Controllers_Backend_Config\\:\\:saveValuesAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Config.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Config\\:\\:translateStore\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Config.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Config\\:\\:translateStore\\(\\) has parameter \\$fallbackLocales with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Config.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Config\\:\\:translateStore\\(\\) has parameter \\$store with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Config.php
-
 		-
 			message: "#^Method Shopware_Controllers_Backend_Config\\:\\:translateStoreUsingSnippets\\(\\) has parameter \\$store with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -24536,22 +21701,7 @@ parameters:
 			path: engine/Shopware/Controllers/Backend/Config.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_Config\\:\\:translateValues\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Config.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Config\\:\\:translateValues\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Config.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Config\\:\\:validateData\\(\\) has parameter \\$elementData with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Config.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Config\\:\\:validateData\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#"
+			message: "#^QueryBuilder\\: \\[Semantical Error\\] line 0, col 233 near 'element LEFT'\\: Error\\: Class Shopware\\\\Components\\\\Model\\\\ModelEntity has no association named elements$#"
 			count: 1
 			path: engine/Shopware/Controllers/Backend/Config.php
 
@@ -24690,16 +21840,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Backend/Customer.php
 
-		-
-			message: "#^Offset 'sessionId' does not exist on array\\<string, mixed\\>\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Customer.php
-
-		-
-			message: "#^Offset 'shopId' does not exist on array\\<string, mixed\\>\\|null\\.$#"
-			count: 3
-			path: engine/Shopware/Controllers/Backend/Customer.php
-
 		-
 			message: "#^Parameter \\#1 \\$url of method Enlight_Controller_Action\\:\\:redirect\\(\\) expects array\\|string, string\\|null given\\.$#"
 			count: 1
@@ -24725,11 +21865,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Backend/CustomerQuickView.php
 
-		-
-			message: "#^Method Shopware_Controllers_Backend_CustomerStream\\:\\:getList\\(\\) should return array\\{success\\: true, data\\: array\\<array\\<string, mixed\\>\\|Shopware\\\\Models\\\\CustomerStream\\\\CustomerStream\\>, total\\: int\\} but returns array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/CustomerStream.php
-
 		-
 			message: "#^Access to an undefined property Enlight_Controller_Request_RequestHttp\\:\\:\\$bid\\.$#"
 			count: 1
@@ -24870,16 +22005,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Backend/Emotion.php
 
-		-
-			message: "#^Method Shopware_Controllers_Backend_Emotion\\:\\:processDataFieldValue\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Emotion.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Emotion\\:\\:processDataFieldValue\\(\\) should return string but returns array\\|string\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Emotion.php
-
 		-
 			message: "#^Method Shopware_Controllers_Backend_Emotion\\:\\:saveEmotion\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -24895,16 +22020,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Backend/Emotion.php
 
-		-
-			message: "#^Parameter \\#1 \\$path of method Shopware\\\\Bundle\\\\MediaBundle\\\\MediaServiceInterface\\:\\:isEncoded\\(\\) expects string, array\\|string given\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Emotion.php
-
-		-
-			message: "#^Parameter \\#1 \\$path of method Shopware\\\\Bundle\\\\MediaBundle\\\\MediaServiceInterface\\:\\:normalize\\(\\) expects string, array\\|string given\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Emotion.php
-
 		-
 			message: "#^Method Shopware_Controllers_Backend_EmotionPreset\\:\\:enrichPlugins\\(\\) has parameter \\$presets with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -24955,51 +22070,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Backend/Export.php
 
-		-
-			message: "#^Access to an undefined property Enlight_Controller_Request_RequestHttp\\:\\:\\$targetField\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/ExtJs.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_ExtJs\\:\\:addAclPermission\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/ExtJs.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_ExtJs\\:\\:camelCaseToUnderScore\\(\\) should return string but returns string\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/ExtJs.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_ExtJs\\:\\:getAclRules\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/ExtJs.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_ExtJs\\:\\:indexAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/ExtJs.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_ExtJs\\:\\:loadAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/ExtJs.php
-
-		-
-			message: "#^Property Shopware_Controllers_Backend_ExtJs\\:\\:\\$aclPermissions type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/ExtJs.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Feedback\\:\\:disableInstallationSurveyAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Feedback.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Feedback\\:\\:loadAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Feedback.php
-
 		-
 			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Struct\\\\LocaleStruct\\|null\\.$#"
 			count: 1
@@ -25135,11 +22205,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Backend/Form.php
 
-		-
-			message: "#^Method Shopware_Controllers_Backend_Index\\:\\:authAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Index.php
-
 		-
 			message: "#^Method Shopware_Controllers_Backend_Index\\:\\:buildTree\\(\\) has parameter \\$nodes with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -25150,76 +22215,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Backend/Index.php
 
-		-
-			message: "#^Method Shopware_Controllers_Backend_Index\\:\\:changeLocaleAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Index.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Index\\:\\:indexAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Index.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Index\\:\\:init\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Index.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Index\\:\\:loadAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Index.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Index\\:\\:menuAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Index.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Log\\:\\:createLogAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Log.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Log\\:\\:deleteLogsAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Log.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Log\\:\\:downloadLogFileAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Log.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Log\\:\\:getDefaultLogFile\\(\\) has parameter \\$files with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Log.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Log\\:\\:getLogFile\\(\\) has parameter \\$files with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Log.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Log\\:\\:getLogFileListAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Log.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Log\\:\\:getLogFiles\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Log.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Log\\:\\:getLogListAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Log.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Log\\:\\:getLogsAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Log.php
-
 		-
 			message: "#^Method Shopware\\\\Controllers\\\\Backend\\\\Logger\\:\\:createLogAction\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -25315,34 +22310,9 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Backend/ManualSorting.php
 
-		-
-			message: "#^Access to an undefined property Enlight_Controller_Request_RequestHttp\\:\\:\\$albumFilter\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/MediaManager.php
-
-		-
-			message: "#^Access to an undefined property Enlight_Controller_Request_RequestHttp\\:\\:\\$filter\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/MediaManager.php
-
 		-
 			message: "#^Cannot call method getThumbnailSize\\(\\) on Shopware\\\\Models\\\\Media\\\\Settings\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/MediaManager.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_MediaManager\\:\\:createThumbnailsAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/MediaManager.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_MediaManager\\:\\:createThumbnailsForMovedMedia\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/MediaManager.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_MediaManager\\:\\:downloadAction\\(\\) has no return type specified\\.$#"
-			count: 1
+			count: 2
 			path: engine/Shopware/Controllers/Backend/MediaManager.php
 
 		-
@@ -25350,56 +22320,16 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Backend/MediaManager.php
 
-		-
-			message: "#^Method Shopware_Controllers_Backend_MediaManager\\:\\:filterAlbums\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/MediaManager.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_MediaManager\\:\\:getAlbumMediaAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/MediaManager.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_MediaManager\\:\\:getAlbumNodeProperties\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/MediaManager.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_MediaManager\\:\\:getAlbumsAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/MediaManager.php
-
 		-
 			message: "#^Method Shopware_Controllers_Backend_MediaManager\\:\\:getMediaAction\\(\\) has no return type specified\\.$#"
 			count: 1
 			path: engine/Shopware/Controllers/Backend/MediaManager.php
 
-		-
-			message: "#^Method Shopware_Controllers_Backend_MediaManager\\:\\:getMediaDetailAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/MediaManager.php
-
 		-
 			message: "#^Method Shopware_Controllers_Backend_MediaManager\\:\\:getMediaThumbnailPaths\\(\\) has parameter \\$media with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Controllers/Backend/MediaManager.php
 
-		-
-			message: "#^Method Shopware_Controllers_Backend_MediaManager\\:\\:getMediaThumbnailPaths\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/MediaManager.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_MediaManager\\:\\:getMediaUrlsAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/MediaManager.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_MediaManager\\:\\:parseExceptionForResponse\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/MediaManager.php
-
 		-
 			message: "#^Method Shopware_Controllers_Backend_MediaManager\\:\\:prefixProperties\\(\\) has parameter \\$properties with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -25410,26 +22340,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Backend/MediaManager.php
 
-		-
-			message: "#^Method Shopware_Controllers_Backend_MediaManager\\:\\:removeAlbum\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/MediaManager.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_MediaManager\\:\\:removeAlbum\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/MediaManager.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_MediaManager\\:\\:removeAlbumAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/MediaManager.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_MediaManager\\:\\:removeMediaAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/MediaManager.php
-
 		-
 			message: "#^Method Shopware_Controllers_Backend_MediaManager\\:\\:resolveAlbumData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -25440,81 +22350,16 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Backend/MediaManager.php
 
-		-
-			message: "#^Method Shopware_Controllers_Backend_MediaManager\\:\\:saveAlbumAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/MediaManager.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_MediaManager\\:\\:saveMedia\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/MediaManager.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_MediaManager\\:\\:saveMedia\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/MediaManager.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_MediaManager\\:\\:saveMediaAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/MediaManager.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_MediaManager\\:\\:singleReplaceAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/MediaManager.php
-
 		-
 			message: "#^Method Shopware_Controllers_Backend_MediaManager\\:\\:toTree\\(\\) has parameter \\$data with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
 			path: engine/Shopware/Controllers/Backend/MediaManager.php
 
-		-
-			message: "#^Method Shopware_Controllers_Backend_MediaManager\\:\\:toTree\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/MediaManager.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_MediaManager\\:\\:toTree\\(\\) has parameter \\$data with no value type specified in iterable type array\\|Doctrine\\\\Common\\\\Collections\\\\ArrayCollection\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/MediaManager.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_MediaManager\\:\\:toTree\\(\\) has parameter \\$parent with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/MediaManager.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_MediaManager\\:\\:toTree\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/MediaManager.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_MediaManager\\:\\:uploadAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/MediaManager.php
-
-		-
-			message: "#^Offset 'mediaCount' does not exist on array\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/MediaManager.php
-
-		-
-			message: "#^PHPDoc tag @var for variable \\$media has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/MediaManager.php
-
 		-
 			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
 			count: 1
 			path: engine/Shopware/Controllers/Backend/MediaManager.php
 
-		-
-			message: "#^Parameter \\#2 \\$fileName of method Shopware\\\\Models\\\\Media\\\\Media\\:\\:removeAlbumThumbnails\\(\\) expects string, bool\\|string given\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/MediaManager.php
-
 		-
 			message: "#^Parameter \\#3 \\$subject of function preg_replace expects array\\|string, string\\|false given\\.$#"
 			count: 1
@@ -25625,31 +22470,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Backend/Newsletter.php
 
-		-
-			message: "#^Offset 'id' does not exist on array\\|null\\.$#"
-			count: 8
-			path: engine/Shopware/Controllers/Backend/Newsletter.php
-
-		-
-			message: "#^Offset 'sendermail' does not exist on array\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Newsletter.php
-
-		-
-			message: "#^Offset 'sendername' does not exist on array\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Newsletter.php
-
-		-
-			message: "#^Offset 'subject' does not exist on array\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Newsletter.php
-
-		-
-			message: "#^Offset 'template' does not exist on array\\|null\\.$#"
-			count: 4
-			path: engine/Shopware/Controllers/Backend/Newsletter.php
-
 		-
 			message: "#^PHPDoc tag @var for variable \\$voucher has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -25660,11 +22480,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Backend/Newsletter.php
 
-		-
-			message: "#^Parameter \\#1 \\$mailing of method Shopware_Controllers_Backend_Newsletter\\:\\:initTemplate\\(\\) expects array, array\\|null given\\.$#"
-			count: 2
-			path: engine/Shopware/Controllers/Backend/Newsletter.php
-
 		-
 			message: "#^Parameter \\#1 \\$template of method Shopware\\\\Components\\\\Theme\\\\Inheritance\\:\\:buildConfig\\(\\) expects Shopware\\\\Models\\\\Shop\\\\Template, Shopware\\\\Models\\\\Shop\\\\Template\\|null given\\.$#"
 			count: 1
@@ -25805,36 +22620,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Backend/NewsletterManager.php
 
-		-
-			message: "#^Access to an undefined property Enlight_Controller_Request_RequestHttp\\:\\:\\$limit\\.$#"
-			count: 2
-			path: engine/Shopware/Controllers/Backend/Notification.php
-
-		-
-			message: "#^Access to an undefined property Enlight_Controller_Request_RequestHttp\\:\\:\\$orderNumber\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Notification.php
-
-		-
-			message: "#^Access to an undefined property Enlight_Controller_Request_RequestHttp\\:\\:\\$start\\.$#"
-			count: 2
-			path: engine/Shopware/Controllers/Backend/Notification.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Notification\\:\\:getArticleListAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Notification.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Notification\\:\\:getCustomerListAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Notification.php
-
-		-
-			message: "#^PHPDoc tag @var for variable \\$filter has no value type specified in iterable type array\\.$#"
-			count: 2
-			path: engine/Shopware/Controllers/Backend/Notification.php
-
 		-
 			message: "#^Method Shopware_Controllers_Backend_Overview\\:\\:getOrderSummaryAction\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -26121,12 +22906,7 @@ parameters:
 			path: engine/Shopware/Controllers/Backend/PluginInstaller.php
 
 		-
-			message: "#^Parameter \\#1 \\$path of function realpath expects string, string\\|false given\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/PluginInstaller.php
-
-		-
-			message: "#^Parameter \\#2 \\$name of method Symfony\\\\Component\\\\HttpFoundation\\\\File\\\\UploadedFile\\:\\:move\\(\\) expects string\\|null, string\\|false given\\.$#"
+			message: "#^Query error\\: Column \"s_core_licenses\\.module\" expects value type string, got type mixed$#"
 			count: 1
 			path: engine/Shopware/Controllers/Backend/PluginInstaller.php
 
@@ -26335,11 +23115,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Backend/Property.php
 
-		-
-			message: "#^Negated boolean expression is always false\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Property.php
-
 		-
 			message: "#^Method Shopware_Controllers_Backend_RiskManagement\\:\\:createRuleAction\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -26385,11 +23160,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Backend/Search.php
 
-		-
-			message: "#^Method Shopware_Controllers_Backend_Search\\:\\:indexAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Search.php
-
 		-
 			message: "#^Method Shopware_Controllers_Backend_Search\\:\\:resolveCategoryPath\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -26575,106 +23345,16 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Backend/Snippet.php
 
-		-
-			message: "#^Parameter \\#2 \\$encoding of method Shopware_Controllers_Backend_Snippet\\:\\:getFormatSnippetForExport\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Snippet.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Supplier\\:\\:createSupplierAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Supplier.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Supplier\\:\\:deleteSupplierAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Supplier.php
-
 		-
 			message: "#^Method Shopware_Controllers_Backend_Supplier\\:\\:getAllSupplier\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Controllers/Backend/Supplier.php
 
-		-
-			message: "#^Method Shopware_Controllers_Backend_Supplier\\:\\:getSingleSupplier\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Supplier.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Supplier\\:\\:getSuppliersAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Supplier.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Supplier\\:\\:saveSuppliers\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Supplier.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Supplier\\:\\:updateSupplierAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Supplier.php
-
-		-
-			message: "#^Cannot call method getOffset\\(\\) on DateTimeZone\\|false\\.$#"
-			count: 2
-			path: engine/Shopware/Controllers/Backend/Systeminfo.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Systeminfo\\:\\:getConfigListAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Systeminfo.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Systeminfo\\:\\:getFileListAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Systeminfo.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Systeminfo\\:\\:getOptimizersAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Systeminfo.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Systeminfo\\:\\:getPathListAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Systeminfo.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Systeminfo\\:\\:getTimezoneAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Systeminfo.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Systeminfo\\:\\:getVersionListAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Systeminfo.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Systeminfo\\:\\:infoAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Systeminfo.php
-
-		-
-			message: "#^Parameter \\#1 \\$timezone of function timezone_open expects string, string\\|false given\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Systeminfo.php
-
-		-
-			message: "#^Parameter \\#2 \\$timezone of class DateTime constructor expects DateTimeZone\\|null, DateTimeZone\\|false given\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Systeminfo.php
-
 		-
 			message: "#^Cannot access offset 'id' on array\\<string, mixed\\>\\|Shopware\\\\Models\\\\Shop\\\\Template\\.$#"
 			count: 1
 			path: engine/Shopware/Controllers/Backend/Theme.php
 
-		-
-			message: "#^Cannot access offset 'path' on non\\-empty\\-array\\<string, mixed\\>\\|Shopware\\\\Models\\\\Shop\\\\Template\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Theme.php
-
 		-
 			message: "#^Cannot access offset 'screen' on array\\<string, mixed\\>\\|Shopware\\\\Models\\\\Shop\\\\Template\\.$#"
 			count: 1
@@ -26695,26 +23375,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Backend/Translation.php
 
-		-
-			message: "#^Method Shopware_Controllers_Backend_UpdateWizard\\:\\:handleException\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/UpdateWizard.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_UpdateWizard\\:\\:indexAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/UpdateWizard.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_UpdateWizard\\:\\:updateAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/UpdateWizard.php
-
-		-
-			message: "#^Parameter \\#4 \\$token of class Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Context\\\\UpdateLicencesRequest constructor expects Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Struct\\\\AccessTokenStruct, Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Struct\\\\AccessTokenStruct\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/UpdateWizard.php
-
 		-
 			message: "#^Method Shopware_Controllers_Backend_UserConfig\\:\\:getAction\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -26835,261 +23495,11 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Backend/Vote.php
 
-		-
-			message: "#^Access to an undefined property Enlight_Controller_Request_RequestHttp\\:\\:\\$codePattern\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Voucher.php
-
-		-
-			message: "#^Access to an undefined property Enlight_Controller_Request_RequestHttp\\:\\:\\$deletePreviousVoucherCodes\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Voucher.php
-
-		-
-			message: "#^Access to an undefined property Enlight_Controller_Request_RequestHttp\\:\\:\\$filter\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Voucher.php
-
-		-
-			message: "#^Access to an undefined property Enlight_Controller_Request_RequestHttp\\:\\:\\$id\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Voucher.php
-
-		-
-			message: "#^Access to an undefined property Enlight_Controller_Request_RequestHttp\\:\\:\\$limit\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Voucher.php
-
-		-
-			message: "#^Access to an undefined property Enlight_Controller_Request_RequestHttp\\:\\:\\$numberOfUnits\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Voucher.php
-
-		-
-			message: "#^Access to an undefined property Enlight_Controller_Request_RequestHttp\\:\\:\\$param\\.$#"
-			count: 2
-			path: engine/Shopware/Controllers/Backend/Voucher.php
-
-		-
-			message: "#^Access to an undefined property Enlight_Controller_Request_RequestHttp\\:\\:\\$sort\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Voucher.php
-
-		-
-			message: "#^Access to an undefined property Enlight_Controller_Request_RequestHttp\\:\\:\\$start\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Voucher.php
-
-		-
-			message: "#^Access to an undefined property Enlight_Controller_Request_RequestHttp\\:\\:\\$value\\.$#"
-			count: 2
-			path: engine/Shopware/Controllers/Backend/Voucher.php
-
-		-
-			message: "#^Access to an undefined property Enlight_Controller_Request_RequestHttp\\:\\:\\$voucherID\\.$#"
-			count: 2
-			path: engine/Shopware/Controllers/Backend/Voucher.php
-
-		-
-			message: "#^Access to an undefined property Enlight_Controller_Request_RequestHttp\\:\\:\\$voucherId\\.$#"
-			count: 2
-			path: engine/Shopware/Controllers/Backend/Voucher.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Voucher\\:\\:createVoucherCodesAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Voucher.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Voucher\\:\\:deleteAllVoucherCodesById\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Voucher.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Voucher\\:\\:deleteVoucherAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Voucher.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Voucher\\:\\:exportVoucherCodeAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Voucher.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Voucher\\:\\:generateVoucherCodes\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Voucher.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Voucher\\:\\:getTaxConfigurationAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Voucher.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Voucher\\:\\:getVoucherAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Voucher.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Voucher\\:\\:getVoucherCodesAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Voucher.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Voucher\\:\\:getVoucherDetailAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Voucher.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Voucher\\:\\:replaceAllMatchingPatterns\\(\\) has parameter \\$range with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Voucher.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Voucher\\:\\:saveVoucherAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Voucher.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Voucher\\:\\:updateVoucherCodesAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Voucher.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Voucher\\:\\:validateOrderCodeAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Voucher.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Voucher\\:\\:validateVoucherCodeAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Voucher.php
-
-		-
-			message: "#^Parameter \\#1 \\$codePattern of method Shopware_Controllers_Backend_Voucher\\:\\:validateCodePattern\\(\\) expects string, array\\|string given\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Voucher.php
-
-		-
-			message: "#^Parameter \\#3 \\$codePattern of method Shopware_Controllers_Backend_Voucher\\:\\:generateVoucherCodes\\(\\) expects string, array\\|string given\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Voucher.php
-
-		-
-			message: "#^Access to an undefined property Enlight_Components_Mail\\:\\:\\$Body\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Widgets.php
-
-		-
-			message: "#^Access to an undefined property Enlight_Components_Mail\\:\\:\\$From\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Widgets.php
-
-		-
-			message: "#^Access to an undefined property Enlight_Components_Mail\\:\\:\\$FromName\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Widgets.php
-
-		-
-			message: "#^Access to an undefined property Enlight_Components_Mail\\:\\:\\$Subject\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Widgets.php
-
-		-
-			message: "#^Cannot call method setColumn\\(\\) on Shopware\\\\Models\\\\Widget\\\\View\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Widgets.php
-
-		-
-			message: "#^Cannot call method setPosition\\(\\) on Shopware\\\\Models\\\\Widget\\\\View\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Widgets.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Widgets\\:\\:addWidgetViewAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Widgets.php
-
 		-
 			message: "#^Method Shopware_Controllers_Backend_Widgets\\:\\:fetchRssFeedData\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Controllers/Backend/Widgets.php
 
-		-
-			message: "#^Method Shopware_Controllers_Backend_Widgets\\:\\:getLastMerchantAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Widgets.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Widgets\\:\\:getLastOrdersAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Widgets.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Widgets\\:\\:getListAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Widgets.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Widgets\\:\\:getNoticeAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Widgets.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Widgets\\:\\:getShopwareNewsAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Widgets.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Widgets\\:\\:getTurnOverVisitorsAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Widgets.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Widgets\\:\\:getVisitorsAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Widgets.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Widgets\\:\\:removeWidgetViewAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Widgets.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Widgets\\:\\:requestMerchantFormAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Widgets.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Widgets\\:\\:saveNoticeAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Widgets.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Widgets\\:\\:savePositionAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Widgets.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Widgets\\:\\:savePositionsAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Widgets.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Widgets\\:\\:sendMailToMerchantAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Widgets.php
-
-		-
-			message: "#^Method Shopware_Controllers_Backend_Widgets\\:\\:setWidgetPosition\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Widgets.php
-
-		-
-			message: "#^Negated boolean expression is always false\\.$#"
-			count: 2
-			path: engine/Shopware/Controllers/Backend/Widgets.php
-
 		-
 			message: "#^PHPDoc tag @var for variable \\$fetchAmount has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -27110,11 +23520,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Backend/Widgets.php
 
-		-
-			message: "#^Parameter \\#1 \\$entity of method Doctrine\\\\ORM\\\\EntityManager\\:\\:persist\\(\\) expects object, Shopware\\\\Models\\\\Widget\\\\View\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/Widgets.php
-
 		-
 			message: "#^Call to an undefined method Symfony\\\\Component\\\\Form\\\\FormError\\|Symfony\\\\Component\\\\Form\\\\FormErrorIterator\\:\\:getMessage\\(\\)\\.$#"
 			count: 3
@@ -27175,11 +23580,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Frontend/Address.php
 
-		-
-			message: "#^Method Shopware_Controllers_Frontend_Address\\:\\:getFormViewData\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Frontend/Address.php
-
 		-
 			message: "#^Method Shopware_Controllers_Frontend_Address\\:\\:getForwardParameters\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -27260,41 +23660,11 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Frontend/Blog.php
 
-		-
-			message: "#^Cannot access offset 'additional' on array\\|false\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Frontend/Blog.php
-
-		-
-			message: "#^Cannot access offset 'billingaddress' on array\\|false\\.$#"
-			count: 2
-			path: engine/Shopware/Controllers/Frontend/Blog.php
-
-		-
-			message: "#^Cannot access offset 'invalidHash' on array\\|bool\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Frontend/Blog.php
-
-		-
-			message: "#^Method Shopware_Controllers_Frontend_Blog\\:\\:addLinksToFilter\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Frontend/Blog.php
-
-		-
-			message: "#^Method Shopware_Controllers_Frontend_Blog\\:\\:addLinksToFilter\\(\\) has parameter \\$filterData with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Frontend/Blog.php
-
 		-
 			message: "#^Method Shopware_Controllers_Frontend_Blog\\:\\:createFilter\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
 			path: engine/Shopware/Controllers/Frontend/Blog.php
 
-		-
-			message: "#^Method Shopware_Controllers_Frontend_Blog\\:\\:detailAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Frontend/Blog.php
-
 		-
 			message: "#^Method Shopware_Controllers_Frontend_Blog\\:\\:getAuthorFilterData\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -27340,26 +23710,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Frontend/Blog.php
 
-		-
-			message: "#^Method Shopware_Controllers_Frontend_Blog\\:\\:indexAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Frontend/Blog.php
-
-		-
-			message: "#^Method Shopware_Controllers_Frontend_Blog\\:\\:init\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Frontend/Blog.php
-
-		-
-			message: "#^Method Shopware_Controllers_Frontend_Blog\\:\\:ratingAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Frontend/Blog.php
-
-		-
-			message: "#^Method Shopware_Controllers_Frontend_Blog\\:\\:sSaveComment\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Frontend/Blog.php
-
 		-
 			message: "#^Method Shopware_Controllers_Frontend_Blog\\:\\:sSaveComment\\(\\) has parameter \\$commentData with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -27375,11 +23725,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Frontend/Blog.php
 
-		-
-			message: "#^PHPDoc tag @var for variable \\$sErrorFlag has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Frontend/Blog.php
-
 		-
 			message: "#^Method Shopware_Controllers_Frontend_Campaign\\:\\:indexAction\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -27391,22109 +23736,15274 @@ parameters:
 			path: engine/Shopware/Controllers/Frontend/Campaign.php
 
 		-
-			message: "#^Access to an undefined property sSystem\\:\\:\\$_GET\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:getBasket\\(\\) should return array\\{content\\?\\: array\\<string, mixed\\>, Amount\\?\\: string, AmountNet\\?\\: string, Quantity\\?\\: int, AmountNumeric\\: float, AmountNetNumeric\\: float, AmountWithTax\\?\\: string, AmountWithTaxNumeric\\?\\: float, \\.\\.\\.\\} but returns array\\{content\\?\\: mixed, Amount\\?\\: string, AmountNet\\?\\: string, Quantity\\?\\: int, AmountWithTax\\?\\: string, sCurrencyId\\: mixed, sCurrencyName\\: mixed, sCurrencyFactor\\: mixed, \\.\\.\\.\\}\\.$#"
 			count: 1
 			path: engine/Shopware/Controllers/Frontend/Checkout.php
 
 		-
-			message: "#^Access to an undefined property sSystem\\:\\:\\$_POST\\.$#"
+			message: "#^Parameter \\#1 \\$basket of method Shopware_Controllers_Frontend_Checkout\\:\\:getTaxRates\\(\\) expects array\\{content\\?\\: array\\<string, mixed\\>, Amount\\?\\: string, AmountNet\\?\\: string, Quantity\\?\\: int, AmountNumeric\\: float, AmountNetNumeric\\: float, AmountWithTax\\?\\: string, AmountWithTaxNumeric\\?\\: float, \\.\\.\\.\\}, array\\{content\\?\\: array\\<array\\<string, mixed\\>\\>, Amount\\?\\: string, AmountNet\\?\\: string, Quantity\\?\\: int, AmountWithTax\\?\\: string, AmountWithTaxNumeric\\?\\: float, sCurrencyId\\: mixed, sCurrencyName\\: mixed, \\.\\.\\.\\} given\\.$#"
 			count: 1
 			path: engine/Shopware/Controllers/Frontend/Checkout.php
 
 		-
-			message: "#^Cannot access offset 'additional' on array\\|false\\.$#"
-			count: 2
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
-
-		-
-			message: "#^Cannot access offset 'sErrorMessages' on array\\|bool\\.$#"
+			message: "#^Parameter \\#1 \\$basket of method Shopware_Controllers_Frontend_Checkout\\:\\:getTaxRates\\(\\) expects array\\{content\\?\\: array\\<string, mixed\\>, Amount\\?\\: string, AmountNet\\?\\: string, Quantity\\?\\: int, AmountNumeric\\: float, AmountNetNumeric\\: float, AmountWithTax\\?\\: string, AmountWithTaxNumeric\\?\\: float, \\.\\.\\.\\}, array\\{content\\?\\: array\\<array\\<string, mixed\\>\\>, Amount\\?\\: string, AmountNet\\?\\: string, Quantity\\?\\: int, AmountWithTax\\?\\: string, sCurrencyId\\: mixed, sCurrencyName\\: mixed, sCurrencyFactor\\: mixed, \\.\\.\\.\\} given\\.$#"
 			count: 1
 			path: engine/Shopware/Controllers/Frontend/Checkout.php
 
 		-
-			message: "#^Cannot call method setPost\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
+			message: "#^Parameter \\#1 \\$cart of method Shopware\\\\Components\\\\Cart\\\\TaxAggregatorInterface\\:\\:taxSum\\(\\) expects array\\{content\\?\\: array\\<string, mixed\\>, sShippingcostsTax\\?\\: float, sShippingcostsTaxProportional\\?\\: array\\<Shopware\\\\Components\\\\Cart\\\\Struct\\\\Price\\>, sShippingcostsNet\\: float, sShippingcostsWithTax\\: float\\}, array\\{content\\?\\: array\\<string, mixed\\>, Amount\\?\\: string, AmountNet\\?\\: string, Quantity\\?\\: int, AmountNumeric\\: float, AmountNetNumeric\\: float, AmountWithTax\\?\\: string, AmountWithTaxNumeric\\?\\: float, \\.\\.\\.\\} given\\.$#"
 			count: 1
 			path: engine/Shopware/Controllers/Frontend/Checkout.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:addAccessories\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Compare\\:\\:addArticleAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Compare.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:addAccessories\\(\\) has parameter \\$accessories with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Compare\\:\\:deleteAllAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Compare.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:addAccessories\\(\\) has parameter \\$quantities with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Compare\\:\\:deleteArticleAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Compare.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:addAccessoriesAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Compare\\:\\:getListAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Compare.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:addArticleAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Compare\\:\\:indexAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Compare.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:addPremiumAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Compare\\:\\:overlayAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Compare.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:addVoucherAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Forms\\:\\:_createInputElement\\(\\) has parameter \\$element with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Forms.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:ajaxAddArticleAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Forms\\:\\:_createLabelElement\\(\\) has parameter \\$element with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Forms.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:ajaxAddArticleCartAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Forms\\:\\:_validateInput\\(\\) has parameter \\$elements with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Forms.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:ajaxAmountAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Forms\\:\\:_validateInput\\(\\) has parameter \\$inputs with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Forms.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:ajaxCartAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Forms\\:\\:_validateInput\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Forms.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:ajaxDeleteArticleCartAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Forms\\:\\:getContent\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Forms.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:areAddressesEqual\\(\\) has parameter \\$addressA with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Forms\\:\\:translateForm\\(\\) has parameter \\$fields with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Forms.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:areAddressesEqual\\(\\) has parameter \\$addressB with no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware_Controllers_Frontend_Forms\\:\\:\\$_elements type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Forms.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:basketHasEsdProducts\\(\\) has parameter \\$basket with no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware_Controllers_Frontend_Forms\\:\\:\\$_errors type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Forms.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:basketHasMixedProducts\\(\\) has parameter \\$basket with no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware_Controllers_Frontend_Forms\\:\\:\\$_postData type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Forms.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:basketHasServiceProducts\\(\\) has parameter \\$basket with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Index\\:\\:indexAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Index.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:calculateShippingCostsAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Media\\:\\:fallbackAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Media.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:cartAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Media\\:\\:init\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Media.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:changeQuantityAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$voteConfirmed\\.$#"
+			count: 2
+			path: engine/Shopware/Controllers/Frontend/Newsletter.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:checkPaymentAvailability\\(\\) has parameter \\$currentPayment with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			message: "#^Access to an undefined property sSystem\\:\\:\\$_POST\\.$#"
+			count: 2
+			path: engine/Shopware/Controllers/Frontend/Newsletter.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:checkPaymentAvailability\\(\\) has parameter \\$payments with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Newsletter\\:\\:detailAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Newsletter.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:deleteArticleAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Newsletter\\:\\:getCustomerGroups\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Newsletter.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:finishAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Newsletter\\:\\:indexAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Newsletter.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:flagPaymentBlocked\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Newsletter\\:\\:listingAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Newsletter.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:getAvailableStock\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Newsletter\\:\\:sendMail\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Newsletter.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:getBasket\\(\\) should return array\\{content\\?\\: array\\<string, mixed\\>, Amount\\?\\: string, AmountNet\\?\\: string, Quantity\\?\\: int, AmountNumeric\\: float, AmountNetNumeric\\: float, AmountWithTax\\?\\: string, AmountWithTaxNumeric\\?\\: float, \\.\\.\\.\\} but returns array\\{content\\?\\: mixed, Amount\\?\\: string, AmountNet\\?\\: string, Quantity\\?\\: int, AmountWithTax\\?\\: string, sCurrencyId\\: mixed, sCurrencyName\\: mixed, sCurrencyFactor\\: mixed, \\.\\.\\.\\}\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Payment\\:\\:getBasket\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Payment.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:getBoughtToo\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Payment\\:\\:getUser\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Payment.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:getCSRFProtectedActions\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Payment\\:\\:loadBasketFromSignature\\(\\) return type with generic class ArrayObject does not specify its types\\: TKey, TValue$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Payment.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:getCountryList\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Payment\\:\\:savePaymentStatus\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Payment.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:getDefaultPaymentMethod\\(\\) has parameter \\$paymentMethods with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Payment\\:\\:sendSignatureIsInvalidNotificationMail\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Payment.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:getDefaultPaymentMethod\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Payment\\:\\:verifyBasketSignature\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Payment.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:getDispatches\\(\\) has parameter \\$paymentId with no type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Payment\\:\\:verifyBasketSignature\\(\\) has parameter \\$basket with generic class ArrayObject but does not specify its types\\: TKey, TValue$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Payment.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:getDispatches\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Property sOrder\\:\\:\\$sUserData \\(array\\) does not accept array\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Payment.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:getInvalidAgreements\\(\\) has parameter \\$basket with no value type specified in iterable type array\\.$#"
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\Form\\\\FormError\\|Symfony\\\\Component\\\\Form\\\\FormErrorIterator\\:\\:getMessage\\(\\)\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Register.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:getInvalidAgreements\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\Form\\\\FormError\\|Symfony\\\\Component\\\\Form\\\\FormErrorIterator\\:\\:getOrigin\\(\\)\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Register.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:getInvalidProducts\\(\\) has parameter \\$basket with no value type specified in iterable type array\\.$#"
+			message: "#^Cannot call method getCountry\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Register.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:getInvalidProducts\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
+			count: 4
+			path: engine/Shopware/Controllers/Frontend/Register.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:getMinimumCharge\\(\\) should return bool but returns float\\|false\\.$#"
+			message: "#^Cannot call method getName\\(\\) on Symfony\\\\Component\\\\Form\\\\FormInterface\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Register.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:getOrderAddress\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			message: "#^Cannot call method setPost\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
+			count: 2
+			path: engine/Shopware/Controllers/Frontend/Register.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:getPayments\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Register\\:\\:ajaxValidateEmailAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Register.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:getPremiums\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Register\\:\\:ajaxValidatePasswordAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Register.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:getSelectedDispatch\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Register\\:\\:confirmValidationAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Register.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:getSelectedPayment\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Register\\:\\:getPostData\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Register.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:getSelectedState\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Register\\:\\:getRegisterData\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Register.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:getSimilarShown\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Register\\:\\:handleRegisterError\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Register.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:getUserData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Register\\:\\:handleRegisterError\\(\\) has parameter \\$errors with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Register.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:getUserData\\(\\) should return array but returns array\\|false\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Register\\:\\:indexAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Register.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:indexAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Register\\:\\:isShippingProvided\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Register.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:init\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Register\\:\\:redirectCustomer\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Register.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:isTaxFreeDelivery\\(\\) has parameter \\$userData with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Register\\:\\:saveRegisterAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Register.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:onPaymentMethodValidationFail\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Register\\:\\:saveRegisterSuccess\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Register.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:paymentAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Register\\:\\:writeSession\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Register.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:resetTemporaryAddresses\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Search\\:\\:convertProducts\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Search.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:returnAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Search\\:\\:defaultSearchAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Search.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:saveDefaultAddresses\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Search\\:\\:indexAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Search.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:saveOrder\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Search\\:\\:setDefaultSorting\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Search.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:saveShippingPaymentAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:convertSite\\(\\) has parameter \\$site with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Sitemap.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:saveTemporaryOrder\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:convertSite\\(\\) has parameter \\$translations with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Sitemap.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:setAddressAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:convertSite\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Sitemap.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:shippingPaymentAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:fetchTranslation\\(\\) has parameter \\$translations with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Sitemap.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Checkout\\:\\:updateCurrencyDependencies\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:fetchTranslation\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Sitemap.php
 
 		-
-			message: "#^Parameter \\#1 \\$basket of method Shopware_Controllers_Frontend_Checkout\\:\\:getTaxRates\\(\\) expects array\\{content\\?\\: array\\<string, mixed\\>, Amount\\?\\: string, AmountNet\\?\\: string, Quantity\\?\\: int, AmountNumeric\\: float, AmountNetNumeric\\: float, AmountWithTax\\?\\: string, AmountWithTaxNumeric\\?\\: float, \\.\\.\\.\\}, array\\{content\\?\\: array\\<array\\<string, mixed\\>\\>, Amount\\?\\: string, AmountNet\\?\\: string, Quantity\\?\\: int, AmountWithTax\\?\\: string, AmountWithTaxNumeric\\?\\: float, sCurrencyId\\: mixed, sCurrencyName\\: mixed, \\.\\.\\.\\} given\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:fetchTranslations\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Sitemap.php
 
 		-
-			message: "#^Parameter \\#1 \\$basket of method Shopware_Controllers_Frontend_Checkout\\:\\:getTaxRates\\(\\) expects array\\{content\\?\\: array\\<string, mixed\\>, Amount\\?\\: string, AmountNet\\?\\: string, Quantity\\?\\: int, AmountNumeric\\: float, AmountNetNumeric\\: float, AmountWithTax\\?\\: string, AmountWithTaxNumeric\\?\\: float, \\.\\.\\.\\}, array\\{content\\?\\: array\\<array\\<string, mixed\\>\\>, Amount\\?\\: string, AmountNet\\?\\: string, Quantity\\?\\: int, AmountWithTax\\?\\: string, sCurrencyId\\: mixed, sCurrencyName\\: mixed, sCurrencyFactor\\: mixed, \\.\\.\\.\\} given\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:getAdditionalTrees\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Sitemap.php
 
 		-
-			message: "#^Parameter \\#1 \\$cart of method Shopware\\\\Components\\\\Cart\\\\TaxAggregatorInterface\\:\\:taxSum\\(\\) expects array\\{content\\?\\: array\\<string, mixed\\>, sShippingcostsTax\\?\\: float, sShippingcostsTaxProportional\\?\\: array\\<Shopware\\\\Components\\\\Cart\\\\Struct\\\\Price\\>, sShippingcostsNet\\: float, sShippingcostsWithTax\\: float\\}, array\\{content\\?\\: array\\<string, mixed\\>, Amount\\?\\: string, AmountNet\\?\\: string, Quantity\\?\\: int, AmountNumeric\\: float, AmountNetNumeric\\: float, AmountWithTax\\?\\: string, AmountWithTaxNumeric\\?\\: float, \\.\\.\\.\\} given\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:getCategoryTree\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Sitemap.php
 
 		-
-			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
-			count: 2
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:getCustomPages\\(\\) return type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Controllers/Frontend/Sitemap.php
 
 		-
-			message: "#^Parameter \\#1 \\$paymentData of method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\BasePaymentMethod\\:\\:validate\\(\\) expects array, array\\|null given\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:getLandingPages\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			path: engine/Shopware/Controllers/Frontend/Sitemap.php
 
 		-
-			message: "#^Parameter \\#2 \\$email of method sAdmin\\:\\:sUpdateNewsletter\\(\\) expects string, string\\|null given\\.$#"
-			count: 2
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:getSitemapArray\\(\\) has parameter \\$link with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Controllers/Frontend/Sitemap.php
 
 		-
-			message: "#^Property sMarketing\\:\\:\\$sBlacklist \\(array\\) does not accept array\\<int\\>\\|null\\.$#"
-			count: 2
-			path: engine/Shopware/Controllers/Frontend/Checkout.php
+			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:getSitemapArray\\(\\) return type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Controllers/Frontend/Sitemap.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Compare\\:\\:addArticleAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:getSitesByShopId\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Compare.php
+			path: engine/Shopware/Controllers/Frontend/Sitemap.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Compare\\:\\:deleteAllAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:getSupplierForSitemap\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Compare.php
+			path: engine/Shopware/Controllers/Frontend/Sitemap.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Compare\\:\\:deleteArticleAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:getSupplierPages\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Compare.php
+			path: engine/Shopware/Controllers/Frontend/Sitemap.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Compare\\:\\:getListAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:getTranslationKeys\\(\\) has parameter \\$array with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Compare.php
+			path: engine/Shopware/Controllers/Frontend/Sitemap.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Compare\\:\\:indexAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:translateCategoryTree\\(\\) has parameter \\$categoryTree with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Compare.php
+			path: engine/Shopware/Controllers/Frontend/Sitemap.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Compare\\:\\:overlayAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:translateCategoryTree\\(\\) has parameter \\$translations with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Compare.php
+			path: engine/Shopware/Controllers/Frontend/Sitemap.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Csrftoken\\:\\:indexAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:translateCategoryTree\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Csrftoken.php
+			path: engine/Shopware/Controllers/Frontend/Sitemap.php
 
 		-
 			message: "#^Access to an undefined property Enlight_Controller_Request_RequestHttp\\:\\:\\$sArticle\\.$#"
-			count: 3
-			path: engine/Shopware/Controllers/Frontend/Detail.php
-
-		-
-			message: "#^Access to an undefined property Enlight_Controller_Request_RequestHttp\\:\\:\\$sConfirmation\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Detail.php
+			path: engine/Shopware/Controllers/Frontend/Tellafriend.php
 
 		-
-			message: "#^Access to an undefined property Enlight_Controller_Request_RequestHttp\\:\\:\\$template\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Tellafriend\\:\\:indexAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Detail.php
+			path: engine/Shopware/Controllers/Frontend/Tellafriend.php
 
 		-
-			message: "#^Access to an undefined property sSystem\\:\\:\\$_POST\\.$#"
-			count: 3
-			path: engine/Shopware/Controllers/Frontend/Detail.php
+			message: "#^Method Shopware_Controllers_Frontend_Tellafriend\\:\\:init\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Controllers/Frontend/Tellafriend.php
 
 		-
-			message: "#^Call to an undefined method Shopware_Components_Modules\\:\\:sCategories\\(\\)\\.$#"
+			message: "#^Method Shopware_Controllers_Frontend_Tellafriend\\:\\:successAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Detail.php
+			path: engine/Shopware/Controllers/Frontend/Tellafriend.php
 
 		-
-			message: "#^Cannot access offset 'additional' on array\\|false\\.$#"
+			message: "#^Property Shopware_Controllers_Frontend_Tellafriend\\:\\:\\$sSYSTEM has no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Detail.php
+			path: engine/Shopware/Controllers/Frontend/Tellafriend.php
 
 		-
-			message: "#^Cannot access offset 'billingaddress' on array\\|false\\.$#"
-			count: 2
-			path: engine/Shopware/Controllers/Frontend/Detail.php
+			message: "#^Property Shopware_Controllers_Frontend_Tracking\\:\\:\\$testRepository has no type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Controllers/Frontend/Tracking.php
 
 		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Category\\\\Category\\|null\\.$#"
+			message: "#^Method Shopware_Controllers_Widgets_Campaign\\:\\:getEmotion\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Detail.php
+			path: engine/Shopware/Controllers/Widgets/Campaign.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Detail\\:\\:errorAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Widgets_Campaign\\:\\:indexAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Detail.php
+			path: engine/Shopware/Controllers/Widgets/Campaign.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Detail\\:\\:indexAction\\(\\) has no return type specified\\.$#"
+			message: "#^Access to an undefined property Enlight_Components_Session_Namespace\\:\\:\\$sOneTimeAccount\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Detail.php
+			path: engine/Shopware/Controllers/Widgets/Checkout.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Detail\\:\\:productQuickViewAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Widgets_Checkout\\:\\:infoAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Detail.php
+			path: engine/Shopware/Controllers/Widgets/Checkout.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Detail\\:\\:ratingAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Widgets_Compare\\:\\:indexAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Detail.php
+			path: engine/Shopware/Controllers/Widgets/Compare.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Error\\:\\:enableBackendTheme\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Widgets_Emotion\\:\\:emotionArticleSliderAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Error.php
+			path: engine/Shopware/Controllers/Widgets/Emotion.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Error\\:\\:errorAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Widgets_Emotion\\:\\:getLegacyEmotion\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Error.php
+			path: engine/Shopware/Controllers/Widgets/Emotion.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Error\\:\\:genericErrorAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Widgets_Emotion\\:\\:getProductSliderData\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Error.php
+			path: engine/Shopware/Controllers/Widgets/Emotion.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Error\\:\\:init\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Widgets_Emotion\\:\\:getProductStream\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Error.php
+			path: engine/Shopware/Controllers/Widgets/Emotion.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Error\\:\\:pageNotFoundErrorAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Widgets_Emotion\\:\\:indexAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Error.php
+			path: engine/Shopware/Controllers/Widgets/Emotion.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Error\\:\\:serviceAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Widgets_Emotion\\:\\:previewAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Error.php
+			path: engine/Shopware/Controllers/Widgets/Emotion.php
 
 		-
-			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
+			message: "#^Method Shopware_Controllers_Widgets_Emotion\\:\\:productStreamArticleSliderAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Error.php
+			path: engine/Shopware/Controllers/Widgets/Emotion.php
 
 		-
-			message: "#^Binary operation \"\\.\" between ' ' and array\\|string\\|false results in an error\\.$#"
+			message: "#^Method Shopware_Controllers_Widgets_Recommendation\\:\\:boughtAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Forms.php
+			path: engine/Shopware/Controllers/Widgets/Recommendation.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Forms\\:\\:_createInputElement\\(\\) has parameter \\$element with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware_Controllers_Widgets_Recommendation\\:\\:getPromotions\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Forms.php
+			path: engine/Shopware/Controllers/Widgets/Recommendation.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Forms\\:\\:_createLabelElement\\(\\) has parameter \\$element with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware_Controllers_Widgets_Recommendation\\:\\:viewedAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Forms.php
+			path: engine/Shopware/Controllers/Widgets/Recommendation.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Forms\\:\\:_validateInput\\(\\) has parameter \\$elements with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Frontend/Forms.php
+			message: "#^Cannot call method getControllerName\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
+			count: 2
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Forms\\:\\:_validateInput\\(\\) has parameter \\$inputs with no value type specified in iterable type array\\.$#"
+			message: "#^Cannot call method getCookie\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Forms.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Forms\\:\\:_validateInput\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Frontend/Forms.php
+			message: "#^Cannot call method getDeviceType\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
+			count: 2
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Forms\\:\\:getContent\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Country\\\\Country\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Forms.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Forms\\:\\:translateForm\\(\\) has parameter \\$fields with no value type specified in iterable type array\\.$#"
+			message: "#^Cannot call method getParam\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Forms.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Offset 0 does not exist on string\\|null\\.$#"
+			message: "#^Cannot call method getParams\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Forms.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Offset 1 does not exist on array\\{\\(array\\|string\\)\\}\\|string\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Frontend/Forms.php
+			message: "#^Cannot call method getPost\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
+			count: 13
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Parameter \\#1 \\$input of method Shopware_Controllers_Frontend_Forms\\:\\:_filterInput\\(\\) expects string, string\\|null given\\.$#"
+			message: "#^Method sAdmin\\:\\:completeUserCountryData\\(\\) has parameter \\$userData with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Forms.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, array\\|string\\|false given\\.$#"
+			message: "#^Method sAdmin\\:\\:executeRiskRule\\(\\) has parameter \\$basket with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Forms.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Parameter \\#3 \\$subject of function str_replace expects array\\|string, string\\|null given\\.$#"
+			message: "#^Method sAdmin\\:\\:executeRiskRule\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Forms.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Possibly invalid array key type \\(array\\|string\\)\\.$#"
+			message: "#^Method sAdmin\\:\\:getPagerStructure\\(\\) has parameter \\$additionalParams with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Forms.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Property Shopware_Controllers_Frontend_Forms\\:\\:\\$_elements type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:getPagerStructure\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Forms.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Property Shopware_Controllers_Frontend_Forms\\:\\:\\$_errors type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:getUserShippingData\\(\\) has parameter \\$userData with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Forms.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Property Shopware_Controllers_Frontend_Forms\\:\\:\\$_postData type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:handleDispatchDiscount\\(\\) has parameter \\$basket with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Forms.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Index\\:\\:indexAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:handleDispatchSurcharge\\(\\) has parameter \\$basket with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Index.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Category\\\\Category\\|null\\.$#"
-			count: 2
-			path: engine/Shopware/Controllers/Frontend/Listing.php
+			message: "#^Method sAdmin\\:\\:handlePaymentMeanSurcharge\\(\\) has parameter \\$country with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Listing\\:\\:filterListingEmotions\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:handlePaymentMeanSurcharge\\(\\) has parameter \\$dispatch with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Listing.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Listing\\:\\:getBreadcrumb\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:handlePaymentMeanSurcharge\\(\\) has parameter \\$payment with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Listing.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Listing\\:\\:getEmotionConfiguration\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:loginUser\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Listing.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Listing\\:\\:hasListing\\(\\) has parameter \\$devicesWithEmotion with no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:loginUser\\(\\) has parameter \\$getUser with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Listing.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Offset 'streamId' does not exist on array\\|null\\.$#"
+			message: "#^Method sAdmin\\:\\:logout\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Listing.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Variable \\$showListing in empty\\(\\) always exists and is not falsy\\.$#"
+			message: "#^Method sAdmin\\:\\:overwriteBillingAddress\\(\\) has parameter \\$userData with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Listing.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Media\\:\\:fallbackAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:overwriteShippingAddress\\(\\) has parameter \\$userData with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Media.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Media\\:\\:init\\(\\) has no return type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:processOpenOrderDetails\\(\\) has parameter \\$orderValue with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Media.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$voteConfirmed\\.$#"
-			count: 2
-			path: engine/Shopware/Controllers/Frontend/Newsletter.php
+			message: "#^Method sAdmin\\:\\:processOpenOrderDetails\\(\\) has parameter \\$orders with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Access to an undefined property sSystem\\:\\:\\$_POST\\.$#"
-			count: 2
-			path: engine/Shopware/Controllers/Frontend/Newsletter.php
+			message: "#^Method sAdmin\\:\\:resendConfirmationMail\\(\\) has parameter \\$userInfo with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Newsletter\\:\\:detailAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:sGetCountry\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Newsletter.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Newsletter\\:\\:getCustomerGroups\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sGetCountryStateTranslation\\(\\) has parameter \\$state with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Newsletter.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Newsletter\\:\\:indexAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:sGetCountryStateTranslation\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Newsletter.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Newsletter\\:\\:listingAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:sGetDispatchBasket\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Newsletter.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Newsletter\\:\\:sendMail\\(\\) has no return type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:sGetDownloads\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Newsletter.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Note\\:\\:addAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:sGetOpenOrderData\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Note.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Note\\:\\:addNote\\(\\) has no return type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:sGetPaymentMean\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Note.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Note\\:\\:addNote\\(\\) has parameter \\$orderNumber with no type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:sGetPaymentMeanById\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Note.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Note\\:\\:ajaxAddAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:sGetPaymentMeanById\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Note.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Note\\:\\:deleteAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:sGetPremiumDispatch\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Note.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Note\\:\\:indexAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:sGetPremiumDispatchSurcharge\\(\\) has parameter \\$basket with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Note.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Parameter \\#2 \\$articleName of method sBasket\\:\\:sAddNote\\(\\) expects string, array\\|string\\|false given\\.$#"
+			message: "#^Method sAdmin\\:\\:sInitiatePaymentClass\\(\\) has parameter \\$paymentData with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Note.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Payment\\:\\:getBasket\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sLogin\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Payment.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Payment\\:\\:getUser\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sManageRisks\\(\\) has parameter \\$basket with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Payment.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Payment\\:\\:loadBasketFromSignature\\(\\) return type with generic class ArrayObject does not specify its types\\: TKey, TValue$#"
+			message: "#^Method sAdmin\\:\\:sManageRisks\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Payment.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Payment\\:\\:savePaymentStatus\\(\\) has no return type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskARTICLESFROM\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Payment.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Payment\\:\\:sendSignatureIsInvalidNotificationMail\\(\\) has no return type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskARTICLESFROM\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Payment.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Payment\\:\\:verifyBasketSignature\\(\\) has no return type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskATTRIS\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Payment.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Payment\\:\\:verifyBasketSignature\\(\\) has parameter \\$basket with generic class ArrayObject but does not specify its types\\: TKey, TValue$#"
+			message: "#^Method sAdmin\\:\\:sRiskATTRIS\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Payment.php
-
-		-
-			message: "#^Offset 'AmountNetNumeric' does not exist on array\\|null\\.$#"
-			count: 2
-			path: engine/Shopware/Controllers/Frontend/Payment.php
-
-		-
-			message: "#^Offset 'AmountNumeric' does not exist on array\\|null\\.$#"
-			count: 2
-			path: engine/Shopware/Controllers/Frontend/Payment.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Offset 'sAmount' does not exist on array\\|null\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskATTRISNOT\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Payment.php
-
-		-
-			message: "#^Offset 'sShippingcosts' does not exist on array\\|null\\.$#"
-			count: 2
-			path: engine/Shopware/Controllers/Frontend/Payment.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Offset 'sShippingcostsNet' does not exist on array\\|null\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskATTRISNOT\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Payment.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Offset 'sShippingcostsWithT…' does not exist on array\\|null\\.$#"
-			count: 2
-			path: engine/Shopware/Controllers/Frontend/Payment.php
+			message: "#^Method sAdmin\\:\\:sRiskBILLINGLANDIS\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Property sOrder\\:\\:\\$sBasketData \\(array\\) does not accept array\\|null\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskBILLINGLANDIS\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Payment.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Property sOrder\\:\\:\\$sUserData \\(array\\) does not accept array\\|null\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskBILLINGLANDISNOT\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Payment.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Form\\\\FormError\\|Symfony\\\\Component\\\\Form\\\\FormErrorIterator\\:\\:getMessage\\(\\)\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskBILLINGLANDISNOT\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Register.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Form\\\\FormError\\|Symfony\\\\Component\\\\Form\\\\FormErrorIterator\\:\\:getOrigin\\(\\)\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskBILLINGZIPCODE\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Register.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Cannot call method getCountry\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskBILLINGZIPCODE\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Register.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
-			count: 4
-			path: engine/Shopware/Controllers/Frontend/Register.php
+			message: "#^Method sAdmin\\:\\:sRiskBILLINGZONEIS\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Cannot call method getName\\(\\) on Symfony\\\\Component\\\\Form\\\\FormInterface\\|null\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskBILLINGZONEIS\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Register.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Cannot call method setPost\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
-			count: 2
-			path: engine/Shopware/Controllers/Frontend/Register.php
+			message: "#^Method sAdmin\\:\\:sRiskBILLINGZONEISNOT\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Register\\:\\:ajaxValidateEmailAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskBILLINGZONEISNOT\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Register.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Register\\:\\:ajaxValidatePasswordAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskCURRENCIESISOIS\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Register.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Register\\:\\:confirmValidationAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskCURRENCIESISOIS\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Register.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Register\\:\\:createBillingForm\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskCURRENCIESISOISNOT\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Register.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Register\\:\\:createCustomerForm\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskCURRENCIESISOISNOT\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Register.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Register\\:\\:createShippingForm\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskCUSTOMERATTRIS\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Register.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Register\\:\\:getFormErrors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskCUSTOMERATTRIS\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Register.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Register\\:\\:getPostData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskCUSTOMERATTRISNOT\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Register.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Register\\:\\:getRegisterData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskCUSTOMERATTRISNOT\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Register.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Register\\:\\:handleRegisterError\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskCUSTOMERGROUPIS\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Register.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Register\\:\\:handleRegisterError\\(\\) has parameter \\$errors with no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskCUSTOMERGROUPIS\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Register.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Register\\:\\:indexAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskCUSTOMERGROUPISNOT\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Register.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Register\\:\\:isShippingProvided\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskCUSTOMERGROUPISNOT\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Register.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Register\\:\\:redirectCustomer\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskCUSTOMERNR\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Register.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Register\\:\\:saveRegisterAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskCUSTOMERNR\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Register.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Register\\:\\:saveRegisterSuccess\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskDIFFER\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Register.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Register\\:\\:writeSession\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskDIFFER\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Register.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Search\\:\\:convertProducts\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskDUNNINGLEVELONE\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Search.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Search\\:\\:defaultSearchAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskDUNNINGLEVELONE\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Search.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Search\\:\\:indexAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskDUNNINGLEVELTHREE\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Search.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Search\\:\\:setDefaultSorting\\(\\) has no return type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskDUNNINGLEVELTHREE\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Search.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Parameter \\#1 \\$ids of method Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Service\\\\Core\\\\CustomSortingService\\:\\:getList\\(\\) expects array\\<int\\>, array\\<int, string\\> given\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskDUNNINGLEVELTWO\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Search.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:convertSite\\(\\) has parameter \\$site with no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskDUNNINGLEVELTWO\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Sitemap.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:convertSite\\(\\) has parameter \\$translations with no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskINKASSO\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Sitemap.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:convertSite\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskINKASSO\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Sitemap.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:fetchTranslation\\(\\) has parameter \\$translations with no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskLANDIS\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Sitemap.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:fetchTranslation\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskLANDIS\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Sitemap.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:fetchTranslations\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskLANDISNOT\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Sitemap.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:getAdditionalTrees\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskLANDISNOT\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Sitemap.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:getCategoryTree\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskLASTNAME\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Sitemap.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:getCustomPages\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskLASTNAME\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Sitemap.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:getLandingPages\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskLASTORDERLESS\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Sitemap.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:getSitemapArray\\(\\) has parameter \\$link with no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskLASTORDERLESS\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Sitemap.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:getSitemapArray\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskLASTORDERSLESS\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Sitemap.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:getSitesByShopId\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskLASTORDERSLESS\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Sitemap.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:getSupplierForSitemap\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskNEWCUSTOMER\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Sitemap.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:getSupplierPages\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskNEWCUSTOMER\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Sitemap.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:getTranslationKeys\\(\\) has parameter \\$array with no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskORDERPOSITIONSMORE\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Sitemap.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:translateCategoryTree\\(\\) has parameter \\$categoryTree with no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskORDERPOSITIONSMORE\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Sitemap.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:translateCategoryTree\\(\\) has parameter \\$translations with no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskORDERPOSITIONSMORE\\(\\) should return bool but returns bool\\|int\\<0, max\\>\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Sitemap.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Sitemap\\:\\:translateCategoryTree\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskORDERVALUELESS\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Sitemap.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_SitemapXml\\:\\:indexAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskORDERVALUELESS\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/SitemapXml.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Access to an undefined property Enlight_Controller_Request_RequestHttp\\:\\:\\$sArticle\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskORDERVALUEMORE\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Tellafriend.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Cannot access offset 'articleName' on array\\|false\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskORDERVALUEMORE\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Tellafriend.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Tellafriend\\:\\:indexAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskPREGBILLINGSTREET\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Tellafriend.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Tellafriend\\:\\:init\\(\\) has no return type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskPREGBILLINGSTREET\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Tellafriend.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Frontend_Tellafriend\\:\\:successAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskPREGSTREET\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Tellafriend.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Property Shopware_Controllers_Frontend_Tellafriend\\:\\:\\$sSYSTEM has no type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskPREGSTREET\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Tellafriend.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Property Shopware_Controllers_Frontend_Tracking\\:\\:\\$testRepository has no type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskSUBSHOP\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Frontend/Tracking.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Widgets_Campaign\\:\\:getEmotion\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskSUBSHOP\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Widgets/Campaign.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Widgets_Campaign\\:\\:indexAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskSUBSHOPNOT\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Widgets/Campaign.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Widgets_Captcha\\:\\:getCaptchaByNameAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskSUBSHOPNOT\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Widgets/Captcha.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Widgets_Captcha\\:\\:indexAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskZIPCODE\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Widgets/Captcha.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Widgets_Captcha\\:\\:refreshCaptchaAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskZIPCODE\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Widgets/Captcha.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Access to an undefined property Enlight_Components_Session_Namespace\\:\\:\\$sOneTimeAccount\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskZONEIS\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Widgets/Checkout.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Widgets_Checkout\\:\\:infoAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskZONEIS\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Widgets/Checkout.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Widgets_Compare\\:\\:indexAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskZONEISNOT\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Widgets/Compare.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Widgets_Emotion\\:\\:emotionArticleSliderAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method sAdmin\\:\\:sRiskZONEISNOT\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Widgets/Emotion.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Widgets_Emotion\\:\\:getLegacyEmotion\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sAdmin\\:\\:sValidateStep3\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Widgets/Emotion.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Widgets_Emotion\\:\\:getProductSliderData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^PHPDoc tag @var for variable \\$getOrderDetails has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Widgets/Emotion.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Widgets_Emotion\\:\\:getProductStream\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^PHPDoc tag @var for variable \\$getOrders has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Widgets/Emotion.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Widgets_Emotion\\:\\:indexAction\\(\\) has no return type specified\\.$#"
+			message: "#^PHPDoc tag @var for variable \\$orderDetails has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Widgets/Emotion.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Widgets_Emotion\\:\\:previewAction\\(\\) has no return type specified\\.$#"
+			message: "#^PHPDoc tag @var for variable \\$orders has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Widgets/Emotion.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Widgets_Emotion\\:\\:productStreamArticleSliderAction\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$address of method sAdmin\\:\\:convertToLegacyAddressArray\\(\\) expects Shopware\\\\Models\\\\Customer\\\\Address, Shopware\\\\Models\\\\Customer\\\\Address\\|null given\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Widgets/Emotion.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Widgets_Error\\:\\:serviceAction\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#2 \\$discountTax of method sAdmin\\:\\:handleDispatchDiscount\\(\\) expects float, float\\|int\\|false given\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Widgets/Error.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Widgets_Listing\\:\\:convertProductsResult\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#2 \\$discountTax of method sAdmin\\:\\:handleDispatchSurcharge\\(\\) expects float, float\\|int\\|false given\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Widgets/Listing.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Widgets_Listing\\:\\:getCategoryAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Widgets/Listing.php
+			message: "#^Parameter \\#2 \\$numberOfPages of method sAdmin\\:\\:getPagerStructure\\(\\) expects int, float\\|int given\\.$#"
+			count: 2
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Widgets_Listing\\:\\:getCategoryById\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#2 \\$resource of method Shopware\\\\Components\\\\DependencyInjection\\\\Container\\:\\:set\\(\\) expects object\\|null, string given\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Widgets/Listing.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Widgets_Listing\\:\\:getCategoryChildrenIds\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#3 \\$discount_tax of method sAdmin\\:\\:handleBasketDiscount\\(\\) expects float, float\\|int\\|false given\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Widgets/Listing.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Widgets_Listing\\:\\:getCustomPageAction\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#3 \\$lastSentDate of method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\OptInLoginServiceInterface\\:\\:refreshOptInHashForUser\\(\\) expects DateTimeInterface, DateTimeImmutable\\|false given\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Widgets/Listing.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Widgets_Listing\\:\\:listingCountAction\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#5 \\$discount_tax of method sAdmin\\:\\:handlePaymentMeanSurcharge\\(\\) expects float, float\\|int\\|false given\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Widgets/Listing.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Widgets_Listing\\:\\:loadThemeConfig\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#5 \\$encoderName of method sAdmin\\:\\:loginUser\\(\\) expects string, string\\|null given\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Widgets/Listing.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Widgets_Listing\\:\\:productsAction\\(\\) has no return type specified\\.$#"
+			message: "#^Property sAdmin\\:\\:\\$cache type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Widgets/Listing.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Widgets_Listing\\:\\:setSearchResultResponse\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_campaigns_maildata\\.city\" expects value type string\\|null, got type mixed$#"
 			count: 1
-			path: engine/Shopware/Controllers/Widgets/Listing.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Widgets_Listing\\:\\:streamAction\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_campaigns_maildata\\.firstname\" expects value type string\\|null, got type mixed$#"
 			count: 1
-			path: engine/Shopware/Controllers/Widgets/Listing.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Widgets_Listing\\:\\:tagCloudAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Widgets/Listing.php
+			message: "#^Query error\\: Column \"s_campaigns_maildata\\.groupID\" expects value type int, got type mixed$#"
+			count: 3
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Widgets_Listing\\:\\:topSellerAction\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_campaigns_maildata\\.lastname\" expects value type string\\|null, got type mixed$#"
 			count: 1
-			path: engine/Shopware/Controllers/Widgets/Listing.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Parameter \\#1 \\$template of method Shopware\\\\Components\\\\Theme\\\\Inheritance\\:\\:buildConfig\\(\\) expects Shopware\\\\Models\\\\Shop\\\\Template, Shopware\\\\Models\\\\Shop\\\\Template\\|null given\\.$#"
+			message: "#^Query error\\: Column \"s_campaigns_maildata\\.salutation\" expects value type string\\|null, got type mixed$#"
 			count: 1
-			path: engine/Shopware/Controllers/Widgets/Listing.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Parameter \\#1 \\$template of method Shopware\\\\Components\\\\Theme\\\\Inheritance\\:\\:getSmartyDirectories\\(\\) expects Shopware\\\\Models\\\\Shop\\\\Template, Shopware\\\\Models\\\\Shop\\\\Template\\|null given\\.$#"
+			message: "#^Query error\\: Column \"s_campaigns_maildata\\.street\" expects value type string\\|null, got type mixed$#"
 			count: 1
-			path: engine/Shopware/Controllers/Widgets/Listing.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Widgets_Recommendation\\:\\:boughtAction\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_campaigns_maildata\\.title\" expects value type string\\|null, got type mixed$#"
 			count: 1
-			path: engine/Shopware/Controllers/Widgets/Recommendation.php
+			path: engine/Shopware/Core/sAdmin.php
 
 		-
-			message: "#^Method Shopware_Controllers_Widgets_Recommendation\\:\\:getPromotions\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\Media\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Widgets/Recommendation.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method Shopware_Controllers_Widgets_Recommendation\\:\\:viewedAction\\(\\) has no return type specified\\.$#"
+			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Category\\\\Category\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Controllers/Widgets/Recommendation.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Cannot access offset 'additional' on array\\|bool\\.$#"
+			message: "#^Cannot call method getParam\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
 			count: 2
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Cannot access offset 'additional' on array\\|false\\.$#"
-			count: 6
-			path: engine/Shopware/Core/sAdmin.php
+			message: "#^Cannot call method getPost\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
+			count: 5
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Cannot call method getControllerName\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
-			count: 2
-			path: engine/Shopware/Core/sAdmin.php
+			message: "#^Cannot call method getQuery\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
+			count: 5
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Cannot call method getCookie\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
+			message: "#^Cannot call method getThumbnailSize\\(\\) on Shopware\\\\Models\\\\Media\\\\Settings\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Cannot call method getDeviceType\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
-			count: 2
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Country\\\\Country\\|null\\.$#"
+			message: "#^Cannot call method has\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Cannot call method getParam\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
+			message: "#^Cannot call method isThumbnailHighDpi\\(\\) on Shopware\\\\Models\\\\Media\\\\Settings\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Cannot call method getParams\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
+			message: "#^Cannot call method setQuery\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Cannot call method getPost\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
-			count: 24
-			path: engine/Shopware/Core/sAdmin.php
+			message: "#^Method sArticles\\:\\:__construct\\(\\) has parameter \\$customerGroupId with no type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Cannot call method getTax\\(\\) on Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\Tax\\|null\\.$#"
+			message: "#^Method sArticles\\:\\:__construct\\(\\) has parameter \\$translationId with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method sAdmin\\:\\:calculateDispatchSurcharge\\(\\) has parameter \\$basket with no value type specified in iterable type array\\.$#"
+			message: "#^Method sArticles\\:\\:buildNavigation\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method sAdmin\\:\\:calculateDispatchSurcharge\\(\\) has parameter \\$dispatches with no value type specified in iterable type array\\.$#"
+			message: "#^Method sArticles\\:\\:getArticleCover\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method sAdmin\\:\\:completeUserCountryData\\(\\) has parameter \\$userData with no value type specified in iterable type array\\.$#"
+			message: "#^Method sArticles\\:\\:getArticleListingCover\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method sAdmin\\:\\:completeUserCountryData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sArticles\\:\\:getArticleMainCover\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method sAdmin\\:\\:executeRiskRule\\(\\) has parameter \\$basket with no value type specified in iterable type array\\.$#"
+			message: "#^Method sArticles\\:\\:getLinksOfProduct\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method sAdmin\\:\\:executeRiskRule\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
+			message: "#^Method sArticles\\:\\:getProductNavigation\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method sAdmin\\:\\:failedLoginUser\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sArticles\\:\\:getRandomArticle\\(\\) should return int but returns int\\|false\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method sAdmin\\:\\:getPagerStructure\\(\\) has parameter \\$additionalParams with no value type specified in iterable type array\\.$#"
+			message: "#^Method sArticles\\:\\:sAddComparison\\(\\) should return bool but returns bool\\|string\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method sAdmin\\:\\:getPagerStructure\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sArticles\\:\\:sCalculatingPrice\\(\\) has parameter \\$article with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method sAdmin\\:\\:getUserBillingData\\(\\) has parameter \\$userData with no value type specified in iterable type array\\.$#"
+			message: "#^Method sArticles\\:\\:sCalculatingPriceNum\\(\\) has parameter \\$article with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method sAdmin\\:\\:getUserBillingData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sArticles\\:\\:sDeleteComparison\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method sAdmin\\:\\:getUserCountryData\\(\\) has parameter \\$userData with no value type specified in iterable type array\\.$#"
+			message: "#^Method sArticles\\:\\:sDeleteComparisons\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method sAdmin\\:\\:getUserCountryData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sArticles\\:\\:sFillUpComparisonArticles\\(\\) has parameter \\$articles with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method sAdmin\\:\\:getUserShippingData\\(\\) has parameter \\$userData with no value type specified in iterable type array\\.$#"
+			message: "#^Method sArticles\\:\\:sFillUpComparisonArticles\\(\\) has parameter \\$properties with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method sAdmin\\:\\:handleDispatchDiscount\\(\\) has parameter \\$basket with no value type specified in iterable type array\\.$#"
+			message: "#^Method sArticles\\:\\:sFillUpComparisonArticles\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method sAdmin\\:\\:handleDispatchSurcharge\\(\\) has parameter \\$basket with no value type specified in iterable type array\\.$#"
+			message: "#^Method sArticles\\:\\:sGetArticleById\\(\\) has parameter \\$selection with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method sAdmin\\:\\:handlePaymentMeanSurcharge\\(\\) has parameter \\$country with no value type specified in iterable type array\\.$#"
+			message: "#^Method sArticles\\:\\:sGetArticleById\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method sAdmin\\:\\:handlePaymentMeanSurcharge\\(\\) has parameter \\$dispatch with no value type specified in iterable type array\\.$#"
+			message: "#^Method sArticles\\:\\:sGetArticleCharts\\(\\) has parameter \\$category with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method sAdmin\\:\\:handlePaymentMeanSurcharge\\(\\) has parameter \\$payment with no value type specified in iterable type array\\.$#"
+			message: "#^Method sArticles\\:\\:sGetArticleCharts\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method sAdmin\\:\\:handlePaymentMeanSurcharge\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sArticles\\:\\:sGetArticlePictures\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method sAdmin\\:\\:loginUser\\(\\) has no return type specified\\.$#"
+			message: "#^Method sArticles\\:\\:sGetArticleProperties\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method sAdmin\\:\\:loginUser\\(\\) has parameter \\$getUser with no value type specified in iterable type array\\.$#"
+			message: "#^Method sArticles\\:\\:sGetArticlesBySupplier\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method sAdmin\\:\\:logout\\(\\) has no return type specified\\.$#"
+			message: "#^Method sArticles\\:\\:sGetCheapestPrice\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method sAdmin\\:\\:overwriteBillingAddress\\(\\) has parameter \\$userData with no value type specified in iterable type array\\.$#"
+			message: "#^Method sArticles\\:\\:sGetComparisonList\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method sAdmin\\:\\:overwriteBillingAddress\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sArticles\\:\\:sGetComparisonProperties\\(\\) has parameter \\$articles with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method sAdmin\\:\\:overwriteShippingAddress\\(\\) has parameter \\$userData with no value type specified in iterable type array\\.$#"
+			message: "#^Method sArticles\\:\\:sGetComparisonProperties\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method sAdmin\\:\\:overwriteShippingAddress\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sArticles\\:\\:sGetComparisons\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method sAdmin\\:\\:processOpenOrderDetails\\(\\) has parameter \\$orderValue with no value type specified in iterable type array\\.$#"
+			message: "#^Method sArticles\\:\\:sGetConfiguratorImage\\(\\) has parameter \\$sArticle with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method sAdmin\\:\\:processOpenOrderDetails\\(\\) has parameter \\$orders with no value type specified in iterable type array\\.$#"
+			message: "#^Method sArticles\\:\\:sGetConfiguratorImage\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method sAdmin\\:\\:processOpenOrderDetails\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sArticles\\:\\:sGetPricegroupDiscount\\(\\) has parameter \\$articleData with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method sAdmin\\:\\:resendConfirmationMail\\(\\) has no return type specified\\.$#"
+			message: "#^Method sArticles\\:\\:sGetPricegroupDiscount\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Core/sAdmin.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method sAdmin\\:\\:resendConfirmationMail\\(\\) has parameter \\$userInfo with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sGetCountry\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sGetCountryList\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sGetCountryStateTranslation\\(\\) has parameter \\$state with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sGetCountryStateTranslation\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sGetDispatchBasket\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sGetDownloads\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sGetOpenOrderData\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sGetPaymentMean\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sGetPaymentMeanById\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sGetPaymentMeanById\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sGetPaymentMeans\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sGetPremiumDispatch\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sGetPremiumDispatchSurcharge\\(\\) has parameter \\$basket with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sGetPremiumDispatches\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sGetUserData\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sGetUserNameById\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sInitiatePaymentClass\\(\\) has parameter \\$paymentData with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sLogin\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sManageRisks\\(\\) has parameter \\$basket with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sManageRisks\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sNewsletterSubscription\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskARTICLESFROM\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskARTICLESFROM\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskATTRIS\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskATTRIS\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskATTRISNOT\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskATTRISNOT\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskBILLINGLANDIS\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskBILLINGLANDIS\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskBILLINGLANDISNOT\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskBILLINGLANDISNOT\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskBILLINGZIPCODE\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskBILLINGZIPCODE\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskBILLINGZONEIS\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskBILLINGZONEIS\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskBILLINGZONEISNOT\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskBILLINGZONEISNOT\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskCURRENCIESISOIS\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskCURRENCIESISOIS\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskCURRENCIESISOISNOT\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskCURRENCIESISOISNOT\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskCUSTOMERATTRIS\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskCUSTOMERATTRIS\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskCUSTOMERATTRISNOT\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskCUSTOMERATTRISNOT\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskCUSTOMERGROUPIS\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskCUSTOMERGROUPIS\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskCUSTOMERGROUPISNOT\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskCUSTOMERGROUPISNOT\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskCUSTOMERNR\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskCUSTOMERNR\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskDIFFER\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskDIFFER\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskDUNNINGLEVELONE\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskDUNNINGLEVELONE\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskDUNNINGLEVELTHREE\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskDUNNINGLEVELTHREE\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskDUNNINGLEVELTWO\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskDUNNINGLEVELTWO\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskINKASSO\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskINKASSO\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskLANDIS\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskLANDIS\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskLANDISNOT\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskLANDISNOT\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskLASTNAME\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskLASTNAME\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskLASTORDERLESS\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskLASTORDERLESS\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskLASTORDERSLESS\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskLASTORDERSLESS\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskNEWCUSTOMER\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskNEWCUSTOMER\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskORDERPOSITIONSMORE\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskORDERPOSITIONSMORE\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskORDERPOSITIONSMORE\\(\\) should return bool but returns bool\\|int\\<0, max\\>\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskORDERVALUELESS\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskORDERVALUELESS\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskORDERVALUEMORE\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskORDERVALUEMORE\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskPREGBILLINGSTREET\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskPREGBILLINGSTREET\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskPREGSTREET\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskPREGSTREET\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskSUBSHOP\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskSUBSHOP\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskSUBSHOPNOT\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskSUBSHOPNOT\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskZIPCODE\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskZIPCODE\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskZONEIS\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskZONEIS\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskZONEISNOT\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sRiskZONEISNOT\\(\\) has parameter \\$user with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sValidateStep3\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:sendMail\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Method sAdmin\\:\\:subscribeNewsletter\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^PHPDoc tag @var for variable \\$getOrderDetails has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^PHPDoc tag @var for variable \\$getOrders has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^PHPDoc tag @var for variable \\$orderDetails has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^PHPDoc tag @var for variable \\$orders has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Parameter \\#1 \\$address of method sAdmin\\:\\:convertToLegacyAddressArray\\(\\) expects Shopware\\\\Models\\\\Customer\\\\Address, Shopware\\\\Models\\\\Customer\\\\Address\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Parameter \\#2 \\$discountTax of method sAdmin\\:\\:handleDispatchDiscount\\(\\) expects float, float\\|int\\|false given\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Parameter \\#2 \\$discountTax of method sAdmin\\:\\:handleDispatchSurcharge\\(\\) expects float, float\\|int\\|false given\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Parameter \\#2 \\$numberOfPages of method sAdmin\\:\\:getPagerStructure\\(\\) expects int, float\\|int given\\.$#"
-			count: 2
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Parameter \\#2 \\$request of method Shopware\\\\Components\\\\Captcha\\\\CaptchaValidator\\:\\:validateByName\\(\\) expects Enlight_Controller_Request_Request, Enlight_Controller_Request_Request\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Parameter \\#2 \\$resource of method Shopware\\\\Components\\\\DependencyInjection\\\\Container\\:\\:set\\(\\) expects object\\|null, string given\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Parameter \\#3 \\$discount_tax of method sAdmin\\:\\:handleBasketDiscount\\(\\) expects float, float\\|int\\|false given\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Parameter \\#3 \\$lastSentDate of method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\OptInLoginServiceInterface\\:\\:refreshOptInHashForUser\\(\\) expects DateTimeInterface, DateTimeImmutable\\|false given\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Parameter \\#3 \\$user of method sAdmin\\:\\:sManageRisks\\(\\) expects array, array\\|false given\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Parameter \\#4 \\$dispatch of method sAdmin\\:\\:handlePaymentMeanSurcharge\\(\\) expects array, array\\|false given\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Parameter \\#5 \\$discount_tax of method sAdmin\\:\\:handlePaymentMeanSurcharge\\(\\) expects float, float\\|int\\|false given\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Parameter \\#5 \\$encoderName of method sAdmin\\:\\:loginUser\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Property sAdmin\\:\\:\\$cache type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sAdmin.php
-
-		-
-			message: "#^Binary operation \"\\-\" between int\\|string and 1 results in an error\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Cannot call method getCover\\(\\) on Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\ListProduct\\|null\\.$#"
-			count: 2
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\ListProduct\\|null\\.$#"
-			count: 2
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\Media\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Category\\\\Category\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Cannot call method getName\\(\\) on Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\ListProduct\\|null\\.$#"
-			count: 2
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Cannot call method getNumber\\(\\) on Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\ListProduct\\|null\\.$#"
-			count: 2
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Cannot call method getParam\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
-			count: 2
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Cannot call method getPost\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
-			count: 5
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Cannot call method getQuery\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
-			count: 5
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Cannot call method getThumbnailSize\\(\\) on Shopware\\\\Models\\\\Media\\\\Settings\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Cannot call method has\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Cannot call method isThumbnailHighDpi\\(\\) on Shopware\\\\Models\\\\Media\\\\Settings\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Cannot call method setQuery\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:__construct\\(\\) has parameter \\$customerGroupId with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:__construct\\(\\) has parameter \\$translationId with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:buildNavigation\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:getArticleCover\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:getArticleListingCover\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:getArticleMainCover\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:getDataOfProductImage\\(\\) has parameter \\$image with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:getDataOfProductImage\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:getLinksOfProduct\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:getOrderNumberByProductId\\(\\) should return string but returns string\\|false\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:getProductNavigation\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:getPromotion\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:getPromotionNumberByMode\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:getPromotionNumberByMode\\(\\) has parameter \\$category with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:getPromotionNumberByMode\\(\\) has parameter \\$mode with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:getPromotionNumberByMode\\(\\) has parameter \\$value with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:getPromotionNumberByMode\\(\\) has parameter \\$withImage with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:getRandomArticle\\(\\) should return int but returns int\\|false\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sAddComparison\\(\\) should return bool but returns bool\\|string\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sCalculatingPrice\\(\\) has parameter \\$article with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sCalculatingPriceNum\\(\\) has parameter \\$article with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sDeleteComparison\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sDeleteComparisons\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sFillUpComparisonArticles\\(\\) has parameter \\$articles with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sFillUpComparisonArticles\\(\\) has parameter \\$properties with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sFillUpComparisonArticles\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sGetArticleById\\(\\) has parameter \\$selection with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sGetArticleById\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sGetArticleCharts\\(\\) has parameter \\$category with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sGetArticleCharts\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sGetArticleNameByArticleId\\(\\) should return string but returns array\\|string\\|false\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sGetArticleNameByOrderNumber\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sGetArticlePictures\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sGetArticleProperties\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sGetArticlesBySupplier\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sGetCheapestPrice\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sGetComparisonList\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sGetComparisonProperties\\(\\) has parameter \\$articles with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sGetComparisonProperties\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sGetComparisons\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sGetConfiguratorImage\\(\\) has parameter \\$sArticle with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sGetConfiguratorImage\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sGetPricegroupDiscount\\(\\) has parameter \\$articleData with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sGetPricegroupDiscount\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sGetProductByOrdernumber\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sGetProductByOrdernumber\\(\\) should return array\\|false but returns array\\|bool\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sGetPromotionById\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sGetSupplierById\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sGetTranslation\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sGetTranslation\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sGetTranslations\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sGetTranslations\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sGetUnit\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Method sArticles\\:\\:sSaveComment\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Parameter \\#1 \\$orderNumber of method sArticles\\:\\:sGetArticleNameByOrderNumber\\(\\) expects string, string\\|false\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Parameter \\#1 \\$productId of method sArticles\\:\\:getOrderNumberByProductId\\(\\) expects int, float\\|int\\<min, \\-1\\>\\|int\\<1, max\\>\\|string given\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Parameter \\#2 \\$orderNumber of method sArticles\\:\\:getArticleCover\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Parameter \\#3 \\$subject of function preg_replace expects array\\|string, string\\|null given\\.$#"
-			count: 2
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Property sArticles\\:\\:\\$cachePromotions type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Property sArticles\\:\\:\\$category \\(Shopware\\\\Models\\\\Category\\\\Category\\) does not accept Shopware\\\\Models\\\\Category\\\\Category\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Property sArticles\\:\\:\\$searchService \\(Shopware\\\\Bundle\\\\SearchBundle\\\\ProductSearch\\) does not accept Shopware\\\\Bundle\\\\SearchBundle\\\\VariantSearch\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticles.php
-
-		-
-			message: "#^Cannot access offset 'linkDetails' on array\\|false\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticlesComparisons.php
-
-		-
-			message: "#^Cannot access offset 'linkVariant' on array\\|false\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticlesComparisons.php
-
-		-
-			message: "#^Method sArticlesComparisons\\:\\:containsTranslation\\(\\) has parameter \\$translation with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticlesComparisons.php
-
-		-
-			message: "#^Method sArticlesComparisons\\:\\:extractPropertyTranslation\\(\\) has parameter \\$articleProperty with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticlesComparisons.php
-
-		-
-			message: "#^Method sArticlesComparisons\\:\\:sDeleteComparison\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticlesComparisons.php
-
-		-
-			message: "#^Method sArticlesComparisons\\:\\:sDeleteComparisons\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticlesComparisons.php
-
-		-
-			message: "#^Method sArticlesComparisons\\:\\:sFillUpComparisonArticles\\(\\) has parameter \\$articles with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticlesComparisons.php
-
-		-
-			message: "#^Method sArticlesComparisons\\:\\:sFillUpComparisonArticles\\(\\) has parameter \\$properties with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticlesComparisons.php
-
-		-
-			message: "#^Method sArticlesComparisons\\:\\:sFillUpComparisonArticles\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticlesComparisons.php
-
-		-
-			message: "#^Method sArticlesComparisons\\:\\:sGetComparisonList\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticlesComparisons.php
-
-		-
-			message: "#^Method sArticlesComparisons\\:\\:sGetComparisonProperties\\(\\) has parameter \\$articles with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticlesComparisons.php
-
-		-
-			message: "#^Method sArticlesComparisons\\:\\:sGetComparisonProperties\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticlesComparisons.php
-
-		-
-			message: "#^Method sArticlesComparisons\\:\\:sGetComparisons\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sArticlesComparisons.php
-
-		-
-			message: "#^Access to an undefined property sSystem\\:\\:\\$sLanguage\\.$#"
-			count: 2
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Call to an undefined method object\\:\\:assign\\(\\)\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Call to an undefined method object\\:\\:fetch\\(\\)\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Cannot call method getCookie\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
-			count: 5
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Cannot call method getQuery\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Cannot call method getTax\\(\\) on Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\Tax\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Cannot call method isSecure\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:calculateVoucherValues\\(\\) has parameter \\$voucherDetails with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:calculateVoucherValues\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:checkIfProductIsInBasket\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:clearBasket\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:convertListProductToNote\\(\\) has parameter \\$note with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:convertListProductToNote\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:filterCustomerGroupVoucher\\(\\) has parameter \\$voucherDetails with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:filterCustomerGroupVoucher\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:filterProductVoucher\\(\\) has parameter \\$voucherDetails with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:filterProductVoucher\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:filterSubShopVoucher\\(\\) has parameter \\$voucherDetails with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:filterSubShopVoucher\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:filterSupplierVoucher\\(\\) has parameter \\$voucherDetails with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:filterSupplierVoucher\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:filterUsedVoucher\\(\\) has parameter \\$voucherDetails with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:filterUsedVoucher\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:getAdditionalInfoForUpdateProduct\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:getBasketImage\\(\\) has parameter \\$image with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:getBasketImage\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:getBasketQuantity\\(\\) has parameter \\$basketProduct with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:getBasketQuantity\\(\\) has parameter \\$product with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:getNoteProducts\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:getPriceForAddProduct\\(\\) has parameter \\$product with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:getPriceForAddProduct\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:getPricesForItemUpdates\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:getProductForAddProduct\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:getTaxesForUpdateProduct\\(\\) has parameter \\$queryAdditionalInfo with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:getTaxesForUpdateProduct\\(\\) has parameter \\$queryNewPrice with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:getTaxesForUpdateProduct\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:sAddVoucher\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:sCheckBasketQuantities\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:sDeleteArticle\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:sGetAmount\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:sGetAmountArticles\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:sGetAmountRestrictedArticles\\(\\) has parameter \\$articles with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:sGetAmountRestrictedArticles\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:sGetNotes\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:sGetVoucher\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:sInsertDiscount\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:sRefreshBasket\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Method sBasket\\:\\:sUpdateVoucher\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^PHPDoc tag @var for variable \\$promotion has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Parameter \\#1 \\$moneyfloat of method sArticles\\:\\:sRound\\(\\) expects float\\|string\\|null, array\\|float\\|void\\|false given\\.$#"
-			count: 2
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Property sBasket\\:\\:\\$additionalTextService \\(Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Service\\\\AdditionalTextServiceInterface\\) does not accept Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Service\\\\AdditionalTextServiceInterface\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Property sBasket\\:\\:\\$contextService \\(Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Service\\\\ContextServiceInterface\\) does not accept Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Service\\\\ContextServiceInterface\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Service \"system\" is not registered in the container\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sBasket.php
-
-		-
-			message: "#^Argument of an invalid type array\\|string supplied for foreach, only iterables are supported\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCategories.php
-
-		-
-			message: "#^Method sCategories\\:\\:assignCategoriesToTree\\(\\) has parameter \\$activePath with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCategories.php
-
-		-
-			message: "#^Method sCategories\\:\\:assignCategoriesToTree\\(\\) has parameter \\$categories with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCategories.php
-
-		-
-			message: "#^Method sCategories\\:\\:assignCategoriesToTree\\(\\) has parameter \\$childrenCounts with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCategories.php
-
-		-
-			message: "#^Method sCategories\\:\\:assignCategoriesToTree\\(\\) has parameter \\$tree with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCategories.php
-
-		-
-			message: "#^Method sCategories\\:\\:assignCategoriesToTree\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCategories.php
-
-		-
-			message: "#^Method sCategories\\:\\:buildTree\\(\\) has parameter \\$associated with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCategories.php
-
-		-
-			message: "#^Method sCategories\\:\\:buildTree\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCategories.php
-
-		-
-			message: "#^Method sCategories\\:\\:convertCategory\\(\\) has parameter \\$childrenCounts with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCategories.php
-
-		-
-			message: "#^Method sCategories\\:\\:convertCategory\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCategories.php
-
-		-
-			message: "#^Method sCategories\\:\\:getCategoryIdsWithParent\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCategories.php
-
-		-
-			message: "#^Method sCategories\\:\\:getCategoryIdsWithParent\\(\\) should return array but returns array\\|false\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCategories.php
-
-		-
-			message: "#^Method sCategories\\:\\:getCategoryPath\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCategories.php
-
-		-
-			message: "#^Method sCategories\\:\\:getChildrenCountOfCategories\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCategories.php
-
-		-
-			message: "#^Method sCategories\\:\\:getChildrenCountOfCategories\\(\\) should return array but returns array\\|false\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCategories.php
-
-		-
-			message: "#^Method sCategories\\:\\:mapCategoryTree\\(\\) has parameter \\$categories with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCategories.php
-
-		-
-			message: "#^Method sCategories\\:\\:mapCategoryTree\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCategories.php
-
-		-
-			message: "#^Method sCategories\\:\\:sGetCategories\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCategories.php
-
-		-
-			message: "#^Method sCategories\\:\\:sGetCategoriesByParent\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCategories.php
-
-		-
-			message: "#^Method sCategories\\:\\:sGetCategoriesByParentId\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCategories.php
-
-		-
-			message: "#^Method sCategories\\:\\:sGetCategoryContent\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCategories.php
-
-		-
-			message: "#^Method sCategories\\:\\:sGetCategoryIdByArticleId\\(\\) has parameter \\$shopId with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCategories.php
-
-		-
-			message: "#^Method sCategories\\:\\:sGetCategoryPath\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCategories.php
-
-		-
-			message: "#^Method sCategories\\:\\:sGetMainCategories\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCategories.php
-
-		-
-			message: "#^Method sCategories\\:\\:sGetWholeCategoryTree\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCategories.php
-
-		-
-			message: "#^Property sCategories\\:\\:\\$sSYSTEM has no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCategories.php
-
-		-
-			message: "#^Cannot call method getQuery\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCms.php
-
-		-
-			message: "#^Method sCms\\:\\:getRelatedForPage\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCms.php
-
-		-
-			message: "#^Method sCms\\:\\:getRelatedForPage\\(\\) has parameter \\$staticPage with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCms.php
-
-		-
-			message: "#^Method sCms\\:\\:getRelatedForSubPage\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCms.php
-
-		-
-			message: "#^Method sCms\\:\\:getRelatedForSubPage\\(\\) has parameter \\$staticPage with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCms.php
-
-		-
-			message: "#^Method sCms\\:\\:sGetStaticPage\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCms.php
-
-		-
-			message: "#^Method sCms\\:\\:sGetStaticPageChildrensById\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCms.php
-
-		-
-			message: "#^Parameter \\#2 \\$fallback of method Shopware_Components_Translation\\:\\:readWithFallback\\(\\) expects int, int\\|null given\\.$#"
-			count: 2
-			path: engine/Shopware/Core/sCms.php
-
-		-
-			message: "#^Argument of an invalid type array\\|null supplied for foreach, only iterables are supported\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCore.php
-
-		-
-			message: "#^Method sCore\\:\\:__construct\\(\\) has parameter \\$front with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCore.php
-
-		-
-			message: "#^Method sCore\\:\\:sBuildLink\\(\\) has parameter \\$sVariables with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCore.php
-
-		-
-			message: "#^Parameter \\#3 \\$subject of function str_replace expects array\\|string, string\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sCore.php
-
-		-
-			message: "#^Cannot call method getThumbnailSize\\(\\) on Shopware\\\\Models\\\\Media\\\\Settings\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sExport.php
-
-		-
-			message: "#^Method sExport\\:\\:_decode_line\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sExport.php
-
-		-
-			message: "#^Method sExport\\:\\:sGetArticlePremiumShippingcosts\\(\\) has parameter \\$article with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sExport.php
-
-		-
-			message: "#^Method sExport\\:\\:sGetArticlePremiumShippingcosts\\(\\) has parameter \\$country with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sExport.php
-
-		-
-			message: "#^Method sExport\\:\\:sGetArticlePremiumShippingcosts\\(\\) has parameter \\$payment with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sExport.php
-
-		-
-			message: "#^Method sExport\\:\\:sGetArticleProperties\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sExport.php
-
-		-
-			message: "#^Method sExport\\:\\:sGetArticleShippingcost\\(\\) has parameter \\$article with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sExport.php
-
-		-
-			message: "#^Method sExport\\:\\:sGetCountry\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sExport.php
-
-		-
-			message: "#^Method sExport\\:\\:sGetDispatchBasket\\(\\) has parameter \\$article with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sExport.php
-
-		-
-			message: "#^Method sExport\\:\\:sGetPaymentmean\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sExport.php
-
-		-
-			message: "#^Method sExport\\:\\:sGetPremiumDispatch\\(\\) has parameter \\$basket with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sExport.php
-
-		-
-			message: "#^Method sExport\\:\\:sGetPremiumDispatch\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sExport.php
-
-		-
-			message: "#^Method sExport\\:\\:sGetPremiumDispatchSurcharge\\(\\) has parameter \\$basket with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sExport.php
-
-		-
-			message: "#^Parameter \\#1 \\$search of function str_replace expects array\\|string, string\\|false\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sExport.php
-
-		-
-			message: "#^Parameter \\#1 \\$url of method sExport\\:\\:fixShopHost\\(\\) expects string, string\\|null given\\.$#"
-			count: 2
-			path: engine/Shopware/Core/sExport.php
-
-		-
-			message: "#^Parameter \\#3 \\$pictureSize of method sArticles\\:\\:sGetArticlePictures\\(\\) expects int, null given\\.$#"
-			count: 2
-			path: engine/Shopware/Core/sExport.php
-
-		-
-			message: "#^Parameter \\#3 \\$subject of function str_replace expects array\\|string, string\\|null given\\.$#"
-			count: 2
-			path: engine/Shopware/Core/sExport.php
-
-		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Category\\\\Category\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sMarketing.php
-
-		-
-			message: "#^Method sMarketing\\:\\:getVariantDetailsForPremiumProducts\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sMarketing.php
-
-		-
-			message: "#^Method sMarketing\\:\\:sBanner\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sMarketing.php
-
-		-
-			message: "#^Method sMarketing\\:\\:sBuildTagCloud\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sMarketing.php
-
-		-
-			message: "#^Method sMarketing\\:\\:sBuildTagCloud\\(\\) has parameter \\$categoryId with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sMarketing.php
-
-		-
-			message: "#^Method sMarketing\\:\\:sGetAlsoBoughtArticles\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sMarketing.php
-
-		-
-			message: "#^Method sMarketing\\:\\:sGetAlsoBoughtArticles\\(\\) has parameter \\$articleID with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sMarketing.php
-
-		-
-			message: "#^Method sMarketing\\:\\:sGetAlsoBoughtArticles\\(\\) has parameter \\$limit with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sMarketing.php
-
-		-
-			message: "#^Method sMarketing\\:\\:sGetMailCampaignsProducts\\(\\) has parameter \\$products with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sMarketing.php
-
-		-
-			message: "#^Method sMarketing\\:\\:sGetMailCampaignsProducts\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sMarketing.php
-
-		-
-			message: "#^Method sMarketing\\:\\:sGetPremiums\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sMarketing.php
-
-		-
-			message: "#^Method sMarketing\\:\\:sGetSimilarArticles\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sMarketing.php
-
-		-
-			message: "#^Method sMarketing\\:\\:sGetSimilaryShownArticles\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sMarketing.php
-
-		-
-			message: "#^Method sMarketing\\:\\:sGetSimilaryShownArticles\\(\\) has parameter \\$articleId with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sMarketing.php
-
-		-
-			message: "#^Method sMarketing\\:\\:sGetSimilaryShownArticles\\(\\) has parameter \\$limit with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sMarketing.php
-
-		-
-			message: "#^Method sMarketing\\:\\:sMailCampaignsGetDetail\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sMarketing.php
-
-		-
-			message: "#^Method sMarketing\\:\\:sMailCampaignsGetDetail\\(\\) has parameter \\$id with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sMarketing.php
-
-		-
-			message: "#^Parameter \\#3 \\$subject of function preg_replace expects array\\|string, string\\|null given\\.$#"
-			count: 2
-			path: engine/Shopware/Core/sMarketing.php
-
-		-
-			message: "#^Property sMarketing\\:\\:\\$sBlacklist type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sMarketing.php
-
-		-
-			message: "#^Call to an undefined method Enlight_Event_EventArgs\\:\\:getValues\\(\\)\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Cannot access offset 'attributes' on array\\|false\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Cannot access offset 'id' on array\\|false\\.$#"
-			count: 4
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Cannot access offset 'serials' on array\\|false\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Cannot call method getClientIp\\(\\) on Symfony\\\\Component\\\\HttpFoundation\\\\Request\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Method sOrder\\:\\:formatBasketRow\\(\\) has parameter \\$basketRow with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Method sOrder\\:\\:formatBasketRow\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Method sOrder\\:\\:getAvailableSerialsOfEsd\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Method sOrder\\:\\:getCustomerInformationByOrderId\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Method sOrder\\:\\:getOrderById\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Method sOrder\\:\\:getOrderDetailsByOrderId\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Method sOrder\\:\\:getOrderDetailsForMail\\(\\) has parameter \\$basketRows with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Method sOrder\\:\\:getOrderDetailsForMail\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Method sOrder\\:\\:getOrderDetailsForStatusMail\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Method sOrder\\:\\:getOrderForStatusMail\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Method sOrder\\:\\:getOrderPaymentStatus\\(\\) should return string but returns string\\|false\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Method sOrder\\:\\:getOrderStatus\\(\\) should return string but returns string\\|false\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Method sOrder\\:\\:getPartnerCode\\(\\) should return string\\|null but returns string\\|false\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Method sOrder\\:\\:getUserDataForMail\\(\\) has parameter \\$userData with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Method sOrder\\:\\:getUserDataForMail\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Method sOrder\\:\\:getVariantEsd\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Method sOrder\\:\\:handleESDOrder\\(\\) has parameter \\$basketRow with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Method sOrder\\:\\:handleESDOrder\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Method sOrder\\:\\:htmlEntityDecodeRecursive\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Method sOrder\\:\\:htmlEntityDecodeRecursive\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Method sOrder\\:\\:logOrderMailException\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Method sOrder\\:\\:refreshOrderedVariant\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Method sOrder\\:\\:reserveVoucher\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Method sOrder\\:\\:sCreateTemporaryOrder\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Method sOrder\\:\\:sDeleteTemporaryOrder\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Method sOrder\\:\\:sSaveBillingAddress\\(\\) has parameter \\$address with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Method sOrder\\:\\:sSaveOrder\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Method sOrder\\:\\:sSaveShippingAddress\\(\\) has parameter \\$address with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Method sOrder\\:\\:sTellFriend\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Method sOrder\\:\\:sendMail\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Method sOrder\\:\\:sendMail\\(\\) has parameter \\$variables with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Method sOrder\\:\\:setConfig\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Method sOrder\\:\\:setOrderStatus\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Method sOrder\\:\\:setPaymentStatus\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Property sOrder\\:\\:\\$orderAttributes type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Property sOrder\\:\\:\\$sBasketData type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Property sOrder\\:\\:\\$sShippingData type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Property sOrder\\:\\:\\$sUserData type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sOrder.php
-
-		-
-			message: "#^Call to an undefined method object\\:\\:assign\\(\\)\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Call to an undefined method object\\:\\:fetch\\(\\)\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Cannot call method execute\\(\\) on PDOStatement\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Category\\\\Category\\|null\\.$#"
-			count: 2
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Cannot call method getLevel\\(\\) on Shopware\\\\Models\\\\Category\\\\Category\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Cannot call method getName\\(\\) on Shopware\\\\Models\\\\Article\\\\Supplier\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Method sRewriteTable\\:\\:baseSetup\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Method sRewriteTable\\:\\:checkSpecificShopForm\\(\\) has parameter \\$matches with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Method sRewriteTable\\:\\:checkSpecificShopSite\\(\\) has parameter \\$matches with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Method sRewriteTable\\:\\:createManufacturerUrls\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Method sRewriteTable\\:\\:createSupplierPath\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Method sRewriteTable\\:\\:getManufacturerIds\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Method sRewriteTable\\:\\:insertFormUrls\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Method sRewriteTable\\:\\:insertStaticPageUrls\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Method sRewriteTable\\:\\:mapArticleTranslationObjectData\\(\\) has parameter \\$articles with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Method sRewriteTable\\:\\:mapArticleTranslationObjectData\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Method sRewriteTable\\:\\:mapProductObjectAttributeFields\\(\\) has parameter \\$product with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Method sRewriteTable\\:\\:mapProductObjectAttributeFields\\(\\) has parameter \\$translations with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Method sRewriteTable\\:\\:mapProductObjectAttributeFields\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Method sRewriteTable\\:\\:mapProductObjectFields\\(\\) has parameter \\$fieldMappings with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Method sRewriteTable\\:\\:mapProductObjectFields\\(\\) has parameter \\$objectData with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Method sRewriteTable\\:\\:mapProductObjectFields\\(\\) has parameter \\$objectDataFallback with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Method sRewriteTable\\:\\:mapProductObjectFields\\(\\) has parameter \\$product with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Method sRewriteTable\\:\\:mapProductObjectFields\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Method sRewriteTable\\:\\:sCategoryPath\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Method sRewriteTable\\:\\:sCategoryPathByProductId\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Method sRewriteTable\\:\\:sCreateRewriteTableBlog\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Method sRewriteTable\\:\\:sCreateRewriteTableCampaigns\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Method sRewriteTable\\:\\:sCreateRewriteTableCategories\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Method sRewriteTable\\:\\:sCreateRewriteTableCleanup\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Method sRewriteTable\\:\\:sCreateRewriteTableContent\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Method sRewriteTable\\:\\:sCreateRewriteTableForSingleCampaign\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Method sRewriteTable\\:\\:sCreateRewriteTableForSingleCampaign\\(\\) has parameter \\$campaign with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Method sRewriteTable\\:\\:sCreateRewriteTableStatic\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Method sRewriteTable\\:\\:sSmartyCategoryPath\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Method sRewriteTable\\:\\:sSmartyCategoryPath\\(\\) should return string\\|null but returns array\\|string\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
-			count: 3
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Parameter \\#1 \\$offset of method sRewriteTable\\:\\:insertFormUrls\\(\\) expects int, int\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Parameter \\#1 \\$offset of method sRewriteTable\\:\\:insertStaticPageUrls\\(\\) expects int, int\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Parameter \\#2 \\$limit of method sRewriteTable\\:\\:insertFormUrls\\(\\) expects int, int\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Parameter \\#2 \\$limit of method sRewriteTable\\:\\:insertStaticPageUrls\\(\\) expects int, int\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Parameter \\#3 \\$fallbackShopId of method sRewriteTable\\:\\:sCreateRewriteTableForSingleCampaign\\(\\) expects int, int\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Property Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\SearchCriteria\\:\\:\\$limit \\(int\\) does not accept int\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sRewriteTable.php
-
-		-
-			message: "#^Method sSystem\\:\\:__call\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sSystem.php
-
-		-
-			message: "#^Method sSystem\\:\\:__call\\(\\) has parameter \\$params with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sSystem.php
-
-		-
-			message: "#^Method sSystem\\:\\:__get\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sSystem.php
-
-		-
-			message: "#^Method sSystem\\:\\:__get\\(\\) has parameter \\$property with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sSystem.php
-
-		-
-			message: "#^Method sSystem\\:\\:__set\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sSystem.php
-
-		-
-			message: "#^Method sSystem\\:\\:__set\\(\\) has parameter \\$property with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sSystem.php
-
-		-
-			message: "#^Method sSystem\\:\\:__set\\(\\) has parameter \\$value with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sSystem.php
-
-		-
-			message: "#^Property sSystem\\:\\:\\$sCurrency type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sSystem.php
-
-		-
-			message: "#^Property sSystem\\:\\:\\$sUSERGROUPDATA type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Core/sSystem.php
-
-		-
-			message: "#^Argument of an invalid type array\\|false supplied for foreach, only iterables are supported\\.$#"
-			count: 1
-			path: engine/Shopware/Kernel.php
-
-		-
-			message: "#^Cannot call method fetchAll\\(\\) on PDOStatement\\|false\\.$#"
-			count: 1
-			path: engine/Shopware/Kernel.php
-
-		-
-			message: "#^Cannot call method get\\(\\) on Shopware\\\\Components\\\\DependencyInjection\\\\Container\\|null\\.$#"
-			count: 2
-			path: engine/Shopware/Kernel.php
-
-		-
-			message: "#^Cannot call method setApplication\\(\\) on Shopware\\\\Components\\\\DependencyInjection\\\\Container\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Kernel.php
-
-		-
-			message: "#^Method Shopware\\\\Kernel\\:\\:addResources\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Kernel.php
-
-		-
-			message: "#^Method Shopware\\\\Kernel\\:\\:addShopwareConfig\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Kernel.php
-
-		-
-			message: "#^Method Shopware\\\\Kernel\\:\\:addShopwareConfig\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Kernel.php
-
-		-
-			message: "#^Method Shopware\\\\Kernel\\:\\:boot\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Kernel.php
-
-		-
-			message: "#^Method Shopware\\\\Kernel\\:\\:dumpContainer\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Kernel.php
-
-		-
-			message: "#^Method Shopware\\\\Kernel\\:\\:getConfig\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Kernel.php
-
-		-
-			message: "#^Method Shopware\\\\Kernel\\:\\:getContainer\\(\\) should return Shopware\\\\Components\\\\DependencyInjection\\\\Container but returns Shopware\\\\Components\\\\DependencyInjection\\\\Container\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Kernel.php
-
-		-
-			message: "#^Method Shopware\\\\Kernel\\:\\:getElasticSearchConfig\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Kernel.php
-
-		-
-			message: "#^Method Shopware\\\\Kernel\\:\\:getHttpCacheConfig\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Kernel.php
-
-		-
-			message: "#^Method Shopware\\\\Kernel\\:\\:getKernelParameters\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Kernel.php
-
-		-
-			message: "#^Method Shopware\\\\Kernel\\:\\:getRelease\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Kernel.php
-
-		-
-			message: "#^Method Shopware\\\\Kernel\\:\\:initializeConfig\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Kernel.php
-
-		-
-			message: "#^Method Shopware\\\\Kernel\\:\\:initializeContainer\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Kernel.php
-
-		-
-			message: "#^Method Shopware\\\\Kernel\\:\\:initializePlugins\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Kernel.php
-
-		-
-			message: "#^Method Shopware\\\\Kernel\\:\\:initializeShopware\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Kernel.php
-
-		-
-			message: "#^Method Shopware\\\\Kernel\\:\\:loadContentTypes\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Kernel.php
-
-		-
-			message: "#^Method Shopware\\\\Kernel\\:\\:prepareContainer\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Kernel.php
-
-		-
-			message: "#^Method Shopware\\\\Kernel\\:\\:registerBundles\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Kernel.php
-
-		-
-			message: "#^Method Shopware\\\\Kernel\\:\\:registerContainerConfiguration\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Kernel.php
-
-		-
-			message: "#^Method Shopware\\\\Kernel\\:\\:setPhpSettings\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Kernel.php
-
-		-
-			message: "#^Method Shopware\\\\Kernel\\:\\:setPhpSettings\\(\\) has parameter \\$settings with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Kernel.php
-
-		-
-			message: "#^Method Shopware\\\\Kernel\\:\\:terminate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Kernel.php
-
-		-
-			message: "#^Parameter \\#1 \\$container of class Shopware constructor expects Shopware\\\\Components\\\\DependencyInjection\\\\Container, Shopware\\\\Components\\\\DependencyInjection\\\\Container\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Kernel.php
-
-		-
-			message: "#^Parameter \\#1 \\$content of method Symfony\\\\Component\\\\Config\\\\ResourceCheckerConfigCache\\:\\:write\\(\\) expects string, array\\|string given\\.$#"
-			count: 1
-			path: engine/Shopware/Kernel.php
-
-		-
-			message: "#^Parameter \\#1 \\$source of static method Symfony\\\\Component\\\\HttpKernel\\\\Kernel\\:\\:stripComments\\(\\) expects string, array\\|string given\\.$#"
-			count: 1
-			path: engine/Shopware/Kernel.php
-
-		-
-			message: "#^Property Shopware\\\\Kernel\\:\\:\\$config type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Kernel.php
-
-		-
-			message: "#^Property Shopware\\\\Kernel\\:\\:\\$release has no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Kernel.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Article\\:\\:getAllCategories\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Article\\:\\:getCategories\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Article\\:\\:getDetails\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Article\\:\\:getLinks\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Article\\:\\:getPropertyValues\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Article\\:\\:getRelatedProductStreams\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Article\\:\\:getVotes\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Article\\:\\:setCategories\\(\\) has parameter \\$categories with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Article\\:\\:setPropertyValues\\(\\) has parameter \\$propertyValues with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Article\\:\\:setRelatedProductStreams\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Article\\:\\:setRelatedProductStreams\\(\\) has parameter \\$relatedProductStreams with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Article\\:\\:setSupplier\\(\\) has parameter \\$supplier with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Article\\:\\:setTax\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Article\\:\\:updateChangedTimestamp\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Article.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Article\\\\Article\\:\\:\\$allCategories with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Article.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Article\\\\Article\\:\\:\\$categories with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Article.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Article\\\\Article\\:\\:\\$crossBundleLook \\(int\\) does not accept default value of type false\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Article.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Article\\\\Article\\:\\:\\$customerGroups with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Article.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Article\\\\Article\\:\\:\\$details with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Article.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Article\\\\Article\\:\\:\\$esds with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Article.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Article\\\\Article\\:\\:\\$links with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Article.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Article\\\\Article\\:\\:\\$propertyValues with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Article.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Article\\\\Article\\:\\:\\$related with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Article.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Article\\\\Article\\:\\:\\$relatedProductStreams with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Article.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Article\\\\Article\\:\\:\\$similar with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Article.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Article\\\\Article\\:\\:\\$votes with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Dependency\\:\\:setChildOption\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Dependency.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Dependency\\:\\:setConfiguratorSet\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Dependency.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Dependency\\:\\:setParentOption\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Dependency.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Group\\:\\:getSets\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Group.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Group\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Group.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Group\\:\\:setDescription\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Group.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Group\\:\\:setName\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Group.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Group\\:\\:setOptions\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Group.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Group\\:\\:setPosition\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Group.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Group\\:\\:setSets\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Group.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Group\\:\\:setSets\\(\\) has parameter \\$sets with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Group.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Article\\\\Configurator\\\\Group\\:\\:\\$sets with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Group.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Option\\:\\:getDependencyChildren\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Option.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Option\\:\\:getDependencyParents\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Option.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Option\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Option.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Option\\:\\:setDependencyChildren\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Option.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Option\\:\\:setDependencyChildren\\(\\) has parameter \\$dependencyChildren with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Option.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Option\\:\\:setDependencyParents\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Option.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Option\\:\\:setDependencyParents\\(\\) has parameter \\$dependencyParents with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Option.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Option\\:\\:setGroup\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Option.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Option\\:\\:setMediaId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Option.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Option\\:\\:setName\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Option.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Option\\:\\:setPosition\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Option.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Article\\\\Configurator\\\\Option\\:\\:\\$articles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Option.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Article\\\\Configurator\\\\Option\\:\\:\\$dependencyChildren with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Option.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Article\\\\Configurator\\\\Option\\:\\:\\$dependencyParents with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Option.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Article\\\\Configurator\\\\Option\\:\\:\\$sets with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Option.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\PriceVariation\\:\\:setConfiguratorSet\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/PriceVariation.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\PriceVariation\\:\\:setIsGross\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/PriceVariation.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\PriceVariation\\:\\:setOptions\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/PriceVariation.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\PriceVariation\\:\\:setVariation\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/PriceVariation.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\:\\:getArticles\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Set.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\:\\:getDependencies\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Set.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\:\\:getGroups\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Set.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\:\\:setArticles\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Set.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\:\\:setArticles\\(\\) has parameter \\$articles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Set.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\:\\:setDependencies\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Set.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\:\\:setDependencies\\(\\) has parameter \\$dependencies with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Set.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\:\\:setName\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Set.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\:\\:setPublic\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Set.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\:\\:setType\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Set.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\:\\:\\$articles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Set.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\:\\:\\$dependencies with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Set.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\:\\:\\$groups with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Set.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\:\\:\\$priceVariations with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Set.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Template\\\\Price\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Template/Price.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Template\\\\Price\\:\\:setTemplate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Template/Price.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Template\\\\Template\\:\\:getAttribute\\(\\) should return Shopware\\\\Models\\\\Attribute\\\\Template but returns Shopware\\\\Models\\\\Attribute\\\\Template\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Template/Template.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Template\\\\Template\\:\\:getPrices\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Template/Template.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Template\\\\Template\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Template/Template.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Template\\\\Template\\:\\:setEan\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Template/Template.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Template\\\\Template\\:\\:setHeight\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Template/Template.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Template\\\\Template\\:\\:setLastStock\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Template/Template.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Template\\\\Template\\:\\:setLen\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Template/Template.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Template\\\\Template\\:\\:setUnit\\(\\) has parameter \\$unit with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Template/Template.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Template\\\\Template\\:\\:setWidth\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Template/Template.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Article\\\\Configurator\\\\Template\\\\Template\\:\\:\\$prices with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Template/Template.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Article\\\\Configurator\\\\Template\\\\Template\\:\\:\\$unit \\(Shopware\\\\Models\\\\Article\\\\Unit\\|null\\) does not accept array\\|Shopware\\\\Models\\\\Article\\\\Unit\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Configurator/Template/Template.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Detail\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Detail.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Detail\\:\\:setConfiguratorOptions\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Detail.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Detail\\:\\:setEan\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Detail.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Detail\\:\\:setEsd\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Detail.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Detail\\:\\:setHeight\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Detail.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Detail\\:\\:setLen\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Detail.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Detail\\:\\:setUnit\\(\\) has parameter \\$unit with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Detail.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Detail\\:\\:setWidth\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Detail.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Article\\\\Detail\\:\\:\\$notifications with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Detail.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Download\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Download.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Element\\:\\:setDefault\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Element.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Element\\:\\:setHelp\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Element.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Element\\:\\:setLabel\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Element.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Element\\:\\:setName\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Element.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Element\\:\\:setPosition\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Element.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Element\\:\\:setRequired\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Element.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Element\\:\\:setStore\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Element.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Element\\:\\:setTranslatable\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Element.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Element\\:\\:setType\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Element.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Element\\:\\:setVariantable\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Element.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Esd\\:\\:getSerials\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Esd.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Esd\\:\\:onPrePersist\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Esd.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Esd\\:\\:setArticle\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Esd.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Esd\\:\\:setArticleDetail\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Esd.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Esd\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Esd.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Esd\\:\\:setFile\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Esd.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Esd\\:\\:setHasSerials\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Esd.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Esd\\:\\:setMaxdownloads\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Esd.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Esd\\:\\:setNotification\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Esd.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Esd\\:\\:setSerials\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Esd.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Esd\\:\\:setSerials\\(\\) has parameter \\$serials with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Esd.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Article\\\\Esd\\:\\:\\$serials with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Esd.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\EsdSerial\\:\\:setSerialnumber\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/EsdSerial.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\:\\:getChildren\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Image.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\:\\:getMappings\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Image.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\:\\:setArticle\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Image.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\:\\:setArticleDetail\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Image.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Image.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\:\\:setChildren\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Image.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\:\\:setChildren\\(\\) has parameter \\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Image.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\:\\:setDescription\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Image.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\:\\:setExtension\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Image.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\:\\:setHeight\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Image.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\:\\:setMain\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Image.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\:\\:setMedia\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Image.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\:\\:setParent\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Image.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\:\\:setPath\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Image.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\:\\:setPosition\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Image.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\:\\:setRelations\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Image.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\:\\:setWidth\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Image.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Article\\\\Image\\:\\:\\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Image.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Article\\\\Image\\:\\:\\$mappings with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Image.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\\\Mapping\\:\\:getRules\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Image/Mapping.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\\\Mapping\\:\\:setImage\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Image/Mapping.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\\\Mapping\\:\\:setRules\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Image/Mapping.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\\\Mapping\\:\\:setRules\\(\\) has parameter \\$rules with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Image/Mapping.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Article\\\\Image\\\\Mapping\\:\\:\\$rules with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Image/Mapping.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\\\Rule\\:\\:setMapping\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Image/Rule.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\\\Rule\\:\\:setOption\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Image/Rule.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Link\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Link.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Notification\\:\\:setArticleNumber\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Notification.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Notification\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Notification.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Notification\\:\\:setMail\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Notification.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Price\\:\\:setArticle\\(\\) has parameter \\$article with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Price.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Price\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Price.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Article\\\\Price\\:\\:\\$article \\(Shopware\\\\Models\\\\Article\\\\Article\\) does not accept array\\|Shopware\\\\Models\\\\Article\\\\Article\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Price.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getAllConfiguratorOptionsIndexedByIdQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getArticleConfiguratorSetOptionIds\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getArticleDetailForTableConfiguratorOptionCombinationQueryBuilder\\(\\) has parameter \\$article with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getArticlesWithExcludedIdsQuery\\(\\) has parameter \\$filter with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getArticlesWithExcludedIdsQueryBuilder\\(\\) has parameter \\$filter with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getArticlesWithRegisteredNotificationsBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getArticlesWithRegisteredNotificationsBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getArticlesWithRegisteredNotificationsQuery\\(\\) has parameter \\$filter with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getArticlesWithRegisteredNotificationsQuery\\(\\) has parameter \\$offset with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getArticlesWithRegisteredNotificationsQuery\\(\\) has parameter \\$order with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getConfiguratorListIdsQuery\\(\\) has parameter \\$filter with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getConfiguratorListIdsQuery\\(\\) has parameter \\$limit with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getConfiguratorListIdsQuery\\(\\) has parameter \\$offset with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getConfiguratorListIdsQuery\\(\\) has parameter \\$sort with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getConfiguratorListIdsQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getConfiguratorTablePreSelectionItemQuery\\(\\) has parameter \\$article with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getConfiguratorTablePreSelectionItemQueryBuilder\\(\\) has parameter \\$article with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getDetailsByIdsQuery\\(\\) has parameter \\$sort with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getDetailsForOptionIdsQuery\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getDetailsForOptionIdsQueryBuilder\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getEsdByArticleQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getEsdByArticleQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getEsdByArticleQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getEsdByArticleQueryBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getNotificationCustomerByArticleBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getNotificationCustomerByArticleBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getNotificationCustomerByArticleQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getNotificationCustomerByArticleQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getSerialsByEsdQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getSerialsByEsdQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getSerialsByEsdQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getSerialsByEsdQueryBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getSupplierListQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getSupplierListQuery\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getSupplierListQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getSupplierListQueryBuilder\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getSuppliersWithExcludedIdsQuery\\(\\) has parameter \\$filter with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getSuppliersWithExcludedIdsQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getVoteListQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getVoteListQueryBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Parameter \\#1 \\$filter of method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getVoteListQueryBuilder\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Parameter \\#3 \\$summarize of method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getArticlesWithRegisteredNotificationsBuilder\\(\\) expects bool, bool\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\SeoCategory\\:\\:setArticle\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/SeoCategory.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\SeoCategory\\:\\:setCategory\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/SeoCategory.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\SeoCategory\\:\\:setShop\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/SeoCategory.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Supplier\\:\\:getArticles\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Supplier.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Supplier\\:\\:setArticles\\(\\) has parameter \\$articles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Supplier.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Supplier\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Supplier.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Supplier\\:\\:setMetaDescription\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Supplier.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Supplier\\:\\:setMetaKeywords\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Supplier.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Supplier\\:\\:setMetaTitle\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Supplier.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Supplier\\:\\:setPrimaryIdentifier\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Supplier.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Article\\\\Supplier\\:\\:\\$articles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Supplier.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\SupplierRepository\\:\\:getListQuery\\(\\) has parameter \\$filterBy with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/SupplierRepository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\SupplierRepository\\:\\:getListQuery\\(\\) has parameter \\$limit with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/SupplierRepository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\SupplierRepository\\:\\:getListQuery\\(\\) has parameter \\$offset with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/SupplierRepository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\SupplierRepository\\:\\:getListQuery\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/SupplierRepository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\SupplierRepository\\:\\:getListQueryBuilder\\(\\) has parameter \\$limit with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/SupplierRepository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\SupplierRepository\\:\\:getListQueryBuilder\\(\\) has parameter \\$offset with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/SupplierRepository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Unit\\:\\:getArticles\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Unit.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Unit\\:\\:setArticles\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Unit.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Unit\\:\\:setArticles\\(\\) has parameter \\$articles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Unit.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Article\\\\Unit\\:\\:\\$articles \\(Doctrine\\\\Common\\\\Collections\\\\ArrayCollection&iterable\\<Shopware\\\\Models\\\\Article\\\\Detail\\>\\) does not accept \\(Doctrine\\\\Common\\\\Collections\\\\ArrayCollection&iterable\\<Shopware\\\\Models\\\\Article\\\\Detail\\>\\)\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Unit.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Article\\\\Unit\\:\\:\\$articles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Unit.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Vote\\:\\:setArticle\\(\\) has parameter \\$article with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Vote.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Article\\\\Vote\\:\\:setShop\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Vote.php
-
-		-
-			message: "#^Parameter \\#1 \\$datetime of class DateTime constructor expects string, string\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Vote.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Article\\\\Vote\\:\\:\\$article \\(Shopware\\\\Models\\\\Article\\\\Article\\) does not accept array\\|Shopware\\\\Models\\\\Article\\\\Article\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Article/Vote.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Attribute\\\\Configuration\\:\\:setArrayStore\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Attribute/Configuration.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Attribute\\\\Configuration\\:\\:setColumnName\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Attribute/Configuration.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Attribute\\\\Configuration\\:\\:setColumnType\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Attribute/Configuration.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Attribute\\\\Configuration\\:\\:setCustom\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Attribute/Configuration.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Attribute\\\\Configuration\\:\\:setDefaultValue\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Attribute/Configuration.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Attribute\\\\Configuration\\:\\:setDisplayInBackend\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Attribute/Configuration.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Attribute\\\\Configuration\\:\\:setEntity\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Attribute/Configuration.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Attribute\\\\Configuration\\:\\:setHelpText\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Attribute/Configuration.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Attribute\\\\Configuration\\:\\:setLabel\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Attribute/Configuration.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Attribute\\\\Configuration\\:\\:setPosition\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Attribute/Configuration.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Attribute\\\\Configuration\\:\\:setSupportText\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Attribute/Configuration.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Attribute\\\\Configuration\\:\\:setTableName\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Attribute/Configuration.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Attribute\\\\Configuration\\:\\:setTranslatable\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Attribute/Configuration.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Banner\\\\Banner\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Banner/Banner.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Banner\\\\Banner\\:\\:\\$validFrom \\(DateTimeInterface\\) does not accept DateTimeInterface\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Banner/Banner.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Banner\\\\Banner\\:\\:\\$validTo \\(DateTimeInterface\\) does not accept DateTimeInterface\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Banner/Banner.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Banner\\\\Repository\\:\\:getAllActiveBanners\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Banner/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Banner\\\\Repository\\:\\:getBannerIds\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Banner/Repository.php
-
-		-
-			message: "#^Parameter \\#1 \\$categoryId of method Shopware\\\\Models\\\\Banner\\\\Repository\\:\\:getBannerIds\\(\\) expects int, int\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Banner/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Benchmark\\\\BenchmarkConfig\\:\\:getLastUpdatedOrdersDate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Benchmark/BenchmarkConfig.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Benchmark\\\\BenchmarkConfig\\:\\:setActive\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Benchmark/BenchmarkConfig.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Benchmark\\\\BenchmarkConfig\\:\\:setBatchSize\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Benchmark/BenchmarkConfig.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Benchmark\\\\BenchmarkConfig\\:\\:setCachedTemplate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Benchmark/BenchmarkConfig.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Benchmark\\\\BenchmarkConfig\\:\\:setIndustry\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Benchmark/BenchmarkConfig.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Benchmark\\\\BenchmarkConfig\\:\\:setLastAnalyticsId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Benchmark/BenchmarkConfig.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Benchmark\\\\BenchmarkConfig\\:\\:setLastCustomerId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Benchmark/BenchmarkConfig.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Benchmark\\\\BenchmarkConfig\\:\\:setLastOrderId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Benchmark/BenchmarkConfig.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Benchmark\\\\BenchmarkConfig\\:\\:setLastProductId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Benchmark/BenchmarkConfig.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Benchmark\\\\BenchmarkConfig\\:\\:setLastReceived\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Benchmark/BenchmarkConfig.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Benchmark\\\\BenchmarkConfig\\:\\:setLastSent\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Benchmark/BenchmarkConfig.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Benchmark\\\\BenchmarkConfig\\:\\:setLastUpdatedOrdersDate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Benchmark/BenchmarkConfig.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Benchmark\\\\BenchmarkConfig\\:\\:setLocked\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Benchmark/BenchmarkConfig.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Benchmark\\\\BenchmarkConfig\\:\\:setShopId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Benchmark/BenchmarkConfig.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Benchmark\\\\BenchmarkConfig\\:\\:setToken\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Benchmark/BenchmarkConfig.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Benchmark\\\\BenchmarkConfig\\:\\:setType\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Benchmark/BenchmarkConfig.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Benchmark\\\\Repository\\:\\:getAllViableShopIds\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Benchmark/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Benchmark\\\\Repository\\:\\:getShopConfigs\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Benchmark/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Benchmark\\\\Repository\\:\\:getShopIds\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Benchmark/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Benchmark\\\\Repository\\:\\:getShopsWithValidTemplate\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Benchmark/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Benchmark\\\\Repository\\:\\:getValidShops\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Benchmark/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Benchmark\\\\Repository\\:\\:lockShop\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Benchmark/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Benchmark\\\\Repository\\:\\:save\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Benchmark/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Benchmark\\\\Repository\\:\\:saveShopConfigs\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Benchmark/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Benchmark\\\\Repository\\:\\:saveShopConfigs\\(\\) has parameter \\$newConfigs with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Benchmark/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Benchmark\\\\Repository\\:\\:synchronizeShops\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Benchmark/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Benchmark\\\\Repository\\:\\:unlockShop\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Benchmark/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:getAssignedArticles\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Blog.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:getComments\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Blog.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:getMedia\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Blog.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:getTags\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Blog.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setActive\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Blog.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setAssignedArticles\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Blog.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setAssignedArticles\\(\\) has parameter \\$assignedArticles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Blog.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Blog.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setAuthor\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Blog.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setCategory\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Blog.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setCategoryId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Blog.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setDescription\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Blog.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setDisplayDate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Blog.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setMetaDescription\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Blog.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setMetaKeyWords\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Blog.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setMetaTitle\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Blog.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setShortDescription\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Blog.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setTags\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Blog.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setTags\\(\\) has parameter \\$tags with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Blog.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setTemplate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Blog.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setTitle\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Blog.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setViews\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Blog.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:\\$assignedArticles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Blog.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:\\$comments with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Blog.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:\\$displayDate \\(DateTimeInterface\\) does not accept DateTimeInterface\\|string\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Blog.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:\\$media with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Blog.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:\\$tags with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Blog.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Comment\\:\\:setActive\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Comment.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Comment\\:\\:setBlog\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Comment.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Comment\\:\\:setComment\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Comment.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Comment\\:\\:setCreationDate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Comment.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Comment\\:\\:setEmail\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Comment.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Comment\\:\\:setHeadline\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Comment.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Comment\\:\\:setName\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Comment.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Comment\\:\\:setPoints\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Comment.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Comment\\:\\:setShop\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Comment.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Comment\\:\\:setShopId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Comment.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Blog\\\\Comment\\:\\:\\$creationDate \\(DateTimeInterface\\) does not accept DateTimeInterface\\|string\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Comment.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Media\\:\\:setBlog\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Media.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Media\\:\\:setMedia\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Media.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Media\\:\\:setPreview\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Media.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getAuthorFilterQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getAuthorFilterQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getBackedDetailQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getBackendDetailQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getBackendListQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getBackendListQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getBlogCommentsById\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getBlogCommentsById\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getBlogCommentsByIdBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getDisplayDateFilterQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getDisplayDateFilterQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getFilterQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getListQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getListQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getTagsFilterQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getTagsFilterQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Repository.php
-
-		-
-			message: "#^Parameter \\#2 \\$filter of method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getBackendListQueryBuilder\\(\\) expects array, array\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Repository.php
-
-		-
-			message: "#^Parameter \\#2 \\$filter of method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getListQueryBuilder\\(\\) expects array, array\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Tag\\:\\:setBlog\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Tag.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Tag\\:\\:setName\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Blog/Tag.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:getAllArticles\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Category/Category.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:getArticles\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Category/Category.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:getChildren\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Category/Category.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:getCustomerGroups\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Category/Category.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:getEmotions\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Category/Category.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:getManualSorting\\(\\) return type with generic interface Doctrine\\\\Common\\\\Collections\\\\Collection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Category/Category.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:setArticles\\(\\) has parameter \\$articles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Category/Category.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Category/Category.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:setBlog\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Category/Category.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:setChildren\\(\\) has parameter \\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Category/Category.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:setCustomerGroups\\(\\) has parameter \\$customerGroups with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Category/Category.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:setEmotions\\(\\) has parameter \\$emotions with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Category/Category.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:setExternalTarget\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Category/Category.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:setFacetIds\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Category/Category.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:setHideSortings\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Category/Category.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:setMetaTitle\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Category/Category.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:setPrimaryIdentifier\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Category/Category.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:setSortingIds\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Category/Category.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:setStream\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Category/Category.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Category\\\\Category\\:\\:\\$allArticles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Category/Category.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Category\\\\Category\\:\\:\\$articles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Category/Category.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Category\\\\Category\\:\\:\\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Category/Category.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Category\\\\Category\\:\\:\\$customerGroups with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Category/Category.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Category\\\\Category\\:\\:\\$emotions with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Category/Category.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Category\\\\Category\\:\\:\\$manualSorting with generic interface Doctrine\\\\Common\\\\Collections\\\\Collection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Category/Category.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Category\\\\Repository\\:\\:getActiveArticleIdByCategoryId\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Category/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Category\\\\Repository\\:\\:getActiveChildrenList\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Category/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Category\\\\Repository\\:\\:getActiveChildrenTree\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Category/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Category\\\\Repository\\:\\:getBlogCategoryTreeListQuery\\(\\) has parameter \\$filterBy with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Category/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Category\\\\Repository\\:\\:getCategoryPathBefore\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Category/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Category\\\\Repository\\:\\:getFullChildrenList\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Category/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Category\\\\Repository\\:\\:getListQuery\\(\\) has parameter \\$filterBy with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Category/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Category\\\\Repository\\:\\:getListQuery\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Category/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Category\\\\Repository\\:\\:getPathById\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Category/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\CommentConfirm\\\\CommentConfirm\\:\\:setCreationDate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/CommentConfirm/CommentConfirm.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\CommentConfirm\\\\CommentConfirm\\:\\:setData\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/CommentConfirm/CommentConfirm.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\CommentConfirm\\\\CommentConfirm\\:\\:setHash\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/CommentConfirm/CommentConfirm.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\CommentConfirm\\\\CommentConfirm\\:\\:setType\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/CommentConfirm/CommentConfirm.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\CommentConfirm\\\\CommentConfirm\\:\\:\\$creationDate \\(DateTimeInterface\\) does not accept DateTimeInterface\\|string\\.$#"
-			count: 1
-			path: engine/Shopware/Models/CommentConfirm/CommentConfirm.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Config\\\\Element\\:\\:__construct\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Config/Element.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Config\\\\Element\\:\\:getOptions\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Config/Element.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Config\\\\Element\\:\\:getTranslations\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Config/Element.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Config\\\\Element\\:\\:getValues\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Config/Element.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Config\\\\Element\\:\\:setForm\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Config/Element.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Config\\\\Element\\:\\:setOptions\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Config/Element.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Config\\\\Element\\:\\:setOptions\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Config/Element.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Config\\\\Element\\:\\:setTranslations\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Config/Element.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Config\\\\Element\\:\\:setTranslations\\(\\) has parameter \\$translations with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Config/Element.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Config\\\\Element\\:\\:setValues\\(\\) has parameter \\$values with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Config/Element.php
-
-		-
-			message: "#^Parameter \\#1 \\$options of method Shopware\\\\Models\\\\Config\\\\Element\\:\\:setOptions\\(\\) expects array, array\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Config/Element.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Config\\\\Element\\:\\:\\$options type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Config/Element.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Config\\\\Element\\:\\:\\$translations with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Config/Element.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Config\\\\Element\\:\\:\\$values with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Config/Element.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Config\\\\ElementTranslation\\:\\:setLocale\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Config/ElementTranslation.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Config\\\\Form\\:\\:addElement\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Config/Form.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Config\\\\Form\\:\\:getChildren\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Config/Form.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Config\\\\Form\\:\\:getElements\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Config/Form.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Config\\\\Form\\:\\:getTranslations\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Config/Form.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Config\\\\Form\\:\\:setChildren\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Config/Form.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Config\\\\Form\\:\\:setChildren\\(\\) has parameter \\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Config/Form.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Config\\\\Form\\:\\:setElement\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Config/Form.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Config\\\\Form\\:\\:setParent\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Config/Form.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Config\\\\Form\\:\\:setPluginId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Config/Form.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Config\\\\Form\\:\\:setPosition\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Config/Form.php
-
-		-
-			message: "#^Parameter \\#2 \\$name of class Shopware\\\\Models\\\\Config\\\\Element constructor expects string, string\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Config/Form.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Config\\\\Form\\:\\:\\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Config/Form.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Config\\\\Form\\:\\:\\$elements with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Config/Form.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Config\\\\Form\\:\\:\\$translations with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Config/Form.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Config\\\\FormTranslation\\:\\:setForm\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Config/FormTranslation.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Config\\\\FormTranslation\\:\\:setLocale\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Config/FormTranslation.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Country\\\\Area\\:\\:getCountries\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Country/Area.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Country\\\\Area\\:\\:\\$countries with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Country/Area.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Country\\\\Country\\:\\:getPayments\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Country/Country.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Country\\\\Country\\:\\:getStates\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Country/Country.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Country\\\\Country\\:\\:setAllowShipping\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Country/Country.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Country\\\\Country\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Country/Country.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Country\\\\Country\\:\\:setDisplayStateInRegistration\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Country/Country.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Country\\\\Country\\:\\:setForceStateInRegistration\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Country/Country.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Country\\\\Country\\:\\:setPayments\\(\\) has parameter \\$payments with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Country/Country.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Country\\\\Country\\:\\:\\$payments with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Country/Country.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Country\\\\Country\\:\\:\\$states with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Country/Country.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Country\\\\Repository\\:\\:getCountriesQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Country/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Country\\\\Repository\\:\\:getCountriesQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Country/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Country\\\\Repository\\:\\:getCountriesQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Country/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Country\\\\Repository\\:\\:getCountriesQueryBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Country/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Country\\\\Repository\\:\\:getCountriesWithStatesQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Country/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Country\\\\Repository\\:\\:getCountriesWithStatesQueryBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Country/Repository.php
-
-		-
-			message: "#^Offset 0 does not exist on array\\|null\\.$#"
-			count: 2
-			path: engine/Shopware/Models/Country/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Country\\\\State\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Country/State.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Country\\\\State\\:\\:setPosition\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Country/State.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:getAdditional\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Address.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setAdditional\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Address.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setAdditional\\(\\) has parameter \\$additional with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Address.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setAdditionalAddressLine1\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Address.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setAdditionalAddressLine2\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Address.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Address.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setCity\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Address.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setCompany\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Address.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setCountry\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Address.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setCustomer\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Address.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setDepartment\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Address.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setFirstname\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Address.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setLastname\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Address.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setPhone\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Address.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setSalutation\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Address.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setState\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Address.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setStreet\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Address.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setTitle\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Address.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setVatId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Address.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setZipcode\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Address.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Customer\\\\Address\\:\\:\\$additional type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Address.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\AddressRepository\\:\\:getListArray\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/AddressRepository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\AddressRepository\\:\\:getListQuery\\(\\) has parameter \\$criteria with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/AddressRepository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\AddressRepository\\:\\:getListQuery\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/AddressRepository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\AddressRepository\\:\\:getListQueryBuilder\\(\\) has parameter \\$filterBy with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/AddressRepository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\AddressRepository\\:\\:getListQueryBuilder\\(\\) has parameter \\$limit with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/AddressRepository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\AddressRepository\\:\\:getListQueryBuilder\\(\\) has parameter \\$offset with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/AddressRepository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:addPaymentData\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:getAdditional\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:getOrders\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:getPaymentInstances\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:onSave\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:onUpdate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setAdditional\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setAdditional\\(\\) has parameter \\$additional with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setBirthday\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setCustomerType\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setDoubleOptinConfirmDate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setDoubleOptinEmailSentDate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setDoubleOptinRegister\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setEncoderName\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setFirstname\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setGroup\\(\\) has parameter \\$group with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setLanguageSubShop\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setLastname\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setNumber\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setOrders\\(\\) has parameter \\$orders with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setPaymentData\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setPaymentData\\(\\) has parameter \\$paymentData with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setPaymentId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setPaymentInstances\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setPaymentInstances\\(\\) has parameter \\$paymentInstances with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setPriceGroup\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setRawPassword\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setSalutation\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setShop\\(\\) has parameter \\$shop with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setTitle\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:updateChangedTimestamp\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Parameter \\#1 \\$datetime of class DateTime constructor expects string, string\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:\\$additional type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:\\$firstLogin \\(DateTimeInterface\\) does not accept DateTimeInterface\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:\\$hashPassword \\(string\\) does not accept null\\.$#"
-			count: 2
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:\\$lastLogin \\(DateTimeInterface\\) does not accept DateTimeInterface\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:\\$notifications with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:\\$orders with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:\\$paymentInstances with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:\\$shop \\(Shopware\\\\Models\\\\Shop\\\\Shop\\) does not accept array\\|Shopware\\\\Models\\\\Shop\\\\Shop\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Customer.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Group\\:\\:getDiscounts\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Group.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Group\\:\\:setAttribute\\(\\) has parameter \\$attribute with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Group.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Group\\:\\:setDiscounts\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Group.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Group\\:\\:setDiscounts\\(\\) has parameter \\$discounts with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Group.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Group\\:\\:toArray\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Group.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Customer\\\\Group\\:\\:\\$customers with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Group.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Customer\\\\Group\\:\\:\\$discounts with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Group.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\PaymentData\\:\\:setAccountHolder\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/PaymentData.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\PaymentData\\:\\:setAccountNumber\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/PaymentData.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\PaymentData\\:\\:setBankCode\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/PaymentData.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\PaymentData\\:\\:setBankName\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/PaymentData.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\PaymentData\\:\\:setBic\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/PaymentData.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\PaymentData\\:\\:setCreatedAt\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/PaymentData.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\PaymentData\\:\\:setCustomer\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/PaymentData.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\PaymentData\\:\\:setIban\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/PaymentData.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\PaymentData\\:\\:setPaymentMean\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/PaymentData.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\PaymentData\\:\\:setUseBillingData\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/PaymentData.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\PriceGroup\\:\\:getCustomers\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/PriceGroup.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\PriceGroup\\:\\:setCustomers\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/PriceGroup.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\PriceGroup\\:\\:setCustomers\\(\\) has parameter \\$customers with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/PriceGroup.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Customer\\\\PriceGroup\\:\\:\\$customers with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/PriceGroup.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Repository\\:\\:getOrdersQuery\\(\\) has parameter \\$filter with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Repository\\:\\:getOrdersQuery\\(\\) has parameter \\$orderBy with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Repository\\:\\:getOrdersQueryBuilder\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Customer/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\CustomerStream\\\\CustomerStream\\:\\:getAttribute\\(\\) should return Shopware\\\\Models\\\\Attribute\\\\CustomerStream but returns Shopware\\\\Models\\\\Attribute\\\\CustomerStream\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Models/CustomerStream/CustomerStream.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\CustomerStream\\\\CustomerStream\\:\\:getName\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/CustomerStream/CustomerStream.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\CustomerStream\\\\CustomerStream\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/CustomerStream/CustomerStream.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\CustomerStream\\\\CustomerStream\\:\\:setConditions\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/CustomerStream/CustomerStream.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\CustomerStream\\\\CustomerStream\\:\\:setDescription\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/CustomerStream/CustomerStream.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\CustomerStream\\\\CustomerStream\\:\\:setFreezeUp\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/CustomerStream/CustomerStream.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\CustomerStream\\\\CustomerStream\\:\\:setName\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/CustomerStream/CustomerStream.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\CustomerStream\\\\CustomerStream\\:\\:setStatic\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/CustomerStream/CustomerStream.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\CustomerStream\\\\CustomerStreamRepository\\:\\:fetchAmountPerStreamChart\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/CustomerStream/CustomerStreamRepository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\CustomerStream\\\\CustomerStreamRepository\\:\\:fetchBackendListing\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/CustomerStream/CustomerStreamRepository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\CustomerStream\\\\CustomerStreamRepository\\:\\:fetchCustomerAmount\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/CustomerStream/CustomerStreamRepository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\CustomerStream\\\\CustomerStreamRepository\\:\\:fetchSearchIndexIds\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/CustomerStream/CustomerStreamRepository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\CustomerStream\\\\CustomerStreamRepository\\:\\:fetchStreamsCustomerCount\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/CustomerStream/CustomerStreamRepository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\CustomerStream\\\\CustomerStreamRepository\\:\\:fetchStreamsForCustomers\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/CustomerStream/CustomerStreamRepository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\CustomerStream\\\\CustomerStreamRepositoryInterface\\:\\:fetchAmountPerStreamChart\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/CustomerStream/CustomerStreamRepositoryInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\CustomerStream\\\\CustomerStreamRepositoryInterface\\:\\:fetchBackendListing\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/CustomerStream/CustomerStreamRepositoryInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\CustomerStream\\\\CustomerStreamRepositoryInterface\\:\\:fetchCustomerAmount\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/CustomerStream/CustomerStreamRepositoryInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\CustomerStream\\\\CustomerStreamRepositoryInterface\\:\\:fetchSearchIndexIds\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/CustomerStream/CustomerStreamRepositoryInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\CustomerStream\\\\CustomerStreamRepositoryInterface\\:\\:fetchStreamsCustomerCount\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/CustomerStream/CustomerStreamRepositoryInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\CustomerStream\\\\CustomerStreamRepositoryInterface\\:\\:fetchStreamsForCustomers\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/CustomerStream/CustomerStreamRepositoryInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\:\\:getCategories\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/Dispatch.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\:\\:getCostsMatrix\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/Dispatch.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\:\\:getCountries\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/Dispatch.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\:\\:getHolidays\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/Dispatch.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\:\\:getPayments\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/Dispatch.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/Dispatch.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\:\\:setCategories\\(\\) has parameter \\$categories with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/Dispatch.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\:\\:setCountries\\(\\) has parameter \\$countries with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/Dispatch.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\:\\:setHolidays\\(\\) has parameter \\$holidays with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/Dispatch.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\:\\:setPayments\\(\\) has parameter \\$payments with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/Dispatch.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\:\\:\\$categories with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/Dispatch.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\:\\:\\$costsMatrix with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/Dispatch.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\:\\:\\$countries with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/Dispatch.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\:\\:\\$holidays with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/Dispatch.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\:\\:\\$payments with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/Dispatch.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getCountryQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getCountryQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getCountryQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getCountryQueryBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getDispatchesQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getDispatchesQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getHolidayQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getHolidayQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getHolidayQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getHolidayQueryBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getListQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getListQueryBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getPaymentQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getPaymentQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getPaymentQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getPaymentQueryBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getShippingCostsQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getShippingCostsQueryBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:sortOrderQuery\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\ShippingCost\\:\\:setDispatch\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/ShippingCost.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\ShippingCost\\:\\:setDispatch\\(\\) has parameter \\$dispatch with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/ShippingCost.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Dispatch\\\\ShippingCost\\:\\:\\$dispatch \\(Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\) does not accept array\\|Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Dispatch/ShippingCost.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Document\\\\Document\\:\\:getElements\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Document/Document.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Document\\\\Document\\:\\:setElements\\(\\) has parameter \\$elements with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Document/Document.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Document\\\\Document\\:\\:\\$elements with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Document/Document.php
-
-		-
-			message: "#^Property Shopware_Models_Document_Order\\:\\:\\$_billing \\(ArrayObject\\|null\\) does not accept array\\<string, ArrayObject\\<string, mixed\\>\\>\\|ArrayObject\\.$#"
-			count: 2
-			path: engine/Shopware/Models/Document/Order.php
-
-		-
-			message: "#^Property Shopware_Models_Document_Order\\:\\:\\$_billing \\(ArrayObject\\|null\\) does not accept array\\<string, array\\>\\|ArrayObject\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Document/Order.php
-
-		-
-			message: "#^Property Shopware_Models_Document_Order\\:\\:\\$_billing with generic class ArrayObject does not specify its types\\: TKey, TValue$#"
-			count: 1
-			path: engine/Shopware/Models/Document/Order.php
-
-		-
-			message: "#^Property Shopware_Models_Document_Order\\:\\:\\$_config type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Document/Order.php
-
-		-
-			message: "#^Property Shopware_Models_Document_Order\\:\\:\\$_currency with generic class ArrayObject does not specify its types\\: TKey, TValue$#"
-			count: 1
-			path: engine/Shopware/Models/Document/Order.php
-
-		-
-			message: "#^Property Shopware_Models_Document_Order\\:\\:\\$_dispatch with generic class ArrayObject does not specify its types\\: TKey, TValue$#"
-			count: 1
-			path: engine/Shopware/Models/Document/Order.php
-
-		-
-			message: "#^Property Shopware_Models_Document_Order\\:\\:\\$_order with generic class ArrayObject does not specify its types\\: TKey, TValue$#"
-			count: 1
-			path: engine/Shopware/Models/Document/Order.php
-
-		-
-			message: "#^Property Shopware_Models_Document_Order\\:\\:\\$_payment with generic class ArrayObject does not specify its types\\: TKey, TValue$#"
-			count: 1
-			path: engine/Shopware/Models/Document/Order.php
-
-		-
-			message: "#^Property Shopware_Models_Document_Order\\:\\:\\$_paymentInstances with generic class ArrayObject does not specify its types\\: TKey, TValue$#"
-			count: 1
-			path: engine/Shopware/Models/Document/Order.php
-
-		-
-			message: "#^Property Shopware_Models_Document_Order\\:\\:\\$_positions with generic class ArrayObject does not specify its types\\: TKey, TValue$#"
-			count: 1
-			path: engine/Shopware/Models/Document/Order.php
-
-		-
-			message: "#^Property Shopware_Models_Document_Order\\:\\:\\$_shipping \\(ArrayObject\\|null\\) does not accept array\\<string, ArrayObject\\<string, mixed\\>\\>\\|ArrayObject\\.$#"
-			count: 2
-			path: engine/Shopware/Models/Document/Order.php
-
-		-
-			message: "#^Property Shopware_Models_Document_Order\\:\\:\\$_shipping \\(ArrayObject\\|null\\) does not accept array\\<string, array\\>\\|ArrayObject\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Document/Order.php
-
-		-
-			message: "#^Property Shopware_Models_Document_Order\\:\\:\\$_shipping \\(ArrayObject\\|null\\) does not accept array\\<string, mixed\\>\\|ArrayObject\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Document/Order.php
-
-		-
-			message: "#^Property Shopware_Models_Document_Order\\:\\:\\$_shipping with generic class ArrayObject does not specify its types\\: TKey, TValue$#"
-			count: 1
-			path: engine/Shopware/Models/Document/Order.php
-
-		-
-			message: "#^Property Shopware_Models_Document_Order\\:\\:\\$_tax type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Document/Order.php
-
-		-
-			message: "#^Property Shopware_Models_Document_Order\\:\\:\\$_user with generic class ArrayObject does not specify its types\\: TKey, TValue$#"
-			count: 1
-			path: engine/Shopware/Models/Document/Order.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Data\\:\\:setComponent\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Data.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Data\\:\\:setComponentId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Data.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Data\\:\\:setElement\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Data.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Data\\:\\:setElementId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Data.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Data\\:\\:setEmotion\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Data.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Data\\:\\:setEmotionId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Data.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Data\\:\\:setField\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Data.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Data\\:\\:setFieldId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Data.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Data\\:\\:setValue\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Data.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Element\\:\\:getData\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Element.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Element\\:\\:getViewports\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Element.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Element\\:\\:setComponent\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Element.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Element\\:\\:setCssClass\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Element.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Element\\:\\:setEmotion\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Element.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Element\\:\\:setEndCol\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Element.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Element\\:\\:setEndRow\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Element.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Element\\:\\:setStartCol\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Element.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Element\\:\\:setStartRow\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Element.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Emotion\\\\Element\\:\\:\\$data with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Element.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Emotion\\\\Element\\:\\:\\$viewports with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Element.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\ElementViewport\\:\\:setAlias\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/ElementViewport.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\ElementViewport\\:\\:setElement\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/ElementViewport.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\ElementViewport\\:\\:setEmotion\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/ElementViewport.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\ElementViewport\\:\\:setEndCol\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/ElementViewport.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\ElementViewport\\:\\:setEndRow\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/ElementViewport.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\ElementViewport\\:\\:setId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/ElementViewport.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\ElementViewport\\:\\:setStartCol\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/ElementViewport.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\ElementViewport\\:\\:setStartRow\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/ElementViewport.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\ElementViewport\\:\\:setVisible\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/ElementViewport.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:getCategories\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:getElements\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:getMode\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:getShops\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setActive\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setArticleHeight\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setCategories\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setCategories\\(\\) has parameter \\$categories with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setCellHeight\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setCellSpacing\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setCols\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setCreateDate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setCustomerStreamIds\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setDevice\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setFullscreen\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setIsLandingPage\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setListingVisibility\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setMode\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setMode\\(\\) has parameter \\$mode with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setModified\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setName\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setParentId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setPosition\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setPreviewId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setPreviewSecret\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setReplacement\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setRows\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setSeoDescription\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setSeoKeywords\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setSeoTitle\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setShops\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setShops\\(\\) has parameter \\$shops with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setShowListing\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setTemplate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setValidFrom\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setValidTo\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:\\$categories with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:\\$elements with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:\\$shops with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Emotion.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Component\\:\\:createField\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Library/Component.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Component\\:\\:getMaxPositionValue\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Library/Component.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Component\\:\\:setCls\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Library/Component.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Component\\:\\:setConvertFunction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Library/Component.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Component\\:\\:setDescription\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Library/Component.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Component\\:\\:setName\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Library/Component.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Component\\:\\:setPlugin\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Library/Component.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Component\\:\\:setPluginId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Library/Component.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Component\\:\\:setTemplate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Library/Component.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Component\\:\\:setXType\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Library/Component.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Field\\:\\:setAllowBlank\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Library/Field.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Field\\:\\:setComponent\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Library/Field.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Field\\:\\:setComponentId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Library/Field.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Field\\:\\:setDefaultValue\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Library/Field.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Field\\:\\:setDisplayField\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Library/Field.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Field\\:\\:setFieldLabel\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Library/Field.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Field\\:\\:setHelpText\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Library/Field.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Field\\:\\:setHelpTitle\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Library/Field.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Field\\:\\:setName\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Library/Field.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Field\\:\\:setPosition\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Library/Field.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Field\\:\\:setStore\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Library/Field.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Field\\:\\:setSupportText\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Library/Field.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Field\\:\\:setTranslatable\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Library/Field.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Field\\:\\:setValueField\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Library/Field.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Field\\:\\:setValueType\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Library/Field.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Field\\:\\:setXType\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Library/Field.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Preset\\:\\:getTranslations\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Preset.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Preset\\:\\:setAssetsImported\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Preset.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Preset\\:\\:setCustom\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Preset.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Preset\\:\\:setEmotionTranslations\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Preset.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Preset\\:\\:setHidden\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Preset.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Preset\\:\\:setName\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Preset.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Preset\\:\\:setPremium\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Preset.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Preset\\:\\:setPresetData\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Preset.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Preset\\:\\:setPreview\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Preset.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Preset\\:\\:setRequiredPlugins\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Preset.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Preset\\:\\:setThumbnail\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Preset.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Emotion\\\\Preset\\:\\:\\$translations with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Preset.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\PresetTranslation\\:\\:setDescription\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/PresetTranslation.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\PresetTranslation\\:\\:setLabel\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/PresetTranslation.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\PresetTranslation\\:\\:setLocale\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/PresetTranslation.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\PresetTranslation\\:\\:setPreset\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/PresetTranslation.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Repository\\:\\:getListingQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Repository\\:\\:getNameListQuery\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Template\\:\\:setFile\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Template.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Template\\:\\:setName\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Template.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Emotion\\\\Template\\:\\:\\$emotions with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Emotion/Template.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Form\\\\Field\\:\\:onPrePersist\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Form/Field.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Form\\\\Form\\:\\:getFields\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Form/Form.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Form\\\\Form\\:\\:setActive\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Form/Form.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Form\\\\Form\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Form/Form.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Form\\\\Form\\:\\:setMetaDescription\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Form/Form.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Form\\\\Form\\:\\:setMetaKeywords\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Form/Form.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Form\\\\Form\\:\\:setMetaTitle\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Form/Form.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Form\\\\Form\\:\\:setShopIds\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Form/Form.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Form\\\\Form\\:\\:\\$fields with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Form/Form.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Form\\\\Repository\\:\\:getListQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Form/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Form\\\\Repository\\:\\:getListQuery\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Form/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Form\\\\Repository\\:\\:getListQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Form/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Form\\\\Repository\\:\\:getListQueryBuilder\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Form/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Mail\\\\Attachment\\:\\:setShop\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Mail/Attachment.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Mail\\\\File\\:\\:getFileName\\(\\) should return string but returns bool\\|string\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Mail/File.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Mail\\\\Log\\:\\:getDocuments\\(\\) return type with generic interface Doctrine\\\\Common\\\\Collections\\\\Collection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Mail/Log.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Mail\\\\Log\\:\\:getRecipients\\(\\) return type with generic interface Doctrine\\\\Common\\\\Collections\\\\Collection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Mail/Log.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Mail\\\\Log\\:\\:setDocuments\\(\\) has parameter \\$documents with generic interface Doctrine\\\\Common\\\\Collections\\\\Collection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Mail/Log.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Mail\\\\Log\\:\\:setRecipients\\(\\) has parameter \\$recipients with generic interface Doctrine\\\\Common\\\\Collections\\\\Collection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Mail/Log.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Mail\\\\Log\\:\\:\\$documents with generic interface Doctrine\\\\Common\\\\Collections\\\\Collection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Mail/Log.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Mail\\\\Log\\:\\:\\$recipients with generic interface Doctrine\\\\Common\\\\Collections\\\\Collection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Mail/Log.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Mail\\\\LogRepository\\:\\:deleteByDate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Mail/LogRepository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Mail\\\\LogRepository\\:\\:findByDate\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Mail/LogRepository.php
-
-		-
-			message: "#^Interface Shopware\\\\Models\\\\Mail\\\\LogRepositoryInterface extends generic interface Doctrine\\\\Common\\\\Collections\\\\Selectable but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Mail/LogRepositoryInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Mail\\\\LogRepositoryInterface\\:\\:deleteByDate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Mail/LogRepositoryInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Mail\\\\LogRepositoryInterface\\:\\:findByDate\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Mail/LogRepositoryInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Mail\\\\Mail\\:\\:arrayGetPath\\(\\) has parameter \\$array with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Mail/Mail.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Mail\\\\Mail\\:\\:arrayGetPath\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Mail/Mail.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Mail\\\\Mail\\:\\:getContext\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Mail/Mail.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Mail\\\\Mail\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Mail/Mail.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Mail\\\\Mail\\:\\:setContext\\(\\) has parameter \\$context with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Mail/Mail.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Mail\\\\Mail\\:\\:setDirty\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Mail/Mail.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Mail\\\\Mail\\:\\:setTranslation\\(\\) has parameter \\$translation with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Mail/Mail.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Mail\\\\Mail\\:\\:\\$attachments with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Mail/Mail.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Mail\\\\Mail\\:\\:\\$context type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Mail/Mail.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Mail\\\\Mail\\:\\:\\$translation type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Mail/Mail.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Mail\\\\Repository\\:\\:getMailListQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Mail/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Mail\\\\Repository\\:\\:getMailListQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Mail/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Mail\\\\Repository\\:\\:getMailsListQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Mail/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Mail\\\\Repository\\:\\:getMailsListQueryBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Mail/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Album\\:\\:getChildren\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Album.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Album\\:\\:getMedia\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Album.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Album\\:\\:onRemove\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Album.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Album\\:\\:setChildren\\(\\) has parameter \\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Album.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Album\\:\\:setChildren\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Album.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Album\\:\\:setMedia\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Album.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Album\\:\\:setMedia\\(\\) has parameter \\$media with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Album.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Media\\\\Album\\:\\:\\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Album.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Media\\\\Album\\:\\:\\$media with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Album.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:createAlbumThumbnails\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:createDefaultThumbnails\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:createThumbnail\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:getAllThumbnailSizes\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:getArticles\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:getCreatedThumbnails\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:getDefaultThumbnails\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:getHighDpiThumbnails\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:getProperties\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:getThumbnailFilePaths\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:getThumbnailNames\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:getThumbnails\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:loadThumbnails\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:onLoad\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:onRemove\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:onSave\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:onUpdate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:removeAlbumThumbnails\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:removeAlbumThumbnails\\(\\) has parameter \\$thumbnailSizes with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:removeDefaultThumbnails\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:removeThumbnails\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:setArticles\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:setArticles\\(\\) has parameter \\$articles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:setDefaultThumbnails\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:setDefaultThumbnails\\(\\) has parameter \\$defaultThumbnails with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:setFileInfo\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:setHeight\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:setProperties\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:setProperties\\(\\) has parameter \\$properties with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:setWidth\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:updateAssociations\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Parameter \\#1 \\$fileName of method Shopware\\\\Models\\\\Media\\\\Media\\:\\:removeDefaultThumbnails\\(\\) expects string, bool\\|string given\\.$#"
-			count: 2
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Parameter \\#2 \\$contents of method Shopware\\\\Bundle\\\\MediaBundle\\\\MediaService\\:\\:write\\(\\) expects string, string\\|false given\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Parameter \\#2 \\$fileName of method Shopware\\\\Models\\\\Media\\\\Media\\:\\:removeAlbumThumbnails\\(\\) expects string, bool\\|string given\\.$#"
-			count: 2
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Parameter \\#3 \\$subject of function preg_replace expects array\\|string, string\\|false given\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Parameter \\#3 \\$subject of function preg_replace expects array\\|string, string\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Parameter \\#3 \\$subject of function str_replace expects array\\|string, bool\\|string given\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Media\\\\Media\\:\\:\\$articles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Media\\\\Media\\:\\:\\$blogMedia with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Media\\\\Media\\:\\:\\$defaultThumbnails type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Media\\\\Media\\:\\:\\$highDpiThumbnails type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Media\\\\Media\\:\\:\\$properties with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Media\\\\Media\\:\\:\\$thumbnails type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Media\\\\Media\\:\\:\\$type \\(string\\) does not accept string\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Media.php
-
-		-
-			message: "#^Cannot access property \\$height on SimpleXMLElement\\|null\\.$#"
-			count: 2
-			path: engine/Shopware/Models/Media/MediaSubscriber.php
-
-		-
-			message: "#^Cannot access property \\$viewBox on SimpleXMLElement\\|null\\.$#"
-			count: 2
-			path: engine/Shopware/Models/Media/MediaSubscriber.php
-
-		-
-			message: "#^Cannot access property \\$width on SimpleXMLElement\\|null\\.$#"
-			count: 2
-			path: engine/Shopware/Models/Media/MediaSubscriber.php
-
-		-
-			message: "#^Parameter \\#1 \\$data of function simplexml_load_string expects string, string\\|false given\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/MediaSubscriber.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Repository\\:\\:getAlbumMediaQuery\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Repository\\:\\:getAlbumMediaQuery\\(\\) has parameter \\$validTypes with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Repository\\:\\:getAlbumMediaQueryBuilder\\(\\) has parameter \\$validTypes with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Repository\\:\\:getMediaListQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Repository\\:\\:getMediaListQuery\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Repository.php
-
-		-
-			message: "#^Parameter \\#3 \\$orderBy of method Shopware\\\\Models\\\\Media\\\\Repository\\:\\:getAlbumMediaQueryBuilder\\(\\) expects Doctrine\\\\ORM\\\\Query\\\\Expr\\\\OrderBy\\|string\\|null, array\\|Doctrine\\\\ORM\\\\Query\\\\Expr\\\\OrderBy\\|string\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Settings\\:\\:getThumbnailSize\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Settings.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Settings\\:\\:setAlbum\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Settings.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Settings\\:\\:setThumbnailHighDpi\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Settings.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Settings\\:\\:setThumbnailHighDpiQuality\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Settings.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Settings\\:\\:setThumbnailQuality\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Settings.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Media\\\\Settings\\:\\:setThumbnailSize\\(\\) has parameter \\$thumbnailSize with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Media/Settings.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Menu\\\\Menu\\:\\:getChildren\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Menu/Menu.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Menu\\\\Menu\\:\\:setAction\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Menu/Menu.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Menu\\\\Menu\\:\\:setActive\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Menu/Menu.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Menu\\\\Menu\\:\\:setChildren\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Menu/Menu.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Menu\\\\Menu\\:\\:setChildren\\(\\) has parameter \\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Menu/Menu.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Menu\\\\Menu\\:\\:setClass\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Menu/Menu.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Menu\\\\Menu\\:\\:setContentType\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Menu/Menu.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Menu\\\\Menu\\:\\:setController\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Menu/Menu.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Menu\\\\Menu\\:\\:setLabel\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Menu/Menu.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Menu\\\\Menu\\:\\:setOnclick\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Menu/Menu.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Menu\\\\Menu\\:\\:setParent\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Menu/Menu.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Menu\\\\Menu\\:\\:setPlugin\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Menu/Menu.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Menu\\\\Menu\\:\\:setPluginId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Menu/Menu.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Menu\\\\Menu\\:\\:setPosition\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Menu/Menu.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Menu\\\\Menu\\:\\:setShortcut\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Menu/Menu.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Menu\\\\Menu\\:\\:\\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Menu/Menu.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Backup\\:\\:setDate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/MultiEdit/Backup.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Backup\\:\\:setFilterString\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/MultiEdit/Backup.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Backup\\:\\:setHash\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/MultiEdit/Backup.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Backup\\:\\:setItems\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/MultiEdit/Backup.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Backup\\:\\:setOperationString\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/MultiEdit/Backup.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Backup\\:\\:setPath\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/MultiEdit/Backup.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Backup\\:\\:setSize\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/MultiEdit/Backup.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\MultiEdit\\\\Backup\\:\\:\\$date \\(DateTimeInterface\\) does not accept DateTimeInterface\\|null\\.$#"
-			count: 1
-			path: engine/Shopware/Models/MultiEdit/Backup.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Filter\\:\\:setCreated\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/MultiEdit/Filter.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Filter\\:\\:setDescription\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/MultiEdit/Filter.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Filter\\:\\:setFilterString\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/MultiEdit/Filter.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Filter\\:\\:setIsFavorite\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/MultiEdit/Filter.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Filter\\:\\:setIsSimple\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/MultiEdit/Filter.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Filter\\:\\:setName\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/MultiEdit/Filter.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Queue\\:\\:getArticleDetails\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/MultiEdit/Queue.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Queue\\:\\:setActive\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/MultiEdit/Queue.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Queue\\:\\:setArticleDetails\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/MultiEdit/Queue.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Queue\\:\\:setArticleDetails\\(\\) has parameter \\$articleDetails with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/MultiEdit/Queue.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Queue\\:\\:setCreated\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/MultiEdit/Queue.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Queue\\:\\:setFilterString\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/MultiEdit/Queue.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Queue\\:\\:setInitialSize\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/MultiEdit/Queue.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Queue\\:\\:setOperations\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/MultiEdit/Queue.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Queue\\:\\:setResource\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/MultiEdit/Queue.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\MultiEdit\\\\Queue\\:\\:\\$articleDetails with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/MultiEdit/Queue.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\QueueArticle\\:\\:setDetail\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/MultiEdit/QueueArticle.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\QueueArticle\\:\\:setQueue\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/MultiEdit/QueueArticle.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Address\\:\\:setAdded\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Address.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Address\\:\\:setDoubleOptinConfirmed\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Address.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Address\\:\\:setEmail\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Address.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Address\\:\\:setGroupId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Address.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Address\\:\\:setIsCustomer\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Address.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Address\\:\\:setLastMailingId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Address.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Address\\:\\:setLastNewsletterId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Address.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Address\\:\\:setLastReadId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Address.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContactData\\:\\:setAdded\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/ContactData.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContactData\\:\\:setCity\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/ContactData.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContactData\\:\\:setDeleted\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/ContactData.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContactData\\:\\:setDoubleOptinConfirmed\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/ContactData.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContactData\\:\\:setEmail\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/ContactData.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContactData\\:\\:setFirstName\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/ContactData.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContactData\\:\\:setGroupId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/ContactData.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContactData\\:\\:setLastName\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/ContactData.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContactData\\:\\:setSalutation\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/ContactData.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContactData\\:\\:setStreet\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/ContactData.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContactData\\:\\:setTitle\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/ContactData.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContactData\\:\\:setZipCode\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/ContactData.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Container\\:\\:getArticles\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Container.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Container\\:\\:getLinks\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Container.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Container\\:\\:setDescription\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Container.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Container\\:\\:setNewsletter\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Container.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Container\\:\\:setPosition\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Container.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Container\\:\\:setType\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Container.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Container\\:\\:setValue\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Container.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Newsletter\\\\Container\\:\\:\\$articles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Container.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Newsletter\\\\Container\\:\\:\\$links with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Container.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Article\\:\\:setArticleDetail\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/ContainerType/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Article\\:\\:setContainer\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/ContainerType/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Article\\:\\:setName\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/ContainerType/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Article\\:\\:setPosition\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/ContainerType/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Article\\:\\:setType\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/ContainerType/Article.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Banner\\:\\:setContainer\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/ContainerType/Banner.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Banner\\:\\:setDescription\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/ContainerType/Banner.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Banner\\:\\:setImage\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/ContainerType/Banner.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Banner\\:\\:setLink\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/ContainerType/Banner.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Banner\\:\\:setTarget\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/ContainerType/Banner.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Link\\:\\:setContainer\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/ContainerType/Link.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Link\\:\\:setDescription\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/ContainerType/Link.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Link\\:\\:setLink\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/ContainerType/Link.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Link\\:\\:setPosition\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/ContainerType/Link.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Link\\:\\:setTarget\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/ContainerType/Link.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Text\\:\\:setAlignment\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/ContainerType/Text.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Text\\:\\:setContainer\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/ContainerType/Text.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Text\\:\\:setContent\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/ContainerType/Text.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Text\\:\\:setHeadline\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/ContainerType/Text.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Text\\:\\:setImage\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/ContainerType/Text.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Text\\:\\:setLink\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/ContainerType/Text.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Group\\:\\:setName\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Group.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:getAlreadySendTo\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Newsletter.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:getContainers\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Newsletter.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:getOrders\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Newsletter.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:setClicked\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Newsletter.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:setCustomerGroup\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Newsletter.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:setDate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Newsletter.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:setGroups\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Newsletter.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:setLanguageId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Newsletter.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:setLocked\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Newsletter.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:setPlaintext\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Newsletter.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:setPublish\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Newsletter.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:setRead\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Newsletter.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:setRecipients\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Newsletter.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:setSenderMail\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Newsletter.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:setSenderName\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Newsletter.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:setStatus\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Newsletter.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:setSubject\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Newsletter.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:setTemplateId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Newsletter.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:setTimedDelivery\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Newsletter.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:\\$addresses with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Newsletter.php
-
-		-
-			message: "#^Property Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:\\$containers with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Newsletter.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Repository\\:\\:getListAddressesQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Repository\\:\\:getListAddressesQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Repository\\:\\:getListGroupsQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Repository\\:\\:getListGroupsQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Repository\\:\\:getListNewslettersQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Repository\\:\\:getListNewslettersQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Repository\\:\\:getListSenderQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Repository\\:\\:getListSenderQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Repository.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Sender\\:\\:setEmail\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Sender.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Sender\\:\\:setName\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Newsletter/Sender.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setArticleId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Order/Basket.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setArticleName\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Order/Basket.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setConfig\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Order/Basket.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setCurrencyFactor\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Order/Basket.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setCustomerId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Order/Basket.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setDate\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Order/Basket.php
-
-		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setEsdArticle\\(\\) has no return type specified\\.$#"
+			message: "#^Method sArticles\\:\\:sGetSupplierById\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Basket.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setLastViewPort\\(\\) has no return type specified\\.$#"
+			message: "#^Method sArticles\\:\\:sGetTranslation\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Basket.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setMode\\(\\) has no return type specified\\.$#"
+			message: "#^Method sArticles\\:\\:sGetTranslation\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Basket.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setNetPrice\\(\\) has no return type specified\\.$#"
+			message: "#^Method sArticles\\:\\:sGetTranslations\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Basket.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setOrderNumber\\(\\) has no return type specified\\.$#"
+			message: "#^Method sArticles\\:\\:sGetTranslations\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Basket.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setPartnerId\\(\\) has no return type specified\\.$#"
+			message: "#^Method sArticles\\:\\:sGetUnit\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Basket.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setPrice\\(\\) has no return type specified\\.$#"
+			message: "#^Method sArticles\\:\\:sSaveComment\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Basket.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setQuantity\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#2 \\$orderNumber of method sArticles\\:\\:getArticleCover\\(\\) expects string, string\\|null given\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Basket.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setSessionId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Order/Basket.php
+			message: "#^Parameter \\#3 \\$subject of function preg_replace expects array\\|string, string\\|null given\\.$#"
+			count: 2
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setShippingFree\\(\\) has no return type specified\\.$#"
+			message: "#^Property sArticles\\:\\:\\$category \\(Shopware\\\\Models\\\\Category\\\\Category\\) does not accept Shopware\\\\Models\\\\Category\\\\Category\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Basket.php
+			path: engine/Shopware/Core/sArticles.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setTaxRate\\(\\) has no return type specified\\.$#"
+			message: "#^Method sArticlesComparisons\\:\\:containsTranslation\\(\\) has parameter \\$translation with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Basket.php
+			path: engine/Shopware/Core/sArticlesComparisons.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setUserAgent\\(\\) has no return type specified\\.$#"
+			message: "#^Method sArticlesComparisons\\:\\:extractPropertyTranslation\\(\\) has parameter \\$articleProperty with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Basket.php
+			path: engine/Shopware/Core/sArticlesComparisons.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Billing\\:\\:fromAddress\\(\\) has no return type specified\\.$#"
+			message: "#^Method sArticlesComparisons\\:\\:sDeleteComparison\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Billing.php
+			path: engine/Shopware/Core/sArticlesComparisons.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Billing\\:\\:setAdditionalAddressLine1\\(\\) has no return type specified\\.$#"
+			message: "#^Method sArticlesComparisons\\:\\:sDeleteComparisons\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Billing.php
+			path: engine/Shopware/Core/sArticlesComparisons.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Billing\\:\\:setAdditionalAddressLine2\\(\\) has no return type specified\\.$#"
+			message: "#^Method sArticlesComparisons\\:\\:sFillUpComparisonArticles\\(\\) has parameter \\$articles with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Billing.php
+			path: engine/Shopware/Core/sArticlesComparisons.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Billing\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
+			message: "#^Method sArticlesComparisons\\:\\:sFillUpComparisonArticles\\(\\) has parameter \\$properties with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Billing.php
+			path: engine/Shopware/Core/sArticlesComparisons.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Billing\\:\\:setCountry\\(\\) has no return type specified\\.$#"
+			message: "#^Method sArticlesComparisons\\:\\:sFillUpComparisonArticles\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Billing.php
+			path: engine/Shopware/Core/sArticlesComparisons.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Billing\\:\\:setCustomer\\(\\) has no return type specified\\.$#"
+			message: "#^Method sArticlesComparisons\\:\\:sGetComparisonList\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Billing.php
+			path: engine/Shopware/Core/sArticlesComparisons.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Billing\\:\\:setOrder\\(\\) has no return type specified\\.$#"
+			message: "#^Method sArticlesComparisons\\:\\:sGetComparisonProperties\\(\\) has parameter \\$articles with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Billing.php
+			path: engine/Shopware/Core/sArticlesComparisons.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Billing\\:\\:setState\\(\\) has no return type specified\\.$#"
+			message: "#^Method sArticlesComparisons\\:\\:sGetComparisonProperties\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Billing.php
+			path: engine/Shopware/Core/sArticlesComparisons.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Billing\\:\\:setTitle\\(\\) has no return type specified\\.$#"
+			message: "#^Method sArticlesComparisons\\:\\:sGetComparisons\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Billing.php
+			path: engine/Shopware/Core/sArticlesComparisons.php
 
 		-
-			message: "#^Parameter \\#1 \\$country of method Shopware\\\\Models\\\\Order\\\\Billing\\:\\:setCountry\\(\\) expects Shopware\\\\Models\\\\Country\\\\Country, Shopware\\\\Models\\\\Country\\\\Country\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Order/Billing.php
+			message: "#^Access to an undefined property sSystem\\:\\:\\$sLanguage\\.$#"
+			count: 2
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Parameter \\#1 \\$entity of method Shopware\\\\Components\\\\Model\\\\ModelManager\\:\\:toArray\\(\\) expects array\\|Shopware\\\\Components\\\\Model\\\\ModelEntity\\|Traversable, Shopware\\\\Models\\\\Attribute\\\\CustomerAddress\\|null given\\.$#"
+			message: "#^Call to an undefined method object\\:\\:assign\\(\\)\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Billing.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Detail\\:\\:setArticleDetail\\(\\) has no return type specified\\.$#"
+			message: "#^Call to an undefined method object\\:\\:fetch\\(\\)\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Detail.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Detail\\:\\:setArticleNumber\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Order/Detail.php
+			message: "#^Cannot call method getCookie\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
+			count: 5
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Detail\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
+			message: "#^Cannot call method getQuery\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Detail.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Detail\\:\\:setEan\\(\\) has no return type specified\\.$#"
+			message: "#^Cannot call method getTax\\(\\) on Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\Tax\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Detail.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Detail\\:\\:setEsd\\(\\) has no return type specified\\.$#"
+			message: "#^Cannot call method isSecure\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Detail.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Detail\\:\\:setOrder\\(\\) has no return type specified\\.$#"
+			message: "#^Method sBasket\\:\\:calculateVoucherValues\\(\\) has parameter \\$voucherDetails with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Detail.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Detail\\:\\:setPackUnit\\(\\) has no return type specified\\.$#"
+			message: "#^Method sBasket\\:\\:calculateVoucherValues\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Detail.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Detail\\:\\:setStatus\\(\\) has no return type specified\\.$#"
+			message: "#^Method sBasket\\:\\:checkIfProductIsInBasket\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Detail.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Detail\\:\\:setTax\\(\\) has no return type specified\\.$#"
+			message: "#^Method sBasket\\:\\:clearBasket\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Detail.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Detail\\:\\:setTaxRate\\(\\) has no return type specified\\.$#"
+			message: "#^Method sBasket\\:\\:convertListProductToNote\\(\\) has parameter \\$note with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Detail.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Detail\\:\\:setUnit\\(\\) has no return type specified\\.$#"
+			message: "#^Method sBasket\\:\\:convertListProductToNote\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Detail.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Order\\\\Detail\\:\\:\\$status has no type specified\\.$#"
+			message: "#^Method sBasket\\:\\:filterCustomerGroupVoucher\\(\\) has parameter \\$voucherDetails with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Detail.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Document\\\\Document\\:\\:setOrder\\(\\) has no return type specified\\.$#"
+			message: "#^Method sBasket\\:\\:filterCustomerGroupVoucher\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Document/Document.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Document\\\\Document\\:\\:setType\\(\\) has no return type specified\\.$#"
+			message: "#^Method sBasket\\:\\:filterProductVoucher\\(\\) has parameter \\$voucherDetails with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Document/Document.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Document\\\\Document\\:\\:setTypeId\\(\\) has no return type specified\\.$#"
+			message: "#^Method sBasket\\:\\:filterProductVoucher\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Document/Document.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Document\\\\Repository\\:\\:filterListQuery\\(\\) has no return type specified\\.$#"
+			message: "#^Method sBasket\\:\\:filterSubShopVoucher\\(\\) has parameter \\$voucherDetails with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Document/Repository.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Document\\\\Repository\\:\\:filterListQuery\\(\\) has parameter \\$filter with no type specified\\.$#"
+			message: "#^Method sBasket\\:\\:filterSubShopVoucher\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Document/Repository.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Document\\\\Repository\\:\\:getListQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
+			message: "#^Method sBasket\\:\\:filterSupplierVoucher\\(\\) has parameter \\$voucherDetails with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Document/Repository.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Document\\\\Repository\\:\\:getListQuery\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
+			message: "#^Method sBasket\\:\\:filterSupplierVoucher\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Document/Repository.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Esd\\:\\:setDate\\(\\) has no return type specified\\.$#"
+			message: "#^Method sBasket\\:\\:filterUsedVoucher\\(\\) has parameter \\$voucherDetails with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Esd.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Esd\\:\\:setOrder\\(\\) has no return type specified\\.$#"
+			message: "#^Method sBasket\\:\\:filterUsedVoucher\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Esd.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Esd\\:\\:setOrderDetail\\(\\) has no return type specified\\.$#"
+			message: "#^Method sBasket\\:\\:getBasketImage\\(\\) has parameter \\$image with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Esd.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\History\\:\\:setChangeDate\\(\\) has no return type specified\\.$#"
+			message: "#^Method sBasket\\:\\:getBasketImage\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/History.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Number\\:\\:setDescription\\(\\) has no return type specified\\.$#"
+			message: "#^Method sBasket\\:\\:getBasketQuantity\\(\\) has parameter \\$basketProduct with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Number.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Number\\:\\:setName\\(\\) has no return type specified\\.$#"
+			message: "#^Method sBasket\\:\\:getBasketQuantity\\(\\) has parameter \\$product with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Number.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Number\\:\\:setNumber\\(\\) has no return type specified\\.$#"
+			message: "#^Method sBasket\\:\\:getNoteProducts\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Number.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\User\\\\User\\|null\\.$#"
+			message: "#^Method sBasket\\:\\:getPriceForAddProduct\\(\\) has parameter \\$product with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/OrderHistorySubscriber.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\OrderHistorySubscriber\\:\\:preUpdate\\(\\) has no return type specified\\.$#"
+			message: "#^Method sBasket\\:\\:getPriceForAddProduct\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/OrderHistorySubscriber.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Repository\\:\\:getOrderStatusQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
+			message: "#^Method sBasket\\:\\:getPricesForItemUpdates\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Repository.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Repository\\:\\:getOrderStatusQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
+			message: "#^Method sBasket\\:\\:getProductForAddProduct\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Repository.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Repository\\:\\:getPaymentStatusQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
+			message: "#^Method sBasket\\:\\:getTaxesForUpdateProduct\\(\\) has parameter \\$queryAdditionalInfo with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Repository.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Repository\\:\\:getPaymentStatusQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
+			message: "#^Method sBasket\\:\\:getTaxesForUpdateProduct\\(\\) has parameter \\$queryNewPrice with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Repository.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Repository\\:\\:getPayments\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sBasket\\:\\:getTaxesForUpdateProduct\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Repository.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Repository\\:\\:searchCustomers\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method sBasket\\:\\:sAddVoucher\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Repository.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Shipping\\:\\:fromAddress\\(\\) has no return type specified\\.$#"
+			message: "#^Method sBasket\\:\\:sCheckBasketQuantities\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Shipping.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Shipping\\:\\:setAdditionalAddressLine1\\(\\) has no return type specified\\.$#"
+			message: "#^Method sBasket\\:\\:sDeleteArticle\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Shipping.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Shipping\\:\\:setAdditionalAddressLine2\\(\\) has no return type specified\\.$#"
+			message: "#^Method sBasket\\:\\:sGetAmount\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Shipping.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Shipping\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
+			message: "#^Method sBasket\\:\\:sGetAmountArticles\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Shipping.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Shipping\\:\\:setCountry\\(\\) has no return type specified\\.$#"
+			message: "#^Method sBasket\\:\\:sGetAmountRestrictedArticles\\(\\) has parameter \\$articles with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Shipping.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Shipping\\:\\:setCustomer\\(\\) has no return type specified\\.$#"
+			message: "#^Method sBasket\\:\\:sGetAmountRestrictedArticles\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Shipping.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Shipping\\:\\:setOrder\\(\\) has no return type specified\\.$#"
+			message: "#^Method sBasket\\:\\:sGetNotes\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Shipping.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Shipping\\:\\:setState\\(\\) has no return type specified\\.$#"
+			message: "#^Method sBasket\\:\\:sGetVoucher\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Shipping.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Shipping\\:\\:setTitle\\(\\) has no return type specified\\.$#"
+			message: "#^Method sBasket\\:\\:sInsertDiscount\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Shipping.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Parameter \\#1 \\$country of method Shopware\\\\Models\\\\Order\\\\Shipping\\:\\:setCountry\\(\\) expects Shopware\\\\Models\\\\Country\\\\Country, Shopware\\\\Models\\\\Country\\\\Country\\|null given\\.$#"
+			message: "#^Method sBasket\\:\\:sRefreshBasket\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Shipping.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Parameter \\#1 \\$entity of method Shopware\\\\Components\\\\Model\\\\ModelManager\\:\\:toArray\\(\\) expects array\\|Shopware\\\\Components\\\\Model\\\\ModelEntity\\|Traversable, Shopware\\\\Models\\\\Attribute\\\\CustomerAddress\\|null given\\.$#"
+			message: "#^Method sBasket\\:\\:sUpdateVoucher\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Shipping.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Parameter \\#1 \\$phone of method Shopware\\\\Models\\\\Order\\\\Shipping\\:\\:setPhone\\(\\) expects string, string\\|null given\\.$#"
+			message: "#^PHPDoc tag @var for variable \\$promotion has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Shipping.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Status\\:\\:setId\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Order/Status.php
+			message: "#^Parameter \\#1 \\$moneyfloat of method sArticles\\:\\:sRound\\(\\) expects float\\|string\\|null, array\\|float\\|false\\|null given\\.$#"
+			count: 2
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Order\\\\Status\\:\\:setName\\(\\) has no return type specified\\.$#"
+			message: "#^Property sBasket\\:\\:\\$additionalTextService \\(Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Service\\\\AdditionalTextServiceInterface\\) does not accept Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Service\\\\AdditionalTextServiceInterface\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Order/Status.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Partner\\\\Partner\\:\\:getOrders\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Property sBasket\\:\\:\\$contextService \\(Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Service\\\\ContextServiceInterface\\) does not accept Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Service\\\\ContextServiceInterface\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Partner/Partner.php
+			path: engine/Shopware/Core/sBasket.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Partner\\\\Partner\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
+			message: "#^Argument of an invalid type array\\|string supplied for foreach, only iterables are supported\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Partner/Partner.php
+			path: engine/Shopware/Core/sCategories.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Partner\\\\Partner\\:\\:setCustomerId\\(\\) has no return type specified\\.$#"
+			message: "#^Method sCategories\\:\\:assignCategoriesToTree\\(\\) has parameter \\$activePath with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Partner/Partner.php
+			path: engine/Shopware/Core/sCategories.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Partner\\\\Partner\\:\\:setOrders\\(\\) has no return type specified\\.$#"
+			message: "#^Method sCategories\\:\\:assignCategoriesToTree\\(\\) has parameter \\$categories with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Partner/Partner.php
+			path: engine/Shopware/Core/sCategories.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Partner\\\\Partner\\:\\:setOrders\\(\\) has parameter \\$orders with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			message: "#^Method sCategories\\:\\:assignCategoriesToTree\\(\\) has parameter \\$childrenCounts with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Partner/Partner.php
+			path: engine/Shopware/Core/sCategories.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Partner\\\\Partner\\:\\:\\$orders with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method sCategories\\:\\:assignCategoriesToTree\\(\\) has parameter \\$tree with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Partner/Partner.php
+			path: engine/Shopware/Core/sCategories.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Partner\\\\Repository\\:\\:getDetailQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
+			message: "#^Method sCategories\\:\\:assignCategoriesToTree\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Partner/Repository.php
+			path: engine/Shopware/Core/sCategories.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Partner\\\\Repository\\:\\:getDetailQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
+			message: "#^Method sCategories\\:\\:buildTree\\(\\) has parameter \\$associated with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Partner/Repository.php
+			path: engine/Shopware/Core/sCategories.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Partner\\\\Repository\\:\\:getStatisticListQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
+			message: "#^Method sCategories\\:\\:buildTree\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Partner/Repository.php
+			path: engine/Shopware/Core/sCategories.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:getCountries\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method sCategories\\:\\:convertCategory\\(\\) has parameter \\$childrenCounts with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/Payment.php
+			path: engine/Shopware/Core/sCategories.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:getPaymentData\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method sCategories\\:\\:convertCategory\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/Payment.php
+			path: engine/Shopware/Core/sCategories.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:getPaymentInstances\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method sCategories\\:\\:getCategoryIdsWithParent\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/Payment.php
+			path: engine/Shopware/Core/sCategories.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:getRuleSets\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method sCategories\\:\\:getCategoryPath\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/Payment.php
+			path: engine/Shopware/Core/sCategories.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:getShops\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method sCategories\\:\\:getChildrenCountOfCategories\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/Payment.php
+			path: engine/Shopware/Core/sCategories.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
+			message: "#^Method sCategories\\:\\:sGetCategories\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/Payment.php
+			path: engine/Shopware/Core/sCategories.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:setCountries\\(\\) has parameter \\$countries with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			message: "#^Method sCategories\\:\\:sGetCategoriesByParentId\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/Payment.php
+			path: engine/Shopware/Core/sCategories.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:setPaymentData\\(\\) has no return type specified\\.$#"
+			message: "#^Method sCategories\\:\\:sGetCategoryContent\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/Payment.php
+			path: engine/Shopware/Core/sCategories.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:setPaymentData\\(\\) has parameter \\$paymentData with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			message: "#^Method sCategories\\:\\:sGetCategoryIdByArticleId\\(\\) has parameter \\$shopId with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/Payment.php
+			path: engine/Shopware/Core/sCategories.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:setPaymentInstances\\(\\) has no return type specified\\.$#"
+			message: "#^Method sCategories\\:\\:sGetCategoryPath\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/Payment.php
+			path: engine/Shopware/Core/sCategories.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:setPaymentInstances\\(\\) has parameter \\$paymentInstances with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			message: "#^Method sCategories\\:\\:sGetMainCategories\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/Payment.php
+			path: engine/Shopware/Core/sCategories.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:setPlugin\\(\\) has no return type specified\\.$#"
+			message: "#^Property sCategories\\:\\:\\$sSYSTEM has no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/Payment.php
+			path: engine/Shopware/Core/sCategories.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:setRuleSets\\(\\) has parameter \\$ruleSets with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			message: "#^Cannot call method getQuery\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/Payment.php
+			path: engine/Shopware/Core/sCms.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:setShops\\(\\) has parameter \\$shops with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			message: "#^Method sCms\\:\\:getRelatedForPage\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/Payment.php
+			path: engine/Shopware/Core/sCms.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:\\$countries with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method sCms\\:\\:getRelatedForPage\\(\\) has parameter \\$staticPage with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/Payment.php
+			path: engine/Shopware/Core/sCms.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:\\$paymentData with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method sCms\\:\\:getRelatedForSubPage\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/Payment.php
+			path: engine/Shopware/Core/sCms.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:\\$paymentInstances with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method sCms\\:\\:getRelatedForSubPage\\(\\) has parameter \\$staticPage with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/Payment.php
+			path: engine/Shopware/Core/sCms.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:\\$ruleSets with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method sCms\\:\\:sGetStaticPage\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/Payment.php
+			path: engine/Shopware/Core/sCms.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:\\$shops with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method sCms\\:\\:sGetStaticPageChildrensById\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/Payment.php
+			path: engine/Shopware/Core/sCms.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\PaymentInstance\\:\\:setAccountHolder\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Payment/PaymentInstance.php
+			message: "#^Parameter \\#2 \\$fallback of method Shopware_Components_Translation\\:\\:readWithFallback\\(\\) expects int, int\\|null given\\.$#"
+			count: 2
+			path: engine/Shopware/Core/sCms.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\PaymentInstance\\:\\:setAccountNumber\\(\\) has no return type specified\\.$#"
+			message: "#^Method sCore\\:\\:__construct\\(\\) has parameter \\$front with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/PaymentInstance.php
+			path: engine/Shopware/Core/sCore.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\PaymentInstance\\:\\:setAddress\\(\\) has no return type specified\\.$#"
+			message: "#^Method sCore\\:\\:sBuildLink\\(\\) has parameter \\$sVariables with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/PaymentInstance.php
+			path: engine/Shopware/Core/sCore.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\PaymentInstance\\:\\:setAmount\\(\\) has no return type specified\\.$#"
+			message: "#^Method sExport\\:\\:_decode_line\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/PaymentInstance.php
+			path: engine/Shopware/Core/sExport.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\PaymentInstance\\:\\:setBankCode\\(\\) has no return type specified\\.$#"
+			message: "#^Method sExport\\:\\:sGetArticlePremiumShippingcosts\\(\\) has parameter \\$article with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/PaymentInstance.php
+			path: engine/Shopware/Core/sExport.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\PaymentInstance\\:\\:setBankName\\(\\) has no return type specified\\.$#"
+			message: "#^Method sExport\\:\\:sGetArticlePremiumShippingcosts\\(\\) has parameter \\$country with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/PaymentInstance.php
+			path: engine/Shopware/Core/sExport.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\PaymentInstance\\:\\:setBic\\(\\) has no return type specified\\.$#"
+			message: "#^Method sExport\\:\\:sGetArticlePremiumShippingcosts\\(\\) has parameter \\$payment with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/PaymentInstance.php
+			path: engine/Shopware/Core/sExport.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\PaymentInstance\\:\\:setCity\\(\\) has no return type specified\\.$#"
+			message: "#^Method sExport\\:\\:sGetArticleProperties\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/PaymentInstance.php
+			path: engine/Shopware/Core/sExport.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\PaymentInstance\\:\\:setCreatedAt\\(\\) has no return type specified\\.$#"
+			message: "#^Method sExport\\:\\:sGetArticleShippingcost\\(\\) has parameter \\$article with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/PaymentInstance.php
+			path: engine/Shopware/Core/sExport.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\PaymentInstance\\:\\:setCustomer\\(\\) has no return type specified\\.$#"
+			message: "#^Method sExport\\:\\:sGetCountry\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/PaymentInstance.php
+			path: engine/Shopware/Core/sExport.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\PaymentInstance\\:\\:setFirstName\\(\\) has no return type specified\\.$#"
+			message: "#^Method sExport\\:\\:sGetDispatchBasket\\(\\) has parameter \\$article with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/PaymentInstance.php
+			path: engine/Shopware/Core/sExport.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\PaymentInstance\\:\\:setIban\\(\\) has no return type specified\\.$#"
+			message: "#^Method sExport\\:\\:sGetPaymentmean\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/PaymentInstance.php
+			path: engine/Shopware/Core/sExport.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\PaymentInstance\\:\\:setLastName\\(\\) has no return type specified\\.$#"
+			message: "#^Method sExport\\:\\:sGetPremiumDispatch\\(\\) has parameter \\$basket with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/PaymentInstance.php
+			path: engine/Shopware/Core/sExport.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\PaymentInstance\\:\\:setOrder\\(\\) has no return type specified\\.$#"
+			message: "#^Method sExport\\:\\:sGetPremiumDispatch\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/PaymentInstance.php
+			path: engine/Shopware/Core/sExport.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\PaymentInstance\\:\\:setPaymentMean\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$search of function str_replace expects array\\|string, string\\|false\\|null given\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/PaymentInstance.php
+			path: engine/Shopware/Core/sExport.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\PaymentInstance\\:\\:setZipCode\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Payment/PaymentInstance.php
+			message: "#^Parameter \\#1 \\$url of method sExport\\:\\:fixShopHost\\(\\) expects string, string\\|null given\\.$#"
+			count: 2
+			path: engine/Shopware/Core/sExport.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Repository\\:\\:getActivePaymentsQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Payment/Repository.php
+			message: "#^Parameter \\#3 \\$pictureSize of method sArticles\\:\\:sGetArticlePictures\\(\\) expects int, null given\\.$#"
+			count: 2
+			path: engine/Shopware/Core/sExport.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Repository\\:\\:getActivePaymentsQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#3 \\$subject of function str_replace expects array\\|string, string\\|null given\\.$#"
+			count: 2
+			path: engine/Shopware/Core/sExport.php
+
+		-
+			message: "#^Call to an undefined method Enlight_Event_EventArgs\\:\\:getValues\\(\\)\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/Repository.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Repository\\:\\:getActivePaymentsQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
+			message: "#^Cannot access offset 'attributes' on array\\|false\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/Repository.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Repository\\:\\:getActivePaymentsQueryBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
+			message: "#^Cannot call method getClientIp\\(\\) on Symfony\\\\Component\\\\HttpFoundation\\\\Request\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/Repository.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Repository\\:\\:getAllPaymentsQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
+			message: "#^Method sOrder\\:\\:formatBasketRow\\(\\) has parameter \\$basketRow with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/Repository.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Repository\\:\\:getAllPaymentsQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
+			message: "#^Method sOrder\\:\\:formatBasketRow\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/Repository.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Repository\\:\\:getAllPaymentsQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
+			message: "#^Method sOrder\\:\\:getAvailableSerialsOfEsd\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/Repository.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Repository\\:\\:getAllPaymentsQueryBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
+			message: "#^Method sOrder\\:\\:getCustomerInformationByOrderId\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/Repository.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Repository\\:\\:getListQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
+			message: "#^Method sOrder\\:\\:getOrderById\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/Repository.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Repository\\:\\:getListQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
+			message: "#^Method sOrder\\:\\:getOrderDetailsByOrderId\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/Repository.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Repository\\:\\:getListQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
+			message: "#^Method sOrder\\:\\:getOrderDetailsForMail\\(\\) has parameter \\$basketRows with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/Repository.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Repository\\:\\:getListQueryBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
+			message: "#^Method sOrder\\:\\:getOrderDetailsForMail\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Payment/Repository.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\License\\:\\:setActive\\(\\) has no return type specified\\.$#"
+			message: "#^Method sOrder\\:\\:getOrderDetailsForStatusMail\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/License.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\License\\:\\:setAdded\\(\\) has no return type specified\\.$#"
+			message: "#^Method sOrder\\:\\:getOrderForStatusMail\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/License.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\License\\:\\:setCreation\\(\\) has no return type specified\\.$#"
+			message: "#^Method sOrder\\:\\:getOrderPaymentStatus\\(\\) should return string but returns string\\|false\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/License.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\License\\:\\:setExpiration\\(\\) has no return type specified\\.$#"
+			message: "#^Method sOrder\\:\\:getOrderStatus\\(\\) should return string but returns string\\|false\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/License.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\License\\:\\:setHost\\(\\) has no return type specified\\.$#"
+			message: "#^Method sOrder\\:\\:getPartnerCode\\(\\) should return string\\|null but returns string\\|false\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/License.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\License\\:\\:setLabel\\(\\) has no return type specified\\.$#"
+			message: "#^Method sOrder\\:\\:getUserDataForMail\\(\\) has parameter \\$userData with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/License.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\License\\:\\:setLicense\\(\\) has no return type specified\\.$#"
+			message: "#^Method sOrder\\:\\:getUserDataForMail\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/License.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\License\\:\\:setModule\\(\\) has no return type specified\\.$#"
+			message: "#^Method sOrder\\:\\:getVariantEsd\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/License.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\License\\:\\:setNotation\\(\\) has no return type specified\\.$#"
+			message: "#^Method sOrder\\:\\:handleESDOrder\\(\\) has parameter \\$basketRow with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/License.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\License\\:\\:setPlugin\\(\\) has no return type specified\\.$#"
+			message: "#^Method sOrder\\:\\:handleESDOrder\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/License.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\License\\:\\:setSource\\(\\) has no return type specified\\.$#"
+			message: "#^Method sOrder\\:\\:htmlEntityDecodeRecursive\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/License.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\License\\:\\:setType\\(\\) has no return type specified\\.$#"
+			message: "#^Method sOrder\\:\\:htmlEntityDecodeRecursive\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/License.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\License\\:\\:setVersion\\(\\) has no return type specified\\.$#"
+			message: "#^Method sOrder\\:\\:logOrderMailException\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/License.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:getConfigForms\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method sOrder\\:\\:refreshOrderedVariant\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:getEmotionComponents\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method sOrder\\:\\:reserveVoucher\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:getLicenses\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method sOrder\\:\\:sSaveBillingAddress\\(\\) has parameter \\$address with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:getMenuItems\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method sOrder\\:\\:sSaveShippingAddress\\(\\) has parameter \\$address with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:getPayments\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method sOrder\\:\\:sTellFriend\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:getTemplates\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method sOrder\\:\\:sendMail\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:getWidgets\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method sOrder\\:\\:sendMail\\(\\) has parameter \\$variables with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setActive\\(\\) has no return type specified\\.$#"
+			message: "#^Method sOrder\\:\\:setConfig\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setAdded\\(\\) has no return type specified\\.$#"
+			message: "#^Method sOrder\\:\\:setOrderStatus\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setAuthor\\(\\) has no return type specified\\.$#"
+			message: "#^Method sOrder\\:\\:setPaymentStatus\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setChanges\\(\\) has no return type specified\\.$#"
+			message: "#^Property sOrder\\:\\:\\$orderAttributes type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setConfigForms\\(\\) has no return type specified\\.$#"
+			message: "#^Property sOrder\\:\\:\\$sBasketData type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setConfigForms\\(\\) has parameter \\$configForms with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			message: "#^Property sOrder\\:\\:\\$sShippingData type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setCopyright\\(\\) has no return type specified\\.$#"
+			message: "#^Property sOrder\\:\\:\\$sUserData type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setDescription\\(\\) has no return type specified\\.$#"
+			message: "#^Call to an undefined method object\\:\\:assign\\(\\)\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setEmotionComponents\\(\\) has no return type specified\\.$#"
+			message: "#^Call to an undefined method object\\:\\:fetch\\(\\)\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setEmotionComponents\\(\\) has parameter \\$emotionComponents with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			message: "#^Cannot call method execute\\(\\) on PDOStatement\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setInSafeMode\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Category\\\\Category\\|null\\.$#"
+			count: 2
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setInstalled\\(\\) has no return type specified\\.$#"
+			message: "#^Cannot call method getLevel\\(\\) on Shopware\\\\Models\\\\Category\\\\Category\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setLabel\\(\\) has no return type specified\\.$#"
+			message: "#^Cannot call method getName\\(\\) on Shopware\\\\Models\\\\Article\\\\Supplier\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setLicense\\(\\) has no return type specified\\.$#"
+			message: "#^Method sRewriteTable\\:\\:baseSetup\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setLicenses\\(\\) has no return type specified\\.$#"
+			message: "#^Method sRewriteTable\\:\\:checkSpecificShopForm\\(\\) has parameter \\$matches with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setLicenses\\(\\) has parameter \\$licenses with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			message: "#^Method sRewriteTable\\:\\:checkSpecificShopSite\\(\\) has parameter \\$matches with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setLink\\(\\) has no return type specified\\.$#"
+			message: "#^Method sRewriteTable\\:\\:createManufacturerUrls\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setMenuItems\\(\\) has no return type specified\\.$#"
+			message: "#^Method sRewriteTable\\:\\:createSupplierPath\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setMenuItems\\(\\) has parameter \\$menuItems with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			message: "#^Method sRewriteTable\\:\\:getManufacturerIds\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setName\\(\\) has no return type specified\\.$#"
+			message: "#^Method sRewriteTable\\:\\:insertFormUrls\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setNamespace\\(\\) has no return type specified\\.$#"
+			message: "#^Method sRewriteTable\\:\\:insertStaticPageUrls\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setPayments\\(\\) has no return type specified\\.$#"
+			message: "#^Method sRewriteTable\\:\\:mapArticleTranslationObjectData\\(\\) has parameter \\$articles with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setPayments\\(\\) has parameter \\$payments with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			message: "#^Method sRewriteTable\\:\\:mapArticleTranslationObjectData\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setSource\\(\\) has no return type specified\\.$#"
+			message: "#^Method sRewriteTable\\:\\:mapProductObjectAttributeFields\\(\\) has parameter \\$product with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setSupport\\(\\) has no return type specified\\.$#"
+			message: "#^Method sRewriteTable\\:\\:mapProductObjectAttributeFields\\(\\) has parameter \\$translations with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setTemplates\\(\\) has no return type specified\\.$#"
+			message: "#^Method sRewriteTable\\:\\:mapProductObjectAttributeFields\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setTemplates\\(\\) has parameter \\$templates with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			message: "#^Method sRewriteTable\\:\\:mapProductObjectFields\\(\\) has parameter \\$fieldMappings with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setTranslations\\(\\) has no return type specified\\.$#"
+			message: "#^Method sRewriteTable\\:\\:mapProductObjectFields\\(\\) has parameter \\$objectData with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setUpdateSource\\(\\) has no return type specified\\.$#"
+			message: "#^Method sRewriteTable\\:\\:mapProductObjectFields\\(\\) has parameter \\$objectDataFallback with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setUpdateVersion\\(\\) has no return type specified\\.$#"
+			message: "#^Method sRewriteTable\\:\\:mapProductObjectFields\\(\\) has parameter \\$product with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setUpdated\\(\\) has no return type specified\\.$#"
+			message: "#^Method sRewriteTable\\:\\:mapProductObjectFields\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setVersion\\(\\) has no return type specified\\.$#"
+			message: "#^Method sRewriteTable\\:\\:sCategoryPath\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setWidgets\\(\\) has no return type specified\\.$#"
+			message: "#^Method sRewriteTable\\:\\:sCategoryPathByProductId\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setWidgets\\(\\) has parameter \\$widgets with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			message: "#^Method sRewriteTable\\:\\:sCreateRewriteTableBlog\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:\\$configForms with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method sRewriteTable\\:\\:sCreateRewriteTableCampaigns\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:\\$emotionComponents with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method sRewriteTable\\:\\:sCreateRewriteTableCategories\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:\\$licenses with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method sRewriteTable\\:\\:sCreateRewriteTableCleanup\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:\\$menuItems with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method sRewriteTable\\:\\:sCreateRewriteTableContent\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:\\$payments with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method sRewriteTable\\:\\:sCreateRewriteTableForSingleCampaign\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:\\$templates with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method sRewriteTable\\:\\:sCreateRewriteTableForSingleCampaign\\(\\) has parameter \\$campaign with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:\\$updateSource \\(string\\) does not accept string\\|null\\.$#"
+			message: "#^Method sRewriteTable\\:\\:sCreateRewriteTableStatic\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:\\$updateVersion \\(string\\) does not accept string\\|null\\.$#"
+			message: "#^Method sRewriteTable\\:\\:sSmartyCategoryPath\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:\\$widgets with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method sRewriteTable\\:\\:sSmartyCategoryPath\\(\\) should return string\\|null but returns array\\|string\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Plugin/Plugin.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Premium\\\\Premium\\:\\:setShop\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Models/Premium/Premium.php
+			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
+			count: 3
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Price\\\\Discount\\:\\:setCustomerGroupId\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$offset of method sRewriteTable\\:\\:insertFormUrls\\(\\) expects int, int\\|null given\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Price/Discount.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Price\\\\Group\\:\\:getDiscounts\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Parameter \\#1 \\$offset of method sRewriteTable\\:\\:insertStaticPageUrls\\(\\) expects int, int\\|null given\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Price/Group.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Price\\\\Group\\:\\:\\$discounts with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Parameter \\#2 \\$limit of method sRewriteTable\\:\\:insertFormUrls\\(\\) expects int, int\\|null given\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Price/Group.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\ProductFeed\\\\ProductFeed\\:\\:getArticles\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Parameter \\#2 \\$limit of method sRewriteTable\\:\\:insertStaticPageUrls\\(\\) expects int, int\\|null given\\.$#"
 			count: 1
-			path: engine/Shopware/Models/ProductFeed/ProductFeed.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\ProductFeed\\\\ProductFeed\\:\\:getCategories\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Parameter \\#3 \\$fallbackShopId of method sRewriteTable\\:\\:sCreateRewriteTableForSingleCampaign\\(\\) expects int, int\\|null given\\.$#"
 			count: 1
-			path: engine/Shopware/Models/ProductFeed/ProductFeed.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\ProductFeed\\\\ProductFeed\\:\\:getSuppliers\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Property Shopware\\\\Bundle\\\\AttributeBundle\\\\Repository\\\\SearchCriteria\\:\\:\\$limit \\(int\\) does not accept int\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Models/ProductFeed/ProductFeed.php
+			path: engine/Shopware/Core/sRewriteTable.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\ProductFeed\\\\ProductFeed\\:\\:sanitizeFilename\\(\\) has no return type specified\\.$#"
+			message: "#^Method sSystem\\:\\:__call\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/ProductFeed/ProductFeed.php
+			path: engine/Shopware/Core/sSystem.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\ProductFeed\\\\ProductFeed\\:\\:setArticles\\(\\) has no return type specified\\.$#"
+			message: "#^Method sSystem\\:\\:__call\\(\\) has parameter \\$params with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/ProductFeed/ProductFeed.php
+			path: engine/Shopware/Core/sSystem.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\ProductFeed\\\\ProductFeed\\:\\:setArticles\\(\\) has parameter \\$articles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			message: "#^Method sSystem\\:\\:__get\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/ProductFeed/ProductFeed.php
+			path: engine/Shopware/Core/sSystem.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\ProductFeed\\\\ProductFeed\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
+			message: "#^Method sSystem\\:\\:__get\\(\\) has parameter \\$property with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/ProductFeed/ProductFeed.php
+			path: engine/Shopware/Core/sSystem.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\ProductFeed\\\\ProductFeed\\:\\:setCategories\\(\\) has parameter \\$categories with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			message: "#^Method sSystem\\:\\:__set\\(\\) has parameter \\$property with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/ProductFeed/ProductFeed.php
+			path: engine/Shopware/Core/sSystem.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\ProductFeed\\\\ProductFeed\\:\\:setDirty\\(\\) has no return type specified\\.$#"
+			message: "#^Method sSystem\\:\\:__set\\(\\) has parameter \\$value with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/ProductFeed/ProductFeed.php
+			path: engine/Shopware/Core/sSystem.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\ProductFeed\\\\ProductFeed\\:\\:setSuppliers\\(\\) has no return type specified\\.$#"
+			message: "#^Property sSystem\\:\\:\\$sCurrency type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/ProductFeed/ProductFeed.php
+			path: engine/Shopware/Core/sSystem.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\ProductFeed\\\\ProductFeed\\:\\:setSuppliers\\(\\) has parameter \\$suppliers with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			message: "#^Property sSystem\\:\\:\\$sUSERGROUPDATA type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/ProductFeed/ProductFeed.php
+			path: engine/Shopware/Core/sSystem.php
 
 		-
-			message: "#^Parameter \\#1 \\$datetime of class DateTime constructor expects string, string\\|null given\\.$#"
+			message: "#^Cannot call method get\\(\\) on Shopware\\\\Components\\\\DependencyInjection\\\\Container\\|null\\.$#"
+			count: 2
+			path: engine/Shopware/Kernel.php
+
+		-
+			message: "#^Cannot call method setApplication\\(\\) on Shopware\\\\Components\\\\DependencyInjection\\\\Container\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Models/ProductFeed/ProductFeed.php
+			path: engine/Shopware/Kernel.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\ProductFeed\\\\ProductFeed\\:\\:\\$articles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Kernel\\:\\:addResources\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/ProductFeed/ProductFeed.php
+			path: engine/Shopware/Kernel.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\ProductFeed\\\\ProductFeed\\:\\:\\$categories with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Kernel\\:\\:addShopwareConfig\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/ProductFeed/ProductFeed.php
+			path: engine/Shopware/Kernel.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\ProductFeed\\\\ProductFeed\\:\\:\\$suppliers with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Kernel\\:\\:addShopwareConfig\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/ProductFeed/ProductFeed.php
+			path: engine/Shopware/Kernel.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\ProductStream\\\\ProductStream\\:\\:getName\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Kernel\\:\\:boot\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/ProductStream/ProductStream.php
+			path: engine/Shopware/Kernel.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\ProductStream\\\\ProductStream\\:\\:getSorting\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Kernel\\:\\:dumpContainer\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/ProductStream/ProductStream.php
+			path: engine/Shopware/Kernel.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\ProductStream\\\\ProductStream\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Kernel\\:\\:getConfig\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/ProductStream/ProductStream.php
+			path: engine/Shopware/Kernel.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\ProductStream\\\\ProductStream\\:\\:setConditions\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Kernel\\:\\:getContainer\\(\\) should return Shopware\\\\Components\\\\DependencyInjection\\\\Container but returns Shopware\\\\Components\\\\DependencyInjection\\\\Container\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Models/ProductStream/ProductStream.php
+			path: engine/Shopware/Kernel.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\ProductStream\\\\ProductStream\\:\\:setDescription\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Kernel\\:\\:getElasticSearchConfig\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/ProductStream/ProductStream.php
+			path: engine/Shopware/Kernel.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\ProductStream\\\\ProductStream\\:\\:setName\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Kernel\\:\\:getHttpCacheConfig\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/ProductStream/ProductStream.php
+			path: engine/Shopware/Kernel.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\ProductStream\\\\ProductStream\\:\\:setSorting\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Kernel\\:\\:getKernelParameters\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/ProductStream/ProductStream.php
+			path: engine/Shopware/Kernel.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\ProductStream\\\\ProductStream\\:\\:setSortingId\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Kernel\\:\\:getRelease\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/ProductStream/ProductStream.php
+			path: engine/Shopware/Kernel.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\ProductStream\\\\ProductStream\\:\\:setType\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Kernel\\:\\:initializeConfig\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/ProductStream/ProductStream.php
+			path: engine/Shopware/Kernel.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Property\\\\Group\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Kernel\\:\\:initializeContainer\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Property/Group.php
+			path: engine/Shopware/Kernel.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Property\\\\Group\\:\\:\\$articles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Kernel\\:\\:initializePlugins\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Property/Group.php
+			path: engine/Shopware/Kernel.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Property\\\\Group\\:\\:\\$options with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Kernel\\:\\:initializeShopware\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Property/Group.php
+			path: engine/Shopware/Kernel.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Property\\\\Group\\:\\:\\$relations with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Kernel\\:\\:loadContentTypes\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Property/Group.php
+			path: engine/Shopware/Kernel.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Property\\\\Option\\:\\:getGroups\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Kernel\\:\\:prepareContainer\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Property/Option.php
+			path: engine/Shopware/Kernel.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Property\\\\Option\\:\\:getRelations\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Kernel\\:\\:registerBundles\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Property/Option.php
+			path: engine/Shopware/Kernel.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Property\\\\Option\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Kernel\\:\\:registerContainerConfiguration\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Property/Option.php
+			path: engine/Shopware/Kernel.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Property\\\\Option\\:\\:\\$groups with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Kernel\\:\\:setPhpSettings\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Property/Option.php
+			path: engine/Shopware/Kernel.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Property\\\\Option\\:\\:\\$relations with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Kernel\\:\\:setPhpSettings\\(\\) has parameter \\$settings with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Property/Option.php
+			path: engine/Shopware/Kernel.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Property\\\\Relation\\:\\:setGroup\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Kernel\\:\\:terminate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Property/Relation.php
+			path: engine/Shopware/Kernel.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Property\\\\Relation\\:\\:setOption\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$container of class Shopware constructor expects Shopware\\\\Components\\\\DependencyInjection\\\\Container, Shopware\\\\Components\\\\DependencyInjection\\\\Container\\|null given\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Property/Relation.php
+			path: engine/Shopware/Kernel.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Property\\\\Relation\\:\\:setPosition\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$content of method Symfony\\\\Component\\\\Config\\\\ResourceCheckerConfigCache\\:\\:write\\(\\) expects string, array\\|string given\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Property/Relation.php
+			path: engine/Shopware/Kernel.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Property\\\\Repository\\:\\:getListGroupsQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#1 \\$source of static method Symfony\\\\Component\\\\HttpKernel\\\\Kernel\\:\\:stripComments\\(\\) expects string, array\\|string given\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Property/Repository.php
+			path: engine/Shopware/Kernel.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Property\\\\Repository\\:\\:getListGroupsQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Kernel\\:\\:\\$config type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Property/Repository.php
+			path: engine/Shopware/Kernel.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Property\\\\Repository\\:\\:getListGroupsQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Kernel\\:\\:\\$release has no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Property/Repository.php
+			path: engine/Shopware/Kernel.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Property\\\\Repository\\:\\:getOptionsQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Article\\:\\:getAllCategories\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Property/Repository.php
+			path: engine/Shopware/Models/Article/Article.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Property\\\\Repository\\:\\:getOptionsQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Article\\:\\:getCategories\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Property/Repository.php
+			path: engine/Shopware/Models/Article/Article.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Property\\\\Repository\\:\\:getPropertyRelationQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Article\\:\\:getDetails\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Property/Repository.php
+			path: engine/Shopware/Models/Article/Article.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Property\\\\Repository\\:\\:getPropertyRelationQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Article\\:\\:getLinks\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Property/Repository.php
+			path: engine/Shopware/Models/Article/Article.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Property\\\\Repository\\:\\:getSetsQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Article\\:\\:getPropertyValues\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Property/Repository.php
+			path: engine/Shopware/Models/Article/Article.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Property\\\\Repository\\:\\:getSetsQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Article\\:\\:getRelatedProductStreams\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Property/Repository.php
+			path: engine/Shopware/Models/Article/Article.php
 
 		-
-			message: "#^Parameter \\#2 \\$order of method Shopware\\\\Models\\\\Property\\\\Repository\\:\\:getListGroupsQueryBuilder\\(\\) expects Doctrine\\\\ORM\\\\Query\\\\Expr\\\\OrderBy\\|string\\|null, array\\|Doctrine\\\\ORM\\\\Query\\\\Expr\\\\OrderBy\\|string\\|null given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Article\\:\\:getVotes\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Property/Repository.php
+			path: engine/Shopware/Models/Article/Article.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Property\\\\Value\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Article\\:\\:setCategories\\(\\) has parameter \\$categories with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Property/Value.php
+			path: engine/Shopware/Models/Article/Article.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Property\\\\Value\\:\\:setMedia\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Article\\:\\:setPropertyValues\\(\\) has parameter \\$propertyValues with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Property/Value.php
+			path: engine/Shopware/Models/Article/Article.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Property\\\\Value\\:\\:setOption\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Article\\:\\:setRelatedProductStreams\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Property/Value.php
+			path: engine/Shopware/Models/Article/Article.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Property\\\\Value\\:\\:\\$articles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Article\\:\\:setRelatedProductStreams\\(\\) has parameter \\$relatedProductStreams with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Property/Value.php
+			path: engine/Shopware/Models/Article/Article.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Search\\\\CustomFacet\\:\\:setActive\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Article\\:\\:setSupplier\\(\\) has parameter \\$supplier with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Search/CustomFacet.php
+			path: engine/Shopware/Models/Article/Article.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Search\\\\CustomFacet\\:\\:setDeletable\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Article\\:\\:setTax\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Search/CustomFacet.php
+			path: engine/Shopware/Models/Article/Article.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Search\\\\CustomFacet\\:\\:setDisplayInCategories\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Article\\:\\:updateChangedTimestamp\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Search/CustomFacet.php
+			path: engine/Shopware/Models/Article/Article.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Search\\\\CustomFacet\\:\\:setFacet\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Article\\\\Article\\:\\:\\$allCategories with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Search/CustomFacet.php
+			path: engine/Shopware/Models/Article/Article.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Search\\\\CustomFacet\\:\\:setName\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Article\\\\Article\\:\\:\\$categories with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Search/CustomFacet.php
+			path: engine/Shopware/Models/Article/Article.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Search\\\\CustomFacet\\:\\:setPosition\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Article\\\\Article\\:\\:\\$crossBundleLook \\(int\\) does not accept default value of type false\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Search/CustomFacet.php
+			path: engine/Shopware/Models/Article/Article.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Search\\\\CustomFacet\\:\\:setUniqueKey\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Article\\\\Article\\:\\:\\$customerGroups with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Search/CustomFacet.php
+			path: engine/Shopware/Models/Article/Article.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Search\\\\CustomSorting\\:\\:setActive\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Article\\\\Article\\:\\:\\$details with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Search/CustomSorting.php
+			path: engine/Shopware/Models/Article/Article.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Search\\\\CustomSorting\\:\\:setDisplayInCategories\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Article\\\\Article\\:\\:\\$esds with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Search/CustomSorting.php
+			path: engine/Shopware/Models/Article/Article.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Search\\\\CustomSorting\\:\\:setLabel\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Article\\\\Article\\:\\:\\$links with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Search/CustomSorting.php
+			path: engine/Shopware/Models/Article/Article.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Search\\\\CustomSorting\\:\\:setPosition\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Article\\\\Article\\:\\:\\$propertyValues with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Search/CustomSorting.php
+			path: engine/Shopware/Models/Article/Article.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Search\\\\CustomSorting\\:\\:setSortings\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Article\\\\Article\\:\\:\\$related with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Search/CustomSorting.php
+			path: engine/Shopware/Models/Article/Article.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Currency\\:\\:toArray\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Article\\\\Article\\:\\:\\$relatedProductStreams with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Currency.php
+			path: engine/Shopware/Models/Article/Article.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Shop\\\\Currency\\:\\:\\$default \\(int\\) does not accept default value of type false\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Article\\\\Article\\:\\:\\$similar with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Currency.php
+			path: engine/Shopware/Models/Article/Article.php
 
 		-
-			message: "#^Argument of an invalid type Shopware\\\\Models\\\\Shop\\\\Shop supplied for foreach, only iterables are supported\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Article\\\\Article\\:\\:\\$votes with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/DetachedShop.php
+			path: engine/Shopware/Models/Article/Article.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:fetchAndFixShop\\(\\) has parameter \\$shop with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Dependency\\:\\:setChildOption\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Repository.php
+			path: engine/Shopware/Models/Article/Configurator/Dependency.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:findShopForRequest\\(\\) has parameter \\$shops with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Dependency\\:\\:setConfiguratorSet\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Repository.php
+			path: engine/Shopware/Models/Article/Configurator/Dependency.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:findShopForRequest\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Dependency\\:\\:setParentOption\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Repository.php
+			path: engine/Shopware/Models/Article/Configurator/Dependency.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getActiveDefault\\(\\) should return Shopware\\\\Models\\\\Shop\\\\DetachedShop but returns Shopware\\\\Models\\\\Shop\\\\DetachedShop\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Group\\:\\:getSets\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Repository.php
+			path: engine/Shopware/Models/Article/Configurator/Group.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getActiveShopByRequestAsArray\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Group\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Repository.php
+			path: engine/Shopware/Models/Article/Configurator/Group.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getActiveShopByRequestAsArray\\(\\) should return array\\|null but returns array\\|false\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Group\\:\\:setDescription\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Repository.php
+			path: engine/Shopware/Models/Article/Configurator/Group.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getActiveShops\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Group\\:\\:setName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Repository.php
+			path: engine/Shopware/Models/Article/Configurator/Group.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getActiveShopsFixed\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Group\\:\\:setOptions\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Repository.php
+			path: engine/Shopware/Models/Article/Configurator/Group.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getBaseListQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Group\\:\\:setPosition\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Repository.php
+			path: engine/Shopware/Models/Article/Configurator/Group.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getBaseListQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Group\\:\\:setSets\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Repository.php
+			path: engine/Shopware/Models/Article/Configurator/Group.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getBaseListQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Group\\:\\:setSets\\(\\) has parameter \\$sets with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Repository.php
+			path: engine/Shopware/Models/Article/Configurator/Group.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getBaseListQueryBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Article\\\\Configurator\\\\Group\\:\\:\\$sets with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Repository.php
+			path: engine/Shopware/Models/Article/Configurator/Group.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getListQuery\\(\\) has parameter \\$filterBy with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Option\\:\\:getDependencyChildren\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Repository.php
+			path: engine/Shopware/Models/Article/Configurator/Option.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getListQuery\\(\\) has parameter \\$limit with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Option\\:\\:getDependencyParents\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Repository.php
+			path: engine/Shopware/Models/Article/Configurator/Option.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getListQuery\\(\\) has parameter \\$offset with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Option\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Repository.php
+			path: engine/Shopware/Models/Article/Configurator/Option.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getListQuery\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Option\\:\\:setDependencyChildren\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Repository.php
+			path: engine/Shopware/Models/Article/Configurator/Option.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getListQueryBuilder\\(\\) has parameter \\$filterBy with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Option\\:\\:setDependencyChildren\\(\\) has parameter \\$dependencyChildren with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Repository.php
+			path: engine/Shopware/Models/Article/Configurator/Option.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getListQueryBuilder\\(\\) has parameter \\$limit with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Option\\:\\:setDependencyParents\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Repository.php
+			path: engine/Shopware/Models/Article/Configurator/Option.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getListQueryBuilder\\(\\) has parameter \\$offset with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Option\\:\\:setDependencyParents\\(\\) has parameter \\$dependencyParents with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Repository.php
+			path: engine/Shopware/Models/Article/Configurator/Option.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getListQueryBuilder\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Option\\:\\:setGroup\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Repository.php
+			path: engine/Shopware/Models/Article/Configurator/Option.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getLocalesListQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Option\\:\\:setMediaId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Repository.php
+			path: engine/Shopware/Models/Article/Configurator/Option.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getLocalesListQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Option\\:\\:setName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Repository.php
+			path: engine/Shopware/Models/Article/Configurator/Option.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getLocalesListQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Option\\:\\:setPosition\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Repository.php
+			path: engine/Shopware/Models/Article/Configurator/Option.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getLocalesListQueryBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Article\\\\Configurator\\\\Option\\:\\:\\$articles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Repository.php
+			path: engine/Shopware/Models/Article/Configurator/Option.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getShopArrayByHostAlias\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Article\\\\Configurator\\\\Option\\:\\:\\$dependencyChildren with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Repository.php
+			path: engine/Shopware/Models/Article/Configurator/Option.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getShopsArrayByHost\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Article\\\\Configurator\\\\Option\\:\\:\\$dependencyParents with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Repository.php
+			path: engine/Shopware/Models/Article/Configurator/Option.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getShopsWithThemes\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Article\\\\Configurator\\\\Option\\:\\:\\$sets with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Repository.php
+			path: engine/Shopware/Models/Article/Configurator/Option.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getShopsWithThemes\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\PriceVariation\\:\\:setConfiguratorSet\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Repository.php
+			path: engine/Shopware/Models/Article/Configurator/PriceVariation.php
 
 		-
-			message: "#^Parameter \\#2 \\$callback of function usort expects callable\\(mixed, mixed\\)\\: int, Closure\\(mixed, mixed\\)\\: \\-1\\|0\\|1\\|bool given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\PriceVariation\\:\\:setIsGross\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Repository.php
+			path: engine/Shopware/Models/Article/Configurator/PriceVariation.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:get\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\PriceVariation\\:\\:setOptions\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Shop.php
+			path: engine/Shopware/Models/Article/Configurator/PriceVariation.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:getChildren\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\PriceVariation\\:\\:setVariation\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Shop.php
+			path: engine/Shopware/Models/Article/Configurator/PriceVariation.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:getCurrencies\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\:\\:getArticles\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Shop.php
+			path: engine/Shopware/Models/Article/Configurator/Set.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:getPages\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\:\\:getDependencies\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Shop.php
+			path: engine/Shopware/Models/Article/Configurator/Set.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setActive\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\:\\:getGroups\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Shop.php
+			path: engine/Shopware/Models/Article/Configurator/Set.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\:\\:setArticles\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Shop.php
+			path: engine/Shopware/Models/Article/Configurator/Set.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setBasePath\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\:\\:setArticles\\(\\) has parameter \\$articles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Shop.php
+			path: engine/Shopware/Models/Article/Configurator/Set.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setBaseUrl\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\:\\:setDependencies\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Shop.php
+			path: engine/Shopware/Models/Article/Configurator/Set.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setCategory\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\:\\:setDependencies\\(\\) has parameter \\$dependencies with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Shop.php
+			path: engine/Shopware/Models/Article/Configurator/Set.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setChildren\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\:\\:setName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Shop.php
+			path: engine/Shopware/Models/Article/Configurator/Set.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setChildren\\(\\) has parameter \\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\:\\:setPublic\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Shop.php
+			path: engine/Shopware/Models/Article/Configurator/Set.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setCurrencies\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\:\\:setType\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Shop.php
+			path: engine/Shopware/Models/Article/Configurator/Set.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setCurrencies\\(\\) has parameter \\$currencies with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			message: "#^Property Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\:\\:\\$articles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Shop.php
+			path: engine/Shopware/Models/Article/Configurator/Set.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setCurrency\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\:\\:\\$dependencies with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Shop.php
+			path: engine/Shopware/Models/Article/Configurator/Set.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setCustomerGroup\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\:\\:\\$groups with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Shop.php
+			path: engine/Shopware/Models/Article/Configurator/Set.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setCustomerScope\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\:\\:\\$priceVariations with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Shop.php
+			path: engine/Shopware/Models/Article/Configurator/Set.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setDefault\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Template\\\\Price\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Shop.php
+			path: engine/Shopware/Models/Article/Configurator/Template/Price.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setDocumentTemplate\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Template\\\\Price\\:\\:setTemplate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Shop.php
+			path: engine/Shopware/Models/Article/Configurator/Template/Price.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setFallback\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Template\\\\Template\\:\\:getAttribute\\(\\) should return Shopware\\\\Models\\\\Attribute\\\\Template but returns Shopware\\\\Models\\\\Attribute\\\\Template\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Shop.php
+			path: engine/Shopware/Models/Article/Configurator/Template/Template.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setHost\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Template\\\\Template\\:\\:getPrices\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Shop.php
+			path: engine/Shopware/Models/Article/Configurator/Template/Template.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setHosts\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Template\\\\Template\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Shop.php
+			path: engine/Shopware/Models/Article/Configurator/Template/Template.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setLocale\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Template\\\\Template\\:\\:setEan\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Shop.php
+			path: engine/Shopware/Models/Article/Configurator/Template/Template.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setMain\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Template\\\\Template\\:\\:setHeight\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Shop.php
+			path: engine/Shopware/Models/Article/Configurator/Template/Template.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setName\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Template\\\\Template\\:\\:setLastStock\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Shop.php
+			path: engine/Shopware/Models/Article/Configurator/Template/Template.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setPages\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Template\\\\Template\\:\\:setLen\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Shop.php
+			path: engine/Shopware/Models/Article/Configurator/Template/Template.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setPages\\(\\) has parameter \\$pages with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Template\\\\Template\\:\\:setUnit\\(\\) has parameter \\$unit with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Shop.php
+			path: engine/Shopware/Models/Article/Configurator/Template/Template.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setPosition\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Template\\\\Template\\:\\:setWidth\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Shop.php
+			path: engine/Shopware/Models/Article/Configurator/Template/Template.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setSecure\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Article\\\\Configurator\\\\Template\\\\Template\\:\\:\\$prices with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Shop.php
+			path: engine/Shopware/Models/Article/Configurator/Template/Template.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setTemplate\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Article\\\\Configurator\\\\Template\\\\Template\\:\\:\\$unit \\(Shopware\\\\Models\\\\Article\\\\Unit\\|null\\) does not accept array\\|Shopware\\\\Models\\\\Article\\\\Unit\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Shop.php
+			path: engine/Shopware/Models/Article/Configurator/Template/Template.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setTitle\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Detail\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Shop.php
+			path: engine/Shopware/Models/Article/Detail.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:\\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Detail\\:\\:setConfiguratorOptions\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Shop.php
+			path: engine/Shopware/Models/Article/Detail.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:\\$currencies with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Detail\\:\\:setEan\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Shop.php
+			path: engine/Shopware/Models/Article/Detail.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:\\$pages with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Detail\\:\\:setEsd\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Shop.php
+			path: engine/Shopware/Models/Article/Detail.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Template\\:\\:getConfigSets\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Detail\\:\\:setHeight\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Template.php
+			path: engine/Shopware/Models/Article/Detail.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Template\\:\\:getElements\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Detail\\:\\:setLen\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Template.php
+			path: engine/Shopware/Models/Article/Detail.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Template\\:\\:getLayouts\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Detail\\:\\:setUnit\\(\\) has parameter \\$unit with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Template.php
+			path: engine/Shopware/Models/Article/Detail.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Template\\:\\:getShops\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Detail\\:\\:setWidth\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Template.php
+			path: engine/Shopware/Models/Article/Detail.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Template\\:\\:setAuthor\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Article\\\\Detail\\:\\:\\$notifications with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Template.php
+			path: engine/Shopware/Models/Article/Detail.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Template\\:\\:setConfigSets\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Download\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Template.php
+			path: engine/Shopware/Models/Article/Download.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Template\\:\\:setConfigSets\\(\\) has parameter \\$configSets with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Element\\:\\:setDefault\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Template.php
+			path: engine/Shopware/Models/Article/Element.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Template\\:\\:setElements\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Element\\:\\:setHelp\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Template.php
+			path: engine/Shopware/Models/Article/Element.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Template\\:\\:setLayouts\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Element\\:\\:setLabel\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Template.php
+			path: engine/Shopware/Models/Article/Element.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Template\\:\\:setParent\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Element\\:\\:setName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Template.php
+			path: engine/Shopware/Models/Article/Element.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Template\\:\\:setPlugin\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Element\\:\\:setPosition\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Template.php
+			path: engine/Shopware/Models/Article/Element.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Template\\:\\:setShops\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Element\\:\\:setRequired\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Template.php
+			path: engine/Shopware/Models/Article/Element.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Template\\:\\:setShops\\(\\) has parameter \\$shops with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Element\\:\\:setStore\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Template.php
+			path: engine/Shopware/Models/Article/Element.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Template\\:\\:setVersion\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Element\\:\\:setTranslatable\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Template.php
+			path: engine/Shopware/Models/Article/Element.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Shop\\\\Template\\:\\:\\$configSets with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Element\\:\\:setType\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Template.php
+			path: engine/Shopware/Models/Article/Element.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Shop\\\\Template\\:\\:\\$elements with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Element\\:\\:setVariantable\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Template.php
+			path: engine/Shopware/Models/Article/Element.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Shop\\\\Template\\:\\:\\$layouts with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Esd\\:\\:getSerials\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Template.php
+			path: engine/Shopware/Models/Article/Esd.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Shop\\\\Template\\:\\:\\$shops with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Esd\\:\\:onPrePersist\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/Template.php
+			path: engine/Shopware/Models/Article/Esd.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:getDefaultValue\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Esd\\:\\:setArticle\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
+			path: engine/Shopware/Models/Article/Esd.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:getSelection\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Esd\\:\\:setArticleDetail\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
+			path: engine/Shopware/Models/Article/Esd.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:getValues\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Esd\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
+			path: engine/Shopware/Models/Article/Esd.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:setAllowBlank\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Esd\\:\\:setFile\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
+			path: engine/Shopware/Models/Article/Esd.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:setAttributes\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Esd\\:\\:setHasSerials\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
+			path: engine/Shopware/Models/Article/Esd.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:setContainer\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Esd\\:\\:setMaxdownloads\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
+			path: engine/Shopware/Models/Article/Esd.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:setDefaultValue\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Esd\\:\\:setNotification\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
+			path: engine/Shopware/Models/Article/Esd.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:setDefaultValue\\(\\) has parameter \\$defaultValue with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Esd\\:\\:setSerials\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
+			path: engine/Shopware/Models/Article/Esd.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:setFieldLabel\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Esd\\:\\:setSerials\\(\\) has parameter \\$serials with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
+			path: engine/Shopware/Models/Article/Esd.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:setLessCompatible\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Article\\\\Esd\\:\\:\\$serials with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
+			path: engine/Shopware/Models/Article/Esd.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:setName\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\EsdSerial\\:\\:setSerialnumber\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
+			path: engine/Shopware/Models/Article/EsdSerial.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:setPosition\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\:\\:getChildren\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
+			path: engine/Shopware/Models/Article/Image.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:setSelection\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\:\\:getMappings\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
+			path: engine/Shopware/Models/Article/Image.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:setSelection\\(\\) has parameter \\$selection with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\:\\:setArticle\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
+			path: engine/Shopware/Models/Article/Image.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:setSupportText\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\:\\:setArticleDetail\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
+			path: engine/Shopware/Models/Article/Image.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:setTemplate\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
+			path: engine/Shopware/Models/Article/Image.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:setType\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\:\\:setChildren\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
+			path: engine/Shopware/Models/Article/Image.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:toArray\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\:\\:setChildren\\(\\) has parameter \\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
+			path: engine/Shopware/Models/Article/Image.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:\\$defaultValue type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\:\\:setDescription\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
+			path: engine/Shopware/Models/Article/Image.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:\\$selection type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\:\\:setExtension\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
+			path: engine/Shopware/Models/Article/Image.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:\\$values with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\:\\:setHeight\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
+			path: engine/Shopware/Models/Article/Image.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Layout\\:\\:getChildren\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\:\\:setMain\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Layout.php
+			path: engine/Shopware/Models/Article/Image.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Layout\\:\\:getElements\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\:\\:setMedia\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Layout.php
+			path: engine/Shopware/Models/Article/Image.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Layout\\:\\:setAttributes\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\:\\:setParent\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Layout.php
+			path: engine/Shopware/Models/Article/Image.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Layout\\:\\:setChildren\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\:\\:setPath\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Layout.php
+			path: engine/Shopware/Models/Article/Image.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Layout\\:\\:setChildren\\(\\) has parameter \\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\:\\:setPosition\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Layout.php
+			path: engine/Shopware/Models/Article/Image.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Layout\\:\\:setElements\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\:\\:setRelations\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Layout.php
+			path: engine/Shopware/Models/Article/Image.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Layout\\:\\:setElements\\(\\) has parameter \\$elements with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\:\\:setWidth\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Layout.php
+			path: engine/Shopware/Models/Article/Image.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Layout\\:\\:setName\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Article\\\\Image\\:\\:\\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Layout.php
+			path: engine/Shopware/Models/Article/Image.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Layout\\:\\:setParent\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Article\\\\Image\\:\\:\\$mappings with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Layout.php
+			path: engine/Shopware/Models/Article/Image.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Layout\\:\\:setParentId\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\\\Mapping\\:\\:getRules\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Layout.php
+			path: engine/Shopware/Models/Article/Image/Mapping.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Layout\\:\\:setTemplate\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\\\Mapping\\:\\:setImage\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Layout.php
+			path: engine/Shopware/Models/Article/Image/Mapping.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Layout\\:\\:setTitle\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\\\Mapping\\:\\:setRules\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Layout.php
+			path: engine/Shopware/Models/Article/Image/Mapping.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Layout\\:\\:setType\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\\\Mapping\\:\\:setRules\\(\\) has parameter \\$rules with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Layout.php
+			path: engine/Shopware/Models/Article/Image/Mapping.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Layout\\:\\:\\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Property Shopware\\\\Models\\\\Article\\\\Image\\\\Mapping\\:\\:\\$rules with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Layout.php
+			path: engine/Shopware/Models/Article/Image/Mapping.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Layout\\:\\:\\$elements with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\\\Rule\\:\\:setMapping\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Layout.php
+			path: engine/Shopware/Models/Article/Image/Rule.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Set\\:\\:getValues\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Image\\\\Rule\\:\\:setOption\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Set.php
+			path: engine/Shopware/Models/Article/Image/Rule.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Set\\:\\:setDescription\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Link\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Set.php
+			path: engine/Shopware/Models/Article/Link.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Set\\:\\:setId\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Notification\\:\\:setArticleNumber\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Set.php
+			path: engine/Shopware/Models/Article/Notification.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Set\\:\\:setName\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Notification\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Set.php
+			path: engine/Shopware/Models/Article/Notification.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Set\\:\\:setTemplate\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Notification\\:\\:setMail\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Set.php
+			path: engine/Shopware/Models/Article/Notification.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Set\\:\\:setValues\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Price\\:\\:setArticle\\(\\) has parameter \\$article with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Set.php
+			path: engine/Shopware/Models/Article/Price.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Set\\:\\:setValues\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Price\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Set.php
+			path: engine/Shopware/Models/Article/Price.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Set\\:\\:\\$values type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Article\\\\Price\\:\\:\\$article \\(Shopware\\\\Models\\\\Article\\\\Article\\) does not accept array\\|Shopware\\\\Models\\\\Article\\\\Article\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Set.php
+			path: engine/Shopware/Models/Article/Price.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Value\\:\\:getValue\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getAllConfiguratorOptionsIndexedByIdQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Value.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Value\\:\\:setElement\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getArticleConfiguratorSetOptionIds\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Value.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Value\\:\\:setShop\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getArticleDetailForTableConfiguratorOptionCombinationQueryBuilder\\(\\) has parameter \\$article with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Value.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Value\\:\\:setValue\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getArticlesWithExcludedIdsQuery\\(\\) has parameter \\$filter with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Value.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Value\\:\\:setValue\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getArticlesWithExcludedIdsQueryBuilder\\(\\) has parameter \\$filter with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Value.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Value\\:\\:\\$value type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getArticlesWithRegisteredNotificationsBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Shop/TemplateConfig/Value.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Site\\\\Group\\:\\:setActive\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getArticlesWithRegisteredNotificationsBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Site/Group.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Site\\\\Group\\:\\:setKey\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getArticlesWithRegisteredNotificationsQuery\\(\\) has parameter \\$filter with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Site/Group.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Site\\\\Group\\:\\:setMapping\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getArticlesWithRegisteredNotificationsQuery\\(\\) has parameter \\$offset with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Site/Group.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Site\\\\Group\\:\\:setName\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getArticlesWithRegisteredNotificationsQuery\\(\\) has parameter \\$order with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Site/Group.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Site\\\\Repository\\:\\:getGroupListQuery\\(\\) has parameter \\$filterBy with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getConfiguratorListIdsQuery\\(\\) has parameter \\$filter with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Site/Repository.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Site\\\\Repository\\:\\:getGroupListQuery\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getConfiguratorListIdsQuery\\(\\) has parameter \\$limit with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Site/Repository.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Site\\\\Repository\\:\\:getGroupListQueryBuilder\\(\\) has parameter \\$filterBy with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getConfiguratorListIdsQuery\\(\\) has parameter \\$offset with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Site/Repository.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Site\\\\Repository\\:\\:getGroupListQueryBuilder\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getConfiguratorListIdsQuery\\(\\) has parameter \\$sort with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Site/Repository.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Site\\\\Site\\:\\:getChildren\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getConfiguratorListIdsQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Site/Site.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Site\\\\Site\\:\\:setActive\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getConfiguratorTablePreSelectionItemQuery\\(\\) has parameter \\$article with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Site/Site.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Site\\\\Site\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getConfiguratorTablePreSelectionItemQueryBuilder\\(\\) has parameter \\$article with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Site/Site.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Site\\\\Site\\:\\:setChildren\\(\\) has parameter \\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getDetailsByIdsQuery\\(\\) has parameter \\$sort with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Site/Site.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Site\\\\Site\\:\\:\\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getDetailsForOptionIdsQuery\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Site/Site.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Snippet\\\\Snippet\\:\\:onPrePersist\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getDetailsForOptionIdsQueryBuilder\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Snippet/Snippet.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Snippet\\\\Snippet\\:\\:onPreUpdate\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getEsdByArticleQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Snippet/Snippet.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Snippet\\\\Snippet\\:\\:setDirty\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getEsdByArticleQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Snippet/Snippet.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Snippet\\\\SnippetRepository\\:\\:getDistinctLocalesQuery\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getEsdByArticleQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Snippet/SnippetRepository.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Snippet\\\\SnippetRepository\\:\\:getDistinctLocalesQueryBuilder\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getEsdByArticleQueryBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Snippet/SnippetRepository.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Snippet\\\\SnippetRepository\\:\\:getDistinctNamespacesQuery\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getNotificationCustomerByArticleBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Snippet/SnippetRepository.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Snippet\\\\SnippetRepository\\:\\:getDistinctNamespacesQuery\\(\\) has parameter \\$limit with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getNotificationCustomerByArticleBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Snippet/SnippetRepository.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Snippet\\\\SnippetRepository\\:\\:getDistinctNamespacesQuery\\(\\) has parameter \\$locales with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getNotificationCustomerByArticleQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Snippet/SnippetRepository.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Snippet\\\\SnippetRepository\\:\\:getDistinctNamespacesQuery\\(\\) has parameter \\$offset with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getNotificationCustomerByArticleQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Snippet/SnippetRepository.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Snippet\\\\SnippetRepository\\:\\:getDistinctNamespacesQueryBuilder\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getSerialsByEsdQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Snippet/SnippetRepository.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Snippet\\\\SnippetRepository\\:\\:getDistinctNamespacesQueryBuilder\\(\\) has parameter \\$limit with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getSerialsByEsdQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Snippet/SnippetRepository.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Snippet\\\\SnippetRepository\\:\\:getDistinctNamespacesQueryBuilder\\(\\) has parameter \\$locales with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getSerialsByEsdQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Snippet/SnippetRepository.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Snippet\\\\SnippetRepository\\:\\:getDistinctNamespacesQueryBuilder\\(\\) has parameter \\$offset with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getSerialsByEsdQueryBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Snippet/SnippetRepository.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Cannot access offset 'id' on array\\<string, mixed\\>\\|false\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getSupplierListQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Tax/Repository.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Cannot access offset 'tax' on array\\<string, mixed\\>\\|false\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getSupplierListQuery\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Tax/Repository.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Repository\\:\\:getTaxQuery\\(\\) has parameter \\$filters with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getSupplierListQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Tax/Repository.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Repository\\:\\:getTaxQuery\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getSupplierListQueryBuilder\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Tax/Repository.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Repository\\:\\:getTaxQueryBuilder\\(\\) has parameter \\$filters with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getSuppliersWithExcludedIdsQuery\\(\\) has parameter \\$filter with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Tax/Repository.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Repository\\:\\:getTaxQueryBuilder\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getSuppliersWithExcludedIdsQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Tax/Repository.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Rule\\:\\:setActive\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getVoteListQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Tax/Rule.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Rule\\:\\:setArea\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getVoteListQueryBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Tax/Rule.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Rule\\:\\:setAreaId\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$filter of method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getVoteListQueryBuilder\\(\\) expects string, string\\|null given\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Tax/Rule.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Rule\\:\\:setCountry\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#3 \\$summarize of method Shopware\\\\Models\\\\Article\\\\Repository\\:\\:getArticlesWithRegisteredNotificationsBuilder\\(\\) expects bool, bool\\|null given\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Tax/Rule.php
+			path: engine/Shopware/Models/Article/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Rule\\:\\:setCountryId\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\SeoCategory\\:\\:setArticle\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Tax/Rule.php
+			path: engine/Shopware/Models/Article/SeoCategory.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Rule\\:\\:setCustomerGroup\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\SeoCategory\\:\\:setCategory\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Tax/Rule.php
+			path: engine/Shopware/Models/Article/SeoCategory.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Rule\\:\\:setCustomerGroupId\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\SeoCategory\\:\\:setShop\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Tax/Rule.php
+			path: engine/Shopware/Models/Article/SeoCategory.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Rule\\:\\:setGroup\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Supplier\\:\\:getArticles\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Tax/Rule.php
+			path: engine/Shopware/Models/Article/Supplier.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Rule\\:\\:setGroupId\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Supplier\\:\\:setArticles\\(\\) has parameter \\$articles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Tax/Rule.php
+			path: engine/Shopware/Models/Article/Supplier.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Rule\\:\\:setName\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Supplier\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Tax/Rule.php
+			path: engine/Shopware/Models/Article/Supplier.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Rule\\:\\:setState\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Supplier\\:\\:setMetaDescription\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Tax/Rule.php
+			path: engine/Shopware/Models/Article/Supplier.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Rule\\:\\:setStateId\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Supplier\\:\\:setMetaKeywords\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Tax/Rule.php
+			path: engine/Shopware/Models/Article/Supplier.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Rule\\:\\:setTax\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Supplier\\:\\:setMetaTitle\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Tax/Rule.php
+			path: engine/Shopware/Models/Article/Supplier.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Tax\\:\\:getRules\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Supplier\\:\\:setPrimaryIdentifier\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Tax/Tax.php
+			path: engine/Shopware/Models/Article/Supplier.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Tax\\:\\:setRules\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Article\\\\Supplier\\:\\:\\$articles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Tax/Tax.php
+			path: engine/Shopware/Models/Article/Supplier.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Tax\\:\\:setRules\\(\\) has parameter \\$rules with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\SupplierRepository\\:\\:getListQuery\\(\\) has parameter \\$filterBy with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Tax/Tax.php
+			path: engine/Shopware/Models/Article/SupplierRepository.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Tax\\\\Tax\\:\\:\\$rules with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\SupplierRepository\\:\\:getListQuery\\(\\) has parameter \\$limit with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Tax/Tax.php
+			path: engine/Shopware/Models/Article/SupplierRepository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Theme\\\\Settings\\:\\:setCompressCss\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\SupplierRepository\\:\\:getListQuery\\(\\) has parameter \\$offset with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Theme/Settings.php
+			path: engine/Shopware/Models/Article/SupplierRepository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Theme\\\\Settings\\:\\:setCompressJs\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\SupplierRepository\\:\\:getListQuery\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Theme/Settings.php
+			path: engine/Shopware/Models/Article/SupplierRepository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Theme\\\\Settings\\:\\:setCreateSourceMap\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\SupplierRepository\\:\\:getListQueryBuilder\\(\\) has parameter \\$limit with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Theme/Settings.php
+			path: engine/Shopware/Models/Article/SupplierRepository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Theme\\\\Settings\\:\\:setForceCompile\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\SupplierRepository\\:\\:getListQueryBuilder\\(\\) has parameter \\$offset with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Theme/Settings.php
+			path: engine/Shopware/Models/Article/SupplierRepository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Theme\\\\Settings\\:\\:setReloadSnippets\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Unit\\:\\:getArticles\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Theme/Settings.php
+			path: engine/Shopware/Models/Article/Unit.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Tracking\\\\ArticleImpression\\:\\:setArticleId\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Unit\\:\\:setArticles\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Tracking/ArticleImpression.php
+			path: engine/Shopware/Models/Article/Unit.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Tracking\\\\ArticleImpression\\:\\:setDate\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Unit\\:\\:setArticles\\(\\) has parameter \\$articles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Tracking/ArticleImpression.php
+			path: engine/Shopware/Models/Article/Unit.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Tracking\\\\ArticleImpression\\:\\:setDeviceType\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Article\\\\Unit\\:\\:\\$articles \\(Doctrine\\\\Common\\\\Collections\\\\ArrayCollection&iterable\\<Shopware\\\\Models\\\\Article\\\\Detail\\>\\) does not accept \\(Doctrine\\\\Common\\\\Collections\\\\ArrayCollection&iterable\\<Shopware\\\\Models\\\\Article\\\\Detail\\>\\)\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Tracking/ArticleImpression.php
+			path: engine/Shopware/Models/Article/Unit.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Tracking\\\\ArticleImpression\\:\\:setImpressions\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Article\\\\Unit\\:\\:\\$articles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Tracking/ArticleImpression.php
+			path: engine/Shopware/Models/Article/Unit.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Tracking\\\\ArticleImpression\\:\\:setShopId\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Vote\\:\\:setArticle\\(\\) has parameter \\$article with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Tracking/ArticleImpression.php
+			path: engine/Shopware/Models/Article/Vote.php
 
 		-
-			message: "#^Parameter \\#1 \\$deviceType of method Shopware\\\\Models\\\\Tracking\\\\ArticleImpression\\:\\:setDeviceType\\(\\) expects string, string\\|null given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Article\\\\Vote\\:\\:setShop\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Tracking/ArticleImpression.php
+			path: engine/Shopware/Models/Article/Vote.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Translation\\\\Translation\\:\\:setData\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$datetime of class DateTime constructor expects string, string\\|null given\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Translation/Translation.php
+			path: engine/Shopware/Models/Article/Vote.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Translation\\\\Translation\\:\\:setKey\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Article\\\\Vote\\:\\:\\$article \\(Shopware\\\\Models\\\\Article\\\\Article\\) does not accept array\\|Shopware\\\\Models\\\\Article\\\\Article\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Translation/Translation.php
+			path: engine/Shopware/Models/Article/Vote.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Translation\\\\Translation\\:\\:setShop\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Attribute\\\\Configuration\\:\\:setArrayStore\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Translation/Translation.php
+			path: engine/Shopware/Models/Attribute/Configuration.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Translation\\\\Translation\\:\\:setShopId\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Attribute\\\\Configuration\\:\\:setColumnName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Translation/Translation.php
+			path: engine/Shopware/Models/Attribute/Configuration.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Translation\\\\Translation\\:\\:setType\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Attribute\\\\Configuration\\:\\:setColumnType\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Translation/Translation.php
+			path: engine/Shopware/Models/Attribute/Configuration.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\User\\\\Privilege\\:\\:getRequirements\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Attribute\\\\Configuration\\:\\:setCustom\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/User/Privilege.php
+			path: engine/Shopware/Models/Attribute/Configuration.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\User\\\\Privilege\\:\\:onRemove\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Attribute\\\\Configuration\\:\\:setDefaultValue\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/User/Privilege.php
+			path: engine/Shopware/Models/Attribute/Configuration.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\User\\\\Privilege\\:\\:setRequirements\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Attribute\\\\Configuration\\:\\:setDisplayInBackend\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/User/Privilege.php
+			path: engine/Shopware/Models/Attribute/Configuration.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\User\\\\Privilege\\:\\:setRequirements\\(\\) has parameter \\$requirements with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Attribute\\\\Configuration\\:\\:setEntity\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/User/Privilege.php
+			path: engine/Shopware/Models/Attribute/Configuration.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\User\\\\Privilege\\:\\:setResource\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Attribute\\\\Configuration\\:\\:setHelpText\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/User/Privilege.php
+			path: engine/Shopware/Models/Attribute/Configuration.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\User\\\\Privilege\\:\\:\\$requirements with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Attribute\\\\Configuration\\:\\:setLabel\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/User/Privilege.php
+			path: engine/Shopware/Models/Attribute/Configuration.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\User\\\\Repository\\:\\:getUsersQuery\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Attribute\\\\Configuration\\:\\:setPosition\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/User/Repository.php
+			path: engine/Shopware/Models/Attribute/Configuration.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\User\\\\Resource\\:\\:getPrivileges\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Attribute\\\\Configuration\\:\\:setSupportText\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/User/Resource.php
+			path: engine/Shopware/Models/Attribute/Configuration.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\User\\\\Resource\\:\\:onRemove\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Attribute\\\\Configuration\\:\\:setTableName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/User/Resource.php
+			path: engine/Shopware/Models/Attribute/Configuration.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\User\\\\Resource\\:\\:setPluginId\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Attribute\\\\Configuration\\:\\:setTranslatable\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/User/Resource.php
+			path: engine/Shopware/Models/Attribute/Configuration.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\User\\\\Resource\\:\\:setPrivileges\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Banner\\\\Banner\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/User/Resource.php
+			path: engine/Shopware/Models/Banner/Banner.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\User\\\\Resource\\:\\:setPrivileges\\(\\) has parameter \\$privileges with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			message: "#^Property Shopware\\\\Models\\\\Banner\\\\Banner\\:\\:\\$validFrom \\(DateTimeInterface\\) does not accept DateTimeInterface\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Models/User/Resource.php
+			path: engine/Shopware/Models/Banner/Banner.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\User\\\\Resource\\:\\:\\$privileges with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Property Shopware\\\\Models\\\\Banner\\\\Banner\\:\\:\\$validTo \\(DateTimeInterface\\) does not accept DateTimeInterface\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Models/User/Resource.php
+			path: engine/Shopware/Models/Banner/Banner.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\User\\\\Role\\:\\:getChildren\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Banner\\\\Repository\\:\\:getBannerIds\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/User/Role.php
+			path: engine/Shopware/Models/Banner/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\User\\\\Role\\:\\:getPrivileges\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Parameter \\#1 \\$categoryId of method Shopware\\\\Models\\\\Banner\\\\Repository\\:\\:getBannerIds\\(\\) expects int, int\\|null given\\.$#"
 			count: 1
-			path: engine/Shopware/Models/User/Role.php
+			path: engine/Shopware/Models/Banner/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\User\\\\Role\\:\\:getRules\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:getAssignedArticles\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/User/Role.php
+			path: engine/Shopware/Models/Blog/Blog.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\User\\\\Role\\:\\:getUsers\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:getComments\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/User/Role.php
+			path: engine/Shopware/Models/Blog/Blog.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\User\\\\Role\\:\\:setChildren\\(\\) has parameter \\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:getMedia\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/User/Role.php
+			path: engine/Shopware/Models/Blog/Blog.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\User\\\\Role\\:\\:setParent\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:getTags\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/User/Role.php
+			path: engine/Shopware/Models/Blog/Blog.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\User\\\\Role\\:\\:setUsers\\(\\) has parameter \\$users with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setActive\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/User/Role.php
+			path: engine/Shopware/Models/Blog/Blog.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\User\\\\Role\\:\\:\\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setAssignedArticles\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/User/Role.php
+			path: engine/Shopware/Models/Blog/Blog.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\User\\\\Role\\:\\:\\$rules with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setAssignedArticles\\(\\) has parameter \\$assignedArticles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/User/Role.php
+			path: engine/Shopware/Models/Blog/Blog.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\User\\\\Role\\:\\:\\$users with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/User/Role.php
+			path: engine/Shopware/Models/Blog/Blog.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\User\\\\Rule\\:\\:setId\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setAuthor\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/User/Rule.php
+			path: engine/Shopware/Models/Blog/Blog.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\User\\\\Rule\\:\\:setPrivilege\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setCategory\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/User/Rule.php
+			path: engine/Shopware/Models/Blog/Blog.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\User\\\\Rule\\:\\:setPrivilegeId\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setCategoryId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/User/Rule.php
+			path: engine/Shopware/Models/Blog/Blog.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\User\\\\Rule\\:\\:setResource\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setDescription\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/User/Rule.php
+			path: engine/Shopware/Models/Blog/Blog.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\User\\\\Rule\\:\\:setResourceId\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setDisplayDate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/User/Rule.php
+			path: engine/Shopware/Models/Blog/Blog.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\User\\\\Rule\\:\\:setRole\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setMetaDescription\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/User/Rule.php
+			path: engine/Shopware/Models/Blog/Blog.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\User\\\\Rule\\:\\:setRoleId\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setMetaKeyWords\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/User/Rule.php
+			path: engine/Shopware/Models/Blog/Blog.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\User\\\\User\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setMetaTitle\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/User/User.php
+			path: engine/Shopware/Models/Blog/Blog.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\User\\\\User\\:\\:setLockedUntil\\(\\) has parameter \\$lockedUntil with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setShortDescription\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/User/User.php
+			path: engine/Shopware/Models/Blog/Blog.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\User\\\\User\\:\\:\\$lastLogin \\(DateTimeInterface\\) does not accept DateTimeInterface\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setTags\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/User/User.php
+			path: engine/Shopware/Models/Blog/Blog.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Voucher\\\\Code\\:\\:setCustomer\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setTags\\(\\) has parameter \\$tags with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Voucher/Code.php
+			path: engine/Shopware/Models/Blog/Blog.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Voucher\\\\Code\\:\\:setVoucher\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setTemplate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Voucher/Code.php
+			path: engine/Shopware/Models/Blog/Blog.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Voucher\\\\Voucher\\:\\:getCodes\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setTitle\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Voucher/Voucher.php
+			path: engine/Shopware/Models/Blog/Blog.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Voucher\\\\Voucher\\:\\:setCodes\\(\\) has parameter \\$codes with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:setViews\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Voucher/Voucher.php
+			path: engine/Shopware/Models/Blog/Blog.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Voucher\\\\Voucher\\:\\:setCodes\\(\\) has parameter \\$codes with no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:\\$assignedArticles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Voucher/Voucher.php
+			path: engine/Shopware/Models/Blog/Blog.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Voucher\\\\Voucher\\:\\:setCustomerStreamIds\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:\\$comments with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Voucher/Voucher.php
+			path: engine/Shopware/Models/Blog/Blog.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Voucher\\\\Voucher\\:\\:\\$codes with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Property Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:\\$displayDate \\(DateTimeInterface\\) does not accept DateTimeInterface\\|string\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Voucher/Voucher.php
+			path: engine/Shopware/Models/Blog/Blog.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Voucher\\\\Voucher\\:\\:\\$validFrom \\(DateTimeInterface\\|null\\) does not accept DateTimeInterface\\|string\\|null\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:\\$media with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Voucher/Voucher.php
+			path: engine/Shopware/Models/Blog/Blog.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Voucher\\\\Voucher\\:\\:\\$validTo \\(DateTimeInterface\\|null\\) does not accept DateTimeInterface\\|string\\|null\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Blog\\\\Blog\\:\\:\\$tags with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Models/Voucher/Voucher.php
+			path: engine/Shopware/Models/Blog/Blog.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Widget\\\\View\\:\\:getData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Comment\\:\\:setActive\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Widget/View.php
+			path: engine/Shopware/Models/Blog/Comment.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Widget\\\\View\\:\\:setAuth\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Comment\\:\\:setBlog\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Widget/View.php
+			path: engine/Shopware/Models/Blog/Comment.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Widget\\\\View\\:\\:setAuthId\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Comment\\:\\:setComment\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Widget/View.php
+			path: engine/Shopware/Models/Blog/Comment.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Widget\\\\View\\:\\:setColumn\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Comment\\:\\:setCreationDate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Widget/View.php
+			path: engine/Shopware/Models/Blog/Comment.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Widget\\\\View\\:\\:setData\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Comment\\:\\:setEmail\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Widget/View.php
+			path: engine/Shopware/Models/Blog/Comment.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Widget\\\\View\\:\\:setData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Comment\\:\\:setHeadline\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Widget/View.php
+			path: engine/Shopware/Models/Blog/Comment.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Widget\\\\View\\:\\:setPosition\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Comment\\:\\:setName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Widget/View.php
+			path: engine/Shopware/Models/Blog/Comment.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Widget\\\\View\\:\\:setWidget\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Comment\\:\\:setPoints\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Widget/View.php
+			path: engine/Shopware/Models/Blog/Comment.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Widget\\\\View\\:\\:\\$data type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Comment\\:\\:setShop\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Widget/View.php
+			path: engine/Shopware/Models/Blog/Comment.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Widget\\\\Widget\\:\\:getViews\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Comment\\:\\:setShopId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Widget/Widget.php
+			path: engine/Shopware/Models/Blog/Comment.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Widget\\\\Widget\\:\\:setName\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Blog\\\\Comment\\:\\:\\$creationDate \\(DateTimeInterface\\) does not accept DateTimeInterface\\|string\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Widget/Widget.php
+			path: engine/Shopware/Models/Blog/Comment.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Widget\\\\Widget\\:\\:setPlugin\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Media\\:\\:setBlog\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Widget/Widget.php
+			path: engine/Shopware/Models/Blog/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Widget\\\\Widget\\:\\:setViews\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Media\\:\\:setMedia\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Widget/Widget.php
+			path: engine/Shopware/Models/Blog/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Models\\\\Widget\\\\Widget\\:\\:setViews\\(\\) has parameter \\$views with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Media\\:\\:setPreview\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Widget/Widget.php
+			path: engine/Shopware/Models/Blog/Media.php
 
 		-
-			message: "#^Property Shopware\\\\Models\\\\Widget\\\\Widget\\:\\:\\$views with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getAuthorFilterQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Models/Widget/Widget.php
+			path: engine/Shopware/Models/Blog/Repository.php
 
 		-
-			message: "#^Call to an undefined method Enlight_Event_EventArgs\\:\\:getSubject\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getAuthorFilterQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/Auth/Bootstrap.php
+			path: engine/Shopware/Models/Blog/Repository.php
 
 		-
-			message: "#^Call to an undefined method Enlight_Template_Default\\:\\:setCompileId\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getBackedDetailQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/Auth/Bootstrap.php
+			path: engine/Shopware/Models/Blog/Repository.php
 
 		-
-			message: "#^Call to an undefined method Enlight_Template_Manager\\:\\:getCompileId\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getBackendDetailQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/Auth/Bootstrap.php
+			path: engine/Shopware/Models/Blog/Repository.php
 
 		-
-			message: "#^Method Shopware_Plugins_Backend_Auth_Bootstrap\\:\\:getLocales\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getBackendListQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/Auth/Bootstrap.php
+			path: engine/Shopware/Models/Blog/Repository.php
 
 		-
-			message: "#^Method Shopware_Plugins_Backend_Auth_Bootstrap\\:\\:initLocale\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getBackendListQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/Auth/Bootstrap.php
+			path: engine/Shopware/Models/Blog/Repository.php
 
 		-
-			message: "#^Method Shopware_Plugins_Backend_Auth_Bootstrap\\:\\:isAllowed\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getBlogCommentsById\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/Auth/Bootstrap.php
+			path: engine/Shopware/Models/Blog/Repository.php
 
 		-
-			message: "#^Method Shopware_Plugins_Backend_Auth_Bootstrap\\:\\:onPreDispatchBackend\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getBlogCommentsById\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/Auth/Bootstrap.php
+			path: engine/Shopware/Models/Blog/Repository.php
 
 		-
-			message: "#^Method Shopware_Plugins_Backend_Auth_Bootstrap\\:\\:registerAclPlugin\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getBlogCommentsByIdBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/Auth/Bootstrap.php
+			path: engine/Shopware/Models/Blog/Repository.php
 
 		-
-			message: "#^Method Shopware_Plugins_Backend_Auth_Bootstrap\\:\\:setNoAcl\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getDisplayDateFilterQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/Auth/Bootstrap.php
+			path: engine/Shopware/Models/Blog/Repository.php
 
 		-
-			message: "#^Method Shopware_Plugins_Backend_Auth_Bootstrap\\:\\:setNoAuth\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getDisplayDateFilterQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/Auth/Bootstrap.php
+			path: engine/Shopware/Models/Blog/Repository.php
 
 		-
-			message: "#^Method Shopware_Plugins_Backend_SwagUpdate_Bootstrap\\:\\:afterInit\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getFilterQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Bootstrap.php
+			path: engine/Shopware/Models/Blog/Repository.php
 
 		-
-			message: "#^Method Shopware_Plugins_Backend_SwagUpdate_Bootstrap\\:\\:installForm\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getListQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Bootstrap.php
+			path: engine/Shopware/Models/Blog/Repository.php
 
 		-
-			message: "#^Method Shopware_Plugins_Backend_SwagUpdate_Bootstrap\\:\\:onBackendIndexPostDispatch\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getListQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Bootstrap.php
+			path: engine/Shopware/Models/Blog/Repository.php
 
 		-
-			message: "#^Method Shopware_Plugins_Backend_SwagUpdate_Bootstrap\\:\\:onInitUpdateCheck\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getTagsFilterQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Bootstrap.php
+			path: engine/Shopware/Models/Blog/Repository.php
 
 		-
-			message: "#^Class ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Archive\\\\Adapter implements generic interface SeekableIterator but does not specify its types\\: TKey, TValue$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getTagsFilterQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Archive/Adapter.php
+			path: engine/Shopware/Models/Blog/Repository.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Archive\\\\Adapter\\:\\:each\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#2 \\$filter of method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getBackendListQueryBuilder\\(\\) expects array, array\\|null given\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Archive/Adapter.php
+			path: engine/Shopware/Models/Blog/Repository.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Archive\\\\Entry\\\\Zip\\:\\:getContents\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#2 \\$filter of method Shopware\\\\Models\\\\Blog\\\\Repository\\:\\:getListQueryBuilder\\(\\) expects array, array\\|null given\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Archive/Entry/Zip.php
+			path: engine/Shopware/Models/Blog/Repository.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Archive\\\\Entry\\\\Zip\\:\\:getStream\\(\\) should return resource but returns resource\\|false\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Tag\\:\\:setBlog\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Archive/Entry/Zip.php
+			path: engine/Shopware/Models/Blog/Tag.php
 
 		-
-			message: "#^Property ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Archive\\\\Entry\\\\Zip\\:\\:\\$name \\(string\\) does not accept string\\|false\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Blog\\\\Tag\\:\\:setName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Archive/Entry/Zip.php
+			path: engine/Shopware/Models/Blog/Tag.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Archive\\\\Zip\\:\\:__construct\\(\\) has parameter \\$flags with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:getAllArticles\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Archive/Zip.php
+			path: engine/Shopware/Models/Category/Category.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Archive\\\\Zip\\:\\:getContents\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:getArticles\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Archive/Zip.php
+			path: engine/Shopware/Models/Category/Category.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Archive\\\\Zip\\:\\:getEntry\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:getChildren\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Archive/Zip.php
+			path: engine/Shopware/Models/Category/Category.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Archive\\\\Zip\\:\\:getStream\\(\\) should return resource but returns resource\\|false\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:getCustomerGroups\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Archive/Zip.php
+			path: engine/Shopware/Models/Category/Category.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\CheckInterface\\:\\:canHandle\\(\\) has parameter \\$requirement with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:getEmotions\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/CheckInterface.php
+			path: engine/Shopware/Models/Category/Category.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\CheckInterface\\:\\:check\\(\\) has parameter \\$requirement with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:getManualSorting\\(\\) return type with generic interface Doctrine\\\\Common\\\\Collections\\\\Collection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/CheckInterface.php
+			path: engine/Shopware/Models/Category/Category.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\EmotionTemplateCheck\\:\\:canHandle\\(\\) has parameter \\$requirement with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:setArticles\\(\\) has parameter \\$articles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/EmotionTemplateCheck.php
+			path: engine/Shopware/Models/Category/Category.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\EmotionTemplateCheck\\:\\:check\\(\\) has parameter \\$requirement with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/EmotionTemplateCheck.php
+			path: engine/Shopware/Models/Category/Category.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\EmotionTemplateCheck\\:\\:getActiveEmotionTemplates\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:setBlog\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/EmotionTemplateCheck.php
+			path: engine/Shopware/Models/Category/Category.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\LicenseCheck\\:\\:canHandle\\(\\) has parameter \\$requirement with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:setChildren\\(\\) has parameter \\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/LicenseCheck.php
+			path: engine/Shopware/Models/Category/Category.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\LicenseCheck\\:\\:check\\(\\) has parameter \\$requirement with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:setCustomerGroups\\(\\) has parameter \\$customerGroups with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/LicenseCheck.php
+			path: engine/Shopware/Models/Category/Category.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\LicenseCheck\\:\\:getLicenseData\\(\\) has parameter \\$licenseKeys with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:setEmotions\\(\\) has parameter \\$emotions with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/LicenseCheck.php
+			path: engine/Shopware/Models/Category/Category.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\LicenseCheck\\:\\:getLicenseData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:setExternalTarget\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/LicenseCheck.php
+			path: engine/Shopware/Models/Category/Category.php
 
 		-
-			message: "#^Parameter \\#2 \\$objectDecodeType of static method Zend_Json\\:\\:decode\\(\\) expects int, true given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:setFacetIds\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/LicenseCheck.php
+			path: engine/Shopware/Models/Category/Category.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\MySQLVersionCheck\\:\\:canHandle\\(\\) has parameter \\$requirement with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:setHideSortings\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/MySQLVersionCheck.php
+			path: engine/Shopware/Models/Category/Category.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\MySQLVersionCheck\\:\\:check\\(\\) has parameter \\$requirement with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:setMetaTitle\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/MySQLVersionCheck.php
+			path: engine/Shopware/Models/Category/Category.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\PHPExtensionCheck\\:\\:canHandle\\(\\) has parameter \\$requirement with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:setPrimaryIdentifier\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/PHPExtensionCheck.php
+			path: engine/Shopware/Models/Category/Category.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\PHPExtensionCheck\\:\\:check\\(\\) has parameter \\$requirement with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:setSortingIds\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/PHPExtensionCheck.php
+			path: engine/Shopware/Models/Category/Category.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\PHPVersionCheck\\:\\:canHandle\\(\\) has parameter \\$requirement with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Category\\\\Category\\:\\:setStream\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/PHPVersionCheck.php
+			path: engine/Shopware/Models/Category/Category.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\PHPVersionCheck\\:\\:check\\(\\) has parameter \\$requirement with no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Category\\\\Category\\:\\:\\$allArticles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/PHPVersionCheck.php
+			path: engine/Shopware/Models/Category/Category.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\RegexCheck\\:\\:canHandle\\(\\) has parameter \\$requirement with no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Category\\\\Category\\:\\:\\$articles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/RegexCheck.php
+			path: engine/Shopware/Models/Category/Category.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\RegexCheck\\:\\:check\\(\\) has parameter \\$requirement with no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Category\\\\Category\\:\\:\\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/RegexCheck.php
+			path: engine/Shopware/Models/Category/Category.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\RegexCheck\\:\\:extractLocalizedMessage\\(\\) has parameter \\$messages with no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Category\\\\Category\\:\\:\\$customerGroups with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/RegexCheck.php
+			path: engine/Shopware/Models/Category/Category.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\RegexCheck\\:\\:scanDirectoryForRegex\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Category\\\\Category\\:\\:\\$emotions with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/RegexCheck.php
+			path: engine/Shopware/Models/Category/Category.php
 
 		-
-			message: "#^Parameter \\#2 \\$subject of function preg_match_all expects string, string\\|false given\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Category\\\\Category\\:\\:\\$manualSorting with generic interface Doctrine\\\\Common\\\\Collections\\\\Collection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/RegexCheck.php
+			path: engine/Shopware/Models/Category/Category.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\WritableCheck\\:\\:canHandle\\(\\) has parameter \\$requirement with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Category\\\\Repository\\:\\:getActiveArticleIdByCategoryId\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/WritableCheck.php
+			path: engine/Shopware/Models/Category/Repository.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\WritableCheck\\:\\:check\\(\\) has parameter \\$requirement with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Category\\\\Repository\\:\\:getActiveChildrenList\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/WritableCheck.php
+			path: engine/Shopware/Models/Category/Repository.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Download\\:\\:moveFile\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Category\\\\Repository\\:\\:getBlogCategoryTreeListQuery\\(\\) has parameter \\$filterBy with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Download.php
+			path: engine/Shopware/Models/Category/Repository.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Download\\:\\:progress\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Category\\\\Repository\\:\\:getCategoryPathBefore\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Download.php
+			path: engine/Shopware/Models/Category/Repository.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Download\\:\\:setHaltCallback\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Category\\\\Repository\\:\\:getFullChildrenList\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Download.php
+			path: engine/Shopware/Models/Category/Repository.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Download\\:\\:setProgressCallback\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Category\\\\Repository\\:\\:getListQuery\\(\\) has parameter \\$filterBy with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Download.php
+			path: engine/Shopware/Models/Category/Repository.php
 
 		-
-			message: "#^Negated boolean expression is always false\\.$#"
-			count: 2
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Download.php
+			message: "#^Method Shopware\\\\Models\\\\Category\\\\Repository\\:\\:getListQuery\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Category/Repository.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\ExtJsResultMapper\\:\\:toExtJs\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Category\\\\Repository\\:\\:getPathById\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/ExtJsResultMapper.php
+			path: engine/Shopware/Models/Category/Repository.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\FeedbackCollector\\:\\:gatherData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\CommentConfirm\\\\CommentConfirm\\:\\:setCreationDate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/FeedbackCollector.php
+			path: engine/Shopware/Models/CommentConfirm/CommentConfirm.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\FeedbackCollector\\:\\:submitData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\CommentConfirm\\\\CommentConfirm\\:\\:setData\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/FeedbackCollector.php
+			path: engine/Shopware/Models/CommentConfirm/CommentConfirm.php
 
 		-
-			message: "#^Parameter \\#1 \\$data of method Zend_Http_Client\\:\\:setRawData\\(\\) expects resource\\|string, string\\|false given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\CommentConfirm\\\\CommentConfirm\\:\\:setHash\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/FeedbackCollector.php
+			path: engine/Shopware/Models/CommentConfirm/CommentConfirm.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\FileSystem\\:\\:checkDirectoryPermissions\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\CommentConfirm\\\\CommentConfirm\\:\\:setType\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/FileSystem.php
+			path: engine/Shopware/Models/CommentConfirm/CommentConfirm.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\FileSystem\\:\\:checkSingleDirectoryPermissions\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\CommentConfirm\\\\CommentConfirm\\:\\:\\$creationDate \\(DateTimeInterface\\) does not accept DateTimeInterface\\|string\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/FileSystem.php
+			path: engine/Shopware/Models/CommentConfirm/CommentConfirm.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\FileSystem\\:\\:fixDirectoryPermission\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Config\\\\Element\\:\\:__construct\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/FileSystem.php
+			path: engine/Shopware/Models/Config/Element.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\FileSystem\\:\\:fixFilePermission\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Config\\\\Element\\:\\:getOptions\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/FileSystem.php
+			path: engine/Shopware/Models/Config/Element.php
 
 		-
-			message: "#^Cannot access property \\$sha1 on array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Config\\\\Element\\:\\:getTranslations\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/DownloadStep.php
+			path: engine/Shopware/Models/Config/Element.php
 
 		-
-			message: "#^Cannot access property \\$size on array\\.$#"
-			count: 3
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/DownloadStep.php
+			message: "#^Method Shopware\\\\Models\\\\Config\\\\Element\\:\\:getValues\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/Config/Element.php
 
 		-
-			message: "#^Cannot access property \\$uri on array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Config\\\\Element\\:\\:setForm\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/DownloadStep.php
+			path: engine/Shopware/Models/Config/Element.php
 
 		-
-			message: "#^Property ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Steps\\\\DownloadStep\\:\\:\\$version \\(array\\) does not accept ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Struct\\\\Version\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Config\\\\Element\\:\\:setOptions\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/DownloadStep.php
+			path: engine/Shopware/Models/Config/Element.php
 
 		-
-			message: "#^Property ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Steps\\\\DownloadStep\\:\\:\\$version type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Config\\\\Element\\:\\:setOptions\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/DownloadStep.php
+			path: engine/Shopware/Models/Config/Element.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Steps\\\\ErrorResult\\:\\:__construct\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Config\\\\Element\\:\\:setTranslations\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/ErrorResult.php
+			path: engine/Shopware/Models/Config/Element.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Steps\\\\ErrorResult\\:\\:getArgs\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Config\\\\Element\\:\\:setTranslations\\(\\) has parameter \\$translations with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/ErrorResult.php
+			path: engine/Shopware/Models/Config/Element.php
 
 		-
-			message: "#^Property ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Steps\\\\ErrorResult\\:\\:\\$args type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Config\\\\Element\\:\\:setValues\\(\\) has parameter \\$values with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/ErrorResult.php
+			path: engine/Shopware/Models/Config/Element.php
 
 		-
-			message: "#^Property ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Steps\\\\ErrorResult\\:\\:\\$exception \\(Exception\\) does not accept Exception\\|null\\.$#"
+			message: "#^Parameter \\#1 \\$options of method Shopware\\\\Models\\\\Config\\\\Element\\:\\:setOptions\\(\\) expects array, array\\|null given\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/ErrorResult.php
+			path: engine/Shopware/Models/Config/Element.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Steps\\\\FinishResult\\:\\:__construct\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Config\\\\Element\\:\\:\\$options type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/FinishResult.php
+			path: engine/Shopware/Models/Config/Element.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Steps\\\\FinishResult\\:\\:getArgs\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Config\\\\Element\\:\\:\\$translations with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/FinishResult.php
+			path: engine/Shopware/Models/Config/Element.php
 
 		-
-			message: "#^Property ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Steps\\\\FinishResult\\:\\:\\$args type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Config\\\\Element\\:\\:\\$values with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/FinishResult.php
+			path: engine/Shopware/Models/Config/Element.php
 
 		-
-			message: "#^Cannot use array destructuring on array\\|false\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Config\\\\ElementTranslation\\:\\:setLocale\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/UnpackStep.php
+			path: engine/Shopware/Models/Config/ElementTranslation.php
 
 		-
-			message: "#^Variable \\$entry in PHPDoc tag @var does not exist\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Config\\\\Form\\:\\:addElement\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/UnpackStep.php
+			path: engine/Shopware/Models/Config/Form.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Steps\\\\ValidResult\\:\\:__construct\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Config\\\\Form\\:\\:getChildren\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/ValidResult.php
+			path: engine/Shopware/Models/Config/Form.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Steps\\\\ValidResult\\:\\:getArgs\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Config\\\\Form\\:\\:getElements\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/ValidResult.php
+			path: engine/Shopware/Models/Config/Form.php
 
 		-
-			message: "#^Property ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Steps\\\\ValidResult\\:\\:\\$args type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Config\\\\Form\\:\\:getTranslations\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/ValidResult.php
+			path: engine/Shopware/Models/Config/Form.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Struct\\\\Struct\\:\\:__construct\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Config\\\\Form\\:\\:setChildren\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Struct/Struct.php
+			path: engine/Shopware/Models/Config/Form.php
 
 		-
-			message: "#^Property ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Struct\\\\Version\\:\\:\\$changelog type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Config\\\\Form\\:\\:setChildren\\(\\) has parameter \\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Struct/Version.php
+			path: engine/Shopware/Models/Config/Form.php
 
 		-
-			message: "#^Property ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Struct\\\\Version\\:\\:\\$checks type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Config\\\\Form\\:\\:setParent\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Struct/Version.php
+			path: engine/Shopware/Models/Config/Form.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\UpdateCheck\\:\\:checkUpdate\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Config\\\\Form\\:\\:setPluginId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/UpdateCheck.php
+			path: engine/Shopware/Models/Config/Form.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\UpdateCheck\\:\\:setVerifyResponseSignature\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Config\\\\Form\\:\\:setPosition\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/UpdateCheck.php
+			path: engine/Shopware/Models/Config/Form.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\UpdateCheck\\:\\:verifyBody\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#2 \\$name of class Shopware\\\\Models\\\\Config\\\\Element constructor expects string, string\\|null given\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/UpdateCheck.php
+			path: engine/Shopware/Models/Config/Form.php
 
 		-
-			message: "#^Parameter \\#1 \\$signature of method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\UpdateCheck\\:\\:verifyBody\\(\\) expects string, array\\|string\\|null given\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Config\\\\Form\\:\\:\\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/UpdateCheck.php
+			path: engine/Shopware/Models/Config/Form.php
 
 		-
-			message: "#^Parameter \\#2 \\$objectDecodeType of static method Zend_Json\\:\\:decode\\(\\) expects int, true given\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Config\\\\Form\\:\\:\\$elements with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/UpdateCheck.php
+			path: engine/Shopware/Models/Config/Form.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Validation\\:\\:checkRequirements\\(\\) has parameter \\$requirements with no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Config\\\\Form\\:\\:\\$translations with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Validation.php
+			path: engine/Shopware/Models/Config/Form.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Validation\\:\\:handleRequirement\\(\\) has parameter \\$requirement with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Config\\\\FormTranslation\\:\\:setForm\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Validation.php
+			path: engine/Shopware/Models/Config/FormTranslation.php
 
 		-
-			message: "#^Cannot access property \\$version on ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Struct\\\\Version\\|null\\.$#"
-			count: 2
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Controllers/Backend/SwagUpdate.php
+			message: "#^Method Shopware\\\\Models\\\\Config\\\\FormTranslation\\:\\:setLocale\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Config/FormTranslation.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_SwagUpdate\\:\\:changelogAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Country\\\\Area\\:\\:getCountries\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Controllers/Backend/SwagUpdate.php
+			path: engine/Shopware/Models/Country/Area.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_SwagUpdate\\:\\:createRecursiveFileIterator\\(\\) return type with generic class RecursiveIteratorIterator does not specify its types\\: T$#"
+			message: "#^Property Shopware\\\\Models\\\\Country\\\\Area\\:\\:\\$countries with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Controllers/Backend/SwagUpdate.php
+			path: engine/Shopware/Models/Country/Area.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_SwagUpdate\\:\\:downloadAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Country\\\\Country\\:\\:getPayments\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Controllers/Backend/SwagUpdate.php
+			path: engine/Shopware/Models/Country/Country.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_SwagUpdate\\:\\:isUpdateAllowedAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Country\\\\Country\\:\\:getStates\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Controllers/Backend/SwagUpdate.php
+			path: engine/Shopware/Models/Country/Country.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_SwagUpdate\\:\\:mapResult\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Country\\\\Country\\:\\:setAllowShipping\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Controllers/Backend/SwagUpdate.php
+			path: engine/Shopware/Models/Country/Country.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_SwagUpdate\\:\\:pluginsAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Country\\\\Country\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Controllers/Backend/SwagUpdate.php
+			path: engine/Shopware/Models/Country/Country.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_SwagUpdate\\:\\:popupAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Country\\\\Country\\:\\:setDisplayStateInRegistration\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Controllers/Backend/SwagUpdate.php
+			path: engine/Shopware/Models/Country/Country.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_SwagUpdate\\:\\:replaceRecoveryFiles\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Country\\\\Country\\:\\:setForceStateInRegistration\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Controllers/Backend/SwagUpdate.php
+			path: engine/Shopware/Models/Country/Country.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_SwagUpdate\\:\\:requirementsAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Country\\\\Country\\:\\:setPayments\\(\\) has parameter \\$payments with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Controllers/Backend/SwagUpdate.php
+			path: engine/Shopware/Models/Country/Country.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_SwagUpdate\\:\\:startUpdateAction\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Country\\\\Country\\:\\:\\$payments with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Controllers/Backend/SwagUpdate.php
+			path: engine/Shopware/Models/Country/Country.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_SwagUpdate\\:\\:unpackAction\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Country\\\\Country\\:\\:\\$states with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Controllers/Backend/SwagUpdate.php
+			path: engine/Shopware/Models/Country/Country.php
 
 		-
-			message: "#^Call to an undefined method Enlight_Event_EventArgs\\:\\:getSubject\\(\\)\\.$#"
-			count: 4
-			path: engine/Shopware/Plugins/Default/Core/ControllerBase/Bootstrap.php
+			message: "#^Method Shopware\\\\Models\\\\Country\\\\Repository\\:\\:getCountriesQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Country/Repository.php
 
 		-
-			message: "#^Call to an undefined method sMarketing\\:\\:sCampaignsGetList\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Country\\\\Repository\\:\\:getCountriesQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/ControllerBase/Bootstrap.php
+			path: engine/Shopware/Models/Country/Repository.php
 
 		-
-			message: "#^Cannot call method get\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
-			count: 2
-			path: engine/Shopware/Plugins/Default/Core/ControllerBase/Bootstrap.php
+			message: "#^Method Shopware\\\\Models\\\\Country\\\\Repository\\:\\:getCountriesQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Country/Repository.php
 
 		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Category\\\\Category\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Country\\\\Repository\\:\\:getCountriesQueryBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/ControllerBase/Bootstrap.php
+			path: engine/Shopware/Models/Country/Repository.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_ControllerBase_Bootstrap\\:\\:getCampaigns\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Country\\\\Repository\\:\\:getCountriesWithStatesQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/ControllerBase/Bootstrap.php
+			path: engine/Shopware/Models/Country/Repository.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_ControllerBase_Bootstrap\\:\\:getCategories\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Country\\\\Repository\\:\\:getCountriesWithStatesQueryBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/ControllerBase/Bootstrap.php
+			path: engine/Shopware/Models/Country/Repository.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_ControllerBase_Bootstrap\\:\\:getMenu\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Country\\\\State\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/ControllerBase/Bootstrap.php
+			path: engine/Shopware/Models/Country/State.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_ControllerBase_Bootstrap\\:\\:onPostDispatch\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Country\\\\State\\:\\:setPosition\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/ControllerBase/Bootstrap.php
+			path: engine/Shopware/Models/Country/State.php
 
 		-
-			message: "#^Call to an undefined method Enlight_Controller_Response_Response\\:\\:setStatusCode\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:getAdditional\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/Cron/Cron.php
+			path: engine/Shopware/Models/Customer/Address.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_Cron\\:\\:indexAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setAdditional\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/Cron/Cron.php
+			path: engine/Shopware/Models/Customer/Address.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_Cron\\:\\:init\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setAdditional\\(\\) has parameter \\$additional with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/Cron/Cron.php
+			path: engine/Shopware/Models/Customer/Address.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_CronBirthday_Bootstrap\\:\\:onRun\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setAdditionalAddressLine1\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/CronBirthday/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Address.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_CronProductExport_Bootstrap\\:\\:exportProductFiles\\(\\) should return string but returns true\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setAdditionalAddressLine2\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/CronProductExport/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Address.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_CronProductExport_Bootstrap\\:\\:onRun\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/CronProductExport/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Address.php
 
 		-
-			message: "#^Parameter \\#1 \\$handleResource of method sExport\\:\\:executeExport\\(\\) expects resource, resource\\|false given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setCity\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/CronProductExport/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Address.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_CronRating_Bootstrap\\:\\:getCustomers\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setCompany\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/CronRating/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Address.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_CronRating_Bootstrap\\:\\:getOrders\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setCountry\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/CronRating/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Address.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_CronRating_Bootstrap\\:\\:getPositionImages\\(\\) has parameter \\$shopPositions with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setCustomer\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/CronRating/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Address.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_CronRating_Bootstrap\\:\\:getPositionImages\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setDepartment\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/CronRating/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Address.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_CronRating_Bootstrap\\:\\:getPositions\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setFirstname\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/CronRating/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Address.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_CronRating_Bootstrap\\:\\:structurePositionsArray\\(\\) has parameter \\$orderPositions with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setLastname\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/CronRating/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Address.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_CronRating_Bootstrap\\:\\:structurePositionsArray\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setPhone\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/CronRating/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Address.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_CronStock_Bootstrap\\:\\:onRun\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setSalutation\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/CronStock/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Address.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_ErrorHandler_Bootstrap\\:\\:errorHandler\\(\\) should return bool but empty return statement found\\.$#"
-			count: 2
-			path: engine/Shopware/Plugins/Default/Core/ErrorHandler/Bootstrap.php
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setState\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Customer/Address.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_ErrorHandler_Bootstrap\\:\\:getErrorLog\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setStreet\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/ErrorHandler/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Address.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_ErrorHandler_Bootstrap\\:\\:onDispatchLoopShutdown\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setTitle\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/ErrorHandler/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Address.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_ErrorHandler_Bootstrap\\:\\:onStartDispatch\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setVatId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/ErrorHandler/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Address.php
 
 		-
-			message: "#^Property Shopware_Plugins_Core_ErrorHandler_Bootstrap\\:\\:\\$_errorLevelList type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Address\\:\\:setZipcode\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/ErrorHandler/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Address.php
 
 		-
-			message: "#^Property Shopware_Plugins_Core_ErrorHandler_Bootstrap\\:\\:\\$_errorList type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Customer\\\\Address\\:\\:\\$additional type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/ErrorHandler/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Address.php
 
 		-
-			message: "#^Property Shopware_Plugins_Core_ErrorHandler_Bootstrap\\:\\:\\$_errorLog \\(array\\) does not accept bool\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\AddressRepository\\:\\:getListArray\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/ErrorHandler/Bootstrap.php
+			path: engine/Shopware/Models/Customer/AddressRepository.php
 
 		-
-			message: "#^Property Shopware_Plugins_Core_ErrorHandler_Bootstrap\\:\\:\\$_errorLog \\(array\\) does not accept default value of type false\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\AddressRepository\\:\\:getListQuery\\(\\) has parameter \\$criteria with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/ErrorHandler/Bootstrap.php
+			path: engine/Shopware/Models/Customer/AddressRepository.php
 
 		-
-			message: "#^Property Shopware_Plugins_Core_ErrorHandler_Bootstrap\\:\\:\\$_errorLog type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\AddressRepository\\:\\:getListQuery\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/ErrorHandler/Bootstrap.php
+			path: engine/Shopware/Models/Customer/AddressRepository.php
 
 		-
-			message: "#^Static property Shopware_Plugins_Core_ErrorHandler_Bootstrap\\:\\:\\$_origErrorHandler \\(callable\\(\\)\\: mixed\\) does not accept \\(callable\\(\\)\\: mixed\\)\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\AddressRepository\\:\\:getListQueryBuilder\\(\\) has parameter \\$filterBy with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/ErrorHandler/Bootstrap.php
+			path: engine/Shopware/Models/Customer/AddressRepository.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:addContextCookie\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\AddressRepository\\:\\:getListQueryBuilder\\(\\) has parameter \\$limit with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
+			path: engine/Shopware/Models/Customer/AddressRepository.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:addSurrogateControl\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\AddressRepository\\:\\:getListQueryBuilder\\(\\) has parameter \\$offset with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
+			path: engine/Shopware/Models/Customer/AddressRepository.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:afterInit\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:addPaymentData\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:disableControllerCache\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:getAdditional\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:enableControllerCache\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:getOrders\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:enableControllerCache\\(\\) has parameter \\$cacheIds with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:getPaymentInstances\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:getInfo\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:onSave\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:getResponseCookie\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:onUpdate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:installForm\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setAdditional\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:onClearCache\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setAdditional\\(\\) has parameter \\$additional with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:onClearHttpCache\\(\\) should return string but return statement is missing\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:onInvalidateCacheId\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setBirthday\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:onPostDispatch\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setCustomerType\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:onPostPersist\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setDoubleOptinConfirmDate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:onPreDispatch\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setDoubleOptinEmailSentDate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:postFlush\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setDoubleOptinRegister\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:renderEsiTag\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setEncoderName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:setCacheHeaders\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setFirstname\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:setCacheIdHeader\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setGroup\\(\\) has parameter \\$group with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:setCacheIdHeader\\(\\) has parameter \\$cacheIds with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setLanguageSubShop\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:setNoCacheCookie\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setLastname\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:setNoCacheTag\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setNumber\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Negated boolean expression is always true\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setOrders\\(\\) has parameter \\$orders with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Parameter \\#2 \\$cacheId of method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:invalidateWithBANRequest\\(\\) expects string, string\\|null given\\.$#"
-			count: 2
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setPaymentData\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Parameter \\#4 \\$active of method Shopware_Components_Plugin_Bootstrap\\:\\:createCronJob\\(\\) expects int, true given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setPaymentData\\(\\) has parameter \\$paymentData with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Property Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:\\$cacheInvalidationBuffer type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setPaymentId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Cannot access offset 'elements' on Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setPaymentInstances\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/CacheIdCollector.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Cannot access offset 'id' on Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setPaymentInstances\\(\\) has parameter \\$paymentInstances with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/CacheIdCollector.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\HttpCache\\\\CacheIdCollector\\:\\:getAjaxListingCacheIds\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setPriceGroup\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/CacheIdCollector.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\HttpCache\\\\CacheIdCollector\\:\\:getBlogCacheIds\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setRawPassword\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/CacheIdCollector.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\HttpCache\\\\CacheIdCollector\\:\\:getCacheIdsFromController\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setSalutation\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/CacheIdCollector.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\HttpCache\\\\CacheIdCollector\\:\\:getControllerRoute\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setShop\\(\\) has parameter \\$shop with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/CacheIdCollector.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\HttpCache\\\\CacheIdCollector\\:\\:getDetailCacheIds\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setTitle\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/CacheIdCollector.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\HttpCache\\\\CacheIdCollector\\:\\:getEmotionCacheIds\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:updateChangedTimestamp\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/CacheIdCollector.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\HttpCache\\\\CacheIdCollector\\:\\:getFormsCacheIds\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#1 \\$datetime of class DateTime constructor expects string, string\\|null given\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/CacheIdCollector.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\HttpCache\\\\CacheIdCollector\\:\\:getHomePageCacheIds\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:\\$additional type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/CacheIdCollector.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\HttpCache\\\\CacheIdCollector\\:\\:getListingCacheIds\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:\\$firstLogin \\(DateTimeInterface\\) does not accept DateTimeInterface\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/CacheIdCollector.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\HttpCache\\\\CacheIdCollector\\:\\:getRecommendationCacheIds\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/CacheIdCollector.php
+			message: "#^Property Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:\\$hashPassword \\(string\\) does not accept null\\.$#"
+			count: 2
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\HttpCache\\\\CacheIdCollector\\:\\:getStaticSiteCacheIds\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:\\$lastLogin \\(DateTimeInterface\\) does not accept DateTimeInterface\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/CacheIdCollector.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Negated boolean expression is always false\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:\\$notifications with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/HttpCache/CacheIdCollector.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Call to an undefined method Enlight_Event_EventArgs\\:\\:getArticle\\(\\)\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:\\$orders with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Call to an undefined method Enlight_Event_EventArgs\\:\\:getDetails\\(\\)\\.$#"
-			count: 2
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
+			message: "#^Property Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:\\$paymentInstances with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Call to an undefined method Enlight_Event_EventArgs\\:\\:getEntity\\(\\)\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:\\$shop \\(Shopware\\\\Models\\\\Shop\\\\Shop\\) does not accept array\\|Shopware\\\\Models\\\\Shop\\\\Shop\\|null\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Customer.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_MarketingAggregate_Bootstrap\\:\\:addNewAlsoBought\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Group\\:\\:getDiscounts\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Group.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_MarketingAggregate_Bootstrap\\:\\:afterSendResponseOnTopSeller\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Group\\:\\:setAttribute\\(\\) has parameter \\$attribute with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Group.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_MarketingAggregate_Bootstrap\\:\\:afterSimilarShownArticlesReset\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Group\\:\\:setDiscounts\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Group.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_MarketingAggregate_Bootstrap\\:\\:afterTopSellerSelected\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Group\\:\\:setDiscounts\\(\\) has parameter \\$discounts with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Group.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_MarketingAggregate_Bootstrap\\:\\:beforeSetLastArticle\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Group\\:\\:toArray\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Group.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_MarketingAggregate_Bootstrap\\:\\:getInfo\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Customer\\\\Group\\:\\:\\$customers with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Group.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_MarketingAggregate_Bootstrap\\:\\:incrementTopSeller\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Customer\\\\Group\\:\\:\\$discounts with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
+			path: engine/Shopware/Models/Customer/Group.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_MarketingAggregate_Bootstrap\\:\\:initAlsoBoughtResource\\(\\) should return Shopware_Components_AlsoBought but returns Enlight_Class\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\PaymentData\\:\\:setAccountHolder\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
+			path: engine/Shopware/Models/Customer/PaymentData.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_MarketingAggregate_Bootstrap\\:\\:initSimilarShownResource\\(\\) should return Shopware_Components_SimilarShown but returns Enlight_Class\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\PaymentData\\:\\:setAccountNumber\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
+			path: engine/Shopware/Models/Customer/PaymentData.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_MarketingAggregate_Bootstrap\\:\\:initTopSellerResource\\(\\) should return Shopware_Components_TopSeller but returns Enlight_Class\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\PaymentData\\:\\:setBankCode\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
+			path: engine/Shopware/Models/Customer/PaymentData.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_MarketingAggregate_Bootstrap\\:\\:isSimilarShownActivated\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\PaymentData\\:\\:setBankName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
+			path: engine/Shopware/Models/Customer/PaymentData.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_MarketingAggregate_Bootstrap\\:\\:isTopSellerActivated\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\PaymentData\\:\\:setBic\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
+			path: engine/Shopware/Models/Customer/PaymentData.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_MarketingAggregate_Bootstrap\\:\\:refreshArticle\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\PaymentData\\:\\:setCreatedAt\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
+			path: engine/Shopware/Models/Customer/PaymentData.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_MarketingAggregate_Bootstrap\\:\\:refreshTopSeller\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\PaymentData\\:\\:setCustomer\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
+			path: engine/Shopware/Models/Customer/PaymentData.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_MarketingAggregate_Bootstrap\\:\\:subscribeAlsoBoughtEvents\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\PaymentData\\:\\:setIban\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
+			path: engine/Shopware/Models/Customer/PaymentData.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_MarketingAggregate_Bootstrap\\:\\:subscribeSimilarShownEvents\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\PaymentData\\:\\:setPaymentMean\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
+			path: engine/Shopware/Models/Customer/PaymentData.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_MarketingAggregate_Bootstrap\\:\\:subscribeTopSellerEvents\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\PaymentData\\:\\:setUseBillingData\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
+			path: engine/Shopware/Models/Customer/PaymentData.php
 
 		-
-			message: "#^Parameter \\#4 \\$active of method Shopware_Components_Plugin_Bootstrap\\:\\:createCronJob\\(\\) expects int, true given\\.$#"
-			count: 2
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\PriceGroup\\:\\:getCustomers\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/Customer/PriceGroup.php
 
 		-
-			message: "#^Argument of an invalid type array\\|false supplied for foreach, only iterables are supported\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\PriceGroup\\:\\:setCustomers\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/AlsoBought.php
+			path: engine/Shopware/Models/Customer/PriceGroup.php
 
 		-
-			message: "#^Method Shopware_Components_AlsoBought\\:\\:initAlsoBought\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\PriceGroup\\:\\:setCustomers\\(\\) has parameter \\$customers with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/AlsoBought.php
+			path: engine/Shopware/Models/Customer/PriceGroup.php
 
 		-
-			message: "#^Method Shopware_Components_AlsoBought\\:\\:refreshBoughtArticles\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Customer\\\\PriceGroup\\:\\:\\$customers with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/AlsoBought.php
+			path: engine/Shopware/Models/Customer/PriceGroup.php
 
 		-
-			message: "#^Method Shopware_Components_AlsoBought\\:\\:refreshMultipleBoughtArticles\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Repository\\:\\:getOrdersQuery\\(\\) has parameter \\$filter with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/AlsoBought.php
+			path: engine/Shopware/Models/Customer/Repository.php
 
 		-
-			message: "#^Method Shopware_Components_AlsoBought\\:\\:refreshMultipleBoughtArticles\\(\\) has parameter \\$combinations with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Repository\\:\\:getOrdersQuery\\(\\) has parameter \\$orderBy with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/AlsoBought.php
+			path: engine/Shopware/Models/Customer/Repository.php
 
 		-
-			message: "#^Argument of an invalid type array\\|false supplied for foreach, only iterables are supported\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Customer\\\\Repository\\:\\:getOrdersQueryBuilder\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/SimilarShown.php
+			path: engine/Shopware/Models/Customer/Repository.php
 
 		-
-			message: "#^Method Shopware_Components_SimilarShown\\:\\:initSimilarShown\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\CustomerStream\\\\CustomerStream\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/SimilarShown.php
+			path: engine/Shopware/Models/CustomerStream/CustomerStream.php
 
 		-
-			message: "#^Method Shopware_Components_SimilarShown\\:\\:refreshSimilarShown\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\CustomerStream\\\\CustomerStreamRepository\\:\\:fetchAmountPerStreamChart\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/SimilarShown.php
+			path: engine/Shopware/Models/CustomerStream/CustomerStreamRepository.php
 
 		-
-			message: "#^Method Shopware_Components_SimilarShown\\:\\:resetSimilarShown\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\CustomerStream\\\\CustomerStreamRepository\\:\\:fetchBackendListing\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/SimilarShown.php
+			path: engine/Shopware/Models/CustomerStream/CustomerStreamRepository.php
 
 		-
-			message: "#^Method Shopware_Components_SimilarShown\\:\\:updateElapsedSimilarShownArticles\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\CustomerStream\\\\CustomerStreamRepository\\:\\:fetchCustomerAmount\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/SimilarShown.php
+			path: engine/Shopware/Models/CustomerStream/CustomerStreamRepository.php
 
 		-
-			message: "#^Method Shopware_Components_TopSeller\\:\\:incrementTopSeller\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\CustomerStream\\\\CustomerStreamRepository\\:\\:fetchSearchIndexIds\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/TopSeller.php
+			path: engine/Shopware/Models/CustomerStream/CustomerStreamRepository.php
 
 		-
-			message: "#^Method Shopware_Components_TopSeller\\:\\:initTopSeller\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\CustomerStream\\\\CustomerStreamRepository\\:\\:fetchStreamsCustomerCount\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/TopSeller.php
+			path: engine/Shopware/Models/CustomerStream/CustomerStreamRepository.php
 
 		-
-			message: "#^Method Shopware_Components_TopSeller\\:\\:refreshTopSellerForArticleId\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\CustomerStream\\\\CustomerStreamRepository\\:\\:fetchStreamsForCustomers\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/TopSeller.php
+			path: engine/Shopware/Models/CustomerStream/CustomerStreamRepository.php
 
 		-
-			message: "#^Method Shopware_Components_TopSeller\\:\\:updateElapsedTopSeller\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\CustomerStream\\\\CustomerStreamRepositoryInterface\\:\\:fetchAmountPerStreamChart\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/TopSeller.php
+			path: engine/Shopware/Models/CustomerStream/CustomerStreamRepositoryInterface.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_AlsoBought\\:\\:getAlsoBoughtCountAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\CustomerStream\\\\CustomerStreamRepositoryInterface\\:\\:fetchBackendListing\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Controllers/AlsoBought.php
+			path: engine/Shopware/Models/CustomerStream/CustomerStreamRepositoryInterface.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_AlsoBought\\:\\:initAlsoBoughtAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\CustomerStream\\\\CustomerStreamRepositoryInterface\\:\\:fetchCustomerAmount\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Controllers/AlsoBought.php
+			path: engine/Shopware/Models/CustomerStream/CustomerStreamRepositoryInterface.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_SimilarShown\\:\\:getSimilarShownCountAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\CustomerStream\\\\CustomerStreamRepositoryInterface\\:\\:fetchSearchIndexIds\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Controllers/SimilarShown.php
+			path: engine/Shopware/Models/CustomerStream/CustomerStreamRepositoryInterface.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_SimilarShown\\:\\:initSimilarShownAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\CustomerStream\\\\CustomerStreamRepositoryInterface\\:\\:fetchStreamsCustomerCount\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Controllers/SimilarShown.php
+			path: engine/Shopware/Models/CustomerStream/CustomerStreamRepositoryInterface.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_TopSeller\\:\\:getTopSellerCountAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\CustomerStream\\\\CustomerStreamRepositoryInterface\\:\\:fetchStreamsForCustomers\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Controllers/TopSeller.php
+			path: engine/Shopware/Models/CustomerStream/CustomerStreamRepositoryInterface.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_TopSeller\\:\\:initTopSellerAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\:\\:getCategories\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Controllers/TopSeller.php
+			path: engine/Shopware/Models/Dispatch/Dispatch.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_PasswordEncoder_Bootstrap\\:\\:getArgon2Options\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\:\\:getCostsMatrix\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PasswordEncoder/Bootstrap.php
+			path: engine/Shopware/Models/Dispatch/Dispatch.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_PasswordEncoder_Bootstrap\\:\\:getBcryptOptions\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\:\\:getCountries\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PasswordEncoder/Bootstrap.php
+			path: engine/Shopware/Models/Dispatch/Dispatch.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_PasswordEncoder_Bootstrap\\:\\:getSha256Options\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\:\\:getHolidays\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PasswordEncoder/Bootstrap.php
+			path: engine/Shopware/Models/Dispatch/Dispatch.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_PasswordEncoder_Bootstrap\\:\\:onAddEncoder\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\:\\:getPayments\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PasswordEncoder/Bootstrap.php
+			path: engine/Shopware/Models/Dispatch/Dispatch.php
 
 		-
-			message: "#^Call to an undefined method Enlight_Event_EventArgs\\:\\:getRequest\\(\\)\\.$#"
-			count: 2
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Bootstrap.php
+			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Dispatch/Dispatch.php
 
 		-
-			message: "#^Call to an undefined method Enlight_Event_EventArgs\\:\\:getSubject\\(\\)\\.$#"
-			count: 2
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Bootstrap.php
+			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\:\\:setCategories\\(\\) has parameter \\$categories with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/Dispatch/Dispatch.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_PaymentMethods_Bootstrap\\:\\:addPaths\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\:\\:setCountries\\(\\) has parameter \\$countries with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Bootstrap.php
+			path: engine/Shopware/Models/Dispatch/Dispatch.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_PaymentMethods_Bootstrap\\:\\:addPaymentClass\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\:\\:setHolidays\\(\\) has parameter \\$holidays with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Bootstrap.php
+			path: engine/Shopware/Models/Dispatch/Dispatch.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_PaymentMethods_Bootstrap\\:\\:onBackendCustomerPostDispatch\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\:\\:setPayments\\(\\) has parameter \\$payments with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Bootstrap.php
+			path: engine/Shopware/Models/Dispatch/Dispatch.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_PaymentMethods_Bootstrap\\:\\:onBackendOrderPostDispatch\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\:\\:\\$categories with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Bootstrap.php
+			path: engine/Shopware/Models/Dispatch/Dispatch.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_PaymentMethods_Bootstrap\\:\\:subscribeEvents\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\:\\:\\$costsMatrix with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Bootstrap.php
+			path: engine/Shopware/Models/Dispatch/Dispatch.php
 
 		-
-			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\BasePaymentMethod\\:\\:getCurrentPaymentDataAsArray\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\:\\:\\$countries with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/BasePaymentMethod.php
+			path: engine/Shopware/Models/Dispatch/Dispatch.php
 
 		-
-			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\BasePaymentMethod\\:\\:savePaymentData\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\:\\:\\$holidays with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/BasePaymentMethod.php
+			path: engine/Shopware/Models/Dispatch/Dispatch.php
 
 		-
-			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\BasePaymentMethod\\:\\:validate\\(\\) has parameter \\$paymentData with no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\:\\:\\$payments with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/BasePaymentMethod.php
+			path: engine/Shopware/Models/Dispatch/Dispatch.php
 
 		-
-			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\BasePaymentMethod\\:\\:validate\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getCountryQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/BasePaymentMethod.php
+			path: engine/Shopware/Models/Dispatch/Repository.php
 
 		-
-			message: "#^Cannot call method getCity\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getCountryQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/DebitPaymentMethod.php
+			path: engine/Shopware/Models/Dispatch/Repository.php
 
 		-
-			message: "#^Cannot call method getDefaultBillingAddress\\(\\) on Shopware\\\\Models\\\\Customer\\\\Customer\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getCountryQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/DebitPaymentMethod.php
+			path: engine/Shopware/Models/Dispatch/Repository.php
 
 		-
-			message: "#^Cannot call method getFirstname\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getCountryQueryBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/DebitPaymentMethod.php
+			path: engine/Shopware/Models/Dispatch/Repository.php
 
 		-
-			message: "#^Cannot call method getLastname\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getDispatchesQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/DebitPaymentMethod.php
+			path: engine/Shopware/Models/Dispatch/Repository.php
 
 		-
-			message: "#^Cannot call method getStreet\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getDispatchesQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/DebitPaymentMethod.php
+			path: engine/Shopware/Models/Dispatch/Repository.php
 
 		-
-			message: "#^Cannot call method getZipcode\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getHolidayQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/DebitPaymentMethod.php
+			path: engine/Shopware/Models/Dispatch/Repository.php
 
 		-
-			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\DebitPaymentMethod\\:\\:getCurrentPaymentDataAsArray\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getHolidayQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/DebitPaymentMethod.php
+			path: engine/Shopware/Models/Dispatch/Repository.php
 
 		-
-			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\DebitPaymentMethod\\:\\:getCurrentPaymentDataAsArray\\(\\) should return array\\|null but return statement is missing\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getHolidayQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/DebitPaymentMethod.php
+			path: engine/Shopware/Models/Dispatch/Repository.php
 
 		-
-			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\DebitPaymentMethod\\:\\:savePaymentData\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getHolidayQueryBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/DebitPaymentMethod.php
+			path: engine/Shopware/Models/Dispatch/Repository.php
 
 		-
-			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\DebitPaymentMethod\\:\\:validate\\(\\) has parameter \\$paymentData with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getListQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/DebitPaymentMethod.php
+			path: engine/Shopware/Models/Dispatch/Repository.php
 
 		-
-			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\DebitPaymentMethod\\:\\:validate\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getListQueryBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/DebitPaymentMethod.php
+			path: engine/Shopware/Models/Dispatch/Repository.php
 
 		-
-			message: "#^Offset 'sDebitAccount' does not exist on array\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getPaymentQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/DebitPaymentMethod.php
+			path: engine/Shopware/Models/Dispatch/Repository.php
 
 		-
-			message: "#^Offset 'sDebitBankHolder' does not exist on array\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getPaymentQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/DebitPaymentMethod.php
+			path: engine/Shopware/Models/Dispatch/Repository.php
 
 		-
-			message: "#^Offset 'sDebitBankName' does not exist on array\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getPaymentQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/DebitPaymentMethod.php
+			path: engine/Shopware/Models/Dispatch/Repository.php
 
 		-
-			message: "#^Offset 'sDebitBankcode' does not exist on array\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getPaymentQueryBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/DebitPaymentMethod.php
+			path: engine/Shopware/Models/Dispatch/Repository.php
 
 		-
-			message: "#^Cannot call method getCity\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getShippingCostsQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/GenericPaymentMethod.php
+			path: engine/Shopware/Models/Dispatch/Repository.php
 
 		-
-			message: "#^Cannot call method getDefaultBillingAddress\\(\\) on Shopware\\\\Models\\\\Customer\\\\Customer\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:getShippingCostsQueryBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/GenericPaymentMethod.php
+			path: engine/Shopware/Models/Dispatch/Repository.php
 
 		-
-			message: "#^Cannot call method getFirstname\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\Repository\\:\\:sortOrderQuery\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/GenericPaymentMethod.php
+			path: engine/Shopware/Models/Dispatch/Repository.php
 
 		-
-			message: "#^Cannot call method getLastname\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\ShippingCost\\:\\:setDispatch\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/GenericPaymentMethod.php
+			path: engine/Shopware/Models/Dispatch/ShippingCost.php
 
 		-
-			message: "#^Cannot call method getStreet\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Dispatch\\\\ShippingCost\\:\\:setDispatch\\(\\) has parameter \\$dispatch with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/GenericPaymentMethod.php
+			path: engine/Shopware/Models/Dispatch/ShippingCost.php
 
 		-
-			message: "#^Cannot call method getZipcode\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Dispatch\\\\ShippingCost\\:\\:\\$dispatch \\(Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\) does not accept array\\|Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/GenericPaymentMethod.php
+			path: engine/Shopware/Models/Dispatch/ShippingCost.php
 
 		-
-			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\GenericPaymentMethod\\:\\:getCurrentPaymentDataAsArray\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Document\\\\Document\\:\\:getElements\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/GenericPaymentMethod.php
+			path: engine/Shopware/Models/Document/Document.php
 
 		-
-			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\GenericPaymentMethod\\:\\:savePaymentData\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Document\\\\Document\\:\\:setElements\\(\\) has parameter \\$elements with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/GenericPaymentMethod.php
+			path: engine/Shopware/Models/Document/Document.php
 
 		-
-			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\GenericPaymentMethod\\:\\:validate\\(\\) has parameter \\$paymentData with no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Document\\\\Document\\:\\:\\$elements with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/GenericPaymentMethod.php
+			path: engine/Shopware/Models/Document/Document.php
 
 		-
-			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\GenericPaymentMethod\\:\\:validate\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/GenericPaymentMethod.php
+			message: "#^Property Shopware_Models_Document_Order\\:\\:\\$_billing \\(ArrayObject\\|null\\) does not accept array\\<string, ArrayObject\\<string, mixed\\>\\>\\|ArrayObject\\.$#"
+			count: 2
+			path: engine/Shopware/Models/Document/Order.php
 
 		-
-			message: "#^Cannot call method getCity\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
+			message: "#^Property Shopware_Models_Document_Order\\:\\:\\$_billing \\(ArrayObject\\|null\\) does not accept array\\<string, array\\>\\|ArrayObject\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php
+			path: engine/Shopware/Models/Document/Order.php
 
 		-
-			message: "#^Cannot call method getDefaultBillingAddress\\(\\) on Shopware\\\\Models\\\\Customer\\\\Customer\\|null\\.$#"
+			message: "#^Property Shopware_Models_Document_Order\\:\\:\\$_billing with generic class ArrayObject does not specify its types\\: TKey, TValue$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php
+			path: engine/Shopware/Models/Document/Order.php
 
 		-
-			message: "#^Cannot call method getFirstname\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
-			count: 2
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php
+			message: "#^Property Shopware_Models_Document_Order\\:\\:\\$_config type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Document/Order.php
 
 		-
-			message: "#^Cannot call method getLastname\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
-			count: 2
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php
+			message: "#^Property Shopware_Models_Document_Order\\:\\:\\$_currency with generic class ArrayObject does not specify its types\\: TKey, TValue$#"
+			count: 1
+			path: engine/Shopware/Models/Document/Order.php
 
 		-
-			message: "#^Cannot call method getStreet\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
+			message: "#^Property Shopware_Models_Document_Order\\:\\:\\$_dispatch with generic class ArrayObject does not specify its types\\: TKey, TValue$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php
+			path: engine/Shopware/Models/Document/Order.php
 
 		-
-			message: "#^Cannot call method getZipcode\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
+			message: "#^Property Shopware_Models_Document_Order\\:\\:\\$_order with generic class ArrayObject does not specify its types\\: TKey, TValue$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php
+			path: engine/Shopware/Models/Document/Order.php
 
 		-
-			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\SepaPaymentMethod\\:\\:getCurrentPaymentDataAsArray\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware_Models_Document_Order\\:\\:\\$_payment with generic class ArrayObject does not specify its types\\: TKey, TValue$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php
+			path: engine/Shopware/Models/Document/Order.php
 
 		-
-			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\SepaPaymentMethod\\:\\:savePaymentData\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware_Models_Document_Order\\:\\:\\$_paymentInstances with generic class ArrayObject does not specify its types\\: TKey, TValue$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php
+			path: engine/Shopware/Models/Document/Order.php
 
 		-
-			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\SepaPaymentMethod\\:\\:sendSepaEmail\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware_Models_Document_Order\\:\\:\\$_positions with generic class ArrayObject does not specify its types\\: TKey, TValue$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php
+			path: engine/Shopware/Models/Document/Order.php
 
 		-
-			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\SepaPaymentMethod\\:\\:sendSepaEmail\\(\\) has parameter \\$data with no type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php
+			message: "#^Property Shopware_Models_Document_Order\\:\\:\\$_shipping \\(ArrayObject\\|null\\) does not accept array\\<string, ArrayObject\\<string, mixed\\>\\>\\|ArrayObject\\.$#"
+			count: 2
+			path: engine/Shopware/Models/Document/Order.php
 
 		-
-			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\SepaPaymentMethod\\:\\:sendSepaEmail\\(\\) has parameter \\$orderNumber with no type specified\\.$#"
+			message: "#^Property Shopware_Models_Document_Order\\:\\:\\$_shipping \\(ArrayObject\\|null\\) does not accept array\\<string, array\\>\\|ArrayObject\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php
+			path: engine/Shopware/Models/Document/Order.php
 
 		-
-			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\SepaPaymentMethod\\:\\:sendSepaEmail\\(\\) has parameter \\$userId with no type specified\\.$#"
+			message: "#^Property Shopware_Models_Document_Order\\:\\:\\$_shipping \\(ArrayObject\\|null\\) does not accept array\\<string, mixed\\>\\|ArrayObject\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php
+			path: engine/Shopware/Models/Document/Order.php
 
 		-
-			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\SepaPaymentMethod\\:\\:validate\\(\\) has parameter \\$paymentData with no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware_Models_Document_Order\\:\\:\\$_shipping with generic class ArrayObject does not specify its types\\: TKey, TValue$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php
+			path: engine/Shopware/Models/Document/Order.php
 
 		-
-			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\SepaPaymentMethod\\:\\:validate\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware_Models_Document_Order\\:\\:\\$_tax type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php
+			path: engine/Shopware/Models/Document/Order.php
 
 		-
-			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\SepaPaymentMethod\\:\\:validateIBAN\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware_Models_Document_Order\\:\\:\\$_user with generic class ArrayObject does not specify its types\\: TKey, TValue$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php
+			path: engine/Shopware/Models/Document/Order.php
 
 		-
-			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\SepaPaymentMethod\\:\\:validateIBAN\\(\\) has parameter \\$value with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Data\\:\\:setComponent\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php
+			path: engine/Shopware/Models/Emotion/Data.php
 
 		-
-			message: "#^Offset 'sSepaBankName' does not exist on array\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Data\\:\\:setComponentId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php
+			path: engine/Shopware/Models/Emotion/Data.php
 
 		-
-			message: "#^Offset 'sSepaBic' does not exist on array\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Data\\:\\:setElement\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php
+			path: engine/Shopware/Models/Emotion/Data.php
 
 		-
-			message: "#^Offset 'sSepaIban' does not exist on array\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Data\\:\\:setElementId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php
+			path: engine/Shopware/Models/Emotion/Data.php
 
 		-
-			message: "#^Offset 'sSepaUseBillingData' does not exist on array\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Data\\:\\:setEmotion\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php
+			path: engine/Shopware/Models/Emotion/Data.php
 
 		-
-			message: "#^Parameter \\#2 \\$callback of function preg_replace_callback expects callable\\(array\\<int\\|string, string\\>\\)\\: string, Closure\\(mixed\\)\\: int given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Data\\:\\:setEmotionId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php
+			path: engine/Shopware/Models/Emotion/Data.php
 
 		-
-			message: "#^Call to an undefined method Enlight_Event_EventArgs\\:\\:getSubject\\(\\)\\.$#"
-			count: 2
-			path: engine/Shopware/Plugins/Default/Core/PostFilter/Bootstrap.php
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Data\\:\\:setField\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Emotion/Data.php
 
 		-
-			message: "#^Cannot call method getBasePath\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Data\\:\\:setFieldId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PostFilter/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Data.php
 
 		-
-			message: "#^Cannot call method getHttpHost\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Data\\:\\:setValue\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PostFilter/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Data.php
 
 		-
-			message: "#^Cannot call method getScheme\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Element\\:\\:getData\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PostFilter/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Element.php
 
 		-
-			message: "#^Cannot call method isSecure\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Element\\:\\:getViewports\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PostFilter/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Element.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_PostFilter_Bootstrap\\:\\:initConfig\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Element\\:\\:setComponent\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PostFilter/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Element.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_PostFilter_Bootstrap\\:\\:onFilterRender\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Element\\:\\:setCssClass\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PostFilter/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Element.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_PostFilter_Bootstrap\\:\\:rewriteLink\\(\\) should return string but returns string\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Element\\:\\:setEmotion\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PostFilter/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Element.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_PostFilter_Bootstrap\\:\\:rewriteSrc\\(\\) has parameter \\$src with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Element\\:\\:setEndCol\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PostFilter/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Element.php
 
 		-
-			message: "#^Offset 'path' does not exist on string\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Element\\:\\:setEndRow\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PostFilter/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Element.php
 
 		-
-			message: "#^Parameter \\#1 \\$source of method Shopware_Plugins_Core_PostFilter_Bootstrap\\:\\:filterSource\\(\\) expects string, array\\<string\\>\\|string\\|null given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Element\\:\\:setStartCol\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/PostFilter/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Element.php
 
 		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Category\\\\Category\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Element\\:\\:setStartRow\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Element.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_RebuildIndex_Bootstrap\\:\\:getInfo\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Emotion\\\\Element\\:\\:\\$data with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Element.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_RebuildIndex_Bootstrap\\:\\:initSeoIndexResource\\(\\) should return Shopware_Components_SeoIndex but returns Enlight_Class\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Emotion\\\\Element\\:\\:\\$viewports with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Element.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_RebuildIndex_Bootstrap\\:\\:onAfterSendResponse\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\ElementViewport\\:\\:setAlias\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/ElementViewport.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_RebuildIndex_Bootstrap\\:\\:subscribeSearchIndexEvents\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\ElementViewport\\:\\:setElement\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/ElementViewport.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_RebuildIndex_Bootstrap\\:\\:subscribeSeoIndexEvents\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\ElementViewport\\:\\:setEmotion\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/ElementViewport.php
 
 		-
-			message: "#^Parameter \\#4 \\$active of method Shopware_Components_Plugin_Bootstrap\\:\\:createCronJob\\(\\) expects int, true given\\.$#"
-			count: 2
-			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Bootstrap.php
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\ElementViewport\\:\\:setEndCol\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Emotion/ElementViewport.php
 
 		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Category\\\\Category\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\ElementViewport\\:\\:setEndRow\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Components/SeoIndex.php
+			path: engine/Shopware/Models/Emotion/ElementViewport.php
 
 		-
-			message: "#^Method Shopware_Components_SeoIndex\\:\\:countArticles\\(\\) should return string but returns int\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\ElementViewport\\:\\:setId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Components/SeoIndex.php
+			path: engine/Shopware/Models/Emotion/ElementViewport.php
 
 		-
-			message: "#^Method Shopware_Components_SeoIndex\\:\\:countCategories\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\ElementViewport\\:\\:setStartCol\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Components/SeoIndex.php
+			path: engine/Shopware/Models/Emotion/ElementViewport.php
 
 		-
-			message: "#^Method Shopware_Components_SeoIndex\\:\\:getCachedTime\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\ElementViewport\\:\\:setStartRow\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Components/SeoIndex.php
+			path: engine/Shopware/Models/Emotion/ElementViewport.php
 
 		-
-			message: "#^Method Shopware_Components_SeoIndex\\:\\:refreshSeoIndex\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\ElementViewport\\:\\:setVisible\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Components/SeoIndex.php
+			path: engine/Shopware/Models/Emotion/ElementViewport.php
 
 		-
-			message: "#^Method Shopware_Components_SeoIndex\\:\\:registerShop\\(\\) should return Shopware\\\\Models\\\\Shop\\\\Shop but returns Shopware\\\\Models\\\\Shop\\\\DetachedShop\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:getCategories\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Components/SeoIndex.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Method Shopware_Components_SeoIndex\\:\\:setCachedTime\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:getElements\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Components/SeoIndex.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Parameter \\#1 \\$shop of method Shopware\\\\Components\\\\ShopRegistrationService\\:\\:registerShop\\(\\) expects Shopware\\\\Models\\\\Shop\\\\Shop, Shopware\\\\Models\\\\Shop\\\\DetachedShop\\|null given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:getMode\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Components/SeoIndex.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_SearchIndex\\:\\:buildAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:getShops\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/SearchIndex.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Category\\\\Category\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setActive\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/Seo.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_Seo\\:\\:getCountAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setArticleHeight\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/Seo.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_Seo\\:\\:initSeoAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/Seo.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_Seo\\:\\:seoArticle\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setCategories\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/Seo.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_Seo\\:\\:seoArticleAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setCategories\\(\\) has parameter \\$categories with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/Seo.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_Seo\\:\\:seoBlogAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setCellHeight\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/Seo.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_Seo\\:\\:seoCategoryAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setCellSpacing\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/Seo.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_Seo\\:\\:seoContentAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setCols\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/Seo.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_Seo\\:\\:seoEmotionAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setCreateDate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/Seo.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_Seo\\:\\:seoStaticAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setCustomerStreamIds\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/Seo.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Method Shopware_Controllers_Backend_Seo\\:\\:seoSupplierAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setDevice\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/Seo.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Access to an undefined property object\\:\\:\\$role\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setFullscreen\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RestApi/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Cannot call method getModuleName\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setIsLandingPage\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RestApi/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_RestApi_Bootstrap\\:\\:afterInit\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setListingVisibility\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RestApi/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_RestApi_Bootstrap\\:\\:onDispatchLoopStartup\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setMode\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RestApi/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_RestApi_Bootstrap\\:\\:onFrontPreDispatch\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setMode\\(\\) has parameter \\$mode with no type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RestApi/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_RestApi_Bootstrap\\:\\:onInitResourceAuth\\(\\) should return Zend_Auth\\|null but empty return statement found\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setModified\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RestApi/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Parameter \\#1 \\$encodedValue of static method Zend_Json\\:\\:decode\\(\\) expects string, string\\|false given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RestApi/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Parameter \\#1 \\$request of method ShopwarePlugins\\\\RestApi\\\\Components\\\\Router\\:\\:assembleRoute\\(\\) expects Enlight_Controller_Request_RequestHttp, Enlight_Controller_Request_Request\\|null given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setParentId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RestApi/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Property Shopware_Plugins_Core_RestApi_Bootstrap\\:\\:\\$request \\(Enlight_Controller_Request_Request\\) does not accept Enlight_Controller_Request_Request\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setPosition\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RestApi/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Method ShopwarePlugins\\\\RestApi\\\\Components\\\\Router\\:\\:assembleRoute\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setPreviewId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/RestApi/Components/Router.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_System_Bootstrap\\:\\:onDispatchLoopShutdown\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setPreviewSecret\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/System/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Parameter \\#1 \\$userAgent of method Shopware_Plugins_Frontend_Statistics_Bootstrap\\:\\:checkIsBot\\(\\) expects string, string\\|false given\\.$#"
-			count: 2
-			path: engine/Shopware/Plugins/Default/Core/System/Bootstrap.php
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setReplacement\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Call to an undefined method Enlight_Event_EventArgs\\:\\:getRequest\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setRows\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/ViewportForward/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Call to an undefined method Enlight_Event_EventArgs\\:\\:getSubject\\(\\)\\.$#"
-			count: 3
-			path: engine/Shopware/Plugins/Default/Core/ViewportForward/Bootstrap.php
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setSeoDescription\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Method Shopware_Plugins_Core_ViewportForward_Bootstrap\\:\\:onPreDispatch\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setSeoKeywords\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Core/ViewportForward/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Method Shopware_Plugins_Frontend_CronRefresh_Bootstrap\\:\\:onCronJobClearing\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setSeoTitle\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Frontend/CronRefresh/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Method Shopware_Plugins_Frontend_CronRefresh_Bootstrap\\:\\:onCronJobSearch\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setShops\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Frontend/CronRefresh/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Access to an undefined property sSystem\\:\\:\\$_POST\\.$#"
-			count: 2
-			path: engine/Shopware/Plugins/Default/Frontend/Notification/Bootstrap.php
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setShops\\(\\) has parameter \\$shops with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Call to an undefined method Enlight_Event_EventArgs\\:\\:getSubject\\(\\)\\.$#"
-			count: 3
-			path: engine/Shopware/Plugins/Default/Frontend/Notification/Bootstrap.php
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setShowListing\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Cannot access offset 'hash' on array\\<string, mixed\\>\\|false\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setTemplate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Frontend/Notification/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Method Shopware_Plugins_Frontend_Notification_Bootstrap\\:\\:onNotifyAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setValidFrom\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Frontend/Notification/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Method Shopware_Plugins_Frontend_Notification_Bootstrap\\:\\:onNotifyConfirmAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:setValidTo\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Frontend/Notification/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Method Shopware_Plugins_Frontend_Notification_Bootstrap\\:\\:onPostDispatch\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:\\$categories with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Frontend/Notification/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^Method Shopware_Plugins_Frontend_Notification_Bootstrap\\:\\:onRunCronJob\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:\\$elements with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Frontend/Notification/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^PHPDoc tag @return has invalid value \\(\\)\\: Unexpected token \"\\\\n     \", expected type at offset 147$#"
+			message: "#^Property Shopware\\\\Models\\\\Emotion\\\\Emotion\\:\\:\\$shops with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Frontend/Notification/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Emotion.php
 
 		-
-			message: "#^PHPDoc tag @return has invalid value \\(\\)\\: Unexpected token \"\\\\n     \", expected type at offset 167$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Component\\:\\:createField\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Frontend/Notification/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Library/Component.php
 
 		-
-			message: "#^Method Shopware_Plugins_Frontend_RouterRewrite_Bootstrap\\:\\:onPreDispatch\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Component\\:\\:getMaxPositionValue\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Frontend/RouterRewrite/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Library/Component.php
 
 		-
-			message: "#^Method Shopware_Plugins_Frontend_RouterRewrite_Bootstrap\\:\\:onStartDispatch\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Component\\:\\:setCls\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Frontend/RouterRewrite/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Library/Component.php
 
 		-
-			message: "#^Cannot call method getControllerName\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Component\\:\\:setConvertFunction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Frontend/Seo/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Library/Component.php
 
 		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Category\\\\Category\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Component\\:\\:setDescription\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Frontend/Seo/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Library/Component.php
 
 		-
-			message: "#^Method Shopware_Plugins_Frontend_Seo_Bootstrap\\:\\:onPostDispatch\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Component\\:\\:setName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Frontend/Seo/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Library/Component.php
 
 		-
-			message: "#^PHPDoc tag @param for parameter \\$request with type Enlight_Controller_Request_Request is not subtype of native type Enlight_Controller_Request_RequestHttp\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Component\\:\\:setPlugin\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Frontend/Statistics/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Library/Component.php
 
 		-
-			message: "#^Parameter \\#1 \\$request of method Shopware_Plugins_Frontend_Statistics_Bootstrap\\:\\:refreshBasket\\(\\) expects Enlight_Controller_Request_RequestHttp, Enlight_Controller_Request_Request given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Component\\:\\:setPluginId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Frontend/Statistics/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Library/Component.php
 
 		-
-			message: "#^Parameter \\#1 \\$request of method Shopware_Plugins_Frontend_Statistics_Bootstrap\\:\\:refreshBlog\\(\\) expects Symfony\\\\Component\\\\HttpFoundation\\\\Request, Enlight_Controller_Request_Request given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Component\\:\\:setTemplate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Frontend/Statistics/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Library/Component.php
 
 		-
-			message: "#^Strict comparison using \\=\\=\\= between string and null will always evaluate to false\\.$#"
-			count: 2
-			path: engine/Shopware/Plugins/Default/Frontend/Statistics/Bootstrap.php
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Component\\:\\:setXType\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Emotion/Library/Component.php
 
 		-
-			message: "#^Access to an undefined property Enlight_Config\\:\\:\\$controller\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Field\\:\\:setAllowBlank\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Frontend/TagCloud/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Library/Field.php
 
 		-
-			message: "#^Call to an undefined method Enlight_Event_EventArgs\\:\\:getSubject\\(\\)\\.$#"
-			count: 3
-			path: engine/Shopware/Plugins/Default/Frontend/TagCloud/Bootstrap.php
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Field\\:\\:setComponent\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Emotion/Library/Field.php
 
 		-
-			message: "#^Method Shopware_Plugins_Frontend_TagCloud_Bootstrap\\:\\:getInfo\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Field\\:\\:setComponentId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Plugins/Default/Frontend/TagCloud/Bootstrap.php
+			path: engine/Shopware/Models/Emotion/Library/Field.php
 
 		-
-			message: "#^Method Shopware\\:\\:System\\(\\) should return sSystem but returns object\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Field\\:\\:setDefaultValue\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Shopware.php
+			path: engine/Shopware/Models/Emotion/Library/Field.php
 
 		-
-			message: "#^Method Shopware\\:\\:__call\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Field\\:\\:setDisplayField\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Shopware.php
+			path: engine/Shopware/Models/Emotion/Library/Field.php
 
 		-
-			message: "#^Method Shopware\\:\\:__call\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Field\\:\\:setFieldLabel\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Shopware.php
+			path: engine/Shopware/Models/Emotion/Library/Field.php
 
 		-
-			message: "#^Method Shopware\\:\\:setEventManager\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Field\\:\\:setHelpText\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Shopware.php
+			path: engine/Shopware/Models/Emotion/Library/Field.php
 
 		-
-			message: "#^Service \"system\" is not registered in the container\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Field\\:\\:setHelpTitle\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: engine/Shopware/Shopware.php
+			path: engine/Shopware/Models/Emotion/Library/Field.php
 
 		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\HttpFoundation\\\\Response\\:\\:getHeader\\(\\)\\.$#"
-			count: 2
-			path: tests/Functional/Api/CategoryTest.php
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Field\\:\\:setName\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Emotion/Library/Field.php
 
 		-
-			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
-			count: 16
-			path: tests/Functional/Api/CategoryTest.php
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Field\\:\\:setPosition\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Emotion/Library/Field.php
 
 		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\HttpFoundation\\\\Response\\:\\:getBody\\(\\)\\.$#"
-			count: 2
-			path: tests/Functional/Api/CustomerGroupTest.php
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Field\\:\\:setStore\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Emotion/Library/Field.php
 
 		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\HttpFoundation\\\\Response\\:\\:getHeader\\(\\)\\.$#"
-			count: 2
-			path: tests/Functional/Api/CustomerGroupTest.php
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Field\\:\\:setSupportText\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Emotion/Library/Field.php
 
 		-
-			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Field\\:\\:setTranslatable\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Api/CustomerGroupTest.php
+			path: engine/Shopware/Models/Emotion/Library/Field.php
 
 		-
-			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
-			count: 6
-			path: tests/Functional/Api/ManufacturerTest.php
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Field\\:\\:setValueField\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Emotion/Library/Field.php
 
 		-
-			message: "#^Cannot call method getUserId\\(\\) on Shopware\\\\Models\\\\Media\\\\Media\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Field\\:\\:setValueType\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Api/MediaTest.php
+			path: engine/Shopware/Models/Emotion/Library/Field.php
 
 		-
-			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
-			count: 12
-			path: tests/Functional/Api/MediaTest.php
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Library\\\\Field\\:\\:setXType\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Emotion/Library/Field.php
 
 		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\HttpFoundation\\\\Response\\:\\:getBody\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Preset\\:\\:getTranslations\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Api/OrderTest.php
+			path: engine/Shopware/Models/Emotion/Preset.php
 
 		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\HttpFoundation\\\\Response\\:\\:getHeader\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Preset\\:\\:setAssetsImported\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Api/OrderTest.php
+			path: engine/Shopware/Models/Emotion/Preset.php
 
 		-
-			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Preset\\:\\:setCustom\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Api/OrderTest.php
+			path: engine/Shopware/Models/Emotion/Preset.php
 
 		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\HttpFoundation\\\\Response\\:\\:getBody\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Preset\\:\\:setEmotionTranslations\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Api/PaymentMethodsTest.php
+			path: engine/Shopware/Models/Emotion/Preset.php
 
 		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Payment\\\\Payment\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Preset\\:\\:setHidden\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Api/PaymentMethodsTest.php
+			path: engine/Shopware/Models/Emotion/Preset.php
 
 		-
-			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
-			count: 6
-			path: tests/Functional/Api/PaymentMethodsTest.php
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Preset\\:\\:setName\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Emotion/Preset.php
 
 		-
-			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Preset\\:\\:setPremium\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Api/VersionTest.php
+			path: engine/Shopware/Models/Emotion/Preset.php
 
 		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Preset\\:\\:setPresetData\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/AddressTest.php
+			path: engine/Shopware/Models/Emotion/Preset.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\AddressTest\\:\\:doRequest\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Preset\\:\\:setPreview\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/AddressTest.php
+			path: engine/Shopware/Models/Emotion/Preset.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\AddressTest\\:\\:getCustomerDemoData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Preset\\:\\:setRequiredPlugins\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/AddressTest.php
+			path: engine/Shopware/Models/Emotion/Preset.php
 
 		-
-			message: "#^Parameter \\#1 \\$displayStateInRegistration of method Shopware\\\\Models\\\\Country\\\\Country\\:\\:setDisplayStateInRegistration\\(\\) expects bool, int given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Preset\\:\\:setThumbnail\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/AddressTest.php
+			path: engine/Shopware/Models/Emotion/Preset.php
 
 		-
-			message: "#^Parameter \\#1 \\$forceStateInRegistration of method Shopware\\\\Models\\\\Country\\\\Country\\:\\:setForceStateInRegistration\\(\\) expects bool, int given\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Emotion\\\\Preset\\:\\:\\$translations with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/AddressTest.php
+			path: engine/Shopware/Models/Emotion/Preset.php
 
 		-
-			message: "#^Parameter \\#1 \\$node of class Symfony\\\\Component\\\\DomCrawler\\\\Crawler constructor expects DOMNode\\|\\(DOMNodeList&iterable\\<DOMNode\\>\\)\\|string\\|null, array\\|string\\|null given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\PresetTranslation\\:\\:setDescription\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/AddressTest.php
+			path: engine/Shopware/Models/Emotion/PresetTranslation.php
 
 		-
-			message: "#^Cannot access offset 'data' on array\\<string, mixed\\>\\|false\\.$#"
-			count: 2
-			path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\PresetTranslation\\:\\:setLabel\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Emotion/PresetTranslation.php
 
 		-
-			message: "#^Cannot access offset 'doubleOptinEmailSen…' on array\\<string, mixed\\>\\|false\\.$#"
-			count: 2
-			path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\PresetTranslation\\:\\:setLocale\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Emotion/PresetTranslation.php
 
 		-
-			message: "#^Cannot access offset 'hash' on array\\<string, mixed\\>\\|false\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\PresetTranslation\\:\\:setPreset\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
+			path: engine/Shopware/Models/Emotion/PresetTranslation.php
 
 		-
-			message: "#^Cannot access offset 'id' on array\\<string, mixed\\>\\|false\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Repository\\:\\:getListingQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
+			path: engine/Shopware/Models/Emotion/Repository.php
 
 		-
-			message: "#^Cannot access offset 'type' on array\\<string, mixed\\>\\|false\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Repository\\:\\:getNameListQuery\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
+			path: engine/Shopware/Models/Emotion/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:assertAddress\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Template\\:\\:setFile\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
+			path: engine/Shopware/Models/Emotion/Template.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:assertAddress\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Emotion\\\\Template\\:\\:setName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
+			path: engine/Shopware/Models/Emotion/Template.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:deleteCustomer\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Emotion\\\\Template\\:\\:\\$emotions with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
+			path: engine/Shopware/Models/Emotion/Template.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:deleteCustomer\\(\\) has parameter \\$email with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Form\\\\Field\\:\\:onPrePersist\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
+			path: engine/Shopware/Models/Form/Field.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:doubleOptinSet\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Form\\\\Form\\:\\:getFields\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
+			path: engine/Shopware/Models/Form/Form.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:getBillingData\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Form\\\\Form\\:\\:setActive\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
+			path: engine/Shopware/Models/Form/Form.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:getBillingData\\(\\) has parameter \\$data with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Form\\\\Form\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
+			path: engine/Shopware/Models/Form/Form.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:getPersonalData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Form\\\\Form\\:\\:setMetaDescription\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
+			path: engine/Shopware/Models/Form/Form.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:getPersonalData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Form\\\\Form\\:\\:setMetaKeywords\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
+			path: engine/Shopware/Models/Form/Form.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:getShippingData\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Form\\\\Form\\:\\:setMetaTitle\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
+			path: engine/Shopware/Models/Form/Form.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:getShippingData\\(\\) has parameter \\$data with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Form\\\\Form\\:\\:setShopIds\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
+			path: engine/Shopware/Models/Form/Form.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:sendRequestAndAssertCustomer\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Form\\\\Form\\:\\:\\$fields with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
+			path: engine/Shopware/Models/Form/Form.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:sendRequestAndAssertCustomer\\(\\) has parameter \\$billing with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Form\\\\Repository\\:\\:getListQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
+			path: engine/Shopware/Models/Form/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:sendRequestAndAssertCustomer\\(\\) has parameter \\$email with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Form\\\\Repository\\:\\:getListQuery\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
+			path: engine/Shopware/Models/Form/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:sendRequestAndAssertCustomer\\(\\) has parameter \\$personal with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Form\\\\Repository\\:\\:getListQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
+			path: engine/Shopware/Models/Form/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:sendRequestAndAssertCustomer\\(\\) has parameter \\$shipping with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Form\\\\Repository\\:\\:getListQueryBuilder\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
+			path: engine/Shopware/Models/Form/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:sendRequestAndAssertCustomerWithDoubleOptIn\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Mail\\\\Attachment\\:\\:setShop\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
+			path: engine/Shopware/Models/Mail/Attachment.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:sendRequestAndAssertCustomerWithDoubleOptIn\\(\\) has parameter \\$email with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Mail\\\\Log\\:\\:getDocuments\\(\\) return type with generic interface Doctrine\\\\Common\\\\Collections\\\\Collection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
+			path: engine/Shopware/Models/Mail/Log.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:sendRequestAndAssertDOIConfirmation\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Mail\\\\Log\\:\\:getRecipients\\(\\) return type with generic interface Doctrine\\\\Common\\\\Collections\\\\Collection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
+			path: engine/Shopware/Models/Mail/Log.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:sendRequestAndAssertDOIConfirmation\\(\\) has parameter \\$email with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Mail\\\\Log\\:\\:setDocuments\\(\\) has parameter \\$documents with generic interface Doctrine\\\\Common\\\\Collections\\\\Collection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
+			path: engine/Shopware/Models/Mail/Log.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:sendRequestAndAssertDOIConfirmation\\(\\) has parameter \\$hash with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Mail\\\\Log\\:\\:setRecipients\\(\\) has parameter \\$recipients with generic interface Doctrine\\\\Common\\\\Collections\\\\Collection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
+			path: engine/Shopware/Models/Mail/Log.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:testCompanyRegistration\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Mail\\\\Log\\:\\:\\$documents with generic interface Doctrine\\\\Common\\\\Collections\\\\Collection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
+			path: engine/Shopware/Models/Mail/Log.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:testDefaultPayment\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Mail\\\\Log\\:\\:\\$recipients with generic interface Doctrine\\\\Common\\\\Collections\\\\Collection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
+			path: engine/Shopware/Models/Mail/Log.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:testDoubleOptInRegistration\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Mail\\\\LogRepository\\:\\:findByDate\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
+			path: engine/Shopware/Models/Mail/LogRepository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:testFastRegistration\\(\\) has no return type specified\\.$#"
+			message: "#^Interface Shopware\\\\Models\\\\Mail\\\\LogRepositoryInterface extends generic interface Doctrine\\\\Common\\\\Collections\\\\Selectable but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
+			path: engine/Shopware/Models/Mail/LogRepositoryInterface.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:testRegistrationWithShipping\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Mail\\\\LogRepositoryInterface\\:\\:findByDate\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
+			path: engine/Shopware/Models/Mail/LogRepositoryInterface.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\RegisterTest\\:\\:testSimpleRegistration\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Mail\\\\Mail\\:\\:arrayGetPath\\(\\) has parameter \\$array with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
+			path: engine/Shopware/Models/Mail/Mail.php
 
 		-
-			message: "#^Parameter \\#2 \\$array of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertArrayHasKey\\(\\) expects array\\|ArrayAccess, array\\<string, mixed\\>\\|false given\\.$#"
-			count: 2
-			path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
+			message: "#^Method Shopware\\\\Models\\\\Mail\\\\Mail\\:\\:arrayGetPath\\(\\) return type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Mail/Mail.php
 
 		-
-			message: "#^Parameter \\#2 \\$string of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringEndsWith\\(\\) expects string, string\\|null given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Mail\\\\Mail\\:\\:getContext\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
+			path: engine/Shopware/Models/Mail/Mail.php
 
 		-
-			message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertNull\\(\\) with int will always evaluate to false\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Mail\\\\Mail\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Service/AddressServiceTest.php
+			path: engine/Shopware/Models/Mail/Mail.php
 
 		-
-			message: "#^Cannot call method getCustomer\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
-			count: 3
-			path: tests/Functional/Bundle/AccountBundle/Service/AddressServiceTest.php
+			message: "#^Method Shopware\\\\Models\\\\Mail\\\\Mail\\:\\:setContext\\(\\) has parameter \\$context with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Mail/Mail.php
 
 		-
-			message: "#^Cannot call method getFirstname\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
-			count: 4
-			path: tests/Functional/Bundle/AccountBundle/Service/AddressServiceTest.php
+			message: "#^Method Shopware\\\\Models\\\\Mail\\\\Mail\\:\\:setDirty\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Mail/Mail.php
 
 		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
-			count: 6
-			path: tests/Functional/Bundle/AccountBundle/Service/AddressServiceTest.php
+			message: "#^Method Shopware\\\\Models\\\\Mail\\\\Mail\\:\\:setTranslation\\(\\) has parameter \\$translation with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Mail/Mail.php
 
 		-
-			message: "#^Cannot call method getLastname\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
-			count: 4
-			path: tests/Functional/Bundle/AccountBundle/Service/AddressServiceTest.php
+			message: "#^Property Shopware\\\\Models\\\\Mail\\\\Mail\\:\\:\\$attachments with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/Mail/Mail.php
 
 		-
-			message: "#^Cannot call method setCity\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Mail\\\\Mail\\:\\:\\$context type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Service/AddressServiceTest.php
+			path: engine/Shopware/Models/Mail/Mail.php
 
 		-
-			message: "#^Cannot call method setFirstname\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Mail\\\\Mail\\:\\:\\$translation type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Service/AddressServiceTest.php
+			path: engine/Shopware/Models/Mail/Mail.php
 
 		-
-			message: "#^Parameter \\#1 \\$address of method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\AddressServiceInterface\\:\\:delete\\(\\) expects Shopware\\\\Models\\\\Customer\\\\Address, Shopware\\\\Models\\\\Customer\\\\Address\\|null given\\.$#"
-			count: 2
-			path: tests/Functional/Bundle/AccountBundle/Service/AddressServiceTest.php
+			message: "#^Method Shopware\\\\Models\\\\Mail\\\\Repository\\:\\:getMailListQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Mail/Repository.php
 
 		-
-			message: "#^Parameter \\#1 \\$address of method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\AddressServiceInterface\\:\\:setDefaultBillingAddress\\(\\) expects Shopware\\\\Models\\\\Customer\\\\Address, Shopware\\\\Models\\\\Customer\\\\Address\\|null given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Mail\\\\Repository\\:\\:getMailListQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Service/AddressServiceTest.php
+			path: engine/Shopware/Models/Mail/Repository.php
 
 		-
-			message: "#^Parameter \\#1 \\$address of method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\AddressServiceInterface\\:\\:setDefaultShippingAddress\\(\\) expects Shopware\\\\Models\\\\Customer\\\\Address, Shopware\\\\Models\\\\Customer\\\\Address\\|null given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Mail\\\\Repository\\:\\:getMailsListQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Service/AddressServiceTest.php
+			path: engine/Shopware/Models/Mail/Repository.php
 
 		-
-			message: "#^Parameter \\#1 \\$address of method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\AddressServiceInterface\\:\\:update\\(\\) expects Shopware\\\\Models\\\\Customer\\\\Address, Shopware\\\\Models\\\\Customer\\\\Address\\|null given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Mail\\\\Repository\\:\\:getMailsListQueryBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Service/AddressServiceTest.php
+			path: engine/Shopware/Models/Mail/Repository.php
 
 		-
-			message: "#^Parameter \\#1 \\$displayStateInRegistration of method Shopware\\\\Models\\\\Country\\\\Country\\:\\:setDisplayStateInRegistration\\(\\) expects bool, int given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Album\\:\\:getChildren\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Service/AddressServiceTest.php
+			path: engine/Shopware/Models/Media/Album.php
 
 		-
-			message: "#^Parameter \\#1 \\$forceStateInRegistration of method Shopware\\\\Models\\\\Country\\\\Country\\:\\:setForceStateInRegistration\\(\\) expects bool, int given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Album\\:\\:getMedia\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Service/AddressServiceTest.php
+			path: engine/Shopware/Models/Media/Album.php
 
 		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Country\\\\Country\\|null\\.$#"
-			count: 2
-			path: tests/Functional/Bundle/AccountBundle/Service/RegisterServiceTest.php
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Album\\:\\:onRemove\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Media/Album.php
 
 		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Country\\\\State\\|null\\.$#"
-			count: 2
-			path: tests/Functional/Bundle/AccountBundle/Service/RegisterServiceTest.php
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Album\\:\\:setChildren\\(\\) has parameter \\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/Media/Album.php
 
 		-
-			message: "#^Cannot call method getKey\\(\\) on Shopware\\\\Models\\\\Customer\\\\Group\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Album\\:\\:setChildren\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Service/RegisterServiceTest.php
+			path: engine/Shopware/Models/Media/Album.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Service\\\\RegisterServiceTest\\:\\:assertAddress\\(\\) has parameter \\$demoData with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Album\\:\\:setMedia\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Service/RegisterServiceTest.php
+			path: engine/Shopware/Models/Media/Album.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Service\\\\RegisterServiceTest\\:\\:assertCustomer\\(\\) has parameter \\$demoData with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Album\\:\\:setMedia\\(\\) has parameter \\$media with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Service/RegisterServiceTest.php
+			path: engine/Shopware/Models/Media/Album.php
 
 		-
-			message: "#^Parameter \\#1 \\$displayStateInRegistration of method Shopware\\\\Models\\\\Country\\\\Country\\:\\:setDisplayStateInRegistration\\(\\) expects bool, int given\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Media\\\\Album\\:\\:\\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Service/RegisterServiceTest.php
+			path: engine/Shopware/Models/Media/Album.php
 
 		-
-			message: "#^Parameter \\#1 \\$forceStateInRegistration of method Shopware\\\\Models\\\\Country\\\\Country\\:\\:setForceStateInRegistration\\(\\) expects bool, int given\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Media\\\\Album\\:\\:\\$media with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Bundle/AccountBundle/Service/RegisterServiceTest.php
+			path: engine/Shopware/Models/Media/Album.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AttributeBundle\\\\DataLoaderTest\\:\\:getForeignKeyData\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:createAlbumThumbnails\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AttributeBundle/DataLoaderTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AttributeBundle\\\\DataLoaderTest\\:\\:testLoadForeignKeyValidation\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:createDefaultThumbnails\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AttributeBundle/DataLoaderTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AttributeBundle\\\\DataLoaderTest\\:\\:testLoadReturnArrayIfNotEmpty\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:createThumbnail\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AttributeBundle/DataLoaderTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AttributeBundle\\\\DataLoaderTest\\:\\:testLoadReturnArrayWhenEmpty\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:getAllThumbnailSizes\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AttributeBundle/DataLoaderTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AttributeBundle\\\\DataLoaderTest\\:\\:testLoadTranslationsForeignKeyValidation\\(\\) has parameter \\$input with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:getArticles\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Bundle/AttributeBundle/DataLoaderTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AttributeBundle\\\\DataLoaderTest\\:\\:testLoadWithUnknownTable\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:getCreatedThumbnails\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AttributeBundle/DataLoaderTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Parameter \\#2 \\$foreignKey of method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataLoaderInterface\\:\\:load\\(\\) expects int, string given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:getDefaultThumbnails\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AttributeBundle/DataLoaderTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AttributeBundle\\\\SchemaOperatorTest\\:\\:iterateTypeArray\\(\\) has parameter \\$types with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:getHighDpiThumbnails\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/AttributeBundle/SchemaOperatorTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\ContentTypeBundle\\\\Services\\\\ExtjsBuilderTest\\:\\:dataProviderColumnFields\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:getProperties\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Bundle/ContentTypeBundle/Services/ExtjsBuilderTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\ContentTypeBundle\\\\Services\\\\ExtjsBuilderTest\\:\\:dataProviderFieldSets\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:getThumbnailFilePaths\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/ContentTypeBundle/Services/ExtjsBuilderTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\ContentTypeBundle\\\\Services\\\\ExtjsBuilderTest\\:\\:dataProviderModelFields\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:getThumbnailNames\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/ContentTypeBundle/Services/ExtjsBuilderTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\ContentTypeBundle\\\\Services\\\\ExtjsBuilderTest\\:\\:testColumns\\(\\) has parameter \\$expectedResult with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:getThumbnails\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/ContentTypeBundle/Services/ExtjsBuilderTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\ContentTypeBundle\\\\Services\\\\ExtjsBuilderTest\\:\\:testFieldSets\\(\\) has parameter \\$expectedResult with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:loadThumbnails\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/ContentTypeBundle/Services/ExtjsBuilderTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\ContentTypeBundle\\\\Services\\\\ExtjsBuilderTest\\:\\:testModelFields\\(\\) has parameter \\$expectedResult with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:onLoad\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/ContentTypeBundle/Services/ExtjsBuilderTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^You should use assertCount\\(\\$expectedCount, \\$variable\\) instead of assertSame\\(\\$expectedCount, \\$variable\\-\\>count\\(\\)\\)\\.$#"
-			count: 5
-			path: tests/Functional/Bundle/CookieBundle/Services/CookieCollectorTest.php
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:onRemove\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^You should use assertCount\\(\\$expectedCount, \\$variable\\) instead of assertSame\\(\\$expectedCount, \\$variable\\-\\>count\\(\\)\\)\\.$#"
-			count: 2
-			path: tests/Functional/Bundle/CookieBundle/Services/CookieHandlerTest.php
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:onSave\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\AccountModeConditionHandlerTest\\:\\:testCustomer\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:onUpdate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AccountModeConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\AccountModeConditionHandlerTest\\:\\:testMultipleAccountless\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:removeAlbumThumbnails\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AccountModeConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\AgeConditionHandlerTest\\:\\:testBetween\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:removeAlbumThumbnails\\(\\) has parameter \\$thumbnailSizes with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AgeConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\AgeConditionHandlerTest\\:\\:testEquals\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:removeDefaultThumbnails\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AgeConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\AgeConditionHandlerTest\\:\\:testGreater\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:removeThumbnails\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AgeConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\AgeConditionHandlerTest\\:\\:testGreaterThanEquals\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:setArticles\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AgeConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\AgeConditionHandlerTest\\:\\:testLower\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:setArticles\\(\\) has parameter \\$articles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AgeConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\AgeConditionHandlerTest\\:\\:testLowerEquals\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AgeConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Parameter \\#2 \\$value of class Shopware\\\\Bundle\\\\CustomerSearchBundle\\\\Condition\\\\AgeCondition constructor expects array\\|string, int given\\.$#"
-			count: 5
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AgeConditionHandlerTest.php
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:setDefaultThumbnails\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Call to method delete\\(\\) on an unknown class Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\CrudService\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:setDefaultThumbnails\\(\\) has parameter \\$defaultThumbnails with no type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/CustomerAttributeConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\CustomerAttributeConditionHandlerTest\\:\\:testAttribute\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:setFileInfo\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/CustomerAttributeConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^PHPDoc tag @var for variable \\$service contains unknown class Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\CrudService\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:setHeight\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/CustomerAttributeConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\HasAddressWithCountryConditionHandlerTest\\:\\:testOneCountry\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:setProperties\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasAddressWithCountryConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\HasAddressWithCountryConditionHandlerTest\\:\\:testTwoCountryIds\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:setProperties\\(\\) has parameter \\$properties with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasAddressWithCountryConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\HasCanceledOrdersConditionHandlerTest\\:\\:testWithMultipleOrders\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:setWidth\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasCanceledOrdersConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\HasCanceledOrdersConditionHandlerTest\\:\\:testWithOneCanceledOrder\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Media\\:\\:updateAssociations\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasCanceledOrdersConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\HasNewsletterRegistrationConditionHandlerTest\\:\\:testWithOneNewsletterSubscription\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#2 \\$contents of method Shopware\\\\Bundle\\\\MediaBundle\\\\MediaService\\:\\:write\\(\\) expects string, string\\|false given\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNewsletterRegistrationConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\HasNewsletterRegistrationConditionHandlerTest\\:\\:testWithTwoNewsletterSubscription\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#3 \\$subject of function preg_replace expects array\\|string, string\\|false given\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNewsletterRegistrationConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\HasNewsletterRegistrationConditionHandlerTest\\:\\:testWithoutNewsletterSubscription\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#3 \\$subject of function preg_replace expects array\\|string, string\\|null given\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNewsletterRegistrationConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\HasOrderCountConditionHandlerTest\\:\\:testCustomerHasOneOrder\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Media\\\\Media\\:\\:\\$articles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasOrderCountConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\HasOrderCountConditionHandlerTest\\:\\:testMultipleCustomerHasOrders\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Media\\\\Media\\:\\:\\$blogMedia with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasOrderCountConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\HasTotalOrderAmountConditionHandlerTest\\:\\:testWithCanceledOrders\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Media\\\\Media\\:\\:\\$defaultThumbnails type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasTotalOrderAmountConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\HasTotalOrderAmountConditionHandlerTest\\:\\:testWithSingleCustomer\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Media\\\\Media\\:\\:\\$highDpiThumbnails type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasTotalOrderAmountConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\IsCustomerSinceConditionHandlerTest\\:\\:testDateTime\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Media\\\\Media\\:\\:\\$properties with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/IsCustomerSinceConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\IsCustomerSinceConditionHandlerTest\\:\\:testWithStringDate\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Media\\\\Media\\:\\:\\$thumbnails type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/IsCustomerSinceConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\IsInCustomerGroupConditionHandlerTest\\:\\:testSingleCustomerGroup\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Media\\\\Media\\:\\:\\$type \\(string\\) does not accept string\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/IsInCustomerGroupConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Media.php
 
 		-
-			message: "#^Parameter \\#1 \\$ids of class Shopware\\\\Bundle\\\\CustomerSearchBundle\\\\Condition\\\\IsInCustomerGroupCondition constructor expects array\\<string\\>, array\\<int, int\\> given\\.$#"
-			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/IsInCustomerGroupConditionHandlerTest.php
+			message: "#^Cannot access property \\$height on SimpleXMLElement\\|null\\.$#"
+			count: 2
+			path: engine/Shopware/Models/Media/MediaSubscriber.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\OrderedAtWeekdayConditionHandlerTest\\:\\:testDifferentDays\\(\\) has no return type specified\\.$#"
+			message: "#^Cannot access property \\$viewBox on SimpleXMLElement\\|null\\.$#"
+			count: 2
+			path: engine/Shopware/Models/Media/MediaSubscriber.php
+
+		-
+			message: "#^Cannot access property \\$width on SimpleXMLElement\\|null\\.$#"
+			count: 2
+			path: engine/Shopware/Models/Media/MediaSubscriber.php
+
+		-
+			message: "#^Parameter \\#1 \\$data of function simplexml_load_string expects string, string\\|false given\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedAtWeekdayConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/MediaSubscriber.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\OrderedAtWeekdayConditionHandlerTest\\:\\:testSingleDay\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Repository\\:\\:getAlbumMediaQuery\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedAtWeekdayConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\OrderedInLastDaysConditionHandlerTest\\:\\:testSingleDay\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Repository\\:\\:getAlbumMediaQuery\\(\\) has parameter \\$validTypes with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedInLastDaysConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\OrderedInShopConditionHandlerTest\\:\\:testMultipleShops\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Repository\\:\\:getAlbumMediaQueryBuilder\\(\\) has parameter \\$validTypes with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedInShopConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\OrderedInShopConditionHandlerTest\\:\\:testSingleShop\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Repository\\:\\:getMediaListQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedInShopConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\OrderedOnDeviceConditionHandlerTest\\:\\:testDesktopDevice\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Repository\\:\\:getMediaListQuery\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedOnDeviceConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\OrderedOnDeviceConditionHandlerTest\\:\\:testMobileAndDesktopDevice\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#3 \\$orderBy of method Shopware\\\\Models\\\\Media\\\\Repository\\:\\:getAlbumMediaQueryBuilder\\(\\) expects Doctrine\\\\ORM\\\\Query\\\\Expr\\\\OrderBy\\|string\\|null, array\\|Doctrine\\\\ORM\\\\Query\\\\Expr\\\\OrderBy\\|string\\|null given\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedOnDeviceConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\OrderedProductConditionHandlerTest\\:\\:testMultipleProducts\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Settings\\:\\:getThumbnailSize\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedProductConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Settings.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\OrderedProductConditionHandlerTest\\:\\:testSingleProduct\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Settings\\:\\:setAlbum\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedProductConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Settings.php
 
 		-
-			message: "#^Cannot call method getNumber\\(\\) on Shopware\\\\Models\\\\Article\\\\Detail\\|null\\.$#"
-			count: 3
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedProductOfManufacturerConditionHandlerTest.php
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Settings\\:\\:setThumbnailHighDpi\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Media/Settings.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\OrderedProductOfManufacturerConditionHandlerTest\\:\\:testSingleManufacturer\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Settings\\:\\:setThumbnailHighDpiQuality\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedProductOfManufacturerConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Settings.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\SalutationConditionHandlerTest\\:\\:testFemaleCustomer\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Settings\\:\\:setThumbnailQuality\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SalutationConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Settings.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\SalutationConditionHandlerTest\\:\\:testMaleCustomer\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Media\\\\Settings\\:\\:setThumbnailSize\\(\\) has parameter \\$thumbnailSize with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SalutationConditionHandlerTest.php
+			path: engine/Shopware/Models/Media/Settings.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\SalutationConditionHandlerTest\\:\\:testMissingSalutation\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Menu\\\\Menu\\:\\:getChildren\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SalutationConditionHandlerTest.php
+			path: engine/Shopware/Models/Menu/Menu.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\SalutationConditionHandlerTest\\:\\:testMultipleSalutations\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Menu\\\\Menu\\:\\:setAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SalutationConditionHandlerTest.php
+			path: engine/Shopware/Models/Menu/Menu.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\SearchTermConditionHandlerTest\\:\\:testBirthdaySearch\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Menu\\\\Menu\\:\\:setActive\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SearchTermConditionHandlerTest.php
+			path: engine/Shopware/Models/Menu/Menu.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\SearchTermConditionHandlerTest\\:\\:testCompanySearch\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Menu\\\\Menu\\:\\:setChildren\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SearchTermConditionHandlerTest.php
+			path: engine/Shopware/Models/Menu/Menu.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\SearchTermConditionHandlerTest\\:\\:testCustomerNumberSearch\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Menu\\\\Menu\\:\\:setChildren\\(\\) has parameter \\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SearchTermConditionHandlerTest.php
+			path: engine/Shopware/Models/Menu/Menu.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\SearchTermConditionHandlerTest\\:\\:testEmailSearch\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Menu\\\\Menu\\:\\:setClass\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SearchTermConditionHandlerTest.php
+			path: engine/Shopware/Models/Menu/Menu.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\SearchTermConditionHandlerTest\\:\\:testOrderedProductsSearch\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Menu\\\\Menu\\:\\:setContentType\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SearchTermConditionHandlerTest.php
+			path: engine/Shopware/Models/Menu/Menu.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\SearchTermConditionHandlerTest\\:\\:testTwoColumnSearch\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Menu\\\\Menu\\:\\:setController\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SearchTermConditionHandlerTest.php
+			path: engine/Shopware/Models/Menu/Menu.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\CustomerNumberSearchTest\\:\\:customerFromNumber\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Menu\\\\Menu\\:\\:setLabel\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/CustomerNumberSearchTest.php
+			path: engine/Shopware/Models/Menu/Menu.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\CustomerNumberSearchTest\\:\\:getCustomerNumbers\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Menu\\\\Menu\\:\\:setOnclick\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/CustomerNumberSearchTest.php
+			path: engine/Shopware/Models/Menu/Menu.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\HandlerRegistryTest\\:\\:testCoreHandlersAreRegistered\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Menu\\\\Menu\\:\\:setParent\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/HandlerRegistryTest.php
+			path: engine/Shopware/Models/Menu/Menu.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\HandlerRegistryTest\\:\\:testNoneSupportConditionThrowsException\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Menu\\\\Menu\\:\\:setPlugin\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/HandlerRegistryTest.php
+			path: engine/Shopware/Models/Menu/Menu.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\PaginationTest\\:\\:testPagination\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Menu\\\\Menu\\:\\:setPluginId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/PaginationTest.php
+			path: engine/Shopware/Models/Menu/Menu.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\SearchResultTest\\:\\:testResultCollection\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Menu\\\\Menu\\:\\:setPosition\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/SearchResultTest.php
+			path: engine/Shopware/Models/Menu/Menu.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\TestCase\\:\\:createCustomer\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Menu\\\\Menu\\:\\:setShortcut\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/TestCase.php
+			path: engine/Shopware/Models/Menu/Menu.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\TestCase\\:\\:createCustomer\\(\\) has parameter \\$customer with no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Menu\\\\Menu\\:\\:\\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/TestCase.php
+			path: engine/Shopware/Models/Menu/Menu.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\TestCase\\:\\:filterData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Backup\\:\\:setDate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/TestCase.php
+			path: engine/Shopware/Models/MultiEdit/Backup.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\TestCase\\:\\:filterData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Backup\\:\\:setFilterString\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/TestCase.php
+			path: engine/Shopware/Models/MultiEdit/Backup.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\TestCase\\:\\:insert\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Backup\\:\\:setHash\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/TestCase.php
+			path: engine/Shopware/Models/MultiEdit/Backup.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\TestCase\\:\\:search\\(\\) has parameter \\$customers with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Backup\\:\\:setItems\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/TestCase.php
+			path: engine/Shopware/Models/MultiEdit/Backup.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\ESIndexingBundle\\\\BacklogProcessorTest\\:\\:mockProductSynchronizer\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Backup\\:\\:setOperationString\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/ESIndexingBundle/BacklogProcessorTest.php
+			path: engine/Shopware/Models/MultiEdit/Backup.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\ESIndexingBundle\\\\BacklogProcessorTest\\:\\:retrieveLatestBacklogs\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Backup\\:\\:setPath\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/ESIndexingBundle/BacklogProcessorTest.php
+			path: engine/Shopware/Models/MultiEdit/Backup.php
 
 		-
-			message: "#^Cannot call method getGroups\\(\\) on Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Backup\\:\\:setSize\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/ESIndexingBundle/Product/ProductListingVariationLoaderTest.php
+			path: engine/Shopware/Models/MultiEdit/Backup.php
 
 		-
-			message: "#^Cannot call method getNumber\\(\\) on Shopware\\\\Models\\\\Article\\\\Detail\\|null\\.$#"
-			count: 2
-			path: tests/Functional/Bundle/ESIndexingBundle/Product/ProductListingVariationLoaderTest.php
+			message: "#^Property Shopware\\\\Models\\\\MultiEdit\\\\Backup\\:\\:\\$date \\(DateTimeInterface\\) does not accept DateTimeInterface\\|null\\.$#"
+			count: 1
+			path: engine/Shopware/Models/MultiEdit/Backup.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\ESIndexingBundle\\\\Product\\\\ProductListingVariationLoaderTest\\:\\:getProductGroups\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Filter\\:\\:setCreated\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/ESIndexingBundle/Product/ProductListingVariationLoaderTest.php
+			path: engine/Shopware/Models/MultiEdit/Filter.php
 
 		-
-			message: "#^Parameter \\#2 \\$limit of method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\BacklogReader\\:\\:read\\(\\) expects int, null given\\.$#"
-			count: 3
-			path: tests/Functional/Bundle/ESIndexingBundle/Subscriber/ORMBacklogSubscriberTest.php
+			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Filter\\:\\:setDescription\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/MultiEdit/Filter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\ESIndexingBundle\\\\TextMapping\\\\TextMappingTest\\:\\:createProducts\\(\\) has parameter \\$products with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Filter\\:\\:setFilterString\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/ESIndexingBundle/TextMapping/TextMappingTest.php
+			path: engine/Shopware/Models/MultiEdit/Filter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\ESIndexingBundle\\\\TextMapping\\\\TextMappingTest\\:\\:testKeywordsIsQueryAble\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Filter\\:\\:setIsFavorite\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/ESIndexingBundle/TextMapping/TextMappingTest.php
+			path: engine/Shopware/Models/MultiEdit/Filter.php
 
 		-
-			message: "#^Parameter \\#1 \\$orderNumber of method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:updateArticle\\(\\) expects string, int\\|string\\|null given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Filter\\:\\:setIsSimple\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/ESIndexingBundle/TextMapping/TextMappingTest.php
+			path: engine/Shopware/Models/MultiEdit/Filter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\EmotionBundle\\\\ComponentHandler\\\\EventComponentHandlerTest\\:\\:testFallbackToEventComponentHandler\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Filter\\:\\:setName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/EmotionBundle/ComponentHandler/EventComponentHandlerTest.php
+			path: engine/Shopware/Models/MultiEdit/Filter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\EsBackendBundle\\\\BacklogTest\\:\\:testBacklogWillBeWritten\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Queue\\:\\:getArticleDetails\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Bundle/EsBackendBundle/BacklogTest.php
+			path: engine/Shopware/Models/MultiEdit/Queue.php
 
 		-
-			message: "#^Cannot call method getRawContent\\(\\) on string\\|Zend_Mime_Part\\|false\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Queue\\:\\:setActive\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/MailBundle/LogRepositoryTest.php
+			path: engine/Shopware/Models/MultiEdit/Queue.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\MediaBundle\\\\FilesystemTest\\:\\:_testDelete\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Queue\\:\\:setArticleDetails\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/MediaBundle/FilesystemTest.php
+			path: engine/Shopware/Models/MultiEdit/Queue.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\MediaBundle\\\\FilesystemTest\\:\\:_testRead\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Queue\\:\\:setArticleDetails\\(\\) has parameter \\$articleDetails with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Bundle/MediaBundle/FilesystemTest.php
+			path: engine/Shopware/Models/MultiEdit/Queue.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\MediaBundle\\\\FilesystemTest\\:\\:_testRename\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Queue\\:\\:setCreated\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/MediaBundle/FilesystemTest.php
+			path: engine/Shopware/Models/MultiEdit/Queue.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\MediaBundle\\\\FilesystemTest\\:\\:_testSize\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Queue\\:\\:setFilterString\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/MediaBundle/FilesystemTest.php
+			path: engine/Shopware/Models/MultiEdit/Queue.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\MediaBundle\\\\FilesystemTest\\:\\:_testWrite\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Queue\\:\\:setInitialSize\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/MediaBundle/FilesystemTest.php
+			path: engine/Shopware/Models/MultiEdit/Queue.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\MediaBundle\\\\FilesystemTest\\:\\:testFiles\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Queue\\:\\:setOperations\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/MediaBundle/FilesystemTest.php
+			path: engine/Shopware/Models/MultiEdit/Queue.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\MediaBundle\\\\FilesystemTest\\:\\:testUrlGeneration\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\Queue\\:\\:setResource\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/MediaBundle/FilesystemTest.php
+			path: engine/Shopware/Models/MultiEdit/Queue.php
 
 		-
-			message: "#^Parameter \\#1 \\$expectedJson of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertJsonStringEqualsJsonString\\(\\) expects string, string\\|false given\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\MultiEdit\\\\Queue\\:\\:\\$articleDetails with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Bundle/MediaBundle/FilesystemTest.php
+			path: engine/Shopware/Models/MultiEdit/Queue.php
 
 		-
-			message: "#^Parameter \\#2 \\$actualJson of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertJsonStringEqualsJsonString\\(\\) expects string, string\\|false given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\QueueArticle\\:\\:setDetail\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/MediaBundle/FilesystemTest.php
+			path: engine/Shopware/Models/MultiEdit/QueueArticle.php
 
 		-
-			message: "#^Parameter \\#2 \\$contents of method Shopware\\\\Bundle\\\\MediaBundle\\\\MediaServiceInterface\\:\\:write\\(\\) expects string, string\\|false given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\MultiEdit\\\\QueueArticle\\:\\:setQueue\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/MediaBundle/FilesystemTest.php
+			path: engine/Shopware/Models/MultiEdit/QueueArticle.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\MediaBundle\\\\FilesystemTest\\:\\:\\$testData type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Address\\:\\:setAdded\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/MediaBundle/FilesystemTest.php
+			path: engine/Shopware/Models/Newsletter/Address.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\MediaBundle\\\\FilesystemTest\\:\\:\\$testPaths type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Address\\:\\:setDoubleOptinConfirmed\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/MediaBundle/FilesystemTest.php
+			path: engine/Shopware/Models/Newsletter/Address.php
 
 		-
-			message: "#^Access to private property Shopware\\\\Bundle\\\\MediaBundle\\\\GarbageCollector\\:\\:\\$mediaPositions\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Address\\:\\:setEmail\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/MediaBundle/GarbageCollectorFactoryTest.php
+			path: engine/Shopware/Models/Newsletter/Address.php
 
 		-
-			message: "#^Cannot call method getExtension\\(\\) on Shopware\\\\Models\\\\Media\\\\Media\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Address\\:\\:setGroupId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/MediaBundle/MediaReplaceServiceTest.php
+			path: engine/Shopware/Models/Newsletter/Address.php
 
 		-
-			message: "#^Cannot call method getPath\\(\\) on Shopware\\\\Models\\\\Media\\\\Media\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Address\\:\\:setIsCustomer\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/MediaBundle/MediaReplaceServiceTest.php
+			path: engine/Shopware/Models/Newsletter/Address.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\BatchProductNumberSearchTest\\:\\:createProducts\\(\\) has parameter \\$products with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Address\\:\\:setLastMailingId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/BatchProductNumberSearchTest.php
+			path: engine/Shopware/Models/Newsletter/Address.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\BatchProductSearchTest\\:\\:createProducts\\(\\) has parameter \\$products with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Address\\:\\:setLastNewsletterId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/BatchProductSearchTest.php
+			path: engine/Shopware/Models/Newsletter/Address.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\OrderNumberConditionTest\\:\\:createProducts\\(\\) has parameter \\$products with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Address\\:\\:setLastReadId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/OrderNumberConditionTest.php
+			path: engine/Shopware/Models/Newsletter/Address.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\PropertyConditionTest\\:\\:createPropertyCombination\\(\\) has parameter \\$properties with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContactData\\:\\:setAdded\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/PropertyConditionTest.php
+			path: engine/Shopware/Models/Newsletter/ContactData.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\PropertyConditionTest\\:\\:createPropertyCombination\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContactData\\:\\:setCity\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/PropertyConditionTest.php
+			path: engine/Shopware/Models/Newsletter/ContactData.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\SalesConditionTest\\:\\:createProducts\\(\\) has parameter \\$products with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContactData\\:\\:setDeleted\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/SalesConditionTest.php
+			path: engine/Shopware/Models/Newsletter/ContactData.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\SearchTermConditionTest\\:\\:createProducts\\(\\) has parameter \\$products with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContactData\\:\\:setDoubleOptinConfirmed\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/SearchTermConditionTest.php
+			path: engine/Shopware/Models/Newsletter/ContactData.php
 
 		-
-			message: "#^Cannot call method getCalculatedPrice\\(\\) on Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\Product\\\\Price\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContactData\\:\\:setEmail\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionOnSaleTest.php
+			path: engine/Shopware/Models/Newsletter/ContactData.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionOnSaleTest\\:\\:assertPrices\\(\\) has parameter \\$prices with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContactData\\:\\:setFirstName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionOnSaleTest.php
+			path: engine/Shopware/Models/Newsletter/ContactData.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionOnSaleTest\\:\\:buildConfigurator\\(\\) has parameter \\$expected with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContactData\\:\\:setGroupId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionOnSaleTest.php
+			path: engine/Shopware/Models/Newsletter/ContactData.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionOnSaleTest\\:\\:createCondition\\(\\) has parameter \\$expand with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContactData\\:\\:setLastName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionOnSaleTest.php
+			path: engine/Shopware/Models/Newsletter/ContactData.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionOnSaleTest\\:\\:createCondition\\(\\) has parameter \\$groupName with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContactData\\:\\:setSalutation\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionOnSaleTest.php
+			path: engine/Shopware/Models/Newsletter/ContactData.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionOnSaleTest\\:\\:createCondition\\(\\) has parameter \\$options with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContactData\\:\\:setStreet\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionOnSaleTest.php
+			path: engine/Shopware/Models/Newsletter/ContactData.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionOnSaleTest\\:\\:getProduct\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContactData\\:\\:setTitle\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionOnSaleTest.php
+			path: engine/Shopware/Models/Newsletter/ContactData.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionOnSaleTest\\:\\:mapOptions\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContactData\\:\\:setZipCode\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionOnSaleTest.php
+			path: engine/Shopware/Models/Newsletter/ContactData.php
 
 		-
-			message: "#^Parameter \\#1 \\$products of method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionOnSaleTest\\:\\:assertPrices\\(\\) expects array\\<Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\ListProduct\\>, array\\<Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\BaseProduct\\> given\\.$#"
-			count: 7
-			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionOnSaleTest.php
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Container\\:\\:getArticles\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/Newsletter/Container.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionTest\\:\\:buildConfigurator\\(\\) has parameter \\$expected with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Container\\:\\:getLinks\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionTest.php
+			path: engine/Shopware/Models/Newsletter/Container.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionTest\\:\\:createCondition\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Container\\:\\:setDescription\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionTest.php
+			path: engine/Shopware/Models/Newsletter/Container.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionTest\\:\\:getProduct\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Container\\:\\:setNewsletter\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionTest.php
+			path: engine/Shopware/Models/Newsletter/Container.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionTest\\:\\:mapOptions\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Container\\:\\:setPosition\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionTest.php
+			path: engine/Shopware/Models/Newsletter/Container.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithCurrencyFactor\\:\\:assertPrices\\(\\) has parameter \\$prices with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Container\\:\\:setType\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithCurrencyFactor.php
+			path: engine/Shopware/Models/Newsletter/Container.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithCurrencyFactor\\:\\:buildConfigurator\\(\\) has parameter \\$expected with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Container\\:\\:setValue\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithCurrencyFactor.php
+			path: engine/Shopware/Models/Newsletter/Container.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithCurrencyFactor\\:\\:createCondition\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Newsletter\\\\Container\\:\\:\\$articles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithCurrencyFactor.php
+			path: engine/Shopware/Models/Newsletter/Container.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithCurrencyFactor\\:\\:getProduct\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Newsletter\\\\Container\\:\\:\\$links with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithCurrencyFactor.php
+			path: engine/Shopware/Models/Newsletter/Container.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithCurrencyFactor\\:\\:getSearchResult\\(\\) has parameter \\$expanded with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Article\\:\\:setArticleDetail\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithCurrencyFactor.php
+			path: engine/Shopware/Models/Newsletter/ContainerType/Article.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithCurrencyFactor\\:\\:mapOptions\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Article\\:\\:setContainer\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithCurrencyFactor.php
+			path: engine/Shopware/Models/Newsletter/ContainerType/Article.php
 
 		-
-			message: "#^Cannot call method getCalculatedPrice\\(\\) on Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\Product\\\\Price\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Article\\:\\:setName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithGraduationTest.php
+			path: engine/Shopware/Models/Newsletter/ContainerType/Article.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithGraduationTest\\:\\:assertPrices\\(\\) has parameter \\$prices with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Article\\:\\:setPosition\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithGraduationTest.php
+			path: engine/Shopware/Models/Newsletter/ContainerType/Article.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithGraduationTest\\:\\:buildConfigurator\\(\\) has parameter \\$expected with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Article\\:\\:setType\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithGraduationTest.php
+			path: engine/Shopware/Models/Newsletter/ContainerType/Article.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithGraduationTest\\:\\:createCondition\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Banner\\:\\:setContainer\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithGraduationTest.php
+			path: engine/Shopware/Models/Newsletter/ContainerType/Banner.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithGraduationTest\\:\\:getProduct\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Banner\\:\\:setDescription\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithGraduationTest.php
+			path: engine/Shopware/Models/Newsletter/ContainerType/Banner.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithGraduationTest\\:\\:mapOptions\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Banner\\:\\:setImage\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithGraduationTest.php
+			path: engine/Shopware/Models/Newsletter/ContainerType/Banner.php
 
 		-
-			message: "#^Parameter \\#1 \\$products of method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithGraduationTest\\:\\:assertPrices\\(\\) expects array\\<Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\ListProduct\\>, array\\<Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\BaseProduct\\> given\\.$#"
-			count: 7
-			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithGraduationTest.php
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Banner\\:\\:setLink\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Newsletter/ContainerType/Banner.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithPriceGroupTest\\:\\:buildConfigurator\\(\\) has parameter \\$expected with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Banner\\:\\:setTarget\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithPriceGroupTest.php
+			path: engine/Shopware/Models/Newsletter/ContainerType/Banner.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithPriceGroupTest\\:\\:createCondition\\(\\) has parameter \\$expand with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Link\\:\\:setContainer\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithPriceGroupTest.php
+			path: engine/Shopware/Models/Newsletter/ContainerType/Link.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithPriceGroupTest\\:\\:createCondition\\(\\) has parameter \\$groupName with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Link\\:\\:setDescription\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithPriceGroupTest.php
+			path: engine/Shopware/Models/Newsletter/ContainerType/Link.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithPriceGroupTest\\:\\:createCondition\\(\\) has parameter \\$options with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Link\\:\\:setLink\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithPriceGroupTest.php
+			path: engine/Shopware/Models/Newsletter/ContainerType/Link.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithPriceGroupTest\\:\\:getPriceData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Link\\:\\:setPosition\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithPriceGroupTest.php
+			path: engine/Shopware/Models/Newsletter/ContainerType/Link.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithPriceGroupTest\\:\\:getProduct\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Link\\:\\:setTarget\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithPriceGroupTest.php
+			path: engine/Shopware/Models/Newsletter/ContainerType/Link.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithPriceGroupTest\\:\\:mapOptions\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Text\\:\\:setAlignment\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithPriceGroupTest.php
+			path: engine/Shopware/Models/Newsletter/ContainerType/Text.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Facet\\\\PropertyFacetTest\\:\\:createPropertyCombination\\(\\) has parameter \\$properties with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Text\\:\\:setContainer\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Facet/PropertyFacetTest.php
+			path: engine/Shopware/Models/Newsletter/ContainerType/Text.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Facet\\\\PropertyFacetTest\\:\\:createPropertyCombination\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Text\\:\\:setContent\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Facet/PropertyFacetTest.php
+			path: engine/Shopware/Models/Newsletter/ContainerType/Text.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\HideNoInStockTest\\:\\:categoryConditionFilter\\(\\) has parameter \\$el with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Text\\:\\:setHeadline\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/HideNoInStockTest.php
+			path: engine/Shopware/Models/Newsletter/ContainerType/Text.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\HideNoInStockTest\\:\\:getStoreFrontConditions\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Text\\:\\:setImage\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/HideNoInStockTest.php
+			path: engine/Shopware/Models/Newsletter/ContainerType/Text.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\HideNoInStockTest\\:\\:\\$testProducts type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\ContainerType\\\\Text\\:\\:setLink\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/HideNoInStockTest.php
+			path: engine/Shopware/Models/Newsletter/ContainerType/Text.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ManualSortingTest\\:\\:search\\(\\) has parameter \\$configs with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Group\\:\\:setName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Sorting/ManualSortingTest.php
+			path: engine/Shopware/Models/Newsletter/Group.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ManualSortingTest\\:\\:search\\(\\) has parameter \\$context with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:getAlreadySendTo\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Sorting/ManualSortingTest.php
+			path: engine/Shopware/Models/Newsletter/Newsletter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ManualSortingTest\\:\\:search\\(\\) has parameter \\$expectedNumbers with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:getContainers\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Sorting/ManualSortingTest.php
+			path: engine/Shopware/Models/Newsletter/Newsletter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ManualSortingTest\\:\\:search\\(\\) has parameter \\$products with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:getOrders\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Sorting/ManualSortingTest.php
+			path: engine/Shopware/Models/Newsletter/Newsletter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\PopularitySortingTest\\:\\:search\\(\\) has parameter \\$configs with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:setClicked\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Sorting/PopularitySortingTest.php
+			path: engine/Shopware/Models/Newsletter/Newsletter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\PopularitySortingTest\\:\\:search\\(\\) has parameter \\$expectedNumbers with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:setCustomerGroup\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Sorting/PopularitySortingTest.php
+			path: engine/Shopware/Models/Newsletter/Newsletter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\PopularitySortingTest\\:\\:search\\(\\) has parameter \\$products with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:setDate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Sorting/PopularitySortingTest.php
+			path: engine/Shopware/Models/Newsletter/Newsletter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\PriceSortingTest\\:\\:getPriceContext\\(\\) has parameter \\$discount with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:setGroups\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Sorting/PriceSortingTest.php
+			path: engine/Shopware/Models/Newsletter/Newsletter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\PriceSortingTest\\:\\:getPriceContext\\(\\) has parameter \\$displayGross with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:setLanguageId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Sorting/PriceSortingTest.php
+			path: engine/Shopware/Models/Newsletter/Newsletter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\PriceSortingTest\\:\\:search\\(\\) has parameter \\$configs with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:setLocked\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Sorting/PriceSortingTest.php
+			path: engine/Shopware/Models/Newsletter/Newsletter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\PriceSortingTest\\:\\:search\\(\\) has parameter \\$context with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:setPlaintext\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Sorting/PriceSortingTest.php
+			path: engine/Shopware/Models/Newsletter/Newsletter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\PriceSortingTest\\:\\:search\\(\\) has parameter \\$expectedNumbers with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:setPublish\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Sorting/PriceSortingTest.php
+			path: engine/Shopware/Models/Newsletter/Newsletter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\PriceSortingTest\\:\\:search\\(\\) has parameter \\$products with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:setRead\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Sorting/PriceSortingTest.php
+			path: engine/Shopware/Models/Newsletter/Newsletter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ProductAttributeSortingTest\\:\\:search\\(\\) has parameter \\$configs with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:setRecipients\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Sorting/ProductAttributeSortingTest.php
+			path: engine/Shopware/Models/Newsletter/Newsletter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ProductAttributeSortingTest\\:\\:search\\(\\) has parameter \\$context with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:setSenderMail\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Sorting/ProductAttributeSortingTest.php
+			path: engine/Shopware/Models/Newsletter/Newsletter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ProductAttributeSortingTest\\:\\:search\\(\\) has parameter \\$expectedNumbers with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:setSenderName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Sorting/ProductAttributeSortingTest.php
+			path: engine/Shopware/Models/Newsletter/Newsletter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ProductAttributeSortingTest\\:\\:search\\(\\) has parameter \\$products with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:setStatus\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Sorting/ProductAttributeSortingTest.php
+			path: engine/Shopware/Models/Newsletter/Newsletter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ProductNameSortingTest\\:\\:search\\(\\) has parameter \\$configs with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:setSubject\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Sorting/ProductNameSortingTest.php
+			path: engine/Shopware/Models/Newsletter/Newsletter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ProductNameSortingTest\\:\\:search\\(\\) has parameter \\$context with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:setTemplateId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Sorting/ProductNameSortingTest.php
+			path: engine/Shopware/Models/Newsletter/Newsletter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ProductNameSortingTest\\:\\:search\\(\\) has parameter \\$expectedNumbers with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:setTimedDelivery\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Sorting/ProductNameSortingTest.php
+			path: engine/Shopware/Models/Newsletter/Newsletter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ProductNameSortingTest\\:\\:search\\(\\) has parameter \\$products with no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:\\$addresses with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Sorting/ProductNameSortingTest.php
+			path: engine/Shopware/Models/Newsletter/Newsletter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ProductNumberSortingTest\\:\\:search\\(\\) has parameter \\$configs with no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Newsletter\\\\Newsletter\\:\\:\\$containers with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Sorting/ProductNumberSortingTest.php
+			path: engine/Shopware/Models/Newsletter/Newsletter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ProductNumberSortingTest\\:\\:search\\(\\) has parameter \\$context with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Repository\\:\\:getListAddressesQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Sorting/ProductNumberSortingTest.php
+			path: engine/Shopware/Models/Newsletter/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ProductNumberSortingTest\\:\\:search\\(\\) has parameter \\$expectedNumbers with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Repository\\:\\:getListAddressesQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Sorting/ProductNumberSortingTest.php
+			path: engine/Shopware/Models/Newsletter/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ProductNumberSortingTest\\:\\:search\\(\\) has parameter \\$products with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Repository\\:\\:getListGroupsQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Sorting/ProductNumberSortingTest.php
+			path: engine/Shopware/Models/Newsletter/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ReleaseDateSortingTest\\:\\:search\\(\\) has parameter \\$configs with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Repository\\:\\:getListGroupsQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Sorting/ReleaseDateSortingTest.php
+			path: engine/Shopware/Models/Newsletter/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ReleaseDateSortingTest\\:\\:search\\(\\) has parameter \\$context with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Repository\\:\\:getListNewslettersQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Sorting/ReleaseDateSortingTest.php
+			path: engine/Shopware/Models/Newsletter/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ReleaseDateSortingTest\\:\\:search\\(\\) has parameter \\$expectedNumbers with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Repository\\:\\:getListNewslettersQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Sorting/ReleaseDateSortingTest.php
+			path: engine/Shopware/Models/Newsletter/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ReleaseDateSortingTest\\:\\:search\\(\\) has parameter \\$products with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Repository\\:\\:getListSenderQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundle/Sorting/ReleaseDateSortingTest.php
+			path: engine/Shopware/Models/Newsletter/Repository.php
 
 		-
-			message: "#^Parameter \\#1 \\$sql of method Doctrine\\\\DBAL\\\\Connection\\:\\:exec\\(\\) expects string, string\\|false given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Repository\\:\\:getListSenderQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SearchBundleDBAL/SearchIndexerTest.php
+			path: engine/Shopware/Models/Newsletter/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SitemapBundle\\\\Provider\\\\CustomUrlProviderTest\\:\\:getCustomUrlProvider\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Sender\\:\\:setEmail\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SitemapBundle/Provider/CustomUrlProviderTest.php
+			path: engine/Shopware/Models/Newsletter/Sender.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SitemapBundle\\\\Provider\\\\CustomUrlProviderTest\\:\\:testGetUrlsReturnsAllUrlsForShop\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Newsletter\\\\Sender\\:\\:setName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SitemapBundle/Provider/CustomUrlProviderTest.php
+			path: engine/Shopware/Models/Newsletter/Sender.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SitemapBundle\\\\Provider\\\\CustomUrlProviderTest\\:\\:testGetUrlsReturnsAllUrlsForShopIdZero\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setArticleId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SitemapBundle/Provider/CustomUrlProviderTest.php
+			path: engine/Shopware/Models/Order/Basket.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SitemapBundle\\\\Provider\\\\CustomUrlProviderTest\\:\\:testGetUrlsReturnsNoUrls\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setArticleName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SitemapBundle/Provider/CustomUrlProviderTest.php
+			path: engine/Shopware/Models/Order/Basket.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SitemapBundle\\\\Provider\\\\CustomUrlProviderTest\\:\\:testGetUrlsReturnsNoUrlsWrongShopId\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setConfig\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SitemapBundle/Provider/CustomUrlProviderTest.php
+			path: engine/Shopware/Models/Order/Basket.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SitemapBundle\\\\SitemapLockTest\\:\\:testLocks\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setCurrencyFactor\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/SitemapBundle/SitemapLockTest.php
+			path: engine/Shopware/Models/Order/Basket.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\CheapestPriceTest\\:\\:createPriceGroupProduct\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setCustomerId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/CheapestPriceTest.php
+			path: engine/Shopware/Models/Order/Basket.php
 
 		-
-			message: "#^Parameter \\#1 \\$host of method Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\Shop\\:\\:setHost\\(\\) expects string, string\\|null given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setDate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Converter.php
+			path: engine/Shopware/Models/Order/Basket.php
 
 		-
-			message: "#^Parameter \\#1 \\$path of method Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\Category\\:\\:setPath\\(\\) expects array, string given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setEsdArticle\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Converter.php
+			path: engine/Shopware/Models/Order/Basket.php
 
 		-
-			message: "#^Parameter \\#1 \\$path of method Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\Shop\\:\\:setPath\\(\\) expects string, string\\|null given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setLastViewPort\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Converter.php
+			path: engine/Shopware/Models/Order/Basket.php
 
 		-
-			message: "#^Parameter \\#1 \\$quantity of method Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\Product\\\\PriceDiscount\\:\\:setQuantity\\(\\) expects int, float given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setMode\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Converter.php
+			path: engine/Shopware/Models/Order/Basket.php
 
 		-
-			message: "#^Parameter \\#1 \\$url of method Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\Shop\\:\\:setUrl\\(\\) expects string, string\\|null given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setNetPrice\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Converter.php
+			path: engine/Shopware/Models/Order/Basket.php
 
 		-
-			message: "#^Parameter \\#2 \\$baseUrl of class Shopware\\\\Components\\\\Routing\\\\Context constructor expects string, string\\|null given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setOrderNumber\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/CoverTest.php
+			path: engine/Shopware/Models/Order/Basket.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:cleanUpCombinations\\(\\) has parameter \\$combinations with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setPartnerId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Basket.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:cleanUpCombinations\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setPrice\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Basket.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:combinations\\(\\) has parameter \\$arrays with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setQuantity\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Basket.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:combinations\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setSessionId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Basket.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:createCategory\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setShippingFree\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Basket.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:createConfiguratorSet\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setTaxRate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Basket.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:createContext\\(\\) has parameter \\$taxes with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Basket\\:\\:setUserAgent\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Basket.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:createCurrency\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Billing\\:\\:fromAddress\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Billing.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:createCustomerGroup\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Billing\\:\\:setAdditionalAddressLine1\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Billing.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:createManufacturer\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Billing\\:\\:setAdditionalAddressLine2\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Billing.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:createProperties\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Billing\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Billing.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:createTax\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Billing\\:\\:setCountry\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Billing.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:createUnitTranslations\\(\\) has parameter \\$translation with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Billing\\:\\:setCustomer\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Billing.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:createUnitTranslations\\(\\) has parameter \\$unitIds with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Billing\\:\\:setOrder\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Billing.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:createVotes\\(\\) has parameter \\$points with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Billing\\:\\:setState\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Billing.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:generateVariants\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Billing\\:\\:setTitle\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Billing.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:generateVariants\\(\\) has parameter \\$groups with no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#1 \\$country of method Shopware\\\\Models\\\\Order\\\\Billing\\:\\:setCountry\\(\\) expects Shopware\\\\Models\\\\Country\\\\Country, Shopware\\\\Models\\\\Country\\\\Country\\|null given\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Billing.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:generateVariants\\(\\) has parameter \\$numberPrefix with no type specified\\.$#"
+			message: "#^Parameter \\#1 \\$entity of method Shopware\\\\Components\\\\Model\\\\ModelManager\\:\\:toArray\\(\\) expects array\\|Shopware\\\\Components\\\\Model\\\\ModelEntity\\|Traversable, Shopware\\\\Models\\\\Attribute\\\\CustomerAddress\\|null given\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Billing.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:generateVariants\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Detail\\:\\:setArticleDetail\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Detail.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getCategoryData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Detail\\:\\:setArticleNumber\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Detail.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getConfigurator\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Detail\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Detail.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getConfigurator\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Detail\\:\\:setEan\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Detail.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getGraduatedPrices\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Detail\\:\\:setEsd\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Detail.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getImageData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Detail\\:\\:setOrder\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Detail.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getImageData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Detail\\:\\:setPackUnit\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Detail.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getListProduct\\(\\) has parameter \\$configs with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Detail\\:\\:setStatus\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Detail.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getListProduct\\(\\) should return Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\ListProduct but returns Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\ListProduct\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Detail\\:\\:setTax\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Detail.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getListProducts\\(\\) has parameter \\$configs with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Detail\\:\\:setTaxRate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Detail.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getManufacturerData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Detail\\:\\:setUnit\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Detail.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getProductConfigurator\\(\\) has parameter \\$selection with no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Order\\\\Detail\\:\\:\\$status has no type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Detail.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getProductData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Document\\\\Document\\:\\:setOrder\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Document/Document.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getProductData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Document\\\\Document\\:\\:setType\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Document/Document.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getProductOptionsByName\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Document\\\\Document\\:\\:setTypeId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Document/Document.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getProductProperties\\(\\) should return Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\Property\\\\Set but returns Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\Property\\\\Set\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Document\\\\Repository\\:\\:filterListQuery\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Document/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getProperties\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Document\\\\Repository\\:\\:filterListQuery\\(\\) has parameter \\$filter with no type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Document/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getShop\\(\\) should return Shopware\\\\Models\\\\Shop\\\\Shop but returns Shopware\\\\Models\\\\Shop\\\\Shop\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Document\\\\Repository\\:\\:getListQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Document/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getUnitData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Document\\\\Repository\\:\\:getListQuery\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Document/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getUnitData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Esd\\:\\:setDate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Esd.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getVariantData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Esd\\:\\:setOrder\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Esd.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getVariantData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Esd\\:\\:setOrderDetail\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Esd.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getVariantsByOptions\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\History\\:\\:setChangeDate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/History.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getVariantsByOptions\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Number\\:\\:setDescription\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Number.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:insertConfiguratorData\\(\\) has parameter \\$groups with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Number\\:\\:setName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Number.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:updateArticle\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Number\\:\\:setNumber\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/Number.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:updateConfiguratorVariants\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\User\\\\User\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/OrderHistorySubscriber.php
 
 		-
-			message: "#^Parameter \\#1 \\$customerGroup of method Shopware\\\\Models\\\\Price\\\\Discount\\:\\:setCustomerGroup\\(\\) expects Shopware\\\\Models\\\\Customer\\\\Group, Shopware\\\\Models\\\\Customer\\\\Group\\|null given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\OrderHistorySubscriber\\:\\:preUpdate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/OrderHistorySubscriber.php
 
 		-
-			message: "#^Parameter \\#1 \\$entity of method Doctrine\\\\ORM\\\\EntityManager\\:\\:remove\\(\\) expects object, Shopware\\\\Models\\\\Price\\\\Group\\|null given\\.$#"
+			message: "#^Query error\\: Column \"s_order_history\\.order_status_id\" expects value type int\\|null, got type mixed$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/OrderHistorySubscriber.php
 
 		-
-			message: "#^Parameter \\#1 \\$entity of method Doctrine\\\\ORM\\\\EntityManager\\:\\:remove\\(\\) expects object, Shopware\\\\Models\\\\Shop\\\\Currency\\|null given\\.$#"
+			message: "#^Query error\\: Column \"s_order_history\\.payment_status_id\" expects value type int\\|null, got type mixed$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/OrderHistorySubscriber.php
 
 		-
-			message: "#^Parameter \\#1 \\$entity of method Doctrine\\\\ORM\\\\EntityManager\\:\\:remove\\(\\) expects object, Shopware\\\\Models\\\\Tax\\\\Tax\\|null given\\.$#"
+			message: "#^Query error\\: Column \"s_order_history\\.previous_order_status_id\" expects value type int\\|null, got type mixed$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/OrderHistorySubscriber.php
 
 		-
-			message: "#^Parameter \\#1 \\$position of method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Group\\:\\:setPosition\\(\\) expects int, array given\\.$#"
+			message: "#^Query error\\: Column \"s_order_history\\.previous_payment_status_id\" expects value type int\\|null, got type mixed$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
+			path: engine/Shopware/Models/Order/OrderHistorySubscriber.php
 
 		-
-			message: "#^Cannot call method getMedia\\(\\) on Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\Product\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Repository\\:\\:getOrderStatusQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/ProductMediaTest.php
+			path: engine/Shopware/Models/Order/Repository.php
 
 		-
-			message: "#^Parameter \\#2 \\$baseUrl of class Shopware\\\\Components\\\\Routing\\\\Context constructor expects string, string\\|null given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Repository\\:\\:getOrderStatusQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/ProductMediaTest.php
+			path: engine/Shopware/Models/Order/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\PropertyHydratorTest\\:\\:hydrateDataProvider\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Repository\\:\\:getPaymentStatusQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/PropertyHydratorTest.php
+			path: engine/Shopware/Models/Order/Repository.php
 
 		-
-			message: "#^Negated boolean expression is always false\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Repository\\:\\:getPaymentStatusQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/SimilarProductsTest.php
+			path: engine/Shopware/Models/Order/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\TestCase\\:\\:assertSearchResult\\(\\) has parameter \\$expectedNumbers with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Repository\\:\\:getPayments\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/TestCase.php
+			path: engine/Shopware/Models/Order/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\TestCase\\:\\:createProducts\\(\\) has parameter \\$products with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Repository\\:\\:searchCustomers\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/TestCase.php
+			path: engine/Shopware/Models/Order/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\TestCase\\:\\:search\\(\\) has parameter \\$configs with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Shipping\\:\\:fromAddress\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/TestCase.php
+			path: engine/Shopware/Models/Order/Shipping.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\TestCase\\:\\:search\\(\\) has parameter \\$expectedNumbers with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Shipping\\:\\:setAdditionalAddressLine1\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/TestCase.php
+			path: engine/Shopware/Models/Order/Shipping.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\TestCase\\:\\:search\\(\\) has parameter \\$products with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Shipping\\:\\:setAdditionalAddressLine2\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Bundle/StoreFrontBundle/TestCase.php
+			path: engine/Shopware/Models/Order/Shipping.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Commands\\\\ConfigSetCommandTest\\:\\:configValueProvider\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Shipping\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Commands/ConfigSetCommandTest.php
+			path: engine/Shopware/Models/Order/Shipping.php
 
 		-
-			message: "#^Cannot access offset 'customer' on array\\|Shopware\\\\Models\\\\Customer\\\\Address\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Shipping\\:\\:setCountry\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/AddressTest.php
+			path: engine/Shopware/Models/Order/Shipping.php
 
 		-
-			message: "#^Cannot access offset 'id' on array\\|Shopware\\\\Models\\\\Customer\\\\Address\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Shipping\\:\\:setCustomer\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/AddressTest.php
+			path: engine/Shopware/Models/Order/Shipping.php
 
 		-
-			message: "#^Cannot call method getDefaultBillingAddress\\(\\) on Shopware\\\\Models\\\\Customer\\\\Customer\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Shipping\\:\\:setOrder\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/AddressTest.php
+			path: engine/Shopware/Models/Order/Shipping.php
 
 		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Country\\\\Country\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Shipping\\:\\:setState\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/AddressTest.php
+			path: engine/Shopware/Models/Order/Shipping.php
 
 		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
-			count: 3
-			path: tests/Functional/Components/Api/AddressTest.php
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Shipping\\:\\:setTitle\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Order/Shipping.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\AddressTest\\:\\:testDeleteShouldBeSuccessfulAfterOtherDefaultAddress\\(\\) has parameter \\$id with no type specified\\.$#"
+			message: "#^Parameter \\#1 \\$country of method Shopware\\\\Models\\\\Order\\\\Shipping\\:\\:setCountry\\(\\) expects Shopware\\\\Models\\\\Country\\\\Country, Shopware\\\\Models\\\\Country\\\\Country\\|null given\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/AddressTest.php
+			path: engine/Shopware/Models/Order/Shipping.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\AddressTest\\:\\:testGetOneShouldBeSuccessful\\(\\) has parameter \\$id with no type specified\\.$#"
+			message: "#^Parameter \\#1 \\$entity of method Shopware\\\\Components\\\\Model\\\\ModelManager\\:\\:toArray\\(\\) expects array\\|Shopware\\\\Components\\\\Model\\\\ModelEntity\\|Traversable, Shopware\\\\Models\\\\Attribute\\\\CustomerAddress\\|null given\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/AddressTest.php
+			path: engine/Shopware/Models/Order/Shipping.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\AddressTest\\:\\:testMakeNewAddressTheDefault\\(\\) has parameter \\$id with no type specified\\.$#"
+			message: "#^Parameter \\#1 \\$phone of method Shopware\\\\Models\\\\Order\\\\Shipping\\:\\:setPhone\\(\\) expects string, string\\|null given\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/AddressTest.php
+			path: engine/Shopware/Models/Order/Shipping.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\AddressTest\\:\\:testUpdateShouldBeSuccessful\\(\\) has parameter \\$id with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Status\\:\\:setId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/AddressTest.php
+			path: engine/Shopware/Models/Order/Status.php
 
 		-
-			message: "#^Parameter \\#1 \\$id of method Shopware\\\\Components\\\\Api\\\\Resource\\\\Address\\:\\:delete\\(\\) expects int, string given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Order\\\\Status\\:\\:setName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/AddressTest.php
+			path: engine/Shopware/Models/Order/Status.php
 
 		-
-			message: "#^Parameter \\#1 \\$id of method Shopware\\\\Components\\\\Api\\\\Resource\\\\Address\\:\\:update\\(\\) expects int, string given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Partner\\\\Partner\\:\\:getOrders\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/AddressTest.php
+			path: engine/Shopware/Models/Partner/Partner.php
 
 		-
-			message: "#^Cannot access offset 'details' on array\\|Shopware\\\\Models\\\\Article\\\\Article\\.$#"
-			count: 2
-			path: tests/Functional/Components/Api/ArticleTest.php
+			message: "#^Method Shopware\\\\Models\\\\Partner\\\\Partner\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Partner/Partner.php
 
 		-
-			message: "#^Cannot access offset 'id' on array\\|Shopware\\\\Models\\\\Article\\\\Article\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Partner\\\\Partner\\:\\:setCustomerId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Partner/Partner.php
 
 		-
-			message: "#^Cannot access offset 'images' on array\\|Shopware\\\\Models\\\\Article\\\\Article\\.$#"
-			count: 5
-			path: tests/Functional/Components/Api/ArticleTest.php
+			message: "#^Method Shopware\\\\Models\\\\Partner\\\\Partner\\:\\:setOrders\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Partner/Partner.php
 
 		-
-			message: "#^Cannot access offset 'mainDetail' on array\\|Shopware\\\\Models\\\\Article\\\\Article\\.$#"
-			count: 2
-			path: tests/Functional/Components/Api/ArticleTest.php
+			message: "#^Method Shopware\\\\Models\\\\Partner\\\\Partner\\:\\:setOrders\\(\\) has parameter \\$orders with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/Partner/Partner.php
 
 		-
-			message: "#^Cannot access offset 'mainDetailId' on array\\|Shopware\\\\Models\\\\Article\\\\Article\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Partner\\\\Partner\\:\\:\\$orders with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Partner/Partner.php
 
 		-
-			message: "#^Cannot access offset 'propertyValues' on array\\|Shopware\\\\Models\\\\Article\\\\Article\\.$#"
-			count: 5
-			path: tests/Functional/Components/Api/ArticleTest.php
+			message: "#^Method Shopware\\\\Models\\\\Partner\\\\Repository\\:\\:getDetailQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Partner/Repository.php
 
 		-
-			message: "#^Cannot access offset 'translations' on array\\|Shopware\\\\Models\\\\Article\\\\Article\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Partner\\\\Repository\\:\\:getDetailQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Partner/Repository.php
 
 		-
-			message: "#^Cannot call method getAttr1\\(\\) on Shopware\\\\Models\\\\Attribute\\\\Article\\|null\\.$#"
-			count: 2
-			path: tests/Functional/Components/Api/ArticleTest.php
+			message: "#^Method Shopware\\\\Models\\\\Partner\\\\Repository\\:\\:getStatisticListQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Partner/Repository.php
 
 		-
-			message: "#^Cannot call method getAttr2\\(\\) on Shopware\\\\Models\\\\Attribute\\\\Article\\|null\\.$#"
-			count: 2
-			path: tests/Functional/Components/Api/ArticleTest.php
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:getCountries\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/Payment/Payment.php
 
 		-
-			message: "#^Cannot call method getAttribute\\(\\) on Shopware\\\\Models\\\\Article\\\\Detail\\|null\\.$#"
-			count: 4
-			path: tests/Functional/Components/Api/ArticleTest.php
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:getPaymentData\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/Payment/Payment.php
 
 		-
-			message: "#^Cannot call method getDetails\\(\\) on array\\|Shopware\\\\Models\\\\Article\\\\Article\\.$#"
-			count: 3
-			path: tests/Functional/Components/Api/ArticleTest.php
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:getPaymentInstances\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/Payment/Payment.php
 
 		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Article\\\\Supplier\\|null\\.$#"
-			count: 2
-			path: tests/Functional/Components/Api/ArticleTest.php
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:getRuleSets\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/Payment/Payment.php
 
 		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Article\\\\Unit\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:getShops\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Payment/Payment.php
 
 		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Media\\\\Media\\|null\\.$#"
-			count: 3
-			path: tests/Functional/Components/Api/ArticleTest.php
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Payment/Payment.php
 
 		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Shop\\\\Shop\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:setCountries\\(\\) has parameter \\$countries with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Payment/Payment.php
 
 		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Tax\\\\Tax\\|null\\.$#"
-			count: 2
-			path: tests/Functional/Components/Api/ArticleTest.php
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:setPaymentData\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Payment/Payment.php
 
 		-
-			message: "#^Cannot call method getId\\(\\) on array\\|Shopware\\\\Models\\\\Article\\\\Article\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:setPaymentData\\(\\) has parameter \\$paymentData with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Payment/Payment.php
 
 		-
-			message: "#^Cannot call method getInStock\\(\\) on Shopware\\\\Models\\\\Article\\\\Detail\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:setPaymentInstances\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Payment/Payment.php
 
 		-
-			message: "#^Cannot call method getLastStock\\(\\) on Shopware\\\\Models\\\\Article\\\\Detail\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:setPaymentInstances\\(\\) has parameter \\$paymentInstances with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Payment/Payment.php
 
 		-
-			message: "#^Cannot call method getMainDetail\\(\\) on Shopware\\\\Models\\\\Article\\\\Article\\|null\\.$#"
-			count: 2
-			path: tests/Functional/Components/Api/ArticleTest.php
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:setPlugin\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Payment/Payment.php
 
 		-
-			message: "#^Cannot call method getMainDetail\\(\\) on array\\|Shopware\\\\Models\\\\Article\\\\Article\\.$#"
-			count: 2
-			path: tests/Functional/Components/Api/ArticleTest.php
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:setRuleSets\\(\\) has parameter \\$ruleSets with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/Payment/Payment.php
 
 		-
-			message: "#^Cannot call method getNumber\\(\\) on Shopware\\\\Models\\\\Article\\\\Detail\\|null\\.$#"
-			count: 6
-			path: tests/Functional/Components/Api/ArticleTest.php
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:setShops\\(\\) has parameter \\$shops with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/Payment/Payment.php
 
 		-
-			message: "#^Cannot call method getOptions\\(\\) on Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\|null\\.$#"
-			count: 3
-			path: tests/Functional/Components/Api/ArticleTest.php
+			message: "#^Property Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:\\$countries with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/Payment/Payment.php
 
 		-
-			message: "#^Cannot call method getPrices\\(\\) on Shopware\\\\Models\\\\Article\\\\Detail\\|null\\.$#"
-			count: 8
-			path: tests/Functional/Components/Api/ArticleTest.php
+			message: "#^Property Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:\\$paymentData with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/Payment/Payment.php
 
 		-
-			message: "#^Cannot call method getTax\\(\\) on Shopware\\\\Models\\\\Tax\\\\Tax\\|null\\.$#"
-			count: 3
-			path: tests/Functional/Components/Api/ArticleTest.php
+			message: "#^Property Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:\\$paymentInstances with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/Payment/Payment.php
 
 		-
-			message: "#^Cannot call method getThumbnails\\(\\) on Shopware\\\\Models\\\\Media\\\\Media\\|null\\.$#"
-			count: 5
-			path: tests/Functional/Components/Api/ArticleTest.php
+			message: "#^Property Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:\\$ruleSets with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/Payment/Payment.php
 
 		-
-			message: "#^Cannot call method getType\\(\\) on Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\|null\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Payment\\\\Payment\\:\\:\\$shops with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Payment/Payment.php
 
 		-
-			message: "#^Cannot call method getUnit\\(\\) on Shopware\\\\Models\\\\Article\\\\Detail\\|null\\.$#"
-			count: 6
-			path: tests/Functional/Components/Api/ArticleTest.php
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\PaymentInstance\\:\\:setAccountHolder\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Payment/PaymentInstance.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\ArticleTest\\:\\:cleanUpCombinations\\(\\) has parameter \\$combinations with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\PaymentInstance\\:\\:setAccountNumber\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Payment/PaymentInstance.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\ArticleTest\\:\\:cleanUpCombinations\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\PaymentInstance\\:\\:setAddress\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Payment/PaymentInstance.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\ArticleTest\\:\\:combinations\\(\\) has parameter \\$arrays with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\PaymentInstance\\:\\:setAmount\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Payment/PaymentInstance.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\ArticleTest\\:\\:combinations\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\PaymentInstance\\:\\:setBankCode\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Payment/PaymentInstance.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\ArticleTest\\:\\:createConfiguratorVariants\\(\\) has parameter \\$groupMapping with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\PaymentInstance\\:\\:setBankName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Payment/PaymentInstance.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\ArticleTest\\:\\:createConfiguratorVariants\\(\\) has parameter \\$groups with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\PaymentInstance\\:\\:setBic\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Payment/PaymentInstance.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\ArticleTest\\:\\:createConfiguratorVariants\\(\\) has parameter \\$optionMapping with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\PaymentInstance\\:\\:setCity\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Payment/PaymentInstance.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\ArticleTest\\:\\:createConfiguratorVariants\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\PaymentInstance\\:\\:setCreatedAt\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Payment/PaymentInstance.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\ArticleTest\\:\\:getEntityOffset\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\PaymentInstance\\:\\:setCustomer\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Payment/PaymentInstance.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\ArticleTest\\:\\:getImagesForNewArticle\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\PaymentInstance\\:\\:setFirstName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Payment/PaymentInstance.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\ArticleTest\\:\\:getOptionsForImage\\(\\) has parameter \\$configuratorSet with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\PaymentInstance\\:\\:setIban\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Payment/PaymentInstance.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\ArticleTest\\:\\:getOptionsForImage\\(\\) has parameter \\$optionCount with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\PaymentInstance\\:\\:setLastName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Payment/PaymentInstance.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\ArticleTest\\:\\:getOptionsForImage\\(\\) has parameter \\$property with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\PaymentInstance\\:\\:setOrder\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Payment/PaymentInstance.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\ArticleTest\\:\\:getOptionsForImage\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\PaymentInstance\\:\\:setPaymentMean\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Payment/PaymentInstance.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\ArticleTest\\:\\:getSimpleConfiguratorSet\\(\\) has parameter \\$groupLimit with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\PaymentInstance\\:\\:setZipCode\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Payment/PaymentInstance.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\ArticleTest\\:\\:getSimpleConfiguratorSet\\(\\) has parameter \\$optionLimit with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Repository\\:\\:getActivePaymentsQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Payment/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\ArticleTest\\:\\:getSimpleConfiguratorSet\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Repository\\:\\:getActivePaymentsQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Payment/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\ArticleTest\\:\\:getVariantOptionsOfSet\\(\\) has parameter \\$configuratorSet with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Repository\\:\\:getActivePaymentsQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Payment/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\ArticleTest\\:\\:getVariantOptionsOfSet\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Repository\\:\\:getActivePaymentsQueryBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Payment/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\ArticleTest\\:\\:internalTestReplaceMode\\(\\) has parameter \\$arrayKey with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Repository\\:\\:getAllPaymentsQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Payment/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\ArticleTest\\:\\:internalTestReplaceMode\\(\\) has parameter \\$entity with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Repository\\:\\:getAllPaymentsQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Payment/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\ArticleTest\\:\\:internalTestReplaceMode\\(\\) has parameter \\$replace with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Repository\\:\\:getAllPaymentsQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Payment/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\ArticleTest\\:\\:testDeleteShouldBeSuccessful\\(\\) has parameter \\$id with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Repository\\:\\:getAllPaymentsQueryBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Payment/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\ArticleTest\\:\\:testGetOneByNumberShouldBeSuccessful\\(\\) has parameter \\$id with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Repository\\:\\:getListQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Payment/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\ArticleTest\\:\\:testGetOneShouldBeAbleToReturnObject\\(\\) has parameter \\$id with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Repository\\:\\:getListQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Payment/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\ArticleTest\\:\\:testGetOneShouldBeSuccessful\\(\\) has parameter \\$id with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Repository\\:\\:getListQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Payment/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\ArticleTest\\:\\:testUpdateByNumberShouldBeSuccessful\\(\\) has parameter \\$id with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Payment\\\\Repository\\:\\:getListQueryBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Payment/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\ArticleTest\\:\\:testUpdateShouldBeSuccessful\\(\\) has parameter \\$id with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\License\\:\\:setActive\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Plugin/License.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\ArticleTest\\:\\:testUpdateUseConfiguratorIds\\(\\) has parameter \\$variantNumber with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\License\\:\\:setAdded\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Plugin/License.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\ArticleTest\\:\\:testUpdateWithInvalidDataShouldThrowValidationException\\(\\) has parameter \\$id with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\License\\:\\:setCreation\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Plugin/License.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\ArticleTest\\:\\:testUpdateWithMainImage\\(\\) has parameter \\$articleId with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\License\\:\\:setExpiration\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Plugin/License.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\ArticleTest\\:\\:testUpdateWithSingleMainImage\\(\\) has parameter \\$articleId with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\License\\:\\:setHost\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Plugin/License.php
 
 		-
-			message: "#^Offset 'images' does not exist on array\\{\\}\\|array\\{images\\: non\\-empty\\-array\\<int, array\\{id\\: mixed, main\\: mixed\\}\\>\\}\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\License\\:\\:setLabel\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Plugin/License.php
 
 		-
-			message: "#^Offset 'metaTitle' does not exist on array\\{name\\: 'Testarticle', description\\: 'testdescription', descriptionLong\\: 'Test descriptionLong', active\\: true, pseudoSales\\: 999, highlight\\: true, keywords\\: 'test, testarticle', tax\\: 19, \\.\\.\\.\\}\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\License\\:\\:setLicense\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Plugin/License.php
 
 		-
-			message: "#^Parameter \\#1 \\$finfo of function finfo_buffer expects resource, resource\\|false given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\License\\:\\:setModule\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Plugin/License.php
 
 		-
-			message: "#^Parameter \\#1 \\$id of method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:delete\\(\\) expects int, string given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\License\\:\\:setNotation\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Plugin/License.php
 
 		-
-			message: "#^Parameter \\#1 \\$id of method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:getOne\\(\\) expects int, string\\|false\\|null given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\License\\:\\:setPlugin\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Plugin/License.php
 
 		-
-			message: "#^Parameter \\#1 \\$id of method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:update\\(\\) expects int, string given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\License\\:\\:setSource\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Plugin/License.php
 
 		-
-			message: "#^Parameter \\#1 \\$id of method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:update\\(\\) expects int, string\\|false\\|null given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\License\\:\\:setType\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Plugin/License.php
 
 		-
-			message: "#^Parameter \\#1 \\$number of method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:getOneByNumber\\(\\) expects string, string\\|null given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\License\\:\\:setVersion\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Plugin/License.php
 
 		-
-			message: "#^Parameter \\#1 \\$number of method Shopware\\\\Components\\\\Api\\\\Resource\\\\Article\\:\\:updateByNumber\\(\\) expects string, string\\|null given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:getConfigForms\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Parameter \\#2 \\$string of function finfo_buffer expects string, string\\|false given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:getEmotionComponents\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/ArticleTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Variable \\$optionIds might not be defined\\.$#"
-			count: 2
-			path: tests/Functional/Components/Api/ArticleTest.php
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:getLicenses\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Variable \\$valueIds might not be defined\\.$#"
-			count: 2
-			path: tests/Functional/Components/Api/ArticleTest.php
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:getMenuItems\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Cannot access offset 'id' on array\\|Shopware\\\\Models\\\\Category\\\\Category\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:getPayments\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/CategoryTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Cannot access offset 'translations' on array\\|Shopware\\\\Models\\\\Category\\\\Category\\.$#"
-			count: 3
-			path: tests/Functional/Components/Api/CategoryTest.php
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:getTemplates\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Cannot call method getAttribute1\\(\\) on Shopware\\\\Models\\\\Attribute\\\\Category\\|null\\.$#"
-			count: 2
-			path: tests/Functional/Components/Api/CategoryTest.php
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:getWidgets\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Cannot call method getAttribute2\\(\\) on Shopware\\\\Models\\\\Attribute\\\\Category\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setActive\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/CategoryTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Cannot call method getAttribute6\\(\\) on Shopware\\\\Models\\\\Attribute\\\\Category\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setAdded\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/CategoryTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Category\\\\Category\\|null\\.$#"
-			count: 3
-			path: tests/Functional/Components/Api/CategoryTest.php
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setAuthor\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Cannot call method getName\\(\\) on Shopware\\\\Models\\\\Category\\\\Category\\|null\\.$#"
-			count: 3
-			path: tests/Functional/Components/Api/CategoryTest.php
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setChanges\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Cannot call method getParent\\(\\) on Shopware\\\\Models\\\\Category\\\\Category\\|null\\.$#"
-			count: 5
-			path: tests/Functional/Components/Api/CategoryTest.php
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setConfigForms\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\CategoryTest\\:\\:testDeleteShouldBeSuccessful\\(\\) has parameter \\$id with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setConfigForms\\(\\) has parameter \\$configForms with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/CategoryTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\CategoryTest\\:\\:testGetOneShouldBeSuccessful\\(\\) has parameter \\$id with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setCopyright\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/CategoryTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\CategoryTest\\:\\:testUpdateShouldBeSuccessful\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setDescription\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/CategoryTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\CategoryTest\\:\\:testUpdateShouldBeSuccessful\\(\\) has parameter \\$id with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setEmotionComponents\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/CategoryTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Parameter \\#1 \\$id of method Shopware\\\\Components\\\\Api\\\\Resource\\\\Category\\:\\:delete\\(\\) expects int, string given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setEmotionComponents\\(\\) has parameter \\$emotionComponents with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/CategoryTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Parameter \\#1 \\$id of method Shopware\\\\Components\\\\Api\\\\Resource\\\\Category\\:\\:update\\(\\) expects int, string given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setInSafeMode\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/CategoryTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Cannot access offset 'id' on array\\|Shopware\\\\Models\\\\Customer\\\\Group\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setInstalled\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/CustomerGroupTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\CustomerGroupTest\\:\\:testDeleteShouldBeSuccessful\\(\\) has parameter \\$id with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setLabel\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/CustomerGroupTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\CustomerGroupTest\\:\\:testGetOneShouldBeSuccessful\\(\\) has parameter \\$id with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setLicense\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/CustomerGroupTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\CustomerGroupTest\\:\\:testUpdateShouldBeSuccessful\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setLicenses\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/CustomerGroupTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\CustomerGroupTest\\:\\:testUpdateShouldBeSuccessful\\(\\) has parameter \\$id with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setLicenses\\(\\) has parameter \\$licenses with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/CustomerGroupTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Parameter \\#1 \\$id of method Shopware\\\\Components\\\\Api\\\\Resource\\\\CustomerGroup\\:\\:delete\\(\\) expects int, string given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setLink\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/CustomerGroupTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Parameter \\#1 \\$id of method Shopware\\\\Components\\\\Api\\\\Resource\\\\CustomerGroup\\:\\:update\\(\\) expects int, string given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setMenuItems\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/CustomerGroupTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\CustomerStreamTest\\:\\:createResource\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setMenuItems\\(\\) has parameter \\$menuItems with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/CustomerStreamTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\CustomerStreamTest\\:\\:testCreateStaticStream\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/CustomerStreamTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Cannot access offset 'details' on array\\|Shopware\\\\Models\\\\Order\\\\Order\\.$#"
-			count: 2
-			path: tests/Functional/Components/Api/OrderTest.php
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setNamespace\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Cannot access offset 'id' on array\\|Shopware\\\\Models\\\\Order\\\\Order\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setPayments\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/OrderTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Cannot access offset 'number' on array\\|Shopware\\\\Models\\\\Order\\\\Order\\.$#"
-			count: 2
-			path: tests/Functional/Components/Api/OrderTest.php
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setPayments\\(\\) has parameter \\$payments with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Cannot call method getDetails\\(\\) on array\\|Shopware\\\\Models\\\\Order\\\\Order\\.$#"
-			count: 3
-			path: tests/Functional/Components/Api/OrderTest.php
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setSource\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Cannot call method getId\\(\\) on array\\|Shopware\\\\Models\\\\Order\\\\Order\\.$#"
-			count: 2
-			path: tests/Functional/Components/Api/OrderTest.php
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setSupport\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\OrderTest\\:\\:filterOrderId\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setTemplates\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/OrderTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\OrderTest\\:\\:filterOrderId\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setTemplates\\(\\) has parameter \\$templates with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/OrderTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Offset 'details' does not exist on array\\{\\}\\|array\\{details\\: non\\-empty\\-array\\<int\\|string, array\\{id\\: mixed, status\\: int\\<0, 3\\>, shipped\\: 1\\}\\>\\}\\.$#"
-			count: 2
-			path: tests/Functional/Components/Api/OrderTest.php
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setTranslations\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Parameter \\#1 \\$id of method Shopware\\\\Components\\\\Api\\\\Resource\\\\Order\\:\\:update\\(\\) expects int, string given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setUpdateSource\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/OrderTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Parameter \\#1 \\$number of method Shopware\\\\Components\\\\Api\\\\Resource\\\\Order\\:\\:getOneByNumber\\(\\) expects string, int given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setUpdateVersion\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/OrderTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Parameter \\#1 \\$order of method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\OrderTest\\:\\:filterOrderId\\(\\) expects array, array\\|Shopware\\\\Models\\\\Order\\\\Order given\\.$#"
-			count: 25
-			path: tests/Functional/Components/Api/OrderTest.php
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setUpdated\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\OrderTest\\:\\:\\$order type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setVersion\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/OrderTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Cannot access offset 'id' on array\\|Shopware\\\\Models\\\\Property\\\\Group\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setWidgets\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/PropertyGroupTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\PropertyGroupTest\\:\\:testCreateShouldBeSuccessful\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:setWidgets\\(\\) has parameter \\$widgets with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/PropertyGroupTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\PropertyGroupTest\\:\\:testCreateShouldThrowCustomValidationException\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:\\$configForms with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/PropertyGroupTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\PropertyGroupTest\\:\\:testDeleteShouldBeSuccessful\\(\\) has parameter \\$id with no type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:\\$emotionComponents with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/PropertyGroupTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\PropertyGroupTest\\:\\:testGetListShouldBeAbleToReturnObjects\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:\\$licenses with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/PropertyGroupTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\PropertyGroupTest\\:\\:testGetListShouldBeSuccessful\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:\\$menuItems with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/PropertyGroupTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\PropertyGroupTest\\:\\:testGetOneShouldBeAbleToReturnObject\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:\\$payments with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/PropertyGroupTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\PropertyGroupTest\\:\\:testGetOneShouldBeAbleToReturnObject\\(\\) has parameter \\$id with no type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:\\$templates with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/PropertyGroupTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\PropertyGroupTest\\:\\:testGetOneShouldBeSuccessful\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:\\$updateSource \\(string\\) does not accept string\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/PropertyGroupTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\PropertyGroupTest\\:\\:testGetOneShouldBeSuccessful\\(\\) has parameter \\$id with no type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:\\$updateVersion \\(string\\) does not accept string\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/PropertyGroupTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\PropertyGroupTest\\:\\:testUpdateShouldBeSuccessful\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Plugin\\\\Plugin\\:\\:\\$widgets with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/PropertyGroupTest.php
+			path: engine/Shopware/Models/Plugin/Plugin.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\PropertyGroupTest\\:\\:testUpdateShouldBeSuccessful\\(\\) has parameter \\$id with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Premium\\\\Premium\\:\\:setShop\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/PropertyGroupTest.php
+			path: engine/Shopware/Models/Premium/Premium.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\PropertyGroupTest\\:\\:testUpdateWithInvalidIdShouldThrowNotFoundException\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Price\\\\Discount\\:\\:setCustomerGroupId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/PropertyGroupTest.php
+			path: engine/Shopware/Models/Price/Discount.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\PropertyGroupTest\\:\\:testUpdateWithMissingIdShouldThrowParameterMissingException\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Price\\\\Group\\:\\:getDiscounts\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/PropertyGroupTest.php
+			path: engine/Shopware/Models/Price/Group.php
 
 		-
-			message: "#^Parameter \\#1 \\$id of method Shopware\\\\Components\\\\Api\\\\Resource\\\\PropertyGroup\\:\\:delete\\(\\) expects int, string given\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Price\\\\Group\\:\\:\\$discounts with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/PropertyGroupTest.php
+			path: engine/Shopware/Models/Price/Group.php
 
 		-
-			message: "#^Parameter \\#1 \\$id of method Shopware\\\\Components\\\\Api\\\\Resource\\\\PropertyGroup\\:\\:update\\(\\) expects int, string given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\ProductFeed\\\\ProductFeed\\:\\:getArticles\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/PropertyGroupTest.php
+			path: engine/Shopware/Models/ProductFeed/ProductFeed.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\TranslationTest\\:\\:getDummyData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\ProductFeed\\\\ProductFeed\\:\\:getCategories\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/TranslationTest.php
+			path: engine/Shopware/Models/ProductFeed/ProductFeed.php
 
 		-
-			message: "#^Cannot access offset 'configuratorOptions' on array\\|Shopware\\\\Models\\\\Article\\\\Detail\\.$#"
-			count: 2
-			path: tests/Functional/Components/Api/VariantTest.php
+			message: "#^Method Shopware\\\\Models\\\\ProductFeed\\\\ProductFeed\\:\\:getSuppliers\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/ProductFeed/ProductFeed.php
 
 		-
-			message: "#^Cannot access offset 'details' on array\\|Shopware\\\\Models\\\\Article\\\\Article\\.$#"
-			count: 3
-			path: tests/Functional/Components/Api/VariantTest.php
+			message: "#^Method Shopware\\\\Models\\\\ProductFeed\\\\ProductFeed\\:\\:sanitizeFilename\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/ProductFeed/ProductFeed.php
 
 		-
-			message: "#^Cannot access offset 'mainDetail' on array\\|Shopware\\\\Models\\\\Article\\\\Article\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\ProductFeed\\\\ProductFeed\\:\\:setArticles\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/ProductFeed/ProductFeed.php
 
 		-
-			message: "#^Cannot access offset 'prices' on array\\|Shopware\\\\Models\\\\Article\\\\Detail\\.$#"
-			count: 2
-			path: tests/Functional/Components/Api/VariantTest.php
+			message: "#^Method Shopware\\\\Models\\\\ProductFeed\\\\ProductFeed\\:\\:setArticles\\(\\) has parameter \\$articles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/ProductFeed/ProductFeed.php
 
 		-
-			message: "#^Cannot call method getArticle\\(\\) on array\\|Shopware\\\\Models\\\\Article\\\\Detail\\.$#"
-			count: 2
-			path: tests/Functional/Components/Api/VariantTest.php
+			message: "#^Method Shopware\\\\Models\\\\ProductFeed\\\\ProductFeed\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Models/ProductFeed/ProductFeed.php
 
 		-
-			message: "#^Cannot call method getAttr1\\(\\) on Shopware\\\\Models\\\\Attribute\\\\Article\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\ProductFeed\\\\ProductFeed\\:\\:setCategories\\(\\) has parameter \\$categories with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/ProductFeed/ProductFeed.php
 
 		-
-			message: "#^Cannot call method getAttr2\\(\\) on Shopware\\\\Models\\\\Attribute\\\\Article\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\ProductFeed\\\\ProductFeed\\:\\:setDirty\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/ProductFeed/ProductFeed.php
 
 		-
-			message: "#^Cannot call method getAttribute\\(\\) on Shopware\\\\Models\\\\Article\\\\Detail\\|null\\.$#"
-			count: 2
-			path: tests/Functional/Components/Api/VariantTest.php
+			message: "#^Method Shopware\\\\Models\\\\ProductFeed\\\\ProductFeed\\:\\:setSuppliers\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/ProductFeed/ProductFeed.php
 
 		-
-			message: "#^Cannot call method getEsd\\(\\) on Shopware\\\\Models\\\\Article\\\\Detail\\|null\\.$#"
-			count: 10
-			path: tests/Functional/Components/Api/VariantTest.php
+			message: "#^Method Shopware\\\\Models\\\\ProductFeed\\\\ProductFeed\\:\\:setSuppliers\\(\\) has parameter \\$suppliers with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/ProductFeed/ProductFeed.php
 
 		-
-			message: "#^Cannot call method getGroups\\(\\) on Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\|null\\.$#"
+			message: "#^Parameter \\#1 \\$datetime of class DateTime constructor expects string, string\\|null given\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/ProductFeed/ProductFeed.php
 
 		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Article\\\\Unit\\|null\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\ProductFeed\\\\ProductFeed\\:\\:\\$articles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/ProductFeed/ProductFeed.php
 
 		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Tax\\\\Tax\\|null\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\ProductFeed\\\\ProductFeed\\:\\:\\$categories with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/ProductFeed/ProductFeed.php
 
 		-
-			message: "#^Cannot call method getId\\(\\) on array\\|Shopware\\\\Models\\\\Article\\\\Detail\\.$#"
-			count: 2
-			path: tests/Functional/Components/Api/VariantTest.php
+			message: "#^Property Shopware\\\\Models\\\\ProductFeed\\\\ProductFeed\\:\\:\\$suppliers with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/ProductFeed/ProductFeed.php
 
 		-
-			message: "#^Cannot call method getImages\\(\\) on array\\|Shopware\\\\Models\\\\Article\\\\Article\\.$#"
-			count: 2
-			path: tests/Functional/Components/Api/VariantTest.php
+			message: "#^Method Shopware\\\\Models\\\\ProductStream\\\\ProductStream\\:\\:getName\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/ProductStream/ProductStream.php
 
 		-
-			message: "#^Cannot call method getImages\\(\\) on array\\|Shopware\\\\Models\\\\Article\\\\Detail\\.$#"
-			count: 2
-			path: tests/Functional/Components/Api/VariantTest.php
+			message: "#^Method Shopware\\\\Models\\\\ProductStream\\\\ProductStream\\:\\:getSorting\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/ProductStream/ProductStream.php
 
 		-
-			message: "#^Cannot call method getNumber\\(\\) on Shopware\\\\Models\\\\Article\\\\Detail\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\ProductStream\\\\ProductStream\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/ProductStream/ProductStream.php
 
 		-
-			message: "#^Cannot call method getPrices\\(\\) on Shopware\\\\Models\\\\Article\\\\Detail\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\ProductStream\\\\ProductStream\\:\\:setConditions\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/ProductStream/ProductStream.php
 
 		-
-			message: "#^Cannot call method getThumbnails\\(\\) on Shopware\\\\Models\\\\Media\\\\Media\\|null\\.$#"
-			count: 2
-			path: tests/Functional/Components/Api/VariantTest.php
+			message: "#^Method Shopware\\\\Models\\\\ProductStream\\\\ProductStream\\:\\:setDescription\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/ProductStream/ProductStream.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\VariantTest\\:\\:getRandomId\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\ProductStream\\\\ProductStream\\:\\:setName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/ProductStream/ProductStream.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\VariantTest\\:\\:getRandomId\\(\\) has parameter \\$table with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\ProductStream\\\\ProductStream\\:\\:setSorting\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/ProductStream/ProductStream.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\VariantTest\\:\\:getSimpleArticleData\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\ProductStream\\\\ProductStream\\:\\:setSortingId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/ProductStream/ProductStream.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\VariantTest\\:\\:getSimpleConfiguratorSet\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\ProductStream\\\\ProductStream\\:\\:setType\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/ProductStream/ProductStream.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\VariantTest\\:\\:getSimpleConfiguratorSet\\(\\) has parameter \\$groupLimit with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Property\\\\Group\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/Property/Group.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\VariantTest\\:\\:getSimpleConfiguratorSet\\(\\) has parameter \\$optionLimit with no type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Property\\\\Group\\:\\:\\$articles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/Property/Group.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\VariantTest\\:\\:getSimpleMedia\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Property\\\\Group\\:\\:\\$options with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/Property/Group.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\VariantTest\\:\\:getSimpleMedia\\(\\) has parameter \\$limit with no type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Property\\\\Group\\:\\:\\$relations with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/Property/Group.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\VariantTest\\:\\:getSimpleMedia\\(\\) has parameter \\$offset with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Property\\\\Option\\:\\:getGroups\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/Property/Option.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\VariantTest\\:\\:getSimpleVariantData\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Property\\\\Option\\:\\:getRelations\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/Property/Option.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\VariantTest\\:\\:getVariantOptionsOfSet\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Property\\\\Option\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/Property/Option.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\VariantTest\\:\\:getVariantOptionsOfSet\\(\\) has parameter \\$configuratorSet with no type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Property\\\\Option\\:\\:\\$groups with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/Property/Option.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\VariantTest\\:\\:testBatchModeShouldBeSuccessful\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Property\\\\Option\\:\\:\\$relations with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/Property/Option.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\VariantTest\\:\\:testCreateConfiguratorOptionsWithPosition\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Property\\\\Relation\\:\\:setGroup\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/Property/Relation.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\VariantTest\\:\\:testCreateEsdReuseVariant\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Property\\\\Relation\\:\\:setOption\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/Property/Relation.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\VariantTest\\:\\:testCreateEsdVariant\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Property\\\\Relation\\:\\:setPosition\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/Property/Relation.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\VariantTest\\:\\:testCreateEsdWithSerialsVariant\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Property\\\\Repository\\:\\:getListGroupsQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/Property/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\VariantTest\\:\\:testCreateShouldBeSuccessful\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Property\\\\Repository\\:\\:getListGroupsQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/Property/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\VariantTest\\:\\:testCreateWithExistingOrderNumberShouldThrowCustomValidationException\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Property\\\\Repository\\:\\:getListGroupsQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/Property/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\VariantTest\\:\\:testGetListShouldBeSuccessful\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Property\\\\Repository\\:\\:getOptionsQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/Property/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\VariantTest\\:\\:testNewConfiguratorOptionForVariant\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Property\\\\Repository\\:\\:getOptionsQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/Property/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\VariantTest\\:\\:testVariantAddImage\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Property\\\\Repository\\:\\:getPropertyRelationQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/Property/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\VariantTest\\:\\:testVariantCreate\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Property\\\\Repository\\:\\:getPropertyRelationQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/Property/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\VariantTest\\:\\:testVariantDefaultPriceBehavior\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Property\\\\Repository\\:\\:getSetsQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/Property/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\VariantTest\\:\\:testVariantGrossPrices\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Property\\\\Repository\\:\\:getSetsQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/Property/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\VariantTest\\:\\:testVariantImageAssignByMediaId\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#2 \\$order of method Shopware\\\\Models\\\\Property\\\\Repository\\:\\:getListGroupsQueryBuilder\\(\\) expects Doctrine\\\\ORM\\\\Query\\\\Expr\\\\OrderBy\\|string\\|null, array\\|Doctrine\\\\ORM\\\\Query\\\\Expr\\\\OrderBy\\|string\\|null given\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/Property/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\VariantTest\\:\\:testVariantUpdate\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Property\\\\Value\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/Property/Value.php
 
 		-
-			message: "#^Parameter \\#1 \\$id of method Shopware\\\\Components\\\\Api\\\\Resource\\\\Variant\\:\\:delete\\(\\) expects int, string given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Property\\\\Value\\:\\:setMedia\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/Property/Value.php
 
 		-
-			message: "#^Parameter \\#1 \\$number of method Shopware\\\\Components\\\\Api\\\\Resource\\\\Variant\\:\\:deleteByNumber\\(\\) expects string, string\\|null given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Property\\\\Value\\:\\:setOption\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/Property/Value.php
 
 		-
-			message: "#^Parameter \\#1 \\$number of method Shopware\\\\Components\\\\Api\\\\Resource\\\\Variant\\:\\:getOneByNumber\\(\\) expects string, string\\|null given\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Property\\\\Value\\:\\:\\$articles with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Api/VariantTest.php
+			path: engine/Shopware/Models/Property/Value.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\AuthTest\\:\\:createAdminUser\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Search\\\\CustomFacet\\:\\:setActive\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/AuthTest.php
+			path: engine/Shopware/Models/Search/CustomFacet.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\AuthTest\\:\\:createAdminUser\\(\\) has parameter \\$password with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Search\\\\CustomFacet\\:\\:setDeletable\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/AuthTest.php
+			path: engine/Shopware/Models/Search/CustomFacet.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\AuthTest\\:\\:createAdminUser\\(\\) has parameter \\$username with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Search\\\\CustomFacet\\:\\:setDisplayInCategories\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/AuthTest.php
+			path: engine/Shopware/Models/Search/CustomFacet.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\AuthTest\\:\\:testAuthenticateWithPassedAdapter\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Search\\\\CustomFacet\\:\\:setFacet\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/AuthTest.php
+			path: engine/Shopware/Models/Search/CustomFacet.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\AuthTest\\:\\:testAuthenticateWithSetAdapter\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Search\\\\CustomFacet\\:\\:setName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/AuthTest.php
+			path: engine/Shopware/Models/Search/CustomFacet.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Captcha\\\\CaptchaRepositoryTest\\:\\:testThrowCaptchaNotFoundException\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Search\\\\CustomFacet\\:\\:setPosition\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Captcha/CaptchaRepositoryTest.php
+			path: engine/Shopware/Models/Search/CustomFacet.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\BasketQueryHelperTest\\:\\:testGetInsertDiscountAttributeQuery\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Search\\\\CustomFacet\\:\\:setUniqueKey\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Cart/BasketQueryHelperTest.php
+			path: engine/Shopware/Models/Search/CustomFacet.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\BasketQueryHelperTest\\:\\:testGetInsertDiscountQuery\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Search\\\\CustomSorting\\:\\:setActive\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Cart/BasketQueryHelperTest.php
+			path: engine/Shopware/Models/Search/CustomSorting.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\BasketQueryHelperTest\\:\\:testGetLastInsertId\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Search\\\\CustomSorting\\:\\:setDisplayInCategories\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Cart/BasketQueryHelperTest.php
+			path: engine/Shopware/Models/Search/CustomSorting.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\BasketQueryHelperTest\\:\\:testGetPositionPricesQuery\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Search\\\\CustomSorting\\:\\:setLabel\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Cart/BasketQueryHelperTest.php
+			path: engine/Shopware/Models/Search/CustomSorting.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\BasketQueryHelperTest\\:\\:\\$queryHelper \\(Shopware\\\\Components\\\\Cart\\\\BasketQueryHelper\\) does not accept null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Search\\\\CustomSorting\\:\\:setPosition\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Cart/BasketQueryHelperTest.php
+			path: engine/Shopware/Models/Search/CustomSorting.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\CalculationOnLogoutTest\\:\\:\\$clearBasketOnReset has no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Search\\\\CustomSorting\\:\\:setSortings\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Cart/CalculationOnLogoutTest.php
+			path: engine/Shopware/Models/Search/CustomSorting.php
 
 		-
-			message: "#^Access to an undefined property sSystem\\:\\:\\$_POST\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Currency\\:\\:toArray\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Cart/CartMigrationTest.php
+			path: engine/Shopware/Models/Shop/Currency.php
 
 		-
-			message: "#^Cannot access offset 'id' on array\\<string, mixed\\>\\|false\\.$#"
-			count: 2
-			path: tests/Functional/Components/Cart/CartPersistServiceTest.php
+			message: "#^Property Shopware\\\\Models\\\\Shop\\\\Currency\\:\\:\\$default \\(int\\) does not accept default value of type false\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Shop/Currency.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\CartRaceConditionTest\\:\\:testPriceChangesInConfirmWithPriceModifications\\(\\) has no return type specified\\.$#"
+			message: "#^Argument of an invalid type Shopware\\\\Models\\\\Shop\\\\Shop supplied for foreach, only iterables are supported\\.$#"
 			count: 1
-			path: tests/Functional/Components/Cart/CartRaceConditionTest.php
+			path: engine/Shopware/Models/Shop/DetachedShop.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\CartRaceConditionTest\\:\\:testPriceChangesInConfirmWithoutPriceModifications\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:fetchAndFixShop\\(\\) has parameter \\$shop with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Cart/CartRaceConditionTest.php
+			path: engine/Shopware/Models/Shop/Repository.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\CartRaceConditionTest\\:\\:\\$clearBasketOnReset has no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:findShopForRequest\\(\\) has parameter \\$shops with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Cart/CartRaceConditionTest.php
+			path: engine/Shopware/Models/Shop/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\PaymentTokenServiceTest\\:\\:paymentTokenProviders\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:findShopForRequest\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Cart/PaymentTokenServiceTest.php
+			path: engine/Shopware/Models/Shop/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\ProportionalCartCalculationCustomerGroupTest\\:\\:testCustomerGroupDiscountNormal\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getActiveDefault\\(\\) should return Shopware\\\\Models\\\\Shop\\\\DetachedShop but returns Shopware\\\\Models\\\\Shop\\\\DetachedShop\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Components/Cart/ProportionalCartCalculationCustomerGroupTest.php
+			path: engine/Shopware/Models/Shop/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\ProportionalCartCalculationCustomerGroupTest\\:\\:testCustomerGroupDiscountNormalMultipleTaxes\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getActiveShopByRequestAsArray\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Cart/ProportionalCartCalculationCustomerGroupTest.php
+			path: engine/Shopware/Models/Shop/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\ProportionalCartCalculationCustomerGroupTest\\:\\:testCustomerGroupWithMinimumOrderNormal\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getActiveShopByRequestAsArray\\(\\) should return array\\|null but returns array\\|false\\.$#"
 			count: 1
-			path: tests/Functional/Components/Cart/ProportionalCartCalculationCustomerGroupTest.php
+			path: engine/Shopware/Models/Shop/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\ProportionalCartCalculationCustomerGroupTest\\:\\:testCustomerGroupWithMinimumOrderTaxes\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getActiveShops\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Cart/ProportionalCartCalculationCustomerGroupTest.php
+			path: engine/Shopware/Models/Shop/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\ProportionalCartCalculationDispatchTest\\:\\:testBasketDiscountIntroducedByDispatch\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getActiveShopsFixed\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Cart/ProportionalCartCalculationDispatchTest.php
+			path: engine/Shopware/Models/Shop/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\ProportionalCartCalculationDispatchTest\\:\\:testBasketDiscountIntroducedByDispatchMultipleTaxes\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getBaseListQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Cart/ProportionalCartCalculationDispatchTest.php
+			path: engine/Shopware/Models/Shop/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\ProportionalCartCalculationDispatchTest\\:\\:testSurchargeInDispatch\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getBaseListQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Cart/ProportionalCartCalculationDispatchTest.php
+			path: engine/Shopware/Models/Shop/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\ProportionalCartCalculationDispatchTest\\:\\:testSurchargeInDispatchMultipleTaxes\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getBaseListQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Cart/ProportionalCartCalculationDispatchTest.php
+			path: engine/Shopware/Models/Shop/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\ProportionalCartCalculationSurchargeTest\\:\\:testMultipleTaxesWithPaymentSurchargeAbsolute\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getBaseListQueryBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Cart/ProportionalCartCalculationSurchargeTest.php
+			path: engine/Shopware/Models/Shop/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\ProportionalCartCalculationSurchargeTest\\:\\:testMultipleTaxesWithPaymentSurchargeAbsoluteNegative\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getListQuery\\(\\) has parameter \\$filterBy with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Cart/ProportionalCartCalculationSurchargeTest.php
+			path: engine/Shopware/Models/Shop/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\ProportionalCartCalculationSurchargeTest\\:\\:testMultipleTaxesWithPaymentSurchargePercent\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getListQuery\\(\\) has parameter \\$limit with no type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Cart/ProportionalCartCalculationSurchargeTest.php
+			path: engine/Shopware/Models/Shop/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\ProportionalCartCalculationSurchargeTest\\:\\:testMultipleTaxesWithPaymentSurchargePercentCountry\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getListQuery\\(\\) has parameter \\$offset with no type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Cart/ProportionalCartCalculationSurchargeTest.php
+			path: engine/Shopware/Models/Shop/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\ProportionalCartCalculationSurchargeTest\\:\\:testMultipleTaxesWithPaymentSurchargePercentCountryNegative\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getListQuery\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Cart/ProportionalCartCalculationSurchargeTest.php
+			path: engine/Shopware/Models/Shop/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\ProportionalCartCalculationSurchargeTest\\:\\:testMultipleTaxesWithPaymentSurchargePercentNegative\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getListQueryBuilder\\(\\) has parameter \\$filterBy with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Cart/ProportionalCartCalculationSurchargeTest.php
+			path: engine/Shopware/Models/Shop/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\ProportionalCartCalculationSurchargeTest\\:\\:testMultipleTaxesWithoutDiscounts\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getListQueryBuilder\\(\\) has parameter \\$limit with no type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Cart/ProportionalCartCalculationSurchargeTest.php
+			path: engine/Shopware/Models/Shop/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\ProportionalCartCalculationVoucherTest\\:\\:testAbsoluteVoucher\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getListQueryBuilder\\(\\) has parameter \\$offset with no type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Cart/ProportionalCartCalculationVoucherTest.php
+			path: engine/Shopware/Models/Shop/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\ProportionalCartCalculationVoucherTest\\:\\:testAbsoluteVoucherMultipleTaxes\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getListQueryBuilder\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Cart/ProportionalCartCalculationVoucherTest.php
+			path: engine/Shopware/Models/Shop/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\ProportionalCartCalculationVoucherTest\\:\\:testAbsoluteVoucherMultipleTaxesWithMaxTax\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getLocalesListQuery\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Cart/ProportionalCartCalculationVoucherTest.php
+			path: engine/Shopware/Models/Shop/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\ProportionalCartCalculationVoucherTest\\:\\:testPercentVoucher\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getLocalesListQuery\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Cart/ProportionalCartCalculationVoucherTest.php
+			path: engine/Shopware/Models/Shop/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\ProportionalCartCalculationVoucherTest\\:\\:testPercentVoucherProportionalWithMultipleTaxes\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getLocalesListQueryBuilder\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Cart/ProportionalCartCalculationVoucherTest.php
+			path: engine/Shopware/Models/Shop/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\ProportionalCartCalculationVoucherTest\\:\\:testPercentVoucherProportionalWithOneTax\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getLocalesListQueryBuilder\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Cart/ProportionalCartCalculationVoucherTest.php
+			path: engine/Shopware/Models/Shop/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\ProportionalCartCalculationVoucherTest\\:\\:testProportionalBasketView\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getShopArrayByHostAlias\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Cart/ProportionalCartCalculationVoucherTest.php
+			path: engine/Shopware/Models/Shop/Repository.php
 
 		-
-			message: "#^Access to an undefined property sSystem\\:\\:\\$_POST\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getShopsArrayByHost\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/CheckoutTest.php
+			path: engine/Shopware/Models/Shop/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\CheckoutTest\\:\\:addCustomerGroupDiscount\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getShopsWithThemes\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/CheckoutTest.php
+			path: engine/Shopware/Models/Shop/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\CheckoutTest\\:\\:addProduct\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Repository\\:\\:getShopsWithThemes\\(\\) has parameter \\$order with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/CheckoutTest.php
+			path: engine/Shopware/Models/Shop/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\CheckoutTest\\:\\:addProduct\\(\\) has parameter \\$productNumber with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:get\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/CheckoutTest.php
+			path: engine/Shopware/Models/Shop/Shop.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\CheckoutTest\\:\\:addProduct\\(\\) has parameter \\$quantity with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:getChildren\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/CheckoutTest.php
+			path: engine/Shopware/Models/Shop/Shop.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\CheckoutTest\\:\\:clearCustomerGroupDiscount\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:getCurrencies\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/CheckoutTest.php
+			path: engine/Shopware/Models/Shop/Shop.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\CheckoutTest\\:\\:hasBasketItem\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:getPages\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/CheckoutTest.php
+			path: engine/Shopware/Models/Shop/Shop.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\CheckoutTest\\:\\:hasBasketItem\\(\\) has parameter \\$sBasket with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setActive\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/CheckoutTest.php
+			path: engine/Shopware/Models/Shop/Shop.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\CheckoutTest\\:\\:loginFrontendUser\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/CheckoutTest.php
+			path: engine/Shopware/Models/Shop/Shop.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\CheckoutTest\\:\\:setCustomerGroupSurcharge\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setBasePath\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/CheckoutTest.php
+			path: engine/Shopware/Models/Shop/Shop.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\CheckoutTest\\:\\:setPaymentSurcharge\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setBaseUrl\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/CheckoutTest.php
+			path: engine/Shopware/Models/Shop/Shop.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\CheckoutTest\\:\\:setVoucherTax\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setCategory\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/CheckoutTest.php
+			path: engine/Shopware/Models/Shop/Shop.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\CheckoutTest\\:\\:updateProductPrice\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setChildren\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/CheckoutTest.php
+			path: engine/Shopware/Models/Shop/Shop.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\CheckoutTest\\:\\:updateProductPrice\\(\\) has parameter \\$orderNumber with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setChildren\\(\\) has parameter \\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/CheckoutTest.php
+			path: engine/Shopware/Models/Shop/Shop.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\CheckoutTest\\:\\:updateProductPrice\\(\\) has parameter \\$price with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setCurrencies\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/CheckoutTest.php
+			path: engine/Shopware/Models/Shop/Shop.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\CheckoutTest\\:\\:updateProductPrice\\(\\) has parameter \\$taxRate with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setCurrencies\\(\\) has parameter \\$currencies with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/CheckoutTest.php
+			path: engine/Shopware/Models/Shop/Shop.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\CheckoutTest\\:\\:visitCart\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setCurrency\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/CheckoutTest.php
+			path: engine/Shopware/Models/Shop/Shop.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\CheckoutTest\\:\\:visitConfirm\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setCustomerGroup\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/CheckoutTest.php
+			path: engine/Shopware/Models/Shop/Shop.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\CheckoutTest\\:\\:visitFinish\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setCustomerScope\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/CheckoutTest.php
+			path: engine/Shopware/Models/Shop/Shop.php
 
 		-
-			message: "#^Parameter \\#1 \\$shop of method Shopware\\\\Components\\\\ShopRegistrationService\\:\\:registerShop\\(\\) expects Shopware\\\\Models\\\\Shop\\\\Shop, Shopware\\\\Models\\\\Shop\\\\DetachedShop\\|null given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setDefault\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/CheckoutTest.php
+			path: engine/Shopware/Models/Shop/Shop.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Components\\\\CheckoutTest\\:\\:\\$clearBasketOnReset has no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setDocumentTemplate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/CheckoutTest.php
+			path: engine/Shopware/Models/Shop/Shop.php
 
 		-
-			message: "#^Method ShopwareConfigTest\\:\\:initForm\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setFallback\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Config/ShopwareConfigTest.php
+			path: engine/Shopware/Models/Shop/Shop.php
 
 		-
-			message: "#^Method ShopwareConfigTest\\:\\:testCoreConfigIgnored\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setHost\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Config/ShopwareConfigTest.php
+			path: engine/Shopware/Models/Shop/Shop.php
 
 		-
-			message: "#^Method ShopwareConfigTest\\:\\:testCoreConfigNoCollision\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setHosts\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Config/ShopwareConfigTest.php
+			path: engine/Shopware/Models/Shop/Shop.php
 
 		-
-			message: "#^Method ShopwareConfigTest\\:\\:testCoreConfigPrefixed\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setLocale\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Config/ShopwareConfigTest.php
+			path: engine/Shopware/Models/Shop/Shop.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\DependencyInjection\\\\Compiler\\\\ConfigureContainerAwareCommandsTest\\:\\:getShopwareCommands\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setMain\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/DependencyInjection/Compiler/ConfigureContainerAwareCommandsTest.php
+			path: engine/Shopware/Models/Shop/Shop.php
 
 		-
-			message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertInstanceOf\\(\\) with 'Shopware\\\\\\\\Tests\\\\\\\\Functional\\\\\\\\Components\\\\\\\\DependencyInjection\\\\\\\\OriginalService' and Shopware\\\\Components\\\\Cart\\\\NetRounding\\\\RoundLineAfterQuantity will always evaluate to false\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/DependencyInjection/ContainerTest.php
+			path: engine/Shopware/Models/Shop/Shop.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\DependencyInjection\\\\ContainerTest\\:\\:attachEvent\\(\\) has parameter \\$callback with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setPages\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/DependencyInjection/ContainerTest.php
+			path: engine/Shopware/Models/Shop/Shop.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\DependencyInjection\\\\ContainerTest\\:\\:listenerCallbackReturningOtherClass\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setPages\\(\\) has parameter \\$pages with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/DependencyInjection/ContainerTest.php
+			path: engine/Shopware/Models/Shop/Shop.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\DependencyInjection\\\\ContainerTest\\:\\:testChangingServiceInAnEvent\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setPosition\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/DependencyInjection/ContainerTest.php
+			path: engine/Shopware/Models/Shop/Shop.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\DependencyInjection\\\\ContainerTest\\:\\:testDecorationOfAliasWorks\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setSecure\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/DependencyInjection/ContainerTest.php
+			path: engine/Shopware/Models/Shop/Shop.php
 
 		-
-			message: "#^Service \"Shopware\\\\Tests\\\\Functional\\\\Components\\\\DependencyInjection\\\\DecoratingService\" is not registered in the container\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setTemplate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/DependencyInjection/ContainerTest.php
+			path: engine/Shopware/Models/Shop/Shop.php
 
 		-
-			message: "#^Service \"Shopware\\\\Tests\\\\Functional\\\\Components\\\\DependencyInjection\\\\OriginalService\" is not registered in the container\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:setTitle\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/DependencyInjection/ContainerTest.php
+			path: engine/Shopware/Models/Shop/Shop.php
 
 		-
-			message: "#^Service \"decoratingservice\" is not registered in the container\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:\\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/DependencyInjection/ContainerTest.php
+			path: engine/Shopware/Models/Shop/Shop.php
 
 		-
-			message: "#^Service \"originalservice\" is not registered in the container\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:\\$currencies with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/DependencyInjection/ContainerTest.php
+			path: engine/Shopware/Models/Shop/Shop.php
 
 		-
-			message: "#^Cannot call method toArray\\(\\) on array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Shop\\\\Shop\\:\\:\\$pages with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/LegacyRequestWrapper/GetWrapperTest.php
+			path: engine/Shopware/Models/Shop/Shop.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\LegacyRequestWrapper\\\\GetWrapperTest\\:\\:testOverwriteAndClearQuery\\(\\) has parameter \\$getData with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Template\\:\\:getConfigSets\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/LegacyRequestWrapper/GetWrapperTest.php
+			path: engine/Shopware/Models/Shop/Template.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\LegacyRequestWrapper\\\\GetWrapperTest\\:\\:testSetQuery\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Template\\:\\:getElements\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/LegacyRequestWrapper/GetWrapperTest.php
+			path: engine/Shopware/Models/Shop/Template.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Components\\\\LegacyRequestWrapper\\\\GetWrapperTest\\:\\:\\$resources type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Template\\:\\:getLayouts\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/LegacyRequestWrapper/GetWrapperTest.php
+			path: engine/Shopware/Models/Shop/Template.php
 
 		-
-			message: "#^Cannot call method toArray\\(\\) on array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Template\\:\\:getShops\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/LegacyRequestWrapper/PostWrapperTest.php
+			path: engine/Shopware/Models/Shop/Template.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\LegacyRequestWrapper\\\\PostWrapperTest\\:\\:testOverwriteAndClearPost\\(\\) has parameter \\$getData with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Template\\:\\:setAuthor\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/LegacyRequestWrapper/PostWrapperTest.php
+			path: engine/Shopware/Models/Shop/Template.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\LegacyRequestWrapper\\\\PostWrapperTest\\:\\:testSetPost\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Template\\:\\:setConfigSets\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/LegacyRequestWrapper/PostWrapperTest.php
+			path: engine/Shopware/Models/Shop/Template.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Components\\\\LegacyRequestWrapper\\\\PostWrapperTest\\:\\:\\$resources type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Template\\:\\:setConfigSets\\(\\) has parameter \\$configSets with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/LegacyRequestWrapper/PostWrapperTest.php
+			path: engine/Shopware/Models/Shop/Template.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Migrations\\\\Migrations_Migration1607Test\\:\\:commentArticleConfigProvider\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Template\\:\\:setElements\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Migrations/Migrations_Migration1607Test.php
+			path: engine/Shopware/Models/Shop/Template.php
 
 		-
-			message: "#^Call to an undefined method Doctrine\\\\ORM\\\\Configuration\\:\\:getAttributeDir\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Template\\:\\:setLayouts\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Model/GeneratorTest.php
+			path: engine/Shopware/Models/Shop/Template.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Model\\\\GeneratorTest\\:\\:addAndEvaluateInitialization\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Template\\:\\:setParent\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Model/GeneratorTest.php
+			path: engine/Shopware/Models/Shop/Template.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Model\\\\GeneratorTest\\:\\:testDefaultInitializationBooleanFalse\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Template\\:\\:setPlugin\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Model/GeneratorTest.php
+			path: engine/Shopware/Models/Shop/Template.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Model\\\\GeneratorTest\\:\\:testDefaultInitializationBooleanTrue\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Template\\:\\:setShops\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Model/GeneratorTest.php
+			path: engine/Shopware/Models/Shop/Template.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Model\\\\GeneratorTest\\:\\:testDefaultInitializationDate\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Template\\:\\:setShops\\(\\) has parameter \\$shops with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Model/GeneratorTest.php
+			path: engine/Shopware/Models/Shop/Template.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Model\\\\GeneratorTest\\:\\:testDefaultInitializationDateTime\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\Template\\:\\:setVersion\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Model/GeneratorTest.php
+			path: engine/Shopware/Models/Shop/Template.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Model\\\\GeneratorTest\\:\\:testDefaultInitializationEmptyString\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Shop\\\\Template\\:\\:\\$configSets with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Model/GeneratorTest.php
+			path: engine/Shopware/Models/Shop/Template.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Model\\\\GeneratorTest\\:\\:testDefaultInitializationFloat\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Shop\\\\Template\\:\\:\\$elements with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Model/GeneratorTest.php
+			path: engine/Shopware/Models/Shop/Template.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Model\\\\GeneratorTest\\:\\:testDefaultInitializationInteger\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Shop\\\\Template\\:\\:\\$layouts with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Model/GeneratorTest.php
+			path: engine/Shopware/Models/Shop/Template.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Model\\\\GeneratorTest\\:\\:testDefaultInitializationTwoProperties\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Shop\\\\Template\\:\\:\\$shops with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Model/GeneratorTest.php
+			path: engine/Shopware/Models/Shop/Template.php
 
 		-
-			message: "#^Negated boolean expression is always true\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:getDefaultValue\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Model/GeneratorTest.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
 
 		-
-			message: "#^Parameter \\#4 \\$default of method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Model\\\\GeneratorTest\\:\\:addAndEvaluateInitialization\\(\\) expects float\\|int\\|null, string given\\.$#"
-			count: 2
-			path: tests/Functional/Components/Model/GeneratorTest.php
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:getSelection\\(\\) return type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\NumberRangeIncrementerTest\\:\\:testIncrement\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:getValues\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/NumberRangeIncrementerTest.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\NumberRangeIncrementerTest\\:\\:testIncrementWithInvalidName\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:setAllowBlank\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/NumberRangeIncrementerTest.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\NumberRangeIncrementerTest\\:\\:testItShouldImplementInterface\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:setAttributes\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/NumberRangeIncrementerTest.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\OptinServiceTest\\:\\:testAssertAdd\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:setContainer\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/OptinServiceTest.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\OptinServiceTest\\:\\:testAssertGet\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:setDefaultValue\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/OptinServiceTest.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\OptinServiceTest\\:\\:testDelete\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:setDefaultValue\\(\\) has parameter \\$defaultValue with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/OptinServiceTest.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\OptinServiceTest\\:\\:testRetriveData\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:setFieldLabel\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/OptinServiceTest.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\OptinServiceTest\\:\\:testRetriveLeftData\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:setLessCompatible\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/OptinServiceTest.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
 
 		-
-			message: "#^Parameter \\#1 \\$type of method Shopware\\\\Components\\\\OptinServiceInterface\\:\\:add\\(\\) expects string, stdClass given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:setName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/OptinServiceTest.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
 
 		-
-			message: "#^Parameter \\#1 \\$type of method Shopware\\\\Components\\\\OptinServiceInterface\\:\\:get\\(\\) expects string, stdClass given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:setPosition\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/OptinServiceTest.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
 
 		-
-			message: "#^Cannot call method count\\(\\) on array\\<Shopware\\\\Models\\\\Config\\\\Element\\>\\|\\(Doctrine\\\\Common\\\\Collections\\\\ArrayCollection&iterable\\<Shopware\\\\Models\\\\Config\\\\Element\\>\\)\\.$#"
-			count: 2
-			path: tests/Functional/Components/Plugin/FormSynchronizerTest.php
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:setSelection\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
 
 		-
-			message: "#^Cannot call method getPosition\\(\\) on Shopware\\\\Models\\\\Config\\\\Element\\|null\\.$#"
-			count: 2
-			path: tests/Functional/Components/Plugin/FormSynchronizerTest.php
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:setSelection\\(\\) has parameter \\$selection with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Plugin\\\\FormSynchronizerTest\\:\\:testAddFormItems\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:setSupportText\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Plugin/FormSynchronizerTest.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Plugin\\\\FormSynchronizerTest\\:\\:testNewFormFieldSorted\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:setTemplate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Plugin/FormSynchronizerTest.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
 
 		-
-			message: "#^Parameter \\#1 \\$em of class Shopware\\\\Components\\\\Plugin\\\\FormSynchronizer constructor expects Shopware\\\\Components\\\\Model\\\\ModelManager, PHPUnit\\\\Framework\\\\MockObject\\\\MockObject given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:setType\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Plugin/FormSynchronizerTest.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Plugin\\\\MenuSynchronizerTest\\:\\:executeTestAndCheckResult\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:toArray\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Plugin/MenuSynchronizerTest.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Plugin\\\\MenuSynchronizerTest\\:\\:executeTestAndCheckResult\\(\\) has parameter \\$expectedQueryParameters with no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:\\$defaultValue type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Plugin/MenuSynchronizerTest.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Plugin\\\\MenuSynchronizerTest\\:\\:executeTestAndCheckResult\\(\\) has parameter \\$menu with no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:\\$selection type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Plugin/MenuSynchronizerTest.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Plugin\\\\MenuSynchronizerTest\\:\\:testIndexLowerCaseIsPartOfSnippet\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Element\\:\\:\\$values with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Plugin/MenuSynchronizerTest.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Element.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Plugin\\\\MenuSynchronizerTest\\:\\:testIndexNotPartOfSnippet\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Layout\\:\\:getChildren\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Plugin/MenuSynchronizerTest.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Layout.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Plugin\\\\MenuSynchronizerTest\\:\\:testOtherActionIsPartOfSnippet\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Layout\\:\\:getElements\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Plugin/MenuSynchronizerTest.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Layout.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Plugin\\\\PluginMigrationTest\\:\\:assertTableColumnExists\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Layout\\:\\:setAttributes\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Plugin/PluginMigrationTest.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Layout.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Components\\\\Plugin\\\\PluginMigrationTest\\:\\:\\$plugins type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Layout\\:\\:setChildren\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Plugin/PluginMigrationTest.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Layout.php
 
 		-
-			message: "#^Cannot call method activatePlugin\\(\\) on Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\InstallerService\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Layout\\:\\:setChildren\\(\\) has parameter \\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Plugin/TestCase.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Layout.php
 
 		-
-			message: "#^Cannot call method deactivatePlugin\\(\\) on Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\InstallerService\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Layout\\:\\:setElements\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Plugin/TestCase.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Layout.php
 
 		-
-			message: "#^Cannot call method getPluginByName\\(\\) on Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\InstallerService\\|null\\.$#"
-			count: 2
-			path: tests/Functional/Components/Plugin/TestCase.php
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Layout\\:\\:setElements\\(\\) has parameter \\$elements with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/Shop/TemplateConfig/Layout.php
 
 		-
-			message: "#^Cannot call method installPlugin\\(\\) on Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\InstallerService\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Layout\\:\\:setName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Plugin/TestCase.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Layout.php
 
 		-
-			message: "#^Cannot call method saveConfigElement\\(\\) on Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\InstallerService\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Layout\\:\\:setParent\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Plugin/TestCase.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Layout.php
 
 		-
-			message: "#^Cannot call method uninstallPlugin\\(\\) on Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\InstallerService\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Layout\\:\\:setParentId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Plugin/TestCase.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Layout.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Plugin\\\\TestCase\\:\\:ensurePluginAvailable\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Layout\\:\\:setTemplate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Plugin/TestCase.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Layout.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Plugin\\\\TestCase\\:\\:ensurePluginAvailable\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Layout\\:\\:setTitle\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Plugin/TestCase.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Layout.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Plugin\\\\TestCase\\:\\:restorePluginState\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Layout\\:\\:setType\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Plugin/TestCase.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Layout.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Plugin\\\\TestCase\\:\\:restorePluginState\\(\\) has parameter \\$status with no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Layout\\:\\:\\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Plugin/TestCase.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Layout.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Plugin\\\\TestCase\\:\\:restorePluginStates\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Layout\\:\\:\\$elements with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Plugin/TestCase.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Layout.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Components\\\\Plugin\\\\TestCase\\:\\:\\$ensureLoadedPlugins type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Set\\:\\:getValues\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Plugin/TestCase.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Set.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Components\\\\Plugin\\\\TestCase\\:\\:\\$pluginStates type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Set\\:\\:setDescription\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Plugin/TestCase.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Set.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Privacy\\\\ConfigDependentIpAnonymizerTest\\:\\:testConfigActiveWorking\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Set\\:\\:setId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Privacy/ConfigDependentIpAnonymizerTest.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Set.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Privacy\\\\ConfigDependentIpAnonymizerTest\\:\\:testConfigInactiveWorking\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Set\\:\\:setName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Privacy/ConfigDependentIpAnonymizerTest.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Set.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Privacy\\\\ConfigDependentIpAnonymizerTest\\:\\:testDispatchLogIpv6\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Set\\:\\:setTemplate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Privacy/ConfigDependentIpAnonymizerTest.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Set.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Privacy\\\\ConfigDependentIpAnonymizerTest\\:\\:testDispatchLogLocalhostConfigDisabled\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Set\\:\\:setValues\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Privacy/ConfigDependentIpAnonymizerTest.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Set.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Privacy\\\\ConfigDependentIpAnonymizerTest\\:\\:testDispatchLogLocalhostIpv4\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Set\\:\\:setValues\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Privacy/ConfigDependentIpAnonymizerTest.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Set.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Privacy\\\\IpAnonymizerTest\\:\\:testIpAnonymizer\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Set\\:\\:\\$values type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Privacy/IpAnonymizerTest.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Set.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\ReflectionHelperTest\\:\\:testCreationOfInvalidClass\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Value\\:\\:getValue\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/ReflectionHelperTest.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Value.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\ReflectionHelperTest\\:\\:testCriteriaCreation\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Value\\:\\:setElement\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/ReflectionHelperTest.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Value.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\ReflectionHelperTest\\:\\:testOutOfFolderCreation\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Value\\:\\:setShop\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/ReflectionHelperTest.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Value.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Router\\\\RouterTest\\:\\:getTestParamsProvider\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Value\\:\\:setValue\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Router/RouterTest.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Value.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Router\\\\RouterTest\\:\\:testArrayParams\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Value\\:\\:setValue\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Router/RouterTest.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Value.php
 
 		-
-			message: "#^Property Functional\\\\Components\\\\Router\\\\RouterTestObject\\:\\:\\$errorHandler has no type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Shop\\\\TemplateConfig\\\\Value\\:\\:\\$value type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Router/RouterTestObject.php
+			path: engine/Shopware/Models/Shop/TemplateConfig/Value.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\StateTranslatorServiceTest\\:\\:testTranslateStateDifferentLocale\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Site\\\\Group\\:\\:setActive\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/StateTranslatorServiceTest.php
+			path: engine/Shopware/Models/Site/Group.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\StateTranslatorServiceTest\\:\\:testTranslateStateNoTranslationShouldReturnDefault\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Site\\\\Group\\:\\:setKey\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/StateTranslatorServiceTest.php
+			path: engine/Shopware/Models/Site/Group.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\StateTranslatorServiceTest\\:\\:testTranslateStateOrdersTranslation\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Site\\\\Group\\:\\:setMapping\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/StateTranslatorServiceTest.php
+			path: engine/Shopware/Models/Site/Group.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\StateTranslatorServiceTest\\:\\:testTranslateStatePaymentsTranslation\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Site\\\\Group\\:\\:setName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/StateTranslatorServiceTest.php
+			path: engine/Shopware/Models/Site/Group.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\StateTranslatorServiceTest\\:\\:testTranslateStateShouldThrowException\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Site\\\\Repository\\:\\:getGroupListQuery\\(\\) has parameter \\$filterBy with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/StateTranslatorServiceTest.php
+			path: engine/Shopware/Models/Site/Repository.php
 
 		-
-			message: "#^Parameter \\#1 \\$locale of method Shopware_Components_Snippet_Manager\\:\\:setLocale\\(\\) expects Shopware\\\\Models\\\\Shop\\\\Locale, Shopware\\\\Models\\\\Shop\\\\Locale\\|null given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Site\\\\Repository\\:\\:getGroupListQuery\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/StateTranslatorServiceTest.php
+			path: engine/Shopware/Models/Site/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\StreamProtocolValidatorTest\\:\\:testDefaultProtocols\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Site\\\\Repository\\:\\:getGroupListQueryBuilder\\(\\) has parameter \\$filterBy with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/StreamProtocolValidatorTest.php
+			path: engine/Shopware/Models/Site/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\StreamProtocolValidatorTest\\:\\:testInvalidProtocols\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Site\\\\Repository\\:\\:getGroupListQueryBuilder\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/StreamProtocolValidatorTest.php
+			path: engine/Shopware/Models/Site/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Theme\\\\Base\\:\\:getSnippetHandler\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Site\\\\Site\\:\\:getChildren\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Theme/Base.php
+			path: engine/Shopware/Models/Site/Site.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Theme\\\\Base\\:\\:invokeMethod\\(\\) has parameter \\$parameters with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Site\\\\Site\\:\\:setActive\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Theme/Base.php
+			path: engine/Shopware/Models/Site/Site.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Theme\\\\InheritanceTest\\:\\:getDummyTemplates\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Site\\\\Site\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Theme/InheritanceTest.php
+			path: engine/Shopware/Models/Site/Site.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Theme\\\\InheritanceTest\\:\\:getTheme\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Site\\\\Site\\:\\:setChildren\\(\\) has parameter \\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Theme/InheritanceTest.php
+			path: engine/Shopware/Models/Site/Site.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Theme\\\\InheritanceTest\\:\\:testBuildInheritance\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Site\\\\Site\\:\\:\\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Components/Theme/InheritanceTest.php
+			path: engine/Shopware/Models/Site/Site.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Theme\\\\InheritanceTest\\:\\:testConfigInheritanceForLanguageShop\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Snippet\\\\Snippet\\:\\:onPrePersist\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Theme/InheritanceTest.php
+			path: engine/Shopware/Models/Snippet/Snippet.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Theme\\\\InheritanceTest\\:\\:testSmartyDirectories\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Snippet\\\\Snippet\\:\\:onPreUpdate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Theme/InheritanceTest.php
+			path: engine/Shopware/Models/Snippet/Snippet.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Theme\\\\InheritanceTest\\:\\:testTemplateDirectories\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Snippet\\\\Snippet\\:\\:setDirty\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Theme/InheritanceTest.php
+			path: engine/Shopware/Models/Snippet/Snippet.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Theme\\\\InheritanceTest\\:\\:testThemeFiles\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Snippet\\\\SnippetRepository\\:\\:getDistinctLocalesQuery\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Theme/InheritanceTest.php
+			path: engine/Shopware/Models/Snippet/SnippetRepository.php
 
 		-
-			message: "#^Parameter \\#1 \\$entityManager of class Shopware\\\\Components\\\\Theme\\\\Inheritance constructor expects Shopware\\\\Components\\\\Model\\\\ModelManager, PHPUnit\\\\Framework\\\\MockObject\\\\MockObject given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Snippet\\\\SnippetRepository\\:\\:getDistinctLocalesQueryBuilder\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Theme/InheritanceTest.php
+			path: engine/Shopware/Models/Snippet/SnippetRepository.php
 
 		-
-			message: "#^Parameter \\#1 \\$template of method Shopware\\\\Components\\\\Theme\\\\Inheritance\\:\\:buildConfig\\(\\) expects Shopware\\\\Models\\\\Shop\\\\Template, Shopware\\\\Models\\\\Shop\\\\Template\\|null given\\.$#"
-			count: 2
-			path: tests/Functional/Components/Theme/InheritanceTest.php
+			message: "#^Method Shopware\\\\Models\\\\Snippet\\\\SnippetRepository\\:\\:getDistinctNamespacesQuery\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Snippet/SnippetRepository.php
 
 		-
-			message: "#^Parameter \\#2 \\$util of class Shopware\\\\Components\\\\Theme\\\\Inheritance constructor expects Shopware\\\\Components\\\\Theme\\\\Util, PHPUnit\\\\Framework\\\\MockObject\\\\MockObject given\\.$#"
-			count: 2
-			path: tests/Functional/Components/Theme/InheritanceTest.php
+			message: "#^Method Shopware\\\\Models\\\\Snippet\\\\SnippetRepository\\:\\:getDistinctNamespacesQuery\\(\\) has parameter \\$limit with no type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Snippet/SnippetRepository.php
 
 		-
-			message: "#^Parameter \\#3 \\$pathResolver of class Shopware\\\\Components\\\\Theme\\\\Inheritance constructor expects Shopware\\\\Components\\\\Theme\\\\PathResolver, PHPUnit\\\\Framework\\\\MockObject\\\\MockObject given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Snippet\\\\SnippetRepository\\:\\:getDistinctNamespacesQuery\\(\\) has parameter \\$locales with no type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Theme/InheritanceTest.php
+			path: engine/Shopware/Models/Snippet/SnippetRepository.php
 
 		-
-			message: "#^Parameter \\#4 \\$eventManager of class Shopware\\\\Components\\\\Theme\\\\Inheritance constructor expects Enlight_Event_EventManager, PHPUnit\\\\Framework\\\\MockObject\\\\MockObject given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Snippet\\\\SnippetRepository\\:\\:getDistinctNamespacesQuery\\(\\) has parameter \\$offset with no type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Theme/InheritanceTest.php
+			path: engine/Shopware/Models/Snippet/SnippetRepository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Theme\\\\InstallerTest\\:\\:testSynchronizeThemeDirectory\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Snippet\\\\SnippetRepository\\:\\:getDistinctNamespacesQueryBuilder\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Theme/InstallerTest.php
+			path: engine/Shopware/Models/Snippet/SnippetRepository.php
 
 		-
-			message: "#^Parameter \\#1 \\$entityManager of class Shopware\\\\Components\\\\Theme\\\\Installer constructor expects Shopware\\\\Components\\\\Model\\\\ModelManager, PHPUnit\\\\Framework\\\\MockObject\\\\MockObject given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Snippet\\\\SnippetRepository\\:\\:getDistinctNamespacesQueryBuilder\\(\\) has parameter \\$limit with no type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Theme/InstallerTest.php
+			path: engine/Shopware/Models/Snippet/SnippetRepository.php
 
 		-
-			message: "#^Parameter \\#2 \\$configurator of class Shopware\\\\Components\\\\Theme\\\\Installer constructor expects Shopware\\\\Components\\\\Theme\\\\Configurator, PHPUnit\\\\Framework\\\\MockObject\\\\MockObject given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Snippet\\\\SnippetRepository\\:\\:getDistinctNamespacesQueryBuilder\\(\\) has parameter \\$locales with no type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Theme/InstallerTest.php
+			path: engine/Shopware/Models/Snippet/SnippetRepository.php
 
 		-
-			message: "#^Property Shopware\\\\Themes\\\\TestBare\\\\Theme\\:\\:\\$css type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Snippet\\\\SnippetRepository\\:\\:getDistinctNamespacesQueryBuilder\\(\\) has parameter \\$offset with no type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Theme/Themes/TestBare/Theme.php
+			path: engine/Shopware/Models/Snippet/SnippetRepository.php
 
 		-
-			message: "#^Property Shopware\\\\Themes\\\\TestBare\\\\Theme\\:\\:\\$extends has no type specified\\.$#"
+			message: "#^Cannot access offset 'tax' on array\\<string, mixed\\>\\|false\\.$#"
 			count: 1
-			path: tests/Functional/Components/Theme/Themes/TestBare/Theme.php
+			path: engine/Shopware/Models/Tax/Repository.php
 
 		-
-			message: "#^Property Shopware\\\\Themes\\\\TestBare\\\\Theme\\:\\:\\$javascript type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Repository\\:\\:getTaxQueryBuilder\\(\\) has parameter \\$filters with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Theme/Themes/TestBare/Theme.php
+			path: engine/Shopware/Models/Tax/Repository.php
 
 		-
-			message: "#^Property Shopware\\\\Themes\\\\TestResponsive\\\\Theme\\:\\:\\$css type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Repository\\:\\:getTaxQueryBuilder\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Components/Theme/Themes/TestResponsive/Theme.php
+			path: engine/Shopware/Models/Tax/Repository.php
 
 		-
-			message: "#^Property Shopware\\\\Themes\\\\TestResponsive\\\\Theme\\:\\:\\$javascript type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Rule\\:\\:setActive\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Theme/Themes/TestResponsive/Theme.php
+			path: engine/Shopware/Models/Tax/Rule.php
 
 		-
-			message: "#^Parameter \\#1 \\$file of method Shopware\\\\Models\\\\Media\\\\Media\\:\\:setFile\\(\\) expects Symfony\\\\Component\\\\HttpFoundation\\\\File\\\\UploadedFile, Symfony\\\\Component\\\\HttpFoundation\\\\File\\\\File given\\.$#"
-			count: 2
-			path: tests/Functional/Components/Thumbnail/ManagerTest.php
+			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Rule\\:\\:setArea\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Tax/Rule.php
 
 		-
-			message: "#^Parameter \\#2 \\$contents of method Shopware\\\\Bundle\\\\MediaBundle\\\\MediaService\\:\\:write\\(\\) expects string, string\\|false given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Rule\\:\\:setAreaId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Components/Thumbnail/ManagerTest.php
+			path: engine/Shopware/Models/Tax/Rule.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\ApplicationTest\\:\\:formatSearchValueTestDataProvider\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Rule\\:\\:setCountry\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ApplicationTest.php
+			path: engine/Shopware/Models/Tax/Rule.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\ApplicationTest\\:\\:searchProvider\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Rule\\:\\:setCountryId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ApplicationTest.php
+			path: engine/Shopware/Models/Tax/Rule.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\ApplicationTest\\:\\:testFormatSearchValue\\(\\) has parameter \\$parameter with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Rule\\:\\:setCustomerGroup\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ApplicationTest.php
+			path: engine/Shopware/Models/Tax/Rule.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\CanceledOrderTest\\:\\:testCanceledOrderSummary\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Rule\\:\\:setCustomerGroupId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/CanceledOrderTest.php
+			path: engine/Shopware/Models/Tax/Rule.php
 
 		-
-			message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$data\\.$#"
-			count: 7
-			path: tests/Functional/Controllers/Backend/CategoryTest.php
+			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Rule\\:\\:setGroup\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Tax/Rule.php
 
 		-
-			message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$message\\.$#"
-			count: 2
-			path: tests/Functional/Controllers/Backend/CategoryTest.php
+			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Rule\\:\\:setGroupId\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Tax/Rule.php
 
 		-
-			message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$success\\.$#"
-			count: 7
-			path: tests/Functional/Controllers/Backend/CategoryTest.php
+			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Rule\\:\\:setName\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Tax/Rule.php
 
 		-
-			message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$total\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Rule\\:\\:setState\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/CategoryTest.php
+			path: engine/Shopware/Models/Tax/Rule.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\CategoryTest\\:\\:testGetIdPath\\(\\) has parameter \\$id with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Rule\\:\\:setStateId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/CategoryTest.php
+			path: engine/Shopware/Models/Tax/Rule.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\CategoryTest\\:\\:testMoveTreeItem\\(\\) has parameter \\$id with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Rule\\:\\:setTax\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/CategoryTest.php
+			path: engine/Shopware/Models/Tax/Rule.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\CategoryTest\\:\\:\\$dummyData type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Tax\\:\\:getRules\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/CategoryTest.php
+			path: engine/Shopware/Models/Tax/Tax.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\CategoryTest\\:\\:\\$updateMetaDescription has no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Tax\\:\\:setRules\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/CategoryTest.php
+			path: engine/Shopware/Models/Tax/Tax.php
 
 		-
-			message: "#^Access to an undefined property object\\:\\:\\$data\\.$#"
-			count: 2
-			path: tests/Functional/Controllers/Backend/ConfigGetFormTest.php
+			message: "#^Method Shopware\\\\Models\\\\Tax\\\\Tax\\:\\:setRules\\(\\) has parameter \\$rules with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/Tax/Tax.php
 
 		-
-			message: "#^Access to an undefined property object\\:\\:\\$success\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Tax\\\\Tax\\:\\:\\$rules with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ConfigGetFormTest.php
+			path: engine/Shopware/Models/Tax/Tax.php
 
 		-
-			message: "#^Call to an undefined method Enlight_Controller_Response_Response\\:\\:getHeader\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Theme\\\\Settings\\:\\:setCompressCss\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ConfigGetFormTest.php
+			path: engine/Shopware/Models/Theme/Settings.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\ConfigGetFormTest\\:\\:createAndLoginAdminUserWithLocaleId\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Theme\\\\Settings\\:\\:setCompressJs\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ConfigGetFormTest.php
+			path: engine/Shopware/Models/Theme/Settings.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\ConfigGetFormTest\\:\\:formLocaleTestCleanup\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Theme\\\\Settings\\:\\:setCreateSourceMap\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ConfigGetFormTest.php
+			path: engine/Shopware/Models/Theme/Settings.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\ConfigGetFormTest\\:\\:getLocaleIdOrCreate\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Theme\\\\Settings\\:\\:setForceCompile\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ConfigGetFormTest.php
+			path: engine/Shopware/Models/Theme/Settings.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\ConfigGetFormTest\\:\\:getLocaleIdOrCreate\\(\\) has parameter \\$locale with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Theme\\\\Settings\\:\\:setReloadSnippets\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ConfigGetFormTest.php
+			path: engine/Shopware/Models/Theme/Settings.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\ConfigGetFormTest\\:\\:getTranslatedFormElementStoreSettings\\(\\) has parameter \\$settingsTranslations with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Tracking\\\\ArticleImpression\\:\\:setArticleId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ConfigGetFormTest.php
+			path: engine/Shopware/Models/Tracking/ArticleImpression.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\ConfigGetFormTest\\:\\:getTranslatedFormElementStoreSettings\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Tracking\\\\ArticleImpression\\:\\:setDate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ConfigGetFormTest.php
+			path: engine/Shopware/Models/Tracking/ArticleImpression.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\ConfigGetFormTest\\:\\:testFormElementSettingTranslationCanBeFixedString\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Tracking\\\\ArticleImpression\\:\\:setDeviceType\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ConfigGetFormTest.php
+			path: engine/Shopware/Models/Tracking/ArticleImpression.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\ConfigGetFormTest\\:\\:testFormElementSettingTranslationIsEnglishFallbackIfBritishEnglishDoesNotExist\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Tracking\\\\ArticleImpression\\:\\:setImpressions\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ConfigGetFormTest.php
+			path: engine/Shopware/Models/Tracking/ArticleImpression.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\ConfigGetFormTest\\:\\:testFormElementSettingTranslationIsFallbackIfNonTranslatedUserLocale\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Tracking\\\\ArticleImpression\\:\\:setShopId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ConfigGetFormTest.php
+			path: engine/Shopware/Models/Tracking/ArticleImpression.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\ConfigGetFormTest\\:\\:testFormElementSettingTranslationIsFallbackIfNonTranslatedUserTerritory\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$deviceType of method Shopware\\\\Models\\\\Tracking\\\\ArticleImpression\\:\\:setDeviceType\\(\\) expects string, string\\|null given\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ConfigGetFormTest.php
+			path: engine/Shopware/Models/Tracking/ArticleImpression.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\ConfigGetFormTest\\:\\:testFormElementSettingTranslationIsFirstTranslationIfUnmatchedAndWithoutFallbacks\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Translation\\\\Translation\\:\\:setData\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ConfigGetFormTest.php
+			path: engine/Shopware/Models/Translation/Translation.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\ConfigGetFormTest\\:\\:testFormElementSettingTranslationIsUserLocaleIfMatching\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Translation\\\\Translation\\:\\:setKey\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ConfigGetFormTest.php
+			path: engine/Shopware/Models/Translation/Translation.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\ConfigGetFormTest\\:\\:\\$temporaryLocales type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Translation\\\\Translation\\:\\:setShop\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ConfigGetFormTest.php
+			path: engine/Shopware/Models/Translation/Translation.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\ConfigTest\\:\\:checkGetTableListConfigPagination\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Translation\\\\Translation\\:\\:setShopId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ConfigTest.php
+			path: engine/Shopware/Models/Translation/Translation.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\ConfigTest\\:\\:checkGetTableListSearch\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Translation\\\\Translation\\:\\:setType\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ConfigTest.php
+			path: engine/Shopware/Models/Translation/Translation.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\ConfigTest\\:\\:checkGetTableListSearchWithPagination\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\User\\\\Privilege\\:\\:getRequirements\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ConfigTest.php
+			path: engine/Shopware/Models/User/Privilege.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\ConfigTest\\:\\:checkTableListConfig\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\User\\\\Privilege\\:\\:onRemove\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ConfigTest.php
+			path: engine/Shopware/Models/User/Privilege.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\ConfigTest\\:\\:testCronJobPaginationConfig\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\User\\\\Privilege\\:\\:setRequirements\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ConfigTest.php
+			path: engine/Shopware/Models/User/Privilege.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\ConfigTest\\:\\:testCronJobSearchConfig\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\User\\\\Privilege\\:\\:setRequirements\\(\\) has parameter \\$requirements with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ConfigTest.php
+			path: engine/Shopware/Models/User/Privilege.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\ConfigTest\\:\\:testIfPDFDocumentsListIncludesTranslation\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\User\\\\Privilege\\:\\:setResource\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ConfigTest.php
+			path: engine/Shopware/Models/User/Privilege.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\ConfigTest\\:\\:testPersistDocumentTypeKey\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\User\\\\Privilege\\:\\:\\$requirements with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ConfigTest.php
+			path: engine/Shopware/Models/User/Privilege.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\ConfigTest\\:\\:testSearchFieldConfig\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\User\\\\Repository\\:\\:getUsersQuery\\(\\) has parameter \\$orderBy with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ConfigTest.php
+			path: engine/Shopware/Models/User/Repository.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\ConfigTest\\:\\:testSearchFieldSearchConfig\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\User\\\\Resource\\:\\:getPrivileges\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ConfigTest.php
+			path: engine/Shopware/Models/User/Resource.php
 
 		-
-			message: "#^Parameter \\#1 \\$json of function json_decode expects string, array\\|string\\|null given\\.$#"
-			count: 3
-			path: tests/Functional/Controllers/Backend/ConfigTest.php
+			message: "#^Method Shopware\\\\Models\\\\User\\\\Resource\\:\\:onRemove\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/User/Resource.php
 
 		-
-			message: "#^Parameter \\#1 \\$tableListName of method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\ConfigTest\\:\\:checkGetTableListConfigPagination\\(\\) expects Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\strin, string given\\.$#"
-			count: 2
-			path: tests/Functional/Controllers/Backend/ConfigTest.php
+			message: "#^Method Shopware\\\\Models\\\\User\\\\Resource\\:\\:setPluginId\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/User/Resource.php
 
 		-
-			message: "#^Parameter \\#2 \\$totalCount of method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\ConfigTest\\:\\:checkGetTableListSearch\\(\\) expects int, string\\|false\\|null given\\.$#"
-			count: 2
-			path: tests/Functional/Controllers/Backend/ConfigTest.php
+			message: "#^Method Shopware\\\\Models\\\\User\\\\Resource\\:\\:setPrivileges\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/User/Resource.php
 
 		-
-			message: "#^Parameter \\$tableListName of method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\ConfigTest\\:\\:checkGetTableListConfigPagination\\(\\) has invalid type Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\strin\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\User\\\\Resource\\:\\:setPrivileges\\(\\) has parameter \\$privileges with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ConfigTest.php
+			path: engine/Shopware/Models/User/Resource.php
 
 		-
-			message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$data\\.$#"
-			count: 2
-			path: tests/Functional/Controllers/Backend/CustomerTest.php
+			message: "#^Property Shopware\\\\Models\\\\User\\\\Resource\\:\\:\\$privileges with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/User/Resource.php
 
 		-
-			message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$success\\.$#"
-			count: 5
-			path: tests/Functional/Controllers/Backend/CustomerTest.php
+			message: "#^Method Shopware\\\\Models\\\\User\\\\Role\\:\\:getChildren\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/User/Role.php
 
 		-
-			message: "#^Cannot call method getAdditionalAddressLine1\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
-			count: 2
-			path: tests/Functional/Controllers/Backend/CustomerTest.php
+			message: "#^Method Shopware\\\\Models\\\\User\\\\Role\\:\\:getPrivileges\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/User/Role.php
 
 		-
-			message: "#^Cannot call method getAdditionalAddressLine2\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
-			count: 2
-			path: tests/Functional/Controllers/Backend/CustomerTest.php
+			message: "#^Method Shopware\\\\Models\\\\User\\\\Role\\:\\:getRules\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/User/Role.php
 
 		-
-			message: "#^Cannot call method getCity\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
-			count: 2
-			path: tests/Functional/Controllers/Backend/CustomerTest.php
+			message: "#^Method Shopware\\\\Models\\\\User\\\\Role\\:\\:getUsers\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/User/Role.php
 
 		-
-			message: "#^Cannot call method getDepartment\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
-			count: 2
-			path: tests/Functional/Controllers/Backend/CustomerTest.php
+			message: "#^Method Shopware\\\\Models\\\\User\\\\Role\\:\\:setChildren\\(\\) has parameter \\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/User/Role.php
 
 		-
-			message: "#^Cannot call method getFirstname\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
-			count: 2
-			path: tests/Functional/Controllers/Backend/CustomerTest.php
+			message: "#^Method Shopware\\\\Models\\\\User\\\\Role\\:\\:setParent\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/User/Role.php
 
 		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Customer\\\\Group\\|null\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\User\\\\Role\\:\\:setUsers\\(\\) has parameter \\$users with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/CustomerTest.php
+			path: engine/Shopware/Models/User/Role.php
 
 		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Payment\\\\Payment\\|null\\.$#"
-			count: 12
-			path: tests/Functional/Controllers/Backend/CustomerTest.php
+			message: "#^Property Shopware\\\\Models\\\\User\\\\Role\\:\\:\\$children with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/User/Role.php
 
 		-
-			message: "#^Cannot call method getLastname\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
-			count: 2
-			path: tests/Functional/Controllers/Backend/CustomerTest.php
+			message: "#^Property Shopware\\\\Models\\\\User\\\\Role\\:\\:\\$rules with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/User/Role.php
 
 		-
-			message: "#^Cannot call method getStreet\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
-			count: 2
-			path: tests/Functional/Controllers/Backend/CustomerTest.php
+			message: "#^Property Shopware\\\\Models\\\\User\\\\Role\\:\\:\\$users with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/User/Role.php
 
 		-
-			message: "#^Cannot call method getTitle\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
-			count: 2
-			path: tests/Functional/Controllers/Backend/CustomerTest.php
+			message: "#^Method Shopware\\\\Models\\\\User\\\\Rule\\:\\:setId\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/User/Rule.php
 
 		-
-			message: "#^Cannot call method getVatId\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
-			count: 2
-			path: tests/Functional/Controllers/Backend/CustomerTest.php
+			message: "#^Method Shopware\\\\Models\\\\User\\\\Rule\\:\\:setPrivilege\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/User/Rule.php
 
 		-
-			message: "#^Cannot call method getZipcode\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
-			count: 2
-			path: tests/Functional/Controllers/Backend/CustomerTest.php
+			message: "#^Method Shopware\\\\Models\\\\User\\\\Rule\\:\\:setPrivilegeId\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/User/Rule.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\CustomerTest\\:\\:testUpdateCustomerPaymentDataWithSepa\\(\\) has parameter \\$dummyDataId with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\User\\\\Rule\\:\\:setResource\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/CustomerTest.php
+			path: engine/Shopware/Models/User/Rule.php
 
 		-
-			message: "#^Parameter \\#1 \\$group of method Shopware\\\\Models\\\\Customer\\\\Customer\\:\\:setGroup\\(\\) expects array\\|Shopware\\\\Models\\\\Customer\\\\Group, Shopware\\\\Models\\\\Customer\\\\Group\\|null given\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\User\\\\Rule\\:\\:setResourceId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/CustomerTest.php
+			path: engine/Shopware/Models/User/Rule.php
 
 		-
-			message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$data\\.$#"
-			count: 5
-			path: tests/Functional/Controllers/Backend/FormTest.php
+			message: "#^Method Shopware\\\\Models\\\\User\\\\Rule\\:\\:setRole\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/User/Rule.php
 
 		-
-			message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$success\\.$#"
-			count: 5
-			path: tests/Functional/Controllers/Backend/FormTest.php
+			message: "#^Method Shopware\\\\Models\\\\User\\\\Rule\\:\\:setRoleId\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/User/Rule.php
 
 		-
-			message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$total\\.$#"
-			count: 4
-			path: tests/Functional/Controllers/Backend/FormTest.php
+			message: "#^Method Shopware\\\\Models\\\\User\\\\User\\:\\:setAttribute\\(\\) has parameter \\$attribute with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Models/User/User.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\FormTest\\:\\:testGetFieldsShouldReturnFields\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\User\\\\User\\:\\:setLockedUntil\\(\\) has parameter \\$lockedUntil with no type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/FormTest.php
+			path: engine/Shopware/Models/User/User.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\FormTest\\:\\:testGetFormsShouldBeFilterAndSortable\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\User\\\\User\\:\\:\\$lastLogin \\(DateTimeInterface\\) does not accept DateTimeInterface\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/FormTest.php
+			path: engine/Shopware/Models/User/User.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\FormTest\\:\\:testGetFormsShouldBeSuccessful\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Voucher\\\\Code\\:\\:setCustomer\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/FormTest.php
+			path: engine/Shopware/Models/Voucher/Code.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\FormTest\\:\\:testGetFormsWithIdShouldReturnSingleForm\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Voucher\\\\Code\\:\\:setVoucher\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/FormTest.php
+			path: engine/Shopware/Models/Voucher/Code.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\FormTest\\:\\:testGetFormsWithInvalidIdShouldReturnFailure\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Voucher\\\\Voucher\\:\\:getCodes\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/FormTest.php
+			path: engine/Shopware/Models/Voucher/Voucher.php
 
 		-
-			message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$success\\.$#"
-			count: 3
-			path: tests/Functional/Controllers/Backend/LogTest.php
+			message: "#^Method Shopware\\\\Models\\\\Voucher\\\\Voucher\\:\\:setCodes\\(\\) has parameter \\$codes with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/Voucher/Voucher.php
 
 		-
-			message: "#^Method Enlight_Controller_Request_RequestTestCase\\:\\:setClientIp\\(\\) invoked with 2 parameters, 1 required\\.$#"
-			count: 2
-			path: tests/Functional/Controllers/Backend/LogTest.php
+			message: "#^Method Shopware\\\\Models\\\\Voucher\\\\Voucher\\:\\:setCodes\\(\\) has parameter \\$codes with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Voucher/Voucher.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\LogTest\\:\\:testCreateDeprecatedLog\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Voucher\\\\Voucher\\:\\:setCustomerStreamIds\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/LogTest.php
+			path: engine/Shopware/Models/Voucher/Voucher.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\LogTest\\:\\:testCreateLog\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Voucher\\\\Voucher\\:\\:\\$codes with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/LogTest.php
+			path: engine/Shopware/Models/Voucher/Voucher.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\LogTest\\:\\:testDeleteLogs\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Voucher\\\\Voucher\\:\\:\\$validFrom \\(DateTimeInterface\\|null\\) does not accept DateTimeInterface\\|string\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/LogTest.php
+			path: engine/Shopware/Models/Voucher/Voucher.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\LogTest\\:\\:testGetLogs\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Voucher\\\\Voucher\\:\\:\\$validTo \\(DateTimeInterface\\|null\\) does not accept DateTimeInterface\\|string\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/LogTest.php
+			path: engine/Shopware/Models/Voucher/Voucher.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\MailTest\\:\\:testCreateMail\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Widget\\\\View\\:\\:getData\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/MailTest.php
+			path: engine/Shopware/Models/Widget/View.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\MailTest\\:\\:testGetAttachmentsShouldBeSuccessful\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Widget\\\\View\\:\\:setAuth\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/MailTest.php
+			path: engine/Shopware/Models/Widget/View.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\MailTest\\:\\:testGetMailsShouldBeSuccessful\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Widget\\\\View\\:\\:setAuthId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/MailTest.php
+			path: engine/Shopware/Models/Widget/View.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\MailTest\\:\\:testGetSingleMail\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Widget\\\\View\\:\\:setColumn\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/MailTest.php
+			path: engine/Shopware/Models/Widget/View.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\MailTest\\:\\:testGetSingleMail\\(\\) has parameter \\$id with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Widget\\\\View\\:\\:setData\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/MailTest.php
+			path: engine/Shopware/Models/Widget/View.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\MailTest\\:\\:testRemoveMail\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Widget\\\\View\\:\\:setData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/MailTest.php
+			path: engine/Shopware/Models/Widget/View.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\MailTest\\:\\:testRemoveMail\\(\\) has parameter \\$id with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Widget\\\\View\\:\\:setPosition\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/MailTest.php
+			path: engine/Shopware/Models/Widget/View.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\MailTest\\:\\:testUpdateMail\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Widget\\\\View\\:\\:setWidget\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/MailTest.php
+			path: engine/Shopware/Models/Widget/View.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\MailTest\\:\\:testUpdateMail\\(\\) has parameter \\$id with no type specified\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Widget\\\\View\\:\\:\\$data type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/MailTest.php
+			path: engine/Shopware/Models/Widget/View.php
 
 		-
-			message: "#^Parameter \\#1 \\$json of function json_decode expects string, array\\|string\\|null given\\.$#"
-			count: 6
-			path: tests/Functional/Controllers/Backend/MailTest.php
+			message: "#^Method Shopware\\\\Models\\\\Widget\\\\Widget\\:\\:getViews\\(\\) return type with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
+			count: 1
+			path: engine/Shopware/Models/Widget/Widget.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\MailTest\\:\\:\\$testData type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Widget\\\\Widget\\:\\:setName\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/MailTest.php
+			path: engine/Shopware/Models/Widget/Widget.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\MediaManagerTest\\:\\:testAlbumInheritance\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Widget\\\\Widget\\:\\:setPlugin\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/MediaManagerTest.php
+			path: engine/Shopware/Models/Widget/Widget.php
 
 		-
-			message: "#^Parameter \\#2 \\$string of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertMatchesRegularExpression\\(\\) expects string, array\\|string\\|null given\\.$#"
-			count: 2
-			path: tests/Functional/Controllers/Backend/NewsletterTest.php
+			message: "#^Method Shopware\\\\Models\\\\Widget\\\\Widget\\:\\:setViews\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Models/Widget/Widget.php
 
 		-
-			message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$data\\.$#"
+			message: "#^Method Shopware\\\\Models\\\\Widget\\\\Widget\\:\\:setViews\\(\\) has parameter \\$views with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/NotificationTest.php
+			path: engine/Shopware/Models/Widget/Widget.php
 
 		-
-			message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$success\\.$#"
+			message: "#^Property Shopware\\\\Models\\\\Widget\\\\Widget\\:\\:\\$views with generic class Doctrine\\\\Common\\\\Collections\\\\ArrayCollection does not specify its types\\: TKey, T$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/NotificationTest.php
+			path: engine/Shopware/Models/Widget/Widget.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\NotificationTest\\:\\:testGetArticleList\\(\\) has no return type specified\\.$#"
+			message: "#^Call to an undefined method Enlight_Template_Default\\:\\:setCompileId\\(\\)\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/NotificationTest.php
+			path: engine/Shopware/Plugins/Default/Backend/Auth/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\NotificationTest\\:\\:testGetCustomerList\\(\\) has no return type specified\\.$#"
+			message: "#^Call to an undefined method Enlight_Template_Manager\\:\\:getCompileId\\(\\)\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/NotificationTest.php
+			path: engine/Shopware/Plugins/Default/Backend/Auth/Bootstrap.php
 
 		-
-			message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$success\\.$#"
-			count: 5
-			path: tests/Functional/Controllers/Backend/PaymentTest.php
+			message: "#^Method Shopware_Plugins_Backend_Auth_Bootstrap\\:\\:getLocales\\(\\) return type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Plugins/Default/Backend/Auth/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\PaymentTest\\:\\:testCreatePayments\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Backend_Auth_Bootstrap\\:\\:isAllowed\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/PaymentTest.php
+			path: engine/Shopware/Plugins/Default/Backend/Auth/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\PaymentTest\\:\\:testDeletePayment\\(\\) has no return type specified\\.$#"
+			message: "#^Class ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Archive\\\\Adapter implements generic interface SeekableIterator but does not specify its types\\: TKey, TValue$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/PaymentTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Archive/Adapter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\PaymentTest\\:\\:testDeletePayment\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Archive\\\\Adapter\\:\\:each\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/PaymentTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Archive/Adapter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\PaymentTest\\:\\:testGetCountries\\(\\) has no return type specified\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Archive\\\\Entry\\\\Zip\\:\\:getContents\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/PaymentTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Archive/Entry/Zip.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\PaymentTest\\:\\:testGetPayments\\(\\) has no return type specified\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Archive\\\\Entry\\\\Zip\\:\\:getStream\\(\\) should return resource but returns resource\\|false\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/PaymentTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Archive/Entry/Zip.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\PaymentTest\\:\\:testUpdatePayments\\(\\) has no return type specified\\.$#"
+			message: "#^Property ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Archive\\\\Entry\\\\Zip\\:\\:\\$name \\(string\\) does not accept string\\|false\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/PaymentTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Archive/Entry/Zip.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\PaymentTest\\:\\:testUpdatePayments\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Archive\\\\Zip\\:\\:__construct\\(\\) has parameter \\$flags with no type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/PaymentTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Archive/Zip.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\PaymentTest\\:\\:\\$testDataCreate has no type specified\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Archive\\\\Zip\\:\\:getContents\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/PaymentTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Archive/Zip.php
 
 		-
-			message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$success\\.$#"
-			count: 2
-			path: tests/Functional/Controllers/Backend/PremiumTest.php
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Archive\\\\Zip\\:\\:getEntry\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Archive/Zip.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\PremiumTest\\:\\:testDeletePremiumArticle\\(\\) has no return type specified\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Archive\\\\Zip\\:\\:getStream\\(\\) should return resource but returns resource\\|false\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/PremiumTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Archive/Zip.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\PremiumTest\\:\\:testEditPremiumArticle\\(\\) has no return type specified\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\CheckInterface\\:\\:canHandle\\(\\) has parameter \\$requirement with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/PremiumTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/CheckInterface.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\PremiumTest\\:\\:testGetPremiumArticles\\(\\) has no return type specified\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\CheckInterface\\:\\:check\\(\\) has parameter \\$requirement with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/PremiumTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/CheckInterface.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\PremiumTest\\:\\:\\$premiumData has no type specified\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\EmotionTemplateCheck\\:\\:canHandle\\(\\) has parameter \\$requirement with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/PremiumTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/EmotionTemplateCheck.php
 
 		-
-			message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$data\\.$#"
-			count: 8
-			path: tests/Functional/Controllers/Backend/ProductFeedTest.php
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\EmotionTemplateCheck\\:\\:check\\(\\) has parameter \\$requirement with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/EmotionTemplateCheck.php
 
 		-
-			message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$success\\.$#"
-			count: 7
-			path: tests/Functional/Controllers/Backend/ProductFeedTest.php
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\EmotionTemplateCheck\\:\\:getActiveEmotionTemplates\\(\\) return type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/EmotionTemplateCheck.php
 
 		-
-			message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$total\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\LicenseCheck\\:\\:canHandle\\(\\) has parameter \\$requirement with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ProductFeedTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/LicenseCheck.php
 
 		-
-			message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$totalCount\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\LicenseCheck\\:\\:check\\(\\) has parameter \\$requirement with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ProductFeedTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/LicenseCheck.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\ProductFeedTest\\:\\:testDeleteFeed\\(\\) has no return type specified\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\LicenseCheck\\:\\:getLicenseData\\(\\) has parameter \\$licenseKeys with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ProductFeedTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/LicenseCheck.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\ProductFeedTest\\:\\:testGetArticlesAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\LicenseCheck\\:\\:getLicenseData\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ProductFeedTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/LicenseCheck.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\ProductFeedTest\\:\\:testGetFeeds\\(\\) has no return type specified\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\MySQLVersionCheck\\:\\:canHandle\\(\\) has parameter \\$requirement with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ProductFeedTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/MySQLVersionCheck.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\ProductFeedTest\\:\\:testGetSuppliersAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\MySQLVersionCheck\\:\\:check\\(\\) has parameter \\$requirement with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ProductFeedTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/MySQLVersionCheck.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\ProductFeedTest\\:\\:testUpdateFeed\\(\\) has no return type specified\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\PHPExtensionCheck\\:\\:canHandle\\(\\) has parameter \\$requirement with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ProductFeedTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/PHPExtensionCheck.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\ProductFeedTest\\:\\:\\$feedData type has no value type specified in iterable type array\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\PHPExtensionCheck\\:\\:check\\(\\) has parameter \\$requirement with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/ProductFeedTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/PHPExtensionCheck.php
 
 		-
-			message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$success\\.$#"
-			count: 2
-			path: tests/Functional/Controllers/Backend/RiskManagementTest.php
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\PHPVersionCheck\\:\\:canHandle\\(\\) has parameter \\$requirement with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/PHPVersionCheck.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\RiskManagementTest\\:\\:testCreateRule\\(\\) has no return type specified\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\PHPVersionCheck\\:\\:check\\(\\) has parameter \\$requirement with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/RiskManagementTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/PHPVersionCheck.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\RiskManagementTest\\:\\:testDeleteRule\\(\\) has no return type specified\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\RegexCheck\\:\\:canHandle\\(\\) has parameter \\$requirement with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/RiskManagementTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/RegexCheck.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\RiskManagementTest\\:\\:testEditRule\\(\\) has no return type specified\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\RegexCheck\\:\\:check\\(\\) has parameter \\$requirement with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/RiskManagementTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/RegexCheck.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\RiskManagementTest\\:\\:testGetPayments\\(\\) has no return type specified\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\RegexCheck\\:\\:extractLocalizedMessage\\(\\) has parameter \\$messages with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/RiskManagementTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/RegexCheck.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\SearchTest\\:\\:testSearchForVariants\\(\\) has no return type specified\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\RegexCheck\\:\\:scanDirectoryForRegex\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/SearchTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/RegexCheck.php
 
 		-
-			message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$success\\.$#"
-			count: 4
-			path: tests/Functional/Controllers/Backend/SupplierTest.php
+			message: "#^Parameter \\#2 \\$subject of function preg_match_all expects string, string\\|false given\\.$#"
+			count: 1
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/RegexCheck.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\SupplierTest\\:\\:testAddSupplier\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\WritableCheck\\:\\:canHandle\\(\\) has parameter \\$requirement with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/SupplierTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/WritableCheck.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\SupplierTest\\:\\:testDeleteSupplier\\(\\) has no return type specified\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Checks\\\\WritableCheck\\:\\:check\\(\\) has parameter \\$requirement with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/SupplierTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/WritableCheck.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\SupplierTest\\:\\:testDeleteSupplier\\(\\) has parameter \\$lastSupplier with no value type specified in iterable type array\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Download\\:\\:moveFile\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/SupplierTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Download.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\SupplierTest\\:\\:testGetSuppliers\\(\\) has no return type specified\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Download\\:\\:progress\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/SupplierTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Download.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\SupplierTest\\:\\:testUpdateSupplier\\(\\) has parameter \\$lastSupplier with no value type specified in iterable type array\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Download\\:\\:setHaltCallback\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/SupplierTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Download.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\SupplierTest\\:\\:testUpdateSupplier\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Download\\:\\:setProgressCallback\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/SupplierTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Download.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\SupplierTest\\:\\:\\$supplierData type has no value type specified in iterable type array\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\FileSystem\\:\\:checkDirectoryPermissions\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/SupplierTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/FileSystem.php
 
 		-
-			message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$success\\.$#"
-			count: 4
-			path: tests/Functional/Controllers/Backend/SysteminfoTest.php
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\FileSystem\\:\\:checkSingleDirectoryPermissions\\(\\) return type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/FileSystem.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\SysteminfoTest\\:\\:testGetConfigList\\(\\) has no return type specified\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\FileSystem\\:\\:fixDirectoryPermission\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/SysteminfoTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/FileSystem.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\SysteminfoTest\\:\\:testGetFileList\\(\\) has no return type specified\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\FileSystem\\:\\:fixFilePermission\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/SysteminfoTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/FileSystem.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\SysteminfoTest\\:\\:testGetPathList\\(\\) has no return type specified\\.$#"
+			message: "#^Cannot access property \\$sha1 on array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/SysteminfoTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/DownloadStep.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\SysteminfoTest\\:\\:testGetVersionList\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Functional/Controllers/Backend/SysteminfoTest.php
+			message: "#^Cannot access property \\$size on array\\.$#"
+			count: 3
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/DownloadStep.php
 
 		-
-			message: "#^Parameter \\#1 \\$json of function json_decode expects string, array\\|string\\|null given\\.$#"
-			count: 4
-			path: tests/Functional/Controllers/Backend/SysteminfoTest.php
+			message: "#^Cannot access property \\$uri on array\\.$#"
+			count: 1
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/DownloadStep.php
 
 		-
-			message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$data\\.$#"
-			count: 3
-			path: tests/Functional/Controllers/Backend/VoteTest.php
+			message: "#^Property ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Steps\\\\DownloadStep\\:\\:\\$version \\(array\\) does not accept ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Struct\\\\Version\\.$#"
+			count: 1
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/DownloadStep.php
 
 		-
-			message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$success\\.$#"
-			count: 4
-			path: tests/Functional/Controllers/Backend/VoteTest.php
+			message: "#^Property ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Steps\\\\DownloadStep\\:\\:\\$version type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/DownloadStep.php
 
 		-
-			message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$total\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Steps\\\\ErrorResult\\:\\:__construct\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/VoteTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/ErrorResult.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\VoteTest\\:\\:testAcceptVote\\(\\) has no return type specified\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Steps\\\\ErrorResult\\:\\:getArgs\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/VoteTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/ErrorResult.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\VoteTest\\:\\:testAcceptVote\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Property ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Steps\\\\ErrorResult\\:\\:\\$args type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/VoteTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/ErrorResult.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\VoteTest\\:\\:testAnswerVote\\(\\) has no return type specified\\.$#"
+			message: "#^Property ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Steps\\\\ErrorResult\\:\\:\\$exception \\(Exception\\) does not accept Exception\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/VoteTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/ErrorResult.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\VoteTest\\:\\:testAnswerVote\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Steps\\\\FinishResult\\:\\:__construct\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/VoteTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/FinishResult.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\VoteTest\\:\\:testDeleteVote\\(\\) has no return type specified\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Steps\\\\FinishResult\\:\\:getArgs\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/VoteTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/FinishResult.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\VoteTest\\:\\:testDeleteVote\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Property ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Steps\\\\FinishResult\\:\\:\\$args type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/VoteTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/FinishResult.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\VoteTest\\:\\:testGetVotes\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Cannot use array destructuring on array\\|false\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/VoteTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/UnpackStep.php
 
 		-
-			message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$data\\.$#"
-			count: 7
-			path: tests/Functional/Controllers/Backend/VoucherTest.php
+			message: "#^Variable \\$entry in PHPDoc tag @var does not exist\\.$#"
+			count: 1
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/UnpackStep.php
 
 		-
-			message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$success\\.$#"
-			count: 8
-			path: tests/Functional/Controllers/Backend/VoucherTest.php
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Steps\\\\ValidResult\\:\\:__construct\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/ValidResult.php
 
 		-
-			message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$totalCount\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Steps\\\\ValidResult\\:\\:getArgs\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/VoucherTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/ValidResult.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\VoucherTest\\:\\:testDeleteVoucher\\(\\) has no return type specified\\.$#"
+			message: "#^Property ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Steps\\\\ValidResult\\:\\:\\$args type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/VoucherTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/ValidResult.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\VoucherTest\\:\\:testExportVoucherCode\\(\\) has no return type specified\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Struct\\\\Struct\\:\\:__construct\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/VoucherTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Struct/Struct.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\VoucherTest\\:\\:testGenerateVoucherCodes\\(\\) has no return type specified\\.$#"
+			message: "#^Property ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Struct\\\\Version\\:\\:\\$changelog type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/VoucherTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Struct/Version.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\VoucherTest\\:\\:testGetTaxConfiguration\\(\\) has no return type specified\\.$#"
+			message: "#^Property ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Struct\\\\Version\\:\\:\\$checks type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/VoucherTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Struct/Version.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\VoucherTest\\:\\:testGetVoucher\\(\\) has no return type specified\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Validation\\:\\:checkRequirements\\(\\) has parameter \\$requirements with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/VoucherTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Validation.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\VoucherTest\\:\\:testGetVoucherCodes\\(\\) has no return type specified\\.$#"
+			message: "#^Method ShopwarePlugins\\\\SwagUpdate\\\\Components\\\\Validation\\:\\:handleRequirement\\(\\) has parameter \\$requirement with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/VoucherTest.php
+			path: engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Validation.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\VoucherTest\\:\\:testUpdateVoucher\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Functional/Controllers/Backend/VoucherTest.php
+			message: "#^Call to an undefined method Enlight_Event_EventArgs\\:\\:getSubject\\(\\)\\.$#"
+			count: 4
+			path: engine/Shopware/Plugins/Default/Core/ControllerBase/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\VoucherTest\\:\\:testValidateOrderCode\\(\\) has no return type specified\\.$#"
+			message: "#^Call to an undefined method sMarketing\\:\\:sCampaignsGetList\\(\\)\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/VoucherTest.php
+			path: engine/Shopware/Plugins/Default/Core/ControllerBase/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\VoucherTest\\:\\:testValidateVoucherCode\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Functional/Controllers/Backend/VoucherTest.php
+			message: "#^Cannot call method get\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
+			count: 2
+			path: engine/Shopware/Plugins/Default/Core/ControllerBase/Bootstrap.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\VoucherTest\\:\\:\\$voucherData type has no value type specified in iterable type array\\.$#"
+			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Category\\\\Category\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/VoucherTest.php
+			path: engine/Shopware/Plugins/Default/Core/ControllerBase/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\WidgetsTest\\:\\:backendAuthProvider\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware_Plugins_Core_ControllerBase_Bootstrap\\:\\:getCampaigns\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/WidgetsTest.php
+			path: engine/Shopware/Plugins/Default/Core/ControllerBase/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\WidgetsTest\\:\\:prepareTestGetVisitors\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_ControllerBase_Bootstrap\\:\\:getCategories\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/WidgetsTest.php
+			path: engine/Shopware/Plugins/Default/Core/ControllerBase/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\WidgetsTest\\:\\:prepareTestGetVisitors\\(\\) has parameter \\$addressData with no type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_ControllerBase_Bootstrap\\:\\:getMenu\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/WidgetsTest.php
+			path: engine/Shopware/Plugins/Default/Core/ControllerBase/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\WidgetsTest\\:\\:testConversionIsCalucatedFromBeginningOfDay\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_ControllerBase_Bootstrap\\:\\:onPostDispatch\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/WidgetsTest.php
+			path: engine/Shopware/Plugins/Default/Core/ControllerBase/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\WidgetsTest\\:\\:testConversionIsEmpty\\(\\) has no return type specified\\.$#"
+			message: "#^Call to an undefined method Enlight_Controller_Response_Response\\:\\:setStatusCode\\(\\)\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/WidgetsTest.php
+			path: engine/Shopware/Plugins/Default/Core/Cron/Cron.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\WidgetsTest\\:\\:testConversionStillWorks\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Backend_Cron\\:\\:indexAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/WidgetsTest.php
+			path: engine/Shopware/Plugins/Default/Core/Cron/Cron.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\WidgetsTest\\:\\:testGetVisitorsWithCompanyAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Backend_Cron\\:\\:init\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/WidgetsTest.php
+			path: engine/Shopware/Plugins/Default/Core/Cron/Cron.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\WidgetsTest\\:\\:testGetVisitorsWithEmptyCompanyAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_CronBirthday_Bootstrap\\:\\:onRun\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/WidgetsTest.php
+			path: engine/Shopware/Plugins/Default/Core/CronBirthday/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\WidgetsTest\\:\\:testGetVisitorsWithoutCompanyAction\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_CronProductExport_Bootstrap\\:\\:exportProductFiles\\(\\) should return string but returns true\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/WidgetsTest.php
+			path: engine/Shopware/Plugins/Default/Core/CronProductExport/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\WidgetsTest\\:\\:testIfNoConversionAfterEightDays\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_CronProductExport_Bootstrap\\:\\:onRun\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Backend/WidgetsTest.php
+			path: engine/Shopware/Plugins/Default/Core/CronProductExport/Bootstrap.php
 
 		-
-			message: "#^Access to an undefined property Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\BlogTest\\:\\:\\$connection\\.$#"
-			count: 3
-			path: tests/Functional/Controllers/Frontend/BlogTest.php
+			message: "#^Parameter \\#1 \\$handleResource of method sExport\\:\\:executeExport\\(\\) expects resource, resource\\|false given\\.$#"
+			count: 1
+			path: engine/Shopware/Plugins/Default/Core/CronProductExport/Bootstrap.php
 
 		-
-			message: "#^Cannot call method getCode\\(\\) on Exception\\|null\\.$#"
-			count: 2
-			path: tests/Functional/Controllers/Frontend/BlogTest.php
+			message: "#^Method Shopware_Plugins_Core_CronRating_Bootstrap\\:\\:getCustomers\\(\\) return type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Plugins/Default/Core/CronRating/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\BlogTest\\:\\:invalidCategoryUrlDataProvider\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_CronRating_Bootstrap\\:\\:getOrders\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Frontend/BlogTest.php
+			path: engine/Shopware/Plugins/Default/Core/CronRating/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\BlogTest\\:\\:testDispatchInactiveCategory\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_CronRating_Bootstrap\\:\\:getPositionImages\\(\\) has parameter \\$shopPositions with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Frontend/BlogTest.php
+			path: engine/Shopware/Plugins/Default/Core/CronRating/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\BlogTest\\:\\:testDispatchNoActiveBlogItem\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_CronRating_Bootstrap\\:\\:getPositionImages\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Frontend/BlogTest.php
+			path: engine/Shopware/Plugins/Default/Core/CronRating/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\BlogTest\\:\\:testDispatchNonBlogCategory\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_CronRating_Bootstrap\\:\\:getPositions\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Frontend/BlogTest.php
+			path: engine/Shopware/Plugins/Default/Core/CronRating/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\BlogTest\\:\\:testDispatchNotExistingBlogCategory\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_CronRating_Bootstrap\\:\\:structurePositionsArray\\(\\) has parameter \\$orderPositions with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Frontend/BlogTest.php
+			path: engine/Shopware/Plugins/Default/Core/CronRating/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\BlogTest\\:\\:testDispatchNotExistingBlogItem\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_CronStock_Bootstrap\\:\\:onRun\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Frontend/BlogTest.php
+			path: engine/Shopware/Plugins/Default/Core/CronStock/Bootstrap.php
 
 		-
-			message: "#^Access to an undefined property Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\DetailTest\\:\\:\\$connection\\.$#"
+			message: "#^Method Shopware_Plugins_Core_ErrorHandler_Bootstrap\\:\\:errorHandler\\(\\) should return bool but empty return statement found\\.$#"
 			count: 2
-			path: tests/Functional/Controllers/Frontend/DetailTest.php
+			path: engine/Shopware/Plugins/Default/Core/ErrorHandler/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\DetailTest\\:\\:gtinDataprovider\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_ErrorHandler_Bootstrap\\:\\:getErrorLog\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Frontend/DetailTest.php
+			path: engine/Shopware/Plugins/Default/Core/ErrorHandler/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\DetailTest\\:\\:testDefaultVariant\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_ErrorHandler_Bootstrap\\:\\:onDispatchLoopShutdown\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Frontend/DetailTest.php
+			path: engine/Shopware/Plugins/Default/Core/ErrorHandler/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\DetailTest\\:\\:testGtins\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_ErrorHandler_Bootstrap\\:\\:onStartDispatch\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Frontend/DetailTest.php
+			path: engine/Shopware/Plugins/Default/Core/ErrorHandler/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\DetailTest\\:\\:testNonDefaultVariant\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware_Plugins_Core_ErrorHandler_Bootstrap\\:\\:\\$_errorLevelList type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Frontend/DetailTest.php
+			path: engine/Shopware/Plugins/Default/Core/ErrorHandler/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\DetailTest\\:\\:testProductQuickView\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware_Plugins_Core_ErrorHandler_Bootstrap\\:\\:\\$_errorList type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Frontend/DetailTest.php
+			path: engine/Shopware/Plugins/Default/Core/ErrorHandler/Bootstrap.php
 
 		-
-			message: "#^Parameter \\#2 \\$haystack of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringContainsString\\(\\) expects string, array\\|string\\|null given\\.$#"
-			count: 2
-			path: tests/Functional/Controllers/Frontend/DetailTest.php
+			message: "#^Property Shopware_Plugins_Core_ErrorHandler_Bootstrap\\:\\:\\$_errorLog \\(array\\) does not accept bool\\.$#"
+			count: 1
+			path: engine/Shopware/Plugins/Default/Core/ErrorHandler/Bootstrap.php
 
 		-
-			message: "#^Parameter \\#2 \\$haystack of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringNotContainsString\\(\\) expects string, array\\|string\\|null given\\.$#"
+			message: "#^Property Shopware_Plugins_Core_ErrorHandler_Bootstrap\\:\\:\\$_errorLog \\(array\\) does not accept default value of type false\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Frontend/DetailTest.php
+			path: engine/Shopware/Plugins/Default/Core/ErrorHandler/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\SearchTest\\:\\:searchTermProvider\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware_Plugins_Core_ErrorHandler_Bootstrap\\:\\:\\$_errorLog type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Frontend/SearchTest.php
+			path: engine/Shopware/Plugins/Default/Core/ErrorHandler/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\SearchTest\\:\\:testAjaxSearch\\(\\) has no return type specified\\.$#"
+			message: "#^Static property Shopware_Plugins_Core_ErrorHandler_Bootstrap\\:\\:\\$_origErrorHandler \\(callable\\(\\)\\: mixed\\) does not accept \\(callable\\(\\)\\: mixed\\)\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Frontend/SearchTest.php
+			path: engine/Shopware/Plugins/Default/Core/ErrorHandler/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\SearchTest\\:\\:testSearchEscapes\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:enableControllerCache\\(\\) has parameter \\$cacheIds with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Frontend/SearchTest.php
+			path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
 
 		-
-			message: "#^Parameter \\#1 \\$needle of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringContainsString\\(\\) expects string, string\\|null given\\.$#"
+			message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:getInfo\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Frontend/SearchTest.php
+			path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
 
 		-
-			message: "#^Parameter \\#2 \\$haystack of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringContainsString\\(\\) expects string, string\\|null given\\.$#"
+			message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:renderEsiTag\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Frontend/SearchTest.php
+			path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
 
 		-
-			message: "#^Parameter \\#2 \\$haystack of static method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\SearchTest\\:\\:assertStringContainsStringIgnoringWhitespace\\(\\) expects string, array\\|string\\|null given\\.$#"
-			count: 3
-			path: tests/Functional/Controllers/Frontend/SearchTest.php
+			message: "#^Method Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:setCacheIdHeader\\(\\) has parameter \\$cacheIds with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\SitemapTest\\:\\:sitemapDataprovider\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Negated boolean expression is always true\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Frontend/SitemapTest.php
+			path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\SitemapTest\\:\\:testIndex\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#4 \\$active of method Shopware_Components_Plugin_Bootstrap\\:\\:createCronJob\\(\\) expects int, true given\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Frontend/SitemapTest.php
+			path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\SitemapTest\\:\\:testIndex\\(\\) has parameter \\$sitemapData with no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware_Plugins_Core_HttpCache_Bootstrap\\:\\:\\$cacheInvalidationBuffer type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Frontend/SitemapTest.php
+			path: engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
 
 		-
-			message: "#^Parameter \\#1 \\$shop of method Shopware\\\\Components\\\\ShopRegistrationService\\:\\:registerShop\\(\\) expects Shopware\\\\Models\\\\Shop\\\\Shop, Shopware\\\\Models\\\\Shop\\\\Shop\\|null given\\.$#"
+			message: "#^Cannot access offset 'elements' on Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Frontend/SitemapTest.php
+			path: engine/Shopware/Plugins/Default/Core/HttpCache/CacheIdCollector.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\SitemapXmlTest\\:\\:testIndex\\(\\) has no return type specified\\.$#"
+			message: "#^Cannot access offset 'id' on Shopware\\\\Bundle\\\\EmotionBundle\\\\Struct\\\\Emotion\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Frontend/SitemapXmlTest.php
+			path: engine/Shopware/Plugins/Default/Core/HttpCache/CacheIdCollector.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Widgets\\\\IndexTest\\:\\:testShopMenu\\(\\) has no return type specified\\.$#"
+			message: "#^Method ShopwarePlugins\\\\HttpCache\\\\CacheIdCollector\\:\\:getAjaxListingCacheIds\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Controllers/Widgets/IndexTest.php
+			path: engine/Shopware/Plugins/Default/Core/HttpCache/CacheIdCollector.php
 
 		-
-			message: "#^Cannot call method format\\(\\) on DateTimeInterface\\|null\\.$#"
-			count: 2
-			path: tests/Functional/Core/AdminTest.php
+			message: "#^Method ShopwarePlugins\\\\HttpCache\\\\CacheIdCollector\\:\\:getBlogCacheIds\\(\\) return type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Plugins/Default/Core/HttpCache/CacheIdCollector.php
 
 		-
-			message: "#^Cannot call method getKey\\(\\) on Shopware\\\\Models\\\\Customer\\\\Group\\|null\\.$#"
+			message: "#^Method ShopwarePlugins\\\\HttpCache\\\\CacheIdCollector\\:\\:getCacheIdsFromController\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Core/AdminTest.php
+			path: engine/Shopware/Plugins/Default/Core/HttpCache/CacheIdCollector.php
 
 		-
-			message: "#^Cannot call method getParams\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
+			message: "#^Method ShopwarePlugins\\\\HttpCache\\\\CacheIdCollector\\:\\:getControllerRoute\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Core/AdminTest.php
+			path: engine/Shopware/Plugins/Default/Core/HttpCache/CacheIdCollector.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Core\\\\AdminTest\\:\\:dataProviderDataCustomerAttributeIsNot\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method ShopwarePlugins\\\\HttpCache\\\\CacheIdCollector\\:\\:getDetailCacheIds\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Core/AdminTest.php
+			path: engine/Shopware/Plugins/Default/Core/HttpCache/CacheIdCollector.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Core\\\\AdminTest\\:\\:testCustomerAttributeIsNot\\(\\) has parameter \\$userData with no value type specified in iterable type array\\.$#"
+			message: "#^Method ShopwarePlugins\\\\HttpCache\\\\CacheIdCollector\\:\\:getEmotionCacheIds\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Core/AdminTest.php
+			path: engine/Shopware/Plugins/Default/Core/HttpCache/CacheIdCollector.php
 
 		-
-			message: "#^Parameter \\#1 \\$basket of method sAdmin\\:\\:sGetPremiumDispatchSurcharge\\(\\) expects array, array\\|false given\\.$#"
+			message: "#^Method ShopwarePlugins\\\\HttpCache\\\\CacheIdCollector\\:\\:getFormsCacheIds\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Core/AdminTest.php
+			path: engine/Shopware/Plugins/Default/Core/HttpCache/CacheIdCollector.php
 
 		-
-			message: "#^Parameter \\#1 \\$basket of method sAdmin\\:\\:sGetPremiumDispatchSurcharge\\(\\) expects array, null given\\.$#"
+			message: "#^Method ShopwarePlugins\\\\HttpCache\\\\CacheIdCollector\\:\\:getHomePageCacheIds\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Core/AdminTest.php
+			path: engine/Shopware/Plugins/Default/Core/HttpCache/CacheIdCollector.php
 
 		-
-			message: "#^Parameter \\#1 \\$id of method sAdmin\\:\\:sGetUserNameById\\(\\) expects int, string given\\.$#"
+			message: "#^Method ShopwarePlugins\\\\HttpCache\\\\CacheIdCollector\\:\\:getListingCacheIds\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Core/AdminTest.php
+			path: engine/Shopware/Plugins/Default/Core/HttpCache/CacheIdCollector.php
 
 		-
-			message: "#^Parameter \\#1 \\$payment of method sAdmin\\:\\:sGetPaymentMean\\(\\) expects int\\|string, string\\|false\\|null given\\.$#"
+			message: "#^Method ShopwarePlugins\\\\HttpCache\\\\CacheIdCollector\\:\\:getRecommendationCacheIds\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Core/AdminTest.php
+			path: engine/Shopware/Plugins/Default/Core/HttpCache/CacheIdCollector.php
 
 		-
-			message: "#^Parameter \\#3 \\$user of method sAdmin\\:\\:sManageRisks\\(\\) expects array, array\\|false given\\.$#"
-			count: 40
-			path: tests/Functional/Core/AdminTest.php
+			message: "#^Method ShopwarePlugins\\\\HttpCache\\\\CacheIdCollector\\:\\:getStaticSiteCacheIds\\(\\) return type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: engine/Shopware/Plugins/Default/Core/HttpCache/CacheIdCollector.php
 
 		-
-			message: "#^Property sSystem\\:\\:\\$sSESSION_ID \\(string\\) does not accept null\\.$#"
+			message: "#^Call to an undefined method Enlight_Event_EventArgs\\:\\:getArticle\\(\\)\\.$#"
 			count: 1
-			path: tests/Functional/Core/AdminTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
 
 		-
-			message: "#^Variable \\$germany might not be defined\\.$#"
+			message: "#^Call to an undefined method Enlight_Event_EventArgs\\:\\:getDetails\\(\\)\\.$#"
 			count: 2
-			path: tests/Functional/Core/AdminTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Core\\\\BasketTest\\:\\:invokeMethod\\(\\) has parameter \\$parameters with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: tests/Functional/Core/BasketTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Core\\\\OrderTest\\:\\:getRandomUser\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Call to an undefined method Enlight_Event_EventArgs\\:\\:getEntity\\(\\)\\.$#"
 			count: 1
-			path: tests/Functional/Core/OrderTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
 
 		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Category\\\\Category\\|null\\.$#"
+			message: "#^Method Shopware_Plugins_Core_MarketingAggregate_Bootstrap\\:\\:addNewAlsoBought\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Core/sArticlesTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
 
 		-
-			message: "#^Method sArticlesTest\\:\\:assertsArticlesState\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_MarketingAggregate_Bootstrap\\:\\:afterSendResponseOnTopSeller\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Core/sArticlesTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
 
 		-
-			message: "#^Method sArticlesTest\\:\\:assertsArticlesState\\(\\) has parameter \\$categoryId with no type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_MarketingAggregate_Bootstrap\\:\\:afterSimilarShownArticlesReset\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Core/sArticlesTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
 
 		-
-			message: "#^Method sArticlesTest\\:\\:assertsArticlesState\\(\\) has parameter \\$customerGroupId with no type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_MarketingAggregate_Bootstrap\\:\\:afterTopSellerSelected\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Core/sArticlesTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
 
 		-
-			message: "#^Method sArticlesTest\\:\\:assertsArticlesState\\(\\) has parameter \\$sArticles with no type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_MarketingAggregate_Bootstrap\\:\\:beforeSetLastArticle\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Core/sArticlesTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
 
 		-
-			message: "#^Method sArticlesTest\\:\\:assertsArticlesState\\(\\) has parameter \\$translationId with no type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_MarketingAggregate_Bootstrap\\:\\:getInfo\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Core/sArticlesTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
 
 		-
-			message: "#^Method sArticlesTest\\:\\:testCanInjectParameters\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_MarketingAggregate_Bootstrap\\:\\:incrementTopSeller\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Core/sArticlesTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
 
 		-
-			message: "#^Method sArticlesTest\\:\\:testCanInstanciatesArticles\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_MarketingAggregate_Bootstrap\\:\\:isSimilarShownActivated\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Core/sArticlesTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
 
 		-
-			message: "#^Method sArticlesTest\\:\\:testPriceGroupForMainVariant\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_MarketingAggregate_Bootstrap\\:\\:isTopSellerActivated\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Core/sArticlesTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
 
 		-
-			message: "#^Method sArticlesTest\\:\\:testsGetPromotionByIdWithNonExistingArticle\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_MarketingAggregate_Bootstrap\\:\\:refreshArticle\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Core/sArticlesTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
 
 		-
-			message: "#^Method sArticlesTest\\:\\:testsRoundWithFloatingPointRepresentation\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_MarketingAggregate_Bootstrap\\:\\:refreshTopSeller\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Core/sArticlesTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
 
 		-
-			message: "#^Method sArticlesTest\\:\\:testsRoundWithFloatingPointRepresentationLarge\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_MarketingAggregate_Bootstrap\\:\\:subscribeAlsoBoughtEvents\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Core/sArticlesTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
 
 		-
-			message: "#^Method sArticlesTest\\:\\:testsRoundWithFloatingPointRepresentationNegative\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_MarketingAggregate_Bootstrap\\:\\:subscribeSimilarShownEvents\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Core/sArticlesTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
 
 		-
-			message: "#^Method sCategoriesTest\\:\\:getCategoryById\\(\\) has parameter \\$allCategories with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware_Plugins_Core_MarketingAggregate_Bootstrap\\:\\:subscribeTopSellerEvents\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Core/sCategoriesTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
 
 		-
-			message: "#^Method sCategoriesTest\\:\\:getCategoryById\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: tests/Functional/Core/sCategoriesTest.php
+			message: "#^Parameter \\#4 \\$active of method Shopware_Components_Plugin_Bootstrap\\:\\:createCronJob\\(\\) expects int, true given\\.$#"
+			count: 2
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
 
 		-
-			message: "#^Method sCategoriesTest\\:\\:testGetCategoriesWithShopCategory\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Components_AlsoBought\\:\\:initAlsoBought\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Core/sCategoriesTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/AlsoBought.php
 
 		-
-			message: "#^Method sCategoriesTest\\:\\:testGetCategoriesWithSubcategory\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Components_AlsoBought\\:\\:refreshBoughtArticles\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Core/sCategoriesTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/AlsoBought.php
 
 		-
-			message: "#^Method sCategoriesTest\\:\\:testGetWholeCategoryTree\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Components_AlsoBought\\:\\:refreshMultipleBoughtArticles\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Core/sCategoriesTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/AlsoBought.php
 
 		-
-			message: "#^Method sCategoriesTest\\:\\:testsGetCategoriesByParent\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Components_AlsoBought\\:\\:refreshMultipleBoughtArticles\\(\\) has parameter \\$combinations with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Core/sCategoriesTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/AlsoBought.php
 
 		-
-			message: "#^Method sCategoriesTest\\:\\:testsGetCategoryContent\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Components_SimilarShown\\:\\:initSimilarShown\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Core/sCategoriesTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/SimilarShown.php
 
 		-
-			message: "#^Method sCategoriesTest\\:\\:testsGetCategoryIdByArticleId\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Components_SimilarShown\\:\\:refreshSimilarShown\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Core/sCategoriesTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/SimilarShown.php
 
 		-
-			message: "#^Method sCategoriesTest\\:\\:testsGetCategoryPath\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Components_SimilarShown\\:\\:resetSimilarShown\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Core/sCategoriesTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/SimilarShown.php
 
 		-
-			message: "#^Method sCategoriesTest\\:\\:testsGetWholeCategoryTree\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Components_SimilarShown\\:\\:updateElapsedSimilarShownArticles\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Core/sCategoriesTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/SimilarShown.php
 
 		-
-			message: "#^Method sCategoriesTest\\:\\:validateCategory\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Components_TopSeller\\:\\:incrementTopSeller\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Core/sCategoriesTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/TopSeller.php
 
 		-
-			message: "#^Method sCategoriesTest\\:\\:validateCategory\\(\\) has parameter \\$categoryArray with no type specified\\.$#"
+			message: "#^Method Shopware_Components_TopSeller\\:\\:initTopSeller\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Core/sCategoriesTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/TopSeller.php
 
 		-
-			message: "#^Method sCategoriesTest\\:\\:validateCategory\\(\\) has parameter \\$subcategoriesIndex with no type specified\\.$#"
+			message: "#^Method Shopware_Components_TopSeller\\:\\:refreshTopSellerForArticleId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Core/sCategoriesTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/TopSeller.php
 
 		-
-			message: "#^Parameter \\#1 \\$id of method sCategories\\:\\:sGetCategoryContent\\(\\) expects int, null given\\.$#"
+			message: "#^Method Shopware_Components_TopSeller\\:\\:updateElapsedTopSeller\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Core/sCategoriesTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/TopSeller.php
 
 		-
-			message: "#^Parameter \\#1 \\$parentId of method sCategories\\:\\:sGetWholeCategoryTree\\(\\) expects int\\|null, string\\|false\\|null given\\.$#"
+			message: "#^Query expects placeholder \\:article_id, but it is missing from values given\\.$#"
 			count: 1
-			path: tests/Functional/Core/sCategoriesTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/TopSeller.php
 
 		-
-			message: "#^Parameter \\#2 \\$array of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertArrayHasKey\\(\\) expects array\\|ArrayAccess, array\\|null given\\.$#"
+			message: "#^Query expects placeholder \\:last_cleared, but it is missing from values given\\.$#"
 			count: 1
-			path: tests/Functional/Core/sCategoriesTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/TopSeller.php
 
 		-
-			message: "#^Method sCmsTest\\:\\:testsGetStaticPage\\(\\) has no return type specified\\.$#"
+			message: "#^Query expects placeholder \\:sales, but it is missing from values given\\.$#"
 			count: 1
-			path: tests/Functional/Core/sCmsTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/TopSeller.php
 
 		-
-			message: "#^Parameter \\#2 \\$array of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertArrayHasKey\\(\\) expects array\\|ArrayAccess, array\\|false given\\.$#"
+			message: "#^Method Shopware_Controllers_Backend_AlsoBought\\:\\:getAlsoBoughtCountAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Core/sCmsTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Controllers/AlsoBought.php
 
 		-
-			message: "#^Method sCoreTest\\:\\:testsBuildLink\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Backend_AlsoBought\\:\\:initAlsoBoughtAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Core/sCoreTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Controllers/AlsoBought.php
 
 		-
-			message: "#^Method sCoreTest\\:\\:testsRewriteLink\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Backend_SimilarShown\\:\\:getSimilarShownCountAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Core/sCoreTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Controllers/SimilarShown.php
 
 		-
-			message: "#^Method sRewriteTest\\:\\:provider\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Backend_SimilarShown\\:\\:initSimilarShownAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Core/sRewriteTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Controllers/SimilarShown.php
 
 		-
-			message: "#^Method sRewriteTest\\:\\:testRewriteString\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Backend_TopSeller\\:\\:getTopSellerCountAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Core/sRewriteTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Controllers/TopSeller.php
 
 		-
-			message: "#^Method sRewriteTest\\:\\:testRewriteString\\(\\) has parameter \\$result with no type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Backend_TopSeller\\:\\:initTopSellerAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Core/sRewriteTest.php
+			path: engine/Shopware/Plugins/Default/Core/MarketingAggregate/Controllers/TopSeller.php
 
 		-
-			message: "#^Method sRewriteTest\\:\\:testRewriteString\\(\\) has parameter \\$string with no type specified\\.$#"
-			count: 1
-			path: tests/Functional/Core/sRewriteTest.php
+			message: "#^Call to an undefined method Enlight_Event_EventArgs\\:\\:getRequest\\(\\)\\.$#"
+			count: 2
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Library\\\\ZendLocaleTest\\:\\:getLocales\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: tests/Functional/Library/ZendLocaleTest.php
+			message: "#^Call to an undefined method Enlight_Event_EventArgs\\:\\:getSubject\\(\\)\\.$#"
+			count: 2
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Library\\\\ZendLocaleTest\\:\\:testLocalCreation\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_PaymentMethods_Bootstrap\\:\\:addPaymentClass\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Library/ZendLocaleTest.php
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Bootstrap.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Models\\\\Category\\\\BlogCategoryTreeListQueryTest\\:\\:\\$expected type has no value type specified in iterable type array\\.$#"
+			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\BasePaymentMethod\\:\\:getCurrentPaymentDataAsArray\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Models/Category/BlogCategoryTreeListQueryTest.php
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/BasePaymentMethod.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Models\\\\Category\\\\PathByIdTest\\:\\:multiArrayProvider\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\BasePaymentMethod\\:\\:savePaymentData\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Models/Category/PathByIdTest.php
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/BasePaymentMethod.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Models\\\\Category\\\\PathByIdTest\\:\\:testGetPathByIdShouldReturnArray\\(\\) has parameter \\$expectedResult with no value type specified in iterable type array\\.$#"
+			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\BasePaymentMethod\\:\\:validate\\(\\) has parameter \\$paymentData with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Models/Category/PathByIdTest.php
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/BasePaymentMethod.php
 
 		-
-			message: "#^Parameter \\#1 \\$displayStateInRegistration of method Shopware\\\\Models\\\\Country\\\\Country\\:\\:setDisplayStateInRegistration\\(\\) expects bool, int given\\.$#"
+			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\BasePaymentMethod\\:\\:validate\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Models/Customer/CustomerTest.php
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/BasePaymentMethod.php
 
 		-
-			message: "#^Parameter \\#1 \\$forceStateInRegistration of method Shopware\\\\Models\\\\Country\\\\Country\\:\\:setForceStateInRegistration\\(\\) expects bool, int given\\.$#"
+			message: "#^Cannot call method getCity\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Models/Customer/CustomerTest.php
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/DebitPaymentMethod.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Models\\\\CustomerStream\\\\CustomerStreamRepositoryTest\\:\\:getCampaignsEntryData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Cannot call method getDefaultBillingAddress\\(\\) on Shopware\\\\Models\\\\Customer\\\\Customer\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Models/CustomerStream/CustomerStreamRepositoryTest.php
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/DebitPaymentMethod.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Models\\\\CustomerStream\\\\CustomerStreamRepositoryTest\\:\\:getCustomerData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Cannot call method getFirstname\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Models/CustomerStream/CustomerStreamRepositoryTest.php
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/DebitPaymentMethod.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Models\\\\CustomerStream\\\\CustomerStreamRepositoryTest\\:\\:getCustomerStreamData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Cannot call method getLastname\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Models/CustomerStream/CustomerStreamRepositoryTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$status of method Shopware\\\\Models\\\\Mail\\\\Mail\\:\\:setStatus\\(\\) expects array\\<Shopware\\\\Models\\\\Order\\\\Status\\>\\|null, PHPUnit\\\\Framework\\\\MockObject\\\\MockObject&Shopware\\\\Models\\\\Order\\\\Status given\\.$#"
-			count: 3
-			path: tests/Functional/Models/MailTest.php
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/DebitPaymentMethod.php
 
 		-
-			message: "#^Cannot call method getStreet\\(\\) on Shopware\\\\Models\\\\Order\\\\Billing\\|null\\.$#"
+			message: "#^Cannot call method getStreet\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Models/Order/BillingTest.php
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/DebitPaymentMethod.php
 
 		-
-			message: "#^Cannot call method getZipCode\\(\\) on Shopware\\\\Models\\\\Order\\\\Billing\\|null\\.$#"
+			message: "#^Cannot call method getZipcode\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Models/Order/BillingTest.php
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/DebitPaymentMethod.php
 
 		-
-			message: "#^Cannot call method setStreet\\(\\) on Shopware\\\\Models\\\\Order\\\\Billing\\|null\\.$#"
+			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\DebitPaymentMethod\\:\\:getCurrentPaymentDataAsArray\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Models/Order/BillingTest.php
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/DebitPaymentMethod.php
 
 		-
-			message: "#^Cannot call method setZipCode\\(\\) on Shopware\\\\Models\\\\Order\\\\Billing\\|null\\.$#"
+			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\DebitPaymentMethod\\:\\:savePaymentData\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Models/Order/BillingTest.php
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/DebitPaymentMethod.php
 
 		-
-			message: "#^Parameter \\#1 \\$entity of method Doctrine\\\\ORM\\\\EntityManager\\:\\:persist\\(\\) expects object, Shopware\\\\Models\\\\Order\\\\Billing\\|null given\\.$#"
+			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\DebitPaymentMethod\\:\\:validate\\(\\) has parameter \\$paymentData with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Models/Order/BillingTest.php
-
-		-
-			message: "#^Cannot call method setActive\\(\\) on Shopware\\\\Models\\\\Shop\\\\Shop\\|null\\.$#"
-			count: 2
-			path: tests/Functional/Models/Order/OrderDocumentDocumentTest.php
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/DebitPaymentMethod.php
 
 		-
-			message: "#^Variable \\$document might not be defined\\.$#"
+			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\DebitPaymentMethod\\:\\:validate\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Models/Order/OrderDocumentDocumentTest.php
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/DebitPaymentMethod.php
 
 		-
-			message: "#^Parameter \\#1 \\$dispatch of method Shopware\\\\Models\\\\Order\\\\Order\\:\\:setDispatch\\(\\) expects Shopware\\\\Models\\\\Dispatch\\\\Dispatch, Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\|null given\\.$#"
+			message: "#^Cannot call method getCity\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Models/Order/OrderTest.php
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/GenericPaymentMethod.php
 
 		-
-			message: "#^Parameter \\#1 \\$net of method Shopware\\\\Models\\\\Order\\\\Order\\:\\:setNet\\(\\) expects int, true given\\.$#"
+			message: "#^Cannot call method getDefaultBillingAddress\\(\\) on Shopware\\\\Models\\\\Customer\\\\Customer\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Models/Order/OrderTest.php
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/GenericPaymentMethod.php
 
 		-
-			message: "#^Parameter \\#1 \\$orderStatus of method Shopware\\\\Models\\\\Order\\\\Order\\:\\:setOrderStatus\\(\\) expects Shopware\\\\Models\\\\Order\\\\Status, Shopware\\\\Models\\\\Order\\\\Status\\|null given\\.$#"
+			message: "#^Cannot call method getFirstname\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Models/Order/OrderTest.php
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/GenericPaymentMethod.php
 
 		-
-			message: "#^Parameter \\#1 \\$payment of method Shopware\\\\Models\\\\Order\\\\Order\\:\\:setPayment\\(\\) expects Shopware\\\\Models\\\\Payment\\\\Payment, Shopware\\\\Models\\\\Payment\\\\Payment\\|null given\\.$#"
+			message: "#^Cannot call method getLastname\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Models/Order/OrderTest.php
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/GenericPaymentMethod.php
 
 		-
-			message: "#^Parameter \\#1 \\$paymentStatus of method Shopware\\\\Models\\\\Order\\\\Order\\:\\:setPaymentStatus\\(\\) expects Shopware\\\\Models\\\\Order\\\\Status, Shopware\\\\Models\\\\Order\\\\Status\\|null given\\.$#"
+			message: "#^Cannot call method getStreet\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Models/Order/OrderTest.php
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/GenericPaymentMethod.php
 
 		-
-			message: "#^Parameter \\#1 \\$shop of method Shopware\\\\Models\\\\Order\\\\Order\\:\\:setShop\\(\\) expects Shopware\\\\Models\\\\Shop\\\\Shop, Shopware\\\\Models\\\\Shop\\\\Shop\\|null given\\.$#"
+			message: "#^Cannot call method getZipcode\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Models/Order/OrderTest.php
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/GenericPaymentMethod.php
 
 		-
-			message: "#^Parameter \\#1 \\$taxFree of method Shopware\\\\Models\\\\Order\\\\Order\\:\\:setTaxFree\\(\\) expects int, false given\\.$#"
+			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\GenericPaymentMethod\\:\\:getCurrentPaymentDataAsArray\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Models/Order/OrderTest.php
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/GenericPaymentMethod.php
 
 		-
-			message: "#^Cannot call method getStreet\\(\\) on Shopware\\\\Models\\\\Order\\\\Shipping\\|null\\.$#"
+			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\GenericPaymentMethod\\:\\:savePaymentData\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Models/Order/ShippingTest.php
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/GenericPaymentMethod.php
 
 		-
-			message: "#^Cannot call method getZipCode\\(\\) on Shopware\\\\Models\\\\Order\\\\Shipping\\|null\\.$#"
+			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\GenericPaymentMethod\\:\\:validate\\(\\) has parameter \\$paymentData with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Models/Order/ShippingTest.php
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/GenericPaymentMethod.php
 
 		-
-			message: "#^Cannot call method setStreet\\(\\) on Shopware\\\\Models\\\\Order\\\\Shipping\\|null\\.$#"
+			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\GenericPaymentMethod\\:\\:validate\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Models/Order/ShippingTest.php
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/GenericPaymentMethod.php
 
 		-
-			message: "#^Cannot call method setZipCode\\(\\) on Shopware\\\\Models\\\\Order\\\\Shipping\\|null\\.$#"
+			message: "#^Cannot call method getCity\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Models/Order/ShippingTest.php
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php
 
 		-
-			message: "#^Parameter \\#1 \\$entity of method Doctrine\\\\ORM\\\\EntityManager\\:\\:persist\\(\\) expects object, Shopware\\\\Models\\\\Order\\\\Shipping\\|null given\\.$#"
+			message: "#^Cannot call method getDefaultBillingAddress\\(\\) on Shopware\\\\Models\\\\Customer\\\\Customer\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Models/Order/ShippingTest.php
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php
 
 		-
-			message: "#^Method RemoveAndCreateResourceTest\\:\\:testRemoveAndCreateAresource\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Functional/Modules/Acl/RemoveAndCreateResourceTest.php
+			message: "#^Cannot call method getFirstname\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
+			count: 2
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Articles\\\\SeoCategoryTest\\:\\:getSimpleTestData\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: tests/Functional/Modules/Articles/SeoCategoryTest.php
+			message: "#^Cannot call method getLastname\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
+			count: 2
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Articles\\\\sGetArticleByIdTest\\:\\:assertArticleData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Cannot call method getStreet\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Modules/Articles/sGetArticleByIdTest.php
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Articles\\\\sGetArticleByIdTest\\:\\:assertArticleData\\(\\) has parameter \\$expected with no value type specified in iterable type array\\.$#"
+			message: "#^Cannot call method getZipcode\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Modules/Articles/sGetArticleByIdTest.php
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Articles\\\\sGetArticleByIdTest\\:\\:assertLinks\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\SepaPaymentMethod\\:\\:getCurrentPaymentDataAsArray\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Modules/Articles/sGetArticleByIdTest.php
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Articles\\\\sGetArticleByIdTest\\:\\:assertLinks\\(\\) has parameter \\$expected with no value type specified in iterable type array\\.$#"
+			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\SepaPaymentMethod\\:\\:savePaymentData\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Modules/Articles/sGetArticleByIdTest.php
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Articles\\\\sGetArticleByIdTest\\:\\:assertRelated\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\SepaPaymentMethod\\:\\:validate\\(\\) has parameter \\$paymentData with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Modules/Articles/sGetArticleByIdTest.php
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Articles\\\\sGetArticleByIdTest\\:\\:assertRelated\\(\\) has parameter \\$expected with no value type specified in iterable type array\\.$#"
+			message: "#^Method ShopwarePlugin\\\\PaymentMethods\\\\Components\\\\SepaPaymentMethod\\:\\:validate\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Modules/Articles/sGetArticleByIdTest.php
+			path: engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Articles\\\\sGetArticleByIdTest\\:\\:\\$articleProperties type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: tests/Functional/Modules/Articles/sGetArticleByIdTest.php
+			message: "#^Call to an undefined method Enlight_Event_EventArgs\\:\\:getSubject\\(\\)\\.$#"
+			count: 2
+			path: engine/Shopware/Plugins/Default/Core/PostFilter/Bootstrap.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Articles\\\\sGetArticleByIdTest\\:\\:\\$articles type has no value type specified in iterable type array\\.$#"
+			message: "#^Cannot call method getBasePath\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Modules/Articles/sGetArticleByIdTest.php
+			path: engine/Shopware/Plugins/Default/Core/PostFilter/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Category\\\\sGetCategoriesTest\\:\\:assertAndGetSubCategories\\(\\) has no return type specified\\.$#"
+			message: "#^Cannot call method getHttpHost\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Modules/Category/sGetCategoriesTest.php
+			path: engine/Shopware/Plugins/Default/Core/PostFilter/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Category\\\\sGetCategoriesTest\\:\\:assertAndGetSubCategories\\(\\) has parameter \\$category with no type specified\\.$#"
+			message: "#^Cannot call method getScheme\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Modules/Category/sGetCategoriesTest.php
+			path: engine/Shopware/Plugins/Default/Core/PostFilter/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Category\\\\sGetCategoriesTest\\:\\:assertAndGetSubCategories\\(\\) has parameter \\$expectedIds with no type specified\\.$#"
+			message: "#^Cannot call method isSecure\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Modules/Category/sGetCategoriesTest.php
+			path: engine/Shopware/Plugins/Default/Core/PostFilter/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Category\\\\sGetCategoriesTest\\:\\:testBlockedCustomerGroups\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_PostFilter_Bootstrap\\:\\:initConfig\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Modules/Category/sGetCategoriesTest.php
+			path: engine/Shopware/Plugins/Default/Core/PostFilter/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Category\\\\sGetCategoriesTest\\:\\:testCategoryData\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_PostFilter_Bootstrap\\:\\:onFilterRender\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Modules/Category/sGetCategoriesTest.php
+			path: engine/Shopware/Plugins/Default/Core/PostFilter/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Category\\\\sGetCategoriesTest\\:\\:testOnlyActiveCategories\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_PostFilter_Bootstrap\\:\\:rewriteLink\\(\\) should return string but returns string\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Modules/Category/sGetCategoriesTest.php
+			path: engine/Shopware/Plugins/Default/Core/PostFilter/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Category\\\\sGetCategoriesTest\\:\\:testPositionSorting\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_PostFilter_Bootstrap\\:\\:rewriteSrc\\(\\) has parameter \\$src with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Modules/Category/sGetCategoriesTest.php
+			path: engine/Shopware/Plugins/Default/Core/PostFilter/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Category\\\\sGetCategoriesTest\\:\\:testWithFourthLevel\\(\\) has no return type specified\\.$#"
+			message: "#^Offset 'path' does not exist on string\\.$#"
 			count: 1
-			path: tests/Functional/Modules/Category/sGetCategoriesTest.php
+			path: engine/Shopware/Plugins/Default/Core/PostFilter/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Category\\\\sGetCategoriesTest\\:\\:testWithMainId\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$source of method Shopware_Plugins_Core_PostFilter_Bootstrap\\:\\:filterSource\\(\\) expects string, array\\<string\\>\\|string\\|null given\\.$#"
 			count: 1
-			path: tests/Functional/Modules/Category/sGetCategoriesTest.php
+			path: engine/Shopware/Plugins/Default/Core/PostFilter/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Category\\\\sGetCategoriesTest\\:\\:testWithSecondLevel\\(\\) has no return type specified\\.$#"
+			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Category\\\\Category\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Modules/Category/sGetCategoriesTest.php
+			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Category\\\\sGetCategoriesTest\\:\\:testWithThirdLevel\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_RebuildIndex_Bootstrap\\:\\:getInfo\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Modules/Category/sGetCategoriesTest.php
+			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Bootstrap.php
 
 		-
-			message: "#^Access to an undefined property Enlight_Components_Session_Namespace\\:\\:\\$Admin\\.$#"
+			message: "#^Method Shopware_Plugins_Core_RebuildIndex_Bootstrap\\:\\:onAfterSendResponse\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/HttpCache/BootstrapTest.php
-
-		-
-			message: "#^Call to an undefined method Enlight_Controller_Response_Response\\:\\:getHeader\\(\\)\\.$#"
-			count: 2
-			path: tests/Functional/Plugins/Core/HttpCache/BootstrapTest.php
+			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\BootstrapTest\\:\\:getCookie\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_RebuildIndex_Bootstrap\\:\\:subscribeSearchIndexEvents\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/HttpCache/BootstrapTest.php
+			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\BootstrapTest\\:\\:getCookie\\(\\) has parameter \\$name with no type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Core_RebuildIndex_Bootstrap\\:\\:subscribeSeoIndexEvents\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/HttpCache/BootstrapTest.php
+			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\BootstrapTest\\:\\:getHeader\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Functional/Plugins/Core/HttpCache/BootstrapTest.php
+			message: "#^Parameter \\#4 \\$active of method Shopware_Components_Plugin_Bootstrap\\:\\:createCronJob\\(\\) expects int, true given\\.$#"
+			count: 2
+			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\BootstrapTest\\:\\:getHeader\\(\\) has parameter \\$name with no type specified\\.$#"
+			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Category\\\\Category\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/HttpCache/BootstrapTest.php
+			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Components/SeoIndex.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\BootstrapTest\\:\\:resetHttpCache\\(\\) has parameter \\$overrideConfig with no type specified\\.$#"
+			message: "#^Method Shopware_Components_SeoIndex\\:\\:countArticles\\(\\) should return string but returns int\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/HttpCache/BootstrapTest.php
+			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Components/SeoIndex.php
 
 		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Category\\\\Category\\|null\\.$#"
+			message: "#^Method Shopware_Components_SeoIndex\\:\\:countCategories\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php
+			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Components/SeoIndex.php
 
 		-
-			message: "#^Cannot call method getNumber\\(\\) on Shopware\\\\Models\\\\Article\\\\Detail\\|null\\.$#"
+			message: "#^Method Shopware_Components_SeoIndex\\:\\:getCachedTime\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php
+			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Components/SeoIndex.php
 
 		-
-			message: "#^Cannot call method setCategories\\(\\) on Shopware\\\\Models\\\\Emotion\\\\Emotion\\|null\\.$#"
+			message: "#^Method Shopware_Components_SeoIndex\\:\\:refreshSeoIndex\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php
+			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Components/SeoIndex.php
 
 		-
-			message: "#^Cannot call method setCategoryId\\(\\) on Shopware\\\\Models\\\\Blog\\\\Blog\\|null\\.$#"
+			message: "#^Method Shopware_Components_SeoIndex\\:\\:registerShop\\(\\) should return Shopware\\\\Models\\\\Shop\\\\Shop but returns Shopware\\\\Models\\\\Shop\\\\DetachedShop\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php
+			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Components/SeoIndex.php
 
 		-
-			message: "#^Cannot call method setReleaseDate\\(\\) on Shopware\\\\Models\\\\Article\\\\Detail\\|null\\.$#"
+			message: "#^Method Shopware_Components_SeoIndex\\:\\:setCachedTime\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php
+			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Components/SeoIndex.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\DynamicCacheTimeServiceTest\\:\\:createTestBlog\\(\\) never returns null so it can be removed from the return type\\.$#"
+			message: "#^Parameter \\#1 \\$shop of method Shopware\\\\Components\\\\ShopRegistrationService\\:\\:registerShop\\(\\) expects Shopware\\\\Models\\\\Shop\\\\Shop, Shopware\\\\Models\\\\Shop\\\\DetachedShop\\|null given\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php
+			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Components/SeoIndex.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\DynamicCacheTimeServiceTest\\:\\:createTestCategory\\(\\) never returns null so it can be removed from the return type\\.$#"
+			message: "#^Method Shopware_Controllers_Backend_SearchIndex\\:\\:buildAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php
+			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/SearchIndex.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\DynamicCacheTimeServiceTest\\:\\:createTestEmotion\\(\\) never returns null so it can be removed from the return type\\.$#"
+			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Category\\\\Category\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php
+			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/Seo.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\DynamicCacheTimeServiceTest\\:\\:createTestProduct\\(\\) never returns null so it can be removed from the return type\\.$#"
+			message: "#^Method Shopware_Controllers_Backend_Seo\\:\\:getCountAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php
+			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/Seo.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\DynamicCacheTimeServiceTest\\:\\:getBlogTestData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware_Controllers_Backend_Seo\\:\\:initSeoAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php
+			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/Seo.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\DynamicCacheTimeServiceTest\\:\\:getEmotionTestData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware_Controllers_Backend_Seo\\:\\:seoArticle\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php
+			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/Seo.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\DynamicCacheTimeServiceTest\\:\\:getProductTestData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware_Controllers_Backend_Seo\\:\\:seoArticleAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php
+			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/Seo.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\DynamicCacheTimeServiceTest\\:\\:testBlogListingTimeCalculation\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Backend_Seo\\:\\:seoBlogAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php
+			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/Seo.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\DynamicCacheTimeServiceTest\\:\\:testBlogTimeCalculation\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Backend_Seo\\:\\:seoCategoryAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php
+			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/Seo.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\DynamicCacheTimeServiceTest\\:\\:testCategoryTimeCalculation\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Backend_Seo\\:\\:seoContentAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php
+			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/Seo.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\DynamicCacheTimeServiceTest\\:\\:testProductDetailTimeCalculation\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Backend_Seo\\:\\:seoEmotionAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php
+			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/Seo.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\DynamicCacheTimeServiceTest\\:\\:testServiceIsAvailable\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Controllers_Backend_Seo\\:\\:seoStaticAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php
+			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/Seo.php
 
 		-
-			message: "#^Parameter \\#1 \\$active of method Shopware\\\\Models\\\\Category\\\\Category\\:\\:setActive\\(\\) expects bool, int given\\.$#"
+			message: "#^Method Shopware_Controllers_Backend_Seo\\:\\:seoSupplierAction\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php
+			path: engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/Seo.php
 
 		-
-			message: "#^Parameter \\#1 \\$blog of method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\DynamicCacheTimeServiceTest\\:\\:getBlogListingRequest\\(\\) expects Shopware\\\\Models\\\\Blog\\\\Blog, Shopware\\\\Models\\\\Blog\\\\Blog\\|null given\\.$#"
+			message: "#^Access to an undefined property object\\:\\:\\$role\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php
+			path: engine/Shopware/Plugins/Default/Core/RestApi/Bootstrap.php
 
 		-
-			message: "#^Parameter \\#1 \\$blog of method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\DynamicCacheTimeServiceTest\\:\\:getBlogRequest\\(\\) expects Shopware\\\\Models\\\\Blog\\\\Blog, Shopware\\\\Models\\\\Blog\\\\Blog\\|null given\\.$#"
+			message: "#^Cannot call method getModuleName\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php
+			path: engine/Shopware/Plugins/Default/Core/RestApi/Bootstrap.php
 
 		-
-			message: "#^Parameter \\#1 \\$category of method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\DynamicCacheTimeServiceTest\\:\\:getcategoryRequest\\(\\) expects Shopware\\\\Models\\\\Category\\\\Category, Shopware\\\\Models\\\\Category\\\\Category\\|null given\\.$#"
+			message: "#^Parameter \\#1 \\$request of method ShopwarePlugins\\\\RestApi\\\\Components\\\\Router\\:\\:assembleRoute\\(\\) expects Enlight_Controller_Request_RequestHttp, Enlight_Controller_Request_Request\\|null given\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php
+			path: engine/Shopware/Plugins/Default/Core/RestApi/Bootstrap.php
 
 		-
-			message: "#^Parameter \\#1 \\$emotions of method Shopware\\\\Models\\\\Category\\\\Category\\:\\:setEmotions\\(\\) expects Doctrine\\\\Common\\\\Collections\\\\ArrayCollection&iterable\\<Shopware\\\\Models\\\\Emotion\\\\Emotion\\>, Doctrine\\\\Common\\\\Collections\\\\ArrayCollection\\<int, Shopware\\\\Models\\\\Emotion\\\\Emotion\\|null\\> given\\.$#"
+			message: "#^Property Shopware_Plugins_Core_RestApi_Bootstrap\\:\\:\\$request \\(Enlight_Controller_Request_Request\\) does not accept Enlight_Controller_Request_Request\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php
+			path: engine/Shopware/Plugins/Default/Core/RestApi/Bootstrap.php
 
 		-
-			message: "#^Parameter \\#1 \\$entity of method Doctrine\\\\ORM\\\\EntityManager\\:\\:persist\\(\\) expects object, Shopware\\\\Models\\\\Blog\\\\Blog\\|null given\\.$#"
+			message: "#^Method ShopwarePlugins\\\\RestApi\\\\Components\\\\Router\\:\\:assembleRoute\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php
+			path: engine/Shopware/Plugins/Default/Core/RestApi/Components/Router.php
 
 		-
-			message: "#^Parameter \\#1 \\$entity of method Doctrine\\\\ORM\\\\EntityManager\\:\\:remove\\(\\) expects object, Shopware\\\\Models\\\\Article\\\\Article\\|null given\\.$#"
+			message: "#^Call to an undefined method Enlight_Event_EventArgs\\:\\:getRequest\\(\\)\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php
+			path: engine/Shopware/Plugins/Default/Core/ViewportForward/Bootstrap.php
 
 		-
-			message: "#^Parameter \\#1 \\$entity of method Doctrine\\\\ORM\\\\EntityManager\\:\\:remove\\(\\) expects object, Shopware\\\\Models\\\\Blog\\\\Blog\\|null given\\.$#"
-			count: 2
-			path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php
+			message: "#^Call to an undefined method Enlight_Event_EventArgs\\:\\:getSubject\\(\\)\\.$#"
+			count: 3
+			path: engine/Shopware/Plugins/Default/Core/ViewportForward/Bootstrap.php
 
 		-
-			message: "#^Parameter \\#1 \\$entity of method Doctrine\\\\ORM\\\\EntityManager\\:\\:remove\\(\\) expects object, Shopware\\\\Models\\\\Category\\\\Category\\|null given\\.$#"
+			message: "#^Method Shopware_Plugins_Core_ViewportForward_Bootstrap\\:\\:onPreDispatch\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php
+			path: engine/Shopware/Plugins/Default/Core/ViewportForward/Bootstrap.php
 
 		-
-			message: "#^Parameter \\#1 \\$product of method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\DynamicCacheTimeServiceTest\\:\\:getProductRequest\\(\\) expects Shopware\\\\Models\\\\Article\\\\Article, Shopware\\\\Models\\\\Article\\\\Article\\|null given\\.$#"
+			message: "#^Method Shopware_Plugins_Frontend_CronRefresh_Bootstrap\\:\\:onCronJobClearing\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php
+			path: engine/Shopware/Plugins/Default/Frontend/CronRefresh/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\AbstractMarketing\\:\\:assertArrayEquals\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Frontend_CronRefresh_Bootstrap\\:\\:onCronJobSearch\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/AbstractMarketing.php
+			path: engine/Shopware/Plugins/Default/Frontend/CronRefresh/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\AbstractMarketing\\:\\:assertArrayEquals\\(\\) has parameter \\$expected with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/AbstractMarketing.php
+			message: "#^Access to an undefined property sSystem\\:\\:\\$_POST\\.$#"
+			count: 2
+			path: engine/Shopware/Plugins/Default/Frontend/Notification/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\AbstractMarketing\\:\\:assertArrayEquals\\(\\) has parameter \\$properties with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/AbstractMarketing.php
+			message: "#^Call to an undefined method Enlight_Event_EventArgs\\:\\:getSubject\\(\\)\\.$#"
+			count: 3
+			path: engine/Shopware/Plugins/Default/Frontend/Notification/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\AbstractMarketing\\:\\:assertArrayEquals\\(\\) has parameter \\$result with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware_Plugins_Frontend_RouterRewrite_Bootstrap\\:\\:onPreDispatch\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/AbstractMarketing.php
+			path: engine/Shopware/Plugins/Default/Frontend/RouterRewrite/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\AbstractMarketing\\:\\:getAllArticles\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Frontend_RouterRewrite_Bootstrap\\:\\:onStartDispatch\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/AbstractMarketing.php
+			path: engine/Shopware/Plugins/Default/Frontend/RouterRewrite/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\AbstractMarketing\\:\\:getAllArticles\\(\\) has parameter \\$condition with no type specified\\.$#"
+			message: "#^Cannot call method getControllerName\\(\\) on Enlight_Controller_Request_Request\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/AbstractMarketing.php
+			path: engine/Shopware/Plugins/Default/Frontend/Seo/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\AbstractMarketing\\:\\:saveConfig\\(\\) has no return type specified\\.$#"
+			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Category\\\\Category\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/AbstractMarketing.php
+			path: engine/Shopware/Plugins/Default/Frontend/Seo/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\AbstractMarketing\\:\\:saveConfig\\(\\) has parameter \\$name with no type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Frontend_Seo_Bootstrap\\:\\:onPostDispatch\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/AbstractMarketing.php
+			path: engine/Shopware/Plugins/Default/Frontend/Seo/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\AbstractMarketing\\:\\:saveConfig\\(\\) has parameter \\$value with no type specified\\.$#"
+			message: "#^PHPDoc tag @param for parameter \\$request with type Enlight_Controller_Request_Request is not subtype of native type Enlight_Controller_Request_RequestHttp\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/AbstractMarketing.php
+			path: engine/Shopware/Plugins/Default/Frontend/Statistics/Bootstrap.php
 
 		-
-			message: "#^Negated boolean expression is always false\\.$#"
+			message: "#^Parameter \\#1 \\$request of method Shopware_Plugins_Frontend_Statistics_Bootstrap\\:\\:refreshBasket\\(\\) expects Enlight_Controller_Request_RequestHttp, Enlight_Controller_Request_Request given\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/AbstractMarketing.php
+			path: engine/Shopware/Plugins/Default/Frontend/Statistics/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\AlsoBoughtTest\\:\\:getAllAlsoBought\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$request of method Shopware_Plugins_Frontend_Statistics_Bootstrap\\:\\:refreshBlog\\(\\) expects Symfony\\\\Component\\\\HttpFoundation\\\\Request, Enlight_Controller_Request_Request given\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/AlsoBoughtTest.php
+			path: engine/Shopware/Plugins/Default/Frontend/Statistics/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\AlsoBoughtTest\\:\\:getAllAlsoBought\\(\\) has parameter \\$condition with no type specified\\.$#"
+			message: "#^Access to an undefined property Enlight_Config\\:\\:\\$controller\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/AlsoBoughtTest.php
+			path: engine/Shopware/Plugins/Default/Frontend/TagCloud/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\AlsoBoughtTest\\:\\:testInitAlsoBought\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/AlsoBoughtTest.php
+			message: "#^Call to an undefined method Enlight_Event_EventArgs\\:\\:getSubject\\(\\)\\.$#"
+			count: 3
+			path: engine/Shopware/Plugins/Default/Frontend/TagCloud/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\AlsoBoughtTest\\:\\:testRefreshBoughtArticles\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware_Plugins_Frontend_TagCloud_Bootstrap\\:\\:getInfo\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/AlsoBoughtTest.php
+			path: engine/Shopware/Plugins/Default/Frontend/TagCloud/Bootstrap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\SimilarShownTest\\:\\:getAllSimilarShown\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\:\\:System\\(\\) should return sSystem but returns object\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/SimilarShownTest.php
+			path: engine/Shopware/Shopware.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\SimilarShownTest\\:\\:getAllSimilarShown\\(\\) has parameter \\$condition with no type specified\\.$#"
+			message: "#^Method Shopware\\:\\:__call\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/SimilarShownTest.php
+			path: engine/Shopware/Shopware.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\SimilarShownTest\\:\\:getDemoData\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\:\\:__call\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/SimilarShownTest.php
+			path: engine/Shopware/Shopware.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\SimilarShownTest\\:\\:insertDemoData\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\:\\:setEventManager\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/SimilarShownTest.php
+			path: engine/Shopware/Shopware.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\SimilarShownTest\\:\\:resetSimilarShown\\(\\) has no return type specified\\.$#"
+			message: "#^Service \"system\" is not registered in the container\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/SimilarShownTest.php
+			path: engine/Shopware/Shopware.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\SimilarShownTest\\:\\:resetSimilarShown\\(\\) has parameter \\$condition with no type specified\\.$#"
-			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/SimilarShownTest.php
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\HttpFoundation\\\\Response\\:\\:getHeader\\(\\)\\.$#"
+			count: 2
+			path: tests/Functional/Api/CategoryTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\SimilarShownTest\\:\\:setSimilarShownInvalid\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/SimilarShownTest.php
+			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
+			count: 16
+			path: tests/Functional/Api/CategoryTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\SimilarShownTest\\:\\:setSimilarShownInvalid\\(\\) has parameter \\$condition with no type specified\\.$#"
-			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/SimilarShownTest.php
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\HttpFoundation\\\\Response\\:\\:getBody\\(\\)\\.$#"
+			count: 2
+			path: tests/Functional/Api/CustomerGroupTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\SimilarShownTest\\:\\:setSimilarShownInvalid\\(\\) has parameter \\$date with no type specified\\.$#"
-			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/SimilarShownTest.php
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\HttpFoundation\\\\Response\\:\\:getHeader\\(\\)\\.$#"
+			count: 2
+			path: tests/Functional/Api/CustomerGroupTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\SimilarShownTest\\:\\:testInitSimilarShown\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/SimilarShownTest.php
+			path: tests/Functional/Api/CustomerGroupTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\SimilarShownTest\\:\\:testRefreshSimilarShown\\(\\) has no return type specified\\.$#"
+			message: "#^Cannot call method getUserId\\(\\) on Shopware\\\\Models\\\\Media\\\\Media\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/SimilarShownTest.php
+			path: tests/Functional/Api/MediaTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\SimilarShownTest\\:\\:testResetSimilarShown\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/SimilarShownTest.php
+			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
+			count: 12
+			path: tests/Functional/Api/MediaTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\SimilarShownTest\\:\\:testSimilarCronJobRefresh\\(\\) has no return type specified\\.$#"
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\HttpFoundation\\\\Response\\:\\:getBody\\(\\)\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/SimilarShownTest.php
+			path: tests/Functional/Api/OrderTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\SimilarShownTest\\:\\:testSimilarShownLiveRefresh\\(\\) has no return type specified\\.$#"
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\HttpFoundation\\\\Response\\:\\:getHeader\\(\\)\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/SimilarShownTest.php
+			path: tests/Functional/Api/OrderTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\SimilarShownTest\\:\\:testUpdateElapsedSimilarShownArticles\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/SimilarShownTest.php
+			path: tests/Functional/Api/OrderTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\TopSellerTest\\:\\:getAllTopSeller\\(\\) has no return type specified\\.$#"
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\HttpFoundation\\\\Response\\:\\:getBody\\(\\)\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/TopSellerTest.php
+			path: tests/Functional/Api/PaymentMethodsTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\TopSellerTest\\:\\:getAllTopSeller\\(\\) has parameter \\$condition with no type specified\\.$#"
+			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Payment\\\\Payment\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/TopSellerTest.php
+			path: tests/Functional/Api/PaymentMethodsTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\TopSellerTest\\:\\:resetTopSeller\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/TopSellerTest.php
+			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
+			count: 6
+			path: tests/Functional/Api/PaymentMethodsTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\TopSellerTest\\:\\:resetTopSeller\\(\\) has parameter \\$condition with no type specified\\.$#"
+			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/TopSellerTest.php
+			path: tests/Functional/Api/VersionTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\TopSellerTest\\:\\:testIncrementTopSeller\\(\\) has no return type specified\\.$#"
+			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/TopSellerTest.php
+			path: tests/Functional/Bundle/AccountBundle/Controller/AddressTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\TopSellerTest\\:\\:testInitTopSeller\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\AddressTest\\:\\:doRequest\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/TopSellerTest.php
+			path: tests/Functional/Bundle/AccountBundle/Controller/AddressTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\TopSellerTest\\:\\:testRefreshTopSellerForArticleId\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Controller\\\\AddressTest\\:\\:getCustomerDemoData\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/TopSellerTest.php
+			path: tests/Functional/Bundle/AccountBundle/Controller/AddressTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\TopSellerTest\\:\\:testTopSellerCronJobRefresh\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$displayStateInRegistration of method Shopware\\\\Models\\\\Country\\\\Country\\:\\:setDisplayStateInRegistration\\(\\) expects bool, int given\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/TopSellerTest.php
+			path: tests/Functional/Bundle/AccountBundle/Controller/AddressTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\TopSellerTest\\:\\:testTopSellerLiveRefresh\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$forceStateInRegistration of method Shopware\\\\Models\\\\Country\\\\Country\\:\\:setForceStateInRegistration\\(\\) expects bool, int given\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/TopSellerTest.php
+			path: tests/Functional/Bundle/AccountBundle/Controller/AddressTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\TopSellerTest\\:\\:testTopSellerManualRefresh\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$node of class Symfony\\\\Component\\\\DomCrawler\\\\Crawler constructor expects DOMNode\\|\\(DOMNodeList&iterable\\<DOMNode\\>\\)\\|string\\|null, array\\|string\\|null given\\.$#"
 			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/TopSellerTest.php
+			path: tests/Functional/Bundle/AccountBundle/Controller/AddressTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\TopSellerTest\\:\\:testUpdateElapsedTopSeller\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/TopSellerTest.php
+			message: "#^Cannot call method getCustomer\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
+			count: 3
+			path: tests/Functional/Bundle/AccountBundle/Service/AddressServiceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Recovery\\\\Update\\\\UpdateHtaccessTest\\:\\:getCombinations\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: tests/Functional/Recovery/Update/UpdateHtaccessTest.php
+			message: "#^Cannot call method getFirstname\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
+			count: 4
+			path: tests/Functional/Bundle/AccountBundle/Service/AddressServiceTest.php
 
 		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 3
-			path: tests/Functional/config.php
+			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
+			count: 6
+			path: tests/Functional/Bundle/AccountBundle/Service/AddressServiceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Behat\\\\ShopwareExtension\\\\Context\\\\Initializer\\\\KernelAwareInitializer\\:\\:bootKernel\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Mink/Extension/ShopwareExtension/Context/Initializer/KernelAwareInitializer.php
+			message: "#^Cannot call method getLastname\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
+			count: 4
+			path: tests/Functional/Bundle/AccountBundle/Service/AddressServiceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Behat\\\\ShopwareExtension\\\\Context\\\\Initializer\\\\KernelAwareInitializer\\:\\:initializeContext\\(\\) has no return type specified\\.$#"
+			message: "#^Cannot call method setCity\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
 			count: 1
-			path: tests/Mink/Extension/ShopwareExtension/Context/Initializer/KernelAwareInitializer.php
+			path: tests/Functional/Bundle/AccountBundle/Service/AddressServiceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Behat\\\\ShopwareExtension\\\\Context\\\\KernelAwareContext\\:\\:setKernel\\(\\) has no return type specified\\.$#"
+			message: "#^Cannot call method setFirstname\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
 			count: 1
-			path: tests/Mink/Extension/ShopwareExtension/Context/KernelAwareContext.php
+			path: tests/Functional/Bundle/AccountBundle/Service/AddressServiceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Behat\\\\ShopwareExtension\\\\ServiceContainer\\\\ShopwareExtension\\:\\:configure\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Mink/Extension/ShopwareExtension/ServiceContainer/ShopwareExtension.php
+			message: "#^Parameter \\#1 \\$address of method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\AddressServiceInterface\\:\\:delete\\(\\) expects Shopware\\\\Models\\\\Customer\\\\Address, Shopware\\\\Models\\\\Customer\\\\Address\\|null given\\.$#"
+			count: 2
+			path: tests/Functional/Bundle/AccountBundle/Service/AddressServiceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Behat\\\\ShopwareExtension\\\\ServiceContainer\\\\ShopwareExtension\\:\\:initialize\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$address of method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\AddressServiceInterface\\:\\:setDefaultBillingAddress\\(\\) expects Shopware\\\\Models\\\\Customer\\\\Address, Shopware\\\\Models\\\\Customer\\\\Address\\|null given\\.$#"
 			count: 1
-			path: tests/Mink/Extension/ShopwareExtension/ServiceContainer/ShopwareExtension.php
+			path: tests/Functional/Bundle/AccountBundle/Service/AddressServiceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Behat\\\\ShopwareExtension\\\\ServiceContainer\\\\ShopwareExtension\\:\\:load\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$address of method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\AddressServiceInterface\\:\\:setDefaultShippingAddress\\(\\) expects Shopware\\\\Models\\\\Customer\\\\Address, Shopware\\\\Models\\\\Customer\\\\Address\\|null given\\.$#"
 			count: 1
-			path: tests/Mink/Extension/ShopwareExtension/ServiceContainer/ShopwareExtension.php
+			path: tests/Functional/Bundle/AccountBundle/Service/AddressServiceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Behat\\\\ShopwareExtension\\\\ServiceContainer\\\\ShopwareExtension\\:\\:load\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#1 \\$address of method Shopware\\\\Bundle\\\\AccountBundle\\\\Service\\\\AddressServiceInterface\\:\\:update\\(\\) expects Shopware\\\\Models\\\\Customer\\\\Address, Shopware\\\\Models\\\\Customer\\\\Address\\|null given\\.$#"
 			count: 1
-			path: tests/Mink/Extension/ShopwareExtension/ServiceContainer/ShopwareExtension.php
+			path: tests/Functional/Bundle/AccountBundle/Service/AddressServiceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Behat\\\\ShopwareExtension\\\\ServiceContainer\\\\ShopwareExtension\\:\\:loadContextInitializer\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$displayStateInRegistration of method Shopware\\\\Models\\\\Country\\\\Country\\:\\:setDisplayStateInRegistration\\(\\) expects bool, int given\\.$#"
 			count: 1
-			path: tests/Mink/Extension/ShopwareExtension/ServiceContainer/ShopwareExtension.php
+			path: tests/Functional/Bundle/AccountBundle/Service/AddressServiceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Behat\\\\ShopwareExtension\\\\ServiceContainer\\\\ShopwareExtension\\:\\:loadKernel\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$forceStateInRegistration of method Shopware\\\\Models\\\\Country\\\\Country\\:\\:setForceStateInRegistration\\(\\) expects bool, int given\\.$#"
 			count: 1
-			path: tests/Mink/Extension/ShopwareExtension/ServiceContainer/ShopwareExtension.php
+			path: tests/Functional/Bundle/AccountBundle/Service/AddressServiceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Behat\\\\ShopwareExtension\\\\ServiceContainer\\\\ShopwareExtension\\:\\:loadKernel\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: tests/Mink/Extension/ShopwareExtension/ServiceContainer/ShopwareExtension.php
+			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Country\\\\Country\\|null\\.$#"
+			count: 2
+			path: tests/Functional/Bundle/AccountBundle/Service/RegisterServiceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Behat\\\\ShopwareExtension\\\\ServiceContainer\\\\ShopwareExtension\\:\\:process\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Mink/Extension/ShopwareExtension/ServiceContainer/ShopwareExtension.php
+			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Country\\\\State\\|null\\.$#"
+			count: 2
+			path: tests/Functional/Bundle/AccountBundle/Service/RegisterServiceTest.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:changeEmail\\(\\)\\.$#"
+			message: "#^Cannot call method getKey\\(\\) on Shopware\\\\Models\\\\Customer\\\\Group\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/AccountBundle/Service/RegisterServiceTest.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:changePassword\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Service\\\\RegisterServiceTest\\:\\:assertAddress\\(\\) has parameter \\$demoData with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/AccountBundle/Service/RegisterServiceTest.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:changeProfile\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AccountBundle\\\\Service\\\\RegisterServiceTest\\:\\:assertCustomer\\(\\) has parameter \\$demoData with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/AccountBundle/Service/RegisterServiceTest.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:checkAddress\\(\\)\\.$#"
+			message: "#^Parameter \\#1 \\$displayStateInRegistration of method Shopware\\\\Models\\\\Country\\\\Country\\:\\:setDisplayStateInRegistration\\(\\) expects bool, int given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/AccountBundle/Service/RegisterServiceTest.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:checkPaymentMethod\\(\\)\\.$#"
+			message: "#^Parameter \\#1 \\$forceStateInRegistration of method Shopware\\\\Models\\\\Country\\\\Country\\:\\:setForceStateInRegistration\\(\\) expects bool, int given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/AccountBundle/Service/RegisterServiceTest.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:clickLoginAgain\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AttributeBundle\\\\DataLoaderTest\\:\\:getForeignKeyData\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/AttributeBundle/DataLoaderTest.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:login\\(\\)\\.$#"
-			count: 2
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AttributeBundle\\\\DataLoaderTest\\:\\:testLoadForeignKeyValidation\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: tests/Functional/Bundle/AttributeBundle/DataLoaderTest.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:logout\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AttributeBundle\\\\DataLoaderTest\\:\\:testLoadReturnArrayIfNotEmpty\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/AttributeBundle/DataLoaderTest.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:register\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AttributeBundle\\\\DataLoaderTest\\:\\:testLoadReturnArrayWhenEmpty\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/AttributeBundle/DataLoaderTest.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:verifyLogin\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AttributeBundle\\\\DataLoaderTest\\:\\:testLoadTranslationsForeignKeyValidation\\(\\) has parameter \\$input with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/AttributeBundle/DataLoaderTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:endsWith\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\AttributeBundle\\\\DataLoaderTest\\:\\:testLoadWithUnknownTable\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/AttributeBundle/DataLoaderTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:endsWith\\(\\) has parameter \\$haystack with no type specified\\.$#"
+			message: "#^Parameter \\#2 \\$foreignKey of method Shopware\\\\Bundle\\\\AttributeBundle\\\\Service\\\\DataLoaderInterface\\:\\:load\\(\\) expects int, string given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/AttributeBundle/DataLoaderTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:endsWith\\(\\) has parameter \\$needle with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\ContentTypeBundle\\\\Services\\\\ExtjsBuilderTest\\:\\:dataProviderColumnFields\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/ContentTypeBundle/Services/ExtjsBuilderTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iChangeMyBillingAddress\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\ContentTypeBundle\\\\Services\\\\ExtjsBuilderTest\\:\\:dataProviderFieldSets\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/ContentTypeBundle/Services/ExtjsBuilderTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iChangeMyEmailWithPasswordToWithConfirmation\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\ContentTypeBundle\\\\Services\\\\ExtjsBuilderTest\\:\\:dataProviderModelFields\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/ContentTypeBundle/Services/ExtjsBuilderTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iChangeMyEmailWithPasswordToWithConfirmation\\(\\) has parameter \\$email with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\ContentTypeBundle\\\\Services\\\\ExtjsBuilderTest\\:\\:testColumns\\(\\) has parameter \\$expectedResult with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/ContentTypeBundle/Services/ExtjsBuilderTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iChangeMyEmailWithPasswordToWithConfirmation\\(\\) has parameter \\$emailConfirmation with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\ContentTypeBundle\\\\Services\\\\ExtjsBuilderTest\\:\\:testFieldSets\\(\\) has parameter \\$expectedResult with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/ContentTypeBundle/Services/ExtjsBuilderTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iChangeMyEmailWithPasswordToWithConfirmation\\(\\) has parameter \\$password with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\ContentTypeBundle\\\\Services\\\\ExtjsBuilderTest\\:\\:testModelFields\\(\\) has parameter \\$expectedResult with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/ContentTypeBundle/Services/ExtjsBuilderTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iChangeMyPasswordFromToWithConfirmation\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			message: "#^You should use assertCount\\(\\$expectedCount, \\$variable\\) instead of assertSame\\(\\$expectedCount, \\$variable\\-\\>count\\(\\)\\)\\.$#"
+			count: 5
+			path: tests/Functional/Bundle/CookieBundle/Services/CookieCollectorTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iChangeMyPasswordFromToWithConfirmation\\(\\) has parameter \\$currentPassword with no type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			message: "#^You should use assertCount\\(\\$expectedCount, \\$variable\\) instead of assertSame\\(\\$expectedCount, \\$variable\\-\\>count\\(\\)\\)\\.$#"
+			count: 2
+			path: tests/Functional/Bundle/CookieBundle/Services/CookieHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iChangeMyPasswordFromToWithConfirmation\\(\\) has parameter \\$password with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\AccountModeConditionHandlerTest\\:\\:testCustomer\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AccountModeConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iChangeMyPasswordFromToWithConfirmation\\(\\) has parameter \\$passwordConfirmation with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\AccountModeConditionHandlerTest\\:\\:testMultipleAccountless\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AccountModeConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iChangeMyProfileWith\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\AgeConditionHandlerTest\\:\\:testBetween\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AgeConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iChangeMyProfileWith\\(\\) has parameter \\$firstname with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\AgeConditionHandlerTest\\:\\:testEquals\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AgeConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iChangeMyProfileWith\\(\\) has parameter \\$lastname with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\AgeConditionHandlerTest\\:\\:testGreater\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AgeConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iChangeMyProfileWith\\(\\) has parameter \\$salutation with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\AgeConditionHandlerTest\\:\\:testGreaterThanEquals\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AgeConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iChangeMyShippingAddress\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\AgeConditionHandlerTest\\:\\:testLower\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AgeConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iChangeTheCurrentAddressTo\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\AgeConditionHandlerTest\\:\\:testLowerEquals\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AgeConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iChangeThePaymentMethodTo\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			message: "#^Parameter \\#2 \\$value of class Shopware\\\\Bundle\\\\CustomerSearchBundle\\\\Condition\\\\AgeCondition constructor expects array\\|string, int given\\.$#"
+			count: 5
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AgeConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iChangeThePaymentMethodTo\\(\\) has parameter \\$payment with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\HasAddressWithCountryConditionHandlerTest\\:\\:testOneCountry\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasAddressWithCountryConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iChooseTheAddress\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\HasAddressWithCountryConditionHandlerTest\\:\\:testTwoCountryIds\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasAddressWithCountryConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iChooseTheAddress\\(\\) has parameter \\$name with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\HasCanceledOrdersConditionHandlerTest\\:\\:testWithMultipleOrders\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasCanceledOrdersConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iClickOnAddress\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\HasCanceledOrdersConditionHandlerTest\\:\\:testWithOneCanceledOrder\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasCanceledOrdersConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iClickOnAddress\\(\\) has parameter \\$address with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\HasNewsletterRegistrationConditionHandlerTest\\:\\:testWithOneNewsletterSubscription\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNewsletterRegistrationConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iClickOnAddress\\(\\) has parameter \\$locator with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\HasNewsletterRegistrationConditionHandlerTest\\:\\:testWithTwoNewsletterSubscription\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNewsletterRegistrationConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iClickOnLoginAgain\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\HasNewsletterRegistrationConditionHandlerTest\\:\\:testWithoutNewsletterSubscription\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNewsletterRegistrationConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iCreateANewAddress\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\HasOrderCountConditionHandlerTest\\:\\:testCustomerHasOneOrder\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasOrderCountConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iDeleteTheAddress\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\HasOrderCountConditionHandlerTest\\:\\:testMultipleCustomerHasOrders\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasOrderCountConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iDeleteTheAddress\\(\\) has parameter \\$address with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\HasTotalOrderAmountConditionHandlerTest\\:\\:testWithCanceledOrders\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasTotalOrderAmountConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iLogInAsWithPassword\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\HasTotalOrderAmountConditionHandlerTest\\:\\:testWithSingleCustomer\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasTotalOrderAmountConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iLogInAsWithPassword\\(\\) has parameter \\$email with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\IsCustomerSinceConditionHandlerTest\\:\\:testDateTime\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/IsCustomerSinceConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iLogInAsWithPassword\\(\\) has parameter \\$password with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\IsCustomerSinceConditionHandlerTest\\:\\:testWithStringDate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/IsCustomerSinceConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iLogInSuccessfulAsWithPassword\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\IsInCustomerGroupConditionHandlerTest\\:\\:testSingleCustomerGroup\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/IsInCustomerGroupConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iLogInSuccessfulAsWithPassword\\(\\) has parameter \\$email with no type specified\\.$#"
+			message: "#^Parameter \\#1 \\$ids of class Shopware\\\\Bundle\\\\CustomerSearchBundle\\\\Condition\\\\IsInCustomerGroupCondition constructor expects array\\<string\\>, array\\<int, int\\> given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/IsInCustomerGroupConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iLogInSuccessfulAsWithPassword\\(\\) has parameter \\$password with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\OrderedAtWeekdayConditionHandlerTest\\:\\:testDifferentDays\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedAtWeekdayConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iLogInSuccessfulAsWithPassword\\(\\) has parameter \\$username with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\OrderedAtWeekdayConditionHandlerTest\\:\\:testSingleDay\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedAtWeekdayConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iLogMeOut\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\OrderedInLastDaysConditionHandlerTest\\:\\:testSingleDay\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedInLastDaysConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iMustNotSeeInBoxWithTitle\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\OrderedInShopConditionHandlerTest\\:\\:testMultipleShops\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedInShopConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iMustNotSeeInBoxWithTitle\\(\\) has parameter \\$elementName with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\OrderedInShopConditionHandlerTest\\:\\:testSingleShop\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedInShopConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iMustNotSeeInBoxWithTitle\\(\\) has parameter \\$title with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\OrderedOnDeviceConditionHandlerTest\\:\\:testDesktopDevice\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedOnDeviceConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iRegisterMe\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\OrderedOnDeviceConditionHandlerTest\\:\\:testMobileAndDesktopDevice\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedOnDeviceConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iShouldBeWelcomedWith\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\OrderedProductConditionHandlerTest\\:\\:testMultipleProducts\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedProductConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iShouldBeWelcomedWith\\(\\) has parameter \\$welcome with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\OrderedProductConditionHandlerTest\\:\\:testSingleProduct\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedProductConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iShouldSeeOnlyWithTitle\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			message: "#^Cannot call method getNumber\\(\\) on Shopware\\\\Models\\\\Article\\\\Detail\\|null\\.$#"
+			count: 3
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedProductOfManufacturerConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iShouldSeeOnlyWithTitle\\(\\) has parameter \\$address with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\OrderedProductOfManufacturerConditionHandlerTest\\:\\:testSingleManufacturer\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedProductOfManufacturerConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:iShouldSeeOnlyWithTitle\\(\\) has parameter \\$addressTitle with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\SalutationConditionHandlerTest\\:\\:testFemaleCustomer\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SalutationConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:theAddressShouldBe\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\SalutationConditionHandlerTest\\:\\:testMaleCustomer\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SalutationConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:theAddressShouldBe\\(\\) has parameter \\$address with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\SalutationConditionHandlerTest\\:\\:testMissingSalutation\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SalutationConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:theAddressShouldBe\\(\\) has parameter \\$type with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\SalutationConditionHandlerTest\\:\\:testMultipleSalutations\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SalutationConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:theCurrentPaymentMethodShouldBe\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\SearchTermConditionHandlerTest\\:\\:testBirthdaySearch\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SearchTermConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:theCurrentPaymentMethodShouldBe\\(\\) has parameter \\$paymentMethod with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\SearchTermConditionHandlerTest\\:\\:testCompanySearch\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SearchTermConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:thereMustNotBeAnAddress\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\SearchTermConditionHandlerTest\\:\\:testCustomerNumberSearch\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SearchTermConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:thereMustNotBeAnAddress\\(\\) has parameter \\$address with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\SearchTermConditionHandlerTest\\:\\:testEmailSearch\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SearchTermConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:thereShouldBeAnAddress\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\SearchTermConditionHandlerTest\\:\\:testOrderedProductsSearch\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SearchTermConditionHandlerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\AccountContext\\:\\:thereShouldBeAnAddress\\(\\) has parameter \\$address with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\ConditionHandler\\\\SearchTermConditionHandlerTest\\:\\:testTwoColumnSearch\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SearchTermConditionHandlerTest.php
 
 		-
-			message: "#^PHPDoc tag @var for variable \\$addressManagementAddressBoxes has no value type specified in iterable type array\\.$#"
-			count: 6
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\CustomerNumberSearchTest\\:\\:customerFromNumber\\(\\) return type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/CustomerNumberSearchTest.php
 
 		-
-			message: "#^Parameter \\#1 \\$addresses of method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Account\\:\\:chooseAddress\\(\\) expects Shopware\\\\Tests\\\\Mink\\\\Element\\\\AddressBox, Shopware\\\\Tests\\\\Mink\\\\Element\\\\MultipleElement given\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\CustomerNumberSearchTest\\:\\:getCustomerNumbers\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/AccountContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/CustomerNumberSearchTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\BackendContext\\:\\:iAmLoggedInToTheBackendAsAnAdminUser\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\HandlerRegistryTest\\:\\:testCoreHandlersAreRegistered\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/BackendContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/HandlerRegistryTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\BackendContext\\:\\:waitForText\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\HandlerRegistryTest\\:\\:testNoneSupportConditionThrowsException\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/BackendContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/HandlerRegistryTest.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:writeComment\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\PaginationTest\\:\\:testPagination\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/BlogContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/PaginationTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\BlogContext\\:\\:iAmOnTheBlogCategory\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\SearchResultTest\\:\\:testResultCollection\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/BlogContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/SearchResultTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\BlogContext\\:\\:iAmOnTheBlogCategory\\(\\) has parameter \\$categoryId with no type specified\\.$#"
+			message: "#^Argument \\#0 expects a constant string, got string$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/BlogContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/TestCase.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\BlogContext\\:\\:iClickToReadTheBlogArticleOnPosition\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\TestCase\\:\\:createCustomer\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/BlogContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/TestCase.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\BlogContext\\:\\:iClickToReadTheBlogArticleOnPosition\\(\\) has parameter \\$position with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\TestCase\\:\\:createCustomer\\(\\) has parameter \\$customer with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/BlogContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/TestCase.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\BlogContext\\:\\:iOpenTheCommentForm\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\TestCase\\:\\:filterData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/BlogContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/TestCase.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\BlogContext\\:\\:iShouldSeeAnAverageEvaluationOfFromFollowingComments\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\TestCase\\:\\:filterData\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/BlogContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/TestCase.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\BlogContext\\:\\:iShouldSeeAnAverageEvaluationOfFromFollowingComments\\(\\) has parameter \\$average with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\TestCase\\:\\:insert\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/BlogContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/TestCase.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\BlogContext\\:\\:iWriteAComment\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\CustomerSearchBundleDBAL\\\\TestCase\\:\\:search\\(\\) has parameter \\$customers with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/BlogContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/TestCase.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\BlogContext\\:\\:theShopOwnerActivateMyLatestComment\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_user\\.customernumber\" expects value type string\\|null, got type mixed$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/BlogContext.php
+			path: tests/Functional/Bundle/CustomerSearchBundleDBAL/TestCase.php
 
 		-
-			message: "#^Parameter \\#1 \\$blogComments of method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Blog\\:\\:checkComments\\(\\) expects Shopware\\\\Tests\\\\Mink\\\\Element\\\\BlogComment, Shopware\\\\Tests\\\\Mink\\\\Element\\\\MultipleElement given\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\ESIndexingBundle\\\\BacklogProcessorTest\\:\\:mockProductSynchronizer\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/BlogContext.php
+			path: tests/Functional/Bundle/ESIndexingBundle/BacklogProcessorTest.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:addArticle\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\ESIndexingBundle\\\\BacklogProcessorTest\\:\\:retrieveLatestBacklogs\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/ESIndexingBundle/BacklogProcessorTest.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:addVoucher\\(\\)\\.$#"
+			message: "#^Cannot call method getGroups\\(\\) on Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/ESIndexingBundle/Product/ProductListingVariationLoaderTest.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:changeShippingMethod\\(\\)\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			message: "#^Cannot call method getNumber\\(\\) on Shopware\\\\Models\\\\Article\\\\Detail\\|null\\.$#"
+			count: 2
+			path: tests/Functional/Bundle/ESIndexingBundle/Product/ProductListingVariationLoaderTest.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:checkAggregation\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\ESIndexingBundle\\\\Product\\\\ProductListingVariationLoaderTest\\:\\:getProductGroups\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/ESIndexingBundle/Product/ProductListingVariationLoaderTest.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:getOrderNumber\\(\\)\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			message: "#^Parameter \\#2 \\$limit of method Shopware\\\\Bundle\\\\ESIndexingBundle\\\\BacklogReader\\:\\:read\\(\\) expects int, null given\\.$#"
+			count: 3
+			path: tests/Functional/Bundle/ESIndexingBundle/Subscriber/ORMBacklogSubscriberTest.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:proceedToCheckout\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\EmotionBundle\\\\ComponentHandler\\\\EventComponentHandlerTest\\:\\:testFallbackToEventComponentHandler\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/EmotionBundle/ComponentHandler/EventComponentHandlerTest.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:proceedToOrderConfirmation\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\EsBackendBundle\\\\BacklogTest\\:\\:testBacklogWillBeWritten\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/EsBackendBundle/BacklogTest.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:proceedToOrderConfirmationWithLogin\\(\\)\\.$#"
+			message: "#^Cannot call method getRawContent\\(\\) on string\\|Zend_Mime_Part\\|false\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/MailBundle/LogRepositoryTest.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:proceedToOrderConfirmationWithRegistration\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\MediaBundle\\\\FilesystemTest\\:\\:_testDelete\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/MediaBundle/FilesystemTest.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:removeVoucher\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\MediaBundle\\\\FilesystemTest\\:\\:_testRead\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/MediaBundle/FilesystemTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:aPriceGroupNamedThatGrantsDiscount\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\MediaBundle\\\\FilesystemTest\\:\\:_testRename\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/MediaBundle/FilesystemTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:aPriceGroupNamedThatGrantsDiscount\\(\\) has parameter \\$grantedDiscount with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\MediaBundle\\\\FilesystemTest\\:\\:_testSize\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/MediaBundle/FilesystemTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:aPriceGroupNamedThatGrantsDiscount\\(\\) has parameter \\$priceGroupName with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\MediaBundle\\\\FilesystemTest\\:\\:_testWrite\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/MediaBundle/FilesystemTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:addCustomDispatchSurcharge\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\MediaBundle\\\\FilesystemTest\\:\\:testFiles\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/MediaBundle/FilesystemTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:addCustomPaymentSurcharge\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\MediaBundle\\\\FilesystemTest\\:\\:testUrlGeneration\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/MediaBundle/FilesystemTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:addCustomTaxation\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$expectedJson of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertJsonStringEqualsJsonString\\(\\) expects string, string\\|false given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/MediaBundle/FilesystemTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:createUserForCheckoutAddressManagementTest\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#2 \\$actualJson of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertJsonStringEqualsJsonString\\(\\) expects string, string\\|false given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/MediaBundle/FilesystemTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iAddTheArticleToMyBasket\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#2 \\$contents of method Shopware\\\\Bundle\\\\MediaBundle\\\\MediaServiceInterface\\:\\:write\\(\\) expects string, string\\|false given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/MediaBundle/FilesystemTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iAddTheArticleToMyBasket\\(\\) has parameter \\$article with no type specified\\.$#"
+			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\MediaBundle\\\\FilesystemTest\\:\\:\\$testData type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/MediaBundle/FilesystemTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iAddTheArticleToMyBasketOverHttpGet\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\MediaBundle\\\\FilesystemTest\\:\\:\\$testPaths type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/MediaBundle/FilesystemTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iAddTheArticleToMyBasketOverHttpGet\\(\\) has parameter \\$article with no type specified\\.$#"
+			message: "#^Access to private property Shopware\\\\Bundle\\\\MediaBundle\\\\GarbageCollector\\:\\:\\$mediaPositions\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/MediaBundle/GarbageCollectorFactoryTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iAddTheVoucherToMyBasket\\(\\) has no return type specified\\.$#"
+			message: "#^Cannot call method getExtension\\(\\) on Shopware\\\\Models\\\\Media\\\\Media\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/MediaBundle/MediaReplaceServiceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iAddTheVoucherToMyBasket\\(\\) has parameter \\$voucher with no type specified\\.$#"
+			message: "#^Cannot call method getPath\\(\\) on Shopware\\\\Models\\\\Media\\\\Media\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/MediaBundle/MediaReplaceServiceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iChangeTheAddress\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\PropertyConditionTest\\:\\:createPropertyCombination\\(\\) has parameter \\$properties with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Condition/PropertyConditionTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iChangeTheShippingMethodTo\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\PropertyConditionTest\\:\\:createPropertyCombination\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Condition/PropertyConditionTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iChangeTheShippingMethodTo\\(\\) has parameter \\$shipping with no type specified\\.$#"
+			message: "#^Cannot call method getCalculatedPrice\\(\\) on Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\Product\\\\Price\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionOnSaleTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iCheckoutUsingGet\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionOnSaleTest\\:\\:assertPrices\\(\\) has parameter \\$prices with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionOnSaleTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iClickOnModalAddressbox\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionOnSaleTest\\:\\:getProduct\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionOnSaleTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iClickOnModalAddressbox\\(\\) has parameter \\$address with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionOnSaleTest\\:\\:mapOptions\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionOnSaleTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iClickOnModalAddressbox\\(\\) has parameter \\$buttonName with no type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			message: "#^Parameter \\#1 \\$products of method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionOnSaleTest\\:\\:assertPrices\\(\\) expects array\\<Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\ListProduct\\>, array\\<Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\BaseProduct\\> given\\.$#"
+			count: 7
+			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionOnSaleTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iClickOnTheLink\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionTest\\:\\:getProduct\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iClickOnTheLink\\(\\) has parameter \\$linkName with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithCurrencyFactor\\:\\:assertPrices\\(\\) has parameter \\$prices with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithCurrencyFactor.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iClickTheLinkInTheAddressBoxWithTitle\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithCurrencyFactor\\:\\:buildConfigurator\\(\\) has parameter \\$expected with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithCurrencyFactor.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iClickTheLinkInTheAddressBoxWithTitle\\(\\) has parameter \\$linkName with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithCurrencyFactor\\:\\:createCondition\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithCurrencyFactor.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iClickTheLinkInTheAddressBoxWithTitle\\(\\) has parameter \\$title with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithCurrencyFactor\\:\\:getProduct\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithCurrencyFactor.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iClickToAddTheArticleToTheCart\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithCurrencyFactor\\:\\:getSearchResult\\(\\) has parameter \\$expanded with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithCurrencyFactor.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iClickToAddTheArticleToTheCart\\(\\) has parameter \\$locator with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithCurrencyFactor\\:\\:mapOptions\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithCurrencyFactor.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iCreateTheAddress\\(\\) has no return type specified\\.$#"
+			message: "#^Cannot call method getCalculatedPrice\\(\\) on Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\Product\\\\Price\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithGraduationTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iOpenTheCartPage\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithGraduationTest\\:\\:assertPrices\\(\\) has parameter \\$prices with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithGraduationTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iOpenTheOrderConfirmationPage\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithGraduationTest\\:\\:buildConfigurator\\(\\) has parameter \\$expected with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithGraduationTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iProceedToCheckout\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithGraduationTest\\:\\:createCondition\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithGraduationTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iProceedToCheckoutAs\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithGraduationTest\\:\\:getProduct\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithGraduationTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iProceedToOrderConfirmation\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithGraduationTest\\:\\:mapOptions\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithGraduationTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iProceedToOrderConfirmationWithEmailAndPassword\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			message: "#^Parameter \\#1 \\$products of method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithGraduationTest\\:\\:assertPrices\\(\\) expects array\\<Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\ListProduct\\>, array\\<Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\BaseProduct\\> given\\.$#"
+			count: 7
+			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithGraduationTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iProceedToOrderConfirmationWithEmailAndPassword\\(\\) has parameter \\$email with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithPriceGroupTest\\:\\:buildConfigurator\\(\\) has parameter \\$expected with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithPriceGroupTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iProceedToOrderConfirmationWithEmailAndPassword\\(\\) has parameter \\$password with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithPriceGroupTest\\:\\:createCondition\\(\\) has parameter \\$expand with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithPriceGroupTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iRemoveTheArticleOnPosition\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithPriceGroupTest\\:\\:createCondition\\(\\) has parameter \\$groupName with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithPriceGroupTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iRemoveTheArticleOnPosition\\(\\) has parameter \\$position with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithPriceGroupTest\\:\\:createCondition\\(\\) has parameter \\$options with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithPriceGroupTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iRemoveTheVoucher\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithPriceGroupTest\\:\\:getPriceData\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithPriceGroupTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iSetAsDefaultAfterDisappeared\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithPriceGroupTest\\:\\:getProduct\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithPriceGroupTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iSetAsDefaultAfterDisappeared\\(\\) has parameter \\$address with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Condition\\\\VariantConditionWithPriceGroupTest\\:\\:mapOptions\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithPriceGroupTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iSetAsDefaultAfterDisappeared\\(\\) has parameter \\$titleToDisappear with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Facet\\\\PropertyFacetTest\\:\\:createPropertyCombination\\(\\) has parameter \\$properties with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Facet/PropertyFacetTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iShouldSeeAppear\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Facet\\\\PropertyFacetTest\\:\\:createPropertyCombination\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Facet/PropertyFacetTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iShouldSeeAppear\\(\\) has parameter \\$text with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\HideNoInStockTest\\:\\:categoryConditionFilter\\(\\) has parameter \\$el with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/HideNoInStockTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iShouldSeeAppearInAddressboxAfterDisappeared\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\HideNoInStockTest\\:\\:getStoreFrontConditions\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/HideNoInStockTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iShouldSeeAppearInAddressboxAfterDisappeared\\(\\) has parameter \\$address with no type specified\\.$#"
+			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\HideNoInStockTest\\:\\:\\$testProducts type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/HideNoInStockTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iShouldSeeAppearInAddressboxAfterDisappeared\\(\\) has parameter \\$title with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ManualSortingTest\\:\\:search\\(\\) has parameter \\$configs with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Sorting/ManualSortingTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iShouldSeeAppearInAddressboxAfterDisappeared\\(\\) has parameter \\$titleToDisappear with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ManualSortingTest\\:\\:search\\(\\) has parameter \\$context with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Sorting/ManualSortingTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iWaitForSeconds\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ManualSortingTest\\:\\:search\\(\\) has parameter \\$expectedNumbers with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Sorting/ManualSortingTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:iWaitForSeconds\\(\\) has parameter \\$seconds with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ManualSortingTest\\:\\:search\\(\\) has parameter \\$products with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Sorting/ManualSortingTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:myFinishedOrderShouldLookLikeThis\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\PopularitySortingTest\\:\\:search\\(\\) has parameter \\$configs with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Sorting/PopularitySortingTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:removeCustomDispatchSurcharge\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\PopularitySortingTest\\:\\:search\\(\\) has parameter \\$expectedNumbers with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Sorting/PopularitySortingTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:removeCustomPaymentSurcharge\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\PopularitySortingTest\\:\\:search\\(\\) has parameter \\$products with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Sorting/PopularitySortingTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:removeCustomTaxation\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\PriceSortingTest\\:\\:getPriceContext\\(\\) has parameter \\$discount with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Sorting/PriceSortingTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:spin\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\PriceSortingTest\\:\\:getPriceContext\\(\\) has parameter \\$displayGross with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Sorting/PriceSortingTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:spin\\(\\) has parameter \\$lambda with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\PriceSortingTest\\:\\:search\\(\\) has parameter \\$configs with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Sorting/PriceSortingTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:theAddressboxMustContain\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\PriceSortingTest\\:\\:search\\(\\) has parameter \\$context with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Sorting/PriceSortingTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:theAddressboxMustContain\\(\\) has parameter \\$address with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\PriceSortingTest\\:\\:search\\(\\) has parameter \\$expectedNumbers with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Sorting/PriceSortingTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:theAddressboxMustContain\\(\\) has parameter \\$title with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\PriceSortingTest\\:\\:search\\(\\) has parameter \\$products with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Sorting/PriceSortingTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:theAggregationsShouldLookLikeThis\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ProductAttributeSortingTest\\:\\:search\\(\\) has parameter \\$configs with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Sorting/ProductAttributeSortingTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:theArticleHasNoActivePriceGroup\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ProductAttributeSortingTest\\:\\:search\\(\\) has parameter \\$context with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Sorting/ProductAttributeSortingTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:theArticleHasNoActivePriceGroup\\(\\) has parameter \\$articleNumber with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ProductAttributeSortingTest\\:\\:search\\(\\) has parameter \\$expectedNumbers with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Sorting/ProductAttributeSortingTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:theArticleIsAssignedToThePriceGroup\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ProductAttributeSortingTest\\:\\:search\\(\\) has parameter \\$products with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Sorting/ProductAttributeSortingTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:theArticleIsAssignedToThePriceGroup\\(\\) has parameter \\$articleNumber with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ProductNameSortingTest\\:\\:search\\(\\) has parameter \\$configs with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Sorting/ProductNameSortingTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:theArticleIsAssignedToThePriceGroup\\(\\) has parameter \\$priceGroupName with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ProductNameSortingTest\\:\\:search\\(\\) has parameter \\$context with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Sorting/ProductNameSortingTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:theCartContainsTheFollowingProducts\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ProductNameSortingTest\\:\\:search\\(\\) has parameter \\$expectedNumbers with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Sorting/ProductNameSortingTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:theCartShouldContainTheFollowingProducts\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ProductNameSortingTest\\:\\:search\\(\\) has parameter \\$products with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Sorting/ProductNameSortingTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:theCustomerGroupExist\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ProductNumberSortingTest\\:\\:search\\(\\) has parameter \\$configs with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Sorting/ProductNumberSortingTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:theFollowingProductExist\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ProductNumberSortingTest\\:\\:search\\(\\) has parameter \\$context with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Sorting/ProductNumberSortingTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:theManufacturerExist\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ProductNumberSortingTest\\:\\:search\\(\\) has parameter \\$expectedNumbers with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Sorting/ProductNumberSortingTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:thereIsACategoryDefined\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ProductNumberSortingTest\\:\\:search\\(\\) has parameter \\$products with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Sorting/ProductNumberSortingTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:thereShouldBeAModalAddressbox\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ReleaseDateSortingTest\\:\\:search\\(\\) has parameter \\$configs with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Sorting/ReleaseDateSortingTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\CheckoutContext\\:\\:thereShouldBeAModalAddressbox\\(\\) has parameter \\$address with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ReleaseDateSortingTest\\:\\:search\\(\\) has parameter \\$context with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Sorting/ReleaseDateSortingTest.php
 
 		-
-			message: "#^Parameter \\#1 \\$givenAddress of method Shopware\\\\Tests\\\\Mink\\\\Element\\\\CheckoutAddressBox\\:\\:containsAdress\\(\\) expects array, array\\<int, string\\>\\|string\\|null given\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ReleaseDateSortingTest\\:\\:search\\(\\) has parameter \\$expectedNumbers with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/CheckoutContext.php
+			path: tests/Functional/Bundle/SearchBundle/Sorting/ReleaseDateSortingTest.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:canNotSelectConfiguratorOption\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SearchBundle\\\\Sorting\\\\ReleaseDateSortingTest\\:\\:search\\(\\) has parameter \\$products with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/DetailContext.php
+			path: tests/Functional/Bundle/SearchBundle/Sorting/ReleaseDateSortingTest.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:checkSelect\\(\\)\\.$#"
+			message: "#^Parameter \\#1 \\$sql of method Doctrine\\\\DBAL\\\\Connection\\:\\:exec\\(\\) expects string, string\\|false given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/DetailContext.php
+			path: tests/Functional/Bundle/SearchBundleDBAL/SearchIndexerTest.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:configure\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\SitemapBundle\\\\SitemapLockTest\\:\\:testLocks\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/DetailContext.php
+			path: tests/Functional/Bundle/SitemapBundle/SitemapLockTest.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:submitNotification\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\CheapestPriceTest\\:\\:createPriceGroupProduct\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/DetailContext.php
+			path: tests/Functional/Bundle/StoreFrontBundle/CheapestPriceTest.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:writeEvaluation\\(\\)\\.$#"
+			message: "#^Parameter \\#1 \\$host of method Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\Shop\\:\\:setHost\\(\\) expects string, string\\|null given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/DetailContext.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Converter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\DetailContext\\:\\:iAmOnTheDetailPageForArticle\\(\\) has parameter \\$articleId with no type specified\\.$#"
+			message: "#^Parameter \\#1 \\$path of method Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\Shop\\:\\:setPath\\(\\) expects string, string\\|null given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/DetailContext.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Converter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\DetailContext\\:\\:iAmOnTheDetailPageForVariantOfArticle\\(\\) has parameter \\$articleId with no type specified\\.$#"
+			message: "#^Parameter \\#1 \\$quantity of method Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\Product\\\\PriceDiscount\\:\\:setQuantity\\(\\) expects int, float given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/DetailContext.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Converter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\DetailContext\\:\\:iAmOnTheDetailPageForVariantOfArticle\\(\\) has parameter \\$number with no type specified\\.$#"
+			message: "#^Parameter \\#1 \\$url of method Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\Shop\\:\\:setUrl\\(\\) expects string, string\\|null given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/DetailContext.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Converter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\DetailContext\\:\\:iCanNotSelectFrom\\(\\) has parameter \\$configuratorGroup with no type specified\\.$#"
+			message: "#^Parameter \\#2 \\$baseUrl of class Shopware\\\\Components\\\\Routing\\\\Context constructor expects string, string\\|null given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/DetailContext.php
+			path: tests/Functional/Bundle/StoreFrontBundle/CoverTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\DetailContext\\:\\:iCanNotSelectFrom\\(\\) has parameter \\$configuratorOption with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:cleanUpCombinations\\(\\) has parameter \\$combinations with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/DetailContext.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\DetailContext\\:\\:iCanSelectEveryOptionOfFromTo\\(\\) has parameter \\$graduation with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:cleanUpCombinations\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/DetailContext.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\DetailContext\\:\\:iCanSelectEveryOptionOfFromTo\\(\\) has parameter \\$max with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:combinations\\(\\) has parameter \\$arrays with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/DetailContext.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\DetailContext\\:\\:iCanSelectEveryOptionOfFromTo\\(\\) has parameter \\$min with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:combinations\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/DetailContext.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\DetailContext\\:\\:iCanSelectEveryOptionOfFromTo\\(\\) has parameter \\$select with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:createCategory\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/DetailContext.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\DetailContext\\:\\:iPutTheArticleTimesIntoTheBasket\\(\\) has parameter \\$quantity with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:createConfiguratorSet\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/DetailContext.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\DetailContext\\:\\:iShouldSeeAnAverageCustomerEvaluationOfFromFollowingEvaluations\\(\\) has parameter \\$average with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:createContext\\(\\) has parameter \\$taxes with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/DetailContext.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\DetailContext\\:\\:iSubmitTheNotificationFormWith\\(\\) has parameter \\$email with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:createCurrency\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/DetailContext.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\DetailContext\\:\\:theShopOwnerActivateMyLatestEvaluation\\(\\) has parameter \\$limit with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:createCustomerGroup\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/DetailContext.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\AccountBilling\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:createManufacturer\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/AccountBilling.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\AccountBilling\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:createProperties\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/AccountBilling.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Cannot call method getText\\(\\) on Behat\\\\Mink\\\\Element\\\\NodeElement\\|null\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:createTax\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/AccountOrder.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\AccountOrder\\:\\:getDateProperty\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:createUnitTranslations\\(\\) has parameter \\$translation with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/AccountOrder.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\AccountOrder\\:\\:getOrderPositionData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:createUnitTranslations\\(\\) has parameter \\$unitIds with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/AccountOrder.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\AccountOrder\\:\\:getPositions\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:createVotes\\(\\) has parameter \\$points with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/AccountOrder.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\AccountOrder\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:generateVariants\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/AccountOrder.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\AccountPayment\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:generateVariants\\(\\) has parameter \\$groups with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/AccountPayment.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\AccountPayment\\:\\:getPaymentMethodProperty\\(\\) should return string but returns string\\|false\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:generateVariants\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/AccountPayment.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\AccountPayment\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getCategoryData\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/AccountPayment.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\AccountShipping\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getConfigurator\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/AccountShipping.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\AccountShipping\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getConfigurator\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/AccountShipping.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\AddressBox\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getGraduatedPrices\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/AddressBox.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\AddressBox\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getImageData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/AddressBox.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Binary operation \"\\.\" between array\\|float\\|string and ' ' results in an error\\.$#"
-			count: 2
-			path: tests/Mink/features/bootstrap/Element/AddressManagementAddressBox.php
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getImageData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Call to an undefined method Shopware\\\\Tests\\\\Mink\\\\Element\\\\AddressManagementAddressBox\\:\\:getCompanyProperty\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getListProduct\\(\\) has parameter \\$configs with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/AddressManagementAddressBox.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Call to an undefined method Shopware\\\\Tests\\\\Mink\\\\Element\\\\AddressManagementAddressBox\\:\\:getTitleProperty\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getListProduct\\(\\) should return Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\ListProduct but returns Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\ListProduct\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/AddressManagementAddressBox.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\AddressManagementAddressBox\\:\\:containsAdress\\(\\) has parameter \\$givenAddress with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getListProducts\\(\\) has parameter \\$configs with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/AddressManagementAddressBox.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\AddressManagementAddressBox\\:\\:getCompanyOrNull\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getManufacturerData\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/AddressManagementAddressBox.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\AddressManagementAddressBox\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getProductData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/AddressManagementAddressBox.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\AddressManagementAddressBox\\:\\:hasTitle\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getProductData\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/AddressManagementAddressBox.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\AddressManagementAddressBox\\:\\:hasTitle\\(\\) has parameter \\$title with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getProductOptionsByName\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/AddressManagementAddressBox.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\AddressManagementAddressBox\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getProperties\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/AddressManagementAddressBox.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\Article\\:\\:getImageProperty\\(\\) should return string but returns string\\|null\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getShop\\(\\) should return Shopware\\\\Models\\\\Shop\\\\Shop but returns Shopware\\\\Models\\\\Shop\\\\Shop\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/Article.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\Article\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getUnitData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/Article.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\ArticleBox\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getUnitData\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/ArticleBox.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\ArticleBox\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getVariantData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/ArticleBox.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\ArticleEvaluation\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getVariantData\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/ArticleEvaluation.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Ternary operator condition is always true\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getVariantsByOptions\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/ArticleEvaluation.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Cannot call method getAttribute\\(\\) on Behat\\\\Mink\\\\Element\\\\NodeElement\\|null\\.$#"
-			count: 5
-			path: tests/Mink/features/bootstrap/Element/ArticleSlider.php
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:getVariantsByOptions\\(\\) return type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Cannot call method getHtml\\(\\) on Behat\\\\Mink\\\\Element\\\\NodeElement\\|null\\.$#"
-			count: 2
-			path: tests/Mink/features/bootstrap/Element/ArticleSlider.php
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:insertConfiguratorData\\(\\) has parameter \\$groups with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\ArticleSlider\\:\\:getImageProperty\\(\\) should return string but returns string\\|null\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\Helper\\:\\:updateConfiguratorVariants\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/ArticleSlider.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Parameter \\#2 \\$locator of method Behat\\\\Mink\\\\Element\\\\Element\\:\\:find\\(\\) expects array\\|string, bool\\|string given\\.$#"
-			count: 2
-			path: tests/Mink/features/bootstrap/Element/ArticleSlider.php
+			message: "#^Parameter \\#1 \\$customerGroup of method Shopware\\\\Models\\\\Price\\\\Discount\\:\\:setCustomerGroup\\(\\) expects Shopware\\\\Models\\\\Customer\\\\Group, Shopware\\\\Models\\\\Customer\\\\Group\\|null given\\.$#"
+			count: 1
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\ArticleSlider\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#1 \\$position of method Shopware\\\\Models\\\\Article\\\\Configurator\\\\Group\\:\\:setPosition\\(\\) expects int, array given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/ArticleSlider.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\Backend\\\\ContentTypeManagerDetailWindow\\:\\:\\$elements type has no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Column \"s_articles_vote\\.active\" expects value type int, got type '1'$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/Backend/ContentTypeManagerDetailWindow.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\Backend\\\\ContentTypeManagerFieldWindow\\:\\:\\$elements type has no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Column \"s_articles_vote\\.id\" expects value type int, got type null$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/Backend/ContentTypeManagerFieldWindow.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\Backend\\\\ContentTypeManagerListWindow\\:\\:\\$elements type has no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Column \"s_articles_vote\\.points\" expects value type float\\|int, got type mixed$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/Backend/ContentTypeManagerListWindow.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\Backend\\\\CustomRecipesListWindow\\:\\:\\$elements type has no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Column \"s_filter_relations\\.groupID\" expects value type int, got type mixed$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/Backend/CustomRecipesListWindow.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\Banner\\:\\:click\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_filter_relations\\.optionID\" expects value type int, got type mixed$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/Banner.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\Banner\\:\\:getImageProperty\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Column \"s_filter_values\\.optionID\" expects value type int, got type mixed$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/Banner.php
+			path: tests/Functional/Bundle/StoreFrontBundle/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\Banner\\:\\:getImageProperty\\(\\) should return array but returns string\\|null\\.$#"
+			message: "#^Cannot call method getMedia\\(\\) on Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\Product\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/Banner.php
+			path: tests/Functional/Bundle/StoreFrontBundle/ProductMediaTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\Banner\\:\\:getLinkProperty\\(\\) should return string but returns string\\|null\\.$#"
+			message: "#^Parameter \\#2 \\$baseUrl of class Shopware\\\\Components\\\\Routing\\\\Context constructor expects string, string\\|null given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/Banner.php
+			path: tests/Functional/Bundle/StoreFrontBundle/ProductMediaTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\Banner\\:\\:getMapping\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\PropertyHydratorTest\\:\\:hydrateDataProvider\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/Banner.php
+			path: tests/Functional/Bundle/StoreFrontBundle/PropertyHydratorTest.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\Banner\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\TestCase\\:\\:assertSearchResult\\(\\) has parameter \\$expectedNumbers with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/Banner.php
+			path: tests/Functional/Bundle/StoreFrontBundle/TestCase.php
 
 		-
-			message: "#^Cannot call method getAttribute\\(\\) on Behat\\\\Mink\\\\Element\\\\NodeElement\\|null\\.$#"
-			count: 4
-			path: tests/Mink/features/bootstrap/Element/BannerSlider.php
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\TestCase\\:\\:search\\(\\) has parameter \\$configs with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: tests/Functional/Bundle/StoreFrontBundle/TestCase.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\BannerSlider\\:\\:getImageProperty\\(\\) should return string but returns string\\|null\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\TestCase\\:\\:search\\(\\) has parameter \\$expectedNumbers with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/BannerSlider.php
+			path: tests/Functional/Bundle/StoreFrontBundle/TestCase.php
 
 		-
-			message: "#^Parameter \\#2 \\$locator of method Behat\\\\Mink\\\\Element\\\\Element\\:\\:find\\(\\) expects array\\|string, bool\\|string given\\.$#"
-			count: 4
-			path: tests/Mink/features/bootstrap/Element/BannerSlider.php
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Bundle\\\\StoreFrontBundle\\\\TestCase\\:\\:search\\(\\) has parameter \\$products with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: tests/Functional/Bundle/StoreFrontBundle/TestCase.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\BannerSlider\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Commands\\\\ConfigSetCommandTest\\:\\:configValueProvider\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/BannerSlider.php
+			path: tests/Functional/Commands/ConfigSetCommandTest.php
 
 		-
-			message: "#^Cannot call method getAttribute\\(\\) on Behat\\\\Mink\\\\Element\\\\NodeElement\\|null\\.$#"
-			count: 5
-			path: tests/Mink/features/bootstrap/Element/BlogArticle.php
+			message: "#^Cannot access offset 'customer' on array\\|Shopware\\\\Models\\\\Customer\\\\Address\\.$#"
+			count: 1
+			path: tests/Functional/Components/Api/AddressTest.php
 
 		-
-			message: "#^Cannot call method getText\\(\\) on Behat\\\\Mink\\\\Element\\\\NodeElement\\|null\\.$#"
-			count: 2
-			path: tests/Mink/features/bootstrap/Element/BlogArticle.php
+			message: "#^Cannot access offset 'id' on array\\|Shopware\\\\Models\\\\Customer\\\\Address\\.$#"
+			count: 1
+			path: tests/Functional/Components/Api/AddressTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\BlogArticle\\:\\:getArticles\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Cannot call method getDefaultBillingAddress\\(\\) on Shopware\\\\Models\\\\Customer\\\\Customer\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/BlogArticle.php
+			path: tests/Functional/Components/Api/AddressTest.php
 
 		-
-			message: "#^Parameter \\#1 \\$titles of method Shopware\\\\Tests\\\\Mink\\\\Element\\\\BlogArticle\\:\\:getUniqueTitle\\(\\) expects array\\<string\\>, array\\<string, string\\|null\\> given\\.$#"
+			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Country\\\\Country\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/BlogArticle.php
+			path: tests/Functional/Components/Api/AddressTest.php
 
 		-
-			message: "#^Parameter \\#2 \\$locator of method Behat\\\\Mink\\\\Element\\\\Element\\:\\:find\\(\\) expects array\\|string, bool\\|string given\\.$#"
-			count: 2
-			path: tests/Mink/features/bootstrap/Element/BlogArticle.php
+			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Customer\\\\Address\\|null\\.$#"
+			count: 3
+			path: tests/Functional/Components/Api/AddressTest.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\BlogArticle\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\AddressTest\\:\\:testDeleteShouldBeSuccessfulAfterOtherDefaultAddress\\(\\) has parameter \\$id with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/BlogArticle.php
+			path: tests/Functional/Components/Api/AddressTest.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\BlogArticleBox\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\AddressTest\\:\\:testGetOneShouldBeSuccessful\\(\\) has parameter \\$id with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/BlogArticleBox.php
+			path: tests/Functional/Components/Api/AddressTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\BlogBox\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\AddressTest\\:\\:testMakeNewAddressTheDefault\\(\\) has parameter \\$id with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/BlogBox.php
+			path: tests/Functional/Components/Api/AddressTest.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\BlogBox\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\AddressTest\\:\\:testUpdateShouldBeSuccessful\\(\\) has parameter \\$id with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/BlogBox.php
+			path: tests/Functional/Components/Api/AddressTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\BlogComment\\:\\:getProperties\\(\\) has parameter \\$locators with no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#1 \\$id of method Shopware\\\\Components\\\\Api\\\\Resource\\\\Address\\:\\:delete\\(\\) expects int, string given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/BlogComment.php
+			path: tests/Functional/Components/Api/AddressTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\BlogComment\\:\\:getProperties\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#1 \\$id of method Shopware\\\\Components\\\\Api\\\\Resource\\\\Address\\:\\:update\\(\\) expects int, string given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/BlogComment.php
+			path: tests/Functional/Components/Api/AddressTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\BlogComment\\:\\:getStars\\(\\) should return string but returns string\\|null\\.$#"
+			message: "#^Cannot access offset 'id' on array\\|Shopware\\\\Models\\\\Category\\\\Category\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/BlogComment.php
+			path: tests/Functional/Components/Api/CategoryTest.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\BlogComment\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Element/BlogComment.php
+			message: "#^Cannot call method getAttribute1\\(\\) on Shopware\\\\Models\\\\Attribute\\\\Category\\|null\\.$#"
+			count: 2
+			path: tests/Functional/Components/Api/CategoryTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\CartPosition\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Cannot call method getAttribute2\\(\\) on Shopware\\\\Models\\\\Attribute\\\\Category\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/CartPosition.php
+			path: tests/Functional/Components/Api/CategoryTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\CartPosition\\:\\:getUniqueName\\(\\) has parameter \\$names with no value type specified in iterable type array\\.$#"
+			message: "#^Cannot call method getAttribute6\\(\\) on Shopware\\\\Models\\\\Attribute\\\\Category\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/CartPosition.php
+			path: tests/Functional/Components/Api/CategoryTest.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\CartPosition\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Element/CartPosition.php
+			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Category\\\\Category\\|null\\.$#"
+			count: 3
+			path: tests/Functional/Components/Api/CategoryTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\CategoryTeaser\\:\\:getImageProperty\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Element/CategoryTeaser.php
+			message: "#^Cannot call method getName\\(\\) on Shopware\\\\Models\\\\Category\\\\Category\\|null\\.$#"
+			count: 3
+			path: tests/Functional/Components/Api/CategoryTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\CategoryTeaser\\:\\:getImageProperty\\(\\) should return array but returns string\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Element/CategoryTeaser.php
+			message: "#^Cannot call method getParent\\(\\) on Shopware\\\\Models\\\\Category\\\\Category\\|null\\.$#"
+			count: 5
+			path: tests/Functional/Components/Api/CategoryTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\CategoryTeaser\\:\\:getLinkProperty\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\CategoryTest\\:\\:testDeleteShouldBeSuccessful\\(\\) has parameter \\$id with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/CategoryTeaser.php
+			path: tests/Functional/Components/Api/CategoryTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\CategoryTeaser\\:\\:getLinkProperty\\(\\) should return array but returns string\\|null\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\CategoryTest\\:\\:testGetOneShouldBeSuccessful\\(\\) has parameter \\$id with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/CategoryTeaser.php
+			path: tests/Functional/Components/Api/CategoryTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\CategoryTeaser\\:\\:getNameProperty\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\CategoryTest\\:\\:testUpdateShouldBeSuccessful\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/CategoryTeaser.php
+			path: tests/Functional/Components/Api/CategoryTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\CategoryTeaser\\:\\:getNameProperty\\(\\) should return array\\<array\\> but returns string\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\CategoryTest\\:\\:testUpdateShouldBeSuccessful\\(\\) has parameter \\$id with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/CategoryTeaser.php
+			path: tests/Functional/Components/Api/CategoryTest.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\CategoryTeaser\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#1 \\$id of method Shopware\\\\Components\\\\Api\\\\Resource\\\\Category\\:\\:delete\\(\\) expects int, string given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/CategoryTeaser.php
-
-		-
-			message: "#^Binary operation \"\\.\" between array\\|float\\|string and ' ' results in an error\\.$#"
-			count: 2
-			path: tests/Mink/features/bootstrap/Element/CheckoutAddressBox.php
+			path: tests/Functional/Components/Api/CategoryTest.php
 
 		-
-			message: "#^Call to an undefined method Shopware\\\\Tests\\\\Mink\\\\Element\\\\CheckoutAddressBox\\:\\:getCompanyProperty\\(\\)\\.$#"
+			message: "#^Parameter \\#1 \\$id of method Shopware\\\\Components\\\\Api\\\\Resource\\\\Category\\:\\:update\\(\\) expects int, string given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/CheckoutAddressBox.php
+			path: tests/Functional/Components/Api/CategoryTest.php
 
 		-
-			message: "#^Call to an undefined method Shopware\\\\Tests\\\\Mink\\\\Element\\\\CheckoutAddressBox\\:\\:getPanelTitleProperty\\(\\)\\.$#"
+			message: "#^Cannot access offset 'id' on array\\|Shopware\\\\Models\\\\Customer\\\\Group\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/CheckoutAddressBox.php
+			path: tests/Functional/Components/Api/CustomerGroupTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\CheckoutAddressBox\\:\\:containsAdress\\(\\) has parameter \\$givenAddress with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\CustomerGroupTest\\:\\:testDeleteShouldBeSuccessful\\(\\) has parameter \\$id with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/CheckoutAddressBox.php
+			path: tests/Functional/Components/Api/CustomerGroupTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\CheckoutAddressBox\\:\\:getCompanyOrNull\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\CustomerGroupTest\\:\\:testGetOneShouldBeSuccessful\\(\\) has parameter \\$id with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/CheckoutAddressBox.php
+			path: tests/Functional/Components/Api/CustomerGroupTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\CheckoutAddressBox\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\CustomerGroupTest\\:\\:testUpdateShouldBeSuccessful\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/CheckoutAddressBox.php
+			path: tests/Functional/Components/Api/CustomerGroupTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\CheckoutAddressBox\\:\\:hasTitle\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\CustomerGroupTest\\:\\:testUpdateShouldBeSuccessful\\(\\) has parameter \\$id with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/CheckoutAddressBox.php
+			path: tests/Functional/Components/Api/CustomerGroupTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\CheckoutAddressBox\\:\\:hasTitle\\(\\) has parameter \\$title with no type specified\\.$#"
+			message: "#^Parameter \\#1 \\$id of method Shopware\\\\Components\\\\Api\\\\Resource\\\\CustomerGroup\\:\\:delete\\(\\) expects int, string given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/CheckoutAddressBox.php
+			path: tests/Functional/Components/Api/CustomerGroupTest.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\CheckoutAddressBox\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#1 \\$id of method Shopware\\\\Components\\\\Api\\\\Resource\\\\CustomerGroup\\:\\:update\\(\\) expects int, string given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/CheckoutAddressBox.php
+			path: tests/Functional/Components/Api/CustomerGroupTest.php
 
 		-
-			message: "#^Binary operation \"\\.\" between array\\|float\\|string and ' ' results in an error\\.$#"
+			message: "#^Query error\\: Argument \\#1 is not a constant array, got array\\<string, mixed\\>$#"
 			count: 2
-			path: tests/Mink/features/bootstrap/Element/CheckoutAddressBoxModal.php
+			path: tests/Functional/Components/Api/EmotionPresetTest.php
 
 		-
-			message: "#^Call to an undefined method Shopware\\\\Tests\\\\Mink\\\\Element\\\\CheckoutAddressBoxModal\\:\\:getCompanyProperty\\(\\)\\.$#"
+			message: "#^Query error\\: Argument \\#1 is not a constant array, got non\\-empty\\-array\\<string, mixed\\>&hasOffsetValue\\('presetID', int\\|string\\|false\\)$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/CheckoutAddressBoxModal.php
+			path: tests/Functional/Components/Api/EmotionPresetTest.php
 
 		-
-			message: "#^Call to an undefined method Shopware\\\\Tests\\\\Mink\\\\Element\\\\CheckoutAddressBoxModal\\:\\:getPanelTitleProperty\\(\\)\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Element/CheckoutAddressBoxModal.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\CheckoutAddressBoxModal\\:\\:containsAdress\\(\\) has parameter \\$givenAddress with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Element/CheckoutAddressBoxModal.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\CheckoutAddressBoxModal\\:\\:getCompanyOrNull\\(\\) has no return type specified\\.$#"
+			message: "#^Cannot access offset 'id' on array\\|Shopware\\\\Models\\\\Property\\\\Group\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/CheckoutAddressBoxModal.php
+			path: tests/Functional/Components/Api/PropertyGroupTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\CheckoutAddressBoxModal\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\PropertyGroupTest\\:\\:testCreateShouldBeSuccessful\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/CheckoutAddressBoxModal.php
+			path: tests/Functional/Components/Api/PropertyGroupTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\CheckoutAddressBoxModal\\:\\:hasTitle\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\PropertyGroupTest\\:\\:testCreateShouldThrowCustomValidationException\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/CheckoutAddressBoxModal.php
+			path: tests/Functional/Components/Api/PropertyGroupTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\CheckoutAddressBoxModal\\:\\:hasTitle\\(\\) has parameter \\$title with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\PropertyGroupTest\\:\\:testDeleteShouldBeSuccessful\\(\\) has parameter \\$id with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/CheckoutAddressBoxModal.php
+			path: tests/Functional/Components/Api/PropertyGroupTest.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\CheckoutAddressBoxModal\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\PropertyGroupTest\\:\\:testGetListShouldBeAbleToReturnObjects\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/CheckoutAddressBoxModal.php
+			path: tests/Functional/Components/Api/PropertyGroupTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\CheckoutBilling\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\PropertyGroupTest\\:\\:testGetListShouldBeSuccessful\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/CheckoutBilling.php
+			path: tests/Functional/Components/Api/PropertyGroupTest.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\CheckoutBilling\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\PropertyGroupTest\\:\\:testGetOneShouldBeAbleToReturnObject\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/CheckoutBilling.php
+			path: tests/Functional/Components/Api/PropertyGroupTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\CheckoutModalAddressEditor\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\PropertyGroupTest\\:\\:testGetOneShouldBeAbleToReturnObject\\(\\) has parameter \\$id with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/CheckoutModalAddressEditor.php
+			path: tests/Functional/Components/Api/PropertyGroupTest.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\CheckoutModalAddressEditor\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\PropertyGroupTest\\:\\:testGetOneShouldBeSuccessful\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/CheckoutModalAddressEditor.php
+			path: tests/Functional/Components/Api/PropertyGroupTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\CheckoutModalAddressSelection\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\PropertyGroupTest\\:\\:testGetOneShouldBeSuccessful\\(\\) has parameter \\$id with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/CheckoutModalAddressSelection.php
+			path: tests/Functional/Components/Api/PropertyGroupTest.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\CheckoutModalAddressSelection\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\PropertyGroupTest\\:\\:testUpdateShouldBeSuccessful\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/CheckoutModalAddressSelection.php
+			path: tests/Functional/Components/Api/PropertyGroupTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\CheckoutPayment\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\PropertyGroupTest\\:\\:testUpdateShouldBeSuccessful\\(\\) has parameter \\$id with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/CheckoutPayment.php
+			path: tests/Functional/Components/Api/PropertyGroupTest.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\CheckoutPayment\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\PropertyGroupTest\\:\\:testUpdateWithInvalidIdShouldThrowNotFoundException\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/CheckoutPayment.php
+			path: tests/Functional/Components/Api/PropertyGroupTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\CheckoutShipping\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Api\\\\PropertyGroupTest\\:\\:testUpdateWithMissingIdShouldThrowParameterMissingException\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/CheckoutShipping.php
+			path: tests/Functional/Components/Api/PropertyGroupTest.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\CheckoutShipping\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#1 \\$id of method Shopware\\\\Components\\\\Api\\\\Resource\\\\PropertyGroup\\:\\:delete\\(\\) expects int, string given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/CheckoutShipping.php
+			path: tests/Functional/Components/Api/PropertyGroupTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\CompareColumn\\:\\:getImageProperty\\(\\) should return string but returns string\\|null\\.$#"
+			message: "#^Parameter \\#1 \\$id of method Shopware\\\\Components\\\\Api\\\\Resource\\\\PropertyGroup\\:\\:update\\(\\) expects int, string given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/CompareColumn.php
+			path: tests/Functional/Components/Api/PropertyGroupTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\CompareColumn\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Column \"s_core_plugins\\.added\" expects value type string, got type DateTime$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/CompareColumn.php
+			path: tests/Functional/Components/CacheSubscriberTest.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\CompareColumn\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\BasketQueryHelperTest\\:\\:testGetInsertDiscountAttributeQuery\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/CompareColumn.php
+			path: tests/Functional/Components/Cart/BasketQueryHelperTest.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\FilterGroup\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\BasketQueryHelperTest\\:\\:testGetInsertDiscountQuery\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/FilterGroup.php
+			path: tests/Functional/Components/Cart/BasketQueryHelperTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\HeaderCart\\:\\:checkCart\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\BasketQueryHelperTest\\:\\:testGetLastInsertId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/HeaderCart.php
+			path: tests/Functional/Components/Cart/BasketQueryHelperTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\HeaderCart\\:\\:clickCart\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\BasketQueryHelperTest\\:\\:testGetPositionPricesQuery\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/HeaderCart.php
+			path: tests/Functional/Components/Cart/BasketQueryHelperTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\HeaderCart\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\BasketQueryHelperTest\\:\\:\\$queryHelper \\(Shopware\\\\Components\\\\Cart\\\\BasketQueryHelper\\) does not accept null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/HeaderCart.php
+			path: tests/Functional/Components/Cart/BasketQueryHelperTest.php
 
 		-
-			message: "#^Parameter \\#2 \\$keys of static method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:findElements\\(\\) expects array, string given\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Element/HeaderCart.php
+			message: "#^Query error\\: Column \"s_order_basket\\.sessionID\" expects value type string\\|null, got type mixed$#"
+			count: 4
+			path: tests/Functional/Components/Cart/CartPersistServiceTest.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\HeaderCart\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Column \"s_core_tax\\.tax\" expects value type numeric\\-string, got type 7\\.75$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/HeaderCart.php
+			path: tests/Functional/Components/Cart/FloatTaxCalculationTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\LanguageSwitcher\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\PaymentTokenServiceTest\\:\\:paymentTokenProviders\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/LanguageSwitcher.php
+			path: tests/Functional/Components/Cart/PaymentTokenServiceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\LanguageSwitcher\\:\\:setLanguage\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\ProportionalCartCalculationCustomerGroupTest\\:\\:testCustomerGroupDiscountNormal\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/LanguageSwitcher.php
+			path: tests/Functional/Components/Cart/ProportionalCartCalculationCustomerGroupTest.php
 
 		-
-			message: "#^Parameter \\#2 \\$locator of method Behat\\\\Mink\\\\Element\\\\Element\\:\\:findAll\\(\\) expects array\\|string, bool\\|string given\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\ProportionalCartCalculationCustomerGroupTest\\:\\:testCustomerGroupDiscountNormalMultipleTaxes\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/LanguageSwitcher.php
+			path: tests/Functional/Components/Cart/ProportionalCartCalculationCustomerGroupTest.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\LanguageSwitcher\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\ProportionalCartCalculationCustomerGroupTest\\:\\:testCustomerGroupWithMinimumOrderNormal\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/LanguageSwitcher.php
-
-		-
-			message: "#^Cannot call method getAttribute\\(\\) on Behat\\\\Mink\\\\Element\\\\NodeElement\\|null\\.$#"
-			count: 4
-			path: tests/Mink/features/bootstrap/Element/ManufacturerSlider.php
+			path: tests/Functional/Components/Cart/ProportionalCartCalculationCustomerGroupTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\ManufacturerSlider\\:\\:getImageProperty\\(\\) should return string but returns string\\|null\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Cart\\\\ProportionalCartCalculationCustomerGroupTest\\:\\:testCustomerGroupWithMinimumOrderTaxes\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/ManufacturerSlider.php
+			path: tests/Functional/Components/Cart/ProportionalCartCalculationCustomerGroupTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\ManufacturerSlider\\:\\:getLinkProperty\\(\\) should return string but returns string\\|null\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\DependencyInjection\\\\Compiler\\\\ConfigureContainerAwareCommandsTest\\:\\:getShopwareCommands\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/ManufacturerSlider.php
-
-		-
-			message: "#^Parameter \\#2 \\$locator of method Behat\\\\Mink\\\\Element\\\\Element\\:\\:find\\(\\) expects array\\|string, bool\\|string given\\.$#"
-			count: 2
-			path: tests/Mink/features/bootstrap/Element/ManufacturerSlider.php
+			path: tests/Functional/Components/DependencyInjection/Compiler/ConfigureContainerAwareCommandsTest.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\ManufacturerSlider\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\DependencyInjection\\\\ContainerTest\\:\\:attachEvent\\(\\) has parameter \\$callback with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/ManufacturerSlider.php
+			path: tests/Functional/Components/DependencyInjection/ContainerTest.php
 
 		-
-			message: "#^Class Shopware\\\\Tests\\\\Mink\\\\Element\\\\MultipleElement implements generic interface Iterator but does not specify its types\\: TKey, TValue$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\DependencyInjection\\\\ContainerTest\\:\\:listenerCallbackReturningOtherClass\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/MultipleElement.php
+			path: tests/Functional/Components/DependencyInjection/ContainerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\MultipleElement\\:\\:__call\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\DependencyInjection\\\\ContainerTest\\:\\:testChangingServiceInAnEvent\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/MultipleElement.php
+			path: tests/Functional/Components/DependencyInjection/ContainerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\MultipleElement\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\DependencyInjection\\\\ContainerTest\\:\\:testDecorationOfAliasWorks\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/MultipleElement.php
+			path: tests/Functional/Components/DependencyInjection/ContainerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\MultipleElement\\:\\:remove\\(\\) has no return type specified\\.$#"
+			message: "#^Service \"Shopware\\\\Tests\\\\Functional\\\\Components\\\\DependencyInjection\\\\DecoratingService\" is not registered in the container\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/MultipleElement.php
+			path: tests/Functional/Components/DependencyInjection/ContainerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\NotePosition\\:\\:getImageProperty\\(\\) should return string but returns string\\|null\\.$#"
+			message: "#^Service \"Shopware\\\\Tests\\\\Functional\\\\Components\\\\DependencyInjection\\\\OriginalService\" is not registered in the container\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/NotePosition.php
+			path: tests/Functional/Components/DependencyInjection/ContainerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\NotePosition\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Service \"decoratingservice\" is not registered in the container\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/NotePosition.php
+			path: tests/Functional/Components/DependencyInjection/ContainerTest.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\NotePosition\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
+			message: "#^Service \"originalservice\" is not registered in the container\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/NotePosition.php
+			path: tests/Functional/Components/DependencyInjection/ContainerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\Paging\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Column \"s_core_translations\\.objectkey\" expects value type int, got type mixed$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/Paging.php
+			path: tests/Functional/Components/Emotion/Preset/EmotionToPresetDataTransformerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\Paging\\:\\:moveDirection\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_core_translations\\.objectlanguage\" expects value type string, got type 2$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/Paging.php
+			path: tests/Functional/Components/Emotion/Preset/EmotionToPresetDataTransformerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\Paging\\:\\:moveToPage\\(\\) has no return type specified\\.$#"
+			message: "#^Cannot call method toArray\\(\\) on array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/Paging.php
+			path: tests/Functional/Components/LegacyRequestWrapper/GetWrapperTest.php
 
 		-
-			message: "#^Parameter \\#1 \\$locator of method Behat\\\\Mink\\\\Element\\\\TraversableElement\\:\\:clickLink\\(\\) expects string, int given\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\LegacyRequestWrapper\\\\GetWrapperTest\\:\\:testOverwriteAndClearQuery\\(\\) has parameter \\$getData with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/Paging.php
+			path: tests/Functional/Components/LegacyRequestWrapper/GetWrapperTest.php
 
 		-
-			message: "#^Parameter \\#1 \\$locator of method Behat\\\\Mink\\\\Element\\\\TraversableElement\\:\\:hasLink\\(\\) expects string, int given\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\LegacyRequestWrapper\\\\GetWrapperTest\\:\\:testSetQuery\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/Paging.php
+			path: tests/Functional/Components/LegacyRequestWrapper/GetWrapperTest.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\Paging\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Components\\\\LegacyRequestWrapper\\\\GetWrapperTest\\:\\:\\$resources type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/Paging.php
+			path: tests/Functional/Components/LegacyRequestWrapper/GetWrapperTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\SearchForm\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Cannot call method toArray\\(\\) on array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/SearchForm.php
+			path: tests/Functional/Components/LegacyRequestWrapper/PostWrapperTest.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\SearchForm\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\LegacyRequestWrapper\\\\PostWrapperTest\\:\\:testOverwriteAndClearPost\\(\\) has parameter \\$getData with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/SearchForm.php
+			path: tests/Functional/Components/LegacyRequestWrapper/PostWrapperTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\SitemapGroup\\:\\:getLevel1Data\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\LegacyRequestWrapper\\\\PostWrapperTest\\:\\:testSetPost\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/SitemapGroup.php
+			path: tests/Functional/Components/LegacyRequestWrapper/PostWrapperTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\SitemapGroup\\:\\:getLevel2Data\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Components\\\\LegacyRequestWrapper\\\\PostWrapperTest\\:\\:\\$resources type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/SitemapGroup.php
+			path: tests/Functional/Components/LegacyRequestWrapper/PostWrapperTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\SitemapGroup\\:\\:getTitleLinkData\\(\\) should return array\\<string\\> but returns array\\<string, string\\|null\\>\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Migrations\\\\Migrations_Migration1607Test\\:\\:commentArticleConfigProvider\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/SitemapGroup.php
+			path: tests/Functional/Components/Migrations/Migrations_Migration1607Test.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\SitemapGroup\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
+			message: "#^Call to an undefined method Doctrine\\\\ORM\\\\Configuration\\:\\:getAttributeDir\\(\\)\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/SitemapGroup.php
+			path: tests/Functional/Components/Model/GeneratorTest.php
 
 		-
-			message: "#^Cannot call method getText\\(\\) on Behat\\\\Mink\\\\Element\\\\NodeElement\\|null\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Model\\\\GeneratorTest\\:\\:addAndEvaluateInitialization\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/SliderElement.php
+			path: tests/Functional/Components/Model/GeneratorTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\SliderElement\\:\\:__call\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Model\\\\GeneratorTest\\:\\:testDefaultInitializationBooleanFalse\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/SliderElement.php
+			path: tests/Functional/Components/Model/GeneratorTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\SliderElement\\:\\:__call\\(\\) should return string but returns string\\|null\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Model\\\\GeneratorTest\\:\\:testDefaultInitializationBooleanTrue\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/SliderElement.php
+			path: tests/Functional/Components/Model/GeneratorTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\SliderElement\\:\\:getSlides\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Model\\\\GeneratorTest\\:\\:testDefaultInitializationDate\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/SliderElement.php
+			path: tests/Functional/Components/Model/GeneratorTest.php
 
 		-
-			message: "#^Parameter \\#2 \\$locator of method Behat\\\\Mink\\\\Element\\\\Element\\:\\:find\\(\\) expects array\\|string, bool\\|string given\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Model\\\\GeneratorTest\\:\\:testDefaultInitializationDateTime\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/SliderElement.php
+			path: tests/Functional/Components/Model/GeneratorTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\YouTube\\:\\:getCodeProperty\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Model\\\\GeneratorTest\\:\\:testDefaultInitializationEmptyString\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/YouTube.php
+			path: tests/Functional/Components/Model/GeneratorTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Element\\\\YouTube\\:\\:getCodeProperty\\(\\) should return array but returns string\\|null\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Model\\\\GeneratorTest\\:\\:testDefaultInitializationFloat\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/YouTube.php
+			path: tests/Functional/Components/Model/GeneratorTest.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Element\\\\YouTube\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Model\\\\GeneratorTest\\:\\:testDefaultInitializationInteger\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Element/YouTube.php
+			path: tests/Functional/Components/Model/GeneratorTest.php
 
 		-
-			message: "#^Cannot call method xpath\\(\\) on SimpleXMLElement\\|false\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Model\\\\GeneratorTest\\:\\:testDefaultInitializationTwoProperties\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ExportContext.php
+			path: tests/Functional/Components/Model/GeneratorTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ExportContext\\:\\:assertKeyExists\\(\\) has no return type specified\\.$#"
+			message: "#^Negated boolean expression is always true\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ExportContext.php
+			path: tests/Functional/Components/Model/GeneratorTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ExportContext\\:\\:assertKeyExists\\(\\) has parameter \\$key with no type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/ExportContext.php
+			message: "#^Parameter \\#4 \\$default of method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Model\\\\GeneratorTest\\:\\:addAndEvaluateInitialization\\(\\) expects float\\|int\\|null, string given\\.$#"
+			count: 2
+			path: tests/Functional/Components/Model/GeneratorTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ExportContext\\:\\:assertKeyExists\\(\\) has parameter \\$row with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\OptinServiceTest\\:\\:testAssertAdd\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ExportContext.php
+			path: tests/Functional/Components/OptinServiceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ExportContext\\:\\:assertStringsEqual\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\OptinServiceTest\\:\\:testAssertGet\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ExportContext.php
+			path: tests/Functional/Components/OptinServiceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ExportContext\\:\\:createSubshop\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\OptinServiceTest\\:\\:testDelete\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ExportContext.php
+			path: tests/Functional/Components/OptinServiceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ExportContext\\:\\:disableExports\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\OptinServiceTest\\:\\:testRetriveData\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ExportContext.php
+			path: tests/Functional/Components/OptinServiceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ExportContext\\:\\:enableExports\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\OptinServiceTest\\:\\:testRetriveLeftData\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ExportContext.php
+			path: tests/Functional/Components/OptinServiceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ExportContext\\:\\:iExportTheFeedFor\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$type of method Shopware\\\\Components\\\\OptinServiceInterface\\:\\:add\\(\\) expects string, stdClass given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ExportContext.php
+			path: tests/Functional/Components/OptinServiceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ExportContext\\:\\:iShouldSeeFeedWithFormatInTheExport\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$type of method Shopware\\\\Components\\\\OptinServiceInterface\\:\\:get\\(\\) expects string, stdClass given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ExportContext.php
+			path: tests/Functional/Components/OptinServiceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ExportContext\\:\\:parseCsv\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Column \"s_core_config_elements\\.form_id\" expects value type int, got type int\\|string\\|false$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ExportContext.php
+			path: tests/Functional/Components/Plugin/ConfigReaderTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ExportContext\\:\\:parseXml\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Column \"s_core_config_forms\\.parent_id\" expects value type int\\|null, got type mixed$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ExportContext.php
+			path: tests/Functional/Components/Plugin/ConfigReaderTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ExportContext\\:\\:pathTo\\(\\) has parameter \\$feed with no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Column \"s_core_config_forms\\.plugin_id\" expects value type int\\|null, got type int\\|string\\|false$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ExportContext.php
+			path: tests/Functional/Components/Plugin/ConfigReaderTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ExportContext\\:\\:removeSubshop\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_core_plugins\\.added\" expects value type string, got type DateTime$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ExportContext.php
+			path: tests/Functional/Components/Plugin/ConfigReaderTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ExportContext\\:\\:validate\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_core_config_elements\\.form_id\" expects value type int, got type int\\|string\\|false$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ExportContext.php
+			path: tests/Functional/Components/Plugin/ConfigWriterTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ExportContext\\:\\:validate\\(\\) has parameter \\$export with no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Column \"s_core_config_forms\\.parent_id\" expects value type int\\|null, got type mixed$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ExportContext.php
+			path: tests/Functional/Components/Plugin/ConfigWriterTest.php
 
 		-
-			message: "#^PHPDoc tag @var for variable \\$entry has no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Column \"s_core_plugins\\.added\" expects value type string, got type DateTime$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ExportContext.php
+			path: tests/Functional/Components/Plugin/ConfigWriterTest.php
 
 		-
-			message: "#^Parameter \\#3 \\$shopType of method Shopware\\\\Tests\\\\Mink\\\\ExportContext\\:\\:validate\\(\\) expects bool, string given\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/ExportContext.php
+			message: "#^Cannot call method count\\(\\) on array\\<Shopware\\\\Models\\\\Config\\\\Element\\>\\|\\(Doctrine\\\\Common\\\\Collections\\\\ArrayCollection&iterable\\<Shopware\\\\Models\\\\Config\\\\Element\\>\\)\\.$#"
+			count: 2
+			path: tests/Functional/Components/Plugin/FormSynchronizerTest.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\ExportContext\\:\\:\\$mappings type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/ExportContext.php
+			message: "#^Cannot call method getPosition\\(\\) on Shopware\\\\Models\\\\Config\\\\Element\\|null\\.$#"
+			count: 2
+			path: tests/Functional/Components/Plugin/FormSynchronizerTest.php
 
 		-
-			message: "#^Call to method getClient\\(\\) on an unknown class Behat\\\\Mink\\\\Driver\\\\BrowserKitDriver\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Plugin\\\\FormSynchronizerTest\\:\\:testAddFormItems\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/FeatureContext.php
+			path: tests/Functional/Components/Plugin/FormSynchronizerTest.php
 
 		-
-			message: "#^Class Behat\\\\Mink\\\\Driver\\\\BrowserKitDriver not found\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Plugin\\\\FormSynchronizerTest\\:\\:testNewFormFieldSorted\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/FeatureContext.php
+			path: tests/Functional/Components/Plugin/FormSynchronizerTest.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:checkCaptcha\\(\\)\\.$#"
+			message: "#^Query error\\: Column \"s_core_config_elements\\.form_id\" expects value type int, got type int\\|string\\|false$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/FormContext.php
+			path: tests/Functional/Components/Plugin/LegacyConfigReaderTest.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:submitInquiryForm\\(\\)\\.$#"
+			message: "#^Query error\\: Column \"s_core_config_forms\\.parent_id\" expects value type int\\|null, got type mixed$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/FormContext.php
+			path: tests/Functional/Components/Plugin/LegacyConfigReaderTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\FormContext\\:\\:iAmOnForm\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_core_config_forms\\.plugin_id\" expects value type int\\|null, got type int\\|string\\|false$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/FormContext.php
+			path: tests/Functional/Components/Plugin/LegacyConfigReaderTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\FormContext\\:\\:iAmOnForm\\(\\) has parameter \\$id with no type specified\\.$#"
+			message: "#^Query error\\: Column \"s_core_plugins\\.added\" expects value type string, got type DateTime$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/FormContext.php
+			path: tests/Functional/Components/Plugin/LegacyConfigReaderTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\FormContext\\:\\:iShouldSeeACaptcha\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_core_config_elements\\.form_id\" expects value type int, got type int\\|string\\|false$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/FormContext.php
+			path: tests/Functional/Components/Plugin/LegacyConfigWriterTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\FormContext\\:\\:iSubmitTheInquiryFormWith\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_core_config_forms\\.parent_id\" expects value type int\\|null, got type mixed$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/FormContext.php
+			path: tests/Functional/Components/Plugin/LegacyConfigWriterTest.php
 
 		-
-			message: "#^Call to an undefined method Behat\\\\Mink\\\\Element\\\\NodeElement\\|Shopware\\\\Tests\\\\Mink\\\\HelperSelectorInterface\\:\\:clickLink\\(\\)\\.$#"
+			message: "#^Query error\\: Column \"s_core_plugins\\.added\" expects value type string, got type DateTime$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/Plugin/LegacyConfigWriterTest.php
 
 		-
-			message: "#^Call to an undefined method Behat\\\\Mink\\\\Element\\\\NodeElement\\|Shopware\\\\Tests\\\\Mink\\\\HelperSelectorInterface\\:\\:hasButton\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Plugin\\\\PluginMigrationTest\\:\\:assertTableColumnExists\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/Plugin/PluginMigrationTest.php
 
 		-
-			message: "#^Call to an undefined method Behat\\\\Mink\\\\Element\\\\NodeElement\\|Shopware\\\\Tests\\\\Mink\\\\HelperSelectorInterface\\:\\:hasLink\\(\\)\\.$#"
+			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Components\\\\Plugin\\\\PluginMigrationTest\\:\\:\\$plugins type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/Plugin/PluginMigrationTest.php
 
 		-
-			message: "#^Call to an undefined method Behat\\\\Mink\\\\Element\\\\NodeElement\\|Shopware\\\\Tests\\\\Mink\\\\HelperSelectorInterface\\:\\:pressButton\\(\\)\\.$#"
+			message: "#^Cannot call method activatePlugin\\(\\) on Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\InstallerService\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/Plugin/TestCase.php
 
 		-
-			message: "#^Call to an undefined method Shopware\\\\Tests\\\\Mink\\\\HelperSelectorInterface\\:\\:find\\(\\)\\.$#"
+			message: "#^Cannot call method deactivatePlugin\\(\\) on Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\InstallerService\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/Plugin/TestCase.php
 
 		-
-			message: "#^Call to an undefined method Shopware\\\\Tests\\\\Mink\\\\HelperSelectorInterface\\:\\:findAll\\(\\)\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			message: "#^Cannot call method getPluginByName\\(\\) on Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\InstallerService\\|null\\.$#"
+			count: 2
+			path: tests/Functional/Components/Plugin/TestCase.php
 
 		-
-			message: "#^Call to an undefined method Shopware\\\\Tests\\\\Mink\\\\HelperSelectorInterface\\:\\:getSession\\(\\)\\.$#"
+			message: "#^Cannot call method installPlugin\\(\\) on Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\InstallerService\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/Plugin/TestCase.php
 
 		-
-			message: "#^Dead catch \\- WebDriver\\\\Exception\\\\StaleElementReference is never thrown in the try block\\.$#"
+			message: "#^Cannot call method saveConfigElement\\(\\) on Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\InstallerService\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/Plugin/TestCase.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:assertElementCount\\(\\) has no return type specified\\.$#"
+			message: "#^Cannot call method uninstallPlugin\\(\\) on Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\InstallerService\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/Plugin/TestCase.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:assertElementProperties\\(\\) has parameter \\$properties with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Plugin\\\\TestCase\\:\\:ensurePluginAvailable\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/Plugin/TestCase.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:assertElementProperties\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Plugin\\\\TestCase\\:\\:ensurePluginAvailable\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/Plugin/TestCase.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:assertElements\\(\\) has parameter \\$needles with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Plugin\\\\TestCase\\:\\:restorePluginState\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/Plugin/TestCase.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:assertElements\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Plugin\\\\TestCase\\:\\:restorePluginState\\(\\) has parameter \\$status with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/Plugin/TestCase.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:checkArray\\(\\) has parameter \\$check with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Plugin\\\\TestCase\\:\\:restorePluginStates\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/Plugin/TestCase.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:clickNamedLink\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Components\\\\Plugin\\\\TestCase\\:\\:\\$ensureLoadedPlugins type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/Plugin/TestCase.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:compareArrays\\(\\) has parameter \\$array1 with no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Components\\\\Plugin\\\\TestCase\\:\\:\\$pluginStates type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/Plugin/TestCase.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:compareArrays\\(\\) has parameter \\$array2 with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Privacy\\\\ConfigDependentIpAnonymizerTest\\:\\:testConfigActiveWorking\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/Privacy/ConfigDependentIpAnonymizerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:compareArrays\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Privacy\\\\ConfigDependentIpAnonymizerTest\\:\\:testConfigInactiveWorking\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/Privacy/ConfigDependentIpAnonymizerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:convertTableHashToArray\\(\\) has parameter \\$hash with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Privacy\\\\ConfigDependentIpAnonymizerTest\\:\\:testDispatchLogIpv6\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/Privacy/ConfigDependentIpAnonymizerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:convertTableHashToArray\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Privacy\\\\ConfigDependentIpAnonymizerTest\\:\\:testDispatchLogLocalhostConfigDisabled\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/Privacy/ConfigDependentIpAnonymizerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:fillForm\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Privacy\\\\ConfigDependentIpAnonymizerTest\\:\\:testDispatchLogLocalhostIpv4\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/Privacy/ConfigDependentIpAnonymizerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:fillForm\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Privacy\\\\IpAnonymizerTest\\:\\:testIpAnonymizer\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/Privacy/IpAnonymizerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:filter\\(\\) has parameter \\$var with no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Column \"s_user\\.active\" expects value type int, got type '1'$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/Privacy/PrivacyServiceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:findAllOfElements\\(\\) has parameter \\$keys with no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Column \"s_user\\.subshopID\" expects value type int, got type '1'$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/Privacy/PrivacyServiceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:findAllOfElements\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\ReflectionHelperTest\\:\\:testCreationOfInvalidClass\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/ReflectionHelperTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:findElements\\(\\) has parameter \\$keys with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\ReflectionHelperTest\\:\\:testCriteriaCreation\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/ReflectionHelperTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:floatArray\\(\\) has parameter \\$keys with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\ReflectionHelperTest\\:\\:testOutOfFolderCreation\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/ReflectionHelperTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:floatArray\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Router\\\\RouterTest\\:\\:getTestParamsProvider\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/Router/RouterTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:floatArray\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Router\\\\RouterTest\\:\\:testArrayParams\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/Router/RouterTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:getElementData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\StateTranslatorServiceTest\\:\\:testTranslateStateDifferentLocale\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/StateTranslatorServiceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:getElementProperty\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\StateTranslatorServiceTest\\:\\:testTranslateStateNoTranslationShouldReturnDefault\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/StateTranslatorServiceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:getPageInfo\\(\\) has parameter \\$selectionMode with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\StateTranslatorServiceTest\\:\\:testTranslateStateOrdersTranslation\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/StateTranslatorServiceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:getPageInfo\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\StateTranslatorServiceTest\\:\\:testTranslateStatePaymentsTranslation\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/StateTranslatorServiceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:getRequiredSelectors\\(\\) has parameter \\$keys with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\StateTranslatorServiceTest\\:\\:testTranslateStateShouldThrowException\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/StateTranslatorServiceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:getRequiredSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#1 \\$locale of method Shopware_Components_Snippet_Manager\\:\\:setLocale\\(\\) expects Shopware\\\\Models\\\\Shop\\\\Locale, Shopware\\\\Models\\\\Shop\\\\Locale\\|null given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/StateTranslatorServiceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:getUnique\\(\\) has parameter \\$array with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\StreamProtocolValidatorTest\\:\\:testDefaultProtocols\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/StreamProtocolValidatorTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:pressNamedButton\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\StreamProtocolValidatorTest\\:\\:testInvalidProtocols\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/StreamProtocolValidatorTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:searchElements\\(\\) has parameter \\$needles with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Theme\\\\InheritanceTest\\:\\:getDummyTemplates\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/Theme/InheritanceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:searchElements\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Theme\\\\InheritanceTest\\:\\:getTheme\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/Theme/InheritanceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:setCurrentLanguage\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Theme\\\\InheritanceTest\\:\\:testBuildInheritance\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/Theme/InheritanceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:setCurrentLanguage\\(\\) has parameter \\$language with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Theme\\\\InheritanceTest\\:\\:testConfigInheritanceForLanguageShop\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/Theme/InheritanceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:spin\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Theme\\\\InheritanceTest\\:\\:testSmartyDirectories\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/Theme/InheritanceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:throwException\\(\\) has parameter \\$messages with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Theme\\\\InheritanceTest\\:\\:testTemplateDirectories\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/Theme/InheritanceTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:waitForOverlay\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Theme\\\\InheritanceTest\\:\\:testThemeFiles\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/Theme/InheritanceTest.php
 
 		-
-			message: "#^PHPDoc tag @param for parameter \\$parent with type SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Element\\|SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\|Shopware\\\\Tests\\\\Mink\\\\HelperSelectorInterface is not subtype of native type Shopware\\\\Tests\\\\Mink\\\\HelperSelectorInterface\\.$#"
-			count: 10
-			path: tests/Mink/features/bootstrap/Helper.php
+			message: "#^Parameter \\#1 \\$template of method Shopware\\\\Components\\\\Theme\\\\Inheritance\\:\\:buildConfig\\(\\) expects Shopware\\\\Models\\\\Shop\\\\Template, Shopware\\\\Models\\\\Shop\\\\Template\\|null given\\.$#"
+			count: 2
+			path: tests/Functional/Components/Theme/InheritanceTest.php
 
 		-
-			message: "#^Parameter \\#1 \\$parent of static method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:findAllOfElements\\(\\) expects Shopware\\\\Tests\\\\Mink\\\\HelperSelectorInterface, SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Element given\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Components\\\\Theme\\\\InstallerTest\\:\\:testSynchronizeThemeDirectory\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/Theme/InstallerTest.php
 
 		-
-			message: "#^Parameter \\#2 \\$subject of function preg_match expects string, string\\|null given\\.$#"
+			message: "#^Property Shopware\\\\Themes\\\\TestBare\\\\Theme\\:\\:\\$css type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/Theme/Themes/TestBare/Theme.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:\\$language has no type specified\\.$#"
+			message: "#^Property Shopware\\\\Themes\\\\TestBare\\\\Theme\\:\\:\\$javascript type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Helper.php
+			path: tests/Functional/Components/Theme/Themes/TestBare/Theme.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\HelperSelectorInterface\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Themes\\\\TestResponsive\\\\Theme\\:\\:\\$css type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/HelperSelectorInterface.php
+			path: tests/Functional/Components/Theme/Themes/TestResponsive/Theme.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Element\\:\\:moveDirection\\(\\)\\.$#"
+			message: "#^Property Shopware\\\\Themes\\\\TestResponsive\\\\Theme\\:\\:\\$javascript type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ListingContext.php
+			path: tests/Functional/Components/Theme/Themes/TestResponsive/Theme.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Element\\:\\:moveToPage\\(\\)\\.$#"
+			message: "#^Query error\\: Column \"s_articles_categories_ro\\.articleID\" expects value type int, got type int\\|null$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ListingContext.php
+			path: tests/Functional/Controllers/Backend/AnalyticsTest.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Element\\:\\:noElement\\(\\)\\.$#"
-			count: 2
-			path: tests/Mink/features/bootstrap/ListingContext.php
+			message: "#^Query error\\: Column \"s_order\\.invoice_amount\" expects value type float\\|int, got type '1000'$#"
+			count: 1
+			path: tests/Functional/Controllers/Backend/AnalyticsTest.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:checkListing\\(\\)\\.$#"
+			message: "#^Query error\\: Column \"s_order\\.invoice_amount\" expects value type float\\|int, got type '500'$#"
 			count: 2
-			path: tests/Mink/features/bootstrap/ListingContext.php
+			path: tests/Functional/Controllers/Backend/AnalyticsTest.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:checkView\\(\\)\\.$#"
+			message: "#^Query error\\: Column \"s_order\\.invoice_amount_net\" expects value type float\\|int, got type '420'$#"
 			count: 2
-			path: tests/Mink/features/bootstrap/ListingContext.php
+			path: tests/Functional/Controllers/Backend/AnalyticsTest.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:openListing\\(\\)\\.$#"
-			count: 2
-			path: tests/Mink/features/bootstrap/ListingContext.php
+			message: "#^Query error\\: Column \"s_order\\.invoice_amount_net\" expects value type float\\|int, got type '840'$#"
+			count: 1
+			path: tests/Functional/Controllers/Backend/AnalyticsTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ListingContext\\:\\:iAmOnTheListingPage\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/ListingContext.php
+			message: "#^Query error\\: Column \"s_order\\.language\" expects value type string, got type 1$#"
+			count: 3
+			path: tests/Functional/Controllers/Backend/AnalyticsTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ListingContext\\:\\:iAmOnTheListingPageForCategoryOnPage\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_order\\.status\" expects value type int, got type '\\-1'$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ListingContext.php
+			path: tests/Functional/Controllers/Backend/AnalyticsTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ListingContext\\:\\:iAmOnTheListingPageForCategoryOnPage\\(\\) has parameter \\$categoryId with no type specified\\.$#"
+			message: "#^Query error\\: Column \"s_order_billingaddress\\.orderID\" expects value type int, got type int\\|string\\|false$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ListingContext.php
+			path: tests/Functional/Controllers/Backend/AnalyticsTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ListingContext\\:\\:iAmOnTheListingPageForCategoryOnPage\\(\\) has parameter \\$page with no type specified\\.$#"
+			message: "#^Query error\\: Column \"s_order_details\\.articleID\" expects value type int, got type int\\|null$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ListingContext.php
+			path: tests/Functional/Controllers/Backend/AnalyticsTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ListingContext\\:\\:iBrowseTimesToPage\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_order_details\\.orderID\" expects value type int, got type int\\|string\\|false$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ListingContext.php
+			path: tests/Functional/Controllers/Backend/AnalyticsTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ListingContext\\:\\:iBrowseTimesToPage\\(\\) has parameter \\$direction with no type specified\\.$#"
+			message: "#^Query error\\: Column \"s_statistics_article_impression\\.articleId\" expects value type int, got type int\\|null$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ListingContext.php
+			path: tests/Functional/Controllers/Backend/AnalyticsTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ListingContext\\:\\:iBrowseTimesToPage\\(\\) has parameter \\$steps with no type specified\\.$#"
+			message: "#^Query error\\: Column \"s_user\\.active\" expects value type int, got type '1'$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ListingContext.php
+			path: tests/Functional/Controllers/Backend/AnalyticsTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ListingContext\\:\\:iBrowseToPage\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_user\\.default_billing_address_id\" expects value type int\\|null, got type int\\|string\\|false$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ListingContext.php
+			path: tests/Functional/Controllers/Backend/AnalyticsTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ListingContext\\:\\:iBrowseToPage\\(\\) has parameter \\$page with no type specified\\.$#"
+			message: "#^Query error\\: Column \"s_user\\.default_shipping_address_id\" expects value type int\\|null, got type int\\|string\\|false$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ListingContext.php
+			path: tests/Functional/Controllers/Backend/AnalyticsTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ListingContext\\:\\:iOrderTheArticleOnPosition\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_user\\.subshopID\" expects value type int, got type '1'$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ListingContext.php
+			path: tests/Functional/Controllers/Backend/AnalyticsTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ListingContext\\:\\:iOrderTheArticleOnPosition\\(\\) has parameter \\$position with no type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/ListingContext.php
+			message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$data\\.$#"
+			count: 5
+			path: tests/Functional/Controllers/Backend/FormTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ListingContext\\:\\:iSetTheFilterTo\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/ListingContext.php
+			message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$success\\.$#"
+			count: 5
+			path: tests/Functional/Controllers/Backend/FormTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ListingContext\\:\\:iShouldNotBeAbleToBrowseToPage\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/ListingContext.php
+			message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$total\\.$#"
+			count: 4
+			path: tests/Functional/Controllers/Backend/FormTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ListingContext\\:\\:iShouldNotBeAbleToBrowseToPage\\(\\) has parameter \\$direction with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\FormTest\\:\\:testGetFieldsShouldReturnFields\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ListingContext.php
+			path: tests/Functional/Controllers/Backend/FormTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ListingContext\\:\\:iShouldNotBeAbleToBrowseToPage2\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\FormTest\\:\\:testGetFormsShouldBeFilterAndSortable\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ListingContext.php
+			path: tests/Functional/Controllers/Backend/FormTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ListingContext\\:\\:iShouldNotBeAbleToBrowseToPage2\\(\\) has parameter \\$page with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\FormTest\\:\\:testGetFormsShouldBeSuccessful\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ListingContext.php
+			path: tests/Functional/Controllers/Backend/FormTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ListingContext\\:\\:iShouldNotSeeTheArticleInListing\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\FormTest\\:\\:testGetFormsWithIdShouldReturnSingleForm\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ListingContext.php
+			path: tests/Functional/Controllers/Backend/FormTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ListingContext\\:\\:iShouldNotSeeTheArticleInListing\\(\\) has parameter \\$name with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\FormTest\\:\\:testGetFormsWithInvalidIdShouldReturnFailure\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ListingContext.php
+			path: tests/Functional/Controllers/Backend/FormTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ListingContext\\:\\:iShouldSeeTheArticleInListing\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\MailTest\\:\\:testCreateMail\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ListingContext.php
+			path: tests/Functional/Controllers/Backend/MailTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ListingContext\\:\\:iShouldSeeTheArticleInListing\\(\\) has parameter \\$name with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\MailTest\\:\\:testGetAttachmentsShouldBeSuccessful\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ListingContext.php
+			path: tests/Functional/Controllers/Backend/MailTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ListingContext\\:\\:theArticleOnPositionShouldHaveThisProperties\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\MailTest\\:\\:testGetMailsShouldBeSuccessful\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ListingContext.php
+			path: tests/Functional/Controllers/Backend/MailTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ListingContext\\:\\:theArticleOnPositionShouldHaveThisProperties\\(\\) has parameter \\$position with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\MailTest\\:\\:testGetSingleMail\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ListingContext.php
+			path: tests/Functional/Controllers/Backend/MailTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ListingContext\\:\\:theArticlesShouldBeShownInAListView\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\MailTest\\:\\:testGetSingleMail\\(\\) has parameter \\$id with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ListingContext.php
+			path: tests/Functional/Controllers/Backend/MailTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ListingContext\\:\\:theArticlesShouldBeShownInATableView\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\MailTest\\:\\:testRemoveMail\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ListingContext.php
+			path: tests/Functional/Controllers/Backend/MailTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\NoteContext\\:\\:clickActionLink\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\MailTest\\:\\:testRemoveMail\\(\\) has parameter \\$id with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/NoteContext.php
+			path: tests/Functional/Controllers/Backend/MailTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\NoteContext\\:\\:clickActionLink\\(\\) has parameter \\$name with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\MailTest\\:\\:testUpdateMail\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/NoteContext.php
+			path: tests/Functional/Controllers/Backend/MailTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\NoteContext\\:\\:clickActionLink\\(\\) has parameter \\$position with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\MailTest\\:\\:testUpdateMail\\(\\) has parameter \\$id with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/NoteContext.php
+			path: tests/Functional/Controllers/Backend/MailTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\NoteContext\\:\\:iCompareTheArticleOnPositionOfMyNote\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/NoteContext.php
+			message: "#^Parameter \\#1 \\$json of function json_decode expects string, array\\|string\\|null given\\.$#"
+			count: 6
+			path: tests/Functional/Controllers/Backend/MailTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\NoteContext\\:\\:iCompareTheArticleOnPositionOfMyNote\\(\\) has parameter \\$position with no type specified\\.$#"
+			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\MailTest\\:\\:\\$testData type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/NoteContext.php
+			path: tests/Functional/Controllers/Backend/MailTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\NoteContext\\:\\:iPutTheArticleOnPositionOfMyNoteInTheBasket\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/NoteContext.php
+			message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$success\\.$#"
+			count: 2
+			path: tests/Functional/Controllers/Backend/PremiumTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\NoteContext\\:\\:iPutTheArticleOnPositionOfMyNoteInTheBasket\\(\\) has parameter \\$position with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\PremiumTest\\:\\:testDeletePremiumArticle\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/NoteContext.php
+			path: tests/Functional/Controllers/Backend/PremiumTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\NoteContext\\:\\:iRemoveTheArticleOnPositionOfMyNote\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\PremiumTest\\:\\:testEditPremiumArticle\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/NoteContext.php
+			path: tests/Functional/Controllers/Backend/PremiumTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\NoteContext\\:\\:iRemoveTheArticleOnPositionOfMyNote\\(\\) has parameter \\$position with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\PremiumTest\\:\\:testGetPremiumArticles\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/NoteContext.php
+			path: tests/Functional/Controllers/Backend/PremiumTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\NoteContext\\:\\:iVisitTheDetailPageOfTheArticleOnPositionOfMyNote\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\PremiumTest\\:\\:\\$premiumData has no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/NoteContext.php
+			path: tests/Functional/Controllers/Backend/PremiumTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\NoteContext\\:\\:iVisitTheDetailPageOfTheArticleOnPositionOfMyNote\\(\\) has parameter \\$position with no type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/NoteContext.php
+			message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$success\\.$#"
+			count: 2
+			path: tests/Functional/Controllers/Backend/RiskManagementTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\NoteContext\\:\\:pressActionButton\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\RiskManagementTest\\:\\:testCreateRule\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/NoteContext.php
+			path: tests/Functional/Controllers/Backend/RiskManagementTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\NoteContext\\:\\:pressActionButton\\(\\) has parameter \\$name with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\RiskManagementTest\\:\\:testDeleteRule\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/NoteContext.php
+			path: tests/Functional/Controllers/Backend/RiskManagementTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\NoteContext\\:\\:pressActionButton\\(\\) has parameter \\$position with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\RiskManagementTest\\:\\:testEditRule\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/NoteContext.php
+			path: tests/Functional/Controllers/Backend/RiskManagementTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\NoteContext\\:\\:theNoteContainsTheFollowingProducts\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\RiskManagementTest\\:\\:testGetPayments\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/NoteContext.php
+			path: tests/Functional/Controllers/Backend/RiskManagementTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\NoteContext\\:\\:theNoteShouldContainTheFollowingProducts\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/NoteContext.php
+			message: "#^Access to an undefined property Enlight_View_Default\\:\\:\\$success\\.$#"
+			count: 4
+			path: tests/Functional/Controllers/Backend/SupplierTest.php
 
 		-
-			message: "#^Parameter \\#1 \\$notePositions of method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Note\\:\\:checkNoteProducts\\(\\) expects Shopware\\\\Tests\\\\Mink\\\\Element\\\\NotePosition, Shopware\\\\Tests\\\\Mink\\\\Element\\\\MultipleElement given\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\SupplierTest\\:\\:testAddSupplier\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/NoteContext.php
+			path: tests/Functional/Controllers/Backend/SupplierTest.php
 
 		-
-			message: "#^Argument of an invalid type array\\|float\\|string supplied for foreach, only iterables are supported\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\SupplierTest\\:\\:testDeleteSupplier\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			path: tests/Functional/Controllers/Backend/SupplierTest.php
 
 		-
-			message: "#^Cannot access offset 'key' on array\\|false\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\SupplierTest\\:\\:testDeleteSupplier\\(\\) has parameter \\$lastSupplier with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			path: tests/Functional/Controllers/Backend/SupplierTest.php
 
 		-
-			message: "#^Cannot access offset 'value' on array\\|false\\.$#"
-			count: 4
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\SupplierTest\\:\\:testGetSuppliers\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: tests/Functional/Controllers/Backend/SupplierTest.php
 
 		-
-			message: "#^Cannot access offset 'value2' on array\\|false\\.$#"
-			count: 4
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\SupplierTest\\:\\:testUpdateSupplier\\(\\) has parameter \\$lastSupplier with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: tests/Functional/Controllers/Backend/SupplierTest.php
 
 		-
-			message: "#^Cannot call method getText\\(\\) on Behat\\\\Mink\\\\Element\\\\NodeElement\\|null\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\SupplierTest\\:\\:testUpdateSupplier\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			path: tests/Functional/Controllers/Backend/SupplierTest.php
 
 		-
-			message: "#^Cannot call method press\\(\\) on Behat\\\\Mink\\\\Element\\\\NodeElement\\|null\\.$#"
-			count: 3
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\SupplierTest\\:\\:\\$supplierData type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: tests/Functional/Controllers/Backend/SupplierTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Account\\:\\:changeBillingAddress\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\WidgetsTest\\:\\:backendAuthProvider\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			path: tests/Functional/Controllers/Backend/WidgetsTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Account\\:\\:changeBillingAddress\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Backend\\\\WidgetsTest\\:\\:prepareTestGetVisitors\\(\\) has parameter \\$addressData with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			path: tests/Functional/Controllers/Backend/WidgetsTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Account\\:\\:changeEmail\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Argument \\#1 is not a constant array, got non\\-empty\\-array$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			path: tests/Functional/Controllers/Backend/WidgetsTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Account\\:\\:changePassword\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			message: "#^Query error\\: Column \"s_order\\.ordernumber\" expects value type string\\|null, got type 999$#"
+			count: 3
+			path: tests/Functional/Controllers/Backend/WidgetsTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Account\\:\\:changePaymentMethod\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_statistics_currentusers\\.time\" expects value type string\\|null, got type Zend_Db_Expr$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			path: tests/Functional/Controllers/Backend/WidgetsTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Account\\:\\:changePaymentMethod\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Column \"s_user\\.active\" expects value type int, got type '1'$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			path: tests/Functional/Controllers/Backend/WidgetsTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Account\\:\\:changeProfile\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_user\\.default_billing_address_id\" expects value type int\\|null, got type int\\|string\\|false$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			path: tests/Functional/Controllers/Backend/WidgetsTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Account\\:\\:changeShippingAddress\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_user\\.subshopID\" expects value type int, got type '1'$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			path: tests/Functional/Controllers/Backend/WidgetsTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Account\\:\\:changeShippingAddress\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Column \"s_core_rulesets\\.value1\" expects value type string, got type 100$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			path: tests/Functional/Controllers/Frontend/CheckoutTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Account\\:\\:checkAddress\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\SitemapTest\\:\\:sitemapDataprovider\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			path: tests/Functional/Controllers/Frontend/SitemapTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Account\\:\\:checkEsdArticles\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Controllers\\\\Frontend\\\\SitemapTest\\:\\:testIndex\\(\\) has parameter \\$sitemapData with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			path: tests/Functional/Controllers/Frontend/SitemapTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Account\\:\\:checkEsdArticles\\(\\) has parameter \\$articles with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			message: "#^Query error\\: Argument \\#1 is not a constant array, got array\\<string, mixed\\>$#"
+			count: 7
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Account\\:\\:checkOrder\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			message: "#^Query error\\: Column \"s_core_countries\\.id\" expects value type int, got type mixed$#"
+			count: 2
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Account\\:\\:checkOrder\\(\\) has parameter \\$articles with no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Column \"s_core_rulesets\\.id\" expects value type int, got type int\\|string\\|false$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Account\\:\\:checkOrderNumber\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			message: "#^Query error\\: Column \"s_core_rulesets\\.value1\" expects value type string, got type 20$#"
+			count: 2
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Account\\:\\:checkOrderPositions\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_core_rulesets\\.value1\" expects value type string, got type string\\|null$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Account\\:\\:checkOrderPositions\\(\\) has parameter \\$articles with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			message: "#^Query error\\: Column \"s_core_translations\\.id\" expects value type int, got type mixed$#"
+			count: 12
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Account\\:\\:checkPaymentMethod\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			message: "#^Query error\\: Column \"s_core_translations\\.objectlanguage\" expects value type string, got type 1$#"
+			count: 6
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Account\\:\\:chooseAddress\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			message: "#^Query error\\: Column \"s_core_translations\\.objectlanguage\" expects value type string, got type 10000$#"
+			count: 2
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Account\\:\\:clickLoginAgain\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			message: "#^Query error\\: Column \"s_core_translations\\.objectlanguage\" expects value type string, got type 2$#"
+			count: 6
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Account\\:\\:createArbitraryAddress\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_order\\.cleared\" expects value type int, got type '17'$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Account\\:\\:createArbitraryAddress\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			message: "#^Query error\\: Column \"s_order\\.currencyFactor\" expects value type float\\|int, got type '1'$#"
+			count: 3
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Account\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			message: "#^Query error\\: Column \"s_order\\.dispatchID\" expects value type int, got type '9'$#"
+			count: 3
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Account\\:\\:login\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			message: "#^Query error\\: Column \"s_order\\.id\" expects value type int, got type int\\|string\\|false$#"
+			count: 2
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Account\\:\\:logout\\(\\) should return bool but return statement is missing\\.$#"
+			message: "#^Query error\\: Column \"s_order\\.id\" expects value type int, got type mixed$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Account\\:\\:register\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_order\\.invoice_amount\" expects value type float\\|int, got type '16\\.89'$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Account\\:\\:register\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			message: "#^Query error\\: Column \"s_order\\.invoice_amount\" expects value type float\\|int, got type '37\\.99'$#"
+			count: 2
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Account\\:\\:searchAddress\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_order\\.invoice_amount_net\" expects value type float\\|int, got type '14\\.2'$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Account\\:\\:verifyLogin\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_order\\.invoice_amount_net\" expects value type float\\|int, got type '31\\.92'$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Parameter \\#1 \\$parent of static method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:clickNamedLink\\(\\) expects Shopware\\\\Tests\\\\Mink\\\\HelperSelectorInterface, SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Element given\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			message: "#^Query error\\: Column \"s_order\\.invoice_shipping\" expects value type float\\|int, got type '0'$#"
+			count: 2
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Parameter \\#2 \\$locator of method Behat\\\\Mink\\\\Element\\\\Element\\:\\:find\\(\\) expects array\\|string, bool\\|string given\\.$#"
+			message: "#^Query error\\: Column \"s_order\\.invoice_shipping\" expects value type float\\|int, got type '3\\.9'$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Account.php
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\AddressDelete\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Column \"s_order\\.invoice_shipping_net\" expects value type float\\|int, got type '0'$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/AddressDelete.php
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\AddressEdit\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Column \"s_order\\.invoice_shipping_net\" expects value type float\\|int, got type '3\\.28'$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/AddressEdit.php
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Cannot call method click\\(\\) on Behat\\\\Mink\\\\Element\\\\NodeElement\\|null\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Page/Backend.php
+			message: "#^Query error\\: Column \"s_order\\.net\" expects value type int, got type '0'$#"
+			count: 3
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Cannot call method setValue\\(\\) on Behat\\\\Mink\\\\Element\\\\NodeElement\\|null\\.$#"
+			message: "#^Query error\\: Column \"s_order\\.paymentID\" expects value type int, got type '4'$#"
 			count: 2
-			path: tests/Mink/features/bootstrap/Page/Backend.php
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Backend\\:\\:getXPathSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Column \"s_order\\.paymentID\" expects value type int, got type '5'$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Backend.php
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Backend\\:\\:login\\(\\) has parameter \\$password with no type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Page/Backend.php
+			message: "#^Query error\\: Column \"s_order\\.status\" expects value type int, got type '0'$#"
+			count: 2
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Backend\\:\\:login\\(\\) has parameter \\$user with no type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Page/Backend.php
+			message: "#^Query error\\: Column \"s_order\\.subshopID\" expects value type int, got type '1'$#"
+			count: 3
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Argument of an invalid type array\\|false supplied for foreach, only iterables are supported\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Page/Blog.php
+			message: "#^Query error\\: Column \"s_order\\.taxfree\" expects value type int, got type '0'$#"
+			count: 3
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Blog\\:\\:checkComments\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_order\\.userID\" expects value type int\\|null, got type mixed$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Blog.php
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Blog\\:\\:checkComments\\(\\) has parameter \\$comments with no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Column \"s_order_details\\.articleID\" expects value type int, got type '98765'$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Blog.php
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Blog\\:\\:checkRating\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_order_details\\.esdarticle\" expects value type int, got type '1'$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Blog.php
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Blog\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Column \"s_order_details\\.modus\" expects value type int, got type '0'$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Blog.php
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Blog\\:\\:openCommentSection\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Page/Blog.php
+			message: "#^Query error\\: Column \"s_order_details\\.orderID\" expects value type int, got type int\\|string\\|false$#"
+			count: 2
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Blog\\:\\:verifyPage\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_order_details\\.orderID\" expects value type int, got type mixed$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Blog.php
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Blog\\:\\:writeComment\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_order_details\\.price\" expects value type float\\|int, got type '34\\.99'$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Blog.php
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Blog\\:\\:writeComment\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Column \"s_order_details\\.quantity\" expects value type int, got type '1'$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Blog.php
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Argument of an invalid type array\\|false supplied for foreach, only iterables are supported\\.$#"
+			message: "#^Query error\\: Column \"s_order_details\\.shipped\" expects value type int, got type '0'$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutCart.php
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:login\\(\\)\\.$#"
+			message: "#^Query error\\: Column \"s_order_details\\.shippedgroup\" expects value type int, got type '0'$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutCart.php
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:register\\(\\)\\.$#"
+			message: "#^Query error\\: Column \"s_order_details\\.status\" expects value type int, got type '0'$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutCart.php
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutCart\\:\\:addArticle\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_order_details\\.taxID\" expects value type int\\|null, got type '1'$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutCart.php
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutCart\\:\\:addVoucher\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_order_details\\.tax_rate\" expects value type float\\|int, got type '19'$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutCart.php
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutCart\\:\\:changePaymentMethod\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_order_esd\\.esdID\" expects value type int, got type '2'$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutCart.php
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutCart\\:\\:changePaymentMethod\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Column \"s_order_esd\\.id\" expects value type int, got type mixed$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutCart.php
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutCart\\:\\:changeShippingMethod\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_order_esd\\.orderID\" expects value type int, got type int\\|string\\|false$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutCart.php
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutCart\\:\\:changeShippingMethod\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Column \"s_order_esd\\.orderdetailsID\" expects value type int, got type int\\|string\\|false$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutCart.php
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutCart\\:\\:checkAggregation\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_order_esd\\.serialID\" expects value type int, got type '8'$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutCart.php
+			path: tests/Functional/Core/AdminTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutCart\\:\\:checkAggregation\\(\\) has parameter \\$aggregation with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Core\\\\BasketTest\\:\\:invokeMethod\\(\\) has parameter \\$parameters with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutCart.php
+			path: tests/Functional/Core/BasketTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutCart\\:\\:checkCartProducts\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutCart.php
+			message: "#^Query error\\: Column \"s_articles\\.id\" expects value type int, got type mixed$#"
+			count: 4
+			path: tests/Functional/Core/BasketTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutCart\\:\\:checkCartProducts\\(\\) has parameter \\$items with no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Column \"s_articles\\.taxID\" expects value type int\\|null, got type mixed$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutCart.php
+			path: tests/Functional/Core/BasketTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutCart\\:\\:emptyCart\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutCart.php
+			message: "#^Query error\\: Column \"s_articles_details\\.id\" expects value type int, got type mixed$#"
+			count: 2
+			path: tests/Functional/Core/BasketTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutCart\\:\\:fillCartWithProducts\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_emarketing_voucher_codes\\.voucherID\" expects value type int, got type int\\|string\\|false$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutCart.php
+			path: tests/Functional/Core/BasketTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutCart\\:\\:fillCartWithProducts\\(\\) has parameter \\$items with no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Column \"s_emarketing_vouchers\\.customergroup\" expects value type int\\|null, got type mixed$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutCart.php
+			path: tests/Functional/Core/BasketTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutCart\\:\\:getAggregationPosition\\(\\) has parameter \\$labels with no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Column \"s_emarketing_vouchers\\.restrictarticles\" expects value type string, got type mixed$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutCart.php
+			path: tests/Functional/Core/BasketTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutCart\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Column \"s_emarketing_vouchers\\.taxconfig\" expects value type string, got type mixed$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutCart.php
+			path: tests/Functional/Core/BasketTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutCart\\:\\:proceedToOrderConfirmation\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutCart.php
+			message: "#^Query error\\: Column \"s_order_basket\\.articleID\" expects value type int, got type mixed$#"
+			count: 12
+			path: tests/Functional/Core/BasketTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutCart\\:\\:proceedToOrderConfirmationWithLogin\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutCart.php
+			message: "#^Query error\\: Column \"s_order_basket\\.ordernumber\" expects value type string, got type mixed$#"
+			count: 12
+			path: tests/Functional/Core/BasketTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutCart\\:\\:proceedToOrderConfirmationWithRegistration\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_order_basket\\.ordernumber\" expects value type string, got type string\\|null$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutCart.php
+			path: tests/Functional/Core/BasketTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutCart\\:\\:proceedToOrderConfirmationWithRegistration\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutCart.php
+			message: "#^Query error\\: Column \"s_order_basket\\.quantity\" expects value type int, got type \\(float\\|int\\)$#"
+			count: 4
+			path: tests/Functional/Core/BasketTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutCart\\:\\:removeProduct\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutCart.php
+			message: "#^Query error\\: Column \"s_order_basket\\.tax_rate\" expects value type float\\|int, got type mixed$#"
+			count: 2
+			path: tests/Functional/Core/BasketTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutCart\\:\\:removeVoucher\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_premium_shippingcosts\\.dispatchID\" expects value type int, got type mixed$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutCart.php
+			path: tests/Functional/Core/BasketTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutCart\\:\\:resetCart\\(\\) has no return type specified\\.$#"
+			message: "#^Query error\\: Column \"s_premium_shippingcosts\\.value\" expects value type numeric\\-string, got type 2\\.8$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutCart.php
+			path: tests/Functional/Core/BasketTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutCart\\:\\:verify\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutCart.php
+			message: "#^Query error\\: Column \"s_user\\.customergroup\" expects value type string, got type mixed$#"
+			count: 2
+			path: tests/Functional/Core/BasketTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutCart\\:\\:verify\\(\\) has parameter \\$urlParameters with no value type specified in iterable type array\\.$#"
+			message: "#^Query error\\: Column \"s_user\\.paymentID\" expects value type int, got type int\\|string\\|false$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutCart.php
+			path: tests/Functional/Core/BasketTest.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutCart\\:\\:\\$path \\(string\\) does not accept string\\|null\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Core\\\\OrderTest\\:\\:getRandomUser\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutCart.php
+			path: tests/Functional/Core/OrderTest.php
 
 		-
-			message: "#^Static method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:hasNamedLink\\(\\) invoked with 3 parameters, 2 required\\.$#"
+			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Models\\\\Category\\\\BlogCategoryTreeListQueryTest\\:\\:\\$expected type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutCart.php
+			path: tests/Functional/Models/Category/BlogCategoryTreeListQueryTest.php
 
 		-
-			message: "#^Cannot access offset 'value' on array\\|false\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Models\\\\Category\\\\PathByIdTest\\:\\:multiArrayProvider\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutConfirm.php
+			path: tests/Functional/Models/Category/PathByIdTest.php
 
 		-
-			message: "#^Cannot access offset 'value2' on array\\|false\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Models\\\\Category\\\\PathByIdTest\\:\\:testGetPathByIdShouldReturnArray\\(\\) has parameter \\$expectedResult with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutConfirm.php
+			path: tests/Functional/Models/Category/PathByIdTest.php
 
 		-
-			message: "#^Cannot call method getAttribute\\(\\) on Behat\\\\Mink\\\\Element\\\\NodeElement\\|null\\.$#"
+			message: "#^Parameter \\#1 \\$displayStateInRegistration of method Shopware\\\\Models\\\\Country\\\\Country\\:\\:setDisplayStateInRegistration\\(\\) expects bool, int given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutConfirm.php
+			path: tests/Functional/Models/Customer/CustomerTest.php
 
 		-
-			message: "#^Cannot call method press\\(\\) on Behat\\\\Mink\\\\Element\\\\NodeElement\\|null\\.$#"
-			count: 2
-			path: tests/Mink/features/bootstrap/Page/CheckoutConfirm.php
+			message: "#^Parameter \\#1 \\$forceStateInRegistration of method Shopware\\\\Models\\\\Country\\\\Country\\:\\:setForceStateInRegistration\\(\\) expects bool, int given\\.$#"
+			count: 1
+			path: tests/Functional/Models/Customer/CustomerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutConfirm\\:\\:changeBillingAddress\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutConfirm.php
+			message: "#^Parameter \\#1 \\$status of method Shopware\\\\Models\\\\Mail\\\\Mail\\:\\:setStatus\\(\\) expects array\\<Shopware\\\\Models\\\\Order\\\\Status\\>\\|null, PHPUnit\\\\Framework\\\\MockObject\\\\MockObject&Shopware\\\\Models\\\\Order\\\\Status given\\.$#"
+			count: 3
+			path: tests/Functional/Models/MailTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutConfirm\\:\\:changeBillingAddress\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Cannot call method getStreet\\(\\) on Shopware\\\\Models\\\\Order\\\\Billing\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutConfirm.php
+			path: tests/Functional/Models/Order/BillingTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutConfirm\\:\\:changeModalAddress\\(\\) has no return type specified\\.$#"
+			message: "#^Cannot call method getZipCode\\(\\) on Shopware\\\\Models\\\\Order\\\\Billing\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutConfirm.php
+			path: tests/Functional/Models/Order/BillingTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutConfirm\\:\\:changeModalAddress\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#"
+			message: "#^Cannot call method setStreet\\(\\) on Shopware\\\\Models\\\\Order\\\\Billing\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutConfirm.php
+			path: tests/Functional/Models/Order/BillingTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutConfirm\\:\\:changePaymentMethod\\(\\) has no return type specified\\.$#"
+			message: "#^Cannot call method setZipCode\\(\\) on Shopware\\\\Models\\\\Order\\\\Billing\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutConfirm.php
+			path: tests/Functional/Models/Order/BillingTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutConfirm\\:\\:changePaymentMethod\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#1 \\$entity of method Doctrine\\\\ORM\\\\EntityManager\\:\\:persist\\(\\) expects object, Shopware\\\\Models\\\\Order\\\\Billing\\|null given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutConfirm.php
+			path: tests/Functional/Models/Order/BillingTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutConfirm\\:\\:changeShippingAddress\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutConfirm.php
+			message: "#^Cannot call method setActive\\(\\) on Shopware\\\\Models\\\\Shop\\\\Shop\\|null\\.$#"
+			count: 2
+			path: tests/Functional/Models/Order/OrderDocumentDocumentTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutConfirm\\:\\:changeShippingAddress\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#1 \\$dispatch of method Shopware\\\\Models\\\\Order\\\\Order\\:\\:setDispatch\\(\\) expects Shopware\\\\Models\\\\Dispatch\\\\Dispatch, Shopware\\\\Models\\\\Dispatch\\\\Dispatch\\|null given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutConfirm.php
+			path: tests/Functional/Models/Order/OrderTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutConfirm\\:\\:changeShippingMethod\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$net of method Shopware\\\\Models\\\\Order\\\\Order\\:\\:setNet\\(\\) expects int, true given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutConfirm.php
+			path: tests/Functional/Models/Order/OrderTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutConfirm\\:\\:changeShippingMethod\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#1 \\$orderStatus of method Shopware\\\\Models\\\\Order\\\\Order\\:\\:setOrderStatus\\(\\) expects Shopware\\\\Models\\\\Order\\\\Status, Shopware\\\\Models\\\\Order\\\\Status\\|null given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutConfirm.php
+			path: tests/Functional/Models/Order/OrderTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutConfirm\\:\\:checkPaymentMethod\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$payment of method Shopware\\\\Models\\\\Order\\\\Order\\:\\:setPayment\\(\\) expects Shopware\\\\Models\\\\Payment\\\\Payment, Shopware\\\\Models\\\\Payment\\\\Payment\\|null given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutConfirm.php
+			path: tests/Functional/Models/Order/OrderTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutConfirm\\:\\:checkoutUsingGet\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$paymentStatus of method Shopware\\\\Models\\\\Order\\\\Order\\:\\:setPaymentStatus\\(\\) expects Shopware\\\\Models\\\\Order\\\\Status, Shopware\\\\Models\\\\Order\\\\Status\\|null given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutConfirm.php
+			path: tests/Functional/Models/Order/OrderTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutConfirm\\:\\:createArbitraryAddress\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$shop of method Shopware\\\\Models\\\\Order\\\\Order\\:\\:setShop\\(\\) expects Shopware\\\\Models\\\\Shop\\\\Shop, Shopware\\\\Models\\\\Shop\\\\Shop\\|null given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutConfirm.php
+			path: tests/Functional/Models/Order/OrderTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutConfirm\\:\\:createArbitraryAddress\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#"
+			message: "#^Parameter \\#1 \\$taxFree of method Shopware\\\\Models\\\\Order\\\\Order\\:\\:setTaxFree\\(\\) expects int, false given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutConfirm.php
+			path: tests/Functional/Models/Order/OrderTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutConfirm\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Cannot call method getStreet\\(\\) on Shopware\\\\Models\\\\Order\\\\Shipping\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutConfirm.php
+			path: tests/Functional/Models/Order/ShippingTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutConfirm\\:\\:proceedToCheckout\\(\\) has no return type specified\\.$#"
+			message: "#^Cannot call method getZipCode\\(\\) on Shopware\\\\Models\\\\Order\\\\Shipping\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutConfirm.php
+			path: tests/Functional/Models/Order/ShippingTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\CheckoutConfirm\\:\\:verifyPage\\(\\) has no return type specified\\.$#"
+			message: "#^Cannot call method setStreet\\(\\) on Shopware\\\\Models\\\\Order\\\\Shipping\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutConfirm.php
+			path: tests/Functional/Models/Order/ShippingTest.php
 
 		-
-			message: "#^Parameter \\#1 \\$parent of static method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:clickNamedLink\\(\\) expects Shopware\\\\Tests\\\\Mink\\\\HelperSelectorInterface, SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Element given\\.$#"
-			count: 2
-			path: tests/Mink/features/bootstrap/Page/CheckoutConfirm.php
+			message: "#^Cannot call method setZipCode\\(\\) on Shopware\\\\Models\\\\Order\\\\Shipping\\|null\\.$#"
+			count: 1
+			path: tests/Functional/Models/Order/ShippingTest.php
 
 		-
-			message: "#^Parameter \\#1 \\$parent of static method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:fillForm\\(\\) expects Shopware\\\\Tests\\\\Mink\\\\HelperSelectorInterface, SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page given\\.$#"
-			count: 2
-			path: tests/Mink/features/bootstrap/Page/CheckoutConfirm.php
+			message: "#^Parameter \\#1 \\$entity of method Doctrine\\\\ORM\\\\EntityManager\\:\\:persist\\(\\) expects object, Shopware\\\\Models\\\\Order\\\\Shipping\\|null given\\.$#"
+			count: 1
+			path: tests/Functional/Models/Order/ShippingTest.php
 
 		-
-			message: "#^Parameter \\#1 \\$parent of static method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:pressNamedButton\\(\\) expects Shopware\\\\Tests\\\\Mink\\\\HelperSelectorInterface, SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page given\\.$#"
-			count: 2
-			path: tests/Mink/features/bootstrap/Page/CheckoutConfirm.php
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Articles\\\\SeoCategoryTest\\:\\:getSimpleTestData\\(\\) return type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: tests/Functional/Modules/Articles/SeoCategoryTest.php
 
 		-
-			message: "#^Parameter \\#1 \\$url of method Behat\\\\Mink\\\\Session\\:\\:visit\\(\\) expects string, string\\|null given\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Articles\\\\sGetArticleByIdTest\\:\\:assertArticleData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/CheckoutConfirm.php
+			path: tests/Functional/Modules/Articles/sGetArticleByIdTest.php
 
 		-
-			message: "#^Argument of an invalid type array\\|false supplied for foreach, only iterables are supported\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Articles\\\\sGetArticleByIdTest\\:\\:assertArticleData\\(\\) has parameter \\$expected with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Detail.php
+			path: tests/Functional/Modules/Articles/sGetArticleByIdTest.php
 
 		-
-			message: "#^Cannot call method click\\(\\) on Behat\\\\Mink\\\\Element\\\\NodeElement\\|null\\.$#"
-			count: 2
-			path: tests/Mink/features/bootstrap/Page/Detail.php
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Articles\\\\sGetArticleByIdTest\\:\\:assertLinks\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: tests/Functional/Modules/Articles/sGetArticleByIdTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Detail\\:\\:addToBasket\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Articles\\\\sGetArticleByIdTest\\:\\:assertLinks\\(\\) has parameter \\$expected with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Detail.php
+			path: tests/Functional/Modules/Articles/sGetArticleByIdTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Detail\\:\\:canNotSelectConfiguratorOption\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Articles\\\\sGetArticleByIdTest\\:\\:assertRelated\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Detail.php
+			path: tests/Functional/Modules/Articles/sGetArticleByIdTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Detail\\:\\:checkEvaluations\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Articles\\\\sGetArticleByIdTest\\:\\:assertRelated\\(\\) has parameter \\$expected with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Detail.php
+			path: tests/Functional/Modules/Articles/sGetArticleByIdTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Detail\\:\\:checkEvaluations\\(\\) has parameter \\$evaluations with no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Articles\\\\sGetArticleByIdTest\\:\\:\\$articleProperties type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Detail.php
+			path: tests/Functional/Modules/Articles/sGetArticleByIdTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Detail\\:\\:checkRating\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Articles\\\\sGetArticleByIdTest\\:\\:\\$articles type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Detail.php
+			path: tests/Functional/Modules/Articles/sGetArticleByIdTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Detail\\:\\:checkSelect\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Category\\\\sGetCategoriesTest\\:\\:assertAndGetSubCategories\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Detail.php
+			path: tests/Functional/Modules/Category/sGetCategoriesTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Detail\\:\\:configure\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Category\\\\sGetCategoriesTest\\:\\:assertAndGetSubCategories\\(\\) has parameter \\$category with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Detail.php
+			path: tests/Functional/Modules/Category/sGetCategoriesTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Detail\\:\\:configure\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Category\\\\sGetCategoriesTest\\:\\:assertAndGetSubCategories\\(\\) has parameter \\$expectedIds with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Detail.php
+			path: tests/Functional/Modules/Category/sGetCategoriesTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Detail\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Category\\\\sGetCategoriesTest\\:\\:testBlockedCustomerGroups\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Detail.php
+			path: tests/Functional/Modules/Category/sGetCategoriesTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Detail\\:\\:openEvaluationSection\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Category\\\\sGetCategoriesTest\\:\\:testCategoryData\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Detail.php
+			path: tests/Functional/Modules/Category/sGetCategoriesTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Detail\\:\\:submitNotification\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Category\\\\sGetCategoriesTest\\:\\:testOnlyActiveCategories\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Detail.php
+			path: tests/Functional/Modules/Category/sGetCategoriesTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Detail\\:\\:toBasket\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Category\\\\sGetCategoriesTest\\:\\:testPositionSorting\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Detail.php
+			path: tests/Functional/Modules/Category/sGetCategoriesTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Detail\\:\\:toBasket\\(\\) has parameter \\$offcanvasCart with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Category\\\\sGetCategoriesTest\\:\\:testWithFourthLevel\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Detail.php
+			path: tests/Functional/Modules/Category/sGetCategoriesTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Detail\\:\\:verifyPage\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Category\\\\sGetCategoriesTest\\:\\:testWithMainId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Detail.php
+			path: tests/Functional/Modules/Category/sGetCategoriesTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Detail\\:\\:writeEvaluation\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Category\\\\sGetCategoriesTest\\:\\:testWithSecondLevel\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Detail.php
+			path: tests/Functional/Modules/Category/sGetCategoriesTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Detail\\:\\:writeEvaluation\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Category\\\\sGetCategoriesTest\\:\\:testWithThirdLevel\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Detail.php
+			path: tests/Functional/Modules/Category/sGetCategoriesTest.php
 
 		-
-			message: "#^Parameter \\#2 \\$value of method Behat\\\\Mink\\\\Element\\\\TraversableElement\\:\\:fillField\\(\\) expects string, int given\\.$#"
+			message: "#^Access to an undefined property Enlight_Components_Session_Namespace\\:\\:\\$Admin\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Detail.php
+			path: tests/Functional/Plugins/Core/HttpCache/BootstrapTest.php
 
 		-
-			message: "#^Strict comparison using \\=\\=\\= between '' and 'select' will always evaluate to false\\.$#"
+			message: "#^Call to an undefined method Enlight_Controller_Response_Response\\:\\:getHeader\\(\\)\\.$#"
 			count: 2
-			path: tests/Mink/features/bootstrap/Page/Detail.php
+			path: tests/Functional/Plugins/Core/HttpCache/BootstrapTest.php
 
 		-
-			message: "#^Variable \\$option in PHPDoc tag @var does not exist\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\BootstrapTest\\:\\:getCookie\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Detail.php
+			path: tests/Functional/Plugins/Core/HttpCache/BootstrapTest.php
 
 		-
-			message: "#^Cannot call method focus\\(\\) on Behat\\\\Mink\\\\Element\\\\NodeElement\\|null\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\BootstrapTest\\:\\:getCookie\\(\\) has parameter \\$name with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Form.php
+			path: tests/Functional/Plugins/Core/HttpCache/BootstrapTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Form\\:\\:checkCaptcha\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\BootstrapTest\\:\\:getHeader\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Form.php
+			path: tests/Functional/Plugins/Core/HttpCache/BootstrapTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Form\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\BootstrapTest\\:\\:getHeader\\(\\) has parameter \\$name with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Form.php
+			path: tests/Functional/Plugins/Core/HttpCache/BootstrapTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Form\\:\\:submitInquiryForm\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\HttpCache\\\\BootstrapTest\\:\\:resetHttpCache\\(\\) has parameter \\$overrideConfig with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Form.php
+			path: tests/Functional/Plugins/Core/HttpCache/BootstrapTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Form\\:\\:submitInquiryForm\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\AbstractMarketing\\:\\:assertArrayEquals\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Form.php
+			path: tests/Functional/Plugins/Core/MarketingAggregate/AbstractMarketing.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Form\\:\\:verifyPage\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\AbstractMarketing\\:\\:assertArrayEquals\\(\\) has parameter \\$expected with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Form.php
+			path: tests/Functional/Plugins/Core/MarketingAggregate/AbstractMarketing.php
 
 		-
-			message: "#^Parameter \\#2 \\$locator of method Behat\\\\Mink\\\\Element\\\\Element\\:\\:find\\(\\) expects array\\|string, bool\\|string given\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\AbstractMarketing\\:\\:assertArrayEquals\\(\\) has parameter \\$properties with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Form.php
+			path: tests/Functional/Plugins/Core/MarketingAggregate/AbstractMarketing.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\GenericPage\\:\\:checkLink\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\AbstractMarketing\\:\\:assertArrayEquals\\(\\) has parameter \\$result with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/GenericPage.php
+			path: tests/Functional/Plugins/Core/MarketingAggregate/AbstractMarketing.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\GenericPage\\:\\:checkLink\\(\\) has parameter \\$query with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\AbstractMarketing\\:\\:getAllArticles\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/GenericPage.php
+			path: tests/Functional/Plugins/Core/MarketingAggregate/AbstractMarketing.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\GenericPage\\:\\:checkRobots\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\AbstractMarketing\\:\\:getAllArticles\\(\\) has parameter \\$condition with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/GenericPage.php
+			path: tests/Functional/Plugins/Core/MarketingAggregate/AbstractMarketing.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\GenericPage\\:\\:checkRobots\\(\\) has parameter \\$content with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\AbstractMarketing\\:\\:saveConfig\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/GenericPage.php
+			path: tests/Functional/Plugins/Core/MarketingAggregate/AbstractMarketing.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\GenericPage\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\AbstractMarketing\\:\\:saveConfig\\(\\) has parameter \\$name with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/GenericPage.php
+			path: tests/Functional/Plugins/Core/MarketingAggregate/AbstractMarketing.php
 
 		-
-			message: "#^Parameter \\#1 \\$url of function parse_url expects string, string\\|null given\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\AbstractMarketing\\:\\:saveConfig\\(\\) has parameter \\$value with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/GenericPage.php
+			path: tests/Functional/Plugins/Core/MarketingAggregate/AbstractMarketing.php
 
 		-
-			message: "#^Argument of an invalid type array\\|false supplied for foreach, only iterables are supported\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\AlsoBoughtTest\\:\\:getAllAlsoBought\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Homepage.php
+			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/AlsoBoughtTest.php
 
 		-
-			message: "#^Cannot access offset 'controller' on array\\|bool\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\AlsoBoughtTest\\:\\:getAllAlsoBought\\(\\) has parameter \\$condition with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Homepage.php
-
-		-
-			message: "#^Cannot access offset 'key' on array\\|false\\.$#"
-			count: 6
-			path: tests/Mink/features/bootstrap/Page/Homepage.php
+			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/AlsoBoughtTest.php
 
 		-
-			message: "#^Cannot access offset 'value' on array\\|false\\.$#"
-			count: 8
-			path: tests/Mink/features/bootstrap/Page/Homepage.php
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\AlsoBoughtTest\\:\\:testInitAlsoBought\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/AlsoBoughtTest.php
 
 		-
-			message: "#^Cannot access offset 'value2' on array\\|false\\.$#"
-			count: 8
-			path: tests/Mink/features/bootstrap/Page/Homepage.php
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\AlsoBoughtTest\\:\\:testRefreshBoughtArticles\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/AlsoBoughtTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Homepage\\:\\:changeCurrency\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\TopSellerTest\\:\\:getAllTopSeller\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Homepage.php
+			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/TopSellerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Homepage\\:\\:checkArticle\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\TopSellerTest\\:\\:getAllTopSeller\\(\\) has parameter \\$condition with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Homepage.php
+			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/TopSellerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Homepage\\:\\:checkArticle\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\TopSellerTest\\:\\:resetTopSeller\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Homepage.php
+			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/TopSellerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Homepage\\:\\:checkBlogArticles\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\TopSellerTest\\:\\:resetTopSeller\\(\\) has parameter \\$condition with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Homepage.php
+			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/TopSellerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Homepage\\:\\:checkBlogArticles\\(\\) has parameter \\$articles with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\TopSellerTest\\:\\:testIncrementTopSeller\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Homepage.php
+			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/TopSellerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Homepage\\:\\:checkCategoryTeaser\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\TopSellerTest\\:\\:testInitTopSeller\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Homepage.php
+			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/TopSellerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Homepage\\:\\:checkComparisonProducts\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\TopSellerTest\\:\\:testRefreshTopSellerForArticleId\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Homepage.php
+			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/TopSellerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Homepage\\:\\:checkComparisonProducts\\(\\) has parameter \\$items with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\TopSellerTest\\:\\:testTopSellerCronJobRefresh\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Homepage.php
+			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/TopSellerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Homepage\\:\\:checkLinkedBanner\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\TopSellerTest\\:\\:testTopSellerLiveRefresh\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Homepage.php
+			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/TopSellerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Homepage\\:\\:checkManufacturerSlider\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\TopSellerTest\\:\\:testTopSellerManualRefresh\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Homepage.php
+			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/TopSellerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Homepage\\:\\:checkManufacturerSlider\\(\\) has parameter \\$slides with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\MarketingAggregate\\\\Components\\\\TopSellerTest\\:\\:testUpdateElapsedTopSeller\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Homepage.php
+			path: tests/Functional/Plugins/Core/MarketingAggregate/Components/TopSellerTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Homepage\\:\\:checkMappedBanner\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Recovery\\\\Update\\\\UpdateHtaccessTest\\:\\:getCombinations\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Homepage.php
+			path: tests/Functional/Recovery/Update/UpdateHtaccessTest.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Homepage\\:\\:checkSlider\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Page/Homepage.php
+			message: "#^Variable \\$this might not be defined\\.$#"
+			count: 3
+			path: tests/Functional/config.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Homepage\\:\\:checkSlider\\(\\) has parameter \\$slides with no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Page\\\\Backend\\\\ContentTypeManager\\\\Elements\\\\ContentTypeManagerDetailWindow\\:\\:\\$elements type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Homepage.php
+			path: tests/Mink/Page/Backend/ContentTypeManager/Elements/ContentTypeManagerDetailWindow.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Homepage\\:\\:checkYoutubeVideo\\(\\) has no return type specified\\.$#"
+			message: "#^Argument of an invalid type array\\|float\\|string supplied for foreach, only iterables are supported\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Homepage.php
+			path: tests/Mink/Page/Frontend/Account/Account.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Homepage\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Cannot access offset 'key' on array\\|false\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Homepage.php
+			path: tests/Mink/Page/Frontend/Account/Account.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Homepage\\:\\:receiveNoResultsMessageForKeyword\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Page/Homepage.php
+			message: "#^Cannot access offset 'value' on array\\|false\\.$#"
+			count: 4
+			path: tests/Mink/Page/Frontend/Account/Account.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Homepage\\:\\:receiveSearchResultsFor\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Page/Homepage.php
+			message: "#^Cannot access offset 'value2' on array\\|false\\.$#"
+			count: 4
+			path: tests/Mink/Page/Frontend/Account/Account.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Homepage\\:\\:searchFor\\(\\) has no return type specified\\.$#"
+			message: "#^Cannot call method getText\\(\\) on Behat\\\\Mink\\\\Element\\\\NodeElement\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Homepage.php
+			path: tests/Mink/Page/Frontend/Account/Account.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Homepage\\:\\:subscribeNewsletter\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Mink/features/bootstrap/Page/Homepage.php
+			message: "#^Cannot call method press\\(\\) on Behat\\\\Mink\\\\Element\\\\NodeElement\\|null\\.$#"
+			count: 3
+			path: tests/Mink/Page/Frontend/Account/Account.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Homepage\\:\\:subscribeNewsletter\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Account\\\\Account\\:\\:changeBillingAddress\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Homepage.php
+			path: tests/Mink/Page/Frontend/Account/Account.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Homepage\\:\\:verifyPage\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Account\\\\Account\\:\\:changeBillingAddress\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Homepage.php
+			path: tests/Mink/Page/Frontend/Account/Account.php
 
 		-
-			message: "#^Parameter \\#1 \\$parent of static method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:fillForm\\(\\) expects Shopware\\\\Tests\\\\Mink\\\\HelperSelectorInterface, SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Element given\\.$#"
-			count: 2
-			path: tests/Mink/features/bootstrap/Page/Homepage.php
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Account\\\\Account\\:\\:changePaymentMethod\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: tests/Mink/Page/Frontend/Account/Account.php
 
 		-
-			message: "#^Parameter \\#1 \\$parent of static method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:pressNamedButton\\(\\) expects Shopware\\\\Tests\\\\Mink\\\\HelperSelectorInterface, SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Element given\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Account\\\\Account\\:\\:changePaymentMethod\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Homepage.php
+			path: tests/Mink/Page/Frontend/Account/Account.php
 
 		-
-			message: "#^Parameter \\#1 \\$properties of method Shopware\\\\Tests\\\\Mink\\\\Element\\\\BlogArticle\\:\\:getArticles\\(\\) expects array\\<string\\>, array\\<int, int\\|string\\> given\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Account\\\\Account\\:\\:changeShippingAddress\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Homepage.php
+			path: tests/Mink/Page/Frontend/Account/Account.php
 
 		-
-			message: "#^Parameter \\#1 \\$properties of method Shopware\\\\Tests\\\\Mink\\\\Element\\\\SliderElement\\:\\:getSlides\\(\\) expects array\\<string\\>, array\\<int, int\\|string\\> given\\.$#"
-			count: 2
-			path: tests/Mink/features/bootstrap/Page/Homepage.php
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Account\\\\Account\\:\\:changeShippingAddress\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: tests/Mink/Page/Frontend/Account/Account.php
 
 		-
-			message: "#^Cannot access offset 'key' on array\\|false\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Account\\\\Account\\:\\:checkEsdArticles\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Listing.php
+			path: tests/Mink/Page/Frontend/Account/Account.php
 
 		-
-			message: "#^Cannot access offset 'value' on array\\|false\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Account\\\\Account\\:\\:checkEsdArticles\\(\\) has parameter \\$articles with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Listing.php
+			path: tests/Mink/Page/Frontend/Account/Account.php
 
 		-
-			message: "#^Cannot access offset 'value2' on array\\|false\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Account\\\\Account\\:\\:checkOrder\\(\\) has parameter \\$articles with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Listing.php
+			path: tests/Mink/Page/Frontend/Account/Account.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Listing\\:\\:checkArticleBox\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Account\\\\Account\\:\\:checkOrderPositions\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Listing.php
+			path: tests/Mink/Page/Frontend/Account/Account.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Listing\\:\\:checkArticleBox\\(\\) has parameter \\$properties with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Account\\\\Account\\:\\:checkOrderPositions\\(\\) has parameter \\$articles with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Listing.php
+			path: tests/Mink/Page/Frontend/Account/Account.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Listing\\:\\:checkListing\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Account\\\\Account\\:\\:checkPaymentMethod\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Listing.php
+			path: tests/Mink/Page/Frontend/Account/Account.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Listing\\:\\:checkView\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Account\\\\Account\\:\\:createArbitraryAddress\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Listing.php
+			path: tests/Mink/Page/Frontend/Account/Account.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Listing\\:\\:filter\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Account\\\\Account\\:\\:createArbitraryAddress\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Listing.php
+			path: tests/Mink/Page/Frontend/Account/Account.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Listing\\:\\:filter\\(\\) has parameter \\$properties with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Account\\\\Account\\:\\:register\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Listing.php
+			path: tests/Mink/Page/Frontend/Account/Account.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Listing\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Account\\\\Account\\:\\:register\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Listing.php
+			path: tests/Mink/Page/Frontend/Account/Account.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Listing\\:\\:openListing\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Account\\\\Elements\\\\AccountBilling\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Listing.php
+			path: tests/Mink/Page/Frontend/Account/Elements/AccountBilling.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Listing\\:\\:openListing\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
+			message: "#^Cannot call method getText\\(\\) on Behat\\\\Mink\\\\Element\\\\NodeElement\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Listing.php
+			path: tests/Mink/Page/Frontend/Account/Elements/AccountOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Listing\\:\\:pressShowResults\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Account\\\\Elements\\\\AccountOrder\\:\\:getDateProperty\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Listing.php
+			path: tests/Mink/Page/Frontend/Account/Elements/AccountOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Listing\\:\\:resetFilters\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Account\\\\Elements\\\\AccountOrder\\:\\:getOrderPositionData\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Listing.php
+			path: tests/Mink/Page/Frontend/Account/Elements/AccountOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Listing\\:\\:setFilters\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Account\\\\Elements\\\\AccountOrder\\:\\:getPositions\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Listing.php
+			path: tests/Mink/Page/Frontend/Account/Elements/AccountOrder.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Listing\\:\\:setFilters\\(\\) has parameter \\$properties with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Account\\\\Elements\\\\AccountPayment\\:\\:getPaymentMethodProperty\\(\\) should return string but returns string\\|false\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Listing.php
+			path: tests/Mink/Page/Frontend/Account/Elements/AccountPayment.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Listing\\:\\:verifyPage\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Account\\\\Elements\\\\AccountPayment\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Listing.php
+			path: tests/Mink/Page/Frontend/Account/Elements/AccountPayment.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Newsletter\\:\\:getNamedSelectors\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Account\\\\Elements\\\\AccountShipping\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Newsletter.php
+			path: tests/Mink/Page/Frontend/Account/Elements/AccountShipping.php
+
+		-
+			message: "#^Binary operation \"\\.\" between array\\|float\\|string and ' ' results in an error\\.$#"
+			count: 2
+			path: tests/Mink/Page/Frontend/Address/Elements/AddressManagementAddressBox.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Newsletter\\:\\:subscribeNewsletter\\(\\) has no return type specified\\.$#"
+			message: "#^Call to an undefined method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Address\\\\Elements\\\\AddressManagementAddressBox\\:\\:getCompanyProperty\\(\\)\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Newsletter.php
+			path: tests/Mink/Page/Frontend/Address/Elements/AddressManagementAddressBox.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Newsletter\\:\\:subscribeNewsletter\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Call to an undefined method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Address\\\\Elements\\\\AddressManagementAddressBox\\:\\:getTitleProperty\\(\\)\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Newsletter.php
+			path: tests/Mink/Page/Frontend/Address/Elements/AddressManagementAddressBox.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Newsletter\\:\\:unsubscribeNewsletter\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Address\\\\Elements\\\\AddressManagementAddressBox\\:\\:containsAdress\\(\\) has parameter \\$givenAddress with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Newsletter.php
+			path: tests/Mink/Page/Frontend/Address/Elements/AddressManagementAddressBox.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Newsletter\\:\\:unsubscribeNewsletter\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Address\\\\Elements\\\\AddressManagementAddressBox\\:\\:getCompanyOrNull\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Newsletter.php
+			path: tests/Mink/Page/Frontend/Address/Elements/AddressManagementAddressBox.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Newsletter\\:\\:verifyPage\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Address\\\\Elements\\\\AddressManagementAddressBox\\:\\:hasTitle\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Newsletter.php
+			path: tests/Mink/Page/Frontend/Address/Elements/AddressManagementAddressBox.php
 
 		-
-			message: "#^Argument of an invalid type array\\|false supplied for foreach, only iterables are supported\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Address\\\\Elements\\\\AddressManagementAddressBox\\:\\:hasTitle\\(\\) has parameter \\$title with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Note.php
+			path: tests/Mink/Page/Frontend/Address/Elements/AddressManagementAddressBox.php
 
 		-
-			message: "#^Cannot access offset 'controller' on array\\|bool\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Article\\\\Elements\\\\Article\\:\\:getImageProperty\\(\\) should return string but returns string\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Note.php
+			path: tests/Mink/Page/Frontend/Article/Elements/Article.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Note\\:\\:checkNoteProducts\\(\\) has no return type specified\\.$#"
+			message: "#^Cannot call method getAttribute\\(\\) on Behat\\\\Mink\\\\Element\\\\NodeElement\\|null\\.$#"
+			count: 5
+			path: tests/Mink/Page/Frontend/Article/Elements/ArticleSlider.php
+
+		-
+			message: "#^Cannot call method getHtml\\(\\) on Behat\\\\Mink\\\\Element\\\\NodeElement\\|null\\.$#"
+			count: 2
+			path: tests/Mink/Page/Frontend/Article/Elements/ArticleSlider.php
+
+		-
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Article\\\\Elements\\\\ArticleSlider\\:\\:getImageProperty\\(\\) should return string but returns string\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Note.php
+			path: tests/Mink/Page/Frontend/Article/Elements/ArticleSlider.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Note\\:\\:checkNoteProducts\\(\\) has parameter \\$items with no value type specified in iterable type array\\.$#"
+			message: "#^Argument of an invalid type array\\|false supplied for foreach, only iterables are supported\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Note.php
+			path: tests/Mink/Page/Frontend/Blog/Blog.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Note\\:\\:fillNoteWithProducts\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Blog\\\\Blog\\:\\:checkComments\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Note.php
+			path: tests/Mink/Page/Frontend/Blog/Blog.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Note\\:\\:fillNoteWithProducts\\(\\) has parameter \\$items with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Blog\\\\Blog\\:\\:checkComments\\(\\) has parameter \\$comments with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Note.php
+			path: tests/Mink/Page/Frontend/Blog/Blog.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Note\\:\\:verifyPage\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Blog\\\\Blog\\:\\:openCommentSection\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Note.php
+			path: tests/Mink/Page/Frontend/Blog/Blog.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Note\\:\\:verifyUrl\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Blog\\\\Blog\\:\\:verifyPage\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Note.php
+			path: tests/Mink/Page/Frontend/Blog/Blog.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Note\\:\\:verifyUrl\\(\\) has parameter \\$urlParameters with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Blog\\\\Blog\\:\\:writeComment\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Note.php
+			path: tests/Mink/Page/Frontend/Blog/Blog.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Sitemap\\:\\:checkGroup\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Blog\\\\Blog\\:\\:writeComment\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Sitemap.php
+			path: tests/Mink/Page/Frontend/Blog/Blog.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Sitemap\\:\\:checkGroup\\(\\) has parameter \\$sites with no value type specified in iterable type array\\.$#"
+			message: "#^Cannot call method getAttribute\\(\\) on Behat\\\\Mink\\\\Element\\\\NodeElement\\|null\\.$#"
+			count: 5
+			path: tests/Mink/Page/Frontend/Blog/Elements/BlogArticle.php
+
+		-
+			message: "#^Cannot call method getText\\(\\) on Behat\\\\Mink\\\\Element\\\\NodeElement\\|null\\.$#"
+			count: 2
+			path: tests/Mink/Page/Frontend/Blog/Elements/BlogArticle.php
+
+		-
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Blog\\\\Elements\\\\BlogArticle\\:\\:getArticles\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Sitemap.php
+			path: tests/Mink/Page/Frontend/Blog/Elements/BlogArticle.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Sitemap\\:\\:checkGroupSite\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$titles of method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Blog\\\\Elements\\\\BlogArticle\\:\\:getUniqueTitle\\(\\) expects array\\<string\\>, array\\<string, string\\|null\\> given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Sitemap.php
+			path: tests/Mink/Page/Frontend/Blog/Elements/BlogArticle.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Sitemap\\:\\:checkGroupSite\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Blog\\\\Elements\\\\BlogComment\\:\\:getProperties\\(\\) has parameter \\$locators with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Sitemap.php
+			path: tests/Mink/Page/Frontend/Blog/Elements/BlogComment.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Sitemap\\:\\:checkGroupTitleLink\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Blog\\\\Elements\\\\BlogComment\\:\\:getProperties\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Sitemap.php
+			path: tests/Mink/Page/Frontend/Blog/Elements/BlogComment.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Sitemap\\:\\:checkGroupTitleLink\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Blog\\\\Elements\\\\BlogComment\\:\\:getStars\\(\\) should return string but returns string\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Sitemap.php
+			path: tests/Mink/Page/Frontend/Blog/Elements/BlogComment.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Sitemap\\:\\:open\\(\\) has parameter \\$urlParameters with no value type specified in iterable type array\\.$#"
+			message: "#^Argument of an invalid type array\\|false supplied for foreach, only iterables are supported\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Sitemap.php
+			path: tests/Mink/Page/Frontend/Checkout/CheckoutCart.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Sitemap\\:\\:verifyUrl\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Checkout\\\\CheckoutCart\\:\\:changePaymentMethod\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Sitemap.php
+			path: tests/Mink/Page/Frontend/Checkout/CheckoutCart.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Sitemap\\:\\:verifyUrl\\(\\) has parameter \\$urlParameters with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Checkout\\\\CheckoutCart\\:\\:changeShippingMethod\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/Sitemap.php
+			path: tests/Mink/Page/Frontend/Checkout/CheckoutCart.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\SitemapIndexXml\\:\\:checkXml\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Checkout\\\\CheckoutCart\\:\\:checkAggregation\\(\\) has parameter \\$aggregation with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/SitemapIndexXml.php
+			path: tests/Mink/Page/Frontend/Checkout/CheckoutCart.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\SitemapIndexXml\\:\\:checkXml\\(\\) has parameter \\$links with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Checkout\\\\CheckoutCart\\:\\:checkCartProducts\\(\\) has parameter \\$items with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/SitemapIndexXml.php
+			path: tests/Mink/Page/Frontend/Checkout/CheckoutCart.php
 
 		-
-			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Checkout\\\\CheckoutCart\\:\\:fillCartWithProducts\\(\\) has parameter \\$items with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/Page/SitemapIndexXml.php
+			path: tests/Mink/Page/Frontend/Checkout/CheckoutCart.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SecurityContext\\:\\:setCsrfStatus\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Checkout\\\\CheckoutCart\\:\\:getAggregationPosition\\(\\) has parameter \\$labels with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SecurityContext.php
+			path: tests/Mink/Page/Frontend/Checkout/CheckoutCart.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SecurityContext\\:\\:setupFeature\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Checkout\\\\CheckoutCart\\:\\:proceedToOrderConfirmationWithRegistration\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SecurityContext.php
+			path: tests/Mink/Page/Frontend/Checkout/CheckoutCart.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SecurityContext\\:\\:teardownFeature\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Checkout\\\\CheckoutCart\\:\\:verify\\(\\) has parameter \\$urlParameters with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SecurityContext.php
+			path: tests/Mink/Page/Frontend/Checkout/CheckoutCart.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SecurityContext\\:\\:theHttpResponseCodeShouldBe\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Checkout\\\\CheckoutCart\\:\\:\\$path \\(string\\) does not accept string\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SecurityContext.php
+			path: tests/Mink/Page/Frontend/Checkout/CheckoutCart.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\SecurityContext\\:\\:\\$configPath has no type specified\\.$#"
+			message: "#^Static method Shopware\\\\Tests\\\\Mink\\\\Tests\\\\General\\\\Helpers\\\\Helper\\:\\:hasNamedLink\\(\\) invoked with 3 parameters, 2 required\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SecurityContext.php
+			path: tests/Mink/Page/Frontend/Checkout/CheckoutCart.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\SecurityContext\\:\\:\\$testConfig has no type specified\\.$#"
+			message: "#^Cannot access offset 'value' on array\\|false\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SecurityContext.php
+			path: tests/Mink/Page/Frontend/Checkout/CheckoutConfirm.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:checkLink\\(\\)\\.$#"
-			count: 3
-			path: tests/Mink/features/bootstrap/SeoContext.php
+			message: "#^Cannot access offset 'value2' on array\\|false\\.$#"
+			count: 1
+			path: tests/Mink/Page/Frontend/Checkout/CheckoutConfirm.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:checkRobots\\(\\)\\.$#"
+			message: "#^Cannot call method getAttribute\\(\\) on Behat\\\\Mink\\\\Element\\\\NodeElement\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SeoContext.php
+			path: tests/Mink/Page/Frontend/Checkout/CheckoutConfirm.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SeoContext\\:\\:iShouldNotSeePageMeta\\(\\) has no return type specified\\.$#"
+			message: "#^Cannot call method press\\(\\) on Behat\\\\Mink\\\\Element\\\\NodeElement\\|null\\.$#"
+			count: 2
+			path: tests/Mink/Page/Frontend/Checkout/CheckoutConfirm.php
+
+		-
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Checkout\\\\CheckoutConfirm\\:\\:changeBillingAddress\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: tests/Mink/Page/Frontend/Checkout/CheckoutConfirm.php
+
+		-
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Checkout\\\\CheckoutConfirm\\:\\:changeModalAddress\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SeoContext.php
+			path: tests/Mink/Page/Frontend/Checkout/CheckoutConfirm.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SeoContext\\:\\:iShouldNotSeePageMeta\\(\\) has parameter \\$locator with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Checkout\\\\CheckoutConfirm\\:\\:changePaymentMethod\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SeoContext.php
+			path: tests/Mink/Page/Frontend/Checkout/CheckoutConfirm.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SeoContext\\:\\:iShouldNotSeePaginationMetas\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Checkout\\\\CheckoutConfirm\\:\\:changeShippingAddress\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SeoContext.php
+			path: tests/Mink/Page/Frontend/Checkout/CheckoutConfirm.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SeoContext\\:\\:iShouldRobotsMeta\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Checkout\\\\CheckoutConfirm\\:\\:changeShippingMethod\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SeoContext.php
+			path: tests/Mink/Page/Frontend/Checkout/CheckoutConfirm.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SeoContext\\:\\:iShouldRobotsMeta\\(\\) has parameter \\$metaOne with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Checkout\\\\CheckoutConfirm\\:\\:createArbitraryAddress\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SeoContext.php
+			path: tests/Mink/Page/Frontend/Checkout/CheckoutConfirm.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SeoContext\\:\\:iShouldRobotsMeta\\(\\) has parameter \\$metaTwo with no type specified\\.$#"
+			message: "#^Parameter \\#1 \\$url of method Behat\\\\Mink\\\\Session\\:\\:visit\\(\\) expects string, string\\|null given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SeoContext.php
+			path: tests/Mink/Page/Frontend/Checkout/CheckoutConfirm.php
+
+		-
+			message: "#^Binary operation \"\\.\" between array\\|float\\|string and ' ' results in an error\\.$#"
+			count: 2
+			path: tests/Mink/Page/Frontend/Checkout/Elements/CheckoutAddressBox.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SeoContext\\:\\:iShouldSeePageMeta\\(\\) has no return type specified\\.$#"
+			message: "#^Call to an undefined method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Checkout\\\\Elements\\\\CheckoutAddressBox\\:\\:getCompanyProperty\\(\\)\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SeoContext.php
+			path: tests/Mink/Page/Frontend/Checkout/Elements/CheckoutAddressBox.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SeoContext\\:\\:iShouldSeePageMeta\\(\\) has parameter \\$locator with no type specified\\.$#"
+			message: "#^Call to an undefined method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Checkout\\\\Elements\\\\CheckoutAddressBox\\:\\:getPanelTitleProperty\\(\\)\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SeoContext.php
+			path: tests/Mink/Page/Frontend/Checkout/Elements/CheckoutAddressBox.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SeoContext\\:\\:iShouldSeePageMetaWithLinkAndPage\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Checkout\\\\Elements\\\\CheckoutAddressBox\\:\\:containsAdress\\(\\) has parameter \\$givenAddress with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SeoContext.php
+			path: tests/Mink/Page/Frontend/Checkout/Elements/CheckoutAddressBox.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SeoContext\\:\\:iShouldSeePageMetaWithLinkAndPage\\(\\) has parameter \\$locator with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Checkout\\\\Elements\\\\CheckoutAddressBox\\:\\:getCompanyOrNull\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SeoContext.php
+			path: tests/Mink/Page/Frontend/Checkout/Elements/CheckoutAddressBox.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SeoContext\\:\\:iShouldSeePageMetaWithLinkAndPage\\(\\) has parameter \\$page with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Checkout\\\\Elements\\\\CheckoutAddressBox\\:\\:hasTitle\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SeoContext.php
+			path: tests/Mink/Page/Frontend/Checkout/Elements/CheckoutAddressBox.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SeoContext\\:\\:iShouldSeePageMetaWithLinkAndPage\\(\\) has parameter \\$path with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Checkout\\\\Elements\\\\CheckoutAddressBox\\:\\:hasTitle\\(\\) has parameter \\$title with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SeoContext.php
+			path: tests/Mink/Page/Frontend/Checkout/Elements/CheckoutAddressBox.php
+
+		-
+			message: "#^Binary operation \"\\.\" between array\\|float\\|string and ' ' results in an error\\.$#"
+			count: 2
+			path: tests/Mink/Page/Frontend/Checkout/Elements/CheckoutAddressBoxModal.php
 
 		-
-			message: "#^Call to an undefined method Behat\\\\Testwork\\\\Environment\\\\Environment\\:\\:getContext\\(\\)\\.$#"
+			message: "#^Call to an undefined method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Checkout\\\\Elements\\\\CheckoutAddressBoxModal\\:\\:getCompanyProperty\\(\\)\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Checkout/Elements/CheckoutAddressBoxModal.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Element\\:\\:checkCart\\(\\)\\.$#"
+			message: "#^Call to an undefined method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Checkout\\\\Elements\\\\CheckoutAddressBoxModal\\:\\:getPanelTitleProperty\\(\\)\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Checkout/Elements/CheckoutAddressBoxModal.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:changeCurrency\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Checkout\\\\Elements\\\\CheckoutAddressBoxModal\\:\\:containsAdress\\(\\) has parameter \\$givenAddress with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Checkout/Elements/CheckoutAddressBoxModal.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:getShopUrl\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Checkout\\\\Elements\\\\CheckoutAddressBoxModal\\:\\:getCompanyOrNull\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Checkout/Elements/CheckoutAddressBoxModal.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:receiveNoResultsMessageForKeyword\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Checkout\\\\Elements\\\\CheckoutAddressBoxModal\\:\\:hasTitle\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Checkout/Elements/CheckoutAddressBoxModal.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:receiveSearchResultsFor\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Checkout\\\\Elements\\\\CheckoutAddressBoxModal\\:\\:hasTitle\\(\\) has parameter \\$title with no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Checkout/Elements/CheckoutAddressBoxModal.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:searchFor\\(\\)\\.$#"
+			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Checkout\\\\Elements\\\\CheckoutBilling\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Checkout/Elements/CheckoutBilling.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:unsubscribeNewsletter\\(\\)\\.$#"
+			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Checkout\\\\Elements\\\\CheckoutPayment\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Checkout/Elements/CheckoutPayment.php
 
 		-
-			message: "#^Cannot access offset 'controller' on array\\|bool\\.$#"
+			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Checkout\\\\Elements\\\\CheckoutShipping\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: tests/Mink/Page/Frontend/Checkout/Elements/CheckoutShipping.php
+
+		-
+			message: "#^Argument of an invalid type array\\|false supplied for foreach, only iterables are supported\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Detail/Detail.php
 
 		-
 			message: "#^Cannot call method click\\(\\) on Behat\\\\Mink\\\\Element\\\\NodeElement\\|null\\.$#"
+			count: 2
+			path: tests/Mink/Page/Frontend/Detail/Detail.php
+
+		-
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Detail\\\\Detail\\:\\:checkEvaluations\\(\\) has parameter \\$evaluations with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Detail/Detail.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:clickLinkInAccount\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Detail\\\\Detail\\:\\:configure\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Detail/Detail.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:clickLinkInAccount\\(\\) has parameter \\$link with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Detail\\\\Detail\\:\\:writeEvaluation\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Detail/Detail.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between '' and 'select' will always evaluate to false\\.$#"
+			count: 2
+			path: tests/Mink/Page/Frontend/Detail/Detail.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:gatherContexts\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Form\\\\Form\\:\\:submitInquiryForm\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Form/Form.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iChangeTheCurrencyTo\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Generic\\\\GenericPage\\:\\:checkLink\\(\\) has parameter \\$query with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Generic/GenericPage.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iChangeTheCurrencyTo\\(\\) has parameter \\$currency with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Generic\\\\GenericPage\\:\\:checkRobots\\(\\) has parameter \\$content with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Generic/GenericPage.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iClick\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$url of function parse_url expects string, string\\|null given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Generic/GenericPage.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iClick\\(\\) has parameter \\$selector with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Elements\\\\Banner\\:\\:getImageProperty\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Homepage/Elements/Banner.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iConfirmTheLinkInTheEmail\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Elements\\\\Banner\\:\\:getImageProperty\\(\\) should return array but returns string\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Homepage/Elements/Banner.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iConfirmTheLinkInTheEmail\\(\\) has parameter \\$limit with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Elements\\\\Banner\\:\\:getLinkProperty\\(\\) should return string but returns string\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Homepage/Elements/Banner.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iDisableTheConfig\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Elements\\\\Banner\\:\\:getMapping\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Homepage/Elements/Banner.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iDisableTheConfig\\(\\) has parameter \\$configName with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Elements\\\\CategoryTeaser\\:\\:getImageProperty\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Homepage/Elements/CategoryTeaser.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iEnableTheConfig\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Elements\\\\CategoryTeaser\\:\\:getImageProperty\\(\\) should return array but returns string\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Homepage/Elements/CategoryTeaser.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iEnableTheConfig\\(\\) has parameter \\$configName with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Elements\\\\CategoryTeaser\\:\\:getLinkProperty\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Homepage/Elements/CategoryTeaser.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iReceivedTheSearchResultsFor\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Elements\\\\CategoryTeaser\\:\\:getLinkProperty\\(\\) should return array but returns string\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Homepage/Elements/CategoryTeaser.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iReceivedTheSearchResultsFor\\(\\) has parameter \\$searchTerm with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Elements\\\\CategoryTeaser\\:\\:getNameProperty\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Homepage/Elements/CategoryTeaser.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iScrollToTheBottomOfThePage\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Elements\\\\CategoryTeaser\\:\\:getNameProperty\\(\\) should return array\\<array\\> but returns string\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Homepage/Elements/CategoryTeaser.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iSearchFor\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Elements\\\\CompareColumn\\:\\:getImageProperty\\(\\) should return string but returns string\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Homepage/Elements/CompareColumn.php
+
+		-
+			message: "#^Cannot call method getAttribute\\(\\) on Behat\\\\Mink\\\\Element\\\\NodeElement\\|null\\.$#"
+			count: 4
+			path: tests/Mink/Page/Frontend/Homepage/Elements/ManufacturerSlider.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iSearchFor\\(\\) has parameter \\$searchTerm with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Elements\\\\ManufacturerSlider\\:\\:getImageProperty\\(\\) should return string but returns string\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Homepage/Elements/ManufacturerSlider.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iShouldSeeABanner\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Elements\\\\ManufacturerSlider\\:\\:getLinkProperty\\(\\) should return string but returns string\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Homepage/Elements/ManufacturerSlider.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iShouldSeeABanner\\(\\) has parameter \\$image with no type specified\\.$#"
+			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Elements\\\\SearchForm\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Homepage/Elements/SearchForm.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iShouldSeeABanner\\(\\) has parameter \\$link with no type specified\\.$#"
+			message: "#^Cannot call method getText\\(\\) on Behat\\\\Mink\\\\Element\\\\NodeElement\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Homepage/Elements/SliderElement.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iShouldSeeABannerOnPositionWithImage\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Elements\\\\SliderElement\\:\\:__call\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Homepage/Elements/SliderElement.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iShouldSeeABannerOnPositionWithImage\\(\\) has parameter \\$image with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Elements\\\\SliderElement\\:\\:__call\\(\\) should return string but returns string\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Homepage/Elements/SliderElement.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iShouldSeeABannerOnPositionWithImage\\(\\) has parameter \\$link with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Elements\\\\SliderElement\\:\\:getSlides\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Homepage/Elements/SliderElement.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iShouldSeeABannerOnPositionWithImage\\(\\) has parameter \\$position with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Elements\\\\YouTube\\:\\:getCodeProperty\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Homepage/Elements/YouTube.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iShouldSeeABannerOnPositionWithImageAndMapping\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Elements\\\\YouTube\\:\\:getCodeProperty\\(\\) should return array but returns string\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Homepage/Elements/YouTube.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iShouldSeeABannerOnPositionWithImageAndMapping\\(\\) has parameter \\$image with no type specified\\.$#"
+			message: "#^Cannot access offset 'controller' on array\\|bool\\.$#"
+			count: 1
+			path: tests/Mink/Page/Frontend/Homepage/Homepage.php
+
+		-
+			message: "#^Cannot access offset 'key' on array\\|false\\.$#"
+			count: 6
+			path: tests/Mink/Page/Frontend/Homepage/Homepage.php
+
+		-
+			message: "#^Cannot access offset 'value' on array\\|false\\.$#"
+			count: 8
+			path: tests/Mink/Page/Frontend/Homepage/Homepage.php
+
+		-
+			message: "#^Cannot access offset 'value2' on array\\|false\\.$#"
+			count: 8
+			path: tests/Mink/Page/Frontend/Homepage/Homepage.php
+
+		-
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Homepage\\:\\:checkArticle\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: tests/Mink/Page/Frontend/Homepage/Homepage.php
+
+		-
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Homepage\\:\\:checkArticle\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: tests/Mink/Page/Frontend/Homepage/Homepage.php
+
+		-
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Homepage\\:\\:checkBlogArticles\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: tests/Mink/Page/Frontend/Homepage/Homepage.php
+
+		-
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Homepage\\:\\:checkBlogArticles\\(\\) has parameter \\$articles with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: tests/Mink/Page/Frontend/Homepage/Homepage.php
+
+		-
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Homepage\\:\\:checkCategoryTeaser\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: tests/Mink/Page/Frontend/Homepage/Homepage.php
+
+		-
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Homepage\\:\\:checkComparisonProducts\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: tests/Mink/Page/Frontend/Homepage/Homepage.php
+
+		-
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Homepage\\:\\:checkComparisonProducts\\(\\) has parameter \\$items with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: tests/Mink/Page/Frontend/Homepage/Homepage.php
+
+		-
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Homepage\\:\\:checkLinkedBanner\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: tests/Mink/Page/Frontend/Homepage/Homepage.php
+
+		-
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Homepage\\:\\:checkManufacturerSlider\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: tests/Mink/Page/Frontend/Homepage/Homepage.php
+
+		-
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Homepage\\:\\:checkManufacturerSlider\\(\\) has parameter \\$slides with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: tests/Mink/Page/Frontend/Homepage/Homepage.php
+
+		-
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Homepage\\:\\:checkMappedBanner\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: tests/Mink/Page/Frontend/Homepage/Homepage.php
+
+		-
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Homepage\\:\\:checkSlider\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Homepage/Homepage.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iShouldSeeABannerOnPositionWithImageAndMapping\\(\\) has parameter \\$position with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Homepage\\:\\:checkSlider\\(\\) has parameter \\$slides with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Homepage/Homepage.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iShouldSeeABannerSlider\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Homepage\\:\\:checkYoutubeVideo\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Homepage/Homepage.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iShouldSeeABannerWithMapping\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Homepage\\:\\:subscribeNewsletter\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Homepage/Homepage.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iShouldSeeABannerWithMapping\\(\\) has parameter \\$image with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Homepage\\:\\:subscribeNewsletter\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Homepage/Homepage.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iShouldSeeACategoryTeaserWithImageTo\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Homepage\\:\\:verifyPage\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Homepage/Homepage.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iShouldSeeACategoryTeaserWithImageTo\\(\\) has parameter \\$image with no type specified\\.$#"
+			message: "#^Parameter \\#1 \\$properties of method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Blog\\\\Elements\\\\BlogArticle\\:\\:getArticles\\(\\) expects array\\<string\\>, array\\<int, int\\|string\\> given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Homepage/Homepage.php
+
+		-
+			message: "#^Parameter \\#1 \\$properties of method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Homepage\\\\Elements\\\\SliderElement\\:\\:getSlides\\(\\) expects array\\<string\\>, array\\<int, int\\|string\\> given\\.$#"
+			count: 2
+			path: tests/Mink/Page/Frontend/Homepage/Homepage.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iShouldSeeACategoryTeaserWithImageTo\\(\\) has parameter \\$link with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Listing\\\\Elements\\\\Paging\\:\\:moveDirection\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Listing/Elements/Paging.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iShouldSeeACategoryTeaserWithImageTo\\(\\) has parameter \\$name with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Listing\\\\Elements\\\\Paging\\:\\:moveToPage\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Listing/Elements/Paging.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iShouldSeeACategoryTeaserWithImageTo\\(\\) has parameter \\$position with no type specified\\.$#"
+			message: "#^Parameter \\#1 \\$locator of method Behat\\\\Mink\\\\Element\\\\TraversableElement\\:\\:clickLink\\(\\) expects string, int given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Listing/Elements/Paging.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iShouldSeeAManufacturerSlider\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$locator of method Behat\\\\Mink\\\\Element\\\\TraversableElement\\:\\:hasLink\\(\\) expects string, int given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Listing/Elements/Paging.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iShouldSeeAYoutubeVideo\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Listing\\\\Elements\\\\Paging\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Listing/Elements/Paging.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iShouldSeeAYoutubeVideo\\(\\) has parameter \\$code with no type specified\\.$#"
+			message: "#^Cannot access offset 'key' on array\\|false\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Listing/Listing.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iShouldSeeAnArticle\\(\\) has no return type specified\\.$#"
+			message: "#^Cannot access offset 'value' on array\\|false\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Listing/Listing.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iShouldSeeAnArticle\\(\\) has parameter \\$position with no type specified\\.$#"
+			message: "#^Cannot access offset 'value2' on array\\|false\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Listing/Listing.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iShouldSeeAnArticleSlider\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Listing\\\\Listing\\:\\:checkArticleBox\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Listing/Listing.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iShouldSeeSomeBlogArticles\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Listing\\\\Listing\\:\\:checkArticleBox\\(\\) has parameter \\$properties with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Listing/Listing.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iShouldSeeTheNoResultsMessageForKeyword\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Listing\\\\Listing\\:\\:checkListing\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Listing/Listing.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iShouldSeeTheNoResultsMessageForKeyword\\(\\) has parameter \\$keyword with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Listing\\\\Listing\\:\\:checkView\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Listing/Listing.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iSubscribeToTheNewsletterWith\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Listing\\\\Listing\\:\\:filter\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Listing/Listing.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iSubscribeToTheNewsletterWith\\(\\) has parameter \\$email with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Listing\\\\Listing\\:\\:filter\\(\\) has parameter \\$properties with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Listing/Listing.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iTheLanguageShouldBe\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Listing\\\\Listing\\:\\:openListing\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Listing/Listing.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iTheLanguageShouldBe\\(\\) has parameter \\$language with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Listing\\\\Listing\\:\\:openListing\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Listing/Listing.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iUnsubscribeTheNewsletter\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Listing\\\\Listing\\:\\:pressShowResults\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Listing/Listing.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:iUnsubscribeTheNewsletter\\(\\) has parameter \\$email with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Listing\\\\Listing\\:\\:resetFilters\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Listing/Listing.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:theCartShouldContainArticlesWithAValueOf\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Listing\\\\Listing\\:\\:setFilters\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Listing/Listing.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:theCartShouldContainArticlesWithAValueOf\\(\\) has parameter \\$amount with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Listing\\\\Listing\\:\\:setFilters\\(\\) has parameter \\$properties with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Listing/Listing.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:theCartShouldContainArticlesWithAValueOf\\(\\) has parameter \\$quantity with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Listing\\\\Listing\\:\\:verifyPage\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Listing/Listing.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:theComparisonShouldContainTheFollowingProducts\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Newsletter\\\\Newsletter\\:\\:subscribeNewsletter\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Newsletter/Newsletter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:theConfigValueOfIs\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Newsletter\\\\Newsletter\\:\\:subscribeNewsletter\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Newsletter/Newsletter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:theConfigValueOfIs\\(\\) has parameter \\$configName with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Newsletter\\\\Newsletter\\:\\:unsubscribeNewsletter\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Newsletter/Newsletter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:theConfigValueOfIs\\(\\) has parameter \\$value with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Newsletter\\\\Newsletter\\:\\:unsubscribeNewsletter\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Newsletter/Newsletter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:theEmotionWorldHasLoaded\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Newsletter\\\\Newsletter\\:\\:verifyPage\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Newsletter/Newsletter.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\ShopwareContext\\:\\:waitForAjaxRequestsDone\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Note\\\\Elements\\\\NotePosition\\:\\:getImageProperty\\(\\) should return string but returns string\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Note/Elements/NotePosition.php
 
 		-
-			message: "#^Parameter \\#1 \\$blogArticle of method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Homepage\\:\\:checkBlogArticles\\(\\) expects Shopware\\\\Tests\\\\Mink\\\\Element\\\\BlogArticle, Shopware\\\\Tests\\\\Mink\\\\Element\\\\MultipleElement given\\.$#"
+			message: "#^Cannot access offset 'controller' on array\\|bool\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Note/Note.php
 
 		-
-			message: "#^Parameter \\#1 \\$youtube of method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Homepage\\:\\:checkYoutubeVideo\\(\\) expects Shopware\\\\Tests\\\\Mink\\\\Element\\\\YouTube, Shopware\\\\Tests\\\\Mink\\\\Element\\\\MultipleElement given\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Note\\\\Note\\:\\:checkNoteProducts\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/ShopwareContext.php
+			path: tests/Mink/Page/Frontend/Note/Note.php
 
 		-
-			message: "#^Call to an undefined method SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page\\:\\:checkXml\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Note\\\\Note\\:\\:checkNoteProducts\\(\\) has parameter \\$items with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SitemapContext.php
+			path: tests/Mink/Page/Frontend/Note/Note.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SitemapContext\\:\\:iAmOnTheSitemapIndexXml\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Note\\\\Note\\:\\:fillNoteWithProducts\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SitemapContext.php
+			path: tests/Mink/Page/Frontend/Note/Note.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SitemapContext\\:\\:iAmOnTheSitemapXml\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Note\\\\Note\\:\\:fillNoteWithProducts\\(\\) has parameter \\$items with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SitemapContext.php
+			path: tests/Mink/Page/Frontend/Note/Note.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SitemapContext\\:\\:iShouldSeeTheGroup\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Note\\\\Note\\:\\:verifyPage\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SitemapContext.php
+			path: tests/Mink/Page/Frontend/Note/Note.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SitemapContext\\:\\:iShouldSeeTheGroup\\(\\) has parameter \\$name with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Note\\\\Note\\:\\:verifyUrl\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SitemapContext.php
+			path: tests/Mink/Page/Frontend/Note/Note.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SitemapContext\\:\\:iShouldSeeTheGroupWithLink\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Note\\\\Note\\:\\:verifyUrl\\(\\) has parameter \\$urlParameters with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SitemapContext.php
+			path: tests/Mink/Page/Frontend/Note/Note.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SitemapContext\\:\\:iShouldSeeTheGroupWithLink\\(\\) has parameter \\$link with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Sitemap\\\\Elements\\\\SitemapGroup\\:\\:getLevel1Data\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SitemapContext.php
+			path: tests/Mink/Page/Frontend/Sitemap/Elements/SitemapGroup.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SitemapContext\\:\\:iShouldSeeTheGroupWithLink\\(\\) has parameter \\$name with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Sitemap\\\\Elements\\\\SitemapGroup\\:\\:getLevel2Data\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SitemapContext.php
+			path: tests/Mink/Page/Frontend/Sitemap/Elements/SitemapGroup.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SitemapContext\\:\\:thereShouldBeTheseLinksInTheXml\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Sitemap\\\\Elements\\\\SitemapGroup\\:\\:getTitleLinkData\\(\\) should return array\\<string\\> but returns array\\<string, string\\|null\\>\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SitemapContext.php
+			path: tests/Mink/Page/Frontend/Sitemap/Elements/SitemapGroup.php
 
 		-
-			message: "#^Call to an undefined method Shopware\\\\Tests\\\\Mink\\\\HelperSelectorInterface\\:\\:press\\(\\)\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Sitemap\\\\Sitemap\\:\\:checkGroup\\(\\) has parameter \\$sites with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SpecialContext.php
+			path: tests/Mink/Page/Frontend/Sitemap/Sitemap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SpecialContext\\:\\:IignoreFormValidations\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Sitemap\\\\Sitemap\\:\\:checkGroupSite\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SpecialContext.php
+			path: tests/Mink/Page/Frontend/Sitemap/Sitemap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SpecialContext\\:\\:clickElementWhenClickable\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Sitemap\\\\Sitemap\\:\\:checkGroupSite\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SpecialContext.php
+			path: tests/Mink/Page/Frontend/Sitemap/Sitemap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SpecialContext\\:\\:clickNamedButtonWhenClickable\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Sitemap\\\\Sitemap\\:\\:checkGroupTitleLink\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SpecialContext.php
+			path: tests/Mink/Page/Frontend/Sitemap/Sitemap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SpecialContext\\:\\:clickNamedLinkWhenClickable\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Sitemap\\\\Sitemap\\:\\:checkGroupTitleLink\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SpecialContext.php
+			path: tests/Mink/Page/Frontend/Sitemap/Sitemap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SpecialContext\\:\\:iAmOnThePage\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Sitemap\\\\Sitemap\\:\\:open\\(\\) has parameter \\$urlParameters with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SpecialContext.php
+			path: tests/Mink/Page/Frontend/Sitemap/Sitemap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SpecialContext\\:\\:iFollowTheLinkOfTheElement\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Sitemap\\\\Sitemap\\:\\:verifyUrl\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SpecialContext.php
+			path: tests/Mink/Page/Frontend/Sitemap/Sitemap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SpecialContext\\:\\:iFollowTheLinkOfTheElement\\(\\) has parameter \\$elementClass with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Sitemap\\\\Sitemap\\:\\:verifyUrl\\(\\) has parameter \\$urlParameters with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SpecialContext.php
+			path: tests/Mink/Page/Frontend/Sitemap/Sitemap.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SpecialContext\\:\\:iFollowTheLinkOfTheElement\\(\\) has parameter \\$position with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Sitemap\\\\SitemapIndexXml\\:\\:checkXml\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SpecialContext.php
+			path: tests/Mink/Page/Frontend/Sitemap/SitemapIndexXml.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SpecialContext\\:\\:iFollowTheLinkOfTheElementOnPosition\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Frontend\\\\Sitemap\\\\SitemapIndexXml\\:\\:checkXml\\(\\) has parameter \\$links with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SpecialContext.php
+			path: tests/Mink/Page/Frontend/Sitemap/SitemapIndexXml.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SpecialContext\\:\\:iFollowTheLinkOfTheElementOnPosition\\(\\) has parameter \\$elementClass with no type specified\\.$#"
+			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SpecialContext.php
+			path: tests/Mink/Page/Frontend/Sitemap/SitemapIndexXml.php
+
+		-
+			message: "#^Cannot call method getAttribute\\(\\) on Behat\\\\Mink\\\\Element\\\\NodeElement\\|null\\.$#"
+			count: 4
+			path: tests/Mink/Page/Helper/Elements/BannerSlider.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SpecialContext\\:\\:iFollowTheLinkOfTheElementOnPosition\\(\\) has parameter \\$linkName with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Helper\\\\Elements\\\\BannerSlider\\:\\:getImageProperty\\(\\) should return string but returns string\\|null\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SpecialContext.php
+			path: tests/Mink/Page/Helper/Elements/BannerSlider.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SpecialContext\\:\\:iFollowTheLinkOfTheElementOnPosition\\(\\) has parameter \\$position with no type specified\\.$#"
+			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Page\\\\Helper\\\\Elements\\\\HeaderCart\\:\\:\\$selector type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SpecialContext.php
+			path: tests/Mink/Page/Helper/Elements/HeaderCart.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SpecialContext\\:\\:iFollowTheLinkOfThePage\\(\\) has no return type specified\\.$#"
+			message: "#^Class Shopware\\\\Tests\\\\Mink\\\\Page\\\\Helper\\\\Elements\\\\MultipleElement implements generic interface Iterator but does not specify its types\\: TKey, TValue$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SpecialContext.php
+			path: tests/Mink/Page/Helper/Elements/MultipleElement.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SpecialContext\\:\\:iFollowTheLinkOfThePage\\(\\) has parameter \\$linkName with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Page\\\\Helper\\\\Elements\\\\MultipleElement\\:\\:__call\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SpecialContext.php
+			path: tests/Mink/Page/Helper/Elements/MultipleElement.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SpecialContext\\:\\:iPressTheButtonOfTheElementOnPosition\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Tests\\\\Backend\\\\Export\\\\bootstrap\\\\ExportContext\\:\\:assertKeyExists\\(\\) has parameter \\$row with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SpecialContext.php
+			path: tests/Mink/Tests/Backend/Export/bootstrap/ExportContext.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SpecialContext\\:\\:iPressTheButtonOfTheElementOnPosition\\(\\) has parameter \\$elementClass with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Tests\\\\Backend\\\\Export\\\\bootstrap\\\\ExportContext\\:\\:parseCsv\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SpecialContext.php
+			path: tests/Mink/Tests/Backend/Export/bootstrap/ExportContext.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SpecialContext\\:\\:iPressTheButtonOfTheElementOnPosition\\(\\) has parameter \\$linkName with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Tests\\\\Backend\\\\Export\\\\bootstrap\\\\ExportContext\\:\\:parseXml\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SpecialContext.php
+			path: tests/Mink/Tests/Backend/Export/bootstrap/ExportContext.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SpecialContext\\:\\:iPressTheButtonOfTheElementOnPosition\\(\\) has parameter \\$position with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Tests\\\\Backend\\\\Export\\\\bootstrap\\\\ExportContext\\:\\:pathTo\\(\\) has parameter \\$feed with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SpecialContext.php
+			path: tests/Mink/Tests/Backend/Export/bootstrap/ExportContext.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SpecialContext\\:\\:iShouldBeOnThePage\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Tests\\\\Backend\\\\Export\\\\bootstrap\\\\ExportContext\\:\\:validate\\(\\) has parameter \\$export with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SpecialContext.php
+			path: tests/Mink/Tests/Backend/Export/bootstrap/ExportContext.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SpecialContext\\:\\:iShouldSeeElementsOfType\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Tests\\\\Backend\\\\Export\\\\bootstrap\\\\ExportContext\\:\\:\\$mappings type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SpecialContext.php
+			path: tests/Mink/Tests/Backend/Export/bootstrap/ExportContext.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SpecialContext\\:\\:iShouldSeeElementsOfType\\(\\) has parameter \\$count with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Tests\\\\Frontend\\\\Homepage\\\\bootstrap\\\\SecurityContext\\:\\:setCsrfStatus\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SpecialContext.php
+			path: tests/Mink/Tests/Frontend/Homepage/bootstrap/SecurityContext.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SpecialContext\\:\\:iShouldSeeElementsOfType\\(\\) has parameter \\$elementClass with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Tests\\\\Frontend\\\\Homepage\\\\bootstrap\\\\SecurityContext\\:\\:setupFeature\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SpecialContext.php
+			path: tests/Mink/Tests/Frontend/Homepage/bootstrap/SecurityContext.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SpecialContext\\:\\:iShouldSeeElementsOfType\\(\\) has parameter \\$mode with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Tests\\\\Frontend\\\\Homepage\\\\bootstrap\\\\SecurityContext\\:\\:teardownFeature\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SpecialContext.php
+			path: tests/Mink/Tests/Frontend/Homepage/bootstrap/SecurityContext.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SpecialContext\\:\\:spin\\(\\) should return bool but return statement is missing\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Tests\\\\Frontend\\\\Homepage\\\\bootstrap\\\\SecurityContext\\:\\:theHttpResponseCodeShouldBe\\(\\) has no return type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SpecialContext.php
+			path: tests/Mink/Tests/Frontend/Homepage/bootstrap/SecurityContext.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SpecialContext\\:\\:theArticlesFromHaveTaxId\\(\\) has no return type specified\\.$#"
+			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Tests\\\\Frontend\\\\Homepage\\\\bootstrap\\\\SecurityContext\\:\\:\\$configPath has no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SpecialContext.php
+			path: tests/Mink/Tests/Frontend/Homepage/bootstrap/SecurityContext.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SpecialContext\\:\\:theArticlesFromHaveTaxId\\(\\) has parameter \\$supplier with no type specified\\.$#"
+			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Tests\\\\Frontend\\\\Homepage\\\\bootstrap\\\\SecurityContext\\:\\:\\$testConfig has no type specified\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SpecialContext.php
+			path: tests/Mink/Tests/Frontend/Homepage/bootstrap/SecurityContext.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SpecialContext\\:\\:theArticlesFromHaveTaxId\\(\\) has parameter \\$taxId with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Tests\\\\General\\\\Helpers\\\\Helper\\:\\:assertElementProperties\\(\\) has parameter \\$properties with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SpecialContext.php
+			path: tests/Mink/Tests/General/Helpers/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SpecialContext\\:\\:theFieldShouldContain\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Tests\\\\General\\\\Helpers\\\\Helper\\:\\:assertElementProperties\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SpecialContext.php
+			path: tests/Mink/Tests/General/Helpers/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SpecialContext\\:\\:theFieldShouldContain\\(\\) has parameter \\$field with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Tests\\\\General\\\\Helpers\\\\Helper\\:\\:assertElements\\(\\) has parameter \\$needles with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SpecialContext.php
+			path: tests/Mink/Tests/General/Helpers/Helper.php
 
 		-
-			message: "#^Parameter \\#1 \\$element of method Shopware\\\\Tests\\\\Mink\\\\SpecialContext\\:\\:clickElementWhenClickable\\(\\) expects Behat\\\\Mink\\\\Element\\\\NodeElement, Shopware\\\\Tests\\\\Mink\\\\HelperSelectorInterface given\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Tests\\\\General\\\\Helpers\\\\Helper\\:\\:assertElements\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SpecialContext.php
+			path: tests/Mink/Tests/General/Helpers/Helper.php
 
 		-
-			message: "#^Parameter \\#1 \\$parent of static method Shopware\\\\Tests\\\\Mink\\\\Helper\\:\\:clickNamedLink\\(\\) expects Shopware\\\\Tests\\\\Mink\\\\HelperSelectorInterface, SensioLabs\\\\Behat\\\\PageObjectExtension\\\\PageObject\\\\Page given\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Tests\\\\General\\\\Helpers\\\\Helper\\:\\:checkArray\\(\\) has parameter \\$check with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SpecialContext.php
+			path: tests/Mink/Tests/General/Helpers/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SubContext\\:\\:getMinkParameter\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Tests\\\\General\\\\Helpers\\\\Helper\\:\\:compareArrays\\(\\) has parameter \\$array1 with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SubContext.php
+			path: tests/Mink/Tests/General/Helpers/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SubContext\\:\\:setKernel\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Tests\\\\General\\\\Helpers\\\\Helper\\:\\:compareArrays\\(\\) has parameter \\$array2 with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SubContext.php
+			path: tests/Mink/Tests/General/Helpers/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SubContext\\:\\:setMink\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Tests\\\\General\\\\Helpers\\\\Helper\\:\\:compareArrays\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SubContext.php
+			path: tests/Mink/Tests/General/Helpers/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SubContext\\:\\:setMinkParameters\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Tests\\\\General\\\\Helpers\\\\Helper\\:\\:convertTableHashToArray\\(\\) has parameter \\$hash with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SubContext.php
+			path: tests/Mink/Tests/General/Helpers/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\SubContext\\:\\:setMinkParameters\\(\\) has parameter \\$parameters with no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Tests\\\\General\\\\Helpers\\\\Helper\\:\\:convertTableHashToArray\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SubContext.php
+			path: tests/Mink/Tests/General/Helpers/Helper.php
 
 		-
-			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\SubContext\\:\\:\\$minkParameters type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Tests\\\\General\\\\Helpers\\\\Helper\\:\\:filter\\(\\) has parameter \\$var with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/SubContext.php
+			path: tests/Mink/Tests/General/Helpers/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\TransformContext\\:\\:castPageNameToPage\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Tests\\\\General\\\\Helpers\\\\Helper\\:\\:findAllOfElements\\(\\) has parameter \\$keys with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/TransformContext.php
+			path: tests/Mink/Tests/General/Helpers/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\TransformContext\\:\\:castPageNameToPage\\(\\) has parameter \\$pageName with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Tests\\\\General\\\\Helpers\\\\Helper\\:\\:findAllOfElements\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/TransformContext.php
+			path: tests/Mink/Tests/General/Helpers/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\TransformContext\\:\\:castStringToNumber\\(\\) has no return type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Tests\\\\General\\\\Helpers\\\\Helper\\:\\:floatArray\\(\\) has parameter \\$keys with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/TransformContext.php
+			path: tests/Mink/Tests/General/Helpers/Helper.php
 
 		-
-			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\TransformContext\\:\\:castStringToNumber\\(\\) has parameter \\$string with no type specified\\.$#"
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Tests\\\\General\\\\Helpers\\\\Helper\\:\\:floatArray\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: tests/Mink/features/bootstrap/TransformContext.php
+			path: tests/Mink/Tests/General/Helpers/Helper.php
+
+		-
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Tests\\\\General\\\\Helpers\\\\Helper\\:\\:floatArray\\(\\) return type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: tests/Mink/Tests/General/Helpers/Helper.php
+
+		-
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Tests\\\\General\\\\Helpers\\\\Helper\\:\\:getElementProperty\\(\\) return type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: tests/Mink/Tests/General/Helpers/Helper.php
+
+		-
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Tests\\\\General\\\\Helpers\\\\Helper\\:\\:getPageInfo\\(\\) has parameter \\$selectionMode with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: tests/Mink/Tests/General/Helpers/Helper.php
+
+		-
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Tests\\\\General\\\\Helpers\\\\Helper\\:\\:getPageInfo\\(\\) return type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: tests/Mink/Tests/General/Helpers/Helper.php
+
+		-
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Tests\\\\General\\\\Helpers\\\\Helper\\:\\:getUnique\\(\\) has parameter \\$array with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: tests/Mink/Tests/General/Helpers/Helper.php
+
+		-
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Tests\\\\General\\\\Helpers\\\\Helper\\:\\:searchElements\\(\\) has parameter \\$needles with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: tests/Mink/Tests/General/Helpers/Helper.php
+
+		-
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Tests\\\\General\\\\Helpers\\\\Helper\\:\\:searchElements\\(\\) return type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: tests/Mink/Tests/General/Helpers/Helper.php
+
+		-
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Tests\\\\General\\\\Helpers\\\\Helper\\:\\:throwException\\(\\) has parameter \\$messages with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: tests/Mink/Tests/General/Helpers/Helper.php
+
+		-
+			message: "#^Method Shopware\\\\Tests\\\\Mink\\\\Tests\\\\General\\\\Helpers\\\\SubContext\\:\\:setMinkParameters\\(\\) has parameter \\$parameters with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: tests/Mink/Tests/General/Helpers/SubContext.php
+
+		-
+			message: "#^Property Shopware\\\\Tests\\\\Mink\\\\Tests\\\\General\\\\Helpers\\\\SubContext\\:\\:\\$minkParameters type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: tests/Mink/Tests/General/Helpers/SubContext.php
 
 		-
 			message: "#^Access to an undefined property Enlight_Collection_ArrayCollection\\:\\:\\$key_one\\.$#"
@@ -49635,11 +39145,6 @@ parameters:
 			count: 1
 			path: tests/Unit/Bundle/MediaBundle/CacheOptimizerServiceTest.php
 
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Bundle\\\\MediaBundle\\\\TestPngOptimizer\\:\\:run\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Bundle/MediaBundle/CacheOptimizerServiceTest.php
-
 		-
 			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Bundle\\\\MediaBundle\\\\CdnOptimizerServiceTest\\:\\:testDeleteOfTempFileOnException\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -49765,11 +39270,6 @@ parameters:
 			count: 1
 			path: tests/Unit/Bundle/MediaBundle/OptimizerServiceTest.php
 
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Bundle\\\\MediaBundle\\\\UnitOptimizer\\:\\:run\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Bundle/MediaBundle/OptimizerServiceTest.php
-
 		-
 			message: "#^Parameter \\#1 \\$mime of method Shopware\\\\Bundle\\\\MediaBundle\\\\OptimizerService\\:\\:getOptimizerByMimeType\\(\\) expects string, null given\\.$#"
 			count: 1
@@ -49885,16 +39385,6 @@ parameters:
 			count: 1
 			path: tests/Unit/Bundle/MediaBundle/Strategy/PlainStrategyTest.php
 
-		-
-			message: "#^Method UniqueIdGeneratorTest\\:\\:testReturnUniqueIdFromDb\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Bundle/PluginInstallerBundle/UniqueIdGenerator/UniqueIdGeneratorTest.php
-
-		-
-			message: "#^Method UniqueIdGeneratorTest\\:\\:testStoringGeneratedIdInDb\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Bundle/PluginInstallerBundle/UniqueIdGenerator/UniqueIdGeneratorTest.php
-
 		-
 			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Bundle\\\\SearchBundle\\\\BatchProductNumberSearchTest\\:\\:invokeMethod\\(\\) has parameter \\$parameters with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -50035,31 +39525,6 @@ parameters:
 			count: 1
 			path: tests/Unit/Bundle/SitemapBundle/Service/UrlFilterTest.php
 
-		-
-			message: "#^Access to an undefined property Shopware\\\\Tests\\\\Unit\\\\Bundle\\\\SitemapBundle\\\\SitemapListenerTest\\:\\:\\$sitemapFolder\\.$#"
-			count: 1
-			path: tests/Unit/Bundle/SitemapBundle/SitemapListenerTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Bundle\\\\SitemapBundle\\\\SitemapListenerTest\\:\\:testListEmptyFolder\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Bundle/SitemapBundle/SitemapListenerTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Bundle\\\\SitemapBundle\\\\SitemapListenerTest\\:\\:testListWithSitemap\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Bundle/SitemapBundle/SitemapListenerTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Bundle\\\\SitemapBundle\\\\SitemapLockTest\\:\\:testAcquireLockDefaultFalse\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Bundle/SitemapBundle/SitemapLockTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Bundle\\\\SitemapBundle\\\\SitemapLockTest\\:\\:testAcquireLockWorks\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Bundle/SitemapBundle/SitemapLockTest.php
-
 		-
 			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Bundle\\\\SitemapBundle\\\\SitemapNameGeneratorTest\\:\\:testPathGeneration\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -50325,46 +39790,6 @@ parameters:
 			count: 1
 			path: tests/Unit/Components/DependencyInjection/Compiler/TagReplaceTraitTest.php
 
-		-
-			message: "#^Call to an undefined method Enlight_Event_EventArgs\\:\\:getSubject\\(\\)\\.$#"
-			count: 3
-			path: tests/Unit/Components/DependencyInjection/ContainerTest.php
-
-		-
-			message: "#^Call to an undefined method Prophecy\\\\Prophecy\\\\ObjectProphecy\\:\\:notify\\(\\)\\.$#"
-			count: 7
-			path: tests/Unit/Components/DependencyInjection/ContainerTest.php
-
-		-
-			message: "#^Call to an undefined method Prophecy\\\\Prophecy\\\\ObjectProphecy\\:\\:notifyUntil\\(\\)\\.$#"
-			count: 4
-			path: tests/Unit/Components/DependencyInjection/ContainerTest.php
-
-		-
-			message: "#^Service \"alias\" is not registered in the container\\.$#"
-			count: 1
-			path: tests/Unit/Components/DependencyInjection/ContainerTest.php
-
-		-
-			message: "#^Service \"bar\" is not registered in the container\\.$#"
-			count: 3
-			path: tests/Unit/Components/DependencyInjection/ContainerTest.php
-
-		-
-			message: "#^Service \"foo\" is not registered in the container\\.$#"
-			count: 5
-			path: tests/Unit/Components/DependencyInjection/ContainerTest.php
-
-		-
-			message: "#^Service \"parent\" is not registered in the container\\.$#"
-			count: 3
-			path: tests/Unit/Components/DependencyInjection/ContainerTest.php
-
-		-
-			message: "#^Service \"someKey\" is not registered in the container\\.$#"
-			count: 1
-			path: tests/Unit/Components/DependencyInjection/ContainerTest.php
-
 		-
 			message: "#^Property Shopware\\\\Tests\\\\Unit\\\\Components\\\\DependencyInjection\\\\ProjectServiceContainer\\:\\:\\$__bar has no type specified\\.$#"
 			count: 1
@@ -50430,51 +39855,6 @@ parameters:
 			count: 1
 			path: tests/Unit/Components/DispatchFormatHelperTest.php
 
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\EmailValidatorTest\\:\\:getValidEmails\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/EmailValidatorTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\EmailValidatorTest\\:\\:getinvalidEmails\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/EmailValidatorTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\EmailValidatorTest\\:\\:testInvalidEmails\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/EmailValidatorTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\EmailValidatorTest\\:\\:testValidEmails\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/EmailValidatorTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Emotion\\\\DeviceConfigurationTest\\:\\:createQueryMock\\(\\) has parameter \\$expectedResult with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: tests/Unit/Components/Emotion/DeviceConfigurationTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Emotion\\\\DeviceConfigurationTest\\:\\:testEmotionsWithDifferentPositions\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Emotion/DeviceConfigurationTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Emotion\\\\DeviceConfigurationTest\\:\\:testEmotionsWithNullPositions\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Emotion/DeviceConfigurationTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Emotion\\\\DeviceConfigurationTest\\:\\:testEmotionsWithSamePosition\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Emotion/DeviceConfigurationTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Emotion\\\\DeviceConfigurationTest\\:\\:testNoneExistingEmotion\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Emotion/DeviceConfigurationTest.php
-
 		-
 			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Escaper\\\\EscaperTest\\:\\:testItCastsNullToEmptyStrings\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -50595,36 +39975,6 @@ parameters:
 			count: 1
 			path: tests/Unit/Components/Event/EventManagerTest.php
 
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Event\\\\SubscriberArrayTest\\:\\:testAddSubscriber\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Event/SubscriberArrayTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Event\\\\SubscriberArrayTest\\:\\:testCanCreateInstance\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Event/SubscriberArrayTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Event\\\\SubscriberArrayTest\\:\\:testRemoveSubscriber\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Event/SubscriberArrayTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Event\\\\SubscriberConfigTest\\:\\:testAddSubscriber\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Event/SubscriberConfigTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Event\\\\SubscriberConfigTest\\:\\:testCanCreateInstance\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Event/SubscriberConfigTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Event\\\\SubscriberConfigTest\\:\\:testRemoveSubscriber\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Event/SubscriberConfigTest.php
-
 		-
 			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Filesystem\\\\Adapter\\\\AwsS3v3FactoryTest\\:\\:testCreationWithEmptyConfig\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -50890,36 +40240,6 @@ parameters:
 			count: 1
 			path: tests/Unit/Components/Filesystem/PrefixFilesystemTest.php
 
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Hook\\\\EnlightHookProxyFactoryTest\\:\\:invokeMethod\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Hook/EnlightHookProxyFactoryTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Hook\\\\EnlightHookProxyFactoryTest\\:\\:invokeMethod\\(\\) has parameter \\$object with no type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Hook/EnlightHookProxyFactoryTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Hook\\\\EnlightHookProxyFactoryTest\\:\\:invokeMethod\\(\\) has parameter \\$parameters with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: tests/Unit/Components/Hook/EnlightHookProxyFactoryTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Hook\\\\EnlightHookProxyFactoryTest\\:\\:testGenerateBasicProxyClass\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Hook/EnlightHookProxyFactoryTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Hook\\\\EnlightHookProxyFactoryTest\\:\\:testGenerateProxyClassWithReferenceParameter\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Hook/EnlightHookProxyFactoryTest.php
-
-		-
-			message: "#^Property Shopware\\\\Tests\\\\Unit\\\\Components\\\\Hook\\\\EnlightHookProxyFactoryTest\\:\\:\\$proxyFactory has no type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Hook/EnlightHookProxyFactoryTest.php
-
 		-
 			message: "#^Access to an undefined property Enlight_Hook_HookArgs\\:\\:\\$limit\\.$#"
 			count: 11
@@ -51140,166 +40460,26 @@ parameters:
 			count: 1
 			path: tests/Unit/Components/Hook/MyBasicTestClass.php
 
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Hook\\\\MyBasicTestClass\\:\\:myPublic\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Hook/MyBasicTestClass.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Hook\\\\MyBasicTestClass\\:\\:myPublic\\(\\) has parameter \\$bar with no type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Hook/MyBasicTestClass.php
-
 		-
 			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Hook\\\\MyBasicTestClass\\:\\:myPublic\\(\\) has parameter \\$barBar with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: tests/Unit/Components/Hook/MyBasicTestClass.php
 
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Hook\\\\MyBasicTestClass\\:\\:myPublic\\(\\) has parameter \\$foo with no type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Hook/MyBasicTestClass.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Hook\\\\MyInterface\\:\\:myPublic\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Hook/MyInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Hook\\\\MyInterface\\:\\:myPublic\\(\\) has parameter \\$bar with no type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Hook/MyInterface.php
-
 		-
 			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Hook\\\\MyInterface\\:\\:myPublic\\(\\) has parameter \\$barBar with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: tests/Unit/Components/Hook/MyInterface.php
 
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Hook\\\\MyInterface\\:\\:myPublic\\(\\) has parameter \\$foo with no type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Hook/MyInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Hook\\\\MyReferenceInterface\\:\\:myPublic\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Hook/MyReferenceInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Hook\\\\MyReferenceInterface\\:\\:myPublic\\(\\) has parameter \\$bar with no type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Hook/MyReferenceInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Hook\\\\MyReferenceInterface\\:\\:myPublic\\(\\) has parameter \\$foo with no type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Hook/MyReferenceInterface.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Hook\\\\MyReferenceTestClass\\:\\:myPublic\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Hook/MyReferenceTestClass.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Hook\\\\MyReferenceTestClass\\:\\:myPublic\\(\\) has parameter \\$bar with no type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Hook/MyReferenceTestClass.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Hook\\\\MyReferenceTestClass\\:\\:myPublic\\(\\) has parameter \\$foo with no type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Hook/MyReferenceTestClass.php
-
-		-
-			message: "#^Access to an undefined property Shopware\\\\Tests\\\\Unit\\\\Components\\\\HttpCache\\\\StoreTest\\:\\:\\$httpCacheStore\\.$#"
-			count: 5
-			path: tests/Unit/Components/HttpCache/StoreTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\HttpCache\\\\StoreTest\\:\\:provideUrls\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/HttpCache/StoreTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\HttpCache\\\\StoreTest\\:\\:testGenerateCacheKey\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/HttpCache/StoreTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\HttpCache\\\\StoreTest\\:\\:testVerifyIgnoredParameters\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/HttpCache/StoreTest.php
-
 		-
 			message: "#^Access to an undefined property sSystem\\:\\:\\$_GET\\.$#"
-			count: 11
-			path: tests/Unit/Components/LegacyRequestWrapper/GetWrapperTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\LegacyRequestWrapper\\\\GetWrapperTest\\:\\:testGet\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/LegacyRequestWrapper/GetWrapperTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\LegacyRequestWrapper\\\\GetWrapperTest\\:\\:testSet\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/LegacyRequestWrapper/GetWrapperTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\LegacyRequestWrapper\\\\GetWrapperTest\\:\\:testSetAll\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/LegacyRequestWrapper/GetWrapperTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\LegacyRequestWrapper\\\\GetWrapperTest\\:\\:testToArray\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/LegacyRequestWrapper/GetWrapperTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\LegacyRequestWrapper\\\\GetWrapperTest\\:\\:testUnset\\(\\) has no return type specified\\.$#"
-			count: 1
+			count: 12
 			path: tests/Unit/Components/LegacyRequestWrapper/GetWrapperTest.php
 
 		-
 			message: "#^Access to an undefined property sSystem\\:\\:\\$_POST\\.$#"
-			count: 11
-			path: tests/Unit/Components/LegacyRequestWrapper/PostWrapperTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\LegacyRequestWrapper\\\\PostWrapperTest\\:\\:testGet\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/LegacyRequestWrapper/PostWrapperTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\LegacyRequestWrapper\\\\PostWrapperTest\\:\\:testSet\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/LegacyRequestWrapper/PostWrapperTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\LegacyRequestWrapper\\\\PostWrapperTest\\:\\:testSetAll\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/LegacyRequestWrapper/PostWrapperTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\LegacyRequestWrapper\\\\PostWrapperTest\\:\\:testToArray\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/LegacyRequestWrapper/PostWrapperTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\LegacyRequestWrapper\\\\PostWrapperTest\\:\\:testUnset\\(\\) has no return type specified\\.$#"
-			count: 1
+			count: 12
 			path: tests/Unit/Components/LegacyRequestWrapper/PostWrapperTest.php
 
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\MailTest\\:\\:testCodeInjectionInFromHeader\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/MailTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\MailTest\\:\\:testValidFromAddress\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/MailTest.php
-
 		-
 			message: "#^Function Shopware\\\\Components\\\\ini_get\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -51370,16 +40550,6 @@ parameters:
 			count: 1
 			path: tests/Unit/Components/MemoryLimitTest.php
 
-		-
-			message: "#^Cannot call method fetchAll\\(\\) on PDOStatement\\|false\\.$#"
-			count: 1
-			path: tests/Unit/Components/Model/CategoryDenormalizationTest.php
-
-		-
-			message: "#^Cannot call method fetchColumn\\(\\) on PDOStatement\\|false\\.$#"
-			count: 2
-			path: tests/Unit/Components/Model/CategoryDenormalizationTest.php
-
 		-
 			message: "#^Parameter \\#1 \\$statement of method PDO\\:\\:exec\\(\\) expects string, string\\|false given\\.$#"
 			count: 2
@@ -51390,136 +40560,6 @@ parameters:
 			count: 1
 			path: tests/Unit/Components/Model/CategoryDenormalizationTest.php
 
-		-
-			message: "#^Cannot call method getName\\(\\) on Shopware\\\\Models\\\\Article\\\\Supplier\\|null\\.$#"
-			count: 1
-			path: tests/Unit/Components/Model/ModelEntityTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Model\\\\ModelEntityTest\\:\\:setProperty\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Model/ModelEntityTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Model\\\\ModelEntityTest\\:\\:setProperty\\(\\) has parameter \\$value with no type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Model/ModelEntityTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Model\\\\ModelEntityTest\\:\\:testCanAssignManyToOne\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Model/ModelEntityTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Model\\\\ModelEntityTest\\:\\:testCanAssignManyToOneByInstance\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Model/ModelEntityTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Model\\\\ModelEntityTest\\:\\:testCanAssignOneToMany\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Model/ModelEntityTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Model\\\\ModelEntityTest\\:\\:testCanAssignOneToManyByInstance\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Model/ModelEntityTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Model\\\\ModelEntityTest\\:\\:testCanAssignProperties\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Model/ModelEntityTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Model\\\\ModelEntityTest\\:\\:testCanEmptyArrayDoesNotOverrideManyToOne\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Model/ModelEntityTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Model\\\\ModelEntityTest\\:\\:testCanOverWriteAssignOneToMany\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Model/ModelEntityTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Model\\\\ModelEntityTest\\:\\:testCanReAssignManyToOne\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Model/ModelEntityTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Model\\\\ModelEntityTest\\:\\:testCanReAssignProperties\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Model/ModelEntityTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Model\\\\ModelEntityTest\\:\\:testCanReAssignWithAnotherIdThrowsExceptionManyToOne\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Model/ModelEntityTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Model\\\\ModelEntityTest\\:\\:testCanRemoveManyToOne\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Model/ModelEntityTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Model\\\\ModelEntityTest\\:\\:testCanRemoveOneToMany\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Model/ModelEntityTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Model\\\\ModelEntityTest\\:\\:testCanSetCodesOnVoucher\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Model/ModelEntityTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Model\\\\ModelEntityTest\\:\\:testCanSetCodesOnVoucherWithArrayCollection\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Model/ModelEntityTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Model\\\\ModelEntityTest\\:\\:testCanSetCountriesOnArea\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Model/ModelEntityTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Model\\\\ModelEntityTest\\:\\:testCanSetElementsOnDocument\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Model/ModelEntityTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Model\\\\ModelEntityTest\\:\\:testCanSetElementsOnDocumentWithArrayCollection\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Model/ModelEntityTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Model\\\\ModelEntityTest\\:\\:testCanUpdateOneToMany\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Model/ModelEntityTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Model\\\\ModelEntityTest\\:\\:testCanUpdateOneToManyById\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Model/ModelEntityTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$codes of method Shopware\\\\Models\\\\Voucher\\\\Voucher\\:\\:setCodes\\(\\) expects array\\|\\(Doctrine\\\\Common\\\\Collections\\\\ArrayCollection&iterable\\<Shopware\\\\Models\\\\Voucher\\\\Code\\>\\)\\|null, Doctrine\\\\Common\\\\Collections\\\\ArrayCollection\\<int, array\\<string, string\\>\\> given\\.$#"
-			count: 1
-			path: tests/Unit/Components/Model/ModelEntityTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$countries of method Shopware\\\\Models\\\\Country\\\\Area\\:\\:setCountries\\(\\) expects array\\<Shopware\\\\Models\\\\Country\\\\Country\\>\\|null, array\\<int, array\\<string, string\\>\\> given\\.$#"
-			count: 1
-			path: tests/Unit/Components/Model/ModelEntityTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$elements of method Shopware\\\\Models\\\\Document\\\\Document\\:\\:setElements\\(\\) expects array\\<Shopware\\\\Models\\\\Document\\\\Element\\>\\|\\(Doctrine\\\\Common\\\\Collections\\\\ArrayCollection&iterable\\<Shopware\\\\Models\\\\Document\\\\Element\\>\\), Doctrine\\\\Common\\\\Collections\\\\ArrayCollection\\<int, array\\<string, string\\>\\> given\\.$#"
-			count: 1
-			path: tests/Unit/Components/Model/ModelEntityTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$elements of method Shopware\\\\Models\\\\Document\\\\Document\\:\\:setElements\\(\\) expects array\\<Shopware\\\\Models\\\\Document\\\\Element\\>\\|\\(Doctrine\\\\Common\\\\Collections\\\\ArrayCollection&iterable\\<Shopware\\\\Models\\\\Document\\\\Element\\>\\), array\\<int, array\\<string, string\\>\\> given\\.$#"
-			count: 1
-			path: tests/Unit/Components/Model/ModelEntityTest.php
-
 		-
 			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Model\\\\ModelManagerTest\\:\\:getSqlTypes\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -51530,191 +40570,6 @@ parameters:
 			count: 1
 			path: tests/Unit/Components/Model/ModelRepositoryTest.php
 
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\Argon2iTest\\:\\:testGenerateShouldReturnDifferentHashesForSamePlaintextString\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/Argon2iTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\Argon2iTest\\:\\:testGenerateShouldReturnString\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/Argon2iTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\Argon2iTest\\:\\:testGetNameShouldReturnName\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/Argon2iTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\Argon2iTest\\:\\:testIsAvailable\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/Argon2iTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\Argon2iTest\\:\\:testRehash\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/Argon2iTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\Argon2iTest\\:\\:testRehash2\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/Argon2iTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\Argon2iTest\\:\\:testVerifyShouldReturnFalseForNotMatchingHash\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/Argon2iTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\Argon2iTest\\:\\:testVerifyShouldReturnTrueForMatchingHash\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/Argon2iTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\Argon2idTest\\:\\:testGenerateShouldReturnDifferentHashesForSamePlaintextString\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/Argon2idTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\Argon2idTest\\:\\:testGenerateShouldReturnString\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/Argon2idTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\Argon2idTest\\:\\:testGetNameShouldReturnName\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/Argon2idTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\Argon2idTest\\:\\:testIsAvailable\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/Argon2idTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\Argon2idTest\\:\\:testRehash\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/Argon2idTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\Argon2idTest\\:\\:testRehash2\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/Argon2idTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\Argon2idTest\\:\\:testVerifyShouldReturnFalseForNotMatchingHash\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/Argon2idTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\Argon2idTest\\:\\:testVerifyShouldReturnTrueForMatchingHash\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/Argon2idTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\BcryptTest\\:\\:testGenerateShouldReturnDifferentHashesForSamePlaintextString\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/BcryptTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\BcryptTest\\:\\:testGenerateShouldReturnString\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/BcryptTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\BcryptTest\\:\\:testGetNameShouldReturnName\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/BcryptTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\BcryptTest\\:\\:testIsAvailable\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/BcryptTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\BcryptTest\\:\\:testRehash\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/BcryptTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\BcryptTest\\:\\:testRehash2\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/BcryptTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\BcryptTest\\:\\:testVerifyShouldReturnFalseForNotMatchingHash\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/BcryptTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\BcryptTest\\:\\:testVerifyShouldReturnTrueForMatchingHash\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/BcryptTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\PreHashedTest\\:\\:testEncodePasswordShouldNotModifyInput\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/PreHashedTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\PreHashedTest\\:\\:testGetNameShouldReturnName\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/PreHashedTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\PreHashedTest\\:\\:testRehash\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/PreHashedTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\PreHashedTest\\:\\:testValidatePasswordForDifferentHashes\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/PreHashedTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\PreHashedTest\\:\\:testValidatePasswordForSameHashes\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/PreHashedTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\Sha256Test\\:\\:testGenerateShouldReturnDifferentHashesForSamePlaintextString\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/Sha256Test.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\Sha256Test\\:\\:testGenerateShouldReturnString\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/Sha256Test.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\Sha256Test\\:\\:testGetNameShouldReturnName\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/Sha256Test.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\Sha256Test\\:\\:testIsAvailable\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/Sha256Test.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\Sha256Test\\:\\:testRehash\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/Sha256Test.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\Sha256Test\\:\\:testRehash2\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/Sha256Test.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\Sha256Test\\:\\:testVerifyShouldReturnFalseForNotMatchingHash\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/Sha256Test.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\Password\\\\Encoder\\\\Sha256Test\\:\\:testVerifyShouldReturnTrueForMatchingHash\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Password/Encoder/Sha256Test.php
-
 		-
 			message: "#^Service \"filled_plugin\\.internal\\.resource_subscriber\" is not registered in the container\\.$#"
 			count: 1
@@ -51905,46 +40760,6 @@ parameters:
 			count: 1
 			path: tests/Unit/Components/Template/SmartyTaxModifierTest.php
 
-		-
-			message: "#^Method Shopware\\\\Components\\\\Test\\\\Theme\\\\PathResolverTest\\:\\:testFiles\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/Theme/PathResolverTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\UploadMaxSizeValidatorTest\\:\\:testContentLengthInRange\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/UploadMaxSizeValidatorTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\UploadMaxSizeValidatorTest\\:\\:testEmptyContentLength\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/UploadMaxSizeValidatorTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Components\\\\UploadMaxSizeValidatorTest\\:\\:testExceededContentLength\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Components/UploadMaxSizeValidatorTest.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method Enlight_Controller_Request_RequestTestCase\\:\\:setServer\\(\\) expects string\\|null, int given\\.$#"
-			count: 1
-			path: tests/Unit/Components/UploadMaxSizeValidatorTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Controllers\\\\Backend\\\\ExtJsTest\\:\\:exampleData\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Controllers/Backend/ExtJsTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Controllers\\\\Backend\\\\ExtJsTest\\:\\:testInflectPath\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Unit/Controllers/Backend/ExtJsTest.php
-
-		-
-			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Controllers\\\\Backend\\\\ExtJsTest\\:\\:testInflectPath\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: tests/Unit/Controllers/Backend/ExtJsTest.php
-
 		-
 			message: "#^Method Shopware\\\\Tests\\\\Unit\\\\Core\\\\sArticlesTest\\:\\:provideData\\(\\) has no return type specified\\.$#"
 			count: 1
diff --git a/.phpstan.neon b/.phpstan.neon
index b3540c918ca..5930be79a40 100644
--- a/.phpstan.neon
+++ b/.phpstan.neon
@@ -1,5 +1,6 @@
 includes:
-	- .phpstan-baseline.neon
+    - .phpstan-baseline.neon
+    - vendor/phpstan/phpstan/conf/bleedingEdge.neon
 
 services:
     -
@@ -9,12 +10,14 @@ services:
 
 parameters:
     level: 8
+    phpVersion: 70400
     inferPrivatePropertyTypeFromConstructor: true
     reportUnmatchedIgnoredErrors: true
     treatPhpDocTypesAsCertain: false
     tmpDir: var/cache/phpstan
     bootstrapFiles:
-        - %currentWorkingDirectory%/recovery/common/autoload.php # Additional autoloading for testing classes under recovery/*
+        - recovery/common/autoload.php # Additional autoloading for testing classes under recovery/*
+        - tests/phpstan-dba-bootstrap.php
 
     symfony:
         constantHassers: false
@@ -27,58 +30,47 @@ parameters:
         objectManagerLoader: tests/phpstan-doctrine-model-manager.php
 
     scanDirectories:
-        - %currentWorkingDirectory%/var/cache/production____REVISION___/doctrine
-        - %currentWorkingDirectory%/var/cache/production____REVISION___/proxies
-        - %currentWorkingDirectory%/engine/Library
+        - var/cache/production____REVISION___/doctrine
+        - var/cache/production____REVISION___/proxies
+        - engine/Library
+
+    stubFiles:
+        - tests/PHPStan/Stub/Behat/Context.stub
+        - tests/PHPStan/Stub/Behat/InitializedContextEnvironment.stub
 
     paths:
-        - %currentWorkingDirectory%/engine/Shopware
-        - %currentWorkingDirectory%/tests
-        - %currentWorkingDirectory%/engine/Library/Enlight
-        - %currentWorkingDirectory%/themes/Frontend/Bare/Theme.php
-        - %currentWorkingDirectory%/themes/Frontend/Responsive/Theme.php
+        - _sql/migrations
+        - engine/Shopware
+        - tests
+        - engine/Library/Enlight
+        - themes/Frontend/Bare/Theme.php
+        - themes/Frontend/Responsive/Theme.php
     excludePaths:
-        - %currentWorkingDirectory%/engine/Shopware/Plugins/Community
-        - %currentWorkingDirectory%/engine/Shopware/Plugins/Local
-        - %currentWorkingDirectory%/engine/Shopware/Components/DependencyInjection/LegacyPhpDumper.php # is copied from Symfony. To keep it comparable, we don't change it
-        - %currentWorkingDirectory%/tests/Functional/Components/DependencyInjection/LegacyPhpDumperTest.php
+        - engine/Shopware/Plugins/Community
+        - engine/Shopware/Plugins/Local
+        - engine/Shopware/Components/DependencyInjection/LegacyPhpDumper.php # is copied from Symfony. To keep it comparable, we don't change it
+        - tests/Functional/Components/DependencyInjection/LegacyPhpDumperTest.php
     ignoreErrors:
         - '#apcu_#'
 
         # Interface / Implementation Switch
         - '#expects Shopware\\Bundle\\SearchBundle\\Facet\\[a-zA-Z]+Facet, Shopware\\Bundle\\SearchBundle\\[a-zA-Z]+Interface given#'
         - '#expects Shopware\\Bundle\\SearchBundle\\Condition\\[a-zA-Z]+Condition, Shopware\\Bundle\\SearchBundle\\[a-zA-Z]+Interface given#'
-        # Product/Shopcontext mixup
+        # Product/ShopContext mix-up
         - '#expects Shopware\\Bundle\\StoreFrontBundle\\Struct\\ProductContextInterface, Shopware\\Bundle\\StoreFrontBundle\\Struct\\ShopContextInterface given#'
 
-        # We manually check if the class exists before instantiating / using it
-        - '#PHPDoc tag \@var for variable \$payPalInstaller contains unknown class SwagPaymentPayPalUnified\\Setup\\FirstRunWizardInstaller#'
-
         - # Config is read out in kernel, so there is a context for $this
             message: '#Variable \$this might not be defined#'
             path: engine/Shopware/Configs/Default.php
 
-        - # Seem to be issues, but need tests to verify changes there
-            message: '#Negated boolean expression is always false#'
-            path: 'engine/Shopware/Core/sArticles.php'
-        -
-            message: '#Comparison operation ">=" between int<1, max> and 1 is always true#'
-            path: 'engine/Shopware/Core/sArticles.php'
-        -
-            message: '#Comparison operation "<" between \(array\|float\|int\) and 0 results in an error\.#'
-            path: engine/Shopware/Core/sAdmin.php
-        -
-            message: '#Call to static method PHPUnit\\Framework\\Assert::assertIsArray\(\) with false will always evaluate to false\.#'
-            path: tests/Functional/Core/AdminTest.php
-
-        - # We override the method in higher class inheritance to public method
-            message: '#Call to protected method verifyPage#'
-            path: tests/Mink/features/bootstrap/SpecialContext.php
-
         - # Every API resource class has those methods, but we cannot put that into an interface or abstract class, because the parameter amount is different
             message: '#Call to an undefined method \$this\(Shopware\\Components\\Api\\Resource\\Resource\)&Shopware\\Components\\Api\\BatchInterface::(delete|update|create)\(\)#'
             path: engine/Shopware/Components/Api/Resource/Resource.php
 
+        - # Currently the ModelManager extends the EntityManager class, but this is not supported in the future anymore. Changing this, would cause breaks, so it should be done in Shopware 5.8
+            message: '#Class Shopware\\Components\\Model\\ModelManager extends @final class Doctrine\\ORM\\EntityManager#'
+            path: engine/Shopware/Components/Model/ModelManager.php
+
         - # Overwrite of parent methods to have a proper type declaration of the entity manager
             message: '#Method .*::getEntityManager\(\) should return Shopware\\Components\\Model\\ModelManager but returns Doctrine\\ORM\\EntityManagerInterface#'
             paths:
@@ -88,21 +80,23 @@ parameters:
         - # Currently not possible to determine the paginator generic type at those places
             message: '#return type with generic class Doctrine\\ORM\\Tools\\Pagination\\Paginator does not specify its types: T#'
             paths:
-                - engine/Shopware/Components/Model/ModelManager.php
                 - engine/Shopware/Controllers/Backend/Search.php
 
         # Some day this should be specified
-        - '#no value type specified in iterable type Doctrine\\DBAL\\#'
+        - '#type specified in iterable type Doctrine\\DBAL\\#'
+        - '#type specified in iterable type PDOStatement#'
+        - '#generic class PDOStatement .*does not specify its types: rowType#'
 
-        # This method does not exists, but it does not throw an error. Needs to be checked
+        # This method does not exist, but it does not throw an error. Needs to be checked
         - '#Call to an undefined method Enlight_Template_Manager::setCompileId\(\)#'
 
         # Needs some improvements in the doctrine PHPStan extensions: see https://github.com/phpstan/phpstan-doctrine/pull/167
-        - '#Cannot call method fetch.*\(\) on Doctrine\\DBAL\\.*\|int#'
+        - '#Cannot call method (fetch.*|rowCount)\(\) on Doctrine\\DBAL\\.*\|int#'
 
-        - # This property contains many different repositories, so we do not specify the type
+        - # This property contains many repositories, so we do not specify the type
             message: '#with generic class Shopware\\Components\\Model\\ModelRepository does not specify its types: TEntityClass#'
             path: engine/Shopware/Controllers/Backend/Config.php
+
         - # While cloning entities the ID or foreign key columns need to be set to `null` even if they do not allow that from the database definition
             message: '#Property Shopware\\Models\\Emotion\\.*::.*id|Id \(int\) does not accept null#'
             paths:
@@ -120,7 +114,7 @@ parameters:
                 - engine/Shopware/Models/Config/Element.php
                 - engine/Shopware/Models/Config/Value.php
 
-        - # Testing DI container stuff with autowiring services into controller actions. No possibility to teach that to PHPStan
+        - # Testing DI container stuff with auto-wiring services into controller actions. No possibility to teach that to PHPStan
             message: '#Service "Shopware\\Tests\\Functional\\Bundle\\ControllerBundle\\TestController\\Test" is not registered in the container#'
             path: tests/Functional/Bundle/ControllerBundle/ControllerActionTest.php
         -
@@ -130,11 +124,6 @@ parameters:
             message: '#Parameter \#1 \$loader of method Enlight_Controller_Action::setContainer\(\) expects Shopware\\Components\\DependencyInjection\\Container\|null, TestContainer given#'
             path: tests/Functional/Bundle/ControllerBundle/ControllerActionTest.php
 
-        - # Somehow PHPStan does not recognize the return types correctly
-            message: '#Call to static method PHPUnit\\Framework\\Assert::assertIsArray\(\) with true|null will always evaluate to false#'
-            count: 4
-            path: tests/Functional/Core/BasketTest.php
-
         - # PHPStan has issues to recognize the inheritance of SortingInterface and ConditionInterface
             message: '#Parameter \#1 \$criteriaPart of method Shopware\\Bundle\\SearchBundleES\\SortingHandler\\.*SortingHandler::getSorting\(\) expects Shopware\\Bundle\\SearchBundle\\Sorting\\.*Sorting, Shopware\\Bundle\\SearchBundle\\CriteriaPartInterface given#'
             path: engine/Shopware/Bundle/SearchBundleES/SortingHandler
@@ -148,25 +137,20 @@ parameters:
             message: '#Parameter \#1 \$sorting of method Shopware\\Bundle\\CustomerSearchBundleDBAL\\SortingHandler\\.*SortingHandler::addSorting\(\) expects Shopware\\Bundle\\CustomerSearchBundle\\Sorting\\.*Sorting, Shopware\\Bundle\\SearchBundle\\SortingInterface given#'
             path: engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler
 
-        - # For testing it is not necessary to declare the whole basket array correctly
+        - # For testing, it is not necessary to declare the whole basket array correctly
             message: '#Parameter \#1 \$basket of method Shopware\\Components\\BasketSignature\\BasketSignatureGenerator::generateSignature\(\) expects array.*, array.* given#'
             path: tests/Unit/Components/BasketSignature/BasketSignatureCreatorTest.php
+
         - # Parent setUp method is not called on purpose
             message: '#Missing call to parent::setUp\(\) method#'
             paths:
-                - tests/Functional/Core/sCoreTest.php
                 - tests/Functional/Controllers/Backend/OrderTest.php
                 - tests/Functional/Controllers/Backend/UserManagerTest.php
+
         - # Some class properties do not have a getter or setter, but they are needed for the Doctrine column declaration
             message: '#Property Shopware\\Models\\.*::\$.* is never written, only read#'
             path: engine/Shopware/Models
-        - # Intended overwrite for easier testing
-            message: '#PHPDoc type string of property Shopware\\Tests\\Functional\\Bundle\\BenchmarkBundle\\Controllers\\Backend\\Mocks\\ViewMock::\$template is not covariant with PHPDoc type Enlight_Template_Default\|null of overridden property Enlight_View_Default::\$template#'
-            path: tests/Functional/Bundle/BenchmarkBundle/Controllers/Backend/Mocks/ViewMock.php
-        - # Intended "endless" loop which is interrupted by an exception
-            message: '#While loop condition is always true#'
-            count: 1
-            path: engine/Shopware/Bundle/BenchmarkBundle/Commands/SendStatisticsCommand.php
+
         - # Giving "test" as construct parameter sets up a test storage
             message: '#Parameter \#1 \$options of class Enlight_Event_Subscriber_Config constructor expects array\|null, string given#'
             path: tests/Unit/Components/Event/SubscriberConfigTest.php
@@ -176,10 +160,41 @@ parameters:
             paths:
                 - engine/Shopware/Bundle/MediaBundle/Commands/MediaOptimizeCommand.php
                 - engine/Shopware/Commands/ThemeCreateCommand.php
+
         - # For testing purposes the constructor of the price struct gets strings
-            message: '#Parameter .* of class Shopware\\Components\\Cart\\Struct\\Price constructor expects float.*string given#'
+            message: '#Parameter .* of class Shopware\\Components\\Cart\\Struct\\Price constructor expects float|numeric-string, .* given#'
             path: tests/Functional/Components/Cart/ProportionalTaxCalculatorTest.php
 
-        - # The doctrine extension has problems with detecting the select within an if condition. see https://github.com/phpstan/phpstan-doctrine/issues/331
-            message: '#Error: Expected Doctrine\\ORM\\Query\\Lexer::T_FROM, got end of string#'
-            path: engine/Shopware/Components/Api/Resource/EmotionPreset.php
+        - # Doctrine type is integer|string. PHPStan allows only specific values defined by constants
+            message: '#Property Shopware\\Models\\.*\\.*::\$.* type mapping mismatch: database can contain (int|string) but property expects .*#'
+            paths:
+                 - engine/Shopware/Models/Dispatch/Dispatch.php
+                 - engine/Shopware/Models/Newsletter/Container.php
+                 - engine/Shopware/Models/ProductStream/ProductStream.php
+
+        - # PHPStan DBA extension complains about temporary database table, which is only active during the time the migrations run
+            message: "#^Query error\\: SQLSTATE\\[42S02\\]\\: Base table or view not found\\: 1146 Table .*translation_migration_id' doesn't exist \\(42S02\\)\\.$#"
+            count: 1
+            path: _sql/migrations/common/AttributeTranslationMigrationHelper.php
+        - # PHPStan DBA extension complains about temporary database column, which is only active during the time of the test
+            message: '#Query error: Column "s_order_basket_attributes.test_attr" does not exist#'
+            count: 1
+            path: tests/Functional/Components/Cart/CartToOrderAttributeTest.php
+
+        - # In this case PHPStan does not consider the second parameter flag of \Symfony\Component\DependencyInjection\ContainerInterface::get
+            message: '#Method Shopware\\Tests\\Mink\\Tests\\General\\Helpers\\SubContext::getService\(\) should return TService of object but returns object\|null#'
+            count: 1
+            path: tests/Mink/Tests/General/Helpers/SubContext.php
+
+        - # Intentionally pass a wrong value for the test
+            message: '#Parameter \#1 \$calculationType of method Shopware\\Bundle\\OrderBundle\\Service\\ShippingCostService::getShippingCostMultiplier\(\) expects 0\|1\|2\|3, 99 given#'
+            count: 1
+            path: tests/Unit/Bundle/OrderBundle/ShippingConstServiceTest.php
+
+        - # Test services are not recognized correctly by PHPStan in this container test class
+            message: '#Service ".*" is not registered in the container#'
+            path: tests/Unit/Components/DependencyInjection/ContainerTest.php
+
+        - # Needs some investigation how to fix the return types
+            message: '#Method Shopware\\Models\\.*\\Repository::.*\(\) should return Doctrine\\ORM\\Query<.*> but returns Doctrine\\ORM\\Query<.*>#'
+            path: engine/Shopware/Models/**/Repository.php
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4c8f549de30..6b5d18a85b1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,7 +8,7 @@ If you are not sure which license to use, or want more details about available l
 
 
 ## Contributing to the Shopware code base
-If you want to learn how to contribute code to Shopware, please refer to [Contribution Code](https://developers.shopware.com/contributing/contributing-code/).  
+If you want to learn how to contribute code to Shopware, please refer to [Contribution Code](https://developers.shopware.com/community/contributing-code/).  
 
 ## Documentation
 
diff --git a/Makefile b/Makefile
index 56973e9bb56..b9e28561d5d 100644
--- a/Makefile
+++ b/Makefile
@@ -38,6 +38,14 @@ fix-code-style: .make.install.composer-dependencies
 check-phpstan: .make.install.composer-dependencies
 	php ./vendor/bin/phpstan analyze -c .phpstan.neon
 
+generate-phpstan-baseline: .make.install.composer-dependencies
+	mv .phpstan-baseline.neon phpstan-baseline.neon
+	sed -i -r 's/- .phpstan-baseline.neon/- phpstan-baseline.neon/g' .phpstan.neon
+	php ./vendor/bin/phpstan analyze -c .phpstan.neon --generate-baseline
+	wait;
+	mv phpstan-baseline.neon .phpstan-baseline.neon
+	sed -i -r 's/- phpstan-baseline.neon/- .phpstan-baseline.neon/g' .phpstan.neon
+
 check-eslint-frontend: .make.install.npm-dependencies
 	npm run lint --prefix ./themes
 
@@ -69,10 +77,10 @@ test-phpunit: init
 	./vendor/bin/phpunit --config recovery/common/phpunit.xml.dist --log-junit build/artifacts/test-log.xml
 
 test-phpunit-coverage-cobertura: init
-	php -d pcov.enabled=1 -d pcov.directory="$(CURDIR)" vendor/bin/phpunit --configuration="tests/phpunit.xml.dist" --log-junit="build/artifacts/phpunit.junit.xml" --colors="never" --exclude-group="elasticSearch,pcovAdapterBrokenTest" --testsuite="$(TESTSUITE)" --coverage-cobertura="build/artifacts/phpunit-coverage-$(TESTSUITE).cobertura.xml"
+	php -d pcov.enabled=1 -d pcov.directory="$(CURDIR)" vendor/bin/phpunit --configuration="tests/phpunit.xml.dist" --colors="never" --exclude-group="elasticSearch,pcovAdapterBrokenTest" --testsuite="$(TESTSUITE)" --coverage-cobertura="build/artifacts/phpunit-coverage-$(TESTSUITE).cobertura.xml"
 
 test-phpunit-coverage-statistic: init tests/phpunit-full-coverage.xml
-	php -d pcov.enabled=1 -d pcov.directory="$(CURDIR)" vendor/bin/phpunit --configuration="tests/phpunit-full-coverage.xml" --log-junit="build/artifacts/phpunit.junit.xml" --colors="never" --exclude-group="elasticSearch,pcovAdapterBrokenTest" --testsuite="$(TESTSUITE)" --coverage-text
+	php -d pcov.enabled=1 -d pcov.directory="$(CURDIR)" vendor/bin/phpunit --configuration="tests/phpunit-full-coverage.xml" --colors="never" --exclude-group="elasticSearch,pcovAdapterBrokenTest" --testsuite="$(TESTSUITE)" --coverage-text
 
 test-phpunit-elasticsearch: elasticsearch-populate
 	./vendor/bin/phpunit --config tests/phpunit.xml.dist --log-junit build/artifacts/test-log.xml --exclude-group=skipElasticSearch --group=elasticSearch
@@ -101,7 +109,8 @@ check-config-variables:
 	@if [ -z "$(DB_PASSWORD)" ]; then echo "No or invalid database password supplied"; exit 1; fi
 
 clean-make-config:
-	rm .make.config.* 2> /dev/null || true
+	rm -f .make.config.*
+	rm -f .make.install.*
 
 clean:
 	rm .make.* 2> /dev/null || true
@@ -109,18 +118,19 @@ clean:
 debug-config-test: .make.config.build.debug
 
 .make.config: check-config-variables .make.config.behat
-	@sed -e 's/%db\.user%/$(DB_USER)/g' -e 's/%db\.password%/$(DB_PASSWORD)/g' -e 's/%db\.database%/$(DB_NAME)/g' -e 's/%db\.host%/$(DB_HOST)/g' -e 's/%db\.port%/$(DB_PORT)/g' -e 's/%db\.port%/$(DB_PORT)/g' -e 's/%elasticsearch\.host%/$(ELASTICSEARCH_HOST)/g' < ./config.php.dist > ./config.php
+	@sed -e 's/%db\.user%/$(DB_USER)/g' -e 's/%db\.password%/$(DB_PASSWORD)/g' -e 's/%db\.database%/$(DB_NAME)/g' -e 's/%db\.host%/$(DB_HOST)/g' -e 's/%db\.port%/$(DB_PORT)/g' -e 's/%db\.port%/$(DB_PORT)/g' -e 's/%elasticsearch\.host%/$(ELASTICSEARCH_HOST)/g' -e 's|%smtp\.host%|$(SMTP_HOST)|g' < ./config.php.dist > ./config.php
 	touch $@
 
 .make.config.build.%: check-config-variables .make.config.behat
-	@sed -e 's/%db\.user%/$(DB_USER)/g' -e 's/%db\.password%/$(DB_PASSWORD)/g' -e 's/%db\.database%/$(DB_NAME)/g' -e 's/%db\.host%/$(DB_HOST)/g' -e 's/%db\.port%/$(DB_PORT)/g' -e 's/%db\.port%/$(DB_PORT)/g' -e 's/%elasticsearch\.host%/$(ELASTICSEARCH_HOST)/g' < ./build/config-$*.php > ./config.php
+	@sed -e 's/%db\.user%/$(DB_USER)/g' -e 's/%db\.password%/$(DB_PASSWORD)/g' -e 's/%db\.database%/$(DB_NAME)/g' -e 's/%db\.host%/$(DB_HOST)/g' -e 's/%db\.port%/$(DB_PORT)/g' -e 's/%db\.port%/$(DB_PORT)/g' -e 's/%elasticsearch\.host%/$(ELASTICSEARCH_HOST)/g' -e 's|%smtp\.host%|$(SMTP_HOST)|g' < ./build/config-$*.php > ./config.php
 	touch $@
 
 .make.config.behat:
-	@sed -e 's/%sw\.host%/$(SW_HOST)/g' -e 's|%sw\.path%|$(SW_BASE_PATH)|g' < ./build/behat.yml.dist > ./tests/Mink/behat.yml
+	@sed -e 's/%sw\.host%/$(SW_HOST)/g' -e 's|%sw\.path%|$(SW_BASE_PATH)|g' -e 's|%selenium\.host%|$(SELENIUM_HOST)|g' < ./tests/Mink/behat.yml.dist > ./tests/Mink/behat.yml
 	touch $@
 
 .make.install.composer-dependencies:
+	composer update 'laminas/*' cocur/slugify
 	composer install
 	composer install -d recovery/common
 	composer bin all install
@@ -141,8 +151,6 @@ debug-config-test: .make.config.build.debug
 	./bin/console sw:theme:initialize
 	./bin/console sw:firstrunwizard:disable
 	./bin/console sw:admin:create --name="Demo" --email="demo@demo.de" --username="demo" --password="demo" --locale=de_DE -n
-	./bin/console sw:config:set installationSurvey false -d
-	./bin/console dbal:run-sql "INSERT IGNORE INTO \`s_core_auth_config\` (\`user_id\`, \`name\`, \`config\`) VALUES (1, 'customer_module', '{\"showWizard\":false}');"
 
 recovery/install/data/install.lock:
 	touch $@
diff --git a/README.md b/README.md
index d76ad642a30..6c5ce901017 100644
--- a/README.md
+++ b/README.md
@@ -1,36 +1,22 @@
-# Shopware 6
-
-<a href="https://github.com/shopware/platform"><img src="https://s3.eu-central-1.amazonaws.com/shopware-platform-assets/github-platform/readme/discover_sw6.png" align="right" height="39" /></a>
-
-<p align="center">
-<img src="https://www.shopware.com/media/image/8a/cf/98/open-commerce-platform.png" width=500>
-</p>
-
-
-The completely newly developed successor "Shopware 6" is based entirely on the Symfony Framework and VueJS and is available under MIT licence at https://github.com/shopware/platform
-
 # Shopware 5
 
-![Build Status](https://github.com/shopware/shopware/workflows/PHPUnit/badge.svg)
+![Build Status](https://github.com/shopware5/shopware/workflows/PHPUnit/badge.svg)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/shopware/localized.svg)](https://crowdin.com/project/shopware)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/shopware/shopware/badges/quality-score.png?b=5.5)](https://scrutinizer-ci.com/g/shopware/shopware/?branch=5.5)
 [![Latest Stable Version](https://poser.pugx.org/shopware/shopware/v/stable)](https://packagist.org/packages/shopware/shopware)
 [![Total Downloads](https://poser.pugx.org/shopware/shopware/downloads)](https://packagist.org/packages/shopware/shopware)
 [![Slack](https://img.shields.io/badge/chat-on%20slack-%23ECB22E)](http://slack.shopware.com?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
-- **License**: Dual license AGPL v3 / Proprietary
-- **GitHub Repository**: <https://github.com/shopware/shopware>
-- **Issue Tracker**: <https://issues.shopware.com>
+- **License**: GNU General Public License v3 (some used parts have different licenses, which can be found in the respective files or directories)
+- **GitHub Repository**: <https://github.com/shopware5/shopware>
+- **Issues**: <https://github.com/shopware5/shopware/issues>
 
 ## Overview
 
 ![Shopware 5 collage](https://assets.shopware.com/media/github/shopware5_readme.png)
 
 Shopware 5 is an open source e-commerce software made in Germany.
-Based on technologies like `Symfony 4`, `Doctrine 2` & `Zend Framework` Shopware comes as the perfect platform for your next e-commerce project.
-Furthermore, Shopware 5 provides an event-driven plugin system and an advanced hook system, giving you the ability to customize every part of the platform.
-
-Visit the forum at <https://forum.shopware.com/>
+Based on technologies like `Symfony 4`, `Doctrine 2` & `Zend Framework` Shopware comes as the perfect platform for your e-commerce project.
+Furthermore, Shopware 5 provides an event-driven plugin system and an advanced hook system, giving you the ability to customize nearly every part of the platform.
 
 ----
 
@@ -46,6 +32,7 @@ Visit the forum at <https://forum.shopware.com/>
 -   <a href="https://php.net/manual/en/book.ctype.php" target="_blank">ctype</a>
 -   <a href="https://php.net/manual/en/book.curl.php" target="_blank">curl</a>
 -   <a href="https://php.net/manual/en/book.dom.php" target="_blank">dom</a>
+-   <a href="https://php.net/manual/en/book.filter.php" target="_blank">filter</a>
 -   <a href="https://php.net/manual/en/book.hash.php" target="_blank">hash</a>
 -   <a href="https://php.net/manual/en/book.iconv.php" target="_blank">iconv</a>
 -   <a href="https://php.net/manual/en/book.image.php" target="_blank">gd</a> (with freetype and libjpeg)
@@ -66,10 +53,10 @@ Follow the instruction below if you want to install Shopware 5 using Git.
 
 1.) Clone the git repository to the desired location using:
 
-    git clone https://github.com/shopware/shopware.git
+    git clone https://github.com/shopware5/shopware.git
 
 In case you wish to contribute to Shopware, fork the `5.7` branch rather than cloning it, and create a pull request via GitHub.
-For further information please read the section "Get involved" of this document.
+For further information please read the section ["Get involved"](#get-involved) of this document.
 
 2.) Set the correct directory permissions:
 
@@ -99,25 +86,20 @@ Some workarounds are in place because of this and place constraints on the funct
 
 Go to the root directory of your shopware system and download the test images:
 
-    wget -O test_images.zip http://releases.s3.shopware.com/test_images_since_5.1.zip
-
-For older Shopware versions < 5.1
-
-    wget -O test_images.zip http://releases.s3.shopware.com/test_images.zip
+    wget -O test_images.zip http://releases.shopware.com/test_images_since_5.1.zip
 
 Unzip the files inside the root directory:
 
     unzip test_images.zip
 
-You can now access your shop
+You can now access your shop.
+The test_images.zip file also includes thumbnails for the responsive theme.
 
 # Backend
 
 The backend is located at `/backend` example `http://your.shop.com/backend`.
 Backend Login: demo/demo
 
-The test_images.zip file includes thumbnails for the new responsive theme and the old deprecated template.
-
 If you want to have full-featured demo data, you should download the respective demo data plugin in the First Run Wizard or in the Plugin Manager.
 
 # Frontend users in demo data
@@ -127,37 +109,32 @@ If you want to have full-featured demo data, you should download the respective
 
 # Get involved
 
-Shopware is available under dual license (AGPL v3 and proprietary license).
+Shopware is available under GPL v3 license.
 If you want to contribute code (features or bugfixes), you have to create a pull request and include valid license information.
 You can either contribute your code under New BSD or MIT license.
 
 If you want to contribute to the backend part of Shopware, and your changes affect or are based on ExtJS code, they must be licensed under GPL V3, as per license requirements from Sencha Inc.
 
-If you are not sure which license to use, or want more details about available licensing or the contribution agreements we offer, you can contact us at <contact@shopware.com>.
-
 For more information about contributing to Shopware, please see [CONTRIBUTING.md](CONTRIBUTING.md).
 
 
 ### How to report bugs / request features?
 
-We've always had a sympathetic ear for our community, so please feel free to submit tickets with bug reports or feature requests.
-In order to have a single issue tracking tool, we've decided to close the GitHub issue panel in favor of our Jira issue tracker, which is directly connected to our development division.
-
-* [Shopware ticket submit form](https://issues.shopware.com/createissue)
+We've always had an ear for our community, so please feel free to submit issues with bug reports or feature requests.
+Just create a new issue [here](https://github.com/shopware5/shopware/issues) using the respective templates.
 
 # Copying / License
 
-Shopware is distributed under a dual license (AGPL v3 and proprietary license). You can find the whole license text in the `license.txt` file.
+Shopware is distributed under the AGPL v3.
+You can find the whole license text in the [license.txt](license.txt) file.
 
 # Changelog
 
-The changelog and all available commits are located under <https://github.com/shopware/shopware>.
+The changelog and all available commits can be found [here](https://github.com/shopware5/shopware/releases).
 
 ## Further reading
 
-* [Shopware AG](https://www.shopware.com) - Homepage of shopware AG
 * [Shopware Developer Documentation](https://developers.shopware.com/)
-* [Shopware Docs](https://docs.shopware.com/) - Shopware documentation
-* [Shopware Forum](https://forum.shopware.com) - Community forum
-* [Shopware Marketplace](https://store.shopware.com) - Shopware Store
-* [Shopware on Crowdin](https://crowdin.com/project/shopware) - Crowdin (Translations)
+* [Shopware User Documentation](https://docs.shopware.com/en/shopware-5-en)
+* [Shopware Community Forum](https://forum.shopware.com/c/shopware-5/7)
+* [Shopware Store](https://store.shopware.com)
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 00000000000..c191050c844
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,3 @@
+## Reporting a vulnerability
+
+Visit our [security reporting](https://www.shopware.com/en/contact/security-reporting) form to report security vulnerabilities and to take part in our bug bounty program.
diff --git a/UPGRADE-5.0.md b/UPGRADE-5.0.md
index 14518129d5e..8a19964fdcf 100644
--- a/UPGRADE-5.0.md
+++ b/UPGRADE-5.0.md
@@ -4,14 +4,14 @@ This changelog references changes done in Shopware 5.0 patch versions.
 
 ## 5.0.4 (2015-09-16)
 
-[View all changes from v5.0.3...v5.0.4](https://github.com/shopware/shopware/compare/v5.0.3...v5.0.4)
+[View all changes from v5.0.3...v5.0.4](https://github.com/shopware5/shopware/compare/v5.0.3...v5.0.4)
 
 * Change file extension of `Shopware_Components_Convert_Excel::generateXML` to .xls
 * Fixed jsonrenderer for backend order batchprocessing
     
 ## 5.0.3 (2015-08-24)
 
-[View all changes from v5.0.2...v5.0.3](https://github.com/shopware/shopware/compare/v5.0.2...v5.0.3)
+[View all changes from v5.0.2...v5.0.3](https://github.com/shopware5/shopware/compare/v5.0.2...v5.0.3)
 
 * The variant API resource now supports the getList method. It will return all variants with prices and attributes. You can optionally calculate the gross price by using the "considerTaxInput" parameter.
 * The getList method of the articles API resource now returns additionally the attributes of an article.
@@ -22,7 +22,7 @@ This changelog references changes done in Shopware 5.0 patch versions.
 
 ## 5.0.2 (2015-07-20)
 
-[View all changes from v5.0.1...v5.0.2](https://github.com/shopware/shopware/compare/v5.0.1...v5.0.2)
+[View all changes from v5.0.1...v5.0.2](https://github.com/shopware5/shopware/compare/v5.0.1...v5.0.2)
 
 * Method `createMenuItem` in plugin bootstrap now results in an duplicate error when passing an existing label with the same parent
 * Removed `Shopware_Controllers_Backend_Order::getStatisticAction` and statistics in the order backend module.
@@ -100,7 +100,7 @@ This changelog references changes done in Shopware 5.0 patch versions.
 
 ## 5.0.1 (2015-05-26)
 
-[View all changes from v5.0.0...v5.0.1](https://github.com/shopware/shopware/compare/v5.0.0...v5.0.1)
+[View all changes from v5.0.0...v5.0.1](https://github.com/shopware5/shopware/compare/v5.0.0...v5.0.1)
 
 * Create `sw:theme:dump:configuration` command to generate watch files for theme compiling
 * Rename \Shopware\Components\Theme\Compiler::preCompile to \Shopware\Components\Theme\Compiler::compile
diff --git a/UPGRADE-5.1.md b/UPGRADE-5.1.md
index 4d1ab5dcd89..82a6c506446 100644
--- a/UPGRADE-5.1.md
+++ b/UPGRADE-5.1.md
@@ -4,20 +4,20 @@ This changelog references changes done in Shopware 5.1 patch versions.
 
 ## 5.1.6 (2016-05-23)
 
-[View all changes from v5.1.5...v5.1.6](https://github.com/shopware/shopware/compare/v5.1.5...v5.1.6)
+[View all changes from v5.1.5...v5.1.6](https://github.com/shopware5/shopware/compare/v5.1.5...v5.1.6)
 
 * The interface `Enlight_Components_Cron_Adapter` in `engine/Library/Enlight/Components/Cron/Adapter.php` got a new method `getJobByAction`. For default implementation see `engine/Library/Enlight/Components/Cron/Adapter/DBAL.php`.
 * Fix a unserialize regression with PHP 5.6.21 and PHP 7.0.6.
     
 ## 5.1.5 (2016-04-11)
 
-[View all changes from v5.1.4...v5.1.5](https://github.com/shopware/shopware/compare/v5.1.4...v5.1.5)
+[View all changes from v5.1.4...v5.1.5](https://github.com/shopware5/shopware/compare/v5.1.4...v5.1.5)
 
 * The smarty variable `sCategoryInfo` in Listing and Blog controllers is now deprecated and will be removed soon. Use `sCategoryContent` instead, it's a drop in replacement.
 
 ## 5.1.4 (2016-03-22)
 
-[View all changes from v5.1.3...v5.1.4](https://github.com/shopware/shopware/compare/v5.1.3...v5.1.4)
+[View all changes from v5.1.3...v5.1.4](https://github.com/shopware5/shopware/compare/v5.1.3...v5.1.4)
 
 * Customer logout will now regenerate the session id and clear the customers basket.
 * Added `IsNew` condition for product streams
@@ -40,7 +40,7 @@ This changelog references changes done in Shopware 5.1 patch versions.
     
 ## 5.1.3 (2016-02-15)
 
-[View all changes from v5.1.2...v5.1.3](https://github.com/shopware/shopware/compare/v5.1.2...v5.1.3)
+[View all changes from v5.1.2...v5.1.3](https://github.com/shopware5/shopware/compare/v5.1.2...v5.1.3)
 
 * Switch Grunt to relativeUrls to unify the paths to less.php
 * Deprecated `Enlight_Application::getOption()` and `Enlight_Application::getOptions`
@@ -56,7 +56,7 @@ This changelog references changes done in Shopware 5.1 patch versions.
 
 ## 5.1.2 (2016-01-12)
 
-[View all changes from v5.1.1...v5.1.2](https://github.com/shopware/shopware/compare/v5.1.1...v5.1.2)
+[View all changes from v5.1.1...v5.1.2](https://github.com/shopware5/shopware/compare/v5.1.1...v5.1.2)
 
 * Out-of-stock variants on the detail page are now selectable
 * `ProductNumberService::getAvailableNumber()` now returns the provided product variant to allow deep linking of out-of-stock variants
@@ -99,14 +99,14 @@ This changelog references changes done in Shopware 5.1 patch versions.
     
 ## 5.1.1 (2015-10-26)
 
-[View all changes from v5.1.0...v5.1.1](https://github.com/shopware/shopware/compare/v5.1.0...v5.1.1)
+[View all changes from v5.1.0...v5.1.1](https://github.com/shopware5/shopware/compare/v5.1.0...v5.1.1)
 
 * Added new smarty block `frontend_detail_index_tabs_cross_selling` in the detail/ajax.tpl to prevent problems with custom themes
 * Renamed block `backend/order/view/detail/communication` in `backend/order/view/detail/configuration.js` to `backend/order/view/detail/configuration`. The name was duplicated in another file and was renamed to match the correct file.
 
 ## 5.1.0 (2015-10-19)
 
-[View all changes from v5.0.4...v5.1.0](https://github.com/shopware/shopware/compare/v5.0.4...v5.1.0)
+[View all changes from v5.0.4...v5.1.0](https://github.com/shopware5/shopware/compare/v5.0.4...v5.1.0)
 
 * Added event `Shopware_Plugin_Collect_MediaXTypes` to collect media related x_type fields for which the value needs to be normalized
 * Updated Behat to v3.0 and other related libraries
@@ -297,4 +297,4 @@ This changelog references changes done in Shopware 5.1 patch versions.
     * `Shopware\Models\Property\Repository::getGroupsQueryBuilder`
     * `Shopware\Models\Property\Repository::getGroupsQuery`
     * `Shopware_Plugins_Frontend_CronRefresh_Bootstrap::onCronJobTranslation()`
-    * `Shopware_Components_DummyPlugin_Bootstrap`
\ No newline at end of file
+    * `Shopware_Components_DummyPlugin_Bootstrap`
diff --git a/UPGRADE-5.2.md b/UPGRADE-5.2.md
index b7feaabefdd..ee68877ba84 100644
--- a/UPGRADE-5.2.md
+++ b/UPGRADE-5.2.md
@@ -4,7 +4,7 @@ This changelog references changes done in Shopware 5.2 patch versions.
 
 # 5.2.27
 
-[View all changes from v5.2.26...v5.2.27](https://github.com/shopware/shopware/compare/v5.2.26...v5.2.27)
+[View all changes from v5.2.26...v5.2.27](https://github.com/shopware5/shopware/compare/v5.2.26...v5.2.27)
 
 * Added config check to disable the `Tell a friend` page if it is disabled via config.
 * Fixed id collision in `themes/Backend/ExtJs/backend/base/component/Shopware.ModuleManager.js`
@@ -18,11 +18,11 @@ This changelog references changes done in Shopware 5.2 patch versions.
 
 # 5.2.26
 
-[View all changes from v5.2.25...v5.2.26](https://github.com/shopware/shopware/compare/v5.2.25...v5.2.26)
+[View all changes from v5.2.25...v5.2.26](https://github.com/shopware5/shopware/compare/v5.2.25...v5.2.26)
 
 ## 5.2.25
 
-[View all changes from v5.2.24...v5.2.25](https://github.com/shopware/shopware/compare/v5.2.24...v5.2.25)
+[View all changes from v5.2.24...v5.2.25](https://github.com/shopware5/shopware/compare/v5.2.24...v5.2.25)
 
 * Added notify event `Shopware_Modules_Basket_AddArticle_Added` in `engine/Shopware/Core/sBasket.php`
 * The event `Shopware_Modules_Export_ExportResult_Filter_Fixed` was added and now filters the processed export result. Previously with `Shopware_Modules_Export_ExportResult_Filter`, an instance of `Zend_Db_Statement_Pdo` was supplied, which could not be used to filter the actual result.
@@ -30,14 +30,14 @@ This changelog references changes done in Shopware 5.2 patch versions.
 
 # 5.2.24
 
-[View all changes from v5.2.23...v5.2.24](https://github.com/shopware/shopware/compare/v5.2.23...v5.2.24)
+[View all changes from v5.2.23...v5.2.24](https://github.com/shopware5/shopware/compare/v5.2.23...v5.2.24)
 
 * Fixed custom datefield format for articles
 * Fixed styling of image slider on tablet landscape view
 
 ## 5.2.23
 
-[View all changes from v5.2.22...v5.2.23](https://github.com/shopware/shopware/compare/v5.2.22...v5.2.23)
+[View all changes from v5.2.22...v5.2.23](https://github.com/shopware5/shopware/compare/v5.2.22...v5.2.23)
 
 * Added conditional statement in `themes/Frontend/Responsive/frontend/_public/src/js/jquery.product-slider.js` to prevent the jquery plugin from sending ajax requests indefinitely
 * Added `limit` parameter to `createQuery` and `createOptionQuery` in `engine/Shopware/Bundle/ESIndexingBundle/Property/PropertyQueryFactory`
@@ -46,7 +46,7 @@ This changelog references changes done in Shopware 5.2 patch versions.
 
 ## 5.2.22
 
-[View all changes from v5.2.21...v5.2.22](https://github.com/shopware/shopware/compare/v5.2.21...v5.2.22)
+[View all changes from v5.2.21...v5.2.22](https://github.com/shopware5/shopware/compare/v5.2.21...v5.2.22)
 
 * Fixed the picture implementation of the `box-emotion.tpl` to load the correct image sizes
 * Added new event `plugin/swAutoSubmit/onChangeSelection` in `themes/Frontend/Responsive/frontend/_public/src/js/jquery.auto-submit.js`
@@ -56,7 +56,7 @@ This changelog references changes done in Shopware 5.2 patch versions.
 
 ## 5.2.21
 
-[View all changes from v5.2.20...v5.2.21](https://github.com/shopware/shopware/compare/v5.2.20...v5.2.21)
+[View all changes from v5.2.20...v5.2.21](https://github.com/shopware5/shopware/compare/v5.2.20...v5.2.21)
 
 * Updated Symfony to version 2.8.17
 * Added paymentID as event property in `Shopware_Modules_Admin_Execute_Risk_Rule_RuleName`
@@ -73,13 +73,13 @@ This changelog references changes done in Shopware 5.2 patch versions.
 
 ## 5.2.20
 
-[View all changes from v5.2.19...v5.2.20](https://github.com/shopware/shopware/compare/v5.2.19...v5.2.20)
+[View all changes from v5.2.19...v5.2.20](https://github.com/shopware5/shopware/compare/v5.2.19...v5.2.20)
 
-* Reverted shopware/shopware#821 which added left joins for basket attributes in `sAdmin::sGetDispatchBasket()` and `sExport::sGetDispatchBasket()`
+* Reverted [shopware5/shopware#821](https://github.com/shopware5/shopware/pull/821) which added left joins for basket attributes in `sAdmin::sGetDispatchBasket()` and `sExport::sGetDispatchBasket()`
 
 ## 5.2.19
 
-[View all changes from v5.2.18...v5.2.19](https://github.com/shopware/shopware/compare/v5.2.18...v5.2.19)
+[View all changes from v5.2.18...v5.2.19](https://github.com/shopware5/shopware/compare/v5.2.18...v5.2.19)
 
 * Changed the loading of backend widgets to disable widgets of deactivated plugins
 * Added new Event `Shopware_Modules_Admin_regenerateSessionId_Start` in sAdmin::regenerateSessionId
@@ -98,14 +98,14 @@ This changelog references changes done in Shopware 5.2 patch versions.
 
 ## 5.2.18
 
-[View all changes from v5.2.17...v5.2.18](https://github.com/shopware/shopware/compare/v5.2.17...v5.2.18)
+[View all changes from v5.2.17...v5.2.18](https://github.com/shopware5/shopware/compare/v5.2.17...v5.2.18)
 
 * Fixed invalid permissions after running media optimizer on some hosting systems
 * Fixed session error in exports
 
 ## 5.2.17
 
-[View all changes from v5.2.16...v5.2.17](https://github.com/shopware/shopware/compare/v5.2.16...v5.2.17)
+[View all changes from v5.2.16...v5.2.17](https://github.com/shopware5/shopware/compare/v5.2.16...v5.2.17)
 
 * Deprecated Smarty modifier `rewrite`. Modifier will be removed in 5.3.0.
 * Changed default `session.gc_divisor` to `200`. To decrease session garbage collection probability.
@@ -150,13 +150,13 @@ The api resources are now available in the dependency injection container using
 
 ## 5.2.16
 
-[View all changes from v5.2.15...v5.2.16](https://github.com/shopware/shopware/compare/v5.2.15...v5.2.16)
+[View all changes from v5.2.15...v5.2.16](https://github.com/shopware5/shopware/compare/v5.2.15...v5.2.16)
 
 * Improved form input filtering
 
 ## 5.2.15
 
-[View all changes from v5.2.14...v5.2.15](https://github.com/shopware/shopware/compare/v5.2.14...v5.2.15)
+[View all changes from v5.2.14...v5.2.15](https://github.com/shopware5/shopware/compare/v5.2.14...v5.2.15)
 
 * Fixed article api resource when creating a new article with new configurator options and an image mapping for this new options
 * Added cronjob registration via `Resources/cronjob.xml` file
@@ -165,7 +165,7 @@ The api resources are now available in the dependency injection container using
 
 ## 5.2.14
 
-[View all changes from v5.2.13...v5.2.14](https://github.com/shopware/shopware/compare/v5.2.13...v5.2.14)
+[View all changes from v5.2.13...v5.2.14](https://github.com/shopware5/shopware/compare/v5.2.13...v5.2.14)
 
 ### Add property "valueField" to the media field.
 * The shopping world element "Media field" supports now to change the value field. All possible properties you can find in the file: `themes/Backend/ExtJs/backend/media_manager/model/media.js`
@@ -182,7 +182,7 @@ The api resources are now available in the dependency injection container using
 
 ## 5.2.13
 
-[View all changes from v5.2.12...v5.2.13](https://github.com/shopware/shopware/compare/v5.2.12...v5.2.13)
+[View all changes from v5.2.12...v5.2.13](https://github.com/shopware5/shopware/compare/v5.2.12...v5.2.13)
 
 * Changed duplicate smarty block from `frontend_checkout_confirm_information_addresses_equal_panel_shipping_select_address` to `frontend_checkout_confirm_information_addresses_equal_panel_shipping_add_address` in `frontend/checkout/confirm.tpl`
 * Added interface `\Shopware\Bundle\ESIndexingBundle\TextMappingInterface` which handles text field mappings for different elastic search versions
@@ -209,11 +209,11 @@ Example:
 
 ## 5.2.12
 
-[View all changes from v5.2.11...v5.2.12](https://github.com/shopware/shopware/compare/v5.2.11...v5.2.12)
+[View all changes from v5.2.11...v5.2.12](https://github.com/shopware5/shopware/compare/v5.2.11...v5.2.12)
 
 ## 5.2.11
 
-[View all changes from v5.2.10...v5.2.11](https://github.com/shopware/shopware/compare/v5.2.10...v5.2.11)
+[View all changes from v5.2.10...v5.2.11](https://github.com/shopware5/shopware/compare/v5.2.10...v5.2.11)
 
 * Added new Smarty block `frontend_robots_txt_allows` to `frontend/robots_txt/index.tpl`
 * Added new Smarty block `frontend_account_order_item_availability` to `frontend/account/order_item_details.tpl`
@@ -261,7 +261,7 @@ There must be at least one option tag and inside each option tag where must be a
 
 ## 5.2.10
 
-[View all changes from v5.2.9...v5.2.10](https://github.com/shopware/shopware/compare/v5.2.9...v5.2.10)
+[View all changes from v5.2.9...v5.2.10](https://github.com/shopware5/shopware/compare/v5.2.9...v5.2.10)
 
 * Added optional `filter` option to `Shopware.apps.Base.view.element.Select`
 * Set `remoteFilter` to `true` in several *base* stores:
@@ -287,13 +287,13 @@ There must be at least one option tag and inside each option tag where must be a
 
 ## 5.2.9
 
-[View all changes from v5.2.8...v5.2.9](https://github.com/shopware/shopware/compare/v5.2.8...v5.2.9)
+[View all changes from v5.2.8...v5.2.9](https://github.com/shopware5/shopware/compare/v5.2.8...v5.2.9)
 
 * `filtergroupID` column will be set to `null` in the `s_articles` table when deleting a property set 
 
 ## 5.2.8
 
-[View all changes from v5.2.7...v5.2.8](https://github.com/shopware/shopware/compare/v5.2.7...v5.2.8)
+[View all changes from v5.2.7...v5.2.8](https://github.com/shopware5/shopware/compare/v5.2.7...v5.2.8)
 
 * Fixed a PHP 7 fatal error in the SVG rendering of mPDF
 * Added missing update of the order details' order number, when converting a cancelled order to a *normal* order in `Shopware_Controllers_Backend_CanceledOrder::convertOrderAction()`
@@ -302,7 +302,7 @@ There must be at least one option tag and inside each option tag where must be a
 
 ## 5.2.7
 
-[View all changes from v5.2.6...v5.2.7](https://github.com/shopware/shopware/compare/v5.2.6...v5.2.7)
+[View all changes from v5.2.6...v5.2.7](https://github.com/shopware5/shopware/compare/v5.2.6...v5.2.7)
 
 * Add support for third party post messages in the backend
 * getOne function of customer api resource contains now the country and state data for billing and shipping address
@@ -311,7 +311,7 @@ There must be at least one option tag and inside each option tag where must be a
 
 ## 5.2.6
 
-[View all changes from v5.2.5...v5.2.6](https://github.com/shopware/shopware/compare/v5.2.5...v5.2.6)
+[View all changes from v5.2.5...v5.2.6](https://github.com/shopware5/shopware/compare/v5.2.5...v5.2.6)
 
 * Changed visibility of sAdmin::loginUser to protected
 * Added filter events to all convert functions in `LegacyStructConverter`
@@ -340,13 +340,13 @@ There must be at least one option tag and inside each option tag where must be a
 
 ## 5.2.5
 
-[View all changes from v5.2.4...v5.2.5](https://github.com/shopware/shopware/compare/v5.2.4...v5.2.5)
+[View all changes from v5.2.4...v5.2.5](https://github.com/shopware5/shopware/compare/v5.2.4...v5.2.5)
 
 * Fixed SEO URL generation for URLs containing dots and forward slashes
 
 ## 5.2.4
 
-[View all changes from v5.2.3...v5.2.4](https://github.com/shopware/shopware/compare/v5.2.3...v5.2.4)
+[View all changes from v5.2.3...v5.2.4](https://github.com/shopware5/shopware/compare/v5.2.3...v5.2.4)
 
 * Introduced new interface `Shopware\Components\Slug\SlugInterface` to generate URL safe versions of a string
     * Service id `shopware.slug`
@@ -388,7 +388,7 @@ There must be at least one option tag and inside each option tag where must be a
 
 ## 5.2.3
 
-[View all changes from v5.2.2...v5.2.3](https://github.com/shopware/shopware/compare/v5.2.2...v5.2.3)
+[View all changes from v5.2.2...v5.2.3](https://github.com/shopware5/shopware/compare/v5.2.2...v5.2.3)
 
 * Updated `guzzlehttp/guzzle` to version 5.3.1 to mitigate [httproxy](https://httpoxy.org/) vulnerability
 * Set timeouts from install/update/(secure) uninstall operations in plugin manager to 300 seconds
@@ -405,13 +405,13 @@ There must be at least one option tag and inside each option tag where must be a
 
 ## 5.2.2 (2016-07-13)
 
-[View all changes from v5.2.0...v5.2.2](https://github.com/shopware/shopware/compare/v5.2.0...v5.2.2)
+[View all changes from v5.2.0...v5.2.2](https://github.com/shopware5/shopware/compare/v5.2.0...v5.2.2)
 
 * Add support for Symfony `console.command` service tag to register commands directly inside service container
 
 ## 5.2.0 (2016-07-01)
 
-[View all changes from v5.1.6...v5.2.0](https://github.com/shopware/shopware/compare/v5.1.6...v5.2.0)
+[View all changes from v5.1.6...v5.2.0](https://github.com/shopware5/shopware/compare/v5.1.6...v5.2.0)
 
 * Increased minimum required PHP version to PHP >= 5.6.4.
 * Added CSRF protection to frontend and backend which is enabled by default.
diff --git a/UPGRADE-5.3.md b/UPGRADE-5.3.md
index 299cec957b7..1df87b2dfb6 100644
--- a/UPGRADE-5.3.md
+++ b/UPGRADE-5.3.md
@@ -4,7 +4,7 @@ This changelog references changes done in Shopware 5.3 patch versions.
 
 ## 5.3.7
 
-[View all changes from v5.3.6...v5.3.7](https://github.com/shopware/shopware/compare/v5.3.6...v5.3.7)
+[View all changes from v5.3.6...v5.3.7](https://github.com/shopware5/shopware/compare/v5.3.6...v5.3.7)
 
 ### Changes
 
@@ -17,7 +17,7 @@ This changelog references changes done in Shopware 5.3 patch versions.
 
 ## 5.3.6
 
-[View all changes from v5.3.5...v5.3.6](https://github.com/shopware/shopware/compare/v5.3.5...v5.3.6)
+[View all changes from v5.3.5...v5.3.6](https://github.com/shopware5/shopware/compare/v5.3.5...v5.3.6)
 
 ### Changes
 
@@ -29,7 +29,7 @@ This changelog references changes done in Shopware 5.3 patch versions.
 
 ## 5.3.5
 
-[View all changes from v5.3.4...v5.3.5](https://github.com/shopware/shopware/compare/v5.3.4...v5.3.5)
+[View all changes from v5.3.4...v5.3.5](https://github.com/shopware5/shopware/compare/v5.3.4...v5.3.5)
 
 ### Additions
 
@@ -62,7 +62,7 @@ This changelog references changes done in Shopware 5.3 patch versions.
 
 ## 5.3.4
 
-[View all changes from v5.3.3...v5.3.4](https://github.com/shopware/shopware/compare/v5.3.3...v5.3.4)
+[View all changes from v5.3.3...v5.3.4](https://github.com/shopware5/shopware/compare/v5.3.3...v5.3.4)
 
 ### Additions
 
@@ -92,7 +92,7 @@ This changelog references changes done in Shopware 5.3 patch versions.
 
 ## 5.3.3
 
-[View all changes from v5.3.2...v5.3.3](https://github.com/shopware/shopware/compare/v5.3.2...v5.3.3)
+[View all changes from v5.3.2...v5.3.3](https://github.com/shopware5/shopware/compare/v5.3.2...v5.3.3)
 
 ### Additions
 
@@ -111,7 +111,7 @@ This changelog references changes done in Shopware 5.3 patch versions.
 
 ## 5.3.2
 
-[View all changes from v5.3.1...v5.3.2](https://github.com/shopware/shopware/compare/v5.3.1...v5.3.2)
+[View all changes from v5.3.1...v5.3.2](https://github.com/shopware5/shopware/compare/v5.3.1...v5.3.2)
 
 ### Additions
 
@@ -125,7 +125,7 @@ This changelog references changes done in Shopware 5.3 patch versions.
 
 ## 5.3.0
 
-[View all changes from v5.2.27...v5.3.0](https://github.com/shopware/shopware/compare/v5.2.27...v5.3.0)
+[View all changes from v5.2.27...v5.3.0](https://github.com/shopware5/shopware/compare/v5.2.27...v5.3.0)
 
 ### Additions
 
diff --git a/UPGRADE-5.4.md b/UPGRADE-5.4.md
index 4b478a4bc0d..2e669eb81b0 100644
--- a/UPGRADE-5.4.md
+++ b/UPGRADE-5.4.md
@@ -4,7 +4,7 @@ This changelog references changes done in Shopware 5.4 patch versions.
 
 ## 5.4.6
 
-[View all changes from v5.4.5...v5.4.6](https://github.com/shopware/shopware/compare/v5.4.5...v5.4.6)
+[View all changes from v5.4.5...v5.4.6](https://github.com/shopware5/shopware/compare/v5.4.5...v5.4.6)
 
 ### Additions
 
@@ -42,7 +42,7 @@ This changelog references changes done in Shopware 5.4 patch versions.
 
 ## 5.4.5
 
-[View all changes from v5.4.4...v5.4.5](https://github.com/shopware/shopware/compare/v5.4.4...v5.4.5)
+[View all changes from v5.4.4...v5.4.5](https://github.com/shopware5/shopware/compare/v5.4.4...v5.4.5)
 
 ### Additions
 
@@ -80,7 +80,7 @@ This changelog references changes done in Shopware 5.4 patch versions.
 
 ## 5.4.4
 
-[View all changes from v5.4.3...v5.4.4](https://github.com/shopware/shopware/compare/v5.4.3...v5.4.4)
+[View all changes from v5.4.3...v5.4.4](https://github.com/shopware5/shopware/compare/v5.4.3...v5.4.4)
 
 ### Additions
 
@@ -136,7 +136,7 @@ This changelog references changes done in Shopware 5.4 patch versions.
 
 ## 5.4.3
 
-[View all changes from v5.4.2...v5.4.3](https://github.com/shopware/shopware/compare/v5.4.2...v5.4.3)
+[View all changes from v5.4.2...v5.4.3](https://github.com/shopware5/shopware/compare/v5.4.2...v5.4.3)
 
 ### Additions
 
@@ -167,7 +167,7 @@ This changelog references changes done in Shopware 5.4 patch versions.
 
 ## 5.4.2
 
-[View all changes from v5.4.1...v5.4.2](https://github.com/shopware/shopware/compare/v5.4.1...v5.4.2)
+[View all changes from v5.4.1...v5.4.2](https://github.com/shopware5/shopware/compare/v5.4.1...v5.4.2)
 
 ### Additions
 
@@ -190,7 +190,7 @@ This changelog references changes done in Shopware 5.4 patch versions.
 
 ## 5.4.1
 
-[View all changes from v5.4.0...v5.4.1](https://github.com/shopware/shopware/compare/v5.4.0...v5.4.1)
+[View all changes from v5.4.0...v5.4.1](https://github.com/shopware5/shopware/compare/v5.4.0...v5.4.1)
 
 ### Additions
 
@@ -237,7 +237,7 @@ This changelog references changes done in Shopware 5.4 patch versions.
 
 ## 5.4.0
 
-[View all changes from v5.3.7...v5.4.0](https://github.com/shopware/shopware/compare/v5.3.7...v5.4.0)
+[View all changes from v5.3.7...v5.4.0](https://github.com/shopware5/shopware/compare/v5.3.7...v5.4.0)
 
 ### Additions
 
diff --git a/UPGRADE-5.5.md b/UPGRADE-5.5.md
index 8515c0c6bb6..85cb16c566b 100644
--- a/UPGRADE-5.5.md
+++ b/UPGRADE-5.5.md
@@ -4,7 +4,7 @@ This changelog references changes done in Shopware 5.5 patch versions.
 
 ## 5.5.10
 
-[View all changes from v5.5.9...v5.5.10](https://github.com/shopware/shopware/compare/v5.5.9...v5.5.10)
+[View all changes from v5.5.9...v5.5.10](https://github.com/shopware5/shopware/compare/v5.5.9...v5.5.10)
 
 ### Additions
 
@@ -20,7 +20,7 @@ This changelog references changes done in Shopware 5.5 patch versions.
 
 ## 5.5.9
 
-[View all changes from v5.5.8...v5.5.9](https://github.com/shopware/shopware/compare/v5.5.8...v5.5.9)
+[View all changes from v5.5.8...v5.5.9](https://github.com/shopware5/shopware/compare/v5.5.8...v5.5.9)
 
 ### Additions
 
@@ -82,7 +82,7 @@ This changelog references changes done in Shopware 5.5 patch versions.
 
 ## 5.5.8
 
-[View all changes from v5.5.7...v5.5.8](https://github.com/shopware/shopware/compare/v5.5.7...v5.5.8)
+[View all changes from v5.5.7...v5.5.8](https://github.com/shopware5/shopware/compare/v5.5.7...v5.5.8)
 
 ### Additions
 
@@ -167,7 +167,7 @@ For security reasons, some extensions like php, cgi, com, exe are not allowed in
 
 ## 5.5.7
 
-[View all changes from v5.5.6...v5.5.7](https://github.com/shopware/shopware/compare/v5.5.6...v5.5.7)
+[View all changes from v5.5.6...v5.5.7](https://github.com/shopware5/shopware/compare/v5.5.6...v5.5.7)
 
 ### Additions
 
@@ -220,7 +220,7 @@ For security reasons, some extensions like php, cgi, com, exe are not allowed in
     * `\Shopware\Components\Plugin\XmlCronjobReader`
     * `\Shopware\Components\Plugin\XmlPluginInfoReader`
     * `\Shopware\Components\Plugin\XmlConfigDefinitionReader`
-    They have been replaced in Shopware 5.6 with new implementations in the namespace [Shopware\Components\Plugin\XmlReader](https://github.com/shopware/shopware/tree/5.6/engine/Shopware/Components/Plugin/XmlReader)
+    They have been replaced in Shopware 5.6 with new implementations in the namespace [Shopware\Components\Plugin\XmlReader](https://github.com/shopware5/shopware/tree/5.6/engine/Shopware/Components/Plugin/XmlReader)
 
 ### Removals
 
@@ -289,7 +289,7 @@ return [
 
 ## 5.5.6
 
-[View all changes from v5.5.5...v5.5.6](https://github.com/shopware/shopware/compare/v5.5.5...v5.5.6)
+[View all changes from v5.5.5...v5.5.6](https://github.com/shopware5/shopware/compare/v5.5.5...v5.5.6)
 
 ### Changes
 
@@ -298,7 +298,7 @@ return [
 
 ## 5.5.5
 
-[View all changes from v5.5.4...v5.5.5](https://github.com/shopware/shopware/compare/v5.5.4...v5.5.5)
+[View all changes from v5.5.4...v5.5.5](https://github.com/shopware5/shopware/compare/v5.5.4...v5.5.5)
 
 ### Additions
 
@@ -387,7 +387,7 @@ return [
 
 ## 5.5.4
 
-[View all changes from v5.5.3...v5.5.4](https://github.com/shopware/shopware/compare/v5.5.3...v5.5.4)
+[View all changes from v5.5.3...v5.5.4](https://github.com/shopware5/shopware/compare/v5.5.3...v5.5.4)
 
 ### Additions
 
@@ -457,7 +457,7 @@ return [
 
 ## 5.5.3
 
-[View all changes from v5.5.2...v5.5.3](https://github.com/shopware/shopware/compare/v5.5.2...v5.5.3)
+[View all changes from v5.5.2...v5.5.3](https://github.com/shopware5/shopware/compare/v5.5.2...v5.5.3)
 
 ### Additions
 
@@ -485,7 +485,7 @@ return [
 
 ## 5.5.2
 
-[View all changes from v5.5.1...v5.5.2](https://github.com/shopware/shopware/compare/v5.5.1...v5.5.2)
+[View all changes from v5.5.1...v5.5.2](https://github.com/shopware5/shopware/compare/v5.5.1...v5.5.2)
 
 ### Additions
 
@@ -567,7 +567,7 @@ return [
 
 ## 5.5.1
 
-[View all changes from v5.5.0...v5.5.1](https://github.com/shopware/shopware/compare/v5.5.0...v5.5.1)
+[View all changes from v5.5.0...v5.5.1](https://github.com/shopware5/shopware/compare/v5.5.0...v5.5.1)
 
 ### Changes
 
@@ -575,7 +575,7 @@ return [
 
 ## 5.5.0
 
-[View all changes from v5.4.6...v5.5.0](https://github.com/shopware/shopware/compare/v5.4.6...v5.5.0)
+[View all changes from v5.4.6...v5.5.0](https://github.com/shopware5/shopware/compare/v5.4.6...v5.5.0)
 
 ### Additions
 
diff --git a/UPGRADE-5.6.md b/UPGRADE-5.6.md
index 4d10e9a21a6..5daea36ab92 100644
--- a/UPGRADE-5.6.md
+++ b/UPGRADE-5.6.md
@@ -2,9 +2,21 @@
 
 This changelog references changes done in Shopware 5.6 patch versions.
 
+## 5.6.10
+
+[View all changes from v5.6.9...v5.6.10](https://github.com/shopware5/shopware/compare/v5.6.9...v5.6.10)
+
+## 5.6.9
+
+[View all changes from v5.6.8...v5.6.9](https://github.com/shopware5/shopware/compare/v5.6.8...v5.6.9)
+
+### Changes
+
+* Changed bot detection to not recognize Huawei devices as bot
+
 ## 5.6.8
 
-[View all changes from v5.6.7...v5.6.8](https://github.com/shopware/shopware/compare/v5.6.7...v5.6.8)
+[View all changes from v5.6.7...v5.6.8](https://github.com/shopware5/shopware/compare/v5.6.7...v5.6.8)
 
 ### Additions
 
@@ -23,7 +35,7 @@ This changelog references changes done in Shopware 5.6 patch versions.
 
 ## 5.6.7
 
-[View all changes from v5.6.6...v5.6.7](https://github.com/shopware/shopware/compare/v5.6.6...v5.6.7)
+[View all changes from v5.6.6...v5.6.7](https://github.com/shopware5/shopware/compare/v5.6.6...v5.6.7)
 
 ### Additions
 
@@ -92,7 +104,7 @@ This changelog references changes done in Shopware 5.6 patch versions.
 
 ## 5.6.6
 
-[View all changes from v5.6.5...v5.6.6](https://github.com/shopware/shopware/compare/v5.6.5...v5.6.6)
+[View all changes from v5.6.5...v5.6.6](https://github.com/shopware5/shopware/compare/v5.6.5...v5.6.6)
 
 ### Changes
 
@@ -100,7 +112,7 @@ This changelog references changes done in Shopware 5.6 patch versions.
 
 ## 5.6.5
 
-[View all changes from v5.6.4...v5.6.5](https://github.com/shopware/shopware/compare/v5.6.4...v5.6.5)
+[View all changes from v5.6.4...v5.6.5](https://github.com/shopware5/shopware/compare/v5.6.4...v5.6.5)
 
 ### Additions
 
@@ -149,7 +161,7 @@ This changelog references changes done in Shopware 5.6 patch versions.
 
 ## 5.6.4
 
-[View all changes from v5.6.3...v5.6.4](https://github.com/shopware/shopware/compare/v5.6.3...v5.6.4)
+[View all changes from v5.6.3...v5.6.4](https://github.com/shopware5/shopware/compare/v5.6.3...v5.6.4)
 
 ### Changes
 
@@ -157,7 +169,7 @@ This changelog references changes done in Shopware 5.6 patch versions.
 
 ## 5.6.3
 
-[View all changes from v5.6.2...v5.6.3](https://github.com/shopware/shopware/compare/v5.6.2...v5.6.3)
+[View all changes from v5.6.2...v5.6.3](https://github.com/shopware5/shopware/compare/v5.6.2...v5.6.3)
 
 ### Additions
 
@@ -220,7 +232,7 @@ to read [this documentation](https://developers.shopware.com/developers-guide/co
 
 ## 5.6.2
 
-[View all changes from v5.6.1...v5.6.2](https://github.com/shopware/shopware/compare/v5.6.1...v5.6.2)
+[View all changes from v5.6.1...v5.6.2](https://github.com/shopware5/shopware/compare/v5.6.1...v5.6.2)
 
 ### Additions
 
@@ -283,7 +295,7 @@ to read [this documentation](https://developers.shopware.com/developers-guide/co
 
 ## 5.6.1
 
-[View all changes from v5.6.0...v5.6.1](https://github.com/shopware/shopware/compare/v5.6.0...v5.6.1)
+[View all changes from v5.6.0...v5.6.1](https://github.com/shopware5/shopware/compare/v5.6.0...v5.6.1)
 
 ### Additions
 
@@ -313,7 +325,7 @@ to read [this documentation](https://developers.shopware.com/developers-guide/co
 
 ## 5.6.0
 
-[View all changes from v5.5.10...v5.6.0](https://github.com/shopware/shopware/compare/v5.5.10...v5.6.0)
+[View all changes from v5.5.10...v5.6.0](https://github.com/shopware5/shopware/compare/v5.5.10...v5.6.0)
 
 ### Additions
 
@@ -402,7 +414,7 @@ to read [this documentation](https://developers.shopware.com/developers-guide/co
 * Added `_config` property to class `Shopware_Models_Document_Order` to make it usable while model creation
 * Added new parameter to prevent certain exceptions from cluttering your logs. See [Disable logging of specific exceptions](###Disable logging of specific exceptions) for more details
 * Added a `Symfony\Component\HttpKernel\Bundle\Bundle` class to all Shopware bundles and moved all service.xml files to a corresponding `DependencyInjection` directory
-* Added `es.index_configuration` and `es.backend.index_configuration` section to `config.php` to allow custom elasticsearch settings
+* Added `es.index_settings` and `es.backend.index_settings` section to `config.php` to allow custom elasticsearch settings
 * Added getter and setter to Config/Form model
 * Added new event `Shopware_Controllers_Order_SendMail_Prepare` to `Shopware_Controllers_Backend_Order::sendMailAction`
 * Added `Shopware\Components\CacheSubscriber` to clear config cache, when plugin config changes
diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md
index ffb9903ecea..795460ee3da 100644
--- a/UPGRADE-5.7.md
+++ b/UPGRADE-5.7.md
@@ -2,58 +2,333 @@
 
 This changelog references changes done in Shopware 5.7 patch versions.
 
-## 5.7.10
+## 5.7.21
+
+[View all changes from v5.7.20...v5.7.21](https://github.com/shopware5/shopware/compare/v5.7.20...v5.7.21)
+
+### Additions
+
+* Added compatibility with PHP 8.3
+* Added new polyfill `symfony/polyfill-php83` to be able to use PHP 8.3 features
+
+### Changes
+
+* Changed behaviour of the translation transfer while setting a product variant as the main variant
+* Changed the test kernel, so PHPUnit tests do no longer ignore PHP warnings and notices and are failing instead
+* Changed the `plugin.xsd` complexType `pluginType` so it could be validated again with newer `libxml2` versions
+
+* Updated `beberlei/assert` to version 3.3.3
+* Updated `beberlei/doctrineextensions` to version 1.4.0
+* Updated `cocur/slugify` to version 4.6.0 for PHP 8.0 and newer
+* Updated `doctrine/annotations` to version 1.14.4
+* Updated `doctrine/common` to version 3.5.0
+* Updated `doctrine/inflector` to version 2.0.10
+* Updated `doctrine/orm` to version 2.15.5
+* Updated `doctrine/persistence` to version 3.4.0
+* Updated `elasticsearch/elasticsearch` to version 7.17.3
+* Updated `friendsofphp/proxy-manager-lts` to version 1.0.18
+* Updated `google/cloud-storage` to version 1.39.0
+* Updated `guzzlehttp/guzzle` to version 7.9.2
+* Updated `guzzlehttp/psr7` to version 2.7.0
+* Updated `monolog/monolog` to version 2.10.0
+* Updated `mpdf/mpdf` to version 8.2.5
+* Updated `laminas/laminas-code` to version 4.16.0 for PHP 8.1 and newer
+* Updated `laminas/laminas-escaper` to version 2.16.0 for PHP 8.1 and newer
+* Updated `phpunit/phpunit` to version 9.6.29
+* Updated `setasign/fpdf` to version 1.8.6
+* Updated `setasign/fpdi` to version 2.6.4
+* Updated `symfony/polyfill-php80` to version 1.33.0
+* Updated `symfony/polyfill-php81` to version 1.33.0
+* Updated `symfony/polyfill-php82` to version 1.33.0
+* Updated `symfony/polyfill-php83` to version 1.33.0
+* Updated `symfony/process` to version 5.4.47
+* Updated `symfony/http-kernel` to version 4.4.51
+* Updated `symfony/serializer` to version 5.4.45
+* Updated `voku/anti-xss` to version 4.1.42
+* Updated `wikimedia/less.php` to version 5.1.2
+* Updated several indirect dependencies
+* Updated npm dependencies in `themes/package.json`
+* Updated npm dependencies in `themes/Frontend/Responsive/package.json`
+* Updated devenv dependencies
+
+### Removals
+
+* Removed development dependency `phpspec/prophecy-phpunit` as it is no longer used due to a refactoring of `Shopware\Tests\Unit\Components\DependencyInjection\ContainerTest`
+
+## 5.7.20
+
+[View all changes from v5.7.19...v5.7.20](https://github.com/shopware5/shopware/compare/v5.7.19...v5.7.20)
+
+### Changes
 
-[View all changes from v5.7.9...v5.7.10](https://github.com/shopware/shopware/compare/v5.7.9...v5.7.10)
+* Changed the removal of font files provided by mPDF from the `vendor` directory so that `DejaVu` font is kept as default.
+
+### Removals
+
+* Removed the font files from `engine/Library/Mpdf/ttfonts` and their loading. Provide the font on your own, if you still need them.
+
+## 5.7.19
+
+[View all changes from v5.7.18...v5.7.19](https://github.com/shopware5/shopware/compare/v5.7.18...v5.7.19)
+
+## 5.7.18
+
+[View all changes from v5.7.17...v5.7.18](https://github.com/shopware5/shopware/compare/v5.7.17...v5.7.18)
+
+### Additions
+
+* Added new input field that does not allow values, that contain URLs
 
 ### Deprecations
 
+* Deprecated `\Shopware\Bundle\SearchBundleDBAL\SearchBundleDBALSubscriber`, it will be removed with Shopware 5.8, because it is not used.
+
+### Changes
+
+* Changed newsletter registration so that it does not allow URLs as value for first and last name
+* Changed customer registration so that it does not allow URLs as value for first and last name
+* Updated `behat/behat` to version 3.13.0
+* Updated `doctrine/dbal` to version 2.13.9
+* Updated `doctrine/orm` to version 2.15.2
+* Updated `doctrine/persistence` to version 3.2.0
+* Updated `elasticsearch/elasticsearch` to version 7.17.2
+* Updated `friendsofphp/proxy-manager-lts` to version 1.0.16
+* Updated `google/cloud-storage` to version 1.31.2
+* Updated `guzzlehttp/guzzle` to version 7.7.0
+* Updated `guzzlehttp/psr7` to version 2.5.0
+* Updated `laminas/laminas-code` to version 4.11.0 for PHP 8.1 and newer
+* Updated `mpdf/mpdf` to version 8.1.6
+* Updated `phpunit/phpunit` to version 9.6.8
+* Updated `setasign/fpdi` to version 2.3.7
+* Updated `symfony/serializer` to version 5.4.23
+* Updated `voku/anti-xss` to version 4.1.41
+* Updated `wikimedia/less.php` to version 4.1.0
+* Updated several indirect dependencies
+
+### Removals
+
+* Removed the feedback popup at first login, as the feedback is no longer used.
+* Removed the Shopware BI feature, as it will be shut down.
+
+## 5.7.17
+
+[View all changes from v5.7.16...v5.7.17](https://github.com/shopware5/shopware/compare/v5.7.16...v5.7.17)
+
+### Additions
+
+* Added version `4.8.0` to version constraint of `laminas/laminas-code` to allow installation on PHP 8.2
+* Added new polyfill `symfony/polyfill-php82` to be able to use PHP 8.2 features
+
+### Deprecations
+
+* Deprecated `\Shopware\Bundle\StoreFrontBundle\Gateway\ConfiguratorGatewayInterface::getProductCombinations`, it will be removed in the next minor version v5.8.
+
+### Changes
+
+* Updated `bcremer/line-reader` to version 1.3.0
+* Updated `behat/behat` to version 3.12.0
+* Updated `cocur/slugify` to version 4.3.0
+* Updated `doctrine/annotations` to version 1.14.3
+* Updated `doctrine/collections` to version 1.8.0
+* Updated `doctrine/common` to version 3.4.3
+* Updated `doctrine/event-manager` to version 1.2.0
+* Updated `doctrine/orm` to version 2.14.1
+* Updated `doctrine/persistence` to version 3.1.3
+* Updated `elasticsearch/elasticsearch` to version 7.17.1
+* Updated `friendsofphp/proxy-manager-lts` to version 1.0.14
+* Updated `google/cloud-storage` to version 1.30.1
+* Updated `guzzlehttp/psr7` to version 2.4.3
+* Updated `laminas/laminas-code` to version 4.7.1
+* Updated `laminas/laminas-escaper` to version 2.12.0
+* Updated `league/flysystem` to version 1.1.10
+* Updated `monolog/monolog` to version 2.9.1
+* Updated `mpdf/mpdf` to version 8.1.4
+* Updated `phpunit/phpunit` to version 9.6.3
+* Updated `sensiolabs/behat-page-object-extension` to version 2.3.7
+* Updated `setasign/fpdf` to version 1.8.5
+* Updated `symfony/console` to version 4.4.49
+* Updated `symfony/dependency-injection` to version 4.4.49
+* Updated `symfony/expression-language` to version 4.4.47
+* Updated `symfony/form` to version 4.4.48
+* Updated `symfony/http-foundation` to version 4.4.49
+* Updated `symfony/http-kernel` to version 4.4.50
+* Updated `symfony/polyfill-php80` to version 1.27.0
+* Updated `symfony/polyfill-php81` to version 1.27.0
+* Updated `symfony/serializer` to version 5.4.17
+* Updated `symfony/validator` to version 4.4.48
+* Updated `wikimedia/less.php` to version 3.2.0
+* Updated several indirect dependencies
+* Updated npm dependencies in `themes/package.json`
+* Updated npm dependencies in `themes/Frontend/Responsive/package.json`
+
+## 5.7.16
+
+[View all changes from v5.7.15...v5.7.16](https://github.com/shopware5/shopware/compare/v5.7.15...v5.7.16)
+
+### Additions
+
+* Added new block `backend/mail_log/model/filter/fields` in `themes/Backend/ExtJs/backend/mail_log/model/filter.js` to be able to extend the model fields
+* Added missing dependency `doctrine/inflector`, which was an indirect dependency before
+
+### Changes
+
+* Changed the following block names, because they were duplicated and could have caused errors
+
+| file path                                                                                                 | old block name                                                                | new block name                                                                    |
+|-----------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------|-----------------------------------------------------------------------------------|
+| themes/Backend/ExtJs/backend/analytics/view/table/partner_revenue.js                                      | backend/analytics/view/table/referrer_revenue                                 | backend/analytics/view/table/partner_revenue                                      |
+| themes/Backend/ExtJs/backend/base/model/product_box_layout.js                                             | backend/base/model/product_box_layout                                         | backend/base/model/product_box_layout/fields                                      |
+| themes/Backend/ExtJs/backend/config/model/main/value.js                                                   | backend/config/model/main/navigation/fields                                   | backend/config/model/main/value/fields                                            |
+| themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/product_number_sorting.js          | backend/config/view/custom_search/sorting/classes/product_name_sorting        | backend/config/view/custom_search/sorting/classes/product_number_sorting          |
+| themes/Backend/ExtJs/backend/config/view/main/fieldset.js                                                 | backend/config/view/main/form                                                 | backend/config/view/main/fields_set                                               |
+| themes/Backend/ExtJs/backend/customer/model/batch.js                                                      | backend/customer/model/customer                                               | backend/customer/model/batch                                                      |
+| themes/Backend/ExtJs/backend/customer/model/batch.js                                                      | backend/customer/model/customer/fields                                        | backend/customer/model/batch/fields                                               |
+| themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_registered_in_shop_condition.js | backend/customer/view/customer_stream/conditions/registered_in_shop_condition | backend/customer/view/customer_stream/conditions/not_registered_in_shop_condition |
+| themes/Backend/ExtJs/backend/mail_log/model/filter.js                                                     | backend/performance/model/filter                                              | backend/mail_log/model/filter                                                     |
+| themes/Backend/ExtJs/backend/media_manager/view/replace/grid.js                                           | backend/media_manager/view/replace/window                                     | backend/media_manager/view/replace/grid                                           |
+| themes/Backend/ExtJs/backend/media_manager/view/replace/upload.js                                         | backend/media_manager/view/replace/row                                        | backend/media_manager/view/replace/upload                                         |
+| themes/Backend/ExtJs/backend/newsletter_manager/model/container.js                                        | backend/newsletter_manager/model/sender/fields                                | backend/newsletter_manager/model/container/fields                                 |
+| themes/Backend/ExtJs/backend/order/model/detail_batch.js                                                  | backend/order/model/batch                                                     | backend/order/model/detail_batch                                                  |
+| themes/Backend/ExtJs/backend/performance/controller/direct.js                                             | backend/performance/controller/main                                           | backend/performance/controller/direct                                             |
+| themes/Backend/ExtJs/backend/performance/model/seo.js                                                     | backend/performance/model/top_seller/fields                                   | backend/performance/model/seo/fields                                              |
+| themes/Backend/ExtJs/backend/product_feed/model/shop.js                                                   | backend/product_feed/model/main                                               | backend/product_feed/model/shop                                                   |
+| themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/attribute_date_time.js              | backend/product_stream/view/condition_list/condition/attribute_date           | backend/product_stream/view/condition_list/condition/attribute_date_time          |
+| themes/Backend/ExtJs/backend/shipping/store/tax.js                                                        | backend/shipping/store/country                                                | backend/shipping/store/tax                                                        |
+| themes/Backend/ExtJs/backend/site/store/selected.js                                                       | backend/site/store/groups                                                     | backend/site/store/selected                                                       |
+| themes/Backend/ExtJs/backend/snippet/view/main/translate_window.js                                        | backend/snippet/view/main/edit_form                                           | backend/snippet/view/main/translate_window                                        |
+| themes/Backend/ExtJs/backend/systeminfo/controller/systeminfo.js                                          | backend/systeminfo/controller/main                                            | backend/systeminfo/controller/systeminfo                                          |
+| themes/Backend/ExtJs/backend/translation/view/main/services.js                                            | backend/translation/view/main/window                                          | backend/translation/view/main/services                                            |
+| themes/Backend/ExtJs/backend/user_manager/model/user_detail.js                                            | backend/user_manager/model/detail                                             | backend/user_manager/model/user_detail                                            |
+| themes/Backend/ExtJs/backend/user_manager/model/user_detail.js                                            | backend/user_manager/model/detail/fields                                      | backend/user_manager/model/user_detail/fields                                     |
+| themes/Frontend/Bare/frontend/blog/comment/form.tpl                                                       | frontend_blog_comments_input_captcha_placeholder                              | frontend_blog_comments_input_captcha_notice                                       |
+| themes/Frontend/Bare/frontend/blog/comments.tpl                                                           | frontend_blog_comments_form                                                   | frontend_blog_comments_form_action                                                |
+| themes/Frontend/Bare/frontend/checkout/finish.tpl                                                         | frontend_checkout_confirm_information_addresses_billing_panel_title           | frontend_checkout_finish_information_addresses_billing_panel_title                |
+| themes/Frontend/Bare/frontend/compare/add_article.tpl                                                     | product_compare_error_title                                                   | product_compare_error_message                                                     |
+| themes/Frontend/Bare/frontend/compare/col.tpl                                                             | frontend_listing_box_article_price_regulation                                 | frontend_compare_price_regulation                                                 |
+| themes/Frontend/Bare/frontend/compare/col.tpl                                                             | frontend_listing_box_article_price_discount_before                            | frontend_compare_price_regulation_before                                          |
+| themes/Frontend/Bare/frontend/compare/col.tpl                                                             | frontend_listing_box_article_price_discount_after                             | frontend_compare_price_regulation_after                                           |
+| themes/Frontend/Bare/frontend/compare/col_description.tpl                                                 | frontend_compare_article_name                                                 | frontend_compare_article_name_header                                              |
+| themes/Frontend/Bare/frontend/compare/col_description.tpl                                                 | frontend_compare_votings                                                      | frontend_compare_votings_header                                                   |
+| themes/Frontend/Bare/frontend/compare/col_description.tpl                                                 | frontend_compare_description                                                  | frontend_compare_description_header                                               |
+| themes/Frontend/Bare/frontend/compare/col_description.tpl                                                 | frontend_compare_price                                                        | frontend_compare_price_header                                                     |
+| themes/Frontend/Bare/frontend/compare/col_description.tpl                                                 | frontend_compare_properties                                                   | frontend_compare_properties_header                                                |
+| themes/Frontend/Bare/frontend/detail/data.tpl                                                             | frontend_detail_data_pseudo_price_discount_content                            | frontend_detail_data_regulation_price_content                                     |
+| themes/Frontend/Bare/frontend/listing/product-box/box-minimal.tpl                                         | frontend_listing_box_article_price_discount_before                            | frontend_listing_box_article_price_regulation_before                              |
+| themes/Frontend/Bare/frontend/listing/product-box/box-minimal.tpl                                         | frontend_listing_box_article_price_discount_after                             | frontend_listing_box_article_price_regulation_after                               |
+| themes/Frontend/Bare/frontend/listing/product-box/product-price.tpl                                       | frontend_listing_box_article_price_discount_before                            | frontend_listing_box_article_price_regulation_before                              |
+| themes/Frontend/Bare/frontend/listing/product-box/product-price.tpl                                       | frontend_listing_box_article_price_discount_after                             | frontend_listing_box_article_price_regulation_after                               |
+| themes/Frontend/Bare/frontend/newsletter/detail.tpl                                                       | frontend_newsletter_listing_error_message                                     | frontend_newsletter_detail_error_message                                          |
+| themes/Frontend/Bare/frontend/plugins/notification/index.tpl                                              | frontend_account_index_form_captcha                                           | frontend_detail_index_notification_captcha                                        |
+
+* Changed the following jQuery event names, because they were duplicated and could have caused errors
+
+| file path                                                                       | method                           | old event name                                      | new event name                                             |
+|---------------------------------------------------------------------------------|----------------------------------|-----------------------------------------------------|------------------------------------------------------------|
+| themes/Frontend/Responsive/frontend/_public/src/js/jquery.image-slider.js       | onThumbnailSlideMove             | plugin/swImageSlider/onThumbnailSlideTouch          | plugin/swImageSlider/onThumbnailSlideMove                  |
+| themes/Frontend/Responsive/frontend/_public/src/js/jquery.infinite-scrolling.js | generateButton                   | plugin/swInfiniteScrolling/onLoadMore               | plugin/swInfiniteScrolling/onGenerateButton                |
+| themes/Frontend/Responsive/frontend/_public/src/js/jquery.listing-actions.js    | setCategoryParamsFromTopLocation | plugin/swListingActions/onSetCategoryParamsFromData | plugin/swListingActions/onSetCategoryParamsFromTopLocation |
+| themes/Frontend/Responsive/frontend/_public/src/js/jquery.listing-actions.js    | getLabelIcon                     | plugin/swListingActions/onCreateStarLabel           | plugin/swListingActions/onGetLabelIcon                     |
+
+* Updated `cocur/slugify` to version 4.2.0
+* Updated `doctrine/annotations` to version 1.13.3
+* Updated `doctrine/collections` to version 1.7.3
+* Updated `doctrine/common` to version 3.4.0
+* Updated `doctrine/event-manager` to version 1.1.2
+* Updated `doctrine/orm` to version 2.13.1
+* Updated `doctrine/persistence` to version 2.5.4
+* Updated `google/cloud-storage` to version 1.28.1
+* Updated `guzzlehttp/guzzle` to version 7.5.0
+* Updated `guzzlehttp/psr7` to version 2.4.1
+* Updated `laminas/laminas-code` to version 4.6.0
+* Updated `league/flysystem-aws-s3-v3` to version 1.0.30
+* Updated `monolog/monolog` to version 2.8.0
+* Updated `phpunit/phpunit` to version 9.5.23
+* Updated `symfony/config` to version 4.4.44
+* Updated `symfony/console` to version 4.4.45
+* Updated `symfony/dependency-injection` to version 4.4.44
+* Updated `symfony/expression-language` to version 4.4.44
+* Updated `symfony/finder` to version 4.4.44
+* Updated `symfony/form` to version 4.4.45
+* Updated `symfony/http-foundation` to version 4.4.45
+* Updated `symfony/http-kernel` to version 4.4.45
+* Updated `symfony/options-resolver` to version 4.4.44
+* Updated `symfony/process` to version 4.4.44
+* Updated `symfony/serializer` to version 5.4.12
+* Updated `symfony/validator` to version 4.4.45
+* Updated several indirect dependencies
+
+## 5.7.15
+
+[View all changes from v5.7.14...v5.7.15](https://github.com/shopware5/shopware/compare/v5.7.14...v5.7.15)
+
+## 5.7.14
+
+[View all changes from v5.7.13...v5.7.14](https://github.com/shopware5/shopware/compare/v5.7.13...v5.7.14)
+
+## 5.7.13
+
+[View all changes from v5.7.12...v5.7.13](https://github.com/shopware5/shopware/compare/v5.7.12...v5.7.13)
+
+## 5.7.12
+
+[View all changes from v5.7.11...v5.7.12](https://github.com/shopware5/shopware/compare/v5.7.11...v5.7.12)
+
 ### Additions
 
 * Added missing dependency `doctrine/annotations`, which was an indirect dependency before
+* Added new optional parameter `dateTime` to `\Shopware\Components\Logger::addRecord` method to be compatible with parent `\Monolog\Logger::addRecord` method
+* Added requirement `composer-runtime-api ^2.0` which was already added indirectly in version [5.7.8](#5.7.8)
 
 ### Changes
 
 * Updated `bamarni/composer-bin-plugin` to version 1.5.0
 * Updated `behat/mink` to version 1.10.0
 * Updated `behat/mink-selenium2-driver` to version 1.6.0
+* Updated `doctrine/cache` to version 1.13.0
 * Updated `doctrine/common` to version 3.3.0
 * Updated `doctrine/dbal` to version 2.13.8
-* Updated `doctrine/persistence` to version 2.5.1
+* Updated `doctrine/orm` to version 2.12.3
+* Updated `doctrine/persistence` to version 2.5.3
 * Updated `elasticsearch/elasticsearch` to version 7.17.0
-* Updated `friendsofphp/proxy-manager-lts` to version 1.0.7
-* Updated `google/cloud-storage` to version 1.26.2
-* Updated `guzzlehttp/guzzle` to version 7.4.2
+* Updated `friendsofphp/proxy-manager-lts` to version 1.0.12
+* Updated `google/cloud-storage` to version 1.27.1
+* Updated `guzzlehttp/guzzle` to version 7.4.5
+* Updated `guzzlehttp/psr7` to version 2.4.0
 * Updated `laminas/laminas-escaper` to version 2.10.0
-* Updated `monolog/monolog` to version 2.5.0
+* Updated `monolog/monolog` to version 2.7.0
 * Updated `mpdf/mpdf` to version 8.1.1
-* Updated `phpunit/phpunit` to version 9.5.20
+* Updated `phpunit/phpunit` to version 9.5.21
 * Updated `symfony/browser-kit` to version 4.4.37
-* Updated `symfony/config` to version 4.4.41
-* Updated `symfony/console` to version 4.4.41
-* Updated `symfony/dependency-injection` to version 4.4.41
-* Updated `symfony/dom-crawler` to version 4.4.39
+* Updated `symfony/config` to version 4.4.42
+* Updated `symfony/console` to version 4.4.42
+* Updated `symfony/dependency-injection` to version 4.4.42
+* Updated `symfony/dom-crawler` to version 4.4.42
 * Updated `symfony/expression-language` to version 4.4.41
-* Updated `symfony/filesystem` to version 4.4.39
+* Updated `symfony/filesystem` to version 4.4.42
 * Updated `symfony/finder` to version 4.4.41
-* Updated `symfony/form` to version 4.4.41
-* Updated `symfony/http-foundation` to version 4.4.41
-* Updated `symfony/http-kernel` to version 4.4.41
+* Updated `symfony/form` to version 4.4.42
+* Updated `symfony/http-foundation` to version 4.4.42
+* Updated `symfony/http-kernel` to version 4.4.42
 * Updated `symfony/options-resolver` to version 4.4.37
-* Updated `symfony/polyfill-php80` to version 1.25.0
-* Updated `symfony/polyfill-php81` to version 1.25.0
+* Updated `symfony/polyfill-php80` to version 1.26.0
+* Updated `symfony/polyfill-php81` to version 1.26.0
 * Updated `symfony/process` to version 4.4.41
-* Updated `symfony/serializer` to version 5.4.8
+* Updated `symfony/serializer` to version 5.4.9
 * Updated `symfony/validator` to version 4.4.41
 * Updated `symfony/web-link` to version 4.4.37
 * Updated several indirect dependencies
 
-### Removals
+## 5.7.11
+
+[View all changes from v5.7.10...v5.7.11](https://github.com/shopware5/shopware/compare/v5.7.10...v5.7.11)
+
+## 5.7.10
 
+[View all changes from v5.7.9...v5.7.10](https://github.com/shopware5/shopware/compare/v5.7.9...v5.7.10)
 
 ## 5.7.9
 
-[View all changes from v5.7.8...v5.7.9](https://github.com/shopware/shopware/compare/v5.7.8...v5.7.9)
+[View all changes from v5.7.8...v5.7.9](https://github.com/shopware5/shopware/compare/v5.7.8...v5.7.9)
 
 ### Changes
 
@@ -63,7 +338,7 @@ This changelog references changes done in Shopware 5.7 patch versions.
 
 ## 5.7.8
 
-[View all changes from v5.7.7...v5.7.8](https://github.com/shopware/shopware/compare/v5.7.7...v5.7.8)
+[View all changes from v5.7.7...v5.7.8](https://github.com/shopware5/shopware/compare/v5.7.7...v5.7.8)
 
 ### Additions
 
@@ -122,7 +397,7 @@ This changelog references changes done in Shopware 5.7 patch versions.
 
 ## 5.7.7
 
-[View all changes from v5.7.6...v5.7.7](https://github.com/shopware/shopware/compare/v5.7.6...v5.7.7)
+[View all changes from v5.7.6...v5.7.7](https://github.com/shopware5/shopware/compare/v5.7.6...v5.7.7)
 
 ### Deprecations
 
@@ -174,7 +449,7 @@ to log in again.**
 
 ## 5.7.6
 
-[View all changes from v5.7.5...v5.7.6](https://github.com/shopware/shopware/compare/v5.7.5...v5.7.6)
+[View all changes from v5.7.5...v5.7.6](https://github.com/shopware5/shopware/compare/v5.7.5...v5.7.6)
 
 ### Additions
 
@@ -182,11 +457,11 @@ to log in again.**
 
 ## 5.7.5
 
-[View all changes from v5.7.4...v5.7.5](https://github.com/shopware/shopware/compare/v5.7.4...v5.7.5)
+[View all changes from v5.7.4...v5.7.5](https://github.com/shopware5/shopware/compare/v5.7.4...v5.7.5)
 
 ## 5.7.4
 
-[View all changes from v5.7.3...v5.7.4](https://github.com/shopware/shopware/compare/v5.7.3...v5.7.4)
+[View all changes from v5.7.3...v5.7.4](https://github.com/shopware5/shopware/compare/v5.7.3...v5.7.4)
 
 ### Deprecations
 
@@ -250,7 +525,7 @@ please extend the `frontend_listing_actions_filter_include` block from now on in
 
 ## 5.7.3
 
-[View all changes from v5.7.2...v5.7.3](https://github.com/shopware/shopware/compare/v5.7.2...v5.7.3)
+[View all changes from v5.7.2...v5.7.3](https://github.com/shopware5/shopware/compare/v5.7.2...v5.7.3)
 
 ### Changes
 
@@ -263,7 +538,7 @@ please extend the `frontend_listing_actions_filter_include` block from now on in
 
 ## 5.7.2
 
-[View all changes from v5.7.1...v5.7.2](https://github.com/shopware/shopware/compare/v5.7.1...v5.7.2)
+[View all changes from v5.7.1...v5.7.2](https://github.com/shopware5/shopware/compare/v5.7.1...v5.7.2)
 
 ### Changes
 
@@ -271,7 +546,7 @@ please extend the `frontend_listing_actions_filter_include` block from now on in
 
 ## 5.7.1
 
-[View all changes from v5.7.0...v5.7.1](https://github.com/shopware/shopware/compare/v5.7.0...v5.7.1)
+[View all changes from v5.7.0...v5.7.1](https://github.com/shopware5/shopware/compare/v5.7.0...v5.7.1)
 
 ### Additions
 
@@ -288,7 +563,7 @@ please extend the `frontend_listing_actions_filter_include` block from now on in
 
 ## 5.7.0
 
-[View all changes from v5.6.10...v5.7.0](https://github.com/shopware/shopware/compare/v5.6.10...v5.7.0)
+[View all changes from v5.6.10...v5.7.0](https://github.com/shopware5/shopware/compare/v5.6.10...v5.7.0)
 
 ### Breaks
 
diff --git a/_sql/migrations/101-add-extended-editor-field.php b/_sql/migrations/101-add-extended-editor-field.php
index cceb50835b4..0f10e8b550f 100644
--- a/_sql/migrations/101-add-extended-editor-field.php
+++ b/_sql/migrations/101-add-extended-editor-field.php
@@ -1,5 +1,30 @@
 <?php
-class Migrations_Migration101 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration101 extends AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/102-add-new-emotions.php b/_sql/migrations/102-add-new-emotions.php
index 8fd5d5badc6..54e2b51ce53 100644
--- a/_sql/migrations/102-add-new-emotions.php
+++ b/_sql/migrations/102-add-new-emotions.php
@@ -1,5 +1,30 @@
 <?php
-class Migrations_Migration102 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration102 extends AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/103-add-field-blog-teaser.php b/_sql/migrations/103-add-field-blog-teaser.php
index b1eb15b051c..20b0fb03216 100644
--- a/_sql/migrations/103-add-field-blog-teaser.php
+++ b/_sql/migrations/103-add-field-blog-teaser.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration103 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration103 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/104-add-field-blog-thumbnail-size.php b/_sql/migrations/104-add-field-blog-thumbnail-size.php
index c03c4fa2300..b16455503a9 100644
--- a/_sql/migrations/104-add-field-blog-thumbnail-size.php
+++ b/_sql/migrations/104-add-field-blog-thumbnail-size.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration104 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration104 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/105-s_core_sessions_backend.php b/_sql/migrations/105-s_core_sessions_backend.php
index 76ec88fb25a..a07800c9094 100644
--- a/_sql/migrations/105-s_core_sessions_backend.php
+++ b/_sql/migrations/105-s_core_sessions_backend.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration105 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration105 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/106-add-path-to-categories.php b/_sql/migrations/106-add-path-to-categories.php
index 3817985bff9..fee22984de1 100644
--- a/_sql/migrations/106-add-path-to-categories.php
+++ b/_sql/migrations/106-add-path-to-categories.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration106 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration106 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/107-remove-legacy-cache-config.php b/_sql/migrations/107-remove-legacy-cache-config.php
index 16097986182..163fac8919d 100644
--- a/_sql/migrations/107-remove-legacy-cache-config.php
+++ b/_sql/migrations/107-remove-legacy-cache-config.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration107 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration107 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/108-add-category-listing-indexes.php b/_sql/migrations/108-add-category-listing-indexes.php
index 110175f99e5..f1275d47095 100644
--- a/_sql/migrations/108-add-category-listing-indexes.php
+++ b/_sql/migrations/108-add-category-listing-indexes.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration108 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration108 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/109-add-translations.php b/_sql/migrations/109-add-translations.php
index 55ec7da950d..7879e899909 100644
--- a/_sql/migrations/109-add-translations.php
+++ b/_sql/migrations/109-add-translations.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration109 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration109 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/110-add-disabled-cache-field.php b/_sql/migrations/110-add-disabled-cache-field.php
index 3843411abba..4a4af9aaad0 100644
--- a/_sql/migrations/110-add-disabled-cache-field.php
+++ b/_sql/migrations/110-add-disabled-cache-field.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration110 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration110 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/111-add-password-encoder.php b/_sql/migrations/111-add-password-encoder.php
index 3ce4792abaf..e4b2bcb68e0 100644
--- a/_sql/migrations/111-add-password-encoder.php
+++ b/_sql/migrations/111-add-password-encoder.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration111 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration111 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/112-link-cache-menu-to-the-new-performance-module.php b/_sql/migrations/112-link-cache-menu-to-the-new-performance-module.php
index d893b9ab901..d9711e83d91 100644
--- a/_sql/migrations/112-link-cache-menu-to-the-new-performance-module.php
+++ b/_sql/migrations/112-link-cache-menu-to-the-new-performance-module.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration112 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration112 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/113-adds-performance-sql.php b/_sql/migrations/113-adds-performance-sql.php
index f5e1c0e4e15..34ec367f6e6 100644
--- a/_sql/migrations/113-adds-performance-sql.php
+++ b/_sql/migrations/113-adds-performance-sql.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration113 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration113 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/114-add-new-top-seller.php b/_sql/migrations/114-add-new-top-seller.php
index be471c01ee6..a347293b0db 100644
--- a/_sql/migrations/114-add-new-top-seller.php
+++ b/_sql/migrations/114-add-new-top-seller.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration114 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration114 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/115-add-denormalized-category-table.php b/_sql/migrations/115-add-denormalized-category-table.php
index 3a4a6c07c47..d03b94930ae 100644
--- a/_sql/migrations/115-add-denormalized-category-table.php
+++ b/_sql/migrations/115-add-denormalized-category-table.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration115 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration115 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/116-optimize-emotion-queries.php b/_sql/migrations/116-optimize-emotion-queries.php
index 4ebba617efb..440a2e36700 100644
--- a/_sql/migrations/116-optimize-emotion-queries.php
+++ b/_sql/migrations/116-optimize-emotion-queries.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration116 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration116 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/117-add-article-detail-page-indexes.php b/_sql/migrations/117-add-article-detail-page-indexes.php
index fe9d37e9635..1484d7ec201 100644
--- a/_sql/migrations/117-add-article-detail-page-indexes.php
+++ b/_sql/migrations/117-add-article-detail-page-indexes.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration117 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration117 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/118-optimize-property-backend-queries.php b/_sql/migrations/118-optimize-property-backend-queries.php
index 61b771d8362..214d5d9926e 100644
--- a/_sql/migrations/118-optimize-property-backend-queries.php
+++ b/_sql/migrations/118-optimize-property-backend-queries.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration118 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration118 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/119-add-batchmode-option.php b/_sql/migrations/119-add-batchmode-option.php
index 14bf6853429..a17ead88f4e 100644
--- a/_sql/migrations/119-add-batchmode-option.php
+++ b/_sql/migrations/119-add-batchmode-option.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration119 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration119 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/120-add-cache-log.php b/_sql/migrations/120-add-cache-log.php
index c224476fd57..6b34a84fe0b 100644
--- a/_sql/migrations/120-add-cache-log.php
+++ b/_sql/migrations/120-add-cache-log.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration120 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration120 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/1200-add-productbox-for-manufacturer.php b/_sql/migrations/1200-add-productbox-for-manufacturer.php
index f2a9527ceda..2f882fe4c6b 100644
--- a/_sql/migrations/1200-add-productbox-for-manufacturer.php
+++ b/_sql/migrations/1200-add-productbox-for-manufacturer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1200 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/1201-remove-secure-shop-config.php b/_sql/migrations/1201-remove-secure-shop-config.php
index 2c6920fe5ec..82d830ac812 100644
--- a/_sql/migrations/1201-remove-secure-shop-config.php
+++ b/_sql/migrations/1201-remove-secure-shop-config.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1201 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/1202-remove-maxpages-formelement.php b/_sql/migrations/1202-remove-maxpages-formelement.php
index ce263b6413b..d2996e70939 100644
--- a/_sql/migrations/1202-remove-maxpages-formelement.php
+++ b/_sql/migrations/1202-remove-maxpages-formelement.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1202 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/1203-remove-blog-indexpage-configuration.php b/_sql/migrations/1203-remove-blog-indexpage-configuration.php
index 11039620d02..b32e3a884f9 100644
--- a/_sql/migrations/1203-remove-blog-indexpage-configuration.php
+++ b/_sql/migrations/1203-remove-blog-indexpage-configuration.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1203 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/1204-add-variant-filter.php b/_sql/migrations/1204-add-variant-filter.php
index 20542990bfc..0c99593db0f 100644
--- a/_sql/migrations/1204-add-variant-filter.php
+++ b/_sql/migrations/1204-add-variant-filter.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1204 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
@@ -66,7 +67,7 @@ private function importFacetTranslations($facetId)
                 } else {
                     $unserialized = unserialize($customFacetTranslations['objectdata']);
 
-                    if (array_key_exists($facetId, $unserialized)) {
+                    if (\array_key_exists($facetId, $unserialized)) {
                         continue;
                     }
 
diff --git a/_sql/migrations/1205-remove-canonical-http-setting.php b/_sql/migrations/1205-remove-canonical-http-setting.php
index 574742a53c7..1f206d7b987 100644
--- a/_sql/migrations/1205-remove-canonical-http-setting.php
+++ b/_sql/migrations/1205-remove-canonical-http-setting.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1205 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/1206-add-laststock-field-to-variants.php b/_sql/migrations/1206-add-laststock-field-to-variants.php
index 18964f4a8a3..43b8222e110 100644
--- a/_sql/migrations/1206-add-laststock-field-to-variants.php
+++ b/_sql/migrations/1206-add-laststock-field-to-variants.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
@@ -34,7 +34,7 @@ public function up($modus)
         // Try/Catches are necessary to allow multiple runs of this migration
         try {
             $this->connection->exec('ALTER TABLE `s_articles_details` ADD `laststock` INT(1) NOT NULL DEFAULT 0 AFTER `stockmin`');
-        } catch (\PDOException $ex) {
+        } catch (PDOException $ex) {
             // This code says the column already exists, we want only all other exceptions to be raised
             if ($ex->getCode() !== '42S21') {
                 throw $ex;
@@ -43,7 +43,7 @@ public function up($modus)
 
         try {
             $this->connection->exec('ALTER TABLE `s_article_configurator_options` ADD `media_id` int(11) NULL');
-        } catch (\PDOException $ex) {
+        } catch (PDOException $ex) {
             // This code says the column already exists, we want only all other exceptions to be raised
             if ($ex->getCode() !== '42S21') {
                 throw $ex;
diff --git a/_sql/migrations/1207-add-new-seo-alias-for-variants.php b/_sql/migrations/1207-add-new-seo-alias-for-variants.php
index 3bd3230bdef..104f8e97cbe 100644
--- a/_sql/migrations/1207-add-new-seo-alias-for-variants.php
+++ b/_sql/migrations/1207-add-new-seo-alias-for-variants.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
diff --git a/_sql/migrations/1208-add-checkout-seo-routes.php b/_sql/migrations/1208-add-checkout-seo-routes.php
index 0b2bad2a3db..4e029f3c30d 100644
--- a/_sql/migrations/1208-add-checkout-seo-routes.php
+++ b/_sql/migrations/1208-add-checkout-seo-routes.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1208 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/1209-add-error-mail-log-level-config-option.php b/_sql/migrations/1209-add-error-mail-log-level-config-option.php
index 77237a6d48d..cacced3afd8 100644
--- a/_sql/migrations/1209-add-error-mail-log-level-config-option.php
+++ b/_sql/migrations/1209-add-error-mail-log-level-config-option.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
diff --git a/_sql/migrations/121-fix-cache-label.php b/_sql/migrations/121-fix-cache-label.php
index 137bd591dd6..0ca145ce521 100644
--- a/_sql/migrations/121-fix-cache-label.php
+++ b/_sql/migrations/121-fix-cache-label.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration121 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration121 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/1210-fix-config-table-index.php b/_sql/migrations/1210-fix-config-table-index.php
index 97e896eca4b..d5e3fdf3f93 100644
--- a/_sql/migrations/1210-fix-config-table-index.php
+++ b/_sql/migrations/1210-fix-config-table-index.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
diff --git a/_sql/migrations/1211-change-description-of-article-cover-setting.php b/_sql/migrations/1211-change-description-of-article-cover-setting.php
index 988834a246b..ca54ea66927 100644
--- a/_sql/migrations/1211-change-description-of-article-cover-setting.php
+++ b/_sql/migrations/1211-change-description-of-article-cover-setting.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1211 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/1212-correct-typo-in-newsletter-backend-config.php b/_sql/migrations/1212-correct-typo-in-newsletter-backend-config.php
index a8ec63917e0..a55493ac93c 100644
--- a/_sql/migrations/1212-correct-typo-in-newsletter-backend-config.php
+++ b/_sql/migrations/1212-correct-typo-in-newsletter-backend-config.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1212 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
@@ -39,7 +40,7 @@ public function up($modus)
         $this->addSql($sql);
 
         $sql = <<<'EOD'
-INSERT IGNORE INTO `s_core_config_element_translations` 
+INSERT IGNORE INTO `s_core_config_element_translations`
     (`element_id`, `locale_id`, `label`, `description`)
 VALUES
     (@elementId, '2', 'Use captcha for newsletter', 'The selected captcha method is used in the newsletter registration in the frontend.');
diff --git a/_sql/migrations/1213-add-laststock-on-variant-template-generation.php b/_sql/migrations/1213-add-laststock-on-variant-template-generation.php
index 87f708a6cca..fac3d26f409 100644
--- a/_sql/migrations/1213-add-laststock-on-variant-template-generation.php
+++ b/_sql/migrations/1213-add-laststock-on-variant-template-generation.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1213 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/1214-improve-email-header-field.php b/_sql/migrations/1214-improve-email-header-field.php
index 647bde95828..e6901635c23 100644
--- a/_sql/migrations/1214-improve-email-header-field.php
+++ b/_sql/migrations/1214-improve-email-header-field.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1214 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
@@ -45,7 +46,7 @@ public function up($modus)
 AND form_id = @formId;
 SQL;
 
-        $sql = sprintf($sql, 's:' . strlen(stripslashes($value)) . ':"' . $value . '";');
+        $sql = \sprintf($sql, 's:' . \strlen(stripslashes($value)) . ':"' . $value . '";');
 
         $this->addSql($sql);
     }
diff --git a/_sql/migrations/1215-form-active-status.php b/_sql/migrations/1215-form-active-status.php
index 098cf616f0a..7a86aaf9abf 100644
--- a/_sql/migrations/1215-form-active-status.php
+++ b/_sql/migrations/1215-form-active-status.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1215 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1216-remove-shopware-connect-menu.php b/_sql/migrations/1216-remove-shopware-connect-menu.php
index a385ab303a9..e59ae5dcdd5 100644
--- a/_sql/migrations/1216-remove-shopware-connect-menu.php
+++ b/_sql/migrations/1216-remove-shopware-connect-menu.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1216 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1217-change-smtp-password-fieldtype.php b/_sql/migrations/1217-change-smtp-password-fieldtype.php
index 8a8eeed2744..ec6fe20a47f 100644
--- a/_sql/migrations/1217-change-smtp-password-fieldtype.php
+++ b/_sql/migrations/1217-change-smtp-password-fieldtype.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1217 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
@@ -31,7 +32,7 @@ public function up($modus)
                 'autocomplete' => 'off',
             ],
         ]);
-        $sql = sprintf(
+        $sql = \sprintf(
             "UPDATE `s_core_config_elements` SET options = '%s' WHERE name = 'mailer_password' AND options IS NULL;",
             $inputType
         );
diff --git a/_sql/migrations/1218-change-privacy-options.php b/_sql/migrations/1218-change-privacy-options.php
index f9b5f4f8f64..7753ed6cb99 100644
--- a/_sql/migrations/1218-change-privacy-options.php
+++ b/_sql/migrations/1218-change-privacy-options.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1218 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/1219-add-cron-for-personal-data-cleanup.php b/_sql/migrations/1219-add-cron-for-personal-data-cleanup.php
index 05a6cf46328..85c14073215 100644
--- a/_sql/migrations/1219-add-cron-for-personal-data-cleanup.php
+++ b/_sql/migrations/1219-add-cron-for-personal-data-cleanup.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1219 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
@@ -46,7 +47,7 @@ public function up($modus)
         $this->addSql('SET @elementId = LAST_INSERT_ID();');
 
         $sql = <<<'EOD'
-INSERT IGNORE INTO `s_core_config_element_translations` 
+INSERT IGNORE INTO `s_core_config_element_translations`
     (`element_id`, `locale_id`, `label`, `description`)
 VALUES
     (@elementId, '2', 'Delete accountless customers without orders after x months', 'The cronjob \"Guest customer cleanup\" must be active');
diff --git a/_sql/migrations/122-optimize-search-index-queries.php b/_sql/migrations/122-optimize-search-index-queries.php
index 460897c55d3..774893ac95d 100644
--- a/_sql/migrations/122-optimize-search-index-queries.php
+++ b/_sql/migrations/122-optimize-search-index-queries.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration122 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration122 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/1221-add-double-opt-in-dates.php b/_sql/migrations/1221-add-double-opt-in-dates.php
index 12fa7813146..9da1bcc6e32 100644
--- a/_sql/migrations/1221-add-double-opt-in-dates.php
+++ b/_sql/migrations/1221-add-double-opt-in-dates.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1221 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1222-privacy-checkbox-note.php b/_sql/migrations/1222-privacy-checkbox-note.php
index a1b31005395..ff84515e611 100644
--- a/_sql/migrations/1222-privacy-checkbox-note.php
+++ b/_sql/migrations/1222-privacy-checkbox-note.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1222 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1223-add-ip-anonymization.php b/_sql/migrations/1223-add-ip-anonymization.php
index 02d04d0ff49..57c8de1f95d 100644
--- a/_sql/migrations/1223-add-ip-anonymization.php
+++ b/_sql/migrations/1223-add-ip-anonymization.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1223 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1224-cleanup-optin-table.php b/_sql/migrations/1224-cleanup-optin-table.php
index 7413de664e7..bf793c14044 100644
--- a/_sql/migrations/1224-cleanup-optin-table.php
+++ b/_sql/migrations/1224-cleanup-optin-table.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1224 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1225-add-double-opt-in-register.php b/_sql/migrations/1225-add-double-opt-in-register.php
index 17184951974..c2fad53a406 100644
--- a/_sql/migrations/1225-add-double-opt-in-register.php
+++ b/_sql/migrations/1225-add-double-opt-in-register.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1225 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1226-add-blog-comment-mailtemplate.php b/_sql/migrations/1226-add-blog-comment-mailtemplate.php
index e412c05601c..bc292aa09b8 100644
--- a/_sql/migrations/1226-add-blog-comment-mailtemplate.php
+++ b/_sql/migrations/1226-add-blog-comment-mailtemplate.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1226 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
@@ -41,7 +42,7 @@ public function up($modus)
         if ($modus === self::MODUS_UPDATE) {
             // Insert for every subshop whichs setting was 'on' (standard)
             $sql = "INSERT INTO `s_core_config_values` (`element_id`, `shop_id`, `value`)
-                    SELECT 
+                    SELECT
                       @optinid,
                       `id`,
                       'b:1;'
diff --git a/_sql/migrations/1227-change-minimum-order-surcharge.php b/_sql/migrations/1227-change-minimum-order-surcharge.php
index 44a340b4c09..e2cf7d91c87 100644
--- a/_sql/migrations/1227-change-minimum-order-surcharge.php
+++ b/_sql/migrations/1227-change-minimum-order-surcharge.php
@@ -1,31 +1,32 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1227 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
-        if (self::MODUS_INSTALL === $modus) {
+        if ($modus === self::MODUS_INSTALL) {
             $this->addSql("SET @customergroupId = ( SELECT id FROM `s_core_customergroups` WHERE groupkey = 'EK' LIMIT 1 );");
             $this->addSql("UPDATE `s_core_customergroups` SET `minimumorder` = '0', `minimumordersurcharge` = '0' WHERE `id` = @customergroupId;");
         }
diff --git a/_sql/migrations/1228-soptinregister-english-on-update.php b/_sql/migrations/1228-soptinregister-english-on-update.php
index d3edf148148..3414698d3d9 100644
--- a/_sql/migrations/1228-soptinregister-english-on-update.php
+++ b/_sql/migrations/1228-soptinregister-english-on-update.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1228 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
@@ -28,16 +29,16 @@ public function up($modus)
         if ($modus === self::MODUS_UPDATE) {
             // Store localePrefix
             $sql =
-                "SET @localePrefix = (
-                    SELECT MID(`locale`, 1, 2) AS localePrefix
-                    FROM `s_core_locales`
-                    WHERE `id` = (
-                        SELECT locale_id
-                        FROM `s_core_shops`
-                        WHERE `default` = '1'
-                        LIMIT 1
-                    )
-                    LIMIT 1
+                "SET @localePrefix = (
+                    SELECT MID(`locale`, 1, 2) AS localePrefix
+                    FROM `s_core_locales`
+                    WHERE `id` = (
+                        SELECT locale_id
+                        FROM `s_core_shops`
+                        WHERE `default` = '1'
+                        LIMIT 1
+                    )
+                    LIMIT 1
                 );";
             $this->addSql($sql);
 
diff --git a/_sql/migrations/1229-accountless-optin-switch.php b/_sql/migrations/1229-accountless-optin-switch.php
index 71ebb990196..c7311ec82b5 100644
--- a/_sql/migrations/1229-accountless-optin-switch.php
+++ b/_sql/migrations/1229-accountless-optin-switch.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1229 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
@@ -71,7 +72,7 @@ public function up($modus)
     '{config name=shopName}',
     'Bitte bestätigen Sie Ihre E-Mail-Adresse für Ihre Bestellung bei {config name=shopName}',
     '{include file="string:{config name=emailheaderplain}"}
-    
+
 Hallo,
 
 Bitte bestätigen Sie Ihre E-Mail-Adresse über den nachfolgenden Link:
diff --git a/_sql/migrations/123-add-dummy-plugins.php b/_sql/migrations/123-add-dummy-plugins.php
index b76e660d341..9a90da057a0 100644
--- a/_sql/migrations/123-add-dummy-plugins.php
+++ b/_sql/migrations/123-add-dummy-plugins.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration123 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration123 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/1230-add-cookie-removal.php b/_sql/migrations/1230-add-cookie-removal.php
index 580a5be7710..10c2f29f569 100644
--- a/_sql/migrations/1230-add-cookie-removal.php
+++ b/_sql/migrations/1230-add-cookie-removal.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1230 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1231-add-description-to-hideNoInStock-config-element.php b/_sql/migrations/1231-add-description-to-hideNoInStock-config-element.php
index 4279b6d627e..1dcac5fac64 100644
--- a/_sql/migrations/1231-add-description-to-hideNoInStock-config-element.php
+++ b/_sql/migrations/1231-add-description-to-hideNoInStock-config-element.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1231 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/124-remove-router-url-cache.php b/_sql/migrations/124-remove-router-url-cache.php
index 40c5bdddb2f..83ac50d868d 100644
--- a/_sql/migrations/124-remove-router-url-cache.php
+++ b/_sql/migrations/124-remove-router-url-cache.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration124 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration124 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/125-adds-filter-performance-sql.php b/_sql/migrations/125-adds-filter-performance-sql.php
index 79ca6493835..e41e69c8db4 100644
--- a/_sql/migrations/125-adds-filter-performance-sql.php
+++ b/_sql/migrations/125-adds-filter-performance-sql.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration125 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration125 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/126-update-cache-menu-items.php b/_sql/migrations/126-update-cache-menu-items.php
index dbf3bd65a12..49bdb24d34e 100644
--- a/_sql/migrations/126-update-cache-menu-items.php
+++ b/_sql/migrations/126-update-cache-menu-items.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration126 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration126 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/127-install-http-plugin.php b/_sql/migrations/127-install-http-plugin.php
index 7645d258c12..e61a21b39e9 100644
--- a/_sql/migrations/127-install-http-plugin.php
+++ b/_sql/migrations/127-install-http-plugin.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration127 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration127 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/128-adds-community-store-resource.php b/_sql/migrations/128-adds-community-store-resource.php
index ad14ec070b1..99412933bc9 100644
--- a/_sql/migrations/128-adds-community-store-resource.php
+++ b/_sql/migrations/128-adds-community-store-resource.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration128 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration128 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/129-fix-mailer-config-help-text-typo.php b/_sql/migrations/129-fix-mailer-config-help-text-typo.php
index 01ac1010c37..d95c4a5fa91 100644
--- a/_sql/migrations/129-fix-mailer-config-help-text-typo.php
+++ b/_sql/migrations/129-fix-mailer-config-help-text-typo.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration129 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration129 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/130-fix-typo-in-no-script-notices-snippet.php b/_sql/migrations/130-fix-typo-in-no-script-notices-snippet.php
index 9cb99481e0f..fc7ea7858a8 100644
--- a/_sql/migrations/130-fix-typo-in-no-script-notices-snippet.php
+++ b/_sql/migrations/130-fix-typo-in-no-script-notices-snippet.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration130 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration130 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/131-add-top-seller-index.php b/_sql/migrations/131-add-top-seller-index.php
index a54e420d7f3..62be6fcdee8 100644
--- a/_sql/migrations/131-add-top-seller-index.php
+++ b/_sql/migrations/131-add-top-seller-index.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration131 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration131 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/132-remove-similar-shown-listener.php b/_sql/migrations/132-remove-similar-shown-listener.php
index 7d4661dff77..7f2d2c2b5bb 100644
--- a/_sql/migrations/132-remove-similar-shown-listener.php
+++ b/_sql/migrations/132-remove-similar-shown-listener.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration132 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration132 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/133-add-esd-payment-status-config.php b/_sql/migrations/133-add-esd-payment-status-config.php
index 1a1e5966efb..bc05439c71d 100644
--- a/_sql/migrations/133-add-esd-payment-status-config.php
+++ b/_sql/migrations/133-add-esd-payment-status-config.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration133 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration133 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/134-add-http-cache-cleanup-cronjob.php b/_sql/migrations/134-add-http-cache-cleanup-cronjob.php
index 8a175048a0b..4cbf24dbe07 100644
--- a/_sql/migrations/134-add-http-cache-cleanup-cronjob.php
+++ b/_sql/migrations/134-add-http-cache-cleanup-cronjob.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration134 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration134 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/135-add-main-image-listing-config.php b/_sql/migrations/135-add-main-image-listing-config.php
index 9f7aa838d2e..cb23f9ad58e 100644
--- a/_sql/migrations/135-add-main-image-listing-config.php
+++ b/_sql/migrations/135-add-main-image-listing-config.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration135 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration135 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/136-add-send-order-mail-config.php b/_sql/migrations/136-add-send-order-mail-config.php
index d7c91cd5904..944e6980152 100644
--- a/_sql/migrations/136-add-send-order-mail-config.php
+++ b/_sql/migrations/136-add-send-order-mail-config.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration136 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration136 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/137-remove-lastarticles-save-time.php b/_sql/migrations/137-remove-lastarticles-save-time.php
index ee5139d77e3..1c185c1e62c 100644
--- a/_sql/migrations/137-remove-lastarticles-save-time.php
+++ b/_sql/migrations/137-remove-lastarticles-save-time.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration137 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration137 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/138-fix-typo-last-articles-headline.php b/_sql/migrations/138-fix-typo-last-articles-headline.php
index 17b36a229b0..4ce3a58eb71 100644
--- a/_sql/migrations/138-fix-typo-last-articles-headline.php
+++ b/_sql/migrations/138-fix-typo-last-articles-headline.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration138 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration138 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/139-remove-plugin-form-from-config.php b/_sql/migrations/139-remove-plugin-form-from-config.php
index b3d5b5259f6..833d4a6a867 100644
--- a/_sql/migrations/139-remove-plugin-form-from-config.php
+++ b/_sql/migrations/139-remove-plugin-form-from-config.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration139 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration139 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/140-fix-emotion-grid-id.php b/_sql/migrations/140-fix-emotion-grid-id.php
index 28e4c6e2e38..eb8d5bbebc7 100644
--- a/_sql/migrations/140-fix-emotion-grid-id.php
+++ b/_sql/migrations/140-fix-emotion-grid-id.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration140 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration140 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -11,6 +34,3 @@ public function up($modus)
         $this->addSql($sql);
     }
 }
-
-
-
diff --git a/_sql/migrations/1400-add-benchmark-config-table.php b/_sql/migrations/1400-add-benchmark-config-table.php
index 6549007b849..6a1b431c901 100644
--- a/_sql/migrations/1400-add-benchmark-config-table.php
+++ b/_sql/migrations/1400-add-benchmark-config-table.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1400 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1401-add-benchmark-menu.php b/_sql/migrations/1401-add-benchmark-menu.php
index ae91f662ac7..d60b724740c 100644
--- a/_sql/migrations/1401-add-benchmark-menu.php
+++ b/_sql/migrations/1401-add-benchmark-menu.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1401 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1402-add-benchmark-teaser-config.php b/_sql/migrations/1402-add-benchmark-teaser-config.php
index 74f466a3556..6a839a6d269 100644
--- a/_sql/migrations/1402-add-benchmark-teaser-config.php
+++ b/_sql/migrations/1402-add-benchmark-teaser-config.php
@@ -1,33 +1,34 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1402 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
         $sql = <<<SQL
     INSERT IGNORE INTO `s_core_config_elements` (`id`, `form_id`, `name`, `value`, `label`, `description`, `type`, `required`, `position`, `scope`, `options`)
-    VALUES 
+    VALUES
     (NULL, 0, 'benchmarkTeaser', 'b:1;', 'Teaser zur Shopware BI', NULL, 'boolean', 0, 0, 0, NULL)
 SQL;
         $this->addSql($sql);
diff --git a/_sql/migrations/1403-implement-document-type-key.php b/_sql/migrations/1403-implement-document-type-key.php
index fdc826958b6..3e8a0bebef7 100644
--- a/_sql/migrations/1403-implement-document-type-key.php
+++ b/_sql/migrations/1403-implement-document-type-key.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1403 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1404-remove-language-distinction-from-shop-pages.php b/_sql/migrations/1404-remove-language-distinction-from-shop-pages.php
index deecbba0a96..f0cfaffec1a 100644
--- a/_sql/migrations/1404-remove-language-distinction-from-shop-pages.php
+++ b/_sql/migrations/1404-remove-language-distinction-from-shop-pages.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1404 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1405-add-es-backend-backlog.php b/_sql/migrations/1405-add-es-backend-backlog.php
index 19085b2ead7..e5d4958c5b2 100644
--- a/_sql/migrations/1405-add-es-backend-backlog.php
+++ b/_sql/migrations/1405-add-es-backend-backlog.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1405 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
@@ -31,7 +32,7 @@ public function up($modus)
   `entity` varchar(500) NOT NULL,
   `entity_id` int NOT NULL,
   `time` datetime NOT NULL
-);    
+);
 EOF;
 
         $this->addSql($sql);
diff --git a/_sql/migrations/1406-add-changed-timestamp-columns.php b/_sql/migrations/1406-add-changed-timestamp-columns.php
index f8329f2d134..64d15db7ca6 100644
--- a/_sql/migrations/1406-add-changed-timestamp-columns.php
+++ b/_sql/migrations/1406-add-changed-timestamp-columns.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
diff --git a/_sql/migrations/1407-add-english-translations.php b/_sql/migrations/1407-add-english-translations.php
index b9e0546cc2c..8ec8a774c4e 100644
--- a/_sql/migrations/1407-add-english-translations.php
+++ b/_sql/migrations/1407-add-english-translations.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1407 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1408-proportional-tax-calculation.php b/_sql/migrations/1408-proportional-tax-calculation.php
index 22e7e98baa5..6989deade6f 100644
--- a/_sql/migrations/1408-proportional-tax-calculation.php
+++ b/_sql/migrations/1408-proportional-tax-calculation.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1408 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1409-add-shipping-tax-column.php b/_sql/migrations/1409-add-shipping-tax-column.php
index d0c599b96ee..f28acf2d7bc 100644
--- a/_sql/migrations/1409-add-shipping-tax-column.php
+++ b/_sql/migrations/1409-add-shipping-tax-column.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1409 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/141-add-force-canonical-http-config.php b/_sql/migrations/141-add-force-canonical-http-config.php
index 3fc8666b962..35988441f9a 100644
--- a/_sql/migrations/141-add-force-canonical-http-config.php
+++ b/_sql/migrations/141-add-force-canonical-http-config.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration141 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration141 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -18,6 +41,3 @@ public function up($modus)
         $this->addSql($sql);
     }
 }
-
-
-
diff --git a/_sql/migrations/1410-add-sqli-privilege.php b/_sql/migrations/1410-add-sqli-privilege.php
index c471f7ee27f..fed10ef0ac6 100644
--- a/_sql/migrations/1410-add-sqli-privilege.php
+++ b/_sql/migrations/1410-add-sqli-privilege.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1410 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1411-change-order-documents-key.php b/_sql/migrations/1411-change-order-documents-key.php
index d6ba56f4cec..306b6d85ae5 100644
--- a/_sql/migrations/1411-change-order-documents-key.php
+++ b/_sql/migrations/1411-change-order-documents-key.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1411 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1413-href-lang-configuration.php b/_sql/migrations/1413-href-lang-configuration.php
index 99a814c42b6..39c3cc3b1b2 100644
--- a/_sql/migrations/1413-href-lang-configuration.php
+++ b/_sql/migrations/1413-href-lang-configuration.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1413 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1414-add-statistics-acl-role.php b/_sql/migrations/1414-add-statistics-acl-role.php
index 2dd19854319..5d8252c65ce 100644
--- a/_sql/migrations/1414-add-statistics-acl-role.php
+++ b/_sql/migrations/1414-add-statistics-acl-role.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1414 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
@@ -30,7 +31,7 @@ public function up($modus)
 
         // Fetch id for later use
         $this->addSql(
-            sprintf(
+            \sprintf(
                 'SET @resourceId = (%s);',
                 "SELECT id FROM `s_core_acl_resources` WHERE name = 'benchmark' LIMIT 1"
             )
diff --git a/_sql/migrations/1415-add-necessary-columns-to-bi.php b/_sql/migrations/1415-add-necessary-columns-to-bi.php
index 6620a14bb62..78cf84247e0 100644
--- a/_sql/migrations/1415-add-necessary-columns-to-bi.php
+++ b/_sql/migrations/1415-add-necessary-columns-to-bi.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1415 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1416-add-article-detail-id-to-s-order-details.php b/_sql/migrations/1416-add-article-detail-id-to-s-order-details.php
index 62155a6d357..76b6c513890 100644
--- a/_sql/migrations/1416-add-article-detail-id-to-s-order-details.php
+++ b/_sql/migrations/1416-add-article-detail-id-to-s-order-details.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1416 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
diff --git a/_sql/migrations/1418-add-sitemap-configuration.php b/_sql/migrations/1418-add-sitemap-configuration.php
index 6604bed7bc7..c9a5cb32893 100644
--- a/_sql/migrations/1418-add-sitemap-configuration.php
+++ b/_sql/migrations/1418-add-sitemap-configuration.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1418 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1419-add-cron-for-personal-data-cleanup.php b/_sql/migrations/1419-add-cron-for-personal-data-cleanup.php
index e30c129357a..7be42d944bf 100644
--- a/_sql/migrations/1419-add-cron-for-personal-data-cleanup.php
+++ b/_sql/migrations/1419-add-cron-for-personal-data-cleanup.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1419 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
@@ -55,7 +56,7 @@ public function up($modus)
         $this->addSql('SET @elementId = LAST_INSERT_ID();');
 
         $sql = <<<'EOD'
-INSERT IGNORE INTO `s_core_config_element_translations` 
+INSERT IGNORE INTO `s_core_config_element_translations`
     (`element_id`, `locale_id`, `label`, `description`)
 VALUES
     (@elementId, '2', 'Delete accountless customers without orders after x months', 'The cronjob \"Guest customer cleanup\" must be active');
diff --git a/_sql/migrations/142-add-listing-description-config.php b/_sql/migrations/142-add-listing-description-config.php
index 87b5317b3d0..65c453cb1dc 100644
--- a/_sql/migrations/142-add-listing-description-config.php
+++ b/_sql/migrations/142-add-listing-description-config.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration142 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration142 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/1421-add-double-opt-in-dates.php b/_sql/migrations/1421-add-double-opt-in-dates.php
index 35a661c89b6..3d981606c96 100644
--- a/_sql/migrations/1421-add-double-opt-in-dates.php
+++ b/_sql/migrations/1421-add-double-opt-in-dates.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1421 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
diff --git a/_sql/migrations/1422-privacy-checkbox-note.php b/_sql/migrations/1422-privacy-checkbox-note.php
index f24c3255437..482f388f481 100644
--- a/_sql/migrations/1422-privacy-checkbox-note.php
+++ b/_sql/migrations/1422-privacy-checkbox-note.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1422 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
diff --git a/_sql/migrations/1423-add-ip-anonymization.php b/_sql/migrations/1423-add-ip-anonymization.php
index ea048498192..79d3893d14f 100644
--- a/_sql/migrations/1423-add-ip-anonymization.php
+++ b/_sql/migrations/1423-add-ip-anonymization.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1423 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
diff --git a/_sql/migrations/1424-cleanup-optin-table.php b/_sql/migrations/1424-cleanup-optin-table.php
index 2c26d322bd6..aa337d8592c 100644
--- a/_sql/migrations/1424-cleanup-optin-table.php
+++ b/_sql/migrations/1424-cleanup-optin-table.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1424 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
diff --git a/_sql/migrations/1425-add-double-opt-in-register.php b/_sql/migrations/1425-add-double-opt-in-register.php
index 67c2c1c67f6..b5a8cc71882 100644
--- a/_sql/migrations/1425-add-double-opt-in-register.php
+++ b/_sql/migrations/1425-add-double-opt-in-register.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1425 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
diff --git a/_sql/migrations/1426-add-blog-comment-mailtemplate.php b/_sql/migrations/1426-add-blog-comment-mailtemplate.php
index 90d9211fe26..f4e065bcbdd 100644
--- a/_sql/migrations/1426-add-blog-comment-mailtemplate.php
+++ b/_sql/migrations/1426-add-blog-comment-mailtemplate.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1426 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
@@ -50,7 +51,7 @@ public function up($modus)
         if ($modus === self::MODUS_UPDATE) {
             // Insert for every subshop whichs setting was 'on' (standard)
             $sql = "INSERT INTO `s_core_config_values` (`element_id`, `shop_id`, `value`)
-                    SELECT 
+                    SELECT
                       @optinid,
                       `id`,
                       'b:1;'
diff --git a/_sql/migrations/1427-change-minimum-order-surcharge.php b/_sql/migrations/1427-change-minimum-order-surcharge.php
index b409dd85a98..0fc1f7ad71a 100644
--- a/_sql/migrations/1427-change-minimum-order-surcharge.php
+++ b/_sql/migrations/1427-change-minimum-order-surcharge.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1427 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
@@ -34,7 +35,7 @@ public function up($modus)
             return;
         }
 
-        if (self::MODUS_INSTALL === $modus) {
+        if ($modus === self::MODUS_INSTALL) {
             $this->addSql("SET @customergroupId = ( SELECT id FROM `s_core_customergroups` WHERE groupkey = 'EK' LIMIT 1 );");
             $this->addSql("UPDATE `s_core_customergroups` SET `minimumorder` = '0', `minimumordersurcharge` = '0' WHERE `id` = @customergroupId;");
         }
diff --git a/_sql/migrations/1428-soptinregister-english-on-update.php b/_sql/migrations/1428-soptinregister-english-on-update.php
index 9310235934a..5f0fa12bc8f 100644
--- a/_sql/migrations/1428-soptinregister-english-on-update.php
+++ b/_sql/migrations/1428-soptinregister-english-on-update.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1428 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
diff --git a/_sql/migrations/1429-accountless-optin-switch.php b/_sql/migrations/1429-accountless-optin-switch.php
index 219911c8e8d..2d85f39035d 100644
--- a/_sql/migrations/1429-accountless-optin-switch.php
+++ b/_sql/migrations/1429-accountless-optin-switch.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1429 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
diff --git a/_sql/migrations/143-deactivate-router-to-lower-scope.php b/_sql/migrations/143-deactivate-router-to-lower-scope.php
index 19604f57b5b..b632e00ea1f 100644
--- a/_sql/migrations/143-deactivate-router-to-lower-scope.php
+++ b/_sql/migrations/143-deactivate-router-to-lower-scope.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration143 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration143 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -16,6 +39,3 @@ public function up($modus)
         $this->addSql($sql);
     }
 }
-
-
-
diff --git a/_sql/migrations/1430-add-cookie-removal.php b/_sql/migrations/1430-add-cookie-removal.php
index bf8a8640aab..9fa93ae6073 100644
--- a/_sql/migrations/1430-add-cookie-removal.php
+++ b/_sql/migrations/1430-add-cookie-removal.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1430 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
diff --git a/_sql/migrations/1431-add-description-to-hideNoInStock-config-element.php b/_sql/migrations/1431-add-description-to-hideNoInStock-config-element.php
index 97d6ae5b330..6bd95fca525 100644
--- a/_sql/migrations/1431-add-description-to-hideNoInStock-config-element.php
+++ b/_sql/migrations/1431-add-description-to-hideNoInStock-config-element.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1431 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
@@ -58,4 +59,4 @@ public function up($modus)
 EOD;
         $this->addSql($sql);
     }
-}
\ No newline at end of file
+}
diff --git a/_sql/migrations/1432-improve-plugin-manager.php b/_sql/migrations/1432-improve-plugin-manager.php
index 27274b20be7..6b2cc576097 100644
--- a/_sql/migrations/1432-improve-plugin-manager.php
+++ b/_sql/migrations/1432-improve-plugin-manager.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1432 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1433-add-analytics-last-id.php b/_sql/migrations/1433-add-analytics-last-id.php
index 51e49c20148..f9d3507e5bd 100644
--- a/_sql/migrations/1433-add-analytics-last-id.php
+++ b/_sql/migrations/1433-add-analytics-last-id.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1433 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1434-add-href-default-selection.php b/_sql/migrations/1434-add-href-default-selection.php
index 1515c7a4a38..4ef22acae1a 100644
--- a/_sql/migrations/1434-add-href-default-selection.php
+++ b/_sql/migrations/1434-add-href-default-selection.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1434 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
@@ -39,6 +40,6 @@ public function up($modus)
 VALUES
 (@formId, 'hrefLangDefaultShop', 's:0:"";', 'href-lang Standardsprache', 'Gibt für diesen Shop "x-default" im href-lang-Tag aus und definiert damit die Sprache dieses Shops als Standardsprache.', 'combo', 0, 0, 0, '%s');
 EOD;
-        $this->addSql(sprintf($sql, serialize($settings)));
+        $this->addSql(\sprintf($sql, serialize($settings)));
     }
 }
diff --git a/_sql/migrations/1435-update-esd-helptext.php b/_sql/migrations/1435-update-esd-helptext.php
index ecbe13685a9..b9a83cd01fd 100644
--- a/_sql/migrations/1435-update-esd-helptext.php
+++ b/_sql/migrations/1435-update-esd-helptext.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1435 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1436-document-type-mail-templates.php b/_sql/migrations/1436-document-type-mail-templates.php
index 985442e246a..8391b3af9a2 100644
--- a/_sql/migrations/1436-document-type-mail-templates.php
+++ b/_sql/migrations/1436-document-type-mail-templates.php
@@ -1,27 +1,30 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
-class Migrations_Migration1436 extends Shopware\Components\Migrations\AbstractMigration
+
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration1436 extends AbstractMigration
 {
     /**
      * {@inheritdoc}
@@ -34,7 +37,7 @@ public function up($modus)
 
         try {
             $installationLanguage = $this->connection->query('SELECT LOWER(TRIM(`name`)) FROM `s_core_countries_areas` WHERE `id` = 1')->fetchColumn(0);
-        } catch (\Exception $ex) {
+        } catch (Exception $ex) {
             // Empty on purpose
         }
 
diff --git a/_sql/migrations/1437-add-bi-last-update-date-column.php b/_sql/migrations/1437-add-bi-last-update-date-column.php
index e8df36f6646..7827d8b72bb 100644
--- a/_sql/migrations/1437-add-bi-last-update-date-column.php
+++ b/_sql/migrations/1437-add-bi-last-update-date-column.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1437 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1438-add-bi-widgets.php b/_sql/migrations/1438-add-bi-widgets.php
index 83f2df36410..cfae8113a6f 100644
--- a/_sql/migrations/1438-add-bi-widgets.php
+++ b/_sql/migrations/1438-add-bi-widgets.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1438 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1439-change-back-document-id-to-tmp.php b/_sql/migrations/1439-change-back-document-id-to-tmp.php
index 7c70f370b34..6462440299a 100644
--- a/_sql/migrations/1439-change-back-document-id-to-tmp.php
+++ b/_sql/migrations/1439-change-back-document-id-to-tmp.php
@@ -1,27 +1,30 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
-class Migrations_Migration1439 extends Shopware\Components\Migrations\AbstractMigration
+
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration1439 extends AbstractMigration
 {
     public function up($modus)
     {
@@ -52,8 +55,8 @@ private function isMySql8()
         try {
             $result = $this->connection
                 ->query('SELECT @@version AS version')
-                ->fetch(\PDO::FETCH_COLUMN);
-        } catch (\Exception $exception) {
+                ->fetch(PDO::FETCH_COLUMN);
+        } catch (Exception $exception) {
             // Silent catch
         }
 
@@ -74,8 +77,8 @@ private function isIdUpperCase()
         try {
             $result = $this->connection
                 ->query('SHOW COLUMNS FROM `s_order_documents`')
-                ->fetchAll(\PDO::FETCH_ASSOC);
-        } catch (\Exception $exception) {
+                ->fetchAll(PDO::FETCH_ASSOC);
+        } catch (Exception $exception) {
             // Silent catch
         }
 
diff --git a/_sql/migrations/144-add-require-phone-field-config.php b/_sql/migrations/144-add-require-phone-field-config.php
index 399a0dbcc46..ffdd9f7900d 100644
--- a/_sql/migrations/144-add-require-phone-field-config.php
+++ b/_sql/migrations/144-add-require-phone-field-config.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration144 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration144 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/1440-change-document-id-to-lowercase.php b/_sql/migrations/1440-change-document-id-to-lowercase.php
index a8e006c2a12..ef6f11c4f1e 100644
--- a/_sql/migrations/1440-change-document-id-to-lowercase.php
+++ b/_sql/migrations/1440-change-document-id-to-lowercase.php
@@ -1,27 +1,30 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
-class Migrations_Migration1440 extends Shopware\Components\Migrations\AbstractMigration
+
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration1440 extends AbstractMigration
 {
     public function up($modus)
     {
@@ -55,8 +58,8 @@ private function isIdTemp()
         try {
             $result = $this->connection
                 ->query('SHOW COLUMNS FROM `s_order_documents`')
-                ->fetchAll(\PDO::FETCH_ASSOC);
-        } catch (\Exception $exception) {
+                ->fetchAll(PDO::FETCH_ASSOC);
+        } catch (Exception $exception) {
             // Silent catch
         }
 
diff --git a/_sql/migrations/1441-update-subshop-vote-description.php b/_sql/migrations/1441-update-subshop-vote-description.php
index b87dc7f8e8c..c7c4fcb0ad4 100644
--- a/_sql/migrations/1441-update-subshop-vote-description.php
+++ b/_sql/migrations/1441-update-subshop-vote-description.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1441 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1442-add-meta-description-config.php b/_sql/migrations/1442-add-meta-description-config.php
index bc65969521c..e700d219b7a 100644
--- a/_sql/migrations/1442-add-meta-description-config.php
+++ b/_sql/migrations/1442-add-meta-description-config.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1442 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1443-add-shipping-country-flag.php b/_sql/migrations/1443-add-shipping-country-flag.php
index 0202f9902c0..169afdd3edb 100644
--- a/_sql/migrations/1443-add-shipping-country-flag.php
+++ b/_sql/migrations/1443-add-shipping-country-flag.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1443 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1444-userfriendly-mail-options.php b/_sql/migrations/1444-userfriendly-mail-options.php
index 6221935d877..a6f01274d71 100644
--- a/_sql/migrations/1444-userfriendly-mail-options.php
+++ b/_sql/migrations/1444-userfriendly-mail-options.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1444 extends Shopware\Components\Migrations\AbstractMigration
 {
     private $mailer = [
@@ -46,8 +47,8 @@ class Migrations_Migration1444 extends Shopware\Components\Migrations\AbstractMi
 
     public function up($modus)
     {
-        $this->addSql(sprintf('UPDATE s_core_config_elements SET options = \'%s\', type = "combo", description = NULL WHERE `name` = "mailer_mailer"', serialize($this->mailer)));
-        $this->addSql(sprintf('UPDATE s_core_config_elements SET options = \'%s\', type = "combo", description = NULL WHERE `name` = "mailer_smtpsecure"', serialize($this->mailerSecure)));
-        $this->addSql(sprintf('UPDATE s_core_config_elements SET options = \'%s\', type = "combo", description = NULL WHERE `name` = "mailer_auth"', serialize($this->mailerAuth)));
+        $this->addSql(\sprintf('UPDATE s_core_config_elements SET options = \'%s\', type = "combo", description = NULL WHERE `name` = "mailer_mailer"', serialize($this->mailer)));
+        $this->addSql(\sprintf('UPDATE s_core_config_elements SET options = \'%s\', type = "combo", description = NULL WHERE `name` = "mailer_smtpsecure"', serialize($this->mailerSecure)));
+        $this->addSql(\sprintf('UPDATE s_core_config_elements SET options = \'%s\', type = "combo", description = NULL WHERE `name` = "mailer_auth"', serialize($this->mailerAuth)));
     }
 }
diff --git a/_sql/migrations/1445-add-delete-document-right.php b/_sql/migrations/1445-add-delete-document-right.php
index 7dea839f917..76cf2363a03 100644
--- a/_sql/migrations/1445-add-delete-document-right.php
+++ b/_sql/migrations/1445-add-delete-document-right.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1445 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1446-adjust-tracking-code-column-type.php b/_sql/migrations/1446-adjust-tracking-code-column-type.php
index 03bd7b07a61..977302020d7 100644
--- a/_sql/migrations/1446-adjust-tracking-code-column-type.php
+++ b/_sql/migrations/1446-adjust-tracking-code-column-type.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 use Shopware\Components\Migrations\AbstractMigration;
 
 class Migrations_Migration1446 extends AbstractMigration
diff --git a/_sql/migrations/1447-add-notification-attributes.php b/_sql/migrations/1447-add-notification-attributes.php
index 0f247ac9be3..96968c7c00c 100644
--- a/_sql/migrations/1447-add-notification-attributes.php
+++ b/_sql/migrations/1447-add-notification-attributes.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 use Shopware\Components\Migrations\AbstractMigration;
 
 class Migrations_Migration1447 extends AbstractMigration
diff --git a/_sql/migrations/1448-set-default-country-allow-shipping-true.php b/_sql/migrations/1448-set-default-country-allow-shipping-true.php
index 59e6e8ef6c6..772f7437056 100644
--- a/_sql/migrations/1448-set-default-country-allow-shipping-true.php
+++ b/_sql/migrations/1448-set-default-country-allow-shipping-true.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1448 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1449-add-shop-attributes-table.php b/_sql/migrations/1449-add-shop-attributes-table.php
index f1ae4c11947..83116b2f030 100644
--- a/_sql/migrations/1449-add-shop-attributes-table.php
+++ b/_sql/migrations/1449-add-shop-attributes-table.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1449 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/145-fix-default-incorrect-translation.php b/_sql/migrations/145-fix-default-incorrect-translation.php
index 271b3b68456..de3f0507a6e 100644
--- a/_sql/migrations/145-fix-default-incorrect-translation.php
+++ b/_sql/migrations/145-fix-default-incorrect-translation.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration145 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration145 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/1450-add-missing-countries.php b/_sql/migrations/1450-add-missing-countries.php
index 92d4a70a147..121a43a3ef1 100644
--- a/_sql/migrations/1450-add-missing-countries.php
+++ b/_sql/migrations/1450-add-missing-countries.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1450 extends Shopware\Components\Migrations\AbstractMigration
@@ -277,9 +277,7 @@ public function up($modus)
     }
 
     /**
-     * @param PDOStatement $statement
-     * @param array        $newCountry
-     * @param string       $defaultLocale
+     * @param string $defaultLocale
      */
     private function saveNewCountry(PDOStatement $statement, array $newCountry, $defaultLocale)
     {
diff --git a/_sql/migrations/1451-change-wiki-link.php b/_sql/migrations/1451-change-wiki-link.php
index dd73711d6a2..bf9fd9fd8d2 100644
--- a/_sql/migrations/1451-change-wiki-link.php
+++ b/_sql/migrations/1451-change-wiki-link.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1451 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/1452-change-laststock-filter.php b/_sql/migrations/1452-change-laststock-filter.php
index 37020f9c94b..1540419ec8b 100644
--- a/_sql/migrations/1452-change-laststock-filter.php
+++ b/_sql/migrations/1452-change-laststock-filter.php
@@ -1,33 +1,35 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-class Migrations_Migration1452 extends \Shopware\Components\Migrations\AbstractMigration
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration1452 extends AbstractMigration
 {
     public function up($modus)
     {
         $sql = <<<'SQL'
-UPDATE s_multi_edit_filter 
+UPDATE s_multi_edit_filter
 SET filter_string = "DETAIL.LASTSTOCK  ISTRUE and DETAIL.INSTOCK <= \"0\" AND ISMAIN"
 WHERE filter_string = "   ARTICLE.LASTSTOCK  ISTRUE and DETAIL.INSTOCK <= 0";
 SQL;
@@ -37,7 +39,7 @@ public function up($modus)
 WHERE `name` = "<b>Abverkauf</b><br><small>nicht auf Lager</small>";
 SQL;
         $sql3 = <<<'SQL'
-UPDATE s_multi_edit_filter 
+UPDATE s_multi_edit_filter
 SET description = "Abverkauf-Hauptartikel ohne Lagerbestand"
 WHERE description = "Abverkauf-Artikel ohne Lagerbestand";
 SQL;
diff --git a/_sql/migrations/1453-fix-extended-editor.php b/_sql/migrations/1453-fix-extended-editor.php
index 534072cb6c6..2b55d1f196c 100644
--- a/_sql/migrations/1453-fix-extended-editor.php
+++ b/_sql/migrations/1453-fix-extended-editor.php
@@ -1,33 +1,35 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-class Migrations_Migration1453 extends \Shopware\Components\Migrations\AbstractMigration
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration1453 extends AbstractMigration
 {
     public function up($modus)
     {
         $sql = <<<'SQL'
-            UPDATE s_core_auth 
+            UPDATE s_core_auth
             SET lockeduntil = "2010-01-01 00:00:00"
             WHERE lockeduntil = "0000-00-00 00:00:00";
 SQL;
diff --git a/_sql/migrations/1454-add-category-shop-association.php b/_sql/migrations/1454-add-category-shop-association.php
index 0b1c4635cf4..5f6be991eaf 100644
--- a/_sql/migrations/1454-add-category-shop-association.php
+++ b/_sql/migrations/1454-add-category-shop-association.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1454 extends Shopware\Components\Migrations\AbstractMigration
@@ -60,9 +60,9 @@ private function createBlogConfigForm()
         $this->addSql($sql);
 
         $sql = <<<'EOD'
-            INSERT IGNORE s_core_config_forms 
-                (`parent_id`, `name`, `label`, `description`, `position`, `plugin_id`) 
-            VALUE 
+            INSERT IGNORE s_core_config_forms
+                (`parent_id`, `name`, `label`, `description`, `position`, `plugin_id`)
+            VALUE
                 (@storeFrontId, 'Blog', 'Blog', NULL, 0, NULL);
 EOD;
         $this->addSql($sql);
@@ -74,7 +74,7 @@ private function createBlogConfigForm()
 
         $sql = <<<'EOD'
             INSERT IGNORE s_core_config_form_translations
-                (`form_id`, `locale_id`, `label`, `description`) 
+                (`form_id`, `locale_id`, `label`, `description`)
             VALUE
                 (@blogId, '2', 'Blog', null)
 EOD;
diff --git a/_sql/migrations/1455-add-customer-group-key-exemption-option.php b/_sql/migrations/1455-add-customer-group-key-exemption-option.php
index 67c9ba85b11..b4fe0a72a29 100644
--- a/_sql/migrations/1455-add-customer-group-key-exemption-option.php
+++ b/_sql/migrations/1455-add-customer-group-key-exemption-option.php
@@ -1,28 +1,30 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-class Migrations_Migration1455 extends \Shopware\Components\Migrations\AbstractMigration
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration1455 extends AbstractMigration
 {
     /**
      * Migration to make new "Exclude Customergroup" option visible in advanced menu without reinstallation
diff --git a/_sql/migrations/1456-change-docid-column-type.php b/_sql/migrations/1456-change-docid-column-type.php
index 134f83ab9fe..1afdce8adbc 100644
--- a/_sql/migrations/1456-change-docid-column-type.php
+++ b/_sql/migrations/1456-change-docid-column-type.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1456 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/1457-add-minsearch-index-length.php b/_sql/migrations/1457-add-minsearch-index-length.php
index a68b3244cac..a6ab6aaf94b 100644
--- a/_sql/migrations/1457-add-minsearch-index-length.php
+++ b/_sql/migrations/1457-add-minsearch-index-length.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
diff --git a/_sql/migrations/1458-add-essential-features-config.php b/_sql/migrations/1458-add-essential-features-config.php
index d1f1005baca..64ee33a8667 100644
--- a/_sql/migrations/1458-add-essential-features-config.php
+++ b/_sql/migrations/1458-add-essential-features-config.php
@@ -4,23 +4,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1458 extends Shopware\Components\Migrations\AbstractMigration
@@ -30,14 +29,14 @@ public function up($modus)
         // Adds new config
         $sql = <<<'SQL'
             SET @parent = (SELECT id FROM s_core_config_forms WHERE name = 'Checkout' LIMIT 1);
-    
+
             INSERT IGNORE INTO `s_core_config_elements`
             (`form_id`, `name`, `value`, `label`, `description`, `type`, `required`, `position`, `scope`, `options`)
             VALUES
             (@parent, 'alwaysShowMainFeatures', 'b:0;', 'Wesentliche Merkmale im gesamten Checkout Prozess anzeigen', 'Wenn aktiviert, werden die wesentlichen Merkmale im gesamten Checkout angezeigt. Andernfalls tauchen diese nur auf der Bestell-Bestätigungsseite auf.', 'boolean', 0, 1, 1, NULL);
-    
+
             SET @elementId = (SELECT id FROM s_core_config_elements WHERE name = 'alwaysShowMainFeatures' LIMIT 1);
-    
+
             INSERT IGNORE INTO `s_core_config_element_translations` (`id`, `element_id`, `locale_id`, `label`, `description`)
             VALUES
             (NULL, @elementId, '2', 'Display essential characteristics throughout the checkout process', 'If activated, the essential characteristics are displayed throughout the checkout. Otherwise, they will only appear on the order confirmation page.');
@@ -47,7 +46,7 @@ public function up($modus)
         if ($modus === self::MODUS_INSTALL) {
             $sql = <<<'SQL'
             SET @elementId = (SELECT id FROM s_core_config_elements WHERE name = 'mainFeatures');
-            
+
             UPDATE s_core_config_elements SET value = :value WHERE id = @elementId;
 SQL;
 
@@ -56,12 +55,12 @@ public function up($modus)
                 <span class="price--label label--purchase-unit is--bold is--nowrap">
                     Inhalt:
                 </span>
-            
+
                 <span class="is--nowrap">
                     {$sBasketItem.purchaseunit|floatval} {$sBasketItem.additional_details.sUnit.description}
                 </span>
             {/if}
-            
+
             {if $sBasketItem.purchaseunit && $sBasketItem.additional_details.referenceunit && $sBasketItem.purchaseunit != $sBasketItem.additional_details.referenceunit}
                 <span class="is--nowrap">
                     ({$sBasketItem.additional_details.referenceprice|currency}
diff --git a/_sql/migrations/1459-change-shipping-costs-configs.php b/_sql/migrations/1459-change-shipping-costs-configs.php
index 6a6f75118e4..fa5d5484fa3 100644
--- a/_sql/migrations/1459-change-shipping-costs-configs.php
+++ b/_sql/migrations/1459-change-shipping-costs-configs.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1459 extends Shopware\Components\Migrations\AbstractMigration
@@ -37,7 +37,7 @@ public function up($modus)
                     [
                         'snippet' => 'shipping_calculations_not_show',
                         'en_GB' => 'No',
-                        'de_DE' => 'Nein'
+                        'de_DE' => 'Nein',
                     ],
                 ],
                 [
@@ -45,18 +45,18 @@ public function up($modus)
                     [
                         'snippet' => 'shipping_calculations_show_folded',
                         'en_GB' => 'Collapsed',
-                        'de_DE' => 'Eingeklappt'
-                    ]
+                        'de_DE' => 'Eingeklappt',
+                    ],
                 ],
                 [
                     2,
                     [
                         'snippet' => 'shipping_calculations_show_expanded',
                         'en_GB' => 'Expanded',
-                        'de_DE' => 'Ausgeklappt'
-                    ]
-                ]
-            ]
+                        'de_DE' => 'Ausgeklappt',
+                    ],
+                ],
+            ],
         ];
 
         $sql = <<<'SQL'
@@ -69,6 +69,6 @@ public function up($modus)
         UPDATE s_core_config_values SET value = 'i:0;'
         WHERE element_id = @elementId;
 SQL;
-        $this->addSql(sprintf($sql, serialize($options)));
+        $this->addSql(\sprintf($sql, serialize($options)));
     }
 }
diff --git a/_sql/migrations/146-http-cache-events.php b/_sql/migrations/146-http-cache-events.php
index c1615cb6583..2137722298d 100644
--- a/_sql/migrations/146-http-cache-events.php
+++ b/_sql/migrations/146-http-cache-events.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration146 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration146 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/1460-add-shipping-costs-configs-for-off-canvas.php b/_sql/migrations/1460-add-shipping-costs-configs-for-off-canvas.php
index 4c9f0ca30a8..075815e266c 100644
--- a/_sql/migrations/1460-add-shipping-costs-configs-for-off-canvas.php
+++ b/_sql/migrations/1460-add-shipping-costs-configs-for-off-canvas.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1460 extends Shopware\Components\Migrations\AbstractMigration
@@ -37,7 +37,7 @@ public function up($modus)
                     [
                         'snippet' => 'shipping_calculations_not_show',
                         'en_GB' => 'No',
-                        'de_DE' => 'Nein'
+                        'de_DE' => 'Nein',
                     ],
                 ],
                 [
@@ -45,36 +45,36 @@ public function up($modus)
                     [
                         'snippet' => 'shipping_calculations_show_folded',
                         'en_GB' => 'Collapsed',
-                        'de_DE' => 'Eingeklappt'
-                    ]
+                        'de_DE' => 'Eingeklappt',
+                    ],
                 ],
                 [
                     2,
                     [
                         'snippet' => 'shipping_calculations_show_expanded',
                         'en_GB' => 'Expanded',
-                        'de_DE' => 'Ausgeklappt'
-                    ]
-                ]
-            ]
+                        'de_DE' => 'Ausgeklappt',
+                    ],
+                ],
+            ],
         ];
 
         $sql = <<<'SQL'
         SET @parent = (SELECT id FROM s_core_config_forms WHERE name = 'Frontend79' LIMIT 1);
-        
+
         INSERT IGNORE INTO `s_core_config_elements` (`id`, `form_id`, `name`, `value`, `label`, `description`, `type`, `required`, `position`, `scope`, `options`) VALUES
         (NULL, @parent, 'showShippingCostsOffCanvas', 'i:1;', 'Versandkostenberechnung im Mini-/OffCanvas-Warenkorb anzeigen', 'Diese Option aktiviert die Versandkostenberechnung für den Mini- bzw. OffCanvas-Warenkorb.', 'select', 0, 6, 1, '%s');
-        
+
         SET @elementId = (SELECT id FROM `s_core_config_elements` WHERE `name` = 'showShippingCostsOffCanvas' LIMIT 1);
 		INSERT IGNORE INTO `s_core_config_element_translations` (`element_id`, `locale_id`, `label`, `description`)
         VALUES (@elementId, '2', 'Show shipping costs calculation in mini/offcanvas shopping cart', 'If enabled, a shipping cost calculator will be displayed in the mini/offcanvas cart page. This is only available for customers who haven\'t logged in');
 
 SQL;
-        $this->addSql(sprintf($sql, serialize($options)));
+        $this->addSql(\sprintf($sql, serialize($options)));
 
         if ($modus === self::MODUS_UPDATE) {
             $sql = "INSERT INTO `s_core_config_values` (`element_id`, `shop_id`, `value`)
-                    SELECT 
+                    SELECT
                       @elementId,
                       `id`,
                       'i:0;'
diff --git a/_sql/migrations/1461-change-no-customer-account-configs.php b/_sql/migrations/1461-change-no-customer-account-configs.php
index d3c0d0c6768..bfbebcc782e 100644
--- a/_sql/migrations/1461-change-no-customer-account-configs.php
+++ b/_sql/migrations/1461-change-no-customer-account-configs.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1461 extends Shopware\Components\Migrations\AbstractMigration
@@ -37,26 +37,26 @@ public function up($modus)
                     [
                         'snippet' => 'deactivate_no_customer_account_true',
                         'en_GB' => 'Yes',
-                        'de_DE' => 'Ja'
-                    ]
+                        'de_DE' => 'Ja',
+                    ],
                 ],
                 [
                     1,
                     [
                         'snippet' => 'deactivate_no_customer_account_preselected',
                         'en_GB' => 'No: Option is preselected',
-                        'de_DE' => 'Nein: Option ist vorausgewählt'
-                    ]
+                        'de_DE' => 'Nein: Option ist vorausgewählt',
+                    ],
                 ],
                 [
                     2,
                     [
                         'snippet' => 'deactivate_no_customer_account_unselected',
                         'en_GB' => 'No: Option is not preselected',
-                        'de_DE' => 'Nein: Option ist nicht vorausgewählt.'
-                    ]
-                ]
-            ]
+                        'de_DE' => 'Nein: Option ist nicht vorausgewählt.',
+                    ],
+                ],
+            ],
         ];
 
         $sql = <<<'SQL'
@@ -67,6 +67,6 @@ public function up($modus)
 		UPDATE s_core_config_values SET value = 'i:2;' WHERE element_id = @elementId AND value = 'b:0;';
         UPDATE s_core_config_values SET value = 'i:0;' WHERE element_id = @elementId AND value = 'b:1;';
 SQL;
-        $this->addSql(sprintf($sql, serialize($options)));
+        $this->addSql(\sprintf($sql, serialize($options)));
     }
 }
diff --git a/_sql/migrations/1462-add-i-am-select-field-options.php b/_sql/migrations/1462-add-i-am-select-field-options.php
index 87f2befd940..43b164a6b2b 100644
--- a/_sql/migrations/1462-add-i-am-select-field-options.php
+++ b/_sql/migrations/1462-add-i-am-select-field-options.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1462 extends Shopware\Components\Migrations\AbstractMigration
@@ -37,26 +37,26 @@ public function up($modus)
                     [
                         'snippet' => 'i_am_select_field_show',
                         'en_GB' => 'Yes',
-                        'de_DE' => 'Ja'
-                    ]
+                        'de_DE' => 'Ja',
+                    ],
                 ],
                 [
                     1,
                     [
                         'snippet' => 'i_am_select_field_not_show_b2c',
                         'en_GB' => 'No. Customers register as B2C customers.',
-                        'de_DE' => 'Nein. Kunden melden sich als B2C Kunden an.'
-                    ]
+                        'de_DE' => 'Nein. Kunden melden sich als B2C Kunden an.',
+                    ],
                 ],
                 [
                     2,
                     [
                         'snippet' => 'i_am_select_field_not_show_b2b',
                         'en_GB' => 'No. Customers register as B2B customers.',
-                        'de_DE' => 'Nein. Kunden melden sich als B2B Kunden an.'
-                    ]
-                ]
-            ]
+                        'de_DE' => 'Nein. Kunden melden sich als B2B Kunden an.',
+                    ],
+                ],
+            ],
         ];
 
         $sql = <<<'SQL'
@@ -69,6 +69,6 @@ public function up($modus)
         UPDATE `s_core_config_elements` SET `description` = 'Das Auswahlfeld wird nur bei der Registrierung ausgeblendet, danach ist es beim Ändern der Benutzerdaten trotzdem verfügbar.' WHERE `id` = @element;
         UPDATE `s_core_config_element_translations` SET `description` = 'This option only affects the registration, it is still available when editing user data.' WHERE `element_id` = @element;
 SQL;
-        $this->addSql(sprintf($sql, serialize($options)));
+        $this->addSql(\sprintf($sql, serialize($options)));
     }
 }
diff --git a/_sql/migrations/1463-invalidate-http-cache-on-entity-removal-subscriber.php b/_sql/migrations/1463-invalidate-http-cache-on-entity-removal-subscriber.php
index f8283ce0374..99d46709b62 100644
--- a/_sql/migrations/1463-invalidate-http-cache-on-entity-removal-subscriber.php
+++ b/_sql/migrations/1463-invalidate-http-cache-on-entity-removal-subscriber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1463 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/1464-fix-translation.php b/_sql/migrations/1464-fix-translation.php
index e048ce493d1..debbf936121 100644
--- a/_sql/migrations/1464-fix-translation.php
+++ b/_sql/migrations/1464-fix-translation.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration1464 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration1464 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/147-translations.php b/_sql/migrations/147-translations.php
index 9509a6bc601..ecb89a98c2d 100644
--- a/_sql/migrations/147-translations.php
+++ b/_sql/migrations/147-translations.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration147 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration147 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/148-payment-method-refactor.php b/_sql/migrations/148-payment-method-refactor.php
index f07c57816ce..80715267cf9 100644
--- a/_sql/migrations/148-payment-method-refactor.php
+++ b/_sql/migrations/148-payment-method-refactor.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration148 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration148 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/149-add-sepa-database-items.php b/_sql/migrations/149-add-sepa-database-items.php
index 7ed91b96bb0..b61739b3b96 100644
--- a/_sql/migrations/149-add-sepa-database-items.php
+++ b/_sql/migrations/149-add-sepa-database-items.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration149 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration149 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/150-add-checkout-payment-info-change-config.php b/_sql/migrations/150-add-checkout-payment-info-change-config.php
index 277f856ed26..a73dc9eae4f 100644
--- a/_sql/migrations/150-add-checkout-payment-info-change-config.php
+++ b/_sql/migrations/150-add-checkout-payment-info-change-config.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration150 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration150 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/151-add-missing-emotion-field-types.php b/_sql/migrations/151-add-missing-emotion-field-types.php
index 02bb1a76582..d1f12bebf6e 100644
--- a/_sql/migrations/151-add-missing-emotion-field-types.php
+++ b/_sql/migrations/151-add-missing-emotion-field-types.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration151 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration151 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -13,7 +36,5 @@ public function up($modus)
             UPDATE  s_library_component SET  x_type =  'emotion-components-youtube' WHERE  s_library_component.name = 'Youtube-Video';
 EOD;
         $this->addSql($sql);
-
-
     }
 }
diff --git a/_sql/migrations/1600-remove-articleid-from-article-attributes-schema.php b/_sql/migrations/1600-remove-articleid-from-article-attributes-schema.php
index 171c387ad55..8d2d5c09f74 100644
--- a/_sql/migrations/1600-remove-articleid-from-article-attributes-schema.php
+++ b/_sql/migrations/1600-remove-articleid-from-article-attributes-schema.php
@@ -1,31 +1,34 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
-class Migrations_Migration1600 extends Shopware\Components\Migrations\AbstractMigration
+
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration1600 extends AbstractMigration
 {
     public function up($modus)
     {
-        if ($modus === \Shopware\Components\Migrations\AbstractMigration::MODUS_INSTALL) {
+        if ($modus === AbstractMigration::MODUS_INSTALL) {
             $this->addSql('ALTER TABLE `s_articles_attributes` DROP FOREIGN KEY `s_articles_attributes_ibfk_1`;');
             $this->addSql('ALTER TABLE `s_articles_attributes` DROP COLUMN `articleID`;');
         }
diff --git a/_sql/migrations/1601-add-http2-push-setting.php b/_sql/migrations/1601-add-http2-push-setting.php
index c05e4bff63a..9757697e239 100644
--- a/_sql/migrations/1601-add-http2-push-setting.php
+++ b/_sql/migrations/1601-add-http2-push-setting.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1601 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1602-add-plugin-manager-privilege.php b/_sql/migrations/1602-add-plugin-manager-privilege.php
index 04e10551e88..e9fe0bb4ccc 100644
--- a/_sql/migrations/1602-add-plugin-manager-privilege.php
+++ b/_sql/migrations/1602-add-plugin-manager-privilege.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1602 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1604-add-html-minify-option.php b/_sql/migrations/1604-add-html-minify-option.php
index c4239b9051d..abb6edc21b2 100644
--- a/_sql/migrations/1604-add-html-minify-option.php
+++ b/_sql/migrations/1604-add-html-minify-option.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1604 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1605-add-plugin-migration-table.php b/_sql/migrations/1605-add-plugin-migration-table.php
index 93674493685..03c95457e18 100644
--- a/_sql/migrations/1605-add-plugin-migration-table.php
+++ b/_sql/migrations/1605-add-plugin-migration-table.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1605 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1606-extend-error-mail-recipients-setting.php b/_sql/migrations/1606-extend-error-mail-recipients-setting.php
index 1ef99c2be2a..ee2e09adf9d 100644
--- a/_sql/migrations/1606-extend-error-mail-recipients-setting.php
+++ b/_sql/migrations/1606-extend-error-mail-recipients-setting.php
@@ -4,23 +4,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1606 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/1607-add-voucher-checkout-configs.php b/_sql/migrations/1607-add-voucher-checkout-configs.php
index d341aa716b7..1df627bb773 100644
--- a/_sql/migrations/1607-add-voucher-checkout-configs.php
+++ b/_sql/migrations/1607-add-voucher-checkout-configs.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1607 extends Shopware\Components\Migrations\AbstractMigration
@@ -37,7 +37,7 @@ public function up($modus)
                     [
                         'snippet' => 'voucher_mode_not_show',
                         'en_GB' => 'No',
-                        'de_DE' => 'Nein'
+                        'de_DE' => 'Nein',
                     ],
                 ],
                 [
@@ -45,18 +45,18 @@ public function up($modus)
                     [
                         'snippet' => 'voucher_mode_show_folded',
                         'en_GB' => 'Collapsed',
-                        'de_DE' => 'Eingeklappt'
-                    ]
+                        'de_DE' => 'Eingeklappt',
+                    ],
                 ],
                 [
                     2,
                     [
                         'snippet' => 'voucher_mode_show_expanded',
                         'en_GB' => 'Expanded',
-                        'de_DE' => 'Ausgeklappt'
-                    ]
-                ]
-            ]
+                        'de_DE' => 'Ausgeklappt',
+                    ],
+                ],
+            ],
         ];
 
         $sql = <<<'SQL'
@@ -73,7 +73,7 @@ public function up($modus)
         UPDATE `s_core_config_elements` SET `description` = 'Artikel hinzuf&uuml;gen, Kommentarfunktion', name = 'commentArticle' WHERE id = @commentArticleElementId;
         UPDATE `s_core_config_element_translations` SET description = 'Add product, comment function' WHERE element_id = @commentArticleElementId;
 SQL;
-        $this->addSql(sprintf($sql, serialize($options)));
+        $this->addSql(\sprintf($sql, serialize($options)));
 
         if ($modus === self::MODUS_UPDATE) {
             $sql = <<<'SQL'
diff --git a/_sql/migrations/1608-add-voucher-configs.php b/_sql/migrations/1608-add-voucher-configs.php
index 53393747f4a..d8963c981a3 100644
--- a/_sql/migrations/1608-add-voucher-configs.php
+++ b/_sql/migrations/1608-add-voucher-configs.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1608 extends Shopware\Components\Migrations\AbstractMigration
@@ -37,7 +37,7 @@ public function up($modus)
                     [
                         'snippet' => 'voucher_mode_not_show',
                         'en_GB' => 'No',
-                        'de_DE' => 'Nein'
+                        'de_DE' => 'Nein',
                     ],
                 ],
                 [
@@ -45,18 +45,18 @@ public function up($modus)
                     [
                         'snippet' => 'voucher_mode_show_folded',
                         'en_GB' => 'Collapsed',
-                        'de_DE' => 'Eingeklappt'
-                    ]
+                        'de_DE' => 'Eingeklappt',
+                    ],
                 ],
                 [
                     2,
                     [
                         'snippet' => 'voucher_mode_show_expanded',
                         'en_GB' => 'Expanded',
-                        'de_DE' => 'Ausgeklappt'
-                    ]
-                ]
-            ]
+                        'de_DE' => 'Ausgeklappt',
+                    ],
+                ],
+            ],
         ];
 
         $sql = <<<'EOD'
@@ -69,11 +69,11 @@ public function up($modus)
         INSERT IGNORE INTO `s_core_config_element_translations` (`element_id`, `locale_id`, `label`)
         VALUES (@elementId, '2', 'Display voucher field in shopping cart');
 EOD;
-        $this->addSql(sprintf($sql, serialize($options)));
+        $this->addSql(\sprintf($sql, serialize($options)));
 
         if ($modus === self::MODUS_UPDATE) {
             $sql = "INSERT INTO `s_core_config_values` (`element_id`, `shop_id`, `value`)
-                    SELECT 
+                    SELECT
                       @elementId,
                       `id`,
                       'i:1;'
diff --git a/_sql/migrations/1609-allow-longer-customergroup-keys.php b/_sql/migrations/1609-allow-longer-customergroup-keys.php
index 8cfac26b5ac..819bc4bb600 100644
--- a/_sql/migrations/1609-allow-longer-customergroup-keys.php
+++ b/_sql/migrations/1609-allow-longer-customergroup-keys.php
@@ -4,23 +4,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1609 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/1610-remove-mobile-sitemap-element.php b/_sql/migrations/1610-remove-mobile-sitemap-element.php
index 2ab8c576316..12f7bd3dce8 100644
--- a/_sql/migrations/1610-remove-mobile-sitemap-element.php
+++ b/_sql/migrations/1610-remove-mobile-sitemap-element.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1610 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/1611-change-order-details-id-column.php b/_sql/migrations/1611-change-order-details-id-column.php
index 5a653dc13a6..8f11d390bc8 100644
--- a/_sql/migrations/1611-change-order-details-id-column.php
+++ b/_sql/migrations/1611-change-order-details-id-column.php
@@ -1,34 +1,36 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-class Migrations_Migration1611 extends Shopware\Components\Migrations\AbstractMigration
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration1611 extends AbstractMigration
 {
     public function up($modus)
     {
-        $columns = $this->connection->query('DESCRIBE `s_order_documents`')->fetchAll(\PDO::FETCH_ASSOC);
+        $columns = $this->connection->query('DESCRIBE `s_order_documents`')->fetchAll(PDO::FETCH_ASSOC);
 
-        if (in_array('id', array_column($columns, 'Field'), true)) {
+        if (\in_array('id', array_column($columns, 'Field'), true)) {
             return;
         }
 
diff --git a/_sql/migrations/1612-add-net-rounding-option.php b/_sql/migrations/1612-add-net-rounding-option.php
index fc85448ff2d..49a690606d0 100644
--- a/_sql/migrations/1612-add-net-rounding-option.php
+++ b/_sql/migrations/1612-add-net-rounding-option.php
@@ -4,23 +4,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1612 extends Shopware\Components\Migrations\AbstractMigration
@@ -39,7 +38,7 @@ public function up($modus)
 
         if ($modus === self::MODUS_UPDATE) {
             $sql = "INSERT INTO `s_core_config_values` (`element_id`, `shop_id`, `value`)
-                    SELECT 
+                    SELECT
                       @elementId,
                       `id`,
                       'b:0;'
diff --git a/_sql/migrations/1613-new-config-clear-basket-on-logout.php b/_sql/migrations/1613-new-config-clear-basket-on-logout.php
index f5d4da7752a..41831d28708 100644
--- a/_sql/migrations/1613-new-config-clear-basket-on-logout.php
+++ b/_sql/migrations/1613-new-config-clear-basket-on-logout.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1613 extends Shopware\Components\Migrations\AbstractMigration
@@ -28,9 +28,9 @@ public function up($modus)
     {
         $sql = <<<SQL
         SET @parent = (SELECT id FROM s_core_config_forms WHERE name = 'Frontend79' LIMIT 1);
-        
+
         INSERT IGNORE INTO s_core_config_elements (form_id, name, value, label, description, type, required, position, scope, options) VALUES (@parent, 'clearBasketAfterLogout', 'b:1;', 'Warenkorb beim Logout leeren', 'Falls aktiv, wird der Warenkorb nach einem Logout geleert.<br>Falls inaktiv, wird der Warenkorb beim Logout nicht geleert und bleibt für einen späteren Login erhalten.', 'boolean', 0, 0, 0, null);
-        
+
         SET @elementId = (SELECT id FROM `s_core_config_elements` WHERE `name` = 'clearBasketAfterLogout' LIMIT 1);
         INSERT INTO s_core_config_element_translations (element_id, locale_id, label, description) VALUES (@elementId, 2, 'Clear basket after logout', 'If active, the shopping cart will be cleared after a logout. <br>If inactive, the shopping cart will not be cleared after a logout and will be retained for a later login.');
 SQL;
diff --git a/_sql/migrations/1614-add-emotion-in-listing-config.php b/_sql/migrations/1614-add-emotion-in-listing-config.php
index a0135197142..1300323121e 100644
--- a/_sql/migrations/1614-add-emotion-in-listing-config.php
+++ b/_sql/migrations/1614-add-emotion-in-listing-config.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
diff --git a/_sql/migrations/1615-add-cart-migration-option.php b/_sql/migrations/1615-add-cart-migration-option.php
index 009e8ef43b1..61139ffd834 100644
--- a/_sql/migrations/1615-add-cart-migration-option.php
+++ b/_sql/migrations/1615-add-cart-migration-option.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1615 extends Shopware\Components\Migrations\AbstractMigration
@@ -28,9 +28,9 @@ public function up($modus)
     {
         $sql = <<<SQL
         SET @parent = (SELECT id FROM s_core_config_forms WHERE name = 'Frontend33' LIMIT 1);
-        
+
         INSERT IGNORE INTO s_core_config_elements (form_id, name, value, label, description, type, required, position, scope, options) VALUES (@parent, 'migrateCartAfterLogin', 'b:1;', 'Gespeicherte Warenkörbe beim Login wiederherstellen', 'Es wird nur wiederhergestellt, wenn der Warenkorb beim Login leer ist.', 'boolean', 0, 0, 0, null);
-        
+
         SET @elementId = (SELECT id FROM `s_core_config_elements` WHERE `name` = 'migrateCartAfterLogin' LIMIT 1);
         INSERT INTO s_core_config_element_translations (element_id, locale_id, label, description) VALUES (@elementId, 2, 'Restore saved shopping carts on login', 'It will only be restored if the shopping cart is empty at login.');
 SQL;
@@ -39,7 +39,7 @@ public function up($modus)
 
         if ($modus === self::MODUS_UPDATE) {
             $sql = "INSERT INTO `s_core_config_values` (`element_id`, `shop_id`, `value`)
-                    SELECT 
+                    SELECT
                       @elementId,
                       `id`,
                       'b:0;'
diff --git a/_sql/migrations/1616-add-mail-log-table.php b/_sql/migrations/1616-add-mail-log-table.php
index ff43b59b20e..2a2f2a163ec 100644
--- a/_sql/migrations/1616-add-mail-log-table.php
+++ b/_sql/migrations/1616-add-mail-log-table.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1616 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/1617-add-session-sharing.php b/_sql/migrations/1617-add-session-sharing.php
index 6eef091a4bd..746fae0e0d1 100644
--- a/_sql/migrations/1617-add-session-sharing.php
+++ b/_sql/migrations/1617-add-session-sharing.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1617 extends Shopware\Components\Migrations\AbstractMigration
@@ -28,9 +28,9 @@ public function up($modus)
     {
         $sql = <<<SQL
         SET @parent = (SELECT id FROM s_core_config_forms WHERE name = 'Frontend33' LIMIT 1);
-        
+
         INSERT IGNORE INTO s_core_config_elements (form_id, name, value, label, description, type, required, position, scope, options) VALUES (@parent, 'shareSessionBetweenLanguageShops', 'b:1;', 'Browser-Sitzung zwischen Sprachshops teilen', 'Wenn aktiv, wird die Browser-Sitzung zwischen Sprachshops geteilt. Somit verliert der Kunde den Warenkorb beim Wechseln nicht.<br><br><strong>Achtung:</strong> Sind Artikel in einzelnen Sprachvarianten nicht verfügbar, werden diese aus Warenkörben entfernt und können innerhalb der Sitzung nicht mehr wiederhergestellt werden.', 'boolean', 0, 0, 0, null);
-        
+
         SET @elementId = (SELECT id FROM `s_core_config_elements` WHERE `name` = 'shareSessionBetweenLanguageShops' LIMIT 1);
         INSERT INTO s_core_config_element_translations (element_id, locale_id, label, description) VALUES (@elementId, 2, 'Share browser session between language shops', 'When active, the browser session is shared between language shops. Thus the customer does not lose the shopping basket when switching');
 SQL;
@@ -39,7 +39,7 @@ public function up($modus)
 
         if ($modus === self::MODUS_UPDATE) {
             $sql = "INSERT INTO `s_core_config_values` (`element_id`, `shop_id`, `value`)
-                    SELECT 
+                    SELECT
                       @elementId,
                       `id`,
                       'b:0;'
diff --git a/_sql/migrations/1618-add-custom-sort.php b/_sql/migrations/1618-add-custom-sort.php
index 179a1c346e8..95eace0173e 100644
--- a/_sql/migrations/1618-add-custom-sort.php
+++ b/_sql/migrations/1618-add-custom-sort.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1618 extends Shopware\Components\Migrations\AbstractMigration
@@ -43,7 +43,6 @@ public function up($modus)
         ];
         $statement->execute($data);
 
-
         $this->addSql('CREATE TABLE `s_categories_manual_sorting` (
     `id` INT(11) NOT NULL AUTO_INCREMENT,
     `category_id` INT(11) NOT NULL,
diff --git a/_sql/migrations/1620-add-mail-log-menu-entry.php b/_sql/migrations/1620-add-mail-log-menu-entry.php
index ef1b8c6ab61..5674605ba2c 100644
--- a/_sql/migrations/1620-add-mail-log-menu-entry.php
+++ b/_sql/migrations/1620-add-mail-log-menu-entry.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1620 extends Shopware\Components\Migrations\AbstractMigration
@@ -43,7 +43,6 @@ public function up($modus)
 SQL;
         $this->addSql($sql);
 
-
         $sql = <<<'SQL'
 INSERT IGNORE INTO `s_core_menu` (`parent`, `name`, `onclick`, `class`, `position`, `active`, `pluginID`, `controller`, `shortcut`, `action`)
 VALUES (@templateId, 'E-Mail-Log', NULL, 'sprite-inbox-document', 1, 1, NULL, 'MailLog', NULL, 'Index');
diff --git a/_sql/migrations/1621-add-mail-log-config.php b/_sql/migrations/1621-add-mail-log-config.php
index 1e77d12d75e..eebbccbb876 100644
--- a/_sql/migrations/1621-add-mail-log-config.php
+++ b/_sql/migrations/1621-add-mail-log-config.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1621 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/1622-add-maillog-acl-role.php b/_sql/migrations/1622-add-maillog-acl-role.php
index e58ff0fc9d4..ab2ae362afe 100644
--- a/_sql/migrations/1622-add-maillog-acl-role.php
+++ b/_sql/migrations/1622-add-maillog-acl-role.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1622 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/1623-add-content-type-to-menu.php b/_sql/migrations/1623-add-content-type-to-menu.php
index e88bf36c4d6..ab1e0ef7cc3 100644
--- a/_sql/migrations/1623-add-content-type-to-menu.php
+++ b/_sql/migrations/1623-add-content-type-to-menu.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1623 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/1624-add-content-type-to-emotion.php b/_sql/migrations/1624-add-content-type-to-emotion.php
index 78381239d27..4d7f4d66158 100644
--- a/_sql/migrations/1624-add-content-type-to-emotion.php
+++ b/_sql/migrations/1624-add-content-type-to-emotion.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1624 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/1625-add-sort-by-articlenumber.php b/_sql/migrations/1625-add-sort-by-articlenumber.php
index 0e010b9f39e..7062a416010 100644
--- a/_sql/migrations/1625-add-sort-by-articlenumber.php
+++ b/_sql/migrations/1625-add-sort-by-articlenumber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1625 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/1626-add password_change_date.php b/_sql/migrations/1626-add password_change_date.php
index c7eafc9b510..efb63383b0d 100644
--- a/_sql/migrations/1626-add password_change_date.php	
+++ b/_sql/migrations/1626-add password_change_date.php	
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1626 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1627-add-foreign-key-for-s_order_details.php b/_sql/migrations/1627-add-foreign-key-for-s_order_details.php
index fae9f334128..477763ae3f3 100644
--- a/_sql/migrations/1627-add-foreign-key-for-s_order_details.php
+++ b/_sql/migrations/1627-add-foreign-key-for-s_order_details.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1627 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1628-add-birthday-single-field-option.php b/_sql/migrations/1628-add-birthday-single-field-option.php
index b37ed7a6803..60e36a31ebe 100644
--- a/_sql/migrations/1628-add-birthday-single-field-option.php
+++ b/_sql/migrations/1628-add-birthday-single-field-option.php
@@ -1,38 +1,39 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1628 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
-        $this->addSql('UPDATE `s_core_config_elements` 
+        $this->addSql('UPDATE `s_core_config_elements`
 SET `position` = `id`
 WHERE `form_id` = (
     SELECT `id` FROM `s_core_config_forms` WHERE `name` = \'Frontend33\' LIMIT 1
 )');
 
         $this->addSql('SET @parentId = (SELECT id FROM `s_core_config_forms` WHERE name = \'Frontend33\' LIMIT 1)');
-        
+
         $this->addSql('INSERT INTO `s_core_config_elements` (`form_id`, `name`, `value`, `label`, `description`, `type`, `required`, `position`, `scope`)
 VALUES (@parentId, \'birthdaySingleField\', \'b:0;\', \'Geburtstag als Datumsfeld anzeigen\', \'Wenn aktiv, wird das Geburtsdatum als einzelnes Datumsfeld dargestellt, statt drei einzelnen Feldern.\', \'boolean\', 1, 0, 0);
 ');
@@ -40,7 +41,7 @@ public function up($modus)
         $this->addSql('SET @configId = LAST_INSERT_ID();');
         $this->addSql('SET @positionId = (SELECT id FROM `s_core_config_elements` WHERE name = \'requirebirthdayfield\' LIMIT 1);');
 
-        $this->addSql('UPDATE `s_core_config_elements` 
+        $this->addSql('UPDATE `s_core_config_elements`
 SET position = @positionId
 WHERE `id` = @configId
 ');
diff --git a/_sql/migrations/1629-translate-dispatch-methods.php b/_sql/migrations/1629-translate-dispatch-methods.php
index f54daf22690..e6dd4e39d4f 100644
--- a/_sql/migrations/1629-translate-dispatch-methods.php
+++ b/_sql/migrations/1629-translate-dispatch-methods.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
diff --git a/_sql/migrations/1630-set-empty-options-null.php b/_sql/migrations/1630-set-empty-options-null.php
index d7eb548a144..9cedaac11a7 100644
--- a/_sql/migrations/1630-set-empty-options-null.php
+++ b/_sql/migrations/1630-set-empty-options-null.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1630 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/1631-add-shop-id-column-to-blogs.php b/_sql/migrations/1631-add-shop-id-column-to-blogs.php
index 15d36465504..e11d2db7165 100644
--- a/_sql/migrations/1631-add-shop-id-column-to-blogs.php
+++ b/_sql/migrations/1631-add-shop-id-column-to-blogs.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
diff --git a/_sql/migrations/1632-add-acl-privilege-requirements.php b/_sql/migrations/1632-add-acl-privilege-requirements.php
index 8c50662f0b8..ea6f9da5f72 100644
--- a/_sql/migrations/1632-add-acl-privilege-requirements.php
+++ b/_sql/migrations/1632-add-acl-privilege-requirements.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
@@ -58,7 +58,7 @@ private function getPrivilegeMapping()
         $mapping = [];
 
         foreach ($resources as $key => $privileges) {
-            if (!array_key_exists($key, $mapping)) {
+            if (!\array_key_exists($key, $mapping)) {
                 $mapping[$key] = [];
             }
             foreach ($privileges as $privilege) {
@@ -73,14 +73,14 @@ private function getRequirementMatrix()
     {
         $matrix = [
             'analytics_read' => [
-                'overview_read'
+                'overview_read',
             ],
             'article_read' => [
                 'category_read',
                 'mediamanager_read',
                 'emotion_read',
                 'mediamanager_upload',
-                'articlelist_read'
+                'articlelist_read',
             ],
             'article_delete' => [
                 'article_read',
@@ -90,7 +90,7 @@ private function getRequirementMatrix()
                 'mediamanager_upload',
             ],
             'articlelist_read' => [
-                'article_read'
+                'article_read',
             ],
             'articlelist_createFilters' => [
                 'articlelist_read',
@@ -109,7 +109,7 @@ private function getRequirementMatrix()
             'articlelist_doMultiEdit' => [
                 'articlelist_read',
                 'article_save',
-                'articlelist_doBackup'
+                'articlelist_doBackup',
             ],
             'articlelist_doBackup' => [
                 'articlelist_read',
@@ -117,7 +117,7 @@ private function getRequirementMatrix()
                 'articlelist_editSingleArticle',
             ],
             'attributes_update' => [
-                'attributes_read'
+                'attributes_read',
             ],
             'banner_create' => [
                 'category_read',
@@ -130,20 +130,20 @@ private function getRequirementMatrix()
                 'mediamanager_read',
                 'mediamanager_create',
                 'mediamanager_upload',
-                'banner_read'
+                'banner_read',
             ],
             'banner_update' => [
-                'banner_read'
+                'banner_read',
             ],
             'banner_delete' => [
-                'banner_read'
+                'banner_read',
             ],
             'blog_read' => [
                 'mediamanager_read',
                 'category_read',
             ],
             'blog_delete' => [
-                'blog_read'
+                'blog_read',
             ],
             'blog_update' => [
                 'blog_read',
@@ -154,64 +154,64 @@ private function getRequirementMatrix()
                 'mediamanager_read',
                 'mediamanager_upload',
                 'mediamanager_update',
-                'mediamanager_create'
+                'mediamanager_create',
             ],
             'category_read' => [
                 'article_read',
-                'mediamanager_read'
+                'mediamanager_read',
             ],
             'category_update' => [
                 'category_read',
                 'mediamanager_update',
             ],
             'category_delete' => [
-                'category_read'
+                'category_read',
             ],
             'config_update' => [
-                'config_read'
+                'config_read',
             ],
             'config_delete' => [
-                'config_read'
+                'config_read',
             ],
             'contenttypemanager_edit' => [
-                'contenttypemanager_read'
+                'contenttypemanager_read',
             ],
             'contenttypemanager_delete' => [
-                'contenttypemanager_read'
+                'contenttypemanager_read',
             ],
             'customer_read' => [
                 'mediamanager_read',
                 'emotion_read',
                 'customerstream_read',
-                'customerstream_charts'
+                'customerstream_charts',
             ],
             'customer_update' => [
-                'customer_read'
+                'customer_read',
             ],
             'customer_delete' => [
-                'customer_read'
+                'customer_read',
             ],
             'customer_detail' => [
-                'customer_read'
+                'customer_read',
             ],
             'customerstream_read' => [
-                'customer_read'
+                'customer_read',
             ],
             'customerstream_save' => [
-                'customerstream_read'
+                'customerstream_read',
             ],
             'customerstream_delete' => [
-                'customerstream_read'
+                'customerstream_read',
             ],
             'customerstream_charts' => [
-                'customerstream_read'
+                'customerstream_read',
             ],
             'emotion_read' => [
                 'article_read',
                 'blog_read',
                 'category_read',
                 'mediamanager_read',
-                'supplier_read'
+                'supplier_read',
             ],
             'emotion_create' => [
                 'emotion_read',
@@ -226,124 +226,124 @@ private function getRequirementMatrix()
                 'emotion_read',
             ],
             'form_createupdate' => [
-                'form_read'
+                'form_read',
             ],
             'form_delete' => [
-                'form_read'
+                'form_read',
             ],
             'log_delete' => [
-                'log_read'
+                'log_read',
             ],
             'log_system' => [
-                'log_read'
+                'log_read',
             ],
             'mail_update' => [
-                'mail_read'
+                'mail_read',
             ],
             'mail_delete' => [
-                'mail_read'
+                'mail_read',
             ],
             'mediamanager_delete' => [
-                'mediamanager_read'
+                'mediamanager_read',
             ],
             'mediamanager_upload' => [
-                'mediamanager_read'
+                'mediamanager_read',
             ],
             'mediamanager_update' => [
-                'mediamanager_read'
+                'mediamanager_read',
             ],
             'newslettermanager_delete' => [
-                'newslettermanager_read'
+                'newslettermanager_read',
             ],
             'newslettermanager_read' => [
                 'customer_read',
                 'mediamanager_read',
-                'category_read'
+                'category_read',
             ],
             'newslettermanager_write' => [
-                'newslettermanager_read'
+                'newslettermanager_read',
             ],
             'notification_read' => [
-                'customer_read'
+                'customer_read',
             ],
             'order_read' => [
                 'customer_read',
             ],
             'order_update' => [
-                'order_read'
+                'order_read',
             ],
             'order_delete' => [
-                'order_read'
+                'order_read',
             ],
             'partner_create' => [
-                'customer_read'
+                'customer_read',
             ],
             'partner_read' => [
-                'customer_read'
+                'customer_read',
             ],
             'partner_update' => [
-                'partner_read'
+                'partner_read',
             ],
             'partner_delete' => [
-                'partner_read'
+                'partner_read',
             ],
             'payment_create' => [
-                'payment_read'
+                'payment_read',
             ],
             'payment_update' => [
-                'payment_read'
+                'payment_read',
             ],
             'payment_delete' => [
-                'payment_read'
+                'payment_read',
             ],
             'performance_update' => [
-                'performance_read'
+                'performance_read',
             ],
             'performance_clear' => [
-                'performance_read'
+                'performance_read',
             ],
             'pluginmanager_upload' => [
-                'pluginmanager_read'
+                'pluginmanager_read',
             ],
             'pluginmanager_download' => [
-                'pluginmanager_read'
+                'pluginmanager_read',
             ],
             'pluginmanager_install' => [
-                'pluginmanager_read'
+                'pluginmanager_read',
             ],
             'pluginmanager_update' => [
-                'pluginmanager_read'
+                'pluginmanager_read',
             ],
             'pluginmanager_notification' => [
-                'pluginmanager_read'
+                'pluginmanager_read',
             ],
             'premium_update' => [
                 'premium_read',
             ],
             'premium_delete' => [
-                'premium_read'
+                'premium_read',
             ],
             'productfeed_create' => [
-                'article_read'
+                'article_read',
             ],
             'productfeed_read' => [
-                'article_read'
+                'article_read',
             ],
             'productfeed_update' => [
-                'productfeed_read'
+                'productfeed_read',
             ],
             'productfeed_delete' => [
-                'productfeed_read'
+                'productfeed_read',
             ],
             'productfeed_generate' => [
-                'productfeed_read'
+                'productfeed_read',
             ],
             'productfeed_sqli' => [
-                'productfeed_read'
+                'productfeed_read',
             ],
             'riskmanagement_read' => [
                 'premium_read',
-                'config_read'
+                'config_read',
             ],
             'riskmanagement_save' => [
                 'riskmanagement_read',
@@ -366,34 +366,34 @@ private function getRequirementMatrix()
                 'shipping_read',
             ],
             'site_createGroup' => [
-                'mediamanager_read'
+                'mediamanager_read',
             ],
             'site_read' => [
-                'mediamanager_read'
+                'mediamanager_read',
             ],
             'site_createSite' => [
-                'site_read'
+                'site_read',
             ],
             'site_updateSite' => [
-                'site_read'
+                'site_read',
             ],
             'site_deleteSite' => [
-                'site_read'
+                'site_read',
             ],
             'site_deleteGroup' => [
-                'site_read'
+                'site_read',
             ],
             'snippet_update' => [
-                'snippet_read'
+                'snippet_read',
             ],
             'snippet_delete' => [
-                'snippet_read'
+                'snippet_read',
             ],
             'supplier_update' => [
-                'supplier_read'
+                'supplier_read',
             ],
             'supplier_delete' => [
-                'supplier_read'
+                'supplier_read',
             ],
             'swagupdate_update' => [
                 'swagupdate_read',
@@ -407,28 +407,28 @@ private function getRequirementMatrix()
                 'swagupdate_notification',
             ],
             'theme_preview' => [
-                'theme_read'
+                'theme_read',
             ],
             'theme_changeTheme' => [
-                'theme_read'
+                'theme_read',
             ],
             'theme_createTheme' => [
-                'theme_read'
+                'theme_read',
             ],
             'theme_uploadTheme' => [
-                'theme_read'
+                'theme_read',
             ],
             'theme_configureTheme' => [
-                'theme_read'
+                'theme_read',
             ],
             'theme_configureSystem' => [
-                'theme_read'
+                'theme_read',
             ],
             'usermanager_update' => [
-                'usermanager_read'
+                'usermanager_read',
             ],
             'usermanager_delete' => [
-                'usermanager_read'
+                'usermanager_read',
             ],
             'vote_read' => [
                 'article_read',
@@ -449,31 +449,31 @@ private function getRequirementMatrix()
                 'supplier_read',
                 'article_read',
                 'customerstream_read',
-                'customer_read'
+                'customer_read',
             ],
             'voucher_read' => [
                 'config_read',
                 'supplier_read',
                 'article_read',
                 'customerstream_read',
-                'customer_read'
+                'customer_read',
             ],
             'voucher_update' => [
-                'voucher_read'
+                'voucher_read',
             ],
             'voucher_delete' => [
-                'voucher_read'
+                'voucher_read',
             ],
             'voucher_export' => [
-                'voucher_read'
+                'voucher_read',
             ],
             'voucher_generate' => [
-                'voucher_read'
+                'voucher_read',
             ],
             'widgets_swag-upload-widget' => [
                 'mediamanager_upload',
-                'widgets_read'
-            ]
+                'widgets_read',
+            ],
         ];
 
         return $matrix;
diff --git a/_sql/migrations/1633-offcanvas-shipping-cost-display.php b/_sql/migrations/1633-offcanvas-shipping-cost-display.php
index d8490987e36..c4b5b83a76e 100644
--- a/_sql/migrations/1633-offcanvas-shipping-cost-display.php
+++ b/_sql/migrations/1633-offcanvas-shipping-cost-display.php
@@ -1,33 +1,34 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1633 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
         $sql = <<<'SQL'
-UPDATE `s_core_config_elements` 
-SET `description` = 'Diese Option aktiviert die Versandkostenberechnung für den Mini- bzw. OffCanvas-Warenkorb. Dies ist nur für Kunden verfügbar, die nicht angemeldet sind.' 
+UPDATE `s_core_config_elements`
+SET `description` = 'Diese Option aktiviert die Versandkostenberechnung für den Mini- bzw. OffCanvas-Warenkorb. Dies ist nur für Kunden verfügbar, die nicht angemeldet sind.'
 WHERE `name` = 'showShippingCostsOffCanvas';
 
 SET @elementId = (SELECT id FROM `s_core_config_elements` WHERE `name` = 'showShippingCostsOffCanvas' LIMIT 1);
diff --git a/_sql/migrations/1634-add-shipping-surcharge-number.php b/_sql/migrations/1634-add-shipping-surcharge-number.php
index add1ede7407..7a424898e27 100644
--- a/_sql/migrations/1634-add-shipping-surcharge-number.php
+++ b/_sql/migrations/1634-add-shipping-surcharge-number.php
@@ -1,40 +1,40 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1634 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
         $sql = <<<SQL
         SET @parent = (SELECT id FROM s_core_config_forms WHERE name = 'Frontend71' LIMIT 1);
-        
+
         INSERT IGNORE INTO s_core_config_elements (form_id, name, value, label, description, type, required, position, scope, options) VALUES (@parent, 'shippingSurchargeNumber', 's:19:"swShippingSurcharge";', 'Aufschlag-Versandregel (Bestellnummer)', null, 'text', 0, 0, 0, null);
-        
+
         SET @elementId = (SELECT id FROM `s_core_config_elements` WHERE `name` = 'shippingSurchargeNumber' LIMIT 1);
         INSERT INTO s_core_config_element_translations (element_id, locale_id, label, description) VALUES (@elementId, 2, 'Order number for surcharge dispatch rule', null);
 SQL;
 
-
         $this->addSql($sql);
     }
 }
diff --git a/_sql/migrations/1635-add-opt-in-column-to-user.php b/_sql/migrations/1635-add-opt-in-column-to-user.php
index 2a1cb5533ce..e10679ad3f2 100644
--- a/_sql/migrations/1635-add-opt-in-column-to-user.php
+++ b/_sql/migrations/1635-add-opt-in-column-to-user.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1635 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1636-fix-config-form-translation.php b/_sql/migrations/1636-fix-config-form-translation.php
index 73ba687d3af..ca44ca290b5 100644
--- a/_sql/migrations/1636-fix-config-form-translation.php
+++ b/_sql/migrations/1636-fix-config-form-translation.php
@@ -1,16 +1,38 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration1636 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
         $sql = <<<SQL
         SET @elementId = (SELECT id FROM `s_core_config_forms` WHERE `name` = 'Service');
-        
+
         UPDATE s_core_config_form_translations
         SET label = 'Maintenance'
         WHERE form_id = @elementId;
 SQL;
         $this->addSql($sql);
     }
-}
\ No newline at end of file
+}
diff --git a/_sql/migrations/1637-fix-foreign-keys-in-mail-log.php b/_sql/migrations/1637-fix-foreign-keys-in-mail-log.php
index 063c3841037..758612319da 100644
--- a/_sql/migrations/1637-fix-foreign-keys-in-mail-log.php
+++ b/_sql/migrations/1637-fix-foreign-keys-in-mail-log.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1637 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1638-update-doi-mail-templates.php b/_sql/migrations/1638-update-doi-mail-templates.php
index f161c467bd5..5596ed6687a 100644
--- a/_sql/migrations/1638-update-doi-mail-templates.php
+++ b/_sql/migrations/1638-update-doi-mail-templates.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1638 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1639-add-review-widget.php b/_sql/migrations/1639-add-review-widget.php
index c8bbb55a3b5..e281239c303 100644
--- a/_sql/migrations/1639-add-review-widget.php
+++ b/_sql/migrations/1639-add-review-widget.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1639 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1640-remove-contact-unique-constraint.php b/_sql/migrations/1640-remove-contact-unique-constraint.php
index 1456256aaa8..ba4ce108435 100644
--- a/_sql/migrations/1640-remove-contact-unique-constraint.php
+++ b/_sql/migrations/1640-remove-contact-unique-constraint.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1640 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/1643-allow-attributes-readonly.php b/_sql/migrations/1643-allow-attributes-readonly.php
index dedd15b8413..952934333a9 100644
--- a/_sql/migrations/1643-allow-attributes-readonly.php
+++ b/_sql/migrations/1643-allow-attributes-readonly.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1643 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1644-href-lang-scope.php b/_sql/migrations/1644-href-lang-scope.php
index c0a08de9067..39f46758e59 100644
--- a/_sql/migrations/1644-href-lang-scope.php
+++ b/_sql/migrations/1644-href-lang-scope.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1644 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1645-use-ssl-shopware-services.php b/_sql/migrations/1645-use-ssl-shopware-services.php
index 40e2af45db5..9dbf784d194 100644
--- a/_sql/migrations/1645-use-ssl-shopware-services.php
+++ b/_sql/migrations/1645-use-ssl-shopware-services.php
@@ -1,31 +1,32 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1645 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
-        $this->addSql(sprintf("UPDATE `s_core_config_elements` SET `value` = '%s' WHERE `name` = 'update-api-endpoint'", serialize('https://update-api.shopware.com/v1/')));
-        $this->addSql(sprintf("UPDATE `s_core_config_elements` SET `value` = '%s' WHERE `name` = 'update-feedback-api-endpoint'", serialize('https://feedback.update-api.shopware.com/v1/')));
+        $this->addSql(\sprintf("UPDATE `s_core_config_elements` SET `value` = '%s' WHERE `name` = 'update-api-endpoint'", serialize('https://update-api.shopware.com/v1/')));
+        $this->addSql(\sprintf("UPDATE `s_core_config_elements` SET `value` = '%s' WHERE `name` = 'update-feedback-api-endpoint'", serialize('https://feedback.update-api.shopware.com/v1/')));
     }
 }
diff --git a/_sql/migrations/1646-remove-sitemap-from-settings.php b/_sql/migrations/1646-remove-sitemap-from-settings.php
index cbceabd050c..35bce44ee88 100644
--- a/_sql/migrations/1646-remove-sitemap-from-settings.php
+++ b/_sql/migrations/1646-remove-sitemap-from-settings.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration1646 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1647-add-title-to-sREGISTERCONFIRMATION-mail-template-default-examples.php b/_sql/migrations/1647-add-title-to-sREGISTERCONFIRMATION-mail-template-default-examples.php
index 22a1dd1a968..0cce2570b70 100644
--- a/_sql/migrations/1647-add-title-to-sREGISTERCONFIRMATION-mail-template-default-examples.php
+++ b/_sql/migrations/1647-add-title-to-sREGISTERCONFIRMATION-mail-template-default-examples.php
@@ -1,16 +1,38 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration1647 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
         $sql = <<<SQL
         UPDATE `s_core_config_mails`
-        SET `context` = 'a:15:{s:5:\"sMAIL\";s:14:\"xy@example.org\";s:7:\"sConfig\";a:0:{}s:6:\"street\";s:15:\"Musterstraße 1\";' 
-            's:7:\"zipcode\";s:5:\"12345\";s:4:\"city\";s:11:\"Musterstadt\";s:7:\"country\";s:1:\"2\";s:5:\"state\";N;s:13:\"customer_type\";' 
-            's:7:\"private\";s:10:\"salutation\";s:4:\"Herr\";s:5:\"title\";s:3:\"Dr.\";s:9:\"firstname\";s:3:\"Max\";s:8:\"lastname\";' 
+        SET `context` = 'a:15:{s:5:\"sMAIL\";s:14:\"xy@example.org\";s:7:\"sConfig\";a:0:{}s:6:\"street\";s:15:\"Musterstraße 1\";'
+            's:7:\"zipcode\";s:5:\"12345\";s:4:\"city\";s:11:\"Musterstadt\";s:7:\"country\";s:1:\"2\";s:5:\"state\";N;s:13:\"customer_type\";'
+            's:7:\"private\";s:10:\"salutation\";s:4:\"Herr\";s:5:\"title\";s:3:\"Dr.\";s:9:\"firstname\";s:3:\"Max\";s:8:\"lastname\";'
             's:10:\"Mustermann\";s:11:\"accountmode\";s:1:\"0\";s:5:\"email\";s:14:\"xy@example.org\";s:10:\"additional\";a:1:{s:13:\"customer_type\";s:7:\"private\";}}'
-        WHERE `name` = 'sREGISTERCONFIRMATION'   
+        WHERE `name` = 'sREGISTERCONFIRMATION'
 SQL;
         $this->addSql($sql);
     }
diff --git a/_sql/migrations/1648-add-new-cookie-button-config.php b/_sql/migrations/1648-add-new-cookie-button-config.php
index 366f75f7f33..b11aa50e7e0 100644
--- a/_sql/migrations/1648-add-new-cookie-button-config.php
+++ b/_sql/migrations/1648-add-new-cookie-button-config.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1648 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/1649-add-cookie-consent-manager-site.php b/_sql/migrations/1649-add-cookie-consent-manager-site.php
index 810ca439b17..fef3e9da9b3 100644
--- a/_sql/migrations/1649-add-cookie-consent-manager-site.php
+++ b/_sql/migrations/1649-add-cookie-consent-manager-site.php
@@ -1,4 +1,27 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
 
 use Shopware\Components\Migrations\AbstractMigration;
 
@@ -18,7 +41,7 @@ public function up($modus)
             INSERT INTO `s_cms_static` (`active`, `tpl1variable`, `tpl1path`, `tpl2variable`, `tpl2path`, `tpl3variable`, `tpl3path`, `description`, `html`, `grouping`, `position`, `link`, `target`, `parentID`, `page_title`, `meta_keywords`, `meta_description`, `changed`, `shop_ids`) VALUES
             (%d, '',	'',	'',	'',	'',	'',	'Cookie-Einstellungen',	'', 'bottom2|left',	0, 'javascript:openCookieConsentManager()',	'',	0, '', '', '', '2019-11-01 00:00:00', NULL);
 SQL;
-        $this->addSql(sprintf($sql, $this->shouldPageActive()));
+        $this->addSql(\sprintf($sql, $this->shouldPageActive()));
 
         $sql = <<<SQL
             INSERT INTO `s_core_translations` (`objecttype`, `objectdata`, `objectkey`, `objectlanguage`, `dirty`) VALUES
@@ -37,17 +60,16 @@ private function shouldPageActive(): int
             return 0;
         }
 
-
         return $cookieMode === 1 ? 1 : 0;
     }
 
     private function getConfigValue(string $name)
     {
-        $config = $this->connection->query(sprintf('SELECT id, value FROM s_core_config_elements WHERE name = "%s" LIMIT 1', $name))->fetch(\PDO::FETCH_ASSOC);
+        $config = $this->connection->query(\sprintf('SELECT id, value FROM s_core_config_elements WHERE name = "%s" LIMIT 1', $name))->fetch(PDO::FETCH_ASSOC);
         $configId = (int) $config['id'];
         $default = unserialize($config['value'], ['allowed_classes' => false]);
 
-        $value = $this->connection->query(sprintf('SELECT `value` FROM s_core_config_values WHERE element_id = %d LIMIT 1', $configId))->fetchColumn();
+        $value = $this->connection->query(\sprintf('SELECT `value` FROM s_core_config_values WHERE element_id = %d LIMIT 1', $configId))->fetchColumn();
 
         if (!$value) {
             return $default;
@@ -58,7 +80,7 @@ private function getConfigValue(string $name)
 
     private function enableOnInstallation(): void
     {
-        $this->connection->exec(sprintf('UPDATE s_core_config_elements SET value = "%s" WHERE name = "show_cookie_note"', serialize(true)));
-        $this->connection->exec(sprintf('UPDATE s_core_config_elements SET value = "%s" WHERE name = "cookie_note_mode"', serialize(1)));
+        $this->connection->exec(\sprintf('UPDATE s_core_config_elements SET value = "%s" WHERE name = "show_cookie_note"', serialize(true)));
+        $this->connection->exec(\sprintf('UPDATE s_core_config_elements SET value = "%s" WHERE name = "cookie_note_mode"', serialize(1)));
     }
 }
diff --git a/_sql/migrations/1650-technical-support-menu.php b/_sql/migrations/1650-technical-support-menu.php
index 9fcc30c1f98..782e949f9ac 100644
--- a/_sql/migrations/1650-technical-support-menu.php
+++ b/_sql/migrations/1650-technical-support-menu.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1650 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1651-feedback-menu-fix.php b/_sql/migrations/1651-feedback-menu-fix.php
index 914a838fd02..0c4e03036ee 100644
--- a/_sql/migrations/1651-feedback-menu-fix.php
+++ b/_sql/migrations/1651-feedback-menu-fix.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1651 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1652-enforce-unique-attributes.php b/_sql/migrations/1652-enforce-unique-attributes.php
index 26ff9682920..a309c5efb6d 100644
--- a/_sql/migrations/1652-enforce-unique-attributes.php
+++ b/_sql/migrations/1652-enforce-unique-attributes.php
@@ -1,25 +1,26 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
diff --git a/_sql/migrations/1653-add-argon2-hashing.php b/_sql/migrations/1653-add-argon2-hashing.php
index 400b91d3162..a5cd47baca3 100644
--- a/_sql/migrations/1653-add-argon2-hashing.php
+++ b/_sql/migrations/1653-add-argon2-hashing.php
@@ -1,40 +1,41 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
 
 // see rfc for argon2 in PHP -> https://wiki.php.net/rfc/argon2_password_hash
-if (!defined('PASSWORD_ARGON2_DEFAULT_MEMORY_COST')) {
-    define('PASSWORD_ARGON2_DEFAULT_MEMORY_COST', 1 << 20); // 1MiB
+if (!\defined('PASSWORD_ARGON2_DEFAULT_MEMORY_COST')) {
+    \define('PASSWORD_ARGON2_DEFAULT_MEMORY_COST', 1 << 20); // 1MiB
 }
 
-if (!defined('PASSWORD_ARGON2_DEFAULT_TIME_COST')) {
-    define('PASSWORD_ARGON2_DEFAULT_TIME_COST', 2);
+if (!\defined('PASSWORD_ARGON2_DEFAULT_TIME_COST')) {
+    \define('PASSWORD_ARGON2_DEFAULT_TIME_COST', 2);
 }
 
-if (!defined('PASSWORD_ARGON2_DEFAULT_THREADS')) {
-    define('PASSWORD_ARGON2_DEFAULT_THREADS', 2);
+if (!\defined('PASSWORD_ARGON2_DEFAULT_THREADS')) {
+    \define('PASSWORD_ARGON2_DEFAULT_THREADS', 2);
 }
 
 class Migrations_Migration1653 extends AbstractMigration
@@ -44,7 +45,7 @@ public function up($modus)
         $this->addSql('SET @parentFormId = (SELECT id FROM s_core_config_forms WHERE NAME = "Passwörter" AND parent_id=(SELECT id FROM s_core_config_forms WHERE NAME="Core") LIMIT 1)');
 
         $sql = 'INSERT IGNORE INTO `s_core_config_elements` (`form_id`, `name`, `value`, `label`, `description`, `type`, `required`, `position`, `scope`, `options`) VALUES ';
-        $sql .= sprintf(
+        $sql .= \sprintf(
             "(@parentFormId, '%s', '%s', '%s', '%s', 'number', 1, 0, 0, '%s'),",
             'argon2MemoryCost',
             serialize(PASSWORD_ARGON2_DEFAULT_MEMORY_COST),
@@ -52,7 +53,7 @@ public function up($modus)
             'Ein höherer Speicherverbrauch macht es einem möglichen Angreifer schwerer, ein passendes Klartext-Passwort zu erzeugen.',
             serialize(['minValue' => (string) (1 << 20), 'maxValue' => (string) (1 << 62)])
         );
-        $sql .= sprintf(
+        $sql .= \sprintf(
             "(@parentFormId, '%s', '%s', '%s', '%s', 'number', 1, 0, 0, '%s'),",
             'argon2TimeCost',
             serialize(PASSWORD_ARGON2_DEFAULT_TIME_COST),
@@ -60,7 +61,7 @@ public function up($modus)
             'Ein höherer Zeitaufwand macht es einem möglichen Angreifer schwerer, ein passendes Klartext-Passwort zu erzeugen.',
             serialize(['minValue' => '1', 'maxValue' => '30'])
         );
-        $sql .= sprintf(
+        $sql .= \sprintf(
             "(@parentFormId, '%s', '%s', '%s', '%s', 'number', 1, 0, 0, '%s');",
             'argon2Threads',
             serialize(PASSWORD_ARGON2_DEFAULT_THREADS),
@@ -78,21 +79,21 @@ public function up($modus)
 
         $sql = 'INSERT IGNORE INTO `s_core_config_element_translations` (`element_id`, `locale_id`, `label`, `description`) VALUES ';
         // memory
-        $sql .= sprintf(
+        $sql .= \sprintf(
             "(@elemArgon2MemoryCost, 2, '%s', '%s'),",
             'Argon2 memory',
             'Higher memory usage increases the security against attackers.'
         );
 
         // time
-        $sql .= sprintf(
+        $sql .= \sprintf(
             "(@elemargon2TimeCost, 2, '%s', '%s'),",
             'Argon2 time',
             'Increasing the required time for hash calculation.'
         );
 
         // threads
-        $sql .= sprintf(
+        $sql .= \sprintf(
             "(@elemargon2Threads, 2, '%s', '%s');",
             'Argon2 threads',
             'Use more threads for parallelism and therefore increased security against attackers, based on your setup.'
diff --git a/_sql/migrations/1654-add-hreflang-just-seo-option.php b/_sql/migrations/1654-add-hreflang-just-seo-option.php
index e73be1a6c46..3f3c7560d2b 100644
--- a/_sql/migrations/1654-add-hreflang-just-seo-option.php
+++ b/_sql/migrations/1654-add-hreflang-just-seo-option.php
@@ -1,4 +1,27 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
 
 use Shopware\Components\Migrations\AbstractMigration;
 
diff --git a/_sql/migrations/1655-disable-html-minification-on-install.php b/_sql/migrations/1655-disable-html-minification-on-install.php
index 68a117f6f8c..17fe812bc50 100644
--- a/_sql/migrations/1655-disable-html-minification-on-install.php
+++ b/_sql/migrations/1655-disable-html-minification-on-install.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1655 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1656-add-config-show-shipping-countries-checkout.php b/_sql/migrations/1656-add-config-show-shipping-countries-checkout.php
index c39b154c7eb..210cf18a137 100644
--- a/_sql/migrations/1656-add-config-show-shipping-countries-checkout.php
+++ b/_sql/migrations/1656-add-config-show-shipping-countries-checkout.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1656 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1700-add-sitemap-tables.php b/_sql/migrations/1700-add-sitemap-tables.php
index 93ae9b9e3d3..47aabe05c89 100644
--- a/_sql/migrations/1700-add-sitemap-tables.php
+++ b/_sql/migrations/1700-add-sitemap-tables.php
@@ -1,26 +1,26 @@
-<?php declare(strict_types = 1);
+<?php
 
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
diff --git a/_sql/migrations/1701-add-http-cache-events-and-routes-for-forms.php b/_sql/migrations/1701-add-http-cache-events-and-routes-for-forms.php
index 28914f2ea02..69accd8cc37 100644
--- a/_sql/migrations/1701-add-http-cache-events-and-routes-for-forms.php
+++ b/_sql/migrations/1701-add-http-cache-events-and-routes-for-forms.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1701 extends Shopware\Components\Migrations\AbstractMigration
@@ -33,14 +33,14 @@ public function up($modus)
         foreach ($values as $row) {
             $value = $this->addCacheEntry($row['value']);
 
-            $sql = sprintf('UPDATE `s_core_config_values` SET `value` = \'%s\' WHERE id = %d', $value, (int) $row['id']);
+            $sql = \sprintf('UPDATE `s_core_config_values` SET `value` = \'%s\' WHERE id = %d', $value, (int) $row['id']);
             $this->addSql($sql);
         }
 
         // Update default
         $value = $this->connection->query('SELECT `value` FROM s_core_config_elements WHERE `name` = "cacheControllers"')->fetchColumn();
         $value = $this->addCacheEntry($value);
-        $this->addSql(sprintf('UPDATE s_core_config_elements SET `value` = \'%s\' WHERE `name` = "cacheControllers"', $value));
+        $this->addSql(\sprintf('UPDATE s_core_config_elements SET `value` = \'%s\' WHERE `name` = "cacheControllers"', $value));
 
         $sql = <<<'EOD'
 SET @plugin_id = (SELECT id FROM s_core_plugins WHERE name='HttpCache');
@@ -60,6 +60,7 @@ private function addCacheEntry(string $entry): string
         $value = explode("\n", $value);
         $value[] = 'frontend/forms 14400';
         $value = implode("\n", $value);
+
         return serialize($value);
     }
 }
diff --git a/_sql/migrations/1702-no-more-invalid-dates.php b/_sql/migrations/1702-no-more-invalid-dates.php
index 6a2e66bcc4a..a7ddd567a7a 100644
--- a/_sql/migrations/1702-no-more-invalid-dates.php
+++ b/_sql/migrations/1702-no-more-invalid-dates.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1702 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
@@ -42,7 +43,7 @@ public function up($modus)
         $sql[] = 'ALTER TABLE `s_user` CHANGE `firstlogin` `firstlogin` DATE  NULL  DEFAULT NULL;';
         $sql[] = 'ALTER TABLE `s_user` CHANGE `lastlogin` `lastlogin` DATETIME  NULL  DEFAULT NULL;';
 
-        foreach($sql as $query) {
+        foreach ($sql as $query) {
             $this->addSql($query);
         }
     }
diff --git a/_sql/migrations/1703-ignore-trailing-slash.php b/_sql/migrations/1703-ignore-trailing-slash.php
index 7c0d903ab53..67541a425b1 100644
--- a/_sql/migrations/1703-ignore-trailing-slash.php
+++ b/_sql/migrations/1703-ignore-trailing-slash.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
@@ -32,7 +32,7 @@ public function up($modus)
             ->query('SELECT id FROM `s_core_config_elements` WHERE `name` = "ignore_trailing_slash" AND form_id = (SELECT id FROM s_core_config_forms WHERE name = "Frontend100") LIMIT 1')
             ->fetch(PDO::FETCH_COLUMN);
 
-        if (is_string($elementExists)) {
+        if (\is_string($elementExists)) {
             return;
         }
 
diff --git a/_sql/migrations/1704-rename-default-emotion-elements.php b/_sql/migrations/1704-rename-default-emotion-elements.php
index 2ae487f030b..adab26ec693 100644
--- a/_sql/migrations/1704-rename-default-emotion-elements.php
+++ b/_sql/migrations/1704-rename-default-emotion-elements.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1704 extends Shopware\Components\Migrations\AbstractMigration
@@ -43,7 +43,7 @@ public function up($modus)
         ];
 
         foreach ($updates as $update) {
-            $sql = sprintf('UPDATE s_library_component component SET component.name = "%s" WHERE component.name = "%s"', $update[1], $update[0]);
+            $sql = \sprintf('UPDATE s_library_component component SET component.name = "%s" WHERE component.name = "%s"', $update[1], $update[0]);
             $this->addSql($sql);
         }
 
diff --git a/_sql/migrations/1705-remove-facebook-plugin.php b/_sql/migrations/1705-remove-facebook-plugin.php
index e629cd5757e..9788d78d1c1 100644
--- a/_sql/migrations/1705-remove-facebook-plugin.php
+++ b/_sql/migrations/1705-remove-facebook-plugin.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1705 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus): void
diff --git a/_sql/migrations/1706-add-missing-pks.php b/_sql/migrations/1706-add-missing-pks.php
index 532bd916bdf..03080f71625 100644
--- a/_sql/migrations/1706-add-missing-pks.php
+++ b/_sql/migrations/1706-add-missing-pks.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1706 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1707-remove-debug-plugin.php b/_sql/migrations/1707-remove-debug-plugin.php
index de01ee98418..00eda11f30d 100644
--- a/_sql/migrations/1707-remove-debug-plugin.php
+++ b/_sql/migrations/1707-remove-debug-plugin.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1707 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1708-add-config-hide-category-in-offcanvas-menu.php b/_sql/migrations/1708-add-config-hide-category-in-offcanvas-menu.php
index ee03a1bafff..331c61d8bd2 100644
--- a/_sql/migrations/1708-add-config-hide-category-in-offcanvas-menu.php
+++ b/_sql/migrations/1708-add-config-hide-category-in-offcanvas-menu.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1708 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1709-change-mail-footer.php b/_sql/migrations/1709-change-mail-footer.php
index 6518118882e..53be366495b 100644
--- a/_sql/migrations/1709-change-mail-footer.php
+++ b/_sql/migrations/1709-change-mail-footer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration1709 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/1710-correct-date-columns.php b/_sql/migrations/1710-correct-date-columns.php
index 55e5e4aa60d..859656b611c 100644
--- a/_sql/migrations/1710-correct-date-columns.php
+++ b/_sql/migrations/1710-correct-date-columns.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1710 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/1711-add-cookie-timeout.php b/_sql/migrations/1711-add-cookie-timeout.php
index ac9aaaa5787..c049fcad941 100644
--- a/_sql/migrations/1711-add-cookie-timeout.php
+++ b/_sql/migrations/1711-add-cookie-timeout.php
@@ -1,31 +1,31 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1711 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
-
         // Add configuration
         $sql = "SET @formId = (SELECT id FROM s_core_config_forms WHERE name = 'Privacy' LIMIT 1);";
         $this->addSql($sql);
diff --git a/_sql/migrations/1712-add-regulation-price.php b/_sql/migrations/1712-add-regulation-price.php
index c779eef8ecd..3c080daedb5 100644
--- a/_sql/migrations/1712-add-regulation-price.php
+++ b/_sql/migrations/1712-add-regulation-price.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1712 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
@@ -30,11 +31,9 @@ public function up($modus)
 SQL;
         $this->addSql($sql);
 
-
         $sql = <<<SQL
 ALTER TABLE `s_article_configurator_template_prices` ADD `regulation_price` DOUBLE AFTER `pseudoprice`;
 SQL;
         $this->addSql($sql);
-
     }
 }
diff --git a/_sql/migrations/1713-add-captcha-to-password-reset.php b/_sql/migrations/1713-add-captcha-to-password-reset.php
index 49d5dc835f7..bb58077a7ed 100644
--- a/_sql/migrations/1713-add-captcha-to-password-reset.php
+++ b/_sql/migrations/1713-add-captcha-to-password-reset.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration1713 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
@@ -39,7 +40,7 @@ public function up($modus)
             VALUE
                 (LAST_INSERT_ID(), 'passwordResetCaptcha', '%s', 'Captcha für das Zurücksetzen des Passworts', 'Wenn diese Option aktiv ist, wird das Formular zum Zurücksetzen des Passworts mit einem Captcha geschützt.',  'combo', 1, 0, 1, 'a:5:{s:8:"editable";b:0;s:10:"valueField";s:2:"id";s:12:"displayField";s:11:"displayname";s:13:"triggerAction";s:3:"all";s:5:"store";s:12:"base.Captcha";}');
 EOD;
-        $this->addSql(sprintf($sql, serialize('nocaptcha')));
+        $this->addSql(\sprintf($sql, serialize('nocaptcha')));
 
         // Translation
         $sql = <<<'EOD'
diff --git a/_sql/migrations/1714-add-option-for-email-notification-captcha.php b/_sql/migrations/1714-add-option-for-email-notification-captcha.php
new file mode 100644
index 00000000000..e8b1f6e2701
--- /dev/null
+++ b/_sql/migrations/1714-add-option-for-email-notification-captcha.php
@@ -0,0 +1,71 @@
+<?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration1714 extends Shopware\Components\Migrations\AbstractMigration
+{
+    public function up($modus)
+    {
+        // Create Notification Email parent
+        $sql = <<<'EOD'
+            INSERT INTO s_core_config_forms(`parent_id`, `name`, `label`, `position`)
+            VALUES('80', 'notificationCaptchaConfig', 'Produkt Benachrichtigungen', '0')
+EOD;
+        $this->addSql($sql);
+
+        // Create Captcha Option in Password Reset
+        $sql = <<<'EOD'
+            INSERT IGNORE s_core_config_elements
+                (`form_id`, `name`, `value`, `label`, `description`, `type`, `required`, `position`, `scope`, `options`)
+            VALUE
+                (LAST_INSERT_ID(), 'notificationCaptchaConfig', '%s', 'Captcha für E-Mail Benachrichtigungen von Produkten', 'Wenn diese Option aktiv ist, wird das Formular zur E-Mail Benachrichtigung für die Verfügbarkeit eines Produktes mit einem Captcha geschützt.',  'combo', 1, 0, 1, 'a:5:{s:8:"editable";b:0;s:10:"valueField";s:2:"id";s:12:"displayField";s:11:"displayname";s:13:"triggerAction";s:3:"all";s:5:"store";s:12:"base.Captcha";}');
+EOD;
+        $this->addSql(\sprintf($sql, serialize('nocaptcha')));
+
+        // Translation
+        $sql = <<<'EOD'
+            SET @elementId = (SELECT id FROM `s_core_config_elements` WHERE `name` LIKE 'notificationCaptchaConfig' LIMIT 1);
+EOD;
+        $this->addSql($sql);
+
+        $sql = <<<'EOD'
+            INSERT IGNORE INTO `s_core_config_element_translations`
+                (`element_id`, `locale_id`, `label`, `description`)
+            VALUES
+                (@elementId, '2', 'Use captcha for the e-mail notification for products', 'If this option is active, a captcha is used to protect e-mail notification form to notify about new products in stock.');
+EOD;
+        $this->addSql($sql);
+
+        // Config Element Translation
+        $sql = <<<'EOD'
+        SET @form_id = (SELECT id FROM `s_core_config_forms` WHERE `name` LIKE 'notificationCaptchaConfig' LIMIT 1);
+EOD;
+        $this->addSql($sql);
+
+        $sql = <<<'EOD'
+            INSERT INTO s_core_config_form_translations(form_id, locale_id, label)
+            VALUES (@form_id, 2, 'Product Notification');
+EOD;
+        $this->addSql($sql);
+    }
+}
diff --git a/_sql/migrations/1715-add-collation.php b/_sql/migrations/1715-add-collation.php
new file mode 100644
index 00000000000..1496579d390
--- /dev/null
+++ b/_sql/migrations/1715-add-collation.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration1715 extends Shopware\Components\Migrations\AbstractMigration
+{
+    public function up($modus)
+    {
+        $this->addSql(<<<'SQL'
+            ALTER TABLE `s_emarketing_partner_attributes` CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+SQL
+        );
+    }
+}
diff --git a/_sql/migrations/1716-fixing-bot-detection-huawei.php b/_sql/migrations/1716-fixing-bot-detection-huawei.php
new file mode 100644
index 00000000000..1f87c698eef
--- /dev/null
+++ b/_sql/migrations/1716-fixing-bot-detection-huawei.php
@@ -0,0 +1,96 @@
+<?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration1716 extends AbstractMigration
+{
+    public function up($modus): void
+    {
+        $this->fixStandardBlacklist();
+
+        $this->fixCustomerBlacklists();
+    }
+
+    private function fixStandardBlacklist(): void
+    {
+        $blacklistConfig = $this->connection
+            ->query("SELECT * FROM s_core_config_elements WHERE name = 'botBlackList'")
+            ->fetchAll(PDO::FETCH_ASSOC);
+
+        if (empty($blacklistConfig)) {
+            return;
+        }
+
+        $botList = $this->getFilteredBotList($blacklistConfig[0]['value']);
+        $statement = $this->connection->prepare(
+            'UPDATE s_core_config_elements
+             SET value = :value
+             WHERE id = :id'
+        );
+        $statement->execute([
+            'value' => $botList,
+            'id' => $blacklistConfig[0]['id'],
+        ]);
+    }
+
+    private function fixCustomerBlacklists(): void
+    {
+        $blacklistConfig = $this->connection
+            ->query(
+                "SELECT v.*
+                 FROM s_core_config_values as v
+                 INNER JOIN s_core_config_elements as e on v.element_id = e.id
+                 WHERE e.name = 'botBlackList'"
+            )
+            ->fetchAll(PDO::FETCH_ASSOC);
+
+        if (empty($blacklistConfig)) {
+            return;
+        }
+
+        foreach ($blacklistConfig as $config) {
+            $botList = $this->getFilteredBotList($config['value']);
+            $statement = $this->connection->prepare(
+                'UPDATE s_core_config_values
+                 SET value = :value
+                 WHERE id = :id'
+            );
+            $statement->execute([
+                'value' => $botList,
+                'id' => $config['id'],
+            ]);
+        }
+    }
+
+    private function getFilteredBotList(string $botConfiguration): string
+    {
+        $botList = explode(';', unserialize($botConfiguration, ['allowed_classes' => false]));
+        $botList = array_filter($botList, function ($bot) {
+            return $bot !== 'core';
+        });
+
+        return serialize(implode(';', $botList));
+    }
+}
diff --git a/_sql/migrations/1717-add-collation.php b/_sql/migrations/1717-add-collation.php
new file mode 100644
index 00000000000..483489e7ca7
--- /dev/null
+++ b/_sql/migrations/1717-add-collation.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration1717 extends Shopware\Components\Migrations\AbstractMigration
+{
+    public function up($modus)
+    {
+        $this->addSql(<<<'SQL'
+            ALTER TABLE `s_core_config_mails_attachments` CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+SQL
+        );
+    }
+}
diff --git a/_sql/migrations/1718-fix-argon2-mempry-cost.php b/_sql/migrations/1718-fix-argon2-mempry-cost.php
new file mode 100644
index 00000000000..5fef29b2174
--- /dev/null
+++ b/_sql/migrations/1718-fix-argon2-mempry-cost.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration1718 extends AbstractMigration
+{
+    public function up($modus)
+    {
+        $statement = $this->connection->prepare(
+            'UPDATE s_core_config_elements SET options = :option WHERE name = "argon2MemoryCost"'
+        );
+        $statement->execute([
+            'option' => serialize(['minValue' => (string) (1 << 10), 'maxValue' => (string) (1 << 62)]),
+        ]);
+    }
+}
diff --git a/_sql/migrations/1719-increase-keywords-datatype.php b/_sql/migrations/1719-increase-keywords-datatype.php
new file mode 100644
index 00000000000..335aaa55a06
--- /dev/null
+++ b/_sql/migrations/1719-increase-keywords-datatype.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration1719 extends Shopware\Components\Migrations\AbstractMigration
+{
+    public function up($modus)
+    {
+        $this->addSql(<<<'SQL'
+            ALTER TABLE `s_articles`
+            MODIFY COLUMN `keywords` MEDIUMTEXT COLLATE utf8_unicode_ci;
+SQL
+        );
+
+        $this->addSql(<<<'SQL'
+            ALTER TABLE `s_articles_supplier`
+            MODIFY COLUMN `meta_keywords` MEDIUMTEXT COLLATE utf8_unicode_ci;
+SQL
+        );
+
+        $this->addSql(<<<'SQL'
+            ALTER TABLE `s_blog`
+            MODIFY COLUMN `meta_keywords` MEDIUMTEXT COLLATE utf8_unicode_ci;
+SQL
+        );
+
+        $this->addSql(<<<'SQL'
+            ALTER TABLE `s_emotion`
+            MODIFY COLUMN `seo_keywords` MEDIUMTEXT COLLATE utf8_unicode_ci NOT NULL;
+SQL
+        );
+
+        $this->addSql(<<<'SQL'
+            ALTER TABLE `s_cms_support`
+            MODIFY COLUMN `meta_keywords` MEDIUMTEXT COLLATE utf8_unicode_ci;
+SQL
+        );
+
+        $this->addSql(<<<'SQL'
+            ALTER TABLE `s_cms_static`
+            MODIFY COLUMN `meta_keywords` MEDIUMTEXT COLLATE utf8_unicode_ci NOT NULL;
+SQL
+        );
+    }
+}
diff --git a/_sql/migrations/1720-add-preview-for-youtube-videos.php b/_sql/migrations/1720-add-preview-for-youtube-videos.php
new file mode 100644
index 00000000000..82a9a86841f
--- /dev/null
+++ b/_sql/migrations/1720-add-preview-for-youtube-videos.php
@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration1720 extends AbstractMigration
+{
+    public function up($modus)
+    {
+        $this->addSql('SET @componentId = (SELECT `id` FROM `s_library_component` WHERE `name` = "youtube")');
+        $this->addSql('SET @maxNumberPosition = (SELECT MAX(position) FROM `s_library_component_field` WHERE `componentID`=@componentId) + 1;');
+        $sql = <<<'EOD'
+INSERT IGNORE INTO `s_library_component_field` (`id`, `componentID`, `name`, `x_type`, `value_type`, `field_label`, `support_text`, `help_title`, `help_text`, `store`, `display_field`, `value_field`, `default_value`, `allow_blank`, `translatable`, `position`)
+VALUES
+(null, @componentId, 'load_video_on_confirmation', 'checkbox', '', 'Video erst nach Bestätigung durch den Kunden laden', '', '', '', '', '', '', 0, 0, 0, @maxNumberPosition),
+(null, @componentId, 'preview_image', 'mediaselectionfield', '', 'Vorschaubild', '', '', '', '', '', '', 0, 0, 0, @maxNumberPosition+1)
+;
+EOD;
+        $this->addSql($sql);
+    }
+}
diff --git a/_sql/migrations/1721-make-salutation-optional.php b/_sql/migrations/1721-make-salutation-optional.php
new file mode 100644
index 00000000000..ef19f142b1a
--- /dev/null
+++ b/_sql/migrations/1721-make-salutation-optional.php
@@ -0,0 +1,119 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration1721 extends AbstractMigration
+{
+    public function up($modus)
+    {
+        $sql = <<<'EOD'
+            SET @formId = (SELECT id FROM s_core_config_forms where name = 'Frontend33' LIMIT 1)
+EOD;
+        $this->addSql($sql);
+
+        $sql = <<<'EOD'
+            INSERT IGNORE s_core_config_elements
+                (`form_id`, `name`, `value`, `label`, `description`, `type`, `required`, `position`, `scope`, `options`)
+            VALUE
+                (@formId, 'shopSalutationRequired', 'b:1;', 'Anrede benötigt', 'Ob eine Anrede bei der Registrierung benötigt wird oder nicht.', 'boolean', 1, 1015, 1, '');
+EOD;
+        $this->addSql($sql);
+
+        $sql = <<<'EOD'
+            SET @elementId = (SELECT id FROM `s_core_config_elements` WHERE `name` LIKE 'shopSalutationRequired' LIMIT 1);
+EOD;
+        $this->addSql($sql);
+
+        $sql = <<<'EOD'
+            INSERT IGNORE INTO `s_core_config_element_translations`
+                (`element_id`, `locale_id`, `label`, `description`)
+            VALUES
+                (@elementId, '2', 'Salutation required', 'Whether or not a salutation is required upon registration.');
+EOD;
+        $this->addSql($sql);
+
+        $sql = <<<'EOD'
+            SET @salutation = (SELECT value FROM s_core_config_elements where name = 'shopsalutations' LIMIT 1)
+EOD;
+        $this->addSql($sql);
+
+        $sql = <<<'EOD'
+            UPDATE s_core_config_elements SET value =
+                (SELECT CONCAT('s:', CHAR_LENGTH(CONCAT(REPLACE(SUBSTRING(@salutation FROM 6), '";', ''), ',not_defined')), ':"', CONCAT(REPLACE(SUBSTRING(@salutation FROM 6), '";', ''), ',not_defined'), '";'))
+                where name = 'shopsalutations';
+EOD;
+        $this->addSql($sql);
+
+        $this->updateMailTemplates();
+    }
+
+    private function updateMailTemplates(): void
+    {
+        $sql = <<<'EOD'
+        UPDATE s_core_config_mails SET
+        content = REPLACE(content, '{$salutation|salutation}', '{$firstname}'),
+        contentHTML = REPLACE(contentHTML, '{$salutation|salutation}', '{$firstname}')
+        WHERE DIRTY = 0
+EOD;
+
+        $this->addSql($sql);
+
+        $sql = <<<'EOD'
+        UPDATE s_core_config_mails SET
+        content = REPLACE(content, '{$billingaddress.salutation|salutation}', '{$billingaddress.firstname}'),
+        contentHTML = REPLACE(contentHTML, '{$billingaddress.salutation|salutation}', '{$billingaddress.firstname}')
+        WHERE DIRTY = 0
+EOD;
+
+        $this->addSql($sql);
+
+        $sql = <<<'EOD'
+        UPDATE s_core_config_mails SET
+        content = REPLACE(content, '{$sUser.billing_salutation|salutation}', '{$sUser.billing_firstname}'),
+        contentHTML = REPLACE(contentHTML, '{$sUser.billing_salutation|salutation}', '{$sUser.billing_firstname}')
+        WHERE DIRTY = 0
+EOD;
+
+        $this->addSql($sql);
+
+        $sql = <<<'EOD'
+        UPDATE s_core_config_mails SET
+        content = REPLACE(content, '{$sUser.salutation|salutation}', '{$sUser.firstname}'),
+        contentHTML = REPLACE(contentHTML, '{$sUser.billing_salutation|salutation}', '{$sUser.billing_firstname}')
+        WHERE DIRTY = 0
+EOD;
+
+        $this->addSql($sql);
+
+        $sql = <<<'EOD'
+        UPDATE s_core_config_mails SET
+        content = REPLACE(content, '{$user.salutation|salutation}', '{$user.firstname}'),
+        contentHTML = REPLACE(contentHTML, '{$user.salutation|salutation}', '{$user.firstname}')
+        WHERE DIRTY = 0
+EOD;
+        $this->addSql($sql);
+    }
+}
diff --git a/_sql/migrations/1722-remove-motor-from-botlist.php b/_sql/migrations/1722-remove-motor-from-botlist.php
new file mode 100644
index 00000000000..ddbe582be81
--- /dev/null
+++ b/_sql/migrations/1722-remove-motor-from-botlist.php
@@ -0,0 +1,68 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration1722 extends AbstractMigration
+{
+    public function up($modus)
+    {
+        $selectSql = 'SELECT * FROM `s_core_config_elements` WHERE `name` = "botBlackList"';
+        $updateSql = 'UPDATE `s_core_config_elements` SET `value` = ? WHERE `id` = ?';
+
+        $configElement = $this->connection->query($selectSql)->fetch();
+
+        if (!\is_array($configElement)) {
+            return;
+        }
+
+        $serializedValue = $configElement['value'];
+        if (!\is_string($serializedValue)) {
+            return;
+        }
+
+        $unserializedValue = unserialize($serializedValue);
+        if (!\is_string($unserializedValue)) {
+            return;
+        }
+
+        $explodedValue = explode(';', $unserializedValue);
+        if (!\is_array($explodedValue)) {
+            return;
+        }
+
+        foreach ($explodedValue as $index => $singleValue) {
+            if ($singleValue === 'motor') {
+                unset($explodedValue[$index]);
+            }
+        }
+
+        $newUnserializedValue = implode(';', $explodedValue);
+
+        $newSerializedValue = serialize($newUnserializedValue);
+
+        $this->connection->prepare($updateSql)->execute([$newSerializedValue, $configElement['id']]);
+    }
+}
diff --git a/_sql/migrations/1723-remove-shopware-bi.php b/_sql/migrations/1723-remove-shopware-bi.php
new file mode 100644
index 00000000000..6330e3768c2
--- /dev/null
+++ b/_sql/migrations/1723-remove-shopware-bi.php
@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration1723 extends AbstractMigration
+{
+    public function up($modus)
+    {
+        $this->removeMenuEntries();
+        $this->removeConfigElement();
+        $this->removeWidget();
+    }
+
+    private function removeMenuEntries(): void
+    {
+        $sql = <<<'SQL'
+DELETE FROM `s_core_menu` WHERE `controller` = 'Benchmark'
+SQL;
+        $this->addSql($sql);
+    }
+
+    private function removeConfigElement(): void
+    {
+        $sql = <<<'SQL'
+SET @elementId = (SELECT `id` FROM `s_core_config_elements` WHERE name = 'benchmarkTeaser');
+DELETE FROM s_core_config_values WHERE element_id = @elementId;
+DELETE FROM s_core_config_elements WHERE id = @elementId;
+SQL;
+        $this->addSql($sql);
+    }
+
+    private function removeWidget(): void
+    {
+        $sql = <<<'SQL'
+DELETE FROM `s_core_widgets` WHERE `name` = 'swag-bi-base'
+SQL;
+        $this->addSql($sql);
+    }
+}
diff --git a/_sql/migrations/1724-remove-update-feedback.php b/_sql/migrations/1724-remove-update-feedback.php
new file mode 100644
index 00000000000..0964ae4fddd
--- /dev/null
+++ b/_sql/migrations/1724-remove-update-feedback.php
@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration1724 extends AbstractMigration
+{
+    public function up($modus)
+    {
+        $sql = "DELETE FROM s_core_config_elements WHERE `name` = 'update-feedback-api-endpoint';";
+        $this->addSql($sql);
+
+        $sql = "DELETE FROM s_core_config_elements WHERE `name` = 'update-send-feedback';";
+        $this->addSql($sql);
+    }
+}
diff --git a/_sql/migrations/1725-remove-feedback-popups.php b/_sql/migrations/1725-remove-feedback-popups.php
new file mode 100644
index 00000000000..48240c4c56a
--- /dev/null
+++ b/_sql/migrations/1725-remove-feedback-popups.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration1725 extends Shopware\Components\Migrations\AbstractMigration
+{
+    public function up($modus)
+    {
+        $sql = "UPDATE s_core_menu SET onclick = 'window.open(\'https://github.com/shopware5/shopware/issues\')' WHERE `name` = 'Feedback senden'";
+        $this->addSql($sql);
+
+        $sql = <<<'SQL'
+SET @elementId = (SELECT `id` FROM `s_core_config_elements` WHERE name = 'installationSurvey');
+DELETE FROM s_core_config_values WHERE element_id = @elementId;
+DELETE FROM s_core_config_element_translations WHERE element_id = @elementId;
+DELETE FROM s_core_config_elements WHERE id = @elementId;
+SQL;
+
+        $this->addSql($sql);
+    }
+}
diff --git a/_sql/migrations/1726-remove-update-form.php b/_sql/migrations/1726-remove-update-form.php
new file mode 100644
index 00000000000..f90f220294e
--- /dev/null
+++ b/_sql/migrations/1726-remove-update-form.php
@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration1726 extends AbstractMigration
+{
+    public function up($modus)
+    {
+        $this->moveTrackingIdConfigOutOfUpdateForm();
+
+        $this->removeAutoUpdateForm();
+    }
+
+    private function moveTrackingIdConfigOutOfUpdateForm(): void
+    {
+        $this->addSql("UPDATE s_core_config_elements SET form_id = 0 WHERE name = 'trackingUniqueId'");
+    }
+
+    private function removeAutoUpdateForm(): void
+    {
+        $this->addSql("SET @formId = (SELECT id FROM s_core_config_forms WHERE name = 'SwagUpdate' LIMIT 1)");
+        $this->addSql('DELETE FROM s_core_config_element_translations WHERE element_id in (SELECT id FROM s_core_config_elements WHERE form_id = @formId)');
+        $this->addSql('DELETE FROM s_core_config_values WHERE element_id in (SELECT id FROM s_core_config_elements WHERE form_id = @formId)');
+        $this->addSql('DELETE FROM s_core_config_form_translations WHERE form_id = @formId');
+        $this->addSql('DELETE FROM s_core_config_elements WHERE form_id = @formId');
+        $this->addSql('DELETE FROM s_core_config_forms WHERE id = @formId');
+        $this->addSql('DELETE FROM s_core_config_forms WHERE id = @formId;');
+    }
+}
diff --git a/_sql/migrations/1727-update-date-formatting.php b/_sql/migrations/1727-update-date-formatting.php
new file mode 100644
index 00000000000..c49aacf825c
--- /dev/null
+++ b/_sql/migrations/1727-update-date-formatting.php
@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration1727 extends AbstractMigration
+{
+    public function up($modus)
+    {
+        $sql = <<<'EOD'
+UPDATE `s_core_config_mails`
+SET content = REPLACE(content, '|date_format:"%d.%m.%Y"', '|date_format:"d.m.Y"'),
+    contentHTML = REPLACE(contentHTML, '|date_format:"%d.%m.%Y"', '|date_format:"d.m.Y"')
+WHERE dirty = 0;
+EOD;
+        $this->addSql($sql);
+    }
+}
diff --git a/_sql/migrations/200-drop-unused-factory-table.php b/_sql/migrations/200-drop-unused-factory-table.php
index f7c977e4a2c..0e14491afb5 100644
--- a/_sql/migrations/200-drop-unused-factory-table.php
+++ b/_sql/migrations/200-drop-unused-factory-table.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration200 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration200 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/201-add-supplier-seo.php b/_sql/migrations/201-add-supplier-seo.php
index 37e05329a49..23b842bebb4 100644
--- a/_sql/migrations/201-add-supplier-seo.php
+++ b/_sql/migrations/201-add-supplier-seo.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration201 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration201 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -21,6 +44,3 @@ public function up($modus)
         $this->addSql($sql);
     }
 }
-
-
-
diff --git a/_sql/migrations/202-unregister-routerold-dead-event.php b/_sql/migrations/202-unregister-routerold-dead-event.php
index 054b0d7efc9..9ed98ac2fe5 100644
--- a/_sql/migrations/202-unregister-routerold-dead-event.php
+++ b/_sql/migrations/202-unregister-routerold-dead-event.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration202 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration202 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/203-add-http-cache-clear-event.php b/_sql/migrations/203-add-http-cache-clear-event.php
index 353e059bccd..91c8d38367b 100644
--- a/_sql/migrations/203-add-http-cache-clear-event.php
+++ b/_sql/migrations/203-add-http-cache-clear-event.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration203 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration203 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/204-add-supplier-seo-template.php b/_sql/migrations/204-add-supplier-seo-template.php
index d7bcb5010f1..f7694f1af53 100644
--- a/_sql/migrations/204-add-supplier-seo-template.php
+++ b/_sql/migrations/204-add-supplier-seo-template.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration204 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration204 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -16,6 +39,3 @@ public function up($modus)
         $this->addSql($sql);
     }
 }
-
-
-
diff --git a/_sql/migrations/205-date-time-picker-label-update.php b/_sql/migrations/205-date-time-picker-label-update.php
index efc3c4d51d9..7a181aa9400 100644
--- a/_sql/migrations/205-date-time-picker-label-update.php
+++ b/_sql/migrations/205-date-time-picker-label-update.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration205 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration205 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/206-change-image-attributes.php b/_sql/migrations/206-change-image-attributes.php
index d7ae438eb06..f8f1632be9f 100644
--- a/_sql/migrations/206-change-image-attributes.php
+++ b/_sql/migrations/206-change-image-attributes.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration206 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration206 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/207-product-feed-export.php b/_sql/migrations/207-product-feed-export.php
index 90a060679dd..58da5dc2ec3 100644
--- a/_sql/migrations/207-product-feed-export.php
+++ b/_sql/migrations/207-product-feed-export.php
@@ -1,9 +1,32 @@
 <?php
-class Migrations_Migration207 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration207 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
-        /**
+        /*
          * @author Tiago Garcia
          *
          * This file is intentionally empty as it was included in a release
@@ -11,6 +34,5 @@ public function up($modus)
          * It's old content is now part of migration 212
          *
          **/
-        return;
     }
 }
diff --git a/_sql/migrations/208-snippet-handling-refactoring.php b/_sql/migrations/208-snippet-handling-refactoring.php
index 9cda68e6529..08080c07302 100644
--- a/_sql/migrations/208-snippet-handling-refactoring.php
+++ b/_sql/migrations/208-snippet-handling-refactoring.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration208 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration208 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/209-add-meta-title.php b/_sql/migrations/209-add-meta-title.php
index 296867b7755..6caf4b55274 100644
--- a/_sql/migrations/209-add-meta-title.php
+++ b/_sql/migrations/209-add-meta-title.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration209 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration209 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/210-add-meta-title-to-blog.php b/_sql/migrations/210-add-meta-title-to-blog.php
index a277c0dbd78..9949cd7a1de 100644
--- a/_sql/migrations/210-add-meta-title-to-blog.php
+++ b/_sql/migrations/210-add-meta-title-to-blog.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration210 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration210 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/211-add-always-secure.php b/_sql/migrations/211-add-always-secure.php
index c6afefe5b4a..91c58889115 100644
--- a/_sql/migrations/211-add-always-secure.php
+++ b/_sql/migrations/211-add-always-secure.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration211 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration211 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/212-product-feed-export.php b/_sql/migrations/212-product-feed-export.php
index 2246920131f..4b6768a2a5d 100644
--- a/_sql/migrations/212-product-feed-export.php
+++ b/_sql/migrations/212-product-feed-export.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration212 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration212 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/213-update-payment-methods-plugin.php b/_sql/migrations/213-update-payment-methods-plugin.php
index 8d340c86b18..84f02358979 100644
--- a/_sql/migrations/213-update-payment-methods-plugin.php
+++ b/_sql/migrations/213-update-payment-methods-plugin.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration213 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration213 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/214-add-debit-fields-to-payment-data.php b/_sql/migrations/214-add-debit-fields-to-payment-data.php
index 9050b195235..fcc12635455 100644
--- a/_sql/migrations/214-add-debit-fields-to-payment-data.php
+++ b/_sql/migrations/214-add-debit-fields-to-payment-data.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration214 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration214 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/215-enlarge-zipcode-and-streetnumber-user.php b/_sql/migrations/215-enlarge-zipcode-and-streetnumber-user.php
index 39221ea9d89..3d2beafa200 100644
--- a/_sql/migrations/215-enlarge-zipcode-and-streetnumber-user.php
+++ b/_sql/migrations/215-enlarge-zipcode-and-streetnumber-user.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration215 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration215 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/216-enlarge-zipcode-and-streetnumber-billing.php b/_sql/migrations/216-enlarge-zipcode-and-streetnumber-billing.php
index e5731c7c5bc..dfac5f41724 100644
--- a/_sql/migrations/216-enlarge-zipcode-and-streetnumber-billing.php
+++ b/_sql/migrations/216-enlarge-zipcode-and-streetnumber-billing.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration216 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration216 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/217-enlarge-zipcode-and-streetnumber-billing_shipping.php b/_sql/migrations/217-enlarge-zipcode-and-streetnumber-billing_shipping.php
index 5df04a13e22..ebe223036f4 100644
--- a/_sql/migrations/217-enlarge-zipcode-and-streetnumber-billing_shipping.php
+++ b/_sql/migrations/217-enlarge-zipcode-and-streetnumber-billing_shipping.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration217 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration217 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/218-remove-old-debug-plugins.php b/_sql/migrations/218-remove-old-debug-plugins.php
index 0105c1193f8..4be889ad43b 100644
--- a/_sql/migrations/218-remove-old-debug-plugins.php
+++ b/_sql/migrations/218-remove-old-debug-plugins.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration218 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration218 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/219-customer-payment-data-editing-in-be.php b/_sql/migrations/219-customer-payment-data-editing-in-be.php
index 0ef27748d0c..febdf0a1a46 100644
--- a/_sql/migrations/219-customer-payment-data-editing-in-be.php
+++ b/_sql/migrations/219-customer-payment-data-editing-in-be.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration219 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration219 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/220-add-payment-data-restriction.php b/_sql/migrations/220-add-payment-data-restriction.php
index 4ec5da70a69..e15e36d7f81 100644
--- a/_sql/migrations/220-add-payment-data-restriction.php
+++ b/_sql/migrations/220-add-payment-data-restriction.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration220 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration220 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/221-remove-log-plugin.php b/_sql/migrations/221-remove-log-plugin.php
index 5c6c8e42930..b0025ebec81 100644
--- a/_sql/migrations/221-remove-log-plugin.php
+++ b/_sql/migrations/221-remove-log-plugin.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration221 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration221 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/222-add-logmail-config.php b/_sql/migrations/222-add-logmail-config.php
index 5a567106ee2..10be26b0869 100644
--- a/_sql/migrations/222-add-logmail-config.php
+++ b/_sql/migrations/222-add-logmail-config.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration222 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration222 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -16,4 +39,3 @@ public function up($modus)
         $this->addSql($sql);
     }
 }
-
diff --git a/_sql/migrations/223-add-statistic-config.php b/_sql/migrations/223-add-statistic-config.php
index 4f69e0b8107..feb6a2a375f 100644
--- a/_sql/migrations/223-add-statistic-config.php
+++ b/_sql/migrations/223-add-statistic-config.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration223 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration223 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/224-add-statistic-impression-table.php b/_sql/migrations/224-add-statistic-impression-table.php
index b98ca63e105..89f3a323189 100644
--- a/_sql/migrations/224-add-statistic-impression-table.php
+++ b/_sql/migrations/224-add-statistic-impression-table.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration224 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration224 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/225-fix-emotion-required-fields.php b/_sql/migrations/225-fix-emotion-required-fields.php
index 74c64c96356..3a2749ebe08 100644
--- a/_sql/migrations/225-fix-emotion-required-fields.php
+++ b/_sql/migrations/225-fix-emotion-required-fields.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration225 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration225 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/226-add-tellafriend-remove-option.php b/_sql/migrations/226-add-tellafriend-remove-option.php
index 1fc1fde7644..ae32ab8f47d 100644
--- a/_sql/migrations/226-add-tellafriend-remove-option.php
+++ b/_sql/migrations/226-add-tellafriend-remove-option.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration226 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration226 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/227-fix-canonical-force-http-translation.php b/_sql/migrations/227-fix-canonical-force-http-translation.php
index 7da08de9f1d..4b040eda83f 100644
--- a/_sql/migrations/227-fix-canonical-force-http-translation.php
+++ b/_sql/migrations/227-fix-canonical-force-http-translation.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration227 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration227 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/228-add-canonical-force-http-description.php b/_sql/migrations/228-add-canonical-force-http-description.php
index 278715441e3..25ec510452a 100644
--- a/_sql/migrations/228-add-canonical-force-http-description.php
+++ b/_sql/migrations/228-add-canonical-force-http-description.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration228 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration228 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/229-fix-last-articles-plugin-config-form.php b/_sql/migrations/229-fix-last-articles-plugin-config-form.php
index db3cad1cd23..50bd08e815f 100644
--- a/_sql/migrations/229-fix-last-articles-plugin-config-form.php
+++ b/_sql/migrations/229-fix-last-articles-plugin-config-form.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration229 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration229 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/230-fix-emotion-mandatory-fields.php b/_sql/migrations/230-fix-emotion-mandatory-fields.php
index 5dbbb6721b6..20a0f9aeb54 100644
--- a/_sql/migrations/230-fix-emotion-mandatory-fields.php
+++ b/_sql/migrations/230-fix-emotion-mandatory-fields.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration230 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration230 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/231-update-redirectDownload-config-var.php b/_sql/migrations/231-update-redirectDownload-config-var.php
index f4e9c67f7c5..7ac8272d2a9 100644
--- a/_sql/migrations/231-update-redirectDownload-config-var.php
+++ b/_sql/migrations/231-update-redirectDownload-config-var.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration231 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration231 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/301-drop-unused-cms-content-table.php b/_sql/migrations/301-drop-unused-cms-content-table.php
index 537c733ffdd..8cf4bc8ccec 100644
--- a/_sql/migrations/301-drop-unused-cms-content-table.php
+++ b/_sql/migrations/301-drop-unused-cms-content-table.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration301 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration301 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/302-add-secure-cron.php b/_sql/migrations/302-add-secure-cron.php
index d1793b778c8..d427bc30b16 100644
--- a/_sql/migrations/302-add-secure-cron.php
+++ b/_sql/migrations/302-add-secure-cron.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration302 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration302 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/303-add-seo-categories.php b/_sql/migrations/303-add-seo-categories.php
index b92473f2d2e..b4ecf71b26f 100644
--- a/_sql/migrations/303-add-seo-categories.php
+++ b/_sql/migrations/303-add-seo-categories.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration303 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration303 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/304-widget-system-refactoring.php b/_sql/migrations/304-widget-system-refactoring.php
index cb986a8a046..51acdcfa765 100644
--- a/_sql/migrations/304-widget-system-refactoring.php
+++ b/_sql/migrations/304-widget-system-refactoring.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration304 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration304 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/305-add-product-feed-caching.php b/_sql/migrations/305-add-product-feed-caching.php
index 6d19b9ecc5b..7e7895e1d9e 100644
--- a/_sql/migrations/305-add-product-feed-caching.php
+++ b/_sql/migrations/305-add-product-feed-caching.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration305 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration305 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/306-update-secure-cron-description.php b/_sql/migrations/306-update-secure-cron-description.php
index 85bbe569af2..3ddf8b58d22 100644
--- a/_sql/migrations/306-update-secure-cron-description.php
+++ b/_sql/migrations/306-update-secure-cron-description.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration306 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration306 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/307-install-swag-update.php b/_sql/migrations/307-install-swag-update.php
index a3c01a32692..297b99e067f 100644
--- a/_sql/migrations/307-install-swag-update.php
+++ b/_sql/migrations/307-install-swag-update.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration307 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration307 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/308-increase-session-id-fields.php b/_sql/migrations/308-increase-session-id-fields.php
index 625c631f096..f561510e803 100644
--- a/_sql/migrations/308-increase-session-id-fields.php
+++ b/_sql/migrations/308-increase-session-id-fields.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration308 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration308 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
      * Increase the lenght of all fields that contain the session id
diff --git a/_sql/migrations/309-merchant-email-translation.php b/_sql/migrations/309-merchant-email-translation.php
index 1187350ca1f..3e8c6b05bce 100644
--- a/_sql/migrations/309-merchant-email-translation.php
+++ b/_sql/migrations/309-merchant-email-translation.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration309 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration309 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/310-swagupdate-translations.php b/_sql/migrations/310-swagupdate-translations.php
index ac730d514ac..b9ea92d2c94 100644
--- a/_sql/migrations/310-swagupdate-translations.php
+++ b/_sql/migrations/310-swagupdate-translations.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration310 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration310 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/311-subshop-maintenance-support.php b/_sql/migrations/311-subshop-maintenance-support.php
index 1dac1ac1fce..b3bfaf5b6fe 100644
--- a/_sql/migrations/311-subshop-maintenance-support.php
+++ b/_sql/migrations/311-subshop-maintenance-support.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration311 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration311 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/312-update-search-form-translation.php b/_sql/migrations/312-update-search-form-translation.php
index 1b7f9ab16bb..553a345a4b8 100644
--- a/_sql/migrations/312-update-search-form-translation.php
+++ b/_sql/migrations/312-update-search-form-translation.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration312 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration312 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/313-add-order-detail-fields.php b/_sql/migrations/313-add-order-detail-fields.php
index 9713b24861b..4338b1237ad 100644
--- a/_sql/migrations/313-add-order-detail-fields.php
+++ b/_sql/migrations/313-add-order-detail-fields.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration313 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration313 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/314-add-order-detail-pack-unit.php b/_sql/migrations/314-add-order-detail-pack-unit.php
index 05d87af94af..fc52799591e 100644
--- a/_sql/migrations/314-add-order-detail-pack-unit.php
+++ b/_sql/migrations/314-add-order-detail-pack-unit.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration314 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration314 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/315-update-shipping-address-country-field-labels.php b/_sql/migrations/315-update-shipping-address-country-field-labels.php
index 2165fa427a6..1481835c1b4 100644
--- a/_sql/migrations/315-update-shipping-address-country-field-labels.php
+++ b/_sql/migrations/315-update-shipping-address-country-field-labels.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration315 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration315 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/316-update-seo-nofollow-labels.php b/_sql/migrations/316-update-seo-nofollow-labels.php
index f1bdaf5699f..34d61aa27f1 100644
--- a/_sql/migrations/316-update-seo-nofollow-labels.php
+++ b/_sql/migrations/316-update-seo-nofollow-labels.php
@@ -1,4 +1,27 @@
 <?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration316 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/317-update-store-api-url.php b/_sql/migrations/317-update-store-api-url.php
index 2450f5102c5..41ea8910ca1 100644
--- a/_sql/migrations/317-update-store-api-url.php
+++ b/_sql/migrations/317-update-store-api-url.php
@@ -1,4 +1,27 @@
 <?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration317 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
@@ -38,6 +61,5 @@ public function up($modus)
 EOD;
 
         $this->addSql($sql);
-
     }
 }
diff --git a/_sql/migrations/318-update-payment-methods-version.php b/_sql/migrations/318-update-payment-methods-version.php
index b96e3f3b24a..0d31837c46f 100644
--- a/_sql/migrations/318-update-payment-methods-version.php
+++ b/_sql/migrations/318-update-payment-methods-version.php
@@ -1,4 +1,27 @@
 <?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration318 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/319-update-google-plugin.php b/_sql/migrations/319-update-google-plugin.php
index 33135461117..f84c8ac114a 100644
--- a/_sql/migrations/319-update-google-plugin.php
+++ b/_sql/migrations/319-update-google-plugin.php
@@ -1,4 +1,27 @@
 <?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration319 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/330-add-secure-uninstall-capability.php b/_sql/migrations/330-add-secure-uninstall-capability.php
index 63be8a83ffc..4f20c672041 100644
--- a/_sql/migrations/330-add-secure-uninstall-capability.php
+++ b/_sql/migrations/330-add-secure-uninstall-capability.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration330 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration330 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/350-add-template-parent.php b/_sql/migrations/350-add-template-parent.php
index fac13679f66..62709c25328 100644
--- a/_sql/migrations/350-add-template-parent.php
+++ b/_sql/migrations/350-add-template-parent.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration350 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration350 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -9,6 +32,3 @@ public function up($modus)
         $this->addSql($sql);
     }
 }
-
-
-
diff --git a/_sql/migrations/351-add-template-menu.php b/_sql/migrations/351-add-template-menu.php
index 1dc7124d291..0f9a1cbf285 100644
--- a/_sql/migrations/351-add-template-menu.php
+++ b/_sql/migrations/351-add-template-menu.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration351 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration351 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -12,6 +35,3 @@ public function up($modus)
         $this->addSql($sql);
     }
 }
-
-
-
diff --git a/_sql/migrations/352-add-theme-config.php b/_sql/migrations/352-add-theme-config.php
index 4159b593de8..189a41feb83 100644
--- a/_sql/migrations/352-add-theme-config.php
+++ b/_sql/migrations/352-add-theme-config.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration352 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration352 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -24,7 +47,6 @@ public function up($modus)
 EOD;
         $this->addSql($sql);
 
-
         $sql = <<<'EOD'
 
 CREATE TABLE IF NOT EXISTS `s_core_templates_config_layout` (
@@ -41,8 +63,6 @@ public function up($modus)
 EOD;
         $this->addSql($sql);
 
-
-
         $sql = <<<'EOD'
 
 CREATE TABLE IF NOT EXISTS `s_core_templates_config_values` (
@@ -57,7 +77,6 @@ public function up($modus)
 EOD;
         $this->addSql($sql);
 
-
         $sql = <<<'EOD'
 
 CREATE TABLE IF NOT EXISTS `s_core_templates_config_set` (
@@ -73,7 +92,6 @@ public function up($modus)
 EOD;
         $this->addSql($sql);
 
-
         $sql = <<<'EOD'
 
 CREATE TABLE IF NOT EXISTS `s_core_theme_settings` (
@@ -89,7 +107,6 @@ public function up($modus)
 EOD;
         $this->addSql($sql);
 
-
         $sql = <<<'EOD'
 INSERT INTO `s_core_theme_settings`
 (`compiler_force`, `compiler_create_source_map`, `compiler_compress_css`, `compiler_compress_js`)
@@ -97,8 +114,5 @@ public function up($modus)
 (0, 0, 1, 1);
 EOD;
         $this->addSql($sql);
-
     }
 }
-
-
diff --git a/_sql/migrations/353-add-horizontal-scrolling-emotion.php b/_sql/migrations/353-add-horizontal-scrolling-emotion.php
index 10ddc25dadd..882f267e2ac 100644
--- a/_sql/migrations/353-add-horizontal-scrolling-emotion.php
+++ b/_sql/migrations/353-add-horizontal-scrolling-emotion.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration353 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration353 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/354-add-video-element.php b/_sql/migrations/354-add-video-element.php
index c338bf05c28..e0447ac7955 100644
--- a/_sql/migrations/354-add-video-element.php
+++ b/_sql/migrations/354-add-video-element.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration354 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration354 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/355-remove-config-module-template-manager.php b/_sql/migrations/355-remove-config-module-template-manager.php
index c557996f461..f04810387f0 100644
--- a/_sql/migrations/355-remove-config-module-template-manager.php
+++ b/_sql/migrations/355-remove-config-module-template-manager.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration355 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration355 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -10,8 +33,5 @@ public function up($modus)
     DELETE FROM s_core_config_forms WHERE id = @formId;
 EOD;
         $this->addSql($sql);
-
     }
 }
-
-
diff --git a/_sql/migrations/356-email-datetime-format.php b/_sql/migrations/356-email-datetime-format.php
index 564b032c1f1..b8a8251d5fa 100644
--- a/_sql/migrations/356-email-datetime-format.php
+++ b/_sql/migrations/356-email-datetime-format.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration356 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration356 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -22,6 +45,3 @@ public function up($modus)
         $this->addSql($sql);
     }
 }
-
-
-
diff --git a/_sql/migrations/357-add-changed-and-mobileactive-columns.php b/_sql/migrations/357-add-changed-and-mobileactive-columns.php
index d671fa4d093..98974b3710f 100644
--- a/_sql/migrations/357-add-changed-and-mobileactive-columns.php
+++ b/_sql/migrations/357-add-changed-and-mobileactive-columns.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration357 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration357 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/358-add-registration-field-options.php b/_sql/migrations/358-add-registration-field-options.php
index 04bdff6b330..082bcb148de 100644
--- a/_sql/migrations/358-add-registration-field-options.php
+++ b/_sql/migrations/358-add-registration-field-options.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration358 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration358 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/359-add_additional_address_data_order_billing.php b/_sql/migrations/359-add_additional_address_data_order_billing.php
index 63ee697ec51..63c90561069 100644
--- a/_sql/migrations/359-add_additional_address_data_order_billing.php
+++ b/_sql/migrations/359-add_additional_address_data_order_billing.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration359 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration359 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -11,6 +34,3 @@ public function up($modus)
         $this->addSql($sql);
     }
 }
-
-
-
diff --git a/_sql/migrations/360-add_additional_address_data_order_shipping.php b/_sql/migrations/360-add_additional_address_data_order_shipping.php
index 8d933f37bf4..7965403c7e9 100644
--- a/_sql/migrations/360-add_additional_address_data_order_shipping.php
+++ b/_sql/migrations/360-add_additional_address_data_order_shipping.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration360 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration360 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -11,6 +34,3 @@ public function up($modus)
         $this->addSql($sql);
     }
 }
-
-
-
diff --git a/_sql/migrations/361-additional_address-config.php b/_sql/migrations/361-additional_address-config.php
index 4a318d74c8c..21a5fc62c79 100644
--- a/_sql/migrations/361-additional_address-config.php
+++ b/_sql/migrations/361-additional_address-config.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration361 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration361 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/362-add_additional_address_data_user_billing.php b/_sql/migrations/362-add_additional_address_data_user_billing.php
index 414071bde85..11c5df74d7d 100644
--- a/_sql/migrations/362-add_additional_address_data_user_billing.php
+++ b/_sql/migrations/362-add_additional_address_data_user_billing.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration362 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration362 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -10,6 +33,3 @@ public function up($modus)
         $this->addSql($sql);
     }
 }
-
-
-
diff --git a/_sql/migrations/363-add_additional_address_data_user_shipping.php b/_sql/migrations/363-add_additional_address_data_user_shipping.php
index 93c3715e7e6..bfa6693fea5 100644
--- a/_sql/migrations/363-add_additional_address_data_user_shipping.php
+++ b/_sql/migrations/363-add_additional_address_data_user_shipping.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration363 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration363 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -10,6 +33,3 @@ public function up($modus)
         $this->addSql($sql);
     }
 }
-
-
-
diff --git a/_sql/migrations/364-remove-article-impression.php b/_sql/migrations/364-remove-article-impression.php
index 2eece80133a..36a06ec993d 100644
--- a/_sql/migrations/364-remove-article-impression.php
+++ b/_sql/migrations/364-remove-article-impression.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration364 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration364 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -9,6 +32,3 @@ public function up($modus)
         $this->addSql($sql);
     }
 }
-
-
-
diff --git a/_sql/migrations/365-google-analytics-plugin-upgrade.php b/_sql/migrations/365-google-analytics-plugin-upgrade.php
index c159d06dbe4..bd8d4c6ee1b 100644
--- a/_sql/migrations/365-google-analytics-plugin-upgrade.php
+++ b/_sql/migrations/365-google-analytics-plugin-upgrade.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration365 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration365 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -25,6 +48,3 @@ public function up($modus)
         }
     }
 }
-
-
-
diff --git a/_sql/migrations/366-translations.php b/_sql/migrations/366-translations.php
index 88eb651a312..6ae5b597fe3 100644
--- a/_sql/migrations/366-translations.php
+++ b/_sql/migrations/366-translations.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration366 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration366 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/367-mobile-statistics.php b/_sql/migrations/367-mobile-statistics.php
index 6a55949c1be..7cc42e14b23 100644
--- a/_sql/migrations/367-mobile-statistics.php
+++ b/_sql/migrations/367-mobile-statistics.php
@@ -1,4 +1,27 @@
 <?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration367 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
@@ -26,6 +49,3 @@ public function up($modus)
         $this->addSql($sql);
     }
 }
-
-
-
diff --git a/_sql/migrations/368-form-elem-text2-labels.php b/_sql/migrations/368-form-elem-text2-labels.php
index 552715e13d3..434ec562b24 100644
--- a/_sql/migrations/368-form-elem-text2-labels.php
+++ b/_sql/migrations/368-form-elem-text2-labels.php
@@ -1,4 +1,27 @@
 <?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration368 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
@@ -12,6 +35,3 @@ public function up($modus)
         $this->addSql($sql);
     }
 }
-
-
-
diff --git a/_sql/migrations/369-change-min-purchase.php b/_sql/migrations/369-change-min-purchase.php
index 52f9454eea2..2db63c6cb3b 100644
--- a/_sql/migrations/369-change-min-purchase.php
+++ b/_sql/migrations/369-change-min-purchase.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration369 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration369 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/370-optimize-performance.php b/_sql/migrations/370-optimize-performance.php
index f9862c77106..986f9ed2392 100644
--- a/_sql/migrations/370-optimize-performance.php
+++ b/_sql/migrations/370-optimize-performance.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration370 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration370 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -18,15 +40,15 @@ public function up($modus)
 immediateDelivery=delivery,
 sSort=o';
 
-                $statement = $this->connection->prepare("UPDATE s_core_config_elements SET value = ? WHERE id = ?");
-                $statement->execute(array(serialize($value), $config['id']));
+                $statement = $this->connection->prepare('UPDATE s_core_config_elements SET value = ? WHERE id = ?');
+                $statement->execute([serialize($value), $config['id']]);
             }
 
-            $statement = $this->connection->prepare("SELECT * FROM s_core_config_values WHERE element_id = ?");
-            $statement->execute(array($config['id']));
+            $statement = $this->connection->prepare('SELECT * FROM s_core_config_values WHERE element_id = ?');
+            $statement->execute([$config['id']]);
             $values = $statement->fetchAll(PDO::FETCH_ASSOC);
 
-            foreach($values as $shopValue) {
+            foreach ($values as $shopValue) {
                 if (empty($shopValue) || empty($shopValue['value'])) {
                     continue;
                 }
@@ -43,11 +65,9 @@ public function up($modus)
 immediateDelivery=delivery,
 sSort=o';
 
-                $statement = $this->connection->prepare("UPDATE s_core_config_values SET value = ? WHERE id = ?");
-                $statement->execute(array(serialize($value), $shopValue['id']));
-
+                $statement = $this->connection->prepare('UPDATE s_core_config_values SET value = ? WHERE id = ?');
+                $statement->execute([serialize($value), $shopValue['id']]);
             }
-
         }
 
         $sql = <<<'EOD'
@@ -56,5 +76,4 @@ public function up($modus)
 EOD;
         $this->addSql($sql);
     }
-
 }
diff --git a/_sql/migrations/371-add-multi-edit-config-options.php b/_sql/migrations/371-add-multi-edit-config-options.php
index 65f84672384..616b6706ba8 100644
--- a/_sql/migrations/371-add-multi-edit-config-options.php
+++ b/_sql/migrations/371-add-multi-edit-config-options.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration371 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration371 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/372-setup-multi-edit.php b/_sql/migrations/372-setup-multi-edit.php
index 9e3428acc49..31b85379e5c 100644
--- a/_sql/migrations/372-setup-multi-edit.php
+++ b/_sql/migrations/372-setup-multi-edit.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration372 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration372 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/373-address-streetnumber-merge.php b/_sql/migrations/373-address-streetnumber-merge.php
index eeceefa484d..a7a4124e207 100644
--- a/_sql/migrations/373-address-streetnumber-merge.php
+++ b/_sql/migrations/373-address-streetnumber-merge.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration373 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration373 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -21,8 +44,6 @@ public function up($modus)
 EOD;
         $this->addSql($sql);
 
-
-
         /**
          * Migrate s_campaigns_maildata
          */
@@ -36,8 +57,6 @@ public function up($modus)
 EOD;
         $this->addSql($sql);
 
-
-
         /**
          * Migrate other data (emails, translations, etc)
          */
diff --git a/_sql/migrations/374-s-order-billing-enlarge-street-field.php b/_sql/migrations/374-s-order-billing-enlarge-street-field.php
index 9ccef8b1fed..a7638849f66 100644
--- a/_sql/migrations/374-s-order-billing-enlarge-street-field.php
+++ b/_sql/migrations/374-s-order-billing-enlarge-street-field.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration374 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration374 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/375-s-order-billing-merge-street-number.php b/_sql/migrations/375-s-order-billing-merge-street-number.php
index f0bd0dc5da3..c156de3d3b5 100644
--- a/_sql/migrations/375-s-order-billing-merge-street-number.php
+++ b/_sql/migrations/375-s-order-billing-merge-street-number.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration375 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration375 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/376-s-order-billing-drop-street-number.php b/_sql/migrations/376-s-order-billing-drop-street-number.php
index e784216f72a..7dcfd909c9a 100644
--- a/_sql/migrations/376-s-order-billing-drop-street-number.php
+++ b/_sql/migrations/376-s-order-billing-drop-street-number.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration376 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration376 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/377-s-order-shipping-enlarge-street-field.php b/_sql/migrations/377-s-order-shipping-enlarge-street-field.php
index 6a82aec8304..5b9bc53e273 100644
--- a/_sql/migrations/377-s-order-shipping-enlarge-street-field.php
+++ b/_sql/migrations/377-s-order-shipping-enlarge-street-field.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration377 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration377 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/378-s-order-shipping-merge-street-number.php b/_sql/migrations/378-s-order-shipping-merge-street-number.php
index bdbe79616a6..93203cde701 100644
--- a/_sql/migrations/378-s-order-shipping-merge-street-number.php
+++ b/_sql/migrations/378-s-order-shipping-merge-street-number.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration378 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration378 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/379-s-order-shipping-drop-street-number.php b/_sql/migrations/379-s-order-shipping-drop-street-number.php
index 07dd29d7b20..38b6e9aeca9 100644
--- a/_sql/migrations/379-s-order-shipping-drop-street-number.php
+++ b/_sql/migrations/379-s-order-shipping-drop-street-number.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration379 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration379 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/380-s-user-billing-enlarge-street-field.php b/_sql/migrations/380-s-user-billing-enlarge-street-field.php
index 47a93c0ad3e..1742e07f73f 100644
--- a/_sql/migrations/380-s-user-billing-enlarge-street-field.php
+++ b/_sql/migrations/380-s-user-billing-enlarge-street-field.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration380 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration380 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/381-s-user-billing-merge-street-number.php b/_sql/migrations/381-s-user-billing-merge-street-number.php
index e1cf53ca103..c5b417c9a93 100644
--- a/_sql/migrations/381-s-user-billing-merge-street-number.php
+++ b/_sql/migrations/381-s-user-billing-merge-street-number.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration381 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration381 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/382-s-user-billing-drop-street-number.php b/_sql/migrations/382-s-user-billing-drop-street-number.php
index c757882989e..a3807c3d898 100644
--- a/_sql/migrations/382-s-user-billing-drop-street-number.php
+++ b/_sql/migrations/382-s-user-billing-drop-street-number.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration382 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration382 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/383-s-user-shipping-enlarge-street-field.php b/_sql/migrations/383-s-user-shipping-enlarge-street-field.php
index 788cdcd7280..39d973c90b1 100644
--- a/_sql/migrations/383-s-user-shipping-enlarge-street-field.php
+++ b/_sql/migrations/383-s-user-shipping-enlarge-street-field.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration383 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration383 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/384-s-user-shipping-merge-street-number.php b/_sql/migrations/384-s-user-shipping-merge-street-number.php
index 32088507abf..73a18d99090 100644
--- a/_sql/migrations/384-s-user-shipping-merge-street-number.php
+++ b/_sql/migrations/384-s-user-shipping-merge-street-number.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration384 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration384 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/385-s-user-shipping-drop-street-number.php b/_sql/migrations/385-s-user-shipping-drop-street-number.php
index 7e796f0df85..9a05580cffd 100644
--- a/_sql/migrations/385-s-user-shipping-drop-street-number.php
+++ b/_sql/migrations/385-s-user-shipping-drop-street-number.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration385 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration385 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/386-import-multiedit-plugin-tables.php b/_sql/migrations/386-import-multiedit-plugin-tables.php
index f3df1d3fa55..96f4877e5f1 100644
--- a/_sql/migrations/386-import-multiedit-plugin-tables.php
+++ b/_sql/migrations/386-import-multiedit-plugin-tables.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration386 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration386 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -7,12 +30,12 @@ public function up($modus)
         try {
             $statement = $this->connection->query("SHOW TABLES LIKE 's_plugin_multi_edit_filter'");
             $result = $statement->fetch(PDO::FETCH_COLUMN);
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             return;
         }
 
         // If not - return
-        if (empty($result))  {
+        if (empty($result)) {
             return;
         }
 
diff --git a/_sql/migrations/387-display-shipping-calculations-in-basket.php b/_sql/migrations/387-display-shipping-calculations-in-basket.php
index 527f9e2ef89..7c5054d403d 100644
--- a/_sql/migrations/387-display-shipping-calculations-in-basket.php
+++ b/_sql/migrations/387-display-shipping-calculations-in-basket.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration387 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration387 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -17,6 +40,3 @@ public function up($modus)
         $this->addSql($sql);
     }
 }
-
-
-
diff --git a/_sql/migrations/388-add-emotion-fields-position.php b/_sql/migrations/388-add-emotion-fields-position.php
index 2b5adf212fb..878804ad6db 100644
--- a/_sql/migrations/388-add-emotion-fields-position.php
+++ b/_sql/migrations/388-add-emotion-fields-position.php
@@ -1,12 +1,35 @@
 <?php
-class Migrations_Migration388 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration388 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
-        $this->addSql("ALTER TABLE s_library_component_field ADD position INT NULL;");
-        $this->addSql("UPDATE s_library_component_field SET position = id;");
+        $this->addSql('ALTER TABLE s_library_component_field ADD position INT NULL;');
+        $this->addSql('UPDATE s_library_component_field SET position = id;');
         $this->addSql("SET @parent = (SELECT id FROM `s_library_component` WHERE `x_type`='emotion-components-article-slider' AND template = 'component_article_slider' AND pluginID IS NULL LIMIT 1);");
         $this->addSql("SET @maxNumberPosition = (SELECT id FROM `s_library_component_field` WHERE `name`='article_slider_max_number' AND componentID = @parent LIMIT 1);");
-        $this->addSql("UPDATE s_library_component_field SET position = position+1 WHERE componentID = @parent AND id >= @maxNumberPosition;");
+        $this->addSql('UPDATE s_library_component_field SET position = position+1 WHERE componentID = @parent AND id >= @maxNumberPosition;');
     }
 }
diff --git a/_sql/migrations/389-fix-custom-form-field-sorting.php b/_sql/migrations/389-fix-custom-form-field-sorting.php
index eb375d82767..9b765adfc14 100644
--- a/_sql/migrations/389-fix-custom-form-field-sorting.php
+++ b/_sql/migrations/389-fix-custom-form-field-sorting.php
@@ -1,22 +1,46 @@
 <?php
-class Migrations_Migration389 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration389 extends AbstractMigration
 {
     public function up($modus)
     {
         // Check if the table from the plugin is available
         try {
-            $statement = $this->connection->query("SELECT DISTINCT id FROM s_cms_support;");
+            $statement = $this->connection->query('SELECT DISTINCT id FROM s_cms_support;');
             $forms = $statement->fetchAll(PDO::FETCH_COLUMN);
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             return;
         }
 
-        foreach($forms as $formId) {
+        foreach ($forms as $formId) {
             try {
                 $statement = $this->connection->query("SELECT count(DISTINCT id) FROM s_cms_support_fields WHERE position = 0 AND supportID = $formId;");
-                $fieldCountArray = $statement->fetch(PDO::FETCH_NUM);
-                $fieldCount = array_shift($fieldCountArray);
-            } catch(Exception $e) {
+                $fieldCount = (int) $statement->fetchColumn();
+            } catch (Exception $e) {
                 continue;
             }
 
diff --git a/_sql/migrations/390-add-device-column.php b/_sql/migrations/390-add-device-column.php
index d59482ff936..30fd966a3bb 100644
--- a/_sql/migrations/390-add-device-column.php
+++ b/_sql/migrations/390-add-device-column.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration390 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration390 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -8,4 +31,4 @@ public function up($modus)
 EOD;
         $this->addSql($sql);
     }
-}
\ No newline at end of file
+}
diff --git a/_sql/migrations/391-fix-attr17.php b/_sql/migrations/391-fix-attr17.php
index e216db64a66..8b57f26dd80 100644
--- a/_sql/migrations/391-fix-attr17.php
+++ b/_sql/migrations/391-fix-attr17.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration391 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration391 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -7,6 +30,6 @@ public function up($modus)
             return;
         }
 
-        $this->addSql("ALTER TABLE s_articles_attributes MODIFY attr17 varchar(255)");
+        $this->addSql('ALTER TABLE s_articles_attributes MODIFY attr17 varchar(255)');
     }
 }
diff --git a/_sql/migrations/392-remove-unused-listerner.php b/_sql/migrations/392-remove-unused-listerner.php
index 79f93a415fa..5e514c645c0 100644
--- a/_sql/migrations/392-remove-unused-listerner.php
+++ b/_sql/migrations/392-remove-unused-listerner.php
@@ -1,10 +1,31 @@
 <?php
-class Migrations_Migration392 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration392 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
         $this->addSql('DELETE FROM s_core_subscribes WHERE listener LIKE "Shopware_Plugins_Frontend_Statistics_Bootstrap::onDispatchLoopShutdown"');
     }
 }
-
-
diff --git a/_sql/migrations/393-add-404-page-config-options.php b/_sql/migrations/393-add-404-page-config-options.php
index bd74e26c24a..21e46faffdd 100644
--- a/_sql/migrations/393-add-404-page-config-options.php
+++ b/_sql/migrations/393-add-404-page-config-options.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration393 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration393 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/394-add-company-register-config.php b/_sql/migrations/394-add-company-register-config.php
index 25285c858e3..a95f01a2f3b 100644
--- a/_sql/migrations/394-add-company-register-config.php
+++ b/_sql/migrations/394-add-company-register-config.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration394 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration394 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/395-remove-obsolete-trusted-shops-code.php b/_sql/migrations/395-remove-obsolete-trusted-shops-code.php
index eb0fa625e49..503e40cfd47 100644
--- a/_sql/migrations/395-remove-obsolete-trusted-shops-code.php
+++ b/_sql/migrations/395-remove-obsolete-trusted-shops-code.php
@@ -1,20 +1,42 @@
 <?php
-class Migrations_Migration395 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration395 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
         $this->addSql("SET @formId = (SELECT id FROM s_core_config_forms WHERE name LIKE 'TrustedShop' LIMIT 1)");
 
-        $this->addSql("
+        $this->addSql('
             DELETE FROM s_core_config_element_translations
             WHERE element_id =
-            (SELECT id FROM s_core_config_elements WHERE form_id = @formId)"
+            (SELECT id FROM s_core_config_elements WHERE form_id = @formId)'
         );
 
-        $this->addSql("DELETE FROM s_core_config_elements WHERE form_id = @formId");
-
-        $this->addSql("DELETE FROM s_core_config_form_translations WHERE form_id = @formId");
-        $this->addSql("DELETE FROM s_core_config_forms WHERE id = @formId");
+        $this->addSql('DELETE FROM s_core_config_elements WHERE form_id = @formId');
 
+        $this->addSql('DELETE FROM s_core_config_form_translations WHERE form_id = @formId');
+        $this->addSql('DELETE FROM s_core_config_forms WHERE id = @formId');
     }
 }
diff --git a/_sql/migrations/396-add-family-friendly-meta.php b/_sql/migrations/396-add-family-friendly-meta.php
index fca9ee40f88..4b95e5db2c0 100644
--- a/_sql/migrations/396-add-family-friendly-meta.php
+++ b/_sql/migrations/396-add-family-friendly-meta.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration396 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration396 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/397-form-meta-data.php b/_sql/migrations/397-form-meta-data.php
index b7a6ede159d..10cdcb12fb2 100644
--- a/_sql/migrations/397-form-meta-data.php
+++ b/_sql/migrations/397-form-meta-data.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration397 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration397 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/398-add-custom-and-form-seo-template.php b/_sql/migrations/398-add-custom-and-form-seo-template.php
index de1613bfd25..d1da908337e 100644
--- a/_sql/migrations/398-add-custom-and-form-seo-template.php
+++ b/_sql/migrations/398-add-custom-and-form-seo-template.php
@@ -1,9 +1,31 @@
 <?php
-class Migrations_Migration398 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration398 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
-
         // seo router config form
         $sql = <<<'EOD'
         SET @parent = (SELECT id FROM s_core_config_forms WHERE name = 'Frontend100' LIMIT 1);
@@ -51,6 +73,3 @@ public function up($modus)
         $this->addSql($sql);
     }
 }
-
-
-
diff --git a/_sql/migrations/399-remove-unused-rewrite-table.php b/_sql/migrations/399-remove-unused-rewrite-table.php
index 1d4fafcc23e..395b891a11c 100644
--- a/_sql/migrations/399-remove-unused-rewrite-table.php
+++ b/_sql/migrations/399-remove-unused-rewrite-table.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration399 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration399 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/400-article-list-config-translations.php b/_sql/migrations/400-article-list-config-translations.php
index 59175009521..54d1755fa90 100644
--- a/_sql/migrations/400-article-list-config-translations.php
+++ b/_sql/migrations/400-article-list-config-translations.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration400 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration400 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -22,8 +44,8 @@ public function up($modus)
         ")->fetchColumn(0);
 
         if ($fixed && $wrong) {
-            $this->addSql("DELETE FROM s_core_config_elements WHERE id = " . $wrong);
-        } else if (!$fixed && $wrong) {
+            $this->addSql('DELETE FROM s_core_config_elements WHERE id = ' . $wrong);
+        } elseif (!$fixed && $wrong) {
             // Fix broken config name
             $sql = "UPDATE s_core_config_elements SET name = 'clearCache', value = 'b:0;' WHERE id = " . $wrong;
             $this->addSql($sql);
diff --git a/_sql/migrations/401-remove-unused-table.php b/_sql/migrations/401-remove-unused-table.php
index 15190c9e9f6..a7ae348c69e 100644
--- a/_sql/migrations/401-remove-unused-table.php
+++ b/_sql/migrations/401-remove-unused-table.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration401 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration401 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/402-remove-dead-event.php b/_sql/migrations/402-remove-dead-event.php
index bc53b416cb7..cf06e488d3e 100644
--- a/_sql/migrations/402-remove-dead-event.php
+++ b/_sql/migrations/402-remove-dead-event.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration402 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration402 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/403-add-emotion-hint-to-basket-colors.php b/_sql/migrations/403-add-emotion-hint-to-basket-colors.php
index ea603d61611..f64ad9727e3 100644
--- a/_sql/migrations/403-add-emotion-hint-to-basket-colors.php
+++ b/_sql/migrations/403-add-emotion-hint-to-basket-colors.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration403 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration403 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/404-remove-sLanguage-from-item-export.php b/_sql/migrations/404-remove-sLanguage-from-item-export.php
index 541cbf1d156..33525b77906 100644
--- a/_sql/migrations/404-remove-sLanguage-from-item-export.php
+++ b/_sql/migrations/404-remove-sLanguage-from-item-export.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration404 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration404 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -14,4 +37,3 @@ public function up($modus)
         $this->addSql($sql);
     }
 }
-
diff --git a/_sql/migrations/405-import-compare-settings.php b/_sql/migrations/405-import-compare-settings.php
index 8ec11023903..d97404561d1 100644
--- a/_sql/migrations/405-import-compare-settings.php
+++ b/_sql/migrations/405-import-compare-settings.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration405 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration405 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -12,7 +35,6 @@ public function up($modus)
          * remove compare plugin
          * remove subscribes of compare plugin
          */
-
         $sql = <<<'EOD'
             SET @configFormId = (SELECT id FROM s_core_config_forms WHERE name = 'Compare' LIMIT 1);
 EOD;
@@ -43,4 +65,4 @@ public function up($modus)
 EOD;
         $this->addSql($sql);
     }
-}
\ No newline at end of file
+}
diff --git a/_sql/migrations/406-add-advanced-menu-listeners.php b/_sql/migrations/406-add-advanced-menu-listeners.php
index bf439dd6d5d..a2712fd32de 100644
--- a/_sql/migrations/406-add-advanced-menu-listeners.php
+++ b/_sql/migrations/406-add-advanced-menu-listeners.php
@@ -1,9 +1,31 @@
 <?php
-class Migrations_Migration406 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration406 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
-
         $sql = <<<'EOD'
 UPDATE `s_core_plugins` SET `label`='Erweitertes Menü' WHERE `name`='AdvancedMenu';
 EOD;
@@ -54,4 +76,4 @@ public function up($modus)
 
         $this->addSql($sql);
     }
-}
\ No newline at end of file
+}
diff --git a/_sql/migrations/407-empty-migration-placeholder.php b/_sql/migrations/407-empty-migration-placeholder.php
index 0f176dc3d95..a7b9ba23e43 100644
--- a/_sql/migrations/407-empty-migration-placeholder.php
+++ b/_sql/migrations/407-empty-migration-placeholder.php
@@ -1,10 +1,32 @@
 <?php
 
-class Migrations_Migration407 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration407 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
-        /**
+        /*
          * The previous content of this migration can be found in migration 437
          */
     }
diff --git a/_sql/migrations/408-variant-price-surcharge-refactor.php b/_sql/migrations/408-variant-price-surcharge-refactor.php
index 88a9b896710..0336a128bd3 100644
--- a/_sql/migrations/408-variant-price-surcharge-refactor.php
+++ b/_sql/migrations/408-variant-price-surcharge-refactor.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration408 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration408 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/409-add-property-media.php b/_sql/migrations/409-add-property-media.php
index 6c33fff5d85..bd81c022fc5 100644
--- a/_sql/migrations/409-add-property-media.php
+++ b/_sql/migrations/409-add-property-media.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration409 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration409 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -22,7 +45,7 @@ public function up($modus)
         $sql = "DELETE FROM s_core_config_elements WHERE name = 'orderbydefault'";
         $this->addSql($sql);
 
-        $sql = "UPDATE s_filter SET sortmode = 0 WHERE sortmode = 2;";
+        $sql = 'UPDATE s_filter SET sortmode = 0 WHERE sortmode = 2;';
         $this->addSql($sql);
     }
-}
\ No newline at end of file
+}
diff --git a/_sql/migrations/410-add-emotion-fields.php b/_sql/migrations/410-add-emotion-fields.php
index fb6d9dbe322..8ed97ba0865 100644
--- a/_sql/migrations/410-add-emotion-fields.php
+++ b/_sql/migrations/410-add-emotion-fields.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration410 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration410 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/411-remove-unused-columns.php b/_sql/migrations/411-remove-unused-columns.php
index d015e893b24..8dad22bf257 100644
--- a/_sql/migrations/411-remove-unused-columns.php
+++ b/_sql/migrations/411-remove-unused-columns.php
@@ -1,26 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
+
 class Migrations_Migration411 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/412-remove-liveshopping-bundle-columns.php b/_sql/migrations/412-remove-liveshopping-bundle-columns.php
index 797d47a4f29..81e770cd3cc 100644
--- a/_sql/migrations/412-remove-liveshopping-bundle-columns.php
+++ b/_sql/migrations/412-remove-liveshopping-bundle-columns.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration412 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration412 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/413-tidy-up-session-tables.php b/_sql/migrations/413-tidy-up-session-tables.php
index 51191ea6159..4db9e491c58 100644
--- a/_sql/migrations/413-tidy-up-session-tables.php
+++ b/_sql/migrations/413-tidy-up-session-tables.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration413 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration413 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -17,5 +40,3 @@ public function up($modus)
         $this->addSql($sql);
     }
 }
-
-
diff --git a/_sql/migrations/414-add-product-box-layout.php b/_sql/migrations/414-add-product-box-layout.php
index 34c389dcf94..dc2e09c8e01 100644
--- a/_sql/migrations/414-add-product-box-layout.php
+++ b/_sql/migrations/414-add-product-box-layout.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration414 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration414 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/415-remove-promotions.php b/_sql/migrations/415-remove-promotions.php
index 82fc4907e2a..c00e799e596 100644
--- a/_sql/migrations/415-remove-promotions.php
+++ b/_sql/migrations/415-remove-promotions.php
@@ -1,15 +1,38 @@
 <?php
-class Migrations_Migration415 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration415 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
-        $this->addSql("DROP TABLE s_emarketing_promotions");
-        $this->addSql("DROP TABLE s_emarketing_promotion_articles");
-        $this->addSql("DROP TABLE s_emarketing_promotion_banner");
-        $this->addSql("DROP TABLE s_emarketing_promotion_containers");
-        $this->addSql("DROP TABLE s_emarketing_promotion_html");
-        $this->addSql("DROP TABLE s_emarketing_promotion_links");
-        $this->addSql("DROP TABLE s_emarketing_promotion_main");
-        $this->addSql("DROP TABLE s_emarketing_promotion_positions");
+        $this->addSql('DROP TABLE s_emarketing_promotions');
+        $this->addSql('DROP TABLE s_emarketing_promotion_articles');
+        $this->addSql('DROP TABLE s_emarketing_promotion_banner');
+        $this->addSql('DROP TABLE s_emarketing_promotion_containers');
+        $this->addSql('DROP TABLE s_emarketing_promotion_html');
+        $this->addSql('DROP TABLE s_emarketing_promotion_links');
+        $this->addSql('DROP TABLE s_emarketing_promotion_main');
+        $this->addSql('DROP TABLE s_emarketing_promotion_positions');
     }
 }
diff --git a/_sql/migrations/416-remove-dummy-plugins.php b/_sql/migrations/416-remove-dummy-plugins.php
index c4d665e19c9..d0b154a25b6 100644
--- a/_sql/migrations/416-remove-dummy-plugins.php
+++ b/_sql/migrations/416-remove-dummy-plugins.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration416 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration416 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/417-remove-routerold-plugin.php b/_sql/migrations/417-remove-routerold-plugin.php
index 466735a1f14..60836fba58a 100644
--- a/_sql/migrations/417-remove-routerold-plugin.php
+++ b/_sql/migrations/417-remove-routerold-plugin.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration417 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration417 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -10,7 +33,7 @@ public function up($modus)
 SQL;
         $this->addSql($sql);
 
-$sql = <<<SQL
+        $sql = <<<SQL
 DELETE FROM
 s_core_subscribes
 WHERE listener LIKE 'Shopware_Plugins_Frontend_RouterOld_Bootstrap::%'
diff --git a/_sql/migrations/418-shop-specific-search-statistics.php b/_sql/migrations/418-shop-specific-search-statistics.php
index 20f076baa4f..589833e8896 100644
--- a/_sql/migrations/418-shop-specific-search-statistics.php
+++ b/_sql/migrations/418-shop-specific-search-statistics.php
@@ -1,8 +1,31 @@
 <?php
-class Migrations_Migration418 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration418 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
-        $this->addSql("ALTER TABLE `s_statistics_search` ADD `shop_id` INT NULL DEFAULT NULL");
+        $this->addSql('ALTER TABLE `s_statistics_search` ADD `shop_id` INT NULL DEFAULT NULL');
     }
 }
diff --git a/_sql/migrations/419-extract-acl-service.php b/_sql/migrations/419-extract-acl-service.php
index 52363e446ef..f493b5bd6e8 100644
--- a/_sql/migrations/419-extract-acl-service.php
+++ b/_sql/migrations/419-extract-acl-service.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration419 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration419 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/420-remove-plugin-manager.php b/_sql/migrations/420-remove-plugin-manager.php
index dba7df682c2..c8e015634df 100644
--- a/_sql/migrations/420-remove-plugin-manager.php
+++ b/_sql/migrations/420-remove-plugin-manager.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration420 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration420 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -26,21 +49,21 @@ private function fetchPluginId()
     private function deleteListeners()
     {
         $this->addSql(
-            "DELETE FROM s_core_subscribes WHERE pluginID = @pluginId"
+            'DELETE FROM s_core_subscribes WHERE pluginID = @pluginId'
         );
     }
 
     private function deleteMenuItem()
     {
         $this->addSql(
-            "DELETE FROM s_core_menu WHERE pluginID = @pluginId"
+            'DELETE FROM s_core_menu WHERE pluginID = @pluginId'
         );
     }
 
     private function deletePlugin()
     {
         $this->addSql(
-            "DELETE FROM s_core_plugins WHERE id = @pluginId"
+            'DELETE FROM s_core_plugins WHERE id = @pluginId'
         );
     }
 }
diff --git a/_sql/migrations/421-remove-store-api-plugin.php b/_sql/migrations/421-remove-store-api-plugin.php
index df8aaa7185b..0933f7bc885 100644
--- a/_sql/migrations/421-remove-store-api-plugin.php
+++ b/_sql/migrations/421-remove-store-api-plugin.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration421 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration421 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -26,14 +49,14 @@ private function fetchPluginId()
     private function deleteListeners()
     {
         $this->addSql(
-            "DELETE FROM s_core_subscribes WHERE pluginID = @pluginId"
+            'DELETE FROM s_core_subscribes WHERE pluginID = @pluginId'
         );
     }
 
     private function deletePlugin()
     {
         $this->addSql(
-            "DELETE FROM s_core_plugins WHERE id = @pluginId"
+            'DELETE FROM s_core_plugins WHERE id = @pluginId'
         );
     }
 
diff --git a/_sql/migrations/422-add-plugin-categories.php b/_sql/migrations/422-add-plugin-categories.php
index ae3f81008c2..a8be6c5d227 100644
--- a/_sql/migrations/422-add-plugin-categories.php
+++ b/_sql/migrations/422-add-plugin-categories.php
@@ -1,9 +1,32 @@
 <?php
-class Migrations_Migration422 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration422 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
-        $sql = "
+        $sql = '
             CREATE TABLE IF NOT EXISTS `s_core_plugin_categories` (
                 `id` int(11) NOT NULL,
                 `locale` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
@@ -11,7 +34,7 @@ public function up($modus)
                 `name` text COLLATE utf8_unicode_ci NOT NULL,
             PRIMARY KEY (`id`,`locale`)
             ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-        ";
+        ';
         $this->addSql($sql);
 
         $sql = "
diff --git a/_sql/migrations/423-remove-unused-config-variables.php b/_sql/migrations/423-remove-unused-config-variables.php
index 0012f0cd20c..8bf3d97a335 100644
--- a/_sql/migrations/423-remove-unused-config-variables.php
+++ b/_sql/migrations/423-remove-unused-config-variables.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration423 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration423 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/424-update-deprecated-config-variables.php b/_sql/migrations/424-update-deprecated-config-variables.php
index 6d80b977e40..657f3f0b30e 100644
--- a/_sql/migrations/424-update-deprecated-config-variables.php
+++ b/_sql/migrations/424-update-deprecated-config-variables.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration424 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration424 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/425-remove-old-templates.php b/_sql/migrations/425-remove-old-templates.php
index b5291b0dfc7..dfe86dbe0ee 100644
--- a/_sql/migrations/425-remove-old-templates.php
+++ b/_sql/migrations/425-remove-old-templates.php
@@ -1,7 +1,30 @@
 <?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 use Shopware\Components\Migrations\AbstractMigration;
 
-class Migrations_Migration425 Extends Shopware\Components\Migrations\AbstractMigration
+class Migrations_Migration425 extends AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/426-extract-cron-service.php b/_sql/migrations/426-extract-cron-service.php
index 2f2735d0a47..89c79efc04a 100644
--- a/_sql/migrations/426-extract-cron-service.php
+++ b/_sql/migrations/426-extract-cron-service.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration426 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration426 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/427-add-nostock-config.php b/_sql/migrations/427-add-nostock-config.php
index 51afecf17e5..552139eb002 100644
--- a/_sql/migrations/427-add-nostock-config.php
+++ b/_sql/migrations/427-add-nostock-config.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration427 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/428-remove-old-instock-config.php b/_sql/migrations/428-remove-old-instock-config.php
index 5398106f419..c8169a2f6e6 100644
--- a/_sql/migrations/428-remove-old-instock-config.php
+++ b/_sql/migrations/428-remove-old-instock-config.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration428 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration428 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -14,5 +37,3 @@ public function up($modus)
         $this->addSql($sql);
     }
 }
-
-
diff --git a/_sql/migrations/429-activate-performance-filters.php b/_sql/migrations/429-activate-performance-filters.php
index 584494d7f5b..d6d7fccb02d 100644
--- a/_sql/migrations/429-activate-performance-filters.php
+++ b/_sql/migrations/429-activate-performance-filters.php
@@ -1,9 +1,34 @@
 <?php
-class Migrations_Migration429 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration429 extends AbstractMigration
 {
     public function up($modus)
     {
-        if ($modus !== \Shopware\Components\Migrations\AbstractMigration::MODUS_INSTALL) {
+        if ($modus !== AbstractMigration::MODUS_INSTALL) {
             return;
         }
 
diff --git a/_sql/migrations/430-add-shop-page-form-shopid.php b/_sql/migrations/430-add-shop-page-form-shopid.php
index 49805152894..ec96e62da0c 100644
--- a/_sql/migrations/430-add-shop-page-form-shopid.php
+++ b/_sql/migrations/430-add-shop-page-form-shopid.php
@@ -1,10 +1,33 @@
 <?php
-class Migrations_Migration430 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration430 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
-        $this->addSql("ALTER TABLE `s_cms_static` ADD `shop_ids` VARCHAR(255) NULL;");
+        $this->addSql('ALTER TABLE `s_cms_static` ADD `shop_ids` VARCHAR(255) NULL;');
 
-        $this->addSql("ALTER TABLE `s_cms_support` ADD `shop_ids` VARCHAR(255) NULL;");
+        $this->addSql('ALTER TABLE `s_cms_support` ADD `shop_ids` VARCHAR(255) NULL;');
     }
 }
diff --git a/_sql/migrations/431-cache-emotion-landing-pages.php b/_sql/migrations/431-cache-emotion-landing-pages.php
index 55cca778fbf..caee0bd1b41 100644
--- a/_sql/migrations/431-cache-emotion-landing-pages.php
+++ b/_sql/migrations/431-cache-emotion-landing-pages.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration431 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration431 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/432-html5-tags-for-snippets.php b/_sql/migrations/432-html5-tags-for-snippets.php
index 881712519df..e7a95db6118 100644
--- a/_sql/migrations/432-html5-tags-for-snippets.php
+++ b/_sql/migrations/432-html5-tags-for-snippets.php
@@ -1,9 +1,32 @@
 <?php
-class Migrations_Migration432 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration432 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
-        /**
+        /*
          * @author Tiago Garcia
          *
          * This file is intentionally empty as it had a redundant s_core_snippets update
diff --git a/_sql/migrations/433-emotion-device-column-as-varchar.php b/_sql/migrations/433-emotion-device-column-as-varchar.php
index 9b7fc1a03e5..ef9786ffd81 100644
--- a/_sql/migrations/433-emotion-device-column-as-varchar.php
+++ b/_sql/migrations/433-emotion-device-column-as-varchar.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration433 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration433 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -8,4 +31,4 @@ public function up($modus)
 EOD;
         $this->addSql($sql);
     }
-}
\ No newline at end of file
+}
diff --git a/_sql/migrations/434-add-emotion-components.php b/_sql/migrations/434-add-emotion-components.php
index 6eb3ff1bc69..33dc95ec567 100644
--- a/_sql/migrations/434-add-emotion-components.php
+++ b/_sql/migrations/434-add-emotion-components.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration434 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration434 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -55,4 +78,4 @@ public function up($modus)
 EOD;
         $this->addSql($sql);
     }
-}
\ No newline at end of file
+}
diff --git a/_sql/migrations/435-mark-deprecated-fields-emotions.php b/_sql/migrations/435-mark-deprecated-fields-emotions.php
index 65110ba362d..7b27786ce87 100644
--- a/_sql/migrations/435-mark-deprecated-fields-emotions.php
+++ b/_sql/migrations/435-mark-deprecated-fields-emotions.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration435 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration435 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -18,4 +41,4 @@ public function up($modus)
 EOD;
         $this->addSql($sql);
     }
-}
\ No newline at end of file
+}
diff --git a/_sql/migrations/436-update-html5-video-fields.php b/_sql/migrations/436-update-html5-video-fields.php
index c427e77dd39..075aeb0eebf 100644
--- a/_sql/migrations/436-update-html5-video-fields.php
+++ b/_sql/migrations/436-update-html5-video-fields.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration436 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration436 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/437-add-dirty-flag-email-translations.php b/_sql/migrations/437-add-dirty-flag-email-translations.php
index da974fcca28..dfbde1f88dd 100644
--- a/_sql/migrations/437-add-dirty-flag-email-translations.php
+++ b/_sql/migrations/437-add-dirty-flag-email-translations.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration437 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration437 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -216,13 +238,14 @@ private function setEmailTranslationsDirtyFlag()
     {
         $defaultData = $this->getDefaultTranslationValues();
 
-        foreach($defaultData as $translationDefault) {
+        foreach ($defaultData as $translationDefault) {
             $this->setEmailTranslationDirtyFlag($translationDefault['name'], $translationDefault['objectdata']);
         }
     }
 
     /**
      * Helper method to set the dirty flag of email templates
+     *
      * @param string $name
      * @param string $content
      * @param string $contentHtml
@@ -237,6 +260,7 @@ private function setEmailDirtyFlag($name, $content, $contentHtml)
 
     /**
      * Helper method to set the dirty flag of email template translations
+     *
      * @param string $name
      * @param string $objectData
      */
@@ -279,29 +303,29 @@ private function setEmailTranslationDirtyFlag($name, $objectData)
      */
     private function getDefaultTranslationValues()
     {
-        return array(
-            array('name' => 'sACCEPTNOTIFICATION','objectdata' => 'a:2:{s:7:"subject";s:39:"Please confirm your e-mail notification";s:7:"content";s:240:"Hello, 
+        return [
+            ['name' => 'sACCEPTNOTIFICATION', 'objectdata' => 'a:2:{s:7:"subject";s:39:"Please confirm your e-mail notification";s:7:"content";s:240:"Hello,
 
-Thank you for signing up for the automatical e-Mail notification for the article {$sArticleName}. 
+Thank you for signing up for the automatical e-Mail notification for the article {$sArticleName}.
 Please confirm the notification by clicking the following link:
 
-{$sConfirmLink} 
+{$sConfirmLink}
 
 Best regards
 
-Your Team of {config name=shopName}";}'),
-            array('name' => 'sARTICLEAVAILABLE','objectdata' => 'a:2:{s:7:"subject";s:31:"Your article is available again";s:7:"content";s:148:"Hello, 
+Your Team of {config name=shopName}";}'],
+            ['name' => 'sARTICLEAVAILABLE', 'objectdata' => 'a:2:{s:7:"subject";s:31:"Your article is available again";s:7:"content";s:148:"Hello,
 
-Your article with the order number {$sOrdernumber} is available again. 
+Your article with the order number {$sOrdernumber} is available again.
 
-{$sArticleLink} 
+{$sArticleLink}
 
 Best regards
-Your Team of {config name=shopName}";}'),
-            array('name' => 'sARTICLECOMMENT','objectdata' => 'a:2:{s:7:"subject";s:16:"Evaluate article";s:7:"content";s:948:"<p>Hello {if $sUser.salutation eq "mr"}Mr{elseif $sUser.billing_salutation eq "ms"}Mrs{/if} {$sUser.billing_firstname} {$sUser.billing_lastname},
+Your Team of {config name=shopName}";}'],
+            ['name' => 'sARTICLECOMMENT', 'objectdata' => 'a:2:{s:7:"subject";s:16:"Evaluate article";s:7:"content";s:948:"<p>Hello {if $sUser.salutation eq "mr"}Mr{elseif $sUser.billing_salutation eq "ms"}Mrs{/if} {$sUser.billing_firstname} {$sUser.billing_lastname},
 </p>
-You have recently purchased articles from {config name=shopName}. We would be pleased if you could evaluate these items. Doing so, you can help us improve our services, and you have the opportunity to tell other customers your opinion. 
-By the way: You do not necessarily have to comment on the articles you have bought. You can select the ones you like best. We would welcome any feedback that you have. 
+You have recently purchased articles from {config name=shopName}. We would be pleased if you could evaluate these items. Doing so, you can help us improve our services, and you have the opportunity to tell other customers your opinion.
+By the way: You do not necessarily have to comment on the articles you have bought. You can select the ones you like best. We would welcome any feedback that you have.
 Here you can find the links to the evaluations of your purchased articles.
 <p>
 </p>
@@ -322,96 +346,96 @@ private function getDefaultTranslationValues()
 <p>
 Best regards,<br />
 Your team of {config name=shopName}
-</p>";}'),
-            array('name' => 'sARTICLESTOCK','objectdata' => 'a:2:{s:7:"subject";s:83:"Stock level of {$sData.count} article{if $sData.count>1}s{/if} under minimum stock ";s:7:"content";s:260:"Hello,
+</p>";}'],
+            ['name' => 'sARTICLESTOCK', 'objectdata' => 'a:2:{s:7:"subject";s:83:"Stock level of {$sData.count} article{if $sData.count>1}s{/if} under minimum stock ";s:7:"content";s:260:"Hello,
 The following articles have undershot the minimum stock:
-Order number Name of article Stock/Minimum stock 
+Order number Name of article Stock/Minimum stock
 {foreach from=$sJob.articles item=sArticle key=key}
-{$sArticle.ordernumber} {$sArticle.name} {$sArticle.instock}/{$sArticle.stockmin} 
+{$sArticle.ordernumber} {$sArticle.name} {$sArticle.instock}/{$sArticle.stockmin}
 {/foreach}
-";}'),
-            array('name' => 'sBIRTHDAY','objectdata' => 'a:2:{s:7:"subject";s:40:"Happy Birthday from {$sConfig.sSHOPNAME}";s:7:"content";s:174:"Hello {if $sUser.salutation eq "mr"}Mr{elseif $sUser.billing_salutation eq "ms"}Mrs{/if} {$sUser.firstname} {$sUser.lastname},
+";}'],
+            ['name' => 'sBIRTHDAY', 'objectdata' => 'a:2:{s:7:"subject";s:40:"Happy Birthday from {$sConfig.sSHOPNAME}";s:7:"content";s:174:"Hello {if $sUser.salutation eq "mr"}Mr{elseif $sUser.billing_salutation eq "ms"}Mrs{/if} {$sUser.firstname} {$sUser.lastname},
 
 Best regards
-Your team of {$sConfig.sSHOPNAME}";}'),
-            array('name' => 'sCANCELEDQUESTION','objectdata' => 'a:2:{s:7:"subject";s:69:"Your aborted order process - Send us your feedback and get a voucher!";s:7:"content";s:378:"Dear customer,
- 
+Your team of {$sConfig.sSHOPNAME}";}'],
+            ['name' => 'sCANCELEDQUESTION', 'objectdata' => 'a:2:{s:7:"subject";s:69:"Your aborted order process - Send us your feedback and get a voucher!";s:7:"content";s:378:"Dear customer,
+
 You have recently aborted an order process on Demoshop.de - we are always working to make shopping with our shop as pleasant as possible. Therefore we would like to know why your order has failed.
- 
-Please tell us the reason why you have aborted your order. We will reward your additional effort by sending you a 5,00 €-voucher. 
- 
-Thank you for your feedback";}'),
-            array('name' => 'sCANCELEDVOUCHER','objectdata' => 'a:2:{s:7:"subject";s:50:"Your aborted order process - Voucher code enclosed";s:7:"content";s:351:"Dear customer,
- 
+
+Please tell us the reason why you have aborted your order. We will reward your additional effort by sending you a 5,00 €-voucher.
+
+Thank you for your feedback";}'],
+            ['name' => 'sCANCELEDVOUCHER', 'objectdata' => 'a:2:{s:7:"subject";s:50:"Your aborted order process - Voucher code enclosed";s:7:"content";s:351:"Dear customer,
+
 You have recently aborted an order process on Demoshop.de - today, we would like to give you a 5,00 Euro-voucher - and therefore make it easier for you to decide for an order with Demoshop.de.
- 
+
 Your voucher is valid for two months and can be redeemed by entering the code "{$sVouchercode}".
 
-We would be pleased to accept your order!";}'),
-            array('name' => 'sCUSTOMERGROUPHACCEPTED','objectdata' => 'a:2:{s:7:"subject";s:39:"Your merchant account has been unlocked";s:7:"content";s:186:"Hello,
+We would be pleased to accept your order!";}'],
+            ['name' => 'sCUSTOMERGROUPHACCEPTED', 'objectdata' => 'a:2:{s:7:"subject";s:39:"Your merchant account has been unlocked";s:7:"content";s:186:"Hello,
 
 Your merchant account {config name=shopName} has been unlocked.
-  
-From now on, we will charge you the net purchase price. 
-  
+
+From now on, we will charge you the net purchase price.
+
 Best regards
-  
-Your team of {config name=shopName}";}'),
-            array('name' => 'sCUSTOMERGROUPHREJECTED','objectdata' => 'a:2:{s:7:"subject";s:41:"Your trader account has not been accepted";s:7:"content";s:307:"Dear customer,
 
-Thank you for your interest in our trade prices. Unfortunately, we do not have a trading license yet so that we cannot accept you as a trader. 
+Your team of {config name=shopName}";}'],
+            ['name' => 'sCUSTOMERGROUPHREJECTED', 'objectdata' => 'a:2:{s:7:"subject";s:41:"Your trader account has not been accepted";s:7:"content";s:307:"Dear customer,
+
+Thank you for your interest in our trade prices. Unfortunately, we do not have a trading license yet so that we cannot accept you as a trader.
 
-In case of further questions please do not hesitate to contact us via telephone, fax or email. 
+In case of further questions please do not hesitate to contact us via telephone, fax or email.
 
 Best regards
 
-Your Team of {config name=shopName}";}'),
-            array('name' => 'sNEWSLETTERCONFIRMATION','objectdata' => 'a:2:{s:7:"subject";s:42:"Thank you for your newsletter subscription";s:7:"content";s:78:"Hello,
+Your Team of {config name=shopName}";}'],
+            ['name' => 'sNEWSLETTERCONFIRMATION', 'objectdata' => 'a:2:{s:7:"subject";s:42:"Thank you for your newsletter subscription";s:7:"content";s:78:"Hello,
 
 Thank you for your newsletter subscription at {config name=shopName}
 
-";}'),
-            array('name' => 'sNOSERIALS','objectdata' => 'a:2:{s:7:"subject";s:53:"Attention - no free serial numbers for {sArticleName}";s:7:"content";s:269:"Hello,
+";}'],
+            ['name' => 'sNOSERIALS', 'objectdata' => 'a:2:{s:7:"subject";s:53:"Attention - no free serial numbers for {sArticleName}";s:7:"content";s:269:"Hello,
 
 There is no additional free serial numbers available for the article {sArticleName}. Please provide new serial numbers immediately or deactivate the article. Please assign a serial number to the customer {sMail} manually.
 
 Best regards,
 
 {config name=shopName}
-";}'),
-            array('name' => 'sOPTINNEWSLETTER','objectdata' => 'a:2:{s:7:"subject";s:43:"Please confirm your newsletter subscription";s:7:"content";s:208:"Hello, 
+";}'],
+            ['name' => 'sOPTINNEWSLETTER', 'objectdata' => 'a:2:{s:7:"subject";s:43:"Please confirm your newsletter subscription";s:7:"content";s:208:"Hello,
 
-Thank you for signing up for our regularly published newsletter. 
+Thank you for signing up for our regularly published newsletter.
 
-Please confirm your subscription by clicking the following link: {$sConfirmLink} 
+Please confirm your subscription by clicking the following link: {$sConfirmLink}
 
 Best regards
 
-Your Team of {config name=shopName}";}'),
-            array('name' => 'sOPTINVOTE','objectdata' => 'a:2:{s:7:"subject";s:38:"Please confirm your article evaluation";s:7:"content";s:164:"Hello, 
+Your Team of {config name=shopName}";}'],
+            ['name' => 'sOPTINVOTE', 'objectdata' => 'a:2:{s:7:"subject";s:38:"Please confirm your article evaluation";s:7:"content";s:164:"Hello,
 
-Thank you for evaluating the article{$sArticle.articleName}. 
+Thank you for evaluating the article{$sArticle.articleName}.
 
-Please confirm the evaluation by clicking the following link: {$sConfirmLink} 
+Please confirm the evaluation by clicking the following link: {$sConfirmLink}
+
+Best regards";}'],
+            ['name' => 'sORDER', 'objectdata' => 'a:3:{s:7:"subject";s:28:"Your order with the demoshop";s:7:"content";s:1739:"Hello {$billingaddress.firstname} {$billingaddress.lastname},
 
-Best regards";}'),
-            array('name' => 'sORDER','objectdata' => 'a:3:{s:7:"subject";s:28:"Your order with the demoshop";s:7:"content";s:1739:"Hello {$billingaddress.firstname} {$billingaddress.lastname},
- 
 Thank you for your order at {config name=shopName} (Number: {$sOrderNumber}) on {$sOrderDay} at {$sOrderTime}.
 Information on your order:
- 
+
 Pos. Art.No.              Quantities         Price        Total
 {foreach item=details key=position from=$sOrderDetails}
 {$position+1|fill:4} {$details.ordernumber|fill:20} {$details.quantity|fill:6} {$details.price|padding:8} EUR {$details.amount|padding:8} EUR
 {$details.articlename|wordwrap:49|indent:5}
 {/foreach}
- 
+
 Shipping costs: {$sShippingCosts}
 Total net: {$sAmountNet}
 {if !$sNet}
 Total gross: {$sAmount}
 {/if}
- 
+
 Selected payment type: {$additional.payment.description}
 {$additional.payment.additionaldescription}
 {if $additional.payment.name == "debit"}
@@ -421,17 +445,17 @@ private function getDefaultTranslationValues()
 We will withdraw the money from your bank account within the next days.
 {/if}
 {if $additional.payment.name == "prepayment"}
- 
+
 Our bank connection:
 Account: ###
 BIN: ###
 {/if}
- 
+
 {if $sComment}
 Your comment:
 {$sComment}
 {/if}
- 
+
 Billing address:
 {$billingaddress.company}
 {$billingaddress.firstname} {$billingaddress.lastname}
@@ -439,22 +463,22 @@ private function getDefaultTranslationValues()
 {$billingaddress.zipcode} {$billingaddress.city}
 {$billingaddress.phone}
 {$additional.country.countryname}
- 
+
 Shipping address:
 {$shippingaddress.company}
 {$shippingaddress.firstname} {$shippingaddress.lastname}
 {$shippingaddress.street}
 {$shippingaddress.zipcode} {$shippingaddress.city}
 {$additional.country.countryname}
- 
+
 {if $billingaddress.ustid}
 Your VAT-ID: {$billingaddress.ustid}
-In case of a successful order and if you are based in one of the EU countries, you will receive your goods exempt from turnover tax. 
+In case of a successful order and if you are based in one of the EU countries, you will receive your goods exempt from turnover tax.
 {/if}
  ";s:11:"contentHtml";s:3493:"<div style="font-family:arial; font-size:12px;">
- 
+
 <p>Hello {$billingaddress.firstname} {$billingaddress.lastname},<br/><br/>
- 
+
 Thank you for your order with {config name=shopName} (Nummer: {$sOrderNumber}) on {$sOrderDay} at {$sOrderTime}.
 <br/>
 <br/>
@@ -468,7 +492,7 @@ private function getDefaultTranslationValues()
       <td bgcolor="#F7F7F2" style="border-bottom:1px solid #cccccc;"><strong>Price</strong></td>
       <td bgcolor="#F7F7F2" style="border-bottom:1px solid #cccccc;"><strong>Total</strong></td>
     </tr>
- 
+
     {foreach item=details key=position from=$sOrderDetails}
     <tr>
       <td rowspan="2" style="border-bottom:1px solid #cccccc;">{if $details.image.src.1}<img src="{$details.image.src.1}" alt="{$details.articlename}" />{else} {/if}</td>
@@ -482,9 +506,9 @@ private function getDefaultTranslationValues()
       <td colspan="5" style="border-bottom:1px solid #cccccc;">{$details.articlename|wordwrap:80|indent:4}</td>
     </tr>
     {/foreach}
- 
+
   </table>
- 
+
 <p>
   <br/>
   <br/>
@@ -508,7 +532,7 @@ private function getDefaultTranslationValues()
     {if $additional.payment.name == "prepayment"}
     Our bank connection:<br/>
     {config name=bankAccount}
-    {/if} 
+    {/if}
   <br/>
   <br/>
     <strong>Selected dispatch:</strong> {$sDispatch.name}<br/>{$sDispatch.description}
@@ -517,7 +541,7 @@ private function getDefaultTranslationValues()
   {if $sComment}
     <strong>Your comment:</strong><br/>
     {$sComment}<br/>
-  {/if} 
+  {/if}
   <br/>
   <br/>
     <strong>Billing address:</strong><br/>
@@ -538,80 +562,80 @@ private function getDefaultTranslationValues()
   <br/>
     {if $billingaddress.ustid}
     Your VAT-ID: {$billingaddress.ustid}<br/>
-    In case of a successful order and if you are based in one of the EU countries, you will receive your goods exempt from turnover tax. 
+    In case of a successful order and if you are based in one of the EU countries, you will receive your goods exempt from turnover tax.
     {/if}
   <br/>
   <br/>
 
     Your Team of {config name=shopName}<br/>
 </p>
-</div>";}'),
-            array('name' => 'sORDERSEPAAUTHORIZATION','objectdata' => 'a:3:{s:7:"subject";s:25:"SEPA direct debit mandate";s:7:"content";s:275:"Hello {$paymentInstance.firstName} {$paymentInstance.lastName},Attached you will find the direct debit mandate form for your order {$paymentInstance.orderNumber}. Please return the completely filled out document by fax or email. Best regards. The {config name=shopName} team.";s:11:"contentHtml";s:311:"<div>Hello {$paymentInstance.firstName} {$paymentInstance.lastName},<br><br>Attached you will find the direct debit mandate form for your order {$paymentInstance.orderNumber}. Please return the completely filled out document by fax or email.<br/><br/>Best regards,<br/><br/>The {config name=shopName} team</div>";}'),
-            array('name' => 'sORDERSTATEMAIL1','objectdata' => 'a:4:{s:8:"fromMail";s:16:"{$sConfig.sMAIL}";s:8:"fromName";s:20:"{$sConfig.sSHOPNAME}";s:7:"subject";s:38:"Your order with {config name=shopName}";s:7:"content";s:334:"Dear{if $sUser.billing_salutation eq "mr"}Mr{elseif $sUser.billing_salutation eq "ms"}Mrs{/if} {$sUser.billing_firstname} {$sUser.billing_lastname},
+</div>";}'],
+            ['name' => 'sORDERSEPAAUTHORIZATION', 'objectdata' => 'a:3:{s:7:"subject";s:25:"SEPA direct debit mandate";s:7:"content";s:275:"Hello {$paymentInstance.firstName} {$paymentInstance.lastName},Attached you will find the direct debit mandate form for your order {$paymentInstance.orderNumber}. Please return the completely filled out document by fax or email. Best regards. The {config name=shopName} team.";s:11:"contentHtml";s:311:"<div>Hello {$paymentInstance.firstName} {$paymentInstance.lastName},<br><br>Attached you will find the direct debit mandate form for your order {$paymentInstance.orderNumber}. Please return the completely filled out document by fax or email.<br/><br/>Best regards,<br/><br/>The {config name=shopName} team</div>";}'],
+            ['name' => 'sORDERSTATEMAIL1', 'objectdata' => 'a:4:{s:8:"fromMail";s:16:"{$sConfig.sMAIL}";s:8:"fromName";s:20:"{$sConfig.sSHOPNAME}";s:7:"subject";s:38:"Your order with {config name=shopName}";s:7:"content";s:334:"Dear{if $sUser.billing_salutation eq "mr"}Mr{elseif $sUser.billing_salutation eq "ms"}Mrs{/if} {$sUser.billing_firstname} {$sUser.billing_lastname},
+
+The status of your order with order number {$sOrder.ordernumber} of {$sOrder.ordertime|date_format:" %d-%m-%Y"} has changed. The new status is as follows: {$sOrder.status_description}.";}'],
+            ['name' => 'sORDERSTATEMAIL11', 'objectdata' => 'a:2:{s:7:"subject";s:22:"Order shipped in parts";s:7:"content";s:334:"Dear{if $sUser.billing_salutation eq "mr"}Mr{elseif $sUser.billing_salutation eq "ms"}Mrs{/if} {$sUser.billing_firstname} {$sUser.billing_lastname},
 
-The status of your order with order number {$sOrder.ordernumber} of {$sOrder.ordertime|date_format:" %d-%m-%Y"} has changed. The new status is as follows: {$sOrder.status_description}.";}'),
-            array('name' => 'sORDERSTATEMAIL11','objectdata' => 'a:2:{s:7:"subject";s:22:"Order shipped in parts";s:7:"content";s:334:"Dear{if $sUser.billing_salutation eq "mr"}Mr{elseif $sUser.billing_salutation eq "ms"}Mrs{/if} {$sUser.billing_firstname} {$sUser.billing_lastname},
+The status of your order with order number {$sOrder.ordernumber} of {$sOrder.ordertime|date_format:" %d-%m-%Y"} has changed. The new status is as follows: {$sOrder.status_description}.";}'],
+            ['name' => 'sORDERSTATEMAIL2', 'objectdata' => 'a:2:{s:7:"subject";s:36:"Your order at {config name=shopName}";s:7:"content";s:332:"Dear{if $sUser.billing_salutation eq "mr"}Mr{elseif $sUser.billing_salutation eq "ms"}Mrs{/if} {$sUser.billing_firstname} {$sUser.billing_lastname},
 
-The status of your order with order number {$sOrder.ordernumber} of {$sOrder.ordertime|date_format:" %d-%m-%Y"} has changed. The new status is as follows: {$sOrder.status_description}.";}'),
-            array('name' => 'sORDERSTATEMAIL2','objectdata' => 'a:2:{s:7:"subject";s:36:"Your order at {config name=shopName}";s:7:"content";s:332:"Dear{if $sUser.billing_salutation eq "mr"}Mr{elseif $sUser.billing_salutation eq "ms"}Mrs{/if} {$sUser.billing_firstname} {$sUser.billing_lastname},
+The status of your order with order number{$sOrder.ordernumber} of {$sOrder.ordertime|date_format:" %d-%m-%Y"} has changed. The new status is as follows {$sOrder.status_description}.";}'],
+            ['name' => 'sORDERSTATEMAIL3', 'objectdata' => 'a:2:{s:7:"subject";s:13:"Status change";s:7:"content";s:923:"Dear {if $sUser.billing_salutation eq "mr"}Mr{elseif $sUser.billing_salutation eq "ms"} Mrs{/if} {$sUser.billing_firstname} {$sUser.billing_lastname},
 
-The status of your order with order number{$sOrder.ordernumber} of {$sOrder.ordertime|date_format:" %d-%m-%Y"} has changed. The new status is as follows {$sOrder.status_description}.";}'),
-            array('name' => 'sORDERSTATEMAIL3','objectdata' => 'a:2:{s:7:"subject";s:13:"Status change";s:7:"content";s:923:"Dear {if $sUser.billing_salutation eq "mr"}Mr{elseif $sUser.billing_salutation eq "ms"} Mrs{/if} {$sUser.billing_firstname} {$sUser.billing_lastname},
- 
-The status of your order {$sOrder.ordernumber} of {$sOrder.ordertime|date_format:" %d.%m.%Y"} 
+The status of your order {$sOrder.ordernumber} of {$sOrder.ordertime|date_format:" %d.%m.%Y"}
 has changed. The new status is as follows: "{$sOrder.status_description}".
- 
- 
+
+
 Information on your order:
-================================== 
+==================================
 {foreach item=details key=position from=$sOrderDetails}
 {$position+1|fill:3} {$details.articleordernumber|fill:10:" ":"..."} {$details.name|fill:30} {$details.quantity} x {$details.price|string_format:"%.2f"} {$sConfig.sCURRENCY}
 {/foreach}
- 
+
 Shipping costs: {$sOrder.invoice_shipping} {$sConfig.sCURRENCY}
 Net total: {$sOrder.invoice_amount_net|string_format:"%.2f"} {$sConfig.sCURRENCY}
 Total amount incl. VAT: {$sOrder.invoice_amount|string_format:"%.2f"} {$sConfig.sCURRENCY}
- 
+
 Best regards,
 Your team of {config name=shopName}
 
-";}'),
-            array('name' => 'sORDERSTATEMAIL4','objectdata' => 'a:2:{s:7:"subject";s:38:"Your order with {config name=shopName}";s:7:"content";s:551:"Hello {if $sUser.billing_salutation eq "mr"}Mr{elseif $sUser.billing_salutation eq "ms"}Mrs{/if} {$sUser.billing_firstname} {$sUser.billing_lastname},
- 
+";}'],
+            ['name' => 'sORDERSTATEMAIL4', 'objectdata' => 'a:2:{s:7:"subject";s:38:"Your order with {config name=shopName}";s:7:"content";s:551:"Hello {if $sUser.billing_salutation eq "mr"}Mr{elseif $sUser.billing_salutation eq "ms"}Mrs{/if} {$sUser.billing_firstname} {$sUser.billing_lastname},
+
 The order status of your order {$sOrder.ordernumber} has changed!
 The order now has the following status: {$sOrder.status_description}.
 
 You can check the current status of your order on our website under "My account" - "My orders" anytime. But in case you have purchased without a registration or a customer account, you do not have this option.
- 
+
 Best regards,
-Your team of {config name=shopName}";}'),
-            array('name' => 'sORDERSTATEMAIL5','objectdata' => 'a:2:{s:7:"subject";s:38:"Your order with {config name=shopName}";s:7:"content";s:389:"Dear{if $sUser.billing_salutation eq "mr"}Mr{elseif $sUser.billing_salutation eq "ms"}Mrs{/if} 
+Your team of {config name=shopName}";}'],
+            ['name' => 'sORDERSTATEMAIL5', 'objectdata' => 'a:2:{s:7:"subject";s:38:"Your order with {config name=shopName}";s:7:"content";s:389:"Dear{if $sUser.billing_salutation eq "mr"}Mr{elseif $sUser.billing_salutation eq "ms"}Mrs{/if}
 {$sUser.billing_firstname} {$sUser.billing_lastname},
- 
-The status of your order with order number {$sOrder.ordernumber} of {$sOrder.ordertime|date_format:" %d.%m.%Y"} 
+
+The status of your order with order number {$sOrder.ordernumber} of {$sOrder.ordertime|date_format:" %d.%m.%Y"}
 has changed. The new status is as follows: {$sOrder.status_description}.
- 
+
 Best regards,
-Your team of {config name=shopName}";}'),
-            array('name' => 'sORDERSTATEMAIL6','objectdata' => 'a:2:{s:7:"subject";s:38:"Your order with {config name=shopName}";s:7:"content";s:552:"Hello {if $sUser.billing_salutation eq "mr"}Mr{elseif $sUser.billing_salutation eq "ms"}Mrs{/if} {$sUser.billing_firstname} {$sUser.billing_lastname},
- 
+Your team of {config name=shopName}";}'],
+            ['name' => 'sORDERSTATEMAIL6', 'objectdata' => 'a:2:{s:7:"subject";s:38:"Your order with {config name=shopName}";s:7:"content";s:552:"Hello {if $sUser.billing_salutation eq "mr"}Mr{elseif $sUser.billing_salutation eq "ms"}Mrs{/if} {$sUser.billing_firstname} {$sUser.billing_lastname},
+
 The order status of your order {$sOrder.ordernumber} has changed!
 Your order now has the following status: {$sOrder.status_description}.
 
 You can check the current status of your order on our website under "My account" - "My orders" anytime. But in case you have purchased without a registration or a customer account, you do not have this option.
- 
+
 Best regards,
-Your team of {config name=shopName}";}'),
-            array('name' => 'sORDERSTATEMAIL8','objectdata' => 'a:2:{s:7:"subject";s:38:"Your order with {config name=shopName}";s:7:"content";s:553:"Hello {if $sUser.billing_salutation eq "mr"}Mr{elseif $sUser.billing_salutation eq "ms"}Mrs{/if} {$sUser.billing_firstname} {$sUser.billing_lastname},
- 
+Your team of {config name=shopName}";}'],
+            ['name' => 'sORDERSTATEMAIL8', 'objectdata' => 'a:2:{s:7:"subject";s:38:"Your order with {config name=shopName}";s:7:"content";s:553:"Hello {if $sUser.billing_salutation eq "mr"}Mr{elseif $sUser.billing_salutation eq "ms"}Mrs{/if} {$sUser.billing_firstname} {$sUser.billing_lastname},
+
 The status of your order {$sOrder.ordernumber} has changed!
 The current status of your order is as follows: {$sOrder.status_description}.
 
 You can check the current status of your order on our website under "My account" - "My orders" anytime. But in case you have purchased without a registration or a customer account, you do not have this option.
- 
+
 Best regards,
-Your team of {config name=shopName}";}'),
-            array('name' => 'sPASSWORD','objectdata' => 'a:2:{s:7:"subject";s:46:"Forgot password - Your access data for {sShop}";s:7:"content";s:127:"Hello,
+Your team of {config name=shopName}";}'],
+            ['name' => 'sPASSWORD', 'objectdata' => 'a:2:{s:7:"subject";s:46:"Forgot password - Your access data for {sShop}";s:7:"content";s:127:"Hello,
 
 Your access data for {sShopURL} is as follows:
 User: {sMail}
@@ -619,32 +643,32 @@ private function getDefaultTranslationValues()
 
 Best regards
 
-{config name=address}";}'),
-            array('name' => 'sREGISTERCONFIRMATION','objectdata' => 'a:3:{s:7:"subject";s:37:"Your registration has been successful";s:7:"content";s:291:"Hello {salutation} {firstname} {lastname},
- 
+{config name=address}";}'],
+            ['name' => 'sREGISTERCONFIRMATION', 'objectdata' => 'a:3:{s:7:"subject";s:37:"Your registration has been successful";s:7:"content";s:291:"Hello {salutation} {firstname} {lastname},
+
 Thank you for your registration with our Shop.
- 
+
 You will gain access via the email address {sMAIL}
 and the password you have chosen.
- 
-You can have your password sent to you by email anytime. 
- 
+
+You can have your password sent to you by email anytime.
+
 Best regards
- 
+
 Your team of {config name=shopName}";s:11:"contentHtml";s:354:"<div>
 Hello {salutation} {firstname} {lastname},<br/><br/>
- 
+
 Thank you for your registration with our Shop.<br/><br/>
- 
+
 You will gain access via the email address {sMAIL} and the password you have chosen.<br/><br/>
- 
+
 You can have your password sent to you by email anytime. <br/><br/>
- 
+
 Best regards<br/><br/>
- 
+
 Your team of {config name=shopName}
-</div>";}'),
-            array('name' => 'sTELLAFRIEND','objectdata' => 'a:2:{s:7:"subject";s:33:"{sName} recommends you {sArticle}";s:7:"content";s:189:"Hello,
+</div>";}'],
+            ['name' => 'sTELLAFRIEND', 'objectdata' => 'a:2:{s:7:"subject";s:33:"{sName} recommends you {sArticle}";s:7:"content";s:189:"Hello,
 
 {sName} has found an interesting product for you on {sShop} that you should have a look at:
 
@@ -655,16 +679,16 @@ private function getDefaultTranslationValues()
 
 Best regards and see you next time
 
-Your contact details";}'),
-            array('name' => 'sVOUCHER','objectdata' => 'a:2:{s:7:"subject";s:12:"Your voucher";s:7:"content";s:268:"Hello {customer},
+Your contact details";}'],
+            ['name' => 'sVOUCHER', 'objectdata' => 'a:2:{s:7:"subject";s:12:"Your voucher";s:7:"content";s:268:"Hello {customer},
 
 {user} has followed your recommendation and just ordered at {config name=shopName}.
 This is why we give you a X € voucher, which you can redeem with your next order.
-			
+
 Your voucher code is as follows: XXX
-			
+
 Best regards,
-{config name=shopName}";}')
-        );
+{config name=shopName}";}'],
+        ];
     }
-}
\ No newline at end of file
+}
diff --git a/_sql/migrations/438-add-email-template-header-footer-fields.php b/_sql/migrations/438-add-email-template-header-footer-fields.php
index 929ab3bf346..606dcf94829 100644
--- a/_sql/migrations/438-add-email-template-header-footer-fields.php
+++ b/_sql/migrations/438-add-email-template-header-footer-fields.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration438 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration438 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -81,6 +103,7 @@ private function updateTemplate($name, $content, $contentHtml = null)
 
     /**
      * Helper method to update the translations of a mail template
+     *
      * @param string $name
      * @param string $content
      * @param string $contentHtml
@@ -170,6 +193,7 @@ private function updateEmailTemplateTranslation($name, $content, $contentHtml =
      * Helper method to prefix and suffix the mail templates with the configuration values
      *
      * @param string $content
+     *
      * @return string
      */
     private function convertTemplatePlain($content)
@@ -177,13 +201,14 @@ private function convertTemplatePlain($content)
         $header = '{include file=\"string:{config name=emailheaderplain}\"}';
         $footer = '{include file=\"string:{config name=emailfooterplain}\"}';
 
-        return $header."\r\n\r\n".$content."\r\n\r\n".$footer;
+        return $header . "\r\n\r\n" . $content . "\r\n\r\n" . $footer;
     }
 
     /**
      * Helper method to prefix and suffix the mail templates with the configuration values
      *
      * @param string $content
+     *
      * @return string
      */
     private function convertTemplateHtml($content)
@@ -191,10 +216,9 @@ private function convertTemplateHtml($content)
         $header = '{include file=\"string:{config name=emailheaderhtml}\"}';
         $footer = '{include file=\"string:{config name=emailfooterhtml}\"}';
 
-        return $header."\r\n<br/><br/>\r\n".$content."\r\n<br/><br/>\r\n".$footer;
+        return $header . "\r\n<br/><br/>\r\n" . $content . "\r\n<br/><br/>\r\n" . $footer;
     }
 
-
     /**
      * Update all mail templates
      */
@@ -438,7 +462,7 @@ private function updateTranslations()
 
         $this->updateTranslation(
             'sBIRTHDAY',
-            "Hello {if \$sUser.salutation eq \"mr\"}Mr{elseif \$sUser.billing_salutation eq \"ms\"}Mrs{/if} {\$sUser.firstname} {\$sUser.lastname}, we wish you a happy birthday."
+            'Hello {if $sUser.salutation eq "mr"}Mr{elseif $sUser.billing_salutation eq "ms"}Mrs{/if} {$sUser.firstname} {$sUser.lastname}, we wish you a happy birthday.'
         );
         $this->updateTranslation(
             'sARTICLESTOCK',
@@ -472,14 +496,14 @@ private function updateTranslations()
 
         $this->updateTranslation(
             'sARTICLECOMMENT',
-            "",
+            '',
             "<p>Hello {if \$sUser.salutation eq \"mr\"}Mr{elseif \$sUser.billing_salutation eq \"ms\"}Mrs{/if} {\$sUser.billing_firstname} {\$sUser.billing_lastname},\n</p>\nYou have recently purchased articles from {config name=shopName}. We would be pleased if you could evaluate these items. Doing so, you can help us improve our services, and you have the opportunity to tell other customers your opinion.\nBy the way: You do not necessarily have to comment on the articles you have bought. You can select the ones you like best. We would welcome any feedback that you have.\nHere you can find the links to the evaluations of your purchased articles.\n<p>\n</p>\n<table>\n {foreach from=\$sArticles item=sArticle key=key}\n{if !\$sArticle.modus}\n <tr>\n  <td>{\$sArticle.articleordernumber}</td>\n  <td>{\$sArticle.name}</td>\n  <td>\n  <a href=\"{\$sArticle.link}\">link</a>\n  </td>\n </tr>\n{/if}\n {/foreach}\n</table>"
         );
 
         $this->updateTranslation(
             'sORDERSEPAAUTHORIZATION',
-            "Hello {\$paymentInstance.firstName} {\$paymentInstance.lastName}, attached you will find the direct debit mandate form for your order {\$paymentInstance.orderNumber}. Please return the completely filled out document by fax or email.",
-            "<div>Hello {\$paymentInstance.firstName} {\$paymentInstance.lastName},<br><br>attached you will find the direct debit mandate form for your order {\$paymentInstance.orderNumber}. Please return the completely filled out document by fax or email.</div>"
+            'Hello {$paymentInstance.firstName} {$paymentInstance.lastName}, attached you will find the direct debit mandate form for your order {$paymentInstance.orderNumber}. Please return the completely filled out document by fax or email.',
+            '<div>Hello {$paymentInstance.firstName} {$paymentInstance.lastName},<br><br>attached you will find the direct debit mandate form for your order {$paymentInstance.orderNumber}. Please return the completely filled out document by fax or email.</div>'
         );
     }
 }
diff --git a/_sql/migrations/439-update-document-footer-styling.php b/_sql/migrations/439-update-document-footer-styling.php
index 134d9a5b09b..9e32902402b 100644
--- a/_sql/migrations/439-update-document-footer-styling.php
+++ b/_sql/migrations/439-update-document-footer-styling.php
@@ -1,9 +1,34 @@
 <?php
-class Migrations_Migration439 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration439 extends AbstractMigration
 {
     public function up($modus)
     {
-        if ($modus !== \Shopware\Components\Migrations\AbstractMigration::MODUS_INSTALL) {
+        if ($modus !== AbstractMigration::MODUS_INSTALL) {
             return;
         }
 
diff --git a/_sql/migrations/440-fix-sorder-email-template.php b/_sql/migrations/440-fix-sorder-email-template.php
index 7fea240085d..e53e6da3ebd 100644
--- a/_sql/migrations/440-fix-sorder-email-template.php
+++ b/_sql/migrations/440-fix-sorder-email-template.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration440 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration440 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -36,6 +58,7 @@ private function updateTemplate($name, $content, $contentHtml = '')
 UPDATE `s_core_config_mails` SET `content` = "$content" WHERE `name` = "$name" AND dirty = 0
 SQL;
             $this->addSql($sql);
+
             return;
         }
 
@@ -61,6 +84,7 @@ private function updateTranslations()
 
     /**
      * Helper method to update the translations of a mail template
+     *
      * @param string $name
      * @param string $content
      * @param string $contentHtml
@@ -108,6 +132,7 @@ private function updateTranslation($name, $content, $contentHtml = '')
      * Helper method to prefix and suffix the mail templates with the configuration values
      *
      * @param string $content
+     *
      * @return string
      */
     private function convertTemplatePlain($content)
@@ -115,13 +140,14 @@ private function convertTemplatePlain($content)
         $header = '{include file=\"string:{config name=emailheaderplain}\"}';
         $footer = '{include file=\"string:{config name=emailfooterplain}\"}';
 
-        return $header."\r\n\r\n".$content."\r\n\r\n".$footer;
+        return $header . "\r\n\r\n" . $content . "\r\n\r\n" . $footer;
     }
 
     /**
      * Helper method to prefix and suffix the mail templates with the configuration values
      *
      * @param string $content
+     *
      * @return string
      */
     private function convertTemplateHtml($content)
@@ -129,6 +155,6 @@ private function convertTemplateHtml($content)
         $header = '{include file=\"string:{config name=emailheaderhtml}\"}';
         $footer = '{include file=\"string:{config name=emailfooterhtml}\"}';
 
-        return $header."\r\n<br/><br/>\r\n".$content."\r\n<br/><br/>\r\n".$footer;
+        return $header . "\r\n<br/><br/>\r\n" . $content . "\r\n<br/><br/>\r\n" . $footer;
     }
 }
diff --git a/_sql/migrations/441-add-hide-downloads-in-account.php b/_sql/migrations/441-add-hide-downloads-in-account.php
index d78be06d6bd..dd781926898 100644
--- a/_sql/migrations/441-add-hide-downloads-in-account.php
+++ b/_sql/migrations/441-add-hide-downloads-in-account.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration441 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration441 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/442-add-option-to-disable-styling-emotions.php b/_sql/migrations/442-add-option-to-disable-styling-emotions.php
index 9c1f8c83a24..fa894cfa0a2 100644
--- a/_sql/migrations/442-add-option-to-disable-styling-emotions.php
+++ b/_sql/migrations/442-add-option-to-disable-styling-emotions.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration442 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration442 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -13,6 +36,5 @@ public function up($modus)
 VALUES (@parent, 'needsNoStyling', 'checkbox', '', 'Kein Styling hinzufügen', 'Definiert, dass kein weiteres Layout-Styling hinzugefügt wird.', '', '', '', '', '', '0', '0', 10);
 EOD;
         $this->addSql($sql);
-
     }
-}
\ No newline at end of file
+}
diff --git a/_sql/migrations/443-add-wizard-configuration-value.php b/_sql/migrations/443-add-wizard-configuration-value.php
index 67d47966aef..3bb18c334ee 100644
--- a/_sql/migrations/443-add-wizard-configuration-value.php
+++ b/_sql/migrations/443-add-wizard-configuration-value.php
@@ -1,5 +1,31 @@
 <?php
-class Migrations_Migration443 Extends Shopware\Components\Migrations\AbstractMigration
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration443 extends AbstractMigration
 {
     public function up($modus)
     {
@@ -14,7 +40,7 @@ public function up($modus)
         }
     }
 
-    private function disableFirstRunWizard()
+    private function disableFirstRunWizard(): void
     {
         $sql = <<<'EOD'
 INSERT IGNORE INTO `s_core_config_values` (`element_id`, `shop_id`, `value`) VALUES
@@ -23,7 +49,7 @@ private function disableFirstRunWizard()
         $this->addSql($sql);
     }
 
-    private function fetchFormId()
+    private function fetchFormId(): void
     {
         $sql = <<<'EOD'
 SET @formId = (SELECT id FROM s_core_config_forms WHERE `name`='Auth');
@@ -31,7 +57,7 @@ private function fetchFormId()
         $this->addSql($sql);
     }
 
-    private function fetchElementId()
+    private function fetchElementId(): void
     {
         $sql = <<<'EOD'
 SET @elementId = (SELECT id FROM s_core_config_elements WHERE name LIKE "firstRunWizardEnabled" LIMIT 1);
@@ -39,7 +65,7 @@ private function fetchElementId()
         $this->addSql($sql);
     }
 
-    private function insertFormElement()
+    private function insertFormElement(): void
     {
         $sql = <<<'EOD'
 INSERT IGNORE INTO `s_core_config_elements` (`id`, `form_id`, `name`, `value`, `label`, `description`, `type`, `required`, `position`, `scope`) VALUES
@@ -48,7 +74,7 @@ private function insertFormElement()
         $this->addSql($sql);
     }
 
-    private function insertFormTranslation()
+    private function insertFormTranslation(): void
     {
         $sql = <<<'EOD'
 INSERT IGNORE INTO `s_core_config_element_translations` (`element_id`, `locale_id`, `label`, `description`)
@@ -57,7 +83,7 @@ private function insertFormTranslation()
         $this->addSql($sql);
     }
 
-    private function fixCaptchaColor()
+    private function fixCaptchaColor(): void
     {
         $sql = <<<'EOD'
 UPDATE s_core_config_element_translations
@@ -68,4 +94,4 @@ private function fixCaptchaColor()
 EOD;
         $this->addSql($sql);
     }
-}
\ No newline at end of file
+}
diff --git a/_sql/migrations/444-add-imprint-to-bottom-shop-group.php b/_sql/migrations/444-add-imprint-to-bottom-shop-group.php
index 9b6e3054a89..2ad2bbe1ffb 100644
--- a/_sql/migrations/444-add-imprint-to-bottom-shop-group.php
+++ b/_sql/migrations/444-add-imprint-to-bottom-shop-group.php
@@ -1,7 +1,30 @@
 <?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 use Shopware\Components\Migrations\AbstractMigration;
 
-class Migrations_Migration444 Extends Shopware\Components\Migrations\AbstractMigration
+class Migrations_Migration444 extends AbstractMigration
 {
     public function up($modus)
     {
@@ -24,4 +47,4 @@ private function addImprintToBottomGroup()
 EOD;
         $this->addSql($sql);
     }
-}
\ No newline at end of file
+}
diff --git a/_sql/migrations/445-import-vrrl-plugin-settings.php b/_sql/migrations/445-import-vrrl-plugin-settings.php
index 5fe0bbc604f..0f7162587bd 100644
--- a/_sql/migrations/445-import-vrrl-plugin-settings.php
+++ b/_sql/migrations/445-import-vrrl-plugin-settings.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration445 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration445 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -8,7 +31,6 @@ public function up($modus)
          * Insert showEsdWarning config
          * Insert serviceAttrField config
          */
-
         $sql = <<<'EOD'
             SET @configFormId = (SELECT id FROM s_core_config_forms WHERE name = 'Checkout' LIMIT 1);
 EOD;
diff --git a/_sql/migrations/446-easy-registration-process.php b/_sql/migrations/446-easy-registration-process.php
index 7cbfb61f8ff..a6e48c2aefa 100644
--- a/_sql/migrations/446-easy-registration-process.php
+++ b/_sql/migrations/446-easy-registration-process.php
@@ -1,14 +1,39 @@
 <?php
-class Migrations_Migration446 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration446 extends AbstractMigration
 {
     public function up($modus)
     {
-        if ($modus !== \Shopware\Components\Migrations\AbstractMigration::MODUS_INSTALL) {
+        if ($modus !== AbstractMigration::MODUS_INSTALL) {
             return;
         }
-        
+
         $sql = <<<'EOD'
-            UPDATE `s_core_config_elements` SET value = 'b:0;' 
+            UPDATE `s_core_config_elements` SET value = 'b:0;'
             WHERE name IN ('doublepasswordvalidation', 'requirePhoneField', 'showphonenumberfield', 'showbirthdayfield');
 EOD;
         $this->addSql($sql);
diff --git a/_sql/migrations/447-update-tag-cloud-defaults.php b/_sql/migrations/447-update-tag-cloud-defaults.php
index 40055cb7efd..18e9ca4316a 100644
--- a/_sql/migrations/447-update-tag-cloud-defaults.php
+++ b/_sql/migrations/447-update-tag-cloud-defaults.php
@@ -1,9 +1,34 @@
 <?php
-class Migrations_Migration447 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration447 extends AbstractMigration
 {
     public function up($modus)
     {
-        if ($modus !== \Shopware\Components\Migrations\AbstractMigration::MODUS_INSTALL) {
+        if ($modus !== AbstractMigration::MODUS_INSTALL) {
             return;
         }
 
diff --git a/_sql/migrations/448-update-first-run-wizard-snippet.php b/_sql/migrations/448-update-first-run-wizard-snippet.php
index 6525ee9591e..c2753ccb002 100644
--- a/_sql/migrations/448-update-first-run-wizard-snippet.php
+++ b/_sql/migrations/448-update-first-run-wizard-snippet.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration448 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration448 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/449-add-pagination-seo.php b/_sql/migrations/449-add-pagination-seo.php
index b06f3bfe283..01114b061a1 100644
--- a/_sql/migrations/449-add-pagination-seo.php
+++ b/_sql/migrations/449-add-pagination-seo.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration449 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration449 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -26,6 +49,3 @@ public function up($modus)
         $this->addSql($sql);
     }
 }
-
-
-
diff --git a/_sql/migrations/450-add-high-dpi-album-settings.php b/_sql/migrations/450-add-high-dpi-album-settings.php
index 1f96d0bc164..4f6512eefaf 100644
--- a/_sql/migrations/450-add-high-dpi-album-settings.php
+++ b/_sql/migrations/450-add-high-dpi-album-settings.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration450 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration450 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/451-fix-email-header-field.php b/_sql/migrations/451-fix-email-header-field.php
index 4ecc44c8bed..d50bfdcc9ba 100644
--- a/_sql/migrations/451-fix-email-header-field.php
+++ b/_sql/migrations/451-fix-email-header-field.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration451 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration451 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -16,5 +38,4 @@ public function up($modus)
 
         $this->addSql($sql);
     }
-
 }
diff --git a/_sql/migrations/452-add-styling-classes-main-menu.php b/_sql/migrations/452-add-styling-classes-main-menu.php
index 08a72716f0b..fed1f876e7a 100644
--- a/_sql/migrations/452-add-styling-classes-main-menu.php
+++ b/_sql/migrations/452-add-styling-classes-main-menu.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration452 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration452 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/453-update-table-encoding.php b/_sql/migrations/453-update-table-encoding.php
index e14171d393e..679d51c02a7 100644
--- a/_sql/migrations/453-update-table-encoding.php
+++ b/_sql/migrations/453-update-table-encoding.php
@@ -1,20 +1,43 @@
 <?php
-class Migrations_Migration453 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration453 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
-        $sql = "
-            ALTER TABLE `s_core_auth_roles` 
+        $sql = '
+            ALTER TABLE `s_core_auth_roles`
                CHANGE `name` `name` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
                CHANGE `description` `description` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
                CHANGE `source` `source` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL;
-        ";
+        ';
         $this->addSql($sql);
-        
-        $sql = "
-            ALTER TABLE `s_statistics_search` 
+
+        $sql = '
+            ALTER TABLE `s_statistics_search`
               CHANGE `searchterm` `searchterm` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL;
-        ";
+        ';
         $this->addSql($sql);
     }
 }
diff --git a/_sql/migrations/454-rename-theme-manager.php b/_sql/migrations/454-rename-theme-manager.php
index 63978c21d5d..fa2794c4c54 100644
--- a/_sql/migrations/454-rename-theme-manager.php
+++ b/_sql/migrations/454-rename-theme-manager.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration454 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration454 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -7,6 +30,5 @@ public function up($modus)
 UPDATE s_core_menu SET name = 'Theme Manager' WHERE controller = 'Theme' and name = 'Theme Manager 2.0'
         ";
         $this->addSql($sql);
-
     }
 }
diff --git a/_sql/migrations/455-cache-invalidate-variants.php b/_sql/migrations/455-cache-invalidate-variants.php
index 9e8a15f7d88..7365c983ea3 100644
--- a/_sql/migrations/455-cache-invalidate-variants.php
+++ b/_sql/migrations/455-cache-invalidate-variants.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration455 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration455 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -18,14 +40,14 @@ public function up($modus)
 
         $sql = "SET @pluginID = (SELECT id FROM s_core_plugins WHERE name = 'HttpCache' LIMIT 1);";
         $this->addSql($sql);
-        
+
         $sql = <<<'SQL'
 INSERT IGNORE INTO `s_core_subscribes` (`subscribe`, `type`, `listener`, `pluginID`, `position`) VALUES
 ('Shopware\\Models\\Article\\Detail::postUpdate', 0, 'Shopware_Plugins_Core_HttpCache_Bootstrap::onPostPersist', @pluginID, 0);
 SQL;
 
         $this->addSql($sql);
-        
+
         $sql = <<<'SQL'
 INSERT IGNORE INTO `s_core_subscribes` (`subscribe`, `type`, `listener`, `pluginID`, `position`) VALUES
 ('Shopware\\Models\\Article\\Detail::postPersist', 0, 'Shopware_Plugins_Core_HttpCache_Bootstrap::onPostPersist', @pluginID, 0);
@@ -33,5 +55,4 @@ public function up($modus)
 
         $this->addSql($sql);
     }
-
 }
diff --git a/_sql/migrations/456-emotion-worlds-cache-invalidation.php b/_sql/migrations/456-emotion-worlds-cache-invalidation.php
index 8b08e528e64..06f5b2daf87 100644
--- a/_sql/migrations/456-emotion-worlds-cache-invalidation.php
+++ b/_sql/migrations/456-emotion-worlds-cache-invalidation.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration456 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration456 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -29,5 +51,4 @@ public function up($modus)
 
         $this->addSql($sql);
     }
-
-}
\ No newline at end of file
+}
diff --git a/_sql/migrations/457-add-thumbnail-config.php b/_sql/migrations/457-add-thumbnail-config.php
index 8f04c6e4e30..0cdfe07a235 100644
--- a/_sql/migrations/457-add-thumbnail-config.php
+++ b/_sql/migrations/457-add-thumbnail-config.php
@@ -1,16 +1,37 @@
 <?php
-class Migrations_Migration457 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration457 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
-
         // add new config form media
         $sql = <<<'EOD'
         SET @parent = (SELECT id FROM s_core_config_forms WHERE name = 'Frontend' AND label = 'Storefront' LIMIT 1);
 EOD;
         $this->addSql($sql);
 
-
         $sql = <<<'EOD'
             INSERT IGNORE INTO `s_core_config_forms` (`parent_id`, `name`, `label`, `description`, `position`, `scope`, `plugin_id`)
             VALUES (@parent, 'Media', 'Medien', NULL, '13', '', NULL);
@@ -22,7 +43,6 @@ public function up($modus)
 EOD;
         $this->addSql($sql);
 
-
         $sql = <<<'EOD'
             INSERT IGNORE INTO `s_core_config_form_translations` (`form_id`, `locale_id`, `label`, `description`)
             VALUES (@parent, 2, 'Media', '');
@@ -48,6 +68,3 @@ public function up($modus)
         $this->addSql($sql);
     }
 }
-
-
-
diff --git a/_sql/migrations/458-remove-selfhealing-plugin.php b/_sql/migrations/458-remove-selfhealing-plugin.php
index 71359b3045f..d79143d409d 100644
--- a/_sql/migrations/458-remove-selfhealing-plugin.php
+++ b/_sql/migrations/458-remove-selfhealing-plugin.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration458 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration458 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -26,14 +49,14 @@ private function fetchPluginId()
     private function deleteListeners()
     {
         $this->addSql(
-            "DELETE FROM s_core_subscribes WHERE pluginID = @pluginId"
+            'DELETE FROM s_core_subscribes WHERE pluginID = @pluginId'
         );
     }
 
     private function deletePlugin()
     {
         $this->addSql(
-            "DELETE FROM s_core_plugins WHERE id = @pluginId"
+            'DELETE FROM s_core_plugins WHERE id = @pluginId'
         );
     }
 
diff --git a/_sql/migrations/459-translate-form-fields.php b/_sql/migrations/459-translate-form-fields.php
index bac6ff567db..77282dbe793 100644
--- a/_sql/migrations/459-translate-form-fields.php
+++ b/_sql/migrations/459-translate-form-fields.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration459 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration459 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -41,5 +64,3 @@ public function up($modus)
         $this->addSql($sql);
     }
 }
-
-
diff --git a/_sql/migrations/460-fix-email-header-field.php b/_sql/migrations/460-fix-email-header-field.php
index 883a142f495..30a0dfb6f0b 100644
--- a/_sql/migrations/460-fix-email-header-field.php
+++ b/_sql/migrations/460-fix-email-header-field.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration460 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration460 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -16,5 +38,4 @@ public function up($modus)
 
         $this->addSql($sql);
     }
-
 }
diff --git a/_sql/migrations/461-fix-sorder-email-thumbnails.php b/_sql/migrations/461-fix-sorder-email-thumbnails.php
index 61ff519d873..05aebf470ed 100644
--- a/_sql/migrations/461-fix-sorder-email-thumbnails.php
+++ b/_sql/migrations/461-fix-sorder-email-thumbnails.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration461 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration461 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -48,6 +70,7 @@ private function updateTranslations()
 
     /**
      * Helper method to update the translations of a mail template
+     *
      * @param string $name
      * @param string $content
      */
diff --git a/_sql/migrations/462-add-emotion-position-column.php b/_sql/migrations/462-add-emotion-position-column.php
index e3b68c7d932..28cb9d2c3ab 100644
--- a/_sql/migrations/462-add-emotion-position-column.php
+++ b/_sql/migrations/462-add-emotion-position-column.php
@@ -1,9 +1,31 @@
 <?php
 
-class Migrations_Migration462 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration462 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
-        $this->addSql("ALTER TABLE `s_emotion` ADD `position` INT NULL DEFAULT 1");
+        $this->addSql('ALTER TABLE `s_emotion` ADD `position` INT NULL DEFAULT 1');
     }
 }
diff --git a/_sql/migrations/463-translate-emotion-html-video.php b/_sql/migrations/463-translate-emotion-html-video.php
index 8bfafbbc7b8..496bd32c5ce 100644
--- a/_sql/migrations/463-translate-emotion-html-video.php
+++ b/_sql/migrations/463-translate-emotion-html-video.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration463 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration463 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/464-add-feed-dirty-flag.php b/_sql/migrations/464-add-feed-dirty-flag.php
index 5b240b79d1c..3cb991ab4ba 100644
--- a/_sql/migrations/464-add-feed-dirty-flag.php
+++ b/_sql/migrations/464-add-feed-dirty-flag.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration464 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration464 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -10,9 +32,8 @@ public function up($modus)
             $this->addSql('UPDATE `s_export` SET `dirty` = 0;');
 
             return;
-        } else {
-            $this->addSql('UPDATE `s_export` SET `dirty` = 1;');
         }
+        $this->addSql('UPDATE `s_export` SET `dirty` = 1;');
 
         $sql = <<<'SQL'
 UPDATE `s_export` SET dirty = 0
@@ -168,5 +189,3 @@ public function up($modus)
         $this->addSql($sql);
     }
 }
-
-
diff --git a/_sql/migrations/465-token-secret.php b/_sql/migrations/465-token-secret.php
index 0d66cf61f34..1bc297401f9 100644
--- a/_sql/migrations/465-token-secret.php
+++ b/_sql/migrations/465-token-secret.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration465 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration465 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/466-supplier-seo-url.php b/_sql/migrations/466-supplier-seo-url.php
index 8504ce8b82b..7c091757ad4 100644
--- a/_sql/migrations/466-supplier-seo-url.php
+++ b/_sql/migrations/466-supplier-seo-url.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration466 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration466 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/467-remove-listing-seo-url.php b/_sql/migrations/467-remove-listing-seo-url.php
index ab4935a2b49..b3bd7ca8b84 100644
--- a/_sql/migrations/467-remove-listing-seo-url.php
+++ b/_sql/migrations/467-remove-listing-seo-url.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration467 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration467 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -14,5 +37,3 @@ public function up($modus)
         $this->addSql($sql);
     }
 }
-
-
diff --git a/_sql/migrations/468-update-feeds-thumbnails-size.php b/_sql/migrations/468-update-feeds-thumbnails-size.php
index 17f7506f7d5..f9cdfcbb0a9 100644
--- a/_sql/migrations/468-update-feeds-thumbnails-size.php
+++ b/_sql/migrations/468-update-feeds-thumbnails-size.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration468 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration468 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -8,7 +31,7 @@ public function up($modus)
         }
 
         $sql = <<<'SQL'
-UPDATE `s_export` 
+UPDATE `s_export`
 SET body = '{strip}\n{$sArticle.ordernumber|escape}{#S#}\n{$sArticle.name|strip_tags|strip|truncate:80:"...":true|escape|htmlentities}{#S#}\n{$sArticle.description_long|strip_tags|html_entity_decode|trim|regex_replace:"#[^\\wöäüÖÄÜß\\.%&-+ ]#i":""|strip|truncate:500:"...":true|htmlentities|escape}{#S#}\n{$sArticle.articleID|link:$sArticle.name|escape}{#S#}\n{$sArticle.image|image:1}{#S#}\n{$sArticle.ean|escape}{#S#}\n{if $sArticle.weight}{$sArticle.weight|escape:"number"}{" kg"}{/if}{#S#}\n{$sArticle.supplier|escape}{#S#}\n{$sArticle.suppliernumber|escape}{#S#}\nNeu{#S#}\n{$sArticle.articleID|category:" > "|escape}{#S#}\n{$sArticle.price|escape:"number"}{#S#}\nDE::DHL:{$sArticle|@shippingcost:"prepayment":"de"}{#S#}\n{#S#}\n{$sCurrency.currency}\n{/strip}{#L#}'
 WHERE `name` = 'Google Produktsuche'
 AND dirty = 0;
@@ -128,5 +151,3 @@ public function up($modus)
         $this->addSql($sql);
     }
 }
-
-
diff --git a/_sql/migrations/469-add-404-article-page-config.php b/_sql/migrations/469-add-404-article-page-config.php
index 8b9447bc6cf..ed7a038a45d 100644
--- a/_sql/migrations/469-add-404-article-page-config.php
+++ b/_sql/migrations/469-add-404-article-page-config.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration469 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration469 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/470-update-price-variation-column-type.php b/_sql/migrations/470-update-price-variation-column-type.php
index 6bf0d50c4b5..54315697e15 100644
--- a/_sql/migrations/470-update-price-variation-column-type.php
+++ b/_sql/migrations/470-update-price-variation-column-type.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration470 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration470 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/471-fix-attr17.php b/_sql/migrations/471-fix-attr17.php
index 53d860c5142..f7d3164a696 100644
--- a/_sql/migrations/471-fix-attr17.php
+++ b/_sql/migrations/471-fix-attr17.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration471 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration471 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -7,6 +30,6 @@ public function up($modus)
             return;
         }
 
-        $this->addSql("ALTER TABLE s_articles_attributes MODIFY attr17 date DEFAULT NULL");
+        $this->addSql('ALTER TABLE s_articles_attributes MODIFY attr17 date DEFAULT NULL');
     }
 }
diff --git a/_sql/migrations/472-add-landing-page-parent.php b/_sql/migrations/472-add-landing-page-parent.php
index 189bd43bba2..e3fe72b22cd 100644
--- a/_sql/migrations/472-add-landing-page-parent.php
+++ b/_sql/migrations/472-add-landing-page-parent.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration472 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration472 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/473-add-zip-city-flip-option.php b/_sql/migrations/473-add-zip-city-flip-option.php
index a4e191d6f40..af2a65aa613 100644
--- a/_sql/migrations/473-add-zip-city-flip-option.php
+++ b/_sql/migrations/473-add-zip-city-flip-option.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration473 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration473 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -26,5 +49,3 @@ public function up($modus)
         $this->addSql($sql);
     }
 }
-
-
diff --git a/_sql/migrations/474-switch-zipcode-city-emails.php b/_sql/migrations/474-switch-zipcode-city-emails.php
index ae513827e35..39b28d341b4 100644
--- a/_sql/migrations/474-switch-zipcode-city-emails.php
+++ b/_sql/migrations/474-switch-zipcode-city-emails.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration474 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration474 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -50,6 +72,7 @@ private function updateTranslations()
 
     /**
      * Helper method to update the translations of a mail template
+     *
      * @param string $name
      * @param string $content
      */
diff --git a/_sql/migrations/475-add-missing-emails.php b/_sql/migrations/475-add-missing-emails.php
index 26f4f15ff2a..fe0bc34c789 100644
--- a/_sql/migrations/475-add-missing-emails.php
+++ b/_sql/migrations/475-add-missing-emails.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration475 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration475 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -24,7 +46,6 @@ private function updateEmail()
         $this->addSql($sql);
     }
 
-
     private function insertTranslation()
     {
         $content = "Hello {if \$sUser.billing_salutation eq \"mr\"}Mr{elseif \$sUser.billing_salutation eq \"ms\"}Mrs{/if} {\$sUser.billing_firstname} {\$sUser.billing_lastname},\n\nThe order status of your order {\$sOrder.ordernumber} has changed!\nYour order now has the following status: {\$sOrder.status_description}.\n\nYou can check the current status of your order on our website under \"My account\" - \"My orders\" anytime. But in case you have purchased without a registration or a customer account, you do not have this option.\n\nBest regards,\nYour team of {config name=shopName}";
@@ -33,7 +54,7 @@ private function insertTranslation()
 
         $data = [
             'content' => $content,
-            'subject' => 'Your order with {config name=shopName}'
+            'subject' => 'Your order with {config name=shopName}',
         ];
 
         $data = serialize($data);
@@ -52,6 +73,7 @@ private function insertTranslation()
      * Helper method to prefix and suffix the mail templates with the configuration values
      *
      * @param string $content
+     *
      * @return string
      */
     private function convertTemplatePlain($content)
@@ -59,6 +81,6 @@ private function convertTemplatePlain($content)
         $header = '{include file=\"string:{config name=emailheaderplain}\"}';
         $footer = '{include file=\"string:{config name=emailfooterplain}\"}';
 
-        return $header."\r\n\r\n".$content."\r\n\r\n".$footer;
+        return $header . "\r\n\r\n" . $content . "\r\n\r\n" . $footer;
     }
 }
diff --git a/_sql/migrations/476-add-less-compatible-flag.php b/_sql/migrations/476-add-less-compatible-flag.php
index 3a84940312d..f60477eca79 100644
--- a/_sql/migrations/476-add-less-compatible-flag.php
+++ b/_sql/migrations/476-add-less-compatible-flag.php
@@ -1,14 +1,38 @@
 <?php
 
-class Migrations_Migration476 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration476 extends AbstractMigration
 {
     public function up($modus)
     {
         $statement = $this->getConnection()->prepare('SHOW COLUMNS FROM `s_core_templates_config_elements`;');
         $statement->execute();
-        $result = $statement->fetchAll(\PDO::FETCH_COLUMN);
+        $result = $statement->fetchAll(PDO::FETCH_COLUMN);
 
-        if (!in_array('less_compatible', $result)) {
+        if (!\in_array('less_compatible', $result)) {
             $this->addLessCompatibleFlag();
         }
     }
diff --git a/_sql/migrations/477-disable-tag-cloud-for-installation.php b/_sql/migrations/477-disable-tag-cloud-for-installation.php
index d7eea9fca96..6fa742c7b94 100644
--- a/_sql/migrations/477-disable-tag-cloud-for-installation.php
+++ b/_sql/migrations/477-disable-tag-cloud-for-installation.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration477 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration477 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -29,14 +52,14 @@ private function fetchPluginId()
     private function deleteListeners()
     {
         $this->addSql(
-            "DELETE FROM s_core_subscribes WHERE pluginID = @pluginId"
+            'DELETE FROM s_core_subscribes WHERE pluginID = @pluginId'
         );
     }
 
     private function uninstallPlugin()
     {
         $this->addSql(
-            "UPDATE s_core_plugins SET active = 0, installation_date = NULL, update_date = NULL WHERE id = @pluginId"
+            'UPDATE s_core_plugins SET active = 0, installation_date = NULL, update_date = NULL WHERE id = @pluginId'
         );
     }
 
diff --git a/_sql/migrations/478-add-emotion-banner-title-attr.php b/_sql/migrations/478-add-emotion-banner-title-attr.php
index cdf13d9e1c8..bc887b84ce2 100644
--- a/_sql/migrations/478-add-emotion-banner-title-attr.php
+++ b/_sql/migrations/478-add-emotion-banner-title-attr.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration478 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration478 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -14,4 +36,4 @@ public function up($modus)
 
         $this->addSql($sql);
     }
-}
\ No newline at end of file
+}
diff --git a/_sql/migrations/479-implement-after-update-wizard.php b/_sql/migrations/479-implement-after-update-wizard.php
index 2812133ec4f..7d08699296e 100644
--- a/_sql/migrations/479-implement-after-update-wizard.php
+++ b/_sql/migrations/479-implement-after-update-wizard.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration479 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration479 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -11,5 +33,4 @@ public function up($modus)
             $this->addSql($sql);
         }
     }
-
-}
\ No newline at end of file
+}
diff --git a/_sql/migrations/480-translate-multi-edit-config-form.php b/_sql/migrations/480-translate-multi-edit-config-form.php
index 2d447499007..5af05afe191 100644
--- a/_sql/migrations/480-translate-multi-edit-config-form.php
+++ b/_sql/migrations/480-translate-multi-edit-config-form.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration480 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration480 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/481-remove-vat-validation-from-core.php b/_sql/migrations/481-remove-vat-validation-from-core.php
index 6a23070758d..07f0e5a1955 100644
--- a/_sql/migrations/481-remove-vat-validation-from-core.php
+++ b/_sql/migrations/481-remove-vat-validation-from-core.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration481 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration481 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/482-remove-horizontal-scrolling.php b/_sql/migrations/482-remove-horizontal-scrolling.php
index d66063f9187..06a3bc5e8b5 100644
--- a/_sql/migrations/482-remove-horizontal-scrolling.php
+++ b/_sql/migrations/482-remove-horizontal-scrolling.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration482 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration482 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/483-set-device-type-nullable.php b/_sql/migrations/483-set-device-type-nullable.php
index 293c9beb3e0..77fae33207a 100644
--- a/_sql/migrations/483-set-device-type-nullable.php
+++ b/_sql/migrations/483-set-device-type-nullable.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration483 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration483 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -8,4 +31,4 @@ public function up($modus)
 EOD;
         $this->addSql($sql);
     }
-}
\ No newline at end of file
+}
diff --git a/_sql/migrations/484-add-seo-title-to-categories.php b/_sql/migrations/484-add-seo-title-to-categories.php
index 5cb71e92b17..678ed659e06 100644
--- a/_sql/migrations/484-add-seo-title-to-categories.php
+++ b/_sql/migrations/484-add-seo-title-to-categories.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration484 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration484 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/485-add-new-sprites-media-manager-albums.php b/_sql/migrations/485-add-new-sprites-media-manager-albums.php
index ff88603718d..dfed7da24fd 100644
--- a/_sql/migrations/485-add-new-sprites-media-manager-albums.php
+++ b/_sql/migrations/485-add-new-sprites-media-manager-albums.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration485 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration485 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -23,4 +45,4 @@ private function updateAlbumIcon($albumId, $icon)
 SQL;
         $this->addSql($sql);
     }
-}
\ No newline at end of file
+}
diff --git a/_sql/migrations/486-generate-mobile-sitemap.php b/_sql/migrations/486-generate-mobile-sitemap.php
index 54ad3bed74f..520e5616c83 100644
--- a/_sql/migrations/486-generate-mobile-sitemap.php
+++ b/_sql/migrations/486-generate-mobile-sitemap.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration486 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration486 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/487-fix-service-product-snippet.php b/_sql/migrations/487-fix-service-product-snippet.php
index 7765ab2eb27..9021c55770d 100644
--- a/_sql/migrations/487-fix-service-product-snippet.php
+++ b/_sql/migrations/487-fix-service-product-snippet.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration487 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration487 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/488-reset-search-index.php b/_sql/migrations/488-reset-search-index.php
index e263bbcd0b6..bdc4cef9922 100644
--- a/_sql/migrations/488-reset-search-index.php
+++ b/_sql/migrations/488-reset-search-index.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration488 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration488 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/489-fix-backend-menu-icons.php b/_sql/migrations/489-fix-backend-menu-icons.php
index b61a706f31e..4ba764b2dbc 100644
--- a/_sql/migrations/489-fix-backend-menu-icons.php
+++ b/_sql/migrations/489-fix-backend-menu-icons.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration489 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration489 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -419,6 +442,5 @@ public function updateProductMenu()
         AND `controller` = 'Payments';
 EOD;
         $this->addSql($sql);
-
     }
 }
diff --git a/_sql/migrations/490-fix-email-templates-images-height.php b/_sql/migrations/490-fix-email-templates-images-height.php
index 880b17806ca..65b1d63fff7 100644
--- a/_sql/migrations/490-fix-email-templates-images-height.php
+++ b/_sql/migrations/490-fix-email-templates-images-height.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration490 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration490 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -19,4 +41,4 @@ private function updateTemplate()
 SQL;
         $this->addSql($sql);
     }
-}
\ No newline at end of file
+}
diff --git a/_sql/migrations/491-change-enabled-payment-methods.php b/_sql/migrations/491-change-enabled-payment-methods.php
index 0bff4066c01..2001f8b8228 100644
--- a/_sql/migrations/491-change-enabled-payment-methods.php
+++ b/_sql/migrations/491-change-enabled-payment-methods.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration491 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration491 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/492-remove-unnecessary-data-from-base-install.php b/_sql/migrations/492-remove-unnecessary-data-from-base-install.php
index f0d2132a91c..7363baca95a 100644
--- a/_sql/migrations/492-remove-unnecessary-data-from-base-install.php
+++ b/_sql/migrations/492-remove-unnecessary-data-from-base-install.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration492 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration492 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/493-remove-mail-translations.php b/_sql/migrations/493-remove-mail-translations.php
index 3f450656bd2..3459e9b67d0 100644
--- a/_sql/migrations/493-remove-mail-translations.php
+++ b/_sql/migrations/493-remove-mail-translations.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration493 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration493 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -14,6 +36,6 @@ public function up($modus)
      */
     private function removeTranslations()
     {
-        $this->addSql("TRUNCATE s_core_translations;");
+        $this->addSql('TRUNCATE s_core_translations;');
     }
 }
diff --git a/_sql/migrations/494-add-cheapest-price-calculation-config.php b/_sql/migrations/494-add-cheapest-price-calculation-config.php
index 837df9348e4..1486b4a9272 100644
--- a/_sql/migrations/494-add-cheapest-price-calculation-config.php
+++ b/_sql/migrations/494-add-cheapest-price-calculation-config.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration494 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration494 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -19,6 +41,5 @@ public function up($modus)
 VALUES (NULL, @elementId, '2', 'Consider product minimum order quantity for cheapest price calculation', NULL);
 SQL;
         $this->addSql($sql);
-
     }
 }
diff --git a/_sql/migrations/495-fix-shopping-worlds-grid.php b/_sql/migrations/495-fix-shopping-worlds-grid.php
index 8adb9e17278..e39050d294c 100644
--- a/_sql/migrations/495-fix-shopping-worlds-grid.php
+++ b/_sql/migrations/495-fix-shopping-worlds-grid.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration495 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration495 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -12,4 +34,4 @@ public function up($modus)
 EOD;
         $this->addSql($sql);
     }
-}
\ No newline at end of file
+}
diff --git a/_sql/migrations/496-add-cheapest-price-selection-config.php b/_sql/migrations/496-add-cheapest-price-selection-config.php
index a81f2d59c79..485c175bd61 100644
--- a/_sql/migrations/496-add-cheapest-price-selection-config.php
+++ b/_sql/migrations/496-add-cheapest-price-selection-config.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration496 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration496 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -19,6 +41,5 @@ public function up($modus)
 VALUES (NULL, @elementId, '2', 'Consider product graduatation for cheapest price calculation', NULL);
 SQL;
         $this->addSql($sql);
-
     }
 }
diff --git a/_sql/migrations/497-fix-email-payment-method-description.php b/_sql/migrations/497-fix-email-payment-method-description.php
index 4bcee75462c..aa4f6f5b8a1 100644
--- a/_sql/migrations/497-fix-email-payment-method-description.php
+++ b/_sql/migrations/497-fix-email-payment-method-description.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration497 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration497 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -19,4 +41,4 @@ private function updateTemplate()
 SQL;
         $this->addSql($sql);
     }
-}
\ No newline at end of file
+}
diff --git a/_sql/migrations/498-fix-and-add-acl-privileges.php b/_sql/migrations/498-fix-and-add-acl-privileges.php
index c19ea17b426..8ad0d38337b 100644
--- a/_sql/migrations/498-fix-and-add-acl-privileges.php
+++ b/_sql/migrations/498-fix-and-add-acl-privileges.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration498 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration498 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -40,4 +62,4 @@ public function up($modus)
 EOD;
         $this->addSql($sql);
     }
-}
\ No newline at end of file
+}
diff --git a/_sql/migrations/499-add-swag-update-acl-privileges.php b/_sql/migrations/499-add-swag-update-acl-privileges.php
index d10f058d989..375877ca78c 100644
--- a/_sql/migrations/499-add-swag-update-acl-privileges.php
+++ b/_sql/migrations/499-add-swag-update-acl-privileges.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration499 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration499 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -30,4 +52,4 @@ public function up($modus)
 EOD;
         $this->addSql($sql);
     }
-}
\ No newline at end of file
+}
diff --git a/_sql/migrations/500-destroy-bot-sessions.php b/_sql/migrations/500-destroy-bot-sessions.php
index fc311e442bd..d8ad87a489d 100644
--- a/_sql/migrations/500-destroy-bot-sessions.php
+++ b/_sql/migrations/500-destroy-bot-sessions.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration500 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration500 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -11,5 +34,3 @@ public function up($modus)
         $this->addSql($sql);
     }
 }
-
-
diff --git a/_sql/migrations/501-add-added-column-in-mailaddresses.php b/_sql/migrations/501-add-added-column-in-mailaddresses.php
index 3c033652a1e..51315341117 100644
--- a/_sql/migrations/501-add-added-column-in-mailaddresses.php
+++ b/_sql/migrations/501-add-added-column-in-mailaddresses.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration501 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration501 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -10,8 +32,8 @@ public function up($modus)
 EOD;
         $this->addSql($sql);
 
-        $sql = "UPDATE s_campaigns_mailaddresses ca
-                SET added = (SELECT cm.added FROM s_campaigns_maildata cm WHERE cm.email = ca.email LIMIT 1)";
+        $sql = 'UPDATE s_campaigns_mailaddresses ca
+                SET added = (SELECT cm.added FROM s_campaigns_maildata cm WHERE cm.email = ca.email LIMIT 1)';
         $this->addSql($sql);
     }
-}
\ No newline at end of file
+}
diff --git a/_sql/migrations/502-remove-unused-voucher-table.php b/_sql/migrations/502-remove-unused-voucher-table.php
index 628b183e87d..522ce200b09 100644
--- a/_sql/migrations/502-remove-unused-voucher-table.php
+++ b/_sql/migrations/502-remove-unused-voucher-table.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration502 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration502 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/503-rename-multi-edit.php b/_sql/migrations/503-rename-multi-edit.php
index 0097e370965..185d6bcea1c 100644
--- a/_sql/migrations/503-rename-multi-edit.php
+++ b/_sql/migrations/503-rename-multi-edit.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration503 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration503 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -90,4 +112,4 @@ private function insertConfigForm()
 EOD;
         $this->addSql($sql);
     }
-}
\ No newline at end of file
+}
diff --git a/_sql/migrations/504-add-customergroup-index.php b/_sql/migrations/504-add-customergroup-index.php
index b03758309e5..51ed426f27f 100644
--- a/_sql/migrations/504-add-customergroup-index.php
+++ b/_sql/migrations/504-add-customergroup-index.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration504 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration504 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/505-add-voucher-indexes.php b/_sql/migrations/505-add-voucher-indexes.php
index 1c9afceda96..8a9de71467c 100644
--- a/_sql/migrations/505-add-voucher-indexes.php
+++ b/_sql/migrations/505-add-voucher-indexes.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration505 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration505 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/506-password-reset.php b/_sql/migrations/506-password-reset.php
index 75d05adee2a..f20469e86d7 100644
--- a/_sql/migrations/506-password-reset.php
+++ b/_sql/migrations/506-password-reset.php
@@ -1,9 +1,32 @@
 <?php
-class Migrations_Migration506 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration506 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
-        $this->addSql("ALTER TABLE  `s_core_optin` ADD  `type` VARCHAR( 255 ) NULL DEFAULT NULL AFTER  `id`;");
+        $this->addSql('ALTER TABLE  `s_core_optin` ADD  `type` VARCHAR( 255 ) NULL DEFAULT NULL AFTER  `id`;');
 
         $sql = <<<'EOD'
 INSERT IGNORE INTO `s_core_config_mails` (`id`, `stateId`, `name`, `frommail`, `fromname`, `subject`, `content`, `contentHTML`, `ishtml`, `attachment`, `mailtype`, `context`, `dirty`) VALUES (NULL, NULL, 'sCONFIRMPASSWORDCHANGE', '{config name=mail}', '{config name=shopName}', 'Passwort vergessen - Passwort zurücksetzen', '{include file=\"string:{config name=emailheaderplain}\"}\r\n\r\nHallo,
diff --git a/_sql/migrations/600-add-support-max-generated-similar-products.php b/_sql/migrations/600-add-support-max-generated-similar-products.php
index b005640a41f..90a52e81ee3 100644
--- a/_sql/migrations/600-add-support-max-generated-similar-products.php
+++ b/_sql/migrations/600-add-support-max-generated-similar-products.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration600 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration600 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -31,4 +53,4 @@ private function updateTranslatedDescription()
 EOD;
         $this->addSql($sql);
     }
-}
\ No newline at end of file
+}
diff --git a/_sql/migrations/601-implement-elastic-search.php b/_sql/migrations/601-implement-elastic-search.php
index 02f0ed8d794..b53daf89eff 100644
--- a/_sql/migrations/601-implement-elastic-search.php
+++ b/_sql/migrations/601-implement-elastic-search.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration601 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration601 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -16,10 +38,10 @@ public function up($modus)
 EOD;
         $this->addSql($sql);
 
-        $sql = "
+        $sql = '
             ALTER TABLE s_articles_categories_ro
             ADD INDEX `elastic_search` (`categoryID`,`articleID`);
-        ";
+        ';
         $this->addSql($sql);
 
         $sql = "
diff --git a/_sql/migrations/602-add-premium-plugins-menu-item.php b/_sql/migrations/602-add-premium-plugins-menu-item.php
index 75c6d6b03b6..cec35926114 100644
--- a/_sql/migrations/602-add-premium-plugins-menu-item.php
+++ b/_sql/migrations/602-add-premium-plugins-menu-item.php
@@ -1,5 +1,28 @@
 <?php
-class Migrations_Migration602 Extends Shopware\Components\Migrations\AbstractMigration
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration602 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -11,5 +34,3 @@ public function up($modus)
         $this->addSql($sql);
     }
 }
-
-
diff --git a/_sql/migrations/603-add-product-streams.php b/_sql/migrations/603-add-product-streams.php
index 944f43c0af1..820097bf9b0 100644
--- a/_sql/migrations/603-add-product-streams.php
+++ b/_sql/migrations/603-add-product-streams.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration603 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
@@ -69,7 +91,6 @@ private function createProductStreamTable()
 
         $this->addSql($sql);
 
-
         return $sql;
     }
 
diff --git a/_sql/migrations/604-move-discount-surchage-names-into-snippets.php b/_sql/migrations/604-move-discount-surchage-names-into-snippets.php
index 28af6ea9f09..849ccc07496 100644
--- a/_sql/migrations/604-move-discount-surchage-names-into-snippets.php
+++ b/_sql/migrations/604-move-discount-surchage-names-into-snippets.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration604 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
@@ -48,9 +70,9 @@ private function migrateCoreSettingsToSnippets()
         }
 
         $statement = $this->getConnection()->prepare(
-            "INSERT INTO `s_core_snippets` (`namespace`, `shopID`, `localeID`, `name`, `value`, `created`, `updated`, `dirty`)
+            'INSERT INTO `s_core_snippets` (`namespace`, `shopID`, `localeID`, `name`, `value`, `created`, `updated`, `dirty`)
             VALUES (?, ?, ?, ?, ?, ?, ?, ?)
-            ON DUPLICATE KEY UPDATE `value` = ?, dirty = 1, `updated` = ?;"
+            ON DUPLICATE KEY UPDATE `value` = ?, dirty = 1, `updated` = ?;'
         );
 
         foreach ($data as $configValue) {
@@ -77,7 +99,7 @@ private function migrateCoreSettingsToSnippets()
                 $dateString,
                 1,
                 $configValue['value'],
-                $dateString
+                $dateString,
             ];
 
             $statement->execute($values);
@@ -93,9 +115,9 @@ private function getSnippetName($configName)
             'paymentsurchargedev' => 'payment_surcharge_dev',
             'shippingdiscountname' => 'shipping_discount_name',
             'surchargename' => 'surcharge_name',
-            'vouchername' => 'voucher_name'
+            'vouchername' => 'voucher_name',
         ];
 
-        return array_key_exists($configName, $matches) ? $matches[$configName] : null;
+        return \array_key_exists($configName, $matches) ? $matches[$configName] : null;
     }
 }
diff --git a/_sql/migrations/605-add-and-search-config.php b/_sql/migrations/605-add-and-search-config.php
index dde55d93ad1..e0a2e7e2d2d 100644
--- a/_sql/migrations/605-add-and-search-config.php
+++ b/_sql/migrations/605-add-and-search-config.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration605 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration605 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/606-add-state-name-column.php b/_sql/migrations/606-add-state-name-column.php
index 5eed55e3e68..572300b14a6 100644
--- a/_sql/migrations/606-add-state-name-column.php
+++ b/_sql/migrations/606-add-state-name-column.php
@@ -1,9 +1,32 @@
 <?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration606 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
-        $this->addSql("ALTER TABLE `s_core_states` ADD `name` VARCHAR(55) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL AFTER `id`;");
+        $this->addSql('ALTER TABLE `s_core_states` ADD `name` VARCHAR(55) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL AFTER `id`;');
 
         $this->addSql("UPDATE s_core_states SET `name` = 'cancelled' WHERE `description` LIKE 'Abgebrochen' AND `group` LIKE 'state';");
         $this->addSql("UPDATE s_core_states SET `name` = 'open' WHERE `description` LIKE 'Offen' AND `group` LIKE 'state';");
diff --git a/_sql/migrations/607-add-rss-feed-widget.php b/_sql/migrations/607-add-rss-feed-widget.php
index 08524815aa0..0e20285e658 100644
--- a/_sql/migrations/607-add-rss-feed-widget.php
+++ b/_sql/migrations/607-add-rss-feed-widget.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration607 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration607 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/608-fix-product-stream-icon.php b/_sql/migrations/608-fix-product-stream-icon.php
index ce2c12f6cdb..cb382cabba2 100644
--- a/_sql/migrations/608-fix-product-stream-icon.php
+++ b/_sql/migrations/608-fix-product-stream-icon.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration608 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/609-add-media-recycling.php b/_sql/migrations/609-add-media-recycling.php
index 63baaaa01ad..dda55448367 100644
--- a/_sql/migrations/609-add-media-recycling.php
+++ b/_sql/migrations/609-add-media-recycling.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration609 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/610-remove-deprecated-adodb.php b/_sql/migrations/610-remove-deprecated-adodb.php
index 3545370fc6e..edf10e7083a 100644
--- a/_sql/migrations/610-remove-deprecated-adodb.php
+++ b/_sql/migrations/610-remove-deprecated-adodb.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration610 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration610 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/611-remove-deprecated-api.php b/_sql/migrations/611-remove-deprecated-api.php
index 00587983b5e..2c1365e738b 100644
--- a/_sql/migrations/611-remove-deprecated-api.php
+++ b/_sql/migrations/611-remove-deprecated-api.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration611 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration611 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
@@ -17,4 +39,3 @@ public function up($modus)
         $this->addSql($sql);
     }
 }
-
diff --git a/_sql/migrations/612-remove-deprecated-multilanguage.php b/_sql/migrations/612-remove-deprecated-multilanguage.php
index 03cb99912d9..52d1c5f4243 100644
--- a/_sql/migrations/612-remove-deprecated-multilanguage.php
+++ b/_sql/migrations/612-remove-deprecated-multilanguage.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration612 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration612 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/613-add-media-meta.php b/_sql/migrations/613-add-media-meta.php
index e6445c71ed1..f356c7abafb 100644
--- a/_sql/migrations/613-add-media-meta.php
+++ b/_sql/migrations/613-add-media-meta.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration613 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration613 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/614-fix-document-logo-path.php b/_sql/migrations/614-fix-document-logo-path.php
index 379ae2b31ef..8fc862fe63a 100644
--- a/_sql/migrations/614-fix-document-logo-path.php
+++ b/_sql/migrations/614-fix-document-logo-path.php
@@ -1,6 +1,28 @@
 <?php
 
-class Migrations_Migration614 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration614 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
diff --git a/_sql/migrations/615-password-reset.php b/_sql/migrations/615-password-reset.php
index 65c63f7cbdd..8705d114657 100644
--- a/_sql/migrations/615-password-reset.php
+++ b/_sql/migrations/615-password-reset.php
@@ -1,17 +1,39 @@
 <?php
 
-class Migrations_Migration615 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration615 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
-        $statement = $this->connection->query("SELECT version FROM `s_schema_version` WHERE version = 506 LIMIT 1");
+        $statement = $this->connection->query('SELECT version FROM `s_schema_version` WHERE version = 506 LIMIT 1');
         $version = $statement->fetchAll(PDO::FETCH_COLUMN);
 
         if (!empty($version)) {
             return;
         }
 
-        $this->addSql("ALTER TABLE `s_core_optin` ADD `type` VARCHAR( 255 ) NULL DEFAULT NULL AFTER `id`");
+        $this->addSql('ALTER TABLE `s_core_optin` ADD `type` VARCHAR( 255 ) NULL DEFAULT NULL AFTER `id`');
 
         $sql = <<<'EOD'
 INSERT IGNORE INTO `s_core_config_mails` (`id`, `stateId`, `name`, `frommail`, `fromname`, `subject`, `content`, `contentHTML`, `ishtml`, `attachment`, `mailtype`, `context`, `dirty`) VALUES (NULL, NULL, 'sCONFIRMPASSWORDCHANGE', '{config name=mail}', '{config name=shopName}', 'Passwort vergessen - Passwort zurücksetzen', '{include file=\"string:{config name=emailheaderplain}\"}\r\n\r\nHallo,
diff --git a/_sql/migrations/616-product-stream-emotion-field.php b/_sql/migrations/616-product-stream-emotion-field.php
index 15227a3fe0b..9fdf17b152a 100644
--- a/_sql/migrations/616-product-stream-emotion-field.php
+++ b/_sql/migrations/616-product-stream-emotion-field.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration616 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
@@ -16,4 +38,4 @@ private function updateProductStreamEmotionField()
 EOD;
         $this->addSql($sql);
     }
-}
\ No newline at end of file
+}
diff --git a/_sql/migrations/617-add-html5-emotion-handler.php b/_sql/migrations/617-add-html5-emotion-handler.php
index c6c3f44eba6..40bdb7fb62f 100644
--- a/_sql/migrations/617-add-html5-emotion-handler.php
+++ b/_sql/migrations/617-add-html5-emotion-handler.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration617 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/618-add-trash-album-settings.php b/_sql/migrations/618-add-trash-album-settings.php
index ec6c79a3e35..a1a6db476ea 100644
--- a/_sql/migrations/618-add-trash-album-settings.php
+++ b/_sql/migrations/618-add-trash-album-settings.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration618 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/619-add-widgets-listing-cache-tag.php b/_sql/migrations/619-add-widgets-listing-cache-tag.php
index 0f30b809020..1bc950ad154 100644
--- a/_sql/migrations/619-add-widgets-listing-cache-tag.php
+++ b/_sql/migrations/619-add-widgets-listing-cache-tag.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration619 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/620-add-delivered-in-future-column.php b/_sql/migrations/620-add-delivered-in-future-column.php
index 09516460863..ec8799d232d 100644
--- a/_sql/migrations/620-add-delivered-in-future-column.php
+++ b/_sql/migrations/620-add-delivered-in-future-column.php
@@ -1,14 +1,38 @@
 <?php
 
-class Migrations_Migration620 extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration620 extends AbstractMigration
 {
     public function up($modus)
     {
         $statement = $this->getConnection()->prepare('SHOW COLUMNS FROM `s_campaigns_mailings`;');
         $statement->execute();
-        $result = $statement->fetchAll(\PDO::FETCH_COLUMN);
+        $result = $statement->fetchAll(PDO::FETCH_COLUMN);
 
-        if (!in_array('timed_delivery', $result)) {
+        if (!\in_array('timed_delivery', $result)) {
             $this->addTimedDeliveryColumn();
         }
     }
diff --git a/_sql/migrations/621-remove-filter-options.php b/_sql/migrations/621-remove-filter-options.php
index d2d33fdaa97..a6ae69e3f81 100644
--- a/_sql/migrations/621-remove-filter-options.php
+++ b/_sql/migrations/621-remove-filter-options.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration621 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/622-add-emotion-seo-title.php b/_sql/migrations/622-add-emotion-seo-title.php
index 101fb46b86f..6140c13e91c 100644
--- a/_sql/migrations/622-add-emotion-seo-title.php
+++ b/_sql/migrations/622-add-emotion-seo-title.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration622 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/623-add-payment-config-item.php b/_sql/migrations/623-add-payment-config-item.php
index 10b55895c15..de830e7896a 100644
--- a/_sql/migrations/623-add-payment-config-item.php
+++ b/_sql/migrations/623-add-payment-config-item.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration623 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/624-fix-null-tax-rules.php b/_sql/migrations/624-fix-null-tax-rules.php
index c478b266bc8..27b3c5fc38a 100644
--- a/_sql/migrations/624-fix-null-tax-rules.php
+++ b/_sql/migrations/624-fix-null-tax-rules.php
@@ -1,4 +1,27 @@
 <?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration624 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/625-rename-feedback.php b/_sql/migrations/625-rename-feedback.php
index 868819a7daa..4229e37800d 100644
--- a/_sql/migrations/625-rename-feedback.php
+++ b/_sql/migrations/625-rename-feedback.php
@@ -1,4 +1,27 @@
 <?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration625 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/626-fix-email-template-variables.php b/_sql/migrations/626-fix-email-template-variables.php
index 31fee3d8ffa..370e8a044b2 100644
--- a/_sql/migrations/626-fix-email-template-variables.php
+++ b/_sql/migrations/626-fix-email-template-variables.php
@@ -1,4 +1,27 @@
 <?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration626 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
@@ -13,8 +36,8 @@ public function up($modus)
             if ($replacedContent != $mail['content'] || $replacedContentHTML != $mail['contentHTML']) {
                 $mailId = $mail['id'];
 
-                $replacedContent = !empty($replacedContent) ? trim($this->getConnection()->quote($replacedContent), "'") : "";
-                $replacedContentHTML = !empty($replacedContentHTML) ? trim($this->getConnection()->quote($replacedContentHTML), "'") : "";
+                $replacedContent = !empty($replacedContent) ? trim($this->getConnection()->quote($replacedContent), "'") : '';
+                $replacedContentHTML = !empty($replacedContentHTML) ? trim($this->getConnection()->quote($replacedContentHTML), "'") : '';
 
                 $sql = <<<EOL
                     UPDATE
@@ -40,7 +63,7 @@ private function replaceOldVarSyntax($content)
                 continue;
             }
 
-            $content = str_replace("{" . $match . "}", "{\$" . $match . "}", $content);
+            $content = str_replace('{' . $match . '}', '{$' . $match . '}', $content);
         }
 
         return trim($content);
diff --git a/_sql/migrations/627-fix-order-email-voucher-image.php b/_sql/migrations/627-fix-order-email-voucher-image.php
index a0be809401f..792c04fd728 100644
--- a/_sql/migrations/627-fix-order-email-voucher-image.php
+++ b/_sql/migrations/627-fix-order-email-voucher-image.php
@@ -1,10 +1,31 @@
 <?php
 
-class Migrations_Migration627 Extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+class Migrations_Migration627 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
-
         $content = <<<'CONTENT'
 {include file="string:{config name=emailheaderhtml}"}
 <br/><br/>
@@ -106,6 +127,6 @@ public function up($modus)
 CONTENT;
 
         $statement = $this->connection->prepare('UPDATE `s_core_config_mails` SET `contentHTML` = ? WHERE `name` = "sORDER" AND dirty = 0');
-        $statement->execute(array($content));
+        $statement->execute([$content]);
     }
-}
\ No newline at end of file
+}
diff --git a/_sql/migrations/628-add-validation-index.php b/_sql/migrations/628-add-validation-index.php
index 5ae1b5d7e35..94abf5e51de 100644
--- a/_sql/migrations/628-add-validation-index.php
+++ b/_sql/migrations/628-add-validation-index.php
@@ -1,4 +1,27 @@
 <?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration628 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/629-implement-ajax-timeout.php b/_sql/migrations/629-implement-ajax-timeout.php
index dee4ddc129e..f2ec9074d41 100644
--- a/_sql/migrations/629-implement-ajax-timeout.php
+++ b/_sql/migrations/629-implement-ajax-timeout.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration629 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/630-remove-google-analytics.php b/_sql/migrations/630-remove-google-analytics.php
index 1ae689f9fdd..6c7b3bb9763 100644
--- a/_sql/migrations/630-remove-google-analytics.php
+++ b/_sql/migrations/630-remove-google-analytics.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration630 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/631-remove-search-results-per-page.php b/_sql/migrations/631-remove-search-results-per-page.php
index 562d161e483..cf9bc36c467 100644
--- a/_sql/migrations/631-remove-search-results-per-page.php
+++ b/_sql/migrations/631-remove-search-results-per-page.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration631 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/632-optimize-hide-no-instock-label.php b/_sql/migrations/632-optimize-hide-no-instock-label.php
index 4a20263c120..83e3aeb1f51 100644
--- a/_sql/migrations/632-optimize-hide-no-instock-label.php
+++ b/_sql/migrations/632-optimize-hide-no-instock-label.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration632 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/633-add-index-for-image-mappings.php b/_sql/migrations/633-add-index-for-image-mappings.php
index a7f8ac20fa1..abca2c3e118 100644
--- a/_sql/migrations/633-add-index-for-image-mappings.php
+++ b/_sql/migrations/633-add-index-for-image-mappings.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration633 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/634-add-index-for-basket-ordernumber.php b/_sql/migrations/634-add-index-for-basket-ordernumber.php
index 5f5ce784bcb..0104da3e945 100644
--- a/_sql/migrations/634-add-index-for-basket-ordernumber.php
+++ b/_sql/migrations/634-add-index-for-basket-ordernumber.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration634 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/635-add-index-for-plugin-id.php b/_sql/migrations/635-add-index-for-plugin-id.php
index ba6566be0f7..ff08842bdb3 100644
--- a/_sql/migrations/635-add-index-for-plugin-id.php
+++ b/_sql/migrations/635-add-index-for-plugin-id.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration635 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/636-streamline-german-email-wording.php b/_sql/migrations/636-streamline-german-email-wording.php
index 3a3b26c53f8..0d4e1329ab9 100644
--- a/_sql/migrations/636-streamline-german-email-wording.php
+++ b/_sql/migrations/636-streamline-german-email-wording.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration636 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
@@ -23,6 +45,7 @@ public function up($modus)
      * Helper method to prefix and suffix the mail templates with the configuration values
      *
      * @param string $content
+     *
      * @return string
      */
     private function convertTemplateHtml($content)
diff --git a/_sql/migrations/637-deactivate-similar-products.php b/_sql/migrations/637-deactivate-similar-products.php
index 9f65c70c4a7..a6db5e854b0 100644
--- a/_sql/migrations/637-deactivate-similar-products.php
+++ b/_sql/migrations/637-deactivate-similar-products.php
@@ -1,6 +1,30 @@
 <?php
 
-class Migrations_Migration637 extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration637 extends AbstractMigration
 {
     public function up($modus)
     {
@@ -22,7 +46,7 @@ public function up($modus)
 SQL;
         $this->addSql($sql);
 
-        if ($modus == \Shopware\Components\Migrations\AbstractMigration::MODUS_UPDATE) {
+        if ($modus == AbstractMigration::MODUS_UPDATE) {
             return;
         }
 
@@ -30,6 +54,5 @@ public function up($modus)
 UPDATE `s_core_config_elements` SET `value` = 's:1:"0";' WHERE `id` = @elementId;
 SQL;
         $this->addSql($sql);
-
     }
 }
diff --git a/_sql/migrations/638-fix-serialized-data.php b/_sql/migrations/638-fix-serialized-data.php
index 49a849f5580..35b94571072 100644
--- a/_sql/migrations/638-fix-serialized-data.php
+++ b/_sql/migrations/638-fix-serialized-data.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration638 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/700-remove-filter-values.php b/_sql/migrations/700-remove-filter-values.php
index 0386c32fe2e..c6315fc5e48 100644
--- a/_sql/migrations/700-remove-filter-values.php
+++ b/_sql/migrations/700-remove-filter-values.php
@@ -1,10 +1,32 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration700 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
-        $this->addSql("ALTER TABLE `s_filter_values` DROP `value_numeric`;");
-        $this->addSql("ALTER TABLE `s_filter_options` DROP `default`;");
+        $this->addSql('ALTER TABLE `s_filter_values` DROP `value_numeric`;');
+        $this->addSql('ALTER TABLE `s_filter_options` DROP `default`;');
     }
 }
diff --git a/_sql/migrations/701-remove-emotion-backend-options.php b/_sql/migrations/701-remove-emotion-backend-options.php
index 7fc76350b89..fa6982f4475 100644
--- a/_sql/migrations/701-remove-emotion-backend-options.php
+++ b/_sql/migrations/701-remove-emotion-backend-options.php
@@ -1,14 +1,37 @@
 <?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration701 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
         // remove old templates
-        $this->addSql("DELETE FROM `s_core_templates` WHERE version < 3;");
+        $this->addSql('DELETE FROM `s_core_templates` WHERE version < 3;');
 
         // remove unused table fields
-        $this->addSql("ALTER TABLE `s_categories` DROP COLUMN `showfiltergroups`;");
-        $this->addSql("ALTER TABLE `s_emotion` DROP COLUMN `container_width`;");
+        $this->addSql('ALTER TABLE `s_categories` DROP COLUMN `showfiltergroups`;');
+        $this->addSql('ALTER TABLE `s_emotion` DROP COLUMN `container_width`;');
 
         // remove unused emotion options
         $this->addSql("DELETE FROM `s_library_component_field` WHERE `name` IN ('article_slider_numbers', 'manufacturer_slider_numbers', 'thumbnail_size');");
@@ -28,10 +51,10 @@ public function up($modus)
             'fuzzysearchdistance',
             'fuzzysearchpricefilter',
             'fuzzysearchresultsperpage',
-            'thumb'
+            'thumb',
         ];
 
-        $optionsToDeleteSql = "'".implode("','", $optionsToDelete)."'";
+        $optionsToDeleteSql = "'" . implode("','", $optionsToDelete) . "'";
         $sql = <<<SQL
 DELETE elements, elementValues, elementTranslations
 FROM `s_core_config_elements` as elements
@@ -44,10 +67,9 @@ public function up($modus)
 
         $this->addSql($sql);
 
-
         // remove unused snippets
-        $snippetsToDelete = ["article_slider_numbers","article_slider_numbers_support","manufacturer_slider_numbers/label","manufacturer_slider_numbers/support","thumbnail_size","thumbnail_size_support","LoginActionClose","LoginLabelNew","LoginActionCreateAccount","LoginLabelExisting","LoginTextExisting","LoginActionNext","ListingPaging","ListingTextPrevious","ListingTextNext","AccountLabelCurrentPassword","AccountLabelNewPassword","AccountLabelRepeatPassword","OrdersHeadline","PasswordLabelMail","BookmarkTwitter","BookmarkFacebook","BookmarkDelicious","BookmarkDiggit","BlogInfoRating","SlideArticleInfoContent","IndexActionShowPositions","sCartPremiumsHeadline","CartFooterSum","CartFooterShipping","CartFooterTotal","CheckoutFooterActionAddVoucher","CheckoutFooterIdLabelInline","CheckoutFooterActionAdd","CartColumnAvailability","sCartItemFree","CartItemInfoPremium","CartItemInfoBundle","ConfirmErrorAGB","ConfirmHeadlinePersonalInformation","CheckoutFooterLabelAddVoucher","CheckoutFooterLabelAddArticle","ConfirmLabelComment","CheckoutDispatchLinkSend","CheckoutItemPrice","CheckoutItemLaststock","CheckoutPaymentHeadline","FinishHeaderItems","sBonusPriceFree","ShippingHeader","DispatchHeadNotice","CompareActionClose","CompareHeader","BundleHeader","BundleInfoPriceForAll","BundleActionAdd","BundleInfoPriceInstead","BundleInfoPercent","LiveTickerStartPrice","LiveTickerCurrentPrice","LiveTimeDays","LiveTimeHours","LiveTimeMinutes","LiveTimeSeconds","LiveTimeRemainingPieces","LiveTimeRemaining","LiveCategoryPreviousPrice","LiveCategorySavingPercent","LiveCategoryOffersEnds","LiveCategoryCurrentPrice","LiveCountdownStartPrice","LiveCountdownCurrentPrice","LiveCountdownPriceFails","LiveCountdownPriceRising","LiveCountdownMinutes","LiveCountdownRemaining","LiveCountdownRemainingPieces","DetailFrom","DetailDataHeaderBlockprices","DetailBuyValueSelect","DetailBuyLabelQuantity","DetailCommentInfoAverageRate","DetailCommentInfoRating","DetailCommentLabelRating","DetailCommentLabelText","DetailDescriptionSupplier","DetailChooseFirst","DetailFromNew","DetailSimilarHeader","FormsLinkBack","FormsTextContact","IndexMetaShortcutIcon","IndexMetaMsNavButtonColor","IndexRealizedWith","IndexRealizedShopsystem","MenuLeftHeading","IndexSearchFieldValue","ListingBoxInstantDownload","ListingBoxLinkBuy","SimilarBoxLinkDetails","SimilarBoxMore","FilterSupplierHeadline","ListingLinkAllSuppliers","ListingActionsSettingsTitle","ListingActionsSettingsTable","ListingActionsSettingsList","NewsletterDetailLinkNewWindow","NewsletterLabelSelect","sNewsletterLabelMail","NewsletterRegisterLabelSalutation","NewsletterRegisterPleaseChoose","NewsletterRegisterLabelFirstname","NewsletterRegisterLabelLastname","NewsletterRegisterBillingLabelStreet","NewsletterRegisterBillingLabelCity","NoteColumnName","NoteColumnPrice","NoteLinkBuy","NoteLinkDetails","PalpalPendingTitle","PalpalPendingInfo","PalpalPendingLinkHomepage","TagcloudHead","DetailNotifyActionSubmit","RegisterLabelCompany","RegisterBillingLabelStreet","RegisterBillingLabelCity","RegisterBillingLabelCountry","RegisterBillingLabelSelect","RegisterErrorHeadline","RegisterInfoSupplier","RegisterInfoSupplier2","RegisterIndexActionSubmit","RegisterInfoAdvantages","RegisterPersonalHeadline","RegisterLabelSalutation","RegisterLabelFirstname","RegisterLabelLastname","RegisterLabelMailConfirmation","RegisterLabelPassword","RegisterLabelPasswordRepeat","RegisterLabelPhone","RegisterLabelBirthday","RegisterShippingLabelSalutation","RegisterShippingLabelCompany","RegisterShippingLabelDepartment","RegisterShippingLabelFirstname","RegisterShippingLabelLastname","RegisterShippingLabelStreet","RegisterShippingLabelCity","RegisterShippingLabelCountry","RegisterShippingLabelSelect","CheckoutStepBasketNumber","CheckoutStepBasketText","CheckoutStepRegisterNumber","CheckoutStepRegisterText","SearchFilterCategoryHeading","SearchFuzzyHeadlineEmpty","SearchLeftHeadlineCutdown","SearchLeftHeadlineFilter","SearchLeftLinkAllFilters","SearchLeftLinkDefault","SearchLeftHeadlineSupplier","SearchLeftInfoSuppliers","SearchLeftLinkAllSuppliers","SearchLeftHeadlinePrice","SearchLeftLinkAllPrices","SearchTo","SearchWere","SearchArticlesFound","SitemapHeader","TellAFriendLabelMail","TellAFriendLabelComment","TellAFriendLabelCaptcha","DetailBoughtArticlesSlider","DetailViewedArticlesSlider"];
-        $snippetsToDeleteSql = "'".implode("','", $snippetsToDelete)."'";
+        $snippetsToDelete = ['article_slider_numbers', 'article_slider_numbers_support', 'manufacturer_slider_numbers/label', 'manufacturer_slider_numbers/support', 'thumbnail_size', 'thumbnail_size_support', 'LoginActionClose', 'LoginLabelNew', 'LoginActionCreateAccount', 'LoginLabelExisting', 'LoginTextExisting', 'LoginActionNext', 'ListingPaging', 'ListingTextPrevious', 'ListingTextNext', 'AccountLabelCurrentPassword', 'AccountLabelNewPassword', 'AccountLabelRepeatPassword', 'OrdersHeadline', 'PasswordLabelMail', 'BookmarkTwitter', 'BookmarkFacebook', 'BookmarkDelicious', 'BookmarkDiggit', 'BlogInfoRating', 'SlideArticleInfoContent', 'IndexActionShowPositions', 'sCartPremiumsHeadline', 'CartFooterSum', 'CartFooterShipping', 'CartFooterTotal', 'CheckoutFooterActionAddVoucher', 'CheckoutFooterIdLabelInline', 'CheckoutFooterActionAdd', 'CartColumnAvailability', 'sCartItemFree', 'CartItemInfoPremium', 'CartItemInfoBundle', 'ConfirmErrorAGB', 'ConfirmHeadlinePersonalInformation', 'CheckoutFooterLabelAddVoucher', 'CheckoutFooterLabelAddArticle', 'ConfirmLabelComment', 'CheckoutDispatchLinkSend', 'CheckoutItemPrice', 'CheckoutItemLaststock', 'CheckoutPaymentHeadline', 'FinishHeaderItems', 'sBonusPriceFree', 'ShippingHeader', 'DispatchHeadNotice', 'CompareActionClose', 'CompareHeader', 'BundleHeader', 'BundleInfoPriceForAll', 'BundleActionAdd', 'BundleInfoPriceInstead', 'BundleInfoPercent', 'LiveTickerStartPrice', 'LiveTickerCurrentPrice', 'LiveTimeDays', 'LiveTimeHours', 'LiveTimeMinutes', 'LiveTimeSeconds', 'LiveTimeRemainingPieces', 'LiveTimeRemaining', 'LiveCategoryPreviousPrice', 'LiveCategorySavingPercent', 'LiveCategoryOffersEnds', 'LiveCategoryCurrentPrice', 'LiveCountdownStartPrice', 'LiveCountdownCurrentPrice', 'LiveCountdownPriceFails', 'LiveCountdownPriceRising', 'LiveCountdownMinutes', 'LiveCountdownRemaining', 'LiveCountdownRemainingPieces', 'DetailFrom', 'DetailDataHeaderBlockprices', 'DetailBuyValueSelect', 'DetailBuyLabelQuantity', 'DetailCommentInfoAverageRate', 'DetailCommentInfoRating', 'DetailCommentLabelRating', 'DetailCommentLabelText', 'DetailDescriptionSupplier', 'DetailChooseFirst', 'DetailFromNew', 'DetailSimilarHeader', 'FormsLinkBack', 'FormsTextContact', 'IndexMetaShortcutIcon', 'IndexMetaMsNavButtonColor', 'IndexRealizedWith', 'IndexRealizedShopsystem', 'MenuLeftHeading', 'IndexSearchFieldValue', 'ListingBoxInstantDownload', 'ListingBoxLinkBuy', 'SimilarBoxLinkDetails', 'SimilarBoxMore', 'FilterSupplierHeadline', 'ListingLinkAllSuppliers', 'ListingActionsSettingsTitle', 'ListingActionsSettingsTable', 'ListingActionsSettingsList', 'NewsletterDetailLinkNewWindow', 'NewsletterLabelSelect', 'sNewsletterLabelMail', 'NewsletterRegisterLabelSalutation', 'NewsletterRegisterPleaseChoose', 'NewsletterRegisterLabelFirstname', 'NewsletterRegisterLabelLastname', 'NewsletterRegisterBillingLabelStreet', 'NewsletterRegisterBillingLabelCity', 'NoteColumnName', 'NoteColumnPrice', 'NoteLinkBuy', 'NoteLinkDetails', 'PalpalPendingTitle', 'PalpalPendingInfo', 'PalpalPendingLinkHomepage', 'TagcloudHead', 'DetailNotifyActionSubmit', 'RegisterLabelCompany', 'RegisterBillingLabelStreet', 'RegisterBillingLabelCity', 'RegisterBillingLabelCountry', 'RegisterBillingLabelSelect', 'RegisterErrorHeadline', 'RegisterInfoSupplier', 'RegisterInfoSupplier2', 'RegisterIndexActionSubmit', 'RegisterInfoAdvantages', 'RegisterPersonalHeadline', 'RegisterLabelSalutation', 'RegisterLabelFirstname', 'RegisterLabelLastname', 'RegisterLabelMailConfirmation', 'RegisterLabelPassword', 'RegisterLabelPasswordRepeat', 'RegisterLabelPhone', 'RegisterLabelBirthday', 'RegisterShippingLabelSalutation', 'RegisterShippingLabelCompany', 'RegisterShippingLabelDepartment', 'RegisterShippingLabelFirstname', 'RegisterShippingLabelLastname', 'RegisterShippingLabelStreet', 'RegisterShippingLabelCity', 'RegisterShippingLabelCountry', 'RegisterShippingLabelSelect', 'CheckoutStepBasketNumber', 'CheckoutStepBasketText', 'CheckoutStepRegisterNumber', 'CheckoutStepRegisterText', 'SearchFilterCategoryHeading', 'SearchFuzzyHeadlineEmpty', 'SearchLeftHeadlineCutdown', 'SearchLeftHeadlineFilter', 'SearchLeftLinkAllFilters', 'SearchLeftLinkDefault', 'SearchLeftHeadlineSupplier', 'SearchLeftInfoSuppliers', 'SearchLeftLinkAllSuppliers', 'SearchLeftHeadlinePrice', 'SearchLeftLinkAllPrices', 'SearchTo', 'SearchWere', 'SearchArticlesFound', 'SitemapHeader', 'TellAFriendLabelMail', 'TellAFriendLabelComment', 'TellAFriendLabelCaptcha', 'DetailBoughtArticlesSlider', 'DetailViewedArticlesSlider'];
+        $snippetsToDeleteSql = "'" . implode("','", $snippetsToDelete) . "'";
         $sql = <<<SQL
 DELETE snippet
 FROM `s_core_snippets` as snippet
diff --git a/_sql/migrations/702-add-emotion-element-css-class.php b/_sql/migrations/702-add-emotion-element-css-class.php
index b716ed2da1d..3c8b66f16b8 100644
--- a/_sql/migrations/702-add-emotion-element-css-class.php
+++ b/_sql/migrations/702-add-emotion-element-css-class.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration702 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/703-activate-html-code-widget-by-default.php b/_sql/migrations/703-activate-html-code-widget-by-default.php
index 4add011ed59..635b0164d00 100644
--- a/_sql/migrations/703-activate-html-code-widget-by-default.php
+++ b/_sql/migrations/703-activate-html-code-widget-by-default.php
@@ -1,4 +1,27 @@
 <?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration703 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/704-remove-referercheck.php b/_sql/migrations/704-remove-referercheck.php
index 2b8339adabf..91945de67bf 100644
--- a/_sql/migrations/704-remove-referercheck.php
+++ b/_sql/migrations/704-remove-referercheck.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration704 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/705-rename-category-template-column.php b/_sql/migrations/705-rename-category-template-column.php
index f532e3fb67f..4f488127afb 100644
--- a/_sql/migrations/705-rename-category-template-column.php
+++ b/_sql/migrations/705-rename-category-template-column.php
@@ -1,27 +1,30 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
-class Migrations_Migration705 extends Shopware\Components\Migrations\AbstractMigration
+
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration705 extends AbstractMigration
 {
     public function up($modus)
     {
@@ -50,7 +53,7 @@ private function updateCustomTemplates()
             'article_listing_4col.tpl',
         ];
         $templates = $this->connection->query("SELECT vals.id, vals.value FROM `s_core_config_values` as vals INNER JOIN `s_core_config_elements` as elems ON elems.id = vals.element_id WHERE elems.name = 'categorytemplates'")
-            ->fetchAll(\PDO::FETCH_KEY_PAIR);
+            ->fetchAll(PDO::FETCH_KEY_PAIR);
 
         foreach ($templates as $valueId => $serializedValue) {
             $cleanedTemplates = [];
@@ -63,7 +66,7 @@ private function updateCustomTemplates()
 
                 list($file, $name) = explode(':', $template);
 
-                if (in_array($file, $templateBlacklist) || empty($name)) {
+                if (\in_array($file, $templateBlacklist) || empty($name)) {
                     continue;
                 }
 
diff --git a/_sql/migrations/706-remove-debit-table.php b/_sql/migrations/706-remove-debit-table.php
index 8ca836557e4..0b6de3ea7cc 100644
--- a/_sql/migrations/706-remove-debit-table.php
+++ b/_sql/migrations/706-remove-debit-table.php
@@ -1,4 +1,27 @@
 <?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration706 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/707-add-new-emotion-link-target-field.php b/_sql/migrations/707-add-new-emotion-link-target-field.php
index ab32fe36e22..d20de1c0a86 100644
--- a/_sql/migrations/707-add-new-emotion-link-target-field.php
+++ b/_sql/migrations/707-add-new-emotion-link-target-field.php
@@ -1,9 +1,32 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration707 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
      * @param string $modus
+     *
      * @return void
      */
     public function up($modus)
diff --git a/_sql/migrations/708-attribute-administration.php b/_sql/migrations/708-attribute-administration.php
index 55b25769cc8..509e3adc6be 100644
--- a/_sql/migrations/708-attribute-administration.php
+++ b/_sql/migrations/708-attribute-administration.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 use Shopware\Components\Migrations\AbstractMigration;
 
 class Migrations_Migration708 extends AbstractMigration
@@ -7,22 +29,22 @@ class Migrations_Migration708 extends AbstractMigration
     public function up($modus)
     {
         if ($modus == AbstractMigration::MODUS_INSTALL) {
-            $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr1` `attr1` VARCHAR(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-            $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr2` `attr2` VARCHAR(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-            $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr3` `attr3` VARCHAR(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-            $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr4` `attr4` VARCHAR(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-            $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr5` `attr5` VARCHAR(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-            $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr6` `attr6` VARCHAR(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-            $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr7` `attr7` VARCHAR(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-            $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr8` `attr8` VARCHAR(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-            $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr11` `attr11` VARCHAR(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-            $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr12` `attr12` VARCHAR(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-            $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr13` `attr13` VARCHAR(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-            $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr14` `attr14` VARCHAR(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-            $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr15` `attr15` VARCHAR(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-            $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr16` `attr16` VARCHAR(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-            $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr19` `attr19` VARCHAR(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-            $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr20` `attr20` VARCHAR(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
+            $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr1` `attr1` VARCHAR(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+            $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr2` `attr2` VARCHAR(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+            $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr3` `attr3` VARCHAR(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+            $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr4` `attr4` VARCHAR(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+            $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr5` `attr5` VARCHAR(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+            $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr6` `attr6` VARCHAR(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+            $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr7` `attr7` VARCHAR(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+            $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr8` `attr8` VARCHAR(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+            $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr11` `attr11` VARCHAR(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+            $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr12` `attr12` VARCHAR(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+            $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr13` `attr13` VARCHAR(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+            $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr14` `attr14` VARCHAR(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+            $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr15` `attr15` VARCHAR(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+            $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr16` `attr16` VARCHAR(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+            $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr19` `attr19` VARCHAR(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+            $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr20` `attr20` VARCHAR(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
         }
 
         $sql = <<<'SQL'
@@ -65,7 +87,6 @@ public function up($modus)
 SQL;
         $this->addSql($sql);
 
-
         $sql = <<<'SQL'
 CREATE TABLE `s_filter_options_attributes` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -99,11 +120,11 @@ public function up($modus)
         $this->addSql("UPDATE s_core_snippets SET `value` = 'Remove image' WHERE `name` = 'image/list/remove_button' AND localeID = 2 AND dirty = 0;");
 
         $this->addSql("SET @formId = (SELECT id FROM s_core_config_forms WHERE name = 'Attribute' LIMIT 1);");
-        $this->addSql("DELETE FROM s_core_config_form_translations WHERE form_id = @formId;");
-        $this->addSql("DELETE FROM s_core_config_elements WHERE form_id = @formId;");
-        $this->addSql("DELETE FROM s_core_config_forms WHERE id = @formId;");
+        $this->addSql('DELETE FROM s_core_config_form_translations WHERE form_id = @formId;');
+        $this->addSql('DELETE FROM s_core_config_elements WHERE form_id = @formId;');
+        $this->addSql('DELETE FROM s_core_config_forms WHERE id = @formId;');
 
-        $statement = $this->connection->query("SELECT * FROM s_core_engine_elements");
+        $statement = $this->connection->query('SELECT * FROM s_core_engine_elements');
         $attributes = $statement->fetchAll(PDO::FETCH_ASSOC);
         foreach ($attributes as $attribute) {
             $attribute = $this->convertAttribute($attribute);
@@ -112,25 +133,24 @@ public function up($modus)
               INSERT INTO s_attribute_configuration (`table_name`, `column_name`, `column_type`, `position`, `translatable`, `display_in_backend`, `custom`, `help_text`, `support_text`, `label`, `entity`, `plugin_id`)
               VALUES (
                 's_articles_attributes',
-                 ".$this->connection->quote($attribute['name']).",
-                 ".$this->connection->quote($attribute['type']).",
-                 ".$this->connection->quote($attribute['position']).",
-                 ".$this->connection->quote($attribute['translatable']).",
+                 " . $this->connection->quote($attribute['name']) . ',
+                 ' . $this->connection->quote($attribute['type']) . ',
+                 ' . $this->connection->quote($attribute['position']) . ',
+                 ' . $this->connection->quote($attribute['translatable']) . ',
                  1,
                  0,
-                 ".$this->connection->quote($attribute['help']).",
+                 ' . $this->connection->quote($attribute['help']) . ",
                  '',
-                 ".$this->connection->quote($attribute['label']).",
-                 ".$this->connection->quote($attribute['entity']).",
+                 " . $this->connection->quote($attribute['label']) . ',
+                 ' . $this->connection->quote($attribute['entity']) . ',
                  NULL
               );
-            ";
+            ';
             $this->addSql($sql);
         }
     }
 
     /**
-     * @param array $attribute
      * @return array
      */
     private function convertAttribute(array $attribute)
@@ -160,6 +180,7 @@ private function convertAttribute(array $attribute)
                 $attribute['type'] = 'string';
                 break;
         }
+
         return $attribute;
     }
 }
diff --git a/_sql/migrations/709-add-user-addresses.php b/_sql/migrations/709-add-user-addresses.php
index da0192635ce..ebbe6f0f952 100644
--- a/_sql/migrations/709-add-user-addresses.php
+++ b/_sql/migrations/709-add-user-addresses.php
@@ -1,9 +1,32 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration709 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
      * @param string $modus
+     *
      * @return void
      */
     public function up($modus)
diff --git a/_sql/migrations/710-remove-fax-field.php b/_sql/migrations/710-remove-fax-field.php
index 1f2f92e4dd1..60136878fcc 100644
--- a/_sql/migrations/710-remove-fax-field.php
+++ b/_sql/migrations/710-remove-fax-field.php
@@ -1,10 +1,32 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration710 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
-        $this->addSql("ALTER TABLE `s_user_billingaddress` DROP fax;");
-        $this->addSql("ALTER TABLE `s_order_billingaddress` DROP fax;");
+        $this->addSql('ALTER TABLE `s_user_billingaddress` DROP fax;');
+        $this->addSql('ALTER TABLE `s_order_billingaddress` DROP fax;');
     }
 }
diff --git a/_sql/migrations/711-create-address-migrate-table.php b/_sql/migrations/711-create-address-migrate-table.php
index 945c1265f3d..3e459086587 100644
--- a/_sql/migrations/711-create-address-migrate-table.php
+++ b/_sql/migrations/711-create-address-migrate-table.php
@@ -1,9 +1,32 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration711 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
      * @param string $modus
+     *
      * @return void
      */
     public function up($modus)
diff --git a/_sql/migrations/712-migrate-user-billing.php b/_sql/migrations/712-migrate-user-billing.php
index b9e95335497..2e4f4a7d4ec 100644
--- a/_sql/migrations/712-migrate-user-billing.php
+++ b/_sql/migrations/712-migrate-user-billing.php
@@ -1,9 +1,32 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration712 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
      * @param string $modus
+     *
      * @return void
      */
     public function up($modus)
diff --git a/_sql/migrations/713-migrate-user-shipping.php b/_sql/migrations/713-migrate-user-shipping.php
index fc707ecd336..cd0de0767e9 100644
--- a/_sql/migrations/713-migrate-user-shipping.php
+++ b/_sql/migrations/713-migrate-user-shipping.php
@@ -1,9 +1,32 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration713 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
      * @param string $modus
+     *
      * @return void
      */
     public function up($modus)
diff --git a/_sql/migrations/714-migrate-order-billing.php b/_sql/migrations/714-migrate-order-billing.php
index dc470d53b3d..d25e6fc9368 100644
--- a/_sql/migrations/714-migrate-order-billing.php
+++ b/_sql/migrations/714-migrate-order-billing.php
@@ -1,9 +1,32 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration714 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
      * @param string $modus
+     *
      * @return void
      */
     public function up($modus)
diff --git a/_sql/migrations/715-migrate-order-shipping.php b/_sql/migrations/715-migrate-order-shipping.php
index 0d2a24914d1..65c33835995 100644
--- a/_sql/migrations/715-migrate-order-shipping.php
+++ b/_sql/migrations/715-migrate-order-shipping.php
@@ -1,9 +1,32 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration715 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
      * @param string $modus
+     *
      * @return void
      */
     public function up($modus)
diff --git a/_sql/migrations/716-copy-addresses-to-addressbook.php b/_sql/migrations/716-copy-addresses-to-addressbook.php
index e0fd97353fb..becda262a59 100644
--- a/_sql/migrations/716-copy-addresses-to-addressbook.php
+++ b/_sql/migrations/716-copy-addresses-to-addressbook.php
@@ -1,9 +1,32 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration716 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
      * @param string $modus
+     *
      * @return void
      */
     public function up($modus)
diff --git a/_sql/migrations/717-set-default-billingaddresses.php b/_sql/migrations/717-set-default-billingaddresses.php
index 3a72516c936..66632e05985 100644
--- a/_sql/migrations/717-set-default-billingaddresses.php
+++ b/_sql/migrations/717-set-default-billingaddresses.php
@@ -1,9 +1,32 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration717 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
      * @param string $modus
+     *
      * @return void
      */
     public function up($modus)
diff --git a/_sql/migrations/718-set-default-shippingaddresses.php b/_sql/migrations/718-set-default-shippingaddresses.php
index ae23b1766e2..6f191804e66 100644
--- a/_sql/migrations/718-set-default-shippingaddresses.php
+++ b/_sql/migrations/718-set-default-shippingaddresses.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration718 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/719-create-address-attribute-tables.php b/_sql/migrations/719-create-address-attribute-tables.php
index cc16788be97..eb98d56961e 100644
--- a/_sql/migrations/719-create-address-attribute-tables.php
+++ b/_sql/migrations/719-create-address-attribute-tables.php
@@ -1,9 +1,32 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration719 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
      * @param string $modus
+     *
      * @return void
      */
     public function up($modus)
@@ -14,7 +37,7 @@ public function up($modus)
             's_order_billingaddress_attributes',
             's_order_shippingaddress_attributes',
             's_user_shippingaddress_attributes',
-            's_user_billingaddress_attributes'
+            's_user_billingaddress_attributes',
         ];
 
         foreach ($tables as $table) {
@@ -38,6 +61,7 @@ private function createAddressAttributeTable()
 
     /**
      * @param string $table
+     *
      * @throws Exception
      */
     private function applyAttributeSchema($table)
diff --git a/_sql/migrations/720-migrate-order-billing-attributes.php b/_sql/migrations/720-migrate-order-billing-attributes.php
index e43fe55b37a..f79c0c58fa4 100644
--- a/_sql/migrations/720-migrate-order-billing-attributes.php
+++ b/_sql/migrations/720-migrate-order-billing-attributes.php
@@ -1,9 +1,32 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration720 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
      * @param string $modus
+     *
      * @return void
      */
     public function up($modus)
diff --git a/_sql/migrations/721-migrate-order-shipping-attributes.php b/_sql/migrations/721-migrate-order-shipping-attributes.php
index 1dd24db28ee..180123f2c23 100644
--- a/_sql/migrations/721-migrate-order-shipping-attributes.php
+++ b/_sql/migrations/721-migrate-order-shipping-attributes.php
@@ -1,9 +1,32 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration721 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
      * @param string $modus
+     *
      * @return void
      */
     public function up($modus)
diff --git a/_sql/migrations/722-migrate-user-shipping-attributes.php b/_sql/migrations/722-migrate-user-shipping-attributes.php
index b20f431437f..f79e893352a 100644
--- a/_sql/migrations/722-migrate-user-shipping-attributes.php
+++ b/_sql/migrations/722-migrate-user-shipping-attributes.php
@@ -1,9 +1,32 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration722 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
      * @param string $modus
+     *
      * @return void
      */
     public function up($modus)
diff --git a/_sql/migrations/723-migrate-user-billing-attributes.php b/_sql/migrations/723-migrate-user-billing-attributes.php
index 5f72ea961c5..ef2bbe5aee2 100644
--- a/_sql/migrations/723-migrate-user-billing-attributes.php
+++ b/_sql/migrations/723-migrate-user-billing-attributes.php
@@ -1,9 +1,32 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration723 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
      * @param string $modus
+     *
      * @return void
      */
     public function up($modus)
diff --git a/_sql/migrations/724-cleanup-address-migration.php b/_sql/migrations/724-cleanup-address-migration.php
index 8c6e6ae8a97..234e0bfe3a5 100644
--- a/_sql/migrations/724-cleanup-address-migration.php
+++ b/_sql/migrations/724-cleanup-address-migration.php
@@ -1,20 +1,43 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration724 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
      * @param string $modus
+     *
      * @return void
      */
     public function up($modus)
     {
-        $this->addSql("ALTER TABLE `s_user_addresses` DROP `original_type`");
-        $this->addSql("ALTER TABLE `s_user_addresses` DROP `original_id`");
+        $this->addSql('ALTER TABLE `s_user_addresses` DROP `original_type`');
+        $this->addSql('ALTER TABLE `s_user_addresses` DROP `original_id`');
         if ($modus == self::MODUS_INSTALL) {
             return;
         }
 
-        $this->addSql("DROP TABLE IF EXISTS `s_user_addresses_migration`");
-        $this->addSql("ALTER TABLE `s_user_addresses` DROP `migration_id`");
+        $this->addSql('DROP TABLE IF EXISTS `s_user_addresses_migration`');
+        $this->addSql('ALTER TABLE `s_user_addresses` DROP `migration_id`');
     }
 }
diff --git a/_sql/migrations/725-remove-license-plugin-from-initial-db.php b/_sql/migrations/725-remove-license-plugin-from-initial-db.php
index 253d93600c9..7173be1f66c 100644
--- a/_sql/migrations/725-remove-license-plugin-from-initial-db.php
+++ b/_sql/migrations/725-remove-license-plugin-from-initial-db.php
@@ -1,9 +1,32 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration725 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
      * @param string $modus
+     *
      * @return void
      */
     public function up($modus)
diff --git a/_sql/migrations/726-remove-shipping-billing.php b/_sql/migrations/726-remove-shipping-billing.php
index f6d6a220fd8..0af90b0f88a 100644
--- a/_sql/migrations/726-remove-shipping-billing.php
+++ b/_sql/migrations/726-remove-shipping-billing.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration726 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
@@ -20,11 +42,11 @@ public function up($modus)
             'ConfirmInfoPaymentMethod',
             'ConfirmLinkChangePayment',
             'ConfirmSalutationMr',
-            'ConfirmSalutationMs'
+            'ConfirmSalutationMs',
         ];
 
-        $moveSnippets = join('","', $moveSnippets);
-        $this->addSql('UPDATE s_core_snippets SET `namespace` = "frontend/checkout/confirm" WHERE `namespace` = "frontend/checkout/confirm_left" AND `name` IN ("'.$moveSnippets.'")');
+        $moveSnippets = implode('","', $moveSnippets);
+        $this->addSql('UPDATE s_core_snippets SET `namespace` = "frontend/checkout/confirm" WHERE `namespace` = "frontend/checkout/confirm_left" AND `name` IN ("' . $moveSnippets . '")');
 
         // delete orphan snippets
         $this->addSql('DELETE FROM `s_core_snippets` WHERE `namespace` = "frontend/account/select_address"');
diff --git a/_sql/migrations/727-core-license-config.php b/_sql/migrations/727-core-license-config.php
index a66348d656b..bd329bc7197 100644
--- a/_sql/migrations/727-core-license-config.php
+++ b/_sql/migrations/727-core-license-config.php
@@ -1,5 +1,26 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
 
 class Migrations_Migration727 extends Shopware\Components\Migrations\AbstractMigration
 {
diff --git a/_sql/migrations/728-create-s-user-columns.php b/_sql/migrations/728-create-s-user-columns.php
index 361d10b3a82..d6451122a85 100644
--- a/_sql/migrations/728-create-s-user-columns.php
+++ b/_sql/migrations/728-create-s-user-columns.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration728 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/729-migrate-additional-userdata.php b/_sql/migrations/729-migrate-additional-userdata.php
index e58ef7a63d2..9c54d04184e 100644
--- a/_sql/migrations/729-migrate-additional-userdata.php
+++ b/_sql/migrations/729-migrate-additional-userdata.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration729 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/730-drop-birthday-column.php b/_sql/migrations/730-drop-birthday-column.php
index 7c62cd46ae4..053830829be 100644
--- a/_sql/migrations/730-drop-birthday-column.php
+++ b/_sql/migrations/730-drop-birthday-column.php
@@ -1,10 +1,32 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration730 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
         // finally remove the old field
-        $this->addSql("ALTER TABLE `s_user_billingaddress` DROP `birthday`");
+        $this->addSql('ALTER TABLE `s_user_billingaddress` DROP `birthday`');
     }
 }
diff --git a/_sql/migrations/731-remove-emotion-grids.php b/_sql/migrations/731-remove-emotion-grids.php
index 886bee40d20..b01ae5cc1c5 100644
--- a/_sql/migrations/731-remove-emotion-grids.php
+++ b/_sql/migrations/731-remove-emotion-grids.php
@@ -1,14 +1,37 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration731 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
      * @param string $modus
+     *
      * @return void
      */
     public function up($modus)
     {
-        $this->addSql("ALTER TABLE `s_emotion` ADD `cell_spacing` INT NOT NULL AFTER `cols`");
+        $this->addSql('ALTER TABLE `s_emotion` ADD `cell_spacing` INT NOT NULL AFTER `cols`');
 
         $sql = <<<'EOD'
 UPDATE `s_emotion` AS e
@@ -23,8 +46,8 @@ public function up($modus)
 
         $this->addSql($sql);
 
-        $this->addSql("ALTER TABLE `s_emotion` DROP `grid_id`");
+        $this->addSql('ALTER TABLE `s_emotion` DROP `grid_id`');
 
-        $this->addSql("DROP TABLE IF EXISTS s_emotion_grid");
+        $this->addSql('DROP TABLE IF EXISTS s_emotion_grid');
     }
 }
diff --git a/_sql/migrations/732-remove-landingpage-teaser.php b/_sql/migrations/732-remove-landingpage-teaser.php
index 62fc9ca85f3..fbd9331c253 100644
--- a/_sql/migrations/732-remove-landingpage-teaser.php
+++ b/_sql/migrations/732-remove-landingpage-teaser.php
@@ -1,13 +1,36 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration732 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
      * @param string $modus
+     *
      * @return void
      */
     public function up($modus)
     {
-        $this->addSql("ALTER TABLE `s_emotion` DROP `landingpage_block`, DROP `landingpage_teaser`");
+        $this->addSql('ALTER TABLE `s_emotion` DROP `landingpage_block`, DROP `landingpage_teaser`');
     }
 }
diff --git a/_sql/migrations/733-add-translatable-field-with-data.php b/_sql/migrations/733-add-translatable-field-with-data.php
index d3cc658046f..701f98bd2ac 100644
--- a/_sql/migrations/733-add-translatable-field-with-data.php
+++ b/_sql/migrations/733-add-translatable-field-with-data.php
@@ -1,9 +1,32 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration733 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
      * @param string $modus
+     *
      * @return void
      */
     public function up($modus)
@@ -22,7 +45,7 @@ public function up($modus)
             ['name' => 'video_id',                  'componentID' => 8],
         ];
 
-        $sql = "ALTER TABLE `s_library_component_field` ADD translatable INT(1) NOT NULL DEFAULT 0 AFTER `allow_blank`";
+        $sql = 'ALTER TABLE `s_library_component_field` ADD translatable INT(1) NOT NULL DEFAULT 0 AFTER `allow_blank`';
         $statement = $this->connection->prepare($sql);
         $statement->execute();
 
diff --git a/_sql/migrations/734-new-emotion-shop-association.php b/_sql/migrations/734-new-emotion-shop-association.php
index bcd2ceb1c1f..2228bbf68cd 100644
--- a/_sql/migrations/734-new-emotion-shop-association.php
+++ b/_sql/migrations/734-new-emotion-shop-association.php
@@ -1,9 +1,32 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration734 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
      * @param string $modus
+     *
      * @return void
      */
     public function up($modus)
diff --git a/_sql/migrations/735-migrate-old-emotion-relation.php b/_sql/migrations/735-migrate-old-emotion-relation.php
index 4b520483590..aedc02ad62a 100644
--- a/_sql/migrations/735-migrate-old-emotion-relation.php
+++ b/_sql/migrations/735-migrate-old-emotion-relation.php
@@ -1,14 +1,37 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration735 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
      * @param string $modus
+     *
      * @return void
      */
     public function up($modus)
     {
-        $statement = $this->connection->query("SELECT id, category_id FROM s_core_shops");
+        $statement = $this->connection->query('SELECT id, category_id FROM s_core_shops');
         $shopCategories = $statement->fetchAll(PDO::FETCH_KEY_PAIR);
 
         $sql = <<<EOD
@@ -28,7 +51,7 @@ public function up($modus)
         $statement = $this->connection->prepare($sql);
 
         foreach ($shopCategories as $shopId => $category) {
-            $path = '%|'.$category.'|%';
+            $path = '%|' . $category . '|%';
             $statement->execute([':path' => $path, ':categoryId' => $category, ':shopId' => $shopId]);
         }
     }
diff --git a/_sql/migrations/736-add-article-widget-categorie-selection.php b/_sql/migrations/736-add-article-widget-categorie-selection.php
index b71ce5f7e4b..63a06466663 100644
--- a/_sql/migrations/736-add-article-widget-categorie-selection.php
+++ b/_sql/migrations/736-add-article-widget-categorie-selection.php
@@ -1,9 +1,32 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration736 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
      * @param string $modus
+     *
      * @return void
      */
     public function up($modus)
diff --git a/_sql/migrations/737-add-emotion-element-viewport.php b/_sql/migrations/737-add-emotion-element-viewport.php
index eb1ca7ac3b5..291e5c4d604 100644
--- a/_sql/migrations/737-add-emotion-element-viewport.php
+++ b/_sql/migrations/737-add-emotion-element-viewport.php
@@ -1,9 +1,32 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration737 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
      * @param string $modus
+     *
      * @return void
      */
     public function up($modus)
diff --git a/_sql/migrations/738-fixed-iframe-widget-xtype.php b/_sql/migrations/738-fixed-iframe-widget-xtype.php
index 66a67754360..57c5106fde9 100644
--- a/_sql/migrations/738-fixed-iframe-widget-xtype.php
+++ b/_sql/migrations/738-fixed-iframe-widget-xtype.php
@@ -1,9 +1,32 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration738 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
      * @param string $modus
+     *
      * @return void
      */
     public function up($modus)
diff --git a/_sql/migrations/739-migrate-emotion-widget-settings.php b/_sql/migrations/739-migrate-emotion-widget-settings.php
index b46f267403a..918cac9e111 100644
--- a/_sql/migrations/739-migrate-emotion-widget-settings.php
+++ b/_sql/migrations/739-migrate-emotion-widget-settings.php
@@ -1,14 +1,37 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration739 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
      * @param string $modus
+     *
      * @return void
      */
     public function up($modus)
     {
-        $viewports = [ 'xs', 's', 'm', 'l', 'xl' ];
+        $viewports = ['xs', 's', 'm', 'l', 'xl'];
 
         $sql = <<<EOD
 INSERT IGNORE INTO s_emotion_element_viewports (elementID, emotionID, alias, start_row, start_col, end_row, end_col, visible)
diff --git a/_sql/migrations/740-new-border-setting-for-emotion-widgets.php b/_sql/migrations/740-new-border-setting-for-emotion-widgets.php
index c3b721a749a..1b3f2a9d5a4 100644
--- a/_sql/migrations/740-new-border-setting-for-emotion-widgets.php
+++ b/_sql/migrations/740-new-border-setting-for-emotion-widgets.php
@@ -1,9 +1,32 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration740 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
      * @param string $modus
+     *
      * @return void
      */
     public function up($modus)
@@ -11,7 +34,7 @@ public function up($modus)
         $components = [
             'emotion-components-article',
             'emotion-components-article-slider',
-            'emotion-components-manufacturer-slider'
+            'emotion-components-manufacturer-slider',
         ];
 
         $sql = <<<'EOD'
diff --git a/_sql/migrations/741-migrate-salutation-mails.php b/_sql/migrations/741-migrate-salutation-mails.php
index 43e505f33b2..ae4f5caed69 100644
--- a/_sql/migrations/741-migrate-salutation-mails.php
+++ b/_sql/migrations/741-migrate-salutation-mails.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration741 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
@@ -23,12 +45,12 @@ public function up($modus)
 
         $statement->execute([
             ':newName' => 'mr',
-            ':name' => 'AccountSalutationMr'
+            ':name' => 'AccountSalutationMr',
         ]);
 
         $statement->execute([
             ':newName' => 'ms',
-            ':name' => 'AccountSalutationMs'
+            ':name' => 'AccountSalutationMs',
         ]);
 
         $sql = <<<'EOD'
@@ -39,15 +61,12 @@ public function up($modus)
 EOD;
         $this->addSql($sql);
 
-
         $sql = <<<'EOD'
         SET @elementId = (SELECT id FROM s_core_config_elements WHERE name = 'shopsalutations' LIMIT 1);
         INSERT INTO `s_core_config_element_translations` (`element_id`, `locale_id`, `label`, `description`) VALUES (@elementId, 2, 'Available salutations', 'Allows to configure the available shop salutations in frontend registration and account. Inserted keys are generated automatically as snippet inside the frontend/salutation namespace.');
 EOD;
         $this->addSql($sql);
 
-
-
         $sql = <<<'EOD'
         SET @formId = (SELECT id FROM s_core_config_forms WHERE name = 'Frontend33' LIMIT 1);
 
@@ -56,7 +75,6 @@ public function up($modus)
 EOD;
         $this->addSql($sql);
 
-
         $sql = <<<'EOD'
 DELETE FROM `s_core_config_mails` WHERE dirty = 0 AND `name` IN (
     'sORDERSTATEMAIL11',
diff --git a/_sql/migrations/742-add-title-user-billing.php b/_sql/migrations/742-add-title-user-billing.php
index 351fd8cbbcb..1e4d13c749d 100644
--- a/_sql/migrations/742-add-title-user-billing.php
+++ b/_sql/migrations/742-add-title-user-billing.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration742 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/743-add-title-order-billing.php b/_sql/migrations/743-add-title-order-billing.php
index 0b00a747ddc..5bacb64f4e9 100644
--- a/_sql/migrations/743-add-title-order-billing.php
+++ b/_sql/migrations/743-add-title-order-billing.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration743 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/744-add-title-order-shipping.php b/_sql/migrations/744-add-title-order-shipping.php
index 9186cb30dcb..07d80624f3c 100644
--- a/_sql/migrations/744-add-title-order-shipping.php
+++ b/_sql/migrations/744-add-title-order-shipping.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration744 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/745-add-title-user-shipping.php b/_sql/migrations/745-add-title-user-shipping.php
index 7611dbbda1a..8a08c99f406 100644
--- a/_sql/migrations/745-add-title-user-shipping.php
+++ b/_sql/migrations/745-add-title-user-shipping.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration745 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/746-migrate-shipping.php b/_sql/migrations/746-migrate-shipping.php
index 7463703e80b..2f76de3be8c 100644
--- a/_sql/migrations/746-migrate-shipping.php
+++ b/_sql/migrations/746-migrate-shipping.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration746 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
@@ -9,7 +31,7 @@ public function up($modus)
 	(`userID`, `company`, `department`, `salutation`, `firstname`, `lastname`, `street`, `zipcode`, `city`, `countryID`, `stateID`, `additional_address_line1`, `additional_address_line2`, `title`)
 SELECT
 	 addresses.`user_id` as userID, addresses.`company`, addresses.`department`, addresses.`salutation`, addresses.`firstname`, addresses.`lastname`, addresses.`street`, addresses.`zipcode`, addresses.`city`, addresses.`country_id` as countryID, addresses.`state_id` as stateID, addresses.`additional_address_line1`, addresses.`additional_address_line2`, addresses.`title`
-FROM 
+FROM
     s_user_addresses addresses
 INNER JOIN s_user user ON user.default_shipping_address_id = addresses.id
 SQL;
diff --git a/_sql/migrations/747-ekw-mode-migration.php b/_sql/migrations/747-ekw-mode-migration.php
index 4702f7053ee..002e0eb9299 100644
--- a/_sql/migrations/747-ekw-mode-migration.php
+++ b/_sql/migrations/747-ekw-mode-migration.php
@@ -1,21 +1,44 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration747 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
      * @param string $modus
+     *
      * @return void
      */
     public function up($modus)
     {
-        $statement = $this->connection->query("SELECT * FROM s_emotion_attributes LIMIT 1");
+        $statement = $this->connection->query('SELECT * FROM s_emotion_attributes LIMIT 1');
         $attributes = $statement->fetch(PDO::FETCH_ASSOC);
 
         if (empty($attributes)) {
             return;
         }
 
-        if (!array_key_exists('swag_mode', $attributes)) {
+        if (!\array_key_exists('swag_mode', $attributes)) {
             return;
         }
 
diff --git a/_sql/migrations/748-remove-unused-fields.php b/_sql/migrations/748-remove-unused-fields.php
index b9daf8745c0..ec97d9808b7 100644
--- a/_sql/migrations/748-remove-unused-fields.php
+++ b/_sql/migrations/748-remove-unused-fields.php
@@ -1,9 +1,32 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration748 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
      * @param string $modus
+     *
      * @return void
      */
     public function up($modus)
diff --git a/_sql/migrations/749-make-ustid-nullable.php b/_sql/migrations/749-make-ustid-nullable.php
index 0764d98fc80..35de7752155 100644
--- a/_sql/migrations/749-make-ustid-nullable.php
+++ b/_sql/migrations/749-make-ustid-nullable.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration749 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/750-migrate-article-details-base-price.php b/_sql/migrations/750-migrate-article-details-base-price.php
index 50194efb219..2141fece742 100644
--- a/_sql/migrations/750-migrate-article-details-base-price.php
+++ b/_sql/migrations/750-migrate-article-details-base-price.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration750 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/751-drop-unused-menu-fields.php b/_sql/migrations/751-drop-unused-menu-fields.php
index 307626faaf4..72dbc5000fe 100644
--- a/_sql/migrations/751-drop-unused-menu-fields.php
+++ b/_sql/migrations/751-drop-unused-menu-fields.php
@@ -1,8 +1,32 @@
 <?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration751 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
      * @param string $modus
+     *
      * @return void
      */
     public function up($modus)
diff --git a/_sql/migrations/752-delete-payment-plugin.php b/_sql/migrations/752-delete-payment-plugin.php
index 951b73f4354..d326db338c8 100644
--- a/_sql/migrations/752-delete-payment-plugin.php
+++ b/_sql/migrations/752-delete-payment-plugin.php
@@ -1,8 +1,32 @@
 <?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration752 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
      * @param string $modus
+     *
      * @return void
      */
     public function up($modus)
diff --git a/_sql/migrations/753-add-s-user-customer-number.php b/_sql/migrations/753-add-s-user-customer-number.php
index 2b533085a99..7e61f7b6c0f 100644
--- a/_sql/migrations/753-add-s-user-customer-number.php
+++ b/_sql/migrations/753-add-s-user-customer-number.php
@@ -1,9 +1,31 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration753 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
-        $this->addSql("ALTER TABLE `s_user` ADD `customernumber` VARCHAR(30) NULL DEFAULT NULL;");
+        $this->addSql('ALTER TABLE `s_user` ADD `customernumber` VARCHAR(30) NULL DEFAULT NULL;');
     }
 }
diff --git a/_sql/migrations/754-update-order-billing-customer-number.php b/_sql/migrations/754-update-order-billing-customer-number.php
index d265595216b..4c919e13a16 100644
--- a/_sql/migrations/754-update-order-billing-customer-number.php
+++ b/_sql/migrations/754-update-order-billing-customer-number.php
@@ -1,9 +1,31 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration754 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
-        $this->addSql("ALTER TABLE `s_order_billingaddress` CHANGE `customernumber` `customernumber` VARCHAR(30) NULL DEFAULT NULL;");
+        $this->addSql('ALTER TABLE `s_order_billingaddress` CHANGE `customernumber` `customernumber` VARCHAR(30) NULL DEFAULT NULL;');
     }
 }
diff --git a/_sql/migrations/755-migrate-customer-number.php b/_sql/migrations/755-migrate-customer-number.php
index 5affe2bbaad..17510f0157d 100644
--- a/_sql/migrations/755-migrate-customer-number.php
+++ b/_sql/migrations/755-migrate-customer-number.php
@@ -1,13 +1,35 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration755 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
-        $this->addSql("
+        $this->addSql('
 UPDATE s_user user, s_user_billingaddress billing
 SET user.customernumber = billing.customernumber
 WHERE user.id = billing.userID;
-        ");
+        ');
     }
 }
diff --git a/_sql/migrations/756-drop-customer-number.php b/_sql/migrations/756-drop-customer-number.php
index 6cfc47ee289..8a228dcc5e5 100644
--- a/_sql/migrations/756-drop-customer-number.php
+++ b/_sql/migrations/756-drop-customer-number.php
@@ -1,9 +1,31 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration756 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
-        $this->addSql("ALTER TABLE `s_user_billingaddress` DROP `customernumber`;");
+        $this->addSql('ALTER TABLE `s_user_billingaddress` DROP `customernumber`;');
     }
 }
diff --git a/_sql/migrations/757-add-array-store-field.php b/_sql/migrations/757-add-array-store-field.php
index c514ffc03ca..82852e957dc 100644
--- a/_sql/migrations/757-add-array-store-field.php
+++ b/_sql/migrations/757-add-array-store-field.php
@@ -1,9 +1,31 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration757 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
-        $this->addSql("ALTER TABLE `s_attribute_configuration` ADD `array_store` MEDIUMTEXT NULL DEFAULT NULL AFTER `plugin_id`;");
+        $this->addSql('ALTER TABLE `s_attribute_configuration` ADD `array_store` MEDIUMTEXT NULL DEFAULT NULL AFTER `plugin_id`;');
     }
 }
diff --git a/_sql/migrations/758-remove-attributes-read-acl.php b/_sql/migrations/758-remove-attributes-read-acl.php
index 7eab569ba2e..460ec77ca65 100644
--- a/_sql/migrations/758-remove-attributes-read-acl.php
+++ b/_sql/migrations/758-remove-attributes-read-acl.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration758 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/759-remove-noviewselect.php b/_sql/migrations/759-remove-noviewselect.php
index f457bd431c1..770e959d343 100644
--- a/_sql/migrations/759-remove-noviewselect.php
+++ b/_sql/migrations/759-remove-noviewselect.php
@@ -1,9 +1,31 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration759 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
-        $this->addSql("ALTER TABLE s_categories DROP noviewselect");
+        $this->addSql('ALTER TABLE s_categories DROP noviewselect');
     }
 }
diff --git a/_sql/migrations/760-change-plugin-unique-key.php b/_sql/migrations/760-change-plugin-unique-key.php
index 0be5f98e0a4..618e45b5fb8 100644
--- a/_sql/migrations/760-change-plugin-unique-key.php
+++ b/_sql/migrations/760-change-plugin-unique-key.php
@@ -1,9 +1,31 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration760 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
-        $this->addSql("ALTER TABLE `s_core_plugins` ADD UNIQUE (`name`), DROP INDEX `namespace`;");
+        $this->addSql('ALTER TABLE `s_core_plugins` ADD UNIQUE (`name`), DROP INDEX `namespace`;');
     }
 }
diff --git a/_sql/migrations/761-change-performance-menu.php b/_sql/migrations/761-change-performance-menu.php
index c33e0d94ff4..0d1ceef5e68 100644
--- a/_sql/migrations/761-change-performance-menu.php
+++ b/_sql/migrations/761-change-performance-menu.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration761 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
@@ -10,7 +32,7 @@ public function up($modus)
 
         $this->addSql($sql);
         $sql = <<<'EOD'
-INSERT INTO `s_core_menu` (`id`, `parent`, `name`, `onclick`, `class`, `position`, `active`, `pluginID`, `controller`, `shortcut`, `action`) VALUES 
+INSERT INTO `s_core_menu` (`id`, `parent`, `name`, `onclick`, `class`, `position`, `active`, `pluginID`, `controller`, `shortcut`, `action`) VALUES
 (NULL, @parent, 'Performance', NULL, 'sprite-bin-full settings--performance', '2', '1', NULL, 'Performance', NULL, 'Index');
 EOD;
         $this->addSql($sql);
diff --git a/_sql/migrations/762-increase-img-character-size.php b/_sql/migrations/762-increase-img-character-size.php
index 3f75381afcd..12f23babd77 100644
--- a/_sql/migrations/762-increase-img-character-size.php
+++ b/_sql/migrations/762-increase-img-character-size.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration762 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/763-add-attributes-read-acl.php b/_sql/migrations/763-add-attributes-read-acl.php
index ab0c1c6d8af..3ec69bbf704 100644
--- a/_sql/migrations/763-add-attributes-read-acl.php
+++ b/_sql/migrations/763-add-attributes-read-acl.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration763 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/764-fixing-ordernumber-schema-addon-premiums.php b/_sql/migrations/764-fixing-ordernumber-schema-addon-premiums.php
index 8ea2d3d4112..b3cad4e2d5c 100644
--- a/_sql/migrations/764-fixing-ordernumber-schema-addon-premiums.php
+++ b/_sql/migrations/764-fixing-ordernumber-schema-addon-premiums.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration764 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/765-fixing-ordernumber-schema-article-configurator-templates.php b/_sql/migrations/765-fixing-ordernumber-schema-article-configurator-templates.php
index b20620a0ee7..5f2f9417f0a 100644
--- a/_sql/migrations/765-fixing-ordernumber-schema-article-configurator-templates.php
+++ b/_sql/migrations/765-fixing-ordernumber-schema-article-configurator-templates.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration765 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/766-fixing-ordernumber-schema-article-details.php b/_sql/migrations/766-fixing-ordernumber-schema-article-details.php
index 62c45b10842..e90b8182453 100644
--- a/_sql/migrations/766-fixing-ordernumber-schema-article-details.php
+++ b/_sql/migrations/766-fixing-ordernumber-schema-article-details.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration766 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/767-fixing-ordernumber-schema-campaigns-articles.php b/_sql/migrations/767-fixing-ordernumber-schema-campaigns-articles.php
index 84681e1f31c..fbbf37b572b 100644
--- a/_sql/migrations/767-fixing-ordernumber-schema-campaigns-articles.php
+++ b/_sql/migrations/767-fixing-ordernumber-schema-campaigns-articles.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration767 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/768-fixing-ordernumber-schema-order.php b/_sql/migrations/768-fixing-ordernumber-schema-order.php
index 8c82df108c7..2b0d123ad81 100644
--- a/_sql/migrations/768-fixing-ordernumber-schema-order.php
+++ b/_sql/migrations/768-fixing-ordernumber-schema-order.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration768 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/769-fixing-ordernumber-schema-order-basket.php b/_sql/migrations/769-fixing-ordernumber-schema-order-basket.php
index dc3968fd0a8..a002f5b7088 100644
--- a/_sql/migrations/769-fixing-ordernumber-schema-order-basket.php
+++ b/_sql/migrations/769-fixing-ordernumber-schema-order-basket.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration769 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/770-fixing-ordernumber-schema-order-details.php b/_sql/migrations/770-fixing-ordernumber-schema-order-details.php
index 0128689e9c3..0b25c1220b1 100644
--- a/_sql/migrations/770-fixing-ordernumber-schema-order-details.php
+++ b/_sql/migrations/770-fixing-ordernumber-schema-order-details.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration770 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/771-fixing-ordernumber-schema-order-notes.php b/_sql/migrations/771-fixing-ordernumber-schema-order-notes.php
index 4ff0374d591..864c56c61a8 100644
--- a/_sql/migrations/771-fixing-ordernumber-schema-order-notes.php
+++ b/_sql/migrations/771-fixing-ordernumber-schema-order-notes.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration771 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/772-allow-label-nullable.php b/_sql/migrations/772-allow-label-nullable.php
index 1d3a6a15230..63e10223df3 100644
--- a/_sql/migrations/772-allow-label-nullable.php
+++ b/_sql/migrations/772-allow-label-nullable.php
@@ -1,10 +1,32 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration772 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
-        $this->addSql("ALTER TABLE `s_attribute_configuration` CHANGE `label` `label` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_attribute_configuration` DROP `plugin_id`;");
+        $this->addSql('ALTER TABLE `s_attribute_configuration` CHANGE `label` `label` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_attribute_configuration` DROP `plugin_id`;');
     }
 }
diff --git a/_sql/migrations/773-add-library-component-fields.php b/_sql/migrations/773-add-library-component-fields.php
index ca7818e275c..d7fdf233a21 100644
--- a/_sql/migrations/773-add-library-component-fields.php
+++ b/_sql/migrations/773-add-library-component-fields.php
@@ -1,17 +1,40 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration773 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
      * @param string $modus
+     *
      * @return void
      */
     public function up($modus)
     {
         $this->addSql('SET @componentId = (SELECT `id` FROM `s_library_component` WHERE `name` = "Youtube-Video")');
-        $this->addSql("SET @maxNumberPosition = (SELECT MAX(position) FROM `s_library_component_field` WHERE `componentID`=@componentId) + 1;");
+        $this->addSql('SET @maxNumberPosition = (SELECT MAX(position) FROM `s_library_component_field` WHERE `componentID`=@componentId) + 1;');
         $sql = <<<'EOD'
-INSERT IGNORE INTO `s_library_component_field` (`id`, `componentID`, `name`, `x_type`, `value_type`, `field_label`, `support_text`, `help_title`, `help_text`, `store`, `display_field`, `value_field`, `default_value`, `allow_blank`, `translatable`, `position`) 
+INSERT IGNORE INTO `s_library_component_field` (`id`, `componentID`, `name`, `x_type`, `value_type`, `field_label`, `support_text`, `help_title`, `help_text`, `store`, `display_field`, `value_field`, `default_value`, `allow_blank`, `translatable`, `position`)
 VALUES
 (null, @componentId, 'video_autoplay', 'checkbox', '', 'Video automatisch starten', '', '', '', '', '', '', 0, 0, 0, @maxNumberPosition),
 (null, @componentId, 'video_related', 'checkbox', '', 'Empfehlungen ausblenden', '', '', '', '', '', '', 0, 0, 0, @maxNumberPosition+1),
diff --git a/_sql/migrations/774-add-extra-config-elements.php b/_sql/migrations/774-add-extra-config-elements.php
index f7eaaca178d..e6948e2fb2c 100644
--- a/_sql/migrations/774-add-extra-config-elements.php
+++ b/_sql/migrations/774-add-extra-config-elements.php
@@ -1,19 +1,42 @@
 <?php
 
-class Migrations_Migration774 extends Shopware\Components\Migrations\AbstractMigration
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration774 extends AbstractMigration
 {
     public function up($modus)
     {
         if ($modus === self::MODUS_UPDATE) {
             return;
         }
-        $today = new \DateTime();
+        $today = new DateTime();
         $installationDate = serialize($today->format('Y-m-d H:i'));
 
-
         $sql = <<<SQL
     INSERT IGNORE INTO `s_core_config_elements` (`id`, `form_id`, `name`, `value`, `label`, `description`, `type`, `required`, `position`, `scope`, `options`)
-    VALUES 
+    VALUES
     (NULL, 0, 'installationDate', '$installationDate', 'Installationsdatum', NULL, 'text', 0, 0, 0, NULL),
     (NULL, 0, 'installationSurvey', 'b:1;', 'Umfrage zur Installation', NULL, 'boolean', 0, 0, 0, NULL)
 SQL;
diff --git a/_sql/migrations/775-add-asset-version-config-element.php b/_sql/migrations/775-add-asset-version-config-element.php
index 0841cbdacd6..dc5fc6d958b 100644
--- a/_sql/migrations/775-add-asset-version-config-element.php
+++ b/_sql/migrations/775-add-asset-version-config-element.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration775 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/776-fix-alter-ignore-migrations.php b/_sql/migrations/776-fix-alter-ignore-migrations.php
index de9752b9dc3..72672cc2f12 100644
--- a/_sql/migrations/776-fix-alter-ignore-migrations.php
+++ b/_sql/migrations/776-fix-alter-ignore-migrations.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration776 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/777-fix-invalid-birthdays.php b/_sql/migrations/777-fix-invalid-birthdays.php
index 8dfc14c19fc..3a73be8b416 100644
--- a/_sql/migrations/777-fix-invalid-birthdays.php
+++ b/_sql/migrations/777-fix-invalid-birthdays.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration777 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/778-add-attribtue-default-value.php b/_sql/migrations/778-add-attribtue-default-value.php
index 0f9150daf05..4ee4c25fa92 100644
--- a/_sql/migrations/778-add-attribtue-default-value.php
+++ b/_sql/migrations/778-add-attribtue-default-value.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration778 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/779-fixing-bot-detection-ios.php b/_sql/migrations/779-fixing-bot-detection-ios.php
index dacd3bf69f1..9c1bfc657a7 100644
--- a/_sql/migrations/779-fixing-bot-detection-ios.php
+++ b/_sql/migrations/779-fixing-bot-detection-ios.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration779 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
@@ -21,14 +43,14 @@ private function fixStandardBlacklist()
         }
 
         $botList = $this->getFilteredBotList($blacklistConfig[0]['value']);
-        $statement = $this->connection->prepare("
+        $statement = $this->connection->prepare('
             UPDATE s_core_config_elements
-            SET value = :value 
+            SET value = :value
             WHERE id = :id
-        ");
+        ');
         $statement->execute([
             'value' => $botList,
-            'id' => $blacklistConfig[0]['id']
+            'id' => $blacklistConfig[0]['id'],
         ]);
     }
 
@@ -45,20 +67,21 @@ private function fixCustomerBlacklists()
 
         foreach ($blacklistConfig as $config) {
             $botList = $this->getFilteredBotList($config['value']);
-            $statement = $this->connection->prepare("
+            $statement = $this->connection->prepare('
                 UPDATE s_core_config_values
-                SET value = :value 
+                SET value = :value
                 WHERE id = :id
-            ");
+            ');
             $statement->execute([
                 'value' => $botList,
-                'id' => $config['id']
+                'id' => $config['id'],
             ]);
         }
     }
 
     /**
      * @param string $botConfiguration
+     *
      * @return string
      */
     private function getFilteredBotList($botConfiguration)
@@ -68,6 +91,6 @@ private function getFilteredBotList($botConfiguration)
             return $bot !== 'legs';
         });
 
-        return serialize(implode(";", $botList));
+        return serialize(implode(';', $botList));
     }
 }
diff --git a/_sql/migrations/780-fix-debit-payment.php b/_sql/migrations/780-fix-debit-payment.php
index c68791a6fea..a68f2482dda 100644
--- a/_sql/migrations/780-fix-debit-payment.php
+++ b/_sql/migrations/780-fix-debit-payment.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration780 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/781-update-forum-link.php b/_sql/migrations/781-update-forum-link.php
index 279f0af1bef..eb134d19922 100644
--- a/_sql/migrations/781-update-forum-link.php
+++ b/_sql/migrations/781-update-forum-link.php
@@ -1,5 +1,26 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
 
 class Migrations_Migration781 extends Shopware\Components\Migrations\AbstractMigration
 {
diff --git a/_sql/migrations/782-add-partner-idcode-index.php b/_sql/migrations/782-add-partner-idcode-index.php
index e7f9051aee5..5f05462675c 100644
--- a/_sql/migrations/782-add-partner-idcode-index.php
+++ b/_sql/migrations/782-add-partner-idcode-index.php
@@ -1,9 +1,31 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration782 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
-        $this->addSql("ALTER TABLE `s_emarketing_partner` ADD INDEX `idcode` (`idcode`);");
+        $this->addSql('ALTER TABLE `s_emarketing_partner` ADD INDEX `idcode` (`idcode`);');
     }
 }
diff --git a/_sql/migrations/783-increase-media-path-columns.php b/_sql/migrations/783-increase-media-path-columns.php
index 1f9199ea334..0c4ea6f19e4 100644
--- a/_sql/migrations/783-increase-media-path-columns.php
+++ b/_sql/migrations/783-increase-media-path-columns.php
@@ -1,10 +1,32 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration783 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
-        $this->addSql("ALTER TABLE `s_emarketing_banners` CHANGE `img` `img` varchar(255) NOT NULL;");
-        $this->addSql("ALTER TABLE `s_articles_supplier` CHANGE `img` `img` varchar(255) NOT NULL;");
+        $this->addSql('ALTER TABLE `s_emarketing_banners` CHANGE `img` `img` varchar(255) NOT NULL;');
+        $this->addSql('ALTER TABLE `s_articles_supplier` CHANGE `img` `img` varchar(255) NOT NULL;');
     }
 }
diff --git a/_sql/migrations/784-add-paging-to-notfoundfield.php b/_sql/migrations/784-add-paging-to-notfoundfield.php
index c3d9b21e29b..a39040ee399 100644
--- a/_sql/migrations/784-add-paging-to-notfoundfield.php
+++ b/_sql/migrations/784-add-paging-to-notfoundfield.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration784 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
@@ -9,10 +31,10 @@ public function up($modus)
             'displayField' => 'name',
             'valueField' => 'id',
             'allowBlank' => false,
-            'pageSize' => 25
+            'pageSize' => 25,
         ];
 
-        $sql = sprintf("UPDATE s_core_config_elements SET `options` = '%s' WHERE `name` = 'PageNotFoundDestination'", serialize($data));
+        $sql = \sprintf("UPDATE s_core_config_elements SET `options` = '%s' WHERE `name` = 'PageNotFoundDestination'", serialize($data));
         $this->addSql($sql);
     }
 }
diff --git a/_sql/migrations/785-add-connect-default-menu.php b/_sql/migrations/785-add-connect-default-menu.php
index 90b9092699c..e4f5c27e9ee 100644
--- a/_sql/migrations/785-add-connect-default-menu.php
+++ b/_sql/migrations/785-add-connect-default-menu.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration785 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/786-extend-api-cache-invalidation.php b/_sql/migrations/786-extend-api-cache-invalidation.php
index f7c7a58c8f5..e9bc3d25c3b 100644
--- a/_sql/migrations/786-extend-api-cache-invalidation.php
+++ b/_sql/migrations/786-extend-api-cache-invalidation.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration786 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/787-add-missing-translation-basicsettings-login-and-registration.php b/_sql/migrations/787-add-missing-translation-basicsettings-login-and-registration.php
index d90abafaeac..6b9a6c273fa 100644
--- a/_sql/migrations/787-add-missing-translation-basicsettings-login-and-registration.php
+++ b/_sql/migrations/787-add-missing-translation-basicsettings-login-and-registration.php
@@ -1,9 +1,32 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration787 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
      * @param string $modus
+     *
      * @return void
      */
     public function up($modus)
diff --git a/_sql/migrations/788-change-Seo-Router-description.php b/_sql/migrations/788-change-Seo-Router-description.php
index eabfbc22760..7881e266bae 100644
--- a/_sql/migrations/788-change-Seo-Router-description.php
+++ b/_sql/migrations/788-change-Seo-Router-description.php
@@ -1,9 +1,32 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration788 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
      * @param string $modus
+     *
      * @return void
      */
     public function up($modus)
diff --git a/_sql/migrations/789-add-crontab-disableonerror.php b/_sql/migrations/789-add-crontab-disableonerror.php
index 7f9e1a3fda0..376c6caa14b 100644
--- a/_sql/migrations/789-add-crontab-disableonerror.php
+++ b/_sql/migrations/789-add-crontab-disableonerror.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration789 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/790-clarify-basic-settings-label.php b/_sql/migrations/790-clarify-basic-settings-label.php
index 7166b966710..1410c9397fd 100644
--- a/_sql/migrations/790-clarify-basic-settings-label.php
+++ b/_sql/migrations/790-clarify-basic-settings-label.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration790 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/791-increase-password-hash-size.php b/_sql/migrations/791-increase-password-hash-size.php
index 386bec3b469..601184c6ac0 100644
--- a/_sql/migrations/791-increase-password-hash-size.php
+++ b/_sql/migrations/791-increase-password-hash-size.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration791 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/792-add-send-registration-email-confirmation-config.php b/_sql/migrations/792-add-send-registration-email-confirmation-config.php
index 06747ef5570..3759fabb12a 100644
--- a/_sql/migrations/792-add-send-registration-email-confirmation-config.php
+++ b/_sql/migrations/792-add-send-registration-email-confirmation-config.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration792 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
@@ -41,4 +63,4 @@ private function deletePluginFormEntry()
 
         $this->addSql($sql);
     }
-}
\ No newline at end of file
+}
diff --git a/_sql/migrations/793-add-attribute-table-for-search.php b/_sql/migrations/793-add-attribute-table-for-search.php
index 0cbf8ff2748..e8965182804 100644
--- a/_sql/migrations/793-add-attribute-table-for-search.php
+++ b/_sql/migrations/793-add-attribute-table-for-search.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration793 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/794-fix-shop-page-limiting.php b/_sql/migrations/794-fix-shop-page-limiting.php
index 41dcb9b851f..94952b118c0 100644
--- a/_sql/migrations/794-fix-shop-page-limiting.php
+++ b/_sql/migrations/794-fix-shop-page-limiting.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration794 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/795-remove-salutation-snippets.php b/_sql/migrations/795-remove-salutation-snippets.php
index 28f29a616a6..0cc02facfac 100644
--- a/_sql/migrations/795-remove-salutation-snippets.php
+++ b/_sql/migrations/795-remove-salutation-snippets.php
@@ -1,13 +1,42 @@
 <?php
 
-class Migrations_Migration795 extends Shopware\Components\Migrations\AbstractMigration
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration795 extends AbstractMigration
 {
     public function up($modus)
     {
-        $statement = $this->connection->query("SELECT id, locale_id FROM s_core_shops WHERE `default` = 1 LIMIT 1");
+        $statement = $this->connection->query('SELECT id, locale_id FROM s_core_shops WHERE `default` = 1 LIMIT 1');
         $shop = $statement->fetchAll(PDO::FETCH_ASSOC);
         $shop = array_shift($shop);
-        $sql = "DELETE FROM s_core_snippets WHERE dirty = 0 AND namespace = 'frontend/salutation' AND value = '' AND (shopID != " . (int) $shop['id'] . " OR localeID != " . (int) $shop['locale_id'] . ")";
+        if (!\is_array($shop)) {
+            return;
+        }
+
+        $sql = "DELETE FROM s_core_snippets WHERE dirty = 0 AND namespace = 'frontend/salutation' AND value = '' AND (shopID != " . (int) $shop['id'] . ' OR localeID != ' . (int) $shop['locale_id'] . ')';
         $this->addSql($sql);
     }
 }
diff --git a/_sql/migrations/796-add-uniqueid-config-element.php b/_sql/migrations/796-add-uniqueid-config-element.php
index 0fc0598261b..89993c64bc7 100644
--- a/_sql/migrations/796-add-uniqueid-config-element.php
+++ b/_sql/migrations/796-add-uniqueid-config-element.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration796 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/797-remove-salutation-snippets.php b/_sql/migrations/797-remove-salutation-snippets.php
index 1adba59793e..8f865f86c2c 100644
--- a/_sql/migrations/797-remove-salutation-snippets.php
+++ b/_sql/migrations/797-remove-salutation-snippets.php
@@ -1,24 +1,52 @@
 <?php
 
-class Migrations_Migration797 extends Shopware\Components\Migrations\AbstractMigration
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration797 extends AbstractMigration
 {
     public function up($modus)
     {
-        $statement = $this->connection->query("SELECT id, locale_id FROM s_core_shops WHERE `default` = 1 LIMIT 1");
+        $statement = $this->connection->query('SELECT id, locale_id FROM s_core_shops WHERE `default` = 1 LIMIT 1');
         $shop = $statement->fetchAll(PDO::FETCH_ASSOC);
         $shop = array_shift($shop);
+        if (!\is_array($shop)) {
+            return;
+        }
 
-        $exists = $this->connection->query("SELECT id FROM s_core_snippets WHERE namespace = 'frontend/salutation' AND localeID = " . (int) $shop['locale_id'] . " AND shopID = " . (int) $shop['id'])->fetch(PDO::FETCH_COLUMN);
+        $exists = $this->connection->query("SELECT id FROM s_core_snippets WHERE namespace = 'frontend/salutation' AND localeID = " . (int) $shop['locale_id'] . ' AND shopID = ' . (int) $shop['id'])->fetch(PDO::FETCH_COLUMN);
         if (!$exists) {
             $this->addSql(
-                "UPDATE s_core_snippets SET localeID = " . (int) $shop['locale_id'] . " WHERE namespace = 'frontend/salutation' AND shopID = " . (int) $shop['id'] . " AND localeID = " . (int) $shop['id']
+                'UPDATE s_core_snippets SET localeID = ' . (int) $shop['locale_id'] . " WHERE namespace = 'frontend/salutation' AND shopID = " . (int) $shop['id'] . ' AND localeID = ' . (int) $shop['id']
             );
         }
 
         $sql = "DELETE FROM s_core_snippets WHERE dirty = 0 AND namespace = 'frontend/salutation' AND value = '' AND shopID != " . (int) $shop['id'];
         $this->addSql($sql);
 
-        $sql = "DELETE FROM s_core_snippets WHERE dirty = 0 AND namespace = 'frontend/salutation' AND value = '' AND shopID = " . (int) $shop['id'] . " AND localeID != " . (int) $shop['locale_id'];
+        $sql = "DELETE FROM s_core_snippets WHERE dirty = 0 AND namespace = 'frontend/salutation' AND value = '' AND shopID = " . (int) $shop['id'] . ' AND localeID != ' . (int) $shop['locale_id'];
         $this->addSql($sql);
     }
 }
diff --git a/_sql/migrations/798-add-sytem-log-acl.php b/_sql/migrations/798-add-sytem-log-acl.php
index e0774208d13..1a5bb22f462 100644
--- a/_sql/migrations/798-add-sytem-log-acl.php
+++ b/_sql/migrations/798-add-sytem-log-acl.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration798 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/799-attribute-translation-fix-1-of-10.php b/_sql/migrations/799-attribute-translation-fix-1-of-10.php
index c5bd6b0d6d4..f4d36fa29fb 100644
--- a/_sql/migrations/799-attribute-translation-fix-1-of-10.php
+++ b/_sql/migrations/799-attribute-translation-fix-1-of-10.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration799 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/800-attribute-translation-fix-2-of-10.php b/_sql/migrations/800-attribute-translation-fix-2-of-10.php
index 9346393cec3..f4c53e75b4c 100644
--- a/_sql/migrations/800-attribute-translation-fix-2-of-10.php
+++ b/_sql/migrations/800-attribute-translation-fix-2-of-10.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration800 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/801-attribute-translation-fix-3-of-10.php b/_sql/migrations/801-attribute-translation-fix-3-of-10.php
index 9b220ede7ba..9e1e8b85166 100644
--- a/_sql/migrations/801-attribute-translation-fix-3-of-10.php
+++ b/_sql/migrations/801-attribute-translation-fix-3-of-10.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration801 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/802-attribute-translation-fix-4-of-10.php b/_sql/migrations/802-attribute-translation-fix-4-of-10.php
index 2c488cc9e0b..907465fc135 100644
--- a/_sql/migrations/802-attribute-translation-fix-4-of-10.php
+++ b/_sql/migrations/802-attribute-translation-fix-4-of-10.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration802 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/803-attribute-translation-fix-5-of-10.php b/_sql/migrations/803-attribute-translation-fix-5-of-10.php
index c0991f78f05..fbeaa080d45 100644
--- a/_sql/migrations/803-attribute-translation-fix-5-of-10.php
+++ b/_sql/migrations/803-attribute-translation-fix-5-of-10.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration803 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/804-attribute-translation-fix-6-of-10.php b/_sql/migrations/804-attribute-translation-fix-6-of-10.php
index 16dd728b325..11efb197894 100644
--- a/_sql/migrations/804-attribute-translation-fix-6-of-10.php
+++ b/_sql/migrations/804-attribute-translation-fix-6-of-10.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration804 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/805-attribute-translation-fix-7-of-10.php b/_sql/migrations/805-attribute-translation-fix-7-of-10.php
index 4792a277b3c..19d74c2414f 100644
--- a/_sql/migrations/805-attribute-translation-fix-7-of-10.php
+++ b/_sql/migrations/805-attribute-translation-fix-7-of-10.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration805 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/806-attribute-translation-fix-8-of-10.php b/_sql/migrations/806-attribute-translation-fix-8-of-10.php
index ecbd7c0e713..7766cfb1751 100644
--- a/_sql/migrations/806-attribute-translation-fix-8-of-10.php
+++ b/_sql/migrations/806-attribute-translation-fix-8-of-10.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration806 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/807-attribute-translation-fix-9-of-10.php b/_sql/migrations/807-attribute-translation-fix-9-of-10.php
index 8296e351c24..b99f34a6d44 100644
--- a/_sql/migrations/807-attribute-translation-fix-9-of-10.php
+++ b/_sql/migrations/807-attribute-translation-fix-9-of-10.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration807 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/808-attribute-translation-fix-10-of-10.php b/_sql/migrations/808-attribute-translation-fix-10-of-10.php
index 155c320299d..2ec287afd60 100644
--- a/_sql/migrations/808-attribute-translation-fix-10-of-10.php
+++ b/_sql/migrations/808-attribute-translation-fix-10-of-10.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration808 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/809-change-session-tables.php b/_sql/migrations/809-change-session-tables.php
index 077ececa25e..a72c7a23f53 100644
--- a/_sql/migrations/809-change-session-tables.php
+++ b/_sql/migrations/809-change-session-tables.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration809 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/810-change-description-of-article-cover-setting.php b/_sql/migrations/810-change-description-of-article-cover-setting.php
index fb5afedef45..bce71839bf6 100644
--- a/_sql/migrations/810-change-description-of-article-cover-setting.php
+++ b/_sql/migrations/810-change-description-of-article-cover-setting.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration810 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/811-add-attributes-partner.php b/_sql/migrations/811-add-attributes-partner.php
index 6df05fddc60..676f70b513e 100644
--- a/_sql/migrations/811-add-attributes-partner.php
+++ b/_sql/migrations/811-add-attributes-partner.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration811 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/812-add-max-limit-config.php b/_sql/migrations/812-add-max-limit-config.php
index c20e2848634..2cdb3deaf8f 100644
--- a/_sql/migrations/812-add-max-limit-config.php
+++ b/_sql/migrations/812-add-max-limit-config.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration812 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/813-session-expiry.php b/_sql/migrations/813-session-expiry.php
index 9cbd12cbda2..549134d62e3 100644
--- a/_sql/migrations/813-session-expiry.php
+++ b/_sql/migrations/813-session-expiry.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration813 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/814-create-configurator-options-attribute-table.php b/_sql/migrations/814-create-configurator-options-attribute-table.php
index c8d58bedeae..26bf44f0f78 100644
--- a/_sql/migrations/814-create-configurator-options-attribute-table.php
+++ b/_sql/migrations/814-create-configurator-options-attribute-table.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration814 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/815-add-strip-tags-configuration-option.php b/_sql/migrations/815-add-strip-tags-configuration-option.php
index bc734704996..eea99bbf6b7 100644
--- a/_sql/migrations/815-add-strip-tags-configuration-option.php
+++ b/_sql/migrations/815-add-strip-tags-configuration-option.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration815 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
@@ -30,7 +52,7 @@ public function up($modus)
         $this->addSql($sql);
 
         $sql = <<<'SQL'
-INSERT IGNORE INTO `s_core_config_element_translations` SET 
+INSERT IGNORE INTO `s_core_config_element_translations` SET
 `element_id` = @stripTagsId,
 `locale_id` = 2,
 `label` = 'Use strip_tags globally',
diff --git a/_sql/migrations/816-short-cut-menu-plugin-manager.php b/_sql/migrations/816-short-cut-menu-plugin-manager.php
index 6ca23b0e7d4..1eae63f9db9 100644
--- a/_sql/migrations/816-short-cut-menu-plugin-manager.php
+++ b/_sql/migrations/816-short-cut-menu-plugin-manager.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration816 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/817-add-plugin-translations.php b/_sql/migrations/817-add-plugin-translations.php
index 32084a3b1f0..420c31962d1 100644
--- a/_sql/migrations/817-add-plugin-translations.php
+++ b/_sql/migrations/817-add-plugin-translations.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration817 extends Shopware\Components\Migrations\AbstractMigration
 {
     /**
diff --git a/_sql/migrations/818-make-some-fields-in-order-table-nullable.php b/_sql/migrations/818-make-some-fields-in-order-table-nullable.php
index c214562ce9e..a4eec863782 100644
--- a/_sql/migrations/818-make-some-fields-in-order-table-nullable.php
+++ b/_sql/migrations/818-make-some-fields-in-order-table-nullable.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration818 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/819-shortcut-help-menu.php b/_sql/migrations/819-shortcut-help-menu.php
index ab33401fcc3..362a69ec3dc 100644
--- a/_sql/migrations/819-shortcut-help-menu.php
+++ b/_sql/migrations/819-shortcut-help-menu.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration819 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/820-plugin-safe-mode.php b/_sql/migrations/820-plugin-safe-mode.php
index 1db4ed2eeb5..fbddf152603 100644
--- a/_sql/migrations/820-plugin-safe-mode.php
+++ b/_sql/migrations/820-plugin-safe-mode.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration820 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/900-add-last-articles-config-elements.php b/_sql/migrations/900-add-last-articles-config-elements.php
index 0e56dc39041..3e67f31fdbc 100644
--- a/_sql/migrations/900-add-last-articles-config-elements.php
+++ b/_sql/migrations/900-add-last-articles-config-elements.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration900 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
@@ -11,7 +33,7 @@ public function up($modus)
 
     private function cleanupLastArticlesTable()
     {
-        $this->addSql("ALTER TABLE `s_emarketing_lastarticles` DROP `img`, DROP `name`;");
+        $this->addSql('ALTER TABLE `s_emarketing_lastarticles` DROP `img`, DROP `name`;');
     }
 
     private function removeLastArticlesPlugin()
diff --git a/_sql/migrations/901-add-vote-shop-id.php b/_sql/migrations/901-add-vote-shop-id.php
index d4b5e8e87bb..eae3fafc694 100644
--- a/_sql/migrations/901-add-vote-shop-id.php
+++ b/_sql/migrations/901-add-vote-shop-id.php
@@ -1,12 +1,34 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration901 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
         $this->addSql('ALTER TABLE `s_articles_vote` ADD `shop_id` INT NULL DEFAULT NULL;');
         $this->addSql("SET @formId = (SELECT id FROM s_core_config_forms WHERE name = 'Rating' LIMIT 1)");
-        $this->addSql("ALTER TABLE `s_articles_vote` CHANGE `answer_date` `answer_date` DATETIME NULL DEFAULT NULL;");
+        $this->addSql('ALTER TABLE `s_articles_vote` CHANGE `answer_date` `answer_date` DATETIME NULL DEFAULT NULL;');
 
         $sql = <<<'EOD'
 
diff --git a/_sql/migrations/902-remove-import-export-legacy-module.php b/_sql/migrations/902-remove-import-export-legacy-module.php
index 850290bb9bc..442132e1b06 100644
--- a/_sql/migrations/902-remove-import-export-legacy-module.php
+++ b/_sql/migrations/902-remove-import-export-legacy-module.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration902 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/903-add-menu-import-export-advanced.php b/_sql/migrations/903-add-menu-import-export-advanced.php
index a7620ecb23f..3f6774ecfd7 100644
--- a/_sql/migrations/903-add-menu-import-export-advanced.php
+++ b/_sql/migrations/903-add-menu-import-export-advanced.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration903 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/904-add-captcha-selection.php b/_sql/migrations/904-add-captcha-selection.php
index 75df50c5aa0..b8e9a5db135 100644
--- a/_sql/migrations/904-add-captcha-selection.php
+++ b/_sql/migrations/904-add-captcha-selection.php
@@ -1,6 +1,31 @@
 <?php
 
-class Migrations_Migration904 extends Shopware\Components\Migrations\AbstractMigration
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration904 extends AbstractMigration
 {
     public function up($modus)
     {
@@ -9,7 +34,7 @@ public function up($modus)
         $this->createAdditionalCaptchaOptionsTranslations();
     }
 
-    private function moveExistingCaptchaOptions()
+    private function moveExistingCaptchaOptions(): void
     {
         $this->addSql("SET @help_parent = (SELECT id FROM s_core_config_forms WHERE name='Frontend' LIMIT 1)");
 
@@ -23,7 +48,7 @@ private function moveExistingCaptchaOptions()
         $this->addSql("UPDATE s_core_config_elements SET form_id=@parent WHERE name='captchaColor'");
     }
 
-    private function createAdditionalCaptchaOptionsTranslations()
+    private function createAdditionalCaptchaOptionsTranslations(): void
     {
         $this->addSql("SET @captchaMethod = (SELECT id FROM s_core_config_elements WHERE name = 'captchaMethod' LIMIT 1)");
         $this->addSql("SET @noCaptchaAfterLogin = (SELECT id FROM s_core_config_elements WHERE name = 'noCaptchaAfterLogin' LIMIT 1)");
@@ -38,9 +63,9 @@ private function createAdditionalCaptchaOptionsTranslations()
     }
 
     /**
-     * @param string $modus
+     * @param self::MODUS_* $modus
      */
-    private function createAdditionalCaptchaOptions($modus)
+    private function createAdditionalCaptchaOptions(string $modus): void
     {
         $captchaMethod = 'default';
         if ($modus === self::MODUS_UPDATE) {
@@ -54,6 +79,6 @@ private function createAdditionalCaptchaOptions($modus)
 (@parent, 'captchaMethod', '%s', 'Captcha Methode', 'Wählen Sie hier eine Methode aus, wie die Formulare gegen Spam-Bots geschützt werden sollen', 'combo', 1, 0, 1, 'a:5:{s:8:"editable";b:0;s:10:"valueField";s:2:"id";s:12:"displayField";s:11:"displayname";s:13:"triggerAction";s:3:"all";s:5:"store";s:12:"base.Captcha";}'),
 (@parent, 'noCaptchaAfterLogin', 'b:0;', 'Nach Login ausblenden', 'Nach dem Login können Kunden Formulare ohne Captcha-Überprüfung absenden.', 'checkbox', 0, 1, 1, '');
 EOD;
-        $this->addSql(sprintf($sql, serialize($captchaMethod)));
+        $this->addSql(\sprintf($sql, serialize($captchaMethod)));
     }
 }
diff --git a/_sql/migrations/905-add-backend-listing-index.php b/_sql/migrations/905-add-backend-listing-index.php
index 1262d8937aa..6f6e84f1632 100644
--- a/_sql/migrations/905-add-backend-listing-index.php
+++ b/_sql/migrations/905-add-backend-listing-index.php
@@ -1,10 +1,32 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration905 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
     {
-        $this->addSql("ALTER TABLE `s_order` ADD INDEX (`ordernumber`,`status`)");
-        $this->addSql("ALTER TABLE `s_order` ADD INDEX (`invoice_amount`);");
+        $this->addSql('ALTER TABLE `s_order` ADD INDEX (`ordernumber`,`status`)');
+        $this->addSql('ALTER TABLE `s_order` ADD INDEX (`invoice_amount`);');
     }
 }
diff --git a/_sql/migrations/906-remove-countryshipping-registration-config-option.php b/_sql/migrations/906-remove-countryshipping-registration-config-option.php
index 5f04edced84..10b125d7f2e 100644
--- a/_sql/migrations/906-remove-countryshipping-registration-config-option.php
+++ b/_sql/migrations/906-remove-countryshipping-registration-config-option.php
@@ -1,5 +1,27 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 class Migrations_Migration906 extends Shopware\Components\Migrations\AbstractMigration
 {
     public function up($modus)
diff --git a/_sql/migrations/907-add-signed-basket.php b/_sql/migrations/907-add-signed-basket.php
index 55b0b900ba6..08fd778c199 100644
--- a/_sql/migrations/907-add-signed-basket.php
+++ b/_sql/migrations/907-add-signed-basket.php
@@ -1,11 +1,33 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 use Shopware\Components\Migrations\AbstractMigration;
 
 class Migrations_Migration907 extends AbstractMigration
 {
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function up($modus)
     {
diff --git a/_sql/migrations/908-change-varchar-attributes.php b/_sql/migrations/908-change-varchar-attributes.php
index 89c0ee33af1..37ad78ca867 100644
--- a/_sql/migrations/908-change-varchar-attributes.php
+++ b/_sql/migrations/908-change-varchar-attributes.php
@@ -1,11 +1,33 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 use Shopware\Components\Migrations\AbstractMigration;
 
 class Migrations_Migration908 extends AbstractMigration
 {
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function up($modus)
     {
@@ -13,108 +35,108 @@ public function up($modus)
             return;
         }
 
-        $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr1` `attr1` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr2` `attr2` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr3` `attr3` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr4` `attr4` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr5` `attr5` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr6` `attr6` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr7` `attr7` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr8` `attr8` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr9` `attr9` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr10` `attr10` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr11` `attr11` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr12` `attr12` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr13` `attr13` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr14` `attr14` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr15` `attr15` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr16` `attr16` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr17` `attr17` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr18` `attr18` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr19` `attr19` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_articles_attributes` CHANGE `attr20` `attr20` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_blog_attributes` CHANGE `attribute1` `attribute1` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_blog_attributes` CHANGE `attribute2` `attribute2` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_blog_attributes` CHANGE `attribute3` `attribute3` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_blog_attributes` CHANGE `attribute4` `attribute4` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_blog_attributes` CHANGE `attribute5` `attribute5` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_blog_attributes` CHANGE `attribute6` `attribute6` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_categories_attributes` CHANGE `attribute1` `attribute1` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_categories_attributes` CHANGE `attribute2` `attribute2` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_categories_attributes` CHANGE `attribute3` `attribute3` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_categories_attributes` CHANGE `attribute4` `attribute4` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_categories_attributes` CHANGE `attribute5` `attribute5` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_categories_attributes` CHANGE `attribute6` `attribute6` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_order_attributes` CHANGE `attribute1` `attribute1` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_order_attributes` CHANGE `attribute2` `attribute2` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_order_attributes` CHANGE `attribute3` `attribute3` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_order_attributes` CHANGE `attribute4` `attribute4` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_order_attributes` CHANGE `attribute5` `attribute5` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_order_attributes` CHANGE `attribute6` `attribute6` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_order_basket_attributes` CHANGE `attribute1` `attribute1` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_order_basket_attributes` CHANGE `attribute2` `attribute2` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_order_basket_attributes` CHANGE `attribute3` `attribute3` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_order_basket_attributes` CHANGE `attribute4` `attribute4` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_order_basket_attributes` CHANGE `attribute5` `attribute5` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_order_basket_attributes` CHANGE `attribute6` `attribute6` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_order_details_attributes` CHANGE `attribute1` `attribute1` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_order_details_attributes` CHANGE `attribute2` `attribute2` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_order_details_attributes` CHANGE `attribute3` `attribute3` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_order_details_attributes` CHANGE `attribute4` `attribute4` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_order_details_attributes` CHANGE `attribute5` `attribute5` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_order_details_attributes` CHANGE `attribute6` `attribute6` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_articles_img_attributes` CHANGE `attribute1` `attribute1` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_articles_img_attributes` CHANGE `attribute2` `attribute2` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_articles_img_attributes` CHANGE `attribute3` `attribute3` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr1` `attr1` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr2` `attr2` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr3` `attr3` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr4` `attr4` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr5` `attr5` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr6` `attr6` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr7` `attr7` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr8` `attr8` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr9` `attr9` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr10` `attr10` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr11` `attr11` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr12` `attr12` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr13` `attr13` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr14` `attr14` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr15` `attr15` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr16` `attr16` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr17` `attr17` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr18` `attr18` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr19` `attr19` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr20` `attr20` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_order_billingaddress_attributes` CHANGE `text1` `text1` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_order_billingaddress_attributes` CHANGE `text2` `text2` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_order_billingaddress_attributes` CHANGE `text3` `text3` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_order_billingaddress_attributes` CHANGE `text4` `text4` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_order_billingaddress_attributes` CHANGE `text5` `text5` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_order_billingaddress_attributes` CHANGE `text6` `text6` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_order_shippingaddress_attributes` CHANGE `text1` `text1` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_order_shippingaddress_attributes` CHANGE `text2` `text2` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_order_shippingaddress_attributes` CHANGE `text3` `text3` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_order_shippingaddress_attributes` CHANGE `text4` `text4` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_order_shippingaddress_attributes` CHANGE `text5` `text5` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_order_shippingaddress_attributes` CHANGE `text6` `text6` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_user_addresses_attributes` CHANGE `text1` `text1` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_user_addresses_attributes` CHANGE `text2` `text2` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_user_addresses_attributes` CHANGE `text3` `text3` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_user_addresses_attributes` CHANGE `text4` `text4` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_user_addresses_attributes` CHANGE `text5` `text5` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_user_addresses_attributes` CHANGE `text6` `text6` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_user_billingaddress_attributes` CHANGE `text1` `text1` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_user_billingaddress_attributes` CHANGE `text2` `text2` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_user_billingaddress_attributes` CHANGE `text3` `text3` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_user_billingaddress_attributes` CHANGE `text4` `text4` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_user_billingaddress_attributes` CHANGE `text5` `text5` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_user_billingaddress_attributes` CHANGE `text6` `text6` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_user_shippingaddress_attributes` CHANGE `text1` `text1` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_user_shippingaddress_attributes` CHANGE `text2` `text2` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_user_shippingaddress_attributes` CHANGE `text3` `text3` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_user_shippingaddress_attributes` CHANGE `text4` `text4` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_user_shippingaddress_attributes` CHANGE `text5` `text5` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
-        $this->addSql("ALTER TABLE `s_user_shippingaddress_attributes` CHANGE `text6` `text6` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;");
+        $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr1` `attr1` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr2` `attr2` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr3` `attr3` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr4` `attr4` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr5` `attr5` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr6` `attr6` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr7` `attr7` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr8` `attr8` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr9` `attr9` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr10` `attr10` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr11` `attr11` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr12` `attr12` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr13` `attr13` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr14` `attr14` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr15` `attr15` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr16` `attr16` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr17` `attr17` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr18` `attr18` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr19` `attr19` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_articles_attributes` CHANGE `attr20` `attr20` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_blog_attributes` CHANGE `attribute1` `attribute1` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_blog_attributes` CHANGE `attribute2` `attribute2` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_blog_attributes` CHANGE `attribute3` `attribute3` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_blog_attributes` CHANGE `attribute4` `attribute4` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_blog_attributes` CHANGE `attribute5` `attribute5` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_blog_attributes` CHANGE `attribute6` `attribute6` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_categories_attributes` CHANGE `attribute1` `attribute1` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_categories_attributes` CHANGE `attribute2` `attribute2` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_categories_attributes` CHANGE `attribute3` `attribute3` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_categories_attributes` CHANGE `attribute4` `attribute4` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_categories_attributes` CHANGE `attribute5` `attribute5` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_categories_attributes` CHANGE `attribute6` `attribute6` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_order_attributes` CHANGE `attribute1` `attribute1` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_order_attributes` CHANGE `attribute2` `attribute2` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_order_attributes` CHANGE `attribute3` `attribute3` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_order_attributes` CHANGE `attribute4` `attribute4` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_order_attributes` CHANGE `attribute5` `attribute5` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_order_attributes` CHANGE `attribute6` `attribute6` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_order_basket_attributes` CHANGE `attribute1` `attribute1` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_order_basket_attributes` CHANGE `attribute2` `attribute2` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_order_basket_attributes` CHANGE `attribute3` `attribute3` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_order_basket_attributes` CHANGE `attribute4` `attribute4` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_order_basket_attributes` CHANGE `attribute5` `attribute5` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_order_basket_attributes` CHANGE `attribute6` `attribute6` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_order_details_attributes` CHANGE `attribute1` `attribute1` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_order_details_attributes` CHANGE `attribute2` `attribute2` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_order_details_attributes` CHANGE `attribute3` `attribute3` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_order_details_attributes` CHANGE `attribute4` `attribute4` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_order_details_attributes` CHANGE `attribute5` `attribute5` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_order_details_attributes` CHANGE `attribute6` `attribute6` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_articles_img_attributes` CHANGE `attribute1` `attribute1` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_articles_img_attributes` CHANGE `attribute2` `attribute2` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_articles_img_attributes` CHANGE `attribute3` `attribute3` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr1` `attr1` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr2` `attr2` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr3` `attr3` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr4` `attr4` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr5` `attr5` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr6` `attr6` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr7` `attr7` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr8` `attr8` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr9` `attr9` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr10` `attr10` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr11` `attr11` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr12` `attr12` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr13` `attr13` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr14` `attr14` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr15` `attr15` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr16` `attr16` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr17` `attr17` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr18` `attr18` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr19` `attr19` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_article_configurator_templates_attributes` CHANGE `attr20` `attr20` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_order_billingaddress_attributes` CHANGE `text1` `text1` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_order_billingaddress_attributes` CHANGE `text2` `text2` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_order_billingaddress_attributes` CHANGE `text3` `text3` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_order_billingaddress_attributes` CHANGE `text4` `text4` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_order_billingaddress_attributes` CHANGE `text5` `text5` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_order_billingaddress_attributes` CHANGE `text6` `text6` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_order_shippingaddress_attributes` CHANGE `text1` `text1` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_order_shippingaddress_attributes` CHANGE `text2` `text2` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_order_shippingaddress_attributes` CHANGE `text3` `text3` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_order_shippingaddress_attributes` CHANGE `text4` `text4` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_order_shippingaddress_attributes` CHANGE `text5` `text5` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_order_shippingaddress_attributes` CHANGE `text6` `text6` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_user_addresses_attributes` CHANGE `text1` `text1` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_user_addresses_attributes` CHANGE `text2` `text2` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_user_addresses_attributes` CHANGE `text3` `text3` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_user_addresses_attributes` CHANGE `text4` `text4` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_user_addresses_attributes` CHANGE `text5` `text5` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_user_addresses_attributes` CHANGE `text6` `text6` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_user_billingaddress_attributes` CHANGE `text1` `text1` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_user_billingaddress_attributes` CHANGE `text2` `text2` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_user_billingaddress_attributes` CHANGE `text3` `text3` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_user_billingaddress_attributes` CHANGE `text4` `text4` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_user_billingaddress_attributes` CHANGE `text5` `text5` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_user_billingaddress_attributes` CHANGE `text6` `text6` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_user_shippingaddress_attributes` CHANGE `text1` `text1` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_user_shippingaddress_attributes` CHANGE `text2` `text2` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_user_shippingaddress_attributes` CHANGE `text3` `text3` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_user_shippingaddress_attributes` CHANGE `text4` `text4` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_user_shippingaddress_attributes` CHANGE `text5` `text5` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_user_shippingaddress_attributes` CHANGE `text6` `text6` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;');
     }
 }
diff --git a/_sql/migrations/909-add-buy-button-config.php b/_sql/migrations/909-add-buy-button-config.php
index 6e1330b045e..ee11ce1a008 100644
--- a/_sql/migrations/909-add-buy-button-config.php
+++ b/_sql/migrations/909-add-buy-button-config.php
@@ -1,11 +1,33 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 use Shopware\Components\Migrations\AbstractMigration;
 
 class Migrations_Migration909 extends AbstractMigration
 {
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function up($modus)
     {
diff --git a/_sql/migrations/910-add-cookie-permissions.php b/_sql/migrations/910-add-cookie-permissions.php
index eb541a66f47..9d8258f84f8 100644
--- a/_sql/migrations/910-add-cookie-permissions.php
+++ b/_sql/migrations/910-add-cookie-permissions.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
@@ -28,6 +28,7 @@ class Migrations_Migration910 extends AbstractMigration
 {
     /**
      * @param string $modus
+     *
      * @return void
      */
     public function up($modus)
diff --git a/_sql/migrations/911-add-facet-behavior-switch.php b/_sql/migrations/911-add-facet-behavior-switch.php
index 59d3e0b94f3..b4dd4197f29 100644
--- a/_sql/migrations/911-add-facet-behavior-switch.php
+++ b/_sql/migrations/911-add-facet-behavior-switch.php
@@ -1,11 +1,33 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 use Shopware\Components\Migrations\AbstractMigration;
 
 class Migrations_Migration911 extends AbstractMigration
 {
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function up($modus)
     {
diff --git a/_sql/migrations/912-add-mail-template.php b/_sql/migrations/912-add-mail-template.php
index 47cb784aa0a..988fbac3ff9 100644
--- a/_sql/migrations/912-add-mail-template.php
+++ b/_sql/migrations/912-add-mail-template.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
@@ -28,6 +28,7 @@ class Migrations_Migration912 extends AbstractMigration
 {
     /**
      * @param string $modus
+     *
      * @return void
      */
     public function up($modus)
diff --git a/_sql/migrations/913-force-category-selection-for-category-teaser.php b/_sql/migrations/913-force-category-selection-for-category-teaser.php
index 3f5d49ec7d5..704cd440413 100644
--- a/_sql/migrations/913-force-category-selection-for-category-teaser.php
+++ b/_sql/migrations/913-force-category-selection-for-category-teaser.php
@@ -1,11 +1,33 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 use Shopware\Components\Migrations\AbstractMigration;
 
 class Migrations_Migration913 extends AbstractMigration
 {
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function up($modus)
     {
diff --git a/_sql/migrations/914-add-preview-id-for-emotions.php b/_sql/migrations/914-add-preview-id-for-emotions.php
index 4a178215139..3fbb25b4037 100644
--- a/_sql/migrations/914-add-preview-id-for-emotions.php
+++ b/_sql/migrations/914-add-preview-id-for-emotions.php
@@ -1,11 +1,33 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 use Shopware\Components\Migrations\AbstractMigration;
 
 class Migrations_Migration914 extends AbstractMigration
 {
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function up($modus)
     {
diff --git a/_sql/migrations/916-add-capcha-to-register-page.php b/_sql/migrations/916-add-capcha-to-register-page.php
index a19e33c4bf4..5f2827bc988 100644
--- a/_sql/migrations/916-add-capcha-to-register-page.php
+++ b/_sql/migrations/916-add-capcha-to-register-page.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
@@ -27,7 +27,7 @@
 class Migrations_Migration916 extends AbstractMigration
 {
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function up($modus)
     {
@@ -42,7 +42,7 @@ public function up($modus)
             VALUE 
                 (@formParent, 'registerCaptcha', '%s', 'Captcha in Registrierung verwenden', 'Wenn diese Option aktiv ist, wird ein Captcha zur Registrierung verwendent. Empfohlen für die Registrierung: Honeypot',  'combo', 1, 0, 1, 'a:5:{s:8:"editable";b:0;s:10:"valueField";s:2:"id";s:12:"displayField";s:11:"displayname";s:13:"triggerAction";s:3:"all";s:5:"store";s:12:"base.Captcha";}');
 EOD;
-        $this->addSql(sprintf($sql, serialize('nocaptcha')));
+        $this->addSql(\sprintf($sql, serialize('nocaptcha')));
 
         $sql = <<<'EOD'
             SET @elementId = (SELECT id FROM `s_core_config_elements` WHERE `name` LIKE 'registerShowCaptcha' LIMIT 1);
diff --git a/_sql/migrations/917-add-sorting-module.php b/_sql/migrations/917-add-sorting-module.php
index bda3558ae88..2a338a8ae2b 100644
--- a/_sql/migrations/917-add-sorting-module.php
+++ b/_sql/migrations/917-add-sorting-module.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Bundle\SearchBundle\Sorting\PopularitySorting;
diff --git a/_sql/migrations/918-add-facet-module.php b/_sql/migrations/918-add-facet-module.php
index dff3d54a7c9..7a3551ef566 100644
--- a/_sql/migrations/918-add-facet-module.php
+++ b/_sql/migrations/918-add-facet-module.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
diff --git a/_sql/migrations/919-change-article-emotion-elements.php b/_sql/migrations/919-change-article-emotion-elements.php
index fdecc1a95ab..55b4c444bae 100644
--- a/_sql/migrations/919-change-article-emotion-elements.php
+++ b/_sql/migrations/919-change-article-emotion-elements.php
@@ -1,11 +1,33 @@
 <?php
 
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
 use Shopware\Components\Migrations\AbstractMigration;
 
 class Migrations_Migration919 extends AbstractMigration
 {
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function up($modus)
     {
@@ -67,7 +89,7 @@ private function convertSelectedProductsOfProductSlider()
     AND libComp.`name` = 'selected_articles';
 SQL;
 
-        $emotionElements = $this->getConnection()->query($emotionElementQuery)->fetchAll(\PDO::FETCH_KEY_PAIR);
+        $emotionElements = $this->getConnection()->query($emotionElementQuery)->fetchAll(PDO::FETCH_KEY_PAIR);
 
         $updateEmotionElementQuery = <<<SQL
 UPDATE s_emotion_element_value
@@ -83,7 +105,7 @@ private function convertSelectedProductsOfProductSlider()
 
             $updateEmotionElementStatement->execute([
                 'id' => $id,
-                'newValue' => $newValue
+                'newValue' => $newValue,
             ]);
         }
     }
diff --git a/_sql/migrations/920-add-description-to-linear-meter.php b/_sql/migrations/920-add-description-to-linear-meter.php
index 1924abff51b..f3ac6ec2e22 100644
--- a/_sql/migrations/920-add-description-to-linear-meter.php
+++ b/_sql/migrations/920-add-description-to-linear-meter.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration920 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/921-remove-shipping-free-flag.php b/_sql/migrations/921-remove-shipping-free-flag.php
index 4e38e8d5f5b..a843867f681 100644
--- a/_sql/migrations/921-remove-shipping-free-flag.php
+++ b/_sql/migrations/921-remove-shipping-free-flag.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
diff --git a/_sql/migrations/922-change-instock.php b/_sql/migrations/922-change-instock.php
index 34dee1ab64c..c52d8d6fa40 100644
--- a/_sql/migrations/922-change-instock.php
+++ b/_sql/migrations/922-change-instock.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration922 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/923-add-customer-streams.php b/_sql/migrations/923-add-customer-streams.php
index b5d36bacae6..d4db3bd55b7 100644
--- a/_sql/migrations/923-add-customer-streams.php
+++ b/_sql/migrations/923-add-customer-streams.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
diff --git a/_sql/migrations/924-add-cache-control.php b/_sql/migrations/924-add-cache-control.php
index 4e0d5580812..609cc70da22 100644
--- a/_sql/migrations/924-add-cache-control.php
+++ b/_sql/migrations/924-add-cache-control.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration924 extends Shopware\Components\Migrations\AbstractMigration
@@ -29,13 +29,13 @@ public function up($modus)
         $this->addSql("SET @pluginId = (SELECT id FROM s_core_plugins WHERE name = 'HttpCache')");
 
         $this->addSql(
-"INSERT INTO `s_core_subscribes` (`subscribe`, `type`, `listener`, `pluginID`, `position`)
-VALUES('Enlight_Bootstrap_InitResource_http_cache.cache_control', '0', 'Shopware_Plugins_Core_HttpCache_Bootstrap::initCacheControl', @pluginId, '0');"
+            "INSERT INTO `s_core_subscribes` (`subscribe`, `type`, `listener`, `pluginID`, `position`)
+             VALUES('Enlight_Bootstrap_InitResource_http_cache.cache_control', '0', 'Shopware_Plugins_Core_HttpCache_Bootstrap::initCacheControl', @pluginId, '0');"
         );
 
         $this->addSql(
-"INSERT INTO `s_core_subscribes` (`subscribe`, `type`, `listener`, `pluginID`, `position`)
-VALUES('Enlight_Bootstrap_InitResource_http_cache.cache_id_collector', '0', 'Shopware_Plugins_Core_HttpCache_Bootstrap::initCacheIdCollector', @pluginId, '0');"
+            "INSERT INTO `s_core_subscribes` (`subscribe`, `type`, `listener`, `pluginID`, `position`)
+             VALUES('Enlight_Bootstrap_InitResource_http_cache.cache_id_collector', '0', 'Shopware_Plugins_Core_HttpCache_Bootstrap::initCacheIdCollector', @pluginId, '0');"
         );
     }
 }
diff --git a/_sql/migrations/925-add-user-config.php b/_sql/migrations/925-add-user-config.php
index 62dfa146337..e79b4597d8a 100644
--- a/_sql/migrations/925-add-user-config.php
+++ b/_sql/migrations/925-add-user-config.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
@@ -40,4 +40,4 @@ public function up($modus)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
         ');
     }
-}
\ No newline at end of file
+}
diff --git a/_sql/migrations/926-add-emotion-presets.php b/_sql/migrations/926-add-emotion-presets.php
index 3c6a5eed167..6a03c279907 100644
--- a/_sql/migrations/926-add-emotion-presets.php
+++ b/_sql/migrations/926-add-emotion-presets.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration926 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/928-add-captcha-to-newsletter-page.php b/_sql/migrations/928-add-captcha-to-newsletter-page.php
index cbf7ce9fd5b..1c3b90c312b 100644
--- a/_sql/migrations/928-add-captcha-to-newsletter-page.php
+++ b/_sql/migrations/928-add-captcha-to-newsletter-page.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
@@ -42,7 +42,7 @@ public function up($modus)
             VALUE 
                 (@formParent, 'newsletterCaptcha', '%s', 'Captcha in Newslettter  verwenden', 'Wenn diese Option aktiv ist, wird ein Captcha zur Newsletter verwendent. Empfohlen für die Newsletter: Honeypot',  'combo', 1, 0, 1, 'a:5:{s:8:"editable";b:0;s:10:"valueField";s:2:"id";s:12:"displayField";s:11:"displayname";s:13:"triggerAction";s:3:"all";s:5:"store";s:12:"base.Captcha";}');
 EOD;
-        $this->addSql(sprintf($sql, serialize('nocaptcha')));
+        $this->addSql(\sprintf($sql, serialize('nocaptcha')));
 
         $sql = <<<'EOD'
             SET @elementId = (SELECT id FROM `s_core_config_elements` WHERE `name` LIKE 'newsletterShowCaptcha' LIMIT 1);
diff --git a/_sql/migrations/929-add-stream-rules.php b/_sql/migrations/929-add-stream-rules.php
index d10f997451d..49a13f76d17 100644
--- a/_sql/migrations/929-add-stream-rules.php
+++ b/_sql/migrations/929-add-stream-rules.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
diff --git a/_sql/migrations/930-fix-variant-weight.php b/_sql/migrations/930-fix-variant-weight.php
index e2df3db3077..0d525418d7e 100644
--- a/_sql/migrations/930-fix-variant-weight.php
+++ b/_sql/migrations/930-fix-variant-weight.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
diff --git a/_sql/migrations/931-add-slt-config.php b/_sql/migrations/931-add-slt-config.php
index 039879fb1e4..90c9df02c84 100644
--- a/_sql/migrations/931-add-slt-config.php
+++ b/_sql/migrations/931-add-slt-config.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
diff --git a/_sql/migrations/932-add-http-cache-route.php b/_sql/migrations/932-add-http-cache-route.php
index 877e9352f4c..e997557b25d 100644
--- a/_sql/migrations/932-add-http-cache-route.php
+++ b/_sql/migrations/932-add-http-cache-route.php
@@ -1,30 +1,30 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
 
-class Migrations_Migration932 extends Shopware\Components\Migrations\AbstractMigration
+class Migrations_Migration932 extends AbstractMigration
 {
     public function up($modus)
     {
@@ -34,7 +34,7 @@ public function up($modus)
             'widgets/compare compare',
         ]);
 
-        $this->addSql(sprintf(
+        $this->addSql(\sprintf(
             "UPDATE `s_core_config_elements` SET `value` = '%s' WHERE `name` = 'noCacheControllers'",
             serialize($tags)
         ));
@@ -60,7 +60,7 @@ public function up($modus)
                     $controller .= ',slt';
                 }
             }
-            $this->addSql(sprintf(
+            $this->addSql(\sprintf(
                 "UPDATE s_core_config_values SET value = '%s' WHERE id = " . $value['id'],
                 serialize(implode("\n", $controllers))
             ));
diff --git a/_sql/migrations/933-add-customer-stream-menu.php b/_sql/migrations/933-add-customer-stream-menu.php
index 36e26924eb2..dbf9ec8678c 100644
--- a/_sql/migrations/933-add-customer-stream-menu.php
+++ b/_sql/migrations/933-add-customer-stream-menu.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
diff --git a/_sql/migrations/934-add-stream-attributes.php b/_sql/migrations/934-add-stream-attributes.php
index 8aa061e25a1..e06e3f677dc 100644
--- a/_sql/migrations/934-add-stream-attributes.php
+++ b/_sql/migrations/934-add-stream-attributes.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
diff --git a/_sql/migrations/935-add-listing-layout-config.php b/_sql/migrations/935-add-listing-layout-config.php
index 2722efc3f07..786cd311698 100644
--- a/_sql/migrations/935-add-listing-layout-config.php
+++ b/_sql/migrations/935-add-listing-layout-config.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
@@ -50,7 +50,7 @@ public function up($modus)
             'frontend/listing/layout 0',
         ]);
 
-        $this->addSql(sprintf(
+        $this->addSql(\sprintf(
             "UPDATE `s_core_config_elements` SET `value` = '%s' WHERE `name` = 'cacheControllers'",
             serialize($tags)
         ));
@@ -69,7 +69,7 @@ public function up($modus)
             $value = implode("\n", $value);
             $value = serialize($value);
 
-            $sql = sprintf("UPDATE `s_core_config_values` SET `value` = '%s' WHERE id = " . (int) $row['id'], $value);
+            $sql = \sprintf("UPDATE `s_core_config_values` SET `value` = '%s' WHERE id = " . (int) $row['id'], $value);
             $this->addSql($sql);
         }
     }
diff --git a/_sql/migrations/936-remove-stream-index.php b/_sql/migrations/936-remove-stream-index.php
index d7009b9d996..3e5b68d035c 100644
--- a/_sql/migrations/936-remove-stream-index.php
+++ b/_sql/migrations/936-remove-stream-index.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
diff --git a/_sql/migrations/937-add-type-field.php b/_sql/migrations/937-add-type-field.php
index f7d91d3bb0f..86d1d3fcede 100644
--- a/_sql/migrations/937-add-type-field.php
+++ b/_sql/migrations/937-add-type-field.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
diff --git a/_sql/migrations/938-add-preset-emotion-translations.php b/_sql/migrations/938-add-preset-emotion-translations.php
index a85998102ac..5e702766aa8 100644
--- a/_sql/migrations/938-add-preset-emotion-translations.php
+++ b/_sql/migrations/938-add-preset-emotion-translations.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
diff --git a/_sql/migrations/939-add-translations-for-facets.php b/_sql/migrations/939-add-translations-for-facets.php
index b2be15ef8b8..f05d882b2b1 100644
--- a/_sql/migrations/939-add-translations-for-facets.php
+++ b/_sql/migrations/939-add-translations-for-facets.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
@@ -35,12 +35,12 @@ public function up($modus)
         $this->updateCustomerFacetAndSorting();
     }
 
-    private function updateTranslation()
+    private function updateTranslation(): void
     {
         $shops = $this->connection->query('SELECT id FROM s_core_shops')->fetchAll(PDO::FETCH_ASSOC);
 
         foreach ($shops as $shop) {
-            $translation = $this->getExistingSortingTranslations($shop['id']);
+            $translation = $this->getExistingSortingTranslations((int) $shop['id']);
 
             if (!empty($translation)) {
                 $id = $translation['id'];
@@ -70,7 +70,7 @@ private function updateTranslation()
         }
     }
 
-    private function updateCustomerFacetAndSorting()
+    private function updateCustomerFacetAndSorting(): void
     {
         $sql = <<<SQL
 UPDATE `s_search_custom_sorting` SET label = 'Lowest price' WHERE id = 3 and label = 'Cheapest price';
@@ -95,17 +95,25 @@ private function updateCustomerFacetAndSorting()
         $this->addSql($sql);
     }
 
-    private function getExistingSortingTranslations($shopId)
+    /**
+     * @return array{id: numeric-string, 0: numeric-string, objectdata: string, 1: string}|null
+     */
+    private function getExistingSortingTranslations(int $shopId): ?array
     {
         $sql = <<<SQL
 SELECT s_core_translations.id, s_core_translations.objectdata
 FROM
     s_core_translations
 WHERE
-    s_core_translations.objecttype = 'custom_facet' AND s_core_translations.objectlanguage =  $shopId;
+    s_core_translations.objecttype = 'custom_facet' AND s_core_translations.objectlanguage = $shopId;
 SQL;
 
-        $translation = $this->connection->query($sql)->fetch();
+        $statement = $this->connection->query($sql);
+        if (!$statement instanceof PDOStatement) {
+            return null;
+        }
+
+        $translation = $statement->fetch();
         if (!$translation) {
             return null;
         }
diff --git a/_sql/migrations/940-fix-import-export-menu-entry.php b/_sql/migrations/940-fix-import-export-menu-entry.php
index 5286477890f..d1675da9ffe 100644
--- a/_sql/migrations/940-fix-import-export-menu-entry.php
+++ b/_sql/migrations/940-fix-import-export-menu-entry.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration940 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/941-replace-default-document-logo.php b/_sql/migrations/941-replace-default-document-logo.php
index 17d82debf01..61ff2a4fdde 100644
--- a/_sql/migrations/941-replace-default-document-logo.php
+++ b/_sql/migrations/941-replace-default-document-logo.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration941 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/942-add-shipping-acl.php b/_sql/migrations/942-add-shipping-acl.php
index 5be9130594b..cdddfa8dd04 100644
--- a/_sql/migrations/942-add-shipping-acl.php
+++ b/_sql/migrations/942-add-shipping-acl.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration942 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/943-add-new-colum-search-fields.php b/_sql/migrations/943-add-new-colum-search-fields.php
index 2218fcbc9b7..db2865414c9 100644
--- a/_sql/migrations/943-add-new-colum-search-fields.php
+++ b/_sql/migrations/943-add-new-colum-search-fields.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
diff --git a/_sql/migrations/944-update-german-translations.php b/_sql/migrations/944-update-german-translations.php
index c80d9963b84..6cdfdab044a 100644
--- a/_sql/migrations/944-update-german-translations.php
+++ b/_sql/migrations/944-update-german-translations.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
diff --git a/_sql/migrations/945-add-category-column-external-target.php b/_sql/migrations/945-add-category-column-external-target.php
index 4588cb95c51..123a0ec87fd 100644
--- a/_sql/migrations/945-add-category-column-external-target.php
+++ b/_sql/migrations/945-add-category-column-external-target.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
diff --git a/_sql/migrations/946-change-customer-stream-type.php b/_sql/migrations/946-change-customer-stream-type.php
index 5c3b2dbb020..04591aa592e 100644
--- a/_sql/migrations/946-change-customer-stream-type.php
+++ b/_sql/migrations/946-change-customer-stream-type.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration946 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/947-change-ordercode-field-length-in_s_marketing_vouchers.php b/_sql/migrations/947-change-ordercode-field-length-in_s_marketing_vouchers.php
index 327a151a132..c473fed0eb3 100644
--- a/_sql/migrations/947-change-ordercode-field-length-in_s_marketing_vouchers.php
+++ b/_sql/migrations/947-change-ordercode-field-length-in_s_marketing_vouchers.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration947 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/948-update-customer-stream-conditions.php b/_sql/migrations/948-update-customer-stream-conditions.php
index 1f2c5c8f6e7..d28d83058ce 100644
--- a/_sql/migrations/948-update-customer-stream-conditions.php
+++ b/_sql/migrations/948-update-customer-stream-conditions.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration948 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/949-add-deprecation-hint-to-maxpages-form.php b/_sql/migrations/949-add-deprecation-hint-to-maxpages-form.php
index 23106353dce..8549663a6c9 100644
--- a/_sql/migrations/949-add-deprecation-hint-to-maxpages-form.php
+++ b/_sql/migrations/949-add-deprecation-hint-to-maxpages-form.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration949 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/951-add-shipping-phone.php b/_sql/migrations/951-add-shipping-phone.php
index 64e6a0c4ef8..d754943d6dd 100644
--- a/_sql/migrations/951-add-shipping-phone.php
+++ b/_sql/migrations/951-add-shipping-phone.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration951 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/952-implement-backend-menu-configuration.php b/_sql/migrations/952-implement-backend-menu-configuration.php
index 44d33967ff5..06123e0ec44 100644
--- a/_sql/migrations/952-implement-backend-menu-configuration.php
+++ b/_sql/migrations/952-implement-backend-menu-configuration.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration952 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/953-implement-growl-message-configuration.php b/_sql/migrations/953-implement-growl-message-configuration.php
index 5a63511b154..7fc5a4ca8d4 100644
--- a/_sql/migrations/953-implement-growl-message-configuration.php
+++ b/_sql/migrations/953-implement-growl-message-configuration.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration953 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/954-edit-company-register-config.php b/_sql/migrations/954-edit-company-register-config.php
index 7cea960d59c..640aa367d04 100644
--- a/_sql/migrations/954-edit-company-register-config.php
+++ b/_sql/migrations/954-edit-company-register-config.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration954 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/955-rename-payment-order-state.php b/_sql/migrations/955-rename-payment-order-state.php
index 35bfbb694e2..568a98e21e4 100644
--- a/_sql/migrations/955-rename-payment-order-state.php
+++ b/_sql/migrations/955-rename-payment-order-state.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration955 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/956-seperate-logmail-address.php b/_sql/migrations/956-seperate-logmail-address.php
index d683a7b4d34..51ebe9702fc 100644
--- a/_sql/migrations/956-seperate-logmail-address.php
+++ b/_sql/migrations/956-seperate-logmail-address.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration956 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/957-site-active-status.php b/_sql/migrations/957-site-active-status.php
index b0b677556e1..dd91dc4701d 100644
--- a/_sql/migrations/957-site-active-status.php
+++ b/_sql/migrations/957-site-active-status.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration957 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/958-add-http-cache-events-for-site.php b/_sql/migrations/958-add-http-cache-events-for-site.php
index 8d6e6427bf9..c9beed5507e 100644
--- a/_sql/migrations/958-add-http-cache-events-for-site.php
+++ b/_sql/migrations/958-add-http-cache-events-for-site.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration958 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/959-fix-emotion-default-value.php b/_sql/migrations/959-fix-emotion-default-value.php
index 96df41cb770..465f1ca5cff 100644
--- a/_sql/migrations/959-fix-emotion-default-value.php
+++ b/_sql/migrations/959-fix-emotion-default-value.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration959 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/960-add-article-shippingtime-translation.php b/_sql/migrations/960-add-article-shippingtime-translation.php
index 871528f18dc..421b390d369 100644
--- a/_sql/migrations/960-add-article-shippingtime-translation.php
+++ b/_sql/migrations/960-add-article-shippingtime-translation.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
diff --git a/_sql/migrations/961-update-email-templates.php b/_sql/migrations/961-update-email-templates.php
index e293ee5ec3d..17e9cf68f54 100644
--- a/_sql/migrations/961-update-email-templates.php
+++ b/_sql/migrations/961-update-email-templates.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration961 extends Shopware\Components\Migrations\AbstractMigration
@@ -76,10 +76,10 @@ private function fixEmailDirtyFlag()
 
     private function updateEmailTemplates()
     {
-        //German
+        // German
         $sql = <<<'EOD'
         UPDATE `s_core_config_mails` SET `frommail` = '{config name=mail}',`fromname` = '{config name=shopName}',`subject` = 'Ihre Anmeldung bei {config name=shopName}',`content` = '{include file="string:{config name=emailheaderplain}"}
-        
+
 Hallo {$salutation|salutation} {$lastname},
 
 vielen Dank für Ihre Anmeldung in unserem Shop.
@@ -103,7 +103,7 @@ private function updateEmailTemplates()
         $sql .= <<<'EOD'
         UPDATE `s_core_config_mails` SET `frommail` = '{config name=mail}',`fromname` = '{config name=shopName}',`subject` = 'Ihre Bestellung im {config name=shopName}',
         `content` = '{include file="string:{config name=emailheaderplain}"}
-        
+
 Hallo {$billingaddress.salutation|salutation} {$billingaddress.lastname},
 
 vielen Dank für Ihre Bestellung im {config name=shopName} (Nummer: {$sOrderNumber}) am {$sOrderDay} um {$sOrderTime}.
@@ -174,7 +174,7 @@ private function updateEmailTemplates()
 Für Rückfragen stehen wir Ihnen jederzeit gerne zur Verfügung.
 
 {include file="string:{config name=emailfooterplain}"}',
-        
+
         `contentHTML` = '<div style="font-family:arial; font-size:12px;">
             {include file="string:{config name=emailheaderhtml}"}
             <br/><br/>
@@ -208,7 +208,7 @@ private function updateEmailTemplates()
                 {/foreach}
 
             </table>
-        
+
             <p>
                 <br/>
                 <br/>
@@ -281,7 +281,7 @@ private function updateEmailTemplates()
         `ishtml` = 1,
         `attachment` = '',
         `mailtype` = 2,
-        `context` = 'a:22:{s:13:"sOrderDetails";a:2:{i:0;a:54:{s:2:"id";s:3:"670";s:9:"sessionID";s:26:"hkkhfl82i1jejfvd2f0ucr6om4";s:6:"userID";s:1:"0";s:11:"articlename";s:11:"ELASTIC CAP";s:9:"articleID";s:3:"152";s:11:"ordernumber";s:7:"SW10153";s:12:"shippingfree";s:1:"0";s:8:"quantity";s:1:"1";s:5:"price";s:5:"29,95";s:8:"netprice";s:15:"25.168067226891";s:8:"tax_rate";s:2:"19";s:5:"datum";s:19:"2017-08-07 14:09:12";s:5:"modus";s:1:"0";s:10:"esdarticle";s:1:"0";s:9:"partnerID";s:0:"";s:12:"lastviewport";s:8:"register";s:9:"useragent";s:76:"Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:54.0) Gecko/20100101 Firefox/54.0";s:6:"config";s:0:"";s:14:"currencyFactor";s:1:"1";s:8:"packunit";s:0:"";s:12:"mainDetailId";s:3:"707";s:15:"articleDetailId";s:3:"708";s:11:"minpurchase";s:1:"1";s:5:"taxID";s:1:"1";s:7:"instock";s:2:"12";s:14:"suppliernumber";s:0:"";s:11:"maxpurchase";s:3:"100";s:13:"purchasesteps";i:1;s:12:"purchaseunit";N;s:9:"laststock";s:1:"0";s:12:"shippingtime";s:0:"";s:11:"releasedate";N;s:12:"sReleaseDate";N;s:3:"ean";s:0:"";s:8:"stockmin";s:1:"0";s:8:"ob_attr1";s:0:"";s:8:"ob_attr2";N;s:8:"ob_attr3";N;s:8:"ob_attr4";N;s:8:"ob_attr5";N;s:8:"ob_attr6";N;s:12:"shippinginfo";b:1;s:3:"esd";s:1:"0";s:18:"additional_details";a:94:{s:9:"articleID";i:152;s:16:"articleDetailsID";i:708;s:11:"ordernumber";s:9:"SW10152.1";s:9:"highlight";b:0;s:11:"description";s:0:"";s:16:"description_long";s:2404:"<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo.</p><p>Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue.</p>  <p>Curabitur ullamcorper ultricies nisi. Nam eget dui. Etiam rhoncus. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel, luctus pulvinar, hendrerit id, lorem. Maecenas nec odio et ante tincidunt tempus. Donec vitae sapien ut libero venenatis faucibus. Nullam quis ante. Etiam sit amet orci eget eros faucibus tincidunt.</p> <p>Duis leo. Sed fringilla mauris sit amet nibh. Donec sodales sagittis magna. Sed consequat, leo eget bibendum sodales, augue velit cursus nunc, quis gravida magna mi a libero. Fusce vulputate eleifend sapien. Vestibulum purus quam, scelerisque ut, mollis sed, nonummy id, metus. Nullam accumsan lorem in dui. Cras ultricies mi eu turpis hendrerit fringilla.</p> <p>Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; In ac dui quis mi consectetuer lacinia. Nam pretium turpis et arcu. Duis arcu tortor, suscipit eget, imperdiet nec, imperdiet iaculis, ipsum. Sed aliquam ultrices mauris. Integer ante arcu, accumsan a, consectetuer eget, posuere ut, mauris. Praesent adipiscing. Phasellus ullamcorper ipsum rutrum nunc. Nunc nonummy metus. Vestibulum volutpat pretium libero. Cras id dui. Aenean ut eros et nisl sagittis vestibulum. Nullam nulla eros, ultricies sit amet, nonummy id, imperdiet feugiat, pede. Sed lectus. Donec mollis hendrerit risus. Phasellus nec sem in justo pellentesque facilisis. Etiam imperdiet imperdiet orci. Nunc nec neque. Phasellus leo dolor, tempus non, auctor et, hendrerit quis, nisi.</p>";s:3:"esd";b:0;s:11:"articleName";s:23:"WINDSTOPPER MÜTZE WARM";s:5:"taxID";i:1;s:3:"tax";i:19;s:7:"instock";i:12;s:11:"isAvailable";b:1;s:6:"weight";i:0;s:12:"shippingtime";N;s:16:"pricegroupActive";b:0;s:12:"pricegroupID";N;s:6:"length";i:0;s:6:"height";i:0;s:5:"width";i:0;s:9:"laststock";b:0;s:14:"additionaltext";s:0:"";s:5:"datum";s:10:"2015-02-05";s:5:"sales";i:0;s:13:"filtergroupID";i:8;s:17:"priceStartingFrom";N;s:18:"pseudopricePercent";N;s:15:"sVariantArticle";N;s:13:"sConfigurator";b:1;s:9:"metaTitle";s:0:"";s:12:"shippingfree";b:0;s:14:"suppliernumber";s:0:"";s:12:"notification";b:0;s:3:"ean";s:0:"";s:8:"keywords";s:0:"";s:12:"sReleasedate";s:0:"";s:8:"template";s:0:"";s:10:"attributes";a:2:{s:4:"core";a:23:{s:2:"id";s:3:"720";s:9:"articleID";s:3:"152";s:16:"articledetailsID";s:3:"708";s:5:"attr1";s:0:"";s:5:"attr2";s:0:"";s:5:"attr3";s:0:"";s:5:"attr4";s:0:"";s:5:"attr5";s:0:"";s:5:"attr6";s:0:"";s:5:"attr7";s:0:"";s:5:"attr8";s:0:"";s:5:"attr9";s:0:"";s:6:"attr10";s:0:"";s:6:"attr11";s:0:"";s:6:"attr12";s:0:"";s:6:"attr13";s:0:"";s:6:"attr14";s:0:"";s:6:"attr15";s:0:"";s:6:"attr16";s:0:"";s:6:"attr17";N;s:6:"attr18";s:0:"";s:6:"attr19";s:0:"";s:6:"attr20";s:0:"";}s:9:"marketing";a:4:{s:5:"isNew";b:0;s:11:"isTopSeller";b:0;s:10:"comingSoon";b:0;s:7:"storage";a:0:{}}}s:17:"allowBuyInListing";b:0;s:5:"attr1";s:0:"";s:5:"attr2";s:0:"";s:5:"attr3";s:0:"";s:5:"attr4";s:0:"";s:5:"attr5";s:0:"";s:5:"attr6";s:0:"";s:5:"attr7";s:0:"";s:5:"attr8";s:0:"";s:5:"attr9";s:0:"";s:6:"attr10";s:0:"";s:6:"attr11";s:0:"";s:6:"attr12";s:0:"";s:6:"attr13";s:0:"";s:6:"attr14";s:0:"";s:6:"attr15";s:0:"";s:6:"attr16";s:0:"";s:6:"attr17";N;s:6:"attr18";s:0:"";s:6:"attr19";s:0:"";s:6:"attr20";s:0:"";s:12:"supplierName";s:8:"LÖFFLER";s:11:"supplierImg";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:10:"supplierID";i:10;s:19:"supplierDescription";s:1267:"<p>L&Ouml;FFLER ist anders. Denn anders als die meisten Mitbewerber hat sich L&Ouml;FFLER schon Anfang der 1990er Jahre entschieden, auch weiterhin in &Ouml;sterreich zu produzieren. Nat&uuml;rlich nach h&ouml;chsten ethischen und &ouml;kologischen Standards, wie sie nur in &Ouml;sterreich bzw. in der Europ&auml;ischen Union gelten. Mit gut ausgebildeten, kompetenten und motivierten Mitarbeiterinnen und Mitarbeitern.</p>  <p>Viele Sportswear-Konzerne haben im Streben nach h&ouml;chsten Gewinnmargen ihre Fertigung l&auml;ngst in Billiglohnl&auml;nder verlagert. Miserable Arbeitsbedingungen, Hungerl&ouml;hne und Kinderarbeit sind dort immer wieder an der Tagesordnung. H&ouml;chst fragw&uuml;rdig sind auch die Umweltzerst&ouml;rung durch r&uuml;cksichtslose Produktionsmethoden und die hohe Schadstoffbelastung der auf diese Weise hergestellten Textilien.</p> <p>70 Prozent aller Stoffe, die L&Ouml;FFLER verarbeitet, kommen aus der eigenen Strickerei in Ried im Innkreis. Das ist einzigartig - und eine wichtige Grundlage f&uuml;r die herausragende Qualit&auml;t, die Fair Sportswear von L&Ouml;FFLER auszeichnet.</p> <p>Weitere Informationen zu dem Hersteller finden Sie <a title="www.loeffler.at" href="http://www.loeffler.at/" target="_blank">hier</a>.</p>";s:19:"supplier_attributes";a:0:{}s:10:"newArticle";b:0;s:9:"sUpcoming";b:0;s:9:"topseller";b:0;s:7:"valFrom";i:1;s:5:"valTo";N;s:4:"from";i:1;s:2:"to";N;s:5:"price";s:5:"29,95";s:11:"pseudoprice";s:1:"0";s:14:"referenceprice";N;s:15:"has_pseudoprice";b:0;s:13:"price_numeric";d:29.949999999999999;s:19:"pseudoprice_numeric";i:0;s:16:"price_attributes";a:0:{}s:10:"pricegroup";s:2:"EK";s:11:"minpurchase";i:1;s:11:"maxpurchase";s:3:"100";s:13:"purchasesteps";i:1;s:12:"purchaseunit";N;s:13:"referenceunit";N;s:8:"packunit";s:0:"";s:6:"unitID";N;s:5:"sUnit";a:2:{s:4:"unit";N;s:11:"description";N;}s:15:"unit_attributes";a:0:{}s:5:"image";a:12:{s:2:"id";i:366;s:8:"position";N;s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:11:"description";s:0:"";s:9:"extension";s:3:"jpg";s:4:"main";b:0;s:8:"parentId";N;s:5:"width";i:1492;s:6:"height";i:1500;s:10:"thumbnails";a:3:{i:0;a:6:{s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:12:"retinaSource";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:9:"sourceSet";s:141:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg, https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg 2x";s:8:"maxWidth";s:3:"200";s:9:"maxHeight";s:3:"200";s:10:"attributes";a:0:{}}i:1;a:6:{s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:12:"retinaSource";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:9:"sourceSet";s:141:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg, https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg 2x";s:8:"maxWidth";s:3:"600";s:9:"maxHeight";s:3:"600";s:10:"attributes";a:0:{}}i:2;a:6:{s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:12:"retinaSource";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:9:"sourceSet";s:141:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg, https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg 2x";s:8:"maxWidth";s:4:"1280";s:9:"maxHeight";s:4:"1280";s:10:"attributes";a:0:{}}}s:10:"attributes";a:0:{}s:9:"attribute";a:0:{}}s:6:"prices";a:1:{i:0;a:22:{s:7:"valFrom";i:1;s:5:"valTo";N;s:4:"from";i:1;s:2:"to";N;s:5:"price";s:5:"29,95";s:11:"pseudoprice";s:1:"0";s:14:"referenceprice";s:1:"0";s:18:"pseudopricePercent";N;s:15:"has_pseudoprice";b:0;s:13:"price_numeric";d:29.949999999999999;s:19:"pseudoprice_numeric";i:0;s:16:"price_attributes";a:0:{}s:10:"pricegroup";s:2:"EK";s:11:"minpurchase";i:1;s:11:"maxpurchase";s:3:"100";s:13:"purchasesteps";i:1;s:12:"purchaseunit";N;s:13:"referenceunit";N;s:8:"packunit";s:0:"";s:6:"unitID";N;s:5:"sUnit";a:2:{s:4:"unit";N;s:11:"description";N;}s:15:"unit_attributes";a:0:{}}}s:10:"linkBasket";s:42:"shopware.php?sViewport=basket&sAdd=SW10153";s:11:"linkDetails";s:42:"shopware.php?sViewport=detail&sArticle=152";s:11:"linkVariant";s:57:"shopware.php?sViewport=detail&sArticle=152&number=SW10153";s:11:"sProperties";a:3:{i:1;a:11:{s:2:"id";i:1;s:8:"optionID";i:1;s:4:"name";s:10:"Artikeltyp";s:7:"groupID";i:8;s:9:"groupName";s:7:"Fashion";s:5:"value";s:16:"Bildkonfigurator";s:6:"values";a:1:{i:4;s:16:"Bildkonfigurator";}s:12:"isFilterable";b:1;s:7:"options";a:1:{i:0;a:3:{s:2:"id";i:4;s:4:"name";s:16:"Bildkonfigurator";s:10:"attributes";a:0:{}}}s:5:"media";a:0:{}s:10:"attributes";a:0:{}}i:3;a:11:{s:2:"id";i:3;s:8:"optionID";i:3;s:4:"name";s:8:"Material";s:7:"groupID";i:8;s:9:"groupName";s:7:"Fashion";s:5:"value";s:20:"Polyester, Baumwolle";s:6:"values";a:2:{i:108;s:9:"Polyester";i:163;s:9:"Baumwolle";}s:12:"isFilterable";b:1;s:7:"options";a:2:{i:0;a:3:{s:2:"id";i:108;s:4:"name";s:9:"Polyester";s:10:"attributes";a:0:{}}i:1;a:3:{s:2:"id";i:163;s:4:"name";s:9:"Baumwolle";s:10:"attributes";a:0:{}}}s:5:"media";a:0:{}s:10:"attributes";a:0:{}}i:18;a:11:{s:2:"id";i:18;s:8:"optionID";i:18;s:4:"name";s:5:"Farbe";s:7:"groupID";i:8;s:9:"groupName";s:7:"Fashion";s:5:"value";s:12:"Rot, Schwarz";s:6:"values";a:2:{i:166;s:3:"Rot";i:155;s:7:"Schwarz";}s:12:"isFilterable";b:1;s:7:"options";a:2:{i:0;a:3:{s:2:"id";i:166;s:4:"name";s:3:"Rot";s:10:"attributes";a:0:{}}i:1;a:3:{s:2:"id";i:155;s:4:"name";s:7:"Schwarz";s:10:"attributes";a:0:{}}}s:5:"media";a:2:{i:166;a:13:{s:7:"valueId";i:166;s:2:"id";i:355;s:8:"position";N;s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:11:"description";s:3:"rot";s:9:"extension";s:3:"jpg";s:4:"main";N;s:8:"parentId";N;s:5:"width";i:40;s:6:"height";i:40;s:10:"thumbnails";a:0:{}s:10:"attributes";a:0:{}s:9:"attribute";a:0:{}}i:155;a:13:{s:7:"valueId";i:155;s:2:"id";i:357;s:8:"position";N;s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:11:"description";s:7:"schwarz";s:9:"extension";s:3:"jpg";s:4:"main";N;s:8:"parentId";N;s:5:"width";i:40;s:6:"height";i:40;s:10:"thumbnails";a:0:{}s:10:"attributes";a:0:{}s:9:"attribute";a:0:{}}}s:10:"attributes";a:0:{}}}s:10:"properties";s:106:"Artikeltyp:&nbsp;Bildkonfigurator,&nbsp;Material:&nbsp;Polyester, Baumwolle,&nbsp;Farbe:&nbsp;Rot, Schwarz";}s:6:"amount";s:5:"29,95";s:9:"amountnet";s:5:"25,17";s:12:"priceNumeric";s:5:"29.95";s:5:"image";a:15:{s:2:"id";i:366;s:8:"position";N;s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:11:"description";s:0:"";s:9:"extension";s:3:"jpg";s:4:"main";b:0;s:8:"parentId";N;s:5:"width";i:1492;s:6:"height";i:1500;s:10:"thumbnails";a:3:{i:0;a:6:{s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:12:"retinaSource";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:9:"sourceSet";s:141:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg, https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg 2x";s:8:"maxWidth";s:3:"200";s:9:"maxHeight";s:3:"200";s:10:"attributes";a:0:{}}i:1;a:6:{s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:12:"retinaSource";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:9:"sourceSet";s:141:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg, https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg 2x";s:8:"maxWidth";s:3:"600";s:9:"maxHeight";s:3:"600";s:10:"attributes";a:0:{}}i:2;a:6:{s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:12:"retinaSource";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:9:"sourceSet";s:141:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg, https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg 2x";s:8:"maxWidth";s:4:"1280";s:9:"maxHeight";s:4:"1280";s:10:"attributes";a:0:{}}}s:10:"attributes";a:0:{}s:9:"attribute";a:0:{}s:3:"src";a:4:{s:8:"original";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";i:0;s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";i:1;s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";i:2;s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";}s:5:"srchd";a:4:{s:8:"original";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";i:0;s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";i:1;s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";i:2;s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";}s:3:"res";a:1:{s:8:"original";a:2:{s:5:"width";i:1500;s:6:"height";i:1492;}}}s:11:"linkDetails";s:42:"shopware.php?sViewport=detail&sArticle=152";s:10:"linkDelete";s:41:"shopware.php?sViewport=basket&sDelete=670";s:8:"linkNote";s:40:"shopware.php?sViewport=note&sAdd=SW10153";s:3:"tax";s:4:"4,78";s:13:"orderDetailId";s:3:"208";s:10:"attributes";a:6:{s:10:"attribute1";s:0:"";s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}}i:1;a:52:{s:2:"id";s:3:"673";s:9:"sessionID";s:26:"hkkhfl82i1jejfvd2f0ucr6om4";s:6:"userID";s:1:"0";s:11:"articlename";s:15:"Warenkorbrabatt";s:9:"articleID";s:1:"0";s:11:"ordernumber";s:16:"SHIPPINGDISCOUNT";s:12:"shippingfree";s:1:"0";s:8:"quantity";s:1:"1";s:5:"price";s:5:"-2,00";s:8:"netprice";s:5:"-1.68";s:8:"tax_rate";s:2:"19";s:5:"datum";s:19:"2017-08-07 14:09:20";s:5:"modus";s:1:"4";s:10:"esdarticle";s:1:"0";s:9:"partnerID";s:0:"";s:12:"lastviewport";s:0:"";s:9:"useragent";s:0:"";s:6:"config";s:0:"";s:14:"currencyFactor";s:1:"1";s:8:"packunit";N;s:12:"mainDetailId";N;s:15:"articleDetailId";N;s:11:"minpurchase";i:1;s:5:"taxID";N;s:7:"instock";N;s:14:"suppliernumber";N;s:11:"maxpurchase";s:3:"100";s:13:"purchasesteps";i:1;s:12:"purchaseunit";N;s:9:"laststock";N;s:12:"shippingtime";N;s:11:"releasedate";N;s:12:"sReleaseDate";N;s:3:"ean";N;s:8:"stockmin";N;s:8:"ob_attr1";N;s:8:"ob_attr2";N;s:8:"ob_attr3";N;s:8:"ob_attr4";N;s:8:"ob_attr5";N;s:8:"ob_attr6";N;s:12:"shippinginfo";b:0;s:3:"esd";s:1:"0";s:6:"amount";s:5:"-2,00";s:9:"amountnet";s:5:"-1,68";s:12:"priceNumeric";s:2:"-2";s:11:"linkDetails";s:40:"shopware.php?sViewport=detail&sArticle=0";s:10:"linkDelete";s:41:"shopware.php?sViewport=basket&sDelete=673";s:8:"linkNote";s:49:"shopware.php?sViewport=note&sAdd=SHIPPINGDISCOUNT";s:3:"tax";s:5:"-0,32";s:13:"orderDetailId";s:3:"209";s:10:"attributes";a:6:{s:10:"attribute1";N;s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}}}s:14:"billingaddress";a:26:{s:2:"id";s:1:"5";s:7:"company";s:0:"";s:10:"department";s:0:"";s:10:"salutation";s:2:"mr";s:9:"firstname";s:3:"Max";s:5:"title";s:0:"";s:8:"lastname";s:10:"Mustermann";s:6:"street";s:15:"Musterstraße 1";s:7:"zipcode";s:5:"12345";s:4:"city";s:11:"Musterstadt";s:5:"phone";s:0:"";s:5:"vatId";s:0:"";s:22:"additionalAddressLine1";s:0:"";s:22:"additionalAddressLine2";s:0:"";s:9:"countryId";s:1:"2";s:7:"stateId";s:0:"";s:8:"customer";N;s:7:"country";N;s:5:"state";s:0:"";s:6:"userID";s:1:"3";s:9:"countryID";s:1:"2";s:7:"stateID";s:0:"";s:5:"ustid";s:0:"";s:24:"additional_address_line1";s:0:"";s:24:"additional_address_line2";s:0:"";s:10:"attributes";N;}s:15:"shippingaddress";a:26:{s:2:"id";s:1:"5";s:7:"company";s:0:"";s:10:"department";s:0:"";s:10:"salutation";s:2:"mr";s:9:"firstname";s:3:"Max";s:5:"title";s:0:"";s:8:"lastname";s:10:"Mustermann";s:6:"street";s:15:"Musterstraße 1";s:7:"zipcode";s:5:"12345";s:4:"city";s:11:"Musterstadt";s:5:"phone";s:0:"";s:5:"vatId";s:0:"";s:22:"additionalAddressLine1";s:0:"";s:22:"additionalAddressLine2";s:0:"";s:9:"countryId";s:1:"2";s:7:"stateId";s:0:"";s:8:"customer";N;s:7:"country";N;s:5:"state";s:0:"";s:6:"userID";s:1:"3";s:9:"countryID";s:1:"2";s:7:"stateID";s:0:"";s:5:"ustid";s:0:"";s:24:"additional_address_line1";s:0:"";s:24:"additional_address_line2";s:0:"";s:10:"attributes";N;}s:10:"additional";a:8:{s:7:"country";a:15:{s:2:"id";s:1:"2";s:11:"countryname";s:11:"Deutschland";s:10:"countryiso";s:2:"DE";s:6:"areaID";s:1:"1";s:9:"countryen";s:7:"GERMANY";s:8:"position";s:1:"1";s:6:"notice";s:0:"";s:7:"taxfree";s:1:"0";s:13:"taxfree_ustid";s:1:"0";s:21:"taxfree_ustid_checked";s:1:"0";s:6:"active";s:1:"1";s:4:"iso3";s:3:"DEU";s:29:"display_state_in_registration";s:1:"0";s:27:"force_state_in_registration";s:1:"0";s:11:"countryarea";s:11:"deutschland";}s:5:"state";a:0:{}s:4:"user";a:33:{s:2:"id";s:1:"3";s:6:"userID";s:1:"3";s:8:"password";s:60:"$2y$10$AzjwzOob83DJ2LG6yxXcBeghK9ciBB1zsK3UeBZADZCl10pTQN62W";s:7:"encoder";s:6:"bcrypt";s:5:"email";s:14:"xy@example.org";s:6:"active";s:1:"1";s:11:"accountmode";s:1:"0";s:15:"confirmationkey";s:0:"";s:9:"paymentID";s:1:"5";s:10:"firstlogin";s:10:"2017-08-07";s:9:"lastlogin";s:19:"2017-08-07 14:09:20";s:9:"sessionID";s:26:"hkkhfl82i1jejfvd2f0ucr6om4";s:10:"newsletter";i:0;s:10:"validation";s:0:"";s:9:"affiliate";s:1:"0";s:13:"customergroup";s:2:"EK";s:13:"paymentpreset";s:1:"0";s:8:"language";s:1:"1";s:9:"subshopID";s:1:"1";s:7:"referer";s:0:"";s:12:"pricegroupID";N;s:15:"internalcomment";s:0:"";s:12:"failedlogins";s:1:"0";s:11:"lockeduntil";N;s:26:"default_billing_address_id";s:1:"5";s:27:"default_shipping_address_id";s:1:"5";s:5:"title";N;s:10:"salutation";s:2:"mr";s:9:"firstname";s:3:"Max";s:8:"lastname";s:10:"Mustermann";s:8:"birthday";N;s:14:"customernumber";s:5:"20005";s:11:"login_token";s:38:"1239c089-6b2f-4461-9134-c02026970bff.1";}s:15:"countryShipping";a:15:{s:2:"id";s:1:"2";s:11:"countryname";s:11:"Deutschland";s:10:"countryiso";s:2:"DE";s:6:"areaID";s:1:"1";s:9:"countryen";s:7:"GERMANY";s:8:"position";s:1:"1";s:6:"notice";s:0:"";s:7:"taxfree";s:1:"0";s:13:"taxfree_ustid";s:1:"0";s:21:"taxfree_ustid_checked";s:1:"0";s:6:"active";s:1:"1";s:4:"iso3";s:3:"DEU";s:29:"display_state_in_registration";s:1:"0";s:27:"force_state_in_registration";s:1:"0";s:11:"countryarea";s:11:"deutschland";}s:13:"stateShipping";a:0:{}s:7:"payment";a:21:{s:2:"id";s:1:"5";s:4:"name";s:10:"prepayment";s:11:"description";s:8:"Vorkasse";s:8:"template";s:14:"prepayment.tpl";s:5:"class";s:14:"prepayment.php";s:5:"table";s:0:"";s:4:"hide";s:1:"0";s:21:"additionaldescription";s:108:"Sie zahlen einfach vorab und erhalten die Ware bequem und günstig bei Zahlungseingang nach Hause geliefert.";s:13:"debit_percent";s:1:"0";s:9:"surcharge";s:1:"0";s:15:"surchargestring";s:0:"";s:8:"position";s:1:"1";s:6:"active";s:1:"1";s:9:"esdactive";s:1:"0";s:11:"embediframe";s:0:"";s:12:"hideprospect";s:1:"0";s:6:"action";N;s:8:"pluginID";N;s:6:"source";N;s:15:"mobile_inactive";s:1:"0";s:10:"validation";a:0:{}}s:10:"charge_vat";b:1;s:8:"show_net";b:1;}s:9:"sTaxRates";a:1:{s:5:"19.00";d:5.0800000000000001;}s:14:"sShippingCosts";s:8:"3,90 EUR";s:7:"sAmount";s:9:"31,85 EUR";s:14:"sAmountNumeric";d:31.850000000000001;s:10:"sAmountNet";s:9:"26,77 EUR";s:17:"sAmountNetNumeric";d:26.77;s:12:"sOrderNumber";i:20003;s:9:"sOrderDay";s:10:"07.08.2017";s:10:"sOrderTime";s:5:"14:09";s:8:"sComment";s:0:"";s:10:"attributes";a:6:{s:10:"attribute1";N;s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}s:9:"sCurrency";s:3:"EUR";s:9:"sLanguage";i:1;s:8:"sSubShop";i:1;s:4:"sEsd";N;s:4:"sNet";b:0;s:13:"sPaymentTable";a:0:{}s:9:"sDispatch";a:10:{s:2:"id";s:1:"9";s:4:"name";s:16:"Standard Versand";s:11:"description";s:0:"";s:11:"calculation";s:1:"1";s:11:"status_link";s:0:"";s:21:"surcharge_calculation";s:1:"3";s:17:"bind_shippingfree";s:1:"0";s:12:"shippingfree";N;s:15:"tax_calculation";s:1:"0";s:21:"tax_calculation_value";N;}}' 
+        `context` = 'a:22:{s:13:"sOrderDetails";a:2:{i:0;a:54:{s:2:"id";s:3:"670";s:9:"sessionID";s:26:"hkkhfl82i1jejfvd2f0ucr6om4";s:6:"userID";s:1:"0";s:11:"articlename";s:11:"ELASTIC CAP";s:9:"articleID";s:3:"152";s:11:"ordernumber";s:7:"SW10153";s:12:"shippingfree";s:1:"0";s:8:"quantity";s:1:"1";s:5:"price";s:5:"29,95";s:8:"netprice";s:15:"25.168067226891";s:8:"tax_rate";s:2:"19";s:5:"datum";s:19:"2017-08-07 14:09:12";s:5:"modus";s:1:"0";s:10:"esdarticle";s:1:"0";s:9:"partnerID";s:0:"";s:12:"lastviewport";s:8:"register";s:9:"useragent";s:76:"Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:54.0) Gecko/20100101 Firefox/54.0";s:6:"config";s:0:"";s:14:"currencyFactor";s:1:"1";s:8:"packunit";s:0:"";s:12:"mainDetailId";s:3:"707";s:15:"articleDetailId";s:3:"708";s:11:"minpurchase";s:1:"1";s:5:"taxID";s:1:"1";s:7:"instock";s:2:"12";s:14:"suppliernumber";s:0:"";s:11:"maxpurchase";s:3:"100";s:13:"purchasesteps";i:1;s:12:"purchaseunit";N;s:9:"laststock";s:1:"0";s:12:"shippingtime";s:0:"";s:11:"releasedate";N;s:12:"sReleaseDate";N;s:3:"ean";s:0:"";s:8:"stockmin";s:1:"0";s:8:"ob_attr1";s:0:"";s:8:"ob_attr2";N;s:8:"ob_attr3";N;s:8:"ob_attr4";N;s:8:"ob_attr5";N;s:8:"ob_attr6";N;s:12:"shippinginfo";b:1;s:3:"esd";s:1:"0";s:18:"additional_details";a:94:{s:9:"articleID";i:152;s:16:"articleDetailsID";i:708;s:11:"ordernumber";s:9:"SW10152.1";s:9:"highlight";b:0;s:11:"description";s:0:"";s:16:"description_long";s:2404:"<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo.</p><p>Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue.</p>  <p>Curabitur ullamcorper ultricies nisi. Nam eget dui. Etiam rhoncus. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel, luctus pulvinar, hendrerit id, lorem. Maecenas nec odio et ante tincidunt tempus. Donec vitae sapien ut libero venenatis faucibus. Nullam quis ante. Etiam sit amet orci eget eros faucibus tincidunt.</p> <p>Duis leo. Sed fringilla mauris sit amet nibh. Donec sodales sagittis magna. Sed consequat, leo eget bibendum sodales, augue velit cursus nunc, quis gravida magna mi a libero. Fusce vulputate eleifend sapien. Vestibulum purus quam, scelerisque ut, mollis sed, nonummy id, metus. Nullam accumsan lorem in dui. Cras ultricies mi eu turpis hendrerit fringilla.</p> <p>Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; In ac dui quis mi consectetuer lacinia. Nam pretium turpis et arcu. Duis arcu tortor, suscipit eget, imperdiet nec, imperdiet iaculis, ipsum. Sed aliquam ultrices mauris. Integer ante arcu, accumsan a, consectetuer eget, posuere ut, mauris. Praesent adipiscing. Phasellus ullamcorper ipsum rutrum nunc. Nunc nonummy metus. Vestibulum volutpat pretium libero. Cras id dui. Aenean ut eros et nisl sagittis vestibulum. Nullam nulla eros, ultricies sit amet, nonummy id, imperdiet feugiat, pede. Sed lectus. Donec mollis hendrerit risus. Phasellus nec sem in justo pellentesque facilisis. Etiam imperdiet imperdiet orci. Nunc nec neque. Phasellus leo dolor, tempus non, auctor et, hendrerit quis, nisi.</p>";s:3:"esd";b:0;s:11:"articleName";s:23:"WINDSTOPPER MÜTZE WARM";s:5:"taxID";i:1;s:3:"tax";i:19;s:7:"instock";i:12;s:11:"isAvailable";b:1;s:6:"weight";i:0;s:12:"shippingtime";N;s:16:"pricegroupActive";b:0;s:12:"pricegroupID";N;s:6:"length";i:0;s:6:"height";i:0;s:5:"width";i:0;s:9:"laststock";b:0;s:14:"additionaltext";s:0:"";s:5:"datum";s:10:"2015-02-05";s:5:"sales";i:0;s:13:"filtergroupID";i:8;s:17:"priceStartingFrom";N;s:18:"pseudopricePercent";N;s:15:"sVariantArticle";N;s:13:"sConfigurator";b:1;s:9:"metaTitle";s:0:"";s:12:"shippingfree";b:0;s:14:"suppliernumber";s:0:"";s:12:"notification";b:0;s:3:"ean";s:0:"";s:8:"keywords";s:0:"";s:12:"sReleasedate";s:0:"";s:8:"template";s:0:"";s:10:"attributes";a:2:{s:4:"core";a:23:{s:2:"id";s:3:"720";s:9:"articleID";s:3:"152";s:16:"articledetailsID";s:3:"708";s:5:"attr1";s:0:"";s:5:"attr2";s:0:"";s:5:"attr3";s:0:"";s:5:"attr4";s:0:"";s:5:"attr5";s:0:"";s:5:"attr6";s:0:"";s:5:"attr7";s:0:"";s:5:"attr8";s:0:"";s:5:"attr9";s:0:"";s:6:"attr10";s:0:"";s:6:"attr11";s:0:"";s:6:"attr12";s:0:"";s:6:"attr13";s:0:"";s:6:"attr14";s:0:"";s:6:"attr15";s:0:"";s:6:"attr16";s:0:"";s:6:"attr17";N;s:6:"attr18";s:0:"";s:6:"attr19";s:0:"";s:6:"attr20";s:0:"";}s:9:"marketing";a:4:{s:5:"isNew";b:0;s:11:"isTopSeller";b:0;s:10:"comingSoon";b:0;s:7:"storage";a:0:{}}}s:17:"allowBuyInListing";b:0;s:5:"attr1";s:0:"";s:5:"attr2";s:0:"";s:5:"attr3";s:0:"";s:5:"attr4";s:0:"";s:5:"attr5";s:0:"";s:5:"attr6";s:0:"";s:5:"attr7";s:0:"";s:5:"attr8";s:0:"";s:5:"attr9";s:0:"";s:6:"attr10";s:0:"";s:6:"attr11";s:0:"";s:6:"attr12";s:0:"";s:6:"attr13";s:0:"";s:6:"attr14";s:0:"";s:6:"attr15";s:0:"";s:6:"attr16";s:0:"";s:6:"attr17";N;s:6:"attr18";s:0:"";s:6:"attr19";s:0:"";s:6:"attr20";s:0:"";s:12:"supplierName";s:8:"LÖFFLER";s:11:"supplierImg";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:10:"supplierID";i:10;s:19:"supplierDescription";s:1267:"<p>L&Ouml;FFLER ist anders. Denn anders als die meisten Mitbewerber hat sich L&Ouml;FFLER schon Anfang der 1990er Jahre entschieden, auch weiterhin in &Ouml;sterreich zu produzieren. Nat&uuml;rlich nach h&ouml;chsten ethischen und &ouml;kologischen Standards, wie sie nur in &Ouml;sterreich bzw. in der Europ&auml;ischen Union gelten. Mit gut ausgebildeten, kompetenten und motivierten Mitarbeiterinnen und Mitarbeitern.</p>  <p>Viele Sportswear-Konzerne haben im Streben nach h&ouml;chsten Gewinnmargen ihre Fertigung l&auml;ngst in Billiglohnl&auml;nder verlagert. Miserable Arbeitsbedingungen, Hungerl&ouml;hne und Kinderarbeit sind dort immer wieder an der Tagesordnung. H&ouml;chst fragw&uuml;rdig sind auch die Umweltzerst&ouml;rung durch r&uuml;cksichtslose Produktionsmethoden und die hohe Schadstoffbelastung der auf diese Weise hergestellten Textilien.</p> <p>70 Prozent aller Stoffe, die L&Ouml;FFLER verarbeitet, kommen aus der eigenen Strickerei in Ried im Innkreis. Das ist einzigartig - und eine wichtige Grundlage f&uuml;r die herausragende Qualit&auml;t, die Fair Sportswear von L&Ouml;FFLER auszeichnet.</p> <p>Weitere Informationen zu dem Hersteller finden Sie <a title="www.loeffler.at" href="http://www.loeffler.at/" target="_blank">hier</a>.</p>";s:19:"supplier_attributes";a:0:{}s:10:"newArticle";b:0;s:9:"sUpcoming";b:0;s:9:"topseller";b:0;s:7:"valFrom";i:1;s:5:"valTo";N;s:4:"from";i:1;s:2:"to";N;s:5:"price";s:5:"29,95";s:11:"pseudoprice";s:1:"0";s:14:"referenceprice";N;s:15:"has_pseudoprice";b:0;s:13:"price_numeric";d:29.949999999999999;s:19:"pseudoprice_numeric";i:0;s:16:"price_attributes";a:0:{}s:10:"pricegroup";s:2:"EK";s:11:"minpurchase";i:1;s:11:"maxpurchase";s:3:"100";s:13:"purchasesteps";i:1;s:12:"purchaseunit";N;s:13:"referenceunit";N;s:8:"packunit";s:0:"";s:6:"unitID";N;s:5:"sUnit";a:2:{s:4:"unit";N;s:11:"description";N;}s:15:"unit_attributes";a:0:{}s:5:"image";a:12:{s:2:"id";i:366;s:8:"position";N;s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:11:"description";s:0:"";s:9:"extension";s:3:"jpg";s:4:"main";b:0;s:8:"parentId";N;s:5:"width";i:1492;s:6:"height";i:1500;s:10:"thumbnails";a:3:{i:0;a:6:{s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:12:"retinaSource";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:9:"sourceSet";s:141:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg, https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg 2x";s:8:"maxWidth";s:3:"200";s:9:"maxHeight";s:3:"200";s:10:"attributes";a:0:{}}i:1;a:6:{s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:12:"retinaSource";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:9:"sourceSet";s:141:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg, https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg 2x";s:8:"maxWidth";s:3:"600";s:9:"maxHeight";s:3:"600";s:10:"attributes";a:0:{}}i:2;a:6:{s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:12:"retinaSource";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:9:"sourceSet";s:141:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg, https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg 2x";s:8:"maxWidth";s:4:"1280";s:9:"maxHeight";s:4:"1280";s:10:"attributes";a:0:{}}}s:10:"attributes";a:0:{}s:9:"attribute";a:0:{}}s:6:"prices";a:1:{i:0;a:22:{s:7:"valFrom";i:1;s:5:"valTo";N;s:4:"from";i:1;s:2:"to";N;s:5:"price";s:5:"29,95";s:11:"pseudoprice";s:1:"0";s:14:"referenceprice";s:1:"0";s:18:"pseudopricePercent";N;s:15:"has_pseudoprice";b:0;s:13:"price_numeric";d:29.949999999999999;s:19:"pseudoprice_numeric";i:0;s:16:"price_attributes";a:0:{}s:10:"pricegroup";s:2:"EK";s:11:"minpurchase";i:1;s:11:"maxpurchase";s:3:"100";s:13:"purchasesteps";i:1;s:12:"purchaseunit";N;s:13:"referenceunit";N;s:8:"packunit";s:0:"";s:6:"unitID";N;s:5:"sUnit";a:2:{s:4:"unit";N;s:11:"description";N;}s:15:"unit_attributes";a:0:{}}}s:10:"linkBasket";s:42:"shopware.php?sViewport=basket&sAdd=SW10153";s:11:"linkDetails";s:42:"shopware.php?sViewport=detail&sArticle=152";s:11:"linkVariant";s:57:"shopware.php?sViewport=detail&sArticle=152&number=SW10153";s:11:"sProperties";a:3:{i:1;a:11:{s:2:"id";i:1;s:8:"optionID";i:1;s:4:"name";s:10:"Artikeltyp";s:7:"groupID";i:8;s:9:"groupName";s:7:"Fashion";s:5:"value";s:16:"Bildkonfigurator";s:6:"values";a:1:{i:4;s:16:"Bildkonfigurator";}s:12:"isFilterable";b:1;s:7:"options";a:1:{i:0;a:3:{s:2:"id";i:4;s:4:"name";s:16:"Bildkonfigurator";s:10:"attributes";a:0:{}}}s:5:"media";a:0:{}s:10:"attributes";a:0:{}}i:3;a:11:{s:2:"id";i:3;s:8:"optionID";i:3;s:4:"name";s:8:"Material";s:7:"groupID";i:8;s:9:"groupName";s:7:"Fashion";s:5:"value";s:20:"Polyester, Baumwolle";s:6:"values";a:2:{i:108;s:9:"Polyester";i:163;s:9:"Baumwolle";}s:12:"isFilterable";b:1;s:7:"options";a:2:{i:0;a:3:{s:2:"id";i:108;s:4:"name";s:9:"Polyester";s:10:"attributes";a:0:{}}i:1;a:3:{s:2:"id";i:163;s:4:"name";s:9:"Baumwolle";s:10:"attributes";a:0:{}}}s:5:"media";a:0:{}s:10:"attributes";a:0:{}}i:18;a:11:{s:2:"id";i:18;s:8:"optionID";i:18;s:4:"name";s:5:"Farbe";s:7:"groupID";i:8;s:9:"groupName";s:7:"Fashion";s:5:"value";s:12:"Rot, Schwarz";s:6:"values";a:2:{i:166;s:3:"Rot";i:155;s:7:"Schwarz";}s:12:"isFilterable";b:1;s:7:"options";a:2:{i:0;a:3:{s:2:"id";i:166;s:4:"name";s:3:"Rot";s:10:"attributes";a:0:{}}i:1;a:3:{s:2:"id";i:155;s:4:"name";s:7:"Schwarz";s:10:"attributes";a:0:{}}}s:5:"media";a:2:{i:166;a:13:{s:7:"valueId";i:166;s:2:"id";i:355;s:8:"position";N;s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:11:"description";s:3:"rot";s:9:"extension";s:3:"jpg";s:4:"main";N;s:8:"parentId";N;s:5:"width";i:40;s:6:"height";i:40;s:10:"thumbnails";a:0:{}s:10:"attributes";a:0:{}s:9:"attribute";a:0:{}}i:155;a:13:{s:7:"valueId";i:155;s:2:"id";i:357;s:8:"position";N;s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:11:"description";s:7:"schwarz";s:9:"extension";s:3:"jpg";s:4:"main";N;s:8:"parentId";N;s:5:"width";i:40;s:6:"height";i:40;s:10:"thumbnails";a:0:{}s:10:"attributes";a:0:{}s:9:"attribute";a:0:{}}}s:10:"attributes";a:0:{}}}s:10:"properties";s:106:"Artikeltyp:&nbsp;Bildkonfigurator,&nbsp;Material:&nbsp;Polyester, Baumwolle,&nbsp;Farbe:&nbsp;Rot, Schwarz";}s:6:"amount";s:5:"29,95";s:9:"amountnet";s:5:"25,17";s:12:"priceNumeric";s:5:"29.95";s:5:"image";a:15:{s:2:"id";i:366;s:8:"position";N;s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:11:"description";s:0:"";s:9:"extension";s:3:"jpg";s:4:"main";b:0;s:8:"parentId";N;s:5:"width";i:1492;s:6:"height";i:1500;s:10:"thumbnails";a:3:{i:0;a:6:{s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:12:"retinaSource";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:9:"sourceSet";s:141:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg, https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg 2x";s:8:"maxWidth";s:3:"200";s:9:"maxHeight";s:3:"200";s:10:"attributes";a:0:{}}i:1;a:6:{s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:12:"retinaSource";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:9:"sourceSet";s:141:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg, https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg 2x";s:8:"maxWidth";s:3:"600";s:9:"maxHeight";s:3:"600";s:10:"attributes";a:0:{}}i:2;a:6:{s:6:"source";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:12:"retinaSource";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";s:9:"sourceSet";s:141:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg, https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg 2x";s:8:"maxWidth";s:4:"1280";s:9:"maxHeight";s:4:"1280";s:10:"attributes";a:0:{}}}s:10:"attributes";a:0:{}s:9:"attribute";a:0:{}s:3:"src";a:4:{s:8:"original";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";i:0;s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";i:1;s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";i:2;s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";}s:5:"srchd";a:4:{s:8:"original";s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";i:0;s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";i:1;s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";i:2;s:68:"https://www.shopwaredemo.de/media/image/e3/46/f9/SW10153_200x200.jpg";}s:3:"res";a:1:{s:8:"original";a:2:{s:5:"width";i:1500;s:6:"height";i:1492;}}}s:11:"linkDetails";s:42:"shopware.php?sViewport=detail&sArticle=152";s:10:"linkDelete";s:41:"shopware.php?sViewport=basket&sDelete=670";s:8:"linkNote";s:40:"shopware.php?sViewport=note&sAdd=SW10153";s:3:"tax";s:4:"4,78";s:13:"orderDetailId";s:3:"208";s:10:"attributes";a:6:{s:10:"attribute1";s:0:"";s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}}i:1;a:52:{s:2:"id";s:3:"673";s:9:"sessionID";s:26:"hkkhfl82i1jejfvd2f0ucr6om4";s:6:"userID";s:1:"0";s:11:"articlename";s:15:"Warenkorbrabatt";s:9:"articleID";s:1:"0";s:11:"ordernumber";s:16:"SHIPPINGDISCOUNT";s:12:"shippingfree";s:1:"0";s:8:"quantity";s:1:"1";s:5:"price";s:5:"-2,00";s:8:"netprice";s:5:"-1.68";s:8:"tax_rate";s:2:"19";s:5:"datum";s:19:"2017-08-07 14:09:20";s:5:"modus";s:1:"4";s:10:"esdarticle";s:1:"0";s:9:"partnerID";s:0:"";s:12:"lastviewport";s:0:"";s:9:"useragent";s:0:"";s:6:"config";s:0:"";s:14:"currencyFactor";s:1:"1";s:8:"packunit";N;s:12:"mainDetailId";N;s:15:"articleDetailId";N;s:11:"minpurchase";i:1;s:5:"taxID";N;s:7:"instock";N;s:14:"suppliernumber";N;s:11:"maxpurchase";s:3:"100";s:13:"purchasesteps";i:1;s:12:"purchaseunit";N;s:9:"laststock";N;s:12:"shippingtime";N;s:11:"releasedate";N;s:12:"sReleaseDate";N;s:3:"ean";N;s:8:"stockmin";N;s:8:"ob_attr1";N;s:8:"ob_attr2";N;s:8:"ob_attr3";N;s:8:"ob_attr4";N;s:8:"ob_attr5";N;s:8:"ob_attr6";N;s:12:"shippinginfo";b:0;s:3:"esd";s:1:"0";s:6:"amount";s:5:"-2,00";s:9:"amountnet";s:5:"-1,68";s:12:"priceNumeric";s:2:"-2";s:11:"linkDetails";s:40:"shopware.php?sViewport=detail&sArticle=0";s:10:"linkDelete";s:41:"shopware.php?sViewport=basket&sDelete=673";s:8:"linkNote";s:49:"shopware.php?sViewport=note&sAdd=SHIPPINGDISCOUNT";s:3:"tax";s:5:"-0,32";s:13:"orderDetailId";s:3:"209";s:10:"attributes";a:6:{s:10:"attribute1";N;s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}}}s:14:"billingaddress";a:26:{s:2:"id";s:1:"5";s:7:"company";s:0:"";s:10:"department";s:0:"";s:10:"salutation";s:2:"mr";s:9:"firstname";s:3:"Max";s:5:"title";s:0:"";s:8:"lastname";s:10:"Mustermann";s:6:"street";s:15:"Musterstraße 1";s:7:"zipcode";s:5:"12345";s:4:"city";s:11:"Musterstadt";s:5:"phone";s:0:"";s:5:"vatId";s:0:"";s:22:"additionalAddressLine1";s:0:"";s:22:"additionalAddressLine2";s:0:"";s:9:"countryId";s:1:"2";s:7:"stateId";s:0:"";s:8:"customer";N;s:7:"country";N;s:5:"state";s:0:"";s:6:"userID";s:1:"3";s:9:"countryID";s:1:"2";s:7:"stateID";s:0:"";s:5:"ustid";s:0:"";s:24:"additional_address_line1";s:0:"";s:24:"additional_address_line2";s:0:"";s:10:"attributes";N;}s:15:"shippingaddress";a:26:{s:2:"id";s:1:"5";s:7:"company";s:0:"";s:10:"department";s:0:"";s:10:"salutation";s:2:"mr";s:9:"firstname";s:3:"Max";s:5:"title";s:0:"";s:8:"lastname";s:10:"Mustermann";s:6:"street";s:15:"Musterstraße 1";s:7:"zipcode";s:5:"12345";s:4:"city";s:11:"Musterstadt";s:5:"phone";s:0:"";s:5:"vatId";s:0:"";s:22:"additionalAddressLine1";s:0:"";s:22:"additionalAddressLine2";s:0:"";s:9:"countryId";s:1:"2";s:7:"stateId";s:0:"";s:8:"customer";N;s:7:"country";N;s:5:"state";s:0:"";s:6:"userID";s:1:"3";s:9:"countryID";s:1:"2";s:7:"stateID";s:0:"";s:5:"ustid";s:0:"";s:24:"additional_address_line1";s:0:"";s:24:"additional_address_line2";s:0:"";s:10:"attributes";N;}s:10:"additional";a:8:{s:7:"country";a:15:{s:2:"id";s:1:"2";s:11:"countryname";s:11:"Deutschland";s:10:"countryiso";s:2:"DE";s:6:"areaID";s:1:"1";s:9:"countryen";s:7:"GERMANY";s:8:"position";s:1:"1";s:6:"notice";s:0:"";s:7:"taxfree";s:1:"0";s:13:"taxfree_ustid";s:1:"0";s:21:"taxfree_ustid_checked";s:1:"0";s:6:"active";s:1:"1";s:4:"iso3";s:3:"DEU";s:29:"display_state_in_registration";s:1:"0";s:27:"force_state_in_registration";s:1:"0";s:11:"countryarea";s:11:"deutschland";}s:5:"state";a:0:{}s:4:"user";a:33:{s:2:"id";s:1:"3";s:6:"userID";s:1:"3";s:8:"password";s:60:"$2y$10$AzjwzOob83DJ2LG6yxXcBeghK9ciBB1zsK3UeBZADZCl10pTQN62W";s:7:"encoder";s:6:"bcrypt";s:5:"email";s:14:"xy@example.org";s:6:"active";s:1:"1";s:11:"accountmode";s:1:"0";s:15:"confirmationkey";s:0:"";s:9:"paymentID";s:1:"5";s:10:"firstlogin";s:10:"2017-08-07";s:9:"lastlogin";s:19:"2017-08-07 14:09:20";s:9:"sessionID";s:26:"hkkhfl82i1jejfvd2f0ucr6om4";s:10:"newsletter";i:0;s:10:"validation";s:0:"";s:9:"affiliate";s:1:"0";s:13:"customergroup";s:2:"EK";s:13:"paymentpreset";s:1:"0";s:8:"language";s:1:"1";s:9:"subshopID";s:1:"1";s:7:"referer";s:0:"";s:12:"pricegroupID";N;s:15:"internalcomment";s:0:"";s:12:"failedlogins";s:1:"0";s:11:"lockeduntil";N;s:26:"default_billing_address_id";s:1:"5";s:27:"default_shipping_address_id";s:1:"5";s:5:"title";N;s:10:"salutation";s:2:"mr";s:9:"firstname";s:3:"Max";s:8:"lastname";s:10:"Mustermann";s:8:"birthday";N;s:14:"customernumber";s:5:"20005";s:11:"login_token";s:38:"1239c089-6b2f-4461-9134-c02026970bff.1";}s:15:"countryShipping";a:15:{s:2:"id";s:1:"2";s:11:"countryname";s:11:"Deutschland";s:10:"countryiso";s:2:"DE";s:6:"areaID";s:1:"1";s:9:"countryen";s:7:"GERMANY";s:8:"position";s:1:"1";s:6:"notice";s:0:"";s:7:"taxfree";s:1:"0";s:13:"taxfree_ustid";s:1:"0";s:21:"taxfree_ustid_checked";s:1:"0";s:6:"active";s:1:"1";s:4:"iso3";s:3:"DEU";s:29:"display_state_in_registration";s:1:"0";s:27:"force_state_in_registration";s:1:"0";s:11:"countryarea";s:11:"deutschland";}s:13:"stateShipping";a:0:{}s:7:"payment";a:21:{s:2:"id";s:1:"5";s:4:"name";s:10:"prepayment";s:11:"description";s:8:"Vorkasse";s:8:"template";s:14:"prepayment.tpl";s:5:"class";s:14:"prepayment.php";s:5:"table";s:0:"";s:4:"hide";s:1:"0";s:21:"additionaldescription";s:108:"Sie zahlen einfach vorab und erhalten die Ware bequem und günstig bei Zahlungseingang nach Hause geliefert.";s:13:"debit_percent";s:1:"0";s:9:"surcharge";s:1:"0";s:15:"surchargestring";s:0:"";s:8:"position";s:1:"1";s:6:"active";s:1:"1";s:9:"esdactive";s:1:"0";s:11:"embediframe";s:0:"";s:12:"hideprospect";s:1:"0";s:6:"action";N;s:8:"pluginID";N;s:6:"source";N;s:15:"mobile_inactive";s:1:"0";s:10:"validation";a:0:{}}s:10:"charge_vat";b:1;s:8:"show_net";b:1;}s:9:"sTaxRates";a:1:{s:5:"19.00";d:5.0800000000000001;}s:14:"sShippingCosts";s:8:"3,90 EUR";s:7:"sAmount";s:9:"31,85 EUR";s:14:"sAmountNumeric";d:31.850000000000001;s:10:"sAmountNet";s:9:"26,77 EUR";s:17:"sAmountNetNumeric";d:26.77;s:12:"sOrderNumber";i:20003;s:9:"sOrderDay";s:10:"07.08.2017";s:10:"sOrderTime";s:5:"14:09";s:8:"sComment";s:0:"";s:10:"attributes";a:6:{s:10:"attribute1";N;s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}s:9:"sCurrency";s:3:"EUR";s:9:"sLanguage";i:1;s:8:"sSubShop";i:1;s:4:"sEsd";N;s:4:"sNet";b:0;s:13:"sPaymentTable";a:0:{}s:9:"sDispatch";a:10:{s:2:"id";s:1:"9";s:4:"name";s:16:"Standard Versand";s:11:"description";s:0:"";s:11:"calculation";s:1:"1";s:11:"status_link";s:0:"";s:21:"surcharge_calculation";s:1:"3";s:17:"bind_shippingfree";s:1:"0";s:12:"shippingfree";N;s:15:"tax_calculation";s:1:"0";s:21:"tax_calculation_value";N;}}'
         WHERE `s_core_config_mails`.`name` = 'sORDER' AND `s_core_config_mails`.`dirty` = 0 AND `content` LIKE '%Informationen zu Ihrer Bestellung%';
 EOD;
 
@@ -310,7 +310,7 @@ private function updateEmailTemplates()
     {if $sComment}
         <div style="border: 2px solid black; border-radius: 5px; padding: 5px;"><p>{$sComment}</p></div><br/>
     {/if}
-    
+
     {include file="string:{config name=emailfooterhtml}"}
 </div>',`ishtml` = 1,`attachment` = '',`mailtype` = 2,`context` = 'a:4:{s:5:"sName";s:11:"Peter Meyer";s:8:"sArticle";s:10:"Blumenvase";s:5:"sLink";s:31:"http://shopware.example/test123";s:8:"sComment";s:36:"Hey Peter - das musst du dir ansehen";}'
 WHERE `s_core_config_mails`.`name` = 'sTELLAFRIEND' AND `s_core_config_mails`.`dirty` = 0 AND `content` LIKE '%dass Sie sich anschauen sollten%';
@@ -418,7 +418,7 @@ private function updateEmailTemplates()
 UPDATE `s_core_config_mails` SET `frommail` = '{config name=mail}',`fromname` = '{config name=shopName}',`subject` = 'Ihre abgebrochene Bestellung - Jetzt Feedback geben und Gutschein kassieren',`content` = '{include file="string:{config name=emailheaderplain}"}
 
 Hallo,
- 
+
 Sie haben vor kurzem Ihre Bestellung auf {$sShop} nicht bis zum Ende durchgeführt - wir sind stets bemüht unseren Kunden das Einkaufen in unserem Shop so angenehm wie möglich zu machen und würden deshalb gerne wissen, woran Ihr Einkauf bei uns gescheitert ist. Bitte lassen Sie uns doch den Grund für Ihren Bestellabbruch zukommen, Ihren Aufwand entschädigen wir Ihnen in jedem Fall mit einem 5,00 € Gutschein.
 Vielen Dank für Ihre Unterstützung.
 
@@ -439,7 +439,7 @@ private function updateEmailTemplates()
 UPDATE `s_core_config_mails` SET `frommail` = '{config name=mail}',`fromname` = '{config name=shopName}',`subject` = 'Ihre abgebrochene Bestellung - Gutschein-Code anbei',`content` = '{include file="string:{config name=emailheaderplain}"}
 
 Hallo,
- 
+
 Sie haben vor kurzem Ihre Bestellung bei {$sShop} nicht bis zum Ende durchgeführt - wir möchten Ihnen heute einen {if $sVoucherpercental == "1"}{$sVouchervalue} %{else}{$sVouchervalue|currency|unescape:"htmlall"}{/if} Gutschein zukommen lassen - und Ihnen hiermit die Bestell-Entscheidung bei {$sShop} erleichtern. Ihr Gutschein ist 2 Monate gültig und kann mit dem Code "{$sVouchercode}" eingelöst werden. Wir würden uns freuen, Ihre Bestellung entgegen nehmen zu dürfen.
 
 {include file="string:{config name=emailfooterplain}"}',`contentHTML` = '<div style="font-family:arial; font-size:12px;">
@@ -451,7 +451,7 @@ private function updateEmailTemplates()
          Sie haben vor kurzem Ihre Bestellung bei {$sShop} nicht bis zum Ende durchgeführt - wir möchten Ihnen heute einen {if $sVoucherpercental == "1"}{$sVouchervalue} %{else}{$sVouchervalue|currency}{/if} Gutschein zukommen lassen - und Ihnen hiermit die Bestell-Entscheidung bei {$sShop} erleichtern. Ihr Gutschein ist 2 Monate gültig und kann mit dem Code "<strong>{$sVouchercode}</strong>" eingelöst werden. Wir würden uns freuen, Ihre Bestellung entgegen nehmen zu dürfen.
     </p>
     {include file="string:{config name=emailfooterhtml}"}
-</div>',`ishtml` = 1,`attachment` = '',`mailtype` = 2,`context` = 'a:5:{s:12:"sVouchercode";s:8:"23A7BCA4";s:13:"sVouchervalue";i:15;s:15:"sVouchervalidto";N;s:17:"sVouchervalidfrom";N;s:17:"sVoucherpercental";i:0;}' 
+</div>',`ishtml` = 1,`attachment` = '',`mailtype` = 2,`context` = 'a:5:{s:12:"sVouchercode";s:8:"23A7BCA4";s:13:"sVouchervalue";i:15;s:15:"sVouchervalidto";N;s:17:"sVouchervalidfrom";N;s:17:"sVoucherpercental";i:0;}'
 
 WHERE `s_core_config_mails`.`name` = 'sCANCELEDVOUCHER' AND `s_core_config_mails`.`dirty` = 0 AND `content` LIKE '%Ihnen hiermit die Bestell-Entscheidung%';
 EOD;
@@ -773,7 +773,7 @@ private function updateEmailTemplates()
             <td bgcolor="#F7F7F2" style="border-bottom:1px solid #cccccc;"><strong>Artikelname</strong></td>
             <td bgcolor="#F7F7F2" style="border-bottom:1px solid #cccccc;"><strong>Bestand/Mindestbestand</strong></td>
         </tr>
-    
+
         {foreach from=$sJob.articles item=sArticle key=key}
             <tr>
                 <td>{$sArticle.ordernumber}</td>
@@ -876,7 +876,7 @@ private function updateEmailTemplates()
         <a href="{$sArticleLink}">{$sOrdernumber}</a>
     </p>
     {include file="string:{config name=emailfooterhtml}"}
-</div>',`ishtml` = 1,`attachment` = '',`mailtype` = 2,`context` = 'a:3:{s:12:"sArticleLink";s:70:"http://shopware.example/genusswelten/koestlichkeiten/272/spachtelmasse";s:12:"sOrdernumber";s:7:"SW10239";s:5:"sData";N;}' 
+</div>',`ishtml` = 1,`attachment` = '',`mailtype` = 2,`context` = 'a:3:{s:12:"sArticleLink";s:70:"http://shopware.example/genusswelten/koestlichkeiten/272/spachtelmasse";s:12:"sOrdernumber";s:7:"SW10239";s:5:"sData";N;}'
 WHERE `s_core_config_mails`.`name` = 'sARTICLEAVAILABLE' AND `s_core_config_mails`.`dirty` = 0 AND `content` LIKE '%Ihr Artikel mit der Bestellnummer%';
 EOD;
 
@@ -1102,7 +1102,7 @@ private function updateEmailTemplates()
             </tr>
             {/foreach}
         </table>
-    <p>    
+    <p>
         <br/>
         Versandkosten: {$sOrder.invoice_shipping|string_format:"%.2f"} {$sOrder.currency}<br/>
         Netto-Gesamt: {$sOrder.invoice_amount_net|string_format:"%.2f"} {$sOrder.currency}<br/>
@@ -1186,7 +1186,7 @@ private function updateEmailTemplates()
         Den aktuellen Status Ihrer Bestellung können Sie auch jederzeit auf unserer Webseite im  Bereich "Mein Konto" - "Meine Bestellungen" abrufen. Sollten Sie allerdings den Kauf ohne Registrierung, also ohne Anlage eines Kundenkontos, gewählt haben, steht Ihnen diese Möglichkeit nicht zur Verfügung.
     </p>
     {include file="string:{config name=emailfooterhtml}"}
-</div>',`ishtml` = 1,`attachment` = '',`mailtype` = 3,`context` = 'a:4:{s:6:"sOrder";a:40:{s:7:"orderID";s:2:"59";s:11:"ordernumber";s:5:"20003";s:12:"order_number";s:5:"20003";s:6:"userID";s:1:"3";s:10:"customerID";s:1:"3";s:14:"invoice_amount";s:5:"31.85";s:18:"invoice_amount_net";s:5:"26.77";s:16:"invoice_shipping";s:3:"3.9";s:20:"invoice_shipping_net";s:4:"3.28";s:9:"ordertime";s:19:"2017-08-07 14:09:26";s:6:"status";s:1:"6";s:8:"statusID";s:1:"6";s:7:"cleared";s:2:"17";s:9:"clearedID";s:2:"17";s:9:"paymentID";s:1:"5";s:13:"transactionID";s:0:"";s:7:"comment";s:0:"";s:15:"customercomment";s:0:"";s:3:"net";s:1:"0";s:5:"netto";s:1:"0";s:9:"partnerID";s:0:"";s:11:"temporaryID";s:0:"";s:7:"referer";s:0:"";s:11:"cleareddate";N;s:12:"cleared_date";N;s:12:"trackingcode";s:0:"";s:8:"language";s:1:"1";s:8:"currency";s:3:"EUR";s:14:"currencyFactor";s:1:"1";s:9:"subshopID";s:1:"1";s:10:"dispatchID";s:1:"9";s:10:"currencyID";s:1:"1";s:12:"cleared_name";s:4:"open";s:19:"cleared_description";s:5:"Offen";s:11:"status_name";s:19:"partially_delivered";s:18:"status_description";s:22:"Teilweise ausgeliefert";s:19:"payment_description";s:8:"Vorkasse";s:20:"dispatch_description";s:16:"Standard Versand";s:20:"currency_description";s:4:"Euro";s:10:"attributes";a:6:{s:10:"attribute1";N;s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}}s:13:"sOrderDetails";a:2:{i:0;a:20:{s:14:"orderdetailsID";s:3:"208";s:7:"orderID";s:2:"59";s:11:"ordernumber";s:5:"20003";s:9:"articleID";s:3:"152";s:18:"articleordernumber";s:9:"SW10152.1";s:5:"price";s:5:"29.95";s:8:"quantity";s:1:"1";s:7:"invoice";s:5:"29.95";s:4:"name";s:31:"WINDSTOPPER MÜTZE WARM Schwarz";s:6:"status";s:1:"0";s:7:"shipped";s:1:"0";s:12:"shippedgroup";s:1:"0";s:11:"releasedate";s:10:"0000-00-00";s:5:"modus";s:1:"0";s:10:"esdarticle";s:1:"0";s:5:"taxID";s:1:"1";s:3:"tax";s:5:"19.00";s:8:"tax_rate";s:2:"19";s:3:"esd";s:1:"0";s:10:"attributes";a:6:{s:10:"attribute1";s:0:"";s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}}i:1;a:20:{s:14:"orderdetailsID";s:3:"209";s:7:"orderID";s:2:"59";s:11:"ordernumber";s:5:"20003";s:9:"articleID";s:1:"0";s:18:"articleordernumber";s:16:"SHIPPINGDISCOUNT";s:5:"price";s:2:"-2";s:8:"quantity";s:1:"1";s:7:"invoice";s:2:"-2";s:4:"name";s:15:"Warenkorbrabatt";s:6:"status";s:1:"0";s:7:"shipped";s:1:"0";s:12:"shippedgroup";s:1:"0";s:11:"releasedate";s:10:"0000-00-00";s:5:"modus";s:1:"4";s:10:"esdarticle";s:1:"0";s:5:"taxID";s:1:"0";s:3:"tax";N;s:8:"tax_rate";s:2:"19";s:3:"esd";s:1:"0";s:10:"attributes";a:6:{s:10:"attribute1";N;s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}}}s:5:"sUser";a:82:{s:15:"billing_company";s:0:"";s:18:"billing_department";s:0:"";s:18:"billing_salutation";s:2:"mr";s:14:"customernumber";s:5:"20005";s:17:"billing_firstname";s:3:"Max";s:16:"billing_lastname";s:10:"Mustermann";s:14:"billing_street";s:15:"Musterstraße 1";s:32:"billing_additional_address_line1";s:0:"";s:32:"billing_additional_address_line2";s:0:"";s:15:"billing_zipcode";s:5:"12345";s:12:"billing_city";s:11:"Musterstadt";s:5:"phone";s:0:"";s:13:"billing_phone";s:0:"";s:17:"billing_countryID";s:1:"2";s:15:"billing_stateID";N;s:15:"billing_country";s:11:"Deutschland";s:18:"billing_countryiso";s:2:"DE";s:19:"billing_countryarea";s:11:"deutschland";s:17:"billing_countryen";s:7:"GERMANY";s:5:"ustid";s:0:"";s:13:"billing_text1";N;s:13:"billing_text2";N;s:13:"billing_text3";N;s:13:"billing_text4";N;s:13:"billing_text5";N;s:13:"billing_text6";N;s:7:"orderID";s:2:"59";s:16:"shipping_company";s:0:"";s:19:"shipping_department";s:0:"";s:19:"shipping_salutation";s:2:"mr";s:18:"shipping_firstname";s:3:"Max";s:17:"shipping_lastname";s:10:"Mustermann";s:15:"shipping_street";s:15:"Musterstraße 1";s:33:"shipping_additional_address_line1";s:0:"";s:33:"shipping_additional_address_line2";s:0:"";s:16:"shipping_zipcode";s:5:"12345";s:13:"shipping_city";s:11:"Musterstadt";s:16:"shipping_stateID";N;s:18:"shipping_countryID";s:1:"2";s:16:"shipping_country";s:11:"Deutschland";s:19:"shipping_countryiso";s:2:"DE";s:20:"shipping_countryarea";s:11:"deutschland";s:18:"shipping_countryen";s:7:"GERMANY";s:14:"shipping_text1";N;s:14:"shipping_text2";N;s:14:"shipping_text3";N;s:14:"shipping_text4";N;s:14:"shipping_text5";N;s:14:"shipping_text6";N;s:2:"id";s:1:"3";s:8:"password";s:60:"$2y$10$AzjwzOob83DJ2LG6yxXcBeghK9ciBB1zsK3UeBZADZCl10pTQN62W";s:7:"encoder";s:6:"bcrypt";s:5:"email";s:14:"xy@example.org";s:6:"active";s:1:"1";s:11:"accountmode";s:1:"0";s:15:"confirmationkey";s:0:"";s:9:"paymentID";s:1:"5";s:10:"firstlogin";s:10:"2017-08-07";s:9:"lastlogin";s:19:"2017-08-07 14:09:26";s:9:"sessionID";s:26:"hkkhfl82i1jejfvd2f0ucr6om4";s:10:"newsletter";s:1:"0";s:10:"validation";s:0:"";s:9:"affiliate";s:1:"0";s:13:"customergroup";s:2:"EK";s:13:"paymentpreset";s:1:"0";s:8:"language";s:1:"1";s:9:"subshopID";s:1:"1";s:7:"referer";s:0:"";s:12:"pricegroupID";N;s:15:"internalcomment";s:0:"";s:12:"failedlogins";s:1:"0";s:11:"lockeduntil";N;s:26:"default_billing_address_id";s:1:"5";s:27:"default_shipping_address_id";s:1:"5";s:5:"title";N;s:10:"salutation";s:2:"mr";s:9:"firstname";s:3:"Max";s:8:"lastname";s:10:"Mustermann";s:8:"birthday";N;s:11:"login_token";s:38:"1239c089-6b2f-4461-9134-c02026970bff.1";s:11:"preisgruppe";s:1:"1";s:11:"billing_net";s:1:"1";}s:9:"sDispatch";a:2:{s:4:"name";s:16:"Standard Versand";s:11:"description";s:0:"";}}' 
+</div>',`ishtml` = 1,`attachment` = '',`mailtype` = 3,`context` = 'a:4:{s:6:"sOrder";a:40:{s:7:"orderID";s:2:"59";s:11:"ordernumber";s:5:"20003";s:12:"order_number";s:5:"20003";s:6:"userID";s:1:"3";s:10:"customerID";s:1:"3";s:14:"invoice_amount";s:5:"31.85";s:18:"invoice_amount_net";s:5:"26.77";s:16:"invoice_shipping";s:3:"3.9";s:20:"invoice_shipping_net";s:4:"3.28";s:9:"ordertime";s:19:"2017-08-07 14:09:26";s:6:"status";s:1:"6";s:8:"statusID";s:1:"6";s:7:"cleared";s:2:"17";s:9:"clearedID";s:2:"17";s:9:"paymentID";s:1:"5";s:13:"transactionID";s:0:"";s:7:"comment";s:0:"";s:15:"customercomment";s:0:"";s:3:"net";s:1:"0";s:5:"netto";s:1:"0";s:9:"partnerID";s:0:"";s:11:"temporaryID";s:0:"";s:7:"referer";s:0:"";s:11:"cleareddate";N;s:12:"cleared_date";N;s:12:"trackingcode";s:0:"";s:8:"language";s:1:"1";s:8:"currency";s:3:"EUR";s:14:"currencyFactor";s:1:"1";s:9:"subshopID";s:1:"1";s:10:"dispatchID";s:1:"9";s:10:"currencyID";s:1:"1";s:12:"cleared_name";s:4:"open";s:19:"cleared_description";s:5:"Offen";s:11:"status_name";s:19:"partially_delivered";s:18:"status_description";s:22:"Teilweise ausgeliefert";s:19:"payment_description";s:8:"Vorkasse";s:20:"dispatch_description";s:16:"Standard Versand";s:20:"currency_description";s:4:"Euro";s:10:"attributes";a:6:{s:10:"attribute1";N;s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}}s:13:"sOrderDetails";a:2:{i:0;a:20:{s:14:"orderdetailsID";s:3:"208";s:7:"orderID";s:2:"59";s:11:"ordernumber";s:5:"20003";s:9:"articleID";s:3:"152";s:18:"articleordernumber";s:9:"SW10152.1";s:5:"price";s:5:"29.95";s:8:"quantity";s:1:"1";s:7:"invoice";s:5:"29.95";s:4:"name";s:31:"WINDSTOPPER MÜTZE WARM Schwarz";s:6:"status";s:1:"0";s:7:"shipped";s:1:"0";s:12:"shippedgroup";s:1:"0";s:11:"releasedate";s:10:"0000-00-00";s:5:"modus";s:1:"0";s:10:"esdarticle";s:1:"0";s:5:"taxID";s:1:"1";s:3:"tax";s:5:"19.00";s:8:"tax_rate";s:2:"19";s:3:"esd";s:1:"0";s:10:"attributes";a:6:{s:10:"attribute1";s:0:"";s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}}i:1;a:20:{s:14:"orderdetailsID";s:3:"209";s:7:"orderID";s:2:"59";s:11:"ordernumber";s:5:"20003";s:9:"articleID";s:1:"0";s:18:"articleordernumber";s:16:"SHIPPINGDISCOUNT";s:5:"price";s:2:"-2";s:8:"quantity";s:1:"1";s:7:"invoice";s:2:"-2";s:4:"name";s:15:"Warenkorbrabatt";s:6:"status";s:1:"0";s:7:"shipped";s:1:"0";s:12:"shippedgroup";s:1:"0";s:11:"releasedate";s:10:"0000-00-00";s:5:"modus";s:1:"4";s:10:"esdarticle";s:1:"0";s:5:"taxID";s:1:"0";s:3:"tax";N;s:8:"tax_rate";s:2:"19";s:3:"esd";s:1:"0";s:10:"attributes";a:6:{s:10:"attribute1";N;s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}}}s:5:"sUser";a:82:{s:15:"billing_company";s:0:"";s:18:"billing_department";s:0:"";s:18:"billing_salutation";s:2:"mr";s:14:"customernumber";s:5:"20005";s:17:"billing_firstname";s:3:"Max";s:16:"billing_lastname";s:10:"Mustermann";s:14:"billing_street";s:15:"Musterstraße 1";s:32:"billing_additional_address_line1";s:0:"";s:32:"billing_additional_address_line2";s:0:"";s:15:"billing_zipcode";s:5:"12345";s:12:"billing_city";s:11:"Musterstadt";s:5:"phone";s:0:"";s:13:"billing_phone";s:0:"";s:17:"billing_countryID";s:1:"2";s:15:"billing_stateID";N;s:15:"billing_country";s:11:"Deutschland";s:18:"billing_countryiso";s:2:"DE";s:19:"billing_countryarea";s:11:"deutschland";s:17:"billing_countryen";s:7:"GERMANY";s:5:"ustid";s:0:"";s:13:"billing_text1";N;s:13:"billing_text2";N;s:13:"billing_text3";N;s:13:"billing_text4";N;s:13:"billing_text5";N;s:13:"billing_text6";N;s:7:"orderID";s:2:"59";s:16:"shipping_company";s:0:"";s:19:"shipping_department";s:0:"";s:19:"shipping_salutation";s:2:"mr";s:18:"shipping_firstname";s:3:"Max";s:17:"shipping_lastname";s:10:"Mustermann";s:15:"shipping_street";s:15:"Musterstraße 1";s:33:"shipping_additional_address_line1";s:0:"";s:33:"shipping_additional_address_line2";s:0:"";s:16:"shipping_zipcode";s:5:"12345";s:13:"shipping_city";s:11:"Musterstadt";s:16:"shipping_stateID";N;s:18:"shipping_countryID";s:1:"2";s:16:"shipping_country";s:11:"Deutschland";s:19:"shipping_countryiso";s:2:"DE";s:20:"shipping_countryarea";s:11:"deutschland";s:18:"shipping_countryen";s:7:"GERMANY";s:14:"shipping_text1";N;s:14:"shipping_text2";N;s:14:"shipping_text3";N;s:14:"shipping_text4";N;s:14:"shipping_text5";N;s:14:"shipping_text6";N;s:2:"id";s:1:"3";s:8:"password";s:60:"$2y$10$AzjwzOob83DJ2LG6yxXcBeghK9ciBB1zsK3UeBZADZCl10pTQN62W";s:7:"encoder";s:6:"bcrypt";s:5:"email";s:14:"xy@example.org";s:6:"active";s:1:"1";s:11:"accountmode";s:1:"0";s:15:"confirmationkey";s:0:"";s:9:"paymentID";s:1:"5";s:10:"firstlogin";s:10:"2017-08-07";s:9:"lastlogin";s:19:"2017-08-07 14:09:26";s:9:"sessionID";s:26:"hkkhfl82i1jejfvd2f0ucr6om4";s:10:"newsletter";s:1:"0";s:10:"validation";s:0:"";s:9:"affiliate";s:1:"0";s:13:"customergroup";s:2:"EK";s:13:"paymentpreset";s:1:"0";s:8:"language";s:1:"1";s:9:"subshopID";s:1:"1";s:7:"referer";s:0:"";s:12:"pricegroupID";N;s:15:"internalcomment";s:0:"";s:12:"failedlogins";s:1:"0";s:11:"lockeduntil";N;s:26:"default_billing_address_id";s:1:"5";s:27:"default_shipping_address_id";s:1:"5";s:5:"title";N;s:10:"salutation";s:2:"mr";s:9:"firstname";s:3:"Max";s:8:"lastname";s:10:"Mustermann";s:8:"birthday";N;s:11:"login_token";s:38:"1239c089-6b2f-4461-9134-c02026970bff.1";s:11:"preisgruppe";s:1:"1";s:11:"billing_net";s:1:"1";}s:9:"sDispatch";a:2:{s:4:"name";s:16:"Standard Versand";s:11:"description";s:0:"";}}'
 WHERE `s_core_config_mails`.`name` = 'sORDERSTATEMAIL6' AND `s_core_config_mails`.`dirty` = 0 AND `content` LIKE '%Bestellstatus für Ihre Bestellung%';
 EOD;
 
@@ -1219,9 +1219,9 @@ private function updateEmailTemplates()
 UPDATE `s_core_config_mails` SET `frommail` = '{config name=mail}',`fromname` = '{config name=shopName}',`subject` = 'Herzlichen Glückwunsch zum Geburtstag von {config name=shopName}',`content` = '{include file="string:{config name=emailheaderplain}"}
 
 Hallo {$sUser.salutation|salutation} {$sUser.lastname},
- 
+
 Alles Gute zum Geburtstag. Zu Ihrem persönlichen Jubiläum haben wir uns etwas Besonderes ausgedacht, wir senden Ihnen hiermit einen Geburtstagscode über {if $sVoucher.value}{$sVoucher.value|currency|unescape:"htmlall"}{else}{$sVoucher.percental} %{/if}, den Sie bei Ihrer nächsten Bestellung in unserem Online-Shop: {$sShopURL} ganz einfach einlösen können.
- 
+
 Ihr persönlicher Geburtstags-Code lautet: {$sVoucher.code}
 {if $sVoucher.valid_from && $sVoucher.valid_to}Dieser Code ist gültig vom {$sVoucher.valid_from|date_format:"%d.%m.%Y"} bis zum {$sVoucher.valid_to|date_format:"%d.%m.%Y"}.{/if}
 {if $sVoucher.valid_from && !$sVoucher.valid_to}Dieser Code ist gültig ab dem {$sVoucher.valid_from|date_format:"%d.%m.%Y"}.{/if}
@@ -1238,9 +1238,9 @@ private function updateEmailTemplates()
  	{if $sVoucher.valid_from && !$sVoucher.valid_to}Dieser Code ist gültig ab dem {$sVoucher.valid_from|date_format:"%d.%m.%Y"}.{/if}
  	{if !$sVoucher.valid_from && $sVoucher.valid_to}Dieser Code ist gültig bis zum {$sVoucher.valid_to|date_format:"%d.%m.%Y"}.{/if}
 </p>
- 
+
     {include file="string:{config name=emailfooterhtml}"}
-</div>',`ishtml` = 1,`attachment` = '',`mailtype` = 2,`context` = 'a:3:{s:5:"sUser";a:28:{s:6:"userID";s:1:"1";s:7:"company";s:11:"Muster GmbH";s:10:"department";N;s:10:"salutation";s:2:"mr";s:14:"customernumber";s:5:"20001";s:9:"firstname";s:3:"Max";s:8:"lastname";s:10:"Mustermann";s:6:"street";s:13:"Musterstr. 55";s:7:"zipcode";s:5:"55555";s:4:"city";s:12:"Musterhausen";s:5:"phone";s:14:"05555 / 555555";s:9:"countryID";s:1:"2";s:5:"ustid";N;s:5:"text1";N;s:5:"text2";N;s:5:"text3";N;s:5:"text4";N;s:5:"text5";N;s:5:"text6";N;s:5:"email";s:16:"test@example.com";s:9:"paymentID";s:1:"5";s:10:"firstlogin";s:10:"2011-11-23";s:9:"lastlogin";s:19:"2012-01-04 14:12:05";s:10:"newsletter";s:1:"0";s:9:"affiliate";s:1:"0";s:13:"customergroup";s:2:"EK";s:8:"language";s:1:"1";s:9:"subshopID";s:1:"1";}s:8:"sVoucher";a:6:{s:13:"vouchercodeID";s:3:"201";s:4:"code";s:8:"0B818118";s:5:"value";s:1:"5";s:9:"percental";s:1:"0";s:8:"valid_to";s:10:"2017-12-31";s:10:"valid_from";s:10:"2017-10-22";}s:5:"sData";N;}' 
+</div>',`ishtml` = 1,`attachment` = '',`mailtype` = 2,`context` = 'a:3:{s:5:"sUser";a:28:{s:6:"userID";s:1:"1";s:7:"company";s:11:"Muster GmbH";s:10:"department";N;s:10:"salutation";s:2:"mr";s:14:"customernumber";s:5:"20001";s:9:"firstname";s:3:"Max";s:8:"lastname";s:10:"Mustermann";s:6:"street";s:13:"Musterstr. 55";s:7:"zipcode";s:5:"55555";s:4:"city";s:12:"Musterhausen";s:5:"phone";s:14:"05555 / 555555";s:9:"countryID";s:1:"2";s:5:"ustid";N;s:5:"text1";N;s:5:"text2";N;s:5:"text3";N;s:5:"text4";N;s:5:"text5";N;s:5:"text6";N;s:5:"email";s:16:"test@example.com";s:9:"paymentID";s:1:"5";s:10:"firstlogin";s:10:"2011-11-23";s:9:"lastlogin";s:19:"2012-01-04 14:12:05";s:10:"newsletter";s:1:"0";s:9:"affiliate";s:1:"0";s:13:"customergroup";s:2:"EK";s:8:"language";s:1:"1";s:9:"subshopID";s:1:"1";}s:8:"sVoucher";a:6:{s:13:"vouchercodeID";s:3:"201";s:4:"code";s:8:"0B818118";s:5:"value";s:1:"5";s:9:"percental";s:1:"0";s:8:"valid_to";s:10:"2017-12-31";s:10:"valid_from";s:10:"2017-10-22";}s:5:"sData";N;}'
 WHERE `s_core_config_mails`.`name` = 'sBIRTHDAY' AND `s_core_config_mails`.`dirty` = 0 AND `content` LIKE '%Ihnen alles Gute zum Geburtstag.%';
 EOD;
 
@@ -1321,7 +1321,7 @@ private function updateEmailTemplates()
 WHERE `s_core_config_mails`.`name` = 'sORDERDOCUMENTS' AND `dirty` = 0 AND `content` LIKE '%Im Anhang finden Sie Dokumente zu Ihrer Bestellung als PDF%';
 EOD;
 
-        //English
+        // English
         $sql .= <<<'EOD'
 UPDATE `s_core_config_mails` SET `subject` = 'Your registration by {config name=shopName}', `content`='{include file="string:{config name=emailheaderplain}"}
 
@@ -1450,7 +1450,7 @@ private function updateEmailTemplates()
             <td style="border-bottom:1px solid #cccccc;">{$details.amount|padding:8|currency}</td>
         </tr>
         {/foreach}
-        
+
     </table>
 
     <p>
@@ -1558,7 +1558,7 @@ private function updateEmailTemplates()
     {if $sComment}
         <div style="border: 2px solid black; border-radius: 5px; padding: 5px;"><p>{$sComment}</p></div><br/>
     {/if}
-    
+
     {include file="string:{config name=emailfooterhtml}"}
 </div>',`ishtml` = 1,`attachment` = '',`mailtype` = 2,
 `context` = 'a:5:{s:7:"sConfig";a:0:{}s:5:"sName";s:8:"John Doe";s:8:"sArticle";s:11:"Elastic Cap";s:5:"sLink";s:39:"http://shopware.example/elastic-cap-153";s:8:"sComment";s:26:"Hey Jane - this is amazing";}'
@@ -1570,7 +1570,7 @@ private function updateEmailTemplates()
 
 Hello,
 
-there is no additional free serial numbers available for the article 
+there is no additional free serial numbers available for the article
 
 {$sArticleName}.
 
@@ -1943,7 +1943,7 @@ private function updateEmailTemplates()
     {include file="string:{config name=emailfooterhtml}"}
 </div>',`ishtml` = 1,`attachment` = '',`mailtype` = 3,
 `context` = 'a:4:{s:6:"sOrder";a:40:{s:7:"orderID";s:2:"62";s:11:"ordernumber";s:5:"20004";s:12:"order_number";s:5:"20004";s:6:"userID";s:1:"4";s:10:"customerID";s:1:"4";s:14:"invoice_amount";s:5:"16.85";s:18:"invoice_amount_net";s:5:"14.16";s:16:"invoice_shipping";s:3:"3.9";s:20:"invoice_shipping_net";s:4:"3.28";s:9:"ordertime";s:19:"2017-10-30 08:49:06";s:6:"status";s:1:"0";s:8:"statusID";s:1:"0";s:7:"cleared";s:2:"17";s:9:"clearedID";s:2:"17";s:9:"paymentID";s:1:"5";s:13:"transactionID";s:0:"";s:7:"comment";s:0:"";s:15:"customercomment";s:0:"";s:3:"net";s:1:"0";s:5:"netto";s:1:"0";s:9:"partnerID";s:0:"";s:11:"temporaryID";s:0:"";s:7:"referer";s:0:"";s:11:"cleareddate";N;s:12:"cleared_date";N;s:12:"trackingcode";s:0:"";s:8:"language";s:1:"1";s:8:"currency";s:3:"EUR";s:14:"currencyFactor";s:1:"1";s:9:"subshopID";s:1:"1";s:10:"dispatchID";s:1:"9";s:10:"currencyID";s:1:"1";s:12:"cleared_name";s:4:"open";s:19:"cleared_description";s:4:"Open";s:11:"status_name";s:4:"open";s:18:"status_description";s:4:"Open";s:19:"payment_description";s:18:"Payment in advance";s:20:"dispatch_description";s:17:"Standard delivery";s:20:"currency_description";s:4:"Euro";s:10:"attributes";a:6:{s:10:"attribute1";N;s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}}s:13:"sOrderDetails";a:2:{i:0;a:20:{s:14:"orderdetailsID";s:3:"214";s:7:"orderID";s:2:"62";s:11:"ordernumber";s:5:"20004";s:9:"articleID";s:3:"153";s:18:"articleordernumber";s:7:"SW10153";s:5:"price";s:5:"14.95";s:8:"quantity";s:1:"1";s:7:"invoice";s:5:"14.95";s:4:"name";s:11:"ELASTIC CAP";s:6:"status";s:1:"0";s:7:"shipped";s:1:"0";s:12:"shippedgroup";s:1:"0";s:11:"releasedate";s:10:"0000-00-00";s:5:"modus";s:1:"0";s:10:"esdarticle";s:1:"0";s:5:"taxID";s:1:"1";s:3:"tax";s:5:"19.00";s:8:"tax_rate";s:2:"19";s:3:"esd";s:1:"0";s:10:"attributes";a:6:{s:10:"attribute1";s:0:"";s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}}i:1;a:20:{s:14:"orderdetailsID";s:3:"215";s:7:"orderID";s:2:"62";s:11:"ordernumber";s:5:"20004";s:9:"articleID";s:1:"0";s:18:"articleordernumber";s:16:"SHIPPINGDISCOUNT";s:5:"price";s:2:"-2";s:8:"quantity";s:1:"1";s:7:"invoice";s:2:"-2";s:4:"name";s:15:"Warenkorbrabatt";s:6:"status";s:1:"0";s:7:"shipped";s:1:"0";s:12:"shippedgroup";s:1:"0";s:11:"releasedate";s:10:"0000-00-00";s:5:"modus";s:1:"4";s:10:"esdarticle";s:1:"0";s:5:"taxID";s:1:"0";s:3:"tax";N;s:8:"tax_rate";s:2:"19";s:3:"esd";s:1:"0";s:10:"attributes";a:6:{s:10:"attribute1";N;s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}}}s:5:"sUser";a:82:{s:15:"billing_company";s:0:"";s:18:"billing_department";s:0:"";s:18:"billing_salutation";s:2:"mr";s:14:"customernumber";s:5:"20006";s:17:"billing_firstname";s:4:"John";s:16:"billing_lastname";s:3:"Doe";s:14:"billing_street";s:16:"Examplestreet 11";s:32:"billing_additional_address_line1";s:0:"";s:32:"billing_additional_address_line2";s:0:"";s:15:"billing_zipcode";s:4:"1234";s:12:"billing_city";s:11:"Examplecity";s:5:"phone";s:0:"";s:13:"billing_phone";s:0:"";s:17:"billing_countryID";s:1:"2";s:15:"billing_stateID";N;s:15:"billing_country";s:7:"Germany";s:18:"billing_countryiso";s:2:"DE";s:19:"billing_countryarea";s:7:"germany";s:17:"billing_countryen";s:7:"GERMANY";s:5:"ustid";s:0:"";s:13:"billing_text1";N;s:13:"billing_text2";N;s:13:"billing_text3";N;s:13:"billing_text4";N;s:13:"billing_text5";N;s:13:"billing_text6";N;s:7:"orderID";s:2:"62";s:16:"shipping_company";s:0:"";s:19:"shipping_department";s:0:"";s:19:"shipping_salutation";s:2:"mr";s:18:"shipping_firstname";s:4:"John";s:17:"shipping_lastname";s:3:"Doe";s:15:"shipping_street";s:16:"Examplestreet 11";s:33:"shipping_additional_address_line1";s:0:"";s:33:"shipping_additional_address_line2";s:0:"";s:16:"shipping_zipcode";s:4:"1234";s:13:"shipping_city";s:11:"Examplecity";s:16:"shipping_stateID";N;s:18:"shipping_countryID";s:1:"2";s:16:"shipping_country";s:7:"Germany";s:19:"shipping_countryiso";s:2:"DE";s:20:"shipping_countryarea";s:7:"germany";s:18:"shipping_countryen";s:7:"GERMANY";s:14:"shipping_text1";N;s:14:"shipping_text2";N;s:14:"shipping_text3";N;s:14:"shipping_text4";N;s:14:"shipping_text5";N;s:14:"shipping_text6";N;s:2:"id";s:1:"4";s:8:"password";s:60:"$2y$10$qcu486mGUDZ/qbUSJDi78uYwatm24dzQ/dCO79PVVP0MbGHJ0LLgq";s:7:"encoder";s:6:"bcrypt";s:5:"email";s:12:"xyz@mail.com";s:6:"active";s:1:"1";s:11:"accountmode";s:1:"0";s:15:"confirmationkey";s:0:"";s:9:"paymentID";s:1:"5";s:10:"firstlogin";s:10:"2017-10-30";s:9:"lastlogin";s:19:"2017-10-30 08:49:06";s:9:"sessionID";s:26:"e6b7aaevs8nvaobuejg2o3gpt4";s:10:"newsletter";s:1:"0";s:10:"validation";s:0:"";s:9:"affiliate";s:1:"0";s:13:"customergroup";s:2:"EK";s:13:"paymentpreset";s:1:"0";s:8:"language";s:1:"1";s:9:"subshopID";s:1:"1";s:7:"referer";s:0:"";s:12:"pricegroupID";N;s:15:"internalcomment";s:0:"";s:12:"failedlogins";s:1:"0";s:11:"lockeduntil";N;s:26:"default_billing_address_id";s:1:"6";s:27:"default_shipping_address_id";s:1:"6";s:5:"title";N;s:10:"salutation";s:2:"mr";s:9:"firstname";s:4:"John";s:8:"lastname";s:3:"Doe";s:8:"birthday";N;s:11:"login_token";s:38:"62c86dd9-a98d-46e7-9a85-612afff5cb7f.1";s:11:"preisgruppe";s:1:"1";s:11:"billing_net";s:1:"1";}s:9:"sDispatch";a:2:{s:4:"name";s:17:"Standard delivery";s:11:"description";s:0:"";}}'
-WHERE `s_core_config_mails`.`name` = 'sORDERSTATEMAIL17' AND `dirty` = 0 AND `content` LIKE '%But in case you have purchased without a registration or a customer account, you do not have this option.%'; 
+WHERE `s_core_config_mails`.`name` = 'sORDERSTATEMAIL17' AND `dirty` = 0 AND `content` LIKE '%But in case you have purchased without a registration or a customer account, you do not have this option.%';
 EOD;
 
         $sql .= <<<'EOD'
@@ -2029,7 +2029,7 @@ private function updateEmailTemplates()
 
         $sql .= <<<'EOD'
         UPDATE `s_core_config_mails` SET `frommail` = '{config name=mail}',`fromname` = '{config name=shopName}',`subject` = 'Stock level of {$sData.count} article{if $sData.count>1}s{/if} under minimum stock ',`content` = '{include file="string:{config name=emailheaderplain}"}
-        
+
 Hello,
 
 the following articles have undershot the minimum stock:
@@ -2053,7 +2053,7 @@ private function updateEmailTemplates()
             <td bgcolor="#F7F7F2" style="border-bottom:1px solid #cccccc;"><strong>Name of article</strong></td>
             <td bgcolor="#F7F7F2" style="border-bottom:1px solid #cccccc;"><strong>Stock/Minimum stock</strong></td>
         </tr>
-    
+
         {foreach from=$sJob.articles item=sArticle key=key}
             <tr>
               <td>{$sArticle.ordernumber}</td>
@@ -2146,7 +2146,7 @@ private function updateEmailTemplates()
 
         $sql .= <<<'EOD'
         UPDATE `s_core_config_mails` SET `frommail` = '{config name=mail}',`fromname` = '{config name=shopName}',`subject` = 'Your article is available again',`content` = '{include file="string:{config name=emailheaderplain}"}
-        
+
 Hello,
 
 your article with the order number {$sOrdernumber} is available again.
@@ -2413,7 +2413,7 @@ private function updateEmailTemplates()
         Net total: {$sOrder.invoice_amount_net|string_format:"%.2f"} {$sOrder.currency}<br/>
         Total amount incl. VAT: {$sOrder.invoice_amount|string_format:"%.2f"} {$sOrder.currency}<br/>
         <br/>
-    
+
         You can check the current status of your order on our website under "My account" - "My orders" anytime. But in case you have purchased without a registration or a customer account, you do not have this option.
     </p>
     {include file="string:{config name=emailfooterhtml}"}
@@ -2639,7 +2639,7 @@ private function updateEmailTemplates()
     {include file="string:{config name=emailfooterhtml}"}
 </div>',`ishtml` = 1,`attachment` = '',`mailtype` = 2,
 `context` = 'a:4:{s:6:"sOrder";a:40:{s:7:"orderID";s:2:"66";s:11:"ordernumber";s:5:"20006";s:12:"order_number";s:5:"20006";s:6:"userID";s:1:"4";s:10:"customerID";s:1:"4";s:14:"invoice_amount";s:5:"701.4";s:18:"invoice_amount_net";s:6:"589.42";s:16:"invoice_shipping";s:3:"3.9";s:20:"invoice_shipping_net";s:4:"3.28";s:9:"ordertime";s:19:"2017-10-29 10:00:08";s:6:"status";s:1:"2";s:8:"statusID";s:1:"2";s:7:"cleared";s:2:"12";s:9:"clearedID";s:2:"12";s:9:"paymentID";s:1:"5";s:13:"transactionID";s:0:"";s:7:"comment";s:0:"";s:15:"customercomment";s:0:"";s:3:"net";s:1:"0";s:5:"netto";s:1:"0";s:9:"partnerID";s:0:"";s:11:"temporaryID";s:0:"";s:7:"referer";s:0:"";s:11:"cleareddate";N;s:12:"cleared_date";N;s:12:"trackingcode";s:0:"";s:8:"language";s:1:"1";s:8:"currency";s:3:"EUR";s:14:"currencyFactor";s:1:"1";s:9:"subshopID";s:1:"1";s:10:"dispatchID";s:1:"9";s:10:"currencyID";s:1:"1";s:12:"cleared_name";s:15:"completely_paid";s:19:"cleared_description";s:15:"Completely paid";s:11:"status_name";s:9:"completed";s:18:"status_description";s:9:"Completed";s:19:"payment_description";s:18:"Payment in advance";s:20:"dispatch_description";s:17:"Standard delivery";s:20:"currency_description";s:4:"Euro";s:10:"attributes";a:6:{s:10:"attribute1";N;s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}}s:13:"sOrderDetails";a:2:{i:0;a:20:{s:14:"orderdetailsID";s:3:"222";s:7:"orderID";s:2:"66";s:11:"ordernumber";s:5:"20006";s:9:"articleID";s:3:"166";s:18:"articleordernumber";s:7:"SW10166";s:5:"price";s:5:"69.95";s:8:"quantity";s:2:"10";s:7:"invoice";s:5:"699.5";s:4:"name";s:12:"DIE ZEIT 100";s:6:"status";s:1:"0";s:7:"shipped";s:1:"0";s:12:"shippedgroup";s:1:"0";s:11:"releasedate";s:10:"0000-00-00";s:5:"modus";s:1:"0";s:10:"esdarticle";s:1:"0";s:5:"taxID";s:1:"1";s:3:"tax";s:5:"19.00";s:8:"tax_rate";s:2:"19";s:3:"esd";s:1:"0";s:10:"attributes";a:6:{s:10:"attribute1";s:0:"";s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}}i:1;a:20:{s:14:"orderdetailsID";s:3:"223";s:7:"orderID";s:2:"66";s:11:"ordernumber";s:5:"20006";s:9:"articleID";s:1:"0";s:18:"articleordernumber";s:16:"SHIPPINGDISCOUNT";s:5:"price";s:2:"-2";s:8:"quantity";s:1:"1";s:7:"invoice";s:2:"-2";s:4:"name";s:15:"Warenkorbrabatt";s:6:"status";s:1:"0";s:7:"shipped";s:1:"0";s:12:"shippedgroup";s:1:"0";s:11:"releasedate";s:10:"0000-00-00";s:5:"modus";s:1:"4";s:10:"esdarticle";s:1:"0";s:5:"taxID";s:1:"0";s:3:"tax";N;s:8:"tax_rate";s:2:"19";s:3:"esd";s:1:"0";s:10:"attributes";a:6:{s:10:"attribute1";N;s:10:"attribute2";N;s:10:"attribute3";N;s:10:"attribute4";N;s:10:"attribute5";N;s:10:"attribute6";N;}}}s:5:"sUser";a:82:{s:15:"billing_company";s:0:"";s:18:"billing_department";s:0:"";s:18:"billing_salutation";s:2:"mr";s:14:"customernumber";s:5:"20006";s:17:"billing_firstname";s:4:"John";s:16:"billing_lastname";s:3:"Doe";s:14:"billing_street";s:16:"Examplestreet 11";s:32:"billing_additional_address_line1";s:0:"";s:32:"billing_additional_address_line2";s:0:"";s:15:"billing_zipcode";s:4:"1234";s:12:"billing_city";s:11:"Examplecity";s:5:"phone";s:0:"";s:13:"billing_phone";s:0:"";s:17:"billing_countryID";s:1:"2";s:15:"billing_stateID";N;s:15:"billing_country";s:7:"Germany";s:18:"billing_countryiso";s:2:"DE";s:19:"billing_countryarea";s:7:"germany";s:17:"billing_countryen";s:7:"GERMANY";s:5:"ustid";s:0:"";s:13:"billing_text1";N;s:13:"billing_text2";N;s:13:"billing_text3";N;s:13:"billing_text4";N;s:13:"billing_text5";N;s:13:"billing_text6";N;s:7:"orderID";s:2:"66";s:16:"shipping_company";s:0:"";s:19:"shipping_department";s:0:"";s:19:"shipping_salutation";s:2:"mr";s:18:"shipping_firstname";s:4:"John";s:17:"shipping_lastname";s:3:"Doe";s:15:"shipping_street";s:16:"Examplestreet 11";s:33:"shipping_additional_address_line1";s:0:"";s:33:"shipping_additional_address_line2";s:0:"";s:16:"shipping_zipcode";s:4:"1234";s:13:"shipping_city";s:11:"Examplecity";s:16:"shipping_stateID";N;s:18:"shipping_countryID";s:1:"2";s:16:"shipping_country";s:7:"Germany";s:19:"shipping_countryiso";s:2:"DE";s:20:"shipping_countryarea";s:7:"germany";s:18:"shipping_countryen";s:7:"GERMANY";s:14:"shipping_text1";N;s:14:"shipping_text2";N;s:14:"shipping_text3";N;s:14:"shipping_text4";N;s:14:"shipping_text5";N;s:14:"shipping_text6";N;s:2:"id";s:1:"4";s:8:"password";s:60:"$2y$10$qcu486mGUDZ/qbUSJDi78uYwatm24dzQ/dCO79PVVP0MbGHJ0LLgq";s:7:"encoder";s:6:"bcrypt";s:5:"email";s:12:"xyz@mail.com";s:6:"active";s:1:"1";s:11:"accountmode";s:1:"0";s:15:"confirmationkey";s:0:"";s:9:"paymentID";s:1:"5";s:10:"firstlogin";s:10:"2017-10-30";s:9:"lastlogin";s:19:"2017-10-30 12:02:18";s:9:"sessionID";s:26:"mpmqj6qoro0pg3ua9u5hprh646";s:10:"newsletter";s:1:"0";s:10:"validation";s:1:"0";s:9:"affiliate";s:1:"0";s:13:"customergroup";s:2:"EK";s:13:"paymentpreset";s:1:"0";s:8:"language";s:1:"1";s:9:"subshopID";s:1:"1";s:7:"referer";s:0:"";s:12:"pricegroupID";N;s:15:"internalcomment";s:0:"";s:12:"failedlogins";s:1:"0";s:11:"lockeduntil";N;s:26:"default_billing_address_id";s:1:"6";s:27:"default_shipping_address_id";s:1:"6";s:5:"title";s:0:"";s:10:"salutation";s:2:"mr";s:9:"firstname";s:4:"John";s:8:"lastname";s:3:"Doe";s:8:"birthday";s:10:"2017-10-30";s:11:"login_token";s:38:"1f6f51a1-54c1-4db8-8b4f-fbe957f8b856.1";s:11:"preisgruppe";s:1:"1";s:11:"billing_net";s:1:"1";}s:9:"sDispatch";a:2:{s:4:"name";s:17:"Standard delivery";s:11:"description";s:0:"";}}'
-WHERE `s_core_config_mails`.`name` = 'sORDERDOCUMENTS' AND `dirty` = 0 AND `content` LIKE '%In the attachments of this E-Mail you will find the documents for your order in PDF format.%';    
+WHERE `s_core_config_mails`.`name` = 'sORDERDOCUMENTS' AND `dirty` = 0 AND `content` LIKE '%In the attachments of this E-Mail you will find the documents for your order in PDF format.%';
 EOD;
 
         // Move sORDERSEPAAUTHORIZATION to system mails
diff --git a/_sql/migrations/962-add-ordernumber-form-field.php b/_sql/migrations/962-add-ordernumber-form-field.php
index 24065ef2031..3f653f241bf 100644
--- a/_sql/migrations/962-add-ordernumber-form-field.php
+++ b/_sql/migrations/962-add-ordernumber-form-field.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Migrations_Migration962 extends Shopware\Components\Migrations\AbstractMigration
diff --git a/_sql/migrations/963-update-emotion-url-template.php b/_sql/migrations/963-update-emotion-url-template.php
index ef10410988d..0a2a64bc044 100644
--- a/_sql/migrations/963-update-emotion-url-template.php
+++ b/_sql/migrations/963-update-emotion-url-template.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
@@ -30,8 +30,8 @@ public function up($modus)
     {
         $template = serialize('{$campaign.name}');
         $this->addSql('SET @id = (SELECT `id` FROM `s_core_config_elements` WHERE `name`="routercampaigntemplate");');
-        $this->addSql(sprintf("UPDATE `s_core_config_elements` SET `value`='%s' WHERE `id`=@id AND md5(`value`)='bbd170aeaa1f52b8c372b32d8c853e9e'", $template));
-        $this->addSql(sprintf("UPDATE `s_core_config_values` SET `value`='%s' WHERE `element_id`=@id AND md5(`value`)='bbd170aeaa1f52b8c372b32d8c853e9e'", $template));
+        $this->addSql(\sprintf("UPDATE `s_core_config_elements` SET `value`='%s' WHERE `id`=@id AND md5(`value`)='bbd170aeaa1f52b8c372b32d8c853e9e'", $template));
+        $this->addSql(\sprintf("UPDATE `s_core_config_values` SET `value`='%s' WHERE `element_id`=@id AND md5(`value`)='bbd170aeaa1f52b8c372b32d8c853e9e'", $template));
         // 'bbd170aeaa1f52b8c372b32d8c853e9e' = md5('s:64:"{sCategoryPath categoryID=$campaign.categoryId}/{$campaign.name}";')
     }
 }
diff --git a/_sql/migrations/964-translate-slt-setting.php b/_sql/migrations/964-translate-slt-setting.php
index 49600e896ad..d93cb2b6909 100644
--- a/_sql/migrations/964-translate-slt-setting.php
+++ b/_sql/migrations/964-translate-slt-setting.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
diff --git a/_sql/migrations/965-add-album-garbage-collect-option.php b/_sql/migrations/965-add-album-garbage-collect-option.php
index ac17f51ff04..99ae26f842e 100644
--- a/_sql/migrations/965-add-album-garbage-collect-option.php
+++ b/_sql/migrations/965-add-album-garbage-collect-option.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Migrations\AbstractMigration;
diff --git a/_sql/migrations/common/AttributeTranslationMigrationHelper.php b/_sql/migrations/common/AttributeTranslationMigrationHelper.php
index 67c81c28680..d2f86e22205 100644
--- a/_sql/migrations/common/AttributeTranslationMigrationHelper.php
+++ b/_sql/migrations/common/AttributeTranslationMigrationHelper.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
@@ -34,9 +34,6 @@ class AttributeTranslationMigrationHelper
      */
     private $connection;
 
-    /**
-     * @param PDO $connection
-     */
     public function __construct(PDO $connection)
     {
         $this->connection = $connection;
@@ -44,6 +41,7 @@ public function __construct(PDO $connection)
 
     /**
      * @param int $maxCount
+     *
      * @return int
      */
     public function migrate($maxCount)
@@ -53,14 +51,14 @@ public function migrate($maxCount)
         $columns = $this->getColumns();
 
         $statement = $this->connection->prepare(
-<<<EOL
-          SELECT * 
-          FROM s_core_translations
-          WHERE objecttype IN ("article", "variantMain", "variant")
-          AND id > :lastId
-          AND id <= :maxId
-          ORDER BY id ASC
-          LIMIT 250
+            <<<EOL
+SELECT *
+FROM s_core_translations
+WHERE objecttype IN ("article", "variantMain", "variant")
+AND id > :lastId
+AND id <= :maxId
+ORDER BY id ASC
+LIMIT 250
 EOL
         );
 
@@ -88,7 +86,7 @@ public function migrate($maxCount)
             $lastId = array_pop($rows)['id'];
             $statement->execute([':lastId' => $lastId, ':maxId' => $maxId]);
 
-            $count += count($rows);
+            $count += \count($rows);
             if ($count > $maxCount) {
                 break;
             }
@@ -118,6 +116,7 @@ private function getColumns()
 
     /**
      * @param string $str
+     *
      * @return string
      */
     private function underscoreToCamelCase($str)
@@ -129,21 +128,21 @@ private function underscoreToCamelCase($str)
 
     /**
      * @param array $data
-     * @param array $columns
-     * @return null|array
+     *
+     * @return array|null
      */
     private function filter($data, array $columns)
     {
-        if (!is_array($data)) {
+        if (!\is_array($data)) {
             return null;
         }
 
         $updated = false;
         foreach ($columns as $key => $column) {
-            if (array_key_exists($key, $data)) {
+            if (\array_key_exists($key, $data)) {
                 $newKey = '__attribute_' . $column;
 
-                if (!array_key_exists($newKey, $data)) {
+                if (!\array_key_exists($newKey, $data)) {
                     $data[$newKey] = $data[$key];
                     $updated = true;
                 }
@@ -158,8 +157,9 @@ private function filter($data, array $columns)
     }
 
     /**
-     * @param array[] $rows
+     * @param array[]  $rows
      * @param string[] $columns
+     *
      * @return string[] indexed by translation id
      */
     private function getUpdatedTranslations($rows, $columns)
@@ -170,7 +170,7 @@ private function getUpdatedTranslations($rows, $columns)
             try {
                 $updated = $this->filter(unserialize($row['objectdata']), $columns);
             } catch (Exception $e) {
-                //serialize error - continue with next translation
+                // serialize error - continue with next translation
                 continue;
             }
 
diff --git a/_sql/migrations/common/MigrationHelper.php b/_sql/migrations/common/MigrationHelper.php
index 1345f91b769..22e1d8befae 100644
--- a/_sql/migrations/common/MigrationHelper.php
+++ b/_sql/migrations/common/MigrationHelper.php
@@ -1,38 +1,32 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class MigrationHelper
 {
-    /**
-     * @var \PDO
-     */
-    private $connection;
+    private PDO $connection;
 
-    /**
-     * @param \PDO $connection
-     */
-    public function __construct(\PDO $connection)
+    public function __construct(PDO $connection)
     {
         $this->connection = $connection;
     }
@@ -40,18 +34,18 @@ public function __construct(\PDO $connection)
     /**
      * @param string $table
      *
-     * @return array[]
+     * @return array<array{name: string, type: string}>
      */
     public function getList($table)
     {
         $identifiers = ['id', 'billingID', 'shippingID'];
 
-        $columns = $this->connection->query(sprintf('DESCRIBE `%s`', $table))->fetchAll(\PDO::FETCH_ASSOC);
+        $columns = $this->connection->query(\sprintf('DESCRIBE `%s`', $table))->fetchAll(PDO::FETCH_ASSOC);
 
         $definition = [];
 
         foreach ($columns as $column) {
-            if (in_array($column['Field'], $identifiers)) {
+            if (\in_array($column['Field'], $identifiers)) {
                 continue;
             }
             $definition[] = ['name' => $column['Field'], 'type' => $column['Type']];
@@ -64,6 +58,8 @@ public function getList($table)
      * @param string $table
      * @param string $name
      * @param string $type
+     *
+     * @return void
      */
     public function update($table, $name, $type)
     {
@@ -79,6 +75,8 @@ public function update($table, $name, $type)
     /**
      * @param string $table
      * @param string $keyColumn
+     *
+     * @return void
      */
     public function migrateAttributes($table, $keyColumn)
     {
@@ -113,39 +111,25 @@ public function migrateAttributes($table, $keyColumn)
         $this->connection->exec($sql);
     }
 
-    /**
-     * @param string $table
-     * @param string $name
-     * @param string $type
-     */
-    private function createColumn($table, $name, $type)
+    private function createColumn(string $table, string $name, string $type): void
     {
-        $sql = sprintf('ALTER TABLE `%s` ADD `%s` %s NULL DEFAULT NULL', $table, $name, $type);
+        $sql = \sprintf('ALTER TABLE `%s` ADD `%s` %s NULL DEFAULT NULL', $table, $name, $type);
         $this->connection->exec($sql);
     }
 
-    /**
-     * @param string $table
-     * @param string $name
-     * @param string $type
-     */
-    private function changeColumn($table, $name, $type)
+    private function changeColumn(string $table, string $name, string $type): void
     {
-        $sql = sprintf('ALTER TABLE `%s` CHANGE `%s` `%s` %s NULL DEFAULT NULL;', $table, $name, $name, $type);
+        $sql = \sprintf('ALTER TABLE `%s` CHANGE `%s` `%s` %s NULL DEFAULT NULL;', $table, $name, $name, $type);
         $this->connection->exec($sql);
     }
 
     /**
-     * @param string $table
-     * @param string $name
-     *
-     * @return null|array
+     * @return array{name: string, type: string}|null
      */
-    private function get($table, $name)
+    private function get(string $table, string $name): ?array
     {
-        $columns = $this->getList($table);
-        foreach ($columns as $column) {
-            if ($name == $column['name']) {
+        foreach ($this->getList($table) as $column) {
+            if ($name === $column['name']) {
                 return $column;
             }
         }
diff --git a/_sql/migrations/common/SitemapConfigMigrationHelper.php b/_sql/migrations/common/SitemapConfigMigrationHelper.php
index f11eb542b82..6e43b652f9c 100644
--- a/_sql/migrations/common/SitemapConfigMigrationHelper.php
+++ b/_sql/migrations/common/SitemapConfigMigrationHelper.php
@@ -1,41 +1,28 @@
-<?php declare(strict_types=1);
+<?php
 
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-use Shopware\Bundle\SitemapBundle\Provider\BlogUrlProvider;
-use Shopware\Bundle\SitemapBundle\Provider\CategoryUrlProvider;
-use Shopware\Bundle\SitemapBundle\Provider\LandingPageUrlProvider;
-use Shopware\Bundle\SitemapBundle\Provider\ManufacturerUrlProvider;
-use Shopware\Bundle\SitemapBundle\Provider\ProductUrlProvider;
-use Shopware\Bundle\SitemapBundle\Provider\StaticUrlProvider;
-use Shopware\Models\Article\Article;
-use Shopware\Models\Article\Supplier;
-use Shopware\Models\Blog\Blog;
-use Shopware\Models\Category\Category;
-use Shopware\Models\Emotion\Emotion;
-use Shopware\Models\Site\Site;
-
 class SitemapConfigMigrationHelper
 {
     /**
@@ -50,7 +37,7 @@ public function __construct(PDO $connection)
 
     public function migrate(): void
     {
-        $customConfigurationPath = dirname(__DIR__, 3) . '/config.php';
+        $customConfigurationPath = __DIR__ . '/../../../config.php';
 
         if (!file_exists($customConfigurationPath)) {
             return;
diff --git a/autoload.php b/autoload.php
index 5880ae6e1ad..fe714476295 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Composer\Autoload\ClassLoader;
diff --git a/bin/console b/bin/console
index 688a2356dca..3aabc1eff32 100755
--- a/bin/console
+++ b/bin/console
@@ -4,23 +4,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 set_time_limit(0);
diff --git a/build/behat.yml.dist b/build/behat.yml.dist
deleted file mode 100644
index bd43e046f1b..00000000000
--- a/build/behat.yml.dist
+++ /dev/null
@@ -1,57 +0,0 @@
-default:
-    extensions:
-        SensioLabs\Behat\PageObjectExtension:
-            namespaces:
-                page:
-                    - Shopware\Tests\Mink\Page
-                    - Shopware\Tests\Mink\Page\Backend
-                element:
-                    - Shopware\Tests\Mink\Element
-                    - Shopware\Tests\Mink\Element\Backend
-        Shopware\Behat\ShopwareExtension: ~
-        Behat\MinkExtension:
-            ## defined in buildscript
-            base_url: 'http://%sw.host%%sw.path%'
-            show_cmd: 'echo "Scenario failed! Saved current page to %s"'
-            show_tmp_dir: 'build/artifacts/mink'
-            show_auto: true
-            default_session: 'selenium2'
-            javascript_session: 'selenium2'
-            browser_name: chrome
-            selenium2:
-                wd_host: "http://selenium:4444/wd/hub"
-                capabilities:
-                    browser: chrome
-                    marionette: true
-                    extra_capabilities:
-                        chromeOptions:
-                            w3c: false
-
-    gherkin:
-      filters:
-        tags: ~@knownFailing
-
-    suites:
-        default:
-            paths:    [ "%paths.base%/features" ]
-            template: Responsive
-            contexts:
-                - Behat\MinkExtension\Context\MinkContext
-                - Shopware\Tests\Mink\FeatureContext
-                - Shopware\Tests\Mink\AccountContext
-                - Shopware\Tests\Mink\BlogContext
-                - Shopware\Tests\Mink\CheckoutContext
-                - Shopware\Tests\Mink\DetailContext
-                - Shopware\Tests\Mink\FormContext
-                - Shopware\Tests\Mink\ListingContext
-                - Shopware\Tests\Mink\NoteContext
-                - Shopware\Tests\Mink\SeoContext
-                - Shopware\Tests\Mink\ShopwareContext
-                - Shopware\Tests\Mink\SitemapContext
-                - Shopware\Tests\Mink\SpecialContext
-                - Shopware\Tests\Mink\TransformContext
-                - Shopware\Tests\Mink\SecurityContext
-                - Shopware\Tests\Mink\ExportContext
-                - Shopware\Tests\Mink\BackendContext
-                - Shopware\Tests\Mink\BackendContentTypeManagerContext
-                - Shopware\Tests\Mink\BackendCustomRecipesContext
diff --git a/build/build.xml b/build/build.xml
index 103124585d2..97a4b0fdc5d 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -19,37 +19,37 @@
     </target>
 
     <target name="build-continuous" depends="unit-shopware-continuous"/>
-    <target name="build-unit" depends="build-composer-install, build-cache-dir, build-database, build-snippets-deploy, build-theme-initialize,build-create-admin-account, build-install-lock-file, build-disable-firstrunwizard, install-git-hooks" />
+    <target name="build-unit" depends="build-composer-install, build-cache-dir, build-database, build-snippets-deploy, build-theme-initialize,build-create-admin-account, build-install-lock-file, build-disable-firstrunwizard, install-git-hooks"/>
     <target name="test-unit" depends="unit-shopware"/>
 
     <target name="write-properties" description="Write build-variables to file">
         <propertyfile file="${build.dir}/build.properties" comment="Project properties">
-            <entry  key="db.host"     value="${db.host}"/>
-            <entry  key="db.name"     value="${db.name}"/>
-            <entry  key="db.user"     value="${db.user}"/>
-            <entry  key="db.password" value="${db.password}"/>
-            <entry  key="db.port"     value="${db.port}"/>
-            <entry  key="app.path"    value="${app.path}"/>
-            <entry  key="app.host"    value="${app.host}"/>
+            <entry key="db.host" value="${db.host}"/>
+            <entry key="db.name" value="${db.name}"/>
+            <entry key="db.user" value="${db.user}"/>
+            <entry key="db.password" value="${db.password}"/>
+            <entry key="db.port" value="${db.port}"/>
+            <entry key="app.path" value="${app.path}"/>
+            <entry key="app.host" value="${app.host}"/>
         </propertyfile>
     </target>
 
     <target name="configure" description="Set up build-variables">
         <input message="Please enter db-host:"
                addproperty="user.db.host"
-               defaultvalue="${db.host}" />
+               defaultvalue="${db.host}"/>
 
         <input message="Please enter db-port:"
                addproperty="user.db.port"
-               defaultvalue="${db.port}" />
+               defaultvalue="${db.port}"/>
 
         <input message="Please enter db-name:"
                addproperty="user.db.name"
-               defaultvalue="${db.name}" />
+               defaultvalue="${db.name}"/>
 
         <input message="Please enter db-username:"
                addproperty="user.db.user"
-               defaultvalue="${db.user}" />
+               defaultvalue="${db.user}"/>
 
         <input message="Please enter db-password:"
                addproperty="user.db.password">
@@ -57,11 +57,11 @@
 
         <input message="Please enter app.host (Hostname e.g. example.com):"
                addproperty="user.app.host"
-               defaultvalue="${app.host}" />
+               defaultvalue="${app.host}"/>
 
         <input message="Please enter app.path (e.g. /shopware. Leave blank if installed in document root):"
                addproperty="user.app.path"
-               defaultvalue="${app.path}" />
+               defaultvalue="${app.path}"/>
 
         <antcall target="write-properties">
             <param name="db.host" value="${user.db.host}"/>
@@ -79,10 +79,10 @@
         <available file="${basedir}/composer.phar" property="composer.binary.present"/>
     </target>
 
-    <target name="install-composer-binary" depends="check-composer-binary"  unless="composer.binary.present">
+    <target name="install-composer-binary" depends="check-composer-binary" unless="composer.binary.present">
         <exec executable="bash" failonerror="true">
-            <arg value="-c" />
-            <arg value="curl -s https://getcomposer.org/installer | ${script.php}" />
+            <arg value="-c"/>
+            <arg value="curl -s https://getcomposer.org/installer | ${script.php}"/>
         </exec>
     </target>
 
@@ -90,41 +90,47 @@
         <exec executable="${script.php}">
             <arg value="composer.phar"/>
             <arg value="self-update"/>
-            <arg value="1"/>
+            <arg value="--2"/>
             <arg value="--no-interaction"/>
         </exec>
     </target>
 
     <target name="build-composer-install" depends="update-composer-binary">
         <exec executable="${script.php}" failonerror="true">
-            <arg value="composer.phar" />
-            <arg value="install" />
-            <arg value="--no-interaction" />
-            <arg value="--optimize-autoloader" />
-            <arg value="--no-suggest" />
+            <arg value="composer.phar"/>
+            <arg value="update"/>
+            <arg value="'laminas/*' cocur/slugify"/>
+        </exec>
+
+        <exec executable="${script.php}" failonerror="true">
+            <arg value="composer.phar"/>
+            <arg value="install"/>
+            <arg value="--no-interaction"/>
+            <arg value="--optimize-autoloader"/>
+            <arg value="--no-suggest"/>
         </exec>
     </target>
 
     <target name="build-composer-update" depends="update-composer-binary">
         <exec executable="${script.php}" failonerror="true">
-            <arg value="composer.phar" />
-            <arg value="update" />
-            <arg value="--no-interaction" />
+            <arg value="composer.phar"/>
+            <arg value="update"/>
+            <arg value="--no-interaction"/>
         </exec>
     </target>
 
     <target name="check-code-style" depends="build-composer-install">
         <exec executable="${script.php}" failonerror="true">
-            <arg value="vendor/bin/php-cs-fixer" />
-            <arg value="fix" />
-            <arg value="--dry-run" />
-            <arg value="--stop-on-violation" />
-            <arg value="--verbose" />
-            <arg value="--show-progress=dots" />
+            <arg value="vendor/bin/php-cs-fixer"/>
+            <arg value="fix"/>
+            <arg value="--dry-run"/>
+            <arg value="--stop-on-violation"/>
+            <arg value="--verbose"/>
+            <arg value="--show-progress=dots"/>
         </exec>
     </target>
 
-    <target name="build-database" depends="build-database-foundation, build-database-deploy-demodata" />
+    <target name="build-database" depends="build-database-foundation, build-database-deploy-demodata"/>
 
     <target name="build-create-admin-account">
         <exec executable="${script.php}" dir="${basedir}/bin" failonerror="true">
@@ -192,7 +198,7 @@
 
     <target name="build-install-lock-file">
         <tstamp>
-            <format property="installDate" pattern="yyyyMMddHHmm" />
+            <format property="installDate" pattern="yyyyMMddHHmm"/>
         </tstamp>
 
         <echo file="${basedir}/recovery/install/data/install.lock">${installDate}</echo>
@@ -237,8 +243,8 @@
 
     <target name="unit-continuous-es">
         <exec executable="${script.phpunit}" failonerror="true" dir="${test.dir.shopware}">
-            <arg value="--exclude-group=skipElasticSearch" />
-            <arg value="--group=elasticSearch" />
+            <arg value="--exclude-group=skipElasticSearch"/>
+            <arg value="--group=elasticSearch"/>
             <arg value="--log-junit=${log.dir}/junit.xml"/>
         </exec>
     </target>
@@ -258,7 +264,7 @@
     </target>
 
     <target name="stop-server">
-        <exec executable="${script.server.stop}" />
+        <exec executable="${script.server.stop}"/>
     </target>
 
     <target name="mink-shopware-continuous-responsive">
@@ -284,8 +290,8 @@
 
     <target name="static-lint" description="Perform syntax check of sourcecode files">
         <exec executable="bash" failonerror="true">
-            <arg value="-c" />
-            <arg value="find -L ${basedir}/engine/Shopware/ -name '*.php' -print0 | xargs -0 -n 1 -P 4 php -l" />
+            <arg value="-c"/>
+            <arg value="find -L ${basedir}/engine/Shopware/ -name '*.php' -print0 | xargs -0 -n 1 -P 4 php -l"/>
         </exec>
     </target>
 
@@ -294,8 +300,8 @@
             <arg value="--standard=${build.dir}"/>
             <arg value="--report=checkstyle"/>
             <arg value="--report-file=${log.dir}/checkstyle.xml"/>
-            <arg value="--extensions=php" />
-            <arg value="-n" />
+            <arg value="--extensions=php"/>
+            <arg value="-n"/>
             <arg value="${app.dir}/"/>
         </exec>
     </target>
@@ -311,7 +317,11 @@
     </target>
 
     <target name="static-phpcpd" description="PHP Copy/Paste Detector">
-        <exec executable="${script.phpcpd}" failonerror="false" output="/dev/null" error="${log.dir}/error.log" append="true">
+        <exec executable="${script.phpcpd}"
+              failonerror="false"
+              output="/dev/null"
+              error="${log.dir}/error.log"
+              append="true">
             <arg value="--log-pmd"/>
             <arg value="${log.dir}/cpd.xml"/>
             <arg value="${app.dir}/"/>
@@ -319,7 +329,11 @@
     </target>
 
     <target name="static-phploc" description="PHP Lines of Code">
-        <exec executable="${script.phploc}" failonerror="false" output="${log.dir}/loc.txt" error="${log.dir}/error.log" append="true">
+        <exec executable="${script.phploc}"
+              failonerror="false"
+              output="${log.dir}/loc.txt"
+              error="${log.dir}/error.log"
+              append="true">
             <arg value="--log-xml"/>
             <arg value="${log.dir}/loc.xml"/>
             <arg value="--log-csv"/>
@@ -331,7 +345,12 @@
 
     <target name="static-pdepend">
         <mkdir dir="${log.dir}/depend"/>
-        <exec executable="${script.pdepend}" failonerror="false" output="${log.dir}/depend/output.txt" error="${log.dir}/error.log" append="true" dir="${app.dir}">
+        <exec executable="${script.pdepend}"
+              failonerror="false"
+              output="${log.dir}/depend/output.txt"
+              error="${log.dir}/error.log"
+              append="true"
+              dir="${app.dir}">
             <arg value="--summary-xml=${log.dir}/depend/summary.xml"/>
             <arg value="--jdepend-chart=${log.dir}/depend/jdepend.svg"/>
             <arg value="--overview-pyramid=${log.dir}/depend/pyramid.svg"/>
@@ -340,7 +359,11 @@
     </target>
 
     <target name="build-phpcb" description="Build CodeBrowser">
-        <exec executable="${script.phpcb}" failonerror="false" output="/dev/null" error="${log.dir}/error.log" append="true">
+        <exec executable="${script.phpcb}"
+              failonerror="false"
+              output="/dev/null"
+              error="${log.dir}/error.log"
+              append="true">
             <arg value="-l${log.dir}"/>
             <arg value="-o${log.dir}/code-browser"/>
             <arg value="-s${app.dir}"/>
@@ -373,11 +396,11 @@
     <target name="compile-tinymce" description="Builds a TinyMce package with default used plugins">
         <!-- Combine all files -->
         <concat destfile="${basedir}/engine/Library/TinyMce/tiny_mce_full.js">
-            <fileset dir="${basedir}/engine/Library/TinyMce/" includes="tiny_mce.js" />
-            <fileset dir="${basedir}/engine/Library/TinyMce/" includes="themes/advanced/langs/en.js" />
-            <fileset dir="${basedir}/engine/Library/TinyMce/" includes="themes/advanced/langs/de.js" />
-            <fileset dir="${basedir}/engine/Library/TinyMce/" includes="plugins/media_selection/editor_plugin.js" />
-            <fileset dir="${basedir}/engine/Library/TinyMce/" includes="plugins/fullscreen/editor_plugin.js" />
+            <fileset dir="${basedir}/engine/Library/TinyMce/" includes="tiny_mce.js"/>
+            <fileset dir="${basedir}/engine/Library/TinyMce/" includes="themes/advanced/langs/en.js"/>
+            <fileset dir="${basedir}/engine/Library/TinyMce/" includes="themes/advanced/langs/de.js"/>
+            <fileset dir="${basedir}/engine/Library/TinyMce/" includes="plugins/media_selection/editor_plugin.js"/>
+            <fileset dir="${basedir}/engine/Library/TinyMce/" includes="plugins/fullscreen/editor_plugin.js"/>
         </concat>
     </target>
 </project>
diff --git a/build/composer-post-install-cmd.sh b/build/composer-post-install-cmd.sh
index 173b282c0bc..37bda4675d9 100755
--- a/build/composer-post-install-cmd.sh
+++ b/build/composer-post-install-cmd.sh
@@ -7,7 +7,7 @@ root_dir="$script_dir"/..
 
 set -x
 
-rm -rf -- "$root_dir"/vendor/mpdf/mpdf/ttfonts
+find -- "$root_dir"/vendor/mpdf/mpdf/ttfonts -type f ! -name 'DejaVu*' -exec rm {} +
 rm -rf -- "$root_dir"/vendor/google/protobuf/src
 rm -rf -- "$root_dir"/vendor/google/protobuf/java
 rm -rf -- "$root_dir"/vendor/google/protobuf/objectivec
diff --git a/build/config-elasticsearch.php b/build/config-elasticsearch.php
index fbb83fa8ea5..f35458a8022 100644
--- a/build/config-elasticsearch.php
+++ b/build/config-elasticsearch.php
@@ -3,23 +3,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 return [
@@ -88,7 +87,7 @@
 
     'mail' => [
         'type' => 'smtp',
-        'host' => 'smtp',
+        'host' => 'localhost',
         'port' => 1025,
     ],
 ];
diff --git a/build/config-mink.php b/build/config-mink.php
index 81587ad4420..238e1ac57e1 100644
--- a/build/config-mink.php
+++ b/build/config-mink.php
@@ -3,23 +3,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 return [
@@ -70,7 +69,7 @@
 
     'mail' => [
         'type' => 'smtp',
-        'host' => 'smtp',
+        'host' => '%smtp.host%',
         'port' => 1025,
     ],
 ];
diff --git a/build/ruleset.xml b/build/ruleset.xml
deleted file mode 100644
index 74a82c36fb2..00000000000
--- a/build/ruleset.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="Shopware">
-    <description>Shopware Code Style Rules</description>
-
-    <rule ref="PSR2">
-        <exclude name="Squiz.Classes.ValidClassName.NotCamelCaps"/>
-        <exclude name="PSR1.Classes.ClassDeclaration.MissingNamespace"/>
-
-        <exclude name="PEAR.Functions.FunctionCallSignature.ContentAfterOpenBracket"/>
-        <exclude name="PEAR.Functions.FunctionCallSignature.CloseBracketLine"/>
-    </rule>
-</ruleset>
diff --git a/composer.json b/composer.json
index 938475ac43c..baa062fe70c 100644
--- a/composer.json
+++ b/composer.json
@@ -1,26 +1,26 @@
 {
     "name": "shopware/shopware",
-    "description": "Shopware is the next generation of open source e-commerce software made in Germany",
+    "description": "Shopware 5 is an open source e-commerce software made in Germany",
     "keywords": ["shopware", "shop"],
-    "homepage": "http://www.shopware.com",
+    "homepage": "https://github.com/shopware5",
     "type": "project",
     "license": [
-        "AGPL-3.0",
-        "proprietary"
+        "AGPL-3.0"
     ],
     "support": {
-        "forum": "https://forum.shopware.com",
+        "forum": "https://forum.shopware.com/c/shopware-5/7",
         "chat": "https://slack.shopware.com",
         "wiki": "https://developers.shopware.com/",
-        "source": "https://github.com/shopware/shopware",
-        "issues": "https://issues.shopware.com"
+        "source": "https://github.com/shopware5/shopware",
+        "issues": "https://github.com/shopware5/shopware/issues"
     },
     "require": {
-        "php": "~7.4.0 || ~8.0.0 || ~8.1.0",
+        "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
         "ext-ctype": "*",
         "ext-curl": "*",
         "ext-date": "*",
         "ext-dom": "*",
+        "ext-filter": "*",
         "ext-gd": "*",
         "ext-hash": "*",
         "ext-iconv": "*",
@@ -36,36 +36,38 @@
         "ext-zip": "*",
         "ext-zlib": "*",
         "lib-libxml": "*",
-        "bcremer/line-reader": "1.2.0",
-        "beberlei/assert": "3.3.2",
-        "beberlei/doctrineextensions": "1.3.0",
-        "cocur/slugify": "4.1.0",
-        "doctrine/annotations": "1.13.2",
-        "doctrine/cache": "1.12.1",
-        "doctrine/collections": "1.6.8",
-        "doctrine/common": "3.3.0",
-        "doctrine/dbal": "2.13.8",
-        "doctrine/event-manager": "1.1.1",
-        "doctrine/orm": "2.12.1",
-        "doctrine/persistence": "2.5.1",
+        "composer-runtime-api": "^2.0",
+        "bcremer/line-reader": "1.3.0",
+        "beberlei/assert": "3.3.3",
+        "beberlei/doctrineextensions": "1.4.0",
+        "cocur/slugify": "4.3.0 || 4.6.0",
+        "doctrine/annotations": "1.14.4",
+        "doctrine/cache": "1.13.0",
+        "doctrine/collections": "1.8.0",
+        "doctrine/common": "3.5.0",
+        "doctrine/dbal": "2.13.9",
+        "doctrine/event-manager": "1.2.0",
+        "doctrine/inflector": "2.0.10",
+        "doctrine/orm": "2.15.5",
+        "doctrine/persistence": "3.4.0",
         "elasticsearch/elasticsearch": "^7",
         "fig/link-util": "1.1.2",
-        "friendsofphp/proxy-manager-lts": "1.0.7",
-        "google/cloud-storage": "1.26.2",
-        "guzzlehttp/guzzle": "7.4.3",
-        "guzzlehttp/psr7": "2.2.1",
-        "laminas/laminas-code": "4.5.1",
-        "laminas/laminas-escaper": "2.10.0",
+        "friendsofphp/proxy-manager-lts": "1.0.18",
+        "google/cloud-storage": "1.39.0",
+        "guzzlehttp/guzzle": "~7.9.0",
+        "guzzlehttp/psr7": "~2.7.0",
+        "laminas/laminas-code": "4.7.1 || 4.16.0",
+        "laminas/laminas-escaper": "2.12.0 || 2.16.0",
         "league/flysystem": "~1.1.4",
-        "league/flysystem-aws-s3-v3": "1.0.29",
-        "monolog/monolog": "2.5.0",
-        "mpdf/mpdf": "8.1.1",
+        "league/flysystem-aws-s3-v3": "1.0.30",
+        "monolog/monolog": "2.10.0",
+        "mpdf/mpdf": "8.2.5",
         "ongr/elasticsearch-dsl": "7.2.2",
         "psr/link": "1.0.0",
         "psr/log": "1.1.4",
         "ramsey/uuid": "4.2.3",
-        "setasign/fpdf": "1.8.4",
-        "setasign/fpdi": "2.3.6",
+        "setasign/fpdf": "1.8.6",
+        "setasign/fpdi": "2.6.4",
         "stecman/symfony-console-completion": "0.11.0",
         "superbalist/flysystem-google-storage": "7.2.2",
         "symfony/config": "~4.4.34",
@@ -75,20 +77,22 @@
         "symfony/filesystem": "~4.4.27",
         "symfony/finder": "~4.4.30",
         "symfony/form": "~4.4.34",
-        "symfony/http-foundation": "~4.4.34",
-        "symfony/http-kernel": "~4.4.34",
+        "symfony/http-foundation": "~4.4.49",
+        "symfony/http-kernel": "~4.4.51",
         "symfony/options-resolver": "~4.4.30",
         "symfony/polyfill-php80": "^1.23",
         "symfony/polyfill-php81": "^1.23",
-        "symfony/process": "~4.4.34",
+        "symfony/polyfill-php82": "^1.26",
+        "symfony/polyfill-php83": "^1.28",
+        "symfony/process": "~5.4.46",
         "symfony/serializer": "~5.4.0",
-        "symfony/validator": "~4.4.34",
+        "symfony/validator": "~4.4.48",
         "symfony/web-link": "~4.4.27",
-        "wikimedia/less.php": "3.1.0"
+        "voku/anti-xss": "~4.1.41",
+        "wikimedia/less.php": "5.1.2"
     },
     "replace": {
         "paragonie/random_compat": "*",
-        "symfony/polyfill-ctype": "*",
         "symfony/polyfill-php72": "*",
         "symfony/polyfill-php73": "*"
     },
@@ -97,23 +101,23 @@
         "ext-zend-opcache": "*"
     },
     "require-dev": {
-        "bamarni/composer-bin-plugin": "1.5.0",
-        "behat/behat": "^3.10.0",
-        "behat/gherkin": "4.9.0",
-        "behat/mink": "1.10.0",
-        "behat/mink-selenium2-driver": "1.6.0",
-        "friends-of-behat/mink-extension": "2.6.1",
+        "bamarni/composer-bin-plugin": "1.8.2",
+        "behat/behat": "3.15.0",
+        "behat/gherkin": "4.10.0",
+        "behat/mink": "1.12.0",
+        "behat/mink-selenium2-driver": "1.7.0",
+        "friends-of-behat/mink-extension": "2.7.5",
         "php-parallel-lint/php-var-dump-check": "^0.5",
-        "phpspec/prophecy-phpunit": "^2.0",
-        "phpstan/extension-installer": "1.1.0",
-        "phpstan/phpstan": "1.7.1",
-        "phpstan/phpstan-doctrine": "1.3.5",
-        "phpstan/phpstan-phpunit": "1.1.1",
-        "phpstan/phpstan-symfony": "1.1.8",
-        "phpunit/phpunit": "^9.4",
-        "sensiolabs/behat-page-object-extension": "2.3.4",
-        "symfony/browser-kit": "~4.4.27",
-        "symfony/dom-crawler": "~4.4.30"
+        "phpstan/extension-installer": "1.4.3",
+        "phpstan/phpstan": "1.12.21",
+        "phpstan/phpstan-doctrine": "1.5.7",
+        "phpstan/phpstan-phpunit": "1.4.2",
+        "phpstan/phpstan-symfony": "1.4.13",
+        "phpunit/phpunit": "^9.6",
+        "sensiolabs/behat-page-object-extension": "2.3.7",
+        "staabm/phpstan-dba": "0.2.81",
+        "symfony/browser-kit": "~5.4.35",
+        "symfony/dom-crawler": "~5.4.35"
     },
     "include-path": [
         "engine/Library/"
@@ -130,7 +134,8 @@
         "files": ["engine/Shopware/Shopware.php"],
         "classmap": [
             "engine/Shopware/",
-            "engine/Library/Smarty/"
+            "engine/Library/Smarty/",
+            "engine/Library/Enlight/Template/Plugins/"
         ],
         "exclude-from-classmap": [
             "engine/Shopware/Plugins/Community/",
@@ -141,9 +146,15 @@
     "autoload-dev": {
         "psr-4": {
             "Shopware\\Behat\\ShopwareExtension\\": "tests/Mink/Extension/ShopwareExtension",
-            "Shopware\\Tests\\Mink\\": "tests/Mink/features/bootstrap",
-            "Shopware\\Tests\\": "tests/"
-        }
+            "Shopware\\Tests\\": "tests/",
+            "TestPlugin\\": "tests/Unit/Bundle/PluginInstallerBundle/Fixtures/TestPlugin",
+            "SwagTest\\": "tests/Functional/Components/Plugin/fixtures/SwagTest",
+            "Shopware\\Themes\\": "tests/Functional/Components/Theme/Themes"
+        },
+        "classmap": [
+            "tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerExamplePlugins",
+            "tests/Functional/Components/Plugin/fixtures"
+        ]
     },
     "config": {
         "autoloader-suffix": "Shopware",
@@ -153,14 +164,23 @@
             "composer/package-versions-deprecated": true,
             "phpstan/extension-installer": true,
             "bamarni/composer-bin-plugin": true
+        },
+        "audit": {
+            "ignore": {
+                "PKSA-365x-2zjk-pt47": "Would require a major update of Symfony components",
+                "PKSA-b35n-565h-rs4q": "Would require a major update of Symfony components",
+                "PKSA-w2tw-kmfg-rt9s": "Would require a major update of Symfony components"
+            }
+        }
+    },
+    "extra": {
+        "bamarni-bin": {
+            "bin-links": true,
+            "forward-command": false
         }
     },
     "scripts": {
-        "cs-check": "make check-php-cs-fixer",
-        "cs-fix": "make fix-code-style",
         "post-install-cmd": "./build/composer-post-install-cmd.sh",
-        "post-update-cmd": "./build/composer-post-update-cmd.sh",
-        "test": "phpunit -c tests/ --colors=always",
-        "test-unit": "phpunit -c tests/phpunit_unit.xml.dist --colors=always"
+        "post-update-cmd": "./build/composer-post-update-cmd.sh"
     }
 }
diff --git a/composer.lock b/composer.lock
index 153932ffe33..166950e57a9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,27 +4,31 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "0d0be9d9b3cca2bd56c8f51d9477e658",
+    "content-hash": "ecb8b836fd03f42fb2ad5b286b57fd7d",
     "packages": [
         {
             "name": "aws/aws-crt-php",
-            "version": "v1.0.2",
+            "version": "v1.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/awslabs/aws-crt-php.git",
-                "reference": "3942776a8c99209908ee0b287746263725685732"
+                "reference": "d71d9906c7bb63a28295447ba12e74723bd3730e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/3942776a8c99209908ee0b287746263725685732",
-                "reference": "3942776a8c99209908ee0b287746263725685732",
+                "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/d71d9906c7bb63a28295447ba12e74723bd3730e",
+                "reference": "d71d9906c7bb63a28295447ba12e74723bd3730e",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.5"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.35|^5.4.3"
+                "phpunit/phpunit": "^4.8.35||^5.6.3||^9.5",
+                "yoast/phpunit-polyfills": "^1.0"
+            },
+            "suggest": {
+                "ext-awscrt": "Make sure you install awscrt native extension to use any of the functionality."
             },
             "type": "library",
             "autoload": {
@@ -43,7 +47,7 @@
                 }
             ],
             "description": "AWS Common Runtime for PHP",
-            "homepage": "http://aws.amazon.com/sdkforphp",
+            "homepage": "https://github.com/awslabs/aws-crt-php",
             "keywords": [
                 "amazon",
                 "aws",
@@ -52,39 +56,42 @@
             ],
             "support": {
                 "issues": "https://github.com/awslabs/aws-crt-php/issues",
-                "source": "https://github.com/awslabs/aws-crt-php/tree/v1.0.2"
+                "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.7"
             },
-            "time": "2021-09-03T22:57:30+00:00"
+            "time": "2024-10-18T22:15:13+00:00"
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.222.0",
+            "version": "3.337.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "0074bca70bf023f049532b177bf90d3a75e425cd"
+                "reference": "06dfc8f76423b49aaa181debd25bbdc724c346d6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0074bca70bf023f049532b177bf90d3a75e425cd",
-                "reference": "0074bca70bf023f049532b177bf90d3a75e425cd",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/06dfc8f76423b49aaa181debd25bbdc724c346d6",
+                "reference": "06dfc8f76423b49aaa181debd25bbdc724c346d6",
                 "shasum": ""
             },
             "require": {
-                "aws/aws-crt-php": "^1.0.2",
+                "aws/aws-crt-php": "^1.2.3",
                 "ext-json": "*",
                 "ext-pcre": "*",
                 "ext-simplexml": "*",
-                "guzzlehttp/guzzle": "^5.3.3 || ^6.2.1 || ^7.0",
-                "guzzlehttp/promises": "^1.4.0",
-                "guzzlehttp/psr7": "^1.7.0 || ^2.1.1",
+                "guzzlehttp/guzzle": "^6.5.8 || ^7.4.5",
+                "guzzlehttp/promises": "^1.4.0 || ^2.0",
+                "guzzlehttp/psr7": "^1.9.1 || ^2.4.5",
                 "mtdowling/jmespath.php": "^2.6",
-                "php": ">=5.5"
+                "php": ">=7.2.5",
+                "psr/http-message": "^1.0 || ^2.0"
             },
             "require-dev": {
                 "andrewsville/php-token-reflection": "^1.4",
                 "aws/aws-php-sns-message-validator": "~1.0",
                 "behat/behat": "~3.0",
+                "composer/composer": "^1.10.22",
+                "dms/phpunit-arraysubset-asserts": "^0.4.0",
                 "doctrine/cache": "~1.4",
                 "ext-dom": "*",
                 "ext-openssl": "*",
@@ -92,10 +99,11 @@
                 "ext-sockets": "*",
                 "nette/neon": "^2.3",
                 "paragonie/random_compat": ">= 2",
-                "phpunit/phpunit": "^4.8.35 || ^5.6.3",
-                "psr/cache": "^1.0",
-                "psr/simple-cache": "^1.0",
-                "sebastian/comparator": "^1.2.3"
+                "phpunit/phpunit": "^5.6.3 || ^8.5 || ^9.5",
+                "psr/cache": "^1.0 || ^2.0 || ^3.0",
+                "psr/simple-cache": "^1.0 || ^2.0 || ^3.0",
+                "sebastian/comparator": "^1.2.3 || ^4.0",
+                "yoast/phpunit-polyfills": "^1.0"
             },
             "suggest": {
                 "aws/aws-php-sns-message-validator": "To validate incoming SNS notifications",
@@ -116,7 +124,10 @@
                 ],
                 "psr-4": {
                     "Aws\\": "src/"
-                }
+                },
+                "exclude-from-classmap": [
+                    "src/data/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -143,29 +154,32 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.222.0"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.337.3"
             },
-            "time": "2022-04-27T18:36:42+00:00"
+            "time": "2025-01-21T19:10:05+00:00"
         },
         {
             "name": "bcremer/line-reader",
-            "version": "1.2.0",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bcremer/LineReader.git",
-                "reference": "568aae7a35a73e9ae6a6e2063e6f6760208006f2"
+                "reference": "5c84ef9e6be043ef1db463c6ae3b81e1a923873a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bcremer/LineReader/zipball/568aae7a35a73e9ae6a6e2063e6f6760208006f2",
-                "reference": "568aae7a35a73e9ae6a6e2063e6f6760208006f2",
+                "url": "https://api.github.com/repos/bcremer/LineReader/zipball/5c84ef9e6be043ef1db463c6ae3b81e1a923873a",
+                "reference": "5c84ef9e6be043ef1db463c6ae3b81e1a923873a",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3|^7.4|^8.0|^8.1"
+                "php": "^7.4 || ^8.0"
             },
             "require-dev": {
-                "infection/infection": "^0.18",
+                "friendsofphp/php-cs-fixer": "3.13.2",
+                "infection/infection": "^0.26",
+                "phpstan/phpstan": "1.9.14",
+                "phpstan/phpstan-phpunit": "1.3.3",
                 "phpunit/phpunit": "^9.4"
             },
             "type": "library",
@@ -187,22 +201,22 @@
             "description": "Read large files line by line in a memory efficient (constant) way.",
             "support": {
                 "issues": "https://github.com/bcremer/LineReader/issues",
-                "source": "https://github.com/bcremer/LineReader/tree/1.2.0"
+                "source": "https://github.com/bcremer/LineReader/tree/1.3.0"
             },
-            "time": "2021-10-13T16:06:27+00:00"
+            "time": "2023-01-27T12:08:54+00:00"
         },
         {
             "name": "beberlei/assert",
-            "version": "v3.3.2",
+            "version": "v3.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/beberlei/assert.git",
-                "reference": "cb70015c04be1baee6f5f5c953703347c0ac1655"
+                "reference": "b5fd8eacd8915a1b627b8bfc027803f1939734dd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/beberlei/assert/zipball/cb70015c04be1baee6f5f5c953703347c0ac1655",
-                "reference": "cb70015c04be1baee6f5f5c953703347c0ac1655",
+                "url": "https://api.github.com/repos/beberlei/assert/zipball/b5fd8eacd8915a1b627b8bfc027803f1939734dd",
+                "reference": "b5fd8eacd8915a1b627b8bfc027803f1939734dd",
                 "shasum": ""
             },
             "require": {
@@ -210,7 +224,7 @@
                 "ext-json": "*",
                 "ext-mbstring": "*",
                 "ext-simplexml": "*",
-                "php": "^7.0 || ^8.0"
+                "php": "^7.1 || ^8.0"
             },
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "*",
@@ -254,33 +268,36 @@
             ],
             "support": {
                 "issues": "https://github.com/beberlei/assert/issues",
-                "source": "https://github.com/beberlei/assert/tree/v3.3.2"
+                "source": "https://github.com/beberlei/assert/tree/v3.3.3"
             },
-            "time": "2021-12-16T21:41:27+00:00"
+            "time": "2024-07-15T13:18:35+00:00"
         },
         {
             "name": "beberlei/doctrineextensions",
-            "version": "v1.3.0",
+            "version": "v1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/beberlei/DoctrineExtensions.git",
-                "reference": "008f162f191584a6c37c03a803f718802ba9dd9a"
+                "reference": "249eab82aa35b65741388f38499b3162403d9956"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/beberlei/DoctrineExtensions/zipball/008f162f191584a6c37c03a803f718802ba9dd9a",
-                "reference": "008f162f191584a6c37c03a803f718802ba9dd9a",
+                "url": "https://api.github.com/repos/beberlei/DoctrineExtensions/zipball/249eab82aa35b65741388f38499b3162403d9956",
+                "reference": "249eab82aa35b65741388f38499b3162403d9956",
                 "shasum": ""
             },
             "require": {
-                "doctrine/orm": "^2.7",
+                "doctrine/orm": "^2.15",
                 "php": "^7.2 || ^8.0"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.14",
+                "doctrine/annotations": "^1.14 || ^2",
+                "doctrine/coding-standard": "^9.0.2 || ^12.0",
                 "nesbot/carbon": "*",
                 "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
-                "symfony/yaml": "^4.2 || ^5.0",
+                "squizlabs/php_codesniffer": "^3.8",
+                "symfony/cache": "^4.4 || ^5.4 || ^6.4 || ^7.0",
+                "symfony/yaml": "^4.4 || ^5.3 || ^6.0 || ^7.0",
                 "zf1/zend-date": "^1.12",
                 "zf1/zend-registry": "^1.12"
             },
@@ -311,9 +328,9 @@
                 "orm"
             ],
             "support": {
-                "source": "https://github.com/beberlei/DoctrineExtensions/tree/v1.3.0"
+                "source": "https://github.com/beberlei/DoctrineExtensions/tree/v1.4.0"
             },
-            "time": "2020-11-29T07:37:23+00:00"
+            "time": "2024-02-05T17:02:44+00:00"
         },
         {
             "name": "brick/math",
@@ -377,21 +394,21 @@
         },
         {
             "name": "cocur/slugify",
-            "version": "v4.1.0",
+            "version": "v4.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cocur/slugify.git",
-                "reference": "2611e6081dbbb05837a16ed339c0451923d4046e"
+                "reference": "652234ef5f1be844a2ae1c36ad1b4c88b05160f9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cocur/slugify/zipball/2611e6081dbbb05837a16ed339c0451923d4046e",
-                "reference": "2611e6081dbbb05837a16ed339c0451923d4046e",
+                "url": "https://api.github.com/repos/cocur/slugify/zipball/652234ef5f1be844a2ae1c36ad1b4c88b05160f9",
+                "reference": "652234ef5f1be844a2ae1c36ad1b4c88b05160f9",
                 "shasum": ""
             },
             "require": {
                 "ext-mbstring": "*",
-                "php": ">=7.1"
+                "php": "^7.1 || ~8.0.0 || ~8.1.0 || ~8.2.0"
             },
             "conflict": {
                 "symfony/config": "<3.4 || >=4,<4.3",
@@ -445,36 +462,40 @@
             ],
             "support": {
                 "issues": "https://github.com/cocur/slugify/issues",
-                "source": "https://github.com/cocur/slugify/tree/v4.1.0"
+                "source": "https://github.com/cocur/slugify/tree/v4.3.0"
             },
-            "time": "2022-01-11T20:51:10+00:00"
+            "time": "2022-12-07T19:48:48+00:00"
         },
         {
             "name": "doctrine/annotations",
-            "version": "1.13.2",
+            "version": "1.14.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/annotations.git",
-                "reference": "5b668aef16090008790395c02c893b1ba13f7e08"
+                "reference": "253dca476f70808a5aeed3a47cc2cc88c5cab915"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/5b668aef16090008790395c02c893b1ba13f7e08",
-                "reference": "5b668aef16090008790395c02c893b1ba13f7e08",
+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/253dca476f70808a5aeed3a47cc2cc88c5cab915",
+                "reference": "253dca476f70808a5aeed3a47cc2cc88c5cab915",
                 "shasum": ""
             },
             "require": {
-                "doctrine/lexer": "1.*",
+                "doctrine/lexer": "^1 || ^2",
                 "ext-tokenizer": "*",
                 "php": "^7.1 || ^8.0",
                 "psr/cache": "^1 || ^2 || ^3"
             },
             "require-dev": {
                 "doctrine/cache": "^1.11 || ^2.0",
-                "doctrine/coding-standard": "^6.0 || ^8.1",
-                "phpstan/phpstan": "^0.12.20",
-                "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5",
-                "symfony/cache": "^4.4 || ^5.2"
+                "doctrine/coding-standard": "^9 || ^12",
+                "phpstan/phpstan": "~1.4.10 || ^1.10.28",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "symfony/cache": "^4.4 || ^5.4 || ^6.4 || ^7",
+                "vimeo/psalm": "^4.30 || ^5.14"
+            },
+            "suggest": {
+                "php": "PHP 8.0 or higher comes with attributes, a native replacement for annotations"
             },
             "type": "library",
             "autoload": {
@@ -517,22 +538,23 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/annotations/issues",
-                "source": "https://github.com/doctrine/annotations/tree/1.13.2"
+                "source": "https://github.com/doctrine/annotations/tree/1.14.4"
             },
-            "time": "2021-08-05T19:00:23+00:00"
+            "abandoned": true,
+            "time": "2024-09-05T10:15:52+00:00"
         },
         {
             "name": "doctrine/cache",
-            "version": "1.12.1",
+            "version": "1.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/cache.git",
-                "reference": "4cf401d14df219fa6f38b671f5493449151c9ad8"
+                "reference": "56cd022adb5514472cb144c087393c1821911d09"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/cache/zipball/4cf401d14df219fa6f38b671f5493449151c9ad8",
-                "reference": "4cf401d14df219fa6f38b671f5493449151c9ad8",
+                "url": "https://api.github.com/repos/doctrine/cache/zipball/56cd022adb5514472cb144c087393c1821911d09",
+                "reference": "56cd022adb5514472cb144c087393c1821911d09",
                 "shasum": ""
             },
             "require": {
@@ -544,13 +566,13 @@
             "require-dev": {
                 "alcaeus/mongo-php-adapter": "^1.1",
                 "cache/integration-tests": "dev-master",
-                "doctrine/coding-standard": "^8.0",
+                "doctrine/coding-standard": "^9",
                 "mongodb/mongodb": "^1.1",
-                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
                 "predis/predis": "~1.0",
                 "psr/cache": "^1.0 || ^2.0 || ^3.0",
-                "symfony/cache": "^4.4 || ^5.2 || ^6.0@dev",
-                "symfony/var-exporter": "^4.4 || ^5.2 || ^6.0@dev"
+                "symfony/cache": "^4.4 || ^5.4 || ^6",
+                "symfony/var-exporter": "^4.4 || ^5.4 || ^6"
             },
             "suggest": {
                 "alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver"
@@ -602,7 +624,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/cache/issues",
-                "source": "https://github.com/doctrine/cache/tree/1.12.1"
+                "source": "https://github.com/doctrine/cache/tree/1.13.0"
             },
             "funding": [
                 {
@@ -618,30 +640,32 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-17T14:39:21+00:00"
+            "abandoned": true,
+            "time": "2022-05-20T20:06:54+00:00"
         },
         {
             "name": "doctrine/collections",
-            "version": "1.6.8",
+            "version": "1.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/collections.git",
-                "reference": "1958a744696c6bb3bb0d28db2611dc11610e78af"
+                "reference": "2b44dd4cbca8b5744327de78bafef5945c7e7b5e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/collections/zipball/1958a744696c6bb3bb0d28db2611dc11610e78af",
-                "reference": "1958a744696c6bb3bb0d28db2611dc11610e78af",
+                "url": "https://api.github.com/repos/doctrine/collections/zipball/2b44dd4cbca8b5744327de78bafef5945c7e7b5e",
+                "reference": "2b44dd4cbca8b5744327de78bafef5945c7e7b5e",
                 "shasum": ""
             },
             "require": {
+                "doctrine/deprecations": "^0.5.3 || ^1",
                 "php": "^7.1.3 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^9.0",
-                "phpstan/phpstan": "^0.12",
+                "doctrine/coding-standard": "^9.0 || ^10.0",
+                "phpstan/phpstan": "^1.4.8",
                 "phpunit/phpunit": "^7.5 || ^8.5 || ^9.1.5",
-                "vimeo/psalm": "^4.2.1"
+                "vimeo/psalm": "^4.22"
             },
             "type": "library",
             "autoload": {
@@ -685,41 +709,42 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/collections/issues",
-                "source": "https://github.com/doctrine/collections/tree/1.6.8"
+                "source": "https://github.com/doctrine/collections/tree/1.8.0"
             },
-            "time": "2021-08-10T18:51:53+00:00"
+            "time": "2022-09-01T20:12:10+00:00"
         },
         {
             "name": "doctrine/common",
-            "version": "3.3.0",
+            "version": "3.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/common.git",
-                "reference": "c824e95d4c83b7102d8bc60595445a6f7d540f96"
+                "reference": "d9ea4a54ca2586db781f0265d36bea731ac66ec5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/common/zipball/c824e95d4c83b7102d8bc60595445a6f7d540f96",
-                "reference": "c824e95d4c83b7102d8bc60595445a6f7d540f96",
+                "url": "https://api.github.com/repos/doctrine/common/zipball/d9ea4a54ca2586db781f0265d36bea731ac66ec5",
+                "reference": "d9ea4a54ca2586db781f0265d36bea731ac66ec5",
                 "shasum": ""
             },
             "require": {
-                "doctrine/persistence": "^2.0 || ^3.0",
+                "doctrine/persistence": "^2.0 || ^3.0 || ^4.0",
                 "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^9.0",
+                "doctrine/coding-standard": "^9.0 || ^10.0",
+                "doctrine/collections": "^1",
                 "phpstan/phpstan": "^1.4.1",
                 "phpstan/phpstan-phpunit": "^1",
                 "phpunit/phpunit": "^7.5.20 || ^8.5 || ^9.0",
                 "squizlabs/php_codesniffer": "^3.0",
-                "symfony/phpunit-bridge": "^4.0.5",
+                "symfony/phpunit-bridge": "^6.1",
                 "vimeo/psalm": "^4.4"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Doctrine\\Common\\": "lib/Doctrine/Common"
+                    "Doctrine\\Common\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -761,7 +786,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/common/issues",
-                "source": "https://github.com/doctrine/common/tree/3.3.0"
+                "source": "https://github.com/doctrine/common/tree/3.5.0"
             },
             "funding": [
                 {
@@ -777,25 +802,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-05T18:28:51+00:00"
+            "time": "2025-01-01T22:12:03+00:00"
         },
         {
             "name": "doctrine/dbal",
-            "version": "2.13.8",
+            "version": "2.13.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "dc9b3c3c8592c935a6e590441f9abc0f9eba335b"
+                "reference": "c480849ca3ad6706a39c970cdfe6888fa8a058b8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/dc9b3c3c8592c935a6e590441f9abc0f9eba335b",
-                "reference": "dc9b3c3c8592c935a6e590441f9abc0f9eba335b",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/c480849ca3ad6706a39c970cdfe6888fa8a058b8",
+                "reference": "c480849ca3ad6706a39c970cdfe6888fa8a058b8",
                 "shasum": ""
             },
             "require": {
                 "doctrine/cache": "^1.0|^2.0",
-                "doctrine/deprecations": "^0.5.3",
+                "doctrine/deprecations": "^0.5.3|^1",
                 "doctrine/event-manager": "^1.0",
                 "ext-pdo": "*",
                 "php": "^7.1 || ^8"
@@ -870,7 +895,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/dbal/issues",
-                "source": "https://github.com/doctrine/dbal/tree/2.13.8"
+                "source": "https://github.com/doctrine/dbal/tree/2.13.9"
             },
             "funding": [
                 {
@@ -886,29 +911,34 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-03-09T15:25:46+00:00"
+            "time": "2022-05-02T20:28:55+00:00"
         },
         {
             "name": "doctrine/deprecations",
-            "version": "v0.5.3",
+            "version": "1.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/deprecations.git",
-                "reference": "9504165960a1f83cc1480e2be1dd0a0478561314"
+                "reference": "459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/9504165960a1f83cc1480e2be1dd0a0478561314",
-                "reference": "9504165960a1f83cc1480e2be1dd0a0478561314",
+                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38",
+                "reference": "459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1|^8.0"
+                "php": "^7.1 || ^8.0"
+            },
+            "conflict": {
+                "phpunit/phpunit": "<=7.5 || >=13"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^6.0|^7.0|^8.0",
-                "phpunit/phpunit": "^7.0|^8.0|^9.0",
-                "psr/log": "^1.0"
+                "doctrine/coding-standard": "^9 || ^12 || ^13",
+                "phpstan/phpstan": "1.4.10 || 2.1.11",
+                "phpstan/phpstan-phpunit": "^1.0 || ^2",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6 || ^10.5 || ^11.5 || ^12",
+                "psr/log": "^1 || ^2 || ^3"
             },
             "suggest": {
                 "psr/log": "Allows logging deprecations via PSR-3 logger implementation"
@@ -916,7 +946,7 @@
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations"
+                    "Doctrine\\Deprecations\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -927,43 +957,41 @@
             "homepage": "https://www.doctrine-project.org/",
             "support": {
                 "issues": "https://github.com/doctrine/deprecations/issues",
-                "source": "https://github.com/doctrine/deprecations/tree/v0.5.3"
+                "source": "https://github.com/doctrine/deprecations/tree/1.1.5"
             },
-            "time": "2021-03-21T12:59:47+00:00"
+            "time": "2025-04-07T20:06:18+00:00"
         },
         {
             "name": "doctrine/event-manager",
-            "version": "1.1.1",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/event-manager.git",
-                "reference": "41370af6a30faa9dc0368c4a6814d596e81aba7f"
+                "reference": "95aa4cb529f1e96576f3fda9f5705ada4056a520"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/event-manager/zipball/41370af6a30faa9dc0368c4a6814d596e81aba7f",
-                "reference": "41370af6a30faa9dc0368c4a6814d596e81aba7f",
+                "url": "https://api.github.com/repos/doctrine/event-manager/zipball/95aa4cb529f1e96576f3fda9f5705ada4056a520",
+                "reference": "95aa4cb529f1e96576f3fda9f5705ada4056a520",
                 "shasum": ""
             },
             "require": {
+                "doctrine/deprecations": "^0.5.3 || ^1",
                 "php": "^7.1 || ^8.0"
             },
             "conflict": {
-                "doctrine/common": "<2.9@dev"
+                "doctrine/common": "<2.9"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^6.0",
-                "phpunit/phpunit": "^7.0"
+                "doctrine/coding-standard": "^9 || ^10",
+                "phpstan/phpstan": "~1.4.10 || ^1.8.8",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "vimeo/psalm": "^4.24"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
-                    "Doctrine\\Common\\": "lib/Doctrine/Common"
+                    "Doctrine\\Common\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1007,7 +1035,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/event-manager/issues",
-                "source": "https://github.com/doctrine/event-manager/tree/1.1.x"
+                "source": "https://github.com/doctrine/event-manager/tree/1.2.0"
             },
             "funding": [
                 {
@@ -1023,32 +1051,32 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-05-29T18:28:51+00:00"
+            "time": "2022-10-12T20:51:15+00:00"
         },
         {
             "name": "doctrine/inflector",
-            "version": "2.0.4",
+            "version": "2.0.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/inflector.git",
-                "reference": "8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89"
+                "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/inflector/zipball/8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89",
-                "reference": "8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89",
+                "url": "https://api.github.com/repos/doctrine/inflector/zipball/5817d0659c5b50c9b950feb9af7b9668e2c436bc",
+                "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^8.2",
-                "phpstan/phpstan": "^0.12",
-                "phpstan/phpstan-phpunit": "^0.12",
-                "phpstan/phpstan-strict-rules": "^0.12",
-                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
-                "vimeo/psalm": "^4.10"
+                "doctrine/coding-standard": "^11.0",
+                "phpstan/phpstan": "^1.8",
+                "phpstan/phpstan-phpunit": "^1.1",
+                "phpstan/phpstan-strict-rules": "^1.3",
+                "phpunit/phpunit": "^8.5 || ^9.5",
+                "vimeo/psalm": "^4.25 || ^5.4"
             },
             "type": "library",
             "autoload": {
@@ -1098,7 +1126,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/inflector/issues",
-                "source": "https://github.com/doctrine/inflector/tree/2.0.4"
+                "source": "https://github.com/doctrine/inflector/tree/2.0.10"
             },
             "funding": [
                 {
@@ -1114,34 +1142,34 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-10-22T20:16:43+00:00"
+            "time": "2024-02-18T20:23:39+00:00"
         },
         {
             "name": "doctrine/instantiator",
-            "version": "1.4.1",
+            "version": "1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc"
+                "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc",
-                "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b",
+                "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^9",
+                "doctrine/coding-standard": "^9 || ^11",
                 "ext-pdo": "*",
                 "ext-phar": "*",
                 "phpbench/phpbench": "^0.16 || ^1",
                 "phpstan/phpstan": "^1.4",
                 "phpstan/phpstan-phpunit": "^1",
                 "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "vimeo/psalm": "^4.22"
+                "vimeo/psalm": "^4.30 || ^5.4"
             },
             "type": "library",
             "autoload": {
@@ -1168,7 +1196,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/instantiator/issues",
-                "source": "https://github.com/doctrine/instantiator/tree/1.4.1"
+                "source": "https://github.com/doctrine/instantiator/tree/1.5.0"
             },
             "funding": [
                 {
@@ -1184,35 +1212,37 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-03-03T08:28:38+00:00"
+            "time": "2022-12-30T00:15:36+00:00"
         },
         {
             "name": "doctrine/lexer",
-            "version": "1.2.3",
+            "version": "2.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/lexer.git",
-                "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229"
+                "reference": "861c870e8b75f7c8f69c146c7f89cc1c0f1b49b6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/c268e882d4dbdd85e36e4ad69e02dc284f89d229",
-                "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/861c870e8b75f7c8f69c146c7f89cc1c0f1b49b6",
+                "reference": "861c870e8b75f7c8f69c146c7f89cc1c0f1b49b6",
                 "shasum": ""
             },
             "require": {
+                "doctrine/deprecations": "^1.0",
                 "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^9.0",
+                "doctrine/coding-standard": "^9 || ^12",
                 "phpstan/phpstan": "^1.3",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "vimeo/psalm": "^4.11"
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6",
+                "psalm/plugin-phpunit": "^0.18.3",
+                "vimeo/psalm": "^4.11 || ^5.21"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer"
+                    "Doctrine\\Common\\Lexer\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1244,7 +1274,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/lexer/issues",
-                "source": "https://github.com/doctrine/lexer/tree/1.2.3"
+                "source": "https://github.com/doctrine/lexer/tree/2.1.1"
             },
             "funding": [
                 {
@@ -1260,57 +1290,59 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-28T11:07:21+00:00"
+            "time": "2024-02-05T11:35:39+00:00"
         },
         {
             "name": "doctrine/orm",
-            "version": "2.12.1",
+            "version": "2.15.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/orm.git",
-                "reference": "2e4a8722721b934149ff53b191522a6829b6d73b"
+                "reference": "d2de4ec03c63ddd7bdfda0421e237e11343c75ee"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/orm/zipball/2e4a8722721b934149ff53b191522a6829b6d73b",
-                "reference": "2e4a8722721b934149ff53b191522a6829b6d73b",
+                "url": "https://api.github.com/repos/doctrine/orm/zipball/d2de4ec03c63ddd7bdfda0421e237e11343c75ee",
+                "reference": "d2de4ec03c63ddd7bdfda0421e237e11343c75ee",
                 "shasum": ""
             },
             "require": {
                 "composer-runtime-api": "^2",
                 "doctrine/cache": "^1.12.1 || ^2.1.1",
-                "doctrine/collections": "^1.5",
+                "doctrine/collections": "^1.5 || ^2.1",
                 "doctrine/common": "^3.0.3",
                 "doctrine/dbal": "^2.13.1 || ^3.2",
-                "doctrine/deprecations": "^0.5.3",
-                "doctrine/event-manager": "^1.1",
+                "doctrine/deprecations": "^0.5.3 || ^1",
+                "doctrine/event-manager": "^1.2 || ^2",
                 "doctrine/inflector": "^1.4 || ^2.0",
-                "doctrine/instantiator": "^1.3",
-                "doctrine/lexer": "^1.2.3",
+                "doctrine/instantiator": "^1.3 || ^2",
+                "doctrine/lexer": "^2",
                 "doctrine/persistence": "^2.4 || ^3",
                 "ext-ctype": "*",
                 "php": "^7.1 || ^8.0",
                 "psr/cache": "^1 || ^2 || ^3",
-                "symfony/console": "^3.0 || ^4.0 || ^5.0 || ^6.0",
+                "symfony/console": "^4.2 || ^5.0 || ^6.0",
                 "symfony/polyfill-php72": "^1.23",
                 "symfony/polyfill-php80": "^1.16"
             },
             "conflict": {
-                "doctrine/annotations": "<1.13 || >= 2.0"
+                "doctrine/annotations": "<1.13 || >= 3.0"
             },
             "require-dev": {
-                "doctrine/annotations": "^1.13",
-                "doctrine/coding-standard": "^9.0",
+                "doctrine/annotations": "^1.13 || ^2",
+                "doctrine/coding-standard": "^9.0.2 || ^12.0",
                 "phpbench/phpbench": "^0.16.10 || ^1.0",
-                "phpstan/phpstan": "~1.4.10 || 1.5.0",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.4",
+                "phpstan/phpstan": "~1.4.10 || 1.10.25",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6",
                 "psr/log": "^1 || ^2 || ^3",
-                "squizlabs/php_codesniffer": "3.6.2",
+                "squizlabs/php_codesniffer": "3.7.2",
                 "symfony/cache": "^4.4 || ^5.4 || ^6.0",
+                "symfony/var-exporter": "^4.4 || ^5.4 || ^6.2",
                 "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0",
-                "vimeo/psalm": "4.22.0"
+                "vimeo/psalm": "4.30.0 || 5.13.1"
             },
             "suggest": {
+                "ext-dom": "Provides support for XSD validation for XML mapping files",
                 "symfony/cache": "Provides cache support for Setup Tool with doctrine/cache 2.0",
                 "symfony/yaml": "If you want to use YAML Metadata Mapping Driver"
             },
@@ -1357,50 +1389,44 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/orm/issues",
-                "source": "https://github.com/doctrine/orm/tree/2.12.1"
+                "source": "https://github.com/doctrine/orm/tree/2.15.5"
             },
-            "time": "2022-04-22T17:46:03+00:00"
+            "time": "2023-07-28T14:08:17+00:00"
         },
         {
             "name": "doctrine/persistence",
-            "version": "2.5.1",
+            "version": "3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/persistence.git",
-                "reference": "4473480044c88f30e0e8288e7123b60c7eb9efa3"
+                "reference": "0ea965320cec355dba75031c1b23d4c78362e3ff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/persistence/zipball/4473480044c88f30e0e8288e7123b60c7eb9efa3",
-                "reference": "4473480044c88f30e0e8288e7123b60c7eb9efa3",
+                "url": "https://api.github.com/repos/doctrine/persistence/zipball/0ea965320cec355dba75031c1b23d4c78362e3ff",
+                "reference": "0ea965320cec355dba75031c1b23d4c78362e3ff",
                 "shasum": ""
             },
             "require": {
-                "doctrine/cache": "^1.11 || ^2.0",
-                "doctrine/collections": "^1.0",
-                "doctrine/deprecations": "^0.5.3",
-                "doctrine/event-manager": "^1.0",
-                "php": "^7.1 || ^8.0",
+                "doctrine/event-manager": "^1 || ^2",
+                "php": "^7.2 || ^8.0",
                 "psr/cache": "^1.0 || ^2.0 || ^3.0"
             },
             "conflict": {
-                "doctrine/annotations": "<1.0 || >=2.0",
                 "doctrine/common": "<2.10"
             },
             "require-dev": {
-                "composer/package-versions-deprecated": "^1.11",
-                "doctrine/annotations": "^1.0",
-                "doctrine/coding-standard": "^9.0",
+                "doctrine/coding-standard": "^12",
                 "doctrine/common": "^3.0",
-                "phpstan/phpstan": "~1.4.10 || 1.5.0",
-                "phpunit/phpunit": "^7.5.20 || ^8.5 || ^9.5",
-                "symfony/cache": "^4.4 || ^5.4 || ^6.0",
-                "vimeo/psalm": "4.22.0"
+                "phpstan/phpstan": "1.12.7",
+                "phpstan/phpstan-phpunit": "^1",
+                "phpstan/phpstan-strict-rules": "^1.1",
+                "phpunit/phpunit": "^8.5.38 || ^9.5",
+                "symfony/cache": "^4.4 || ^5.4 || ^6.0 || ^7.0"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Doctrine\\Common\\": "src/Common",
                     "Doctrine\\Persistence\\": "src/Persistence"
                 }
             },
@@ -1435,7 +1461,7 @@
                 }
             ],
             "description": "The Doctrine Persistence project is a set of shared interfaces and functionality that the different Doctrine object mappers share.",
-            "homepage": "https://doctrine-project.org/projects/persistence.html",
+            "homepage": "https://www.doctrine-project.org/projects/persistence.html",
             "keywords": [
                 "mapper",
                 "object",
@@ -1445,22 +1471,36 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/persistence/issues",
-                "source": "https://github.com/doctrine/persistence/tree/2.5.1"
+                "source": "https://github.com/doctrine/persistence/tree/3.4.0"
             },
-            "time": "2022-04-14T21:47:17+00:00"
+            "funding": [
+                {
+                    "url": "https://www.doctrine-project.org/sponsorship.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/phpdoctrine",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fpersistence",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-10-30T19:48:12+00:00"
         },
         {
             "name": "elasticsearch/elasticsearch",
-            "version": "v7.17.0",
+            "version": "v7.17.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/elastic/elasticsearch-php.git",
-                "reference": "1890f9d7fde076b5a3ddcf579a802af05b2e781b"
+                "reference": "b8a60b4136ee31117d1aa1b19879530eb6d11efb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/1890f9d7fde076b5a3ddcf579a802af05b2e781b",
-                "reference": "1890f9d7fde076b5a3ddcf579a802af05b2e781b",
+                "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/b8a60b4136ee31117d1aa1b19879530eb6d11efb",
+                "reference": "b8a60b4136ee31117d1aa1b19879530eb6d11efb",
                 "shasum": ""
             },
             "require": {
@@ -1473,7 +1513,7 @@
                 "ext-yaml": "*",
                 "ext-zip": "*",
                 "mockery/mockery": "^1.2",
-                "phpstan/phpstan": "^0.12",
+                "phpstan/phpstan": "^1.10",
                 "phpunit/phpunit": "^9.3",
                 "squizlabs/php_codesniffer": "^3.4",
                 "symfony/finder": "~4.0"
@@ -1512,29 +1552,30 @@
             ],
             "support": {
                 "issues": "https://github.com/elastic/elasticsearch-php/issues",
-                "source": "https://github.com/elastic/elasticsearch-php/tree/v7.17.0"
+                "source": "https://github.com/elastic/elasticsearch-php/tree/v7.17.3"
             },
-            "time": "2022-02-03T13:40:04+00:00"
+            "time": "2025-07-14T09:07:02+00:00"
         },
         {
             "name": "ezimuel/guzzlestreams",
-            "version": "3.0.1",
+            "version": "4.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ezimuel/guzzlestreams.git",
-                "reference": "abe3791d231167f14eb80d413420d1eab91163a8"
+                "reference": "903161be81e9f497cc42fb7db982404a4e6441b0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ezimuel/guzzlestreams/zipball/abe3791d231167f14eb80d413420d1eab91163a8",
-                "reference": "abe3791d231167f14eb80d413420d1eab91163a8",
+                "url": "https://api.github.com/repos/ezimuel/guzzlestreams/zipball/903161be81e9f497cc42fb7db982404a4e6441b0",
+                "reference": "903161be81e9f497cc42fb7db982404a4e6441b0",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.4.0"
+                "php": ">=7.4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.0"
+                "phpstan/phpstan": "^2.1",
+                "phpunit/phpunit": "~9.0"
             },
             "type": "library",
             "extra": {
@@ -1565,28 +1606,28 @@
                 "stream"
             ],
             "support": {
-                "source": "https://github.com/ezimuel/guzzlestreams/tree/3.0.1"
+                "source": "https://github.com/ezimuel/guzzlestreams/tree/4.1.0"
             },
-            "time": "2020-02-14T23:11:50+00:00"
+            "time": "2025-08-05T06:44:46+00:00"
         },
         {
             "name": "ezimuel/ringphp",
-            "version": "1.2.0",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ezimuel/ringphp.git",
-                "reference": "92b8161404ab1ad84059ebed41d9f757e897ce74"
+                "reference": "bc983599ec7add50c00e420e867c403c8ed16ae7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ezimuel/ringphp/zipball/92b8161404ab1ad84059ebed41d9f757e897ce74",
-                "reference": "92b8161404ab1ad84059ebed41d9f757e897ce74",
+                "url": "https://api.github.com/repos/ezimuel/ringphp/zipball/bc983599ec7add50c00e420e867c403c8ed16ae7",
+                "reference": "bc983599ec7add50c00e420e867c403c8ed16ae7",
                 "shasum": ""
             },
             "require": {
-                "ezimuel/guzzlestreams": "^3.0.1",
+                "ezimuel/guzzlestreams": "^3.0.1 || ^4.0.0",
                 "php": ">=5.4.0",
-                "react/promise": "~2.0"
+                "react/promise": "^2.0 || ^3.0"
             },
             "replace": {
                 "guzzlehttp/ringphp": "self.version"
@@ -1622,9 +1663,9 @@
             ],
             "description": "Fork of guzzle/RingPHP (abandoned) to be used with elasticsearch-php",
             "support": {
-                "source": "https://github.com/ezimuel/ringphp/tree/1.2.0"
+                "source": "https://github.com/ezimuel/ringphp/tree/1.4.0"
             },
-            "time": "2021-11-16T11:51:30+00:00"
+            "time": "2025-08-07T09:30:38+00:00"
         },
         {
             "name": "fig/link-util",
@@ -1689,25 +1730,31 @@
         },
         {
             "name": "firebase/php-jwt",
-            "version": "v6.1.2",
+            "version": "v6.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/firebase/php-jwt.git",
-                "reference": "c297139da7c6873dbd67cbd1093f09ec0bbd0c50"
+                "reference": "a49db6f0a5033aef5143295342f1c95521b075ff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/c297139da7c6873dbd67cbd1093f09ec0bbd0c50",
-                "reference": "c297139da7c6873dbd67cbd1093f09ec0bbd0c50",
+                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/a49db6f0a5033aef5143295342f1c95521b075ff",
+                "reference": "a49db6f0a5033aef5143295342f1c95521b075ff",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1||^8.0"
+                "php": "^7.4||^8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.5||9.5"
+                "guzzlehttp/guzzle": "^6.5||^7.4",
+                "phpspec/prophecy-phpunit": "^2.0",
+                "phpunit/phpunit": "^9.5",
+                "psr/cache": "^1.0||^2.0",
+                "psr/http-client": "^1.0",
+                "psr/http-factory": "^1.0"
             },
             "suggest": {
+                "ext-sodium": "Support EdDSA (Ed25519) signatures",
                 "paragonie/sodium_compat": "Support EdDSA (Ed25519) signatures when libsodium is not present"
             },
             "type": "library",
@@ -1740,28 +1787,28 @@
             ],
             "support": {
                 "issues": "https://github.com/firebase/php-jwt/issues",
-                "source": "https://github.com/firebase/php-jwt/tree/v6.1.2"
+                "source": "https://github.com/firebase/php-jwt/tree/v6.10.0"
             },
-            "time": "2022-04-21T14:37:18+00:00"
+            "time": "2023-12-01T16:26:39+00:00"
         },
         {
             "name": "friendsofphp/proxy-manager-lts",
-            "version": "v1.0.7",
+            "version": "v1.0.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfPHP/proxy-manager-lts.git",
-                "reference": "c828ced1f932094ab79e4120a106a666565e4d9c"
+                "reference": "2c8a6cffc3220e99352ad958fe7cf06bf6f7690f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/proxy-manager-lts/zipball/c828ced1f932094ab79e4120a106a666565e4d9c",
-                "reference": "c828ced1f932094ab79e4120a106a666565e4d9c",
+                "url": "https://api.github.com/repos/FriendsOfPHP/proxy-manager-lts/zipball/2c8a6cffc3220e99352ad958fe7cf06bf6f7690f",
+                "reference": "2c8a6cffc3220e99352ad958fe7cf06bf6f7690f",
                 "shasum": ""
             },
             "require": {
                 "laminas/laminas-code": "~3.4.1|^4.0",
                 "php": ">=7.1",
-                "symfony/filesystem": "^4.4.17|^5.0|^6.0"
+                "symfony/filesystem": "^4.4.17|^5.0|^6.0|^7.0"
             },
             "conflict": {
                 "laminas/laminas-stdlib": "<3.2.1",
@@ -1772,13 +1819,13 @@
             },
             "require-dev": {
                 "ext-phar": "*",
-                "symfony/phpunit-bridge": "^5.4|^6.0"
+                "symfony/phpunit-bridge": "^5.4|^6.0|^7.0"
             },
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "ocramius/proxy-manager",
-                    "url": "https://github.com/Ocramius/ProxyManager"
+                    "url": "https://github.com/Ocramius/ProxyManager",
+                    "name": "ocramius/proxy-manager"
                 }
             },
             "autoload": {
@@ -1812,7 +1859,7 @@
             ],
             "support": {
                 "issues": "https://github.com/FriendsOfPHP/proxy-manager-lts/issues",
-                "source": "https://github.com/FriendsOfPHP/proxy-manager-lts/tree/v1.0.7"
+                "source": "https://github.com/FriendsOfPHP/proxy-manager-lts/tree/v1.0.18"
             },
             "funding": [
                 {
@@ -1824,36 +1871,36 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-03-02T09:29:19+00:00"
+            "time": "2024-03-20T12:50:41+00:00"
         },
         {
             "name": "google/auth",
-            "version": "v1.21.0",
+            "version": "v1.37.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/googleapis/google-auth-library-php.git",
-                "reference": "73392bad2eb6852eea9084b6bbdec752515cb849"
+                "reference": "25eed0045d8cf107424a8b9010c9fdcc0734ceb0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/73392bad2eb6852eea9084b6bbdec752515cb849",
-                "reference": "73392bad2eb6852eea9084b6bbdec752515cb849",
+                "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/25eed0045d8cf107424a8b9010c9fdcc0734ceb0",
+                "reference": "25eed0045d8cf107424a8b9010c9fdcc0734ceb0",
                 "shasum": ""
             },
             "require": {
-                "firebase/php-jwt": "^5.5||^6.0",
-                "guzzlehttp/guzzle": "^6.2.1|^7.0",
-                "guzzlehttp/psr7": "^1.7|^2.0",
-                "php": "^7.1||^8.0",
-                "psr/cache": "^1.0|^2.0|^3.0",
-                "psr/http-message": "^1.0"
+                "firebase/php-jwt": "^6.0",
+                "guzzlehttp/guzzle": "^6.5.8||^7.4.5",
+                "guzzlehttp/psr7": "^2.4.5",
+                "php": "^7.4||^8.0",
+                "psr/cache": "^1.0||^2.0||^3.0",
+                "psr/http-message": "^1.1||^2.0"
             },
             "require-dev": {
-                "guzzlehttp/promises": "0.1.1|^1.3",
-                "kelvinmo/simplejwt": "^0.2.5|^0.5.1",
-                "phpseclib/phpseclib": "^2.0.31",
-                "phpspec/prophecy-phpunit": "^1.1",
-                "phpunit/phpunit": "^7.5||^8.5",
+                "guzzlehttp/promises": "^2.0",
+                "kelvinmo/simplejwt": "0.7.1",
+                "phpseclib/phpseclib": "^3.0",
+                "phpspec/prophecy-phpunit": "^2.0",
+                "phpunit/phpunit": "^9.0.0",
                 "sebastian/comparator": ">=1.2.3",
                 "squizlabs/php_codesniffer": "^3.5"
             },
@@ -1880,41 +1927,43 @@
             "support": {
                 "docs": "https://googleapis.github.io/google-auth-library-php/main/",
                 "issues": "https://github.com/googleapis/google-auth-library-php/issues",
-                "source": "https://github.com/googleapis/google-auth-library-php/tree/v1.21.0"
+                "source": "https://github.com/googleapis/google-auth-library-php/tree/v1.37.2"
             },
-            "time": "2022-04-13T20:35:52+00:00"
+            "time": "2024-12-11T18:15:11+00:00"
         },
         {
             "name": "google/cloud-core",
-            "version": "v1.44.3",
+            "version": "v1.56.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/googleapis/google-cloud-php-core.git",
-                "reference": "eac417a907beaa3bc2783a17b90c0113b7aa86e6"
+                "reference": "35ca0fd74685c635a4c027c871de9d716c504933"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/eac417a907beaa3bc2783a17b90c0113b7aa86e6",
-                "reference": "eac417a907beaa3bc2783a17b90c0113b7aa86e6",
+                "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/35ca0fd74685c635a4c027c871de9d716c504933",
+                "reference": "35ca0fd74685c635a4c027c871de9d716c504933",
                 "shasum": ""
             },
             "require": {
-                "google/auth": "^1.18",
-                "guzzlehttp/guzzle": "^5.3|^6.0|^7.0",
-                "guzzlehttp/promises": "^1.3",
-                "guzzlehttp/psr7": "^1.7|^2.0",
-                "monolog/monolog": "^1.1|^2.0",
-                "php": ">=5.5",
-                "psr/http-message": "1.0.*",
+                "google/auth": "^1.34",
+                "google/gax": "^1.27.0",
+                "guzzlehttp/guzzle": "^6.5.8|^7.4.4",
+                "guzzlehttp/promises": "^1.4||^2.0",
+                "guzzlehttp/psr7": "^2.6",
+                "monolog/monolog": "^2.9|^3.0",
+                "php": ">=7.4",
+                "psr/http-message": "^1.0|^2.0",
                 "rize/uri-template": "~0.3"
             },
             "require-dev": {
                 "erusev/parsedown": "^1.6",
-                "google/common-protos": "^1.0||^2.0",
-                "google/gax": "^1.9",
+                "google/cloud-common-protos": "~0.5",
                 "opis/closure": "^3",
-                "phpdocumentor/reflection": "^3.0",
-                "phpunit/phpunit": "^4.8|^5.0",
+                "phpdocumentor/reflection": "^5.3.3",
+                "phpdocumentor/reflection-docblock": "^5.3",
+                "phpspec/prophecy-phpunit": "^2.0",
+                "phpunit/phpunit": "^9.0",
                 "squizlabs/php_codesniffer": "2.*"
             },
             "suggest": {
@@ -1928,9 +1977,9 @@
             "extra": {
                 "component": {
                     "id": "cloud-core",
-                    "target": "googleapis/google-cloud-php-core.git",
                     "path": "Core",
-                    "entry": "src/ServiceBuilder.php"
+                    "entry": "src/ServiceBuilder.php",
+                    "target": "googleapis/google-cloud-php-core.git"
                 }
             },
             "autoload": {
@@ -1944,34 +1993,37 @@
             ],
             "description": "Google Cloud PHP shared dependency, providing functionality useful to all components.",
             "support": {
-                "source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.44.3"
+                "source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.56.0"
             },
-            "time": "2022-04-27T23:24:15+00:00"
+            "time": "2024-02-23T23:49:35+00:00"
         },
         {
             "name": "google/cloud-storage",
-            "version": "v1.26.2",
+            "version": "v1.39.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/googleapis/google-cloud-php-storage.git",
-                "reference": "a515dc6f80bee00ded6364626953b3b8de15c303"
+                "reference": "2425a167578084af5c9b87fac6eb59b09b33b8f5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/googleapis/google-cloud-php-storage/zipball/a515dc6f80bee00ded6364626953b3b8de15c303",
-                "reference": "a515dc6f80bee00ded6364626953b3b8de15c303",
+                "url": "https://api.github.com/repos/googleapis/google-cloud-php-storage/zipball/2425a167578084af5c9b87fac6eb59b09b33b8f5",
+                "reference": "2425a167578084af5c9b87fac6eb59b09b33b8f5",
                 "shasum": ""
             },
             "require": {
-                "google/cloud-core": "^1.43",
-                "google/crc32": "^0.1.0"
+                "google/cloud-core": "^1.55",
+                "php": ">=7.4",
+                "ramsey/uuid": "^4.2.3"
             },
             "require-dev": {
                 "erusev/parsedown": "^1.6",
                 "google/cloud-pubsub": "^1.0",
-                "phpdocumentor/reflection": "^3.0",
-                "phpseclib/phpseclib": "^2",
-                "phpunit/phpunit": "^4.8|^5.0",
+                "phpdocumentor/reflection": "^5.3.3",
+                "phpdocumentor/reflection-docblock": "^5.3",
+                "phpseclib/phpseclib": "^2.0||^3.0",
+                "phpspec/prophecy-phpunit": "^2.0",
+                "phpunit/phpunit": "^9.0",
                 "squizlabs/php_codesniffer": "2.*"
             },
             "suggest": {
@@ -1982,9 +2034,9 @@
             "extra": {
                 "component": {
                     "id": "cloud-storage",
-                    "target": "googleapis/google-cloud-php-storage.git",
                     "path": "Storage",
-                    "entry": "src/StorageClient.php"
+                    "entry": "src/StorageClient.php",
+                    "target": "googleapis/google-cloud-php-storage.git"
                 }
             },
             "autoload": {
@@ -1998,74 +2050,312 @@
             ],
             "description": "Cloud Storage Client for PHP",
             "support": {
-                "source": "https://github.com/googleapis/google-cloud-php-storage/tree/v1.26.2"
+                "source": "https://github.com/googleapis/google-cloud-php-storage/tree/v1.39.0"
             },
-            "time": "2022-04-20T18:34:50+00:00"
+            "time": "2024-02-23T23:49:35+00:00"
         },
         {
-            "name": "google/crc32",
-            "version": "v0.1.0",
+            "name": "google/common-protos",
+            "version": "v4.5.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/google/php-crc32.git",
-                "reference": "a8525f0dea6fca1893e1bae2f6e804c5f7d007fb"
+                "url": "https://github.com/googleapis/common-protos-php.git",
+                "reference": "dfc232e90823cedca107b56e7371f2e2f35b9427"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/google/php-crc32/zipball/a8525f0dea6fca1893e1bae2f6e804c5f7d007fb",
-                "reference": "a8525f0dea6fca1893e1bae2f6e804c5f7d007fb",
+                "url": "https://api.github.com/repos/googleapis/common-protos-php/zipball/dfc232e90823cedca107b56e7371f2e2f35b9427",
+                "reference": "dfc232e90823cedca107b56e7371f2e2f35b9427",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.4"
+                "google/protobuf": "^3.6.1",
+                "php": ">=7.4"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "^1.13 || v2.14.2",
-                "paragonie/random_compat": ">=2",
-                "phpunit/phpunit": "^4"
+                "phpunit/phpunit": "^9.0"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Google\\CRC32\\": "src"
+                    "Google\\Api\\": "src/Api",
+                    "Google\\Iam\\": "src/Iam",
+                    "Google\\Rpc\\": "src/Rpc",
+                    "Google\\Type\\": "src/Type",
+                    "Google\\Cloud\\": "src/Cloud",
+                    "GPBMetadata\\Google\\Api\\": "metadata/Api",
+                    "GPBMetadata\\Google\\Iam\\": "metadata/Iam",
+                    "GPBMetadata\\Google\\Rpc\\": "metadata/Rpc",
+                    "GPBMetadata\\Google\\Type\\": "metadata/Type",
+                    "GPBMetadata\\Google\\Cloud\\": "metadata/Cloud",
+                    "GPBMetadata\\Google\\Logging\\": "metadata/Logging"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "Apache-2.0"
             ],
-            "authors": [
-                {
-                    "name": "Andrew Brampton",
-                    "email": "bramp@google.com"
+            "description": "Google API Common Protos for PHP",
+            "homepage": "https://github.com/googleapis/common-protos-php",
+            "keywords": [
+                "google"
+            ],
+            "support": {
+                "issues": "https://github.com/googleapis/common-protos-php/issues",
+                "source": "https://github.com/googleapis/common-protos-php/tree/v4.5.0"
+            },
+            "time": "2023-11-29T21:08:16+00:00"
+        },
+        {
+            "name": "google/gax",
+            "version": "v1.29.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/googleapis/gax-php.git",
+                "reference": "e400e2432475f0ab85d3fdd6eddbc995ba787a21"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/googleapis/gax-php/zipball/e400e2432475f0ab85d3fdd6eddbc995ba787a21",
+                "reference": "e400e2432475f0ab85d3fdd6eddbc995ba787a21",
+                "shasum": ""
+            },
+            "require": {
+                "google/auth": "^1.34.0",
+                "google/common-protos": "^4.4",
+                "google/grpc-gcp": "^0.2||^0.3",
+                "google/longrunning": "~0.2",
+                "google/protobuf": "^3.22",
+                "grpc/grpc": "^1.13",
+                "guzzlehttp/promises": "^1.4||^2.0",
+                "guzzlehttp/psr7": "^2.0",
+                "php": ">=7.4"
+            },
+            "conflict": {
+                "ext-protobuf": "<3.7.0"
+            },
+            "require-dev": {
+                "phpspec/prophecy-phpunit": "^2.0",
+                "phpunit/phpunit": "^9.0",
+                "squizlabs/php_codesniffer": "3.*"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Google\\ApiCore\\": "src",
+                    "GPBMetadata\\ApiCore\\": "metadata/ApiCore"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Google API Core for PHP",
+            "homepage": "https://github.com/googleapis/gax-php",
+            "keywords": [
+                "google"
+            ],
+            "support": {
+                "issues": "https://github.com/googleapis/gax-php/issues",
+                "source": "https://github.com/googleapis/gax-php/tree/v1.29.2"
+            },
+            "time": "2024-12-11T18:10:54+00:00"
+        },
+        {
+            "name": "google/grpc-gcp",
+            "version": "v0.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/GoogleCloudPlatform/grpc-gcp-php.git",
+                "reference": "4d8b455a45a89f57e1552cadc41a43bc34c40456"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/GoogleCloudPlatform/grpc-gcp-php/zipball/4d8b455a45a89f57e1552cadc41a43bc34c40456",
+                "reference": "4d8b455a45a89f57e1552cadc41a43bc34c40456",
+                "shasum": ""
+            },
+            "require": {
+                "google/auth": "^1.3",
+                "google/protobuf": "^v3.3.0",
+                "grpc/grpc": "^v1.13.0",
+                "php": "^7.4||^8.0",
+                "psr/cache": "^1.0.1||^2.0.0||^3.0.0"
+            },
+            "require-dev": {
+                "google/cloud-spanner": "^1.7",
+                "phpunit/phpunit": "^9.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Grpc\\Gcp\\": "src/"
+                },
+                "classmap": [
+                    "src/generated/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "description": "gRPC GCP library for channel management",
+            "support": {
+                "issues": "https://github.com/GoogleCloudPlatform/grpc-gcp-php/issues",
+                "source": "https://github.com/GoogleCloudPlatform/grpc-gcp-php/tree/v0.3.0"
+            },
+            "time": "2023-04-24T14:37:29+00:00"
+        },
+        {
+            "name": "google/longrunning",
+            "version": "0.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/googleapis/php-longrunning.git",
+                "reference": "226d3b5166eaa13754cc5e452b37872478e23375"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/googleapis/php-longrunning/zipball/226d3b5166eaa13754cc5e452b37872478e23375",
+                "reference": "226d3b5166eaa13754cc5e452b37872478e23375",
+                "shasum": ""
+            },
+            "require-dev": {
+                "google/gax": "^1.38.0",
+                "phpunit/phpunit": "^9.0"
+            },
+            "type": "library",
+            "extra": {
+                "component": {
+                    "id": "longrunning",
+                    "path": "LongRunning",
+                    "entry": null,
+                    "target": "googleapis/php-longrunning"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Google\\LongRunning\\": "src/LongRunning",
+                    "Google\\ApiCore\\LongRunning\\": "src/ApiCore/LongRunning",
+                    "GPBMetadata\\Google\\Longrunning\\": "metadata/Longrunning"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "description": "Google LongRunning Client for PHP",
+            "support": {
+                "source": "https://github.com/googleapis/php-longrunning/tree/v0.6.0"
+            },
+            "time": "2025-10-07T18:41:09+00:00"
+        },
+        {
+            "name": "google/protobuf",
+            "version": "v3.25.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/protocolbuffers/protobuf-php.git",
+                "reference": "57d440fc54a00fda5b8781e8d9bf0140ea6d8e52"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/protocolbuffers/protobuf-php/zipball/57d440fc54a00fda5b8781e8d9bf0140ea6d8e52",
+                "reference": "57d440fc54a00fda5b8781e8d9bf0140ea6d8e52",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": ">=5.0.0"
+            },
+            "suggest": {
+                "ext-bcmath": "Need to support JSON deserialization"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Google\\Protobuf\\": "src/Google/Protobuf",
+                    "GPBMetadata\\Google\\Protobuf\\": "src/GPBMetadata/Google/Protobuf"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "proto library for PHP",
+            "homepage": "https://developers.google.com/protocol-buffers/",
+            "keywords": [
+                "proto"
+            ],
+            "support": {
+                "source": "https://github.com/protocolbuffers/protobuf-php/tree/v3.25.8"
+            },
+            "time": "2025-05-27T21:04:40+00:00"
+        },
+        {
+            "name": "grpc/grpc",
+            "version": "1.74.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/grpc/grpc-php.git",
+                "reference": "32bf4dba256d60d395582fb6e4e8d3936bcdb713"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/grpc/grpc-php/zipball/32bf4dba256d60d395582fb6e4e8d3936bcdb713",
+                "reference": "32bf4dba256d60d395582fb6e4e8d3936bcdb713",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0.0"
+            },
+            "require-dev": {
+                "google/auth": "^v1.3.0"
+            },
+            "suggest": {
+                "ext-protobuf": "For better performance, install the protobuf C extension.",
+                "google/protobuf": "To get started using grpc quickly, install the native protobuf library."
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Grpc\\": "src/lib/"
                 }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "description": "gRPC library for PHP",
+            "homepage": "https://grpc.io",
+            "keywords": [
+                "rpc"
             ],
-            "description": "Various CRC32 implementations",
-            "homepage": "https://github.com/google/php-crc32",
             "support": {
-                "issues": "https://github.com/google/php-crc32/issues",
-                "source": "https://github.com/google/php-crc32/tree/v0.1.0"
+                "source": "https://github.com/grpc/grpc-php/tree/v1.74.0"
             },
-            "time": "2019-05-09T06:24:58+00:00"
+            "time": "2025-07-24T20:02:16+00:00"
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "7.4.3",
+            "version": "7.9.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "74a8602c6faec9ef74b7a9391ac82c5e65b1cdab"
+                "reference": "7b2f29fe81dc4da0ca0ea7d42107a0845946ea77"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/74a8602c6faec9ef74b7a9391ac82c5e65b1cdab",
-                "reference": "74a8602c6faec9ef74b7a9391ac82c5e65b1cdab",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/7b2f29fe81dc4da0ca0ea7d42107a0845946ea77",
+                "reference": "7b2f29fe81dc4da0ca0ea7d42107a0845946ea77",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "guzzlehttp/promises": "^1.5",
-                "guzzlehttp/psr7": "^1.8.3 || ^2.1",
+                "guzzlehttp/promises": "^1.5.3 || ^2.0.3",
+                "guzzlehttp/psr7": "^2.7.0",
                 "php": "^7.2.5 || ^8.0",
                 "psr/http-client": "^1.0",
                 "symfony/deprecation-contracts": "^2.2 || ^3.0"
@@ -2074,10 +2364,11 @@
                 "psr/http-client-implementation": "1.0"
             },
             "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.4.1",
+                "bamarni/composer-bin-plugin": "^1.8.2",
                 "ext-curl": "*",
-                "php-http/client-integration-tests": "^3.0",
-                "phpunit/phpunit": "^8.5.5 || ^9.3.5",
+                "guzzle/client-integration-tests": "3.0.2",
+                "php-http/message-factory": "^1.1",
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20",
                 "psr/log": "^1.1 || ^2.0 || ^3.0"
             },
             "suggest": {
@@ -2087,8 +2378,9 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "7.4-dev"
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": false
                 }
             },
             "autoload": {
@@ -2154,7 +2446,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.4.3"
+                "source": "https://github.com/guzzle/guzzle/tree/7.9.3"
             },
             "funding": [
                 {
@@ -2170,38 +2462,37 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-25T13:24:33+00:00"
+            "time": "2025-03-27T13:37:11+00:00"
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "1.5.1",
+            "version": "2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da"
+                "reference": "481557b130ef3790cf82b713667b43030dc9c957"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
-                "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/481557b130ef3790cf82b713667b43030dc9c957",
+                "reference": "481557b130ef3790cf82b713667b43030dc9c957",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5"
+                "php": "^7.2.5 || ^8.0"
             },
             "require-dev": {
-                "symfony/phpunit-bridge": "^4.4 || ^5.1"
+                "bamarni/composer-bin-plugin": "^1.8.2",
+                "phpunit/phpunit": "^8.5.44 || ^9.6.25"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "1.5-dev"
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": false
                 }
             },
             "autoload": {
-                "files": [
-                    "src/functions_include.php"
-                ],
                 "psr-4": {
                     "GuzzleHttp\\Promise\\": "src/"
                 }
@@ -2238,7 +2529,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/1.5.1"
+                "source": "https://github.com/guzzle/promises/tree/2.3.0"
             },
             "funding": [
                 {
@@ -2254,26 +2545,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-10-22T20:56:57+00:00"
+            "time": "2025-08-22T14:34:08+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "2.2.1",
+            "version": "2.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "c94a94f120803a18554c1805ef2e539f8285f9a2"
+                "reference": "c2270caaabe631b3b44c85f99e5a04bbb8060d16"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/c94a94f120803a18554c1805ef2e539f8285f9a2",
-                "reference": "c94a94f120803a18554c1805ef2e539f8285f9a2",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/c2270caaabe631b3b44c85f99e5a04bbb8060d16",
+                "reference": "c2270caaabe631b3b44c85f99e5a04bbb8060d16",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2.5 || ^8.0",
                 "psr/http-factory": "^1.0",
-                "psr/http-message": "^1.0",
+                "psr/http-message": "^1.1 || ^2.0",
                 "ralouphie/getallheaders": "^3.0"
             },
             "provide": {
@@ -2281,17 +2572,18 @@
                 "psr/http-message-implementation": "1.0"
             },
             "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.4.1",
-                "http-interop/http-factory-tests": "^0.9",
-                "phpunit/phpunit": "^8.5.8 || ^9.3.10"
+                "bamarni/composer-bin-plugin": "^1.8.2",
+                "http-interop/http-factory-tests": "0.9.0",
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20"
             },
             "suggest": {
                 "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "2.2-dev"
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": false
                 }
             },
             "autoload": {
@@ -2353,7 +2645,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.2.1"
+                "source": "https://github.com/guzzle/psr7/tree/2.7.1"
             },
             "funding": [
                 {
@@ -2369,20 +2661,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-03-20T21:55:58+00:00"
+            "time": "2025-03-27T12:30:47+00:00"
         },
         {
             "name": "laminas/laminas-code",
-            "version": "4.5.1",
+            "version": "4.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-code.git",
-                "reference": "6fd96d4d913571a2cd056a27b123fa28cb90ac4e"
+                "reference": "91aabc066d5620428120800c0eafc0411e441a62"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-code/zipball/6fd96d4d913571a2cd056a27b123fa28cb90ac4e",
-                "reference": "6fd96d4d913571a2cd056a27b123fa28cb90ac4e",
+                "url": "https://api.github.com/repos/laminas/laminas-code/zipball/91aabc066d5620428120800c0eafc0411e441a62",
+                "reference": "91aabc066d5620428120800c0eafc0411e441a62",
                 "shasum": ""
             },
             "require": {
@@ -2394,7 +2686,7 @@
                 "laminas/laminas-coding-standard": "^2.3.0",
                 "laminas/laminas-stdlib": "^3.6.1",
                 "phpunit/phpunit": "^9.5.10",
-                "psalm/plugin-phpunit": "^0.16.1",
+                "psalm/plugin-phpunit": "^0.17.0",
                 "vimeo/psalm": "^4.13.1"
             },
             "suggest": {
@@ -2435,36 +2727,36 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2021-12-19T18:06:55+00:00"
+            "time": "2022-11-21T01:32:31+00:00"
         },
         {
             "name": "laminas/laminas-escaper",
-            "version": "2.10.0",
+            "version": "2.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-escaper.git",
-                "reference": "58af67282db37d24e584a837a94ee55b9c7552be"
+                "reference": "ee7a4c37bf3d0e8c03635d5bddb5bb3184ead490"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/58af67282db37d24e584a837a94ee55b9c7552be",
-                "reference": "58af67282db37d24e584a837a94ee55b9c7552be",
+                "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/ee7a4c37bf3d0e8c03635d5bddb5bb3184ead490",
+                "reference": "ee7a4c37bf3d0e8c03635d5bddb5bb3184ead490",
                 "shasum": ""
             },
             "require": {
                 "ext-ctype": "*",
                 "ext-mbstring": "*",
-                "php": "^7.4 || ~8.0.0 || ~8.1.0"
+                "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0"
             },
             "conflict": {
                 "zendframework/zend-escaper": "*"
             },
             "require-dev": {
                 "infection/infection": "^0.26.6",
-                "laminas/laminas-coding-standard": "~2.3.0",
+                "laminas/laminas-coding-standard": "~2.4.0",
                 "maglnet/composer-require-checker": "^3.8.0",
                 "phpunit/phpunit": "^9.5.18",
-                "psalm/plugin-phpunit": "^0.16.1",
+                "psalm/plugin-phpunit": "^0.17.0",
                 "vimeo/psalm": "^4.22.0"
             },
             "type": "library",
@@ -2497,20 +2789,20 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2022-03-08T20:15:36+00:00"
+            "time": "2022-10-10T10:11:09+00:00"
         },
         {
             "name": "league/flysystem",
-            "version": "1.1.9",
+            "version": "1.1.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "094defdb4a7001845300334e7c1ee2335925ef99"
+                "reference": "3239285c825c152bcc315fe0e87d6b55f5972ed1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/094defdb4a7001845300334e7c1ee2335925ef99",
-                "reference": "094defdb4a7001845300334e7c1ee2335925ef99",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/3239285c825c152bcc315fe0e87d6b55f5972ed1",
+                "reference": "3239285c825c152bcc315fe0e87d6b55f5972ed1",
                 "shasum": ""
             },
             "require": {
@@ -2583,7 +2875,7 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/flysystem/issues",
-                "source": "https://github.com/thephpleague/flysystem/tree/1.1.9"
+                "source": "https://github.com/thephpleague/flysystem/tree/1.1.10"
             },
             "funding": [
                 {
@@ -2591,20 +2883,20 @@
                     "type": "other"
                 }
             ],
-            "time": "2021-12-09T09:40:50+00:00"
+            "time": "2022-10-04T09:16:37+00:00"
         },
         {
             "name": "league/flysystem-aws-s3-v3",
-            "version": "1.0.29",
+            "version": "1.0.30",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git",
-                "reference": "4e25cc0582a36a786c31115e419c6e40498f6972"
+                "reference": "af286f291ebab6877bac0c359c6c2cb017eb061d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/4e25cc0582a36a786c31115e419c6e40498f6972",
-                "reference": "4e25cc0582a36a786c31115e419c6e40498f6972",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/af286f291ebab6877bac0c359c6c2cb017eb061d",
+                "reference": "af286f291ebab6877bac0c359c6c2cb017eb061d",
                 "shasum": ""
             },
             "require": {
@@ -2640,32 +2932,46 @@
             "description": "Flysystem adapter for the AWS S3 SDK v3.x",
             "support": {
                 "issues": "https://github.com/thephpleague/flysystem-aws-s3-v3/issues",
-                "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/1.0.29"
+                "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/1.0.30"
             },
-            "time": "2020-10-08T18:58:37+00:00"
+            "funding": [
+                {
+                    "url": "https://offset.earth/frankdejonge",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/frankdejonge",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/league/flysystem",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-07-02T13:51:38+00:00"
         },
         {
             "name": "league/mime-type-detection",
-            "version": "1.11.0",
+            "version": "1.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/mime-type-detection.git",
-                "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd"
+                "reference": "2d6702ff215bf922936ccc1ad31007edc76451b9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ff6248ea87a9f116e78edd6002e39e5128a0d4dd",
-                "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd",
+                "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/2d6702ff215bf922936ccc1ad31007edc76451b9",
+                "reference": "2d6702ff215bf922936ccc1ad31007edc76451b9",
                 "shasum": ""
             },
             "require": {
                 "ext-fileinfo": "*",
-                "php": "^7.2 || ^8.0"
+                "php": "^7.4 || ^8.0"
             },
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "^3.2",
                 "phpstan/phpstan": "^0.12.68",
-                "phpunit/phpunit": "^8.5.8 || ^9.3"
+                "phpunit/phpunit": "^8.5.8 || ^9.3 || ^10.0"
             },
             "type": "library",
             "autoload": {
@@ -2686,7 +2992,7 @@
             "description": "Mime-type detection for Flysystem",
             "support": {
                 "issues": "https://github.com/thephpleague/mime-type-detection/issues",
-                "source": "https://github.com/thephpleague/mime-type-detection/tree/1.11.0"
+                "source": "https://github.com/thephpleague/mime-type-detection/tree/1.16.0"
             },
             "funding": [
                 {
@@ -2698,20 +3004,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-17T13:12:02+00:00"
+            "time": "2024-09-21T08:32:55+00:00"
         },
         {
             "name": "monolog/monolog",
-            "version": "2.5.0",
+            "version": "2.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "4192345e260f1d51b365536199744b987e160edc"
+                "reference": "5cf826f2991858b54d5c3809bee745560a1042a7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/4192345e260f1d51b365536199744b987e160edc",
-                "reference": "4192345e260f1d51b365536199744b987e160edc",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/5cf826f2991858b54d5c3809bee745560a1042a7",
+                "reference": "5cf826f2991858b54d5c3809bee745560a1042a7",
                 "shasum": ""
             },
             "require": {
@@ -2724,18 +3030,22 @@
             "require-dev": {
                 "aws/aws-sdk-php": "^2.4.9 || ^3.0",
                 "doctrine/couchdb": "~1.0@dev",
-                "elasticsearch/elasticsearch": "^7",
-                "graylog2/gelf-php": "^1.4.2",
+                "elasticsearch/elasticsearch": "^7 || ^8",
+                "ext-json": "*",
+                "graylog2/gelf-php": "^1.4.2 || ^2@dev",
+                "guzzlehttp/guzzle": "^7.4",
+                "guzzlehttp/psr7": "^2.2",
                 "mongodb/mongodb": "^1.8",
                 "php-amqplib/php-amqplib": "~2.4 || ^3",
-                "php-console/php-console": "^3.1.3",
-                "phpspec/prophecy": "^1.6.1",
-                "phpstan/phpstan": "^0.12.91",
-                "phpunit/phpunit": "^8.5",
-                "predis/predis": "^1.1",
+                "phpspec/prophecy": "^1.15",
+                "phpstan/phpstan": "^1.10",
+                "phpunit/phpunit": "^8.5.38 || ^9.6.19",
+                "predis/predis": "^1.1 || ^2.0",
                 "rollbar/rollbar": "^1.3 || ^2 || ^3",
-                "ruflin/elastica": ">=0.90@dev",
-                "swiftmailer/swiftmailer": "^5.3|^6.0"
+                "ruflin/elastica": "^7",
+                "swiftmailer/swiftmailer": "^5.3|^6.0",
+                "symfony/mailer": "^5.4 || ^6",
+                "symfony/mime": "^5.4 || ^6"
             },
             "suggest": {
                 "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
@@ -2750,7 +3060,6 @@
                 "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
                 "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)",
                 "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
-                "php-console/php-console": "Allow sending log messages to Google Chrome",
                 "rollbar/rollbar": "Allow sending log messages to Rollbar",
                 "ruflin/elastica": "Allow sending log messages to an Elastic Search server"
             },
@@ -2785,7 +3094,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/monolog/issues",
-                "source": "https://github.com/Seldaek/monolog/tree/2.5.0"
+                "source": "https://github.com/Seldaek/monolog/tree/2.10.0"
             },
             "funding": [
                 {
@@ -2797,38 +3106,39 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-08T15:43:54+00:00"
+            "time": "2024-11-12T12:43:37+00:00"
         },
         {
             "name": "mpdf/mpdf",
-            "version": "v8.1.1",
+            "version": "v8.2.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mpdf/mpdf.git",
-                "reference": "e511e89a66bdb066e3fbf352f00f4734d5064cbf"
+                "reference": "e175b05e3e00977b85feb96a8cccb174ac63621f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mpdf/mpdf/zipball/e511e89a66bdb066e3fbf352f00f4734d5064cbf",
-                "reference": "e511e89a66bdb066e3fbf352f00f4734d5064cbf",
+                "url": "https://api.github.com/repos/mpdf/mpdf/zipball/e175b05e3e00977b85feb96a8cccb174ac63621f",
+                "reference": "e175b05e3e00977b85feb96a8cccb174ac63621f",
                 "shasum": ""
             },
             "require": {
                 "ext-gd": "*",
                 "ext-mbstring": "*",
+                "mpdf/psr-http-message-shim": "^1.0 || ^2.0",
+                "mpdf/psr-log-aware-trait": "^2.0 || ^3.0",
                 "myclabs/deep-copy": "^1.7",
                 "paragonie/random_compat": "^1.4|^2.0|^9.99.99",
-                "php": "^5.6 || ^7.0 || ~8.0.0 || ~8.1.0",
-                "php-http/message-factory": "^1.0",
-                "psr/http-message": "^1.0",
-                "psr/log": "^1.0 || ^2.0",
+                "php": "^5.6 || ^7.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
+                "psr/http-message": "^1.0 || ^2.0",
+                "psr/log": "^1.0 || ^2.0 || ^3.0",
                 "setasign/fpdi": "^2.1"
             },
             "require-dev": {
                 "mockery/mockery": "^1.3.0",
                 "mpdf/qrcode": "^1.1.0",
                 "squizlabs/php_codesniffer": "^3.5.0",
-                "tracy/tracy": "^2.4",
+                "tracy/tracy": "~2.5",
                 "yoast/phpunit-polyfills": "^1.0"
             },
             "suggest": {
@@ -2838,6 +3148,9 @@
             },
             "type": "library",
             "autoload": {
+                "files": [
+                    "src/functions.php"
+                ],
                 "psr-4": {
                     "Mpdf\\": "src/"
                 }
@@ -2864,7 +3177,7 @@
                 "utf-8"
             ],
             "support": {
-                "docs": "http://mpdf.github.io",
+                "docs": "https://mpdf.github.io",
                 "issues": "https://github.com/mpdf/mpdf/issues",
                 "source": "https://github.com/mpdf/mpdf"
             },
@@ -2874,29 +3187,121 @@
                     "type": "custom"
                 }
             ],
-            "time": "2022-04-18T11:50:28+00:00"
+            "time": "2024-11-18T15:30:42+00:00"
         },
         {
-            "name": "mtdowling/jmespath.php",
-            "version": "2.6.1",
+            "name": "mpdf/psr-http-message-shim",
+            "version": "v2.0.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/jmespath/jmespath.php.git",
-                "reference": "9b87907a81b87bc76d19a7fb2d61e61486ee9edb"
+                "url": "https://github.com/mpdf/psr-http-message-shim.git",
+                "reference": "f25a0153d645e234f9db42e5433b16d9b113920f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/9b87907a81b87bc76d19a7fb2d61e61486ee9edb",
-                "reference": "9b87907a81b87bc76d19a7fb2d61e61486ee9edb",
+                "url": "https://api.github.com/repos/mpdf/psr-http-message-shim/zipball/f25a0153d645e234f9db42e5433b16d9b113920f",
+                "reference": "f25a0153d645e234f9db42e5433b16d9b113920f",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.4 || ^7.0 || ^8.0",
-                "symfony/polyfill-mbstring": "^1.17"
+                "psr/http-message": "^2.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Mpdf\\PsrHttpMessageShim\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mark Dorison",
+                    "email": "mark@chromatichq.com"
+                },
+                {
+                    "name": "Kristofer Widholm",
+                    "email": "kristofer@chromatichq.com"
+                },
+                {
+                    "name": "Nigel Cunningham",
+                    "email": "nigel.cunningham@technocrat.com.au"
+                }
+            ],
+            "description": "Shim to allow support of different psr/message versions.",
+            "support": {
+                "issues": "https://github.com/mpdf/psr-http-message-shim/issues",
+                "source": "https://github.com/mpdf/psr-http-message-shim/tree/v2.0.1"
+            },
+            "time": "2023-10-02T14:34:03+00:00"
+        },
+        {
+            "name": "mpdf/psr-log-aware-trait",
+            "version": "v2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/mpdf/psr-log-aware-trait.git",
+                "reference": "7a077416e8f39eb626dee4246e0af99dd9ace275"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/mpdf/psr-log-aware-trait/zipball/7a077416e8f39eb626dee4246e0af99dd9ace275",
+                "reference": "7a077416e8f39eb626dee4246e0af99dd9ace275",
+                "shasum": ""
+            },
+            "require": {
+                "psr/log": "^1.0 || ^2.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Mpdf\\PsrLogAwareTrait\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mark Dorison",
+                    "email": "mark@chromatichq.com"
+                },
+                {
+                    "name": "Kristofer Widholm",
+                    "email": "kristofer@chromatichq.com"
+                }
+            ],
+            "description": "Trait to allow support of different psr/log versions.",
+            "support": {
+                "issues": "https://github.com/mpdf/psr-log-aware-trait/issues",
+                "source": "https://github.com/mpdf/psr-log-aware-trait/tree/v2.0.0"
+            },
+            "time": "2023-05-03T06:18:28+00:00"
+        },
+        {
+            "name": "mtdowling/jmespath.php",
+            "version": "2.8.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/jmespath/jmespath.php.git",
+                "reference": "a2a865e05d5f420b50cc2f85bb78d565db12a6bc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/a2a865e05d5f420b50cc2f85bb78d565db12a6bc",
+                "reference": "a2a865e05d5f420b50cc2f85bb78d565db12a6bc",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2.5 || ^8.0",
+                "symfony/polyfill-mbstring": "^1.17"
             },
             "require-dev": {
-                "composer/xdebug-handler": "^1.4 || ^2.0",
-                "phpunit/phpunit": "^4.8.36 || ^7.5.15"
+                "composer/xdebug-handler": "^3.0.3",
+                "phpunit/phpunit": "^8.5.33"
             },
             "bin": [
                 "bin/jp.php"
@@ -2904,7 +3309,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.6-dev"
+                    "dev-master": "2.8-dev"
                 }
             },
             "autoload": {
@@ -2920,6 +3325,11 @@
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
+                },
                 {
                     "name": "Michael Dowling",
                     "email": "mtdowling@gmail.com",
@@ -2933,22 +3343,22 @@
             ],
             "support": {
                 "issues": "https://github.com/jmespath/jmespath.php/issues",
-                "source": "https://github.com/jmespath/jmespath.php/tree/2.6.1"
+                "source": "https://github.com/jmespath/jmespath.php/tree/2.8.0"
             },
-            "time": "2021-06-14T00:11:39+00:00"
+            "time": "2024-09-04T18:46:31+00:00"
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.11.0",
+            "version": "1.13.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614"
+                "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614",
-                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/07d290f0c47959fd5eed98c95ee5602db07e0b6a",
+                "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a",
                 "shasum": ""
             },
             "require": {
@@ -2956,11 +3366,12 @@
             },
             "conflict": {
                 "doctrine/collections": "<1.6.8",
-                "doctrine/common": "<2.13.3 || >=3,<3.2.2"
+                "doctrine/common": "<2.13.3 || >=3 <3.2.2"
             },
             "require-dev": {
                 "doctrine/collections": "^1.6.8",
                 "doctrine/common": "^2.13.3 || ^3.2.2",
+                "phpspec/prophecy": "^1.10",
                 "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
             },
             "type": "library",
@@ -2986,7 +3397,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.13.4"
             },
             "funding": [
                 {
@@ -2994,7 +3405,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-03-03T13:19:32+00:00"
+            "time": "2025-08-01T08:46:24+00:00"
         },
         {
             "name": "ongr/elasticsearch-dsl",
@@ -3048,60 +3459,6 @@
             },
             "time": "2021-04-27T10:58:40+00:00"
         },
-        {
-            "name": "php-http/message-factory",
-            "version": "v1.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-http/message-factory.git",
-                "reference": "a478cb11f66a6ac48d8954216cfed9aa06a501a1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-http/message-factory/zipball/a478cb11f66a6ac48d8954216cfed9aa06a501a1",
-                "reference": "a478cb11f66a6ac48d8954216cfed9aa06a501a1",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.4",
-                "psr/http-message": "^1.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Http\\Message\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Márk Sági-Kazár",
-                    "email": "mark.sagikazar@gmail.com"
-                }
-            ],
-            "description": "Factory interfaces for PSR-7 HTTP Message",
-            "homepage": "http://php-http.org",
-            "keywords": [
-                "factory",
-                "http",
-                "message",
-                "stream",
-                "uri"
-            ],
-            "support": {
-                "issues": "https://github.com/php-http/message-factory/issues",
-                "source": "https://github.com/php-http/message-factory/tree/master"
-            },
-            "time": "2015-12-19T14:08:53+00:00"
-        },
         {
             "name": "psr/cache",
             "version": "1.0.1",
@@ -3201,21 +3558,21 @@
         },
         {
             "name": "psr/http-client",
-            "version": "1.0.1",
+            "version": "1.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-client.git",
-                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"
+                "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
-                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
+                "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90",
+                "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.0 || ^8.0",
-                "psr/http-message": "^1.0"
+                "psr/http-message": "^1.0 || ^2.0"
             },
             "type": "library",
             "extra": {
@@ -3235,7 +3592,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for HTTP clients",
@@ -3247,27 +3604,27 @@
                 "psr-18"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-client/tree/master"
+                "source": "https://github.com/php-fig/http-client"
             },
-            "time": "2020-06-29T06:28:15+00:00"
+            "time": "2023-09-23T14:17:50+00:00"
         },
         {
             "name": "psr/http-factory",
-            "version": "1.0.1",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-factory.git",
-                "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be"
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
-                "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
+                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0.0",
-                "psr/http-message": "^1.0"
+                "php": ">=7.1",
+                "psr/http-message": "^1.0 || ^2.0"
             },
             "type": "library",
             "extra": {
@@ -3287,10 +3644,10 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
-            "description": "Common interfaces for PSR-7 HTTP message factories",
+            "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories",
             "keywords": [
                 "factory",
                 "http",
@@ -3302,31 +3659,31 @@
                 "response"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-factory/tree/master"
+                "source": "https://github.com/php-fig/http-factory"
             },
-            "time": "2019-04-30T12:38:16+00:00"
+            "time": "2024-04-15T12:06:14+00:00"
         },
         {
             "name": "psr/http-message",
-            "version": "1.0.1",
+            "version": "2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-message.git",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71",
+                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.0.x-dev"
                 }
             },
             "autoload": {
@@ -3341,7 +3698,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for HTTP messages",
@@ -3355,9 +3712,9 @@
                 "response"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-message/tree/master"
+                "source": "https://github.com/php-fig/http-message/tree/2.0"
             },
-            "time": "2016-08-06T14:39:51+00:00"
+            "time": "2023-04-04T09:54:51+00:00"
         },
         {
             "name": "psr/link",
@@ -3507,42 +3864,53 @@
         },
         {
             "name": "ramsey/collection",
-            "version": "1.2.2",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/collection.git",
-                "reference": "cccc74ee5e328031b15640b51056ee8d3bb66c0a"
+                "reference": "ad7475d1c9e70b190ecffc58f2d989416af339b4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/collection/zipball/cccc74ee5e328031b15640b51056ee8d3bb66c0a",
-                "reference": "cccc74ee5e328031b15640b51056ee8d3bb66c0a",
+                "url": "https://api.github.com/repos/ramsey/collection/zipball/ad7475d1c9e70b190ecffc58f2d989416af339b4",
+                "reference": "ad7475d1c9e70b190ecffc58f2d989416af339b4",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ^8",
+                "php": "^7.4 || ^8.0",
                 "symfony/polyfill-php81": "^1.23"
             },
             "require-dev": {
-                "captainhook/captainhook": "^5.3",
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
-                "ergebnis/composer-normalize": "^2.6",
-                "fakerphp/faker": "^1.5",
-                "hamcrest/hamcrest-php": "^2",
-                "jangregor/phpstan-prophecy": "^0.8",
-                "mockery/mockery": "^1.3",
+                "captainhook/plugin-composer": "^5.3",
+                "ergebnis/composer-normalize": "^2.28.3",
+                "fakerphp/faker": "^1.21",
+                "hamcrest/hamcrest-php": "^2.0",
+                "jangregor/phpstan-prophecy": "^1.0",
+                "mockery/mockery": "^1.5",
+                "php-parallel-lint/php-console-highlighter": "^1.0",
+                "php-parallel-lint/php-parallel-lint": "^1.3",
+                "phpcsstandards/phpcsutils": "^1.0.0-rc1",
                 "phpspec/prophecy-phpunit": "^2.0",
-                "phpstan/extension-installer": "^1",
-                "phpstan/phpstan": "^0.12.32",
-                "phpstan/phpstan-mockery": "^0.12.5",
-                "phpstan/phpstan-phpunit": "^0.12.11",
-                "phpunit/phpunit": "^8.5 || ^9",
-                "psy/psysh": "^0.10.4",
-                "slevomat/coding-standard": "^6.3",
-                "squizlabs/php_codesniffer": "^3.5",
-                "vimeo/psalm": "^4.4"
+                "phpstan/extension-installer": "^1.2",
+                "phpstan/phpstan": "^1.9",
+                "phpstan/phpstan-mockery": "^1.1",
+                "phpstan/phpstan-phpunit": "^1.3",
+                "phpunit/phpunit": "^9.5",
+                "psalm/plugin-mockery": "^1.1",
+                "psalm/plugin-phpunit": "^0.18.4",
+                "ramsey/coding-standard": "^2.0.3",
+                "ramsey/conventional-commits": "^1.3",
+                "vimeo/psalm": "^5.4"
             },
             "type": "library",
+            "extra": {
+                "captainhook": {
+                    "force-install": true
+                },
+                "ramsey/conventional-commits": {
+                    "configFile": "conventional-commits.json"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Ramsey\\Collection\\": "src/"
@@ -3570,7 +3938,7 @@
             ],
             "support": {
                 "issues": "https://github.com/ramsey/collection/issues",
-                "source": "https://github.com/ramsey/collection/tree/1.2.2"
+                "source": "https://github.com/ramsey/collection/tree/1.3.0"
             },
             "funding": [
                 {
@@ -3582,7 +3950,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-10-10T03:01:02+00:00"
+            "time": "2022-12-27T19:12:24+00:00"
         },
         {
             "name": "ramsey/uuid",
@@ -3641,11 +4009,11 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "4.x-dev"
-                },
                 "captainhook": {
                     "force-install": true
+                },
+                "branch-alias": {
+                    "dev-main": "4.x-dev"
                 }
             },
             "autoload": {
@@ -3684,23 +4052,24 @@
         },
         {
             "name": "react/promise",
-            "version": "v2.9.0",
+            "version": "v3.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/reactphp/promise.git",
-                "reference": "234f8fd1023c9158e2314fa9d7d0e6a83db42910"
+                "reference": "23444f53a813a3296c1368bb104793ce8d88f04a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/promise/zipball/234f8fd1023c9158e2314fa9d7d0e6a83db42910",
-                "reference": "234f8fd1023c9158e2314fa9d7d0e6a83db42910",
+                "url": "https://api.github.com/repos/reactphp/promise/zipball/23444f53a813a3296c1368bb104793ce8d88f04a",
+                "reference": "23444f53a813a3296c1368bb104793ce8d88f04a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.4.0"
+                "php": ">=7.1.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.36"
+                "phpstan/phpstan": "1.12.28 || 1.4.10",
+                "phpunit/phpunit": "^9.6 || ^7.5"
             },
             "type": "library",
             "autoload": {
@@ -3744,32 +4113,28 @@
             ],
             "support": {
                 "issues": "https://github.com/reactphp/promise/issues",
-                "source": "https://github.com/reactphp/promise/tree/v2.9.0"
+                "source": "https://github.com/reactphp/promise/tree/v3.3.0"
             },
             "funding": [
                 {
-                    "url": "https://github.com/WyriHaximus",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/clue",
-                    "type": "github"
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
                 }
             ],
-            "time": "2022-02-11T10:27:51+00:00"
+            "time": "2025-08-19T18:57:03+00:00"
         },
         {
             "name": "rize/uri-template",
-            "version": "0.3.4",
+            "version": "0.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rize/UriTemplate.git",
-                "reference": "2a874863c48d643b9e2e254ab288ec203060a0b8"
+                "reference": "34a5b96d0b65a5dddb7d20f09b6527a43faede24"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rize/UriTemplate/zipball/2a874863c48d643b9e2e254ab288ec203060a0b8",
-                "reference": "2a874863c48d643b9e2e254ab288ec203060a0b8",
+                "url": "https://api.github.com/repos/rize/UriTemplate/zipball/34a5b96d0b65a5dddb7d20f09b6527a43faede24",
+                "reference": "34a5b96d0b65a5dddb7d20f09b6527a43faede24",
                 "shasum": ""
             },
             "require": {
@@ -3802,32 +4167,36 @@
             ],
             "support": {
                 "issues": "https://github.com/rize/UriTemplate/issues",
-                "source": "https://github.com/rize/UriTemplate/tree/0.3.4"
+                "source": "https://github.com/rize/UriTemplate/tree/0.3.8"
             },
             "funding": [
                 {
                     "url": "https://www.paypal.me/rezigned",
                     "type": "custom"
                 },
+                {
+                    "url": "https://github.com/rezigned",
+                    "type": "github"
+                },
                 {
                     "url": "https://opencollective.com/rize-uri-template",
                     "type": "open_collective"
                 }
             ],
-            "time": "2021-10-09T06:30:16+00:00"
+            "time": "2024-08-30T07:09:40+00:00"
         },
         {
             "name": "setasign/fpdf",
-            "version": "1.8.4",
+            "version": "1.8.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Setasign/FPDF.git",
-                "reference": "b0ddd9c5b98ced8230ef38534f6f3c17308a7974"
+                "reference": "0838e0ee4925716fcbbc50ad9e1799b5edfae0a0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Setasign/FPDF/zipball/b0ddd9c5b98ced8230ef38534f6f3c17308a7974",
-                "reference": "b0ddd9c5b98ced8230ef38534f6f3c17308a7974",
+                "url": "https://api.github.com/repos/Setasign/FPDF/zipball/0838e0ee4925716fcbbc50ad9e1799b5edfae0a0",
+                "reference": "0838e0ee4925716fcbbc50ad9e1799b5edfae0a0",
                 "shasum": ""
             },
             "require": {
@@ -3858,37 +4227,37 @@
                 "pdf"
             ],
             "support": {
-                "source": "https://github.com/Setasign/FPDF/tree/1.8.4"
+                "source": "https://github.com/Setasign/FPDF/tree/1.8.6"
             },
-            "time": "2021-08-30T07:50:06+00:00"
+            "time": "2023-06-26T14:44:25+00:00"
         },
         {
             "name": "setasign/fpdi",
-            "version": "v2.3.6",
+            "version": "v2.6.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Setasign/FPDI.git",
-                "reference": "6231e315f73e4f62d72b73f3d6d78ff0eed93c31"
+                "reference": "4b53852fde2734ec6a07e458a085db627c60eada"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Setasign/FPDI/zipball/6231e315f73e4f62d72b73f3d6d78ff0eed93c31",
-                "reference": "6231e315f73e4f62d72b73f3d6d78ff0eed93c31",
+                "url": "https://api.github.com/repos/Setasign/FPDI/zipball/4b53852fde2734ec6a07e458a085db627c60eada",
+                "reference": "4b53852fde2734ec6a07e458a085db627c60eada",
                 "shasum": ""
             },
             "require": {
                 "ext-zlib": "*",
-                "php": "^5.6 || ^7.0 || ^8.0"
+                "php": "^7.1 || ^8.0"
             },
             "conflict": {
                 "setasign/tfpdf": "<1.31"
             },
             "require-dev": {
-                "phpunit/phpunit": "~5.7",
-                "setasign/fpdf": "~1.8",
-                "setasign/tfpdf": "1.31",
+                "phpunit/phpunit": "^7",
+                "setasign/fpdf": "~1.8.6",
+                "setasign/tfpdf": "~1.33",
                 "squizlabs/php_codesniffer": "^3.5",
-                "tecnickcom/tcpdf": "~6.2"
+                "tecnickcom/tcpdf": "^6.8"
             },
             "suggest": {
                 "setasign/fpdf": "FPDI will extend this class but as it is also possible to use TCPDF or tFPDF as an alternative. There's no fixed dependency configured."
@@ -3924,7 +4293,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Setasign/FPDI/issues",
-                "source": "https://github.com/Setasign/FPDI/tree/v2.3.6"
+                "source": "https://github.com/Setasign/FPDI/tree/v2.6.4"
             },
             "funding": [
                 {
@@ -3932,7 +4301,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-02-11T11:37:01+00:00"
+            "time": "2025-08-05T09:57:14+00:00"
         },
         {
             "name": "stecman/symfony-console-completion",
@@ -4036,16 +4405,16 @@
         },
         {
             "name": "symfony/cache",
-            "version": "v5.4.8",
+            "version": "v5.4.46",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/cache.git",
-                "reference": "4c6747cf7e56c6b8e3094dd24852bd3e364375b1"
+                "reference": "0fe08ee32cec2748fbfea10c52d3ee02049e0f6b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache/zipball/4c6747cf7e56c6b8e3094dd24852bd3e364375b1",
-                "reference": "4c6747cf7e56c6b8e3094dd24852bd3e364375b1",
+                "url": "https://api.github.com/repos/symfony/cache/zipball/0fe08ee32cec2748fbfea10c52d3ee02049e0f6b",
+                "reference": "0fe08ee32cec2748fbfea10c52d3ee02049e0f6b",
                 "shasum": ""
             },
             "require": {
@@ -4073,8 +4442,8 @@
             "require-dev": {
                 "cache/integration-tests": "dev-master",
                 "doctrine/cache": "^1.6|^2.0",
-                "doctrine/dbal": "^2.13.1|^3.0",
-                "predis/predis": "^1.1",
+                "doctrine/dbal": "^2.13.1|^3|^4",
+                "predis/predis": "^1.1|^2.0",
                 "psr/simple-cache": "^1.0|^2.0",
                 "symfony/config": "^4.4|^5.0|^6.0",
                 "symfony/dependency-injection": "^4.4|^5.0|^6.0",
@@ -4106,14 +4475,14 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Provides an extended PSR-6, PSR-16 (and tags) implementation",
+            "description": "Provides extended PSR-6, PSR-16 (and tags) implementations",
             "homepage": "https://symfony.com",
             "keywords": [
                 "caching",
                 "psr6"
             ],
             "support": {
-                "source": "https://github.com/symfony/cache/tree/v5.4.8"
+                "source": "https://github.com/symfony/cache/tree/v5.4.46"
             },
             "funding": [
                 {
@@ -4129,20 +4498,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-26T13:19:20+00:00"
+            "time": "2024-11-04T11:43:55+00:00"
         },
         {
             "name": "symfony/cache-contracts",
-            "version": "v2.5.1",
+            "version": "v2.5.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/cache-contracts.git",
-                "reference": "64be4a7acb83b6f2bf6de9a02cee6dad41277ebc"
+                "reference": "517c3a3619dadfa6952c4651767fcadffb4df65e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/64be4a7acb83b6f2bf6de9a02cee6dad41277ebc",
-                "reference": "64be4a7acb83b6f2bf6de9a02cee6dad41277ebc",
+                "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/517c3a3619dadfa6952c4651767fcadffb4df65e",
+                "reference": "517c3a3619dadfa6952c4651767fcadffb4df65e",
                 "shasum": ""
             },
             "require": {
@@ -4154,12 +4523,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "2.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -4192,7 +4561,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/cache-contracts/tree/v2.5.1"
+                "source": "https://github.com/symfony/cache-contracts/tree/v2.5.4"
             },
             "funding": [
                 {
@@ -4208,20 +4577,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:53:40+00:00"
+            "time": "2024-09-25T14:11:13+00:00"
         },
         {
             "name": "symfony/config",
-            "version": "v4.4.41",
+            "version": "v4.4.44",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "9d031eb2d4292aed117b0f7fafd5c436dcf3dfd7"
+                "reference": "ed42f8f9da528d2c6cae36fe1f380b0c1d8f0658"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/9d031eb2d4292aed117b0f7fafd5c436dcf3dfd7",
-                "reference": "9d031eb2d4292aed117b0f7fafd5c436dcf3dfd7",
+                "url": "https://api.github.com/repos/symfony/config/zipball/ed42f8f9da528d2c6cae36fe1f380b0c1d8f0658",
+                "reference": "ed42f8f9da528d2c6cae36fe1f380b0c1d8f0658",
                 "shasum": ""
             },
             "require": {
@@ -4270,7 +4639,7 @@
             "description": "Helps you find, load, combine, autofill and validate configuration values of any kind",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/config/tree/v4.4.41"
+                "source": "https://github.com/symfony/config/tree/v4.4.44"
             },
             "funding": [
                 {
@@ -4286,20 +4655,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-12T15:19:55+00:00"
+            "time": "2022-07-20T09:59:04+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v4.4.41",
+            "version": "v4.4.49",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "0e1e62083b20ccb39c2431293de060f756af905c"
+                "reference": "33fa45ffc81fdcc1ca368d4946da859c8cdb58d9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/0e1e62083b20ccb39c2431293de060f756af905c",
-                "reference": "0e1e62083b20ccb39c2431293de060f756af905c",
+                "url": "https://api.github.com/repos/symfony/console/zipball/33fa45ffc81fdcc1ca368d4946da859c8cdb58d9",
+                "reference": "33fa45ffc81fdcc1ca368d4946da859c8cdb58d9",
                 "shasum": ""
             },
             "require": {
@@ -4360,7 +4729,7 @@
             "description": "Eases the creation of beautiful and testable command line interfaces",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/console/tree/v4.4.41"
+                "source": "https://github.com/symfony/console/tree/v4.4.49"
             },
             "funding": [
                 {
@@ -4376,20 +4745,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-12T15:19:55+00:00"
+            "time": "2022-11-05T17:10:16+00:00"
         },
         {
             "name": "symfony/debug",
-            "version": "v4.4.41",
+            "version": "v4.4.44",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",
-                "reference": "6637e62480b60817b9a6984154a533e8e64c6bd5"
+                "reference": "1a692492190773c5310bc7877cb590c04c2f05be"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/6637e62480b60817b9a6984154a533e8e64c6bd5",
-                "reference": "6637e62480b60817b9a6984154a533e8e64c6bd5",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/1a692492190773c5310bc7877cb590c04c2f05be",
+                "reference": "1a692492190773c5310bc7877cb590c04c2f05be",
                 "shasum": ""
             },
             "require": {
@@ -4428,7 +4797,7 @@
             "description": "Provides tools to ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/debug/tree/v4.4.41"
+                "source": "https://github.com/symfony/debug/tree/v4.4.44"
             },
             "funding": [
                 {
@@ -4444,20 +4813,21 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-12T15:19:55+00:00"
+            "abandoned": "symfony/error-handler",
+            "time": "2022-07-28T16:29:46+00:00"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v4.4.41",
+            "version": "v4.4.49",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "74c7f55de0eced4d3c9654809b1871870386a577"
+                "reference": "9065fe97dbd38a897e95ea254eb5ddfe1310f734"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/74c7f55de0eced4d3c9654809b1871870386a577",
-                "reference": "74c7f55de0eced4d3c9654809b1871870386a577",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/9065fe97dbd38a897e95ea254eb5ddfe1310f734",
+                "reference": "9065fe97dbd38a897e95ea254eb5ddfe1310f734",
                 "shasum": ""
             },
             "require": {
@@ -4514,7 +4884,7 @@
             "description": "Allows you to standardize and centralize the way objects are constructed in your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dependency-injection/tree/v4.4.41"
+                "source": "https://github.com/symfony/dependency-injection/tree/v4.4.49"
             },
             "funding": [
                 {
@@ -4530,20 +4900,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-12T15:19:55+00:00"
+            "time": "2022-11-16T16:18:09+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v2.5.1",
+            "version": "v2.5.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
+                "reference": "605389f2a7e5625f273b53960dc46aeaf9c62918"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
-                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/605389f2a7e5625f273b53960dc46aeaf9c62918",
+                "reference": "605389f2a7e5625f273b53960dc46aeaf9c62918",
                 "shasum": ""
             },
             "require": {
@@ -4551,12 +4921,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "2.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -4581,7 +4951,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.1"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.4"
             },
             "funding": [
                 {
@@ -4597,20 +4967,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:53:40+00:00"
+            "time": "2024-09-25T14:11:13+00:00"
         },
         {
             "name": "symfony/error-handler",
-            "version": "v4.4.41",
+            "version": "v4.4.44",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "529feb0e03133dbd5fd3707200147cc4903206da"
+                "reference": "be731658121ef2d8be88f3a1ec938148a9237291"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/529feb0e03133dbd5fd3707200147cc4903206da",
-                "reference": "529feb0e03133dbd5fd3707200147cc4903206da",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/be731658121ef2d8be88f3a1ec938148a9237291",
+                "reference": "be731658121ef2d8be88f3a1ec938148a9237291",
                 "shasum": ""
             },
             "require": {
@@ -4649,7 +5019,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v4.4.41"
+                "source": "https://github.com/symfony/error-handler/tree/v4.4.44"
             },
             "funding": [
                 {
@@ -4665,20 +5035,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-12T15:19:55+00:00"
+            "time": "2022-07-28T16:29:46+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v4.4.37",
+            "version": "v4.4.44",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "3ccfcfb96ecce1217d7b0875a0736976bc6e63dc"
+                "reference": "1e866e9e5c1b22168e0ce5f0b467f19bba61266a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/3ccfcfb96ecce1217d7b0875a0736976bc6e63dc",
-                "reference": "3ccfcfb96ecce1217d7b0875a0736976bc6e63dc",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/1e866e9e5c1b22168e0ce5f0b467f19bba61266a",
+                "reference": "1e866e9e5c1b22168e0ce5f0b467f19bba61266a",
                 "shasum": ""
             },
             "require": {
@@ -4733,7 +5103,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v4.4.37"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v4.4.44"
             },
             "funding": [
                 {
@@ -4749,20 +5119,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:41:36+00:00"
+            "time": "2022-07-20T09:59:04+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v1.1.12",
+            "version": "v1.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "1d5cd762abaa6b2a4169d3e77610193a7157129e"
+                "reference": "761c8b8387cfe5f8026594a75fdf0a4e83ba6974"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/1d5cd762abaa6b2a4169d3e77610193a7157129e",
-                "reference": "1d5cd762abaa6b2a4169d3e77610193a7157129e",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/761c8b8387cfe5f8026594a75fdf0a4e83ba6974",
+                "reference": "761c8b8387cfe5f8026594a75fdf0a4e83ba6974",
                 "shasum": ""
             },
             "require": {
@@ -4774,12 +5144,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "1.1-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -4812,7 +5182,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v1.1.12"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v1.10.0"
             },
             "funding": [
                 {
@@ -4828,20 +5198,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:41:36+00:00"
+            "time": "2022-07-20T09:59:04+00:00"
         },
         {
             "name": "symfony/expression-language",
-            "version": "v4.4.41",
+            "version": "v4.4.47",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/expression-language.git",
-                "reference": "2774df99a13bbf2339e1c5b1f8c47dbec8d67c2b"
+                "reference": "e4964c7636e19f6008660f450c09121c80c2a7b9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/expression-language/zipball/2774df99a13bbf2339e1c5b1f8c47dbec8d67c2b",
-                "reference": "2774df99a13bbf2339e1c5b1f8c47dbec8d67c2b",
+                "url": "https://api.github.com/repos/symfony/expression-language/zipball/e4964c7636e19f6008660f450c09121c80c2a7b9",
+                "reference": "e4964c7636e19f6008660f450c09121c80c2a7b9",
                 "shasum": ""
             },
             "require": {
@@ -4875,7 +5245,7 @@
             "description": "Provides an engine that can compile and evaluate expressions",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/expression-language/tree/v4.4.41"
+                "source": "https://github.com/symfony/expression-language/tree/v4.4.47"
             },
             "funding": [
                 {
@@ -4891,20 +5261,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-03T16:32:29+00:00"
+            "time": "2022-10-03T15:15:11+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v4.4.39",
+            "version": "v4.4.42",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "72a5b35fecaa670b13954e6eaf414acbe2a67b35"
+                "reference": "815412ee8971209bd4c1eecd5f4f481eacd44bf5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/72a5b35fecaa670b13954e6eaf414acbe2a67b35",
-                "reference": "72a5b35fecaa670b13954e6eaf414acbe2a67b35",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/815412ee8971209bd4c1eecd5f4f481eacd44bf5",
+                "reference": "815412ee8971209bd4c1eecd5f4f481eacd44bf5",
                 "shasum": ""
             },
             "require": {
@@ -4938,7 +5308,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v4.4.39"
+                "source": "https://github.com/symfony/filesystem/tree/v4.4.42"
             },
             "funding": [
                 {
@@ -4954,20 +5324,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-25T10:38:15+00:00"
+            "time": "2022-05-20T08:49:14+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v4.4.41",
+            "version": "v4.4.44",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "40790bdf293b462798882ef6da72bb49a4a6633a"
+                "reference": "66bd787edb5e42ff59d3523f623895af05043e4f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/40790bdf293b462798882ef6da72bb49a4a6633a",
-                "reference": "40790bdf293b462798882ef6da72bb49a4a6633a",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/66bd787edb5e42ff59d3523f623895af05043e4f",
+                "reference": "66bd787edb5e42ff59d3523f623895af05043e4f",
                 "shasum": ""
             },
             "require": {
@@ -5000,7 +5370,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v4.4.41"
+                "source": "https://github.com/symfony/finder/tree/v4.4.44"
             },
             "funding": [
                 {
@@ -5016,20 +5386,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-14T15:36:10+00:00"
+            "time": "2022-07-29T07:35:46+00:00"
         },
         {
             "name": "symfony/form",
-            "version": "v4.4.41",
+            "version": "v4.4.48",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/form.git",
-                "reference": "d874bd4208741fd88bd5a1c6d22f2b30a28dc47e"
+                "reference": "e1d137b13e0ec2cb5c5e38debca7a510c6f858c6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/form/zipball/d874bd4208741fd88bd5a1c6d22f2b30a28dc47e",
-                "reference": "d874bd4208741fd88bd5a1c6d22f2b30a28dc47e",
+                "url": "https://api.github.com/repos/symfony/form/zipball/e1d137b13e0ec2cb5c5e38debca7a510c6f858c6",
+                "reference": "e1d137b13e0ec2cb5c5e38debca7a510c6f858c6",
                 "shasum": ""
             },
             "require": {
@@ -5098,7 +5468,7 @@
             "description": "Allows to easily create, process and reuse HTML forms",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/form/tree/v4.4.41"
+                "source": "https://github.com/symfony/form/tree/v4.4.48"
             },
             "funding": [
                 {
@@ -5114,20 +5484,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-22T17:25:21+00:00"
+            "time": "2022-10-22T05:50:33+00:00"
         },
         {
             "name": "symfony/http-client-contracts",
-            "version": "v2.5.1",
+            "version": "v2.5.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-client-contracts.git",
-                "reference": "1a4f708e4e87f335d1b1be6148060739152f0bd5"
+                "reference": "48ef1d0a082885877b664332b9427662065a360c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/1a4f708e4e87f335d1b1be6148060739152f0bd5",
-                "reference": "1a4f708e4e87f335d1b1be6148060739152f0bd5",
+                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/48ef1d0a082885877b664332b9427662065a360c",
+                "reference": "48ef1d0a082885877b664332b9427662065a360c",
                 "shasum": ""
             },
             "require": {
@@ -5138,12 +5508,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "2.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -5176,7 +5546,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/http-client-contracts/tree/v2.5.1"
+                "source": "https://github.com/symfony/http-client-contracts/tree/v2.5.5"
             },
             "funding": [
                 {
@@ -5192,20 +5562,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-03-13T20:07:29+00:00"
+            "time": "2024-11-28T08:37:04+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v4.4.41",
+            "version": "v4.4.49",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "27441220aebeb096b4eb8267acaaa7feb5e4266c"
+                "reference": "191413c7b832c015bb38eae963f2e57498c3c173"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/27441220aebeb096b4eb8267acaaa7feb5e4266c",
-                "reference": "27441220aebeb096b4eb8267acaaa7feb5e4266c",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/191413c7b832c015bb38eae963f2e57498c3c173",
+                "reference": "191413c7b832c015bb38eae963f2e57498c3c173",
                 "shasum": ""
             },
             "require": {
@@ -5244,7 +5614,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v4.4.41"
+                "source": "https://github.com/symfony/http-foundation/tree/v4.4.49"
             },
             "funding": [
                 {
@@ -5260,20 +5630,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-21T07:22:34+00:00"
+            "time": "2022-11-04T16:17:57+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v4.4.41",
+            "version": "v4.4.51",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "7f8ce5bffc3939c63b7da32de5a546c98eb67698"
+                "reference": "ad8ab192cb619ff7285c95d28c69b36d718416c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/7f8ce5bffc3939c63b7da32de5a546c98eb67698",
-                "reference": "7f8ce5bffc3939c63b7da32de5a546c98eb67698",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/ad8ab192cb619ff7285c95d28c69b36d718416c7",
+                "reference": "ad8ab192cb619ff7285c95d28c69b36d718416c7",
                 "shasum": ""
             },
             "require": {
@@ -5348,7 +5718,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v4.4.41"
+                "source": "https://github.com/symfony/http-kernel/tree/v4.4.51"
             },
             "funding": [
                 {
@@ -5364,20 +5734,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-27T17:13:11+00:00"
+            "time": "2023-11-10T13:31:29+00:00"
         },
         {
             "name": "symfony/intl",
-            "version": "v5.4.8",
+            "version": "v5.4.47",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/intl.git",
-                "reference": "b9e17d7ab867ce99f89950ebced0fa91076ba12b"
+                "reference": "5258476a3ab680cd633a1d23130fcc9e8027e3ff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/intl/zipball/b9e17d7ab867ce99f89950ebced0fa91076ba12b",
-                "reference": "b9e17d7ab867ce99f89950ebced0fa91076ba12b",
+                "url": "https://api.github.com/repos/symfony/intl/zipball/5258476a3ab680cd633a1d23130fcc9e8027e3ff",
+                "reference": "5258476a3ab680cd633a1d23130fcc9e8027e3ff",
                 "shasum": ""
             },
             "require": {
@@ -5386,7 +5756,8 @@
                 "symfony/polyfill-php80": "^1.16"
             },
             "require-dev": {
-                "symfony/filesystem": "^4.4|^5.0|^6.0"
+                "symfony/filesystem": "^4.4|^5.0|^6.0",
+                "symfony/var-exporter": "^5.4|^6.0"
             },
             "type": "library",
             "autoload": {
@@ -5400,7 +5771,8 @@
                     "Resources/stubs"
                 ],
                 "exclude-from-classmap": [
-                    "/Tests/"
+                    "/Tests/",
+                    "/Resources/data/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -5436,7 +5808,7 @@
                 "localization"
             ],
             "support": {
-                "source": "https://github.com/symfony/intl/tree/v5.4.8"
+                "source": "https://github.com/symfony/intl/tree/v5.4.47"
             },
             "funding": [
                 {
@@ -5452,20 +5824,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-07T09:39:59+00:00"
+            "time": "2024-11-08T08:12:23+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v5.4.8",
+            "version": "v5.4.45",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "af49bc163ec3272f677bde3bc44c0d766c1fd662"
+                "reference": "8c1b9b3e5b52981551fc6044539af1d974e39064"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/af49bc163ec3272f677bde3bc44c0d766c1fd662",
-                "reference": "af49bc163ec3272f677bde3bc44c0d766c1fd662",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/8c1b9b3e5b52981551fc6044539af1d974e39064",
+                "reference": "8c1b9b3e5b52981551fc6044539af1d974e39064",
                 "shasum": ""
             },
             "require": {
@@ -5479,15 +5851,17 @@
                 "egulias/email-validator": "~3.0.0",
                 "phpdocumentor/reflection-docblock": "<3.2.2",
                 "phpdocumentor/type-resolver": "<1.4.0",
-                "symfony/mailer": "<4.4"
+                "symfony/mailer": "<4.4",
+                "symfony/serializer": "<5.4.35|>=6,<6.3.12|>=6.4,<6.4.3"
             },
             "require-dev": {
-                "egulias/email-validator": "^2.1.10|^3.1",
+                "egulias/email-validator": "^2.1.10|^3.1|^4",
                 "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
                 "symfony/dependency-injection": "^4.4|^5.0|^6.0",
+                "symfony/process": "^5.4|^6.4",
                 "symfony/property-access": "^4.4|^5.1|^6.0",
                 "symfony/property-info": "^4.4|^5.1|^6.0",
-                "symfony/serializer": "^5.2|^6.0"
+                "symfony/serializer": "^5.4.35|~6.3.12|^6.4.3"
             },
             "type": "library",
             "autoload": {
@@ -5519,7 +5893,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v5.4.8"
+                "source": "https://github.com/symfony/mime/tree/v5.4.45"
             },
             "funding": [
                 {
@@ -5535,20 +5909,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-12T15:48:08+00:00"
+            "time": "2024-10-23T20:18:32+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v4.4.37",
+            "version": "v4.4.44",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "41d1e741a292574887629369400820c9645e8a87"
+                "reference": "583f56160f716dd435f1cd721fd14b548f4bb510"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/41d1e741a292574887629369400820c9645e8a87",
-                "reference": "41d1e741a292574887629369400820c9645e8a87",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/583f56160f716dd435f1cd721fd14b548f4bb510",
+                "reference": "583f56160f716dd435f1cd721fd14b548f4bb510",
                 "shasum": ""
             },
             "require": {
@@ -5586,7 +5960,7 @@
                 "options"
             ],
             "support": {
-                "source": "https://github.com/symfony/options-resolver/tree/v4.4.37"
+                "source": "https://github.com/symfony/options-resolver/tree/v4.4.44"
             },
             "funding": [
                 {
@@ -5602,36 +5976,36 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:41:36+00:00"
+            "time": "2022-07-20T09:59:04+00:00"
         },
         {
-            "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.25.0",
+            "name": "symfony/polyfill-ctype",
+            "version": "v1.33.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "81b86b50cf841a64252b439e738e97f4a34e2783"
+                "url": "https://github.com/symfony/polyfill-ctype.git",
+                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/81b86b50cf841a64252b439e738e97f4a34e2783",
-                "reference": "81b86b50cf841a64252b439e738e97f4a34e2783",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638",
+                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
+            },
+            "provide": {
+                "ext-ctype": "*"
             },
             "suggest": {
-                "ext-intl": "For best performance"
+                "ext-ctype": "For best performance"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -5639,7 +6013,7 @@
                     "bootstrap.php"
                 ],
                 "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
+                    "Symfony\\Polyfill\\Ctype\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -5648,26 +6022,24 @@
             ],
             "authors": [
                 {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
+                    "name": "Gert de Pagter",
+                    "email": "BackEndTea@gmail.com"
                 },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony polyfill for intl's grapheme_* functions",
+            "description": "Symfony polyfill for ctype functions",
             "homepage": "https://symfony.com",
             "keywords": [
                 "compatibility",
-                "grapheme",
-                "intl",
+                "ctype",
                 "polyfill",
-                "portable",
-                "shim"
+                "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.25.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -5678,43 +6050,45 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-23T21:10:46+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
-            "name": "symfony/polyfill-intl-idn",
-            "version": "v1.25.0",
+            "name": "symfony/polyfill-iconv",
+            "version": "v1.33.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "749045c69efb97c70d25d7463abba812e91f3a44"
+                "url": "https://github.com/symfony/polyfill-iconv.git",
+                "reference": "5f3b930437ae03ae5dff61269024d8ea1b3774aa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/749045c69efb97c70d25d7463abba812e91f3a44",
-                "reference": "749045c69efb97c70d25d7463abba812e91f3a44",
+                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/5f3b930437ae03ae5dff61269024d8ea1b3774aa",
+                "reference": "5f3b930437ae03ae5dff61269024d8ea1b3774aa",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1",
-                "symfony/polyfill-intl-normalizer": "^1.10",
-                "symfony/polyfill-php72": "^1.10"
+                "php": ">=7.2"
+            },
+            "provide": {
+                "ext-iconv": "*"
             },
             "suggest": {
-                "ext-intl": "For best performance"
+                "ext-iconv": "For best performance"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -5722,7 +6096,7 @@
                     "bootstrap.php"
                 ],
                 "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Idn\\": ""
+                    "Symfony\\Polyfill\\Iconv\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -5731,30 +6105,25 @@
             ],
             "authors": [
                 {
-                    "name": "Laurent Bassin",
-                    "email": "laurent@bassin.info"
-                },
-                {
-                    "name": "Trevor Rowbotham",
-                    "email": "trevor.rowbotham@pm.me"
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
                 },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions",
+            "description": "Symfony polyfill for the Iconv extension",
             "homepage": "https://symfony.com",
             "keywords": [
                 "compatibility",
-                "idn",
-                "intl",
+                "iconv",
                 "polyfill",
                 "portable",
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.25.0"
+                "source": "https://github.com/symfony/polyfill-iconv/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -5765,41 +6134,42 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-09-14T14:02:44+00:00"
+            "time": "2024-09-17T14:58:18+00:00"
         },
         {
-            "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.25.0",
+            "name": "symfony/polyfill-intl-grapheme",
+            "version": "v1.33.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8"
+                "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
+                "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8",
-                "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/380872130d3a5dd3ace2f4010d95125fde5d5c70",
+                "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "suggest": {
                 "ext-intl": "For best performance"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -5807,11 +6177,8 @@
                     "bootstrap.php"
                 ],
                 "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
-                },
-                "classmap": [
-                    "Resources/stubs"
-                ]
+                    "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -5827,18 +6194,18 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony polyfill for intl's Normalizer class and related functions",
+            "description": "Symfony polyfill for intl's grapheme_* functions",
             "homepage": "https://symfony.com",
             "keywords": [
                 "compatibility",
+                "grapheme",
                 "intl",
-                "normalizer",
                 "polyfill",
                 "portable",
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.25.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -5849,44 +6216,43 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-02-19T12:13:01+00:00"
+            "time": "2025-06-27T09:58:17+00:00"
         },
         {
-            "name": "symfony/polyfill-mbstring",
-            "version": "v1.25.0",
+            "name": "symfony/polyfill-intl-idn",
+            "version": "v1.33.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825"
+                "url": "https://github.com/symfony/polyfill-intl-idn.git",
+                "reference": "9614ac4d8061dc257ecc64cba1b140873dce8ad3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825",
-                "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/9614ac4d8061dc257ecc64cba1b140873dce8ad3",
+                "reference": "9614ac4d8061dc257ecc64cba1b140873dce8ad3",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
-            },
-            "provide": {
-                "ext-mbstring": "*"
+                "php": ">=7.2",
+                "symfony/polyfill-intl-normalizer": "^1.10"
             },
             "suggest": {
-                "ext-mbstring": "For best performance"
+                "ext-intl": "For best performance"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -5894,7 +6260,7 @@
                     "bootstrap.php"
                 ],
                 "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
+                    "Symfony\\Polyfill\\Intl\\Idn\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -5903,25 +6269,30 @@
             ],
             "authors": [
                 {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
+                    "name": "Laurent Bassin",
+                    "email": "laurent@bassin.info"
+                },
+                {
+                    "name": "Trevor Rowbotham",
+                    "email": "trevor.rowbotham@pm.me"
                 },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony polyfill for the Mbstring extension",
+            "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions",
             "homepage": "https://symfony.com",
             "keywords": [
                 "compatibility",
-                "mbstring",
+                "idn",
+                "intl",
                 "polyfill",
                 "portable",
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.25.0"
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -5932,38 +6303,42 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-30T18:21:41+00:00"
+            "time": "2024-09-10T14:38:51+00:00"
         },
         {
-            "name": "symfony/polyfill-php80",
-            "version": "v1.25.0",
+            "name": "symfony/polyfill-intl-normalizer",
+            "version": "v1.33.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c"
+                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
+                "reference": "3833d7255cc303546435cb650316bff708a1c75c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4407588e0d3f1f52efb65fbe92babe41f37fe50c",
-                "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c",
+                "reference": "3833d7255cc303546435cb650316bff708a1c75c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -5971,7 +6346,7 @@
                     "bootstrap.php"
                 ],
                 "psr-4": {
-                    "Symfony\\Polyfill\\Php80\\": ""
+                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
                 },
                 "classmap": [
                     "Resources/stubs"
@@ -5982,10 +6357,6 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Ion Bazan",
-                    "email": "ion.bazan@gmail.com"
-                },
                 {
                     "name": "Nicolas Grekas",
                     "email": "p@tchwork.com"
@@ -5995,16 +6366,18 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
+            "description": "Symfony polyfill for intl's Normalizer class and related functions",
             "homepage": "https://symfony.com",
             "keywords": [
                 "compatibility",
+                "intl",
+                "normalizer",
                 "polyfill",
                 "portable",
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.25.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -6015,38 +6388,46 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-03-04T08:16:47+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
-            "name": "symfony/polyfill-php81",
-            "version": "v1.25.0",
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.33.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-php81.git",
-                "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f"
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/5de4ba2d41b15f9bd0e19b2ab9674135813ec98f",
-                "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6d857f4d76bd4b343eac26d6b539585d2bc56493",
+                "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "ext-iconv": "*",
+                "php": ">=7.2"
+            },
+            "provide": {
+                "ext-mbstring": "*"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -6054,11 +6435,8 @@
                     "bootstrap.php"
                 ],
                 "psr-4": {
-                    "Symfony\\Polyfill\\Php81\\": ""
-                },
-                "classmap": [
-                    "Resources/stubs"
-                ]
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -6074,16 +6452,17 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions",
+            "description": "Symfony polyfill for the Mbstring extension",
             "homepage": "https://symfony.com",
             "keywords": [
                 "compatibility",
+                "mbstring",
                 "polyfill",
                 "portable",
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php81/tree/v1.25.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -6094,38 +6473,50 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-09-13T13:58:11+00:00"
+            "time": "2024-12-23T08:48:59+00:00"
         },
         {
-            "name": "symfony/process",
-            "version": "v4.4.41",
+            "name": "symfony/polyfill-php80",
+            "version": "v1.33.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/process.git",
-                "reference": "9eedd60225506d56e42210a70c21bb80ca8456ce"
+                "url": "https://github.com/symfony/polyfill-php80.git",
+                "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/9eedd60225506d56e42210a70c21bb80ca8456ce",
-                "reference": "9eedd60225506d56e42210a70c21bb80ca8456ce",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
+                "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1.3",
-                "symfony/polyfill-php80": "^1.16"
+                "php": ">=7.2"
             },
             "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
             "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
                 "psr-4": {
-                    "Symfony\\Component\\Process\\": ""
+                    "Symfony\\Polyfill\\Php80\\": ""
                 },
-                "exclude-from-classmap": [
-                    "/Tests/"
+                "classmap": [
+                    "Resources/stubs"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -6134,18 +6525,28 @@
             ],
             "authors": [
                 {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
+                    "name": "Ion Bazan",
+                    "email": "ion.bazan@gmail.com"
+                },
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
                 },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Executes commands in sub-processes",
+            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
             "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
             "support": {
-                "source": "https://github.com/symfony/process/tree/v4.4.41"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -6156,46 +6557,50 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-04T10:19:07+00:00"
+            "time": "2025-01-02T08:10:11+00:00"
         },
         {
-            "name": "symfony/property-access",
-            "version": "v5.4.8",
+            "name": "symfony/polyfill-php81",
+            "version": "v1.33.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/property-access.git",
-                "reference": "fe501d498d6ec7e9efe928c90fabedf629116495"
+                "url": "https://github.com/symfony/polyfill-php81.git",
+                "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/property-access/zipball/fe501d498d6ec7e9efe928c90fabedf629116495",
-                "reference": "fe501d498d6ec7e9efe928c90fabedf629116495",
+                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
+                "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "symfony/deprecation-contracts": "^2.1|^3",
-                "symfony/polyfill-php80": "^1.16",
-                "symfony/property-info": "^5.2|^6.0"
-            },
-            "require-dev": {
-                "symfony/cache": "^4.4|^5.0|^6.0"
-            },
-            "suggest": {
-                "psr/cache-implementation": "To cache access methods."
+                "php": ">=7.2"
             },
             "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
             "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
                 "psr-4": {
-                    "Symfony\\Component\\PropertyAccess\\": ""
+                    "Symfony\\Polyfill\\Php81\\": ""
                 },
-                "exclude-from-classmap": [
-                    "/Tests/"
+                "classmap": [
+                    "Resources/stubs"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -6204,29 +6609,24 @@
             ],
             "authors": [
                 {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
                 },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Provides functions to read and write from/to an object or array using a simple string notation",
+            "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions",
             "homepage": "https://symfony.com",
             "keywords": [
-                "access",
-                "array",
-                "extraction",
-                "index",
-                "injection",
-                "object",
-                "property",
-                "property path",
-                "reflection"
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/property-access/tree/v5.4.8"
+                "source": "https://github.com/symfony/polyfill-php81/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -6237,59 +6637,50 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-12T15:48:08+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
-            "name": "symfony/property-info",
-            "version": "v5.4.7",
+            "name": "symfony/polyfill-php82",
+            "version": "v1.33.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/property-info.git",
-                "reference": "0fc07795712972b9792f203d0fe0e77c26c3281d"
+                "url": "https://github.com/symfony/polyfill-php82.git",
+                "reference": "5d2ed36f7734637dacc025f179698031951b1692"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/property-info/zipball/0fc07795712972b9792f203d0fe0e77c26c3281d",
-                "reference": "0fc07795712972b9792f203d0fe0e77c26c3281d",
+                "url": "https://api.github.com/repos/symfony/polyfill-php82/zipball/5d2ed36f7734637dacc025f179698031951b1692",
+                "reference": "5d2ed36f7734637dacc025f179698031951b1692",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "symfony/deprecation-contracts": "^2.1|^3",
-                "symfony/polyfill-php80": "^1.16",
-                "symfony/string": "^5.1|^6.0"
-            },
-            "conflict": {
-                "phpdocumentor/reflection-docblock": "<3.2.2",
-                "phpdocumentor/type-resolver": "<1.4.0",
-                "symfony/dependency-injection": "<4.4"
-            },
-            "require-dev": {
-                "doctrine/annotations": "^1.10.4",
-                "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
-                "phpstan/phpdoc-parser": "^1.0",
-                "symfony/cache": "^4.4|^5.0|^6.0",
-                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
-                "symfony/serializer": "^4.4|^5.0|^6.0"
-            },
-            "suggest": {
-                "phpdocumentor/reflection-docblock": "To use the PHPDoc",
-                "psr/cache-implementation": "To cache results",
-                "symfony/doctrine-bridge": "To use Doctrine metadata",
-                "symfony/serializer": "To use Serializer metadata"
+                "php": ">=7.2"
             },
             "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
             "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
                 "psr-4": {
-                    "Symfony\\Component\\PropertyInfo\\": ""
+                    "Symfony\\Polyfill\\Php82\\": ""
                 },
-                "exclude-from-classmap": [
-                    "/Tests/"
+                "classmap": [
+                    "Resources/stubs"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -6298,26 +6689,24 @@
             ],
             "authors": [
                 {
-                    "name": "Kévin Dunglas",
-                    "email": "dunglas@gmail.com"
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
                 },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Extracts information about PHP class' properties using metadata of popular sources",
+            "description": "Symfony polyfill backporting some PHP 8.2+ features to lower PHP versions",
             "homepage": "https://symfony.com",
             "keywords": [
-                "doctrine",
-                "phpdoc",
-                "property",
-                "symfony",
-                "type",
-                "validator"
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/property-info/tree/v5.4.7"
+                "source": "https://github.com/symfony/polyfill-php82/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -6328,79 +6717,50 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-03-30T13:40:48+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
-            "name": "symfony/serializer",
-            "version": "v5.4.8",
+            "name": "symfony/polyfill-php83",
+            "version": "v1.33.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/serializer.git",
-                "reference": "a806b1031c45bf2ee583beee6df734ecf34d5cfc"
+                "url": "https://github.com/symfony/polyfill-php83.git",
+                "reference": "17f6f9a6b1735c0f163024d959f700cfbc5155e5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/serializer/zipball/a806b1031c45bf2ee583beee6df734ecf34d5cfc",
-                "reference": "a806b1031c45bf2ee583beee6df734ecf34d5cfc",
+                "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/17f6f9a6b1735c0f163024d959f700cfbc5155e5",
+                "reference": "17f6f9a6b1735c0f163024d959f700cfbc5155e5",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "symfony/deprecation-contracts": "^2.1|^3",
-                "symfony/polyfill-ctype": "~1.8",
-                "symfony/polyfill-php80": "^1.16"
-            },
-            "conflict": {
-                "doctrine/annotations": "<1.12",
-                "phpdocumentor/reflection-docblock": "<3.2.2",
-                "phpdocumentor/type-resolver": "<1.4.0",
-                "symfony/dependency-injection": "<4.4",
-                "symfony/property-access": "<5.4",
-                "symfony/property-info": "<5.3.13",
-                "symfony/uid": "<5.3",
-                "symfony/yaml": "<4.4"
-            },
-            "require-dev": {
-                "doctrine/annotations": "^1.12",
-                "phpdocumentor/reflection-docblock": "^3.2|^4.0|^5.0",
-                "symfony/cache": "^4.4|^5.0|^6.0",
-                "symfony/config": "^4.4|^5.0|^6.0",
-                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
-                "symfony/error-handler": "^4.4|^5.0|^6.0",
-                "symfony/filesystem": "^4.4|^5.0|^6.0",
-                "symfony/form": "^4.4|^5.0|^6.0",
-                "symfony/http-foundation": "^4.4|^5.0|^6.0",
-                "symfony/http-kernel": "^4.4|^5.0|^6.0",
-                "symfony/mime": "^4.4|^5.0|^6.0",
-                "symfony/property-access": "^5.4|^6.0",
-                "symfony/property-info": "^5.3.13|^6.0",
-                "symfony/uid": "^5.3|^6.0",
-                "symfony/validator": "^4.4|^5.0|^6.0",
-                "symfony/var-dumper": "^4.4|^5.0|^6.0",
-                "symfony/var-exporter": "^4.4|^5.0|^6.0",
-                "symfony/yaml": "^4.4|^5.0|^6.0"
-            },
-            "suggest": {
-                "psr/cache-implementation": "For using the metadata cache.",
-                "symfony/config": "For using the XML mapping loader.",
-                "symfony/mime": "For using a MIME type guesser within the DataUriNormalizer.",
-                "symfony/property-access": "For using the ObjectNormalizer.",
-                "symfony/property-info": "To deserialize relations.",
-                "symfony/var-exporter": "For using the metadata compiler.",
-                "symfony/yaml": "For using the default YAML mapping loader."
+                "php": ">=7.2"
             },
             "type": "library",
-            "autoload": {
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
                 "psr-4": {
-                    "Symfony\\Component\\Serializer\\": ""
+                    "Symfony\\Polyfill\\Php83\\": ""
                 },
-                "exclude-from-classmap": [
-                    "/Tests/"
+                "classmap": [
+                    "Resources/stubs"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -6409,18 +6769,24 @@
             ],
             "authors": [
                 {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
                 },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.",
+            "description": "Symfony polyfill backporting some PHP 8.3+ features to lower PHP versions",
             "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
             "support": {
-                "source": "https://github.com/symfony/serializer/tree/v5.4.8"
+                "source": "https://github.com/symfony/polyfill-php83/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -6431,52 +6797,43 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-12T16:02:29+00:00"
+            "time": "2025-07-08T02:45:35+00:00"
         },
         {
-            "name": "symfony/service-contracts",
-            "version": "v2.5.1",
+            "name": "symfony/process",
+            "version": "v5.4.47",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c"
+                "url": "https://github.com/symfony/process.git",
+                "reference": "5d1662fb32ebc94f17ddb8d635454a776066733d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/24d9dc654b83e91aa59f9d167b131bc3b5bea24c",
-                "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c",
+                "url": "https://api.github.com/repos/symfony/process/zipball/5d1662fb32ebc94f17ddb8d635454a776066733d",
+                "reference": "5d1662fb32ebc94f17ddb8d635454a776066733d",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
-                "psr/container": "^1.1",
-                "symfony/deprecation-contracts": "^2.1|^3"
-            },
-            "conflict": {
-                "ext-psr": "<1.1|>=2"
-            },
-            "suggest": {
-                "symfony/service-implementation": ""
+                "symfony/polyfill-php80": "^1.16"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "2.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
-                }
-            },
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Contracts\\Service\\": ""
-                }
+                    "Symfony\\Component\\Process\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -6484,26 +6841,18 @@
             ],
             "authors": [
                 {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
                 },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Generic abstractions related to writing services",
+            "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
-            "keywords": [
-                "abstractions",
-                "contracts",
-                "decoupling",
-                "interfaces",
-                "interoperability",
-                "standards"
-            ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v2.5.1"
+                "source": "https://github.com/symfony/process/tree/v5.4.47"
             },
             "funding": [
                 {
@@ -6519,46 +6868,38 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-03-13T20:07:29+00:00"
+            "time": "2024-11-06T11:36:42+00:00"
         },
         {
-            "name": "symfony/string",
-            "version": "v5.4.8",
+            "name": "symfony/property-access",
+            "version": "v5.4.45",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/string.git",
-                "reference": "3c061a76bff6d6ea427d85e12ad1bb8ed8cd43e8"
+                "url": "https://github.com/symfony/property-access.git",
+                "reference": "111e7ed617509f1a9139686055d234aad6e388e0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/3c061a76bff6d6ea427d85e12ad1bb8ed8cd43e8",
-                "reference": "3c061a76bff6d6ea427d85e12ad1bb8ed8cd43e8",
+                "url": "https://api.github.com/repos/symfony/property-access/zipball/111e7ed617509f1a9139686055d234aad6e388e0",
+                "reference": "111e7ed617509f1a9139686055d234aad6e388e0",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
-                "symfony/polyfill-ctype": "~1.8",
-                "symfony/polyfill-intl-grapheme": "~1.0",
-                "symfony/polyfill-intl-normalizer": "~1.0",
-                "symfony/polyfill-mbstring": "~1.0",
-                "symfony/polyfill-php80": "~1.15"
-            },
-            "conflict": {
-                "symfony/translation-contracts": ">=3.0"
+                "symfony/deprecation-contracts": "^2.1|^3",
+                "symfony/polyfill-php80": "^1.16",
+                "symfony/property-info": "^5.2|^6.0"
             },
             "require-dev": {
-                "symfony/error-handler": "^4.4|^5.0|^6.0",
-                "symfony/http-client": "^4.4|^5.0|^6.0",
-                "symfony/translation-contracts": "^1.1|^2",
-                "symfony/var-exporter": "^4.4|^5.0|^6.0"
+                "symfony/cache": "^4.4|^5.0|^6.0"
+            },
+            "suggest": {
+                "psr/cache-implementation": "To cache access methods."
             },
             "type": "library",
             "autoload": {
-                "files": [
-                    "Resources/functions.php"
-                ],
                 "psr-4": {
-                    "Symfony\\Component\\String\\": ""
+                    "Symfony\\Component\\PropertyAccess\\": ""
                 },
                 "exclude-from-classmap": [
                     "/Tests/"
@@ -6570,26 +6911,29 @@
             ],
             "authors": [
                 {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
                 },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way",
+            "description": "Provides functions to read and write from/to an object or array using a simple string notation",
             "homepage": "https://symfony.com",
             "keywords": [
-                "grapheme",
-                "i18n",
-                "string",
-                "unicode",
-                "utf-8",
-                "utf8"
+                "access",
+                "array",
+                "extraction",
+                "index",
+                "injection",
+                "object",
+                "property",
+                "property-path",
+                "reflection"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v5.4.8"
+                "source": "https://github.com/symfony/property-access/tree/v5.4.45"
             },
             "funding": [
                 {
@@ -6605,42 +6949,55 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-19T10:40:37+00:00"
+            "time": "2024-09-25T14:11:13+00:00"
         },
         {
-            "name": "symfony/translation-contracts",
-            "version": "v2.5.1",
+            "name": "symfony/property-info",
+            "version": "v5.4.48",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/translation-contracts.git",
-                "reference": "1211df0afa701e45a04253110e959d4af4ef0f07"
+                "url": "https://github.com/symfony/property-info.git",
+                "reference": "a0396295ad585f95fccd690bc6a281e5bd303902"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/1211df0afa701e45a04253110e959d4af4ef0f07",
-                "reference": "1211df0afa701e45a04253110e959d4af4ef0f07",
+                "url": "https://api.github.com/repos/symfony/property-info/zipball/a0396295ad585f95fccd690bc6a281e5bd303902",
+                "reference": "a0396295ad585f95fccd690bc6a281e5bd303902",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5"
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1|^3",
+                "symfony/polyfill-php80": "^1.16",
+                "symfony/string": "^5.1|^6.0"
+            },
+            "conflict": {
+                "phpdocumentor/reflection-docblock": "<3.2.2",
+                "phpdocumentor/type-resolver": "<1.4.0",
+                "symfony/dependency-injection": "<4.4"
+            },
+            "require-dev": {
+                "doctrine/annotations": "^1.10.4|^2",
+                "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
+                "phpstan/phpdoc-parser": "^1.0|^2.0",
+                "symfony/cache": "^4.4|^5.0|^6.0",
+                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
+                "symfony/serializer": "^4.4|^5.0|^6.0"
             },
             "suggest": {
-                "symfony/translation-implementation": ""
+                "phpdocumentor/reflection-docblock": "To use the PHPDoc",
+                "psr/cache-implementation": "To cache results",
+                "symfony/doctrine-bridge": "To use Doctrine metadata",
+                "symfony/serializer": "To use Serializer metadata"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "2.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
-                }
-            },
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Contracts\\Translation\\": ""
-                }
+                    "Symfony\\Component\\PropertyInfo\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -6648,26 +7005,26 @@
             ],
             "authors": [
                 {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
+                    "name": "Kévin Dunglas",
+                    "email": "dunglas@gmail.com"
                 },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Generic abstractions related to translation",
+            "description": "Extracts information about PHP class' properties using metadata of popular sources",
             "homepage": "https://symfony.com",
             "keywords": [
-                "abstractions",
-                "contracts",
-                "decoupling",
-                "interfaces",
-                "interoperability",
-                "standards"
+                "doctrine",
+                "phpdoc",
+                "property",
+                "symfony",
+                "type",
+                "validator"
             ],
             "support": {
-                "source": "https://github.com/symfony/translation-contracts/tree/v2.5.1"
+                "source": "https://github.com/symfony/property-info/tree/v5.4.48"
             },
             "funding": [
                 {
@@ -6683,74 +7040,71 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:53:40+00:00"
+            "time": "2024-11-25T16:14:41+00:00"
         },
         {
-            "name": "symfony/validator",
-            "version": "v4.4.41",
+            "name": "symfony/serializer",
+            "version": "v5.4.45",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/validator.git",
-                "reference": "b79a7830b8ead3fb0a2a0080ba6f5b2a0861c28c"
+                "url": "https://github.com/symfony/serializer.git",
+                "reference": "460c5df9fb6c39d10d5b7f386e4feae4b6370221"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/validator/zipball/b79a7830b8ead3fb0a2a0080ba6f5b2a0861c28c",
-                "reference": "b79a7830b8ead3fb0a2a0080ba6f5b2a0861c28c",
+                "url": "https://api.github.com/repos/symfony/serializer/zipball/460c5df9fb6c39d10d5b7f386e4feae4b6370221",
+                "reference": "460c5df9fb6c39d10d5b7f386e4feae4b6370221",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1.3",
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1|^3",
                 "symfony/polyfill-ctype": "~1.8",
-                "symfony/polyfill-mbstring": "~1.0",
-                "symfony/polyfill-php80": "^1.16",
-                "symfony/translation-contracts": "^1.1|^2"
+                "symfony/polyfill-php80": "^1.16"
             },
             "conflict": {
-                "doctrine/lexer": "<1.1",
-                "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
-                "symfony/dependency-injection": "<3.4",
-                "symfony/http-kernel": "<4.4",
-                "symfony/intl": "<4.3",
-                "symfony/translation": ">=5.0",
-                "symfony/yaml": "<3.4"
+                "doctrine/annotations": "<1.12",
+                "phpdocumentor/reflection-docblock": "<3.2.2",
+                "phpdocumentor/type-resolver": "<1.4.0",
+                "symfony/dependency-injection": "<4.4",
+                "symfony/property-access": "<5.4",
+                "symfony/property-info": "<5.4.24|>=6,<6.2.11",
+                "symfony/uid": "<5.3",
+                "symfony/yaml": "<4.4"
             },
             "require-dev": {
-                "doctrine/annotations": "^1.10.4",
-                "doctrine/cache": "^1.0|^2.0",
-                "egulias/email-validator": "^2.1.10|^3",
-                "symfony/cache": "^3.4|^4.0|^5.0",
-                "symfony/config": "^3.4|^4.0|^5.0",
-                "symfony/dependency-injection": "^3.4|^4.0|^5.0",
-                "symfony/expression-language": "^3.4|^4.0|^5.0",
-                "symfony/http-client": "^4.3|^5.0",
-                "symfony/http-foundation": "^4.1|^5.0",
-                "symfony/http-kernel": "^4.4",
-                "symfony/intl": "^4.3|^5.0",
-                "symfony/mime": "^4.4|^5.0",
-                "symfony/property-access": "^3.4|^4.0|^5.0",
-                "symfony/property-info": "^3.4|^4.0|^5.0",
-                "symfony/translation": "^4.2",
-                "symfony/yaml": "^3.4|^4.0|^5.0"
+                "doctrine/annotations": "^1.12|^2",
+                "phpdocumentor/reflection-docblock": "^3.2|^4.0|^5.0",
+                "symfony/cache": "^4.4|^5.0|^6.0",
+                "symfony/config": "^4.4|^5.0|^6.0",
+                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
+                "symfony/error-handler": "^4.4|^5.0|^6.0",
+                "symfony/filesystem": "^4.4|^5.0|^6.0",
+                "symfony/form": "^4.4|^5.0|^6.0",
+                "symfony/http-foundation": "^4.4|^5.0|^6.0",
+                "symfony/http-kernel": "^4.4|^5.0|^6.0",
+                "symfony/mime": "^4.4|^5.0|^6.0",
+                "symfony/property-access": "^5.4.26|^6.3",
+                "symfony/property-info": "^5.4.24|^6.2.11",
+                "symfony/uid": "^5.3|^6.0",
+                "symfony/validator": "^4.4|^5.0|^6.0",
+                "symfony/var-dumper": "^4.4|^5.0|^6.0",
+                "symfony/var-exporter": "^4.4|^5.0|^6.0",
+                "symfony/yaml": "^4.4|^5.0|^6.0"
             },
             "suggest": {
-                "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
-                "doctrine/cache": "For using the default cached annotation reader.",
-                "egulias/email-validator": "Strict (RFC compliant) email validation",
-                "psr/cache-implementation": "For using the mapping cache.",
-                "symfony/config": "",
-                "symfony/expression-language": "For using the Expression validator",
-                "symfony/http-foundation": "",
-                "symfony/intl": "",
-                "symfony/property-access": "For accessing properties within comparison constraints",
-                "symfony/property-info": "To automatically add NotNull and Type constraints",
-                "symfony/translation": "For translating validation errors.",
-                "symfony/yaml": ""
+                "psr/cache-implementation": "For using the metadata cache.",
+                "symfony/config": "For using the XML mapping loader.",
+                "symfony/mime": "For using a MIME type guesser within the DataUriNormalizer.",
+                "symfony/property-access": "For using the ObjectNormalizer.",
+                "symfony/property-info": "To deserialize relations.",
+                "symfony/var-exporter": "For using the metadata compiler.",
+                "symfony/yaml": "For using the default YAML mapping loader."
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Component\\Validator\\": ""
+                    "Symfony\\Component\\Serializer\\": ""
                 },
                 "exclude-from-classmap": [
                     "/Tests/"
@@ -6770,10 +7124,10 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Provides tools to validate values",
+            "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/validator/tree/v4.4.41"
+                "source": "https://github.com/symfony/serializer/tree/v5.4.45"
             },
             "funding": [
                 {
@@ -6789,20 +7143,373 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-14T15:50:15+00:00"
+            "time": "2024-09-25T14:11:13+00:00"
         },
         {
-            "name": "symfony/var-dumper",
-            "version": "v5.4.8",
+            "name": "symfony/service-contracts",
+            "version": "v2.5.4",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "cdcadd343d31ad16fc5e006b0de81ea307435053"
+                "url": "https://github.com/symfony/service-contracts.git",
+                "reference": "f37b419f7aea2e9abf10abd261832cace12e3300"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/cdcadd343d31ad16fc5e006b0de81ea307435053",
-                "reference": "cdcadd343d31ad16fc5e006b0de81ea307435053",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f37b419f7aea2e9abf10abd261832cace12e3300",
+                "reference": "f37b419f7aea2e9abf10abd261832cace12e3300",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "psr/container": "^1.1",
+                "symfony/deprecation-contracts": "^2.1|^3"
+            },
+            "conflict": {
+                "ext-psr": "<1.1|>=2"
+            },
+            "suggest": {
+                "symfony/service-implementation": ""
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
+                "branch-alias": {
+                    "dev-main": "2.5-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\Service\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Generic abstractions related to writing services",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/service-contracts/tree/v2.5.4"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-09-25T14:11:13+00:00"
+        },
+        {
+            "name": "symfony/string",
+            "version": "v5.4.47",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/string.git",
+                "reference": "136ca7d72f72b599f2631aca474a4f8e26719799"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/string/zipball/136ca7d72f72b599f2631aca474a4f8e26719799",
+                "reference": "136ca7d72f72b599f2631aca474a4f8e26719799",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-intl-grapheme": "~1.0",
+                "symfony/polyfill-intl-normalizer": "~1.0",
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/polyfill-php80": "~1.15"
+            },
+            "conflict": {
+                "symfony/translation-contracts": ">=3.0"
+            },
+            "require-dev": {
+                "symfony/error-handler": "^4.4|^5.0|^6.0",
+                "symfony/http-client": "^4.4|^5.0|^6.0",
+                "symfony/translation-contracts": "^1.1|^2",
+                "symfony/var-exporter": "^4.4|^5.0|^6.0"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "Resources/functions.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Component\\String\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "grapheme",
+                "i18n",
+                "string",
+                "unicode",
+                "utf-8",
+                "utf8"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/string/tree/v5.4.47"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-11-10T20:33:58+00:00"
+        },
+        {
+            "name": "symfony/translation-contracts",
+            "version": "v2.5.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/translation-contracts.git",
+                "reference": "450d4172653f38818657022252f9d81be89ee9a8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/450d4172653f38818657022252f9d81be89ee9a8",
+                "reference": "450d4172653f38818657022252f9d81be89ee9a8",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5"
+            },
+            "suggest": {
+                "symfony/translation-implementation": ""
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
+                "branch-alias": {
+                    "dev-main": "2.5-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\Translation\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Generic abstractions related to translation",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/translation-contracts/tree/v2.5.4"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-09-25T14:11:13+00:00"
+        },
+        {
+            "name": "symfony/validator",
+            "version": "v4.4.48",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/validator.git",
+                "reference": "54781a4c41efbd283b779110bf8ae7f263737775"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/validator/zipball/54781a4c41efbd283b779110bf8ae7f263737775",
+                "reference": "54781a4c41efbd283b779110bf8ae7f263737775",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1.3",
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/polyfill-php80": "^1.16",
+                "symfony/translation-contracts": "^1.1|^2"
+            },
+            "conflict": {
+                "doctrine/lexer": "<1.1",
+                "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
+                "symfony/dependency-injection": "<3.4",
+                "symfony/http-kernel": "<4.4",
+                "symfony/intl": "<4.3",
+                "symfony/translation": ">=5.0",
+                "symfony/yaml": "<3.4"
+            },
+            "require-dev": {
+                "doctrine/annotations": "^1.10.4",
+                "doctrine/cache": "^1.0|^2.0",
+                "egulias/email-validator": "^2.1.10|^3",
+                "symfony/cache": "^3.4|^4.0|^5.0",
+                "symfony/config": "^3.4|^4.0|^5.0",
+                "symfony/dependency-injection": "^3.4|^4.0|^5.0",
+                "symfony/expression-language": "^3.4|^4.0|^5.0",
+                "symfony/http-client": "^4.3|^5.0",
+                "symfony/http-foundation": "^4.1|^5.0",
+                "symfony/http-kernel": "^4.4",
+                "symfony/intl": "^4.3|^5.0",
+                "symfony/mime": "^4.4|^5.0",
+                "symfony/property-access": "^3.4|^4.0|^5.0",
+                "symfony/property-info": "^3.4|^4.0|^5.0",
+                "symfony/translation": "^4.2",
+                "symfony/yaml": "^3.4|^4.0|^5.0"
+            },
+            "suggest": {
+                "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
+                "doctrine/cache": "For using the default cached annotation reader.",
+                "egulias/email-validator": "Strict (RFC compliant) email validation",
+                "psr/cache-implementation": "For using the mapping cache.",
+                "symfony/config": "",
+                "symfony/expression-language": "For using the Expression validator",
+                "symfony/http-foundation": "",
+                "symfony/intl": "",
+                "symfony/property-access": "For accessing properties within comparison constraints",
+                "symfony/property-info": "To automatically add NotNull and Type constraints",
+                "symfony/translation": "For translating validation errors.",
+                "symfony/yaml": ""
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Validator\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides tools to validate values",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/validator/tree/v4.4.48"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-10-25T13:54:11+00:00"
+        },
+        {
+            "name": "symfony/var-dumper",
+            "version": "v5.4.48",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/var-dumper.git",
+                "reference": "42f18f170aa86d612c3559cfb3bd11a375df32c8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/42f18f170aa86d612c3559cfb3bd11a375df32c8",
+                "reference": "42f18f170aa86d612c3559cfb3bd11a375df32c8",
                 "shasum": ""
             },
             "require": {
@@ -6811,12 +7518,12 @@
                 "symfony/polyfill-php80": "^1.16"
             },
             "conflict": {
-                "phpunit/phpunit": "<5.4.3",
                 "symfony/console": "<4.4"
             },
             "require-dev": {
                 "ext-iconv": "*",
                 "symfony/console": "^4.4|^5.0|^6.0",
+                "symfony/http-kernel": "^4.4|^5.0|^6.0",
                 "symfony/process": "^4.4|^5.0|^6.0",
                 "symfony/uid": "^5.1|^6.0",
                 "twig/twig": "^2.13|^3.0.4"
@@ -6862,7 +7569,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v5.4.8"
+                "source": "https://github.com/symfony/var-dumper/tree/v5.4.48"
             },
             "funding": [
                 {
@@ -6878,20 +7585,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-26T13:19:20+00:00"
+            "time": "2024-11-08T15:21:10+00:00"
         },
         {
             "name": "symfony/var-exporter",
-            "version": "v5.4.8",
+            "version": "v5.4.45",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-exporter.git",
-                "reference": "7e132a3fcd4b57add721b4207236877b6017ec93"
+                "reference": "862700068db0ddfd8c5b850671e029a90246ec75"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/7e132a3fcd4b57add721b4207236877b6017ec93",
-                "reference": "7e132a3fcd4b57add721b4207236877b6017ec93",
+                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/862700068db0ddfd8c5b850671e029a90246ec75",
+                "reference": "862700068db0ddfd8c5b850671e029a90246ec75",
                 "shasum": ""
             },
             "require": {
@@ -6935,7 +7642,7 @@
                 "serialize"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-exporter/tree/v5.4.8"
+                "source": "https://github.com/symfony/var-exporter/tree/v5.4.45"
             },
             "funding": [
                 {
@@ -6951,7 +7658,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-26T13:19:20+00:00"
+            "time": "2024-09-25T14:11:13+00:00"
         },
         {
             "name": "symfony/web-link",
@@ -7042,29 +7749,290 @@
             ],
             "time": "2022-01-02T09:41:36+00:00"
         },
+        {
+            "name": "voku/anti-xss",
+            "version": "4.1.42",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/voku/anti-xss.git",
+                "reference": "bca1f8607e55a3c5077483615cd93bd8f11bd675"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/voku/anti-xss/zipball/bca1f8607e55a3c5077483615cd93bd8f11bd675",
+                "reference": "bca1f8607e55a3c5077483615cd93bd8f11bd675",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0.0",
+                "voku/portable-utf8": "~6.0.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~6.0 || ~7.0 || ~9.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "voku\\helper\\": "src/voku/helper/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "EllisLab Dev Team",
+                    "homepage": "http://ellislab.com/"
+                },
+                {
+                    "name": "Lars Moelleken",
+                    "email": "lars@moelleken.org",
+                    "homepage": "https://www.moelleken.org/"
+                }
+            ],
+            "description": "anti xss-library",
+            "homepage": "https://github.com/voku/anti-xss",
+            "keywords": [
+                "anti-xss",
+                "clean",
+                "security",
+                "xss"
+            ],
+            "support": {
+                "issues": "https://github.com/voku/anti-xss/issues",
+                "source": "https://github.com/voku/anti-xss/tree/4.1.42"
+            },
+            "funding": [
+                {
+                    "url": "https://www.paypal.me/moelleken",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/voku",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/anti-xss",
+                    "type": "open_collective"
+                },
+                {
+                    "url": "https://www.patreon.com/voku",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/voku/anti-xss",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-07-03T14:40:46+00:00"
+        },
+        {
+            "name": "voku/portable-ascii",
+            "version": "2.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/voku/portable-ascii.git",
+                "reference": "b1d923f88091c6bf09699efcd7c8a1b1bfd7351d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/voku/portable-ascii/zipball/b1d923f88091c6bf09699efcd7c8a1b1bfd7351d",
+                "reference": "b1d923f88091c6bf09699efcd7c8a1b1bfd7351d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~6.0 || ~7.0 || ~9.0"
+            },
+            "suggest": {
+                "ext-intl": "Use Intl for transliterator_transliterate() support"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "voku\\": "src/voku/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Lars Moelleken",
+                    "homepage": "https://www.moelleken.org/"
+                }
+            ],
+            "description": "Portable ASCII library - performance optimized (ascii) string functions for php.",
+            "homepage": "https://github.com/voku/portable-ascii",
+            "keywords": [
+                "ascii",
+                "clean",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/voku/portable-ascii/issues",
+                "source": "https://github.com/voku/portable-ascii/tree/2.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://www.paypal.me/moelleken",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/voku",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/portable-ascii",
+                    "type": "open_collective"
+                },
+                {
+                    "url": "https://www.patreon.com/voku",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/voku/portable-ascii",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-11-21T01:49:47+00:00"
+        },
+        {
+            "name": "voku/portable-utf8",
+            "version": "6.0.13",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/voku/portable-utf8.git",
+                "reference": "b8ce36bf26593e5c2e81b1850ef0ffb299d2043f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/voku/portable-utf8/zipball/b8ce36bf26593e5c2e81b1850ef0ffb299d2043f",
+                "reference": "b8ce36bf26593e5c2e81b1850ef0ffb299d2043f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0.0",
+                "symfony/polyfill-iconv": "~1.0",
+                "symfony/polyfill-intl-grapheme": "~1.0",
+                "symfony/polyfill-intl-normalizer": "~1.0",
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/polyfill-php72": "~1.0",
+                "voku/portable-ascii": "~2.0.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "1.9.*@dev",
+                "phpstan/phpstan-strict-rules": "1.4.*@dev",
+                "phpunit/phpunit": "~6.0 || ~7.0 || ~9.0",
+                "thecodingmachine/phpstan-strict-rules": "1.0.*@dev",
+                "voku/phpstan-rules": "3.1.*@dev"
+            },
+            "suggest": {
+                "ext-ctype": "Use Ctype for e.g. hexadecimal digit detection",
+                "ext-fileinfo": "Use Fileinfo for better binary file detection",
+                "ext-iconv": "Use iconv for best performance",
+                "ext-intl": "Use Intl for best performance",
+                "ext-json": "Use JSON for string detection",
+                "ext-mbstring": "Use Mbstring for best performance"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "voku\\": "src/voku/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "(Apache-2.0 or GPL-2.0)"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Hamid Sarfraz",
+                    "homepage": "http://pageconfig.com/"
+                },
+                {
+                    "name": "Lars Moelleken",
+                    "homepage": "http://www.moelleken.org/"
+                }
+            ],
+            "description": "Portable UTF-8 library - performance optimized (unicode) string functions for php.",
+            "homepage": "https://github.com/voku/portable-utf8",
+            "keywords": [
+                "UTF",
+                "clean",
+                "php",
+                "unicode",
+                "utf-8",
+                "utf8"
+            ],
+            "support": {
+                "issues": "https://github.com/voku/portable-utf8/issues",
+                "source": "https://github.com/voku/portable-utf8/tree/6.0.13"
+            },
+            "funding": [
+                {
+                    "url": "https://www.paypal.me/moelleken",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/voku",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/portable-utf8",
+                    "type": "open_collective"
+                },
+                {
+                    "url": "https://www.patreon.com/voku",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/voku/portable-utf8",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-03-08T08:35:38+00:00"
+        },
         {
             "name": "wikimedia/less.php",
-            "version": "v3.1.0",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/wikimedia/less.php.git",
-                "reference": "a486d78b9bd16b72f237fc6093aa56d69ce8bd13"
+                "reference": "39b1fbbdd3d95c5279f231d2298f3866fa869fcd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/wikimedia/less.php/zipball/a486d78b9bd16b72f237fc6093aa56d69ce8bd13",
-                "reference": "a486d78b9bd16b72f237fc6093aa56d69ce8bd13",
+                "url": "https://api.github.com/repos/wikimedia/less.php/zipball/39b1fbbdd3d95c5279f231d2298f3866fa869fcd",
+                "reference": "39b1fbbdd3d95c5279f231d2298f3866fa869fcd",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.9"
+                "php": ">=7.4.3"
             },
             "require-dev": {
-                "mediawiki/mediawiki-codesniffer": "34.0.0",
-                "mediawiki/minus-x": "1.0.0",
-                "php-parallel-lint/php-console-highlighter": "0.5.0",
-                "php-parallel-lint/php-parallel-lint": "1.2.0",
-                "phpunit/phpunit": "^8.5"
+                "mediawiki/mediawiki-codesniffer": "45.0.0",
+                "mediawiki/mediawiki-phan-config": "0.14.0",
+                "mediawiki/minus-x": "1.1.3",
+                "php-parallel-lint/php-console-highlighter": "1.0.0",
+                "php-parallel-lint/php-parallel-lint": "1.4.0",
+                "phpunit/phpunit": "9.6.16"
             },
             "bin": [
                 "bin/lessc"
@@ -7083,6 +8051,10 @@
                 "Apache-2.0"
             ],
             "authors": [
+                {
+                    "name": "Timo Tijhof",
+                    "homepage": "https://timotijhof.net"
+                },
                 {
                     "name": "Josh Schmidt",
                     "homepage": "https://github.com/oyejorge"
@@ -7096,7 +8068,8 @@
                     "homepage": "https://github.com/Mordred"
                 }
             ],
-            "description": "PHP port of the Javascript version of LESS http://lesscss.org (Originally maintained by Josh Schmidt)",
+            "description": "PHP port of the LESS processor",
+            "homepage": "https://gerrit.wikimedia.org/g/mediawiki/libs/less.php",
             "keywords": [
                 "css",
                 "less",
@@ -7107,37 +8080,44 @@
             ],
             "support": {
                 "issues": "https://github.com/wikimedia/less.php/issues",
-                "source": "https://github.com/wikimedia/less.php/tree/v3.1.0"
+                "source": "https://github.com/wikimedia/less.php/tree/v5.1.2"
             },
-            "time": "2020-12-11T19:33:31+00:00"
+            "time": "2024-11-13T15:44:20+00:00"
         }
     ],
     "packages-dev": [
         {
             "name": "bamarni/composer-bin-plugin",
-            "version": "v1.5.0",
+            "version": "1.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bamarni/composer-bin-plugin.git",
-                "reference": "49934ffea764864788334c1485fbb08a4b852031"
+                "reference": "92fd7b1e6e9cdae19b0d57369d8ad31a37b6a880"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bamarni/composer-bin-plugin/zipball/49934ffea764864788334c1485fbb08a4b852031",
-                "reference": "49934ffea764864788334c1485fbb08a4b852031",
+                "url": "https://api.github.com/repos/bamarni/composer-bin-plugin/zipball/92fd7b1e6e9cdae19b0d57369d8ad31a37b6a880",
+                "reference": "92fd7b1e6e9cdae19b0d57369d8ad31a37b6a880",
                 "shasum": ""
             },
             "require": {
-                "composer-plugin-api": "^1.0 || ^2.0",
-                "php": "^5.5.9 || ^7.0 || ^8.0"
+                "composer-plugin-api": "^2.0",
+                "php": "^7.2.5 || ^8.0"
             },
             "require-dev": {
-                "composer/composer": "^1.0 || ^2.0",
-                "symfony/console": "^2.5 || ^3.0 || ^4.0"
+                "composer/composer": "^2.0",
+                "ext-json": "*",
+                "phpstan/extension-installer": "^1.1",
+                "phpstan/phpstan": "^1.8",
+                "phpstan/phpstan-phpunit": "^1.1",
+                "phpunit/phpunit": "^8.5 || ^9.5",
+                "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0",
+                "symfony/finder": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0",
+                "symfony/process": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0"
             },
             "type": "composer-plugin",
             "extra": {
-                "class": "Bamarni\\Composer\\Bin\\Plugin"
+                "class": "Bamarni\\Composer\\Bin\\BamarniBinPlugin"
             },
             "autoload": {
                 "psr-4": {
@@ -7159,42 +8139,41 @@
             ],
             "support": {
                 "issues": "https://github.com/bamarni/composer-bin-plugin/issues",
-                "source": "https://github.com/bamarni/composer-bin-plugin/tree/v1.5.0"
+                "source": "https://github.com/bamarni/composer-bin-plugin/tree/1.8.2"
             },
-            "time": "2022-02-22T21:01:25+00:00"
+            "time": "2022-10-31T08:38:03+00:00"
         },
         {
             "name": "behat/behat",
-            "version": "v3.10.0",
+            "version": "v3.15.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Behat/Behat.git",
-                "reference": "a55661154079cf881ef643b303bfaf67bae3a09f"
+                "reference": "132e32fdad69340f503b103a5ccaf5dd72ce7d83"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Behat/Behat/zipball/a55661154079cf881ef643b303bfaf67bae3a09f",
-                "reference": "a55661154079cf881ef643b303bfaf67bae3a09f",
+                "url": "https://api.github.com/repos/Behat/Behat/zipball/132e32fdad69340f503b103a5ccaf5dd72ce7d83",
+                "reference": "132e32fdad69340f503b103a5ccaf5dd72ce7d83",
                 "shasum": ""
             },
             "require": {
-                "behat/gherkin": "^4.9.0",
+                "behat/gherkin": "^4.10.0",
                 "behat/transliterator": "^1.2",
                 "ext-mbstring": "*",
                 "php": "^7.2 || ^8.0",
-                "psr/container": "^1.0",
-                "symfony/config": "^4.4 || ^5.0 || ^6.0",
-                "symfony/console": "^4.4 || ^5.0 || ^6.0",
-                "symfony/dependency-injection": "^4.4 || ^5.0 || ^6.0",
-                "symfony/event-dispatcher": "^4.4 || ^5.0 || ^6.0",
-                "symfony/translation": "^4.4 || ^5.0 || ^6.0",
-                "symfony/yaml": "^4.4 || ^5.0 || ^6.0"
+                "psr/container": "^1.0 || ^2.0",
+                "symfony/config": "^4.4 || ^5.0 || ^6.0 || ^7.0",
+                "symfony/console": "^4.4 || ^5.0 || ^6.0 || ^7.0",
+                "symfony/dependency-injection": "^4.4 || ^5.0 || ^6.0 || ^7.0",
+                "symfony/event-dispatcher": "^4.4 || ^5.0 || ^6.0 || ^7.0",
+                "symfony/translation": "^4.4 || ^5.0 || ^6.0 || ^7.0",
+                "symfony/yaml": "^4.4 || ^5.0 || ^6.0 || ^7.0"
             },
             "require-dev": {
-                "container-interop/container-interop": "^1.2",
                 "herrera-io/box": "~1.6.1",
                 "phpunit/phpunit": "^8.5 || ^9.0",
-                "symfony/process": "^4.4 || ^5.0 || ^6.0",
+                "symfony/process": "^4.4 || ^5.0 || ^6.0 || ^7.0",
                 "vimeo/psalm": "^4.8"
             },
             "suggest": {
@@ -7229,7 +8208,7 @@
                 }
             ],
             "description": "Scenario-oriented BDD framework for PHP",
-            "homepage": "http://behat.org/",
+            "homepage": "https://behat.org/",
             "keywords": [
                 "Agile",
                 "BDD",
@@ -7246,31 +8225,31 @@
             ],
             "support": {
                 "issues": "https://github.com/Behat/Behat/issues",
-                "source": "https://github.com/Behat/Behat/tree/v3.10.0"
+                "source": "https://github.com/Behat/Behat/tree/v3.15.0"
             },
-            "time": "2021-11-02T20:09:40+00:00"
+            "time": "2024-10-30T07:54:51+00:00"
         },
         {
             "name": "behat/gherkin",
-            "version": "v4.9.0",
+            "version": "v4.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Behat/Gherkin.git",
-                "reference": "0bc8d1e30e96183e4f36db9dc79caead300beff4"
+                "reference": "cbb83c4c435dd8d05a161f2a5ae322e61b2f4db6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/0bc8d1e30e96183e4f36db9dc79caead300beff4",
-                "reference": "0bc8d1e30e96183e4f36db9dc79caead300beff4",
+                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/cbb83c4c435dd8d05a161f2a5ae322e61b2f4db6",
+                "reference": "cbb83c4c435dd8d05a161f2a5ae322e61b2f4db6",
                 "shasum": ""
             },
             "require": {
                 "php": "~7.2|~8.0"
             },
             "require-dev": {
-                "cucumber/cucumber": "dev-gherkin-22.0.0",
+                "cucumber/cucumber": "dev-gherkin-24.1.0",
                 "phpunit/phpunit": "~8|~9",
-                "symfony/yaml": "~3|~4|~5"
+                "symfony/yaml": "~3|~4|~5|~6|~7"
             },
             "suggest": {
                 "symfony/yaml": "If you want to parse features, represented in YAML files"
@@ -7309,32 +8288,34 @@
             ],
             "support": {
                 "issues": "https://github.com/Behat/Gherkin/issues",
-                "source": "https://github.com/Behat/Gherkin/tree/v4.9.0"
+                "source": "https://github.com/Behat/Gherkin/tree/v4.10.0"
             },
-            "time": "2021-10-12T13:05:09+00:00"
+            "time": "2024-10-19T14:46:06+00:00"
         },
         {
             "name": "behat/mink",
-            "version": "v1.10.0",
+            "version": "v1.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/minkphp/Mink.git",
-                "reference": "19e58905632e7cfdc5b2bafb9b950a3521af32c5"
+                "reference": "7e4edec6c335937029cb3569ce7ef81182804d0a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/minkphp/Mink/zipball/19e58905632e7cfdc5b2bafb9b950a3521af32c5",
-                "reference": "19e58905632e7cfdc5b2bafb9b950a3521af32c5",
+                "url": "https://api.github.com/repos/minkphp/Mink/zipball/7e4edec6c335937029cb3569ce7ef81182804d0a",
+                "reference": "7e4edec6c335937029cb3569ce7ef81182804d0a",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2",
-                "symfony/css-selector": "^4.4 || ^5.0 || ^6.0"
+                "symfony/css-selector": "^4.4 || ^5.0 || ^6.0 || ^7.0"
             },
             "require-dev": {
+                "phpstan/phpstan": "^1.10",
+                "phpstan/phpstan-phpunit": "^1.3",
                 "phpunit/phpunit": "^8.5.22 || ^9.5.11",
-                "symfony/error-handler": "^4.4 || ^5.0 || ^6.0",
-                "symfony/phpunit-bridge": "^5.4 || ^6.0"
+                "symfony/error-handler": "^4.4 || ^5.0 || ^6.0 || ^7.0",
+                "symfony/phpunit-bridge": "^5.4 || ^6.0 || ^7.0"
             },
             "suggest": {
                 "behat/mink-browserkit-driver": "fast headless driver for any app without JS emulation",
@@ -7373,34 +8354,36 @@
             ],
             "support": {
                 "issues": "https://github.com/minkphp/Mink/issues",
-                "source": "https://github.com/minkphp/Mink/tree/v1.10.0"
+                "source": "https://github.com/minkphp/Mink/tree/v1.12.0"
             },
-            "time": "2022-03-28T14:22:43+00:00"
+            "time": "2024-10-30T18:48:14+00:00"
         },
         {
             "name": "behat/mink-selenium2-driver",
-            "version": "v1.6.0",
+            "version": "v1.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/minkphp/MinkSelenium2Driver.git",
-                "reference": "e5f8421654930da725499fb92983e6948c6f973e"
+                "reference": "4ca4083f305de7dff4434ac402dc4e3f39c0866a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/minkphp/MinkSelenium2Driver/zipball/e5f8421654930da725499fb92983e6948c6f973e",
-                "reference": "e5f8421654930da725499fb92983e6948c6f973e",
+                "url": "https://api.github.com/repos/minkphp/MinkSelenium2Driver/zipball/4ca4083f305de7dff4434ac402dc4e3f39c0866a",
+                "reference": "4ca4083f305de7dff4434ac402dc4e3f39c0866a",
                 "shasum": ""
             },
             "require": {
-                "behat/mink": "^1.9@dev",
+                "behat/mink": "^1.11@dev",
                 "ext-json": "*",
-                "instaclick/php-webdriver": "^1.4",
+                "instaclick/php-webdriver": "^1.4.14",
                 "php": ">=7.2"
             },
             "require-dev": {
                 "mink/driver-testsuite": "dev-master",
+                "phpstan/phpstan": "^1.10",
+                "phpstan/phpstan-phpunit": "^1.3",
                 "phpunit/phpunit": "^8.5.22 || ^9.5.11",
-                "symfony/error-handler": "^4.4 || ^5.0"
+                "symfony/error-handler": "^4.4 || ^5.0 || ^6.0 || ^7.0"
             },
             "type": "mink-driver",
             "extra": {
@@ -7441,84 +8424,162 @@
             ],
             "support": {
                 "issues": "https://github.com/minkphp/MinkSelenium2Driver/issues",
-                "source": "https://github.com/minkphp/MinkSelenium2Driver/tree/v1.6.0"
+                "source": "https://github.com/minkphp/MinkSelenium2Driver/tree/v1.7.0"
+            },
+            "time": "2023-12-09T11:58:45+00:00"
+        },
+        {
+            "name": "behat/transliterator",
+            "version": "v1.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Behat/Transliterator.git",
+                "reference": "baac5873bac3749887d28ab68e2f74db3a4408af"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Behat/Transliterator/zipball/baac5873bac3749887d28ab68e2f74db3a4408af",
+                "reference": "baac5873bac3749887d28ab68e2f74db3a4408af",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "require-dev": {
+                "chuyskywalker/rolling-curl": "^3.1",
+                "php-yaoi/php-yaoi": "^1.0",
+                "phpunit/phpunit": "^8.5.25 || ^9.5.19"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Behat\\Transliterator\\": "src/Behat/Transliterator"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Artistic-1.0"
+            ],
+            "description": "String transliterator",
+            "keywords": [
+                "i18n",
+                "slug",
+                "transliterator"
+            ],
+            "support": {
+                "issues": "https://github.com/Behat/Transliterator/issues",
+                "source": "https://github.com/Behat/Transliterator/tree/v1.5.0"
             },
-            "time": "2022-03-28T14:55:17+00:00"
+            "abandoned": true,
+            "time": "2022-03-30T09:27:43+00:00"
         },
         {
-            "name": "behat/transliterator",
-            "version": "v1.5.0",
+            "name": "composer/semver",
+            "version": "3.4.4",
             "source": {
                 "type": "git",
-                "url": "https://github.com/Behat/Transliterator.git",
-                "reference": "baac5873bac3749887d28ab68e2f74db3a4408af"
+                "url": "https://github.com/composer/semver.git",
+                "reference": "198166618906cb2de69b95d7d47e5fa8aa1b2b95"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Behat/Transliterator/zipball/baac5873bac3749887d28ab68e2f74db3a4408af",
-                "reference": "baac5873bac3749887d28ab68e2f74db3a4408af",
+                "url": "https://api.github.com/repos/composer/semver/zipball/198166618906cb2de69b95d7d47e5fa8aa1b2b95",
+                "reference": "198166618906cb2de69b95d7d47e5fa8aa1b2b95",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2"
+                "php": "^5.3.2 || ^7.0 || ^8.0"
             },
             "require-dev": {
-                "chuyskywalker/rolling-curl": "^3.1",
-                "php-yaoi/php-yaoi": "^1.0",
-                "phpunit/phpunit": "^8.5.25 || ^9.5.19"
+                "phpstan/phpstan": "^1.11",
+                "symfony/phpunit-bridge": "^3 || ^7"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.x-dev"
+                    "dev-main": "3.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Behat\\Transliterator\\": "src/Behat/Transliterator"
+                    "Composer\\Semver\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "Artistic-1.0"
+                "MIT"
             ],
-            "description": "String transliterator",
+            "authors": [
+                {
+                    "name": "Nils Adermann",
+                    "email": "naderman@naderman.de",
+                    "homepage": "http://www.naderman.de"
+                },
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                },
+                {
+                    "name": "Rob Bast",
+                    "email": "rob.bast@gmail.com",
+                    "homepage": "http://robbast.nl"
+                }
+            ],
+            "description": "Semver library that offers utilities, version constraint parsing and validation.",
             "keywords": [
-                "i18n",
-                "slug",
-                "transliterator"
+                "semantic",
+                "semver",
+                "validation",
+                "versioning"
             ],
             "support": {
-                "issues": "https://github.com/Behat/Transliterator/issues",
-                "source": "https://github.com/Behat/Transliterator/tree/v1.5.0"
+                "irc": "ircs://irc.libera.chat:6697/composer",
+                "issues": "https://github.com/composer/semver/issues",
+                "source": "https://github.com/composer/semver/tree/3.4.4"
             },
-            "time": "2022-03-30T09:27:43+00:00"
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                }
+            ],
+            "time": "2025-08-20T19:15:30+00:00"
         },
         {
             "name": "friends-of-behat/mink-extension",
-            "version": "v2.6.1",
+            "version": "v2.7.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfBehat/MinkExtension.git",
-                "reference": "df04efb3e88833208c3a99a3efa3f7e9f03854db"
+                "reference": "854336030e11983f580f49faad1b49a1238f9846"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfBehat/MinkExtension/zipball/df04efb3e88833208c3a99a3efa3f7e9f03854db",
-                "reference": "df04efb3e88833208c3a99a3efa3f7e9f03854db",
+                "url": "https://api.github.com/repos/FriendsOfBehat/MinkExtension/zipball/854336030e11983f580f49faad1b49a1238f9846",
+                "reference": "854336030e11983f580f49faad1b49a1238f9846",
                 "shasum": ""
             },
             "require": {
                 "behat/behat": "^3.0.5",
                 "behat/mink": "^1.5",
                 "php": ">=7.4",
-                "symfony/config": "^4.4 || ^5.0 || ^6.0"
+                "symfony/config": "^4.4 || ^5.0 || ^6.0 || ^7.0"
             },
             "replace": {
                 "behat/mink-extension": "self.version"
             },
             "require-dev": {
-                "behat/mink-goutte-driver": "^1.1",
+                "behat/mink-goutte-driver": "^1.1 || ^2.0",
                 "phpspec/phpspec": "^6.0 || ^7.0 || 7.1.x-dev"
             },
             "type": "behat-extension",
@@ -7555,22 +8616,23 @@
                 "web"
             ],
             "support": {
-                "source": "https://github.com/FriendsOfBehat/MinkExtension/tree/v2.6.1"
+                "issues": "https://github.com/FriendsOfBehat/MinkExtension/issues",
+                "source": "https://github.com/FriendsOfBehat/MinkExtension/tree/v2.7.5"
             },
-            "time": "2021-12-24T13:19:26+00:00"
+            "time": "2024-01-11T09:12:02+00:00"
         },
         {
             "name": "instaclick/php-webdriver",
-            "version": "1.4.14",
+            "version": "1.4.19",
             "source": {
                 "type": "git",
                 "url": "https://github.com/instaclick/php-webdriver.git",
-                "reference": "200b8df772b74d604bebf25ef42ad6f8ee6380a9"
+                "reference": "3b2a2ddc4e0a690cc691d7e5952964cc4b9538b1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/200b8df772b74d604bebf25ef42ad6f8ee6380a9",
-                "reference": "200b8df772b74d604bebf25ef42ad6f8ee6380a9",
+                "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/3b2a2ddc4e0a690cc691d7e5952964cc4b9538b1",
+                "reference": "3b2a2ddc4e0a690cc691d7e5952964cc4b9538b1",
                 "shasum": ""
             },
             "require": {
@@ -7618,31 +8680,33 @@
             ],
             "support": {
                 "issues": "https://github.com/instaclick/php-webdriver/issues",
-                "source": "https://github.com/instaclick/php-webdriver/tree/1.4.14"
+                "source": "https://github.com/instaclick/php-webdriver/tree/1.4.19"
             },
-            "time": "2022-04-19T02:06:59+00:00"
+            "time": "2024-03-19T01:58:53+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.13.2",
+            "version": "v5.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "210577fe3cf7badcc5814d99455df46564f3c077"
+                "reference": "3a454ca033b9e06b63282ce19562e892747449bb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077",
-                "reference": "210577fe3cf7badcc5814d99455df46564f3c077",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/3a454ca033b9e06b63282ce19562e892747449bb",
+                "reference": "3a454ca033b9e06b63282ce19562e892747449bb",
                 "shasum": ""
             },
             "require": {
+                "ext-ctype": "*",
+                "ext-json": "*",
                 "ext-tokenizer": "*",
-                "php": ">=7.0"
+                "php": ">=7.4"
             },
             "require-dev": {
                 "ircmaxell/php-yacc": "^0.0.7",
-                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
+                "phpunit/phpunit": "^9.0"
             },
             "bin": [
                 "bin/php-parse"
@@ -7650,7 +8714,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.9-dev"
+                    "dev-master": "5.x-dev"
                 }
             },
             "autoload": {
@@ -7674,26 +8738,27 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.2"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.2"
             },
-            "time": "2021-11-30T19:35:32+00:00"
+            "time": "2025-10-21T19:32:17+00:00"
         },
         {
             "name": "phar-io/manifest",
-            "version": "2.0.3",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/manifest.git",
-                "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
+                "reference": "54750ef60c58e43759730615a392c31c80e23176"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
-                "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176",
+                "reference": "54750ef60c58e43759730615a392c31c80e23176",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
+                "ext-libxml": "*",
                 "ext-phar": "*",
                 "ext-xmlwriter": "*",
                 "phar-io/version": "^3.0.1",
@@ -7734,417 +8799,143 @@
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
             "support": {
                 "issues": "https://github.com/phar-io/manifest/issues",
-                "source": "https://github.com/phar-io/manifest/tree/2.0.3"
-            },
-            "time": "2021-07-20T11:28:43+00:00"
-        },
-        {
-            "name": "phar-io/version",
-            "version": "3.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phar-io/version.git",
-                "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
-                "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2 || ^8.0"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Arne Blankerts",
-                    "email": "arne@blankerts.de",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Sebastian Heuer",
-                    "email": "sebastian@phpeople.de",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Library for handling version information and constraints",
-            "support": {
-                "issues": "https://github.com/phar-io/version/issues",
-                "source": "https://github.com/phar-io/version/tree/3.2.1"
-            },
-            "time": "2022-02-21T01:04:05+00:00"
-        },
-        {
-            "name": "php-parallel-lint/php-var-dump-check",
-            "version": "v0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-parallel-lint/PHP-Var-Dump-Check.git",
-                "reference": "8b880e559a2ab38b091d650f1a36caf161444c0c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-parallel-lint/PHP-Var-Dump-Check/zipball/8b880e559a2ab38b091d650f1a36caf161444c0c",
-                "reference": "8b880e559a2ab38b091d650f1a36caf161444c0c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.4.0"
-            },
-            "replace": {
-                "jakub-onderka/php-var-dump-check": "*"
-            },
-            "require-dev": {
-                "php-parallel-lint/php-parallel-lint": "^1.0",
-                "phpunit/phpunit": "^4.8.36"
-            },
-            "suggest": {
-                "php-parallel-lint/php-console-highlighter": "For colored console output"
-            },
-            "bin": [
-                "var-dump-check"
-            ],
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "JakubOnderka\\PhpVarDumpCheck\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-2-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jakub Onderka",
-                    "email": "jakub.onderka@gmail.com"
-                }
-            ],
-            "description": "Find forgotten variables dump in PHP source code.",
-            "support": {
-                "issues": "https://github.com/php-parallel-lint/PHP-Var-Dump-Check/issues",
-                "source": "https://github.com/php-parallel-lint/PHP-Var-Dump-Check/tree/master"
-            },
-            "time": "2020-08-17T12:12:52+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-common",
-            "version": "2.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
-                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2 || ^8.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.x": "2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "opensource@ijaap.nl"
-                }
-            ],
-            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
-            "homepage": "http://www.phpdoc.org",
-            "keywords": [
-                "FQSEN",
-                "phpDocumentor",
-                "phpdoc",
-                "reflection",
-                "static analysis"
-            ],
-            "support": {
-                "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x"
-            },
-            "time": "2020-06-27T09:03:43+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "5.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170",
-                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170",
-                "shasum": ""
-            },
-            "require": {
-                "ext-filter": "*",
-                "php": "^7.2 || ^8.0",
-                "phpdocumentor/reflection-common": "^2.2",
-                "phpdocumentor/type-resolver": "^1.3",
-                "webmozart/assert": "^1.9.1"
-            },
-            "require-dev": {
-                "mockery/mockery": "~1.3.2",
-                "psalm/phar": "^4.8"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                },
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "account@ijaap.nl"
-                }
-            ],
-            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "support": {
-                "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0"
-            },
-            "time": "2021-10-19T17:43:47+00:00"
-        },
-        {
-            "name": "phpdocumentor/type-resolver",
-            "version": "1.6.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "77a32518733312af16a44300404e945338981de3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3",
-                "reference": "77a32518733312af16a44300404e945338981de3",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2 || ^8.0",
-                "phpdocumentor/reflection-common": "^2.0"
-            },
-            "require-dev": {
-                "ext-tokenizer": "*",
-                "psalm/phar": "^4.8"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-1.x": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src"
-                }
+                "source": "https://github.com/phar-io/manifest/tree/2.0.4"
             },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
+            "funding": [
                 {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
+                    "url": "https://github.com/theseer",
+                    "type": "github"
                 }
-            ],
-            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
-            "support": {
-                "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.1"
-            },
-            "time": "2022-03-15T21:29:03+00:00"
+            ],
+            "time": "2024-03-03T12:33:53+00:00"
         },
         {
-            "name": "phpspec/prophecy",
-            "version": "v1.15.0",
+            "name": "phar-io/version",
+            "version": "3.2.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13"
+                "url": "https://github.com/phar-io/version.git",
+                "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
-                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
+                "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
+                "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.2",
-                "php": "^7.2 || ~8.0, <8.2",
-                "phpdocumentor/reflection-docblock": "^5.2",
-                "sebastian/comparator": "^3.0 || ^4.0",
-                "sebastian/recursion-context": "^3.0 || ^4.0"
-            },
-            "require-dev": {
-                "phpspec/phpspec": "^6.0 || ^7.0",
-                "phpunit/phpunit": "^8.0 || ^9.0"
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
             "autoload": {
-                "psr-4": {
-                    "Prophecy\\": "src/Prophecy"
-                }
+                "classmap": [
+                    "src/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
                 },
                 {
-                    "name": "Marcello Duarte",
-                    "email": "marcello.duarte@gmail.com"
+                    "name": "Sebastian Heuer",
+                    "email": "sebastian@phpeople.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "Developer"
                 }
             ],
-            "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "https://github.com/phpspec/prophecy",
-            "keywords": [
-                "Double",
-                "Dummy",
-                "fake",
-                "mock",
-                "spy",
-                "stub"
-            ],
+            "description": "Library for handling version information and constraints",
             "support": {
-                "issues": "https://github.com/phpspec/prophecy/issues",
-                "source": "https://github.com/phpspec/prophecy/tree/v1.15.0"
+                "issues": "https://github.com/phar-io/version/issues",
+                "source": "https://github.com/phar-io/version/tree/3.2.1"
             },
-            "time": "2021-12-08T12:19:24+00:00"
+            "time": "2022-02-21T01:04:05+00:00"
         },
         {
-            "name": "phpspec/prophecy-phpunit",
-            "version": "v2.0.1",
+            "name": "php-parallel-lint/php-var-dump-check",
+            "version": "v0.5",
             "source": {
                 "type": "git",
-                "url": "https://github.com/phpspec/prophecy-phpunit.git",
-                "reference": "2d7a9df55f257d2cba9b1d0c0963a54960657177"
+                "url": "https://github.com/php-parallel-lint/PHP-Var-Dump-Check.git",
+                "reference": "8b880e559a2ab38b091d650f1a36caf161444c0c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy-phpunit/zipball/2d7a9df55f257d2cba9b1d0c0963a54960657177",
-                "reference": "2d7a9df55f257d2cba9b1d0c0963a54960657177",
+                "url": "https://api.github.com/repos/php-parallel-lint/PHP-Var-Dump-Check/zipball/8b880e559a2ab38b091d650f1a36caf161444c0c",
+                "reference": "8b880e559a2ab38b091d650f1a36caf161444c0c",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ^8",
-                "phpspec/prophecy": "^1.3",
-                "phpunit/phpunit": "^9.1"
+                "php": ">=5.4.0"
             },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
+            "replace": {
+                "jakub-onderka/php-var-dump-check": "*"
+            },
+            "require-dev": {
+                "php-parallel-lint/php-parallel-lint": "^1.0",
+                "phpunit/phpunit": "^4.8.36"
+            },
+            "suggest": {
+                "php-parallel-lint/php-console-highlighter": "For colored console output"
             },
+            "bin": [
+                "var-dump-check"
+            ],
+            "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Prophecy\\PhpUnit\\": "src"
+                    "JakubOnderka\\PhpVarDumpCheck\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "BSD-2-Clause"
             ],
             "authors": [
                 {
-                    "name": "Christophe Coevoet",
-                    "email": "stof@notk.org"
+                    "name": "Jakub Onderka",
+                    "email": "jakub.onderka@gmail.com"
                 }
             ],
-            "description": "Integrating the Prophecy mocking library in PHPUnit test cases",
-            "homepage": "http://phpspec.net",
-            "keywords": [
-                "phpunit",
-                "prophecy"
-            ],
+            "description": "Find forgotten variables dump in PHP source code.",
             "support": {
-                "issues": "https://github.com/phpspec/prophecy-phpunit/issues",
-                "source": "https://github.com/phpspec/prophecy-phpunit/tree/v2.0.1"
+                "issues": "https://github.com/php-parallel-lint/PHP-Var-Dump-Check/issues",
+                "source": "https://github.com/php-parallel-lint/PHP-Var-Dump-Check/tree/master"
             },
-            "time": "2020-07-09T08:33:42+00:00"
+            "time": "2020-08-17T12:12:52+00:00"
         },
         {
             "name": "phpstan/extension-installer",
-            "version": "1.1.0",
+            "version": "1.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/extension-installer.git",
-                "reference": "66c7adc9dfa38b6b5838a9fb728b68a7d8348051"
+                "reference": "85e90b3942d06b2326fba0403ec24fe912372936"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/extension-installer/zipball/66c7adc9dfa38b6b5838a9fb728b68a7d8348051",
-                "reference": "66c7adc9dfa38b6b5838a9fb728b68a7d8348051",
+                "url": "https://api.github.com/repos/phpstan/extension-installer/zipball/85e90b3942d06b2326fba0403ec24fe912372936",
+                "reference": "85e90b3942d06b2326fba0403ec24fe912372936",
                 "shasum": ""
             },
             "require": {
-                "composer-plugin-api": "^1.1 || ^2.0",
-                "php": "^7.1 || ^8.0",
-                "phpstan/phpstan": ">=0.11.6"
+                "composer-plugin-api": "^2.0",
+                "php": "^7.2 || ^8.0",
+                "phpstan/phpstan": "^1.9.0 || ^2.0"
             },
             "require-dev": {
-                "composer/composer": "^1.8",
-                "phing/phing": "^2.16.3",
+                "composer/composer": "^2.0",
                 "php-parallel-lint/php-parallel-lint": "^1.2.0",
-                "phpstan/phpstan-strict-rules": "^0.11 || ^0.12"
+                "phpstan/phpstan-strict-rules": "^0.11 || ^0.12 || ^1.0"
             },
             "type": "composer-plugin",
             "extra": {
@@ -8160,24 +8951,28 @@
                 "MIT"
             ],
             "description": "Composer plugin for automatic installation of PHPStan extensions",
+            "keywords": [
+                "dev",
+                "static analysis"
+            ],
             "support": {
                 "issues": "https://github.com/phpstan/extension-installer/issues",
-                "source": "https://github.com/phpstan/extension-installer/tree/1.1.0"
+                "source": "https://github.com/phpstan/extension-installer/tree/1.4.3"
             },
-            "time": "2020-12-13T13:06:13+00:00"
+            "time": "2024-09-04T20:21:43+00:00"
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.7.1",
+            "version": "1.12.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "e3baed2ee2ef322e0f9b8fe8f87fdbe024c7c719"
+                "reference": "14276fdef70575106a3392a4ed553c06a984df28"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e3baed2ee2ef322e0f9b8fe8f87fdbe024c7c719",
-                "reference": "e3baed2ee2ef322e0f9b8fe8f87fdbe024c7c719",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/14276fdef70575106a3392a4ed553c06a984df28",
+                "reference": "14276fdef70575106a3392a4ed553c06a984df28",
                 "shasum": ""
             },
             "require": {
@@ -8201,9 +8996,16 @@
                 "MIT"
             ],
             "description": "PHPStan - PHP Static Analysis Tool",
+            "keywords": [
+                "dev",
+                "static analysis"
+            ],
             "support": {
+                "docs": "https://phpstan.org/user-guide/getting-started",
+                "forum": "https://github.com/phpstan/phpstan/discussions",
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.7.1"
+                "security": "https://github.com/phpstan/phpstan/security/policy",
+                "source": "https://github.com/phpstan/phpstan-src"
             },
             "funding": [
                 {
@@ -8213,35 +9015,27 @@
                 {
                     "url": "https://github.com/phpstan",
                     "type": "github"
-                },
-                {
-                    "url": "https://www.patreon.com/phpstan",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
-                    "type": "tidelift"
                 }
             ],
-            "time": "2022-05-24T09:05:09+00:00"
+            "time": "2025-03-09T09:24:50+00:00"
         },
         {
             "name": "phpstan/phpstan-doctrine",
-            "version": "1.3.5",
+            "version": "1.5.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan-doctrine.git",
-                "reference": "73979203c9cb56efd2dfcce1c795254f3b55ce39"
+                "reference": "231d3f795ed5ef54c98961fd3958868cbe091207"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/73979203c9cb56efd2dfcce1c795254f3b55ce39",
-                "reference": "73979203c9cb56efd2dfcce1c795254f3b55ce39",
+                "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/231d3f795ed5ef54c98961fd3958868cbe091207",
+                "reference": "231d3f795ed5ef54c98961fd3958868cbe091207",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2 || ^8.0",
-                "phpstan/phpstan": "^1.7.0"
+                "phpstan/phpstan": "^1.12.12"
             },
             "conflict": {
                 "doctrine/collections": "<1.0",
@@ -8251,22 +9045,26 @@
                 "doctrine/persistence": "<1.3"
             },
             "require-dev": {
-                "doctrine/annotations": "^1.11.0",
-                "doctrine/collections": "^1.6",
+                "cache/array-adapter": "^1.1",
+                "composer/semver": "^3.3.2",
+                "cweagans/composer-patches": "^1.7.3",
+                "doctrine/annotations": "^1.11 || ^2.0",
+                "doctrine/collections": "^1.6 || ^2.1",
                 "doctrine/common": "^2.7 || ^3.0",
                 "doctrine/dbal": "^2.13.8 || ^3.3.3",
-                "doctrine/lexer": "^1.2.1",
-                "doctrine/mongodb-odm": "^1.3 || ^2.1",
-                "doctrine/orm": "^2.11.0",
-                "doctrine/persistence": "^1.3.8 || ^2.2.1",
+                "doctrine/lexer": "^2.0 || ^3.0",
+                "doctrine/mongodb-odm": "^1.3 || ^2.4.3",
+                "doctrine/orm": "^2.16.0",
+                "doctrine/persistence": "^2.2.1 || ^3.2",
+                "gedmo/doctrine-extensions": "^3.8",
                 "nesbot/carbon": "^2.49",
                 "nikic/php-parser": "^4.13.2",
                 "php-parallel-lint/php-parallel-lint": "^1.2",
-                "phpstan/phpstan-phpunit": "^1.0",
-                "phpstan/phpstan-strict-rules": "^1.0",
-                "phpunit/phpunit": "^9.5.10",
-                "ramsey/uuid-doctrine": "^1.5.0",
-                "symfony/cache": "^4.4.35"
+                "phpstan/phpstan-phpunit": "^1.3.13",
+                "phpstan/phpstan-strict-rules": "^1.5.1",
+                "phpunit/phpunit": "^9.6.20",
+                "ramsey/uuid": "^4.2",
+                "symfony/cache": "^5.4"
             },
             "type": "phpstan-extension",
             "extra": {
@@ -8289,27 +9087,27 @@
             "description": "Doctrine extensions for PHPStan",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan-doctrine/issues",
-                "source": "https://github.com/phpstan/phpstan-doctrine/tree/1.3.5"
+                "source": "https://github.com/phpstan/phpstan-doctrine/tree/1.5.7"
             },
-            "time": "2022-05-23T13:09:30+00:00"
+            "time": "2024-12-02T16:47:26+00:00"
         },
         {
             "name": "phpstan/phpstan-phpunit",
-            "version": "1.1.1",
+            "version": "1.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan-phpunit.git",
-                "reference": "4a3c437c09075736285d1cabb5c75bf27ed0bc84"
+                "reference": "72a6721c9b64b3e4c9db55abbc38f790b318267e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/4a3c437c09075736285d1cabb5c75bf27ed0bc84",
-                "reference": "4a3c437c09075736285d1cabb5c75bf27ed0bc84",
+                "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/72a6721c9b64b3e4c9db55abbc38f790b318267e",
+                "reference": "72a6721c9b64b3e4c9db55abbc38f790b318267e",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2 || ^8.0",
-                "phpstan/phpstan": "^1.5.0"
+                "phpstan/phpstan": "^1.12"
             },
             "conflict": {
                 "phpunit/phpunit": "<7.0"
@@ -8317,7 +9115,7 @@
             "require-dev": {
                 "nikic/php-parser": "^4.13.0",
                 "php-parallel-lint/php-parallel-lint": "^1.2",
-                "phpstan/phpstan-strict-rules": "^1.0",
+                "phpstan/phpstan-strict-rules": "^1.5.1",
                 "phpunit/phpunit": "^9.5"
             },
             "type": "phpstan-extension",
@@ -8341,28 +9139,28 @@
             "description": "PHPUnit extensions and rules for PHPStan",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan-phpunit/issues",
-                "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.1.1"
+                "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.4.2"
             },
-            "time": "2022-04-20T15:24:25+00:00"
+            "time": "2024-12-17T17:20:49+00:00"
         },
         {
             "name": "phpstan/phpstan-symfony",
-            "version": "1.1.8",
+            "version": "1.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan-symfony.git",
-                "reference": "4bdffcf1033b6c60662a28419d0192e0dda5684f"
+                "reference": "dd1aaa7f85f9916222a2ce7e4d21072fe03958f4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan-symfony/zipball/4bdffcf1033b6c60662a28419d0192e0dda5684f",
-                "reference": "4bdffcf1033b6c60662a28419d0192e0dda5684f",
+                "url": "https://api.github.com/repos/phpstan/phpstan-symfony/zipball/dd1aaa7f85f9916222a2ce7e4d21072fe03958f4",
+                "reference": "dd1aaa7f85f9916222a2ce7e4d21072fe03958f4",
                 "shasum": ""
             },
             "require": {
                 "ext-simplexml": "*",
-                "php": "^7.1 || ^8.0",
-                "phpstan/phpstan": "^1.4"
+                "php": "^7.2 || ^8.0",
+                "phpstan/phpstan": "^1.12"
             },
             "conflict": {
                 "symfony/framework-bundle": "<3.0"
@@ -8370,25 +9168,23 @@
             "require-dev": {
                 "nikic/php-parser": "^4.13.0",
                 "php-parallel-lint/php-parallel-lint": "^1.2",
-                "phpstan/phpstan-phpunit": "^1.0",
-                "phpstan/phpstan-strict-rules": "^1.0",
-                "phpunit/phpunit": "^9.5",
+                "phpstan/phpstan-phpunit": "^1.3.11",
+                "phpstan/phpstan-strict-rules": "^1.5.1",
+                "phpunit/phpunit": "^8.5.29 || ^9.5",
                 "psr/container": "1.0 || 1.1.1",
-                "symfony/config": "^4.2 || ^5.0",
-                "symfony/console": "^4.0 || ^5.0",
-                "symfony/dependency-injection": "^4.0 || ^5.0",
-                "symfony/form": "^4.0 || ^5.0",
-                "symfony/framework-bundle": "^4.4 || ^5.0",
-                "symfony/http-foundation": "^5.1",
-                "symfony/messenger": "^4.2 || ^5.0",
+                "symfony/config": "^5.4 || ^6.1",
+                "symfony/console": "^5.4 || ^6.1",
+                "symfony/dependency-injection": "^5.4 || ^6.1",
+                "symfony/form": "^5.4 || ^6.1",
+                "symfony/framework-bundle": "^5.4 || ^6.1",
+                "symfony/http-foundation": "^5.4 || ^6.1",
+                "symfony/messenger": "^5.4",
                 "symfony/polyfill-php80": "^1.24",
-                "symfony/serializer": "^4.0 || ^5.0"
+                "symfony/serializer": "^5.4",
+                "symfony/service-contracts": "^2.2.0"
             },
             "type": "phpstan-extension",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                },
                 "phpstan": {
                     "includes": [
                         "extension.neon",
@@ -8415,50 +9211,50 @@
             "description": "Symfony Framework extensions and rules for PHPStan",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan-symfony/issues",
-                "source": "https://github.com/phpstan/phpstan-symfony/tree/1.1.8"
+                "source": "https://github.com/phpstan/phpstan-symfony/tree/1.4.13"
             },
-            "time": "2022-03-24T07:56:03+00:00"
+            "time": "2025-01-04T13:55:31+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.15",
+            "version": "9.2.32",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f"
+                "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
-                "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/85402a822d1ecf1db1096959413d35e1c37cf1a5",
+                "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.13.0",
+                "nikic/php-parser": "^4.19.1 || ^5.1.0",
                 "php": ">=7.3",
-                "phpunit/php-file-iterator": "^3.0.3",
-                "phpunit/php-text-template": "^2.0.2",
-                "sebastian/code-unit-reverse-lookup": "^2.0.2",
-                "sebastian/complexity": "^2.0",
-                "sebastian/environment": "^5.1.2",
-                "sebastian/lines-of-code": "^1.0.3",
-                "sebastian/version": "^3.0.1",
-                "theseer/tokenizer": "^1.2.0"
+                "phpunit/php-file-iterator": "^3.0.6",
+                "phpunit/php-text-template": "^2.0.4",
+                "sebastian/code-unit-reverse-lookup": "^2.0.3",
+                "sebastian/complexity": "^2.0.3",
+                "sebastian/environment": "^5.1.5",
+                "sebastian/lines-of-code": "^1.0.4",
+                "sebastian/version": "^3.0.2",
+                "theseer/tokenizer": "^1.2.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^9.6"
             },
             "suggest": {
-                "ext-pcov": "*",
-                "ext-xdebug": "*"
+                "ext-pcov": "PHP extension that provides line coverage",
+                "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "9.2-dev"
+                    "dev-main": "9.2.x-dev"
                 }
             },
             "autoload": {
@@ -8486,7 +9282,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.15"
+                "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.32"
             },
             "funding": [
                 {
@@ -8494,7 +9291,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-03-07T09:28:20+00:00"
+            "time": "2024-08-22T04:23:01+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -8739,55 +9536,50 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.20",
+            "version": "9.6.29",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba"
+                "reference": "9ecfec57835a5581bc888ea7e13b51eb55ab9dd3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/12bc8879fb65aef2138b26fc633cb1e3620cffba",
-                "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9ecfec57835a5581bc888ea7e13b51eb55ab9dd3",
+                "reference": "9ecfec57835a5581bc888ea7e13b51eb55ab9dd3",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.3.1",
+                "doctrine/instantiator": "^1.5.0 || ^2",
                 "ext-dom": "*",
                 "ext-json": "*",
                 "ext-libxml": "*",
                 "ext-mbstring": "*",
                 "ext-xml": "*",
                 "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.10.1",
-                "phar-io/manifest": "^2.0.3",
-                "phar-io/version": "^3.0.2",
+                "myclabs/deep-copy": "^1.13.4",
+                "phar-io/manifest": "^2.0.4",
+                "phar-io/version": "^3.2.1",
                 "php": ">=7.3",
-                "phpspec/prophecy": "^1.12.1",
-                "phpunit/php-code-coverage": "^9.2.13",
-                "phpunit/php-file-iterator": "^3.0.5",
+                "phpunit/php-code-coverage": "^9.2.32",
+                "phpunit/php-file-iterator": "^3.0.6",
                 "phpunit/php-invoker": "^3.1.1",
-                "phpunit/php-text-template": "^2.0.3",
-                "phpunit/php-timer": "^5.0.2",
-                "sebastian/cli-parser": "^1.0.1",
-                "sebastian/code-unit": "^1.0.6",
-                "sebastian/comparator": "^4.0.5",
-                "sebastian/diff": "^4.0.3",
-                "sebastian/environment": "^5.1.3",
-                "sebastian/exporter": "^4.0.3",
-                "sebastian/global-state": "^5.0.1",
-                "sebastian/object-enumerator": "^4.0.3",
-                "sebastian/resource-operations": "^3.0.3",
-                "sebastian/type": "^3.0",
+                "phpunit/php-text-template": "^2.0.4",
+                "phpunit/php-timer": "^5.0.3",
+                "sebastian/cli-parser": "^1.0.2",
+                "sebastian/code-unit": "^1.0.8",
+                "sebastian/comparator": "^4.0.9",
+                "sebastian/diff": "^4.0.6",
+                "sebastian/environment": "^5.1.5",
+                "sebastian/exporter": "^4.0.8",
+                "sebastian/global-state": "^5.0.8",
+                "sebastian/object-enumerator": "^4.0.4",
+                "sebastian/resource-operations": "^3.0.4",
+                "sebastian/type": "^3.2.1",
                 "sebastian/version": "^3.0.2"
             },
-            "require-dev": {
-                "ext-pdo": "*",
-                "phpspec/prophecy-phpunit": "^2.0.1"
-            },
             "suggest": {
-                "ext-soap": "*",
-                "ext-xdebug": "*"
+                "ext-soap": "To be able to generate mocks based on WSDL files",
+                "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
             },
             "bin": [
                 "phpunit"
@@ -8795,7 +9587,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "9.5-dev"
+                    "dev-master": "9.6-dev"
                 }
             },
             "autoload": {
@@ -8826,7 +9618,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.20"
+                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.29"
             },
             "funding": [
                 {
@@ -8836,22 +9629,34 @@
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2022-04-01T12:37:26+00:00"
+            "time": "2025-09-24T06:29:11+00:00"
         },
         {
             "name": "sebastian/cli-parser",
-            "version": "1.0.1",
+            "version": "1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/cli-parser.git",
-                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2"
+                "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2",
-                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2",
+                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/2b56bea83a09de3ac06bb18b92f068e60cc6f50b",
+                "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b",
                 "shasum": ""
             },
             "require": {
@@ -8886,7 +9691,7 @@
             "homepage": "https://github.com/sebastianbergmann/cli-parser",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
-                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1"
+                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.2"
             },
             "funding": [
                 {
@@ -8894,7 +9699,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T06:08:49+00:00"
+            "time": "2024-03-02T06:27:43+00:00"
         },
         {
             "name": "sebastian/code-unit",
@@ -9009,16 +9814,16 @@
         },
         {
             "name": "sebastian/comparator",
-            "version": "4.0.6",
+            "version": "4.0.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "55f4261989e546dc112258c7a75935a81a7ce382"
+                "reference": "67a2df3a62639eab2cc5906065e9805d4fd5dfc5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382",
-                "reference": "55f4261989e546dc112258c7a75935a81a7ce382",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/67a2df3a62639eab2cc5906065e9805d4fd5dfc5",
+                "reference": "67a2df3a62639eab2cc5906065e9805d4fd5dfc5",
                 "shasum": ""
             },
             "require": {
@@ -9071,32 +9876,44 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6"
+                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.9"
             },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/sebastian/comparator",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2020-10-26T15:49:45+00:00"
+            "time": "2025-08-10T06:51:50+00:00"
         },
         {
             "name": "sebastian/complexity",
-            "version": "2.0.2",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/complexity.git",
-                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88"
+                "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88",
-                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a",
+                "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a",
                 "shasum": ""
             },
             "require": {
-                "nikic/php-parser": "^4.7",
+                "nikic/php-parser": "^4.18 || ^5.0",
                 "php": ">=7.3"
             },
             "require-dev": {
@@ -9128,7 +9945,7 @@
             "homepage": "https://github.com/sebastianbergmann/complexity",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/complexity/issues",
-                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2"
+                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3"
             },
             "funding": [
                 {
@@ -9136,20 +9953,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T15:52:27+00:00"
+            "time": "2023-12-22T06:19:30+00:00"
         },
         {
             "name": "sebastian/diff",
-            "version": "4.0.4",
+            "version": "4.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d"
+                "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d",
-                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ba01945089c3a293b01ba9badc29ad55b106b0bc",
+                "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc",
                 "shasum": ""
             },
             "require": {
@@ -9194,7 +10011,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4"
+                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.6"
             },
             "funding": [
                 {
@@ -9202,20 +10019,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:10:38+00:00"
+            "time": "2024-03-02T06:30:58+00:00"
         },
         {
             "name": "sebastian/environment",
-            "version": "5.1.4",
+            "version": "5.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7"
+                "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7",
-                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
+                "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
                 "shasum": ""
             },
             "require": {
@@ -9257,7 +10074,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4"
+                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5"
             },
             "funding": [
                 {
@@ -9265,20 +10082,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-04-03T09:37:03+00:00"
+            "time": "2023-02-03T06:03:51+00:00"
         },
         {
             "name": "sebastian/exporter",
-            "version": "4.0.4",
+            "version": "4.0.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9"
+                "reference": "14c6ba52f95a36c3d27c835d65efc7123c446e8c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9",
-                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/14c6ba52f95a36c3d27c835d65efc7123c446e8c",
+                "reference": "14c6ba52f95a36c3d27c835d65efc7123c446e8c",
                 "shasum": ""
             },
             "require": {
@@ -9334,28 +10151,40 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.4"
+                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.8"
             },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/sebastian/exporter",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2021-11-11T14:18:36+00:00"
+            "time": "2025-09-24T06:03:27+00:00"
         },
         {
             "name": "sebastian/global-state",
-            "version": "5.0.5",
+            "version": "5.0.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2"
+                "reference": "b6781316bdcd28260904e7cc18ec983d0d2ef4f6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2",
-                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/b6781316bdcd28260904e7cc18ec983d0d2ef4f6",
+                "reference": "b6781316bdcd28260904e7cc18ec983d0d2ef4f6",
                 "shasum": ""
             },
             "require": {
@@ -9398,32 +10227,44 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5"
+                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.8"
             },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/sebastian/global-state",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2022-02-14T08:28:10+00:00"
+            "time": "2025-08-10T07:10:35+00:00"
         },
         {
             "name": "sebastian/lines-of-code",
-            "version": "1.0.3",
+            "version": "1.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/lines-of-code.git",
-                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc"
+                "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc",
-                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc",
+                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5",
+                "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5",
                 "shasum": ""
             },
             "require": {
-                "nikic/php-parser": "^4.6",
+                "nikic/php-parser": "^4.18 || ^5.0",
                 "php": ">=7.3"
             },
             "require-dev": {
@@ -9455,7 +10296,7 @@
             "homepage": "https://github.com/sebastianbergmann/lines-of-code",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
-                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3"
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4"
             },
             "funding": [
                 {
@@ -9463,7 +10304,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-28T06:42:11+00:00"
+            "time": "2023-12-22T06:20:34+00:00"
         },
         {
             "name": "sebastian/object-enumerator",
@@ -9579,16 +10420,16 @@
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "4.0.4",
+            "version": "4.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172"
+                "reference": "539c6691e0623af6dc6f9c20384c120f963465a0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172",
-                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/539c6691e0623af6dc6f9c20384c120f963465a0",
+                "reference": "539c6691e0623af6dc6f9c20384c120f963465a0",
                 "shasum": ""
             },
             "require": {
@@ -9627,31 +10468,43 @@
                 }
             ],
             "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "homepage": "https://github.com/sebastianbergmann/recursion-context",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4"
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.6"
             },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/sebastian/recursion-context",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2020-10-26T13:17:30+00:00"
+            "time": "2025-08-10T06:57:39+00:00"
         },
         {
             "name": "sebastian/resource-operations",
-            "version": "3.0.3",
+            "version": "3.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8"
+                "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
-                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
+                "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
                 "shasum": ""
             },
             "require": {
@@ -9663,7 +10516,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-main": "3.0-dev"
                 }
             },
             "autoload": {
@@ -9684,8 +10537,7 @@
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
             "support": {
-                "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
-                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3"
+                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.4"
             },
             "funding": [
                 {
@@ -9693,20 +10545,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T06:45:17+00:00"
+            "time": "2024-03-14T16:00:52+00:00"
         },
         {
             "name": "sebastian/type",
-            "version": "3.0.0",
+            "version": "3.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad"
+                "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
-                "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
+                "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
                 "shasum": ""
             },
             "require": {
@@ -9718,7 +10570,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "3.2-dev"
                 }
             },
             "autoload": {
@@ -9741,7 +10593,7 @@
             "homepage": "https://github.com/sebastianbergmann/type",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/3.0.0"
+                "source": "https://github.com/sebastianbergmann/type/tree/3.2.1"
             },
             "funding": [
                 {
@@ -9749,7 +10601,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-03-15T09:54:48+00:00"
+            "time": "2023-02-03T06:13:03+00:00"
         },
         {
             "name": "sebastian/version",
@@ -9806,23 +10658,23 @@
         },
         {
             "name": "sensiolabs/behat-page-object-extension",
-            "version": "v2.3.4",
+            "version": "v2.3.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sensiolabs/BehatPageObjectExtension.git",
-                "reference": "7a623cc12243e653b70d3d03892544fa4ce8b203"
+                "reference": "1f06d054b61d12333a2d9a9e76473c392ef8bd65"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sensiolabs/BehatPageObjectExtension/zipball/7a623cc12243e653b70d3d03892544fa4ce8b203",
-                "reference": "7a623cc12243e653b70d3d03892544fa4ce8b203",
+                "url": "https://api.github.com/repos/sensiolabs/BehatPageObjectExtension/zipball/1f06d054b61d12333a2d9a9e76473c392ef8bd65",
+                "reference": "1f06d054b61d12333a2d9a9e76473c392ef8bd65",
                 "shasum": ""
             },
             "require": {
                 "behat/behat": "^3.8",
                 "behat/mink": "^1.7",
                 "friends-of-behat/mink-extension": "^2.2",
-                "friendsofphp/proxy-manager-lts": "^1.0.2",
+                "friendsofphp/proxy-manager-lts": "^1.0.12",
                 "php": "^7.2 || ~8.0"
             },
             "conflict": {
@@ -9876,34 +10728,109 @@
             ],
             "support": {
                 "issues": "https://github.com/sensiolabs/BehatPageObjectExtension/issues",
-                "source": "https://github.com/sensiolabs/BehatPageObjectExtension/tree/v2.3.4"
+                "source": "https://github.com/sensiolabs/BehatPageObjectExtension/tree/v2.3.7"
+            },
+            "time": "2023-01-16T12:14:34+00:00"
+        },
+        {
+            "name": "staabm/phpstan-dba",
+            "version": "0.2.81",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/staabm/phpstan-dba.git",
+                "reference": "9b3f8f25efa262f5b5da9b86e20b74002019f5bc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/staabm/phpstan-dba/zipball/9b3f8f25efa262f5b5da9b86e20b74002019f5bc",
+                "reference": "9b3f8f25efa262f5b5da9b86e20b74002019f5bc",
+                "shasum": ""
+            },
+            "require": {
+                "composer-runtime-api": "^2.0",
+                "composer/semver": "^3.2",
+                "php": "^7.2 || ^8.0",
+                "phpstan/phpstan": "^1.9.4"
+            },
+            "conflict": {
+                "sqlftw/sqlftw": "<0.1.10"
+            },
+            "require-dev": {
+                "dibi/dibi": "^4.2",
+                "ext-mysqli": "*",
+                "ext-pdo": "*",
+                "php-parallel-lint/php-parallel-lint": "^1.3",
+                "phpstan/extension-installer": "^1.2",
+                "phpstan/phpstan-deprecation-rules": "^1.1",
+                "phpstan/phpstan-php-parser": "^1.1",
+                "phpstan/phpstan-phpunit": "^1.0",
+                "phpstan/phpstan-strict-rules": "^1.1",
+                "phpunit/phpunit": "^8.5|^9.5",
+                "symplify/easy-coding-standard": "^11.4",
+                "tomasvotruba/unused-public": "^0.3",
+                "vlucas/phpdotenv": "^5.4"
+            },
+            "type": "phpstan-extension",
+            "extra": {
+                "phpstan": {
+                    "includes": [
+                        "config/dba.neon"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "staabm\\PHPStanDba\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "keywords": [
+                "Database Access Layer",
+                "PHPStan",
+                "code quality",
+                "dev",
+                "phpstan-extension",
+                "static analysis"
+            ],
+            "support": {
+                "issues": "https://github.com/staabm/phpstan-dba/issues",
+                "source": "https://github.com/staabm/phpstan-dba/tree/0.2.81"
             },
-            "time": "2022-01-12T14:54:01+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/staabm",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-06-04T12:11:49+00:00"
         },
         {
             "name": "symfony/browser-kit",
-            "version": "v4.4.37",
+            "version": "v5.4.45",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "6e81008cac62369871cb6b8de64576ed138e3998"
+                "reference": "03cce39764429e07fbab9b989a1182a24578341d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/6e81008cac62369871cb6b8de64576ed138e3998",
-                "reference": "6e81008cac62369871cb6b8de64576ed138e3998",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/03cce39764429e07fbab9b989a1182a24578341d",
+                "reference": "03cce39764429e07fbab9b989a1182a24578341d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1.3",
-                "symfony/dom-crawler": "^3.4|^4.0|^5.0",
+                "php": ">=7.2.5",
+                "symfony/dom-crawler": "^4.4|^5.0|^6.0",
                 "symfony/polyfill-php80": "^1.16"
             },
             "require-dev": {
-                "symfony/css-selector": "^3.4|^4.0|^5.0",
-                "symfony/http-client": "^4.3|^5.0",
-                "symfony/mime": "^4.3|^5.0",
-                "symfony/process": "^3.4|^4.0|^5.0"
+                "symfony/css-selector": "^4.4|^5.0|^6.0",
+                "symfony/http-client": "^4.4|^5.0|^6.0",
+                "symfony/mime": "^4.4|^5.0|^6.0",
+                "symfony/process": "^4.4|^5.0|^6.0"
             },
             "suggest": {
                 "symfony/process": ""
@@ -9934,7 +10861,7 @@
             "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/browser-kit/tree/v4.4.37"
+                "source": "https://github.com/symfony/browser-kit/tree/v5.4.45"
             },
             "funding": [
                 {
@@ -9950,20 +10877,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:41:36+00:00"
+            "time": "2024-10-22T13:05:35+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v5.4.3",
+            "version": "v5.4.45",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "b0a190285cd95cb019237851205b8140ef6e368e"
+                "reference": "4f7f3c35fba88146b56d0025d20ace3f3901f097"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/b0a190285cd95cb019237851205b8140ef6e368e",
-                "reference": "b0a190285cd95cb019237851205b8140ef6e368e",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/4f7f3c35fba88146b56d0025d20ace3f3901f097",
+                "reference": "4f7f3c35fba88146b56d0025d20ace3f3901f097",
                 "shasum": ""
             },
             "require": {
@@ -10000,7 +10927,7 @@
             "description": "Converts CSS selectors to XPath expressions",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/css-selector/tree/v5.4.3"
+                "source": "https://github.com/symfony/css-selector/tree/v5.4.45"
             },
             "funding": [
                 {
@@ -10016,24 +10943,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:53:40+00:00"
+            "time": "2024-09-25T14:11:13+00:00"
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v4.4.39",
+            "version": "v5.4.48",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "4e9215a8b533802ba84a3cc5bd3c43103e7a6dc3"
+                "reference": "b57df76f4757a9a8dfbb57ba48d7780cc20776c6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/4e9215a8b533802ba84a3cc5bd3c43103e7a6dc3",
-                "reference": "4e9215a8b533802ba84a3cc5bd3c43103e7a6dc3",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/b57df76f4757a9a8dfbb57ba48d7780cc20776c6",
+                "reference": "b57df76f4757a9a8dfbb57ba48d7780cc20776c6",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1.3",
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1|^3",
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-mbstring": "~1.0",
                 "symfony/polyfill-php80": "^1.16"
@@ -10043,7 +10971,7 @@
             },
             "require-dev": {
                 "masterminds/html5": "^2.6",
-                "symfony/css-selector": "^3.4|^4.0|^5.0"
+                "symfony/css-selector": "^4.4|^5.0|^6.0"
             },
             "suggest": {
                 "symfony/css-selector": ""
@@ -10074,7 +11002,7 @@
             "description": "Eases DOM navigation for HTML and XML documents",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dom-crawler/tree/v4.4.39"
+                "source": "https://github.com/symfony/dom-crawler/tree/v5.4.48"
             },
             "funding": [
                 {
@@ -10090,20 +11018,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-25T10:38:15+00:00"
+            "time": "2024-11-13T14:36:38+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v4.4.41",
+            "version": "v4.4.47",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "dcb67eae126e74507e0b4f0b9ac6ef35b37c3331"
+                "reference": "45036b1d53accc48fe9bab71ccd86d57eba0dd94"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/dcb67eae126e74507e0b4f0b9ac6ef35b37c3331",
-                "reference": "dcb67eae126e74507e0b4f0b9ac6ef35b37c3331",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/45036b1d53accc48fe9bab71ccd86d57eba0dd94",
+                "reference": "45036b1d53accc48fe9bab71ccd86d57eba0dd94",
                 "shasum": ""
             },
             "require": {
@@ -10163,7 +11091,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/translation/tree/v4.4.41"
+                "source": "https://github.com/symfony/translation/tree/v4.4.47"
             },
             "funding": [
                 {
@@ -10179,7 +11107,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-21T07:22:34+00:00"
+            "time": "2022-10-03T15:15:11+00:00"
         },
         {
             "name": "symfony/yaml",
@@ -10258,16 +11186,16 @@
         },
         {
             "name": "theseer/tokenizer",
-            "version": "1.2.1",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e"
+                "reference": "d74205c497bfbca49f34d4bc4c19c17e22db4ebb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e",
-                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/d74205c497bfbca49f34d4bc4c19c17e22db4ebb",
+                "reference": "d74205c497bfbca49f34d4bc4c19c17e22db4ebb",
                 "shasum": ""
             },
             "require": {
@@ -10296,7 +11224,7 @@
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
             "support": {
                 "issues": "https://github.com/theseer/tokenizer/issues",
-                "source": "https://github.com/theseer/tokenizer/tree/1.2.1"
+                "source": "https://github.com/theseer/tokenizer/tree/1.3.0"
             },
             "funding": [
                 {
@@ -10304,78 +11232,21 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-07-28T10:34:58+00:00"
-        },
-        {
-            "name": "webmozart/assert",
-            "version": "1.10.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webmozarts/assert.git",
-                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25",
-                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2 || ^8.0",
-                "symfony/polyfill-ctype": "^1.8"
-            },
-            "conflict": {
-                "phpstan/phpstan": "<0.12.20",
-                "vimeo/psalm": "<4.6.1 || 4.6.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^8.5.13"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.10-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Webmozart\\Assert\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
-                }
-            ],
-            "description": "Assertions to validate method input/output with nice error messages.",
-            "keywords": [
-                "assert",
-                "check",
-                "validate"
-            ],
-            "support": {
-                "issues": "https://github.com/webmozarts/assert/issues",
-                "source": "https://github.com/webmozarts/assert/tree/1.10.0"
-            },
-            "time": "2021-03-09T10:59:23+00:00"
+            "time": "2025-11-13T13:44:09+00:00"
         }
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "~7.4.0 || ~8.0.0 || ~8.1.0",
+        "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
         "ext-ctype": "*",
         "ext-curl": "*",
         "ext-date": "*",
         "ext-dom": "*",
+        "ext-filter": "*",
         "ext-gd": "*",
         "ext-hash": "*",
         "ext-iconv": "*",
@@ -10390,8 +11261,9 @@
         "ext-xml": "*",
         "ext-zip": "*",
         "ext-zlib": "*",
-        "lib-libxml": "*"
+        "lib-libxml": "*",
+        "composer-runtime-api": "^2.0"
     },
-    "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "platform-dev": {},
+    "plugin-api-version": "2.9.0"
 }
diff --git a/devenv.lock b/devenv.lock
new file mode 100644
index 00000000000..e53b88b9225
--- /dev/null
+++ b/devenv.lock
@@ -0,0 +1,244 @@
+{
+  "nodes": {
+    "devenv": {
+      "locked": {
+        "dir": "src/modules",
+        "lastModified": 1712042502,
+        "owner": "cachix",
+        "repo": "devenv",
+        "rev": "9a00a3d196d4f298bc56941b60dbb1adad382c1e",
+        "treeHash": "672ba3bc870a88570b52d08c85d87b7398b8254b",
+        "type": "github"
+      },
+      "original": {
+        "dir": "src/modules",
+        "owner": "cachix",
+        "repo": "devenv",
+        "type": "github"
+      }
+    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "treeHash": "2addb7b71a20a25ea74feeaf5c2f6a6b30898ecb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "treeHash": "2addb7b71a20a25ea74feeaf5c2f6a6b30898ecb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "treeHash": "bd263f021e345cb4a39d80c126ab650bebc3c10c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "pre-commit-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "treeHash": "ca14199cabdfe1a06a7b1654c76ed49100a689f9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1711715736,
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "807c549feabce7eddbf259dbdcec9e0600a0660d",
+        "treeHash": "682dc19175b69e6aa827cad28db6e11fb51a8252",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1711668574,
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659",
+        "treeHash": "51ec3259d600ba0dbef93d23999da1141e943713",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-23.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nur": {
+      "locked": {
+        "lastModified": 1712051077,
+        "owner": "nix-community",
+        "repo": "NUR",
+        "rev": "a4291b2fa3c6d7edbc07f7e49dcf207173c754c0",
+        "treeHash": "e50b2575e8d073442bf602a243a46bd245aea619",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "NUR",
+        "type": "github"
+      }
+    },
+    "phps": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "utils": "utils"
+      },
+      "locked": {
+        "lastModified": 1711866475,
+        "owner": "fossar",
+        "repo": "nix-phps",
+        "rev": "0a2ef0bf581581ea2305de4d533f966fd6d90b18",
+        "treeHash": "1e4af6cb04ccb6df27094ea3e5ee438a57bb4ea1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "fossar",
+        "repo": "nix-phps",
+        "type": "github"
+      }
+    },
+    "pre-commit-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "flake-utils": "flake-utils",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": "nixpkgs-stable"
+      },
+      "locked": {
+        "lastModified": 1712033542,
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "rev": "642dce09c85b1478b509416f83e72bd59b6b3ac2",
+        "treeHash": "c6cb717934b3ae8ddce4ad9ca8052bd8ed6880f3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "devenv": "devenv",
+        "nixpkgs": "nixpkgs",
+        "nur": "nur",
+        "phps": "phps",
+        "pre-commit-hooks": "pre-commit-hooks"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "treeHash": "cce81f2a0f0743b2eb61bc2eb6c7adbe2f2c6beb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "treeHash": "cce81f2a0f0743b2eb61bc2eb6c7adbe2f2c6beb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "treeHash": "bd263f021e345cb4a39d80c126ab650bebc3c10c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/devenv.nix b/devenv.nix
new file mode 100644
index 00000000000..cf0748bc0ff
--- /dev/null
+++ b/devenv.nix
@@ -0,0 +1,143 @@
+{ pkgs, lib, inputs, config, ... }:
+let
+  # Use an older nixpkgs-version, containing Node 18.
+  oldPkgs = import (fetchTarball {
+    url = "https://github.com/NixOS/nixpkgs/archive/nixos-23.11.tar.gz";
+    sha256 = "1f5d2g1p6nfwycpmrnnmc2xmcszp804adp16knjvdkj8nz36y1fg";
+  }) {
+  system = pkgs.system;
+  };
+in
+{
+  languages.javascript.enable = true;
+  languages.javascript.package = lib.mkDefault oldPkgs.nodejs-18_x;
+
+    languages.php = {
+        enable = lib.mkDefault true;
+        version = lib.mkDefault "8.1";
+        extensions = [ "redis" "pcov" ];
+
+        ini = ''
+          memory_limit = 2G
+          realpath_cache_ttl = 3600
+          session.gc_probability = 0
+          ${lib.optionalString config.services.redis.enable ''
+          session.save_handler = redis
+          session.save_path = "tcp://127.0.0.1:6379/0"
+          ''}
+          display_errors = On
+          error_reporting = E_ALL
+          assert.active = 0
+          opcache.memory_consumption = 256M
+          opcache.interned_strings_buffer = 20
+          zend.assertions = 0
+          short_open_tag = 0
+          zend.detect_unicode = 0
+          realpath_cache_ttl = 3600
+        '';
+
+        fpm.pools.web = lib.mkDefault {
+          settings = {
+            "clear_env" = "no";
+            "pm" = "dynamic";
+            "pm.max_children" = 10;
+            "pm.start_servers" = 2;
+            "pm.min_spare_servers" = 1;
+            "pm.max_spare_servers" = 10;
+          };
+        };
+  };
+
+  services.caddy.enable = lib.mkDefault true;
+
+  services.caddy.virtualHosts."http://localhost:8000" = {
+    extraConfig = ''
+      root * .
+
+      handle /recovery/* {
+        php_fastcgi unix/${config.languages.php.fpm.pools.web.socket} {
+          index {path}/index.php
+        }
+      }
+
+      php_fastcgi unix/${config.languages.php.fpm.pools.web.socket} {
+        index shopware.php
+      }
+      file_server
+    '';
+  };
+
+  services.mysql = {
+    enable = true;
+    initialDatabases = lib.mkDefault [
+        { name = "shopware"; }
+    ];
+    ensureUsers = lib.mkDefault [
+      {
+        name = "shopware";
+        password = "shopware";
+        ensurePermissions = {
+          "shopware.*" = "ALL PRIVILEGES";
+        };
+      }
+    ];
+    settings = {
+      mysqld = {
+        log_bin_trust_function_creators = 1;
+      };
+    };
+  };
+
+  services.redis.enable = lib.mkDefault true;
+  services.adminer.enable = lib.mkDefault true;
+  services.adminer.listen = lib.mkDefault "127.0.0.1:9080";
+  services.mailpit.enable = lib.mkDefault true;
+
+  env.SW_HOST = lib.mkDefault "localhost:8000";
+  env.DB_USER = lib.mkDefault "shopware";
+  env.DB_PASSWORD = lib.mkDefault "shopware";
+  env.DB_NAME = lib.mkDefault "shopware";
+  env.DB_HOST = lib.mkDefault "localhost";
+  env.DB_PORT = lib.mkDefault "3306";
+  env.MAILER_DSN = lib.mkDefault "smtp://localhost:1025";
+  env.SW_BASE_PATH = lib.mkDefault "";
+  env.SELENIUM_HOST = lib.mkDefault "localhost";
+  env.SMTP_HOST = lib.mkDefault "localhost";
+
+  scripts.init-shopware.exec= ''
+    make init
+  '';
+
+  scripts.check-code.exec= ''
+    make check-code
+  '';
+
+  scripts.check-js-code.exec= ''
+      make check-js-code
+  '';
+
+  scripts.test-jest.exec= ''
+      make test-jest
+  '';
+
+  scripts.test-phpunit.exec= ''
+      make test-phpunit
+  '';
+
+  scripts.info-setup.exec= ''
+      php -v
+      mysql -V
+  '';
+
+  scripts.test-phpunit-coverage-statistic.exec= ''
+    make test-phpunit-coverage-statistic
+  '';
+
+  scripts.test-phpunit-elasticsearch.exec= ''
+    make test-phpunit-elasticsearch
+  '';
+
+  scripts.prepare-mink.exec= ''
+    make prepare-mink
+  '';
+}
diff --git a/devenv.yaml b/devenv.yaml
new file mode 100644
index 00000000000..bb6e2ef0cd5
--- /dev/null
+++ b/devenv.yaml
@@ -0,0 +1,13 @@
+allowUnfree: true
+inputs:
+    nixpkgs:
+        url: github:NixOS/nixpkgs/nixpkgs-unstable
+    nur:
+        url: github:nix-community/NUR
+    phps:
+        url: github:fossar/nix-phps
+        inputs:
+            nixpkgs:
+                follows: nixpkgs
+permittedInsecurePackages:
+    - openssl-1.1.1u
diff --git a/engine/Library/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php b/engine/Library/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php
index 5379b69d804..e2b6484064f 100644
--- a/engine/Library/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php
+++ b/engine/Library/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php
@@ -87,6 +87,8 @@
  *
  * Subclasses can be created to provide custom persisting and querying strategies,
  * i.e. spanning multiple tables.
+ *
+ * @psalm-import-type AssociationMapping from ClassMetadata
  */
 class BasicEntityPersister implements EntityPersister
 {
@@ -217,7 +219,7 @@ public function __construct(EntityManagerInterface $em, ClassMetadata $class)
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function getClassMetadata()
     {
@@ -225,7 +227,7 @@ public function getClassMetadata()
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function getResultSetMapping()
     {
@@ -233,7 +235,7 @@ public function getResultSetMapping()
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function addInsert($entity)
     {
@@ -241,7 +243,7 @@ public function addInsert($entity)
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function getInserts()
     {
@@ -249,7 +251,7 @@ public function getInserts()
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function executeInserts()
     {
@@ -386,7 +388,7 @@ private function extractIdentifierTypes(array $id, ClassMetadata $versionedClass
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function update($entity)
     {
@@ -487,14 +489,15 @@ final protected function updateTable(
             $targetType    = PersisterHelper::getTypeOfField($targetMapping->identifier[0], $targetMapping, $this->em);
 
             if ($targetType === []) {
-                throw UnrecognizedField::byName($targetMapping->identifier[0]);
+                throw UnrecognizedField::byFullyQualifiedName($this->class->name, $targetMapping->identifier[0]);
             }
 
             $types[] = reset($targetType);
         }
 
         if ($versioned) {
-            $versionField     = $this->class->versionField;
+            $versionField = $this->class->versionField;
+            assert($versionField !== null);
             $versionFieldType = $this->class->fieldMappings[$versionField]['type'];
             $versionColumn    = $this->quoteStrategy->getColumnName($versionField, $this->class, $this->platform);
 
@@ -535,7 +538,7 @@ final protected function updateTable(
     protected function deleteJoinTableRecords(array $identifier, array $types): void
     {
         foreach ($this->class->associationMappings as $mapping) {
-            if ($mapping['type'] !== ClassMetadata::MANY_TO_MANY) {
+            if ($mapping['type'] !== ClassMetadata::MANY_TO_MANY || isset($mapping['isOnDeleteCascade'])) {
                 continue;
             }
 
@@ -571,10 +574,6 @@ protected function deleteJoinTableRecords(array $identifier, array $types): void
                 $otherKeys[] = $this->quoteStrategy->getJoinColumnName($joinColumn, $class, $this->platform);
             }
 
-            if (isset($mapping['isOnDeleteCascade'])) {
-                continue;
-            }
-
             $joinTableName = $this->quoteStrategy->getJoinTableName($association, $this->class, $this->platform);
 
             $this->conn->delete($joinTableName, array_combine($keys, $identifier), $types);
@@ -586,7 +585,7 @@ protected function deleteJoinTableRecords(array $identifier, array $types): void
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function delete($entity)
     {
@@ -776,7 +775,7 @@ protected function prepareInsertData($entity)
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function getOwningTable($fieldName)
     {
@@ -784,7 +783,7 @@ public function getOwningTable($fieldName)
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function load(array $criteria, $entity = null, $assoc = null, array $hints = [], $lockMode = null, $limit = null, ?array $orderBy = null)
     {
@@ -806,7 +805,7 @@ public function load(array $criteria, $entity = null, $assoc = null, array $hint
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function loadById(array $identifier, $entity = null)
     {
@@ -814,7 +813,7 @@ public function loadById(array $identifier, $entity = null)
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function loadOneToOneEntity(array $assoc, $sourceEntity, array $identifier = [])
     {
@@ -874,7 +873,7 @@ public function loadOneToOneEntity(array $assoc, $sourceEntity, array $identifie
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function refresh(array $id, $entity, $lockMode = null)
     {
@@ -901,7 +900,7 @@ public function count($criteria = [])
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function loadCriteria(Criteria $criteria)
     {
@@ -919,7 +918,7 @@ public function loadCriteria(Criteria $criteria)
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function expandCriteriaParameters(Criteria $criteria)
     {
@@ -935,22 +934,24 @@ public function expandCriteriaParameters(Criteria $criteria)
 
         $valueVisitor->dispatch($expression);
 
-        [$params, $types] = $valueVisitor->getParamsAndTypes();
-
-        foreach ($params as $param) {
-            $sqlParams = array_merge($sqlParams, $this->getValues($param));
-        }
+        [, $types] = $valueVisitor->getParamsAndTypes();
 
         foreach ($types as $type) {
-            [$field, $value] = $type;
-            $sqlTypes        = array_merge($sqlTypes, $this->getTypes($field, $value, $this->class));
+            [$field, $value, $operator] = $type;
+
+            if ($value === null && ($operator === Comparison::EQ || $operator === Comparison::NEQ)) {
+                continue;
+            }
+
+            $sqlParams = array_merge($sqlParams, $this->getValues($value));
+            $sqlTypes  = array_merge($sqlTypes, $this->getTypes($field, $value, $this->class));
         }
 
         return [$sqlParams, $sqlTypes];
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function loadAll(array $criteria = [], ?array $orderBy = null, $limit = null, $offset = null)
     {
@@ -966,7 +967,7 @@ public function loadAll(array $criteria = [], ?array $orderBy = null, $limit = n
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function getManyToManyCollection(array $assoc, $sourceEntity, $offset = null, $limit = null)
     {
@@ -1024,7 +1025,7 @@ private function loadCollectionFromStatement(
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function loadManyToManyCollection(array $assoc, $sourceEntity, PersistentCollection $collection)
     {
@@ -1110,7 +1111,7 @@ private function getManyToManyStatement(
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function getSelectSQL($criteria, $assoc = null, $lockMode = null, $limit = null, $offset = null, ?array $orderBy = null)
     {
@@ -1244,7 +1245,7 @@ final protected function getOrderBySQL(array $orderBy, string $baseTableAlias):
                 continue;
             }
 
-            throw UnrecognizedField::byName($fieldName);
+            throw UnrecognizedField::byFullyQualifiedName($this->class->name, $fieldName);
         }
 
         return ' ORDER BY ' . implode(', ', $orderByList);
@@ -1377,9 +1378,9 @@ protected function getSelectColumnsSQL()
     /**
      * Gets the SQL join fragment used when selecting entities from an association.
      *
-     * @param string  $field
-     * @param mixed[] $assoc
-     * @param string  $alias
+     * @param string             $field
+     * @param AssociationMapping $assoc
+     * @param string             $alias
      *
      * @return string
      */
@@ -1411,7 +1412,7 @@ protected function getSelectColumnAssociationSQL($field, $assoc, ClassMetadata $
      * Gets the SQL join fragment used when selecting entities from a
      * many-to-many association.
      *
-     * @psalm-param array<string, mixed> $manyToMany
+     * @psalm-param AssociationMapping $manyToMany
      *
      * @return string
      */
@@ -1441,7 +1442,7 @@ protected function getSelectManyToManyJoinSQL(array $manyToMany)
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function getInsertSQL()
     {
@@ -1551,6 +1552,9 @@ protected function getSelectColumnSQL($field, ClassMetadata $class, $alias = 'r'
         $columnAlias  = $this->getSQLColumnAlias($fieldMapping['columnName']);
 
         $this->currentPersisterContext->rsm->addFieldResult($alias, $columnAlias, $field);
+        if (! empty($fieldMapping['enumType'])) {
+            $this->currentPersisterContext->rsm->addEnumResult($columnAlias, $fieldMapping['enumType']);
+        }
 
         if (isset($fieldMapping['requireSQLConversion'])) {
             $type = Type::getType($fieldMapping['type']);
@@ -1588,7 +1592,7 @@ protected function getSQLTableAlias($className, $assocName = '')
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function lock(array $criteria, $lockMode)
     {
@@ -1665,7 +1669,7 @@ protected function getSelectConditionCriteriaSQL(Criteria $criteria)
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function getSelectConditionStatementSQL($field, $value, $assoc = null, $comparison = null)
     {
@@ -1736,7 +1740,7 @@ public function getSelectConditionStatementSQL($field, $value, $assoc = null, $c
     /**
      * Builds the left-hand-side of a where condition statement.
      *
-     * @psalm-param array<string, mixed>|null $assoc
+     * @psalm-param AssociationMapping|null $assoc
      *
      * @return string[]
      * @psalm-return list<string>
@@ -1799,7 +1803,7 @@ private function getSelectConditionStatementColumnSQL(
             return [$field];
         }
 
-        throw UnrecognizedField::byName($field);
+        throw UnrecognizedField::byFullyQualifiedName($this->class->name, $field);
     }
 
     /**
@@ -1809,7 +1813,7 @@ private function getSelectConditionStatementColumnSQL(
      * Subclasses are supposed to override this method if they intend to change
      * or alter the criteria by which entities are selected.
      *
-     * @param mixed[]|null $assoc
+     * @param AssociationMapping|null $assoc
      * @psalm-param array<string, mixed> $criteria
      * @psalm-param array<string, mixed>|null $assoc
      *
@@ -1827,7 +1831,7 @@ protected function getSelectConditionSQL(array $criteria, $assoc = null)
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function getOneToManyCollection(array $assoc, $sourceEntity, $offset = null, $limit = null)
     {
@@ -1839,7 +1843,7 @@ public function getOneToManyCollection(array $assoc, $sourceEntity, $offset = nu
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function loadOneToManyCollection(array $assoc, $sourceEntity, PersistentCollection $collection)
     {
@@ -1852,7 +1856,7 @@ public function loadOneToManyCollection(array $assoc, $sourceEntity, PersistentC
      * Builds criteria and execute SQL statement to fetch the one to many entities from.
      *
      * @param object $sourceEntity
-     * @psalm-param array<string, mixed> $assoc
+     * @psalm-param AssociationMapping $assoc
      */
     private function getOneToManyStatement(
         array $assoc,
@@ -1906,7 +1910,7 @@ private function getOneToManyStatement(
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function expandParameters($criteria)
     {
@@ -2069,7 +2073,7 @@ private function getIndividualValue($value): array
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function exists($entity, ?Criteria $extraConditions = null)
     {
diff --git a/engine/Library/Enlight/.php-cs-fixer.php b/engine/Library/Enlight/.php-cs-fixer.php
index bb5c5f96e64..e6c560fc12e 100644
--- a/engine/Library/Enlight/.php-cs-fixer.php
+++ b/engine/Library/Enlight/.php-cs-fixer.php
@@ -18,6 +18,7 @@
  */
 
 use PhpCsFixer\Config;
+use PhpCsFixer\Runner\Parallel\ParallelConfigFactory;
 use PhpCsFixerCustomFixers\Fixer\NoSuperfluousConcatenationFixer;
 use PhpCsFixerCustomFixers\Fixer\NoUselessCommentFixer;
 use PhpCsFixerCustomFixers\Fixer\NoUselessDirnameCallFixer;
@@ -56,6 +57,7 @@
     ->registerCustomFixers(new Fixers())
     ->setRiskyAllowed(true)
     ->setCacheFile('var/cache/php-cs-fixer-enlight')
+    ->setParallelConfig(ParallelConfigFactory::detect())
     ->setRules([
         '@PSR12' => true,
         '@Symfony' => true,
@@ -72,6 +74,7 @@
         'no_useless_else' => true,
         'no_useless_return' => true,
         'no_superfluous_phpdoc_tags' => true,
+        'nullable_type_declaration_for_default_null_value' => true,
         'operator_linebreak' => ['only_booleans' => true],
         'ordered_class_elements' => true,
         'phpdoc_line_span' => true,
diff --git a/engine/Library/Enlight/Class.php b/engine/Library/Enlight/Class.php
index b96f1f7e565..75b92b31225 100644
--- a/engine/Library/Enlight/Class.php
+++ b/engine/Library/Enlight/Class.php
@@ -33,7 +33,7 @@ abstract class Enlight_Class
     /**
      * Contains all initialized Enlight instances.
      *
-     * @var array
+     * @var array<class-string<Enlight_Class|object>, Enlight_Class|object>
      */
     protected static $instances = [];
 
@@ -43,7 +43,7 @@ abstract class Enlight_Class
      * If an hook proxy exist for the class, the constructor will prevent the initialization and throw an exception
      * that the instance method should be used.
      *
-     * @throws \Enlight_Exception
+     * @throws Enlight_Exception
      */
     public function __construct()
     {
@@ -59,7 +59,8 @@ public function __construct()
         }
         if ($this instanceof Enlight_Hook
           && !$this instanceof Enlight_Hook_Proxy
-          && Shopware()->Hooks()->hasProxy($class)) {
+          && Shopware()->Hooks()->hasProxy($class)
+        ) {
             throw new Enlight_Exception(
                 'Class "' . \get_class($this) . '" has hooks, please use the instance method'
             );
@@ -79,7 +80,7 @@ public function __construct()
      * @param string $name
      * @param array  $args
      *
-     * @throws \Enlight_Exception
+     * @throws Enlight_Exception
      */
     public function __call($name, $args = null)
     {
@@ -95,7 +96,7 @@ public function __call($name, $args = null)
      * @param string $name
      * @param array  $args
      *
-     * @throws \Enlight_Exception
+     * @throws Enlight_Exception
      */
     public static function __callStatic($name, $args = null)
     {
@@ -110,7 +111,7 @@ public static function __callStatic($name, $args = null)
      *
      * @param string $name
      *
-     * @throws \Enlight_Exception
+     * @throws Enlight_Exception
      */
     public function __get($name)
     {
@@ -122,7 +123,7 @@ public function __get($name)
      *
      * @param string $name
      *
-     * @throws \Enlight_Exception
+     * @throws Enlight_Exception
      */
     public function __set($name, $value = null)
     {
@@ -133,7 +134,7 @@ public function __set($name, $value = null)
      * Returns the class name of the given class. If no class is given, the class will drawn by
      * get_called_class(). If the given class has an hook proxy the function will return the proxy class.
      *
-     * @throws \Enlight_Exception
+     * @throws Enlight_Exception
      *
      * @return class-string
      */
@@ -146,7 +147,7 @@ public static function getClassName($class = null)
         if (\is_object($class)) {
             $class = \get_class($class);
         } elseif (!class_exists($class)) {
-            throw new Enlight_Exception(sprintf('Class "%s" does not exist and could not be loaded', $class));
+            throw new Enlight_Exception(\sprintf('Class "%s" does not exist and could not be loaded', $class));
         }
 
         $classImplements = class_implements($class);
@@ -161,12 +162,14 @@ public static function getClassName($class = null)
      * Returns a class instance. If the class is already initialed the existing instance will returned.
      * Otherwise the class will be initialed with the given arguments.
      *
-     * @param class-string $class
-     * @param array        $args
+     * @template TClass of (Enlight_Class|object)
      *
-     * @throws \ReflectionException
+     * @param class-string<TClass>|null $class
+     * @param array<mixed>|null         $args
      *
-     * @return Enlight_Class
+     * @throws ReflectionException
+     *
+     * @return TClass
      */
     public static function Instance($class = null, $args = null)
     {
diff --git a/engine/Library/Enlight/Collection/ArrayCollection.php b/engine/Library/Enlight/Collection/ArrayCollection.php
index 9e6b97bb57d..85a60fca4c9 100644
--- a/engine/Library/Enlight/Collection/ArrayCollection.php
+++ b/engine/Library/Enlight/Collection/ArrayCollection.php
@@ -125,7 +125,7 @@ public function __call($name, $args = null)
      *
      * @deprecated - Native return type will be added with Shopware 5.8
      */
-    #[\ReturnTypeWillChange]
+    #[ReturnTypeWillChange]
     public function count()
     {
         return \count($this->_elements);
@@ -192,7 +192,7 @@ public function remove($key)
      *
      * @deprecated - Native return and parameter type will be added with Shopware 5.8
      */
-    #[\ReturnTypeWillChange]
+    #[ReturnTypeWillChange]
     public function offsetExists($key)
     {
         return $this->containsKey($key);
@@ -207,7 +207,7 @@ public function offsetExists($key)
      *
      * @deprecated - Native return and parameter type will be added with Shopware 5.8
      */
-    #[\ReturnTypeWillChange]
+    #[ReturnTypeWillChange]
     public function offsetUnset($key)
     {
         $this->remove($key);
@@ -222,7 +222,7 @@ public function offsetUnset($key)
      *
      * @deprecated - Native return and parameter type will be added with Shopware 5.8
      */
-    #[\ReturnTypeWillChange]
+    #[ReturnTypeWillChange]
     public function offsetGet($key)
     {
         return $this->get($key);
@@ -238,7 +238,7 @@ public function offsetGet($key)
      *
      * @deprecated - Native return and parameter type will be added with Shopware 5.8
      */
-    #[\ReturnTypeWillChange]
+    #[ReturnTypeWillChange]
     public function offsetSet($key, $value)
     {
         $this->set($key, $value);
@@ -251,7 +251,7 @@ public function offsetSet($key, $value)
      *
      * @deprecated - Native return type will be added with Shopware 5.8
      */
-    #[\ReturnTypeWillChange]
+    #[ReturnTypeWillChange]
     public function getIterator()
     {
         $ref = &$this->_elements;
diff --git a/engine/Library/Enlight/Components/Auth.php b/engine/Library/Enlight/Components/Auth.php
index 6294e03c2fa..9ca13d4dd9b 100644
--- a/engine/Library/Enlight/Components/Auth.php
+++ b/engine/Library/Enlight/Components/Auth.php
@@ -63,7 +63,7 @@ public function setAdapter(Zend_Auth_Adapter_Interface $adapter)
      *
      * @return Zend_Auth_Result
      */
-    public function authenticate(Zend_Auth_Adapter_Interface $adapter = null)
+    public function authenticate(?Zend_Auth_Adapter_Interface $adapter = null)
     {
         if ($adapter == null) {
             $adapter = $this->_adapter;
@@ -72,7 +72,9 @@ public function authenticate(Zend_Auth_Adapter_Interface $adapter = null)
 
         if ($result->isValid() && method_exists($adapter, 'getResultRowObject')) {
             $user = $adapter->getResultRowObject();
-            $this->getStorage()->write($user);
+            if (\is_object($user)) {
+                $this->getStorage()->write($user);
+            }
         } else {
             $this->getStorage()->clear();
         }
@@ -85,7 +87,7 @@ public function authenticate(Zend_Auth_Adapter_Interface $adapter = null)
      *
      * @return Zend_Auth_Result
      */
-    public function refresh(Zend_Auth_Adapter_Interface $adapter = null)
+    public function refresh(?Zend_Auth_Adapter_Interface $adapter = null)
     {
         if ($adapter == null) {
             $adapter = $this->_adapter;
diff --git a/engine/Library/Enlight/Components/Auth/Adapter/DbTable.php b/engine/Library/Enlight/Components/Auth/Adapter/DbTable.php
index 1265f3e8806..f4ff03c6bfa 100644
--- a/engine/Library/Enlight/Components/Auth/Adapter/DbTable.php
+++ b/engine/Library/Enlight/Components/Auth/Adapter/DbTable.php
@@ -42,7 +42,7 @@ class Enlight_Components_Auth_Adapter_DbTable extends Zend_Auth_Adapter_DbTable
      *
      * @var string
      */
-    protected $lockedUntilColumn = null;
+    protected $lockedUntilColumn;
 
     /**
      * Date until a account has been disabled caused by a brute force attack
diff --git a/engine/Library/Enlight/Components/Cron/Adapter.php b/engine/Library/Enlight/Components/Cron/Adapter.php
index a7af2fea858..3a984c5d135 100644
--- a/engine/Library/Enlight/Components/Cron/Adapter.php
+++ b/engine/Library/Enlight/Components/Cron/Adapter.php
@@ -33,16 +33,19 @@ interface Enlight_Components_Cron_Adapter
     /**
      * Updates a cron job in the cron tab
      *
-     * @return Enlight_Components_Cron_Manager
+     * @return void
      */
     public function updateJob(Enlight_Components_Cron_Job $job);
 
+    /**
+     * @return bool
+     */
     public function startJob(Enlight_Components_Cron_Job $job);
 
     /**
      * Returns an array of Enlight_Components_Cron_Job from the crontab
      *
-     * @return Enlight_Components_Cron_Job[]
+     * @return array<int, Enlight_Components_Cron_Job>
      */
     public function getAllJobs();
 
diff --git a/engine/Library/Enlight/Components/Cron/Adapter/DBAL.php b/engine/Library/Enlight/Components/Cron/Adapter/DBAL.php
index d8a96ed0f43..70ea1d77828 100644
--- a/engine/Library/Enlight/Components/Cron/Adapter/DBAL.php
+++ b/engine/Library/Enlight/Components/Cron/Adapter/DBAL.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Enlight
  *
@@ -34,25 +36,19 @@ class Enlight_Components_Cron_Adapter_DBAL implements Enlight_Components_Cron_Ad
      */
     protected $tableName = 's_crontab';
 
-    /**
-     * @var Connection
-     */
-    private $connection;
+    private Connection $connection;
 
     /**
-     * @var Enlight_Components_Cron_Job[]|null
+     * @var array<int, Enlight_Components_Cron_Job>|null
      */
-    private $allJobsList;
+    private ?array $allJobsList = null;
 
     /**
-     * @var Enlight_Components_Cron_Job[]|null
+     * @var array<int, Enlight_Components_Cron_Job>|null
      */
-    private $overdueJobsList;
+    private ?array $overdueJobsList = null;
 
-    /**
-     * @param Connection $connection
-     */
-    public function __construct(Doctrine\DBAL\Connection $connection)
+    public function __construct(Connection $connection)
     {
         $this->connection = $connection;
     }
@@ -109,17 +105,12 @@ public function getAllJobs()
         $qb->select('*')
             ->from($this->tableName, 'c');
 
-        $ignoreActive = true;
-        if (!$ignoreActive) {
-            $qb->andWhere('c.active = true');
-        }
-
-        $rows = $qb->execute()->fetchAll();
+        $rows = $qb->execute()->fetchAllAssociative();
 
         $jobs = [];
         foreach ($rows as $row) {
             $row['data'] = unserialize($row['data'], ['allowed_classes' => false]);
-            $jobs[$row['id']] = new Enlight_Components_Cron_Job($row);
+            $jobs[(int) $row['id']] = new Enlight_Components_Cron_Job($row);
         }
 
         return $jobs;
@@ -143,7 +134,7 @@ public function getNextJob($force = false)
         }
 
         while (($nextJob = array_pop($this->overdueJobsList)) !== null) {
-            if ($this->isJobStillOverdue($nextJob->getId())) {
+            if ($this->isJobStillOverdue((int) $nextJob->getId())) {
                 return $nextJob;
             }
         }
@@ -197,12 +188,9 @@ public function deleteJob(Enlight_Components_Cron_Job $job)
     /**
      * Internal helper method to grep data based on a given column name.
      *
-     * @param string $column
-     * @param string $value
-     *
-     * @return Enlight_Components_Cron_Job|null
+     * @param string|int $value
      */
-    private function getJobByColumn($column, $value)
+    private function getJobByColumn(string $column, $value): ?Enlight_Components_Cron_Job
     {
         $qb = $this->connection->createQueryBuilder();
 
@@ -225,9 +213,9 @@ private function getJobByColumn($column, $value)
     }
 
     /**
-     * @return Enlight_Components_Cron_Job[]
+     * @return array<int, Enlight_Components_Cron_Job>
      */
-    private function getOverdueJobs()
+    private function getOverdueJobs(): array
     {
         $qb = $this->connection->createQueryBuilder();
 
@@ -244,16 +232,13 @@ private function getOverdueJobs()
         $overdueJobsList = [];
         foreach ($rows as $row) {
             $row['data'] = unserialize($row['data'], ['allowed_classes' => false]);
-            $overdueJobsList[$row['id']] = new Enlight_Components_Cron_Job($row);
+            $overdueJobsList[(int) $row['id']] = new Enlight_Components_Cron_Job($row);
         }
 
         return $overdueJobsList;
     }
 
-    /**
-     * @return bool
-     */
-    private function isJobStillOverdue($jobId)
+    private function isJobStillOverdue(int $jobId): bool
     {
         $qb = $this->connection->createQueryBuilder();
         $qb->select('*')
diff --git a/engine/Library/Enlight/Components/Cron/Job.php b/engine/Library/Enlight/Components/Cron/Job.php
index bc40fc6568c..5918843a3f3 100644
--- a/engine/Library/Enlight/Components/Cron/Job.php
+++ b/engine/Library/Enlight/Components/Cron/Job.php
@@ -282,7 +282,7 @@ public function getNext()
     /**
      * Sets the next date when the cronjob is due
      *
-     * @param string|\Zend_Date $next
+     * @param string|Zend_Date $next
      *
      * @return Enlight_Components_Cron_Job
      */
@@ -309,7 +309,7 @@ public function getStart()
     /**
      * Sets the date and time when the cronjob has been started
      *
-     * @param string|\Zend_Date $start
+     * @param string|Zend_Date $start
      *
      * @return Enlight_Components_Cron_Job
      */
diff --git a/engine/Library/Enlight/Components/Cron/Manager.php b/engine/Library/Enlight/Components/Cron/Manager.php
index 4c53a7fd07e..d9568503807 100644
--- a/engine/Library/Enlight/Components/Cron/Manager.php
+++ b/engine/Library/Enlight/Components/Cron/Manager.php
@@ -84,7 +84,7 @@ public function getAdapter()
      *
      * @return Enlight_Components_Cron_Manager
      */
-    public function setEventManager(Enlight_Event_EventManager $eventManager = null)
+    public function setEventManager(?Enlight_Event_EventManager $eventManager = null)
     {
         $this->eventManager = $eventManager;
 
@@ -104,20 +104,18 @@ public function getEventManager()
     /**
      * Deactivate a given Cron Job in the crontab
      *
-     * @return Enlight_Components_Cron_Adapter
+     * @return void
      */
     public function disableJob(Enlight_Components_Cron_Job $job)
     {
         $job->setActive(false);
 
-        return $this->adapter->updateJob($job);
+        $this->adapter->updateJob($job);
     }
 
     /**
      * Deactivate a given Cron Job
      *
-     * @param \Enlight_Components_Cron_Job $job
-     *
      * @throws Enlight_Exception
      *
      * @return Enlight_Components_Cron_Manager
@@ -132,8 +130,6 @@ public function deleteJob(Enlight_Components_Cron_Job $job)
     /**
      * Updates a cron job
      *
-     * @param \Enlight_Components_Cron_Job $job
-     *
      * @throws Enlight_Exception
      *
      * @return Enlight_Components_Cron_Manager
@@ -277,7 +273,7 @@ public function runJob(Enlight_Components_Cron_Job $job)
             ]);
 
             return $jobArgs;
-        } catch (\Throwable $e) {
+        } catch (Throwable $e) {
             $job->setData(['error' => $e->getMessage()]);
 
             if ($job->getDisableOnError()) {
diff --git a/engine/Library/Enlight/Components/Db/Adapter/Pdo/Mysql.php b/engine/Library/Enlight/Components/Db/Adapter/Pdo/Mysql.php
index 0ed74d3ab1e..845695e3870 100644
--- a/engine/Library/Enlight/Components/Db/Adapter/Pdo/Mysql.php
+++ b/engine/Library/Enlight/Components/Db/Adapter/Pdo/Mysql.php
@@ -139,6 +139,37 @@ protected function _quote($value)
         return parent::_quote($value);
     }
 
+    /**
+     * Begin a transaction.
+     * Opening a zend connection and a dbalconnection results in a fatal error, so we use the doctrine transaction levels
+     *
+     * @return void
+     */
+    protected function _beginTransaction()
+    {
+        $this->dbalConnection->beginTransaction();
+    }
+
+    /**
+     * Commit a transaction.
+     *
+     * @return void
+     */
+    protected function _commit()
+    {
+        $this->dbalConnection->commit();
+    }
+
+    /**
+     * Roll-back a transaction.
+     *
+     * @return void
+     */
+    protected function _rollBack()
+    {
+        $this->dbalConnection->rollBack();
+    }
+
     /**
      * Creates a PDO object and connects to the database.
      *
@@ -152,7 +183,7 @@ protected function _connect()
         }
 
         if (!$this->dbalConnection) {
-            throw new RuntimeException(sprintf('Class can only be constructed using %s::createFromDbalConnectionAndConfig().', __CLASS__));
+            throw new RuntimeException(\sprintf('Class can only be constructed using %s::createFromDbalConnectionAndConfig().', __CLASS__));
         }
 
         $this->_connection = $this->dbalConnection->getWrappedConnection();
diff --git a/engine/Library/Enlight/Components/Mail.php b/engine/Library/Enlight/Components/Mail.php
index 8c0438eefe4..9e72dcb9679 100644
--- a/engine/Library/Enlight/Components/Mail.php
+++ b/engine/Library/Enlight/Components/Mail.php
@@ -39,35 +39,35 @@ class Enlight_Components_Mail extends Zend_Mail
      *
      * @var string|null
      */
-    protected $_fromName = null;
+    protected $_fromName;
 
     /**
      * Property for the plain body
      *
      * @var null
      */
-    protected $_plainBody = null;
+    protected $_plainBody;
 
     /**
      * Property for the plain body text. Can be filled by setBodyText function.
      *
      * @var string|null
      */
-    protected $_plainBodyText = null;
+    protected $_plainBodyText;
 
     /**
      * Property for the plain subject. Can be filled by setSubject function.
      *
      * @var string|null
      */
-    protected $_plainSubject = null;
+    protected $_plainSubject;
 
     /**
      * Property for the template name. Can be filled by setTemplateName function.
      *
      * @var string|null
      */
-    protected $templateName = null;
+    protected $templateName;
 
     /**
      * @var array
@@ -137,7 +137,7 @@ public function __get($name)
                 return $this->_plainBodyText;
         }
 
-        throw new RuntimeException(sprintf('Could not read value for given name: "%s"', $name));
+        throw new RuntimeException(\sprintf('Could not read value for given name: "%s"', $name));
     }
 
     /**
@@ -194,7 +194,7 @@ public function setFrom($email, $name = null)
         // mitigate "pwnscriptum" attack
         // see https://framework.zend.com/security/advisory/ZF2016-04 for ZF2+ fix
         if (preg_match('/\\\"/', $email)) {
-            throw new \RuntimeException('Potential code injection in From header');
+            throw new RuntimeException('Potential code injection in From header');
         }
 
         $this->_fromName = $name;
@@ -381,6 +381,7 @@ public function removeAssociation(string $key): void
      * @param Zend_Mail_Transport_Abstract $transport
      *
      * @return Zend_Mail Provides fluent interface
+     *
      * @events  Enlight_Components_Mail_Send
      */
     public function send($transport = null)
@@ -393,6 +394,10 @@ public function send($transport = null)
             ]
         );
 
+        if (!$this->getMessageId()) {
+            $this->setMessageId();
+        }
+
         return parent::send($transport);
     }
 }
diff --git a/engine/Library/Enlight/Components/Session/Namespace.php b/engine/Library/Enlight/Components/Session/Namespace.php
index 62b8a96e1fe..3e845d635ae 100644
--- a/engine/Library/Enlight/Components/Session/Namespace.php
+++ b/engine/Library/Enlight/Components/Session/Namespace.php
@@ -45,7 +45,7 @@ public function __get($name)
      */
     public function __set($name, $value)
     {
-        return $this->set($name, $value);
+        $this->set($name, $value);
     }
 
     /**
@@ -87,7 +87,7 @@ public function __isset($name)
      *
      * @deprecated - Native return and parameter type will be added with Shopware 5.8
      */
-    #[\ReturnTypeWillChange]
+    #[ReturnTypeWillChange]
     public function offsetExists($key)
     {
         return $this->has($key);
@@ -102,7 +102,7 @@ public function offsetExists($key)
      *
      * @deprecated - Native return and parameter type will be added with Shopware 5.8
      */
-    #[\ReturnTypeWillChange]
+    #[ReturnTypeWillChange]
     public function offsetUnset($key)
     {
         $this->remove($key);
@@ -117,7 +117,7 @@ public function offsetUnset($key)
      *
      * @deprecated - Native return and parameter type will be added with Shopware 5.8
      */
-    #[\ReturnTypeWillChange]
+    #[ReturnTypeWillChange]
     public function offsetGet($key)
     {
         return $this->get($key);
@@ -133,7 +133,7 @@ public function offsetGet($key)
      *
      * @deprecated - Native return and parameter type will be added with Shopware 5.8
      */
-    #[\ReturnTypeWillChange]
+    #[ReturnTypeWillChange]
     public function offsetSet($key, $value)
     {
         $this->set($key, $value);
@@ -164,7 +164,7 @@ public function start()
         // - Shopware\Components\DependencyInjection\Bridge\Session::createSession()
         // In case the session is started somewhere else we need to ensure no other session is active. The same logic as
         // in Shopware's factories is used here.
-        // This behaviour is analogue to Zend: https://github.com/shopware/shopware/blob/cbc212ca4642878cac62193d3a2f41e08f4849a2/engine/Library/Zend/Session.php#L413
+        // This behaviour is analogue to Zend: https://github.com/shopware5/shopware/blob/cbc212ca4642878cac62193d3a2f41e08f4849a2/engine/Library/Zend/Session.php#L413
         $container = Shopware()->Container();
         self::ensureFrontendSessionClosed($container);
         self::ensureBackendSessionClosed($container);
diff --git a/engine/Library/Enlight/Components/Snippet/Manager.php b/engine/Library/Enlight/Components/Snippet/Manager.php
index e336ba77223..621d065d3ab 100644
--- a/engine/Library/Enlight/Components/Snippet/Manager.php
+++ b/engine/Library/Enlight/Components/Snippet/Manager.php
@@ -50,7 +50,7 @@ class Enlight_Components_Snippet_Manager extends Enlight_Class
     /**
      * @var string Default config class
      */
-    protected $defaultSection = null;
+    protected $defaultSection;
 
     /**
      * @deprecated - Unused property. Will be removed in Shopware 5.8 without replacement
diff --git a/engine/Library/Enlight/Components/Snippet/Resource.php b/engine/Library/Enlight/Components/Snippet/Resource.php
index 9d7b3360425..54064671abf 100644
--- a/engine/Library/Enlight/Components/Snippet/Resource.php
+++ b/engine/Library/Enlight/Components/Snippet/Resource.php
@@ -60,7 +60,7 @@ public function __construct(Enlight_Components_Snippet_Manager $snippetManager,
      *
      * @return void
      */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
+    public function populate(Smarty_Template_Source $source, ?Smarty_Internal_Template $_template = null)
     {
         if (!isset($source->smarty->registered_plugins[Smarty::PLUGIN_BLOCK]['snippet'])) {
             $source->smarty->registerPlugin(Smarty::PLUGIN_BLOCK, 'snippet', [__CLASS__, 'compileSnippetBlock']);
diff --git a/engine/Library/Enlight/Components/Test/Controller/TestCase.php b/engine/Library/Enlight/Components/Test/Controller/TestCase.php
index ffeeb7e10d3..45bc6fc9e1f 100644
--- a/engine/Library/Enlight/Components/Test/Controller/TestCase.php
+++ b/engine/Library/Enlight/Components/Test/Controller/TestCase.php
@@ -18,6 +18,7 @@
  */
 
 use Shopware\Components\Cart\ConditionalLineItemServiceInterface;
+use Shopware\Components\ShopRegistrationServiceInterface;
 use Symfony\Component\HttpFoundation\Response;
 
 /**
@@ -192,6 +193,9 @@ public function reset()
             }
             $container->get('events')->addSubscriber($plugin);
         }
+        if ($container->initialized('shop')) {
+            $container->get(ShopRegistrationServiceInterface::class)->resetTemplate($container->get('shop'));
+        }
     }
 
     /**
diff --git a/engine/Library/Enlight/Components/Test/TestCase.php b/engine/Library/Enlight/Components/Test/TestCase.php
index 6da3b1c39f9..729d28c4e69 100644
--- a/engine/Library/Enlight/Components/Test/TestCase.php
+++ b/engine/Library/Enlight/Components/Test/TestCase.php
@@ -50,7 +50,7 @@ protected function tearDown(): void
     /**
      * Allows to set a Shopware config
      *
-     * @param bool|string|null $value
+     * @param bool|float|int|string|null $value
      */
     protected function setConfig(string $name, $value): void
     {
diff --git a/engine/Library/Enlight/Config.php b/engine/Library/Enlight/Config.php
index 8d5402099ae..17f01e2c8e2 100644
--- a/engine/Library/Enlight/Config.php
+++ b/engine/Library/Enlight/Config.php
@@ -247,7 +247,7 @@ public function rewind()
      *
      * @deprecated - Native return and parameter type will be added with Shopware 5.8
      */
-    #[\ReturnTypeWillChange]
+    #[ReturnTypeWillChange]
     public function offsetSet($name, $value)
     {
         $this->__set($name, $value);
@@ -262,7 +262,7 @@ public function offsetSet($name, $value)
      *
      * @deprecated - Native return and parameter type will be added with Shopware 5.8
      */
-    #[\ReturnTypeWillChange]
+    #[ReturnTypeWillChange]
     public function offsetExists($name)
     {
         return $this->__isset($name);
@@ -277,7 +277,7 @@ public function offsetExists($name)
      *
      * @deprecated - Native return and parameter type will be added with Shopware 5.8
      */
-    #[\ReturnTypeWillChange]
+    #[ReturnTypeWillChange]
     public function offsetUnset($name)
     {
         $this->__unset($name);
@@ -292,7 +292,7 @@ public function offsetUnset($name)
      *
      * @deprecated - Native return and parameter type will be added with Shopware 5.8
      */
-    #[\ReturnTypeWillChange]
+    #[ReturnTypeWillChange]
     public function offsetGet($name)
     {
         return $this->get($name);
diff --git a/engine/Library/Enlight/Config/Adapter/DbTable.php b/engine/Library/Enlight/Config/Adapter/DbTable.php
index 57127d488d8..80dd0dfebbb 100644
--- a/engine/Library/Enlight/Config/Adapter/DbTable.php
+++ b/engine/Library/Enlight/Config/Adapter/DbTable.php
@@ -59,7 +59,7 @@ class Enlight_Config_Adapter_DbTable extends Enlight_Config_Adapter
     /**
      * The section column in the database table.
      *
-     * @var string|array<string, string>|null
+     * @var string|array<array-key, string>|null
      */
     protected $_sectionColumn = 'section';
 
@@ -141,8 +141,8 @@ public function getTable($name = null)
     {
         if ($name !== null) {
             return new Enlight_Components_Table([
-               'name' => $name,
-               'db' => $this->_db, ]
+                'name' => $name,
+                'db' => $this->_db, ]
             );
         }
         if (!$this->_table instanceof Enlight_Components_Table) {
@@ -226,18 +226,16 @@ public function write(Enlight_Config $config, $fields = null, $update = true, $f
             $insertData[$this->_createdColumn] = new Zend_Date();
         }
 
-        if ($section !== null) {
-            if (\is_array($this->_sectionColumn)) {
-                foreach ($this->_sectionColumn as $key => $sectionColumn) {
-                    if (isset($section[$key])) {
-                        $where[] = $db->quoteInto($sectionColumn . '=?', $section[$key]);
-                        $insertData[$sectionColumn] = $section[$key];
-                    }
+        if (\is_array($this->_sectionColumn)) {
+            foreach ($this->_sectionColumn as $key => $sectionColumn) {
+                if (isset($section[$key])) {
+                    $where[] = $db->quoteInto($sectionColumn . '=?', $section[$key]);
+                    $insertData[$sectionColumn] = $section[$key];
                 }
-            } else {
-                $where[] = $db->quoteInto($this->_sectionColumn . '=?', $section);
-                $insertData[$this->_sectionColumn] = $section;
             }
+        } else {
+            $where[] = $db->quoteInto($this->_sectionColumn . '=?', $section);
+            $insertData[$this->_sectionColumn] = $section;
         }
 
         foreach ((array) $fields as $field) {
@@ -317,18 +315,16 @@ public function delete(Enlight_Config $config, $fields = null, $deleteDirty = fa
             $where[] = $db->quoteInto($this->_namespaceColumn . '=?', $name);
         }
 
-        if ($section !== null) {
-            if (\is_array($this->_sectionColumn)) {
-                foreach ($this->_sectionColumn as $key => $sectionColumn) {
-                    if (isset($section[$key])) {
-                        $where[] = $db->quoteInto($sectionColumn . '=?', $section[$key]);
-                        $insertData[$sectionColumn] = $section[$key];
-                    }
+        if (\is_array($this->_sectionColumn)) {
+            foreach ($this->_sectionColumn as $key => $sectionColumn) {
+                if (isset($section[$key])) {
+                    $where[] = $db->quoteInto($sectionColumn . '=?', $section[$key]);
+                    $insertData[$sectionColumn] = $section[$key];
                 }
-            } else {
-                $where[] = $db->quoteInto($this->_sectionColumn . '=?', $section);
-                $insertData[$this->_sectionColumn] = $section;
             }
+        } else {
+            $where[] = $db->quoteInto($this->_sectionColumn . '=?', $section);
+            $insertData[$this->_sectionColumn] = $section;
         }
 
         $where[] = $db->quoteInto($this->_nameColumn . ' IN (?)', $fields);
@@ -359,15 +355,15 @@ protected function readSection($name, $section)
             $select->where($this->_namespaceColumn . '=?', $name);
         }
 
-        if ($section !== null && $this->_sectionColumn !== null) {
+        if (!empty($section) && $this->_sectionColumn !== null) {
             if (\is_array($this->_sectionColumn)) {
-                $section = explode(':', $section);
+                $sectionArray = explode(':', $section);
                 foreach ($this->_sectionColumn as $key => $sectionColumn) {
-                    if (!empty($section[$key])) {
-                        $select->where($sectionColumn . '=?', $section[$key]);
+                    if (!empty($sectionArray[$key])) {
+                        $select->where($sectionColumn . '=?', $sectionArray[$key]);
                     }
                 }
-            } elseif ($this->_sectionColumn !== null) {
+            } else {
                 $select->where($this->_sectionColumn . '=?', $section);
             }
         }
diff --git a/engine/Library/Enlight/Config/Adapter/File.php b/engine/Library/Enlight/Config/Adapter/File.php
index 3f6044bc747..f706ffaa637 100644
--- a/engine/Library/Enlight/Config/Adapter/File.php
+++ b/engine/Library/Enlight/Config/Adapter/File.php
@@ -112,7 +112,7 @@ public function read(Enlight_Config $config)
                 try {
                     /** @var Enlight_Config_Format_Ini $reader */
                     $reader = new $reader($name, $section, [
-                            'skipExtends' => $this->_skipExtends, ]
+                        'skipExtends' => $this->_skipExtends, ]
                     );
                     $config->setData($reader->toArray());
                     break;
@@ -232,9 +232,9 @@ protected function readBase($filename)
             /** @var class-string<Enlight_Config> $reader */
             $reader = 'Enlight_Config_Format_' . ucfirst($this->_configType);
             $base = new $reader($filename, null, [
-                    'skipExtends' => true,
-                    'allowModifications' => true, ]
-            );
+                'skipExtends' => true,
+                'allowModifications' => true,
+            ]);
         } else {
             $base = new Enlight_Config([], true);
         }
diff --git a/engine/Library/Enlight/Config/BaseConfig.php b/engine/Library/Enlight/Config/BaseConfig.php
index 385e5f889d8..032ea017918 100644
--- a/engine/Library/Enlight/Config/BaseConfig.php
+++ b/engine/Library/Enlight/Config/BaseConfig.php
@@ -93,7 +93,7 @@ class Enlight_Config_BaseConfig implements Countable, Iterator
      *
      * @var string
      */
-    protected $_loadFileErrorStr = null;
+    protected $_loadFileErrorStr;
 
     /**
      * Enlight_Config_BaseConfig provides a property based interface to
@@ -254,7 +254,7 @@ public function toArray()
      *
      * @deprecated - Native return type will be added with Shopware 5.8
      */
-    #[\ReturnTypeWillChange]
+    #[ReturnTypeWillChange]
     public function count()
     {
         return $this->_count;
@@ -267,7 +267,7 @@ public function count()
      *
      * @deprecated - Native return type will be added with Shopware 5.8
      */
-    #[\ReturnTypeWillChange]
+    #[ReturnTypeWillChange]
     public function current()
     {
         $this->_skipNextIteration = false;
@@ -282,7 +282,7 @@ public function current()
      *
      * @deprecated - Native return type will be added with Shopware 5.8
      */
-    #[\ReturnTypeWillChange]
+    #[ReturnTypeWillChange]
     public function key()
     {
         return key($this->_data);
@@ -295,7 +295,7 @@ public function key()
      *
      * @deprecated - Native return type will be added with Shopware 5.8
      */
-    #[\ReturnTypeWillChange]
+    #[ReturnTypeWillChange]
     public function next()
     {
         if ($this->_skipNextIteration) {
@@ -314,7 +314,7 @@ public function next()
      *
      * @deprecated - Native return type will be added with Shopware 5.8
      */
-    #[\ReturnTypeWillChange]
+    #[ReturnTypeWillChange]
     public function rewind()
     {
         $this->_skipNextIteration = false;
@@ -329,7 +329,7 @@ public function rewind()
      *
      * @deprecated - Native return type will be added with Shopware 5.8
      */
-    #[\ReturnTypeWillChange]
+    #[ReturnTypeWillChange]
     public function valid()
     {
         return $this->_index < $this->_count;
diff --git a/engine/Library/Enlight/Config/Format/Ini.php b/engine/Library/Enlight/Config/Format/Ini.php
index a7610357a1a..72ce8a87a65 100644
--- a/engine/Library/Enlight/Config/Format/Ini.php
+++ b/engine/Library/Enlight/Config/Format/Ini.php
@@ -144,7 +144,7 @@ public function __construct($filename, $section = null, $options = false)
             $dataArray = [];
             foreach ($section as $sectionName) {
                 if (!isset($iniArray[$sectionName])) {
-                    throw new Enlight_Config_Exception(sprintf("Section '%s' cannot be found in %s", $sectionName, $filename));
+                    throw new Enlight_Config_Exception(\sprintf("Section '%s' cannot be found in %s", $sectionName, $filename));
                 }
                 $dataArray = $this->_arrayMergeRecursive($this->_processSection($iniArray, $sectionName), $dataArray);
             }
@@ -214,7 +214,7 @@ protected function _loadIniFile($filename)
                     break;
 
                 default:
-                    throw new Enlight_Config_Exception(sprintf("Section '%s' may not extend multiple sections in %s", $thisSection, $filename));
+                    throw new Enlight_Config_Exception(\sprintf("Section '%s' may not extend multiple sections in %s", $thisSection, $filename));
             }
         }
 
@@ -247,7 +247,7 @@ protected function _processSection($iniArray, $section, $config = [])
                         $config = $this->_processSection($iniArray, $value, $config);
                     }
                 } else {
-                    throw new Enlight_Config_Exception(sprintf("Parent section '%s' cannot be found", $section));
+                    throw new Enlight_Config_Exception(\sprintf("Parent section '%s' cannot be found", $section));
                 }
             } else {
                 $config = $this->_processKey($config, $key, $value);
@@ -282,11 +282,11 @@ protected function _processKey($config, $key, $value)
                         $config[$pieces[0]] = [];
                     }
                 } elseif (!\is_array($config[$pieces[0]])) {
-                    throw new Enlight_Config_Exception(sprintf("Cannot create sub-key for '%s' as key already exists", $pieces[0]));
+                    throw new Enlight_Config_Exception(\sprintf("Cannot create sub-key for '%s' as key already exists", $pieces[0]));
                 }
                 $config[$pieces[0]] = $this->_processKey($config[$pieces[0]], $pieces[1], $value);
             } else {
-                throw new Enlight_Config_Exception(sprintf("Invalid key '%s'", $key));
+                throw new Enlight_Config_Exception(\sprintf("Invalid key '%s'", $key));
             }
         } else {
             $config[$key] = $value;
diff --git a/engine/Library/Enlight/Config/Writer/FileAbstract.php b/engine/Library/Enlight/Config/Writer/FileAbstract.php
index b9e5c452e8a..3ac866343e4 100644
--- a/engine/Library/Enlight/Config/Writer/FileAbstract.php
+++ b/engine/Library/Enlight/Config/Writer/FileAbstract.php
@@ -40,7 +40,7 @@ class Enlight_Config_Writer_FileAbstract extends Enlight_Config_Writer_Writer
      *
      * @var string
      */
-    protected $_filename = null;
+    protected $_filename;
 
     /**
      * Wether to exclusively lock the file or not
@@ -80,13 +80,12 @@ public function setExclusiveLock($exclusiveLock)
     /**
      * Write configuration to file.
      *
-     * @param string         $filename
-     * @param Enlight_Config $config
-     * @param bool           $exclusiveLock
+     * @param string $filename
+     * @param bool   $exclusiveLock
      *
      * @return void
      */
-    public function write($filename = null, Enlight_Config $config = null, $exclusiveLock = null)
+    public function write($filename = null, ?Enlight_Config $config = null, $exclusiveLock = null)
     {
         if ($filename !== null) {
             $this->setFilename($filename);
diff --git a/engine/Library/Enlight/Config/Writer/Ini.php b/engine/Library/Enlight/Config/Writer/Ini.php
index 629c70c3f35..1c0abdeac0a 100644
--- a/engine/Library/Enlight/Config/Writer/Ini.php
+++ b/engine/Library/Enlight/Config/Writer/Ini.php
@@ -163,9 +163,7 @@ protected function _prepareValue($value)
      * Root elements that are not assigned to any section needs to be
      * on the top of config.
      *
-     * @see    http://framework.zend.com/issues/browse/ZF-6289
-     *
-     * @param  Enlight_Config_BaseConfig
+     * @see http://framework.zend.com/issues/browse/ZF-6289
      *
      * @return Enlight_Config_BaseConfig
      */
diff --git a/engine/Library/Enlight/Config/Writer/Writer.php b/engine/Library/Enlight/Config/Writer/Writer.php
index 509ef04de54..fbba7c7c061 100644
--- a/engine/Library/Enlight/Config/Writer/Writer.php
+++ b/engine/Library/Enlight/Config/Writer/Writer.php
@@ -45,14 +45,14 @@ abstract class Enlight_Config_Writer_Writer
      *
      * @var Enlight_Config_BaseConfig
      */
-    protected $_config = null;
+    protected $_config;
 
     /**
      * Create a new adapter
      *
      * $options can only be passed as array or be omitted
      */
-    public function __construct(array $options = null)
+    public function __construct(?array $options = null)
     {
         if (\is_array($options)) {
             $this->setOptions($options);
diff --git a/engine/Library/Enlight/Controller/Action.php b/engine/Library/Enlight/Controller/Action.php
index 819e7c01316..c942b5278c3 100644
--- a/engine/Library/Enlight/Controller/Action.php
+++ b/engine/Library/Enlight/Controller/Action.php
@@ -20,7 +20,8 @@
 use Shopware\Components\DependencyInjection\Container;
 use Shopware\Components\DependencyInjection\ContainerAwareInterface;
 use Shopware\Components\Model\ModelManager;
-use Symfony\Component\Form\Form;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormTypeInterface;
 
 /**
  * Basic class for each Enlight controller action.
@@ -102,8 +103,9 @@ public function __call($name, $value = null)
      * @throws Enlight_Exception
      * @throws Enlight_Event_Exception
      */
-    public function initController(Enlight_Controller_Request_RequestHttp $request,
-                                Enlight_Controller_Response_ResponseHttp $response
+    public function initController(
+        Enlight_Controller_Request_RequestHttp $request,
+        Enlight_Controller_Response_ResponseHttp $response
     ) {
         $this->setRequest($request)->setResponse($response);
 
@@ -236,9 +238,8 @@ public function dispatch($action)
      * @param string $action
      * @param string $controller
      * @param string $module
-     * @param array  $params
      */
-    public function forward($action, $controller = null, $module = null, array $params = null)
+    public function forward($action, $controller = null, $module = null, ?array $params = null)
     {
         $request = $this->Request();
 
@@ -261,11 +262,13 @@ public function forward($action, $controller = null, $module = null, array $para
      * @param string|array $url
      *
      * @throws Exception
+     *
+     * @return void
      */
     public function redirect($url, array $options = [])
     {
         if (\is_array($url)) {
-            $url = $this->Front()->Router()->assemble($url);
+            $url = $this->Front()->ensureRouter()->assemble($url);
         }
         if (!preg_match('#^(https?|ftp)://#', $url)) {
             if (!str_starts_with($url, '/')) {
@@ -290,10 +293,7 @@ public function setView(Enlight_View $view)
         return $this;
     }
 
-    /**
-     * @param Container $loader
-     */
-    public function setContainer(Container $loader = null)
+    public function setContainer(?Container $loader = null)
     {
         $this->container = $loader;
     }
@@ -301,13 +301,11 @@ public function setContainer(Container $loader = null)
     /**
      * Set front instance
      *
-     * @param Enlight_Controller_Front $front
-     *
      * @throws Exception
      *
      * @return Enlight_Controller_Action
      */
-    public function setFront(Enlight_Controller_Front $front = null)
+    public function setFront(?Enlight_Controller_Front $front = null)
     {
         if ($front === null) {
             $front = Shopware()->Container()->get('front');
@@ -412,13 +410,13 @@ public function getModelManager()
     /**
      * Creates and returns a Form instance from the type of the form.
      *
-     * @param string $type    The fully qualified class name of the form type
-     * @param mixed  $data    The initial data for the form
-     * @param array  $options Options for the form
+     * @param class-string<FormTypeInterface> $type    The fully qualified class name of the form type
+     * @param mixed                           $data    The initial data for the form
+     * @param array                           $options Options for the form
      *
      * @throws Exception
      *
-     * @return Form
+     * @return FormInterface
      */
     protected function createForm($type, $data = null, array $options = [])
     {
diff --git a/engine/Library/Enlight/Controller/Dispatcher.php b/engine/Library/Enlight/Controller/Dispatcher.php
index 0693f6148e9..82219a8f76c 100644
--- a/engine/Library/Enlight/Controller/Dispatcher.php
+++ b/engine/Library/Enlight/Controller/Dispatcher.php
@@ -68,7 +68,7 @@ public function Front()
      *
      * @return Enlight_Controller_Dispatcher
      */
-    public function setResponse(Enlight_Controller_Response_Response $response = null)
+    public function setResponse(?Enlight_Controller_Response_Response $response = null)
     {
         $this->response = $response;
 
@@ -88,7 +88,8 @@ public function Response()
     /**
      * Default dispatch function of the controller
      */
-    abstract public function dispatch(Enlight_Controller_Request_Request $request,
-                                      Enlight_Controller_Response_Response $response
+    abstract public function dispatch(
+        Enlight_Controller_Request_Request $request,
+        Enlight_Controller_Response_Response $response
     );
 }
diff --git a/engine/Library/Enlight/Controller/Dispatcher/Default.php b/engine/Library/Enlight/Controller/Dispatcher/Default.php
index 4288027c99f..acb73b534bf 100644
--- a/engine/Library/Enlight/Controller/Dispatcher/Default.php
+++ b/engine/Library/Enlight/Controller/Dispatcher/Default.php
@@ -18,6 +18,7 @@
  */
 
 use Shopware\Components\DependencyInjection\ContainerAwareInterface;
+use Shopware\Components\DispatchFormatHelper;
 use Symfony\Component\DependencyInjection\ContainerInterface as Container;
 
 /**
@@ -83,7 +84,7 @@ class Enlight_Controller_Dispatcher_Default extends Enlight_Controller_Dispatche
     protected $modules = ['frontend', 'api', 'widgets', 'backend'];
 
     /**
-     * @var \Shopware\Components\DispatchFormatHelper
+     * @var DispatchFormatHelper
      */
     protected $dispatchFormatHelper;
 
@@ -105,7 +106,7 @@ public function __construct(array $controllers, Container $container)
     }
 
     /**
-     * @return \Shopware\Components\DispatchFormatHelper
+     * @return DispatchFormatHelper
      */
     public function getDispatchFormatHelper()
     {
@@ -432,7 +433,7 @@ public function dispatch(
             try {
                 Shopware()->Loader()->loadClass($class, $path);
             } catch (Exception $e) {
-                throw new Enlight_Exception(sprintf('Controller "%s" could not be loaded', $class));
+                throw new Enlight_Exception(\sprintf('Controller "%s" could not be loaded', $class));
             }
 
             $proxy = Shopware()->Hooks()->getProxy($class);
@@ -484,7 +485,7 @@ public function dispatch(
 
     private function getControllerServiceId(string $module, string $name): ?string
     {
-        $controllerKey = strtolower(sprintf('%s_%s', $module, $name));
+        $controllerKey = strtolower(\sprintf('%s_%s', $module, $name));
 
         return $this->controllers[$controllerKey] ?? null;
     }
diff --git a/engine/Library/Enlight/Controller/Front.php b/engine/Library/Enlight/Controller/Front.php
index 8dbf75c637d..9c7ee0a3fce 100644
--- a/engine/Library/Enlight/Controller/Front.php
+++ b/engine/Library/Enlight/Controller/Front.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Enlight
  *
@@ -17,6 +19,8 @@
  * @license    http://enlight.de/license     New BSD License
  */
 
+use Shopware\Components\Routing\Router;
+use Symfony\Component\HttpFoundation\Request as SymfonyRequest;
 use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
@@ -28,11 +32,6 @@
  * loads the default plugins viewRenderer and errorHandler. The controller running the dispatch of the request
  * unless according to request everything was dispatched. it catches exceptions automatically and sets them into the
  * response object. Finally it sends the response if nothing else is specified in the configuration.
- *
- * @category   Enlight
- *
- * @copyright  Copyright (c) 2011, shopware AG (http://www.shopware.de)
- * @license    http://enlight.de/license     New BSD License
  */
 class Enlight_Controller_Front extends Enlight_Class implements Enlight_Hook
 {
@@ -42,29 +41,29 @@ class Enlight_Controller_Front extends Enlight_Class implements Enlight_Hook
     protected $plugins;
 
     /**
-     * @var Enlight_Controller_Router contains an instance of the Enlight_Controller_Router.
-     *                                Used to route the request to the controller/action.
+     * @var Enlight_Controller_Router|null contains an instance of the Enlight_Controller_Router.
+     *                                     Used to route the request to the controller/action.
      */
     protected $router;
 
     /**
-     * @var Enlight_Controller_Dispatcher contains in instance of the
-     *                                    Enlight_Controller_Dispatcher. Used to dispatch the request.
+     * @var Enlight_Controller_Dispatcher_Default|null contains in instance of the
+     *                                                 Enlight_Controller_Dispatcher. Used to dispatch the request.
      */
     protected $dispatcher;
 
     /**
-     * @var Enlight_Controller_Request_Request contains an instance of the
-     *                                         Enlight_Controller_Request_Request. Used for the routing,
-     *                                         the different events which will be notified in the dispatch function and for the
-     *                                         dispatch itself.
+     * @var Enlight_Controller_Request_Request|null contains an instance of the
+     *                                              Enlight_Controller_Request_Request. Used for the routing,
+     *                                              the different events which will be notified in the dispatch function and for the
+     *                                              dispatch itself.
      */
     protected $request;
 
     /**
-     * @var Enlight_Controller_Response_ResponseHttp contains an
-     *                                               instance of the Enlight_Controller_Response_ResponseHttp. Used for the dispatch of the request
-     *                                               and to log the thrown exception. After the dispatch, the response will be sent.
+     * @var Enlight_Controller_Response_ResponseHttp|null contains an
+     *                                                    instance of the Enlight_Controller_Response_ResponseHttp. Used for the dispatch of the request
+     *                                                    and to log the thrown exception. After the dispatch, the response will be sent.
      */
     protected $response;
 
@@ -75,8 +74,8 @@ class Enlight_Controller_Front extends Enlight_Class implements Enlight_Hook
     protected $throwExceptions;
 
     /**
-     * @var array Contains all invoked params. The invoked params can be set by the setParam/s function and
-     *            can be accessed by the getParams function.
+     * @var array<string, mixed> Contains all invoked params. The invoked params can be set by the setParam/s function and
+     *                           can be accessed by the getParams function.
      */
     protected $invokeParams = [];
 
@@ -107,7 +106,7 @@ public function __construct(Enlight_Event_EventManager $eventManager)
      * If the objects has been set, the Enlight_Controller_Front_RouteStartup event is notified.
      * After the event is done, the route routes the request to controller/action.
      * Then the Enlight_Controller_Front_RouteShutdown event and the Enlight_Controller_Front_DispatchLoopStartup
-     * event are notified. After this events the controller runs the dispatch
+     * event are notified. After these events the controller runs the dispatch
      * of the request unless according to request everything was dispatched. During the dispatch
      * two events are notified:<br>
      *  - Enlight_Controller_Front_PreDispatch  => before the dispatch<br>
@@ -134,7 +133,7 @@ public function dispatch()
         );
 
         if (!$this->router) {
-            $this->setRouter('Enlight_Controller_Router_Default');
+            $this->setRouter(Router::class);
         }
         if (!$this->dispatcher) {
             $this->setDispatcher('Enlight_Controller_Dispatcher_Default');
@@ -147,7 +146,9 @@ public function dispatch()
             $this->setResponse('Enlight_Controller_Response_ResponseHttp');
         }
 
-        $this->requestStack->push($this->request);
+        if ($this->request instanceof SymfonyRequest) {
+            $this->requestStack->push($this->request);
+        }
 
         $eventArgs->set('request', $this->Request());
         $eventArgs->set('response', $this->Response());
@@ -164,12 +165,12 @@ public function dispatch()
          * Route request to controller/action, if a router is provided
          */
         try {
-            $this->router->route($this->request);
+            $this->ensureRouter()->route($this->ensureRequest());
         } catch (Exception $e) {
             if ($this->throwExceptions()) {
                 throw $e;
             }
-            $this->response->setException($e);
+            $this->Response()->setException($e);
         }
 
         /*
@@ -183,8 +184,8 @@ public function dispatch()
         /*
          * Early exit the dispatch if we have a redirect
          */
-        if ($this->response->isRedirect()) {
-            return $this->response;
+        if ($this->Response()->isRedirect()) {
+            return $this->Response();
         }
 
         /*
@@ -201,7 +202,7 @@ public function dispatch()
          * action in the request.
          */
         do {
-            $this->request->setDispatched(true);
+            $this->ensureRequest()->setDispatched();
 
             /*
              * Notify plugins of dispatch startup
@@ -215,19 +216,19 @@ public function dispatch()
                 /*
                  * Skip requested action if preDispatch() has reset it
                  */
-                if (!$this->request->isDispatched()) {
+                if (!$this->ensureRequest()->isDispatched()) {
                     continue;
                 }
 
                 /*
                  * Dispatch request
                  */
-                $this->dispatcher->dispatch($this->request, $this->response);
+                $this->Dispatcher()->dispatch($this->ensureRequest(), $this->Response());
             } catch (Exception $e) {
                 if ($this->throwExceptions()) {
                     throw $e;
                 }
-                $this->response->setException($e);
+                $this->Response()->setException($e);
             }
             /*
              * Notify plugins of dispatch completion
@@ -236,7 +237,7 @@ public function dispatch()
                 'Enlight_Controller_Front_PostDispatch',
                 $eventArgs
             );
-        } while (!$this->request->isDispatched());
+        } while (!$this->ensureRequest()->isDispatched());
 
         /*
          * Notify plugins of dispatch loop completion
@@ -246,23 +247,19 @@ public function dispatch()
             $eventArgs
         );
 
-        return $this->response;
+        return $this->Response();
     }
 
     /**
      * Setter method for the plugin property.
      *
-     * @param string|Enlight_Plugin_Namespace $plugins
-     *
-     * @throws Enlight_Exception
-     *
      * @return Enlight_Controller_Front
      */
-    public function setPlugins(Enlight_Plugin_Namespace $plugins = null)
+    public function setPlugins(?Enlight_Plugin_Namespace $plugins = null)
     {
         if ($plugins === null) {
             $plugins = new Enlight_Plugin_Namespace_Loader('Controller');
-            $plugins->addPrefixPath('Enlight_Controller_Plugins', \dirname(__FILE__) . DIRECTORY_SEPARATOR . 'Plugins');
+            $plugins->addPrefixPath('Enlight_Controller_Plugins', __DIR__ . DIRECTORY_SEPARATOR . 'Plugins');
         }
         $this->plugins = $plugins;
 
@@ -273,7 +270,7 @@ public function setPlugins(Enlight_Plugin_Namespace $plugins = null)
      * Setter method for the router. Sets the front controller instance
      * automatically in the given router.
      *
-     * @param string|Enlight_Controller_Router $router
+     * @param class-string<Enlight_Controller_Router>|Enlight_Controller_Router $router
      *
      * @throws Enlight_Exception
      *
@@ -297,7 +294,7 @@ public function setRouter($router)
      * Setter method for the dispatcher. Sets the front controller instance
      * automatically in the given dispatcher.
      *
-     * @param string|Enlight_Controller_Dispatcher $dispatcher
+     * @param class-string<Enlight_Controller_Dispatcher>|Enlight_Controller_Dispatcher $dispatcher
      *
      * @throws Enlight_Exception
      *
@@ -308,7 +305,7 @@ public function setDispatcher($dispatcher)
         if (\is_string($dispatcher)) {
             $dispatcher = new $dispatcher();
         }
-        if (!$dispatcher instanceof Enlight_Controller_Dispatcher) {
+        if (!$dispatcher instanceof Enlight_Controller_Dispatcher_Default) {
             throw new Enlight_Exception('Invalid dispatcher class');
         }
         $dispatcher->setFront($this);
@@ -320,6 +317,8 @@ public function setDispatcher($dispatcher)
     /**
      * Sets the request instance
      *
+     * @param class-string<Enlight_Controller_Request_RequestHttp>|Enlight_Controller_Request_Request $request
+     *
      * @throws Enlight_Exception
      *
      * @return Enlight_Controller_Front
@@ -340,6 +339,8 @@ public function setRequest($request)
     /**
      * Sets the response instance
      *
+     * @param class-string<Enlight_Controller_Response_Response>|Enlight_Controller_Response_Response $response
+     *
      * @throws Enlight_Exception
      *
      * @return Enlight_Controller_Front
@@ -374,13 +375,22 @@ public function Plugins()
     /**
      * Returns the router instance.
      *
-     * @return Enlight_Controller_Router
+     * @return Enlight_Controller_Router|null
      */
     public function Router()
     {
         return $this->router;
     }
 
+    public function ensureRouter(): Enlight_Controller_Router
+    {
+        if (!$this->router instanceof Enlight_Controller_Router) {
+            throw new RuntimeException('Router was requested, but is not set.');
+        }
+
+        return $this->router;
+    }
+
     /**
      * Returns the request instance.
      *
@@ -391,31 +401,52 @@ public function Request()
         return $this->request;
     }
 
+    public function ensureRequest(): Enlight_Controller_Request_Request
+    {
+        if (!$this->request instanceof Enlight_Controller_Request_Request) {
+            throw new RuntimeException('Request was requested, but is not set.');
+        }
+
+        return $this->request;
+    }
+
     /**
      * Returns the response instance.
      *
+     * @throws Enlight_Exception
+     *
      * @return Enlight_Controller_Response_ResponseHttp
      */
     public function Response()
     {
-        if ($this->response === null) {
+        if (!$this->response instanceof Enlight_Controller_Response_ResponseHttp) {
             $this->setResponse('Enlight_Controller_Response_ResponseHttp');
         }
 
+        if (!$this->response instanceof Enlight_Controller_Response_ResponseHttp) {
+            throw new RuntimeException('Response was requested, but it could not be set.');
+        }
+
         return $this->response;
     }
 
     /**
      * Returns the dispatcher instance.
      *
+     * @throws Enlight_Exception
+     *
      * @return Enlight_Controller_Dispatcher_Default
      */
     public function Dispatcher()
     {
-        if ($this->dispatcher === null) {
+        if (!$this->dispatcher instanceof Enlight_Controller_Dispatcher_Default) {
             $this->setDispatcher('Enlight_Controller_Dispatcher_Default');
         }
 
+        if (!$this->dispatcher instanceof Enlight_Controller_Dispatcher_Default) {
+            throw new RuntimeException('Dispatcher was requested, but it could not be set.');
+        }
+
         return $this->dispatcher;
     }
 
@@ -424,7 +455,7 @@ public function Dispatcher()
      *
      * @param bool|null $flag
      *
-     * @return bool|Enlight_Controller_Front
+     * @return ($flag is null ? bool : Enlight_Controller_Front)
      */
     public function throwExceptions($flag = null)
     {
@@ -440,7 +471,8 @@ public function throwExceptions($flag = null)
     /**
      * Setter method to set a single parameter into the invokeParams property.
      *
-     * @param string $name
+     * @param string     $name
+     * @param mixed|null $value
      *
      * @return Enlight_Controller_Front
      */
@@ -455,6 +487,8 @@ public function setParam($name, $value)
     /**
      * Setter method for the invokeParams property.
      *
+     * @param array<string, mixed> $params
+     *
      * @return Enlight_Controller_Front
      */
     public function setParams(array $params)
@@ -465,21 +499,21 @@ public function setParams(array $params)
     }
 
     /**
-     * Sets a invoke param by name.
+     * Gets an invoke param by name.
+     *
+     * @param string $name
+     *
+     * @return mixed|null
      */
     public function getParam($name)
     {
-        if (isset($this->invokeParams[$name])) {
-            return $this->invokeParams[$name];
-        }
-
-        return null;
+        return $this->invokeParams[$name] ?? null;
     }
 
     /**
      * Returns the list of invoked params.
      *
-     * @return array
+     * @return array<string, mixed>
      */
     public function getParams()
     {
diff --git a/engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php b/engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php
index bc187649e82..2c23b780f1c 100644
--- a/engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php
+++ b/engine/Library/Enlight/Controller/Plugins/Json/Bootstrap.php
@@ -49,7 +49,7 @@ class Enlight_Controller_Plugins_Json_Bootstrap extends Enlight_Plugin_Bootstrap
     /**
      * Should the JSON object be encapsulated into a javascript function
      *
-     * @var string
+     * @var bool|string|null
      */
     protected $padding;
 
@@ -62,6 +62,8 @@ class Enlight_Controller_Plugins_Json_Bootstrap extends Enlight_Plugin_Bootstrap
 
     /**
      * Initializes this plugin. This Plugin should run after the ViewRenderer Plugin
+     *
+     * @return void
      */
     public function init()
     {
@@ -79,11 +81,15 @@ public function init()
     /**
      * Called from the Event Manager after the dispatch process
      *
-     * @return bool
+     * @return void
      */
     public function onPostDispatch(Enlight_Event_EventArgs $args)
     {
         $subject = $args->get('subject');
+        if (!$subject instanceof Enlight_Controller_Action) {
+            return;
+        }
+
         $response = $subject->Response();
         $request = $subject->Request();
 
@@ -100,7 +106,7 @@ public function onPostDispatch(Enlight_Event_EventArgs $args)
         // decide if we should render the data or the whole page
         if ($this->renderer === true) {
             $content = $subject->View()->getAssign();
-        } elseif (!empty($this->padding)) {
+        } elseif (\is_string($this->padding) && $this->padding !== '') {
             $content = $response->getBody();
         } else {
             return;
@@ -109,7 +115,7 @@ public function onPostDispatch(Enlight_Event_EventArgs $args)
         // Convert content to json
         $content = $this->convertToJson($content);
 
-        if (!empty($this->padding)) {
+        if (\is_string($this->padding) && $this->padding !== '') {
             $response->setHeader('Content-type', 'text/javascript', true);
             $response->setBody($this->addPadding($content, $this->padding));
         } elseif ($this->renderer === true) {
@@ -119,7 +125,7 @@ public function onPostDispatch(Enlight_Event_EventArgs $args)
 
         $this->padding = null;
         $this->encoding = 'UTF-8';
-        $this->renderer = null;
+        $this->renderer = false;
     }
 
     /**
@@ -142,7 +148,7 @@ public function setPadding($padding = true)
     /**
      * Returns the Value set by setPadding()
      *
-     * @return string
+     * @return bool|string|null
      */
     public function getPadding()
     {
@@ -162,10 +168,13 @@ public function setRenderer($renderer = true)
         $this->renderer = (bool) $renderer;
 
         if ($this->renderer === true) {
-            /** @var Enlight_Controller_Plugins_ViewRenderer_Bootstrap $viewRenderer */
-            $viewRenderer = $this->Collection()->get('ViewRenderer');
-            // Disable the default renderer
-            $viewRenderer->setNoRender(true);
+            $collection = $this->Collection();
+            if ($collection !== null) {
+                /** @var Enlight_Controller_Plugins_ViewRenderer_Bootstrap $viewRenderer */
+                $viewRenderer = $collection->get('ViewRenderer');
+                // Disable the default renderer
+                $viewRenderer->setNoRender(true);
+            }
         }
 
         return $this;
@@ -186,7 +195,7 @@ public function getRenderer()
      *
      * @param string $encoding
      *
-     * @return \Enlight_Controller_Plugins_Json_Bootstrap
+     * @return Enlight_Controller_Plugins_Json_Bootstrap
      */
     public function setEncoding($encoding)
     {
@@ -241,11 +250,17 @@ protected function convertToJson($data)
     /**
      * Converts date time objects
      *
-     * @param DateTime $value
+     * @param DateTimeInterface $value
+     *
+     * @param-out string $value
+     *
+     * @param array-key $key
+     *
+     * @return void
      */
     protected static function convertDateTime(&$value, $key)
     {
-        if ($value instanceof DateTime) {
+        if ($value instanceof DateTimeInterface) {
             $value = 'Date(' . (int) $value->getTimestamp() . '000)';
         }
     }
diff --git a/engine/Library/Enlight/Controller/Plugins/JsonRequest/Bootstrap.php b/engine/Library/Enlight/Controller/Plugins/JsonRequest/Bootstrap.php
index 19daca2c475..4467df990b9 100644
--- a/engine/Library/Enlight/Controller/Plugins/JsonRequest/Bootstrap.php
+++ b/engine/Library/Enlight/Controller/Plugins/JsonRequest/Bootstrap.php
@@ -35,7 +35,7 @@
 class Enlight_Controller_Plugins_JsonRequest_Bootstrap extends Enlight_Plugin_Bootstrap_Default
 {
     /**
-     * @var bool
+     * @var string|null
      */
     protected $padding;
 
@@ -51,6 +51,8 @@ class Enlight_Controller_Plugins_JsonRequest_Bootstrap extends Enlight_Plugin_Bo
 
     /**
      * Init this plugin. This Plugin should run before the dispatching process.
+     *
+     * @return void
      */
     public function init()
     {
@@ -67,7 +69,7 @@ public function init()
      * Called from the event manager before the dispatch process.
      * Parse the json input data, when it was activated.
      *
-     * @return bool
+     * @return void
      */
     public function onPreDispatch(Enlight_Event_EventArgs $args)
     {
@@ -76,13 +78,15 @@ public function onPreDispatch(Enlight_Event_EventArgs $args)
         $request = $subject->Request();
 
         // Parses the json input data, if the content type is correct
+        $contentType = $request->getHeader('Content-Type');
+        $input = $request->getRawBody();
         if (
             $this->parseInput === true
-            && ($contentType = $request->getHeader('Content-Type')) !== false
-            && strpos($contentType, 'application/json') === 0
-            && ($input = $request->getRawBody()) !== false
+            && \is_string($contentType)
+            && str_starts_with($contentType, 'application/json')
+            && \is_string($input)
         ) {
-            if ($input != '') {
+            if ($input !== '') {
                 $input = Zend_Json::decode($input);
             } else {
                 $input = null;
@@ -102,7 +106,8 @@ public function onPreDispatch(Enlight_Event_EventArgs $args)
         // Parse the json Params
         if (\count($this->parseParams)) {
             foreach ($this->parseParams as $Param) {
-                if (($value = $request->getParam($Param)) !== null) {
+                $value = $request->getParam($Param);
+                if ($value !== null) {
                     $value = Zend_Json::decode($value);
                     $request->setParam($Param, $value);
                 }
@@ -121,7 +126,7 @@ public function onPreDispatch(Enlight_Event_EventArgs $args)
      *
      * @param bool $parseInput
      *
-     * @return Enlight_Controller_Plugins_JsonRequest_Bootstrap
+     * @return $this
      */
     public function setParseInput($parseInput = true)
     {
@@ -136,7 +141,7 @@ public function setParseInput($parseInput = true)
      *
      * @param array $parseParams
      *
-     * @return Enlight_Controller_Plugins_JsonRequest_Bootstrap
+     * @return $this
      */
     public function setParseParams($parseParams = [])
     {
@@ -145,11 +150,12 @@ public function setParseParams($parseParams = [])
         return $this;
     }
 
-    /*
-    * @param bool $padding
-    * @return Enlight_Controller_Plugins_Json_Bootstrap
-    */
-    public function setPadding($padding = true)
+    /**
+     * @param string $padding
+     *
+     * @return $this
+     */
+    public function setPadding($padding = '1')
     {
         $this->padding = $padding;
 
@@ -159,7 +165,7 @@ public function setPadding($padding = true)
     /**
      * Returns the Value set by setPadding()
      *
-     * @return string
+     * @return string|null
      */
     public function getPadding()
     {
diff --git a/engine/Library/Enlight/Controller/Plugins/ScriptRenderer/Bootstrap.php b/engine/Library/Enlight/Controller/Plugins/ScriptRenderer/Bootstrap.php
index 7a9d872486a..1bf491ea603 100644
--- a/engine/Library/Enlight/Controller/Plugins/ScriptRenderer/Bootstrap.php
+++ b/engine/Library/Enlight/Controller/Plugins/ScriptRenderer/Bootstrap.php
@@ -34,7 +34,7 @@ class Enlight_Controller_Plugins_ScriptRenderer_Bootstrap extends Enlight_Plugin
     /**
      * @var string used when no file parameter is given
      */
-    protected $defaultFile = null;
+    protected $defaultFile;
 
     /**
      * @var array will be set in the response instance on pre dispatch
@@ -144,16 +144,22 @@ public function getTemplateName()
         $fileNames = (array) $request->getParam('file', $this->defaultFile);
         if (empty($fileNames)) {
             $fileNames = $request->getParam('f');
-            $fileNames = explode('|', $fileNames);
+            $fileNames = explode('|', (string) $fileNames);
         }
 
         $templateNames = [];
         foreach ($fileNames as $fileName) {
             // Remove unwanted characters
             $fileName = preg_replace('/[^a-z0-9\/_-]/i', '', $fileName);
+            if (!\is_string($fileName)) {
+                continue;
+            }
 
             // Replace multiple forward slashes
             $fileName = preg_replace('#/+#', '/', $fileName);
+            if (!\is_string($fileName)) {
+                continue;
+            }
 
             // Remove leading and trailing forward slash
             $fileName = trim($fileName, '/');
@@ -189,10 +195,13 @@ public function getTemplateName()
      *
      * @return Enlight_Controller_Plugins_ScriptRenderer_Bootstrap
      */
-    public function setViewRenderer(Enlight_Controller_Plugins_ViewRenderer_Bootstrap $viewRenderer = null)
+    public function setViewRenderer(?Enlight_Controller_Plugins_ViewRenderer_Bootstrap $viewRenderer = null)
     {
         if ($viewRenderer === null) {
-            $viewRenderer = $this->Collection()->get('ViewRenderer');
+            $collection = $this->Collection();
+            if ($collection !== null) {
+                $viewRenderer = $collection->get('ViewRenderer');
+            }
         }
 
         $this->viewRenderer = $viewRenderer;
@@ -209,7 +218,7 @@ public function setViewRenderer(Enlight_Controller_Plugins_ViewRenderer_Bootstra
      */
     private function inflectPath($module, $controller, $file)
     {
-        return sprintf(
+        return \sprintf(
             '%s/%s/%s.js',
             mb_strtolower($this->camelCaseToUnderScore($module)),
             mb_strtolower($this->camelCaseToUnderScore($controller)),
diff --git a/engine/Library/Enlight/Controller/Plugins/ViewRenderer/Bootstrap.php b/engine/Library/Enlight/Controller/Plugins/ViewRenderer/Bootstrap.php
index e85d1a8515d..34ca013da06 100644
--- a/engine/Library/Enlight/Controller/Plugins/ViewRenderer/Bootstrap.php
+++ b/engine/Library/Enlight/Controller/Plugins/ViewRenderer/Bootstrap.php
@@ -103,7 +103,7 @@ public function init()
      * The Enlight_Controller_Front and the Enlight_Template_Manager are set from the
      * passed Enlight_Event_EventArgs into the internal properties front and engine.
      *
-     * @return
+     * @return void
      */
     public function onDispatchLoopStartup(Enlight_Event_EventArgs $args)
     {
@@ -304,7 +304,7 @@ public function getTemplateName()
     protected function initEngine()
     {
         if ($this->engine === null) {
-            $this->engine = Shopware()->Container()->get(\Enlight_Template_Manager::class);
+            $this->engine = Shopware()->Container()->get(Enlight_Template_Manager::class);
         }
     }
 
diff --git a/engine/Library/Enlight/Controller/Request/Request.php b/engine/Library/Enlight/Controller/Request/Request.php
index 5a027e4faee..5f08647c229 100644
--- a/engine/Library/Enlight/Controller/Request/Request.php
+++ b/engine/Library/Enlight/Controller/Request/Request.php
@@ -39,7 +39,7 @@ public function __get($key);
      *
      * @param string $key
      *
-     * @throws \Exception
+     * @throws Exception
      */
     public function __set($key, $value);
 
@@ -626,9 +626,9 @@ public function setRequestUri($requestUri = null);
      *
      * @param string $header HTTP header name
      *
-     * @throws \Exception
+     * @throws Exception
      *
-     * @return string|false HTTP header value, or false if not found
+     * @return string|false|null HTTP header value, or false if not found
      */
     public function getHeader($header);
 
diff --git a/engine/Library/Enlight/Controller/Request/RequestHttp.php b/engine/Library/Enlight/Controller/Request/RequestHttp.php
index b7415dafabe..41030c24cad 100644
--- a/engine/Library/Enlight/Controller/Request/RequestHttp.php
+++ b/engine/Library/Enlight/Controller/Request/RequestHttp.php
@@ -17,6 +17,7 @@
  * @license    http://enlight.de/license     New BSD License
  */
 
+use Shopware\Components\DispatchFormatHelper;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -100,7 +101,7 @@ class Enlight_Controller_Request_RequestHttp extends Request implements Enlight_
     protected $_params = [];
 
     /**
-     * @var \Shopware\Components\DispatchFormatHelper
+     * @var DispatchFormatHelper
      */
     private $nameFormatter;
 
@@ -129,7 +130,7 @@ public function __isset($key)
     }
 
     /**
-     * @return \Shopware\Components\DispatchFormatHelper
+     * @return DispatchFormatHelper
      */
     public function getNameFormatter()
     {
@@ -643,7 +644,7 @@ public function setRequestUri($requestUri = null)
                 parse_str($query, $result);
 
                 foreach ($result as $key => $value) {
-                    $this->setQuery($key, $value);
+                    $this->setQuery((string) $key, $value);
                 }
             }
 
@@ -724,7 +725,7 @@ public function setPathInfo($pathInfo = null)
      */
     public function setParamSources(array $paramSources = [])
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         return $this;
     }
@@ -734,7 +735,7 @@ public function setParamSources(array $paramSources = [])
      */
     public function getParamSources()
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         return ['_GET', '_POST'];
     }
@@ -840,10 +841,10 @@ public function isOptions()
      */
     public function isFlashRequest()
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         $userAgent = $this->getHeader('USER_AGENT');
-        if ($userAgent === false) {
+        if (empty($userAgent)) {
             return false;
         }
         $header = strtolower($userAgent);
@@ -869,7 +870,7 @@ public function getHeader($header)
             return $this->server->get('HTTP_' . $temp);
         }
 
-        if (strpos($temp, 'CONTENT_') === 0 && $this->server->has($temp)) {
+        if (str_starts_with($temp, 'CONTENT_') && $this->server->has($temp)) {
             return $this->server->get($temp);
         }
 
diff --git a/engine/Library/Enlight/Controller/Request/RequestTestCase.php b/engine/Library/Enlight/Controller/Request/RequestTestCase.php
index 38c408227d0..373c107f93e 100644
--- a/engine/Library/Enlight/Controller/Request/RequestTestCase.php
+++ b/engine/Library/Enlight/Controller/Request/RequestTestCase.php
@@ -187,7 +187,7 @@ public function setMethod($type)
     {
         $type = strtoupper(trim((string) $type));
         if (!\in_array($type, $this->_validMethodTypes, true)) {
-            throw new \Exception('Invalid request method specified');
+            throw new Exception('Invalid request method specified');
         }
 
         $this->method = $type;
@@ -354,9 +354,13 @@ public function getServer($key = null, $default = null)
     {
         if ($key === null) {
             return array_merge($_SERVER, $this->_serverParams);
-        } elseif (isset($this->_serverParams[$key])) {
-            return $this->_serverParams[$key] !== null ? $this->_serverParams[$key] : $default;
-        } elseif ($this->server->has($key)) {
+        }
+
+        if (isset($this->_serverParams[$key])) {
+            return $this->_serverParams[$key] ?: $default;
+        }
+
+        if ($this->server->has($key)) {
             return $this->server->get($key);
         }
 
diff --git a/engine/Library/Enlight/Controller/Response/Response.php b/engine/Library/Enlight/Controller/Response/Response.php
index fd3d689a3b2..1def792fc81 100644
--- a/engine/Library/Enlight/Controller/Response/Response.php
+++ b/engine/Library/Enlight/Controller/Response/Response.php
@@ -25,6 +25,8 @@ interface Enlight_Controller_Response_Response
     /**
      * Sets a cookie method
      *
+     * @see http://www.php.net/manual/de/function.setcookie.php
+     *
      * @param string $name
      * @param string $value
      * @param int    $expire
@@ -33,7 +35,7 @@ interface Enlight_Controller_Response_Response
      * @param bool   $secure
      * @param bool   $httpOnly
      *
-     * @return \Enlight_Controller_Response_Response* @see http://www.php.net/manual/de/function.setcookie.php
+     * @return Enlight_Controller_Response_Response
      */
     public function setCookie($name, $value = null, $expire = 0, $path = null, $domain = null, $secure = false, $httpOnly = false);
 
@@ -57,7 +59,7 @@ public function unsetExceptions();
      * @param string $value
      * @param bool   $replace
      *
-     * @return \Enlight_Controller_Response_Response
+     * @return Enlight_Controller_Response_Response
      */
     public function setHeader($name, $value, $replace = false);
 
@@ -70,7 +72,7 @@ public function setHeader($name, $value, $replace = false);
      * @param string $url
      * @param int    $code
      *
-     * @return \Enlight_Controller_Response_Response
+     * @return Enlight_Controller_Response_Response
      */
     public function setRedirect($url, $code = 302);
 
@@ -91,7 +93,7 @@ public function getHeaders();
     /**
      * Clear headers
      *
-     * @return \Enlight_Controller_Response_Response
+     * @return Enlight_Controller_Response_Response
      */
     public function clearHeaders();
 
@@ -100,14 +102,14 @@ public function clearHeaders();
      *
      * @param string $name
      *
-     * @return \Enlight_Controller_Response_Response
+     * @return Enlight_Controller_Response_Response
      */
     public function clearHeader($name);
 
     /**
      * Clear all headers, normal and raw
      *
-     * @return \Enlight_Controller_Response_Response
+     * @return Enlight_Controller_Response_Response
      */
     public function clearAllHeaders();
 
@@ -116,7 +118,7 @@ public function clearAllHeaders();
      *
      * @param int $code
      *
-     * @return \Enlight_Controller_Response_Response
+     * @return Enlight_Controller_Response_Response
      */
     public function setHttpResponseCode($code);
 
@@ -144,7 +146,7 @@ public function canSendHeaders($throw = false);
      * Sends any headers specified. If an {@link setHttpResponseCode() HTTP response code}
      * has been specified, it is sent with the first header.
      *
-     * @return \Enlight_Controller_Response_Response
+     * @return Enlight_Controller_Response_Response
      */
     public function sendHeaders();
 
@@ -159,7 +161,7 @@ public function sendHeaders();
      *
      * @param string|null $name
      *
-     * @return \Enlight_Controller_Response_Response
+     * @return Enlight_Controller_Response_Response
      */
     public function setBody($content, $name = null);
 
@@ -169,7 +171,7 @@ public function setBody($content, $name = null);
      * @param string      $content
      * @param string|null $name
      *
-     * @return \Enlight_Controller_Response_Response
+     * @return Enlight_Controller_Response_Response
      */
     public function appendBody($content, $name = null);
 
@@ -209,7 +211,7 @@ public function getBody($spec = false);
      * @param string $name
      * @param string $content
      *
-     * @return \Enlight_Controller_Response_Response
+     * @return Enlight_Controller_Response_Response
      */
     public function append($name, $content);
 
@@ -227,14 +229,14 @@ public function prepend($name, $content);
     /**
      * Register an exception with the response
      *
-     * @return \Enlight_Controller_Response_Response
+     * @return Enlight_Controller_Response_Response
      */
     public function setException(Exception $e);
 
     /**
      * Retrieve the exception stack
      *
-     * @return \Exception[]
+     * @return Exception[]
      */
     public function getException();
 
diff --git a/engine/Library/Enlight/Controller/Response/ResponseHttp.php b/engine/Library/Enlight/Controller/Response/ResponseHttp.php
index 5bbe319f67b..04212424744 100644
--- a/engine/Library/Enlight/Controller/Response/ResponseHttp.php
+++ b/engine/Library/Enlight/Controller/Response/ResponseHttp.php
@@ -220,7 +220,7 @@ public function setRawHeader($value)
         $parts = self::getRawHeaderParts($value);
 
         if (\count($parts) !== 2) {
-            throw new InvalidArgumentException(sprintf('Given Header "%s" is invalid', $value));
+            throw new InvalidArgumentException(\sprintf('Given Header "%s" is invalid', $value));
         }
 
         $this->headers->set($parts[0], $parts[1]);
@@ -340,7 +340,7 @@ public function clearBody($name = null)
         return true;
     }
 
-    public function isRedirect(string $location = null): bool
+    public function isRedirect(?string $location = null): bool
     {
         return \in_array($this->statusCode, [self::HTTP_MOVED_PERMANENTLY, self::HTTP_FOUND, self::HTTP_SEE_OTHER, self::HTTP_TEMPORARY_REDIRECT, self::HTTP_PERMANENTLY_REDIRECT]) && ($location === null ?: $location == $this->headers->get('Location'));
     }
diff --git a/engine/Library/Enlight/Event/EventManager.php b/engine/Library/Enlight/Event/EventManager.php
index ee4ccefe36b..f5c5f9df291 100644
--- a/engine/Library/Enlight/Event/EventManager.php
+++ b/engine/Library/Enlight/Event/EventManager.php
@@ -70,7 +70,7 @@ public function addListener($eventName, $listener, $priority = 0)
             $priority = null;
         }
 
-        $handler = new \Enlight_Event_Handler_Default(
+        $handler = new Enlight_Event_Handler_Default(
             $eventName,
             $listener,
             $priority
@@ -306,7 +306,7 @@ public function filter($event, $value, $eventArgs = null)
      *
      * @throws Enlight_Event_Exception
      *
-     * @return ArrayCollection
+     * @return ArrayCollection<mixed>
      */
     public function collect($event, ArrayCollection $collection, $eventArgs = null)
     {
@@ -382,19 +382,21 @@ public function reset()
     }
 
     /**
-     * @param Enlight_Event_EventArgs|array|null $eventArgs
+     * @param Enlight_Event_EventArgs|array|mixed|null $eventArgs
      *
      * @throws Enlight_Event_Exception
-     *
-     * @return Enlight_Event_EventArgs
      */
-    private function buildEventArgs($eventArgs = null)
+    private function buildEventArgs($eventArgs = null): Enlight_Event_EventArgs
     {
         if (isset($eventArgs) && \is_array($eventArgs)) {
             return new Enlight_Event_EventArgs($eventArgs);
-        } elseif (!isset($eventArgs)) {
+        }
+
+        if (!isset($eventArgs)) {
             return new Enlight_Event_EventArgs();
-        } elseif (!$eventArgs instanceof Enlight_Event_EventArgs) {
+        }
+
+        if (!$eventArgs instanceof Enlight_Event_EventArgs) {
             throw new Enlight_Event_Exception('Parameter "eventArgs" must be an instance of "Enlight_Event_EventArgs"');
         }
 
diff --git a/engine/Library/Enlight/Event/Handler/Plugin.php b/engine/Library/Enlight/Event/Handler/Plugin.php
index 6efcfe8a72f..f279e7e3b82 100644
--- a/engine/Library/Enlight/Event/Handler/Plugin.php
+++ b/engine/Library/Enlight/Event/Handler/Plugin.php
@@ -42,6 +42,8 @@ class Enlight_Event_Handler_Plugin extends Enlight_Event_Handler
     protected $namespace;
 
     /**
+     * @deprecated Will be only `string` starting from Shopware 5.8
+     *
      * @var Enlight_Plugin_Bootstrap|string contains an instance
      *                                      of the Enlight_Plugin_Bootstrap or the plugin name
      */
@@ -51,11 +53,13 @@ class Enlight_Event_Handler_Plugin extends Enlight_Event_Handler
      * The Enlight_Event_Handler_Plugin class constructor expects the event name.
      * All parameters are set in the internal properties.
      *
-     * @param string                   $event
-     * @param Enlight_Plugin_Namespace $namespace
-     * @param Enlight_Plugin_Bootstrap $plugin
-     * @param string                   $listener
-     * @param int                      $position
+     * @deprecated The parameter $plugin will only accept `string` starting from Shopware 5.8
+     *
+     * @param string                          $event
+     * @param Enlight_Plugin_Namespace        $namespace
+     * @param Enlight_Plugin_Bootstrap|string $plugin
+     * @param string                          $listener
+     * @param int                             $position
      *
      * @throws Enlight_Event_Exception
      */
@@ -92,12 +96,19 @@ public function setPlugin($plugin)
      * Getter method for the internal plugin property. If the plugin property is a string,
      * enlight determines the plugin object over the namespace.
      *
-     * @return Enlight_Plugin_Bootstrap
+     * @return ?Enlight_Plugin_Bootstrap
      */
     public function Plugin()
     {
-        if (!$this->plugin instanceof Enlight_Plugin_Bootstrap) {
-            $plugin = $this->namespace->get($this->plugin);
+        // In the past always `null` was returned if $this->plugin was of instance `Enlight_Plugin_Bootstrap`
+        // therefore this bug is replicated here, can be removed once the type has been fixed to `string`
+        if ($this->plugin instanceof Enlight_Plugin_Bootstrap) {
+            return null;
+        }
+
+        $plugin = $this->namespace->get($this->plugin);
+        if (!$plugin instanceof Enlight_Plugin_Bootstrap) {
+            return null;
         }
 
         return $plugin;
@@ -145,10 +156,11 @@ public function setNamespace(Enlight_Plugin_Namespace $namespace)
     public function execute(Enlight_Event_EventArgs $args)
     {
         $plugin = $this->Plugin();
-        if (!method_exists($plugin, $this->listener)) {
+        if ($plugin === null || !method_exists($plugin, $this->listener)) {
             $name = $this->plugin instanceof Enlight_Plugin_Bootstrap ? $this->plugin->getName() : $this->plugin;
             trigger_error('Listener "' . $this->listener . '" in "' . $name . '" is not callable.', E_USER_ERROR);
-            //throw new Enlight_Exception('Listener "' . $this->listener . '" in "' . $name . '" is not callable.');
+
+            // throw new Enlight_Exception('Listener "' . $this->listener . '" in "' . $name . '" is not callable.');
             return;
         }
 
diff --git a/engine/Library/Enlight/Exception.php b/engine/Library/Enlight/Exception.php
index 8a254768ab5..0f052af9a46 100644
--- a/engine/Library/Enlight/Exception.php
+++ b/engine/Library/Enlight/Exception.php
@@ -54,7 +54,7 @@ class Enlight_Exception extends Exception
      * @param string $message
      * @param int    $code
      */
-    public function __construct($message = '', $code = 0, Exception $previous = null)
+    public function __construct($message = '', $code = 0, ?Exception $previous = null)
     {
         parent::__construct($message, $code, $previous);
 
diff --git a/engine/Library/Enlight/Hook/HookArgs.php b/engine/Library/Enlight/Hook/HookArgs.php
index 5dc54007eaf..b892bc0406b 100644
--- a/engine/Library/Enlight/Hook/HookArgs.php
+++ b/engine/Library/Enlight/Hook/HookArgs.php
@@ -75,7 +75,7 @@ public function getArgs()
     /**
      * Sets the given property to null.
      *
-     * @return \Enlight_Hook_HookArgs
+     * @return Enlight_Hook_HookArgs
      */
     public function remove($key)
     {
@@ -87,7 +87,7 @@ public function remove($key)
     /**
      * Default set function to set the value to the given property
      *
-     * @return \Enlight_Hook_HookArgs
+     * @return Enlight_Hook_HookArgs
      */
     public function set($key, $value)
     {
diff --git a/engine/Library/Enlight/Hook/HookManager.php b/engine/Library/Enlight/Hook/HookManager.php
index 57207c134c4..03bbc5758ed 100644
--- a/engine/Library/Enlight/Hook/HookManager.php
+++ b/engine/Library/Enlight/Hook/HookManager.php
@@ -42,7 +42,7 @@ class Enlight_Hook_HookManager extends Enlight_Class
     /**
      * @var Enlight_Hook_ProxyFactory|null instance of the Enlight_Hook_ProxyFactory
      */
-    protected $proxyFactory = null;
+    protected $proxyFactory;
 
     /**
      * @var array internal list of all registered hook aliases
@@ -64,11 +64,11 @@ public function __construct(Enlight_Event_EventManager $eventManager, Enlight_Lo
         $this->eventManager = $eventManager;
 
         if (!isset($options['proxyNamespace'])) {
-            throw new \Exception('proxyNamespace has to be set.');
+            throw new Exception('proxyNamespace has to be set.');
         }
 
         if (!isset($options['proxyDir'])) {
-            throw new \Exception('proxyDir has to be set.');
+            throw new Exception('proxyDir has to be set.');
         }
 
         $this->proxyFactory = new Enlight_Hook_ProxyFactory(
diff --git a/engine/Library/Enlight/Hook/ProxyFactory.php b/engine/Library/Enlight/Hook/ProxyFactory.php
index 91946b4a57b..f43a51eeb4a 100644
--- a/engine/Library/Enlight/Hook/ProxyFactory.php
+++ b/engine/Library/Enlight/Hook/ProxyFactory.php
@@ -77,10 +77,10 @@ public function __construct($hookManager, $proxyNamespace, $proxyDir)
 
         if (!is_dir($proxyDir)) {
             if (@mkdir($proxyDir, 0777, true) === false && !is_dir($proxyDir)) {
-                throw new \RuntimeException(sprintf("Unable to create the %s directory (%s)\n", 'Proxy', $proxyDir));
+                throw new RuntimeException(\sprintf("Unable to create the %s directory (%s)\n", 'Proxy', $proxyDir));
             }
         } elseif (!is_writable($proxyDir)) {
-            throw new \RuntimeException(sprintf("Unable to write in the %s directory (%s)\n", 'Proxy', $proxyDir));
+            throw new RuntimeException(\sprintf("Unable to write in the %s directory (%s)\n", 'Proxy', $proxyDir));
         }
 
         $proxyDir = rtrim((string) Enlight_Loader::realpath($proxyDir), '\\/') . DIRECTORY_SEPARATOR;
@@ -102,8 +102,8 @@ public function getProxy($class)
     {
         $classImplements = class_implements($class);
         if (!\is_array($classImplements) || !\in_array(Enlight_Hook::class, $classImplements, true)) {
-            trigger_error(sprintf('The class "%s" does not implement the Enlight_Hook Interface. It will be thrown in 5.8.', $class), E_USER_WARNING);
-            //throw new Enlight_Hook_Exception('The class' . $class . ' does not implement Enlight_Hook interface.');
+            trigger_error(\sprintf('The class "%s" does not implement the Enlight_Hook Interface. It will be thrown in 5.8.', $class), E_USER_WARNING);
+            // throw new Enlight_Hook_Exception('The class' . $class . ' does not implement Enlight_Hook interface.');
         }
 
         $proxyFile = $this->getProxyFileName($class);
@@ -112,11 +112,11 @@ public function getProxy($class)
         if (!is_readable($proxyFile)) {
             if (!file_exists($this->proxyDir)) {
                 if (!mkdir($concurrentDirectory = $this->proxyDir) && !is_dir($concurrentDirectory)) {
-                    throw new \RuntimeException(sprintf('Directory "%s" was not created', $concurrentDirectory));
+                    throw new RuntimeException(\sprintf('Directory "%s" was not created', $concurrentDirectory));
                 }
             }
             if (!is_writable($this->proxyDir)) {
-                throw new \RuntimeException(sprintf('The directory "%s" is not writable.', $this->proxyDir));
+                throw new RuntimeException(\sprintf('The directory "%s" is not writable.', $this->proxyDir));
             }
 
             $content = $this->generateProxyClass($class);
@@ -433,6 +433,6 @@ protected function writeProxyClass($fileName, $content)
             return;
         }
 
-        throw new Enlight_Exception(sprintf('Unable to write file "%s"', $fileName));
+        throw new Enlight_Exception(\sprintf('Unable to write file "%s"', $fileName));
     }
 }
diff --git a/engine/Library/Enlight/Loader.php b/engine/Library/Enlight/Loader.php
index 9faeed2a474..1c884d78265 100644
--- a/engine/Library/Enlight/Loader.php
+++ b/engine/Library/Enlight/Loader.php
@@ -80,7 +80,7 @@ public function __construct()
      */
     public function loadClass($class, $path = null)
     {
-        if (\is_array($class)) {
+        if (\is_array($class) && $class !== []) {
             return min(array_map([$this, __METHOD__], $class));
         }
         if (!\is_string($class)) {
diff --git a/engine/Library/Enlight/Plugin/Bootstrap.php b/engine/Library/Enlight/Plugin/Bootstrap.php
index 4754a66839b..ea28a96b27f 100644
--- a/engine/Library/Enlight/Plugin/Bootstrap.php
+++ b/engine/Library/Enlight/Plugin/Bootstrap.php
@@ -36,7 +36,7 @@ abstract class Enlight_Plugin_Bootstrap extends Enlight_Class
     protected $name;
 
     /**
-     * @var Enlight_Plugin_PluginCollection Contains an instance of the Enlight_Plugin_PluginCollection
+     * @var Enlight_Plugin_PluginCollection|null Contains an instance of the Enlight_Plugin_PluginCollection
      */
     protected $collection;
 
@@ -54,6 +54,8 @@ public function __construct($name)
 
     /**
      * Is executed after the collection has been added.
+     *
+     * @return void
      */
     public function afterInit()
     {
@@ -74,7 +76,7 @@ public function getName()
      *
      * @return Enlight_Plugin_Bootstrap
      */
-    public function setCollection(Enlight_Plugin_PluginCollection $collection = null)
+    public function setCollection(?Enlight_Plugin_PluginCollection $collection = null)
     {
         $this->collection = $collection;
         $this->afterInit();
@@ -85,7 +87,7 @@ public function setCollection(Enlight_Plugin_PluginCollection $collection = null
     /**
      * Getter method for the collection property.
      *
-     * @return Enlight_Plugin_PluginCollection
+     * @return Enlight_Plugin_PluginCollection|null
      */
     public function Collection()
     {
@@ -99,6 +101,10 @@ public function Collection()
      */
     public function Application()
     {
+        if (!$this->collection instanceof Enlight_Plugin_PluginCollection) {
+            throw new RuntimeException('Could not get "Application". Plugin collection is not set.');
+        }
+
         return $this->collection->Application();
     }
 
@@ -106,9 +112,15 @@ public function Application()
      * Get service from resource loader
      *
      * @param string $name
+     *
+     * @return mixed|object|null
      */
     public function get($name)
     {
+        if (!$this->collection instanceof Enlight_Plugin_PluginCollection) {
+            throw new RuntimeException(\sprintf('Could not get "%s". Plugin collection is not set.', $name));
+        }
+
         return $this->collection->Application()->Container()->get($name);
     }
 }
diff --git a/engine/Library/Enlight/Plugin/Namespace/Config.php b/engine/Library/Enlight/Plugin/Namespace/Config.php
index c98f08fafcd..aa7b5476639 100644
--- a/engine/Library/Enlight/Plugin/Namespace/Config.php
+++ b/engine/Library/Enlight/Plugin/Namespace/Config.php
@@ -64,7 +64,7 @@ public function __construct($name, $storage = null)
      * @param string $name
      * @param bool   $throwException
      *
-     * @return \Enlight_Plugin_Namespace_Config|\Enlight_Plugin_PluginCollection
+     * @return Enlight_Plugin_Namespace_Config|Enlight_Plugin_PluginCollection
      */
     public function load($name, $throwException = true)
     {
diff --git a/engine/Library/Enlight/Template/Manager.php b/engine/Library/Enlight/Template/Manager.php
index 01c5e4d3826..917d095b8a0 100644
--- a/engine/Library/Enlight/Template/Manager.php
+++ b/engine/Library/Enlight/Template/Manager.php
@@ -17,6 +17,8 @@
  * @license    http://enlight.de/license     New BSD License
  */
 
+use Shopware\Components\Theme;
+
 /**
  * The Enlight_Template_Manager is an extension of smarty to manually set the config in the class constructor.
  *
@@ -252,7 +254,7 @@ public function resolveTemplateDir($templateDir, $key = null)
     }
 
     /**
-     * @param \Enlight_Event_EventManager $eventManager
+     * @param Enlight_Event_EventManager $eventManager
      *
      * @return Enlight_Template_Manager
      */
@@ -302,7 +304,7 @@ public function buildInheritance($themeDirectories, $pluginDirs)
 
             $class = '\\Shopware\\Themes\\' . $name . '\\Theme';
 
-            /** @var \Shopware\Components\Theme $theme */
+            /** @var Theme $theme */
             $theme = new $class();
 
             if ($theme->injectBeforePlugins()) {
diff --git a/engine/Library/Enlight/Template/Plugins/compiler.media.php b/engine/Library/Enlight/Template/Plugins/compiler.media.php
index 116219b3836..d52b6b8bd6f 100644
--- a/engine/Library/Enlight/Template/Plugins/compiler.media.php
+++ b/engine/Library/Enlight/Template/Plugins/compiler.media.php
@@ -17,6 +17,8 @@
  * @license    http://enlight.de/license     New BSD License
  */
 
+use Shopware\Bundle\MediaBundle\MediaServiceInterface;
+
 /**
  * Build an full qualified image url based on the virtual path
  *
@@ -40,7 +42,7 @@ class Smarty_Compiler_Media extends Smarty_Internal_CompileBase
     public function parseAttributes(array $attributes)
     {
         if (!empty($attributes['path'])) {
-            $mediaService = Shopware()->Container()->get(\Shopware\Bundle\MediaBundle\MediaServiceInterface::class);
+            $mediaService = Shopware()->Container()->get(MediaServiceInterface::class);
             $attributes['path'] = trim($attributes['path'], '"\'');
             $attributes['path'] = $mediaService->getUrl($attributes['path']);
         }
@@ -70,6 +72,6 @@ public function compile($args, $compiler)
         }
 
         return '<?php '
-             . 'echo Shopware()->Container()->get(\'' . \Shopware\Bundle\MediaBundle\MediaServiceInterface::class . '\')->getUrl(' . $_attr['path'] . '); ?>';
+             . 'echo Shopware()->Container()->get(\'' . MediaServiceInterface::class . '\')->getUrl(' . $_attr['path'] . '); ?>';
     }
 }
diff --git a/engine/Library/Enlight/Template/Plugins/compiler.url.php b/engine/Library/Enlight/Template/Plugins/compiler.url.php
index 2e85dad1d0d..347934c3306 100644
--- a/engine/Library/Enlight/Template/Plugins/compiler.url.php
+++ b/engine/Library/Enlight/Template/Plugins/compiler.url.php
@@ -84,7 +84,7 @@ public function compile($args, $compiler)
         }
 
         if (isset($extractParams) && empty($_attr)) {
-            return '<?php echo htmlspecialchars(Shopware()->Front()->Router()->assemble((array) ' . $extractParams . ')); ?>';
+            return '<?php echo htmlspecialchars(Shopware()->Front()->ensureRouter()->assemble((array) ' . $extractParams . ')); ?>';
         }
 
         $params = [];
@@ -96,15 +96,15 @@ public function compile($args, $compiler)
                 }
 
                 if (isset($extractParams)) {
-                    return '<?php echo htmlspecialchars(Shopware()->Front()->Router()->assemble(array(' . $params . ')+(array) ' . $extractParams . ')); ?>';
+                    return '<?php echo htmlspecialchars(Shopware()->Front()->ensureRouter()->assemble(array(' . $params . ')+(array) ' . $extractParams . ')); ?>';
                 }
 
-                return '<?php echo htmlspecialchars(Shopware()->Front()->Router()->assemble(array(' . $params . '))); ?>';
+                return '<?php echo htmlspecialchars(Shopware()->Front()->ensureRouter()->assemble(array(' . $params . '))); ?>';
             }
             $params[$index] = is_numeric($param) ? $param : substr($param, 1, -1);
         }
 
-        $url = Shopware()->Front()->Router()->assemble($params);
+        $url = Shopware()->Front()->ensureRouter()->assemble($params);
 
         return '<?php echo ' . var_export(htmlspecialchars($url), true) . ';?>';
     }
diff --git a/engine/Library/Enlight/Template/Plugins/function.action.php b/engine/Library/Enlight/Template/Plugins/function.action.php
index b54c62f0ad4..a0c5ee5b305 100644
--- a/engine/Library/Enlight/Template/Plugins/function.action.php
+++ b/engine/Library/Enlight/Template/Plugins/function.action.php
@@ -53,7 +53,6 @@ function smarty_function_action($params, Enlight_Template_Default $template)
 
     $params = array_merge($userParams, $params);
 
-    /** @var \Shopware_Plugins_Core_HttpCache_Bootstrap $httpCache */
     $httpCache = Shopware()->Plugins()->Core()->HttpCache();
     if ($esiTag = $httpCache->renderEsiTag($request, $params)) {
         return $esiTag;
diff --git a/engine/Library/Enlight/Template/Plugins/function.compileJavascript.php b/engine/Library/Enlight/Template/Plugins/function.compileJavascript.php
index 656154151f5..01518daf301 100644
--- a/engine/Library/Enlight/Template/Plugins/function.compileJavascript.php
+++ b/engine/Library/Enlight/Template/Plugins/function.compileJavascript.php
@@ -17,6 +17,11 @@
  * @license    http://enlight.de/license     New BSD License
  */
 
+use Doctrine\ORM\AbstractQuery;
+use Shopware\Components\Theme\PathResolver;
+use Shopware\Components\Theme\Service;
+use Shopware\Models\Theme\Settings;
+
 /**
  * @param string $template
  *
@@ -27,15 +32,13 @@ function smarty_function_compileJavascript(array $params, $template)
     $time = $params['timestamp'];
     $output = $params['output'];
 
-    /** @var \Shopware\Components\Theme\PathResolver $pathResolver */
-    $pathResolver = Shopware()->Container()->get(\Shopware\Components\Theme\PathResolver::class);
+    $pathResolver = Shopware()->Container()->get(PathResolver::class);
 
-    /** @var \Shopware\Models\Shop\Shop $shop */
     $shop = Shopware()->Container()->get('shop');
 
-    /** @var \Shopware\Models\Theme\Settings $settings */
-    $settings = Shopware()->Container()->get(\Shopware\Components\Theme\Service::class)->getSystemConfiguration(
-        \Doctrine\ORM\AbstractQuery::HYDRATE_OBJECT
+    /** @var Settings $settings */
+    $settings = Shopware()->Container()->get(Service::class)->getSystemConfiguration(
+        AbstractQuery::HYDRATE_OBJECT
     );
 
     $file = $pathResolver->getJsFilePath($shop, $time);
@@ -48,7 +51,6 @@ function smarty_function_compileJavascript(array $params, $template)
         return;
     }
 
-    /** @var \Shopware\Components\Theme\Compiler $compiler */
     $compiler = Shopware()->Container()->get('theme_compiler');
     $compiler->compileJavascript($time, $shop->getTemplate(), $shop);
     $template->assign($output, [$url]);
diff --git a/engine/Library/Enlight/Template/Plugins/function.compileLess.php b/engine/Library/Enlight/Template/Plugins/function.compileLess.php
index 19db17a1c43..229b9514a40 100644
--- a/engine/Library/Enlight/Template/Plugins/function.compileLess.php
+++ b/engine/Library/Enlight/Template/Plugins/function.compileLess.php
@@ -17,6 +17,11 @@
  * @license    http://enlight.de/license     New BSD License
  */
 
+use Doctrine\ORM\AbstractQuery;
+use Shopware\Components\Theme\PathResolver;
+use Shopware\Components\Theme\Service;
+use Shopware\Models\Theme\Settings;
+
 /**
  * @param array $params
  * @param array $template
@@ -28,15 +33,13 @@ function smarty_function_compileLess($params, $template)
     $time = $params['timestamp'];
     $output = $params['output'];
 
-    /** @var \Shopware\Components\Theme\PathResolver $pathResolver */
-    $pathResolver = Shopware()->Container()->get(\Shopware\Components\Theme\PathResolver::class);
+    $pathResolver = Shopware()->Container()->get(PathResolver::class);
 
-    /** @var \Shopware\Models\Shop\Shop $shop */
     $shop = Shopware()->Container()->get('shop');
 
-    /** @var \Shopware\Models\Theme\Settings $settings */
-    $settings = Shopware()->Container()->get(\Shopware\Components\Theme\Service::class)->getSystemConfiguration(
-        \Doctrine\ORM\AbstractQuery::HYDRATE_OBJECT
+    /** @var Settings $settings */
+    $settings = Shopware()->Container()->get(Service::class)->getSystemConfiguration(
+        AbstractQuery::HYDRATE_OBJECT
     );
 
     $file = $pathResolver->getCssFilePath($shop, $time);
@@ -49,7 +52,6 @@ function smarty_function_compileLess($params, $template)
         return;
     }
 
-    /** @var \Shopware\Components\Theme\Compiler $compiler */
     $compiler = Shopware()->Container()->get('theme_compiler');
     $compiler->compileLess($time, $shop->getTemplate(), $shop);
     $template->assign($output, [$url]);
diff --git a/engine/Library/Enlight/Template/Plugins/function.getSalutations.php b/engine/Library/Enlight/Template/Plugins/function.getSalutations.php
index cc9b69f187e..2f028b49236 100644
--- a/engine/Library/Enlight/Template/Plugins/function.getSalutations.php
+++ b/engine/Library/Enlight/Template/Plugins/function.getSalutations.php
@@ -25,7 +25,7 @@
  */
 function smarty_function_getSalutations($params, $smarty)
 {
-    $config = Shopware()->Container()->get(\Shopware_Components_Config::class);
+    $config = Shopware()->Container()->get(Shopware_Components_Config::class);
     $salutations = $config->get('shopsalutations');
     $salutations = explode(',', $salutations);
 
diff --git a/engine/Library/Enlight/Template/Plugins/function.themeTimestamp.php b/engine/Library/Enlight/Template/Plugins/function.themeTimestamp.php
index 341a5828ba7..fa553a0a8cc 100644
--- a/engine/Library/Enlight/Template/Plugins/function.themeTimestamp.php
+++ b/engine/Library/Enlight/Template/Plugins/function.themeTimestamp.php
@@ -17,13 +17,15 @@
  * @license    http://enlight.de/license     New BSD License
  */
 
+use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface;
+
 /**
  * Returns the current time measured in the number of seconds
  * since the Unix Epoch (January 1 1970 00:00:00 GMT).
  */
 function smarty_function_themeTimestamp($params, $template)
 {
-    $context = Shopware()->Container()->get(\Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface::class)->getShopContext();
+    $context = Shopware()->Container()->get(ContextServiceInterface::class)->getShopContext();
     $shopId = $context->getShop()->getParentId();
 
     return Shopware()->Container()->get('theme_timestamp_persistor')->getCurrentTimestamp($shopId);
diff --git a/engine/Library/Enlight/Template/Plugins/modifier.count.php b/engine/Library/Enlight/Template/Plugins/modifier.count.php
index 1670aae1990..40566a7f0c9 100644
--- a/engine/Library/Enlight/Template/Plugins/modifier.count.php
+++ b/engine/Library/Enlight/Template/Plugins/modifier.count.php
@@ -19,14 +19,13 @@
 
 /**
  * Overwrites the default smarty count modifier for PHP8 compatibility reasons
+ *
+ * @param mixed|null $value
+ *
+ * @return int
  */
 function smarty_modifier_count($value)
 {
-    // PHP version is below 8.0.0, use default behavior
-    if (\PHP_VERSION_ID < 80000) {
-        return \count($value);
-    }
-
     // Neither a countable object nor an array
     if (!\is_array($value) && !($value instanceof Countable)) {
         return 0;
diff --git a/engine/Library/Enlight/Template/Plugins/modifier.currency.php b/engine/Library/Enlight/Template/Plugins/modifier.currency.php
index 77f3fa9f92b..b3baea6dea0 100644
--- a/engine/Library/Enlight/Template/Plugins/modifier.currency.php
+++ b/engine/Library/Enlight/Template/Plugins/modifier.currency.php
@@ -22,9 +22,9 @@
  *
  * @see http://framework.zend.com/manual/de/zend.currency.options.html
  *
- * @param float        $value    Value can have a coma as a decimal separator
- * @param array|string $config
- * @param string       $position where the currency symbol should be displayed
+ * @param float|string                $value    Value can have a coma as a decimal separator
+ * @param array<string, mixed>|string $config
+ * @param string|null                 $position where the currency symbol should be displayed
  *
  * @return string
  */
@@ -49,9 +49,8 @@ function smarty_modifier_currency($value, $config = null, $position = null)
     }
 
     $currency = Shopware()->Container()->get('currency');
-    $formattedValue = (float) str_replace(',', '.', $value);
+    $formattedValue = (float) str_replace(',', '.', (string) $value);
     $formattedValue = $currency->toCurrency($formattedValue, $config);
-    $formattedValue = mb_convert_encoding($formattedValue, 'HTML-ENTITIES', 'UTF-8');
 
     return htmlentities($formattedValue, ENT_COMPAT, 'UTF-8', false);
 }
diff --git a/engine/Library/Enlight/Template/Plugins/modifier.date.php b/engine/Library/Enlight/Template/Plugins/modifier.date.php
index dc009edd549..76bc7b6123e 100644
--- a/engine/Library/Enlight/Template/Plugins/modifier.date.php
+++ b/engine/Library/Enlight/Template/Plugins/modifier.date.php
@@ -52,7 +52,7 @@ function smarty_modifier_date($value, $format = null, $type = null)
     if (\is_string($value)) {
         $value = strtotime($value);
     } elseif ($value instanceof DateTime) {
-        /** @var \DateTime $value */
+        /** @var DateTime $value */
         $value = $value->getTimestamp();
     }
 
diff --git a/engine/Library/Enlight/Template/Plugins/modifier.fill.php b/engine/Library/Enlight/Template/Plugins/modifier.fill.php
index 3442f59248c..bc98cbc0426 100644
--- a/engine/Library/Enlight/Template/Plugins/modifier.fill.php
+++ b/engine/Library/Enlight/Template/Plugins/modifier.fill.php
@@ -32,10 +32,10 @@ function smarty_modifier_fill($str, $width = 10, $break = '...', $fill = ' ')
 {
     // checks if we have either a integer, float, sting or boolean value
     // If we don't get what we expected, we use some default values
-    if (!is_scalar($break)) {
+    if (!\is_scalar($break)) {
         $break = '...';
     }
-    if (empty($fill) || !is_scalar($fill)) {
+    if (empty($fill) || !\is_scalar($fill)) {
         $fill = ' ';
     }
     if (empty($width) || !is_numeric($width)) {
@@ -44,7 +44,7 @@ function smarty_modifier_fill($str, $width = 10, $break = '...', $fill = ' ')
         $width = (int) $width;
     }
     // if no string is given, just build one string containing the fill pattern
-    if (!is_scalar($str)) {
+    if (!\is_scalar($str)) {
         return str_repeat($fill, $width);
     }
     // If the string longer than the given width shorten the string and append the break pattern
diff --git a/engine/Library/Enlight/Template/Plugins/modifier.padding.php b/engine/Library/Enlight/Template/Plugins/modifier.padding.php
index 67e8f6686e9..ce2fa684f61 100644
--- a/engine/Library/Enlight/Template/Plugins/modifier.padding.php
+++ b/engine/Library/Enlight/Template/Plugins/modifier.padding.php
@@ -32,10 +32,10 @@ function smarty_modifier_padding($str, $width = 10, $break = '...', $fill = ' ')
 {
     // checks if we have either a integer, float, sting or boolean value
     // If we don't get what we expected, we use some default values
-    if (!is_scalar($break)) {
+    if (!\is_scalar($break)) {
         $break = '...';
     }
-    if (empty($fill) || !is_scalar($fill)) {
+    if (empty($fill) || !\is_scalar($fill)) {
         $fill = ' ';
     }
     if (empty($width) || !is_numeric($width)) {
@@ -44,7 +44,7 @@ function smarty_modifier_padding($str, $width = 10, $break = '...', $fill = ' ')
         $width = (int) $width;
     }
     // if no string is given, just build one string containing the fill pattern
-    if (!is_scalar($str)) {
+    if (!\is_scalar($str)) {
         return str_repeat($fill, $width);
     }
     // If the string longer than the given width shorten the string and append the break pattern
diff --git a/engine/Library/Enlight/Template/Plugins/modifier.tax.php b/engine/Library/Enlight/Template/Plugins/modifier.tax.php
index abfec44ea4b..61923dc0c11 100644
--- a/engine/Library/Enlight/Template/Plugins/modifier.tax.php
+++ b/engine/Library/Enlight/Template/Plugins/modifier.tax.php
@@ -26,7 +26,7 @@
 function smarty_modifier_tax($value, $locale = null)
 {
     if (!is_numeric($value)) {
-        throw new InvalidArgumentException(sprintf('Input %s must be numeric.', (string) $value));
+        throw new InvalidArgumentException(\sprintf('Input %s must be numeric.', (string) $value));
     }
 
     $format['precision'] = 2;
diff --git a/engine/Library/Enlight/Template/Plugins/resource.parent.php b/engine/Library/Enlight/Template/Plugins/resource.parent.php
index 6fd6a08484f..cd3cd5033d0 100644
--- a/engine/Library/Enlight/Template/Plugins/resource.parent.php
+++ b/engine/Library/Enlight/Template/Plugins/resource.parent.php
@@ -30,7 +30,7 @@ class Smarty_Resource_Parent extends Smarty_Internal_Resource_File
      * @param Smarty_Template_Source   $source    source object
      * @param Smarty_Internal_Template $_template template object
      */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
+    public function populate(Smarty_Template_Source $source, ?Smarty_Internal_Template $_template = null)
     {
         $filePath = $this->buildFilepath($source, $_template);
         $s = Smarty_Resource::source(null, $source->smarty, $filePath);
@@ -69,7 +69,7 @@ public function getContent(Smarty_Template_Source $source)
      *
      * @return string fully qualified filepath
      */
-    protected function buildFilepath(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
+    protected function buildFilepath(Smarty_Template_Source $source, ?Smarty_Internal_Template $_template = null)
     {
         ++$this->index;
         $file = $source->name;
diff --git a/engine/Library/Enlight/View/Default.php b/engine/Library/Enlight/View/Default.php
index 7dc52531f76..23b1d2cfd4e 100644
--- a/engine/Library/Enlight/View/Default.php
+++ b/engine/Library/Enlight/View/Default.php
@@ -124,11 +124,9 @@ public function addTemplateDir($templateDir, $key = null)
     /**
      * Sets the current template instance into the internal property.
      *
-     * @param Enlight_Template_Default $template
-     *
      * @return Enlight_View_Default
      */
-    public function setTemplate(Enlight_Template_Default $template = null)
+    public function setTemplate(?Enlight_Template_Default $template = null)
     {
         $this->template = $template;
 
@@ -224,7 +222,7 @@ public function templateExists($template_name)
      * @param bool|null    $nocache
      * @param int|null     $scope
      *
-     * @return \Enlight_View|\Enlight_View_Default
+     * @return Enlight_View|Enlight_View_Default
      */
     public function assign($spec, $value = null, $nocache = null, $scope = null)
     {
diff --git a/engine/Library/ExtJs/components/Enlight.app.Controller.js b/engine/Library/ExtJs/components/Enlight.app.Controller.js
index b60db8520ae..b9ab8767e9d 100644
--- a/engine/Library/ExtJs/components/Enlight.app.Controller.js
+++ b/engine/Library/ExtJs/components/Enlight.app.Controller.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/engine/Library/ExtJs/components/Enlight.app.SubApplication.js b/engine/Library/ExtJs/components/Enlight.app.SubApplication.js
index 92bf5071ed2..eef6730251e 100644
--- a/engine/Library/ExtJs/components/Enlight.app.SubApplication.js
+++ b/engine/Library/ExtJs/components/Enlight.app.SubApplication.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/engine/Library/ExtJs/components/Enlight.app.SubWindow.js b/engine/Library/ExtJs/components/Enlight.app.SubWindow.js
index 755540e0cbb..ac422287958 100644
--- a/engine/Library/ExtJs/components/Enlight.app.SubWindow.js
+++ b/engine/Library/ExtJs/components/Enlight.app.SubWindow.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/engine/Library/ExtJs/components/Enlight.app.Window.js b/engine/Library/ExtJs/components/Enlight.app.Window.js
index f11b58e74e9..760e65b3e2d 100644
--- a/engine/Library/ExtJs/components/Enlight.app.Window.js
+++ b/engine/Library/ExtJs/components/Enlight.app.Window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/engine/Library/ExtJs/components/Enlight.app.WindowManagement.js b/engine/Library/ExtJs/components/Enlight.app.WindowManagement.js
index 603bfe495b9..995e99071db 100644
--- a/engine/Library/ExtJs/components/Enlight.app.WindowManagement.js
+++ b/engine/Library/ExtJs/components/Enlight.app.WindowManagement.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/engine/Library/ExtJs/components/Enlight.form.mixin.HelpSupportElements.js b/engine/Library/ExtJs/components/Enlight.form.mixin.HelpSupportElements.js
index c2d95ad322c..2a6e54d814f 100644
--- a/engine/Library/ExtJs/components/Enlight.form.mixin.HelpSupportElements.js
+++ b/engine/Library/ExtJs/components/Enlight.form.mixin.HelpSupportElements.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/engine/Library/ExtJs/components/Ext.util.FileUpload.js b/engine/Library/ExtJs/components/Ext.util.FileUpload.js
index e5d52c81ba2..ac1c5296908 100644
--- a/engine/Library/ExtJs/components/Ext.util.FileUpload.js
+++ b/engine/Library/ExtJs/components/Ext.util.FileUpload.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
  /**
diff --git a/engine/Library/ExtJs/license.txt b/engine/Library/ExtJs/license.txt
index 2ff09c8ac5c..fbf9d60279c 100644
--- a/engine/Library/ExtJs/license.txt
+++ b/engine/Library/ExtJs/license.txt
@@ -7,9 +7,9 @@ http://www.sencha.com/license
 
 Open Source License
 ------------------------------------------------------------------------------------------
-This version of Ext JS is licensed under the terms of the Open Source GPL 3.0 license. 
+This version of Ext JS is licensed under the terms of the Open Source GPL 3.0 license.
 
-http://www.gnu.org/licenses/gpl.html
+https://www.gnu.org/licenses/gpl-3.0.html
 
 There are several FLOSS exceptions available for use with this release for
 open source applications that are distributed under a license other than GPL.
@@ -26,10 +26,12 @@ open source applications that are distributed under a license other than GPL.
 Alternate Licensing
 ------------------------------------------------------------------------------------------
 Commercial and OEM Licenses are available for an alternate download of Ext JS.
-This is the appropriate option if you are creating proprietary applications and you are 
-not prepared to distribute and share the source code of your application under the 
+This is the appropriate option if you are creating proprietary applications, and you are
+not prepared to distribute and share the source code of your application under the
 GPL v3 license. Please visit http://www.sencha.com/license for more details.
 
 --
 
-This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT OF THIRD-PARTY INTELLECTUAL PROPERTY RIGHTS.  See the GNU General Public License for more details.
\ No newline at end of file
+This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+without even the implied warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT OF THIRD-PARTY INTELLECTUAL PROPERTY RIGHTS.
+See the GNU General Public License for more details.
diff --git a/engine/Library/ExtJs/overrides/Ext.Ajax.js b/engine/Library/ExtJs/overrides/Ext.Ajax.js
index 261cb6aed7f..bb71e72c09c 100644
--- a/engine/Library/ExtJs/overrides/Ext.Ajax.js
+++ b/engine/Library/ExtJs/overrides/Ext.Ajax.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="extjs/overrides/ajax"}
@@ -160,4 +159,4 @@ Ext.CSRFService = (function() {
 
     return me;
 })();
-//{/block}
\ No newline at end of file
+//{/block}
diff --git a/engine/Library/ExtJs/overrides/Ext.Base.js b/engine/Library/ExtJs/overrides/Ext.Base.js
index 64401c7fcd2..0ab3835485d 100644
--- a/engine/Library/ExtJs/overrides/Ext.Base.js
+++ b/engine/Library/ExtJs/overrides/Ext.Base.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
@@ -163,4 +162,4 @@ Ext.onReady(function () {
         });
     }
 });
-//{/block}
\ No newline at end of file
+//{/block}
diff --git a/engine/Library/ExtJs/overrides/Ext.ClassManager.js b/engine/Library/ExtJs/overrides/Ext.ClassManager.js
index 2a095f6e0e6..c24237196d8 100644
--- a/engine/Library/ExtJs/overrides/Ext.ClassManager.js
+++ b/engine/Library/ExtJs/overrides/Ext.ClassManager.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="extjs/overrides/classManager"}
diff --git a/engine/Library/ExtJs/overrides/Ext.LoadMask.js b/engine/Library/ExtJs/overrides/Ext.LoadMask.js
index 0012fbf5334..18f74f31c01 100644
--- a/engine/Library/ExtJs/overrides/Ext.LoadMask.js
+++ b/engine/Library/ExtJs/overrides/Ext.LoadMask.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
@@ -146,4 +145,4 @@ Ext.define('Ext.LoadMask-Shopware', {
         return this.callParent(arguments);
     }
 });
-//{/block}
\ No newline at end of file
+//{/block}
diff --git a/engine/Library/ExtJs/overrides/Ext.Loader.js b/engine/Library/ExtJs/overrides/Ext.Loader.js
index 14a43cd02e3..7b3796d3a90 100644
--- a/engine/Library/ExtJs/overrides/Ext.Loader.js
+++ b/engine/Library/ExtJs/overrides/Ext.Loader.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
@@ -421,4 +420,4 @@
         return this;
     };
 })();
-//{/block}
\ No newline at end of file
+//{/block}
diff --git a/engine/Library/ExtJs/overrides/Ext.MessageBox.js b/engine/Library/ExtJs/overrides/Ext.MessageBox.js
index adf30b15911..255ae9e0637 100644
--- a/engine/Library/ExtJs/overrides/Ext.MessageBox.js
+++ b/engine/Library/ExtJs/overrides/Ext.MessageBox.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="extjs/overrides/messageBox"}
@@ -48,4 +47,4 @@ Ext.override(Ext.MessageBox, {
         me.callParent(arguments);
     }
 });
-//{/block}
\ No newline at end of file
+//{/block}
diff --git a/engine/Library/ExtJs/overrides/Ext.String.js b/engine/Library/ExtJs/overrides/Ext.String.js
index a2c1d202530..fec0c426157 100644
--- a/engine/Library/ExtJs/overrides/Ext.String.js
+++ b/engine/Library/ExtJs/overrides/Ext.String.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /** @lends Ext.String */
@@ -80,4 +79,4 @@ Ext.override(Ext.String, {
         return ret;
     }
 });
-//{/block}
\ No newline at end of file
+//{/block}
diff --git a/engine/Library/ExtJs/overrides/Ext.Template.js b/engine/Library/ExtJs/overrides/Ext.Template.js
index d038293c8a5..1633789ec7d 100644
--- a/engine/Library/ExtJs/overrides/Ext.Template.js
+++ b/engine/Library/ExtJs/overrides/Ext.Template.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
@@ -39,4 +38,4 @@ Ext.override(Ext.String, {
     }
 });
 //{/literal}
-//{/block}
\ No newline at end of file
+//{/block}
diff --git a/engine/Library/ExtJs/overrides/Ext.Timeout.js b/engine/Library/ExtJs/overrides/Ext.Timeout.js
index 5b689d3ed67..2e3a5c7fb1f 100644
--- a/engine/Library/ExtJs/overrides/Ext.Timeout.js
+++ b/engine/Library/ExtJs/overrides/Ext.Timeout.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="extjs/overrides/timeout"}
@@ -37,4 +36,4 @@ if (ajaxTimeout >= 6) {
         { timeout: Ext.Ajax.timeout }
     );
 }
-//{/block}
\ No newline at end of file
+//{/block}
diff --git a/engine/Library/ExtJs/overrides/Ext.app.Application.js b/engine/Library/ExtJs/overrides/Ext.app.Application.js
index 83707fe1239..6259b33ec0f 100644
--- a/engine/Library/ExtJs/overrides/Ext.app.Application.js
+++ b/engine/Library/ExtJs/overrides/Ext.app.Application.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/index/controller/main"}
diff --git a/engine/Library/ExtJs/overrides/Ext.app.Controller.js b/engine/Library/ExtJs/overrides/Ext.app.Controller.js
index 4068a420d19..8f6160ae50d 100644
--- a/engine/Library/ExtJs/overrides/Ext.app.Controller.js
+++ b/engine/Library/ExtJs/overrides/Ext.app.Controller.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
@@ -222,4 +221,4 @@ Ext.override(Ext.app.Controller, {
         return returnRef;
     }
 });
-//{/block}
\ No newline at end of file
+//{/block}
diff --git a/engine/Library/ExtJs/overrides/Ext.app.EventBus.js b/engine/Library/ExtJs/overrides/Ext.app.EventBus.js
index 1534db1b41d..7b0cba5ae93 100644
--- a/engine/Library/ExtJs/overrides/Ext.app.EventBus.js
+++ b/engine/Library/ExtJs/overrides/Ext.app.EventBus.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 /**
  * Ext.app.Eventbus - Override
@@ -146,4 +145,4 @@ Ext.override(Ext.app.EventBus, {
         });
     }
 });
-//{/block}
\ No newline at end of file
+//{/block}
diff --git a/engine/Library/ExtJs/overrides/Ext.button.Button.js b/engine/Library/ExtJs/overrides/Ext.button.Button.js
index 591524b0f29..f5ef485c0da 100644
--- a/engine/Library/ExtJs/overrides/Ext.button.Button.js
+++ b/engine/Library/ExtJs/overrides/Ext.button.Button.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
@@ -119,4 +118,4 @@ Ext.override(Ext.button.Button, {
         return me;
     }
 });
-//{/block}
\ No newline at end of file
+//{/block}
diff --git a/engine/Library/ExtJs/overrides/Ext.container.DockingContainer.js b/engine/Library/ExtJs/overrides/Ext.container.DockingContainer.js
index 72801cfec26..0a71fb87a36 100644
--- a/engine/Library/ExtJs/overrides/Ext.container.DockingContainer.js
+++ b/engine/Library/ExtJs/overrides/Ext.container.DockingContainer.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="extjs/overrides/dockingContainer"}
diff --git a/engine/Library/ExtJs/overrides/Ext.data.proxy.Server.js b/engine/Library/ExtJs/overrides/Ext.data.proxy.Server.js
index 482d0ade088..cc4bfd34fab 100644
--- a/engine/Library/ExtJs/overrides/Ext.data.proxy.Server.js
+++ b/engine/Library/ExtJs/overrides/Ext.data.proxy.Server.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="extjs/overrides/server"}
@@ -99,4 +98,4 @@ Ext.define('Ext.data.proxy.Server-Shopware', {
         return this.applyEncoding(min);
     }
 });
-//{/block}
\ No newline at end of file
+//{/block}
diff --git a/engine/Library/ExtJs/overrides/Ext.form.Field.js b/engine/Library/ExtJs/overrides/Ext.form.Field.js
index cef46508fa1..48a63470fde 100644
--- a/engine/Library/ExtJs/overrides/Ext.form.Field.js
+++ b/engine/Library/ExtJs/overrides/Ext.form.Field.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/engine/Library/ExtJs/overrides/Ext.form.field.ComboBox.js b/engine/Library/ExtJs/overrides/Ext.form.field.ComboBox.js
index cc117dcf92a..d5cb8487834 100644
--- a/engine/Library/ExtJs/overrides/Ext.form.field.ComboBox.js
+++ b/engine/Library/ExtJs/overrides/Ext.form.field.ComboBox.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
@@ -66,4 +65,4 @@ Ext.override(Ext.form.field.ComboBox,
         }
     }
 });
-//{/block}
\ No newline at end of file
+//{/block}
diff --git a/engine/Library/ExtJs/overrides/Ext.form.field.Display.js b/engine/Library/ExtJs/overrides/Ext.form.field.Display.js
index 8be4964800b..1d2d0a7b9e7 100644
--- a/engine/Library/ExtJs/overrides/Ext.form.field.Display.js
+++ b/engine/Library/ExtJs/overrides/Ext.form.field.Display.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="extjs/overrides/display"}
@@ -44,4 +43,4 @@ Ext.override(Ext.form.field.Display, {
         return value;
     }
 });
-//{/block}
\ No newline at end of file
+//{/block}
diff --git a/engine/Library/ExtJs/overrides/Ext.form.field.HtmlEditor.js b/engine/Library/ExtJs/overrides/Ext.form.field.HtmlEditor.js
index 6c93e64e566..3cf0da95e78 100644
--- a/engine/Library/ExtJs/overrides/Ext.form.field.HtmlEditor.js
+++ b/engine/Library/ExtJs/overrides/Ext.form.field.HtmlEditor.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
@@ -43,4 +42,4 @@ Ext.define('Enlight.form.field.HtmlEditor', {
 },
 function() {
     Ext.form.field.HtmlEditor.mixin('helpSupportElems', Enlight.form.mixin.HelpSupportElements);
-});
\ No newline at end of file
+});
diff --git a/engine/Library/ExtJs/overrides/Ext.form.field.Number.js b/engine/Library/ExtJs/overrides/Ext.form.field.Number.js
index 2cd74b960c5..3e130b5219a 100644
--- a/engine/Library/ExtJs/overrides/Ext.form.field.Number.js
+++ b/engine/Library/ExtJs/overrides/Ext.form.field.Number.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="extjs/overrides/number"}
@@ -27,4 +26,4 @@ Ext.override(Ext.form.field.Number,
 {
     submitLocaleSeparator: false
 });
-//{/block}
\ No newline at end of file
+//{/block}
diff --git a/engine/Library/ExtJs/overrides/Ext.form.field.Time.js b/engine/Library/ExtJs/overrides/Ext.form.field.Time.js
index 4a724d1861f..0e3239d5f8c 100644
--- a/engine/Library/ExtJs/overrides/Ext.form.field.Time.js
+++ b/engine/Library/ExtJs/overrides/Ext.form.field.Time.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
@@ -66,4 +65,4 @@ Ext.override(Ext.form.field.Time,
         return result;
     }
 });
-//{/block}
\ No newline at end of file
+//{/block}
diff --git a/engine/Library/ExtJs/overrides/Ext.grid.RowEditor.js b/engine/Library/ExtJs/overrides/Ext.grid.RowEditor.js
index bf5611131ce..20c1dc8f56a 100644
--- a/engine/Library/ExtJs/overrides/Ext.grid.RowEditor.js
+++ b/engine/Library/ExtJs/overrides/Ext.grid.RowEditor.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="extjs/overrides/rowEditor"}
@@ -123,4 +122,4 @@ Ext.override(Ext.grid.RowEditor, {
         }
     }
 });
-//{/block}
\ No newline at end of file
+//{/block}
diff --git a/engine/Library/ExtJs/overrides/Ext.grid.column.Action.js b/engine/Library/ExtJs/overrides/Ext.grid.column.Action.js
index 1d3342716bc..5992b6e97de 100644
--- a/engine/Library/ExtJs/overrides/Ext.grid.column.Action.js
+++ b/engine/Library/ExtJs/overrides/Ext.grid.column.Action.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
@@ -73,4 +72,4 @@ Ext.override(Ext.grid.column.Action, {
         };
     }
 });
-//{/block}
\ No newline at end of file
+//{/block}
diff --git a/engine/Library/ExtJs/overrides/Ext.grid.header.Container.js b/engine/Library/ExtJs/overrides/Ext.grid.header.Container.js
index 504591965eb..a1751575d72 100644
--- a/engine/Library/ExtJs/overrides/Ext.grid.header.Container.js
+++ b/engine/Library/ExtJs/overrides/Ext.grid.header.Container.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /** @lends Ext.grid.header.Container# */
@@ -92,4 +91,4 @@ Ext.override(Ext.grid.header.Container, {
         return obj;
     }
 });
-//{/block}
\ No newline at end of file
+//{/block}
diff --git a/engine/Library/ExtJs/overrides/Ext.menu.Menu.js b/engine/Library/ExtJs/overrides/Ext.menu.Menu.js
index 091d12754ba..4299201269b 100644
--- a/engine/Library/ExtJs/overrides/Ext.menu.Menu.js
+++ b/engine/Library/ExtJs/overrides/Ext.menu.Menu.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="extjs/overrides/menu"}
@@ -41,4 +40,4 @@ Ext.override(Ext.menu.Menu, {
         this.callParent([ev]);
     }
 });
-//{/block}
\ No newline at end of file
+//{/block}
diff --git a/engine/Library/ExtJs/overrides/Ext.panel.Panel.js b/engine/Library/ExtJs/overrides/Ext.panel.Panel.js
index 26a5928d506..898ce5b9fd5 100644
--- a/engine/Library/ExtJs/overrides/Ext.panel.Panel.js
+++ b/engine/Library/ExtJs/overrides/Ext.panel.Panel.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
@@ -120,4 +119,4 @@ Ext.override(Ext.panel.Panel, {
         me.ghostPanel.el.hide();
     },
 });
-//{/block}
\ No newline at end of file
+//{/block}
diff --git a/engine/Library/ExtJs/overrides/Ext.picker.Date.js b/engine/Library/ExtJs/overrides/Ext.picker.Date.js
index efacb4efa6a..f5290d412c8 100644
--- a/engine/Library/ExtJs/overrides/Ext.picker.Date.js
+++ b/engine/Library/ExtJs/overrides/Ext.picker.Date.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="extjs/overrides/date"}
@@ -39,4 +38,4 @@ Ext.override(Ext.picker.Date, {
         }
     }
 });
-//{/block}
\ No newline at end of file
+//{/block}
diff --git a/engine/Library/ExtJs/overrides/Ext.tab.Tab.js b/engine/Library/ExtJs/overrides/Ext.tab.Tab.js
index 02fa35005ea..b8a9d23a834 100644
--- a/engine/Library/ExtJs/overrides/Ext.tab.Tab.js
+++ b/engine/Library/ExtJs/overrides/Ext.tab.Tab.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
@@ -42,4 +41,4 @@ Ext.override(Ext.tab.Tab, {
         }
 	}
 });
-//{/block}
\ No newline at end of file
+//{/block}
diff --git a/engine/Library/ExtJs/overrides/Ext.toolbar.Paging.js b/engine/Library/ExtJs/overrides/Ext.toolbar.Paging.js
index d4053c714c2..bd172a5c6fd 100644
--- a/engine/Library/ExtJs/overrides/Ext.toolbar.Paging.js
+++ b/engine/Library/ExtJs/overrides/Ext.toolbar.Paging.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
@@ -121,4 +120,4 @@ Ext.override(Ext.toolbar.Paging, {
         }
     }
 });
-//{/block}
\ No newline at end of file
+//{/block}
diff --git a/engine/Library/ExtJs/overrides/Ext.tree.Panel.js b/engine/Library/ExtJs/overrides/Ext.tree.Panel.js
index f1e36b8551e..1ce21f5d460 100644
--- a/engine/Library/ExtJs/overrides/Ext.tree.Panel.js
+++ b/engine/Library/ExtJs/overrides/Ext.tree.Panel.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
@@ -43,4 +42,4 @@ Ext.override(Ext.tree.Panel, {
         me.callOverridden(arguments);
     }
 });
-//{/block}
\ No newline at end of file
+//{/block}
diff --git a/engine/Library/ExtJs/overrides/Ext.view.BoundList.js b/engine/Library/ExtJs/overrides/Ext.view.BoundList.js
index 36e4b362a12..6a3e4f8b05f 100644
--- a/engine/Library/ExtJs/overrides/Ext.view.BoundList.js
+++ b/engine/Library/ExtJs/overrides/Ext.view.BoundList.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
@@ -62,4 +61,4 @@ Ext.override(Ext.view.BoundList,
         }
     }
 });
-//{/block}
\ No newline at end of file
+//{/block}
diff --git a/engine/Library/ExtJs/overrides/Ext.view.Table.js b/engine/Library/ExtJs/overrides/Ext.view.Table.js
index 30b700cfeff..33e1998bb9c 100644
--- a/engine/Library/ExtJs/overrides/Ext.view.Table.js
+++ b/engine/Library/ExtJs/overrides/Ext.view.Table.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
@@ -115,4 +114,4 @@ Ext.override(Ext.view.Table, {
         }
     }
 });
-//{/block}
\ No newline at end of file
+//{/block}
diff --git a/engine/Library/Mpdf/ttfonts/arial.ttf b/engine/Library/Mpdf/ttfonts/arial.ttf
deleted file mode 100644
index ff0815cd8c6..00000000000
Binary files a/engine/Library/Mpdf/ttfonts/arial.ttf and /dev/null differ
diff --git a/engine/Library/Mpdf/ttfonts/arialbd.ttf b/engine/Library/Mpdf/ttfonts/arialbd.ttf
deleted file mode 100644
index d0d857e2d29..00000000000
Binary files a/engine/Library/Mpdf/ttfonts/arialbd.ttf and /dev/null differ
diff --git a/engine/Library/Mpdf/ttfonts/arialbi.ttf b/engine/Library/Mpdf/ttfonts/arialbi.ttf
deleted file mode 100644
index 00968d29b6e..00000000000
Binary files a/engine/Library/Mpdf/ttfonts/arialbi.ttf and /dev/null differ
diff --git a/engine/Library/Mpdf/ttfonts/ariali.ttf b/engine/Library/Mpdf/ttfonts/ariali.ttf
deleted file mode 100644
index 5b05d353598..00000000000
Binary files a/engine/Library/Mpdf/ttfonts/ariali.ttf and /dev/null differ
diff --git a/engine/Library/Mpdf/ttfonts/cour.ttf b/engine/Library/Mpdf/ttfonts/cour.ttf
deleted file mode 100644
index 2c99e08c255..00000000000
Binary files a/engine/Library/Mpdf/ttfonts/cour.ttf and /dev/null differ
diff --git a/engine/Library/Mpdf/ttfonts/courbd.ttf b/engine/Library/Mpdf/ttfonts/courbd.ttf
deleted file mode 100644
index be426cd20f6..00000000000
Binary files a/engine/Library/Mpdf/ttfonts/courbd.ttf and /dev/null differ
diff --git a/engine/Library/Mpdf/ttfonts/courbi.ttf b/engine/Library/Mpdf/ttfonts/courbi.ttf
deleted file mode 100644
index 17cb775eef3..00000000000
Binary files a/engine/Library/Mpdf/ttfonts/courbi.ttf and /dev/null differ
diff --git a/engine/Library/Mpdf/ttfonts/couri.ttf b/engine/Library/Mpdf/ttfonts/couri.ttf
deleted file mode 100644
index e98261fad8c..00000000000
Binary files a/engine/Library/Mpdf/ttfonts/couri.ttf and /dev/null differ
diff --git a/engine/Library/Mpdf/ttfonts/georgia.ttf b/engine/Library/Mpdf/ttfonts/georgia.ttf
deleted file mode 100644
index 27d1c19515b..00000000000
Binary files a/engine/Library/Mpdf/ttfonts/georgia.ttf and /dev/null differ
diff --git a/engine/Library/Mpdf/ttfonts/georgiab.ttf b/engine/Library/Mpdf/ttfonts/georgiab.ttf
deleted file mode 100644
index e121d7e1cbc..00000000000
Binary files a/engine/Library/Mpdf/ttfonts/georgiab.ttf and /dev/null differ
diff --git a/engine/Library/Mpdf/ttfonts/georgiai.ttf b/engine/Library/Mpdf/ttfonts/georgiai.ttf
deleted file mode 100644
index b5c4209e8ff..00000000000
Binary files a/engine/Library/Mpdf/ttfonts/georgiai.ttf and /dev/null differ
diff --git a/engine/Library/Mpdf/ttfonts/georgiaz.ttf b/engine/Library/Mpdf/ttfonts/georgiaz.ttf
deleted file mode 100644
index 1ab2c5530ac..00000000000
Binary files a/engine/Library/Mpdf/ttfonts/georgiaz.ttf and /dev/null differ
diff --git a/engine/Library/Mpdf/ttfonts/times.ttf b/engine/Library/Mpdf/ttfonts/times.ttf
deleted file mode 100644
index a998feeca74..00000000000
Binary files a/engine/Library/Mpdf/ttfonts/times.ttf and /dev/null differ
diff --git a/engine/Library/Mpdf/ttfonts/timesbd.ttf b/engine/Library/Mpdf/ttfonts/timesbd.ttf
deleted file mode 100644
index bade374515b..00000000000
Binary files a/engine/Library/Mpdf/ttfonts/timesbd.ttf and /dev/null differ
diff --git a/engine/Library/Mpdf/ttfonts/timesbi.ttf b/engine/Library/Mpdf/ttfonts/timesbi.ttf
deleted file mode 100644
index ba7ba5f8d41..00000000000
Binary files a/engine/Library/Mpdf/ttfonts/timesbi.ttf and /dev/null differ
diff --git a/engine/Library/Mpdf/ttfonts/timesi.ttf b/engine/Library/Mpdf/ttfonts/timesi.ttf
deleted file mode 100644
index 28798d3c623..00000000000
Binary files a/engine/Library/Mpdf/ttfonts/timesi.ttf and /dev/null differ
diff --git a/engine/Library/Mpdf/ttfonts/verdana.ttf b/engine/Library/Mpdf/ttfonts/verdana.ttf
deleted file mode 100644
index 8f25a642311..00000000000
Binary files a/engine/Library/Mpdf/ttfonts/verdana.ttf and /dev/null differ
diff --git a/engine/Library/Mpdf/ttfonts/verdanab.ttf b/engine/Library/Mpdf/ttfonts/verdanab.ttf
deleted file mode 100644
index e4391be2f2f..00000000000
Binary files a/engine/Library/Mpdf/ttfonts/verdanab.ttf and /dev/null differ
diff --git a/engine/Library/Mpdf/ttfonts/verdanai.ttf b/engine/Library/Mpdf/ttfonts/verdanai.ttf
deleted file mode 100644
index 8542da3ae87..00000000000
Binary files a/engine/Library/Mpdf/ttfonts/verdanai.ttf and /dev/null differ
diff --git a/engine/Library/Mpdf/ttfonts/verdanaz.ttf b/engine/Library/Mpdf/ttfonts/verdanaz.ttf
deleted file mode 100644
index 476256a6b83..00000000000
Binary files a/engine/Library/Mpdf/ttfonts/verdanaz.ttf and /dev/null differ
diff --git a/engine/Library/Smarty/sysplugins/smarty_cacheresource_custom.php b/engine/Library/Smarty/sysplugins/smarty_cacheresource_custom.php
index ee9de157b35..2687b809d0a 100644
--- a/engine/Library/Smarty/sysplugins/smarty_cacheresource_custom.php
+++ b/engine/Library/Smarty/sysplugins/smarty_cacheresource_custom.php
@@ -14,6 +14,7 @@
  * @author Rodney Rehm
  */
 abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
+    private $cache;
 
     /**
      * fetch cached content and its modification time from data source
@@ -234,4 +235,4 @@ public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
         $this->delete($name, null, null, null);
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/engine/Library/Smarty/sysplugins/smarty_internal_compile_extends.php b/engine/Library/Smarty/sysplugins/smarty_internal_compile_extends.php
index b93139bfa6b..d10a0a62567 100644
--- a/engine/Library/Smarty/sysplugins/smarty_internal_compile_extends.php
+++ b/engine/Library/Smarty/sysplugins/smarty_internal_compile_extends.php
@@ -39,6 +39,10 @@ class Smarty_Internal_Compile_Extends extends Smarty_Internal_CompileBase {
     */
     public $mbstring_overload = 0;
 
+    private $_rdl;
+
+    private $_ldl;
+
     /**
     * Compiles code for the {extends} tag
     *
@@ -130,4 +134,4 @@ public function compile($args, $compiler)
 
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/engine/Library/Smarty/sysplugins/smarty_internal_configfilelexer.php b/engine/Library/Smarty/sysplugins/smarty_internal_configfilelexer.php
index bade2fe74f9..2700f1dc112 100644
--- a/engine/Library/Smarty/sysplugins/smarty_internal_configfilelexer.php
+++ b/engine/Library/Smarty/sysplugins/smarty_internal_configfilelexer.php
@@ -23,6 +23,9 @@ class Smarty_Internal_Configfilelexer
     public $smarty_token_names = array (		// Text for parser error messages
    				);
 
+    private $smarty;
+
+    private $mbstring_overload;
 
     function __construct($data, $smarty)
     {
@@ -89,7 +92,7 @@ function yylex1()
         $yy_global_pattern = "/\G(#|;)|\G(\\[)|\G(\\])|\G(=)|\G([ \t\r]+)|\G(\n)|\G([0-9]*[a-zA-Z_]\\w*)|\G([\S\s])/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, 0, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
                 if (!count($yymatches)) {
@@ -201,7 +204,7 @@ function yylex2()
         $yy_global_pattern = "/\G([ \t\r]+)|\G(\\d+\\.\\d+(?=[ \t\r]*[\n#;]))|\G(\\d+(?=[ \t\r]*[\n#;]))|\G(\"\"\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*'(?=[ \t\r]*[\n#;]))|\G(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"(?=[ \t\r]*[\n#;]))|\G([a-zA-Z]+(?=[ \t\r]*[\n#;]))|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, 0, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
                 if (!count($yymatches)) {
@@ -322,7 +325,7 @@ function yylex3()
         $yy_global_pattern = "/\G([^\n]+?(?=[ \t\r]*\n))/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, 0, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
                 if (!count($yymatches)) {
@@ -391,7 +394,7 @@ function yylex4()
         $yy_global_pattern = "/\G([ \t\r]+)|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, 0, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
                 if (!count($yymatches)) {
@@ -469,7 +472,7 @@ function yylex5()
         $yy_global_pattern = "/\G(\\.)|\G(.*?(?=[\.=[\]\r\n]))/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, 0, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
                 if (!count($yymatches)) {
@@ -541,7 +544,7 @@ function yylex6()
         $yy_global_pattern = "/\G(\"\"\"(?=[ \t\r]*[\n#;]))|\G([\S\s])/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, 0, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
                 if (!count($yymatches)) {
@@ -619,4 +622,4 @@ function yy_r6_2($yy_subpatterns)
 
 
 }
-?>
\ No newline at end of file
+?>
diff --git a/engine/Library/Smarty/sysplugins/smarty_internal_configfileparser.php b/engine/Library/Smarty/sysplugins/smarty_internal_configfileparser.php
index 784bc684da7..17c505f5535 100644
--- a/engine/Library/Smarty/sysplugins/smarty_internal_configfileparser.php
+++ b/engine/Library/Smarty/sysplugins/smarty_internal_configfileparser.php
@@ -93,6 +93,9 @@ class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser
     public $retvalue = 0;
     private $lex;
     private $internalError = false;
+    private $smarty;
+    private $compiler;
+    private $yymajor;
 
     function __construct($lex, $compiler) {
         // set instance object
@@ -918,4 +921,4 @@ function doParse($yymajor, $yytokenvalue)
         } while ($yymajor != self::YYNOCODE && $this->yyidx >= 0);
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/engine/Library/Smarty/sysplugins/smarty_internal_data.php b/engine/Library/Smarty/sysplugins/smarty_internal_data.php
index 5baf3b76dc7..4f43dce5763 100644
--- a/engine/Library/Smarty/sysplugins/smarty_internal_data.php
+++ b/engine/Library/Smarty/sysplugins/smarty_internal_data.php
@@ -198,7 +198,7 @@ public function appendByRef($tpl_var, &$value, $merge = false)
      * @param string  $varname        variable name or null
      * @param string  $_ptr           optional pointer to data object
      * @param boolean $search_parents include parent templates?
-     * @return string variable value or or array of variables
+     * @return mixed variable value or array of variables
      */
     public function getTemplateVars($varname = null, $_ptr = null, $search_parents = true)
     {
@@ -464,6 +464,7 @@ public function __construct ($_parent = null, $smarty = null)
  * @package Smarty
  * @subpackage Template
  */
+#[AllowDynamicProperties]
 class Smarty_Variable {
 
     /**
@@ -548,4 +549,4 @@ public function __toString()
 
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/engine/Library/Smarty/sysplugins/smarty_internal_parsetree.php b/engine/Library/Smarty/sysplugins/smarty_internal_parsetree.php
index 99f4c656657..bb0074fd24c 100644
--- a/engine/Library/Smarty/sysplugins/smarty_internal_parsetree.php
+++ b/engine/Library/Smarty/sysplugins/smarty_internal_parsetree.php
@@ -131,6 +131,7 @@ public function to_smarty_php()
  * @ignore
  */
 class _smarty_doublequoted extends _smarty_parsetree {
+    private $subtrees;
 
     /**
      * Create parse tree buffer for double quoted string subtrees
@@ -392,4 +393,4 @@ public function to_smarty_php()
 
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/engine/Library/Smarty/sysplugins/smarty_internal_template.php b/engine/Library/Smarty/sysplugins/smarty_internal_template.php
index 3821fe37255..53b37aa4550 100644
--- a/engine/Library/Smarty/sysplugins/smarty_internal_template.php
+++ b/engine/Library/Smarty/sysplugins/smarty_internal_template.php
@@ -19,6 +19,7 @@
  * @property Smarty_Template_Compiled $compiled
  * @property Smarty_Template_Cached   $cached
  */
+#[AllowDynamicProperties]
 class Smarty_Internal_Template extends Smarty_Internal_TemplateBase {
 
     /**
@@ -240,7 +241,7 @@ public function writeCachedContent($content)
      * @param integer $cache_lifetime life time of cache data
      * @param array   $vars optional  variables to assign
      * @param int     $parent_scope   scope in which {include} should execute
-     * @returns string template content
+     * @return string template content
      */
     public function getSubTemplate($template, $cache_id, $compile_id, $caching, $cache_lifetime, $data, $parent_scope)
     {
@@ -297,7 +298,7 @@ public function getSubTemplate($template, $cache_id, $compile_id, $caching, $cac
      * @param array   $vars optional  variables to assign
      * @param int     $parent_scope   scope in which {include} should execute
      * @param string  $hash           nocache hash code
-     * @returns string template content
+     * @return string template content
      */
     public function setupInlineSubTemplate($template, $cache_id, $compile_id, $caching, $cache_lifetime, $data, $parent_scope, $hash)
     {
@@ -689,4 +690,4 @@ public function __destruct()
 
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/engine/Library/Smarty/sysplugins/smarty_internal_templatebase.php b/engine/Library/Smarty/sysplugins/smarty_internal_templatebase.php
index 416b5bf239e..ef38afac01f 100644
--- a/engine/Library/Smarty/sysplugins/smarty_internal_templatebase.php
+++ b/engine/Library/Smarty/sysplugins/smarty_internal_templatebase.php
@@ -402,7 +402,7 @@ public function isCached($template = null, $cache_id = null, $compile_id = null,
      * creates a data object
      *
      * @param object $parent next higher level of Smarty variables
-     * @returns Smarty_Data data object
+     * @return Smarty_Data data object
      */
     public function createData($parent = null)
     {
diff --git a/engine/Library/Smarty/sysplugins/smarty_internal_templatecompilerbase.php b/engine/Library/Smarty/sysplugins/smarty_internal_templatecompilerbase.php
index aa94aa6ce63..1453b939f17 100644
--- a/engine/Library/Smarty/sysplugins/smarty_internal_templatecompilerbase.php
+++ b/engine/Library/Smarty/sysplugins/smarty_internal_templatecompilerbase.php
@@ -136,6 +136,14 @@ abstract class Smarty_Internal_TemplateCompilerBase {
      */
     public $known_modifier_type = array();
 
+    public $nocache;
+    public $tag_nocache;
+    public $has_code;
+    public $has_output;
+    public $abort_and_recompile;
+    public $prefix_code;
+    public $has_variable_string;
+
     /**
      * Initialize compiler
      */
@@ -166,8 +174,8 @@ public function compileTemplate(Smarty_Internal_Template $template) {
         // template header code
         $template_header = '';
         if (!$this->suppressHeader) {
-            $template_header .= "<?php /* Smarty version " . Smarty::SMARTY_VERSION . ", created on " . strftime("%Y-%m-%d %H:%M:%S") . "\n";
-            $template_header .= "         compiled from \"" . $this->template->source->filepath . "\" */ ?>\n";
+            $template_header .= '<?php /* Smarty version ' . Smarty::SMARTY_VERSION . ', created on ' . date('Y-m-d H:i:s') . "\n";
+            $template_header .= '         compiled from "' . $this->template->source->filepath . "\" */ ?>\n";
         }
 
         do {
diff --git a/engine/Library/Smarty/sysplugins/smarty_internal_templatelexer.php b/engine/Library/Smarty/sysplugins/smarty_internal_templatelexer.php
index a7d5fa9a5e3..00241b0d22c 100644
--- a/engine/Library/Smarty/sysplugins/smarty_internal_templatelexer.php
+++ b/engine/Library/Smarty/sysplugins/smarty_internal_templatelexer.php
@@ -73,6 +73,13 @@ class Smarty_Internal_Templatelexer
     				'TO' => 'to',
     				);
 
+    public $ldel;
+    public $ldel_length;
+    private $smarty;
+    private $compiler;
+    private $rdel;
+    private $rdel_length;
+    private $mbstring_overload;
 
     function __construct($data,$compiler)
     {
@@ -150,7 +157,7 @@ function yylex1()
         $yy_global_pattern = "/\G(".$this->ldel."[$]smarty\\.block\\.child".$this->rdel.")|\G(\\{\\})|\G(".$this->ldel."\\*([\S\s]*?)\\*".$this->rdel.")|\G(".$this->ldel."strip".$this->rdel.")|\G(".$this->ldel."\\s{1,}strip\\s{1,}".$this->rdel.")|\G(".$this->ldel."\/strip".$this->rdel.")|\G(".$this->ldel."\\s{1,}\/strip\\s{1,}".$this->rdel.")|\G(".$this->ldel."\\s*literal\\s*".$this->rdel.")|\G(".$this->ldel."\\s{1,}\/)|\G(".$this->ldel."\\s*(if|elseif|else if|while)\\s+)|\G(".$this->ldel."\\s*for\\s+)|\G(".$this->ldel."\\s*foreach(?![^\s]))|\G(".$this->ldel."\\s*setfilter\\s+)|\G(".$this->ldel."\\s{1,})|\G(".$this->ldel."\/)|\G(".$this->ldel.")|\G(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|\G(\\?>)|\G(".$this->rdel.")|\G(<%)|\G(%>)|\G([\S\s])/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, 0, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
                 if (!count($yymatches)) {
@@ -457,7 +464,7 @@ function yylex2()
         $yy_global_pattern = "/\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G(".$this->ldel."\\s{1,}\/)|\G(".$this->ldel."\\s*(if|elseif|else if|while)\\s+)|\G(".$this->ldel."\\s*for\\s+)|\G(".$this->ldel."\\s*foreach(?![^\s]))|\G(".$this->ldel."\\s{1,})|\G(\\s{1,}".$this->rdel.")|\G(".$this->ldel."\/)|\G(".$this->ldel.")|\G(".$this->rdel.")|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*===\\s*)|\G(\\s*!==\\s*)|\G(\\s*==\\s*|\\s+eq\\s+)|\G(\\s*!=\\s*|\\s*<>\\s*|\\s+(ne|neq)\\s+)|\G(\\s*>=\\s*|\\s+(ge|gte)\\s+)|\G(\\s*<=\\s*|\\s+(le|lte)\\s+)|\G(\\s*>\\s*|\\s+gt\\s+)|\G(\\s*<\\s*|\\s+lt\\s+)|\G(\\s+mod\\s+)|\G(!\\s*|not\\s+)|\G(\\s*&&\\s*|\\s*and\\s+)|\G(\\s*\\|\\|\\s*|\\s*or\\s+)|\G(\\s*xor\\s+)|\G(\\s+is\\s+odd\\s+by\\s+)|\G(\\s+is\\s+not\\s+odd\\s+by\\s+)|\G(\\s+is\\s+odd)|\G(\\s+is\\s+not\\s+odd)|\G(\\s+is\\s+even\\s+by\\s+)|\G(\\s+is\\s+not\\s+even\\s+by\\s+)|\G(\\s+is\\s+even)|\G(\\s+is\\s+not\\s+even)|\G(\\s+is\\s+div\\s+by\\s+)|\G(\\s+is\\s+not\\s+div\\s+by\\s+)|\G(\\((int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)\\)\\s*)|\G(\\s*\\(\\s*)|\G(\\s*\\))|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*->\\s*)|\G(\\s*=>\\s*)|\G(\\s*=\\s*)|\G(\\+\\+|--)|\G(\\s*(\\+|-)\\s*)|\G(\\s*(\\*|\/|%)\\s*)|\G(\\$)|\G(\\s*;)|\G(::)|\G(\\s*:\\s*)|\G(@)|\G(#)|\G(\")|\G(`)|\G(\\|)|\G(\\.)|\G(\\s*,\\s*)|\G(\\s*&\\s*)|\G(\\s*\\?\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*=\\s*)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G(\\s+)|\G([\S\s])/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, 0, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
                 if (!count($yymatches)) {
@@ -909,7 +916,7 @@ function yylex3()
         $yy_global_pattern = "/\G(".$this->ldel."\\s*literal\\s*".$this->rdel.")|\G(".$this->ldel."\\s*\/literal\\s*".$this->rdel.")|\G(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|\G(\\?>)|\G(<%)|\G(%>)|\G([\S\s])/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, 0, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
                 if (!count($yymatches)) {
@@ -1039,7 +1046,7 @@ function yylex4()
         $yy_global_pattern = "/\G(".$this->ldel."\\s{1,}\/)|\G(".$this->ldel."\\s*(if|elseif|else if|while)\\s+)|\G(".$this->ldel."\\s*for\\s+)|\G(".$this->ldel."\\s*foreach(?![^\s]))|\G(".$this->ldel."\\s{1,})|\G(".$this->ldel."\/)|\G(".$this->ldel.")|\G(\")|\G(`\\$)|\G(\\$[0-9]*[a-zA-Z_]\\w*)|\G(\\$)|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(".$this->ldel."|\\$|`\\$|\")))|\G([\S\s])/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, 0, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
                 if (!count($yymatches)) {
diff --git a/engine/Library/Smarty/sysplugins/smarty_internal_templateparser.php b/engine/Library/Smarty/sysplugins/smarty_internal_templateparser.php
index d67be6e6fa4..6430e5bb739 100644
--- a/engine/Library/Smarty/sysplugins/smarty_internal_templateparser.php
+++ b/engine/Library/Smarty/sysplugins/smarty_internal_templateparser.php
@@ -34,16 +34,38 @@ function __toString()
         return $this->_string;
     }
 
+    /**
+     * @param $offset
+     * @return bool
+     *
+     * @deprecated - Native return and parameter type will be added with Shopware 5.8
+     */
+    #[\ReturnTypeWillChange]
     function offsetExists($offset)
     {
         return isset($this->metadata[$offset]);
     }
 
+    /**
+     * @param $offset
+     * @return mixed|null
+     *
+     * @deprecated - Native return and parameter type will be added with Shopware 5.8
+     */
+    #[\ReturnTypeWillChange]
     function offsetGet($offset)
     {
         return $this->metadata[$offset];
     }
 
+    /**
+     * @param $offset
+     * @param $value
+     * @return void
+     *
+     * @deprecated - Native return and parameter type will be added with Shopware 5.8
+     */
+    #[\ReturnTypeWillChange]
     function offsetSet($offset, $value)
     {
         if ($offset === null) {
@@ -67,6 +89,13 @@ function offsetSet($offset, $value)
         }
     }
 
+    /**
+     * @param $offset
+     * @return void
+     *
+     * @deprecated - Native return and parameter type will be added with Shopware 5.8
+     */
+    #[\ReturnTypeWillChange]
     function offsetUnset($offset)
     {
         unset($this->metadata[$offset]);
@@ -94,9 +123,23 @@ class Smarty_Internal_Templateparser#line 79 "smarty_internal_templateparser.php
     // states whether the parse was successful or not
     public $successful = true;
     public $retvalue = 0;
+    public $block_nesting_level;
+    public $asp_tags;
+    public $root_buffer;
+    public $current_buffer;
+    public $compiler;
+    public $prefix_number;
+    public $yymajor;
     private $lex;
     private $internalError = false;
     private $strip = false;
+    private $smarty;
+    private $template;
+    private $security;
+    private $php_handling;
+    private $is_xml;
+    private $last_variable;
+    private $last_index;
 
     function __construct($lex, $compiler) {
         $this->lex = $lex;
diff --git a/engine/Library/Smarty/sysplugins/smarty_internal_write_file.php b/engine/Library/Smarty/sysplugins/smarty_internal_write_file.php
index e210cebbdfe..aa76252a9d9 100644
--- a/engine/Library/Smarty/sysplugins/smarty_internal_write_file.php
+++ b/engine/Library/Smarty/sysplugins/smarty_internal_write_file.php
@@ -1,26 +1,4 @@
 <?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
 
 /**
  * Smarty Internal Write File Class
diff --git a/engine/Library/Smarty/sysplugins/smarty_resource.php b/engine/Library/Smarty/sysplugins/smarty_resource.php
index ec9ccecec91..8a3dca8beec 100644
--- a/engine/Library/Smarty/sysplugins/smarty_resource.php
+++ b/engine/Library/Smarty/sysplugins/smarty_resource.php
@@ -1,26 +1,4 @@
 <?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
 
 /**
  * Smarty Resource Plugin
@@ -653,6 +631,7 @@ protected static function parseResourceName($resource_name, $default_resource, &
  * @property bool   $template  Extended Template reference
  * @property string $content   Source Content
  */
+#[AllowDynamicProperties]
 class Smarty_Template_Source
 {
     /**
diff --git a/engine/Library/Smarty/sysplugins/smarty_security.php b/engine/Library/Smarty/sysplugins/smarty_security.php
index f8b31d96324..93318d33b2d 100644
--- a/engine/Library/Smarty/sysplugins/smarty_security.php
+++ b/engine/Library/Smarty/sysplugins/smarty_security.php
@@ -6,14 +6,14 @@
  * @subpackage Security
  * @author Uwe Tews
  */
- 
+
 /*
  * FIXME: Smarty_Security API
  *      - getter and setter instead of public properties would allow cultivating an internal cache properly
  *      - current implementation of isTrustedResourceDir() assumes that Smarty::$template_dir and Smarty::$config_dir are immutable
  *        the cache is killed every time either of the variables change. That means that two distinct Smarty objects with differing
- *        $template_dir or $config_dir should NOT share the same Smarty_Security instance, 
- *        as this would lead to (severe) performance penalty! how should this be handled? 
+ *        $template_dir or $config_dir should NOT share the same Smarty_Security instance,
+ *        as this would lead to (severe) performance penalty! how should this be handled?
  */
 
 /**
@@ -164,16 +164,14 @@ class Smarty_Security {
      * @var array
      */
     protected $_trusted_dir = null;
-    
-    
-    /**
-     * @param Smarty $smarty
-     */
-    public function __construct($smarty)
+
+    public Smarty $smarty;
+
+    public function __construct(Smarty $smarty)
     {
         $this->smarty = $smarty;
     }
-    
+
     /**
      * Check if PHP function is trusted.
      *
@@ -380,14 +378,14 @@ public function isTrustedResourceDir($filepath)
         // give up
         throw new SmartyException("directory '{$_filepath}' not allowed by security setting");
     }
-    
+
     /**
      * Check if URI (e.g. {fetch} or {html_image}) is trusted
      *
      * To simplify things, isTrustedUri() resolves all input to "{$PROTOCOL}://{$HOSTNAME}".
      * So "http://username:password@hello.world.example.org:8080/some-path?some=query-string"
      * is reduced to "http://hello.world.example.org" prior to applying the patters from {@link $trusted_uri}.
-     * @param string $uri 
+     * @param string $uri
      * @return boolean true if URI is trusted
      * @throws SmartyException if URI is not trusted
      * @uses $trusted_uri for list of patterns to match against $uri
@@ -403,10 +401,10 @@ public function isTrustedUri($uri)
                 }
             }
         }
-        
+
         throw new SmartyException("URI '{$uri}' not allowed by security setting");
     }
-    
+
     /**
      * Check if directory of file resource is trusted.
      *
@@ -456,4 +454,4 @@ public function isTrustedPHPDir($filepath)
 
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/engine/Library/Zend/Auth/Adapter/DbTable.php b/engine/Library/Zend/Auth/Adapter/DbTable.php
index 5bc6fab7e66..0755c5dafae 100644
--- a/engine/Library/Zend/Auth/Adapter/DbTable.php
+++ b/engine/Library/Zend/Auth/Adapter/DbTable.php
@@ -1,26 +1,4 @@
 <?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
 
 /**
  * @see Zend_Auth_Adapter_Interface
@@ -297,7 +275,7 @@ public function getDbSelect()
      * @param string|array $returnColumns
      * @param string|array $omitColumns
      *
-     * @return stdClass|bool
+     * @return stdClass|false
      */
     public function getResultRowObject($returnColumns = null, $omitColumns = null)
     {
@@ -308,15 +286,16 @@ public function getResultRowObject($returnColumns = null, $omitColumns = null)
         $returnObject = new stdClass();
 
         if ($returnColumns !== null) {
-            $availableColumns = array_keys($this->_resultRow);
             foreach ((array) $returnColumns as $returnColumn) {
-                if (in_array($returnColumn, $availableColumns)) {
+                if (array_key_exists($returnColumn, $this->_resultRow)) {
                     $returnObject->{$returnColumn} = $this->_resultRow[$returnColumn];
                 }
             }
 
             return $returnObject;
-        } elseif ($omitColumns !== null) {
+        }
+
+        if ($omitColumns !== null) {
             $omitColumns = (array) $omitColumns;
             foreach ($this->_resultRow as $resultColumn => $resultValue) {
                 if (!in_array($resultColumn, $omitColumns)) {
diff --git a/engine/Library/Zend/Cache/Backend.php b/engine/Library/Zend/Cache/Backend.php
index f82f0b714d3..6af6898c24e 100644
--- a/engine/Library/Zend/Cache/Backend.php
+++ b/engine/Library/Zend/Cache/Backend.php
@@ -1,26 +1,5 @@
 <?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
+
 
 /**
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
diff --git a/engine/Library/Zend/Cache/Core.php b/engine/Library/Zend/Cache/Core.php
index 2b5695c7e4f..38a3b4820fc 100644
--- a/engine/Library/Zend/Cache/Core.php
+++ b/engine/Library/Zend/Cache/Core.php
@@ -1,26 +1,5 @@
 <?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
+
 
 /**
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
diff --git a/engine/Library/Zend/Config.php b/engine/Library/Zend/Config.php
index 33f78e6ef89..90446353788 100644
--- a/engine/Library/Zend/Config.php
+++ b/engine/Library/Zend/Config.php
@@ -243,6 +243,7 @@ public function __unset($name)
      *
      * @return int
      */
+    #[\ReturnTypeWillChange]
     public function count()
     {
         return $this->_count;
@@ -253,6 +254,7 @@ public function count()
      *
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function current()
     {
         $this->_skipNextIteration = false;
@@ -264,6 +266,7 @@ public function current()
      *
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return key($this->_data);
@@ -273,6 +276,7 @@ public function key()
      * Defined by Iterator interface
      *
      */
+    #[\ReturnTypeWillChange]
     public function next()
     {
         if ($this->_skipNextIteration) {
@@ -287,6 +291,7 @@ public function next()
      * Defined by Iterator interface
      *
      */
+    #[\ReturnTypeWillChange]
     public function rewind()
     {
         $this->_skipNextIteration = false;
@@ -299,6 +304,7 @@ public function rewind()
      *
      * @return boolean
      */
+    #[\ReturnTypeWillChange]
     public function valid()
     {
         return $this->_index < $this->_count;
@@ -478,4 +484,4 @@ protected function _arrayMergeRecursive($firstArray, $secondArray)
 
         return $firstArray;
     }
-}
\ No newline at end of file
+}
diff --git a/engine/Library/Zend/Db/Adapter/Abstract.php b/engine/Library/Zend/Db/Adapter/Abstract.php
index e7ba4a34b56..6f1f275660b 100644
--- a/engine/Library/Zend/Db/Adapter/Abstract.php
+++ b/engine/Library/Zend/Db/Adapter/Abstract.php
@@ -1,26 +1,5 @@
 <?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
+
 
 /**
  * @see Zend_Db
diff --git a/engine/Library/Zend/Db/Adapter/Exception.php b/engine/Library/Zend/Db/Adapter/Exception.php
index 0c05e5b77b5..ae10356e196 100644
--- a/engine/Library/Zend/Db/Adapter/Exception.php
+++ b/engine/Library/Zend/Db/Adapter/Exception.php
@@ -37,9 +37,18 @@ class Zend_Db_Adapter_Exception extends Zend_Db_Exception
 
     public function __construct($message = '', $code = 0, Exception $e = null)
     {
-        if ($e && (0 === $code)) {
+        if ($e && ($code === 0)) {
             $code = $e->getCode();
         }
+
+        if (!is_int($code)) {
+            if (is_numeric($code)) {
+                $code = (int) $code;
+            } else {
+                $code = 0;
+            }
+        }
+
         parent::__construct($message, $code, $e);
     }
 
@@ -52,5 +61,4 @@ public function getChainedException()
     {
         return $this->getPrevious();
     }
-
 }
diff --git a/engine/Library/Zend/Db/Select.php b/engine/Library/Zend/Db/Select.php
index d946113b7ab..fa610f362e2 100644
--- a/engine/Library/Zend/Db/Select.php
+++ b/engine/Library/Zend/Db/Select.php
@@ -1,26 +1,5 @@
 <?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
+
 
 /**
  * @see Zend_Db_Adapter_Abstract
diff --git a/engine/Library/Zend/Db/Table/Row/Abstract.php b/engine/Library/Zend/Db/Table/Row/Abstract.php
index 245f117546c..36fce697b2b 100644
--- a/engine/Library/Zend/Db/Table/Row/Abstract.php
+++ b/engine/Library/Zend/Db/Table/Row/Abstract.php
@@ -256,6 +256,7 @@ public function __wakeup()
      * @param string $offset
      * @return boolean
      */
+    #[\ReturnTypeWillChange]
     public function offsetExists($offset)
     {
         return $this->__isset($offset);
@@ -268,6 +269,7 @@ public function offsetExists($offset)
      * @param string $offset
      * @return string
      */
+    #[\ReturnTypeWillChange]
      public function offsetGet($offset)
      {
          return $this->__get($offset);
@@ -280,6 +282,7 @@ public function offsetGet($offset)
       * @param string $offset
       * @param mixed $value
       */
+    #[\ReturnTypeWillChange]
      public function offsetSet($offset, $value)
      {
          $this->__set($offset, $value);
@@ -291,6 +294,7 @@ public function offsetSet($offset, $value)
       *
       * @param string $offset
       */
+    #[\ReturnTypeWillChange]
      public function offsetUnset($offset)
      {
          return $this->__unset($offset);
@@ -629,6 +633,7 @@ public function delete()
         return $result;
     }
 
+    #[\ReturnTypeWillChange]
     public function getIterator()
     {
         return new ArrayIterator((array) $this->_data);
diff --git a/engine/Library/Zend/Http/Header/SetCookie.php b/engine/Library/Zend/Http/Header/SetCookie.php
index 102e5def7dd..6d2370fa114 100644
--- a/engine/Library/Zend/Http/Header/SetCookie.php
+++ b/engine/Library/Zend/Http/Header/SetCookie.php
@@ -1,26 +1,5 @@
 <?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
+
 use GuzzleHttp\Cookie\SetCookie;
 
 /**
diff --git a/engine/Library/Zend/Http/Response.php b/engine/Library/Zend/Http/Response.php
index c195fa76ecf..b6950101b28 100644
--- a/engine/Library/Zend/Http/Response.php
+++ b/engine/Library/Zend/Http/Response.php
@@ -252,7 +252,7 @@ public function getBody()
         $body = '';
 
         // Decode the body if it was transfer-encoded
-        switch (strtolower($this->getHeader('transfer-encoding'))) {
+        switch (strtolower($this->getHeader('transfer-encoding') ?? '')) {
 
             // Handle chunked body
             case 'chunked':
@@ -267,7 +267,7 @@ public function getBody()
         }
 
         // Decode any content-encoding (gzip or deflate) if needed
-        switch (strtolower($this->getHeader('content-encoding'))) {
+        switch (strtolower($this->getHeader('content-encoding') ?? '')) {
 
             // Handle gzip encoding
             case 'gzip':
diff --git a/engine/Library/Zend/Json.php b/engine/Library/Zend/Json.php
index 06b79966aa1..fceaf7ebd1a 100644
--- a/engine/Library/Zend/Json.php
+++ b/engine/Library/Zend/Json.php
@@ -34,8 +34,8 @@ class Zend_Json
      * so that it is a boolean true value, allowing it to be used with
      * ext/json's functions.
      */
-    const TYPE_ARRAY  = 1;
-    const TYPE_OBJECT = 0;
+    const TYPE_ARRAY  = true;
+    const TYPE_OBJECT = false;
 
     /**
      * Decodes the given $encodedValue string which is
@@ -44,16 +44,16 @@ class Zend_Json
      * Uses ext/json's json_decode if available.
      *
      * @param string $encodedValue Encoded in JSON format
-     * @param int $objectDecodeType Optional; flag indicating how to decode
-     * objects.
+     * @param bool $objectDecodeType Optional; flag indicating how to decode objects.
      * @return mixed
      * @throws Zend_Json_Exception
      */
-    public static function decode($encodedValue, $objectDecodeType = Zend_Json::TYPE_ARRAY)
+    public static function decode($encodedValue, $objectDecodeType = self::TYPE_ARRAY)
     {
         $encodedValue = (string) $encodedValue;
         $decode = json_decode($encodedValue, $objectDecodeType);
-        if (($jsonLastErr = json_last_error()) !== JSON_ERROR_NONE) {
+        $jsonLastErr = json_last_error();
+        if (($jsonLastErr) !== JSON_ERROR_NONE) {
             switch ($jsonLastErr) {
                 case JSON_ERROR_DEPTH:
                     throw new Zend_Json_Exception('Decoding failed: Maximum stack depth exceeded');
@@ -89,7 +89,9 @@ public static function encode($valueToEncode, $cycleCheck = false, array $option
         if (is_object($valueToEncode)) {
             if (method_exists($valueToEncode, 'toJson')) {
                 return $valueToEncode->toJson();
-            } elseif (method_exists($valueToEncode, 'toArray')) {
+            }
+
+            if (method_exists($valueToEncode, 'toArray')) {
                 return self::encode($valueToEncode->toArray(), $cycleCheck);
             }
         }
diff --git a/engine/Library/Zend/Locale/Data.php b/engine/Library/Zend/Locale/Data.php
index 8ae55680f31..4276618a1b1 100644
--- a/engine/Library/Zend/Locale/Data.php
+++ b/engine/Library/Zend/Locale/Data.php
@@ -1,26 +1,5 @@
 <?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
+
 
 /**
  * include needed classes
@@ -720,7 +699,7 @@ public static function getContent($locale, $path, $value = false)
         if (is_array($value)) {
             $val = implode('_', $value);
         }
-        $val = urlencode($val);
+        $val = urlencode((string) $val);
         $id = strtr('Zend_LocaleC_' . $locale . '_' . $path . '_' . $val, ['-' => '_', '%' => '_', '+' => '_']);
         if (!self::$_cacheDisabled && ($result = self::$_cache->load($id))) {
             return unserialize($result);
diff --git a/engine/Library/Zend/Mail.php b/engine/Library/Zend/Mail.php
index 9ac30cfc189..f552001a2f1 100644
--- a/engine/Library/Zend/Mail.php
+++ b/engine/Library/Zend/Mail.php
@@ -36,6 +36,7 @@
  * @see Zend_Mime_Part
  */
 
+use Shopware\Components\Random;
 
 /**
  * Class for sending an email.
@@ -119,7 +120,7 @@ class Zend_Mail extends Zend_Mime_Message
 
     /**
      * Subject: header
-     * @var string
+     * @var string|null
      */
     protected $_subject = null;
 
@@ -167,6 +168,7 @@ class Zend_Mail extends Zend_Mime_Message
      */
     public $hasAttachments = false;
 
+    private ?string $messageIdHostName;
 
     /**
      * Sets the default mail transport for all following uses of
@@ -201,17 +203,12 @@ public static function clearDefaultTransport()
         self::$_defaultTransport = null;
     }
 
-    /**
-     * Public constructor
-     *
-     * @param  string $charset
-     * @return void
-     */
-    public function __construct($charset = null)
+    public function __construct(?string $charset = null, ?string $messageIdHostName = null)
     {
-        if ($charset != null) {
+        if ($charset !== null) {
             $this->_charset = $charset;
         }
+        $this->messageIdHostName = $messageIdHostName;
     }
 
     /**
@@ -926,7 +923,7 @@ public function setSubject($subject)
     /**
      * Returns the encoded subject of the message
      *
-     * @return string
+     * @return string|null
      */
     public function getSubject()
     {
@@ -1049,7 +1046,7 @@ public function setMessageId($id = true)
     /**
      * Returns the Message-ID of the message
      *
-     * @return string
+     * @return string|null
      */
     public function getMessageId()
     {
@@ -1087,7 +1084,7 @@ public function createMessageId() {
             $user = getmypid();
         }
 
-        $rand = Shopware\Components\Random::getInteger(0, PHP_INT_MAX);
+        $rand = Random::getInteger(0, PHP_INT_MAX);
 
         if ($this->_recipients !== array()) {
             $recipient = array_rand($this->_recipients);
@@ -1095,9 +1092,11 @@ public function createMessageId() {
             $recipient = 'unknown';
         }
 
-        if (isset($_SERVER["SERVER_NAME"])) {
-            $hostName = $_SERVER["SERVER_NAME"];
-        } else {
+        $hostName = $this->messageIdHostName;
+        if (!$hostName) {
+            $hostName = (string) ($_SERVER['SERVER_NAME'] ?? '');
+        }
+        if (!$hostName) {
             $hostName = php_uname('n');
         }
 
@@ -1136,7 +1135,7 @@ public function addHeader($name, $value, $append = false)
     /**
      * Return mail headers
      *
-     * @return void
+     * @return array
      */
     public function getHeaders()
     {
@@ -1206,6 +1205,9 @@ protected function _filterEmail($email)
      */
     protected function _filterName($name)
     {
+        if (empty($name)) {
+            return '';
+        }
         $rule = array("\r" => '',
                       "\n" => '',
                       "\t" => '',
diff --git a/engine/Library/Zend/Translate/Adapter/XmlTm.php b/engine/Library/Zend/Translate/Adapter/XmlTm.php
index 9a3ff7fcb55..4b808105a03 100644
--- a/engine/Library/Zend/Translate/Adapter/XmlTm.php
+++ b/engine/Library/Zend/Translate/Adapter/XmlTm.php
@@ -60,10 +60,9 @@ protected function _loadTranslationData($filename, $locale, array $options = arr
 
         $encoding    = $this->_findEncoding($filename);
         $this->_file = xml_parser_create($encoding);
-        xml_set_object($this->_file, $this);
         xml_parser_set_option($this->_file, XML_OPTION_CASE_FOLDING, 0);
-        xml_set_element_handler($this->_file, "_startElement", "_endElement");
-        xml_set_character_data_handler($this->_file, "_contentElement");
+        xml_set_element_handler($this->_file, [$this, "_startElement"], [$this, "_endElement"]);
+        xml_set_character_data_handler($this->_file, [$this, "_contentElement"]);
 
         if (!xml_parse($this->_file, file_get_contents($filename))) {
             $ex = sprintf('XML error: %s at line %d of file %s',
diff --git a/engine/Library/minify/JSMin.php b/engine/Library/minify/JSMin.php
index 8e7c2695ed0..fad5bbf9d5d 100644
--- a/engine/Library/minify/JSMin.php
+++ b/engine/Library/minify/JSMin.php
@@ -323,7 +323,7 @@ protected function get()
                 $c = null;
             }
         }
-        if (ord($c) >= self::ORD_SPACE || $c === "\n" || $c === null) {
+        if ($c === null || ord($c) >= self::ORD_SPACE || $c === "\n") {
             return $c;
         }
         if ($c === "\r") {
@@ -446,4 +446,4 @@ protected function next()
 
 class JSMin_UnterminatedStringException extends Exception {}
 class JSMin_UnterminatedCommentException extends Exception {}
-class JSMin_UnterminatedRegExpException extends Exception {}
\ No newline at end of file
+class JSMin_UnterminatedRegExpException extends Exception {}
diff --git a/engine/Shopware/Bootstrap.php b/engine/Shopware/Bootstrap.php
index 7c618cbc7fd..1980229067f 100644
--- a/engine/Shopware/Bootstrap.php
+++ b/engine/Shopware/Bootstrap.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Symfony\Component\DependencyInjection\ContainerInterface;
diff --git a/engine/Shopware/Bundle/AccountBundle/AccountBundle.php b/engine/Shopware/Bundle/AccountBundle/AccountBundle.php
index fc9555deb17..d8403c70c39 100644
--- a/engine/Shopware/Bundle/AccountBundle/AccountBundle.php
+++ b/engine/Shopware/Bundle/AccountBundle/AccountBundle.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AccountBundle;
diff --git a/engine/Shopware/Bundle/AccountBundle/Constraint/CurrentPassword.php b/engine/Shopware/Bundle/AccountBundle/Constraint/CurrentPassword.php
index ea38f460f48..5a7aebe8813 100644
--- a/engine/Shopware/Bundle/AccountBundle/Constraint/CurrentPassword.php
+++ b/engine/Shopware/Bundle/AccountBundle/Constraint/CurrentPassword.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AccountBundle\Constraint;
diff --git a/engine/Shopware/Bundle/AccountBundle/Constraint/CurrentPasswordValidator.php b/engine/Shopware/Bundle/AccountBundle/Constraint/CurrentPasswordValidator.php
index 90ec4d822f7..2169d084eff 100644
--- a/engine/Shopware/Bundle/AccountBundle/Constraint/CurrentPasswordValidator.php
+++ b/engine/Shopware/Bundle/AccountBundle/Constraint/CurrentPasswordValidator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AccountBundle\Constraint;
diff --git a/engine/Shopware/Bundle/AccountBundle/Constraint/CustomerEmail.php b/engine/Shopware/Bundle/AccountBundle/Constraint/CustomerEmail.php
index c7e8f74bfac..f04d1de1272 100644
--- a/engine/Shopware/Bundle/AccountBundle/Constraint/CustomerEmail.php
+++ b/engine/Shopware/Bundle/AccountBundle/Constraint/CustomerEmail.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AccountBundle\Constraint;
diff --git a/engine/Shopware/Bundle/AccountBundle/Constraint/CustomerEmailValidator.php b/engine/Shopware/Bundle/AccountBundle/Constraint/CustomerEmailValidator.php
index b6fe74d27da..6105eed66db 100644
--- a/engine/Shopware/Bundle/AccountBundle/Constraint/CustomerEmailValidator.php
+++ b/engine/Shopware/Bundle/AccountBundle/Constraint/CustomerEmailValidator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AccountBundle\Constraint;
diff --git a/engine/Shopware/Bundle/AccountBundle/Constraint/FormEmail.php b/engine/Shopware/Bundle/AccountBundle/Constraint/FormEmail.php
index 9f7dc024289..20d2541fc0a 100644
--- a/engine/Shopware/Bundle/AccountBundle/Constraint/FormEmail.php
+++ b/engine/Shopware/Bundle/AccountBundle/Constraint/FormEmail.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AccountBundle\Constraint;
diff --git a/engine/Shopware/Bundle/AccountBundle/Constraint/FormEmailValidator.php b/engine/Shopware/Bundle/AccountBundle/Constraint/FormEmailValidator.php
index e2c2e495866..211d70e2d38 100644
--- a/engine/Shopware/Bundle/AccountBundle/Constraint/FormEmailValidator.php
+++ b/engine/Shopware/Bundle/AccountBundle/Constraint/FormEmailValidator.php
@@ -1,32 +1,31 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AccountBundle\Constraint;
 
 use Shopware\Models\Customer\Customer;
-use Shopware_Components_Snippet_Manager;
-use Symfony\Component\Form\Form;
+use Shopware_Components_Snippet_Manager as SnippetManager;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Validator\Constraint;
@@ -40,18 +39,12 @@ class FormEmailValidator extends ConstraintValidator
         'default' => 'The mail addresses entered are not equal',
     ];
 
-    /**
-     * @var Shopware_Components_Snippet_Manager
-     */
-    private $snippets;
+    private SnippetManager $snippets;
 
-    /**
-     * @var CustomerEmailValidator
-     */
-    private $customerEmailValidator;
+    private CustomerEmailValidator $customerEmailValidator;
 
     public function __construct(
-        Shopware_Components_Snippet_Manager $snippets,
+        SnippetManager $snippets,
         CustomerEmailValidator $customerEmailValidator
     ) {
         $this->snippets = $snippets;
@@ -60,6 +53,8 @@ public function __construct(
 
     /**
      * @param string $email
+     *
+     * @return void
      */
     public function validate($email, Constraint $constraint)
     {
@@ -67,10 +62,9 @@ public function validate($email, Constraint $constraint)
             return;
         }
 
-        /** @var Form $form */
+        /** @var FormInterface<Customer> $form */
         $form = $this->context->getRoot();
 
-        /** @var Customer $customer */
         $customer = $form->getData();
 
         $accountMode = $this->getAccountMode($form);
@@ -85,7 +79,7 @@ public function validate($email, Constraint $constraint)
         $this->customerEmailValidator->validate($email, $emailConstraint);
 
         if ($form->has('emailConfirmation') && $form->get('emailConfirmation')->getData() !== $email) {
-            $error = new FormError($this->getSnippet(self::SNIPPET_EMAIL_CONFIRMATION));
+            $error = new FormError($this->getSnippet());
             $error->setOrigin($form->get('emailConfirmation'));
             $form->addError($error);
         }
@@ -100,27 +94,22 @@ public function validatedBy()
     }
 
     /**
-     * @return int
+     * @param FormInterface<Customer> $form
      */
-    private function getAccountMode(FormInterface $form)
+    private function getAccountMode(FormInterface $form): int
     {
         if ($form->has('accountmode')) {
             return $form->get('accountmode')->getData();
         }
 
-        /** @var Customer $customer */
         $customer = $form->getData();
 
         return $customer->getAccountMode();
     }
 
-    /**
-     * @param array $snippet with namespace, name and default value
-     *
-     * @return string
-     */
-    private function getSnippet(array $snippet)
+    private function getSnippet(): string
     {
-        return $this->snippets->getNamespace($snippet['namespace'])->get($snippet['name'], $snippet['default'], true);
+        return $this->snippets->getNamespace(self::SNIPPET_EMAIL_CONFIRMATION['namespace'])
+            ->get(self::SNIPPET_EMAIL_CONFIRMATION['name'], self::SNIPPET_EMAIL_CONFIRMATION['default'], true);
     }
 }
diff --git a/engine/Shopware/Bundle/AccountBundle/Constraint/Password.php b/engine/Shopware/Bundle/AccountBundle/Constraint/Password.php
index bae6bd96efc..74587566011 100644
--- a/engine/Shopware/Bundle/AccountBundle/Constraint/Password.php
+++ b/engine/Shopware/Bundle/AccountBundle/Constraint/Password.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AccountBundle\Constraint;
diff --git a/engine/Shopware/Bundle/AccountBundle/Constraint/PasswordValidator.php b/engine/Shopware/Bundle/AccountBundle/Constraint/PasswordValidator.php
index c536562f289..8e433d2a75d 100644
--- a/engine/Shopware/Bundle/AccountBundle/Constraint/PasswordValidator.php
+++ b/engine/Shopware/Bundle/AccountBundle/Constraint/PasswordValidator.php
@@ -1,32 +1,32 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AccountBundle\Constraint;
 
 use Shopware\Models\Customer\Customer;
-use Shopware_Components_Config;
-use Shopware_Components_Snippet_Manager;
+use Shopware_Components_Config as Config;
+use Shopware_Components_Snippet_Manager as SnippetManager;
 use Symfony\Component\Form\Form;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormInterface;
@@ -47,19 +47,13 @@ class PasswordValidator extends ConstraintValidator
         'default' => '',
     ];
 
-    /**
-     * @var Shopware_Components_Snippet_Manager
-     */
-    private $snippets;
+    private SnippetManager $snippets;
 
-    /**
-     * @var Shopware_Components_Config
-     */
-    private $config;
+    private Config $config;
 
     public function __construct(
-        Shopware_Components_Snippet_Manager $snippets,
-        Shopware_Components_Config $config
+        SnippetManager $snippets,
+        Config $config
     ) {
         $this->snippets = $snippets;
         $this->config = $config;
@@ -101,6 +95,9 @@ private function addError(string $message): void
             ->addViolation();
     }
 
+    /**
+     * @param FormInterface<Customer> $form
+     */
     private function isFastLogin(FormInterface $form): bool
     {
         if ($form->has('accountmode')) {
diff --git a/engine/Shopware/Bundle/AccountBundle/Form/Account/AddressFormType.php b/engine/Shopware/Bundle/AccountBundle/Form/Account/AddressFormType.php
index 61b775a991d..627a049d176 100644
--- a/engine/Shopware/Bundle/AccountBundle/Form/Account/AddressFormType.php
+++ b/engine/Shopware/Bundle/AccountBundle/Form/Account/AddressFormType.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AccountBundle\Form\Account;
@@ -45,17 +46,14 @@
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Constraints\NotBlank;
 
+/**
+ * @extends AbstractType<Address>
+ */
 class AddressFormType extends AbstractType
 {
-    /**
-     * @var Shopware_Components_Config
-     */
-    private $config;
+    private Shopware_Components_Config $config;
 
-    /**
-     * @var ModelManager
-     */
-    private $models;
+    private ModelManager $models;
 
     public function __construct(Shopware_Components_Config $config, ModelManager $models)
     {
@@ -63,6 +61,9 @@ public function __construct(Shopware_Components_Config $config, ModelManager $mo
         $this->models = $models;
     }
 
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
@@ -79,19 +80,24 @@ public function getBlockPrefix()
         return 'address';
     }
 
+    /**
+     * @return void
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
             $data = $event->getData();
-            array_walk_recursive($data, function (&$item) {
-                $item = strip_tags($item);
+            array_walk_recursive($data, static function (&$item) {
+                $item = strip_tags((string) $item);
             });
             $event->setData($data);
         });
 
-        $builder->add('salutation', SalutationType::class, [
-            'constraints' => [new NotBlank(['message' => null])],
-        ]);
+        if ($this->config->get('shopSalutationRequired')) {
+            $builder->add('salutation', SalutationType::class, [
+                'constraints' => [new NotBlank(['message' => null])],
+            ]);
+        }
 
         $builder->add('firstname', TextType::class, [
             'constraints' => [new NotBlank(['message' => null])],
@@ -128,11 +134,11 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         ]);
 
         $builder->add('additionalAddressLine1', TextType::class, [
-            'constraints' => $this->getAdditionalAddressline1Constraints(),
+            'constraints' => $this->getAdditionalAddressLine1Constraints(),
         ]);
 
         $builder->add('additionalAddressLine2', TextType::class, [
-            'constraints' => $this->getAdditionalAddressline2Constraints(),
+            'constraints' => $this->getAdditionalAddressLine2Constraints(),
         ]);
 
         // convert IDs to entities
@@ -143,8 +149,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'data_class' => AddressAttribute::class,
         ]);
 
-        //dynamic field which contains multiple values
-        //used for extendable data which has not to persist over attributes
+        // dynamic field which contains multiple values
+        // used for extendable data which has not to persist over attributes
         $builder->add('additional', null, [
             'compound' => true,
             'allow_extra_fields' => true,
@@ -161,19 +167,19 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $this->addCountryStateValidation($builder);
         $this->addCompanyValidation($builder);
 
-        if ($this->config->offsetGet('vatcheckrequired')) {
+        if ($this->config->get('vatcheckrequired')) {
             $this->addVatIdValidation($builder);
         }
     }
 
     /**
-     * @return Constraint[]
+     * @return list<Constraint>
      */
-    private function getPhoneConstraints()
+    private function getPhoneConstraints(): array
     {
         $constraints = [];
 
-        if ($this->config->offsetGet('showphonenumberfield') && $this->config->offsetGet('requirePhoneField')) {
+        if ($this->config->get('showphonenumberfield') && $this->config->get('requirePhoneField')) {
             $constraints[] = new NotBlank(['message' => null]);
         }
 
@@ -181,13 +187,13 @@ private function getPhoneConstraints()
     }
 
     /**
-     * @return Constraint[]
+     * @return list<Constraint>
      */
-    private function getAdditionalAddressline1Constraints()
+    private function getAdditionalAddressLine1Constraints(): array
     {
         $constraints = [];
 
-        if ($this->config->offsetGet('showAdditionAddressLine1') && $this->config->offsetGet('requireAdditionAddressLine1')) {
+        if ($this->config->get('showAdditionAddressLine1') && $this->config->get('requireAdditionAddressLine1')) {
             $constraints[] = new NotBlank(['message' => null]);
         }
 
@@ -195,20 +201,23 @@ private function getAdditionalAddressline1Constraints()
     }
 
     /**
-     * @return Constraint[]
+     * @return list<Constraint>
      */
-    private function getAdditionalAddressline2Constraints()
+    private function getAdditionalAddressLine2Constraints(): array
     {
         $constraints = [];
 
-        if ($this->config->offsetGet('showAdditionAddressLine2') && $this->config->offsetGet('requireAdditionAddressLine2')) {
+        if ($this->config->get('showAdditionAddressLine2') && $this->config->get('requireAdditionAddressLine2')) {
             $constraints[] = new NotBlank(['message' => null]);
         }
 
         return $constraints;
     }
 
-    private function addCompanyValidation(FormBuilderInterface $builder)
+    /**
+     * @param FormBuilderInterface<Address|null> $builder
+     */
+    private function addCompanyValidation(FormBuilderInterface $builder): void
     {
         $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
             $form = $event->getForm();
@@ -228,7 +237,10 @@ private function addCompanyValidation(FormBuilderInterface $builder)
         });
     }
 
-    private function addVatIdValidation(FormBuilderInterface $builder)
+    /**
+     * @param FormBuilderInterface<Address|null> $builder
+     */
+    private function addVatIdValidation(FormBuilderInterface $builder): void
     {
         $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
             $form = $event->getForm();
@@ -248,7 +260,10 @@ private function addVatIdValidation(FormBuilderInterface $builder)
         });
     }
 
-    private function addCountryStateValidation(FormBuilderInterface $builder)
+    /**
+     * @param FormBuilderInterface<Address|null> $builder
+     */
+    private function addCountryStateValidation(FormBuilderInterface $builder): void
     {
         $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
             $form = $event->getForm();
diff --git a/engine/Shopware/Bundle/AccountBundle/Form/Account/AttributeFormType.php b/engine/Shopware/Bundle/AccountBundle/Form/Account/AttributeFormType.php
index 56a2c5c15c7..3520bad9ab5 100644
--- a/engine/Shopware/Bundle/AccountBundle/Form/Account/AttributeFormType.php
+++ b/engine/Shopware/Bundle/AccountBundle/Form/Account/AttributeFormType.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AccountBundle\Form\Account;
@@ -35,6 +35,9 @@
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
+/**
+ * @extends AbstractType<ModelEntity>
+ */
 class AttributeFormType extends AbstractType
 {
     /**
@@ -95,7 +98,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $builder->add($field);
         }
 
-        //set default value for all attribute fields to prevent null override if a field isn't in the submit data
+        // set default value for all attribute fields to prevent null override if a field isn't in the submit data
         $builder->addEventListener(FormEvents::POST_SET_DATA, function (FormEvent $event) use ($attributes, $metaData) {
             try {
                 $form = $event->getForm();
diff --git a/engine/Shopware/Bundle/AccountBundle/Form/Account/EmailUpdateFormType.php b/engine/Shopware/Bundle/AccountBundle/Form/Account/EmailUpdateFormType.php
index bd3daa1e4ec..d5de6bb8cf7 100644
--- a/engine/Shopware/Bundle/AccountBundle/Form/Account/EmailUpdateFormType.php
+++ b/engine/Shopware/Bundle/AccountBundle/Form/Account/EmailUpdateFormType.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AccountBundle\Form\Account;
@@ -39,6 +39,8 @@
 
 /**
  * Form reflects the needed fields for changing the email address in the account
+ *
+ * @extends AbstractType<Customer>
  */
 class EmailUpdateFormType extends AbstractType
 {
diff --git a/engine/Shopware/Bundle/AccountBundle/Form/Account/PasswordUpdateFormType.php b/engine/Shopware/Bundle/AccountBundle/Form/Account/PasswordUpdateFormType.php
index 41745d51fbe..cdce8ac044b 100644
--- a/engine/Shopware/Bundle/AccountBundle/Form/Account/PasswordUpdateFormType.php
+++ b/engine/Shopware/Bundle/AccountBundle/Form/Account/PasswordUpdateFormType.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AccountBundle\Form\Account;
@@ -36,6 +36,8 @@
 
 /**
  * Form reflects the needed fields for changing the password address in the account
+ *
+ * @extends AbstractType<Customer>
  */
 class PasswordUpdateFormType extends AbstractType
 {
diff --git a/engine/Shopware/Bundle/AccountBundle/Form/Account/PersonalFormType.php b/engine/Shopware/Bundle/AccountBundle/Form/Account/PersonalFormType.php
index f78034cf3f4..28435c05660 100644
--- a/engine/Shopware/Bundle/AccountBundle/Form/Account/PersonalFormType.php
+++ b/engine/Shopware/Bundle/AccountBundle/Form/Account/PersonalFormType.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AccountBundle\Form\Account;
@@ -44,18 +44,32 @@
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Constraints\EqualTo;
 use Symfony\Component\Validator\Constraints\NotBlank;
+use Symfony\Component\Validator\Constraints\Regex;
 
 /**
  * Form reflects the personal fields for the registration, including auth
+ *
+ * @extends AbstractType<Customer>
  */
 class PersonalFormType extends AbstractType
 {
+    /**
+     * The regex to check if string contains an url
+     */
+    public const DOMAIN_NAME_REGEX = '/(http[s]?\:\/\/)?(?!\-)(?:[a-zA-Z\d\-]{0,62}[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63}/';
+
     public const SNIPPET_BIRTHDAY = [
         'namespace' => 'frontend/account/internalMessages',
         'name' => 'DateFailure',
         'default' => 'Please enter a valid birthday',
     ];
 
+    public const SNIPPET_URL = [
+        'namespace' => 'frontend/account/internalMessages',
+        'name' => 'UrlInFieldFailure',
+        'default' => 'A URL is not allowed in this field',
+    ];
+
     /**
      * @var Shopware_Components_Snippet_Manager
      */
@@ -142,18 +156,28 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'data' => 'private',
         ]);
 
-        $builder->add('salutation', SalutationType::class, [
-            'constraints' => [new NotBlank(['message' => null])],
-        ]);
+        if ($this->config->get('shopSalutationRequired')) {
+            $builder->add('salutation', SalutationType::class, [
+                'constraints' => [new NotBlank(['message' => null])],
+            ]);
+        }
 
         $builder->add('title', TextType::class);
 
         $builder->add('firstname', TextType::class, [
-            'constraints' => [new NotBlank(['message' => null])],
+            'constraints' => [new NotBlank(['message' => null]), new Regex([
+                'pattern' => self::DOMAIN_NAME_REGEX,
+                'match' => false,
+                'message' => $this->getSnippet(self::SNIPPET_URL),
+            ])],
         ]);
 
         $builder->add('lastname', TextType::class, [
-            'constraints' => [new NotBlank(['message' => null])],
+            'constraints' => [new NotBlank(['message' => null]), new Regex([
+                'pattern' => self::DOMAIN_NAME_REGEX,
+                'match' => false,
+                'message' => $this->getSnippet(self::SNIPPET_URL),
+            ])],
         ]);
 
         $builder->add('birthday', BirthdayType::class, [
diff --git a/engine/Shopware/Bundle/AccountBundle/Form/Account/ProfileUpdateFormType.php b/engine/Shopware/Bundle/AccountBundle/Form/Account/ProfileUpdateFormType.php
index 16769a00673..a48e208d69a 100644
--- a/engine/Shopware/Bundle/AccountBundle/Form/Account/ProfileUpdateFormType.php
+++ b/engine/Shopware/Bundle/AccountBundle/Form/Account/ProfileUpdateFormType.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AccountBundle\Form\Account;
@@ -40,6 +40,8 @@
 
 /**
  * Form reflects the needed fields for changing the email address in the account
+ *
+ * @extends AbstractType<Customer>
  */
 class ProfileUpdateFormType extends AbstractType
 {
@@ -79,9 +81,11 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $event->setData($data);
         });
 
-        $builder->add('salutation', SalutationType::class, [
-            'constraints' => [new NotBlank(['message' => null])],
-        ]);
+        if ($this->config->get('shopSalutationRequired')) {
+            $builder->add('salutation', SalutationType::class, [
+                'constraints' => [new NotBlank(['message' => null])],
+            ]);
+        }
 
         $builder->add('title', TextType::class);
 
diff --git a/engine/Shopware/Bundle/AccountBundle/Form/Account/ResetPasswordFormType.php b/engine/Shopware/Bundle/AccountBundle/Form/Account/ResetPasswordFormType.php
index 43b0994a550..8bc24dc579a 100644
--- a/engine/Shopware/Bundle/AccountBundle/Form/Account/ResetPasswordFormType.php
+++ b/engine/Shopware/Bundle/AccountBundle/Form/Account/ResetPasswordFormType.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AccountBundle\Form\Account;
@@ -32,7 +32,9 @@
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
- * Form reflects the needed fields for resetting the password without logged in user
+ * Form reflects the needed fields for resetting the password without logged-in customer
+ *
+ * @extends AbstractType<Customer>
  */
 class ResetPasswordFormType extends AbstractType
 {
diff --git a/engine/Shopware/Bundle/AccountBundle/Service/AddressService.php b/engine/Shopware/Bundle/AccountBundle/Service/AddressService.php
index 63487288f15..f14981acf0b 100644
--- a/engine/Shopware/Bundle/AccountBundle/Service/AddressService.php
+++ b/engine/Shopware/Bundle/AccountBundle/Service/AddressService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AccountBundle\Service;
diff --git a/engine/Shopware/Bundle/AccountBundle/Service/AddressServiceInterface.php b/engine/Shopware/Bundle/AccountBundle/Service/AddressServiceInterface.php
index c1ba4e7e10c..65bda0797d7 100644
--- a/engine/Shopware/Bundle/AccountBundle/Service/AddressServiceInterface.php
+++ b/engine/Shopware/Bundle/AccountBundle/Service/AddressServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AccountBundle\Service;
@@ -29,19 +29,32 @@
 
 interface AddressServiceInterface
 {
+    /**
+     * @return void
+     */
     public function create(Address $address, Customer $customer);
 
+    /**
+     * @return void
+     */
     public function update(Address $address);
 
+    /**
+     * @return void
+     */
     public function delete(Address $address);
 
     /**
      * Sets the address to the default billing address in the customer model
+     *
+     * @return void
      */
     public function setDefaultBillingAddress(Address $address);
 
     /**
      * Sets the address to the default shipping address in the customer model
+     *
+     * @return void
      */
     public function setDefaultShippingAddress(Address $address);
 }
diff --git a/engine/Shopware/Bundle/AccountBundle/Service/CustomerService.php b/engine/Shopware/Bundle/AccountBundle/Service/CustomerService.php
index c4857e9774e..83a581c2bb0 100644
--- a/engine/Shopware/Bundle/AccountBundle/Service/CustomerService.php
+++ b/engine/Shopware/Bundle/AccountBundle/Service/CustomerService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AccountBundle\Service;
diff --git a/engine/Shopware/Bundle/AccountBundle/Service/CustomerServiceInterface.php b/engine/Shopware/Bundle/AccountBundle/Service/CustomerServiceInterface.php
index b19512c565a..33db64fc228 100644
--- a/engine/Shopware/Bundle/AccountBundle/Service/CustomerServiceInterface.php
+++ b/engine/Shopware/Bundle/AccountBundle/Service/CustomerServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AccountBundle\Service;
@@ -28,5 +28,8 @@
 
 interface CustomerServiceInterface
 {
+    /**
+     * @return void
+     */
     public function update(Customer $customer);
 }
diff --git a/engine/Shopware/Bundle/AccountBundle/Service/CustomerUnlockService.php b/engine/Shopware/Bundle/AccountBundle/Service/CustomerUnlockService.php
index c13c683e72c..1054952c3ee 100644
--- a/engine/Shopware/Bundle/AccountBundle/Service/CustomerUnlockService.php
+++ b/engine/Shopware/Bundle/AccountBundle/Service/CustomerUnlockService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AccountBundle\Service;
@@ -45,6 +45,6 @@ public function __construct(Connection $connection)
      */
     public function unlock($customerId)
     {
-        $this->connection->update('s_user', ['lockedUntil' => null, 'failedlogins' => 0], ['id' => $customerId]);
+        $this->connection->update('s_user', ['lockeduntil' => null, 'failedlogins' => 0], ['id' => $customerId]);
     }
 }
diff --git a/engine/Shopware/Bundle/AccountBundle/Service/CustomerUnlockServiceInterface.php b/engine/Shopware/Bundle/AccountBundle/Service/CustomerUnlockServiceInterface.php
index ba39b31ffa8..c1cfb1d1335 100644
--- a/engine/Shopware/Bundle/AccountBundle/Service/CustomerUnlockServiceInterface.php
+++ b/engine/Shopware/Bundle/AccountBundle/Service/CustomerUnlockServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AccountBundle\Service;
@@ -28,6 +28,8 @@ interface CustomerUnlockServiceInterface
 {
     /**
      * @param int $customerId
+     *
+     * @return void
      */
     public function unlock($customerId);
 }
diff --git a/engine/Shopware/Bundle/AccountBundle/Service/OptInLoginService.php b/engine/Shopware/Bundle/AccountBundle/Service/OptInLoginService.php
index 5f56a376c95..002ee60997d 100644
--- a/engine/Shopware/Bundle/AccountBundle/Service/OptInLoginService.php
+++ b/engine/Shopware/Bundle/AccountBundle/Service/OptInLoginService.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AccountBundle\Service;
diff --git a/engine/Shopware/Bundle/AccountBundle/Service/OptInLoginServiceInterface.php b/engine/Shopware/Bundle/AccountBundle/Service/OptInLoginServiceInterface.php
index 11c79274660..3bb5da66e41 100644
--- a/engine/Shopware/Bundle/AccountBundle/Service/OptInLoginServiceInterface.php
+++ b/engine/Shopware/Bundle/AccountBundle/Service/OptInLoginServiceInterface.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AccountBundle\Service;
diff --git a/engine/Shopware/Bundle/AccountBundle/Service/RegisterService.php b/engine/Shopware/Bundle/AccountBundle/Service/RegisterService.php
index 84924291c37..75d5894849a 100644
--- a/engine/Shopware/Bundle/AccountBundle/Service/RegisterService.php
+++ b/engine/Shopware/Bundle/AccountBundle/Service/RegisterService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AccountBundle\Service;
@@ -106,7 +106,7 @@ public function register(
         ShopStruct $shop,
         Customer $customer,
         Address $billing,
-        Address $shipping = null
+        ?Address $shipping = null
     ) {
         $this->modelManager->beginTransaction();
         try {
@@ -234,7 +234,7 @@ private function getPartnerId(Customer $customer): int
     private function doubleOptInVerificationMail(ShopStruct $shop, Customer $customer, string $hash): void
     {
         $container = Shopware()->Container();
-        $router = Shopware()->Front()->Router();
+        $router = Shopware()->Front()->ensureRouter();
 
         $shopModel = $this->modelManager->getRepository(ShopModel::class)->getById($shop->getId());
         if ($shopModel === null) {
diff --git a/engine/Shopware/Bundle/AccountBundle/Service/RegisterServiceInterface.php b/engine/Shopware/Bundle/AccountBundle/Service/RegisterServiceInterface.php
index 2a99021bb27..89ec70ea46a 100644
--- a/engine/Shopware/Bundle/AccountBundle/Service/RegisterServiceInterface.php
+++ b/engine/Shopware/Bundle/AccountBundle/Service/RegisterServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AccountBundle\Service;
@@ -30,5 +30,8 @@
 
 interface RegisterServiceInterface
 {
-    public function register(Shop $shop, Customer $customer, Address $billing, Address $shipping = null);
+    /**
+     * @return void
+     */
+    public function register(Shop $shop, Customer $customer, Address $billing, ?Address $shipping = null);
 }
diff --git a/engine/Shopware/Bundle/AccountBundle/Service/StoreFrontCustomerGreetingService.php b/engine/Shopware/Bundle/AccountBundle/Service/StoreFrontCustomerGreetingService.php
index 5f6cfdd4154..ab7d3a384cc 100644
--- a/engine/Shopware/Bundle/AccountBundle/Service/StoreFrontCustomerGreetingService.php
+++ b/engine/Shopware/Bundle/AccountBundle/Service/StoreFrontCustomerGreetingService.php
@@ -1,54 +1,46 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AccountBundle\Service;
 
 use Doctrine\DBAL\Connection;
-use Enlight_Components_Session_Namespace;
-use Shopware_Components_Config;
+use Enlight_Components_Session_Namespace as Session;
+use Shopware\Models\Customer\Customer;
+use Shopware_Components_Config as Config;
 
 class StoreFrontCustomerGreetingService implements StoreFrontCustomerGreetingServiceInterface
 {
-    /**
-     * @var Enlight_Components_Session_Namespace
-     */
-    private $session;
+    private Session $session;
 
-    /**
-     * @var Connection
-     */
-    private $connection;
+    private Connection $connection;
 
-    /**
-     * @var Shopware_Components_Config
-     */
-    private $config;
+    private Config $config;
 
     public function __construct(
-        Enlight_Components_Session_Namespace $session,
+        Session $session,
         Connection $connection,
-        Shopware_Components_Config $config
+        Config $config
     ) {
         $this->session = $session;
         $this->connection = $connection;
@@ -63,26 +55,26 @@ public function fetch()
         if (!$this->config->get('useSltCookie')) {
             return null;
         }
-        if ($this->session->sOneTimeAccount) {
+        if ($this->session->get('sOneTimeAccount')) {
             return null;
         }
 
-        if (!isset($this->session->userInfo)) {
-            $this->session->userInfo = $this->fetchUserInfo();
+        if (!$this->session->get('userInfo')) {
+            $this->session->set('userInfo', $this->fetchCustomerInfo());
         }
 
-        if ($this->session->userInfo['accountmode'] == 1) {
-            $this->session->sOneTimeAccount = true;
-            $this->session->userInfo = null;
+        if ($this->session->get('userInfo') && (int) $this->session->get('userInfo')['accountmode'] === Customer::ACCOUNT_MODE_FAST_LOGIN) {
+            $this->session->set('sOneTimeAccount', true);
+            $this->session->set('userInfo', null);
         }
 
-        return $this->session->userInfo;
+        return $this->session->get('userInfo');
     }
 
     /**
-     * @return array|null
+     * @return array<string, mixed>|null
      */
-    private function fetchUserInfo()
+    private function fetchCustomerInfo(): ?array
     {
         $userId = $this->session->offsetGet('sUserId');
         if (!$userId) {
@@ -93,9 +85,13 @@ private function fetchUserInfo()
             return null;
         }
 
-        return $this->connection->fetchAssoc(
-            'SELECT firstname, lastname, email, salutation, title, birthday, accountmode FROM s_user WHERE id = :id',
+        $customerInfo = $this->connection->fetchAssociative(
+            'SELECT firstname, lastname, email, salutation, title, birthday, accountmode
+             FROM s_user
+             WHERE id = :id',
             [':id' => $userId]
         );
+
+        return $customerInfo ?: null;
     }
 }
diff --git a/engine/Shopware/Bundle/AccountBundle/Service/StoreFrontCustomerGreetingServiceInterface.php b/engine/Shopware/Bundle/AccountBundle/Service/StoreFrontCustomerGreetingServiceInterface.php
index 9a4f6c254eb..6ba68ff2901 100644
--- a/engine/Shopware/Bundle/AccountBundle/Service/StoreFrontCustomerGreetingServiceInterface.php
+++ b/engine/Shopware/Bundle/AccountBundle/Service/StoreFrontCustomerGreetingServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AccountBundle\Service;
@@ -30,7 +30,7 @@ interface StoreFrontCustomerGreetingServiceInterface
      * Returns the customer information for the header greeting "hi, max"
      * In case that the slt configuration is disabled, or no customer can be detected, the function returns null.
      *
-     * @return array|null
+     * @return array<string, mixed>|null
      */
     public function fetch();
 }
diff --git a/engine/Shopware/Bundle/AccountBundle/Service/Validator/AddressValidator.php b/engine/Shopware/Bundle/AccountBundle/Service/Validator/AddressValidator.php
index 0b605ec15b6..cff111aadd1 100644
--- a/engine/Shopware/Bundle/AccountBundle/Service/Validator/AddressValidator.php
+++ b/engine/Shopware/Bundle/AccountBundle/Service/Validator/AddressValidator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AccountBundle\Service\Validator;
@@ -59,7 +59,9 @@ public function validate(Address $address)
         $additional = $address->getAdditional();
         $customerType = !empty($additional['customer_type']) ? $additional['customer_type'] : null;
 
-        $this->validateField('salutation', $address->getSalutation(), [new NotBlank()]);
+        if ($this->config->get('shopSalutationRequired')) {
+            $this->validateField('salutation', $address->getSalutation(), [new NotBlank()]);
+        }
         $this->validateField('firstname', $address->getFirstname(), [new NotBlank()]);
         $this->validateField('lastname', $address->getLastname(), [new NotBlank()]);
         $this->validateField('street', $address->getStreet(), [new NotBlank()]);
diff --git a/engine/Shopware/Bundle/AccountBundle/Service/Validator/AddressValidatorInterface.php b/engine/Shopware/Bundle/AccountBundle/Service/Validator/AddressValidatorInterface.php
index 2ccece16244..2c1469c5149 100644
--- a/engine/Shopware/Bundle/AccountBundle/Service/Validator/AddressValidatorInterface.php
+++ b/engine/Shopware/Bundle/AccountBundle/Service/Validator/AddressValidatorInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AccountBundle\Service\Validator;
@@ -31,6 +31,8 @@ interface AddressValidatorInterface
 {
     /**
      * @throws ValidationException
+     *
+     * @return void
      */
     public function validate(Address $address);
 
diff --git a/engine/Shopware/Bundle/AccountBundle/Service/Validator/CustomerValidator.php b/engine/Shopware/Bundle/AccountBundle/Service/Validator/CustomerValidator.php
index 99cfd063b69..27330d4d5e3 100644
--- a/engine/Shopware/Bundle/AccountBundle/Service/Validator/CustomerValidator.php
+++ b/engine/Shopware/Bundle/AccountBundle/Service/Validator/CustomerValidator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AccountBundle\Service\Validator;
@@ -64,7 +64,12 @@ public function validate(Customer $customer)
 
         $this->validateField('firstname', $customer->getFirstname(), [new NotBlank()]);
         $this->validateField('lastname', $customer->getLastname(), [new NotBlank()]);
-        $this->validateField('salutation', $customer->getSalutation(), $this->getSalutationConstraints());
+
+        $salutationRequired = $this->config->get('shopsalutationrequired');
+        if ($salutationRequired) {
+            $this->validateField('salutation', $customer->getSalutation(), $this->getSalutationConstraints());
+        }
+
         $this->validateField('email', $customer->getEmail(), [
             new CustomerEmail([
                 'shop' => $this->context->getShopContext()->getShop(),
@@ -107,6 +112,6 @@ private function getSalutationConstraints(): array
     {
         $salutations = explode(',', $this->config->get('shopsalutations'));
 
-        return [new NotBlank(), new Choice(['choices' => $salutations])];
+        return [new Choice(['choices' => $salutations])];
     }
 }
diff --git a/engine/Shopware/Bundle/AccountBundle/Service/Validator/CustomerValidatorInterface.php b/engine/Shopware/Bundle/AccountBundle/Service/Validator/CustomerValidatorInterface.php
index c5209fb6240..d5a3f487fb2 100644
--- a/engine/Shopware/Bundle/AccountBundle/Service/Validator/CustomerValidatorInterface.php
+++ b/engine/Shopware/Bundle/AccountBundle/Service/Validator/CustomerValidatorInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AccountBundle\Service\Validator;
@@ -31,6 +31,8 @@ interface CustomerValidatorInterface
 {
     /**
      * @throws ValidationException
+     *
+     * @return void
      */
     public function validate(Customer $customer);
 
diff --git a/engine/Shopware/Bundle/AccountBundle/Type/SalutationType.php b/engine/Shopware/Bundle/AccountBundle/Type/SalutationType.php
index 5535522b7ab..9af6a26ce30 100644
--- a/engine/Shopware/Bundle/AccountBundle/Type/SalutationType.php
+++ b/engine/Shopware/Bundle/AccountBundle/Type/SalutationType.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AccountBundle\Type;
@@ -29,6 +29,9 @@
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
+/**
+ * @extends AbstractType<list<string>>
+ */
 class SalutationType extends AbstractType
 {
     /**
diff --git a/engine/Shopware/Bundle/AttributeBundle/AttributeBundle.php b/engine/Shopware/Bundle/AttributeBundle/AttributeBundle.php
index e1ce1aa3473..08b6b106be6 100644
--- a/engine/Shopware/Bundle/AttributeBundle/AttributeBundle.php
+++ b/engine/Shopware/Bundle/AttributeBundle/AttributeBundle.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/AttributeData.php b/engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/AttributeData.php
index b98e6119104..224da2304d2 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/AttributeData.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/AttributeData.php
@@ -1,30 +1,31 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Bundle\AttributeBundle\Service\ConfigurationStruct;
 use Shopware\Bundle\AttributeBundle\Service\CrudServiceInterface;
 use Shopware\Bundle\AttributeBundle\Service\DataLoaderInterface;
+use Shopware\Bundle\AttributeBundle\Service\DataPersisterInterface;
 
 class Shopware_Controllers_Backend_AttributeData extends Shopware_Controllers_Backend_ExtJs
 {
@@ -59,8 +60,7 @@ public function loadDataAction()
 
     public function saveDataAction()
     {
-        /** @var \Shopware\Bundle\AttributeBundle\Service\DataPersisterInterface $dataPersister */
-        $dataPersister = $this->get(\Shopware\Bundle\AttributeBundle\Service\DataPersisterInterface::class);
+        $dataPersister = $this->get(DataPersisterInterface::class);
 
         $data = [];
         foreach ($this->Request()->getParams() as $key => $value) {
@@ -135,7 +135,7 @@ private function translateColumns(array $columns): void
             $arrayStore = json_decode($column->getArrayStore(), true);
             if (!empty($arrayStore)) {
                 foreach ($arrayStore as &$option) {
-                    $optionKey = sprintf('%soptions_store_%s', $key, strtolower($option['key']));
+                    $optionKey = \sprintf('%soptions_store_%s', $key, strtolower($option['key']));
                     $option['value'] = $snippets->get($optionKey, $option['value']);
                 }
                 unset($option);
diff --git a/engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/Attributes.php b/engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/Attributes.php
index e99a2e1b037..ef7b4644245 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/Attributes.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/Attributes.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Bundle\AttributeBundle\Service\CrudServiceInterface;
@@ -73,11 +73,11 @@ public function resetDataAction()
         $column = $this->Request()->getParam($columnParamName);
 
         if (!$table) {
-            throw new Exception(sprintf('Required parameter "%s" not found', $tableParamName));
+            throw new Exception(\sprintf('Required parameter "%s" not found', $tableParamName));
         }
 
         if (!$column) {
-            throw new Exception(sprintf('Required parameter "%s" not found', $columnParamName));
+            throw new Exception(\sprintf('Required parameter "%s" not found', $columnParamName));
         }
 
         $schemaOperator = $this->get(SchemaOperatorInterface::class);
diff --git a/engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/EntitySearch.php b/engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/EntitySearch.php
index b7de76cb7f7..87b2f53e9c8 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/EntitySearch.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Controllers/Backend/EntitySearch.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Enlight_Controller_Request_Request as Request;
diff --git a/engine/Shopware/Bundle/AttributeBundle/DependencyInjection/Compiler/StaticResourcesCompilerPass.php b/engine/Shopware/Bundle/AttributeBundle/DependencyInjection/Compiler/StaticResourcesCompilerPass.php
index 8b80b301456..70d0837d125 100644
--- a/engine/Shopware/Bundle/AttributeBundle/DependencyInjection/Compiler/StaticResourcesCompilerPass.php
+++ b/engine/Shopware/Bundle/AttributeBundle/DependencyInjection/Compiler/StaticResourcesCompilerPass.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\DependencyInjection\Compiler;
diff --git a/engine/Shopware/Bundle/AttributeBundle/DependencyInjection/Resources/column_name_blacklist.php b/engine/Shopware/Bundle/AttributeBundle/DependencyInjection/Resources/column_name_blacklist.php
index 8289e707cb7..7261ca4ad6a 100644
--- a/engine/Shopware/Bundle/AttributeBundle/DependencyInjection/Resources/column_name_blacklist.php
+++ b/engine/Shopware/Bundle/AttributeBundle/DependencyInjection/Resources/column_name_blacklist.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 return [
diff --git a/engine/Shopware/Bundle/AttributeBundle/DependencyInjection/Resources/table_entity_mapping.php b/engine/Shopware/Bundle/AttributeBundle/DependencyInjection/Resources/table_entity_mapping.php
index e9654a5b9ba..36e682aa734 100644
--- a/engine/Shopware/Bundle/AttributeBundle/DependencyInjection/Resources/table_entity_mapping.php
+++ b/engine/Shopware/Bundle/AttributeBundle/DependencyInjection/Resources/table_entity_mapping.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 return [
diff --git a/engine/Shopware/Bundle/AttributeBundle/README.md b/engine/Shopware/Bundle/AttributeBundle/README.md
index fb4e19a1d5a..ce809a9a860 100644
--- a/engine/Shopware/Bundle/AttributeBundle/README.md
+++ b/engine/Shopware/Bundle/AttributeBundle/README.md
@@ -1,9 +1,5 @@
 # AttributeBundle
 
-- **License**: Dual license AGPL v3 / Proprietary
-- **Github Repository**: <https://github.com/shopware/shopware>
-- **Issue-Tracker**: <https://issues.shopware.com>
-
 ## Controllers
 
 There are only two controllers for handle all actions regarding attributes.
diff --git a/engine/Shopware/Bundle/AttributeBundle/Repository/CustomFacetRepository.php b/engine/Shopware/Bundle/AttributeBundle/Repository/CustomFacetRepository.php
index ef9d58e51b5..ca62ef87151 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Repository/CustomFacetRepository.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Repository/CustomFacetRepository.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Repository;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Repository/CustomerRepository.php b/engine/Shopware/Bundle/AttributeBundle/Repository/CustomerRepository.php
index 591815c7162..6ff021fe36a 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Repository/CustomerRepository.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Repository/CustomerRepository.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Repository;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Repository/GenericRepository.php b/engine/Shopware/Bundle/AttributeBundle/Repository/GenericRepository.php
index 25a7185675b..8e91954e1b6 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Repository/GenericRepository.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Repository/GenericRepository.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Repository;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Repository/OrderRepository.php b/engine/Shopware/Bundle/AttributeBundle/Repository/OrderRepository.php
index 35503eb7e49..692df76bb03 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Repository/OrderRepository.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Repository/OrderRepository.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Repository;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Repository/ProductRepository.php b/engine/Shopware/Bundle/AttributeBundle/Repository/ProductRepository.php
index a47045320ad..0d3d44957b9 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Repository/ProductRepository.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Repository/ProductRepository.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Repository;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/BlogReader.php b/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/BlogReader.php
index 476b038cf68..5e1286a5eb7 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/BlogReader.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/BlogReader.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Repository\Reader;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/CategoryReader.php b/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/CategoryReader.php
index 7c982d99d27..2e49212b5d1 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/CategoryReader.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/CategoryReader.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Repository\Reader;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/CustomerReader.php b/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/CustomerReader.php
index ac063af87aa..6b65a2a3612 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/CustomerReader.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/CustomerReader.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Repository\Reader;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/CustomerStreamReader.php b/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/CustomerStreamReader.php
index 70419a2b752..0e6584fd7e8 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/CustomerStreamReader.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/CustomerStreamReader.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Repository\Reader;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/GenericReader.php b/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/GenericReader.php
index d836adb874d..69cfd1e9f95 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/GenericReader.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/GenericReader.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Repository\Reader;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/MediaReader.php b/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/MediaReader.php
index e009745c321..ed5a3d4755f 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/MediaReader.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/MediaReader.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Repository\Reader;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/OrderReader.php b/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/OrderReader.php
index 62358e13fb8..73372266431 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/OrderReader.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/OrderReader.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Repository\Reader;
@@ -52,8 +52,8 @@ public function getList($identifiers)
         foreach ($orders as &$order) {
             $order['orderStateName'] = $namespace->get($order['orderStateKey']);
             $order['orderDocuments'] = $this->getOrderDocuments($documents, $order);
-            $order['supplierId'] = explode(',', $order['supplierId']);
-            $order['articleNumber'] = explode(',', $order['articleNumber']);
+            $order['supplierId'] = explode(',', $order['supplierId'] ?? '');
+            $order['articleNumber'] = explode(',', $order['articleNumber'] ?? '');
         }
 
         return $orders;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/PremiumReader.php b/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/PremiumReader.php
index f0501604f6c..9209eeb3316 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/PremiumReader.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/PremiumReader.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Repository\Reader;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/ProductReader.php b/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/ProductReader.php
index 89138568ddd..d771070172a 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/ProductReader.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/ProductReader.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Repository\Reader;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/PropertyOptionReader.php b/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/PropertyOptionReader.php
index bd923b82954..d9500e5d283 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/PropertyOptionReader.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/PropertyOptionReader.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Repository\Reader;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/ReaderInterface.php b/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/ReaderInterface.php
index 894c5bb6b61..74322566c53 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/ReaderInterface.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/ReaderInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Repository\Reader;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/ShopReader.php b/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/ShopReader.php
index e16d19e05aa..cd60da36613 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/ShopReader.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Repository/Reader/ShopReader.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Repository\Reader;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Repository/Registry.php b/engine/Shopware/Bundle/AttributeBundle/Repository/Registry.php
index 42760574aa2..8de705eef46 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Repository/Registry.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Repository/Registry.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Repository;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Repository/RegistryInterface.php b/engine/Shopware/Bundle/AttributeBundle/Repository/RegistryInterface.php
index 3551d65f155..c223b4947ef 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Repository/RegistryInterface.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Repository/RegistryInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Repository;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Repository/RepositoryInterface.php b/engine/Shopware/Bundle/AttributeBundle/Repository/RepositoryInterface.php
index f90b7b80b9e..2dab613766c 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Repository/RepositoryInterface.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Repository/RepositoryInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Repository;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Repository/SearchCriteria.php b/engine/Shopware/Bundle/AttributeBundle/Repository/SearchCriteria.php
index b67d27476fa..bcdad6a7566 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Repository/SearchCriteria.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Repository/SearchCriteria.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Repository;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Repository/SearchResult.php b/engine/Shopware/Bundle/AttributeBundle/Repository/SearchResult.php
index 46348a605da..08f7b99b1c0 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Repository/SearchResult.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Repository/SearchResult.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Repository;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/CategorySearcher.php b/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/CategorySearcher.php
index d1d828791c3..6cad530c6e4 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/CategorySearcher.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/CategorySearcher.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Repository\Searcher;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/CustomerSearcher.php b/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/CustomerSearcher.php
index 4fad1ede670..fa8a20edf2a 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/CustomerSearcher.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/CustomerSearcher.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Repository\Searcher;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/CustomerStreamSearcher.php b/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/CustomerStreamSearcher.php
index f41c884f8ec..cfb6ac68f7c 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/CustomerStreamSearcher.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/CustomerStreamSearcher.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Repository\Searcher;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/EmotionSearcher.php b/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/EmotionSearcher.php
index b8a43e82db2..112d5c57216 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/EmotionSearcher.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/EmotionSearcher.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Repository\Searcher;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/GenericSearcher.php b/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/GenericSearcher.php
index 976b0161f63..e57c7621899 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/GenericSearcher.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/GenericSearcher.php
@@ -1,30 +1,31 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Repository\Searcher;
 
 use Doctrine\ORM\AbstractQuery;
+use Doctrine\ORM\Query;
 use Shopware\Bundle\AttributeBundle\Repository\SearchCriteria;
 use Shopware\Components\Model\ModelEntity;
 use Shopware\Components\Model\ModelManager;
@@ -50,9 +51,8 @@ class GenericSearcher implements SearcherInterface
 
     /**
      * @param class-string<ModelEntity> $entity
-     * @param SearchBuilder             $searchBuilder
      */
-    public function __construct($entity, ModelManager $entityManager, SearchBuilder $searchBuilder = null)
+    public function __construct($entity, ModelManager $entityManager, ?SearchBuilder $searchBuilder = null)
     {
         $this->entity = $entity;
         $this->entityManager = $entityManager;
@@ -120,10 +120,11 @@ protected function getSearchFields(SearchCriteria $criteria)
      */
     protected function createResult(QueryBuilder $builder)
     {
+        /** @var Query<array<string, mixed>> $query */
         $query = $builder->getQuery();
         $query->setHydrationMode(AbstractQuery::HYDRATE_ARRAY);
         $paginator = $this->entityManager->createPaginator($query);
-        $result = $paginator->getIterator()->getArrayCopy();
+        $result = iterator_to_array($paginator);
 
         $field = $this->getIdentifierField();
         $field = explode('.', $field);
diff --git a/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/OrderSearcher.php b/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/OrderSearcher.php
index 42818a0fec9..65f15ba4e5d 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/OrderSearcher.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/OrderSearcher.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Repository\Searcher;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/PremiumSearcher.php b/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/PremiumSearcher.php
index e911d3d447f..3251436a762 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/PremiumSearcher.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/PremiumSearcher.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Repository\Searcher;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/ProductSearcher.php b/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/ProductSearcher.php
index 8beddd6e4ab..f4eb22dcc52 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/ProductSearcher.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/ProductSearcher.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Repository\Searcher;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/PropertyOptionSearcher.php b/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/PropertyOptionSearcher.php
index 4bc1b1d59e3..14ca6222b9e 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/PropertyOptionSearcher.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/PropertyOptionSearcher.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Repository\Searcher;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/SearcherInterface.php b/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/SearcherInterface.php
index 919cc1c386e..523317bb5ec 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/SearcherInterface.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/SearcherInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Repository\Searcher;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/SearcherResult.php b/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/SearcherResult.php
index 8220f54dc00..26c8f3aa772 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/SearcherResult.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Repository/Searcher/SearcherResult.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Repository\Searcher;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php b/engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
index c8ed88aa823..72062bac928 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Service/ConfigurationStruct.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Service;
@@ -54,7 +54,7 @@ class ConfigurationStruct implements JsonSerializable
     /**
      * @var int|null
      */
-    private $position = null;
+    private $position;
 
     /**
      * @var bool
diff --git a/engine/Shopware/Bundle/AttributeBundle/Service/CrudService.php b/engine/Shopware/Bundle/AttributeBundle/Service/CrudService.php
index 52b93ffd7bc..32aeeab24a0 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Service/CrudService.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Service/CrudService.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Service;
@@ -31,25 +32,13 @@
 
 class CrudService implements CrudServiceInterface
 {
-    /**
-     * @var ModelManager
-     */
-    private $entityManager;
+    private ModelManager $entityManager;
 
-    /**
-     * @var SchemaOperatorInterface
-     */
-    private $schemaOperator;
+    private SchemaOperatorInterface $schemaOperator;
 
-    /**
-     * @var TableMappingInterface
-     */
-    private $tableMapping;
+    private TableMappingInterface $tableMapping;
 
-    /**
-     * @var TypeMappingInterface
-     */
-    private $typeMapping;
+    private TypeMappingInterface $typeMapping;
 
     public function __construct(
         ModelManager $entityManager,
@@ -71,7 +60,7 @@ public function delete($table, $column, $updateDependingTables = false)
         $column = $this->formatColumnName($column);
 
         if (!$this->tableMapping->isTableColumn($table, $column)) {
-            throw new RuntimeException(sprintf('Table %s has no column with name %s', $table, $column));
+            throw new RuntimeException(\sprintf('Table %s has no column with name %s', $table, $column));
         }
 
         $this->schemaOperator->dropColumn($table, $column);
@@ -140,7 +129,7 @@ public function get($table, $columnName)
 
         $columns = $this->getList($table);
         foreach ($columns as $column) {
-            if ($column->getColumnName() == $columnName) {
+            if ($column->getColumnName() === $columnName) {
                 return $column;
             }
         }
@@ -218,15 +207,12 @@ public function getList($table)
         return $items;
     }
 
-    /**
-     * @param int|null $id
-     */
-    private function updateConfig($id, array $data)
+    private function updateConfig(?int $id, array $data): void
     {
         $model = null;
 
         if ($id) {
-            $model = $this->entityManager->find('Shopware\Models\Attribute\Configuration', $id);
+            $model = $this->entityManager->find(Configuration::class, $id);
         }
 
         if (isset($data['arrayStore']) && \is_array($data['arrayStore'])) {
@@ -243,13 +229,9 @@ private function updateConfig($id, array $data)
     }
 
     /**
-     * @param string                $name
-     * @param string                $type
      * @param string|int|float|null $defaultValue
-     *
-     * @return bool
      */
-    private function schemaChanged(ConfigurationStruct $config, $name, $type, $defaultValue = null)
+    private function schemaChanged(ConfigurationStruct $config, string $name, string $type, $defaultValue = null): bool
     {
         return $config->getColumnType() !== $type
             || $config->getColumnName() !== $name
@@ -257,16 +239,11 @@ private function schemaChanged(ConfigurationStruct $config, $name, $type, $defau
         ;
     }
 
-    /**
-     * @param string $table
-     *
-     * @return array
-     */
-    private function getTableConfiguration($table)
+    private function getTableConfiguration(string $table): array
     {
         $query = $this->entityManager->createQueryBuilder();
         $query->select('configuration')
-            ->from('Shopware\Models\Attribute\Configuration', 'configuration', 'configuration.columnName')
+            ->from(Configuration::class, 'configuration', 'configuration.columnName')
             ->where('configuration.tableName = :tableName')
             ->orderBy('configuration.position')
             ->setParameter('tableName', $table);
@@ -275,14 +252,11 @@ private function getTableConfiguration($table)
     }
 
     /**
-     * @param string                $table
-     * @param string                $column
-     * @param string                $unifiedType
      * @param string|int|float|null $defaultValue
      *
      * @throws Exception
      */
-    private function createAttribute($table, $column, $unifiedType, array $data = [], $defaultValue = null)
+    private function createAttribute(string $table, string $column, string $unifiedType, array $data = [], $defaultValue = null): void
     {
         $this->schemaOperator->createColumn(
             $table,
@@ -307,23 +281,22 @@ private function createAttribute($table, $column, $unifiedType, array $data = []
     }
 
     /**
-     * @param string                $table
-     * @param string                $originalColumnName
-     * @param string                $newColumnName
-     * @param string                $unifiedType
      * @param string|int|float|null $defaultValue
      *
      * @throws Exception
      */
     private function changeAttribute(
-        $table,
-        $originalColumnName,
-        $newColumnName,
-        $unifiedType,
+        string $table,
+        string $originalColumnName,
+        string $newColumnName,
+        string $unifiedType,
         array $data = [],
         $defaultValue = null
-    ) {
+    ): void {
         $config = $this->get($table, $originalColumnName);
+        if (!$config instanceof ConfigurationStruct) {
+            return;
+        }
 
         $data = array_merge($data, [
             'tableName' => $table,
@@ -355,26 +328,25 @@ private function changeAttribute(
     }
 
     /**
-     * @param string                $type
      * @param string|int|float|null $defaultValue
      *
      * @return string|int|float
      */
-    private function parseDefaultValue($type, $defaultValue)
+    private function parseDefaultValue(string $type, $defaultValue)
     {
         $types = $this->typeMapping->getTypes();
-        $type = $types[$type];
+        $typeArray = $types[$type];
 
-        if ($type['unified'] === TypeMappingInterface::TYPE_BOOLEAN) {
+        if ($typeArray['unified'] === TypeMappingInterface::TYPE_BOOLEAN) {
             return (bool) $defaultValue === true ? 1 : 0;
         }
-        if (!$type['allowDefaultValue'] || $defaultValue === null) {
+        if (!$typeArray['allowDefaultValue'] || $defaultValue === null) {
             return CrudServiceInterface::NULL_STRING;
         }
         if ($defaultValue === CrudServiceInterface::NULL_STRING) {
             return $defaultValue;
         }
-        if ($type['quoteDefaultValue'] && $defaultValue !== null) {
+        if ($typeArray['quoteDefaultValue']) {
             return $this->entityManager->getConnection()->quote($defaultValue);
         }
 
@@ -383,12 +355,8 @@ private function parseDefaultValue($type, $defaultValue)
 
     /**
      * Process the column name to handle edge cases
-     *
-     * @param string $column
-     *
-     * @return string
      */
-    private function formatColumnName($column)
+    private function formatColumnName(string $column): string
     {
         return strtolower($column);
     }
diff --git a/engine/Shopware/Bundle/AttributeBundle/Service/CrudServiceInterface.php b/engine/Shopware/Bundle/AttributeBundle/Service/CrudServiceInterface.php
index 8fee3492b14..b5035cebf13 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Service/CrudServiceInterface.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Service/CrudServiceInterface.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Service;
@@ -35,6 +34,8 @@ interface CrudServiceInterface
      * @param string $table
      * @param string $column
      * @param bool   $updateDependingTables
+     *
+     * @return void
      */
     public function delete($table, $column, $updateDependingTables = false);
 
@@ -51,6 +52,8 @@ public function delete($table, $column, $updateDependingTables = false);
      * @param string|null           $newColumnName
      * @param bool                  $updateDependingTables
      * @param string|int|float|null $defaultValue
+     *
+     * @return void
      */
     public function update(
         $table,
diff --git a/engine/Shopware/Bundle/AttributeBundle/Service/DataLoader.php b/engine/Shopware/Bundle/AttributeBundle/Service/DataLoader.php
index 1f218f71869..314290c0e1f 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Service/DataLoader.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Service/DataLoader.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Service;
@@ -54,7 +54,7 @@ public function __construct(Connection $connection, TableMappingInterface $mappi
     public function load($table, $foreignKey)
     {
         if (!$this->mapping->isAttributeTable($table)) {
-            throw new Exception(sprintf('Table %s is no attribute table', $table));
+            throw new Exception(\sprintf('Table %s is no attribute table', $table));
         }
 
         if (!$foreignKey) {
diff --git a/engine/Shopware/Bundle/AttributeBundle/Service/DataLoaderInterface.php b/engine/Shopware/Bundle/AttributeBundle/Service/DataLoaderInterface.php
index 2aec15bd7ac..77fc25b16b7 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Service/DataLoaderInterface.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Service/DataLoaderInterface.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Service;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Service/DataPersister.php b/engine/Shopware/Bundle/AttributeBundle/Service/DataPersister.php
index 5f7780c38b7..d9eb111edf9 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Service/DataPersister.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Service/DataPersister.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Service;
@@ -64,7 +64,7 @@ public function __construct(Connection $connection, TableMappingInterface $mappi
     public function persist($data, $table, $foreignKey)
     {
         if (!$this->mapping->isAttributeTable($table)) {
-            throw new Exception(sprintf('Table %s is no attribute table', $table));
+            throw new Exception(\sprintf('Table %s is no attribute table', $table));
         }
         if (!$foreignKey) {
             throw new Exception('No foreign key provided');
@@ -94,7 +94,7 @@ public function persist($data, $table, $foreignKey)
     public function cloneAttribute($table, $sourceForeignKey, $targetForeignKey)
     {
         if (!$this->mapping->isAttributeTable($table)) {
-            throw new Exception(sprintf('Table %s is no attribute table', $table));
+            throw new Exception(\sprintf('Table %s is no attribute table', $table));
         }
         if (!$sourceForeignKey) {
             throw new Exception('No foreign key provided');
@@ -118,7 +118,7 @@ public function cloneAttribute($table, $sourceForeignKey, $targetForeignKey)
     public function cloneAttributeTranslations($table, $sourceForeignKey, $targetForeignKey)
     {
         if (!$this->mapping->isAttributeTable($table)) {
-            throw new Exception(sprintf('Table %s is no attribute table', $table));
+            throw new Exception(\sprintf('Table %s is no attribute table', $table));
         }
         if (!$sourceForeignKey) {
             throw new Exception('No foreign key provided');
diff --git a/engine/Shopware/Bundle/AttributeBundle/Service/DataPersisterInterface.php b/engine/Shopware/Bundle/AttributeBundle/Service/DataPersisterInterface.php
index b40c9f0021f..0f013b2739d 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Service/DataPersisterInterface.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Service/DataPersisterInterface.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Service;
@@ -35,6 +34,8 @@ interface DataPersisterInterface
      * @param string     $table
      * @param array      $data
      * @param int|string $foreignKey
+     *
+     * @return void
      */
     public function persist($data, $table, $foreignKey);
 
@@ -42,6 +43,8 @@ public function persist($data, $table, $foreignKey);
      * @param string $table
      * @param int    $sourceForeignKey
      * @param int    $targetForeignKey
+     *
+     * @return void
      */
     public function cloneAttribute($table, $sourceForeignKey, $targetForeignKey);
 
@@ -49,6 +52,8 @@ public function cloneAttribute($table, $sourceForeignKey, $targetForeignKey);
      * @param string $table
      * @param int    $sourceForeignKey
      * @param int    $targetForeignKey
+     *
+     * @return void
      */
     public function cloneAttributeTranslations($table, $sourceForeignKey, $targetForeignKey);
 }
diff --git a/engine/Shopware/Bundle/AttributeBundle/Service/SchemaOperator.php b/engine/Shopware/Bundle/AttributeBundle/Service/SchemaOperator.php
index 2b59e547cd4..29ed3386973 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Service/SchemaOperator.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Service/SchemaOperator.php
@@ -1,48 +1,43 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Service;
 
 use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\DBALException;
 use Exception;
 
 class SchemaOperator implements SchemaOperatorInterface
 {
-    /**
-     * @var Connection
-     */
-    private $connection;
+    private Connection $connection;
 
-    /**
-     * @var TableMappingInterface
-     */
-    private $tableMapping;
+    private TableMappingInterface $tableMapping;
 
     /**
-     * @var array
+     * @var list<string>
      */
-    private $nameBlacklist;
+    private array $nameBlacklist;
 
     public function __construct(Connection $connection, TableMappingInterface $tableMapping)
     {
@@ -54,7 +49,7 @@ public function __construct(Connection $connection, TableMappingInterface $table
     /**
      * {@inheritdoc}
      *
-     * @throws \Doctrine\DBAL\DBALException
+     * @throws DBALException
      * @throws Exception
      */
     public function createColumn($table, $column, $type, $defaultValue = null)
@@ -66,7 +61,7 @@ public function createColumn($table, $column, $type, $defaultValue = null)
             throw new Exception('No column type provided');
         }
 
-        $sql = sprintf(
+        $sql = \sprintf(
             'ALTER TABLE `%s` ADD `%s` %s NULL DEFAULT %s',
             $table,
             $column,
@@ -80,7 +75,7 @@ public function createColumn($table, $column, $type, $defaultValue = null)
     /**
      * {@inheritdoc}
      *
-     * @throws \Doctrine\DBAL\DBALException
+     * @throws DBALException
      * @throws Exception
      */
     public function changeColumn($table, $originalName, $newName, $type, $defaultValue = null)
@@ -97,7 +92,7 @@ public function changeColumn($table, $originalName, $newName, $type, $defaultVal
         $this->validateField($newName);
         $defaultValue = $this->filterDefaultValue($defaultValue);
 
-        $sql = sprintf(
+        $sql = \sprintf(
             'ALTER TABLE `%s` CHANGE `%s` `%s` %s NULL DEFAULT %s;',
             $table,
             $originalName,
@@ -112,7 +107,7 @@ public function changeColumn($table, $originalName, $newName, $type, $defaultVal
     /**
      * {@inheritdoc}
      *
-     * @throws \Doctrine\DBAL\DBALException
+     * @throws DBALException
      * @throws Exception
      */
     public function dropColumn($table, $column)
@@ -120,17 +115,17 @@ public function dropColumn($table, $column)
         $this->validate($table, $column);
 
         if ($this->tableMapping->isCoreColumn($table, $column)) {
-            throw new Exception(sprintf('Provided column is an core attribute column: %s', $column));
+            throw new Exception(\sprintf('Provided column is an core attribute column: %s', $column));
         }
 
-        $sql = sprintf('ALTER TABLE `%s` DROP `%s`', $table, $column);
+        $sql = \sprintf('ALTER TABLE `%s` DROP `%s`', $table, $column);
         $this->connection->executeQuery($sql);
     }
 
     /**
      * {@inheritdoc}
      *
-     * @throws \Doctrine\DBAL\DBALException
+     * @throws DBALException
      * @throws Exception
      */
     public function resetColumn($table, $column)
@@ -138,10 +133,10 @@ public function resetColumn($table, $column)
         $this->validate($table, $column);
 
         if (!$this->tableMapping->isTableColumn($table, $column)) {
-            throw new Exception(sprintf('Provided column %s does not exist in table %s', $column, $table));
+            throw new Exception(\sprintf('Provided column %s does not exist in table %s', $column, $table));
         }
 
-        $sql = sprintf('UPDATE `%s` SET `%s` = NULL', $table, $column);
+        $sql = \sprintf('UPDATE `%s` SET `%s` = NULL', $table, $column);
         $this->connection->executeUpdate($sql);
     }
 
@@ -151,7 +146,7 @@ public function resetColumn($table, $column)
      *
      * @throws Exception
      */
-    private function validate($table, $name)
+    private function validate($table, $name): void
     {
         if (!$table) {
             throw new Exception('No table name provided');
@@ -164,15 +159,15 @@ private function validate($table, $name)
         $this->validateField($name);
 
         if (!$this->tableMapping->isAttributeTable($table)) {
-            throw new Exception(sprintf('Provided table is no attribute table: %s', $table));
+            throw new Exception(\sprintf('Provided table is no attribute table: %s', $table));
         }
         if ($this->tableMapping->isIdentifierColumn($table, $name)) {
-            throw new Exception(sprintf('Provided column is an identifier column: %s', $name));
+            throw new Exception(\sprintf('Provided column is an identifier column: %s', $name));
         }
 
         $lowerCaseName = strtolower($name);
-        if (\in_array($lowerCaseName, $this->nameBlacklist)) {
-            throw new Exception(sprintf('Provided name %s is a reserved keyword.', $name));
+        if (\in_array($lowerCaseName, $this->nameBlacklist, true)) {
+            throw new Exception(\sprintf('Provided name %s is a reserved keyword.', $name));
         }
     }
 
@@ -181,14 +176,14 @@ private function validate($table, $name)
      *
      * @throws Exception
      */
-    private function validateField($field)
+    private function validateField($field): void
     {
         if (\strlen($field) > 64) {
             throw new Exception('Maximum length: 64 chars');
         }
 
         if (!preg_match('/^[a-zA-Z_][a-zA-Z0-9_]*$/', $field)) {
-            throw new Exception(sprintf('Invalid chars in %s', $field));
+            throw new Exception(\sprintf('Invalid chars in %s', $field));
         }
     }
 
diff --git a/engine/Shopware/Bundle/AttributeBundle/Service/SchemaOperatorInterface.php b/engine/Shopware/Bundle/AttributeBundle/Service/SchemaOperatorInterface.php
index 7cb2107020a..1ad0272d32f 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Service/SchemaOperatorInterface.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Service/SchemaOperatorInterface.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Service;
@@ -33,6 +32,8 @@ interface SchemaOperatorInterface
      * @param string                $column
      * @param string                $type
      * @param string|int|float|null $defaultValue
+     *
+     * @return void
      */
     public function createColumn($table, $column, $type, $defaultValue = null);
 
@@ -42,12 +43,16 @@ public function createColumn($table, $column, $type, $defaultValue = null);
      * @param string                $newName
      * @param string                $type
      * @param string|int|float|null $defaultValue
+     *
+     * @return void
      */
     public function changeColumn($table, $originalName, $newName, $type, $defaultValue = null);
 
     /**
      * @param string $table
      * @param string $column
+     *
+     * @return void
      */
     public function dropColumn($table, $column);
 
@@ -56,6 +61,8 @@ public function dropColumn($table, $column);
      *
      * @param string $table
      * @param string $column
+     *
+     * @return void
      */
     public function resetColumn($table, $column);
 }
diff --git a/engine/Shopware/Bundle/AttributeBundle/Service/TableMapping.php b/engine/Shopware/Bundle/AttributeBundle/Service/TableMapping.php
index a1021476acf..2b49b0ffd1a 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Service/TableMapping.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Service/TableMapping.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Service;
@@ -54,7 +54,7 @@ public function __construct(Connection $connection, array $tableMapping)
     public function isIdentifierColumn($table, $name)
     {
         if (!\array_key_exists($table, $this->tables)) {
-            throw new Exception(sprintf('Table %s is no attribute table', $table));
+            throw new Exception(\sprintf('Table %s is no attribute table', $table));
         }
         $config = $this->tables[$table];
         $identifiers = isset($config['identifiers']) ? $config['identifiers'] : [];
@@ -71,7 +71,7 @@ public function isIdentifierColumn($table, $name)
     public function isCoreColumn($table, $name)
     {
         if (!\array_key_exists($table, $this->tables)) {
-            throw new Exception(sprintf('Table %s is no attribute table', $table));
+            throw new Exception(\sprintf('Table %s is no attribute table', $table));
         }
         $config = $this->tables[$table];
         $coreAttributes = isset($config['coreAttributes']) ? $config['coreAttributes'] : [];
@@ -139,7 +139,7 @@ public function isTableColumn($table, $column)
     public function getDependingTables($table)
     {
         if (!$this->isAttributeTable($table)) {
-            throw new Exception(sprintf('Table %s is no supported attribute table', $table));
+            throw new Exception(\sprintf('Table %s is no supported attribute table', $table));
         }
 
         return $this->tables[$table]['dependingTables'];
diff --git a/engine/Shopware/Bundle/AttributeBundle/Service/TableMappingInterface.php b/engine/Shopware/Bundle/AttributeBundle/Service/TableMappingInterface.php
index 476661759c8..74868aa9c96 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Service/TableMappingInterface.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Service/TableMappingInterface.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Service;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Service/TypeMapping.php b/engine/Shopware/Bundle/AttributeBundle/Service/TypeMapping.php
index 1044cdba9a0..5e9fecb2a7a 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Service/TypeMapping.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Service/TypeMapping.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Service;
diff --git a/engine/Shopware/Bundle/AttributeBundle/Service/TypeMappingInterface.php b/engine/Shopware/Bundle/AttributeBundle/Service/TypeMappingInterface.php
index 68d16ff11f7..b2707dcb630 100644
--- a/engine/Shopware/Bundle/AttributeBundle/Service/TypeMappingInterface.php
+++ b/engine/Shopware/Bundle/AttributeBundle/Service/TypeMappingInterface.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\AttributeBundle\Service;
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/BatchableProviderInterface.php b/engine/Shopware/Bundle/BenchmarkBundle/BatchableProviderInterface.php
deleted file mode 100644
index 0f9a664d632..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/BatchableProviderInterface.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle;
-
-use Shopware\Bundle\StoreFrontBundle\Struct\ShopContextInterface;
-
-interface BatchableProviderInterface extends BenchmarkProviderInterface
-{
-    /**
-     * @param int|null $batchSize
-     *
-     * @return array<string, mixed>
-     */
-    public function getBenchmarkData(ShopContextInterface $shopContext, $batchSize = null);
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/BenchmarkBundle.php b/engine/Shopware/Bundle/BenchmarkBundle/BenchmarkBundle.php
deleted file mode 100644
index d2360d9a0d1..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/BenchmarkBundle.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle;
-
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
-use Symfony\Component\HttpKernel\Bundle\Bundle;
-
-class BenchmarkBundle extends Bundle
-{
-    public function build(ContainerBuilder $container): void
-    {
-        parent::build($container);
-
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/DependencyInjection'));
-        $loader->load('services.xml');
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/BenchmarkCollector.php b/engine/Shopware/Bundle/BenchmarkBundle/BenchmarkCollector.php
deleted file mode 100644
index 0930a640836..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/BenchmarkCollector.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle;
-
-use Exception;
-use IteratorAggregate;
-use Shopware\Bundle\BenchmarkBundle\Provider\UpdatedOrdersProvider;
-use Shopware\Bundle\StoreFrontBundle\Struct\ShopContextInterface;
-
-class BenchmarkCollector implements BenchmarkCollectorInterface
-{
-    /**
-     * @var IteratorAggregate
-     */
-    private $providers;
-
-    public function __construct(IteratorAggregate $providers)
-    {
-        $this->providers = $providers;
-    }
-
-    /**
-     * @return string
-     */
-    public static function getVersion()
-    {
-        return '1.0.3';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function get(ShopContextInterface $shopContext, $batchSize = null)
-    {
-        $providerData = [];
-
-        /** @var BenchmarkProviderInterface $provider */
-        foreach ($this->providers as $provider) {
-            if ($provider instanceof BatchableProviderInterface) {
-                // Updated Orders Provider may only be called if no initial order has to be transmitted
-                if ($provider instanceof UpdatedOrdersProvider && $providerData['orders']['list']) {
-                    $providerData[$provider->getName()]['list'] = [];
-                    continue;
-                }
-
-                $providerData[$provider->getName()] = $provider->getBenchmarkData($shopContext, $batchSize);
-
-                continue;
-            }
-
-            $providerData[$provider->getName()] = $provider->getBenchmarkData($shopContext);
-        }
-
-        $providerData = $this->moveUpdatedOrdersData($providerData);
-
-        return $this->moveShopData($providerData);
-    }
-
-    /**
-     * Moves the array element 'shop' to the parent array and deletes the 'shop' element.
-     *
-     * @throws Exception
-     *
-     * @return array
-     */
-    private function moveShopData(array $providerData)
-    {
-        $shopDataArrayKey = 'shop';
-        if (!\array_key_exists($shopDataArrayKey, $providerData)) {
-            throw new Exception(sprintf('Necessary data with name \'%s\' not provided.', $shopDataArrayKey));
-        }
-
-        $providerData = $providerData[$shopDataArrayKey] + $providerData;
-        unset($providerData[$shopDataArrayKey]);
-
-        return $providerData;
-    }
-
-    /**
-     * Moves the "updated_orders" array into the "orders" key and leaves a hint about that moving
-     *
-     * @return array
-     */
-    private function moveUpdatedOrdersData(array $providerData)
-    {
-        // Nothing to be moved
-        if (!\array_key_exists('updated_orders', $providerData) || !$providerData['updated_orders']['list']) {
-            return $providerData;
-        }
-
-        $providerData['orders'] = $providerData['updated_orders'];
-
-        // Necessary to know that the "orders" key contains the updated_orders later on
-        // This is used in the StatisticsService to update the "last_updated_orders_date" column
-        $providerData['updated_orders']['moved'] = true;
-        unset($providerData['updated_orders']['list']);
-
-        return $providerData;
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/BenchmarkCollectorInterface.php b/engine/Shopware/Bundle/BenchmarkBundle/BenchmarkCollectorInterface.php
deleted file mode 100644
index cbd478018ba..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/BenchmarkCollectorInterface.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle;
-
-use Shopware\Bundle\StoreFrontBundle\Struct\ShopContextInterface;
-
-interface BenchmarkCollectorInterface
-{
-    /**
-     * @param int $batchSize - If set, this will be used for the Orders, Customers and ProductsProvider
-     *
-     * @return array
-     */
-    public function get(ShopContextInterface $shopContext, $batchSize = null);
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/BenchmarkEncryption.php b/engine/Shopware/Bundle/BenchmarkBundle/BenchmarkEncryption.php
deleted file mode 100644
index e841ed1ad1a..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/BenchmarkEncryption.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle;
-
-use Shopware\Components\OpenSSLVerifier;
-
-class BenchmarkEncryption
-{
-    /**
-     * @var OpenSSLVerifier
-     */
-    private $verifier;
-
-    /**
-     * @param string $publicKeyPath
-     */
-    public function __construct($publicKeyPath)
-    {
-        $this->verifier = new OpenSSLVerifier($publicKeyPath);
-    }
-
-    /**
-     * @return bool
-     */
-    public function isSignatureSupported()
-    {
-        return $this->verifier->isSystemSupported();
-    }
-
-    /**
-     * @param string $message
-     * @param string $signature
-     *
-     * @return bool
-     */
-    public function isSignatureValid($message, $signature)
-    {
-        return $this->verifier->isValid($message, $signature);
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/BenchmarkProviderInterface.php b/engine/Shopware/Bundle/BenchmarkBundle/BenchmarkProviderInterface.php
deleted file mode 100644
index 186adbe5fca..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/BenchmarkProviderInterface.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle;
-
-use Shopware\Bundle\StoreFrontBundle\Struct\ShopContextInterface;
-
-interface BenchmarkProviderInterface
-{
-    /**
-     * @return string
-     */
-    public function getName();
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function getBenchmarkData(ShopContextInterface $shopContext);
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/BusinessIntelligenceClient.php b/engine/Shopware/Bundle/BenchmarkBundle/BusinessIntelligenceClient.php
deleted file mode 100644
index df4eb853af7..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/BusinessIntelligenceClient.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle;
-
-use Exception;
-use Psr\Log\LoggerInterface;
-use Psr\Log\NullLogger;
-use RuntimeException;
-use Shopware\Bundle\BenchmarkBundle\Exception\BenchmarkHydratingException;
-use Shopware\Bundle\BenchmarkBundle\Exception\BenchmarkSendingException;
-use Shopware\Bundle\BenchmarkBundle\Hydrator\HydratorInterface;
-use Shopware\Bundle\BenchmarkBundle\Struct\BusinessIntelligenceRequest;
-use Shopware\Components\HttpClient\HttpClientInterface;
-use Shopware\Components\HttpClient\Response;
-
-class BusinessIntelligenceClient implements BusinessIntelligenceClientInterface
-{
-    /**
-     * @var string
-     */
-    private $biEndpoint;
-
-    /**
-     * @var HttpClientInterface
-     */
-    private $client;
-
-    /**
-     * @var HydratorInterface
-     */
-    private $biResponseHydrator;
-
-    /**
-     * @var BenchmarkEncryption
-     */
-    private $benchmarkEncryption;
-
-    /**
-     * @var LoggerInterface|null
-     */
-    private $logger;
-
-    /**
-     * @param string $biEndpoint
-     */
-    public function __construct(
-        $biEndpoint,
-        HttpClientInterface $client,
-        HydratorInterface $biResponseHydrator,
-        BenchmarkEncryption $benchmarkEncryption,
-        LoggerInterface $logger = null
-    ) {
-        $this->biEndpoint = (string) $biEndpoint;
-        $this->client = $client;
-        $this->biResponseHydrator = $biResponseHydrator;
-        $this->benchmarkEncryption = $benchmarkEncryption;
-        $this->logger = $logger ?: new NullLogger();
-    }
-
-    /**
-     * @throws BenchmarkSendingException
-     *
-     * @return Struct\BusinessIntelligenceResponse
-     */
-    public function fetchBusinessIntelligence(BusinessIntelligenceRequest $biRequest)
-    {
-        $headers = [
-            'User-Agent' => 'Shopware',
-        ];
-
-        try {
-            $response = $this->client->get($this->biEndpoint . '?' . (string) $biRequest, $headers);
-        } catch (Exception $ex) {
-            $this->logger->warning(sprintf('Could not retrieve BI data from %s', $this->biEndpoint), [$ex]);
-
-            throw new BenchmarkSendingException('Could not retrieve BI data', 0, $ex);
-        }
-
-        return $this->hydrateBiResponse($response);
-    }
-
-    /**
-     * @throws BenchmarkHydratingException
-     *
-     * @return Struct\BusinessIntelligenceResponse
-     */
-    private function hydrateBiResponse(Response $response)
-    {
-        $data = $response->getBody();
-
-        if (empty($data)) {
-            throw new BenchmarkHydratingException(sprintf('Could not retrieve BI response: %s', $data));
-        }
-
-        $this->verifyResponseSignature($response);
-
-        return $this->biResponseHydrator->hydrate(['html' => $data]);
-    }
-
-    /**
-     * @throws RuntimeException
-     */
-    private function verifyResponseSignature(Response $response)
-    {
-        $signatureHeaderName = 'x-shopware-signature';
-        $signature = $response->getHeader($signatureHeaderName);
-
-        if (empty($signature)) {
-            throw new RuntimeException(sprintf('Signature not found in header "%s"', $signatureHeaderName));
-        }
-
-        if (!$this->benchmarkEncryption->isSignatureSupported()) {
-            return;
-        }
-
-        if ($this->benchmarkEncryption->isSignatureValid($response->getBody(), $signature)) {
-            return;
-        }
-
-        throw new RuntimeException('Signature not valid');
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/BusinessIntelligenceClientInterface.php b/engine/Shopware/Bundle/BenchmarkBundle/BusinessIntelligenceClientInterface.php
deleted file mode 100644
index dab8b43d2bd..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/BusinessIntelligenceClientInterface.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle;
-
-use Shopware\Bundle\BenchmarkBundle\Struct\BusinessIntelligenceRequest;
-use Shopware\Bundle\BenchmarkBundle\Struct\BusinessIntelligenceResponse;
-
-interface BusinessIntelligenceClientInterface
-{
-    /**
-     * @return BusinessIntelligenceResponse
-     */
-    public function fetchBusinessIntelligence(BusinessIntelligenceRequest $biRequest);
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Commands/ReceiveStatisticsCommand.php b/engine/Shopware/Bundle/BenchmarkBundle/Commands/ReceiveStatisticsCommand.php
deleted file mode 100644
index 18cea640245..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Commands/ReceiveStatisticsCommand.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle\Commands;
-
-use DateInterval;
-use DateTime;
-use DateTimeZone;
-use Shopware\Commands\ShopwareCommand;
-use Shopware\Models\Benchmark\BenchmarkConfig;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
-
-class ReceiveStatisticsCommand extends ShopwareCommand
-{
-    public function configure()
-    {
-        $this
-            ->setName('sw:benchmark:receive')
-            ->setDescription('Receives statistics data')
-            ->addArgument(
-                'shopIds',
-                InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
-                'List of shop IDs to receive benchmark statistics for. All shops will be considered if this is left empty'
-            )
-            ->addOption(
-                'force',
-                'f',
-                InputOption::VALUE_NONE,
-                'Force transmission of data even if selected shops are inactive or data were recently received'
-            )
-        ;
-    }
-
-    public function execute(InputInterface $input, OutputInterface $output)
-    {
-        $benchmarkRepository = $this->getContainer()->get('shopware.benchmark_bundle.repository.config');
-        $businessIntelligenceService = $this->getContainer()->get('shopware.benchmark_bundle.bi_transmission');
-
-        $shopIds = $input->getArgument('shopIds');
-        if (!$shopIds) {
-            $shopIds = $benchmarkRepository->getShopIds();
-        }
-
-        foreach ($shopIds as $shopId) {
-            $shopConfig = $benchmarkRepository->getConfigForShop($shopId);
-
-            if (!$shopConfig) {
-                $output->writeln(sprintf('<comment>No shop with ID %s found.</comment>', $shopId));
-                continue;
-            }
-
-            // Shop just received data. If 'force' parameter is set, this will be ignored.
-            if (!$input->getOption('force') && !$this->isShopValid($shopConfig)) {
-                $output->writeln(sprintf('<comment>No receiving of the benchmark statistics currently necessary for shop with ID %s. Use \'force\' option if you still want to receive the benchmark statistics for this shop.</comment>', $shopId));
-                continue;
-            }
-
-            $output->writeln(sprintf('Receiving benchmark statistics for shop with ID %s...', $shopId));
-            $businessIntelligenceService->transmit($shopConfig);
-            $output->writeln('<info>Done!</info>');
-        }
-
-        return 0;
-    }
-
-    /**
-     * @return bool
-     */
-    private function isShopValid(BenchmarkConfig $shopConfig)
-    {
-        return $shopConfig->isActive()
-            && $shopConfig->getLastReceived()->add(new DateInterval('P1D')) < new DateTime('now', new DateTimeZone('UTC'));
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Commands/SendStatisticsCommand.php b/engine/Shopware/Bundle/BenchmarkBundle/Commands/SendStatisticsCommand.php
deleted file mode 100644
index 6daf5c857bd..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Commands/SendStatisticsCommand.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle\Commands;
-
-use DateInterval;
-use DateTime;
-use DateTimeZone;
-use Shopware\Bundle\BenchmarkBundle\Exception\TransmissionNotNecessaryException;
-use Shopware\Commands\ShopwareCommand;
-use Shopware\Models\Benchmark\BenchmarkConfig;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
-
-class SendStatisticsCommand extends ShopwareCommand
-{
-    public const MAX_BATCH_SIZE = 3000;
-
-    public function configure()
-    {
-        $this
-            ->setName('sw:benchmark:send')
-            ->setDescription('Sends statistics data')
-            ->addArgument(
-                'shopIds',
-                InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
-                'List of shop IDs to send data for. All shops will be considered if this is left empty'
-            )
-            ->addOption(
-                'force',
-                'f',
-                InputOption::VALUE_NONE,
-                'Force transmission of data even if selected shops are inactive or data were recently sent'
-            )
-            ->addOption(
-                'batch',
-                'b',
-                InputOption::VALUE_OPTIONAL,
-                'Amount of data to be sent per request. Max 3000'
-            )
-        ;
-    }
-
-    public function execute(InputInterface $input, OutputInterface $output)
-    {
-        $benchmarkRepository = $this->getContainer()->get('shopware.benchmark_bundle.repository.config');
-        $statisticsService = $this->getContainer()->get('shopware.benchmark_bundle.statistics_transmission');
-
-        $benchmarkRepository->synchronizeShops();
-
-        $shopIds = $input->getArgument('shopIds');
-        if (!$shopIds) {
-            $shopIds = $benchmarkRepository->getShopIds();
-        }
-
-        foreach ($shopIds as $shopId) {
-            $shopId = (int) $shopId;
-            $shopConfig = $benchmarkRepository->getConfigForShop($shopId);
-
-            if (!$shopConfig) {
-                $output->writeln(sprintf('<comment>No shop with ID %s found.</comment>', $shopId));
-                continue;
-            }
-
-            $locked = $shopConfig->getLocked();
-            $dateOneHourAgo = new DateTime('now');
-            $dateOneHourAgo->sub(new DateInterval('PT1H'));
-
-            if ($locked && $locked > $dateOneHourAgo) {
-                $output->writeln(sprintf('<comment>Shop with ID %s is currently locked, skipping.</comment>', $shopId));
-                continue;
-            }
-
-            // Shop doesn't have to send data. If 'force' parameter is set, this will be ignored.
-            if (!$input->getOption('force') && !$this->isShopValid($shopConfig)) {
-                $output->writeln(sprintf('<comment>No transmission currently necessary for shop with ID %s. Use \'force\' option if you still want to transmit data for this shop.</comment>', $shopId));
-                continue;
-            }
-
-            $benchmarkRepository->lockShop($shopId);
-
-            $output->writeln(sprintf('Sending statistics for shop with ID %s...', $shopId));
-
-            try {
-                $batchSize = null;
-
-                if ($input->getOption('batch')) {
-                    $batchSize = (int) $input->getOption('batch');
-
-                    if ($batchSize > $this::MAX_BATCH_SIZE) {
-                        $batchSize = $this::MAX_BATCH_SIZE;
-                    }
-                }
-
-                while (true) {
-                    $statisticsService->transmit($shopConfig, $batchSize);
-                }
-            } catch (TransmissionNotNecessaryException $e) {
-                $output->writeln('<info>Done!</info>');
-            } finally {
-                $benchmarkRepository->unlockShop($shopId);
-            }
-        }
-
-        return 0;
-    }
-
-    private function isShopValid(BenchmarkConfig $shopConfig): bool
-    {
-        return $shopConfig->isActive()
-            && $shopConfig->getLastSent()->add(new DateInterval('P1D')) < new DateTime('now', new DateTimeZone('UTC'));
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Controllers/Backend/Benchmark.php b/engine/Shopware/Bundle/BenchmarkBundle/Controllers/Backend/Benchmark.php
deleted file mode 100644
index bd21a82f1d3..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Controllers/Backend/Benchmark.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-use Doctrine\DBAL\Connection;
-use Shopware\Bundle\BenchmarkBundle\Struct\BenchmarkDataResult;
-use Shopware\Components\CacheManager;
-
-class Shopware_Controllers_Backend_Benchmark extends Shopware_Controllers_Backend_ExtJs
-{
-    public function getShopConfigsAction()
-    {
-        try {
-            $benchmarkRepository = $this->get('shopware.benchmark_bundle.repository.config');
-            $benchmarkRepository->synchronizeShops();
-
-            $this->View()->assign([
-                'success' => true,
-                'data' => array_values($benchmarkRepository->getShopConfigs(true)),
-            ]);
-        } catch (Exception $e) {
-            $this->View()->assign(['success' => false, 'message' => $e->getMessage()]);
-        }
-    }
-
-    public function saveIndustryAction()
-    {
-        try {
-            $benchmarkRepository = $this->get('shopware.benchmark_bundle.repository.config');
-
-            $benchmarkConfig = $benchmarkRepository->getConfigForShop($this->request->getParam('shopId'));
-            $benchmarkConfig->setIndustry((int) $this->request->getParam('industry'));
-
-            $benchmarkRepository->save($benchmarkConfig);
-
-            $this->View()->assign('success', true);
-        } catch (Exception $e) {
-            $this->View()->assign(['success' => false, 'message' => $e->getMessage()]);
-        }
-    }
-
-    public function setActiveAction()
-    {
-        try {
-            $benchmarkRepository = $this->get('shopware.benchmark_bundle.repository.config');
-
-            $benchmarkConfig = $benchmarkRepository->getConfigForShop($this->request->getParam('shopId'));
-            $benchmarkConfig->setActive((bool) $this->request->getParam('active'));
-
-            $benchmarkRepository->save($benchmarkConfig);
-
-            $this->View()->assign('success', true);
-        } catch (Exception $e) {
-            $this->View()->assign(['success' => false, 'message' => $e->getMessage()]);
-        }
-    }
-
-    public function saveTypeAction()
-    {
-        try {
-            $benchmarkRepository = $this->get('shopware.benchmark_bundle.repository.config');
-
-            $benchmarkConfig = $benchmarkRepository->getConfigForShop($this->request->getParam('shopId'));
-            $benchmarkConfig->setType($this->request->getParam('type'));
-
-            $benchmarkRepository->save($benchmarkConfig);
-
-            $this->View()->assign('success', true);
-        } catch (Exception $e) {
-            $this->View()->assign(['success' => false, 'message' => $e->getMessage()]);
-        }
-    }
-
-    public function disableBenchmarkTeaserAction()
-    {
-        $conn = $this->container->get(Connection::class);
-        $elementId = $conn->fetchColumn('SELECT id FROM s_core_config_elements WHERE name LIKE "benchmarkTeaser"');
-        $valueId = $conn->fetchColumn(
-            'SELECT id FROM s_core_config_values WHERE element_id = :elementId',
-            ['elementId' => $elementId]
-        );
-
-        $data = [
-            'element_id' => $elementId,
-            'shop_id' => 1,
-            'value' => serialize(false),
-        ];
-
-        if ($valueId) {
-            $conn->update(
-                's_core_config_values',
-                $data,
-                ['id' => $valueId]
-            );
-        } else {
-            $conn->insert('s_core_config_values', $data);
-        }
-        $cacheManager = $this->get(CacheManager::class);
-        $cacheManager->clearConfigCache();
-    }
-
-    public function checkBenchmarksAction()
-    {
-        $result = new BenchmarkDataResult();
-        $message = null;
-
-        try {
-            /** @var BenchmarkDataResult $result */
-            $result = $this->get('shopware.benchmark_bundle.benchmark_statistics')->handleTransmission();
-        } catch (Exception $e) {
-            $message = $e->getMessage();
-        }
-
-        $statisticsResponseSuccess = $result->getStatisticsResponse() !== null;
-        $bIResponseSuccess = $result->getBiResponse() !== null;
-
-        $shopId = 0;
-        if ($statisticsResponseSuccess) {
-            $shopId = $result->getStatisticsResponse()->getShopId();
-        }
-
-        if ($bIResponseSuccess) {
-            $shopId = $result->getBiResponse()->getShopId();
-        }
-
-        $this->View()->assign([
-            'success' => $message === null,
-            'statistics' => $statisticsResponseSuccess,
-            'bi' => $bIResponseSuccess,
-            'message' => $message,
-            'shopId' => $shopId,
-        ]);
-    }
-
-    protected function initAcl()
-    {
-        $this->addAclPermission('getShopConfigs', 'read', 'Insufficient permissions');
-        $this->addAclPermission('saveSettings', 'manage', 'Insufficient permissions');
-        $this->addAclPermission('saveIndustry', 'manage', 'Insufficient permissions');
-        $this->addAclPermission('saveTypeAction', 'manage', 'Insufficient permissions');
-        $this->addAclPermission('setActive', 'manage', 'Insufficient permissions');
-        $this->addAclPermission('disableBenchmarkTeaser', 'manage', 'Insufficient permissions');
-        $this->addAclPermission('checkBenchmarksAction', 'submit', 'Insufficient permissions');
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Controllers/Backend/BenchmarkLocalOverview.php b/engine/Shopware/Bundle/BenchmarkBundle/Controllers/Backend/BenchmarkLocalOverview.php
deleted file mode 100644
index 291563911cc..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Controllers/Backend/BenchmarkLocalOverview.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-use League\Flysystem;
-
-class Shopware_Controllers_Backend_BenchmarkLocalOverview extends Shopware_Controllers_Backend_ExtJs implements \Shopware\Components\CSRFWhitelistAware
-{
-    /**
-     * Key to use when saving the date on which the user first tried to access the benchmark results.
-     *
-     * @var string
-     */
-    private $waitingSinceConfigKey = 'benchmarkWaitingSince';
-
-    /**
-     * @return string[]
-     */
-    public function getWhitelistedCSRFActions()
-    {
-        return ['render'];
-    }
-
-    public function renderAction()
-    {
-        $this->get('plugins')->Controller()->ViewRenderer()->setNoRender(false);
-        $this->Front()->Plugins()->Json()->setRenderer(false);
-
-        $template = $this->getTemplate();
-
-        $this->View()->loadTemplate(sprintf('backend/benchmark/template/local/%s.tpl', $template));
-
-        if ($template === 'waiting') {
-            $waitingSinceHours = $this->getWaitingSinceHours();
-            $this->View()->assign('waitingSinceHours', $waitingSinceHours);
-        }
-
-        if ($template === 'industry_select') {
-            $this->View()->assign('shops', $this->getShops());
-        }
-
-        $this->View()->assign('benchmarkTranslations', json_encode(
-            $this->get('shopware.benchmark_bundle.components.translation')->getAll(),
-            JSON_HEX_APOS
-        ));
-
-        $this->View()->assign('benchmarkDefaultLanguage', $this->Request()->getParam('lang', 'de'));
-    }
-
-    protected function initAcl()
-    {
-        $this->addAclPermission('render', 'read', 'Insufficient permissions');
-    }
-
-    /**
-     * @return string
-     */
-    private function getTemplate()
-    {
-        $templateParam = $this->Request()->getParam('template');
-
-        if (!$templateParam) {
-            $templateParam = $this->getStartingTemplate();
-        }
-
-        // Prevents directory traversal
-        return FlySystem\Util::normalizeRelativePath($templateParam);
-    }
-
-    /**
-     * @return string
-     */
-    private function getStartingTemplate()
-    {
-        $benchmarkRepository = $this->get('shopware.benchmark_bundle.repository.config');
-
-        if ($benchmarkRepository->getConfigsCount() === 0) {
-            return 'start';
-        }
-
-        return 'waiting';
-    }
-
-    /**
-     * Returns the amount of hours since first seeing the waiting screen.
-     *
-     * @return int
-     */
-    private function getWaitingSinceHours()
-    {
-        $now = new DateTime('now');
-        $diff = $now->diff($this->getWaitingSinceDate());
-
-        return (int) ($diff->h + ($diff->days * 24));
-    }
-
-    /**
-     * Returns the date on which the user first tried to access the benchmark results.
-     * If no date is set, the function initialises the value.
-     *
-     * @return DateTime
-     */
-    private function getWaitingSinceDate()
-    {
-        $identity = $this->getUserIdentity()->id;
-        $date = new DateTime('now');
-        $db = $this->get(\Doctrine\DBAL\Connection::class);
-
-        $value = $db->fetchColumn(
-            'SELECT `config` FROM `s_core_auth_config` WHERE `user_id` = :id AND `name` = :name',
-            [
-                ':id' => $identity,
-                ':name' => $this->waitingSinceConfigKey,
-            ]
-        );
-
-        if ($value) {
-            return unserialize($value, ['allowed_classes' => false]);
-        }
-
-        $db->executeUpdate(
-            'INSERT INTO s_core_auth_config (`user_id`, `name`, `config`) VALUES (:id, :name, :config) ON DUPLICATE KEY UPDATE `config`= :config',
-            [
-                ':id' => $identity,
-                ':name' => $this->waitingSinceConfigKey,
-                ':config' => serialize($date),
-            ]
-        );
-
-        return $date;
-    }
-
-    /**
-     * Tries to fetch the current users identity
-     *
-     * @return Shopware_Components_Auth|null
-     */
-    private function getUserIdentity()
-    {
-        /** @var Shopware_Plugins_Backend_Auth_Bootstrap $plugin */
-        $plugin = $this->get('plugins')->get('Backend')->get('Auth');
-
-        try {
-            return $plugin->checkAuth()->getIdentity();
-        } catch (Exception $e) {
-            return null;
-        }
-    }
-
-    /**
-     * @return array
-     */
-    private function getShops()
-    {
-        $queryBuilder = $this->get(\Doctrine\DBAL\Connection::class)->createQueryBuilder();
-
-        return $queryBuilder->select('shop.id, shop.name')
-            ->from('s_core_shops', 'shop')
-            ->where('shop.main_id IS NULL')
-            ->execute()
-            ->fetchAll();
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Controllers/Backend/BenchmarkOverview.php b/engine/Shopware/Bundle/BenchmarkBundle/Controllers/Backend/BenchmarkOverview.php
deleted file mode 100644
index 57596f3370d..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Controllers/Backend/BenchmarkOverview.php
+++ /dev/null
@@ -1,243 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-use Shopware\Bundle\BenchmarkBundle\Service\TemplateCachingHandler;
-use Shopware\Components\CSRFWhitelistAware;
-use Shopware\Components\Model\ModelManager;
-use Shopware\Components\Routing\RouterInterface;
-use Shopware\Models\Benchmark\BenchmarkConfig;
-use Shopware\Models\Benchmark\Repository as BenchmarkRepository;
-use Shopware\Models\Menu\Menu;
-use Shopware\Models\Shop\Shop;
-
-class Shopware_Controllers_Backend_BenchmarkOverview extends Shopware_Controllers_Backend_ExtJs implements CSRFWhitelistAware
-{
-    /**
-     * Returns a list with actions which should not be validated for CSRF protection
-     *
-     * @return string[]
-     */
-    public function getWhitelistedCSRFActions()
-    {
-        return ['index', 'render', 'saveIndustry', 'getShops'];
-    }
-
-    public function indexAction()
-    {
-        $shopId = $this->getShopId();
-
-        $benchmarkRepository = $this->get(BenchmarkRepository::class);
-        $config = $benchmarkRepository->getConfigForShop($shopId);
-
-        $this->handleSettings($config);
-    }
-
-    public function renderAction()
-    {
-        $this->get('plugins')->Controller()->ViewRenderer()->setNoRender(true);
-        $this->Front()->Plugins()->Json()->setRenderer(false);
-
-        $benchmarkRepository = $this->get(BenchmarkRepository::class);
-        $config = $benchmarkRepository->getConfigForShop($this->getShopId());
-
-        if ($this->hasOutdatedStatistics($config->getLastReceived())) {
-            $this->redirect([
-                'controller' => 'BenchmarkOverview',
-                'action' => 'index',
-                'shopId' => $this->getShopId(),
-            ]);
-
-            return;
-        }
-
-        echo $config->getCachedTemplate();
-    }
-
-    public function saveIndustryAction()
-    {
-        $config = $this->request->getParam('config');
-
-        $benchmarkRepository = $this->get(BenchmarkRepository::class);
-        $benchmarkRepository->saveShopConfigs($config);
-
-        $this->enableMenu();
-        $this->View()->assign('success', true);
-    }
-
-    public function getShopsAction()
-    {
-        $benchmarkRepository = $this->get(BenchmarkRepository::class);
-
-        $shops = $benchmarkRepository->getShopsWithValidTemplate();
-        $currentShop = $this->getShopId();
-
-        $shops[$currentShop]['active'] = 1;
-
-        $widgetsAllowed = (int) $this->_isAllowed('swag-bi-base', 'widgets');
-
-        $this->View()->assign([
-            'shops' => $shops,
-            'shopSwitchUrl' => $this->Front()->Router()->assemble([
-                'controller' => 'BenchmarkOverview',
-                'action' => 'render',
-                'shopId' => 'replaceShopId',
-            ]) . '?widgetAllowed=' . $widgetsAllowed,
-        ]);
-    }
-
-    protected function initAcl()
-    {
-        $this->addAclPermission('index', 'read', 'Insufficient permissions');
-        $this->addAclPermission('render', 'read', 'Insufficient permissions');
-        $this->addAclPermission('setIndustry', 'manage', 'Insufficient permissions');
-        $this->addAclPermission('getShops', 'read', 'Insufficient permissions');
-    }
-
-    private function handleSettings(BenchmarkConfig $config = null)
-    {
-        $backendLanguage = $this->get('auth')->getIdentity()->locale->getId() === 1 ? 'de' : 'en';
-
-        $benchmarkRepository = $this->get(BenchmarkRepository::class);
-
-        if (!$config || $benchmarkRepository->getConfigsCount() === 0) {
-            $this->redirect([
-                'controller' => 'BenchmarkLocalOverview',
-                'action' => 'render',
-                'template' => 'start',
-                'lang' => $this->request->getParam('lang', $backendLanguage),
-            ]);
-
-            return;
-        }
-
-        if ($this->hasFreshStatistics($config->getLastReceived())) {
-            $this->loadCachedFile();
-
-            return;
-        }
-
-        if (!$config->isActive() || $this->hasOutdatedStatistics($config->getLastReceived())) {
-            $this->redirect([
-                'controller' => 'BenchmarkLocalOverview',
-                'action' => 'render',
-                'template' => 'waiting',
-                'lang' => $this->request->getParam('lang', $backendLanguage),
-            ]);
-
-            return;
-        }
-
-        $this->loadCachedFile();
-    }
-
-    /**
-     * Checks if "lastReceived" is younger than 24 hours.
-     *
-     * @return bool
-     */
-    private function hasFreshStatistics(DateTimeInterface $lastReceived)
-    {
-        $today = new DateTime('now');
-
-        $interval = new DateInterval('PT1H');
-
-        $periods = new DatePeriod($lastReceived, $interval, $today);
-        $hours = iterator_count($periods);
-
-        return $hours < 24;
-    }
-
-    /**
-     * Checks if "lastReceived" is older than 7 days.
-     *
-     * @return bool
-     */
-    private function hasOutdatedStatistics(DateTimeInterface $lastReceived)
-    {
-        $today = new DateTime('now');
-
-        $interval = new DateInterval('P1D');
-
-        $periods = new DatePeriod($lastReceived, $interval, $today);
-        $days = iterator_count($periods);
-
-        return $days > 7;
-    }
-
-    private function loadCachedFile()
-    {
-        /** @var TemplateCachingHandler $cachingHandler */
-        $cachingHandler = $this->get('shopware.benchmark_bundle.components.template_caching_handler');
-        $shopId = $this->getShopId();
-
-        if ($cachingHandler->isTemplateCached($shopId)) {
-            $link = $this->get(RouterInterface::class)->assemble([
-                'controller' => 'BenchmarkOverview',
-                'action' => 'render',
-                'shopId' => $shopId,
-            ]);
-
-            $widgetsAllowed = (int) $this->_isAllowed('swag-bi-base', 'widgets');
-
-            $this->redirect($link . '?widgetAllowed=' . $widgetsAllowed);
-
-            return;
-        }
-
-        $this->redirect([
-            'controller' => 'BenchmarkLocalOverview',
-            'action' => 'render',
-            'template' => 'waiting',
-            'lang' => $this->request->getParam('lang', 'de'),
-        ]);
-    }
-
-    private function enableMenu()
-    {
-        $em = $this->get(ModelManager::class);
-        $repo = $em->getRepository(Menu::class);
-
-        /** @var Menu|null $menuEntry */
-        $menuEntry = $repo->findOneBy(['controller' => 'Benchmark', 'action' => 'Settings']);
-        if ($menuEntry) {
-            $menuEntry->setActive(true);
-            $em->persist($menuEntry);
-            $em->flush();
-        }
-    }
-
-    /**
-     * @return int
-     */
-    private function getShopId()
-    {
-        $shopId = (int) $this->request->getParam('shopId');
-
-        if (!$shopId) {
-            $shopId = $this->get(ModelManager::class)->getRepository(Shop::class)->getActiveDefault()->getId();
-        }
-
-        return $shopId;
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/DependencyInjection/Compiler/MatcherCompilerPass.php b/engine/Shopware/Bundle/BenchmarkBundle/DependencyInjection/Compiler/MatcherCompilerPass.php
deleted file mode 100644
index a5f3bb7ee8e..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/DependencyInjection/Compiler/MatcherCompilerPass.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-class MatcherCompilerPass implements CompilerPassInterface
-{
-    public function process(ContainerBuilder $container)
-    {
-        $container->setParameter('shopware.benchmark_bundle.shipment_mapping', include __DIR__ . '/../Resources/shipment_matchers.php');
-        $container->setParameter('shopware.benchmark_bundle.payment_mapping', include __DIR__ . '/../Resources/payment_matchers.php');
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/DependencyInjection/Resources/payment_matchers.php b/engine/Shopware/Bundle/BenchmarkBundle/DependencyInjection/Resources/payment_matchers.php
deleted file mode 100644
index 085ff55a109..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/DependencyInjection/Resources/payment_matchers.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-return [
-    'paypal' => [
-        '/pay[\s\-_]?pal/i',
-    ],
-    'invoice' => [
-        '/invoice/i',
-        '/rechnung/i',
-    ],
-    'debit' => [
-        '/debit/i',
-        '/last[\s\-_]?schrift/i',
-        '/sepa/i',
-    ],
-    'credit_card' => [
-        '/credit/i',
-        '/credit[\s\-_]?card/i',
-        '/visa/i',
-        '/master[\s\-_]?card/i',
-        '/american[\s\-_]?express/i',
-    ],
-    'sofort' => [
-        '/sofort/i',
-    ],
-    'credit' => [
-        '/post[\s\-_]?finance/i',
-    ],
-    'stripe' => [
-        '/stripe/i',
-    ],
-    'prepayment' => [
-        '/pre[\s\-_]?payment/i',
-        '/vor[\s\-_]?kasse/i',
-    ],
-    'amazon_pay' => [
-        '/amazon/i',
-    ],
-    'google_wallet' => [
-        '/google/i',
-    ],
-    'apple_pay' => [
-        '/apple/i',
-    ],
-    'click_and_collect' => [
-        '/abholen|abholung/i',
-        '/self[\s-]?pick[\s-]?up/i',
-        '/click[\s-]?(and|\&)[\s-]?collect/i',
-    ],
-    'klarna' => [
-        '/klarna/i',
-    ],
-    'ideal' => [
-        '/ideal/i',
-    ],
-    'pay_direkt' => [
-        '/pay[\s\-_]?direct/i',
-        '/pay[\s\-_]?direkt/i',
-    ],
-    'giro_pay' => [
-        '/giro[\s\-_]?pay/i',
-    ],
-    'bitcoin' => [
-        '/bit[\s\-_]?coin/i',
-    ],
-    'sage' => [
-        '/sage/i',
-    ],
-    'cash' => [
-        '/nach[\s\-_]?nahme/i',
-        '/cash[\s\-_]?on[\s\-_]?delivery/i',
-        '/cash[[\s\-_]?delivery/i',
-        '/cash/i',
-    ],
-];
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/DependencyInjection/Resources/shipment_matchers.php b/engine/Shopware/Bundle/BenchmarkBundle/DependencyInjection/Resources/shipment_matchers.php
deleted file mode 100644
index 6c7485b9cbf..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/DependencyInjection/Resources/shipment_matchers.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-return [
-    'dhl' => [
-        '/dhl/i',
-        '/deutsche[\s-]?post/i',
-    ],
-    'hermes' => [
-        '/hermes/i',
-    ],
-    'spedition' => [
-        '/spedition/i',
-    ],
-    'dpd' => [
-        '/dpd/i',
-        '/Dynamic[\s-]?Parcel[\s-]?Distribution/i',
-    ],
-    'click_and_collect' => [
-        '/abholen|abholung/i',
-        '/self[\s-]?pick[\s-]?up/i',
-        '/click[\s-]?(and|\&)[\s-]?collect/i',
-    ],
-    'ups' => [
-        '/ups/i',
-        '/United[\s-]?Parcel[\s-]?Service/i',
-    ],
-    'gls' => [
-        '/gls/i',
-        '/General[\s-]?Logistics[\s-]?Systems/i',
-    ],
-    'post_nl' => [
-        '/post[\s-]?nl/i',
-    ],
-    'royal_mail' => [
-        '/royal[\s-]?mail/i',
-    ],
-    'fedex' => [
-        '/fedex/i',
-    ],
-    'tnt' => [
-        '/tnt/i',
-    ],
-];
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/DependencyInjection/services.xml b/engine/Shopware/Bundle/BenchmarkBundle/DependencyInjection/services.xml
deleted file mode 100644
index 282e3b0ab03..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/DependencyInjection/services.xml
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0" ?>
-
-<container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
-    <parameters>
-        <parameter key="shopware.benchmark_bundle.guzzle_config" type="collection">
-            <parameter type="collection" key="defaults">
-                <parameter key="timeout">7</parameter>
-                <parameter key="connect_timeout">5</parameter>
-            </parameter>
-        </parameter>
-    </parameters>
-
-    <services>
-        <defaults public="true" />
-
-        <!-- Providers & Collectors -->
-        <service id="shopware.benchmark_bundle.collector" class="Shopware\Bundle\BenchmarkBundle\BenchmarkCollector">
-            <argument type="tagged" tag="shopware.benchmark_provider" />
-        </service>
-
-        <service id="shopware.benchmark_bundle.providers.shop"
-                 class="Shopware\Bundle\BenchmarkBundle\Provider\ShopProvider"
-                 public="false">
-            <argument type="service" id="Doctrine\DBAL\Connection"/>
-            <tag name="shopware.benchmark_provider" />
-        </service>
-
-        <service id="shopware.benchmark_bundle.providers.shopware"
-                 class="Shopware\Bundle\BenchmarkBundle\Provider\ShopwareProvider"
-                 public="false">
-            <argument type="service" id="Doctrine\DBAL\Connection"/>
-            <argument type="service" id="shopware.release"/>
-            <argument type="service" id="Shopware\Components\License\Service\LocalLicenseUnpackService"/>
-            <tag name="shopware.benchmark_provider" />
-        </service>
-
-        <service id="shopware.benchmark_bundle.providers.manufacturers"
-                 class="Shopware\Bundle\BenchmarkBundle\Provider\ManufacturerProvider"
-                 public="false">
-            <argument type="service" id="Doctrine\DBAL\Connection"/>
-            <tag name="shopware.benchmark_provider" />
-        </service>
-
-        <service id="shopware.benchmark_bundle.providers.products"
-                 class="Shopware\Bundle\BenchmarkBundle\Provider\ProductsProvider"
-                 public="false">
-            <argument type="service" id="Doctrine\DBAL\Connection"/>
-            <tag name="shopware.benchmark_provider" />
-        </service>
-
-        <service id="shopware.benchmark_bundle.providers.emotions"
-                 class="Shopware\Bundle\BenchmarkBundle\Provider\EmotionsProvider"
-                 public="false">
-            <argument type="service" id="Doctrine\DBAL\Connection"/>
-            <tag name="shopware.benchmark_provider" />
-        </service>
-
-        <service id="shopware.benchmark_bundle.providers.categories"
-                 class="Shopware\Bundle\BenchmarkBundle\Provider\CategoriesProvider"
-                 public="false">
-            <argument type="service" id="Doctrine\DBAL\Connection"/>
-            <tag name="shopware.benchmark_provider" />
-        </service>
-
-        <service id="shopware.benchmark_bundle.providers.analytics"
-                 class="Shopware\Bundle\BenchmarkBundle\Provider\AnalyticsProvider"
-                 public="false">
-            <argument type="service" id="Doctrine\DBAL\Connection"/>
-            <tag name="shopware.benchmark_provider" />
-        </service>
-
-        <service id="shopware.benchmark_bundle.providers.plugins"
-                 class="Shopware\Bundle\BenchmarkBundle\Provider\PluginsProvider"
-                 public="false">
-            <argument type="service" id="Doctrine\DBAL\Connection"/>
-            <tag name="shopware.benchmark_provider" />
-        </service>
-
-        <service id="shopware.benchmark_bundle.providers.payments"
-                 class="Shopware\Bundle\BenchmarkBundle\Provider\PaymentsProvider"
-                 public="false">
-            <argument type="service" id="Doctrine\DBAL\Connection"/>
-            <argument type="service" id="shopware.benchmark_bundle.matcher_payment"/>
-            <tag name="shopware.benchmark_provider" />
-        </service>
-
-        <service id="shopware.benchmark_bundle.providers.customers"
-                 class="Shopware\Bundle\BenchmarkBundle\Provider\CustomersProvider"
-                 public="false">
-            <argument type="service" id="Doctrine\DBAL\Connection"/>
-            <tag name="shopware.benchmark_provider" />
-        </service>
-
-        <service id="shopware.benchmark_bundle.providers.shipments"
-                 class="Shopware\Bundle\BenchmarkBundle\Provider\ShipmentsProvider"
-                 public="false">
-            <argument type="service" id="Doctrine\DBAL\Connection"/>
-            <argument type="service" id="shopware.benchmark_bundle.matcher_shipping"/>
-            <tag name="shopware.benchmark_provider" />
-        </service>
-
-        <service id="shopware.benchmark_bundle.providers.orders"
-                 class="Shopware\Bundle\BenchmarkBundle\Provider\OrdersProvider"
-                 public="false">
-            <argument type="service" id="Doctrine\DBAL\Connection"/>
-            <argument type="service" id="shopware.benchmark_bundle.matcher_payment"/>
-            <argument type="service" id="shopware.benchmark_bundle.matcher_shipping"/>
-            <tag name="shopware.benchmark_provider" />
-        </service>
-
-        <service id="shopware.benchmark_bundle.providers.updated_orders"
-                 class="Shopware\Bundle\BenchmarkBundle\Provider\UpdatedOrdersProvider"
-                 public="false">
-            <argument type="service" id="Doctrine\DBAL\Connection"/>
-            <argument type="service" id="shopware.benchmark_bundle.matcher_payment"/>
-            <argument type="service" id="shopware.benchmark_bundle.matcher_shipping"/>
-            <tag name="shopware.benchmark_provider" />
-        </service>
-
-        <!-- Services-->
-        <service id="shopware.benchmark_bundle.repository.config" class="Shopware\Models\Benchmark\Repository">
-            <factory service="Shopware\Components\Model\ModelManager" method="getRepository" />
-            <argument type="string">\Shopware\Models\Benchmark\BenchmarkConfig</argument>
-        </service>
-
-        <service id="shopware.benchmark_bundle.components.template_caching_handler"
-                 class="Shopware\Bundle\BenchmarkBundle\Service\TemplateCachingHandler">
-            <argument type="service" id="Doctrine\DBAL\Connection"/>
-        </service>
-
-        <service id="shopware.benchmark_bundle.components.translation"
-                 class="Shopware\Bundle\BenchmarkBundle\Service\TranslationService">
-            <argument type="service" id="Shopware_Components_Snippet_Manager"/>
-            <argument type="service" id="Shopware\Components\Model\ModelManager"/>
-        </service>
-
-        <service id="shopware.benchmark_bundle.matcher_shipping" class="Shopware\Bundle\BenchmarkBundle\Service\MatcherService">
-            <argument>%shopware.benchmark_bundle.shipment_mapping%</argument>
-        </service>
-
-        <service id="shopware.benchmark_bundle.matcher_payment" class="Shopware\Bundle\BenchmarkBundle\Service\MatcherService">
-            <argument>%shopware.benchmark_bundle.payment_mapping%</argument>
-        </service>
-
-        <!-- Transmission services -->
-        <service id="shopware.benchmark_bundle.commands.send_data" class="Shopware\Bundle\BenchmarkBundle\Commands\SendStatisticsCommand">
-            <tag name="console.command" command="sw:benchmark:send"/>
-        </service>
-
-        <service id="shopware.benchmark_bundle.commands.receive_data" class="Shopware\Bundle\BenchmarkBundle\Commands\ReceiveStatisticsCommand">
-            <tag name="console.command" command="sw:benchmark:receive"/>
-        </service>
-
-        <service id="shopware.benchmark_bundle.bi_transmission"
-                 class="Shopware\Bundle\BenchmarkBundle\Service\BusinessIntelligenceService">
-            <argument type="service" id="shopware.benchmark_bundle.bi_client"/>
-            <argument type="service" id="shopware.benchmark_bundle.repository.config"/>
-        </service>
-
-        <service id="shopware.benchmark_bundle.statistics_transmission"
-                 class="Shopware\Bundle\BenchmarkBundle\Service\StatisticsService">
-            <argument type="service" id="shopware.benchmark_bundle.collector"/>
-            <argument type="service" id="shopware.benchmark_bundle.statistics_client"/>
-            <argument type="service" id="shopware.benchmark_bundle.repository.config"/>
-            <argument type="service" id="Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface"/>
-            <argument type="service" id="Doctrine\DBAL\Connection"/>
-        </service>
-
-        <service id="shopware.benchmark_bundle.benchmark_statistics"
-                 class="Shopware\Bundle\BenchmarkBundle\Service\BenchmarkStatisticsService">
-            <argument type="service" id="shopware.benchmark_bundle.repository.config"/>
-            <argument type="service" id="shopware.benchmark_bundle.statistics_transmission"/>
-            <argument type="service" id="shopware.benchmark_bundle.bi_transmission"/>
-        </service>
-
-        <service id="shopware.benchmark_bundle.bi_client"
-                 class="Shopware\Bundle\BenchmarkBundle\BusinessIntelligenceClient"
-                 public="false">
-            <argument type="string">%shopware.bi.endpoint.benchmark%</argument>
-            <argument type="service" id="shopware.benchmark_bundle.client"/>
-            <argument type="service" id="shopware.benchmark_bundle.hydrator.bi_response_hydrator"/>
-            <argument type="service" id="shopware_benchmark_bundle.benchmark_encryption"/>
-            <argument type="service" id="corelogger"/>
-        </service>
-
-        <service id="shopware.benchmark_bundle.statistics_client"
-                 class="Shopware\Bundle\BenchmarkBundle\StatisticsClient"
-                 public="false">
-            <argument type="string">%shopware.bi.endpoint.statistics%</argument>
-            <argument type="service" id="shopware.benchmark_bundle.client"/>
-            <argument type="service" id="shopware.benchmark_bundle.hydrator.statistics_response_hydrator"/>
-            <argument type="service" id="corelogger"/>
-            <argument type="service" id="Doctrine\DBAL\Connection"/>
-        </service>
-
-        <service id="shopware.benchmark_bundle.hydrator.statistics_response_hydrator"
-                 class="Shopware\Bundle\BenchmarkBundle\Hydrator\StatisticsResponseHydrator"/>
-
-        <service id="shopware.benchmark_bundle.hydrator.bi_response_hydrator"
-                 class="Shopware\Bundle\BenchmarkBundle\Hydrator\BusinessIntelligenceResponseHydrator"
-                 public="false" />
-
-        <service id="shopware.benchmark_bundle.client"
-                 class="Shopware\Components\HttpClient\GuzzleHttpClient"
-                 public="false">
-            <argument type="service" id="guzzle_http_client_factory"/>
-            <argument type="collection" id="shopware.benchmark_bundle.guzzle_config" />
-        </service>
-
-        <service id="shopware_benchmark_bundle.benchmark_encryption"
-                 class="Shopware\Bundle\BenchmarkBundle\BenchmarkEncryption"
-                 public="false">
-            <argument type="string">%kernel.root_dir%/engine/Shopware/Components/HttpClient/public.key</argument>
-        </service>
-
-        <service id="shopware_attribute.backend_controllers_benchmark" class="Shopware_Controllers_Backend_Benchmark">
-            <tag name="shopware.controller" module="backend" controller="Benchmark"/>
-        </service>
-
-        <service id="shopware_attribute.backend_controllers_benchmark_local_overview" class="Shopware_Controllers_Backend_BenchmarkLocalOverview">
-            <tag name="shopware.controller" module="backend" controller="BenchmarkLocalOverview"/>
-        </service>
-
-        <service id="shopware_attribute.backend_controllers_benchmark_overview" class="Shopware_Controllers_Backend_BenchmarkOverview">
-            <tag name="shopware.controller" module="backend" controller="BenchmarkOverview"/>
-        </service>
-
-    </services>
-</container>
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Exception/BenchmarkHydratingException.php b/engine/Shopware/Bundle/BenchmarkBundle/Exception/BenchmarkHydratingException.php
deleted file mode 100644
index 0f0fc64fbf7..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Exception/BenchmarkHydratingException.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle\Exception;
-
-use Exception;
-
-class BenchmarkHydratingException extends Exception
-{
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Exception/BenchmarkSendingException.php b/engine/Shopware/Bundle/BenchmarkBundle/Exception/BenchmarkSendingException.php
deleted file mode 100644
index cb2946647f6..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Exception/BenchmarkSendingException.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle\Exception;
-
-use Exception;
-
-class BenchmarkSendingException extends Exception
-{
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Exception/StatisticsHydratingException.php b/engine/Shopware/Bundle/BenchmarkBundle/Exception/StatisticsHydratingException.php
deleted file mode 100644
index 623ba4bc1c5..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Exception/StatisticsHydratingException.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle\Exception;
-
-use Exception;
-
-class StatisticsHydratingException extends Exception
-{
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Exception/StatisticsSendingException.php b/engine/Shopware/Bundle/BenchmarkBundle/Exception/StatisticsSendingException.php
deleted file mode 100644
index 8de843d98df..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Exception/StatisticsSendingException.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle\Exception;
-
-use Exception;
-
-class StatisticsSendingException extends Exception
-{
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Exception/TransmissionNotNecessaryException.php b/engine/Shopware/Bundle/BenchmarkBundle/Exception/TransmissionNotNecessaryException.php
deleted file mode 100644
index 6c615825aa5..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Exception/TransmissionNotNecessaryException.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle\Exception;
-
-use Exception;
-
-class TransmissionNotNecessaryException extends Exception
-{
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Hydrator/BusinessIntelligenceResponseHydrator.php b/engine/Shopware/Bundle/BenchmarkBundle/Hydrator/BusinessIntelligenceResponseHydrator.php
deleted file mode 100644
index c08b5bd630b..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Hydrator/BusinessIntelligenceResponseHydrator.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle\Hydrator;
-
-use DateTime;
-use DateTimeZone;
-use Shopware\Bundle\BenchmarkBundle\Struct\BusinessIntelligenceResponse;
-
-class BusinessIntelligenceResponseHydrator implements HydratorInterface
-{
-    /**
-     * @return BusinessIntelligenceResponse
-     */
-    public function hydrate(array $data)
-    {
-        return new BusinessIntelligenceResponse(new DateTime('now', new DateTimeZone('UTC')), $data['html']);
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Hydrator/HydratorInterface.php b/engine/Shopware/Bundle/BenchmarkBundle/Hydrator/HydratorInterface.php
deleted file mode 100644
index 6287fb2aac3..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Hydrator/HydratorInterface.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle\Hydrator;
-
-interface HydratorInterface
-{
-    public function hydrate(array $data);
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Hydrator/StatisticsResponseHydrator.php b/engine/Shopware/Bundle/BenchmarkBundle/Hydrator/StatisticsResponseHydrator.php
deleted file mode 100644
index c401f338345..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Hydrator/StatisticsResponseHydrator.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle\Hydrator;
-
-use DateTime;
-use DateTimeZone;
-use Shopware\Bundle\BenchmarkBundle\Exception\StatisticsHydratingException;
-use Shopware\Bundle\BenchmarkBundle\Struct\StatisticsResponse;
-
-class StatisticsResponseHydrator implements HydratorInterface
-{
-    /**
-     * {@inheritdoc}
-     *
-     * @throws StatisticsHydratingException
-     *
-     * @return StatisticsResponse
-     */
-    public function hydrate(array $data)
-    {
-        $messageDataArrayKey = 'message';
-        $messageDataSuccessValue = 'Success';
-        if ($data[$messageDataArrayKey] !== $messageDataSuccessValue) {
-            throw new StatisticsHydratingException(sprintf('Expected field "%s" to be "%s", was "%s"', $messageDataArrayKey, $messageDataSuccessValue, $data[$messageDataArrayKey]));
-        }
-
-        if (empty($data['responseToken'])) {
-            throw new StatisticsHydratingException('Missing field "responseToken" from server response');
-        }
-
-        return new StatisticsResponse($date = new DateTime('now', new DateTimeZone('UTC')), $data['responseToken'], false);
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Provider/AnalyticsProvider.php b/engine/Shopware/Bundle/BenchmarkBundle/Provider/AnalyticsProvider.php
deleted file mode 100644
index 8026ef06cb7..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Provider/AnalyticsProvider.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle\Provider;
-
-use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Query\QueryBuilder;
-use PDO;
-use Shopware\Bundle\BenchmarkBundle\BenchmarkProviderInterface;
-use Shopware\Bundle\StoreFrontBundle\Struct\ShopContextInterface;
-
-class AnalyticsProvider implements BenchmarkProviderInterface
-{
-    private const NAME = 'analytics';
-
-    /**
-     * @var Connection
-     */
-    private $dbalConnection;
-
-    /**
-     * @var int
-     */
-    private $shopId;
-
-    public function __construct(Connection $dbalConnection)
-    {
-        $this->dbalConnection = $dbalConnection;
-    }
-
-    public function getName()
-    {
-        return self::NAME;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getBenchmarkData(ShopContextInterface $shopContext)
-    {
-        $this->shopId = $shopContext->getShop()->getId();
-
-        $config = $this->getConfig();
-
-        $returnData = [
-            'list' => $this->getVisitsList((int) $config['last_analytics_id']),
-            'listByDevice' => $this->getVisitsPerDevice((int) $config['last_analytics_id']),
-        ];
-
-        return $returnData;
-    }
-
-    /**
-     * @param int $lastAnalyticsId
-     *
-     * @return array
-     */
-    private function getVisitsList($lastAnalyticsId)
-    {
-        $queryBuilder = $this->getVisitsListQueryBuilder($lastAnalyticsId);
-
-        $data = $queryBuilder->execute()->fetchAll(PDO::FETCH_ASSOC);
-
-        $data = array_map(function ($item) {
-            $item['totalImpressions'] = (int) $item['totalImpressions'];
-            $item['totalUniqueVisits'] = (int) $item['totalUniqueVisits'];
-
-            return $item;
-        }, $data);
-
-        return $data;
-    }
-
-    /**
-     * @param int $lastAnalyticsId
-     *
-     * @return array
-     */
-    private function getVisitsPerDevice($lastAnalyticsId)
-    {
-        $queryBuilder = $this->getVisitsPerDeviceQueryBuilder($lastAnalyticsId);
-
-        $visitsPerDevice = $queryBuilder->execute()
-            ->fetchAll(PDO::FETCH_ASSOC);
-
-        $visitsPerDevice = array_map(function ($item) {
-            $item['totalImpressions'] = (int) $item['totalImpressions'];
-            $item['totalUniqueVisits'] = (int) $item['totalUniqueVisits'];
-
-            return $item;
-        }, $visitsPerDevice);
-
-        return $visitsPerDevice;
-    }
-
-    /**
-     * @param int $lastAnalyticsId
-     *
-     * @return QueryBuilder
-     */
-    private function getVisitsPerDeviceQueryBuilder($lastAnalyticsId)
-    {
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        return $queryBuilder
-            ->addSelect('visitors.datum as date')
-            ->addSelect('visitors.deviceType')
-            ->addSelect('SUM(visitors.pageimpressions) as totalImpressions')
-            ->addSelect('SUM(visitors.uniquevisits) as totalUniqueVisits')
-            ->from('s_statistics_visitors', 'visitors')
-            ->andWhere('visitors.shopID = :shopId')
-            ->andWhere('visitors.id > :lastId')
-            ->setParameter(':shopId', $this->shopId)
-            ->setParameter(':lastId', $lastAnalyticsId)
-            ->groupBy('visitors.datum, visitors.deviceType');
-    }
-
-    /**
-     * @param int $lastAnalyticsId
-     *
-     * @return QueryBuilder
-     */
-    private function getVisitsListQueryBuilder($lastAnalyticsId)
-    {
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        return $queryBuilder->addSelect('visitors.datum as date')
-            ->addSelect('SUM(visitors.pageimpressions) as totalImpressions')
-            ->addSelect('SUM(visitors.uniquevisits) as totalUniqueVisits')
-            ->from('s_statistics_visitors', 'visitors')
-            ->where('visitors.shopID = :shopId')
-            ->andWhere('visitors.id > :lastId')
-            ->setParameter(':shopId', $this->shopId)
-            ->setParameter(':lastId', $lastAnalyticsId)
-            ->groupBy('visitors.datum');
-    }
-
-    /**
-     * @return array
-     */
-    private function getConfig()
-    {
-        $configsQueryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        return $configsQueryBuilder->select('configs.*')
-            ->from('s_benchmark_config', 'configs')
-            ->where('configs.shop_id = :shopId')
-            ->setParameter(':shopId', $this->shopId)
-            ->execute()
-            ->fetch();
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Provider/CategoriesProvider.php b/engine/Shopware/Bundle/BenchmarkBundle/Provider/CategoriesProvider.php
deleted file mode 100644
index 658ec58f484..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Provider/CategoriesProvider.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle\Provider;
-
-use Doctrine\DBAL\Connection;
-use PDO;
-use Shopware\Bundle\BenchmarkBundle\BenchmarkProviderInterface;
-use Shopware\Bundle\StoreFrontBundle\Struct\ShopContextInterface;
-
-class CategoriesProvider implements BenchmarkProviderInterface
-{
-    private const NAME = 'categories';
-
-    /**
-     * @var Connection
-     */
-    private $dbalConnection;
-
-    /**
-     * @var ShopContextInterface
-     */
-    private $shopContext;
-
-    /**
-     * @var array
-     */
-    private $categoryIds = [];
-
-    public function __construct(Connection $dbalConnection)
-    {
-        $this->dbalConnection = $dbalConnection;
-    }
-
-    public function getName()
-    {
-        return self::NAME;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getBenchmarkData(ShopContextInterface $shopContext)
-    {
-        $this->shopContext = $shopContext;
-        $this->categoryIds = [];
-
-        return [
-            'products' => $this->getCategoryProductData(),
-            'tree' => $this->getCategoryTree(),
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    private function getCategoryProductData()
-    {
-        return [
-            'average' => $this->getAverageProductsPerCategory(),
-            'max' => $this->getMaxProductsPerCategory(),
-        ];
-    }
-
-    /**
-     * @return float
-     */
-    private function getAverageProductsPerCategory()
-    {
-        $totalProductsInCategories = array_sum($this->getProductsInCategoriesCounts());
-        $totalCategories = $this->getTotalCategories();
-
-        return (float) $totalProductsInCategories / $totalCategories;
-    }
-
-    /**
-     * @return int
-     */
-    private function getTotalCategories()
-    {
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-        $categoryIds = $this->getCategoryIds();
-
-        return (int) $queryBuilder->select('COUNT(categories.id)')
-            ->from('s_categories', 'categories')
-            ->where('categories.id IN (:categoryIds)')
-            ->setParameter(':categoryIds', $categoryIds, Connection::PARAM_INT_ARRAY)
-            ->execute()
-            ->fetchColumn();
-    }
-
-    private function getMaxProductsPerCategory(): int
-    {
-        $counts = $this->getProductsInCategoriesCounts();
-
-        if (\count($counts) === 0) {
-            return 0;
-        }
-
-        return (int) max($counts);
-    }
-
-    /**
-     * @return array
-     */
-    private function getProductsInCategoriesCounts()
-    {
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-        $categoryIds = $this->getCategoryIds();
-
-        return $queryBuilder->select('COUNT(categories.articleID) as productCount')
-            ->from('s_articles_categories', 'categories')
-            ->where('categories.categoryID IN (:categoryIds)')
-            ->setParameter(':categoryIds', $categoryIds, Connection::PARAM_INT_ARRAY)
-            ->groupBy('categories.categoryID')
-            ->execute()
-            ->fetchAll(PDO::FETCH_COLUMN);
-    }
-
-    /**
-     * @return array
-     */
-    private function getCategoryTree()
-    {
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-        $categoryIds = $this->getCategoryIds();
-
-        $categories = $queryBuilder->select([
-                'categories.id',
-                'categories.parent',
-                'categories.active',
-                'categories.blog as isBlog',
-                'categories.hidetop as hiddenFromTopMenu',
-                'categories.hidefilter as noFilters',
-                'categories.hide_sortings as noSortings',
-                'categories.stream_id IS NOT NULL as hasProductStream',
-            ])
-            ->from('s_categories', 'categories')
-            ->where('categories.id IN (:categoryIds)')
-            ->setParameter(':categoryIds', $categoryIds, Connection::PARAM_INT_ARRAY)
-            ->execute()
-            ->fetchAll();
-
-        $categories = array_map(function ($item) {
-            $item['active'] = (bool) $item['active'];
-            $item['isBlog'] = (bool) $item['isBlog'];
-            $item['hiddenFromTopMenu'] = (bool) $item['hiddenFromTopMenu'];
-            $item['noFilters'] = (bool) $item['noFilters'];
-            $item['noSortings'] = (bool) $item['noSortings'];
-            $item['hasProductStream'] = (bool) $item['hasProductStream'];
-
-            return $item;
-        }, $categories);
-
-        return $this->buildTree($categories);
-    }
-
-    /**
-     * @return array
-     */
-    private function getCategoryIds()
-    {
-        $shopId = $this->shopContext->getShop()->getId();
-        if (\array_key_exists($shopId, $this->categoryIds)) {
-            return $this->categoryIds[$shopId];
-        }
-
-        $categoryQueryBuilder = $this->dbalConnection->createQueryBuilder();
-        $categoryId = $this->shopContext->getShop()->getCategory()->getId();
-
-        $this->categoryIds[$shopId] = $categoryQueryBuilder->select('category.id')
-            ->from('s_categories', 'category')
-            // Match, if path contains the category ID for the given shop
-            ->where('category.path LIKE :categoryParentIdLike')
-            // Match, if the current category ID equals the category ID for the given shop
-            ->orWhere('category.id = :categoryParentId')
-            ->orderBy('category.id', 'ASC')
-            ->setParameter(':categoryParentId', $categoryId)
-            ->setParameter(':categoryParentIdLike', '%|' . $categoryId . '|%')
-            ->execute()
-            ->fetchAll(PDO::FETCH_COLUMN);
-
-        return $this->categoryIds[$shopId];
-    }
-
-    /**
-     * Builds an actual category tree.
-     *
-     * @return array
-     */
-    private function buildTree(array $categories)
-    {
-        $tree = [];
-
-        foreach ($categories as $category) {
-            $categoryId = $category['id'];
-            $parentId = $category['parent'];
-
-            unset($category['id'], $category['parent']);
-
-            isset($tree[$parentId]) ?: $tree[$parentId] = [];
-            isset($tree[$categoryId]) ?: $tree[$categoryId] = [];
-            $tree[$parentId][] = array_merge($category, ['children' => &$tree[$categoryId]]);
-        }
-
-        return $tree[$categories[0]['parent']];
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Provider/CustomersProvider.php b/engine/Shopware/Bundle/BenchmarkBundle/Provider/CustomersProvider.php
deleted file mode 100644
index 458c2a97c68..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Provider/CustomersProvider.php
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle\Provider;
-
-use Doctrine\DBAL\Connection;
-use PDO;
-use Shopware\Bundle\BenchmarkBundle\BatchableProviderInterface;
-use Shopware\Bundle\StoreFrontBundle\Struct\ShopContextInterface;
-
-class CustomersProvider implements BatchableProviderInterface
-{
-    private const NAME = 'customers';
-
-    /**
-     * @var Connection
-     */
-    private $dbalConnection;
-
-    /**
-     * @var int
-     */
-    private $shopId;
-
-    public function __construct(Connection $dbalConnection)
-    {
-        $this->dbalConnection = $dbalConnection;
-    }
-
-    public function getName()
-    {
-        return self::NAME;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getBenchmarkData(ShopContextInterface $shopContext, $batchSize = null)
-    {
-        $this->shopId = $shopContext->getShop()->getId();
-
-        return [
-            'list' => $this->getCustomersList($batchSize),
-        ];
-    }
-
-    /**
-     * @param int $batchSize
-     *
-     * @return array
-     */
-    private function getCustomersList($batchSize = null)
-    {
-        $config = $this->getConfig();
-        $batch = (int) $config['batch_size'];
-        $lastCustomerId = $config['last_customer_id'];
-
-        if ($batchSize !== null) {
-            $batch = $batchSize;
-        }
-
-        $customers = $this->getCustomersBasicList($batch, $lastCustomerId);
-
-        $customerIds = array_keys($customers);
-
-        foreach ($this->getTurnOverPerCustomer($customerIds) as $customerId => $turnOver) {
-            $customers[$customerId]['turnOver'] = $turnOver;
-        }
-
-        $customers = array_map([$this, 'matchGenders'], array_values($customers));
-
-        $customers = array_map(function ($item) {
-            $item['hasNewsletter'] = (bool) $item['hasNewsletter'];
-            $item['registered'] = (bool) $item['registered'];
-            $item['turnOver'] = (float) $item['turnOver'];
-
-            if ($item['birthMonth']) {
-                $item['birthMonth'] = (int) $item['birthMonth'];
-                $item['birthYear'] = (int) $item['birthYear'];
-            } else {
-                $item['birthMonth'] = 0;
-                $item['birthYear'] = 0;
-            }
-
-            return $item;
-        }, $customers);
-
-        return $customers;
-    }
-
-    /**
-     * @param int $batch
-     * @param int $lastCustomerId
-     *
-     * @return array
-     */
-    private function getCustomersBasicList($batch, $lastCustomerId)
-    {
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        return $queryBuilder->select([
-                'customer.id',
-                'customer.id as customerId',
-                'customer.accountmode = 0 as registered',
-                'YEAR(customer.birthday) as birthYear',
-                'MONTH(customer.birthday) as birthMonth',
-                'customer.salutation as gender',
-                'customer.firstlogin as registerDate',
-                'newsletter.id IS NOT NULL as hasNewsletter',
-                '0 as turnOver',
-            ])
-            ->from('s_user', 'customer')
-            ->leftJoin('customer', 's_campaigns_mailaddresses', 'newsletter', 'newsletter.email = customer.email AND newsletter.customer = 1')
-            ->where('customer.id > :lastCustomerId')
-            ->andWhere('customer.subshopID = :shopId')
-            ->setParameter(':shopId', $this->shopId)
-            ->setParameter(':lastCustomerId', $lastCustomerId)
-            ->orderBy('customer.id')
-            ->setMaxResults($batch)
-            ->execute()
-            ->fetchAll(PDO::FETCH_GROUP | PDO::FETCH_UNIQUE | PDO::FETCH_ASSOC);
-    }
-
-    /**
-     * @param int[] $customerIds
-     *
-     * @return array
-     */
-    private function getTurnOverPerCustomer(array $customerIds)
-    {
-        $turnOverQueryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        return $turnOverQueryBuilder->select([
-                'orders.userID',
-                'SUM(orders.invoice_amount)',
-            ])
-            ->from('s_order', 'orders')
-            ->where('orders.userID IN (:customerIds)')
-            ->groupBy('orders.userID')
-            ->setParameter(':customerIds', $customerIds, Connection::PARAM_INT_ARRAY)
-            ->execute()
-            ->fetchAll(PDO::FETCH_KEY_PAIR);
-    }
-
-    /**
-     * @return array
-     */
-    private function matchGenders(array $customer)
-    {
-        if ($customer['gender'] === 'mr') {
-            $customer['gender'] = 'male';
-
-            return $customer;
-        }
-
-        if (\in_array($customer['gender'], ['mrs', 'ms'])) {
-            $customer['gender'] = 'female';
-
-            return $customer;
-        }
-
-        $customer['gender'] = 'unknown';
-
-        return $customer;
-    }
-
-    /**
-     * @return array
-     */
-    private function getConfig()
-    {
-        $configsQueryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        return $configsQueryBuilder->select('configs.*')
-            ->from('s_benchmark_config', 'configs')
-            ->where('configs.shop_id = :shopId')
-            ->setParameter(':shopId', $this->shopId)
-            ->execute()
-            ->fetch();
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Provider/EmotionsProvider.php b/engine/Shopware/Bundle/BenchmarkBundle/Provider/EmotionsProvider.php
deleted file mode 100644
index 06ec18071f8..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Provider/EmotionsProvider.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle\Provider;
-
-use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Query\QueryBuilder;
-use PDO;
-use Shopware\Bundle\BenchmarkBundle\BenchmarkProviderInterface;
-use Shopware\Bundle\StoreFrontBundle\Struct\ShopContextInterface;
-
-class EmotionsProvider implements BenchmarkProviderInterface
-{
-    private const NAME = 'emotions';
-
-    /**
-     * @var Connection
-     */
-    private $dbalConnection;
-
-    /**
-     * @var ShopContextInterface
-     */
-    private $shopContext;
-
-    /**
-     * @var array
-     */
-    private $emotionIds = [];
-
-    public function __construct(Connection $dbalConnection)
-    {
-        $this->dbalConnection = $dbalConnection;
-    }
-
-    public function getName()
-    {
-        return self::NAME;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getBenchmarkData(ShopContextInterface $shopContext)
-    {
-        $this->shopContext = $shopContext;
-        $this->emotionIds = [];
-
-        return [
-            'total' => $this->getTotalEmotions(),
-            'landingPages' => $this->getLandingPageEmotions(),
-            'timed' => $this->getTimedEmotions(),
-            'elementUsages' => $this->getElementUsages(),
-            'viewportUsages' => $this->getViewportUsages(),
-        ];
-    }
-
-    /**
-     * @return int
-     */
-    private function getTotalEmotions()
-    {
-        $queryBuilder = $this->getBasicEmotionCountQueryBuilder();
-
-        return (int) $queryBuilder->execute()->fetchColumn();
-    }
-
-    /**
-     * @return int
-     */
-    private function getLandingPageEmotions()
-    {
-        $queryBuilder = $this->getBasicEmotionCountQueryBuilder();
-
-        return (int) $queryBuilder->andWhere('emotion.is_landingpage = 1')
-            ->execute()
-            ->fetchColumn();
-    }
-
-    /**
-     * @return int
-     */
-    private function getTimedEmotions()
-    {
-        $queryBuilder = $this->getBasicEmotionCountQueryBuilder();
-
-        return (int) $queryBuilder->andWhere('emotion.valid_from IS NOT NULL OR emotion.valid_to IS NOT NULL')
-            ->execute()
-            ->fetchColumn();
-    }
-
-    /**
-     * @return array
-     */
-    private function getElementUsages()
-    {
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        $emotionIds = $this->getEmotionIds();
-
-        $data = $queryBuilder->select('COUNT(element.id) as elementCount, element.x_type as elementName')
-            ->from('s_emotion_element', 'elementRelation')
-            ->innerJoin('elementRelation', 's_library_component', 'element', 'element.id = elementRelation.componentID')
-            ->where('elementRelation.emotionID IN (:emotionIds)')
-            ->groupBy('elementRelation.componentID')
-            ->setParameter(':emotionIds', $emotionIds, Connection::PARAM_INT_ARRAY)
-            ->execute()
-            ->fetchAll();
-
-        $data = array_map(function ($item) {
-            $item['elementCount'] = (int) $item['elementCount'];
-
-            return $item;
-        }, $data);
-
-        return $data;
-    }
-
-    /**
-     * @return array
-     */
-    private function getViewportUsages()
-    {
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-        $emotionIds = $this->getEmotionIds();
-
-        $devicesUsed = $queryBuilder->select("GROUP_CONCAT(emotion.device SEPARATOR ',') as devicesUsed")
-            ->from('s_emotion', 'emotion')
-            ->where('emotion.id IN (:emotionIds)')
-            ->setParameter(':emotionIds', $emotionIds, Connection::PARAM_INT_ARRAY)
-            ->execute()
-            ->fetchColumn();
-
-        $devicesUsed = array_filter(explode(',', $devicesUsed), static function ($element) {
-            return $element !== '';
-        });
-
-        $deviceCounts = [0, 0, 0, 0, 0];
-        foreach ($devicesUsed as $device) {
-            if (\array_key_exists($device, $deviceCounts)) {
-                ++$deviceCounts[$device];
-                continue;
-            }
-
-            $deviceCounts[$device] = 1;
-        }
-
-        return $deviceCounts;
-    }
-
-    /**
-     * @return QueryBuilder
-     */
-    private function getBasicEmotionCountQueryBuilder()
-    {
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        $emotionIds = $this->getEmotionIds();
-
-        return $queryBuilder->select('COUNT(emotion.id)')
-            ->from('s_emotion', 'emotion')
-            ->where('emotion.id IN (:emotionId)')
-            ->setParameter(':emotionId', $emotionIds, Connection::PARAM_INT_ARRAY);
-    }
-
-    /**
-     * @return array
-     */
-    private function getEmotionIds()
-    {
-        $shopId = $this->shopContext->getShop()->getId();
-        if (\array_key_exists($shopId, $this->emotionIds)) {
-            return $this->emotionIds[$shopId];
-        }
-
-        $emoCategoriesQb = $this->dbalConnection->createQueryBuilder();
-        $emoShopsQb = $this->dbalConnection->createQueryBuilder();
-
-        $categoryId = $this->shopContext->getShop()->getCategory()->getId();
-
-        $emoCategoryIds = $emoCategoriesQb->select('emotion.id')
-            ->from('s_emotion', 'emotion')
-            ->innerJoin('emotion', 's_emotion_categories', 'emoCategories', 'emotion.id = emoCategories.emotion_id')
-            ->innerJoin('emoCategories', 's_categories', 'category', 'category.id = emoCategories.category_id')
-            ->where('emotion.is_landingpage = 0 AND (category.path LIKE :categoryIdPath OR category.id = :categoryId)')
-            ->setParameter(':categoryId', $categoryId)
-            ->setParameter(':categoryIdPath', '%|' . $categoryId . '|%')
-            ->execute()
-            ->fetchAll(PDO::FETCH_COLUMN);
-
-        $emoShopIds = $emoShopsQb->select('emotion.id')
-            ->from('s_emotion', 'emotion')
-            ->innerJoin('emotion', 's_emotion_shops', 'emoShops', 'emotion.id = emoShops.emotion_id')
-            ->where('emotion.is_landingpage = 1 AND emoShops.shop_id = :shopId')
-            ->setParameter(':shopId', $this->shopContext->getShop()->getId())
-            ->execute()
-            ->fetchAll(PDO::FETCH_COLUMN);
-
-        $this->emotionIds[$shopId] = array_merge($emoShopIds, $emoCategoryIds);
-
-        return $this->emotionIds[$shopId];
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Provider/ManufacturerProvider.php b/engine/Shopware/Bundle/BenchmarkBundle/Provider/ManufacturerProvider.php
deleted file mode 100644
index c65123fa3d6..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Provider/ManufacturerProvider.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle\Provider;
-
-use Doctrine\DBAL\Connection;
-use PDO;
-use Shopware\Bundle\BenchmarkBundle\BenchmarkProviderInterface;
-use Shopware\Bundle\StoreFrontBundle\Struct\ShopContextInterface;
-
-class ManufacturerProvider implements BenchmarkProviderInterface
-{
-    private const NAME = 'manufacturers';
-
-    /**
-     * @var Connection
-     */
-    private $dbalConnection;
-
-    /**
-     * @var ShopContextInterface
-     */
-    private $shopContext;
-
-    public function __construct(Connection $dbalConnection)
-    {
-        $this->dbalConnection = $dbalConnection;
-    }
-
-    public function getName()
-    {
-        return self::NAME;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getBenchmarkData(ShopContextInterface $shopContext)
-    {
-        $this->shopContext = $shopContext;
-
-        return [
-            'total' => $this->getTotalSuppliers(),
-        ];
-    }
-
-    /**
-     * @return int
-     */
-    private function getTotalSuppliers()
-    {
-        $productIds = $this->getProductIds();
-
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        return (int) $queryBuilder->select('COUNT(DISTINCT product.supplierID)')
-            ->from('s_articles', 'product')
-            ->where('product.id IN (:productIds)')
-            ->setParameter(':productIds', $productIds, Connection::PARAM_INT_ARRAY)
-            ->execute()
-            ->fetchColumn();
-    }
-
-    /**
-     * @return array
-     */
-    private function getProductIds()
-    {
-        $categoryIds = $this->getPossibleCategoryIds();
-
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        return $queryBuilder->select('DISTINCT productCat.articleID')
-            ->from('s_articles_categories', 'productCat')
-            ->where('productCat.categoryID IN (:categoryIds)')
-            ->setParameter(':categoryIds', $categoryIds, Connection::PARAM_INT_ARRAY)
-            ->execute()
-            ->fetchAll(PDO::FETCH_COLUMN);
-    }
-
-    /**
-     * @return array
-     */
-    private function getPossibleCategoryIds()
-    {
-        $categoryId = $this->shopContext->getShop()->getCategory()->getId();
-
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        return $queryBuilder->select('category.id')
-            ->from('s_categories', 'category')
-            ->where('category.path LIKE :categoryIdPath')
-            ->orWhere('category.id = :categoryId')
-            ->setParameter(':categoryId', $categoryId)
-            ->setParameter(':categoryIdPath', '%|' . $categoryId . '|%')
-            ->execute()
-            ->fetchAll(PDO::FETCH_COLUMN);
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Provider/OrdersProvider.php b/engine/Shopware/Bundle/BenchmarkBundle/Provider/OrdersProvider.php
deleted file mode 100644
index d14fd468a3e..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Provider/OrdersProvider.php
+++ /dev/null
@@ -1,474 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle\Provider;
-
-use DateTime;
-use Doctrine\DBAL\Connection;
-use PDO;
-use Shopware\Bundle\BenchmarkBundle\BatchableProviderInterface;
-use Shopware\Bundle\BenchmarkBundle\Service\MatcherService;
-use Shopware\Bundle\StoreFrontBundle\Struct\ShopContextInterface;
-
-class OrdersProvider implements BatchableProviderInterface
-{
-    private const NAME = 'orders';
-
-    /**
-     * @var Connection
-     */
-    protected $dbalConnection;
-
-    /**
-     * @var int
-     */
-    protected $shopId;
-
-    /**
-     * @var MatcherService
-     */
-    private $paymentMatcher;
-
-    /**
-     * @var MatcherService
-     */
-    private $shipmentMatcher;
-
-    public function __construct(Connection $dbalConnection, MatcherService $paymentMatcher, MatcherService $shipmentMatcher)
-    {
-        $this->dbalConnection = $dbalConnection;
-        $this->paymentMatcher = $paymentMatcher;
-        $this->shipmentMatcher = $shipmentMatcher;
-    }
-
-    public function getName()
-    {
-        return self::NAME;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getBenchmarkData(ShopContextInterface $shopContext, $batchSize = null)
-    {
-        $this->shopId = $shopContext->getShop()->getId();
-
-        return [
-            'list' => $this->getOrdersList($batchSize),
-        ];
-    }
-
-    /**
-     * @param int $batch
-     *
-     * @return array
-     */
-    protected function getOrdersBasicData(array $config, $batch)
-    {
-        $ordersQueryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        $lastOrderId = (int) $config['last_order_id'];
-
-        return $ordersQueryBuilder->select('orders.*')
-            ->from('s_order', 'orders')
-            ->where('orders.id > :lastOrderId')
-            ->andWhere('orders.subshopID = :shopId')
-            ->andWhere('orders.status != -1')
-            ->orderBy('orders.id', 'ASC')
-            ->setMaxResults($batch)
-            ->setParameter(':lastOrderId', $lastOrderId)
-            ->setParameter(':shopId', $this->shopId)
-            ->execute()
-            ->fetchAll(PDO::FETCH_GROUP | PDO::FETCH_UNIQUE | PDO::FETCH_ASSOC);
-    }
-
-    /**
-     * @param int $batchSize
-     *
-     * @return array
-     */
-    private function getOrdersList($batchSize = null)
-    {
-        $config = $this->getOrderConfig();
-        $batch = (int) $config['batch_size'];
-
-        if ($batchSize !== null) {
-            $batch = $batchSize;
-        }
-
-        $orderData = $this->getOrderData($config, $batch);
-        $orderData = $this->hydrateData($orderData);
-
-        return $orderData;
-    }
-
-    /**
-     * @param int $batch
-     *
-     * @return array
-     */
-    private function getOrderData(array $config, $batch)
-    {
-        $ordersBasicData = $this->getOrdersBasicData($config, $batch);
-
-        $orderIds = array_keys($ordersBasicData);
-        $dispatchIds = $this->getUniqueColumnValues($ordersBasicData, 'dispatchID');
-        $paymentIds = $this->getUniqueColumnValues($ordersBasicData, 'paymentID');
-        $customerIds = $this->getUniqueColumnValues($ordersBasicData, 'userID');
-
-        $orderDetails = $this->getOrderDetails($orderIds);
-        $dispatchData = $this->getDispatchData($dispatchIds);
-        $paymentData = $this->getPaymentData($paymentIds);
-        $customerData = $this->getCustomerData($customerIds);
-        $billingCountries = $this->getBillingCountry($orderIds);
-        $shippingCountries = $this->getShippingCountry($orderIds);
-
-        foreach ($orderDetails as $detailsId => $orderDetail) {
-            $orderId = $orderDetail['orderID'];
-            unset($orderDetail['orderID']);
-            $ordersBasicData[$orderId]['details'][] = $orderDetail;
-        }
-
-        foreach ($ordersBasicData as $orderId => &$basicOrder) {
-            // Dispatch has been deleted in meanwhile
-            if (!isset($dispatchData[$basicOrder['dispatchID']])) {
-                $dispatchData[$basicOrder['dispatchID']] = [
-                    'id' => 0,
-                    'name' => 'others',
-                    'minPrice' => 0,
-                    'maxPrice' => 0,
-                ];
-            }
-
-            if (!isset($paymentData[$basicOrder['paymentID']])) {
-                $paymentData[$basicOrder['paymentID']] = [
-                    'id' => 0,
-                    'name' => 'others',
-                    'percentCosts' => 0,
-                    'absoluteCosts' => 0,
-                    'absoluteCostsPerCountry' => 0,
-                ];
-            }
-
-            if (!isset($customerData[$basicOrder['userID']])) {
-                $customerData[$basicOrder['userID']] = [
-                    'registered' => false,
-                    'birthYear' => 0,
-                    'birthMonth' => 0,
-                    'gender' => 'male',
-                    'registerDate' => '1970-01-01',
-                    'hasNewsletter' => false,
-                ];
-            }
-
-            $customerData[$basicOrder['userID']]['registered'] = (bool) $customerData[$basicOrder['userID']]['registered'];
-            $customerData[$basicOrder['userID']]['hasNewsletter'] = (bool) $customerData[$basicOrder['userID']]['hasNewsletter'];
-            $customerData[$basicOrder['userID']]['birthYear'] = (int) $customerData[$basicOrder['userID']]['birthYear'];
-            $customerData[$basicOrder['userID']]['birthMonth'] = (int) $customerData[$basicOrder['userID']]['birthMonth'];
-
-            $basicOrder['dispatch'] = $dispatchData[$basicOrder['dispatchID']];
-            $basicOrder['payment'] = $paymentData[$basicOrder['paymentID']];
-
-            $basicOrder['customer'] = $customerData[$basicOrder['userID']];
-            $basicOrder['customer']['billing']['country'] = isset($billingCountries[$orderId]) ? $billingCountries[$orderId] : '--';
-            $basicOrder['customer']['shipping']['country'] = isset($shippingCountries[$orderId]) ? $shippingCountries[$orderId] : '--';
-
-            if (\strlen($basicOrder['customer']['billing']['country']) !== 2) {
-                $basicOrder['customer']['billing']['country'] = '--';
-            }
-
-            if (\strlen($basicOrder['customer']['shipping']['country']) !== 2) {
-                $basicOrder['customer']['shipping']['country'] = '--';
-            }
-        }
-
-        return $ordersBasicData;
-    }
-
-    /**
-     * @return array
-     */
-    private function hydrateData(array $orderData)
-    {
-        $hydratedOrders = [];
-
-        $currentHydratedOrder = [];
-        foreach ($orderData as $orderId => $order) {
-            $dateTime = DateTime::createFromFormat('Y-m-d H:i:s', $order['ordertime']);
-
-            $currentHydratedOrder['orderId'] = (int) $orderId;
-            $currentHydratedOrder['status'] = (int) $order['status'];
-            $currentHydratedOrder['currency'] = $order['currency'];
-            $currentHydratedOrder['shippingCosts'] = (float) $order['invoice_shipping'];
-            $currentHydratedOrder['changed'] = (string) $order['changed'];
-            $currentHydratedOrder['invoiceAmount'] = (float) $order['invoice_amount'];
-            $currentHydratedOrder['invoiceAmountNet'] = (float) $order['invoice_amount_net'];
-            $currentHydratedOrder['isTaxFree'] = (bool) $order['taxfree'];
-            $currentHydratedOrder['isNet'] = (bool) $order['net'];
-            $currentHydratedOrder['date'] = $dateTime->format('Y-m-d');
-            $currentHydratedOrder['datetime'] = $dateTime->format('Y-m-d H:i:s');
-            $currentHydratedOrder['customer'] = $order['customer'];
-
-            // PHP DateTime can handle also invalid dates
-            if (!$this->isValidDate($currentHydratedOrder['datetime'])) {
-                $currentHydratedOrder['datetime'] = '1970-01-01 00:00:00';
-                $currentHydratedOrder['date'] = '1970-01-01';
-            }
-
-            $currentHydratedOrder['analytics'] = [
-                'device' => empty($order['deviceType']) ? 'desktop' : $order['deviceType'],
-                'referer' => $order['referer'] ? true : false,
-            ];
-
-            $currentHydratedOrder['shipment'] = [
-                'name' => empty($order['dispatch']['name']) ? 'others' : $this->shipmentMatcher->matchString($order['dispatch']['name']),
-                'cost' => [
-                    'minPrice' => (float) $order['dispatch']['minPrice'],
-                    'maxPrice' => (float) $order['dispatch']['maxPrice'],
-                ],
-            ];
-
-            $currentHydratedOrder['payment'] = [
-                'name' => empty($order['payment']['name']) ? 'others' : $this->paymentMatcher->matchString($order['payment']['name']),
-                'cost' => [
-                    'percentCosts' => (float) $order['payment']['percentCosts'],
-                    'absoluteCosts' => (float) $order['payment']['absoluteCosts'],
-                    'absoluteCostsPerCountry' => (float) $order['payment']['absoluteCostsPerCountry'],
-                ],
-            ];
-
-            $currentHydratedOrder['items'] = isset($order['details']) ? $order['details'] : [];
-
-            $isCancelOrder = $currentHydratedOrder['status'] === 4;
-
-            if (!$currentHydratedOrder['changed']) {
-                $currentHydratedOrder['changed'] = '1970-01-01 00:00:00';
-            }
-
-            if ($isCancelOrder) {
-                $currentHydratedOrder['invoiceAmount'] = 0;
-                $currentHydratedOrder['shippingCosts'] = 0;
-            }
-
-            $currentHydratedOrder['items'] = array_map(function ($item) use ($isCancelOrder) {
-                $item['detailId'] = (int) $item['detailId'];
-                $item['unitPrice'] = (float) ($isCancelOrder ? 0 : $item['unitPrice']);
-                $item['totalPrice'] = (float) ($isCancelOrder ? 0 : $item['totalPrice']);
-                $item['amount'] = (int) $item['amount'];
-
-                return $item;
-            }, $currentHydratedOrder['items']);
-
-            $hydratedOrders[] = $currentHydratedOrder;
-        }
-
-        return $hydratedOrders;
-    }
-
-    /**
-     * @return array
-     */
-    private function getOrderDetails(array $orderIds)
-    {
-        $orderDetailsQueryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        return $orderDetailsQueryBuilder->select([
-                'details.id',
-                'details.orderID',
-                'details.id as detailId',
-                'details.price as unitPrice',
-                'details.price * details.quantity as totalPrice',
-                'details.quantity as amount',
-                'IFNULL(details.pack_unit, "") as packUnit',
-                'IFNULL(details.unit, "") as purchaseUnit',
-            ])
-            ->from('s_order_details', 'details')
-            ->where('details.orderID IN (:orderIds)')
-            ->setParameter(':orderIds', $orderIds, Connection::PARAM_INT_ARRAY)
-            ->execute()
-            ->fetchAll(PDO::FETCH_GROUP | PDO::FETCH_UNIQUE | PDO::FETCH_ASSOC);
-    }
-
-    /**
-     * @return array
-     */
-    private function getDispatchData(array $dispatchIds)
-    {
-        $dispatchQueryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        return $dispatchQueryBuilder->select('dispatch.id, dispatch.name, MIN(costs.value) as minPrice, MAX(costs.value) as maxPrice')
-            ->from('s_premium_dispatch', 'dispatch')
-            ->innerJoin('dispatch', 's_premium_shippingcosts', 'costs', 'dispatch.id = costs.dispatchID')
-            ->where('dispatch.id IN (:dispatchIds)')
-            ->setParameter(':dispatchIds', $dispatchIds, Connection::PARAM_INT_ARRAY)
-            ->groupBy('dispatch.id')
-            ->execute()
-            ->fetchAll(PDO::FETCH_GROUP | PDO::FETCH_UNIQUE | PDO::FETCH_ASSOC);
-    }
-
-    /**
-     * @return array
-     */
-    private function getPaymentData(array $paymentIds)
-    {
-        $paymentQueryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        return $paymentQueryBuilder->select([
-                'payment.id',
-                'payment.name',
-                'payment.debit_percent as percentCosts',
-                'payment.surcharge as absoluteCosts',
-                'payment.surchargeString as absoluteCostsPerCountry',
-            ])
-            ->from('s_core_paymentmeans', 'payment')
-            ->where('payment.id IN (:paymentIds)')
-            ->setParameter(':paymentIds', $paymentIds, Connection::PARAM_INT_ARRAY)
-            ->execute()
-            ->fetchAll(PDO::FETCH_GROUP | PDO::FETCH_UNIQUE | PDO::FETCH_ASSOC);
-    }
-
-    /**
-     * @return array
-     */
-    private function getOrderConfig()
-    {
-        $configsQueryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        return $configsQueryBuilder->select('configs.*')
-            ->from('s_benchmark_config', 'configs')
-            ->where('configs.shop_id = :shopId')
-            ->setParameter(':shopId', $this->shopId)
-            ->execute()
-            ->fetch();
-    }
-
-    /**
-     * @return array
-     */
-    private function getCustomerData(array $customerIds)
-    {
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        $customers = $queryBuilder->select([
-                'customer.id',
-                'customer.accountmode = 0 as registered',
-                'YEAR(customer.birthday) as birthYear',
-                'MONTH(customer.birthday) as birthMonth',
-                'customer.salutation as gender',
-                'customer.firstlogin as registerDate',
-                'newsletter.id IS NOT NULL as hasNewsletter',
-            ])
-            ->from('s_user', 'customer')
-            ->leftJoin('customer', 's_campaigns_mailaddresses', 'newsletter', 'newsletter.email = customer.email AND newsletter.customer = 1')
-
-            ->where('customer.id IN (:customerIds)')
-            ->setParameter(':customerIds', $customerIds, Connection::PARAM_INT_ARRAY)
-            ->orderBy('customer.id')
-            ->execute()
-            ->fetchAll(PDO::FETCH_GROUP | PDO::FETCH_UNIQUE | PDO::FETCH_ASSOC);
-
-        return array_map([$this, 'matchGenders'], $customers);
-    }
-
-    /**
-     * @return array
-     */
-    private function getBillingCountry(array $orderIds)
-    {
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        return $queryBuilder->select('billingAddress.orderID, country.countryiso')
-            ->from('s_order_billingaddress', 'billingAddress')
-            ->innerJoin('billingAddress', 's_core_countries', 'country', 'country.id = billingAddress.countryID')
-            ->where('billingAddress.orderID IN (:orderIds)')
-            ->setParameter(':orderIds', $orderIds, Connection::PARAM_INT_ARRAY)
-            ->execute()
-            ->fetchAll(PDO::FETCH_KEY_PAIR);
-    }
-
-    /**
-     * @return array
-     */
-    private function getShippingCountry(array $orderIds)
-    {
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        return $queryBuilder->select('shippingAddress.orderID, country.countryiso')
-            ->from('s_order_shippingaddress', 'shippingAddress')
-            ->innerJoin('shippingAddress', 's_core_countries', 'country', 'country.id = shippingAddress.countryID')
-            ->where('shippingAddress.orderID IN (:orderIds)')
-            ->setParameter(':orderIds', $orderIds, Connection::PARAM_INT_ARRAY)
-            ->execute()
-            ->fetchAll(PDO::FETCH_KEY_PAIR);
-    }
-
-    /**
-     * @return array
-     */
-    private function matchGenders(array $customer)
-    {
-        if ($customer['gender'] === 'mr') {
-            $customer['gender'] = 'male';
-
-            return $customer;
-        }
-
-        if (\in_array($customer['gender'], ['mrs', 'ms'])) {
-            $customer['gender'] = 'female';
-
-            return $customer;
-        }
-
-        $customer['gender'] = 'unknown';
-
-        return $customer;
-    }
-
-    /**
-     * Fetches a column of an associative array and returns the unique values.
-     *
-     * @param string $column
-     *
-     * @return array
-     */
-    private function getUniqueColumnValues(array $dataSet, $column)
-    {
-        $columnValues = array_column($dataSet, $column);
-
-        // Values unique this way, faster than array_unique
-        return array_keys(array_flip($columnValues));
-    }
-
-    /**
-     * @param string $date
-     *
-     * @return bool
-     */
-    private function isValidDate($date)
-    {
-        $re = '/^([0-9]{2,4})-([0-1][0-9])-([0-3][0-9])(?:( [0-2][0-9]):([0-5][0-9]):([0-5][0-9]))?$/m';
-
-        return preg_match($re, $date);
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Provider/PaymentsProvider.php b/engine/Shopware/Bundle/BenchmarkBundle/Provider/PaymentsProvider.php
deleted file mode 100644
index f19b256e1c4..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Provider/PaymentsProvider.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle\Provider;
-
-use Doctrine\DBAL\Connection;
-use PDO;
-use Shopware\Bundle\BenchmarkBundle\BenchmarkProviderInterface;
-use Shopware\Bundle\BenchmarkBundle\Service\MatcherService;
-use Shopware\Bundle\StoreFrontBundle\Struct\ShopContextInterface;
-
-class PaymentsProvider implements BenchmarkProviderInterface
-{
-    private const NAME = 'payments';
-
-    /**
-     * @var Connection
-     */
-    private $dbalConnection;
-
-    /**
-     * @var int
-     */
-    private $shopId;
-
-    /**
-     * @var array
-     */
-    private $paymentIds = [];
-
-    /**
-     * @var MatcherService
-     */
-    private $matcherService;
-
-    public function __construct(Connection $dbalConnection, MatcherService $matcherService)
-    {
-        $this->dbalConnection = $dbalConnection;
-        $this->matcherService = $matcherService;
-    }
-
-    public function getName()
-    {
-        return self::NAME;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getBenchmarkData(ShopContextInterface $shopContext)
-    {
-        $this->shopId = $shopContext->getShop()->getId();
-        $this->paymentIds = [];
-
-        return [
-            'activePayments' => $this->getTotalActivePayments(),
-            'paymentsWithSurcharge' => $this->getPaymentsWithSurcharges(),
-            'paymentsWithReduction' => $this->getPaymentsWithReduction(),
-            'paymentsWithPercentagePrice' => $this->getPaymentsWithPercentagePrice(),
-            'paymentsWithAbsolutePrice' => $this->getPaymentsWithAbsolutePrice(),
-            'paymentUsages' => $this->getMatchedPaymentUsages(),
-        ];
-    }
-
-    private function getMatchedPaymentUsages()
-    {
-        $paymentUsages = $this->getPaymentUsages();
-
-        $matches = [];
-        foreach ($paymentUsages as $paymentName => $usages) {
-            $match = $this->matcherService->matchString($paymentName);
-
-            if (!isset($matches[$match])) {
-                $matches[$match] = [
-                    'name' => $match,
-                    'usages' => 0,
-                ];
-            }
-
-            $matches[$match]['usages'] += $usages;
-        }
-
-        return array_values($matches);
-    }
-
-    /**
-     * @return array
-     */
-    private function getPaymentUsages()
-    {
-        $paymentIds = $this->getPossiblePaymentIds();
-
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        return $queryBuilder->select('payments.name, COUNT(orders.id) as usages')
-            ->from('s_order', 'orders')
-            ->leftJoin('orders', 's_core_paymentmeans', 'payments', 'payments.id = orders.paymentID')
-            ->where('payments.id IN (:paymentIds)')
-            ->setParameter(':paymentIds', $paymentIds, Connection::PARAM_INT_ARRAY)
-            ->groupBy('orders.paymentID')
-            ->orderBy('usages', 'DESC')
-            ->execute()
-            ->fetchAll(PDO::FETCH_KEY_PAIR);
-    }
-
-    /**
-     * @return int
-     */
-    private function getTotalActivePayments()
-    {
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        $paymentIds = $this->getPossiblePaymentIds();
-
-        return (int) $queryBuilder->select('COUNT(payments.id)')
-            ->from('s_core_paymentmeans', 'payments')
-            ->where('payments.active = 1')
-            ->andWhere('payments.id IN (:paymentIds)')
-            ->setParameter(':paymentIds', $paymentIds, Connection::PARAM_INT_ARRAY)
-            ->execute()
-            ->fetchColumn();
-    }
-
-    /**
-     * @return int
-     */
-    private function getPaymentsWithSurcharges()
-    {
-        $paymentIds = $this->getPossiblePaymentIds();
-
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-        $payments = $queryBuilder->select('payments.debit_percent, payments.surcharge, payments.surchargestring')
-            ->from('s_core_paymentmeans', 'payments')
-            ->where('payments.id IN (:paymentIds)')
-            ->setParameter(':paymentIds', $paymentIds, Connection::PARAM_INT_ARRAY)
-            ->execute()
-            ->fetchAll();
-
-        foreach ($payments as $key => $payment) {
-            if ($payment['surcharge'] > 0 || $payment['debit_percent'] > 0 || $this->hasSurchargeInCountries($payment['surchargestring'])) {
-                continue;
-            }
-
-            unset($payments[$key]);
-        }
-
-        return \count($payments);
-    }
-
-    /**
-     * @return int
-     */
-    private function getPaymentsWithReduction()
-    {
-        $paymentIds = $this->getPossiblePaymentIds();
-
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-        $payments = $queryBuilder->select('payments.debit_percent, payments.surcharge, payments.surchargestring')
-            ->from('s_core_paymentmeans', 'payments')
-            ->where('payments.id IN (:paymentIds)')
-            ->setParameter(':paymentIds', $paymentIds, Connection::PARAM_INT_ARRAY)
-            ->execute()
-            ->fetchAll();
-
-        foreach ($payments as $key => $payment) {
-            if ($payment['surcharge'] < 0 || $payment['debit_percent'] < 0 || $this->hasReductionInCountries($payment['surchargestring'])) {
-                continue;
-            }
-
-            unset($payments[$key]);
-        }
-
-        return \count($payments);
-    }
-
-    /**
-     * @return int
-     */
-    private function getPaymentsWithPercentagePrice()
-    {
-        $paymentIds = $this->getPossiblePaymentIds();
-
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        return (int) $queryBuilder->select('COUNT(payments.id)')
-            ->from('s_core_paymentmeans', 'payments')
-            ->where('payments.debit_percent != 0')
-            ->andWhere('payments.id IN (:paymentIds)')
-            ->setParameter(':paymentIds', $paymentIds, Connection::PARAM_INT_ARRAY)
-            ->execute()
-            ->fetchColumn();
-    }
-
-    /**
-     * @return int
-     */
-    private function getPaymentsWithAbsolutePrice()
-    {
-        $paymentIds = $this->getPossiblePaymentIds();
-
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        return (int) $queryBuilder->select('COUNT(payments.id)')
-            ->from('s_core_paymentmeans', 'payments')
-            ->where("payments.surcharge != 0 OR payments.surchargestring != ''")
-            ->andWhere('payments.id IN (:paymentIds)')
-            ->setParameter(':paymentIds', $paymentIds, Connection::PARAM_INT_ARRAY)
-            ->execute()
-            ->fetchColumn();
-    }
-
-    /**
-     * @param string $surchargeString
-     *
-     * @return bool
-     */
-    private function hasSurchargeInCountries($surchargeString)
-    {
-        if (!$surchargeString) {
-            return false;
-        }
-
-        return $this->getSurcharge($surchargeString)[0];
-    }
-
-    /**
-     * @param string $surchargeString
-     *
-     * @return bool
-     */
-    private function hasReductionInCountries($surchargeString)
-    {
-        if (!$surchargeString) {
-            return false;
-        }
-
-        return $this->getSurcharge($surchargeString)[1];
-    }
-
-    /**
-     * @param string $surchargeString
-     *
-     * @return bool[]
-     */
-    private function getSurcharge($surchargeString)
-    {
-        $pricePerCountry = explode(';', $surchargeString);
-
-        $hasReduction = false;
-        $hasSurcharge = false;
-        foreach ($pricePerCountry as $countryPrice) {
-            $countryPrice = explode(':', $countryPrice)[1];
-            if ($countryPrice < 0) {
-                $hasReduction = true;
-            }
-
-            if ($countryPrice > 0) {
-                $hasSurcharge = true;
-            }
-        }
-
-        return [$hasSurcharge, $hasReduction];
-    }
-
-    /**
-     * @return array
-     */
-    private function getPossiblePaymentIds()
-    {
-        if (\array_key_exists($this->shopId, $this->paymentIds)) {
-            return $this->paymentIds[$this->shopId];
-        }
-
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        $this->paymentIds[$this->shopId] = $queryBuilder->select('DISTINCT payment.id')
-            ->from('s_core_paymentmeans', 'payment')
-            ->leftJoin('payment', 's_core_paymentmeans_subshops', 'paymentShop', 'paymentShop.paymentID = payment.id')
-            ->where('paymentShop.subshopID IS NULL or paymentShop.subshopID = :shopId')
-            ->setParameter(':shopId', $this->shopId)
-            ->execute()
-            ->fetchAll(PDO::FETCH_COLUMN);
-
-        return $this->paymentIds[$this->shopId];
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Provider/PluginsProvider.php b/engine/Shopware/Bundle/BenchmarkBundle/Provider/PluginsProvider.php
deleted file mode 100644
index 37349a5fa8f..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Provider/PluginsProvider.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle\Provider;
-
-use Doctrine\DBAL\Connection;
-use Shopware\Bundle\BenchmarkBundle\BenchmarkProviderInterface;
-use Shopware\Bundle\StoreFrontBundle\Struct\ShopContextInterface;
-
-class PluginsProvider implements BenchmarkProviderInterface
-{
-    private const NAME = 'plugins';
-
-    /**
-     * @var Connection
-     */
-    private $dbalConnection;
-
-    public function __construct(Connection $dbalConnection)
-    {
-        $this->dbalConnection = $dbalConnection;
-    }
-
-    public function getName()
-    {
-        return self::NAME;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getBenchmarkData(ShopContextInterface $shopContext)
-    {
-        return [
-            'total' => $this->getTotalPlugins(),
-            'shopwarePlugins' => $this->getShopwarePlugins(),
-        ];
-    }
-
-    /**
-     * @return int
-     */
-    private function getTotalPlugins()
-    {
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        return (int) $queryBuilder->select('COUNT(plugins.id)')
-            ->from('s_core_plugins', 'plugins')
-            ->execute()
-            ->fetchColumn();
-    }
-
-    /**
-     * @return array
-     */
-    private function getShopwarePlugins()
-    {
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        $data = $queryBuilder->select('plugins.name, plugins.active')
-            ->from('s_core_plugins', 'plugins')
-            ->where("plugins.author = 'shopware AG'")
-            ->execute()
-            ->fetchAll();
-
-        $data = array_map(function ($item) {
-            $item['active'] = (bool) $item['active'];
-
-            return $item;
-        }, $data);
-
-        return $data;
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Provider/ProductsProvider.php b/engine/Shopware/Bundle/BenchmarkBundle/Provider/ProductsProvider.php
deleted file mode 100644
index 7bbe4b0e645..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Provider/ProductsProvider.php
+++ /dev/null
@@ -1,286 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle\Provider;
-
-use Doctrine\DBAL\Connection;
-use PDO;
-use Shopware\Bundle\BenchmarkBundle\BatchableProviderInterface;
-use Shopware\Bundle\StoreFrontBundle\Struct\ShopContextInterface;
-
-class ProductsProvider implements BatchableProviderInterface
-{
-    private const NAME = 'products';
-
-    /**
-     * @var Connection
-     */
-    private $dbalConnection;
-
-    /**
-     * @var ShopContextInterface
-     */
-    private $shopContext;
-
-    public function __construct(Connection $dbalConnection)
-    {
-        $this->dbalConnection = $dbalConnection;
-    }
-
-    public function getName()
-    {
-        return self::NAME;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getBenchmarkData(ShopContextInterface $shopContext, $batchSize = null)
-    {
-        $this->shopContext = $shopContext;
-
-        return [
-            'list' => $this->getProductList($batchSize),
-        ];
-    }
-
-    /**
-     * @param int $batchSize
-     *
-     * @return array
-     */
-    private function getProductList($batchSize = null)
-    {
-        $config = $this->getConfig();
-        $batch = (int) $config['batch_size'];
-        $lastProductId = (int) $config['last_product_id'];
-
-        if ($batchSize !== null) {
-            $batch = $batchSize;
-        }
-
-        $productIds = $this->getProductIds($batch, $lastProductId);
-
-        $basicProducts = $this->getBasicProductData($productIds);
-
-        $productIds = array_keys($basicProducts);
-
-        $variantsPerProduct = $this->getVariantsForProducts($productIds);
-        $imagesPerProduct = $this->getImagesPerProduct($productIds);
-
-        foreach ($basicProducts as $productId => &$basicProduct) {
-            $basicProduct['variants'] = [];
-            if (\array_key_exists($productId, $variantsPerProduct)) {
-                $basicProduct['variants'] = $variantsPerProduct[$productId];
-            }
-
-            $basicProduct['images'] = [];
-            if (\array_key_exists($productId, $imagesPerProduct)) {
-                $basicProduct['images'] = $imagesPerProduct[$productId];
-            }
-        }
-
-        $basicProducts = array_map(function ($item) {
-            $item['active'] = (bool) $item['active'];
-            $item['notificationEnabled'] = (bool) $item['notificationEnabled'];
-            $item['instock'] = (int) $item['instock'];
-            $item['instockMinimum'] = (int) $item['instockMinimum'];
-            $item['sale'] = (int) $item['sale'];
-            $item['minPurchase'] = (int) $item['minPurchase'];
-            $item['maxPurchase'] = (int) $item['maxPurchase'];
-            $item['purchaseSteps'] = (int) $item['purchaseSteps'];
-            $item['shippingReady'] = (bool) $item['shippingReady'];
-            $item['shippingFree'] = (bool) $item['shippingFree'];
-            $item['pseudoSales'] = (int) $item['pseudoSales'];
-            $item['topSeller'] = (int) $item['topSeller'];
-
-            $item['variants'] = array_map(function ($item) {
-                $item['active'] = (bool) $item['active'];
-                $item['instock'] = (int) $item['instock'];
-                $item['instockMinimum'] = (int) $item['instockMinimum'];
-                $item['sale'] = (int) $item['sale'];
-                $item['minPurchase'] = (int) $item['minPurchase'];
-                $item['maxPurchase'] = (int) $item['maxPurchase'];
-                $item['purchaseSteps'] = (int) $item['purchaseSteps'];
-                $item['shippingReady'] = (bool) $item['shippingReady'];
-                $item['shippingFree'] = (bool) $item['shippingFree'];
-
-                return $item;
-            }, $item['variants']);
-
-            return $item;
-        }, $basicProducts);
-
-        return array_values($basicProducts);
-    }
-
-    /**
-     * @return array
-     */
-    private function getBasicProductData(array $productIds)
-    {
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        return $queryBuilder->select([
-            'details.articleID',
-            'details.articleID as productId',
-            'details.active',
-            'details.instock',
-            'details.stockmin as instockMinimum',
-            'details.lastStock as sale',
-            'details.minpurchase as minPurchase',
-            'details.maxpurchase as maxPurchase',
-            'details.purchasesteps as purchaseSteps',
-            'details.instock > 0 as shippingReady',
-            'details.shippingfree as shippingFree',
-            'productMain.pseudosales as pseudoSales',
-            'productMain.topseller as topSeller',
-            'productMain.notification as notificationEnabled',
-            'details.shippingtime as shippingTime',
-        ])
-            ->from('s_articles_details', 'details')
-            ->innerJoin('details', 's_articles', 'productMain', 'productMain.id = details.articleID')
-            ->where('productMain.id IN (:productIds)')
-            ->setParameter(':productIds', $productIds, Connection::PARAM_INT_ARRAY)
-            ->execute()
-            ->fetchAll(PDO::FETCH_GROUP | PDO::FETCH_UNIQUE | PDO::FETCH_ASSOC);
-    }
-
-    /**
-     * @return array
-     */
-    private function getVariantsForProducts(array $productIds)
-    {
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        return $queryBuilder->select([
-            'details.articleID',
-            'details.active',
-            'details.instock',
-            'details.stockmin as instockMinimum',
-            'details.lastStock as sale',
-            'details.minpurchase as minPurchase',
-            'details.maxpurchase as maxPurchase',
-            'details.purchasesteps as purchaseSteps',
-            'details.instock > 0 as shippingReady',
-            'details.shippingfree as shippingFree',
-            'details.shippingtime as shippingTime',
-        ])
-            ->from('s_articles_details', 'details')
-            ->where('details.articleID IN (:productIds)')
-            ->andWhere('details.kind = 2')
-            ->setParameter(':productIds', $productIds, Connection::PARAM_INT_ARRAY)
-            ->execute()
-            ->fetchAll(PDO::FETCH_GROUP);
-    }
-
-    /**
-     * @return array
-     */
-    private function getImagesPerProduct(array $productIds)
-    {
-        $productMedias = [];
-
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        $mediaIdArray = $queryBuilder->select('image.articleID, GROUP_CONCAT(image.media_id)')
-            ->from('s_articles_img', 'image')
-            ->where('image.articleID IN (:productIds)')
-            ->groupBy('image.articleID')
-            ->setParameter(':productIds', $productIds, Connection::PARAM_INT_ARRAY)
-            ->execute()
-            ->fetchAll(PDO::FETCH_KEY_PAIR);
-
-        foreach ($mediaIdArray as $productId => $mediaIds) {
-            $mediaQueryBuilder = $this->dbalConnection->createQueryBuilder();
-            $medias = $mediaQueryBuilder->select('media.width, media.height, media.extension, media.file_size as fileSize')
-                ->from('s_media', 'media')
-                ->where('media.id IN (:mediaIds)')
-                ->setParameter(':mediaIds', explode(',', $mediaIds), Connection::PARAM_INT_ARRAY)
-                ->execute()
-                ->fetchAll();
-
-            $productMedias[$productId] = $medias;
-        }
-
-        return $productMedias;
-    }
-
-    /**
-     * @param int $batch
-     * @param int $lastProductId
-     *
-     * @return array
-     */
-    private function getProductIds($batch, $lastProductId)
-    {
-        $categoryIds = $this->getPossibleCategoryIds();
-
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        return $queryBuilder->select('DISTINCT productCat.articleID')
-            ->from('s_articles_categories', 'productCat')
-            ->where('productCat.categoryID IN (:categoryIds)')
-            ->andWhere('productCat.articleID > :lastProductId')
-            ->setMaxResults($batch)
-            ->setParameter(':categoryIds', $categoryIds, Connection::PARAM_INT_ARRAY)
-            ->setParameter(':lastProductId', $lastProductId)
-            ->execute()
-            ->fetchAll(PDO::FETCH_COLUMN);
-    }
-
-    /**
-     * @return array
-     */
-    private function getPossibleCategoryIds()
-    {
-        $categoryId = $this->shopContext->getShop()->getCategory()->getId();
-
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        return $queryBuilder->select('category.id')
-            ->from('s_categories', 'category')
-            ->where('category.path LIKE :categoryIdPath')
-            ->orWhere('category.id = :categoryId')
-            ->setParameter(':categoryId', $categoryId)
-            ->setParameter(':categoryIdPath', '%|' . $categoryId . '|%')
-            ->execute()
-            ->fetchAll(PDO::FETCH_COLUMN);
-    }
-
-    /**
-     * @return array
-     */
-    private function getConfig()
-    {
-        $configsQueryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        return $configsQueryBuilder->select('configs.*')
-            ->from('s_benchmark_config', 'configs')
-            ->where('configs.shop_id = :shopId')
-            ->setParameter(':shopId', $this->shopContext->getShop()->getId())
-            ->execute()
-            ->fetch();
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Provider/ShipmentsProvider.php b/engine/Shopware/Bundle/BenchmarkBundle/Provider/ShipmentsProvider.php
deleted file mode 100644
index d7f85b68c30..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Provider/ShipmentsProvider.php
+++ /dev/null
@@ -1,244 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle\Provider;
-
-use Doctrine\DBAL\Connection;
-use PDO;
-use Shopware\Bundle\BenchmarkBundle\BenchmarkProviderInterface;
-use Shopware\Bundle\BenchmarkBundle\Service\MatcherService;
-use Shopware\Bundle\StoreFrontBundle\Struct\ShopContextInterface;
-
-class ShipmentsProvider implements BenchmarkProviderInterface
-{
-    private const NAME = 'shipments';
-
-    /**
-     * @var Connection
-     */
-    private $dbalConnection;
-
-    /**
-     * @var ShopContextInterface
-     */
-    private $shopContext;
-
-    /**
-     * @var array
-     */
-    private $shipmentIds = [];
-
-    /**
-     * @var MatcherService
-     */
-    private $matcher;
-
-    public function __construct(Connection $dbalConnection, MatcherService $matcherService)
-    {
-        $this->dbalConnection = $dbalConnection;
-        $this->matcher = $matcherService;
-    }
-
-    public function getName()
-    {
-        return self::NAME;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getBenchmarkData(ShopContextInterface $shopContext)
-    {
-        $this->shopContext = $shopContext;
-        $this->shipmentIds = [];
-
-        return [
-            'list' => $this->getMatchedShipmentList(),
-            'usages' => $this->getMatchedShipmentUsages(),
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    private function getMatchedShipmentList()
-    {
-        $shipmentList = $this->getShipmentList();
-
-        $matches = [];
-        $others = [];
-        foreach ($shipmentList as $shipmentName => $prices) {
-            $matchedName = $this->matcher->matchString($shipmentName);
-
-            if ($matchedName === 'others') {
-                $others[] = $prices;
-                continue;
-            }
-
-            $matches[$matchedName] = ['name' => $matchedName] + $prices;
-        }
-
-        $minPrices = array_column($others, 'minPrice');
-        $maxPrices = array_column($others, 'maxPrice');
-
-        $matches['others']['name'] = 'others';
-        $matches['others']['minPrice'] = (float) empty($minPrices) ? 0.0 : min($minPrices);
-        $matches['others']['maxPrice'] = (float) empty($maxPrices) ? 0.0 : max($maxPrices);
-
-        return array_values($matches);
-    }
-
-    /**
-     * @return array
-     */
-    private function getMatchedShipmentUsages()
-    {
-        $shipments = $this->getShipmentUsages();
-
-        $matches = [];
-        foreach ($shipments as $shipmentName => $usages) {
-            $match = $this->matcher->matchString($shipmentName);
-
-            if (!isset($matches[$match])) {
-                $matches[$match] = [
-                    'name' => $match,
-                    'usages' => 0,
-                ];
-            }
-
-            $matches[$match]['usages'] += $usages;
-        }
-
-        return array_values($matches);
-    }
-
-    /**
-     * @return array
-     */
-    private function getShipmentList()
-    {
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        $shippingCosts = $queryBuilder->select('dispatch.name, MIN(costs.value) as minPrice, MAX(costs.value) as maxPrice')
-            ->from('s_premium_dispatch', 'dispatch')
-            ->where('dispatch.id IN (:dispatchIds)')
-            ->innerJoin('dispatch', 's_premium_shippingcosts', 'costs', 'dispatch.id = costs.dispatchID')
-            ->groupBy('dispatch.id')
-            ->setParameter(':dispatchIds', $this->getShipmentIds(), Connection::PARAM_INT_ARRAY)
-            ->execute()
-            ->fetchAll(PDO::FETCH_GROUP | PDO::FETCH_UNIQUE | PDO::FETCH_ASSOC);
-
-        return array_map(function ($shippingCost) {
-            $shippingCost['minPrice'] = (float) $shippingCost['minPrice'];
-            $shippingCost['maxPrice'] = (float) $shippingCost['maxPrice'];
-
-            return $shippingCost;
-        }, $shippingCosts);
-    }
-
-    /**
-     * @return array
-     */
-    private function getShipmentUsages()
-    {
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        return $queryBuilder->select('dispatches.name, COUNT(orders.id) as usages')
-            ->from('s_order', 'orders')
-            ->where('dispatches.id IN (:dispatchIds)')
-            ->andWhere('orders.status != -1')
-            ->leftJoin('orders', 's_premium_dispatch', 'dispatches', 'dispatches.id = orders.dispatchID')
-            ->groupBy('orders.dispatchID')
-            ->setParameter(':dispatchIds', $this->getShipmentIds(), Connection::PARAM_INT_ARRAY)
-            ->execute()
-            ->fetchAll(PDO::FETCH_KEY_PAIR);
-    }
-
-    /**
-     * @return array
-     */
-    private function getShipmentIds()
-    {
-        $shopId = $this->shopContext->getShop()->getId();
-        if (\array_key_exists($shopId, $this->shipmentIds)) {
-            return $this->shipmentIds[$shopId];
-        }
-
-        $categoryIds = $this->getPossibleCategoryIds();
-
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        $dispatchIds = $queryBuilder->select('dispatch.id')
-            ->from('s_premium_dispatch', 'dispatch')
-            ->where('dispatch.type != 3')
-            ->execute()
-            ->fetchAll(PDO::FETCH_COLUMN);
-
-        $dispatchIds = array_combine($dispatchIds, $dispatchIds);
-
-        $forbiddenCategoriesBuilder = $this->dbalConnection->createQueryBuilder();
-
-        $forbiddenCategoriesByDispatchId = $forbiddenCategoriesBuilder->select('dispatch.dispatchID, dispatch.categoryID')
-            ->from('s_premium_dispatch_categories', 'dispatch')
-            ->execute()
-            ->fetchAll(PDO::FETCH_GROUP | PDO::FETCH_COLUMN);
-
-        // Figure out all dispatches, that forbid ALL categories being available to a shop
-        foreach ($forbiddenCategoriesByDispatchId as $dispatchId => $forbiddenCategories) {
-            $availableCategoryIds = array_combine($categoryIds, $categoryIds);
-            foreach ($forbiddenCategories as $forbiddenCategory) {
-                if (\array_key_exists($forbiddenCategory, $availableCategoryIds)) {
-                    unset($availableCategoryIds[$forbiddenCategory]);
-                }
-            }
-
-            if (!$availableCategoryIds) {
-                unset($dispatchIds[$dispatchId]);
-            }
-        }
-
-        $this->shipmentIds[$shopId] = $dispatchIds;
-
-        return $this->shipmentIds[$shopId];
-    }
-
-    /**
-     * @return array
-     */
-    private function getPossibleCategoryIds()
-    {
-        $categoryId = $this->shopContext->getShop()->getCategory()->getId();
-
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        return $queryBuilder->select('category.id')
-            ->from('s_categories', 'category')
-            ->where('category.path LIKE :categoryIdPath')
-            ->orWhere('category.id = :categoryId')
-            ->setParameter(':categoryId', $categoryId)
-            ->setParameter(':categoryIdPath', '%|' . $categoryId . '|%')
-            ->execute()
-            ->fetchAll(PDO::FETCH_COLUMN);
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Provider/ShopProvider.php b/engine/Shopware/Bundle/BenchmarkBundle/Provider/ShopProvider.php
deleted file mode 100644
index 28002cbca0e..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Provider/ShopProvider.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle\Provider;
-
-use DateTime;
-use DateTimeZone;
-use Doctrine\DBAL\Connection;
-use Shopware\Bundle\BenchmarkBundle\BenchmarkProviderInterface;
-use Shopware\Bundle\StoreFrontBundle\Struct\ShopContextInterface;
-
-class ShopProvider implements BenchmarkProviderInterface
-{
-    private const NAME = 'shop';
-
-    /**
-     * @var Connection
-     */
-    private $dbalConnection;
-
-    /**
-     * @var int
-     */
-    private $shopId;
-
-    public function __construct(Connection $dbalConnection)
-    {
-        $this->dbalConnection = $dbalConnection;
-    }
-
-    public function getName()
-    {
-        return self::NAME;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getBenchmarkData(ShopContextInterface $shopContext)
-    {
-        $now = new DateTime('now', new DateTimeZone('UTC'));
-
-        $this->shopId = $shopContext->getShop()->getId();
-
-        return [
-            'id' => $this->getUniqueShopHash(),
-            'industry' => $this->getIndustry(),
-            'type' => $this->getType(),
-            'datetime' => $now->format('Y-m-d H:i:s'),
-        ];
-    }
-
-    /**
-     * @return string
-     */
-    private function getUniqueShopHash()
-    {
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        $shopHash = \Ramsey\Uuid\Uuid::fromBytes(
-            (string) $queryBuilder->select('config.id')
-            ->from('s_benchmark_config', 'config')
-            ->where('config.shop_id = :shopId')
-            ->setParameter(':shopId', $this->shopId)
-            ->execute()
-            ->fetchColumn()
-        );
-
-        return $shopHash->toString();
-    }
-
-    /**
-     * @return string
-     */
-    private function getIndustry()
-    {
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        return (string) $queryBuilder->select('industry')
-            ->from('s_benchmark_config', 'config')
-            ->where('config.shop_id = :shopId')
-            ->setParameter(':shopId', $this->shopId)
-            ->execute()
-            ->fetchColumn();
-    }
-
-    /**
-     * @return string
-     */
-    private function getType()
-    {
-        $queryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        $type = (string) $queryBuilder->select('type')
-            ->from('s_benchmark_config', 'config')
-            ->where('config.shop_id = :shopId')
-            ->setParameter(':shopId', $this->shopId)
-            ->execute()
-            ->fetchColumn();
-
-        if (!\in_array($type, ['b2b', 'b2c'])) {
-            $type = 'b2c';
-        }
-
-        return $type;
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Provider/ShopwareProvider.php b/engine/Shopware/Bundle/BenchmarkBundle/Provider/ShopwareProvider.php
deleted file mode 100644
index 7ffd1c25754..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Provider/ShopwareProvider.php
+++ /dev/null
@@ -1,236 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle\Provider;
-
-use Doctrine\DBAL\Connection;
-use Exception;
-use Shopware\Bundle\BenchmarkBundle\BenchmarkCollector;
-use Shopware\Bundle\BenchmarkBundle\BenchmarkProviderInterface;
-use Shopware\Bundle\StoreFrontBundle\Struct\ShopContextInterface;
-use Shopware\Components\License\Service\LicenseUnpackServiceInterface;
-use Shopware\Components\ShopwareReleaseStruct;
-
-class ShopwareProvider implements BenchmarkProviderInterface
-{
-    private const NAME = 'shopware';
-
-    /**
-     * @var Connection
-     */
-    private $connection;
-
-    /**
-     * @var ShopwareReleaseStruct
-     */
-    private $releaseStruct;
-
-    /**
-     * @var LicenseUnpackServiceInterface
-     */
-    private $licenseUnpackService;
-
-    public function __construct(
-        Connection $connection,
-        ShopwareReleaseStruct $releaseStruct,
-        LicenseUnpackServiceInterface $licenseUnpackService
-    ) {
-        $this->connection = $connection;
-        $this->releaseStruct = $releaseStruct;
-        $this->licenseUnpackService = $licenseUnpackService;
-    }
-
-    public function getName()
-    {
-        return self::NAME;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getBenchmarkData(ShopContextInterface $shopContext)
-    {
-        return [
-            'api' => $this->getApi(),
-            'os' => $this->getOs(),
-            'arch' => $this->getArch(),
-            'dist' => $this->getDist(),
-            'serverSoftware' => $this->getServerSoftware(),
-            'phpVersion' => $this->getPhpVersion(),
-            'phpVersionId' => $this->getPhpVersionId(),
-            'maxExecutionTime' => $this->getMaxExecutionTime(),
-            'memoryLimit' => $this->getMemoryLimit(),
-            'sApi' => $this->getSApi(),
-            'extensions' => $this->getExtensions(),
-            'mysqlVersion' => $this->getMysqlVersion(),
-            'version' => $this->getVersion(),
-            'revision' => $this->getRevision(),
-            'licence' => $this->getLicence(),
-            'shops' => $this->getShopCount(),
-        ];
-    }
-
-    /**
-     * @return string
-     */
-    private function getApi()
-    {
-        return BenchmarkCollector::getVersion();
-    }
-
-    /**
-     * @return string
-     */
-    private function getOs()
-    {
-        return PHP_OS;
-    }
-
-    /**
-     * @return string
-     */
-    private function getArch()
-    {
-        return php_uname('m') ?: '';
-    }
-
-    /**
-     * @return string
-     */
-    private function getDist()
-    {
-        return php_uname('r') ?: '';
-    }
-
-    /**
-     * @return string
-     */
-    private function getServerSoftware()
-    {
-        return isset($_SERVER['SERVER_SOFTWARE']) ? $_SERVER['SERVER_SOFTWARE'] : '';
-    }
-
-    /**
-     * @return string
-     */
-    private function getPhpVersion()
-    {
-        return PHP_VERSION;
-    }
-
-    /**
-     * @return int
-     */
-    private function getPhpVersionId()
-    {
-        return PHP_VERSION_ID;
-    }
-
-    /**
-     * @return int
-     */
-    private function getMaxExecutionTime()
-    {
-        return (int) ini_get('max_execution_time');
-    }
-
-    /**
-     * @return int
-     */
-    private function getMemoryLimit()
-    {
-        return (int) ini_get('memory_limit');
-    }
-
-    /**
-     * @return string
-     */
-    private function getSApi()
-    {
-        return PHP_SAPI;
-    }
-
-    /**
-     * @return array
-     */
-    private function getExtensions()
-    {
-        return array_values(get_loaded_extensions());
-    }
-
-    /**
-     * @return string
-     */
-    private function getMysqlVersion()
-    {
-        return (string) $this->connection->fetchColumn('SELECT @@version');
-    }
-
-    /**
-     * @return string
-     */
-    private function getVersion()
-    {
-        return $this->releaseStruct->getVersion() . '-' . $this->releaseStruct->getVersionText();
-    }
-
-    /**
-     * @return string
-     */
-    private function getRevision()
-    {
-        return $this->releaseStruct->getRevision();
-    }
-
-    /**
-     * @return string
-     */
-    private function getLicence()
-    {
-        $license = $this->connection->fetchColumn('SELECT license FROM s_core_licenses WHERE active=1 AND module = "SwagCommercial"');
-
-        if (!$license) {
-            return 'ce';
-        }
-
-        try {
-            $licenseInfo = $this->licenseUnpackService->readLicenseInfo($license);
-
-            if (isset($licenseInfo['product'])) {
-                return strtolower($licenseInfo['product']);
-            }
-        } catch (Exception $e) {
-        }
-
-        return 'ce';
-    }
-
-    /**
-     * @return int
-     */
-    private function getShopCount()
-    {
-        return (int) $this->connection->fetchColumn('SELECT COUNT(id) FROM s_core_shops');
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Provider/UpdatedOrdersProvider.php b/engine/Shopware/Bundle/BenchmarkBundle/Provider/UpdatedOrdersProvider.php
deleted file mode 100644
index 3d780e63754..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Provider/UpdatedOrdersProvider.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle\Provider;
-
-use PDO;
-
-class UpdatedOrdersProvider extends OrdersProvider
-{
-    private const NAME = 'updated_orders';
-
-    public function getName()
-    {
-        return self::NAME;
-    }
-
-    /**
-     * @param int $batch
-     *
-     * @return array
-     */
-    protected function getOrdersBasicData(array $config, $batch)
-    {
-        $ordersQueryBuilder = $this->dbalConnection->createQueryBuilder();
-
-        $lastOrderId = (int) $config['last_order_id'];
-        $lastUpdatedOrdersDate = $config['last_updated_orders_date'];
-
-        return $ordersQueryBuilder->select('orders.*')
-            ->from('s_order', 'orders')
-            ->where('orders.id <= :lastOrderId')
-            ->andWhere('orders.changed > :lastOrdersUpdate')
-            ->andWhere('orders.subshopID = :shopId')
-            ->andWhere('orders.status != -1')
-            ->orderBy('orders.changed', 'ASC')
-            ->setMaxResults($batch)
-            ->setParameter(':lastOrderId', $lastOrderId)
-            ->setParameter(':lastOrdersUpdate', $lastUpdatedOrdersDate)
-            ->setParameter(':shopId', $this->shopId)
-            ->execute()
-            ->fetchAll(PDO::FETCH_GROUP | PDO::FETCH_UNIQUE | PDO::FETCH_ASSOC);
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Service/BenchmarkStatisticsService.php b/engine/Shopware/Bundle/BenchmarkBundle/Service/BenchmarkStatisticsService.php
deleted file mode 100644
index 5f8ee3303af..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Service/BenchmarkStatisticsService.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle\Service;
-
-use Exception;
-use Shopware\Bundle\BenchmarkBundle\Exception\TransmissionNotNecessaryException;
-use Shopware\Bundle\BenchmarkBundle\Struct\BenchmarkDataResult;
-use Shopware\Models\Benchmark\Repository as BenchmarkRepository;
-
-class BenchmarkStatisticsService
-{
-    private StatisticsService $statistics;
-
-    private BenchmarkRepository $benchmarkRepository;
-
-    private BusinessIntelligenceService $biService;
-
-    /**
-     * @throws Exception
-     */
-    public function __construct(
-        BenchmarkRepository $benchmarkRepository,
-        StatisticsService $statistics,
-        BusinessIntelligenceService $biService
-    ) {
-        $this->benchmarkRepository = $benchmarkRepository;
-        $this->statistics = $statistics;
-        $this->biService = $biService;
-    }
-
-    /**
-     * @return BenchmarkDataResult
-     */
-    public function handleTransmission()
-    {
-        $statisticsResponse = $this->sendStatisticsData();
-        $biResponse = $this->fetchBenchmarkData();
-
-        return new BenchmarkDataResult($statisticsResponse, $biResponse);
-    }
-
-    private function sendStatisticsData()
-    {
-        // Configuration hasn't been done yet
-        if ($this->benchmarkRepository->getConfigsCount() === 0) {
-            return null;
-        }
-
-        $this->benchmarkRepository->synchronizeShops();
-
-        $benchmarkConfig = $this->benchmarkRepository->getNextTransmissionShopConfig();
-
-        if (!$benchmarkConfig) {
-            return null;
-        }
-
-        $this->benchmarkRepository->lockShop($benchmarkConfig->getShopId());
-
-        $statisticsResponse = null;
-
-        try {
-            $statisticsResponse = $this->statistics->transmit($benchmarkConfig, $benchmarkConfig->getBatchSize());
-            $statisticsResponse->setShopId((int) $benchmarkConfig->getShopId());
-        } catch (TransmissionNotNecessaryException $e) {
-            return null;
-        } finally {
-            $this->benchmarkRepository->unlockShop($benchmarkConfig->getShopId());
-        }
-
-        return $statisticsResponse;
-    }
-
-    private function fetchBenchmarkData()
-    {
-        $biResponse = null;
-
-        $benchmarkConfig = $this->benchmarkRepository->getNextReceivingShopConfig();
-
-        if (!$benchmarkConfig) {
-            return null;
-        }
-
-        $biResponse = $this->biService->transmit($benchmarkConfig);
-        $biResponse->setShopId((int) $benchmarkConfig->getShopId());
-
-        return $biResponse;
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Service/BusinessIntelligenceService.php b/engine/Shopware/Bundle/BenchmarkBundle/Service/BusinessIntelligenceService.php
deleted file mode 100644
index ca2809c5858..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Service/BusinessIntelligenceService.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle\Service;
-
-use Shopware\Bundle\BenchmarkBundle\BusinessIntelligenceClientInterface;
-use Shopware\Bundle\BenchmarkBundle\Struct\BusinessIntelligenceRequest;
-use Shopware\Bundle\BenchmarkBundle\Struct\BusinessIntelligenceResponse;
-use Shopware\Models\Benchmark\BenchmarkConfig;
-use Shopware\Models\Benchmark\Repository as BenchmarkRepository;
-
-class BusinessIntelligenceService
-{
-    /**
-     * @var BusinessIntelligenceClientInterface
-     */
-    private $biClient;
-
-    /**
-     * @var BenchmarkRepository
-     */
-    private $benchmarkRepository;
-
-    public function __construct(
-        BusinessIntelligenceClientInterface $biClient,
-        BenchmarkRepository $benchmarkRepository
-    ) {
-        $this->biClient = $biClient;
-        $this->benchmarkRepository = $benchmarkRepository;
-    }
-
-    /**
-     * @return BusinessIntelligenceResponse
-     */
-    public function transmit(BenchmarkConfig $config)
-    {
-        /** @var BusinessIntelligenceResponse $response */
-        $response = $this->biClient->fetchBusinessIntelligence(new BusinessIntelligenceRequest($config->getToken()));
-
-        $config->setCachedTemplate($response->getHtml());
-        $config->setLastReceived($response->getDateTime());
-
-        $this->benchmarkRepository->save($config);
-
-        return $response;
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Service/MatcherService.php b/engine/Shopware/Bundle/BenchmarkBundle/Service/MatcherService.php
deleted file mode 100644
index d8cde305365..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Service/MatcherService.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle\Service;
-
-class MatcherService
-{
-    /**
-     * @var array
-     */
-    private $matchers;
-
-    /**
-     * @var array
-     */
-    private $storage = [];
-
-    public function __construct(array $matchers)
-    {
-        $this->matchers = $matchers;
-    }
-
-    /**
-     * @param string $entityName
-     *
-     * @return string
-     */
-    public function matchString($entityName)
-    {
-        if (isset($this->storage[$entityName])) {
-            return $this->storage[$entityName];
-        }
-
-        foreach ($this->matchers as $entityKey => $expressions) {
-            foreach ($expressions as $expression) {
-                if (preg_match($expression, $entityName)) {
-                    $this->storage[$entityName] = $entityKey;
-
-                    return $entityKey;
-                }
-            }
-        }
-
-        $this->storage[$entityName] = 'others';
-
-        return 'others';
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Service/StatisticsService.php b/engine/Shopware/Bundle/BenchmarkBundle/Service/StatisticsService.php
deleted file mode 100644
index 61246a3e60c..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Service/StatisticsService.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle\Service;
-
-use DateTime;
-use DateTimeZone;
-use Doctrine\DBAL\Connection;
-use Shopware\Bundle\BenchmarkBundle\BenchmarkCollectorInterface;
-use Shopware\Bundle\BenchmarkBundle\Exception\TransmissionNotNecessaryException;
-use Shopware\Bundle\BenchmarkBundle\StatisticsClientInterface;
-use Shopware\Bundle\BenchmarkBundle\Struct\StatisticsRequest;
-use Shopware\Bundle\BenchmarkBundle\Struct\StatisticsResponse;
-use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface;
-use Shopware\Models\Benchmark\BenchmarkConfig;
-use Shopware\Models\Benchmark\Repository as BenchmarkRepository;
-
-class StatisticsService
-{
-    /**
-     * @var BenchmarkCollectorInterface
-     */
-    private $benchmarkCollector;
-
-    /**
-     * @var StatisticsClientInterface
-     */
-    private $statisticsClient;
-
-    /**
-     * @var BenchmarkRepository
-     */
-    private $benchmarkRepository;
-
-    /**
-     * @var ContextServiceInterface
-     */
-    private $contextService;
-
-    /**
-     * @var Connection
-     */
-    private $connection;
-
-    public function __construct(
-        BenchmarkCollectorInterface $benchmarkCollector,
-        StatisticsClientInterface $statisticsClient,
-        BenchmarkRepository $benchmarkRepository,
-        ContextServiceInterface $contextService,
-        Connection $connection
-    ) {
-        $this->benchmarkCollector = $benchmarkCollector;
-        $this->statisticsClient = $statisticsClient;
-        $this->benchmarkRepository = $benchmarkRepository;
-        $this->contextService = $contextService;
-        $this->connection = $connection;
-    }
-
-    /**
-     * @param int|null $batchSize
-     *
-     * @throws TransmissionNotNecessaryException
-     *
-     * @return StatisticsResponse
-     */
-    public function transmit(BenchmarkConfig $config, $batchSize = null)
-    {
-        $benchmarkData = $this->benchmarkCollector->get($this->contextService->createShopContext($config->getShopId()), $batchSize);
-
-        $ordersCount = \count($benchmarkData['orders']['list']);
-        $customersCount = \count($benchmarkData['customers']['list']);
-        $productsCount = \count($benchmarkData['products']['list']);
-        $analyticsCount = \count($benchmarkData['analytics']['list']);
-
-        // If all entity counts are below the batch size (or the batch size is null), we are likely to be in the last iteration
-        if ($batchSize === null
-            || ($ordersCount < $batchSize && $customersCount < $batchSize && $productsCount < $batchSize && $analyticsCount < $batchSize)) {
-            $config->setLastSent(new DateTime('now', new DateTimeZone('UTC')));
-            $this->benchmarkRepository->save($config);
-        }
-
-        // If literally all entities are 0, we do not need to send any data at all
-        if ($ordersCount === 0 && $customersCount === 0 && $productsCount === 0 && $analyticsCount === 0) {
-            throw new TransmissionNotNecessaryException();
-        }
-
-        $benchmarkDataJson = json_encode($benchmarkData, JSON_HEX_TAG);
-
-        $request = new StatisticsRequest($benchmarkDataJson, $config);
-
-        /** @var StatisticsResponse $statisticsResponse */
-        $statisticsResponse = $this->statisticsClient->sendStatistics($request);
-
-        $config->setToken($statisticsResponse->getToken());
-
-        $this->updateLastIds($config, $benchmarkData);
-
-        $this->benchmarkRepository->save($config);
-
-        return $statisticsResponse;
-    }
-
-    private function updateLastIds(BenchmarkConfig $config, array $benchmarkData)
-    {
-        if (!empty($benchmarkData['orders']['list']) && (!\array_key_exists('moved', $benchmarkData['updated_orders']) || !$benchmarkData['updated_orders']['moved'])) {
-            $order = end($benchmarkData['orders']['list']);
-            $config->setLastOrderId($order['orderId']);
-        }
-
-        if (!empty($benchmarkData['customers']['list'])) {
-            $customer = end($benchmarkData['customers']['list']);
-            $config->setLastCustomerId($customer['customerId']);
-        }
-
-        if (!empty($benchmarkData['products']['list'])) {
-            $product = end($benchmarkData['products']['list']);
-            $config->setLastProductId($product['productId']);
-        }
-
-        if (!empty($benchmarkData['analytics']['list'])) {
-            $lastId = $this->connection->fetchColumn('SELECT id FROM s_statistics_visitors WHERE shopID = ? ORDER BY id DESC LIMIT 1', [
-                $config->getShopId(),
-            ]);
-
-            $config->setLastAnalyticsId($lastId);
-        }
-
-        $this->handleLastUpdatedOrdersDate($config, $benchmarkData);
-    }
-
-    private function handleLastUpdatedOrdersDate(BenchmarkConfig $config, array $benchmarkData)
-    {
-        // If the column is still NULL, set it to "NOW()" for the first time
-        if ($config->getLastUpdatedOrdersDate() === null) {
-            $config->setLastUpdatedOrdersDate(new DateTime('now'));
-        }
-
-        if (!\array_key_exists('moved', $benchmarkData['updated_orders']) || !$benchmarkData['updated_orders']['moved'] || !$benchmarkData['orders']['list']) {
-            return;
-        }
-
-        $ordersCount = \count($benchmarkData['orders']['list']);
-
-        // Set the last_updated column to the most recent date of all updated orders if chances are high that another batch of orders
-        // is necessary
-        if ($ordersCount >= $config->getBatchSize()) {
-            $mostRecentChangedOrder = end($benchmarkData['orders']['list']);
-            $config->setLastUpdatedOrdersDate(DateTime::createFromFormat('Y-m-d H:i:s', $mostRecentChangedOrder['changed']));
-
-            return;
-        }
-
-        $config->setLastUpdatedOrdersDate(new DateTime('now'));
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Service/TemplateCachingHandler.php b/engine/Shopware/Bundle/BenchmarkBundle/Service/TemplateCachingHandler.php
deleted file mode 100644
index b180299a951..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Service/TemplateCachingHandler.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle\Service;
-
-use Doctrine\DBAL\Connection;
-
-class TemplateCachingHandler
-{
-    /**
-     * @var Connection
-     */
-    private $connection;
-
-    public function __construct(Connection $connection)
-    {
-        $this->connection = $connection;
-    }
-
-    /**
-     * @param int $shopId
-     *
-     * @return bool
-     */
-    public function isTemplateCached($shopId)
-    {
-        $queryBuilder = $this->connection->createQueryBuilder();
-
-        $template = $queryBuilder->select('config.cached_template')
-            ->from('s_benchmark_config', 'config')
-            ->where('config.shop_id = :shopId')
-            ->setParameter('shopId', $shopId)
-            ->execute()
-            ->fetchColumn();
-
-        return (bool) $template;
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Service/TranslationService.php b/engine/Shopware/Bundle/BenchmarkBundle/Service/TranslationService.php
deleted file mode 100644
index 7bea63b0403..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Service/TranslationService.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle\Service;
-
-use Shopware\Components\Model\ModelManager;
-use Shopware\Models\Shop\Locale;
-use Shopware_Components_Snippet_Manager as SnippetManager;
-use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter;
-
-class TranslationService
-{
-    /**
-     * @var SnippetManager
-     */
-    private $snippetManager;
-
-    /**
-     * @var ModelManager
-     */
-    private $modelManager;
-
-    public function __construct(SnippetManager $snippetManager, ModelManager $modelManager)
-    {
-        $this->snippetManager = $snippetManager;
-        $this->modelManager = $modelManager;
-    }
-
-    /**
-     * @return array
-     */
-    public function getAll()
-    {
-        $translations = [];
-
-        /** @var Locale $germanLocale */
-        $germanLocale = $this->modelManager->getRepository(Locale::class)->find(1);
-        /** @var Locale $englishLocale */
-        $englishLocale = $this->modelManager->getRepository(Locale::class)->find(2);
-
-        $this->snippetManager->setLocale($germanLocale);
-        $germanNamespace = $this->snippetManager->getNamespace('backend/benchmark/statistics');
-        $germanCategories = $this->loadCategories();
-        $germanTimeUnits = $this->loadTimeUnits();
-
-        $this->snippetManager->setLocale($englishLocale);
-        $englishNamespace = $this->snippetManager->getNamespace('backend/benchmark/statistics');
-        $englishCategories = $this->loadCategories();
-        $englishTimeUnits = $this->loadTimeUnits();
-
-        $translations['de'] = $germanNamespace->toArray() + $germanCategories + $germanTimeUnits;
-        $translations['en'] = $englishNamespace->toArray() + $englishCategories + $englishTimeUnits;
-
-        return $translations;
-    }
-
-    /**
-     * @return array
-     */
-    private function loadCategories()
-    {
-        $categories = $this->snippetManager->getNamespace('backend/benchmark/categories')->toArray();
-        $converter = new CamelCaseToSnakeCaseNameConverter();
-
-        foreach ($categories as $snippetKey => $snippet) {
-            $camelCaseKey = $converter->denormalize($snippetKey);
-            unset($categories[$snippetKey]);
-            $categories[$camelCaseKey] = $snippet;
-        }
-
-        return $categories;
-    }
-
-    /**
-     * @return array
-     */
-    private function loadTimeUnits()
-    {
-        return $this->snippetManager->getNamespace('backend/benchmark/time_units')->toArray();
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/StatisticsClient.php b/engine/Shopware/Bundle/BenchmarkBundle/StatisticsClient.php
deleted file mode 100644
index 4c218177e6d..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/StatisticsClient.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle;
-
-use Doctrine\DBAL\Connection;
-use Exception;
-use Psr\Log\LoggerInterface;
-use Ramsey\Uuid\Uuid;
-use Shopware\Bundle\BenchmarkBundle\Exception\StatisticsHydratingException;
-use Shopware\Bundle\BenchmarkBundle\Exception\StatisticsSendingException;
-use Shopware\Bundle\BenchmarkBundle\Hydrator\HydratorInterface;
-use Shopware\Bundle\BenchmarkBundle\Struct\StatisticsRequest;
-use Shopware\Components\HttpClient\HttpClientInterface;
-use Shopware\Components\HttpClient\RequestException;
-use Shopware\Components\HttpClient\Response;
-use Shopware\Models\Benchmark\BenchmarkConfig;
-
-/**
- * Responsible for converting business layer requests into HTTP requests and vice/versa.
- */
-class StatisticsClient implements StatisticsClientInterface
-{
-    /**
-     * @var string
-     */
-    private $statisticsApiEndpoint;
-
-    /**
-     * @var HttpClientInterface
-     */
-    private $client;
-
-    /**
-     * @var HydratorInterface
-     */
-    private $statisticsResponseHydrator;
-
-    /**
-     * @var LoggerInterface
-     */
-    private $logger;
-
-    /**
-     * @var Connection
-     */
-    private $connection;
-
-    /**
-     * @param string $statisticsApiEndpoint
-     */
-    public function __construct(
-        $statisticsApiEndpoint,
-        HttpClientInterface $client,
-        HydratorInterface $statisticsResponseHydrator,
-        LoggerInterface $logger,
-        Connection $connection
-    ) {
-        $this->statisticsApiEndpoint = $statisticsApiEndpoint;
-        $this->client = $client;
-        $this->statisticsResponseHydrator = $statisticsResponseHydrator;
-        $this->logger = $logger;
-        $this->connection = $connection;
-    }
-
-    /**
-     * @throws StatisticsSendingException
-     *
-     * @return Struct\StatisticsResponse
-     */
-    public function sendStatistics(StatisticsRequest $statisticsRequest)
-    {
-        $headers = [
-            'User-Agent' => 'Shopware',
-        ];
-
-        try {
-            $response = $this->client->post($this->statisticsApiEndpoint, $headers, (string) $statisticsRequest);
-        } catch (Exception $ex) {
-            $body = '';
-
-            if ($ex instanceof RequestException) {
-                $body = $ex->getBody();
-
-                if ($ex->getCode() === 420) {
-                    $this->resetBenchmarkConfig($statisticsRequest->getConfig());
-                }
-            }
-
-            $this->logger->warning(sprintf('Could not send statistics data to %s', $this->statisticsApiEndpoint), [$ex, $body]);
-
-            throw new StatisticsSendingException('Could not send statistics data', 0, $ex);
-        }
-
-        return $this->hydrateStatisticsResponse($response);
-    }
-
-    /**
-     * @throws StatisticsHydratingException
-     *
-     * @return Struct\StatisticsResponse
-     */
-    private function hydrateStatisticsResponse(Response $response)
-    {
-        $data = json_decode(
-            $response->getBody(),
-            true
-        );
-
-        if (!\is_array($data)) {
-            throw new StatisticsHydratingException(sprintf('Could not interpret statistics response from %s', $this->statisticsApiEndpoint));
-        }
-
-        return $this->statisticsResponseHydrator->hydrate($data);
-    }
-
-    private function resetBenchmarkConfig(BenchmarkConfig $config)
-    {
-        $this->connection->update('s_benchmark_config', [
-            'id' => Uuid::uuid4(),
-            'last_sent' => '1970-01-01 00:00:00',
-            'last_received' => '1970-01-01 00:00:00',
-            'last_updated_orders_date' => null,
-            'last_order_id' => 0,
-            'last_customer_id' => 0,
-            'last_product_id' => 0,
-            'last_analytics_id' => 0,
-            'response_token' => null,
-            'cached_template' => null,
-            'locked' => null,
-        ], [
-            'shop_id' => $config->getShopId(),
-        ]);
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/StatisticsClientInterface.php b/engine/Shopware/Bundle/BenchmarkBundle/StatisticsClientInterface.php
deleted file mode 100644
index 9552eca197a..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/StatisticsClientInterface.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle;
-
-use Shopware\Bundle\BenchmarkBundle\Struct\StatisticsRequest;
-use Shopware\Bundle\BenchmarkBundle\Struct\StatisticsResponse;
-
-interface StatisticsClientInterface
-{
-    /**
-     * @return StatisticsResponse
-     */
-    public function sendStatistics(StatisticsRequest $statisticsRequest);
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Struct/BenchmarkDataResult.php b/engine/Shopware/Bundle/BenchmarkBundle/Struct/BenchmarkDataResult.php
deleted file mode 100644
index 431d5b26551..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Struct/BenchmarkDataResult.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle\Struct;
-
-class BenchmarkDataResult
-{
-    /**
-     * @var StatisticsResponse|null
-     */
-    private $statisticsResponse;
-
-    /**
-     * @var BusinessIntelligenceResponse|null
-     */
-    private $biResponse;
-
-    /**
-     * @param \Shopware\Bundle\BenchmarkBundle\Struct\StatisticsResponse|null           $statisticsResponse
-     * @param \Shopware\Bundle\BenchmarkBundle\Struct\BusinessIntelligenceResponse|null $biResponse
-     */
-    public function __construct(
-        StatisticsResponse $statisticsResponse = null,
-        BusinessIntelligenceResponse $biResponse = null
-    ) {
-        $this->statisticsResponse = $statisticsResponse;
-        $this->biResponse = $biResponse;
-    }
-
-    /**
-     * @return StatisticsResponse|null
-     */
-    public function getStatisticsResponse()
-    {
-        return $this->statisticsResponse;
-    }
-
-    /**
-     * @return BusinessIntelligenceResponse|null
-     */
-    public function getBiResponse()
-    {
-        return $this->biResponse;
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Struct/BusinessIntelligenceRequest.php b/engine/Shopware/Bundle/BenchmarkBundle/Struct/BusinessIntelligenceRequest.php
deleted file mode 100644
index e153220b692..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Struct/BusinessIntelligenceRequest.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle\Struct;
-
-class BusinessIntelligenceRequest
-{
-    /**
-     * @var string
-     */
-    private $token;
-
-    /**
-     * @param string $token
-     */
-    public function __construct($token)
-    {
-        $this->token = $token;
-    }
-
-    public function __toString()
-    {
-        return sprintf('responseToken=%s', $this->token);
-    }
-
-    /**
-     * @return string
-     */
-    public function getToken()
-    {
-        return $this->token;
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Struct/BusinessIntelligenceResponse.php b/engine/Shopware/Bundle/BenchmarkBundle/Struct/BusinessIntelligenceResponse.php
deleted file mode 100644
index 3fb6344a0fa..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Struct/BusinessIntelligenceResponse.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle\Struct;
-
-use DateTimeInterface;
-
-class BusinessIntelligenceResponse
-{
-    /**
-     * @var DateTimeInterface
-     */
-    private $dateTime;
-
-    /**
-     * @var string
-     */
-    private $html;
-
-    /**
-     * @var int
-     */
-    private $shopId;
-
-    /**
-     * @param string $html
-     * @param int    $shopId
-     */
-    public function __construct(DateTimeInterface $dateTime, $html, $shopId = null)
-    {
-        $this->dateTime = $dateTime;
-        $this->html = $html;
-        $this->shopId = $shopId;
-    }
-
-    /**
-     * @return DateTimeInterface
-     */
-    public function getDateTime()
-    {
-        return $this->dateTime;
-    }
-
-    /**
-     * @return string
-     */
-    public function getHtml()
-    {
-        return $this->html;
-    }
-
-    /**
-     * @param int $shopId
-     */
-    public function setShopId($shopId)
-    {
-        $this->shopId = $shopId;
-    }
-
-    /**
-     * @return int|null
-     */
-    public function getShopId()
-    {
-        return $this->shopId;
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Struct/StatisticsRequest.php b/engine/Shopware/Bundle/BenchmarkBundle/Struct/StatisticsRequest.php
deleted file mode 100644
index 1c260c8463a..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Struct/StatisticsRequest.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle\Struct;
-
-use Shopware\Models\Benchmark\BenchmarkConfig;
-
-class StatisticsRequest
-{
-    /**
-     * @var string
-     */
-    private $data;
-
-    /**
-     * @var BenchmarkConfig
-     */
-    private $config;
-
-    /**
-     * @param string $data
-     */
-    public function __construct($data, BenchmarkConfig $config)
-    {
-        $this->data = $data;
-        $this->config = $config;
-    }
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->data;
-    }
-
-    /**
-     * @return BenchmarkConfig
-     */
-    public function getConfig()
-    {
-        return $this->config;
-    }
-}
diff --git a/engine/Shopware/Bundle/BenchmarkBundle/Struct/StatisticsResponse.php b/engine/Shopware/Bundle/BenchmarkBundle/Struct/StatisticsResponse.php
deleted file mode 100644
index e49028f0d5c..00000000000
--- a/engine/Shopware/Bundle/BenchmarkBundle/Struct/StatisticsResponse.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Bundle\BenchmarkBundle\Struct;
-
-use DateTimeInterface;
-
-class StatisticsResponse
-{
-    /**
-     * @var DateTimeInterface
-     */
-    private $dateUpdated;
-
-    /**
-     * @var string
-     */
-    private $token;
-
-    /**
-     * @var bool
-     */
-    private $isFinished;
-
-    /**
-     * @var int
-     */
-    private $shopId;
-
-    /**
-     * @param string $token
-     * @param bool   $isFinished
-     * @param int    $shopId
-     */
-    public function __construct(DateTimeInterface $dateUpdated, $token, $isFinished, $shopId = null)
-    {
-        $this->dateUpdated = $dateUpdated;
-        $this->token = $token;
-        $this->isFinished = $isFinished;
-        $this->shopId = $shopId;
-    }
-
-    /**
-     * @return DateTimeInterface
-     */
-    public function getDateUpdated()
-    {
-        return $this->dateUpdated;
-    }
-
-    /**
-     * @return string
-     */
-    public function getToken()
-    {
-        return $this->token;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isFinished()
-    {
-        return $this->isFinished;
-    }
-
-    /**
-     * @param int $shopId
-     */
-    public function setShopId($shopId)
-    {
-        $this->shopId = $shopId;
-    }
-
-    /**
-     * @return int|null
-     */
-    public function getShopId()
-    {
-        return $this->shopId;
-    }
-}
diff --git a/engine/Shopware/Bundle/CartBundle/CartKey.php b/engine/Shopware/Bundle/CartBundle/CartKey.php
index cc5cb0f667d..a74cf5872eb 100644
--- a/engine/Shopware/Bundle/CartBundle/CartKey.php
+++ b/engine/Shopware/Bundle/CartBundle/CartKey.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CartBundle;
diff --git a/engine/Shopware/Bundle/CartBundle/CartPositionsMode.php b/engine/Shopware/Bundle/CartBundle/CartPositionsMode.php
index 04ccd496cdd..602535f2429 100644
--- a/engine/Shopware/Bundle/CartBundle/CartPositionsMode.php
+++ b/engine/Shopware/Bundle/CartBundle/CartPositionsMode.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CartBundle;
diff --git a/engine/Shopware/Bundle/CartBundle/CheckoutKey.php b/engine/Shopware/Bundle/CartBundle/CheckoutKey.php
index 8cc89a59ac1..a7dcd561b5a 100644
--- a/engine/Shopware/Bundle/CartBundle/CheckoutKey.php
+++ b/engine/Shopware/Bundle/CartBundle/CheckoutKey.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CartBundle;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Commands/TypeSynchronizerCommand.php b/engine/Shopware/Bundle/ContentTypeBundle/Commands/TypeSynchronizerCommand.php
index a5ee4d72134..b6d42981844 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Commands/TypeSynchronizerCommand.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Commands/TypeSynchronizerCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Commands;
@@ -56,7 +56,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $types = $sync->sync(array_keys($activePlugins), $input->getOption('destructive'));
         $io = new SymfonyStyle($input, $output);
 
-        $io->success(sprintf('Synchronized %d type(s)', \count($types)));
+        $io->success(\sprintf('Synchronized %d type(s)', \count($types)));
 
         return 0;
     }
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/ContentTypeBundle.php b/engine/Shopware/Bundle/ContentTypeBundle/ContentTypeBundle.php
index 0f1d1a99a20..f71732a1ecf 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/ContentTypeBundle.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/ContentTypeBundle.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Controller/Api/ContentType.php b/engine/Shopware/Bundle/ContentTypeBundle/Controller/Api/ContentType.php
index 46e0866348d..b20f768e5ba 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Controller/Api/ContentType.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Controller/Api/ContentType.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Controller\Api;
@@ -82,7 +82,7 @@ public function getAction(int $id, bool $resolve = false, bool $loadTranslations
         $result = current($this->repository->findAll($criteria)->items);
 
         if (!$result) {
-            throw new NotFoundException(sprintf('Entity by id %d not found', $id));
+            throw new NotFoundException(\sprintf('Entity by id %d not found', $id));
         }
 
         $this->View()->assign('data', $result);
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Controller/Backend/ContentType.php b/engine/Shopware/Bundle/ContentTypeBundle/Controller/Backend/ContentType.php
index c622886dcdf..fd22d4710cd 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Controller/Backend/ContentType.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Controller/Backend/ContentType.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Controller\Backend;
@@ -56,7 +56,7 @@ public function __construct(ExtjsBuilderInterface $extjsBuilder, Type $type, Rep
         $this->repository = $repository;
     }
 
-    public function setContainer(Container $loader = null)
+    public function setContainer(?Container $loader = null)
     {
         parent::setContainer($loader);
 
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Controller/Backend/ContentTypeManager.php b/engine/Shopware/Bundle/ContentTypeBundle/Controller/Backend/ContentTypeManager.php
index 60484d1612c..0de26c9960e 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Controller/Backend/ContentTypeManager.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Controller/Backend/ContentTypeManager.php
@@ -1,29 +1,30 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Controller\Backend;
 
+use Shopware\Bundle\ContentTypeBundle\Field\FieldInterface;
 use Shopware\Bundle\ContentTypeBundle\Field\ResolveableFieldInterface;
 use Shopware\Bundle\ContentTypeBundle\Field\TypeField;
 use Shopware\Bundle\ContentTypeBundle\Field\TypeGrid;
@@ -35,54 +36,34 @@
 use Shopware\Components\CacheManager;
 use Shopware\Components\Slug\SlugInterface;
 use Shopware\Models\Shop\Shop;
-use Shopware_Components_SeoIndex;
 use Shopware_Components_Snippet_Manager as Snippets;
 use Shopware_Controllers_Backend_ExtJs;
-use sRewriteTable;
 use Symfony\Component\HttpFoundation\Request;
 
 class ContentTypeManager extends Shopware_Controllers_Backend_ExtJs
 {
-    /**
-     * @var TypeProvider
-     */
-    private $typeProvider;
+    private TypeProvider $typeProvider;
 
     /**
-     * @var array
+     * @var array<string, class-string<FieldInterface>>
      */
-    private $fieldAlias;
+    private array $fieldAlias;
 
-    /**
-     * @var Snippets
-     */
-    private $snippetManager;
+    private Snippets $snippetManager;
 
-    /**
-     * @var SlugInterface
-     */
-    private $slug;
+    private SlugInterface $slug;
 
-    /**
-     * @var TypeBuilder
-     */
-    private $typeBuilder;
+    private TypeBuilder $typeBuilder;
 
-    /**
-     * @var CacheManager
-     */
-    private $cacheManager;
+    private CacheManager $cacheManager;
 
-    /**
-     * @var SynchronizerServiceInterface
-     */
-    private $synchronizerService;
+    private SynchronizerServiceInterface $synchronizerService;
+
+    private ContentTypeCleanupServiceInterface $cleanupService;
 
     /**
-     * @var ContentTypeCleanupServiceInterface
+     * @param array<string, class-string<FieldInterface>> $fieldAlias
      */
-    private $cleanupService;
-
     public function __construct(
         array $fieldAlias,
         TypeProvider $typeProvider,
@@ -116,10 +97,10 @@ public function listAction(): void
 
     public function fieldsAction(): void
     {
+        $query = strtolower((string) $this->Request()->getParam('query'));
         $data = [];
         $namespace = $this->snippetManager->getNamespace('backend/content_type_manager/fields');
 
-        /** @var Type $type */
         foreach ($this->typeProvider->getTypes() as $type) {
             $this->fieldAlias[$type->getInternalName() . '-field'] = TypeField::class;
             $this->fieldAlias[$type->getInternalName() . '-grid'] = TypeGrid::class;
@@ -128,24 +109,21 @@ public function fieldsAction(): void
         foreach ($this->fieldAlias as $id => $name) {
             $classImplements = class_implements($name);
             $hasResolver = \is_array($classImplements) && \array_key_exists(ResolveableFieldInterface::class, $classImplements);
+            $label = $namespace->get($id, $id, true);
 
             if ($name === TypeField::class || $name === TypeGrid::class) {
                 $snippetName = 'type-' . explode('-', $id)[1];
+                $label = \sprintf($namespace->get($snippetName, $snippetName, true), ucfirst(explode('-', $id)[0]));
+            }
 
-                $data[] = [
-                    'id' => $id,
-                    'name' => $name,
-                    'label' => sprintf($namespace->get($snippetName, $snippetName, true), ucfirst(explode('-', $id)[0])),
-                    'hasResolver' => $hasResolver,
-                ];
-
+            if (($query !== '') && !str_contains(strtolower($name), $query) && !str_contains(strtolower($label), $query)) {
                 continue;
             }
 
             $data[] = [
                 'id' => $id,
                 'name' => $name,
-                'label' => $namespace->get($id, $id, true),
+                'label' => $label,
                 'hasResolver' => $hasResolver,
             ];
         }
@@ -161,13 +139,16 @@ public function createAction(Request $request): void
             'internalName' => $type->getInternalName(),
             'name' => $type->getName(),
             'source' => $type->getSource(),
-            'config' => json_encode($type),
+            'config' => json_encode($type, JSON_THROW_ON_ERROR),
         ]);
 
         $this->typeProvider->addType($type->getInternalName(), $type);
         $this->clearCacheAndSync();
 
-        $this->View()->assign(['success' => true, 'data' => $this->getDetail($type->getInternalName())]);
+        $this->View()->assign([
+            'success' => true,
+            'data' => $this->getDetail($type->getInternalName()),
+        ]);
     }
 
     public function updateAction(Request $request): void
@@ -177,7 +158,7 @@ public function updateAction(Request $request): void
         $this->getModelManager()->getConnection()->update('s_content_types', [
             'name' => $type->getName(),
             'source' => $type->getSource(),
-            'config' => json_encode($type),
+            'config' => json_encode($type, JSON_THROW_ON_ERROR),
         ], [
             'internalName' => $type->getInternalName(),
         ]);
@@ -186,7 +167,10 @@ public function updateAction(Request $request): void
         $this->clearCacheAndSync();
         $this->createUrls($type);
 
-        $this->View()->assign(['success' => true, 'data' => $this->getDetail($type->getInternalName())]);
+        $this->View()->assign([
+            'success' => true,
+            'data' => $this->getDetail($type->getInternalName()),
+        ]);
     }
 
     public function deleteAction(string $id): void
@@ -221,12 +205,14 @@ protected function initAcl(): void
         $this->addAclPermission('delete', 'delete', 'Insufficient permissions');
     }
 
+    /**
+     * @return array<string, mixed>
+     */
     private function getDetail(string $name): array
     {
-        /** @var Type $typeObj */
         $typeObj = $this->typeProvider->getType($name);
 
-        $type = json_decode(json_encode($typeObj), true);
+        $type = json_decode(json_encode($typeObj, JSON_THROW_ON_ERROR), true);
         $type['id'] = $type['internalName'];
         $type['controllerName'] = $typeObj->getControllerName();
         $type['urls'] = $this->getUrls($typeObj);
@@ -234,6 +220,9 @@ private function getDetail(string $name): array
         return $type;
     }
 
+    /**
+     * @param array<string, mixed> $data
+     */
     private function convertExtJsToStruct(array $data): Type
     {
         unset($data['id'], $data['source'], $data['urls'], $data['controllerName']);
@@ -263,13 +252,10 @@ private function clearCacheAndSync(): void
     private function createUrls(Type $type): void
     {
         $shops = $this->getModelManager()->getRepository(Shop::class)->getActiveShopsFixed();
-        /** @var Shopware_Components_SeoIndex $seoIndexer */
         $seoIndexer = $this->get('seoindex');
 
-        /** @var sRewriteTable $rewriteTable */
         $rewriteTable = $this->get('modules')->RewriteTable();
 
-        /** @var Shop $shop */
         foreach ($shops as $shop) {
             $seoIndexer->registerShop($shop->getId());
 
@@ -278,19 +264,21 @@ private function createUrls(Type $type): void
         }
     }
 
+    /**
+     * @return list<array{name: string, url: string}>
+     */
     private function getUrls(Type $type): array
     {
         $shops = $this->getModelManager()->getRepository(Shop::class)->getActiveShopsFixed();
 
         $urls = [];
 
-        /** @var Shop $shop */
         foreach ($shops as $shop) {
             $shop->registerResources();
 
             $urls[] = [
                 'name' => $shop->getName(),
-                'url' => $this->Front()->Router()->assemble([
+                'url' => $this->Front()->ensureRouter()->assemble([
                     'controller' => $type->getControllerName(),
                     'module' => 'frontend',
                     'action' => 'index',
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Controller/Frontend/ContentType.php b/engine/Shopware/Bundle/ContentTypeBundle/Controller/Frontend/ContentType.php
index 509e2a2ef98..7eed220a21e 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Controller/Frontend/ContentType.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Controller/Frontend/ContentType.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Controller\Frontend;
@@ -59,7 +59,7 @@ public function indexAction(int $p = 1): void
         $criteria->limit = self::LIMIT;
         $criteria->sort = [['property' => 'id', 'direction' => 'DESC']];
 
-        $this->get('events')->notify(sprintf('Content_Type_Frontend_Criteria_Creation_%s', $this->type->getInternalName()), [
+        $this->get('events')->notify(\sprintf('Content_Type_Frontend_Criteria_Creation_%s', $this->type->getInternalName()), [
             'subject' => $this,
             'criteria' => $criteria,
         ]);
@@ -82,7 +82,7 @@ public function detailAction(int $id = 1): void
         $result = $this->repository->findAll($criteria);
 
         if (\count($result->items) === 0) {
-            throw new Enlight_Controller_Exception(sprintf('Cannot find element with id %d of type \'%s\'', $id, $this->type->getInternalName()));
+            throw new Enlight_Controller_Exception(\sprintf('Cannot find element with id %d of type \'%s\'', $id, $this->type->getInternalName()));
         }
 
         $item = current($result->items);
@@ -115,7 +115,7 @@ public function postDispatch()
         }
     }
 
-    public function getBreadcrumb(array $item = null): array
+    public function getBreadcrumb(?array $item = null): array
     {
         $breadCrumb = [
             [
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/DependencyInjection/RegisterDynamicController.php b/engine/Shopware/Bundle/ContentTypeBundle/DependencyInjection/RegisterDynamicController.php
index b10a151de17..d54c144976a 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/DependencyInjection/RegisterDynamicController.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/DependencyInjection/RegisterDynamicController.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\DependencyInjection;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/DependencyInjection/RegisterFieldsCompilerPass.php b/engine/Shopware/Bundle/ContentTypeBundle/DependencyInjection/RegisterFieldsCompilerPass.php
index 5e999df718c..fc867b8dd19 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/DependencyInjection/RegisterFieldsCompilerPass.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/DependencyInjection/RegisterFieldsCompilerPass.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\DependencyInjection;
@@ -38,7 +38,7 @@ public function process(ContainerBuilder $container): void
             $def = $container->getDefinition($id);
 
             if (!isset($options[0]['fieldName'])) {
-                throw new RuntimeException(sprintf('Service with id "%s" need the tag attribute fieldName to identify the short name', $id));
+                throw new RuntimeException(\sprintf('Service with id "%s" need the tag attribute fieldName to identify the short name', $id));
             }
 
             // To support FQCN ids without class attribute
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/DependencyInjection/RegisterTypeRepositories.php b/engine/Shopware/Bundle/ContentTypeBundle/DependencyInjection/RegisterTypeRepositories.php
index 5df83175a8f..6d76cf4a6e8 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/DependencyInjection/RegisterTypeRepositories.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/DependencyInjection/RegisterTypeRepositories.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\DependencyInjection;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/DependencyInjection/TypeReader.php b/engine/Shopware/Bundle/ContentTypeBundle/DependencyInjection/TypeReader.php
index 4b481a7e8b8..0c7875aa407 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/DependencyInjection/TypeReader.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/DependencyInjection/TypeReader.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\DependencyInjection;
@@ -85,7 +85,7 @@ private static function resolveAlias(array $types, array $alias): array
             foreach ($type['fieldSets'] as &$fieldSet) {
                 foreach ($fieldSet['fields'] as &$field) {
                     if (!isset($alias[$field['type']])) {
-                        throw new RuntimeException(sprintf('Type with name "%s" does not exist', $field['type']));
+                        throw new RuntimeException(\sprintf('Type with name "%s" does not exist', $field['type']));
                     }
                 }
             }
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/DependencyInjection/fields.xml b/engine/Shopware/Bundle/ContentTypeBundle/DependencyInjection/fields.xml
index ec222657a34..ad1d2539ec1 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/DependencyInjection/fields.xml
+++ b/engine/Shopware/Bundle/ContentTypeBundle/DependencyInjection/fields.xml
@@ -13,6 +13,10 @@
             <tag name="shopware.bundle.content_type.field" fieldName="text"/>
         </service>
 
+        <service id="Shopware\Bundle\ContentTypeBundle\Field\NoUrlField">
+            <tag name="shopware.bundle.content_type.field" fieldName="nourl"/>
+        </service>
+
         <service id="Shopware\Bundle\ContentTypeBundle\Field\CodeMirrorField" class="Shopware\Bundle\ContentTypeBundle\Field\AceEditor">
             <tag name="shopware.bundle.content_type.field" fieldName="aceeditor"/>
         </service>
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Field/AceEditor.php b/engine/Shopware/Bundle/ContentTypeBundle/Field/AceEditor.php
index 799edee9d40..a2a7013a38f 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Field/AceEditor.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Field/AceEditor.php
@@ -1,37 +1,37 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Field;
 
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use Shopware\Bundle\ContentTypeBundle\Structs\Field;
 
 class AceEditor implements FieldInterface, TemplateProvidingFieldInterface
 {
     public static function getDbalType(): string
     {
-        return Type::TEXT;
+        return Types::TEXT;
     }
 
     public static function getExtjsType(): string
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Field/CheckboxField.php b/engine/Shopware/Bundle/ContentTypeBundle/Field/CheckboxField.php
index b4756d43311..b456ffe8d0f 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Field/CheckboxField.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Field/CheckboxField.php
@@ -1,37 +1,37 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Field;
 
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use Shopware\Bundle\ContentTypeBundle\Structs\Field;
 
 class CheckboxField implements FieldInterface, TemplateProvidingFieldInterface
 {
     public static function getDbalType(): string
     {
-        return Type::BOOLEAN;
+        return Types::BOOLEAN;
     }
 
     public static function getExtjsField(): string
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Field/ComboboxField.php b/engine/Shopware/Bundle/ContentTypeBundle/Field/ComboboxField.php
index 5ef29c2c513..6b885eef719 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Field/ComboboxField.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Field/ComboboxField.php
@@ -1,37 +1,37 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Field;
 
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use Shopware\Bundle\ContentTypeBundle\Structs\Field;
 
 class ComboboxField implements FieldInterface, TemplateProvidingFieldInterface
 {
     public static function getDbalType(): string
     {
-        return Type::STRING;
+        return Types::STRING;
     }
 
     public static function getExtjsField(): string
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Field/DateField.php b/engine/Shopware/Bundle/ContentTypeBundle/Field/DateField.php
index c54a34335a8..6e694600fae 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Field/DateField.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Field/DateField.php
@@ -1,37 +1,37 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Field;
 
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use Shopware\Bundle\ContentTypeBundle\Structs\Field;
 
 class DateField implements FieldInterface, TemplateProvidingFieldInterface
 {
     public static function getDbalType(): string
     {
-        return Type::DATE;
+        return Types::DATE_MUTABLE;
     }
 
     public static function getExtjsField(): string
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Field/DummyField.php b/engine/Shopware/Bundle/ContentTypeBundle/Field/DummyField.php
index 8c588fe0546..b30c65d8429 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Field/DummyField.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Field/DummyField.php
@@ -1,37 +1,37 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Field;
 
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use Shopware\Bundle\ContentTypeBundle\Structs\Field;
 
 class DummyField implements FieldInterface
 {
     public static function getDbalType(): string
     {
-        return Type::TEXT;
+        return Types::TEXT;
     }
 
     public static function getExtjsType(): string
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Field/FieldInterface.php b/engine/Shopware/Bundle/ContentTypeBundle/Field/FieldInterface.php
index 12a30c16bfc..d6a0dc241a2 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Field/FieldInterface.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Field/FieldInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Field;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Field/IntegerField.php b/engine/Shopware/Bundle/ContentTypeBundle/Field/IntegerField.php
index 5cdcd071908..27f4e93c493 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Field/IntegerField.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Field/IntegerField.php
@@ -1,37 +1,37 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Field;
 
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use Shopware\Bundle\ContentTypeBundle\Structs\Field;
 
 class IntegerField implements FieldInterface, TemplateProvidingFieldInterface
 {
     public static function getDbalType(): string
     {
-        return Type::INTEGER;
+        return Types::INTEGER;
     }
 
     public static function getExtjsType(): string
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Field/MediaField.php b/engine/Shopware/Bundle/ContentTypeBundle/Field/MediaField.php
index 08e93f0d041..cda4e090d56 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Field/MediaField.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Field/MediaField.php
@@ -1,30 +1,30 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Field;
 
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use Shopware\Bundle\ContentTypeBundle\FieldResolver\MediaResolver;
 use Shopware\Bundle\ContentTypeBundle\Structs\Field;
 
@@ -32,7 +32,7 @@ class MediaField implements FieldInterface, ResolveableFieldInterface, TemplateP
 {
     public static function getDbalType(): string
     {
-        return Type::INTEGER;
+        return Types::INTEGER;
     }
 
     public static function getExtjsField(): string
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Field/MediaGrid.php b/engine/Shopware/Bundle/ContentTypeBundle/Field/MediaGrid.php
index 9a1f11d732c..f0807b76b9e 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Field/MediaGrid.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Field/MediaGrid.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Field;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Field/NoUrlField.php b/engine/Shopware/Bundle/ContentTypeBundle/Field/NoUrlField.php
new file mode 100644
index 00000000000..a8a29413692
--- /dev/null
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Field/NoUrlField.php
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Bundle\ContentTypeBundle\Field;
+
+use Doctrine\DBAL\Types\Types;
+use Shopware\Bundle\ContentTypeBundle\Structs\Field;
+
+class NoUrlField implements FieldInterface, TemplateProvidingFieldInterface
+{
+    public static function getDbalType(): string
+    {
+        return Types::STRING;
+    }
+
+    public static function getExtjsField(): string
+    {
+        return 'nourl';
+    }
+
+    public static function getExtjsType(): string
+    {
+        return 'string';
+    }
+
+    /**
+     * @return array<mixed>
+     */
+    public static function getExtjsOptions(Field $field): array
+    {
+        return [];
+    }
+
+    public static function isMultiple(): bool
+    {
+        return false;
+    }
+
+    public static function getTemplate(): string
+    {
+        return 'frontend/content_type/field/text.tpl';
+    }
+}
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Field/ResolveableFieldInterface.php b/engine/Shopware/Bundle/ContentTypeBundle/Field/ResolveableFieldInterface.php
index eb3810f292b..a1dafe9a2e5 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Field/ResolveableFieldInterface.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Field/ResolveableFieldInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Field;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Field/Shopware/AbstractGridField.php b/engine/Shopware/Bundle/ContentTypeBundle/Field/Shopware/AbstractGridField.php
index df08cdf2b40..279fd1079d6 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Field/Shopware/AbstractGridField.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Field/Shopware/AbstractGridField.php
@@ -1,30 +1,30 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Field\Shopware;
 
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use Shopware\Bundle\ContentTypeBundle\Field\FieldInterface;
 use Shopware\Bundle\ContentTypeBundle\Field\ResolveableFieldInterface;
 use Shopware\Bundle\ContentTypeBundle\Structs\Field;
@@ -48,7 +48,7 @@ abstract class AbstractGridField implements FieldInterface, ResolveableFieldInte
 
     public static function getDbalType(): string
     {
-        return Type::STRING;
+        return Types::STRING;
     }
 
     public static function getExtjsField(): string
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Field/Shopware/AbstractSingleSelectionField.php b/engine/Shopware/Bundle/ContentTypeBundle/Field/Shopware/AbstractSingleSelectionField.php
index 208c0060c92..5c2860733e2 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Field/Shopware/AbstractSingleSelectionField.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Field/Shopware/AbstractSingleSelectionField.php
@@ -1,30 +1,30 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Field\Shopware;
 
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use Shopware\Bundle\ContentTypeBundle\Field\FieldInterface;
 use Shopware\Bundle\ContentTypeBundle\Field\ResolveableFieldInterface;
 use Shopware\Bundle\ContentTypeBundle\Structs\Field;
@@ -48,7 +48,7 @@ abstract class AbstractSingleSelectionField implements FieldInterface, Resolveab
 
     public static function getDbalType(): string
     {
-        return Type::STRING;
+        return Types::STRING;
     }
 
     public static function getExtjsField(): string
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Field/Shopware/ProductField.php b/engine/Shopware/Bundle/ContentTypeBundle/Field/Shopware/ProductField.php
index fb04531be37..0d65bb4576a 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Field/Shopware/ProductField.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Field/Shopware/ProductField.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Field\Shopware;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Field/Shopware/ProductGrid.php b/engine/Shopware/Bundle/ContentTypeBundle/Field/Shopware/ProductGrid.php
index c13ddb6cfac..1ff25188257 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Field/Shopware/ProductGrid.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Field/Shopware/ProductGrid.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Field\Shopware;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Field/Shopware/ShopField.php b/engine/Shopware/Bundle/ContentTypeBundle/Field/Shopware/ShopField.php
index b0b435fcbeb..d7288d803ca 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Field/Shopware/ShopField.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Field/Shopware/ShopField.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Field\Shopware;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Field/Shopware/ShopGrid.php b/engine/Shopware/Bundle/ContentTypeBundle/Field/Shopware/ShopGrid.php
index 3ba3d1dfdef..bfe33a48235 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Field/Shopware/ShopGrid.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Field/Shopware/ShopGrid.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Field\Shopware;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Field/TemplateProvidingFieldInterface.php b/engine/Shopware/Bundle/ContentTypeBundle/Field/TemplateProvidingFieldInterface.php
index 4e496ff2504..5477edc029b 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Field/TemplateProvidingFieldInterface.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Field/TemplateProvidingFieldInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Field;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Field/TextAreaField.php b/engine/Shopware/Bundle/ContentTypeBundle/Field/TextAreaField.php
index a082ef79abf..fbdbfccbda2 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Field/TextAreaField.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Field/TextAreaField.php
@@ -1,37 +1,37 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Field;
 
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use Shopware\Bundle\ContentTypeBundle\Structs\Field;
 
 class TextAreaField implements FieldInterface, TemplateProvidingFieldInterface
 {
     public static function getDbalType(): string
     {
-        return Type::TEXT;
+        return Types::TEXT;
     }
 
     public static function getExtjsType(): string
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Field/TextField.php b/engine/Shopware/Bundle/ContentTypeBundle/Field/TextField.php
index 0a841fde23b..527a91433a5 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Field/TextField.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Field/TextField.php
@@ -1,37 +1,37 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Field;
 
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use Shopware\Bundle\ContentTypeBundle\Structs\Field;
 
 class TextField implements FieldInterface, TemplateProvidingFieldInterface
 {
     public static function getDbalType(): string
     {
-        return Type::STRING;
+        return Types::STRING;
     }
 
     public static function getExtjsType(): string
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Field/TinymceField.php b/engine/Shopware/Bundle/ContentTypeBundle/Field/TinymceField.php
index 76b8ff5990e..8616c2106ef 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Field/TinymceField.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Field/TinymceField.php
@@ -1,37 +1,37 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Field;
 
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use Shopware\Bundle\ContentTypeBundle\Structs\Field;
 
 class TinymceField implements FieldInterface, TemplateProvidingFieldInterface
 {
     public static function getDbalType(): string
     {
-        return Type::TEXT;
+        return Types::TEXT;
     }
 
     public static function getExtjsType(): string
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Field/TypeField.php b/engine/Shopware/Bundle/ContentTypeBundle/Field/TypeField.php
index 243c082313c..b7447c10d36 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Field/TypeField.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Field/TypeField.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Field;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Field/TypeGrid.php b/engine/Shopware/Bundle/ContentTypeBundle/Field/TypeGrid.php
index 6b4e4a99451..38f9451517e 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Field/TypeGrid.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Field/TypeGrid.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Field;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/FieldResolver/AbstractResolver.php b/engine/Shopware/Bundle/ContentTypeBundle/FieldResolver/AbstractResolver.php
index 0acc8c8cad9..3cbc83f6aee 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/FieldResolver/AbstractResolver.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/FieldResolver/AbstractResolver.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\FieldResolver;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/FieldResolver/MediaResolver.php b/engine/Shopware/Bundle/ContentTypeBundle/FieldResolver/MediaResolver.php
index 85bc3438bf2..797042168d1 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/FieldResolver/MediaResolver.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/FieldResolver/MediaResolver.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\FieldResolver;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/FieldResolver/ProductResolver.php b/engine/Shopware/Bundle/ContentTypeBundle/FieldResolver/ProductResolver.php
index 960ffb4b91a..f2c47857484 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/FieldResolver/ProductResolver.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/FieldResolver/ProductResolver.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\FieldResolver;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/FieldResolver/ShopResolver.php b/engine/Shopware/Bundle/ContentTypeBundle/FieldResolver/ShopResolver.php
index ef6e3f31220..e11712c30ee 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/FieldResolver/ShopResolver.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/FieldResolver/ShopResolver.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\FieldResolver;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/FieldResolver/TypeResolver.php b/engine/Shopware/Bundle/ContentTypeBundle/FieldResolver/TypeResolver.php
index e0b0c3f21bd..5cacbcdf046 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/FieldResolver/TypeResolver.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/FieldResolver/TypeResolver.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\FieldResolver;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Resources/contenttypes.xsd b/engine/Shopware/Bundle/ContentTypeBundle/Resources/contenttypes.xsd
index b397ce196a4..74a7643c30b 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Resources/contenttypes.xsd
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Resources/contenttypes.xsd
@@ -21,7 +21,7 @@
             <xsd:element name="typeName">
                 <xsd:simpleType>
                     <xsd:restriction base="xsd:string">
-                        <xsd:pattern value="[A-z]+"/>
+                        <xsd:pattern value="[A-z][A-z0-9]*"/>
                     </xsd:restriction>
                 </xsd:simpleType>
             </xsd:element>
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Services/AclSynchronizer.php b/engine/Shopware/Bundle/ContentTypeBundle/Services/AclSynchronizer.php
index 6119b86e44a..f7bbb2f23e1 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Services/AclSynchronizer.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Services/AclSynchronizer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Services;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Services/AclSynchronizerInterface.php b/engine/Shopware/Bundle/ContentTypeBundle/Services/AclSynchronizerInterface.php
index e89518f03a2..78e8a1afd73 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Services/AclSynchronizerInterface.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Services/AclSynchronizerInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Services;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Services/ContentTypeCleanupService.php b/engine/Shopware/Bundle/ContentTypeBundle/Services/ContentTypeCleanupService.php
index 73c66641523..13e87c3fbce 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Services/ContentTypeCleanupService.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Services/ContentTypeCleanupService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Services;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Services/ContentTypeCleanupServiceInterface.php b/engine/Shopware/Bundle/ContentTypeBundle/Services/ContentTypeCleanupServiceInterface.php
index 15c360f1677..64c8d6e16fe 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Services/ContentTypeCleanupServiceInterface.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Services/ContentTypeCleanupServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Services;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Services/DatabaseContentTypeSynchronizer.php b/engine/Shopware/Bundle/ContentTypeBundle/Services/DatabaseContentTypeSynchronizer.php
index 7a691f9b8d3..c41418dd89b 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Services/DatabaseContentTypeSynchronizer.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Services/DatabaseContentTypeSynchronizer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Services;
@@ -106,18 +106,20 @@ public function sync(array $installedPlugins, bool $destructive = false): array
         return $this->synchronizerService->sync($destructive);
     }
 
+    /**
+     * @param array<string, Type> $types
+     */
     private function updateContentTypesTable(array $types): void
     {
         $dbal = $this->connection;
 
-        /** @var Type $type */
         foreach ($types as $type) {
-            $id = $dbal->fetchColumn('SELECT id FROM s_content_types WHERE internalName = ?', [$type->getInternalName()]);
+            $id = (int) $dbal->fetchOne('SELECT id FROM s_content_types WHERE internalName = ?', [$type->getInternalName()]);
             $update = [
                 'internalName' => $type->getInternalName(),
                 'name' => $type->getName(),
                 'source' => $type->getSource(),
-                'config' => json_encode($type),
+                'config' => json_encode($type, JSON_THROW_ON_ERROR),
             ];
 
             if ($id) {
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Services/DatabaseContentTypeSynchronizerInterface.php b/engine/Shopware/Bundle/ContentTypeBundle/Services/DatabaseContentTypeSynchronizerInterface.php
index 500a34a4486..6625e632443 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Services/DatabaseContentTypeSynchronizerInterface.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Services/DatabaseContentTypeSynchronizerInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Services;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Services/ExtjsBuilder.php b/engine/Shopware/Bundle/ContentTypeBundle/Services/ExtjsBuilder.php
index e3fc961ffc3..59a97256457 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Services/ExtjsBuilder.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Services/ExtjsBuilder.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Services;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Services/ExtjsBuilderInterface.php b/engine/Shopware/Bundle/ContentTypeBundle/Services/ExtjsBuilderInterface.php
index b104d13fb7c..634bac256c5 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Services/ExtjsBuilderInterface.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Services/ExtjsBuilderInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Services;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Services/FrontendTypeTranslator.php b/engine/Shopware/Bundle/ContentTypeBundle/Services/FrontendTypeTranslator.php
index 9f93607c0c9..969649bcb5d 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Services/FrontendTypeTranslator.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Services/FrontendTypeTranslator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Services;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Services/FrontendTypeTranslatorInterface.php b/engine/Shopware/Bundle/ContentTypeBundle/Services/FrontendTypeTranslatorInterface.php
index 4274b0c669a..94526a22bb0 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Services/FrontendTypeTranslatorInterface.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Services/FrontendTypeTranslatorInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Services;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Services/MenuSynchronizer.php b/engine/Shopware/Bundle/ContentTypeBundle/Services/MenuSynchronizer.php
index fc4ac3bc2bc..bfb4f0c68e6 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Services/MenuSynchronizer.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Services/MenuSynchronizer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Services;
@@ -71,7 +71,7 @@ public function synchronize(array $menu): void
                 $parent = $this->menuRepository->findOneBy($menuItem['parent']);
 
                 if (!\is_object($parent)) {
-                    throw new InvalidArgumentException(sprintf('Unable to find parent for query %s', print_r($menuItem['parent'], true)));
+                    throw new InvalidArgumentException(\sprintf('Unable to find parent for query %s', print_r($menuItem['parent'], true)));
                 }
             }
 
@@ -83,7 +83,7 @@ public function synchronize(array $menu): void
         $this->cleanupContentTypeEntries();
     }
 
-    protected function createMenuItem(array $menuItem, Menu $parent = null): Menu
+    protected function createMenuItem(array $menuItem, ?Menu $parent = null): Menu
     {
         $item = null;
 
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Services/MenuSynchronizerInterface.php b/engine/Shopware/Bundle/ContentTypeBundle/Services/MenuSynchronizerInterface.php
index 4e991d63cd7..4d875131a35 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Services/MenuSynchronizerInterface.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Services/MenuSynchronizerInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Services;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Services/Repository.php b/engine/Shopware/Bundle/ContentTypeBundle/Services/Repository.php
index b1995add279..5cc33f818d4 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Services/Repository.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Services/Repository.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Services;
@@ -167,7 +167,7 @@ protected function buildQuery($offset = 0, $limit = 10, $sort = [], $filters = [
                             continue;
                         }
 
-                        $query->orWhere(sprintf('`%s` LIKE :search', $field->getName()));
+                        $query->orWhere(\sprintf('`%s` LIKE :search', $field->getName()));
                     }
                 } else {
                     $where = $item['value'];
@@ -226,7 +226,7 @@ protected function buildQuery($offset = 0, $limit = 10, $sort = [], $filters = [
         if ($idSearch && \count($filters) === 1) {
             $idSearch = array_map('intval', $idSearch);
 
-            $orderBy = sprintf('FIELD(id, %s)', implode(',', $idSearch));
+            $orderBy = \sprintf('FIELD(id, %s)', implode(',', $idSearch));
 
             $query->addOrderBy($orderBy);
         }
@@ -287,7 +287,7 @@ private function validateFields(array $data): void
             }
 
             if (empty($data[$field->getName()])) {
-                throw new CustomValidationException(sprintf('Field %s is required', $field->getName()));
+                throw new CustomValidationException(\sprintf('Field %s is required', $field->getName()));
             }
         }
     }
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Services/RepositoryInterface.php b/engine/Shopware/Bundle/ContentTypeBundle/Services/RepositoryInterface.php
index 27a9a071de8..885934129d8 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Services/RepositoryInterface.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Services/RepositoryInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Services;
@@ -31,7 +31,7 @@ interface RepositoryInterface
 {
     public function findAll(Criteria $criteria): SearchResult;
 
-    public function save(array $data, int $id = null): int;
+    public function save(array $data, ?int $id = null): int;
 
     public function delete(int $id): bool;
 }
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Services/SynchronizerService.php b/engine/Shopware/Bundle/ContentTypeBundle/Services/SynchronizerService.php
index dc981f2975c..cb2e85d9637 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Services/SynchronizerService.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Services/SynchronizerService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Services;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Services/SynchronizerServiceInterface.php b/engine/Shopware/Bundle/ContentTypeBundle/Services/SynchronizerServiceInterface.php
index 8154bf396c0..0b8f9483f8b 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Services/SynchronizerServiceInterface.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Services/SynchronizerServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Services;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Services/TypeBuilder.php b/engine/Shopware/Bundle/ContentTypeBundle/Services/TypeBuilder.php
index 566c243ea14..259f252bd50 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Services/TypeBuilder.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Services/TypeBuilder.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Services;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Services/TypeFieldResolver.php b/engine/Shopware/Bundle/ContentTypeBundle/Services/TypeFieldResolver.php
index d3d15ba2adf..59d88973f8a 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Services/TypeFieldResolver.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Services/TypeFieldResolver.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Services;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Services/TypeFieldResolverInterface.php b/engine/Shopware/Bundle/ContentTypeBundle/Services/TypeFieldResolverInterface.php
index e532cc2c567..67b2b65c79a 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Services/TypeFieldResolverInterface.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Services/TypeFieldResolverInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Services;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Services/TypeProvider.php b/engine/Shopware/Bundle/ContentTypeBundle/Services/TypeProvider.php
index 35d7fe0f858..0466200a94e 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Services/TypeProvider.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Services/TypeProvider.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Services;
@@ -49,7 +49,7 @@ public function getTypes(): array
     public function getType(string $name): Type
     {
         if (!isset($this->types[$name])) {
-            throw new RuntimeException(sprintf('Requested type "%s" does not exist', $name));
+            throw new RuntimeException(\sprintf('Requested type "%s" does not exist', $name));
         }
 
         return $this->types[$name];
@@ -75,6 +75,6 @@ public function getTypeByControllerName(string $controllerName): Type
             }
         }
 
-        throw new RuntimeException(sprintf('Cannot find type for controller "%s"', $controllerName));
+        throw new RuntimeException(\sprintf('Cannot find type for controller "%s"', $controllerName));
     }
 }
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Services/XmlReader/ContentTypesReader.php b/engine/Shopware/Bundle/ContentTypeBundle/Services/XmlReader/ContentTypesReader.php
index f7bab2fffdb..364b1a5ef87 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Services/XmlReader/ContentTypesReader.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Services/XmlReader/ContentTypesReader.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Services\XmlReader;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Structs/Criteria.php b/engine/Shopware/Bundle/ContentTypeBundle/Structs/Criteria.php
index 0a383f2d1dd..6f297a84d90 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Structs/Criteria.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Structs/Criteria.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Structs;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Structs/Field.php b/engine/Shopware/Bundle/ContentTypeBundle/Structs/Field.php
index 5dce027ecdb..42dfffe392d 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Structs/Field.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Structs/Field.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Structs;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Structs/Fieldset.php b/engine/Shopware/Bundle/ContentTypeBundle/Structs/Fieldset.php
index 1d23287ebec..05ba8bb7492 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Structs/Fieldset.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Structs/Fieldset.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Structs;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Structs/SearchResult.php b/engine/Shopware/Bundle/ContentTypeBundle/Structs/SearchResult.php
index f5c4f365d13..29ef64c4b94 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Structs/SearchResult.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Structs/SearchResult.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Structs;
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Structs/Type.php b/engine/Shopware/Bundle/ContentTypeBundle/Structs/Type.php
index 850f8dcfa12..c2c865d7adb 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Structs/Type.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Structs/Type.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Structs;
@@ -138,10 +138,8 @@ public function getFields(): array
 
     /**
      * @param Field[] $fields
-     *
-     * @return Type
      */
-    public function setFields(array $fields): self
+    public function setFields(array $fields): Type
     {
         $this->fields = $fields;
 
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Subscriber/EntitySearchSubscriber.php b/engine/Shopware/Bundle/ContentTypeBundle/Subscriber/EntitySearchSubscriber.php
index 74814a3f6b7..045dc16a774 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Subscriber/EntitySearchSubscriber.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Subscriber/EntitySearchSubscriber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Subscriber;
@@ -149,6 +149,6 @@ private function getLabelField(Type $type): Field
             }
         }
 
-        throw new RuntimeException(sprintf('Type %s needs a label', $type->getName()));
+        throw new RuntimeException(\sprintf('Type %s needs a label', $type->getName()));
     }
 }
diff --git a/engine/Shopware/Bundle/ContentTypeBundle/Subscriber/SyncSubscriber.php b/engine/Shopware/Bundle/ContentTypeBundle/Subscriber/SyncSubscriber.php
index a4c9bb04fc1..52b2fb18f16 100644
--- a/engine/Shopware/Bundle/ContentTypeBundle/Subscriber/SyncSubscriber.php
+++ b/engine/Shopware/Bundle/ContentTypeBundle/Subscriber/SyncSubscriber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ContentTypeBundle\Subscriber;
diff --git a/engine/Shopware/Bundle/ControllerBundle/ArgumentResolver/RequestParameterResolver.php b/engine/Shopware/Bundle/ControllerBundle/ArgumentResolver/RequestParameterResolver.php
index 1ca7281c14c..057a7caa679 100644
--- a/engine/Shopware/Bundle/ControllerBundle/ArgumentResolver/RequestParameterResolver.php
+++ b/engine/Shopware/Bundle/ControllerBundle/ArgumentResolver/RequestParameterResolver.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ControllerBundle\ArgumentResolver;
diff --git a/engine/Shopware/Bundle/ControllerBundle/ArgumentResolver/ShopContextResolver.php b/engine/Shopware/Bundle/ControllerBundle/ArgumentResolver/ShopContextResolver.php
index d5358010956..fb4b12df9c4 100644
--- a/engine/Shopware/Bundle/ControllerBundle/ArgumentResolver/ShopContextResolver.php
+++ b/engine/Shopware/Bundle/ControllerBundle/ArgumentResolver/ShopContextResolver.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ControllerBundle\ArgumentResolver;
diff --git a/engine/Shopware/Bundle/ControllerBundle/ControllerBundle.php b/engine/Shopware/Bundle/ControllerBundle/ControllerBundle.php
index cd4d943c871..02d1d8902a8 100644
--- a/engine/Shopware/Bundle/ControllerBundle/ControllerBundle.php
+++ b/engine/Shopware/Bundle/ControllerBundle/ControllerBundle.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ControllerBundle;
diff --git a/engine/Shopware/Bundle/ControllerBundle/DependencyInjection/Compiler/ControllerCompilerPass.php b/engine/Shopware/Bundle/ControllerBundle/DependencyInjection/Compiler/ControllerCompilerPass.php
index 8ad50e51855..2edd4d18940 100644
--- a/engine/Shopware/Bundle/ControllerBundle/DependencyInjection/Compiler/ControllerCompilerPass.php
+++ b/engine/Shopware/Bundle/ControllerBundle/DependencyInjection/Compiler/ControllerCompilerPass.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ControllerBundle\DependencyInjection\Compiler;
@@ -39,14 +39,14 @@ public function process(ContainerBuilder $container)
             $options = $options[0];
 
             if (!isset($options['module'])) {
-                throw new RuntimeException(sprintf('Attribute "module" is required for "shopware.controller" tagged service with id "%s"', $id));
+                throw new RuntimeException(\sprintf('Attribute "module" is required for "shopware.controller" tagged service with id "%s"', $id));
             }
 
             if (!isset($options['controller'])) {
-                throw new RuntimeException(sprintf('Attribute "controller" is required for "shopware.controller" tagged service with id "%s"', $id));
+                throw new RuntimeException(\sprintf('Attribute "controller" is required for "shopware.controller" tagged service with id "%s"', $id));
             }
 
-            $controllers[strtolower(sprintf('%s_%s', $options['module'], $options['controller']))] = $id;
+            $controllers[strtolower(\sprintf('%s_%s', $options['module'], $options['controller']))] = $id;
 
             $definition = $container->getDefinition($id);
 
diff --git a/engine/Shopware/Bundle/ControllerBundle/DependencyInjection/Compiler/RegisterControllerCompilerPass.php b/engine/Shopware/Bundle/ControllerBundle/DependencyInjection/Compiler/RegisterControllerCompilerPass.php
index af1b5b934ff..e02e19fabc0 100644
--- a/engine/Shopware/Bundle/ControllerBundle/DependencyInjection/Compiler/RegisterControllerCompilerPass.php
+++ b/engine/Shopware/Bundle/ControllerBundle/DependencyInjection/Compiler/RegisterControllerCompilerPass.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ControllerBundle\DependencyInjection\Compiler;
@@ -134,7 +134,7 @@ private function collectControllerPaths($actives)
      */
     private function buildEventName($module, $controller)
     {
-        return sprintf(
+        return \sprintf(
             'Enlight_Controller_Dispatcher_ControllerPath_%s_%s',
             $module,
             $controller
diff --git a/engine/Shopware/Bundle/ControllerBundle/Exceptions/ResourceNotFoundException.php b/engine/Shopware/Bundle/ControllerBundle/Exceptions/ResourceNotFoundException.php
index d3f95723b64..1d940d9c2a8 100644
--- a/engine/Shopware/Bundle/ControllerBundle/Exceptions/ResourceNotFoundException.php
+++ b/engine/Shopware/Bundle/ControllerBundle/Exceptions/ResourceNotFoundException.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ControllerBundle\Exceptions;
@@ -38,7 +37,7 @@ public function __construct(string $exceptionMessagePrefix, Request $request)
             $referer = 'notFound';
         }
 
-        $message = sprintf(
+        $message = \sprintf(
             '%s. The request comes from: "%s". Module: "%s", Controller: "%s", Action: "%s",',
             $exceptionMessagePrefix,
             $referer,
diff --git a/engine/Shopware/Bundle/ControllerBundle/Listener/ControllerPathListener.php b/engine/Shopware/Bundle/ControllerBundle/Listener/ControllerPathListener.php
index f3954c39d0b..e79409ffd62 100644
--- a/engine/Shopware/Bundle/ControllerBundle/Listener/ControllerPathListener.php
+++ b/engine/Shopware/Bundle/ControllerBundle/Listener/ControllerPathListener.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ControllerBundle\Listener;
diff --git a/engine/Shopware/Bundle/CookieBundle/Controllers/CookieController.php b/engine/Shopware/Bundle/CookieBundle/Controllers/CookieController.php
index 7ba8d8290fe..0ae76c0059e 100644
--- a/engine/Shopware/Bundle/CookieBundle/Controllers/CookieController.php
+++ b/engine/Shopware/Bundle/CookieBundle/Controllers/CookieController.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CookieBundle\Controllers;
diff --git a/engine/Shopware/Bundle/CookieBundle/CookieBundle.php b/engine/Shopware/Bundle/CookieBundle/CookieBundle.php
index 4457c44158b..b1fa502b873 100644
--- a/engine/Shopware/Bundle/CookieBundle/CookieBundle.php
+++ b/engine/Shopware/Bundle/CookieBundle/CookieBundle.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CookieBundle;
diff --git a/engine/Shopware/Bundle/CookieBundle/CookieCollection.php b/engine/Shopware/Bundle/CookieBundle/CookieCollection.php
index 70cf3c4263d..32a088b58c7 100644
--- a/engine/Shopware/Bundle/CookieBundle/CookieCollection.php
+++ b/engine/Shopware/Bundle/CookieBundle/CookieCollection.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CookieBundle;
diff --git a/engine/Shopware/Bundle/CookieBundle/CookieGroupCollection.php b/engine/Shopware/Bundle/CookieBundle/CookieGroupCollection.php
index 03705cffc9f..c5b9c18e453 100644
--- a/engine/Shopware/Bundle/CookieBundle/CookieGroupCollection.php
+++ b/engine/Shopware/Bundle/CookieBundle/CookieGroupCollection.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CookieBundle;
@@ -66,7 +65,7 @@ public function getGroupByName(string $groupName): CookieGroupStruct
         });
 
         if ($cookieGroupCollection->count() === 0) {
-            throw new NoCookieGroupByNameKnownException(sprintf('There is no known cookie group with name %s', $groupName));
+            throw new NoCookieGroupByNameKnownException(\sprintf('There is no known cookie group with name %s', $groupName));
         }
 
         return $cookieGroupCollection->first();
diff --git a/engine/Shopware/Bundle/CookieBundle/Exceptions/InvalidCookieGroupItemException.php b/engine/Shopware/Bundle/CookieBundle/Exceptions/InvalidCookieGroupItemException.php
index 7fd73a53996..44bef1f9d0b 100644
--- a/engine/Shopware/Bundle/CookieBundle/Exceptions/InvalidCookieGroupItemException.php
+++ b/engine/Shopware/Bundle/CookieBundle/Exceptions/InvalidCookieGroupItemException.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CookieBundle\Exceptions;
diff --git a/engine/Shopware/Bundle/CookieBundle/Exceptions/InvalidCookieItemException.php b/engine/Shopware/Bundle/CookieBundle/Exceptions/InvalidCookieItemException.php
index da16f0c6108..75bcfcb033f 100644
--- a/engine/Shopware/Bundle/CookieBundle/Exceptions/InvalidCookieItemException.php
+++ b/engine/Shopware/Bundle/CookieBundle/Exceptions/InvalidCookieItemException.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CookieBundle\Exceptions;
diff --git a/engine/Shopware/Bundle/CookieBundle/Exceptions/NoCookieGroupByNameKnownException.php b/engine/Shopware/Bundle/CookieBundle/Exceptions/NoCookieGroupByNameKnownException.php
index 7fcdb04b18e..a8f69483cda 100644
--- a/engine/Shopware/Bundle/CookieBundle/Exceptions/NoCookieGroupByNameKnownException.php
+++ b/engine/Shopware/Bundle/CookieBundle/Exceptions/NoCookieGroupByNameKnownException.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CookieBundle\Exceptions;
diff --git a/engine/Shopware/Bundle/CookieBundle/Services/CookieCollector.php b/engine/Shopware/Bundle/CookieBundle/Services/CookieCollector.php
index b22a2ffda9b..668a9b379d7 100644
--- a/engine/Shopware/Bundle/CookieBundle/Services/CookieCollector.php
+++ b/engine/Shopware/Bundle/CookieBundle/Services/CookieCollector.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CookieBundle\Services;
@@ -74,7 +73,7 @@ public function collect(): CookieGroupCollection
         );
 
         if (!$cookieCollection->isValid()) {
-            throw new InvalidCookieItemException(sprintf('Found item inside cookie collection, which is not of type \Shopware\Bundle\CookieBundle\Structs\CookieStruct'));
+            throw new InvalidCookieItemException(\sprintf('Found item inside cookie collection, which is not of type \Shopware\Bundle\CookieBundle\Structs\CookieStruct'));
         }
 
         $cookieCollection = $this->sortCookies($cookieCollection);
diff --git a/engine/Shopware/Bundle/CookieBundle/Services/CookieCollectorInterface.php b/engine/Shopware/Bundle/CookieBundle/Services/CookieCollectorInterface.php
index e2531b265d4..a6b32b09792 100644
--- a/engine/Shopware/Bundle/CookieBundle/Services/CookieCollectorInterface.php
+++ b/engine/Shopware/Bundle/CookieBundle/Services/CookieCollectorInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CookieBundle\Services;
diff --git a/engine/Shopware/Bundle/CookieBundle/Services/CookieHandler.php b/engine/Shopware/Bundle/CookieBundle/Services/CookieHandler.php
index 99a7ffe7c77..53b35731e26 100644
--- a/engine/Shopware/Bundle/CookieBundle/Services/CookieHandler.php
+++ b/engine/Shopware/Bundle/CookieBundle/Services/CookieHandler.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CookieBundle\Services;
@@ -69,7 +68,7 @@ public function isCookieAllowedByPreferences(string $cookieName, array $preferen
             return false;
         }
 
-        foreach ($preferences['groups'] as $cookieGroup) {
+        foreach ($preferences['groups'] ?? [] as $cookieGroup) {
             foreach ($cookieGroup['cookies'] as $cookie) {
                 if ($cookie['name'] !== $foundCookie->getName()) {
                     continue;
diff --git a/engine/Shopware/Bundle/CookieBundle/Services/CookieHandlerInterface.php b/engine/Shopware/Bundle/CookieBundle/Services/CookieHandlerInterface.php
index 66b70da47d5..d2e08a59b18 100644
--- a/engine/Shopware/Bundle/CookieBundle/Services/CookieHandlerInterface.php
+++ b/engine/Shopware/Bundle/CookieBundle/Services/CookieHandlerInterface.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CookieBundle\Services;
diff --git a/engine/Shopware/Bundle/CookieBundle/Services/CookieRemoveHandler.php b/engine/Shopware/Bundle/CookieBundle/Services/CookieRemoveHandler.php
index 689bc563bca..c42c9221474 100644
--- a/engine/Shopware/Bundle/CookieBundle/Services/CookieRemoveHandler.php
+++ b/engine/Shopware/Bundle/CookieBundle/Services/CookieRemoveHandler.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CookieBundle\Services;
diff --git a/engine/Shopware/Bundle/CookieBundle/Services/CookieRemoveHandlerInterface.php b/engine/Shopware/Bundle/CookieBundle/Services/CookieRemoveHandlerInterface.php
index 8b85c297db4..b4d43164610 100644
--- a/engine/Shopware/Bundle/CookieBundle/Services/CookieRemoveHandlerInterface.php
+++ b/engine/Shopware/Bundle/CookieBundle/Services/CookieRemoveHandlerInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CookieBundle\Services;
diff --git a/engine/Shopware/Bundle/CookieBundle/Structs/CookieGroupStruct.php b/engine/Shopware/Bundle/CookieBundle/Structs/CookieGroupStruct.php
index dda68f66ca2..e81e89e5009 100644
--- a/engine/Shopware/Bundle/CookieBundle/Structs/CookieGroupStruct.php
+++ b/engine/Shopware/Bundle/CookieBundle/Structs/CookieGroupStruct.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CookieBundle\Structs;
diff --git a/engine/Shopware/Bundle/CookieBundle/Structs/CookieStruct.php b/engine/Shopware/Bundle/CookieBundle/Structs/CookieStruct.php
index 011a8c22329..a9d86bec98d 100644
--- a/engine/Shopware/Bundle/CookieBundle/Structs/CookieStruct.php
+++ b/engine/Shopware/Bundle/CookieBundle/Structs/CookieStruct.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CookieBundle\Structs;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/BaseCustomer.php b/engine/Shopware/Bundle/CustomerSearchBundle/BaseCustomer.php
index 2935ca66964..3b5bb0e1b4f 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/BaseCustomer.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/BaseCustomer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/AccountModeCondition.php b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/AccountModeCondition.php
index 6257c97271c..dea544d9686 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/AccountModeCondition.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/AccountModeCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/AgeCondition.php b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/AgeCondition.php
index a4e316fe91c..124b2647292 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/AgeCondition.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/AgeCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/AssignedToStreamCondition.php b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/AssignedToStreamCondition.php
index aad9c2ab9e9..35b1008f2ae 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/AssignedToStreamCondition.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/AssignedToStreamCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/CustomerAttributeCondition.php b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/CustomerAttributeCondition.php
index 5b968da498a..b82571ca7cd 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/CustomerAttributeCondition.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/CustomerAttributeCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/HasAddressWithCountryCondition.php b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/HasAddressWithCountryCondition.php
index 6f10ddb1748..4cfc766e367 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/HasAddressWithCountryCondition.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/HasAddressWithCountryCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/HasCanceledOrdersCondition.php b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/HasCanceledOrdersCondition.php
index 24b750cde71..efe53191990 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/HasCanceledOrdersCondition.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/HasCanceledOrdersCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/HasNewsletterRegistrationCondition.php b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/HasNewsletterRegistrationCondition.php
index a3f55d32b5e..75965881e02 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/HasNewsletterRegistrationCondition.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/HasNewsletterRegistrationCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/HasNoAddressWithCountryCondition.php b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/HasNoAddressWithCountryCondition.php
index 2786c9cbc1b..52fe9746c50 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/HasNoAddressWithCountryCondition.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/HasNoAddressWithCountryCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/HasNoCanceledOrdersCondition.php b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/HasNoCanceledOrdersCondition.php
index c26d6963bf6..c0eb91277d4 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/HasNoCanceledOrdersCondition.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/HasNoCanceledOrdersCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/HasNoNewsletterRegistrationCondition.php b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/HasNoNewsletterRegistrationCondition.php
index 796bfc42c06..a86cd989a21 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/HasNoNewsletterRegistrationCondition.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/HasNoNewsletterRegistrationCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/HasOrderCountCondition.php b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/HasOrderCountCondition.php
index 901a10a60bf..272fe76eeb1 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/HasOrderCountCondition.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/HasOrderCountCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/HasTotalOrderAmountCondition.php b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/HasTotalOrderAmountCondition.php
index 4cb8ed149eb..526313cf665 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/HasTotalOrderAmountCondition.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/HasTotalOrderAmountCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/IsCustomerSinceCondition.php b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/IsCustomerSinceCondition.php
index fdc321ede30..34a2f9e56f6 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/IsCustomerSinceCondition.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/IsCustomerSinceCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/IsInCustomerGroupCondition.php b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/IsInCustomerGroupCondition.php
index fe96030c18c..e9dc16e876d 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/IsInCustomerGroupCondition.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/IsInCustomerGroupCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/IsNotInCustomerGroupCondition.php b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/IsNotInCustomerGroupCondition.php
index 9c98e4c6839..c1766dc8596 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/IsNotInCustomerGroupCondition.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/IsNotInCustomerGroupCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotOrderedInLastDaysCondition.php b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotOrderedInLastDaysCondition.php
index d805d75d489..ec33cf3fa2d 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotOrderedInLastDaysCondition.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotOrderedInLastDaysCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotOrderedInShopCondition.php b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotOrderedInShopCondition.php
index 1590c33c0a5..18f3f0ad654 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotOrderedInShopCondition.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotOrderedInShopCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotOrderedProductCondition.php b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotOrderedProductCondition.php
index 2c94d115ea1..3a48ddcaf34 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotOrderedProductCondition.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotOrderedProductCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotOrderedProductOfCategoryCondition.php b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotOrderedProductOfCategoryCondition.php
index 69ff7819842..e1a6fbacf48 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotOrderedProductOfCategoryCondition.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotOrderedProductOfCategoryCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotOrderedProductOfManufacturerCondition.php b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotOrderedProductOfManufacturerCondition.php
index 626b4af4332..c1f6aa059e8 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotOrderedProductOfManufacturerCondition.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotOrderedProductOfManufacturerCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotOrderedWithDeliveryCondition.php b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotOrderedWithDeliveryCondition.php
index 813effd3aa6..734a3d9a1ba 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotOrderedWithDeliveryCondition.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotOrderedWithDeliveryCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotOrderedWithPaymentCondition.php b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotOrderedWithPaymentCondition.php
index 2b90e2319b4..e977c47a4bc 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotOrderedWithPaymentCondition.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotOrderedWithPaymentCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotRegisteredInShopCondition.php b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotRegisteredInShopCondition.php
index 25a7387cf0b..7b89ab48fd2 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotRegisteredInShopCondition.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotRegisteredInShopCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotSalutationCondition.php b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotSalutationCondition.php
index c8b1cc42a73..d55c0b30140 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotSalutationCondition.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/NotSalutationCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedAtWeekdayCondition.php b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedAtWeekdayCondition.php
index ccd6c2210b6..9be09d720d7 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedAtWeekdayCondition.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedAtWeekdayCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedInLastDaysCondition.php b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedInLastDaysCondition.php
index 6182b7c0724..0425982461e 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedInLastDaysCondition.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedInLastDaysCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedInShopCondition.php b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedInShopCondition.php
index d0f9dcf83b1..ffc81d5dd3e 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedInShopCondition.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedInShopCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedOnDeviceCondition.php b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedOnDeviceCondition.php
index 60a1073d5db..a048ae76b12 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedOnDeviceCondition.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedOnDeviceCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedProductCondition.php b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedProductCondition.php
index d00fd54b62a..62131cd6a70 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedProductCondition.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedProductCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedProductOfCategoryCondition.php b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedProductOfCategoryCondition.php
index fc7bc1bedb6..fad1b71092a 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedProductOfCategoryCondition.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedProductOfCategoryCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedProductOfManufacturerCondition.php b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedProductOfManufacturerCondition.php
index 9cc3a55feaa..ad03fe78d48 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedProductOfManufacturerCondition.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedProductOfManufacturerCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedWithDeliveryCondition.php b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedWithDeliveryCondition.php
index 22d6a410226..ddf3d670483 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedWithDeliveryCondition.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedWithDeliveryCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedWithPaymentCondition.php b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedWithPaymentCondition.php
index 641b53cf809..a154c899adb 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedWithPaymentCondition.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/OrderedWithPaymentCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/RegisteredInShopCondition.php b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/RegisteredInShopCondition.php
index 876926ff01c..cb6fd5d93de 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/RegisteredInShopCondition.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/RegisteredInShopCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/SalutationCondition.php b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/SalutationCondition.php
index 619609a90a1..96b3f8834d6 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Condition/SalutationCondition.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Condition/SalutationCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/CustomerNumberSearchInterface.php b/engine/Shopware/Bundle/CustomerSearchBundle/CustomerNumberSearchInterface.php
index 74f510a498e..222429c71cc 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/CustomerNumberSearchInterface.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/CustomerNumberSearchInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/CustomerNumberSearchResult.php b/engine/Shopware/Bundle/CustomerSearchBundle/CustomerNumberSearchResult.php
index 20f35e91591..3a73cadae32 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/CustomerNumberSearchResult.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/CustomerNumberSearchResult.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/AgeSorting.php b/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/AgeSorting.php
index 982057619e7..ebd69939d25 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/AgeSorting.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/AgeSorting.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Sorting;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/AverageAmountSorting.php b/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/AverageAmountSorting.php
index bc25a55c3e1..6b4d670b0c9 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/AverageAmountSorting.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/AverageAmountSorting.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Sorting;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/AverageProductAmountSorting.php b/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/AverageProductAmountSorting.php
index 615115b4d8f..88f162f395c 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/AverageProductAmountSorting.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/AverageProductAmountSorting.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Sorting;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/CitySorting.php b/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/CitySorting.php
index e17443e64bf..3fd869a5ff8 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/CitySorting.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/CitySorting.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Sorting;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/CustomerGroupSorting.php b/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/CustomerGroupSorting.php
index ebbe61aa69e..bee2db41cee 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/CustomerGroupSorting.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/CustomerGroupSorting.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Sorting;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/CustomerSinceSorting.php b/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/CustomerSinceSorting.php
index 8365f85d7a5..4c35f863e12 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/CustomerSinceSorting.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/CustomerSinceSorting.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Sorting;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/LastNameSorting.php b/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/LastNameSorting.php
index c0a105ac276..5e7d351d90f 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/LastNameSorting.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/LastNameSorting.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Sorting;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/LastOrderSorting.php b/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/LastOrderSorting.php
index 9359bd4f80f..eb9c86994a4 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/LastOrderSorting.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/LastOrderSorting.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Sorting;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/NumberSorting.php b/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/NumberSorting.php
index 6e3333ef643..5e8444772c9 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/NumberSorting.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/NumberSorting.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Sorting;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/OrderCountSorting.php b/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/OrderCountSorting.php
index deb951ea9c1..3b274e4a7af 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/OrderCountSorting.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/OrderCountSorting.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Sorting;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/StreetNameSorting.php b/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/StreetNameSorting.php
index 28b1485d4a2..c9a548d2187 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/StreetNameSorting.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/StreetNameSorting.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Sorting;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/TotalAmountSorting.php b/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/TotalAmountSorting.php
index 7fc9ee7127f..d896cda9107 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/TotalAmountSorting.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/TotalAmountSorting.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Sorting;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/ZipCodeSorting.php b/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/ZipCodeSorting.php
index f1b6d72ff7d..fe4612f6613 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/ZipCodeSorting.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundle/Sorting/ZipCodeSorting.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundle\Sorting;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Commands/SearchIndexPopulateCommand.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Commands/SearchIndexPopulateCommand.php
index 30dc64e30e0..06bf3244894 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Commands/SearchIndexPopulateCommand.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Commands/SearchIndexPopulateCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\Commands;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AccountModeConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AccountModeConditionHandler.php
index 2324c77169d..47bf1dfe6b2 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AccountModeConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AccountModeConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AgeConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AgeConditionHandler.php
index ffb613cd02b..daff671f3ac 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AgeConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AgeConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AssignedToStreamConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AssignedToStreamConditionHandler.php
index f80c7a07e6b..388ef374a8b 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AssignedToStreamConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AssignedToStreamConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/CustomerAttributeConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/CustomerAttributeConditionHandler.php
index 075ebad3e27..819578267f3 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/CustomerAttributeConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/CustomerAttributeConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasAddressWithCountryConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasAddressWithCountryConditionHandler.php
index 43e7a7d52aa..e573bb92fa4 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasAddressWithCountryConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasAddressWithCountryConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasCanceledOrdersConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasCanceledOrdersConditionHandler.php
index 1414e8aa45d..af1c2dba293 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasCanceledOrdersConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasCanceledOrdersConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNewsletterRegistrationConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNewsletterRegistrationConditionHandler.php
index 3c44a02dcf4..1f98787eb79 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNewsletterRegistrationConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNewsletterRegistrationConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNoAddressWithCountryConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNoAddressWithCountryConditionHandler.php
index ebe93522fcb..06336c3ae80 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNoAddressWithCountryConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNoAddressWithCountryConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
@@ -55,7 +55,7 @@ private function addCondition(HasNoAddressWithCountryCondition $condition, Query
             AND addresses.user_id NOT IN (
                 SELECT user_id
                 FROM s_user_addresses
-                WHERE (' . (implode(' OR ', $ors)) . ')
+                WHERE (' . implode(' OR ', $ors) . ')
             )'
         );
         $query->addGroupBy('customer.id');
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNoCanceledOrdersConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNoCanceledOrdersConditionHandler.php
index 418efaa598c..43943a14855 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNoCanceledOrdersConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNoCanceledOrdersConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNoNewsletterRegistrationConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNoNewsletterRegistrationConditionHandler.php
index 95a9a1b0aa0..0049d5d0d0e 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNoNewsletterRegistrationConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNoNewsletterRegistrationConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasOrderCountConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasOrderCountConditionHandler.php
index dd714c62d47..5a93a712a2a 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasOrderCountConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasOrderCountConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasTotalOrderAmountConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasTotalOrderAmountConditionHandler.php
index 485a9b57d3b..6fe39b4ab34 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasTotalOrderAmountConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasTotalOrderAmountConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/IsCustomerSinceConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/IsCustomerSinceConditionHandler.php
index c2bd8ae5789..82e124d303d 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/IsCustomerSinceConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/IsCustomerSinceConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/IsInCustomerGroupConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/IsInCustomerGroupConditionHandler.php
index d2e4a4546f8..a59f39ea565 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/IsInCustomerGroupConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/IsInCustomerGroupConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/IsNotInCustomerGroupConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/IsNotInCustomerGroupConditionHandler.php
index 57e6c733b3b..da77bade817 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/IsNotInCustomerGroupConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/IsNotInCustomerGroupConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedInLastDaysConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedInLastDaysConditionHandler.php
index 2c69d22f2df..b01dc05176f 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedInLastDaysConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedInLastDaysConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedInShopConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedInShopConditionHandler.php
index 14bc33e1c40..1d2a31f3309 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedInShopConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedInShopConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
@@ -52,7 +52,7 @@ private function addCondition(NotOrderedInShopCondition $condition, QueryBuilder
                 (
                     SELECT customernumber
                     FROM s_customer_search_index
-                    WHERE ' . (implode(' OR ', $likes)) . '
+                    WHERE ' . implode(' OR ', $likes) . '
                 )'
         );
         foreach ($condition->getShopIds() as $i => $id) {
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedProductConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedProductConditionHandler.php
index 28e7b9b8a43..02767000994 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedProductConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedProductConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
@@ -52,7 +52,7 @@ private function addCondition(NotOrderedProductCondition $condition, QueryBuilde
                 (
                     SELECT customernumber
                     FROM s_customer_search_index
-                    WHERE ' . (implode(' OR ', $likes)) . '
+                    WHERE ' . implode(' OR ', $likes) . '
                 )'
         );
         foreach ($condition->getNumbers() as $i => $number) {
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedProductOfCategoryConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedProductOfCategoryConditionHandler.php
index 10895459624..c268dc2b0e0 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedProductOfCategoryConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedProductOfCategoryConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
@@ -52,7 +52,7 @@ private function addCondition(NotOrderedProductOfCategoryCondition $condition, Q
                 (
                     SELECT customernumber
                     FROM s_customer_search_index
-                    WHERE ' . (implode(' OR ', $likes)) . '
+                    WHERE ' . implode(' OR ', $likes) . '
                 )'
         );
         foreach ($condition->getCategoryIds() as $i => $id) {
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedProductOfManufacturerConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedProductOfManufacturerConditionHandler.php
index 6b2105a57ba..bf8dc2b1d11 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedProductOfManufacturerConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedProductOfManufacturerConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
@@ -52,7 +52,7 @@ private function addCondition(NotOrderedProductOfManufacturerCondition $conditio
                 (
                     SELECT customernumber
                     FROM s_customer_search_index
-                    WHERE ' . (implode(' OR ', $likes)) . '
+                    WHERE ' . implode(' OR ', $likes) . '
                 )'
         );
         foreach ($condition->getManufacturerIds() as $i => $id) {
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedWithDeliveryConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedWithDeliveryConditionHandler.php
index 2b661da91eb..f1bacc11971 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedWithDeliveryConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedWithDeliveryConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
@@ -52,7 +52,7 @@ private function addCondition(NotOrderedWithDeliveryCondition $condition, QueryB
                 (
                     SELECT customernumber
                     FROM s_customer_search_index
-                    WHERE ' . (implode(' OR ', $likes)) . '
+                    WHERE ' . implode(' OR ', $likes) . '
                 )'
         );
         foreach ($condition->getDispatchIds() as $i => $number) {
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedWithPaymentConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedWithPaymentConditionHandler.php
index bebfd903491..aa2aeed08d8 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedWithPaymentConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedWithPaymentConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
@@ -52,7 +52,7 @@ private function addCondition(NotOrderedWithPaymentCondition $condition, QueryBu
                 (
                     SELECT customernumber
                     FROM s_customer_search_index
-                    WHERE ' . (implode(' OR ', $likes)) . '
+                    WHERE ' . implode(' OR ', $likes) . '
                 )'
         );
         foreach ($condition->getPaymentIds() as $i => $number) {
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotRegisteredInShopConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotRegisteredInShopConditionHandler.php
index 15a9e354379..2cc372fff69 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotRegisteredInShopConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotRegisteredInShopConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotSalutationConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotSalutationConditionHandler.php
index 2acca1d87ed..d9fdabed902 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotSalutationConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotSalutationConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedAtWeekdayConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedAtWeekdayConditionHandler.php
index b98451cd942..3a1564290a8 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedAtWeekdayConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedAtWeekdayConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedInLastDaysConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedInLastDaysConditionHandler.php
index 650a2f1a2f3..f9097661130 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedInLastDaysConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedInLastDaysConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedInShopConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedInShopConditionHandler.php
index 3dceefd439c..0e5b9d7a10f 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedInShopConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedInShopConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedOnDeviceConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedOnDeviceConditionHandler.php
index bf5415c7012..432deb68722 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedOnDeviceConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedOnDeviceConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedProductConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedProductConditionHandler.php
index 2583f6c213c..befecd5fdf7 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedProductConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedProductConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedProductOfCategoryConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedProductOfCategoryConditionHandler.php
index 6755a8f0de7..faaf8907ff5 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedProductOfCategoryConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedProductOfCategoryConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedProductOfManufacturerConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedProductOfManufacturerConditionHandler.php
index f4624445396..4e1524046f3 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedProductOfManufacturerConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedProductOfManufacturerConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedWithDeliveryConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedWithDeliveryConditionHandler.php
index f64b8dcad86..d5088b34a69 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedWithDeliveryConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedWithDeliveryConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedWithPaymentConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedWithPaymentConditionHandler.php
index 17aca957de2..5d124f05b89 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedWithPaymentConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedWithPaymentConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/RegisteredInShopConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/RegisteredInShopConditionHandler.php
index f2e26b2cec2..dcbe2334bf9 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/RegisteredInShopConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/RegisteredInShopConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SalutationConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SalutationConditionHandler.php
index e97854f37bd..8c3664816da 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SalutationConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SalutationConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SearchTermConditionHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SearchTermConditionHandler.php
index d31acd25a74..d57477346dc 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SearchTermConditionHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SearchTermConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandlerInterface.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandlerInterface.php
index a2eff26940e..d8c341c2ec2 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandlerInterface.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/ConditionHandlerInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/CustomerNumberSearch.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/CustomerNumberSearch.php
index a4e2f8a5e18..b98eb6fdd84 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/CustomerNumberSearch.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/CustomerNumberSearch.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/CustomerSearchBundleDBALBundle.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/CustomerSearchBundleDBALBundle.php
index 6ba8458f0b9..bb631b14c7b 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/CustomerSearchBundleDBALBundle.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/CustomerSearchBundleDBALBundle.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/HandlerRegistry.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/HandlerRegistry.php
index 1ec9d0b4cf5..2d15286e64e 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/HandlerRegistry.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/HandlerRegistry.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL;
@@ -59,7 +59,7 @@ public function getConditionHandler(ConditionInterface $condition)
                 return $handler;
             }
         }
-        throw new RuntimeException(sprintf('Condition class %s not supported', \get_class($condition)));
+        throw new RuntimeException(\sprintf('Condition class %s not supported', \get_class($condition)));
     }
 
     /**
@@ -80,7 +80,7 @@ public function getSortingHandler(SortingInterface $sorting)
                 return $handler;
             }
         }
-        throw new RuntimeException(sprintf('Sorting class %s not supported', \get_class($sorting)));
+        throw new RuntimeException(\sprintf('Sorting class %s not supported', \get_class($sorting)));
     }
 
     /**
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/AnalyzedCustomer.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/AnalyzedCustomer.php
index a2c5673709f..a5129a43990 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/AnalyzedCustomer.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/AnalyzedCustomer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\Indexing;
@@ -47,7 +47,7 @@ public static function createFromCustomer(Customer $customer)
     }
 
     /**
-     * @return \Shopware\Bundle\CustomerSearchBundleDBAL\Indexing\CustomerOrder
+     * @return CustomerOrder
      */
     public function getOrderInformation()
     {
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CronJobProgressHelper.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CronJobProgressHelper.php
index 1079a2086fc..8bef74d0867 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CronJobProgressHelper.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CronJobProgressHelper.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\Indexing;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CronJobSubscriber.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CronJobSubscriber.php
index fb40f3e1cfd..d155d9ef22f 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CronJobSubscriber.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CronJobSubscriber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\Indexing;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerOrder.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerOrder.php
index c33369d5cef..4f3540ed5bf 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerOrder.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerOrder.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\Indexing;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerOrderGateway.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerOrderGateway.php
index ceb10255b43..6b734cbe20d 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerOrderGateway.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerOrderGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\Indexing;
@@ -46,9 +46,9 @@ public function __construct(Connection $connection, CustomerOrderHydrator $hydra
     }
 
     /**
-     * @param int[] $customerIds
+     * @param array<int> $customerIds
      *
-     * @return CustomerOrder[] indexed by customer id
+     * @return array<int, CustomerOrder> indexed by customer id
      */
     public function getList($customerIds)
     {
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerOrderHydrator.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerOrderHydrator.php
index 3cf3e4b8ace..abd38c5131c 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerOrderHydrator.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerOrderHydrator.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\Indexing;
@@ -28,6 +29,11 @@
 
 class CustomerOrderHydrator
 {
+    /**
+     * @param array<string, mixed> $data
+     *
+     * @return CustomerOrder
+     */
     public function hydrate(array $data)
     {
         $struct = new CustomerOrder();
@@ -36,34 +42,37 @@ public function hydrate(array $data)
             return $struct;
         }
 
-        $struct->setOrderCount((int) $data['count_orders']);
-        $struct->setTotalAmount((float) $data['invoice_amount_sum']);
-        $struct->setAvgAmount((float) $data['invoice_amount_avg']);
-        $struct->setMinAmount((float) $data['invoice_amount_min']);
-        $struct->setMaxAmount((float) $data['invoice_amount_max']);
-        $struct->setAvgProductPrice((float) $data['product_avg']);
-        $struct->setFirstOrderTime(new DateTime($data['first_order_time']));
-        $struct->setLastOrderTime(new DateTime($data['last_order_time']));
-        $struct->setPayments($this->explodeAndFilter($data['selected_payments']));
-        $struct->setShops($this->explodeAndFilter($data['ordered_in_shops']));
-        $struct->setDevices($this->explodeAndFilter($data['ordered_with_devices']));
-        $struct->setDispatches($this->explodeAndFilter($data['selected_dispachtes']));
-        $struct->setWeekdays($this->explodeAndFilter($data['weekdays']));
+        $struct->setOrderCount((int) ($data['count_orders'] ?? 0));
+        $struct->setTotalAmount((float) ($data['invoice_amount_sum'] ?? 0.0));
+        $struct->setAvgAmount((float) ($data['invoice_amount_avg'] ?? 0.0));
+        $struct->setMinAmount((float) ($data['invoice_amount_min'] ?? 0.0));
+        $struct->setMaxAmount((float) ($data['invoice_amount_max'] ?? 0.0));
+        $struct->setAvgProductPrice((float) ($data['product_avg'] ?? 0.0));
+        $struct->setFirstOrderTime(isset($data['first_order_time']) ? new DateTime($data['first_order_time']) : null);
+        $struct->setLastOrderTime(isset($data['last_order_time']) ? new DateTime($data['last_order_time']) : null);
+        $struct->setPayments(array_map('\intval', $this->explodeAndFilter($data['selected_payments'] ?? '')));
+        $struct->setShops(array_map('\intval', $this->explodeAndFilter($data['ordered_in_shops'] ?? '')));
+        $struct->setDevices($this->explodeAndFilter($data['ordered_with_devices'] ?? ''));
+        $struct->setDispatches(array_map('\intval', $this->explodeAndFilter($data['selected_dispachtes'] ?? '')));
+        $struct->setWeekdays($this->explodeAndFilter($data['weekdays'] ?? ''));
 
         if (\array_key_exists('product_numbers', $data)) {
-            $struct->setProducts($this->explodeAndFilter($data['product_numbers']));
+            $struct->setProducts($this->explodeAndFilter($data['product_numbers'] ?? ''));
         }
         if (\array_key_exists('category_ids', $data)) {
-            $struct->setCategories($this->explodeAndFilter($data['category_ids']));
+            $struct->setCategories(array_map('\intval', $this->explodeAndFilter($data['category_ids'] ?? '')));
         }
         if (\array_key_exists('manufacturer_ids', $data)) {
-            $struct->setManufacturers($this->explodeAndFilter($data['manufacturer_ids']));
+            $struct->setManufacturers(array_map('\intval', $this->explodeAndFilter($data['manufacturer_ids'] ?? '')));
         }
 
         return $struct;
     }
 
-    private function explodeAndFilter($value)
+    /**
+     * @return array<string|numeric-string>
+     */
+    private function explodeAndFilter(string $value): array
     {
         return array_filter(explode(',', $value));
     }
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerProvider.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerProvider.php
index a9ca66ab7c1..9680fb53dc9 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerProvider.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerProvider.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\Indexing;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerProviderInterface.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerProviderInterface.php
index 415d6b58668..f6c43c91c4b 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerProviderInterface.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/CustomerProviderInterface.php
@@ -1,30 +1,35 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\Indexing;
 
 interface CustomerProviderInterface
 {
+    /**
+     * @param array<int> $customerIds
+     *
+     * @return array<int, AnalyzedCustomer>
+     */
     public function get($customerIds);
 }
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/SearchIndexer.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/SearchIndexer.php
index 0396b50d3b5..9cc16b2ae96 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/SearchIndexer.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/SearchIndexer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\Indexing;
@@ -64,7 +64,7 @@ public function populate(array $ids)
      */
     public function clearIndex()
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         $this->connection->executeUpdate('DELETE FROM s_customer_search_index');
     }
@@ -253,7 +253,7 @@ private function implodeUnique($array)
      *
      * @return string|null
      */
-    private function formatDate(DateTimeInterface $date = null, $format = 'Y-m-d H:i:s')
+    private function formatDate(?DateTimeInterface $date = null, $format = 'Y-m-d H:i:s')
     {
         if ($date === null) {
             return null;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/SearchIndexerInterface.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/SearchIndexerInterface.php
index 437568c3b07..c14faf4bab2 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/SearchIndexerInterface.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/Indexing/SearchIndexerInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\Indexing;
@@ -30,6 +30,8 @@ interface SearchIndexerInterface
      * Indexes the provided customer ids into the search index
      *
      * @param int[] $ids
+     *
+     * @return void
      */
     public function populate(array $ids);
 
@@ -37,11 +39,15 @@ public function populate(array $ids);
      * @deprecated in 5.6, will be removed in 5.7 without replacement.
      *
      * Clears the whole search index at once
+     *
+     * @return void
      */
     public function clearIndex();
 
     /**
      * Removes all customer rows from the generated search index which do not exist anymore
+     *
+     * @return void
      */
     public function cleanupIndex();
 }
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/AgeSortingHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/AgeSortingHandler.php
index b5ab9e1fffd..1bf759dfda4 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/AgeSortingHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/AgeSortingHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\SortingHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/AverageAmountSortingHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/AverageAmountSortingHandler.php
index 89e860eec56..af377dd4692 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/AverageAmountSortingHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/AverageAmountSortingHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\SortingHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/AverageProductAmountSortingHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/AverageProductAmountSortingHandler.php
index e75b0817465..e539817da11 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/AverageProductAmountSortingHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/AverageProductAmountSortingHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\SortingHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/CitySortingHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/CitySortingHandler.php
index 5e6c4492ef3..521f463d914 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/CitySortingHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/CitySortingHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\SortingHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/CustomerGroupSortingHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/CustomerGroupSortingHandler.php
index 8c6d9ff9a15..63ea5ec5b95 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/CustomerGroupSortingHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/CustomerGroupSortingHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\SortingHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/CustomerSinceSortingHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/CustomerSinceSortingHandler.php
index e1aa0ecf087..5b425a40580 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/CustomerSinceSortingHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/CustomerSinceSortingHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\SortingHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/LastNameSortingHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/LastNameSortingHandler.php
index 4ff918783d1..6247769cd08 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/LastNameSortingHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/LastNameSortingHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\SortingHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/LastOrderSortingHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/LastOrderSortingHandler.php
index bc25b463af0..04b5d0e3da2 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/LastOrderSortingHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/LastOrderSortingHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\SortingHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/NumberSortingHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/NumberSortingHandler.php
index 633b6750bd8..86658280f93 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/NumberSortingHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/NumberSortingHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\SortingHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/OrderCountSortingHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/OrderCountSortingHandler.php
index 3120b5f690a..0b85807c4b4 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/OrderCountSortingHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/OrderCountSortingHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\SortingHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/StreetNameSortingHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/StreetNameSortingHandler.php
index c53446777f2..2f53b5e7fc2 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/StreetNameSortingHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/StreetNameSortingHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\SortingHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/TotalAmountSortingHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/TotalAmountSortingHandler.php
index 76ca7d1edf7..e9cf131b5e9 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/TotalAmountSortingHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/TotalAmountSortingHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\SortingHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/ZipCodeSortingHandler.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/ZipCodeSortingHandler.php
index b75c825c7ea..42da09a300a 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/ZipCodeSortingHandler.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandler/ZipCodeSortingHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL\SortingHandler;
diff --git a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandlerInterface.php b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandlerInterface.php
index 01612f2dec4..0e753bf01ca 100644
--- a/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandlerInterface.php
+++ b/engine/Shopware/Bundle/CustomerSearchBundleDBAL/SortingHandlerInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\CustomerSearchBundleDBAL;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/BacklogProcessor.php b/engine/Shopware/Bundle/ESIndexingBundle/BacklogProcessor.php
index bf6a9dac66c..5f76afaba4e 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/BacklogProcessor.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/BacklogProcessor.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/BacklogProcessorInterface.php b/engine/Shopware/Bundle/ESIndexingBundle/BacklogProcessorInterface.php
index a6410895090..4b1c05be5c4 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/BacklogProcessorInterface.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/BacklogProcessorInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle;
@@ -31,11 +31,15 @@ interface BacklogProcessorInterface
 {
     /**
      * @param Backlog[] $backlogs
+     *
+     * @return void
      */
     public function add($backlogs);
 
     /**
      * @param Backlog[] $backlogs
+     *
+     * @return void
      */
     public function process(ShopIndex $shopIndex, $backlogs);
 }
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/BacklogReader.php b/engine/Shopware/Bundle/ESIndexingBundle/BacklogReader.php
index 645abbae544..b791f5146b7 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/BacklogReader.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/BacklogReader.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle;
@@ -30,10 +30,7 @@
 
 class BacklogReader implements BacklogReaderInterface
 {
-    /**
-     * @var Connection
-     */
-    private $connection;
+    private Connection $connection;
 
     public function __construct(Connection $connection)
     {
@@ -54,7 +51,7 @@ public function getLastBacklogId()
             ->execute()
             ->fetch(PDO::FETCH_COLUMN);
 
-        return unserialize($value, ['allowed_classes' => false]);
+        return (int) unserialize($value, ['allowed_classes' => false]);
     }
 
     /**
@@ -62,7 +59,7 @@ public function getLastBacklogId()
      */
     public function setLastBacklogId($lastId)
     {
-        $this->connection->executeUpdate(
+        $this->connection->executeStatement(
             "UPDATE s_core_config_elements SET value = :value WHERE name = 'lastBacklogId'",
             [':value' => serialize($lastId)]
         );
@@ -81,7 +78,7 @@ public function read($lastId, $limit)
             ->setParameter(':lastId', $lastId)
             ->setMaxResults($limit);
 
-        $data = $query->execute()->fetchAll(PDO::FETCH_ASSOC);
+        $data = $query->execute()->fetchAllAssociative();
 
         $result = [];
         foreach ($data as $row) {
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/BacklogReaderInterface.php b/engine/Shopware/Bundle/ESIndexingBundle/BacklogReaderInterface.php
index a3e022c793c..5683fa23f5a 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/BacklogReaderInterface.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/BacklogReaderInterface.php
@@ -1,36 +1,38 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle;
 
+use Shopware\Bundle\ESIndexingBundle\Struct\Backlog;
+
 interface BacklogReaderInterface
 {
     /**
      * @param int $lastId
      * @param int $limit
      *
-     * @return Struct\Backlog[]
+     * @return list<Backlog>
      */
     public function read($lastId, $limit);
 
@@ -41,6 +43,8 @@ public function getLastBacklogId();
 
     /**
      * @param int $lastId
+     *
+     * @return void
      */
     public function setLastBacklogId($lastId);
 }
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/ClientFactory.php b/engine/Shopware/Bundle/ESIndexingBundle/ClientFactory.php
index ef0fe5a381f..443a7687ee1 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/ClientFactory.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/ClientFactory.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Commands/AnalyzeCommand.php b/engine/Shopware/Bundle/ESIndexingBundle/Commands/AnalyzeCommand.php
index 68aa0a91c0b..02f3dcdfd1d 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/Commands/AnalyzeCommand.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/Commands/AnalyzeCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\Commands;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Commands/BacklogClearCommand.php b/engine/Shopware/Bundle/ESIndexingBundle/Commands/BacklogClearCommand.php
index 3b6b8afedd4..f36380c2b10 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/Commands/BacklogClearCommand.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/Commands/BacklogClearCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\Commands;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Commands/BacklogSyncCommand.php b/engine/Shopware/Bundle/ESIndexingBundle/Commands/BacklogSyncCommand.php
index daab89c331d..a022cceab23 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/Commands/BacklogSyncCommand.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/Commands/BacklogSyncCommand.php
@@ -1,31 +1,34 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\Commands;
 
+use Shopware\Bundle\ESIndexingBundle\BacklogProcessorInterface;
+use Shopware\Bundle\ESIndexingBundle\BacklogReaderInterface;
+use Shopware\Bundle\ESIndexingBundle\IdentifierSelector;
+use Shopware\Bundle\ESIndexingBundle\IndexFactoryInterface;
 use Shopware\Bundle\ESIndexingBundle\MappingInterface;
-use Shopware\Bundle\ESIndexingBundle\Struct\Backlog;
 use Shopware\Commands\ShopwareCommand;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -34,22 +37,36 @@
 
 class BacklogSyncCommand extends ShopwareCommand
 {
-    /**
-     * @var int
-     */
-    private $batchSize;
+    private int $batchSize;
 
     /**
-     * @var MappingInterface[]
+     * @var list<MappingInterface>
      */
-    private $mappings;
+    private array $mappings;
 
-    public function __construct(int $batchSize, Traversable $mappings)
-    {
+    private BacklogReaderInterface $backlogReader;
+
+    private IdentifierSelector $identifierSelector;
+
+    private IndexFactoryInterface $indexFactory;
+
+    private BacklogProcessorInterface $backlogProcessor;
+
+    public function __construct(
+        int $batchSize,
+        Traversable $mappings,
+        BacklogReaderInterface $backlogReader,
+        IdentifierSelector $identifierSelector,
+        IndexFactoryInterface $indexFactory,
+        BacklogProcessorInterface $backlogProcessor
+    ) {
         $this->batchSize = $batchSize;
         $this->mappings = iterator_to_array($mappings, false);
-
-        parent::__construct(null);
+        $this->backlogReader = $backlogReader;
+        $this->identifierSelector = $identifierSelector;
+        $this->indexFactory = $indexFactory;
+        $this->backlogProcessor = $backlogProcessor;
+        parent::__construct();
     }
 
     /**
@@ -67,11 +84,10 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $reader = $this->container->get(\Shopware\Bundle\ESIndexingBundle\BacklogReader::class);
-        $lastBackLogId = $reader->getLastBacklogId();
-        $backlogs = $reader->read($lastBackLogId, $this->batchSize);
+        $lastBackLogId = $this->backlogReader->getLastBacklogId();
+        $backlogs = $this->backlogReader->read($lastBackLogId, $this->batchSize);
 
-        $output->writeln(sprintf('Current last backlog id: %d', $lastBackLogId));
+        $output->writeln(\sprintf('Current last backlog id: %d', $lastBackLogId));
 
         $io = new SymfonyStyle($input, $output);
 
@@ -81,20 +97,17 @@ protected function execute(InputInterface $input, OutputInterface $output)
             return 0;
         }
 
-        /** @var Backlog $last */
-        $last = $backlogs[\count($backlogs) - 1];
-        $reader->setLastBacklogId($last->getId());
-        $shops = $this->container->get(\Shopware\Bundle\ESIndexingBundle\IdentifierSelector::class)->getShops();
-        foreach ($shops as $shop) {
+        foreach ($this->identifierSelector->getShops() as $shop) {
             foreach ($this->mappings as $mapping) {
-                $index = $this->container->get(\Shopware\Bundle\ESIndexingBundle\IndexFactory::class)->createShopIndex($shop, $mapping->getType());
+                $index = $this->indexFactory->createShopIndex($shop, $mapping->getType());
 
-                $this->container->get(\Shopware\Bundle\ESIndexingBundle\BacklogProcessorInterface::class)
-                    ->process($index, $backlogs);
+                $this->backlogProcessor->process($index, $backlogs);
             }
         }
+        $last = $backlogs[array_key_last($backlogs)];
+        $this->backlogReader->setLastBacklogId($last->getId());
 
-        $io->success(sprintf('Synchronized %d items', \count($backlogs)));
+        $io->success(\sprintf('Synchronized %d items', \count($backlogs)));
 
         return 0;
     }
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Commands/IndexCleanupCommand.php b/engine/Shopware/Bundle/ESIndexingBundle/Commands/IndexCleanupCommand.php
index 993c9a93348..57b3d057f05 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/Commands/IndexCleanupCommand.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/Commands/IndexCleanupCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\Commands;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Commands/IndexPopulateCommand.php b/engine/Shopware/Bundle/ESIndexingBundle/Commands/IndexPopulateCommand.php
index 47d4dd7c374..9b3b53386c6 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/Commands/IndexPopulateCommand.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/Commands/IndexPopulateCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\Commands;
@@ -147,7 +147,7 @@ private function getShops(InputInterface $input, OutputInterface $output): array
 
         $shopIdsNotFound = array_diff_key($shopIds, $existingShopIds);
         if ($shopIdsNotFound !== []) {
-            $output->writeln(sprintf('<error>Shops with following IDs not found: %s</error>', implode(', ', $shopIdsNotFound)));
+            $output->writeln(\sprintf('<error>Shops with following IDs not found: %s</error>', implode(', ', $shopIdsNotFound)));
         }
 
         return $shops;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Commands/SwitchAliasCommand.php b/engine/Shopware/Bundle/ESIndexingBundle/Commands/SwitchAliasCommand.php
index d0b3121fd54..7d6da87b84f 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/Commands/SwitchAliasCommand.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/Commands/SwitchAliasCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\Commands;
@@ -114,7 +114,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $exist = $client->indices()->exists(['index' => $indexName]);
         if (!$exist) {
-            throw new RuntimeException(sprintf('Index "%s" does not exist', $indexName));
+            throw new RuntimeException(\sprintf('Index "%s" does not exist', $indexName));
         }
 
         $actions = [
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Console/ConsoleEvaluationHelper.php b/engine/Shopware/Bundle/ESIndexingBundle/Console/ConsoleEvaluationHelper.php
index e4de19a0d1d..59b69eb3fe2 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/Console/ConsoleEvaluationHelper.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/Console/ConsoleEvaluationHelper.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\Console;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Console/ConsoleProgressHelper.php b/engine/Shopware/Bundle/ESIndexingBundle/Console/ConsoleProgressHelper.php
index cb022c1d73b..2bdb07aab59 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/Console/ConsoleProgressHelper.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/Console/ConsoleProgressHelper.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\Console;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Console/EvaluationHelperInterface.php b/engine/Shopware/Bundle/ESIndexingBundle/Console/EvaluationHelperInterface.php
index be3199c444f..853ba573cda 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/Console/EvaluationHelperInterface.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/Console/EvaluationHelperInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\Console;
@@ -30,6 +30,8 @@ interface EvaluationHelperInterface
 {
     /**
      * @param bool $active
+     *
+     * @return static
      */
     public function setActive($active);
 
@@ -40,6 +42,8 @@ public function getActive();
 
     /**
      * @param bool $stopOnError
+     *
+     * @return static
      */
     public function setStopOnError($stopOnError);
 
@@ -48,9 +52,18 @@ public function setStopOnError($stopOnError);
      */
     public function getStopOnError();
 
+    /**
+     * @return static
+     */
     public function setOutput(OutputInterface $output);
 
+    /**
+     * @return void
+     */
     public function addResult(array $data);
 
+    /**
+     * @return void
+     */
     public function finish();
 }
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Console/ProgressHelperInterface.php b/engine/Shopware/Bundle/ESIndexingBundle/Console/ProgressHelperInterface.php
index 3ad4809c1bb..1270066ee1e 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/Console/ProgressHelperInterface.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/Console/ProgressHelperInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\Console;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/DataIndexerInterface.php b/engine/Shopware/Bundle/ESIndexingBundle/DataIndexerInterface.php
index 5dfb0cc9df1..06f6ca3edbb 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/DataIndexerInterface.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/DataIndexerInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle;
@@ -29,6 +29,9 @@
 
 interface DataIndexerInterface
 {
+    /**
+     * @return void
+     */
     public function populate(ShopIndex $index, ProgressHelperInterface $progress);
 
     /**
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/DependencyInjection/CompilerPass/VersionCompilerPass.php b/engine/Shopware/Bundle/ESIndexingBundle/DependencyInjection/CompilerPass/VersionCompilerPass.php
index 2d8840734c5..03b6930a684 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/DependencyInjection/CompilerPass/VersionCompilerPass.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/DependencyInjection/CompilerPass/VersionCompilerPass.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\DependencyInjection\CompilerPass;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/DependencyInjection/Factory/ShopIndexerFactory.php b/engine/Shopware/Bundle/ESIndexingBundle/DependencyInjection/Factory/ShopIndexerFactory.php
index 003965e6261..3ea46ea8947 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/DependencyInjection/Factory/ShopIndexerFactory.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/DependencyInjection/Factory/ShopIndexerFactory.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\DependencyInjection\Factory;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/DependencyInjection/Factory/TextMappingFactory.php b/engine/Shopware/Bundle/ESIndexingBundle/DependencyInjection/Factory/TextMappingFactory.php
index a94c878bf50..a6b8485536e 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/DependencyInjection/Factory/TextMappingFactory.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/DependencyInjection/Factory/TextMappingFactory.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\DependencyInjection\Factory;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/DependencyInjection/services.xml b/engine/Shopware/Bundle/ESIndexingBundle/DependencyInjection/services.xml
index 23186f3acd1..9d8de8cad0d 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/DependencyInjection/services.xml
+++ b/engine/Shopware/Bundle/ESIndexingBundle/DependencyInjection/services.xml
@@ -12,10 +12,11 @@
             <argument>%shopware.es.client%</argument>
             <argument type="service" id="eslogger"/>
             <argument type="service" id="Shopware\Bundle\ESIndexingBundle\Console\EvaluationHelperInterface"/>
-            <deprecated>The "shopware_elastic_search.client.logger" service is deprecated. Use "%service_id%" instead</deprecated>
         </service>
 
-        <service id="shopware_elastic_search.client.logger" alias="shopware_elastic_search.client"/>
+        <service id="shopware_elastic_search.client.logger" alias="shopware_elastic_search.client">
+            <deprecated>The "%service_id%" service is deprecated. Use "%alias_id%" instead</deprecated>
+        </service>
 
         <service id="shopware_elastic_search.shop_indexer_factory"
                  class="Shopware\Bundle\ESIndexingBundle\DependencyInjection\Factory\ShopIndexerFactory">
@@ -229,6 +230,10 @@
                  id="shopware_elastic_search.commands.backlog_sync_command">
             <argument>%shopware.es.batchsize%</argument>
             <argument type="tagged" tag="shopware_elastic_search.mapping"/>
+            <argument type="service" id="Shopware\Bundle\ESIndexingBundle\BacklogReader"/>
+            <argument type="service" id="Shopware\Bundle\ESIndexingBundle\IdentifierSelector"/>
+            <argument type="service" id="Shopware\Bundle\ESIndexingBundle\IndexFactory"/>
+            <argument type="service" id="Shopware\Bundle\ESIndexingBundle\BacklogProcessorInterface"/>
 
             <tag name="console.command" command="sw:es:backlog:sync"/>
         </service>
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/ESIndexingBundle.php b/engine/Shopware/Bundle/ESIndexingBundle/ESIndexingBundle.php
index 17cc935de76..ff149a5ca61 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/ESIndexingBundle.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/ESIndexingBundle.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/EsClientBuilder.php b/engine/Shopware/Bundle/ESIndexingBundle/EsClientBuilder.php
index c2888b506ad..e2f90fb432c 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/EsClientBuilder.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/EsClientBuilder.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/EsClientInterface.php b/engine/Shopware/Bundle/ESIndexingBundle/EsClientInterface.php
index a19134241d7..3120bfe77c5 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/EsClientInterface.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/EsClientInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle;
@@ -29,13 +29,34 @@
 
 interface EsClientInterface
 {
+    /**
+     * @return void
+     */
     public function setLogger(LoggerInterface $logger);
 
+    /**
+     * @return void
+     */
     public function setEvaluation(EvaluationHelperInterface $evaluation);
 
+    /**
+     * @param array<string, mixed> $params
+     *
+     * @return array<string, mixed>
+     */
     public function info($params = []);
 
+    /**
+     * @param array<string, mixed> $params
+     *
+     * @return array<string, mixed>
+     */
     public function bulk($params = []);
 
+    /**
+     * @param array<string, mixed> $params
+     *
+     * @return array<string, mixed>
+     */
     public function search($params = []);
 }
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/EsClientLogger.php b/engine/Shopware/Bundle/ESIndexingBundle/EsClientLogger.php
index d983cd432c3..6064e7237dc 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/EsClientLogger.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/EsClientLogger.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/EsSearch.php b/engine/Shopware/Bundle/ESIndexingBundle/EsSearch.php
index 65909aebd57..1f30d541da9 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/EsSearch.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/EsSearch.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/FieldMapping.php b/engine/Shopware/Bundle/ESIndexingBundle/FieldMapping.php
index 78f846462e8..1e4e451af90 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/FieldMapping.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/FieldMapping.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/FieldMappingInterface.php b/engine/Shopware/Bundle/ESIndexingBundle/FieldMappingInterface.php
index c26360d939e..19b4498781a 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/FieldMappingInterface.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/FieldMappingInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/IdentifierSelector.php b/engine/Shopware/Bundle/ESIndexingBundle/IdentifierSelector.php
index e49d092e852..f6faf634440 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/IdentifierSelector.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/IdentifierSelector.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/IndexFactory.php b/engine/Shopware/Bundle/ESIndexingBundle/IndexFactory.php
index 45ffc406041..ad5d174f357 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/IndexFactory.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/IndexFactory.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/IndexFactoryInterface.php b/engine/Shopware/Bundle/ESIndexingBundle/IndexFactoryInterface.php
index 4973bbcf1f8..e24dee6cc7f 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/IndexFactoryInterface.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/IndexFactoryInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/LastIdQuery.php b/engine/Shopware/Bundle/ESIndexingBundle/LastIdQuery.php
index adb3e4d8523..94e7a6f400c 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/LastIdQuery.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/LastIdQuery.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle;
@@ -75,7 +75,7 @@ public function fetchCount()
      */
     public function getQuery()
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         return $this->query;
     }
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/MappingInterface.php b/engine/Shopware/Bundle/ESIndexingBundle/MappingInterface.php
index 671a5c39bb1..3ea1a9ce6d4 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/MappingInterface.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/MappingInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductConfigurationLoader.php b/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductConfigurationLoader.php
index d8816a85528..df88d02d0c3 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductConfigurationLoader.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductConfigurationLoader.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\Product;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductIndexer.php b/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductIndexer.php
index e18c35b5270..df6ffbf3b9a 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductIndexer.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductIndexer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\Product;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductListingVariationLoader.php b/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductListingVariationLoader.php
index d1e4683ea85..df8b941e306 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductListingVariationLoader.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductListingVariationLoader.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\Product;
@@ -88,7 +88,7 @@ public function getListingPrices(
         Shop $shop,
         array $products,
         array $configurations,
-        VariantFacet $variantFacet = null
+        ?VariantFacet $variantFacet = null
     ) {
         $combinationPrices = [];
 
@@ -156,7 +156,7 @@ public function getListingPrices(
     public function getAvailability(
         array $products,
         array $configurations,
-        VariantFacet $variantFacet = null
+        ?VariantFacet $variantFacet = null
     ) {
         $combinationAvailability = [];
         $availability = $this->fetchAvailability($products);
@@ -309,7 +309,7 @@ private function nestedArrayCombinations(array $groups, array $onlyFirst, array
                     $tmp = array_merge($item, [$index => (int) $option->getId()]);
                     sort($tmp, SORT_NUMERIC);
 
-                    //check if this combination is a available combination (out of stock, not active)
+                    // check if this combination is a available combination (out of stock, not active)
                     $isAvailable = false;
                     foreach ($availability as $available) {
                         $available = '-' . $available . '-';
@@ -320,7 +320,7 @@ private function nestedArrayCombinations(array $groups, array $onlyFirst, array
                                 $allMatch = false;
                             }
                         }
-                        //all options matched? combination is available, break availability check
+                        // all options matched? combination is available, break availability check
                         if ($allMatch) {
                             $isAvailable = true;
                             break;
@@ -550,7 +550,7 @@ private function getCombinationPrices(
         array $configuration,
         array $prices,
         array $combinations,
-        VariantFacet $variantFacet = null
+        ?VariantFacet $variantFacet = null
     ): array {
         $cheapestPrices = [];
 
@@ -573,17 +573,17 @@ private function getCombinationPrices(
             // size combination => only consider prices with same size
             // size + color combination => only consider prices with same size and color like the current product
             // Only consider prices without the groups which should not expand
-            $tmp = array_values(array_keys(
+            $tmp = array_keys(
                 array_intersect(array_intersect(array_flip($options), $combination), $expandGroupIds)
-            ));
+            );
             sort($tmp, SORT_NUMERIC);
 
             // Get the options of the groups which should not expand
-            $excludedOptions = array_values(array_keys(
+            $excludedOptions = array_keys(
                 array_diff(array_intersect(array_flip($options), $combination), $expandGroupIds)
-            ));
+            );
 
-            //filter prices which has configuration matches the current variant configuration
+            // filter prices which has configuration matches the current variant configuration
             $affected = array_filter($prices, function (array $price) use ($tmp, $excludedOptions) {
                 $diff = array_values(array_intersect(array_diff($price['options'], $excludedOptions), $tmp));
 
@@ -592,8 +592,8 @@ private function getCombinationPrices(
 
             $price = array_column($affected, 'price');
 
-            //build combination key by group ids
-            //store front filters to filtered group "sort by price for `color`"
+            // build combination key by group ids
+            // store front filters to filtered group "sort by price for `color`"
             $key = 'g' . implode('-', $combination);
 
             if (!empty($price)) {
@@ -608,7 +608,7 @@ private function getCombinationAvailability(
         array $configuration,
         array $availabilities,
         array $combinations,
-        VariantFacet $variantFacet = null
+        ?VariantFacet $variantFacet = null
     ): array {
         $availabilityList = [];
 
@@ -626,14 +626,14 @@ private function getCombinationAvailability(
         foreach ($combinations as $combination) {
             sort($combination, SORT_NUMERIC);
 
-            $tmp = array_values(array_keys(
+            $tmp = array_keys(
                 array_intersect(array_intersect(array_flip($options), $combination), $expandGroupIds)
-            ));
+            );
             sort($tmp, SORT_NUMERIC);
 
-            $excludedOptions = array_values(array_keys(
+            $excludedOptions = array_keys(
                 array_diff(array_intersect(array_flip($options), $combination), $expandGroupIds)
-            ));
+            );
 
             $affected = array_filter($availabilities, function (array $price) use ($tmp, $excludedOptions) {
                 $diff = array_values(array_intersect(array_diff($price['options'], $excludedOptions), $tmp));
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductManualPositionLoader.php b/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductManualPositionLoader.php
index a9666c00280..fe9788a1b27 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductManualPositionLoader.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductManualPositionLoader.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\Product;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductManualPositionLoaderInterface.php b/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductManualPositionLoaderInterface.php
index 2a97b6bd8ee..cd38b80c613 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductManualPositionLoaderInterface.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductManualPositionLoaderInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\Product;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductMapping.php b/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductMapping.php
index b28c2cc1f6d..6a20a405b8b 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductMapping.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductMapping.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\Product;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductProvider.php b/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductProvider.php
index 339edea4b3f..edd1f1618c6 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductProvider.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductProvider.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\Product;
@@ -345,7 +345,7 @@ protected function addVariantSearchDetails(
         }
     }
 
-    private function formatDate(DateTimeInterface $date = null): ?string
+    private function formatDate(?DateTimeInterface $date = null): ?string
     {
         return !$date ? null : $date->format('Y-m-d');
     }
@@ -368,16 +368,13 @@ private function getCategories($products): array
             ->where('mapping.articleID IN (:ids)')
             ->setParameter(':ids', $ids, Connection::PARAM_INT_ARRAY);
 
-        $data = $query->execute()->fetchAll(PDO::FETCH_ASSOC);
+        $data = $query->execute()->fetchAllAssociative();
 
         $result = [];
         foreach ($data as $row) {
             $productId = (int) $row['productId'];
-            $categories = [];
-            if (isset($result[$productId])) {
-                $categories = $result[$productId];
-            }
-            $temp = explode('|', $row['path']);
+            $categories = $result[$productId] ?? [];
+            $temp = explode('|', $row['path'] ?? '');
             $temp[] = $row['id'];
 
             $result[$productId] = array_merge($categories, $temp);
@@ -470,7 +467,7 @@ private function getCalculatedPrices(Shop $shop, array $products, array $priceRu
                 $customerGroup = $context->getCurrentCustomerGroup()->getKey();
                 $key = $customerGroup . '_' . $context->getCurrency()->getId();
 
-                $rule = $rules[$context->getFallbackCustomerGroup()->getKey()];
+                $rule = $rules[$context->getFallbackCustomerGroup()->getKey()] ?? null;
                 if (isset($rules[$customerGroup])) {
                     $rule = $rules[$customerGroup];
                 }
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductQueryFactory.php b/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductQueryFactory.php
index 6fa1e44e9cc..5b2ff865daf 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductQueryFactory.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductQueryFactory.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\Product;
@@ -82,7 +82,7 @@ public function createCategoryQuery($categoryId, $limit = null)
      */
     public function createPriceIdQuery($priceIds, $limit = null)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         $dbal = $this->createQuery($limit)
             ->innerJoin('variant', 's_articles_details', 'subVariant', 'subVariant.articleID = variant.articleID')
@@ -112,7 +112,7 @@ public function createUnitIdQuery($unitIds, $limit = null)
      */
     public function createVoteIdQuery($voteIds, $limit = null)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         $dbal = $this->createQuery($limit)
             ->innerJoin('product', 's_articles_vote', 'vote', 'vote.articleID = product.id')
@@ -141,7 +141,7 @@ public function createProductIdQuery($productIds, $limit = null)
      */
     public function createVariantIdQuery($variantIds, $limit = null)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         $dbal = $this->createQuery($limit)
             ->innerJoin('variant', 's_articles_details', 'subVariant', 'subVariant.articleID = variant.articleID')
@@ -182,7 +182,7 @@ public function createManufacturerQuery($manufacturerIds, $limit = null)
      */
     public function createProductCategoryQuery($categoryIds, $limit = null)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         $dbal = $this->createQuery($limit)
             ->innerJoin('variant', 's_articles_categories_ro', 'shopProducts', 'shopProducts.articleID = variant.articleID')
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductQueryFactoryInterface.php b/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductQueryFactoryInterface.php
index f262e7209d0..6ca4b4f176e 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductQueryFactoryInterface.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductQueryFactoryInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\Product;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductSynchronizer.php b/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductSynchronizer.php
index 2fe8f488a6a..37cde6382b3 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductSynchronizer.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductSynchronizer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\Product;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Property/PropertyIndexer.php b/engine/Shopware/Bundle/ESIndexingBundle/Property/PropertyIndexer.php
index 2026bc34ab6..03480841417 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/Property/PropertyIndexer.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/Property/PropertyIndexer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\Property;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Property/PropertyMapping.php b/engine/Shopware/Bundle/ESIndexingBundle/Property/PropertyMapping.php
index 5e3f43ccc1a..f0e9f2e1473 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/Property/PropertyMapping.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/Property/PropertyMapping.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\Property;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Property/PropertyProvider.php b/engine/Shopware/Bundle/ESIndexingBundle/Property/PropertyProvider.php
index 34c2afadd68..07b8f9287c8 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/Property/PropertyProvider.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/Property/PropertyProvider.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\Property;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Property/PropertyQueryFactory.php b/engine/Shopware/Bundle/ESIndexingBundle/Property/PropertyQueryFactory.php
index 7bb82d039bb..2cead479817 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/Property/PropertyQueryFactory.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/Property/PropertyQueryFactory.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\Property;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Property/PropertySynchronizer.php b/engine/Shopware/Bundle/ESIndexingBundle/Property/PropertySynchronizer.php
index ac5daf0807f..36ff1264df6 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/Property/PropertySynchronizer.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/Property/PropertySynchronizer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\Property;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/ProviderInterface.php b/engine/Shopware/Bundle/ESIndexingBundle/ProviderInterface.php
index 643882cee8c..f7f4dd36a08 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/ProviderInterface.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/ProviderInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/SettingsInterface.php b/engine/Shopware/Bundle/ESIndexingBundle/SettingsInterface.php
index fead4e7c456..5494f7c4165 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/SettingsInterface.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/SettingsInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/ShopAnalyzer.php b/engine/Shopware/Bundle/ESIndexingBundle/ShopAnalyzer.php
index 6b54612dcd8..fe7040371e5 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/ShopAnalyzer.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/ShopAnalyzer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/ShopAnalyzerInterface.php b/engine/Shopware/Bundle/ESIndexingBundle/ShopAnalyzerInterface.php
index ddffd380fb2..44389773879 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/ShopAnalyzerInterface.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/ShopAnalyzerInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/ShopIndexer.php b/engine/Shopware/Bundle/ESIndexingBundle/ShopIndexer.php
index c668c17ca47..51bbbdb4998 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/ShopIndexer.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/ShopIndexer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle;
@@ -89,7 +89,7 @@ public function __construct(
      *
      * @throws RuntimeException
      */
-    public function index(Shop $shop, ProgressHelperInterface $helper, array $indexNames = null)
+    public function index(Shop $shop, ProgressHelperInterface $helper, ?array $indexNames = null)
     {
         $lastBacklogId = $this->backlogReader->getLastBacklogId();
 
@@ -134,7 +134,7 @@ private function createIndex(IndexConfiguration $configuration, ShopIndex $index
     {
         $exist = $this->client->indices()->exists(['index' => $configuration->getName()]);
         if ($exist) {
-            throw new RuntimeException(sprintf('ElasticSearch index %s already exist.', $configuration->getName()));
+            throw new RuntimeException(\sprintf('ElasticSearch index %s already exist.', $configuration->getName()));
         }
 
         $mergedSettings = [
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/ShopIndexerInterface.php b/engine/Shopware/Bundle/ESIndexingBundle/ShopIndexerInterface.php
index b96f58e1a6c..c6d45abb27b 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/ShopIndexerInterface.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/ShopIndexerInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle;
@@ -29,10 +29,15 @@
 
 interface ShopIndexerInterface
 {
-    public function index(Shop $shop, ProgressHelperInterface $helper, array $indexes = null);
+    /**
+     * @return void
+     */
+    public function index(Shop $shop, ProgressHelperInterface $helper, ?array $indexes = null);
 
     /**
      * Remove unused indices
+     *
+     * @return void
      */
     public function cleanupIndices();
 }
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Struct/Backlog.php b/engine/Shopware/Bundle/ESIndexingBundle/Struct/Backlog.php
index 88810f8ffc7..9b819b82b31 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/Struct/Backlog.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/Struct/Backlog.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\Struct;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Struct/IndexConfiguration.php b/engine/Shopware/Bundle/ESIndexingBundle/Struct/IndexConfiguration.php
index 71e12283b08..a4fcc19c842 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/Struct/IndexConfiguration.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/Struct/IndexConfiguration.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\Struct;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Struct/Product.php b/engine/Shopware/Bundle/ESIndexingBundle/Struct/Product.php
index a93624eefdb..355a5e1e5c3 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/Struct/Product.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/Struct/Product.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\Struct;
@@ -246,7 +246,7 @@ public function getVisibility()
         return $this->visibility;
     }
 
-    public function setAvailableCombinations(array $combinations = null)
+    public function setAvailableCombinations(?array $combinations = null)
     {
         $this->availableCombinations = $combinations;
     }
@@ -259,7 +259,7 @@ public function getAvailableCombinations()
     /**
      * @param Group[]|null $fullConfiguration
      */
-    public function setFullConfiguration(array $fullConfiguration = null)
+    public function setFullConfiguration(?array $fullConfiguration = null)
     {
         $this->fullConfiguration = $fullConfiguration;
     }
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Struct/ShopIndex.php b/engine/Shopware/Bundle/ESIndexingBundle/Struct/ShopIndex.php
index bb8026054a5..386c6868220 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/Struct/ShopIndex.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/Struct/ShopIndex.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\Struct;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Subscriber/DomainBacklogSubscriber.php b/engine/Shopware/Bundle/ESIndexingBundle/Subscriber/DomainBacklogSubscriber.php
index 448a4b48a07..86f23b72b2b 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/Subscriber/DomainBacklogSubscriber.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/Subscriber/DomainBacklogSubscriber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\Subscriber;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Subscriber/ORMBacklogSaveSubscriber.php b/engine/Shopware/Bundle/ESIndexingBundle/Subscriber/ORMBacklogSaveSubscriber.php
index 16675fdddde..467c12bd7d9 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/Subscriber/ORMBacklogSaveSubscriber.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/Subscriber/ORMBacklogSaveSubscriber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\Subscriber;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Subscriber/ORMBacklogSubscriber.php b/engine/Shopware/Bundle/ESIndexingBundle/Subscriber/ORMBacklogSubscriber.php
index 84099fc9496..6240ac593db 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/Subscriber/ORMBacklogSubscriber.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/Subscriber/ORMBacklogSubscriber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\Subscriber;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/SynchronizerInterface.php b/engine/Shopware/Bundle/ESIndexingBundle/SynchronizerInterface.php
index 6ae563a0b72..d88fd38c84a 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/SynchronizerInterface.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/SynchronizerInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle;
@@ -31,6 +31,8 @@ interface SynchronizerInterface
 {
     /**
      * @param Backlog[] $backlogs
+     *
+     * @return void
      */
     public function synchronize(ShopIndex $shopIndex, array $backlogs);
 
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/TextMapping/TextMappingES6.php b/engine/Shopware/Bundle/ESIndexingBundle/TextMapping/TextMappingES6.php
index e3c06c67ac8..adc47c016da 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/TextMapping/TextMappingES6.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/TextMapping/TextMappingES6.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle\TextMapping;
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/TextMappingInterface.php b/engine/Shopware/Bundle/ESIndexingBundle/TextMappingInterface.php
index 5609ecfed71..850cd3c8e99 100644
--- a/engine/Shopware/Bundle/ESIndexingBundle/TextMappingInterface.php
+++ b/engine/Shopware/Bundle/ESIndexingBundle/TextMappingInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\ESIndexingBundle;
diff --git a/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/ArticleComponentHandler.php b/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/ArticleComponentHandler.php
index 8ecb586fcdb..2d3be2b897f 100644
--- a/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/ArticleComponentHandler.php
+++ b/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/ArticleComponentHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\ComponentHandler;
diff --git a/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/ArticleSliderComponentHandler.php b/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/ArticleSliderComponentHandler.php
index fa36e1a13d4..1d3ad587cf5 100644
--- a/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/ArticleSliderComponentHandler.php
+++ b/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/ArticleSliderComponentHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\ComponentHandler;
@@ -121,7 +121,7 @@ public function prepare(PrepareDataCollection $collection, Element $element, Sho
                 break;
 
             case self::TYPE_STATIC_PRODUCT:
-                $products = $element->getConfig()->get(self::SELECTED_PRODUCTS, '');
+                $products = $element->getConfig()->get(self::SELECTED_PRODUCTS, '') ?? '';
                 $productNumbers = array_filter(explode('|', $products));
                 if (empty($productNumbers)) {
                     $productNumbers = [];
@@ -130,7 +130,7 @@ public function prepare(PrepareDataCollection $collection, Element $element, Sho
                 $collection->getBatchRequest()->setProductNumbers($key, $productNumbers);
                 break;
             case self::TYPE_STATIC_VARIANT:
-                $productVariants = $element->getConfig()->get(self::SELECTED_VARIANTS, '');
+                $productVariants = $element->getConfig()->get(self::SELECTED_VARIANTS, '') ?? '';
                 $productNumbers = array_filter(explode('|', $productVariants));
                 if (empty($productNumbers)) {
                     $productNumbers = [];
@@ -161,7 +161,7 @@ public function handle(ResolvedDataCollection $collection, Element $element, Sho
                 break;
 
             case self::TYPE_STATIC_PRODUCT:
-                $products = $element->getConfig()->get(self::SELECTED_PRODUCTS, '');
+                $products = $element->getConfig()->get(self::SELECTED_PRODUCTS, '') ?? '';
                 $productNumbers = array_filter(explode('|', $products));
                 $listProducts = $collection->getBatchResult()->get($key);
 
@@ -176,7 +176,7 @@ public function handle(ResolvedDataCollection $collection, Element $element, Sho
                 $element->getData()->set('products', $products);
                 break;
             case self::TYPE_STATIC_VARIANT:
-                $products = $element->getConfig()->get(self::SELECTED_VARIANTS, '');
+                $products = $element->getConfig()->get(self::SELECTED_VARIANTS, '') ?? '';
                 $productNumbers = array_filter(explode('|', $products));
                 $listProducts = $collection->getBatchResult()->get($key);
                 $listProducts = $this->additionalTextService->buildAdditionalTextLists($listProducts, $context);
diff --git a/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/BannerComponentHandler.php b/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/BannerComponentHandler.php
index 63cb4084a10..0f622b96f03 100644
--- a/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/BannerComponentHandler.php
+++ b/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/BannerComponentHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\ComponentHandler;
diff --git a/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/BannerSliderComponentHandler.php b/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/BannerSliderComponentHandler.php
index c35b0773bee..ea3c34a32d4 100644
--- a/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/BannerSliderComponentHandler.php
+++ b/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/BannerSliderComponentHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\ComponentHandler;
diff --git a/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/BlogComponentHandler.php b/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/BlogComponentHandler.php
index 21fd4312fc5..b2fa2698330 100644
--- a/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/BlogComponentHandler.php
+++ b/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/BlogComponentHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\ComponentHandler;
diff --git a/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/CategoryTeaserComponentHandler.php b/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/CategoryTeaserComponentHandler.php
index 5642b42a15c..7bfc0968910 100644
--- a/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/CategoryTeaserComponentHandler.php
+++ b/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/CategoryTeaserComponentHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\ComponentHandler;
diff --git a/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/ComponentHandlerInterface.php b/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/ComponentHandlerInterface.php
index 41cd43415f6..2e3ab459722 100644
--- a/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/ComponentHandlerInterface.php
+++ b/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/ComponentHandlerInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\ComponentHandler;
diff --git a/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/ContentTypeComponentHandler.php b/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/ContentTypeComponentHandler.php
index 24709e040b8..5bf6eaca078 100644
--- a/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/ContentTypeComponentHandler.php
+++ b/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/ContentTypeComponentHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\ComponentHandler;
@@ -65,8 +65,13 @@ public function prepare(PrepareDataCollection $collection, Element $element, Sho
 
     public function handle(ResolvedDataCollection $collection, Element $element, ShopContextInterface $context): void
     {
-        /** @var RepositoryInterface $repository */
-        $repository = $this->container->get('shopware.bundle.content_type.' . $element->getConfig()->get(self::CONTENT_TYPE_KEY));
+        $repository = $this->container->get(
+            'shopware.bundle.content_type.' . $element->getConfig()->get(self::CONTENT_TYPE_KEY),
+            ContainerInterface::NULL_ON_INVALID_REFERENCE
+        );
+        if (!$repository instanceof RepositoryInterface) {
+            return;
+        }
 
         $mode = (int) $element->getConfig()->get(self::MODE_KEY);
 
diff --git a/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/EventComponentHandler.php b/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/EventComponentHandler.php
index 5eaa86dcf49..491c19b536d 100644
--- a/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/EventComponentHandler.php
+++ b/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/EventComponentHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\ComponentHandler;
@@ -77,7 +77,7 @@ private function deprecationLog(Element $element): void
     {
         $types = ['emotion-components-html-code', 'emotion-components-html-element', 'emotion-components-iframe', 'emotion-components-youtube'];
         if (!\in_array($element->getComponent()->getType(), $types, true)) {
-            $message = sprintf('%s is deprecated since 5.3 and will be removed with 6.0. Implement a ComponentHandler instead for performance benefit.', __CLASS__);
+            $message = \sprintf('%s is deprecated since 5.3 and will be removed with 6.0. Implement a ComponentHandler instead for performance benefit.', __CLASS__);
             trigger_error($message, E_USER_DEPRECATED);
         }
     }
diff --git a/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/Html5VideoComponentHandler.php b/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/Html5VideoComponentHandler.php
index c60ff3788c5..9babec06a4d 100644
--- a/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/Html5VideoComponentHandler.php
+++ b/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/Html5VideoComponentHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\ComponentHandler;
diff --git a/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/HtmlCodeComponentHandler.php b/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/HtmlCodeComponentHandler.php
index b07a9f99d1d..d76978360c2 100644
--- a/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/HtmlCodeComponentHandler.php
+++ b/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/HtmlCodeComponentHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\ComponentHandler;
diff --git a/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/HtmlElementComponentHandler.php b/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/HtmlElementComponentHandler.php
index a9dc88ff8e9..a7e42fcdcc7 100644
--- a/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/HtmlElementComponentHandler.php
+++ b/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/HtmlElementComponentHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\ComponentHandler;
diff --git a/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/IFrameComponentHandler.php b/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/IFrameComponentHandler.php
index b20b0fcc287..ed566dd6393 100644
--- a/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/IFrameComponentHandler.php
+++ b/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/IFrameComponentHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\ComponentHandler;
diff --git a/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/ManufacturerSliderComponentHandler.php b/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/ManufacturerSliderComponentHandler.php
index b4854051661..eb64463d952 100644
--- a/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/ManufacturerSliderComponentHandler.php
+++ b/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/ManufacturerSliderComponentHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\ComponentHandler;
diff --git a/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/YoutubeComponentHandler.php b/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/YoutubeComponentHandler.php
index 0c1135334c4..274522a0cb4 100644
--- a/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/YoutubeComponentHandler.php
+++ b/engine/Shopware/Bundle/EmotionBundle/ComponentHandler/YoutubeComponentHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\ComponentHandler;
diff --git a/engine/Shopware/Bundle/EmotionBundle/DependencyInjection/EmotionCompilerPass.php b/engine/Shopware/Bundle/EmotionBundle/DependencyInjection/EmotionCompilerPass.php
index e5b7ced2882..2f090964c40 100644
--- a/engine/Shopware/Bundle/EmotionBundle/DependencyInjection/EmotionCompilerPass.php
+++ b/engine/Shopware/Bundle/EmotionBundle/DependencyInjection/EmotionCompilerPass.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\DependencyInjection;
diff --git a/engine/Shopware/Bundle/EmotionBundle/EmotionBundle.php b/engine/Shopware/Bundle/EmotionBundle/EmotionBundle.php
index bfbc84b3db6..94701aad70a 100644
--- a/engine/Shopware/Bundle/EmotionBundle/EmotionBundle.php
+++ b/engine/Shopware/Bundle/EmotionBundle/EmotionBundle.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle;
diff --git a/engine/Shopware/Bundle/EmotionBundle/Exception/ComponentHandlerNotFoundException.php b/engine/Shopware/Bundle/EmotionBundle/Exception/ComponentHandlerNotFoundException.php
index 2c83898afb2..b28de9cf9aa 100644
--- a/engine/Shopware/Bundle/EmotionBundle/Exception/ComponentHandlerNotFoundException.php
+++ b/engine/Shopware/Bundle/EmotionBundle/Exception/ComponentHandlerNotFoundException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\Exception;
diff --git a/engine/Shopware/Bundle/EmotionBundle/Service/DataCollectionResolver.php b/engine/Shopware/Bundle/EmotionBundle/Service/DataCollectionResolver.php
index 463fb210fdb..b4d5c6e66a7 100644
--- a/engine/Shopware/Bundle/EmotionBundle/Service/DataCollectionResolver.php
+++ b/engine/Shopware/Bundle/EmotionBundle/Service/DataCollectionResolver.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\Service;
diff --git a/engine/Shopware/Bundle/EmotionBundle/Service/DataCollectionResolverInterface.php b/engine/Shopware/Bundle/EmotionBundle/Service/DataCollectionResolverInterface.php
index dbd494e4732..2fa1192d421 100644
--- a/engine/Shopware/Bundle/EmotionBundle/Service/DataCollectionResolverInterface.php
+++ b/engine/Shopware/Bundle/EmotionBundle/Service/DataCollectionResolverInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\Service;
diff --git a/engine/Shopware/Bundle/EmotionBundle/Service/EmotionElementService.php b/engine/Shopware/Bundle/EmotionBundle/Service/EmotionElementService.php
index 97eec4bae3c..2c8df85bbad 100644
--- a/engine/Shopware/Bundle/EmotionBundle/Service/EmotionElementService.php
+++ b/engine/Shopware/Bundle/EmotionBundle/Service/EmotionElementService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\Service;
diff --git a/engine/Shopware/Bundle/EmotionBundle/Service/EmotionElementServiceInterface.php b/engine/Shopware/Bundle/EmotionBundle/Service/EmotionElementServiceInterface.php
index 877b2350280..d9c3930822b 100644
--- a/engine/Shopware/Bundle/EmotionBundle/Service/EmotionElementServiceInterface.php
+++ b/engine/Shopware/Bundle/EmotionBundle/Service/EmotionElementServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\Service;
diff --git a/engine/Shopware/Bundle/EmotionBundle/Service/EmotionService.php b/engine/Shopware/Bundle/EmotionBundle/Service/EmotionService.php
index 3de6daa65db..008ddfbaa17 100644
--- a/engine/Shopware/Bundle/EmotionBundle/Service/EmotionService.php
+++ b/engine/Shopware/Bundle/EmotionBundle/Service/EmotionService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\Service;
diff --git a/engine/Shopware/Bundle/EmotionBundle/Service/EmotionServiceInterface.php b/engine/Shopware/Bundle/EmotionBundle/Service/EmotionServiceInterface.php
index 1ed41c6f8a3..03eb5e089ae 100644
--- a/engine/Shopware/Bundle/EmotionBundle/Service/EmotionServiceInterface.php
+++ b/engine/Shopware/Bundle/EmotionBundle/Service/EmotionServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\Service;
diff --git a/engine/Shopware/Bundle/EmotionBundle/Service/Gateway/EmotionElementGateway.php b/engine/Shopware/Bundle/EmotionBundle/Service/Gateway/EmotionElementGateway.php
index 74ef0b33ecf..da06ae4bb00 100644
--- a/engine/Shopware/Bundle/EmotionBundle/Service/Gateway/EmotionElementGateway.php
+++ b/engine/Shopware/Bundle/EmotionBundle/Service/Gateway/EmotionElementGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\Service\Gateway;
diff --git a/engine/Shopware/Bundle/EmotionBundle/Service/Gateway/EmotionGateway.php b/engine/Shopware/Bundle/EmotionBundle/Service/Gateway/EmotionGateway.php
index 43d76acc29c..d7ca3452c61 100644
--- a/engine/Shopware/Bundle/EmotionBundle/Service/Gateway/EmotionGateway.php
+++ b/engine/Shopware/Bundle/EmotionBundle/Service/Gateway/EmotionGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\Service\Gateway;
diff --git a/engine/Shopware/Bundle/EmotionBundle/Service/Gateway/Hydrator/EmotionElementHydrator.php b/engine/Shopware/Bundle/EmotionBundle/Service/Gateway/Hydrator/EmotionElementHydrator.php
index 337affdc317..5233cad4510 100644
--- a/engine/Shopware/Bundle/EmotionBundle/Service/Gateway/Hydrator/EmotionElementHydrator.php
+++ b/engine/Shopware/Bundle/EmotionBundle/Service/Gateway/Hydrator/EmotionElementHydrator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\Service\Gateway\Hydrator;
diff --git a/engine/Shopware/Bundle/EmotionBundle/Service/Gateway/Hydrator/EmotionHydrator.php b/engine/Shopware/Bundle/EmotionBundle/Service/Gateway/Hydrator/EmotionHydrator.php
index a7682936b36..76d86ca746e 100644
--- a/engine/Shopware/Bundle/EmotionBundle/Service/Gateway/Hydrator/EmotionHydrator.php
+++ b/engine/Shopware/Bundle/EmotionBundle/Service/Gateway/Hydrator/EmotionHydrator.php
@@ -1,40 +1,40 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\Service\Gateway\Hydrator;
 
+use DateTime;
+use DateTimeInterface;
 use Shopware\Bundle\EmotionBundle\Struct\Emotion;
 use Shopware\Bundle\EmotionBundle\Struct\EmotionTemplate;
 use Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator\AttributeHydrator;
 use Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator\Hydrator;
+use Throwable;
 
 class EmotionHydrator extends Hydrator
 {
-    /**
-     * @var AttributeHydrator
-     */
-    private $attributeHydrator;
+    private AttributeHydrator $attributeHydrator;
 
     public function __construct(AttributeHydrator $attributeHydrator)
     {
@@ -56,30 +56,26 @@ public function hydrate(array $data)
         $emotion->setCellHeight((int) $data['__emotion_cell_height']);
         $emotion->setArticleHeight((int) $data['__emotion_article_height']);
         $emotion->setRows((int) $data['__emotion_rows']);
-        $emotion->setValidFrom($data['__emotion_valid_from'] ? date_create($data['__emotion_valid_from']) : null);
-        $emotion->setValidTo($data['__emotion_valid_to'] ? date_create($data['__emotion_valid_to']) : null);
+        $emotion->setValidFrom($this->createDate($data['__emotion_valid_from']));
+        $emotion->setValidTo($this->createDate($data['__emotion_valid_to']));
         $emotion->setUserId((int) $data['__emotion_user_id']);
         $emotion->setShowListing((bool) $data['__emotion_show_listing']);
         $emotion->setIsLandingPage((bool) $data['__emotion_is_landingpage']);
         $emotion->setSeoTitle($data['__emotion_seo_title']);
         $emotion->setSeoKeywords($data['__emotion_seo_keywords']);
         $emotion->setSeoDescription($data['__emotion_seo_description']);
-        $emotion->setCreateDate($data['__emotion_create_date'] ? date_create($data['__emotion_create_date']) : null);
-        $emotion->setModifiedDate($data['__emotion_modified'] ? date_create($data['__emotion_modified']) : null);
+        $emotion->setCreateDate($this->createDate($data['__emotion_create_date']));
+        $emotion->setModifiedDate($this->createDate($data['__emotion_modified']));
         $emotion->setTemplateId((int) $data['__emotion_template_id']);
-        $emotion->setDevices(array_map('intval', explode(',', $data['__emotion_device'])));
+        $emotion->setDevices(array_map('\intval', explode(',', $data['__emotion_device'])));
         $emotion->setFullscreen((bool) $data['__emotion_fullscreen']);
         $emotion->setMode($data['__emotion_mode']);
         $emotion->setPosition((int) $data['__emotion_position']);
         $emotion->setParentId($data['__emotion_parent_id'] !== null ? (int) $data['__emotion_parent_id'] : null);
         $emotion->setIsPreview((bool) $data['__emotion_preview_id']);
         $emotion->setPreviewSecret($data['__emotion_preview_secret']);
-        /** @var int[] $categoryIds */
-        $categoryIds = explode(',', $data['__emotion_category_ids']);
-        $emotion->setCategoryIds($categoryIds);
-        /** @var int[] $shopIds */
-        $shopIds = explode(',', $data['__emotion_shop_ids']);
-        $emotion->setShopIds($shopIds);
+        $emotion->setCategoryIds(array_map('\intval', explode(',', $data['__emotion_category_ids'])));
+        $emotion->setShopIds(array_map('\intval', explode(',', $data['__emotion_shop_ids'])));
 
         // assign template
         $this->assignTemplate($emotion, $data);
@@ -92,7 +88,7 @@ public function hydrate(array $data)
         return $emotion;
     }
 
-    private function assignTemplate(Emotion $emotion, array $data)
+    private function assignTemplate(Emotion $emotion, array $data): void
     {
         $template = new EmotionTemplate();
 
@@ -102,4 +98,18 @@ private function assignTemplate(Emotion $emotion, array $data)
 
         $emotion->setTemplate($template);
     }
+
+    private function createDate(?string $dateString): ?DateTimeInterface
+    {
+        if (!\is_string($dateString)) {
+            return null;
+        }
+        try {
+            $date = new DateTime($dateString);
+        } catch (Throwable $e) {
+            return null;
+        }
+
+        return $date;
+    }
 }
diff --git a/engine/Shopware/Bundle/EmotionBundle/Service/StoreFrontEmotionDeviceConfiguration.php b/engine/Shopware/Bundle/EmotionBundle/Service/StoreFrontEmotionDeviceConfiguration.php
index 7a5c76b59a0..c617cf5b3fb 100644
--- a/engine/Shopware/Bundle/EmotionBundle/Service/StoreFrontEmotionDeviceConfiguration.php
+++ b/engine/Shopware/Bundle/EmotionBundle/Service/StoreFrontEmotionDeviceConfiguration.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\Service;
@@ -55,14 +55,14 @@ public function getCategoryConfiguration($categoryId, ShopContextInterface $cont
             return empty($config['shopIds']) || \in_array($context->getShop()->getId(), $config['shopIds']);
         });
 
-        //no active stream detected? display only emotions without customer stream configuration
+        // no active stream detected? display only emotions without customer stream configuration
         if (empty($context->getActiveCustomerStreamIds()) || $withStreams === false) {
             return array_filter($configurations, function ($config) {
                 return $config['customer_stream_ids'] === null;
             });
         }
 
-        //filter emotions which has customer stream configuration for active streams or which has no configuration
+        // filter emotions which has customer stream configuration for active streams or which has no configuration
         $configurations = array_filter(
             $configurations,
             function (array $config) use ($context) {
@@ -74,10 +74,10 @@ function (array $config) use ($context) {
             }
         );
 
-        //collect emotion replacements
+        // collect emotion replacements
         $replacements = $this->getReplacements($configurations);
 
-        //remove all emotions which replaced by customer stream emotions
+        // remove all emotions which replaced by customer stream emotions
         return array_filter(
             $configurations,
             function (array $config) use ($replacements) {
diff --git a/engine/Shopware/Bundle/EmotionBundle/Service/StoreFrontEmotionDeviceConfigurationInterface.php b/engine/Shopware/Bundle/EmotionBundle/Service/StoreFrontEmotionDeviceConfigurationInterface.php
index 48d930ba502..9cc87ebf683 100644
--- a/engine/Shopware/Bundle/EmotionBundle/Service/StoreFrontEmotionDeviceConfigurationInterface.php
+++ b/engine/Shopware/Bundle/EmotionBundle/Service/StoreFrontEmotionDeviceConfigurationInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\Service;
diff --git a/engine/Shopware/Bundle/EmotionBundle/Service/StructConverter.php b/engine/Shopware/Bundle/EmotionBundle/Service/StructConverter.php
index 309d2c5d588..43a4dba7d80 100644
--- a/engine/Shopware/Bundle/EmotionBundle/Service/StructConverter.php
+++ b/engine/Shopware/Bundle/EmotionBundle/Service/StructConverter.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\Service;
diff --git a/engine/Shopware/Bundle/EmotionBundle/Struct/Collection/PrepareDataCollection.php b/engine/Shopware/Bundle/EmotionBundle/Struct/Collection/PrepareDataCollection.php
index 11c004f9c2c..10e2c88cc16 100644
--- a/engine/Shopware/Bundle/EmotionBundle/Struct/Collection/PrepareDataCollection.php
+++ b/engine/Shopware/Bundle/EmotionBundle/Struct/Collection/PrepareDataCollection.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\Struct\Collection;
diff --git a/engine/Shopware/Bundle/EmotionBundle/Struct/Collection/ResolvedDataCollection.php b/engine/Shopware/Bundle/EmotionBundle/Struct/Collection/ResolvedDataCollection.php
index f25c5af669f..2616f3107b3 100644
--- a/engine/Shopware/Bundle/EmotionBundle/Struct/Collection/ResolvedDataCollection.php
+++ b/engine/Shopware/Bundle/EmotionBundle/Struct/Collection/ResolvedDataCollection.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\Struct\Collection;
diff --git a/engine/Shopware/Bundle/EmotionBundle/Struct/Element.php b/engine/Shopware/Bundle/EmotionBundle/Struct/Element.php
index 156d286a27c..6a0a20bf7bc 100644
--- a/engine/Shopware/Bundle/EmotionBundle/Struct/Element.php
+++ b/engine/Shopware/Bundle/EmotionBundle/Struct/Element.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\Struct;
diff --git a/engine/Shopware/Bundle/EmotionBundle/Struct/ElementConfig.php b/engine/Shopware/Bundle/EmotionBundle/Struct/ElementConfig.php
index f8be48e4456..7771d719352 100644
--- a/engine/Shopware/Bundle/EmotionBundle/Struct/ElementConfig.php
+++ b/engine/Shopware/Bundle/EmotionBundle/Struct/ElementConfig.php
@@ -1,31 +1,32 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\Struct;
 
 use JsonSerializable;
 use ReturnTypeWillChange;
+use Shopware\Models\Emotion\Library\Field;
 
 class ElementConfig implements JsonSerializable
 {
@@ -40,7 +41,7 @@ public function __construct(array $data = [])
     {
         $storage = [];
         foreach ($data as $configElement) {
-            if ($configElement['__emotionLibraryComponentField_value_type'] === 'json') {
+            if ($configElement['__emotionLibraryComponentField_value_type'] === Field::VALUE_TYPE_JSON) {
                 $configElement['__emotionElementValue_value'] = json_decode($configElement['__emotionElementValue_value'], true);
             }
 
diff --git a/engine/Shopware/Bundle/EmotionBundle/Struct/ElementData.php b/engine/Shopware/Bundle/EmotionBundle/Struct/ElementData.php
index b5f26dfdfbb..3d57d07d707 100644
--- a/engine/Shopware/Bundle/EmotionBundle/Struct/ElementData.php
+++ b/engine/Shopware/Bundle/EmotionBundle/Struct/ElementData.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\Struct;
diff --git a/engine/Shopware/Bundle/EmotionBundle/Struct/ElementViewport.php b/engine/Shopware/Bundle/EmotionBundle/Struct/ElementViewport.php
index a76272b30ae..c2288bdc15d 100644
--- a/engine/Shopware/Bundle/EmotionBundle/Struct/ElementViewport.php
+++ b/engine/Shopware/Bundle/EmotionBundle/Struct/ElementViewport.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\Struct;
diff --git a/engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php b/engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php
index 7933f165dc1..7d54201d7f2 100644
--- a/engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php
+++ b/engine/Shopware/Bundle/EmotionBundle/Struct/Emotion.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\Struct;
@@ -75,12 +75,12 @@ class Emotion extends Extendable
     protected $rows;
 
     /**
-     * @var DateTimeInterface
+     * @var DateTimeInterface|null
      */
     protected $validFrom;
 
     /**
-     * @var DateTimeInterface
+     * @var DateTimeInterface|null
      */
     protected $validTo;
 
@@ -115,12 +115,12 @@ class Emotion extends Extendable
     protected $seoDescription;
 
     /**
-     * @var DateTimeInterface
+     * @var DateTimeInterface|null
      */
     protected $createDate;
 
     /**
-     * @var DateTimeInterface
+     * @var DateTimeInterface|null
      */
     protected $modifiedDate;
 
@@ -130,7 +130,7 @@ class Emotion extends Extendable
     protected $templateId;
 
     /**
-     * @var int[]
+     * @var array<int>
      */
     protected $devices;
 
@@ -150,7 +150,7 @@ class Emotion extends Extendable
     protected $position;
 
     /**
-     * @var int
+     * @var int|null
      */
     protected $parentId;
 
@@ -170,7 +170,7 @@ class Emotion extends Extendable
     protected $elements = [];
 
     /**
-     * @var int[]
+     * @var array<int>
      */
     protected $categoryIds = [];
 
@@ -185,7 +185,7 @@ class Emotion extends Extendable
     protected $template;
 
     /**
-     * @var int[]
+     * @var array<int>
      */
     protected $shopIds = [];
 
@@ -259,7 +259,7 @@ public function getRows()
     }
 
     /**
-     * @return DateTimeInterface
+     * @return DateTimeInterface|null
      */
     public function getValidFrom()
     {
@@ -267,7 +267,7 @@ public function getValidFrom()
     }
 
     /**
-     * @return DateTimeInterface
+     * @return DateTimeInterface|null
      */
     public function getValidTo()
     {
@@ -323,7 +323,7 @@ public function getSeoDescription()
     }
 
     /**
-     * @return DateTimeInterface
+     * @return DateTimeInterface|null
      */
     public function getCreateDate()
     {
@@ -331,7 +331,7 @@ public function getCreateDate()
     }
 
     /**
-     * @return DateTimeInterface
+     * @return DateTimeInterface|null
      */
     public function getModifiedDate()
     {
@@ -347,7 +347,7 @@ public function getTemplateId()
     }
 
     /**
-     * @return int[]
+     * @return array<int>
      */
     public function getDevices()
     {
@@ -379,7 +379,7 @@ public function getPosition()
     }
 
     /**
-     * @return int
+     * @return int|null
      */
     public function getParentId()
     {
@@ -388,6 +388,8 @@ public function getParentId()
 
     /**
      * @param int $id
+     *
+     * @return void
      */
     public function setId($id)
     {
@@ -396,6 +398,8 @@ public function setId($id)
 
     /**
      * @param bool $active
+     *
+     * @return void
      */
     public function setActive($active)
     {
@@ -404,6 +408,8 @@ public function setActive($active)
 
     /**
      * @param string $name
+     *
+     * @return void
      */
     public function setName($name)
     {
@@ -412,6 +418,8 @@ public function setName($name)
 
     /**
      * @param int $cols
+     *
+     * @return void
      */
     public function setCols($cols)
     {
@@ -420,6 +428,8 @@ public function setCols($cols)
 
     /**
      * @param int $cellSpacing
+     *
+     * @return void
      */
     public function setCellSpacing($cellSpacing)
     {
@@ -428,6 +438,8 @@ public function setCellSpacing($cellSpacing)
 
     /**
      * @param int $cellHeight
+     *
+     * @return void
      */
     public function setCellHeight($cellHeight)
     {
@@ -436,6 +448,8 @@ public function setCellHeight($cellHeight)
 
     /**
      * @param int $articleHeight
+     *
+     * @return void
      */
     public function setArticleHeight($articleHeight)
     {
@@ -444,6 +458,8 @@ public function setArticleHeight($articleHeight)
 
     /**
      * @param int $rows
+     *
+     * @return void
      */
     public function setRows($rows)
     {
@@ -451,7 +467,9 @@ public function setRows($rows)
     }
 
     /**
-     * @param DateTimeInterface $validFrom
+     * @param DateTimeInterface|null $validFrom
+     *
+     * @return void
      */
     public function setValidFrom($validFrom)
     {
@@ -459,7 +477,9 @@ public function setValidFrom($validFrom)
     }
 
     /**
-     * @param DateTimeInterface $validTo
+     * @param DateTimeInterface|null $validTo
+     *
+     * @return void
      */
     public function setValidTo($validTo)
     {
@@ -468,6 +488,8 @@ public function setValidTo($validTo)
 
     /**
      * @param int $userId
+     *
+     * @return void
      */
     public function setUserId($userId)
     {
@@ -476,6 +498,8 @@ public function setUserId($userId)
 
     /**
      * @param bool $showListing
+     *
+     * @return void
      */
     public function setShowListing($showListing)
     {
@@ -484,6 +508,8 @@ public function setShowListing($showListing)
 
     /**
      * @param bool $isLandingPage
+     *
+     * @return void
      */
     public function setIsLandingPage($isLandingPage)
     {
@@ -492,6 +518,8 @@ public function setIsLandingPage($isLandingPage)
 
     /**
      * @param string $seoTitle
+     *
+     * @return void
      */
     public function setSeoTitle($seoTitle)
     {
@@ -500,6 +528,8 @@ public function setSeoTitle($seoTitle)
 
     /**
      * @param string $seoKeywords
+     *
+     * @return void
      */
     public function setSeoKeywords($seoKeywords)
     {
@@ -508,6 +538,8 @@ public function setSeoKeywords($seoKeywords)
 
     /**
      * @param string $seoDescription
+     *
+     * @return void
      */
     public function setSeoDescription($seoDescription)
     {
@@ -515,7 +547,9 @@ public function setSeoDescription($seoDescription)
     }
 
     /**
-     * @param DateTimeInterface $createDate
+     * @param DateTimeInterface|null $createDate
+     *
+     * @return void
      */
     public function setCreateDate($createDate)
     {
@@ -523,7 +557,9 @@ public function setCreateDate($createDate)
     }
 
     /**
-     * @param DateTimeInterface $modifiedDate
+     * @param DateTimeInterface|null $modifiedDate
+     *
+     * @return void
      */
     public function setModifiedDate($modifiedDate)
     {
@@ -532,6 +568,8 @@ public function setModifiedDate($modifiedDate)
 
     /**
      * @param int $templateId
+     *
+     * @return void
      */
     public function setTemplateId($templateId)
     {
@@ -539,7 +577,9 @@ public function setTemplateId($templateId)
     }
 
     /**
-     * @param int[] $devices
+     * @param array<int> $devices
+     *
+     * @return void
      */
     public function setDevices($devices)
     {
@@ -548,6 +588,8 @@ public function setDevices($devices)
 
     /**
      * @param bool $fullscreen
+     *
+     * @return void
      */
     public function setFullscreen($fullscreen)
     {
@@ -556,6 +598,8 @@ public function setFullscreen($fullscreen)
 
     /**
      * @param string $mode
+     *
+     * @return void
      */
     public function setMode($mode)
     {
@@ -564,6 +608,8 @@ public function setMode($mode)
 
     /**
      * @param int $position
+     *
+     * @return void
      */
     public function setPosition($position)
     {
@@ -571,7 +617,9 @@ public function setPosition($position)
     }
 
     /**
-     * @param int $parentId
+     * @param int|null $parentId
+     *
+     * @return void
      */
     public function setParentId($parentId)
     {
@@ -588,6 +636,8 @@ public function getElements()
 
     /**
      * @param Element[] $elements
+     *
+     * @return void
      */
     public function setElements(array $elements)
     {
@@ -604,6 +654,8 @@ public function getCategories()
 
     /**
      * @param Category[] $categories
+     *
+     * @return void
      */
     public function setCategories(array $categories)
     {
@@ -618,13 +670,16 @@ public function getTemplate()
         return $this->template;
     }
 
+    /**
+     * @return void
+     */
     public function setTemplate(EmotionTemplate $template)
     {
         $this->template = $template;
     }
 
     /**
-     * @return \Shopware\Bundle\StoreFrontBundle\Struct\Shop[]
+     * @return Shop[]
      */
     public function getShops()
     {
@@ -632,7 +687,9 @@ public function getShops()
     }
 
     /**
-     * @param \Shopware\Bundle\StoreFrontBundle\Struct\Shop[] $shops
+     * @param Shop[] $shops
+     *
+     * @return void
      */
     public function setShops(array $shops)
     {
@@ -640,7 +697,7 @@ public function setShops(array $shops)
     }
 
     /**
-     * @return int[]
+     * @return array<int>
      */
     public function getCategoryIds()
     {
@@ -648,7 +705,9 @@ public function getCategoryIds()
     }
 
     /**
-     * @param int[] $categoryIds
+     * @param array<int> $categoryIds
+     *
+     * @return void
      */
     public function setCategoryIds(array $categoryIds)
     {
@@ -656,7 +715,7 @@ public function setCategoryIds(array $categoryIds)
     }
 
     /**
-     * @return int[]
+     * @return array<int>
      */
     public function getShopIds()
     {
@@ -664,7 +723,9 @@ public function getShopIds()
     }
 
     /**
-     * @param int[] $shopIds
+     * @param array<int> $shopIds
+     *
+     * @return void
      */
     public function setShopIds(array $shopIds)
     {
@@ -681,6 +742,8 @@ public function isPreview()
 
     /**
      * @param bool $isPreview
+     *
+     * @return void
      */
     public function setIsPreview($isPreview)
     {
@@ -697,6 +760,8 @@ public function getPreviewSecret()
 
     /**
      * @param string $previewSecret
+     *
+     * @return void
      */
     public function setPreviewSecret($previewSecret)
     {
diff --git a/engine/Shopware/Bundle/EmotionBundle/Struct/EmotionTemplate.php b/engine/Shopware/Bundle/EmotionBundle/Struct/EmotionTemplate.php
index c9e1f96c536..484a2f8f60b 100644
--- a/engine/Shopware/Bundle/EmotionBundle/Struct/EmotionTemplate.php
+++ b/engine/Shopware/Bundle/EmotionBundle/Struct/EmotionTemplate.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\Struct;
diff --git a/engine/Shopware/Bundle/EmotionBundle/Struct/Library/Component.php b/engine/Shopware/Bundle/EmotionBundle/Struct/Library/Component.php
index 16b4aace502..d832ed770e9 100644
--- a/engine/Shopware/Bundle/EmotionBundle/Struct/Library/Component.php
+++ b/engine/Shopware/Bundle/EmotionBundle/Struct/Library/Component.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EmotionBundle\Struct\Library;
diff --git a/engine/Shopware/Bundle/EsBackendBundle/BacklogService.php b/engine/Shopware/Bundle/EsBackendBundle/BacklogService.php
index bfe34c459fd..29c3fdbd907 100644
--- a/engine/Shopware/Bundle/EsBackendBundle/BacklogService.php
+++ b/engine/Shopware/Bundle/EsBackendBundle/BacklogService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EsBackendBundle;
diff --git a/engine/Shopware/Bundle/EsBackendBundle/BacklogServiceInterface.php b/engine/Shopware/Bundle/EsBackendBundle/BacklogServiceInterface.php
index a914cd70722..36ca49a036e 100644
--- a/engine/Shopware/Bundle/EsBackendBundle/BacklogServiceInterface.php
+++ b/engine/Shopware/Bundle/EsBackendBundle/BacklogServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EsBackendBundle;
diff --git a/engine/Shopware/Bundle/EsBackendBundle/Commands/ClearBacklogCommand.php b/engine/Shopware/Bundle/EsBackendBundle/Commands/ClearBacklogCommand.php
index 67e9fa25cfb..870baf561fe 100644
--- a/engine/Shopware/Bundle/EsBackendBundle/Commands/ClearBacklogCommand.php
+++ b/engine/Shopware/Bundle/EsBackendBundle/Commands/ClearBacklogCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EsBackendBundle\Commands;
diff --git a/engine/Shopware/Bundle/EsBackendBundle/Commands/IndexCleanupCommand.php b/engine/Shopware/Bundle/EsBackendBundle/Commands/IndexCleanupCommand.php
index 8f41d4788c0..feadaf175f9 100644
--- a/engine/Shopware/Bundle/EsBackendBundle/Commands/IndexCleanupCommand.php
+++ b/engine/Shopware/Bundle/EsBackendBundle/Commands/IndexCleanupCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EsBackendBundle\Commands;
diff --git a/engine/Shopware/Bundle/EsBackendBundle/Commands/IndexPopulateCommand.php b/engine/Shopware/Bundle/EsBackendBundle/Commands/IndexPopulateCommand.php
index 23f36a090d1..ae5470e203c 100644
--- a/engine/Shopware/Bundle/EsBackendBundle/Commands/IndexPopulateCommand.php
+++ b/engine/Shopware/Bundle/EsBackendBundle/Commands/IndexPopulateCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EsBackendBundle\Commands;
diff --git a/engine/Shopware/Bundle/EsBackendBundle/Commands/SyncBacklogCommand.php b/engine/Shopware/Bundle/EsBackendBundle/Commands/SyncBacklogCommand.php
index d518e861cbe..a683fc56dae 100644
--- a/engine/Shopware/Bundle/EsBackendBundle/Commands/SyncBacklogCommand.php
+++ b/engine/Shopware/Bundle/EsBackendBundle/Commands/SyncBacklogCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EsBackendBundle\Commands;
@@ -87,7 +87,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 continue;
             }
 
-            $output->writeln(sprintf('Sync %s with id %s', $backlog['entity'], $backlog['entity_id']));
+            $output->writeln(\sprintf('Sync %s with id %s', $backlog['entity'], $backlog['entity_id']));
 
             if ($backlog['entity'] === Article::class) {
                 $this->indexArticle($backlog['entity_id']);
diff --git a/engine/Shopware/Bundle/EsBackendBundle/DependencyInjection/services.xml b/engine/Shopware/Bundle/EsBackendBundle/DependencyInjection/services.xml
index fab7364ce8f..a416d2f3744 100644
--- a/engine/Shopware/Bundle/EsBackendBundle/DependencyInjection/services.xml
+++ b/engine/Shopware/Bundle/EsBackendBundle/DependencyInjection/services.xml
@@ -16,7 +16,7 @@
 
         <service id="Shopware\Bundle\EsBackendBundle\IndexFactoryInterface" class="Shopware\Bundle\EsBackendBundle\IndexFactory">
             <argument>%shopware.es.backend.prefix%</argument>
-            <argument>%shopware.es.index_settings%</argument>
+            <argument>%shopware.es.backend.index_settings%</argument>
         </service>
 
         <service class="Shopware\Bundle\EsBackendBundle\SearchQueryBuilder" id="shopware_es_backend.search_query_builder" />
@@ -102,4 +102,3 @@
         </service>
     </services>
 </container>
-
diff --git a/engine/Shopware/Bundle/EsBackendBundle/EsAwareRepository.php b/engine/Shopware/Bundle/EsBackendBundle/EsAwareRepository.php
index 934e57c36f1..1f100d18235 100644
--- a/engine/Shopware/Bundle/EsBackendBundle/EsAwareRepository.php
+++ b/engine/Shopware/Bundle/EsBackendBundle/EsAwareRepository.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EsBackendBundle;
diff --git a/engine/Shopware/Bundle/EsBackendBundle/EsAwareSearcher.php b/engine/Shopware/Bundle/EsBackendBundle/EsAwareSearcher.php
index 13320d1864b..637b289702e 100644
--- a/engine/Shopware/Bundle/EsBackendBundle/EsAwareSearcher.php
+++ b/engine/Shopware/Bundle/EsBackendBundle/EsAwareSearcher.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EsBackendBundle;
diff --git a/engine/Shopware/Bundle/EsBackendBundle/EsBackendBundle.php b/engine/Shopware/Bundle/EsBackendBundle/EsBackendBundle.php
index a24f91a33f5..eb2c4f1e6c1 100644
--- a/engine/Shopware/Bundle/EsBackendBundle/EsBackendBundle.php
+++ b/engine/Shopware/Bundle/EsBackendBundle/EsBackendBundle.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EsBackendBundle;
diff --git a/engine/Shopware/Bundle/EsBackendBundle/EsBackendIndexer.php b/engine/Shopware/Bundle/EsBackendBundle/EsBackendIndexer.php
index 54d743462db..d9c99783906 100644
--- a/engine/Shopware/Bundle/EsBackendBundle/EsBackendIndexer.php
+++ b/engine/Shopware/Bundle/EsBackendBundle/EsBackendIndexer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EsBackendBundle;
@@ -71,6 +71,9 @@ public function __construct(
         $this->indexFactory = $indexFactory;
     }
 
+    /**
+     * @return void
+     */
     public function index(ProgressHelperInterface $helper)
     {
         foreach ($this->repositories as $repository) {
@@ -84,7 +87,10 @@ public function index(ProgressHelperInterface $helper)
     }
 
     /**
-     * @param string $index
+     * @param string     $index
+     * @param array<int> $ids
+     *
+     * @return void
      */
     public function indexEntities($index, EsAwareRepository $repository, array $ids)
     {
@@ -94,20 +100,34 @@ public function indexEntities($index, EsAwareRepository $repository, array $ids)
         $remove = array_diff($ids, $remove);
 
         $booleanFields = [];
+        $dateFields = [];
+        $dateTimeFields = [];
         foreach ($repository->getMapping()['properties'] as $key => $mapping) {
             if ($mapping['type'] === 'boolean') {
                 $booleanFields[] = $key;
             }
+
+            if ($mapping['type'] === 'date' && $mapping['format'] === 'yyyy-MM-dd') {
+                $dateFields[] = $key;
+            }
+
+            if ($mapping['type'] === 'date' && \in_array($mapping['format'], ['yyyy-MM-dd HH:mm:ss', 'yyyy-MM-dd HH:mm:ss||yyyy-MM-dd'])) {
+                $dateTimeFields[] = $key;
+            }
         }
 
         $documents = [];
         foreach ($data as $row) {
             $documents[] = ['index' => ['_id' => $row['id']]];
             foreach ($row as $key => &$value) {
-                if ($value instanceof DateTime) {
+                if ($value instanceof DateTime && \in_array($key, $dateTimeFields, true)) {
                     $value = $value->format('Y-m-d H:i:s');
                 }
 
+                if ($value instanceof DateTime && \in_array($key, $dateFields, true)) {
+                    $value = $value->format('Y-m-d');
+                }
+
                 if (\in_array($key, $booleanFields, true)) {
                     $value = (bool) $value;
                 }
@@ -136,6 +156,8 @@ public function indexEntities($index, EsAwareRepository $repository, array $ids)
 
     /**
      * Removes unused indices
+     *
+     * @return void
      */
     public function cleanupIndices()
     {
diff --git a/engine/Shopware/Bundle/EsBackendBundle/IndexFactory.php b/engine/Shopware/Bundle/EsBackendBundle/IndexFactory.php
index 8f2a74a39df..9a28942a39e 100644
--- a/engine/Shopware/Bundle/EsBackendBundle/IndexFactory.php
+++ b/engine/Shopware/Bundle/EsBackendBundle/IndexFactory.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EsBackendBundle;
diff --git a/engine/Shopware/Bundle/EsBackendBundle/IndexFactoryInterface.php b/engine/Shopware/Bundle/EsBackendBundle/IndexFactoryInterface.php
index 4409a24cb96..3a8fb48dc1f 100644
--- a/engine/Shopware/Bundle/EsBackendBundle/IndexFactoryInterface.php
+++ b/engine/Shopware/Bundle/EsBackendBundle/IndexFactoryInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EsBackendBundle;
diff --git a/engine/Shopware/Bundle/EsBackendBundle/SearchQueryBuilder.php b/engine/Shopware/Bundle/EsBackendBundle/SearchQueryBuilder.php
index fe9fca660a5..c33120e3307 100644
--- a/engine/Shopware/Bundle/EsBackendBundle/SearchQueryBuilder.php
+++ b/engine/Shopware/Bundle/EsBackendBundle/SearchQueryBuilder.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EsBackendBundle;
@@ -49,7 +49,7 @@ public function buildQuery(array $fields, $term)
             }
         }
 
-        //use combination for more precision
+        // use combination for more precision
         foreach ($combines as $token) {
             foreach ($fields as $field => $priority) {
                 $bool->add(new MatchQuery($field, $token, ['boost' => $priority * 2]), BoolQuery::SHOULD);
@@ -73,7 +73,7 @@ private function tokenize(string $term): array
         $tokens = array_unique(explode(' ', $string));
         $tokens = array_map('trim', $tokens);
 
-        return array_filter(
+        return array_values(
             array_filter(
                 $tokens,
                 function ($token) {
@@ -95,7 +95,9 @@ private function combine(array $items): array
         for ($i = 1; $i < 3; ++$i) {
             $combination = [];
             for ($x = 0; $x <= $i; ++$x) {
-                $combination[] = $items[$x];
+                if (\array_key_exists($x, $items)) {
+                    $combination[] = $items[$x];
+                }
             }
 
             $result[] = implode(' ', $combination);
diff --git a/engine/Shopware/Bundle/EsBackendBundle/Searcher/CustomerSearcher.php b/engine/Shopware/Bundle/EsBackendBundle/Searcher/CustomerSearcher.php
index 19ba195f747..a81fffe6214 100644
--- a/engine/Shopware/Bundle/EsBackendBundle/Searcher/CustomerSearcher.php
+++ b/engine/Shopware/Bundle/EsBackendBundle/Searcher/CustomerSearcher.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EsBackendBundle\Searcher;
diff --git a/engine/Shopware/Bundle/EsBackendBundle/Searcher/GenericSearcher.php b/engine/Shopware/Bundle/EsBackendBundle/Searcher/GenericSearcher.php
index bd7f0234f36..952c671a03f 100644
--- a/engine/Shopware/Bundle/EsBackendBundle/Searcher/GenericSearcher.php
+++ b/engine/Shopware/Bundle/EsBackendBundle/Searcher/GenericSearcher.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EsBackendBundle\Searcher;
diff --git a/engine/Shopware/Bundle/EsBackendBundle/Searcher/OrderSearcher.php b/engine/Shopware/Bundle/EsBackendBundle/Searcher/OrderSearcher.php
index 1f41848ecc5..af2e15e6d88 100644
--- a/engine/Shopware/Bundle/EsBackendBundle/Searcher/OrderSearcher.php
+++ b/engine/Shopware/Bundle/EsBackendBundle/Searcher/OrderSearcher.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EsBackendBundle\Searcher;
diff --git a/engine/Shopware/Bundle/EsBackendBundle/Searcher/ProductSearcher.php b/engine/Shopware/Bundle/EsBackendBundle/Searcher/ProductSearcher.php
index 13b220368e3..5d20a30dbf1 100644
--- a/engine/Shopware/Bundle/EsBackendBundle/Searcher/ProductSearcher.php
+++ b/engine/Shopware/Bundle/EsBackendBundle/Searcher/ProductSearcher.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EsBackendBundle\Searcher;
diff --git a/engine/Shopware/Bundle/EsBackendBundle/Struct/Backlog.php b/engine/Shopware/Bundle/EsBackendBundle/Struct/Backlog.php
index 39c26e590cb..8dec4c059d7 100644
--- a/engine/Shopware/Bundle/EsBackendBundle/Struct/Backlog.php
+++ b/engine/Shopware/Bundle/EsBackendBundle/Struct/Backlog.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EsBackendBundle\Struct;
@@ -41,6 +41,9 @@ class Backlog
      */
     public $time;
 
+    /**
+     * @param int|null $entity_id
+     */
     public function __construct(string $entity, $entity_id)
     {
         $this->entity = $entity;
@@ -48,6 +51,9 @@ public function __construct(string $entity, $entity_id)
         $this->time = date('Y-m-d H:i:s');
     }
 
+    /**
+     * @return array{entity: string, entity_id: int|null, time: string}
+     */
     public function toArray(): array
     {
         return get_object_vars($this);
diff --git a/engine/Shopware/Bundle/EsBackendBundle/Subscriber/DomainBacklogSubscriber.php b/engine/Shopware/Bundle/EsBackendBundle/Subscriber/DomainBacklogSubscriber.php
index 57bea00d2e6..941e2f3f611 100644
--- a/engine/Shopware/Bundle/EsBackendBundle/Subscriber/DomainBacklogSubscriber.php
+++ b/engine/Shopware/Bundle/EsBackendBundle/Subscriber/DomainBacklogSubscriber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EsBackendBundle\Subscriber;
diff --git a/engine/Shopware/Bundle/EsBackendBundle/Subscriber/OrmBacklogSubscriber.php b/engine/Shopware/Bundle/EsBackendBundle/Subscriber/OrmBacklogSubscriber.php
index 44782f41f6e..816c8510092 100644
--- a/engine/Shopware/Bundle/EsBackendBundle/Subscriber/OrmBacklogSubscriber.php
+++ b/engine/Shopware/Bundle/EsBackendBundle/Subscriber/OrmBacklogSubscriber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\EsBackendBundle\Subscriber;
@@ -83,13 +83,13 @@ private function getBacklog(object $entity): ?Backlog
             case $entity instanceof Article:
                 return new Backlog(Article::class, $entity->getId());
 
-            // Variant changes
+                // Variant changes
             case $entity instanceof Price:
                 return new Backlog(Article::class, $entity->getDetail()->getArticleId());
             case $entity instanceof Variant:
                 return new Backlog(Article::class, $entity->getArticleId());
 
-            // Order changes
+                // Order changes
             case $entity instanceof Order:
                 return new Backlog(Order::class, $entity->getId());
             case $entity instanceof Detail:
@@ -99,7 +99,7 @@ private function getBacklog(object $entity): ?Backlog
             case $entity instanceof Shipping:
                 return new Backlog(Order::class, $entity->getOrder()->getId());
 
-            // Customer changes
+                // Customer changes
             case $entity instanceof Customer:
                 return new Backlog(Customer::class, $entity->getId());
             case $entity instanceof Address:
diff --git a/engine/Shopware/Bundle/FormBundle/Constraints/Exists.php b/engine/Shopware/Bundle/FormBundle/Constraints/Exists.php
index a5acccb2a8b..89150c9f657 100644
--- a/engine/Shopware/Bundle/FormBundle/Constraints/Exists.php
+++ b/engine/Shopware/Bundle/FormBundle/Constraints/Exists.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\FormBundle\Constraints;
diff --git a/engine/Shopware/Bundle/FormBundle/Constraints/ExistsValidator.php b/engine/Shopware/Bundle/FormBundle/Constraints/ExistsValidator.php
index af77741fdc8..24a2f0a85c0 100644
--- a/engine/Shopware/Bundle/FormBundle/Constraints/ExistsValidator.php
+++ b/engine/Shopware/Bundle/FormBundle/Constraints/ExistsValidator.php
@@ -1,41 +1,37 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\FormBundle\Constraints;
 
 use Doctrine\DBAL\Connection;
-use PDOStatement;
 use RuntimeException;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 
 class ExistsValidator extends ConstraintValidator
 {
-    /**
-     * @var Connection
-     */
-    private $connection;
+    private Connection $connection;
 
     public function __construct(Connection $connection)
     {
@@ -50,7 +46,6 @@ public function __construct(Connection $connection)
      */
     public function validate($value, Constraint $constraint)
     {
-        /** @var Exists $constraint */
         if (!$constraint instanceof Exists) {
             throw new RuntimeException('Invalid constraint for validator given.');
         }
@@ -72,10 +67,7 @@ public function validate($value, Constraint $constraint)
             }
         }
 
-        /** @var PDOStatement $stmt */
-        $stmt = $builder->execute();
-
-        if ($stmt->rowCount() > 0) {
+        if ($builder->execute()->rowCount() > 0) {
             return;
         }
 
diff --git a/engine/Shopware/Bundle/FormBundle/Constraints/Unique.php b/engine/Shopware/Bundle/FormBundle/Constraints/Unique.php
index c9cc8d43500..76f13f66664 100644
--- a/engine/Shopware/Bundle/FormBundle/Constraints/Unique.php
+++ b/engine/Shopware/Bundle/FormBundle/Constraints/Unique.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\FormBundle\Constraints;
diff --git a/engine/Shopware/Bundle/FormBundle/Constraints/UniqueValidator.php b/engine/Shopware/Bundle/FormBundle/Constraints/UniqueValidator.php
index f7ca454165c..1f50e0d25ce 100644
--- a/engine/Shopware/Bundle/FormBundle/Constraints/UniqueValidator.php
+++ b/engine/Shopware/Bundle/FormBundle/Constraints/UniqueValidator.php
@@ -1,41 +1,37 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\FormBundle\Constraints;
 
 use Doctrine\DBAL\Connection;
-use PDOStatement;
 use RuntimeException;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 
 class UniqueValidator extends ConstraintValidator
 {
-    /**
-     * @var Connection
-     */
-    private $connection;
+    private Connection $connection;
 
     public function __construct(Connection $connection)
     {
@@ -50,7 +46,6 @@ public function __construct(Connection $connection)
      */
     public function validate($value, Constraint $constraint)
     {
-        /** @var Unique $constraint */
         if (!$constraint instanceof Unique) {
             throw new RuntimeException('Invalid constraint for validator given.');
         }
@@ -71,10 +66,7 @@ public function validate($value, Constraint $constraint)
                 ->setParameter('ignoreId', $ignoreIdValue);
         }
 
-        /** @var PDOStatement $stmt */
-        $stmt = $builder->execute();
-
-        if ($stmt->rowCount() === 0) {
+        if ($builder->execute()->rowCount() === 0) {
             return;
         }
 
diff --git a/engine/Shopware/Bundle/FormBundle/DependencyInjection/CompilerPass/AddConstraintValidatorsPass.php b/engine/Shopware/Bundle/FormBundle/DependencyInjection/CompilerPass/AddConstraintValidatorsPass.php
index fe079f91b17..6bacf31bef7 100644
--- a/engine/Shopware/Bundle/FormBundle/DependencyInjection/CompilerPass/AddConstraintValidatorsPass.php
+++ b/engine/Shopware/Bundle/FormBundle/DependencyInjection/CompilerPass/AddConstraintValidatorsPass.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\FormBundle\DependencyInjection\CompilerPass;
diff --git a/engine/Shopware/Bundle/FormBundle/DependencyInjection/Factory/ConstraintValidatorFactory.php b/engine/Shopware/Bundle/FormBundle/DependencyInjection/Factory/ConstraintValidatorFactory.php
index 8ff5951894a..549e38f5d30 100644
--- a/engine/Shopware/Bundle/FormBundle/DependencyInjection/Factory/ConstraintValidatorFactory.php
+++ b/engine/Shopware/Bundle/FormBundle/DependencyInjection/Factory/ConstraintValidatorFactory.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\FormBundle\DependencyInjection\Factory;
diff --git a/engine/Shopware/Bundle/FormBundle/Extension/EventExtension.php b/engine/Shopware/Bundle/FormBundle/Extension/EventExtension.php
index ebc12ef230b..dbdd51d19c3 100644
--- a/engine/Shopware/Bundle/FormBundle/Extension/EventExtension.php
+++ b/engine/Shopware/Bundle/FormBundle/Extension/EventExtension.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\FormBundle\Extension;
diff --git a/engine/Shopware/Bundle/FormBundle/FormBundle.php b/engine/Shopware/Bundle/FormBundle/FormBundle.php
index abde0742545..2c8493b0ad1 100644
--- a/engine/Shopware/Bundle/FormBundle/FormBundle.php
+++ b/engine/Shopware/Bundle/FormBundle/FormBundle.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\FormBundle;
diff --git a/engine/Shopware/Bundle/FormBundle/FormFactory.php b/engine/Shopware/Bundle/FormBundle/FormFactory.php
index d6fa9695403..143b5e9f521 100644
--- a/engine/Shopware/Bundle/FormBundle/FormFactory.php
+++ b/engine/Shopware/Bundle/FormBundle/FormFactory.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\FormBundle;
diff --git a/engine/Shopware/Bundle/FormBundle/StringRendererService.php b/engine/Shopware/Bundle/FormBundle/StringRendererService.php
index c89eed3e310..84b8b9d609b 100644
--- a/engine/Shopware/Bundle/FormBundle/StringRendererService.php
+++ b/engine/Shopware/Bundle/FormBundle/StringRendererService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\FormBundle;
@@ -28,20 +28,14 @@
 
 class StringRendererService implements StringRendererServiceInterface
 {
-    /**
-     * @var string
-     */
-    private $placeholderRegEx = '/(\{\$){1}[:\'a-zA-Z0-9\.\|\$_]+(\}){1}/';
+    private string $placeholderRegEx = '/(\{\$){1}[:\'a-zA-Z0-9\.\|\$_]+(\}){1}/';
 
-    /**
-     * @var string
-     */
-    private $functionRegEx = '/((\{\$){1})|(\})|(\|{1}(.+)\}{1})/';
+    private string $functionRegEx = '/((\{\$){1})|(\})|(\|{1}(.+)\}{1})/';
 
     /**
-     * @var array
+     * @var list<string>
      */
-    private $whiteListTypeArray = [
+    private array $whiteListTypeArray = [
         'string',
         'integer',
         'double',
@@ -60,10 +54,10 @@ public function render($string, array $viewVariables, array $sElement)
 
         $placeholders = array_shift($placeholders);
 
-        foreach ($placeholders as $placeholder) {
+        foreach ($placeholders ?? [] as $placeholder) {
             $placeholderString = preg_replace($this->functionRegEx, '', $placeholder);
 
-            if (\strlen($placeholderString) < 1) {
+            if (!\is_string($placeholderString) || $placeholderString === '') {
                 continue;
             }
 
@@ -105,7 +99,7 @@ private function getValue(array $placeholder, array $viewVariables, array $sElem
         }
 
         if (!\in_array(\gettype($variable), $this->whiteListTypeArray)) {
-            throw new Exception(sprintf('Could not render type of %s', \gettype($variable)));
+            throw new Exception(\sprintf('Could not render type of %s', \gettype($variable)));
         }
 
         return (string) $variable;
diff --git a/engine/Shopware/Bundle/FormBundle/StringRendererServiceInterface.php b/engine/Shopware/Bundle/FormBundle/StringRendererServiceInterface.php
index 004e01cb8fe..49be0ae590e 100644
--- a/engine/Shopware/Bundle/FormBundle/StringRendererServiceInterface.php
+++ b/engine/Shopware/Bundle/FormBundle/StringRendererServiceInterface.php
@@ -4,23 +4,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\FormBundle;
diff --git a/engine/Shopware/Bundle/FormBundle/Transformer/EntityTransformer.php b/engine/Shopware/Bundle/FormBundle/Transformer/EntityTransformer.php
index 3e2735766af..9865eeb44c8 100644
--- a/engine/Shopware/Bundle/FormBundle/Transformer/EntityTransformer.php
+++ b/engine/Shopware/Bundle/FormBundle/Transformer/EntityTransformer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\FormBundle\Transformer;
@@ -75,7 +75,7 @@ public function reverseTransform($entityId)
             // causes a validation error
             // this message is not shown to the user
             // see the invalid_message option
-            throw new TransformationFailedException(sprintf('An entity with id "%s" does not exist! (%s)', $entityId, $this->entityName));
+            throw new TransformationFailedException(\sprintf('An entity with id "%s" does not exist! (%s)', $entityId, $this->entityName));
         }
 
         return $entity;
diff --git a/engine/Shopware/Bundle/MailBundle/AutoCompleteResolver.php b/engine/Shopware/Bundle/MailBundle/AutoCompleteResolver.php
index c7d248c9da8..a3fc5207bff 100644
--- a/engine/Shopware/Bundle/MailBundle/AutoCompleteResolver.php
+++ b/engine/Shopware/Bundle/MailBundle/AutoCompleteResolver.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MailBundle;
diff --git a/engine/Shopware/Bundle/MailBundle/AutocompleteResolver/AbstractResolver.php b/engine/Shopware/Bundle/MailBundle/AutocompleteResolver/AbstractResolver.php
index 61966746c7d..97e54713e6e 100644
--- a/engine/Shopware/Bundle/MailBundle/AutocompleteResolver/AbstractResolver.php
+++ b/engine/Shopware/Bundle/MailBundle/AutocompleteResolver/AbstractResolver.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MailBundle\AutocompleteResolver;
diff --git a/engine/Shopware/Bundle/MailBundle/AutocompleteResolver/ForeachResolver.php b/engine/Shopware/Bundle/MailBundle/AutocompleteResolver/ForeachResolver.php
index 48d98604a7e..908df8e02b3 100644
--- a/engine/Shopware/Bundle/MailBundle/AutocompleteResolver/ForeachResolver.php
+++ b/engine/Shopware/Bundle/MailBundle/AutocompleteResolver/ForeachResolver.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MailBundle\AutocompleteResolver;
diff --git a/engine/Shopware/Bundle/MailBundle/AutocompleteResolver/ResolverInterface.php b/engine/Shopware/Bundle/MailBundle/AutocompleteResolver/ResolverInterface.php
index 55f70d94381..5a6592d10f9 100644
--- a/engine/Shopware/Bundle/MailBundle/AutocompleteResolver/ResolverInterface.php
+++ b/engine/Shopware/Bundle/MailBundle/AutocompleteResolver/ResolverInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MailBundle\AutocompleteResolver;
diff --git a/engine/Shopware/Bundle/MailBundle/AutocompleteResolver/ShortForeachResolver.php b/engine/Shopware/Bundle/MailBundle/AutocompleteResolver/ShortForeachResolver.php
index 60578a28c0b..7ada589c442 100644
--- a/engine/Shopware/Bundle/MailBundle/AutocompleteResolver/ShortForeachResolver.php
+++ b/engine/Shopware/Bundle/MailBundle/AutocompleteResolver/ShortForeachResolver.php
@@ -1,25 +1,27 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MailBundle\AutocompleteResolver;
@@ -34,10 +36,6 @@ public function completer(array $context, string $smartyCode): array
 
         if (!empty($matches)) {
             foreach ($matches as $match) {
-                if (!isset($match['arrayName'], $match['value'])) {
-                    continue;
-                }
-
                 $value = $this->getValueFromPath($context, $match['arrayName']);
 
                 if ($value === null) {
@@ -47,14 +45,10 @@ public function completer(array $context, string $smartyCode): array
                 if (\count($value)) {
                     $key = array_keys($value)[0];
                     $context[$match['value']] = $value[$key];
-                    if (isset($match['key'])) {
-                        $context[$match['key']] = $key;
-                    }
+                    $context[$match['key']] = $key;
                 } else {
                     $context[$match['value']] = [];
-                    if (isset($match['key'])) {
-                        $context[$match['key']] = 0;
-                    }
+                    $context[$match['key']] = 0;
                 }
             }
         }
diff --git a/engine/Shopware/Bundle/MailBundle/Controllers/Backend/MailLog.php b/engine/Shopware/Bundle/MailBundle/Controllers/Backend/MailLog.php
index b6ddb70a7e3..42b3c77990a 100644
--- a/engine/Shopware/Bundle/MailBundle/Controllers/Backend/MailLog.php
+++ b/engine/Shopware/Bundle/MailBundle/Controllers/Backend/MailLog.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MailBundle\Controllers\Backend;
diff --git a/engine/Shopware/Bundle/MailBundle/Controllers/Backend/MailLogContact.php b/engine/Shopware/Bundle/MailBundle/Controllers/Backend/MailLogContact.php
index 1e7499dfa57..0fa6e3c1976 100644
--- a/engine/Shopware/Bundle/MailBundle/Controllers/Backend/MailLogContact.php
+++ b/engine/Shopware/Bundle/MailBundle/Controllers/Backend/MailLogContact.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MailBundle\Controllers\Backend;
diff --git a/engine/Shopware/Bundle/MailBundle/DependencyInjection/EventListener/MailLogCleanupCronSubscriber.php b/engine/Shopware/Bundle/MailBundle/DependencyInjection/EventListener/MailLogCleanupCronSubscriber.php
index a6793a7eec4..586f4c6fa20 100644
--- a/engine/Shopware/Bundle/MailBundle/DependencyInjection/EventListener/MailLogCleanupCronSubscriber.php
+++ b/engine/Shopware/Bundle/MailBundle/DependencyInjection/EventListener/MailLogCleanupCronSubscriber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MailBundle\DependencyInjection\EventListener;
@@ -63,7 +63,7 @@ public static function getSubscribedEvents(): array
     public function mailLogCleanup(): void
     {
         $now = new DateTime('now');
-        $maximumAgeInterval = new DateInterval(sprintf('P%dD', $this->maximumAgeInDays));
+        $maximumAgeInterval = new DateInterval(\sprintf('P%dD', $this->maximumAgeInDays));
 
         $this->logRepository->deleteByDate(null, $now->sub($maximumAgeInterval));
     }
diff --git a/engine/Shopware/Bundle/MailBundle/DependencyInjection/EventListener/MailSubscriber.php b/engine/Shopware/Bundle/MailBundle/DependencyInjection/EventListener/MailSubscriber.php
index 995bf7a37c4..db0f63b0032 100644
--- a/engine/Shopware/Bundle/MailBundle/DependencyInjection/EventListener/MailSubscriber.php
+++ b/engine/Shopware/Bundle/MailBundle/DependencyInjection/EventListener/MailSubscriber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MailBundle\DependencyInjection\EventListener;
diff --git a/engine/Shopware/Bundle/MailBundle/DependencyInjection/EventListener/TerminationSubscriber.php b/engine/Shopware/Bundle/MailBundle/DependencyInjection/EventListener/TerminationSubscriber.php
index 35271244d11..77101254a92 100644
--- a/engine/Shopware/Bundle/MailBundle/DependencyInjection/EventListener/TerminationSubscriber.php
+++ b/engine/Shopware/Bundle/MailBundle/DependencyInjection/EventListener/TerminationSubscriber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MailBundle\DependencyInjection\EventListener;
diff --git a/engine/Shopware/Bundle/MailBundle/DependencyInjection/services.xml b/engine/Shopware/Bundle/MailBundle/DependencyInjection/services.xml
index ad54f8fec30..4615fc34577 100644
--- a/engine/Shopware/Bundle/MailBundle/DependencyInjection/services.xml
+++ b/engine/Shopware/Bundle/MailBundle/DependencyInjection/services.xml
@@ -41,6 +41,7 @@
                  class="Shopware\Bundle\MailBundle\Service\LogEntryMailBuilder">
             <argument type="service" id="shopware.filesystem.private" />
             <argument type="service" id="Shopware\Bundle\MediaBundle\MediaServiceInterface" />
+            <argument type="service" id="mail"/>
         </service>
 
         <service id="Shopware\Bundle\MailBundle\Service\LogServiceInterface"
diff --git a/engine/Shopware/Bundle/MailBundle/MailBundle.php b/engine/Shopware/Bundle/MailBundle/MailBundle.php
index c95b2434cae..f9ad669a303 100644
--- a/engine/Shopware/Bundle/MailBundle/MailBundle.php
+++ b/engine/Shopware/Bundle/MailBundle/MailBundle.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MailBundle;
diff --git a/engine/Shopware/Bundle/MailBundle/Service/Filter/AdministrativeMailFilter.php b/engine/Shopware/Bundle/MailBundle/Service/Filter/AdministrativeMailFilter.php
index e3d06af259b..291d5f2a1c2 100644
--- a/engine/Shopware/Bundle/MailBundle/Service/Filter/AdministrativeMailFilter.php
+++ b/engine/Shopware/Bundle/MailBundle/Service/Filter/AdministrativeMailFilter.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MailBundle\Service\Filter;
diff --git a/engine/Shopware/Bundle/MailBundle/Service/Filter/AssociationExistsFilter.php b/engine/Shopware/Bundle/MailBundle/Service/Filter/AssociationExistsFilter.php
index 0db3648dc77..084c0fa6797 100644
--- a/engine/Shopware/Bundle/MailBundle/Service/Filter/AssociationExistsFilter.php
+++ b/engine/Shopware/Bundle/MailBundle/Service/Filter/AssociationExistsFilter.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MailBundle\Service\Filter;
diff --git a/engine/Shopware/Bundle/MailBundle/Service/Filter/MailFilterInterface.php b/engine/Shopware/Bundle/MailBundle/Service/Filter/MailFilterInterface.php
index 455d7e295c3..2178190aad7 100644
--- a/engine/Shopware/Bundle/MailBundle/Service/Filter/MailFilterInterface.php
+++ b/engine/Shopware/Bundle/MailBundle/Service/Filter/MailFilterInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MailBundle\Service\Filter;
diff --git a/engine/Shopware/Bundle/MailBundle/Service/Filter/NewsletterMailFilter.php b/engine/Shopware/Bundle/MailBundle/Service/Filter/NewsletterMailFilter.php
index 4df913e9b2c..df81f97e670 100644
--- a/engine/Shopware/Bundle/MailBundle/Service/Filter/NewsletterMailFilter.php
+++ b/engine/Shopware/Bundle/MailBundle/Service/Filter/NewsletterMailFilter.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MailBundle\Service\Filter;
diff --git a/engine/Shopware/Bundle/MailBundle/Service/LogEntryBuilder.php b/engine/Shopware/Bundle/MailBundle/Service/LogEntryBuilder.php
index 19e1ee424a5..a5038f4a3d2 100644
--- a/engine/Shopware/Bundle/MailBundle/Service/LogEntryBuilder.php
+++ b/engine/Shopware/Bundle/MailBundle/Service/LogEntryBuilder.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MailBundle\Service;
@@ -70,7 +69,7 @@ public function build(Enlight_Components_Mail $mail): Log
     {
         $logEntry = new Log();
 
-        $logEntry->setSubject((string) iconv_mime_decode($mail->getSubject()));
+        $logEntry->setSubject((string) iconv_mime_decode((string) $mail->getSubject()));
         $logEntry->setSender($mail->getFrom());
         $logEntry->setSentAt(new DateTime((string) $mail->getDate()));
         $logEntry->setContentText($mail->getPlainBodyText());
@@ -300,6 +299,6 @@ protected function getDocumentFilename(array $document): ?string
             return null;
         }
 
-        return sprintf('%s.pdf', $document['type']['name']);
+        return \sprintf('%s.pdf', $document['type']['name']);
     }
 }
diff --git a/engine/Shopware/Bundle/MailBundle/Service/LogEntryBuilderInterface.php b/engine/Shopware/Bundle/MailBundle/Service/LogEntryBuilderInterface.php
index 36e1441ccce..21c7c14ae19 100644
--- a/engine/Shopware/Bundle/MailBundle/Service/LogEntryBuilderInterface.php
+++ b/engine/Shopware/Bundle/MailBundle/Service/LogEntryBuilderInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MailBundle\Service;
diff --git a/engine/Shopware/Bundle/MailBundle/Service/LogEntryMailBuilder.php b/engine/Shopware/Bundle/MailBundle/Service/LogEntryMailBuilder.php
index 096fda6f348..0c69b79bd8f 100644
--- a/engine/Shopware/Bundle/MailBundle/Service/LogEntryMailBuilder.php
+++ b/engine/Shopware/Bundle/MailBundle/Service/LogEntryMailBuilder.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MailBundle\Service;
@@ -29,26 +29,22 @@
 use RuntimeException;
 use Shopware\Bundle\MediaBundle\MediaServiceInterface;
 use Shopware\Models\Mail\Log;
-use Shopware\Models\Order\Document\Document;
 
 class LogEntryMailBuilder implements LogEntryMailBuilderInterface
 {
     public const INVALID_SENDER_REPLACEMENT_ADDRESS = 'invalid@example.com';
 
-    /**
-     * @var FilesystemInterface
-     */
-    private $filesystem;
+    private FilesystemInterface $filesystem;
 
-    /**
-     * @var MediaServiceInterface
-     */
-    private $mediaService;
+    private MediaServiceInterface $mediaService;
+
+    private Enlight_Components_Mail $mail;
 
-    public function __construct(FilesystemInterface $filesystem, MediaServiceInterface $mediaService)
+    public function __construct(FilesystemInterface $filesystem, MediaServiceInterface $mediaService, Enlight_Components_Mail $mail)
     {
         $this->filesystem = $filesystem;
         $this->mediaService = $mediaService;
+        $this->mail = $mail;
     }
 
     /**
@@ -56,7 +52,7 @@ public function __construct(FilesystemInterface $filesystem, MediaServiceInterfa
      */
     public function build(Log $entry): Enlight_Components_Mail
     {
-        $mail = new Enlight_Components_Mail('UTF-8');
+        $mail = clone $this->mail;
 
         try {
             $mail->setFrom($entry->getSender());
@@ -104,10 +100,9 @@ protected function assignOrderDocuments(Log $logEntry, Enlight_Components_Mail $
             return;
         }
 
-        /** @var Document $document */
         foreach ($logEntry->getDocuments() as $document) {
-            $filePath = sprintf('documents/%s.pdf', $document->getHash());
-            $fileName = sprintf('%s.pdf', $document->getType()->getName());
+            $filePath = \sprintf('documents/%s.pdf', $document->getHash());
+            $fileName = \sprintf('%s.pdf', $document->getType()->getName());
 
             if (!$this->filesystem->has($filePath)) {
                 continue;
diff --git a/engine/Shopware/Bundle/MailBundle/Service/LogEntryMailBuilderInterface.php b/engine/Shopware/Bundle/MailBundle/Service/LogEntryMailBuilderInterface.php
index 4ce2d2855c0..9db0e38f4b6 100644
--- a/engine/Shopware/Bundle/MailBundle/Service/LogEntryMailBuilderInterface.php
+++ b/engine/Shopware/Bundle/MailBundle/Service/LogEntryMailBuilderInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MailBundle\Service;
diff --git a/engine/Shopware/Bundle/MailBundle/Service/LogService.php b/engine/Shopware/Bundle/MailBundle/Service/LogService.php
index 589e0dd65fd..ef5936802a4 100644
--- a/engine/Shopware/Bundle/MailBundle/Service/LogService.php
+++ b/engine/Shopware/Bundle/MailBundle/Service/LogService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MailBundle\Service;
@@ -93,7 +93,7 @@ public function flush(): void
                     'order_id' => $entry->getOrder() ? $entry->getOrder()->getId() : null,
                     'shop_id' => $entry->getShop() ? $entry->getShop()->getId() : null,
                     'subject' => $entry->getSubject(),
-                    'sender' => $entry->getSender(),
+                    'sender' => (string) $entry->getSender(),
                     'sent_at' => $entry->getSentAt()->format('Y-m-d H:i:s'),
                     'content_html' => $entry->getContentHtml(),
                     'content_text' => $entry->getContentText(),
@@ -112,7 +112,7 @@ public function flush(): void
 
                     $this->connection->insert('s_mail_log_recipient', [
                         'log_id' => $mailLogId,
-                        'contact_id' => $recipient->getId() ?: $contacts[$mail],
+                        'contact_id' => $recipient->getId() ?: (int) $contacts[$mail],
                     ]);
                 }
             }
@@ -159,6 +159,9 @@ private function loadContacts(): array
         }
 
         $recipients = array_unique(array_filter(array_map('trim', $recipients)));
+        if (empty($recipients)) {
+            return [];
+        }
 
         $sql = 'SELECT LOWER(mail_address), id FROM s_mail_log_contact WHERE mail_address IN (:addresses)';
         $foundRecipients = $this->connection->executeQuery($sql, ['addresses' => $recipients])->fetchAll(PDO::FETCH_KEY_PAIR);
diff --git a/engine/Shopware/Bundle/MailBundle/Service/LogServiceInterface.php b/engine/Shopware/Bundle/MailBundle/Service/LogServiceInterface.php
index 0dbf1be3572..5df8b034e42 100644
--- a/engine/Shopware/Bundle/MailBundle/Service/LogServiceInterface.php
+++ b/engine/Shopware/Bundle/MailBundle/Service/LogServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MailBundle\Service;
diff --git a/engine/Shopware/Bundle/MediaBundle/Adapters/AdapterFactoryInterface.php b/engine/Shopware/Bundle/MediaBundle/Adapters/AdapterFactoryInterface.php
index 7e0e036ca43..512cc5b48ff 100644
--- a/engine/Shopware/Bundle/MediaBundle/Adapters/AdapterFactoryInterface.php
+++ b/engine/Shopware/Bundle/MediaBundle/Adapters/AdapterFactoryInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle\Adapters;
diff --git a/engine/Shopware/Bundle/MediaBundle/Adapters/AwsS3v3Factory.php b/engine/Shopware/Bundle/MediaBundle/Adapters/AwsS3v3Factory.php
index f56023dd560..0a2089bce89 100644
--- a/engine/Shopware/Bundle/MediaBundle/Adapters/AwsS3v3Factory.php
+++ b/engine/Shopware/Bundle/MediaBundle/Adapters/AwsS3v3Factory.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle\Adapters;
diff --git a/engine/Shopware/Bundle/MediaBundle/Adapters/FtpAdapterFactory.php b/engine/Shopware/Bundle/MediaBundle/Adapters/FtpAdapterFactory.php
index 7be42f0043d..fd5cec7a9f0 100644
--- a/engine/Shopware/Bundle/MediaBundle/Adapters/FtpAdapterFactory.php
+++ b/engine/Shopware/Bundle/MediaBundle/Adapters/FtpAdapterFactory.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle\Adapters;
diff --git a/engine/Shopware/Bundle/MediaBundle/Adapters/GoogleStorageFactory.php b/engine/Shopware/Bundle/MediaBundle/Adapters/GoogleStorageFactory.php
index 5660bab49b8..b906237343e 100644
--- a/engine/Shopware/Bundle/MediaBundle/Adapters/GoogleStorageFactory.php
+++ b/engine/Shopware/Bundle/MediaBundle/Adapters/GoogleStorageFactory.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle\Adapters;
diff --git a/engine/Shopware/Bundle/MediaBundle/Adapters/LocalAdapterFactory.php b/engine/Shopware/Bundle/MediaBundle/Adapters/LocalAdapterFactory.php
index b7c02b3a280..5989a5948b8 100644
--- a/engine/Shopware/Bundle/MediaBundle/Adapters/LocalAdapterFactory.php
+++ b/engine/Shopware/Bundle/MediaBundle/Adapters/LocalAdapterFactory.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle\Adapters;
diff --git a/engine/Shopware/Bundle/MediaBundle/CacheOptimizerService.php b/engine/Shopware/Bundle/MediaBundle/CacheOptimizerService.php
index 12666646b9a..d4c76ab39dd 100644
--- a/engine/Shopware/Bundle/MediaBundle/CacheOptimizerService.php
+++ b/engine/Shopware/Bundle/MediaBundle/CacheOptimizerService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle;
diff --git a/engine/Shopware/Bundle/MediaBundle/CdnOptimizerService.php b/engine/Shopware/Bundle/MediaBundle/CdnOptimizerService.php
index 6cf7b32fdd9..8c4e4a9efc5 100644
--- a/engine/Shopware/Bundle/MediaBundle/CdnOptimizerService.php
+++ b/engine/Shopware/Bundle/MediaBundle/CdnOptimizerService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle;
@@ -52,7 +52,7 @@ class CdnOptimizerService implements OptimizerServiceInterface
     public function __construct(
         OptimizerServiceInterface $optimizerService,
         MediaServiceInterface $mediaService,
-        FilesystemInterface $filesystem = null
+        ?FilesystemInterface $filesystem = null
     ) {
         $this->optimizerService = $optimizerService;
         $this->mediaService = $mediaService;
diff --git a/engine/Shopware/Bundle/MediaBundle/Commands/ImageMigrateCommand.php b/engine/Shopware/Bundle/MediaBundle/Commands/ImageMigrateCommand.php
index b4998baa000..d0a4d47426b 100644
--- a/engine/Shopware/Bundle/MediaBundle/Commands/ImageMigrateCommand.php
+++ b/engine/Shopware/Bundle/MediaBundle/Commands/ImageMigrateCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle\Commands;
diff --git a/engine/Shopware/Bundle/MediaBundle/Commands/MediaCleanupCommand.php b/engine/Shopware/Bundle/MediaBundle/Commands/MediaCleanupCommand.php
index cf99bb39c0d..0383bcefe6e 100644
--- a/engine/Shopware/Bundle/MediaBundle/Commands/MediaCleanupCommand.php
+++ b/engine/Shopware/Bundle/MediaBundle/Commands/MediaCleanupCommand.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle\Commands;
@@ -62,7 +61,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $io->section('Searching for unused media files.');
         $total = $this->handleMove();
-        $io->text(sprintf('%s unused item(s) found.', $total));
+        $io->text(\sprintf('%s unused item(s) found.', $total));
 
         if ($total === 0) {
             return 0;
@@ -74,12 +73,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
 
             $deleted = $this->handleCleanup($io);
-            $io->success(sprintf('%d item(s) deleted.', $deleted));
+            $io->success(\sprintf('%d item(s) deleted.', $deleted));
 
             return 0;
         }
 
-        $io->success(sprintf('%d item(s) in recycle bin.', $total));
+        $io->success(\sprintf('%d item(s) in recycle bin.', $total));
 
         return 0;
     }
diff --git a/engine/Shopware/Bundle/MediaBundle/Commands/MediaOptimizeCommand.php b/engine/Shopware/Bundle/MediaBundle/Commands/MediaOptimizeCommand.php
index 4f941216a61..dd8cfe82fd0 100644
--- a/engine/Shopware/Bundle/MediaBundle/Commands/MediaOptimizeCommand.php
+++ b/engine/Shopware/Bundle/MediaBundle/Commands/MediaOptimizeCommand.php
@@ -1,29 +1,31 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle\Commands;
 
+use DateTime;
+use Exception;
 use League\Flysystem\FileExistsException;
 use League\Flysystem\FileNotFoundException;
 use Shopware\Bundle\MediaBundle\Exception\OptimizerNotFoundException;
@@ -91,7 +93,18 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $optimizerService = $this->getContainer()->get('shopware_media.cdn_optimizer_service');
-        $mediaService = $this->getContainer()->get(\Shopware\Bundle\MediaBundle\MediaServiceInterface::class);
+        $mediaService = $this->getContainer()->get(MediaServiceInterface::class);
+
+        if ($input->getOption('modified')) {
+            $errors = date_parse($input->getOption('modified'))['errors'];
+            if ($errors) {
+                $output->writeln("<error>You have provided an invalid date string!
+Please only use a valid date string that conists of 'd-m-Y' e.g '10-05-2022'. You can also provide 'd-m-Y h:i:s' e.g '10-05-2022 10:15:00'.
+If you want to enhance the date even further you can consult the PHP documentation regarding valid formats https://www.php.net/manual/en/datetime.formats.php' </error>");
+
+                return 1;
+            }
+        }
 
         if ($this->hasRunnableOptimizer() === false) {
             $output->writeln('<error>No runnable optimizer found. Consider installing one of the following optimizers.</error>');
@@ -145,7 +158,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $progress = new ProgressBar($output, $numberOfFiles);
 
-        $this->optimizeFiles($path, $mediaService, $optimizerService, $progress, $output);
+        $this->optimizeFiles($path, $input, $mediaService, $optimizerService, $progress, $output);
 
         $progress->finish();
 
@@ -153,10 +166,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
     }
 
     /**
-     * @param string $directory
+     * @throws Exception
      */
     private function optimizeFiles(
-        $directory,
+        string $directory,
+        InputInterface $input,
         MediaServiceInterface $mediaService,
         OptimizerServiceInterface $optimizerService,
         ProgressBar $progressBar,
@@ -164,14 +178,22 @@ private function optimizeFiles(
     ) {
         /** @var array $contents */
         $contents = $mediaService->getFilesystem()->listContents($directory);
-
         foreach ($contents as $item) {
             if ($item['type'] === 'dir') {
-                $this->optimizeFiles($item['path'], $mediaService, $optimizerService, $progressBar, $output);
+                $this->optimizeFiles($item['path'], $input, $mediaService, $optimizerService, $progressBar, $output);
                 continue;
             }
 
             if ($item['type'] === 'file') {
+                if ($input->getOption('modified')) {
+                    $modifiedDateTime = new DateTime($input->getOption('modified'));
+
+                    if ($modifiedDateTime->getTimestamp() > $item['timestamp']) {
+                        $progressBar->advance();
+                        continue;
+                    }
+                }
+
                 if (strpos($item['basename'], '.') === 0) {
                     $progressBar->advance();
                     continue;
@@ -215,10 +237,7 @@ private function displayCapabilities(OutputInterface $output, array $capabilitie
         $table->render();
     }
 
-    /**
-     * @return bool
-     */
-    private function hasRunnableOptimizer()
+    private function hasRunnableOptimizer(): bool
     {
         $optimizerService = $this->getContainer()->get(\Shopware\Bundle\MediaBundle\OptimizerService::class);
 
diff --git a/engine/Shopware/Bundle/MediaBundle/Exception/MediaFileExtensionIsBlacklistedException.php b/engine/Shopware/Bundle/MediaBundle/Exception/MediaFileExtensionIsBlacklistedException.php
index 50e001587ad..729975a5150 100644
--- a/engine/Shopware/Bundle/MediaBundle/Exception/MediaFileExtensionIsBlacklistedException.php
+++ b/engine/Shopware/Bundle/MediaBundle/Exception/MediaFileExtensionIsBlacklistedException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle\Exception;
@@ -36,7 +36,7 @@ class MediaFileExtensionIsBlacklistedException extends Exception
     public function __construct($extension)
     {
         $this->extension = $extension;
-        $message = sprintf('The file extension "%s" is blacklisted.', $extension);
+        $message = \sprintf('The file extension "%s" is blacklisted.', $extension);
 
         parent::__construct($message);
     }
diff --git a/engine/Shopware/Bundle/MediaBundle/Exception/MediaFileExtensionNotAllowedException.php b/engine/Shopware/Bundle/MediaBundle/Exception/MediaFileExtensionNotAllowedException.php
index 1055af3b42a..9aa5636b501 100644
--- a/engine/Shopware/Bundle/MediaBundle/Exception/MediaFileExtensionNotAllowedException.php
+++ b/engine/Shopware/Bundle/MediaBundle/Exception/MediaFileExtensionNotAllowedException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle\Exception;
@@ -34,7 +34,7 @@ public function __construct($extension)
     {
         $this->extension = $extension;
 
-        $message = sprintf('The media file extension "%s" is not allowed.', $extension);
+        $message = \sprintf('The media file extension "%s" is not allowed.', $extension);
 
         parent::__construct($message);
     }
diff --git a/engine/Shopware/Bundle/MediaBundle/Exception/OptimizerNotFoundException.php b/engine/Shopware/Bundle/MediaBundle/Exception/OptimizerNotFoundException.php
index 1645a6e59c6..520cd3458a8 100644
--- a/engine/Shopware/Bundle/MediaBundle/Exception/OptimizerNotFoundException.php
+++ b/engine/Shopware/Bundle/MediaBundle/Exception/OptimizerNotFoundException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle\Exception;
diff --git a/engine/Shopware/Bundle/MediaBundle/Exception/WrongMediaTypeForReplaceException.php b/engine/Shopware/Bundle/MediaBundle/Exception/WrongMediaTypeForReplaceException.php
index cb1fa76f3fd..bdc32b54d13 100644
--- a/engine/Shopware/Bundle/MediaBundle/Exception/WrongMediaTypeForReplaceException.php
+++ b/engine/Shopware/Bundle/MediaBundle/Exception/WrongMediaTypeForReplaceException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle\Exception;
@@ -37,7 +37,7 @@ public function __construct($requiredType)
     {
         $this->requiredType = $requiredType;
 
-        $message = sprintf('To replace the media file, a "%s" file is required.', $requiredType);
+        $message = \sprintf('To replace the media file, a "%s" file is required.', $requiredType);
         parent::__construct($message);
     }
 
diff --git a/engine/Shopware/Bundle/MediaBundle/GarbageCollector.php b/engine/Shopware/Bundle/MediaBundle/GarbageCollector.php
index 3fefd357820..08460ce1517 100644
--- a/engine/Shopware/Bundle/MediaBundle/GarbageCollector.php
+++ b/engine/Shopware/Bundle/MediaBundle/GarbageCollector.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle;
@@ -233,7 +232,7 @@ private function handleTablesWithIdsSeparatedByPipes(MediaPosition $mediaPositio
 
     private function handleTable(MediaPosition $mediaPosition): void
     {
-        $sql = sprintf(
+        $sql = \sprintf(
             'INSERT INTO s_media_used
                 SELECT DISTINCT NULL, media.id
                 FROM s_media media
@@ -275,7 +274,7 @@ private function processQueue(): void
         if (!empty($this->queue['id'])) {
             $ids = array_keys(array_flip($this->queue['id']));
             $this->connection->executeQuery(
-                sprintf('INSERT INTO s_media_used (mediaId) VALUES (%s)', implode('),(', $ids))
+                \sprintf('INSERT INTO s_media_used (mediaId) VALUES (%s)', implode('),(', $ids))
             );
         }
     }
diff --git a/engine/Shopware/Bundle/MediaBundle/GarbageCollectorFactory.php b/engine/Shopware/Bundle/MediaBundle/GarbageCollectorFactory.php
index cce2fdc209c..b2333393469 100644
--- a/engine/Shopware/Bundle/MediaBundle/GarbageCollectorFactory.php
+++ b/engine/Shopware/Bundle/MediaBundle/GarbageCollectorFactory.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle;
diff --git a/engine/Shopware/Bundle/MediaBundle/MediaBundle.php b/engine/Shopware/Bundle/MediaBundle/MediaBundle.php
index 890963fcec6..2a2c37132ab 100644
--- a/engine/Shopware/Bundle/MediaBundle/MediaBundle.php
+++ b/engine/Shopware/Bundle/MediaBundle/MediaBundle.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle;
diff --git a/engine/Shopware/Bundle/MediaBundle/MediaExtensionMappingService.php b/engine/Shopware/Bundle/MediaBundle/MediaExtensionMappingService.php
index c041aae7311..1073ee67415 100644
--- a/engine/Shopware/Bundle/MediaBundle/MediaExtensionMappingService.php
+++ b/engine/Shopware/Bundle/MediaBundle/MediaExtensionMappingService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle;
diff --git a/engine/Shopware/Bundle/MediaBundle/MediaExtensionMappingServiceInterface.php b/engine/Shopware/Bundle/MediaBundle/MediaExtensionMappingServiceInterface.php
index 7cb1fb17bd5..1ae7e4b18a8 100644
--- a/engine/Shopware/Bundle/MediaBundle/MediaExtensionMappingServiceInterface.php
+++ b/engine/Shopware/Bundle/MediaBundle/MediaExtensionMappingServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle;
diff --git a/engine/Shopware/Bundle/MediaBundle/MediaMigration.php b/engine/Shopware/Bundle/MediaBundle/MediaMigration.php
index 07c21c70d4c..8d0502f3635 100644
--- a/engine/Shopware/Bundle/MediaBundle/MediaMigration.php
+++ b/engine/Shopware/Bundle/MediaBundle/MediaMigration.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle;
diff --git a/engine/Shopware/Bundle/MediaBundle/MediaReplaceService.php b/engine/Shopware/Bundle/MediaBundle/MediaReplaceService.php
index c8a6ed5f26d..780a0bafe8a 100644
--- a/engine/Shopware/Bundle/MediaBundle/MediaReplaceService.php
+++ b/engine/Shopware/Bundle/MediaBundle/MediaReplaceService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle;
@@ -76,12 +76,12 @@ public function replace($mediaId, UploadedFile $file)
         $media = $this->modelManager->find(Media::class, $mediaId);
 
         if ($media === null) {
-            throw new InvalidArgumentException(sprintf('Media with id %s not found', $mediaId));
+            throw new InvalidArgumentException(\sprintf('Media with id %s not found', $mediaId));
         }
 
         $filePath = $file->getRealPath();
         if (!\is_string($filePath)) {
-            throw new UnexpectedValueException(sprintf('Could not get path of file "%s"', $file->getFilename()));
+            throw new UnexpectedValueException(\sprintf('Could not get path of file "%s"', $file->getFilename()));
         }
 
         $uploadedFileExtension = $this->getExtension($file);
@@ -103,7 +103,7 @@ public function replace($mediaId, UploadedFile $file)
             $this->mediaService->write($media->getPath(), $fileContent);
         } else {
             $pathInfo = pathinfo($media->getPath());
-            $newFileName = sprintf('%s/%s.%s', $pathInfo['dirname'], $pathInfo['filename'], $newExtension);
+            $newFileName = \sprintf('%s/%s.%s', $pathInfo['dirname'] ?? '', $pathInfo['filename'], $newExtension);
             $this->mediaService->delete($media->getPath());
             $this->mediaService->write($newFileName, $fileContent);
             $this->modelManager->getConnection()->update('s_articles_img', [
diff --git a/engine/Shopware/Bundle/MediaBundle/MediaReplaceServiceInterface.php b/engine/Shopware/Bundle/MediaBundle/MediaReplaceServiceInterface.php
index 55c4d41adf0..c61945afd87 100644
--- a/engine/Shopware/Bundle/MediaBundle/MediaReplaceServiceInterface.php
+++ b/engine/Shopware/Bundle/MediaBundle/MediaReplaceServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle;
@@ -35,6 +35,8 @@ interface MediaReplaceServiceInterface
      * @param int $mediaId
      *
      * @throws Exception
+     *
+     * @return void
      */
     public function replace($mediaId, UploadedFile $file);
 }
diff --git a/engine/Shopware/Bundle/MediaBundle/MediaService.php b/engine/Shopware/Bundle/MediaBundle/MediaService.php
index 6d54e1492c7..8135f937a02 100644
--- a/engine/Shopware/Bundle/MediaBundle/MediaService.php
+++ b/engine/Shopware/Bundle/MediaBundle/MediaService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle;
@@ -70,7 +70,7 @@ public function __construct(FilesystemInterface $filesystem, StrategyInterface $
         $this->config = $config;
 
         if (!isset($config['mediaUrl'])) {
-            throw new Exception(sprintf('Please provide a "mediaUrl" in your %s adapter.', $config['type']));
+            throw new Exception(\sprintf('Please provide a "mediaUrl" in your %s adapter.', $config['type']));
         }
 
         $mediaUrl = $config['mediaUrl'] ?: $this->createFallbackMediaUrl();
diff --git a/engine/Shopware/Bundle/MediaBundle/MediaServiceFactory.php b/engine/Shopware/Bundle/MediaBundle/MediaServiceFactory.php
index 69d653a6dde..49e2095f909 100644
--- a/engine/Shopware/Bundle/MediaBundle/MediaServiceFactory.php
+++ b/engine/Shopware/Bundle/MediaBundle/MediaServiceFactory.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle;
@@ -31,6 +31,7 @@
 use League\Flysystem\AdapterInterface;
 use League\Flysystem\Filesystem;
 use Shopware\Bundle\MediaBundle\Adapters\AdapterFactoryInterface;
+use Shopware\Bundle\MediaBundle\Strategy\StrategyFactory;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 class MediaServiceFactory
@@ -69,7 +70,7 @@ public function __construct(ContainerInterface $container, IteratorAggregate $ad
     public function factory($backendName)
     {
         if (!isset($this->cdnConfig['adapters'][$backendName])) {
-            throw new Exception(sprintf('Configuration "%s" not found', $backendName));
+            throw new Exception(\sprintf('Configuration "%s" not found', $backendName));
         }
 
         // Filesystem
@@ -78,7 +79,7 @@ public function factory($backendName)
         $filesystem = new Filesystem($adapter, ['visibility' => AdapterInterface::VISIBILITY_PUBLIC]);
 
         // Strategy
-        $strategyFactory = $this->container->get(\Shopware\Bundle\MediaBundle\Strategy\StrategyFactory::class);
+        $strategyFactory = $this->container->get(StrategyFactory::class);
         $strategyName = isset($config['strategy']) ? $config['strategy'] : $this->cdnConfig['strategy'];
         $strategy = $strategyFactory->factory($strategyName);
 
@@ -103,7 +104,7 @@ private function getAdapterByCollectEvent($config)
         $adapter = $adapters->first();
 
         if (!$adapter) {
-            throw new Exception(sprintf('CDN Adapter "%s" not found.', $config['type']));
+            throw new Exception(\sprintf('CDN Adapter "%s" not found.', $config['type']));
         }
 
         return $adapter;
diff --git a/engine/Shopware/Bundle/MediaBundle/MediaServiceInterface.php b/engine/Shopware/Bundle/MediaBundle/MediaServiceInterface.php
index 201a284eafd..b951aba5992 100644
--- a/engine/Shopware/Bundle/MediaBundle/MediaServiceInterface.php
+++ b/engine/Shopware/Bundle/MediaBundle/MediaServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle;
diff --git a/engine/Shopware/Bundle/MediaBundle/Optimizer/BinaryOptimizer.php b/engine/Shopware/Bundle/MediaBundle/Optimizer/BinaryOptimizer.php
index c99415b4d48..aae7692faf4 100644
--- a/engine/Shopware/Bundle/MediaBundle/Optimizer/BinaryOptimizer.php
+++ b/engine/Shopware/Bundle/MediaBundle/Optimizer/BinaryOptimizer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle\Optimizer;
@@ -31,7 +31,7 @@ abstract class BinaryOptimizer implements OptimizerInterface
     /**
      * @var bool
      */
-    private $isRunnable = null;
+    private $isRunnable;
 
     /**
      * @return string
diff --git a/engine/Shopware/Bundle/MediaBundle/Optimizer/GuetzliOptimizer.php b/engine/Shopware/Bundle/MediaBundle/Optimizer/GuetzliOptimizer.php
index c5ac2fef2bb..48aecd4d454 100644
--- a/engine/Shopware/Bundle/MediaBundle/Optimizer/GuetzliOptimizer.php
+++ b/engine/Shopware/Bundle/MediaBundle/Optimizer/GuetzliOptimizer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle\Optimizer;
diff --git a/engine/Shopware/Bundle/MediaBundle/Optimizer/JpegoptimOptimizer.php b/engine/Shopware/Bundle/MediaBundle/Optimizer/JpegoptimOptimizer.php
index ede9927f1d9..5e963c8f050 100644
--- a/engine/Shopware/Bundle/MediaBundle/Optimizer/JpegoptimOptimizer.php
+++ b/engine/Shopware/Bundle/MediaBundle/Optimizer/JpegoptimOptimizer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle\Optimizer;
diff --git a/engine/Shopware/Bundle/MediaBundle/Optimizer/JpegtranOptimizer.php b/engine/Shopware/Bundle/MediaBundle/Optimizer/JpegtranOptimizer.php
index 40b07f75cd9..5cb174a32ac 100644
--- a/engine/Shopware/Bundle/MediaBundle/Optimizer/JpegtranOptimizer.php
+++ b/engine/Shopware/Bundle/MediaBundle/Optimizer/JpegtranOptimizer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle\Optimizer;
diff --git a/engine/Shopware/Bundle/MediaBundle/Optimizer/OptimizerInterface.php b/engine/Shopware/Bundle/MediaBundle/Optimizer/OptimizerInterface.php
index a6c0b0e2eee..fa49530c63f 100644
--- a/engine/Shopware/Bundle/MediaBundle/Optimizer/OptimizerInterface.php
+++ b/engine/Shopware/Bundle/MediaBundle/Optimizer/OptimizerInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle\Optimizer;
@@ -33,6 +33,8 @@ public function getName();
 
     /**
      * @param string $filepath
+     *
+     * @return void
      */
     public function run($filepath);
 
diff --git a/engine/Shopware/Bundle/MediaBundle/Optimizer/OptipngOptimizer.php b/engine/Shopware/Bundle/MediaBundle/Optimizer/OptipngOptimizer.php
index e80cddd671b..bc6cbdb80ae 100644
--- a/engine/Shopware/Bundle/MediaBundle/Optimizer/OptipngOptimizer.php
+++ b/engine/Shopware/Bundle/MediaBundle/Optimizer/OptipngOptimizer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle\Optimizer;
diff --git a/engine/Shopware/Bundle/MediaBundle/Optimizer/PngcrushOptimizer.php b/engine/Shopware/Bundle/MediaBundle/Optimizer/PngcrushOptimizer.php
index 845171fa17e..29b315c50f7 100644
--- a/engine/Shopware/Bundle/MediaBundle/Optimizer/PngcrushOptimizer.php
+++ b/engine/Shopware/Bundle/MediaBundle/Optimizer/PngcrushOptimizer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle\Optimizer;
diff --git a/engine/Shopware/Bundle/MediaBundle/Optimizer/PngoutOptimizer.php b/engine/Shopware/Bundle/MediaBundle/Optimizer/PngoutOptimizer.php
index 66ad1202495..52dbef70d85 100644
--- a/engine/Shopware/Bundle/MediaBundle/Optimizer/PngoutOptimizer.php
+++ b/engine/Shopware/Bundle/MediaBundle/Optimizer/PngoutOptimizer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle\Optimizer;
diff --git a/engine/Shopware/Bundle/MediaBundle/OptimizerService.php b/engine/Shopware/Bundle/MediaBundle/OptimizerService.php
index dfc54cc4e63..b0554daafd1 100644
--- a/engine/Shopware/Bundle/MediaBundle/OptimizerService.php
+++ b/engine/Shopware/Bundle/MediaBundle/OptimizerService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle;
@@ -78,7 +78,7 @@ public function getOptimizerByMimeType($mime)
             }
         }
 
-        throw new OptimizerNotFoundException(sprintf('Optimizer for mime-type "%s" not found.', $mime));
+        throw new OptimizerNotFoundException(\sprintf('Optimizer for mime-type "%s" not found.', $mime));
     }
 
     /**
diff --git a/engine/Shopware/Bundle/MediaBundle/OptimizerServiceInterface.php b/engine/Shopware/Bundle/MediaBundle/OptimizerServiceInterface.php
index 3fd4142a668..852eac13ac3 100644
--- a/engine/Shopware/Bundle/MediaBundle/OptimizerServiceInterface.php
+++ b/engine/Shopware/Bundle/MediaBundle/OptimizerServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle;
@@ -31,6 +31,8 @@ interface OptimizerServiceInterface
 {
     /**
      * @param string $filepath
+     *
+     * @return void
      */
     public function optimize($filepath);
 
diff --git a/engine/Shopware/Bundle/MediaBundle/Strategy/Md5Strategy.php b/engine/Shopware/Bundle/MediaBundle/Strategy/Md5Strategy.php
index 630a88b49f3..eefca9db906 100644
--- a/engine/Shopware/Bundle/MediaBundle/Strategy/Md5Strategy.php
+++ b/engine/Shopware/Bundle/MediaBundle/Strategy/Md5Strategy.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle\Strategy;
diff --git a/engine/Shopware/Bundle/MediaBundle/Strategy/PlainStrategy.php b/engine/Shopware/Bundle/MediaBundle/Strategy/PlainStrategy.php
index 430fed28bd0..c2b13cf5bd7 100644
--- a/engine/Shopware/Bundle/MediaBundle/Strategy/PlainStrategy.php
+++ b/engine/Shopware/Bundle/MediaBundle/Strategy/PlainStrategy.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle\Strategy;
diff --git a/engine/Shopware/Bundle/MediaBundle/Strategy/StrategyFactory.php b/engine/Shopware/Bundle/MediaBundle/Strategy/StrategyFactory.php
index 9fe7fade21b..6d2080a2218 100644
--- a/engine/Shopware/Bundle/MediaBundle/Strategy/StrategyFactory.php
+++ b/engine/Shopware/Bundle/MediaBundle/Strategy/StrategyFactory.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle\Strategy;
@@ -45,7 +45,7 @@ public function factory($strategy)
             case 'plain':
                 return new PlainStrategy();
             default:
-                throw new Exception(sprintf('Unsupported strategy "%s".', $strategy));
+                throw new Exception(\sprintf('Unsupported strategy "%s".', $strategy));
         }
     }
 }
diff --git a/engine/Shopware/Bundle/MediaBundle/Strategy/StrategyInterface.php b/engine/Shopware/Bundle/MediaBundle/Strategy/StrategyInterface.php
index 88054ccae7b..ce89d7f2f9b 100644
--- a/engine/Shopware/Bundle/MediaBundle/Strategy/StrategyInterface.php
+++ b/engine/Shopware/Bundle/MediaBundle/Strategy/StrategyInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle\Strategy;
diff --git a/engine/Shopware/Bundle/MediaBundle/Struct/MediaPosition.php b/engine/Shopware/Bundle/MediaBundle/Struct/MediaPosition.php
index 65bba2e8886..0f50e1c9264 100644
--- a/engine/Shopware/Bundle/MediaBundle/Struct/MediaPosition.php
+++ b/engine/Shopware/Bundle/MediaBundle/Struct/MediaPosition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle\Struct;
diff --git a/engine/Shopware/Bundle/MediaBundle/Subscriber/ServiceSubscriber.php b/engine/Shopware/Bundle/MediaBundle/Subscriber/ServiceSubscriber.php
index d83bd1e81d6..04237013769 100644
--- a/engine/Shopware/Bundle/MediaBundle/Subscriber/ServiceSubscriber.php
+++ b/engine/Shopware/Bundle/MediaBundle/Subscriber/ServiceSubscriber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\MediaBundle\Subscriber;
diff --git a/engine/Shopware/Bundle/OrderBundle/DependencyInjection/services.xml b/engine/Shopware/Bundle/OrderBundle/DependencyInjection/services.xml
index 5469cb49440..ad07de18993 100644
--- a/engine/Shopware/Bundle/OrderBundle/DependencyInjection/services.xml
+++ b/engine/Shopware/Bundle/OrderBundle/DependencyInjection/services.xml
@@ -38,6 +38,11 @@
             <argument type="service" id="shopware_storefront.variant_cover_service"/>
         </service>
 
+        <service id="Shopware\Bundle\OrderBundle\Service\ShippingCostServiceInterface"
+                 class="Shopware\Bundle\OrderBundle\Service\ShippingCostService">
+            <argument type="service" id="dbal_connection"/>
+        </service>
+
         <service id="shopware_order.consider_inactive_list_product_service"
                  parent="shopware_storefront.list_product_service"
                  class="Shopware\Bundle\StoreFrontBundle\Service\Core\ListProductService"
diff --git a/engine/Shopware/Bundle/OrderBundle/OrderBundle.php b/engine/Shopware/Bundle/OrderBundle/OrderBundle.php
index d1f7726b03c..9689a841b7a 100644
--- a/engine/Shopware/Bundle/OrderBundle/OrderBundle.php
+++ b/engine/Shopware/Bundle/OrderBundle/OrderBundle.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\OrderBundle;
diff --git a/engine/Shopware/Bundle/OrderBundle/Service/CalculationService.php b/engine/Shopware/Bundle/OrderBundle/Service/CalculationService.php
index 5ded79dbace..ba077a7a4a5 100644
--- a/engine/Shopware/Bundle/OrderBundle/Service/CalculationService.php
+++ b/engine/Shopware/Bundle/OrderBundle/Service/CalculationService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\OrderBundle\Service;
diff --git a/engine/Shopware/Bundle/OrderBundle/Service/CalculationServiceInterface.php b/engine/Shopware/Bundle/OrderBundle/Service/CalculationServiceInterface.php
index f9b0ed48d5c..1efa5d2113e 100644
--- a/engine/Shopware/Bundle/OrderBundle/Service/CalculationServiceInterface.php
+++ b/engine/Shopware/Bundle/OrderBundle/Service/CalculationServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\OrderBundle\Service;
diff --git a/engine/Shopware/Bundle/OrderBundle/Service/ConsiderInactiveProductsListProductGateway.php b/engine/Shopware/Bundle/OrderBundle/Service/ConsiderInactiveProductsListProductGateway.php
index 6e12f494c0d..ce7b41e81ad 100644
--- a/engine/Shopware/Bundle/OrderBundle/Service/ConsiderInactiveProductsListProductGateway.php
+++ b/engine/Shopware/Bundle/OrderBundle/Service/ConsiderInactiveProductsListProductGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\OrderBundle\Service;
diff --git a/engine/Shopware/Bundle/OrderBundle/Service/OrderListProductService.php b/engine/Shopware/Bundle/OrderBundle/Service/OrderListProductService.php
index 0b119a736e3..702e21b660f 100644
--- a/engine/Shopware/Bundle/OrderBundle/Service/OrderListProductService.php
+++ b/engine/Shopware/Bundle/OrderBundle/Service/OrderListProductService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\OrderBundle\Service;
diff --git a/engine/Shopware/Bundle/OrderBundle/Service/OrderListProductServiceInterface.php b/engine/Shopware/Bundle/OrderBundle/Service/OrderListProductServiceInterface.php
index 3fd564e417e..4374d3b58b6 100644
--- a/engine/Shopware/Bundle/OrderBundle/Service/OrderListProductServiceInterface.php
+++ b/engine/Shopware/Bundle/OrderBundle/Service/OrderListProductServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\OrderBundle\Service;
diff --git a/engine/Shopware/Bundle/OrderBundle/Service/ShippingCostService.php b/engine/Shopware/Bundle/OrderBundle/Service/ShippingCostService.php
new file mode 100644
index 00000000000..0cbae790f8d
--- /dev/null
+++ b/engine/Shopware/Bundle/OrderBundle/Service/ShippingCostService.php
@@ -0,0 +1,105 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Bundle\OrderBundle\Service;
+
+use Doctrine\DBAL\Connection;
+use RuntimeException;
+use Shopware\Models\Dispatch\Dispatch;
+
+class ShippingCostService implements ShippingCostServiceInterface
+{
+    private Connection $connection;
+
+    public function __construct(
+        Connection $connection
+    ) {
+        $this->connection = $connection;
+    }
+
+    public function getShippingCostMultiplier(int $calculationType, array $basket, array $dispatchData): float
+    {
+        switch (true) {
+            case $calculationType === Dispatch::CALCULATION_WEIGHT:
+                return round((float) ($basket['weight'] ?? 1.0), 3);
+            case $calculationType === Dispatch::CALCULATION_PRICE:
+                return round((float) ($basket['amount'] ?? 1.0), 2);
+            case $calculationType === Dispatch::CALCULATION_NUMBER_OF_PRODUCTS:
+                return round((float) ($basket['count_article'] ?? 1.0));
+            case $calculationType === Dispatch::CALCULATION_CUSTOM:
+                return round((float) ($basket['calculation_value_' . $dispatchData['id']] ?? 1.0), 2);
+        }
+
+        throw new RuntimeException(\sprintf('Shipping calculation type "%d" not supported', $calculationType));
+    }
+
+    public function calculateDispatchSurcharge(array $basket, array $dispatch): float
+    {
+        $surcharge = 0;
+
+        $calculationType = (int) $dispatch['calculation'];
+        if (!\in_array($calculationType, Dispatch::CALCULATIONS, true)) {
+            throw new RuntimeException(\sprintf('Invalid shipping calculation type "%d"', $calculationType));
+        }
+
+        $from = $this->getShippingCostMultiplier($calculationType, $basket, $dispatch);
+
+        $result = $this->connection->fetchAssociative('SELECT `value` , factor
+            FROM s_premium_shippingcosts
+            WHERE `from` <= ?
+            AND dispatchID = ?
+            ORDER BY `from` DESC
+            LIMIT 1', [$from, $dispatch['id']]);
+
+        if ($result === false) {
+            throw new RuntimeException(\sprintf('Shipping calculation not found for dispatch ID "%d" and from value of "%d"', $dispatch['id'], $from));
+        }
+        $surcharge += $result['value'];
+        if (!empty($result['factor'])) {
+            $surcharge += $result['factor'] / 100 * $from;
+        }
+
+        return $surcharge;
+    }
+
+    public function calculateDispatchesSurcharge(array $basket, array $dispatches): float
+    {
+        $surcharge = 0;
+
+        if (empty($dispatches)) {
+            return $surcharge;
+        }
+
+        foreach ($dispatches as $dispatch) {
+            try {
+                $surcharge += $this->calculateDispatchSurcharge($basket, $dispatch);
+            } catch (RuntimeException $e) {
+                continue;
+            }
+        }
+
+        return $surcharge;
+    }
+}
diff --git a/engine/Shopware/Bundle/OrderBundle/Service/ShippingCostServiceInterface.php b/engine/Shopware/Bundle/OrderBundle/Service/ShippingCostServiceInterface.php
new file mode 100644
index 00000000000..6c1cacb2d05
--- /dev/null
+++ b/engine/Shopware/Bundle/OrderBundle/Service/ShippingCostServiceInterface.php
@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Bundle\OrderBundle\Service;
+
+use Shopware\Models\Dispatch\Dispatch;
+
+interface ShippingCostServiceInterface
+{
+    /**
+     * @param Dispatch::CALCULATION_* $calculationType
+     * @param array<string, mixed>    $basket
+     * @param array<string, mixed>    $dispatchData
+     */
+    public function getShippingCostMultiplier(int $calculationType, array $basket, array $dispatchData): float;
+
+    /**
+     * @param array<string, mixed> $basket
+     * @param array<string, mixed> $dispatch
+     */
+    public function calculateDispatchSurcharge(array $basket, array $dispatch): float;
+
+    /**
+     * @param array<string, mixed>             $basket
+     * @param array<int, array<string, mixed>> $dispatches
+     */
+    public function calculateDispatchesSurcharge(array $basket, array $dispatches): float;
+}
diff --git a/engine/Shopware/Bundle/OrderBundle/Service/StockService.php b/engine/Shopware/Bundle/OrderBundle/Service/StockService.php
index fb097a94a87..d4baa87df72 100644
--- a/engine/Shopware/Bundle/OrderBundle/Service/StockService.php
+++ b/engine/Shopware/Bundle/OrderBundle/Service/StockService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\OrderBundle\Service;
diff --git a/engine/Shopware/Bundle/OrderBundle/Service/StockServiceInterface.php b/engine/Shopware/Bundle/OrderBundle/Service/StockServiceInterface.php
index 2e1c3a13aaf..d904e4e07b4 100644
--- a/engine/Shopware/Bundle/OrderBundle/Service/StockServiceInterface.php
+++ b/engine/Shopware/Bundle/OrderBundle/Service/StockServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\OrderBundle\Service;
diff --git a/engine/Shopware/Bundle/OrderBundle/Subscriber/OrderRecalculationSubscriber.php b/engine/Shopware/Bundle/OrderBundle/Subscriber/OrderRecalculationSubscriber.php
index da3c7ff6555..d8a261907ba 100644
--- a/engine/Shopware/Bundle/OrderBundle/Subscriber/OrderRecalculationSubscriber.php
+++ b/engine/Shopware/Bundle/OrderBundle/Subscriber/OrderRecalculationSubscriber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\OrderBundle\Subscriber;
@@ -37,9 +37,8 @@ class OrderRecalculationSubscriber implements SubscriberInterface
      */
     protected $calculationService;
 
-    public function __construct(
-        CalculationServiceInterface $calculationService
-    ) {
+    public function __construct(CalculationServiceInterface $calculationService)
+    {
         $this->calculationService = $calculationService;
     }
 
@@ -57,20 +56,19 @@ public static function getSubscribedEvents()
 
     /**
      * If a product position get updated, the order totals must be recalculated
+     *
+     * @return void
      */
     public function preUpdate(Enlight_Event_EventArgs $arguments)
     {
-        /** @var Detail $orderDetail */
         $orderDetail = $arguments->get('entity');
-        $entityManager = $arguments->get('entityManager');
+        // returns a change set for the model, which contains all changed properties with the old and new value.
+        $changeSet = $arguments->get('entityManager')->getUnitOfWork()->getEntityChangeSet($orderDetail);
 
-        //returns a change set for the model, which contains all changed properties with the old and new value.
-        $changeSet = $entityManager->getUnitOfWork()->getEntityChangeSet($orderDetail);
-
-        $productChange = $changeSet['articleNumber'][0] !== $changeSet['articleNumber'][1];
-        $quantityChange = $changeSet['quantity'][0] !== $changeSet['quantity'][1];
-        $priceChanged = $changeSet['price'][0] !== $changeSet['price'][1];
-        $taxChanged = $changeSet['taxRate'][0] !== $changeSet['taxRate'][1];
+        $productChange = \array_key_exists('articleNumber', $changeSet) && $changeSet['articleNumber'][0] !== $changeSet['articleNumber'][1];
+        $quantityChange = \array_key_exists('quantity', $changeSet) && $changeSet['quantity'][0] !== $changeSet['quantity'][1];
+        $priceChanged = \array_key_exists('price', $changeSet) && $changeSet['price'][0] !== $changeSet['price'][1];
+        $taxChanged = \array_key_exists('taxRate', $changeSet) && $changeSet['taxRate'][0] !== $changeSet['taxRate'][1];
 
         // If anything in the order position has been changed, we must recalculate the totals of the order
         if ($quantityChange || $productChange || $priceChanged || $taxChanged) {
@@ -80,28 +78,40 @@ public function preUpdate(Enlight_Event_EventArgs $arguments)
 
     /**
      * If a product position got added to the order, the order totals must be recalculated
+     *
+     * @return void
      */
     public function postPersist(Enlight_Event_EventArgs $arguments)
     {
-        /** @var Detail $orderDetail */
         $orderDetail = $arguments->get('entity');
+        if (!$orderDetail instanceof Detail) {
+            return;
+        }
 
-        /** @var Order $order */
         $order = $orderDetail->getOrder();
+        if (!$order instanceof Order) {
+            return;
+        }
 
         $this->calculationService->recalculateOrderTotals($order);
     }
 
     /**
      * If a product position get removed from the order, the order totals must be recalculated
+     *
+     * @return void
      */
     public function preRemove(Enlight_Event_EventArgs $arguments)
     {
-        /** @var Detail $orderDetail */
         $orderDetail = $arguments->get('entity');
+        if (!$orderDetail instanceof Detail) {
+            return;
+        }
 
-        /** @var Order $order */
         $order = $orderDetail->getOrder();
+        if (!$order instanceof Order) {
+            return;
+        }
 
         $this->calculationService->recalculateOrderTotals($order);
     }
diff --git a/engine/Shopware/Bundle/OrderBundle/Subscriber/ProductStockSubscriber.php b/engine/Shopware/Bundle/OrderBundle/Subscriber/ProductStockSubscriber.php
index a64a6707f45..5ab6116a30c 100644
--- a/engine/Shopware/Bundle/OrderBundle/Subscriber/ProductStockSubscriber.php
+++ b/engine/Shopware/Bundle/OrderBundle/Subscriber/ProductStockSubscriber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\OrderBundle\Subscriber;
@@ -65,7 +65,7 @@ public function preUpdate(Enlight_Event_EventArgs $arguments)
 
         $entityManager = $arguments->get('entityManager');
 
-        //returns a change set for the model, which contains all changed properties with the old and new value.
+        // returns a change set for the model, which contains all changed properties with the old and new value.
         $changeSet = $entityManager->getUnitOfWork()->getEntityChangeSet($orderDetail);
 
         $this->stockService->updateProductDetail(
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Context/BaseRequest.php b/engine/Shopware/Bundle/PluginInstallerBundle/Context/BaseRequest.php
index 7c4d2b2deb7..ce70b60964b 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Context/BaseRequest.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Context/BaseRequest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Context;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Context/DownloadRequest.php b/engine/Shopware/Bundle/PluginInstallerBundle/Context/DownloadRequest.php
index b2b1c93adac..d4839fd644e 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Context/DownloadRequest.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Context/DownloadRequest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Context;
@@ -53,7 +53,7 @@ class DownloadRequest
      * @param string $shopwareVersion
      * @param string $domain
      */
-    public function __construct($technicalName, $shopwareVersion, $domain, AccessTokenStruct $token = null)
+    public function __construct($technicalName, $shopwareVersion, $domain, ?AccessTokenStruct $token = null)
     {
         $this->technicalName = $technicalName;
         $this->shopwareVersion = $shopwareVersion;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Context/LicenceRequest.php b/engine/Shopware/Bundle/PluginInstallerBundle/Context/LicenceRequest.php
index 57b8b4b56c3..bb4c2d3c762 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Context/LicenceRequest.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Context/LicenceRequest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Context;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Context/ListingRequest.php b/engine/Shopware/Bundle/PluginInstallerBundle/Context/ListingRequest.php
index 27d4c144563..001189c6a59 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Context/ListingRequest.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Context/ListingRequest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Context;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Context/MetaRequest.php b/engine/Shopware/Bundle/PluginInstallerBundle/Context/MetaRequest.php
index 4052dd1ad8e..13115203342 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Context/MetaRequest.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Context/MetaRequest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Context;
@@ -31,7 +31,7 @@ class MetaRequest
     /**
      * @var AccessTokenStruct|null
      */
-    private $token = null;
+    private $token;
 
     /**
      * @var string
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Context/OrderRequest.php b/engine/Shopware/Bundle/PluginInstallerBundle/Context/OrderRequest.php
index 2434b748cd9..6f2c7484cef 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Context/OrderRequest.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Context/OrderRequest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Context;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Context/PluginLicenceRequest.php b/engine/Shopware/Bundle/PluginInstallerBundle/Context/PluginLicenceRequest.php
index 46918485d3c..0c39c349bbe 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Context/PluginLicenceRequest.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Context/PluginLicenceRequest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Context;
@@ -59,7 +59,7 @@ class PluginLicenceRequest
      */
     public function __construct($token, $domain, $shopwareVersion, $technicalName)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         $this->token = $token;
         $this->domain = $domain;
@@ -72,7 +72,7 @@ public function __construct($token, $domain, $shopwareVersion, $technicalName)
      */
     public function getTechnicalName()
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         return $this->technicalName;
     }
@@ -82,7 +82,7 @@ public function getTechnicalName()
      */
     public function getShopwareVersion()
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         return $this->shopwareVersion;
     }
@@ -92,7 +92,7 @@ public function getShopwareVersion()
      */
     public function getDomain()
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         return $this->domain;
     }
@@ -102,7 +102,7 @@ public function getDomain()
      */
     public function getToken()
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         return $this->token;
     }
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Context/PluginsByTechnicalNameRequest.php b/engine/Shopware/Bundle/PluginInstallerBundle/Context/PluginsByTechnicalNameRequest.php
index e97784a82db..d4aad7de4e6 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Context/PluginsByTechnicalNameRequest.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Context/PluginsByTechnicalNameRequest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Context;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Context/RangeDownloadRequest.php b/engine/Shopware/Bundle/PluginInstallerBundle/Context/RangeDownloadRequest.php
index d07b460e791..44d20ff7cf4 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Context/RangeDownloadRequest.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Context/RangeDownloadRequest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Context;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Context/UpdateLicencesRequest.php b/engine/Shopware/Bundle/PluginInstallerBundle/Context/UpdateLicencesRequest.php
index 3bf03c79234..d74eeca6000 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Context/UpdateLicencesRequest.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Context/UpdateLicencesRequest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Context;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Context/UpdateListingRequest.php b/engine/Shopware/Bundle/PluginInstallerBundle/Context/UpdateListingRequest.php
index c606b5110fe..55467020ad4 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Context/UpdateListingRequest.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Context/UpdateListingRequest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Context;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/DependencyInjection/services.xml b/engine/Shopware/Bundle/PluginInstallerBundle/DependencyInjection/services.xml
index e8d9ad64db0..acd6f889925 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/DependencyInjection/services.xml
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/DependencyInjection/services.xml
@@ -65,6 +65,7 @@
             <argument type="service" id="Shopware\Bundle\PluginInstallerBundle\StoreClient"/>
             <argument type="service" id="Doctrine\DBAL\Connection"/>
             <argument type="service" id="Shopware\Bundle\PluginInstallerBundle\Service\PluginExtractor"/>
+            <argument type="service" id="Shopware\Components\HttpClient\GuzzleHttpClient"/>
         </service>
 
         <service id="shopware_plugininstaller.plugin_service_store" alias="shopware_plugininstaller.plugin_service_store_production"/>
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Events/PluginEvent.php b/engine/Shopware/Bundle/PluginInstallerBundle/Events/PluginEvent.php
index a9aecef2933..de8455b54ac 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Events/PluginEvent.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Events/PluginEvent.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Events;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Events/PostPluginActivateEvent.php b/engine/Shopware/Bundle/PluginInstallerBundle/Events/PostPluginActivateEvent.php
index f2ceda27b54..ac2b9bf45ef 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Events/PostPluginActivateEvent.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Events/PostPluginActivateEvent.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Events;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Events/PostPluginDeactivateEvent.php b/engine/Shopware/Bundle/PluginInstallerBundle/Events/PostPluginDeactivateEvent.php
index 488495108f9..e2c719ac7cd 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Events/PostPluginDeactivateEvent.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Events/PostPluginDeactivateEvent.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Events;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Events/PostPluginInstallEvent.php b/engine/Shopware/Bundle/PluginInstallerBundle/Events/PostPluginInstallEvent.php
index 2f0b7ed3120..36056fcb62f 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Events/PostPluginInstallEvent.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Events/PostPluginInstallEvent.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Events;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Events/PostPluginUninstallEvent.php b/engine/Shopware/Bundle/PluginInstallerBundle/Events/PostPluginUninstallEvent.php
index 059497ce4de..e7069a5949c 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Events/PostPluginUninstallEvent.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Events/PostPluginUninstallEvent.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Events;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Events/PostPluginUpdateEvent.php b/engine/Shopware/Bundle/PluginInstallerBundle/Events/PostPluginUpdateEvent.php
index 22f0effe701..141ae02dcfc 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Events/PostPluginUpdateEvent.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Events/PostPluginUpdateEvent.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Events;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Events/PrePluginActivateEvent.php b/engine/Shopware/Bundle/PluginInstallerBundle/Events/PrePluginActivateEvent.php
index 15f322a35ff..1c0dfb9867c 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Events/PrePluginActivateEvent.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Events/PrePluginActivateEvent.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Events;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Events/PrePluginDeactivateEvent.php b/engine/Shopware/Bundle/PluginInstallerBundle/Events/PrePluginDeactivateEvent.php
index b5fcc4817c8..f5a4c3976d7 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Events/PrePluginDeactivateEvent.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Events/PrePluginDeactivateEvent.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Events;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Events/PrePluginInstallEvent.php b/engine/Shopware/Bundle/PluginInstallerBundle/Events/PrePluginInstallEvent.php
index a09fe8321e1..c95b31ecd06 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Events/PrePluginInstallEvent.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Events/PrePluginInstallEvent.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Events;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Events/PrePluginUninstallEvent.php b/engine/Shopware/Bundle/PluginInstallerBundle/Events/PrePluginUninstallEvent.php
index d57cf8557ba..0134536ec8b 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Events/PrePluginUninstallEvent.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Events/PrePluginUninstallEvent.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Events;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Events/PrePluginUpdateEvent.php b/engine/Shopware/Bundle/PluginInstallerBundle/Events/PrePluginUpdateEvent.php
index bcc4417d709..c5e368dcecf 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Events/PrePluginUpdateEvent.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Events/PrePluginUpdateEvent.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Events;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Exception/AccountException.php b/engine/Shopware/Bundle/PluginInstallerBundle/Exception/AccountException.php
index 53f4237bad9..123cba2a68b 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Exception/AccountException.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Exception/AccountException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Exception;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Exception/AuthenticationException.php b/engine/Shopware/Bundle/PluginInstallerBundle/Exception/AuthenticationException.php
index 96b0498a2dd..8320cb2b27c 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Exception/AuthenticationException.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Exception/AuthenticationException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Exception;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Exception/DomainVerificationException.php b/engine/Shopware/Bundle/PluginInstallerBundle/Exception/DomainVerificationException.php
index a2c982e8f05..6ae0e93a3a4 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Exception/DomainVerificationException.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Exception/DomainVerificationException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Exception;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Exception/LicenceException.php b/engine/Shopware/Bundle/PluginInstallerBundle/Exception/LicenceException.php
index a6b34d382a7..193b9d499ca 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Exception/LicenceException.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Exception/LicenceException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Exception;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Exception/MissingDoubleOptInConfirmationException.php b/engine/Shopware/Bundle/PluginInstallerBundle/Exception/MissingDoubleOptInConfirmationException.php
index 5c8a08c2455..5e99641033a 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Exception/MissingDoubleOptInConfirmationException.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Exception/MissingDoubleOptInConfirmationException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Exception;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Exception/MissingMasterDataException.php b/engine/Shopware/Bundle/PluginInstallerBundle/Exception/MissingMasterDataException.php
index eb3704d8fc1..c163e140e35 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Exception/MissingMasterDataException.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Exception/MissingMasterDataException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Exception;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Exception/OrderException.php b/engine/Shopware/Bundle/PluginInstallerBundle/Exception/OrderException.php
index 33b6036d7ba..45cdf8e3e79 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Exception/OrderException.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Exception/OrderException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Exception;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Exception/SbpServerException.php b/engine/Shopware/Bundle/PluginInstallerBundle/Exception/SbpServerException.php
index 11585d29a21..f08c5b4b06d 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Exception/SbpServerException.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Exception/SbpServerException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Exception;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Exception/ShopNotFoundException.php b/engine/Shopware/Bundle/PluginInstallerBundle/Exception/ShopNotFoundException.php
index 5e15ac71b9f..7425ef86875 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Exception/ShopNotFoundException.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Exception/ShopNotFoundException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Exception;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Exception/ShopSecretException.php b/engine/Shopware/Bundle/PluginInstallerBundle/Exception/ShopSecretException.php
index f46c1ee9486..2929574a836 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Exception/ShopSecretException.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Exception/ShopSecretException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Exception;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Exception/StoreException.php b/engine/Shopware/Bundle/PluginInstallerBundle/Exception/StoreException.php
index 38ffd7b00ed..52ddc0e2715 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Exception/StoreException.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Exception/StoreException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Exception;
@@ -35,16 +35,15 @@ class StoreException extends RuntimeException
     private $sbpCode;
 
     /**
-     * @param string    $sbpCode
-     * @param string    $message
-     * @param int       $code
-     * @param Exception $previous
+     * @param string $sbpCode
+     * @param string $message
+     * @param int    $code
      */
     public function __construct(
         $sbpCode,
         $message = '',
         $code = 0,
-        Exception $previous = null
+        ?Exception $previous = null
     ) {
         $this->sbpCode = $sbpCode;
 
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/PluginInstallerBundle.php b/engine/Shopware/Bundle/PluginInstallerBundle/PluginInstallerBundle.php
index 02169f175de..5fe865a76cf 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/PluginInstallerBundle.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/PluginInstallerBundle.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Service/AccountManagerService.php b/engine/Shopware/Bundle/PluginInstallerBundle/Service/AccountManagerService.php
index 23ba40c38d4..a6fc1d9b370 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Service/AccountManagerService.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Service/AccountManagerService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Service;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Service/DownloadService.php b/engine/Shopware/Bundle/PluginInstallerBundle/Service/DownloadService.php
index 59be76acee4..f711b251604 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Service/DownloadService.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Service/DownloadService.php
@@ -1,39 +1,38 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Service;
 
 use Doctrine\DBAL\Connection;
 use Exception;
-use PDO;
-use PDOStatement;
 use RuntimeException;
 use Shopware\Bundle\PluginInstallerBundle\Context\DownloadRequest;
 use Shopware\Bundle\PluginInstallerBundle\Context\MetaRequest;
 use Shopware\Bundle\PluginInstallerBundle\Context\RangeDownloadRequest;
 use Shopware\Bundle\PluginInstallerBundle\StoreClient;
 use Shopware\Bundle\PluginInstallerBundle\Struct\MetaStruct;
+use Shopware\Components\HttpClient\HttpClientInterface;
 use ShopwarePlugins\SwagUpdate\Components\Steps\DownloadStep;
 use ShopwarePlugins\SwagUpdate\Components\Steps\FinishResult;
 use ShopwarePlugins\SwagUpdate\Components\Steps\ValidResult;
@@ -41,36 +40,28 @@
 
 class DownloadService
 {
-    /**
-     * @var StoreClient
-     */
-    private $storeClient;
+    private array $pluginDirectories;
 
-    /**
-     * @var array
-     */
-    private $pluginDirectories;
+    private StoreClient $storeClient;
 
-    /**
-     * @var Connection
-     */
-    private $connection;
+    private Connection $connection;
 
-    /**
-     * @var PluginExtractor
-     */
-    private $pluginExtractor;
+    private PluginExtractor $pluginExtractor;
+
+    private HttpClientInterface $httpClient;
 
     public function __construct(
         array $pluginDirectories,
         StoreClient $storeClient,
         Connection $connection,
-        PluginExtractor $pluginExtractor
+        PluginExtractor $pluginExtractor,
+        HttpClientInterface $httpClient
     ) {
         $this->pluginDirectories = $pluginDirectories;
         $this->storeClient = $storeClient;
         $this->connection = $connection;
         $this->pluginExtractor = $pluginExtractor;
+        $this->httpClient = $httpClient;
     }
 
     /**
@@ -87,9 +78,7 @@ public function downloadRange(RangeDownloadRequest $request)
             'sha1' => $request->getSha1(),
         ]);
 
-        $step = new DownloadStep($version, $request->getDestination());
-
-        return $step->run($request->getOffset());
+        return (new DownloadStep($version, $request->getDestination()))->run($request->getOffset());
     }
 
     /**
@@ -163,33 +152,28 @@ public function getMetaInformation(MetaRequest $request)
      */
     public function download(DownloadRequest $request)
     {
-        $request = new MetaRequest(
+        $metaRequest = new MetaRequest(
             $request->getTechnicalName(),
             $request->getShopwareVersion(),
             $request->getDomain(),
             $request->getToken()
         );
 
-        $result = $this->getMetaInformation($request);
+        $result = $this->getMetaInformation($metaRequest);
 
-        /** @var \Shopware\Components\HttpClient\HttpClientInterface $client */
-        $client = Shopware()->Container()->get('http_client');
-
-        $response = $client->get($result->getUri());
+        $response = $this->httpClient->get($result->getUri());
         $file = $this->createDownloadZip($response->getBody());
 
-        $this->extractPluginZip($file, $request->getTechnicalName());
+        $this->extractPluginZip($file, $metaRequest->getTechnicalName());
         unlink($file);
 
         return true;
     }
 
     /**
-     * @param string $content
-     *
      * @return string file path to the downloaded file
      */
-    private function createDownloadZip($content)
+    private function createDownloadZip(string $content): string
     {
         $file = tempnam(sys_get_temp_dir(), 'plugin_') . '.zip';
         file_put_contents($file, $content);
@@ -197,12 +181,7 @@ private function createDownloadZip($content)
         return $file;
     }
 
-    /**
-     * @param string $name
-     *
-     * @return string
-     */
-    private function getPluginSource($name)
+    private function getPluginSource(string $name): string
     {
         $query = $this->connection->createQueryBuilder();
         $query->select(['plugin.source'])
@@ -211,9 +190,6 @@ private function getPluginSource($name)
             ->setParameter(':name', $name)
             ->setMaxResults(1);
 
-        /** @var PDOStatement $statement */
-        $statement = $query->execute();
-
-        return $statement->fetch(PDO::FETCH_COLUMN);
+        return (string) $query->execute()->fetchOne();
     }
 }
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Service/FirstRunWizardPluginStoreService.php b/engine/Shopware/Bundle/PluginInstallerBundle/Service/FirstRunWizardPluginStoreService.php
index 4fef3a23147..9bea23fdbfb 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Service/FirstRunWizardPluginStoreService.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Service/FirstRunWizardPluginStoreService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Service;
@@ -66,7 +66,7 @@ public function __construct(
      *
      * @return array List of plugins
      */
-    public function getRecommendedPlugins(LocaleStruct $locale = null, $shopwareVersion)
+    public function getRecommendedPlugins(?LocaleStruct $locale, $shopwareVersion)
     {
         $localeName = $locale ? $locale->getName() : null;
 
@@ -112,7 +112,7 @@ public function getIntegratedPlugins($isoCode, $shopwareVersion)
      *
      * @return array List of plugins
      */
-    public function getDemoDataPlugins(LocaleStruct $locale = null, $shopwareVersion)
+    public function getDemoDataPlugins(?LocaleStruct $locale, $shopwareVersion)
     {
         $localeName = $locale ? $locale->getName() : null;
 
@@ -134,7 +134,7 @@ public function getDemoDataPlugins(LocaleStruct $locale = null, $shopwareVersion
      *
      * @return array List of plugins
      */
-    public function getLocalizations(LocaleStruct $locale = null, $shopwareVersion)
+    public function getLocalizations(?LocaleStruct $locale, $shopwareVersion)
     {
         $localeName = $locale ? $locale->getName() : null;
 
@@ -153,7 +153,7 @@ public function getLocalizations(LocaleStruct $locale = null, $shopwareVersion)
      *
      * @return string[] List of countries
      */
-    public function getIntegratedPluginsCountries(LocaleStruct $locale = null)
+    public function getIntegratedPluginsCountries(?LocaleStruct $locale = null)
     {
         $localeName = $locale ? $locale->getName() : null;
 
@@ -174,7 +174,7 @@ public function getIntegratedPluginsCountries(LocaleStruct $locale = null)
      *
      * @return PluginStruct[] List of plugins
      */
-    public function getLocalizationPlugins($localization, LocaleStruct $locale = null, $shopwareVersion)
+    public function getLocalizationPlugins($localization, ?LocaleStruct $locale, $shopwareVersion)
     {
         $localeName = $locale ? $locale->getName() : null;
 
@@ -196,7 +196,7 @@ public function getLocalizationPlugins($localization, LocaleStruct $locale = nul
      *
      * @return PluginStruct[] List of plugins
      */
-    public function getAvailableLocalizations(LocaleStruct $locale = null, $shopwareVersion)
+    public function getAvailableLocalizations(?LocaleStruct $locale, $shopwareVersion)
     {
         $localeName = $locale ? $locale->getName() : null;
 
@@ -215,7 +215,7 @@ public function getAvailableLocalizations(LocaleStruct $locale = null, $shopware
      *
      * @return PluginStruct[]
      */
-    private function getAdditionallyLocalData(array $plugins)
+    private function getAdditionallyLocalData(array $plugins): array
     {
         $context = new PluginsByTechnicalNameRequest('', '', array_keys($plugins));
         $local = $this->localPluginService->getPlugins($context);
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Service/InstallerService.php b/engine/Shopware/Bundle/PluginInstallerBundle/Service/InstallerService.php
index bc34097d863..5a1ec41eccb 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Service/InstallerService.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Service/InstallerService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Service;
@@ -129,7 +129,7 @@ public function getPluginByName($pluginName)
         ]);
 
         if ($plugin === null) {
-            throw new Exception(sprintf('Unknown plugin "%s".', $pluginName));
+            throw new Exception(\sprintf('Unknown plugin "%s".', $pluginName));
         }
 
         return $plugin;
@@ -226,7 +226,7 @@ public function activatePlugin(Plugin $plugin)
         }
 
         if (!$plugin->getInstalled()) {
-            throw new Exception(sprintf('Plugin "%s" has to be installed first before it can be activated.', $plugin->getName()));
+            throw new Exception(\sprintf('Plugin "%s" has to be installed first before it can be activated.', $plugin->getName()));
         }
 
         if (!$plugin->isLegacyPlugin()) {
@@ -262,20 +262,17 @@ public function deactivatePlugin(Plugin $plugin)
     }
 
     /**
-     * @param Shop $shop
-     *
      * @return array
      */
-    public function getPluginConfig(Plugin $plugin, Shop $shop = null)
+    public function getPluginConfig(Plugin $plugin, ?Shop $shop = null)
     {
         return $this->configReader->getByPluginName($plugin->getName(), $shop);
     }
 
     /**
      * @param array $elements
-     * @param Shop  $shop
      */
-    public function savePluginConfig(Plugin $plugin, $elements, Shop $shop = null)
+    public function savePluginConfig(Plugin $plugin, $elements, ?Shop $shop = null)
     {
         if ($shop === null) {
             /** @var Shop $shop */
@@ -287,11 +284,10 @@ public function savePluginConfig(Plugin $plugin, $elements, Shop $shop = null)
 
     /**
      * @param string $name
-     * @param Shop   $shop
      *
      * @throws Exception
      */
-    public function saveConfigElement(Plugin $plugin, $name, $value, Shop $shop = null)
+    public function saveConfigElement(Plugin $plugin, $name, $value, ?Shop $shop = null)
     {
         if ($shop === null) {
             /** @var Shop $shop */
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Service/LegacyPluginExtractor.php b/engine/Shopware/Bundle/PluginInstallerBundle/Service/LegacyPluginExtractor.php
index 9961ce552ff..01a20e6c07e 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Service/LegacyPluginExtractor.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Service/LegacyPluginExtractor.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Service;
@@ -37,11 +37,13 @@ class LegacyPluginExtractor
      * @param string     $destination
      *
      * @throws Exception
+     *
+     * @return void
      */
     public function extract($archive, $destination)
     {
         if (!is_writable($destination)) {
-            throw new Exception(sprintf('Destination directory "%s" is not writable', $destination));
+            throw new Exception(\sprintf('Destination directory "%s" is not writable', $destination));
         }
 
         $this->validatePluginZip($archive);
@@ -58,32 +60,32 @@ public function extract($archive, $destination)
      *
      * @throws Exception
      */
-    private function validatePluginZip(ZipArchive $archive)
+    private function validatePluginZip(ZipArchive $archive): void
     {
         $prefix = $this->getLegacyPluginPrefix($archive);
 
         $this->assertValid($archive, $prefix);
     }
 
-    /**
-     * @param string $prefix
-     */
-    private function assertValid(ZipArchive $archive, $prefix)
+    private function assertValid(ZipArchive $archive, string $prefix): void
     {
         for ($i = 2; $i < $archive->numFiles; ++$i) {
             $stat = $archive->statIndex($i);
+            if (!\is_array($stat)) {
+                continue;
+            }
 
             $this->assertNoDirectoryTraversal($stat['name']);
             $this->assertPrefix($stat['name'], $prefix);
         }
     }
 
-    /**
-     * @return string
-     */
-    private function getLegacyPluginPrefix(ZipArchive $archive)
+    private function getLegacyPluginPrefix(ZipArchive $archive): string
     {
         $segments = $archive->statIndex(0);
+        if (!\is_array($segments)) {
+            throw new RuntimeException('Uploaded zip archive contains no plugin namespace directory');
+        }
         $segments = array_filter(explode('/', $segments['name']));
 
         if (!\in_array($segments[0], ['Frontend', 'Backend', 'Core'])) {
@@ -91,8 +93,10 @@ private function getLegacyPluginPrefix(ZipArchive $archive)
         }
 
         if (\count($segments) <= 1) {
-            $segments = $archive->statIndex(1);
-            $segments = array_filter(explode('/', $segments['name']));
+            $segmentsTmp = $archive->statIndex(1);
+            if (\is_array($segmentsTmp)) {
+                $segments = array_filter(explode('/', $segmentsTmp['name']));
+            }
         }
 
         return implode('/', [$segments[0], $segments[1]]);
@@ -102,7 +106,7 @@ private function getLegacyPluginPrefix(ZipArchive $archive)
      * Clear opcode caches to make sure that the
      * updated plugin files are used in the following requests.
      */
-    private function clearOpcodeCache()
+    private function clearOpcodeCache(): void
     {
         if (\function_exists('opcache_reset')) {
             opcache_reset();
@@ -113,23 +117,16 @@ private function clearOpcodeCache()
         }
     }
 
-    /**
-     * @param string $filename
-     * @param string $prefix
-     */
-    private function assertPrefix($filename, $prefix)
+    private function assertPrefix(string $filename, string $prefix): void
     {
-        if (strpos($filename, $prefix) !== 0) {
-            throw new RuntimeException(sprintf('Detected invalid file/directory %s in the plugin zip: %s', $filename, $prefix));
+        if (!str_starts_with($filename, $prefix)) {
+            throw new RuntimeException(\sprintf('Detected invalid file/directory %s in the plugin zip: %s', $filename, $prefix));
         }
     }
 
-    /**
-     * @param string $filename
-     */
-    private function assertNoDirectoryTraversal($filename)
+    private function assertNoDirectoryTraversal(string $filename): void
     {
-        if (strpos($filename, '../') !== false) {
+        if (str_contains($filename, '../')) {
             throw new RuntimeException('Directory Traversal detected');
         }
     }
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Service/LegacyPluginInstaller.php b/engine/Shopware/Bundle/PluginInstallerBundle/Service/LegacyPluginInstaller.php
index 4438d4138f5..1b22941152c 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Service/LegacyPluginInstaller.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Service/LegacyPluginInstaller.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Service;
@@ -81,7 +81,7 @@ public function getPluginBootstrap(Plugin $plugin)
         $pluginName = $plugin->getName();
         $pluginByName = $namespace->get($pluginName);
         if ($pluginByName === null) {
-            throw new RuntimeException(sprintf('Plugin by name "%s" was not found.', $pluginName));
+            throw new RuntimeException(\sprintf('Plugin by name "%s" was not found.', $pluginName));
         }
 
         return $pluginByName;
@@ -102,16 +102,16 @@ public function installPlugin(Plugin $plugin)
         try {
             $result = $namespace->installPlugin($bootstrap);
         } catch (Exception $e) {
-            throw new Exception(sprintf("Unable to install '%s', got exception:\n%s\n", $plugin->getName(), $e->getMessage()), 0, $e);
+            throw new Exception(\sprintf("Unable to install '%s', got exception:\n%s\n", $plugin->getName(), $e->getMessage()), 0, $e);
         }
 
         $result = \is_bool($result) ? ['success' => $result] : $result;
 
         if (!$result['success']) {
             if (isset($result['message'])) {
-                throw new Exception(sprintf("Unable to install '%s', got message:\n'%s'\n", $plugin->getName(), $result['message']));
+                throw new Exception(\sprintf("Unable to install '%s', got message:\n'%s'\n", $plugin->getName(), $result['message']));
             }
-            throw new Exception(sprintf('Unable to install "%s", an unknown error occured.', $plugin->getName()));
+            throw new Exception(\sprintf('Unable to install "%s", an unknown error occured.', $plugin->getName()));
         }
 
         return $result;
@@ -134,16 +134,16 @@ public function uninstallPlugin(Plugin $plugin, $removeData = true)
         try {
             $result = $namespace->uninstallPlugin($bootstrap, $removeData);
         } catch (Exception $e) {
-            throw new Exception(sprintf("Unable to uninstall '%s', got exception:\n%s\n", $plugin->getName(), $e->getMessage()), 0, $e);
+            throw new Exception(\sprintf("Unable to uninstall '%s', got exception:\n%s\n", $plugin->getName(), $e->getMessage()), 0, $e);
         }
 
         $result = \is_bool($result) ? ['success' => $result] : $result;
 
         if (!$result['success']) {
             if (isset($result['message'])) {
-                throw new Exception(sprintf("Unable to uninstall '%s', got message:\n%s\n", $plugin->getName(), $result['message']));
+                throw new Exception(\sprintf("Unable to uninstall '%s', got message:\n%s\n", $plugin->getName(), $result['message']));
             }
-            throw new Exception(sprintf('Unable to uninstall %s, an unknown error occured.', $plugin->getName()));
+            throw new Exception(\sprintf('Unable to uninstall %s, an unknown error occured.', $plugin->getName()));
         }
 
         return $result;
@@ -164,16 +164,16 @@ public function updatePlugin(Plugin $plugin)
         try {
             $result = $namespace->updatePlugin($bootstrap);
         } catch (Exception $e) {
-            throw new Exception(sprintf("Unable to update '%s', got exception:\n'%s'\n", $plugin->getName(), $e->getMessage()), 0, $e);
+            throw new Exception(\sprintf("Unable to update '%s', got exception:\n'%s'\n", $plugin->getName(), $e->getMessage()), 0, $e);
         }
 
         $result = \is_bool($result) ? ['success' => $result] : $result;
 
         if (!$result['success']) {
             if (isset($result['message'])) {
-                throw new Exception(sprintf("Unable to update '%s', got message:\n%s\n", $plugin->getName(), $result['message']));
+                throw new Exception(\sprintf("Unable to update '%s', got message:\n%s\n", $plugin->getName(), $result['message']));
             }
-            throw new Exception(sprintf('Unable to update "%s", an unknown error occured.', $plugin->getName()));
+            throw new Exception(\sprintf('Unable to update "%s", an unknown error occured.', $plugin->getName()));
         }
 
         return $result;
@@ -192,7 +192,7 @@ public function activatePlugin(Plugin $plugin)
         $result = \is_bool($result) ? ['success' => $result] : $result;
 
         if ($result['success'] == false) {
-            throw new Exception(sprintf('Not allowed to enable plugin "%s".', $plugin->getName()));
+            throw new Exception(\sprintf('Not allowed to enable plugin "%s".', $plugin->getName()));
         }
 
         $plugin->setActive(true);
@@ -215,7 +215,7 @@ public function deactivatePlugin(Plugin $plugin)
         $result = \is_bool($result) ? ['success' => $result] : $result;
 
         if ($result['success'] == false) {
-            throw new Exception(sprintf('Not allowed to disable plugin "%s".', $plugin->getName()));
+            throw new Exception(\sprintf('Not allowed to disable plugin "%s".', $plugin->getName()));
         }
 
         $plugin->setActive(false);
@@ -254,7 +254,7 @@ public function refreshPluginList(DateTimeInterface $refreshDate)
                     $name = $dir->getFilename();
 
                     if ($this->validateIonCube($file)) {
-                        throw new Exception(sprintf('Plugin "%s" is encrypted but the ionCube Loader extension is not installed', $name));
+                        throw new Exception(\sprintf('Plugin "%s" is encrypted but the ionCube Loader extension is not installed', $name));
                     }
 
                     $plugin = $collection->get($name);
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginCategoryService.php b/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginCategoryService.php
index 6bd51113c5e..0d22f8cd571 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginCategoryService.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginCategoryService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Service;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginExtractor.php b/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginExtractor.php
index d3895e5f94f..47b1296388c 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginExtractor.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginExtractor.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Service;
@@ -33,37 +33,24 @@
 
 class PluginExtractor
 {
-    /**
-     * @var string
-     */
-    private $pluginDir;
+    private string $pluginDir;
 
-    /**
-     * @var Filesystem
-     */
-    private $filesystem;
+    private Filesystem $filesystem;
 
     /**
      * @var string[]
      */
-    private $pluginDirectories;
+    private array $pluginDirectories;
 
-    /**
-     * @var ShopwareReleaseStruct
-     */
-    private $release;
+    private ShopwareReleaseStruct $release;
 
-    /**
-     * @var RequirementValidator
-     */
-    private $requirementsValidator;
+    private RequirementValidator $requirementsValidator;
 
     /**
-     * @param string   $pluginDir
      * @param string[] $pluginDirectories
      */
     public function __construct(
-        $pluginDir,
+        string $pluginDir,
         Filesystem $filesystem,
         array $pluginDirectories,
         ShopwareReleaseStruct $release,
@@ -82,13 +69,15 @@ public function __construct(
      * @param ZipArchive $archive
      *
      * @throws Exception
+     *
+     * @return void
      */
     public function extract($archive)
     {
         $destination = $this->pluginDir;
 
         if (!is_writable($destination)) {
-            throw new Exception(sprintf('Destination directory "%s" is not writable', $destination));
+            throw new Exception(\sprintf('Destination directory "%s" is not writable', $destination));
         }
 
         $prefix = $this->getPluginPrefix($archive);
@@ -107,7 +96,7 @@ public function extract($archive)
 
             unlink($archive->filename);
         } catch (Exception $e) {
-            if ($backupFile !== false) {
+            if ($oldFile !== false) {
                 $this->filesystem->rename($backupFile, $oldFile);
             }
             throw $e;
@@ -120,25 +109,26 @@ public function extract($archive)
      * Iterates all files of the provided zip archive
      * path and validates the plugin namespace, directory traversal
      * and multiple plugin directories.
-     *
-     * @param string $prefix
      */
-    private function validatePluginZip($prefix, ZipArchive $archive)
+    private function validatePluginZip(string $prefix, ZipArchive $archive): void
     {
         for ($i = 2; $i < $archive->numFiles; ++$i) {
             $stat = $archive->statIndex($i);
+            if (!\is_array($stat)) {
+                continue;
+            }
 
             $this->assertNoDirectoryTraversal($stat['name']);
             $this->assertPrefix($stat['name'], $prefix);
         }
     }
 
-    /**
-     * @return string
-     */
-    private function getPluginPrefix(ZipArchive $archive)
+    private function getPluginPrefix(ZipArchive $archive): string
     {
         $entry = $archive->statIndex(0);
+        if (!\is_array($entry)) {
+            return '';
+        }
 
         return explode('/', $entry['name'])[0];
     }
@@ -147,7 +137,7 @@ private function getPluginPrefix(ZipArchive $archive)
      * Clear opcode caches to make sure that the
      * updated plugin files are used in the following requests.
      */
-    private function clearOpcodeCache()
+    private function clearOpcodeCache(): void
     {
         if (\function_exists('opcache_reset')) {
             opcache_reset();
@@ -158,21 +148,14 @@ private function clearOpcodeCache()
         }
     }
 
-    /**
-     * @param string $filename
-     * @param string $prefix
-     */
-    private function assertPrefix($filename, $prefix)
+    private function assertPrefix(string $filename, string $prefix): void
     {
         if (strpos($filename, $prefix) !== 0) {
-            throw new RuntimeException(sprintf('Detected invalid file/directory %s in the plugin zip: %s', $filename, $prefix));
+            throw new RuntimeException(\sprintf('Detected invalid file/directory %s in the plugin zip: %s', $filename, $prefix));
         }
     }
 
-    /**
-     * @param string $filename
-     */
-    private function assertNoDirectoryTraversal($filename)
+    private function assertNoDirectoryTraversal(string $filename): void
     {
         if (strpos($filename, '../') !== false) {
             throw new RuntimeException('Directory Traversal detected');
@@ -180,11 +163,9 @@ private function assertNoDirectoryTraversal($filename)
     }
 
     /**
-     * @param string $pluginName
-     *
-     * @return bool|string
+     * @return false|string
      */
-    private function findOldFile($pluginName)
+    private function findOldFile(string $pluginName)
     {
         $dir = $this->pluginDir . '/' . $pluginName;
         if ($this->filesystem->exists($dir)) {
@@ -208,7 +189,7 @@ private function findOldFile($pluginName)
     /**
      * @param string|false $oldFile
      *
-     * @return bool|string
+     * @return false|string
      */
     private function createBackupFile($oldFile)
     {
@@ -222,19 +203,19 @@ private function createBackupFile($oldFile)
         return $backupFile;
     }
 
-    /**
-     * @param string $prefix
-     */
-    private function validatePluginRequirements($prefix, ZipArchive $archive)
+    private function validatePluginRequirements(string $prefix, ZipArchive $archive): void
     {
-        if ($xml = $archive->getFromName($prefix . '/plugin.xml')) {
-            $tmpFile = tempnam(sys_get_temp_dir(), uniqid()) . '.xml';
-            file_put_contents($tmpFile, $xml);
-            try {
-                $this->requirementsValidator->validate($tmpFile, $this->release->getVersion());
-            } finally {
-                unlink($tmpFile);
-            }
+        $xml = $archive->getFromName($prefix . '/plugin.xml');
+        if (!$xml) {
+            return;
+        }
+
+        $tmpFile = tempnam(sys_get_temp_dir(), uniqid()) . '.xml';
+        file_put_contents($tmpFile, $xml);
+        try {
+            $this->requirementsValidator->validate($tmpFile, $this->release->getVersion());
+        } finally {
+            unlink($tmpFile);
         }
     }
 }
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInitializer.php b/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInitializer.php
index 14b3e4c11da..777706b51cb 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInitializer.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInitializer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Service;
@@ -74,12 +74,9 @@ public function initializePlugins()
         $classLoader = new ClassLoader();
         $classLoader->register(true);
 
-        $stmt = $this->connection->query('SELECT `name`, `version`, `namespace` FROM s_core_plugins WHERE `active` = 1 AND `installation_date` IS NOT NULL;');
-        if ($stmt === false) {
-            throw new RuntimeException('Could not load plugins from database');
-        }
-
-        $activePlugins = $stmt->fetchAll(PDO::FETCH_UNIQUE);
+        $activePlugins = $this->connection->query(
+            'SELECT `name`, `version`, `namespace` FROM s_core_plugins WHERE `active` = 1 AND `installation_date` IS NOT NULL;'
+        )->fetchAll(PDO::FETCH_UNIQUE);
         if (!\is_array($activePlugins)) {
             throw new RuntimeException('Could not load plugins from database');
         }
@@ -120,13 +117,13 @@ public function initializePlugins()
 
         foreach ($pluginsAvailable as $pluginName => $pluginDetails) {
             if (!class_exists($pluginDetails['className'])) {
-                throw new RuntimeException(sprintf('Unable to load class %s for plugin %s in file %s', $pluginDetails['className'], $pluginName, $pluginDetails['pluginFile']));
+                throw new RuntimeException(\sprintf('Unable to load class %s for plugin %s in file %s', $pluginDetails['className'], $pluginName, $pluginDetails['pluginFile']));
             }
 
             $plugin = new $pluginDetails['className']($pluginDetails['isActive'], $pluginDetails['pluginNamespace']);
 
             if (!$plugin instanceof Plugin) {
-                throw new RuntimeException(sprintf('Class %s must extend %s in file %s', \get_class($plugin), Plugin::class, $pluginDetails['pluginFile']));
+                throw new RuntimeException(\sprintf('Class %s must extend %s in file %s', \get_class($plugin), Plugin::class, $pluginDetails['pluginFile']));
             }
 
             $plugins[$plugin->getName()] = $plugin;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php b/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
index 83cd1c5f8b2..661d18c1287 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Service;
@@ -27,7 +28,8 @@
 use DateTime;
 use DateTimeInterface;
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Driver\ResultStatement;
+use Doctrine\DBAL\DBALException;
+use Doctrine\ORM\OptimisticLockException;
 use Enlight_Event_EventManager;
 use Exception;
 use InvalidArgumentException;
@@ -45,11 +47,11 @@
 use Shopware\Bundle\PluginInstallerBundle\Events\PrePluginInstallEvent;
 use Shopware\Bundle\PluginInstallerBundle\Events\PrePluginUninstallEvent;
 use Shopware\Bundle\PluginInstallerBundle\Events\PrePluginUpdateEvent;
+use Shopware\Components\Migrations\AbstractMigration;
 use Shopware\Components\Migrations\AbstractPluginMigration;
 use Shopware\Components\Migrations\PluginMigrationManager;
 use Shopware\Components\Model\ModelManager;
-use Shopware\Components\Plugin as PluginBootstrap;
-use Shopware\Components\Plugin as PluginComponent;
+use Shopware\Components\Plugin as PluginBaseClass;
 use Shopware\Components\Plugin\Context\ActivateContext;
 use Shopware\Components\Plugin\Context\DeactivateContext;
 use Shopware\Components\Plugin\Context\InstallContext;
@@ -70,58 +72,31 @@
 
 class PluginInstaller
 {
-    /**
-     * @var ModelManager
-     */
-    private $em;
+    private ModelManager $em;
 
-    /**
-     * @var Connection
-     */
-    private $connection;
+    private Connection $connection;
 
-    /**
-     * @var DatabaseHandler
-     */
-    private $snippetHandler;
+    private DatabaseHandler $snippetHandler;
 
-    /**
-     * @var RequirementValidator
-     */
-    private $requirementValidator;
+    private RequirementValidator $requirementValidator;
 
-    /**
-     * @var PDO
-     */
-    private $pdo;
+    private PDO $pdo;
 
     /**
-     * @var string[]
+     * @var array<string, string>
      */
-    private $pluginDirectories;
+    private array $pluginDirectories;
 
-    /**
-     * @var ShopwareReleaseStruct
-     */
-    private $release;
+    private ShopwareReleaseStruct $release;
 
-    /**
-     * @var Enlight_Event_EventManager
-     */
-    private $events;
+    private Enlight_Event_EventManager $events;
 
-    /**
-     * @var LoggerInterface
-     */
-    private $logger;
+    private LoggerInterface $logger;
 
-    /**
-     * @var Kernel
-     */
-    private $kernel;
+    private Kernel $kernel;
 
     /**
-     * @param string|string[] $pluginDirectories
+     * @param array<string, string> $pluginDirectories
      */
     public function __construct(
         ModelManager $em,
@@ -129,7 +104,7 @@ public function __construct(
         RequirementValidator $requirementValidator,
         PDO $pdo,
         Enlight_Event_EventManager $events,
-        $pluginDirectories,
+        array $pluginDirectories,
         ShopwareReleaseStruct $release,
         LoggerInterface $logger,
         Kernel $kernel
@@ -140,7 +115,7 @@ public function __construct(
         $this->requirementValidator = $requirementValidator;
         $this->pdo = $pdo;
         $this->events = $events;
-        $this->pluginDirectories = (array) $pluginDirectories;
+        $this->pluginDirectories = $pluginDirectories;
         $this->release = $release;
         $this->logger = $logger;
         $this->kernel = $kernel;
@@ -163,13 +138,13 @@ public function installPlugin(Plugin $plugin)
         $this->installResources($pluginBootstrap, $plugin);
 
         // Makes sure the version is updated in the db after a re-installation
-        if ($this->hasInfoNewerVersion($plugin->getUpdateVersion(), $plugin->getVersion())) {
+        if ($plugin->getUpdateVersion() && $this->hasInfoNewerVersion($plugin->getUpdateVersion(), $plugin->getVersion())) {
             $plugin->setVersion($plugin->getUpdateVersion());
         }
 
         $this->em->flush($plugin);
 
-        $this->applyMigrations($pluginBootstrap, AbstractPluginMigration::MODUS_INSTALL);
+        $this->applyMigrations($pluginBootstrap, AbstractMigration::MODUS_INSTALL);
 
         $pluginBootstrap->install($context);
 
@@ -187,8 +162,8 @@ public function installPlugin(Plugin $plugin)
      * @param bool $removeData
      *
      * @throws Exception
-     * @throws \Doctrine\DBAL\DBALException
-     * @throws \Doctrine\ORM\OptimisticLockException
+     * @throws DBALException
+     * @throws OptimisticLockException
      *
      * @return UninstallContext
      */
@@ -250,7 +225,7 @@ public function updatePlugin(Plugin $plugin)
 
         $this->installResources($pluginBootstrap, $plugin);
 
-        $this->applyMigrations($pluginBootstrap, AbstractPluginMigration::MODUS_UPDATE);
+        $this->applyMigrations($pluginBootstrap, AbstractMigration::MODUS_UPDATE);
 
         $pluginBootstrap->update($context);
 
@@ -268,7 +243,7 @@ public function updatePlugin(Plugin $plugin)
 
     /**
      * @throws Exception
-     * @throws \Doctrine\ORM\OptimisticLockException
+     * @throws OptimisticLockException
      *
      * @return ActivateContext
      */
@@ -293,7 +268,7 @@ public function activatePlugin(Plugin $plugin)
 
     /**
      * @throws Exception
-     * @throws \Doctrine\ORM\OptimisticLockException
+     * @throws OptimisticLockException
      *
      * @return DeactivateContext
      */
@@ -316,26 +291,26 @@ public function deactivatePlugin(Plugin $plugin)
 
     /**
      * @throws RuntimeException
+     *
+     * @return void
      */
     public function refreshPluginList(DateTimeInterface $refreshDate)
     {
+        $refreshDateString = $refreshDate->format('Y-m-d H:i:s');
         $initializer = new PluginInitializer(
             $this->pdo,
             $this->pluginDirectories
         );
 
-        $plugins = $initializer->initializePlugins();
-
-        foreach ($plugins as $plugin) {
+        foreach ($initializer->initializePlugins() as $plugin) {
             $pluginInfoPath = $plugin->getPath() . '/plugin.xml';
             if (is_file($pluginInfoPath)) {
-                $xmlConfigReader = new XmlPluginReader();
-                $info = $xmlConfigReader->read($pluginInfoPath);
+                $info = (new XmlPluginReader())->read($pluginInfoPath);
             } else {
                 $info = [];
             }
 
-            $currentPluginInfo = $this->em->getConnection()->fetchAssoc(
+            $currentPluginInfo = $this->em->getConnection()->fetchAssociative(
                 'SELECT * FROM s_core_plugins WHERE `name` LIKE ?',
                 [$plugin->getName()]
             );
@@ -352,43 +327,43 @@ public function refreshPluginList(DateTimeInterface $refreshDate)
                 }
             }
 
-            $info['label'] = isset($info['label']['en']) ? $info['label']['en'] : $plugin->getName();
-            $info['description'] = isset($info['description']['en']) ? $info['description']['en'] : null;
-            $info['version'] = isset($info['version']) ? $info['version'] : '0.0.1';
-            $info['author'] = isset($info['author']) ? $info['author'] : null;
-            $info['link'] = isset($info['link']) ? $info['link'] : null;
+            $info['label'] = (string) ($info['label']['en'] ?? $plugin->getName());
+            $info['description'] = $info['description']['en'] ?? null;
+            $info['version'] = (string) ($info['version'] ?? '0.0.1');
+            $info['author'] = $info['author'] ?? null;
+            $info['link'] = $info['link'] ?? null;
 
             $data = [
                 'namespace' => $plugin->getPluginNamespace(),
                 'version' => $info['version'],
-                'author' => $info['author'],
+                'author' => $info['author'] ? (string) $info['author'] : null,
                 'name' => $plugin->getName(),
-                'link' => $info['link'],
+                'link' => $info['link'] ? (string) $info['link'] : null,
                 'label' => $info['label'],
-                'description' => $info['description'],
-                'capability_update' => true,
-                'capability_install' => true,
-                'capability_enable' => true,
-                'capability_secure_uninstall' => true,
-                'refresh_date' => $refreshDate,
-                'translations' => $translations ? json_encode($translations) : null,
-                'changes' => isset($info['changelog']) ? json_encode($info['changelog']) : null,
+                'description' => $info['description'] ? (string) $info['description'] : null,
+                'capability_update' => 1,
+                'capability_install' => 1,
+                'capability_enable' => 1,
+                'capability_secure_uninstall' => 1,
+                'refresh_date' => $refreshDateString,
+                'translations' => $translations ? json_encode($translations, JSON_THROW_ON_ERROR) : null,
+                'changes' => isset($info['changelog']) ? json_encode($info['changelog'], JSON_THROW_ON_ERROR) : null,
             ];
 
             if ($currentPluginInfo) {
                 if ($this->hasInfoNewerVersion($info['version'], $currentPluginInfo['version'])) {
-                    $data['version'] = $currentPluginInfo['version'];
+                    $data['version'] = (string) $currentPluginInfo['version'];
                     $data['update_version'] = $info['version'];
                 }
 
                 $this->em->getConnection()->update(
                     's_core_plugins',
                     $data,
-                    ['id' => $currentPluginInfo['id']],
+                    ['id' => (int) $currentPluginInfo['id']],
                     ['refresh_date' => 'datetime']
                 );
             } else {
-                $data['added'] = $refreshDate;
+                $data['added'] = $refreshDateString;
                 $this->em->getConnection()->insert(
                     's_core_plugins',
                     $data,
@@ -408,15 +383,10 @@ public function refreshPluginList(DateTimeInterface $refreshDate)
      */
     public function getPluginPath(Plugin $plugin)
     {
-        $pluginBootstrap = $this->getPluginByName($plugin->getName());
-
-        return $pluginBootstrap->getPath();
+        return $this->getPluginByName($plugin->getName())->getPath();
     }
 
-    /**
-     * @param bool $removeDirty
-     */
-    private function removeSnippets(PluginBootstrap $bootstrap, $removeDirty)
+    private function removeSnippets(PluginBaseClass $bootstrap, bool $removeDirty): void
     {
         $this->snippetHandler->removeFromDatabase($bootstrap->getPath() . '/Resources/snippets/', $removeDirty);
     }
@@ -424,7 +394,7 @@ private function removeSnippets(PluginBootstrap $bootstrap, $removeDirty)
     /**
      * @throws Exception
      */
-    private function installResources(PluginBootstrap $bootstrap, Plugin $plugin)
+    private function installResources(PluginBaseClass $bootstrap, Plugin $plugin): void
     {
         if (is_file($bootstrap->getPath() . '/Resources/config.xml')) {
             $this->installForm($plugin, $bootstrap->getPath() . '/Resources/config.xml');
@@ -443,88 +413,67 @@ private function installResources(PluginBootstrap $bootstrap, Plugin $plugin)
         }
     }
 
-    private function installSnippets(PluginBootstrap $bootstrap)
+    private function installSnippets(PluginBaseClass $bootstrap): void
     {
         $this->snippetHandler->loadToDatabase($bootstrap->getPath() . '/Resources/snippets/');
     }
 
     /**
-     * @param string $file
-     *
      * @throws Exception
      */
-    private function installForm(Plugin $plugin, $file)
+    private function installForm(Plugin $plugin, string $file): void
     {
-        $xmlConfigReader = new XmlConfigReader();
-        $config = $xmlConfigReader->read($file);
+        $config = (new XmlConfigReader())->read($file);
 
         $formSynchronizer = new FormSynchronizer($this->em);
         $formSynchronizer->synchronize($plugin, $config);
     }
 
     /**
-     * @param string $file
-     *
      * @throws InvalidArgumentException
      */
-    private function installMenu(Plugin $plugin, $file)
+    private function installMenu(Plugin $plugin, string $file): void
     {
-        $menuReader = new XmlMenuReader();
-        $menu = $menuReader->read($file);
+        $menu = (new XmlMenuReader())->read($file);
 
         $menuSynchronizer = new MenuSynchronizer($this->em);
         $menuSynchronizer->synchronize($plugin, $menu);
     }
 
     /**
-     * @param string $file
-     *
      * @throws InvalidArgumentException
      */
-    private function installCronjob(Plugin $plugin, $file)
+    private function installCronjob(Plugin $plugin, string $file): void
     {
-        $cronjobReader = new XmlCronjobReader();
-        $cronjobs = $cronjobReader->read($file);
+        $cronjobs = (new XmlCronjobReader())->read($file);
 
         $cronjobSynchronizer = new CronjobSynchronizer($this->em->getConnection());
         $cronjobSynchronizer->synchronize($plugin, $cronjobs);
     }
 
-    /**
-     * @param string $updateVersion
-     * @param string $currentVersion
-     *
-     * @return bool
-     */
-    private function hasInfoNewerVersion($updateVersion, $currentVersion)
+    private function hasInfoNewerVersion(string $updateVersion, string $currentVersion): bool
     {
         return version_compare($updateVersion, $currentVersion, '>');
     }
 
     /**
-     * @param string $pluginName
-     *
      * @throws Exception
-     *
-     * @return PluginBootstrap
      */
-    private function getPluginByName($pluginName)
+    private function getPluginByName(string $pluginName): PluginBaseClass
     {
         $plugins = $this->kernel->getPlugins();
 
         if (!isset($plugins[$pluginName])) {
-            throw new InvalidArgumentException(sprintf('Plugin by name "%s" not found.', $pluginName));
+            throw new InvalidArgumentException(\sprintf('Plugin by name "%s" not found.', $pluginName));
         }
 
         return $plugins[$pluginName];
     }
 
     /**
-     * @param int $pluginId
-     *
-     * @throws \Doctrine\DBAL\DBALException
+     * @throws DBALException
      */
-    private function removeEmotionComponents($pluginId)
+    private function removeEmotionComponents(int $pluginId): void
     {
         // Remove emotion-components
         $sql = 'DELETE s_emotion_element_value, s_emotion_element
@@ -547,11 +496,9 @@ private function removeEmotionComponents($pluginId)
     }
 
     /**
-     * @param int $pluginId
-     *
-     * @throws \Doctrine\DBAL\DBALException
+     * @throws DBALException
      */
-    private function removeFormsAndElements($pluginId)
+    private function removeFormsAndElements(int $pluginId): void
     {
         $sql = <<<SQL
 DELETE s_core_config_forms, s_core_config_form_translations, s_core_config_elements, s_core_config_element_translations, s_core_config_values
@@ -566,31 +513,26 @@ private function removeFormsAndElements($pluginId)
     }
 
     /**
-     * @param int $pluginId
-     *
-     * @throws \Doctrine\DBAL\DBALException
+     * @throws DBALException
      */
-    private function removeTemplates($pluginId)
+    private function removeTemplates(int $pluginId): void
     {
         $sql = 'DELETE FROM s_core_templates WHERE plugin_id = :pluginId';
         $this->connection->executeStatement($sql, [':pluginId' => $pluginId]);
     }
 
     /**
-     * @throws \Doctrine\DBAL\DBALException
+     * @throws DBALException
      */
-    private function removeMenuEntries(int $pluginId)
+    private function removeMenuEntries(int $pluginId): void
     {
-        $builder = $this->em->getConnection()->createQueryBuilder();
-        $builder->select(['id', 'controller', 'action']);
-        $builder->from('s_core_menu');
-        $builder->andWhere('pluginID = :pluginId');
-        $builder->setParameter(':pluginId', $pluginId);
-
-        /** @var ResultStatement<array> $statement */
-        $statement = $builder->execute();
-
-        $menuItems = $statement->fetchAll();
+        $menuItems = $this->em->getConnection()->createQueryBuilder()
+            ->select(['id', 'controller', 'action'])
+            ->from('s_core_menu')
+            ->andWhere('pluginID = :pluginId')
+            ->setParameter(':pluginId', $pluginId)
+            ->execute()
+            ->fetchAllAssociative();
 
         if (\count($menuItems) === 0) {
             return;
@@ -620,28 +562,27 @@ private function removeMenuEntries(int $pluginId)
     }
 
     /**
-     * @param int $pluginId
-     *
-     * @throws \Doctrine\DBAL\DBALException
+     * @throws DBALException
      */
-    private function removeCrontabEntries($pluginId)
+    private function removeCrontabEntries(int $pluginId): void
     {
         $sql = 'DELETE FROM s_crontab WHERE pluginID = :pluginId';
         $this->connection->executeStatement($sql, [':pluginId' => $pluginId]);
     }
 
     /**
-     * @param int $pluginId
-     *
-     * @throws \Doctrine\DBAL\DBALException
+     * @throws DBALException
      */
-    private function removeEventSubscribers($pluginId)
+    private function removeEventSubscribers(int $pluginId): void
     {
         $sql = 'DELETE FROM s_core_subscribes WHERE pluginID = :pluginId';
         $this->connection->executeStatement($sql, [':pluginId' => $pluginId]);
     }
 
-    private function applyMigrations(PluginComponent $plugin, string $mode, bool $keepUserData = false): void
+    /**
+     * @param AbstractPluginMigration::MODUS_* $mode
+     */
+    private function applyMigrations(PluginBaseClass $plugin, string $mode, bool $keepUserData = false): void
     {
         $manager = new PluginMigrationManager($this->pdo, $plugin, $this->logger);
         if (!is_dir($manager->getMigrationPath())) {
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginLicenceService.php b/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginLicenceService.php
index fcf53d36cdb..025f729d711 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginLicenceService.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginLicenceService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Service;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginLocalService.php b/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginLocalService.php
index 4d09406cf80..c9dc8018a65 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginLocalService.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginLocalService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Service;
@@ -162,7 +162,7 @@ private function iteratePlugins(array $plugins, BaseRequest $context): array
                 $row['iconPath'] = null;
             }
 
-            $translations = json_decode($row['translations'], true);
+            $translations = json_decode($row['translations'] ?? '', true);
 
             if (isset($translations[$locale]['label'])) {
                 $row['label'] = $translations[$locale]['label'];
@@ -265,7 +265,7 @@ private function parseChangeLog(string $html): string
         }
 
         $dom = new DOMDocument();
-        $dom->loadHTML(mb_convert_encoding($html, 'HTML-ENTITIES', 'UTF-8'));
+        $dom->loadHTML(htmlentities($html));
 
         $nodes = (new DOMXPath($dom))->query("//@*[local-name() != 'href']");
         if ($nodes === false) {
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginStoreService.php b/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginStoreService.php
index 394e6d757ad..1d7afb9e74d 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginStoreService.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginStoreService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Service;
@@ -147,7 +147,7 @@ public function getUpdates(UpdateListingRequest $context)
      */
     public function getPluginLicence(PluginLicenceRequest $context)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         $content = $this->storeClient->doAuthGetRequest(
             $context->getToken(),
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginViewService.php b/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginViewService.php
index 672c119253f..05880c5d871 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginViewService.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginViewService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Service;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginZipDetector.php b/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginZipDetector.php
index 74887cc8878..302f3531641 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginZipDetector.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginZipDetector.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Service;
@@ -34,6 +34,9 @@ class PluginZipDetector
     public function isLegacyPlugin(ZipArchive $archive)
     {
         $entry = $archive->statIndex(0);
+        if (!\is_array($entry)) {
+            return false;
+        }
         $rootDirectory = explode('/', $entry['name'])[0];
 
         return \in_array($rootDirectory, ['Frontend', 'Backend', 'Core']);
@@ -45,6 +48,9 @@ public function isLegacyPlugin(ZipArchive $archive)
     public function isPlugin(ZipArchive $archive)
     {
         $entry = $archive->statIndex(0);
+        if (!\is_array($entry)) {
+            return false;
+        }
 
         $pluginName = explode('/', $entry['name'])[0];
         $bootstrapFile = $pluginName . '/' . $pluginName . '.php';
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Service/StoreOrderService.php b/engine/Shopware/Bundle/PluginInstallerBundle/Service/StoreOrderService.php
index 26759ca799a..d7e08706ca7 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Service/StoreOrderService.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Service/StoreOrderService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Service;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Service/SubscriptionService.php b/engine/Shopware/Bundle/PluginInstallerBundle/Service/SubscriptionService.php
index bcf7b3297e9..49f6df5a372 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Service/SubscriptionService.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Service/SubscriptionService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Service;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Service/UniqueIdGenerator/UniqueIdGenerator.php b/engine/Shopware/Bundle/PluginInstallerBundle/Service/UniqueIdGenerator/UniqueIdGenerator.php
index a6c1322f164..984d59feacf 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Service/UniqueIdGenerator/UniqueIdGenerator.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Service/UniqueIdGenerator/UniqueIdGenerator.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Service\UniqueIdGenerator;
@@ -29,14 +30,11 @@
 use Shopware\Components\Random;
 
 /**
- * A simple class for storing a generated unique Id in the database.
+ * A simple class for storing a generated unique ID in the database.
  */
 class UniqueIdGenerator implements UniqueIdGeneratorInterface
 {
-    /**
-     * @var Connection
-     */
-    private $connection;
+    private Connection $connection;
 
     public function __construct(Connection $connection)
     {
@@ -48,7 +46,8 @@ public function __construct(Connection $connection)
      */
     public function getUniqueId()
     {
-        if ($uniqueId = $this->readUniqueIdFromDb()) {
+        $uniqueId = $this->readUniqueIdFromDb();
+        if ($uniqueId) {
             return $uniqueId;
         }
 
@@ -59,10 +58,7 @@ public function getUniqueId()
         return $uniqueId;
     }
 
-    /**
-     * @return string|null
-     */
-    private function readUniqueIdFromDb()
+    private function readUniqueIdFromDb(): ?string
     {
         $sql = <<<'sql'
 SELECT s_core_config_values.value FROM s_core_config_values
@@ -71,25 +67,22 @@ private function readUniqueIdFromDb()
     AND s_core_config_elements.name LIKE 'trackingUniqueId'
 WHERE s_core_config_values.shop_id = 1
 sql;
-        $uniqueId = $this->connection->fetchColumn($sql);
+        $uniqueId = $this->connection->fetchOne($sql);
 
-        if ($uniqueId !== false && \is_string($uniqueId)) {
+        if (\is_string($uniqueId)) {
             return unserialize($uniqueId, ['allowed_classes' => false]);
         }
 
         return null;
     }
 
-    /**
-     * @param string $uniqueId
-     */
-    private function storeUniqueIdInDb($uniqueId)
+    private function storeUniqueIdInDb(string $uniqueId): void
     {
-        $uniqueRowId = $this->connection->fetchColumn('SELECT id FROM s_core_config_elements WHERE name LIKE \'trackingUniqueId\' LIMIT 1');
+        $uniqueRowId = $this->connection->fetchOne("SELECT id FROM s_core_config_elements WHERE name LIKE 'trackingUniqueId' LIMIT 1");
 
         if ($uniqueRowId === false) {
-            $this->connection->executeUpdate('INSERT INTO s_core_config_elements (form_id, name, value, label, description, type, required, position, scope)
-VALUES (\'0\', \'trackingUniqueId\', \'s:0:"";\', \'Unique identifier\', \'\', \'text\', \'0\', \'0\', \'1\')');
+            $this->connection->executeStatement("INSERT INTO s_core_config_elements (form_id, name, value, label, description, type, required, position, scope)
+VALUES ('0', 'trackingUniqueId', 's:0:\"\";', 'Unique identifier', '', 'text', '0', '0', '1')");
             $uniqueRowId = $this->connection->lastInsertId();
         }
 
@@ -99,7 +92,7 @@ private function storeUniqueIdInDb($uniqueId)
 )
 sql;
 
-        $this->connection->executeUpdate(
+        $this->connection->executeStatement(
             $sql,
             [
                 'uniqueRowId' => $uniqueRowId,
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Service/UniqueIdGeneratorInterface.php b/engine/Shopware/Bundle/PluginInstallerBundle/Service/UniqueIdGeneratorInterface.php
index 524bab13910..797a2ac8754 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Service/UniqueIdGeneratorInterface.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Service/UniqueIdGeneratorInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Service;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Service/ZipUtils.php b/engine/Shopware/Bundle/PluginInstallerBundle/Service/ZipUtils.php
index 518cd742598..e5784e9462c 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Service/ZipUtils.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Service/ZipUtils.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Service;
@@ -55,25 +55,25 @@ private static function getErrorMessage($retVal, $file)
     {
         switch ($retVal) {
             case ZipArchive::ER_EXISTS:
-                return sprintf("File '%s' already exists.", $file);
+                return \sprintf("File '%s' already exists.", $file);
             case ZipArchive::ER_INCONS:
-                return sprintf("Zip archive '%s' is inconsistent.", $file);
+                return \sprintf("Zip archive '%s' is inconsistent.", $file);
             case ZipArchive::ER_INVAL:
-                return sprintf('Invalid argument (%s)', $file);
+                return \sprintf('Invalid argument (%s)', $file);
             case ZipArchive::ER_MEMORY:
-                return sprintf('Malloc failure (%s)', $file);
+                return \sprintf('Malloc failure (%s)', $file);
             case ZipArchive::ER_NOENT:
-                return sprintf("No such zip file: '%s'", $file);
+                return \sprintf("No such zip file: '%s'", $file);
             case ZipArchive::ER_NOZIP:
-                return sprintf("'%s' is not a zip archive.", $file);
+                return \sprintf("'%s' is not a zip archive.", $file);
             case ZipArchive::ER_OPEN:
-                return sprintf("Can't open zip file: %s", $file);
+                return \sprintf("Can't open zip file: %s", $file);
             case ZipArchive::ER_READ:
-                return sprintf('Zip read error (%s)', $file);
+                return \sprintf('Zip read error (%s)', $file);
             case ZipArchive::ER_SEEK:
-                return sprintf('Zip seek error (%s)', $file);
+                return \sprintf('Zip seek error (%s)', $file);
             default:
-                return sprintf("'%s' is not a valid zip archive, got error code: %s", $file, $retVal);
+                return \sprintf("'%s' is not a valid zip archive, got error code: %s", $file, $retVal);
         }
     }
 }
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/StoreClient.php b/engine/Shopware/Bundle/PluginInstallerBundle/StoreClient.php
index cbfb33d98d2..97f34dad141 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/StoreClient.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/StoreClient.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle;
@@ -287,7 +287,7 @@ public function doTrackEvent($eventName, $additionalData = [])
      *
      * @throws Exception
      */
-    private function getRequest(string $resource, array $params, array $headers = [], AccessTokenStruct $token = null): Response
+    private function getRequest(string $resource, array $params, array $headers = [], ?AccessTokenStruct $token = null): Response
     {
         $url = $this->apiEndPoint . $resource;
         if (!empty($params)) {
@@ -315,12 +315,11 @@ private function getRequest(string $resource, array $params, array $headers = []
     /**
      * @param array<string, mixed>  $params
      * @param array<string, string> $headers
-     * @param AccessTokenStruct     $token
      *
      * @throws StoreException
      * @throws Exception
      */
-    private function postRequest(string $resource, array $params = [], array $headers = [], AccessTokenStruct $token = null): Response
+    private function postRequest(string $resource, array $params = [], array $headers = [], ?AccessTokenStruct $token = null): Response
     {
         $url = $this->apiEndPoint . $resource;
 
@@ -477,7 +476,7 @@ private function handleRequestException(RequestException $requestException): voi
                 throw new MissingDoubleOptInConfirmationException($sbpCode, 'missing_doi_confirmation', $httpCode, $requestException);
         }
 
-        $reason = \array_key_exists('reason', $data) ? $data['reason'] : sprintf('Unknown error occurred. (%s)', $sbpCode);
+        $reason = \array_key_exists('reason', $data) ? $data['reason'] : \sprintf('Unknown error occurred. (%s)', $sbpCode);
 
         throw new StoreException($sbpCode, $reason, $httpCode, $requestException);
     }
@@ -488,7 +487,7 @@ private function verifyResponseSignature(Response $response): void
         $signature = $response->getHeader($signatureHeaderName);
 
         if (!\is_string($signature)) {
-            throw new RuntimeException(sprintf('Signature not found in header "%s"', $signatureHeaderName));
+            throw new RuntimeException(\sprintf('Signature not found in header "%s"', $signatureHeaderName));
         }
 
         if (!$this->openSSLVerifier->isSystemSupported()) {
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/AccessTokenStruct.php b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/AccessTokenStruct.php
index 94671f4d720..7046731386d 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/AccessTokenStruct.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/AccessTokenStruct.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Struct;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/AddressStruct.php b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/AddressStruct.php
index 0a00b794179..b2f2ed56025 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/AddressStruct.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/AddressStruct.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Struct;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/BasketPositionStruct.php b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/BasketPositionStruct.php
index 9f290101799..aa0bc1ae2dc 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/BasketPositionStruct.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/BasketPositionStruct.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Struct;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/BasketStruct.php b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/BasketStruct.php
index 360279e8492..53dee049f02 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/BasketStruct.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/BasketStruct.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Struct;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/CategoryStruct.php b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/CategoryStruct.php
index eb7d9f0bad6..0ddafd72e22 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/CategoryStruct.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/CategoryStruct.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Struct;
@@ -37,14 +37,14 @@ class CategoryStruct implements JsonSerializable
     private $id;
 
     /**
-     * @var array|string
+     * @var array<string, string>
      */
     private $name;
 
     /**
      * @var int
      */
-    private $parentId = null;
+    private $parentId;
 
     /**
      * @var CategoryStruct[]
@@ -61,6 +61,8 @@ public function getId()
 
     /**
      * @param int $id
+     *
+     * @return void
      */
     public function setId($id)
     {
@@ -68,7 +70,7 @@ public function setId($id)
     }
 
     /**
-     * @return array
+     * @return array<string, string>
      */
     public function getName()
     {
@@ -76,7 +78,9 @@ public function getName()
     }
 
     /**
-     * @param array $name
+     * @param array<string, string> $name
+     *
+     * @return void
      */
     public function setName($name)
     {
@@ -93,6 +97,8 @@ public function getParentId()
 
     /**
      * @param int $parentId
+     *
+     * @return void
      */
     public function setParentId($parentId)
     {
@@ -109,6 +115,8 @@ public function getChildren()
 
     /**
      * @param CategoryStruct[] $children
+     *
+     * @return void
      */
     public function setChildren($children)
     {
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/CommentStruct.php b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/CommentStruct.php
index 2a1b9e34183..f06062f5511 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/CommentStruct.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/CommentStruct.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Struct;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/DomainStruct.php b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/DomainStruct.php
index 74b84861184..e6255d6bf6c 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/DomainStruct.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/DomainStruct.php
@@ -1,28 +1,26 @@
 <?php
 
 declare(strict_types=1);
-
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Struct;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/LicenceStruct.php b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/LicenceStruct.php
index 948cb495710..28eaa707e00 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/LicenceStruct.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/LicenceStruct.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Struct;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/ListingResultStruct.php b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/ListingResultStruct.php
index 9900f0fb3cc..b5be5d08981 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/ListingResultStruct.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/ListingResultStruct.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Struct;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/LocaleStruct.php b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/LocaleStruct.php
index befce965fe5..d22fda79f38 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/LocaleStruct.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/LocaleStruct.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Struct;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/MetaStruct.php b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/MetaStruct.php
index 28699ead68e..83184d381f6 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/MetaStruct.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/MetaStruct.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Struct;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/PictureStruct.php b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/PictureStruct.php
index 80e3fd31e21..bfb9a4f3303 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/PictureStruct.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/PictureStruct.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Struct;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/PluginInformationResultStruct.php b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/PluginInformationResultStruct.php
index 4c256cf0adc..0a16580fca7 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/PluginInformationResultStruct.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/PluginInformationResultStruct.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Struct;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/PluginInformationStruct.php b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/PluginInformationStruct.php
index dbe1eba2ee4..e85ca18b965 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/PluginInformationStruct.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/PluginInformationStruct.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Struct;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/PluginStruct.php b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/PluginStruct.php
index 32af487aa3e..5fe7691b620 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/PluginStruct.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/PluginStruct.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Struct;
@@ -36,6 +36,7 @@ class PluginStruct implements JsonSerializable
      * @var int
      *
      * @unique
+     *
      * @optional
      */
     private $id;
@@ -44,6 +45,7 @@ class PluginStruct implements JsonSerializable
      * @var string
      *
      * @unique
+     *
      * @required
      */
     private $technicalName;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/PriceStruct.php b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/PriceStruct.php
index f8b5a3e6b86..1a4c7525d34 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/PriceStruct.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/PriceStruct.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Struct;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/ProducerStruct.php b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/ProducerStruct.php
index a4ff519a800..bd5971ada55 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/ProducerStruct.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/ProducerStruct.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Struct;
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/StructHydrator.php b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/StructHydrator.php
index b491cfe477e..5fd739ee90a 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/StructHydrator.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/StructHydrator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Struct;
@@ -333,17 +333,17 @@ public function hydrateCategory($data)
      */
     public function assignLocalData(PluginStruct $plugin, $data)
     {
-        $plugin->setId((int) $data['id']);
+        $plugin->setId((int) ($data['id'] ?? 0));
         $plugin->setTechnicalName($data['name']);
-        $plugin->setLabel($data['label']);
-        $plugin->setActive((bool) $data['active']);
-        $plugin->setVersion($data['version']);
-        $plugin->setCapabilityActivate((bool) $data['capability_enable']);
-        $plugin->setCapabilityUpdate((bool) $data['capability_update']);
-        $plugin->setCapabilityInstall((bool) $data['capability_install']);
-        $plugin->setCapabilitySecureUninstall((bool) $data['capability_secure_uninstall']);
-        $plugin->setLocalUpdateAvailable($data['update_version'] !== null);
-        $plugin->setLink($data['link']);
+        $plugin->setLabel($data['label'] ?? '');
+        $plugin->setActive((bool) ($data['active'] ?? false));
+        $plugin->setVersion($data['version'] ?? '0.0.1');
+        $plugin->setCapabilityActivate((bool) ($data['capability_enable'] ?? false));
+        $plugin->setCapabilityUpdate((bool) ($data['capability_update'] ?? false));
+        $plugin->setCapabilityInstall((bool) ($data['capability_install'] ?? false));
+        $plugin->setCapabilitySecureUninstall((bool) ($data['capability_secure_uninstall'] ?? false));
+        $plugin->setLocalUpdateAvailable(isset($data['update_version']));
+        $plugin->setLink($data['link'] ?? '');
 
         if (\array_key_exists('redirectToStore', $data)) {
             $plugin->setRedirectToStore((bool) $data['redirectToStore']);
@@ -353,11 +353,11 @@ public function assignLocalData(PluginStruct $plugin, $data)
             $plugin->setLowestPrice((float) $data['lowestPriceValue']);
         }
 
-        $plugin->setSource($data['source']);
-        $plugin->setFormId($data['form_id']);
-        $plugin->setLocalIcon($data['iconPath']);
-        $plugin->setLocalDescription($data['description']);
-        $plugin->setInSafeMode((bool) $data['in_safe_mode']);
+        $plugin->setSource($data['source'] ?? '');
+        $plugin->setFormId($data['form_id'] ?? 0);
+        $plugin->setLocalIcon($data['iconPath'] ?? '');
+        $plugin->setLocalDescription($data['description'] ?? '');
+        $plugin->setInSafeMode((bool) ($data['in_safe_mode'] ?? false));
 
         if (isset($data['installation_date']) && !empty($data['installation_date'])) {
             $date = new DateTime($data['installation_date']);
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/SubscriptionStateStruct.php b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/SubscriptionStateStruct.php
index 5a1238bbb10..d83f71ad4b1 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/SubscriptionStateStruct.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/SubscriptionStateStruct.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Struct;
@@ -62,7 +62,7 @@ class SubscriptionStateStruct implements JsonSerializable
      */
     public function __construct($isShopUpgraded, $notUpgradedPlugins, $wrongVersionPlugins, $expiredPluginSubscriptions)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         $this->isShopUpgraded = $isShopUpgraded;
         $this->notUpgradedPlugins = $notUpgradedPlugins;
@@ -75,7 +75,7 @@ public function __construct($isShopUpgraded, $notUpgradedPlugins, $wrongVersionP
      */
     public function getIsShopUpgraded()
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         return $this->isShopUpgraded;
     }
@@ -85,7 +85,7 @@ public function getIsShopUpgraded()
      */
     public function getNotUpgradedPlugins()
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         return $this->notUpgradedPlugins;
     }
@@ -95,7 +95,7 @@ public function getNotUpgradedPlugins()
      */
     public function getWrongVersionPlugins()
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         return $this->wrongVersionPlugins;
     }
@@ -105,7 +105,7 @@ public function getWrongVersionPlugins()
      */
     public function getExpiredPluginSubscriptions()
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         return $this->expiredPluginSubscriptions;
     }
diff --git a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/UpdateResultStruct.php b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/UpdateResultStruct.php
index f0c58b4d411..68fe6ae7069 100644
--- a/engine/Shopware/Bundle/PluginInstallerBundle/Struct/UpdateResultStruct.php
+++ b/engine/Shopware/Bundle/PluginInstallerBundle/Struct/UpdateResultStruct.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\PluginInstallerBundle\Struct;
diff --git a/engine/Shopware/Bundle/SearchBundle/BatchProductNumberSearch.php b/engine/Shopware/Bundle/SearchBundle/BatchProductNumberSearch.php
index 781485e3322..55512a0e3ec 100644
--- a/engine/Shopware/Bundle/SearchBundle/BatchProductNumberSearch.php
+++ b/engine/Shopware/Bundle/SearchBundle/BatchProductNumberSearch.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle;
@@ -30,23 +30,19 @@
 
 class BatchProductNumberSearch
 {
-    /**
-     * @var ProductNumberSearchInterface
-     */
-    private $productNumberSearch;
+    private ProductNumberSearchInterface $productNumberSearch;
 
-    /**
-     * @var BaseProductFactoryServiceInterface
-     */
-    private $baseProductFactoryService;
+    private BaseProductFactoryServiceInterface $baseProductFactoryService;
 
     /**
-     * @var array
+     * @var array<string, int>
      */
-    private $pointer = [];
+    private array $pointer = [];
 
-    public function __construct(ProductNumberSearchInterface $productNumberSearch, BaseProductFactoryServiceInterface $baseProductFactoryService)
-    {
+    public function __construct(
+        ProductNumberSearchInterface $productNumberSearch,
+        BaseProductFactoryServiceInterface $baseProductFactoryService
+    ) {
         $this->productNumberSearch = $productNumberSearch;
         $this->baseProductFactoryService = $baseProductFactoryService;
     }
@@ -104,6 +100,11 @@ private function getBaseProductsRange(string $key, array $baseProducts, int $num
         return array_merge($items, $this->getBaseProductsRange($key, $baseProducts, $missingItems));
     }
 
+    /**
+     * @param array<string, Criteria> $criteriaList
+     *
+     * @return array<string, array<string, BaseProduct>>
+     */
     private function getBaseProductsByCriteriaList(array $criteriaList, ShopContextInterface $context): array
     {
         $products = [];
@@ -128,9 +129,9 @@ private function getBaseProductsByCriteriaList(array $criteriaList, ShopContextI
     }
 
     /**
-     * @param Criteria[] $criteriaList
+     * @param array<string, Criteria> $criteriaList
      *
-     * @return array<array{criteria: Criteria, requests: array<array{criteria: Criteria, key: int}>}>
+     * @return array<array{criteria: Criteria, requests: array<array{criteria: Criteria, key: string}>}>
      */
     private function getOptimizedCriteriaList(array $criteriaList): array
     {
@@ -140,6 +141,9 @@ private function getOptimizedCriteriaList(array $criteriaList): array
             $criteriaPosition = $this->getOptimizedCriteriaListPosition($originalCriteria, $optimizedCriteriaList);
 
             if ($criteriaPosition !== false) {
+                if (!isset($optimizedCriteriaList[$criteriaPosition]['criteria'])) {
+                    continue;
+                }
                 $existingCriteria = $optimizedCriteriaList[$criteriaPosition]['criteria'];
 
                 // search requests already exists, increase limit to select more products and satisfy all requests
@@ -164,6 +168,8 @@ private function getOptimizedCriteriaList(array $criteriaList): array
     }
 
     /**
+     * @param array<array{criteria: Criteria, requests: array<array{criteria: Criteria, key: string}>}> $criteriaList
+     *
      * @return int|false
      */
     private function getOptimizedCriteriaListPosition(Criteria $criteria, array $criteriaList)
diff --git a/engine/Shopware/Bundle/SearchBundle/BatchProductNumberSearchRequest.php b/engine/Shopware/Bundle/SearchBundle/BatchProductNumberSearchRequest.php
index f38a17a0414..c51e900ee08 100644
--- a/engine/Shopware/Bundle/SearchBundle/BatchProductNumberSearchRequest.php
+++ b/engine/Shopware/Bundle/SearchBundle/BatchProductNumberSearchRequest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle;
@@ -27,17 +27,20 @@
 class BatchProductNumberSearchRequest
 {
     /**
-     * @var array
+     * @var array<string, Criteria>
      */
-    private $criteriaList = [];
+    private array $criteriaList = [];
 
     /**
-     * @var array
+     * @var array<string, array<string>>
      */
-    private $productNumberList = [];
+    private array $productNumberList = [];
 
     /**
-     * @param string $key
+     * @param string        $key
+     * @param array<string> $numbers
+     *
+     * @return void
      */
     public function setProductNumbers($key, array $numbers = [])
     {
@@ -46,6 +49,8 @@ public function setProductNumbers($key, array $numbers = [])
 
     /**
      * @param string $key
+     *
+     * @return void
      */
     public function setCriteria($key, Criteria $criteria)
     {
@@ -53,7 +58,7 @@ public function setCriteria($key, Criteria $criteria)
     }
 
     /**
-     * @return array
+     * @return array<string, Criteria>
      */
     public function getCriteriaList()
     {
@@ -61,7 +66,7 @@ public function getCriteriaList()
     }
 
     /**
-     * @return array
+     * @return array<string, array<string>>
      */
     public function getProductNumbers()
     {
diff --git a/engine/Shopware/Bundle/SearchBundle/BatchProductNumberSearchResult.php b/engine/Shopware/Bundle/SearchBundle/BatchProductNumberSearchResult.php
index b104936f4e1..be836d9b19c 100644
--- a/engine/Shopware/Bundle/SearchBundle/BatchProductNumberSearchResult.php
+++ b/engine/Shopware/Bundle/SearchBundle/BatchProductNumberSearchResult.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle;
@@ -56,7 +56,7 @@ public function get($key)
             return $this->storage[$key];
         }
 
-        throw new OutOfBoundsException(sprintf('Key "%s" was not found.', $key));
+        throw new OutOfBoundsException(\sprintf('Key "%s" was not found.', $key));
     }
 
     /**
diff --git a/engine/Shopware/Bundle/SearchBundle/BatchProductSearch.php b/engine/Shopware/Bundle/SearchBundle/BatchProductSearch.php
index 286612ae46c..ac5b0deb80b 100644
--- a/engine/Shopware/Bundle/SearchBundle/BatchProductSearch.php
+++ b/engine/Shopware/Bundle/SearchBundle/BatchProductSearch.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle;
@@ -82,10 +82,10 @@ private function mapListProducts(BatchProductNumberSearchResult $searchResult, a
     }
 
     /**
-     * @param array<string, Struct\ListProduct|null> $products
-     * @param Struct\BaseProduct[]                   $searchProducts
+     * @param array<string, ListProduct|null> $products
+     * @param Struct\BaseProduct[]            $searchProducts
      *
-     * @return Struct\ListProduct[]
+     * @return ListProduct[]
      */
     private function assignAttributes($products, $searchProducts)
     {
diff --git a/engine/Shopware/Bundle/SearchBundle/BatchProductSearchResult.php b/engine/Shopware/Bundle/SearchBundle/BatchProductSearchResult.php
index d75d6619dde..9ac188f2f91 100644
--- a/engine/Shopware/Bundle/SearchBundle/BatchProductSearchResult.php
+++ b/engine/Shopware/Bundle/SearchBundle/BatchProductSearchResult.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle;
@@ -59,7 +59,7 @@ public function get($key)
             return $this->storage[$key];
         }
 
-        throw new OutOfBoundsException(sprintf('Key "%s" was not found.', $key));
+        throw new OutOfBoundsException(\sprintf('Key "%s" was not found.', $key));
     }
 
     /**
diff --git a/engine/Shopware/Bundle/SearchBundle/Condition/CategoryCondition.php b/engine/Shopware/Bundle/SearchBundle/Condition/CategoryCondition.php
index 2f0a483c26e..05081851110 100644
--- a/engine/Shopware/Bundle/SearchBundle/Condition/CategoryCondition.php
+++ b/engine/Shopware/Bundle/SearchBundle/Condition/CategoryCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Condition;
@@ -36,22 +36,22 @@ class CategoryCondition implements ConditionInterface, JsonSerializable
     private const NAME = 'category';
 
     /**
-     * @var int[]
+     * @var array<int>
      */
     protected $categoryIds;
 
     /**
-     * @param int[] $categoryIds
+     * @param array<int|numeric-string> $categoryIds
      */
     public function __construct(array $categoryIds)
     {
         Assertion::allIntegerish($categoryIds);
-        $this->categoryIds = array_map('intval', $categoryIds);
+        $this->categoryIds = array_map('\intval', $categoryIds);
         sort($this->categoryIds, SORT_NUMERIC);
     }
 
     /**
-     * @return int[]
+     * @return array<int>
      */
     public function getCategoryIds()
     {
diff --git a/engine/Shopware/Bundle/SearchBundle/Condition/CloseoutCondition.php b/engine/Shopware/Bundle/SearchBundle/Condition/CloseoutCondition.php
index 0ba32adaea4..a3f624e90f5 100644
--- a/engine/Shopware/Bundle/SearchBundle/Condition/CloseoutCondition.php
+++ b/engine/Shopware/Bundle/SearchBundle/Condition/CloseoutCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/SearchBundle/Condition/CombinedCondition.php b/engine/Shopware/Bundle/SearchBundle/Condition/CombinedCondition.php
index 8e48784dbd3..fc861507072 100644
--- a/engine/Shopware/Bundle/SearchBundle/Condition/CombinedCondition.php
+++ b/engine/Shopware/Bundle/SearchBundle/Condition/CombinedCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/SearchBundle/Condition/CreateDateCondition.php b/engine/Shopware/Bundle/SearchBundle/Condition/CreateDateCondition.php
index d514ebf0653..1fa373f663d 100644
--- a/engine/Shopware/Bundle/SearchBundle/Condition/CreateDateCondition.php
+++ b/engine/Shopware/Bundle/SearchBundle/Condition/CreateDateCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/SearchBundle/Condition/CustomerGroupCondition.php b/engine/Shopware/Bundle/SearchBundle/Condition/CustomerGroupCondition.php
index 2ff1c925f03..098be1fe836 100644
--- a/engine/Shopware/Bundle/SearchBundle/Condition/CustomerGroupCondition.php
+++ b/engine/Shopware/Bundle/SearchBundle/Condition/CustomerGroupCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/SearchBundle/Condition/HasPseudoPriceCondition.php b/engine/Shopware/Bundle/SearchBundle/Condition/HasPseudoPriceCondition.php
index 3a686226b5a..9b51b24bc34 100644
--- a/engine/Shopware/Bundle/SearchBundle/Condition/HasPseudoPriceCondition.php
+++ b/engine/Shopware/Bundle/SearchBundle/Condition/HasPseudoPriceCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/SearchBundle/Condition/HeightCondition.php b/engine/Shopware/Bundle/SearchBundle/Condition/HeightCondition.php
index 048746234a3..f7d9b3eb4be 100644
--- a/engine/Shopware/Bundle/SearchBundle/Condition/HeightCondition.php
+++ b/engine/Shopware/Bundle/SearchBundle/Condition/HeightCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/SearchBundle/Condition/ImmediateDeliveryCondition.php b/engine/Shopware/Bundle/SearchBundle/Condition/ImmediateDeliveryCondition.php
index 522c0188ccd..d4c91f3d194 100644
--- a/engine/Shopware/Bundle/SearchBundle/Condition/ImmediateDeliveryCondition.php
+++ b/engine/Shopware/Bundle/SearchBundle/Condition/ImmediateDeliveryCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/SearchBundle/Condition/IsAvailableCondition.php b/engine/Shopware/Bundle/SearchBundle/Condition/IsAvailableCondition.php
index be27efc7176..30b0825433b 100644
--- a/engine/Shopware/Bundle/SearchBundle/Condition/IsAvailableCondition.php
+++ b/engine/Shopware/Bundle/SearchBundle/Condition/IsAvailableCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/SearchBundle/Condition/IsNewCondition.php b/engine/Shopware/Bundle/SearchBundle/Condition/IsNewCondition.php
index bfb493ecb15..9a7cfe1c517 100644
--- a/engine/Shopware/Bundle/SearchBundle/Condition/IsNewCondition.php
+++ b/engine/Shopware/Bundle/SearchBundle/Condition/IsNewCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/SearchBundle/Condition/LastProductIdCondition.php b/engine/Shopware/Bundle/SearchBundle/Condition/LastProductIdCondition.php
index 7270c790f3a..2504ca69dc1 100644
--- a/engine/Shopware/Bundle/SearchBundle/Condition/LastProductIdCondition.php
+++ b/engine/Shopware/Bundle/SearchBundle/Condition/LastProductIdCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/SearchBundle/Condition/LengthCondition.php b/engine/Shopware/Bundle/SearchBundle/Condition/LengthCondition.php
index 46bf6b4a73a..40fe4969e0c 100644
--- a/engine/Shopware/Bundle/SearchBundle/Condition/LengthCondition.php
+++ b/engine/Shopware/Bundle/SearchBundle/Condition/LengthCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/SearchBundle/Condition/MainVariantCondition.php b/engine/Shopware/Bundle/SearchBundle/Condition/MainVariantCondition.php
index 899a7cd06c6..ccb800eda93 100644
--- a/engine/Shopware/Bundle/SearchBundle/Condition/MainVariantCondition.php
+++ b/engine/Shopware/Bundle/SearchBundle/Condition/MainVariantCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/SearchBundle/Condition/ManufacturerCondition.php b/engine/Shopware/Bundle/SearchBundle/Condition/ManufacturerCondition.php
index 4ecac89e1cb..dd905f2d4bb 100644
--- a/engine/Shopware/Bundle/SearchBundle/Condition/ManufacturerCondition.php
+++ b/engine/Shopware/Bundle/SearchBundle/Condition/ManufacturerCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Condition;
@@ -36,17 +36,17 @@ class ManufacturerCondition implements ConditionInterface, JsonSerializable
     private const NAME = 'manufacturer';
 
     /**
-     * @var int[]
+     * @var array<int>
      */
     protected $manufacturerIds;
 
     /**
-     * @param int[] $manufacturerIds
+     * @param array<int|numeric-string> $manufacturerIds
      */
     public function __construct(array $manufacturerIds)
     {
         Assertion::allIntegerish($manufacturerIds);
-        $this->manufacturerIds = array_map('intval', $manufacturerIds);
+        $this->manufacturerIds = array_map('\intval', $manufacturerIds);
         sort($this->manufacturerIds, SORT_NUMERIC);
     }
 
@@ -59,7 +59,7 @@ public function getName()
     }
 
     /**
-     * @return int[]
+     * @return array<int>
      */
     public function getManufacturerIds()
     {
diff --git a/engine/Shopware/Bundle/SearchBundle/Condition/OrdernumberCondition.php b/engine/Shopware/Bundle/SearchBundle/Condition/OrdernumberCondition.php
index b8594ec09c3..00e56de0e78 100644
--- a/engine/Shopware/Bundle/SearchBundle/Condition/OrdernumberCondition.php
+++ b/engine/Shopware/Bundle/SearchBundle/Condition/OrdernumberCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/SearchBundle/Condition/PriceCondition.php b/engine/Shopware/Bundle/SearchBundle/Condition/PriceCondition.php
index cfeb0706285..eca4d2c690f 100644
--- a/engine/Shopware/Bundle/SearchBundle/Condition/PriceCondition.php
+++ b/engine/Shopware/Bundle/SearchBundle/Condition/PriceCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/SearchBundle/Condition/ProductAttributeCondition.php b/engine/Shopware/Bundle/SearchBundle/Condition/ProductAttributeCondition.php
index e795bfbe410..ee0f7f90b25 100644
--- a/engine/Shopware/Bundle/SearchBundle/Condition/ProductAttributeCondition.php
+++ b/engine/Shopware/Bundle/SearchBundle/Condition/ProductAttributeCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/SearchBundle/Condition/ProductIdCondition.php b/engine/Shopware/Bundle/SearchBundle/Condition/ProductIdCondition.php
index bec1789e33d..24367d8e218 100644
--- a/engine/Shopware/Bundle/SearchBundle/Condition/ProductIdCondition.php
+++ b/engine/Shopware/Bundle/SearchBundle/Condition/ProductIdCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/SearchBundle/Condition/PropertyCondition.php b/engine/Shopware/Bundle/SearchBundle/Condition/PropertyCondition.php
index 8072f86e7d6..696045f97bd 100644
--- a/engine/Shopware/Bundle/SearchBundle/Condition/PropertyCondition.php
+++ b/engine/Shopware/Bundle/SearchBundle/Condition/PropertyCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/SearchBundle/Condition/ReleaseDateCondition.php b/engine/Shopware/Bundle/SearchBundle/Condition/ReleaseDateCondition.php
index 1080619d7db..8a11e39ae45 100644
--- a/engine/Shopware/Bundle/SearchBundle/Condition/ReleaseDateCondition.php
+++ b/engine/Shopware/Bundle/SearchBundle/Condition/ReleaseDateCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/SearchBundle/Condition/SalesCondition.php b/engine/Shopware/Bundle/SearchBundle/Condition/SalesCondition.php
index e4a218cbe72..d18e5c4f003 100644
--- a/engine/Shopware/Bundle/SearchBundle/Condition/SalesCondition.php
+++ b/engine/Shopware/Bundle/SearchBundle/Condition/SalesCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/SearchBundle/Condition/SearchTermCondition.php b/engine/Shopware/Bundle/SearchBundle/Condition/SearchTermCondition.php
index 2c160817531..0220c642d19 100644
--- a/engine/Shopware/Bundle/SearchBundle/Condition/SearchTermCondition.php
+++ b/engine/Shopware/Bundle/SearchBundle/Condition/SearchTermCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/SearchBundle/Condition/ShippingFreeCondition.php b/engine/Shopware/Bundle/SearchBundle/Condition/ShippingFreeCondition.php
index ca773a74081..b06d1af5afe 100644
--- a/engine/Shopware/Bundle/SearchBundle/Condition/ShippingFreeCondition.php
+++ b/engine/Shopware/Bundle/SearchBundle/Condition/ShippingFreeCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/SearchBundle/Condition/SimilarProductCondition.php b/engine/Shopware/Bundle/SearchBundle/Condition/SimilarProductCondition.php
index 72c0e1310cb..435f6d9f6dd 100644
--- a/engine/Shopware/Bundle/SearchBundle/Condition/SimilarProductCondition.php
+++ b/engine/Shopware/Bundle/SearchBundle/Condition/SimilarProductCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/SearchBundle/Condition/SimpleCondition.php b/engine/Shopware/Bundle/SearchBundle/Condition/SimpleCondition.php
index 09ed89a5f80..39934bfef72 100644
--- a/engine/Shopware/Bundle/SearchBundle/Condition/SimpleCondition.php
+++ b/engine/Shopware/Bundle/SearchBundle/Condition/SimpleCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/SearchBundle/Condition/VariantCondition.php b/engine/Shopware/Bundle/SearchBundle/Condition/VariantCondition.php
index 7f43202fd35..9545c241bca 100644
--- a/engine/Shopware/Bundle/SearchBundle/Condition/VariantCondition.php
+++ b/engine/Shopware/Bundle/SearchBundle/Condition/VariantCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/SearchBundle/Condition/VoteAverageCondition.php b/engine/Shopware/Bundle/SearchBundle/Condition/VoteAverageCondition.php
index d10e7dc6095..065803fd5e6 100644
--- a/engine/Shopware/Bundle/SearchBundle/Condition/VoteAverageCondition.php
+++ b/engine/Shopware/Bundle/SearchBundle/Condition/VoteAverageCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/SearchBundle/Condition/WeightCondition.php b/engine/Shopware/Bundle/SearchBundle/Condition/WeightCondition.php
index cdc7703246b..b5d4fe15fc2 100644
--- a/engine/Shopware/Bundle/SearchBundle/Condition/WeightCondition.php
+++ b/engine/Shopware/Bundle/SearchBundle/Condition/WeightCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/SearchBundle/Condition/WidthCondition.php b/engine/Shopware/Bundle/SearchBundle/Condition/WidthCondition.php
index 59a0cc6bb98..df48a68acaf 100644
--- a/engine/Shopware/Bundle/SearchBundle/Condition/WidthCondition.php
+++ b/engine/Shopware/Bundle/SearchBundle/Condition/WidthCondition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Condition;
diff --git a/engine/Shopware/Bundle/SearchBundle/ConditionInterface.php b/engine/Shopware/Bundle/SearchBundle/ConditionInterface.php
index e3554e6402c..485405293df 100644
--- a/engine/Shopware/Bundle/SearchBundle/ConditionInterface.php
+++ b/engine/Shopware/Bundle/SearchBundle/ConditionInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle;
diff --git a/engine/Shopware/Bundle/SearchBundle/Criteria.php b/engine/Shopware/Bundle/SearchBundle/Criteria.php
index d885bf4d38b..81a04243439 100644
--- a/engine/Shopware/Bundle/SearchBundle/Criteria.php
+++ b/engine/Shopware/Bundle/SearchBundle/Criteria.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle;
diff --git a/engine/Shopware/Bundle/SearchBundle/CriteriaPartInterface.php b/engine/Shopware/Bundle/SearchBundle/CriteriaPartInterface.php
index 37cf9eff348..0cb2a32cb79 100644
--- a/engine/Shopware/Bundle/SearchBundle/CriteriaPartInterface.php
+++ b/engine/Shopware/Bundle/SearchBundle/CriteriaPartInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle;
diff --git a/engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/CoreCriteriaRequestHandler.php b/engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/CoreCriteriaRequestHandler.php
index 034b63a13c2..2acf1a1c6f1 100644
--- a/engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/CoreCriteriaRequestHandler.php
+++ b/engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/CoreCriteriaRequestHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\CriteriaRequestHandler;
@@ -46,15 +46,9 @@
 
 class CoreCriteriaRequestHandler implements CriteriaRequestHandlerInterface
 {
-    /**
-     * @var Shopware_Components_Config
-     */
-    private $config;
+    private Shopware_Components_Config $config;
 
-    /**
-     * @var SearchTermPreProcessorInterface
-     */
-    private $searchTermPreProcessor;
+    private SearchTermPreProcessorInterface $searchTermPreProcessor;
 
     public function __construct(
         Shopware_Components_Config $config,
@@ -86,43 +80,36 @@ public function handleRequest(Request $request, Criteria $criteria, ShopContextI
         $this->addLengthCondition($request, $criteria);
     }
 
-    private function addCategoryCondition(Request $request, Criteria $criteria)
+    private function addCategoryCondition(Request $request, Criteria $criteria): void
     {
         if ($request->has('sCategory')) {
-            /** @var int[] $ids */
-            $ids = explode('|', $request->getParam('sCategory'));
+            /** @var array<numeric-string> $ids */
+            $ids = explode('|', $request->getParam('sCategory')) ?: [];
 
-            $criteria->addBaseCondition(
-                new CategoryCondition($ids)
-            );
+            $criteria->addBaseCondition(new CategoryCondition($ids));
         } elseif ($request->has('categoryFilter')) {
-            /** @var int[] $ids */
-            $ids = explode('|', $request->getParam('categoryFilter'));
+            /** @var array<numeric-string> $ids */
+            $ids = explode('|', $request->getParam('categoryFilter')) ?: [];
 
-            $criteria->addCondition(
-                new CategoryCondition($ids)
-            );
+            $criteria->addCondition(new CategoryCondition($ids));
         }
     }
 
-    private function addManufacturerCondition(Request $request, Criteria $criteria)
+    private function addManufacturerCondition(Request $request, Criteria $criteria): void
     {
         if (!$request->has('sSupplier')) {
             return;
         }
 
-        /** @var int[] $manufacturerIds */
-        $manufacturerIds = explode(
-            '|',
-            $request->getParam('sSupplier')
-        );
+        /** @var array<numeric-string> $manufacturerIds */
+        $manufacturerIds = explode('|', $request->getParam('sSupplier')) ?: [];
 
         if (!empty($manufacturerIds)) {
             $criteria->addCondition(new ManufacturerCondition($manufacturerIds));
         }
     }
 
-    private function addShippingFreeCondition(Request $request, Criteria $criteria)
+    private function addShippingFreeCondition(Request $request, Criteria $criteria): void
     {
         $shippingFree = $request->getParam('shippingFree');
         if (!$shippingFree) {
@@ -132,7 +119,7 @@ private function addShippingFreeCondition(Request $request, Criteria $criteria)
         $criteria->addCondition(new ShippingFreeCondition());
     }
 
-    private function addImmediateDeliveryCondition(Request $request, Criteria $criteria)
+    private function addImmediateDeliveryCondition(Request $request, Criteria $criteria): void
     {
         $immediateDelivery = $request->getParam('immediateDelivery');
         if (!$immediateDelivery) {
@@ -142,7 +129,7 @@ private function addImmediateDeliveryCondition(Request $request, Criteria $crite
         $criteria->addCondition(new ImmediateDeliveryCondition());
     }
 
-    private function addRatingCondition(Request $request, Criteria $criteria)
+    private function addRatingCondition(Request $request, Criteria $criteria): void
     {
         $average = $request->getParam('rating');
         if (!$average) {
@@ -152,7 +139,7 @@ private function addRatingCondition(Request $request, Criteria $criteria)
         $criteria->addCondition(new VoteAverageCondition($average));
     }
 
-    private function addPriceCondition(Request $request, Criteria $criteria)
+    private function addPriceCondition(Request $request, Criteria $criteria): void
     {
         $min = $request->getParam('priceMin');
         $max = $request->getParam('priceMax');
@@ -165,17 +152,17 @@ private function addPriceCondition(Request $request, Criteria $criteria)
         $criteria->addCondition($condition);
     }
 
-    private function addSearchCondition(Request $request, Criteria $criteria)
+    private function addSearchCondition(Request $request, Criteria $criteria): void
     {
         $term = $request->getParam('sSearch');
-        if ($term == null) {
+        if (empty($term)) {
             return;
         }
         $term = $this->searchTermPreProcessor->process($term);
         $criteria->addBaseCondition(new SearchTermCondition($term));
     }
 
-    private function addCustomerGroupCondition(Criteria $criteria, ShopContextInterface $context)
+    private function addCustomerGroupCondition(Criteria $criteria, ShopContextInterface $context): void
     {
         $condition = new CustomerGroupCondition(
             [$context->getCurrentCustomerGroup()->getId()]
@@ -183,7 +170,7 @@ private function addCustomerGroupCondition(Criteria $criteria, ShopContextInterf
         $criteria->addBaseCondition($condition);
     }
 
-    private function addOffset(Request $request, Criteria $criteria)
+    private function addOffset(Request $request, Criteria $criteria): void
     {
         $page = (int) $request->getParam('sPage', 1);
         $page = ($page > 0) ? $page : 1;
@@ -194,18 +181,18 @@ private function addOffset(Request $request, Criteria $criteria)
         );
     }
 
-    private function addLimit(Request $request, Criteria $criteria)
+    private function addLimit(Request $request, Criteria $criteria): void
     {
         $limit = (int) $request->getParam('sPerPage', $this->config->get('articlesPerPage'));
         $max = $this->config->get('maxStoreFrontLimit');
         if ($max) {
             $limit = min($limit, $max);
         }
-        $limit = $limit >= 1 ? $limit : 1;
+        $limit = max($limit, 1);
         $criteria->limit($limit);
     }
 
-    private function addIsAvailableCondition(Criteria $criteria)
+    private function addIsAvailableCondition(Criteria $criteria): void
     {
         if (!$this->config->get('hideNoInStock')) {
             return;
@@ -213,7 +200,7 @@ private function addIsAvailableCondition(Criteria $criteria)
         $criteria->addBaseCondition(new IsAvailableCondition());
     }
 
-    private function addWeightCondition(Request $request, Criteria $criteria)
+    private function addWeightCondition(Request $request, Criteria $criteria): void
     {
         $min = $request->getParam('minWeight');
         $max = $request->getParam('maxWeight');
@@ -226,7 +213,7 @@ private function addWeightCondition(Request $request, Criteria $criteria)
         $criteria->addCondition($condition);
     }
 
-    private function addWidthCondition(Request $request, Criteria $criteria)
+    private function addWidthCondition(Request $request, Criteria $criteria): void
     {
         $min = $request->getParam('minWidth');
         $max = $request->getParam('maxWidth');
@@ -239,7 +226,7 @@ private function addWidthCondition(Request $request, Criteria $criteria)
         $criteria->addCondition($condition);
     }
 
-    private function addLengthCondition(Request $request, Criteria $criteria)
+    private function addLengthCondition(Request $request, Criteria $criteria): void
     {
         $min = $request->getParam('minLength');
         $max = $request->getParam('maxLength');
@@ -252,7 +239,7 @@ private function addLengthCondition(Request $request, Criteria $criteria)
         $criteria->addCondition($condition);
     }
 
-    private function addHeightCondition(Request $request, Criteria $criteria)
+    private function addHeightCondition(Request $request, Criteria $criteria): void
     {
         $min = $request->getParam('minHeight');
         $max = $request->getParam('maxHeight');
diff --git a/engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/FacetCriteriaRequestHandler.php b/engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/FacetCriteriaRequestHandler.php
index 19751b901f9..0034734152a 100644
--- a/engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/FacetCriteriaRequestHandler.php
+++ b/engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/FacetCriteriaRequestHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\CriteriaRequestHandler;
diff --git a/engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/PropertyCriteriaRequestHandler.php b/engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/PropertyCriteriaRequestHandler.php
index b33ece4919b..50e42441db9 100644
--- a/engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/PropertyCriteriaRequestHandler.php
+++ b/engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/PropertyCriteriaRequestHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\CriteriaRequestHandler;
diff --git a/engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/SortingCriteriaRequestHandler.php b/engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/SortingCriteriaRequestHandler.php
index 09d053fd71d..ccc70aa5ac2 100644
--- a/engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/SortingCriteriaRequestHandler.php
+++ b/engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/SortingCriteriaRequestHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\CriteriaRequestHandler;
diff --git a/engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/VariantCriteriaRequestHandler.php b/engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/VariantCriteriaRequestHandler.php
index 99eaf939273..3edb8674c7c 100644
--- a/engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/VariantCriteriaRequestHandler.php
+++ b/engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandler/VariantCriteriaRequestHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\CriteriaRequestHandler;
diff --git a/engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandlerInterface.php b/engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandlerInterface.php
index 976d9161afa..b8597bfe337 100644
--- a/engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandlerInterface.php
+++ b/engine/Shopware/Bundle/SearchBundle/CriteriaRequestHandlerInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle;
@@ -29,6 +29,9 @@
 
 interface CriteriaRequestHandlerInterface
 {
+    /**
+     * @return void
+     */
     public function handleRequest(
         Request $request,
         Criteria $criteria,
diff --git a/engine/Shopware/Bundle/SearchBundle/Facet/CategoryFacet.php b/engine/Shopware/Bundle/SearchBundle/Facet/CategoryFacet.php
index 8a41d6bff55..45b399c7c81 100644
--- a/engine/Shopware/Bundle/SearchBundle/Facet/CategoryFacet.php
+++ b/engine/Shopware/Bundle/SearchBundle/Facet/CategoryFacet.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Facet;
diff --git a/engine/Shopware/Bundle/SearchBundle/Facet/CombinedConditionFacet.php b/engine/Shopware/Bundle/SearchBundle/Facet/CombinedConditionFacet.php
index 6f4d9614c7d..53c41791866 100644
--- a/engine/Shopware/Bundle/SearchBundle/Facet/CombinedConditionFacet.php
+++ b/engine/Shopware/Bundle/SearchBundle/Facet/CombinedConditionFacet.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Facet;
diff --git a/engine/Shopware/Bundle/SearchBundle/Facet/HeightFacet.php b/engine/Shopware/Bundle/SearchBundle/Facet/HeightFacet.php
index 0a6d99d6a6f..79387af7707 100644
--- a/engine/Shopware/Bundle/SearchBundle/Facet/HeightFacet.php
+++ b/engine/Shopware/Bundle/SearchBundle/Facet/HeightFacet.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Facet;
diff --git a/engine/Shopware/Bundle/SearchBundle/Facet/ImmediateDeliveryFacet.php b/engine/Shopware/Bundle/SearchBundle/Facet/ImmediateDeliveryFacet.php
index cf145805c4a..0b08f468e8a 100644
--- a/engine/Shopware/Bundle/SearchBundle/Facet/ImmediateDeliveryFacet.php
+++ b/engine/Shopware/Bundle/SearchBundle/Facet/ImmediateDeliveryFacet.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Facet;
diff --git a/engine/Shopware/Bundle/SearchBundle/Facet/LengthFacet.php b/engine/Shopware/Bundle/SearchBundle/Facet/LengthFacet.php
index 8bfe97f780a..46036195526 100644
--- a/engine/Shopware/Bundle/SearchBundle/Facet/LengthFacet.php
+++ b/engine/Shopware/Bundle/SearchBundle/Facet/LengthFacet.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Facet;
diff --git a/engine/Shopware/Bundle/SearchBundle/Facet/ManufacturerFacet.php b/engine/Shopware/Bundle/SearchBundle/Facet/ManufacturerFacet.php
index b486679b489..06831ab1bea 100644
--- a/engine/Shopware/Bundle/SearchBundle/Facet/ManufacturerFacet.php
+++ b/engine/Shopware/Bundle/SearchBundle/Facet/ManufacturerFacet.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Facet;
diff --git a/engine/Shopware/Bundle/SearchBundle/Facet/PriceFacet.php b/engine/Shopware/Bundle/SearchBundle/Facet/PriceFacet.php
index 33695627c4a..2aa0f0e27d0 100644
--- a/engine/Shopware/Bundle/SearchBundle/Facet/PriceFacet.php
+++ b/engine/Shopware/Bundle/SearchBundle/Facet/PriceFacet.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Facet;
diff --git a/engine/Shopware/Bundle/SearchBundle/Facet/ProductAttributeFacet.php b/engine/Shopware/Bundle/SearchBundle/Facet/ProductAttributeFacet.php
index 8387cbe5946..55a61966a93 100644
--- a/engine/Shopware/Bundle/SearchBundle/Facet/ProductAttributeFacet.php
+++ b/engine/Shopware/Bundle/SearchBundle/Facet/ProductAttributeFacet.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Facet;
diff --git a/engine/Shopware/Bundle/SearchBundle/Facet/PropertyFacet.php b/engine/Shopware/Bundle/SearchBundle/Facet/PropertyFacet.php
index e43590c7174..cac2f46d853 100644
--- a/engine/Shopware/Bundle/SearchBundle/Facet/PropertyFacet.php
+++ b/engine/Shopware/Bundle/SearchBundle/Facet/PropertyFacet.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Facet;
diff --git a/engine/Shopware/Bundle/SearchBundle/Facet/ShippingFreeFacet.php b/engine/Shopware/Bundle/SearchBundle/Facet/ShippingFreeFacet.php
index 7ff7af5b878..a2c07692d37 100644
--- a/engine/Shopware/Bundle/SearchBundle/Facet/ShippingFreeFacet.php
+++ b/engine/Shopware/Bundle/SearchBundle/Facet/ShippingFreeFacet.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Facet;
diff --git a/engine/Shopware/Bundle/SearchBundle/Facet/SimpleFacet.php b/engine/Shopware/Bundle/SearchBundle/Facet/SimpleFacet.php
index 642e72a547a..8b964930a8d 100644
--- a/engine/Shopware/Bundle/SearchBundle/Facet/SimpleFacet.php
+++ b/engine/Shopware/Bundle/SearchBundle/Facet/SimpleFacet.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Facet;
diff --git a/engine/Shopware/Bundle/SearchBundle/Facet/VariantFacet.php b/engine/Shopware/Bundle/SearchBundle/Facet/VariantFacet.php
index 1a9ac8afea9..7cc782d501c 100644
--- a/engine/Shopware/Bundle/SearchBundle/Facet/VariantFacet.php
+++ b/engine/Shopware/Bundle/SearchBundle/Facet/VariantFacet.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Facet;
diff --git a/engine/Shopware/Bundle/SearchBundle/Facet/VoteAverageFacet.php b/engine/Shopware/Bundle/SearchBundle/Facet/VoteAverageFacet.php
index cbe7819b9cb..a60c2ed8e10 100644
--- a/engine/Shopware/Bundle/SearchBundle/Facet/VoteAverageFacet.php
+++ b/engine/Shopware/Bundle/SearchBundle/Facet/VoteAverageFacet.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Facet;
diff --git a/engine/Shopware/Bundle/SearchBundle/Facet/WeightFacet.php b/engine/Shopware/Bundle/SearchBundle/Facet/WeightFacet.php
index 028fbf6e000..702d237e298 100644
--- a/engine/Shopware/Bundle/SearchBundle/Facet/WeightFacet.php
+++ b/engine/Shopware/Bundle/SearchBundle/Facet/WeightFacet.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Facet;
diff --git a/engine/Shopware/Bundle/SearchBundle/Facet/WidthFacet.php b/engine/Shopware/Bundle/SearchBundle/Facet/WidthFacet.php
index 1dc129834be..9af4a0bc516 100644
--- a/engine/Shopware/Bundle/SearchBundle/Facet/WidthFacet.php
+++ b/engine/Shopware/Bundle/SearchBundle/Facet/WidthFacet.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Facet;
diff --git a/engine/Shopware/Bundle/SearchBundle/FacetInterface.php b/engine/Shopware/Bundle/SearchBundle/FacetInterface.php
index 38705b1906c..62f45471337 100644
--- a/engine/Shopware/Bundle/SearchBundle/FacetInterface.php
+++ b/engine/Shopware/Bundle/SearchBundle/FacetInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle;
diff --git a/engine/Shopware/Bundle/SearchBundle/FacetResult/BooleanFacetResult.php b/engine/Shopware/Bundle/SearchBundle/FacetResult/BooleanFacetResult.php
index 032cc4be44f..9bc8ab75def 100644
--- a/engine/Shopware/Bundle/SearchBundle/FacetResult/BooleanFacetResult.php
+++ b/engine/Shopware/Bundle/SearchBundle/FacetResult/BooleanFacetResult.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\FacetResult;
diff --git a/engine/Shopware/Bundle/SearchBundle/FacetResult/CategoryTreeFacetResultBuilder.php b/engine/Shopware/Bundle/SearchBundle/FacetResult/CategoryTreeFacetResultBuilder.php
index c45137b8328..8cb9546faf5 100644
--- a/engine/Shopware/Bundle/SearchBundle/FacetResult/CategoryTreeFacetResultBuilder.php
+++ b/engine/Shopware/Bundle/SearchBundle/FacetResult/CategoryTreeFacetResultBuilder.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\FacetResult;
@@ -91,29 +91,23 @@ public function buildFacetResult(array $categories, array $activeIds, $systemCat
     }
 
     /**
-     * @param Category[] $categories
-     * @param int|null   $parentId
+     * @param array<Category> $categories
      *
-     * @return array
+     * @return array<Category>
      */
-    private function getCategoriesOfParent(array $categories, $parentId)
+    private function getCategoriesOfParent(array $categories, int $parentId): array
     {
         $result = [];
 
         foreach ($categories as $category) {
-            if (!$category->getPath() && $parentId !== null) {
-                continue;
-            }
-
-            if ($category->getPath() == $parentId) {
-                $result[] = $category;
+            if (!$category->getPath()) {
                 continue;
             }
 
             $parents = $category->getPath();
-            $lastParent = $parents[\count($parents) - 1];
+            $lastParent = $parents[array_key_last($parents)];
 
-            if ($lastParent == $parentId) {
+            if ($lastParent === $parentId) {
                 $result[] = $category;
             }
         }
@@ -125,7 +119,7 @@ private function getCategoriesOfParent(array $categories, $parentId)
      * @param Category[] $categories
      * @param int[]      $actives
      *
-     * @return \Shopware\Bundle\SearchBundle\FacetResult\TreeItem
+     * @return TreeItem
      */
     private function createTreeItem(array $categories, Category $category, array $actives = [])
     {
diff --git a/engine/Shopware/Bundle/SearchBundle/FacetResult/FacetResultGroup.php b/engine/Shopware/Bundle/SearchBundle/FacetResult/FacetResultGroup.php
index 2b7a11c4d05..f08dac3e774 100644
--- a/engine/Shopware/Bundle/SearchBundle/FacetResult/FacetResultGroup.php
+++ b/engine/Shopware/Bundle/SearchBundle/FacetResult/FacetResultGroup.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\FacetResult;
@@ -115,7 +115,7 @@ public function getTemplate()
     }
 
     /**
-     * @param \Shopware\Bundle\SearchBundle\FacetResultInterface[] $facetResults
+     * @param FacetResultInterface[] $facetResults
      */
     public function setFacetResults(array $facetResults)
     {
diff --git a/engine/Shopware/Bundle/SearchBundle/FacetResult/MediaListFacetResult.php b/engine/Shopware/Bundle/SearchBundle/FacetResult/MediaListFacetResult.php
index a668eb2ca9c..3377fdfc749 100644
--- a/engine/Shopware/Bundle/SearchBundle/FacetResult/MediaListFacetResult.php
+++ b/engine/Shopware/Bundle/SearchBundle/FacetResult/MediaListFacetResult.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\FacetResult;
diff --git a/engine/Shopware/Bundle/SearchBundle/FacetResult/MediaListItem.php b/engine/Shopware/Bundle/SearchBundle/FacetResult/MediaListItem.php
index e4ae2af9dd9..1985775939b 100644
--- a/engine/Shopware/Bundle/SearchBundle/FacetResult/MediaListItem.php
+++ b/engine/Shopware/Bundle/SearchBundle/FacetResult/MediaListItem.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\FacetResult;
@@ -38,10 +38,9 @@ class MediaListItem extends ValueListItem
      * @param int|string  $id
      * @param string      $label
      * @param bool        $active
-     * @param Media       $media
      * @param Attribute[] $attributes
      */
-    public function __construct($id, $label, $active, Media $media = null, $attributes = [])
+    public function __construct($id, $label, $active, ?Media $media = null, $attributes = [])
     {
         parent::__construct($id, $label, $active, $attributes);
         $this->media = $media;
diff --git a/engine/Shopware/Bundle/SearchBundle/FacetResult/RadioFacetResult.php b/engine/Shopware/Bundle/SearchBundle/FacetResult/RadioFacetResult.php
index fadef6caa18..eaa9501d185 100644
--- a/engine/Shopware/Bundle/SearchBundle/FacetResult/RadioFacetResult.php
+++ b/engine/Shopware/Bundle/SearchBundle/FacetResult/RadioFacetResult.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\FacetResult;
diff --git a/engine/Shopware/Bundle/SearchBundle/FacetResult/RangeFacetResult.php b/engine/Shopware/Bundle/SearchBundle/FacetResult/RangeFacetResult.php
index 79193106fc1..fcda346851b 100644
--- a/engine/Shopware/Bundle/SearchBundle/FacetResult/RangeFacetResult.php
+++ b/engine/Shopware/Bundle/SearchBundle/FacetResult/RangeFacetResult.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\FacetResult;
diff --git a/engine/Shopware/Bundle/SearchBundle/FacetResult/TreeFacetResult.php b/engine/Shopware/Bundle/SearchBundle/FacetResult/TreeFacetResult.php
index 6d1c3f6342c..20138f5b907 100644
--- a/engine/Shopware/Bundle/SearchBundle/FacetResult/TreeFacetResult.php
+++ b/engine/Shopware/Bundle/SearchBundle/FacetResult/TreeFacetResult.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\FacetResult;
diff --git a/engine/Shopware/Bundle/SearchBundle/FacetResult/TreeItem.php b/engine/Shopware/Bundle/SearchBundle/FacetResult/TreeItem.php
index 6371266d5d7..6189a2701dc 100644
--- a/engine/Shopware/Bundle/SearchBundle/FacetResult/TreeItem.php
+++ b/engine/Shopware/Bundle/SearchBundle/FacetResult/TreeItem.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\FacetResult;
diff --git a/engine/Shopware/Bundle/SearchBundle/FacetResult/ValueListFacetResult.php b/engine/Shopware/Bundle/SearchBundle/FacetResult/ValueListFacetResult.php
index 5230534f2e5..c7cc95de744 100644
--- a/engine/Shopware/Bundle/SearchBundle/FacetResult/ValueListFacetResult.php
+++ b/engine/Shopware/Bundle/SearchBundle/FacetResult/ValueListFacetResult.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\FacetResult;
diff --git a/engine/Shopware/Bundle/SearchBundle/FacetResult/ValueListItem.php b/engine/Shopware/Bundle/SearchBundle/FacetResult/ValueListItem.php
index c9b12719b2b..bf0371cff75 100644
--- a/engine/Shopware/Bundle/SearchBundle/FacetResult/ValueListItem.php
+++ b/engine/Shopware/Bundle/SearchBundle/FacetResult/ValueListItem.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\FacetResult;
diff --git a/engine/Shopware/Bundle/SearchBundle/FacetResultInterface.php b/engine/Shopware/Bundle/SearchBundle/FacetResultInterface.php
index 038270e4b97..a51b7580540 100644
--- a/engine/Shopware/Bundle/SearchBundle/FacetResultInterface.php
+++ b/engine/Shopware/Bundle/SearchBundle/FacetResultInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle;
diff --git a/engine/Shopware/Bundle/SearchBundle/ProductNumberSearchInterface.php b/engine/Shopware/Bundle/SearchBundle/ProductNumberSearchInterface.php
index f3b836c164c..cdf236e65e8 100644
--- a/engine/Shopware/Bundle/SearchBundle/ProductNumberSearchInterface.php
+++ b/engine/Shopware/Bundle/SearchBundle/ProductNumberSearchInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle;
diff --git a/engine/Shopware/Bundle/SearchBundle/ProductNumberSearchResult.php b/engine/Shopware/Bundle/SearchBundle/ProductNumberSearchResult.php
index 1660311ed7e..6f693cee064 100644
--- a/engine/Shopware/Bundle/SearchBundle/ProductNumberSearchResult.php
+++ b/engine/Shopware/Bundle/SearchBundle/ProductNumberSearchResult.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle;
diff --git a/engine/Shopware/Bundle/SearchBundle/ProductSearch.php b/engine/Shopware/Bundle/SearchBundle/ProductSearch.php
index 8569b1b3195..0655a1e445b 100644
--- a/engine/Shopware/Bundle/SearchBundle/ProductSearch.php
+++ b/engine/Shopware/Bundle/SearchBundle/ProductSearch.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle;
diff --git a/engine/Shopware/Bundle/SearchBundle/ProductSearchInterface.php b/engine/Shopware/Bundle/SearchBundle/ProductSearchInterface.php
index 8aaaac41bb0..8e239a25faa 100644
--- a/engine/Shopware/Bundle/SearchBundle/ProductSearchInterface.php
+++ b/engine/Shopware/Bundle/SearchBundle/ProductSearchInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle;
diff --git a/engine/Shopware/Bundle/SearchBundle/ProductSearchResult.php b/engine/Shopware/Bundle/SearchBundle/ProductSearchResult.php
index dd4a46ac405..9dac3ef6447 100644
--- a/engine/Shopware/Bundle/SearchBundle/ProductSearchResult.php
+++ b/engine/Shopware/Bundle/SearchBundle/ProductSearchResult.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle;
diff --git a/engine/Shopware/Bundle/SearchBundle/SearchBundle.php b/engine/Shopware/Bundle/SearchBundle/SearchBundle.php
index 65cfb2784be..9677811e85b 100644
--- a/engine/Shopware/Bundle/SearchBundle/SearchBundle.php
+++ b/engine/Shopware/Bundle/SearchBundle/SearchBundle.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle;
diff --git a/engine/Shopware/Bundle/SearchBundle/SearchTermPreProcessor.php b/engine/Shopware/Bundle/SearchBundle/SearchTermPreProcessor.php
index f3b92a7b482..c628c4dcc32 100644
--- a/engine/Shopware/Bundle/SearchBundle/SearchTermPreProcessor.php
+++ b/engine/Shopware/Bundle/SearchBundle/SearchTermPreProcessor.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle;
@@ -33,16 +33,16 @@ class SearchTermPreProcessor implements SearchTermPreProcessorInterface
      */
     public function process($term)
     {
-        //This fix prevents an exception if the search term includes an character that can not be
-        //displayed with the database charset.
-        //This fix can be removed if all tables are set to utf8mb4_unicode_ci.
+        // This fix prevents an exception if the search term includes an character that can not be
+        // displayed with the database charset.
+        // This fix can be removed if all tables are set to utf8mb4_unicode_ci.
 
-        //converts encoded characters back ('%a5%27' to '?')
+        // converts encoded characters back ('%a5%27' to '?')
         $term = mb_convert_encoding($term, 'UTF-8');
-        //does the replacing of 4byte chars to the Unicode replacement character
+        // does the replacing of 4byte chars to the Unicode replacement character
         $term = (string) preg_replace('/[\xF0-\xF7].../s', '�', $term);
 
-        //we have to strip the / otherwise broken urls would be created e.g. wrong pager urls
+        // we have to strip the / otherwise broken urls would be created e.g. wrong pager urls
         $term = trim(strip_tags(htmlspecialchars_decode(stripslashes($term))));
 
         return str_replace('/', ' ', $term);
diff --git a/engine/Shopware/Bundle/SearchBundle/SearchTermPreProcessorInterface.php b/engine/Shopware/Bundle/SearchBundle/SearchTermPreProcessorInterface.php
index 0357a5daa7f..1b1be8bf9c4 100644
--- a/engine/Shopware/Bundle/SearchBundle/SearchTermPreProcessorInterface.php
+++ b/engine/Shopware/Bundle/SearchBundle/SearchTermPreProcessorInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle;
diff --git a/engine/Shopware/Bundle/SearchBundle/Sorting/ManualSorting.php b/engine/Shopware/Bundle/SearchBundle/Sorting/ManualSorting.php
index f4d7835610a..2d95044305a 100644
--- a/engine/Shopware/Bundle/SearchBundle/Sorting/ManualSorting.php
+++ b/engine/Shopware/Bundle/SearchBundle/Sorting/ManualSorting.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Sorting;
diff --git a/engine/Shopware/Bundle/SearchBundle/Sorting/PopularitySorting.php b/engine/Shopware/Bundle/SearchBundle/Sorting/PopularitySorting.php
index 2b43834203f..f6ab2dd6a82 100644
--- a/engine/Shopware/Bundle/SearchBundle/Sorting/PopularitySorting.php
+++ b/engine/Shopware/Bundle/SearchBundle/Sorting/PopularitySorting.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Sorting;
diff --git a/engine/Shopware/Bundle/SearchBundle/Sorting/PriceSorting.php b/engine/Shopware/Bundle/SearchBundle/Sorting/PriceSorting.php
index f28d765db4f..5ff11d56d0e 100644
--- a/engine/Shopware/Bundle/SearchBundle/Sorting/PriceSorting.php
+++ b/engine/Shopware/Bundle/SearchBundle/Sorting/PriceSorting.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Sorting;
diff --git a/engine/Shopware/Bundle/SearchBundle/Sorting/ProductAttributeSorting.php b/engine/Shopware/Bundle/SearchBundle/Sorting/ProductAttributeSorting.php
index 5afc8642a1a..55f6d3ce48c 100644
--- a/engine/Shopware/Bundle/SearchBundle/Sorting/ProductAttributeSorting.php
+++ b/engine/Shopware/Bundle/SearchBundle/Sorting/ProductAttributeSorting.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Sorting;
diff --git a/engine/Shopware/Bundle/SearchBundle/Sorting/ProductNameSorting.php b/engine/Shopware/Bundle/SearchBundle/Sorting/ProductNameSorting.php
index 8ed1fa95c26..a047a718721 100644
--- a/engine/Shopware/Bundle/SearchBundle/Sorting/ProductNameSorting.php
+++ b/engine/Shopware/Bundle/SearchBundle/Sorting/ProductNameSorting.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Sorting;
diff --git a/engine/Shopware/Bundle/SearchBundle/Sorting/ProductNumberSorting.php b/engine/Shopware/Bundle/SearchBundle/Sorting/ProductNumberSorting.php
index d0d0e6cd70b..03d5e4a7f62 100644
--- a/engine/Shopware/Bundle/SearchBundle/Sorting/ProductNumberSorting.php
+++ b/engine/Shopware/Bundle/SearchBundle/Sorting/ProductNumberSorting.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Sorting;
diff --git a/engine/Shopware/Bundle/SearchBundle/Sorting/ProductStockSorting.php b/engine/Shopware/Bundle/SearchBundle/Sorting/ProductStockSorting.php
index fa59cd3812b..e98b941aca4 100644
--- a/engine/Shopware/Bundle/SearchBundle/Sorting/ProductStockSorting.php
+++ b/engine/Shopware/Bundle/SearchBundle/Sorting/ProductStockSorting.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Sorting;
diff --git a/engine/Shopware/Bundle/SearchBundle/Sorting/RandomSorting.php b/engine/Shopware/Bundle/SearchBundle/Sorting/RandomSorting.php
index 89cee6c1cae..6ba4b5255bc 100644
--- a/engine/Shopware/Bundle/SearchBundle/Sorting/RandomSorting.php
+++ b/engine/Shopware/Bundle/SearchBundle/Sorting/RandomSorting.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Sorting;
diff --git a/engine/Shopware/Bundle/SearchBundle/Sorting/ReleaseDateSorting.php b/engine/Shopware/Bundle/SearchBundle/Sorting/ReleaseDateSorting.php
index 7f61a3f68ce..205cf4d5ffb 100644
--- a/engine/Shopware/Bundle/SearchBundle/Sorting/ReleaseDateSorting.php
+++ b/engine/Shopware/Bundle/SearchBundle/Sorting/ReleaseDateSorting.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Sorting;
diff --git a/engine/Shopware/Bundle/SearchBundle/Sorting/SearchRankingSorting.php b/engine/Shopware/Bundle/SearchBundle/Sorting/SearchRankingSorting.php
index 7c44c00540e..b0bb6e2c3a6 100644
--- a/engine/Shopware/Bundle/SearchBundle/Sorting/SearchRankingSorting.php
+++ b/engine/Shopware/Bundle/SearchBundle/Sorting/SearchRankingSorting.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Sorting;
diff --git a/engine/Shopware/Bundle/SearchBundle/Sorting/SimpleSorting.php b/engine/Shopware/Bundle/SearchBundle/Sorting/SimpleSorting.php
index fd0dc26bfce..c973426fd92 100644
--- a/engine/Shopware/Bundle/SearchBundle/Sorting/SimpleSorting.php
+++ b/engine/Shopware/Bundle/SearchBundle/Sorting/SimpleSorting.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Sorting;
diff --git a/engine/Shopware/Bundle/SearchBundle/Sorting/Sorting.php b/engine/Shopware/Bundle/SearchBundle/Sorting/Sorting.php
index 2daca207ad5..ba0afb6a4b9 100644
--- a/engine/Shopware/Bundle/SearchBundle/Sorting/Sorting.php
+++ b/engine/Shopware/Bundle/SearchBundle/Sorting/Sorting.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle\Sorting;
diff --git a/engine/Shopware/Bundle/SearchBundle/SortingInterface.php b/engine/Shopware/Bundle/SearchBundle/SortingInterface.php
index 9ab2357455f..fa7a273e671 100644
--- a/engine/Shopware/Bundle/SearchBundle/SortingInterface.php
+++ b/engine/Shopware/Bundle/SearchBundle/SortingInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle;
diff --git a/engine/Shopware/Bundle/SearchBundle/StoreFrontCriteriaFactory.php b/engine/Shopware/Bundle/SearchBundle/StoreFrontCriteriaFactory.php
index a2748f6790d..bcc0fc94f27 100644
--- a/engine/Shopware/Bundle/SearchBundle/StoreFrontCriteriaFactory.php
+++ b/engine/Shopware/Bundle/SearchBundle/StoreFrontCriteriaFactory.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle;
@@ -190,7 +190,7 @@ public function createAjaxCountCriteria(Request $request, ShopContextInterface $
     /**
      * @param int $categoryId
      *
-     * @return \Shopware\Bundle\SearchBundle\Criteria
+     * @return Criteria
      */
     public function createProductNavigationCriteria(
         Request $request,
diff --git a/engine/Shopware/Bundle/SearchBundle/StoreFrontCriteriaFactoryInterface.php b/engine/Shopware/Bundle/SearchBundle/StoreFrontCriteriaFactoryInterface.php
index f4bef7401c6..6ca878bbc3e 100644
--- a/engine/Shopware/Bundle/SearchBundle/StoreFrontCriteriaFactoryInterface.php
+++ b/engine/Shopware/Bundle/SearchBundle/StoreFrontCriteriaFactoryInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle;
@@ -64,7 +64,7 @@ public function createAjaxCountCriteria(Request $request, ShopContextInterface $
     /**
      * @param int $categoryId
      *
-     * @return \Shopware\Bundle\SearchBundle\Criteria
+     * @return Criteria
      */
     public function createProductNavigationCriteria(Request $request, ShopContextInterface $context, $categoryId);
 }
diff --git a/engine/Shopware/Bundle/SearchBundle/TemplateSwitchable.php b/engine/Shopware/Bundle/SearchBundle/TemplateSwitchable.php
index c604c2dfb24..b4de7cf0601 100644
--- a/engine/Shopware/Bundle/SearchBundle/TemplateSwitchable.php
+++ b/engine/Shopware/Bundle/SearchBundle/TemplateSwitchable.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle;
diff --git a/engine/Shopware/Bundle/SearchBundle/VariantSearch.php b/engine/Shopware/Bundle/SearchBundle/VariantSearch.php
index fcf8ab86992..d4d5aa76386 100644
--- a/engine/Shopware/Bundle/SearchBundle/VariantSearch.php
+++ b/engine/Shopware/Bundle/SearchBundle/VariantSearch.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundle;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/CategoryConditionHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/CategoryConditionHandler.php
index cadde1df750..5b4129f1a9d 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/CategoryConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/CategoryConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/CloseoutConditionHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/CloseoutConditionHandler.php
index 74c0bff70ed..67f0e5e05a8 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/CloseoutConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/CloseoutConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/CombinedConditionHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/CombinedConditionHandler.php
index 65fd431e3da..914fbf1161f 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/CombinedConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/CombinedConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\ConditionHandler;
@@ -90,6 +90,6 @@ private function getConditionHandler(ConditionInterface $condition): ConditionHa
             }
         }
 
-        throw new RuntimeException(sprintf('Condition %s not supported', \get_class($condition)));
+        throw new RuntimeException(\sprintf('Condition %s not supported', \get_class($condition)));
     }
 }
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/CreateDateConditionHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/CreateDateConditionHandler.php
index 60aefd93865..c42397c02bc 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/CreateDateConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/CreateDateConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/CustomerGroupConditionHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/CustomerGroupConditionHandler.php
index 17947181e97..408aede0c79 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/CustomerGroupConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/CustomerGroupConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/DynamicConditionParserTrait.php b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/DynamicConditionParserTrait.php
index 3e5f1992d84..d36d90e6750 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/DynamicConditionParserTrait.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/DynamicConditionParserTrait.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\ConditionHandler;
@@ -68,7 +68,7 @@ public function parse(QueryBuilder $query, $table, $tableAlias, $field = null, $
             ->listTableColumns($table);
 
         if (empty($columns)) {
-            throw new RuntimeException(sprintf('Could not retrieve columns from "%s".', $table));
+            throw new RuntimeException(\sprintf('Could not retrieve columns from "%s".', $table));
         }
 
         $names = array_map(function (Column $column) {
@@ -76,7 +76,7 @@ public function parse(QueryBuilder $query, $table, $tableAlias, $field = null, $
         }, $columns);
 
         if (!\array_key_exists(strtolower($field), $names)) {
-            throw new InvalidArgumentException(sprintf('Invalid column name "%s" specified.', $field), 1);
+            throw new InvalidArgumentException(\sprintf('Invalid column name "%s" specified.', $field), 1);
         }
 
         $validOperators = [
@@ -103,12 +103,12 @@ public function parse(QueryBuilder $query, $table, $tableAlias, $field = null, $
          * When an operator is not specified, by default, return all results that are not null
          */
         if (empty($operator)) {
-            throw new InvalidArgumentException(sprintf('Must specify an operator, please use one of: %s', implode(', ', $validOperators)), 3);
+            throw new InvalidArgumentException(\sprintf('Must specify an operator, please use one of: %s', implode(', ', $validOperators)), 3);
         }
 
-        //Identify each field placeholder value with table alias and a hash of condition properties
-        $boundParamName = sprintf(':%s_%s', $tableAlias, md5($field . $operator . json_encode($value)));
-        $field = sprintf('%s.%s', $tableAlias, $field);
+        // Identify each field placeholder value with table alias and a hash of condition properties
+        $boundParamName = \sprintf(':%s_%s', $tableAlias, md5($field . $operator . json_encode($value)));
+        $field = \sprintf('%s.%s', $tableAlias, $field);
 
         switch (true) {
             case $operator === Condition::OPERATOR_EQ:
@@ -187,23 +187,23 @@ public function parse(QueryBuilder $query, $table, $tableAlias, $field = null, $
                 }
                 break;
 
-            case $operator === Condition::OPERATOR_STARTS_WITH && is_scalar($value):
+            case $operator === Condition::OPERATOR_STARTS_WITH && \is_scalar($value):
                 $query->andWhere($query->expr()->like($field, $boundParamName));
                 $query->setParameter($boundParamName, $value . '%');
                 break;
 
-            case $operator === Condition::OPERATOR_ENDS_WITH && is_scalar($value):
+            case $operator === Condition::OPERATOR_ENDS_WITH && \is_scalar($value):
                 $query->andWhere($query->expr()->like($field, $boundParamName));
                 $query->setParameter($boundParamName, '%' . $value);
                 break;
 
-            case $operator === Condition::OPERATOR_CONTAINS && is_scalar($value):
+            case $operator === Condition::OPERATOR_CONTAINS && \is_scalar($value):
                 $query->andWhere($query->expr()->like($field, $boundParamName));
                 $query->setParameter($boundParamName, '%' . $value . '%');
                 break;
 
             default:
-                throw new InvalidArgumentException(sprintf('Invalid operator specified, please use one of: %s', implode(', ', $validOperators)), 3);
+                throw new InvalidArgumentException(\sprintf('Invalid operator specified, please use one of: %s', implode(', ', $validOperators)), 3);
         }
     }
 }
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/HasPseudoPriceConditionHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/HasPseudoPriceConditionHandler.php
index 2fe33bd677e..57c05480c03 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/HasPseudoPriceConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/HasPseudoPriceConditionHandler.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\ConditionHandler;
@@ -30,6 +31,7 @@
 use Shopware\Bundle\SearchBundle\Criteria;
 use Shopware\Bundle\SearchBundleDBAL\ConditionHandlerInterface;
 use Shopware\Bundle\SearchBundleDBAL\CriteriaAwareInterface;
+use Shopware\Bundle\SearchBundleDBAL\ListingPriceHelper;
 use Shopware\Bundle\SearchBundleDBAL\ListingPriceSwitcher;
 use Shopware\Bundle\SearchBundleDBAL\QueryBuilder;
 use Shopware\Bundle\SearchBundleDBAL\VariantHelperInterface;
@@ -45,10 +47,16 @@ class HasPseudoPriceConditionHandler implements ConditionHandlerInterface, Crite
 
     private VariantHelperInterface $variantHelper;
 
-    public function __construct(ListingPriceSwitcher $listingPriceSwitcher, VariantHelperInterface $variantHelper)
-    {
+    private ListingPriceHelper $listingPriceHelper;
+
+    public function __construct(
+        ListingPriceSwitcher $listingPriceSwitcher,
+        VariantHelperInterface $variantHelper,
+        ListingPriceHelper $listingPriceHelper
+    ) {
         $this->listingPriceSwitcher = $listingPriceSwitcher;
         $this->variantHelper = $variantHelper;
+        $this->listingPriceHelper = $listingPriceHelper;
     }
 
     /**
@@ -75,12 +83,12 @@ public function generateCondition(
         if (!$query->hasState(self::STATE_INCLUDES_PSEUDO_PRICE_VARIANTS)) {
             if (empty($conditions)) {
                 $this->variantHelper->joinVariants($query);
-                $query->leftJoin('allVariants', 's_articles_prices', 'variantPrices', 'variantPrices.articledetailsID = allVariants.id');
-                $query->andWhere('variantPrices.pseudoprice > 0');
+                $this->joinPrices($query, $context);
             } else {
                 $this->listingPriceSwitcher->joinPrice($query, $this->criteria, $context);
                 $query->andWhere('listing_price.pseudoprice > 0');
             }
+
             $query->addState(self::STATE_INCLUDES_PSEUDO_PRICE_VARIANTS);
         }
     }
@@ -89,4 +97,34 @@ public function setCriteria(Criteria $criteria)
     {
         $this->criteria = $criteria;
     }
+
+    private function joinPrices(QueryBuilder $query, ShopContextInterface $context): void
+    {
+        $hasDifferentCustomerGroups = $this->hasDifferentCustomerGroups($context);
+
+        $priceTable = $this->listingPriceHelper->getPriceTable($context);
+
+        if ($hasDifferentCustomerGroups) {
+            $priceTable->andWhere('IFNULL(customerPrice.`pseudoprice`, defaultPrice.`pseudoprice`) > 0');
+        } else {
+            $priceTable->andWhere('defaultPrice.pseudoprice > 0');
+        }
+
+        $query->innerJoin(
+            'allVariants',
+            '(' . $priceTable->getSQL() . ')',
+            'variantPrices',
+            'variantPrices.articledetailsID = allVariants.id'
+        );
+
+        $query->setParameter(':fallbackCustomerGroup', $context->getFallbackCustomerGroup()->getKey());
+        if ($hasDifferentCustomerGroups) {
+            $query->setParameter(':currentCustomerGroup', $context->getCurrentCustomerGroup()->getKey());
+        }
+    }
+
+    private function hasDifferentCustomerGroups(ShopContextInterface $context): bool
+    {
+        return $context->getCurrentCustomerGroup()->getId() !== $context->getFallbackCustomerGroup()->getId();
+    }
 }
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/HeightConditionHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/HeightConditionHandler.php
index 3a621dcdc3d..1e0f1b128cf 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/HeightConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/HeightConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/ImmediateDeliveryConditionHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/ImmediateDeliveryConditionHandler.php
index bac73c8ba88..918b5cc4597 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/ImmediateDeliveryConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/ImmediateDeliveryConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/IsAvailableConditionHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/IsAvailableConditionHandler.php
index 8f9f46c6ae8..6e5b5f149d1 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/IsAvailableConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/IsAvailableConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\ConditionHandler;
@@ -68,13 +68,13 @@ public function generateCondition(
         });
 
         if (empty($conditions)) {
-            //variants will ne be splitted => only check if product has an available variant
+            // variants will ne be splitted => only check if product has an available variant
             $this->priceHelper->joinAvailableVariant($query);
 
             return;
         }
 
-        //variants will be displayed => add stock condition
+        // variants will be displayed => add stock condition
         $query->andWhere('(variant.laststock * variant.instock) >= (variant.laststock * variant.minpurchase)');
     }
 
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/IsNewConditionHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/IsNewConditionHandler.php
index 1dac60c2888..bae37ee92d8 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/IsNewConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/IsNewConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\ConditionHandler;
@@ -62,7 +62,7 @@ public function generateCondition(
         $dayLimit = (int) $this->config->get('markAsNew');
         $timestamp = strtotime('-' . $dayLimit . ' days');
         if ($timestamp === false) {
-            throw new RuntimeException(sprintf('Could not convert "-%s days" into a timestamp', $dayLimit));
+            throw new RuntimeException(\sprintf('Could not convert "-%s days" into a timestamp', $dayLimit));
         }
 
         $query->andWhere('product.datum >= ' . $key)
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/LastProductIdConditionHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/LastProductIdConditionHandler.php
index 3a55a5e449d..c5e450b8df2 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/LastProductIdConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/LastProductIdConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/LengthConditionHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/LengthConditionHandler.php
index ee6e2bdbe51..c29c41e23dc 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/LengthConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/LengthConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/ManufacturerConditionHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/ManufacturerConditionHandler.php
index 95a317850b6..b6e068c4a05 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/ManufacturerConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/ManufacturerConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/OrdernumberConditionHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/OrdernumberConditionHandler.php
index d319664c488..8668d87f3ff 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/OrdernumberConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/OrdernumberConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/PriceConditionHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/PriceConditionHandler.php
index a7d726ab522..39bfd889746 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/PriceConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/PriceConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/ProductAttributeConditionHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/ProductAttributeConditionHandler.php
index bc3141f1557..e137408d60d 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/ProductAttributeConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/ProductAttributeConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/ProductIdConditionHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/ProductIdConditionHandler.php
index a408ec9e7f2..b89788f0589 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/ProductIdConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/ProductIdConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/PropertyConditionHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/PropertyConditionHandler.php
index cb30383f366..cb95585f700 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/PropertyConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/PropertyConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/ReleaseDateConditionHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/ReleaseDateConditionHandler.php
index fe4889aa20d..c27634fb247 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/ReleaseDateConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/ReleaseDateConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/SalesConditionHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/SalesConditionHandler.php
index f33cb0477a6..7250133cc80 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/SalesConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/SalesConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/SearchTermConditionHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/SearchTermConditionHandler.php
index e8f875b1a22..d84f804069d 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/SearchTermConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/SearchTermConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\ConditionHandler;
@@ -65,8 +65,8 @@ private function addCondition(SearchTermCondition $condition, QueryBuilder $quer
     {
         $searchQuery = $this->searchTermQueryBuilder->buildQuery($condition->getTerm());
 
-        //no matching products found by the search query builder.
-        //add condition that the result contains no product.
+        // no matching products found by the search query builder.
+        // add condition that the result contains no product.
         if ($searchQuery === null) {
             $query->andWhere('0 = 1');
 
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/ShippingFreeConditionHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/ShippingFreeConditionHandler.php
index 482b5dd6450..d01de000fe7 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/ShippingFreeConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/ShippingFreeConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/SimilarProductConditionHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/SimilarProductConditionHandler.php
index c0f89045609..9f9ba89ed29 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/SimilarProductConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/SimilarProductConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/VariantConditionHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/VariantConditionHandler.php
index 56bdaa4dfcb..799c6e6c6a2 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/VariantConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/VariantConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/VoteAverageConditionHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/VoteAverageConditionHandler.php
index 033ee2d0efc..f6ab918f42a 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/VoteAverageConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/VoteAverageConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/WeightConditionHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/WeightConditionHandler.php
index d6af1757d3f..8570bf3170c 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/WeightConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/WeightConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/WidthConditionHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/WidthConditionHandler.php
index f3d264da070..84dda401e12 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/WidthConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandler/WidthConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandlerInterface.php b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandlerInterface.php
index 078ef6a3f58..8e6629de217 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandlerInterface.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/ConditionHandlerInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/CriteriaAwareInterface.php b/engine/Shopware/Bundle/SearchBundleDBAL/CriteriaAwareInterface.php
index f1265f4d37d..4e7791cf343 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/CriteriaAwareInterface.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/CriteriaAwareInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/DependencyInjection/Compiler/DBALHandlerCompilerPass.php b/engine/Shopware/Bundle/SearchBundleDBAL/DependencyInjection/Compiler/DBALHandlerCompilerPass.php
index dc9243447c9..13ebc0fdaf4 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/DependencyInjection/Compiler/DBALHandlerCompilerPass.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/DependencyInjection/Compiler/DBALHandlerCompilerPass.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\DependencyInjection\Compiler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/DependencyInjection/services.xml b/engine/Shopware/Bundle/SearchBundleDBAL/DependencyInjection/services.xml
index 35de7204506..eed4e1b2165 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/DependencyInjection/services.xml
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/DependencyInjection/services.xml
@@ -147,6 +147,7 @@
         <service id="shopware_searchdbal.has_pseudo_price_condition_handler_dbal" class="Shopware\Bundle\SearchBundleDBAL\ConditionHandler\HasPseudoPriceConditionHandler">
             <argument type="service" id="shopware_searchdbal.listing_price_switcher"/>
             <argument type="service" id="Shopware\Bundle\SearchBundleDBAL\VariantHelperInterface"/>
+            <argument type="service" id="Shopware\Bundle\SearchBundleDBAL\ListingPriceHelper"/>
             <tag name="condition_handler_dbal"/>
         </service>
 
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/CategoryFacetHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/CategoryFacetHandler.php
index 3af5ad5f3ce..7b05b36b39c 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/CategoryFacetHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/CategoryFacetHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\FacetHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/CombinedConditionFacetHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/CombinedConditionFacetHandler.php
index d025a062231..bd1b986ae4e 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/CombinedConditionFacetHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/CombinedConditionFacetHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\FacetHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/ImmediateDeliveryFacetHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/ImmediateDeliveryFacetHandler.php
index 00619d19640..652e3a03526 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/ImmediateDeliveryFacetHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/ImmediateDeliveryFacetHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\FacetHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/ManufacturerFacetHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/ManufacturerFacetHandler.php
index 4000c81bc3f..d45a9252b1d 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/ManufacturerFacetHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/ManufacturerFacetHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\FacetHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/PriceFacetHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/PriceFacetHandler.php
index 7be60b3e1cf..a053a3fc9de 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/PriceFacetHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/PriceFacetHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\FacetHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/ProductAttributeFacetHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/ProductAttributeFacetHandler.php
index d7c6da0dec0..860b466d584 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/ProductAttributeFacetHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/ProductAttributeFacetHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\FacetHandler;
@@ -41,7 +41,6 @@
 use Shopware\Bundle\SearchBundleDBAL\PartialFacetHandlerInterface;
 use Shopware\Bundle\SearchBundleDBAL\QueryBuilder;
 use Shopware\Bundle\SearchBundleDBAL\QueryBuilderFactoryInterface;
-use Shopware\Bundle\StoreFrontBundle\Struct;
 use Shopware\Bundle\StoreFrontBundle\Struct\ShopContextInterface;
 
 class ProductAttributeFacetHandler implements PartialFacetHandlerInterface
@@ -137,7 +136,7 @@ private function createValueListFacetResult(
         QueryBuilder $query,
         ProductAttributeFacet $facet,
         Criteria $criteria,
-        Struct\ShopContextInterface $context
+        ShopContextInterface $context
     ): ?FacetResultInterface {
         $sqlField = 'productAttribute.' . $facet->getField();
 
@@ -355,6 +354,6 @@ private function getTypeTemplate(?string $type, string $mode, ?string $defaultTe
                 }
         }
 
-        throw new RuntimeException(sprintf('Could not find template for type "%s" or default template not set', $type));
+        throw new RuntimeException(\sprintf('Could not find template for type "%s" or default template not set', $type));
     }
 }
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/ProductDimensionsFacetHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/ProductDimensionsFacetHandler.php
index 1d70f6a404c..f2850170957 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/ProductDimensionsFacetHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/ProductDimensionsFacetHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\FacetHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/PropertyFacetHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/PropertyFacetHandler.php
index 495f825c6b7..0e3de7adbff 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/PropertyFacetHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/PropertyFacetHandler.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\FacetHandler;
@@ -85,14 +86,14 @@ public function generatePartialFacet(
     /**
      * @deprecated - Will be private with Shopware 5.8
      *
-     * @return Set[]|null
+     * @return array<int, Set>|null
      */
     protected function getProperties(ShopContextInterface $context, Criteria $queryCriteria)
     {
         $query = $this->queryBuilderFactory->createQuery($queryCriteria, $context);
         $this->rebuildQuery($query);
 
-        $propertyData = $query->execute()->fetchAll();
+        $propertyData = $query->execute()->fetchAllAssociative();
 
         $valueIds = array_column($propertyData, 'id');
         $filterGroupIds = array_keys(array_flip(array_column($propertyData, 'filterGroupId')));
@@ -138,8 +139,8 @@ private function getFilteredValues(Criteria $criteria): array
     }
 
     /**
-     * @param Set[] $sets
-     * @param int[] $actives
+     * @param array<Set> $sets
+     * @param array<int> $actives
      */
     private function createCollectionResult(
         PropertyFacet $facet,
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/ShippingFreeFacetHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/ShippingFreeFacetHandler.php
index 0a2f1fb4020..4a58ac74dd6 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/ShippingFreeFacetHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/ShippingFreeFacetHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\FacetHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/VariantFacetHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/VariantFacetHandler.php
index a90b271fd1b..840fb1f4dc1 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/VariantFacetHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/VariantFacetHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\FacetHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/VoteAverageFacetHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/VoteAverageFacetHandler.php
index d696d61f9f0..89c1f7757db 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/VoteAverageFacetHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandler/VoteAverageFacetHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\FacetHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandlerInterface.php b/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandlerInterface.php
index fce14838265..eb94f156f47 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandlerInterface.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/FacetHandlerInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/KeywordFinderInterface.php b/engine/Shopware/Bundle/SearchBundleDBAL/KeywordFinderInterface.php
index 67c69e725c7..fed2636bfdb 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/KeywordFinderInterface.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/KeywordFinderInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ListingPriceHelper.php b/engine/Shopware/Bundle/SearchBundleDBAL/ListingPriceHelper.php
index 7cc0b1c9deb..a52f52627f7 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/ListingPriceHelper.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/ListingPriceHelper.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL;
@@ -107,6 +107,7 @@ public function getPriceTable(ShopContextInterface $context)
             's_articles_prices',
             'customerPrice',
             'customerPrice.articledetailsID = defaultPrice.articledetailsID
+            AND customerPrice.articleID = defaultPrice.articleID
             AND customerPrice.pricegroup = :currentCustomerGroup'
         );
 
@@ -157,7 +158,7 @@ private function getPriceSwitchColumns()
         $template = 'IFNULL(customerPrice.%s, defaultPrice.%s) as %s';
         $switch = [];
         foreach ($this->getPriceColumns() as $column) {
-            $switch[] = sprintf($template, $column, $column, $column);
+            $switch[] = \sprintf($template, $column, $column, $column);
         }
 
         $switch[] = 'defaultPrice.articleID as product_id';
@@ -176,10 +177,10 @@ private function getDefaultPriceColumns()
         $template = 'defaultPrice.%s';
         $switch = [];
         foreach ($this->getPriceColumns() as $column) {
-            $switch[] = sprintf($template, $column);
+            $switch[] = \sprintf($template, $column);
         }
-        $switch[] = sprintf($template, 'articleID as product_id');
-        $switch[] = sprintf($template, 'articledetailsID as variant_id');
+        $switch[] = \sprintf($template, 'articleID as product_id');
+        $switch[] = \sprintf($template, 'articledetailsID as variant_id');
 
         return implode(',', $switch);
     }
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ListingPriceSwitcher.php b/engine/Shopware/Bundle/SearchBundleDBAL/ListingPriceSwitcher.php
index 83b26cf908b..1d9f0572a2a 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/ListingPriceSwitcher.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/ListingPriceSwitcher.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ListingPriceTable.php b/engine/Shopware/Bundle/SearchBundleDBAL/ListingPriceTable.php
index 7f3dbb35ab0..2f3f83f9fc3 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/ListingPriceTable.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/ListingPriceTable.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ListingPriceTableInterface.php b/engine/Shopware/Bundle/SearchBundleDBAL/ListingPriceTableInterface.php
index 33b236081ba..e86f5c5af4a 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/ListingPriceTableInterface.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/ListingPriceTableInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/PartialFacetHandlerInterface.php b/engine/Shopware/Bundle/SearchBundleDBAL/PartialFacetHandlerInterface.php
index 8a545609dd4..9a115cbd131 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/PartialFacetHandlerInterface.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/PartialFacetHandlerInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/PriceHelper.php b/engine/Shopware/Bundle/SearchBundleDBAL/PriceHelper.php
index 9871fbb6c11..a2064890c1b 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/PriceHelper.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/PriceHelper.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL;
@@ -65,26 +65,26 @@ public function getSelection(ShopContextInterface $context)
 
         $taxCase = $this->buildTaxCase($context);
 
-        //rounded to filter this value correctly
+        // rounded to filter this value correctly
         // => 2,99999999 displayed as 3,- € but won't be displayed with a filter on price >= 3,- €
         return 'ROUND(' .
 
-            //customer group price (with fallback switch)
+            // customer group price (with fallback switch)
             $priceField .
 
-            //multiplied with the variant min purchase
+            // multiplied with the variant min purchase
             ($considerMinPurchase ? ' * availableVariant.minpurchase' : '') .
 
-            //multiplied with the percentage price group discount
+            // multiplied with the percentage price group discount
             ' * ((100 - IFNULL(priceGroup.discount, 0)) / 100)' .
 
-            //multiplied with the product tax if the current customer group should see gross prices
+            // multiplied with the product tax if the current customer group should see gross prices
             ($current->displayGrossPrices() ? ' * (( ' . $taxCase . ' + 100) / 100)' : '') .
 
-            //multiplied with the percentage discount of the current customer group
+            // multiplied with the percentage discount of the current customer group
             ($discount ? ' * ' . (100 - (float) $discount) / 100 : '') .
 
-            //multiplied with the shop currency factor
+            // multiplied with the shop currency factor
             ($currency->getFactor() ? ' * ' . $currency->getFactor() : '') .
 
         ', 2)';
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/PriceHelperInterface.php b/engine/Shopware/Bundle/SearchBundleDBAL/PriceHelperInterface.php
index 1a20508784c..266637f202c 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/PriceHelperInterface.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/PriceHelperInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL;
@@ -40,16 +40,22 @@ public function getSelection(ProductContextInterface $context);
 
     /**
      * Joins the customer prices to the provided query
+     *
+     * @return void
      */
     public function joinPrices(QueryBuilder $query, ShopContextInterface $context);
 
     /**
      * Joins the fallback customer group prices for the provided query
+     *
+     * @return void
      */
     public function joinDefaultPrices(QueryBuilder $query, ShopContextInterface $context);
 
     /**
      * Joins variants to the selected products which are available
+     *
+     * @return void
      */
     public function joinAvailableVariant(QueryBuilder $query);
 }
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/ProductNumberSearch.php b/engine/Shopware/Bundle/SearchBundleDBAL/ProductNumberSearch.php
index ade34eb7e93..4f6f8298c7d 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/ProductNumberSearch.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/ProductNumberSearch.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL;
@@ -151,13 +151,13 @@ private function createFacets(SearchBundle\Criteria $criteria, ShopContextInterf
             $handler = $this->getFacetHandler($facet);
 
             if ($criteria->generatePartialFacets() && !$handler instanceof PartialFacetHandlerInterface) {
-                throw new RuntimeException(sprintf("New filter mode activated, handler class %s doesn't support this mode", \get_class($handler)));
+                throw new RuntimeException(\sprintf("New filter mode activated, handler class %s doesn't support this mode", \get_class($handler)));
             }
 
             if ($handler instanceof PartialFacetHandlerInterface) {
                 $result = $handler->generatePartialFacet($facet, $clone, $criteria, $context);
             } else {
-                trigger_error(sprintf("Facet handler %s doesn't support new filter mode. FacetHandlerInterface is deprecated since version 5.3 and will be removed in 5.8.", \get_class($handler)), E_USER_DEPRECATED);
+                trigger_error(\sprintf("Facet handler %s doesn't support new filter mode. FacetHandlerInterface is deprecated since version 5.3 and will be removed in 5.8.", \get_class($handler)), E_USER_DEPRECATED);
                 $result = $handler->generateFacet($facet, $criteria, $context);
             }
 
@@ -210,7 +210,7 @@ private function getFacetHandler(SearchBundle\FacetInterface $facet)
             }
         }
 
-        throw new Exception(sprintf('Facet %s not supported', \get_class($facet)));
+        throw new Exception(\sprintf('Facet %s not supported', \get_class($facet)));
     }
 
     /**
@@ -227,7 +227,7 @@ private function assertCollectionIsInstanceOf(ArrayCollection $objects, $classes
                 }
             }
             if (!$implements) {
-                throw new RuntimeException(sprintf('Object of class "%s" has to implement one of the following interfaces: "%s".', \get_class($object), implode(',', $classes)));
+                throw new RuntimeException(\sprintf('Object of class "%s" has to implement one of the following interfaces: "%s".', \get_class($object), implode(',', $classes)));
             }
         }
     }
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/QueryBuilder.php b/engine/Shopware/Bundle/SearchBundleDBAL/QueryBuilder.php
index 13c312d3224..704fc7c1e52 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/QueryBuilder.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/QueryBuilder.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/QueryBuilderFactory.php b/engine/Shopware/Bundle/SearchBundleDBAL/QueryBuilderFactory.php
index 33bee11271f..e0670032a88 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/QueryBuilderFactory.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/QueryBuilderFactory.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL;
@@ -211,7 +211,7 @@ private function getSortingHandler(SortingInterface $sorting)
             }
         }
 
-        throw new Exception(sprintf('Sorting %s not supported', \get_class($sorting)));
+        throw new Exception(\sprintf('Sorting %s not supported', \get_class($sorting)));
     }
 
     /**
@@ -227,7 +227,7 @@ private function getConditionHandler(ConditionInterface $condition)
             }
         }
 
-        throw new Exception(sprintf('Condition %s not supported', \get_class($condition)));
+        throw new Exception(\sprintf('Condition %s not supported', \get_class($condition)));
     }
 
     /**
@@ -271,7 +271,7 @@ private function assertCollectionIsInstanceOf(ArrayCollection $objects, $class)
     {
         foreach ($objects as $object) {
             if (!$object instanceof $class) {
-                throw new RuntimeException(sprintf('Object of class "%s" must be instance of "%s".', \get_class($object), $class));
+                throw new RuntimeException(\sprintf('Object of class "%s" must be instance of "%s".', \get_class($object), $class));
             }
         }
     }
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/QueryBuilderFactoryInterface.php b/engine/Shopware/Bundle/SearchBundleDBAL/QueryBuilderFactoryInterface.php
index f85ec26bf41..8dd70cf5b13 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/QueryBuilderFactoryInterface.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/QueryBuilderFactoryInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/SearchBundleDBAL.php b/engine/Shopware/Bundle/SearchBundleDBAL/SearchBundleDBAL.php
index 2ca45e080b3..c6b36ef7145 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/SearchBundleDBAL.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/SearchBundleDBAL.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/SearchBundleDBALSubscriber.php b/engine/Shopware/Bundle/SearchBundleDBAL/SearchBundleDBALSubscriber.php
index e9681afc4ae..ca04b26542d 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/SearchBundleDBALSubscriber.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/SearchBundleDBALSubscriber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL;
@@ -29,25 +29,28 @@
 use RuntimeException;
 use Shopware\Bundle\SearchBundle\CriteriaRequestHandlerInterface;
 
+/**
+ * @deprecated - Not used. The events are emitted in other classes. This class will be removed without replacement in 5.8
+ */
 class SearchBundleDBALSubscriber implements SubscriberInterface
 {
     /**
-     * @var \Doctrine\Common\Collections\ArrayCollection<SortingHandlerInterface>
+     * @var ArrayCollection<SortingHandlerInterface>
      */
     private $sortingHandlers;
 
     /**
-     * @var \Doctrine\Common\Collections\ArrayCollection<ConditionHandlerInterface>
+     * @var ArrayCollection<ConditionHandlerInterface>
      */
     private $conditionHandlers;
 
     /**
-     * @var \Doctrine\Common\Collections\ArrayCollection<FacetHandlerInterface|PartialFacetHandlerInterface>
+     * @var ArrayCollection<FacetHandlerInterface|PartialFacetHandlerInterface>
      */
     private $facetHandlers;
 
     /**
-     * @var \Doctrine\Common\Collections\ArrayCollection<CriteriaRequestHandlerInterface>
+     * @var ArrayCollection<CriteriaRequestHandlerInterface>
      */
     private $criteriaRequestHandlers;
 
@@ -83,7 +86,7 @@ public static function getSubscribedEvents()
     }
 
     /**
-     * @return \Doctrine\Common\Collections\ArrayCollection<FacetHandlerInterface|PartialFacetHandlerInterface>
+     * @return ArrayCollection<FacetHandlerInterface|PartialFacetHandlerInterface>
      */
     public function registerFacetHandlers()
     {
@@ -91,7 +94,7 @@ public function registerFacetHandlers()
     }
 
     /**
-     * @return \Doctrine\Common\Collections\ArrayCollection<SortingHandlerInterface>
+     * @return ArrayCollection<SortingHandlerInterface>
      */
     public function registerSortingHandlers()
     {
@@ -99,7 +102,7 @@ public function registerSortingHandlers()
     }
 
     /**
-     * @return \Doctrine\Common\Collections\ArrayCollection<ConditionHandlerInterface>
+     * @return ArrayCollection<ConditionHandlerInterface>
      */
     public function registerConditionHandlers()
     {
@@ -107,7 +110,7 @@ public function registerConditionHandlers()
     }
 
     /**
-     * @return \Doctrine\Common\Collections\ArrayCollection<CriteriaRequestHandlerInterface>
+     * @return ArrayCollection<CriteriaRequestHandlerInterface>
      */
     public function registerRequestHandlers()
     {
@@ -117,7 +120,7 @@ public function registerRequestHandlers()
     private function validateHandlers(array $handlers)
     {
         if (empty($handlers)) {
-            throw new RuntimeException(sprintf('No handlers provided in %s', __CLASS__));
+            throw new RuntimeException(\sprintf('No handlers provided in %s', __CLASS__));
         }
 
         foreach ($handlers as $handler) {
@@ -130,7 +133,7 @@ private function validateHandlers(array $handlers)
                 continue;
             }
 
-            throw new RuntimeException(sprintf('Unknown handler class %s detected', \is_object($handler) ? \get_class($handler) : \gettype($handler)));
+            throw new RuntimeException(\sprintf('Unknown handler class %s detected', \is_object($handler) ? \get_class($handler) : \gettype($handler)));
         }
     }
 
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/CacheKeywordFinder.php b/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/CacheKeywordFinder.php
index 3be06a2c3d3..c19dd40d1ff 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/CacheKeywordFinder.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/CacheKeywordFinder.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\SearchTerm;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/Keyword.php b/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/Keyword.php
index e8b24f2d7bf..9be829468f2 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/Keyword.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/Keyword.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\SearchTerm;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/KeywordFinder.php b/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/KeywordFinder.php
index dc67826a13e..d44f98e3903 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/KeywordFinder.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/KeywordFinder.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\SearchTerm;
@@ -43,7 +43,7 @@ class KeywordFinder implements KeywordFinderInterface
     private $config;
 
     /**
-     * @var \Doctrine\DBAL\Connection
+     * @var Connection
      */
     private $connection;
 
@@ -162,11 +162,11 @@ private function findFuzzyMatches($term)
                 if (\strlen($term1) < 4) {
                     $relevance = $this->config->get('fuzzySearchMatchFactor', 5);
 
-                //ipod === ipods
+                // ipod === ipods
                 } elseif (\strlen($term1) - \strlen($term2) <= 1) {
                     $relevance = $this->config->get('fuzzySearchExactMatchFactor', 100);
 
-                //digital == digi
+                // digital == digi
                 } elseif ((round(\strlen($term2) / \strlen($term1), 2) * 100) >= $this->config->get('fuzzySearchPartNameDistancen', 25)) {
                     $relevance = $this->config->get('fuzzySearchPatternMatchFactor', 50);
                 }
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/SearchIndexer.php b/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/SearchIndexer.php
index c183e348be0..b80028f585a 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/SearchIndexer.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/SearchIndexer.php
@@ -1,30 +1,31 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\SearchTerm;
 
 use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\DBALException;
 use PDO;
 use Shopware\Components\MemoryLimit;
 use Shopware_Components_Config;
@@ -36,34 +37,19 @@ class SearchIndexer implements SearchIndexerInterface
      */
     public const INDEX_DELETE_THRESHOLD = 0.9;
 
-    /**
-     * @var Connection
-     */
-    private $connection;
+    private Connection $connection;
 
-    /**
-     * @var Shopware_Components_Config
-     */
-    private $config;
+    private Shopware_Components_Config $config;
 
-    /**
-     * @var TermHelperInterface
-     */
-    private $termHelper;
+    private TermHelperInterface $termHelper;
 
-    /**
-     * @var int
-     */
-    private $batchSize;
+    private int $batchSize;
 
-    /**
-     * @param int $batchSize
-     */
     public function __construct(
         Shopware_Components_Config $config,
         Connection $connection,
         TermHelperInterface $termHelper,
-        $batchSize = 4000
+        int $batchSize = 4000
     ) {
         $this->config = $config;
         $this->connection = $connection;
@@ -71,9 +57,6 @@ public function __construct(
         $this->batchSize = $batchSize > 0 ? $batchSize : 4000;
     }
 
-    /**
-     * Check if search index is valid anymore and rebuild if necessary
-     */
     public function validate()
     {
         $strategy = $this->config->get('searchRefreshStrategy', 3);
@@ -96,7 +79,7 @@ public function validate()
             AND cf.element_id = ce.id
             AND cf.shop_id = 1
         ";
-        $result = $this->connection->fetchAll($sql);
+        $result = $this->connection->fetchAllAssociative($sql);
 
         if (empty($result) || !isset($result[0])) {
             $this->build();
@@ -113,9 +96,6 @@ public function validate()
         }
     }
 
-    /**
-     * Rebuilds the search index for the shopware default search query builder.
-     */
     public function build()
     {
         MemoryLimit::setMinimumMemoryLimit(1024 * 1024 * 512);
@@ -124,7 +104,7 @@ public function build()
         $this->setNextUpdateTimestamp();
 
         // Truncate search index table (using DELETE to avoid committing database transactions in tests)
-        $this->connection->executeUpdate('DELETE FROM `s_search_index`');
+        $this->connection->executeStatement('DELETE FROM `s_search_index`');
 
         // Get a list of all tables and columns in this tables that should be processed by search
         /**
@@ -147,13 +127,13 @@ public function build()
                 // Build sql query to fetch values from this table
                 $sql = 'SELECT ' . $table['elementID'] . ' as id, ' . $table['fields'] . ' FROM ' . $table['table'];
 
-                // If any where condition is set, add to query
+                // If any "where" condition is set, add to query
                 if (!empty($table['where'])) {
                     $sql .= ' WHERE ' . $table['where'];
                 }
 
                 // Get all fields & values from current table
-                $getTableKeywords = $this->connection->fetchAll($sql);
+                $getTableKeywords = $this->connection->fetchAllAssociative($sql);
 
                 if ($table['table'] === 's_categories') {
                     $getTableKeywords = $this->mapCategoryKeywords($getTableKeywords);
@@ -212,14 +192,14 @@ public function build()
                         continue;
                     }
 
-                    // If last row or more then 5000 keywords fetched, write results to index
+                    // If last row or more than 5000 keywords fetched, write results to index
                     if ($currentRow == \count($getTableKeywords) - 1 || \count($keywords) > $this->batchSize) {
                         $keywords = array_unique($keywords); // Remove duplicates
                         $sql_keywords = 'INSERT IGNORE INTO `s_search_keywords` (`keyword`) VALUES';
                         $sql_keywords .= ' (' . implode('), (', $keywords) . ')';
 
                         // Insert Keywords
-                        $this->connection->executeUpdate($sql_keywords);
+                        $this->connection->executeStatement($sql_keywords);
 
                         $keywords = [];
 
@@ -227,7 +207,7 @@ public function build()
                         $sqlIndex = implode("\n\nUNION ALL\n\n", $sqlIndex);
                         $sqlIndex = "INSERT IGNORE INTO s_search_index (keywordID, elementID, fieldID)\n\n" . $sqlIndex;
 
-                        $this->connection->executeUpdate($sqlIndex);
+                        $this->connection->executeStatement($sqlIndex);
                         $sqlIndex = [];
                     }
                 }
@@ -242,7 +222,7 @@ public function build()
     /**
      * Updates the last update timestamp in the database
      */
-    private function setNextUpdateTimestamp()
+    private function setNextUpdateTimestamp(): void
     {
         $sql = '
             SET @parent = (SELECT id FROM s_core_config_elements WHERE name = \'fuzzysearchlastupdate\');
@@ -250,13 +230,13 @@ private function setNextUpdateTimestamp()
             INSERT INTO `s_core_config_values` (`element_id`, `shop_id`, `value`) VALUES
             (@parent, 1, CONCAT(\'s:\', LENGTH(NOW()), \':"\', NOW(), \'";\'));
         ';
-        $this->connection->executeUpdate($sql);
+        $this->connection->executeStatement($sql);
     }
 
     /**
-     * @throws \Doctrine\DBAL\DBALException
+     * @throws DBALException
      */
-    private function cleanupIndex()
+    private function cleanupIndex(): void
     {
         $tables = $this->getSearchTables();
         $qb = $this->connection->createQueryBuilder();
@@ -277,7 +257,7 @@ private function cleanupIndex()
                     'si',
                     $table['reference_table'] ?: 's_articles',
                     't' . $table['tableID'],
-                    sprintf(
+                    \sprintf(
                         'si.elementID = t%d.%s AND si.fieldID IN (:fieldIDs%1$d)',
                         $table['tableID'],
                         $table['foreign_key']
@@ -288,7 +268,7 @@ private function cleanupIndex()
 
             if (!\in_array($table['reference_table'] ?: $table['table'], $selected)) {
                 $qb->addSelect(
-                    sprintf(
+                    \sprintf(
                         '(SELECT COUNT(*) * :threshold FROM %s) AS cnt_%1$s',
                         $selected[] = ($table['reference_table'] ?: $table['table'])
                     )
@@ -296,7 +276,7 @@ private function cleanupIndex()
             }
 
             $qb->orHaving(
-                sprintf(
+                \sprintf(
                     'tableId = %d AND count_self > cnt_%s',
                     $table['tableID'],
                     $table['reference_table'] ?: $table['table']
@@ -321,20 +301,20 @@ function ($param) {
             substr_replace($qb->getSQL(), 'SELECT STRAIGHT_JOIN', 0, 6)
         );
 
-        $collectToDelete = $this->connection->fetchAll($mappedSql);
+        $collectToDelete = $this->connection->fetchAllAssociative($mappedSql);
         foreach ($collectToDelete as $delete) {
             $sql = '
                 DELETE FROM s_search_index
                 WHERE keywordID=? AND fieldID=?
             ';
-            $this->connection->executeUpdate($sql, [$delete['keywordID'], $delete['fieldID']]);
+            $this->connection->executeStatement($sql, [$delete['keywordID'], $delete['fieldID']]);
         }
     }
 
     /**
      * Cleanups search keywords in the database.
      */
-    private function cleanupKeywords()
+    private function cleanupKeywords(): void
     {
         $sql = '
             DELETE sk FROM `s_search_keywords` sk
@@ -342,17 +322,15 @@ private function cleanupKeywords()
             ON sk.id=si.keywordID
             WHERE si.keywordID IS NULL
         ';
-        $this->connection->executeUpdate($sql);
+        $this->connection->executeStatement($sql);
     }
 
     /**
      * Get all tables and columns that might be involved in this search request as an array
-     *
-     * @return array
      */
-    private function getSearchTables()
+    private function getSearchTables(): array
     {
-        return $this->connection->fetchAll("
+        return $this->connection->fetchAllAssociative("
             SELECT STRAIGHT_JOIN
                 st.id AS tableID,
                 st.table,
@@ -370,10 +348,7 @@ private function getSearchTables()
        ");
     }
 
-    /**
-     * @return array
-     */
-    private function mapCategoryKeywords(array $keywords)
+    private function mapCategoryKeywords(array $keywords): array
     {
         $ids = array_column($keywords, 'id');
 
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/SearchIndexerInterface.php b/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/SearchIndexerInterface.php
index 60e4269d1d0..1e6b13019b6 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/SearchIndexerInterface.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/SearchIndexerInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\SearchTerm;
@@ -28,11 +28,15 @@ interface SearchIndexerInterface
 {
     /**
      * Check if search index is valid anymore and rebuild if necessary
+     *
+     * @return void
      */
     public function validate();
 
     /**
      * Rebuilds the search index for the shopware default search query builder.
+     *
+     * @return void
      */
     public function build();
 }
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/SearchTermLogger.php b/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/SearchTermLogger.php
index 34d2545b43b..d8ba44ba85e 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/SearchTermLogger.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/SearchTermLogger.php
@@ -1,41 +1,39 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\SearchTerm;
 
 use DateTime;
 use Doctrine\DBAL\Connection;
+use Shopware\Bundle\SearchBundle\Condition\SearchTermCondition;
 use Shopware\Bundle\SearchBundle\Criteria;
 use Shopware\Bundle\SearchBundle\ProductNumberSearchResult;
 use Shopware\Bundle\StoreFrontBundle\Struct\Shop;
 
 class SearchTermLogger implements SearchTermLoggerInterface
 {
-    /**
-     * @var \Doctrine\DBAL\Connection
-     */
-    private $connection;
+    private Connection $connection;
 
     public function __construct(Connection $connection)
     {
@@ -55,6 +53,9 @@ public function logResult(
         }
 
         $condition = $criteria->getCondition('search');
+        if (!$condition instanceof SearchTermCondition) {
+            return;
+        }
 
         $now = new DateTime();
         $this->connection->insert('s_statistics_search', [
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/SearchTermLoggerInterface.php b/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/SearchTermLoggerInterface.php
index 886cd0284ab..95b6fb4ae5f 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/SearchTermLoggerInterface.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/SearchTermLoggerInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\SearchTerm;
@@ -32,6 +32,8 @@ interface SearchTermLoggerInterface
 {
     /**
      * Traces the search result into the s_statistic_search
+     *
+     * @return void
      */
     public function logResult(Criteria $criteria, ProductNumberSearchResult $result, Shop $shop);
 }
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/SearchTermQueryBuilder.php b/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/SearchTermQueryBuilder.php
index 4e6eaffdee1..6c043d31b47 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/SearchTermQueryBuilder.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/SearchTermQueryBuilder.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\SearchTerm;
@@ -186,7 +186,7 @@ private function addToleranceCondition(QueryBuilder $query)
         $distance = $this->config->get('fuzzySearchMinDistancenTop', 20);
         $query->select('MAX(' . $this->getRelevanceSelection() . ") / 100 * $distance");
 
-        //calculates the tolerance limit
+        // calculates the tolerance limit
         if ($distance) {
             $query->andWhere('(' . $this->getRelevanceSelection() . ') > (' . $query->getSQL() . ')');
         }
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/TermHelper.php b/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/TermHelper.php
index 6e1b4a39a73..07f3a80c8a1 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/TermHelper.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/TermHelper.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\SearchTerm;
@@ -71,6 +71,9 @@ public function __construct($config, $useBadWords = true, $replaceUmlauts = true
      */
     public function splitTerm($string)
     {
+        if (empty($string)) {
+            return [];
+        }
         if ($this->replaceUmlauts) {
             $string = str_replace(
                 ['Ü', 'ü', 'ä', 'Ä', 'ö', 'Ö', 'ß'],
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/TermHelperInterface.php b/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/TermHelperInterface.php
index 36516372554..1366570b843 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/TermHelperInterface.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/SearchTerm/TermHelperInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\SearchTerm;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/SearchTermQueryBuilderInterface.php b/engine/Shopware/Bundle/SearchBundleDBAL/SearchTermQueryBuilderInterface.php
index 86012e5d51d..39490b779af 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/SearchTermQueryBuilderInterface.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/SearchTermQueryBuilderInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/ManualSortingHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/ManualSortingHandler.php
index 6b74a13c1b8..b0b6454a024 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/ManualSortingHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/ManualSortingHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\SortingHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/PopularitySortingHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/PopularitySortingHandler.php
index bbe16d243b3..d55a914abe7 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/PopularitySortingHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/PopularitySortingHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\SortingHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/PriceSortingHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/PriceSortingHandler.php
index 59bb188e3bb..95ceff72dd6 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/PriceSortingHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/PriceSortingHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\SortingHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/ProductAttributeSortingHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/ProductAttributeSortingHandler.php
index f88849f8b64..41683489e73 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/ProductAttributeSortingHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/ProductAttributeSortingHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\SortingHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/ProductNameSortingHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/ProductNameSortingHandler.php
index 27d03528872..e55e904c6dd 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/ProductNameSortingHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/ProductNameSortingHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\SortingHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/ProductNumberSortingHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/ProductNumberSortingHandler.php
index d483f837a01..031d7d87d87 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/ProductNumberSortingHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/ProductNumberSortingHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\SortingHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/ProductStockSortingHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/ProductStockSortingHandler.php
index 618c3de96b1..97b17e6a8f5 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/ProductStockSortingHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/ProductStockSortingHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\SortingHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/RandomSortingHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/RandomSortingHandler.php
index 133acf0f330..604b7308e1e 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/RandomSortingHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/RandomSortingHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\SortingHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/ReleaseDateSortingHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/ReleaseDateSortingHandler.php
index 917c54d1f63..87c9a7376a3 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/ReleaseDateSortingHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/ReleaseDateSortingHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\SortingHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/SearchRankingSortingHandler.php b/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/SearchRankingSortingHandler.php
index e78120ca3da..5f0a2e8338a 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/SearchRankingSortingHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandler/SearchRankingSortingHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL\SortingHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandlerInterface.php b/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandlerInterface.php
index 0f0f2939566..9200e17e2e9 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandlerInterface.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/SortingHandlerInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL;
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/VariantHelper.php b/engine/Shopware/Bundle/SearchBundleDBAL/VariantHelper.php
index cd391b2c1a7..fa9efb99201 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/VariantHelper.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/VariantHelper.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL;
@@ -330,7 +330,7 @@ protected function getOnSalePriceColums()
             ',',
             array_map(
                 function ($column) use ($template) {
-                    return sprintf($template, $column, $column, $column);
+                    return \sprintf($template, $column, $column, $column);
                 },
                 $this->listingPriceHelper->getPriceColumns()
             )
@@ -355,6 +355,7 @@ protected function createListingPriceTable(Criteria $criteria, ShopContextInterf
         $priceTable = $this->listingPriceHelper->getPriceTable($context);
         $priceTable->innerJoin('defaultPrice', 's_articles_details', 'details', 'details.id = defaultPrice.articledetailsID');
         $priceTable->andWhere('(details.laststock * details.instock) >= (details.laststock * details.minpurchase)');
+        $priceTable->andWhere('details.active = 1');
 
         $query->from('s_articles', 'product');
         $query->innerJoin('product', '(' . $priceTable->getSQL() . ')', 'prices', 'product.id = prices.articleID');
@@ -416,6 +417,12 @@ protected function createOnSaleListingPriceTable(Criteria $criteria, ShopContext
 
         $priceTable = $this->listingPriceHelper->getPriceTable($context);
 
+        if ($this->hasDifferentCustomerGroups($context)) {
+            $priceTable->andWhere('IFNULL(customerPrice.`from`, defaultPrice.`from`)  = 1');
+        } else {
+            $priceTable->andWhere('defaultPrice.from = 1');
+        }
+
         $query->from('s_articles', 'product');
         $query->innerJoin('product', '(' . $priceTable->getSQL() . ')', 'prices', 'product.id = prices.articleID');
         $query->innerJoin('prices', 's_articles_details', 'variant', 'variant.id = prices.articledetailsID AND variant.active = 1');
@@ -441,8 +448,6 @@ protected function createOnSaleListingPriceTable(Criteria $criteria, ShopContext
             $query->addGroupBy($tableKey . '.option_id');
         }
 
-        $query->andWhere('prices.from = 1');
-
         $query->setParameter(':fallbackCustomerGroup', $context->getFallbackCustomerGroup()->getKey());
         $query->setParameter(':priceGroupCustomerGroup', $context->getCurrentCustomerGroup()->getId());
 
diff --git a/engine/Shopware/Bundle/SearchBundleDBAL/VariantHelperInterface.php b/engine/Shopware/Bundle/SearchBundleDBAL/VariantHelperInterface.php
index 9a96606f015..232492e6115 100644
--- a/engine/Shopware/Bundle/SearchBundleDBAL/VariantHelperInterface.php
+++ b/engine/Shopware/Bundle/SearchBundleDBAL/VariantHelperInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleDBAL;
@@ -38,9 +38,18 @@ interface VariantHelperInterface
      */
     public function getVariantFacet();
 
+    /**
+     * @return void
+     */
     public function joinVariantCondition(QueryBuilder $query, VariantCondition $condition);
 
+    /**
+     * @return void
+     */
     public function joinPrices(QueryBuilder $query, ShopContextInterface $context, Criteria $criteria);
 
+    /**
+     * @return void
+     */
     public function joinVariants(QueryBuilder $query);
 }
diff --git a/engine/Shopware/Bundle/SearchBundleES/CombinedConditionQueryBuilder.php b/engine/Shopware/Bundle/SearchBundleES/CombinedConditionQueryBuilder.php
index 938ce2f29e7..5f9de9d5983 100644
--- a/engine/Shopware/Bundle/SearchBundleES/CombinedConditionQueryBuilder.php
+++ b/engine/Shopware/Bundle/SearchBundleES/CombinedConditionQueryBuilder.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES;
@@ -49,7 +49,7 @@ public function build(array $conditions, Criteria $criteria, ShopContextInterfac
         $handlerRegistry = $this->container->get(HandlerRegistry::class);
 
         if (!$handlerRegistry instanceof HandlerRegistry) {
-            throw new RuntimeException(sprintf('%s is missing', HandlerRegistry::class));
+            throw new RuntimeException(\sprintf('%s is missing', HandlerRegistry::class));
         }
 
         foreach ($conditions as $condition) {
diff --git a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/CategoryConditionHandler.php b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/CategoryConditionHandler.php
index 77e6d91f1ea..df6f08f45e3 100644
--- a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/CategoryConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/CategoryConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/CloseoutConditionHandler.php b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/CloseoutConditionHandler.php
index 8c990a867ac..f6beba495e6 100644
--- a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/CloseoutConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/CloseoutConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/CombinedConditionHandler.php b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/CombinedConditionHandler.php
index 62a2163f7b6..c1b9ab5f972 100644
--- a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/CombinedConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/CombinedConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/CreateDateConditionHandler.php b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/CreateDateConditionHandler.php
index bf5e6e2b7ff..92efd0fe652 100644
--- a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/CreateDateConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/CreateDateConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/CustomerGroupConditionHandler.php b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/CustomerGroupConditionHandler.php
index fa2a2e90248..91a0cea7d9e 100644
--- a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/CustomerGroupConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/CustomerGroupConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/HasPseudoPriceConditionHandler.php b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/HasPseudoPriceConditionHandler.php
index 01c9122e002..1126ec3a1f3 100644
--- a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/HasPseudoPriceConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/HasPseudoPriceConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/HeightConditionHandler.php b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/HeightConditionHandler.php
index 36bf52729d9..11aceaaaedd 100644
--- a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/HeightConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/HeightConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/ImmediateDeliveryConditionHandler.php b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/ImmediateDeliveryConditionHandler.php
index b8f08f5d914..236fa0d8312 100644
--- a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/ImmediateDeliveryConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/ImmediateDeliveryConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/IsAvailableConditionHandler.php b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/IsAvailableConditionHandler.php
index 575bf0650a3..ccb0c32c65c 100644
--- a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/IsAvailableConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/IsAvailableConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/IsNewConditionHandler.php b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/IsNewConditionHandler.php
index 7e7b24965f5..eeca749da69 100644
--- a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/IsNewConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/IsNewConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\ConditionHandler;
@@ -81,7 +81,7 @@ private function getQuery(): RangeQuery
         $dayLimit = (int) $this->config->get('markAsNew');
         $timestamp = strtotime('-' . $dayLimit . ' days');
         if ($timestamp === false) {
-            throw new RuntimeException(sprintf('Could not convert "-%s days" into a timestamp', $dayLimit));
+            throw new RuntimeException(\sprintf('Could not convert "-%s days" into a timestamp', $dayLimit));
         }
 
         return new RangeQuery('formattedCreatedAt', [
diff --git a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/LastProductIdConditionHandler.php b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/LastProductIdConditionHandler.php
index fd5f62fbd7d..397da798a3d 100644
--- a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/LastProductIdConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/LastProductIdConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/LengthConditionHandler.php b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/LengthConditionHandler.php
index 36cbbb397a8..c6d32c4343e 100644
--- a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/LengthConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/LengthConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/MainVariantConditionHandler.php b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/MainVariantConditionHandler.php
index bb2c7696f2c..849e828f133 100644
--- a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/MainVariantConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/MainVariantConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/ManufacturerConditionHandler.php b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/ManufacturerConditionHandler.php
index 33ef317e7ce..f25250700c2 100644
--- a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/ManufacturerConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/ManufacturerConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/OrdernumberConditionHandler.php b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/OrdernumberConditionHandler.php
index 2338d5f97b9..f57d611f413 100644
--- a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/OrdernumberConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/OrdernumberConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/PriceConditionHandler.php b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/PriceConditionHandler.php
index ad238470841..7a157410495 100644
--- a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/PriceConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/PriceConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/ProductAttributeConditionHandler.php b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/ProductAttributeConditionHandler.php
index a33183c06c1..ac6c4d15913 100644
--- a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/ProductAttributeConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/ProductAttributeConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\ConditionHandler;
@@ -91,7 +91,7 @@ private function getQuery(ProductAttributeCondition $criteriaPart): BuilderInter
         $attribute = $this->attributeService->get('s_articles_attributes', $criteriaPart->getField());
 
         if (!$attribute instanceof ConfigurationStruct) {
-            throw new RuntimeException(sprintf('Attribute not found for field %s', $criteriaPart->getField()));
+            throw new RuntimeException(\sprintf('Attribute not found for field %s', $criteriaPart->getField()));
         }
 
         $type = $attribute->getElasticSearchType()['type'];
@@ -208,7 +208,7 @@ private function getQuery(ProductAttributeCondition $criteriaPart): BuilderInter
                 return new WildcardQuery($field, '*' . $value);
 
             default:
-                throw new RuntimeException(sprintf('Operator %s is not supported in elastic search', $criteriaPart->getOperator()));
+                throw new RuntimeException(\sprintf('Operator %s is not supported in elastic search', $criteriaPart->getOperator()));
         }
     }
 }
diff --git a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/ProductIdConditionHandler.php b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/ProductIdConditionHandler.php
index b60c1759ab0..856908d72ca 100644
--- a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/ProductIdConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/ProductIdConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/PropertyConditionHandler.php b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/PropertyConditionHandler.php
index edf1bd21d8f..78dd5b4babd 100644
--- a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/PropertyConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/PropertyConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/ReleaseDateConditionHandler.php b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/ReleaseDateConditionHandler.php
index c18ed1d5496..9d6496b7fa5 100644
--- a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/ReleaseDateConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/ReleaseDateConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\ConditionHandler;
@@ -95,7 +95,7 @@ private function getQuery(ReleaseDateCondition $criteriaPart): RangeQuery
                 ]);
 
             default:
-                throw new RuntimeException(sprintf('Provided release date direction %s not supported', $criteriaPart->getDirection()));
+                throw new RuntimeException(\sprintf('Provided release date direction %s not supported', $criteriaPart->getDirection()));
         }
     }
 }
diff --git a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/SalesConditionHandler.php b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/SalesConditionHandler.php
index 28d1b7ef5ea..7ce47e21a96 100644
--- a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/SalesConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/SalesConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/SearchTermConditionHandler.php b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/SearchTermConditionHandler.php
index 28339759b1f..23f0729f0d8 100644
--- a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/SearchTermConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/SearchTermConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/ShippingFreeConditionHandler.php b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/ShippingFreeConditionHandler.php
index c3c627e1c9b..3df35357791 100644
--- a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/ShippingFreeConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/ShippingFreeConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/SimilarProductConditionHandler.php b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/SimilarProductConditionHandler.php
index 4a33d3202cd..eecab7e7e97 100644
--- a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/SimilarProductConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/SimilarProductConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/VariantConditionHandler.php b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/VariantConditionHandler.php
index 6e267dd66a0..a668f3c9b5e 100644
--- a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/VariantConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/VariantConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/VoteAverageConditionHandler.php b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/VoteAverageConditionHandler.php
index b6c412e6e4d..66a76117ce6 100644
--- a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/VoteAverageConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/VoteAverageConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/WeightConditionHandler.php b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/WeightConditionHandler.php
index fae50480677..2adac3cd535 100644
--- a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/WeightConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/WeightConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/WidthConditionHandler.php b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/WidthConditionHandler.php
index d3e57c903fa..00418ea80e2 100644
--- a/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/WidthConditionHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/ConditionHandler/WidthConditionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\ConditionHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/DependencyInjection/Compiler/ESHandlerCompilerPass.php b/engine/Shopware/Bundle/SearchBundleES/DependencyInjection/Compiler/ESHandlerCompilerPass.php
index da5727d1bdc..92c9394f3f4 100644
--- a/engine/Shopware/Bundle/SearchBundleES/DependencyInjection/Compiler/ESHandlerCompilerPass.php
+++ b/engine/Shopware/Bundle/SearchBundleES/DependencyInjection/Compiler/ESHandlerCompilerPass.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\DependencyInjection\Compiler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/FacetHandler/CategoryFacetHandler.php b/engine/Shopware/Bundle/SearchBundleES/FacetHandler/CategoryFacetHandler.php
index bdb0923bcba..2322ef10d4a 100644
--- a/engine/Shopware/Bundle/SearchBundleES/FacetHandler/CategoryFacetHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/FacetHandler/CategoryFacetHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\FacetHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/FacetHandler/CombinedConditionFacetHandler.php b/engine/Shopware/Bundle/SearchBundleES/FacetHandler/CombinedConditionFacetHandler.php
index 33620851bcc..33a1f526a48 100644
--- a/engine/Shopware/Bundle/SearchBundleES/FacetHandler/CombinedConditionFacetHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/FacetHandler/CombinedConditionFacetHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\FacetHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/FacetHandler/ImmediateDeliveryFacetHandler.php b/engine/Shopware/Bundle/SearchBundleES/FacetHandler/ImmediateDeliveryFacetHandler.php
index fdac76e9d7e..310d3da8ebc 100644
--- a/engine/Shopware/Bundle/SearchBundleES/FacetHandler/ImmediateDeliveryFacetHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/FacetHandler/ImmediateDeliveryFacetHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\FacetHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/FacetHandler/ManufacturerFacetHandler.php b/engine/Shopware/Bundle/SearchBundleES/FacetHandler/ManufacturerFacetHandler.php
index 93b8bcd5aab..d1e8fb329c2 100644
--- a/engine/Shopware/Bundle/SearchBundleES/FacetHandler/ManufacturerFacetHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/FacetHandler/ManufacturerFacetHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\FacetHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/FacetHandler/PriceFacetHandler.php b/engine/Shopware/Bundle/SearchBundleES/FacetHandler/PriceFacetHandler.php
index 0b5ebd66055..5aee9c933c2 100644
--- a/engine/Shopware/Bundle/SearchBundleES/FacetHandler/PriceFacetHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/FacetHandler/PriceFacetHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\FacetHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/FacetHandler/ProductAttributeFacetHandler.php b/engine/Shopware/Bundle/SearchBundleES/FacetHandler/ProductAttributeFacetHandler.php
index 8f9d5334820..80476f82964 100644
--- a/engine/Shopware/Bundle/SearchBundleES/FacetHandler/ProductAttributeFacetHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/FacetHandler/ProductAttributeFacetHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\FacetHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/FacetHandler/ProductDimensionsFacetHandler.php b/engine/Shopware/Bundle/SearchBundleES/FacetHandler/ProductDimensionsFacetHandler.php
index e0ca31a2b57..a6ee6a6d99f 100644
--- a/engine/Shopware/Bundle/SearchBundleES/FacetHandler/ProductDimensionsFacetHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/FacetHandler/ProductDimensionsFacetHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\FacetHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/FacetHandler/PropertyFacetHandler.php b/engine/Shopware/Bundle/SearchBundleES/FacetHandler/PropertyFacetHandler.php
index 388f2d7f24c..923693f3439 100644
--- a/engine/Shopware/Bundle/SearchBundleES/FacetHandler/PropertyFacetHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/FacetHandler/PropertyFacetHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\FacetHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/FacetHandler/ShippingFreeFacetHandler.php b/engine/Shopware/Bundle/SearchBundleES/FacetHandler/ShippingFreeFacetHandler.php
index de277e24bdd..2bf91a5fcb8 100644
--- a/engine/Shopware/Bundle/SearchBundleES/FacetHandler/ShippingFreeFacetHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/FacetHandler/ShippingFreeFacetHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\FacetHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/FacetHandler/VariantFacetHandler.php b/engine/Shopware/Bundle/SearchBundleES/FacetHandler/VariantFacetHandler.php
index 2de2e0891c9..4628957f7ae 100644
--- a/engine/Shopware/Bundle/SearchBundleES/FacetHandler/VariantFacetHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/FacetHandler/VariantFacetHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\FacetHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/FacetHandler/VoteAverageFacetHandler.php b/engine/Shopware/Bundle/SearchBundleES/FacetHandler/VoteAverageFacetHandler.php
index 4f692fae092..754b52d7038 100644
--- a/engine/Shopware/Bundle/SearchBundleES/FacetHandler/VoteAverageFacetHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/FacetHandler/VoteAverageFacetHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\FacetHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/HandlerInterface.php b/engine/Shopware/Bundle/SearchBundleES/HandlerInterface.php
index 868e767e89f..bce4f17b662 100644
--- a/engine/Shopware/Bundle/SearchBundleES/HandlerInterface.php
+++ b/engine/Shopware/Bundle/SearchBundleES/HandlerInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES;
diff --git a/engine/Shopware/Bundle/SearchBundleES/HandlerRegistry.php b/engine/Shopware/Bundle/SearchBundleES/HandlerRegistry.php
index e17a060b4d1..a8355b9b0e4 100644
--- a/engine/Shopware/Bundle/SearchBundleES/HandlerRegistry.php
+++ b/engine/Shopware/Bundle/SearchBundleES/HandlerRegistry.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES;
@@ -59,7 +58,7 @@ public function getHandler(CriteriaPartInterface $condition)
             }
         }
 
-        throw new RuntimeException(sprintf('%s class not supported', \get_class($condition)));
+        throw new RuntimeException(\sprintf('%s class not supported', \get_class($condition)));
     }
 
     /**
diff --git a/engine/Shopware/Bundle/SearchBundleES/PartialConditionHandlerInterface.php b/engine/Shopware/Bundle/SearchBundleES/PartialConditionHandlerInterface.php
index fa3b84f2d9e..5ca60e6161c 100644
--- a/engine/Shopware/Bundle/SearchBundleES/PartialConditionHandlerInterface.php
+++ b/engine/Shopware/Bundle/SearchBundleES/PartialConditionHandlerInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES;
diff --git a/engine/Shopware/Bundle/SearchBundleES/PriceFieldMapper.php b/engine/Shopware/Bundle/SearchBundleES/PriceFieldMapper.php
index b2497a14ffc..8e3b9e35980 100644
--- a/engine/Shopware/Bundle/SearchBundleES/PriceFieldMapper.php
+++ b/engine/Shopware/Bundle/SearchBundleES/PriceFieldMapper.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES;
diff --git a/engine/Shopware/Bundle/SearchBundleES/ProductNumberSearch.php b/engine/Shopware/Bundle/SearchBundleES/ProductNumberSearch.php
index 336acd624f4..b768531a2b3 100644
--- a/engine/Shopware/Bundle/SearchBundleES/ProductNumberSearch.php
+++ b/engine/Shopware/Bundle/SearchBundleES/ProductNumberSearch.php
@@ -4,23 +4,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES;
@@ -152,7 +151,7 @@ private function addCriteriaParts(
     /**
      * @param array[] $data
      *
-     * @return \Shopware\Bundle\StoreFrontBundle\Struct\BaseProduct[]
+     * @return BaseProduct[]
      */
     private function createProducts(array $data): array
     {
@@ -191,7 +190,7 @@ private function addConditions(
             if ($handler instanceof PartialConditionHandlerInterface) {
                 $handler->handleFilter($condition, $criteria, $search, $context);
             } else {
-                trigger_error(sprintf("Condition handler %s doesn't support new filter mode. Class has to implement \\Shopware\\Bundle\\SearchBundleES\\PartialConditionHandlerInterface.", \get_class($handler)), E_USER_DEPRECATED);
+                trigger_error(\sprintf("Condition handler %s doesn't support new filter mode. Class has to implement \\Shopware\\Bundle\\SearchBundleES\\PartialConditionHandlerInterface.", \get_class($handler)), E_USER_DEPRECATED);
                 $handler->handle($condition, $criteria, $search, $context);
             }
         }
@@ -201,12 +200,12 @@ private function addConditions(
 
             // Trigger error when new interface isn't implemented
             if (!$handler instanceof PartialConditionHandlerInterface) {
-                trigger_error(sprintf('Condition handler "%s" doesn\'t support new filter mode. Class has to implement "%s".', \get_class($handler), PartialConditionHandlerInterface::class), E_USER_DEPRECATED);
+                trigger_error(\sprintf('Condition handler "%s" doesn\'t support new filter mode. Class has to implement "%s".', \get_class($handler), PartialConditionHandlerInterface::class), E_USER_DEPRECATED);
             }
 
             // Filter mode active and handler doesn't supports the filter mode?
             if (!$handler instanceof PartialConditionHandlerInterface && $criteria->generatePartialFacets()) {
-                throw new Exception(sprintf('New filter mode activated, handler class %s doesn\'t support this mode', \get_class($handler)));
+                throw new Exception(\sprintf('New filter mode activated, handler class %s doesn\'t support this mode', \get_class($handler)));
             }
 
             // Filter mode active and handler supports new filter mode?
diff --git a/engine/Shopware/Bundle/SearchBundleES/ResultHydratorInterface.php b/engine/Shopware/Bundle/SearchBundleES/ResultHydratorInterface.php
index d5196f59c85..dd06d0451f8 100644
--- a/engine/Shopware/Bundle/SearchBundleES/ResultHydratorInterface.php
+++ b/engine/Shopware/Bundle/SearchBundleES/ResultHydratorInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES;
diff --git a/engine/Shopware/Bundle/SearchBundleES/SearchBundleES.php b/engine/Shopware/Bundle/SearchBundleES/SearchBundleES.php
index de7e2c002ca..3e66de62519 100644
--- a/engine/Shopware/Bundle/SearchBundleES/SearchBundleES.php
+++ b/engine/Shopware/Bundle/SearchBundleES/SearchBundleES.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES;
diff --git a/engine/Shopware/Bundle/SearchBundleES/SearchTermQueryBuilder.php b/engine/Shopware/Bundle/SearchBundleES/SearchTermQueryBuilder.php
index c843d635a74..2705a385dd1 100644
--- a/engine/Shopware/Bundle/SearchBundleES/SearchTermQueryBuilder.php
+++ b/engine/Shopware/Bundle/SearchBundleES/SearchTermQueryBuilder.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES;
diff --git a/engine/Shopware/Bundle/SearchBundleES/SearchTermQueryBuilderInterface.php b/engine/Shopware/Bundle/SearchBundleES/SearchTermQueryBuilderInterface.php
index f44b3eb74d1..fb0ed4839e5 100644
--- a/engine/Shopware/Bundle/SearchBundleES/SearchTermQueryBuilderInterface.php
+++ b/engine/Shopware/Bundle/SearchBundleES/SearchTermQueryBuilderInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES;
diff --git a/engine/Shopware/Bundle/SearchBundleES/SortingHandler/ManualSortingHandler.php b/engine/Shopware/Bundle/SearchBundleES/SortingHandler/ManualSortingHandler.php
index af0b09db58a..6c33174e5ee 100644
--- a/engine/Shopware/Bundle/SearchBundleES/SortingHandler/ManualSortingHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/SortingHandler/ManualSortingHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\SortingHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/SortingHandler/PopularitySortingHandler.php b/engine/Shopware/Bundle/SearchBundleES/SortingHandler/PopularitySortingHandler.php
index 143816b1073..61ca2517480 100644
--- a/engine/Shopware/Bundle/SearchBundleES/SortingHandler/PopularitySortingHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/SortingHandler/PopularitySortingHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\SortingHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/SortingHandler/PriceSortingHandler.php b/engine/Shopware/Bundle/SearchBundleES/SortingHandler/PriceSortingHandler.php
index feeedcd11d2..f1f5401f915 100644
--- a/engine/Shopware/Bundle/SearchBundleES/SortingHandler/PriceSortingHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/SortingHandler/PriceSortingHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\SortingHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/SortingHandler/ProductAttributeSortingHandler.php b/engine/Shopware/Bundle/SearchBundleES/SortingHandler/ProductAttributeSortingHandler.php
index c357b43d498..846d9a0d7e6 100644
--- a/engine/Shopware/Bundle/SearchBundleES/SortingHandler/ProductAttributeSortingHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/SortingHandler/ProductAttributeSortingHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\SortingHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/SortingHandler/ProductNameSortingHandler.php b/engine/Shopware/Bundle/SearchBundleES/SortingHandler/ProductNameSortingHandler.php
index 4a1fbdb3db3..a4febd9aa4e 100644
--- a/engine/Shopware/Bundle/SearchBundleES/SortingHandler/ProductNameSortingHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/SortingHandler/ProductNameSortingHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\SortingHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/SortingHandler/ProductNumberSortingHandler.php b/engine/Shopware/Bundle/SearchBundleES/SortingHandler/ProductNumberSortingHandler.php
index bbb8f6b9b6f..ab54acb1986 100644
--- a/engine/Shopware/Bundle/SearchBundleES/SortingHandler/ProductNumberSortingHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/SortingHandler/ProductNumberSortingHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\SortingHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/SortingHandler/ProductStockSortingHandler.php b/engine/Shopware/Bundle/SearchBundleES/SortingHandler/ProductStockSortingHandler.php
index fd02084d03d..449f5531a72 100644
--- a/engine/Shopware/Bundle/SearchBundleES/SortingHandler/ProductStockSortingHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/SortingHandler/ProductStockSortingHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\SortingHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/SortingHandler/RandomSortingHandler.php b/engine/Shopware/Bundle/SearchBundleES/SortingHandler/RandomSortingHandler.php
index 0202b5d7e31..1b58a6fe8dd 100644
--- a/engine/Shopware/Bundle/SearchBundleES/SortingHandler/RandomSortingHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/SortingHandler/RandomSortingHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\SortingHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/SortingHandler/ReleaseDateSortingHandler.php b/engine/Shopware/Bundle/SearchBundleES/SortingHandler/ReleaseDateSortingHandler.php
index 7203e82b7ff..de693c052b7 100644
--- a/engine/Shopware/Bundle/SearchBundleES/SortingHandler/ReleaseDateSortingHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/SortingHandler/ReleaseDateSortingHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\SortingHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/SortingHandler/SearchRankingSortingHandler.php b/engine/Shopware/Bundle/SearchBundleES/SortingHandler/SearchRankingSortingHandler.php
index 229c0b21eeb..fcbc2591dc3 100644
--- a/engine/Shopware/Bundle/SearchBundleES/SortingHandler/SearchRankingSortingHandler.php
+++ b/engine/Shopware/Bundle/SearchBundleES/SortingHandler/SearchRankingSortingHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\SortingHandler;
diff --git a/engine/Shopware/Bundle/SearchBundleES/StructHydrator.php b/engine/Shopware/Bundle/SearchBundleES/StructHydrator.php
index 3245c5a4524..407188504ce 100644
--- a/engine/Shopware/Bundle/SearchBundleES/StructHydrator.php
+++ b/engine/Shopware/Bundle/SearchBundleES/StructHydrator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES;
@@ -65,7 +65,7 @@ public function createPropertyOption($data)
         $option = new PropertyOption();
         $option->setId($data['id']);
         $option->setName($data['name']);
-        $option->setPosition($data['position']);
+        $option->setPosition((int) $data['position']);
 
         if ($data['media']) {
             $option->setMedia($this->createMedia($data['media']));
diff --git a/engine/Shopware/Bundle/SearchBundleES/Subscriber/ServiceSubscriber.php b/engine/Shopware/Bundle/SearchBundleES/Subscriber/ServiceSubscriber.php
index a602f95bbd0..697eafbb8f6 100644
--- a/engine/Shopware/Bundle/SearchBundleES/Subscriber/ServiceSubscriber.php
+++ b/engine/Shopware/Bundle/SearchBundleES/Subscriber/ServiceSubscriber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES\Subscriber;
diff --git a/engine/Shopware/Bundle/SearchBundleES/VariantSearch.php b/engine/Shopware/Bundle/SearchBundleES/VariantSearch.php
index f13087ee1b8..9bbf346f8ad 100644
--- a/engine/Shopware/Bundle/SearchBundleES/VariantSearch.php
+++ b/engine/Shopware/Bundle/SearchBundleES/VariantSearch.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SearchBundleES;
diff --git a/engine/Shopware/Bundle/SitemapBundle/Commands/SitemapGenerateCommand.php b/engine/Shopware/Bundle/SitemapBundle/Commands/SitemapGenerateCommand.php
index 9f71891539a..a485a9529d1 100644
--- a/engine/Shopware/Bundle/SitemapBundle/Commands/SitemapGenerateCommand.php
+++ b/engine/Shopware/Bundle/SitemapBundle/Commands/SitemapGenerateCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\Commands;
@@ -85,7 +85,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $sitemapExporter = $this->container->get(SitemapExporter::class);
         foreach ($shops as $shop) {
-            $output->writeln(sprintf('Generating sitemaps for shop #%d (%s)...', $shop->getId(), $shop->getName()));
+            $output->writeln(\sprintf('Generating sitemaps for shop #%d (%s)...', $shop->getId(), $shop->getName()));
 
             if ($input->getOption('force')) {
                 $this->container
@@ -96,7 +96,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             try {
                 $sitemapExporter->generate($shop);
             } catch (AlreadyLockedException $exception) {
-                $output->writeln(sprintf('ERROR: %s', $exception->getMessage()));
+                $output->writeln(\sprintf('ERROR: %s', $exception->getMessage()));
             }
         }
 
diff --git a/engine/Shopware/Bundle/SitemapBundle/ConfigHandler/ConfigHandlerInterface.php b/engine/Shopware/Bundle/SitemapBundle/ConfigHandler/ConfigHandlerInterface.php
index 45e4affd51f..5c734875eff 100644
--- a/engine/Shopware/Bundle/SitemapBundle/ConfigHandler/ConfigHandlerInterface.php
+++ b/engine/Shopware/Bundle/SitemapBundle/ConfigHandler/ConfigHandlerInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\ConfigHandler;
diff --git a/engine/Shopware/Bundle/SitemapBundle/ConfigHandler/Database.php b/engine/Shopware/Bundle/SitemapBundle/ConfigHandler/Database.php
index 577ccf358ed..5687a9897c5 100644
--- a/engine/Shopware/Bundle/SitemapBundle/ConfigHandler/Database.php
+++ b/engine/Shopware/Bundle/SitemapBundle/ConfigHandler/Database.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\ConfigHandler;
diff --git a/engine/Shopware/Bundle/SitemapBundle/ConfigHandler/File.php b/engine/Shopware/Bundle/SitemapBundle/ConfigHandler/File.php
index 017e1e8f116..dbb2acef0bb 100644
--- a/engine/Shopware/Bundle/SitemapBundle/ConfigHandler/File.php
+++ b/engine/Shopware/Bundle/SitemapBundle/ConfigHandler/File.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\ConfigHandler;
diff --git a/engine/Shopware/Bundle/SitemapBundle/Controller/Frontend/SitemapIndexXml.php b/engine/Shopware/Bundle/SitemapBundle/Controller/Frontend/SitemapIndexXml.php
index 4a555289489..fff8cc2072a 100644
--- a/engine/Shopware/Bundle/SitemapBundle/Controller/Frontend/SitemapIndexXml.php
+++ b/engine/Shopware/Bundle/SitemapBundle/Controller/Frontend/SitemapIndexXml.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\Controller;
diff --git a/engine/Shopware/Bundle/SitemapBundle/DependencyInjection/SitemapCompilerPass.php b/engine/Shopware/Bundle/SitemapBundle/DependencyInjection/SitemapCompilerPass.php
index 96f074b863d..575b331f990 100644
--- a/engine/Shopware/Bundle/SitemapBundle/DependencyInjection/SitemapCompilerPass.php
+++ b/engine/Shopware/Bundle/SitemapBundle/DependencyInjection/SitemapCompilerPass.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\DependencyInjection;
diff --git a/engine/Shopware/Bundle/SitemapBundle/Exception/AlreadyLockedException.php b/engine/Shopware/Bundle/SitemapBundle/Exception/AlreadyLockedException.php
index 6686f4352ab..32254f82ad9 100644
--- a/engine/Shopware/Bundle/SitemapBundle/Exception/AlreadyLockedException.php
+++ b/engine/Shopware/Bundle/SitemapBundle/Exception/AlreadyLockedException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\Exception;
diff --git a/engine/Shopware/Bundle/SitemapBundle/Exception/UnknownFileException.php b/engine/Shopware/Bundle/SitemapBundle/Exception/UnknownFileException.php
index 86c28510a8f..baaff8d1c51 100644
--- a/engine/Shopware/Bundle/SitemapBundle/Exception/UnknownFileException.php
+++ b/engine/Shopware/Bundle/SitemapBundle/Exception/UnknownFileException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\Exception;
diff --git a/engine/Shopware/Bundle/SitemapBundle/Provider/BaseUrlProvider.php b/engine/Shopware/Bundle/SitemapBundle/Provider/BaseUrlProvider.php
index 096bac7dc63..55f9d79ab17 100644
--- a/engine/Shopware/Bundle/SitemapBundle/Provider/BaseUrlProvider.php
+++ b/engine/Shopware/Bundle/SitemapBundle/Provider/BaseUrlProvider.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\Provider;
diff --git a/engine/Shopware/Bundle/SitemapBundle/Provider/BlogUrlProvider.php b/engine/Shopware/Bundle/SitemapBundle/Provider/BlogUrlProvider.php
index a088eb36aa8..506cad80e44 100644
--- a/engine/Shopware/Bundle/SitemapBundle/Provider/BlogUrlProvider.php
+++ b/engine/Shopware/Bundle/SitemapBundle/Provider/BlogUrlProvider.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\Provider;
diff --git a/engine/Shopware/Bundle/SitemapBundle/Provider/CategoryUrlProvider.php b/engine/Shopware/Bundle/SitemapBundle/Provider/CategoryUrlProvider.php
index f2835a01234..c630e47fbc0 100644
--- a/engine/Shopware/Bundle/SitemapBundle/Provider/CategoryUrlProvider.php
+++ b/engine/Shopware/Bundle/SitemapBundle/Provider/CategoryUrlProvider.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\Provider;
diff --git a/engine/Shopware/Bundle/SitemapBundle/Provider/CustomUrlProvider.php b/engine/Shopware/Bundle/SitemapBundle/Provider/CustomUrlProvider.php
index 7c56f72a425..1340a81282a 100644
--- a/engine/Shopware/Bundle/SitemapBundle/Provider/CustomUrlProvider.php
+++ b/engine/Shopware/Bundle/SitemapBundle/Provider/CustomUrlProvider.php
@@ -1,29 +1,30 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\Provider;
 
+use DateTimeImmutable;
 use Shopware\Bundle\SitemapBundle\Service\ConfigHandler;
 use Shopware\Bundle\SitemapBundle\Struct\Url;
 use Shopware\Bundle\SitemapBundle\UrlProviderInterface;
@@ -60,7 +61,7 @@ public function getUrls(Context $routingContext, ShopContextInterface $shopConte
 
             $urls[] = new Url(
                 $sitemapCustomUrl['url'],
-                $sitemapCustomUrl['lastMod'],
+                new DateTimeImmutable($sitemapCustomUrl['lastMod']),
                 $sitemapCustomUrl['changeFreq'],
                 'custom',
                 null,
diff --git a/engine/Shopware/Bundle/SitemapBundle/Provider/LandingPageUrlProvider.php b/engine/Shopware/Bundle/SitemapBundle/Provider/LandingPageUrlProvider.php
index 1fcabddb05c..a332a4bfc9a 100644
--- a/engine/Shopware/Bundle/SitemapBundle/Provider/LandingPageUrlProvider.php
+++ b/engine/Shopware/Bundle/SitemapBundle/Provider/LandingPageUrlProvider.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\Provider;
diff --git a/engine/Shopware/Bundle/SitemapBundle/Provider/ManufacturerUrlProvider.php b/engine/Shopware/Bundle/SitemapBundle/Provider/ManufacturerUrlProvider.php
index d9e490a0dd9..fdca1b4396f 100644
--- a/engine/Shopware/Bundle/SitemapBundle/Provider/ManufacturerUrlProvider.php
+++ b/engine/Shopware/Bundle/SitemapBundle/Provider/ManufacturerUrlProvider.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\Provider;
diff --git a/engine/Shopware/Bundle/SitemapBundle/Provider/ProductUrlProvider.php b/engine/Shopware/Bundle/SitemapBundle/Provider/ProductUrlProvider.php
index 55bfacea16f..e3030b9de04 100644
--- a/engine/Shopware/Bundle/SitemapBundle/Provider/ProductUrlProvider.php
+++ b/engine/Shopware/Bundle/SitemapBundle/Provider/ProductUrlProvider.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\Provider;
diff --git a/engine/Shopware/Bundle/SitemapBundle/Provider/StaticUrlProvider.php b/engine/Shopware/Bundle/SitemapBundle/Provider/StaticUrlProvider.php
index 53f375234e8..fb7de324ae2 100644
--- a/engine/Shopware/Bundle/SitemapBundle/Provider/StaticUrlProvider.php
+++ b/engine/Shopware/Bundle/SitemapBundle/Provider/StaticUrlProvider.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\Provider;
@@ -27,6 +27,7 @@
 use DateTime;
 use Doctrine\DBAL\Driver\Connection as ConnectionInterface;
 use PDO;
+use Shopware\Bundle\SitemapBundle\Service\LinkFilter;
 use Shopware\Bundle\SitemapBundle\Struct\Url;
 use Shopware\Bundle\SitemapBundle\UrlProviderInterface;
 use Shopware\Bundle\StoreFrontBundle\Struct\ShopContextInterface;
@@ -66,7 +67,7 @@ public function getUrls(Context $routingContext, ShopContextInterface $shopConte
                 'sCustom' => $site['id'],
             ];
 
-            if (!$this->filterLink($site['link'], $site['urlParams'])) {
+            if (!LinkFilter::filterLink($site['link'], $site['urlParams'])) {
                 unset($sites[$key]);
                 continue;
             }
@@ -151,25 +152,4 @@ private function getSitesByShopId(int $shopId): array
 
         return array_values($sites);
     }
-
-    /**
-     * Helper function to filter predefined links, which should not be in the sitemap (external links, sitemap links itself)
-     * Returns false, if the link is not allowed
-     *
-     * @param array<string, mixed> $userParams
-     */
-    private function filterLink(?string $link, array &$userParams): bool
-    {
-        if (empty($link)) {
-            return true;
-        }
-        $parsedUserParams = (string) parse_url($link, PHP_URL_QUERY);
-        parse_str($parsedUserParams, $userParams);
-        $blacklist = ['', 'sitemap', 'sitemapXml'];
-        if (\in_array($userParams['sViewport'], $blacklist, true)) {
-            return false;
-        }
-
-        return true;
-    }
 }
diff --git a/engine/Shopware/Bundle/SitemapBundle/Service/ConfigHandler.php b/engine/Shopware/Bundle/SitemapBundle/Service/ConfigHandler.php
index 051259d0ad3..1f5f6bf7ed3 100644
--- a/engine/Shopware/Bundle/SitemapBundle/Service/ConfigHandler.php
+++ b/engine/Shopware/Bundle/SitemapBundle/Service/ConfigHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\Service;
@@ -67,7 +67,7 @@ public function get($key)
             return $customUrls;
         }
 
-        throw new RuntimeException(sprintf("Invalid sitemap config key: '%s'", $key));
+        throw new RuntimeException(\sprintf("Invalid sitemap config key: '%s'", $key));
     }
 
     public function save(array $config): void
diff --git a/engine/Shopware/Bundle/SitemapBundle/Service/FilterContainerFactory.php b/engine/Shopware/Bundle/SitemapBundle/Service/FilterContainerFactory.php
index 5f61438b318..82c5e8c7e93 100644
--- a/engine/Shopware/Bundle/SitemapBundle/Service/FilterContainerFactory.php
+++ b/engine/Shopware/Bundle/SitemapBundle/Service/FilterContainerFactory.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\Service;
diff --git a/engine/Shopware/Bundle/SitemapBundle/Service/LinkFilter.php b/engine/Shopware/Bundle/SitemapBundle/Service/LinkFilter.php
new file mode 100644
index 00000000000..5d168e5e99c
--- /dev/null
+++ b/engine/Shopware/Bundle/SitemapBundle/Service/LinkFilter.php
@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Bundle\SitemapBundle\Service;
+
+class LinkFilter
+{
+    /**
+     * Helper function to filter predefined links, which should not be in the sitemap (external links, sitemap links itself)
+     * Returns false, if the link is not allowed
+     *
+     * @param array<string, mixed> $userParams
+     *
+     * @param-out array<int|string, array|string> $userParams
+     */
+    public static function filterLink(?string $link, array &$userParams = []): bool
+    {
+        if (empty($link)) {
+            return true;
+        }
+        $parsedUserParams = (string) parse_url($link, PHP_URL_QUERY);
+        parse_str($parsedUserParams, $userParams);
+        $blacklist = ['', 'sitemap', 'sitemapXml'];
+        if (\in_array($userParams['sViewport'] ?? [], $blacklist, true)) {
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/engine/Shopware/Bundle/SitemapBundle/Service/SitemapExporter.php b/engine/Shopware/Bundle/SitemapBundle/Service/SitemapExporter.php
index 1060c6e133c..3c2617ffcfc 100644
--- a/engine/Shopware/Bundle/SitemapBundle/Service/SitemapExporter.php
+++ b/engine/Shopware/Bundle/SitemapBundle/Service/SitemapExporter.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\Service;
@@ -101,7 +101,7 @@ public function __construct(
     public function generate(Shop $shop)
     {
         if (!$this->sitemapLock->doLock($shop, $this->shopwareConfig->get('sitemapRefreshTime'))) {
-            throw new AlreadyLockedException(sprintf('Cannot acquire lock for shop %d', $shop->getId()));
+            throw new AlreadyLockedException(\sprintf('Cannot acquire lock for shop %d', $shop->getId()));
         }
 
         $routerContext = Context::createFromShop($shop, $this->shopwareConfig);
diff --git a/engine/Shopware/Bundle/SitemapBundle/Service/SitemapLister.php b/engine/Shopware/Bundle/SitemapBundle/Service/SitemapLister.php
index 127871a9e46..afd7888b016 100644
--- a/engine/Shopware/Bundle/SitemapBundle/Service/SitemapLister.php
+++ b/engine/Shopware/Bundle/SitemapBundle/Service/SitemapLister.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\Service;
diff --git a/engine/Shopware/Bundle/SitemapBundle/Service/SitemapLock.php b/engine/Shopware/Bundle/SitemapBundle/Service/SitemapLock.php
index 3a66e5a44b9..e014ef82302 100644
--- a/engine/Shopware/Bundle/SitemapBundle/Service/SitemapLock.php
+++ b/engine/Shopware/Bundle/SitemapBundle/Service/SitemapLock.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\Service;
@@ -62,7 +62,7 @@ public function doLock(Shop $shop, $lifeTime = 3600)
             return false;
         }
 
-        $data = sprintf('Locked: %s', (new DateTime('NOW', new DateTimeZone('UTC')))->format(DateTime::ATOM));
+        $data = \sprintf('Locked: %s', (new DateTime('NOW', new DateTimeZone('UTC')))->format(DateTime::ATOM));
 
         $this->cache->save($this->generateCacheKeyForShop($shop), $data, $lifeTime);
 
@@ -94,6 +94,6 @@ public function isLocked(Shop $shop)
      */
     private function generateCacheKeyForShop(Shop $shop)
     {
-        return sprintf($this->cacheKey, $shop->getId());
+        return \sprintf($this->cacheKey, $shop->getId());
     }
 }
diff --git a/engine/Shopware/Bundle/SitemapBundle/Service/SitemapNameGenerator.php b/engine/Shopware/Bundle/SitemapBundle/Service/SitemapNameGenerator.php
index 0d869e52c8e..fc7110a6a4c 100644
--- a/engine/Shopware/Bundle/SitemapBundle/Service/SitemapNameGenerator.php
+++ b/engine/Shopware/Bundle/SitemapBundle/Service/SitemapNameGenerator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\Service;
diff --git a/engine/Shopware/Bundle/SitemapBundle/Service/SitemapWriter.php b/engine/Shopware/Bundle/SitemapBundle/Service/SitemapWriter.php
index 873d79b7ce5..5f17e36def2 100644
--- a/engine/Shopware/Bundle/SitemapBundle/Service/SitemapWriter.php
+++ b/engine/Shopware/Bundle/SitemapBundle/Service/SitemapWriter.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\Service;
@@ -63,7 +63,7 @@ class SitemapWriter implements SitemapWriterInterface
     public function __construct(
         SitemapNameGenerator $sitemapNameGenerator,
         FilesystemInterface $filesystem,
-        LoggerInterface $logger = null
+        ?LoggerInterface $logger = null
     ) {
         $this->sitemapNameGenerator = $sitemapNameGenerator;
         $this->filesystem = $filesystem;
@@ -123,7 +123,7 @@ public function closeFiles()
     private function closeFile($shopId)
     {
         if (!\array_key_exists($shopId, $this->files)) {
-            throw new UnknownFileException(sprintf('No open file "%s"', $shopId));
+            throw new UnknownFileException(\sprintf('No open file "%s"', $shopId));
         }
 
         $fileHandle = $this->files[$shopId]['fileHandle'];
@@ -156,7 +156,7 @@ private function openFile($shopId)
             return true;
         }
 
-        $filePath = sprintf(
+        $filePath = \sprintf(
             '%s/sitemap-shop-%d-%s.xml.gz',
             rtrim(sys_get_temp_dir(), '/'),
             $shopId,
@@ -166,7 +166,7 @@ private function openFile($shopId)
         $fileHandler = gzopen($filePath, 'wb');
 
         if (!$fileHandler) {
-            $this->logger->error(sprintf('Could not generate sitemap file, unable to write to "%s"', $filePath));
+            $this->logger->error(\sprintf('Could not generate sitemap file, unable to write to "%s"', $filePath));
 
             return false;
         }
@@ -200,7 +200,7 @@ private function moveFiles()
         /** @var Sitemap[] $sitemaps */
         foreach ($this->sitemaps as $shopId => $sitemaps) {
             // Delete old sitemaps for this siteId
-            foreach ($this->filesystem->listContents(sprintf('shop-%d', $shopId)) as $file) {
+            foreach ($this->filesystem->listContents(\sprintf('shop-%d', $shopId)) as $file) {
                 $this->filesystem->delete($file['path']);
             }
 
@@ -210,7 +210,7 @@ private function moveFiles()
                 try {
                     $this->filesystem->write($sitemapFileName, file_get_contents($sitemap->getFilename()));
                 } catch (\League\Flysystem\Exception $exception) {
-                    $this->logger->error(sprintf('Could not move sitemap to "%s" in the location for sitemaps', $sitemapFileName));
+                    $this->logger->error(\sprintf('Could not move sitemap to "%s" in the location for sitemaps', $sitemapFileName));
                 } finally {
                     // If we could not move the file to it's target, we remove it here to not clutter tmp dir
                     unlink($sitemap->getFilename());
diff --git a/engine/Shopware/Bundle/SitemapBundle/Service/UrlFilter.php b/engine/Shopware/Bundle/SitemapBundle/Service/UrlFilter.php
index d1db3ac0808..e90a5f54814 100644
--- a/engine/Shopware/Bundle/SitemapBundle/Service/UrlFilter.php
+++ b/engine/Shopware/Bundle/SitemapBundle/Service/UrlFilter.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\Service;
@@ -78,7 +78,7 @@ public function filter(array $urls, $shopId)
             $filterHandler = $this->getFilterHandler($url->getResource());
 
             if (!$filterHandler) {
-                throw new UrlFilterException(sprintf('No handler known for resource \'%s\'.', $url->getResource()));
+                throw new UrlFilterException(\sprintf('No handler known for resource \'%s\'.', $url->getResource()));
             }
 
             if ($filterHandler->isFiltered($url->getIdentifier(), $filters)) {
diff --git a/engine/Shopware/Bundle/SitemapBundle/SitemapBundle.php b/engine/Shopware/Bundle/SitemapBundle/SitemapBundle.php
index 9a50ed7a163..0f9a700a561 100644
--- a/engine/Shopware/Bundle/SitemapBundle/SitemapBundle.php
+++ b/engine/Shopware/Bundle/SitemapBundle/SitemapBundle.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle;
diff --git a/engine/Shopware/Bundle/SitemapBundle/SitemapExporterInterface.php b/engine/Shopware/Bundle/SitemapBundle/SitemapExporterInterface.php
index df2f0101c9a..1f4f1d0240d 100644
--- a/engine/Shopware/Bundle/SitemapBundle/SitemapExporterInterface.php
+++ b/engine/Shopware/Bundle/SitemapBundle/SitemapExporterInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle;
@@ -32,5 +32,8 @@ interface SitemapExporterInterface
     public const STRATEGY_CRON = 2;
     public const STRATEGY_LIVE = 3;
 
+    /**
+     * @return void
+     */
     public function generate(Shop $shop);
 }
diff --git a/engine/Shopware/Bundle/SitemapBundle/SitemapListerInterface.php b/engine/Shopware/Bundle/SitemapBundle/SitemapListerInterface.php
index bec680a6343..7ef50bb54f0 100644
--- a/engine/Shopware/Bundle/SitemapBundle/SitemapListerInterface.php
+++ b/engine/Shopware/Bundle/SitemapBundle/SitemapListerInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle;
diff --git a/engine/Shopware/Bundle/SitemapBundle/SitemapLockInterface.php b/engine/Shopware/Bundle/SitemapBundle/SitemapLockInterface.php
index 412d8fef787..9a998325ffb 100644
--- a/engine/Shopware/Bundle/SitemapBundle/SitemapLockInterface.php
+++ b/engine/Shopware/Bundle/SitemapBundle/SitemapLockInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle;
diff --git a/engine/Shopware/Bundle/SitemapBundle/SitemapNameGeneratorInterface.php b/engine/Shopware/Bundle/SitemapBundle/SitemapNameGeneratorInterface.php
index 2f2a4efa1c5..bafb0a73c24 100644
--- a/engine/Shopware/Bundle/SitemapBundle/SitemapNameGeneratorInterface.php
+++ b/engine/Shopware/Bundle/SitemapBundle/SitemapNameGeneratorInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle;
diff --git a/engine/Shopware/Bundle/SitemapBundle/SitemapWriterInterface.php b/engine/Shopware/Bundle/SitemapBundle/SitemapWriterInterface.php
index 54291bcdc75..535db5e140d 100644
--- a/engine/Shopware/Bundle/SitemapBundle/SitemapWriterInterface.php
+++ b/engine/Shopware/Bundle/SitemapBundle/SitemapWriterInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle;
diff --git a/engine/Shopware/Bundle/SitemapBundle/Struct/FilterContainer.php b/engine/Shopware/Bundle/SitemapBundle/Struct/FilterContainer.php
index badbf1c766a..20b74d76afa 100644
--- a/engine/Shopware/Bundle/SitemapBundle/Struct/FilterContainer.php
+++ b/engine/Shopware/Bundle/SitemapBundle/Struct/FilterContainer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\Struct;
diff --git a/engine/Shopware/Bundle/SitemapBundle/Struct/Sitemap.php b/engine/Shopware/Bundle/SitemapBundle/Struct/Sitemap.php
index 460e131db4c..964379a68cc 100644
--- a/engine/Shopware/Bundle/SitemapBundle/Struct/Sitemap.php
+++ b/engine/Shopware/Bundle/SitemapBundle/Struct/Sitemap.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\Struct;
@@ -49,7 +49,7 @@ class Sitemap
      * @param string $filename
      * @param int    $urlCount
      */
-    public function __construct($filename, $urlCount, DateTimeInterface $created = null)
+    public function __construct($filename, $urlCount, ?DateTimeInterface $created = null)
     {
         $this->filename = $filename;
         $this->created = $created ?: new DateTime('NOW', new DateTimeZone('UTC'));
diff --git a/engine/Shopware/Bundle/SitemapBundle/Struct/Url.php b/engine/Shopware/Bundle/SitemapBundle/Struct/Url.php
index d22ddd655c0..760842be1e5 100644
--- a/engine/Shopware/Bundle/SitemapBundle/Struct/Url.php
+++ b/engine/Shopware/Bundle/SitemapBundle/Struct/Url.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\Struct;
@@ -30,51 +30,29 @@ class Url
 {
     /**
      * The Url
-     *
-     * @var string
      */
-    private $loc;
+    private string $loc;
 
     /**
      * Date and time of last modification
-     *
-     * @var DateTimeInterface
      */
-    private $lastmod;
+    private DateTimeInterface $lastmod;
 
     /**
      * Frequency of changing
-     *
-     * @var string
      */
-    private $changefreq;
+    private string $changefreq;
 
     /**
      * Relative priority for this URL
-     *
-     * @var float
      */
-    private $priority;
+    private float $priority;
 
-    /**
-     * @var string
-     */
-    private $resource;
+    private string $resource;
 
-    /**
-     * @var int
-     */
-    private $identifier;
+    private int $identifier;
 
-    /**
-     * @param string            $loc
-     * @param DateTimeInterface $lastmod
-     * @param string            $changefreq
-     * @param string            $resource
-     * @param int|null          $identifier
-     * @param float             $priority
-     */
-    public function __construct($loc, $lastmod, $changefreq, $resource, $identifier, $priority = 0.5)
+    public function __construct(string $loc, DateTimeInterface $lastmod, string $changefreq, string $resource, ?int $identifier, float $priority = 0.5)
     {
         $this->loc = $loc;
         $this->lastmod = $lastmod;
@@ -89,7 +67,7 @@ public function __construct($loc, $lastmod, $changefreq, $resource, $identifier,
      */
     public function __toString()
     {
-        return sprintf(
+        return \sprintf(
             '<url><loc>%s</loc><lastmod>%s</lastmod><changefreq>%s</changefreq><priority>%.1f</priority></url>',
             $this->getLoc(),
             $this->getLastmod()->format('Y-m-d'),
diff --git a/engine/Shopware/Bundle/SitemapBundle/Subscriber/CronjobSubscriber.php b/engine/Shopware/Bundle/SitemapBundle/Subscriber/CronjobSubscriber.php
index b650c741c82..094ef8f914b 100644
--- a/engine/Shopware/Bundle/SitemapBundle/Subscriber/CronjobSubscriber.php
+++ b/engine/Shopware/Bundle/SitemapBundle/Subscriber/CronjobSubscriber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\Subscriber;
@@ -81,11 +81,11 @@ public function onSitemapGeneration()
 
         /** @var Shop $shop */
         foreach ($this->modelManager->getRepository(Shop::class)->getActiveShopsFixed() as $shop) {
-            $output .= sprintf('Generating sitemaps for shop #%d (%s)...', $shop->getId(), $shop->getName()) . PHP_EOL;
+            $output .= \sprintf('Generating sitemaps for shop #%d (%s)...', $shop->getId(), $shop->getName()) . PHP_EOL;
             try {
                 $this->sitemapExporter->generate($shop);
             } catch (AlreadyLockedException $exception) {
-                $output .= sprintf('ERROR: %s', $exception->getMessage()) . PHP_EOL;
+                $output .= \sprintf('ERROR: %s', $exception->getMessage()) . PHP_EOL;
             }
         }
 
diff --git a/engine/Shopware/Bundle/SitemapBundle/UrlFilter/Base.php b/engine/Shopware/Bundle/SitemapBundle/UrlFilter/Base.php
index 8bc4c71f4cb..922ed4182df 100644
--- a/engine/Shopware/Bundle/SitemapBundle/UrlFilter/Base.php
+++ b/engine/Shopware/Bundle/SitemapBundle/UrlFilter/Base.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\UrlFilter;
diff --git a/engine/Shopware/Bundle/SitemapBundle/UrlFilter/Blog.php b/engine/Shopware/Bundle/SitemapBundle/UrlFilter/Blog.php
index e327f2f1d56..037e64154b5 100644
--- a/engine/Shopware/Bundle/SitemapBundle/UrlFilter/Blog.php
+++ b/engine/Shopware/Bundle/SitemapBundle/UrlFilter/Blog.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\UrlFilter;
diff --git a/engine/Shopware/Bundle/SitemapBundle/UrlFilter/Category.php b/engine/Shopware/Bundle/SitemapBundle/UrlFilter/Category.php
index cbc96d1df5c..80ed41f2f4d 100644
--- a/engine/Shopware/Bundle/SitemapBundle/UrlFilter/Category.php
+++ b/engine/Shopware/Bundle/SitemapBundle/UrlFilter/Category.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\UrlFilter;
diff --git a/engine/Shopware/Bundle/SitemapBundle/UrlFilter/FilterInterface.php b/engine/Shopware/Bundle/SitemapBundle/UrlFilter/FilterInterface.php
index 4c369664ceb..b360d9db0bd 100644
--- a/engine/Shopware/Bundle/SitemapBundle/UrlFilter/FilterInterface.php
+++ b/engine/Shopware/Bundle/SitemapBundle/UrlFilter/FilterInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\UrlFilter;
diff --git a/engine/Shopware/Bundle/SitemapBundle/UrlFilter/LandingPage.php b/engine/Shopware/Bundle/SitemapBundle/UrlFilter/LandingPage.php
index 197e3edb746..02f6ed79ca0 100644
--- a/engine/Shopware/Bundle/SitemapBundle/UrlFilter/LandingPage.php
+++ b/engine/Shopware/Bundle/SitemapBundle/UrlFilter/LandingPage.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\UrlFilter;
diff --git a/engine/Shopware/Bundle/SitemapBundle/UrlFilter/Manufacturer.php b/engine/Shopware/Bundle/SitemapBundle/UrlFilter/Manufacturer.php
index 0fa2bb041d8..5480aec567e 100644
--- a/engine/Shopware/Bundle/SitemapBundle/UrlFilter/Manufacturer.php
+++ b/engine/Shopware/Bundle/SitemapBundle/UrlFilter/Manufacturer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\UrlFilter;
diff --git a/engine/Shopware/Bundle/SitemapBundle/UrlFilter/Product.php b/engine/Shopware/Bundle/SitemapBundle/UrlFilter/Product.php
index df471e3293c..93ed9e4263c 100644
--- a/engine/Shopware/Bundle/SitemapBundle/UrlFilter/Product.php
+++ b/engine/Shopware/Bundle/SitemapBundle/UrlFilter/Product.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\UrlFilter;
diff --git a/engine/Shopware/Bundle/SitemapBundle/UrlFilter/Statics.php b/engine/Shopware/Bundle/SitemapBundle/UrlFilter/Statics.php
index 13b5b3b10f4..32fa6eeb1df 100644
--- a/engine/Shopware/Bundle/SitemapBundle/UrlFilter/Statics.php
+++ b/engine/Shopware/Bundle/SitemapBundle/UrlFilter/Statics.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\UrlFilter;
diff --git a/engine/Shopware/Bundle/SitemapBundle/UrlFilter/UrlFilterException.php b/engine/Shopware/Bundle/SitemapBundle/UrlFilter/UrlFilterException.php
index 9db5008d2fa..a412ccd6526 100644
--- a/engine/Shopware/Bundle/SitemapBundle/UrlFilter/UrlFilterException.php
+++ b/engine/Shopware/Bundle/SitemapBundle/UrlFilter/UrlFilterException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle\UrlFilter;
diff --git a/engine/Shopware/Bundle/SitemapBundle/UrlFilterInterface.php b/engine/Shopware/Bundle/SitemapBundle/UrlFilterInterface.php
index dde9839e6b3..9c0316f92dc 100644
--- a/engine/Shopware/Bundle/SitemapBundle/UrlFilterInterface.php
+++ b/engine/Shopware/Bundle/SitemapBundle/UrlFilterInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle;
@@ -42,6 +42,8 @@ public function filter(array $urls, $shopId);
 
     /**
      * @param int $shopId
+     *
+     * @return void
      */
     public function addFilterContainer(FilterContainer $filterContainer, $shopId);
 
diff --git a/engine/Shopware/Bundle/SitemapBundle/UrlProviderInterface.php b/engine/Shopware/Bundle/SitemapBundle/UrlProviderInterface.php
index a8a71e2f0f0..bcb06328d79 100644
--- a/engine/Shopware/Bundle/SitemapBundle/UrlProviderInterface.php
+++ b/engine/Shopware/Bundle/SitemapBundle/UrlProviderInterface.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\SitemapBundle;
diff --git a/engine/Shopware/Bundle/StaticContentBundle/Exception/EsdNotFoundException.php b/engine/Shopware/Bundle/StaticContentBundle/Exception/EsdNotFoundException.php
index 5759d169b12..3e9366b4b74 100644
--- a/engine/Shopware/Bundle/StaticContentBundle/Exception/EsdNotFoundException.php
+++ b/engine/Shopware/Bundle/StaticContentBundle/Exception/EsdNotFoundException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StaticContentBundle\Exception;
diff --git a/engine/Shopware/Bundle/StaticContentBundle/Gateway/DBAL/EsdGateway.php b/engine/Shopware/Bundle/StaticContentBundle/Gateway/DBAL/EsdGateway.php
index befd396c742..e48185765ca 100644
--- a/engine/Shopware/Bundle/StaticContentBundle/Gateway/DBAL/EsdGateway.php
+++ b/engine/Shopware/Bundle/StaticContentBundle/Gateway/DBAL/EsdGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StaticContentBundle\Gateway\DBAL;
diff --git a/engine/Shopware/Bundle/StaticContentBundle/Gateway/EsdGatewayInterface.php b/engine/Shopware/Bundle/StaticContentBundle/Gateway/EsdGatewayInterface.php
index 096b3ba2dc5..d2911134e61 100644
--- a/engine/Shopware/Bundle/StaticContentBundle/Gateway/EsdGatewayInterface.php
+++ b/engine/Shopware/Bundle/StaticContentBundle/Gateway/EsdGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StaticContentBundle\Gateway;
diff --git a/engine/Shopware/Bundle/StaticContentBundle/Service/Core/DownloadService.php b/engine/Shopware/Bundle/StaticContentBundle/Service/Core/DownloadService.php
index 56ec6be066f..9f40f17e5f4 100644
--- a/engine/Shopware/Bundle/StaticContentBundle/Service/Core/DownloadService.php
+++ b/engine/Shopware/Bundle/StaticContentBundle/Service/Core/DownloadService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StaticContentBundle\Service\Core;
@@ -100,12 +100,12 @@ public function send(string $location, FilesystemInterface $filesystem): void
                 case 2:
                     $location = $this->privateFilesystemRoot . '/' . $location;
                     $response->headers->set('content-type', 'application/octet-stream');
-                    $response->headers->set('content-disposition', sprintf('attachment; filename="%s"', basename($location)));
+                    $response->headers->set('content-disposition', \sprintf('attachment; filename="%s"', basename($location)));
                     $response->headers->set('x-sendfile', $location);
                     break;
                 case 3:
                     $response->headers->set('content-type', 'application/octet-stream');
-                    $response->headers->set('content-disposition', sprintf('attachment; filename="%s"', basename($location)));
+                    $response->headers->set('content-disposition', \sprintf('attachment; filename="%s"', basename($location)));
                     $response->headers->set('x-accel-redirect', $path);
                     break;
             }
@@ -116,14 +116,14 @@ public function send(string $location, FilesystemInterface $filesystem): void
         @set_time_limit(0);
 
         $response->headers->set('content-type', $mimeType);
-        $response->headers->set('content-disposition', sprintf('attachment; filename="%s"', basename($location)));
+        $response->headers->set('content-disposition', \sprintf('attachment; filename="%s"', basename($location)));
         $response->headers->set('content-length', $meta['size']);
         $response->headers->set('content-transfer-encoding', 'binary');
         $response->sendHeaders();
 
         $upstream = $filesystem->readStream($location);
         if (!\is_resource($upstream)) {
-            throw new RuntimeException(sprintf('Could not read stream from: %s', $location));
+            throw new RuntimeException(\sprintf('Could not read stream from: %s', $location));
         }
         $downstream = fopen('php://output', 'wb');
         if (!\is_resource($downstream)) {
diff --git a/engine/Shopware/Bundle/StaticContentBundle/Service/Core/EsdService.php b/engine/Shopware/Bundle/StaticContentBundle/Service/Core/EsdService.php
index 6f118fe48db..07c9788b2aa 100644
--- a/engine/Shopware/Bundle/StaticContentBundle/Service/Core/EsdService.php
+++ b/engine/Shopware/Bundle/StaticContentBundle/Service/Core/EsdService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StaticContentBundle\Service\Core;
diff --git a/engine/Shopware/Bundle/StaticContentBundle/Service/DownloadServiceInterface.php b/engine/Shopware/Bundle/StaticContentBundle/Service/DownloadServiceInterface.php
index 4d180142995..069d9e7fbf3 100644
--- a/engine/Shopware/Bundle/StaticContentBundle/Service/DownloadServiceInterface.php
+++ b/engine/Shopware/Bundle/StaticContentBundle/Service/DownloadServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StaticContentBundle\Service;
diff --git a/engine/Shopware/Bundle/StaticContentBundle/Service/EsdServiceInterface.php b/engine/Shopware/Bundle/StaticContentBundle/Service/EsdServiceInterface.php
index bf5b50aa30c..e25c6f59540 100644
--- a/engine/Shopware/Bundle/StaticContentBundle/Service/EsdServiceInterface.php
+++ b/engine/Shopware/Bundle/StaticContentBundle/Service/EsdServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StaticContentBundle\Service;
diff --git a/engine/Shopware/Bundle/StaticContentBundle/StaticContentBundle.php b/engine/Shopware/Bundle/StaticContentBundle/StaticContentBundle.php
index 7d221188d38..8224e656a0f 100644
--- a/engine/Shopware/Bundle/StaticContentBundle/StaticContentBundle.php
+++ b/engine/Shopware/Bundle/StaticContentBundle/StaticContentBundle.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StaticContentBundle;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Common/StructHelper.php b/engine/Shopware/Bundle/StoreFrontBundle/Common/StructHelper.php
index 6e1da1da65d..9891a0e4370 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Common/StructHelper.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Common/StructHelper.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Common;
@@ -33,7 +33,7 @@ class StructHelper
 {
     public function assignProductData(ListProduct $listProduct, ListProduct $product)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         $product->setShippingFree($listProduct->isShippingFree());
         $product->setMainVariantId($listProduct->getMainVariantId());
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Exception/StructNotFoundException.php b/engine/Shopware/Bundle/StoreFrontBundle/Exception/StructNotFoundException.php
index 9f975775c4d..4993b616afc 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Exception/StructNotFoundException.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Exception/StructNotFoundException.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Exception;
@@ -43,7 +42,7 @@ public function __construct(
         int $code = 0,
         ?Throwable $previous = null
     ) {
-        $message = sprintf('Struct of "%s" for %s "%s" not found', $structClass, $identifier, (string) $identifierValue);
+        $message = \sprintf('Struct of "%s" for %s "%s" not found', $structClass, $identifier, (string) $identifierValue);
         parent::__construct($message, $code, $previous);
     }
 }
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/AddressGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/AddressGatewayInterface.php
index 9235c4a5b36..9d19b9d8c5a 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/AddressGatewayInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/AddressGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/BlogGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/BlogGatewayInterface.php
index ec1b6133d06..d957b8439ed 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/BlogGatewayInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/BlogGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CategoryGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CategoryGatewayInterface.php
index 1ce7463fc54..aa0642722f0 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CategoryGatewayInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CategoryGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
@@ -34,7 +34,7 @@ interface CategoryGatewayInterface
      * To get detailed information about the selection conditions, structure and content of the returned object,
      * please refer to the linked classes.
      *
-     * @see \Shopware\Bundle\StoreFrontBundle\Gateway\CategoryGatewayInterface::get()
+     * @see CategoryGatewayInterface::get()
      *
      * @param array<int> $ids
      *
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CategoryQueryHelperInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CategoryQueryHelperInterface.php
index 6f46bf7d483..8427449950c 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CategoryQueryHelperInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CategoryQueryHelperInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CheapestPriceGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CheapestPriceGatewayInterface.php
index 50327a4a3cf..a7bf6afcc0e 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CheapestPriceGatewayInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CheapestPriceGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
@@ -35,7 +35,7 @@ interface CheapestPriceGatewayInterface
      * To get detailed information about the selection conditions, structure and content of the returned object,
      * please refer to the linked classes.
      *
-     * @see \Shopware\Bundle\StoreFrontBundle\Gateway\CheapestPriceGatewayInterface::get()
+     * @see CheapestPriceGatewayInterface::get()
      *
      * @param BaseProduct[] $products
      *
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ConfiguratorGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ConfiguratorGatewayInterface.php
index 6b3cec025ab..d3e45bf1892 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ConfiguratorGatewayInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ConfiguratorGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
@@ -63,6 +63,8 @@ public function get(BaseProduct $product, ShopContextInterface $context);
     public function getConfiguratorMedia(BaseProduct $product, ShopContextInterface $context);
 
     /**
+     * @deprecated Will be removed with 5.8
+     *
      * Returns all possible configurator combinations for the provided product.
      * The returned array contains as array key the id of the configurator option.
      * The array value contains an imploded array with all possible configurator option ids
@@ -86,4 +88,19 @@ public function getConfiguratorMedia(BaseProduct $product, ShopContextInterface
      * @return array<int, array<string>> Indexed by the option id
      */
     public function getProductCombinations(BaseProduct $product);
+
+    /**
+     * Returns only available possible configurator combinations for the provided product.
+     * The returned array contains as array key the id of the configurator option.
+     * The array value contains an array with all possible configurator option configurations
+     *
+     * Example (written with the configurator option names)
+     * array(
+     *     'white' => array(array('XL', 'Cotton'), array('XL', 'Leather')),
+     *     'red'   => array(array('S', ...), array('L', ...)
+     * )
+     *
+     * @return array<int, array<int, array<int, int>>> Indexed by the option id
+     */
+    public function getAvailableConfigurations(BaseProduct $product): array;
 }
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ConfiguratorOptionsGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ConfiguratorOptionsGatewayInterface.php
index d45930f3822..3fc483b00d2 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ConfiguratorOptionsGatewayInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ConfiguratorOptionsGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CountryGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CountryGatewayInterface.php
index 040fb446e41..fdb306ba2ee 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CountryGatewayInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CountryGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
@@ -45,7 +45,7 @@ public function getArea($id, ShopContextInterface $context);
      * To get detailed information about the selection conditions, structure and content of the returned object,
      * please refer to the linked classes.
      *
-     * @see \Shopware\Bundle\StoreFrontBundle\Gateway\CountryGatewayInterface::getState()
+     * @see CountryGatewayInterface::getState()
      *
      * @param int[] $ids
      *
@@ -57,7 +57,7 @@ public function getStates(array $ids, ShopContextInterface $context);
      * To get detailed information about the selection conditions, structure and content of the returned object,
      * please refer to the linked classes.
      *
-     * @see \Shopware\Bundle\StoreFrontBundle\Gateway\CountryGatewayInterface::getCountry()
+     * @see CountryGatewayInterface::getCountry()
      *
      * @param int[] $ids
      *
@@ -69,7 +69,7 @@ public function getCountries(array $ids, ShopContextInterface $context);
      * To get detailed information about the selection conditions, structure and content of the returned object,
      * please refer to the linked classes.
      *
-     * @see \Shopware\Bundle\StoreFrontBundle\Gateway\CountryGatewayInterface::getArea()
+     * @see CountryGatewayInterface::getArea()
      *
      * @param int[] $ids
      *
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CurrencyGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CurrencyGatewayInterface.php
index 99db61188ac..3d92e6d1627 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CurrencyGatewayInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CurrencyGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CustomFacetGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CustomFacetGatewayInterface.php
index 6eb3030c159..3d166815dc2 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CustomFacetGatewayInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CustomFacetGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CustomSortingGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CustomSortingGatewayInterface.php
index cb65a5d2314..d5e91bc0d16 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CustomSortingGatewayInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CustomSortingGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CustomerGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CustomerGatewayInterface.php
index bad40c32b56..70b409e3dcf 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CustomerGatewayInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CustomerGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CustomerGroupGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CustomerGroupGatewayInterface.php
index 135156972c0..71ddbb74c72 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CustomerGroupGatewayInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/CustomerGroupGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
@@ -32,7 +32,7 @@ interface CustomerGroupGatewayInterface
      * To get detailed information about the selection conditions, structure and content of the returned object,
      * please refer to the linked classes.
      *
-     * @see \Shopware\Bundle\StoreFrontBundle\Gateway\CustomerGroupGatewayInterface::get()
+     * @see CustomerGroupGatewayInterface::get()
      *
      * @param array<string> $keys
      *
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/AddressGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/AddressGateway.php
index 74d74ee53e9..8e43afa51ba 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/AddressGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/AddressGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/BlogGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/BlogGateway.php
index b0faf487843..a34f78dc184 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/BlogGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/BlogGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CategoryGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CategoryGateway.php
index 36ecbd24d57..0528f9c21b8 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CategoryGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CategoryGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
@@ -106,7 +106,7 @@ public function getList(array $ids, ShopContextInterface $context)
     {
         $data = $this->getQuery($ids, $context)->execute()->fetchAll(PDO::FETCH_ASSOC);
 
-        //use php usort instead of running mysql order by to prevent file-sort and temporary table statement
+        // use php usort instead of running mysql order by to prevent file-sort and temporary table statement
         usort($data, function ($a, $b) {
             if ($a['__category_position'] === $b['__category_position']) {
                 return $a['__category_id'] <=> $b['__category_id'];
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CategoryQueryHelper.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CategoryQueryHelper.php
index bdb75f172c5..7e2e18e296b 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CategoryQueryHelper.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CategoryQueryHelper.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CheapestPriceESGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CheapestPriceESGateway.php
index 1494cfda534..20dcec7d51a 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CheapestPriceESGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CheapestPriceESGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CheapestPriceGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CheapestPriceGateway.php
index 77bc7ac4868..dbc33aba6cd 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CheapestPriceGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CheapestPriceGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ConfiguratorGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ConfiguratorGateway.php
index f74c0453ae7..c385815bc91 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ConfiguratorGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ConfiguratorGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
@@ -169,6 +169,45 @@ public function getProductCombinations(BaseProduct $product)
         return $data;
     }
 
+    public function getAvailableConfigurations(BaseProduct $product): array
+    {
+        $query = $this->connection->createQueryBuilder();
+
+        $query->select([
+            "GROUP_CONCAT(DISTINCT relations.option_id, '' SEPARATOR '|') as combinations",
+        ]);
+
+        $query->from('s_articles_details', 'variant')
+            ->innerJoin(
+                'variant',
+                's_articles',
+                'product',
+                'product.id = variant.articleID AND product.id = :productId AND (
+                    (variant.laststock * variant.instock) >= (variant.laststock * variant.minpurchase)
+                )'
+            )
+            ->leftJoin('variant', 's_article_configurator_option_relations', 'relations', 'variant.id = relations.article_id')
+            ->where('variant.active = 1')
+            ->groupBy('variant.id')
+            ->setParameter(':productId', $product->getId());
+
+        $data = $query->execute()->fetchAll(PDO::FETCH_COLUMN);
+
+        $result = [];
+        foreach ($data as $row) {
+            if (empty($row)) {
+                continue;
+            }
+            $rowIds = array_map('\intval', explode('|', $row));
+
+            foreach ($rowIds as $optionId) {
+                $result[$optionId][] = $rowIds;
+            }
+        }
+
+        return $result;
+    }
+
     private function getQuery(): QueryBuilder
     {
         $query = $this->connection->createQueryBuilder();
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ConfiguratorOptionsGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ConfiguratorOptionsGateway.php
index c7d91eeaec1..ea2810e82f8 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ConfiguratorOptionsGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ConfiguratorOptionsGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CountryGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CountryGateway.php
index 751ad8421a6..064ecb99e59 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CountryGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CountryGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
@@ -29,6 +29,7 @@
 use PDO;
 use Shopware\Bundle\StoreFrontBundle\Gateway\CountryGatewayInterface;
 use Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator\CountryHydrator;
+use Shopware\Bundle\StoreFrontBundle\Struct\Country;
 use Shopware\Bundle\StoreFrontBundle\Struct\ShopContextInterface;
 use Shopware\Bundle\StoreFrontBundle\Struct\Struct;
 
@@ -149,6 +150,35 @@ public function getCountries(array $ids, ShopContextInterface $context)
         return $this->sortByIds($ids, $countries);
     }
 
+    public function getFallbackCountry(ShopContextInterface $context): ?Country
+    {
+        $query = $this->connection->createQueryBuilder();
+
+        $query->select($this->fieldHelper->getCountryFields());
+        $query->from('s_core_countries', 'country')
+            ->leftJoin('country', 's_core_countries_attributes', 'countryAttribute', 'countryAttribute.countryID = country.id')
+            ->orderBy('country.position', 'ASC');
+
+        $this->fieldHelper->addCountryTranslation($query, $context);
+
+        $data = $query->execute()->fetchAll(PDO::FETCH_ASSOC);
+
+        foreach ($data as $row) {
+            $country = $this->countryHydrator->hydrateCountry($row);
+            if (!$country->isActive()) {
+                continue;
+            }
+
+            if (!$country->allowShipping()) {
+                continue;
+            }
+
+            return $country;
+        }
+
+        return null;
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CurrencyGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CurrencyGateway.php
index d0cddc0f6ac..f0780ea7a29 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CurrencyGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CurrencyGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CustomFacetGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CustomFacetGateway.php
index 36814c08047..8e497859d23 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CustomFacetGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CustomFacetGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
@@ -200,7 +200,7 @@ private function getCategoryMapping(array $categoryIds): array
 
         return array_map(
             function ($ids) use ($allFacetIds) {
-                $ids = array_filter(explode('|', $ids));
+                $ids = array_filter(explode('|', $ids ?? ''));
 
                 if (!empty($ids)) {
                     return array_map('\intval', $ids);
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CustomSortingGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CustomSortingGateway.php
index b5a426cb63b..7fbf24c1569 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CustomSortingGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CustomSortingGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
@@ -194,7 +194,7 @@ private function getCategoryMapping(array $categoryIds): array
 
         return array_map(
             function ($ids) use ($allSortingIds) {
-                $ids = array_filter(explode('|', $ids));
+                $ids = array_filter(explode('|', $ids ?? ''));
 
                 if (!empty($ids)) {
                     return array_map('\intval', $ids);
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CustomerGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CustomerGateway.php
index 1b72862268a..b2a1edcf4d9 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CustomerGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CustomerGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CustomerGroupGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CustomerGroupGateway.php
index 869ff9b3bf7..6e989242bd3 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CustomerGroupGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/CustomerGroupGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/DownloadGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/DownloadGateway.php
index f23eb8ca9e2..09475476f6b 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/DownloadGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/DownloadGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/FieldHelper.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/FieldHelper.php
index f6fc9c158b7..608e4c39b8a 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/FieldHelper.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/FieldHelper.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/GraduatedPricesGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/GraduatedPricesGateway.php
index bdca3af066f..c7b971f534a 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/GraduatedPricesGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/GraduatedPricesGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/AddressHydrator.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/AddressHydrator.php
index ff69cff0fa0..7a4bfaf5b1b 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/AddressHydrator.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/AddressHydrator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/AttributeHydrator.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/AttributeHydrator.php
index 464e5871a1a..d0d68ad96ce 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/AttributeHydrator.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/AttributeHydrator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/BlogHydrator.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/BlogHydrator.php
index 0c9c0dd9901..81cf94c839e 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/BlogHydrator.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/BlogHydrator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/CategoryHydrator.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/CategoryHydrator.php
index 75dc747910a..e0fedb70aa0 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/CategoryHydrator.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/CategoryHydrator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator;
@@ -89,6 +89,7 @@ private function assignCategoryData(Category $category, array $data)
             $path = rtrim($path, '|');
 
             $path = explode('|', $path);
+            $path = array_map('\intval', $path);
 
             $category->setPath(array_reverse($path));
         }
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/ConfiguratorHydrator.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/ConfiguratorHydrator.php
index a581906f6d7..4623e93dba5 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/ConfiguratorHydrator.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/ConfiguratorHydrator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/CountryHydrator.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/CountryHydrator.php
index 1bff7b0c823..17516feae0d 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/CountryHydrator.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/CountryHydrator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/CurrencyHydrator.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/CurrencyHydrator.php
index 8d15d5bfcb4..5883ba41a02 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/CurrencyHydrator.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/CurrencyHydrator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/CustomListingHydrator.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/CustomListingHydrator.php
index cf423e81278..28320bad772 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/CustomListingHydrator.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/CustomListingHydrator.php
@@ -1,29 +1,31 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator;
 
+use Shopware\Bundle\SearchBundle\FacetInterface;
+use Shopware\Bundle\SearchBundle\SortingInterface;
 use Shopware\Bundle\StoreFrontBundle\Struct\Search\CustomFacet;
 use Shopware\Bundle\StoreFrontBundle\Struct\Search\CustomSorting;
 use Shopware\Components\LogawareReflectionHelper;
@@ -52,9 +54,10 @@ public function hydrateSorting(array $data)
         $sorting->setLabel($data['__customSorting_label']);
         $sorting->setPosition((int) $data['__customSorting_position']);
 
+        /** @var array<SortingInterface> $sortings */
         $sortings = $this->reflector->unserialize(
             json_decode($data['__customSorting_sortings'], true),
-            sprintf('Serialization error in custom sorting %s', $sorting->getLabel())
+            \sprintf('Serialization error in custom sorting %s', $sorting->getLabel())
         );
 
         $sorting->setSortings($sortings);
@@ -91,14 +94,18 @@ public function hydrateFacet(array $data, array $streams)
 
         $facets = $this->reflector->unserialize(
             $facets,
-            sprintf('Serialization error in custom facet %s', $customFacet->getName())
+            \sprintf('Serialization error in custom facet %s', $customFacet->getName())
         );
 
         if (empty($facets)) {
             return null;
         }
+        $firstFacet = array_shift($facets);
+        if (!$firstFacet instanceof FacetInterface) {
+            return null;
+        }
 
-        $customFacet->setFacet(array_shift($facets));
+        $customFacet->setFacet($firstFacet);
 
         return $customFacet;
     }
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/CustomerGroupHydrator.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/CustomerGroupHydrator.php
index 8adec4f71e7..3bb353dba6a 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/CustomerGroupHydrator.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/CustomerGroupHydrator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator;
@@ -46,9 +46,9 @@ public function hydrate(array $data)
 
         $customerGroup->setName($data['__customerGroup_description']);
 
-        $customerGroup->setDisplayGrossPrices((bool) ($data['__customerGroup_tax']));
+        $customerGroup->setDisplayGrossPrices((bool) $data['__customerGroup_tax']);
 
-        $customerGroup->setInsertedGrossPrices((bool) ($data['__customerGroup_taxinput']));
+        $customerGroup->setInsertedGrossPrices((bool) $data['__customerGroup_taxinput']);
 
         $customerGroup->setKey($data['__customerGroup_groupkey']);
 
@@ -58,7 +58,7 @@ public function hydrate(array $data)
 
         $customerGroup->setSurcharge((float) $data['__customerGroup_minimumordersurcharge']);
 
-        $customerGroup->setUseDiscount((bool) ($data['__customerGroup_mode']));
+        $customerGroup->setUseDiscount((bool) $data['__customerGroup_mode']);
 
         if (!empty($data['__customerGroupAttribute_id'])) {
             $this->attributeHydrator->addAttribute($customerGroup, $data, 'customerGroupAttribute');
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/CustomerHydrator.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/CustomerHydrator.php
index 6a25c578522..15cc55c1efd 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/CustomerHydrator.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/CustomerHydrator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/DownloadHydrator.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/DownloadHydrator.php
index 1a8d69e3648..688acd89b20 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/DownloadHydrator.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/DownloadHydrator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/EsdHydrator.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/EsdHydrator.php
index 76babdcb943..f37fd7be6f2 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/EsdHydrator.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/EsdHydrator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/Hydrator.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/Hydrator.php
index 4d8d28bd3f4..f09b9df28c8 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/Hydrator.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/Hydrator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator;
@@ -55,7 +55,7 @@ public function extractFields($prefix, $data)
      */
     protected function getFields($prefix, $data)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         $result = [];
         foreach ($data as $field => $value) {
@@ -123,7 +123,7 @@ protected function getTranslation(array $data, $prefix, array $mapping = [], $id
         $fallback = $this->extractTranslation($data, $fallback, $id);
         $translation = $this->extractTranslation($data, $key, $id);
 
-        $translation = $translation + $fallback;
+        $translation += $fallback;
 
         if (!empty($mapping)) {
             $translation = $this->convertArrayKeys($translation, $mapping);
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/LinkHydrator.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/LinkHydrator.php
index 80fd70be1b9..2c1a24a4e74 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/LinkHydrator.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/LinkHydrator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/LocaleHydrator.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/LocaleHydrator.php
index 7b6882ffe4d..5b1ecd8dbd1 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/LocaleHydrator.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/LocaleHydrator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/ManufacturerHydrator.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/ManufacturerHydrator.php
index 14e3f62e7fc..83c0b9359d4 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/ManufacturerHydrator.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/ManufacturerHydrator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/MediaHydrator.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/MediaHydrator.php
index b856fd86d96..2ff539eda07 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/MediaHydrator.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/MediaHydrator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator;
@@ -175,7 +175,7 @@ private function getMediaThumbnails(array $data): array
                 $retina = null;
             }
 
-            if (!empty($retina)) {
+            if (\is_string($retina) && $retina !== '') {
                 $retina = $this->mediaService->getUrl($retina);
             }
 
@@ -194,7 +194,7 @@ private function updateMedia(array $data): array
     {
         $imageSize = getimagesizefromstring((string) $this->mediaService->read($data['__media_path']));
         if (!\is_array($imageSize)) {
-            throw new RuntimeException(sprintf('Could not get image size from "%s"', $data['__media_path']));
+            throw new RuntimeException(\sprintf('Could not get image size from "%s"', $data['__media_path']));
         }
         [$width, $height] = $imageSize;
         $this->connection->executeUpdate(
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/PaymentHydrator.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/PaymentHydrator.php
index 70025508ad1..56226c08fc8 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/PaymentHydrator.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/PaymentHydrator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/PriceHydrator.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/PriceHydrator.php
index cee88f29299..33d9b006acb 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/PriceHydrator.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/PriceHydrator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/ProductHydrator.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/ProductHydrator.php
index 661397be5b1..37e7e7fbbc3 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/ProductHydrator.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/ProductHydrator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator;
@@ -150,18 +150,18 @@ private function assignProductData(ListProduct $product, array $data): void
         $product->setName($data['__product_name']);
         $product->setShortDescription($data['__product_description']);
         $product->setLongDescription($data['__product_description_long']);
-        $product->setCloseouts((bool) ($data['__product_laststock']));
+        $product->setCloseouts((bool) $data['__product_laststock']);
         $product->setMetaTitle($data['__product_metaTitle']);
         $product->setHasProperties($data['__product_filtergroupID'] > 0);
-        $product->setHighlight((bool) ($data['__product_topseller']));
-        $product->setAllowsNotification((bool) ($data['__product_notification']));
+        $product->setHighlight((bool) $data['__product_topseller']);
+        $product->setAllowsNotification((bool) $data['__product_notification']);
         $product->setKeywords($data['__product_keywords']);
         $product->setTemplate($data['__product_template']);
         $product->setHasConfigurator($data['__product_configurator_set_id'] > 0);
         $product->setHasEsd((bool) $data['__product_has_esd']);
         $product->setIsPriceGroupActive((bool) $data['__product_pricegroupActive']);
         $product->setSales((int) $data['__topSeller_sales']);
-        $product->setShippingFree((bool) ($data['__variant_shippingfree']));
+        $product->setShippingFree((bool) $data['__variant_shippingfree']);
         $product->setStock((int) $data['__variant_instock']);
         $product->setManufacturerNumber($data['__variant_suppliernumber']);
         $product->setMainVariantId((int) $data['__product_main_detail_id']);
@@ -196,7 +196,7 @@ private function assignProductData(ListProduct $product, array $data): void
         $product->setWeight((float) $data['__variant_weight']);
         $product->setWidth((float) $data['__variant_width']);
 
-        $customerGroups = explode('|', $data['__product_blocked_customer_groups']);
+        $customerGroups = explode('|', $data['__product_blocked_customer_groups'] ?? '');
         $customerGroups = array_filter($customerGroups);
         $product->setBlockedCustomerGroupIds($customerGroups);
         $product->setHasAvailableVariant($data['__product_has_available_variants'] > 0);
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/ProductStreamHydrator.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/ProductStreamHydrator.php
index 2ab1ff2cdf3..5e30b528d4d 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/ProductStreamHydrator.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/ProductStreamHydrator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/PropertyHydrator.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/PropertyHydrator.php
index 15c2890de5c..084c016e561 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/PropertyHydrator.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/PropertyHydrator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator;
@@ -34,15 +34,15 @@ class PropertyHydrator extends Hydrator
 
     private MediaHydrator $mediaHydrator;
 
-    public function __construct(
-        AttributeHydrator $attributeHydrator,
-        MediaHydrator $mediaHydrator
-    ) {
+    public function __construct(AttributeHydrator $attributeHydrator, MediaHydrator $mediaHydrator)
+    {
         $this->attributeHydrator = $attributeHydrator;
         $this->mediaHydrator = $mediaHydrator;
     }
 
     /**
+     * @param array<array<string, mixed>> $data
+     *
      * @return Set[]
      */
     public function hydrateValues(array $data)
@@ -56,18 +56,10 @@ public function hydrateValues(array $data)
             $groupId = $row['__propertyGroup_id'];
             $optionId = $row['__propertyOption_id'];
 
-            if (isset($sets[$setId])) {
-                $set = $sets[$setId];
-            } else {
-                $set = $this->hydrateSet($row);
-            }
+            $set = $sets[$setId] ?? $this->hydrateSet($row);
 
             $groups = $set->getGroups();
-            if (isset($groups[$groupId])) {
-                $group = $groups[$groupId];
-            } else {
-                $group = $this->hydrateGroup($row);
-            }
+            $group = $groups[$groupId] ?? $this->hydrateGroup($row);
 
             $options = $group->getOptions();
             $options[$optionId] = $this->hydrateOption($row);
@@ -90,6 +82,8 @@ public function hydrateValues(array $data)
     }
 
     /**
+     * @param array<string, mixed> $data
+     *
      * @return Group
      */
     public function hydrateGroup(array $data)
@@ -110,6 +104,8 @@ public function hydrateGroup(array $data)
     }
 
     /**
+     * @param array<string, mixed> $data
+     *
      * @return Option
      */
     public function hydrateOption(array $data)
@@ -135,6 +131,9 @@ public function hydrateOption(array $data)
         return $option;
     }
 
+    /**
+     * @param array<string, mixed> $data
+     */
     private function hydrateSet(array $data): Set
     {
         $set = new Set();
@@ -155,22 +154,20 @@ private function hydrateSet(array $data): Set
 
     /**
      * Sort groups by position in set
+     *
+     * @param array<array<string, mixed>> $data
      */
     private function sortGroups(array &$data): void
     {
-        usort($data, function ($a, $b) {
-            if ($a['__relations_position'] == $b['__relations_position']) {
-                return 0;
-            }
-
-            return ($a['__relations_position'] < $b['__relations_position']) ? -1 : 1;
+        usort($data, function (array $a, array $b): int {
+            return $a['__relations_position'] <=> $b['__relations_position'];
         });
     }
 
     /**
-     * @param Option[] $options
+     * @param array<Option> $options
      */
-    private function sortOptions(array &$options, int $sortMode)
+    private function sortOptions(array &$options, int $sortMode): void
     {
         if ($sortMode === Set::SORT_POSITION) {
             $this->sortOptionsByPosition($options);
@@ -179,7 +176,7 @@ private function sortOptions(array &$options, int $sortMode)
         }
 
         if ($sortMode === Set::SORT_NUMERIC) {
-            $this->sortOptionsNumercialValue($options);
+            $this->sortOptionsNumericalValue($options);
 
             return;
         }
@@ -188,42 +185,34 @@ private function sortOptions(array &$options, int $sortMode)
     }
 
     /**
-     * @param Option[] $options
+     * @param array<Option> $options
      */
-    private function sortOptionsByPosition(array &$options)
+    private function sortOptionsByPosition(array &$options): void
     {
-        usort($options, function (Option $a, Option $b) {
-            if ($a->getPosition() == $b->getPosition()) {
-                return 0;
-            }
-
-            return ($a->getPosition() < $b->getPosition()) ? -1 : 1;
+        usort($options, function (Option $a, Option $b): int {
+            return $a->getPosition() <=> $b->getPosition();
         });
     }
 
     /**
-     * @param Option[] $options
+     * @param array<Option> $options
      */
-    private function sortOptionsNumercialValue(array &$options)
+    private function sortOptionsNumericalValue(array &$options): void
     {
-        usort($options, function (Option $a, Option $b) {
+        usort($options, function (Option $a, Option $b): int {
             $aValue = (float) str_replace(',', '.', $a->getName());
             $bValue = (float) str_replace(',', '.', $b->getName());
 
-            if ($aValue == $bValue) {
-                return 0;
-            }
-
-            return ($aValue < $bValue) ? -1 : 1;
+            return $aValue <=> $bValue;
         });
     }
 
     /**
-     * @param Option[] $options
+     * @param array<Option> $options
      */
     private function sortOptionsAlphanumeric(array &$options): void
     {
-        usort($options, function (Option $a, Option $b) {
+        usort($options, function (Option $a, Option $b): int {
             return strnatcasecmp($a->getName(), $b->getName());
         });
     }
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/ShopHydrator.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/ShopHydrator.php
index bcdbbcf371d..c02eddb9b64 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/ShopHydrator.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/ShopHydrator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/ShopPageHydrator.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/ShopPageHydrator.php
index b293280bdd0..e149bd256f5 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/ShopPageHydrator.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/ShopPageHydrator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/TaxHydrator.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/TaxHydrator.php
index 2b5bc572ba2..dd59f7b9e9a 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/TaxHydrator.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/TaxHydrator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/TemplateHydrator.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/TemplateHydrator.php
index 22bc24f3738..dd203c9cbec 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/TemplateHydrator.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/TemplateHydrator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/UnitHydrator.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/UnitHydrator.php
index 531277897c8..813eb687199 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/UnitHydrator.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/UnitHydrator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/VoteHydrator.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/VoteHydrator.php
index 09190a0508b..cff2a589c7b 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/VoteHydrator.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/VoteHydrator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/LinkGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/LinkGateway.php
index 6ed7a25ad2c..5ac03865e58 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/LinkGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/LinkGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ListProductGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ListProductGateway.php
index 3227ad4710d..7784233fd6c 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ListProductGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ListProductGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ListProductQueryHelper.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ListProductQueryHelper.php
index 1cc1736789a..0a7653a1ad9 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ListProductQueryHelper.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ListProductQueryHelper.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ManufacturerGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ManufacturerGateway.php
index 701d469ee82..e5bf984c0f0 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ManufacturerGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ManufacturerGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
@@ -55,7 +55,7 @@ class ManufacturerGateway implements ManufacturerGatewayInterface
     public function __construct(
         Connection $connection,
         FieldHelper $fieldHelper,
-        Hydrator\ManufacturerHydrator $manufacturerHydrator,
+        ManufacturerHydrator $manufacturerHydrator,
         MediaServiceInterface $mediaService
     ) {
         $this->connection = $connection;
@@ -105,7 +105,7 @@ public function getList(array $ids, ShopContextInterface $context)
             }
         }
 
-        //sort elements by provided ids, sorting is defined by other queries like `best term match` or `max articles` or `sort alphanumeric`
+        // sort elements by provided ids, sorting is defined by other queries like `best term match` or `max articles` or `sort alphanumeric`
         $sorted = [];
         foreach ($ids as $id) {
             if (!\array_key_exists($id, $manufacturers)) {
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/MediaGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/MediaGateway.php
index 2f8bbf5c058..a516365fa05 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/MediaGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/MediaGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/PaymentGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/PaymentGateway.php
index ca62c8a87df..352d4ea303b 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/PaymentGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/PaymentGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/PriceGroupDiscountGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/PriceGroupDiscountGateway.php
index d36bfefbcd1..ff75e77e74d 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/PriceGroupDiscountGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/PriceGroupDiscountGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ProductConfigurationGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ProductConfigurationGateway.php
index 0f4718e697e..239cd0d32b3 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ProductConfigurationGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ProductConfigurationGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ProductMediaGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ProductMediaGateway.php
index f947e853ffb..7a40b943413 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ProductMediaGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ProductMediaGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ProductPropertyGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ProductPropertyGateway.php
index 4e014512c92..fd7533af752 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ProductPropertyGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ProductPropertyGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/PropertyGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/PropertyGateway.php
index c84a738064d..a90e1d4059c 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/PropertyGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/PropertyGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/RelatedProductStreamsGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/RelatedProductStreamsGateway.php
index a596c72cc68..ed7f2ef1910 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/RelatedProductStreamsGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/RelatedProductStreamsGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/RelatedProductsGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/RelatedProductsGateway.php
index 3eb31a74192..7ca901b6822 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/RelatedProductsGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/RelatedProductsGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ShopGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ShopGateway.php
index 6d5139c2b43..ae793312cfd 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ShopGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ShopGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ShopPageChildrenGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ShopPageChildrenGateway.php
index bd6b50acee9..cca13e1b2f7 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ShopPageChildrenGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ShopPageChildrenGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ShopPageGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ShopPageGateway.php
index cc31a7be647..ff29f2450f8 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ShopPageGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/ShopPageGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/SimilarProductsGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/SimilarProductsGateway.php
index da2ce301471..365f7ffbae1 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/SimilarProductsGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/SimilarProductsGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/TaxGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/TaxGateway.php
index e88bc1cd5d7..fe2f77f3f51 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/TaxGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/TaxGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
@@ -66,7 +66,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function getRules(Group $customerGroup, Area $area = null, Country $country = null, State $state = null)
+    public function getRules(Group $customerGroup, ?Area $area = null, ?Country $country = null, ?State $state = null)
     {
         $query = $this->connection->createQueryBuilder();
         $query->select($this->fieldHelper->getTaxFields())
@@ -107,9 +107,9 @@ public function getRules(Group $customerGroup, Area $area = null, Country $count
 
     private function getAreaQuery(
         Group $customerGroup,
-        Area $area = null,
-        Country $country = null,
-        State $state = null
+        ?Area $area = null,
+        ?Country $country = null,
+        ?State $state = null
     ): QueryBuilder {
         $areaId = $area ? $area->getId() : null;
         $countryId = $country ? $country->getId() : null;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/VariantCheapestPriceGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/VariantCheapestPriceGateway.php
index 95bff28d046..825e1830f3c 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/VariantCheapestPriceGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/VariantCheapestPriceGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/VariantMediaGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/VariantMediaGateway.php
index cefd26fdb80..5e74aa16ae5 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/VariantMediaGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/VariantMediaGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
@@ -38,9 +38,6 @@ class VariantMediaGateway implements VariantMediaGatewayInterface
 
     private FieldHelper $fieldHelper;
 
-    /**
-     * @var Hydrator\MediaHydrator
-     */
     private MediaHydrator $hydrator;
 
     public function __construct(
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/VoteAverageGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/VoteAverageGateway.php
index 2e424853934..c8c3ccacf1d 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/VoteAverageGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/VoteAverageGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/VoteGateway.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/VoteGateway.php
index c7d42a2cdc0..11b23da41df 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/VoteGateway.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/VoteGateway.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DownloadGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DownloadGatewayInterface.php
index 3d267e5a1bb..14c220e6d85 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DownloadGatewayInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/DownloadGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
@@ -34,7 +34,7 @@ interface DownloadGatewayInterface
      * To get detailed information about the selection conditions, structure and content of the returned object,
      * please refer to the linked classes.
      *
-     * @see \Shopware\Bundle\StoreFrontBundle\Gateway\DownloadGatewayInterface::get()
+     * @see DownloadGatewayInterface::get()
      *
      * @param BaseProduct[] $products
      *
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/GraduatedPricesGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/GraduatedPricesGatewayInterface.php
index dd68ed605d4..7dfd1e316e1 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/GraduatedPricesGatewayInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/GraduatedPricesGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
@@ -35,7 +35,7 @@ interface GraduatedPricesGatewayInterface
      * To get detailed information about the selection conditions, structure and content of the returned object,
      * please refer to the linked classes.
      *
-     * @see \Shopware\Bundle\StoreFrontBundle\Gateway\GraduatedPricesGatewayInterface::get()
+     * @see GraduatedPricesGatewayInterface::get()
      *
      * @param ListProduct[] $products
      *
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/LinkGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/LinkGatewayInterface.php
index 27f435dc0d7..3396da077a0 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/LinkGatewayInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/LinkGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
@@ -34,7 +34,7 @@ interface LinkGatewayInterface
      * To get detailed information about the selection conditions, structure and content of the returned object,
      * please refer to the linked classes.
      *
-     * @see \Shopware\Bundle\StoreFrontBundle\Gateway\LinkGatewayInterface::get()
+     * @see LinkGatewayInterface::get()
      *
      * @param BaseProduct[] $products
      *
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ListProductGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ListProductGatewayInterface.php
index 6c81c3e1151..71b52b54519 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ListProductGatewayInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ListProductGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
@@ -33,7 +33,7 @@ interface ListProductGatewayInterface
      * To get detailed information about the selection conditions, structure and content of the returned object,
      * please refer to the linked classes.
      *
-     * @see \Shopware\Bundle\StoreFrontBundle\Gateway\ListProductGatewayInterface::get()
+     * @see ListProductGatewayInterface::get()
      *
      * @param array<string> $numbers
      *
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ListProductQueryHelperInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ListProductQueryHelperInterface.php
index 1f6390a305a..31ace3f378e 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ListProductQueryHelperInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ListProductQueryHelperInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ManufacturerGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ManufacturerGatewayInterface.php
index 92b9cbfa730..f021df964a0 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ManufacturerGatewayInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ManufacturerGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
@@ -33,7 +33,7 @@ interface ManufacturerGatewayInterface
      * To get detailed information about the selection conditions, structure and content of the returned object,
      * please refer to the linked classes.
      *
-     * @see \Shopware\Bundle\StoreFrontBundle\Gateway\ManufacturerGatewayInterface::get()
+     * @see ManufacturerGatewayInterface::get()
      *
      * @param array<int> $ids
      *
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/MediaGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/MediaGatewayInterface.php
index 3da643bc733..9f0a1685f55 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/MediaGatewayInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/MediaGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
@@ -33,7 +33,7 @@ interface MediaGatewayInterface
      * To get detailed information about the selection conditions, structure and content of the returned object,
      * please refer to the linked classes.
      *
-     * @see \Shopware\Bundle\StoreFrontBundle\Gateway\ProductMediaGatewayInterface::get()
+     * @see ProductMediaGatewayInterface::get()
      *
      * @param array<int> $ids
      *
@@ -45,7 +45,7 @@ public function getList($ids, ShopContextInterface $context);
      * To get detailed information about the selection conditions, structure and content of the returned object,
      * please refer to the linked classes.
      *
-     * @see \Shopware\Bundle\StoreFrontBundle\Gateway\ProductMediaGatewayInterface::get()
+     * @see ProductMediaGatewayInterface::get()
      *
      * @param int $id
      *
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/PaymentGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/PaymentGatewayInterface.php
index 327a79843ec..5fb2c9eb767 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/PaymentGatewayInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/PaymentGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/PriceGroupDiscountGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/PriceGroupDiscountGatewayInterface.php
index 60cd529f4c3..f4f977084fd 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/PriceGroupDiscountGatewayInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/PriceGroupDiscountGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ProductConfigurationGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ProductConfigurationGatewayInterface.php
index afea0bb4ac9..89d55888e68 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ProductConfigurationGatewayInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ProductConfigurationGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
@@ -34,7 +34,7 @@ interface ProductConfigurationGatewayInterface
      * To get detailed information about the selection conditions, structure and content of the returned object,
      * please refer to the linked classes.
      *
-     * @see \Shopware\Bundle\StoreFrontBundle\Gateway\ProductConfigurationGatewayInterface::get()
+     * @see ProductConfigurationGatewayInterface::get()
      *
      * @param BaseProduct[] $products
      *
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ProductMediaGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ProductMediaGatewayInterface.php
index 20ae431cd47..1a426f6bf1e 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ProductMediaGatewayInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ProductMediaGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
@@ -34,7 +34,7 @@ interface ProductMediaGatewayInterface
      * To get detailed information about the selection conditions, structure and content of the returned object,
      * please refer to the linked classes.
      *
-     * @see \Shopware\Bundle\StoreFrontBundle\Gateway\ProductMediaGatewayInterface::get()
+     * @see ProductMediaGatewayInterface::get()
      *
      * The passed $products array contains in some cases two variations of the same product.
      * For example:
@@ -103,7 +103,7 @@ public function get(BaseProduct $product, ShopContextInterface $context);
      * To get detailed information about the selection conditions, structure and content of the returned object,
      * please refer to the linked classes.
      *
-     * @see \Shopware\Bundle\StoreFrontBundle\Gateway\ProductMediaGatewayInterface::getCover()
+     * @see ProductMediaGatewayInterface::getCover()
      *
      * The passed $products array contains in some case two variations of the same product.
      * For example:
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ProductPropertyGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ProductPropertyGatewayInterface.php
index 47cddabc30d..db8cb739bc3 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ProductPropertyGatewayInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ProductPropertyGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
@@ -34,7 +34,7 @@ interface ProductPropertyGatewayInterface
      * To get detailed information about the selection conditions, structure and content of the returned object,
      * please refer to the linked classes.
      *
-     * @see \Shopware\Bundle\StoreFrontBundle\Gateway\ProductPropertyGatewayInterface::get()
+     * @see ProductPropertyGatewayInterface::get()
      *
      * @param BaseProduct[] $products
      *
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/PropertyGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/PropertyGatewayInterface.php
index fc7b3615cea..3090b580524 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/PropertyGatewayInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/PropertyGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/RelatedProductStreamsGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/RelatedProductStreamsGatewayInterface.php
index 42f53b8f062..21d7bb82643 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/RelatedProductStreamsGatewayInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/RelatedProductStreamsGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/RelatedProductsGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/RelatedProductsGatewayInterface.php
index 9ec33dbcee8..788a8317d06 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/RelatedProductsGatewayInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/RelatedProductsGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ShopGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ShopGatewayInterface.php
index 2bdd9c7f84d..0514cf255ac 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ShopGatewayInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ShopGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ShopPageChildrenGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ShopPageChildrenGatewayInterface.php
index 81f2139477c..b5cd6a7cfb3 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ShopPageChildrenGatewayInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ShopPageChildrenGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ShopPageGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ShopPageGatewayInterface.php
index be4ff7ed580..237e8db77be 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ShopPageGatewayInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/ShopPageGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/SimilarProductsGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/SimilarProductsGatewayInterface.php
index a572833f054..24010848dfe 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/SimilarProductsGatewayInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/SimilarProductsGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/TaxGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/TaxGatewayInterface.php
index 2dbc46c7af6..dd890b7a361 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/TaxGatewayInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/TaxGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
@@ -46,5 +46,5 @@ interface TaxGatewayInterface
      *
      * @return array<string, Tax> Indexed by 'tax_' + id
      */
-    public function getRules(Group $customerGroup, Area $area = null, Country $country = null, State $state = null);
+    public function getRules(Group $customerGroup, ?Area $area = null, ?Country $country = null, ?State $state = null);
 }
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/VariantCheapestPriceGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/VariantCheapestPriceGatewayInterface.php
index 82e566788d8..77e6f6ce67f 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/VariantCheapestPriceGatewayInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/VariantCheapestPriceGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
@@ -36,7 +36,7 @@ interface VariantCheapestPriceGatewayInterface
      * To get detailed information about the selection conditions, structure and content of the returned object,
      * please refer to the linked classes.
      *
-     * @see \Shopware\Bundle\StoreFrontBundle\Gateway\VariantCheapestPriceGatewayInterface::get()
+     * @see VariantCheapestPriceGatewayInterface::get()
      *
      * @param BaseProduct[] $products
      *
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/VariantMediaGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/VariantMediaGatewayInterface.php
index 316df14fbe0..ea4949c5267 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/VariantMediaGatewayInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/VariantMediaGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
@@ -34,7 +34,7 @@ interface VariantMediaGatewayInterface
      * To get detailed information about the selection conditions, structure and content of the returned object,
      * please refer to the linked classes.
      *
-     * @see \Shopware\Bundle\StoreFrontBundle\Gateway\VariantMediaGatewayInterface::get()
+     * @see VariantMediaGatewayInterface::get()
      *
      * The passed $products array contains in some case two variations of the same product.
      * For example:
@@ -101,7 +101,7 @@ public function get(BaseProduct $product, ShopContextInterface $context);
      * To get detailed information about the selection conditions, structure and content of the returned object,
      * please refer to the linked classes.
      *
-     * @see \Shopware\Bundle\StoreFrontBundle\Gateway\VariantMediaGatewayInterface::getCover()
+     * @see VariantMediaGatewayInterface::getCover()
      *
      * The passed $products array contains in some case two variations of the same product.
      * For example:
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/VoteAverageGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/VoteAverageGatewayInterface.php
index 2c0813123f1..a34f6e6eb5d 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/VoteAverageGatewayInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/VoteAverageGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
@@ -34,7 +34,7 @@ interface VoteAverageGatewayInterface
      * To get detailed information about the selection conditions, structure and content of the returned object,
      * please refer to the linked classes.
      *
-     * @see \Shopware\Bundle\StoreFrontBundle\Gateway\VoteAverageGatewayInterface::get()
+     * @see VoteAverageGatewayInterface::get()
      *
      * @param BaseProduct[] $products
      *
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/VoteGatewayInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/VoteGatewayInterface.php
index 9282305a299..70f48e26773 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Gateway/VoteGatewayInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Gateway/VoteGatewayInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Gateway;
@@ -34,7 +34,7 @@ interface VoteGatewayInterface
      * To get detailed information about the selection conditions, structure and content of the returned object,
      * please refer to the linked classes.
      *
-     * @see \Shopware\Bundle\StoreFrontBundle\Gateway\VoteGatewayInterface::get()
+     * @see VoteGatewayInterface::get()
      *
      * @param BaseProduct[] $products
      *
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/AdditionalTextServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/AdditionalTextServiceInterface.php
index ad660a3a58d..031a46628a2 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/AdditionalTextServiceInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/AdditionalTextServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service;
@@ -45,7 +45,7 @@ public function buildAdditionalText(ListProduct $product, ShopContextInterface $
     /**
      * Determines the 'additional text' value for multiple ListProduct.
      *
-     * @see \Shopware\Bundle\StoreFrontBundle\Service\AdditionalTextServiceInterface::buildAdditionalText()
+     * @see AdditionalTextServiceInterface::buildAdditionalText()
      *
      * @param array<string, ListProduct> $products
      *
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/BaseProductFactoryServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/BaseProductFactoryServiceInterface.php
index 751fde01b47..4d96154b687 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/BaseProductFactoryServiceInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/BaseProductFactoryServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/BlogServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/BlogServiceInterface.php
index fa4c0771840..d0a9b4946d5 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/BlogServiceInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/BlogServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/CacheInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/CacheInterface.php
index 7471c56bec6..70c4d7e0e8b 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/CacheInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/CacheInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/CategoryDepthServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/CategoryDepthServiceInterface.php
index 45db42a6869..b68db3e0be3 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/CategoryDepthServiceInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/CategoryDepthServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/CategoryServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/CategoryServiceInterface.php
index 14495b14723..7ac23c59a22 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/CategoryServiceInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/CategoryServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/CheapestPriceServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/CheapestPriceServiceInterface.php
index c65f8630ba4..6e25f76a6df 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/CheapestPriceServiceInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/CheapestPriceServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service;
@@ -32,7 +32,7 @@
 interface CheapestPriceServiceInterface
 {
     /**
-     * @see \Shopware\Bundle\StoreFrontBundle\Service\Core\CheapestPriceServiceInterface::get()
+     * @see Core\CheapestPriceServiceInterface::get
      * @deprecated 5.7, interface will require a ShopContextInterface in 5.8
      *
      * @param ListProduct[] $products
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/ConfiguratorServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/ConfiguratorServiceInterface.php
index 7492881b6cb..915b152e48d 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/ConfiguratorServiceInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/ConfiguratorServiceInterface.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/ContextServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/ContextServiceInterface.php
index 13931fd28db..638c4233d60 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/ContextServiceInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/ContextServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/AdditionalTextService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/AdditionalTextService.php
index f999f59301a..13d9ccc2657 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/AdditionalTextService.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/AdditionalTextService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
@@ -49,7 +49,7 @@ public function buildAdditionalText(ListProduct $product, ShopContextInterface $
 
         $product = array_shift($products);
         if (!$product instanceof ListProduct) {
-            throw new UnexpectedValueException(sprintf('Expect instance of "%s", got "%s" instead', ListProduct::class, \gettype($product)));
+            throw new UnexpectedValueException(\sprintf('Expect instance of "%s", got "%s" instead', ListProduct::class, \gettype($product)));
         }
 
         return $product;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/BaseProductFactoryService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/BaseProductFactoryService.php
index c843dc9ce95..d0dccb08361 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/BaseProductFactoryService.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/BaseProductFactoryService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/BlogService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/BlogService.php
index 8cb3ec757c9..dc0de89a4af 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/BlogService.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/BlogService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CachedHrefLangService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CachedHrefLangService.php
index 0e6d79b5cf1..b7ecc316889 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CachedHrefLangService.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CachedHrefLangService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CategoryDepthService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CategoryDepthService.php
index f7d5f5c6cb8..87357ccd77a 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CategoryDepthService.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CategoryDepthService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CategoryService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CategoryService.php
index 2e9d307a88d..c93c57080df 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CategoryService.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CategoryService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
@@ -83,7 +83,7 @@ private function filterValidCategories(array $categories, ShopContextInterface $
         $customerGroup = $context->getCurrentCustomerGroup();
 
         return array_filter($categories, function (Category $category) use ($customerGroup) {
-            return !(\in_array($customerGroup->getId(), $category->getBlockedCustomerGroupIds()));
+            return !\in_array($customerGroup->getId(), $category->getBlockedCustomerGroupIds());
         });
     }
 }
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CheapestPriceService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CheapestPriceService.php
index 5a6d2e0207e..d23ff6b54dd 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CheapestPriceService.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CheapestPriceService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
@@ -70,7 +70,7 @@ public function getList($products, ShopContextInterface $context)
 
         $prices = $this->buildPrices($products, $rules, $group);
 
-        //check if one of the products have no assigned price within the prices variable.
+        // check if one of the products have no assigned price within the prices variable.
         $fallbackProducts = array_filter(
             $products,
             function (BaseProduct $product) use ($prices) {
@@ -82,7 +82,7 @@ function (BaseProduct $product) use ($prices) {
             return $this->calculatePriceGroupDiscounts($products, $prices, $context);
         }
 
-        //if some product has no price, we have to load the fallback customer group prices for the fallbackProducts.
+        // if some product has no price, we have to load the fallback customer group prices for the fallbackProducts.
         $fallbackPrices = $this->cheapestPriceGateway->getList(
             $fallbackProducts,
             $context,
@@ -95,8 +95,8 @@ function (BaseProduct $product) use ($prices) {
             $context->getFallbackCustomerGroup()
         );
 
-        //Do not use array_merge here. Since it will reindex the numbers of fallbackPrices.
-        $prices = $prices + $fallbackPrices;
+        // Do not use array_merge here. Since it will reindex the numbers of fallbackPrices.
+        $prices += $fallbackPrices;
 
         return $this->calculatePriceGroupDiscounts($products, $prices, $context);
     }
@@ -114,7 +114,7 @@ private function calculatePriceGroupDiscounts(array $products, array $prices, Sh
                 continue;
             }
 
-            $price = $prices[$product->getNumber()];
+            $price = $prices[$product->getNumber()] ?? null;
 
             if (!$price instanceof PriceRule) {
                 continue;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ConfiguratorService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ConfiguratorService.php
index 9cd535c7cc5..817ac3c2a5a 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ConfiguratorService.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ConfiguratorService.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
@@ -78,7 +77,7 @@ public function getProductConfigurator(
         array $selection
     ) {
         $configurator = $this->configuratorGateway->get($product, $context);
-        $combinations = $this->configuratorGateway->getProductCombinations($product);
+        $availableProductOptions = $this->configuratorGateway->getAvailableConfigurations($product);
 
         $media = [];
         if (((int) $configurator->getType()) === self::CONFIGURATOR_TYPE_PICTURE) {
@@ -97,18 +96,14 @@ public function getProductConfigurator(
 
             foreach ($group->getOptions() as $option) {
                 $option->setSelected(
-                    \in_array($option->getId(), $selection)
+                    \in_array($option->getId(), $selection, true)
                 );
 
-                $isValid = $this->isCombinationValid(
-                    $group,
-                    $combinations[$option->getId()],
-                    $selection
-                );
+                $isOptionValid = $this->isOptionValid($group, $option->getId(), $selection, $availableProductOptions);
 
                 $option->setActive(
-                    $isValid
-                    || ($onlyOneGroup && isset($combinations[$option->getId()]))
+                    $isOptionValid
+                    || ($onlyOneGroup && isset($availableProductOptions[$option->getId()]))
                 );
 
                 if (isset($media[$option->getId()])) {
@@ -123,24 +118,31 @@ public function getProductConfigurator(
     }
 
     /**
-     * Checks if the passed combination is compatible with the provided customer configurator
-     * selection.
-     *
-     * @param array<string>|null $combinations
-     * @param array<int, int>    $selection
+     * @param array<int, int>                         $selection
+     * @param array<int, array<int, array<int, int>>> $availableProductOptions
      */
-    private function isCombinationValid(Group $group, ?array $combinations, array $selection): bool
+    private function isOptionValid(Group $group, int $id, array $selection, array $availableProductOptions): bool
     {
-        if (empty($combinations)) {
+        if (empty($availableProductOptions)) {
+            return false;
+        }
+
+        if (!isset($availableProductOptions[$id])) {
             return false;
         }
 
-        foreach ($selection as $selectedGroup => $selectedOption) {
-            if (!\in_array($selectedOption, $combinations) && $selectedGroup !== $group->getId()) {
-                return false;
+        $searchValue = array_replace($selection, [$group->getId() => $id]);
+
+        foreach ($availableProductOptions[$id] as $combinations) {
+            foreach ($searchValue as $searched) {
+                if (!\in_array($searched, $combinations, true)) {
+                    continue 2;
+                }
             }
+
+            return true;
         }
 
-        return true;
+        return false;
     }
 }
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ContextService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ContextService.php
index 2f764d97a9b..a1df4208921 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ContextService.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ContextService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
@@ -207,6 +207,7 @@ private function getStoreFrontAreaId(): ?int
     private function getStoreFrontCountryId(): ?int
     {
         $session = $this->container->get('session');
+
         if ($session->offsetGet('sCountry')) {
             return $session->offsetGet('sCountry');
         }
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CoreCache.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CoreCache.php
index 7dce68bc4b8..df76eaaf356 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CoreCache.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CoreCache.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CustomFacetService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CustomFacetService.php
index d9022191fae..d1de84c647b 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CustomFacetService.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CustomFacetService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CustomSortingService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CustomSortingService.php
index e36c034afa8..0182adae682 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CustomSortingService.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CustomSortingService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CustomerService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CustomerService.php
index 783fb07c27a..0dc5b690951 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CustomerService.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/CustomerService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/GraduatedPricesService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/GraduatedPricesService.php
index 85239de6440..14af17431c4 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/GraduatedPricesService.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/GraduatedPricesService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
@@ -65,14 +65,14 @@ public function getList($products, ShopContextInterface $context)
             $group
         );
 
-        //iterates the passed prices and products and assign the product unit to the prices and the passed customer group
+        // iterates the passed prices and products and assign the product unit to the prices and the passed customer group
         $prices = $this->buildPrices(
             $products,
             $specify,
             $group
         );
 
-        //check if one of the products have no assigned price within the prices variable.
+        // check if one of the products have no assigned price within the prices variable.
         $fallbackProducts = array_filter(
             $products,
             function (ListProduct $product) use ($prices) {
@@ -81,7 +81,7 @@ function (ListProduct $product) use ($prices) {
         );
 
         if (!empty($fallbackProducts)) {
-            //if some product has no price, we have to load the fallback customer group prices for the fallbackProducts.
+            // if some product has no price, we have to load the fallback customer group prices for the fallbackProducts.
             $fallbackPrices = $this->graduatedPricesGateway->getList(
                 $fallbackProducts,
                 $context,
@@ -94,8 +94,8 @@ function (ListProduct $product) use ($prices) {
                 $context->getFallbackCustomerGroup()
             );
 
-            //Do not use array_merge here. Since it will reindex the numbers of fallbackPrices.
-            $prices = $prices + $fallbackPrices;
+            // Do not use array_merge here. Since it will reindex the numbers of fallbackPrices.
+            $prices += $fallbackPrices;
         }
 
         $priceGroups = $context->getPriceGroups();
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/HrefLangService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/HrefLangService.php
index a6948b58e10..52aeac425ec 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/HrefLangService.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/HrefLangService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
@@ -218,6 +218,10 @@ private function isUrlHome(array $parameters): bool
             return true;
         }
 
+        if (!isset($parameters['controller'], $parameters['action'])) {
+            return false;
+        }
+
         if ($parameters['controller'] === 'index' && $parameters['action'] === 'index') {
             return true;
         }
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ListProductService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ListProductService.php
index 0d0fe46aa5b..78cadc5ccd4 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ListProductService.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ListProductService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ListingLinkRewriteService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ListingLinkRewriteService.php
index 56c633ae402..9285e5933c0 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ListingLinkRewriteService.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ListingLinkRewriteService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
@@ -45,6 +45,12 @@ public function __construct(ConfiguratorServiceInterface $configuratorService, R
         $this->router = $router;
     }
 
+    /**
+     * @param array<string, mixed> $articles
+     * @param int|null             $categoryId
+     *
+     * @return array<string, mixed>
+     */
     public function rewriteLinks(
         Criteria $criteria,
         array $articles,
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/LocationService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/LocationService.php
index 4d9f11a5289..e32f85fd462 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/LocationService.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/LocationService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ManufacturerService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ManufacturerService.php
index d78420d1d65..7441ca3c320 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ManufacturerService.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ManufacturerService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/MarketingService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/MarketingService.php
index 79742457f25..f56cd197559 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/MarketingService.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/MarketingService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/MediaService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/MediaService.php
index b661f2fc50a..78579be9d95 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/MediaService.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/MediaService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/PriceCalculationService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/PriceCalculationService.php
index b444c167f27..a50f7030f95 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/PriceCalculationService.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/PriceCalculationService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/PriceCalculator.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/PriceCalculator.php
index 1513c016435..35bc63ee9db 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/PriceCalculator.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/PriceCalculator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
@@ -53,15 +53,15 @@ public function calculatePrice($price, Tax $tax, ShopContextInterface $context)
          * by the percentage discount value of the current customer group.
          */
         if ($customerGroup->useDiscount() && $customerGroup->getPercentageDiscount()) {
-            $price = $price - ($price / 100 * $customerGroup->getPercentageDiscount());
+            $price -= ($price / 100 * $customerGroup->getPercentageDiscount());
         }
 
-        /**
+        /*
          * Currency calculation:
          * If the customer is currently in a sub shop with another currency, like dollar,
-         * we have to calculate the the price for the other currency.
+         * we have to calculate the price for the other currency.
          */
-        $price = $price * $context->getCurrency()->getFactor();
+        $price *= $context->getCurrency()->getFactor();
 
         /*
          * check if the customer group should see gross prices.
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ProductDownloadService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ProductDownloadService.php
index 56252a291d5..10bde490a56 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ProductDownloadService.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ProductDownloadService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ProductLinkService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ProductLinkService.php
index 391361ad965..aacc58d482c 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ProductLinkService.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ProductLinkService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ProductNumberService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ProductNumberService.php
index 35cbe4a9acf..ec51dd280e5 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ProductNumberService.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ProductNumberService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
@@ -62,7 +62,7 @@ public function getMainProductNumberById($productId)
         $number = $query->execute()->fetch(PDO::FETCH_COLUMN);
 
         if (!$number) {
-            throw new RuntimeException(sprintf('No valid product number found by id %d', $productId));
+            throw new RuntimeException(\sprintf('No valid product number found by id %d', $productId));
         }
 
         return $number;
@@ -76,11 +76,11 @@ public function getAvailableNumber($number, ShopContextInterface $context, $sele
         $productId = $this->getProductIdByNumber($number);
 
         if ($productId === 0) {
-            throw new RuntimeException(sprintf('No valid product id found for product with number "%s"', $number));
+            throw new RuntimeException(\sprintf('No valid product id found for product with number "%s"', $number));
         }
 
         if (!$this->isProductAvailableInShop($productId, $context->getShop())) {
-            throw new RuntimeException(sprintf('Product with number "%s" is not available in current shop', $number));
+            throw new RuntimeException(\sprintf('Product with number "%s" is not available in current shop', $number));
         }
 
         $selected = '';
@@ -102,7 +102,7 @@ public function getAvailableNumber($number, ShopContextInterface $context, $sele
 
         $selected = $this->findFallbackById($productId);
         if ($selected === '') {
-            throw new RuntimeException(sprintf('No active product variant found for product with number "%s" and id "%s"', $number, $productId));
+            throw new RuntimeException(\sprintf('No active product variant found for product with number "%s" and id "%s"', $number, $productId));
         }
 
         return $selected;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ProductService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ProductService.php
index 54e483d1280..97b83c996a0 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ProductService.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ProductService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/PropertyService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/PropertyService.php
index 4c924022ce9..5d23f045b5f 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/PropertyService.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/PropertyService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/RelatedProductStreamsService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/RelatedProductStreamsService.php
index c2925939e54..073c3b20bdc 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/RelatedProductStreamsService.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/RelatedProductStreamsService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/RelatedProductsService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/RelatedProductsService.php
index b539ea7a904..5f5f1f41e3b 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/RelatedProductsService.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/RelatedProductsService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ShopContextFactory.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ShopContextFactory.php
index 5763279010b..41c3505dadf 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ShopContextFactory.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ShopContextFactory.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
@@ -31,6 +31,7 @@
 use Shopware\Bundle\StoreFrontBundle\Gateway\PriceGroupDiscountGatewayInterface;
 use Shopware\Bundle\StoreFrontBundle\Gateway\ShopGatewayInterface;
 use Shopware\Bundle\StoreFrontBundle\Gateway\TaxGatewayInterface;
+use Shopware\Bundle\StoreFrontBundle\Struct\Country;
 use Shopware\Bundle\StoreFrontBundle\Struct\Shop;
 use Shopware\Bundle\StoreFrontBundle\Struct\ShopContext;
 use Shopware\Bundle\StoreFrontBundle\Struct\ShopContextInterface;
@@ -118,6 +119,7 @@ public function create(
             $currency = $this->currencyGateway->getList([$currencyId]);
             $currency = array_shift($currency);
         }
+
         if (!$currency) {
             $currency = $shop->getCurrency();
         }
@@ -132,6 +134,10 @@ public function create(
         $country = null;
         if ($countryId !== null) {
             $country = $this->countryGateway->getCountry($countryId, $context);
+        } else {
+            if (method_exists($this->countryGateway, 'getFallbackCountry')) {
+                $country = $this->countryGateway->getFallbackCountry($context);
+            }
         }
 
         $state = null;
@@ -139,7 +145,12 @@ public function create(
             $state = $this->countryGateway->getState($stateId, $context);
         }
 
+        if (!$area && $country instanceof Country && \is_int($country->getAreaId())) {
+            $area = $this->countryGateway->getArea($country->getAreaId(), $context);
+        }
+
         $taxRules = $this->taxGateway->getRules($currentCustomerGroup, $area, $country, $state);
+
         $priceGroups = $this->priceGroupDiscountGateway->getPriceGroups($currentCustomerGroup, $context);
 
         return new ShopContext(
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ShopContextFactoryInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ShopContextFactoryInterface.php
index 0930a1d85d9..4dca865a15c 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ShopContextFactoryInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ShopContextFactoryInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ShopPageService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ShopPageService.php
index 23b859d4c12..40c1d94dae0 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ShopPageService.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/ShopPageService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/SimilarProductsService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/SimilarProductsService.php
index dd05cfd8f17..44eef291702 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/SimilarProductsService.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/SimilarProductsService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
@@ -86,7 +86,7 @@ public function getList($products, ShopContextInterface $context)
          * Loads the list product data for the selected numbers.
          * All numbers are joined in the `extractNumbers` function to prevent that a product will be loaded multiple times
          */
-        $listProducts = $this->listProductService->getList(
+        $similarProducts = $this->listProductService->getList(
             $this->extractNumbers($numbers),
             $context
         );
@@ -101,7 +101,7 @@ public function getList($products, ShopContextInterface $context)
             }
 
             $result[$product->getNumber()] = $this->getProductsByNumbers(
-                $listProducts,
+                $similarProducts,
                 $numbers[$product->getId()]
             );
         }
@@ -135,18 +135,21 @@ public function getList($products, ShopContextInterface $context)
     }
 
     /**
-     * @param array<string, ListProduct> $products
-     * @param array<string>              $numbers
+     * @param array<string, ListProduct> $similarProducts
+     * @param array<string>              $similarProductNumbersByProductId
      *
      * @return array<string, ListProduct>
      */
-    private function getProductsByNumbers(array $products, array $numbers): array
+    private function getProductsByNumbers(array $similarProducts, array $similarProductNumbersByProductId): array
     {
+        $maxSimilarProducts = (int) $this->config->get('maxcrosssimilar');
+        $count = 1;
         $result = [];
 
-        foreach ($products as $product) {
-            if (\in_array($product->getNumber(), $numbers)) {
+        foreach ($similarProducts as $product) {
+            if ($count <= $maxSimilarProducts && \in_array($product->getNumber(), $similarProductNumbersByProductId, true)) {
                 $result[$product->getNumber()] = $product;
+                ++$count;
             }
         }
 
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/VariantCoverService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/VariantCoverService.php
index bfdc19b4ae4..97520c5abc3 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/VariantCoverService.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/VariantCoverService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/VariantListingPriceService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/VariantListingPriceService.php
index 684c9fa49e3..543b67f30db 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/VariantListingPriceService.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/VariantListingPriceService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
@@ -71,7 +71,7 @@ public function updatePrices(Criteria $criteria, ProductSearchResult $result, Sh
             return;
         }
 
-        //executed if no price condition included in search request
+        // executed if no price condition included in search request
 
         $this->loadPrices($criteria, $result, $context);
     }
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/VoteService.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/VoteService.php
index c94f584479e..3e64a18805b 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/VoteService.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/Core/VoteService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service\Core;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/CustomFacetServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/CustomFacetServiceInterface.php
index 3dd8d040843..fc574b95e0f 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/CustomFacetServiceInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/CustomFacetServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/CustomSortingServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/CustomSortingServiceInterface.php
index 21c1f362008..8ed97c8d142 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/CustomSortingServiceInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/CustomSortingServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/CustomerServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/CustomerServiceInterface.php
index 0521be715fd..999a3a632d8 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/CustomerServiceInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/CustomerServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service;
@@ -29,7 +29,7 @@
 interface CustomerServiceInterface
 {
     /**
-     * @param int[] $customerIds
+     * @param array<int> $customerIds
      *
      * @return array<int, Customer> indexed by customer id
      */
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/GraduatedPricesServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/GraduatedPricesServiceInterface.php
index 081b1604e37..17e9b7c34f4 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/GraduatedPricesServiceInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/GraduatedPricesServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service;
@@ -32,7 +32,7 @@
 interface GraduatedPricesServiceInterface
 {
     /**
-     * @see \Shopware\Bundle\StoreFrontBundle\Service\Core\GraduatedPricesServiceInterface::get()
+     * @see Core\GraduatedPricesServiceInterface::get()
      * @deprecated 5.7, interface will require a ShopContextInterface in 5.8
      *
      * @param ListProduct[] $products
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/HrefLangServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/HrefLangServiceInterface.php
index d18d40484b8..eded5853fe1 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/HrefLangServiceInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/HrefLangServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/ListProductServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/ListProductServiceInterface.php
index ecd4331ef6c..2b9914f76f1 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/ListProductServiceInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/ListProductServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service;
@@ -35,7 +35,7 @@ interface ListProductServiceInterface
      * please refer to the linked classes.
      *
      * @deprecated 5.7, interface will require a ShopContextInterface in 5.8
-     * @see \Shopware\Bundle\StoreFrontBundle\Service\ListProductServiceInterface::get()
+     * @see ListProductServiceInterface::get()
      *
      * @param array<string> $numbers
      *
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/ListingLinkRewriteServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/ListingLinkRewriteServiceInterface.php
index f9b48091d12..e3113806473 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/ListingLinkRewriteServiceInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/ListingLinkRewriteServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/LocationServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/LocationServiceInterface.php
index d7ac4beb70b..13eec1e8908 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/LocationServiceInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/LocationServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/ManufacturerServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/ManufacturerServiceInterface.php
index c27f369a849..76588ed2a9a 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/ManufacturerServiceInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/ManufacturerServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/MarketingServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/MarketingServiceInterface.php
index 3687dea3c76..c1ca814f18a 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/MarketingServiceInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/MarketingServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/MediaServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/MediaServiceInterface.php
index e0151933a39..8bc9cc7d7a9 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/MediaServiceInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/MediaServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service;
@@ -55,7 +55,7 @@ public function get($id, ShopContextInterface $context);
     public function getList($ids, ShopContextInterface $context);
 
     /**
-     * @see \Shopware\Bundle\StoreFrontBundle\Service\MediaServiceInterface::getProductMedia()
+     * @see MediaServiceInterface::getProductMedia()
      *
      * @param BaseProduct[] $products
      *
@@ -81,7 +81,7 @@ public function getProductsMedia($products, ShopContextInterface $context);
     public function getCover(BaseProduct $product, ShopContextInterface $context);
 
     /**
-     * @see \Shopware\Bundle\StoreFrontBundle\Service\MediaServiceInterface::getCover()
+     * @see MediaServiceInterface::getCover()
      *
      * @param BaseProduct[] $products
      *
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/PriceCalculationServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/PriceCalculationServiceInterface.php
index 12412a44747..f41c8a27e0e 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/PriceCalculationServiceInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/PriceCalculationServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/PriceCalculatorInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/PriceCalculatorInterface.php
index 34508456bac..3a537c7f474 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/PriceCalculatorInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/PriceCalculatorInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/ProductDownloadServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/ProductDownloadServiceInterface.php
index 20fa34c98a4..530ac7701a4 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/ProductDownloadServiceInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/ProductDownloadServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service;
@@ -34,7 +34,7 @@ interface ProductDownloadServiceInterface
      * To get detailed information about the selection conditions, structure and content of the returned object,
      * please refer to the linked classes.
      *
-     * @see \Shopware\Bundle\StoreFrontBundle\Service\ProductDownloadServiceInterface::get()
+     * @see ProductDownloadServiceInterface::get()
      *
      * @param BaseProduct[] $products
      *
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/ProductLinkServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/ProductLinkServiceInterface.php
index 943fdcaa5dd..683e9fc2756 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/ProductLinkServiceInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/ProductLinkServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service;
@@ -34,7 +34,7 @@ interface ProductLinkServiceInterface
      * To get detailed information about the selection conditions, structure and content of the returned object,
      * please refer to the linked classes.
      *
-     * @see \Shopware\Bundle\StoreFrontBundle\Service\ProductLinkServiceInterface::get()
+     * @see ProductLinkServiceInterface::get()
      *
      * @param BaseProduct[] $products
      *
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/ProductNumberServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/ProductNumberServiceInterface.php
index b3ef7906eee..f5812962f79 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/ProductNumberServiceInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/ProductNumberServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/ProductServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/ProductServiceInterface.php
index 892a4ea4b10..c1f89ff2707 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/ProductServiceInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/ProductServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service;
@@ -31,7 +31,7 @@
 interface ProductServiceInterface extends ListProductServiceInterface
 {
     /**
-     * @see \Shopware\Bundle\StoreFrontBundle\Service\ProductServiceInterface::get()
+     * @see ProductServiceInterface::get()
      * @deprecated 5.7, interface will require a ShopContextInterface in 5.8
      *
      * @param string[] $numbers
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/PropertyServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/PropertyServiceInterface.php
index bcb9e168044..237c1dc75ca 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/PropertyServiceInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/PropertyServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service;
@@ -34,7 +34,7 @@ interface PropertyServiceInterface
      * To get detailed information about the selection conditions, structure and content of the returned object,
      * please refer to the linked classes.
      *
-     * @see \Shopware\Bundle\StoreFrontBundle\Service\PropertyServiceInterface::get()
+     * @see PropertyServiceInterface::get()
      *
      * @param BaseProduct[] $products
      *
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/RelatedProductStreamsServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/RelatedProductStreamsServiceInterface.php
index 4ffa56db091..94386967a03 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/RelatedProductStreamsServiceInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/RelatedProductStreamsServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service;
@@ -31,7 +31,7 @@
 interface RelatedProductStreamsServiceInterface
 {
     /**
-     * @see \Shopware\Bundle\StoreFrontBundle\Service\RelatedProductStreamsServiceInterface::get()
+     * @see RelatedProductStreamsServiceInterface::get()
      *
      * @param BaseProduct[] $products
      *
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/RelatedProductsServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/RelatedProductsServiceInterface.php
index a37c33f4a9c..f512f7710c7 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/RelatedProductsServiceInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/RelatedProductsServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service;
@@ -32,7 +32,7 @@
 interface RelatedProductsServiceInterface
 {
     /**
-     * @see \Shopware\Bundle\StoreFrontBundle\Service\RelatedProductsServiceInterface::get()
+     * @see RelatedProductsServiceInterface::get()
      * @deprecated 5.7, interface will require a ShopContextInterface in 5.8
      *
      * @param BaseProduct[] $products
@@ -51,7 +51,7 @@ public function getList($products, ProductContextInterface $context);
      * To get detailed information about the selection conditions, structure and content of the returned object,
      * please refer to the linked classes.
      *
-     * @see \Shopware\Bundle\StoreFrontBundle\Service\ListProductServiceInterface::get()
+     * @see ListProductServiceInterface::get()
      * @deprecated 5.7, interface will require a ShopContextInterface in 5.8
      *
      * @return array<string, BaseProduct>|null indexed by the product order number
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/ShopPageServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/ShopPageServiceInterface.php
index 69565845e77..36187cf4b9a 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/ShopPageServiceInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/ShopPageServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/SimilarProductsServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/SimilarProductsServiceInterface.php
index 743dcb6fd86..15ee89bb95a 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/SimilarProductsServiceInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/SimilarProductsServiceInterface.php
@@ -1,37 +1,36 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service;
 
 use Shopware\Bundle\StoreFrontBundle\Struct\ListProduct;
 use Shopware\Bundle\StoreFrontBundle\Struct\ProductContextInterface;
-use Shopware\Bundle\StoreFrontBundle\Struct\ShopContextInterface;
 
 interface SimilarProductsServiceInterface
 {
     /**
-     * @see \Shopware\Bundle\StoreFrontBundle\Service\SimilarProductsServiceInterface::get()
+     * @see SimilarProductsServiceInterface::get()
      * @deprecated 5.7, interface will require a ShopContextInterface in 5.8
      *
      * @param ListProduct[] $products
@@ -53,7 +52,7 @@ public function getList($products, ProductContextInterface $context);
      * To get detailed information about the selection conditions, structure and content of the returned object,
      * please refer to the linked classes.
      *
-     * @see \Shopware\Bundle\StoreFrontBundle\Service\ListProductServiceInterface::get()
+     * @see ListProductServiceInterface::get()
      * @deprecated 5.7, interface will require a ShopContextInterface in 5.8
      *
      * @return array<string, ListProduct>|null indexed by the product order number
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/VariantCoverServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/VariantCoverServiceInterface.php
index 266027eda52..f419246aad7 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/VariantCoverServiceInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/VariantCoverServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/VariantListingPriceServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/VariantListingPriceServiceInterface.php
index b08ddb1eea4..fffac0fd85d 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/VariantListingPriceServiceInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/VariantListingPriceServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Service/VoteServiceInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Service/VoteServiceInterface.php
index d5240eeb0ed..9cb20d8923b 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Service/VoteServiceInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Service/VoteServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Service;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/StoreFrontBundle.php b/engine/Shopware/Bundle/StoreFrontBundle/StoreFrontBundle.php
index 03c52c09816..dd902be6774 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/StoreFrontBundle.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/StoreFrontBundle.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Address.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Address.php
index ec3dae02f4f..6c26c7b47e8 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Address.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Address.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Attribute.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Attribute.php
index a1cba989a5c..b3b3a5f709c 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Attribute.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Attribute.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct;
@@ -165,7 +165,7 @@ public function offsetUnset($offset)
 
     private function isValid($value): bool
     {
-        if ($value instanceof JsonSerializable || is_scalar($value) || $value === null) {
+        if ($value instanceof JsonSerializable || \is_scalar($value) || $value === null) {
             return true;
         }
 
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/BaseProduct.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/BaseProduct.php
index 616d5b3d8a4..bcc5d414352 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/BaseProduct.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/BaseProduct.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Blog/Blog.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Blog/Blog.php
index 6f8a089d1e5..d8c76200dd7 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Blog/Blog.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Blog/Blog.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct\Blog;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Category.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Category.php
index 332e309328a..e4c9bf3b152 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Category.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Category.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct;
@@ -121,7 +121,7 @@ class Category extends Extendable
     /**
      * @var string|null
      */
-    protected $productBoxLayout = null;
+    protected $productBoxLayout;
 
     /**
      * @var ProductStream|null
@@ -151,6 +151,7 @@ public static function createFromCategoryEntity(CategoryEntity $category)
             $path = rtrim($path, '|');
 
             $path = explode('|', $path);
+            $path = array_map('\intval', $path);
 
             $struct->setPath(array_reverse($path));
         }
@@ -359,7 +360,7 @@ public function setBlog($blog)
     }
 
     /**
-     * @param \Shopware\Bundle\StoreFrontBundle\Struct\Media $media
+     * @param Media $media
      */
     public function setMedia($media)
     {
@@ -367,7 +368,7 @@ public function setMedia($media)
     }
 
     /**
-     * @return \Shopware\Bundle\StoreFrontBundle\Struct\Media|null
+     * @return Media|null
      */
     public function getMedia()
     {
@@ -470,7 +471,7 @@ public function getProductStream()
         return $this->productStream;
     }
 
-    public function setProductStream(ProductStream $productStream = null)
+    public function setProductStream(?ProductStream $productStream = null)
     {
         $this->productStream = $productStream;
     }
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Configurator/Group.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Configurator/Group.php
index 99a092e1f36..873b1a1dd50 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Configurator/Group.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Configurator/Group.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct\Configurator;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Configurator/Option.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Configurator/Option.php
index 9225cf8c90f..11452740ccc 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Configurator/Option.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Configurator/Option.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct\Configurator;
@@ -103,7 +103,7 @@ public function setSelected($selected)
     }
 
     /**
-     * @return \Shopware\Bundle\StoreFrontBundle\Struct\Media|null
+     * @return Media|null
      */
     public function getMedia()
     {
@@ -111,7 +111,7 @@ public function getMedia()
     }
 
     /**
-     * @param \Shopware\Bundle\StoreFrontBundle\Struct\Media $media
+     * @param Media $media
      */
     public function setMedia($media)
     {
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Configurator/Set.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Configurator/Set.php
index 50365e89ee6..474c57db0de 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Configurator/Set.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Configurator/Set.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct\Configurator;
@@ -97,7 +97,7 @@ public function getType()
     }
 
     /**
-     * @return \Shopware\Bundle\StoreFrontBundle\Struct\Configurator\Group[]
+     * @return Group[]
      */
     public function getGroups()
     {
@@ -105,7 +105,7 @@ public function getGroups()
     }
 
     /**
-     * @param \Shopware\Bundle\StoreFrontBundle\Struct\Configurator\Group[] $groups
+     * @param Group[] $groups
      */
     public function setGroups($groups)
     {
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Country.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Country.php
index c3e3f871e24..2536db2ad8d 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Country.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Country.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct;
@@ -301,7 +301,7 @@ public function allowShipping()
     }
 
     /**
-     * @return Country\State[]
+     * @return State[]
      */
     public function getStates()
     {
@@ -309,7 +309,7 @@ public function getStates()
     }
 
     /**
-     * @param Country\State[] $states
+     * @param State[] $states
      */
     public function setStates($states)
     {
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Country/Area.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Country/Area.php
index 5d3a4844e27..b03184ebd62 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Country/Area.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Country/Area.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct\Country;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Country/State.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Country/State.php
index 5ad6505ebfe..1fc72487f4c 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Country/State.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Country/State.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct\Country;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Currency.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Currency.php
index 66ef8edfb4e..531f13e4386 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Currency.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Currency.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Customer.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Customer.php
index d76e93c7107..5333a4097a1 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Customer.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Customer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Customer/Group.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Customer/Group.php
index d60ae1553ae..0def23c8d93 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Customer/Group.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Customer/Group.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct\Customer;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Extendable.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Extendable.php
index 90b999c4117..2510ba9b4bc 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Extendable.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Extendable.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/HrefLang.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/HrefLang.php
index a6c14f9aada..c50fbb94e5f 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/HrefLang.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/HrefLang.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/ListProduct.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/ListProduct.php
index 2e87b7a5370..e729d5c91da 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/ListProduct.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/ListProduct.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct;
@@ -868,10 +868,7 @@ public function getPriceGroup()
         return $this->priceGroup;
     }
 
-    /**
-     * @param PriceGroup $priceGroup
-     */
-    public function setPriceGroup(PriceGroup $priceGroup = null)
+    public function setPriceGroup(?PriceGroup $priceGroup = null)
     {
         $this->priceGroup = $priceGroup;
     }
@@ -1012,10 +1009,7 @@ public function getEsd()
         return $this->esd;
     }
 
-    /**
-     * @param Esd $esd
-     */
-    public function setEsd(Esd $esd = null)
+    public function setEsd(?Esd $esd = null)
     {
         $this->esd = $esd;
     }
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Locale.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Locale.php
index da535a54c09..260a69b8749 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Locale.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Locale.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Media.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Media.php
index 0ae704272d0..e1efd6da970 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Media.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Media.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Payment.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Payment.php
index 27da23a3e12..3da8939ad6c 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Payment.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Payment.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product.php
index 81668edc5b5..0fed5b5edce 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct;
@@ -48,12 +48,12 @@ class Product extends ListProduct
     protected $similarProducts = [];
 
     /**
-     * @var Product\Download[]
+     * @var Download[]
      */
     protected $downloads = [];
 
     /**
-     * @var Product\Link[]
+     * @var Link[]
      */
     protected $links = [];
 
@@ -63,7 +63,7 @@ class Product extends ListProduct
     protected $media = [];
 
     /**
-     * @var Product\Vote[]
+     * @var Vote[]
      */
     protected $votes = [];
 
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/Download.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/Download.php
index 79764529410..4d3323bea2e 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/Download.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/Download.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct\Product;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/Esd.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/Esd.php
index a0b4db551f7..8c6da640110 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/Esd.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/Esd.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct\Product;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/Link.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/Link.php
index ee990ae379d..d6a1caea7cb 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/Link.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/Link.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct\Product;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/Manufacturer.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/Manufacturer.php
index 6f98846af65..84bf7d77828 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/Manufacturer.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/Manufacturer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct\Product;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/MarketingAttribute.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/MarketingAttribute.php
index 25776b0c2ab..52f0c79d3e3 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/MarketingAttribute.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/MarketingAttribute.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct\Product;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/Price.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/Price.php
index 166cd5e2d37..3551c3b5aaa 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/Price.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/Price.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct\Product;
@@ -134,7 +134,7 @@ public function getRule()
         return $this->rule;
     }
 
-    public function setRule(PriceRule $rule = null)
+    public function setRule(?PriceRule $rule = null)
     {
         $this->rule = $rule;
     }
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/PriceDiscount.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/PriceDiscount.php
index b2bf4ea49e0..ae36d4e5c45 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/PriceDiscount.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/PriceDiscount.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct\Product;
@@ -66,7 +66,7 @@ public function getId()
     }
 
     /**
-     * @param \Shopware\Bundle\StoreFrontBundle\Struct\Customer\Group $customerGroup
+     * @param Group $customerGroup
      */
     public function setCustomerGroup($customerGroup)
     {
@@ -74,7 +74,7 @@ public function setCustomerGroup($customerGroup)
     }
 
     /**
-     * @return \Shopware\Bundle\StoreFrontBundle\Struct\Customer\Group
+     * @return Group
      */
     public function getCustomerGroup()
     {
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/PriceGroup.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/PriceGroup.php
index 2fd3667f9ef..bba1acd8366 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/PriceGroup.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/PriceGroup.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct\Product;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/PriceRule.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/PriceRule.php
index a8b376b53cf..deaf0067673 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/PriceRule.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/PriceRule.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct\Product;
@@ -49,7 +49,7 @@ class PriceRule extends Extendable
     /**
      * @var int|null
      */
-    protected $to = null;
+    protected $to;
 
     /**
      * The pseudo price is used to fake a discount in the store front
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/Unit.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/Unit.php
index fd7e156bf35..e61b98d0794 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/Unit.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/Unit.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct\Product;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/Vote.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/Vote.php
index 1a40529fe24..f2f287e6e39 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/Vote.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/Vote.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct\Product;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/VoteAverage.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/VoteAverage.php
index 21b4b55b310..3625ef2f6ff 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/VoteAverage.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Product/VoteAverage.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct\Product;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/ProductContext.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/ProductContext.php
index 48da498a3fe..24a8dbc8305 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/ProductContext.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/ProductContext.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/ProductContextInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/ProductContextInterface.php
index e1efb84c04e..625b2ad8b9e 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/ProductContextInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/ProductContextInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/ProductStream.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/ProductStream.php
index fe11f9cf28b..e6fe478b24e 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/ProductStream.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/ProductStream.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Property/Group.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Property/Group.php
index 10112ff74c5..32b5d622b34 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Property/Group.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Property/Group.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct\Property;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Property/Option.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Property/Option.php
index 9e716648ce4..6a0fa86b76e 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Property/Option.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Property/Option.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct\Property;
@@ -90,7 +90,7 @@ public function getName()
     }
 
     /**
-     * @return \Shopware\Bundle\StoreFrontBundle\Struct\Media|null
+     * @return Media|null
      */
     public function getMedia()
     {
@@ -98,7 +98,7 @@ public function getMedia()
     }
 
     /**
-     * @param \Shopware\Bundle\StoreFrontBundle\Struct\Media $media
+     * @param Media $media
      */
     public function setMedia($media)
     {
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Property/Set.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Property/Set.php
index 3ceaf130391..bea2b32fa75 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Property/Set.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Property/Set.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct\Property;
@@ -109,7 +109,7 @@ public function getName()
     }
 
     /**
-     * @param \Shopware\Bundle\StoreFrontBundle\Struct\Property\Group[] $groups
+     * @param Group[] $groups
      *
      * @return $this
      */
@@ -121,7 +121,7 @@ public function setGroups($groups)
     }
 
     /**
-     * @return \Shopware\Bundle\StoreFrontBundle\Struct\Property\Group[]
+     * @return Group[]
      */
     public function getGroups()
     {
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Search/CustomFacet.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Search/CustomFacet.php
index 492fba60a76..a1dc38018de 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Search/CustomFacet.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Search/CustomFacet.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct\Search;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Search/CustomSorting.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Search/CustomSorting.php
index 97a82efc28a..f2a8a5de3ae 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Search/CustomSorting.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Search/CustomSorting.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct\Search;
@@ -50,7 +50,7 @@ class CustomSorting extends Extendable
     protected $position;
 
     /**
-     * @var SortingInterface[]
+     * @var array<SortingInterface>
      */
     protected $sortings;
 
@@ -119,7 +119,7 @@ public function setPosition($position)
     }
 
     /**
-     * @return SortingInterface[]
+     * @return array<SortingInterface>
      */
     public function getSortings()
     {
@@ -127,7 +127,7 @@ public function getSortings()
     }
 
     /**
-     * @param SortingInterface[] $sortings
+     * @param array<SortingInterface> $sortings
      */
     public function setSortings(array $sortings)
     {
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Shop.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Shop.php
index de6f34a0a87..e281c54b7e8 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Shop.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Shop.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct;
@@ -277,7 +277,7 @@ public function getHost()
     }
 
     /**
-     * @return \Shopware\Bundle\StoreFrontBundle\Struct\Category
+     * @return Category
      */
     public function getCategory()
     {
@@ -285,7 +285,7 @@ public function getCategory()
     }
 
     /**
-     * @param \Shopware\Bundle\StoreFrontBundle\Struct\Category $category
+     * @param Category $category
      */
     public function setCategory($category)
     {
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/ShopContext.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/ShopContext.php
index 445ac918593..f6eeb13603e 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/ShopContext.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/ShopContext.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct;
@@ -100,9 +100,9 @@ public function __construct(
         Group $fallbackCustomerGroup,
         array $taxRules,
         array $priceGroups,
-        Area $area = null,
-        Country $country = null,
-        State $state = null,
+        ?Area $area = null,
+        ?Country $country = null,
+        ?State $state = null,
         $customerStreamIds = []
     ) {
         $this->baseUrl = $baseUrl;
@@ -173,7 +173,7 @@ public function getTaxRule($taxId)
     {
         $key = 'tax_' . $taxId;
 
-        return $this->taxRules[$key];
+        return $this->taxRules[$key] ?? null;
     }
 
     /**
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/ShopContextInterface.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/ShopContextInterface.php
index 4756ae9a944..12987771158 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/ShopContextInterface.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/ShopContextInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/ShopPage.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/ShopPage.php
index a65eb379f5d..4ce84c757db 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/ShopPage.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/ShopPage.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Struct.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Struct.php
index 463faaa6e23..b74704305ea 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Struct.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Struct.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Tax.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Tax.php
index fe9c7356ef4..142938c4af9 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Tax.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Tax.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Template.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Template.php
index 1c8e20781e2..f598f853a7f 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Template.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Template.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct;
diff --git a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Thumbnail.php b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Thumbnail.php
index a5bff3eef9c..549f415c2c0 100644
--- a/engine/Shopware/Bundle/StoreFrontBundle/Struct/Thumbnail.php
+++ b/engine/Shopware/Bundle/StoreFrontBundle/Struct/Thumbnail.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Bundle\StoreFrontBundle\Struct;
diff --git a/engine/Shopware/Commands/AdminCreateCommand.php b/engine/Shopware/Commands/AdminCreateCommand.php
index 77811340bd3..b19bfcda6b1 100644
--- a/engine/Shopware/Commands/AdminCreateCommand.php
+++ b/engine/Shopware/Commands/AdminCreateCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
@@ -115,7 +115,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $this->persistUser($user);
 
-        $io->success(sprintf('Adminuser "%s" was successfully created.', $user->getUsername()));
+        $io->success(\sprintf('Adminuser "%s" was successfully created.', $user->getUsername()));
 
         return 0;
     }
@@ -153,7 +153,7 @@ private function getLocaleIdFromLocale(string $locale): int
             return $locales[$locale];
         }
 
-        throw new RuntimeException(sprintf('Backend Locale "%s" not supported', $locale));
+        throw new RuntimeException(\sprintf('Backend Locale "%s" not supported', $locale));
     }
 
     private function setPassword(User $user, string $plainPassword): void
diff --git a/engine/Shopware/Commands/CacheClearCommand.php b/engine/Shopware/Commands/CacheClearCommand.php
index 2e6b0c84dcb..aea469977d3 100644
--- a/engine/Shopware/Commands/CacheClearCommand.php
+++ b/engine/Shopware/Commands/CacheClearCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
@@ -62,7 +62,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $filesystem = $this->getContainer()->get('file_system');
 
         if (!is_writable($realCacheDir)) {
-            throw new RuntimeException(sprintf('Unable to write into directory "%s"', $realCacheDir));
+            throw new RuntimeException(\sprintf('Unable to write into directory "%s"', $realCacheDir));
         }
 
         if ($filesystem->exists($oldCacheDir)) {
@@ -70,7 +70,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $kernel = $this->getContainer()->get('kernel');
-        $io->comment(sprintf('Clearing the cache for the <info>%s</info> environment', $kernel->getEnvironment()));
+        $io->comment(\sprintf('Clearing the cache for the <info>%s</info> environment', $kernel->getEnvironment()));
 
         $filesystem->rename($realCacheDir, $oldCacheDir);
 
@@ -83,7 +83,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $io->comment('Finished');
         }
 
-        $io->success(sprintf('Cache for the "%s" environment was successfully cleared.', $kernel->getEnvironment()));
+        $io->success(\sprintf('Cache for the "%s" environment was successfully cleared.', $kernel->getEnvironment()));
 
         return 0;
     }
diff --git a/engine/Shopware/Commands/CloneCategoryTreeCommand.php b/engine/Shopware/Commands/CloneCategoryTreeCommand.php
index 80dfb45d06d..c80b0ea66c2 100644
--- a/engine/Shopware/Commands/CloneCategoryTreeCommand.php
+++ b/engine/Shopware/Commands/CloneCategoryTreeCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
@@ -234,9 +234,7 @@ private function duplicateCategory(
         $copyProductAssociations,
         $newRootCategoryId = null
     ) {
-        $categoryDuplicator = $this->container->get(CategoryDuplicator::class);
-
-        $newCategoryId = $categoryDuplicator->duplicateCategory($categoryId, $newParentId, $copyProductAssociations);
+        $newCategoryId = $this->container->get(CategoryDuplicator::class)->duplicateCategory($categoryId, $newParentId, $copyProductAssociations);
         $this->progressBar->advance();
 
         $childrenStmt = $this->container->get('db')->prepare('SELECT id FROM s_categories WHERE parent = :parent');
@@ -246,7 +244,8 @@ private function duplicateCategory(
         $newRootCategoryId = $newRootCategoryId ?: $newCategoryId;
 
         foreach ($children as $child) {
-            if ((int) $child !== (int) $newRootCategoryId) {
+            $child = (int) $child;
+            if ($child !== (int) $newRootCategoryId) {
                 $this->duplicateCategory($child, $newCategoryId, $copyProductAssociations, $newRootCategoryId);
             }
         }
diff --git a/engine/Shopware/Commands/ConfigSetCommand.php b/engine/Shopware/Commands/ConfigSetCommand.php
index 867043ae739..5f84f417b0d 100644
--- a/engine/Shopware/Commands/ConfigSetCommand.php
+++ b/engine/Shopware/Commands/ConfigSetCommand.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
diff --git a/engine/Shopware/Commands/CronListCommand.php b/engine/Shopware/Commands/CronListCommand.php
index b2eb9a94632..075edb0a971 100644
--- a/engine/Shopware/Commands/CronListCommand.php
+++ b/engine/Shopware/Commands/CronListCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
diff --git a/engine/Shopware/Commands/CronRunCommand.php b/engine/Shopware/Commands/CronRunCommand.php
index b89a6c07e6d..289074e47ed 100644
--- a/engine/Shopware/Commands/CronRunCommand.php
+++ b/engine/Shopware/Commands/CronRunCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
@@ -193,6 +193,6 @@ private function getJobByActionName(Enlight_Components_Cron_Manager $manager, $a
             return $job;
         }
 
-        throw new RuntimeException(sprintf('Cron not found by action name "%s".', $action));
+        throw new RuntimeException(\sprintf('Cron not found by action name "%s".', $action));
     }
 }
diff --git a/engine/Shopware/Commands/DatabaseSetupCommand.php b/engine/Shopware/Commands/DatabaseSetupCommand.php
index 4ebc8ae74f3..ffa4b5155d4 100644
--- a/engine/Shopware/Commands/DatabaseSetupCommand.php
+++ b/engine/Shopware/Commands/DatabaseSetupCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
@@ -80,7 +80,7 @@ protected function configure()
             'steps',
             null,
             InputOption::VALUE_REQUIRED,
-            sprintf('Valid steps: %s.', implode(', ', $this->validSteps))
+            \sprintf('Valid steps: %s.', implode(', ', $this->validSteps))
         );
 
         $this->addOption(
@@ -123,21 +123,19 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $rootDir = $this->getContainer()->getParameter('kernel.root_dir');
 
         if (!\is_string($rootDir)) {
-            throw new RuntimeException('Parameter kernel.root_dir has to be an string');
+            throw new RuntimeException('Parameter kernel.root_dir has to be a string');
         }
 
         $connection = $this->createConnection($dbConfig);
         $database = new Database($connection);
 
-        /** @var string $steps */
         $steps = $input->getOption('steps');
-        /** @var string[] $steps */
         $steps = array_filter(explode(',', $steps));
 
         foreach ($steps as $step) {
             if (!\in_array($step, $this->validSteps, true)) {
                 $io->error(
-                    sprintf("Unknown install step (%s). Valid steps: %s\n", $step, implode(', ', $this->validSteps))
+                    \sprintf("Unknown install step (%s). Valid steps: %s\n", $step, implode(', ', $this->validSteps))
                 );
 
                 return 1;
@@ -184,7 +182,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                     break;
 
                 default:
-                    $io->error(sprintf("Unknown install step (%s). Valid steps: %s\n", $step, implode(', ', $this->validSteps)));
+                    $io->error(\sprintf("Unknown install step (%s). Valid steps: %s\n", $step, implode(', ', $this->validSteps)));
 
                     return 1;
             }
@@ -261,7 +259,7 @@ private function parseUrl(InputInterface $input)
         if (!empty($url)) {
             if (parse_url($url) === false) {
                 throw new InvalidArgumentException(
-                    sprintf('Invalid Shop URL (%s).', $url)
+                    \sprintf('Invalid Shop URL (%s).', $url)
                 );
             }
 
diff --git a/engine/Shopware/Commands/FirstRunWizardDisableCommand.php b/engine/Shopware/Commands/FirstRunWizardDisableCommand.php
index 1aba8db990f..03060b8215a 100644
--- a/engine/Shopware/Commands/FirstRunWizardDisableCommand.php
+++ b/engine/Shopware/Commands/FirstRunWizardDisableCommand.php
@@ -1,36 +1,40 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
 
+use Doctrine\DBAL\Connection;
+use Shopware\Components\CacheManager;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class FirstRunWizardDisableCommand extends ShopwareCommand
 {
     /**
-     * {@inheritdoc}
+     * @return void
      */
     protected function configure()
     {
@@ -45,9 +49,9 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $conn = $this->container->get(\Doctrine\DBAL\Connection::class);
-        $elementId = $conn->fetchColumn('SELECT id FROM s_core_config_elements WHERE name LIKE "firstRunWizardEnabled"');
-        $valueid = $conn->fetchColumn('SELECT id FROM s_core_config_values WHERE element_id = :elementId', ['elementId' => $elementId]);
+        $conn = $this->container->get(Connection::class);
+        $elementId = (int) $conn->fetchOne('SELECT id FROM s_core_config_elements WHERE name LIKE "firstRunWizardEnabled"');
+        $valueId = (int) $conn->fetchOne('SELECT id FROM s_core_config_values WHERE element_id = :elementId', ['elementId' => $elementId]);
 
         $data = [
             'element_id' => $elementId,
@@ -55,18 +59,17 @@ protected function execute(InputInterface $input, OutputInterface $output)
             'value' => serialize(false),
         ];
 
-        if ($valueid) {
+        if ($valueId) {
             $conn->update(
                 's_core_config_values',
                 $data,
-                ['id' => $valueid]
+                ['id' => $valueId]
             );
         } else {
             $conn->insert('s_core_config_values', $data);
         }
 
-        /** @var \Shopware\Components\CacheManager $cacheManager */
-        $cacheManager = $this->container->get(\Shopware\Components\CacheManager::class);
+        $cacheManager = $this->container->get(CacheManager::class);
         $cacheManager->clearConfigCache();
 
         $output->writeln('<info>First Run Wizard disabled</info>');
diff --git a/engine/Shopware/Commands/FirstRunWizardEnableCommand.php b/engine/Shopware/Commands/FirstRunWizardEnableCommand.php
index 1662b62baba..ee96fd0d47f 100644
--- a/engine/Shopware/Commands/FirstRunWizardEnableCommand.php
+++ b/engine/Shopware/Commands/FirstRunWizardEnableCommand.php
@@ -1,36 +1,40 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
 
+use Doctrine\DBAL\Connection;
+use Shopware\Components\CacheManager;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class FirstRunWizardEnableCommand extends ShopwareCommand
 {
     /**
-     * {@inheritdoc}
+     * @return void
      */
     protected function configure()
     {
@@ -45,9 +49,9 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $conn = $this->container->get(\Doctrine\DBAL\Connection::class);
-        $elementId = $conn->fetchColumn('SELECT id FROM s_core_config_elements WHERE name LIKE "firstRunWizardEnabled"');
-        $valueid = $conn->fetchColumn('SELECT id FROM s_core_config_values WHERE element_id = :elementId', ['elementId' => $elementId]);
+        $conn = $this->container->get(Connection::class);
+        $elementId = (int) $conn->fetchOne('SELECT id FROM s_core_config_elements WHERE name LIKE "firstRunWizardEnabled"');
+        $valueId = (int) $conn->fetchOne('SELECT id FROM s_core_config_values WHERE element_id = :elementId', ['elementId' => $elementId]);
 
         $data = [
             'element_id' => $elementId,
@@ -55,18 +59,17 @@ protected function execute(InputInterface $input, OutputInterface $output)
             'value' => serialize(true),
         ];
 
-        if ($valueid) {
+        if ($valueId) {
             $conn->update(
                 's_core_config_values',
                 $data,
-                ['id' => $valueid]
+                ['id' => $valueId]
             );
         } else {
             $conn->insert('s_core_config_values', $data);
         }
 
-        /** @var \Shopware\Components\CacheManager $cacheManager */
-        $cacheManager = $this->container->get(\Shopware\Components\CacheManager::class);
+        $cacheManager = $this->container->get(CacheManager::class);
         $cacheManager->clearConfigCache();
 
         $output->writeln('<info>First Run Wizard enabled</info>');
diff --git a/engine/Shopware/Commands/GenerateAttributesCommand.php b/engine/Shopware/Commands/GenerateAttributesCommand.php
index 3456c7483b2..58b4b5b6b0f 100644
--- a/engine/Shopware/Commands/GenerateAttributesCommand.php
+++ b/engine/Shopware/Commands/GenerateAttributesCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
diff --git a/engine/Shopware/Commands/GenerateMigrationCommand.php b/engine/Shopware/Commands/GenerateMigrationCommand.php
index 5bce68c2fba..3f7def06eb1 100644
--- a/engine/Shopware/Commands/GenerateMigrationCommand.php
+++ b/engine/Shopware/Commands/GenerateMigrationCommand.php
@@ -1,28 +1,26 @@
 <?php
 
 declare(strict_types=1);
-
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
@@ -57,11 +55,11 @@ public function execute(InputInterface $input, OutputInterface $output)
         $migrationDirectory = $this->findMigrationDirectory($pluginName);
 
         if ($migrationDirectory === null) {
-            throw new RuntimeException(sprintf('Plugin by name "%s" does not exists', $pluginName));
+            throw new RuntimeException(\sprintf('Plugin by name "%s" does not exists', $pluginName));
         }
 
         if (!file_exists($migrationDirectory) && !mkdir($migrationDirectory, 0777, true) && !is_dir($migrationDirectory)) {
-            throw new RuntimeException(sprintf('Directory "%s" was not created', $migrationDirectory));
+            throw new RuntimeException(\sprintf('Directory "%s" was not created', $migrationDirectory));
         }
 
         $nextVersion = $this->getLatestMigrationVersion($migrationDirectory) + 1;
@@ -70,7 +68,7 @@ public function execute(InputInterface $input, OutputInterface $output)
 
         $io = new SymfonyStyle($input, $output);
 
-        $io->success(sprintf('Generated file "%s/%s"', $migrationDirectory, $fileName));
+        $io->success(\sprintf('Generated file "%s/%s"', $migrationDirectory, $fileName));
 
         return 0;
     }
@@ -118,7 +116,7 @@ private function getLatestMigrationVersion(string $migrationFolder): int
 
     private function createMigration(string $migrationFolder, string $migrationName, ?string $pluginName, int $nextVersion): string
     {
-        $fileName = sprintf('%d-%s.php', $nextVersion, $this->camelCaseToDash($migrationName));
+        $fileName = \sprintf('%d-%s.php', $nextVersion, $this->camelCaseToDash($migrationName));
 
         file_put_contents($migrationFolder . DIRECTORY_SEPARATOR . $fileName, $this->generateMigrationFileContent($pluginName, $nextVersion));
 
@@ -141,28 +139,27 @@ private function generateMigrationFileContent(?string $pluginName, int $nextVers
 
     private function createCoreMigration(int $nextVersion): string
     {
-        return sprintf('<?php
+        return \sprintf('<?php
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 class Migrations_Migration%d extends Shopware\Components\Migrations\AbstractMigration
 {
@@ -176,7 +173,7 @@ public function up($modus)
 
     private function createPluginMigration(string $pluginName, int $nextVersion): string
     {
-        return sprintf('<?php
+        return \sprintf('<?php
 
 namespace %s\Migrations;
 
diff --git a/engine/Shopware/Commands/GenerateProductFeedCommand.php b/engine/Shopware/Commands/GenerateProductFeedCommand.php
index 4ba07831b11..b4575d6a18b 100644
--- a/engine/Shopware/Commands/GenerateProductFeedCommand.php
+++ b/engine/Shopware/Commands/GenerateProductFeedCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
@@ -116,10 +116,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         if (!is_dir($this->cacheDir)) {
             if (@mkdir($this->cacheDir, 0777, true) === false) {
-                throw new RuntimeException(sprintf("Unable to create directory '%s'\n", $this->cacheDir));
+                throw new RuntimeException(\sprintf("Unable to create directory '%s'\n", $this->cacheDir));
             }
         } elseif (!is_writable($this->cacheDir)) {
-            throw new RuntimeException(sprintf("Unable to write in directory '%s'\n", $this->cacheDir));
+            throw new RuntimeException(\sprintf("Unable to write in directory '%s'\n", $this->cacheDir));
         }
 
         $feedId = (int) $input->getOption('feed-id');
@@ -148,16 +148,16 @@ protected function execute(InputInterface $input, OutputInterface $output)
             /** @var ProductFeed|null $productFeed */
             $productFeed = $productFeedRepository->find((int) $feedId);
             if ($productFeed === null) {
-                throw new RuntimeException(sprintf("Unable to load feed with id %s\n", $feedId));
+                throw new RuntimeException(\sprintf("Unable to load feed with id %s\n", $feedId));
             }
 
             if ($productFeed->getActive() !== 1) {
-                throw new RuntimeException(sprintf("The feed with id %s is not active\n", $feedId));
+                throw new RuntimeException(\sprintf("The feed with id %s is not active\n", $feedId));
             }
             $this->generateFeed($export, $productFeed);
         }
 
-        $this->output->writeln(sprintf('Product feed cache successfully refreshed'));
+        $this->output->writeln(\sprintf('Product feed cache successfully refreshed'));
 
         return 0;
     }
@@ -167,7 +167,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
      */
     private function generateFeed($export, ProductFeed $feedModel)
     {
-        $this->output->writeln(sprintf('Refreshing cache for ' . $feedModel->getName()));
+        $this->output->writeln(\sprintf('Refreshing cache for ' . $feedModel->getName()));
 
         $export->sFeedID = $feedModel->getId();
         $export->sHash = $feedModel->getHash();
@@ -181,7 +181,7 @@ private function generateFeed($export, ProductFeed $feedModel)
         $handleResource = fopen($feedCachePath, 'w');
 
         if (!\is_resource($handleResource)) {
-            throw new RuntimeException(sprintf('Feed cache path %s can not be opened', $feedCachePath));
+            throw new RuntimeException(\sprintf('Feed cache path %s can not be opened', $feedCachePath));
         }
 
         $export->executeExport($handleResource);
diff --git a/engine/Shopware/Commands/ListProductFeedCommand.php b/engine/Shopware/Commands/ListProductFeedCommand.php
index d7a3661e641..a636c07150b 100644
--- a/engine/Shopware/Commands/ListProductFeedCommand.php
+++ b/engine/Shopware/Commands/ListProductFeedCommand.php
@@ -4,23 +4,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
diff --git a/engine/Shopware/Commands/MigrateArticleAttributeTranslationsCommand.php b/engine/Shopware/Commands/MigrateArticleAttributeTranslationsCommand.php
index 296cc35653a..72bed2876a2 100644
--- a/engine/Shopware/Commands/MigrateArticleAttributeTranslationsCommand.php
+++ b/engine/Shopware/Commands/MigrateArticleAttributeTranslationsCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
@@ -196,7 +196,7 @@ private function getUpdatedTranslations($rows, $columns)
             try {
                 $updated = $this->filter(unserialize($row['objectdata'], ['allowed_classes' => false]), $columns);
             } catch (Exception $e) {
-                //serialize error - continue with next translation
+                // serialize error - continue with next translation
                 continue;
             }
 
diff --git a/engine/Shopware/Commands/MigrationsMigrateCommand.php b/engine/Shopware/Commands/MigrationsMigrateCommand.php
index 8f96bb7f9bb..c4829315b11 100644
--- a/engine/Shopware/Commands/MigrationsMigrateCommand.php
+++ b/engine/Shopware/Commands/MigrationsMigrateCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
diff --git a/engine/Shopware/Commands/PluginActivateCommand.php b/engine/Shopware/Commands/PluginActivateCommand.php
index 8b6fff1e57d..f8f7d992a39 100644
--- a/engine/Shopware/Commands/PluginActivateCommand.php
+++ b/engine/Shopware/Commands/PluginActivateCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
@@ -99,25 +99,25 @@ protected function execute(InputInterface $input, OutputInterface $output)
         try {
             $plugin = $pluginManager->getPluginByName($pluginName);
         } catch (Exception $e) {
-            $output->writeln(sprintf('Plugin by name "%s" was not found.', $pluginName));
+            $output->writeln(\sprintf('Plugin by name "%s" was not found.', $pluginName));
 
             return 1;
         }
 
         if ($plugin->getActive()) {
-            $output->writeln(sprintf('The plugin %s is already activated.', $pluginName));
+            $output->writeln(\sprintf('The plugin %s is already activated.', $pluginName));
 
             return 0;
         }
 
         if (!$plugin->getInstalled()) {
-            $output->writeln(sprintf('The plugin %s has to be installed first.', $pluginName));
+            $output->writeln(\sprintf('The plugin %s has to be installed first.', $pluginName));
 
             return 1;
         }
 
         $activationContext = $pluginManager->activatePlugin($plugin);
-        $output->writeln(sprintf('Plugin %s has been activated.', $pluginName));
+        $output->writeln(\sprintf('Plugin %s has been activated.', $pluginName));
 
         $this->clearCachesIfRequested($input, $output, $activationContext);
 
diff --git a/engine/Shopware/Commands/PluginCommand.php b/engine/Shopware/Commands/PluginCommand.php
index cda986ab641..a37e901620e 100644
--- a/engine/Shopware/Commands/PluginCommand.php
+++ b/engine/Shopware/Commands/PluginCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
@@ -70,7 +70,7 @@ protected function clearCaches(OutputInterface $output, ...$contexts)
         $cacheManager = $this->container->get(CacheManager::class);
         $cacheTags = $this->getScheduledCaches(...$contexts);
         if ($cacheManager->clearByTags($cacheTags)) {
-            $output->writeln(sprintf('Caches cleared (%s).', implode(', ', $cacheTags)));
+            $output->writeln(\sprintf('Caches cleared (%s).', implode(', ', $cacheTags)));
         }
     }
 
diff --git a/engine/Shopware/Commands/PluginConfigListCommand.php b/engine/Shopware/Commands/PluginConfigListCommand.php
index 24c5ac433c7..f20df8c0e48 100644
--- a/engine/Shopware/Commands/PluginConfigListCommand.php
+++ b/engine/Shopware/Commands/PluginConfigListCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
@@ -105,7 +105,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         try {
             $plugin = $pluginManager->getPluginByName($pluginName);
         } catch (Exception $e) {
-            $output->writeln(sprintf('Plugin by name "%s" was not found.', $pluginName));
+            $output->writeln(\sprintf('Plugin by name "%s" was not found.', $pluginName));
 
             return 1;
         }
@@ -126,7 +126,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             /** @var Shop|null $shop */
             $shop = $em->getRepository(Shop::class)->find($shopId);
             if (!$shop) {
-                $output->writeln(sprintf('Could not find shop with id %s.', $shopId));
+                $output->writeln(\sprintf('Could not find shop with id %s.', $shopId));
 
                 return 1;
             }
@@ -139,7 +139,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         foreach ($shops as $shop) {
             $config = $pluginManager->getPluginConfig($plugin, $shop);
 
-            $output->writeln(sprintf('Plugin configuration for Plugin %s and shop %s:', $pluginName, $shop->getName()));
+            $output->writeln(\sprintf('Plugin configuration for Plugin %s and shop %s:', $pluginName, $shop->getName()));
             $output->writeln(print_r($config, true));
         }
 
diff --git a/engine/Shopware/Commands/PluginConfigSetCommand.php b/engine/Shopware/Commands/PluginConfigSetCommand.php
index fcd218609c8..5d84177d5fb 100644
--- a/engine/Shopware/Commands/PluginConfigSetCommand.php
+++ b/engine/Shopware/Commands/PluginConfigSetCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
@@ -167,7 +167,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         try {
             $plugin = $pluginManager->getPluginByName($pluginName);
         } catch (Exception $e) {
-            $output->writeln(sprintf('Plugin by name "%s" was not found.', $pluginName));
+            $output->writeln(\sprintf('Plugin by name "%s" was not found.', $pluginName));
 
             return 1;
         }
@@ -189,7 +189,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $shop = $em->getRepository(Shop::class)->find($shopId);
 
             if (!$shop) {
-                $output->writeln(sprintf('Could not find shop with id %s.', $shopId));
+                $output->writeln(\sprintf('Could not find shop with id %s.', $shopId));
 
                 return 1;
             }
@@ -209,7 +209,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $pluginManager->saveConfigElement($plugin, $input->getArgument('key'), $value, $shop);
-        $output->writeln(sprintf('Plugin configuration for Plugin %s saved.', $pluginName));
+        $output->writeln(\sprintf('Plugin configuration for Plugin %s saved.', $pluginName));
 
         return 0;
     }
diff --git a/engine/Shopware/Commands/PluginDeactivateCommand.php b/engine/Shopware/Commands/PluginDeactivateCommand.php
index dc0382c5d7c..d33b6ed1d71 100644
--- a/engine/Shopware/Commands/PluginDeactivateCommand.php
+++ b/engine/Shopware/Commands/PluginDeactivateCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
@@ -99,19 +99,19 @@ protected function execute(InputInterface $input, OutputInterface $output)
         try {
             $plugin = $pluginManager->getPluginByName($pluginName);
         } catch (Exception $e) {
-            $output->writeln(sprintf('Plugin by name "%s" was not found.', $pluginName));
+            $output->writeln(\sprintf('Plugin by name "%s" was not found.', $pluginName));
 
             return 1;
         }
 
         if (!$plugin->getActive()) {
-            $output->writeln(sprintf('The plugin %s is already deactivated.', $pluginName));
+            $output->writeln(\sprintf('The plugin %s is already deactivated.', $pluginName));
 
             return 1;
         }
 
         $deactivationContext = $pluginManager->deactivatePlugin($plugin);
-        $output->writeln(sprintf('Plugin %s has been deactivated', $pluginName));
+        $output->writeln(\sprintf('Plugin %s has been deactivated', $pluginName));
 
         $this->clearCachesIfRequested($input, $output, $deactivationContext);
 
diff --git a/engine/Shopware/Commands/PluginDeleteCommand.php b/engine/Shopware/Commands/PluginDeleteCommand.php
index 26f28475ec9..f6f9d366bef 100644
--- a/engine/Shopware/Commands/PluginDeleteCommand.php
+++ b/engine/Shopware/Commands/PluginDeleteCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
@@ -114,7 +114,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         try {
             $plugin = $pluginManager->getPluginByName($pluginName);
         } catch (Exception $e) {
-            $output->writeln(sprintf('Plugin by name "%s" was not found.', $pluginName));
+            $output->writeln(\sprintf('Plugin by name "%s" was not found.', $pluginName));
 
             return 1;
         }
@@ -142,7 +142,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
             return 1;
         }
-        $output->writeln(sprintf('Plugin %s has been deleted successfully.', $pluginName));
+        $output->writeln(\sprintf('Plugin %s has been deleted successfully.', $pluginName));
 
         return 0;
     }
diff --git a/engine/Shopware/Commands/PluginInstallCommand.php b/engine/Shopware/Commands/PluginInstallCommand.php
index ddd0deed669..5600d17a00f 100644
--- a/engine/Shopware/Commands/PluginInstallCommand.php
+++ b/engine/Shopware/Commands/PluginInstallCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
@@ -84,7 +84,7 @@ protected function configure()
                 'activate',
                 null,
                 InputOption::VALUE_NONE,
-                'Activate plugin after intallation.'
+                'Activate plugin after installation.'
             )
             ->addOption(
                 'no-refresh',
@@ -115,7 +115,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         try {
             $plugin = $pluginManager->getPluginByName($pluginName);
         } catch (Exception $e) {
-            $output->writeln(sprintf('Plugin by name "%s" was not found.', $pluginName));
+            $output->writeln(\sprintf('Plugin by name "%s" was not found.', $pluginName));
 
             return 1;
         }
@@ -123,17 +123,17 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $installationContext = null;
 
         if ($plugin->getInstalled()) {
-            $output->writeln(sprintf('The plugin %s is already installed.', $pluginName));
+            $output->writeln(\sprintf('The plugin %s is already installed.', $pluginName));
         } else {
             $installationContext = $pluginManager->installPlugin($plugin);
-            $output->writeln(sprintf('Plugin %s has been installed successfully.', $pluginName));
+            $output->writeln(\sprintf('Plugin %s has been installed successfully.', $pluginName));
         }
 
         $activationContext = null;
 
         if ($input->getOption('activate')) {
             $activationContext = $pluginManager->activatePlugin($plugin);
-            $output->writeln(sprintf('Plugin %s has been activated successfully.', $pluginName));
+            $output->writeln(\sprintf('Plugin %s has been activated successfully.', $pluginName));
         }
 
         $this->clearCachesIfRequested($input, $output, $installationContext, $activationContext);
diff --git a/engine/Shopware/Commands/PluginListCommand.php b/engine/Shopware/Commands/PluginListCommand.php
index 51eb0b50224..2e21afa3139 100644
--- a/engine/Shopware/Commands/PluginListCommand.php
+++ b/engine/Shopware/Commands/PluginListCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
@@ -38,7 +38,7 @@ class PluginListCommand extends ShopwareCommand implements CompletionAwareInterf
     /**
      * {@inheritdoc}
      */
-    public function completeOptionValues($optionName, CompletionContext $context)
+    public function completeOptionValues($optionName, CompletionContext $context): array
     {
         if ($optionName === 'filter') {
             return [
@@ -65,7 +65,7 @@ public function completeOptionValues($optionName, CompletionContext $context)
     /**
      * {@inheritdoc}
      */
-    public function completeArgumentValues($argumentName, CompletionContext $context)
+    public function completeArgumentValues($argumentName, CompletionContext $context): array
     {
         return [];
     }
@@ -73,7 +73,7 @@ public function completeArgumentValues($argumentName, CompletionContext $context
     /**
      * {@inheritdoc}
      */
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('sw:plugin:list')
@@ -82,7 +82,8 @@ protected function configure()
                 'filter',
                 'f',
                 InputOption::VALUE_REQUIRED,
-                'Filter Plugins (inactive, active, installed, uninstalled)'
+                'Filter Plugins (inactive, active, installed, uninstalled)',
+                ''
             )
             ->addOption(
                 'namespace',
@@ -103,7 +104,7 @@ protected function configure()
     /**
      * {@inheritdoc}
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $em = $this->container->get(ModelManager::class);
 
@@ -145,7 +146,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $rows = [];
 
-        /** @var Plugin $plugin */
         foreach ($plugins as $plugin) {
             $rows[] = [
                 $plugin->getName(),
diff --git a/engine/Shopware/Commands/PluginRefreshCommand.php b/engine/Shopware/Commands/PluginRefreshCommand.php
index 195fae1c761..8cb80a90c9c 100644
--- a/engine/Shopware/Commands/PluginRefreshCommand.php
+++ b/engine/Shopware/Commands/PluginRefreshCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
@@ -46,11 +46,10 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        /** @var InstallerService $pluginManager */
-        $pluginManager = $this->container->get(\Shopware\Bundle\PluginInstallerBundle\Service\InstallerService::class);
+        $pluginManager = $this->container->get(InstallerService::class);
         $pluginManager->refreshPluginList();
 
-        $output->writeln(sprintf('Successfully refreshed'));
+        $output->writeln(\sprintf('Successfully refreshed'));
 
         return 0;
     }
diff --git a/engine/Shopware/Commands/PluginReinstallCommand.php b/engine/Shopware/Commands/PluginReinstallCommand.php
index 5d5e25e7ed2..8d62e7ae43b 100644
--- a/engine/Shopware/Commands/PluginReinstallCommand.php
+++ b/engine/Shopware/Commands/PluginReinstallCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
@@ -90,8 +90,7 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        /** @var InstallerService $pluginManager */
-        $pluginManager = $this->container->get(\Shopware\Bundle\PluginInstallerBundle\Service\InstallerService::class);
+        $pluginManager = $this->container->get(InstallerService::class);
         if (!$input->getOption('no-refresh')) {
             $pluginManager->refreshPluginList();
             $output->writeln('Successfully refreshed');
@@ -101,7 +100,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         try {
             $plugin = $pluginManager->getPluginByName($pluginName);
         } catch (Exception $e) {
-            $output->writeln(sprintf('Plugin by name "%s" was not found.', $pluginName));
+            $output->writeln(\sprintf('Plugin by name "%s" was not found.', $pluginName));
 
             return 1;
         }
@@ -111,7 +110,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $uninstallationContext = $pluginManager->uninstallPlugin($plugin, $removeData);
         $installationContext = $pluginManager->installPlugin($plugin);
         $activationContext = $pluginManager->activatePlugin($plugin);
-        $output->writeln(sprintf('Plugin %s has been reinstalled successfully.', $pluginName));
+        $output->writeln(\sprintf('Plugin %s has been reinstalled successfully.', $pluginName));
 
         $this->clearCachesIfRequested($input, $output, $uninstallationContext, $installationContext, $activationContext);
 
diff --git a/engine/Shopware/Commands/PluginUninstallCommand.php b/engine/Shopware/Commands/PluginUninstallCommand.php
index f2a500e3bfb..b79e1e3e0db 100644
--- a/engine/Shopware/Commands/PluginUninstallCommand.php
+++ b/engine/Shopware/Commands/PluginUninstallCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
@@ -105,13 +105,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
         try {
             $plugin = $pluginManager->getPluginByName($pluginName);
         } catch (Exception $e) {
-            $output->writeln(sprintf('Plugin by name "%s" was not found.', $pluginName));
+            $output->writeln(\sprintf('Plugin by name "%s" was not found.', $pluginName));
 
             return 1;
         }
 
         if (!$plugin->getInstalled()) {
-            $output->writeln(sprintf('The plugin %s is already uninstalled.', $pluginName));
+            $output->writeln(\sprintf('The plugin %s is already uninstalled.', $pluginName));
 
             return 1;
         }
@@ -119,7 +119,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $removeData = !(bool) $input->getOption('secure');
 
         $uninstallationContext = $pluginManager->uninstallPlugin($plugin, $removeData);
-        $output->writeln(sprintf('Plugin %s has been uninstalled successfully.', $pluginName));
+        $output->writeln(\sprintf('Plugin %s has been uninstalled successfully.', $pluginName));
 
         $this->clearCachesIfRequested($input, $output, $uninstallationContext);
 
diff --git a/engine/Shopware/Commands/PluginUpdateCommand.php b/engine/Shopware/Commands/PluginUpdateCommand.php
index 723948b5a13..dcdd60bb3a5 100644
--- a/engine/Shopware/Commands/PluginUpdateCommand.php
+++ b/engine/Shopware/Commands/PluginUpdateCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
@@ -117,7 +117,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             return 0;
         }
 
-        $output->writeln(sprintf('Specify either a plugin name or use the --batch option to update several plugins at once'));
+        $output->writeln(\sprintf('Specify either a plugin name or use the --batch option to update several plugins at once'));
 
         return 1;
     }
@@ -153,7 +153,7 @@ private function batchUpdate(InstallerService $pluginManager, $batchUpdate, Outp
         $plugins = $builder->getQuery()->execute();
 
         if (empty($plugins)) {
-            $output->writeln(sprintf('No plugin(s) found'));
+            $output->writeln(\sprintf('No plugin(s) found'));
 
             return 1;
         }
@@ -164,12 +164,12 @@ private function batchUpdate(InstallerService $pluginManager, $batchUpdate, Outp
                 continue;
             }
             $pluginManager->updatePlugin($plugin);
-            $output->writeln(sprintf('Plugin %s has been updated successfully.', $plugin->getName()));
+            $output->writeln(\sprintf('Plugin %s has been updated successfully.', $plugin->getName()));
             $allPluginsUpToDate = false;
         }
 
         if ($allPluginsUpToDate) {
-            $output->writeln(sprintf('No update needed. Plugin(s) are up to date'));
+            $output->writeln(\sprintf('No update needed. Plugin(s) are up to date'));
         }
 
         return 0;
@@ -185,19 +185,19 @@ private function updatePlugin(InstallerService $pluginManager, $pluginName, Inpu
         try {
             $plugin = $pluginManager->getPluginByName($pluginName);
         } catch (Exception $e) {
-            $output->writeln(sprintf('Plugin by name "%s" was not found.', $pluginName));
+            $output->writeln(\sprintf('Plugin by name "%s" was not found.', $pluginName));
 
             return 1;
         }
 
         if (!$plugin->getUpdateVersion()) {
-            $output->writeln(sprintf('The plugin %s is up to date.', $pluginName));
+            $output->writeln(\sprintf('The plugin %s is up to date.', $pluginName));
 
             return 0;
         }
 
         $updateContext = $pluginManager->updatePlugin($plugin);
-        $output->writeln(sprintf('Plugin %s has been updated successfully.', $pluginName));
+        $output->writeln(\sprintf('Plugin %s has been updated successfully.', $pluginName));
 
         $this->clearCachesIfRequested($input, $output, $updateContext);
 
diff --git a/engine/Shopware/Commands/RebuildCategoryTreeCommand.php b/engine/Shopware/Commands/RebuildCategoryTreeCommand.php
index a7b027d8b70..f65efec9b62 100644
--- a/engine/Shopware/Commands/RebuildCategoryTreeCommand.php
+++ b/engine/Shopware/Commands/RebuildCategoryTreeCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
diff --git a/engine/Shopware/Commands/RebuildSeoIndexCommand.php b/engine/Shopware/Commands/RebuildSeoIndexCommand.php
index cce9fa6e284..fa7f27c253c 100644
--- a/engine/Shopware/Commands/RebuildSeoIndexCommand.php
+++ b/engine/Shopware/Commands/RebuildSeoIndexCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
diff --git a/engine/Shopware/Commands/RefreshSearchIndexCommand.php b/engine/Shopware/Commands/RefreshSearchIndexCommand.php
index 5efbd1a8638..c406e95c688 100644
--- a/engine/Shopware/Commands/RefreshSearchIndexCommand.php
+++ b/engine/Shopware/Commands/RefreshSearchIndexCommand.php
@@ -1,29 +1,30 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
 
+use Shopware\Bundle\SearchBundleDBAL\SearchTerm\SearchIndexer;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -54,18 +55,18 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $clearTable = $input->getOption('clear-table');
+
         if ($clearTable) {
             $output->writeln('Deleting the search index...');
 
             /** @var \Doctrine\DBAL\Connection $connection */
             $connection = $this->container->get(\Doctrine\DBAL\Connection::class);
-            // Changed according to https://www.doctrine-project.org/projects/doctrine-dbal/en/2.12/reference/data-retrieval-and-manipulation.html#delete
-            $connection->delete('s_search_index', ['id' => '*']);
-            $connection->delete('s_search_keywords', ['id' => '*']);
+            $connection->executeStatement('DELETE FROM s_search_index');
+            $connection->executeStatement('DELETE FROM s_search_keywords');
         }
         $output->writeln('Creating the search index. This may take a while depending on the shop size.');
 
-        $indexer = $this->container->get(\Shopware\Bundle\SearchBundleDBAL\SearchTerm\SearchIndexer::class);
+        $indexer = $this->container->get(SearchIndexer::class);
         $indexer->build();
 
         $output->writeln('The search index was created successfully.');
diff --git a/engine/Shopware/Commands/RefreshTopsellerCommand.php b/engine/Shopware/Commands/RefreshTopsellerCommand.php
index 69249e25c92..1b564feba20 100644
--- a/engine/Shopware/Commands/RefreshTopsellerCommand.php
+++ b/engine/Shopware/Commands/RefreshTopsellerCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
diff --git a/engine/Shopware/Commands/SessionCleanupCommand.php b/engine/Shopware/Commands/SessionCleanupCommand.php
index 3b504567887..5b716f69a7d 100644
--- a/engine/Shopware/Commands/SessionCleanupCommand.php
+++ b/engine/Shopware/Commands/SessionCleanupCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
@@ -68,7 +68,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $count = session_gc();
         session_destroy();
 
-        $io->success(sprintf('Successfully removed %d expired sessions', $count));
+        $io->success(\sprintf('Successfully removed %d expired sessions', $count));
 
         return 0;
     }
diff --git a/engine/Shopware/Commands/SettingsLabelsFindMissingCommand.php b/engine/Shopware/Commands/SettingsLabelsFindMissingCommand.php
index 2e18e9b5986..6656dfdbca9 100644
--- a/engine/Shopware/Commands/SettingsLabelsFindMissingCommand.php
+++ b/engine/Shopware/Commands/SettingsLabelsFindMissingCommand.php
@@ -1,31 +1,32 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
 
 use Exception;
 use RuntimeException;
+use Shopware\Components\Model\ModelManager;
 use Shopware\Models\Shop\Locale;
 use Stecman\Component\Symfony\Console\BashCompletion\Completion\CompletionAwareInterface;
 use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext;
@@ -95,7 +96,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         if (!file_exists($dir) || !is_writable($dir)) {
             $old = umask(0);
             if (!mkdir($dir, 0777, true) && !is_dir($dir)) {
-                throw new RuntimeException(sprintf('Directory "%s" was not created', $dir));
+                throw new RuntimeException(\sprintf('Directory "%s" was not created', $dir));
             }
             chmod($dir, 0777);
             umask($old);
@@ -107,8 +108,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         /** @var Locale|null $locale */
-        $locale = $this->container->get(\Shopware\Components\Model\ModelManager::class)
-            ->getRepository(\Shopware\Models\Shop\Locale::class)
+        $locale = $this->container->get(ModelManager::class)
+            ->getRepository(Locale::class)
             ->findOneByLocale($input->getArgument('locale'));
         if (!$locale) {
             $output->writeln('<error>Provided locale not found</error>');
@@ -126,14 +127,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
     /**
      * Exports form labels from the database into a php file containing an array
      *
-     * @param \Shopware\Models\Shop\Locale $locale
-     * @param string                       $dir
+     * @param Locale $locale
+     * @param string $dir
      *
      * @throws Exception
      */
     protected function exportFormLabels(OutputInterface $output, $locale, $dir)
     {
-        $formQueryBuilder = $this->container->get(\Shopware\Components\Model\ModelManager::class)->getDBALQueryBuilder();
+        $formQueryBuilder = $this->container->get(ModelManager::class)->getDBALQueryBuilder();
         $statement = $formQueryBuilder
             ->select('form.name AS name', 'form.label AS label', 'form.description AS description')
             ->from('s_core_config_forms', 'form')
@@ -170,7 +171,7 @@ protected function exportFormLabels(OutputInterface $output, $locale, $dir)
      */
     protected function exportElementLabels(OutputInterface $output, $locale, $dir)
     {
-        $elementsQueryBuilder = $this->container->get(\Shopware\Components\Model\ModelManager::class)->getDBALQueryBuilder();
+        $elementsQueryBuilder = $this->container->get(ModelManager::class)->getDBALQueryBuilder();
         $statement = $elementsQueryBuilder
             ->select('form.name AS formName', 'elem.name AS elementName', 'elem.label AS label')
             ->from('s_core_config_forms', 'form')
diff --git a/engine/Shopware/Commands/ShopwareCommand.php b/engine/Shopware/Commands/ShopwareCommand.php
index 181ad8bc402..ba0c756ed5f 100644
--- a/engine/Shopware/Commands/ShopwareCommand.php
+++ b/engine/Shopware/Commands/ShopwareCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
@@ -46,7 +46,7 @@ abstract class ShopwareCommand extends Command implements ContainerAwareInterfac
     /**
      * {@inheritdoc}
      */
-    public function setContainer(Container $container = null)
+    public function setContainer(?Container $container = null)
     {
         $this->container = $container;
     }
@@ -95,13 +95,13 @@ public function registerErrorHandler(OutputInterface $output)
             if ($output->getVerbosity() === OutputInterface::VERBOSITY_VERBOSE) {
                 $errorName = isset($errorNameMap[$errno]) ? $errorNameMap[$errno] : $errno;
 
-                $message = sprintf("Error: %s, \nFile: %s\nLine: %s, Message:\n%s\n", $errorName, $errfile, $errline, $errstr);
+                $message = \sprintf("Error: %s, \nFile: %s\nLine: %s, Message:\n%s\n", $errorName, $errfile, $errline, $errstr);
                 $output->writeln('<comment>' . $message . '</comment>');
 
                 $output->writeln('<comment>Error stack:</comment>');
                 $stack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 10);
                 foreach ($stack as $trace) {
-                    $output->writeln(sprintf(' %s%s%s() at <info>%s:%s</info>', $trace['class'] ?? '', $trace['type'] ?? '', $trace['function'], $trace['file'] ?? '', $trace['line'] ?? ''));
+                    $output->writeln(\sprintf(' %s%s%s() at <info>%s:%s</info>', $trace['class'] ?? '', $trace['type'] ?? '', $trace['function'], $trace['file'] ?? '', $trace['line'] ?? ''));
                 }
                 $output->writeln('');
                 $output->writeln('');
diff --git a/engine/Shopware/Commands/SnippetsFindMissingCommand.php b/engine/Shopware/Commands/SnippetsFindMissingCommand.php
index 950993cb610..f608ed97d5a 100644
--- a/engine/Shopware/Commands/SnippetsFindMissingCommand.php
+++ b/engine/Shopware/Commands/SnippetsFindMissingCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
diff --git a/engine/Shopware/Commands/SnippetsRemoveCommand.php b/engine/Shopware/Commands/SnippetsRemoveCommand.php
index 24fb9ccaefc..a1e1a7cc872 100644
--- a/engine/Shopware/Commands/SnippetsRemoveCommand.php
+++ b/engine/Shopware/Commands/SnippetsRemoveCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
diff --git a/engine/Shopware/Commands/SnippetsToDbCommand.php b/engine/Shopware/Commands/SnippetsToDbCommand.php
index 5f42e53a23f..42a759b91a7 100644
--- a/engine/Shopware/Commands/SnippetsToDbCommand.php
+++ b/engine/Shopware/Commands/SnippetsToDbCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
diff --git a/engine/Shopware/Commands/SnippetsToIniCommand.php b/engine/Shopware/Commands/SnippetsToIniCommand.php
index 60b7f13b80d..1faf105ea1e 100644
--- a/engine/Shopware/Commands/SnippetsToIniCommand.php
+++ b/engine/Shopware/Commands/SnippetsToIniCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
@@ -94,7 +94,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         if (!file_exists($dir) || !is_writable($dir)) {
             $old = umask(0);
             if (!mkdir($dir, 0777, true) && !is_dir($dir)) {
-                throw new RuntimeException(sprintf('Directory "%s" was not created', $dir));
+                throw new RuntimeException(\sprintf('Directory "%s" was not created', $dir));
             }
             chmod($dir, 0777);
             umask($old);
diff --git a/engine/Shopware/Commands/SnippetsToSqlCommand.php b/engine/Shopware/Commands/SnippetsToSqlCommand.php
index cf11de4d0de..bcabe5fe2a6 100644
--- a/engine/Shopware/Commands/SnippetsToSqlCommand.php
+++ b/engine/Shopware/Commands/SnippetsToSqlCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
@@ -112,7 +112,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             return 1;
         }
 
-        $output->writeln(sprintf('<info>Writing to file "%s".</info>', $input->getArgument('file')));
+        $output->writeln(\sprintf('<info>Writing to file "%s".</info>', $input->getArgument('file')));
 
         /** @var QueryHandler $queryLoader */
         $queryLoader = $this->container->get('shopware.snippet_query_handler');
diff --git a/engine/Shopware/Commands/SnippetsValidateCommand.php b/engine/Shopware/Commands/SnippetsValidateCommand.php
index 48091d9b37d..6c41866b264 100644
--- a/engine/Shopware/Commands/SnippetsValidateCommand.php
+++ b/engine/Shopware/Commands/SnippetsValidateCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
diff --git a/engine/Shopware/Commands/StoreCommand.php b/engine/Shopware/Commands/StoreCommand.php
index 6aa5e39b37a..411618b38ba 100644
--- a/engine/Shopware/Commands/StoreCommand.php
+++ b/engine/Shopware/Commands/StoreCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
@@ -151,7 +151,7 @@ protected function setupAuth(InputInterface $input, OutputInterface $output)
             throw new Exception('Username and password are required');
         }
 
-        $output->writeln(sprintf('Connect to Store with username: %s...', $username));
+        $output->writeln(\sprintf('Connect to Store with username: %s...', $username));
 
         return $this->container->get(\Shopware\Bundle\PluginInstallerBundle\StoreClient::class)->getAccessToken(
             $username,
diff --git a/engine/Shopware/Commands/StoreDownloadCommand.php b/engine/Shopware/Commands/StoreDownloadCommand.php
index 233dd2397be..51158c0fcf8 100644
--- a/engine/Shopware/Commands/StoreDownloadCommand.php
+++ b/engine/Shopware/Commands/StoreDownloadCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
@@ -30,11 +30,13 @@
 use Shopware\Bundle\PluginInstallerBundle\Context\LicenceRequest;
 use Shopware\Bundle\PluginInstallerBundle\Context\PluginsByTechnicalNameRequest;
 use Shopware\Bundle\PluginInstallerBundle\Exception\StoreException;
+use Shopware\Bundle\PluginInstallerBundle\Service\InstallerService;
 use Shopware\Bundle\PluginInstallerBundle\Service\PluginStoreService;
 use Shopware\Bundle\PluginInstallerBundle\StoreClient;
 use Shopware\Bundle\PluginInstallerBundle\Struct\AccessTokenStruct;
 use Shopware\Bundle\PluginInstallerBundle\Struct\LicenceStruct;
 use Shopware\Bundle\PluginInstallerBundle\Struct\PluginStruct;
+use Shopware\Components\Model\ModelManager;
 use Shopware\Models\Plugin\Plugin;
 use Stecman\Component\Symfony\Console\BashCompletion\Completion\CompletionAwareInterface;
 use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext;
@@ -77,7 +79,7 @@ public function completeArgumentValues($argumentName, CompletionContext $context
                 $context = new LicenceRequest('en_GB', $this->getVersionFromArguments($context->getWords()), $this->getDomainFromArguments($context->getWords()), $token);
 
                 /** @var PluginStoreService $pluginStoreService */
-                $pluginStoreService = $this->container->get(\Shopware\Bundle\PluginInstallerBundle\Service\PluginStoreService::class);
+                $pluginStoreService = $this->container->get(PluginStoreService::class);
 
                 return array_map(function (LicenceStruct $licence) {
                     return $licence->getTechnicalName();
@@ -124,7 +126,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         if ($plugin && $plugin->getCode() !== null) {
             if ($plugin->hasFreeDownload() === false && $plugin->hasCapabilityDummy() === false) {
-                $io->note(sprintf('You must be authenticated to download: %s', $plugin->getLabel()));
+                $io->note(\sprintf('You must be authenticated to download: %s', $plugin->getLabel()));
 
                 $token = $this->checkAuthentication();
             }
@@ -137,7 +139,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
             try {
                 /** @var PluginStoreService $pluginStoreService */
-                $pluginStoreService = $this->container->get(\Shopware\Bundle\PluginInstallerBundle\Service\PluginStoreService::class);
+                $pluginStoreService = $this->container->get(PluginStoreService::class);
                 $licences = $pluginStoreService->getLicences($context);
                 $licences = array_filter(
                     $licences,
@@ -156,13 +158,13 @@ function (LicenceStruct $license) use ($technicalName) {
         }
 
         if (!$plugin) {
-            $io->error(sprintf('Plugin %s not found', $technicalName));
+            $io->error(\sprintf('Plugin %s not found', $technicalName));
 
             return 1;
         }
 
         $io->section($plugin->getLabel());
-        $io->comment(sprintf('Checking system requirements for plugin %s', $plugin->getLabel()));
+        $io->comment(\sprintf('Checking system requirements for plugin %s', $plugin->getLabel()));
 
         $plugin = $this->createPluginStruct($plugin);
 
@@ -193,7 +195,7 @@ function (LicenceStruct $license) use ($technicalName) {
 
         try {
             $this->clearOpcodeCache();
-            $this->container->get(\Shopware\Bundle\PluginInstallerBundle\Service\InstallerService::class)->refreshPluginList();
+            $this->container->get(InstallerService::class)->refreshPluginList();
 
             $this->io->success('Process completed successfully.');
         } catch (Exception $e) {
@@ -211,18 +213,18 @@ function (LicenceStruct $license) use ($technicalName) {
     private function handleDummyUpdate(PluginStruct $plugin, $domain, $version)
     {
         if (!$plugin->isUpdateAvailable()) {
-            $this->io->text(sprintf('No update available for plugin %s', $plugin->getLabel()));
+            $this->io->text(\sprintf('No update available for plugin %s', $plugin->getLabel()));
 
             return;
         }
 
-        $this->io->comment(sprintf('Download plugin update package %s', $plugin->getLabel()));
+        $this->io->comment(\sprintf('Download plugin update package %s', $plugin->getLabel()));
 
         $request = new DownloadRequest($plugin->getTechnicalName(), $version, $domain, null);
 
         $model = $this->getPluginModel($plugin->getTechnicalName());
         if ($plugin->isActive()) {
-            $this->container->get(\Shopware\Bundle\PluginInstallerBundle\Service\InstallerService::class)->deactivatePlugin($model);
+            $this->container->get(InstallerService::class)->deactivatePlugin($model);
         }
 
         $this->container->get('shopware_plugininstaller.plugin_download_service')
@@ -237,7 +239,7 @@ private function handleDummyUpdate(PluginStruct $plugin, $domain, $version)
      */
     private function handleDummyInstall(PluginStruct $plugin, $domain, $version)
     {
-        $this->io->comment(sprintf('Download plugin install package %s', $plugin->getLabel()));
+        $this->io->comment(\sprintf('Download plugin install package %s', $plugin->getLabel()));
 
         $request = new DownloadRequest($plugin->getTechnicalName(), $version, $domain, null);
 
@@ -245,16 +247,15 @@ private function handleDummyInstall(PluginStruct $plugin, $domain, $version)
     }
 
     /**
-     * @param string            $domain
-     * @param string            $version
-     * @param AccessTokenStruct $token
+     * @param string $domain
+     * @param string $version
      *
      * @throws Exception
      */
-    private function handleLicenceUpdate(PluginStruct $plugin, $domain, $version, AccessTokenStruct $token = null)
+    private function handleLicenceUpdate(PluginStruct $plugin, $domain, $version, ?AccessTokenStruct $token = null)
     {
         if (!$plugin->isUpdateAvailable()) {
-            $this->io->text(sprintf('No update available for plugin %s', $plugin->getLabel()));
+            $this->io->text(\sprintf('No update available for plugin %s', $plugin->getLabel()));
 
             return;
         }
@@ -263,7 +264,7 @@ private function handleLicenceUpdate(PluginStruct $plugin, $domain, $version, Ac
 
         $model = $this->getPluginModel($plugin->getTechnicalName());
         if ($plugin->isActive()) {
-            $this->container->get(\Shopware\Bundle\PluginInstallerBundle\Service\InstallerService::class)
+            $this->container->get(InstallerService::class)
                 ->deactivatePlugin($model);
         }
 
@@ -273,11 +274,10 @@ private function handleLicenceUpdate(PluginStruct $plugin, $domain, $version, Ac
     }
 
     /**
-     * @param string            $domain
-     * @param string            $version
-     * @param AccessTokenStruct $token
+     * @param string $domain
+     * @param string $version
      */
-    private function handleLicenceInstall(PluginStruct $plugin, $domain, $version, AccessTokenStruct $token = null)
+    private function handleLicenceInstall(PluginStruct $plugin, $domain, $version, ?AccessTokenStruct $token = null)
     {
         $this->io->comment('Downloading plugin install package');
 
@@ -293,7 +293,7 @@ private function handleLicenceInstall(PluginStruct $plugin, $domain, $version, A
      */
     private function getPluginModel($technicalName)
     {
-        $repo = $this->container->get(\Shopware\Components\Model\ModelManager::class)->getRepository(Plugin::class);
+        $repo = $this->container->get(ModelManager::class)->getRepository(Plugin::class);
 
         return $repo->findOneBy(['name' => $technicalName]);
     }
@@ -344,7 +344,7 @@ private function checkAuthentication(): AccessTokenStruct
             $this->io->comment('Connection to store...');
 
             /** @var StoreClient $storeClient */
-            $storeClient = $this->container->get(\Shopware\Bundle\PluginInstallerBundle\StoreClient::class);
+            $storeClient = $this->container->get(StoreClient::class);
             $token = $storeClient->getAccessToken($username, $password);
 
             $this->io->comment('Authenticated successfully.');
@@ -468,7 +468,7 @@ private function getAuthenticationFromArguments(array $arguments)
 
         try {
             /** @var StoreClient $storeClient */
-            $storeClient = $this->container->get(\Shopware\Bundle\PluginInstallerBundle\StoreClient::class);
+            $storeClient = $this->container->get(StoreClient::class);
 
             return $storeClient->getAccessToken($username, $password);
         } catch (Exception $e) {
diff --git a/engine/Shopware/Commands/StoreListCommand.php b/engine/Shopware/Commands/StoreListCommand.php
index edf7ac897fd..8e75a3ed81d 100644
--- a/engine/Shopware/Commands/StoreListCommand.php
+++ b/engine/Shopware/Commands/StoreListCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
diff --git a/engine/Shopware/Commands/StoreListDomainsCommand.php b/engine/Shopware/Commands/StoreListDomainsCommand.php
index 2ae74516a60..595ba667754 100644
--- a/engine/Shopware/Commands/StoreListDomainsCommand.php
+++ b/engine/Shopware/Commands/StoreListDomainsCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
@@ -57,8 +57,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         foreach ($shops as $shop) {
             $domains[] = [
-               $shop['domain'],
-               number_format($shop['balance'], 2),
+                $shop['domain'],
+                number_format($shop['balance'], 2),
             ];
         }
 
diff --git a/engine/Shopware/Commands/StoreListIntegratedCommand.php b/engine/Shopware/Commands/StoreListIntegratedCommand.php
index fc691ff7e0e..e62140c15f3 100644
--- a/engine/Shopware/Commands/StoreListIntegratedCommand.php
+++ b/engine/Shopware/Commands/StoreListIntegratedCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
diff --git a/engine/Shopware/Commands/StoreListUpdatesCommand.php b/engine/Shopware/Commands/StoreListUpdatesCommand.php
index 5d20e5b33d7..e1d08acaea4 100644
--- a/engine/Shopware/Commands/StoreListUpdatesCommand.php
+++ b/engine/Shopware/Commands/StoreListUpdatesCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
diff --git a/engine/Shopware/Commands/StreamIndexPopulateCommand.php b/engine/Shopware/Commands/StreamIndexPopulateCommand.php
index d95c407020c..6dd04d38b26 100644
--- a/engine/Shopware/Commands/StreamIndexPopulateCommand.php
+++ b/engine/Shopware/Commands/StreamIndexPopulateCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
diff --git a/engine/Shopware/Commands/ThemeCacheGenerateCommand.php b/engine/Shopware/Commands/ThemeCacheGenerateCommand.php
index 2126a25d1f7..eea510266b3 100644
--- a/engine/Shopware/Commands/ThemeCacheGenerateCommand.php
+++ b/engine/Shopware/Commands/ThemeCacheGenerateCommand.php
@@ -4,23 +4,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
@@ -108,13 +107,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         foreach ($shopsWithThemes as $shop) {
             if (!$current) {
-                $output->writeln(sprintf('Generating new theme cache for shop "%s" ...', $shop->getName()));
+                $output->writeln(\sprintf('Generating new theme cache for shop "%s" ...', $shop->getName()));
                 $compiler->compile($shop);
                 continue;
             }
 
             $timestamp = $this->container->get('theme_timestamp_persistor')->getCurrentTimestamp($shop->getId());
-            $output->writeln(sprintf('Generating theme cache for shop "%s" from current timestamp %s', $shop->getName(), $timestamp));
+            $output->writeln(\sprintf('Generating theme cache for shop "%s" from current timestamp %s', $shop->getName(), $timestamp));
             $compiler->recompile($shop);
         }
 
diff --git a/engine/Shopware/Commands/ThemeCreateCommand.php b/engine/Shopware/Commands/ThemeCreateCommand.php
index 3e3191067ba..5b920848393 100644
--- a/engine/Shopware/Commands/ThemeCreateCommand.php
+++ b/engine/Shopware/Commands/ThemeCreateCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
@@ -147,7 +147,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $parent = $this->getRepository()->findOneBy(['template' => $arguments['parent']]);
         if (!$parent instanceof Template) {
             $output->writeln(
-                sprintf(
+                \sprintf(
                     'Shop template by template name "%s" not found',
                     $arguments['parent']
                 )
@@ -161,7 +161,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $themeGenerator = $this->container->get(Generator::class);
         $themeGenerator->generateTheme($arguments, $parent);
 
-        $output->writeln(sprintf('Theme "%s" has been created successfully.', $arguments['name']));
+        $output->writeln(\sprintf('Theme "%s" has been created successfully.', $arguments['name']));
 
         return 0;
     }
@@ -203,7 +203,7 @@ private function askForOptionalData(InputInterface $input, OutputInterface $outp
 
         if (empty($optionValue)) {
             $questionHelper = $this->getHelper('question');
-            $question = new Question(sprintf('Please enter the %s: ', $optionKey));
+            $question = new Question(\sprintf('Please enter the %s: ', $optionKey));
             $optionValue = $questionHelper->ask($input, $output, $question);
         }
 
diff --git a/engine/Shopware/Commands/ThemeDumpConfigurationCommand.php b/engine/Shopware/Commands/ThemeDumpConfigurationCommand.php
index 0dcafe1c4a9..6aa78190c11 100644
--- a/engine/Shopware/Commands/ThemeDumpConfigurationCommand.php
+++ b/engine/Shopware/Commands/ThemeDumpConfigurationCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
diff --git a/engine/Shopware/Commands/ThemeInitializeCommand.php b/engine/Shopware/Commands/ThemeInitializeCommand.php
index 1187bdfc9ea..201c04a050a 100644
--- a/engine/Shopware/Commands/ThemeInitializeCommand.php
+++ b/engine/Shopware/Commands/ThemeInitializeCommand.php
@@ -1,29 +1,30 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
 
+use Doctrine\DBAL\Connection;
 use RuntimeException;
 use Shopware\Components\Theme\Installer;
 use Symfony\Component\Console\Input\InputInterface;
@@ -32,7 +33,7 @@
 class ThemeInitializeCommand extends ShopwareCommand
 {
     /**
-     * @var \Doctrine\DBAL\Connection
+     * @var Connection
      */
     private $conn;
 
@@ -51,11 +52,10 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        /** @var Installer $themeInstaller */
-        $themeInstaller = $this->container->get(\Shopware\Components\Theme\Installer::class);
+        $themeInstaller = $this->container->get(Installer::class);
         $themeInstaller->synchronize();
 
-        $this->conn = $this->container->get(\Doctrine\DBAL\Connection::class);
+        $this->conn = $this->container->get(Connection::class);
 
         $templateId = $this->getResponsiveTemplateId();
         $this->updateDefaultTemplateId($templateId);
diff --git a/engine/Shopware/Commands/ThemeSynchronizeCommand.php b/engine/Shopware/Commands/ThemeSynchronizeCommand.php
index 17fa278a3dd..abde0a5ff29 100644
--- a/engine/Shopware/Commands/ThemeSynchronizeCommand.php
+++ b/engine/Shopware/Commands/ThemeSynchronizeCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
diff --git a/engine/Shopware/Commands/ThumbnailCleanupCommand.php b/engine/Shopware/Commands/ThumbnailCleanupCommand.php
index e154e019a11..d240e39dab3 100644
--- a/engine/Shopware/Commands/ThumbnailCleanupCommand.php
+++ b/engine/Shopware/Commands/ThumbnailCleanupCommand.php
@@ -1,30 +1,31 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
 
 use League\Flysystem\FilesystemInterface;
+use Shopware\Bundle\MediaBundle\MediaServiceInterface;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -39,17 +40,17 @@
 class ThumbnailCleanupCommand extends ShopwareCommand
 {
     /**
-     * @var array
+     * @var array<string, int>
      */
-    private $baseFiles = [];
+    private array $baseFiles = [];
 
     /**
-     * @var array
+     * @var array<string, list<string>>
      */
-    private $thumbnailFiles = [];
+    private array $thumbnailFiles = [];
 
     /**
-     * {@inheritdoc}
+     * @return void
      */
     protected function configure()
     {
@@ -70,10 +71,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
         return 0;
     }
 
-    private function removeThumbnails(SymfonyStyle $io)
+    private function removeThumbnails(SymfonyStyle $io): void
     {
-        $mediaService = $this->getContainer()->get(\Shopware\Bundle\MediaBundle\MediaServiceInterface::class);
-        $filesystem = $mediaService->getFilesystem();
+        $filesystem = $this->getContainer()->get(MediaServiceInterface::class)->getFilesystem();
 
         $thumbnailFiles = $this->searchThumbnails($io, $filesystem);
 
@@ -89,21 +89,17 @@ private function removeThumbnails(SymfonyStyle $io)
             $io->listing($thumbnailFiles);
         }
 
-        if (!$io->confirm(sprintf('Found %d orphaned thumbnails. Are you sure you want to delete the files? This step is irreversible.', \count($thumbnailFiles)))) {
+        if (!$io->confirm(\sprintf('Found %d orphaned thumbnails. Are you sure you want to delete the files? This step is irreversible.', \count($thumbnailFiles)))) {
             return;
         }
 
         $deletedThumbnails = $this->deleteThumbnails($io, $filesystem, $thumbnailFiles);
 
-        $io->success(sprintf('Removed %d/%d orphaned thumbnails.', $deletedThumbnails, \count($thumbnailFiles)));
+        $io->success(\sprintf('Removed %d/%d orphaned thumbnails.', $deletedThumbnails, \count($thumbnailFiles)));
     }
 
-    /**
-     * @param string $directory
-     */
-    private function processFilesIn($directory, FilesystemInterface $filesystem, ProgressBar $progressBar)
+    private function processFilesIn(string $directory, FilesystemInterface $filesystem, ProgressBar $progressBar): void
     {
-        /** @var array $contents */
         $contents = $filesystem->listContents($directory);
 
         foreach ($contents as $item) {
@@ -112,7 +108,7 @@ private function processFilesIn($directory, FilesystemInterface $filesystem, Pro
             }
 
             if ($item['type'] === 'file') {
-                if (strpos($item['basename'], '.') === 0) {
+                if (str_starts_with($item['basename'], '.')) {
                     continue;
                 }
 
@@ -122,10 +118,7 @@ private function processFilesIn($directory, FilesystemInterface $filesystem, Pro
         }
     }
 
-    /**
-     * @param string $file
-     */
-    private function indexFile($file)
+    private function indexFile(string $file): void
     {
         $baseName = pathinfo($file, PATHINFO_FILENAME);
         $fileName = pathinfo($file, PATHINFO_BASENAME);
@@ -135,7 +128,7 @@ private function indexFile($file)
             // strip thumbnail info to get the base filename
             $strippedName = preg_replace('/(_[0-9]+x[0-9]+(@2x)?)$/', '', $baseName);
 
-            if (\array_key_exists($strippedName, $this->baseFiles)) {
+            if (!\is_string($strippedName) || \array_key_exists($strippedName, $this->baseFiles)) {
                 return;
             }
 
@@ -152,9 +145,9 @@ private function indexFile($file)
     }
 
     /**
-     * @return array
+     * @return array<string>
      */
-    private function searchThumbnails(SymfonyStyle $io, FilesystemInterface $filesystem)
+    private function searchThumbnails(SymfonyStyle $io, FilesystemInterface $filesystem): array
     {
         // reset internal index
         $this->baseFiles = [];
@@ -179,9 +172,9 @@ private function searchThumbnails(SymfonyStyle $io, FilesystemInterface $filesys
     }
 
     /**
-     * @return int
+     * @param array<string> $thumbnailFiles
      */
-    private function deleteThumbnails(SymfonyStyle $io, FilesystemInterface $filesystem, array $thumbnailFiles)
+    private function deleteThumbnails(SymfonyStyle $io, FilesystemInterface $filesystem, array $thumbnailFiles): int
     {
         $deleted = 0;
         $progressBar = $io->createProgressBar(\count($thumbnailFiles));
diff --git a/engine/Shopware/Commands/ThumbnailGenerateCommand.php b/engine/Shopware/Commands/ThumbnailGenerateCommand.php
index 048c7b67ed9..54df2235dab 100644
--- a/engine/Shopware/Commands/ThumbnailGenerateCommand.php
+++ b/engine/Shopware/Commands/ThumbnailGenerateCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
@@ -204,7 +204,7 @@ private function createAlbumThumbnails(Album $album)
         $progressBar->setRedrawFrequency(10);
         $progressBar->start();
 
-        foreach ($paginator->getIterator() as $media) {
+        foreach ($paginator as $media) {
             try {
                 $this->createMediaThumbnails($media);
             } catch (Exception $e) {
@@ -228,7 +228,7 @@ private function createAlbumThumbnails(Album $album)
     private function createMediaThumbnails(Media $media)
     {
         if (!$this->imageExists($media)) {
-            throw new Exception(sprintf('Base image file "%s" does not exist', $media->getPath()));
+            throw new Exception(\sprintf('Base image file "%s" does not exist', $media->getPath()));
         }
 
         $thumbnails = $media->getThumbnailFilePaths();
diff --git a/engine/Shopware/Commands/WarmUpHttpCacheCommand.php b/engine/Shopware/Commands/WarmUpHttpCacheCommand.php
index ec7e10416ab..237b3400b7c 100644
--- a/engine/Shopware/Commands/WarmUpHttpCacheCommand.php
+++ b/engine/Shopware/Commands/WarmUpHttpCacheCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Commands;
@@ -149,7 +149,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
          */
         $concurrentRequests = (int) trim($input->getOption('concurrent-requests'), '=');
         $limit = $concurrentRequests > 10 ? $concurrentRequests : 10;
-        $io->writeln(sprintf('Calling URLs with %d concurrent requests', $concurrentRequests));
+        $io->writeln(\sprintf('Calling URLs with %d concurrent requests', $concurrentRequests));
 
         // Print warming information
         if (!\in_array(false, $options, true)) {
@@ -185,7 +185,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
             // Progressbar
             $progressBar = $io->createProgressBar($totalResultCount);
-            $io->writeln(sprintf("\nShop '%s' (ID: %s)", $shop->getName(), $shop->getId()));
+            $io->writeln(\sprintf("\nShop '%s' (ID: %s)", $shop->getName(), $shop->getId()));
             $progressBar->setBarWidth(100);
             $progressBar->setFormat('very_verbose');
             $progressBar->start();
diff --git a/engine/Shopware/Components/Acl.php b/engine/Shopware/Components/Acl.php
index 4d0d915b93f..604413956f2 100644
--- a/engine/Shopware/Components/Acl.php
+++ b/engine/Shopware/Components/Acl.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\Common\Collections\ArrayCollection;
@@ -148,11 +148,11 @@ public function hasResourceInDatabase($resourceName)
      *
      * @throws Enlight_Exception
      */
-    public function createResource($resourceName, array $privileges = null, $menuItemName = null, $pluginID = null)
+    public function createResource($resourceName, ?array $privileges = null, $menuItemName = null, $pluginID = null)
     {
         // Check if resource already exists
         if ($this->hasResourceInDatabase($resourceName)) {
-            throw new Enlight_Exception(sprintf('Resource "%s" already exists', $resourceName));
+            throw new Enlight_Exception(\sprintf('Resource "%s" already exists', $resourceName));
         }
 
         $resource = new UserResource();
diff --git a/engine/Shopware/Components/AddLinkHeaderSubscriber.php b/engine/Shopware/Components/AddLinkHeaderSubscriber.php
index 21bb029706e..e15625308a0 100644
--- a/engine/Shopware/Components/AddLinkHeaderSubscriber.php
+++ b/engine/Shopware/Components/AddLinkHeaderSubscriber.php
@@ -1,53 +1,44 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
 
 use Enlight\Event\SubscriberInterface;
 use Enlight_Controller_Request_Request;
-use Enlight_Controller_Response_Response;
 use Enlight_Event_EventArgs;
-use Psr\Link\LinkProviderInterface;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\WebLink\HttpHeaderSerializer;
-use Traversable;
 
 class AddLinkHeaderSubscriber implements SubscriberInterface
 {
-    /**
-     * @var HttpHeaderSerializer
-     */
-    private $serializer;
+    private HttpHeaderSerializer $serializer;
 
-    /**
-     * @var bool
-     */
-    private $pushEnabled;
+    private bool $pushEnabled;
 
-    /**
-     * @var WebLinkManager
-     */
-    private $webLinkManager;
+    private WebLinkManager $webLinkManager;
 
     public function __construct(
         HttpHeaderSerializer $headerSerializer,
@@ -71,8 +62,10 @@ public static function getSubscribedEvents(): array
 
     public function onDispatchLoopShutdown(Enlight_Event_EventArgs $args): void
     {
-        /** @var Enlight_Controller_Request_Request $request */
         $request = $args->get('request');
+        if (!$request instanceof Enlight_Controller_Request_Request) {
+            return;
+        }
 
         // Only use Server Push if it is enabled in the settings and the current module is "frontend"
         if (!$this->pushEnabled
@@ -80,20 +73,13 @@ public function onDispatchLoopShutdown(Enlight_Event_EventArgs $args): void
             return;
         }
 
-        /** @var Enlight_Controller_Response_Response $response */
         $response = $args->get('response');
-
-        $linkProvider = $this->webLinkManager->getLinkProvider();
-        if (!$linkProvider instanceof LinkProviderInterface) {
-            return;
-        }
-
-        $links = $linkProvider->getLinks();
-        if (is_countable($links) && \count($links) === 0) {
+        if (!$response instanceof Response) {
             return;
         }
 
-        if ($links instanceof Traversable && iterator_count($links) === 0) {
+        $links = $this->webLinkManager->getLinkProvider()->getLinks();
+        if (empty($links)) {
             return;
         }
 
diff --git a/engine/Shopware/Components/Api/BatchInterface.php b/engine/Shopware/Components/Api/BatchInterface.php
index a507cad75df..baa78bfad12 100644
--- a/engine/Shopware/Components/Api/BatchInterface.php
+++ b/engine/Shopware/Components/Api/BatchInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Api;
@@ -38,10 +38,10 @@ interface BatchInterface
      * If your resource supports other kinds of IDs, too, you should identify
      * your entity by these IDs and return the primary ID of that entity.
      *
-     * @param array $data
+     * @param array<string, mixed> $data
      *
-     * @return int|bool Return the primary ID of the entity, if it exists
-     *                  Return false, if no existing entity matches $data
+     * @return int|false Return the primary ID of the entity, if it exists
+     *                   Return false, if no existing entity matches $data
      */
     public function getIdByData($data);
 }
diff --git a/engine/Shopware/Components/Api/Exception/ApiException.php b/engine/Shopware/Components/Api/Exception/ApiException.php
index 091cb6ec5d5..47f1492b13c 100644
--- a/engine/Shopware/Components/Api/Exception/ApiException.php
+++ b/engine/Shopware/Components/Api/Exception/ApiException.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Api\Exception;
diff --git a/engine/Shopware/Components/Api/Exception/BatchInterfaceNotImplementedException.php b/engine/Shopware/Components/Api/Exception/BatchInterfaceNotImplementedException.php
index 3e259080c12..f2bdfb89850 100644
--- a/engine/Shopware/Components/Api/Exception/BatchInterfaceNotImplementedException.php
+++ b/engine/Shopware/Components/Api/Exception/BatchInterfaceNotImplementedException.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Api\Exception;
diff --git a/engine/Shopware/Components/Api/Exception/CustomValidationException.php b/engine/Shopware/Components/Api/Exception/CustomValidationException.php
index 55aa6e29248..84a36d243f7 100644
--- a/engine/Shopware/Components/Api/Exception/CustomValidationException.php
+++ b/engine/Shopware/Components/Api/Exception/CustomValidationException.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Api\Exception;
diff --git a/engine/Shopware/Components/Api/Exception/NonUniqueIdentifierUsedException.php b/engine/Shopware/Components/Api/Exception/NonUniqueIdentifierUsedException.php
index 8f2a925743a..6074fea41ae 100644
--- a/engine/Shopware/Components/Api/Exception/NonUniqueIdentifierUsedException.php
+++ b/engine/Shopware/Components/Api/Exception/NonUniqueIdentifierUsedException.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Api\Exception;
@@ -45,7 +44,7 @@ public function __construct(string $identifier, string $identifierValue, string
     {
         $this->alternativeIds = $alternativeIds;
 
-        $message = sprintf("Identifier '%s' with value '%s' for entity '%s' is not unique.", $identifier, $identifierValue, $model);
+        $message = \sprintf("Identifier '%s' with value '%s' for entity '%s' is not unique.", $identifier, $identifierValue, $model);
         parent::__construct($message, Response::HTTP_CONFLICT);
     }
 
diff --git a/engine/Shopware/Components/Api/Exception/NotFoundException.php b/engine/Shopware/Components/Api/Exception/NotFoundException.php
index 99cee46b3c6..0ddd52a6ae9 100644
--- a/engine/Shopware/Components/Api/Exception/NotFoundException.php
+++ b/engine/Shopware/Components/Api/Exception/NotFoundException.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Api\Exception;
diff --git a/engine/Shopware/Components/Api/Exception/OrmException.php b/engine/Shopware/Components/Api/Exception/OrmException.php
index 9fa84264a7a..577bda70c30 100644
--- a/engine/Shopware/Components/Api/Exception/OrmException.php
+++ b/engine/Shopware/Components/Api/Exception/OrmException.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Api\Exception;
@@ -32,7 +31,7 @@
 
 class OrmException extends Enlight_Exception implements ApiException
 {
-    public function __construct(string $message, Exception $previous = null)
+    public function __construct(string $message, ?Exception $previous = null)
     {
         parent::__construct($message, Response::HTTP_INTERNAL_SERVER_ERROR, $previous);
     }
diff --git a/engine/Shopware/Components/Api/Exception/ParameterMissingException.php b/engine/Shopware/Components/Api/Exception/ParameterMissingException.php
index c060a09f2ab..a8ff4fa89ab 100644
--- a/engine/Shopware/Components/Api/Exception/ParameterMissingException.php
+++ b/engine/Shopware/Components/Api/Exception/ParameterMissingException.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Api\Exception;
@@ -43,7 +42,7 @@ class ParameterMissingException extends Enlight_Exception implements ApiExceptio
     public function __construct($param)
     {
         $this->setMissingParam($param);
-        parent::__construct(sprintf('A required parameter is missing: %s', $param), Response::HTTP_BAD_REQUEST);
+        parent::__construct(\sprintf('A required parameter is missing: %s', $param), Response::HTTP_BAD_REQUEST);
     }
 
     /**
diff --git a/engine/Shopware/Components/Api/Exception/PrivilegeException.php b/engine/Shopware/Components/Api/Exception/PrivilegeException.php
index 2b34737dc0e..fe5cefe8382 100644
--- a/engine/Shopware/Components/Api/Exception/PrivilegeException.php
+++ b/engine/Shopware/Components/Api/Exception/PrivilegeException.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Api\Exception;
diff --git a/engine/Shopware/Components/Api/Exception/ValidationException.php b/engine/Shopware/Components/Api/Exception/ValidationException.php
index 410a660613e..82dcacdd04b 100644
--- a/engine/Shopware/Components/Api/Exception/ValidationException.php
+++ b/engine/Shopware/Components/Api/Exception/ValidationException.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Api\Exception;
@@ -41,7 +40,7 @@ class ValidationException extends Enlight_Exception implements ApiException
      *
      * @var ConstraintViolationListInterface|null
      */
-    protected $violations = null;
+    protected $violations;
 
     public function __construct(ConstraintViolationListInterface $violations)
     {
diff --git a/engine/Shopware/Components/Api/Manager.php b/engine/Shopware/Components/Api/Manager.php
index 3c26770cc5b..c6df31e8a4e 100644
--- a/engine/Shopware/Components/Api/Manager.php
+++ b/engine/Shopware/Components/Api/Manager.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Api;
@@ -50,7 +50,7 @@ public static function getResource($name)
                 /** @var Resource\Resource $resource */
                 $resource = $container->get($serviceId);
             } else {
-                trigger_error(sprintf('The requested service with id %s is deprecated. Please use CamelCased service id instead.', $name), E_USER_DEPRECATED);
+                trigger_error(\sprintf('The requested service with id %s is deprecated. Please use CamelCased service id instead.', $name), E_USER_DEPRECATED);
                 $resource = $container->get('shopware.api.' . strtolower($name));
             }
         } catch (ServiceNotFoundException $e) {
diff --git a/engine/Shopware/Components/Api/Resource/Address.php b/engine/Shopware/Components/Api/Resource/Address.php
index 0a27097eae0..8c6d2a264ee 100644
--- a/engine/Shopware/Components/Api/Resource/Address.php
+++ b/engine/Shopware/Components/Api/Resource/Address.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Api\Resource;
@@ -83,7 +83,7 @@ public function getOne($id)
         $address = $query->getOneOrNullResult($this->getResultMode());
 
         if (!$address) {
-            throw new NotFoundException(sprintf('Address by id %d not found', $id));
+            throw new NotFoundException(\sprintf('Address by id %d not found', $id));
         }
 
         return $address;
@@ -108,7 +108,7 @@ public function getList($offset = 0, $limit = 25, array $criteria = [], array $o
         $totalResult = $paginator->count();
 
         // Returns the address data
-        $addresses = $paginator->getIterator()->getArrayCopy();
+        $addresses = iterator_to_array($paginator);
 
         return ['data' => $addresses, 'total' => $totalResult];
     }
@@ -128,7 +128,7 @@ public function create(array $params)
 
         $customer = $this->getContainer()->get(ModelManager::class)->find(CustomerModel::class, $customerId);
         if (!$customer) {
-            throw new NotFoundException(sprintf('Customer by id %s not found', $customerId));
+            throw new NotFoundException(\sprintf('Customer by id %s not found', $customerId));
         }
 
         $this->setupContext($customer->getShop()->getId());
@@ -175,7 +175,7 @@ public function update($id, array $params)
         $address = $this->getRepository()->findOneBy(['id' => $id]);
 
         if (!$address) {
-            throw new NotFoundException(sprintf('Address by id %d not found', $id));
+            throw new NotFoundException(\sprintf('Address by id %d not found', $id));
         }
 
         $this->setupContext($address->getCustomer()->getShop()->getId());
@@ -215,7 +215,7 @@ public function delete($id)
         $address = $this->getRepository()->findOneBy(['id' => $id]);
 
         if (!$address) {
-            throw new NotFoundException(sprintf('Address by id %d not found', $id));
+            throw new NotFoundException(\sprintf('Address by id %d not found', $id));
         }
 
         $this->addressService->delete($address);
diff --git a/engine/Shopware/Components/Api/Resource/Article.php b/engine/Shopware/Components/Api/Resource/Article.php
index fb84fd5f601..911f2991082 100644
--- a/engine/Shopware/Components/Api/Resource/Article.php
+++ b/engine/Shopware/Components/Api/Resource/Article.php
@@ -1,31 +1,32 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Api\Resource;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\ORMException;
+use Doctrine\ORM\Query;
 use Exception;
 use RuntimeException;
 use Shopware\Bundle\AttributeBundle\Service\CrudServiceInterface;
@@ -40,9 +41,9 @@
 use Shopware\Components\Model\QueryBuilder;
 use Shopware\Components\Thumbnail\Manager;
 use Shopware\Models\Article\Article as ProductModel;
-use Shopware\Models\Article\Configurator;
 use Shopware\Models\Article\Configurator\Group as ConfiguratorGroup;
 use Shopware\Models\Article\Configurator\Option as ConfiguratorOption;
+use Shopware\Models\Article\Configurator\Set;
 use Shopware\Models\Article\Detail;
 use Shopware\Models\Article\Download;
 use Shopware\Models\Article\Image;
@@ -72,7 +73,7 @@ class Article extends Resource implements BatchInterface
      */
     private $translationComponent;
 
-    public function __construct(Shopware_Components_Translation $translationComponent = null)
+    public function __construct(?Shopware_Components_Translation $translationComponent = null)
     {
         $this->translationComponent = $translationComponent ?: Shopware()->Container()->get(Shopware_Components_Translation::class);
     }
@@ -112,7 +113,7 @@ public function getIdFromNumber($number)
         $productVariant = $this->getDetailRepository()->findOneBy(['number' => $number]);
 
         if (!$productVariant instanceof Detail) {
-            throw new NotFoundException(sprintf('Product by number "%s" not found', $number));
+            throw new NotFoundException(\sprintf('Product by number "%s" not found', $number));
         }
 
         return $productVariant->getArticle()->getId();
@@ -179,7 +180,7 @@ public function getOne($id, array $options = [])
         $product = $builder->getQuery()->getOneOrNullResult($this->getResultMode());
 
         if ($product === null) {
-            throw new NotFoundException(sprintf('Product by id "%d" not found', $id));
+            throw new NotFoundException(\sprintf('Product by id "%d" not found', $id));
         }
 
         if ($this->getResultMode() === self::HYDRATE_ARRAY) {
@@ -248,7 +249,11 @@ public function getTaxPrices(array $prices, $taxRate)
         foreach ($prices as &$price) {
             $price['net'] = $price['price'];
             if ($price['customerGroup'] && $price['customerGroup']['taxInput']) {
-                $price['price'] *= (($taxRate + 100) / 100);
+                $taxMultiplier = ($taxRate + 100) / 100;
+
+                $price['price'] *= $taxMultiplier;
+                $price['pseudoPrice'] *= $taxMultiplier;
+                $price['regulationPrice'] *= $taxMultiplier;
             }
         }
 
@@ -274,6 +279,7 @@ public function getList($offset = 0, $limit = 25, array $criteria = [], array $o
             ->setFirstResult($offset)
             ->setMaxResults($limit);
 
+        /** @var Query<ProductModel|array<string, mixed>> $query */
         $query = $builder->getQuery();
 
         $query->setHydrationMode($this->getResultMode());
@@ -283,18 +289,18 @@ public function getList($offset = 0, $limit = 25, array $criteria = [], array $o
         // Returns the total count of the query
         $totalResult = $paginator->count();
 
-        $products = $paginator->getIterator()->getArrayCopy();
+        $products = iterator_to_array($paginator);
 
-        if ($this->getResultMode() === self::HYDRATE_ARRAY
-            && isset($options['language'])
-            && !empty($options['language'])) {
+        if ($this->getResultMode() === self::HYDRATE_ARRAY && !empty($options['language'])) {
             $shop = $this->findEntityByConditions(Shop::class, [['id' => $options['language']]]);
             if (!$shop instanceof Shop) {
                 throw new ModelNotFoundException(Shop::class, $options['language']);
             }
 
             foreach ($products as &$product) {
-                $product = $this->translateArticle($product, $shop);
+                if (\is_array($product)) {
+                    $product = $this->translateArticle($product, $shop);
+                }
             }
         }
 
@@ -393,8 +399,8 @@ public function update($id, array $params)
 
         $product = $builder->getQuery()->getOneOrNullResult(self::HYDRATE_OBJECT);
 
-        if (!$product) {
-            throw new NotFoundException(sprintf('Product by id "%d" not found', $id));
+        if (!$product instanceof ProductModel) {
+            throw new NotFoundException(\sprintf('Product by id "%d" not found', $id));
         }
 
         $translations = [];
@@ -451,7 +457,7 @@ public function delete($id)
         $product = $this->getRepository()->find($id);
 
         if (!$product instanceof ProductModel) {
-            throw new NotFoundException(sprintf('Product by "id" %d not found', $id));
+            throw new NotFoundException(\sprintf('Product by "id" %d not found', $id));
         }
 
         // Delete associated data
@@ -476,7 +482,9 @@ public function delete($id)
     /**
      * Helper function which converts the passed data for the main variant of the product.
      *
-     * @return array
+     * @param array<string, mixed> $data
+     *
+     * @return array<string, mixed>
      */
     public function prepareMainDetail(array $data, ProductModel $article)
     {
@@ -488,7 +496,7 @@ public function prepareMainDetail(array $data, ProductModel $article)
             $article->setMainDetail($detail);
         }
 
-        if (!$data['mainDetail']) {
+        if (empty($data['mainDetail'])) {
             $data['mainDetail'] = [];
         }
 
@@ -502,8 +510,8 @@ public function prepareMainDetail(array $data, ProductModel $article)
      *
      * @param bool $force Force all images to be regenerated
      *
-     * @see \Shopware\Components\Api\Resource\Article::generateMainThumbnails()
-     * @see \Shopware\Components\Api\Resource\Article::generateVariantImages()
+     * @see Article::generateMainThumbnails
+     * @see Article::generateVariantImages
      */
     public function generateImages(ProductModel $article, $force = false)
     {
@@ -561,13 +569,12 @@ public function generateVariantImages(ProductModel $article, $force = false)
                     ->setParameter($alias, $option->getId());
             }
 
-            /** @var Detail $variant */
-            foreach ($builder->getQuery()->getResult() as $variant) {
-                if (!$force && $this->getCollectionElementByProperty(
-                    $variant->getImages(),
-                    'parent',
-                    $mapping->getImage()
-                )) {
+            /** @var Query<Detail> $query */
+            $query = $builder->getQuery();
+            foreach ($query->getResult() as $variant) {
+                if (!$force
+                    && $this->getCollectionElementByProperty($variant->getImages(), 'parent', $mapping->getImage())
+                ) {
                     continue;
                 }
 
@@ -641,7 +648,7 @@ public function writeTranslations($articleId, $translations)
         foreach ($translations as $translation) {
             $shop = $this->getManager()->find(Shop::class, $translation['shopId']);
             if (!$shop instanceof Shop) {
-                throw new CustomValidationException(sprintf('Shop by id "%s" not found', $translation['shopId']));
+                throw new CustomValidationException(\sprintf('Shop by id "%s" not found', $translation['shopId']));
             }
 
             // Backward compatibility for attribute translations
@@ -657,11 +664,6 @@ public function writeTranslations($articleId, $translations)
         }
     }
 
-    /**
-     * Returns the primary ID of any data set.
-     *
-     * {@inheritdoc}
-     */
     public function getIdByData($data)
     {
         $id = null;
@@ -719,13 +721,14 @@ protected function getMediaResource()
      * The groups are sorted by the position value.
      *
      * @param int $articleId
+     *
+     * @return array<string, mixed>
      */
     protected function getArticleConfiguratorSet($articleId)
     {
-        /** @var QueryBuilder $builder */
         $builder = $this->getManager()->createQueryBuilder();
         $builder->select(['configuratorSet', 'groups'])
-            ->from(Configurator\Set::class, 'configuratorSet')
+            ->from(Set::class, 'configuratorSet')
             ->innerJoin('configuratorSet.articles', 'article')
             ->leftJoin('configuratorSet.groups', 'groups')
             ->addOrderBy('groups.position', 'ASC')
@@ -741,11 +744,10 @@ protected function getArticleConfiguratorSet($articleId)
      *
      * @param int $articleId
      *
-     * @return array
+     * @return array<array<string, mixed>>
      */
     protected function getArticleImages($articleId)
     {
-        /** @var QueryBuilder $builder */
         $builder = $this->getManager()->createQueryBuilder();
         $builder->select(['images'])
             ->from(Image::class, 'images')
@@ -763,11 +765,10 @@ protected function getArticleImages($articleId)
      *
      * @param int $articleId
      *
-     * @return array
+     * @return array<array<string, mixed>>
      */
     protected function getArticleDownloads($articleId)
     {
-        /** @var QueryBuilder $builder */
         $builder = $this->getManager()->createQueryBuilder();
         $builder->select(['downloads'])
             ->from(Download::class, 'downloads')
@@ -784,11 +785,10 @@ protected function getArticleDownloads($articleId)
      *
      * @param int $articleId
      *
-     * @return array
+     * @return array<array<string, mixed>>
      */
     protected function getArticleLinks($articleId)
     {
-        /** @var QueryBuilder $builder */
         $builder = $this->getManager()->createQueryBuilder();
         $builder->select(['links'])
             ->from(Link::class, 'links')
@@ -806,11 +806,10 @@ protected function getArticleLinks($articleId)
      *
      * @param int $articleId
      *
-     * @return array
+     * @return array<array<string, mixed>>
      */
     protected function getArticleCategories($articleId)
     {
-        /** @var QueryBuilder $builder */
         $builder = $this->getManager()->createQueryBuilder();
         $builder->select(['categories.id', 'categories.name'])
             ->from(Category::class, 'categories')
@@ -825,10 +824,11 @@ protected function getArticleCategories($articleId)
      * Helper function which selects all similar products of the passed product id.
      *
      * @param int $articleId
+     *
+     * @return array<string, mixed>|null
      */
     protected function getArticleSimilar($articleId)
     {
-        /** @var QueryBuilder $builder */
         $builder = $this->getManager()->createQueryBuilder();
         $builder->select(['article', 'PARTIAL similar.{id, name}'])
             ->from(ProductModel::class, 'article')
@@ -838,17 +838,18 @@ protected function getArticleSimilar($articleId)
 
         $product = $this->getSingleResult($builder);
 
-        return $product['similar'];
+        return $product['similar'] ?? null;
     }
 
     /**
      * Helper function which selects all accessory products of the passed product id.
      *
      * @param int $articleId
+     *
+     * @return array<string, mixed>|null
      */
     protected function getArticleRelated($articleId)
     {
-        /** @var QueryBuilder $builder */
         $builder = $this->getManager()->createQueryBuilder();
         $builder->select(['article', 'PARTIAL related.{id, name}'])
             ->from(ProductModel::class, 'article')
@@ -858,7 +859,7 @@ protected function getArticleRelated($articleId)
 
         $product = $this->getSingleResult($builder);
 
-        return $product['related'];
+        return $product['related'] ?? null;
     }
 
     /**
@@ -889,7 +890,7 @@ protected function getArticleSeoCategories($articleId)
      *
      * @param int $articleId
      *
-     * @return array
+     * @return array<array<string, mixed>>
      */
     protected function getArticleVariants($articleId)
     {
@@ -905,6 +906,8 @@ protected function getArticleVariants($articleId)
      * Helper function to remove product details for a given product
      *
      * @param ProductModel $article
+     *
+     * @return void
      */
     protected function removeArticleDetails($article)
     {
@@ -932,9 +935,9 @@ protected function removeArticleDetails($article)
     }
 
     /**
-     * @param array $data
+     * @param array<string, mixed> $data
      *
-     * @return array
+     * @return array<string, mixed>
      */
     protected function prepareAssociatedData($data, ProductModel $article)
     {
@@ -1053,7 +1056,7 @@ protected function prepareVariants($data, ProductModel $article)
                 }
             }
 
-            if ($variantData['isMain'] || $variantData['standard']) {
+            if (!empty($variantData['isMain']) || !empty($variantData['standard'])) {
                 $newMain = $variant;
                 $newMain->setKind(1);
                 $oldMainId = $article->getMainDetail()->getId();
@@ -1119,12 +1122,12 @@ protected function prepareVariants($data, ProductModel $article)
     }
 
     /**
-     * @param array $data
+     * @param array<string, mixed> $data
      *
      * @throws CustomValidationException
      * @throws Exception
      *
-     * @return array
+     * @return array<string, mixed>
      */
     protected function prepareConfiguratorSet($data, ProductModel $article)
     {
@@ -1134,7 +1137,7 @@ protected function prepareConfiguratorSet($data, ProductModel $article)
 
         $configuratorSet = $article->getConfiguratorSet();
         if (!$configuratorSet) {
-            $configuratorSet = new Configurator\Set();
+            $configuratorSet = new Set();
             $number = $data['mainDetail']['number'] ?? $article->getMainDetail()->getNumber();
 
             $configuratorSet->setName('Set-' . $number);
@@ -1159,7 +1162,7 @@ protected function prepareConfiguratorSet($data, ProductModel $article)
             if (isset($groupData['id'])) {
                 $group = $this->getManager()->getRepository(ConfiguratorGroup::class)->find($groupData['id']);
                 if (!$group) {
-                    throw new CustomValidationException(sprintf('ConfiguratorGroup by id "%s" not found', $groupData['id']));
+                    throw new CustomValidationException(\sprintf('ConfiguratorGroup by id "%s" not found', $groupData['id']));
                 }
             } elseif (isset($groupData['name'])) {
                 $group = $this->getManager()->getRepository(ConfiguratorGroup::class)->findOneBy(['name' => $groupData['name']]);
@@ -1180,7 +1183,7 @@ protected function prepareConfiguratorSet($data, ProductModel $article)
                     if (isset($optionData['id'])) {
                         $option = $this->getManager()->find(ConfiguratorOption::class, $optionData['id']);
                         if (!$option) {
-                            throw new CustomValidationException(sprintf('ConfiguratorOption by id "%s" not found', $optionData['id']));
+                            throw new CustomValidationException(\sprintf('ConfiguratorOption by id "%s" not found', $optionData['id']));
                         }
                     } else {
                         $option = $this->getManager()->getRepository(ConfiguratorOption::class)->findOneBy([
@@ -1228,11 +1231,11 @@ protected function prepareConfiguratorSet($data, ProductModel $article)
     }
 
     /**
-     * @param array $data
+     * @param array<string, mixed> $data
      *
      * @throws CustomValidationException
      *
-     * @return array
+     * @return array<string, mixed>
      */
     protected function prepareArticleAssociatedData($data, ProductModel $article)
     {
@@ -1241,12 +1244,12 @@ protected function prepareArticleAssociatedData($data, ProductModel $article)
             $data['tax'] = $this->getManager()->find(Tax::class, $data['taxId']);
 
             if (empty($data['tax'])) {
-                throw new CustomValidationException(sprintf('Tax by id "%s" not found', $data['taxId']));
+                throw new CustomValidationException(\sprintf('Tax by id "%s" not found', $data['taxId']));
             }
         } elseif (isset($data['tax']) && ($data['tax'] >= 0)) {
             $tax = $this->getManager()->getRepository(Tax::class)->findOneBy(['tax' => $data['tax']]);
             if (!$tax) {
-                throw new CustomValidationException(sprintf('Tax by taxrate "%s" not found', $data['tax']));
+                throw new CustomValidationException(\sprintf('Tax by taxrate "%s" not found', $data['tax']));
             }
             $data['tax'] = $tax;
         } else {
@@ -1257,7 +1260,7 @@ protected function prepareArticleAssociatedData($data, ProductModel $article)
         if (!empty($data['supplierId'])) {
             $data['supplier'] = $this->getManager()->find(Supplier::class, $data['supplierId']);
             if (empty($data['supplier'])) {
-                throw new CustomValidationException(sprintf('Supplier by id "%s" not found', $data['supplierId']));
+                throw new CustomValidationException(\sprintf('Supplier by id "%s" not found', $data['supplierId']));
             }
         } elseif (!empty($data['supplier'])) {
             $supplier = $this->getManager()->getRepository(Supplier::class)->findOneBy(['name' => $data['supplier']]);
@@ -1277,7 +1280,7 @@ protected function prepareArticleAssociatedData($data, ProductModel $article)
             } else {
                 $data['priceGroup'] = $this->getManager()->find(Group::class, $data['priceGroupId']);
                 if (empty($data['priceGroup'])) {
-                    throw new CustomValidationException(sprintf('Pricegroup by id "%s" not found', $data['priceGroupId']));
+                    throw new CustomValidationException(\sprintf('Pricegroup by id "%s" not found', $data['priceGroupId']));
                 }
             }
         } else {
@@ -1292,7 +1295,7 @@ protected function prepareArticleAssociatedData($data, ProductModel $article)
                 $data['propertyGroup'] = $this->getManager()->find(PropertyGroup::class, $data['filterGroupId']);
 
                 if (empty($data['propertyGroup'])) {
-                    throw new CustomValidationException(sprintf('PropertyGroup by id "%s" not found', $data['filterGroupId']));
+                    throw new CustomValidationException(\sprintf('PropertyGroup by id "%s" not found', $data['filterGroupId']));
                 }
             }
         } else {
@@ -1303,9 +1306,9 @@ protected function prepareArticleAssociatedData($data, ProductModel $article)
     }
 
     /**
-     * @param array $data
+     * @param array<string, mixed> $data
      *
-     * @return array
+     * @return array<string, mixed>
      */
     protected function prepareAttributeAssociatedData($data, ProductModel $article)
     {
@@ -1321,11 +1324,11 @@ protected function prepareAttributeAssociatedData($data, ProductModel $article)
     }
 
     /**
-     * @param array $data
+     * @param array<string, mixed> $data
      *
      * @throws CustomValidationException
      *
-     * @return array
+     * @return array<string, mixed>
      */
     protected function prepareCategoryAssociatedData($data, ProductModel $article)
     {
@@ -1337,7 +1340,7 @@ protected function prepareCategoryAssociatedData($data, ProductModel $article)
 
         $categories = $article->getCategories();
 
-        $categoryIds = $categories->map(function ($category) {
+        $categoryIds = $categories->map(function (Category $category) {
             return $category->getId();
         });
 
@@ -1356,7 +1359,7 @@ protected function prepareCategoryAssociatedData($data, ProductModel $article)
                     $category = $categoryResource->findCategoryByPath($categoryData['path'], true);
 
                     if (!$category) {
-                        throw new CustomValidationException(sprintf('Could not find or create category by path: %s.', $categoryData['path']));
+                        throw new CustomValidationException(\sprintf('Could not find or create category by path: %s.', $categoryData['path']));
                     }
 
                     if (isset($categoryIds[$category->getId()])) {
@@ -1376,11 +1379,11 @@ protected function prepareCategoryAssociatedData($data, ProductModel $article)
     }
 
     /**
-     * @param array $data
+     * @param array<string, mixed> $data
      *
      * @throws CustomValidationException
      *
-     * @return array
+     * @return array<string, mixed>
      */
     protected function prepareSeoCategoryAssociatedData($data, ProductModel $article)
     {
@@ -1411,21 +1414,21 @@ protected function prepareSeoCategoryAssociatedData($data, ProductModel $article
                 );
 
                 if (!$shop instanceof Shop) {
-                    throw new CustomValidationException(sprintf('Could not find shop by id: %s.', $categoryData['shopId']));
+                    throw new CustomValidationException(\sprintf('Could not find shop by id: %s.', $categoryData['shopId']));
                 }
 
                 $seoCategory->setShop($shop);
             }
 
             if (!$seoCategory->getShop()) {
-                throw new CustomValidationException(sprintf('A product seo category requires a configured shop'));
+                throw new CustomValidationException(\sprintf('A product seo category requires a configured shop'));
             }
 
             if (isset($categoryData['categoryId'])) {
                 $category = $this->manager->find(Category::class, $categoryData['categoryId']);
 
                 if (!$category instanceof Category) {
-                    throw new CustomValidationException(sprintf('Could not find category by id: %s.', $categoryData['categoryId']));
+                    throw new CustomValidationException(\sprintf('Could not find category by id: %s.', $categoryData['categoryId']));
                 }
 
                 $seoCategory->setCategory($category);
@@ -1435,7 +1438,7 @@ protected function prepareSeoCategoryAssociatedData($data, ProductModel $article
                     true
                 );
                 if (!$category instanceof Category) {
-                    throw new CustomValidationException(sprintf('Could not find category by path: %s.', $categoryData['categoryPath']));
+                    throw new CustomValidationException(\sprintf('Could not find category by path: %s.', $categoryData['categoryPath']));
                 }
                 $seoCategory->setCategory($category);
             }
@@ -1447,7 +1450,7 @@ protected function prepareSeoCategoryAssociatedData($data, ProductModel $article
             );
 
             if (!$existing instanceof Category) {
-                throw new CustomValidationException(sprintf("Seo category isn't assigned as normal product category. Only assigned categories can be used as seo category"));
+                throw new CustomValidationException(\sprintf("Seo category isn't assigned as normal product category. Only assigned categories can be used as seo category"));
             }
 
             $seoCategory->setArticle($article);
@@ -1459,11 +1462,11 @@ protected function prepareSeoCategoryAssociatedData($data, ProductModel $article
     }
 
     /**
-     * @param array $data
+     * @param array<string, mixed> $data
      *
      * @throws CustomValidationException
      *
-     * @return array
+     * @return array<string, mixed>
      */
     protected function prepareAvoidCustomerGroups($data, ProductModel $article)
     {
@@ -1487,11 +1490,11 @@ protected function prepareAvoidCustomerGroups($data, ProductModel $article)
     }
 
     /**
-     * @param array $data
+     * @param array<string, mixed> $data
      *
      * @throws CustomValidationException
      *
-     * @return array
+     * @return array<string, mixed>
      */
     protected function prepareRelatedAssociatedData($data, ProductModel $article)
     {
@@ -1507,7 +1510,7 @@ protected function prepareRelatedAssociatedData($data, ProductModel $article)
             }
 
             $relatedProduct = null;
-            if ($relatedData['number']) {
+            if (!empty($relatedData['number'])) {
                 $productId = $this->getManager()->getConnection()->fetchOne(
                     'SELECT articleID FROM s_articles_details WHERE ordernumber = :number',
                     [':number' => $relatedData['number']]
@@ -1530,13 +1533,13 @@ protected function prepareRelatedAssociatedData($data, ProductModel $article)
                 );
             }
 
-            //no valid entity found, throw exception!
+            // no valid entity found, throw exception!
             if ($relatedProduct === null) {
                 $property = $relatedData['number'] ?: $relatedData['id'];
-                throw new CustomValidationException(sprintf('Related product by number/id "%s" not found', $property));
+                throw new CustomValidationException(\sprintf('Related product by number/id "%s" not found', $property));
             }
 
-            if ($relatedData['cross']) {
+            if (!empty($relatedData['cross'])) {
                 $relatedProduct->getRelated()->add($article);
             }
         }
@@ -1547,11 +1550,11 @@ protected function prepareRelatedAssociatedData($data, ProductModel $article)
     }
 
     /**
-     * @param array $data
+     * @param array<string, mixed> $data
      *
      * @throws CustomValidationException
      *
-     * @return array
+     * @return array<string, mixed>
      */
     protected function prepareSimilarAssociatedData($data, ProductModel $article)
     {
@@ -1567,7 +1570,7 @@ protected function prepareSimilarAssociatedData($data, ProductModel $article)
             }
 
             $similarProduct = null;
-            if ($similarData['number']) {
+            if (!empty($similarData['number'])) {
                 $productId = $this->getManager()->getConnection()->fetchOne(
                     'SELECT articleID FROM s_articles_details WHERE ordernumber = :number',
                     [':number' => $similarData['number']]
@@ -1593,10 +1596,10 @@ protected function prepareSimilarAssociatedData($data, ProductModel $article)
             // No valid entity found, throw exception!
             if ($similarProduct === null) {
                 $property = $similarData['number'] ?: $similarData['id'];
-                throw new CustomValidationException(sprintf('Similar product by number/id "%s" not found', $property));
+                throw new CustomValidationException(\sprintf('Similar product by number/id "%s" not found', $property));
             }
 
-            if ($similarData['cross']) {
+            if (!empty($similarData['cross'])) {
                 $similarProduct->getSimilar()->add($article);
             }
         }
@@ -1607,11 +1610,11 @@ protected function prepareSimilarAssociatedData($data, ProductModel $article)
     }
 
     /**
-     * @param array $data
+     * @param array<string, mixed> $data
      *
      * @throws CustomValidationException
      *
-     * @return array
+     * @return array<string, mixed>
      */
     protected function preparePropertyValuesData($data, ProductModel $article)
     {
@@ -1645,9 +1648,9 @@ protected function preparePropertyValuesData($data, ProductModel $article)
             if (isset($valueData['id'])) {
                 $value = $this->getManager()->getRepository(Value::class)->find($valueData['id']);
                 if (!$value instanceof Value) {
-                    throw new CustomValidationException(sprintf('Property value by id "%s" not found', $valueData['id']));
+                    throw new CustomValidationException(\sprintf('Property value by id "%s" not found', $valueData['id']));
                 }
-                // Get / create value by name
+            // Get / create value by name
             } elseif (isset($valueData['value'])) {
                 // Get option
                 if (isset($valueData['option'])) {
@@ -1655,7 +1658,7 @@ protected function preparePropertyValuesData($data, ProductModel $article)
                     if (isset($valueData['option']['id'])) {
                         $option = $this->getManager()->getRepository(Option::class)->find($valueData['option']['id']);
                         if (!$option instanceof Option) {
-                            throw new CustomValidationException(sprintf('Property option by id "%s" not found', $valueData['option']['id']));
+                            throw new CustomValidationException(\sprintf('Property option by id "%s" not found', $valueData['option']['id']));
                         }
                         $filters = [
                             ['property' => 'options.id', 'expression' => '=', 'value' => $option->getId()],
@@ -1666,7 +1669,7 @@ protected function preparePropertyValuesData($data, ProductModel $article)
                         if (!$relation instanceof Relation) {
                             $propertyGroup->addOption($option);
                         }
-                        // Get/create option depending on associated filter groups
+                    // Get/create option depending on associated filter groups
                     } elseif (isset($valueData['option']['name'])) {
                         // If a name is passed and there is a matching option/group relation, get this option
                         // If only a name is passed, create a new option
@@ -1677,8 +1680,8 @@ protected function preparePropertyValuesData($data, ProductModel $article)
                         $query = $propertyRepository->getPropertyRelationQuery($filters, null, 1, 0);
                         $relation = $query->getOneOrNullResult(self::HYDRATE_OBJECT);
                         if (!$relation instanceof Relation) {
-                            //checks if a new option was created
-                            //because the new option is not written to the database at this point
+                            // checks if a new option was created
+                            // because the new option is not written to the database at this point
                             $groupOption = $this->getCollectionElementByProperty(
                                 $propertyGroup->getOptions(),
                                 'name',
@@ -1741,7 +1744,6 @@ protected function preparePropertyValuesData($data, ProductModel $article)
      */
     protected function getArticleImageMappingsQuery($articleId)
     {
-        /** @var QueryBuilder $builder */
         $builder = $this->getManager()->createQueryBuilder();
         $builder->select(['mappings', 'image', 'rules'])
             ->from(Image\Mapping::class, 'mappings')
@@ -1763,7 +1765,7 @@ protected function getArticleImageMappingsQuery($articleId)
      */
     protected function isVariantImageExist(Detail $variant, Image $image)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         foreach ($variant->getImages() as $variantImage) {
             if ((int) $variantImage->getParent()->getId() === (int) $image->getId()) {
@@ -1784,7 +1786,6 @@ protected function isVariantImageExist(Detail $variant, Image $image)
      */
     protected function getArticleVariantQuery($id)
     {
-        /** @var QueryBuilder $builder */
         $builder = $this->getManager()->createQueryBuilder();
         $builder->select('variants');
         $builder->from(Detail::class, 'variants')
@@ -1836,7 +1837,7 @@ protected function createImageMappings(Image $image, ProductModel $article, arra
 
                 if (!$available) {
                     $property = $option['id'] ?: $option['name'];
-                    throw new CustomValidationException(sprintf('Passed option "%s" does not exist in the configurator set of the product', $property));
+                    throw new CustomValidationException(\sprintf('Passed option "%s" does not exist in the configurator set of the product', $property));
                 }
 
                 $options->add($available);
@@ -2167,27 +2168,31 @@ protected function getSingleTranslation($type, $shopId, $key)
      * to get a single row of the query builder result for the current resource result mode
      * using the query paginator.
      *
-     * @return array
+     * @return array<string, mixed>
      */
-    private function getSingleResult(QueryBuilder $builder)
+    private function getSingleResult(QueryBuilder $builder): array
     {
+        /** @var Query<array<string, mixed>> $query */
         $query = $builder->getQuery();
-        $query->setHydrationMode($this->getResultMode());
+        $query->setHydrationMode(self::HYDRATE_ARRAY);
 
-        return $this->getManager()->createPaginator($query)->getIterator()->current();
+        return iterator_to_array($this->getManager()->createPaginator($query))[0] ?? [];
     }
 
     /**
      * Helper function to prevent duplicate source code
      * to get the full query builder result for the current resource result mode
      * using the query paginator.
+     *
+     * @return array<array<string, mixed>>
      */
     private function getFullResult(QueryBuilder $builder): array
     {
+        /** @var Query<array<string, mixed>> $query */
         $query = $builder->getQuery();
-        $query->setHydrationMode($this->getResultMode());
+        $query->setHydrationMode(self::HYDRATE_ARRAY);
 
-        return $this->getManager()->createPaginator($query)->getIterator()->getArrayCopy();
+        return iterator_to_array($this->getManager()->createPaginator($query));
     }
 
     /**
@@ -2223,7 +2228,11 @@ private function resetProductCategoryAssignment(array $data, ProductModel $produ
     }
 
     /**
+     * @param array<string, mixed> $data
+     *
      * @throws CustomValidationException
+     *
+     * @return array<string, mixed>
      */
     private function prepareDownloadsAssociatedData(array $data, ProductModel $product): array
     {
@@ -2249,10 +2258,10 @@ private function prepareDownloadsAssociatedData(array $data, ProductModel $produ
                     $media->setDescription($downloadData['name']);
                 }
 
-                try { //persist the model into the model manager
+                try { // persist the model into the model manager
                     $this->getManager()->persist($media);
                 } catch (ORMException $e) {
-                    throw new CustomValidationException(sprintf('Some error occurred while loading your image from link "%s"', $downloadData['link']));
+                    throw new CustomValidationException(\sprintf('Some error occurred while loading your image from link "%s"', $downloadData['link']));
                 }
 
                 $download->setFile($media->getPath());
@@ -2271,7 +2280,11 @@ private function prepareDownloadsAssociatedData(array $data, ProductModel $produ
      * Resolves the passed images data to valid Shopware\Models\Article\Image
      * entities.
      *
+     * @param array<string, mixed> $data
+     *
      * @throws CustomValidationException
+     *
+     * @return array<string, mixed>
      */
     private function prepareImageAssociatedData(array $data, ProductModel $product): array
     {
@@ -2324,7 +2337,7 @@ private function prepareImageAssociatedData(array $data, ProductModel $product):
                 );
 
                 if (!($media instanceof MediaModel)) {
-                    throw new CustomValidationException(sprintf('Media by mediaId "%s" not found', $imageData['mediaId']));
+                    throw new CustomValidationException(\sprintf('Media by mediaId "%s" not found', $imageData['mediaId']));
                 }
 
                 $image = $this->updateArticleImageWithMedia(
diff --git a/engine/Shopware/Components/Api/Resource/Cache.php b/engine/Shopware/Components/Api/Resource/Cache.php
index 697c75f592f..074359dedb8 100644
--- a/engine/Shopware/Components/Api/Resource/Cache.php
+++ b/engine/Shopware/Components/Api/Resource/Cache.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Api\Resource;
@@ -60,10 +60,8 @@ class Cache extends Resource implements BatchInterface
 
     /**
      * Sets the Container.
-     *
-     * @param Container $container
      */
-    public function setContainer(Container $container = null)
+    public function setContainer(?Container $container = null)
     {
         if ($container) {
             $this->request = $container->get('front')->Request();
@@ -130,9 +128,6 @@ public function delete($id)
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getIdByData($data)
     {
         return $data['id'] ?? false;
@@ -189,7 +184,7 @@ public function batchDelete($data)
      */
     protected function getRequest()
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         return $this->request;
     }
@@ -254,7 +249,7 @@ protected function clearCache($cache)
                 $this->cacheManager->clearOpCache();
                 break;
             default:
-                throw new NotFoundException(sprintf('Cache "%s" is not a valid cache id.', $cache));
+                throw new NotFoundException(\sprintf('Cache "%s" is not a valid cache id.', $cache));
         }
 
         if (!empty($capabilities['tags'])) {
@@ -295,7 +290,7 @@ private function getCacheInfo($cache): array
                 $cacheInfo = $this->cacheManager->getOpCacheCacheInfo();
                 break;
             default:
-                throw new NotFoundException(sprintf('Cache "%s" is not a valid cache id.', $cache));
+                throw new NotFoundException(\sprintf('Cache "%s" is not a valid cache id.', $cache));
         }
 
         $cacheInfo['id'] = $cache;
diff --git a/engine/Shopware/Components/Api/Resource/Category.php b/engine/Shopware/Components/Api/Resource/Category.php
index 6649d70f8e4..fa1f298c0ee 100644
--- a/engine/Shopware/Components/Api/Resource/Category.php
+++ b/engine/Shopware/Components/Api/Resource/Category.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Api\Resource;
@@ -53,7 +53,7 @@ class Category extends Resource
      */
     private $translationComponent;
 
-    public function __construct(TranslationComponent $translationComponent = null)
+    public function __construct(?TranslationComponent $translationComponent = null)
     {
         $this->translationComponent = $translationComponent ?: Shopware()->Container()->get(TranslationComponent::class);
     }
@@ -87,7 +87,7 @@ public function getOne($id)
         $categoryResult = $query->getOneOrNullResult($this->getResultMode());
 
         if (!$categoryResult) {
-            throw new NotFoundException(sprintf('Category by id %d not found', $id));
+            throw new NotFoundException(\sprintf('Category by id %d not found', $id));
         }
 
         if ($this->getResultMode() === Resource::HYDRATE_ARRAY) {
@@ -139,7 +139,7 @@ public function getList($offset = 0, $limit = 25, array $criteria = [], array $o
         $totalResult = $paginator->count();
 
         // Returns the category data
-        $categories = $paginator->getIterator()->getArrayCopy();
+        $categories = iterator_to_array($paginator);
 
         return ['data' => $categories, 'total' => $totalResult];
     }
@@ -204,7 +204,7 @@ public function update($id, array $params)
         $category = $this->getRepository()->find($id);
 
         if (!$category) {
-            throw new NotFoundException(sprintf('Category by id %d not found', $id));
+            throw new NotFoundException(\sprintf('Category by id %d not found', $id));
         }
 
         $params = $this->prepareCategoryData($params);
@@ -245,7 +245,7 @@ public function delete($id)
         $category = $this->getRepository()->find($id);
 
         if (!$category) {
-            throw new NotFoundException(sprintf('Category by id %d not found', $id));
+            throw new NotFoundException(\sprintf('Category by id %d not found', $id));
         }
 
         $this->getManager()->remove($category);
@@ -303,7 +303,7 @@ public function findCategoryByPath($path, $create = false)
                 if ($parent === null) {
                     $parent = $this->getRepository()->find($parentId);
                     if (!$parent) {
-                        throw new RuntimeException(sprintf('Could not find parent %s', $parentId));
+                        throw new RuntimeException(\sprintf('Could not find parent %s', $parentId));
                     }
                 }
 
@@ -335,7 +335,7 @@ public function writeTranslations($categoryId, $translations)
         foreach ($translations as $translation) {
             $shop = $this->getManager()->find(ShopModel::class, $translation['shopId']);
             if (!$shop) {
-                throw new CustomValidationException(sprintf('Shop by id %s not found', $translation['shopId']));
+                throw new CustomValidationException(\sprintf('Shop by id %s not found', $translation['shopId']));
             }
 
             $attributeTranslation = array_intersect_key($translation, array_flip($attributes));
@@ -366,7 +366,7 @@ private function prepareCategoryData(array $params): array
         if (!empty($params['parent'])) {
             $params['parent'] = Shopware()->Models()->getRepository(CategoryModel::class)->find($params['parent']);
             if (!$params['parent']) {
-                throw new CustomValidationException(sprintf('Parent by id %s not found', $params['parent']));
+                throw new CustomValidationException(\sprintf('Parent by id %s not found', $params['parent']));
             }
         } else {
             unset($params['parent']);
@@ -406,7 +406,7 @@ private function prepareMediaData(array $data, CategoryModel $categoryModel): ar
             $media = $this->getManager()->find(MediaModel::class, (int) $data['media']['mediaId']);
 
             if (!($media instanceof MediaModel)) {
-                throw new CustomValidationException(sprintf('Media by mediaId %s not found', $data['media']['mediaId']));
+                throw new CustomValidationException(\sprintf('Media by mediaId %s not found', $data['media']['mediaId']));
             }
         }
 
@@ -432,18 +432,18 @@ private function prepareManualSorting(array $data, CategoryModel $category): arr
 
         foreach ($data['manualSorting'] as $sorting) {
             if (!isset($sorting['product_id'])) {
-                throw new CustomValidationException(sprintf('Field product_id is missing in manualSorting array'));
+                throw new CustomValidationException(\sprintf('Field product_id is missing in manualSorting array'));
             }
 
             if (!isset($sorting['position'])) {
-                throw new CustomValidationException(sprintf('Field position is missing in manualSorting array'));
+                throw new CustomValidationException(\sprintf('Field position is missing in manualSorting array'));
             }
 
             if (!$connection->fetchOne('SELECT 1 FROM s_articles_categories_ro WHERE categoryID = ? AND articleID = ?', [
                 $category->getId(),
                 $sorting['product_id'],
             ])) {
-                throw new CustomValidationException(sprintf('Product with id %d is not assigned to the category', $sorting['product_id']));
+                throw new CustomValidationException(\sprintf('Product with id %d is not assigned to the category', $sorting['product_id']));
             }
 
             $sortingObj = new ManualSorting();
diff --git a/engine/Shopware/Components/Api/Resource/Country.php b/engine/Shopware/Components/Api/Resource/Country.php
index 51db5d4d8ff..f8c93e95cdb 100644
--- a/engine/Shopware/Components/Api/Resource/Country.php
+++ b/engine/Shopware/Components/Api/Resource/Country.php
@@ -1,30 +1,38 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Api\Resource;
 
-use Shopware\Components\Api\Exception as ApiException;
+use Doctrine\ORM\Query;
+use Shopware\Components\Api\Exception\CustomValidationException;
+use Shopware\Components\Api\Exception\NotFoundException;
+use Shopware\Components\Api\Exception\ParameterMissingException;
+use Shopware\Components\Api\Exception\ValidationException;
+use Shopware\Models\Country\Area;
+use Shopware\Models\Country\Country as CountryModel;
+use Shopware\Models\Country\Repository;
+use Shopware\Models\Country\State;
 
 /**
  * Country API Resource
@@ -32,11 +40,11 @@
 class Country extends Resource
 {
     /**
-     * @return \Shopware\Models\Country\Repository
+     * @return Repository
      */
     public function getRepository()
     {
-        return $this->getManager()->getRepository(\Shopware\Models\Country\Country::class);
+        return $this->getManager()->getRepository(CountryModel::class);
     }
 
     /**
@@ -44,17 +52,17 @@ public function getRepository()
      *
      * @param int $id
      *
-     * @throws \Shopware\Components\Api\Exception\ParameterMissingException
-     * @throws \Shopware\Components\Api\Exception\NotFoundException
+     * @throws NotFoundException
+     * @throws ParameterMissingException
      *
-     * @return array|\Shopware\Models\Country\Country
+     * @return array|CountryModel
      */
     public function getOne($id)
     {
         $this->checkPrivilege('read');
 
         if (empty($id)) {
-            throw new ApiException\ParameterMissingException('id');
+            throw new ParameterMissingException('id');
         }
 
         $filters = [
@@ -65,10 +73,10 @@ public function getOne($id)
             ],
         ];
         $builder = $this->getRepository()->getCountriesWithStatesQueryBuilder($filters);
-        /** @var \Shopware\Models\Country\Country|null $country */
+        /** @var CountryModel|null $country */
         $country = $builder->getQuery()->getOneOrNullResult($this->getResultMode());
         if (!$country) {
-            throw new ApiException\NotFoundException(sprintf('Country by id %d not found', $id));
+            throw new NotFoundException(\sprintf('Country by id %d not found', $id));
         }
 
         return $country;
@@ -95,13 +103,14 @@ public function getList($offset = 0, $limit = 25, array $criteria = [], array $o
                 ->setMaxResults($limit);
 
         // Set hydration mode
+        /** @var Query<CountryModel|array<string, mixed>> $query */
         $query = $builder->getQuery();
         $query->setHydrationMode($this->getResultMode());
 
         // Get result
         $paginator = $this->getManager()->createPaginator($query);
         $totalResult = $paginator->count();
-        $countries = $paginator->getIterator()->getArrayCopy();
+        $countries = iterator_to_array($paginator);
 
         return [
             'data' => $countries,
@@ -112,9 +121,9 @@ public function getList($offset = 0, $limit = 25, array $criteria = [], array $o
     /**
      * Creates a new Country entity using the passed params.
      *
-     * @throws \Shopware\Components\Api\Exception\ValidationException
+     * @throws ValidationException
      *
-     * @return \Shopware\Models\Country\Country
+     * @return CountryModel
      */
     public function create(array $params)
     {
@@ -122,12 +131,12 @@ public function create(array $params)
 
         $params = $this->prepareCountryData($params);
 
-        $country = new \Shopware\Models\Country\Country();
+        $country = new CountryModel();
         $country->fromArray($params);
 
         $violations = $this->getManager()->validate($country);
         if ($violations->count() > 0) {
-            throw new ApiException\ValidationException($violations);
+            throw new ValidationException($violations);
         }
 
         $this->getManager()->persist($country);
@@ -141,24 +150,24 @@ public function create(array $params)
      *
      * @param int $id
      *
-     * @throws \Shopware\Components\Api\Exception\ParameterMissingException
-     * @throws \Shopware\Components\Api\Exception\NotFoundException
-     * @throws \Shopware\Components\Api\Exception\ValidationException
+     * @throws NotFoundException
+     * @throws ValidationException
+     * @throws ParameterMissingException
      *
-     * @return \Shopware\Models\Country\Country
+     * @return CountryModel
      */
     public function update($id, array $params)
     {
         $this->checkPrivilege('update');
 
         if (empty($id)) {
-            throw new ApiException\ParameterMissingException('id');
+            throw new ParameterMissingException('id');
         }
 
-        /** @var \Shopware\Models\Country\Country|null $country */
+        /** @var CountryModel|null $country */
         $country = $this->getRepository()->find($id);
         if (!$country) {
-            throw new ApiException\NotFoundException(sprintf('Country by id %d not found', $id));
+            throw new NotFoundException(\sprintf('Country by id %d not found', $id));
         }
 
         $params = $this->prepareCountryData($params, $country);
@@ -166,7 +175,7 @@ public function update($id, array $params)
 
         $violations = $this->getManager()->validate($country);
         if ($violations->count() > 0) {
-            throw new ApiException\ValidationException($violations);
+            throw new ValidationException($violations);
         }
 
         $this->flush();
@@ -179,23 +188,23 @@ public function update($id, array $params)
      *
      * @param int $id
      *
-     * @throws \Shopware\Components\Api\Exception\ParameterMissingException
-     * @throws \Shopware\Components\Api\Exception\NotFoundException
+     * @throws NotFoundException
+     * @throws ParameterMissingException
      *
-     * @return \Shopware\Models\Country\Country
+     * @return CountryModel
      */
     public function delete($id)
     {
         $this->checkPrivilege('delete');
 
         if (empty($id)) {
-            throw new ApiException\ParameterMissingException('id');
+            throw new ParameterMissingException('id');
         }
 
-        /** @var \Shopware\Models\Country\Country|null $country */
+        /** @var CountryModel|null $country */
         $country = $this->getRepository()->find($id);
         if (!$country) {
-            throw new ApiException\NotFoundException(sprintf('Country by id %d not found', $id));
+            throw new NotFoundException(\sprintf('Country by id %d not found', $id));
         }
 
         $this->getManager()->remove($country);
@@ -205,15 +214,13 @@ public function delete($id)
     }
 
     /**
-     * @param \Shopware\Models\Country\Country $country
-     *
-     * @throws \Shopware\Components\Api\Exception\CustomValidationException
-     * @throws \Shopware\Components\Api\Exception\ParameterMissingException
-     * @throws \Shopware\Components\Api\Exception\NotFoundException
+     * @throws ParameterMissingException
+     * @throws NotFoundException
+     * @throws CustomValidationException
      *
      * @return array
      */
-    private function prepareCountryData(array $params, \Shopware\Models\Country\Country $country = null)
+    private function prepareCountryData(array $params, ?CountryModel $country = null)
     {
         $requiredParams = [
             'name',
@@ -224,11 +231,11 @@ private function prepareCountryData(array $params, \Shopware\Models\Country\Coun
         foreach ($requiredParams as $param) {
             if (!$country) {
                 if (!isset($params[$param]) || empty($params[$param])) {
-                    throw new ApiException\ParameterMissingException($param);
+                    throw new ParameterMissingException($param);
                 }
             } else {
                 if (isset($params[$param]) && empty($params[$param])) {
-                    throw new ApiException\CustomValidationException(sprintf('Param "%s" may not be empty', $param));
+                    throw new CustomValidationException(\sprintf('Param "%s" may not be empty', $param));
                 }
             }
         }
@@ -236,26 +243,24 @@ private function prepareCountryData(array $params, \Shopware\Models\Country\Coun
         if (isset($params['area'])) {
             $areaId = (int) $params['area'];
             if ($areaId > 0) {
-                $area = $this->getManager()->find('\Shopware\Models\Country\Area', $areaId);
+                $area = $this->getManager()->find(Area::class, $areaId);
                 if ($area) {
                     $params['area'] = $area;
                 } else {
-                    throw new ApiException\NotFoundException(sprintf('Area by id %d not found', $areaId));
+                    throw new NotFoundException(\sprintf('Area by id %d not found', $areaId));
                 }
             } else {
                 $params['area'] = null;
             }
         }
 
-        $params = $this->prepareCountryStatesData($params);
-
-        return $params;
+        return $this->prepareCountryStatesData($params);
     }
 
     /**
-     * @throws \Shopware\Components\Api\Exception\CustomValidationException
-     * @throws \Shopware\Components\Api\Exception\ParameterMissingException
-     * @throws \Shopware\Components\Api\Exception\NotFoundException
+     * @throws CustomValidationException
+     * @throws ParameterMissingException
+     * @throws NotFoundException
      *
      * @return array
      */
@@ -267,13 +272,13 @@ private function prepareCountryStatesData(array $params)
 
         foreach ($params['states'] as &$state) {
             if (!isset($state['id']) || empty($state['id'])) {
-                throw new ApiException\CustomValidationException('You need to specify the id of the state you want to modify');
+                throw new CustomValidationException('You need to specify the id of the state you want to modify');
             }
 
-            /** @var \Shopware\Models\Country\State|null $stateModel */
-            $stateModel = $this->getManager()->find(\Shopware\Models\Country\State::class, $state['id']);
+            /** @var State|null $stateModel */
+            $stateModel = $this->getManager()->find(State::class, $state['id']);
             if (!$stateModel) {
-                throw new ApiException\NotFoundException(sprintf('State by id %d not found', (int) $state['id']));
+                throw new NotFoundException(\sprintf('State by id %d not found', (int) $state['id']));
             }
 
             // Update state
diff --git a/engine/Shopware/Components/Api/Resource/Customer.php b/engine/Shopware/Components/Api/Resource/Customer.php
index 1ce0c3af107..df2766e7bd5 100644
--- a/engine/Shopware/Components/Api/Resource/Customer.php
+++ b/engine/Shopware/Components/Api/Resource/Customer.php
@@ -5,28 +5,28 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Api\Resource;
 
 use Doctrine\ORM\NonUniqueResultException;
+use Doctrine\ORM\Query;
 use Doctrine\ORM\Query\Expr\Join;
 use Shopware\Bundle\AccountBundle\Service\AddressServiceInterface;
 use Shopware\Bundle\AccountBundle\Service\RegisterServiceInterface;
@@ -71,7 +71,7 @@ public function getRepository()
      *
      * @param string $number
      *
-     * @throws ParameterMissingException*
+     * @throws ParameterMissingException
      * @throws NonUniqueIdentifierUsedException
      * @throws NotFoundException
      *
@@ -97,7 +97,7 @@ public function getIdFromNumber($number)
         }
 
         if (!$id) {
-            throw new NotFoundException(sprintf('Customer by number %s not found', $number));
+            throw new NotFoundException(\sprintf('Customer by number %s not found', $number));
         }
 
         return $id['id'];
@@ -165,7 +165,7 @@ public function getOne($id)
         $customer = $builder->getQuery()->getOneOrNullResult($this->getResultMode());
 
         if (!$customer) {
-            throw new NotFoundException(sprintf('Customer by id %d not found', $id));
+            throw new NotFoundException(\sprintf('Customer by id %d not found', $id));
         }
 
         return $customer;
@@ -190,6 +190,7 @@ public function getList($offset = 0, $limit = 25, array $criteria = [], array $o
         $builder->setFirstResult($offset)
                 ->setMaxResults($limit);
 
+        /** @var Query<CustomerModel|array<string, mixed>> $query */
         $query = $builder->getQuery();
 
         $query->setHydrationMode($this->getResultMode());
@@ -200,7 +201,7 @@ public function getList($offset = 0, $limit = 25, array $criteria = [], array $o
         $totalResult = $paginator->count();
 
         // Returns the customer data
-        $customers = $paginator->getIterator()->getArrayCopy();
+        $customers = iterator_to_array($paginator);
 
         return ['data' => $customers, 'total' => $totalResult];
     }
@@ -213,7 +214,7 @@ public function getList($offset = 0, $limit = 25, array $criteria = [], array $o
     public function create(array $params)
     {
         $this->checkPrivilege('create');
-        $this->setupContext($params['shopId']);
+        $this->setupContext($params['shopId'] ?? null);
 
         // Create models
         $customer = new CustomerModel();
@@ -235,13 +236,13 @@ public function create(array $params)
         $customer->fromArray($params);
 
         $billing = $this->createAddress($params['billing']) ?? new AddressModel();
-        $shipping = $this->createAddress($params['shipping']);
+        $shipping = $this->createAddress($params['shipping'] ?? null);
 
         $registerService = $this->getContainer()->get(RegisterServiceInterface::class);
         $context = $this->getContainer()->get(ContextServiceInterface::class)->getShopContext()->getShop();
 
         $context->addAttribute('sendOptinMail', new Attribute([
-            'sendOptinMail' => $params['sendOptinMail'] === true,
+            'sendOptinMail' => ($params['sendOptinMail'] ?? false) === true,
         ]));
 
         $registerService->register($context, $customer, $billing, $shipping);
@@ -287,7 +288,7 @@ public function update($id, array $params)
         $customer = $this->getRepository()->find($id);
 
         if (!$customer instanceof CustomerModel) {
-            throw new NotFoundException(sprintf('Customer by id %d not found', $id));
+            throw new NotFoundException(\sprintf('Customer by id %d not found', $id));
         }
 
         $this->setupContext($customer->getShop()->getId());
@@ -356,7 +357,7 @@ public function delete($id)
         $customer = $this->getRepository()->find($id);
 
         if (!$customer) {
-            throw new NotFoundException(sprintf('Customer by id %d not found', $id));
+            throw new NotFoundException(\sprintf('Customer by id %d not found', $id));
         }
 
         $this->getManager()->remove($customer);
@@ -428,7 +429,7 @@ protected function prepareCustomerPaymentData($data, CustomerModel $customer)
             if (isset($paymentDataData['paymentMeanId'])) {
                 $paymentMean = $this->getManager()->getRepository(Payment::class)->find($paymentDataData['paymentMeanId']);
                 if ($paymentMean === null) {
-                    throw new CustomValidationException(sprintf('%s by %s %s not found', Payment::class, 'id', $paymentDataData['paymentMeanId']));
+                    throw new CustomValidationException(\sprintf('%s by %s %s not found', Payment::class, 'id', $paymentDataData['paymentMeanId']));
                 }
                 $paymentData->setPaymentMean($paymentMean);
                 unset($paymentDataData['paymentMeanId']);
@@ -466,14 +467,14 @@ private function prepareCustomerData(array $params, CustomerModel $customer): ar
         if (\array_key_exists('groupKey', $params)) {
             $params['group'] = Shopware()->Models()->getRepository(Group::class)->findOneBy(['key' => $params['groupKey']]);
             if (!$params['group']) {
-                throw new CustomValidationException(sprintf('CustomerGroup by key %s not found', $params['groupKey']));
+                throw new CustomValidationException(\sprintf('CustomerGroup by key %s not found', $params['groupKey']));
             }
         }
 
         if (\array_key_exists('shopId', $params)) {
             $params['shop'] = Shopware()->Models()->find(ShopModel::class, $params['shopId']);
             if (!$params['shop']) {
-                throw new CustomValidationException(sprintf('Shop by id %s not found', $params['shopId']));
+                throw new CustomValidationException(\sprintf('Shop by id %s not found', $params['shopId']));
             }
         }
 
@@ -487,7 +488,7 @@ private function prepareCustomerData(array $params, CustomerModel $customer): ar
         }
 
         // If a different payment method is selected, it must also be placed in the "paymentPreset" so that the risk management that does not reset.
-        if ($customer->getId() && $customer->getPaymentId() !== $params['paymentId']) {
+        if (isset($params['paymentId']) && $customer->getId() && $customer->getPaymentId() !== $params['paymentId']) {
             $params['paymentPreset'] = $params['paymentId'];
         }
 
@@ -499,14 +500,14 @@ private function prepareCustomerData(array $params, CustomerModel $customer): ar
      *
      * @throws CustomValidationException
      */
-    private function setupContext(int $shopId = null): void
+    private function setupContext(?int $shopId = null): void
     {
         $shopRepository = $this->getContainer()->get(ModelManager::class)->getRepository(ShopModel::class);
 
         if ($shopId) {
             $shop = $shopRepository->getActiveById($shopId);
             if (!$shop) {
-                throw new CustomValidationException(sprintf('Shop by id %s not found', $shopId));
+                throw new CustomValidationException(\sprintf('Shop by id %s not found', $shopId));
             }
         } else {
             $shop = $shopRepository->getActiveDefault();
@@ -520,13 +521,13 @@ private function setupContext(int $shopId = null): void
      *
      * @throws CustomValidationException
      */
-    private function createAddress(array $data = null): ?AddressModel
+    private function createAddress(?array $data = null): ?AddressModel
     {
         if (empty($data)) {
             return null;
         }
 
-        if (!$data['country']) {
+        if (empty($data['country'])) {
             throw new CustomValidationException('A country is required.');
         }
 
@@ -582,11 +583,11 @@ private function applyAddressData(array $params, CustomerModel $customer): array
         unset($params['billing'], $params['shipping'], $params['defaultBillingAddress'], $params['defaultShippingAddress']);
 
         if (!$customer->getDefaultBillingAddress() instanceof AddressModel) {
-            throw new CustomValidationException(sprintf('Customer with ID "%s" has no default billing address', $customer->getId()));
+            throw new CustomValidationException(\sprintf('Customer with ID "%s" has no default billing address', $customer->getId()));
         }
         $customer->getDefaultBillingAddress()->fromArray($billingData);
         if (!$customer->getDefaultShippingAddress() instanceof AddressModel) {
-            throw new CustomValidationException(sprintf('Customer with ID "%s" has no default shipping address', $customer->getId()));
+            throw new CustomValidationException(\sprintf('Customer with ID "%s" has no default shipping address', $customer->getId()));
         }
         $customer->getDefaultShippingAddress()->fromArray($shippingData);
 
diff --git a/engine/Shopware/Components/Api/Resource/CustomerGroup.php b/engine/Shopware/Components/Api/Resource/CustomerGroup.php
index 4145e504be0..016a3f0474a 100644
--- a/engine/Shopware/Components/Api/Resource/CustomerGroup.php
+++ b/engine/Shopware/Components/Api/Resource/CustomerGroup.php
@@ -1,29 +1,30 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Api\Resource;
 
+use Doctrine\ORM\Query;
 use Exception;
 use Shopware\Components\Api\Exception\CustomValidationException;
 use Shopware\Components\Api\Exception\NotFoundException;
@@ -76,7 +77,7 @@ public function getOne($id)
         $result = $query->getOneOrNullResult($this->getResultMode());
 
         if (!$result) {
-            throw new NotFoundException(sprintf('CustomerGroup by id %d not found', $id));
+            throw new NotFoundException(\sprintf('CustomerGroup by id %d not found', $id));
         }
 
         return $result;
@@ -93,13 +94,13 @@ public function getList($offset = 0, $limit = 25, array $criteria = [], array $o
         $this->checkPrivilege('read');
 
         $builder = $this->getRepository()->createQueryBuilder('customerGroup')
-                ->select('customerGroup', 'd')
-                ->leftJoin('customerGroup.discounts', 'd');
-
-        $builder->addFilter($criteria)
-                ->addOrderBy($orderBy)
-                ->setFirstResult($offset)
-                ->setMaxResults($limit);
+            ->select('customerGroup', 'd')
+            ->leftJoin('customerGroup.discounts', 'd')
+            ->addFilter($criteria)
+            ->addOrderBy($orderBy)
+            ->setFirstResult($offset)
+            ->setMaxResults($limit);
+        /** @var Query<Group|array<string, mixed>> $query */
         $query = $builder->getQuery();
         $query->setHydrationMode($this->resultMode);
 
@@ -109,7 +110,7 @@ public function getList($offset = 0, $limit = 25, array $criteria = [], array $o
         $totalResult = $paginator->count();
 
         // Returns the category data
-        $results = $paginator->getIterator()->getArrayCopy();
+        $results = iterator_to_array($paginator);
 
         return ['data' => $results, 'total' => $totalResult];
     }
@@ -168,7 +169,7 @@ public function update($id, array $params)
         $result = $this->getRepository()->find($id);
 
         if (!$result) {
-            throw new NotFoundException(sprintf('CustomerGroup by id %d not found', $id));
+            throw new NotFoundException(\sprintf('CustomerGroup by id %d not found', $id));
         }
 
         $params = $this->prepareCustomerGroupData($params, $result);
@@ -210,7 +211,7 @@ public function delete($id)
         $result = $this->getRepository()->find($id);
 
         if (!$result) {
-            throw new NotFoundException(sprintf('CustomerGroup by id %d not found', $id));
+            throw new NotFoundException(\sprintf('CustomerGroup by id %d not found', $id));
         }
 
         $this->getManager()->remove($result);
@@ -269,20 +270,20 @@ private function prepareCustomerGroupData(array $params, $customerGroup = null)
             }
 
             if (empty($params['name'])) {
-                throw new CustomValidationException(sprintf("Parameter '%s' is missing", 'name'));
+                throw new CustomValidationException(\sprintf("Parameter '%s' is missing", 'name'));
             }
 
             if (empty($params['key'])) {
-                throw new CustomValidationException(sprintf("Parameter '%s' is missing", 'key'));
+                throw new CustomValidationException(\sprintf("Parameter '%s' is missing", 'key'));
             }
         }
 
         if (isset($params['name']) && empty($params['name'])) {
-            throw new CustomValidationException(sprintf("Parameter '%s' is missing", 'name'));
+            throw new CustomValidationException(\sprintf("Parameter '%s' is missing", 'name'));
         }
 
         if (isset($params['key']) && empty($params['key'])) {
-            throw new CustomValidationException(sprintf("Parameter '%s' is missing", 'key'));
+            throw new CustomValidationException(\sprintf("Parameter '%s' is missing", 'key'));
         }
 
         $discountRepository = $this->getManager()->getRepository(Discount::class);
diff --git a/engine/Shopware/Components/Api/Resource/CustomerStream.php b/engine/Shopware/Components/Api/Resource/CustomerStream.php
index 2d7c52eb8b1..e22c3cd39a9 100644
--- a/engine/Shopware/Components/Api/Resource/CustomerStream.php
+++ b/engine/Shopware/Components/Api/Resource/CustomerStream.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Api\Resource;
@@ -27,14 +28,17 @@
 use DateTime;
 use DateTimeInterface;
 use Doctrine\DBAL\Connection;
+use Doctrine\ORM\Query;
 use Shopware\Bundle\CustomerSearchBundle\Condition\AssignedToStreamCondition;
 use Shopware\Bundle\CustomerSearchBundle\CustomerNumberSearchInterface;
+use Shopware\Bundle\CustomerSearchBundle\CustomerNumberSearchResult;
 use Shopware\Bundle\CustomerSearchBundleDBAL\Indexing\SearchIndexerInterface;
 use Shopware\Bundle\SearchBundle\Criteria;
 use Shopware\Bundle\SearchBundle\SortingInterface;
 use Shopware\Components\Api\Exception\CustomValidationException;
 use Shopware\Components\Api\Exception\NotFoundException;
 use Shopware\Components\Api\Exception\ParameterMissingException;
+use Shopware\Components\Api\Exception\PrivilegeException;
 use Shopware\Components\Api\Exception\ValidationException;
 use Shopware\Components\CustomerStream\CustomerStreamCriteriaFactoryInterface;
 use Shopware\Components\CustomerStream\StreamIndexerInterface;
@@ -45,45 +49,19 @@
 
 class CustomerStream extends Resource
 {
-    /**
-     * @var ModelManager
-     */
-    protected $manager;
+    private LogawareReflectionHelper $reflectionHelper;
 
-    /**
-     * @var LogawareReflectionHelper
-     */
-    private $reflectionHelper;
+    private CustomerNumberSearchInterface $customerNumberSearch;
 
-    /**
-     * @var CustomerNumberSearchInterface
-     */
-    private $customerNumberSearch;
-
-    /**
-     * @var CustomerStreamRepositoryInterface
-     */
-    private $streamRepository;
+    private CustomerStreamRepositoryInterface $streamRepository;
 
-    /**
-     * @var Connection
-     */
-    private $connection;
+    private Connection $connection;
 
-    /**
-     * @var SearchIndexerInterface
-     */
-    private $searchIndexer;
+    private SearchIndexerInterface $searchIndexer;
 
-    /**
-     * @var StreamIndexerInterface
-     */
-    private $streamIndexer;
+    private StreamIndexerInterface $streamIndexer;
 
-    /**
-     * @var CustomerStreamCriteriaFactoryInterface
-     */
-    private $criteriaFactory;
+    private CustomerStreamCriteriaFactoryInterface $criteriaFactory;
 
     public function __construct(
         LogawareReflectionHelper $reflectionHelper,
@@ -108,28 +86,31 @@ public function __construct(
     /**
      * @param int|null $id
      * @param int      $offset
+     * @param int|null $limit
      * @param string   $conditions
      * @param string   $sortings
      *
-     * @return \Shopware\Bundle\CustomerSearchBundle\CustomerNumberSearchResult
+     * @return CustomerNumberSearchResult
      */
-    public function getOne($id, $offset, $limit, $conditions, $sortings)
+    public function getOne($id, $offset = 0, $limit = 50, $conditions = '', $sortings = '')
     {
         $this->checkPrivilege('read');
 
         $criteria = new Criteria();
 
-        $conditions = $this->getConditions($id, $conditions);
+        $parsedConditions = $this->getConditions($id, $conditions);
 
-        foreach ($conditions as $condition) {
+        foreach ($parsedConditions as $condition) {
             $criteria->addCondition($condition);
         }
         $decodedSortings = json_decode($sortings, true);
         if (!empty($decodedSortings)) {
-            /** @var SortingInterface[] $unserializedSortings */
             $unserializedSortings = $this->reflectionHelper->unserialize($decodedSortings, '');
 
             foreach ($unserializedSortings as $sorting) {
+                if (!$sorting instanceof SortingInterface) {
+                    continue;
+                }
                 $criteria->addSorting($sorting);
             }
         }
@@ -146,7 +127,7 @@ public function getOne($id, $offset, $limit, $conditions, $sortings)
      * @param array<string, string>|array<array{property: string, value: mixed, expression?: string}> $criteria
      * @param array<array{property: string, direction: string}>                                       $orderBy
      *
-     * @return array
+     * @return array{success: true, data: array<array<string, mixed>>, total: int}
      */
     public function getList($offset = 0, $limit = 25, array $criteria = [], array $orderBy = [])
     {
@@ -167,15 +148,16 @@ public function getList($offset = 0, $limit = 25, array $criteria = [], array $o
             $builder->addOrderBy($orderBy);
         }
 
+        /** @var Query<array<string, mixed>> $query */
         $query = $builder->getQuery();
-        $query->setHydrationMode($this->getResultMode());
+        $query->setHydrationMode(self::HYDRATE_ARRAY);
         $paginator = $this->getManager()->createPaginator($query);
         $total = $paginator->count();
-        $data = $paginator->getIterator()->getArrayCopy();
+        $data = iterator_to_array($paginator);
 
         $ids = array_column($data, 'id');
         if (empty($ids)) {
-            return $data;
+            return ['success' => true, 'data' => [], 'total' => 0];
         }
 
         $counts = $this->streamRepository->fetchStreamsCustomerCount($ids);
@@ -189,13 +171,14 @@ public function getList($offset = 0, $limit = 25, array $criteria = [], array $o
                 $row = array_merge($row, $counts[$id]);
             }
 
-            if ($result = $this->updateFrozenState($id, $row['freezeUp'], $row['conditions'])) {
+            $result = $this->updateFrozenState($id, $row['freezeUp'], $row['conditions']);
+            if ($result) {
                 $row['freezeUp'] = $result['freezeUp'];
                 $row['static'] = $result['static'];
             }
         }
 
-        return ['data' => $data, 'total' => $total];
+        return ['success' => true, 'data' => $data, 'total' => $total];
     }
 
     /**
@@ -253,11 +236,10 @@ public function update($id, array $data, $index = false)
             throw new ParameterMissingException('id');
         }
 
-        /** @var \Shopware\Models\CustomerStream\CustomerStream|null $stream */
         $stream = $this->getManager()->find(CustomerStreamEntity::class, $id);
 
-        if (!$stream) {
-            throw new NotFoundException(sprintf('Customer Stream by id %d not found', $id));
+        if (!$stream instanceof CustomerStreamEntity) {
+            throw new NotFoundException(\sprintf('Customer Stream by id %d not found', $id));
         }
 
         $data = $this->prepareData($data);
@@ -286,17 +268,22 @@ public function update($id, array $data, $index = false)
 
     /**
      * @param int $id
+     *
+     * @return void
      */
     public function delete($id)
     {
         $this->checkPrivilege('delete');
 
         $stream = $this->manager->find(CustomerStreamEntity::class, $id);
+        if (!$stream instanceof CustomerStreamEntity) {
+            throw new NotFoundException(\sprintf('Customer Stream by id %d not found', $id));
+        }
 
         $this->manager->remove($stream);
         $this->manager->flush($stream);
 
-        $this->connection->executeQuery(
+        $this->connection->executeStatement(
             'DELETE FROM s_customer_streams_mapping WHERE stream_id = :id',
             [':id' => $id]
         );
@@ -315,7 +302,7 @@ public function buildSearchIndex($lastId, $full)
         $ids = $this->streamRepository->fetchSearchIndexIds($lastId, $full);
 
         if (!empty($ids)) {
-            $this->connection->executeUpdate(
+            $this->connection->executeStatement(
                 'DELETE FROM s_customer_search_index WHERE id IN (:ids)',
                 [':ids' => $ids],
                 [':ids' => Connection::PARAM_INT_ARRAY]
@@ -327,6 +314,9 @@ public function buildSearchIndex($lastId, $full)
         return $ids;
     }
 
+    /**
+     * @return void
+     */
     public function cleanupIndexSearchIndex()
     {
         $this->searchIndexer->cleanupIndex();
@@ -336,13 +326,16 @@ public function cleanupIndexSearchIndex()
      * @param int|null $offset
      * @param int|null $limit
      *
-     * @throws \Shopware\Components\Api\Exception\PrivilegeException
+     * @throws PrivilegeException
+     *
+     * @return void
      */
     public function indexStream(CustomerStreamEntity $stream, $offset = null, $limit = null)
     {
         $this->checkPrivilege('save');
 
-        if ($result = $this->updateFrozenState($stream->getId(), $stream->getFreezeUp(), $stream->getConditions())) {
+        $result = $this->updateFrozenState($stream->getId(), $stream->getFreezeUp(), $stream->getConditions());
+        if ($result) {
             $stream->setStatic($result['static']);
             $stream->setFreezeUp($result['freezeUp']);
         }
@@ -357,7 +350,7 @@ public function indexStream(CustomerStreamEntity $stream, $offset = null, $limit
         $criteria->offset((int) $offset);
 
         if ($limit !== null) {
-            $criteria->limit($limit);
+            $criteria->limit((int) $limit);
         }
 
         if ($criteria->getOffset() === 0) {
@@ -370,26 +363,26 @@ public function indexStream(CustomerStreamEntity $stream, $offset = null, $limit
     /**
      * Returns true if frozen state has changed
      *
-     * @param int    $streamId
-     * @param string $conditions
+     * @param int         $streamId
+     * @param string|null $conditions
      *
-     * @return array|bool
+     * @return array|null
      */
-    public function updateFrozenState($streamId, DateTimeInterface $freezeUp = null, $conditions)
+    public function updateFrozenState($streamId, ?DateTimeInterface $freezeUp, $conditions)
     {
         $now = new DateTime();
         if (!$freezeUp || $freezeUp >= $now) {
-            return false;
+            return null;
         }
 
-        $conditions = json_decode($conditions, true);
+        $conditions = json_decode((string) $conditions, true);
         $params = [
-            'id' => $streamId,
+            'id' => (int) $streamId,
             'freezeUp' => null,
             'static' => empty($conditions),
         ];
 
-        $this->manager->getConnection()->executeUpdate(
+        $this->manager->getConnection()->executeStatement(
             'UPDATE s_customer_streams SET static = :static, freeze_up = :freezeUp WHERE id = :id',
             $params
         );
@@ -397,13 +390,7 @@ public function updateFrozenState($streamId, DateTimeInterface $freezeUp = null,
         return $params;
     }
 
-    /**
-     * @param int         $streamId
-     * @param string|null $conditions
-     *
-     * @return array
-     */
-    private function getConditions($streamId, $conditions = null)
+    private function getConditions(?int $streamId, ?string $conditions = null): array
     {
         if (!empty($conditions)) {
             return $this->reflectionHelper->unserialize(
@@ -416,36 +403,36 @@ private function getConditions($streamId, $conditions = null)
             return [];
         }
         $stream = $this->manager->find(CustomerStreamEntity::class, $streamId);
+        if (!$stream instanceof CustomerStreamEntity) {
+            return [];
+        }
 
         if ($stream->isStatic() || $stream->getFreezeUp()) {
             return [new AssignedToStreamCondition($streamId)];
         }
 
         return $this->reflectionHelper->unserialize(
-            json_decode($stream->getConditions(), true),
+            json_decode($stream->getConditions() ?? '', true),
             'Serialization error in Customer Stream'
         );
     }
 
-    /**
-     * @param int $streamId
-     */
-    private function insertCustomers(array $customerIds, $streamId)
+    private function insertCustomers(array $customerIds, int $streamId): void
     {
         $connection = $this->connection;
 
         $connection->transactional(function () use ($connection, $customerIds, $streamId) {
-            $connection->executeUpdate(
+            $connection->executeStatement(
                 'DELETE FROM s_customer_streams_mapping WHERE stream_id = :streamId',
-                [':streamId' => (int) $streamId]
+                [':streamId' => $streamId]
             );
 
             $insert = $connection->prepare('INSERT INTO s_customer_streams_mapping (stream_id, customer_id) VALUES (:streamId, :customerId)');
             $customerIds = array_keys(array_flip($customerIds));
 
             foreach ($customerIds as $customerId) {
-                $insert->execute([
-                    ':streamId' => (int) $streamId,
+                $insert->executeStatement([
+                    ':streamId' => $streamId,
                     ':customerId' => (int) $customerId,
                 ]);
             }
@@ -453,11 +440,13 @@ private function insertCustomers(array $customerIds, $streamId)
     }
 
     /**
-     * @return array
+     * @param array<string, mixed> $data
+     *
+     * @return array<string, mixed>
      */
-    private function prepareData(array $data)
+    private function prepareData(array $data): array
     {
-        $conditions = json_decode($data['conditions'], true);
+        $conditions = json_decode($data['conditions'] ?? '', true);
         if (empty($conditions)) {
             $data['conditions'] = null;
         }
@@ -468,7 +457,7 @@ private function prepareData(array $data)
     /**
      * @throws CustomValidationException
      */
-    private function validateStream(CustomerStreamEntity $stream)
+    private function validateStream(CustomerStreamEntity $stream): void
     {
         if (!$stream->isStatic()) {
             if (!$stream->getConditions()) {
diff --git a/engine/Shopware/Components/Api/Resource/EmotionPreset.php b/engine/Shopware/Components/Api/Resource/EmotionPreset.php
index 8185256b7fd..993f8890f81 100644
--- a/engine/Shopware/Components/Api/Resource/EmotionPreset.php
+++ b/engine/Shopware/Components/Api/Resource/EmotionPreset.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Api\Resource;
@@ -93,11 +93,11 @@ public function delete($presetId)
         $preset = $this->models->find(Preset::class, $presetId);
 
         if (!$preset) {
-            throw new NotFoundException(sprintf('Emotion preset with id %s not found', $presetId));
+            throw new NotFoundException(\sprintf('Emotion preset with id %s not found', $presetId));
         }
 
         if (!$preset->getCustom()) {
-            throw new PrivilegeException(sprintf('Emotion preset %s is not defined as custom preset', $preset->getName()));
+            throw new PrivilegeException(\sprintf('Emotion preset %s is not defined as custom preset', $preset->getName()));
         }
 
         $this->models->remove($preset);
@@ -127,7 +127,7 @@ public function create(array $data, $locale = 'de_DE')
      * @param int    $id
      * @param string $locale
      *
-     * @throws \Shopware\Components\Api\Exception\NotFoundException
+     * @throws NotFoundException
      *
      * @return Preset
      */
@@ -136,7 +136,7 @@ public function update($id, array $data, $locale = 'de_DE')
         /** @var Preset|null $preset */
         $preset = $this->models->getRepository(Preset::class)->find($id);
         if (!$preset) {
-            throw new NotFoundException(sprintf('Preset with id %s not found', $id));
+            throw new NotFoundException(\sprintf('Preset with id %s not found', $id));
         }
 
         $preset->getTranslations()->clear();
@@ -164,7 +164,7 @@ private function save(array $data, Preset $preset, $locale = 'de_DE')
             unset($translation);
         }
 
-        if (!\is_array($data['requiredPlugins'])) {
+        if (!isset($data['requiredPlugins']) || !\is_array($data['requiredPlugins'])) {
             $data['requiredPlugins'] = [];
         }
 
@@ -206,7 +206,7 @@ private function validateName(Preset $preset)
             ->getSingleScalarResult();
 
         if ($result > 0) {
-            throw new CustomValidationException(sprintf('Preset with name %s already exists', $preset->getName()));
+            throw new CustomValidationException(\sprintf('Preset with name %s already exists', $preset->getName()));
         }
     }
 
@@ -241,7 +241,7 @@ private function hydrate(array $presets, $locale = 'de_DE')
     {
         $pluginNames = [];
         foreach ($presets as $id => $preset) {
-            $plugins = json_decode($preset['requiredPlugins'], true) ?? [];
+            $plugins = json_decode($preset['requiredPlugins'] ?? '', true) ?? [];
             $combinedPlugins = array_combine(array_column($plugins, 'name'), $plugins);
             if (!\is_array($combinedPlugins)) {
                 $preset['requiredPlugins'] = [];
@@ -263,8 +263,8 @@ private function hydrate(array $presets, $locale = 'de_DE')
                 'premium' => $preset['premium'],
                 'custom' => $preset['custom'],
                 'thumbnail' => $preset['thumbnail'],
-                'preview' => $preset['preview'],
-                'presetData' => $preset['presetData'],
+                'preview' => $preset['preview'] ?? null,
+                'presetData' => $preset['presetData'] ?? null,
                 'requiredPlugins' => $this->getPluginsForPreset($preset, $localPlugins),
                 'assetsImported' => $preset['assetsImported'],
             ];
@@ -336,7 +336,7 @@ function ($plugin) {
                     'installed' => false,
                     'plugin_label' => $plugin['label'],
                     'plugin_name' => $plugin['name'],
-                    'current_version' => null,
+                    'current_version' => '',
                     'valid' => false,
                 ], $plugin);
 
diff --git a/engine/Shopware/Components/Api/Resource/Manufacturer.php b/engine/Shopware/Components/Api/Resource/Manufacturer.php
index 1e6a5651ac8..3d8b389418c 100644
--- a/engine/Shopware/Components/Api/Resource/Manufacturer.php
+++ b/engine/Shopware/Components/Api/Resource/Manufacturer.php
@@ -1,31 +1,36 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Api\Resource;
 
+use Doctrine\ORM\Mapping\ClassMetadata;
 use Shopware\Components\Api\Exception as ApiException;
+use Shopware\Components\Api\Exception\NotFoundException;
+use Shopware\Components\Api\Exception\ParameterMissingException;
+use Shopware\Components\Api\Exception\ValidationException;
 use Shopware\Models\Article\Supplier as ManufacturerModel;
+use Shopware\Models\Article\SupplierRepository;
 use Shopware\Models\Media\Album;
 use Shopware\Models\Media\Media as MediaModel;
 
@@ -35,36 +40,35 @@
 class Manufacturer extends Resource
 {
     /**
-     * @return \Shopware\Models\Article\SupplierRepository
+     * @return SupplierRepository
      */
     public function getRepository()
     {
-        return $this->getManager()->getRepository(\Shopware\Models\Article\Supplier::class);
+        return $this->getManager()->getRepository(ManufacturerModel::class);
     }
 
     /**
      * @param int $id
      *
-     * @throws \Shopware\Components\Api\Exception\ParameterMissingException
-     * @throws \Shopware\Components\Api\Exception\NotFoundException
+     * @throws NotFoundException
+     * @throws ParameterMissingException
      *
-     * @return array|\Shopware\Models\Article\Supplier
+     * @return array|ManufacturerModel
      */
     public function getOne($id)
     {
         $this->checkPrivilege('read');
 
         if (empty($id)) {
-            throw new ApiException\ParameterMissingException('id');
+            throw new ParameterMissingException('id');
         }
 
         $query = $this->getRepository()->getDetailQuery($id);
 
-        /** @var \Shopware\Models\Article\Supplier|null $manufacturer */
         $manufacturer = $query->getOneOrNullResult($this->getResultMode());
 
         if (!$manufacturer) {
-            throw new ApiException\NotFoundException(sprintf('Manufacturer by id %d not found', $id));
+            throw new NotFoundException(\sprintf('Manufacturer by id %d not found', $id));
         }
 
         return $manufacturer;
@@ -89,21 +93,21 @@ public function getList($offset = 0, $limit = 25, array $criteria = [], array $o
         $totalResult = $paginator->count();
 
         // Returns the manufacturer data
-        $manufacturers = $paginator->getIterator()->getArrayCopy();
+        $manufacturers = iterator_to_array($paginator);
 
         return ['data' => $manufacturers, 'total' => $totalResult];
     }
 
     /**
-     * @throws \Shopware\Components\Api\Exception\ValidationException
+     * @throws ValidationException
      *
-     * @return \Shopware\Models\Article\Supplier
+     * @return ManufacturerModel
      */
     public function create(array $params)
     {
         $this->checkPrivilege('create');
 
-        $manufacturer = new \Shopware\Models\Article\Supplier();
+        $manufacturer = new ManufacturerModel();
 
         $params = $this->prepareManufacturerData($params);
         $params = $this->prepareMediaData($params, $manufacturer);
@@ -111,14 +115,14 @@ public function create(array $params)
         $manufacturer->fromArray($params);
 
         if (isset($params['id'])) {
-            $metaData = $this->getManager()->getMetadataFactory()->getMetadataFor(\Shopware\Models\Article\Supplier::class);
-            $metaData->setIdGeneratorType(\Doctrine\ORM\Mapping\ClassMetadata::GENERATOR_TYPE_NONE);
+            $metaData = $this->getManager()->getMetadataFactory()->getMetadataFor(ManufacturerModel::class);
+            $metaData->setIdGeneratorType(ClassMetadata::GENERATOR_TYPE_NONE);
             $manufacturer->setPrimaryIdentifier($params['id']);
         }
 
         $violations = $this->getManager()->validate($manufacturer);
         if ($violations->count() > 0) {
-            throw new ApiException\ValidationException($violations);
+            throw new ValidationException($violations);
         }
 
         $this->getManager()->persist($manufacturer);
@@ -130,25 +134,24 @@ public function create(array $params)
     /**
      * @param int $id
      *
-     * @throws \Shopware\Components\Api\Exception\ValidationException
-     * @throws \Shopware\Components\Api\Exception\NotFoundException
-     * @throws \Shopware\Components\Api\Exception\ParameterMissingException
+     * @throws NotFoundException
+     * @throws ParameterMissingException
+     * @throws ValidationException
      *
-     * @return \Shopware\Models\Article\Supplier
+     * @return ManufacturerModel
      */
     public function update($id, array $params)
     {
         $this->checkPrivilege('update');
 
         if (empty($id)) {
-            throw new ApiException\ParameterMissingException('id');
+            throw new ParameterMissingException('id');
         }
 
-        /** @var \Shopware\Models\Article\Supplier|null $manufacturer */
         $manufacturer = $this->getRepository()->findOneBy(['id' => $id]);
 
         if (!$manufacturer) {
-            throw new ApiException\NotFoundException(sprintf('Manufacturer by id %d not found', $id));
+            throw new NotFoundException(\sprintf('Manufacturer by id %d not found', $id));
         }
 
         $params = $this->prepareManufacturerData($params);
@@ -157,7 +160,7 @@ public function update($id, array $params)
 
         $violations = $this->getManager()->validate($manufacturer);
         if ($violations->count() > 0) {
-            throw new ApiException\ValidationException($violations);
+            throw new ValidationException($violations);
         }
 
         $this->flush();
@@ -168,24 +171,23 @@ public function update($id, array $params)
     /**
      * @param int $id
      *
-     * @throws \Shopware\Components\Api\Exception\ParameterMissingException
-     * @throws \Shopware\Components\Api\Exception\NotFoundException
+     * @throws NotFoundException
+     * @throws ParameterMissingException
      *
-     * @return \Shopware\Models\Article\Supplier
+     * @return ManufacturerModel
      */
     public function delete($id)
     {
         $this->checkPrivilege('delete');
 
         if (empty($id)) {
-            throw new ApiException\ParameterMissingException('id');
+            throw new ParameterMissingException('id');
         }
 
-        /** @var \Shopware\Models\Article\Supplier|null $manufacturer */
         $manufacturer = $this->getRepository()->findOneBy(['id' => $id]);
 
         if (!$manufacturer) {
-            throw new ApiException\NotFoundException(sprintf('Manufacturer by id %d not found', $id));
+            throw new NotFoundException(\sprintf('Manufacturer by id %d not found', $id));
         }
 
         $this->getManager()->remove($manufacturer);
@@ -231,17 +233,13 @@ private function prepareMediaData(array $data, ManufacturerModel $manufacturerMo
         $media = null;
 
         if (isset($data['image']['link'])) {
-            /** @var Media $resource */
-            $resource = $this->getContainer()->get(\Shopware\Components\Api\Resource\Media::class);
+            $resource = $this->getContainer()->get(Media::class);
             $media = $resource->internalCreateMediaByFileLink($data['image']['link'], Album::ALBUM_SUPPLIER);
         } elseif (!empty($data['image']['mediaId'])) {
-            $media = $this->getManager()->find(
-                \Shopware\Models\Media\Media::class,
-                (int) $data['image']['mediaId']
-            );
+            $media = $this->getManager()->find(MediaModel::class, (int) $data['image']['mediaId']);
 
             if (!($media instanceof MediaModel)) {
-                throw new ApiException\CustomValidationException(sprintf('Media by mediaId %s not found', $data['image']['mediaId']));
+                throw new ApiException\CustomValidationException(\sprintf('Media by mediaId %s not found', $data['image']['mediaId']));
             }
         }
 
diff --git a/engine/Shopware/Components/Api/Resource/Media.php b/engine/Shopware/Components/Api/Resource/Media.php
index a0a53816e62..d4f8979b615 100644
--- a/engine/Shopware/Components/Api/Resource/Media.php
+++ b/engine/Shopware/Components/Api/Resource/Media.php
@@ -1,31 +1,32 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Api\Resource;
 
 use DateTime;
 use Doctrine\ORM\ORMException;
+use Doctrine\ORM\Query;
 use Exception;
 use InvalidArgumentException;
 use RuntimeException;
@@ -82,7 +83,7 @@ public function getOne($id)
         $media = $query->getOneOrNullResult($this->getResultMode());
 
         if (!$media) {
-            throw new NotFoundException(sprintf('Media by id %d not found', $id));
+            throw new NotFoundException(\sprintf('Media by id %d not found', $id));
         }
 
         $mediaService = Shopware()->Container()->get(MediaServiceInterface::class);
@@ -105,6 +106,7 @@ public function getList($offset = 0, $limit = 25, array $criteria = [], array $o
     {
         $this->checkPrivilege('read');
 
+        /** @var Query<MediaModel|array<string, mixed>> $query */
         $query = $this->getRepository()->getMediaListQuery($criteria, $orderBy, $limit, $offset);
         $query->setHydrationMode($this->resultMode);
 
@@ -114,11 +116,13 @@ public function getList($offset = 0, $limit = 25, array $criteria = [], array $o
         $totalResult = $paginator->count();
 
         // Returns the category data
-        $media = $paginator->getIterator()->getArrayCopy();
+        $media = iterator_to_array($paginator);
 
         $mediaService = Shopware()->Container()->get(MediaServiceInterface::class);
         array_walk($media, function (&$item) use ($mediaService) {
-            $item['path'] = $mediaService->getUrl($item['path']);
+            if (\is_array($item)) {
+                $item['path'] = $mediaService->getUrl($item['path']);
+            }
         });
 
         return ['data' => $media, 'total' => $totalResult];
@@ -188,7 +192,7 @@ public function update($id, array $params)
         $media = $this->getRepository()->find($id);
 
         if (!$media) {
-            throw new NotFoundException(sprintf('Media by id "%d" not found', $id));
+            throw new NotFoundException(\sprintf('Media by id "%d" not found', $id));
         }
 
         if (!empty($params['file'])) {
@@ -236,7 +240,7 @@ public function delete($id)
         $media = $this->getRepository()->find($id);
 
         if (!$media) {
-            throw new NotFoundException(sprintf('Media by id %d not found', $id));
+            throw new NotFoundException(\sprintf('Media by id %d not found', $id));
         }
 
         $this->getManager()->remove($media);
@@ -279,7 +283,7 @@ public function internalCreateMediaByFileLink($link, $albumId = -1)
         if (!$album) {
             // Cleanup temporary file
             $this->deleteTmpFile($file);
-            throw new CustomValidationException(sprintf('Album by id %s not found', $albumId));
+            throw new CustomValidationException(\sprintf('Album by id %s not found', $albumId));
         }
 
         $media->setAlbum($album);
@@ -288,7 +292,7 @@ public function internalCreateMediaByFileLink($link, $albumId = -1)
             // Persist the model into the model manager this uploads and resizes the image
             $this->getManager()->persist($media);
         } catch (ORMException $e) {
-            throw new CustomValidationException(sprintf('Some error occurred while persisting your media'));
+            throw new CustomValidationException(\sprintf('Some error occurred while persisting your media'));
         } finally {
             // Cleanup temporary file
             $this->deleteTmpFile($file);
@@ -319,7 +323,7 @@ public function load($url, $baseFilename = null)
         unlink($destPath);
 
         if (!\is_string($destPath) || (!@mkdir($destPath) && !is_dir($destPath))) {
-            throw new RuntimeException(sprintf('Could not create temp directory "%s"', $destPath));
+            throw new RuntimeException(\sprintf('Could not create temp directory "%s"', $destPath));
         }
 
         $this->getContainer()->get('shopware.components.stream_protocol_validator')->validate($url);
@@ -329,16 +333,16 @@ public function load($url, $baseFilename = null)
         }
 
         $filename = $this->getUniqueFileName($destPath, $baseFilename);
-        $filePath = sprintf('%s/%s', $destPath, $filename);
+        $filePath = \sprintf('%s/%s', $destPath, $filename);
 
         $put_handle = fopen($filePath, 'wb+');
         if (!\is_resource($put_handle)) {
-            throw new Exception(sprintf('Could not open %s for writing', $filePath));
+            throw new Exception(\sprintf('Could not open %s for writing', $filePath));
         }
 
         $get_handle = fopen($url, 'rb');
         if (!\is_resource($get_handle)) {
-            throw new Exception(sprintf('Could not open %s for reading', $url));
+            throw new Exception(\sprintf('Could not open %s for reading', $url));
         }
 
         while (!feof($get_handle)) {
@@ -352,7 +356,7 @@ public function load($url, $baseFilename = null)
         fclose($get_handle);
         fclose($put_handle);
 
-        return sprintf('%s/%s', $destPath, $filename);
+        return \sprintf('%s/%s', $destPath, $filename);
     }
 
     /**
@@ -415,17 +419,17 @@ protected function uploadBase64File($url, $destinationPath, $baseFilename)
     {
         $get_handle = fopen($url, 'r');
         if (!\is_resource($get_handle)) {
-            throw new Exception(sprintf('Could not open %s for reading', $url));
+            throw new Exception(\sprintf('Could not open %s for reading', $url));
         }
 
         $meta = stream_get_meta_data($get_handle);
         if (!\array_key_exists('mediatype', $meta) || !str_contains($meta['mediatype'], 'image/')) {
-            throw new CustomValidationException(sprintf('No valid media type passed for the product image: %s', $url));
+            throw new CustomValidationException(\sprintf('No valid media type passed for the product image: %s', $url));
         }
 
         $extension = str_replace('image/', '', $meta['mediatype']);
         $filename = $this->getUniqueFileName($destinationPath, $baseFilename) . '.' . $extension;
-        $destinationFilePath = sprintf('%s/%s', $destinationPath, $filename);
+        $destinationFilePath = \sprintf('%s/%s', $destinationPath, $filename);
 
         $put_handle = fopen("$destinationPath/$filename", 'wb+');
         if (!\is_resource($put_handle)) {
@@ -482,7 +486,7 @@ private function prepareMediaData(array $params, $media = null)
         if (isset($params['album'])) {
             $album = Shopware()->Models()->find(Album::class, $params['album']);
             if (!$album) {
-                throw new CustomValidationException(sprintf('Album by id %s not found', $params['album']));
+                throw new CustomValidationException(\sprintf('Album by id %s not found', $params['album']));
             }
             $params['album'] = $album;
         }
@@ -504,7 +508,7 @@ private function prepareMediaData(array $params, $media = null)
                         $originalName = $params['name'];
                     }
                 } catch (Exception $e) {
-                    throw new Exception(sprintf('Could not load image %s', $params['file']), $e->getCode(), $e);
+                    throw new Exception(\sprintf('Could not load image %s', $params['file']), $e->getCode(), $e);
                 }
             } else {
                 $path = str_replace('file://', '', $params['file']);
diff --git a/engine/Shopware/Components/Api/Resource/Order.php b/engine/Shopware/Components/Api/Resource/Order.php
index aee78501121..8e3597833ad 100644
--- a/engine/Shopware/Components/Api/Resource/Order.php
+++ b/engine/Shopware/Components/Api/Resource/Order.php
@@ -1,33 +1,40 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Api\Resource;
 
 use Doctrine\Common\Collections\ArrayCollection;
-use Shopware\Components\Api\Exception as ApiException;
+use Doctrine\ORM\Exception\ORMException;
+use Doctrine\ORM\NonUniqueResultException;
+use Doctrine\ORM\OptimisticLockException;
+use Doctrine\ORM\Query;
+use Doctrine\ORM\TransactionRequiredException;
+use Shopware\Components\Api\Exception\CustomValidationException;
 use Shopware\Components\Api\Exception\NotFoundException;
+use Shopware\Components\Api\Exception\OrmException as ShopwareOrmException;
 use Shopware\Components\Api\Exception\ParameterMissingException;
+use Shopware\Components\Api\Exception\PrivilegeException;
 use Shopware\Components\Api\Exception\ValidationException;
 use Shopware\Components\Model\ModelManager;
 use Shopware\Components\NumberRangeIncrementerInterface;
@@ -79,7 +86,7 @@ public function getIdFromNumber($number)
         $orderModel = $this->getRepository()->findOneBy(['number' => $number]);
 
         if (!$orderModel) {
-            throw new NotFoundException(sprintf('Order by number %s not found', $number));
+            throw new NotFoundException(\sprintf('Order by number %s not found', $number));
         }
 
         return $orderModel->getId();
@@ -88,10 +95,12 @@ public function getIdFromNumber($number)
     /**
      * @param string $number
      *
-     * @throws ParameterMissingException
+     * @throws NonUniqueResultException
      * @throws NotFoundException
+     * @throws ParameterMissingException
+     * @throws PrivilegeException
      *
-     * @return array|OrderModel
+     * @return array<string, mixed>|OrderModel
      */
     public function getOneByNumber($number)
     {
@@ -103,10 +112,12 @@ public function getOneByNumber($number)
     /**
      * @param int $id
      *
-     * @throws ParameterMissingException
      * @throws NotFoundException
+     * @throws ParameterMissingException
+     * @throws NonUniqueResultException
+     * @throws PrivilegeException
      *
-     * @return array|OrderModel
+     * @return array<string, mixed>|OrderModel
      */
     public function getOne($id)
     {
@@ -121,7 +132,7 @@ public function getOne($id)
             ->getOneOrNullResult($this->getResultMode());
 
         if ($order === null) {
-            throw new NotFoundException(sprintf('Order by id %d not found', $id));
+            throw new NotFoundException(\sprintf('Order by id %d not found', $id));
         }
 
         if (\is_array($order)) {
@@ -134,10 +145,14 @@ public function getOne($id)
     }
 
     /**
-     * @param int $offset
-     * @param int $limit
+     * @param int                                                                                                            $offset
+     * @param int                                                                                                            $limit
+     * @param array<string, mixed>|array<array{property: string, value: mixed, expression?: string, operator?: string|null}> $criteria
+     * @param array<array{property: string, direction?: string}>                                                             $orderBy
+     *
+     * @throws PrivilegeException
      *
-     * @return array
+     * @return array{data: array<array<string, mixed>|OrderModel>, total: int}
      */
     public function getList($offset = 0, $limit = 25, array $criteria = [], array $orderBy = [])
     {
@@ -145,14 +160,14 @@ public function getList($offset = 0, $limit = 25, array $criteria = [], array $o
 
         $builder = $this->getRepository()->createQueryBuilder('orders')
             ->addSelect(['attribute'])
-            ->leftJoin('orders.attribute', 'attribute');
-
-        $builder->addFilter($criteria);
-        $builder->addOrderBy($orderBy);
-        $builder->setFirstResult($offset)
-                ->setMaxResults($limit);
-        $builder->addSelect(['partial customer.{id,email}']);
-        $builder->leftJoin('orders.customer', 'customer');
+            ->leftJoin('orders.attribute', 'attribute')
+            ->addFilter($criteria)
+            ->addOrderBy($orderBy)
+            ->setFirstResult($offset)
+                ->setMaxResults($limit)
+            ->addSelect(['partial customer.{id,email}'])
+            ->leftJoin('orders.customer', 'customer');
+        /** @var Query<OrderModel|array<string, mixed>> $query */
         $query = $builder->getQuery();
 
         $query->setHydrationMode($this->getResultMode());
@@ -163,7 +178,7 @@ public function getList($offset = 0, $limit = 25, array $criteria = [], array $o
         $totalResult = $paginator->count();
 
         // Returns the order data
-        $orders = $paginator->getIterator()->getArrayCopy();
+        $orders = iterator_to_array($paginator);
 
         foreach ($orders as &$order) {
             if (\is_array($order)) {
@@ -177,7 +192,14 @@ public function getList($offset = 0, $limit = 25, array $criteria = [], array $o
     }
 
     /**
+     * @param array<string, mixed> $params
+     *
+     * @throws NotFoundException
+     * @throws ParameterMissingException
+     * @throws PrivilegeException
      * @throws ValidationException
+     * @throws ORMException
+     * @throws ShopwareOrmException
      *
      * @return OrderModel
      */
@@ -213,7 +235,7 @@ public function create(array $params)
             throw new ValidationException($violations);
         }
 
-        $this->prepareCreateAddresses($params, $order);
+        $this->createAddresses($params, $order);
 
         // Generate an order number if none was provided. Doing it after validation since
         // the generation of the order number cannot be reverted in a simple manner.
@@ -234,8 +256,15 @@ public function create(array $params)
     }
 
     /**
-     * @param string $number
-     * @param array  $params
+     * @param string               $number
+     * @param array<string, mixed> $params
+     *
+     * @throws CustomValidationException
+     * @throws NotFoundException
+     * @throws ParameterMissingException
+     * @throws PrivilegeException
+     * @throws ShopwareOrmException
+     * @throws ValidationException
      *
      * @return OrderModel
      */
@@ -247,11 +276,18 @@ public function updateByNumber($number, $params)
     }
 
     /**
-     * @param int $id
+     * @param int                  $id
+     * @param array<string, mixed> $params
      *
-     * @throws ValidationException
+     * @throws CustomValidationException
      * @throws NotFoundException
+     * @throws ORMException
+     * @throws OptimisticLockException
      * @throws ParameterMissingException
+     * @throws PrivilegeException
+     * @throws ShopwareOrmException
+     * @throws TransactionRequiredException
+     * @throws ValidationException
      *
      * @return OrderModel
      */
@@ -266,7 +302,7 @@ public function update($id, array $params)
         $order = $this->getRepository()->find($id);
 
         if (!$order) {
-            throw new NotFoundException(sprintf('Order by id %d not found', $id));
+            throw new NotFoundException(\sprintf('Order by id %d not found', $id));
         }
 
         $params = $this->prepareOrderData($params, $order);
@@ -286,16 +322,19 @@ public function update($id, array $params)
     /**
      * Helper method to prepare the order data
      *
+     * @param array<string, mixed> $params
+     *
      * @throws NotFoundException
      * @throws ParameterMissingException
+     * @throws ValidationException
      *
-     * @return array
+     * @return array<string, mixed>
      */
     public function prepareCreateOrderData(array $params)
     {
         $params = $this->prepareCreateOrderDetailsData($params);
 
-        $orderWhiteList = [
+        $allowedOrderFields = [
             'attribute',
             'billing',
             'clearedDate',
@@ -314,6 +353,7 @@ public function prepareCreateOrderData(array $params)
             'invoiceAmountNet',
             'invoiceShipping',
             'invoiceShippingNet',
+            'invoiceShippingTaxRate',
             'languageIso',
             'net',
             'number',
@@ -334,7 +374,7 @@ public function prepareCreateOrderData(array $params)
             'shopId',
         ];
 
-        $params = array_intersect_key($params, array_flip($orderWhiteList));
+        $params = array_intersect_key($params, array_flip($allowedOrderFields));
 
         if (!\array_key_exists('customerId', $params)) {
             throw new ParameterMissingException('customerId');
@@ -362,7 +402,7 @@ public function prepareCreateOrderData(array $params)
 
         $params['customer'] = $this->getContainer()->get(ModelManager::class)->find(CustomerModel::class, $params['customerId']);
         if (empty($params['customer'])) {
-            throw new NotFoundException(sprintf('Customer by id %s not found', $params['customerId']));
+            throw new NotFoundException(\sprintf('Customer by id %s not found', $params['customerId']));
         }
         unset($params['customerId']);
 
@@ -371,7 +411,7 @@ public function prepareCreateOrderData(array $params)
             'group' => 'state',
         ]);
         if (empty($params['orderStatus'])) {
-            throw new NotFoundException(sprintf('OrderStatus by id %s not found', $params['orderStatusId']));
+            throw new NotFoundException(\sprintf('OrderStatus by id %s not found', $params['orderStatusId']));
         }
         unset($params['orderStatusId']);
 
@@ -380,19 +420,19 @@ public function prepareCreateOrderData(array $params)
             'group' => 'payment',
         ]);
         if (empty($params['paymentStatus'])) {
-            throw new NotFoundException(sprintf('PaymentStatus by id %s not found', $params['paymentStatusId']));
+            throw new NotFoundException(\sprintf('PaymentStatus by id %s not found', $params['paymentStatusId']));
         }
         unset($params['paymentStatusId']);
 
         $params['payment'] = $this->getContainer()->get(ModelManager::class)->find(Payment::class, $params['paymentId']);
         if (empty($params['payment'])) {
-            throw new NotFoundException(sprintf('Payment by id %s not found', $params['paymentId']));
+            throw new NotFoundException(\sprintf('Payment by id %s not found', $params['paymentId']));
         }
         unset($params['paymentId']);
 
         $params['dispatch'] = $this->getContainer()->get(ModelManager::class)->find(Dispatch::class, $params['dispatchId']);
         if (empty($params['dispatch'])) {
-            throw new NotFoundException(sprintf('Dispatch by id %s not found', $params['dispatchId']));
+            throw new NotFoundException(\sprintf('Dispatch by id %s not found', $params['dispatchId']));
         }
         unset($params['dispatchId']);
 
@@ -400,7 +440,7 @@ public function prepareCreateOrderData(array $params)
             $params['partner'] = $this->getContainer()->get(ModelManager::class)->find(Partner::class, $params['partnerId']);
 
             if (empty($params['partner'])) {
-                throw new NotFoundException(sprintf('Partner by id %s not found', $params['partnerId']));
+                throw new NotFoundException(\sprintf('Partner by id %s not found', $params['partnerId']));
             }
 
             unset($params['partnerId']);
@@ -408,7 +448,7 @@ public function prepareCreateOrderData(array $params)
 
         $params['shop'] = $this->getContainer()->get(ModelManager::class)->find(Shop::class, $params['shopId']);
         if (empty($params['shop'])) {
-            throw new NotFoundException(sprintf('Shop by id %s not found', $params['shopId']));
+            throw new NotFoundException(\sprintf('Shop by id %s not found', $params['shopId']));
         }
 
         unset($params['shopId']);
@@ -419,14 +459,16 @@ public function prepareCreateOrderData(array $params)
     /**
      * Helper method to prepare the order detail data
      *
+     * @param array<string, mixed> $params
+     *
      * @throws NotFoundException
      * @throws ValidationException
      *
-     * @return array
+     * @return array<string, mixed>
      */
     public function prepareCreateOrderDetailsData(array $params)
     {
-        $detailWhiteList = [
+        $allowedOrderDetailFields = [
             'articleId',
             'articleName',
             'articleNumber',
@@ -459,8 +501,7 @@ public function prepareCreateOrderDetailsData(array $params)
         }
 
         foreach ($details as &$detail) {
-            // Apply whiteList
-            $detail = array_intersect_key($detail, array_flip($detailWhiteList));
+            $detail = array_intersect_key($detail, array_flip($allowedOrderDetailFields));
 
             if (!\array_key_exists('statusId', $detail)) {
                 throw new NotFoundException('details.statusId');
@@ -481,14 +522,14 @@ public function prepareCreateOrderDetailsData(array $params)
 
             $status = $this->getContainer()->get(ModelManager::class)->find(DetailStatus::class, $detail['statusId']);
             if (!$status) {
-                throw new NotFoundException(sprintf('DetailStatus by id %s not found', $detail['statusId']));
+                throw new NotFoundException(\sprintf('DetailStatus by id %s not found', $detail['statusId']));
             }
             $detailModel->setStatus($status);
             unset($detail['statusId']);
 
             $tax = $this->getContainer()->get(ModelManager::class)->find(Tax::class, $detail['taxId']);
             if (!$tax) {
-                throw new NotFoundException(sprintf('Tax by id %s not found', $detail['taxId']));
+                throw new NotFoundException(\sprintf('Tax by id %s not found', $detail['taxId']));
             }
             $detailModel->setTax($tax);
             unset($detail['taxId']);
@@ -515,15 +556,21 @@ public function prepareCreateOrderDetailsData(array $params)
     /**
      * Helper method to prepare the order data
      *
+     * @param array<string, mixed> $params
+     *
+     * @throws CustomValidationException
      * @throws NotFoundException
+     * @throws ORMException
+     * @throws OptimisticLockException
+     * @throws TransactionRequiredException
      *
-     * @return array
+     * @return array<string, mixed>
      */
     public function prepareOrderData(array $params, OrderModel $order)
     {
         $params = $this->prepareOrderDetailsData($params, $order);
 
-        $orderWhiteList = [
+        $allowedOrderFields = [
             'paymentStatusId',
             'orderStatusId',
             'trackingCode',
@@ -536,7 +583,7 @@ public function prepareOrderData(array $params, OrderModel $order)
             'details',
         ];
 
-        $params = array_intersect_key($params, array_flip($orderWhiteList));
+        $params = array_intersect_key($params, array_flip($allowedOrderFields));
 
         if (isset($params['orderStatusId'])) {
             $params['orderStatus'] = Shopware()->Models()->getRepository(Status::class)->findOneBy(
@@ -547,7 +594,7 @@ public function prepareOrderData(array $params, OrderModel $order)
             );
 
             if (empty($params['orderStatus'])) {
-                throw new NotFoundException(sprintf('OrderStatus by id %s not found', $params['orderStatusId']));
+                throw new NotFoundException(\sprintf('OrderStatus by id %s not found', $params['orderStatusId']));
             }
         }
 
@@ -560,7 +607,7 @@ public function prepareOrderData(array $params, OrderModel $order)
             );
 
             if (empty($params['paymentStatus'])) {
-                throw new NotFoundException(sprintf('PaymentStatus by id %s not found', $params['paymentStatusId']));
+                throw new NotFoundException(\sprintf('PaymentStatus by id %s not found', $params['paymentStatusId']));
             }
 
             return $params;
@@ -572,13 +619,19 @@ public function prepareOrderData(array $params, OrderModel $order)
     /**
      * Helper method to prepare the order detail data
      *
-     * @throws NotFoundException|ApiException\CustomValidationException
+     * @param array<string, mixed> $params
      *
-     * @return array
+     * @throws CustomValidationException
+     * @throws NotFoundException
+     * @throws ORMException
+     * @throws OptimisticLockException
+     * @throws TransactionRequiredException
+     *
+     * @return array<string, mixed>
      */
     public function prepareOrderDetailsData(array $params, OrderModel $order)
     {
-        $detailWhiteList = [
+        $allowedOrderDetailFields = [
             'status',
             'shipped',
             'id',
@@ -593,8 +646,7 @@ public function prepareOrderDetailsData(array $params, OrderModel $order)
         }
 
         foreach ($details as &$detail) {
-            // Apply whiteList
-            $detail = array_intersect_key($detail, array_flip($detailWhiteList));
+            $detail = array_intersect_key($detail, array_flip($allowedOrderDetailFields));
         }
         unset($detail);
 
@@ -612,7 +664,7 @@ public function prepareOrderDetailsData(array $params, OrderModel $order)
                 $status = Shopware()->Models()->find(DetailStatus::class, $detail['status']);
 
                 if (!$status) {
-                    throw new NotFoundException(sprintf('DetailStatus by id %s not found', $detail['status']));
+                    throw new NotFoundException(\sprintf('DetailStatus by id %s not found', $detail['status']));
                 }
 
                 $detailModel->setStatus($status);
@@ -632,11 +684,13 @@ public function prepareOrderDetailsData(array $params, OrderModel $order)
     }
 
     /**
+     * @param array<string, mixed> $params
+     *
      * @throws NotFoundException
      * @throws ValidationException
      * @throws ParameterMissingException
      */
-    private function prepareCreateAddresses(array $params, OrderModel $order): void
+    private function createAddresses(array $params, OrderModel $order): void
     {
         if (!\array_key_exists('billing', $params)) {
             throw new ParameterMissingException('billing');
@@ -656,7 +710,7 @@ private function prepareCreateAddresses(array $params, OrderModel $order): void
         if (isset($billing['stateId'])) {
             $state = $this->getContainer()->get(ModelManager::class)->find(State::class, (int) $billing['stateId']);
             if (!$state instanceof State) {
-                throw new NotFoundException(sprintf('Billing State by id %s not found', $billing['stateId']));
+                throw new NotFoundException(\sprintf('Billing State by id %s not found', $billing['stateId']));
             }
         } else {
             $billing['stateId'] = 0;
@@ -664,11 +718,11 @@ private function prepareCreateAddresses(array $params, OrderModel $order): void
 
         $country = $this->getContainer()->get(ModelManager::class)->find(CountryModel::class, $billing['countryId']);
         if (!$country instanceof CountryModel) {
-            throw new NotFoundException(sprintf('Billing Country by id %s not found', $billing['countryId']));
+            throw new NotFoundException(\sprintf('Billing Country by id %s not found', $billing['countryId']));
         }
 
         if (!$order->getCustomer() instanceof CustomerModel) {
-            throw new NotFoundException(sprintf('Order with ID "%s" has no customer', $order->getId()));
+            throw new NotFoundException(\sprintf('Order with ID "%s" has no customer', $order->getId()));
         }
 
         $billingAddress = new Billing();
@@ -693,7 +747,7 @@ private function prepareCreateAddresses(array $params, OrderModel $order): void
         if (isset($shipping['stateId'])) {
             $state = $this->getContainer()->get(ModelManager::class)->find(State::class, (int) $shipping['stateId']);
             if (!$state instanceof State) {
-                throw new NotFoundException(sprintf('Shipping State by id %s not found', $shipping['stateId']));
+                throw new NotFoundException(\sprintf('Shipping State by id %s not found', $shipping['stateId']));
             }
         } else {
             $shipping['stateId'] = 0;
@@ -701,7 +755,7 @@ private function prepareCreateAddresses(array $params, OrderModel $order): void
 
         $country = $this->getContainer()->get(ModelManager::class)->find(CountryModel::class, $shipping['countryId']);
         if (!$country) {
-            throw new NotFoundException(sprintf('Shipping Country by id %s not found', $shipping['countryId']));
+            throw new NotFoundException(\sprintf('Shipping Country by id %s not found', $shipping['countryId']));
         }
 
         $shippingAddress = new Shipping();
diff --git a/engine/Shopware/Components/Api/Resource/PaymentMethods.php b/engine/Shopware/Components/Api/Resource/PaymentMethods.php
index f74bb05d758..42151f739a1 100644
--- a/engine/Shopware/Components/Api/Resource/PaymentMethods.php
+++ b/engine/Shopware/Components/Api/Resource/PaymentMethods.php
@@ -1,34 +1,39 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Api\Resource;
 
 use Exception;
-use Shopware\Components\Api\Exception as ApiException;
+use Shopware\Components\Api\Exception\NotFoundException;
+use Shopware\Components\Api\Exception\ParameterMissingException;
+use Shopware\Components\Api\Exception\ValidationException;
+use Shopware\Components\Model\ModelManager;
 use Shopware\Models\Country\Country as CountryModel;
 use Shopware\Models\Payment\Payment as PaymentModel;
+use Shopware\Models\Payment\Repository;
 use Shopware\Models\Plugin\Plugin;
+use Shopware\Models\Shop\Shop as ShopModel;
 
 /**
  * Payment API Resource
@@ -36,7 +41,7 @@
 class PaymentMethods extends Resource
 {
     /**
-     * @return \Shopware\Models\Payment\Repository
+     * @return Repository
      */
     public function getRepository()
     {
@@ -46,8 +51,8 @@ public function getRepository()
     /**
      * @param int $id
      *
-     * @throws \Shopware\Components\Api\Exception\ParameterMissingException
-     * @throws \Shopware\Components\Api\Exception\NotFoundException
+     * @throws ParameterMissingException
+     * @throws NotFoundException
      *
      * @return array|PaymentModel
      */
@@ -56,7 +61,7 @@ public function getOne($id)
         $this->checkPrivilege('read');
 
         if (empty($id)) {
-            throw new ApiException\ParameterMissingException('id');
+            throw new ParameterMissingException('id');
         }
 
         $filters = [['property' => 'payment.id', 'expression' => '=', 'value' => $id]];
@@ -66,7 +71,7 @@ public function getOne($id)
         $payment = $query->getOneOrNullResult($this->getResultMode());
 
         if (!$payment) {
-            throw new ApiException\NotFoundException(sprintf('Payment by id %d not found', $id));
+            throw new NotFoundException(\sprintf('Payment by id %d not found', $id));
         }
 
         return $payment;
@@ -87,17 +92,17 @@ public function getList($offset = 0, $limit = 25, array $filter = [], array $ord
 
         $paginator = $this->getManager()->createPaginator($query);
 
-        //returns the total count of the query
+        // returns the total count of the query
         $totalResult = $paginator->count();
 
-        //returns the category data
-        $payments = $paginator->getIterator()->getArrayCopy();
+        // returns the category data
+        $payments = iterator_to_array($paginator);
 
         return ['data' => $payments, 'total' => $totalResult];
     }
 
     /**
-     * @throws \Shopware\Components\Api\Exception\ValidationException
+     * @throws ValidationException
      * @throws Exception
      *
      * @return PaymentModel
@@ -117,7 +122,7 @@ public function create(array $params)
         $violations = $this->getManager()->validate($payment);
 
         if ($violations->count() > 0) {
-            throw new ApiException\ValidationException($violations);
+            throw new ValidationException($violations);
         }
 
         $this->getManager()->persist($payment);
@@ -129,9 +134,9 @@ public function create(array $params)
     /**
      * @param int $id
      *
-     * @throws \Shopware\Components\Api\Exception\ValidationException
-     * @throws \Shopware\Components\Api\Exception\NotFoundException
-     * @throws \Shopware\Components\Api\Exception\ParameterMissingException
+     * @throws ValidationException
+     * @throws NotFoundException
+     * @throws ParameterMissingException
      *
      * @return PaymentModel
      */
@@ -140,14 +145,14 @@ public function update($id, array $params)
         $this->checkPrivilege('update');
 
         if (empty($id)) {
-            throw new ApiException\ParameterMissingException('id');
+            throw new ParameterMissingException('id');
         }
 
         /** @var PaymentModel|null $payment */
         $payment = $this->getRepository()->find($id);
 
         if (!$payment) {
-            throw new ApiException\NotFoundException(sprintf('Payment by id "%d" not found', $id));
+            throw new NotFoundException(\sprintf('Payment by id "%d" not found', $id));
         }
 
         $params = $this->preparePaymentData($params);
@@ -156,7 +161,7 @@ public function update($id, array $params)
 
         $violations = $this->getManager()->validate($payment);
         if ($violations->count() > 0) {
-            throw new ApiException\ValidationException($violations);
+            throw new ValidationException($violations);
         }
 
         $this->flush();
@@ -167,8 +172,8 @@ public function update($id, array $params)
     /**
      * @param int $id
      *
-     * @throws \Shopware\Components\Api\Exception\ParameterMissingException
-     * @throws \Shopware\Components\Api\Exception\NotFoundException
+     * @throws ParameterMissingException
+     * @throws NotFoundException
      *
      * @return PaymentModel
      */
@@ -177,14 +182,14 @@ public function delete($id)
         $this->checkPrivilege('delete');
 
         if (empty($id)) {
-            throw new ApiException\ParameterMissingException('id');
+            throw new ParameterMissingException('id');
         }
 
         /** @var PaymentModel|null $payment */
         $payment = $this->getRepository()->find($id);
 
         if (!$payment) {
-            throw new ApiException\NotFoundException("Payment by id $id not found");
+            throw new NotFoundException("Payment by id $id not found");
         }
 
         $this->getManager()->remove($payment);
@@ -196,7 +201,7 @@ public function delete($id)
     /**
      * @param array $params
      *
-     * @throws ApiException\NotFoundException
+     * @throws NotFoundException
      *
      * @return array
      */
@@ -227,9 +232,9 @@ protected function preparePaymentData($params)
 
         if (isset($params['countries'])) {
             foreach ($params['countries'] as &$country) {
-                $countryModel = $this->getContainer()->get(\Shopware\Components\Model\ModelManager::class)->find(CountryModel::class, $country['countryId']);
+                $countryModel = $this->getContainer()->get(ModelManager::class)->find(CountryModel::class, $country['countryId']);
                 if (!$countryModel) {
-                    throw new ApiException\NotFoundException(sprintf('Country by id %d not found', $country['countryId']));
+                    throw new NotFoundException(\sprintf('Country by id %d not found', $country['countryId']));
                 }
 
                 $country = $countryModel;
@@ -240,9 +245,9 @@ protected function preparePaymentData($params)
 
         if (isset($params['shops'])) {
             foreach ($params['shops'] as &$shop) {
-                $shopModel = $this->getContainer()->get(\Shopware\Components\Model\ModelManager::class)->find(\Shopware\Models\Shop\Shop::class, $shop['shopId']);
+                $shopModel = $this->getContainer()->get(ModelManager::class)->find(ShopModel::class, $shop['shopId']);
                 if (!$shopModel) {
-                    throw new ApiException\NotFoundException(sprintf('Shop by id %d not found', $shop['shopId']));
+                    throw new NotFoundException(\sprintf('Shop by id %d not found', $shop['shopId']));
                 }
 
                 $shop = $shopModel;
@@ -252,9 +257,9 @@ protected function preparePaymentData($params)
         }
 
         if (isset($params['pluginId'])) {
-            $params['plugin'] = $this->getContainer()->get(\Shopware\Components\Model\ModelManager::class)->find(Plugin::class, $params['pluginId']);
+            $params['plugin'] = $this->getContainer()->get(ModelManager::class)->find(Plugin::class, $params['pluginId']);
             if (empty($params['plugin'])) {
-                throw new ApiException\NotFoundException(sprintf('plugin by id %s not found', $params['pluginId']));
+                throw new NotFoundException(\sprintf('plugin by id %s not found', $params['pluginId']));
             }
         }
 
diff --git a/engine/Shopware/Components/Api/Resource/PropertyGroup.php b/engine/Shopware/Components/Api/Resource/PropertyGroup.php
index 68bd1b594a0..a47efd18396 100644
--- a/engine/Shopware/Components/Api/Resource/PropertyGroup.php
+++ b/engine/Shopware/Components/Api/Resource/PropertyGroup.php
@@ -1,31 +1,36 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Api\Resource;
 
 use Exception;
-use Shopware\Components\Api\Exception as ApiException;
+use Shopware\Components\Api\Exception\CustomValidationException;
+use Shopware\Components\Api\Exception\NotFoundException;
+use Shopware\Components\Api\Exception\ParameterMissingException;
+use Shopware\Components\Api\Exception\ValidationException;
+use Shopware\Models\Property\Group;
+use Shopware\Models\Property\Repository;
 
 /**
  * Property API Resource
@@ -33,37 +38,37 @@
 class PropertyGroup extends Resource
 {
     /**
-     * @return \Shopware\Models\Property\Repository
+     * @return Repository
      */
     public function getRepository()
     {
-        return $this->getManager()->getRepository(\Shopware\Models\Property\Group::class);
+        return $this->getManager()->getRepository(Group::class);
     }
 
     /**
      * @param int $id
      *
-     * @throws \Shopware\Components\Api\Exception\ParameterMissingException
-     * @throws \Shopware\Components\Api\Exception\NotFoundException
+     * @throws ParameterMissingException
+     * @throws NotFoundException
      *
-     * @return array|\Shopware\Models\Property\Group
+     * @return array|Group
      */
     public function getOne($id)
     {
         $this->checkPrivilege('read');
 
         if (empty($id)) {
-            throw new ApiException\ParameterMissingException('id');
+            throw new ParameterMissingException('id');
         }
 
         $filters = [['property' => 'groups.id', 'expression' => '=', 'value' => $id]];
         $query = $this->getRepository()->getListGroupsQuery($filters);
 
-        /** @var \Shopware\Models\Property\Group|null $property */
+        /** @var Group|null $property */
         $property = $query->getOneOrNullResult($this->getResultMode());
 
         if (!$property) {
-            throw new ApiException\NotFoundException(sprintf('PropertyGroup by id %d not found', $id));
+            throw new NotFoundException(\sprintf('PropertyGroup by id %d not found', $id));
         }
 
         return $property;
@@ -88,16 +93,16 @@ public function getList($offset = 0, $limit = 25, array $criteria = [], array $o
         $totalResult = $paginator->count();
 
         // Returns the property groups data
-        $propertyGroups = $paginator->getIterator()->getArrayCopy();
+        $propertyGroups = iterator_to_array($paginator);
 
         return ['data' => $propertyGroups, 'total' => $totalResult];
     }
 
     /**
-     * @throws \Shopware\Components\Api\Exception\ValidationException
+     * @throws ValidationException
      * @throws Exception
      *
-     * @return \Shopware\Models\Property\Group
+     * @return Group
      */
     public function create(array $params)
     {
@@ -105,12 +110,12 @@ public function create(array $params)
 
         $params = $this->preparePropertyData($params);
 
-        $property = new \Shopware\Models\Property\Group();
+        $property = new Group();
         $property->fromArray($params);
 
         $violations = $this->getManager()->validate($property);
         if ($violations->count() > 0) {
-            throw new ApiException\ValidationException($violations);
+            throw new ValidationException($violations);
         }
 
         $this->getManager()->persist($property);
@@ -122,25 +127,25 @@ public function create(array $params)
     /**
      * @param int $id
      *
-     * @throws \Shopware\Components\Api\Exception\ValidationException
-     * @throws \Shopware\Components\Api\Exception\NotFoundException
-     * @throws \Shopware\Components\Api\Exception\ParameterMissingException
+     * @throws ValidationException
+     * @throws NotFoundException
+     * @throws ParameterMissingException
      *
-     * @return \Shopware\Models\Property\Group
+     * @return Group
      */
     public function update($id, array $params)
     {
         $this->checkPrivilege('update');
 
         if (empty($id)) {
-            throw new ApiException\ParameterMissingException('id');
+            throw new ParameterMissingException('id');
         }
 
-        /** @var \Shopware\Models\Property\Group|null $propertyGroup */
+        /** @var Group|null $propertyGroup */
         $propertyGroup = $this->getRepository()->find($id);
 
         if (!$propertyGroup) {
-            throw new ApiException\NotFoundException(sprintf('PropertyGroup by id %d not found', $id));
+            throw new NotFoundException(\sprintf('PropertyGroup by id %d not found', $id));
         }
 
         $params = $this->preparePropertyData($params, $propertyGroup);
@@ -148,7 +153,7 @@ public function update($id, array $params)
 
         $violations = $this->getManager()->validate($propertyGroup);
         if ($violations->count() > 0) {
-            throw new ApiException\ValidationException($violations);
+            throw new ValidationException($violations);
         }
 
         $this->flush();
@@ -159,24 +164,24 @@ public function update($id, array $params)
     /**
      * @param int $id
      *
-     * @throws \Shopware\Components\Api\Exception\ParameterMissingException
-     * @throws \Shopware\Components\Api\Exception\NotFoundException
+     * @throws ParameterMissingException
+     * @throws NotFoundException
      *
-     * @return \Shopware\Models\Property\Group
+     * @return Group
      */
     public function delete($id)
     {
         $this->checkPrivilege('delete');
 
         if (empty($id)) {
-            throw new ApiException\ParameterMissingException('id');
+            throw new ParameterMissingException('id');
         }
 
-        /** @var \Shopware\Models\Property\Group|null $propertyGroup */
+        /** @var Group|null $propertyGroup */
         $propertyGroup = $this->getRepository()->find($id);
 
         if (!$propertyGroup) {
-            throw new ApiException\NotFoundException(sprintf('PropertyGroup by id %d not found', $id));
+            throw new NotFoundException(\sprintf('PropertyGroup by id %d not found', $id));
         }
 
         $this->getManager()->remove($propertyGroup);
@@ -186,9 +191,9 @@ public function delete($id)
     }
 
     /**
-     * @param \Shopware\Models\Property\Group|null $propertyGroup
+     * @param Group|null $propertyGroup
      *
-     * @throws ApiException\CustomValidationException
+     * @throws CustomValidationException
      *
      * @return array
      */
@@ -196,20 +201,20 @@ private function preparePropertyData(array $params, $propertyGroup = null)
     {
         // If property group is created, we need to set some default values
         if (!$propertyGroup) {
-            if (!isset($params['name']) || empty($params['name'])) {
-                throw new ApiException\CustomValidationException('A name is required');
+            if (empty($params['name'])) {
+                throw new CustomValidationException('A name is required');
             }
 
-            if (!isset($params['position']) || empty($params['position'])) {
+            if (empty($params['position'])) {
                 $params['position'] = 0;
             }
 
-            if (!isset($params['comparable']) || empty($params['comparable'])) {
+            if (empty($params['comparable'])) {
                 // Set comparable
                 $params['comparable'] = 0;
             }
 
-            if (!isset($params['sortmode']) || empty($params['sortmode'])) {
+            if (empty($params['sortmode'])) {
                 // Set sortmode
                 $params['sortmode'] = 0;
             }
@@ -221,7 +226,7 @@ private function preparePropertyData(array $params, $propertyGroup = null)
             }
         } else {
             if (isset($params['name']) && empty($params['name'])) {
-                throw new ApiException\CustomValidationException('Name must not be empty');
+                throw new CustomValidationException('Name must not be empty');
             }
         }
 
diff --git a/engine/Shopware/Components/Api/Resource/Resource.php b/engine/Shopware/Components/Api/Resource/Resource.php
index 9b0952eee64..67054f0997b 100644
--- a/engine/Shopware/Components/Api/Resource/Resource.php
+++ b/engine/Shopware/Components/Api/Resource/Resource.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Api\Resource;
@@ -113,7 +113,7 @@ public function getContainer()
     /**
      * @return void
      */
-    public function setContainer(Container $container = null)
+    public function setContainer(?Container $container = null)
     {
         $this->container = $container;
     }
@@ -142,7 +142,7 @@ public function checkPrivilege($privilege)
         $role = $this->getRole();
 
         if ($this->getAcl()->isAllowed($role, $resource, $privilege) === false) {
-            $message = sprintf(
+            $message = \sprintf(
                 'Role "%s" is not allowed to "%s" on resource "%s"',
                 \is_string($role) ? $role : $role->getRoleId(),
                 $privilege,
@@ -225,9 +225,7 @@ public function getAutoFlush()
     }
 
     /**
-     * @phpstan-param Resource::HYDRATE_* $resultMode
-     *
-     * @param int $resultMode
+     * @param self::HYDRATE_* $resultMode
      *
      * @return void
      */
@@ -237,9 +235,7 @@ public function setResultMode($resultMode)
     }
 
     /**
-     * @phpstan-return Resource::HYDRATE_*
-     *
-     * @return int
+     * @return self::HYDRATE_*
      */
     public function getResultMode()
     {
@@ -332,12 +328,8 @@ public function batch($data)
             throw new BatchInterfaceNotImplementedException();
         }
 
-        $this->setAutoFlush(false);
-        $connection = $this->getManager()->getConnection();
-
         $results = [];
         foreach ($data as $key => $datum) {
-            $connection->beginTransaction();
             $id = $this->getIdByData($datum);
 
             try {
@@ -355,17 +347,12 @@ public function batch($data)
                     ];
                 }
 
-                $this->getManager()->flush();
-                $connection->commit();
-
                 if ($this->getResultMode() === self::HYDRATE_ARRAY) {
                     $results[$key]['data'] = Shopware()->Models()->toArray(
                         $results[$key]['data']
                     );
                 }
             } catch (Exception $e) {
-                $connection->rollBack();
-
                 if (!$this->getManager()->isOpen()) {
                     $this->resetEntityManager();
                 }
@@ -469,7 +456,7 @@ protected function getCollectionElementByProperty($collection, $property, $value
             $getterMethod = 'get' . ucfirst($property);
 
             if (!method_exists($entity, $getterMethod)) {
-                throw new RuntimeException(sprintf('Method %s not found on entity %s', $getterMethod, \get_class($entity)));
+                throw new RuntimeException(\sprintf('Method %s not found on entity %s', $getterMethod, \get_class($entity)));
             }
             if ($entity->$getterMethod() === $value) {
                 return $entity;
@@ -520,7 +507,7 @@ protected function findEntityByConditions($entity, array $conditions)
     {
         $repo = $this->getManager()->getRepository($entity);
         if (!$repo instanceof ModelRepository) {
-            throw new RuntimeException(sprintf('Passed entity has no configured repository: %s', $entity));
+            throw new RuntimeException(\sprintf('Passed entity has no configured repository: %s', $entity));
         }
 
         foreach ($conditions as $condition) {
@@ -565,7 +552,7 @@ protected function getOneToManySubElement(Collection $collection, $data, $entity
             $item = $this->getCollectionElementByProperty($collection, $property, $data[$property]);
 
             if (!$item) {
-                throw new CustomValidationException(sprintf('%s by %s %s not found', $entityType, $property, $data[$property]));
+                throw new CustomValidationException(\sprintf('%s by %s %s not found', $entityType, $property, $data[$property]));
             }
 
             return $item;
@@ -619,7 +606,7 @@ protected function getManyToManySubElement(Collection $collection, $data, $entit
             $item = $repo->findOneBy([$property => $data[$property]]);
 
             if (!$item) {
-                throw new CustomValidationException(sprintf('%s by %s %s not found', $entityType, $property, $data[$property]));
+                throw new CustomValidationException(\sprintf('%s by %s %s not found', $entityType, $property, $data[$property]));
             }
 
             $collection->add($item);
diff --git a/engine/Shopware/Components/Api/Resource/Shop.php b/engine/Shopware/Components/Api/Resource/Shop.php
index 07a4640a890..70e1f1bb9d8 100644
--- a/engine/Shopware/Components/Api/Resource/Shop.php
+++ b/engine/Shopware/Components/Api/Resource/Shop.php
@@ -1,31 +1,42 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Api\Resource;
 
+use Doctrine\ORM\Query;
 use Exception;
-use Shopware\Components\Api\Exception as ApiException;
+use RuntimeException;
+use Shopware\Components\Api\Exception\NotFoundException;
+use Shopware\Components\Api\Exception\ParameterMissingException;
+use Shopware\Components\Api\Exception\ValidationException;
+use Shopware\Models\Category\Category;
+use Shopware\Models\Customer\Group;
+use Shopware\Models\Shop\Currency;
+use Shopware\Models\Shop\Locale;
+use Shopware\Models\Shop\Repository;
+use Shopware\Models\Shop\Shop as ShopModel;
+use Shopware\Models\Shop\Template;
 
 /**
  * Shop API Resource
@@ -33,27 +44,27 @@
 class Shop extends Resource
 {
     /**
-     * @return \Shopware\Models\Shop\Repository
+     * @return Repository
      */
     public function getRepository()
     {
-        return $this->getManager()->getRepository('Shopware\Models\Shop\Shop');
+        return $this->getManager()->getRepository(ShopModel::class);
     }
 
     /**
      * @param int $id
      *
-     * @throws \Shopware\Components\Api\Exception\ParameterMissingException
-     * @throws \Shopware\Components\Api\Exception\NotFoundException
+     * @throws NotFoundException
+     * @throws ParameterMissingException
      *
-     * @return array|\Shopware\Models\Shop\Shop
+     * @return array|ShopModel
      */
     public function getOne($id)
     {
         $this->checkPrivilege('read');
 
         if (empty($id)) {
-            throw new ApiException\ParameterMissingException('id');
+            throw new ParameterMissingException('id');
         }
 
         $builder = $this->getRepository()->createQueryBuilder('shop')
@@ -65,11 +76,10 @@ public function getOne($id)
         $query = $builder->getQuery();
         $query->setHydrationMode($this->getResultMode());
 
-        /** @var \Shopware\Models\Shop\Shop|null $shop */
         $shop = $query->getOneOrNullResult($this->getResultMode());
 
         if (!$shop) {
-            throw new ApiException\NotFoundException(sprintf('Shop by id %s not found', $id));
+            throw new NotFoundException(\sprintf('Shop by id %s not found', $id));
         }
 
         return $shop;
@@ -91,25 +101,26 @@ public function getList($offset = 0, $limit = 25, array $criteria = [], array $o
                 ->addOrderBy($orderBy)
                 ->setFirstResult($offset)
                 ->setMaxResults($limit);
+        /** @var Query<ShopModel|array<string, mixed>> $query */
         $query = $builder->getQuery();
         $query->setHydrationMode($this->resultMode);
 
         $paginator = $this->getManager()->createPaginator($query);
 
-        //returns the total count of the query
+        // returns the total count of the query
         $totalResult = $paginator->count();
 
-        //returns the category data
-        $shops = $paginator->getIterator()->getArrayCopy();
+        // returns the category data
+        $shops = iterator_to_array($paginator);
 
         return ['data' => $shops, 'total' => $totalResult];
     }
 
     /**
-     * @throws \Shopware\Components\Api\Exception\ValidationException
      * @throws Exception
+     * @throws ValidationException
      *
-     * @return \Shopware\Models\Shop\Shop
+     * @return ShopModel
      */
     public function create(array $params)
     {
@@ -117,12 +128,12 @@ public function create(array $params)
 
         $params = $this->prepareShopData($params);
 
-        $shop = new \Shopware\Models\Shop\Shop();
+        $shop = new ShopModel();
         $shop->fromArray($params);
 
         $violations = $this->getManager()->validate($shop);
         if ($violations->count() > 0) {
-            throw new ApiException\ValidationException($violations);
+            throw new ValidationException($violations);
         }
 
         $this->getManager()->persist($shop);
@@ -134,26 +145,24 @@ public function create(array $params)
     /**
      * @param int $id
      *
-     * @throws \Shopware\Components\Api\Exception\ValidationException
-     * @throws \Shopware\Components\Api\Exception\NotFoundException
-     * @throws \Shopware\Components\Api\Exception\ParameterMissingException
-     * @throws \Shopware\Components\Api\Exception\CustomValidationException
+     * @throws NotFoundException
+     * @throws ParameterMissingException
+     * @throws ValidationException
      *
-     * @return \Shopware\Models\Shop\Shop
+     * @return ShopModel
      */
     public function update($id, array $params)
     {
         $this->checkPrivilege('update');
 
         if (empty($id)) {
-            throw new ApiException\ParameterMissingException('id');
+            throw new ParameterMissingException('id');
         }
 
-        /** @var \Shopware\Models\Shop\Shop|null $shop */
         $shop = $this->getRepository()->find($id);
 
         if (!$shop) {
-            throw new ApiException\NotFoundException(sprintf('Shop by id %s not found', $id));
+            throw new NotFoundException(\sprintf('Shop by id %s not found', $id));
         }
 
         $params = $this->prepareShopData($params, $shop);
@@ -161,7 +170,7 @@ public function update($id, array $params)
 
         $violations = $this->getManager()->validate($shop);
         if ($violations->count() > 0) {
-            throw new ApiException\ValidationException($violations);
+            throw new ValidationException($violations);
         }
 
         $this->flush();
@@ -172,24 +181,23 @@ public function update($id, array $params)
     /**
      * @param int $id
      *
-     * @throws \Shopware\Components\Api\Exception\ParameterMissingException
-     * @throws \Shopware\Components\Api\Exception\NotFoundException
+     * @throws NotFoundException
+     * @throws ParameterMissingException
      *
-     * @return \Shopware\Models\Shop\Shop
+     * @return ShopModel
      */
     public function delete($id)
     {
         $this->checkPrivilege('delete');
 
         if (empty($id)) {
-            throw new ApiException\ParameterMissingException('id');
+            throw new ParameterMissingException('id');
         }
 
-        /** @var \Shopware\Models\Shop\Shop|null $shop */
         $shop = $this->getRepository()->find($id);
 
         if (!$shop) {
-            throw new ApiException\NotFoundException(sprintf('Shop by id %s not found', $id));
+            throw new NotFoundException(\sprintf('Shop by id %s not found', $id));
         }
 
         $this->getManager()->remove($shop);
@@ -198,81 +206,86 @@ public function delete($id)
         return $shop;
     }
 
-    private function prepareShopData($params, $shop = null)
+    /**
+     * @param array<string, mixed> $params
+     *
+     * @return array<string, mixed>
+     */
+    private function prepareShopData(array $params, ?ShopModel $shop = null): array
     {
         $requiredParams = ['name', 'localeId', 'currencyId', 'customerGroupId', 'categoryId'];
         foreach ($requiredParams as $param) {
             if (!$shop) {
                 if (!isset($params[$param]) || empty($params[$param])) {
-                    throw new ApiException\ParameterMissingException($param);
+                    throw new ParameterMissingException($param);
                 }
             } else {
                 if (isset($params[$param]) && empty($params[$param])) {
-                    throw new Exception(sprintf('param %s may not be empty', $param));
+                    throw new RuntimeException(\sprintf('param %s may not be empty', $param));
                 }
             }
         }
 
         if (isset($params['currencyId'])) {
-            $currency = Shopware()->Models()->find('\Shopware\Models\Shop\Currency', $params['currencyId']);
+            $currency = Shopware()->Models()->find(Currency::class, $params['currencyId']);
             if ($currency !== null) {
                 $params['currency'] = $currency;
             } else {
-                throw new Exception(sprintf('%s is not a valid currency id', $params['currencyId']));
+                throw new RuntimeException(\sprintf('%s is not a valid currency id', $params['currencyId']));
             }
         }
 
         if (isset($params['localeId'])) {
-            $locale = Shopware()->Models()->find('\Shopware\Models\Shop\Locale', $params['localeId']);
+            $locale = Shopware()->Models()->find(Locale::class, $params['localeId']);
             if ($locale !== null) {
                 $params['locale'] = $locale;
             } else {
-                throw new Exception(sprintf('%s is not a valid locale id', $params['localeId']));
+                throw new RuntimeException(\sprintf('%s is not a valid locale id', $params['localeId']));
             }
         }
 
         if (isset($params['customerGroupId'])) {
-            $customerGroup = Shopware()->Models()->find('\Shopware\Models\Customer\Group', $params['customerGroupId']);
+            $customerGroup = Shopware()->Models()->find(Group::class, $params['customerGroupId']);
             if ($customerGroup !== null) {
                 $params['customerGroup'] = $customerGroup;
             } else {
-                throw new Exception(sprintf('%s is not a valid customerGroup id', $params['customerGroupId']));
+                throw new RuntimeException(\sprintf('%s is not a valid customerGroup id', $params['customerGroupId']));
             }
         }
 
         if (isset($params['mainId'])) {
-            $shop = Shopware()->Models()->find('\Shopware\Models\Shop\Shop', $params['mainId']);
-            if ($shop !== null) {
-                $params['main'] = $shop;
+            $shopModel = Shopware()->Models()->find(ShopModel::class, $params['mainId']);
+            if ($shopModel instanceof ShopModel) {
+                $params['main'] = $shopModel;
             } else {
-                throw new Exception(sprintf('%s is not a valid shop id', $params['mainId']));
+                throw new RuntimeException(\sprintf('%s is not a valid shop id', $params['mainId']));
             }
         }
 
         if (isset($params['templateId'])) {
-            $template = Shopware()->Models()->find('\Shopware\Models\Shop\Template', $params['templateId']);
+            $template = Shopware()->Models()->find(Template::class, $params['templateId']);
             if ($template !== null) {
                 $params['template'] = $template;
             } else {
-                throw new Exception(sprintf('%s is not a valid template id', $params['templateId']));
+                throw new RuntimeException(\sprintf('%s is not a valid template id', $params['templateId']));
             }
         }
 
         if (isset($params['documentTemplateId'])) {
-            $template = Shopware()->Models()->find('\Shopware\Models\Shop\Template', $params['documentTemplateId']);
+            $template = Shopware()->Models()->find(Template::class, $params['documentTemplateId']);
             if ($template !== null) {
                 $params['documentTemplate'] = $template;
             } else {
-                throw new Exception(sprintf('%s is not a valid template id', $params['documentTemplateId']));
+                throw new RuntimeException(\sprintf('%s is not a valid template id', $params['documentTemplateId']));
             }
         }
 
         if (isset($params['categoryId'])) {
-            $category = Shopware()->Models()->find('\Shopware\Models\Category\Category', $params['categoryId']);
+            $category = Shopware()->Models()->find(Category::class, $params['categoryId']);
             if ($category !== null) {
                 $params['category'] = $category;
             } else {
-                throw new Exception(sprintf('%s is not a valid category id', $params['categoryId']));
+                throw new RuntimeException(\sprintf('%s is not a valid category id', $params['categoryId']));
             }
         }
 
diff --git a/engine/Shopware/Components/Api/Resource/Translation.php b/engine/Shopware/Components/Api/Resource/Translation.php
index 3aa651450dc..56576b9b4e7 100644
--- a/engine/Shopware/Components/Api/Resource/Translation.php
+++ b/engine/Shopware/Components/Api/Resource/Translation.php
@@ -1,37 +1,38 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Api\Resource;
 
 use Doctrine\ORM\AbstractQuery;
-use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Query;
 use Exception;
 use Shopware\Components\Api\BatchInterface;
 use Shopware\Components\Api\Exception\CustomValidationException;
 use Shopware\Components\Api\Exception\NotFoundException;
 use Shopware\Components\Api\Exception\ParameterMissingException;
 use Shopware\Components\Model\Exception\ModelNotFoundException;
+use Shopware\Components\Model\ModelRepository;
 use Shopware\Components\Model\QueryBuilder;
 use Shopware\Models\Article\Configurator\Group as ConfiguratorGroup;
 use Shopware\Models\Article\Configurator\Option as ConfiguratorOption;
@@ -73,7 +74,7 @@ class Translation extends Resource implements BatchInterface
     protected $translationWriter;
 
     /**
-     * @var EntityRepository|null
+     * @var ModelRepository<TranslationModel>|null
      */
     protected $repository;
 
@@ -82,25 +83,14 @@ class Translation extends Resource implements BatchInterface
      */
     private $translationComponent;
 
-    public function __construct(Shopware_Components_Translation $translationComponent = null)
+    public function __construct(?Shopware_Components_Translation $translationComponent = null)
     {
         $this->translationComponent = $translationComponent ?: Shopware()->Container()->get(Shopware_Components_Translation::class);
     }
 
-    /**
-     * This methods needs to return an ID for the current resource.
-     * The ID needs to be the primary ID of the resource (in most cases `id`).
-     * If your resource supports other kinds of IDs, too, you should identify
-     * your entity by these IDs and return the primary ID of that entity.
-     *
-     * @param array $data
-     *
-     * @return int|bool Return the primary ID of the entity, if it exists
-     *                  Return false, if no existing entity matches $data
-     */
     public function getIdByData($data)
     {
-        if ($data['useNumberAsId']) {
+        if (!empty($data['useNumberAsId'])) {
             return $this->getIdByNumber(
                 $data['key'],
                 $data['type']
@@ -120,6 +110,8 @@ public function getTranslationComponent()
 
     /**
      * @param Shopware_Components_Translation $translationWriter
+     *
+     * @return void
      */
     public function setTranslationComponent($translationWriter)
     {
@@ -144,11 +136,12 @@ public function getList(
     ) {
         $this->checkPrivilege('read');
 
+        /** @var Query<array<string, mixed>> $query */
         $query = $this->getListQuery($offset, $limit, $criteria, $orderBy)->getQuery();
-        $query->setHydrationMode($this->getResultMode());
+        $query->setHydrationMode(self::HYDRATE_ARRAY);
         $paginator = $this->getManager()->createPaginator($query);
 
-        $translations = $paginator->getIterator()->getArrayCopy();
+        $translations = iterator_to_array($paginator);
 
         foreach ($translations as &$translation) {
             unset($translation['id']);
@@ -184,12 +177,12 @@ public function create(array $data)
     {
         $this->checkPrivilege('create');
 
-        $this->checkRequirements($data);
-
-        if (!isset($data['key']) || empty($data['key'])) {
-            throw new ParameterMissingException('The parameter key is required for a object translation.');
+        if (empty($data['key'])) {
+            throw new ParameterMissingException('The parameter key is required for an object translation.');
         }
 
+        $this->checkRequirements($data);
+
         return $this->saveTranslation($data);
     }
 
@@ -333,7 +326,7 @@ public function delete($id, $data)
         );
 
         if (!$translation instanceof TranslationModel) {
-            throw new NotFoundException(sprintf('No translation found for type %s, shop id %s and foreign key %s', $data['type'], $data['shopId'], $id));
+            throw new NotFoundException(\sprintf('No translation found for type %s, shop id %s and foreign key %s', $data['type'], $data['shopId'], $id));
         }
 
         $this->getManager()->remove($translation);
@@ -375,6 +368,9 @@ public function deleteByNumber($number, $data)
         return $this->delete($id, $data);
     }
 
+    /**
+     * @return ModelRepository<TranslationModel>
+     */
     protected function getRepository()
     {
         if ($this->repository === null) {
@@ -432,7 +428,6 @@ protected function saveTranslation(array $data)
             $existing = [];
         } else {
             $existing['data'] = unserialize($existing['data'], ['allowed_classes' => false]);
-            $this->delete($data['key'], $data);
         }
 
         $data = array_replace_recursive(
@@ -456,6 +451,8 @@ protected function saveTranslation(array $data)
         if (!$translation instanceof TranslationModel) {
             throw new ModelNotFoundException(TranslationModel::class, $data['key'], 'key');
         }
+        // The model needs to be refreshed after reading, otherwise it will not load the updated translation correctly
+        $this->getManager()->refresh($translation);
 
         return $translation;
     }
@@ -463,10 +460,10 @@ protected function saveTranslation(array $data)
     /**
      * Helper function which returns a language translation for a single object type.
      *
-     * @param string $type       - Type of the translatable object, see class constants
-     * @param int    $key        - Identifier of the translatable object. (s_articles.id)
-     * @param int    $shopId     - Identifier of the shop object. (s_core_shops.id)
-     * @param int    $resultMode - Flag which handles the return value between array and \Shopware\Models\Translation\Translation
+     * @param string                   $type       - Type of the translatable object, see class constants
+     * @param int                      $key        - Identifier of the translatable object. (s_articles.id)
+     * @param int                      $shopId     - Identifier of the shop object. (s_core_shops.id)
+     * @param AbstractQuery::HYDRATE_* $resultMode - Flag which handles the return value between array and \Shopware\Models\Translation\Translation
      *
      * @return array|TranslationModel|null
      */
@@ -531,7 +528,7 @@ protected function getIdByNumber($number, $type)
             case self::TYPE_CONFIGURATOR_OPTION:
                 return $this->getConfiguratorOptionIdByNumber($number);
             default:
-                throw new CustomValidationException(sprintf('Unknown translation type %s', $type));
+                throw new CustomValidationException(\sprintf('Unknown translation type %s', $type));
         }
     }
 
@@ -553,7 +550,7 @@ protected function getProductIdByNumber($number)
         );
 
         if (!$entity instanceof Detail) {
-            throw new NotFoundException(sprintf('Variant by order number %s not found', $number));
+            throw new NotFoundException(\sprintf('Variant by order number %s not found', $number));
         }
 
         return $entity->getArticle()->getId();
@@ -577,7 +574,7 @@ protected function getProductVariantIdByNumber($number)
         );
 
         if (!$entity instanceof Detail) {
-            throw new NotFoundException(sprintf('Variant by order number %s not found', $number));
+            throw new NotFoundException(\sprintf('Variant by order number %s not found', $number));
         }
 
         return $entity->getId();
@@ -632,7 +629,7 @@ protected function getManufacturerIdByNumber($number)
         );
 
         if (!$entity instanceof Supplier) {
-            throw new NotFoundException(sprintf('Manufacturer by name %s not found', $number));
+            throw new NotFoundException(\sprintf('Manufacturer by name %s not found', $number));
         }
 
         return $entity->getId();
@@ -659,7 +656,7 @@ protected function getCountryIdByNumber($number)
         );
 
         if (!$country instanceof Country) {
-            throw new NotFoundException(sprintf('Country by iso/name %s not found', $number));
+            throw new NotFoundException(\sprintf('Country by iso/name %s not found', $number));
         }
 
         return $country->getId();
@@ -686,7 +683,7 @@ protected function getCountryStateIdByNumber($number)
         );
 
         if (!$entity instanceof State) {
-            throw new NotFoundException(sprintf('Country state by name/short code %s not found', $number));
+            throw new NotFoundException(\sprintf('Country state by name/short code %s not found', $number));
         }
 
         return $entity->getId();
@@ -711,7 +708,7 @@ protected function getDispatchIdByNumber($number)
         );
 
         if (!$entity instanceof Dispatch) {
-            throw new NotFoundException(sprintf('Dispatch by name code %s not found', $number));
+            throw new NotFoundException(\sprintf('Dispatch by name code %s not found', $number));
         }
 
         return $entity->getId();
@@ -737,7 +734,7 @@ protected function getPaymentIdByNumber($number)
         );
 
         if (!$entity instanceof Payment) {
-            throw new NotFoundException(sprintf('Payment by name/description code %s not found', $number));
+            throw new NotFoundException(\sprintf('Payment by name/description code %s not found', $number));
         }
 
         return $entity->getId();
@@ -762,7 +759,7 @@ protected function getFilterSetIdByNumber($number)
         );
 
         if (!$entity instanceof Group) {
-            throw new NotFoundException(sprintf('Filter set by name code %s not found', $number));
+            throw new NotFoundException(\sprintf('Filter set by name code %s not found', $number));
         }
 
         return $entity->getId();
@@ -786,7 +783,7 @@ protected function getFilterGroupIdByNumber($number)
         $numbers = explode('|', $number);
 
         if (\count($numbers) < 2) {
-            throw new CustomValidationException(sprintf('Passed filter group number %s contains not the full path: set|group', $number));
+            throw new CustomValidationException(\sprintf('Passed filter group number %s contains not the full path: set|group', $number));
         }
 
         $set = $this->findEntityByConditions(
@@ -797,7 +794,7 @@ protected function getFilterGroupIdByNumber($number)
         );
 
         if (!$set instanceof Group) {
-            throw new NotFoundException(sprintf('Filter set by name code %s not found', $numbers[0]));
+            throw new NotFoundException(\sprintf('Filter set by name code %s not found', $numbers[0]));
         }
 
         $group = $this->getCollectionElementByProperty(
@@ -807,7 +804,7 @@ protected function getFilterGroupIdByNumber($number)
         );
 
         if (!$group instanceof Option) {
-            throw new NotFoundException(sprintf('Filter group by name code %s not found', $numbers[1]));
+            throw new NotFoundException(\sprintf('Filter group by name code %s not found', $numbers[1]));
         }
 
         return $group->getId();
@@ -831,7 +828,7 @@ protected function getFilterOptionIdByNumber($number)
         $numbers = explode('|', $number);
 
         if (\count($numbers) < 3) {
-            throw new CustomValidationException(sprintf('Passed filter option number %s contains not the full path: set|group|option', $number));
+            throw new CustomValidationException(\sprintf('Passed filter option number %s contains not the full path: set|group|option', $number));
         }
 
         $set = $this->findEntityByConditions(
@@ -842,7 +839,7 @@ protected function getFilterOptionIdByNumber($number)
         );
 
         if (!$set instanceof Group) {
-            throw new NotFoundException(sprintf('Filter set by name %s not found', $numbers[0]));
+            throw new NotFoundException(\sprintf('Filter set by name %s not found', $numbers[0]));
         }
 
         $group = $this->getCollectionElementByProperty(
@@ -852,7 +849,7 @@ protected function getFilterOptionIdByNumber($number)
         );
 
         if (!$group instanceof Option) {
-            throw new NotFoundException(sprintf('Filter group by name %s not found', $numbers[1]));
+            throw new NotFoundException(\sprintf('Filter group by name %s not found', $numbers[1]));
         }
 
         $option = $this->getCollectionElementByProperty(
@@ -862,7 +859,7 @@ protected function getFilterOptionIdByNumber($number)
         );
 
         if (!$option instanceof Value) {
-            throw new NotFoundException(sprintf('Filter option by name %s not found', $numbers[2]));
+            throw new NotFoundException(\sprintf('Filter option by name %s not found', $numbers[2]));
         }
 
         return $option->getId();
@@ -885,7 +882,7 @@ protected function getConfiguratorGroupIdByNumber($number)
         );
 
         if (!$entity instanceof ConfiguratorGroup) {
-            throw new NotFoundException(sprintf('Configurator group by name %s not found', $number));
+            throw new NotFoundException(\sprintf('Configurator group by name %s not found', $number));
         }
 
         return $entity->getId();
@@ -909,8 +906,8 @@ protected function getConfiguratorOptionIdByNumber($number)
     {
         $numbers = explode('|', $number);
 
-        if (\count($numbers) < 2) {
-            throw new CustomValidationException(sprintf('Passed configurator option name %s contains not the full path: group|option', $number));
+        if (!\is_array($numbers) || \count($numbers) < 2) {
+            throw new CustomValidationException(\sprintf('Passed configurator option name %s contains not the full path: group|option', $number));
         }
 
         $group = $this->findEntityByConditions(
@@ -919,7 +916,7 @@ protected function getConfiguratorOptionIdByNumber($number)
         );
 
         if (!$group) {
-            throw new NotFoundException(sprintf('Configurator group by name %s not found', $numbers[0]));
+            throw new NotFoundException(\sprintf('Configurator group by name %s not found', $numbers[0]));
         }
 
         $option = $this->getCollectionElementByProperty(
@@ -928,15 +925,21 @@ protected function getConfiguratorOptionIdByNumber($number)
             $numbers[1]
         );
         if (!$option instanceof ConfiguratorOption) {
-            throw new NotFoundException(sprintf('Configurator option by name %s not found', $numbers[1]));
+            throw new NotFoundException(\sprintf('Configurator option by name %s not found', $numbers[1]));
         }
 
         return $option->getId();
     }
 
+    /**
+     * @param array<string, mixed> $data
+     * @param bool                 $checkData
+     *
+     * @return void
+     */
     protected function checkRequirements($data, $checkData = true)
     {
-        if (!isset($data['type']) || empty($data['type'])) {
+        if (empty($data['type'])) {
             throw new ParameterMissingException('Passed translation contains no object type');
         }
 
@@ -945,8 +948,8 @@ protected function checkRequirements($data, $checkData = true)
         }
 
         if ($checkData) {
-            if (!isset($data['data']) || empty($data['data'])) {
-                throw new ParameterMissingException('The parameter data is required for a object translation');
+            if (empty($data['data'])) {
+                throw new ParameterMissingException('The parameter data is required for an object translation');
             }
 
             if (!\is_array($data['data'])) {
diff --git a/engine/Shopware/Components/Api/Resource/User.php b/engine/Shopware/Components/Api/Resource/User.php
index 057e91039dc..563c67eec5e 100644
--- a/engine/Shopware/Components/Api/Resource/User.php
+++ b/engine/Shopware/Components/Api/Resource/User.php
@@ -1,35 +1,35 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Api\Resource;
 
+use Doctrine\ORM\Query;
 use Shopware\Components\Api\Exception as ApiException;
 use Shopware\Components\Api\Exception\NotFoundException;
 use Shopware\Components\Api\Exception\ParameterMissingException;
 use Shopware\Components\Auth\Validator\UserValidator;
 use Shopware\Components\Model\ModelRepository;
-use Shopware\Components\Model\QueryBuilder;
 use Shopware\Components\Password\Manager;
 use Shopware\Models\Config\Element;
 use Shopware\Models\Shop\Locale;
@@ -40,7 +40,7 @@
 
 /**
  * User API Resource
-` */
+ * ` */
 class User extends Resource
 {
     /**
@@ -86,7 +86,7 @@ public function getOne($id)
         $user = $builder->getQuery()->getOneOrNullResult($this->getResultMode());
 
         if (!$user) {
-            throw new NotFoundException(sprintf('User by id %s not found', $id));
+            throw new NotFoundException(\sprintf('User by id %s not found', $id));
         }
 
         if (!$this->hasPrivilege('create', 'usermanager')
@@ -116,29 +116,29 @@ public function getList($offset = 0, $limit = 25, array $criteria = [], array $o
     {
         $this->checkPrivilege('read', 'usermanager');
 
-        /** @var QueryBuilder $builder */
         $builder = $this->getRepository()->createQueryBuilder('user')
-            ->join('user.role', 'role');
-
-        $builder->addSelect(['attribute'])
-            ->leftJoin('user.attribute', 'attribute');
-
-        $builder->addFilter($criteria)
+            ->join('user.role', 'role')
+            ->addSelect(['attribute'])
+            ->leftJoin('user.attribute', 'attribute')
+            ->addFilter($criteria)
             ->addOrderBy($orderBy)
             ->setFirstResult($offset)
             ->setMaxResults($limit);
 
+        /** @var Query<UserModel|array<string, mixed>> $query */
         $query = $builder->getQuery();
         $query->setHydrationMode($this->getResultMode());
 
         $paginator = $this->getManager()->createPaginator($query);
 
-        $users = $paginator->getIterator()->getArrayCopy();
+        $users = iterator_to_array($paginator);
 
         if (!$this->hasPrivilege('create', 'usermanager')
             && !$this->hasPrivilege('update', 'usermanager')) {
             foreach ($users as &$user) {
-                unset($user['apiKey'], $user['sessionId'], $user['password'], $user['encoder']);
+                if (\is_array($user)) {
+                    unset($user['apiKey'], $user['sessionId'], $user['password'], $user['encoder']);
+                }
             }
         }
 
@@ -202,7 +202,7 @@ public function update($id, array $params)
         $user = $builder->getQuery()->getOneOrNullResult(self::HYDRATE_OBJECT);
 
         if (!$user) {
-            throw new NotFoundException(sprintf('User by id %s not found', $id));
+            throw new NotFoundException(\sprintf('User by id %s not found', $id));
         }
 
         $params = $this->prepareAssociatedData($params, $user);
@@ -238,7 +238,7 @@ public function delete($id)
         $user = $this->getRepository()->find($id);
 
         if (!$user) {
-            throw new NotFoundException(sprintf('User by id %s not found', $id));
+            throw new NotFoundException(\sprintf('User by id %s not found', $id));
         }
 
         $this->getManager()->remove($user);
@@ -266,13 +266,13 @@ public function checkPrivilege($privilege, $resource = null)
         }
 
         if (!$this->getAcl()->has($resource)) {
-            throw new ApiException\PrivilegeException(sprintf('No resource "%s" found', $resource));
+            throw new ApiException\PrivilegeException(\sprintf('No resource "%s" found', $resource));
         }
 
         $role = $this->getRole();
 
         if (!$this->getAcl()->isAllowed($role, $resource, $privilege)) {
-            throw new ApiException\PrivilegeException(sprintf('Role "%s" is not allowed to "%s" on resource "%s"', \is_string($role) ? $role : $role->getRoleId(), $privilege, \is_string($resource) ? $resource : $resource->getResourceId()));
+            throw new ApiException\PrivilegeException(\sprintf('Role "%s" is not allowed to "%s" on resource "%s"', \is_string($role) ? $role : $role->getRoleId(), $privilege, \is_string($resource) ? $resource : $resource->getResourceId()));
         }
     }
 
@@ -305,13 +305,13 @@ protected function prepareAssociatedData(array $data, UserModel $user)
             $data['role'] = $this->getManager()->find(Role::class, $data['roleId']);
 
             if (empty($data['role'])) {
-                throw new ApiException\CustomValidationException(sprintf('Role by id %s not found', $data['roleId']));
+                throw new ApiException\CustomValidationException(\sprintf('Role by id %s not found', $data['roleId']));
             }
         } elseif (isset($data['role']) && ($data['role'] >= 0)) {
             $role = $this->getManager()->getRepository(Role::class)->findOneBy(['name' => $data['role']]);
 
             if (!$role) {
-                throw new ApiException\CustomValidationException(sprintf('Role by name %s not found', $data['role']));
+                throw new ApiException\CustomValidationException(\sprintf('Role by name %s not found', $data['role']));
             }
             $data['role'] = $role;
         } else {
@@ -321,12 +321,12 @@ protected function prepareAssociatedData(array $data, UserModel $user)
         // Check if a locale id or name is passed.
         if (!empty($data['localeId'])) {
             if (!$this->isLocaleId((int) $data['localeId'])) {
-                throw new ApiException\CustomValidationException(sprintf('Locale by id %s not found', $data['localeId']));
+                throw new ApiException\CustomValidationException(\sprintf('Locale by id %s not found', $data['localeId']));
             }
         } elseif (!empty($data['locale'])) {
             $localeId = $this->getLocaleIdFromLocale($data['locale']);
             if (!$localeId) {
-                throw new ApiException\CustomValidationException(sprintf('Locale by name %s not found', $data['locale']));
+                throw new ApiException\CustomValidationException(\sprintf('Locale by name %s not found', $data['locale']));
             }
             $data['localeId'] = $localeId;
         } else {
@@ -361,7 +361,7 @@ protected function prepareAssociatedData(array $data, UserModel $user)
         $defaultEncoderName = $passwordEncoderRegistry->getDefaultPasswordEncoderName();
         $encoder = $passwordEncoderRegistry->getEncoderByName($defaultEncoderName);
 
-        $data['password'] = $encoder->encodePassword($data['password']);
+        $data['password'] = $encoder->encodePassword($data['password'] ?? '');
         $data['encoder'] = $encoder->getName();
 
         return $data;
diff --git a/engine/Shopware/Components/Api/Resource/Variant.php b/engine/Shopware/Components/Api/Resource/Variant.php
index 12a821aa575..c1519e42f52 100644
--- a/engine/Shopware/Components/Api/Resource/Variant.php
+++ b/engine/Shopware/Components/Api/Resource/Variant.php
@@ -1,35 +1,39 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Api\Resource;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
+use Doctrine\DBAL\Connection;
+use Doctrine\ORM\Query;
 use RuntimeException;
 use Shopware\Components\Api\BatchInterface;
-use Shopware\Components\Api\Exception as ApiException;
-use Shopware\Components\Model\QueryBuilder;
+use Shopware\Components\Api\Exception\CustomValidationException;
+use Shopware\Components\Api\Exception\NotFoundException;
+use Shopware\Components\Api\Exception\ParameterMissingException;
+use Shopware\Components\Api\Exception\ValidationException;
 use Shopware\Models\Article\Article as ProductModel;
 use Shopware\Models\Article\Configurator\Group;
 use Shopware\Models\Article\Configurator\Option;
@@ -37,7 +41,10 @@
 use Shopware\Models\Article\Esd;
 use Shopware\Models\Article\EsdSerial;
 use Shopware\Models\Article\Image;
+use Shopware\Models\Article\Image\Mapping;
+use Shopware\Models\Article\Image\Rule;
 use Shopware\Models\Article\Price;
+use Shopware\Models\Article\Repository;
 use Shopware\Models\Article\Unit;
 use Shopware\Models\Attribute\Article as ArticleAttributeModel;
 use Shopware\Models\Customer\Group as CustomerGroup;
@@ -50,7 +57,7 @@
 class Variant extends Resource implements BatchInterface
 {
     /**
-     * @return \Shopware\Models\Article\Repository
+     * @return Repository
      */
     public function getRepository()
     {
@@ -72,8 +79,8 @@ public function getOneByNumber($number, array $options = [])
     /**
      * @param int $id
      *
-     * @throws ApiException\NotFoundException
-     * @throws ApiException\ParameterMissingException
+     * @throws NotFoundException
+     * @throws ParameterMissingException
      *
      * @return array|Detail
      */
@@ -82,7 +89,7 @@ public function getOne($id, array $options = [])
         $this->checkPrivilege('read');
 
         if (empty($id)) {
-            throw new ApiException\ParameterMissingException('id');
+            throw new ParameterMissingException('id');
         }
 
         $builder = $this->getRepository()->getVariantDetailQuery();
@@ -93,17 +100,13 @@ public function getOne($id, array $options = [])
                 ->addOrderBy('prices.from', 'ASC')
                 ->setParameter('variantId', $id);
 
-        /** @var Detail|array $variant */
         $variant = $builder->getQuery()->getOneOrNullResult($this->getResultMode());
 
         if (!$variant) {
-            throw new ApiException\NotFoundException(sprintf('Variant by id %d not found', $id));
+            throw new NotFoundException(\sprintf('Variant by id %d not found', $id));
         }
 
-        if (($this->getResultMode() === self::HYDRATE_ARRAY)
-            && isset($options['considerTaxInput'])
-            && $options['considerTaxInput']
-        ) {
+        if (\is_array($variant) && !empty($options['considerTaxInput'])) {
             $variant = $this->considerTaxInput($variant);
         }
 
@@ -120,7 +123,6 @@ public function getList($offset = 0, $limit = 25, array $criteria = [], array $o
     {
         $this->checkPrivilege('read');
 
-        /** @var QueryBuilder $builder */
         $builder = $this->getRepository()->createQueryBuilder('detail');
 
         $builder->addSelect(['prices', 'attribute', 'partial article.{id,name,active,taxId}', 'customerGroup'])
@@ -133,6 +135,7 @@ public function getList($offset = 0, $limit = 25, array $criteria = [], array $o
                 ->setFirstResult($offset)
                 ->setMaxResults($limit);
 
+        /** @var Query<Detail|array<string, mixed>> $query */
         $query = $builder->getQuery();
 
         $query->setHydrationMode($this->getResultMode());
@@ -143,14 +146,13 @@ public function getList($offset = 0, $limit = 25, array $criteria = [], array $o
         $totalResult = $paginator->count();
 
         // Returns the product data
-        $variants = $paginator->getIterator()->getArrayCopy();
+        $variants = iterator_to_array($paginator);
 
-        if (($this->getResultMode() === self::HYDRATE_ARRAY)
-            && isset($options['considerTaxInput'])
-            && $options['considerTaxInput']
-        ) {
+        if ($this->getResultMode() === self::HYDRATE_ARRAY && !empty($options['considerTaxInput'])) {
             foreach ($variants as &$variant) {
-                $variant = $this->considerTaxInput($variant);
+                if (\is_array($variant)) {
+                    $variant = $this->considerTaxInput($variant);
+                }
             }
         }
 
@@ -162,22 +164,21 @@ public function getList($offset = 0, $limit = 25, array $criteria = [], array $o
      *
      * @param string $number
      *
-     * @throws ApiException\NotFoundException
-     * @throws ApiException\ParameterMissingException
+     * @throws NotFoundException
+     * @throws ParameterMissingException
      *
      * @return int
      */
     public function getIdFromNumber($number)
     {
         if (empty($number)) {
-            throw new ApiException\ParameterMissingException('id');
+            throw new ParameterMissingException('id');
         }
 
-        /** @var Detail|null $productVariant */
         $productVariant = $this->getRepository()->findOneBy(['number' => $number]);
 
         if (!$productVariant) {
-            throw new ApiException\NotFoundException(sprintf('Variant by number %s not found', $number));
+            throw new NotFoundException(\sprintf('Variant by number %s not found', $number));
         }
 
         return $productVariant->getId();
@@ -186,8 +187,8 @@ public function getIdFromNumber($number)
     /**
      * @param string $number
      *
-     * @throws ApiException\ParameterMissingException
-     * @throws ApiException\NotFoundException
+     * @throws ParameterMissingException
+     * @throws NotFoundException
      *
      * @return Detail
      */
@@ -201,8 +202,8 @@ public function deleteByNumber($number)
     /**
      * @param int $id
      *
-     * @throws ApiException\ParameterMissingException
-     * @throws ApiException\NotFoundException
+     * @throws ParameterMissingException
+     * @throws NotFoundException
      *
      * @return Detail
      */
@@ -211,14 +212,13 @@ public function delete($id)
         $this->checkPrivilege('delete');
 
         if (empty($id)) {
-            throw new ApiException\ParameterMissingException('id');
+            throw new ParameterMissingException('id');
         }
 
-        /** @var Detail|null $productVariant */
         $productVariant = $this->getRepository()->find($id);
 
-        if (!$productVariant) {
-            throw new ApiException\NotFoundException(sprintf('Variant by id %d not found', $id));
+        if (!$productVariant instanceof Detail) {
+            throw new NotFoundException(\sprintf('Variant by id %d not found', $id));
         }
 
         if ($productVariant->getKind() === 1) {
@@ -250,30 +250,29 @@ public function updateByNumber($number, array $params)
      *
      * @param int $id
      *
-     * @throws ApiException\ValidationException
-     * @throws ApiException\NotFoundException
-     * @throws ApiException\ParameterMissingException
+     * @throws ValidationException
+     * @throws NotFoundException
+     * @throws ParameterMissingException
      *
      * @return Detail
      */
     public function update($id, array $params)
     {
         if (empty($id)) {
-            throw new ApiException\ParameterMissingException('id');
+            throw new ParameterMissingException('id');
         }
 
-        /** @var Detail|null $variant */
         $variant = $this->getRepository()->find($id);
 
-        if (!$variant) {
-            throw new ApiException\NotFoundException(sprintf('Variant by id %d not found', $id));
+        if (!$variant instanceof Detail) {
+            throw new NotFoundException(\sprintf('Variant by id %d not found', $id));
         }
 
         $variant = $this->internalUpdate($id, $params, $variant->getArticle());
 
         $violations = $this->getManager()->validate($variant);
         if ($violations->count() > 0) {
-            throw new ApiException\ValidationException($violations);
+            throw new ValidationException($violations);
         }
 
         $this->flush();
@@ -285,9 +284,9 @@ public function update($id, array $params)
      * Creates a new variant for an product.
      * This function requires an articleId in the params parameter.
      *
-     * @throws ApiException\ValidationException
-     * @throws ApiException\NotFoundException
-     * @throws ApiException\ParameterMissingException
+     * @throws ValidationException
+     * @throws NotFoundException
+     * @throws ParameterMissingException
      *
      * @return Detail
      */
@@ -296,21 +295,20 @@ public function create(array $params)
         $productId = $params['articleId'];
 
         if (empty($productId)) {
-            throw new ApiException\ParameterMissingException('Passed parameter array does not contain an articleId property');
+            throw new ParameterMissingException('Passed parameter array does not contain an articleId property');
         }
 
-        /** @var ProductModel|null $product */
         $product = $this->getManager()->find(ProductModel::class, $productId);
 
         if (!$product) {
-            throw new ApiException\NotFoundException(sprintf('Product by id %d not found', $productId));
+            throw new NotFoundException(\sprintf('Product by id %d not found', $productId));
         }
 
         $variant = $this->internalCreate($params, $product);
 
         $violations = $this->getManager()->validate($variant);
         if ($violations->count() > 0) {
-            throw new ApiException\ValidationException($violations);
+            throw new ValidationException($violations);
         }
 
         $this->getManager()->persist($variant);
@@ -328,22 +326,21 @@ public function create(array $params)
      *
      * @param int $id
      *
-     * @throws ApiException\NotFoundException
-     * @throws ApiException\ParameterMissingException
+     * @throws NotFoundException
+     * @throws ParameterMissingException
      *
      * @return Detail
      */
     public function internalUpdate($id, array $data, ProductModel $article)
     {
         if (empty($id)) {
-            throw new ApiException\ParameterMissingException('id');
+            throw new ParameterMissingException('id');
         }
 
-        /** @var Detail|null $variant */
         $variant = $this->getRepository()->find($id);
 
-        if (!$variant) {
-            throw new ApiException\NotFoundException(sprintf('Variant by id %d not found', $id));
+        if (!$variant instanceof Detail) {
+            throw new NotFoundException(\sprintf('Variant by id %d not found', $id));
         }
 
         $variant->setArticle($article);
@@ -362,7 +359,7 @@ public function internalUpdate($id, array $data, ProductModel $article)
      * Required for the 'Article' resource if the product data is already updated
      * in the entity but not in the database.
      *
-     * @throws ApiException\ValidationException
+     * @throws ValidationException
      *
      * @return Detail
      */
@@ -411,14 +408,14 @@ public function createVariantImage(Image $articleImage, Detail $variant)
     /**
      * @param Collection|array $options
      *
-     * @return Image\Mapping
+     * @return Mapping
      */
     public function createImageMappingForOptions($options, Image $image)
     {
-        $mapping = new Image\Mapping();
+        $mapping = new Mapping();
         $mapping->setImage($image);
         foreach ($options as $option) {
-            $rule = new Image\Rule();
+            $rule = new Rule();
             $rule->setMapping($mapping);
             $rule->setOption($option);
             $mapping->getRules()->add($rule);
@@ -428,11 +425,6 @@ public function createImageMappingForOptions($options, Image $image)
         return $mapping;
     }
 
-    /**
-     * Returns the primary ID of any data set.
-     *
-     * {@inheritdoc}
-     */
     public function getIdByData($data)
     {
         $id = null;
@@ -442,7 +434,7 @@ public function getIdByData($data)
         } elseif (isset($data['number'])) {
             try {
                 $id = $this->getIdFromNumber($data['number']);
-            } catch (ApiException\NotFoundException $e) {
+            } catch (NotFoundException $e) {
                 return false;
             }
         }
@@ -465,7 +457,7 @@ public function getIdByData($data)
      */
     protected function getArticleResource()
     {
-        return $this->getContainer()->get(\Shopware\Components\Api\Resource\Article::class);
+        return $this->getContainer()->get(Article::class);
     }
 
     /**
@@ -473,13 +465,13 @@ protected function getArticleResource()
      */
     protected function getMediaResource()
     {
-        return $this->getContainer()->get(\Shopware\Components\Api\Resource\Media::class);
+        return $this->getContainer()->get(Media::class);
     }
 
     /**
      * Resolves the association data for a single variant.
      *
-     * @throws ApiException\CustomValidationException
+     * @throws CustomValidationException
      *
      * @return array|mixed
      */
@@ -515,10 +507,10 @@ protected function prepareData(array $data, ProductModel $article, Detail $varia
         if (!empty($data['number']) && $data['number'] !== $variant->getNumber()) {
             // Number changed, hence make sure it does not already exist in another variant
             $exists = $this->getContainer()
-                ->get(\Doctrine\DBAL\Connection::class)
+                ->get(Connection::class)
                 ->fetchColumn('SELECT id FROM s_articles_details WHERE ordernumber = ?', [$data['number']]);
             if ($exists) {
-                throw new ApiException\CustomValidationException(sprintf('A variant with the given order number "%s" already exists.', $data['number']));
+                throw new CustomValidationException(\sprintf('A variant with the given order number "%s" already exists.', $data['number']));
             }
         }
 
@@ -533,7 +525,7 @@ protected function prepareData(array $data, ProductModel $article, Detail $varia
      *
      * @param array $data
      *
-     * @throws ApiException\CustomValidationException
+     * @throws CustomValidationException
      *
      * @return array
      */
@@ -541,7 +533,6 @@ protected function prepareImageAssociation($data, ProductModel $article, Detail
     {
         if (empty($data['images'])) {
             if ($variant->getImages()->count() > 0) {
-                /** @var Image $image */
                 foreach ($variant->getImages() as $image) {
                     $mapping = $this->getVariantMappingOfImage($image, $variant);
 
@@ -566,17 +557,16 @@ protected function prepareImageAssociation($data, ProductModel $article, Detail
                 // First check if the media object is already assigned to the product
                 $image = $this->getAvailableMediaImage(
                     $article->getImages(),
-                    $imageData['mediaId']
+                    (int) $imageData['mediaId']
                 );
 
                 // Media image isn't assigned to the product?
                 if (!$image) {
                     // Find the media object and convert it to an product image.
-                    /** @var MediaModel|null $media */
                     $media = $this->getManager()->find(MediaModel::class, (int) $imageData['mediaId']);
 
                     if (!$media) {
-                        throw new ApiException\CustomValidationException(sprintf('Media by id %s not found', (int) $imageData['mediaId']));
+                        throw new CustomValidationException(\sprintf('Media by id %s not found', (int) $imageData['mediaId']));
                     }
 
                     $image = $this->getArticleResource()->createNewArticleImage($article, $media);
@@ -588,7 +578,7 @@ protected function prepareImageAssociation($data, ProductModel $article, Detail
                 );
                 $image = $this->getArticleResource()->createNewArticleImage($article, $media);
             } else {
-                throw new ApiException\CustomValidationException("One of the passed variant images doesn't contain a mediaId or link property!");
+                throw new CustomValidationException("One of the passed variant images doesn't contain a mediaId or link property!");
             }
 
             $variantImage = $this->createVariantImage(
@@ -614,17 +604,15 @@ protected function prepareImageAssociation($data, ProductModel $article, Detail
      * Helper function which returns a single image mapping
      * for the passed variant image and variant model.
      *
-     * @return Image\Mapping|null
+     * @return Mapping|null
      */
     protected function getVariantMappingOfImage(Image $image, Detail $variant)
     {
         $parent = $image->getParent();
 
-        /** @var Image\Mapping $mapping */
         foreach ($parent->getMappings() as $mapping) {
             $match = true;
 
-            /** @var Image\Rule $rule */
             foreach ($mapping->getRules() as $rule) {
                 $option = $this->getCollectionElementByProperty(
                     $variant->getConfiguratorOptions(),
@@ -647,7 +635,7 @@ protected function getVariantMappingOfImage(Image $image, Detail $variant)
     /**
      * @param array $data
      *
-     * @throws ApiException\CustomValidationException
+     * @throws CustomValidationException
      *
      * @return Collection
      */
@@ -656,7 +644,6 @@ protected function preparePriceAssociation($data, ProductModel $article, Detail
         $prices = $this->checkDataReplacement($variant->getPrices(), $data, 'prices', true);
 
         foreach ($data['prices'] as &$priceData) {
-            /** @var Price $price */
             $price = $this->getOneToManySubElement(
                 $prices,
                 $priceData,
@@ -676,9 +663,8 @@ protected function preparePriceAssociation($data, ProductModel $article, Detail
                 ->getRepository(CustomerGroup::class)
                 ->findOneBy(['key' => $priceData['customerGroupKey']]);
 
-            /** @var CustomerGroup $customerGroup */
             if (!$customerGroup instanceof CustomerGroup) {
-                throw new ApiException\CustomValidationException(sprintf('Customer Group by key %s not found', $priceData['customerGroupKey']));
+                throw new CustomValidationException(\sprintf('Customer Group by key %s not found', $priceData['customerGroupKey']));
             }
 
             $priceData['customerGroup'] = $customerGroup;
@@ -697,14 +683,14 @@ protected function preparePriceAssociation($data, ProductModel $article, Detail
      * Resolves the passed configuratorOptions parameter for a single variant.
      * Each passed configurator option, has to be configured in the product configurator set.
      *
-     * @throws ApiException\CustomValidationException
+     * @throws CustomValidationException
      *
      * @return array
      */
     protected function prepareConfigurator(array $data, ProductModel $article, Detail $variant)
     {
         if (!$article->getConfiguratorSet()) {
-            throw new ApiException\CustomValidationException('A configurator set has to be defined');
+            throw new CustomValidationException('A configurator set has to be defined');
         }
 
         $availableGroups = $article->getConfiguratorSet()->getGroups();
@@ -713,8 +699,8 @@ protected function prepareConfigurator(array $data, ProductModel $article, Detai
 
         foreach ($data['configuratorOptions'] as $optionData) {
             $availableGroup = $this->getAvailableGroup($availableGroups, [
-                'id' => $optionData['groupId'],
-                'name' => $optionData['group'],
+                'id' => $optionData['groupId'] ?? null,
+                'name' => $optionData['group'] ?? null,
             ]);
 
             // Group is in the product configurator set configured?
@@ -724,13 +710,13 @@ protected function prepareConfigurator(array $data, ProductModel $article, Detai
 
             // Check if the option is available in the configured product configurator set.
             $option = $this->getAvailableOption($availableGroup->getOptions(), [
-                'id' => $optionData['optionId'],
-                'name' => $optionData['option'],
+                'id' => $optionData['optionId'] ?? null,
+                'name' => $optionData['option'] ?? null,
             ]);
 
             if (!$option) {
                 if (!$optionData['option']) {
-                    throw new ApiException\CustomValidationException('A new configurator option requires a name');
+                    throw new CustomValidationException('A new configurator option requires a name');
                 }
 
                 $option = new Option();
@@ -773,7 +759,7 @@ protected function prepareAttributeAssociation($data, ProductModel $article, Det
      *
      * @param array $data
      *
-     * @throws ApiException\CustomValidationException
+     * @throws CustomValidationException
      *
      * @return array
      */
@@ -784,10 +770,10 @@ protected function prepareUnitAssociation($data)
             $data['unit'] = $this->getManager()->find(Unit::class, $data['unitId']);
 
             if (empty($data['unit'])) {
-                throw new ApiException\CustomValidationException(sprintf('Unit by id %s not found', $data['unitId']));
+                throw new CustomValidationException(\sprintf('Unit by id %s not found', $data['unitId']));
             }
 
-            // New unit data send? create new unit for this variant
+        // New unit data send? create new unit for this variant
         } elseif (!empty($data['unit'])) {
             $data['unit'] = $this->updateUnitReference($data['unit']);
         }
@@ -802,7 +788,7 @@ protected function prepareUnitAssociation($data)
      *
      * @param array $unitData
      *
-     * @throws ApiException\CustomValidationException
+     * @throws CustomValidationException
      *
      * @return Unit
      */
@@ -811,21 +797,20 @@ protected function updateUnitReference($unitData)
         $unitRepository = $this->getManager()->getRepository(Unit::class);
 
         // Try to find an existing unit by the passed conditions "id", "name" or "unit"
-        /** @var Unit|null $unit */
         $unit = $unitRepository->findOneBy(
             $this->getUnitFindCondition($unitData)
         );
 
         // Unit identifier send and unit not found? throw exception => Not allowed to create a new unit in this case
         if (!$unit && isset($unitData['id'])) {
-            throw new ApiException\CustomValidationException(sprintf('Unit by id %s not found', $unitData['id']));
+            throw new CustomValidationException(\sprintf('Unit by id %s not found', $unitData['id']));
         }
 
         // To create a new unit, the unit name and unit is required. Otherwise we throw an exception
         if (!$unit && isset($unitData['name'], $unitData['unit'])) {
             $unit = new Unit();
         } elseif (!$unit) {
-            throw new ApiException\CustomValidationException(sprintf('To create a unit you need to pass `name` and `unit`'));
+            throw new CustomValidationException(\sprintf('To create a unit you need to pass `name` and `unit`'));
         }
 
         $unit->fromArray($unitData);
@@ -834,11 +819,13 @@ protected function updateUnitReference($unitData)
     }
 
     /**
-     * @throws ApiException\CustomValidationException
+     * @param array<string, mixed> $variant
      *
-     * @return array
+     * @throws CustomValidationException
+     *
+     * @return array<string, mixed>
      */
-    private function considerTaxInput(array $variant)
+    private function considerTaxInput(array $variant): array
     {
         $tax = Shopware()->Db()->fetchOne(
             'SELECT tax
@@ -850,7 +837,7 @@ private function considerTaxInput(array $variant)
         );
 
         if (empty($tax)) {
-            throw new ApiException\CustomValidationException(sprintf('No product tax configured for variant: %s', $variant['id']));
+            throw new CustomValidationException(\sprintf('No product tax configured for variant: %s', $variant['id']));
         }
 
         $variant['prices'] = $this->getArticleResource()->getTaxPrices(
@@ -862,34 +849,34 @@ private function considerTaxInput(array $variant)
     }
 
     /**
-     * @param Collection|array $availableImages
-     * @param int              $mediaId
-     *
-     * @return bool|Image
+     * @param Collection<int, Image> $availableImages
      */
-    private function getAvailableMediaImage($availableImages, $mediaId)
+    private function getAvailableMediaImage(Collection $availableImages, int $mediaId): ?Image
     {
-        /** @var Image $image */
         foreach ($availableImages as $image) {
-            if ((int) $image->getMedia()->getId() === (int) $mediaId) {
+            if ($image->getMedia()->getId() === $mediaId) {
                 return $image;
             }
         }
 
-        return false;
+        return null;
     }
 
     /**
      * Calculates and merges the numeric values of the Price entity
      *
-     * @throws ApiException\CustomValidationException
+     * @param array<string, mixed> $priceData
+     *
+     * @throws CustomValidationException
+     *
+     * @return array<string, mixed>
      */
-    private function mergePriceData(array $priceData, Tax $tax)
+    private function mergePriceData(array $priceData, Tax $tax): array
     {
         if (\array_key_exists('from', $priceData)) {
             $priceData['from'] = (int) $priceData['from'];
             if ($priceData['from'] <= 0) {
-                throw new ApiException\CustomValidationException(sprintf('Invalid Price "from" value'));
+                throw new CustomValidationException(\sprintf('Invalid Price "from" value'));
             }
         }
         if (\array_key_exists('to', $priceData)) {
@@ -925,57 +912,55 @@ private function mergePriceData(array $priceData, Tax $tax)
      * Checks if the passed group data is already existing in the passed array collection.
      * The group data are checked for "id" and "name".
      *
-     * @param \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Article\Configurator\Group> $availableGroups
-     *
-     * @return false|Group
+     * @param Collection<int, Group> $availableGroups
+     * @param array<string, mixed>   $groupData
      */
-    private function getAvailableGroup($availableGroups, array $groupData)
+    private function getAvailableGroup(Collection $availableGroups, array $groupData): ?Group
     {
         // Convert string to lower case to avoid problems with case insensitivity in database
         // vs case sensitivity in PHP
-        $groupName = mb_strtolower($groupData['name']);
+        $groupName = mb_strtolower($groupData['name'] ?? '');
 
-        /** @var Group $availableGroup */
         foreach ($availableGroups as $availableGroup) {
             if (($groupData['id'] !== null && (int) $availableGroup->getId() === (int) $groupData['id'])
-                || (mb_strtolower($availableGroup->getName()) === $groupName && $groupData['name'] !== null)) {
+                || (mb_strtolower($availableGroup->getName()) === $groupName && $groupData['name'] !== null)
+            ) {
                 return $availableGroup;
             }
         }
 
-        return false;
+        return null;
     }
 
     /**
      * Checks if the passed option data is already existing in the passed array collection.
      * The option data are checked for "id" and "name".
      *
-     * @param \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Article\Configurator\Option> $availableOptions
-     *
-     * @return bool|Option
+     * @param Collection<int, Option> $availableOptions
+     * @param array<string, mixed>    $optionData
      */
-    private function getAvailableOption($availableOptions, array $optionData)
+    private function getAvailableOption(Collection $availableOptions, array $optionData): ?Option
     {
         // Convert string to lower case to avoid problems with case insensitivity in database
         // vs case sensitivity in PHP
-        $optionName = mb_strtolower($optionData['name']);
+        $optionName = mb_strtolower($optionData['name'] ?? '');
 
-        /** @var Option $availableOption */
         foreach ($availableOptions as $availableOption) {
             if ((mb_strtolower($availableOption->getName()) === $optionName && $optionData['name'] !== null)
-                || ((int) $availableOption->getId() === (int) $optionData['id'] && $optionData['id'] !== null)) {
+                || ((int) $availableOption->getId() === (int) $optionData['id'] && $optionData['id'] !== null)
+            ) {
                 return $availableOption;
             }
         }
 
-        return false;
+        return null;
     }
 
     /**
      * Helper function returns the findOneBy condition
      * for the passed unit data.
      *
-     * @throws ApiException\CustomValidationException
+     * @throws CustomValidationException
      *
      * @return array
      */
@@ -993,7 +978,7 @@ private function getUnitFindCondition(array $data)
             return ['name' => $data['name']];
         }
 
-        throw new ApiException\CustomValidationException(sprintf('To create a unit you need to pass `name` and `unit`'));
+        throw new CustomValidationException(\sprintf('To create a unit you need to pass `name` and `unit`'));
     }
 
     /**
@@ -1032,7 +1017,7 @@ private function prepareEsdAssociation($data, Detail $variant)
                 $saveFile = $esdDir . '/' . $saveFileName;
 
                 if (!is_writable($esdDir)) {
-                    throw new RuntimeException(sprintf('Unable to save ESD-file, as the directory "%s" is not writable.', $esdDir));
+                    throw new RuntimeException(\sprintf('Unable to save ESD-file, as the directory "%s" is not writable.', $esdDir));
                 }
 
                 copy($file, $saveFile);
@@ -1063,7 +1048,6 @@ private function prepareEsdAssociation($data, Detail $variant)
     private function prepareEsdSerialsAssociation($data, Esd $esd)
     {
         // Remove old serials
-        /** @var EsdSerial $serial */
         foreach ($esd->getSerials() as $serial) {
             $found = false;
             foreach ($data['esd']['serials'] as $newSerial) {
@@ -1084,7 +1068,6 @@ private function prepareEsdSerialsAssociation($data, Esd $esd)
         foreach ($data['esd']['serials'] as $newSerial) {
             $found = false;
 
-            /** @var EsdSerial $serial */
             foreach ($esd->getSerials() as $serial) {
                 if ($newSerial['serialnumber'] === $serial->getSerialnumber()) {
                     $found = true;
diff --git a/engine/Shopware/Components/AttributeSubscriber.php b/engine/Shopware/Components/AttributeSubscriber.php
index d64a8571de1..f19a400105e 100644
--- a/engine/Shopware/Components/AttributeSubscriber.php
+++ b/engine/Shopware/Components/AttributeSubscriber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
@@ -92,9 +92,9 @@ private function handleException($exception)
 
                 setcookie(self::redirectCookieString, '1', time() + 5);
                 $response->sendResponse();
-                exit();
+                exit;
             }
-            exit(sprintf("Failed to create the attribute models, please check the permissions of the '%s' directory", $generator->getPath()));
+            exit(\sprintf("Failed to create the attribute models, please check the permissions of the '%s' directory", $generator->getPath()));
         }
     }
 
diff --git a/engine/Shopware/Components/Auth.php b/engine/Shopware/Components/Auth.php
index 25bce13d69d..2fc9f2aa28a 100644
--- a/engine/Shopware/Components/Auth.php
+++ b/engine/Shopware/Components/Auth.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
@@ -37,7 +37,7 @@ class Shopware_Components_Auth extends Enlight_Components_Auth
     /**
      * Adapter that is current active - has a valid user session
      *
-     * @var \Zend_Auth_Adapter_Interface
+     * @var Zend_Auth_Adapter_Interface
      */
     protected $_baseAdapter; // Current active adapter
 
@@ -100,9 +100,9 @@ public function login($username, $password)
     /**
      * Set current active adapter
      *
-     * @param \Zend_Auth_Adapter_Interface|null $adapter
+     * @param Zend_Auth_Adapter_Interface|null $adapter
      *
-     * @return \Shopware_Components_Auth
+     * @return Shopware_Components_Auth
      */
     public function setBaseAdapter($adapter)
     {
@@ -114,7 +114,7 @@ public function setBaseAdapter($adapter)
     /**
      * Get current active adapter
      *
-     * @return \Zend_Auth_Adapter_Interface
+     * @return Zend_Auth_Adapter_Interface
      */
     public function getBaseAdapter()
     {
@@ -126,7 +126,7 @@ public function getBaseAdapter()
      *
      * @return Zend_Auth_Result
      */
-    public function authenticate(Zend_Auth_Adapter_Interface $adapter = null)
+    public function authenticate(?Zend_Auth_Adapter_Interface $adapter = null)
     {
         if ($adapter == null) {
             $adapter = $this->_baseAdapter;
@@ -138,7 +138,7 @@ public function authenticate(Zend_Auth_Adapter_Interface $adapter = null)
     /**
      * Refresh authentication - for example expire date -
      */
-    public function refresh(Zend_Auth_Adapter_Interface $adapter = null)
+    public function refresh(?Zend_Auth_Adapter_Interface $adapter = null)
     {
         if ($adapter == null) {
             $adapter = $this->getBaseAdapter();
@@ -165,7 +165,7 @@ public static function getInstance()
             self::$_instance = new self();
         }
 
-        /** @var \Shopware_Components_Auth $return */
+        /** @var Shopware_Components_Auth $return */
         $return = self::$_instance;
 
         return $return;
diff --git a/engine/Shopware/Components/Auth/Adapter/Default.php b/engine/Shopware/Components/Auth/Adapter/Default.php
index 0f20ec442a3..87f335d42ad 100644
--- a/engine/Shopware/Components/Auth/Adapter/Default.php
+++ b/engine/Shopware/Components/Auth/Adapter/Default.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Symfony\Component\HttpFoundation\Session\Session;
@@ -150,8 +150,8 @@ public function authenticate()
 
             // Reset failed login count
             $this->setFailedLogins(0);
-        } else {
-            // If more then 4 previous failed logins lock account for n * failedlogins seconds
+        } elseif ($user) {
+            // If more than 4 previous failed logins lock account for n * failedlogins seconds
             if ($user->failedlogins >= 4) {
                 $lockedUntil = new Zend_Date();
                 $lockedUntil->addSecond($this->lockSeconds * $user->failedlogins);
@@ -172,16 +172,16 @@ public function authenticate()
     }
 
     /**
-     * @deprecated in 5.6, will be private in 5.7
+     * @deprecated in 5.6, will be private in 5.8
      *
      * @param string $plaintext
      * @param string $hash
      * @param string $encoderName
+     *
+     * @return void
      */
     public function rehash($plaintext, $hash, $encoderName)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.7.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
-
         $newHash = Shopware()->PasswordEncoder()->reencodePassword($plaintext, $hash, $encoderName);
 
         if ($newHash === $hash) {
@@ -203,6 +203,8 @@ public function rehash($plaintext, $hash, $encoderName)
      *
      * @param string $plaintext
      * @param string $defaultEncoderName
+     *
+     * @return void
      */
     public function updateHash($plaintext, $defaultEncoderName)
     {
@@ -218,6 +220,9 @@ public function updateHash($plaintext, $defaultEncoderName)
         );
     }
 
+    /**
+     * @return void
+     */
     protected function updateExpiry()
     {
         if ($this->expiryColumn === null) {
@@ -225,6 +230,9 @@ protected function updateExpiry()
         }
 
         $user = $this->getResultRowObject();
+        if (!\is_object($user)) {
+            return;
+        }
 
         $this->_zendDb->update(
             $this->_tableName,
diff --git a/engine/Shopware/Components/Auth/Constraint/NoUrl.php b/engine/Shopware/Components/Auth/Constraint/NoUrl.php
new file mode 100644
index 00000000000..1a03b4fb85c
--- /dev/null
+++ b/engine/Shopware/Components/Auth/Constraint/NoUrl.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Components\Auth\Constraint;
+
+use Symfony\Component\Validator\Constraint;
+
+class NoUrl extends Constraint
+{
+    public function validatedBy(): string
+    {
+        return 'NoUrlValidator';
+    }
+}
diff --git a/engine/Shopware/Components/Auth/Constraint/NoUrlValidator.php b/engine/Shopware/Components/Auth/Constraint/NoUrlValidator.php
new file mode 100644
index 00000000000..caba7bfa5bb
--- /dev/null
+++ b/engine/Shopware/Components/Auth/Constraint/NoUrlValidator.php
@@ -0,0 +1,85 @@
+<?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Components\Auth\Constraint;
+
+use Shopware\Bundle\AccountBundle\Form\Account\PersonalFormType;
+use Shopware\Components\Validator\NoUrlValidatorInterface;
+use Shopware_Components_Snippet_Manager;
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+
+class NoUrlValidator extends ConstraintValidator
+{
+    public const SNIPPET_EMPTY_FIELD = [
+        'namespace' => 'frontend/account/internalMessages',
+        'name' => 'EmptyFieldError',
+        'default' => 'This field cannot be empty',
+    ];
+
+    private Shopware_Components_Snippet_Manager $snippets;
+
+    private NoUrlValidatorInterface $noUrlValidator;
+
+    public function __construct(
+        Shopware_Components_Snippet_Manager $snippets,
+        NoUrlValidatorInterface $noUrlValidator
+    ) {
+        $this->snippets = $snippets;
+        $this->noUrlValidator = $noUrlValidator;
+    }
+
+    /**
+     * @param string $text
+     */
+    public function validate($text, Constraint $constraint): void
+    {
+        if (!$constraint instanceof NoUrl) {
+            return;
+        }
+
+        if (empty($text)) {
+            $this->addError($this->getSnippet(self::SNIPPET_EMPTY_FIELD));
+        }
+
+        if (!$this->noUrlValidator->isValid($text)) {
+            $this->addError($this->getSnippet(PersonalFormType::SNIPPET_URL));
+        }
+    }
+
+    private function addError(string $message): void
+    {
+        $this->context
+            ->buildViolation($message)
+            ->addViolation();
+    }
+
+    /**
+     * @param array<string, string> $snippet with namespace, name and default value
+     */
+    private function getSnippet(array $snippet): string
+    {
+        return (string) $this->snippets->getNamespace($snippet['namespace'])->get($snippet['name'], $snippet['default'], true);
+    }
+}
diff --git a/engine/Shopware/Components/Auth/Constraint/UserEmail.php b/engine/Shopware/Components/Auth/Constraint/UserEmail.php
index ac3c9ffb453..6f79894c8a1 100644
--- a/engine/Shopware/Components/Auth/Constraint/UserEmail.php
+++ b/engine/Shopware/Components/Auth/Constraint/UserEmail.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Auth\Constraint;
diff --git a/engine/Shopware/Components/Auth/Constraint/UserEmailValidator.php b/engine/Shopware/Components/Auth/Constraint/UserEmailValidator.php
index 957bdf20a58..700a1ec1c0b 100644
--- a/engine/Shopware/Components/Auth/Constraint/UserEmailValidator.php
+++ b/engine/Shopware/Components/Auth/Constraint/UserEmailValidator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Auth\Constraint;
@@ -82,7 +82,7 @@ public function validate($email, Constraint $constraint)
         $userId = $constraint->getUserId();
 
         if (empty($email)) {
-            $this->addError($this->getSnippet(self::SNIPPET_MAIL_FAILURE));
+            $this->addError($this->getSnippet(NoUrlValidator::SNIPPET_EMPTY_FIELD));
         }
 
         if (!$this->emailValidator->isValid($email)) {
diff --git a/engine/Shopware/Components/Auth/Constraint/UserName.php b/engine/Shopware/Components/Auth/Constraint/UserName.php
index 6659537052c..f24e585316b 100644
--- a/engine/Shopware/Components/Auth/Constraint/UserName.php
+++ b/engine/Shopware/Components/Auth/Constraint/UserName.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Auth\Constraint;
diff --git a/engine/Shopware/Components/Auth/Constraint/UserNameValidator.php b/engine/Shopware/Components/Auth/Constraint/UserNameValidator.php
index 9977cde3a2e..7800d6aa0b8 100644
--- a/engine/Shopware/Components/Auth/Constraint/UserNameValidator.php
+++ b/engine/Shopware/Components/Auth/Constraint/UserNameValidator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Auth\Constraint;
@@ -82,7 +82,7 @@ public function validate($userName, Constraint $constraint)
         $userId = $constraint->getUserId();
 
         if (empty($userName)) {
-            $this->addError($this->getSnippet(self::SNIPPET_NAME_FAILURE));
+            $this->addError($this->getSnippet(NoUrlValidator::SNIPPET_EMPTY_FIELD));
         }
 
         if (!$this->userNameValidator->isValid($userName)) {
diff --git a/engine/Shopware/Components/Auth/Validator/UserValidator.php b/engine/Shopware/Components/Auth/Validator/UserValidator.php
index c5e287da073..f8042bd6c76 100644
--- a/engine/Shopware/Components/Auth/Validator/UserValidator.php
+++ b/engine/Shopware/Components/Auth/Validator/UserValidator.php
@@ -1,30 +1,31 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Auth\Validator;
 
 use Shopware\Components\Api\Exception\ValidationException;
+use Shopware\Components\Auth\Constraint\NoUrl;
 use Shopware\Components\Auth\Constraint\UserEmail;
 use Shopware\Components\Auth\Constraint\UserName;
 use Shopware\Models\User\User;
@@ -61,8 +62,9 @@ public function validate(User $user)
             new UserName([
                 'userId' => $user->getId(),
             ]),
+            new NoUrl(),
         ]);
-        $this->validateField('name', $user->getName(), [new NotBlank()]);
+        $this->validateField('name', $user->getName(), [new NotBlank(), new NoUrl()]);
         $this->validateField('role', $user->getRole(), [new NotBlank()]);
         $this->validateField('email', $user->getEmail(), [
             new UserEmail([
diff --git a/engine/Shopware/Components/Auth/Validator/UserValidatorInterface.php b/engine/Shopware/Components/Auth/Validator/UserValidatorInterface.php
index fd8af71f85e..5908055e543 100644
--- a/engine/Shopware/Components/Auth/Validator/UserValidatorInterface.php
+++ b/engine/Shopware/Components/Auth/Validator/UserValidatorInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Auth\Validator;
@@ -31,6 +31,8 @@ interface UserValidatorInterface
 {
     /**
      * @throws ValidationException
+     *
+     * @return void
      */
     public function validate(User $user);
 
diff --git a/engine/Shopware/Components/Backend/GlobalSearch.php b/engine/Shopware/Components/Backend/GlobalSearch.php
index a949dcf8a5a..18ace55097b 100644
--- a/engine/Shopware/Components/Backend/GlobalSearch.php
+++ b/engine/Shopware/Components/Backend/GlobalSearch.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Backend;
diff --git a/engine/Shopware/Components/BasketSignature/BasketPersister.php b/engine/Shopware/Components/BasketSignature/BasketPersister.php
index 3778e965975..f5e459dc6ed 100644
--- a/engine/Shopware/Components/BasketSignature/BasketPersister.php
+++ b/engine/Shopware/Components/BasketSignature/BasketPersister.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\BasketSignature;
diff --git a/engine/Shopware/Components/BasketSignature/BasketSignatureGenerator.php b/engine/Shopware/Components/BasketSignature/BasketSignatureGenerator.php
index 480f44fc9c7..933929063f3 100644
--- a/engine/Shopware/Components/BasketSignature/BasketSignatureGenerator.php
+++ b/engine/Shopware/Components/BasketSignature/BasketSignatureGenerator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\BasketSignature;
@@ -35,7 +35,7 @@ class BasketSignatureGenerator implements BasketSignatureGeneratorInterface
     public function generateSignature(array $basket, $customerId)
     {
         $items = array_map(
-            function (array $item) {
+            static function (array $item) {
                 return [
                     'ordernumber' => (string) $item['ordernumber'],
                     'quantity' => (float) $item['quantity'],
@@ -59,15 +59,15 @@ function (array $item) {
     }
 
     /**
-     * @param array<array{ordernumber: string, quantity: float, tax_rate: float, price: float}> $items
+     * @param array<string, array{ordernumber: string, quantity: float, tax_rate: float, price: float}> $items
      *
-     * @return array<array{ordernumber: string, quantity: float, tax_rate: float, price: float}>
+     * @return list<array{ordernumber: string, quantity: float, tax_rate: float, price: float}>
      */
     private function sortItems(array $items): array
     {
         usort(
             $items,
-            function (array $a, array $b) {
+            static function (array $a, array $b) {
                 if ($a['price'] < $b['price']) {
                     return 1;
                 }
@@ -96,6 +96,6 @@ function (array $a, array $b) {
             }
         );
 
-        return array_values($items);
+        return $items;
     }
 }
diff --git a/engine/Shopware/Components/BasketSignature/BasketSignatureGeneratorInterface.php b/engine/Shopware/Components/BasketSignature/BasketSignatureGeneratorInterface.php
index 92e3f6405a8..998819afb10 100644
--- a/engine/Shopware/Components/BasketSignature/BasketSignatureGeneratorInterface.php
+++ b/engine/Shopware/Components/BasketSignature/BasketSignatureGeneratorInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\BasketSignature;
diff --git a/engine/Shopware/Components/BasketSignature/CleanupSignatureSubscriber.php b/engine/Shopware/Components/BasketSignature/CleanupSignatureSubscriber.php
index 4d381d8a2f2..0b693fc1f4e 100644
--- a/engine/Shopware/Components/BasketSignature/CleanupSignatureSubscriber.php
+++ b/engine/Shopware/Components/BasketSignature/CleanupSignatureSubscriber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\BasketSignature;
diff --git a/engine/Shopware/Components/CSRFGetProtectionAware.php b/engine/Shopware/Components/CSRFGetProtectionAware.php
index 00f5926ec17..857b207c57f 100644
--- a/engine/Shopware/Components/CSRFGetProtectionAware.php
+++ b/engine/Shopware/Components/CSRFGetProtectionAware.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
diff --git a/engine/Shopware/Components/CSRFTokenValidationException.php b/engine/Shopware/Components/CSRFTokenValidationException.php
index e1f47fa45fb..966b60b16c0 100644
--- a/engine/Shopware/Components/CSRFTokenValidationException.php
+++ b/engine/Shopware/Components/CSRFTokenValidationException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
diff --git a/engine/Shopware/Components/CSRFTokenValidator.php b/engine/Shopware/Components/CSRFTokenValidator.php
index 07abc54d963..aac4d7eb7c8 100644
--- a/engine/Shopware/Components/CSRFTokenValidator.php
+++ b/engine/Shopware/Components/CSRFTokenValidator.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
@@ -41,47 +42,30 @@ class CSRFTokenValidator implements SubscriberInterface
     public const CSRF_TOKEN_ARGUMENT = '__csrf_token';
 
     public const CSRF_TOKEN_HEADER = 'X-CSRF-Token';
+    public const CSRF_TOKEN_RESPONSE_HEADER = 'x-csrf-token';
 
     private const CSRF_WAS_VALIDATED = 'isValidated';
 
-    /**
-     * @var ContainerInterface
-     */
-    private $container;
+    private ContainerInterface $container;
 
-    /**
-     * @var string
-     */
-    private $tokenName = self::CSRF_TOKEN_HEADER;
-
-    /**
-     * @var bool
-     */
-    private $isEnabledFrontend;
+    private bool $isEnabledFrontend;
 
-    /**
-     * @var bool
-     */
-    private $isEnabledBackend;
+    private bool $isEnabledBackend;
 
     private ContextServiceInterface $contextService;
 
     private Shopware_Components_Config $componentsConfig;
 
-    /**
-     * @param bool $isEnabledFrontend
-     * @param bool $isEnabledBackend
-     */
     public function __construct(
         ContainerInterface $container,
         ContextServiceInterface $contextService,
         Shopware_Components_Config $componentsConfig,
-        $isEnabledFrontend = true,
-        $isEnabledBackend = true
+        bool $isEnabledFrontend = true,
+        bool $isEnabledBackend = true
     ) {
         $this->container = $container;
-        $this->isEnabledFrontend = (bool) $isEnabledFrontend;
-        $this->isEnabledBackend = (bool) $isEnabledBackend;
+        $this->isEnabledFrontend = $isEnabledFrontend;
+        $this->isEnabledBackend = $isEnabledBackend;
         $this->contextService = $contextService;
         $this->componentsConfig = $componentsConfig;
     }
@@ -115,15 +99,18 @@ public function checkBackendTokenValidation(ActionEventArgs $args)
             return;
         }
 
-        $expected = $this->container->get('backendsession')->offsetGet($this->tokenName);
-        $token = $controller->Request()->getHeader($this->tokenName);
+        $expected = $this->container->get('backendsession')->offsetGet(self::CSRF_TOKEN_HEADER);
+        if (!\is_string($expected)) {
+            throw new CSRFTokenValidationException('The backend session does not contain a valid CSRF token');
+        }
+        $token = $controller->Request()->getHeader(self::CSRF_TOKEN_HEADER);
 
         if (empty($token)) {
             $token = $controller->Request()->getParam(self::CSRF_TOKEN_ARGUMENT);
         }
 
         if (!hash_equals($expected, $token)) {
-            throw new CSRFTokenValidationException(sprintf('The provided CSRF-Token is invalid. If you\'re sure that the request to path "%s" should be valid, the called controller action needs to be whitelisted using the CSRFWhitelistAware interface.', $controller->Request()->getRequestUri()));
+            throw new CSRFTokenValidationException(\sprintf('The provided CSRF-Token is invalid. If you\'re sure that the request to path "%s" should be valid, the called controller action needs to be whitelisted using the CSRFWhitelistAware interface.', $controller->Request()->getRequestUri()));
         }
     }
 
@@ -161,7 +148,7 @@ public function checkFrontendTokenValidation(Enlight_Event_EventArgs $args)
         }
 
         if (!$this->checkRequest($request)) {
-            throw new CSRFTokenValidationException(sprintf('The provided X-CSRF-Token for path "%s" is invalid. Please go back, reload the page and try again.', $request->getRequestUri()));
+            throw new CSRFTokenValidationException(\sprintf('The provided X-CSRF-Token for path "%s" is invalid. Please go back, reload the page and try again.', $request->getRequestUri()));
         }
 
         // mark request as validated to avoid double validation
@@ -173,23 +160,22 @@ public function clearExistingCookie(): void
         $shop = $this->contextService->getShopContext()->getShop();
         $name = $this->getCsrfName();
 
-        $front = $this->container->get('front');
-        $response = $front->Response();
-        $response->headers->clearCookie(
+        $response = $this->container->get('front')->Response();
+        $response->headers->setCookie(new Cookie(
             $name,
-            sprintf('%s/', $shop->getPath() ?: ''),
+            Random::getAlphanumericString(30),
+            0,
+            \sprintf('%s/', $shop->getPath() ?: ''),
             '',
             $shop->getSecure(),
             false
-        );
+        ));
     }
 
     /**
      * Check if the submitted CSRF token matches with the token stored in the cookie or header
-     *
-     * @return bool
      */
-    private function checkRequest(Request $request)
+    private function checkRequest(Request $request): bool
     {
         $name = $this->getCsrfName();
 
@@ -236,7 +222,7 @@ private function isWhitelisted(Enlight_Controller_Action $controller): bool
         $whitelistedActions = $controller->getWhitelistedCSRFActions();
         $whitelistedActions = array_map('strtolower', $whitelistedActions);
 
-        return \in_array($calledAction, $whitelistedActions);
+        return \in_array($calledAction, $whitelistedActions, true);
     }
 
     /**
@@ -254,6 +240,6 @@ private function isProtected(Enlight_Controller_Action $controller): bool
         $protectedActions = $controller->getCSRFProtectedActions();
         $protectedActions = array_map('strtolower', $protectedActions);
 
-        return \in_array($calledAction, $protectedActions);
+        return \in_array($calledAction, $protectedActions, true);
     }
 }
diff --git a/engine/Shopware/Components/CSRFWhitelistAware.php b/engine/Shopware/Components/CSRFWhitelistAware.php
index d1b399606b7..f8e004fec8a 100644
--- a/engine/Shopware/Components/CSRFWhitelistAware.php
+++ b/engine/Shopware/Components/CSRFWhitelistAware.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
@@ -29,7 +30,7 @@ interface CSRFWhitelistAware
     /**
      * Returns a list with actions which should not be validated for CSRF protection
      *
-     * @return string[]
+     * @return list<string>
      */
     public function getWhitelistedCSRFActions();
 }
diff --git a/engine/Shopware/Components/CacheManager.php b/engine/Shopware/Components/CacheManager.php
index 7c339426e59..28991271e01 100644
--- a/engine/Shopware/Components/CacheManager.php
+++ b/engine/Shopware/Components/CacheManager.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
@@ -283,7 +283,7 @@ public function clearProxyCache()
 
     public function clearOpCache()
     {
-        if (\extension_loaded('Zend OPcache') && ini_get('opcache.enable')) {
+        if (\extension_loaded('Zend OPcache') && \ini_get('opcache.enable')) {
             opcache_reset();
         }
     }
@@ -413,16 +413,24 @@ public function getShopwareProxyCacheInfo()
      */
     public function getOpCacheCacheInfo()
     {
-        $info = [];
-        if (\extension_loaded('Zend OPcache') && ini_get('opcache.enable')) {
-            $status = opcache_get_status(false);
-            $info['files'] = $status['opcache_statistics']['num_cached_scripts'];
-            $info['size'] = $this->encodeSize($status['memory_usage']['used_memory']);
-            $info['freeSpace'] = $this->encodeSize($status['memory_usage']['free_memory']);
-        } else {
+        $info = ['name' => 'Zend OPcache'];
+
+        if (!\function_exists('opcache_get_status')) {
             $info['message'] = 'Zend OPcache is not available';
+
+            return $info;
         }
-        $info['name'] = 'Zend OPcache';
+
+        $status = \opcache_get_status(false);
+        if ($status === false) {
+            $info['message'] = 'Zend OPcache status is not available';
+
+            return $info;
+        }
+
+        $info['files'] = $status['opcache_statistics']['num_cached_scripts'];
+        $info['size'] = $this->encodeSize($status['memory_usage']['used_memory']);
+        $info['freeSpace'] = $this->encodeSize($status['memory_usage']['free_memory']);
 
         return $info;
     }
@@ -440,7 +448,7 @@ public function getDirectoryInfo($dir)
     {
         $info = [];
         $info['dir'] = str_replace($this->docRoot . '/', '', $dir);
-        $info['dir'] = str_replace(DIRECTORY_SEPARATOR, '/', $info['dir']);
+        $info['dir'] = str_replace(\DIRECTORY_SEPARATOR, '/', $info['dir']);
         $info['dir'] = rtrim($info['dir'], '/') . '/';
 
         if (!file_exists($dir) || !is_dir($dir)) {
@@ -575,14 +583,14 @@ private function clearDirectory(string $dir): void
         $finder = new Finder();
 
         $tempFileExtension = 'sw_bak';
-        $tempFileName = sprintf('%s_%s.%s', $dir, uniqid(), $tempFileExtension);
+        $tempFileName = \sprintf('%s_%s.%s', $dir, uniqid(), $tempFileExtension);
 
         // Move the existing cache to a temporary new location prior to deletion, so it won't be written to in the meantime
         $fileSystem->rename($dir, $tempFileName);
 
         $finder->directories()
             ->in(\dirname($dir, 1))
-            ->name(sprintf('*.%s', $tempFileExtension));
+            ->name(\sprintf('*.%s', $tempFileExtension));
 
         if ($finder->hasResults()) {
             $fileSystem->remove($finder);
diff --git a/engine/Shopware/Components/CacheSubscriber.php b/engine/Shopware/Components/CacheSubscriber.php
index 56b9fc2b3a9..b716f0e0886 100644
--- a/engine/Shopware/Components/CacheSubscriber.php
+++ b/engine/Shopware/Components/CacheSubscriber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
@@ -60,7 +60,7 @@ public static function getSubscribedEvents(): array
 
     public function onConfigElement(Enlight_Event_EventArgs $args): void
     {
-        /** @var \Shopware\Models\Config\Value $entity */
+        /** @var Value $entity */
         $entity = $args->get('entity');
 
         $this->addTagsConfigValue($entity);
diff --git a/engine/Shopware/Components/Captcha/AbstractCaptcha.php b/engine/Shopware/Components/Captcha/AbstractCaptcha.php
index fe3005887a5..aca0f487381 100644
--- a/engine/Shopware/Components/Captcha/AbstractCaptcha.php
+++ b/engine/Shopware/Components/Captcha/AbstractCaptcha.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Captcha;
@@ -34,20 +33,12 @@
 abstract class AbstractCaptcha implements CaptchaInterface
 {
     private const PATH_CAPTCHA_IMAGE = 'frontend/_public/src/img/bg--captcha.jpg';
-    private const PATH_CAPTCHA_IMAGE_FALLBACK = 'frontend/_resources/images/captcha/background.jpg';
 
     private const PATH_CAPTCHA_FONT = 'frontend/_public/src/fonts/captcha.ttf';
-    private const PATH_CAPTCHA_FONT_FALLBACK = 'frontend/_resources/images/captcha/font.ttf';
 
-    /**
-     * @var Shopware_Components_Config
-     */
-    protected $config;
+    protected Shopware_Components_Config $config;
 
-    /**
-     * @var Enlight_Template_Manager
-     */
-    private $templateManager;
+    private Enlight_Template_Manager $templateManager;
 
     public function __construct(
         Shopware_Components_Config $config,
@@ -69,14 +60,6 @@ protected function getImageResource($string)
         $captcha = $this->getCaptchaFile(self::PATH_CAPTCHA_IMAGE);
         $font = $this->getCaptchaFile(self::PATH_CAPTCHA_FONT);
 
-        if (empty($captcha)) {
-            $captcha = $this->getCaptchaFile(self::PATH_CAPTCHA_IMAGE_FALLBACK);
-        }
-
-        if (empty($font)) {
-            $font = $this->getCaptchaFile(self::PATH_CAPTCHA_FONT_FALLBACK);
-        }
-
         if (!empty($captcha)) {
             $im = imagecreatefromjpeg($captcha);
         } else {
@@ -89,16 +72,24 @@ protected function getImageResource($string)
 
         if (!empty($this->config->get('CaptchaColor'))) {
             $colors = explode(',', $this->config->get('CaptchaColor'));
+            $colors = array_map(static function ($color): int {
+                $color = (int) $color;
+                if ($color < 0 || $color > 255) {
+                    return 0;
+                }
+
+                return $color;
+            }, $colors);
         } else {
-            $colors = explode(',', '255,0,0');
+            $colors = [255, 0, 0];
         }
 
-        $black = (int) imagecolorallocate($im, (int) $colors[0], (int) $colors[1], (int) $colors[2]);
+        $black = (int) imagecolorallocate($im, $colors[0], $colors[1], $colors[2]);
 
         $string = implode(' ', str_split($string));
 
         if (!empty($font)) {
-            for ($i = 0, $iMax = \strlen($string); $i <= $iMax; ++$i) {
+            for ($i = 0, $iMax = \strlen($string); $i < $iMax; ++$i) {
                 $rand1 = Random::getInteger(35, 40);
                 $rand2 = Random::getInteger(15, 20);
                 $rand3 = Random::getInteger(60, 70);
@@ -106,10 +97,8 @@ protected function getImageResource($string)
                 imagettftext($im, $rand1, $rand2, (($i + 1) * 15) + 2, $rand3 + 2, $black, $font, $string[$i]);
             }
             for ($i = 0; $i < 8; ++$i) {
-                imageline($im, Random::getInteger(30, 70), Random::getInteger(0, 50), Random::getInteger(100, 150),
-                    Random::getInteger(20, 100), $black);
-                imageline($im, Random::getInteger(30, 70), Random::getInteger(0, 50), Random::getInteger(100, 150),
-                    Random::getInteger(20, 100), $black);
+                imageline($im, Random::getInteger(30, 70), Random::getInteger(0, 50), Random::getInteger(100, 150), Random::getInteger(20, 100), $black);
+                imageline($im, Random::getInteger(30, 70), Random::getInteger(0, 50), Random::getInteger(100, 150), Random::getInteger(20, 100), $black);
             }
         } else {
             $white = (int) imagecolorallocate($im, 255, 255, 255);
diff --git a/engine/Shopware/Components/Captcha/CaptchaInterface.php b/engine/Shopware/Components/Captcha/CaptchaInterface.php
index a9bdec93b14..eed04a85b50 100644
--- a/engine/Shopware/Components/Captcha/CaptchaInterface.php
+++ b/engine/Shopware/Components/Captcha/CaptchaInterface.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Captcha;
diff --git a/engine/Shopware/Components/Captcha/CaptchaRepository.php b/engine/Shopware/Components/Captcha/CaptchaRepository.php
index 44ac8f1ace9..20ef177a302 100644
--- a/engine/Shopware/Components/Captcha/CaptchaRepository.php
+++ b/engine/Shopware/Components/Captcha/CaptchaRepository.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Captcha;
@@ -32,20 +33,14 @@
 
 class CaptchaRepository
 {
-    /**
-     * @var Shopware_Components_Config
-     */
-    private $config;
+    private Shopware_Components_Config $config;
 
     /**
-     * @var CaptchaInterface[]
+     * @var list<CaptchaInterface>
      */
-    private $captchas;
+    private array $captchas;
 
-    /**
-     * @var ContainerInterface
-     */
-    private $container;
+    private ContainerInterface $container;
 
     public function __construct(
         IteratorAggregate $captchas,
@@ -80,7 +75,7 @@ public function getConfiguredCaptcha()
     }
 
     /**
-     * @return CaptchaInterface[]
+     * @return list<CaptchaInterface>
      */
     public function getList()
     {
@@ -99,31 +94,25 @@ public function getList()
     public function getCaptchaByName($captchaName)
     {
         foreach ($this->captchas as $captcha) {
-            if ($captcha->getName() == $captchaName) {
+            if ($captcha->getName() === $captchaName) {
                 return $captcha;
             }
         }
 
-        throw new CaptchaNotFoundException(sprintf("The captcha with id '%s' is configured, but could not be found", $captchaName));
+        throw new CaptchaNotFoundException(\sprintf("The captcha with id '%s' is configured, but could not be found", $captchaName));
     }
 
-    /**
-     * @return bool
-     */
-    private function isCaptchaDisabled()
+    private function isCaptchaDisabled(): bool
     {
-        $userIsLoggedIn = !empty($this->container->get('session')->get('sUserId'));
+        $isCustomerLoggedIn = !empty($this->container->get('session')->get('sUserId'));
 
-        if ($this->config->get('noCaptchaAfterLogin') && $userIsLoggedIn) {
+        if ($this->config->get('noCaptchaAfterLogin') && $isCustomerLoggedIn) {
             return true;
         }
 
         // legacy way to disable the captcha
         $captchaColor = $this->config->get('CaptchaColor');
-        if (empty($captchaColor)) {
-            return true;
-        }
 
-        return false;
+        return empty($captchaColor);
     }
 }
diff --git a/engine/Shopware/Components/Captcha/CaptchaValidator.php b/engine/Shopware/Components/Captcha/CaptchaValidator.php
index 86025821da6..b2ca66839f4 100644
--- a/engine/Shopware/Components/Captcha/CaptchaValidator.php
+++ b/engine/Shopware/Components/Captcha/CaptchaValidator.php
@@ -1,37 +1,36 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Captcha;
 
 use Enlight_Controller_Request_Request;
+use Shopware\Components\Captcha\Exception\CaptchaNotFoundException;
 
 class CaptchaValidator
 {
-    /**
-     * @var CaptchaRepository
-     */
-    private $repository;
+    private CaptchaRepository $repository;
 
     public function __construct(CaptchaRepository $repository)
     {
@@ -41,6 +40,8 @@ public function __construct(CaptchaRepository $repository)
     /**
      * Validates a Request using the currently configured captcha
      *
+     * @throws CaptchaNotFoundException
+     *
      * @return bool
      */
     public function validate(Enlight_Controller_Request_Request $request)
@@ -56,12 +57,12 @@ public function validate(Enlight_Controller_Request_Request $request)
      *
      * @param string $name
      *
+     * @throws CaptchaNotFoundException
+     *
      * @return bool
      */
     public function validateByName($name, Enlight_Controller_Request_Request $request)
     {
-        $captcha = $this->repository->getCaptchaByName($name);
-
-        return $captcha->validate($request);
+        return $this->repository->getCaptchaByName($name)->validate($request);
     }
 }
diff --git a/engine/Shopware/Components/Captcha/DefaultCaptcha.php b/engine/Shopware/Components/Captcha/DefaultCaptcha.php
index 30af0e923a2..a7736616c8e 100644
--- a/engine/Shopware/Components/Captcha/DefaultCaptcha.php
+++ b/engine/Shopware/Components/Captcha/DefaultCaptcha.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Captcha;
@@ -35,10 +36,7 @@ class DefaultCaptcha extends AbstractCaptcha
     public const SESSION_KEY = __CLASS__ . '_sRandom';
     public const CAPTCHA_METHOD = 'default';
 
-    /**
-     * @var ContainerInterface
-     */
-    private $container;
+    private ContainerInterface $container;
 
     public function __construct(
         ContainerInterface $container,
@@ -66,7 +64,7 @@ public function validate(Enlight_Controller_Request_Request $request)
 
         unset($captchaArray[$request->get('sCaptcha')]);
 
-        $this->container->get('session')->offsetSet(self::SESSION_KEY, $captchaArray);
+        $this->container->get('session')->set(self::SESSION_KEY, $captchaArray);
 
         return true;
     }
@@ -86,7 +84,6 @@ public function getTemplateData()
         imagedestroy($imgResource);
         $img = base64_encode($img);
 
-        /** @var string[] $sRandArray */
         $sRandArray = $this->container->get('session')->get(self::SESSION_KEY, []);
 
         $threshold = 51;
@@ -96,7 +93,7 @@ public function getTemplateData()
 
         $sRandArray[$string] = true;
 
-        $this->container->get('session')->offsetSet(self::SESSION_KEY, $sRandArray);
+        $this->container->get('session')->set(self::SESSION_KEY, $sRandArray);
 
         return ['img' => $img];
     }
diff --git a/engine/Shopware/Components/Captcha/Exception/CaptchaNotFoundException.php b/engine/Shopware/Components/Captcha/Exception/CaptchaNotFoundException.php
index 1ed15427005..f64c0114f53 100644
--- a/engine/Shopware/Components/Captcha/Exception/CaptchaNotFoundException.php
+++ b/engine/Shopware/Components/Captcha/Exception/CaptchaNotFoundException.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Captcha\Exception;
diff --git a/engine/Shopware/Components/Captcha/HoneypotCaptcha.php b/engine/Shopware/Components/Captcha/HoneypotCaptcha.php
index a19339fabf0..1551e223add 100644
--- a/engine/Shopware/Components/Captcha/HoneypotCaptcha.php
+++ b/engine/Shopware/Components/Captcha/HoneypotCaptcha.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Captcha;
diff --git a/engine/Shopware/Components/Captcha/LegacyCaptcha.php b/engine/Shopware/Components/Captcha/LegacyCaptcha.php
index feb4bedd0eb..2545440f9b8 100644
--- a/engine/Shopware/Components/Captcha/LegacyCaptcha.php
+++ b/engine/Shopware/Components/Captcha/LegacyCaptcha.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Captcha;
diff --git a/engine/Shopware/Components/Captcha/NoCaptcha.php b/engine/Shopware/Components/Captcha/NoCaptcha.php
index ef8cdac3ff2..9b30fe48db8 100644
--- a/engine/Shopware/Components/Captcha/NoCaptcha.php
+++ b/engine/Shopware/Components/Captcha/NoCaptcha.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Captcha;
diff --git a/engine/Shopware/Components/Cart/BasketHelper.php b/engine/Shopware/Components/Cart/BasketHelper.php
index 414e87c8bb0..8bbec92ff12 100644
--- a/engine/Shopware/Components/Cart/BasketHelper.php
+++ b/engine/Shopware/Components/Cart/BasketHelper.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Cart;
diff --git a/engine/Shopware/Components/Cart/BasketHelperInterface.php b/engine/Shopware/Components/Cart/BasketHelperInterface.php
index 7f498490b3a..084d37a3843 100644
--- a/engine/Shopware/Components/Cart/BasketHelperInterface.php
+++ b/engine/Shopware/Components/Cart/BasketHelperInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Cart;
@@ -31,6 +31,9 @@ interface BasketHelperInterface
     public const DISCOUNT_ABSOLUTE = 1;
     public const DISCOUNT_PERCENT = 2;
 
+    /**
+     * @return void
+     */
     public function addProportionalDiscount(DiscountContext $discountContext);
 
     /**
diff --git a/engine/Shopware/Components/Cart/BasketQueryHelper.php b/engine/Shopware/Components/Cart/BasketQueryHelper.php
index bf3de0923be..533f6838556 100644
--- a/engine/Shopware/Components/Cart/BasketQueryHelper.php
+++ b/engine/Shopware/Components/Cart/BasketQueryHelper.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Cart;
diff --git a/engine/Shopware/Components/Cart/BasketQueryHelperInterface.php b/engine/Shopware/Components/Cart/BasketQueryHelperInterface.php
index b25ee131526..1fa1c2ef6b8 100644
--- a/engine/Shopware/Components/Cart/BasketQueryHelperInterface.php
+++ b/engine/Shopware/Components/Cart/BasketQueryHelperInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Cart;
@@ -46,7 +46,7 @@ public function getPositionPricesQuery(DiscountContext $discountContext);
     public function getInsertDiscountQuery(DiscountContext $discountContext);
 
     /**
-     * @return \Doctrine\DBAL\Query\QueryBuilder
+     * @return QueryBuilder
      */
     public function getInsertDiscountAttributeQuery(DiscountContext $discountContext);
 
diff --git a/engine/Shopware/Components/Cart/CartMigration.php b/engine/Shopware/Components/Cart/CartMigration.php
index 9691b236285..c8635c901f4 100644
--- a/engine/Shopware/Components/Cart/CartMigration.php
+++ b/engine/Shopware/Components/Cart/CartMigration.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Cart;
diff --git a/engine/Shopware/Components/Cart/CartMigrationCleaner.php b/engine/Shopware/Components/Cart/CartMigrationCleaner.php
index 6d1894ee7f7..6d9dbb97e8e 100644
--- a/engine/Shopware/Components/Cart/CartMigrationCleaner.php
+++ b/engine/Shopware/Components/Cart/CartMigrationCleaner.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Cart;
diff --git a/engine/Shopware/Components/Cart/CartMigrationCleanerInterface.php b/engine/Shopware/Components/Cart/CartMigrationCleanerInterface.php
index 6097b4c8aa0..c4f63c100e9 100644
--- a/engine/Shopware/Components/Cart/CartMigrationCleanerInterface.php
+++ b/engine/Shopware/Components/Cart/CartMigrationCleanerInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Cart;
diff --git a/engine/Shopware/Components/Cart/CartMigrationInterface.php b/engine/Shopware/Components/Cart/CartMigrationInterface.php
index 2d7cc2918f5..eb79885e631 100644
--- a/engine/Shopware/Components/Cart/CartMigrationInterface.php
+++ b/engine/Shopware/Components/Cart/CartMigrationInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Cart;
diff --git a/engine/Shopware/Components/Cart/CartOrderNumberProvider.php b/engine/Shopware/Components/Cart/CartOrderNumberProvider.php
index 46cd5a821ff..d79cf889287 100644
--- a/engine/Shopware/Components/Cart/CartOrderNumberProvider.php
+++ b/engine/Shopware/Components/Cart/CartOrderNumberProvider.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Cart;
diff --git a/engine/Shopware/Components/Cart/CartOrderNumberProviderInterface.php b/engine/Shopware/Components/Cart/CartOrderNumberProviderInterface.php
index a1188b52f7e..7364317633d 100644
--- a/engine/Shopware/Components/Cart/CartOrderNumberProviderInterface.php
+++ b/engine/Shopware/Components/Cart/CartOrderNumberProviderInterface.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Cart;
diff --git a/engine/Shopware/Components/Cart/CartPersistService.php b/engine/Shopware/Components/Cart/CartPersistService.php
index eabbb213729..e98d4331fa1 100644
--- a/engine/Shopware/Components/Cart/CartPersistService.php
+++ b/engine/Shopware/Components/Cart/CartPersistService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Cart;
@@ -30,25 +30,19 @@
 
 class CartPersistService implements CartPersistServiceInterface
 {
-    /**
-     * @var Connection
-     */
-    private $connection;
+    private Connection $connection;
 
-    /**
-     * @var Session
-     */
-    private $session;
+    private Session $session;
 
     /**
-     * @var array
+     * @var array<int, array<string, mixed>>
      */
-    private $cart;
+    private array $cart = [];
 
     /**
-     * @var array
+     * @var array<int, array<string, mixed>>
      */
-    private $cartAttributes;
+    private array $cartAttributes = [];
 
     public function __construct(Connection $connection, Session $session)
     {
diff --git a/engine/Shopware/Components/Cart/CartPersistServiceInterface.php b/engine/Shopware/Components/Cart/CartPersistServiceInterface.php
index a1681cfa8ec..3ea2e0ec662 100644
--- a/engine/Shopware/Components/Cart/CartPersistServiceInterface.php
+++ b/engine/Shopware/Components/Cart/CartPersistServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Cart;
diff --git a/engine/Shopware/Components/Cart/ConditionalLineItemService.php b/engine/Shopware/Components/Cart/ConditionalLineItemService.php
index 9b2bdfb60a5..dbcc1d1cb60 100644
--- a/engine/Shopware/Components/Cart/ConditionalLineItemService.php
+++ b/engine/Shopware/Components/Cart/ConditionalLineItemService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Cart;
@@ -32,33 +32,23 @@
 
 class ConditionalLineItemService implements ConditionalLineItemServiceInterface
 {
-    /**
-     * @var System
-     */
-    private $system;
+    private System $system;
 
-    /**
-     * @var Session
-     */
-    private $session;
+    private Session $session;
 
-    /**
-     * @var Config
-     */
-    private $config;
+    private Config $config;
 
-    /**
-     * @var BasketHelperInterface
-     */
-    private $basketHelper;
+    private BasketHelperInterface $basketHelper;
 
-    /**
-     * @var Connection
-     */
-    private $connection;
+    private Connection $connection;
 
-    public function __construct(System $sSystem, Session $session, Config $config, BasketHelperInterface $basketHelper, Connection $connection)
-    {
+    public function __construct(
+        System $sSystem,
+        Session $session,
+        Config $config,
+        BasketHelperInterface $basketHelper,
+        Connection $connection
+    ) {
         $this->system = $sSystem;
         $this->session = $session;
         $this->config = $config;
@@ -68,9 +58,9 @@ public function __construct(System $sSystem, Session $session, Config $config, B
 
     public function addConditionalLineItem(string $name, string $orderNumber, float $price, float $tax, int $mode): void
     {
-        $currencyFactor = empty($this->system->sCurrency['factor']) ? 1 : $this->system->sCurrency['factor'];
+        $currencyFactor = (float) (empty($this->system->sCurrency['factor']) ? 1 : $this->system->sCurrency['factor']);
         $taxFree = empty($this->system->sUSERGROUPDATA['tax']) && !empty($this->system->sUSERGROUPDATA['id']);
-        $sessionId = $this->session->get('sessionId');
+        $sessionId = (string) $this->session->get('sessionId');
 
         if ($taxFree) {
             $netPrice = $price;
@@ -108,6 +98,8 @@ public function addConditionalLineItem(string $name, string $orderNumber, float
                     'currencyFactor' => $currencyFactor,
                 ]
             );
+
+            $this->connection->insert('s_order_basket_attributes', ['basketID' => (int) $this->connection->lastInsertId()]);
         }
     }
 }
diff --git a/engine/Shopware/Components/Cart/ConditionalLineItemServiceInterface.php b/engine/Shopware/Components/Cart/ConditionalLineItemServiceInterface.php
index ab2bf471967..2f16e59dbf6 100644
--- a/engine/Shopware/Components/Cart/ConditionalLineItemServiceInterface.php
+++ b/engine/Shopware/Components/Cart/ConditionalLineItemServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Cart;
diff --git a/engine/Shopware/Components/Cart/NetRounding/RoundLineAfterQuantity.php b/engine/Shopware/Components/Cart/NetRounding/RoundLineAfterQuantity.php
index 39c6526da5d..52b1b88f1fd 100644
--- a/engine/Shopware/Components/Cart/NetRounding/RoundLineAfterQuantity.php
+++ b/engine/Shopware/Components/Cart/NetRounding/RoundLineAfterQuantity.php
@@ -1,32 +1,32 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Cart\NetRounding;
 
 class RoundLineAfterQuantity implements RoundingInterface
 {
-    public function round(float $netPrice, float $tax, int $quantity = null): float
+    public function round(float $netPrice, float $tax, ?int $quantity = null): float
     {
         if ($quantity === 0) {
             return 0.0;
diff --git a/engine/Shopware/Components/Cart/NetRounding/RoundLineAfterTax.php b/engine/Shopware/Components/Cart/NetRounding/RoundLineAfterTax.php
index 6e71ae0944a..fdb6e27ca7b 100644
--- a/engine/Shopware/Components/Cart/NetRounding/RoundLineAfterTax.php
+++ b/engine/Shopware/Components/Cart/NetRounding/RoundLineAfterTax.php
@@ -1,32 +1,32 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Cart\NetRounding;
 
 class RoundLineAfterTax implements RoundingInterface
 {
-    public function round(float $netPrice, float $tax, int $quantity = null): float
+    public function round(float $netPrice, float $tax, ?int $quantity = null): float
     {
         if ($quantity === 0) {
             return 0.0;
diff --git a/engine/Shopware/Components/Cart/NetRounding/RoundingInterface.php b/engine/Shopware/Components/Cart/NetRounding/RoundingInterface.php
index 1ee8e44e93f..d55975c378d 100644
--- a/engine/Shopware/Components/Cart/NetRounding/RoundingInterface.php
+++ b/engine/Shopware/Components/Cart/NetRounding/RoundingInterface.php
@@ -1,30 +1,30 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Cart\NetRounding;
 
 interface RoundingInterface
 {
-    public function round(float $netPrice, float $tax, int $quantity = null): float;
+    public function round(float $netPrice, float $tax, ?int $quantity = null): float;
 }
diff --git a/engine/Shopware/Components/Cart/PaymentTokenService.php b/engine/Shopware/Components/Cart/PaymentTokenService.php
index bdb109b81e8..56100829536 100644
--- a/engine/Shopware/Components/Cart/PaymentTokenService.php
+++ b/engine/Shopware/Components/Cart/PaymentTokenService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Cart;
@@ -52,7 +52,7 @@ public function generate(): string
     {
         $sessionId = $this->session->get('sessionId');
 
-        return $this->optinService->add(self::TYPE_PAYMENT_TOKEN, (int) ini_get('session.gc_maxlifetime'), [
+        return $this->optinService->add(self::TYPE_PAYMENT_TOKEN, (int) \ini_get('session.gc_maxlifetime'), [
             'name' => session_name(),
             'value' => $sessionId,
         ]);
diff --git a/engine/Shopware/Components/Cart/PaymentTokenSubscriber.php b/engine/Shopware/Components/Cart/PaymentTokenSubscriber.php
index 25ee4b17069..7036feadbf1 100644
--- a/engine/Shopware/Components/Cart/PaymentTokenSubscriber.php
+++ b/engine/Shopware/Components/Cart/PaymentTokenSubscriber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Cart;
@@ -83,7 +83,7 @@ public function onPreDispatchFrontend(Enlight_Event_EventArgs $args): void
                     $restoreData->getSessionName(),
                     $restoreData->getValue(),
                     0,
-                    ini_get('session.cookie_path'),
+                    \ini_get('session.cookie_path'),
                     null,
                     $request->isSecure()
                 )
diff --git a/engine/Shopware/Components/Cart/ProportionalCartMerger.php b/engine/Shopware/Components/Cart/ProportionalCartMerger.php
index 764c5448771..bbd53d13a22 100644
--- a/engine/Shopware/Components/Cart/ProportionalCartMerger.php
+++ b/engine/Shopware/Components/Cart/ProportionalCartMerger.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Cart;
@@ -95,8 +95,8 @@ public function mergeProportionalItems(array $content)
      */
     private function mergeAmount(array $item1, array $item2, string $property)
     {
-        $hasComma = str_contains($item1[$property], ',');
-        $amount = (float) str_replace(',', '.', $item1[$property]) + (float) str_replace(',', '.', $item2[$property]);
+        $hasComma = str_contains($item1[$property] ?? '', ',');
+        $amount = (float) str_replace(',', '.', $item1[$property] ?? '') + (float) str_replace(',', '.', $item2[$property] ?? '');
 
         if ($hasComma) {
             $amount = $this->modules->Articles()->sFormatPrice($amount);
diff --git a/engine/Shopware/Components/Cart/ProportionalCartMergerInterface.php b/engine/Shopware/Components/Cart/ProportionalCartMergerInterface.php
index fb753d9015e..6384186adbc 100644
--- a/engine/Shopware/Components/Cart/ProportionalCartMergerInterface.php
+++ b/engine/Shopware/Components/Cart/ProportionalCartMergerInterface.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Cart;
diff --git a/engine/Shopware/Components/Cart/ProportionalCartNormalizer.php b/engine/Shopware/Components/Cart/ProportionalCartNormalizer.php
index ec50fa3a15d..83743de9eaa 100644
--- a/engine/Shopware/Components/Cart/ProportionalCartNormalizer.php
+++ b/engine/Shopware/Components/Cart/ProportionalCartNormalizer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Cart;
diff --git a/engine/Shopware/Components/Cart/ProportionalCartNormalizerInterface.php b/engine/Shopware/Components/Cart/ProportionalCartNormalizerInterface.php
index acba9bd5e5d..aa00a41beaf 100644
--- a/engine/Shopware/Components/Cart/ProportionalCartNormalizerInterface.php
+++ b/engine/Shopware/Components/Cart/ProportionalCartNormalizerInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Cart;
diff --git a/engine/Shopware/Components/Cart/ProportionalTaxCalculator.php b/engine/Shopware/Components/Cart/ProportionalTaxCalculator.php
index 1fa0a42c604..e84d446cde9 100644
--- a/engine/Shopware/Components/Cart/ProportionalTaxCalculator.php
+++ b/engine/Shopware/Components/Cart/ProportionalTaxCalculator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Cart;
diff --git a/engine/Shopware/Components/Cart/ProportionalTaxCalculatorInterface.php b/engine/Shopware/Components/Cart/ProportionalTaxCalculatorInterface.php
index a209e188294..4775748c721 100644
--- a/engine/Shopware/Components/Cart/ProportionalTaxCalculatorInterface.php
+++ b/engine/Shopware/Components/Cart/ProportionalTaxCalculatorInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Cart;
diff --git a/engine/Shopware/Components/Cart/Struct/CartItemStruct.php b/engine/Shopware/Components/Cart/Struct/CartItemStruct.php
index ca8d3a6ef3d..df8ddbcb4f6 100644
--- a/engine/Shopware/Components/Cart/Struct/CartItemStruct.php
+++ b/engine/Shopware/Components/Cart/Struct/CartItemStruct.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Cart\Struct;
diff --git a/engine/Shopware/Components/Cart/Struct/DiscountContext.php b/engine/Shopware/Components/Cart/Struct/DiscountContext.php
index 8aa1144aad1..f1b20e90ba0 100644
--- a/engine/Shopware/Components/Cart/Struct/DiscountContext.php
+++ b/engine/Shopware/Components/Cart/Struct/DiscountContext.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Cart\Struct;
diff --git a/engine/Shopware/Components/Cart/Struct/PaymentTokenResult.php b/engine/Shopware/Components/Cart/Struct/PaymentTokenResult.php
index 95fabbb56a7..0d3de8d65c5 100644
--- a/engine/Shopware/Components/Cart/Struct/PaymentTokenResult.php
+++ b/engine/Shopware/Components/Cart/Struct/PaymentTokenResult.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Cart\Struct;
diff --git a/engine/Shopware/Components/Cart/Struct/Price.php b/engine/Shopware/Components/Cart/Struct/Price.php
index 07169b72c3e..9789b853ac2 100644
--- a/engine/Shopware/Components/Cart/Struct/Price.php
+++ b/engine/Shopware/Components/Cart/Struct/Price.php
@@ -1,63 +1,52 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Cart\Struct;
 
 class Price
 {
-    /**
-     * @var float
-     */
-    private $price;
+    private float $price;
 
-    /**
-     * @var float
-     */
-    private $netPrice;
+    private float $netPrice;
 
-    /**
-     * @var float
-     */
-    private $taxRate;
+    private float $taxRate;
 
-    /**
-     * @var float
-     */
-    private $tax;
+    private float $tax;
 
     /**
-     * @param float      $price
-     * @param float      $netPrice
-     * @param float      $taxRate
-     * @param float|null $tax
+     * @param float|numeric-string      $price
+     * @param float|numeric-string      $netPrice
+     * @param float|numeric-string      $taxRate
+     * @param float|numeric-string|null $tax
      */
     public function __construct($price, $netPrice, $taxRate, $tax)
     {
-        $this->price = $price;
-        $this->netPrice = $netPrice;
-        $this->taxRate = $taxRate;
-        $this->tax = $tax;
+        $this->price = (float) $price;
+        $this->netPrice = (float) $netPrice;
+        $this->taxRate = (float) $taxRate;
+        $this->tax = (float) $tax;
     }
 
     /**
diff --git a/engine/Shopware/Components/Cart/TaxAggregator.php b/engine/Shopware/Components/Cart/TaxAggregator.php
index 720827fe38b..8159d0edcb1 100644
--- a/engine/Shopware/Components/Cart/TaxAggregator.php
+++ b/engine/Shopware/Components/Cart/TaxAggregator.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Cart;
@@ -74,7 +73,6 @@ public function positionsTaxSum(array $cart, float $maximumTaxRate): ?array
             return null;
         }
 
-        /** @var array<numeric-string, float> $result */
         $result = [];
 
         foreach ($cart[CartKey::POSITIONS] as $cartPosition) {
@@ -84,7 +82,7 @@ public function positionsTaxSum(array $cart, float $maximumTaxRate): ?array
                 continue;
             }
 
-            /** @var numeric-string $taxRateString */
+            /** @var numeric-string&non-empty-string $taxRateString */
             $taxRateString = number_format($taxRate, 2);
 
             if (!\array_key_exists($taxRateString, $result)) {
@@ -112,13 +110,10 @@ public function shippingCostsTaxSum(array $cart): ?array
             return null;
         }
 
-        /** @var array<numeric-string, float> $result */
         $result = [];
 
         if (!empty($cart[CheckoutKey::SHIPPING_COSTS_TAX_PROPORTIONAL])) {
-            /** @var callable(array<numeric-string, float> $carry, Price $shippingTax): array<numeric-string, float> $callback */
             $callback = static function (array $carry, Price $shippingTax) {
-                /** @var numeric-string $taxRate */
                 $taxRate = number_format($shippingTax->getTaxRate(), 2);
 
                 if (!\array_key_exists($taxRate, $carry)) {
@@ -132,7 +127,6 @@ public function shippingCostsTaxSum(array $cart): ?array
 
             $result = array_reduce($cart[CheckoutKey::SHIPPING_COSTS_TAX_PROPORTIONAL], $callback, []);
         } else {
-            /** @var numeric-string $taxRate */
             $taxRate = number_format((float) $cart[CheckoutKey::SHIPPING_COSTS_TAX], 2);
 
             $result[$taxRate] = $cart[CheckoutKey::SHIPPING_COSTS_WITH_TAX] - $cart[CheckoutKey::SHIPPING_COSTS_NET];
@@ -183,7 +177,6 @@ private function aggregateTaxes(array $positionTaxSum, array $shippingCostsTaxSu
             array_diff_key($shippingCostsTaxSum, $positionTaxSum)
         );
 
-        /** @var callable(array<numeric-string, float> $carry, int|numeric-string $taxRate): array<numeric-string, float> $callback */
         $callback = static function (array $carry, $taxRate) use ($positionTaxSum, $shippingCostsTaxSum): array {
             $carry[$taxRate] = $positionTaxSum[$taxRate] + $shippingCostsTaxSum[$taxRate];
 
@@ -224,13 +217,6 @@ private function resolveTaxRateAndTax(array $cartPosition, float $maximumTaxRate
             ];
         }
 
-        if (!empty($cartPosition['taxPercent'])) {
-            return [
-                $cartPosition['taxPercent'],
-                $tax,
-            ];
-        }
-
         if ($cartPosition['modus'] == CartPositionsMode::VOUCHER) {
             return [
                 $this->getVoucherTaxRate($cartPosition['ordernumber'], $maximumTaxRate) ?: 0.0,
diff --git a/engine/Shopware/Components/Cart/TaxAggregatorInterface.php b/engine/Shopware/Components/Cart/TaxAggregatorInterface.php
index 240cca06864..b3fec25d943 100644
--- a/engine/Shopware/Components/Cart/TaxAggregatorInterface.php
+++ b/engine/Shopware/Components/Cart/TaxAggregatorInterface.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Cart;
diff --git a/engine/Shopware/Components/CategoryHandling/CategoryDuplicator.php b/engine/Shopware/Components/CategoryHandling/CategoryDuplicator.php
index f7fc78fd476..521e61677e7 100644
--- a/engine/Shopware/Components/CategoryHandling/CategoryDuplicator.php
+++ b/engine/Shopware/Components/CategoryHandling/CategoryDuplicator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\CategoryHandling;
@@ -75,7 +75,7 @@ public function duplicateCategory($originalCategoryId, $parentId, $copyArticleAs
         $originalCategory = $originalCategoryStmt->fetch(PDO::FETCH_ASSOC);
 
         if (empty($originalCategory)) {
-            throw new RuntimeException(sprintf('Category "%s" not found', $originalCategoryId));
+            throw new RuntimeException(\sprintf('Category "%s" not found', $originalCategoryId));
         }
 
         $newPosStmt = $this->connection
@@ -91,7 +91,7 @@ public function duplicateCategory($originalCategoryId, $parentId, $copyArticleAs
         $valuePlaceholders = array_fill(0, \count($originalCategory), '?');
         $insertStmt = $this->connection->prepare(
             'INSERT INTO s_categories (`' . implode('`, `', array_keys($originalCategory)) . '`)
-            VALUES (' . implode(', ', $valuePlaceholders) . ')'
+             VALUES (' . implode(', ', $valuePlaceholders) . ')'
         );
         $insertStmt->execute(array_values($originalCategory));
         $newCategoryId = (int) $this->connection->lastInsertId();
@@ -159,14 +159,13 @@ public function duplicateCategoryArticleAssociations($originalCategoryId, $newCa
         $products = $assocProductsStmt->fetchAll(PDO::FETCH_COLUMN, 0);
 
         if ($products) {
-            $insertStmt = $this->connection->prepare(
+            $this->connection->query(
                 'INSERT INTO s_articles_categories (categoryID, articleID)
-            VALUES (' . $newCategoryId . ', ' . implode('), (' . $newCategoryId . ', ', $products) . ')'
+                 VALUES (' . $newCategoryId . ', ' . implode('), (' . $newCategoryId . ', ', $products) . ')'
             );
-            $insertStmt->execute();
 
             foreach ($products as $productId) {
-                $this->categoryDenormalization->addAssignment($productId, $newCategoryId);
+                $this->categoryDenormalization->addAssignment((int) $productId, $newCategoryId);
             }
         }
     }
diff --git a/engine/Shopware/Components/Check/Data/System.xml b/engine/Shopware/Components/Check/Data/System.xml
index ce4526682a8..9dca562b2b8 100644
--- a/engine/Shopware/Components/Check/Data/System.xml
+++ b/engine/Shopware/Components/Check/Data/System.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <requirements>
     <requirement>
-        <name>php</name><group>core</group><required>7.4.2</required><maxCompatibleVersion>8.1.99</maxCompatibleVersion>
+        <name>php</name><group>core</group><required>7.4.2</required><maxCompatibleVersion>8.2.99</maxCompatibleVersion>
     </requirement>
     <requirement>
         <name>mod_rewrite</name><group>core</group><required>1</required>
diff --git a/engine/Shopware/Components/Check/File.php b/engine/Shopware/Components/Check/File.php
index 33dece9e318..af6de20093e 100644
--- a/engine/Shopware/Components/Check/File.php
+++ b/engine/Shopware/Components/Check/File.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/engine/Shopware/Components/Check/MySQLVersionExtractor.php b/engine/Shopware/Components/Check/MySQLVersionExtractor.php
index 2834c3098bd..f06fdc7d9f9 100644
--- a/engine/Shopware/Components/Check/MySQLVersionExtractor.php
+++ b/engine/Shopware/Components/Check/MySQLVersionExtractor.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Check;
@@ -52,7 +52,7 @@ private static function getVersionNumber(string $versionString): string
             $versionString,
             $versionParts
         )) {
-            throw new RuntimeException(sprintf('Invalid version string: %s', $versionString));
+            throw new RuntimeException(\sprintf('Invalid version string: %s', $versionString));
         }
 
         return $versionParts['major'] . '.' . $versionParts['minor'] . '.' . $versionParts['patch'];
diff --git a/engine/Shopware/Components/Check/Path.php b/engine/Shopware/Components/Check/Path.php
index 65fb8b69ae4..be880d04581 100644
--- a/engine/Shopware/Components/Check/Path.php
+++ b/engine/Shopware/Components/Check/Path.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
@@ -75,8 +75,11 @@ public function getList()
     /**
      * Returns the check list
      *
+     * @deprecated - Native return type will be added with Shopware 5.8
+     *
      * @return Iterator
      */
+    #[ReturnTypeWillChange]
     public function getIterator()
     {
         return $this->getList();
@@ -99,7 +102,7 @@ public function toArray()
      *
      * @deprecated - Native return type will be added with Shopware 5.8
      */
-    #[\ReturnTypeWillChange]
+    #[ReturnTypeWillChange]
     public function count()
     {
         return $this->getList()->count();
diff --git a/engine/Shopware/Components/Check/Requirements.php b/engine/Shopware/Components/Check/Requirements.php
index 8aae1029112..9d22c1b45a4 100644
--- a/engine/Shopware/Components/Check/Requirements.php
+++ b/engine/Shopware/Components/Check/Requirements.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Check;
@@ -42,7 +42,7 @@ class Requirements
     public function __construct(string $sourceFile, PDO $connection, Shopware_Components_Snippet_Manager $snippetManager)
     {
         if (!is_readable($sourceFile)) {
-            throw new RuntimeException(sprintf('Cannot read requirements file in %s.', $sourceFile));
+            throw new RuntimeException(\sprintf('Cannot read requirements file in %s.', $sourceFile));
         }
 
         $this->sourceFile = $sourceFile;
@@ -159,13 +159,13 @@ private function getRuntimeValue(string $name, SimpleXMLElement $requirement)
             return true;
         }
 
-        $value = ini_get($name);
+        $value = \ini_get($name);
         if ($value !== '' && $value !== false) {
-            if (strtolower($value) === 'off' || (is_numeric($value) && $value == 0)) {
+            if ((int) $value === 0 || strtolower($value) === 'off') {
                 return false;
             }
 
-            if (strtolower($value) === 'on' || (is_numeric($value) && $value == 1)) {
+            if ((int) $value === 1 || strtolower($value) === 'on') {
                 return true;
             }
 
@@ -252,29 +252,29 @@ private function checkOpcache(): array
             return [];
         }
 
-        $useCwdOption = $this->compare('opcache.use_cwd', ini_get('opcache.use_cwd'), '1');
+        $useCwdOption = $this->compare('opcache.use_cwd', \ini_get('opcache.use_cwd'), '1');
         $opcacheRequirements = [[
             'name' => 'opcache.use_cwd',
             'group' => 'core',
             'required' => 1,
-            'version' => ini_get('opcache.use_cwd'),
-            'result' => ini_get('opcache.use_cwd'),
+            'version' => \ini_get('opcache.use_cwd'),
+            'result' => \ini_get('opcache.use_cwd'),
             'notice' => '',
-            'check' => $this->compare('opcache.use_cwd', ini_get('opcache.use_cwd'), '1'),
+            'check' => $this->compare('opcache.use_cwd', \ini_get('opcache.use_cwd'), '1'),
             'error' => '',
         ]];
 
         try {
             if (fileinode('/') > 2) {
-                $validateRootOption = $this->compare('opcache.validate_root', ini_get('opcache.validate_root'), '1');
+                $validateRootOption = $this->compare('opcache.validate_root', \ini_get('opcache.validate_root'), '1');
                 $opcacheRequirements[] = [
                     'name' => 'opcache.validate_root',
                     'group' => 'core',
                     'required' => 1,
-                    'version' => ini_get('opcache.validate_root'),
-                    'result' => ini_get('opcache.validate_root'),
+                    'version' => \ini_get('opcache.validate_root'),
+                    'result' => \ini_get('opcache.validate_root'),
                     'notice' => '',
-                    'check' => $this->compare('opcache.validate_root', ini_get('opcache.validate_root'), '1'),
+                    'check' => $this->compare('opcache.validate_root', \ini_get('opcache.validate_root'), '1'),
                     'error' => '',
                 ];
             }
@@ -377,7 +377,7 @@ private function checkSessionSavePath(): bool
             return (bool) session_save_path();
         }
 
-        if (ini_get('session.save_path')) {
+        if (\ini_get('session.save_path')) {
             return true;
         }
 
@@ -406,7 +406,7 @@ private function checkDiskFreeSpace()
      */
     private function checkSuhosinGetMaxValueLength(): int
     {
-        $length = (int) ini_get('suhosin.get.max_value_length');
+        $length = (int) \ini_get('suhosin.get.max_value_length');
         if ($length === 0) {
             return 2000;
         }
@@ -504,7 +504,7 @@ private function handleMaxCompatibleVersion(array $check): array
         if (version_compare($check['version'], $check['maxCompatibleVersion'], '>')) {
             $check['check'] = false;
             $maxCompatibleVersion = str_replace('.99', '', $check['maxCompatibleVersion']);
-            $check['notice'] = sprintf($this->snippetManager->getNamespace('backend/systeminfo/view')->get('php_version_is_too_new_warning'), $maxCompatibleVersion);
+            $check['notice'] = \sprintf($this->snippetManager->getNamespace('backend/systeminfo/view')->get('php_version_is_too_new_warning'), $maxCompatibleVersion);
         }
 
         return $check;
diff --git a/engine/Shopware/Components/Compatibility/LegacyEventManager.php b/engine/Shopware/Components/Compatibility/LegacyEventManager.php
index 134fced93a3..481d7f37e25 100644
--- a/engine/Shopware/Components/Compatibility/LegacyEventManager.php
+++ b/engine/Shopware/Components/Compatibility/LegacyEventManager.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Compatibility;
@@ -30,6 +30,7 @@
 
 /**
  * @deprecated - Will be removed with shopware 5.8 without replacement
+ *
  * @phpstan-import-type ListingArray from \sArticles
  */
 class LegacyEventManager
diff --git a/engine/Shopware/Components/Compatibility/LegacyStructConverter.php b/engine/Shopware/Components/Compatibility/LegacyStructConverter.php
index a172e701c24..094e8931bb7 100644
--- a/engine/Shopware/Components/Compatibility/LegacyStructConverter.php
+++ b/engine/Shopware/Components/Compatibility/LegacyStructConverter.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Compatibility;
@@ -55,6 +54,7 @@
 use Shopware\Bundle\StoreFrontBundle\Struct\Property\Option as PropertyOption;
 use Shopware\Bundle\StoreFrontBundle\Struct\Property\Set;
 use Shopware\Bundle\StoreFrontBundle\Struct\ShopPage;
+use Shopware\Bundle\StoreFrontBundle\Struct\Tax;
 use Shopware\Bundle\StoreFrontBundle\Struct\Thumbnail;
 use Shopware\Components\Model\ModelManager;
 use Shopware\Models\Emotion\Emotion;
@@ -581,11 +581,11 @@ public function convertVoteStruct(Vote $vote)
             $data['attribute'] = $vote->getAttribute('core');
         }
 
-        if ($vote->getCreatedAt() instanceof DateTime) {
+        if ($vote->getCreatedAt() instanceof DateTimeInterface) {
             $data['datum'] = $vote->getCreatedAt()->format('Y-m-d H:i:s');
         }
 
-        if ($vote->getAnsweredAt() instanceof DateTime) {
+        if ($vote->getAnsweredAt() instanceof DateTimeInterface) {
             $data['answer_date'] = $vote->getAnsweredAt()->format('Y-m-d H:i:s');
         }
 
@@ -595,7 +595,7 @@ public function convertVoteStruct(Vote $vote)
     }
 
     /**
-     * @return array
+     * @return array{valFrom: int, valTo: int|null, from: int, to: int|null, price: float, pseudoprice: float, referenceprice: float|null, regulationPrice: float|null}
      */
     public function convertPriceStruct(Price $price)
     {
@@ -607,6 +607,7 @@ public function convertPriceStruct(Price $price)
             'price' => $price->getCalculatedPrice(),
             'pseudoprice' => $price->getCalculatedPseudoPrice(),
             'referenceprice' => $price->getCalculatedReferencePrice(),
+            'regulationPrice' => $price->getCalculatedRegulationPrice(),
         ];
 
         return $this->eventManager->filter('Legacy_Struct_Converter_Convert_Price', $data, [
@@ -1120,7 +1121,7 @@ private function getCategoryLink(Category $category): string
     private function getSourceSet(Thumbnail $thumbnail): string
     {
         if ($thumbnail->getRetinaSource() !== null) {
-            return sprintf('%s, %s 2x', $thumbnail->getSource(), $thumbnail->getRetinaSource());
+            return \sprintf('%s, %s 2x', $thumbnail->getSource(), $thumbnail->getRetinaSource());
         }
 
         return $thumbnail->getSource();
@@ -1136,7 +1137,7 @@ private function formatPrice(?float $price): string
         $price = str_replace('.', ',', (string) $price); // Replace points with commas
         $commaPos = strpos($price, ',');
         if ($commaPos) {
-            $part = substr($price, $commaPos + 1, \strlen($price) - $commaPos);
+            $part = (string) substr($price, $commaPos + 1, \strlen($price) - $commaPos);
             switch (\strlen($part)) {
                 case 1:
                     $price .= '0';
@@ -1182,6 +1183,11 @@ private function getListProductData(ListProduct $product): array
         if ($product->getUpdatedAt()) {
             $updateDate = $product->getUpdatedAt()->format('Y-m-d');
         }
+        $tax = $product->getTax();
+        $taxRule = $this->contextService->getShopContext()->getTaxRule($product->getTax()->getId());
+        if ($taxRule instanceof Tax) {
+            $tax = $taxRule;
+        }
 
         $data = [
             'articleID' => $product->getId(),
@@ -1193,7 +1199,7 @@ private function getListProductData(ListProduct $product): array
             'esd' => $product->hasEsd(),
             'articleName' => $product->getName(),
             'taxID' => $product->getTax()->getId(),
-            'tax' => $product->getTax()->getTax(),
+            'tax' => $tax->getTax(),
             'instock' => $product->getStock(),
             'isAvailable' => $product->isAvailable(),
             'hasAvailableVariant' => $product->hasAvailableVariant(),
@@ -1222,7 +1228,6 @@ private function getListProductData(ListProduct $product): array
             'notification' => $product->allowsNotification(),
             'ean' => trim((string) $product->getEan()),
             'keywords' => $product->getKeywords(),
-            'sReleasedate' => $this->dateToString($product->getReleaseDate()),
             'template' => $product->getTemplate(),
             'attributes' => $product->getAttributes(),
             'allowBuyInListing' => $product->allowBuyInListing(),
@@ -1257,7 +1262,8 @@ private function getListProductData(ListProduct $product): array
 
         $today = new DateTime();
         if ($product->getReleaseDate() && $product->getReleaseDate() > $today) {
-            $data['sReleasedate'] = $product->getReleaseDate()->format('Y-m-d');
+            $data['sReleasedate'] = $this->dateToString($product->getReleaseDate());
+            $data['sReleaseDate'] = $data['sReleasedate'];
         }
 
         return $this->eventManager->filter('Legacy_Struct_Converter_List_Product_Data', $data, [
@@ -1266,11 +1272,11 @@ private function getListProductData(ListProduct $product): array
     }
 
     /**
-     * @param DateTimeInterface|string $date
+     * @param DateTimeInterface|string|null $date
      */
     private function dateToString($date): string
     {
-        if ($date instanceof DateTime) {
+        if ($date instanceof DateTimeInterface) {
             return $date->format('Y-m-d');
         }
 
diff --git a/engine/Shopware/Components/Config.php b/engine/Shopware/Components/Config.php
index a4f73324b7b..cd06d1f071f 100644
--- a/engine/Shopware/Components/Config.php
+++ b/engine/Shopware/Components/Config.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\DBAL\Connection;
@@ -102,6 +102,8 @@ public function __isset($name)
      * Magic getter
      *
      * @param string $name
+     *
+     * @return mixed config value
      */
     public function __get($name)
     {
@@ -156,7 +158,7 @@ public function setShop($shop)
      */
     public function formatName($name)
     {
-        if (strpos($name, 's') === 0 && preg_match('#^s[A-Z]#', $name)) {
+        if (str_starts_with($name, 's') && preg_match('#^s[A-Z]#', $name)) {
             $name = substr($name, 1);
         }
 
@@ -175,7 +177,10 @@ public function getByNamespace($namespace, $name, $default = null)
     }
 
     /**
-     * @param string $name
+     * @param string     $name
+     * @param mixed|null $default
+     *
+     * @return mixed config value
      */
     public function get($name, $default = null)
     {
@@ -231,7 +236,7 @@ public function offsetExists($name)
         if (!isset($this->_data[$name])) {
             $baseName = $this->formatName($name);
 
-            return isset($this->_data[$baseName]) && $this->_data[$baseName] !== null;
+            return isset($this->_data[$baseName]);
         }
 
         return true;
diff --git a/engine/Shopware/Components/ConfigLoader.php b/engine/Shopware/Components/ConfigLoader.php
index 38855ea5423..b4f688629c9 100644
--- a/engine/Shopware/Components/ConfigLoader.php
+++ b/engine/Shopware/Components/ConfigLoader.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
@@ -96,7 +96,7 @@ public function loadConfig($file)
         $suffix = strtolower(pathinfo($file, PATHINFO_EXTENSION));
 
         if (!\in_array($suffix, ['php', 'inc'])) {
-            throw new Exception(sprintf('Invalid configuration file provided; unknown config type "%s"', $suffix));
+            throw new Exception(\sprintf('Invalid configuration file provided; unknown config type "%s"', $suffix));
         }
 
         $config = include $file;
diff --git a/engine/Shopware/Components/ConfigWriter.php b/engine/Shopware/Components/ConfigWriter.php
index e7d0d3a1681..0f462ff27d2 100644
--- a/engine/Shopware/Components/ConfigWriter.php
+++ b/engine/Shopware/Components/ConfigWriter.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
@@ -45,6 +45,8 @@ public function __construct(Connection $connection)
      * @param string      $name
      * @param string|null $namespace
      * @param int         $shopId
+     *
+     * @return mixed|null
      */
     public function get($name, $namespace = null, $shopId = 1)
     {
@@ -56,6 +58,10 @@ public function get($name, $namespace = null, $shopId = 1)
             return unserialize($result['configured'], ['allowed_classes' => false]);
         }
 
+        if ($result['value'] === null) {
+            return null;
+        }
+
         return unserialize($result['value'], ['allowed_classes' => false]);
     }
 
diff --git a/engine/Shopware/Components/Console/Application.php b/engine/Shopware/Components/Console/Application.php
index fc936659541..be2256d6ecb 100644
--- a/engine/Shopware/Components/Console/Application.php
+++ b/engine/Shopware/Components/Console/Application.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Console;
@@ -28,9 +28,9 @@
 use Doctrine\DBAL\Tools\Console\Helper\ConnectionHelper;
 use Doctrine\ORM\Tools\Console\ConsoleRunner as DoctrineConsoleRunner;
 use Doctrine\ORM\Tools\Console\Helper\EntityManagerHelper;
-use Enlight_Event_EventManager;
 use Exception;
 use Shopware\Components\DependencyInjection\ContainerAwareInterface;
+use Shopware\Components\Model\ModelManager;
 use Shopware\Kernel;
 use Symfony\Component\Console\Application as BaseApplication;
 use Symfony\Component\Console\Command\Command;
@@ -43,20 +43,11 @@ class Application extends BaseApplication
 {
     private const IMPORTANT_COMMANDS = ['sw:migration:migrate', 'sw:cache:clear'];
 
-    /**
-     * @var \Shopware\Kernel
-     */
-    private $kernel;
+    private Kernel $kernel;
 
-    /**
-     * @var bool
-     */
-    private $commandsRegistered = false;
+    private bool $commandsRegistered = false;
 
-    /**
-     * @var bool
-     */
-    private $skipDatabase = false;
+    private bool $skipDatabase = false;
 
     public function __construct(Kernel $kernel)
     {
@@ -71,7 +62,7 @@ public function __construct(Kernel $kernel)
     /**
      * Gets the Kernel associated with this Console.
      *
-     * @return \Shopware\Kernel
+     * @return Kernel
      */
     public function getKernel()
     {
@@ -115,7 +106,6 @@ public function doRun(InputInterface $input, OutputInterface $output)
      */
     protected function doRunCommand(Command $command, InputInterface $input, OutputInterface $output)
     {
-        /** @var Enlight_Event_EventManager $eventManager */
         $eventManager = $this->kernel->getContainer()->get('events');
 
         $event = $eventManager->notifyUntil('Shopware_Command_Before_Run', [
@@ -131,11 +121,11 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI
         $exitCode = parent::doRunCommand($command, $input, $output);
 
         $eventManager->notify('Shopware_Command_After_Run', [
-           'exitCode' => $exitCode,
-           'command' => $command,
-           'input' => $input,
-           'output' => $output,
-       ]);
+            'exitCode' => $exitCode,
+            'command' => $command,
+            'input' => $input,
+            'output' => $output,
+        ]);
 
         return $exitCode;
     }
@@ -148,7 +138,7 @@ protected function registerCommands(OutputInterface $output)
             // Wrap database related logic in a try-catch
             // so that non-db commands can still execute
             try {
-                $em = $this->kernel->getContainer()->get(\Shopware\Components\Model\ModelManager::class);
+                $em = $this->kernel->getContainer()->get(ModelManager::class);
 
                 // Setup doctrine commands
                 $helperSet = $this->getHelperSet();
@@ -175,13 +165,11 @@ protected function registerEventCommands()
     {
         $this->kernel->getContainer()->load('plugins');
 
-        /** @var Enlight_Event_EventManager $eventManager */
         $eventManager = $this->kernel->getContainer()->get('events');
 
         $collection = new ArrayCollection();
         $collection = $eventManager->collect('Shopware_Console_Add_Command', $collection, ['subject' => $this]);
 
-        /** @var Command $command */
         foreach ($collection as $command) {
             if ($command instanceof Command) {
                 $this->add($command);
@@ -200,17 +188,9 @@ protected function registerEventCommands()
      */
     protected function registerTaggedServiceIds()
     {
-        $ids = (array) $this->kernel->getContainer()->getParameter('console.command.ids');
-        $lazyServices = array_keys($ids);
-
         if ($this->kernel->getContainer()->hasParameter('console.command.ids')) {
-            /** @var array<string, string> $commandIds */
-            $commandIds = $this->kernel->getContainer()->getParameter('console.command.ids');
-
-            foreach ($commandIds as $id) {
-                if (!\in_array($id, $lazyServices)) {
-                    $this->add($this->kernel->getContainer()->get($id));
-                }
+            foreach ($this->kernel->getContainer()->getParameter('console.command.ids') as $id) {
+                $this->add($this->kernel->getContainer()->get($id));
             }
         }
     }
diff --git a/engine/Shopware/Components/ContainerAwareEventManager.php b/engine/Shopware/Components/ContainerAwareEventManager.php
index e9f54fce7f0..44273db582b 100644
--- a/engine/Shopware/Components/ContainerAwareEventManager.php
+++ b/engine/Shopware/Components/ContainerAwareEventManager.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
@@ -47,9 +47,6 @@ class ContainerAwareEventManager extends Enlight_Event_EventManager
      */
     protected $containerListeners = [];
 
-    /**
-     * @var ContainerInterface;
-     */
     private ContainerInterface $container;
 
     private array $listenerIds = [];
@@ -234,7 +231,7 @@ protected function lazyLoad($eventName)
     private function checkForDeprecatedEvent(string $eventName): void
     {
         if (\in_array($eventName, self::DEPRECATED_EVENTS, true)) {
-            $this->container->get('corelogger')->warning(sprintf('Event "%s" is deprecated. Do not use it anymore.', $eventName));
+            $this->container->get('corelogger')->warning(\sprintf('Event "%s" is deprecated. Do not use it anymore.', $eventName));
         }
     }
 }
diff --git a/engine/Shopware/Components/Cron/CronJob.php b/engine/Shopware/Components/Cron/CronJob.php
index f05c3ebd994..f1ae7775a2e 100644
--- a/engine/Shopware/Components/Cron/CronJob.php
+++ b/engine/Shopware/Components/Cron/CronJob.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Shopware_Components_Cron_CronJob extends Enlight_Components_Cron_EventArgs
diff --git a/engine/Shopware/Components/CsvIterator.php b/engine/Shopware/Components/CsvIterator.php
index bf10ca095f9..c93b9c53205 100644
--- a/engine/Shopware/Components/CsvIterator.php
+++ b/engine/Shopware/Components/CsvIterator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Shopware_Components_CsvIterator extends Enlight_Class implements Iterator
@@ -77,7 +77,7 @@ class Shopware_Components_CsvIterator extends Enlight_Class implements Iterator
     private $_header;
 
     /**
-     * This is the constructor. It try to open the CSV file.
+     * This is the constructor. It tries to open the CSV file.
      *
      * @param string           $filename  the full path of the CSV file
      * @param non-empty-string $delimiter the delimiter
@@ -90,12 +90,12 @@ public function __construct($filename, $delimiter = self::DEFAULT_DELIMITER, $he
         $realPath = realpath($filename);
 
         if ($realPath === false) {
-            throw new InvalidArgumentException(sprintf('Given file path "%s" does not exist', $filename));
+            throw new InvalidArgumentException(\sprintf('Given file path "%s" does not exist', $filename));
         }
 
         $handler = fopen($realPath, 'r');
         if (!\is_resource($handler)) {
-            throw new Exception(sprintf('The file "%s" cannot be opened', $realPath));
+            throw new Exception(\sprintf('The file "%s" cannot be opened', $realPath));
         }
         $this->_handler = $handler;
 
@@ -111,7 +111,7 @@ public function __construct($filename, $delimiter = self::DEFAULT_DELIMITER, $he
     }
 
     /**
-     * This is the destructor. It close the CSV file.
+     * This is the destructor. It closes the CSV file.
      */
     public function __destruct()
     {
@@ -141,8 +141,11 @@ public function GetHeader()
     /**
      * This method move the file pointer to the next row.
      *
+     * @deprecated - Native return type will be added with Shopware 5.8
+     *
      * @return void
      */
+    #[ReturnTypeWillChange]
     public function next()
     {
         $this->_read();
@@ -152,8 +155,11 @@ public function next()
     /**
      * This method reset the file handler.
      *
+     * @deprecated - Native return type will be added with Shopware 5.8
+     *
      * @return void
      */
+    #[ReturnTypeWillChange]
     public function rewind()
     {
         rewind($this->_handler);
@@ -165,18 +171,24 @@ public function rewind()
     /**
      * This method returns the current row number.
      *
+     * @deprecated - Native return type will be added with Shopware 5.8
+     *
      * @return int|null
      */
+    #[ReturnTypeWillChange]
     public function key()
     {
         return $this->_key;
     }
 
     /**
-     * This methods return the current CSV row data.
+     * This method return the current CSV row data.
+     *
+     * @deprecated - Native return type will be added with Shopware 5.8
      *
      * @return array The row as a one-dimensional array
      */
+    #[ReturnTypeWillChange]
     public function current()
     {
         $data = [];
@@ -190,8 +202,11 @@ public function current()
     /**
      * This method checks if the current row is readable.
      *
+     * @deprecated - Native return type will be added with Shopware 5.8
+     *
      * @return bool if the current row is readable
      */
+    #[ReturnTypeWillChange]
     public function valid()
     {
         return $this->_current !== false;
@@ -200,7 +215,7 @@ public function valid()
     /**
      * Helper function to determine the newline type of the file
      *
-     * @throws \Exception
+     * @throws Exception
      *
      * @return string Detected new line type
      */
@@ -246,7 +261,9 @@ private function _read()
         $count = 0;
         $line = stream_get_line($this->_handler, self::DEFAULT_LENGTH, $this->_newline);
         if ($line === false) {
-            throw new RuntimeException('Could not read line');
+            $this->_current = false;
+
+            return;
         }
 
         // Remove possible utf8-bom
diff --git a/engine/Shopware/Components/CustomerStream/CookieSubscriber.php b/engine/Shopware/Components/CustomerStream/CookieSubscriber.php
index 8fcfa6a0c20..bec33718de0 100644
--- a/engine/Shopware/Components/CustomerStream/CookieSubscriber.php
+++ b/engine/Shopware/Components/CustomerStream/CookieSubscriber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\CustomerStream;
diff --git a/engine/Shopware/Components/CustomerStream/CustomerStreamCriteriaFactory.php b/engine/Shopware/Components/CustomerStream/CustomerStreamCriteriaFactory.php
index 92c73ec6fd4..da472604937 100644
--- a/engine/Shopware/Components/CustomerStream/CustomerStreamCriteriaFactory.php
+++ b/engine/Shopware/Components/CustomerStream/CustomerStreamCriteriaFactory.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\CustomerStream;
@@ -27,6 +27,7 @@
 use Doctrine\DBAL\Connection;
 use PDO;
 use RuntimeException;
+use Shopware\Bundle\SearchBundle\ConditionInterface;
 use Shopware\Bundle\SearchBundle\Criteria;
 use Shopware\Components\LogawareReflectionHelper;
 
@@ -57,21 +58,24 @@ public function createCriteria($streamId)
     {
         $stream = $this->getStream($streamId);
         if (!$stream) {
-            throw new RuntimeException(sprintf('Stream by id %s not found', $streamId));
+            throw new RuntimeException(\sprintf('Stream by id %s not found', $streamId));
         }
 
         if (empty($stream['conditions'])) {
-            throw new RuntimeException(sprintf('Stream %s has no conditions', $stream['name']));
+            throw new RuntimeException(\sprintf('Stream %s has no conditions', $stream['name']));
         }
 
         $conditions = $this->reflectionHelper->unserialize(
             json_decode($stream['conditions'], true),
-            sprintf('Error while unserialize stream conditions')
+            \sprintf('Error while unserialize stream conditions')
         );
 
         $criteria = new Criteria();
 
         foreach ($conditions as $condition) {
+            if (!$condition instanceof ConditionInterface) {
+                continue;
+            }
             $criteria->addCondition($condition);
         }
 
diff --git a/engine/Shopware/Components/CustomerStream/CustomerStreamCriteriaFactoryInterface.php b/engine/Shopware/Components/CustomerStream/CustomerStreamCriteriaFactoryInterface.php
index 4b79dbbd8b5..bc2f5e099dc 100644
--- a/engine/Shopware/Components/CustomerStream/CustomerStreamCriteriaFactoryInterface.php
+++ b/engine/Shopware/Components/CustomerStream/CustomerStreamCriteriaFactoryInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\CustomerStream;
diff --git a/engine/Shopware/Components/CustomerStream/StreamIndexer.php b/engine/Shopware/Components/CustomerStream/StreamIndexer.php
index 51565350e67..cd15092c70e 100644
--- a/engine/Shopware/Components/CustomerStream/StreamIndexer.php
+++ b/engine/Shopware/Components/CustomerStream/StreamIndexer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\CustomerStream;
diff --git a/engine/Shopware/Components/CustomerStream/StreamIndexerInterface.php b/engine/Shopware/Components/CustomerStream/StreamIndexerInterface.php
index cc12f0e971f..b6452b5b830 100644
--- a/engine/Shopware/Components/CustomerStream/StreamIndexerInterface.php
+++ b/engine/Shopware/Components/CustomerStream/StreamIndexerInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\CustomerStream;
@@ -32,6 +32,8 @@ interface StreamIndexerInterface
 {
     /**
      * @param int $streamId
+     *
+     * @return void
      */
     public function populate($streamId, ProgressHelperInterface $helper);
 
@@ -44,6 +46,8 @@ public function populatePartial($streamId, Criteria $criteria);
 
     /**
      * @param int $streamId
+     *
+     * @return void
      */
     public function clearStreamIndex($streamId);
 }
diff --git a/engine/Shopware/Components/DependencyInjection/Bridge/Cache.php b/engine/Shopware/Components/DependencyInjection/Bridge/Cache.php
index 84dec897c59..6b3f5c1cc13 100644
--- a/engine/Shopware/Components/DependencyInjection/Bridge/Cache.php
+++ b/engine/Shopware/Components/DependencyInjection/Bridge/Cache.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\DependencyInjection\Bridge;
@@ -114,7 +114,7 @@ private function isApcuAvailable()
             return false;
         }
 
-        if (!ini_get('apc.enabled')) {
+        if (!\ini_get('apc.enabled')) {
             return false;
         }
 
diff --git a/engine/Shopware/Components/DependencyInjection/Bridge/Config.php b/engine/Shopware/Components/DependencyInjection/Bridge/Config.php
index 09f46f806a7..f3a0b75878d 100644
--- a/engine/Shopware/Components/DependencyInjection/Bridge/Config.php
+++ b/engine/Shopware/Components/DependencyInjection/Bridge/Config.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\DependencyInjection\Bridge;
@@ -32,8 +32,7 @@
 class Config
 {
     /**
-     * @param Connection $db
-     * @param array      $config
+     * @param array $config
      *
      * @return Shopware_Components_Config|null
      */
diff --git a/engine/Shopware/Components/DependencyInjection/Bridge/Currency.php b/engine/Shopware/Components/DependencyInjection/Bridge/Currency.php
index 2d2e66cfa87..5b767e0caf4 100644
--- a/engine/Shopware/Components/DependencyInjection/Bridge/Currency.php
+++ b/engine/Shopware/Components/DependencyInjection/Bridge/Currency.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\DependencyInjection\Bridge;
diff --git a/engine/Shopware/Components/DependencyInjection/Bridge/Db.php b/engine/Shopware/Components/DependencyInjection/Bridge/Db.php
index 1d6bbc9889a..649c5bc4917 100644
--- a/engine/Shopware/Components/DependencyInjection/Bridge/Db.php
+++ b/engine/Shopware/Components/DependencyInjection/Bridge/Db.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\DependencyInjection\Bridge;
@@ -38,6 +38,8 @@
 class Db
 {
     /**
+     * @param array<string, mixed> $dbConfig
+     *
      * @return PDO
      */
     public static function createPDO(array $dbConfig)
@@ -56,31 +58,32 @@ public static function createPDO(array $dbConfig)
                 'mysql:' . $connectionString,
                 $dbConfig['username'],
                 $password,
-                $dbConfig['pdoOptions']
+                $dbConfig['pdoOptions'] ?? null
             );
 
             $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
             $conn->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
+            $conn->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, true);
 
             // Reset sql_mode "STRICT_TRANS_TABLES" that will be default in MySQL 5.6
             $conn->exec('SET @@session.sql_mode = ""');
 
             if (isset($dbConfig['timezone'])) {
-                $conn->exec(sprintf('SET @@session.time_zone = %s;', $conn->quote($dbConfig['timezone'])));
+                $conn->exec(\sprintf('SET @@session.time_zone = %s;', $conn->quote($dbConfig['timezone'])));
             }
 
             foreach (($dbConfig['session'] ?? []) as $sessionKey => $sessionValue) {
                 if (\is_int($sessionValue)) {
-                    $conn->exec(sprintf('SET @@session.`%s` = %d;', $sessionKey, $sessionValue));
+                    $conn->exec(\sprintf('SET @@session.`%s` = %d;', $sessionKey, $sessionValue));
                 } elseif (\is_float($sessionValue)) {
-                    $conn->exec(sprintf('SET @@session.`%s` = %f;', $sessionKey, $sessionValue));
+                    $conn->exec(\sprintf('SET @@session.`%s` = %f;', $sessionKey, $sessionValue));
                 } elseif (\is_string($sessionValue)) {
-                    $conn->exec(sprintf('SET @@session.`%s` = %s;', $sessionKey, $conn->quote($sessionValue)));
+                    $conn->exec(\sprintf('SET @@session.`%s` = %s;', $sessionKey, $conn->quote($sessionValue)));
                 } elseif ($sessionValue === null) {
-                    $conn->exec(sprintf('SET @@session.`%s` = NULL;', $sessionKey));
+                    $conn->exec(\sprintf('SET @@session.`%s` = NULL;', $sessionKey));
                 } else {
                     throw new InvalidArgumentException(
-                        sprintf('Unexpected database session value for %s: %s', $sessionKey, serialize($sessionValue))
+                        \sprintf('Unexpected database session value for %s: %s', $sessionKey, serialize($sessionValue))
                     );
                 }
             }
@@ -94,16 +97,15 @@ public static function createPDO(array $dbConfig)
                 $e->getMessage()
             );
 
-            throw new RuntimeException(sprintf('Could not connect to database. Message from SQL Server: %s', $message));
+            throw new RuntimeException(\sprintf('Could not connect to database. Message from SQL Server: %s', $message));
         }
 
         return $conn;
     }
 
     /**
-     * @param PDO $pdo
-     *
-     * @throws \Doctrine\DBAL\DBALException
+     * @param array<string, mixed> $options
+     * @param PDO                  $pdo
      *
      * @return Connection
      */
@@ -124,6 +126,8 @@ public static function createDbalConnection(
     }
 
     /**
+     * @param array<string, mixed> $options
+     *
      * @return Enlight_Components_Db_Adapter_Pdo_Mysql
      */
     public static function createEnlightDbAdapter(Connection $connection, array $options)
@@ -137,6 +141,9 @@ public static function createEnlightDbAdapter(Connection $connection, array $opt
         return $db;
     }
 
+    /**
+     * @param array<string, mixed> $dbConfig
+     */
     private static function buildConnectionString(array $dbConfig): string
     {
         if (!isset($dbConfig['host']) || empty($dbConfig['host'])) {
diff --git a/engine/Shopware/Components/DependencyInjection/Bridge/Front.php b/engine/Shopware/Components/DependencyInjection/Bridge/Front.php
index cc253785208..a08faaf6898 100644
--- a/engine/Shopware/Components/DependencyInjection/Bridge/Front.php
+++ b/engine/Shopware/Components/DependencyInjection/Bridge/Front.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\DependencyInjection\Bridge;
@@ -30,6 +30,7 @@
 use Enlight_Plugin_PluginManager;
 use Exception;
 use Shopware\Components\DependencyInjection\Container;
+use Shopware\Components\Routing\RouterInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 
 class Front
@@ -40,6 +41,8 @@ class Front
      * front dispatcher. After the controller path is set to the dispatcher,
      * the plugin namespace of the front resource is set.
      *
+     * @param array<string, mixed> $options
+     *
      * @throws Exception
      *
      * @return Enlight_Controller_Front
@@ -55,7 +58,7 @@ public function factory(
 
         $front->setDispatcher($container->get('dispatcher'));
 
-        $front->setRouter($container->get(\Shopware\Components\Routing\RouterInterface::class));
+        $front->setRouter($container->get(RouterInterface::class));
 
         $front->setParams($options);
 
diff --git a/engine/Shopware/Components/DependencyInjection/Bridge/Locale.php b/engine/Shopware/Components/DependencyInjection/Bridge/Locale.php
index ea4f296e273..627884cdc3b 100644
--- a/engine/Shopware/Components/DependencyInjection/Bridge/Locale.php
+++ b/engine/Shopware/Components/DependencyInjection/Bridge/Locale.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\DependencyInjection\Bridge;
diff --git a/engine/Shopware/Components/DependencyInjection/Bridge/Mail.php b/engine/Shopware/Components/DependencyInjection/Bridge/Mail.php
index 86996cc7dff..e9d3abe907a 100644
--- a/engine/Shopware/Components/DependencyInjection/Bridge/Mail.php
+++ b/engine/Shopware/Components/DependencyInjection/Bridge/Mail.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\DependencyInjection\Bridge;
@@ -41,12 +41,12 @@ public function factory(Container $container, Shopware_Components_Config $config
 
         if (isset($options['charset'])) {
             $defaultCharSet = $options['charset'];
-        } elseif (!empty($config->CharSet)) {
-            $defaultCharSet = $config->CharSet;
+        } elseif (!empty($config->get('CharSet'))) {
+            $defaultCharSet = $config->get('CharSet');
         } else {
             $defaultCharSet = null;
         }
 
-        return new Enlight_Components_Mail($defaultCharSet);
+        return new Enlight_Components_Mail($defaultCharSet, $config->get('mailer_hostname') ?: null);
     }
 }
diff --git a/engine/Shopware/Components/DependencyInjection/Bridge/MailTransport.php b/engine/Shopware/Components/DependencyInjection/Bridge/MailTransport.php
index 37ac3ce488f..aaecefcb32d 100644
--- a/engine/Shopware/Components/DependencyInjection/Bridge/MailTransport.php
+++ b/engine/Shopware/Components/DependencyInjection/Bridge/MailTransport.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\DependencyInjection\Bridge;
@@ -31,21 +31,26 @@
 use Zend_Mail_Transport_Abstract;
 use Zend_Mail_Transport_Smtp;
 
+/**
+ * @phpstan-type MailOptions = array{charset: string, type?: string|class-string<Zend_Mail_Transport_Abstract>, username?: string, password?: string, auth?: string, ssl?: string, port?: string, name?: string, host?: string, from?: array{email: string, name: string}, replyTo?: array{email: string, name: string}}
+ */
 class MailTransport
 {
     /**
-     * @return Enlight_Class|Zend_Mail_Transport_Abstract
+     * @param MailOptions $options
+     *
+     * @return Zend_Mail_Transport_Abstract
      */
     public function factory(Enlight_Loader $loader, Shopware_Components_Config $config, array $options)
     {
-        if (!isset($options['type']) && !empty($config->MailerMailer) && $config->MailerMailer != 'mail') {
+        if (!isset($options['type']) && !empty($config->MailerMailer) && $config->MailerMailer !== 'mail') {
             $options['type'] = $config->MailerMailer;
         }
         if (empty($options['type'])) {
             $options['type'] = 'sendmail';
         }
 
-        if ($options['type'] == 'smtp') {
+        if ($options['type'] === 'smtp') {
             if (!isset($options['username']) && !empty($config->MailerUsername)) {
                 if (!empty($config->MailerAuth)) {
                     $options['auth'] = $config->MailerAuth;
@@ -77,16 +82,14 @@ public function factory(Enlight_Loader $loader, Shopware_Components_Config $conf
         }
         unset($options['type'], $options['charset']);
 
-        if ($transportName === 'Zend_Mail_Transport_Smtp') {
-            /** @var Zend_Mail_Transport_Smtp $transport */
-            $transport = Enlight_Class::Instance($transportName, [$options['host'], $options]);
+        if ($transportName === Zend_Mail_Transport_Smtp::class) {
+            $transport = Enlight_Class::Instance($transportName, [$options['host'] ?? null, $options]);
         } elseif (!empty($options)) {
-            /** @var Zend_Mail_Transport_Abstract $transport */
             $transport = Enlight_Class::Instance($transportName, [$options]);
         } else {
-            /** @var Zend_Mail_Transport_Abstract $transport */
             $transport = Enlight_Class::Instance($transportName);
         }
+        \assert($transport instanceof Zend_Mail_Transport_Abstract);
         Enlight_Components_Mail::setDefaultTransport($transport);
 
         if (!isset($options['from']) && !empty($config->Mail)) {
diff --git a/engine/Shopware/Components/DependencyInjection/Bridge/ModelAnnotation.php b/engine/Shopware/Components/DependencyInjection/Bridge/ModelAnnotation.php
index d973eeb3be4..ba373ef3c66 100644
--- a/engine/Shopware/Components/DependencyInjection/Bridge/ModelAnnotation.php
+++ b/engine/Shopware/Components/DependencyInjection/Bridge/ModelAnnotation.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\DependencyInjection\Bridge;
diff --git a/engine/Shopware/Components/DependencyInjection/Bridge/Models.php b/engine/Shopware/Components/DependencyInjection/Bridge/Models.php
index 6fee3f70b62..227f2b1e3fa 100644
--- a/engine/Shopware/Components/DependencyInjection/Bridge/Models.php
+++ b/engine/Shopware/Components/DependencyInjection/Bridge/Models.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\DependencyInjection\Bridge;
@@ -53,7 +53,7 @@ public function factory(
         Connection $connection,
         // Annotation driver is not really used here but has to be loaded first
         AnnotationDriver $modelAnnotation,
-        QueryOperatorValidator $operatorValidator = null
+        ?QueryOperatorValidator $operatorValidator = null
     ) {
         $loader->registerNamespace(
             'Shopware\Models\Attribute',
diff --git a/engine/Shopware/Components/DependencyInjection/Bridge/Plugins.php b/engine/Shopware/Components/DependencyInjection/Bridge/Plugins.php
index cb7834a7d8e..8986ae5718a 100644
--- a/engine/Shopware/Components/DependencyInjection/Bridge/Plugins.php
+++ b/engine/Shopware/Components/DependencyInjection/Bridge/Plugins.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\DependencyInjection\Bridge;
diff --git a/engine/Shopware/Components/DependencyInjection/Bridge/Router.php b/engine/Shopware/Components/DependencyInjection/Bridge/Router.php
index b3e7d0f8b30..8fd0fe15a54 100644
--- a/engine/Shopware/Components/DependencyInjection/Bridge/Router.php
+++ b/engine/Shopware/Components/DependencyInjection/Bridge/Router.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\DependencyInjection\Bridge;
@@ -28,7 +28,6 @@
 use Enlight_Controller_Front;
 use Enlight_Event_EventArgs;
 use Enlight_Event_EventManager as EnlightEventManager;
-use Shopware\Components\DependencyInjection\Container;
 use Shopware\Components\Routing\Context;
 use Shopware\Components\Routing\Router as RoutingRouter;
 use Shopware\Components\Routing\RouterInterface;
@@ -72,13 +71,9 @@ public function factory(
 
     public function onAfterRegisterShop(Enlight_Event_EventArgs $args)
     {
-        /** @var Container $container */
         $container = $args->getSubject();
-        /** @var RouterInterface $router */
-        $router = $container->get(\Shopware\Components\Routing\RouterInterface::class);
-        /** @var \Shopware\Models\Shop\Shop $shop */
+        $router = $container->get(RouterInterface::class);
         $shop = $container->get('shop');
-        /** @var Shopware_Components_Config $config */
         $config = $container->get(Shopware_Components_Config::class);
         // Register the shop (we're too soon)
         $config->setShop($shop);
@@ -103,7 +98,7 @@ public function onPreDispatch(Enlight_Controller_EventArgs $args)
         $front = $args->getSubject();
         $request = $front->Request();
         /** @var RouterInterface $router */
-        $router = $front->Router();
+        $router = $front->ensureRouter();
         // Fix context on forward
         $context = $router->getContext();
         $context->setGlobalParams($context::getGlobalParamsFromRequest($request));
diff --git a/engine/Shopware/Components/DependencyInjection/Bridge/Session.php b/engine/Shopware/Components/DependencyInjection/Bridge/Session.php
index a06eec7afa8..61d27dcf7a7 100644
--- a/engine/Shopware/Components/DependencyInjection/Bridge/Session.php
+++ b/engine/Shopware/Components/DependencyInjection/Bridge/Session.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\DependencyInjection\Bridge;
@@ -73,7 +73,7 @@ public function createSaveHandler(Container $container)
     /**
      * @return Enlight_Components_Session_Namespace
      */
-    public function createSession(Container $container, SessionHandlerInterface $saveHandler = null)
+    public function createSession(Container $container, ?SessionHandlerInterface $saveHandler = null)
     {
         // If another session is already started, save and close it before starting the frontend session below.
         // We need to do this, because the other session would use the session id of the frontend session and thus write
@@ -114,7 +114,9 @@ public function createSession(Container $container, SessionHandlerInterface $sav
         $sessionOptions['cookie_path'] = empty($basePath) ? '/' : $basePath;
 
         if ($saveHandler) {
-            session_set_save_handler($saveHandler);
+            if (empty($sessionOptions['unitTestEnabled'])) {
+                session_set_save_handler($saveHandler);
+            }
             unset($sessionOptions['save_handler']);
         }
 
diff --git a/engine/Shopware/Components/DependencyInjection/Bridge/Template.php b/engine/Shopware/Components/DependencyInjection/Bridge/Template.php
index 2792997a04a..1ae9d868009 100644
--- a/engine/Shopware/Components/DependencyInjection/Bridge/Template.php
+++ b/engine/Shopware/Components/DependencyInjection/Bridge/Template.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\DependencyInjection\Bridge;
@@ -45,17 +45,16 @@ public function factory(
         array $securityConfig,
         array $backendOptions
     ) {
-        /** @var Enlight_Template_Manager $template */
-        $template = Enlight_Class::Instance('Enlight_Template_Manager', [null, $backendOptions]);
+        $template = Enlight_Class::Instance(Enlight_Template_Manager::class, [null, $backendOptions]);
+        \assert($template instanceof Enlight_Template_Manager);
 
-        $template->enableSecurity(
-            new Security($template, $securityConfig)
-        );
+        $template->enableSecurity(new Security($template, $securityConfig));
 
         $template->setOptions($templateConfig);
         $template->setEventManager($eventManager);
 
         $template->registerResource('snippet', $snippetResource);
+        /* @phpstan-ignore-next-line is handled by magic method `\Smarty_Internal_TemplateBase::__call` and will set the property `\Smarty::$default_resource_type` */
         $template->setDefaultResourceType('snippet');
 
         $template->registerPlugin(Smarty::PLUGIN_MODIFIER, 'escapeHtml', [$escaper, 'escapeHtml']);
diff --git a/engine/Shopware/Components/DependencyInjection/Bridge/TemplateMail.php b/engine/Shopware/Components/DependencyInjection/Bridge/TemplateMail.php
index b05f4953b60..c72264c3e00 100644
--- a/engine/Shopware/Components/DependencyInjection/Bridge/TemplateMail.php
+++ b/engine/Shopware/Components/DependencyInjection/Bridge/TemplateMail.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\DependencyInjection\Bridge;
diff --git a/engine/Shopware/Components/DependencyInjection/Bridge/Validator.php b/engine/Shopware/Components/DependencyInjection/Bridge/Validator.php
index 15972b66635..a30a6840b6d 100644
--- a/engine/Shopware/Components/DependencyInjection/Bridge/Validator.php
+++ b/engine/Shopware/Components/DependencyInjection/Bridge/Validator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\DependencyInjection\Bridge;
diff --git a/engine/Shopware/Components/DependencyInjection/Compiler/ConfigureApiResourcesPass.php b/engine/Shopware/Components/DependencyInjection/Compiler/ConfigureApiResourcesPass.php
index 2c40fd13007..30c54476493 100644
--- a/engine/Shopware/Components/DependencyInjection/Compiler/ConfigureApiResourcesPass.php
+++ b/engine/Shopware/Components/DependencyInjection/Compiler/ConfigureApiResourcesPass.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\DependencyInjection\Compiler;
diff --git a/engine/Shopware/Components/DependencyInjection/Compiler/ConfigureContainerAwareCommands.php b/engine/Shopware/Components/DependencyInjection/Compiler/ConfigureContainerAwareCommands.php
index 4a1a96601cc..66b36ce0594 100644
--- a/engine/Shopware/Components/DependencyInjection/Compiler/ConfigureContainerAwareCommands.php
+++ b/engine/Shopware/Components/DependencyInjection/Compiler/ConfigureContainerAwareCommands.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\DependencyInjection\Compiler;
diff --git a/engine/Shopware/Components/DependencyInjection/Compiler/DoctrineEventSubscriberCompilerPass.php b/engine/Shopware/Components/DependencyInjection/Compiler/DoctrineEventSubscriberCompilerPass.php
index 4516ee5da0f..06d3c596000 100644
--- a/engine/Shopware/Components/DependencyInjection/Compiler/DoctrineEventSubscriberCompilerPass.php
+++ b/engine/Shopware/Components/DependencyInjection/Compiler/DoctrineEventSubscriberCompilerPass.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\DependencyInjection\Compiler;
diff --git a/engine/Shopware/Components/DependencyInjection/Compiler/EventListenerCompilerPass.php b/engine/Shopware/Components/DependencyInjection/Compiler/EventListenerCompilerPass.php
index 3701372ceec..ccdfb0a0d84 100644
--- a/engine/Shopware/Components/DependencyInjection/Compiler/EventListenerCompilerPass.php
+++ b/engine/Shopware/Components/DependencyInjection/Compiler/EventListenerCompilerPass.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\DependencyInjection\Compiler;
@@ -43,17 +43,17 @@ public function process(ContainerBuilder $container)
             $def->setPublic(true);
 
             if ($def->isAbstract()) {
-                throw new InvalidArgumentException(sprintf('The service "%s" must not be abstract as event listeners are lazy-loaded.', $id));
+                throw new InvalidArgumentException(\sprintf('The service "%s" must not be abstract as event listeners are lazy-loaded.', $id));
             }
 
             foreach ($events as $event) {
                 $priority = isset($event['priority']) ? $event['priority'] : 0;
                 if (!isset($event['event'])) {
-                    throw new InvalidArgumentException(sprintf('Service "%s" must define the "event" attribute on "%s" tags.', $id, 'shopware.event_listener'));
+                    throw new InvalidArgumentException(\sprintf('Service "%s" must define the "event" attribute on "%s" tags.', $id, 'shopware.event_listener'));
                 }
 
                 if (!isset($event['method'])) {
-                    throw new InvalidArgumentException(sprintf('Service "%s" must define the "method" attribute on "%s" tags.', $id, 'shopware.event_listener'));
+                    throw new InvalidArgumentException(\sprintf('Service "%s" must define the "method" attribute on "%s" tags.', $id, 'shopware.event_listener'));
                 }
 
                 $definition->addMethodCall('addListenerService', [$event['event'], [$id, $event['method']], $priority]);
diff --git a/engine/Shopware/Components/DependencyInjection/Compiler/EventSubscriberCompilerPass.php b/engine/Shopware/Components/DependencyInjection/Compiler/EventSubscriberCompilerPass.php
index b90cae2d35a..80171a420b8 100644
--- a/engine/Shopware/Components/DependencyInjection/Compiler/EventSubscriberCompilerPass.php
+++ b/engine/Shopware/Components/DependencyInjection/Compiler/EventSubscriberCompilerPass.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\DependencyInjection\Compiler;
@@ -50,7 +50,7 @@ public function process(ContainerBuilder $container)
             $def->setPublic(true);
 
             if ($def->isAbstract()) {
-                throw new InvalidArgumentException(sprintf('The service "%s" must not be abstract as event subscribers are lazy-loaded.', $id));
+                throw new InvalidArgumentException(\sprintf('The service "%s" must not be abstract as event subscribers are lazy-loaded.', $id));
             }
 
             // We must assume that the class value has been correctly filled, even if the service is created by a factory
@@ -59,7 +59,7 @@ public function process(ContainerBuilder $container)
             $refClass = new ReflectionClass($class);
             $interface = 'Enlight\Event\SubscriberInterface';
             if (!$refClass->implementsInterface($interface)) {
-                throw new InvalidArgumentException(sprintf('Service "%s" must implement interface "%s".', $id, $interface));
+                throw new InvalidArgumentException(\sprintf('Service "%s" must implement interface "%s".', $id, $interface));
             }
 
             $definition->addMethodCall(
diff --git a/engine/Shopware/Components/DependencyInjection/Compiler/LegacyApiResourcesPass.php b/engine/Shopware/Components/DependencyInjection/Compiler/LegacyApiResourcesPass.php
index 3c0902873b9..9706d42bd22 100644
--- a/engine/Shopware/Components/DependencyInjection/Compiler/LegacyApiResourcesPass.php
+++ b/engine/Shopware/Components/DependencyInjection/Compiler/LegacyApiResourcesPass.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\DependencyInjection\Compiler;
@@ -31,7 +31,7 @@
 /**
  * This class adds to all shopware.api services the tag shopware.api_resource
  *
- * @depracted in 5.6 and will be removed with Shopware 5.8. Please use the tag `shopware.api_resource` instead.
+ * @deprecated in 5.6 and will be removed with Shopware 5.8. Please use the tag `shopware.api_resource` instead.
  */
 class LegacyApiResourcesPass implements CompilerPassInterface
 {
diff --git a/engine/Shopware/Components/DependencyInjection/Compiler/PluginLoggerCompilerPass.php b/engine/Shopware/Components/DependencyInjection/Compiler/PluginLoggerCompilerPass.php
index ae4434496ae..e50cf7f6740 100644
--- a/engine/Shopware/Components/DependencyInjection/Compiler/PluginLoggerCompilerPass.php
+++ b/engine/Shopware/Components/DependencyInjection/Compiler/PluginLoggerCompilerPass.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\DependencyInjection\Compiler;
@@ -73,10 +73,10 @@ protected function processPlugin(ContainerBuilder $container, string $servicePre
     protected function createLoggerHandler(string $servicePrefix): Definition
     {
         return (new Definition(RotatingFileHandler::class, [
-                sprintf('%%kernel.logs_dir%%/%s_%%kernel.environment%%.log', $servicePrefix),
-                sprintf('%%%s%%', $this->getParameterNameLoggerMaxFiles($servicePrefix)),
-                sprintf('%%%s%%', $this->getParameterNameLogLevel($servicePrefix)),
-            ]))
+            \sprintf('%%kernel.logs_dir%%/%s_%%kernel.environment%%.log', $servicePrefix),
+            \sprintf('%%%s%%', $this->getParameterNameLoggerMaxFiles($servicePrefix)),
+            \sprintf('%%%s%%', $this->getParameterNameLogLevel($servicePrefix)),
+        ]))
             ->addMethodCall('pushProcessor', [new Reference('monolog.processor.uid')])
             ->setPublic(false)
         ;
@@ -100,26 +100,26 @@ protected function createLogger(string $servicePrefix): Definition
 
     protected function getServiceIdLogger(string $servicePrefix): string
     {
-        return sprintf('%s.logger', $servicePrefix);
+        return \sprintf('%s.logger', $servicePrefix);
     }
 
     protected function getServiceIdLoggerFormatter(string $servicePrefix): string
     {
-        return sprintf('%s.logger_formatter', $servicePrefix);
+        return \sprintf('%s.logger_formatter', $servicePrefix);
     }
 
     protected function getServiceIdLoggerHandler(string $servicePrefix): string
     {
-        return sprintf('%s.logger_handler', $servicePrefix);
+        return \sprintf('%s.logger_handler', $servicePrefix);
     }
 
     protected function getParameterNameLoggerMaxFiles(string $servicePrefix): string
     {
-        return sprintf('%s.logger.max_files', $servicePrefix);
+        return \sprintf('%s.logger.max_files', $servicePrefix);
     }
 
     protected function getParameterNameLogLevel(string $servicePrefix): string
     {
-        return sprintf('%s.logger.level', $servicePrefix);
+        return \sprintf('%s.logger.level', $servicePrefix);
     }
 }
diff --git a/engine/Shopware/Components/DependencyInjection/Compiler/PluginResourceCompilerPass.php b/engine/Shopware/Components/DependencyInjection/Compiler/PluginResourceCompilerPass.php
index 2925a3d8e58..9813f3fdb19 100644
--- a/engine/Shopware/Components/DependencyInjection/Compiler/PluginResourceCompilerPass.php
+++ b/engine/Shopware/Components/DependencyInjection/Compiler/PluginResourceCompilerPass.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\DependencyInjection\Compiler;
diff --git a/engine/Shopware/Components/DependencyInjection/Compiler/TagReplaceTrait.php b/engine/Shopware/Components/DependencyInjection/Compiler/TagReplaceTrait.php
index b7c6778d92d..646a03a6248 100644
--- a/engine/Shopware/Components/DependencyInjection/Compiler/TagReplaceTrait.php
+++ b/engine/Shopware/Components/DependencyInjection/Compiler/TagReplaceTrait.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\DependencyInjection\Compiler;
diff --git a/engine/Shopware/Components/DependencyInjection/Container.php b/engine/Shopware/Components/DependencyInjection/Container.php
index 5cd3a4a9d4e..38b5790e02d 100644
--- a/engine/Shopware/Components/DependencyInjection/Container.php
+++ b/engine/Shopware/Components/DependencyInjection/Container.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\DependencyInjection;
@@ -120,9 +120,6 @@ public function getNormalizedId($id)
      * Getter method for a single resource. If the source is not already registered, this function will
      * load the resource automatically. In case the resource is not found the status STATUS_NOT_FOUND is
      * set and an \Exception is thrown.
-     *
-     * @param string $name
-     * @param int    $invalidBehavior
      */
     public function get($name, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE)
     {
diff --git a/engine/Shopware/Components/DependencyInjection/ContainerAwareInterface.php b/engine/Shopware/Components/DependencyInjection/ContainerAwareInterface.php
index 5edc492b363..a18761d3ae8 100644
--- a/engine/Shopware/Components/DependencyInjection/ContainerAwareInterface.php
+++ b/engine/Shopware/Components/DependencyInjection/ContainerAwareInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\DependencyInjection;
@@ -33,6 +33,8 @@ interface ContainerAwareInterface
      * Sets the Container.
      *
      * @param Container|null $Container A ContainerInterface instance or null
+     *
+     * @return void
      */
-    public function setContainer(Container $Container = null);
+    public function setContainer(?Container $Container = null);
 }
diff --git a/engine/Shopware/Components/DependencyInjection/Controllers/backend.xml b/engine/Shopware/Components/DependencyInjection/Controllers/backend.xml
index 306c1cdaf20..d1f20c35c4d 100644
--- a/engine/Shopware/Components/DependencyInjection/Controllers/backend.xml
+++ b/engine/Shopware/Components/DependencyInjection/Controllers/backend.xml
@@ -40,6 +40,10 @@
             <tag name="shopware.controller" module="backend" controller="base"/>
         </service>
 
+        <service id="Shopware\Controllers\Backend\OrderProductSearch">
+            <tag name="shopware.controller" module="backend" controller="orderproductsearch"/>
+        </service>
+
         <service id="shopware_controllers_backend_blog" class="Shopware_Controllers_Backend_Blog">
             <tag name="shopware.controller" module="backend" controller="blog"/>
         </service>
@@ -124,10 +128,6 @@
             <tag name="shopware.controller" module="backend" controller="extjs"/>
         </service>
 
-        <service id="shopware_controllers_backend_feedback" class="Shopware_Controllers_Backend_Feedback">
-            <tag name="shopware.controller" module="backend" controller="feedback"/>
-        </service>
-
         <service id="shopware_controllers_backend_firstrunwizard" class="Shopware_Controllers_Backend_FirstRunWizard">
             <tag name="shopware.controller" module="backend" controller="firstrunwizard"/>
         </service>
diff --git a/engine/Shopware/Components/DependencyInjection/LegacyPhpDumper.php b/engine/Shopware/Components/DependencyInjection/LegacyPhpDumper.php
index a3bbd369581..b9159d7c2c4 100644
--- a/engine/Shopware/Components/DependencyInjection/LegacyPhpDumper.php
+++ b/engine/Shopware/Components/DependencyInjection/LegacyPhpDumper.php
@@ -4,23 +4,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\DependencyInjection;
diff --git a/engine/Shopware/Components/DependencyInjection/ProxyFactory.php b/engine/Shopware/Components/DependencyInjection/ProxyFactory.php
index 420e011f889..8e30a2555c7 100644
--- a/engine/Shopware/Components/DependencyInjection/ProxyFactory.php
+++ b/engine/Shopware/Components/DependencyInjection/ProxyFactory.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\DependencyInjection;
diff --git a/engine/Shopware/Components/DependencyInjection/SimpleFactory.php b/engine/Shopware/Components/DependencyInjection/SimpleFactory.php
index 91eec266fb9..8c56fbb4892 100644
--- a/engine/Shopware/Components/DependencyInjection/SimpleFactory.php
+++ b/engine/Shopware/Components/DependencyInjection/SimpleFactory.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\DependencyInjection;
diff --git a/engine/Shopware/Components/DependencyInjection/api.xml b/engine/Shopware/Components/DependencyInjection/api.xml
index b46fa13b8bd..cd59194b8e2 100644
--- a/engine/Shopware/Components/DependencyInjection/api.xml
+++ b/engine/Shopware/Components/DependencyInjection/api.xml
@@ -102,16 +102,16 @@
 
         <!-- Necessary because of implementation in \Shopware\Components\Api\Manager::getResource() -->
         <service id="shopware.api.customerstream" alias="shopware.api.customer_stream">
-            <deprecated>%alias_id% is deprecated, use shopware.api.customer_stream instead</deprecated>
+            <deprecated>%service_id% is deprecated, use %alias_id% instead</deprecated>
         </service>
         <service id="shopware.api.customergroup" alias="shopware.api.customer_group">
-            <deprecated>%alias_id% is deprecated, use shopware.api.customer_group instead</deprecated>
+            <deprecated>%service_id% is deprecated, use %alias_id% instead</deprecated>
         </service>
         <service id="shopware.api.propertygroup" alias="shopware.api.property_group">
-            <deprecated>%alias_id% is deprecated, use shopware.api.property_group instead</deprecated>
+            <deprecated>%service_id% is deprecated, use %alias_id% instead</deprecated>
         </service>
         <service id="shopware.api.emotionpreset" alias="shopware.api.emotion_preset">
-            <deprecated>%alias_id% is deprecated, use shopware.api.emotion_preset instead</deprecated>
+            <deprecated>%service_id% is deprecated, use %alias_id% instead</deprecated>
         </service>
     </services>
 </container>
diff --git a/engine/Shopware/Components/DependencyInjection/logger.xml b/engine/Shopware/Components/DependencyInjection/logger.xml
index 9a7baed825b..8dd10af5d87 100644
--- a/engine/Shopware/Components/DependencyInjection/logger.xml
+++ b/engine/Shopware/Components/DependencyInjection/logger.xml
@@ -76,7 +76,7 @@
         </service>
 
         <service id="debuglogger" alias="corelogger">
-            <deprecated>The "%alias_id%" service id is deprecated since 5.7.0, use "corelogger" instead. Will be removed with 5.8.0</deprecated>
+            <deprecated>The "%service_id%" service id is deprecated since 5.7.0, use "%alias_id%" instead.</deprecated>
         </service>
 
         <service id="shopware.log.fileparser" class="Shopware\Components\Log\Parser\LogfileParser"/>
diff --git a/engine/Shopware/Components/DependencyInjection/service-aliases.xml b/engine/Shopware/Components/DependencyInjection/service-aliases.xml
index 6836d9e5923..cafd9db0f39 100644
--- a/engine/Shopware/Components/DependencyInjection/service-aliases.xml
+++ b/engine/Shopware/Components/DependencyInjection/service-aliases.xml
@@ -7,6 +7,7 @@
     <services>
         <defaults public="true" />
 
+        <service id="Shopware\Kernel" alias="kernel"/>
         <service id="PDO" alias="db_connection" />
         <service id="Shopware_Components_Modules" alias="modules" />
         <service id="Shopware_Components_Config" alias="config" />
@@ -744,36 +745,6 @@
         <service id="Shopware\Bundle\CustomerSearchBundleDBAL\Commands\SearchIndexPopulateCommand" alias="customer_search.dbal.search_index_populate_command" />
         <service id="Shopware\Bundle\CustomerSearchBundleDBAL\Indexing\CustomerOrderGateway" alias="customer_search.dbal.indexing.order_gateway" />
         <service id="Shopware\Bundle\CustomerSearchBundleDBAL\Indexing\CustomerOrderHydrator" alias="customer_search.dbal.indexing.customer_order_hydrator" />
-        <service id="Shopware\Bundle\BenchmarkBundle\BenchmarkCollector" alias="shopware.benchmark_bundle.collector" />
-        <service id="Shopware\Bundle\BenchmarkBundle\Provider\ShopProvider" alias="shopware.benchmark_bundle.providers.shop" />
-        <service id="Shopware\Bundle\BenchmarkBundle\Provider\ShopwareProvider" alias="shopware.benchmark_bundle.providers.shopware" />
-        <service id="Shopware\Bundle\BenchmarkBundle\Provider\ManufacturerProvider" alias="shopware.benchmark_bundle.providers.manufacturers" />
-        <service id="Shopware\Bundle\BenchmarkBundle\Provider\ProductsProvider" alias="shopware.benchmark_bundle.providers.products" />
-        <service id="Shopware\Bundle\BenchmarkBundle\Provider\EmotionsProvider" alias="shopware.benchmark_bundle.providers.emotions" />
-        <service id="Shopware\Bundle\BenchmarkBundle\Provider\CategoriesProvider" alias="shopware.benchmark_bundle.providers.categories" />
-        <service id="Shopware\Bundle\BenchmarkBundle\Provider\AnalyticsProvider" alias="shopware.benchmark_bundle.providers.analytics" />
-        <service id="Shopware\Bundle\BenchmarkBundle\Provider\PluginsProvider" alias="shopware.benchmark_bundle.providers.plugins" />
-        <service id="Shopware\Bundle\BenchmarkBundle\Provider\PaymentsProvider" alias="shopware.benchmark_bundle.providers.payments" />
-        <service id="Shopware\Bundle\BenchmarkBundle\Provider\CustomersProvider" alias="shopware.benchmark_bundle.providers.customers" />
-        <service id="Shopware\Bundle\BenchmarkBundle\Provider\ShipmentsProvider" alias="shopware.benchmark_bundle.providers.shipments" />
-        <service id="Shopware\Bundle\BenchmarkBundle\Provider\OrdersProvider" alias="shopware.benchmark_bundle.providers.orders" />
-        <service id="Shopware\Bundle\BenchmarkBundle\Provider\UpdatedOrdersProvider" alias="shopware.benchmark_bundle.providers.updated_orders" />
-        <service id="Shopware\Models\Benchmark\Repository" alias="shopware.benchmark_bundle.repository.config" />
-        <service id="Shopware\Bundle\BenchmarkBundle\Service\TemplateCachingHandler" alias="shopware.benchmark_bundle.components.template_caching_handler" />
-        <service id="Shopware\Bundle\BenchmarkBundle\Service\TranslationService" alias="shopware.benchmark_bundle.components.translation" />
-        <service id="Shopware\Bundle\BenchmarkBundle\Commands\SendStatisticsCommand" alias="shopware.benchmark_bundle.commands.send_data" />
-        <service id="Shopware\Bundle\BenchmarkBundle\Commands\ReceiveStatisticsCommand" alias="shopware.benchmark_bundle.commands.receive_data" />
-        <service id="Shopware\Bundle\BenchmarkBundle\Service\BusinessIntelligenceService" alias="shopware.benchmark_bundle.bi_transmission" />
-        <service id="Shopware\Bundle\BenchmarkBundle\Service\StatisticsService" alias="shopware.benchmark_bundle.statistics_transmission" />
-        <service id="Shopware\Bundle\BenchmarkBundle\Service\BenchmarkStatisticsService" alias="shopware.benchmark_bundle.benchmark_statistics" />
-        <service id="Shopware\Bundle\BenchmarkBundle\BusinessIntelligenceClient" alias="shopware.benchmark_bundle.bi_client" />
-        <service id="Shopware\Bundle\BenchmarkBundle\StatisticsClient" alias="shopware.benchmark_bundle.statistics_client" />
-        <service id="Shopware\Bundle\BenchmarkBundle\Hydrator\StatisticsResponseHydrator" alias="shopware.benchmark_bundle.hydrator.statistics_response_hydrator" />
-        <service id="Shopware\Bundle\BenchmarkBundle\Hydrator\BusinessIntelligenceResponseHydrator" alias="shopware.benchmark_bundle.hydrator.bi_response_hydrator" />
-        <service id="Shopware\Bundle\BenchmarkBundle\BenchmarkEncryption" alias="shopware_benchmark_bundle.benchmark_encryption" />
-        <service id="Shopware_Controllers_Backend_Benchmark" alias="shopware_attribute.backend_controllers_benchmark" />
-        <service id="Shopware_Controllers_Backend_BenchmarkLocalOverview" alias="shopware_attribute.backend_controllers_benchmark_local_overview" />
-        <service id="Shopware_Controllers_Backend_BenchmarkOverview" alias="shopware_attribute.backend_controllers_benchmark_overview" />
         <service id="Shopware\Bundle\EsBackendBundle\EsBackendIndexer" alias="shopware_es_backend.indexer" />
         <service id="Shopware\Bundle\EsBackendBundle\SearchQueryBuilder" alias="shopware_es_backend.search_query_builder" />
         <service id="Shopware\Bundle\EsBackendBundle\Searcher\OrderSearcher" alias="shopware_es_backend.order_searcher" />
diff --git a/engine/Shopware/Components/DependencyInjection/services.xml b/engine/Shopware/Components/DependencyInjection/services.xml
index 5e70de8c484..ac5778c6c44 100644
--- a/engine/Shopware/Components/DependencyInjection/services.xml
+++ b/engine/Shopware/Components/DependencyInjection/services.xml
@@ -37,10 +37,21 @@
         <service id="topseller" class="Shopware_Components_TopSeller" synthetic="true"/>
         <service id="backendsession" class="Enlight_Components_Session_Namespace" synthetic="true"/>
         <service id="httpcache" class="Shopware\Components\HttpCache\AppCache" synthetic="true"/>
-        <service id="swagupdateupdatecheck" class="ShopwarePlugins\SwagUpdate\Components\UpdateCheck" synthetic="true"/>
         <service id="shop" class="Shopware\Models\Shop\Shop" synthetic="true"/>
         <service id="auth" class="Shopware_Components_Auth" synthetic="true"/>
 
+        <service id="swagupdateupdatecheck" class="ShopwarePlugins\SwagUpdate\Components\UpdateCheck">
+            <argument type="service" id="update_api_client"/>
+            <argument>%shopware.update.prerelease%</argument>
+        </service>
+
+        <service id="update_api_client" class="\Zend_Http_Client">
+            <argument>%shopware.update.url%</argument>
+            <argument type="collection">
+                <argument key="timeout">5</argument>
+            </argument>
+        </service>
+
         <service id="shopware.release" class="Shopware\Components\ShopwareReleaseStruct">
             <argument>%shopware.release.version%</argument>
             <argument>%shopware.release.version_text%</argument>
@@ -79,7 +90,7 @@
 
         <service id="template_factory" class="Shopware\Components\DependencyInjection\Bridge\Template"/>
         <service id="Template" alias="template">
-            <deprecated>The "%alias_id%" service is deprecated. Use "template" instead</deprecated>
+            <deprecated>The "%service_id%" service is deprecated. Use "%alias_id%" instead</deprecated>
         </service>
         <service id="template" class="Enlight_Template_Manager">
             <factory service="template_factory" method="factory"/>
@@ -178,7 +189,7 @@
         </service>
 
         <service id="Loader" alias="loader">
-            <deprecated>The "%alias_id%" service is deprecated. Use "loader" instead</deprecated>
+            <deprecated>The "%service_id%" service is deprecated. Use "%alias_id%" instead</deprecated>
         </service>
         <service id="loader" class="Enlight_Loader"/>
         <service id="shopware.loader" alias="loader"/>
@@ -433,7 +444,8 @@
             <argument type="service" id="multi_edit.product.backup"/>
         </service>
 
-        <service id="multi_edit.product.batch_process" class="Shopware\Components\MultiEdit\Resource\Product\BatchProcess">
+        <service id="multi_edit.product.batch_process"
+                 class="Shopware\Components\MultiEdit\Resource\Product\BatchProcess">
             <argument type="service" id="multi_edit.product.dql_helper"/>
             <argument type="service" id="multi_edit.product.filter"/>
             <argument type="service" id="multi_edit.product.queue"/>
@@ -468,7 +480,8 @@
 
         <service id="file_system" class="Symfony\Component\Filesystem\Filesystem"/>
 
-        <service id="first_run_wizard_plugin_store" class="Shopware\Bundle\PluginInstallerBundle\Service\FirstRunWizardPluginStoreService">
+        <service id="first_run_wizard_plugin_store"
+                 class="Shopware\Bundle\PluginInstallerBundle\Service\FirstRunWizardPluginStoreService">
             <argument type="service" id="Shopware\Bundle\PluginInstallerBundle\Struct\StructHydrator"/>
             <argument type="service" id="Shopware\Bundle\PluginInstallerBundle\Service\PluginLocalService"/>
             <argument type="service" id="Shopware\Bundle\PluginInstallerBundle\StoreClient"/>
@@ -495,11 +508,13 @@
         <service id="validator" class="Symfony\Component\Validator\Validator\ValidatorInterface">
             <factory class="Shopware\Components\DependencyInjection\Bridge\Validator" method="create"/>
             <argument type="service" id="models.annotations_reader"/>
-            <argument type="service" id="Shopware\Bundle\FormBundle\DependencyInjection\Factory\ConstraintValidatorFactory"/>
+            <argument type="service"
+                      id="Shopware\Bundle\FormBundle\DependencyInjection\Factory\ConstraintValidatorFactory"/>
         </service>
 
         <service id="validator.email" class="Shopware\Components\Validator\EmailValidator"/>
         <service id="validator.user_name" class="Shopware\Components\Validator\UserNameValidator"/>
+        <service id="Shopware\Components\Validator\NoUrlValidator"/>
 
         <service id="sitemapxml.repository" class="Shopware\Components\SitemapXMLRepository">
             <argument type="service" id="Shopware\Bundle\SearchBundle\ProductNumberSearchInterface"/>
@@ -556,11 +571,13 @@
             <argument type="service" id="Shopware\Components\Plugin\Configuration\ReaderInterface"/>
         </service>
 
-        <service id="Shopware\Components\Plugin\Configuration\WriterInterface" class="Shopware\Components\Plugin\Configuration\Writer">
+        <service id="Shopware\Components\Plugin\Configuration\WriterInterface"
+                 class="Shopware\Components\Plugin\Configuration\Writer">
             <argument type="service" id="Shopware\Components\Plugin\Configuration\Layers\LanguageShopLayer"/>
         </service>
 
-        <service id="Shopware\Components\Plugin\Configuration\ReaderInterface" class="Shopware\Components\Plugin\Configuration\Reader">
+        <service id="Shopware\Components\Plugin\Configuration\ReaderInterface"
+                 class="Shopware\Components\Plugin\Configuration\Reader">
             <argument type="service" id="Shopware\Components\Plugin\Configuration\Layers\LanguageShopLayer"/>
         </service>
 
@@ -591,7 +608,8 @@
             <argument type="service" id="Shopware\Components\Plugin\Configuration\Layers\SubShopLayer"/>
         </service>
 
-        <service id="shopware_product_stream.criteria_factory" class="Shopware\Components\ProductStream\CriteriaFactory">
+        <service id="shopware_product_stream.criteria_factory"
+                 class="Shopware\Components\ProductStream\CriteriaFactory">
             <argument type="service" id="Shopware\Bundle\SearchBundle\StoreFrontCriteriaFactoryInterface"/>
         </service>
 
@@ -620,18 +638,21 @@
             <tag name="shopware.event_subscriber"/>
         </service>
 
-        <service id="Shopware\Components\License\Service\ShopwareEditionServiceInterface" class="Shopware\Components\License\Service\ShopwareEditionService">
+        <service id="Shopware\Components\License\Service\ShopwareEditionServiceInterface"
+                 class="Shopware\Components\License\Service\ShopwareEditionService">
             <argument type="service" id="models"/>
             <argument type="service" id="Shopware\Components\License\Service\LocalLicenseUnpackService"/>
         </service>
 
-        <service id="shopware_core.license_service_subscriber" class="Shopware\Components\License\Service\LicenseServiceSubscriber">
+        <service id="shopware_core.license_service_subscriber"
+                 class="Shopware\Components\License\Service\LicenseServiceSubscriber">
             <argument type="service" id="Shopware\Components\License\Service\ShopwareEditionServiceInterface"/>
             <argument type="service" id="plugins"/>
             <tag name="shopware.event_subscriber"/>
         </service>
 
-        <service id="shopware_core.local_license_unpack_service" class="Shopware\Components\License\Service\LocalLicenseUnpackService"/>
+        <service id="shopware_core.local_license_unpack_service"
+                 class="Shopware\Components\License\Service\LocalLicenseUnpackService"/>
 
         <service id="shopware.openssl_verificator" class="Shopware\Components\OpenSSLVerifier">
             <argument>%kernel.root_dir%/engine/Shopware/Components/HttpClient/public.key</argument>
@@ -644,7 +665,7 @@
         <service id="shopware.plugin_xml_plugin_reader" class="Shopware\Components\Plugin\XmlReader\XmlPluginReader"/>
 
         <service id="shopware.plugin_xml_plugin_info_reader" alias="shopware.plugin_xml_plugin_reader">
-            <deprecated>The "%alias_id%" service id is deprecated since 5.6.0, use "shopware.plugin_xml_plugin_reader" instead.</deprecated>
+            <deprecated>The "%service_id%" service id is deprecated since 5.6.0, use "%alias_id%" instead.</deprecated>
         </service>
 
         <service id="shopware.plugin_requirement_validator" class="Shopware\Components\Plugin\RequirementValidator">
@@ -681,13 +702,15 @@
 
         <service id="basket_signature_generator" class="Shopware\Components\BasketSignature\BasketSignatureGenerator"/>
 
-        <service id="basket_cleanup_cron_job_subscriber" class="Shopware\Components\BasketSignature\CleanupSignatureSubscriber">
+        <service id="basket_cleanup_cron_job_subscriber"
+                 class="Shopware\Components\BasketSignature\CleanupSignatureSubscriber">
             <argument type="service" id="Doctrine\DBAL\Connection"/>
 
             <tag name="shopware.event_subscriber"/>
         </service>
 
-        <service id="registration_cleanup_cron_job_subscriber" class="Shopware\Components\Register\RegistrationCleanupSubscriber">
+        <service id="registration_cleanup_cron_job_subscriber"
+                 class="Shopware\Components\Register\RegistrationCleanupSubscriber">
             <argument type="service" id="Shopware\Components\Register\RegistrationCleanupService"/>
 
             <tag name="shopware.event_subscriber"/>
@@ -705,7 +728,8 @@
             <tag name="shopware.event_subscriber"/>
         </service>
 
-        <service id="shopware.components.optin_cleanup_service" class="Shopware\Components\Register\OptinCleanupService">
+        <service id="shopware.components.optin_cleanup_service"
+                 class="Shopware\Components\Register\OptinCleanupService">
             <argument type="service" id="Shopware_Components_Config"/>
             <argument type="service" id="Doctrine\DBAL\Connection"/>
         </service>
@@ -749,7 +773,8 @@
             <argument type="service" id="service_container"/>
         </service>
 
-        <service id="shopware.emotion.emotion_presetdata_transformer" class="Shopware\Components\Emotion\Preset\EmotionToPresetDataTransformer">
+        <service id="shopware.emotion.emotion_presetdata_transformer"
+                 class="Shopware\Components\Emotion\Preset\EmotionToPresetDataTransformer">
             <argument type="service" id="Shopware\Components\Model\ModelManager"/>
         </service>
 
@@ -769,12 +794,14 @@
             <argument type="service" id="Doctrine\DBAL\Connection"/>
         </service>
 
-        <service id="shopware.emotion.emotion_landingpage_loader" class="Shopware\Components\Emotion\LandingPageViewLoader">
+        <service id="shopware.emotion.emotion_landingpage_loader"
+                 class="Shopware\Components\Emotion\LandingPageViewLoader">
             <argument type="service" id="Shopware\Components\Emotion\DeviceConfiguration"/>
             <argument type="service" id="Shopware_Components_Translation"/>
         </service>
 
-        <service id="shopware.emotion.translation_importer" class="Shopware\Components\Emotion\EmotionTranslationImporter">
+        <service id="shopware.emotion.translation_importer"
+                 class="Shopware\Components\Emotion\EmotionTranslationImporter">
             <argument type="service" id="Doctrine\DBAL\Connection"/>
             <argument type="service" id="Shopware_Components_Translation"/>
         </service>
@@ -789,7 +816,8 @@
             <argument type="service" id="shopware.slug"/>
         </service>
 
-        <service id="shopware.emotion.preset_data_synchronizer" class="Shopware\Components\Emotion\Preset\PresetDataSynchronizer">
+        <service id="shopware.emotion.preset_data_synchronizer"
+                 class="Shopware\Components\Emotion\Preset\PresetDataSynchronizer">
             <argument type="service" id="Shopware\Components\Model\ModelManager"/>
             <argument type="service" id="Shopware\Components\ContainerAwareEventManager"/>
             <!-- Preset element handlers -->
@@ -797,7 +825,8 @@
             <argument>%shopware.app.rootDir%</argument>
         </service>
 
-        <service id="shopware.emotion.preset_banner_component_handler" class="Shopware\Components\Emotion\Preset\ComponentHandler\BannerComponentHandler">
+        <service id="shopware.emotion.preset_banner_component_handler"
+                 class="Shopware\Components\Emotion\Preset\ComponentHandler\BannerComponentHandler">
             <argument type="service" id="Shopware\Bundle\MediaBundle\MediaServiceInterface"/>
             <argument type="service" id="Shopware\Components\Api\Resource\Media"/>
             <argument type="service" id="service_container"/>
@@ -805,7 +834,8 @@
             <tag name="shopware.emotion.preset_component_handler"/>
         </service>
 
-        <service id="shopware.emotion.preset_bannerslider_component_handler" class="Shopware\Components\Emotion\Preset\ComponentHandler\BannerSliderComponentHandler">
+        <service id="shopware.emotion.preset_bannerslider_component_handler"
+                 class="Shopware\Components\Emotion\Preset\ComponentHandler\BannerSliderComponentHandler">
             <argument type="service" id="Shopware\Bundle\MediaBundle\MediaServiceInterface"/>
             <argument type="service" id="Shopware\Components\Api\Resource\Media"/>
             <argument type="service" id="service_container"/>
@@ -813,7 +843,8 @@
             <tag name="shopware.emotion.preset_component_handler"/>
         </service>
 
-        <service id="shopware.emotion.preset_categoryteaser_component_handler" class="Shopware\Components\Emotion\Preset\ComponentHandler\CategoryTeaserComponentHandler">
+        <service id="shopware.emotion.preset_categoryteaser_component_handler"
+                 class="Shopware\Components\Emotion\Preset\ComponentHandler\CategoryTeaserComponentHandler">
             <argument type="service" id="Shopware\Bundle\MediaBundle\MediaServiceInterface"/>
             <argument type="service" id="Shopware\Components\Api\Resource\Media"/>
             <argument type="service" id="service_container"/>
@@ -821,7 +852,8 @@
             <tag name="shopware.emotion.preset_component_handler"/>
         </service>
 
-        <service id="shopware.emotion.preset_html5_video_component_handler" class="Shopware\Components\Emotion\Preset\ComponentHandler\Html5VideoComponentHandler">
+        <service id="shopware.emotion.preset_html5_video_component_handler"
+                 class="Shopware\Components\Emotion\Preset\ComponentHandler\Html5VideoComponentHandler">
             <argument type="service" id="Shopware\Bundle\MediaBundle\MediaServiceInterface"/>
             <argument type="service" id="Shopware\Components\Api\Resource\Media"/>
             <argument type="service" id="service_container"/>
@@ -829,14 +861,16 @@
             <tag name="shopware.emotion.preset_component_handler"/>
         </service>
 
-        <service id="shopware.customer_stream.cookie_subscriber" class="Shopware\Components\CustomerStream\CookieSubscriber">
+        <service id="shopware.customer_stream.cookie_subscriber"
+                 class="Shopware\Components\CustomerStream\CookieSubscriber">
             <argument type="service" id="Doctrine\DBAL\Connection"/>
             <argument type="service" id="service_container"/>
 
             <tag name="shopware.event_subscriber"/>
         </service>
 
-        <service id="shopware.customer_stream.repository" class="Shopware\Models\CustomerStream\CustomerStreamRepository">
+        <service id="shopware.customer_stream.repository"
+                 class="Shopware\Models\CustomerStream\CustomerStreamRepository">
             <argument type="service" id="Doctrine\DBAL\Connection"/>
         </service>
 
@@ -846,7 +880,8 @@
             <argument type="service" id="Doctrine\DBAL\Connection"/>
         </service>
 
-        <service id="shopware.customer_stream.criteria_factory" class="Shopware\Components\CustomerStream\CustomerStreamCriteriaFactory">
+        <service id="shopware.customer_stream.criteria_factory"
+                 class="Shopware\Components\CustomerStream\CustomerStreamCriteriaFactory">
             <argument type="service" id="Doctrine\DBAL\Connection"/>
             <argument type="service" id="shopware.logaware_reflection_helper"/>
         </service>
@@ -855,14 +890,16 @@
             <argument id="shopware_backend_searchdbal.search_term_helper" type="service"/>
         </service>
 
-        <service id="shopware_backend_searchdbal.search_term_helper" class="Shopware\Bundle\SearchBundleDBAL\SearchTerm\TermHelper">
+        <service id="shopware_backend_searchdbal.search_term_helper"
+                 class="Shopware\Bundle\SearchBundleDBAL\SearchTerm\TermHelper">
             <argument type="service" id="Shopware_Components_Config"/>
             <argument>false</argument>
             <argument>false</argument>
             <argument>false</argument>
         </service>
 
-        <service id="shopware.routing.matchers.rewrite_matcher" class="Shopware\Components\Routing\Matchers\RewriteMatcher">
+        <service id="shopware.routing.matchers.rewrite_matcher"
+                 class="Shopware\Components\Routing\Matchers\RewriteMatcher">
             <argument type="service" id="Doctrine\DBAL\Connection"/>
             <argument type="service" id="Shopware\Components\QueryAliasMapper"/>
             <argument type="service" id="Shopware_Components_Config"/>
@@ -875,13 +912,15 @@
             <tag name="router.matcher" priority="40"/>
         </service>
 
-        <service id="shopware.routing.matchers.default_matcher" class="Shopware\Components\Routing\Matchers\DefaultMatcher">
+        <service id="shopware.routing.matchers.default_matcher"
+                 class="Shopware\Components\Routing\Matchers\DefaultMatcher">
             <argument type="service" id="dispatcher"/>
 
             <tag name="router.matcher" priority="30"/>
         </service>
 
-        <service id="shopware.routing.generators.rewrite_generator" class="Shopware\Components\Routing\Generators\RewriteGenerator">
+        <service id="shopware.routing.generators.rewrite_generator"
+                 class="Shopware\Components\Routing\Generators\RewriteGenerator">
             <argument type="service" id="Doctrine\DBAL\Connection"/>
             <argument type="service" id="Shopware\Components\QueryAliasMapper"/>
             <argument type="service" id="Shopware\Components\ContainerAwareEventManager"/>
@@ -889,25 +928,30 @@
             <tag name="router.generator" priority="50"/>
         </service>
 
-        <service id="shopware.routing.generators.default_generator" class="Shopware\Components\Routing\Generators\DefaultGenerator">
+        <service id="shopware.routing.generators.default_generator"
+                 class="Shopware\Components\Routing\Generators\DefaultGenerator">
             <argument type="service" id="dispatcher"/>
 
             <tag name="router.generator" priority="40"/>
         </service>
 
-        <service id="shopware.routing.pre_filter.default_pre_filter" class="Shopware\Components\Routing\GeneratorFilters\DefaultPreFilter">
+        <service id="shopware.routing.pre_filter.default_pre_filter"
+                 class="Shopware\Components\Routing\GeneratorFilters\DefaultPreFilter">
             <tag name="router.pre_filter" priority="50"/>
         </service>
 
-        <service id="shopware.routing.pre_filter.frontend_pre_filter" class="Shopware\Components\Routing\GeneratorFilters\FrontendPreFilter">
+        <service id="shopware.routing.pre_filter.frontend_pre_filter"
+                 class="Shopware\Components\Routing\GeneratorFilters\FrontendPreFilter">
             <tag name="router.pre_filter" priority="40"/>
         </service>
 
-        <service id="shopware.routing.post_filter.frontend_post_filter" class="Shopware\Components\Routing\GeneratorFilters\FrontendPostFilter">
+        <service id="shopware.routing.post_filter.frontend_post_filter"
+                 class="Shopware\Components\Routing\GeneratorFilters\FrontendPostFilter">
             <tag name="router.post_filter" priority="50"/>
         </service>
 
-        <service id="shopware.routing.post_filter.default_post_filter" class="Shopware\Components\Routing\GeneratorFilters\DefaultPostFilter">
+        <service id="shopware.routing.post_filter.default_post_filter"
+                 class="Shopware\Components\Routing\GeneratorFilters\DefaultPostFilter">
             <tag name="router.post_filter" priority="40"/>
         </service>
 
@@ -915,7 +959,8 @@
             <argument type="service" id="validator"/>
         </service>
 
-        <service id="shopware.auth.constraint.user_email_validator" class="Shopware\Components\Auth\Constraint\UserEmailValidator">
+        <service id="shopware.auth.constraint.user_email_validator"
+                 class="Shopware\Components\Auth\Constraint\UserEmailValidator">
             <argument type="service" id="Shopware_Components_Snippet_Manager"/>
             <argument type="service" id="Doctrine\DBAL\Connection"/>
             <argument type="service" id="Shopware\Components\Validator\EmailValidator"/>
@@ -923,7 +968,8 @@
             <tag name="validator.constraint_validator" alias="UserEmailValidator"/>
         </service>
 
-        <service id="shopware.auth.constraint.user_name_validator" class="Shopware\Components\Auth\Constraint\UserNameValidator">
+        <service id="shopware.auth.constraint.user_name_validator"
+                 class="Shopware\Components\Auth\Constraint\UserNameValidator">
             <argument type="service" id="Shopware_Components_Snippet_Manager"/>
             <argument type="service" id="Doctrine\DBAL\Connection"/>
             <argument type="service" id="Shopware\Components\Validator\UserNameValidator"/>
@@ -931,7 +977,15 @@
             <tag name="validator.constraint_validator" alias="UserNameValidator"/>
         </service>
 
-        <service id="shopware.components.privacy.privacy_cleanup_cron_subscriber" class="Shopware\Components\Privacy\PrivacyCleanupCronSubscriber">
+        <service id="Shopware\Components\Auth\Constraint\NoUrlValidator">
+            <argument type="service" id="Shopware_Components_Snippet_Manager"/>
+            <argument type="service" id="Shopware\Components\Validator\NoUrlValidator"/>
+
+            <tag name="validator.constraint_validator" alias="NoUrlValidator"/>
+        </service>
+
+        <service id="shopware.components.privacy.privacy_cleanup_cron_subscriber"
+                 class="Shopware\Components\Privacy\PrivacyCleanupCronSubscriber">
             <argument type="service" id="Shopware\Components\Privacy\PrivacyService"/>
             <argument type="service" id="Shopware_Components_Config"/>
 
@@ -942,12 +996,14 @@
             <argument type="service" id="Doctrine\DBAL\Connection"/>
         </service>
 
-        <service id="shopware.components.privacy.ip_anonymizer" class="Shopware\Components\Privacy\ConfigDependentIpAnonymizer">
+        <service id="shopware.components.privacy.ip_anonymizer"
+                 class="Shopware\Components\Privacy\ConfigDependentIpAnonymizer">
             <argument type="service" id="shopware.components.privacy.ip_anonymizer_service"/>
             <argument type="service" id="Shopware_Components_Config"/>
         </service>
 
-        <service id="shopware.components.privacy.ip_anonymizer_service" class="Shopware\Components\Privacy\IpAnonymizer" public="false"/>
+        <service id="shopware.components.privacy.ip_anonymizer_service" class="Shopware\Components\Privacy\IpAnonymizer"
+                 public="false"/>
 
         <service id="shopware.cart.proportional_tax_calculator"
                  class="Shopware\Components\Cart\ProportionalTaxCalculator"/>
@@ -965,7 +1021,8 @@
             <argument type="service" id="Shopware_Components_Modules"/>
         </service>
 
-        <service id="shopware.components.cart.proportional_cart_normalizer" class="Shopware\Components\Cart\ProportionalCartNormalizer"/>
+        <service id="shopware.components.cart.proportional_cart_normalizer"
+                 class="Shopware\Components\Cart\ProportionalCartNormalizer"/>
 
         <!-- Filesystem -->
         <service id="shopware.filesystem_factory" class="Shopware\Components\Filesystem\FilesystemFactory">
@@ -977,7 +1034,8 @@
             <argument>%shopware.filesystem.public%</argument>
         </service>
 
-        <service id="shopware.filesystem.public.url_generator" class="Shopware\Components\Filesystem\PublicUrlGenerator">
+        <service id="shopware.filesystem.public.url_generator"
+                 class="Shopware\Components\Filesystem\PublicUrlGenerator">
             <argument type="service" id="service_container"/>
             <argument>%shopware.app.rootDir%</argument>
             <argument>%shopware.filesystem.public.config.root%</argument>
@@ -989,7 +1047,8 @@
             <argument>%shopware.filesystem.private%</argument>
         </service>
 
-        <service id="shopware.components.privacy.cookie_remove_subscriber" class="Shopware\Components\Privacy\CookieRemoveSubscriber">
+        <service id="shopware.components.privacy.cookie_remove_subscriber"
+                 class="Shopware\Components\Privacy\CookieRemoveSubscriber">
             <argument type="service" id="Shopware_Components_Config"/>
             <argument type="service" id="Shopware\Bundle\CookieBundle\Services\CookieHandler"/>
             <argument>%shopware.httpcache.enabled%</argument>
@@ -1007,7 +1066,8 @@
             <argument type="service" id="Shopware_Components_Snippet_Manager"/>
         </service>
 
-        <service id="shopware.components.stream_protocol_validator" class="Shopware\Components\StreamProtocolValidator"/>
+        <service id="shopware.components.stream_protocol_validator"
+                 class="Shopware\Components\StreamProtocolValidator"/>
 
         <service id="shopware.components.dispatch_format_helper" class="Shopware\Components\DispatchFormatHelper"/>
 
@@ -1035,7 +1095,8 @@
             <argument type="service" id="Symfony\Component\HttpFoundation\Session\SessionInterface"/>
         </service>
 
-        <service id="Shopware\Components\Cart\PaymentTokenService_subscriber" class="Shopware\Components\Cart\PaymentTokenSubscriber">
+        <service id="Shopware\Components\Cart\PaymentTokenService_subscriber"
+                 class="Shopware\Components\Cart\PaymentTokenSubscriber">
             <argument type="service" id="Shopware\Components\Cart\PaymentTokenService"/>
             <argument type="service" id="Symfony\Component\HttpFoundation\Session\SessionInterface" on-invalid="null"/>
 
@@ -1046,30 +1107,35 @@
             <argument type="service" id="Shopware\Components\Routing\RouterInterface"/>
         </service>
 
-        <service id="shopware.console.completion_command" class="Stecman\Component\Symfony\Console\BashCompletion\CompletionCommand">
+        <service id="shopware.console.completion_command"
+                 class="Stecman\Component\Symfony\Console\BashCompletion\CompletionCommand">
             <tag name="console.command"/>
         </service>
 
-        <service id="Shopware\Components\ManualSorting\ProductLoaderInterface" class="Shopware\Components\ManualSorting\ProductLoader">
+        <service id="Shopware\Components\ManualSorting\ProductLoaderInterface"
+                 class="Shopware\Components\ManualSorting\ProductLoader">
             <argument type="service" id="Shopware\Bundle\SearchBundleDBAL\QueryBuilderFactory"/>
             <argument type="service" id="Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface"/>
             <argument type="service" id="Shopware\Bundle\MediaBundle\MediaServiceInterface"/>
         </service>
 
-        <service id="Shopware\Components\ManualSorting\PositionServiceInterface" class="Shopware\Components\ManualSorting\PositionService">
+        <service id="Shopware\Components\ManualSorting\PositionServiceInterface"
+                 class="Shopware\Components\ManualSorting\PositionService">
             <argument type="service" id="Doctrine\DBAL\Connection"/>
             <argument type="service" id="Shopware\Components\ManualSorting\ProductLoaderInterface"/>
             <argument type="service" id="Shopware\Bundle\StoreFrontBundle\Service\CustomSortingServiceInterface"/>
             <argument type="service" id="Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface"/>
             <argument type="service" id="Shopware\Bundle\ESIndexingBundle\BacklogProcessorInterface"/>
-            <argument type="expression">parameter('shopware.es.enabled') and parameter('shopware.es.write_backlog')</argument>
+            <argument type="expression">parameter('shopware.es.enabled') and parameter('shopware.es.write_backlog')
+            </argument>
         </service>
 
         <service id="shopware.components.shop_registration_service" class="Shopware\Components\ShopRegistrationService">
             <argument type="service" id="service_container"/>
         </service>
 
-        <service id="Shopware\Components\Cart\CartPersistServiceInterface" class="Shopware\Components\Cart\CartPersistService">
+        <service id="Shopware\Components\Cart\CartPersistServiceInterface"
+                 class="Shopware\Components\Cart\CartPersistService">
             <argument type="service" id="dbal_connection"/>
             <argument type="service" id="session"/>
         </service>
@@ -1086,5 +1152,10 @@
             <argument type="expression">service('config').get('sDISCOUNTTAX')</argument>
             <argument type="expression">service('config').get('sTAXAUTOMODE')</argument>
         </service>
+
+        <service id="Shopware\Components\Translation\SwapProductVariantTranslationService"
+                 class="Shopware\Components\Translation\SwapProductVariantTranslationService">
+            <argument type="service" id="dbal_connection"/>
+        </service>
     </services>
 </container>
diff --git a/engine/Shopware/Components/DispatchFormatHelper.php b/engine/Shopware/Components/DispatchFormatHelper.php
index 13e3cf63dfa..3c272cb98c2 100644
--- a/engine/Shopware/Components/DispatchFormatHelper.php
+++ b/engine/Shopware/Components/DispatchFormatHelper.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
@@ -27,8 +27,8 @@
 class DispatchFormatHelper
 {
     /**
-     * @param string $unFormatted
-     * @param bool   $isController
+     * @param string|null $unFormatted
+     * @param bool        $isController
      *
      * @return string
      */
@@ -40,17 +40,17 @@ public function formatNameForRequest($unFormatted, $isController = false)
             $allowedCharacters .= '\.';
         }
 
-        return preg_replace('#[^' . $allowedCharacters . ']+#', '', $unFormatted);
+        return preg_replace('#[^' . $allowedCharacters . ']+#', '', $unFormatted ?? '');
     }
 
     /**
-     * @param string $unFormatted
+     * @param string|null $unFormatted
      *
      * @return string
      */
     public function formatNameForDispatch($unFormatted)
     {
-        $segments = explode('_', $unFormatted);
+        $segments = explode('_', $unFormatted ?? '');
 
         foreach ($segments as $key => $segment) {
             $segment = (string) preg_replace('#[A-Z]#', ' $0', $segment);
diff --git a/engine/Shopware/Components/Document.php b/engine/Shopware/Components/Document.php
index cabd9dc1234..6461b83e9e2 100644
--- a/engine/Shopware/Components/Document.php
+++ b/engine/Shopware/Components/Document.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\ORM\OptimisticLockException;
@@ -37,6 +37,7 @@
 use Shopware\Models\Shop\Currency;
 use Shopware\Models\Shop\Shop;
 use Shopware\Models\Shop\Template;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException as SymfonyInvalidArgumentException;
 
 /**
  * Shopware document generator
@@ -225,7 +226,7 @@ public static function initDocument($orderID, $documentID, array $config = [])
             }
 
             if (empty($document->_subshop['id'])) {
-                throw new Enlight_Exception(sprintf('Could not load template path for order "%s"', $orderID));
+                throw new Enlight_Exception(\sprintf('Could not load template path for order "%s"', $orderID));
             }
             if (!empty($config['_allowMultipleDocuments'])) {
                 $document->_allowMultipleDocuments = $config['_allowMultipleDocuments'];
@@ -262,7 +263,7 @@ public static function initDocument($orderID, $documentID, array $config = [])
      * @param string $_renderer optional define renderer (pdf,html,return)
      *
      * @throws Enlight_Event_Exception
-     * @throws \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
+     * @throws SymfonyInvalidArgumentException
      */
     public function render($_renderer = '')
     {
@@ -311,6 +312,9 @@ public function render($_renderer = '')
             );
             if ($this->_preview == true || !$this->_documentHash) {
                 $mpdf = new Mpdf($mpdfConfig);
+                $mpdf->setLogger(
+                    Shopware()->Container()->get('corelogger')
+                );
                 $mpdf->WriteHTML($html);
                 $mpdf->Output();
                 exit;
@@ -318,11 +322,14 @@ public function render($_renderer = '')
 
             $tmpFile = tempnam(sys_get_temp_dir(), 'document');
             $mpdf = new Mpdf($mpdfConfig);
+            $mpdf->setLogger(
+                Shopware()->Container()->get('corelogger')
+            );
             $mpdf->WriteHTML($html);
             $mpdf->Output($tmpFile, 'F');
 
             $stream = fopen($tmpFile, 'rb');
-            $path = sprintf('documents/%s.pdf', $this->_documentHash);
+            $path = \sprintf('documents/%s.pdf', $this->_documentHash);
 
             $filesystem = Shopware()->Container()->get('shopware.filesystem.private');
             $filesystem->putStream($path, $stream);
@@ -458,19 +465,19 @@ protected function assignValues4x()
         $Document = array_merge(
             $Document,
             [
-                'comment' => $this->_config['docComment'],
+                'comment' => $this->_config['docComment'] ?? null,
                 'id' => $id,
                 'bid' => $this->_documentBid,
                 'date' => $this->_config['date'],
-                'deliveryDate' => $this->_config['delivery_date'],
+                'deliveryDate' => $this->_config['delivery_date'] ?? null,
                 // The "netto" config flag, if set to true, allows creating
                 // netto documents for brutto orders. Setting it to false,
                 // does not however create brutto documents for netto orders.
-                'netto' => $this->_order->order->taxfree ? true : $this->_config['netto'],
+                'netto' => $this->_order->order->taxfree ? true : ($this->_config['netto'] ?? null),
                 'nettoPositions' => $this->_order->order->net,
             ]
         );
-        $Document['voucher'] = $this->getVoucher($this->_config['voucher']);
+        $Document['voucher'] = $this->getVoucher($this->_config['voucher'] ?? null);
         $this->_view->assign('Document', $Document);
 
         // Translate payment and dispatch depending on the order's language
@@ -523,7 +530,7 @@ protected function assignValues4x()
         }
         unset($product);
 
-        if ($this->_config['_previewForcePagebreak']) {
+        if (!empty($this->_config['_previewForcePagebreak'])) {
             $positions = array_merge($positions, $positions);
         }
 
@@ -686,7 +693,7 @@ protected function saveDocument()
             return;
         }
 
-        $bid = $this->_config['bid'];
+        $bid = $this->_config['bid'] ?? null;
         if (!empty($bid)) {
             $this->_documentBid = $bid;
         }
@@ -707,16 +714,17 @@ protected function saveDocument()
             UPDATE `s_order_documents` SET `date` = now(),`amount` = ?
             WHERE `type` = ? AND userID = ? AND orderID = ? LIMIT 1
             ';
-            $amount = ($this->_order->order->taxfree ? true : $this->_config['netto']) ? round($this->_order->amountNetto, 2) : round($this->_order->amount, 2);
+            $useNet = $this->_order->order->taxfree ? true : ($this->_config['netto'] ?? null);
+            $amount = $useNet ? round($this->_order->amountNetto, 2) : round($this->_order->amount, 2);
             if ($typID == 4) {
                 $amount *= -1;
             }
             Shopware()->Db()->query($update, [
-                    $amount,
-                    $typID,
-                    $this->_order->userID,
-                    $this->_order->id,
-                ]);
+                $amount,
+                $typID,
+                $this->_order->userID,
+                $this->_order->id,
+            ]);
 
             if (!empty($this->_config['attributes'])) {
                 // Get the updated document
@@ -750,7 +758,8 @@ protected function saveDocument()
 
             $hash = md5(uniqid((string) rand()));
 
-            $amount = ($this->_order->order->taxfree ? true : $this->_config['netto']) ? round($this->_order->amountNetto, 2) : round($this->_order->amount, 2);
+            $useNet = $this->_order->order->taxfree ? true : ($this->_config['netto'] ?? null);
+            $amount = $useNet ? round($this->_order->amountNetto, 2) : round($this->_order->amount, 2);
             if ($typID == 4) {
                 $amount *= -1;
             }
@@ -791,7 +800,7 @@ protected function saveDocument()
                 } else {
                     // The typID is indexed with base 0, so we need increase the typID
                     if (!\in_array($typID, ['1', '2', '3'])) {
-                        $typID = $typID + 1;
+                        ++$typID;
                     }
                     $numberrange = 'doc_' . $typID;
                 }
diff --git a/engine/Shopware/Components/Emotion/ComponentInstaller.php b/engine/Shopware/Components/Emotion/ComponentInstaller.php
index 14c7e9ae24a..3eedca5f117 100644
--- a/engine/Shopware/Components/Emotion/ComponentInstaller.php
+++ b/engine/Shopware/Components/Emotion/ComponentInstaller.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Emotion;
@@ -63,7 +63,7 @@ public function createOrUpdate($pluginName, $componentName, array $data)
         $plugin = $repo->findOneBy(['name' => $pluginName]);
 
         if (!$plugin) {
-            throw new Exception(sprintf('Plugin by name %s not found', $pluginName));
+            throw new Exception(\sprintf('Plugin by name %s not found', $pluginName));
         }
 
         $repo = $this->em->getRepository(Component::class);
diff --git a/engine/Shopware/Components/Emotion/DeviceConfiguration.php b/engine/Shopware/Components/Emotion/DeviceConfiguration.php
index f067b4b498b..fe1fefa14a4 100644
--- a/engine/Shopware/Components/Emotion/DeviceConfiguration.php
+++ b/engine/Shopware/Components/Emotion/DeviceConfiguration.php
@@ -1,41 +1,37 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Emotion;
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Query\QueryBuilder;
-use PDO;
-use PDOStatement;
 use Shopware\Models\Emotion\Emotion;
 
 class DeviceConfiguration implements DeviceConfigurationInterface
 {
-    /**
-     * @var Connection
-     */
-    private $connection;
+    private Connection $connection;
 
     public function __construct(Connection $connection)
     {
@@ -43,10 +39,12 @@ public function __construct(Connection $connection)
     }
 
     /**
+     * @deprecated - Unused. Will be removed without replacement in 5.8
+     *
      * @param int $categoryId
      * @param int $pageIndex
      *
-     * @return array[]
+     * @return array<array<string, mixed>>
      */
     public function getListingEmotions($categoryId, $pageIndex)
     {
@@ -84,21 +82,19 @@ public function getListingEmotions($categoryId, $pageIndex)
      */
     public function get($categoryId)
     {
-        $query = $this->connection->createQueryBuilder();
-
-        $query->select([
-            'emotion.id',
-            'emotion.device as devices',
-            'emotion.show_listing as showListing',
-            'emotion.fullscreen',
-            'emotion.customer_stream_ids',
-            'emotion.replacement',
-            'emotion.position',
-            'emotion.listing_visibility',
-            'GROUP_CONCAT(shops.shop_id SEPARATOR \',\') as shopIds',
-        ]);
-
-        $query->from('s_emotion', 'emotion')
+        $emotions = $this->connection->createQueryBuilder()
+            ->select([
+                'emotion.id',
+                'emotion.device as devices',
+                'emotion.show_listing as showListing',
+                'emotion.fullscreen',
+                'emotion.customer_stream_ids',
+                'emotion.replacement',
+                'emotion.position',
+                'emotion.listing_visibility',
+                'GROUP_CONCAT(shops.shop_id SEPARATOR \',\') as shopIds',
+            ])
+            ->from('s_emotion', 'emotion')
             ->leftJoin('emotion', 's_emotion_shops', 'shops', 'shops.emotion_id = emotion.id')
             ->andWhere('emotion.active = 1')
             ->andWhere('emotion.is_landingpage = 0')
@@ -108,24 +104,20 @@ public function get($categoryId)
             ->addOrderBy('emotion.position', 'ASC')
             ->addOrderBy('emotion.id', 'ASC')
             ->groupBy('emotion.id')
-            ->setParameter(':categoryId', $categoryId);
-
-        $query->innerJoin(
-            'emotion',
-            's_emotion_categories',
-            'category',
-            'category.emotion_id = emotion.id
+            ->setParameter(':categoryId', $categoryId)
+            ->innerJoin(
+                'emotion',
+                's_emotion_categories',
+                'category',
+                'category.emotion_id = emotion.id
              AND category.category_id = :categoryId'
-        );
-
-        /** @var PDOStatement $statement */
-        $statement = $query->execute();
-
-        $emotions = $statement->fetchAll(PDO::FETCH_ASSOC);
+            )
+            ->execute()
+            ->fetchAllAssociative();
 
         $emotions = array_map(function ($emotion) {
             $emotion['devicesArray'] = explode(',', $emotion['devices']);
-            $emotion['shopIds'] = array_filter(explode(',', $emotion['shopIds']));
+            $emotion['shopIds'] = array_filter(explode(',', $emotion['shopIds'] ?? ''));
 
             return $emotion;
         }, $emotions);
@@ -138,22 +130,23 @@ public function get($categoryId)
      */
     public function getById($emotionId)
     {
-        $query = $this->connection->createQueryBuilder();
-
-        $query->select([
-            'emotion.id',
-            'emotion.device as devices',
-            'emotion.show_listing as showListing',
-        ]);
-
-        $query->from('s_emotion', 'emotion')
+        $emotion = $this->connection->createQueryBuilder()
+            ->select([
+                'emotion.id',
+                'emotion.device as devices',
+                'emotion.show_listing as showListing',
+            ])
+            ->from('s_emotion', 'emotion')
             ->where('emotion.id = :emotionId')
-            ->setParameter(':emotionId', $emotionId);
+            ->setParameter(':emotionId', $emotionId)
+            ->execute()
+            ->fetchAssociative();
 
-        /** @var PDOStatement $statement */
-        $statement = $query->execute();
+        if (!\is_array($emotion)) {
+            return [];
+        }
 
-        return $statement->fetch(PDO::FETCH_ASSOC);
+        return $emotion;
     }
 
     /**
@@ -186,106 +179,87 @@ public function getLandingPage($id)
      */
     public function getLandingPageShops($emotionId)
     {
-        $query = $this->getLandingpageShopsQuery();
-
-        $query->setParameter(':id', $emotionId);
-
-        /** @var PDOStatement $statement */
-        $statement = $query->execute();
-
-        return $statement->fetchAll(PDO::FETCH_COLUMN);
+        return $this->getLandingPageShopsQuery()
+            ->setParameter(':id', $emotionId)
+            ->execute()
+            ->fetchFirstColumn();
     }
 
     /**
-     * @param int $id
-     *
-     * @return array|null
+     * @return array<string, mixed>|null
      */
-    private function getMasterLandingPage($id)
+    private function getMasterLandingPage(int $id): ?array
     {
-        $query = $this->getLandingPageQuery()
+        $landingPage = $this->getLandingPageQuery()
             ->andWhere('emotion.id = :id')
-            ->setParameter('id', $id);
+            ->setParameter('id', $id)
+            ->execute()
+            ->fetchAssociative();
 
-        /** @var PDOStatement $statement */
-        $statement = $query->execute();
+        if (!\is_array($landingPage)) {
+            return null;
+        }
 
-        return $statement->fetch(PDO::FETCH_ASSOC);
+        return $landingPage;
     }
 
     /**
-     * @param int $parentId
-     *
-     * @return array
+     * @return array<array<string, mixed>>
      */
-    private function getChildrenLandingPages($parentId)
+    private function getChildrenLandingPages(int $parentId): array
     {
-        $query = $this->getLandingPageQuery()
+        $emotions = $this->getLandingPageQuery()
             ->andWhere('emotion.parent_id = :id')
-            ->setParameter(':id', $parentId);
-
-        /** @var PDOStatement $statement */
-        $statement = $query->execute();
-
-        $emotions = $statement->fetchAll(PDO::FETCH_ASSOC);
+            ->setParameter(':id', $parentId)
+            ->execute()
+            ->fetchAllAssociative();
 
         return $this->sortEmotionsByPositionAndId($emotions);
     }
 
-    /**
-     * @return QueryBuilder
-     */
-    private function getLandingPageQuery()
+    private function getLandingPageQuery(): QueryBuilder
     {
-        $query = $this->connection->createQueryBuilder();
-
-        $query->select([
-            'emotion.id',
-            'emotion.position',
-            'emotion.device as devices',
-            'emotion.name',
-            'emotion.seo_title',
-            'emotion.seo_keywords',
-            'emotion.seo_description',
-            'emotion.valid_from',
-            'emotion.valid_to',
-            'emotion.customer_stream_ids',
-            'emotion.replacement',
-            'now()',
-        ]);
-
-        $query->from('s_emotion', 'emotion')
+        return $this->connection->createQueryBuilder()
+            ->select([
+                'emotion.id',
+                'emotion.position',
+                'emotion.device as devices',
+                'emotion.name',
+                'emotion.seo_title',
+                'emotion.seo_keywords',
+                'emotion.seo_description',
+                'emotion.valid_from',
+                'emotion.valid_to',
+                'emotion.customer_stream_ids',
+                'emotion.replacement',
+                'now()',
+            ])
+            ->from('s_emotion', 'emotion')
             ->andWhere('emotion.active = 1')
             ->andWhere('emotion.is_landingpage = 1')
             ->andWhere('(emotion.valid_from IS NULL OR emotion.valid_from <= now())')
             ->andWhere('(emotion.valid_to IS NULL OR emotion.valid_to >= now())')
             ->orderBy('emotion.position', 'ASC')
-            ->addOrderBy('emotion.id', 'ASC')
-        ;
-
-        return $query;
+            ->addOrderBy('emotion.id', 'ASC');
     }
 
     /**
      * Get QueryBuilder for shops of an emotion.
-     *
-     * @return QueryBuilder
      */
-    private function getLandingPageShopsQuery()
+    private function getLandingPageShopsQuery(): QueryBuilder
     {
-        $query = $this->connection->createQueryBuilder();
-
-        $query->select(['shops.shop_id'])
+        return $this->connection->createQueryBuilder()
+            ->select(['shops.shop_id'])
             ->from('s_emotion_shops', 'shops')
             ->where('shops.emotion_id = :id');
-
-        return $query;
     }
 
     /**
-     * @return array
+     * @param array<array<string, mixed>> $emotions
+     *
+     * @return array<array<string, mixed>>
      */
-    private function sortEmotionsByPositionAndId(array $emotions)
+    private function sortEmotionsByPositionAndId(array $emotions): array
     {
         usort($emotions, function ($a, $b) {
             if ($a['position'] === $b['position']) {
@@ -299,9 +273,12 @@ private function sortEmotionsByPositionAndId(array $emotions)
     }
 
     /**
-     * @return array
+     * @param array<array<string, mixed>>               $emotions
+     * @param array<Emotion::LISTING_VISIBILITY_ONLY_*> $visibility
+     *
+     * @return array<array<string, mixed>>
      */
-    private function getEmotionsByVisibility(array $emotions, array $visibility)
+    private function getEmotionsByVisibility(array $emotions, array $visibility): array
     {
         return array_filter($emotions, function ($emotion) use ($visibility) {
             return \in_array($emotion['listing_visibility'], $visibility);
diff --git a/engine/Shopware/Components/Emotion/DeviceConfigurationInterface.php b/engine/Shopware/Components/Emotion/DeviceConfigurationInterface.php
index 0078b3ec921..dc413b8e8f7 100644
--- a/engine/Shopware/Components/Emotion/DeviceConfigurationInterface.php
+++ b/engine/Shopware/Components/Emotion/DeviceConfigurationInterface.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Emotion;
@@ -29,28 +30,28 @@ interface DeviceConfigurationInterface
     /**
      * @param int $categoryId
      *
-     * @return array
+     * @return array<array<string, mixed>>
      */
     public function get($categoryId);
 
     /**
      * @param int $emotionId
      *
-     * @return array
+     * @return array<string, mixed>
      */
     public function getById($emotionId);
 
     /**
      * @param int $id
      *
-     * @return array|null
+     * @return array<string, mixed>|null
      */
     public function getLandingPage($id);
 
     /**
      * @param int $emotionId
      *
-     * @return array
+     * @return array<int>
      */
     public function getLandingPageShops($emotionId);
 }
diff --git a/engine/Shopware/Components/Emotion/EmotionComponentViewSubscriber.php b/engine/Shopware/Components/Emotion/EmotionComponentViewSubscriber.php
index f91b6d2c545..0289b966822 100644
--- a/engine/Shopware/Components/Emotion/EmotionComponentViewSubscriber.php
+++ b/engine/Shopware/Components/Emotion/EmotionComponentViewSubscriber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Emotion;
diff --git a/engine/Shopware/Components/Emotion/EmotionExporter.php b/engine/Shopware/Components/Emotion/EmotionExporter.php
index 60dd22b8245..7ec7aefdce5 100644
--- a/engine/Shopware/Components/Emotion/EmotionExporter.php
+++ b/engine/Shopware/Components/Emotion/EmotionExporter.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Emotion;
@@ -109,7 +109,7 @@ public function export($emotionId)
         $filename = $this->rootDirectory . '/files/downloads/' . $name . time() . '.zip';
 
         if ($zip->open($filename, ZipArchive::CREATE) !== true) {
-            throw new Exception(sprintf('Could not create zip file "%s"!', $filename));
+            throw new Exception(\sprintf('Could not create zip file "%s"!', $filename));
         }
 
         $emotionData = $this->transformer->transform($emotionId, true);
@@ -148,7 +148,7 @@ public function export($emotionId)
         $zip->addFromString('emotion.json', json_encode($exportData, JSON_THROW_ON_ERROR));
 
         if (!$zip->close()) {
-            throw new Exception(sprintf('Could not close zip file "%s"!', $filename));
+            throw new Exception(\sprintf('Could not close zip file "%s"!', $filename));
         }
 
         $this->presetResource->delete($preset->getId());
diff --git a/engine/Shopware/Components/Emotion/EmotionExporterInterface.php b/engine/Shopware/Components/Emotion/EmotionExporterInterface.php
index 53816808ba4..096c56972e8 100644
--- a/engine/Shopware/Components/Emotion/EmotionExporterInterface.php
+++ b/engine/Shopware/Components/Emotion/EmotionExporterInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Emotion;
diff --git a/engine/Shopware/Components/Emotion/EmotionImporter.php b/engine/Shopware/Components/Emotion/EmotionImporter.php
index 8f728f561f7..6005f074398 100644
--- a/engine/Shopware/Components/Emotion/EmotionImporter.php
+++ b/engine/Shopware/Components/Emotion/EmotionImporter.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Emotion;
@@ -120,15 +120,15 @@ private function extractEmotionArchive($filePath, $extractPath)
         $zip = new ZipArchive();
 
         if ($zip->open($filePath) !== true) {
-            throw new EmotionImportException(sprintf('Could not open zip file "%s"!', $filePath));
+            throw new EmotionImportException(\sprintf('Could not open zip file "%s"!', $filePath));
         }
 
         if ($zip->locateName('emotion.json') === false) {
-            throw new EmotionImportException(sprintf('Missing emotion.json in %s!', $filePath));
+            throw new EmotionImportException(\sprintf('Missing emotion.json in %s!', $filePath));
         }
 
         if ($zip->extractTo($extractPath) !== true) {
-            throw new EmotionImportException(sprintf('Could not extract zip file %s to %s!', $filePath, $extractPath));
+            throw new EmotionImportException(\sprintf('Could not extract zip file %s to %s!', $filePath, $extractPath));
         }
 
         $zip->close();
@@ -169,12 +169,12 @@ private function checkRequiredPlugins(array $requiredPlugins)
                 || !$plugin['installed']
                 || version_compare($plugin['currentVersion'], $requiredPlugin['version'], '<')
             ) {
-                $missingPlugins[] = sprintf('%s (%s)', $requiredPlugin['name'], $requiredPlugin['version']);
+                $missingPlugins[] = \sprintf('%s (%s)', $requiredPlugin['name'], $requiredPlugin['version']);
             }
         }
 
         if ($missingPlugins) {
-            throw new EmotionImportException(sprintf('The following plugins are required to use this shopping world: <br>%s', implode('<br>', $missingPlugins)));
+            throw new EmotionImportException(\sprintf('The following plugins are required to use this shopping world: <br>%s', implode('<br>', $missingPlugins)));
         }
     }
 
diff --git a/engine/Shopware/Components/Emotion/EmotionImporterInterface.php b/engine/Shopware/Components/Emotion/EmotionImporterInterface.php
index 7feb028b266..71fb8e9daff 100644
--- a/engine/Shopware/Components/Emotion/EmotionImporterInterface.php
+++ b/engine/Shopware/Components/Emotion/EmotionImporterInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Emotion;
@@ -41,6 +41,8 @@ public function import($filePath);
     /**
      * @param string   $filePath
      * @param int|null $presetId
+     *
+     * @return void
      */
     public function cleanupImport($filePath, $presetId = null);
 }
diff --git a/engine/Shopware/Components/Emotion/EmotionTranslationImporter.php b/engine/Shopware/Components/Emotion/EmotionTranslationImporter.php
index c76d5b98815..9fc7e1d40b0 100644
--- a/engine/Shopware/Components/Emotion/EmotionTranslationImporter.php
+++ b/engine/Shopware/Components/Emotion/EmotionTranslationImporter.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Emotion;
@@ -41,7 +41,7 @@ class EmotionTranslationImporter
      */
     private $translator;
 
-    public function __construct(Connection $connection, Shopware_Components_Translation $translationComponent = null)
+    public function __construct(Connection $connection, ?Shopware_Components_Translation $translationComponent = null)
     {
         $this->connection = $connection;
         $this->translator = $translationComponent ?: Shopware()->Container()->get(Shopware_Components_Translation::class);
diff --git a/engine/Shopware/Components/Emotion/Exception/EmotionImportException.php b/engine/Shopware/Components/Emotion/Exception/EmotionImportException.php
index fabf7b17952..b6986573981 100644
--- a/engine/Shopware/Components/Emotion/Exception/EmotionImportException.php
+++ b/engine/Shopware/Components/Emotion/Exception/EmotionImportException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Emotion\Exception;
diff --git a/engine/Shopware/Components/Emotion/Exception/MappingRequiredException.php b/engine/Shopware/Components/Emotion/Exception/MappingRequiredException.php
index 2f0bb6af64b..4a312dfc269 100644
--- a/engine/Shopware/Components/Emotion/Exception/MappingRequiredException.php
+++ b/engine/Shopware/Components/Emotion/Exception/MappingRequiredException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Emotion\Exception;
diff --git a/engine/Shopware/Components/Emotion/LandingPageViewLoader.php b/engine/Shopware/Components/Emotion/LandingPageViewLoader.php
index 761af0cbfc4..9043debc4f0 100644
--- a/engine/Shopware/Components/Emotion/LandingPageViewLoader.php
+++ b/engine/Shopware/Components/Emotion/LandingPageViewLoader.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Emotion;
@@ -43,7 +43,7 @@ class LandingPageViewLoader
 
     public function __construct(
         DeviceConfigurationInterface $deviceConfiguration,
-        Shopware_Components_Translation $translationComponent = null
+        ?Shopware_Components_Translation $translationComponent = null
     ) {
         $this->deviceConfiguration = $deviceConfiguration;
         $this->translationComponent = $translationComponent ?: Shopware()->Container()->get(Shopware_Components_Translation::class);
diff --git a/engine/Shopware/Components/Emotion/LandingPageViewStruct.php b/engine/Shopware/Components/Emotion/LandingPageViewStruct.php
index 8f7ac423872..2bae47566df 100644
--- a/engine/Shopware/Components/Emotion/LandingPageViewStruct.php
+++ b/engine/Shopware/Components/Emotion/LandingPageViewStruct.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Emotion;
diff --git a/engine/Shopware/Components/Emotion/Preset/ComponentHandler/AbstractComponentHandler.php b/engine/Shopware/Components/Emotion/Preset/ComponentHandler/AbstractComponentHandler.php
index 05d2ea6045c..0219c3046f0 100644
--- a/engine/Shopware/Components/Emotion/Preset/ComponentHandler/AbstractComponentHandler.php
+++ b/engine/Shopware/Components/Emotion/Preset/ComponentHandler/AbstractComponentHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Emotion\Preset\ComponentHandler;
diff --git a/engine/Shopware/Components/Emotion/Preset/ComponentHandler/BannerComponentHandler.php b/engine/Shopware/Components/Emotion/Preset/ComponentHandler/BannerComponentHandler.php
index 6bbc24f98b2..592fc229883 100644
--- a/engine/Shopware/Components/Emotion/Preset/ComponentHandler/BannerComponentHandler.php
+++ b/engine/Shopware/Components/Emotion/Preset/ComponentHandler/BannerComponentHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Emotion\Preset\ComponentHandler;
diff --git a/engine/Shopware/Components/Emotion/Preset/ComponentHandler/BannerSliderComponentHandler.php b/engine/Shopware/Components/Emotion/Preset/ComponentHandler/BannerSliderComponentHandler.php
index 67db69a3470..74733803e2c 100644
--- a/engine/Shopware/Components/Emotion/Preset/ComponentHandler/BannerSliderComponentHandler.php
+++ b/engine/Shopware/Components/Emotion/Preset/ComponentHandler/BannerSliderComponentHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Emotion\Preset\ComponentHandler;
diff --git a/engine/Shopware/Components/Emotion/Preset/ComponentHandler/CategoryTeaserComponentHandler.php b/engine/Shopware/Components/Emotion/Preset/ComponentHandler/CategoryTeaserComponentHandler.php
index 0b6ce802523..0f6c789e847 100644
--- a/engine/Shopware/Components/Emotion/Preset/ComponentHandler/CategoryTeaserComponentHandler.php
+++ b/engine/Shopware/Components/Emotion/Preset/ComponentHandler/CategoryTeaserComponentHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Emotion\Preset\ComponentHandler;
diff --git a/engine/Shopware/Components/Emotion/Preset/ComponentHandler/ComponentHandlerInterface.php b/engine/Shopware/Components/Emotion/Preset/ComponentHandler/ComponentHandlerInterface.php
index d75fac7ba7d..5a0bc31919a 100644
--- a/engine/Shopware/Components/Emotion/Preset/ComponentHandler/ComponentHandlerInterface.php
+++ b/engine/Shopware/Components/Emotion/Preset/ComponentHandler/ComponentHandlerInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Emotion\Preset\ComponentHandler;
diff --git a/engine/Shopware/Components/Emotion/Preset/ComponentHandler/Html5VideoComponentHandler.php b/engine/Shopware/Components/Emotion/Preset/ComponentHandler/Html5VideoComponentHandler.php
index 8188042478e..3696fcc3b25 100644
--- a/engine/Shopware/Components/Emotion/Preset/ComponentHandler/Html5VideoComponentHandler.php
+++ b/engine/Shopware/Components/Emotion/Preset/ComponentHandler/Html5VideoComponentHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Emotion\Preset\ComponentHandler;
diff --git a/engine/Shopware/Components/Emotion/Preset/EmotionToPresetDataTransformer.php b/engine/Shopware/Components/Emotion/Preset/EmotionToPresetDataTransformer.php
index 39b5e58fd83..0e0e975242b 100644
--- a/engine/Shopware/Components/Emotion/Preset/EmotionToPresetDataTransformer.php
+++ b/engine/Shopware/Components/Emotion/Preset/EmotionToPresetDataTransformer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Emotion\Preset;
@@ -65,13 +65,13 @@ private function getEmotionData($emotionId)
         $builder = $this->modelManager->createQueryBuilder();
 
         return $builder->select([
-                'emotion',
-                'elements',
-                'viewports',
-                'component',
-                'data',
-                'fields',
-            ])
+            'emotion',
+            'elements',
+            'viewports',
+            'component',
+            'data',
+            'fields',
+        ])
             ->from(Emotion::class, 'emotion')
             ->leftJoin('emotion.elements', 'elements')
             ->leftJoin('elements.viewports', 'viewports')
@@ -163,7 +163,7 @@ private function cleanupElementData(array $element, array $fieldMapping)
                 $data['emotionId'],
                 $data['elementId']
             );
-            $field = $fieldMapping[$data['fieldId']];
+            $field = $fieldMapping[$data['fieldId']] ?? null;
 
             if ($field) {
                 $data['fieldId'] = $field['name'];
diff --git a/engine/Shopware/Components/Emotion/Preset/EmotionToPresetDataTransformerInterface.php b/engine/Shopware/Components/Emotion/Preset/EmotionToPresetDataTransformerInterface.php
index c568f70fbf2..4474a12cfe9 100644
--- a/engine/Shopware/Components/Emotion/Preset/EmotionToPresetDataTransformerInterface.php
+++ b/engine/Shopware/Components/Emotion/Preset/EmotionToPresetDataTransformerInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Emotion\Preset;
diff --git a/engine/Shopware/Components/Emotion/Preset/Exception/PresetAssetImportException.php b/engine/Shopware/Components/Emotion/Preset/Exception/PresetAssetImportException.php
index f03a3cabead..8b32111966c 100644
--- a/engine/Shopware/Components/Emotion/Preset/Exception/PresetAssetImportException.php
+++ b/engine/Shopware/Components/Emotion/Preset/Exception/PresetAssetImportException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Emotion\Preset\Exception;
diff --git a/engine/Shopware/Components/Emotion/Preset/PresetDataSynchronizer.php b/engine/Shopware/Components/Emotion/Preset/PresetDataSynchronizer.php
index 378437dce78..dc640c6e601 100644
--- a/engine/Shopware/Components/Emotion/Preset/PresetDataSynchronizer.php
+++ b/engine/Shopware/Components/Emotion/Preset/PresetDataSynchronizer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Emotion\Preset;
@@ -82,7 +82,7 @@ public function importElementAssets(Preset $preset, $elementSyncKey)
         $presetData = json_decode($preset->getPresetData(), true);
 
         if (!$presetData || !\is_array($presetData) || !\array_key_exists('elements', $presetData)) {
-            throw new PresetAssetImportException(sprintf('The preset data of the %s preset seems to be invalid.', $preset->getName()));
+            throw new PresetAssetImportException(\sprintf('The preset data of the %s preset seems to be invalid.', $preset->getName()));
         }
 
         // continue if no sync data present or we just have an assets key which is empty
@@ -182,7 +182,7 @@ private function synchronizeData(Preset $preset, array $element)
     private function findElementBySyncKey(array $presetData, $elementSyncKey)
     {
         foreach ($presetData['elements'] as $element) {
-            if ($element['syncKey'] === $elementSyncKey) {
+            if (isset($element['syncKey']) && $element['syncKey'] === $elementSyncKey) {
                 return $element;
             }
         }
diff --git a/engine/Shopware/Components/Emotion/Preset/PresetDataSynchronizerInterface.php b/engine/Shopware/Components/Emotion/Preset/PresetDataSynchronizerInterface.php
index 8b3e7ab85a6..cc3cfdbe89e 100644
--- a/engine/Shopware/Components/Emotion/Preset/PresetDataSynchronizerInterface.php
+++ b/engine/Shopware/Components/Emotion/Preset/PresetDataSynchronizerInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Emotion\Preset;
@@ -33,6 +33,8 @@ interface PresetDataSynchronizerInterface
      * @param string $elementSyncKey
      *
      * @throws PresetAssetImportException
+     *
+     * @return void
      */
     public function importElementAssets(Preset $preset, $elementSyncKey);
 
diff --git a/engine/Shopware/Components/Emotion/Preset/PresetInstaller.php b/engine/Shopware/Components/Emotion/Preset/PresetInstaller.php
index 6f0da5b63eb..dc36124049b 100644
--- a/engine/Shopware/Components/Emotion/Preset/PresetInstaller.php
+++ b/engine/Shopware/Components/Emotion/Preset/PresetInstaller.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Emotion\Preset;
diff --git a/engine/Shopware/Components/Emotion/Preset/PresetInstallerInterface.php b/engine/Shopware/Components/Emotion/Preset/PresetInstallerInterface.php
index eb64151ca52..8e7b3f299b9 100644
--- a/engine/Shopware/Components/Emotion/Preset/PresetInstallerInterface.php
+++ b/engine/Shopware/Components/Emotion/Preset/PresetInstallerInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Emotion\Preset;
@@ -27,9 +27,16 @@
 interface PresetInstallerInterface
 {
     /**
-     * @param PresetMetaDataInterface[] $presetMetaData
+     * @param array<PresetMetaDataInterface> $presetMetaData
+     *
+     * @return void
      */
     public function installOrUpdate(array $presetMetaData);
 
+    /**
+     * @param array<string> $presetNames
+     *
+     * @return void
+     */
     public function uninstall(array $presetNames);
 }
diff --git a/engine/Shopware/Components/Emotion/Preset/PresetLoader.php b/engine/Shopware/Components/Emotion/Preset/PresetLoader.php
index 60e50a53963..d4d7c7bef5e 100644
--- a/engine/Shopware/Components/Emotion/Preset/PresetLoader.php
+++ b/engine/Shopware/Components/Emotion/Preset/PresetLoader.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Emotion\Preset;
@@ -29,19 +30,14 @@
 use Shopware\Bundle\MediaBundle\MediaServiceInterface;
 use Shopware\Components\Model\ModelManager;
 use Shopware\Models\Emotion\Library\Component;
+use Shopware\Models\Emotion\Library\Field;
 use Shopware\Models\Emotion\Preset;
 
 class PresetLoader implements PresetLoaderInterface
 {
-    /**
-     * @var ModelManager
-     */
-    private $modelManager;
+    private ModelManager $modelManager;
 
-    /**
-     * @var MediaServiceInterface
-     */
-    private $mediaService;
+    private MediaServiceInterface $mediaService;
 
     public function __construct(ModelManager $modelManager, MediaServiceInterface $mediaService)
     {
@@ -62,7 +58,7 @@ public function load($presetId)
 
         $presetData = json_decode($preset->getPresetData(), true);
 
-        if (!$presetData['elements']) {
+        if (empty($presetData['elements'])) {
             return $preset->getPresetData();
         }
 
@@ -79,10 +75,7 @@ public function load($presetId)
         return $this->preparePresetData($presetData);
     }
 
-    /**
-     * @return array
-     */
-    private function refreshElementData(array $elements)
+    private function refreshElementData(array $elements): array
     {
         $collectedComponents = array_column($elements, 'componentId');
         $collectedComponents = array_keys(array_flip($collectedComponents));
@@ -102,7 +95,7 @@ private function refreshElementData(array $elements)
 
                 foreach ($element['data'] as &$data) {
                     $data['componentId'] = $element['componentId'];
-                    $data['fieldId'] = $fieldMapping[$data['fieldId']]['id'];
+                    $data['fieldId'] = $fieldMapping[$data['fieldId']]['id'] ?? null;
                 }
                 unset($data);
             }
@@ -117,7 +110,7 @@ private function refreshElementData(array $elements)
      *
      * @return string $presetData
      */
-    private function preparePresetData(array $presetData)
+    private function preparePresetData(array $presetData): string
     {
         foreach ($presetData['elements'] as &$element) {
             $fieldMapping = [];
@@ -128,13 +121,16 @@ private function preparePresetData(array $presetData)
             }
 
             foreach ($element['data'] as &$data) {
-                $field = $fieldMapping[$data['fieldId']];
+                $field = $fieldMapping[$data['fieldId']] ?? null;
+                if ($field === null) {
+                    continue;
+                }
 
                 if (\in_array($field['name'], ['file', 'image', 'fallback_picture'], true)) {
                     $data['value'] = $this->mediaService->getUrl($data['value']);
                 }
 
-                if (!empty($data['value']) && strtolower($field['valueType']) === 'json') {
+                if (!empty($data['value']) && strtolower($field['valueType']) === Field::VALUE_TYPE_JSON) {
                     $data['value'] = json_decode($data['value'], true);
                     if (\is_array($data['value'])) {
                         foreach ($data['value'] as $key => &$value) {
@@ -154,10 +150,7 @@ private function preparePresetData(array $presetData)
         return json_encode($presetData);
     }
 
-    /**
-     * @return array
-     */
-    private function getComponentData(array $collectedComponents)
+    private function getComponentData(array $collectedComponents): array
     {
         return $this->modelManager->createQueryBuilder()
             ->select('component', 'fields')
diff --git a/engine/Shopware/Components/Emotion/Preset/PresetLoaderInterface.php b/engine/Shopware/Components/Emotion/Preset/PresetLoaderInterface.php
index 93ba6dc29ee..75cace32e8b 100644
--- a/engine/Shopware/Components/Emotion/Preset/PresetLoaderInterface.php
+++ b/engine/Shopware/Components/Emotion/Preset/PresetLoaderInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Emotion\Preset;
diff --git a/engine/Shopware/Components/Emotion/Preset/PresetMetaDataInterface.php b/engine/Shopware/Components/Emotion/Preset/PresetMetaDataInterface.php
index d56bc50c5d4..11395745e6e 100644
--- a/engine/Shopware/Components/Emotion/Preset/PresetMetaDataInterface.php
+++ b/engine/Shopware/Components/Emotion/Preset/PresetMetaDataInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Emotion\Preset;
diff --git a/engine/Shopware/Components/ErrorSubscriber.php b/engine/Shopware/Components/ErrorSubscriber.php
index 8e34f851140..a4105b4c03c 100644
--- a/engine/Shopware/Components/ErrorSubscriber.php
+++ b/engine/Shopware/Components/ErrorSubscriber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
diff --git a/engine/Shopware/Components/Escaper/Escaper.php b/engine/Shopware/Components/Escaper/Escaper.php
index 8d633aace86..dd9e081ab4e 100644
--- a/engine/Shopware/Components/Escaper/Escaper.php
+++ b/engine/Shopware/Components/Escaper/Escaper.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Escaper;
@@ -27,7 +28,7 @@
 use Laminas\Escaper\Escaper as LaminasEscaper;
 
 /**
- * @see https://github.com/laminas/laminas-escaper/blob/2.9.x/src/Escaper.php
+ * @see https://github.com/laminas/laminas-escaper/blob/2.12.x/src/Escaper.php
  */
 class Escaper implements EscaperInterface
 {
diff --git a/engine/Shopware/Components/Escaper/EscaperInterface.php b/engine/Shopware/Components/Escaper/EscaperInterface.php
index 0df0536a8ac..9590a82c56e 100644
--- a/engine/Shopware/Components/Escaper/EscaperInterface.php
+++ b/engine/Shopware/Components/Escaper/EscaperInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Escaper;
diff --git a/engine/Shopware/Components/Filesystem/Exception/AdapterFactoryNotFoundException.php b/engine/Shopware/Components/Filesystem/Exception/AdapterFactoryNotFoundException.php
index 9200a9ccfad..cc29b87ba8a 100644
--- a/engine/Shopware/Components/Filesystem/Exception/AdapterFactoryNotFoundException.php
+++ b/engine/Shopware/Components/Filesystem/Exception/AdapterFactoryNotFoundException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Filesystem\Exception;
@@ -30,6 +30,6 @@ class AdapterFactoryNotFoundException extends Exception
 {
     public static function fromAdapterType($type)
     {
-        return new self(sprintf('Adapter factory for type "%s" was not found.', $type));
+        return new self(\sprintf('Adapter factory for type "%s" was not found.', $type));
     }
 }
diff --git a/engine/Shopware/Components/Filesystem/Exception/DuplicateFilesystemFactoryException.php b/engine/Shopware/Components/Filesystem/Exception/DuplicateFilesystemFactoryException.php
index e76951c354f..24c961e142c 100644
--- a/engine/Shopware/Components/Filesystem/Exception/DuplicateFilesystemFactoryException.php
+++ b/engine/Shopware/Components/Filesystem/Exception/DuplicateFilesystemFactoryException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Filesystem\Exception;
@@ -30,6 +30,6 @@ class DuplicateFilesystemFactoryException extends Exception
 {
     public static function fromAdapterType($type)
     {
-        return new self(sprintf('The type of factory "%s" must be unique.', $type));
+        return new self(\sprintf('The type of factory "%s" must be unique.', $type));
     }
 }
diff --git a/engine/Shopware/Components/Filesystem/FilesystemFactory.php b/engine/Shopware/Components/Filesystem/FilesystemFactory.php
index d0d1cba5d57..ca964f37b1b 100644
--- a/engine/Shopware/Components/Filesystem/FilesystemFactory.php
+++ b/engine/Shopware/Components/Filesystem/FilesystemFactory.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Filesystem;
diff --git a/engine/Shopware/Components/Filesystem/FilesystemFactoryInterface.php b/engine/Shopware/Components/Filesystem/FilesystemFactoryInterface.php
index f5a50037436..d73a0f32047 100644
--- a/engine/Shopware/Components/Filesystem/FilesystemFactoryInterface.php
+++ b/engine/Shopware/Components/Filesystem/FilesystemFactoryInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Filesystem;
diff --git a/engine/Shopware/Components/Filesystem/PrefixFilesystem.php b/engine/Shopware/Components/Filesystem/PrefixFilesystem.php
index 3cf5f59f85a..5d350baf49e 100644
--- a/engine/Shopware/Components/Filesystem/PrefixFilesystem.php
+++ b/engine/Shopware/Components/Filesystem/PrefixFilesystem.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Filesystem;
@@ -292,7 +292,7 @@ public function readAndDelete($path)
     /**
      * {@inheritdoc}
      */
-    public function get($path, Handler $handler = null)
+    public function get($path, ?Handler $handler = null)
     {
         $this->checkPath($path);
 
diff --git a/engine/Shopware/Components/Filesystem/PublicUrlGenerator.php b/engine/Shopware/Components/Filesystem/PublicUrlGenerator.php
index b99bc8a5444..ddf7d134d0a 100644
--- a/engine/Shopware/Components/Filesystem/PublicUrlGenerator.php
+++ b/engine/Shopware/Components/Filesystem/PublicUrlGenerator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Filesystem;
diff --git a/engine/Shopware/Components/Filesystem/PublicUrlGeneratorInterface.php b/engine/Shopware/Components/Filesystem/PublicUrlGeneratorInterface.php
index 5bb34ba21a8..5dcd6e7644c 100644
--- a/engine/Shopware/Components/Filesystem/PublicUrlGeneratorInterface.php
+++ b/engine/Shopware/Components/Filesystem/PublicUrlGeneratorInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Filesystem;
diff --git a/engine/Shopware/Components/Form/Base.php b/engine/Shopware/Components/Form/Base.php
index 1ba788d8fb9..c9569aff190 100644
--- a/engine/Shopware/Components/Form/Base.php
+++ b/engine/Shopware/Components/Form/Base.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Form;
diff --git a/engine/Shopware/Components/Form/Container.php b/engine/Shopware/Components/Form/Container.php
index 3c59ac5e411..2a7ccabd692 100644
--- a/engine/Shopware/Components/Form/Container.php
+++ b/engine/Shopware/Components/Form/Container.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Form;
@@ -31,7 +31,7 @@
 class Container extends Base implements ContainerInterface
 {
     /**
-     * @var ArrayCollection<\Shopware\Components\Form\Interfaces\Element>
+     * @var ArrayCollection<Element>
      */
     protected $elements;
 
@@ -70,7 +70,7 @@ public function getAttributes()
     }
 
     /**
-     * @param ArrayCollection<\Shopware\Components\Form\Interfaces\Element> $elements
+     * @param ArrayCollection<Element> $elements
      */
     public function setElements($elements)
     {
@@ -78,7 +78,7 @@ public function setElements($elements)
     }
 
     /**
-     * @return ArrayCollection<\Shopware\Components\Form\Interfaces\Element>
+     * @return ArrayCollection<Element>
      */
     public function getElements()
     {
diff --git a/engine/Shopware/Components/Form/Container/FieldSet.php b/engine/Shopware/Components/Form/Container/FieldSet.php
index c8decbdeed2..f05308e1140 100644
--- a/engine/Shopware/Components/Form/Container/FieldSet.php
+++ b/engine/Shopware/Components/Form/Container/FieldSet.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Form\Container;
diff --git a/engine/Shopware/Components/Form/Container/Tab.php b/engine/Shopware/Components/Form/Container/Tab.php
index 24fb5415a83..168dd3ab9c5 100644
--- a/engine/Shopware/Components/Form/Container/Tab.php
+++ b/engine/Shopware/Components/Form/Container/Tab.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Form\Container;
diff --git a/engine/Shopware/Components/Form/Container/TabContainer.php b/engine/Shopware/Components/Form/Container/TabContainer.php
index 37263215389..f73fa164265 100644
--- a/engine/Shopware/Components/Form/Container/TabContainer.php
+++ b/engine/Shopware/Components/Form/Container/TabContainer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Form\Container;
diff --git a/engine/Shopware/Components/Form/Field.php b/engine/Shopware/Components/Form/Field.php
index b6611c2f994..6b9b56cadb9 100644
--- a/engine/Shopware/Components/Form/Field.php
+++ b/engine/Shopware/Components/Form/Field.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Form;
@@ -175,7 +175,7 @@ public function getHelp()
     public function validate()
     {
         if (!$this->name) {
-            throw new Exception(sprintf('Field %s requires a configured name', \get_class($this)));
+            throw new Exception(\sprintf('Field %s requires a configured name', \get_class($this)));
         }
     }
 }
diff --git a/engine/Shopware/Components/Form/Field/Boolean.php b/engine/Shopware/Components/Form/Field/Boolean.php
index 3d89786ca79..fab73a1f2db 100644
--- a/engine/Shopware/Components/Form/Field/Boolean.php
+++ b/engine/Shopware/Components/Form/Field/Boolean.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Form\Field;
diff --git a/engine/Shopware/Components/Form/Field/Color.php b/engine/Shopware/Components/Form/Field/Color.php
index ac4daad0c59..ea36830934d 100644
--- a/engine/Shopware/Components/Form/Field/Color.php
+++ b/engine/Shopware/Components/Form/Field/Color.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Form\Field;
diff --git a/engine/Shopware/Components/Form/Field/Date.php b/engine/Shopware/Components/Form/Field/Date.php
index 9d6d95524ab..37ab2ee38ff 100644
--- a/engine/Shopware/Components/Form/Field/Date.php
+++ b/engine/Shopware/Components/Form/Field/Date.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Form\Field;
diff --git a/engine/Shopware/Components/Form/Field/Em.php b/engine/Shopware/Components/Form/Field/Em.php
index dab1087ee74..ac73c74cf9d 100644
--- a/engine/Shopware/Components/Form/Field/Em.php
+++ b/engine/Shopware/Components/Form/Field/Em.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Form\Field;
diff --git a/engine/Shopware/Components/Form/Field/Media.php b/engine/Shopware/Components/Form/Field/Media.php
index 5f45482adad..14490c56ed3 100644
--- a/engine/Shopware/Components/Form/Field/Media.php
+++ b/engine/Shopware/Components/Form/Field/Media.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Form\Field;
diff --git a/engine/Shopware/Components/Form/Field/NoUrl.php b/engine/Shopware/Components/Form/Field/NoUrl.php
new file mode 100644
index 00000000000..4a9aa777b06
--- /dev/null
+++ b/engine/Shopware/Components/Form/Field/NoUrl.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Components\Form\Field;
+
+use Shopware\Components\Form\Field;
+
+class NoUrl extends Field
+{
+    /**
+     * Requires to set a name for the field
+     */
+    public function __construct(string $name)
+    {
+        $this->name = $name;
+    }
+}
diff --git a/engine/Shopware/Components/Form/Field/Number.php b/engine/Shopware/Components/Form/Field/Number.php
index 5e97252be15..0eb678a0677 100644
--- a/engine/Shopware/Components/Form/Field/Number.php
+++ b/engine/Shopware/Components/Form/Field/Number.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Form\Field;
diff --git a/engine/Shopware/Components/Form/Field/Percent.php b/engine/Shopware/Components/Form/Field/Percent.php
index 251d6dad776..d825b32cd7e 100644
--- a/engine/Shopware/Components/Form/Field/Percent.php
+++ b/engine/Shopware/Components/Form/Field/Percent.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Form\Field;
diff --git a/engine/Shopware/Components/Form/Field/Pixel.php b/engine/Shopware/Components/Form/Field/Pixel.php
index bc7ae81216c..f036754e284 100644
--- a/engine/Shopware/Components/Form/Field/Pixel.php
+++ b/engine/Shopware/Components/Form/Field/Pixel.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Form\Field;
diff --git a/engine/Shopware/Components/Form/Field/Selection.php b/engine/Shopware/Components/Form/Field/Selection.php
index 2276a6fc967..0af337f6d58 100644
--- a/engine/Shopware/Components/Form/Field/Selection.php
+++ b/engine/Shopware/Components/Form/Field/Selection.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Form\Field;
@@ -72,7 +72,7 @@ public function validate()
         parent::validate();
 
         if (!$this->store) {
-            throw new Exception(sprintf('Field %s requires a configured store', $this->name));
+            throw new Exception(\sprintf('Field %s requires a configured store', $this->name));
         }
     }
 }
diff --git a/engine/Shopware/Components/Form/Field/Text.php b/engine/Shopware/Components/Form/Field/Text.php
index a7d04772896..f33e7cbdce6 100644
--- a/engine/Shopware/Components/Form/Field/Text.php
+++ b/engine/Shopware/Components/Form/Field/Text.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Form\Field;
diff --git a/engine/Shopware/Components/Form/Field/TextArea.php b/engine/Shopware/Components/Form/Field/TextArea.php
index 4db097d2c8f..ad2df5bb9d3 100644
--- a/engine/Shopware/Components/Form/Field/TextArea.php
+++ b/engine/Shopware/Components/Form/Field/TextArea.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Form\Field;
diff --git a/engine/Shopware/Components/Form/Interfaces/Container.php b/engine/Shopware/Components/Form/Interfaces/Container.php
index f4f6a1b07d4..96b384be7b8 100644
--- a/engine/Shopware/Components/Form/Interfaces/Container.php
+++ b/engine/Shopware/Components/Form/Interfaces/Container.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Form\Interfaces;
@@ -31,14 +31,14 @@ interface Container
     /**
      * Overrides all elements of this container
      *
-     * @param ArrayCollection<\Shopware\Components\Form\Interfaces\Element> $elements
+     * @param ArrayCollection<Element> $elements
      */
     public function setElements($elements);
 
     /**
      * Returns all elements of this container.
      *
-     * @return ArrayCollection<\Shopware\Components\Form\Interfaces\Element>
+     * @return ArrayCollection<Element>
      */
     public function getElements();
 
diff --git a/engine/Shopware/Components/Form/Interfaces/Element.php b/engine/Shopware/Components/Form/Interfaces/Element.php
index 6da43c425d7..d740204ca12 100644
--- a/engine/Shopware/Components/Form/Interfaces/Element.php
+++ b/engine/Shopware/Components/Form/Interfaces/Element.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Form\Interfaces;
diff --git a/engine/Shopware/Components/Form/Interfaces/Field.php b/engine/Shopware/Components/Form/Interfaces/Field.php
index 821627de365..c8cf98e6bd8 100644
--- a/engine/Shopware/Components/Form/Interfaces/Field.php
+++ b/engine/Shopware/Components/Form/Interfaces/Field.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Form\Interfaces;
diff --git a/engine/Shopware/Components/Form/Interfaces/Persister.php b/engine/Shopware/Components/Form/Interfaces/Persister.php
index 80bb5be9d36..fc745bcd0aa 100644
--- a/engine/Shopware/Components/Form/Interfaces/Persister.php
+++ b/engine/Shopware/Components/Form/Interfaces/Persister.php
@@ -1,37 +1,37 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Form\Interfaces;
 
-use Shopware\Components\Form;
+use Shopware\Models\Shop\Template;
 
 interface Persister
 {
     /**
      * Saves the given container to the database, files or wherever.
      *
-     * @param \Shopware\Models\Shop\Template $reference
+     * @param Template $reference
      */
-    public function save(Form\Interfaces\Container $container, $reference);
+    public function save(Container $container, $reference);
 }
diff --git a/engine/Shopware/Components/Form/Interfaces/Validate.php b/engine/Shopware/Components/Form/Interfaces/Validate.php
index e938fd40eae..d608746c1c6 100644
--- a/engine/Shopware/Components/Form/Interfaces/Validate.php
+++ b/engine/Shopware/Components/Form/Interfaces/Validate.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Form\Interfaces;
diff --git a/engine/Shopware/Components/Form/Persister/Theme.php b/engine/Shopware/Components/Form/Persister/Theme.php
index 41e806693bf..4d74693b4b6 100644
--- a/engine/Shopware/Components/Form/Persister/Theme.php
+++ b/engine/Shopware/Components/Form/Persister/Theme.php
@@ -1,32 +1,31 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Form\Persister;
 
 use Doctrine\Common\Collections\Collection;
 use Shopware\Components\Form;
-use Shopware\Components\Form\Container;
 use Shopware\Components\Form\Container\FieldSet;
 use Shopware\Components\Form\Container\Tab;
 use Shopware\Components\Form\Container\TabContainer;
@@ -36,6 +35,7 @@
 use Shopware\Components\Form\Field\Date;
 use Shopware\Components\Form\Field\Em;
 use Shopware\Components\Form\Field\Media;
+use Shopware\Components\Form\Field\NoUrl;
 use Shopware\Components\Form\Field\Number;
 use Shopware\Components\Form\Field\Percent;
 use Shopware\Components\Form\Field\Pixel;
@@ -204,6 +204,9 @@ private function saveField(Field $field, Template $template, Layout $parent): vo
             case TextArea::class:
                 $data += ['type' => 'theme-text-area-field'];
                 break;
+            case NoUrl::class:
+                $data += ['type' => 'widget.theme-nourl-field'];
+                break;
             case Selection::class:
                 $data += [
                     'type' => 'theme-select-field',
diff --git a/engine/Shopware/Components/HolidayTableUpdater.php b/engine/Shopware/Components/HolidayTableUpdater.php
index fe321455f8c..da7d887c5ab 100644
--- a/engine/Shopware/Components/HolidayTableUpdater.php
+++ b/engine/Shopware/Components/HolidayTableUpdater.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
@@ -100,12 +100,10 @@ private function updateHolidaysForYear(array $holidays, int $year): void
             }
             $calculation = str_replace(['EASTERDATE()', 'YEAR()'], ["'$easterDate'", "'$year'"], $calculation);
 
-            $sql = <<<SQL
-UPDATE s_premium_holidays
-set `date` = $calculation
-WHERE id = ?
-SQL;
-            $this->db->executeStatement($sql, [$id]);
+            $sql = 'UPDATE s_premium_holidays
+                    SET `date` = :calculation
+                    WHERE id = :id';
+            $this->db->executeStatement($sql, ['calculation' => $calculation, 'id' => $id]);
         }
     }
 
diff --git a/engine/Shopware/Components/HttpCache/AppCache.php b/engine/Shopware/Components/HttpCache/AppCache.php
index e66443c57a4..c13a3448f2b 100644
--- a/engine/Shopware/Components/HttpCache/AppCache.php
+++ b/engine/Shopware/Components/HttpCache/AppCache.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpCache;
@@ -59,7 +59,7 @@ class AppCache extends HttpCache
     protected $cacheDir;
 
     /**
-     * @var array
+     * @var array<string, mixed>
      */
     protected $options = [
         'purge_allowed_ips' => ['127.0.0.1', '::1'],
@@ -68,8 +68,8 @@ class AppCache extends HttpCache
     ];
 
     /**
-     * @param HttpKernelInterface $kernel  An HttpKernelInterface instance
-     * @param array               $options
+     * @param HttpKernelInterface  $kernel  An HttpKernelInterface instance
+     * @param array<string, mixed> $options
      */
     public function __construct(HttpKernelInterface $kernel, $options)
     {
@@ -119,6 +119,10 @@ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQ
         $response->headers->remove('cache-control');
         $response->headers->addCacheControlDirective('no-cache');
 
+        if (str_starts_with($request->getPathInfo(), '/account')) {
+            $response->headers->addCacheControlDirective('no-store');
+        }
+
         $response = $this->handleCookies($request, $response);
 
         $this->filterHttp2ServerPushHeader($request, $response);
@@ -256,7 +260,7 @@ protected function containsNoCacheTag(Request $request, Response $response)
      *
      * @return Response A Response instance
      */
-    protected function forward(Request $request, $raw = false, Response $entry = null)
+    protected function forward(Request $request, $raw = false, ?Response $entry = null)
     {
         $this->getKernel()->boot();
 
@@ -343,10 +347,7 @@ private function checkSltCookie(Request $request): void
             return;
         }
 
-        $noCache = $request->cookies->get('nocache');
-        if (!\is_string($noCache)) {
-            return;
-        }
+        $noCache = $request->cookies->get('nocache', '');
 
         $noCache = array_filter(explode(', ', $noCache));
         if (\in_array('slt', $noCache, true)) {
diff --git a/engine/Shopware/Components/HttpCache/BlackHoleStore.php b/engine/Shopware/Components/HttpCache/BlackHoleStore.php
index e9e6c561e37..b704a7ccd36 100644
--- a/engine/Shopware/Components/HttpCache/BlackHoleStore.php
+++ b/engine/Shopware/Components/HttpCache/BlackHoleStore.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpCache;
diff --git a/engine/Shopware/Components/HttpCache/CacheRouteGenerationService.php b/engine/Shopware/Components/HttpCache/CacheRouteGenerationService.php
index b49679aab4a..449373dfce1 100644
--- a/engine/Shopware/Components/HttpCache/CacheRouteGenerationService.php
+++ b/engine/Shopware/Components/HttpCache/CacheRouteGenerationService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpCache;
diff --git a/engine/Shopware/Components/HttpCache/CacheRouteInstaller.php b/engine/Shopware/Components/HttpCache/CacheRouteInstaller.php
index 6dcb3111f75..a46b232e66f 100644
--- a/engine/Shopware/Components/HttpCache/CacheRouteInstaller.php
+++ b/engine/Shopware/Components/HttpCache/CacheRouteInstaller.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpCache;
@@ -78,7 +78,7 @@ public function addHttpCacheRoute($route, $time, array $invalidateTags = [])
      */
     public function removeHttpCacheRoute($route)
     {
-        //remove cached controller
+        // remove cached controller
         $cacheRoutes = $this->configWriter->get('cacheControllers', 'HttpCache');
         if (empty($cacheRoutes)) {
             return false;
@@ -92,7 +92,7 @@ public function removeHttpCacheRoute($route)
         $cacheRoutes = $this->implodeHttpCacheRoutes($cacheRoutes);
         $this->configWriter->save('cacheControllers', $cacheRoutes, 'HttpCache');
 
-        //remove no cache tags
+        // remove no cache tags
         $noCacheRoutes = $this->configWriter->get('noCacheControllers', 'HttpCache');
         $noCacheRoutes = $this->explodeHttpCacheRoutes($noCacheRoutes);
         $noCacheRoutes = array_filter($noCacheRoutes, function ($row) use ($route) {
diff --git a/engine/Shopware/Components/HttpCache/CacheTimeServiceInterface.php b/engine/Shopware/Components/HttpCache/CacheTimeServiceInterface.php
index 407736ecbdf..cad11dccee7 100644
--- a/engine/Shopware/Components/HttpCache/CacheTimeServiceInterface.php
+++ b/engine/Shopware/Components/HttpCache/CacheTimeServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpCache;
diff --git a/engine/Shopware/Components/HttpCache/CacheWarmer.php b/engine/Shopware/Components/HttpCache/CacheWarmer.php
index 5ace748b374..054ed5d9817 100644
--- a/engine/Shopware/Components/HttpCache/CacheWarmer.php
+++ b/engine/Shopware/Components/HttpCache/CacheWarmer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpCache;
diff --git a/engine/Shopware/Components/HttpCache/DefaultCacheTimeService.php b/engine/Shopware/Components/HttpCache/DefaultCacheTimeService.php
index 22d813c2fc2..09ef59337f9 100644
--- a/engine/Shopware/Components/HttpCache/DefaultCacheTimeService.php
+++ b/engine/Shopware/Components/HttpCache/DefaultCacheTimeService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpCache;
diff --git a/engine/Shopware/Components/HttpCache/DefaultRouteService.php b/engine/Shopware/Components/HttpCache/DefaultRouteService.php
index b8cd9ba7051..ba4c97544bc 100644
--- a/engine/Shopware/Components/HttpCache/DefaultRouteService.php
+++ b/engine/Shopware/Components/HttpCache/DefaultRouteService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpCache;
@@ -52,7 +52,7 @@ public function __construct(ConfigReader $configReader, CacheRouteGenerationServ
      */
     public function getDefaultNoCacheTags()
     {
-        $controllers = $this->config['noCacheControllers'];
+        $controllers = $this->config['noCacheControllers'] ?? null;
         $result = [];
 
         if (empty($controllers)) {
@@ -78,7 +78,7 @@ public function getDefaultNoCacheTags()
      *
      * @return array<string>|int|null
      */
-    public function findRouteValue(Enlight_Controller_Request_Request $request, array $values = null)
+    public function findRouteValue(Enlight_Controller_Request_Request $request, ?array $values = null)
     {
         if (empty($values)) {
             $values = $this->getDefaultRouteValues();
diff --git a/engine/Shopware/Components/HttpCache/DynamicCacheTimeService.php b/engine/Shopware/Components/HttpCache/DynamicCacheTimeService.php
index f4e498760f6..b7629e0bb10 100644
--- a/engine/Shopware/Components/HttpCache/DynamicCacheTimeService.php
+++ b/engine/Shopware/Components/HttpCache/DynamicCacheTimeService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpCache;
diff --git a/engine/Shopware/Components/HttpCache/InvalidationDate/BlogDate.php b/engine/Shopware/Components/HttpCache/InvalidationDate/BlogDate.php
index 7cf5d7d05e9..5ed4ef86290 100644
--- a/engine/Shopware/Components/HttpCache/InvalidationDate/BlogDate.php
+++ b/engine/Shopware/Components/HttpCache/InvalidationDate/BlogDate.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpCache\InvalidationDate;
diff --git a/engine/Shopware/Components/HttpCache/InvalidationDate/BlogListingDate.php b/engine/Shopware/Components/HttpCache/InvalidationDate/BlogListingDate.php
index 94960d30658..ee7fb09f531 100644
--- a/engine/Shopware/Components/HttpCache/InvalidationDate/BlogListingDate.php
+++ b/engine/Shopware/Components/HttpCache/InvalidationDate/BlogListingDate.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpCache\InvalidationDate;
diff --git a/engine/Shopware/Components/HttpCache/InvalidationDate/CampaignDate.php b/engine/Shopware/Components/HttpCache/InvalidationDate/CampaignDate.php
index c2bb0a43a22..aec58b11d00 100644
--- a/engine/Shopware/Components/HttpCache/InvalidationDate/CampaignDate.php
+++ b/engine/Shopware/Components/HttpCache/InvalidationDate/CampaignDate.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpCache\InvalidationDate;
diff --git a/engine/Shopware/Components/HttpCache/InvalidationDate/InvalidationDateInterface.php b/engine/Shopware/Components/HttpCache/InvalidationDate/InvalidationDateInterface.php
index 7172ffdb788..f221cb57e2e 100644
--- a/engine/Shopware/Components/HttpCache/InvalidationDate/InvalidationDateInterface.php
+++ b/engine/Shopware/Components/HttpCache/InvalidationDate/InvalidationDateInterface.php
@@ -1,30 +1,30 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpCache\InvalidationDate;
 
-use DateTime;
+use DateTimeInterface;
 use Enlight_Controller_Request_Request as Request;
 
 interface InvalidationDateInterface
@@ -39,7 +39,7 @@ public function supportsRoute($route);
     /**
      * Returns the next point in time at which the given resource is unlocked.
      *
-     * @return DateTime|null
+     * @return DateTimeInterface|null
      */
     public function getInvalidationDate(Request $request);
 }
diff --git a/engine/Shopware/Components/HttpCache/InvalidationDate/InvalidationDateTrait.php b/engine/Shopware/Components/HttpCache/InvalidationDate/InvalidationDateTrait.php
index 42d0ea80fd8..bd4359c7201 100644
--- a/engine/Shopware/Components/HttpCache/InvalidationDate/InvalidationDateTrait.php
+++ b/engine/Shopware/Components/HttpCache/InvalidationDate/InvalidationDateTrait.php
@@ -1,39 +1,41 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpCache\InvalidationDate;
 
 use DateTime;
+use DateTimeInterface;
 
 trait InvalidationDateTrait
 {
     /**
      * getMostRecentDate sorts an array of DateTime objects and returns the most recent one.
      *
-     * @param DateTime[] $dates
+     * @param array<DateTimeInterface|string|null> $dates
      *
-     * @return DateTime|null
+     * @return DateTimeInterface|null
      */
     protected function getMostRecentDate(array $dates)
     {
@@ -41,8 +43,8 @@ protected function getMostRecentDate(array $dates)
 
         // Convert all date-strings into DateTime-objects
         $dates = array_map(function ($el) use ($now) {
-            if (!$el instanceof DateTime) {
-                $el = new DateTime($el);
+            if (!$el instanceof DateTimeInterface) {
+                $el = new DateTime($el ?? '');
             }
 
             return $now < $el ? $el : null;
@@ -55,17 +57,10 @@ protected function getMostRecentDate(array $dates)
             return null;
         }
 
-        // Pop a date as reference
-        $nearest = array_pop($dates);
-
-        // Find the nearest date
-        foreach ($dates as $date) {
-            if ($now->diff($nearest) < $now->diff($date)) {
-                continue;
-            }
-            $nearest = $date;
-        }
+        usort($dates, function (DateTimeInterface $a, DateTimeInterface $b): int {
+            return $a <=> $b;
+        });
 
-        return $nearest;
+        return array_pop($dates);
     }
 }
diff --git a/engine/Shopware/Components/HttpCache/InvalidationDate/ListingDate.php b/engine/Shopware/Components/HttpCache/InvalidationDate/ListingDate.php
index 9fcdb8b96d1..33af433dda9 100644
--- a/engine/Shopware/Components/HttpCache/InvalidationDate/ListingDate.php
+++ b/engine/Shopware/Components/HttpCache/InvalidationDate/ListingDate.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpCache\InvalidationDate;
diff --git a/engine/Shopware/Components/HttpCache/InvalidationDate/ListingDateFrontpage.php b/engine/Shopware/Components/HttpCache/InvalidationDate/ListingDateFrontpage.php
index ecfd448c967..3c54d90b32a 100644
--- a/engine/Shopware/Components/HttpCache/InvalidationDate/ListingDateFrontpage.php
+++ b/engine/Shopware/Components/HttpCache/InvalidationDate/ListingDateFrontpage.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpCache\InvalidationDate;
diff --git a/engine/Shopware/Components/HttpCache/InvalidationDate/ProductDetailDate.php b/engine/Shopware/Components/HttpCache/InvalidationDate/ProductDetailDate.php
index c90ec4bd374..0f742ae09ee 100644
--- a/engine/Shopware/Components/HttpCache/InvalidationDate/ProductDetailDate.php
+++ b/engine/Shopware/Components/HttpCache/InvalidationDate/ProductDetailDate.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpCache\InvalidationDate;
diff --git a/engine/Shopware/Components/HttpCache/Store.php b/engine/Shopware/Components/HttpCache/Store.php
index 11061e4b8a8..cb35baa370f 100644
--- a/engine/Shopware/Components/HttpCache/Store.php
+++ b/engine/Shopware/Components/HttpCache/Store.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpCache;
@@ -206,7 +206,7 @@ public function write(Request $request, Response $response)
             $content[$cacheKey] = $headerKey;
 
             if (!$this->save($key, json_encode($content))) {
-                throw new RuntimeException(sprintf('Could not write cacheKey "%s"', $key));
+                throw new RuntimeException(\sprintf('Could not write cacheKey "%s"', $key));
             }
         }
 
@@ -266,7 +266,7 @@ private function verifyIgnoredParameters(Request $request)
         /**
          * Normalize URL to consistently return the same path even when variables are present
          */
-        $uri = sprintf(
+        $uri = \sprintf(
             '%s%s%s',
             $request->getSchemeAndHttpHost(),
             $path,
diff --git a/engine/Shopware/Components/HttpCache/UrlProvider/BlogProvider.php b/engine/Shopware/Components/HttpCache/UrlProvider/BlogProvider.php
index 46fbb9f4447..6cc53e04f9d 100644
--- a/engine/Shopware/Components/HttpCache/UrlProvider/BlogProvider.php
+++ b/engine/Shopware/Components/HttpCache/UrlProvider/BlogProvider.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpCache\UrlProvider;
@@ -93,7 +93,7 @@ protected function getBaseQuery()
                 'blog',
                 's_categories',
                 'cat',
-                sprintf('blog.category_id = cat.id
+                \sprintf('blog.category_id = cat.id
                         AND blog.category_id IN (%s)', $this->prepareSubQuery()->getSQL())
             )
             ->where('blog.active = 1');
diff --git a/engine/Shopware/Components/HttpCache/UrlProvider/CategoryProvider.php b/engine/Shopware/Components/HttpCache/UrlProvider/CategoryProvider.php
index c6798a39f75..a141a421a33 100644
--- a/engine/Shopware/Components/HttpCache/UrlProvider/CategoryProvider.php
+++ b/engine/Shopware/Components/HttpCache/UrlProvider/CategoryProvider.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpCache\UrlProvider;
diff --git a/engine/Shopware/Components/HttpCache/UrlProvider/EmotionProvider.php b/engine/Shopware/Components/HttpCache/UrlProvider/EmotionProvider.php
index 9b8a3589fe8..a46b57dd11d 100644
--- a/engine/Shopware/Components/HttpCache/UrlProvider/EmotionProvider.php
+++ b/engine/Shopware/Components/HttpCache/UrlProvider/EmotionProvider.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpCache\UrlProvider;
@@ -106,7 +106,7 @@ protected function getBaseQuery()
             )
             ->leftJoin('emo_cat', 's_categories', 'cat', 'emo_cat.category_id = cat.id')
             ->where('emo.active = 1')
-            ->andWhere(sprintf('emo_cat.category_id IN (%s)', $this->prepareSubQuery()->getSQL()))
+            ->andWhere(\sprintf('emo_cat.category_id IN (%s)', $this->prepareSubQuery()->getSQL()))
             ->andWhere('emo.valid_to > NOW() OR emo.valid_to IS NULL');
     }
 
diff --git a/engine/Shopware/Components/HttpCache/UrlProvider/FormProvider.php b/engine/Shopware/Components/HttpCache/UrlProvider/FormProvider.php
index 58e7efbae19..93f9d157135 100644
--- a/engine/Shopware/Components/HttpCache/UrlProvider/FormProvider.php
+++ b/engine/Shopware/Components/HttpCache/UrlProvider/FormProvider.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpCache\UrlProvider;
@@ -79,12 +79,12 @@ public function getUrls(Context $context, $limit = null, $offset = null): array
         }
 
         return $this->router->generateList(
-            array_filter(array_map(
+            array_map(
                 function ($custom) {
                     return ['sViewport' => 'forms', 'sFid' => $custom['id']];
                 },
                 $result
-            )),
+            ),
             $context
         );
     }
diff --git a/engine/Shopware/Components/HttpCache/UrlProvider/ManufacturerProvider.php b/engine/Shopware/Components/HttpCache/UrlProvider/ManufacturerProvider.php
index 910d05fe861..ebaeed681f7 100644
--- a/engine/Shopware/Components/HttpCache/UrlProvider/ManufacturerProvider.php
+++ b/engine/Shopware/Components/HttpCache/UrlProvider/ManufacturerProvider.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpCache\UrlProvider;
diff --git a/engine/Shopware/Components/HttpCache/UrlProvider/ProductProvider.php b/engine/Shopware/Components/HttpCache/UrlProvider/ProductProvider.php
index 55236c9bbef..68891d17fac 100644
--- a/engine/Shopware/Components/HttpCache/UrlProvider/ProductProvider.php
+++ b/engine/Shopware/Components/HttpCache/UrlProvider/ProductProvider.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpCache\UrlProvider;
diff --git a/engine/Shopware/Components/HttpCache/UrlProvider/ProductWithCategoryProvider.php b/engine/Shopware/Components/HttpCache/UrlProvider/ProductWithCategoryProvider.php
index 7d6023f0d23..fe61925f395 100644
--- a/engine/Shopware/Components/HttpCache/UrlProvider/ProductWithCategoryProvider.php
+++ b/engine/Shopware/Components/HttpCache/UrlProvider/ProductWithCategoryProvider.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpCache\UrlProvider;
diff --git a/engine/Shopware/Components/HttpCache/UrlProvider/ProductWithNumberProvider.php b/engine/Shopware/Components/HttpCache/UrlProvider/ProductWithNumberProvider.php
index b0870f283af..83888aa8a1a 100644
--- a/engine/Shopware/Components/HttpCache/UrlProvider/ProductWithNumberProvider.php
+++ b/engine/Shopware/Components/HttpCache/UrlProvider/ProductWithNumberProvider.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpCache\UrlProvider;
diff --git a/engine/Shopware/Components/HttpCache/UrlProvider/StaticProvider.php b/engine/Shopware/Components/HttpCache/UrlProvider/StaticProvider.php
index c0c71a32b6f..e956588059a 100644
--- a/engine/Shopware/Components/HttpCache/UrlProvider/StaticProvider.php
+++ b/engine/Shopware/Components/HttpCache/UrlProvider/StaticProvider.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpCache\UrlProvider;
@@ -129,7 +129,7 @@ private function isShopwareLink(string $link): bool
     /**
      * @param array<string, mixed> $custom
      *
-     * @return array<string, mixed>
+     * @return array<array-key, mixed>
      */
     private function createRequestParameters(array $custom): array
     {
diff --git a/engine/Shopware/Components/HttpCache/UrlProvider/UrlProviderInterface.php b/engine/Shopware/Components/HttpCache/UrlProvider/UrlProviderInterface.php
index 9efb734dcc6..5d470779a75 100644
--- a/engine/Shopware/Components/HttpCache/UrlProvider/UrlProviderInterface.php
+++ b/engine/Shopware/Components/HttpCache/UrlProvider/UrlProviderInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpCache\UrlProvider;
diff --git a/engine/Shopware/Components/HttpCache/UrlProvider/VariantSwitchProvider.php b/engine/Shopware/Components/HttpCache/UrlProvider/VariantSwitchProvider.php
index 8ad942d0819..e1055c5fe20 100644
--- a/engine/Shopware/Components/HttpCache/UrlProvider/VariantSwitchProvider.php
+++ b/engine/Shopware/Components/HttpCache/UrlProvider/VariantSwitchProvider.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpCache\UrlProvider;
@@ -50,7 +50,7 @@ public function getUrls(Context $context, $limit = null, $offset = null)
                   ORDER BY opt.group_id ASC
                   SEPARATOR '&')
               AS 'link'"])
-            ->where(sprintf('article.id IN (%s)', $this->prepareSubQuery()->getSQL()))
+            ->where(\sprintf('article.id IN (%s)', $this->prepareSubQuery()->getSQL()))
             ->groupBy('details.ordernumber')
             ->orderBy('details.ordernumber', 'ASC')
             ->setParameter(':shop', $context->getShopId());
@@ -93,7 +93,7 @@ public function getCount(Context $context)
     {
         return (int) $this->getBaseQuery()
             ->addSelect(['COUNT(DISTINCT details.ordernumber)'])
-            ->where(sprintf('article.id IN (%s)', $this->prepareSubQuery()->getSQL()))
+            ->where(\sprintf('article.id IN (%s)', $this->prepareSubQuery()->getSQL()))
             ->setParameter(':shop', $context->getShopId())
             ->execute()
             ->fetchColumn();
diff --git a/engine/Shopware/Components/HttpCache/UrlProviderFactory.php b/engine/Shopware/Components/HttpCache/UrlProviderFactory.php
index 5f0684ffc13..a4e299d59f8 100644
--- a/engine/Shopware/Components/HttpCache/UrlProviderFactory.php
+++ b/engine/Shopware/Components/HttpCache/UrlProviderFactory.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpCache;
@@ -51,7 +51,7 @@ public function getProvider($providerName)
             }
         }
 
-        throw new RuntimeException(sprintf('No provider with name "%s" found', $providerName));
+        throw new RuntimeException(\sprintf('No provider with name "%s" found', $providerName));
     }
 
     /**
diff --git a/engine/Shopware/Components/HttpCache/UrlProviderFactoryInterface.php b/engine/Shopware/Components/HttpCache/UrlProviderFactoryInterface.php
index f049a81b99b..ee9619a56c1 100644
--- a/engine/Shopware/Components/HttpCache/UrlProviderFactoryInterface.php
+++ b/engine/Shopware/Components/HttpCache/UrlProviderFactoryInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpCache;
diff --git a/engine/Shopware/Components/HttpClient/GuzzleFactory.php b/engine/Shopware/Components/HttpClient/GuzzleFactory.php
index 1dd357893fe..4bc4d98dcd2 100644
--- a/engine/Shopware/Components/HttpClient/GuzzleFactory.php
+++ b/engine/Shopware/Components/HttpClient/GuzzleFactory.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpClient;
diff --git a/engine/Shopware/Components/HttpClient/GuzzleHttpClient.php b/engine/Shopware/Components/HttpClient/GuzzleHttpClient.php
index 5bae03837ed..1d0f3ad5cd4 100644
--- a/engine/Shopware/Components/HttpClient/GuzzleHttpClient.php
+++ b/engine/Shopware/Components/HttpClient/GuzzleHttpClient.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpClient;
@@ -30,10 +30,7 @@
 
 class GuzzleHttpClient implements HttpClientInterface
 {
-    /**
-     * @var ClientInterface
-     */
-    private $guzzleClient;
+    private ClientInterface $guzzleClient;
 
     public function __construct(GuzzleFactory $guzzleFactory, array $guzzleConfig = [])
     {
diff --git a/engine/Shopware/Components/HttpClient/HttpClientInterface.php b/engine/Shopware/Components/HttpClient/HttpClientInterface.php
index 0e1c1acd748..14a6138d59a 100644
--- a/engine/Shopware/Components/HttpClient/HttpClientInterface.php
+++ b/engine/Shopware/Components/HttpClient/HttpClientInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpClient;
diff --git a/engine/Shopware/Components/HttpClient/RequestException.php b/engine/Shopware/Components/HttpClient/RequestException.php
index 642c84caed9..3d54a07ba66 100644
--- a/engine/Shopware/Components/HttpClient/RequestException.php
+++ b/engine/Shopware/Components/HttpClient/RequestException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpClient;
@@ -34,12 +34,11 @@ class RequestException extends Exception
     private $body;
 
     /**
-     * @param string    $message
-     * @param int       $code
-     * @param Exception $previous
-     * @param string    $body
+     * @param string $message
+     * @param int    $code
+     * @param string $body
      */
-    public function __construct($message = '', $code = 0, Exception $previous = null, $body = null)
+    public function __construct($message = '', $code = 0, ?Exception $previous = null, $body = null)
     {
         $this->body = $body;
         parent::__construct($message, $code, $previous);
diff --git a/engine/Shopware/Components/HttpClient/Response.php b/engine/Shopware/Components/HttpClient/Response.php
index 4d1df5ef52e..47f5b1f0e1f 100644
--- a/engine/Shopware/Components/HttpClient/Response.php
+++ b/engine/Shopware/Components/HttpClient/Response.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\HttpClient;
diff --git a/engine/Shopware/Components/Install/Database.php b/engine/Shopware/Components/Install/Database.php
index 2559f943ea2..dee458e6b62 100644
--- a/engine/Shopware/Components/Install/Database.php
+++ b/engine/Shopware/Components/Install/Database.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Install;
@@ -48,10 +48,10 @@ public function __construct(PDO $connection)
      */
     public function importFile($dbName, $file)
     {
-        $this->connection->query(sprintf('use `%s`', $dbName));
+        $this->connection->query(\sprintf('use `%s`', $dbName));
 
         if (($contents = file_get_contents($file)) === false) {
-            throw new Exception(sprintf('Could not open file: %s', $file));
+            throw new Exception(\sprintf('Could not open file: %s', $file));
         }
 
         $rows = explode(";\n", trim($contents));
@@ -70,7 +70,7 @@ public function setupShop($url, $dbName)
     {
         $parts = parse_url($url);
         if ($parts === false || !\array_key_exists('host', $parts) || !\array_key_exists('scheme', $parts)) {
-            throw new InvalidArgumentException(sprintf('Invalid Shop URL (%s)', $url));
+            throw new InvalidArgumentException(\sprintf('Invalid Shop URL (%s)', $url));
         }
 
         $isSecure = $parts['scheme'] === 'https';
@@ -87,7 +87,7 @@ public function setupShop($url, $dbName)
             $path = '/' . $path;
         }
 
-        $this->connection->query(sprintf('use `%s`', $dbName));
+        $this->connection->query(\sprintf('use `%s`', $dbName));
 
         $stmt = $this->connection->prepare('UPDATE `s_core_shops` SET `host` = :host, `base_path` = :path, `secure` = :isSecure WHERE `main_id` IS NULL');
         $stmt->execute([
@@ -102,7 +102,7 @@ public function setupShop($url, $dbName)
      */
     public function emptyDatabase($dbName)
     {
-        $this->connection->query(sprintf('use `%s`', $dbName));
+        $this->connection->query(\sprintf('use `%s`', $dbName));
 
         $sql = <<<'SQL'
 SET FOREIGN_KEY_CHECKS = 0;
@@ -131,7 +131,7 @@ public function emptyDatabase($dbName)
     public function dropDatabase($dbName)
     {
         $this->connection->exec(
-            sprintf(
+            \sprintf(
                 'DROP DATABASE IF EXISTS `%s`',
                 $dbName
             )
@@ -146,14 +146,14 @@ public function dropDatabase($dbName)
     public function createDatabase($dbName)
     {
         $this->connection->exec(
-            sprintf(
+            \sprintf(
                 'CREATE DATABASE `%s`',
                 $dbName
             )
         );
 
         $this->connection->exec(
-            sprintf(
+            \sprintf(
                 'ALTER DATABASE `%s` DEFAULT CHARACTER SET = utf8 COLLATE = utf8_unicode_ci;',
                 $dbName
             )
diff --git a/engine/Shopware/Components/LastArticlesSubscriber.php b/engine/Shopware/Components/LastArticlesSubscriber.php
index 8bc63660d31..1407e2f6bbc 100644
--- a/engine/Shopware/Components/LastArticlesSubscriber.php
+++ b/engine/Shopware/Components/LastArticlesSubscriber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
diff --git a/engine/Shopware/Components/LegacyRequestWrapper/CookieWrapper.php b/engine/Shopware/Components/LegacyRequestWrapper/CookieWrapper.php
index d79c1b300bf..f7c2b281a9f 100644
--- a/engine/Shopware/Components/LegacyRequestWrapper/CookieWrapper.php
+++ b/engine/Shopware/Components/LegacyRequestWrapper/CookieWrapper.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\LegacyRequestWrapper;
diff --git a/engine/Shopware/Components/LegacyRequestWrapper/GetWrapper.php b/engine/Shopware/Components/LegacyRequestWrapper/GetWrapper.php
index 6ba1767d676..2e76ca73367 100644
--- a/engine/Shopware/Components/LegacyRequestWrapper/GetWrapper.php
+++ b/engine/Shopware/Components/LegacyRequestWrapper/GetWrapper.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\LegacyRequestWrapper;
diff --git a/engine/Shopware/Components/LegacyRequestWrapper/PostWrapper.php b/engine/Shopware/Components/LegacyRequestWrapper/PostWrapper.php
index a1c1edd4143..043673addb1 100644
--- a/engine/Shopware/Components/LegacyRequestWrapper/PostWrapper.php
+++ b/engine/Shopware/Components/LegacyRequestWrapper/PostWrapper.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\LegacyRequestWrapper;
diff --git a/engine/Shopware/Components/License/Service/Exceptions/LicenseHostException.php b/engine/Shopware/Components/License/Service/Exceptions/LicenseHostException.php
index 236bd8a410f..a4b157a2f89 100644
--- a/engine/Shopware/Components/License/Service/Exceptions/LicenseHostException.php
+++ b/engine/Shopware/Components/License/Service/Exceptions/LicenseHostException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\License\Service\Exceptions;
diff --git a/engine/Shopware/Components/License/Service/Exceptions/LicenseInvalidException.php b/engine/Shopware/Components/License/Service/Exceptions/LicenseInvalidException.php
index cf663e4a217..4801cfebc1f 100644
--- a/engine/Shopware/Components/License/Service/Exceptions/LicenseInvalidException.php
+++ b/engine/Shopware/Components/License/Service/Exceptions/LicenseInvalidException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\License\Service\Exceptions;
diff --git a/engine/Shopware/Components/License/Service/Exceptions/LicenseProductKeyException.php b/engine/Shopware/Components/License/Service/Exceptions/LicenseProductKeyException.php
index ac0e36f8c75..266cfa64970 100644
--- a/engine/Shopware/Components/License/Service/Exceptions/LicenseProductKeyException.php
+++ b/engine/Shopware/Components/License/Service/Exceptions/LicenseProductKeyException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\License\Service\Exceptions;
diff --git a/engine/Shopware/Components/License/Service/LicenseServiceSubscriber.php b/engine/Shopware/Components/License/Service/LicenseServiceSubscriber.php
index 6a02aac8a67..493e5926708 100644
--- a/engine/Shopware/Components/License/Service/LicenseServiceSubscriber.php
+++ b/engine/Shopware/Components/License/Service/LicenseServiceSubscriber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\License\Service;
diff --git a/engine/Shopware/Components/License/Service/LicenseUnpackServiceInterface.php b/engine/Shopware/Components/License/Service/LicenseUnpackServiceInterface.php
index 9544d8d83ac..8f79146ae5c 100644
--- a/engine/Shopware/Components/License/Service/LicenseUnpackServiceInterface.php
+++ b/engine/Shopware/Components/License/Service/LicenseUnpackServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\License\Service;
diff --git a/engine/Shopware/Components/License/Service/LocalLicenseUnpackService.php b/engine/Shopware/Components/License/Service/LocalLicenseUnpackService.php
index 74b6df46d32..4dca2ba60d1 100644
--- a/engine/Shopware/Components/License/Service/LocalLicenseUnpackService.php
+++ b/engine/Shopware/Components/License/Service/LocalLicenseUnpackService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\License\Service;
@@ -51,7 +51,7 @@ public function evaluateLicense(LicenseUnpackRequest $request)
         }
 
         if ($info['host'] != $host) {
-            throw new LicenseHostException(new LicenseInformation($info), sprintf('License key is not valid for domain %s', $request->host));
+            throw new LicenseHostException(new LicenseInformation($info), \sprintf('License key is not valid for domain %s', $request->host));
         }
 
         $info['edition'] = $info['product'];
diff --git a/engine/Shopware/Components/License/Service/ShopwareEditionService.php b/engine/Shopware/Components/License/Service/ShopwareEditionService.php
index f47c79a622c..c970a2e6772 100644
--- a/engine/Shopware/Components/License/Service/ShopwareEditionService.php
+++ b/engine/Shopware/Components/License/Service/ShopwareEditionService.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\License\Service;
diff --git a/engine/Shopware/Components/License/Service/ShopwareEditionServiceInterface.php b/engine/Shopware/Components/License/Service/ShopwareEditionServiceInterface.php
index 931b6bcac4e..9d4a8aa57da 100644
--- a/engine/Shopware/Components/License/Service/ShopwareEditionServiceInterface.php
+++ b/engine/Shopware/Components/License/Service/ShopwareEditionServiceInterface.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\License\Service;
diff --git a/engine/Shopware/Components/License/Struct/LicenseInformation.php b/engine/Shopware/Components/License/Struct/LicenseInformation.php
index 90495f5a09b..466df2db293 100644
--- a/engine/Shopware/Components/License/Struct/LicenseInformation.php
+++ b/engine/Shopware/Components/License/Struct/LicenseInformation.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\License\Struct;
diff --git a/engine/Shopware/Components/License/Struct/LicenseUnpackRequest.php b/engine/Shopware/Components/License/Struct/LicenseUnpackRequest.php
index d51a77a7fac..8f72de66de6 100644
--- a/engine/Shopware/Components/License/Struct/LicenseUnpackRequest.php
+++ b/engine/Shopware/Components/License/Struct/LicenseUnpackRequest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\License\Struct;
diff --git a/engine/Shopware/Components/License/Struct/ShopwareEdition.php b/engine/Shopware/Components/License/Struct/ShopwareEdition.php
index 9227008d272..ada1c979899 100644
--- a/engine/Shopware/Components/License/Struct/ShopwareEdition.php
+++ b/engine/Shopware/Components/License/Struct/ShopwareEdition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\License\Struct;
diff --git a/engine/Shopware/Components/LicenseInstaller.php b/engine/Shopware/Components/LicenseInstaller.php
index 18a76ca8b9a..34adbd43035 100644
--- a/engine/Shopware/Components/LicenseInstaller.php
+++ b/engine/Shopware/Components/LicenseInstaller.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
diff --git a/engine/Shopware/Components/Log/Formatter/HtmlFormatter.php b/engine/Shopware/Components/Log/Formatter/HtmlFormatter.php
index 57950b9b87e..daefbdee513 100644
--- a/engine/Shopware/Components/Log/Formatter/HtmlFormatter.php
+++ b/engine/Shopware/Components/Log/Formatter/HtmlFormatter.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Log\Formatter;
@@ -104,7 +104,7 @@ public function formatBatch(array $records)
 
     protected function convertToString($data)
     {
-        if ($data === null || is_scalar($data)) {
+        if ($data === null || \is_scalar($data)) {
             return (string) $data;
         }
 
diff --git a/engine/Shopware/Components/Log/Formatter/WildfireFormatter.php b/engine/Shopware/Components/Log/Formatter/WildfireFormatter.php
index 4012829f1d4..380883f24bf 100644
--- a/engine/Shopware/Components/Log/Formatter/WildfireFormatter.php
+++ b/engine/Shopware/Components/Log/Formatter/WildfireFormatter.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Log\Formatter;
diff --git a/engine/Shopware/Components/Log/Handler/DoctrineDBALHandler.php b/engine/Shopware/Components/Log/Handler/DoctrineDBALHandler.php
index 826386e32d0..37c4cd0c51c 100644
--- a/engine/Shopware/Components/Log/Handler/DoctrineDBALHandler.php
+++ b/engine/Shopware/Components/Log/Handler/DoctrineDBALHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Log\Handler;
@@ -54,11 +54,9 @@ class DoctrineDBALHandler extends AbstractProcessingHandler
     protected $table;
 
     /**
-     * @param string     $table
-     * @param int|string $level
-     * @phpstan-param Level|LevelName|LogLevel::* $level
-     *
-     * @param bool $bubble
+     * @param string                      $table
+     * @param Level|LevelName|LogLevel::* $level
+     * @param bool                        $bubble
      */
     public function __construct(Connection $conn, $table, array $columnMap, $level = Logger::DEBUG, $bubble = true)
     {
diff --git a/engine/Shopware/Components/Log/Handler/EnlightMailHandler.php b/engine/Shopware/Components/Log/Handler/EnlightMailHandler.php
index 376d7f3bb8d..c9b6589b598 100644
--- a/engine/Shopware/Components/Log/Handler/EnlightMailHandler.php
+++ b/engine/Shopware/Components/Log/Handler/EnlightMailHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Log\Handler;
@@ -43,11 +43,9 @@ class EnlightMailHandler extends MailHandler
     protected $mailer;
 
     /**
-     * @param Enlight_Components_Mail $mailer The mailer to use
-     * @param int|string              $level  The minimum logging level at which this handler will be triggered
-     * @phpstan-param Level|LevelName|LogLevel::* $level
-     *
-     * @param bool $bubble Whether the messages that are handled can bubble up the stack or not
+     * @param Enlight_Components_Mail     $mailer The mailer to use
+     * @param Level|LevelName|LogLevel::* $level  The minimum logging level at which this handler will be triggered
+     * @param bool                        $bubble Whether the messages that are handled can bubble up the stack or not
      */
     public function __construct(Enlight_Components_Mail $mailer, $level = Logger::ERROR, $bubble = true)
     {
diff --git a/engine/Shopware/Components/Log/Parser/LogfileParser.php b/engine/Shopware/Components/Log/Parser/LogfileParser.php
index a083e70f905..6e54ec6eda9 100644
--- a/engine/Shopware/Components/Log/Parser/LogfileParser.php
+++ b/engine/Shopware/Components/Log/Parser/LogfileParser.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Log\Parser;
@@ -28,15 +29,18 @@
 use LimitIterator;
 use SplFileObject;
 
+/**
+ * @phpstan-type Log array{date?: string, channel?: string, level?: string, message?: string, context?: string, extra?: string, raw: string}
+ */
 class LogfileParser
 {
     /**
      * @param string   $file
-     * @param int      $offset
+     * @param int|null $offset
      * @param int|null $limit
      * @param bool     $reverse
      *
-     * @return array
+     * @return list<Log>
      */
     public function parseLogFile($file, $offset = null, $limit = null, $reverse = false)
     {
@@ -46,6 +50,13 @@ public function parseLogFile($file, $offset = null, $limit = null, $reverse = fa
             $lineGenerator = LineReader::readLines($file);
         }
 
+        if (!\is_int($offset)) {
+            $offset = 0;
+        }
+        if (!\is_int($limit)) {
+            $limit = -1;
+        }
+
         $reader = new LimitIterator($lineGenerator, $offset, $limit);
 
         $result = [];
@@ -70,11 +81,9 @@ public function countLogFile($filePath)
     }
 
     /**
-     * @param string $log
-     *
-     * @return string[]
+     * @return Log
      */
-    private function parseLine($log)
+    private function parseLine(string $log): array
     {
         $pattern = '/\[(?P<date>[^\[]*)\] (?P<channel>\w+).(?P<level>\w+): (?P<message>[^\[{]+) (?P<context>[\[\{].*[\]\}]) (?P<extra>[\[\{].*[\]\}])/';
 
@@ -88,11 +97,11 @@ private function parseLine($log)
 
         return [
             'date' => $data['date'],
-            'channel' => $data['channel'],
-            'level' => $data['level'],
-            'message' => $data['message'],
-            'context' => json_decode($data['context'], true),
-            'extra' => json_decode($data['extra'], true),
+            'channel' => $data['channel'] ?? '',
+            'level' => $data['level'] ?? '',
+            'message' => $data['message'] ?? '',
+            'context' => json_decode($data['context'] ?? '', true),
+            'extra' => json_decode($data['extra'] ?? '', true),
             'raw' => $log,
         ];
     }
diff --git a/engine/Shopware/Components/Log/Processor/ShopwareEnvironmentProcessor.php b/engine/Shopware/Components/Log/Processor/ShopwareEnvironmentProcessor.php
index 2fe274cb291..860bdb73093 100644
--- a/engine/Shopware/Components/Log/Processor/ShopwareEnvironmentProcessor.php
+++ b/engine/Shopware/Components/Log/Processor/ShopwareEnvironmentProcessor.php
@@ -4,23 +4,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Log\Processor;
diff --git a/engine/Shopware/Components/LogawareReflectionHelper.php b/engine/Shopware/Components/LogawareReflectionHelper.php
index cecbcc5716d..355d3e252ae 100644
--- a/engine/Shopware/Components/LogawareReflectionHelper.php
+++ b/engine/Shopware/Components/LogawareReflectionHelper.php
@@ -1,31 +1,32 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
 
 use Exception;
 use Psr\Log\LoggerInterface;
+use Shopware\Bundle\SearchBundle\ConditionInterface;
 use Shopware\Bundle\SearchBundle\FacetInterface;
 use Shopware\Bundle\SearchBundle\SortingInterface;
 
@@ -51,7 +52,7 @@ public function __construct(LoggerInterface $logger)
      * @param array  $serialized
      * @param string $errorSource
      *
-     * @return array
+     * @return array<ConditionInterface|SortingInterface|FacetInterface>
      */
     public function unserialize($serialized, $errorSource)
     {
@@ -59,7 +60,7 @@ public function unserialize($serialized, $errorSource)
 
         foreach ($serialized as $className => $arguments) {
             $className = explode('|', $className);
-            /** @var class-string<SortingInterface|FacetInterface> $className */
+            /** @var class-string<ConditionInterface|SortingInterface|FacetInterface> $className */
             $className = $className[0];
 
             try {
diff --git a/engine/Shopware/Components/Logger.php b/engine/Shopware/Components/Logger.php
index 0523d5f6931..d660e37c0ab 100644
--- a/engine/Shopware/Components/Logger.php
+++ b/engine/Shopware/Components/Logger.php
@@ -1,29 +1,30 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
 
+use Monolog\DateTimeImmutable;
 use Monolog\Logger as BaseLogger;
 
 class Logger extends BaseLogger
@@ -49,10 +50,10 @@ public function trace($label)
         $this->log(BaseLogger::DEBUG, $label, ['trace' => true]);
     }
 
-    public function addRecord(int $level, string $message, array $context = []): bool
+    public function addRecord(int $level, string $message, array $context = [], ?DateTimeImmutable $datetime = null): bool
     {
         $message = str_replace(['[', ']'], ['(', ')'], $message);
 
-        return parent::addRecord($level, $message, $context);
+        return parent::addRecord($level, $message, $context, $datetime);
     }
 }
diff --git a/engine/Shopware/Components/ManualSorting/PositionService.php b/engine/Shopware/Components/ManualSorting/PositionService.php
index 5fb3e8f1296..e80839cba8b 100644
--- a/engine/Shopware/Components/ManualSorting/PositionService.php
+++ b/engine/Shopware/Components/ManualSorting/PositionService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\ManualSorting;
diff --git a/engine/Shopware/Components/ManualSorting/PositionServiceInterface.php b/engine/Shopware/Components/ManualSorting/PositionServiceInterface.php
index 2c4b6e6ef64..206f086c234 100644
--- a/engine/Shopware/Components/ManualSorting/PositionServiceInterface.php
+++ b/engine/Shopware/Components/ManualSorting/PositionServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\ManualSorting;
diff --git a/engine/Shopware/Components/ManualSorting/ProductLoader.php b/engine/Shopware/Components/ManualSorting/ProductLoader.php
index 8660c794a5a..81e5fa4a247 100644
--- a/engine/Shopware/Components/ManualSorting/ProductLoader.php
+++ b/engine/Shopware/Components/ManualSorting/ProductLoader.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\ManualSorting;
diff --git a/engine/Shopware/Components/ManualSorting/ProductLoaderInterface.php b/engine/Shopware/Components/ManualSorting/ProductLoaderInterface.php
index 4d607649003..4413a5ba848 100644
--- a/engine/Shopware/Components/ManualSorting/ProductLoaderInterface.php
+++ b/engine/Shopware/Components/ManualSorting/ProductLoaderInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\ManualSorting;
diff --git a/engine/Shopware/Components/MemoryLimit.php b/engine/Shopware/Components/MemoryLimit.php
index 0aade30a9cd..1e1a22c5bc9 100644
--- a/engine/Shopware/Components/MemoryLimit.php
+++ b/engine/Shopware/Components/MemoryLimit.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
@@ -33,7 +33,7 @@ class MemoryLimit
      */
     public static function setMinimumMemoryLimit($bytes)
     {
-        $currentLimit = self::convertToBytes(@ini_get('memory_limit'));
+        $currentLimit = self::convertToBytes((string) @ini_get('memory_limit'));
         if ($currentLimit === -1) {
             return;
         }
@@ -46,7 +46,7 @@ public static function setMinimumMemoryLimit($bytes)
     /**
      * @param string $memoryLimit
      *
-     * @return int|string
+     * @return int
      */
     public static function convertToBytes($memoryLimit)
     {
@@ -66,11 +66,11 @@ public static function convertToBytes($memoryLimit)
 
         switch (substr($memoryLimit, -1)) {
             case 't': $max *= 1024;
-            // no break
+                // no break
             case 'g': $max *= 1024;
-            // no break
+                // no break
             case 'm': $max *= 1024;
-            // no break
+                // no break
             case 'k': $max *= 1024;
         }
 
diff --git a/engine/Shopware/Components/Migrations/AbstractMigration.php b/engine/Shopware/Components/Migrations/AbstractMigration.php
index 9a9c85f2cc6..f0a08128340 100644
--- a/engine/Shopware/Components/Migrations/AbstractMigration.php
+++ b/engine/Shopware/Components/Migrations/AbstractMigration.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Migrations;
@@ -38,7 +38,7 @@ abstract class AbstractMigration
     protected $connection;
 
     /**
-     * @var array
+     * @var array<string>
      */
     protected $sql = [];
 
@@ -71,11 +71,11 @@ public function getLabel(): string
         $regexPattern = '/[\d]*-(.+)\.php$/i';
 
         $rc = new ReflectionClass(\get_class($this));
-        $fileName = basename($rc->getFileName());
+        $fileName = basename((string) $rc->getFileName());
 
         preg_match($regexPattern, $fileName, $result);
 
-        return $result[1];
+        return (string) ($result[1] ?? '');
     }
 
     public function getVersion(): int
@@ -85,11 +85,13 @@ public function getVersion(): int
 
         preg_match($regexPattern, \get_class($this), $result);
 
-        return (int) $result[0];
+        return (int) ($result[0] ?? 0);
     }
 
     /**
-     * @param string $modus
+     * @param self::MODUS_* $modus
+     *
+     * @return void
      */
     abstract public function up($modus);
 
@@ -106,6 +108,9 @@ public function addSql($sql): AbstractMigration
         return $this;
     }
 
+    /**
+     * @return array<string>
+     */
     public function getSql(): array
     {
         return $this->sql;
diff --git a/engine/Shopware/Components/Migrations/AbstractPluginMigration.php b/engine/Shopware/Components/Migrations/AbstractPluginMigration.php
index 6aae008c3c5..44c5097e919 100644
--- a/engine/Shopware/Components/Migrations/AbstractPluginMigration.php
+++ b/engine/Shopware/Components/Migrations/AbstractPluginMigration.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Migrations;
diff --git a/engine/Shopware/Components/Migrations/Manager.php b/engine/Shopware/Components/Migrations/Manager.php
index 9bfc2cf94c4..1ddcca4daa6 100644
--- a/engine/Shopware/Components/Migrations/Manager.php
+++ b/engine/Shopware/Components/Migrations/Manager.php
@@ -1,28 +1,26 @@
 <?php
 
 declare(strict_types=1);
-
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Migrations;
@@ -204,7 +202,7 @@ public function getMigrationsForVersion($currentVersion, $limit = null)
     /**
      * Applies given $migration to database
      *
-     * @param string $modus
+     * @param AbstractMigration::MODUS_* $modus
      *
      * @throws Exception
      */
@@ -221,7 +219,7 @@ public function apply(AbstractMigration $migration, $modus = AbstractMigration::
         } catch (Exception $e) {
             $this->markMigrationAsFailed($migration, $e);
 
-            throw new Exception(sprintf('Could not apply migration (%s). Error: %s ', \get_class($migration), $e->getMessage()));
+            throw new Exception(\sprintf('Could not apply migration (%s). Error: %s ', \get_class($migration), $e->getMessage()));
         }
 
         $this->markMigrationAsFinished($migration);
@@ -230,21 +228,21 @@ public function apply(AbstractMigration $migration, $modus = AbstractMigration::
     /**
      * Composite Method to apply all migrations
      *
-     * @param string $modus
+     * @param AbstractMigration::MODUS_* $modus
      */
     public function run($modus = AbstractMigration::MODUS_INSTALL)
     {
         $this->createSchemaTable();
 
         $currentVersion = $this->getCurrentVersion();
-        $this->log(sprintf('Current MigrationNumber: %s', $currentVersion));
+        $this->log(\sprintf('Current MigrationNumber: %s', $currentVersion));
 
         $migrations = $this->getMigrationsForVersion($currentVersion);
 
-        $this->log(sprintf('Found %s migrations to apply', \count($migrations)));
+        $this->log(\sprintf('Found %s migrations to apply', \count($migrations)));
 
         foreach ($migrations as $migration) {
-            $this->log(sprintf('Apply MigrationNumber: %s - %s', $migration->getVersion(), $migration->getLabel()));
+            $this->log(\sprintf('Apply MigrationNumber: %s - %s', $migration->getVersion(), $migration->getLabel()));
             try {
                 $this->apply($migration, $modus);
             } catch (Exception $e) {
@@ -266,7 +264,7 @@ protected function loadMigration(array $result, string $migrationPath): Abstract
             /** @var AbstractMigration $migrationClass */
             $migrationClass = new $migrationClassName($this->getConnection());
         } catch (Exception $e) {
-            throw new RuntimeException(sprintf('Could not instantiate Object of class "%s"', $migrationClassName));
+            throw new RuntimeException(\sprintf('Could not instantiate Object of class "%s"', $migrationClassName));
         }
 
         $this->validateMigration($migrationClass, $result);
@@ -310,7 +308,7 @@ protected function validateMigration(AbstractMigration $migrationClass, $result)
         $version = (int) $result['0'];
 
         if ($migrationClass->getVersion() !== $version) {
-            throw new Exception(sprintf('Version mismatch. Version in filename: %s, Version in Class: %s', $result['1'], $migrationClass->getVersion()));
+            throw new Exception(\sprintf('Version mismatch. Version in filename: %s, Version in Class: %s', $result['1'], $migrationClass->getVersion()));
         }
     }
 }
diff --git a/engine/Shopware/Components/Migrations/PluginMigrationManager.php b/engine/Shopware/Components/Migrations/PluginMigrationManager.php
index fcca32f1dfc..a9cc74af26f 100644
--- a/engine/Shopware/Components/Migrations/PluginMigrationManager.php
+++ b/engine/Shopware/Components/Migrations/PluginMigrationManager.php
@@ -1,28 +1,26 @@
 <?php
 
 declare(strict_types=1);
-
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Migrations;
@@ -38,15 +36,9 @@
 
 class PluginMigrationManager extends Manager
 {
-    /**
-     * @var Plugin
-     */
-    private $plugin;
+    private Plugin $plugin;
 
-    /**
-     * @var LoggerInterface
-     */
-    private $logger;
+    private LoggerInterface $logger;
 
     public function __construct(PDO $connection, Plugin $plugin, LoggerInterface $logger)
     {
@@ -85,6 +77,9 @@ public function getCurrentVersion(): int
         return (int) $stmt->fetchColumn();
     }
 
+    /**
+     * @param AbstractPluginMigration::MODUS_* $modus
+     */
     public function apply(AbstractMigration $migration, $modus = AbstractMigration::MODUS_INSTALL, bool $keepUserData = false): void
     {
         if ($modus === AbstractPluginMigration::MODUS_UNINSTALL) {
@@ -128,6 +123,9 @@ public function getMigrationsForDowngrade($currentVersion, $limit = null): array
         return $migrations;
     }
 
+    /**
+     * @param AbstractPluginMigration::MODUS_* $modus
+     */
     public function run($modus = AbstractMigration::MODUS_INSTALL, bool $keepUserData = false): void
     {
         if ($modus !== AbstractPluginMigration::MODUS_UNINSTALL) {
@@ -137,14 +135,14 @@ public function run($modus = AbstractMigration::MODUS_INSTALL, bool $keepUserDat
         }
 
         $currentVersion = $this->getCurrentVersion();
-        $this->log(sprintf('Current MigrationNumber: %s', $currentVersion));
+        $this->log(\sprintf('Current MigrationNumber: %s', $currentVersion));
 
         $migrations = $this->getMigrationsForDowngrade($currentVersion);
 
-        $this->log(sprintf('Found %s migrations to apply', \count($migrations)));
+        $this->log(\sprintf('Found %s migrations to apply', \count($migrations)));
 
         foreach ($migrations as $migration) {
-            $this->log(sprintf('Revert MigrationNumber: %s - %s', $migration->getVersion(), $migration->getLabel()));
+            $this->log(\sprintf('Revert MigrationNumber: %s - %s', $migration->getVersion(), $migration->getLabel()));
             try {
                 $this->apply($migration, $modus, $keepUserData);
             } catch (Exception $e) {
@@ -156,12 +154,12 @@ public function run($modus = AbstractMigration::MODUS_INSTALL, bool $keepUserDat
 
     public function log($str): void
     {
-        $this->logger->info(sprintf('[Migration from %s] %s', $this->plugin->getName(), $str));
+        $this->logger->info(\sprintf('[Migration from %s] %s', $this->plugin->getName(), $str));
     }
 
     protected function loadMigration(array $result, string $migrationPath): AbstractMigration
     {
-        $migrationClassName = sprintf('%s\\Migrations\\Migration%d', $this->plugin->getName(), $result['1']);
+        $migrationClassName = \sprintf('%s\\Migrations\\Migration%d', $this->plugin->getName(), $result['1']);
         if (!class_exists($migrationClassName, false)) {
             $file = $migrationPath . '/' . $result['0'];
             require $file;
@@ -234,7 +232,7 @@ private function downMigration(AbstractMigration $migration, bool $keepUserData)
         } catch (Exception $e) {
             $this->markMigrationAsFailed($migration, $e);
 
-            throw new RuntimeException(sprintf('Could not revert migration (%s). Error: %s ', \get_class($migration), $e->getMessage()));
+            throw new RuntimeException(\sprintf('Could not revert migration (%s). Error: %s ', \get_class($migration), $e->getMessage()));
         }
 
         $this->removeMigration($migration);
diff --git a/engine/Shopware/Components/Model/Cache.php b/engine/Shopware/Components/Model/Cache.php
index 4f7210067a4..e4260f124f1 100644
--- a/engine/Shopware/Components/Model/Cache.php
+++ b/engine/Shopware/Components/Model/Cache.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Model;
diff --git a/engine/Shopware/Components/Model/CategoryDenormalization.php b/engine/Shopware/Components/Model/CategoryDenormalization.php
index 8ba0bdeb3c8..07f875dbf80 100644
--- a/engine/Shopware/Components/Model/CategoryDenormalization.php
+++ b/engine/Shopware/Components/Model/CategoryDenormalization.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Model;
@@ -126,7 +126,7 @@ public function getParentCategoryIds($id)
 
         $result = [$parent['id']];
 
-        $parent = $this->getParentCategoryIds($parent['parent']);
+        $parent = $this->getParentCategoryIds((int) $parent['parent']);
         if ($parent) {
             $result = array_merge($result, $parent);
         }
@@ -402,7 +402,7 @@ public function rebuildAssignments($categoryId, $count = null, $offset = 0)
             $assignmentsStmt->execute(['categoryId' => $affectedCategoryId]);
 
             while ($assignment = $assignmentsStmt->fetch()) {
-                $count += $this->insertAssignment($assignment['articleID'], $assignment['categoryID']);
+                $count += $this->insertAssignment((int) $assignment['articleID'], (int) $assignment['categoryID']);
             }
         }
         $this->commit();
@@ -599,12 +599,12 @@ public function limit($sql, $count, $offset = 0)
     {
         $count = (int) $count;
         if ($count <= 0) {
-            throw new Exception(sprintf('LIMIT argument count=%s is not valid', $count));
+            throw new Exception(\sprintf('LIMIT argument count=%s is not valid', $count));
         }
 
         $offset = (int) $offset;
         if ($offset < 0) {
-            throw new Exception(sprintf('LIMIT argument offset=%s is not valid', $offset));
+            throw new Exception(\sprintf('LIMIT argument offset=%s is not valid', $offset));
         }
 
         $sql .= " LIMIT $count";
diff --git a/engine/Shopware/Components/Model/CategorySubscriber.php b/engine/Shopware/Components/Model/CategorySubscriber.php
index 54550690f1d..5d6b1324171 100644
--- a/engine/Shopware/Components/Model/CategorySubscriber.php
+++ b/engine/Shopware/Components/Model/CategorySubscriber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Model;
diff --git a/engine/Shopware/Components/Model/Configuration.php b/engine/Shopware/Components/Model/Configuration.php
index 5dfb9b8c308..19de723b221 100644
--- a/engine/Shopware/Components/Model/Configuration.php
+++ b/engine/Shopware/Components/Model/Configuration.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Model;
@@ -32,8 +32,10 @@
 use Doctrine\Common\Cache\RedisCache;
 use Doctrine\Common\Cache\XcacheCache;
 use Doctrine\Common\Proxy\AbstractProxyFactory;
+use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\ORM\Configuration as BaseConfiguration;
+use Doctrine\ORM\ORMException;
 use Doctrine\ORM\Repository\RepositoryFactory;
 use DoctrineExtensions\Query\Mysql\DateFormat;
 use DoctrineExtensions\Query\Mysql\GroupConcat;
@@ -45,6 +47,9 @@
 use Redis;
 use RuntimeException;
 use Shopware\Components\CacheManager;
+use Shopware\Components\Model\DBAL\Types\AllowInvalidArrayType;
+use Shopware\Components\Model\DBAL\Types\DateStringType;
+use Shopware\Components\Model\DBAL\Types\DateTimeStringType;
 use Shopware\Components\ShopwareReleaseStruct;
 use Zend_Cache_Core;
 
@@ -72,8 +77,8 @@ class Configuration extends BaseConfiguration
     /**
      * @throws Exception
      * @throws RuntimeException
-     * @throws \Doctrine\ORM\ORMException
-     * @throws \Doctrine\DBAL\DBALException
+     * @throws ORMException
+     * @throws DBALException
      */
     public function __construct(array $options, Zend_Cache_Core $cache, RepositoryFactory $repositoryFactory, ShopwareReleaseStruct $release)
     {
@@ -89,9 +94,9 @@ public function __construct(array $options, Zend_Cache_Core $cache, RepositoryFa
 
         $this->setAttributeDir($options['attributeDir']);
 
-        Type::overrideType('datetime', \Shopware\Components\Model\DBAL\Types\DateTimeStringType::class);
-        Type::overrideType('date', \Shopware\Components\Model\DBAL\Types\DateStringType::class);
-        Type::overrideType('array', \Shopware\Components\Model\DBAL\Types\AllowInvalidArrayType::class);
+        Type::overrideType('datetime', DateTimeStringType::class);
+        Type::overrideType('date', DateStringType::class);
+        Type::overrideType('array', AllowInvalidArrayType::class);
 
         $this->addCustomStringFunction('DATE_FORMAT', DateFormat::class);
         $this->addCustomStringFunction('IFNULL', IfNull::class);
@@ -209,10 +214,10 @@ public function setAttributeDir($dir)
     {
         if (!is_dir($dir)) {
             if (@mkdir($dir, 0777, true) === false && !is_dir($dir)) {
-                throw new RuntimeException(sprintf("Unable to create the doctrine attribute directory (%s)\n", $dir));
+                throw new RuntimeException(\sprintf("Unable to create the doctrine attribute directory (%s)\n", $dir));
             }
         } elseif (!is_writable($dir)) {
-            throw new RuntimeException(sprintf("Unable to write in the doctrine attribute directory (%s)\n", $dir));
+            throw new RuntimeException(\sprintf("Unable to write in the doctrine attribute directory (%s)\n", $dir));
         }
 
         $dir = rtrim((string) realpath($dir), '\\/') . DIRECTORY_SEPARATOR;
@@ -241,10 +246,10 @@ public function setProxyDir($dir)
     {
         if (!is_dir($dir)) {
             if (@mkdir($dir, 0777, true) === false && !is_dir($dir)) {
-                throw new RuntimeException(sprintf("Unable to create the doctrine proxy directory (%s)\n", $dir));
+                throw new RuntimeException(\sprintf("Unable to create the doctrine proxy directory (%s)\n", $dir));
             }
         } elseif (!is_writable($dir)) {
-            throw new RuntimeException(sprintf("Unable to write in the doctrine proxy directory (%s)\n", $dir));
+            throw new RuntimeException(\sprintf("Unable to write in the doctrine proxy directory (%s)\n", $dir));
         }
 
         parent::setProxyDir($dir);
@@ -292,7 +297,7 @@ private function createDefaultProvider($provider)
         }
 
         if (!class_exists($provider)) {
-            throw new Exception(sprintf('Doctrine cache provider "%s" not found failure.', $provider));
+            throw new Exception(\sprintf('Doctrine cache provider "%s" not found failure.', $provider));
         }
 
         return new $provider();
diff --git a/engine/Shopware/Components/Model/DBAL/Constraints/OrderNumber.php b/engine/Shopware/Components/Model/DBAL/Constraints/OrderNumber.php
index 522285b54a8..92e7ac759d3 100644
--- a/engine/Shopware/Components/Model/DBAL/Constraints/OrderNumber.php
+++ b/engine/Shopware/Components/Model/DBAL/Constraints/OrderNumber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Model\DBAL\Constraints;
diff --git a/engine/Shopware/Components/Model/DBAL/Result.php b/engine/Shopware/Components/Model/DBAL/Result.php
index 67ddf77d97f..64e6398a684 100644
--- a/engine/Shopware/Components/Model/DBAL/Result.php
+++ b/engine/Shopware/Components/Model/DBAL/Result.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Model\DBAL;
diff --git a/engine/Shopware/Components/Model/DBAL/Types/AllowInvalidArrayType.php b/engine/Shopware/Components/Model/DBAL/Types/AllowInvalidArrayType.php
index f409c299ca2..57b38445410 100644
--- a/engine/Shopware/Components/Model/DBAL/Types/AllowInvalidArrayType.php
+++ b/engine/Shopware/Components/Model/DBAL/Types/AllowInvalidArrayType.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Model\DBAL\Types;
diff --git a/engine/Shopware/Components/Model/DBAL/Types/DateStringType.php b/engine/Shopware/Components/Model/DBAL/Types/DateStringType.php
index 03afc7226d8..6420b2264d0 100644
--- a/engine/Shopware/Components/Model/DBAL/Types/DateStringType.php
+++ b/engine/Shopware/Components/Model/DBAL/Types/DateStringType.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Model\DBAL\Types;
diff --git a/engine/Shopware/Components/Model/DBAL/Types/DateTimeStringType.php b/engine/Shopware/Components/Model/DBAL/Types/DateTimeStringType.php
index d5720cd1496..405cb332df0 100644
--- a/engine/Shopware/Components/Model/DBAL/Types/DateTimeStringType.php
+++ b/engine/Shopware/Components/Model/DBAL/Types/DateTimeStringType.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Model\DBAL\Types;
diff --git a/engine/Shopware/Components/Model/DBAL/Validator/OrderNumberValidator.php b/engine/Shopware/Components/Model/DBAL/Validator/OrderNumberValidator.php
index 454c2e13cc6..9a6dbe1e1ff 100644
--- a/engine/Shopware/Components/Model/DBAL/Validator/OrderNumberValidator.php
+++ b/engine/Shopware/Components/Model/DBAL/Validator/OrderNumberValidator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Model\DBAL\Validator;
diff --git a/engine/Shopware/Components/Model/EventSubscriber.php b/engine/Shopware/Components/Model/EventSubscriber.php
index 0c9d712efc3..ec75085af80 100644
--- a/engine/Shopware/Components/Model/EventSubscriber.php
+++ b/engine/Shopware/Components/Model/EventSubscriber.php
@@ -1,31 +1,37 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Model;
 
 use Doctrine\Common\EventSubscriber as BaseEventSubscriber;
 use Doctrine\ORM\Event\LifecycleEventArgs;
+use Doctrine\ORM\Event\PostPersistEventArgs;
+use Doctrine\ORM\Event\PostRemoveEventArgs;
+use Doctrine\ORM\Event\PostUpdateEventArgs;
+use Doctrine\ORM\Event\PrePersistEventArgs;
+use Doctrine\ORM\Event\PreRemoveEventArgs;
+use Doctrine\ORM\Event\PreUpdateEventArgs;
 use Doctrine\ORM\Proxy\Proxy;
 use Enlight_Event_EventArgs;
 use Enlight_Event_EventManager;
@@ -88,10 +94,10 @@ public function getSubscribedEvents()
      *
      * @return Enlight_Event_EventArgs|null
      */
-    public function preUpdate(LifecycleEventArgs $eventArgs)
+    public function preUpdate(PreUpdateEventArgs $eventArgs)
     {
         /** @var ModelEntity $entity */
-        $entity = $eventArgs->getEntity();
+        $entity = $eventArgs->getObject();
         $entityName = $this->getEntityName($entity);
 
         return $this->notifyEvent($entityName . '::preUpdate', $eventArgs);
@@ -102,10 +108,10 @@ public function preUpdate(LifecycleEventArgs $eventArgs)
      *
      * @return Enlight_Event_EventArgs|null
      */
-    public function preRemove(LifecycleEventArgs $eventArgs)
+    public function preRemove(PreRemoveEventArgs $eventArgs)
     {
         /** @var ModelEntity $entity */
-        $entity = $eventArgs->getEntity();
+        $entity = $eventArgs->getObject();
         $entityName = $this->getEntityName($entity);
 
         return $this->notifyEvent($entityName . '::preRemove', $eventArgs);
@@ -116,10 +122,10 @@ public function preRemove(LifecycleEventArgs $eventArgs)
      *
      * @return Enlight_Event_EventArgs|null
      */
-    public function prePersist(LifecycleEventArgs $eventArgs)
+    public function prePersist(PrePersistEventArgs $eventArgs)
     {
         /** @var ModelEntity $entity */
-        $entity = $eventArgs->getEntity();
+        $entity = $eventArgs->getObject();
         $entityName = $this->getEntityName($entity);
 
         return $this->notifyEvent($entityName . '::prePersist', $eventArgs);
@@ -130,10 +136,10 @@ public function prePersist(LifecycleEventArgs $eventArgs)
      *
      * @return Enlight_Event_EventArgs|null
      */
-    public function postUpdate(LifecycleEventArgs $eventArgs)
+    public function postUpdate(PostUpdateEventArgs $eventArgs)
     {
         /** @var ModelEntity $entity */
-        $entity = $eventArgs->getEntity();
+        $entity = $eventArgs->getObject();
         $entityName = $this->getEntityName($entity);
 
         return $this->notifyEvent($entityName . '::postUpdate', $eventArgs);
@@ -144,10 +150,10 @@ public function postUpdate(LifecycleEventArgs $eventArgs)
      *
      * @return Enlight_Event_EventArgs|null
      */
-    public function postRemove(LifecycleEventArgs $eventArgs)
+    public function postRemove(PostRemoveEventArgs $eventArgs)
     {
         /** @var ModelEntity $entity */
-        $entity = $eventArgs->getEntity();
+        $entity = $eventArgs->getObject();
         $entityName = $this->getEntityName($entity);
 
         return $this->notifyEvent($entityName . '::postRemove', $eventArgs);
@@ -158,10 +164,10 @@ public function postRemove(LifecycleEventArgs $eventArgs)
      *
      * @return Enlight_Event_EventArgs|null
      */
-    public function postPersist(LifecycleEventArgs $eventArgs)
+    public function postPersist(PostPersistEventArgs $eventArgs)
     {
         /** @var ModelEntity $entity */
-        $entity = $eventArgs->getEntity();
+        $entity = $eventArgs->getObject();
         $entityName = $this->getEntityName($entity);
 
         return $this->notifyEvent($entityName . '::postPersist', $eventArgs);
@@ -170,9 +176,9 @@ public function postPersist(LifecycleEventArgs $eventArgs)
     /**
      * Returns the class name of the passed entity.
      *
-     * @param \Shopware\Components\Model\ModelEntity $entity
+     * @param ModelEntity $entity
      *
-     * @return string
+     * @return class-string
      */
     protected function getEntityName($entity)
     {
@@ -181,6 +187,7 @@ protected function getEntityName($entity)
         } else {
             $entityName = \get_class($entity);
         }
+        \assert(\is_string($entityName));
 
         return $entityName;
     }
@@ -196,8 +203,8 @@ protected function getEntityName($entity)
     protected function notifyEvent($eventName, $eventArgs)
     {
         return $this->eventManager->notify($eventName, [
-            'entityManager' => $eventArgs->getEntityManager(),
-            'entity' => $eventArgs->getEntity(),
+            'entityManager' => $eventArgs->getObjectManager(),
+            'entity' => $eventArgs->getObject(),
         ]);
     }
 }
diff --git a/engine/Shopware/Components/Model/Exception/ModelNotFoundException.php b/engine/Shopware/Components/Model/Exception/ModelNotFoundException.php
index 7d902f96b51..9bb74d970eb 100644
--- a/engine/Shopware/Components/Model/Exception/ModelNotFoundException.php
+++ b/engine/Shopware/Components/Model/Exception/ModelNotFoundException.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Model\Exception;
@@ -43,7 +42,7 @@ public function __construct(
         int $code = 0,
         ?Throwable $previous = null
     ) {
-        $message = sprintf('Model of "%s" for %s "%s" not found', $modelClass, $identifier, (string) $identifierValue);
+        $message = \sprintf('Model of "%s" for %s "%s" not found', $modelClass, $identifier, (string) $identifierValue);
         parent::__construct($message, $code, $previous);
     }
 }
diff --git a/engine/Shopware/Components/Model/Generator.php b/engine/Shopware/Components/Model/Generator.php
index 2a3296f4969..684b24bf32e 100644
--- a/engine/Shopware/Components/Model/Generator.php
+++ b/engine/Shopware/Components/Model/Generator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Model;
@@ -51,23 +51,22 @@ class Generator
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 ';
 
@@ -176,7 +175,7 @@ public function set%upperPropertyName%($%lowerPropertyName%)
      *
      * @var AbstractSchemaManager
      */
-    protected $schemaManager = null;
+    protected $schemaManager;
 
     /**
      * Contains the table mapping for the existing Shopware models.
@@ -334,7 +333,7 @@ public function createModelFile($table, $sourceCode)
         $file = $this->getPath() . $className . '.php';
 
         if (file_exists($file) && !is_writable($file)) {
-            throw new Exception(sprintf('File: "%s" isn\'t writable, please check the file permissions for this model!', $file), 501);
+            throw new Exception(\sprintf('File: "%s" isn\'t writable, please check the file permissions for this model!', $file), 501);
         }
 
         $result = file_put_contents($file, $sourceCode);
@@ -435,10 +434,10 @@ protected function createTargetDirectory($dir)
     {
         if (!is_dir($dir)) {
             if (@mkdir($dir, 0777, true) === false && !is_dir($dir)) {
-                throw new RuntimeException(sprintf("Unable to create directory (%s)\n", $dir));
+                throw new RuntimeException(\sprintf("Unable to create directory (%s)\n", $dir));
             }
         } elseif (!is_writable($dir)) {
-            throw new RuntimeException(sprintf("Unable to write in directory (%s)\n", $dir));
+            throw new RuntimeException(\sprintf("Unable to write in directory (%s)\n", $dir));
         }
     }
 
@@ -511,7 +510,7 @@ protected function getClassDefinition($table)
 
         // Check if the passed table is a Shopware attribute table.
         if (strpos($table->getName(), '_attributes')) {
-            //if the table is an attribute table we have to use the class name of the parent table.
+            // if the table is an attribute table we have to use the class name of the parent table.
             $parentClass = str_replace('_attributes', '', $table->getName());
             $className = $this->getClassNameOfTableName($parentClass);
 
diff --git a/engine/Shopware/Components/Model/LazyFetchModelEntity.php b/engine/Shopware/Components/Model/LazyFetchModelEntity.php
index cd464673f95..7b39294ffd1 100644
--- a/engine/Shopware/Components/Model/LazyFetchModelEntity.php
+++ b/engine/Shopware/Components/Model/LazyFetchModelEntity.php
@@ -1,30 +1,30 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Model;
 
-use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\Persistence\Proxy;
 use Exception;
@@ -36,11 +36,11 @@
 abstract class LazyFetchModelEntity extends ModelEntity
 {
     /**
-     * @var EntityManager|null
+     * @var EntityManagerInterface|null
      */
     private static $em;
 
-    public static function setEntityManager(EntityManager $em)
+    public static function setEntityManager(EntityManagerInterface $em)
     {
         self::$em = $em;
     }
@@ -58,15 +58,14 @@ public function isProxy($object)
     /**
      * @template TModel of object
      *
-     * @param TModel|null   $object
-     * @param array         $condition
-     * @param EntityManager $em
+     * @param TModel|null $object
+     * @param array       $condition
      *
      * @throws Exception
      *
      * @return TModel|null
      */
-    public function fetchLazy($object, $condition, EntityManager $em = null)
+    public function fetchLazy($object, $condition, ?EntityManagerInterface $em = null)
     {
         if (!$object instanceof Proxy || $object->__isInitialized() || !$this->getId() || !method_exists($object, 'getId')) {
             return $object;
diff --git a/engine/Shopware/Components/Model/ModelEntity.php b/engine/Shopware/Components/Model/ModelEntity.php
index 2d26bdcc827..692d0e18663 100644
--- a/engine/Shopware/Components/Model/ModelEntity.php
+++ b/engine/Shopware/Components/Model/ModelEntity.php
@@ -1,34 +1,37 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Model;
 
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\ORM\Mapping as ORM;
 use InvalidArgumentException;
 
 /**
  * Abstract class for shopware standard models.
+ *
+ * @ORM\MappedSuperclass()
  */
 abstract class ModelEntity
 {
@@ -202,12 +205,12 @@ public function setOneToMany($data, $model, $property, $reference = null)
         // Iterate all passed items
         foreach ($data as $item) {
             // To get the right collection item use the internal helper function
-            if (\is_array($item) && isset($item['id']) && $item['id'] !== null) {
+            if (\is_array($item) && isset($item['id'])) {
                 $attribute = $this->getArrayCollectionElementById($this->$getterFunction(), $item['id']);
                 if (!$attribute instanceof $model) {
                     $attribute = new $model();
                 }
-                // If the item is an array without an id, create a new model.
+            // If the item is an array without an id, create a new model.
             } elseif (\is_array($item)) {
                 $attribute = new $model();
             // If the item is no array, it could be an instance of the expected object.
diff --git a/engine/Shopware/Components/Model/ModelManager.php b/engine/Shopware/Components/Model/ModelManager.php
index df9b3b9e6a3..a597f918a69 100644
--- a/engine/Shopware/Components/Model/ModelManager.php
+++ b/engine/Shopware/Components/Model/ModelManager.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Model;
@@ -30,6 +30,8 @@
 use Doctrine\Inflector\Inflector;
 use Doctrine\Inflector\NoopWordInflector;
 use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\Exception\MismatchedEventManager;
+use Doctrine\ORM\Exception\MissingMappingDriverImplementation;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\ORMException;
 use Doctrine\ORM\Proxy\Proxy;
@@ -38,7 +40,7 @@
 use InvalidArgumentException;
 use ReflectionProperty;
 use RuntimeException;
-use Shopware\Components\Model\Query\SqlWalker;
+use Shopware\Components\Model\Query\SqlWalker\ForceIndexWalker;
 use Symfony\Component\Validator\ConstraintViolationListInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Traversable;
@@ -63,18 +65,15 @@ class ModelManager extends EntityManager
     public function __construct(
         Connection $conn,
         Configuration $config,
-        QueryOperatorValidator $operatorValidator,
-        EventManager $eventManager
+        QueryOperatorValidator $operatorValidator
     ) {
         $this->operatorValidator = $operatorValidator;
-        parent::__construct($conn, $config, $eventManager);
+        parent::__construct($conn, $config);
     }
 
     /**
      * Factory method to create EntityManager instances.
      *
-     * @param EventManager $eventManager
-     *
      * @throws ORMException
      *
      * @return ModelManager
@@ -82,22 +81,22 @@ public function __construct(
     public static function createInstance(
         Connection $conn,
         Configuration $config,
-        EventManager $eventManager = null,
-        QueryOperatorValidator $operatorValidator = null
+        ?EventManager $eventManager = null,
+        ?QueryOperatorValidator $operatorValidator = null
     ) {
         if (!$config->getMetadataDriverImpl()) {
-            throw ORMException::missingMappingDriverImpl();
+            throw new MissingMappingDriverImplementation();
         }
 
         if ($eventManager !== null && $conn->getEventManager() !== $eventManager) {
-            throw ORMException::mismatchedEventManager();
+            throw new MismatchedEventManager();
         }
 
         if ($operatorValidator === null) {
             $operatorValidator = new QueryOperatorValidator();
         }
 
-        return new self($conn, $config, $operatorValidator, $conn->getEventManager());
+        return new self($conn, $config, $operatorValidator);
     }
 
     /**
@@ -131,6 +130,8 @@ public function toArray($entity)
     /**
      * Returns the total count of the passed query builder.
      *
+     * @param Query<ModelEntity|array<string, mixed>> $query
+     *
      * @return int|null
      */
     public function getQueryCount(Query $query)
@@ -144,11 +145,13 @@ public function getQueryCount(Query $query)
      * This method should be used instead of
      * new \Doctrine\ORM\Tools\Pagination\Paginator($query).
      *
-     * As of SW 4.2 $paginator->setUseOutputWalkers(false) will be set here.
-     *
      * @since 4.1.4
      *
-     * @return Paginator
+     * @template TModel of (ModelEntity|array<string, mixed>)
+     *
+     * @param Query<TModel> $query
+     *
+     * @return Paginator<TModel>
      */
     public function createPaginator(Query $query)
     {
@@ -213,8 +216,12 @@ public function regenerateAttributeProxies($tableNames = [])
 
         $attributeMetaData = [];
         foreach ($allMetaData as $metaData) {
+            if (!$metaData instanceof ClassMetadata) {
+                continue;
+            }
+
             $tableName = $metaData->getTableName();
-            if (strpos($tableName, '_attributes') === false) {
+            if (!str_contains($tableName, '_attributes')) {
                 continue;
             }
             if (!empty($tableNames) && !\in_array($tableName, $tableNames, true)) {
@@ -238,24 +245,27 @@ public function regenerateProxies()
     /**
      * Helper function to add mysql specified command to increase the sql performance.
      *
-     * @param mixed|null $index        Name of the forced index
-     * @param bool       $straightJoin true or false. Allow to add STRAIGHT_JOIN select condition
-     * @param bool       $sqlNoCache
+     * @template TModel of (ModelEntity|array<string, mixed>)
      *
-     * @return Query
+     * @param Query<TModel> $query
+     * @param mixed|null    $index        Name of the forced index
+     * @param bool          $straightJoin true or false. Allow to add STRAIGHT_JOIN select condition
+     * @param bool          $sqlNoCache
+     *
+     * @return Query<TModel>
      */
     public function addCustomHints(Query $query, $index = null, $straightJoin = false, $sqlNoCache = false)
     {
-        $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, SqlWalker\ForceIndexWalker::class);
+        $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, ForceIndexWalker::class);
 
         if ($straightJoin === true) {
-            $query->setHint(SqlWalker\ForceIndexWalker::HINT_STRAIGHT_JOIN, true);
+            $query->setHint(ForceIndexWalker::HINT_STRAIGHT_JOIN, true);
         }
         if ($index !== null) {
-            $query->setHint(SqlWalker\ForceIndexWalker::HINT_FORCE_INDEX, $index);
+            $query->setHint(ForceIndexWalker::HINT_FORCE_INDEX, $index);
         }
         if ($sqlNoCache === true) {
-            $query->setHint(SqlWalker\ForceIndexWalker::HINT_SQL_NO_CACHE, true);
+            $query->setHint(ForceIndexWalker::HINT_SQL_NO_CACHE, true);
         }
 
         return $query;
@@ -292,13 +302,11 @@ public function enableDebugMode()
      */
     public function createModelGenerator()
     {
-        $generator = new Generator(
+        return new Generator(
             $this->getConnection()->getSchemaManager(),
             $this->getConfiguration()->getAttributeDir(),
             Shopware()->AppPath('Models')
         );
-
-        return $generator;
     }
 
     /**
@@ -312,7 +320,7 @@ public function createModelGenerator()
      *
      * @param ModelEntity|null $entity
      *
-     * @return array
+     * @return array<string, mixed>
      */
     protected function serializeEntity($entity)
     {
@@ -335,7 +343,7 @@ protected function serializeEntity($entity)
 
         foreach ($metadata->fieldMappings as $field => $mapping) {
             if (!($metadata->reflFields[$field] instanceof ReflectionProperty)) {
-                throw new InvalidArgumentException(sprintf('Expected an instance of %s', ReflectionProperty::class));
+                throw new InvalidArgumentException(\sprintf('Expected an instance of %s', ReflectionProperty::class));
             }
 
             $data[$field] = $metadata->reflFields[$field]->getValue($entity);
@@ -343,7 +351,7 @@ protected function serializeEntity($entity)
 
         foreach ($metadata->associationMappings as $field => $mapping) {
             if (!($metadata->reflFields[$field] instanceof ReflectionProperty)) {
-                throw new InvalidArgumentException(sprintf('Expected an instance of %s', ReflectionProperty::class));
+                throw new InvalidArgumentException(\sprintf('Expected an instance of %s', ReflectionProperty::class));
             }
 
             $key = $inflector->tableize($field);
@@ -353,13 +361,11 @@ protected function serializeEntity($entity)
                     $data[$key] = $this->serializeEntity($data[$key]);
                 }
             } elseif ($mapping['isOwningSide'] && $mapping['type'] & ClassMetadata::TO_ONE) {
-                if ($metadata->reflFields[$field]->getValue($entity) !== null) {
-                    $data[$key] = $this->getUnitOfWork()->getEntityIdentifier(
-                        $metadata->reflFields[$field]->getValue($entity)
-                    );
+                $association = $metadata->reflFields[$field]->getValue($entity);
+                if (\is_object($association) && $this->getUnitOfWork()->isInIdentityMap($association)) {
+                    $data[$key] = $this->getUnitOfWork()->getEntityIdentifier($association);
                 } else {
-                    // In some case the relationship may not exist, but we want
-                    // to know about it
+                    // In some case the relationship may not exist, but we want to know about it
                     $data[$key] = null;
                 }
             }
diff --git a/engine/Shopware/Components/Model/ModelRepository.php b/engine/Shopware/Components/Model/ModelRepository.php
index f46aba30aaf..042b51c0bbf 100644
--- a/engine/Shopware/Components/Model/ModelRepository.php
+++ b/engine/Shopware/Components/Model/ModelRepository.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Model;
@@ -34,11 +34,12 @@
  * These standard function must later be implemented in the various models.
  *
  * <code>
- * $modelRepository = new Shopware\Components\Models\ModelRepository;
+ * $modelRepository = new \Shopware\Components\Models\ModelRepository();
  * $modelRepository->createQueryBuilder();
  * </code>
  *
- * @template TEntityClass of object
+ * @template TEntityClass of ModelEntity
+ *
  * @extends EntityRepository<TEntityClass>
  */
 class ModelRepository extends EntityRepository implements Enlight_Hook
diff --git a/engine/Shopware/Components/Model/ProxyAwareRepositoryFactory.php b/engine/Shopware/Components/Model/ProxyAwareRepositoryFactory.php
index 852cbcfb239..f036d074693 100644
--- a/engine/Shopware/Components/Model/ProxyAwareRepositoryFactory.php
+++ b/engine/Shopware/Components/Model/ProxyAwareRepositoryFactory.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Model;
diff --git a/engine/Shopware/Components/Model/Query/Mysql/DateFormat.php b/engine/Shopware/Components/Model/Query/Mysql/DateFormat.php
index 4f6f034e1c6..961e5b16570 100644
--- a/engine/Shopware/Components/Model/Query/Mysql/DateFormat.php
+++ b/engine/Shopware/Components/Model/Query/Mysql/DateFormat.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Model\Query\Mysql;
diff --git a/engine/Shopware/Components/Model/Query/Mysql/IfElse.php b/engine/Shopware/Components/Model/Query/Mysql/IfElse.php
index 0a9a4dc83a1..ac5e8dd526f 100644
--- a/engine/Shopware/Components/Model/Query/Mysql/IfElse.php
+++ b/engine/Shopware/Components/Model/Query/Mysql/IfElse.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Model\Query\Mysql;
diff --git a/engine/Shopware/Components/Model/Query/Mysql/IfNull.php b/engine/Shopware/Components/Model/Query/Mysql/IfNull.php
index c50ad151163..d63ab4743d9 100644
--- a/engine/Shopware/Components/Model/Query/Mysql/IfNull.php
+++ b/engine/Shopware/Components/Model/Query/Mysql/IfNull.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Model\Query\Mysql;
diff --git a/engine/Shopware/Components/Model/Query/Mysql/RegExp.php b/engine/Shopware/Components/Model/Query/Mysql/RegExp.php
index e584e239e65..f7becf7ca0a 100644
--- a/engine/Shopware/Components/Model/Query/Mysql/RegExp.php
+++ b/engine/Shopware/Components/Model/Query/Mysql/RegExp.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Model\Query\Mysql;
diff --git a/engine/Shopware/Components/Model/Query/Mysql/Replace.php b/engine/Shopware/Components/Model/Query/Mysql/Replace.php
index 4b640951d30..8a70962598a 100644
--- a/engine/Shopware/Components/Model/Query/Mysql/Replace.php
+++ b/engine/Shopware/Components/Model/Query/Mysql/Replace.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Model\Query\Mysql;
diff --git a/engine/Shopware/Components/Model/Query/SqlWalker/ForceIndexWalker.php b/engine/Shopware/Components/Model/Query/SqlWalker/ForceIndexWalker.php
index f5babe06e2e..0858e4c2ff2 100644
--- a/engine/Shopware/Components/Model/Query/SqlWalker/ForceIndexWalker.php
+++ b/engine/Shopware/Components/Model/Query/SqlWalker/ForceIndexWalker.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Model\Query\SqlWalker;
diff --git a/engine/Shopware/Components/Model/QueryBuilder.php b/engine/Shopware/Components/Model/QueryBuilder.php
index f990c002363..8a9d260193a 100644
--- a/engine/Shopware/Components/Model/QueryBuilder.php
+++ b/engine/Shopware/Components/Model/QueryBuilder.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Model;
@@ -77,7 +77,7 @@ public function setAlias($alias)
      *         ->setParameters(new ArrayCollection(array(
      *             new Parameter('user_id1', 1),
      *             new Parameter('user_id2', 2)
-     )));
+     * )));
      * </code>
      *
      * Notice: This method overrides ALL parameters in Doctrine 2.3 and up.
@@ -94,7 +94,7 @@ public function setAlias($alias)
      */
     public function setParameters($parameters)
     {
-        trigger_error(sprintf('%s::%s() is deprecated. Please use setParameter().', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s::%s() is deprecated. Please use setParameter().', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         $existingParameters = $this->getParameters();
 
@@ -119,7 +119,7 @@ public function setParameters($parameters)
      */
     public function addParameters(array $parameters)
     {
-        trigger_error(sprintf('%s::%s() is deprecated. Please use addParameter().', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s::%s() is deprecated. Please use addParameter().', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         $existingParameters = $this->getParameters();
         $newParameters = new ArrayCollection();
@@ -164,7 +164,7 @@ public function addParameters(array $parameters)
      *      )));
      * </code>
      *
-     * @param array<string, string>|array<array{property: string, value: mixed, expression?: string, operator?: string|null}> $filter
+     * @param array<string, mixed>|array<array{property: string, value: mixed, expression?: string, operator?: string|null}> $filter
      *
      * @return QueryBuilder
      */
@@ -302,11 +302,10 @@ public function addOrderBy($orderBy, $order = null)
     /**
      * Overrides the original function to add the SQL_NO_CACHE parameter
      * for each doctrine orm query if the global shopware debug mode is activated.
-     *
-     * @return Query
      */
     public function getQuery()
     {
+        /** @var Query<ModelEntity> $query */
         $query = parent::getQuery();
 
         $em = $this->getEntityManager();
diff --git a/engine/Shopware/Components/Model/QueryOperatorValidator.php b/engine/Shopware/Components/Model/QueryOperatorValidator.php
index 055149c8a8f..6cba40b7b4c 100644
--- a/engine/Shopware/Components/Model/QueryOperatorValidator.php
+++ b/engine/Shopware/Components/Model/QueryOperatorValidator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Model;
@@ -102,6 +102,6 @@ public function isValid($operator)
             return true;
         }
 
-        throw new InvalidArgumentException(sprintf("'%s' is no valid operator", $operator));
+        throw new InvalidArgumentException(\sprintf("'%s' is no valid operator", $operator));
     }
 }
diff --git a/engine/Shopware/Components/Model/SearchBuilder.php b/engine/Shopware/Components/Model/SearchBuilder.php
index 65acf195508..a17c5cc1965 100644
--- a/engine/Shopware/Components/Model/SearchBuilder.php
+++ b/engine/Shopware/Components/Model/SearchBuilder.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Model;
@@ -58,11 +58,11 @@ public function addSearchTerm($query, $term, array $fields)
 
             foreach ($terms as $index => $word) {
                 $conditions[] = $field . '  LIKE :phrase' . $index;
-                $select[] = sprintf(' IF(%s LIKE %s, %s, 0) ', $field, ':phrase' . $index, $ranking * 0.5);
-                $select[] = sprintf(' IF(%s = %s, %s, 0) ', $field, ':match' . $index, $ranking);
+                $select[] = \sprintf(' IF(%s LIKE %s, %s, 0) ', $field, ':phrase' . $index, $ranking * 0.5);
+                $select[] = \sprintf(' IF(%s = %s, %s, 0) ', $field, ':match' . $index, $ranking);
             }
 
-            $select[] = sprintf(' IF(%s = :full, %s, 0) ', $field, $ranking * 2);
+            $select[] = \sprintf(' IF(%s = :full, %s, 0) ', $field, $ranking * 2);
         }
 
         foreach ($terms as $index => $word) {
diff --git a/engine/Shopware/Components/Model/ZendDbInitializer.php b/engine/Shopware/Components/Model/ZendDbInitializer.php
index 8260cbdba6f..4f09dc84397 100644
--- a/engine/Shopware/Components/Model/ZendDbInitializer.php
+++ b/engine/Shopware/Components/Model/ZendDbInitializer.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Model;
diff --git a/engine/Shopware/Components/Modules.php b/engine/Shopware/Components/Modules.php
index 78c8e0e3fdf..871176134ba 100644
--- a/engine/Shopware/Components/Modules.php
+++ b/engine/Shopware/Components/Modules.php
@@ -5,29 +5,28 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Shopware_Components_Modules extends Enlight_Class implements ArrayAccess
 {
     /**
-     * @var \sSystem
+     * @var sSystem
      */
     protected $system;
 
@@ -50,7 +49,7 @@ public function __call($name, $value = null)
     /**
      * Set class property
      *
-     * @param \sSystem $system
+     * @param sSystem $system
      *
      * @return void
      */
@@ -91,7 +90,7 @@ public function getModule($name)
      *
      * @deprecated - Native return and parameter type will be added with Shopware 5.8
      */
-    #[\ReturnTypeWillChange]
+    #[ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
     }
@@ -103,7 +102,7 @@ public function offsetSet($offset, $value)
      *
      * @deprecated - Native return and parameter type will be added with Shopware 5.8
      */
-    #[\ReturnTypeWillChange]
+    #[ReturnTypeWillChange]
     public function offsetExists($offset)
     {
         return (bool) $this->getModule($offset);
@@ -116,7 +115,7 @@ public function offsetExists($offset)
      *
      * @deprecated - Native return and parameter type will be added with Shopware 5.8
      */
-    #[\ReturnTypeWillChange]
+    #[ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
     }
@@ -128,7 +127,7 @@ public function offsetUnset($offset)
      *
      * @deprecated - Native return and parameter type will be added with Shopware 5.8
      */
-    #[\ReturnTypeWillChange]
+    #[ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return $this->getModule($offset);
@@ -167,7 +166,7 @@ public function Marketing()
     }
 
     /**
-     * @return \sSystem
+     * @return sSystem
      */
     public function System()
     {
@@ -225,17 +224,11 @@ public function Export()
     /**
      * Load a module defined by $name
      * Possible values for $name - sBasket, sAdmin etc.
+     *
+     * @param class-string $name
      */
     private function loadModule(string $name): void
     {
-        if (isset($this->modules_container[$name])) {
-            return;
-        }
-
-        $this->modules_container[$name] = null;
-        /** @var class-string $name */
-        $name = basename($name);
-
         if ($name === 'sSystem') {
             $this->modules_container[$name] = $this->system;
 
diff --git a/engine/Shopware/Components/MultiEdit/Resource/Product.php b/engine/Shopware/Components/MultiEdit/Resource/Product.php
index 44a0bef70e2..e1ee4c4a27b 100644
--- a/engine/Shopware/Components/MultiEdit/Resource/Product.php
+++ b/engine/Shopware/Components/MultiEdit/Resource/Product.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\MultiEdit\Resource;
@@ -33,6 +33,7 @@
 use Shopware\Components\MultiEdit\Resource\Product\Queue;
 use Shopware\Components\MultiEdit\Resource\Product\Value;
 use Shopware\Models\Article\Detail;
+use Shopware\Models\Article\Price;
 
 /**
  * The main product resource will delegate the controller requests to the corresponding classes
@@ -40,40 +41,19 @@
  */
 class Product implements ResourceInterface
 {
-    /**
-     * @var Product\DqlHelper
-     */
-    private $dqlHelper;
+    private DqlHelper $dqlHelper;
 
-    /**
-     * @var Product\Grammar
-     */
-    private $grammar;
+    private Grammar $grammar;
 
-    /**
-     * @var Product\Value
-     */
-    private $value;
+    private Value $value;
 
-    /**
-     * @var Product\Filter
-     */
-    private $filter;
+    private Filter $filter;
 
-    /**
-     * @var Product\BatchProcess
-     */
-    private $batchProcess;
+    private BatchProcess $batchProcess;
 
-    /**
-     * @var Product\Queue
-     */
-    private $queue;
+    private Queue $queue;
 
-    /**
-     * @var Product\Backup
-     */
-    private $backup;
+    private Backup $backup;
 
     public function __construct(DqlHelper $dqlHelper, Grammar $grammar, Value $value, Filter $filter, BatchProcess $batchProcess, Queue $queue, Backup $backup)
     {
@@ -168,7 +148,7 @@ public function save($params)
             $entity = $this->dqlHelper->getEntityForPrefix($prefix);
 
             // All models except price
-            if ($prefix !== 'price') {
+            if ($entity !== Price::class) {
                 $model = $entityManager->find($entity, $primaryIdentifiers[$prefix]);
                 if ($model === null) {
                     continue;
diff --git a/engine/Shopware/Components/MultiEdit/Resource/Product/Backup.php b/engine/Shopware/Components/MultiEdit/Resource/Product/Backup.php
index 1ff8225632f..8ef167f3749 100644
--- a/engine/Shopware/Components/MultiEdit/Resource/Product/Backup.php
+++ b/engine/Shopware/Components/MultiEdit/Resource/Product/Backup.php
@@ -1,31 +1,32 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\MultiEdit\Resource\Product;
 
 use DateTime;
 use Doctrine\ORM\AbstractQuery;
+use Doctrine\ORM\Query;
 use Exception;
 use PDO;
 use RuntimeException;
@@ -126,7 +127,7 @@ public function setupBackupDir()
             }
 
             if (!is_dir($this->backupPath)) {
-                throw new RuntimeException(sprintf('Could not find nor create "%s"', $this->backupPath));
+                throw new RuntimeException(\sprintf('Could not find nor create "%s"', $this->backupPath));
             }
         }
     }
@@ -137,16 +138,18 @@ public function setupBackupDir()
      * @param int $offset
      * @param int $limit
      *
-     * @return array
+     * @return array{totalCount: int, data: array<array<string, mixed>>}
      */
     public function getList($offset, $limit)
     {
-        $query = $this->getDqlHelper()->getEntityManager()->getRepository(BackupModel::class)->getBackupListQuery($offset, $limit);
+        /** @var Query<array<string, mixed>> $query */
+        $query = $this->getDqlHelper()->getEntityManager()->getRepository(BackupModel::class)
+            ->getBackupListQuery($offset, $limit);
         $query->setHydrationMode(AbstractQuery::HYDRATE_ARRAY);
         $paginator = Shopware()->Models()->createPaginator($query);
         $totalCount = $paginator->count();
 
-        $backups = $paginator->getIterator()->getArrayCopy();
+        $backups = iterator_to_array($paginator);
 
         return [
             'totalCount' => $totalCount,
@@ -222,28 +225,23 @@ public function finishBackup($filterString, $operations, $items, $id)
      *
      * @throws RuntimeException
      *
-     * @return array
+     * @return array{totalCount: int, offset: int, done: bool}
      */
     public function restore($id, $offset = 0)
     {
         $entityManager = $this->getDqlHelper()->getEntityManager();
         $backup = $entityManager->find(BackupModel::class, $id);
 
-        if (!$backup) {
-            throw new RuntimeException(sprintf('Backup by id %d not found', $id));
+        if (!$backup instanceof BackupModel) {
+            throw new RuntimeException(\sprintf('Backup by id %d not found', $id));
         }
 
         $path = $backup->getPath();
         $dir = \dirname($path);
 
-        if ($offset === 0) {
-            $zip = new ZipArchive();
-            $zip->open($path);
-            $success = $zip->extractTo($dir);
-            if (!$success) {
-                throw new RuntimeException(sprintf('Could not extract %s to %s', $path, $dir));
-            }
-            $zip->close();
+        // Only unzip at the first time
+        if ((int) $offset === 0) {
+            $this->extractedFilesFromZip($path, $dir);
         }
 
         // Get list of data sql files
@@ -309,7 +307,7 @@ public function delete($id)
         $backup = $entityManager->find(BackupModel::class, $id);
 
         if (!$backup) {
-            throw new RuntimeException(sprintf('Backup by id %d not found', $id));
+            throw new RuntimeException(\sprintf('Backup by id %d not found', $id));
         }
 
         $dir = \dirname($backup->getPath());
@@ -411,7 +409,7 @@ protected function buildAffectedTableArray($operations)
         $fields = [];
         // Create a assoc array of tables and their fields
         foreach ($operations as $operation) {
-            list($prefix, $field) = explode('.', $operation['column']);
+            [$prefix, $field] = explode('.', $operation['column']);
             $prefix = ucfirst(strtolower($prefix));
             $prefixes[] = $prefix;
 
@@ -462,7 +460,7 @@ protected function getPrefixFromTable($table)
         $prefix = $this->affectedTables[$table]['prefix'];
 
         if (!$prefix) {
-            throw new RuntimeException(sprintf('Empty prefix for %s', $table));
+            throw new RuntimeException(\sprintf('Empty prefix for %s', $table));
         }
 
         return $prefix;
@@ -480,7 +478,7 @@ protected function getAffectedColumns($table)
         $columns = $this->affectedTables[$table]['columns'];
 
         if (!$columns) {
-            throw new RuntimeException(sprintf('Empty column for %s', $table));
+            throw new RuntimeException(\sprintf('Empty column for %s', $table));
         }
 
         return $columns;
@@ -551,7 +549,7 @@ protected function dumpTable($table, $name, $ids, $newBackup)
 
         $fileHandle = fopen($outFileData, 'w');
         if (!\is_resource($fileHandle)) {
-            throw new RuntimeException(sprintf('Could not open stream at "%s"', $outFileData));
+            throw new RuntimeException(\sprintf('Could not open stream at "%s"', $outFileData));
         }
 
         $columns = $this->getAffectedColumns($table);
@@ -657,7 +655,7 @@ protected function createZip($name)
         $zip = new ZipArchive();
 
         if ($zip->open($zipPath, ZipArchive::CREATE) !== true) {
-            throw new RuntimeException(sprintf('Could not open %s, please check the permissions.', $zipPath));
+            throw new RuntimeException(\sprintf('Could not open %s, please check the permissions.', $zipPath));
         }
 
         $files = $this->getDirectoryList($this->outputPath);
@@ -695,4 +693,15 @@ protected function getDirectoryList($path, $findExtension = ['datasql', 'headers
 
         return $files;
     }
+
+    private function extractedFilesFromZip(string $path, string $dir): void
+    {
+        $zip = new ZipArchive();
+        $zip->open($path);
+        $success = $zip->extractTo($dir);
+        if (!$success) {
+            throw new RuntimeException(\sprintf('Could not extract %s to %s', $path, $dir));
+        }
+        $zip->close();
+    }
 }
diff --git a/engine/Shopware/Components/MultiEdit/Resource/Product/BatchProcess.php b/engine/Shopware/Components/MultiEdit/Resource/Product/BatchProcess.php
index b4298b6ac17..580f55b4a3e 100644
--- a/engine/Shopware/Components/MultiEdit/Resource/Product/BatchProcess.php
+++ b/engine/Shopware/Components/MultiEdit/Resource/Product/BatchProcess.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\MultiEdit\Resource\Product;
@@ -114,7 +114,7 @@ public function getConfig()
      *
      * @throws RuntimeException When the column was not defined
      *
-     * @return array
+     * @return array<string, array<string>>
      */
     public function getEditableColumns()
     {
@@ -169,7 +169,7 @@ public function getEditableColumns()
                     break;
 
                 default:
-                    throw new RuntimeException(sprintf('Column with type %s was not configured, yet', $type));
+                    throw new RuntimeException(\sprintf('Column with type %s was not configured, yet', $type));
             }
         }
 
@@ -308,7 +308,7 @@ public function updateDetails($detailIds, $nestedOperations)
      *
      * @throws RuntimeException
      *
-     * @return array
+     * @return array{totalCount: int, remaining: int, done: bool, processed: int}
      */
     public function batchProcess($queueId)
     {
@@ -319,7 +319,7 @@ public function batchProcess($queueId)
         $queue = $entityManager->find(Queue::class, $queueId);
 
         if (!$queue) {
-            throw new RuntimeException(sprintf('Queue with ID %s not found', $queueId));
+            throw new RuntimeException(\sprintf('Queue with ID %s not found', $queueId));
         }
 
         $operations = json_decode($queue->getOperations(), true);
@@ -337,7 +337,7 @@ public function batchProcess($queueId)
             }
         } catch (Exception $e) {
             $connection->rollBack();
-            throw new RuntimeException(sprintf('Error updating details: %s', $e->getMessage()), 0, $e);
+            throw new RuntimeException(\sprintf('Error updating details: %s', $e->getMessage()), 0, $e);
         }
         $remaining = $queue->getArticleDetails()->count();
 
diff --git a/engine/Shopware/Components/MultiEdit/Resource/Product/DqlHelper.php b/engine/Shopware/Components/MultiEdit/Resource/Product/DqlHelper.php
index e781a7c80af..fc6d8524580 100644
--- a/engine/Shopware/Components/MultiEdit/Resource/Product/DqlHelper.php
+++ b/engine/Shopware/Components/MultiEdit/Resource/Product/DqlHelper.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\MultiEdit\Resource\Product;
@@ -145,10 +145,16 @@ class DqlHelper
 
     protected $entityToPrefix = [];
 
+    /**
+     * @var array<class-string<ModelEntity>>
+     */
     protected $prefixToEntity = [];
 
     protected $columns = [];
 
+    /**
+     * @var array<string, array<string, mixed>>
+     */
     protected $columnInfo = [];
 
     public function __construct(
@@ -242,6 +248,8 @@ public function getMainEntity()
      * e.g. article => \Shopware\Models\Article\Article
      *
      * @param string $prefix
+     *
+     * @return class-string<ModelEntity>
      */
     public function getEntityForPrefix($prefix)
     {
@@ -262,7 +270,7 @@ public function getPrefixForEntity($entity)
     /**
      * Returns a list of columns which are always visible in the default filter view
      *
-     * @return array
+     * @return list<string>
      */
     public function getDefaultColumns()
     {
@@ -283,7 +291,7 @@ public function getDefaultColumns()
      *
      * Columns having "allowInGrid" set to true, are selected for the main product listing.
      *
-     * @return array
+     * @return array<string, array<string, mixed>>
      */
     public function getColumnsForProductListing()
     {
@@ -294,6 +302,8 @@ public function getColumnsForProductListing()
      * Returns a single row with (almost) all possibly relevant information of a product
      *
      * @param int $detailId
+     *
+     * @return array<string, mixed>|null
      */
     public function getProductForListing($detailId)
     {
@@ -305,9 +315,9 @@ public function getProductForListing($detailId)
     /**
      * Returns a multiple row with (almost) all possibly relevant information of products
      *
-     * @param int[] $ids
+     * @param array<int> $ids
      *
-     * @return array[]
+     * @return array<array<string, mixed>>
      */
     public function getProductsForListing(array $ids)
     {
@@ -387,6 +397,8 @@ public function getAttributes()
 
     /**
      * Build some basic mappings
+     *
+     * @return void
      */
     public function buildMapping()
     {
@@ -421,6 +433,8 @@ public function buildMapping()
      * Build a list which holds the configuration for all known columns - e.g. name, data type, associated table…
      *
      * Columns having "allowInGrid" set to true, are selected for the main product listing.
+     *
+     * @return array<string, array<string, mixed>>
      */
     public function buildColumnInfo()
     {
@@ -959,7 +973,7 @@ public function getIdForForeignEntityInternal($foreignPrefix, $detailIds)
                 );
         }
 
-        throw new RuntimeException(sprintf('Foreign table %s not defined, yet. Please report this error.', $foreignPrefix));
+        throw new RuntimeException(\sprintf('Foreign table %s not defined, yet. Please report this error.', $foreignPrefix));
     }
 
     /**
@@ -1011,9 +1025,9 @@ protected function getPrefixedColumns($entity)
      *  * a category
      *  * images?
      *
-     * @param array[] $articles
+     * @param array<array<string, mixed>> $articles
      *
-     * @return array[]
+     * @return array<array<string, mixed>>
      */
     protected function addInfo(array $articles)
     {
@@ -1071,12 +1085,8 @@ protected function addInfo(array $articles)
      *
      * Use the filter event SwagMultiEdit_Product_DqlHelper_getColumnsForProductListing_filterColumns
      * in order to overwrite the selectable columns
-     *
-     * @param array $column
-     *
-     * @return bool
      */
-    private function showColumnInGrid($column)
+    private function showColumnInGrid(array $column): bool
     {
         $entitiesToShow = [
             'Article',
diff --git a/engine/Shopware/Components/MultiEdit/Resource/Product/Filter.php b/engine/Shopware/Components/MultiEdit/Resource/Product/Filter.php
index 535f0d24876..a9a13d8b111 100644
--- a/engine/Shopware/Components/MultiEdit/Resource/Product/Filter.php
+++ b/engine/Shopware/Components/MultiEdit/Resource/Product/Filter.php
@@ -1,30 +1,32 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\MultiEdit\Resource\Product;
 
+use Doctrine\ORM\Query;
 use Shopware\Components\Model\QueryBuilder;
+use Shopware\Models\Article\Article;
 use Shopware\Models\Article\Detail;
 
 /**
@@ -77,7 +79,7 @@ public function filterArrayToString($filterArray)
      * @param int|null   $limit
      * @param array|null $orderBy
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Detail>
      */
     public function getFilterQuery($tokens, $offset = null, $limit = null, $orderBy = null)
     {
@@ -114,7 +116,6 @@ public function getFilterQueryBuilder($tokens, $orderBy)
         }
         $joinEntities = $this->filterJoinEntities($joinEntities);
 
-        /** @var QueryBuilder $builder */
         $builder = $this->getDqlHelper()->getEntityManager()->createQueryBuilder()
                 ->select('partial detail.{id}')
                 ->from(Detail::class, 'detail')
@@ -163,7 +164,7 @@ public function getArticleQueryBuilder($detailId)
             'partial article.{id, name}',
         ])
         ->from(Detail::class, 'detail')
-        //~ ->leftJoin('detail.article', 'article')
+        // ~ ->leftJoin('detail.article', 'article')
         ->where('detail.id = ?1')
         ->setParameter(1, $detailId);
 
@@ -171,9 +172,9 @@ public function getArticleQueryBuilder($detailId)
     }
 
     /**
-     * @param \Doctrine\ORM\Query $query
+     * @param Query<Detail> $query
      *
-     * @return array
+     * @return array{0: array<int>, 1: int}
      */
     public function getPaginatedResult($query)
     {
@@ -186,7 +187,7 @@ public function getPaginatedResult($query)
             function ($item) {
                 return $item->getId();
             },
-            $paginator->getIterator()->getArrayCopy()
+            iterator_to_array($paginator)
         );
 
         // Detach currently handled models in order to avoid invalid models later
@@ -203,7 +204,7 @@ function ($item) {
      * @param int   $limit
      * @param array $orderBy
      *
-     * @return array
+     * @return array{data: array<array<string, mixed>>, total: int}
      */
     public function filter($tokens, $offset, $limit, $orderBy)
     {
@@ -229,21 +230,14 @@ public function filter($tokens, $offset, $limit, $orderBy)
         ];
     }
 
-    /**
-     * @param array $joinEntities
-     *
-     * @return array
-     */
-    private function filterJoinEntities($joinEntities)
+    private function filterJoinEntities(array $joinEntities): array
     {
         // Remove Article-Entity
-        $joinEntities = array_filter(
+        return array_filter(
             $joinEntities,
             function ($item) {
-                return $item !== 'Shopware\Models\Article\Article' && $item !== 'Shopware\Models\Article\Detail';
+                return $item !== Article::class && $item !== Detail::class;
             }
         );
-
-        return $joinEntities;
     }
 }
diff --git a/engine/Shopware/Components/MultiEdit/Resource/Product/Grammar.php b/engine/Shopware/Components/MultiEdit/Resource/Product/Grammar.php
index d42043293a6..c6cefc33ed2 100644
--- a/engine/Shopware/Components/MultiEdit/Resource/Product/Grammar.php
+++ b/engine/Shopware/Components/MultiEdit/Resource/Product/Grammar.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\MultiEdit\Resource\Product;
@@ -77,7 +77,7 @@ public function getEventManager()
      *
      * @throws RuntimeException When the column was not defined
      *
-     * @return array
+     * @return array<string, array<string>>
      */
     public function generateAttributesFromColumns()
     {
@@ -133,7 +133,7 @@ public function generateAttributesFromColumns()
                     )) {
                         $attributes[$formattedColumn] = $event->getReturn();
                     } else {
-                        throw new RuntimeException(sprintf('Column with type %s was not configured, yet', $type));
+                        throw new RuntimeException(\sprintf('Column with type %s was not configured, yet', $type));
                     }
             }
         }
@@ -144,7 +144,7 @@ public function generateAttributesFromColumns()
     /**
      * Returns an array which represents the grammar of out product resource
      *
-     * @return array
+     * @return array<string, array<int|string, string|array<string>>>
      */
     public function getGrammar()
     {
@@ -181,12 +181,10 @@ public function getGrammar()
         ];
 
         // Allow users to add own operators / rules
-        $grammar = $this->getEventManager()->filter(
+        return $this->getEventManager()->filter(
             'SwagMultiEdit_Product_Grammar_getGrammar_filterGrammar',
             $grammar,
             ['subject' => $this]
         );
-
-        return $grammar;
     }
 }
diff --git a/engine/Shopware/Components/MultiEdit/Resource/Product/Queue.php b/engine/Shopware/Components/MultiEdit/Resource/Product/Queue.php
index c0e3f9c010c..44b42ea970e 100644
--- a/engine/Shopware/Components/MultiEdit/Resource/Product/Queue.php
+++ b/engine/Shopware/Components/MultiEdit/Resource/Product/Queue.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\MultiEdit\Resource\Product;
@@ -27,6 +27,7 @@
 use DateTime;
 use RuntimeException;
 use Shopware\Models\Article\Detail;
+use Shopware\Models\MultiEdit\Queue as QueueModel;
 use Shopware\Models\MultiEdit\QueueArticle;
 
 /**
@@ -132,7 +133,7 @@ function ($item) {
      *
      * @throws RuntimeException
      *
-     * @return array
+     * @return array{totalCount: int, offset: int, queueId: int, done: bool}
      */
     public function create($filterArray, $operations, $offset, $limit, $queueId)
     {
@@ -145,14 +146,14 @@ public function create($filterArray, $operations, $offset, $limit, $queueId)
 
         if (!empty($queueId)) {
             $newBackup = false;
-            /** @var \Shopware\Models\MultiEdit\Queue|null $queue */
-            $queue = $entityManager->find(\Shopware\Models\MultiEdit\Queue::class, $queueId);
+            /** @var QueueModel|null $queue */
+            $queue = $entityManager->find(QueueModel::class, $queueId);
             if (!$queue) {
-                throw new RuntimeException(sprintf('Queue with ID %s not found', $queueId));
+                throw new RuntimeException(\sprintf('Queue with ID %s not found', $queueId));
             }
         } else {
             $newBackup = true;
-            $queue = new \Shopware\Models\MultiEdit\Queue('product');
+            $queue = new QueueModel('product');
             $queue->setFilterString($filterString);
             $queue->setOperations(json_encode($operations));
             $queue->setCreated(new DateTime());
@@ -177,12 +178,12 @@ public function create($filterArray, $operations, $offset, $limit, $queueId)
                 $entityManager->flush($model);
                 $entityManager->clear();
 
-                /** @var \Shopware\Models\MultiEdit\Queue $queue */
-                $queue = $entityManager->getReference(\Shopware\Models\MultiEdit\Queue::class, $queueId);
+                /** @var QueueModel $queue */
+                $queue = $entityManager->getReference(QueueModel::class, $queueId);
             }
 
             /** @var Detail $detail */
-            $detail = $entityManager->getReference(\Shopware\Models\Article\Detail::class, $detailId);
+            $detail = $entityManager->getReference(Detail::class, $detailId);
 
             $model = new QueueArticle();
             $model->setQueue($queue);
diff --git a/engine/Shopware/Components/MultiEdit/Resource/Product/Value.php b/engine/Shopware/Components/MultiEdit/Resource/Product/Value.php
index 8262ec8d3a8..477f4df8b01 100644
--- a/engine/Shopware/Components/MultiEdit/Resource/Product/Value.php
+++ b/engine/Shopware/Components/MultiEdit/Resource/Product/Value.php
@@ -1,30 +1,31 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\MultiEdit\Resource\Product;
 
 use DateTime;
+use Doctrine\ORM\Query;
 use Shopware\Components\Model\ModelEntity;
 
 /**
@@ -58,7 +59,7 @@ public function getDqlHelper()
      * @param string                    $operator
      * @param array                     $queryConfig
      *
-     * @return array
+     * @return array{data: array<array{title: mixed}>, total: int}
      */
     public function getValuesFor($attribute, $operator, $queryConfig)
     {
@@ -90,6 +91,7 @@ public function getValuesFor($attribute, $operator, $queryConfig)
             ->setFirstResult($queryConfig['offset'])
             ->setMaxResults($queryConfig['limit']);
 
+        /** @var Query<array<string, mixed>> $query */
         $query = $builder->getQuery();
 
         $paginator = Shopware()->Models()->createPaginator($query);
@@ -97,7 +99,7 @@ public function getValuesFor($attribute, $operator, $queryConfig)
         $results = [];
 
         // Iterate results, do some formatting if needed
-        foreach ($paginator->getIterator()->getArrayCopy() as $item) {
+        foreach ($paginator as $item) {
             $item = array_pop($item);
             if ($item instanceof DateTime) {
                 if ($columnType === 'date') {
diff --git a/engine/Shopware/Components/MultiEdit/Resource/ResourceInterface.php b/engine/Shopware/Components/MultiEdit/Resource/ResourceInterface.php
index 990f15b2c40..7a5580f737f 100644
--- a/engine/Shopware/Components/MultiEdit/Resource/ResourceInterface.php
+++ b/engine/Shopware/Components/MultiEdit/Resource/ResourceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\MultiEdit\Resource;
@@ -30,6 +30,8 @@ interface ResourceInterface
 {
     /**
      * Needs to return the grammar for out lexer
+     *
+     * @return array<string, array<int|string, string|array<string>>>
      */
     public function getGrammar();
 
@@ -39,6 +41,8 @@ public function getGrammar();
      * @param class-string<ModelEntity> $attribute
      * @param string                    $operator
      * @param array                     $queryConfig
+     *
+     * @return array{data: array<array{title: mixed}>, total: int}
      */
     public function getValuesFor($attribute, $operator, $queryConfig);
 
@@ -48,11 +52,15 @@ public function getValuesFor($attribute, $operator, $queryConfig);
      * @param array $tokens
      * @param int   $offset
      * @param int   $limit
+     *
+     * @return array{data: array<array<string, mixed>>, total: int}
      */
     public function filter($tokens, $offset, $limit, $orderBy = null);
 
     /**
      * Returns columns to be shown in the batchProcess window
+     *
+     * @return array<string, array<string>>
      */
     public function getBatchColumns();
 
@@ -60,6 +68,8 @@ public function getBatchColumns();
      * The actual batch processing
      *
      * @param int $queueId
+     *
+     * @return array{totalCount: int, remaining: int, done: bool, processed: int}
      */
     public function batchProcess($queueId);
 
@@ -71,11 +81,15 @@ public function batchProcess($queueId);
      * @param int   $offset
      * @param int   $limit
      * @param int   $queueId
+     *
+     * @return array{totalCount: int, offset: int, queueId: int, done: bool}
      */
     public function createQueue($filterArray, $operations, $offset, $limit, $queueId);
 
     /**
      * Needs to return the columns that can be shown as well as their data type.
+     *
+     * @return array<array<string, mixed>>
      */
     public function getColumnConfig();
 
@@ -83,6 +97,8 @@ public function getColumnConfig();
      * Saves a single modified instance of the entity
      *
      * @param array $params
+     *
+     * @return array<string, mixed>|null
      */
     public function save($params);
 
@@ -91,6 +107,8 @@ public function save($params);
      *
      * @param int $offset
      * @param int $limit
+     *
+     * @return array{totalCount: int, data: array<array<string, mixed>>}
      */
     public function listBackups($offset, $limit);
 
@@ -99,6 +117,8 @@ public function listBackups($offset, $limit);
      *
      * @param int $id
      * @param int $offset
+     *
+     * @return array{totalCount: int, offset: int, done: bool}
      */
     public function restoreBackup($id, $offset);
 
@@ -106,6 +126,8 @@ public function restoreBackup($id, $offset);
      * Delete a given backup
      *
      * @param int $id
+     *
+     * @return bool
      */
     public function deleteBackup($id);
 }
diff --git a/engine/Shopware/Components/NumberRangeIncrementer.php b/engine/Shopware/Components/NumberRangeIncrementer.php
index 94149f7c155..81faf688dd7 100644
--- a/engine/Shopware/Components/NumberRangeIncrementer.php
+++ b/engine/Shopware/Components/NumberRangeIncrementer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
@@ -50,7 +50,7 @@ public function increment($name)
             $number = $this->connection->fetchColumn('SELECT number FROM s_order_number WHERE name = ? FOR UPDATE', [$name]);
 
             if ($number === false) {
-                throw new RuntimeException(sprintf('Number range with name "%s" does not exist.', $name));
+                throw new RuntimeException(\sprintf('Number range with name "%s" does not exist.', $name));
             }
 
             $this->connection->executeUpdate('UPDATE s_order_number SET number = number + 1 WHERE name = ?', [$name]);
diff --git a/engine/Shopware/Components/NumberRangeIncrementerInterface.php b/engine/Shopware/Components/NumberRangeIncrementerInterface.php
index 64ddea07b68..1e56b00181b 100644
--- a/engine/Shopware/Components/NumberRangeIncrementerInterface.php
+++ b/engine/Shopware/Components/NumberRangeIncrementerInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
diff --git a/engine/Shopware/Components/ObjectJsonSerializeTrait.php b/engine/Shopware/Components/ObjectJsonSerializeTrait.php
index 792a74d35ff..f861aaa594b 100644
--- a/engine/Shopware/Components/ObjectJsonSerializeTrait.php
+++ b/engine/Shopware/Components/ObjectJsonSerializeTrait.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
diff --git a/engine/Shopware/Components/ObjectJsonSerializeTraitDeprecated.php b/engine/Shopware/Components/ObjectJsonSerializeTraitDeprecated.php
index 165d07bf883..94bf2f75e00 100644
--- a/engine/Shopware/Components/ObjectJsonSerializeTraitDeprecated.php
+++ b/engine/Shopware/Components/ObjectJsonSerializeTraitDeprecated.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
diff --git a/engine/Shopware/Components/OpenSSLVerifier.php b/engine/Shopware/Components/OpenSSLVerifier.php
index fdf589f036a..3391ed46922 100644
--- a/engine/Shopware/Components/OpenSSLVerifier.php
+++ b/engine/Shopware/Components/OpenSSLVerifier.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
@@ -47,7 +47,7 @@ class OpenSSLVerifier
     public function __construct($publicKey)
     {
         if (!is_readable($publicKey)) {
-            throw new InvalidArgumentException(sprintf('Public keyfile "%s" not readable', $publicKey));
+            throw new InvalidArgumentException(\sprintf('Public keyfile "%s" not readable', $publicKey));
         }
 
         $this->publicKeyPath = $publicKey;
@@ -86,7 +86,7 @@ public function isValid($message, $signature)
         }
         while ($errors[] = openssl_error_string()) {
         }
-        throw new RuntimeException(sprintf("Error during private key read: \n%s", implode("\n", $errors)));
+        throw new RuntimeException(\sprintf("Error during private key read: \n%s", implode("\n", $errors)));
     }
 
     /**
@@ -104,7 +104,7 @@ private function getKeyResource()
         if ($keyResource === false) {
             while ($errors[] = openssl_error_string()) {
             }
-            throw new RuntimeException(sprintf("Error during public key read: \n%s", implode("\n", $errors)));
+            throw new RuntimeException(\sprintf("Error during public key read: \n%s", implode("\n", $errors)));
         }
 
         $this->keyResource = $keyResource;
diff --git a/engine/Shopware/Components/OptinService.php b/engine/Shopware/Components/OptinService.php
index 69af866ecaf..20f071dcef7 100644
--- a/engine/Shopware/Components/OptinService.php
+++ b/engine/Shopware/Components/OptinService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
diff --git a/engine/Shopware/Components/OptinServiceInterface.php b/engine/Shopware/Components/OptinServiceInterface.php
index 52a7a9dda2a..22723335da0 100644
--- a/engine/Shopware/Components/OptinServiceInterface.php
+++ b/engine/Shopware/Components/OptinServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
@@ -32,6 +32,8 @@ interface OptinServiceInterface
     /**
      * @param string $type
      * @param int    $duration
+     *
+     * @return string
      */
     public function add($type, $duration, array $data);
 
@@ -46,6 +48,8 @@ public function get($type, $hash);
     /**
      * @param string $type
      * @param string $hash
+     *
+     * @return void
      */
     public function delete($type, $hash);
 }
diff --git a/engine/Shopware/Components/OrderNumberValidator/Exception/InvalidOrderNumberException.php b/engine/Shopware/Components/OrderNumberValidator/Exception/InvalidOrderNumberException.php
index a917b4d200a..b32d3573dc8 100644
--- a/engine/Shopware/Components/OrderNumberValidator/Exception/InvalidOrderNumberException.php
+++ b/engine/Shopware/Components/OrderNumberValidator/Exception/InvalidOrderNumberException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\OrderNumberValidator\Exception;
diff --git a/engine/Shopware/Components/OrderNumberValidator/OrderNumberValidatorInterface.php b/engine/Shopware/Components/OrderNumberValidator/OrderNumberValidatorInterface.php
index e190d63f703..22214ad45d3 100644
--- a/engine/Shopware/Components/OrderNumberValidator/OrderNumberValidatorInterface.php
+++ b/engine/Shopware/Components/OrderNumberValidator/OrderNumberValidatorInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\OrderNumberValidator;
diff --git a/engine/Shopware/Components/OrderNumberValidator/RegexOrderNumberValidator.php b/engine/Shopware/Components/OrderNumberValidator/RegexOrderNumberValidator.php
index f8dca783b93..b2a6b4738a8 100644
--- a/engine/Shopware/Components/OrderNumberValidator/RegexOrderNumberValidator.php
+++ b/engine/Shopware/Components/OrderNumberValidator/RegexOrderNumberValidator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\OrderNumberValidator;
@@ -28,10 +28,7 @@
 
 class RegexOrderNumberValidator implements OrderNumberValidatorInterface
 {
-    /**
-     * @var string
-     */
-    private $pattern;
+    private string $pattern;
 
     public function __construct(string $pattern)
     {
@@ -41,7 +38,7 @@ public function __construct(string $pattern)
     public function validate(string $orderNumber): bool
     {
         if (preg_match($this->pattern, $orderNumber) === 0) {
-            throw new InvalidOrderNumberException(sprintf('Order number "%s" does not match pattern "%s"', $orderNumber, $this->pattern));
+            throw new InvalidOrderNumberException(\sprintf('Order number "%s" does not match pattern "%s"', $orderNumber, $this->pattern));
         }
 
         return true;
diff --git a/engine/Shopware/Components/Password/Encoder/Argon2i.php b/engine/Shopware/Components/Password/Encoder/Argon2i.php
index fc4de9b34a0..d411f05fd8e 100644
--- a/engine/Shopware/Components/Password/Encoder/Argon2i.php
+++ b/engine/Shopware/Components/Password/Encoder/Argon2i.php
@@ -1,29 +1,31 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Password\Encoder;
 
+use DomainException;
+
 class Argon2i implements PasswordEncoderInterface
 {
     /**
@@ -36,9 +38,23 @@ class Argon2i implements PasswordEncoderInterface
      */
     public function __construct($options = null)
     {
-        if ($options !== null) {
-            $this->options = $options;
+        if ($options === null) {
+            return;
+        }
+
+        if (!isset($options['memory_cost']) || $options['memory_cost'] < 256) {
+            $options['memory_cost'] = PASSWORD_ARGON2_DEFAULT_MEMORY_COST;
+        }
+
+        if (!isset($options['time_cost']) || ($options['time_cost'] < 1 || $options['time_cost'] > 30)) {
+            $options['time_cost'] = PASSWORD_ARGON2_DEFAULT_TIME_COST;
         }
+
+        if (!isset($options['threads']) || ($options['threads'] < 1 || $options['threads'] > 32)) {
+            $options['threads'] = PASSWORD_ARGON2_DEFAULT_THREADS;
+        }
+
+        $this->options = $options;
     }
 
     /**
@@ -75,7 +91,13 @@ public function isPasswordValid($password, $hash)
      */
     public function encodePassword($password)
     {
-        return password_hash($password, PASSWORD_ARGON2I, $this->options);
+        $hash = password_hash($password, PASSWORD_ARGON2I, $this->options);
+
+        if (!\is_string($hash)) {
+            throw new DomainException(\sprintf('Password could not be encoded by the encoder %s.', PASSWORD_ARGON2I));
+        }
+
+        return $hash;
     }
 
     /**
diff --git a/engine/Shopware/Components/Password/Encoder/Argon2id.php b/engine/Shopware/Components/Password/Encoder/Argon2id.php
index 9feb0869637..a5b6cb132f9 100644
--- a/engine/Shopware/Components/Password/Encoder/Argon2id.php
+++ b/engine/Shopware/Components/Password/Encoder/Argon2id.php
@@ -1,29 +1,31 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Password\Encoder;
 
+use DomainException;
+
 class Argon2id implements PasswordEncoderInterface
 {
     /**
@@ -36,9 +38,23 @@ class Argon2id implements PasswordEncoderInterface
      */
     public function __construct($options = null)
     {
-        if ($options !== null) {
-            $this->options = $options;
+        if ($options === null) {
+            return;
+        }
+
+        if (!isset($options['memory_cost']) || $options['memory_cost'] < 256) {
+            $options['memory_cost'] = PASSWORD_ARGON2_DEFAULT_MEMORY_COST;
+        }
+
+        if (!isset($options['time_cost']) || ($options['time_cost'] < 1 || $options['time_cost'] > 30)) {
+            $options['time_cost'] = PASSWORD_ARGON2_DEFAULT_TIME_COST;
         }
+
+        if (!isset($options['threads']) || ($options['threads'] < 1 || $options['threads'] > 32)) {
+            $options['threads'] = PASSWORD_ARGON2_DEFAULT_THREADS;
+        }
+
+        $this->options = $options;
     }
 
     /**
@@ -75,7 +91,13 @@ public function isPasswordValid($password, $hash)
      */
     public function encodePassword($password)
     {
-        return password_hash($password, PASSWORD_ARGON2ID, $this->options);
+        $hash = password_hash($password, PASSWORD_ARGON2ID, $this->options);
+
+        if (!\is_string($hash)) {
+            throw new DomainException(\sprintf('Password could not be encoded by the encoder %s.', $this->getName()));
+        }
+
+        return $hash;
     }
 
     /**
diff --git a/engine/Shopware/Components/Password/Encoder/Bcrypt.php b/engine/Shopware/Components/Password/Encoder/Bcrypt.php
index e98f761bf12..9b1cede4260 100644
--- a/engine/Shopware/Components/Password/Encoder/Bcrypt.php
+++ b/engine/Shopware/Components/Password/Encoder/Bcrypt.php
@@ -1,29 +1,31 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Password\Encoder;
 
+use DomainException;
+
 class Bcrypt implements PasswordEncoderInterface
 {
     /**
@@ -36,9 +38,15 @@ class Bcrypt implements PasswordEncoderInterface
      */
     public function __construct($options = null)
     {
-        if ($options !== null) {
-            $this->options = $options;
+        if ($options === null) {
+            return;
+        }
+
+        if (!isset($options['cost']) || ($options['cost'] <= 3 || $options['cost'] >= 32)) {
+            $options['cost'] = 10;
         }
+
+        $this->options = $options;
     }
 
     /**
@@ -75,7 +83,13 @@ public function isPasswordValid($password, $hash)
      */
     public function encodePassword($password)
     {
-        return password_hash($password, PASSWORD_BCRYPT, $this->options);
+        $hash = password_hash($password, PASSWORD_BCRYPT, $this->options);
+
+        if (!\is_string($hash)) {
+            throw new DomainException(\sprintf('Password could not be encoded by the encoder %s.', $this->getName()));
+        }
+
+        return $hash;
     }
 
     /**
diff --git a/engine/Shopware/Components/Password/Encoder/LegacyBackendMd5.php b/engine/Shopware/Components/Password/Encoder/LegacyBackendMd5.php
index 2a2faa50b3c..61710331210 100644
--- a/engine/Shopware/Components/Password/Encoder/LegacyBackendMd5.php
+++ b/engine/Shopware/Components/Password/Encoder/LegacyBackendMd5.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Password\Encoder;
diff --git a/engine/Shopware/Components/Password/Encoder/Md5.php b/engine/Shopware/Components/Password/Encoder/Md5.php
index 0c7f7148956..5c15b55881d 100644
--- a/engine/Shopware/Components/Password/Encoder/Md5.php
+++ b/engine/Shopware/Components/Password/Encoder/Md5.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Password\Encoder;
diff --git a/engine/Shopware/Components/Password/Encoder/PasswordEncoderInterface.php b/engine/Shopware/Components/Password/Encoder/PasswordEncoderInterface.php
index 46f7ec67dc1..fc18f8909c1 100644
--- a/engine/Shopware/Components/Password/Encoder/PasswordEncoderInterface.php
+++ b/engine/Shopware/Components/Password/Encoder/PasswordEncoderInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Password\Encoder;
diff --git a/engine/Shopware/Components/Password/Encoder/PreHashed.php b/engine/Shopware/Components/Password/Encoder/PreHashed.php
index 1f96d345914..d7543e98898 100644
--- a/engine/Shopware/Components/Password/Encoder/PreHashed.php
+++ b/engine/Shopware/Components/Password/Encoder/PreHashed.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Password\Encoder;
diff --git a/engine/Shopware/Components/Password/Encoder/Sha256.php b/engine/Shopware/Components/Password/Encoder/Sha256.php
index ce008d20346..19d353e66e9 100644
--- a/engine/Shopware/Components/Password/Encoder/Sha256.php
+++ b/engine/Shopware/Components/Password/Encoder/Sha256.php
@@ -1,29 +1,30 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Password\Encoder;
 
+use DomainException;
 use Shopware\Components\Random;
 
 /**
@@ -31,6 +32,8 @@
  */
 class Sha256 implements PasswordEncoderInterface
 {
+    private const DELIMITER = ':';
+
     /**
      * @var array
      */
@@ -44,9 +47,15 @@ class Sha256 implements PasswordEncoderInterface
      */
     public function __construct($options = null)
     {
-        if ($options !== null) {
-            $this->options = $options;
+        if ($options === null) {
+            return;
         }
+
+        if (!isset($options['iterations']) || ($options['iterations'] > 1000000 || $options['iterations'] < 1)) {
+            $options['iterations'] = 100000;
+        }
+
+        $this->options = $options;
     }
 
     /**
@@ -65,7 +74,11 @@ public function getName()
      */
     public function isPasswordValid($password, $hash)
     {
-        list($iterations, $salt) = explode(':', $hash);
+        if (!str_contains($hash, self::DELIMITER)) {
+            throw new DomainException(\sprintf('Invalid hash provided for the encoder %s.', $this->getName()));
+        }
+
+        list($iterations, $salt) = explode(self::DELIMITER, $hash);
 
         $verifyHash = $this->generateInternal($password, $salt, (int) $iterations);
 
@@ -130,6 +143,10 @@ protected function generateInternal($password, $salt, $iterations)
             $hash = hash('sha256', $hash . $password . $salt);
         }
 
+        if (!\is_string($hash)) {
+            throw new DomainException(\sprintf('The password could not be hashed by %s.', $this->getName()));
+        }
+
         return $iterations . ':' . $salt . ':' . $hash;
     }
 }
diff --git a/engine/Shopware/Components/Password/Manager.php b/engine/Shopware/Components/Password/Manager.php
index 7f7f2d0375b..c1800daa636 100644
--- a/engine/Shopware/Components/Password/Manager.php
+++ b/engine/Shopware/Components/Password/Manager.php
@@ -1,29 +1,30 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Password;
 
+use DomainException;
 use Exception;
 use Shopware\Components\Password\Encoder\PasswordEncoderInterface;
 use Shopware_Components_Config;
@@ -33,6 +34,10 @@
  */
 class Manager
 {
+    private const DEFAULT_ENCODER = 'bcrypt';
+    private const FALLBACK_ENCODER = 'sha256';
+    private const AUTO_ENCODING = 'auto';
+
     /**
      * @var array<string, PasswordEncoderInterface>
      */
@@ -50,13 +55,15 @@ public function __construct(Shopware_Components_Config $config)
 
     /**
      * @throws Exception
+     *
+     * @return void
      */
     public function addEncoder(PasswordEncoderInterface $encoder)
     {
         $name = strtolower(trim($encoder->getName()));
 
         if (isset($this->encoder[$name])) {
-            throw new Exception(sprintf('Encoder by name %s already registered', $name));
+            throw new Exception(\sprintf('Encoder by name %s already registered', $name));
         }
 
         $this->encoder[$name] = $encoder;
@@ -74,20 +81,20 @@ public function getEncoderByName($name)
         $name = strtolower(trim($name));
 
         if (!isset($this->encoder[$name])) {
-            throw new Exception(sprintf('Encoder by name %s not found', $name));
+            throw new DomainException(\sprintf('Encoder by name %s not found', $name));
         }
 
         $encoder = $this->encoder[$name];
 
         if (method_exists($encoder, 'isCompatible') && !$encoder->isCompatible()) {
-            throw new Exception(sprintf('Encoder by name %s is not compatible with your system', $name));
+            throw new Exception(\sprintf('Encoder by name %s is not compatible with your system', $name));
         }
 
         return $encoder;
     }
 
     /**
-     * @return array
+     * @return array<PasswordEncoderInterface>
      */
     public function getCompatibleEncoders()
     {
@@ -105,12 +112,12 @@ public function getDefaultPasswordEncoderName()
     {
         $encoderName = strtolower($this->config->defaultPasswordEncoder);
 
-        if (empty($encoderName) || $encoderName === 'auto') {
-            $bryptEncoder = $this->encoder['bcrypt'];
+        if (empty($encoderName) || $encoderName === self::AUTO_ENCODING) {
+            $bryptEncoder = $this->encoder[self::DEFAULT_ENCODER];
             if ($bryptEncoder->isCompatible()) {
-                $encoderName = 'bcrypt';
+                $encoderName = self::DEFAULT_ENCODER;
             } else {
-                $encoderName = 'sha256';
+                $encoderName = self::FALLBACK_ENCODER;
             }
         }
 
@@ -126,6 +133,14 @@ public function getDefaultPasswordEncoderName()
      */
     public function isPasswordValid($password, $hash, $encoderName)
     {
+        if (!\is_string($password) || empty($password)) {
+            return false;
+        }
+
+        if (!\is_string($hash) || empty($hash)) {
+            return false;
+        }
+
         $encoder = $this->getEncoderByName($encoderName);
 
         if ($encoder->isPasswordValid($password, $hash)) {
@@ -143,9 +158,19 @@ public function isPasswordValid($password, $hash, $encoderName)
      */
     public function encodePassword($password, $encoderName)
     {
+        if (!\is_string($password) || empty($password)) {
+            throw new DomainException('This Password can not be encoded');
+        }
+
         $encoder = $this->getEncoderByName($encoderName);
 
-        return $encoder->encodePassword($password);
+        $encodedPassword = $encoder->encodePassword($password);
+
+        if (!\is_string($encodedPassword)) {
+            throw new DomainException(\sprintf('The password could not be encoded by %s.', $encoderName));
+        }
+
+        return $encodedPassword;
     }
 
     /**
@@ -157,6 +182,14 @@ public function encodePassword($password, $encoderName)
      */
     public function reencodePassword($password, $hash, $encoderName)
     {
+        if (!\is_string($password) || empty($password)) {
+            throw new DomainException('Password can not be reencoded');
+        }
+
+        if (!\is_string($hash) || empty($hash)) {
+            throw new DomainException('The hash is not valid');
+        }
+
         $encoder = $this->getEncoderByName($encoderName);
 
         $truncated = $password !== strip_tags($password);
@@ -164,6 +197,12 @@ public function reencodePassword($password, $hash, $encoderName)
             return $hash;
         }
 
-        return $encoder->encodePassword($password);
+        $encodedPassword = $encoder->encodePassword($password);
+
+        if (!\is_string($encodedPassword)) {
+            throw new DomainException('The reencoding of the password was not successfull.');
+        }
+
+        return $encodedPassword;
     }
 }
diff --git a/engine/Shopware/Components/Plugin.php b/engine/Shopware/Components/Plugin.php
index 38b65bfe6c1..831a940b705 100644
--- a/engine/Shopware/Components/Plugin.php
+++ b/engine/Shopware/Components/Plugin.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
@@ -175,7 +175,7 @@ public function build(ContainerBuilder $container)
      *
      * @param ContainerInterface|null $container A ContainerInterface instance or null
      */
-    final public function setContainer(ContainerInterface $container = null): void
+    final public function setContainer(?ContainerInterface $container = null): void
     {
         $this->container = $container;
     }
@@ -215,8 +215,8 @@ private function registerFilesystems(ContainerBuilder $container): void
 
     private function registerFilesystem(ContainerBuilder $container, string $key): void
     {
-        $parameterKey = sprintf('shopware.filesystem.%s', $key);
-        $serviceId = sprintf('%s.filesystem.%s', $this->getContainerPrefix(), $key);
+        $parameterKey = \sprintf('shopware.filesystem.%s', $key);
+        $serviceId = \sprintf('%s.filesystem.%s', $this->getContainerPrefix(), $key);
 
         $filesystem = new Definition(
             PrefixFilesystem::class,
diff --git a/engine/Shopware/Components/Plugin/Bootstrap.php b/engine/Shopware/Components/Plugin/Bootstrap.php
index c6fcec7f04d..ed3f82a52d1 100644
--- a/engine/Shopware/Components/Plugin/Bootstrap.php
+++ b/engine/Shopware/Components/Plugin/Bootstrap.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\DBAL\Connection;
@@ -99,8 +99,11 @@ public function __construct($name, $info = null)
     public function hasInfoNewerVersion(Enlight_Config $updatePluginInfo, Enlight_Config $currentPluginInfo)
     {
         $currentVersion = $currentPluginInfo->get('version');
-        $updateVersion = $updatePluginInfo->get('version');
+        if ($currentVersion === null) {
+            return true;
+        }
 
+        $updateVersion = $updatePluginInfo->get('version');
         if (empty($updateVersion)) {
             return false;
         }
@@ -500,29 +503,29 @@ public function getDefaultControllerPath(Enlight_Event_EventArgs $arguments)
         $path = $this->Path() . 'Controllers/' . ucfirst($module) . '/' . ucfirst($controller) . '.php';
 
         if (!file_exists($path)) {
-            throw new Enlight_Exception(sprintf('Controller "%s" can\'t load failure', $controller));
+            throw new Enlight_Exception(\sprintf('Controller "%s" can\'t load failure', $controller));
         }
 
-        //register plugin model directory
+        // register plugin model directory
         if (file_exists($this->Path() . 'Models')) {
             $this->registerCustomModels();
         }
 
-        //register plugin views directory
+        // register plugin views directory
         if (file_exists($this->Path() . 'Views')) {
             Shopware()->Template()->addTemplateDir(
                 $this->Path() . 'Views/'
             );
         }
 
-        //register plugin snippet directory
+        // register plugin snippet directory
         if (file_exists($this->Path() . 'Snippets')) {
             Shopware()->Snippets()->addConfigDir(
                 $this->Path() . 'Snippets/'
             );
         }
 
-        //register plugin component directory
+        // register plugin component directory
         if (file_exists($this->Path() . 'Components')) {
             Shopware()->Loader()->registerNamespace(
                 'Shopware_Components',
@@ -739,18 +742,18 @@ public function removeSnippets($removeDirty = false)
      * Example $translations array:
      * <code>
      * array(
-     'en_GB' => array(
-     'plugin_form' => array(
-     'label' => 'Recently viewed items'
-     ),
-     'show' => array(
-     'label' => 'Display recently viewed items'
-     ),
-     'thumb' => array(
-     'label' => 'Thumbnail size',
-     'description' => 'Index of the thumbnail size of the associated album to use. Starts at 0'
-     )
-     )
+     * 'en_GB' => array(
+     * 'plugin_form' => array(
+     * 'label' => 'Recently viewed items'
+     * ),
+     * 'show' => array(
+     * 'label' => 'Display recently viewed items'
+     * ),
+     * 'thumb' => array(
+     * 'label' => 'Thumbnail size',
+     * 'description' => 'Index of the thumbnail size of the associated album to use. Starts at 0'
+     * )
+     * )
      * )
      * </code>
      *
diff --git a/engine/Shopware/Components/Plugin/CachedConfigReader.php b/engine/Shopware/Components/Plugin/CachedConfigReader.php
index 31cce027dd1..cb354ebf1a9 100644
--- a/engine/Shopware/Components/Plugin/CachedConfigReader.php
+++ b/engine/Shopware/Components/Plugin/CachedConfigReader.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin;
@@ -52,7 +52,7 @@ public function __construct(ConfigReader $reader, Cache $cache)
     /**
      * {@inheritdoc}
      */
-    public function getByPluginName($pluginName, Shop $shop = null)
+    public function getByPluginName($pluginName, ?Shop $shop = null)
     {
         if ($shop) {
             $cacheKey = $pluginName . $shop->getId();
diff --git a/engine/Shopware/Components/Plugin/ConfigReader.php b/engine/Shopware/Components/Plugin/ConfigReader.php
index 2fc0197baf8..76a830b1759 100644
--- a/engine/Shopware/Components/Plugin/ConfigReader.php
+++ b/engine/Shopware/Components/Plugin/ConfigReader.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin;
@@ -38,5 +38,5 @@ interface ConfigReader
      *
      * @deprecated since 5.7 and removed in 5.9. Use `Shopware\Components\Plugin\Configuration\ReaderInterface`::getByPluginName instead
      */
-    public function getByPluginName($pluginName, Shop $shop = null);
+    public function getByPluginName($pluginName, ?Shop $shop = null);
 }
diff --git a/engine/Shopware/Components/Plugin/ConfigWriter.php b/engine/Shopware/Components/Plugin/ConfigWriter.php
index a1c36a7931e..3345fa9f646 100644
--- a/engine/Shopware/Components/Plugin/ConfigWriter.php
+++ b/engine/Shopware/Components/Plugin/ConfigWriter.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin;
diff --git a/engine/Shopware/Components/Plugin/Configuration/CachedReader.php b/engine/Shopware/Components/Plugin/Configuration/CachedReader.php
index f3a8fb5d309..1b5085020ad 100644
--- a/engine/Shopware/Components/Plugin/Configuration/CachedReader.php
+++ b/engine/Shopware/Components/Plugin/Configuration/CachedReader.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin\Configuration;
diff --git a/engine/Shopware/Components/Plugin/Configuration/Layers/AbstractShopConfigurationLayer.php b/engine/Shopware/Components/Plugin/Configuration/Layers/AbstractShopConfigurationLayer.php
index 4eadf93e592..a5534e25cc8 100644
--- a/engine/Shopware/Components/Plugin/Configuration/Layers/AbstractShopConfigurationLayer.php
+++ b/engine/Shopware/Components/Plugin/Configuration/Layers/AbstractShopConfigurationLayer.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin\Configuration\Layers;
@@ -95,9 +94,9 @@ public function readValues(string $pluginName, ?int $shopId): array
         $builder = $this->configureQuery($builder, $shopId, $pluginName);
 
         $values = $builder->select([
-                'coreConfigElements.name',
-                'coreConfigValues.value',
-            ])
+            'coreConfigElements.name',
+            'coreConfigValues.value',
+        ])
             ->execute()
             ->fetchAll(PDO::FETCH_KEY_PAIR)
         ;
@@ -119,13 +118,13 @@ public function writeValues(string $pluginName, ?int $shopId, array $data): void
         /** @var Plugin|null $plugin */
         $plugin = $pluginRepository->findOneBy(['name' => $pluginName]);
         if ($plugin === null) {
-            throw new WriterException(sprintf('Plugin by name "%s" not found.', $pluginName));
+            throw new WriterException(\sprintf('Plugin by name "%s" not found.', $pluginName));
         }
 
         /** @var Form|null $form */
         $form = $formRepository->findOneBy(['pluginId' => $plugin->getId()]);
         if ($form === null) {
-            throw new WriterException(sprintf('Plugin form by plugin id "%u" not found.', $plugin->getId()));
+            throw new WriterException(\sprintf('Plugin form by plugin id "%u" not found.', $plugin->getId()));
         }
 
         $parentValues = $this->getParent()->readValues($pluginName, $shopId);
@@ -152,11 +151,11 @@ public function writeValue(?int $shopId, Form $form, string $name, $value, $pare
         /** @var Element|null $element */
         $element = $elementRepository->findOneBy(['form' => $form, 'name' => $name]);
         if ($element === null) {
-            throw new WriterException(sprintf('Config element "%s" not found.', $name));
+            throw new WriterException(\sprintf('Config element "%s" not found.', $name));
         }
 
         if ($shopId !== 1 && $element->getScope() === 0) {
-            $message = sprintf("Element '%s' is not writeable for shop %u", $element->getName(), $shopId);
+            $message = \sprintf("Element '%s' is not writeable for shop %u", $element->getName(), $shopId);
             $baseException = new InvalidArgumentException($message);
             throw new WriterException('Element is not valid', 0, $baseException);
         }
diff --git a/engine/Shopware/Components/Plugin/Configuration/Layers/ConfigurationLayerInterface.php b/engine/Shopware/Components/Plugin/Configuration/Layers/ConfigurationLayerInterface.php
index 264cbf6c810..489d1259cf9 100644
--- a/engine/Shopware/Components/Plugin/Configuration/Layers/ConfigurationLayerInterface.php
+++ b/engine/Shopware/Components/Plugin/Configuration/Layers/ConfigurationLayerInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin\Configuration\Layers;
@@ -33,6 +33,8 @@ public function readValues(string $pluginName, ?int $shopId): array;
 
     /**
      * Write the values attached to this layer by shop and plugin name
+     *
+     * @param array<string, mixed> $data
      */
     public function writeValues(string $pluginName, ?int $shopId, array $data): void;
 }
diff --git a/engine/Shopware/Components/Plugin/Configuration/Layers/DefaultLayer.php b/engine/Shopware/Components/Plugin/Configuration/Layers/DefaultLayer.php
index e4172654802..e987b24194d 100644
--- a/engine/Shopware/Components/Plugin/Configuration/Layers/DefaultLayer.php
+++ b/engine/Shopware/Components/Plugin/Configuration/Layers/DefaultLayer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin\Configuration\Layers;
diff --git a/engine/Shopware/Components/Plugin/Configuration/Layers/DefaultShopLayer.php b/engine/Shopware/Components/Plugin/Configuration/Layers/DefaultShopLayer.php
index 90efe7dfc97..62ae8b67759 100644
--- a/engine/Shopware/Components/Plugin/Configuration/Layers/DefaultShopLayer.php
+++ b/engine/Shopware/Components/Plugin/Configuration/Layers/DefaultShopLayer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin\Configuration\Layers;
@@ -42,8 +42,7 @@ protected function configureQuery(QueryBuilder $builder, ?int $shopId, string $p
             ->andWhere($builder->expr()->eq('corePlugins.name', ':' . $pluginNameKey))
             ->andWhere($builder->expr()->eq('coreConfigValues.shop_id', ':' . $shopIdKey))
             ->setParameter($pluginNameKey, $pluginName)
-            ->setParameter($shopIdKey, $shopId)
-        ;
+            ->setParameter($shopIdKey, $shopId);
     }
 
     protected function isLayerResponsible(?int $shopId): bool
@@ -54,12 +53,12 @@ protected function isLayerResponsible(?int $shopId): bool
 
         $queryBuilder = $this->connection->createQueryBuilder();
 
-        return $queryBuilder->select('1')
-                ->from('s_core_shops')
-                ->andWhere($queryBuilder->expr()->eq('id', ':id'))
-                ->andWhere($queryBuilder->expr()->gt('`default`', 0))
-                ->setParameter('id', $shopId)
-                ->execute()->fetchColumn() !== false
-            ;
+        return $queryBuilder
+            ->select('1')
+            ->from('s_core_shops')
+            ->andWhere($queryBuilder->expr()->eq('id', ':id'))
+            ->andWhere($queryBuilder->expr()->gt('`default`', 0))
+            ->setParameter('id', $shopId)
+            ->execute()->fetchColumn() !== false;
     }
 }
diff --git a/engine/Shopware/Components/Plugin/Configuration/Layers/LanguageShopLayer.php b/engine/Shopware/Components/Plugin/Configuration/Layers/LanguageShopLayer.php
index 838159f8e31..583ec0d6b11 100644
--- a/engine/Shopware/Components/Plugin/Configuration/Layers/LanguageShopLayer.php
+++ b/engine/Shopware/Components/Plugin/Configuration/Layers/LanguageShopLayer.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin\Configuration\Layers;
diff --git a/engine/Shopware/Components/Plugin/Configuration/Layers/SubShopLayer.php b/engine/Shopware/Components/Plugin/Configuration/Layers/SubShopLayer.php
index 08280d363f6..5564c14e745 100644
--- a/engine/Shopware/Components/Plugin/Configuration/Layers/SubShopLayer.php
+++ b/engine/Shopware/Components/Plugin/Configuration/Layers/SubShopLayer.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin\Configuration\Layers;
diff --git a/engine/Shopware/Components/Plugin/Configuration/Reader.php b/engine/Shopware/Components/Plugin/Configuration/Reader.php
index f25e99c2f08..12ca797a7bd 100644
--- a/engine/Shopware/Components/Plugin/Configuration/Reader.php
+++ b/engine/Shopware/Components/Plugin/Configuration/Reader.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin\Configuration;
diff --git a/engine/Shopware/Components/Plugin/Configuration/ReaderInterface.php b/engine/Shopware/Components/Plugin/Configuration/ReaderInterface.php
index 6bb7bdb32a7..f509421ea85 100644
--- a/engine/Shopware/Components/Plugin/Configuration/ReaderInterface.php
+++ b/engine/Shopware/Components/Plugin/Configuration/ReaderInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin\Configuration;
diff --git a/engine/Shopware/Components/Plugin/Configuration/Writer.php b/engine/Shopware/Components/Plugin/Configuration/Writer.php
index bcf91a5f80c..0a8e42b5cef 100644
--- a/engine/Shopware/Components/Plugin/Configuration/Writer.php
+++ b/engine/Shopware/Components/Plugin/Configuration/Writer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin\Configuration;
diff --git a/engine/Shopware/Components/Plugin/Configuration/WriterException.php b/engine/Shopware/Components/Plugin/Configuration/WriterException.php
index 8f483c79499..4f21d24a0d4 100644
--- a/engine/Shopware/Components/Plugin/Configuration/WriterException.php
+++ b/engine/Shopware/Components/Plugin/Configuration/WriterException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin\Configuration;
diff --git a/engine/Shopware/Components/Plugin/Configuration/WriterInterface.php b/engine/Shopware/Components/Plugin/Configuration/WriterInterface.php
index 513f6a0807b..9da4b1c2fde 100644
--- a/engine/Shopware/Components/Plugin/Configuration/WriterInterface.php
+++ b/engine/Shopware/Components/Plugin/Configuration/WriterInterface.php
@@ -1,30 +1,36 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin\Configuration;
 
 interface WriterInterface
 {
+    /**
+     * @param array<string, mixed> $elements
+     * @param int                  $shopId
+     *
+     * @return void
+     */
     public function setByPluginName(string $pluginName, array $elements, $shopId = 1);
 }
diff --git a/engine/Shopware/Components/Plugin/Context/ActivateContext.php b/engine/Shopware/Components/Plugin/Context/ActivateContext.php
index b2b5e8f29b4..0ddb5b3c393 100644
--- a/engine/Shopware/Components/Plugin/Context/ActivateContext.php
+++ b/engine/Shopware/Components/Plugin/Context/ActivateContext.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin\Context;
diff --git a/engine/Shopware/Components/Plugin/Context/DeactivateContext.php b/engine/Shopware/Components/Plugin/Context/DeactivateContext.php
index 9e82acf6a0d..769052f2231 100644
--- a/engine/Shopware/Components/Plugin/Context/DeactivateContext.php
+++ b/engine/Shopware/Components/Plugin/Context/DeactivateContext.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin\Context;
diff --git a/engine/Shopware/Components/Plugin/Context/InstallContext.php b/engine/Shopware/Components/Plugin/Context/InstallContext.php
index 34223ae3e18..cb6bdb06b2e 100644
--- a/engine/Shopware/Components/Plugin/Context/InstallContext.php
+++ b/engine/Shopware/Components/Plugin/Context/InstallContext.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin\Context;
diff --git a/engine/Shopware/Components/Plugin/Context/UninstallContext.php b/engine/Shopware/Components/Plugin/Context/UninstallContext.php
index 1a50edc9cfc..ce3b97a2b2a 100644
--- a/engine/Shopware/Components/Plugin/Context/UninstallContext.php
+++ b/engine/Shopware/Components/Plugin/Context/UninstallContext.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin\Context;
diff --git a/engine/Shopware/Components/Plugin/Context/UpdateContext.php b/engine/Shopware/Components/Plugin/Context/UpdateContext.php
index 049110c8269..ae1ab5aa70d 100644
--- a/engine/Shopware/Components/Plugin/Context/UpdateContext.php
+++ b/engine/Shopware/Components/Plugin/Context/UpdateContext.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin\Context;
diff --git a/engine/Shopware/Components/Plugin/CronjobSynchronizer.php b/engine/Shopware/Components/Plugin/CronjobSynchronizer.php
index 7dda7c3ce91..b8ba5b2b3e6 100644
--- a/engine/Shopware/Components/Plugin/CronjobSynchronizer.php
+++ b/engine/Shopware/Components/Plugin/CronjobSynchronizer.php
@@ -1,25 +1,27 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin;
@@ -31,10 +33,7 @@
 
 class CronjobSynchronizer
 {
-    /**
-     * @var Connection
-     */
-    private $connection;
+    private Connection $connection;
 
     public function __construct(Connection $connection)
     {
@@ -42,7 +41,11 @@ public function __construct(Connection $connection)
     }
 
     /**
+     * @param array<array<string, mixed>> $cronjobs
+     *
      * @throws InvalidArgumentException
+     *
+     * @return void
      */
     public function synchronize(Plugin $plugin, array $cronjobs)
     {
@@ -54,9 +57,9 @@ public function synchronize(Plugin $plugin, array $cronjobs)
     }
 
     /**
-     * @param array $cronjob
+     * @param array<string, mixed> $cronjob
      */
-    private function addCronjob(Plugin $plugin, $cronjob)
+    private function addCronjob(Plugin $plugin, array $cronjob): void
     {
         $cronjob['pluginID'] = $plugin->getId();
 
@@ -73,16 +76,16 @@ private function addCronjob(Plugin $plugin, $cronjob)
             $plugin->getId(),
         ];
 
-        $id = $this->connection->fetchColumn($selectStatement, $params);
+        $id = (int) $this->connection->fetchOne($selectStatement, $params);
 
         /*
          * Check if this cronjob's action is named without a preceding 'Shopware_CronJob_',
          * which is valid but after first run, every cronjob gets prefixed with that, so we might not have gotten
          * the id because we were asking for the wrong action.
          */
-        if (!$id && strpos($action, 'Shopware_CronJob_') !== 0) {
+        if (!$id && !str_starts_with($action, 'Shopware_CronJob_')) {
             $params[0] = 'Shopware_CronJob_' . $action;
-            $id = $this->connection->fetchColumn($selectStatement, $params);
+            $id = (int) $this->connection->fetchOne($selectStatement, $params);
         }
 
         if ($id) {
@@ -98,9 +101,9 @@ private function addCronjob(Plugin $plugin, $cronjob)
     }
 
     /**
-     * @param int $pluginId
+     * @param list<string> $cronjobActions
      */
-    private function removeNotExistingEntries($pluginId, array $cronjobActions)
+    private function removeNotExistingEntries(int $pluginId, array $cronjobActions): void
     {
         $builder = $this->connection->createQueryBuilder();
         $builder->delete('s_crontab');
diff --git a/engine/Shopware/Components/Plugin/DBALConfigReader.php b/engine/Shopware/Components/Plugin/DBALConfigReader.php
index d0c17b15284..be2b753c772 100644
--- a/engine/Shopware/Components/Plugin/DBALConfigReader.php
+++ b/engine/Shopware/Components/Plugin/DBALConfigReader.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin;
@@ -49,7 +49,7 @@ public function __construct(ReaderInterface $reader)
      *
      * @deprecated since 5.7 and removed in 5.9. Use `Shopware\Components\Plugin\Configuration\ReaderInterface`::getByPluginName instead
      */
-    public function getByPluginName($pluginName, Shop $shop = null)
+    public function getByPluginName($pluginName, ?Shop $shop = null)
     {
         return $this->reader->getByPluginName($pluginName, $shop === null ? null : $shop->getId());
     }
diff --git a/engine/Shopware/Components/Plugin/FormSynchronizer.php b/engine/Shopware/Components/Plugin/FormSynchronizer.php
index 8742907712d..bf145fb15b2 100644
--- a/engine/Shopware/Components/Plugin/FormSynchronizer.php
+++ b/engine/Shopware/Components/Plugin/FormSynchronizer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin;
@@ -141,21 +141,21 @@ private function removeNotExistingElements(Plugin $plugin, array $names)
             return;
         }
 
-        //elements
+        // elements
         $query = $this->em->getConnection()->createQueryBuilder();
         $query->delete('s_core_config_elements');
         $query->where('id IN (:ids)');
         $query->setParameter(':ids', $ids, Connection::PARAM_INT_ARRAY);
         $query->execute();
 
-        //saved values
+        // saved values
         $query = $this->em->getConnection()->createQueryBuilder();
         $query->delete('s_core_config_values');
         $query->where('element_id IN (:ids)');
         $query->setParameter(':ids', $ids, Connection::PARAM_INT_ARRAY);
         $query->execute();
 
-        //translations
+        // translations
         $query = $this->em->getConnection()->createQueryBuilder();
         $query->delete('s_core_config_element_translations');
         $query->where('element_id IN (:ids)');
diff --git a/engine/Shopware/Components/Plugin/MenuSynchronizer.php b/engine/Shopware/Components/Plugin/MenuSynchronizer.php
index 22d4418add0..efb3d487780 100644
--- a/engine/Shopware/Components/Plugin/MenuSynchronizer.php
+++ b/engine/Shopware/Components/Plugin/MenuSynchronizer.php
@@ -1,50 +1,44 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin;
 
 use Doctrine\DBAL\Connection;
-use Exception;
 use InvalidArgumentException;
 use RuntimeException;
 use Shopware\Components\Model\ModelManager;
 use Shopware\Components\Snippet\Writer\DatabaseWriter;
 use Shopware\Models\Menu\Menu;
+use Shopware\Models\Menu\Repository;
 use Shopware\Models\Plugin\Plugin;
 use Shopware\Models\Shop\Locale;
 
 class MenuSynchronizer
 {
-    /**
-     * @var ModelManager
-     */
-    private $em;
+    private ModelManager $em;
 
-    /**
-     * @var \Shopware\Models\Menu\Repository
-     */
-    private $menuRepository;
+    private Repository $menuRepository;
 
     public function __construct(ModelManager $em)
     {
@@ -53,7 +47,7 @@ public function __construct(ModelManager $em)
     }
 
     /**
-     * @throws InvalidArgumentException
+     * @return void
      */
     public function synchronize(Plugin $plugin, array $menu)
     {
@@ -74,10 +68,9 @@ public function synchronize(Plugin $plugin, array $menu)
                 if (!isset($menuItem['parent'])) {
                     throw new InvalidArgumentException('Root Menu Item must provide parent element');
                 }
-                /** @var Menu|null $parent */
                 $parent = $this->menuRepository->findOneBy($menuItem['parent']);
                 if (!$parent) {
-                    throw new InvalidArgumentException(sprintf('Unable to find parent for query %s', print_r($menuItem['parent'], true)));
+                    throw new InvalidArgumentException(\sprintf('Unable to find parent for query %s', print_r($menuItem['parent'], true)));
                 }
             }
 
@@ -88,12 +81,7 @@ public function synchronize(Plugin $plugin, array $menu)
         $this->removeNotExistingEntries($plugin->getId(), $menuNames);
     }
 
-    /**
-     * @param string $name
-     *
-     * @throws Exception
-     */
-    private function saveMenuTranslation(array $labels, $name)
+    private function saveMenuTranslation(array $labels, string $name): void
     {
         $databaseWriter = new DatabaseWriter($this->em->getConnection());
         foreach ($labels as $locale => $text) {
@@ -106,22 +94,19 @@ private function saveMenuTranslation(array $labels, $name)
             }
 
             $locale = Shopware()->Models()->getRepository(Locale::class)->findOneBy(['locale' => $locale]);
+            if (!$locale instanceof Locale) {
+                continue;
+            }
 
             $databaseWriter->write([$name => $text], 'backend/index/view/main', $locale->getId(), 1);
         }
     }
 
-    /**
-     * @throws RuntimeException
-     *
-     * @return Menu
-     */
-    private function createMenuItem(Plugin $plugin, Menu $parent = null, array $menuItem)
+    private function createMenuItem(Plugin $plugin, ?Menu $parent, array $menuItem): Menu
     {
         $item = null;
 
         if ($plugin->getId()) {
-            /** @var Menu $item */
             $item = $this->menuRepository->findOneBy([
                 'pluginId' => $plugin->getId(),
                 'label' => $menuItem['name'],
@@ -135,26 +120,18 @@ private function createMenuItem(Plugin $plugin, Menu $parent = null, array $menu
         $item->setParent($parent);
         $item->setPlugin($plugin);
 
-        if (!isset($menuItem['label']['en']) || empty($menuItem['label']['en'])) {
+        if (empty($menuItem['label']['en'])) {
             throw new RuntimeException('Label with lang en required');
         }
         $item->setLabel($menuItem['name']);
 
-        $item->setController(
-            isset($menuItem['controller']) ? $menuItem['controller'] : null
-        );
+        $item->setController($menuItem['controller'] ?? null);
 
-        $item->setAction(
-            isset($menuItem['action']) ? $menuItem['action'] : null
-        );
+        $item->setAction($menuItem['action'] ?? null);
 
-        $item->setOnclick(
-            isset($menuItem['onclick']) ? $menuItem['onclick'] : null
-        );
+        $item->setOnclick($menuItem['onclick'] ?? null);
 
-        $item->setClass(
-            isset($menuItem['class']) ? $menuItem['class'] : null
-        );
+        $item->setClass($menuItem['class'] ?? null);
 
         if (isset($menuItem['active'])) {
             $item->setActive((bool) $menuItem['active']);
@@ -188,10 +165,7 @@ private function createMenuItem(Plugin $plugin, Menu $parent = null, array $menu
         return $item;
     }
 
-    /**
-     * @param int $pluginId
-     */
-    private function removeNotExistingEntries($pluginId, array $menuNames)
+    private function removeNotExistingEntries(int $pluginId, array $menuNames): void
     {
         $builder = $this->em->getConnection()->createQueryBuilder();
         $builder->delete('s_core_menu');
diff --git a/engine/Shopware/Components/Plugin/Namespace.php b/engine/Shopware/Components/Plugin/Namespace.php
index b9ffe8b5d10..70aa4640d54 100644
--- a/engine/Shopware/Components/Plugin/Namespace.php
+++ b/engine/Shopware/Components/Plugin/Namespace.php
@@ -1,33 +1,34 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\DBAL\Connection;
+use Doctrine\ORM\OptimisticLockException;
+use Doctrine\ORM\ORMInvalidArgumentException;
 use Shopware\Components\Plugin\Configuration\ReaderInterface as ConfigurationReader;
 use Shopware\Components\Snippet\DatabaseHandler;
 use Shopware\Models\Plugin\Plugin;
 use Shopware\Models\Shop\Shop;
-use Shopware\Models\Widget\Widget;
 
 /**
  * Shopware Plugin Namespace
@@ -86,7 +87,7 @@ public function __construct($name, $storage, array $pluginDirectories, Configura
      *
      * @return Enlight_Config
      */
-    public function getConfig($name, Shop $shop = null)
+    public function getConfig($name, ?Shop $shop = null)
     {
         if (!$shop) {
             $shop = $this->shop;
@@ -153,11 +154,10 @@ public function initPlugin($name, $config)
      * Registers a plugin in the collection.
      *
      * @param Enlight_Plugin_Bootstrap|Shopware_Components_Plugin_Bootstrap $plugin
-     * @param DateTimeInterface                                             $refreshDate
      *
      * @return Enlight_Plugin_PluginManager|Shopware_Components_Plugin_Namespace
      */
-    public function registerPlugin(Enlight_Plugin_Bootstrap $plugin, DateTimeInterface $refreshDate = null)
+    public function registerPlugin(Enlight_Plugin_Bootstrap $plugin, ?DateTimeInterface $refreshDate = null)
     {
         parent::registerPlugin($plugin);
 
@@ -182,14 +182,14 @@ public function registerPlugin(Enlight_Plugin_Bootstrap $plugin, DateTimeInterfa
             'namespace' => $this->getName(),
             'name' => $plugin->getName(),
             'label' => isset($info['label']) && \is_string($info['label']) ? $info['label'] : $plugin->getName(),
-            'version' => $info['version'] ?? '1.0.0',
-            'author' => $info['author'] ?? 'shopware AG',
-            'copyright' => $info['copyright'] ?? 'Copyright © 2012, shopware AG',
+            'version' => (string) ($info['version'] ?? '1.0.0'),
+            'author' => (string) ($info['author'] ?? 'shopware AG'),
+            'copyright' => (string) ($info['copyright'] ?? 'Copyright © 2012, shopware AG'),
             'description' => $info['description'] ?? null,
             'license' => $info['license'] ?? null,
             'support' => $info['support'] ?? null,
             'link' => $info['link'] ?? null,
-            'source' => $info['source'] ?? 'Default',
+            'source' => (string) ($info['source'] ?? 'Default'),
             'update_date' => $info['updateDate'] ?? null,
             'update_version' => $info['updateVersion'] ?? null,
             'update_source' => $info['updateSource'] ?? null,
@@ -439,10 +439,10 @@ public function uninstallPlugin(Shopware_Components_Plugin_Bootstrap $bootstrap,
     /**
      * Registers a plugin in the collection.
      *
-     * @throws \Enlight_Config_Exception
-     * @throws \Enlight_Event_Exception
-     * @throws \Doctrine\ORM\OptimisticLockException
-     * @throws \Doctrine\ORM\ORMInvalidArgumentException
+     * @throws Enlight_Config_Exception
+     * @throws Enlight_Event_Exception
+     * @throws OptimisticLockException
+     * @throws ORMInvalidArgumentException
      * @throws Exception
      *
      * @return bool|array
@@ -624,7 +624,7 @@ protected function buildClassName($namespace, $pluginName)
      */
     protected function buildPath($namespace, $pluginName, $pluginSource)
     {
-        $baseDir = $this->pluginDirectories[$pluginSource];
+        $baseDir = $this->pluginDirectories[$pluginSource] ?? '';
 
         return $baseDir . $namespace . DIRECTORY_SEPARATOR . $pluginName . DIRECTORY_SEPARATOR;
     }
diff --git a/engine/Shopware/Components/Plugin/PaymentInstaller.php b/engine/Shopware/Components/Plugin/PaymentInstaller.php
index a8c933b7f9b..dcd32c415ad 100644
--- a/engine/Shopware/Components/Plugin/PaymentInstaller.php
+++ b/engine/Shopware/Components/Plugin/PaymentInstaller.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin;
diff --git a/engine/Shopware/Components/Plugin/RequirementValidator.php b/engine/Shopware/Components/Plugin/RequirementValidator.php
index c9f236a1ef7..ffb700c99e5 100644
--- a/engine/Shopware/Components/Plugin/RequirementValidator.php
+++ b/engine/Shopware/Components/Plugin/RequirementValidator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin;
@@ -97,20 +97,20 @@ private function assertVersion($version, $required, $operator)
     private function assertShopwareVersion(array $compatibility, string $shopwareVersion): void
     {
         if (isset($compatibility['blacklist']) && \in_array($shopwareVersion, $compatibility['blacklist'])) {
-            throw new Exception(sprintf($this->namespace->get('shopware_version_blacklisted'), $shopwareVersion));
+            throw new Exception(\sprintf($this->namespace->get('shopware_version_blacklisted'), $shopwareVersion));
         }
 
         if (isset($compatibility['minVersion'])) {
             $min = $compatibility['minVersion'];
             if ($min !== '' && !$this->assertVersion($shopwareVersion, $min, '>=')) {
-                throw new Exception(sprintf($this->namespace->get('plugin_min_shopware_version'), $min));
+                throw new Exception(\sprintf($this->namespace->get('plugin_min_shopware_version'), $min));
             }
         }
 
         if (isset($compatibility['maxVersion'])) {
             $max = $compatibility['maxVersion'];
             if ($max !== '' && !$this->assertVersion($shopwareVersion, $max, '<=')) {
-                throw new Exception(sprintf($this->namespace->get('plugin_max_shopware_version'), $max));
+                throw new Exception(\sprintf($this->namespace->get('plugin_max_shopware_version'), $max));
             }
         }
     }
@@ -125,32 +125,32 @@ private function assertRequiredPlugins(array $requiredPlugins): void
             ]);
 
             if (!$plugin) {
-                throw new Exception(sprintf($this->namespace->get('required_plugin_not_found'), $requiredPlugin['pluginName']));
+                throw new Exception(\sprintf($this->namespace->get('required_plugin_not_found'), $requiredPlugin['pluginName']));
             }
 
             if ($plugin->getInstalled() === null) {
-                throw new Exception(sprintf($this->namespace->get('required_plugin_not_installed'), $requiredPlugin['pluginName']));
+                throw new Exception(\sprintf($this->namespace->get('required_plugin_not_installed'), $requiredPlugin['pluginName']));
             }
 
             if (!$plugin->getActive()) {
-                throw new Exception(sprintf($this->namespace->get('required_plugin_not_active'), $requiredPlugin['pluginName']));
+                throw new Exception(\sprintf($this->namespace->get('required_plugin_not_active'), $requiredPlugin['pluginName']));
             }
 
             if (isset($requiredPlugin['blacklist']) && \in_array($plugin->getVersion(), $requiredPlugin['blacklist'])) {
-                throw new Exception(sprintf($this->namespace->get('required_plugin_blacklisted'), $plugin->getName(), $plugin->getVersion()));
+                throw new Exception(\sprintf($this->namespace->get('required_plugin_blacklisted'), $plugin->getName(), $plugin->getVersion()));
             }
 
             if (isset($requiredPlugin['minVersion'])) {
                 $min = $requiredPlugin['minVersion'];
                 if ($min !== '' && !$this->assertVersion($plugin->getVersion(), $min, '>=')) {
-                    throw new Exception(sprintf($this->namespace->get('plugin_version_required'), $min, $plugin->getName()));
+                    throw new Exception(\sprintf($this->namespace->get('plugin_version_required'), $min, $plugin->getName()));
                 }
             }
 
             if (isset($requiredPlugin['maxVersion'])) {
                 $max = $requiredPlugin['maxVersion'];
                 if ($max !== '' && !$this->assertVersion($plugin->getVersion(), $max, '<=')) {
-                    throw new Exception(sprintf($this->namespace->get('plugin_version_max'), $plugin->getName(), $max));
+                    throw new Exception(\sprintf($this->namespace->get('plugin_version_max'), $plugin->getName(), $max));
                 }
             }
         }
diff --git a/engine/Shopware/Components/Plugin/ResourceSubscriber.php b/engine/Shopware/Components/Plugin/ResourceSubscriber.php
index 0ca141c9a8c..68bdad0894e 100644
--- a/engine/Shopware/Components/Plugin/ResourceSubscriber.php
+++ b/engine/Shopware/Components/Plugin/ResourceSubscriber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin;
@@ -29,7 +29,6 @@
 use Enlight_Event_EventArgs;
 use Enlight_Exception;
 use Shopware\Components\Theme\LessDefinition;
-use SplFileInfo;
 use Symfony\Component\Finder\Finder;
 
 class ResourceSubscriber
@@ -108,7 +107,8 @@ public function onRegisterControllerTemplate(Enlight_Controller_ActionEventArgs
         $controller = $args->getSubject();
 
         try {
-            if (($view = $controller->View()) !== null) {
+            $view = $controller->View();
+            if ($view !== null) {
                 $view->Template()->Engine()->addTemplateDir($viewsDirectory);
             }
         } catch (Enlight_Exception $ignored) {
@@ -119,9 +119,9 @@ public function onRegisterControllerTemplate(Enlight_Controller_ActionEventArgs
      * @param string $baseDir resource base directory
      * @param string $type    `css` or `js`
      *
-     * @return string[]
+     * @return array<string>
      */
-    private function collectResourceFiles($baseDir, $type)
+    private function collectResourceFiles(string $baseDir, string $type): array
     {
         $directory = $baseDir . '/Resources/frontend/' . $type;
         if (!is_dir($directory)) {
@@ -133,7 +133,6 @@ private function collectResourceFiles($baseDir, $type)
         $finder->files()->name('*.' . $type)->in($directory);
         $finder->sortByName();
 
-        /** @var SplFileInfo $file */
         foreach ($finder as $file) {
             $files[] = $file->getRealPath();
         }
diff --git a/engine/Shopware/Components/Plugin/XmlPluginInfoReader.php b/engine/Shopware/Components/Plugin/XmlPluginInfoReader.php
index eae2ade32a9..bc8b2625b29 100644
--- a/engine/Shopware/Components/Plugin/XmlPluginInfoReader.php
+++ b/engine/Shopware/Components/Plugin/XmlPluginInfoReader.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin;
@@ -34,11 +34,11 @@
 use Symfony\Component\Config\Util\XmlUtils;
 
 /**
- * @deprecated This class will be removed in 5.6
+ * @deprecated This class will be removed in 5.8
  *
- * Use new class Shopware\Components\Plugin\XmlReader\XmlPluginInfoReader (see Shopware 5.6)
+ * Use new class @see XmlReader\XmlPluginReader (see Shopware 5.6)
  *
- * https://github.com/shopware/shopware/blob/5.6/engine/Shopware/Components/Plugin/XmlReader/XmlPluginInfoReader.php
+ * https://github.com/shopware5/shopware/blob/5.6/engine/Shopware/Components/Plugin/XmlReader/XmlPluginReader.php
  */
 class XmlPluginInfoReader
 {
@@ -47,7 +47,7 @@ public function read($file)
         try {
             $dom = XmlUtils::loadFile($file, __DIR__ . '/schema/plugin.xsd');
         } catch (Exception $e) {
-            throw new InvalidArgumentException(sprintf('Unable to parse file "%s". Message: %s', $file, $e->getMessage()), $e->getCode(), $e);
+            throw new InvalidArgumentException(\sprintf('Unable to parse file "%s". Message: %s', $file, $e->getMessage()), $e->getCode(), $e);
         }
 
         return $this->parseInfo($dom);
@@ -73,8 +73,7 @@ private function parseInfo(DOMDocument $xml): ?array
             $info['description'][$lang] = trim((string) $description->nodeValue);
         }
 
-        $simpleKeys = ['version', 'license', 'author', 'copyright', 'link'];
-        foreach ($simpleKeys as $simpleKey) {
+        foreach (['version', 'license', 'author', 'copyright', 'link'] as $simpleKey) {
             if ($names = $this->getChildren($entry, $simpleKey)) {
                 $info[$simpleKey] = $names[0]->nodeValue;
             }
diff --git a/engine/Shopware/Components/Plugin/XmlReader/StoreValueParser/StoreExtjsValueParser.php b/engine/Shopware/Components/Plugin/XmlReader/StoreValueParser/StoreExtjsValueParser.php
index 5f0c468deb5..d8a067e0e92 100644
--- a/engine/Shopware/Components/Plugin/XmlReader/StoreValueParser/StoreExtjsValueParser.php
+++ b/engine/Shopware/Components/Plugin/XmlReader/StoreValueParser/StoreExtjsValueParser.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin\XmlReader\StoreValueParser;
@@ -28,11 +28,6 @@
 
 class StoreExtjsValueParser implements StoreValueParserInterface
 {
-    /**
-     * Parses store options.
-     *
-     * @return string|array
-     */
     public function parse(DOMElement $element)
     {
         return $element->nodeValue ?: '';
diff --git a/engine/Shopware/Components/Plugin/XmlReader/StoreValueParser/StoreValueParserFactory.php b/engine/Shopware/Components/Plugin/XmlReader/StoreValueParser/StoreValueParserFactory.php
index 9339bd33033..82e140043f4 100644
--- a/engine/Shopware/Components/Plugin/XmlReader/StoreValueParser/StoreValueParserFactory.php
+++ b/engine/Shopware/Components/Plugin/XmlReader/StoreValueParser/StoreValueParserFactory.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin\XmlReader\StoreValueParser;
diff --git a/engine/Shopware/Components/Plugin/XmlReader/StoreValueParser/StoreValueParserInterface.php b/engine/Shopware/Components/Plugin/XmlReader/StoreValueParser/StoreValueParserInterface.php
index 0a41e4760a8..925f98e6893 100644
--- a/engine/Shopware/Components/Plugin/XmlReader/StoreValueParser/StoreValueParserInterface.php
+++ b/engine/Shopware/Components/Plugin/XmlReader/StoreValueParser/StoreValueParserInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin\XmlReader\StoreValueParser;
diff --git a/engine/Shopware/Components/Plugin/XmlReader/StoreValueParser/StoreXmlValueParser.php b/engine/Shopware/Components/Plugin/XmlReader/StoreValueParser/StoreXmlValueParser.php
index a0b2441eda4..db81c5271cc 100644
--- a/engine/Shopware/Components/Plugin/XmlReader/StoreValueParser/StoreXmlValueParser.php
+++ b/engine/Shopware/Components/Plugin/XmlReader/StoreValueParser/StoreXmlValueParser.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin\XmlReader\StoreValueParser;
@@ -29,9 +29,6 @@
 
 class StoreXmlValueParser implements StoreValueParserInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function parse(DOMElement $element)
     {
         $storeOptions = $element->getElementsByTagName('option');
diff --git a/engine/Shopware/Components/Plugin/XmlReader/XmlConfigReader.php b/engine/Shopware/Components/Plugin/XmlReader/XmlConfigReader.php
index 284765bf4a8..f1278c025f4 100644
--- a/engine/Shopware/Components/Plugin/XmlReader/XmlConfigReader.php
+++ b/engine/Shopware/Components/Plugin/XmlReader/XmlConfigReader.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin\XmlReader;
@@ -44,7 +44,7 @@ public static function validateAttributeScope(string $scope): int
             return self::SCOPE_SHOP;
         }
 
-        throw new InvalidArgumentException(sprintf('Invalid scope "%s"', $scope));
+        throw new InvalidArgumentException(\sprintf('Invalid config scope "%s" in file "%s"', $scope, static::$xmlFile));
     }
 
     protected function parseFile(DOMDocument $xml): array
@@ -86,7 +86,7 @@ private function parseElementNodeList(DOMNodeList $list): array
         foreach ($list as $item) {
             $element = [];
 
-            //attributes
+            // attributes
             $element['scope'] = self::validateAttributeScope(
                 $item->getAttribute('scope')
             );
@@ -101,7 +101,7 @@ private function parseElementNodeList(DOMNodeList $list): array
                 'text'
             );
 
-            //elements
+            // elements
             if ($name = $item->getElementsByTagName('name')->item(0)) {
                 $element['name'] = $name->nodeValue;
             }
diff --git a/engine/Shopware/Components/Plugin/XmlReader/XmlCronjobReader.php b/engine/Shopware/Components/Plugin/XmlReader/XmlCronjobReader.php
index 1be188a30a8..fc66588deee 100644
--- a/engine/Shopware/Components/Plugin/XmlReader/XmlCronjobReader.php
+++ b/engine/Shopware/Components/Plugin/XmlReader/XmlCronjobReader.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin\XmlReader;
diff --git a/engine/Shopware/Components/Plugin/XmlReader/XmlMenuReader.php b/engine/Shopware/Components/Plugin/XmlReader/XmlMenuReader.php
index 67cfff2ff84..8735a4a4760 100644
--- a/engine/Shopware/Components/Plugin/XmlReader/XmlMenuReader.php
+++ b/engine/Shopware/Components/Plugin/XmlReader/XmlMenuReader.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin\XmlReader;
@@ -43,7 +43,7 @@ protected function parseFile(DOMDocument $xml): array
         $entries = (new DOMXPath($xml))->query('//entries/entry');
 
         if (!$entries instanceof DOMNodeList || $entries->length === 0) {
-            throw new RuntimeException('Required element "entry" is missing.');
+            throw new RuntimeException(\sprintf('Required element "entry" is missing in file "%s".', static::$xmlFile));
         }
 
         $menu = [];
@@ -60,10 +60,7 @@ private function parseEntry(DOMElement $entry): array
     {
         $menuEntry = [];
 
-        $menuEntry['isRootMenu'] = self::validateBooleanAttribute(
-            $entry->getAttribute('isRootMenu'),
-            false
-        );
+        $menuEntry['isRootMenu'] = self::validateBooleanAttribute($entry->getAttribute('isRootMenu'));
 
         $label = self::parseTranslatableElement($entry, 'label');
 
@@ -71,14 +68,15 @@ private function parseEntry(DOMElement $entry): array
             $menuEntry['label'] = $label;
         }
 
-        $simpleFields = ['name', 'controller', 'action', 'class', 'onclick'];
-        foreach ($simpleFields as $simpleField) {
-            if (($fieldValue = self::getElementChildValueByName($entry, $simpleField)) !== null) {
+        foreach (['name', 'controller', 'action', 'class', 'onclick'] as $simpleField) {
+            $fieldValue = self::getElementChildValueByName($entry, $simpleField);
+            if ($fieldValue !== null) {
                 $menuEntry[$simpleField] = $fieldValue;
             }
         }
 
-        if (($parent = $entry->getElementsByTagName('parent')->item(0)) !== null) {
+        $parent = $entry->getElementsByTagName('parent')->item(0);
+        if ($parent !== null) {
             $identifiedBy = self::validateTextAttribute(
                 $parent->getAttribute('identifiedBy'),
                 'controller'
@@ -89,17 +87,21 @@ private function parseEntry(DOMElement $entry): array
             ];
         }
 
-        if ($active = self::getElementChildValueByName($entry, 'active')) {
+        $active = self::getElementChildValueByName($entry, 'active');
+        if ($active !== null) {
             $menuEntry['active'] = (bool) XmlUtils::phpize($active);
         }
 
-        if ($position = self::getElementChildValueByName($entry, 'position')) {
+        $position = self::getElementChildValueByName($entry, 'position');
+        if ($position !== null) {
             $menuEntry['position'] = (int) $position;
         }
 
-        if (($children = $entry->getElementsByTagName('children')) !== null && $children->length) {
+        $children = $entry->getElementsByTagName('children');
+        if ($children !== null && $children->length) {
             $children = $children->item(0);
-            foreach (XmlReaderBase::getChildren($children, 'entry') as $child) {
+            $menuEntry['children'] = [];
+            foreach (self::getChildren($children, 'entry') as $child) {
                 $menuEntry['children'][] = $this->parseEntry($child);
             }
         }
diff --git a/engine/Shopware/Components/Plugin/XmlReader/XmlPluginReader.php b/engine/Shopware/Components/Plugin/XmlReader/XmlPluginReader.php
index 6c4462013a1..79cf200c289 100644
--- a/engine/Shopware/Components/Plugin/XmlReader/XmlPluginReader.php
+++ b/engine/Shopware/Components/Plugin/XmlReader/XmlPluginReader.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin\XmlReader;
@@ -29,6 +29,7 @@
 use DOMNode;
 use DOMNodeList;
 use DOMXPath;
+use InvalidArgumentException;
 
 class XmlPluginReader extends XmlReaderBase
 {
@@ -84,9 +85,9 @@ protected function parseFile(DOMDocument $xml): array
             }
         }
 
-        $simpleFields = ['version', 'license', 'author', 'copyright', 'link'];
-        foreach ($simpleFields as $simpleField) {
-            if (($fieldValue = self::getElementChildValueByName($pluginData, $simpleField)) !== null) {
+        foreach (['version', 'license', 'author', 'copyright', 'link'] as $simpleField) {
+            $fieldValue = self::getElementChildValueByName($pluginData, $simpleField, $simpleField === 'version');
+            if ($fieldValue !== null) {
                 $info[$simpleField] = $fieldValue;
             }
         }
@@ -102,6 +103,9 @@ protected function parseFile(DOMDocument $xml): array
 
         $compatibility = $xpath->query('//plugin/compatibility');
         if ($compatibility instanceof DOMNodeList) {
+            if (\count($compatibility) > 1) {
+                throw new InvalidArgumentException(\sprintf('Element with name "compatibility" found multiple times in file "%s", but expected to be there only once', static::$xmlFile));
+            }
             $compatibility = $compatibility->item(0);
             if ($compatibility instanceof DOMNode) {
                 $info['compatibility'] = [
@@ -130,9 +134,7 @@ private function parseRequiredPlugins(DOMElement $requiredPluginNode): array
     {
         $plugins = [];
 
-        $requiredPlugins = $requiredPluginNode->getElementsByTagName('requiredPlugin');
-
-        foreach ($requiredPlugins as $requiredPlugin) {
+        foreach ($requiredPluginNode->getElementsByTagName('requiredPlugin') as $requiredPlugin) {
             $plugin = [];
 
             $plugin['pluginName'] = $requiredPlugin->getAttribute('pluginName');
diff --git a/engine/Shopware/Components/Plugin/XmlReader/XmlReaderBase.php b/engine/Shopware/Components/Plugin/XmlReader/XmlReaderBase.php
index d8229ba6b09..b04316a530e 100644
--- a/engine/Shopware/Components/Plugin/XmlReader/XmlReaderBase.php
+++ b/engine/Shopware/Components/Plugin/XmlReader/XmlReaderBase.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin\XmlReader;
@@ -46,17 +46,23 @@ abstract class XmlReaderBase implements XmlReaderInterface
      */
     protected $xsdFile;
 
+    protected static string $xmlFile = '';
+
     public function read(string $xmlFile): array
     {
+        static::$xmlFile = $xmlFile;
         try {
             $dom = XmlUtils::loadFile($xmlFile, $this->xsdFile);
         } catch (Exception $e) {
-            throw new InvalidArgumentException(sprintf('Unable to parse file "%s". Message: %s', $xmlFile, $e->getMessage()), $e->getCode(), $e);
+            throw new InvalidArgumentException(\sprintf('Unable to parse file "%s". Message: %s', $xmlFile, $e->getMessage()), $e->getCode(), $e);
         }
 
         return $this->parseFile($dom);
     }
 
+    /**
+     * @return array<string, string>|null
+     */
     public static function parseTranslatableNodeList(DOMNodeList $list): ?array
     {
         if ($list->length === 0) {
@@ -68,7 +74,7 @@ public static function parseTranslatableNodeList(DOMNodeList $list): ?array
         foreach ($list as $item) {
             $language = $item->getAttribute('lang') ?: self::DEFAULT_LANG;
             if (!\is_string($language)) {
-                throw new RuntimeException('"lang" attribute needs to be a string');
+                throw new RuntimeException(\sprintf('Attribute "lang" needs to be a string in file "%s"', static::$xmlFile));
             }
 
             // XSD Requires en-GB, Zend uses en_GB
@@ -80,6 +86,9 @@ public static function parseTranslatableNodeList(DOMNodeList $list): ?array
         return $translations;
     }
 
+    /**
+     * @return array<string, string>|null
+     */
     public static function parseTranslatableElement(DOMNode $element, string $name): ?array
     {
         $list = self::getChildren($element, $name);
@@ -93,7 +102,7 @@ public static function parseTranslatableElement(DOMNode $element, string $name):
         foreach ($list as $item) {
             $language = $item->getAttribute('lang') ?: self::DEFAULT_LANG;
             if (!\is_string($language)) {
-                throw new RuntimeException('"lang" attribute needs to be a string');
+                throw new RuntimeException(\sprintf('Attribute "lang" needs to be a string in file "%s"', static::$xmlFile));
             }
 
             // XSD Requires en-GB, Zend uses en_GB
@@ -105,6 +114,9 @@ public static function parseTranslatableElement(DOMNode $element, string $name):
         return $translations;
     }
 
+    /**
+     * @return array<DOMElement>
+     */
     public static function getChildren(DOMNode $node, string $name): array
     {
         $children = [];
@@ -188,9 +200,13 @@ public static function getElementChildValueByName(DOMElement $element, string $n
     {
         $children = self::getChildren($element, $name);
 
+        if (\count($children) > 1) {
+            throw new InvalidArgumentException(\sprintf('Element with name "%s" found multiple times in file "%s", but expected to be there only once', $name, static::$xmlFile));
+        }
+
         if (\count($children) === 0) {
             if ($throwException) {
-                throw new InvalidArgumentException(sprintf('Element with %s not found', $name));
+                throw new InvalidArgumentException(\sprintf('Element with name "%s" not found in file "%s"', $name, static::$xmlFile));
             }
 
             return null;
diff --git a/engine/Shopware/Components/Plugin/XmlReader/XmlReaderInterface.php b/engine/Shopware/Components/Plugin/XmlReader/XmlReaderInterface.php
index 05153e4eafc..f4d24f73d6a 100644
--- a/engine/Shopware/Components/Plugin/XmlReader/XmlReaderInterface.php
+++ b/engine/Shopware/Components/Plugin/XmlReader/XmlReaderInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Plugin\XmlReader;
diff --git a/engine/Shopware/Components/Plugin/schema/plugin.xsd b/engine/Shopware/Components/Plugin/schema/plugin.xsd
index eeb75e9d0df..4e48d2cbdac 100644
--- a/engine/Shopware/Components/Plugin/schema/plugin.xsd
+++ b/engine/Shopware/Components/Plugin/schema/plugin.xsd
@@ -5,19 +5,18 @@
     <xsd:element name="plugin" type="pluginType"/>
 
     <xsd:complexType name="pluginType">
-        <xsd:sequence>
-            <xsd:element name="label" type="translatableString" minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:choice maxOccurs="unbounded">
+            <xsd:element name="label" type="translatableString"/>
             <xsd:element name="version" type="xsd:string"/>
-            <xsd:element name="copyright" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="license" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="link" type="xsd:anyURI" minOccurs="0"/>
-            <xsd:element name="author" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="description" type="translatableString" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="changelog" type="changelogLog" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="requiredPlugins" type="requiredPluginList" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="compatibility" type="compatibilityType" minOccurs="0"/>
-            <xsd:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-        </xsd:sequence>
+            <xsd:element name="copyright" type="xsd:string"/>
+            <xsd:element name="license" type="xsd:string"/>
+            <xsd:element name="link" type="xsd:anyURI"/>
+            <xsd:element name="author" type="xsd:string"/>
+            <xsd:element name="description" type="translatableString"/>
+            <xsd:element name="changelog" type="changelogLog"/>
+            <xsd:element name="requiredPlugins" type="requiredPluginList"/>
+            <xsd:element name="compatibility" type="compatibilityType"/>
+        </xsd:choice>
     </xsd:complexType>
 
     <xsd:complexType name="compatibilityType">
@@ -45,7 +44,7 @@
         <xsd:sequence>
             <xsd:element name="blacklist" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
         </xsd:sequence>
-        <xsd:attribute name="pluginName" type="xsd:string"  use="required" />
+        <xsd:attribute name="pluginName" type="xsd:string" use="required"/>
         <xsd:attribute name="minVersion" type="xsd:string"/>
         <xsd:attribute name="maxVersion" type="xsd:string"/>
     </xsd:complexType>
diff --git a/engine/Shopware/Components/Privacy/ConfigDependentIpAnonymizer.php b/engine/Shopware/Components/Privacy/ConfigDependentIpAnonymizer.php
index 1d9b1725820..1775b6692be 100644
--- a/engine/Shopware/Components/Privacy/ConfigDependentIpAnonymizer.php
+++ b/engine/Shopware/Components/Privacy/ConfigDependentIpAnonymizer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Privacy;
diff --git a/engine/Shopware/Components/Privacy/CookieRemoveSubscriber.php b/engine/Shopware/Components/Privacy/CookieRemoveSubscriber.php
index 26a824340b6..19067ed8542 100644
--- a/engine/Shopware/Components/Privacy/CookieRemoveSubscriber.php
+++ b/engine/Shopware/Components/Privacy/CookieRemoveSubscriber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Privacy;
@@ -95,13 +95,13 @@ public function onPostDispatch(Enlight_Controller_ActionEventArgs $args): void
             );
         }
 
-        $allowCookie = (int) $controller->Request()->cookies->getInt('allowCookie');
+        $allowCookie = $controller->Request()->cookies->getInt('allowCookie');
         if ($this->config->get('cookie_note_mode') !== self::COOKIE_MODE_TECHNICAL) {
             if ($allowCookie === 1) {
                 return;
             }
 
-            header_remove('Set-Cookie');
+            $controller->Response()->headers->remove('Set-Cookie');
 
             return;
         }
diff --git a/engine/Shopware/Components/Privacy/IpAnonymizer.php b/engine/Shopware/Components/Privacy/IpAnonymizer.php
index d0df220ded3..20d9b0c4fda 100644
--- a/engine/Shopware/Components/Privacy/IpAnonymizer.php
+++ b/engine/Shopware/Components/Privacy/IpAnonymizer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Privacy;
diff --git a/engine/Shopware/Components/Privacy/IpAnonymizerInterface.php b/engine/Shopware/Components/Privacy/IpAnonymizerInterface.php
index 8a9e3fcbdff..a30cd34f670 100644
--- a/engine/Shopware/Components/Privacy/IpAnonymizerInterface.php
+++ b/engine/Shopware/Components/Privacy/IpAnonymizerInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Privacy;
diff --git a/engine/Shopware/Components/Privacy/PrivacyCleanupCronSubscriber.php b/engine/Shopware/Components/Privacy/PrivacyCleanupCronSubscriber.php
index bf4f8cabcb3..de5076b87a8 100644
--- a/engine/Shopware/Components/Privacy/PrivacyCleanupCronSubscriber.php
+++ b/engine/Shopware/Components/Privacy/PrivacyCleanupCronSubscriber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Privacy;
diff --git a/engine/Shopware/Components/Privacy/PrivacyService.php b/engine/Shopware/Components/Privacy/PrivacyService.php
index 738f394b592..8d1a4e5b5de 100644
--- a/engine/Shopware/Components/Privacy/PrivacyService.php
+++ b/engine/Shopware/Components/Privacy/PrivacyService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Privacy;
@@ -45,7 +45,7 @@ public function __construct(Connection $connection)
     public function cleanupGuestUsers($months)
     {
         $threshold = (new DateTime())
-            ->modify(sprintf('-%d months', $months))
+            ->modify(\sprintf('-%d months', $months))
             ->format('Y-m-d H:i:s');
 
         $query = <<<'SQL'
@@ -64,7 +64,7 @@ public function cleanupGuestUsers($months)
     public function cleanupCanceledOrders($months)
     {
         $threshold = (new DateTime())
-            ->modify(sprintf('-%d months', $months))
+            ->modify(\sprintf('-%d months', $months))
             ->format('Y-m-d H:i:s');
 
         $query = <<<'SQL'
diff --git a/engine/Shopware/Components/Privacy/PrivacyServiceInterface.php b/engine/Shopware/Components/Privacy/PrivacyServiceInterface.php
index a7722b476b1..413c3c3f10e 100644
--- a/engine/Shopware/Components/Privacy/PrivacyServiceInterface.php
+++ b/engine/Shopware/Components/Privacy/PrivacyServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Privacy;
@@ -30,6 +30,8 @@ interface PrivacyServiceInterface
      * Delete guest users which have a firstlogin date in months greater than $months and no orders
      *
      * @param int $months
+     *
+     * @return void
      */
     public function cleanupGuestUsers($months);
 
@@ -37,6 +39,8 @@ public function cleanupGuestUsers($months);
      * Delete canceled orders that have a creation time in months greater or equal than $months
      *
      * @param int $months Amount of months
+     *
+     * @return void
      */
     public function cleanupCanceledOrders($months);
 }
diff --git a/engine/Shopware/Components/ProductStream/CriteriaFactory.php b/engine/Shopware/Components/ProductStream/CriteriaFactory.php
index db384182861..6b70f018923 100644
--- a/engine/Shopware/Components/ProductStream/CriteriaFactory.php
+++ b/engine/Shopware/Components/ProductStream/CriteriaFactory.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\ProductStream;
diff --git a/engine/Shopware/Components/ProductStream/CriteriaFactoryInterface.php b/engine/Shopware/Components/ProductStream/CriteriaFactoryInterface.php
index 88c7ea9df29..5415c49258e 100644
--- a/engine/Shopware/Components/ProductStream/CriteriaFactoryInterface.php
+++ b/engine/Shopware/Components/ProductStream/CriteriaFactoryInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\ProductStream;
diff --git a/engine/Shopware/Components/ProductStream/FacetFilter.php b/engine/Shopware/Components/ProductStream/FacetFilter.php
index 7184ab6d516..be89cf36610 100644
--- a/engine/Shopware/Components/ProductStream/FacetFilter.php
+++ b/engine/Shopware/Components/ProductStream/FacetFilter.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\ProductStream;
diff --git a/engine/Shopware/Components/ProductStream/FacetFilterInterface.php b/engine/Shopware/Components/ProductStream/FacetFilterInterface.php
index e35898f1d00..f20a69ca544 100644
--- a/engine/Shopware/Components/ProductStream/FacetFilterInterface.php
+++ b/engine/Shopware/Components/ProductStream/FacetFilterInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\ProductStream;
@@ -32,6 +32,8 @@ interface FacetFilterInterface
     /**
      * Adds \Shopware\Bundle\SearchBundle\FacetInterface to the provided criteria,
      * which not already filtered by the stream
+     *
+     * @return void
      */
     public function add(Criteria $criteria);
 
diff --git a/engine/Shopware/Components/ProductStream/Repository.php b/engine/Shopware/Components/ProductStream/Repository.php
index d74cea1d013..74ec4156be7 100644
--- a/engine/Shopware/Components/ProductStream/Repository.php
+++ b/engine/Shopware/Components/ProductStream/Repository.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\ProductStream;
@@ -31,18 +31,13 @@
 use Shopware\Bundle\SearchBundle\Criteria;
 use Shopware\Bundle\SearchBundle\SortingInterface;
 use Shopware\Components\LogawareReflectionHelper;
+use Shopware\Models\ProductStream\ProductStream;
 
 class Repository implements RepositoryInterface
 {
-    /**
-     * @var Connection
-     */
-    private $conn;
+    private Connection $conn;
 
-    /**
-     * @var LogawareReflectionHelper
-     */
-    private $reflector;
+    private LogawareReflectionHelper $reflector;
 
     public function __construct(Connection $conn, LogawareReflectionHelper $reflector)
     {
@@ -50,23 +45,21 @@ public function __construct(Connection $conn, LogawareReflectionHelper $reflecto
         $this->reflector = $reflector;
     }
 
-    /**
-     * @param int $productStreamId
-     */
     public function prepareCriteria(Criteria $criteria, $productStreamId)
     {
         $productStream = $this->getStreamById($productStreamId);
+        if (!\array_key_exists('type', $productStream)) {
+            return;
+        }
 
-        if ($productStream['type'] == 1) {
+        if ((int) $productStream['type'] === ProductStream::TYPE_CONDITION) {
             $this->prepareConditionStream($productStream, $criteria);
 
             return;
         }
 
-        if ($productStream['type'] == 2) {
+        if ((int) $productStream['type'] === ProductStream::TYPE_SELECTION) {
             $this->prepareSelectionStream($productStream, $criteria);
-
-            return;
         }
     }
 
@@ -80,7 +73,7 @@ public function unserialize($serializedConditions)
         return $this->reflector->unserialize($serializedConditions, 'Serialization error in Product stream');
     }
 
-    private function prepareConditionStream(array $productStream, Criteria $criteria)
+    private function prepareConditionStream(array $productStream, Criteria $criteria): void
     {
         $this->assignConditions($productStream, $criteria);
 
@@ -90,9 +83,9 @@ private function prepareConditionStream(array $productStream, Criteria $criteria
         }
     }
 
-    private function prepareSelectionStream(array $productStream, Criteria $criteria)
+    private function prepareSelectionStream(array $productStream, Criteria $criteria): void
     {
-        $productIds = $this->getProductIds($productStream['id']);
+        $productIds = $this->getProductIds((int) $productStream['id']);
         $criteria->addBaseCondition(new ProductIdCondition($productIds));
 
         $sortings = $criteria->getSortings();
@@ -102,11 +95,9 @@ private function prepareSelectionStream(array $productStream, Criteria $criteria
     }
 
     /**
-     * @param int $productStreamId
-     *
      * @return int[]
      */
-    private function getProductIds($productStreamId)
+    private function getProductIds(int $productStreamId): array
     {
         $query = $this->conn->createQueryBuilder();
         $query->select('article_id')
@@ -117,14 +108,9 @@ private function getProductIds($productStreamId)
         return $query->execute()->fetchAll(PDO::FETCH_COLUMN);
     }
 
-    /**
-     * @param int $productStreamId
-     *
-     * @return array
-     */
-    private function getStreamById($productStreamId)
+    private function getStreamById(int $productStreamId): array
     {
-        $row = $this->conn->fetchAssoc(
+        $stream = $this->conn->fetchAssociative(
             'SELECT streams.*, customSorting.sortings as customSortings
              FROM s_product_streams streams
              LEFT JOIN s_search_custom_sorting customSorting
@@ -134,10 +120,14 @@ private function getStreamById($productStreamId)
             ['productStreamId' => $productStreamId]
         );
 
-        return $row;
+        if (!\is_array($stream)) {
+            return [];
+        }
+
+        return $stream;
     }
 
-    private function assignSortings(array $productStream, Criteria $criteria)
+    private function assignSortings(array $productStream, Criteria $criteria): void
     {
         $sorting = $productStream['sorting'];
         if (!empty($productStream['customSortings'])) {
@@ -153,7 +143,7 @@ private function assignSortings(array $productStream, Criteria $criteria)
         }
     }
 
-    private function assignConditions(array $productStream, Criteria $criteria)
+    private function assignConditions(array $productStream, Criteria $criteria): void
     {
         $serializedConditions = json_decode($productStream['conditions'], true);
         /** @var ConditionInterface[] $conditions */
diff --git a/engine/Shopware/Components/ProductStream/RepositoryInterface.php b/engine/Shopware/Components/ProductStream/RepositoryInterface.php
index 5dc83a5fd88..5949f739669 100644
--- a/engine/Shopware/Components/ProductStream/RepositoryInterface.php
+++ b/engine/Shopware/Components/ProductStream/RepositoryInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\ProductStream;
@@ -30,6 +30,8 @@ interface RepositoryInterface
 {
     /**
      * @param int $productStreamId
+     *
+     * @return void
      */
     public function prepareCriteria(Criteria $criteria, $productStreamId);
 
diff --git a/engine/Shopware/Components/QueryAliasMapper.php b/engine/Shopware/Components/QueryAliasMapper.php
index 13642281aea..048f459642e 100644
--- a/engine/Shopware/Components/QueryAliasMapper.php
+++ b/engine/Shopware/Components/QueryAliasMapper.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
diff --git a/engine/Shopware/Components/Random.php b/engine/Shopware/Components/Random.php
index 94403b6c600..a282c845869 100644
--- a/engine/Shopware/Components/Random.php
+++ b/engine/Shopware/Components/Random.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
@@ -96,7 +96,8 @@ public static function getInteger($min, $max)
     public static function getFloat()
     {
         $bytes = static::getBytes(7);
-        $bytes[6] = $bytes[6] | \chr(0xF0);
+        $newBytes = $bytes[6] | \chr(0xF0);
+        $bytes[6] = $newBytes;
         $bytes .= \chr(63); // exponent bias (1023)
         $unpacked = unpack('d', $bytes);
         if (!\is_array($unpacked)) {
diff --git a/engine/Shopware/Components/ReflectionAwareInterface.php b/engine/Shopware/Components/ReflectionAwareInterface.php
index c6fc250759f..ac5423eb046 100644
--- a/engine/Shopware/Components/ReflectionAwareInterface.php
+++ b/engine/Shopware/Components/ReflectionAwareInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
diff --git a/engine/Shopware/Components/ReflectionHelper.php b/engine/Shopware/Components/ReflectionHelper.php
index a9b67de1aed..9fd16c47f0b 100644
--- a/engine/Shopware/Components/ReflectionHelper.php
+++ b/engine/Shopware/Components/ReflectionHelper.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
@@ -42,7 +42,7 @@ class ReflectionHelper
      * @param string               $docPath     Optional document root parameter where the class should be found
      * @param array                $directories an array of directories in which the class should be found
      *
-     * @see \Shopware\Components\ReflectionHelper::verifyClass()
+     * @see ReflectionHelper::verifyClass()
      *
      * @throws ReflectionException      Class could not be found
      * @throws InvalidArgumentException
@@ -90,7 +90,7 @@ public function createInstanceFromNamedArguments($className, $arguments, $secure
 
             if (!isset($arguments[$paramName])) {
                 if (!$constructorParam->isOptional()) {
-                    throw new RuntimeException(sprintf('Required constructor parameter missing: "$%s".', $paramName));
+                    throw new RuntimeException(\sprintf('Required constructor parameter missing: "$%s".', $paramName));
                 }
                 $newParams[] = $constructorParam->getDefaultValue();
 
@@ -123,7 +123,7 @@ private function verifyClass(ReflectionClass $class, string $docPath, array $dir
 
         // Trying to execute a class outside the Shopware DocumentRoot
         if ($fileDir !== $docPath) {
-            throw new InvalidArgumentException(sprintf('Class "%s" out of scope', $class->getFileName()), 1);
+            throw new InvalidArgumentException(\sprintf('Class "%s" out of scope', $class->getFileName()), 1);
         }
 
         $fileName = substr($fileName, \strlen($docPath));
@@ -144,13 +144,13 @@ private function verifyClass(ReflectionClass $class, string $docPath, array $dir
         }
 
         if ($error) {
-            throw new InvalidArgumentException(sprintf('Class "%s" out of scope', $class->getFileName()), 2);
+            throw new InvalidArgumentException(\sprintf('Class "%s" out of scope', $class->getFileName()), 2);
         }
 
         $className = $class->getName();
         $classImplements = class_implements($className);
         if (!\is_array($classImplements) || !\array_key_exists(ReflectionAwareInterface::class, $classImplements)) {
-            throw new InvalidArgumentException(sprintf('Class %s has to implement the interface %s', $className, ReflectionAwareInterface::class));
+            throw new InvalidArgumentException(\sprintf('Class %s has to implement the interface %s', $className, ReflectionAwareInterface::class));
         }
     }
 }
diff --git a/engine/Shopware/Components/Register/OptinCleanupService.php b/engine/Shopware/Components/Register/OptinCleanupService.php
index ed62cfdd2a2..2b558e0edc2 100644
--- a/engine/Shopware/Components/Register/OptinCleanupService.php
+++ b/engine/Shopware/Components/Register/OptinCleanupService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Register;
diff --git a/engine/Shopware/Components/Register/OptinCleanupServiceInterface.php b/engine/Shopware/Components/Register/OptinCleanupServiceInterface.php
index 8aaeaaa32b1..eb99d7108dd 100644
--- a/engine/Shopware/Components/Register/OptinCleanupServiceInterface.php
+++ b/engine/Shopware/Components/Register/OptinCleanupServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Register;
diff --git a/engine/Shopware/Components/Register/OptinCleanupSubscriber.php b/engine/Shopware/Components/Register/OptinCleanupSubscriber.php
index 3fdfc508d92..02bae04c39f 100644
--- a/engine/Shopware/Components/Register/OptinCleanupSubscriber.php
+++ b/engine/Shopware/Components/Register/OptinCleanupSubscriber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Register;
diff --git a/engine/Shopware/Components/Register/RegistrationCleanupService.php b/engine/Shopware/Components/Register/RegistrationCleanupService.php
index 48450eebdb0..9f94421aa54 100644
--- a/engine/Shopware/Components/Register/RegistrationCleanupService.php
+++ b/engine/Shopware/Components/Register/RegistrationCleanupService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Register;
diff --git a/engine/Shopware/Components/Register/RegistrationCleanupServiceInterface.php b/engine/Shopware/Components/Register/RegistrationCleanupServiceInterface.php
index 4a71011c93a..57b12672beb 100644
--- a/engine/Shopware/Components/Register/RegistrationCleanupServiceInterface.php
+++ b/engine/Shopware/Components/Register/RegistrationCleanupServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Register;
diff --git a/engine/Shopware/Components/Register/RegistrationCleanupSubscriber.php b/engine/Shopware/Components/Register/RegistrationCleanupSubscriber.php
index 2172b28365c..55a59d9d62d 100644
--- a/engine/Shopware/Components/Register/RegistrationCleanupSubscriber.php
+++ b/engine/Shopware/Components/Register/RegistrationCleanupSubscriber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Register;
diff --git a/engine/Shopware/Components/RobotsTxtGenerator.php b/engine/Shopware/Components/RobotsTxtGenerator.php
index 35efbc01a84..0c2e7b157da 100644
--- a/engine/Shopware/Components/RobotsTxtGenerator.php
+++ b/engine/Shopware/Components/RobotsTxtGenerator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
diff --git a/engine/Shopware/Components/RobotsTxtGeneratorInterface.php b/engine/Shopware/Components/RobotsTxtGeneratorInterface.php
index d5f6ea06933..3eae0d50dc3 100644
--- a/engine/Shopware/Components/RobotsTxtGeneratorInterface.php
+++ b/engine/Shopware/Components/RobotsTxtGeneratorInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
diff --git a/engine/Shopware/Components/Routing/Context.php b/engine/Shopware/Components/Routing/Context.php
index 54e1dc97e69..99a7e471eb3 100644
--- a/engine/Shopware/Components/Routing/Context.php
+++ b/engine/Shopware/Components/Routing/Context.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Routing;
@@ -33,7 +33,7 @@
 /**
  * @see http://php.net/manual/en/reflectionclass.iscloneable.php
  * @see http://api.symfony.com/2.0/Symfony/Component/Routing/RequestContext.html
- * @see \Enlight_Controller_Request_Request
+ * @see EnlightRequest
  */
 class Context implements JsonSerializable
 {
@@ -52,7 +52,7 @@ class Context implements JsonSerializable
     protected $baseFile = 'shopware.php';
 
     /**
-     * @see \Enlight_Controller_Request_Request::getHttpHost
+     * @see EnlightRequest::getHttpHost
      *
      * @var string
      */
@@ -91,7 +91,7 @@ class Context implements JsonSerializable
     /**
      * Module keys for retrieving module from params
      *
-     * @see \Enlight_Controller_Request_Request::$_moduleKey
+     * @see EnlightRequest::$_moduleKey
      *
      * @var string
      */
diff --git a/engine/Shopware/Components/Routing/GeneratorFilters/DefaultPostFilter.php b/engine/Shopware/Components/Routing/GeneratorFilters/DefaultPostFilter.php
index 4ed57f34bab..7d91d66dc8b 100644
--- a/engine/Shopware/Components/Routing/GeneratorFilters/DefaultPostFilter.php
+++ b/engine/Shopware/Components/Routing/GeneratorFilters/DefaultPostFilter.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Routing\GeneratorFilters;
diff --git a/engine/Shopware/Components/Routing/GeneratorFilters/DefaultPreFilter.php b/engine/Shopware/Components/Routing/GeneratorFilters/DefaultPreFilter.php
index 0ef4585221a..cfac51d3d96 100644
--- a/engine/Shopware/Components/Routing/GeneratorFilters/DefaultPreFilter.php
+++ b/engine/Shopware/Components/Routing/GeneratorFilters/DefaultPreFilter.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Routing\GeneratorFilters;
@@ -32,7 +32,7 @@ class DefaultPreFilter implements PreFilterInterface
     /**
      * {@inheritdoc}
      */
-    public function preFilter($params, Context $context = null)
+    public function preFilter($params, ?Context $context = null)
     {
         // Add support for "shopware.php?sViewport,cat&sCategory=3"
         if (\is_string($params)) {
@@ -73,10 +73,14 @@ public function preFilter($params, Context $context = null)
             $params['module'] = 'frontend';
         }
         $params = array_merge($globalParams, $params);
+        $newParams = [];
+        foreach ($params as $key => $param) {
+            $newParams[(string) $key] = $param;
+        }
         if ($context) {
-            $context->setParams($params);
+            $context->setParams($newParams);
         }
 
-        return $params;
+        return $newParams;
     }
 }
diff --git a/engine/Shopware/Components/Routing/GeneratorFilters/FrontendPostFilter.php b/engine/Shopware/Components/Routing/GeneratorFilters/FrontendPostFilter.php
index 66c48f1a368..3ee4008d323 100644
--- a/engine/Shopware/Components/Routing/GeneratorFilters/FrontendPostFilter.php
+++ b/engine/Shopware/Components/Routing/GeneratorFilters/FrontendPostFilter.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Routing\GeneratorFilters;
diff --git a/engine/Shopware/Components/Routing/GeneratorFilters/FrontendPreFilter.php b/engine/Shopware/Components/Routing/GeneratorFilters/FrontendPreFilter.php
index 9697ab9fa22..047d3232def 100644
--- a/engine/Shopware/Components/Routing/GeneratorFilters/FrontendPreFilter.php
+++ b/engine/Shopware/Components/Routing/GeneratorFilters/FrontendPreFilter.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Routing\GeneratorFilters;
diff --git a/engine/Shopware/Components/Routing/GeneratorInterface.php b/engine/Shopware/Components/Routing/GeneratorInterface.php
index dac2ccba452..f098ca7b44c 100644
--- a/engine/Shopware/Components/Routing/GeneratorInterface.php
+++ b/engine/Shopware/Components/Routing/GeneratorInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Routing;
diff --git a/engine/Shopware/Components/Routing/GeneratorListInterface.php b/engine/Shopware/Components/Routing/GeneratorListInterface.php
index 4f48388f294..e6c5ee10860 100644
--- a/engine/Shopware/Components/Routing/GeneratorListInterface.php
+++ b/engine/Shopware/Components/Routing/GeneratorListInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Routing;
diff --git a/engine/Shopware/Components/Routing/Generators/DefaultGenerator.php b/engine/Shopware/Components/Routing/Generators/DefaultGenerator.php
index 19474e0c73f..2d5325d0821 100644
--- a/engine/Shopware/Components/Routing/Generators/DefaultGenerator.php
+++ b/engine/Shopware/Components/Routing/Generators/DefaultGenerator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Routing\Generators;
@@ -86,14 +86,16 @@ public function generate(array $params, Context $context)
 
         foreach ($params as $key => $value) {
             if (\is_object($value)) {
-                trigger_error(sprintf('Using objects as params in %s:%s is deprecated since Shopware 5.6 and will result in an exception with 5.7.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+                trigger_error(\sprintf('Using objects as params in %s:%s is deprecated since Shopware 5.6 and will result in an exception with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
             }
 
             $route[] = $key;
             $route[] = \is_array($value) ? http_build_query($value) : $value;
         }
 
-        $route = array_map('urlencode', $route);
+        $route = array_map(function ($routePart) {
+            return $routePart !== null ? urlencode($routePart) : null;
+        }, $route);
 
         return implode($this->separator, $route);
     }
diff --git a/engine/Shopware/Components/Routing/Generators/RewriteGenerator.php b/engine/Shopware/Components/Routing/Generators/RewriteGenerator.php
index 94e19da6930..dc0be022181 100644
--- a/engine/Shopware/Components/Routing/Generators/RewriteGenerator.php
+++ b/engine/Shopware/Components/Routing/Generators/RewriteGenerator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Routing\Generators;
@@ -38,15 +38,9 @@ class RewriteGenerator implements GeneratorListInterface
      */
     protected $connection;
 
-    /**
-     * @var QueryAliasMapper
-     */
-    private $queryAliasMapper;
+    private QueryAliasMapper $queryAliasMapper;
 
-    /**
-     * @var Enlight_Event_EventManager
-     */
-    private $eventManager;
+    private Enlight_Event_EventManager $eventManager;
 
     public function __construct(
         Connection $connection,
@@ -121,7 +115,7 @@ public function generateList(array $list, Context $context)
             return $urls;
         }
 
-        //Add query / strtolower
+        // Add query / strtolower
         array_walk($urls, function (&$url, $key) use ($context, $list, $orgQueryList) {
             if (\is_string($url)) {
                 if ($context->isUrlToLower()) {
@@ -142,7 +136,7 @@ public function generateList(array $list, Context $context)
     }
 
     /**
-     * @return string
+     * @return literal-string
      */
     protected function getAssembleQuery()
     {
@@ -159,7 +153,9 @@ protected function getOrgQueryArray($query)
         $orgQuery = ['sViewport' => $query['controller']];
         switch ($query['controller']) {
             case 'detail':
-                $orgQuery['sArticle'] = $query['sArticle'];
+                if (isset($query['sArticle'])) {
+                    $orgQuery['sArticle'] = $query['sArticle'];
+                }
                 break;
             case 'blog':
                 if (isset($query['action']) && $query['action'] !== 'index') {
@@ -266,7 +262,7 @@ private function rewriteList(array $list, Context $context)
             ]
         );
 
-        $rows = $statement->fetchAll(PDO::FETCH_KEY_PAIR);
+        $rows = $statement->fetchAllKeyValue();
 
         foreach ($list as $key => $orgPath) {
             if (isset($rows[$orgPath])) {
diff --git a/engine/Shopware/Components/Routing/MatcherInterface.php b/engine/Shopware/Components/Routing/MatcherInterface.php
index ff672fb82ac..7a2887066ce 100644
--- a/engine/Shopware/Components/Routing/MatcherInterface.php
+++ b/engine/Shopware/Components/Routing/MatcherInterface.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Routing;
diff --git a/engine/Shopware/Components/Routing/Matchers/DefaultMatcher.php b/engine/Shopware/Components/Routing/Matchers/DefaultMatcher.php
index d09274764a8..6ad796e0ee8 100644
--- a/engine/Shopware/Components/Routing/Matchers/DefaultMatcher.php
+++ b/engine/Shopware/Components/Routing/Matchers/DefaultMatcher.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Routing\Matchers;
diff --git a/engine/Shopware/Components/Routing/Matchers/EventMatcher.php b/engine/Shopware/Components/Routing/Matchers/EventMatcher.php
index 7c596e528d9..40a9b70e06a 100644
--- a/engine/Shopware/Components/Routing/Matchers/EventMatcher.php
+++ b/engine/Shopware/Components/Routing/Matchers/EventMatcher.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Routing\Matchers;
@@ -49,7 +49,7 @@ public function match($pathInfo, Context $context)
         if (str_starts_with($pathInfo, '/backend/') || str_starts_with($pathInfo, '/api/')) {
             return $pathInfo;
         }
-        if ($context->getShopId() === null) { //only frontend
+        if ($context->getShopId() === null) { // only frontend
             return $pathInfo;
         }
 
diff --git a/engine/Shopware/Components/Routing/Matchers/RewriteMatcher.php b/engine/Shopware/Components/Routing/Matchers/RewriteMatcher.php
index dcfd5fb2004..9784c694661 100644
--- a/engine/Shopware/Components/Routing/Matchers/RewriteMatcher.php
+++ b/engine/Shopware/Components/Routing/Matchers/RewriteMatcher.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Routing\Matchers;
@@ -143,7 +142,7 @@ private function getRoute(int $shopId, string $pathInfo)
     }
 
     /**
-     * @return array<string, mixed>
+     * @return array<array-key, mixed>
      */
     private function getQueryFormOrgPath(string $orgPath): array
     {
diff --git a/engine/Shopware/Components/Routing/PostFilterInterface.php b/engine/Shopware/Components/Routing/PostFilterInterface.php
index bf4d87664df..b7959557bd2 100644
--- a/engine/Shopware/Components/Routing/PostFilterInterface.php
+++ b/engine/Shopware/Components/Routing/PostFilterInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Routing;
diff --git a/engine/Shopware/Components/Routing/PreFilterInterface.php b/engine/Shopware/Components/Routing/PreFilterInterface.php
index 2786ca46b12..97c14348124 100644
--- a/engine/Shopware/Components/Routing/PreFilterInterface.php
+++ b/engine/Shopware/Components/Routing/PreFilterInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Routing;
diff --git a/engine/Shopware/Components/Routing/Router.php b/engine/Shopware/Components/Routing/Router.php
index ee7486a163f..8b5737cf414 100644
--- a/engine/Shopware/Components/Routing/Router.php
+++ b/engine/Shopware/Components/Routing/Router.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Routing;
@@ -96,7 +96,7 @@ public function getContext()
     /**
      * {@inheritdoc}
      */
-    public function match($pathInfo, Context $context = null)
+    public function match($pathInfo, ?Context $context = null)
     {
         if ($context === null) {
             $context = clone $this->context;
@@ -116,7 +116,7 @@ public function match($pathInfo, Context $context = null)
     /**
      * {@inheritdoc}
      */
-    public function generateList(array $list, Context $context = null)
+    public function generateList(array $list, ?Context $context = null)
     {
         $context = $context ?? $this->context;
         $contextList = [];
@@ -150,7 +150,7 @@ public function generateList(array $list, Context $context = null)
         }
 
         // At this point only strings should be in the array
-        $urls = array_filter($urls, '\is_string');
+        $urls = array_filter($urls, 'is_string');
         foreach ($this->postFilters as $postFilter) {
             foreach ($urls as $key => &$url) {
                 if ($postFilter instanceof PostFilterInterface) {
@@ -165,7 +165,7 @@ public function generateList(array $list, Context $context = null)
     /**
      * {@inheritdoc}
      */
-    public function assemble($userParams = [], Context $context = null)
+    public function assemble($userParams = [], ?Context $context = null)
     {
         if ($context === null) {
             $context = clone $this->context;
@@ -276,16 +276,16 @@ public function setPostFilters($postFilters)
      */
     public function route(EnlightRequest $request)
     {
-        /* For enlight routing  */
+        /* For enlight routing */
         $this->context->updateFromEnlightRequest($request);
 
         $params = $this->match($request->getPathInfo(), $this->context);
         if ($params !== false) {
-            /* For shopware routing (query === userParams)  */
+            /* For shopware routing (query === userParams) */
             $request->setQuery($params);
         }
 
-        /* For enlight routing  */
+        /* For enlight routing */
         $this->context->updateFromEnlightRequest($request);
         $this->context->setParams([]);
 
@@ -296,7 +296,7 @@ public function route(EnlightRequest $request)
      * Sets a global parameter.
      *
      * @see \Shopware_Controllers_Backend_Newsletter::initMailing
-     * @see \Enlight_Controller_Router::setGlobalParam
+     * @see EnlightRouter::setGlobalParam
      *
      * @param string $name
      * @param string $value
diff --git a/engine/Shopware/Components/Routing/RouterInterface.php b/engine/Shopware/Components/Routing/RouterInterface.php
index 313eb2709b2..a36e036eb44 100644
--- a/engine/Shopware/Components/Routing/RouterInterface.php
+++ b/engine/Shopware/Components/Routing/RouterInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Routing;
@@ -34,18 +34,18 @@
 interface RouterInterface
 {
     /**
-     * @param array<int, array<string, mixed>>|array<int, string> $list
+     * @param array<int, array<string, mixed>>|array<array-key, string> $list
      *
-     * @return array<int, string>
+     * @return array<array-key, string>
      */
-    public function generateList(array $list, Context $context = null);
+    public function generateList(array $list, ?Context $context = null);
 
     /**
      * @param array<string, mixed> $userParams
      *
      * @return string
      */
-    public function assemble($userParams = [], Context $context = null);
+    public function assemble($userParams = [], ?Context $context = null);
 
     /**
      * Switch the context
@@ -64,5 +64,5 @@ public function getContext();
      *
      * @return array<string, mixed>|false
      */
-    public function match($pathInfo, Context $context = null);
+    public function match($pathInfo, ?Context $context = null);
 }
diff --git a/engine/Shopware/Components/Security/AttributeCleanerTrait.php b/engine/Shopware/Components/Security/AttributeCleanerTrait.php
index cfa68bffbeb..0caabe7249f 100644
--- a/engine/Shopware/Components/Security/AttributeCleanerTrait.php
+++ b/engine/Shopware/Components/Security/AttributeCleanerTrait.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Security;
@@ -38,7 +38,7 @@ trait AttributeCleanerTrait
      *
      * @return string The filtered string
      */
-    protected function cleanup($var, callable $callback = null)
+    protected function cleanup($var, ?callable $callback = null)
     {
         if (!\is_string($var)) {
             return $var;
diff --git a/engine/Shopware/Components/Session/PdoSessionHandler.php b/engine/Shopware/Components/Session/PdoSessionHandler.php
index aa912c3e9ec..8a74a52153c 100644
--- a/engine/Shopware/Components/Session/PdoSessionHandler.php
+++ b/engine/Shopware/Components/Session/PdoSessionHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Session;
@@ -29,6 +29,7 @@
 use PDO;
 use PDOException;
 use PDOStatement;
+use ReturnTypeWillChange;
 use SessionHandlerInterface;
 
 /**
@@ -193,7 +194,7 @@ public function __construct($pdoOrDsn = null, array $options = [])
     {
         if ($pdoOrDsn instanceof PDO) {
             if ($pdoOrDsn->getAttribute(PDO::ATTR_ERRMODE) !== PDO::ERRMODE_EXCEPTION) {
-                throw new InvalidArgumentException(sprintf('"%s" requires PDO error mode attribute be set to throw Exceptions (i.e. $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION))', __CLASS__));
+                throw new InvalidArgumentException(\sprintf('"%s" requires PDO error mode attribute be set to throw Exceptions (i.e. $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION))', __CLASS__));
             }
 
             $this->pdo = $pdoOrDsn;
@@ -251,7 +252,7 @@ public function createTable()
                 $sql = "CREATE TABLE $this->table ($this->idCol VARCHAR(128) NOT NULL PRIMARY KEY, $this->dataCol VARBINARY(MAX) NOT NULL, $this->expiryCol INTEGER NOT NULL, $this->timeCol INTEGER NOT NULL)";
                 break;
             default:
-                throw new DomainException(sprintf('Creating the session table is currently not implemented for PDO driver "%s".', $this->driver));
+                throw new DomainException(\sprintf('Creating the session table is currently not implemented for PDO driver "%s".', $this->driver));
         }
 
         try {
@@ -277,7 +278,10 @@ public function isSessionExpired()
 
     /**
      * {@inheritdoc}
+     *
+     * @deprecated - Native return and parameter type will be added with Shopware 5.8
      */
+    #[ReturnTypeWillChange]
     public function open($savePath, $sessionName)
     {
         if ($this->pdo === null) {
@@ -289,7 +293,10 @@ public function open($savePath, $sessionName)
 
     /**
      * {@inheritdoc}
+     *
+     * @deprecated - Native return and parameter type will be added with Shopware 5.8
      */
+    #[ReturnTypeWillChange]
     public function read($sessionId)
     {
         try {
@@ -303,7 +310,10 @@ public function read($sessionId)
 
     /**
      * {@inheritdoc}
+     *
+     * @deprecated - Native return and parameter type will be added with Shopware 5.8
      */
+    #[ReturnTypeWillChange]
     public function gc($maxlifetime)
     {
         // We delay gc() to close() so that it is executed outside the transactional and blocking read-write process.
@@ -315,7 +325,10 @@ public function gc($maxlifetime)
 
     /**
      * {@inheritdoc}
+     *
+     * @deprecated - Native return and parameter type will be added with Shopware 5.8
      */
+    #[ReturnTypeWillChange]
     public function destroy($sessionId)
     {
         // delete the record associated with this id
@@ -336,10 +349,13 @@ public function destroy($sessionId)
 
     /**
      * {@inheritdoc}
+     *
+     * @deprecated - Native return and parameter type will be added with Shopware 5.8
      */
+    #[ReturnTypeWillChange]
     public function write($sessionId, $data)
     {
-        $maxlifetime = (int) ini_get('session.gc_maxlifetime');
+        $maxlifetime = (int) \ini_get('session.gc_maxlifetime');
 
         try {
             // We use a single MERGE SQL query when supported by the database.
@@ -394,7 +410,10 @@ public function write($sessionId, $data)
 
     /**
      * {@inheritdoc}
+     *
+     * @deprecated - Native return and parameter type will be added with Shopware 5.8
      */
+    #[ReturnTypeWillChange]
     public function close()
     {
         $this->commit();
@@ -429,7 +448,7 @@ public function close()
     protected function getConnection()
     {
         if ($this->pdo === null) {
-            $this->connect($this->dsn ?: ini_get('session.save_path'));
+            $this->connect($this->dsn ?: \ini_get('session.save_path'));
         }
 
         return $this->pdo;
@@ -641,7 +660,7 @@ private function doAdvisoryLock($sessionId)
             case 'sqlite':
                 throw new DomainException('SQLite does not support advisory locks.');
             default:
-                throw new DomainException(sprintf('Advisory locks are currently not implemented for PDO driver "%s".', $this->driver));
+                throw new DomainException(\sprintf('Advisory locks are currently not implemented for PDO driver "%s".', $this->driver));
         }
     }
 
@@ -668,7 +687,7 @@ private function getSelectSql()
                     // we already locked when starting transaction
                     break;
                 default:
-                    throw new DomainException(sprintf('Transactional locks are currently not implemented for PDO driver "%s".', $this->driver));
+                    throw new DomainException(\sprintf('Transactional locks are currently not implemented for PDO driver "%s".', $this->driver));
             }
         }
 
diff --git a/engine/Shopware/Components/ShopRegistrationService.php b/engine/Shopware/Components/ShopRegistrationService.php
index df75f1430bc..c673791e942 100644
--- a/engine/Shopware/Components/ShopRegistrationService.php
+++ b/engine/Shopware/Components/ShopRegistrationService.php
@@ -1,35 +1,33 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
 
 use Enlight_Plugin_PluginManager;
 use Enlight_Template_Manager;
-use Exception;
+use RuntimeException;
 use Shopware\Components\Theme\Inheritance;
-use Shopware\Models\Shop\Currency;
-use Shopware\Models\Shop\Locale;
 use Shopware\Models\Shop\Shop;
 use Shopware\Models\Shop\Template;
 use Shopware_Components_Config;
@@ -62,27 +60,21 @@ public function registerResources(Shop $shop): void
     {
         $this->container->set('shop', $shop);
 
-        /** @var Zend_Locale $locale */
         $locale = $this->container->get(Zend_Locale::class);
         $locale->setLocale($shop->getLocale()->toString());
 
-        /** @var Zend_Currency $currency */
         $currency = $this->container->get(Zend_Currency::class);
         $currency->setLocale($locale);
         $currency->setFormat($shop->getCurrency()->toArray());
 
-        /** @var Shopware_Components_Config $config */
         $config = $this->container->get(Shopware_Components_Config::class);
         $config->setShop($shop);
 
-        /** @var Shopware_Components_Snippet_Manager $snippets */
         $snippets = $this->container->get(Shopware_Components_Snippet_Manager::class);
         $snippets->setShop($shop);
 
-        /** @var Enlight_Plugin_PluginManager $plugins */
         $plugins = $this->container->get(Enlight_Plugin_PluginManager::class);
 
-        /** @var Shopware_Components_Plugin_Namespace $pluginNamespace */
         foreach ($plugins as $pluginNamespace) {
             if ($pluginNamespace instanceof Shopware_Components_Plugin_Namespace) {
                 $pluginNamespace->setShop($shop);
@@ -92,7 +84,6 @@ public function registerResources(Shop $shop): void
         // Initializes the frontend session to prevent output before session started.
         $this->container->get('session');
 
-        /** @var Shopware_Components_TemplateMail $templateMail */
         $templateMail = $this->container->get(Shopware_Components_TemplateMail::class);
         $templateMail->setShop($shop);
 
@@ -105,38 +96,27 @@ public function registerResources(Shop $shop): void
 
     public function resetTemplate(Shop $shop): void
     {
-        if ($shop->getTemplate() === null) {
+        $template = $shop->getTemplate();
+        if (!$template instanceof Template) {
             return;
         }
 
-        /** @var Enlight_Template_Manager $templateManager */
-        $templateManager = $this->container->get(Enlight_Template_Manager::class);
-        $template = $shop->getTemplate();
         $localeName = $shop->getLocale()->toString();
 
         if ($template->getVersion() === 3) {
             $this->registerTheme($template);
         } else {
-            throw new Exception(sprintf('Tried to load unsupported template version %s for template: %s', $template->getVersion(), $template->getName()));
+            throw new RuntimeException(\sprintf('Tried to load unsupported template version %s for template: %s', $template->getVersion(), $template->getName()));
         }
 
-        $templateManager->setCompileId(
-            'frontend' .
-            '_' . $template->toString() .
-            '_' . $localeName .
-            '_' . $shop->getId()
+        $this->container->get(Enlight_Template_Manager::class)->setCompileId(
+            \sprintf('frontend_%s_%s_%s', $template->toString(), $localeName, $shop->getId())
         );
     }
 
     private function registerTheme(Template $template): void
     {
-        /** @var Enlight_Template_Manager $templateManager */
-        $templateManager = $this->container->get(Enlight_Template_Manager::class);
-
-        /** @var Inheritance $inheritance */
-        $inheritance = $this->container->get(\Shopware\Components\Theme\Inheritance::class);
-
-        $path = $inheritance->getTemplateDirectories($template);
-        $templateManager->setTemplateDir($path);
+        $path = $this->container->get(Inheritance::class)->getTemplateDirectories($template);
+        $this->container->get(Enlight_Template_Manager::class)->setTemplateDir($path);
     }
 }
diff --git a/engine/Shopware/Components/ShopRegistrationServiceInterface.php b/engine/Shopware/Components/ShopRegistrationServiceInterface.php
index 42a9bfedbf7..ab5fa415905 100644
--- a/engine/Shopware/Components/ShopRegistrationServiceInterface.php
+++ b/engine/Shopware/Components/ShopRegistrationServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
diff --git a/engine/Shopware/Components/ShopwareReleaseStruct.php b/engine/Shopware/Components/ShopwareReleaseStruct.php
index bd18feac4be..52d2475ae0f 100644
--- a/engine/Shopware/Components/ShopwareReleaseStruct.php
+++ b/engine/Shopware/Components/ShopwareReleaseStruct.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
diff --git a/engine/Shopware/Components/SitePageMenu.php b/engine/Shopware/Components/SitePageMenu.php
index 40fcfac697a..9a802ab270e 100644
--- a/engine/Shopware/Components/SitePageMenu.php
+++ b/engine/Shopware/Components/SitePageMenu.php
@@ -1,32 +1,30 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
 
 use Doctrine\DBAL\Connection;
-use PDO;
-use PDOStatement;
 use Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\FieldHelper;
 use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface;
 use Shopware\Components\Routing\RouterInterface;
@@ -71,12 +69,7 @@ public function __construct(Connection $connection, RouterInterface $router, Fie
      */
     public function getTree($shopId, $activeId)
     {
-        $query = $this->getQuery($shopId);
-
-        /** @var PDOStatement $statement */
-        $statement = $query->execute();
-
-        $data = $statement->fetchAll(PDO::FETCH_ASSOC);
+        $data = $this->getQuery($shopId)->execute()->fetchAllAssociative();
 
         $menu = [];
         $links = [];
@@ -97,7 +90,7 @@ public function getTree($shopId, $activeId)
                 $menu[$key] = [];
             }
 
-            if ($site['__page_translation']) {
+            if (isset($site['__page_translation'])) {
                 $translations = unserialize($site['__page_translation'], ['allowed_classes' => false]);
 
                 if ($translations) {
@@ -170,7 +163,7 @@ private function buildSiteTree($parentId, $sites, $activeId)
             }
             $id = (int) $site['id'];
 
-            //call recursive for tree building
+            // call recursive for tree building
             $site['subPages'] = $this->buildSiteTree(
                 $site['id'],
                 $sites,
diff --git a/engine/Shopware/Components/SitemapXMLRepository.php b/engine/Shopware/Components/SitemapXMLRepository.php
index 9903fb49ab7..e90655605c7 100644
--- a/engine/Shopware/Components/SitemapXMLRepository.php
+++ b/engine/Shopware/Components/SitemapXMLRepository.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
@@ -33,6 +33,7 @@
 use Shopware\Bundle\SearchBundle\Criteria;
 use Shopware\Bundle\SearchBundle\ProductNumberSearchInterface;
 use Shopware\Bundle\SearchBundle\StoreFrontCriteriaFactoryInterface;
+use Shopware\Bundle\SitemapBundle\Service\LinkFilter;
 use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface;
 use Shopware\Components\Model\ModelManager;
 use Shopware\Models\Category\Category;
@@ -204,7 +205,7 @@ private function readBlogUrls($parentId)
     {
         $blogs = [];
 
-        $categoryRepository = $this->em->getRepository(\Shopware\Models\Category\Category::class);
+        $categoryRepository = $this->em->getRepository(Category::class);
         $query = $categoryRepository->getBlogCategoriesByParentQuery($parentId);
         $blogCategories = $query->getArrayResult();
 
@@ -265,7 +266,7 @@ private function readStaticUrls()
                 'sCustom' => $site['id'],
             ];
 
-            $site['show'] = $this->filterLink($site['link'], $site['urlParams']);
+            $site['show'] = LinkFilter::filterLink($site['link'], $site['urlParams']);
         }
 
         return $sites;
@@ -309,33 +310,6 @@ private function getSitesByShopId($shopId)
         return $sites;
     }
 
-    /**
-     * Helper function to filter predefined links, which should not be in the sitemap (external links, sitemap links itself)
-     * Returns false, if the link is not allowed
-     *
-     * @param string $link
-     * @param array  $userParams
-     *
-     * @return bool
-     */
-    private function filterLink($link, &$userParams)
-    {
-        if (empty($link)) {
-            return true;
-        }
-
-        $parsedUserParams = (string) parse_url($link, PHP_URL_QUERY);
-        parse_str($parsedUserParams, $userParams);
-
-        $blacklist = ['', 'sitemap', 'sitemapXml'];
-
-        if (\in_array($userParams['sViewport'], $blacklist, true)) {
-            return false;
-        }
-
-        return true;
-    }
-
     /**
      * Helper function to read the supplier pages urls
      *
diff --git a/engine/Shopware/Components/Slug/CocurSlugifyAdapter.php b/engine/Shopware/Components/Slug/CocurSlugifyAdapter.php
index e6209acb8ee..128d201ac3c 100644
--- a/engine/Shopware/Components/Slug/CocurSlugifyAdapter.php
+++ b/engine/Shopware/Components/Slug/CocurSlugifyAdapter.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Slug;
@@ -28,10 +28,7 @@
 
 class CocurSlugifyAdapter implements SlugInterface
 {
-    /**
-     * @var SlugifyInterface
-     */
-    private $slugify;
+    private SlugifyInterface $slugify;
 
     public function __construct(SlugifyInterface $slugify)
     {
@@ -43,6 +40,8 @@ public function __construct(SlugifyInterface $slugify)
      */
     public function slugify($string, $separator = null)
     {
+        $string = (string) $string;
+
         return $this->slugify->slugify($string, $separator);
     }
 }
diff --git a/engine/Shopware/Components/Slug/SlugInterface.php b/engine/Shopware/Components/Slug/SlugInterface.php
index 7e561c4ec37..dba4c302c21 100644
--- a/engine/Shopware/Components/Slug/SlugInterface.php
+++ b/engine/Shopware/Components/Slug/SlugInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Slug;
diff --git a/engine/Shopware/Components/Snippet/DatabaseHandler.php b/engine/Shopware/Components/Snippet/DatabaseHandler.php
index 55dd316e778..7c653dd113b 100644
--- a/engine/Shopware/Components/Snippet/DatabaseHandler.php
+++ b/engine/Shopware/Components/Snippet/DatabaseHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Snippet;
@@ -160,7 +160,7 @@ public function dumpFromDatabase($snippetsDir, $localeName)
 
         $locale = $this->em->getRepository('Shopware\Models\Shop\Locale')->findOneByLocale($localeName);
         if (!$locale) {
-            throw new Exception(sprintf('Locale "%s" not found.', $localeName));
+            throw new Exception(\sprintf('Locale "%s" not found.', $localeName));
         }
 
         $outputAdapter = new Enlight_Config_Adapter_File([
diff --git a/engine/Shopware/Components/Snippet/DbAdapter.php b/engine/Shopware/Components/Snippet/DbAdapter.php
index 58baa78741b..45917a844a5 100644
--- a/engine/Shopware/Components/Snippet/DbAdapter.php
+++ b/engine/Shopware/Components/Snippet/DbAdapter.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Snippet;
diff --git a/engine/Shopware/Components/Snippet/Manager.php b/engine/Shopware/Components/Snippet/Manager.php
index 2623d8138fc..d5b4c8a85b7 100644
--- a/engine/Shopware/Components/Snippet/Manager.php
+++ b/engine/Shopware/Components/Snippet/Manager.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Model\ModelManager;
@@ -257,7 +256,7 @@ protected function initExtends()
         }
 
         // fallback to default shop, default language
-        // TODO SW-26555: this needs to be fixed, because it's wrong for non-english installations
+        // TODO SW-23512: this needs to be fixed, because it's wrong for non-english installations
         if ($locale->getId() !== 1) {
             $extends[] = [
                 1,
@@ -313,7 +312,7 @@ private function getPluginDirs(): array
                 );
 
                 foreach ($directories as $directory) {
-                    //check valid directory
+                    // check valid directory
                     if ($directory->isDot() || !$directory->isDir() || $directory->getFilename() === '_cache') {
                         continue;
                     }
@@ -340,7 +339,7 @@ private function getThemeDirs(?string $themeDir = null): array
         foreach (new DirectoryIterator(
             $themeDir
         ) as $directory) {
-            //check valid directory
+            // check valid directory
             if ($directory->isDot() || !$directory->isDir() || $directory->getFilename() === '_cache') {
                 continue;
             }
diff --git a/engine/Shopware/Components/Snippet/QueryHandler.php b/engine/Shopware/Components/Snippet/QueryHandler.php
index e7b28b91a75..11aac59fe1e 100644
--- a/engine/Shopware/Components/Snippet/QueryHandler.php
+++ b/engine/Shopware/Components/Snippet/QueryHandler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Snippet;
diff --git a/engine/Shopware/Components/Snippet/SnippetValidator.php b/engine/Shopware/Components/Snippet/SnippetValidator.php
index 2ad210b4ced..b4efb3e3b0f 100644
--- a/engine/Shopware/Components/Snippet/SnippetValidator.php
+++ b/engine/Shopware/Components/Snippet/SnippetValidator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Snippet;
@@ -51,7 +51,7 @@ public function __construct(Connection $db)
     public function validate($snippetsDir)
     {
         if (!file_exists($snippetsDir)) {
-            throw new RuntimeException(sprintf('Could not find %s folder for snippet validation', $snippetsDir));
+            throw new RuntimeException(\sprintf('Could not find %s folder for snippet validation', $snippetsDir));
         }
 
         $dirIterator = new RecursiveDirectoryIterator($snippetsDir, RecursiveDirectoryIterator::SKIP_DOTS);
@@ -95,7 +95,7 @@ public function validate($snippetsDir)
                 if (\array_key_exists('default', $data)) {
                     $invalidSnippets[] = '"Default" snippet group is deprecated (' . $entry->getRealPath() . ')';
                 } elseif ($diffGroups) {
-                    $invalidSnippets[] = sprintf(
+                    $invalidSnippets[] = \sprintf(
                         'Invalid snippet group(s): %s (%s)',
                         implode(', ', $diffGroups),
                         $entry->getRealPath()
diff --git a/engine/Shopware/Components/Snippet/Writer/DatabaseWriter.php b/engine/Shopware/Components/Snippet/Writer/DatabaseWriter.php
index eb7c36db185..17e2567e542 100644
--- a/engine/Shopware/Components/Snippet/Writer/DatabaseWriter.php
+++ b/engine/Shopware/Components/Snippet/Writer/DatabaseWriter.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Snippet\Writer;
@@ -74,14 +74,14 @@ public function write($data, $namespace, $localeId, $shopId)
             if (!$this->update) {
                 $this->insertBatch($data, $namespace, $localeId, $shopId);
             } else {
-                $rows = $this->db->fetchAll(
+                $rows = $this->db->fetchAllAssociative(
                     'SELECT * FROM s_core_snippets WHERE shopID = :shopId AND localeID = :localeId AND namespace = :namespace',
                     [
                         'shopId' => $shopId,
                         'localeId' => $localeId,
                         'namespace' => $namespace,
                     ]
-                );
+                ) ?: [];
 
                 foreach ($data as $name => $value) {
                     $row = null;
@@ -108,7 +108,7 @@ public function write($data, $namespace, $localeId, $shopId)
             $this->db->commit();
         } catch (Exception $e) {
             $this->db->rollBack();
-            throw new Exception(sprintf('An error occurred when importing namespace "%s" for locale "%s"', $namespace, $localeId), 0, $e);
+            throw new Exception(\sprintf('An error occurred when importing namespace "%s" for locale "%s"', $namespace, $localeId), 0, $e);
         }
     }
 
diff --git a/engine/Shopware/Components/Snippet/Writer/QueryWriter.php b/engine/Shopware/Components/Snippet/Writer/QueryWriter.php
index b1a9c668c50..e2562c280a2 100644
--- a/engine/Shopware/Components/Snippet/Writer/QueryWriter.php
+++ b/engine/Shopware/Components/Snippet/Writer/QueryWriter.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Snippet\Writer;
@@ -94,7 +94,7 @@ public function getUpdate()
         return $this->update;
     }
 
-    private function generateUpdateInsertQueries($data, $namespace, $localeId, $shopId)
+    private function generateUpdateInsertQueries($data, $namespace, $localeId, $shopId): void
     {
         foreach ($data as $name => $value) {
             $queryData = [
@@ -103,21 +103,21 @@ private function generateUpdateInsertQueries($data, $namespace, $localeId, $shop
                 'localeID' => $localeId,
                 'name' => '\'' . addslashes($name) . '\'',
                 'value' => '\'' . addslashes($value) . '\'',
-                'created' => '\'' . date('Y-m-d H:i:s', time()) . '\'',
-                'updated' => '\'' . date('Y-m-d H:i:s', time()) . '\'',
+                'created' => '\'' . date('Y-m-d H:i:s') . '\'',
+                'updated' => '\'' . date('Y-m-d H:i:s') . '\'',
                 'dirty' => 0,
             ];
 
             $updateData = [
-                'updated=IF(dirty = 1, updated, \'' . date('Y-m-d H:i:s', time()) . '\')',
+                'updated=IF(dirty = 1, updated, \'' . date('Y-m-d H:i:s') . '\')',
                 'value=IF(dirty = 1, value, \'' . addslashes($value) . '\')',
                 'dirty=IF(value = \'' . addslashes($value) . '\', 0, 1)',
             ];
 
             $this->queries[] = 'INSERT INTO s_core_snippets'
                 . ' (' . implode(', ', array_keys($queryData)) . ')'
-                . ' VALUES (' . implode(', ', array_values($queryData)) . ')'
-                . ' ON DUPLICATE KEY UPDATE ' . implode(', ', array_values($updateData)) . ';';
+                . ' VALUES (' . implode(', ', $queryData) . ')'
+                . ' ON DUPLICATE KEY UPDATE ' . implode(', ', $updateData) . ';';
         }
     }
 
@@ -136,14 +136,14 @@ private function generateInsertQueries($data, $namespace, $localeId, $shopId)
         $counter = 0;
         foreach ($data as $name => $value) {
             $queryData = [
-                    'namespace' => '\'' . addslashes($namespace) . '\'',
-                    'shopID' => $shopId,
-                    'localeID' => $localeId,
-                    'name' => '\'' . addslashes($name) . '\'',
-                    'value' => '\'' . addslashes($value) . '\'',
-                    'created' => '\'' . date('Y-m-d H:i:s', time()) . '\'',
-                    'updated' => '\'' . date('Y-m-d H:i:s', time()) . '\'',
-                    'dirty' => 0,
+                'namespace' => '\'' . addslashes($namespace) . '\'',
+                'shopID' => $shopId,
+                'localeID' => $localeId,
+                'name' => '\'' . addslashes($name) . '\'',
+                'value' => '\'' . addslashes($value) . '\'',
+                'created' => '\'' . date('Y-m-d H:i:s', time()) . '\'',
+                'updated' => '\'' . date('Y-m-d H:i:s', time()) . '\'',
+                'dirty' => 0,
             ];
 
             $values[] = '(' . implode(', ', array_values($queryData)) . ')';
diff --git a/engine/Shopware/Components/StateTranslatorService.php b/engine/Shopware/Components/StateTranslatorService.php
index b5a45ae774e..e326c328745 100644
--- a/engine/Shopware/Components/StateTranslatorService.php
+++ b/engine/Shopware/Components/StateTranslatorService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
@@ -62,8 +62,8 @@ public function translateState($type, array $state)
     {
         $type = strtolower($type);
 
-        if (!$this->availableTypes[$type]) {
-            throw new RuntimeException(sprintf('Invalid type \'%s\' given.', $type));
+        if (empty($this->availableTypes[$type])) {
+            throw new RuntimeException(\sprintf('Invalid type \'%s\' given.', $type));
         }
 
         $namespace = $this->availableTypes[$type];
diff --git a/engine/Shopware/Components/StateTranslatorServiceInterface.php b/engine/Shopware/Components/StateTranslatorServiceInterface.php
index d00c5bde7df..eda1484c1b8 100644
--- a/engine/Shopware/Components/StateTranslatorServiceInterface.php
+++ b/engine/Shopware/Components/StateTranslatorServiceInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
diff --git a/engine/Shopware/Components/StreamProtocolValidator.php b/engine/Shopware/Components/StreamProtocolValidator.php
index 88e47574458..49bccef71f6 100644
--- a/engine/Shopware/Components/StreamProtocolValidator.php
+++ b/engine/Shopware/Components/StreamProtocolValidator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
@@ -59,11 +59,11 @@ public function validate($url)
     {
         $urlArray = parse_url($url);
         if (!\is_array($urlArray)) {
-            throw new InvalidArgumentException(sprintf('Invalid stream URL "%s"', $url));
+            throw new InvalidArgumentException(\sprintf('Invalid stream URL "%s"', $url));
         }
 
         if (isset($urlArray['scheme']) && !\in_array($urlArray['scheme'], $this->allowedProtocols, true)) {
-            throw new InvalidArgumentException(sprintf("Invalid stream protocol '%s'", $urlArray['scheme']));
+            throw new InvalidArgumentException(\sprintf("Invalid stream protocol '%s'", $urlArray['scheme']));
         }
 
         return true;
diff --git a/engine/Shopware/Components/StreamProtocolValidatorInterface.php b/engine/Shopware/Components/StreamProtocolValidatorInterface.php
index 80810672f37..b811490ff41 100644
--- a/engine/Shopware/Components/StreamProtocolValidatorInterface.php
+++ b/engine/Shopware/Components/StreamProtocolValidatorInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
diff --git a/engine/Shopware/Components/StringCompiler.php b/engine/Shopware/Components/StringCompiler.php
index b89c2067632..a0af15a0f54 100644
--- a/engine/Shopware/Components/StringCompiler.php
+++ b/engine/Shopware/Components/StringCompiler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
@@ -28,7 +28,7 @@
 class Shopware_Components_StringCompiler
 {
     /**
-     * @var \Enlight_Template_Manager
+     * @var Enlight_Template_Manager
      */
     protected $view;
 
@@ -80,7 +80,7 @@ public function getContext()
     /**
      * Return View Object
      *
-     * @return \Enlight_Template_Manager
+     * @return Enlight_Template_Manager
      */
     public function getView()
     {
@@ -168,10 +168,10 @@ public function compileSmartyString($value, $context)
 
             if (stripos($errorMessage, 'Syntax Error in template') === 0) {
                 // Strip away filepath which is a md5sum
-                $errorMessage = sprintf('Syntax Error %s', substr($errorMessage, 69));
+                $errorMessage = \sprintf('Syntax Error %s', substr($errorMessage, 69));
             }
 
-            throw new \Enlight_Exception($errorMessage, 0, $e);
+            throw new Enlight_Exception($errorMessage, 0, $e);
         }
 
         return $template;
diff --git a/engine/Shopware/Components/Template/HtmlCompressorInterface.php b/engine/Shopware/Components/Template/HtmlCompressorInterface.php
index 3bfad787f9b..2cca94339f9 100644
--- a/engine/Shopware/Components/Template/HtmlCompressorInterface.php
+++ b/engine/Shopware/Components/Template/HtmlCompressorInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Template;
diff --git a/engine/Shopware/Components/Template/HtmlMinCompressor.php b/engine/Shopware/Components/Template/HtmlMinCompressor.php
index cf11685d79f..312e6e56535 100644
--- a/engine/Shopware/Components/Template/HtmlMinCompressor.php
+++ b/engine/Shopware/Components/Template/HtmlMinCompressor.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Template;
diff --git a/engine/Shopware/Components/Template/Security.php b/engine/Shopware/Components/Template/Security.php
index 77959ff4a36..31b7137fb38 100644
--- a/engine/Shopware/Components/Template/Security.php
+++ b/engine/Shopware/Components/Template/Security.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Template;
diff --git a/engine/Shopware/Components/TemplateMail.php b/engine/Shopware/Components/TemplateMail.php
index 1a7d8f5cd1d..e77115150a8 100644
--- a/engine/Shopware/Components/TemplateMail.php
+++ b/engine/Shopware/Components/TemplateMail.php
@@ -1,28 +1,29 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Bundle\MailBundle\Service\LogEntryBuilder;
+use Shopware\Bundle\MediaBundle\MediaServiceInterface;
 use Shopware\Components\Model\ModelManager;
 use Shopware\Models\Mail\Mail;
 use Shopware\Models\Shop\Shop;
@@ -43,12 +44,12 @@ class Shopware_Components_TemplateMail
     protected $modelManager;
 
     /**
-     * @var \Shopware_Components_Translation
+     * @var Shopware_Components_Translation
      */
     protected $translationReader;
 
     /**
-     * @var \Shopware_Components_StringCompiler
+     * @var Shopware_Components_StringCompiler
      */
     protected $stringCompiler;
 
@@ -78,7 +79,7 @@ class Shopware_Components_TemplateMail
     ];
 
     /**
-     * @return \Shopware_Components_TemplateMail
+     * @return Shopware_Components_TemplateMail
      */
     public function setModelManager(ModelManager $modelManager)
     {
@@ -98,7 +99,7 @@ public function getModelManager()
     /**
      * @param Shop $shop
      *
-     * @return \Shopware_Components_TemplateMail
+     * @return Shopware_Components_TemplateMail
      */
     public function setShop($shop)
     {
@@ -116,23 +117,23 @@ public function getShop()
     }
 
     /**
-     * @throws \Exception
+     * @throws Exception
      *
-     * @return \Shopware_Components_Translation
+     * @return Shopware_Components_Translation
      */
     public function getTranslationReader()
     {
         if ($this->translationReader === null) {
-            $this->translationReader = Shopware()->Container()->get(\Shopware_Components_Translation::class);
+            $this->translationReader = Shopware()->Container()->get(Shopware_Components_Translation::class);
         }
 
         return $this->translationReader;
     }
 
     /**
-     * @param \Shopware_Components_Translation $translationReader
+     * @param Shopware_Components_Translation $translationReader
      *
-     * @return \Shopware_Components_TemplateMail
+     * @return Shopware_Components_TemplateMail
      */
     public function setTranslationReader($translationReader)
     {
@@ -142,7 +143,7 @@ public function setTranslationReader($translationReader)
     }
 
     /**
-     * @return \Shopware_Components_TemplateMail
+     * @return Shopware_Components_TemplateMail
      */
     public function setStringCompiler(Shopware_Components_StringCompiler $stringCompiler)
     {
@@ -152,7 +153,7 @@ public function setStringCompiler(Shopware_Components_StringCompiler $stringComp
     }
 
     /**
-     * @return \Shopware_Components_StringCompiler
+     * @return Shopware_Components_StringCompiler
      */
     public function getStringCompiler()
     {
@@ -165,9 +166,9 @@ public function getStringCompiler()
      * @param Shop        $shop
      * @param array       $overrideConfig
      *
-     * @throws \Enlight_Exception
+     * @throws Enlight_Exception
      *
-     * @return \Enlight_Components_Mail
+     * @return Enlight_Components_Mail
      */
     public function createMail($mailModel, $context = [], $shop = null, $overrideConfig = [])
     {
@@ -177,12 +178,11 @@ public function createMail($mailModel, $context = [], $shop = null, $overrideCon
 
         if (!($mailModel instanceof Mail)) {
             $modelName = $mailModel;
-            /** @var Mail|null $mailModel */
             $mailModel = $this->getModelManager()->getRepository(Mail::class)->findOneBy(
                 ['name' => $modelName]
             );
-            if (!$mailModel) {
-                throw new \Enlight_Exception(sprintf('Mail-Template with name "%s" could not be found.', $modelName));
+            if (!$mailModel instanceof Mail) {
+                throw new Enlight_Exception(\sprintf('Mail-Template with name "%s" could not be found.', $modelName));
             }
         }
 
@@ -258,9 +258,9 @@ public function createMail($mailModel, $context = [], $shop = null, $overrideCon
      *
      * @param array $overrideConfig
      *
-     * @throws \Enlight_Exception
+     * @throws Enlight_Exception
      *
-     * @return \Enlight_Components_Mail
+     * @return Enlight_Components_Mail
      */
     public function loadValues(Enlight_Components_Mail $mail, Mail $mailModel, $overrideConfig = [])
     {
@@ -296,14 +296,13 @@ public function loadValues(Enlight_Components_Mail $mail, Mail $mailModel, $over
             $mail->setBodyHtml($stringCompiler->compileString($mailModel->getContentHtml()));
         }
 
-        /** @var \Shopware\Models\Mail\Attachment $attachment */
         foreach ($mailModel->getAttachments() as $attachment) {
             if ($attachment->getShopId() !== null
                 && ($this->getShop() === null || $attachment->getShopId() !== $this->getShop()->getId())) {
                 continue;
             }
 
-            $mediaService = Shopware()->Container()->get(\Shopware\Bundle\MediaBundle\MediaServiceInterface::class);
+            $mediaService = Shopware()->Container()->get(MediaServiceInterface::class);
             if (!$mediaService->has($attachment->getPath())) {
                 Shopware()->Container()->get('corelogger')->error('Could not load file: ' . $attachment->getPath());
             } else {
diff --git a/engine/Shopware/Components/Theme.php b/engine/Shopware/Components/Theme.php
index 718817f0581..48305e36cba 100644
--- a/engine/Shopware/Components/Theme.php
+++ b/engine/Shopware/Components/Theme.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
@@ -33,6 +33,7 @@
 use Shopware\Components\Form\Field\Date;
 use Shopware\Components\Form\Field\Em;
 use Shopware\Components\Form\Field\Media;
+use Shopware\Components\Form\Field\NoUrl;
 use Shopware\Components\Form\Field\Number;
 use Shopware\Components\Form\Field\Percent;
 use Shopware\Components\Form\Field\Pixel;
@@ -567,4 +568,19 @@ protected function createTextAreaField($name, $label, $defaultValue, array $opti
 
         return $element;
     }
+
+    /**
+     * Creates a custom no URL text field.
+     *
+     * @param array<string, string> $options
+     */
+    protected function createNoUrlField(string $name, string $label, string $defaultValue, array $options = []): NoUrl
+    {
+        $element = new NoUrl($name);
+        $element->fromArray($options);
+        $element->setLabel($label);
+        $element->setDefaultValue($defaultValue);
+
+        return $element;
+    }
 }
diff --git a/engine/Shopware/Components/Theme/Compiler.php b/engine/Shopware/Components/Theme/Compiler.php
index 2fb5cee1883..e5987fc42e7 100644
--- a/engine/Shopware/Components/Theme/Compiler.php
+++ b/engine/Shopware/Components/Theme/Compiler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Theme;
@@ -35,8 +35,8 @@
 use Shopware\Bundle\PluginInstallerBundle\Service\UniqueIdGeneratorInterface;
 use Shopware\Components\ShopwareReleaseStruct;
 use Shopware\Components\Theme\Compressor\CompressorInterface;
-use Shopware\Components\Theme\Compressor\Js;
-use Shopware\Models\Shop;
+use Shopware\Models\Shop\Shop;
+use Shopware\Models\Shop\Template;
 use SplFileInfo;
 use SplFileObject;
 
@@ -46,71 +46,32 @@
  */
 class Compiler
 {
-    /**
-     * @var string
-     */
-    private $rootDir;
+    private string $rootDir;
 
-    /**
-     * @var LessCompiler
-     */
-    private $compiler;
+    private LessCompiler $compiler;
 
-    /**
-     * @var PathResolver
-     */
-    private $pathResolver;
+    private PathResolver $pathResolver;
 
-    /**
-     * @var Inheritance
-     */
-    private $inheritance;
+    private Inheritance $inheritance;
 
-    /**
-     * @var Enlight_Event_EventManager
-     */
-    private $eventManager;
+    private Enlight_Event_EventManager $eventManager;
 
-    /**
-     * @var CompressorInterface
-     */
-    private $jsCompressor;
+    private CompressorInterface $jsCompressor;
 
-    /**
-     * @var Service
-     */
-    private $service;
+    private Service $service;
 
-    /**
-     * @var TimestampPersistor
-     */
-    private $timestampPersistor;
+    private TimestampPersistor $timestampPersistor;
 
-    /**
-     * @var LessCollector
-     */
-    private $lessCollector;
+    private LessCollector $lessCollector;
 
-    /**
-     * @var JavascriptCollector
-     */
-    private $javascriptCollector;
+    private JavascriptCollector $javascriptCollector;
 
-    /**
-     * @var ShopwareReleaseStruct
-     */
-    private $release;
+    private ShopwareReleaseStruct $release;
 
-    /**
-     * @var UniqueIdGeneratorInterface
-     */
-    private $uniqueIdGenerator;
+    private UniqueIdGeneratorInterface $uniqueIdGenerator;
 
-    /**
-     * @param string $rootDir
-     */
     public function __construct(
-        $rootDir,
+        string $rootDir,
         LessCompiler $compiler,
         PathResolver $pathResolver,
         Inheritance $inheritance,
@@ -149,8 +110,10 @@ public function __construct(
      * The function is called when the template cache is cleared.
      *
      * @throws Exception
+     *
+     * @return void
      */
-    public function compile(Shop\Shop $shop)
+    public function compile(Shop $shop)
     {
         if ($shop->getMain()) {
             $shop = $shop->getMain();
@@ -166,7 +129,10 @@ public function compile(Shop\Shop $shop)
         $this->clearThemeCache($shop, $old);
     }
 
-    public function recompile(Shop\Shop $shop)
+    /**
+     * @return void
+     */
+    public function recompile(Shop $shop)
     {
         if ($shop->getMain()) {
             $shop = $shop->getMain();
@@ -183,7 +149,7 @@ public function recompile(Shop\Shop $shop)
      *
      * @return Configuration
      */
-    public function getThemeConfiguration(Shop\Shop $shop)
+    public function getThemeConfiguration(Shop $shop)
     {
         $less = $this->lessCollector->collectLessDefinitions($shop->getTemplate(), $shop);
         $js = $this->javascriptCollector->collectJavascriptFiles($shop->getTemplate(), $shop);
@@ -231,8 +197,10 @@ public function getThemeConfiguration(Shop\Shop $shop)
      * @param string $timestamp
      *
      * @throws Exception
+     *
+     * @return void
      */
-    public function compileLess($timestamp, Shop\Template $template, Shop\Shop $shop)
+    public function compileLess($timestamp, Template $template, Shop $shop)
     {
         if ($shop->getMain()) {
             $shop = $shop->getMain();
@@ -243,10 +211,10 @@ public function compileLess($timestamp, Shop\Template $template, Shop\Shop $shop
         $dir = \dirname($file);
         if (!is_dir($dir)) {
             if (@mkdir($dir, 0777, true) === false && !is_dir($dir)) {
-                throw new RuntimeException(sprintf("Unable to create the %s directory (%s)\n", 'web', $dir));
+                throw new RuntimeException(\sprintf("Unable to create the %s directory (%s)\n", 'web', $dir));
             }
         } elseif (!is_writable($dir)) {
-            throw new RuntimeException(sprintf("Unable to write in the %s directory (%s)\n", 'web', $dir));
+            throw new RuntimeException(\sprintf("Unable to write in the %s directory (%s)\n", 'web', $dir));
         }
 
         $file = new SplFileObject($file, 'w');
@@ -286,8 +254,10 @@ public function compileLess($timestamp, Shop\Template $template, Shop\Shop $shop
      * @param string $timestamp
      *
      * @throws Exception
+     *
+     * @return void
      */
-    public function compileJavascript($timestamp, Shop\Template $template, Shop\Shop $shop)
+    public function compileJavascript($timestamp, Template $template, Shop $shop)
     {
         if ($shop->getMain()) {
             $shop = $shop->getMain();
@@ -326,15 +296,17 @@ public function compileJavascript($timestamp, Shop\Template $template, Shop\Shop
      *
      * @return string
      */
-    public function getThemeTimestamp(Shop\Shop $shop)
+    public function getThemeTimestamp(Shop $shop)
     {
         return $this->timestampPersistor->getCurrentTimestamp($shop->getId());
     }
 
     /**
      * @param int $timestamp
+     *
+     * @return void
      */
-    public function createThemeTimestamp(Shop\Shop $shop, $timestamp)
+    public function createThemeTimestamp(Shop $shop, $timestamp)
     {
         $this->timestampPersistor->updateTimestamp($shop->getId(), $timestamp);
     }
@@ -344,8 +316,10 @@ public function createThemeTimestamp(Shop\Shop $shop, $timestamp)
      * Removes all assets and timestamp files
      *
      * @param int $timestamp
+     *
+     * @return void
      */
-    public function clearThemeCache(Shop\Shop $shop, $timestamp)
+    public function clearThemeCache(Shop $shop, $timestamp)
     {
         if ($shop->getMain()) {
             $shop = $shop->getMain();
@@ -365,7 +339,7 @@ public function clearThemeCache(Shop\Shop $shop, $timestamp)
      *
      * @throws Enlight_Event_Exception
      */
-    private function compileLessDefinition(Shop\Shop $shop, LessDefinition $definition)
+    private function compileLessDefinition(Shop $shop, LessDefinition $definition): void
     {
         // Set unique import directory for less @import commands
         if ($definition->getImportDirectory()) {
@@ -395,7 +369,7 @@ private function compileLessDefinition(Shop\Shop $shop, LessDefinition $definiti
                 continue;
             }
 
-            // Creates the url for the compiler, this url will be prepend to each relative path.
+            // Creates the url for the compiler, this url will be prepended to each relative path.
             // The url is additionally used for the source map generation.
             $url = $this->formatPathToUrl($file);
 
@@ -412,14 +386,13 @@ private function compileLessDefinition(Shop\Shop $shop, LessDefinition $definiti
      * to allow plugins to override the theme configuration.
      *
      * @throws Exception
-     *
-     * @return array
      */
-    private function getConfig(Shop\Template $template, Shop\Shop $shop)
+    private function getConfig(Template $template, Shop $shop): array
     {
         $config = $this->inheritance->buildConfig($template, $shop);
         $config['shopware-revision'] = md5($this->release->getRevision() . $this->uniqueIdGenerator->getUniqueId());
 
+        /** @var ArrayCollection<int, mixed> $collection */
         $collection = new ArrayCollection();
 
         $this->eventManager->collect(
@@ -430,7 +403,7 @@ private function getConfig(Shop\Template $template, Shop\Shop $shop)
 
         foreach ($collection as $temp) {
             if (!\is_array($temp)) {
-                throw new Exception('The passed plugin less config isn\'t an array!');
+                throw new Exception("The passed plugin less config isn't an array!");
             }
             $config = array_merge($config, $temp);
         }
@@ -442,10 +415,8 @@ private function getConfig(Shop\Template $template, Shop\Shop $shop)
      * Builds the configuration for the less compiler class.
      *
      * @throws Enlight_Event_Exception
-     *
-     * @return array
      */
-    private function getCompilerConfiguration(Shop\Shop $shop)
+    private function getCompilerConfiguration(Shop $shop): array
     {
         $settings = $this->service->getSystemConfiguration(
             AbstractQuery::HYDRATE_OBJECT
@@ -465,7 +436,7 @@ private function getCompilerConfiguration(Shop\Shop $shop)
             ];
         }
 
-        $config = $this->eventManager->filter(
+        return $this->eventManager->filter(
             'Theme_Compiler_Configure',
             $config,
             [
@@ -473,20 +444,14 @@ private function getCompilerConfiguration(Shop\Shop $shop)
                 'settings' => $settings,
             ]
         );
-
-        return $config;
     }
 
     /**
      * Helper function which creates a url for the passed directory/file path.
      * This urls are used for the less compiler, to create the source map
      * and to prepend this url for each relative path.
-     *
-     * @param string $path
-     *
-     * @return string
      */
-    private function formatPathToUrl($path)
+    private function formatPathToUrl(string $path): string
     {
         // Path normalizing
         $path = str_replace([$this->rootDir, '//'], ['', '/'], $path);
@@ -498,7 +463,7 @@ private function formatPathToUrl($path)
      * Helper function to clear the theme cache directory
      * before the new css and js files are compiled.
      */
-    private function clearDirectory(array $names = [])
+    private function clearDirectory(array $names = []): void
     {
         $dir = $this->pathResolver->getCacheDirectory();
 
@@ -533,12 +498,9 @@ private function clearDirectory(array $names = [])
     }
 
     /**
-     * @param string   $original
-     * @param string[] $names
-     *
-     * @return bool
+     * @param array<string> $names
      */
-    private function fileNameMatch($original, $names)
+    private function fileNameMatch(string $original, array $names): bool
     {
         foreach ($names as $name) {
             if (strpos($original, $name) !== false) {
diff --git a/engine/Shopware/Components/Theme/Compressor/CompressorInterface.php b/engine/Shopware/Components/Theme/Compressor/CompressorInterface.php
index 7602ea2ec54..cd5699f143d 100644
--- a/engine/Shopware/Components/Theme/Compressor/CompressorInterface.php
+++ b/engine/Shopware/Components/Theme/Compressor/CompressorInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Theme\Compressor;
diff --git a/engine/Shopware/Components/Theme/Compressor/Js.php b/engine/Shopware/Components/Theme/Compressor/Js.php
index f4b9aa2eb4d..df959142c8d 100644
--- a/engine/Shopware/Components/Theme/Compressor/Js.php
+++ b/engine/Shopware/Components/Theme/Compressor/Js.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Theme\Compressor;
diff --git a/engine/Shopware/Components/Theme/ConfigSet.php b/engine/Shopware/Components/Theme/ConfigSet.php
index 45f888d0409..3e4b4241954 100644
--- a/engine/Shopware/Components/Theme/ConfigSet.php
+++ b/engine/Shopware/Components/Theme/ConfigSet.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Theme;
@@ -141,7 +141,7 @@ public function validate()
             throw new Exception('Each config set requires a configured name!');
         }
         if (!$this->values || !\is_array($this->values)) {
-            throw new Exception(sprintf('Config set %s defined without values array.', $this->name));
+            throw new Exception(\sprintf('Config set %s defined without values array.', $this->name));
         }
     }
 }
diff --git a/engine/Shopware/Components/Theme/Configuration.php b/engine/Shopware/Components/Theme/Configuration.php
index 0cb69f479dc..1e8d99b6941 100644
--- a/engine/Shopware/Components/Theme/Configuration.php
+++ b/engine/Shopware/Components/Theme/Configuration.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Theme;
diff --git a/engine/Shopware/Components/Theme/Configurator.php b/engine/Shopware/Components/Theme/Configurator.php
index 35b9a88b26f..0e296a0a183 100644
--- a/engine/Shopware/Components/Theme/Configurator.php
+++ b/engine/Shopware/Components/Theme/Configurator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Theme;
@@ -111,18 +111,18 @@ public function __construct(
      */
     public function synchronize(Theme $theme)
     {
-        //prevents the theme configuration lazy loading
+        // prevents the theme configuration lazy loading
         $template = $this->getTemplate($theme);
         if (!$template instanceof Template) {
-            $this->logger->error(sprintf('Could not synchronize theme. "%s" instance for theme "%s" not found', Template::class, $theme->getName()));
+            $this->logger->error(\sprintf('Could not synchronize theme. "%s" instance for theme "%s" not found', Template::class, $theme->getName()));
 
             return;
         }
 
-        //static main container which generated for each theme configuration.
+        // static main container which generated for each theme configuration.
         $container = new TabContainer('main_container');
 
-        //inject the inheritance config container.
+        // inject the inheritance config container.
         $this->injectConfig($theme, $container);
 
         $this->eventManager->notify('Theme_Configurator_Container_Injected', [
@@ -141,7 +141,7 @@ public function synchronize(Theme $theme)
             'container' => $container,
         ]);
 
-        //use the theme persister class to write the Shopware\Components\Form elements into the database
+        // use the theme persister class to write the Shopware\Components\Form elements into the database
         $this->persister->save($container, $template);
 
         $this->eventManager->notify('Theme_Configurator_Theme_Config_Saved', [
@@ -172,17 +172,17 @@ public function synchronize(Theme $theme)
      */
     private function validateConfig(Container $container): void
     {
-        //check if the container implements the validation interface
+        // check if the container implements the validation interface
         if ($container instanceof Validate) {
             $container->validate();
         }
 
         foreach ($container->getElements() as $element) {
-            //check recursive validation.
+            // check recursive validation.
             if ($element instanceof Container) {
                 $this->validateConfig($element);
 
-            //check Form\Field validation
+            // check Form\Field validation
             } elseif ($element instanceof Validate) {
                 $element->validate();
             }
@@ -206,7 +206,7 @@ private function synchronizeSets(Theme $theme, Template $template): void
         // Iterates all configurations sets of the file system
         foreach ($collection as $item) {
             if (!$item instanceof ConfigSet) {
-                throw new Exception(sprintf("Theme %s adds a configuration set which isn't an instance of Shopware\Components\Theme\ConfigSet.", $theme->getTemplate()));
+                throw new Exception(\sprintf("Theme %s adds a configuration set which isn't an instance of Shopware\Components\Theme\ConfigSet.", $theme->getTemplate()));
             }
 
             $item->validate();
@@ -239,9 +239,9 @@ private function synchronizeSets(Theme $theme, Template $template): void
             $synchronized[] = $existing;
         }
 
-        //iterates all sets of the template, file system and database
+        // iterates all sets of the template, file system and database
         foreach ($template->getConfigSets() as $existing) {
-            //check if the current set was synchronized in the foreach before
+            // check if the current set was synchronized in the foreach before
             $defined = $this->getExistingConfigSet(
                 new ArrayCollection($synchronized),
                 $existing->getName()
@@ -251,7 +251,7 @@ private function synchronizeSets(Theme $theme, Template $template): void
                 continue;
             }
 
-            //if it wasn't synchronized, the file system theme want to remove the set.
+            // if it wasn't synchronized, the file system theme want to remove the set.
             $this->entityManager->remove($existing);
         }
 
@@ -436,7 +436,7 @@ private function injectConfig(Theme $theme, TabContainer $container): void
             return;
         }
 
-        //get Theme.php instance of the parent template
+        // get Theme.php instance of the parent template
         $parent = $this->util->getThemeByTemplate(
             $template->getParent()
         );
diff --git a/engine/Shopware/Components/Theme/DBALTimestampPersistor.php b/engine/Shopware/Components/Theme/DBALTimestampPersistor.php
index 23fad631111..6f7321154bc 100644
--- a/engine/Shopware/Components/Theme/DBALTimestampPersistor.php
+++ b/engine/Shopware/Components/Theme/DBALTimestampPersistor.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Theme;
diff --git a/engine/Shopware/Components/Theme/EventListener/BackendTheme.php b/engine/Shopware/Components/Theme/EventListener/BackendTheme.php
index 12f54424e8f..0fc03678345 100644
--- a/engine/Shopware/Components/Theme/EventListener/BackendTheme.php
+++ b/engine/Shopware/Components/Theme/EventListener/BackendTheme.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Theme\EventListener;
diff --git a/engine/Shopware/Components/Theme/EventListener/ConfigLoader.php b/engine/Shopware/Components/Theme/EventListener/ConfigLoader.php
index e76ee44f12e..48a4a1bffc6 100644
--- a/engine/Shopware/Components/Theme/EventListener/ConfigLoader.php
+++ b/engine/Shopware/Components/Theme/EventListener/ConfigLoader.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Theme\EventListener;
diff --git a/engine/Shopware/Components/Theme/Generator.php b/engine/Shopware/Components/Theme/Generator.php
index 7dd99fc7889..6d0d4115e1c 100644
--- a/engine/Shopware/Components/Theme/Generator.php
+++ b/engine/Shopware/Components/Theme/Generator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Theme;
@@ -190,14 +190,12 @@ public function __construct(PathResolver $pathResolver, Filesystem $fileSystem,
      * Function which generates a new shopware theme
      * into the engine/Shopware/Themes directory.
      *
-     * @param Template $parent
-     *
      * @throws Exception
      */
-    public function generateTheme(array $data, Template $parent = null)
+    public function generateTheme(array $data, ?Template $parent = null)
     {
         if (!is_writable($this->pathResolver->getFrontendThemeDirectory())) {
-            throw new Exception(sprintf('Theme directory %s isn\'t writable', $this->pathResolver->getFrontendThemeDirectory()));
+            throw new Exception(\sprintf('Theme directory %s isn\'t writable', $this->pathResolver->getFrontendThemeDirectory()));
         }
         if (!isset($data['template']) || empty($data['template'])) {
             throw new Exception('Passed data array contains no valid theme name under the array key "template".');
@@ -273,10 +271,8 @@ private function getThemeDirectory($name)
 
     /**
      * Generates the Theme.php file for the theme.
-     *
-     * @param Template $parent
      */
-    private function generateThemePhp(array $data, Template $parent = null)
+    private function generateThemePhp(array $data, ?Template $parent = null)
     {
         $source = str_replace('$TEMPLATE$', $data['template'], $this->phpSource);
 
diff --git a/engine/Shopware/Components/Theme/Inheritance.php b/engine/Shopware/Components/Theme/Inheritance.php
index 347f2c9e8dd..e6e346fc8e3 100644
--- a/engine/Shopware/Components/Theme/Inheritance.php
+++ b/engine/Shopware/Components/Theme/Inheritance.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Theme;
@@ -370,7 +370,7 @@ private function parseConfig(array $config, bool $lessCompatible = true): array
             return [];
         }
 
-        //creates a key value array for the configuration.
+        // creates a key value array for the configuration.
         $combinedArray = array_combine(
             array_column($config, 'name'),
             array_column($config, 'value')
diff --git a/engine/Shopware/Components/Theme/Installer.php b/engine/Shopware/Components/Theme/Installer.php
index c685177df7d..1ef2418ab68 100644
--- a/engine/Shopware/Components/Theme/Installer.php
+++ b/engine/Shopware/Components/Theme/Installer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Theme;
@@ -32,7 +32,6 @@
 use Shopware\Components\Snippet\DatabaseHandler;
 use Shopware\Components\Theme;
 use Shopware\Models\Plugin\Plugin;
-use Shopware\Models\Shop;
 use Shopware\Models\Shop\Template;
 
 /**
@@ -164,14 +163,12 @@ private function synchronizeThemes()
      * Helper function which iterates the engine\Shopware\Themes directory
      * and registers all stored themes within the directory as \Shopware\Models\Shop\Template.
      *
-     * @param \Shopware\Models\Plugin\Plugin $plugin
-     *
      * @throws \Doctrine\ORM\OptimisticLockException
      * @throws \Doctrine\ORM\ORMInvalidArgumentException
      *
      * @return Theme[]
      */
-    private function synchronizeThemeDirectories(DirectoryIterator $directories, Plugin $plugin = null)
+    private function synchronizeThemeDirectories(DirectoryIterator $directories, ?Plugin $plugin = null)
     {
         $themes = [];
 
@@ -267,7 +264,7 @@ private function synchronizePluginThemes()
                 continue;
             }
 
-            //merge the plugin themes into the already detected plugin themes.
+            // merge the plugin themes into the already detected plugin themes.
             $themes = array_merge($themes, $pluginThemes);
 
             $this->entityManager->flush();
@@ -365,14 +362,14 @@ private function setParents(array $themes)
                 'template' => $theme->getTemplate(),
             ]);
             if (!$template instanceof Template) {
-                throw new Exception(sprintf('Template of theme %s not found', $theme->getTemplate()));
+                throw new Exception(\sprintf('Template of theme %s not found', $theme->getTemplate()));
             }
 
             $parent = $this->repository->findOneBy([
                 'template' => $theme->getExtend(),
             ]);
             if (!$parent instanceof Template) {
-                throw new Exception(sprintf('Parent %s of theme %s not found', $theme->getExtend(), $theme->getTemplate()));
+                throw new Exception(\sprintf('Parent %s of theme %s not found', $theme->getExtend(), $theme->getTemplate()));
             }
 
             $template->setParent($parent);
diff --git a/engine/Shopware/Components/Theme/JavascriptCollector.php b/engine/Shopware/Components/Theme/JavascriptCollector.php
index ec136a3543b..e0015656e84 100644
--- a/engine/Shopware/Components/Theme/JavascriptCollector.php
+++ b/engine/Shopware/Components/Theme/JavascriptCollector.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Theme;
@@ -142,7 +142,7 @@ private function collectPluginJavascript(Shop\Shop $shop, Shop\Template $templat
 
         foreach ($collection as $file) {
             if (!file_exists($file)) {
-                throw new Exception(sprintf('Some plugin tries to compress a javascript file, but the file %s doesn\'t exist', $file));
+                throw new Exception(\sprintf('Some plugin tries to compress a javascript file, but the file %s doesn\'t exist', $file));
             }
         }
 
diff --git a/engine/Shopware/Components/Theme/JavascriptDefinition.php b/engine/Shopware/Components/Theme/JavascriptDefinition.php
index 86f89b53fb8..489ff89c29a 100644
--- a/engine/Shopware/Components/Theme/JavascriptDefinition.php
+++ b/engine/Shopware/Components/Theme/JavascriptDefinition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Theme;
@@ -41,10 +41,7 @@ class JavascriptDefinition
      * @var Theme */
     private $theme;
 
-    /**
-     * @param Theme $theme
-     */
-    public function __construct(array $files = [], Theme $theme = null)
+    public function __construct(array $files = [], ?Theme $theme = null)
     {
         $this->files = $files;
         $this->theme = $theme;
diff --git a/engine/Shopware/Components/Theme/LessCollector.php b/engine/Shopware/Components/Theme/LessCollector.php
index dab919c5da8..3a89a5d801f 100644
--- a/engine/Shopware/Components/Theme/LessCollector.php
+++ b/engine/Shopware/Components/Theme/LessCollector.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Theme;
diff --git a/engine/Shopware/Components/Theme/LessCompiler.php b/engine/Shopware/Components/Theme/LessCompiler.php
index b90727e1281..8193d116903 100644
--- a/engine/Shopware/Components/Theme/LessCompiler.php
+++ b/engine/Shopware/Components/Theme/LessCompiler.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Theme;
diff --git a/engine/Shopware/Components/Theme/LessCompiler/Oyejorge.php b/engine/Shopware/Components/Theme/LessCompiler/Oyejorge.php
index 60821fe4c57..f6ace03288a 100644
--- a/engine/Shopware/Components/Theme/LessCompiler/Oyejorge.php
+++ b/engine/Shopware/Components/Theme/LessCompiler/Oyejorge.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Theme\LessCompiler;
diff --git a/engine/Shopware/Components/Theme/LessDefinition.php b/engine/Shopware/Components/Theme/LessDefinition.php
index f7a853731f5..3192686c5db 100644
--- a/engine/Shopware/Components/Theme/LessDefinition.php
+++ b/engine/Shopware/Components/Theme/LessDefinition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Theme;
@@ -104,7 +104,7 @@ class LessDefinition
      * @param string|null $importDirectory Full path to the import directory for less `@import` commands
      * @param Theme|null  $theme           the corresponding theme
      */
-    public function __construct(array $config = [], array $files = [], $importDirectory = null, Theme $theme = null)
+    public function __construct(array $config = [], array $files = [], $importDirectory = null, ?Theme $theme = null)
     {
         $this->config = $config;
         $this->files = $files;
diff --git a/engine/Shopware/Components/Theme/PathResolver.php b/engine/Shopware/Components/Theme/PathResolver.php
index 66a7af62def..efeec620fda 100644
--- a/engine/Shopware/Components/Theme/PathResolver.php
+++ b/engine/Shopware/Components/Theme/PathResolver.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Theme;
diff --git a/engine/Shopware/Components/Theme/Service.php b/engine/Shopware/Components/Theme/Service.php
index 0403477eefd..fb33edacdb8 100644
--- a/engine/Shopware/Components/Theme/Service.php
+++ b/engine/Shopware/Components/Theme/Service.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Theme;
@@ -123,11 +123,9 @@ public function saveSystemConfiguration($data)
      * If a shop instance passed, the function selects additionally the
      * element values of the passed shop.
      *
-     * @param Shop $shop
-     *
      * @return array
      */
-    public function getLayout(Template $template, Shop $shop = null)
+    public function getLayout(Template $template, ?Shop $shop = null)
     {
         $layout = $this->buildConfigLayout(
             $template,
@@ -149,12 +147,11 @@ public function getLayout(Template $template, Shop $shop = null)
      * will also be returned.
      * If provided, only option in $optionNames will be returned
      *
-     * @param Shop  $shop
      * @param array $optionNames
      *
      * @return array
      */
-    public function getConfig(Template $template, Shop $shop = null, $optionNames = null)
+    public function getConfig(Template $template, ?Shop $shop = null, $optionNames = null)
     {
         $builder = $this->entityManager->createQueryBuilder();
         $builder->select([
@@ -425,7 +422,7 @@ protected function translateContainer(array $container, Template $template, Enli
      */
     protected function buildConfigLayout(
         Template $template,
-        Shop $shop = null,
+        ?Shop $shop = null,
         $parentId = null
     ) {
         $builder = $this->entityManager->createQueryBuilder();
diff --git a/engine/Shopware/Components/Theme/TimestampPersistor.php b/engine/Shopware/Components/Theme/TimestampPersistor.php
index 443dd48b776..c95c22e853e 100644
--- a/engine/Shopware/Components/Theme/TimestampPersistor.php
+++ b/engine/Shopware/Components/Theme/TimestampPersistor.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Theme;
diff --git a/engine/Shopware/Components/Theme/Util.php b/engine/Shopware/Components/Theme/Util.php
index b51a8e930d8..5bf2dc46e26 100644
--- a/engine/Shopware/Components/Theme/Util.php
+++ b/engine/Shopware/Components/Theme/Util.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Theme;
@@ -87,7 +87,7 @@ public function getThemeByTemplate(Template $template)
         $file = $directory . DIRECTORY_SEPARATOR . 'Theme.php';
 
         if (!file_exists($file)) {
-            throw new Exception(sprintf('Theme directory %s contains no Theme.php', $directory));
+            throw new Exception(\sprintf('Theme directory %s contains no Theme.php', $directory));
         }
 
         require_once $file;
@@ -112,13 +112,13 @@ public function getThemeByDirectory(DirectoryIterator $directory)
         $file = $directory->getPathname() . DIRECTORY_SEPARATOR . 'Theme.php';
 
         if (!file_exists($file)) {
-            throw new Exception(sprintf('Theme directory %s contains no Theme.php', $directory->getPathname()));
+            throw new Exception(\sprintf('Theme directory %s contains no Theme.php', $directory->getPathname()));
         }
 
         require_once $file;
 
         if (!class_exists($class)) {
-            throw new Exception(sprintf('Theme file %s contains unexpected class %s', $file, $class));
+            throw new Exception(\sprintf('Theme file %s contains unexpected class %s', $file, $class));
         }
 
         return new $class();
diff --git a/engine/Shopware/Components/Thumbnail/Generator/Basic.php b/engine/Shopware/Components/Thumbnail/Generator/Basic.php
index 2d84735dd3f..70f64939a05 100644
--- a/engine/Shopware/Components/Thumbnail/Generator/Basic.php
+++ b/engine/Shopware/Components/Thumbnail/Generator/Basic.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Thumbnail\Generator;
@@ -39,24 +39,15 @@
  */
 class Basic implements GeneratorInterface
 {
-    /**
-     * @var bool
-     */
-    private $fixGdImageBlur;
+    private bool $fixGdImageBlur;
 
-    /**
-     * @var MediaServiceInterface
-     */
-    private $mediaService;
+    private MediaServiceInterface $mediaService;
 
-    /**
-     * @var OptimizerServiceInterface
-     */
-    private $optimizerService;
+    private OptimizerServiceInterface $optimizerService;
 
     public function __construct(Shopware_Components_Config $config, MediaServiceInterface $mediaService, OptimizerServiceInterface $optimizerService)
     {
-        $this->fixGdImageBlur = $config->get('thumbnailNoiseFilter');
+        $this->fixGdImageBlur = (bool) $config->get('thumbnailNoiseFilter');
         $this->mediaService = $mediaService;
         $this->optimizerService = $optimizerService;
     }
@@ -71,12 +62,12 @@ public function createThumbnail($imagePath, $destination, $maxWidth, $maxHeight,
         $quality = (int) $quality;
 
         if (!$this->mediaService->has($imagePath)) {
-            throw new RuntimeException(sprintf('File not found: %s', $imagePath));
+            throw new RuntimeException(\sprintf('File not found: %s', $imagePath));
         }
 
         $content = $this->mediaService->read($imagePath);
         if (!\is_string($content)) {
-            throw new RuntimeException(sprintf('Could not read image from file: %s', $imagePath));
+            throw new RuntimeException(\sprintf('Could not read image from file: %s', $imagePath));
         }
         $image = $this->createImageResource($content, $imagePath);
 
@@ -116,13 +107,13 @@ public function createThumbnail($imagePath, $destination, $maxWidth, $maxHeight,
      *
      * @param resource $imageResource
      *
-     * @return array{width: int, height: int}
+     * @return array{width: int<1, max>, height: int<1, max>}
      */
     private function getOriginalImageSize($imageResource): array
     {
         return [
-            'width' => (int) imagesx($imageResource),
-            'height' => (int) imagesy($imageResource),
+            'width' => imagesx($imageResource),
+            'height' => imagesy($imageResource),
         ];
     }
 
@@ -139,7 +130,7 @@ private function createImageResource(string $fileContent, string $imagePath)
     {
         $image = imagecreatefromstring($fileContent);
         if ($image === false) {
-            throw new RuntimeException(sprintf('Image is not in a recognized format (%s)', $imagePath));
+            throw new RuntimeException(\sprintf('Image is not in a recognized format (%s)', $imagePath));
         }
 
         return $image;
@@ -156,9 +147,9 @@ private function getImageExtension(string $path): string
     /**
      * Calculate image proportion and set the new resolution
      *
-     * @param array{width: int, height: int} $originalSize
+     * @param array{width: int<1, max>, height: int<1, max>} $originalSize
      *
-     * @return array{width: int, height: int, proportion: float}
+     * @return array{width: int<1, max>, height: int<1, max>, proportion: float}
      */
     private function calculateProportionalThumbnailSize(array $originalSize, int $width, int $height): array
     {
@@ -180,22 +171,25 @@ private function calculateProportionalThumbnailSize(array $originalSize, int $wi
             $dstHeight = $srcHeight;
             $factor = 1;
         } else {
-            //Get the destination size
+            // Get the destination size
             $dstWidth = round($srcWidth * $factor);
             $dstHeight = round($srcHeight * $factor);
         }
 
+        $dstWidth = max(1, (int) $dstWidth);
+        $dstHeight = max(1, (int) $dstHeight);
+
         return [
-            'width' => (int) $dstWidth,
-            'height' => (int) $dstHeight,
+            'width' => $dstWidth,
+            'height' => $dstHeight,
             'proportion' => $factor,
         ];
     }
 
     /**
-     * @param resource                       $image
-     * @param array{width: int, height: int} $originalSize
-     * @param array{width: int, height: int} $newSize
+     * @param resource                                       $image
+     * @param array{width: int<1, max>, height: int<1, max>} $originalSize
+     * @param array{width: int<1, max>, height: int<1, max>} $newSize
      *
      * @return resource
      */
@@ -308,12 +302,12 @@ private function downloadImage(string $destination): string
         }
         $handle = fopen($tmpFilename, 'wb');
         if (!\is_resource($handle)) {
-            throw new RuntimeException(sprintf('Could not open file at: %s', $tmpFilename));
+            throw new RuntimeException(\sprintf('Could not open file at: %s', $tmpFilename));
         }
 
         $fromHandle = $this->mediaService->readStream($destination);
         if (!\is_resource($fromHandle)) {
-            throw new RuntimeException(sprintf('Could not open file at: %s', $destination));
+            throw new RuntimeException(\sprintf('Could not open file at: %s', $destination));
         }
         stream_copy_to_stream(
             $fromHandle,
@@ -327,7 +321,7 @@ private function uploadImage(string $destination, string $tmpFilename): void
     {
         $fileHandle = fopen($tmpFilename, 'rb');
         if (!\is_resource($fileHandle)) {
-            throw new RuntimeException(sprintf('Could not open file at: %s', $tmpFilename));
+            throw new RuntimeException(\sprintf('Could not open file at: %s', $tmpFilename));
         }
         $this->mediaService->writeStream($destination, $fileHandle);
         fclose($fileHandle);
diff --git a/engine/Shopware/Components/Thumbnail/Generator/GeneratorInterface.php b/engine/Shopware/Components/Thumbnail/Generator/GeneratorInterface.php
index 02e9f3222e4..d236e074ab1 100644
--- a/engine/Shopware/Components/Thumbnail/Generator/GeneratorInterface.php
+++ b/engine/Shopware/Components/Thumbnail/Generator/GeneratorInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Thumbnail\Generator;
@@ -40,12 +40,12 @@ interface GeneratorInterface
      * This function creates a thumbnail from the given image path
      * and saves it to the defined destination with the given size
      *
-     * @param string $image           - original image path
-     * @param string $destination     - full path of the generated thumbnail
-     * @param int    $maxWidth        - width in pixel
-     * @param int    $maxHeight       - height in pixel
-     * @param bool   $keepProportions - Whether or not keeping the proportions of the original image, the size can be affected when true
-     * @param int    $quality         - JPEG quality
+     * @param string      $image           - original image path
+     * @param string      $destination     - full path of the generated thumbnail
+     * @param int<1, max> $maxWidth        - width in pixel
+     * @param int<1, max> $maxHeight       - height in pixel
+     * @param bool        $keepProportions - Whether or not keeping the proportions of the original image, the size can be affected when true
+     * @param int         $quality         - JPEG quality
      *
      * @return void
      */
diff --git a/engine/Shopware/Components/Thumbnail/Manager.php b/engine/Shopware/Components/Thumbnail/Manager.php
index e1616b19e31..5d7403937dd 100644
--- a/engine/Shopware/Components/Thumbnail/Manager.php
+++ b/engine/Shopware/Components/Thumbnail/Manager.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Thumbnail;
@@ -57,10 +57,7 @@ class Manager
      */
     protected $eventManager;
 
-    /**
-     * @var MediaServiceInterface
-     */
-    private $mediaService;
+    private MediaServiceInterface $mediaService;
 
     /**
      * The constructor for the thumbnail manager.
@@ -88,13 +85,15 @@ public function __construct(
      *
      * @param array $thumbnailSizes  - array of all sizes which needs to be generated
      * @param bool  $keepProportions - Whether or not keeping the proportions of the original image, the size can be affected when true
+     *
+     * @return void
      */
     public function createMediaThumbnail(Media $media, $thumbnailSizes = [], $keepProportions = false)
     {
         $imagePath = $media->getPath();
 
         if ($media->getType() !== $media::TYPE_IMAGE) {
-            throw new Exception(sprintf('File %s is not an image.', $imagePath));
+            throw new Exception(\sprintf('File %s is not an image.', $imagePath));
         }
 
         if (empty($thumbnailSizes)) {
@@ -142,11 +141,13 @@ public function createMediaThumbnail(Media $media, $thumbnailSizes = [], $keepPr
 
             $destinations = $this->getDestination($media, $suffix);
             foreach ($destinations as $destination) {
+                $width = max(1, (int) $size['width']);
+                $height = max(1, (int) $size['height']);
                 $this->generator->createThumbnail(
                     $parameters['path'],
                     $destination,
-                    $size['width'],
-                    $size['height'],
+                    $width,
+                    $height,
                     $parameters['keepProportions'],
                     $standardQuality
                 );
@@ -162,11 +163,13 @@ public function createMediaThumbnail(Media $media, $thumbnailSizes = [], $keepPr
 
             $destinations = $this->getDestination($media, $suffix);
             foreach ($destinations as $destination) {
+                $width = max(1, (int) ($size['width'] * 2));
+                $height = max(1, (int) ($size['height'] * 2));
                 $this->generator->createThumbnail(
                     $parameters['path'],
                     $destination,
-                    $size['width'] * 2,
-                    $size['height'] * 2,
+                    $width,
+                    $height,
                     $parameters['keepProportions'],
                     $highDpiQuality
                 );
@@ -181,7 +184,7 @@ public function createMediaThumbnail(Media $media, $thumbnailSizes = [], $keepPr
      * @param string $type
      * @param string $extension
      *
-     * @return array
+     * @return array<array{maxWidth: int, maxHeight: int, source: string, retinaSource: string}>
      */
     public function getMediaThumbnails($name, $type, $extension, array $sizes)
     {
@@ -215,6 +218,8 @@ public function getMediaThumbnails($name, $type, $extension, array $sizes)
 
     /**
      * Deletes all thumbnails from the given media object
+     *
+     * @return void
      */
     public function removeMediaThumbnails(Media $media)
     {
@@ -282,7 +287,7 @@ protected function getThumbnailDir(Media $media)
      * Brings the passed sizes into a uniform format.
      *
      * The passed param has to be an array with one or more sizes.
-     * These sizes can have following formats:
+     * These sizes can have the following formats:
      *
      * '100x110'
      * array(120, 130)
@@ -295,13 +300,13 @@ protected function getThumbnailDir(Media $media)
      *
      * @param int[]|string[]|array<string[]>|array<int[]> $thumbnailSizes
      *
-     * @return array
+     * @return array<array{width: int, height: int}>
      */
     protected function uniformThumbnailSizes(array $thumbnailSizes)
     {
         foreach ($thumbnailSizes as &$size) {
             if (\is_string($size)) {
-                if (strpos($size, 'x') !== false) {
+                if (str_contains($size, 'x')) {
                     $size = $this->stringSizeToArray($size);
                 } else {
                     $size = ['width' => $size, 'height' => $size];
@@ -320,12 +325,7 @@ protected function uniformThumbnailSizes(array $thumbnailSizes)
         return $thumbnailSizes;
     }
 
-    /**
-     * @param string $type
-     *
-     * @return string
-     */
-    private function getPathOfType($type)
+    private function getPathOfType(string $type): string
     {
         return 'media/' . strtolower($type);
     }
@@ -333,12 +333,14 @@ private function getPathOfType($type)
     /**
      * Returns an array with width and height gained
      * from a string in a format like 100x200
+     *
+     * @return array{width: int, height: int}
      */
     private function stringSizeToArray(string $size): array
     {
         $sizes = explode('x', $size);
 
-        return ['width' => $sizes[0], 'height' => $sizes[1]];
+        return ['width' => (int) $sizes[0], 'height' => (int) $sizes[1]];
     }
 
     /**
diff --git a/engine/Shopware/Components/Translation.php b/engine/Shopware/Components/Translation.php
index f3ec8cb9e8b..eb2ec439c08 100644
--- a/engine/Shopware/Components/Translation.php
+++ b/engine/Shopware/Components/Translation.php
@@ -1,30 +1,32 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\DBAL\Connection;
 use Shopware\Bundle\AttributeBundle\Service\CrudServiceInterface;
+use Shopware\Components\Model\ModelManager;
 use Shopware\Components\Translation\ObjectTranslator;
+use Shopware\Models\Shop\Locale as ShopLocale;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -58,7 +60,12 @@ public function __construct(Connection $connection, ContainerInterface $containe
 
         // Determine how to query the current language
         if ($container->initialized('auth') && $container->get('auth')->hasIdentity()) {
-            $locale = $container->get('auth')->getIdentity()->locale;
+            $identity = $container->get('auth')->getIdentity();
+            if (isset($identity->locale)) {
+                $locale = $identity->locale;
+            } elseif (isset($identity->localeID)) {
+                $locale = $container->get(ModelManager::class)->getRepository(ShopLocale::class)->find($identity->localeID);
+            }
         } elseif ($container->initialized('shop')) {
             $locale = $container->get('shop')->getLocale();
         }
@@ -123,7 +130,7 @@ public function unFilterData($type, $data, $key = null)
     {
         $tmp = unserialize($data, ['allowed_classes' => false]);
         if ($tmp === false) {
-            $tmp = unserialize(utf8_decode($data), ['allowed_classes' => false]);
+            $tmp = unserialize(mb_convert_encoding($data, 'ISO-8859-1', 'UTF-8'), ['allowed_classes' => false]);
         }
         if ($tmp === false) {
             return [];
@@ -172,7 +179,7 @@ public function read($language, $type, $key = 1, $merge = false)
             ->setParameter(':language', $language);
 
         $data = $query->execute()
-            ->fetch(\PDO::FETCH_COLUMN);
+            ->fetch(PDO::FETCH_COLUMN);
 
         return $this->unFilterData($type, $data, $merge ? $key : null);
     }
@@ -417,7 +424,7 @@ public function write($language, $type, $key = 1, $data = null, $merge = false)
     }
 
     /**
-     * Translates an order by translating it's document types, payment and dispatch methods.
+     * Translates an order by translating its document types, payment and dispatch methods.
      */
     public function translateOrders(array $orders, ?int $language = null, ?int $fallback = null): array
     {
@@ -450,7 +457,7 @@ public function translateOrders(array $orders, ?int $language = null, ?int $fall
 
         // Save the translated objects
         foreach ($orders as &$order) {
-            $orderDocuments = \is_array($order['documents']) ? $order['documents'] : [];
+            $orderDocuments = isset($order['documents']) && \is_array($order['documents']) ? $order['documents'] : [];
 
             for ($documentCounter = 0, $orderDocumentsCount = \count($orderDocuments); $documentCounter < $orderDocumentsCount; ++$documentCounter) {
                 $type = $orderDocuments[$documentCounter]['type'];
@@ -586,7 +593,7 @@ public function getFallbackLocaleId(int $currentLocaleId): int
      */
     protected function filterText($text)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         $text = html_entity_decode($text);
         $text = preg_replace('!<[^>]*?>!', ' ', $text);
@@ -659,7 +666,7 @@ protected function getMapping($type)
      * @param int    $articleId
      * @param string $data
      *
-     * @throws \Exception
+     * @throws Exception
      */
     protected function fixArticleTranslation($languageId, $articleId, $data)
     {
@@ -681,15 +688,15 @@ protected function fixArticleTranslation($languageId, $articleId, $data)
         );
 
         foreach ($fallbacks as $id) {
-            //check if fallback ids contains an individual translation
+            // check if fallback ids contains an individual translation
             $existQuery->execute([':language' => $id, ':articleId' => $articleId]);
             $exist = $existQuery->fetch(PDO::FETCH_COLUMN);
 
-            //if shop translation of fallback exists, skip
+            // if shop translation of fallback exists, skip
             if ($exist) {
                 continue;
             }
-            //add fallback translation to s_articles_translation for search requests.
+            // add fallback translation to s_articles_translation for search requests.
             $this->addProductTranslation($articleId, $id, $data);
         }
     }
diff --git a/engine/Shopware/Components/Translation/ObjectTranslator.php b/engine/Shopware/Components/Translation/ObjectTranslator.php
index b195d34a702..e79e21db701 100644
--- a/engine/Shopware/Components/Translation/ObjectTranslator.php
+++ b/engine/Shopware/Components/Translation/ObjectTranslator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Translation;
@@ -81,7 +81,7 @@ public function translateObjectProperty(array $object, string $translationIndex,
 
         $objectIndex = $objectIndex ?: $translationIndex;
 
-        $translation = $this->translations[$object['id']];
+        $translation = $this->translations[$object['id']] ?? null;
         if ($translation && !empty($translation[$translationIndex])) {
             $object[$objectIndex] = $translation[$translationIndex];
         } elseif ($fallback) {
diff --git a/engine/Shopware/Components/Translation/SwapProductVariantTranslationService.php b/engine/Shopware/Components/Translation/SwapProductVariantTranslationService.php
new file mode 100644
index 00000000000..fcd837a6002
--- /dev/null
+++ b/engine/Shopware/Components/Translation/SwapProductVariantTranslationService.php
@@ -0,0 +1,87 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Components\Translation;
+
+use Doctrine\DBAL\Connection;
+use Shopware\Models\Article\Detail as ProductVariant;
+
+class SwapProductVariantTranslationService implements SwapProductVariantTranslationServiceInterface
+{
+    private Connection $connection;
+
+    public function __construct(Connection $connection)
+    {
+        $this->connection = $connection;
+    }
+
+    public function swapProductVariantTranslation(ProductVariant $newMainVariant, ProductVariant $oldMainVariant): void
+    {
+        $productId = $newMainVariant->getArticle()->getId();
+
+        $oldMainVariantTranslations = $this->getTranslations(self::OBJECT_TYPE_PRODUCT, $productId);
+        $newMainVariantTranslations = $this->getTranslations(self::OBJECT_TYPE_VARIANT, $newMainVariant->getId());
+
+        $this->updateTranslation(self::OBJECT_TYPE_VARIANT, (int) $oldMainVariant->getId(), $oldMainVariantTranslations);
+        $this->updateTranslation(self::OBJECT_TYPE_PRODUCT, (int) $productId, $newMainVariantTranslations);
+    }
+
+    /**
+     * @param array<int|string, array<string, mixed>> $translationsToUpdate
+     */
+    private function updateTranslation(string $objectType, int $objectKey, array $translationsToUpdate): void
+    {
+        $translationIdsToUpdate = array_map(function ($translation) {
+            return (int) $translation[self::TRANSLATION_ID_KEY];
+        }, $translationsToUpdate);
+
+        $this->connection->createQueryBuilder()
+            ->update('s_core_translations')
+            ->set('objecttype', ':objectType')
+            ->set('objectkey', ':objectKey')
+            ->where('id IN (:ids)')
+            ->setParameter('objectType', $objectType)
+            ->setParameter('objectKey', $objectKey)
+            ->setParameter('ids', $translationIdsToUpdate, Connection::PARAM_INT_ARRAY)
+            ->execute();
+    }
+
+    /**
+     * @return array<int|string, array<string, mixed>>
+     */
+    private function getTranslations(string $objectType, int $objectKey): array
+    {
+        $queryBuilder = $this->connection->createQueryBuilder();
+
+        return $queryBuilder->select(['objectlanguage as arrayIndex', 'objectlanguage', 'id', 'objectdata', 'objecttype', 'objectkey'])
+            ->from('s_core_translations')
+            ->where('objecttype = :objecttype')
+            ->andWhere('objectkey = :objectkey')
+            ->setParameter('objecttype', $objectType)
+            ->setParameter('objectkey', $objectKey)
+            ->execute()
+            ->fetchAllAssociativeIndexed();
+    }
+}
diff --git a/engine/Shopware/Components/Translation/SwapProductVariantTranslationServiceInterface.php b/engine/Shopware/Components/Translation/SwapProductVariantTranslationServiceInterface.php
new file mode 100644
index 00000000000..643d51b3626
--- /dev/null
+++ b/engine/Shopware/Components/Translation/SwapProductVariantTranslationServiceInterface.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Components\Translation;
+
+use Shopware\Models\Article\Detail as ProductVariant;
+
+interface SwapProductVariantTranslationServiceInterface
+{
+    public const TRANSLATION_ID_KEY = 'id';
+    public const OBJECT_TYPE_PRODUCT = 'article';
+    public const OBJECT_TYPE_VARIANT = 'variant';
+
+    public function swapProductVariantTranslation(ProductVariant $newMainVariant, ProductVariant $oldMainVariant): void;
+}
diff --git a/engine/Shopware/Components/UploadMaxSizeException.php b/engine/Shopware/Components/UploadMaxSizeException.php
index 08a73f10f2e..bf9e296b2e2 100644
--- a/engine/Shopware/Components/UploadMaxSizeException.php
+++ b/engine/Shopware/Components/UploadMaxSizeException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
diff --git a/engine/Shopware/Components/UploadMaxSizeValidator.php b/engine/Shopware/Components/UploadMaxSizeValidator.php
index b12d7e88a3c..36db0ba6bd0 100644
--- a/engine/Shopware/Components/UploadMaxSizeValidator.php
+++ b/engine/Shopware/Components/UploadMaxSizeValidator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
@@ -97,11 +97,11 @@ public function getPostMaxSize()
 
         switch (substr($iniMax, -1)) {
             case 't': $max *= 1024;
-            // no break
+                // no break
             case 'g': $max *= 1024;
-            // no break
+                // no break
             case 'm': $max *= 1024;
-            // no break
+                // no break
             case 'k': $max *= 1024;
         }
 
@@ -115,7 +115,7 @@ public function getPostMaxSize()
      */
     public function getNormalizedIniPostMaxSize()
     {
-        return strtoupper(trim((string) ini_get('post_max_size')));
+        return strtoupper(trim((string) \ini_get('post_max_size')));
     }
 
     /**
diff --git a/engine/Shopware/Components/Validator/EmailValidator.php b/engine/Shopware/Components/Validator/EmailValidator.php
index e5d610ab40d..27490ea279e 100644
--- a/engine/Shopware/Components/Validator/EmailValidator.php
+++ b/engine/Shopware/Components/Validator/EmailValidator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Validator;
@@ -34,8 +34,6 @@ class EmailValidator implements EmailValidatorInterface
      */
     public function isValid($emailAddress)
     {
-        // Inspired by the regex used in symfony/validator
-        // See: https://github.com/symfony/validator/blob/dae70b74fe173461395cfd61a5c5245e05e511f5/Constraints/EmailValidator.php#L72
-        return (bool) preg_match('/^\S+\@\S+\.\S+$/', $emailAddress);
+        return (bool) filter_var($emailAddress, FILTER_VALIDATE_EMAIL);
     }
 }
diff --git a/engine/Shopware/Components/Validator/EmailValidatorInterface.php b/engine/Shopware/Components/Validator/EmailValidatorInterface.php
index 9238efba4de..3bec60d75bc 100644
--- a/engine/Shopware/Components/Validator/EmailValidatorInterface.php
+++ b/engine/Shopware/Components/Validator/EmailValidatorInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Validator;
diff --git a/engine/Shopware/Components/Validator/NoUrlValidator.php b/engine/Shopware/Components/Validator/NoUrlValidator.php
new file mode 100644
index 00000000000..b98d9a0dd26
--- /dev/null
+++ b/engine/Shopware/Components/Validator/NoUrlValidator.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Components\Validator;
+
+/**
+ * The Validator\NoUrlValidator class is used to validate fields consistently across the system for URLs
+ */
+class NoUrlValidator implements NoUrlValidatorInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function isValid(string $textToValidate): bool
+    {
+        return (bool) preg_match('/^(?:(?!(http[s]?\:\/\/)?(?!\-)(?:[a-zA-Z\d\-]{0,62}[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63}).)*$/', $textToValidate);
+    }
+}
diff --git a/engine/Shopware/Components/Validator/NoUrlValidatorInterface.php b/engine/Shopware/Components/Validator/NoUrlValidatorInterface.php
new file mode 100644
index 00000000000..432735d3b1d
--- /dev/null
+++ b/engine/Shopware/Components/Validator/NoUrlValidatorInterface.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Components\Validator;
+
+/**
+ * The Validator\NoUrlValidator class is used to validate fields consistently across the system for URLs
+ */
+interface NoUrlValidatorInterface
+{
+    /**
+     * Checks that the given string has no URLs
+     */
+    public function isValid(string $textToValidate): bool;
+}
diff --git a/engine/Shopware/Components/Validator/UserNameValidator.php b/engine/Shopware/Components/Validator/UserNameValidator.php
index 1c33df65257..58df2dbe5e7 100644
--- a/engine/Shopware/Components/Validator/UserNameValidator.php
+++ b/engine/Shopware/Components/Validator/UserNameValidator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Validator;
diff --git a/engine/Shopware/Components/Validator/UserNameValidatorInterface.php b/engine/Shopware/Components/Validator/UserNameValidatorInterface.php
index d6df3bc92ea..c0f09acd2cb 100644
--- a/engine/Shopware/Components/Validator/UserNameValidatorInterface.php
+++ b/engine/Shopware/Components/Validator/UserNameValidatorInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components\Validator;
diff --git a/engine/Shopware/Components/WebLinkManager.php b/engine/Shopware/Components/WebLinkManager.php
index 99649f55553..43c17dfb0a6 100644
--- a/engine/Shopware/Components/WebLinkManager.php
+++ b/engine/Shopware/Components/WebLinkManager.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
diff --git a/engine/Shopware/Configs/Default.php b/engine/Shopware/Configs/Default.php
index ffe0fecc967..373ee1edf28 100644
--- a/engine/Shopware/Configs/Default.php
+++ b/engine/Shopware/Configs/Default.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Api\Exception\BatchInterfaceNotImplementedException;
@@ -246,6 +246,10 @@
     'mail' => [
         'charset' => 'utf-8',
     ],
+    'update' => [
+        'url' => 'https://raw.githubusercontent.com/shopware5/shopware-release-cache/main/releases.json',
+        'prerelease' => false,
+    ],
     'httpcache' => [
         'enabled' => true,
         'lookup_optimization' => true,
@@ -292,12 +296,6 @@
             'fbclid',         // Facebook
         ],
     ],
-    'bi' => [
-        'endpoint' => [
-            'benchmark' => 'https://bi.shopware.com/benchmark',
-            'statistics' => 'https://bi.shopware.com/statistics',
-        ],
-    ],
     'session' => [
         'cookie_lifetime' => 0,
         'cookie_httponly' => 1,
@@ -375,7 +373,6 @@
         // Passed to \Mpdf\Mpdf::__construct:
         'defaultConfig' => [
             'tempDir' => $this->getCacheDir() . '/mpdf/',
-            'fontDir' => $this->DocPath('engine_Library_Mpdf_ttfonts_'),
             'fonttrans' => [
                 'helvetica' => 'arial',
                 'verdana' => 'arial',
@@ -391,38 +388,6 @@
                 'ocr-b10bt' => 'ocrb',
                 'damase' => 'mph2bdamase',
             ],
-            'fontdata' => [
-                'arial' => [
-                    'R' => 'arial.ttf',
-                    'B' => 'arialbd.ttf',
-                    'I' => 'ariali.ttf',
-                    'BI' => 'arialbi.ttf',
-                ],
-                'couriernew' => [
-                    'R' => 'cour.ttf',
-                    'B' => 'courbd.ttf',
-                    'I' => 'couri.ttf',
-                    'BI' => 'courbi.ttf',
-                ],
-                'georgia' => [
-                    'R' => 'georgia.ttf',
-                    'B' => 'georgiab.ttf',
-                    'I' => 'georgiai.ttf',
-                    'BI' => 'georgiaz.ttf',
-                ],
-                'timesnewroman' => [
-                    'R' => 'times.ttf',
-                    'B' => 'timesbd.ttf',
-                    'I' => 'timesi.ttf',
-                    'BI' => 'timesbi.ttf',
-                ],
-                'verdana' => [
-                    'R' => 'verdana.ttf',
-                    'B' => 'verdanab.ttf',
-                    'I' => 'verdanai.ttf',
-                    'BI' => 'verdanaz.ttf',
-                ],
-            ],
             'format' => 'A4',
         ],
     ],
diff --git a/engine/Shopware/Configs/smarty_functions.php b/engine/Shopware/Configs/smarty_functions.php
index e8a3101d4c0..7546a63d325 100644
--- a/engine/Shopware/Configs/smarty_functions.php
+++ b/engine/Shopware/Configs/smarty_functions.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 return [
diff --git a/engine/Shopware/Controllers/Api/Addresses.php b/engine/Shopware/Controllers/Api/Addresses.php
index 88b8de4a776..e5106b35919 100644
--- a/engine/Shopware/Controllers/Api/Addresses.php
+++ b/engine/Shopware/Controllers/Api/Addresses.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Api\Resource\Address;
diff --git a/engine/Shopware/Controllers/Api/Articles.php b/engine/Shopware/Controllers/Api/Articles.php
index 53d1469c79b..8b6f7b47e85 100644
--- a/engine/Shopware/Controllers/Api/Articles.php
+++ b/engine/Shopware/Controllers/Api/Articles.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Api\Resource\Article;
diff --git a/engine/Shopware/Controllers/Api/Caches.php b/engine/Shopware/Controllers/Api/Caches.php
index 387036addd0..772cedeec23 100644
--- a/engine/Shopware/Controllers/Api/Caches.php
+++ b/engine/Shopware/Controllers/Api/Caches.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Api\Resource\Cache;
@@ -27,7 +27,7 @@
 class Shopware_Controllers_Api_Caches extends Shopware_Controllers_Api_Rest
 {
     /**
-     * @var Shopware\Components\Api\Resource\Cache
+     * @var Cache
      */
     protected $resource;
 
@@ -72,7 +72,7 @@ public function getAction(): void
      */
     public function postAction(): void
     {
-        throw new \RuntimeException('Building caches is not possible, yet. You can build the cache by calling the category/product manually.');
+        throw new RuntimeException('Building caches is not possible, yet. You can build the cache by calling the category/product manually.');
     }
 
     /**
@@ -82,7 +82,7 @@ public function postAction(): void
      */
     public function putAction(): void
     {
-        throw new \RuntimeException('Updating caches is not possible, yet. After updating a product or category the cache will be invalidated automatically, if configured in the HTTP-Cache settings..');
+        throw new RuntimeException('Updating caches is not possible, yet. After updating a product or category the cache will be invalidated automatically, if configured in the HTTP-Cache settings..');
     }
 
     /**
diff --git a/engine/Shopware/Controllers/Api/Categories.php b/engine/Shopware/Controllers/Api/Categories.php
index 04f97968814..929110acbe9 100644
--- a/engine/Shopware/Controllers/Api/Categories.php
+++ b/engine/Shopware/Controllers/Api/Categories.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Api\Resource\Category;
diff --git a/engine/Shopware/Controllers/Api/Countries.php b/engine/Shopware/Controllers/Api/Countries.php
index 0473de68f33..dd77881ec77 100644
--- a/engine/Shopware/Controllers/Api/Countries.php
+++ b/engine/Shopware/Controllers/Api/Countries.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Api\Resource\Country;
diff --git a/engine/Shopware/Controllers/Api/CustomerGroups.php b/engine/Shopware/Controllers/Api/CustomerGroups.php
index 9e091052c5e..30307bad76b 100644
--- a/engine/Shopware/Controllers/Api/CustomerGroups.php
+++ b/engine/Shopware/Controllers/Api/CustomerGroups.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Api\Resource\CustomerGroup;
@@ -27,7 +27,7 @@
 class Shopware_Controllers_Api_CustomerGroups extends Shopware_Controllers_Api_Rest
 {
     /**
-     * @var Shopware\Components\Api\Resource\CustomerGroup
+     * @var CustomerGroup
      */
     protected $resource;
 
diff --git a/engine/Shopware/Controllers/Api/CustomerStreams.php b/engine/Shopware/Controllers/Api/CustomerStreams.php
index cba7804e94a..32906e1a46f 100644
--- a/engine/Shopware/Controllers/Api/CustomerStreams.php
+++ b/engine/Shopware/Controllers/Api/CustomerStreams.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Api\Resource\CustomerStream;
@@ -27,7 +28,7 @@
 class Shopware_Controllers_Api_CustomerStreams extends Shopware_Controllers_Api_Rest
 {
     /**
-     * @var Shopware\Components\Api\Resource\CustomerStream
+     * @var CustomerStream
      */
     protected $resource;
 
@@ -42,15 +43,16 @@ public function __construct(CustomerStream $resource)
      */
     public function indexAction(): void
     {
-        $limit = (int) $this->Request()->getParam('limit', 100);
-        $offset = (int) $this->Request()->getParam('start', 0);
-        $sort = $this->Request()->getParam('sort', []);
-        $filter = $this->Request()->getParam('filter', []);
+        $request = $this->Request();
+
+        $limit = (int) $request->getParam('limit', 100);
+        $offset = (int) $request->getParam('start', 0);
+        $sort = $request->getParam('sort', []);
+        $filter = $request->getParam('filter', []);
 
         $result = $this->resource->getList($offset, $limit, $filter, $sort);
 
         $this->View()->assign($result);
-        $this->View()->assign('success', true);
     }
 
     /**
@@ -59,16 +61,22 @@ public function indexAction(): void
      */
     public function getAction(): void
     {
-        $customers = $this->resource->getOne(
-            $this->Request()->getParam('id'),
-            (int) $this->Request()->getParam('offset', 0),
-            $this->Request()->getParam('limit'),
-            $this->Request()->getParam('conditions'),
-            $this->Request()->getParam('sortings')
+        $request = $this->Request();
+
+        $streamId = $request->getParam('id');
+        if ($streamId !== null) {
+            $streamId = (int) $streamId;
+        }
+        $customerNumberSearchResult = $this->resource->getOne(
+            $streamId,
+            (int) $request->getParam('offset', 0),
+            (int) $request->getParam('limit', 50),
+            $request->getParam('conditions', ''),
+            $request->getParam('sortings', '')
         );
 
-        $this->View()->assign('data', $customers->getCustomers());
-        $this->View()->assign('total', $customers->getTotal());
+        $this->View()->assign('data', $customerNumberSearchResult->getCustomers());
+        $this->View()->assign('total', $customerNumberSearchResult->getTotal());
         $this->View()->assign('success', true);
     }
 
@@ -78,7 +86,9 @@ public function getAction(): void
      */
     public function postAction(): void
     {
-        if ($this->Request()->has('buildSearchIndex')) {
+        $request = $this->Request();
+
+        if ($request->has('buildSearchIndex')) {
             $this->resource->buildSearchIndex(0, true);
             $this->resource->cleanupIndexSearchIndex();
             $this->View()->assign(['success' => true]);
@@ -87,8 +97,8 @@ public function postAction(): void
         }
 
         $stream = $this->resource->create(
-            $this->Request()->getPost(),
-            $this->Request()->getParam('indexStream')
+            $request->getPost(),
+            $request->getParam('indexStream')
         );
 
         $location = $this->apiBaseUrl . 'customer_streams/' . $stream->getId();
@@ -106,15 +116,17 @@ public function postAction(): void
      */
     public function putAction(): void
     {
-        $customer = $this->resource->update(
-            $this->Request()->getParam('id'),
-            $this->Request()->getPost(),
-            $this->Request()->getParam('indexStream')
+        $request = $this->Request();
+
+        $customerStream = $this->resource->update(
+            (int) $request->getParam('id'),
+            $request->getPost(),
+            $request->getParam('indexStream')
         );
 
-        $location = $this->apiBaseUrl . 'customer_streams/' . $customer->getId();
+        $location = $this->apiBaseUrl . 'customer_streams/' . $customerStream->getId();
         $data = [
-            'id' => $customer->getId(),
+            'id' => $customerStream->getId(),
             'location' => $location,
         ];
 
@@ -126,9 +138,8 @@ public function putAction(): void
      */
     public function deleteAction(): void
     {
-        $this->resource->delete(
-            $this->Request()->getParam('id')
-        );
+        $streamId = (int) $this->Request()->getParam('id');
+        $this->resource->delete($streamId);
 
         $this->View()->assign(['success' => true]);
     }
diff --git a/engine/Shopware/Controllers/Api/Customers.php b/engine/Shopware/Controllers/Api/Customers.php
index 3a7884de64f..8e0b81b9e6c 100644
--- a/engine/Shopware/Controllers/Api/Customers.php
+++ b/engine/Shopware/Controllers/Api/Customers.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Api\Resource\Customer;
diff --git a/engine/Shopware/Controllers/Api/Error.php b/engine/Shopware/Controllers/Api/Error.php
index b2bf2ae9f1e..6b9f0cb60e1 100644
--- a/engine/Shopware/Controllers/Api/Error.php
+++ b/engine/Shopware/Controllers/Api/Error.php
@@ -1,28 +1,26 @@
 <?php
 
 declare(strict_types=1);
-
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Api\Exception\ApiException;
@@ -96,7 +94,7 @@ private function handleApiExceptions(Enlight_Exception $exception): void
             if ($exception->getViolations() instanceof ConstraintViolationListInterface) {
                 $errors = [];
                 foreach ($exception->getViolations() as $violation) {
-                    $errors[] = sprintf(
+                    $errors[] = \sprintf(
                         '%s: %s',
                         $violation->getPropertyPath(),
                         $violation->getMessage()
diff --git a/engine/Shopware/Controllers/Api/GenerateArticleImages.php b/engine/Shopware/Controllers/Api/GenerateArticleImages.php
index 479af4280ee..b180636dd5f 100644
--- a/engine/Shopware/Controllers/Api/GenerateArticleImages.php
+++ b/engine/Shopware/Controllers/Api/GenerateArticleImages.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Api\Exception as ApiException;
@@ -65,7 +65,7 @@ public function putAction(): void
         $product = $this->resource->getRepository()->find($id);
 
         if (!$product) {
-            throw new ApiException\NotFoundException(sprintf('Product by id %d not found', $id));
+            throw new ApiException\NotFoundException(\sprintf('Product by id %d not found', $id));
         }
 
         $this->resource->generateImages($product, (bool) $request->getParam('force', 0));
diff --git a/engine/Shopware/Controllers/Api/Manufacturers.php b/engine/Shopware/Controllers/Api/Manufacturers.php
index 65bfa823f24..efaad3206aa 100644
--- a/engine/Shopware/Controllers/Api/Manufacturers.php
+++ b/engine/Shopware/Controllers/Api/Manufacturers.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Api\Resource\Manufacturer;
diff --git a/engine/Shopware/Controllers/Api/Media.php b/engine/Shopware/Controllers/Api/Media.php
index 6470da55ac7..776c61ea4c6 100644
--- a/engine/Shopware/Controllers/Api/Media.php
+++ b/engine/Shopware/Controllers/Api/Media.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Api\Resource\Media;
@@ -28,7 +28,7 @@
 class Shopware_Controllers_Api_Media extends Shopware_Controllers_Api_Rest
 {
     /**
-     * @var Shopware\Components\Api\Resource\Media
+     * @var Media
      */
     protected $resource;
 
@@ -141,7 +141,7 @@ private function prepareUploadedFile(array $params): array
             $fileName = $file->getClientOriginalName();
 
             if ($file->getError() !== UPLOAD_ERR_OK) {
-                throw new \Exception(sprintf('Could not upload file "%s"', $file->getClientOriginalName()));
+                throw new Exception(\sprintf('Could not upload file "%s"', $file->getClientOriginalName()));
             }
 
             // use custom name if provided
diff --git a/engine/Shopware/Controllers/Api/Orders.php b/engine/Shopware/Controllers/Api/Orders.php
index aeaaacabad3..c41a53d0a85 100644
--- a/engine/Shopware/Controllers/Api/Orders.php
+++ b/engine/Shopware/Controllers/Api/Orders.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Api\Resource\Order;
@@ -27,7 +27,7 @@
 class Shopware_Controllers_Api_Orders extends Shopware_Controllers_Api_Rest
 {
     /**
-     * @var Shopware\Components\Api\Resource\Order
+     * @var Order
      */
     protected $resource;
 
diff --git a/engine/Shopware/Controllers/Api/PaymentMethods.php b/engine/Shopware/Controllers/Api/PaymentMethods.php
index 075b99ba386..8e39b40dfea 100644
--- a/engine/Shopware/Controllers/Api/PaymentMethods.php
+++ b/engine/Shopware/Controllers/Api/PaymentMethods.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Api\Resource\PaymentMethods;
diff --git a/engine/Shopware/Controllers/Api/PropertyGroups.php b/engine/Shopware/Controllers/Api/PropertyGroups.php
index 101dcd86a36..c0990718a9b 100644
--- a/engine/Shopware/Controllers/Api/PropertyGroups.php
+++ b/engine/Shopware/Controllers/Api/PropertyGroups.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Api\Resource\PropertyGroup;
diff --git a/engine/Shopware/Controllers/Api/Rest.php b/engine/Shopware/Controllers/Api/Rest.php
index ff58a9bf1b0..17c1ce54af5 100644
--- a/engine/Shopware/Controllers/Api/Rest.php
+++ b/engine/Shopware/Controllers/Api/Rest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Api\Resource\Resource as AbstractResource;
@@ -82,12 +82,6 @@ public function postDispatch()
      */
     public function batchAction()
     {
-        // To support the batch mode, the controller just needs to reference the api resource
-        // with the "resource" property
-        if (!property_exists($this, 'resource')) {
-            throw new RuntimeException('Property "resource" not found.');
-        }
-
         $params = $this->Request()->getPost();
 
         $this->resource->setResultMode(AbstractResource::HYDRATE_ARRAY);
@@ -105,12 +99,6 @@ public function batchAction()
      */
     public function batchDeleteAction()
     {
-        // To support the batch mode, the controller just needs to reference the api resource
-        // with the "resource" property
-        if (!property_exists($this, 'resource')) {
-            throw new RuntimeException('Property "resource" not found.');
-        }
-
         // getParams() returns some additional, irrelevant parameters
         $params = array_merge($this->Request()->getQuery(), $this->Request()->getPost());
 
diff --git a/engine/Shopware/Controllers/Api/Shops.php b/engine/Shopware/Controllers/Api/Shops.php
index dd4775e8623..3075f7ccd23 100644
--- a/engine/Shopware/Controllers/Api/Shops.php
+++ b/engine/Shopware/Controllers/Api/Shops.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Api\Resource\Shop;
@@ -27,7 +27,7 @@
 class Shopware_Controllers_Api_Shops extends Shopware_Controllers_Api_Rest
 {
     /**
-     * @var Shopware\Components\Api\Resource\Shop
+     * @var Shop
      */
     protected $resource;
 
diff --git a/engine/Shopware/Controllers/Api/Translations.php b/engine/Shopware/Controllers/Api/Translations.php
index 30b6ee2f07e..56b8c4e7e32 100644
--- a/engine/Shopware/Controllers/Api/Translations.php
+++ b/engine/Shopware/Controllers/Api/Translations.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Api\Resource\Translation;
diff --git a/engine/Shopware/Controllers/Api/Users.php b/engine/Shopware/Controllers/Api/Users.php
index 72ea383b550..0f218aa0511 100644
--- a/engine/Shopware/Controllers/Api/Users.php
+++ b/engine/Shopware/Controllers/Api/Users.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Api\Exception\CustomValidationException;
diff --git a/engine/Shopware/Controllers/Api/Variants.php b/engine/Shopware/Controllers/Api/Variants.php
index e3a8c3da352..1ea87a83060 100644
--- a/engine/Shopware/Controllers/Api/Variants.php
+++ b/engine/Shopware/Controllers/Api/Variants.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Api\Resource\Variant;
diff --git a/engine/Shopware/Controllers/Api/Version.php b/engine/Shopware/Controllers/Api/Version.php
index bb38c5c0e9d..11fc67a8d7b 100644
--- a/engine/Shopware/Controllers/Api/Version.php
+++ b/engine/Shopware/Controllers/Api/Version.php
@@ -1,27 +1,29 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+use Shopware\Components\ShopwareReleaseStruct;
+
 class Shopware_Controllers_Api_Version extends Shopware_Controllers_Api_Rest
 {
     /**
@@ -29,7 +31,7 @@ class Shopware_Controllers_Api_Version extends Shopware_Controllers_Api_Rest
      */
     public function indexAction(): void
     {
-        /** @var \Shopware\Components\ShopwareReleaseStruct $shopwareRelease */
+        /** @var ShopwareReleaseStruct $shopwareRelease */
         $shopwareRelease = $this->container->get('shopware.release');
 
         $result['data'] = [
diff --git a/engine/Shopware/Controllers/Backend/Address.php b/engine/Shopware/Controllers/Backend/Address.php
index 95908de234d..afa6d32cd4f 100644
--- a/engine/Shopware/Controllers/Backend/Address.php
+++ b/engine/Shopware/Controllers/Backend/Address.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\ORM\AbstractQuery;
@@ -90,7 +90,7 @@ public function save($data)
         }
 
         $data['country'] = $data['countryId'];
-        $data['state'] = $data['stateId'];
+        $data['state'] = $data['stateId'] ?? null;
 
         $form = $this->get('shopware.form.factory')->create(AddressFormType::class, $model);
         $form->submit($data);
@@ -146,7 +146,7 @@ public function delete($id)
 
         try {
             $this->addressService->delete($model);
-        } catch (\Exception $ex) {
+        } catch (Exception $ex) {
             return ['success' => false, 'error' => $ex->getMessage()];
         }
 
@@ -161,7 +161,7 @@ protected function getListQuery()
         $customerId = (int) $this->Request()->get('customerId');
 
         if (!$customerId) {
-            throw new \RuntimeException('You have to provide a valid customerId.');
+            throw new RuntimeException('You have to provide a valid customerId.');
         }
 
         $query = parent::getListQuery();
@@ -177,6 +177,7 @@ protected function getListQuery()
      */
     protected function getQueryPaginator(QueryBuilder $builder, $hydrationMode = AbstractQuery::HYDRATE_ARRAY)
     {
+        /** @var Query<AddressModel|array<string, mixed>> $query */
         $query = $builder->getQuery();
         $query->setHydrationMode($hydrationMode);
         $query->setHint(Query::HINT_INCLUDE_META_COLUMNS, true);
@@ -190,15 +191,13 @@ protected function getQueryPaginator(QueryBuilder $builder, $hydrationMode = Abs
     protected function getDetailQuery($id)
     {
         $query = parent::getDetailQuery($id);
-        $query = $this->addAssociations($query);
 
-        return $query;
+        return $this->addAssociations($query);
     }
 
     private function addAssociations(QueryBuilder $query): QueryBuilder
     {
-        $query
-            ->addSelect(['country', 'state', 'PARTIAL customer.{id,email}'])
+        $query->addSelect(['country', 'state', 'PARTIAL customer.{id,email}'])
             ->join('address.customer', 'customer')
             ->join('address.country', 'country')
             ->leftJoin('address.state', 'state');
diff --git a/engine/Shopware/Controllers/Backend/Analytics.php b/engine/Shopware/Controllers/Backend/Analytics.php
index e2e612d3266..1114faeea8b 100644
--- a/engine/Shopware/Controllers/Backend/Analytics.php
+++ b/engine/Shopware/Controllers/Backend/Analytics.php
@@ -1,28 +1,26 @@
 <?php
 
 declare(strict_types=1);
-
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\DBAL\Query\QueryBuilder;
@@ -212,9 +210,15 @@ public function getOverviewAction()
             $this->getToDate()
         );
 
-        $turnover = array_map('reset', $turnover->getData());
-        $visitors = array_map('reset', $visitors->getData());
-        $registrations = array_map('reset', $registrations->getData());
+        $turnover = array_map(function ($turnoverItem) {
+            return reset($turnoverItem);
+        }, $turnover->getData());
+        $visitors = array_map(function ($visitorsItem) {
+            return reset($visitorsItem);
+        }, $visitors->getData());
+        $registrations = array_map(function ($registrationsItem) {
+            return reset($registrationsItem);
+        }, $registrations->getData());
 
         $data = array_merge_recursive($turnover, $visitors);
         $data = array_merge_recursive($data, $registrations);
@@ -335,13 +339,11 @@ public function getReferrerRevenueAction()
         );
 
         $referrer = [];
-        $customers = [];
         foreach ($result->getData() as $row) {
-            $url = parse_url($row['referrer']);
-            if (!\is_array($url) || !\array_key_exists('host', $url)) {
+            $host = parse_url($row['referrer'], PHP_URL_HOST);
+            if (!\is_string($host)) {
                 continue;
             }
-            $host = $url['host'];
 
             if (!\array_key_exists($host, $referrer)) {
                 $referrer[$host] = [
@@ -358,14 +360,12 @@ public function getReferrerRevenueAction()
                 ];
             }
 
-            if (!\in_array($row['userID'], $customers)) {
-                if (strtotime($row['orderTime']) - strtotime($row['firstLogin']) < 60 * 60 * 24) {
-                    $referrer[$host]['turnoverNewCustomer'] += $row['turnover'];
-                    ++$referrer[$host]['newCustomers'];
-                } else {
-                    $referrer[$host]['turnoverRegularCustomer'] += $row['turnover'];
-                    ++$referrer[$host]['regularCustomers'];
-                }
+            if (strtotime($row['orderTime']) - strtotime($row['firstLogin']) < 60 * 60 * 24) {
+                $referrer[$host]['turnoverNewCustomer'] += $row['turnover'];
+                ++$referrer[$host]['newCustomers'];
+            } else {
+                $referrer[$host]['turnoverRegularCustomer'] += $row['turnover'];
+                ++$referrer[$host]['regularCustomers'];
             }
 
             $referrer[$host]['turnover'] += $row['turnover'];
@@ -398,7 +398,7 @@ public function getReferrerRevenueAction()
         });
 
         $this->send(
-            array_values($referrer),
+            $referrer,
             (int) $this->Request()->getParam('limit', 25)
         );
     }
@@ -1228,14 +1228,14 @@ private function getFromDate(): DateTime
 
     private function getToDate(): DateTime
     {
-        //if a "to" date passed, format it over the \DateTime object. Otherwise, create a new date with today
+        // if a "to" date passed, format it over the \DateTime object. Otherwise, create a new date with today
         $toDate = $this->Request()->getParam('toDate');
         if (empty($toDate)) {
             $toDate = new DateTime();
         } else {
             $toDate = new DateTime($toDate);
         }
-        //to get the right value cause 2012-02-02 is smaller than 2012-02-02 15:33:12
+        // to get the right value cause 2012-02-02 is smaller than 2012-02-02 15:33:12
         $toDate = $toDate->add(new DateInterval('P1D'));
 
         return $toDate->sub(new DateInterval('PT1S'));
diff --git a/engine/Shopware/Controllers/Backend/Application.php b/engine/Shopware/Controllers/Backend/Application.php
index 32cf4a0eb09..1ba7bf4a45a 100644
--- a/engine/Shopware/Controllers/Backend/Application.php
+++ b/engine/Shopware/Controllers/Backend/Application.php
@@ -1,29 +1,30 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
+use Doctrine\ORM\Query;
 use Doctrine\ORM\Tools\Pagination\Paginator;
 use Doctrine\Persistence\Proxy;
 use Shopware\Components\Model\ModelEntity;
@@ -369,8 +370,7 @@ public function getDetail($id)
     {
         $builder = $this->getDetailQuery($id);
 
-        $paginator = $this->getQueryPaginator($builder);
-        $data = $paginator->getIterator()->current();
+        $data = iterator_to_array($this->getQueryPaginator($builder))[0] ?? [];
         if (!\is_array($data)) {
             $data = [];
         }
@@ -440,7 +440,7 @@ public function save($data)
         $this->getManager()->flush();
 
         if (!method_exists($model, 'getId')) {
-            throw new RuntimeException(sprintf('Model "%s" has no "getId" method', $this->model));
+            throw new RuntimeException(\sprintf('Model "%s" has no "getId" method', $this->model));
         }
 
         $detail = $this->getDetail($model->getId());
@@ -547,7 +547,7 @@ public function reloadAssociation($id, $associationKey, $offset, $limit, $sort =
 
         $paginator = $this->getQueryPaginator($builder);
 
-        $data = $paginator->getIterator()->getArrayCopy();
+        $data = iterator_to_array($paginator);
 
         return [
             'success' => true,
@@ -614,7 +614,7 @@ public function searchAssociation($search, $association, $offset, $limit, $id =
         }
 
         $paginator = $this->getQueryPaginator($builder);
-        $data = $paginator->getIterator()->getArrayCopy();
+        $data = iterator_to_array($paginator);
 
         return [
             'success' => true,
@@ -683,7 +683,7 @@ protected function getList($offset, $limit, $sort = [], $filter = [], array $who
         }
 
         $paginator = $this->getQueryPaginator($builder);
-        $data = $paginator->getIterator()->getArrayCopy();
+        $data = iterator_to_array($paginator);
         $count = $paginator->count();
 
         return ['success' => true, 'data' => $data, 'total' => $count];
@@ -802,14 +802,12 @@ protected function getReloadAssociationQuery($model, $alias, $fieldName)
      *      => array('billing' => array( 0 => array('id' => ...) ))
      *      => The function removes the first level of the array to have to model data directly in the association property.
      *      => array('billing' => array('id' => ...))
-     *
      * @ORM\ManyToOne() associations
      *      => @ORM\ManyToOne() requires the related doctrine model in the association key property.
      *      => But Ext JS sends only the foreign key property.
      *      => 'article' => array('id' => 1, ... , 'shopId' => 1, 'shop' => null)
      *      => This function resolves the foreign key, removes the foreign key property from the data array and sets the founded doctrine model into the association property.
      *      => 'article' => array('id' => 1, ... , 'shop' => $this->getManager()->find(Model, $data['shopId']);
-     *
      * @ORM\ManyToMany() associations
      *      => @ORM\ManyToMany() requires like the @ORM\ManyToOne() associations the resolved doctrine models in the association property.
      *      => But Ext JS sends only an array of foreign keys.
@@ -864,7 +862,7 @@ protected function resolveExtJsData($data)
                 continue;
             }
 
-            if ($mapping['type'] === ClassMetadataInfo::MANY_TO_ONE) {
+            if ($mapping['type'] === ClassMetadataInfo::MANY_TO_ONE && \array_key_exists('joinColumns', $mapping)) {
                 /**
                  * @ORM\ManyToOne associations.
                  *
@@ -879,16 +877,16 @@ protected function resolveExtJsData($data)
                 $column = $mapping['joinColumns'][0]['name'];
                 $field = $metaData->getFieldForColumn($column);
 
-                if ($data[$field]) {
+                if (isset($data[$field])) {
                     $associationModel = $this->getManager()->find($mapping['targetEntity'], $data[$field]);
 
-                    //proxies need to be loaded, otherwise the validation will be failed.
-                    if ($associationModel instanceof Proxy && method_exists($associationModel, '__load')) {
+                    // proxies need to be loaded, otherwise the validation will be failed.
+                    if ($associationModel instanceof Proxy) {
                         $associationModel->__load();
                     }
                     $data[$mapping['fieldName']] = $associationModel;
 
-                    //remove the foreign key data.
+                    // remove the foreign key data.
                     if ($field !== $mapping['fieldName']) {
                         unset($data[$field]);
                     }
@@ -1029,12 +1027,12 @@ protected function getSortConditions($sort, $model, $alias, $whiteList = [])
         $fields = $this->getModelFields($model, $alias);
         $conditions = [];
         foreach ($sort as $condition) {
-            //check if the passed field is a valid doctrine model field of the configured model.
+            // check if the passed field is a valid doctrine model field of the configured model.
             if (!\array_key_exists($condition['property'], $fields)) {
                 continue;
             }
 
-            //check if the developer limited the sortable fields and the passed property defined in the sort fields parameter.
+            // check if the developer limited the sortable fields and the passed property defined in the sort fields parameter.
             if (!empty($whiteList) && !\in_array($condition['property'], $whiteList, true)) {
                 continue;
             }
@@ -1089,39 +1087,41 @@ protected function getFilterConditions($filters, $model, $alias, $whiteList = []
         $conditions = [];
 
         foreach ($filters as $condition) {
-            if ($condition['property'] === 'search') {
-                foreach ($fields as $name => $field) {
-                    //check if the developer limited the filterable fields and the passed property defined in the filter fields parameter.
-                    if (!empty($whiteList) && !\in_array($name, $whiteList, true)) {
+            if (isset($condition['property'])) {
+                if ($condition['property'] === 'search') {
+                    foreach ($fields as $name => $field) {
+                        // check if the developer limited the filterable fields and the passed property defined in the filter fields parameter.
+                        if (!empty($whiteList) && !\in_array($name, $whiteList, true)) {
+                            continue;
+                        }
+
+                        $value = $this->formatSearchValue($condition['value'], $field);
+
+                        $conditions[] = [
+                            'property' => $field['alias'],
+                            'operator' => 'OR',
+                            'value' => $value,
+                        ];
+                    }
+                } elseif (\array_key_exists($condition['property'], $fields)) {
+                    // check if the developer limited the filterable fields and the passed property defined in the filter fields parameter.
+                    if (!empty($whiteList) && !\in_array($condition['property'], $whiteList, true)) {
                         continue;
                     }
 
-                    $value = $this->formatSearchValue($condition['value'], $field);
+                    $field = $fields[$condition['property']];
+                    $value = $this->formatSearchValue($condition['value'], $field, $condition['expression'] ?? null);
 
-                    $conditions[] = [
+                    $tmpCondition = [
                         'property' => $field['alias'],
-                        'operator' => 'OR',
+                        'operator' => $condition['operator'] ?? null,
                         'value' => $value,
                     ];
+                    if (isset($condition['expression'])) {
+                        $tmpCondition['expression'] = $condition['expression'];
+                    }
+                    $conditions[] = $tmpCondition;
                 }
-            } elseif (\array_key_exists($condition['property'], $fields)) {
-                //check if the developer limited the filterable fields and the passed property defined in the filter fields parameter.
-                if (!empty($whiteList) && !\in_array($condition['property'], $whiteList, true)) {
-                    continue;
-                }
-
-                $field = $fields[$condition['property']];
-                $value = $this->formatSearchValue($condition['value'], $field, $condition['expression'] ?? null);
-
-                $tmpCondition = [
-                    'property' => $field['alias'],
-                    'operator' => $condition['operator'] ?? null,
-                    'value' => $value,
-                ];
-                if (isset($condition['expression'])) {
-                    $tmpCondition['expression'] = $condition['expression'];
-                }
-                $conditions[] = $tmpCondition;
             }
         }
 
@@ -1139,6 +1139,7 @@ protected function getFilterConditions($filters, $model, $alias, $whiteList = []
      */
     protected function getQueryPaginator(QueryBuilder $builder, $hydrationMode = AbstractQuery::HYDRATE_ARRAY)
     {
+        /** @var Query<TEntityClass|array<string, mixed>> $query */
         $query = $builder->getQuery();
         $query->setHydrationMode($hydrationMode);
 
@@ -1166,7 +1167,7 @@ protected function formatSearchValue($value, array $field, $expression = null)
                 break;
             case 'date':
             case 'datetime':
-                //validates the date value. If the value is no date value, return
+                // validates the date value. If the value is no date value, return
                 $date = date_parse($value);
 
                 if ($date['error_count'] > 0 || !checkdate((int) $date['month'], (int) $date['day'], (int) $date['year'])) {
@@ -1179,7 +1180,7 @@ protected function formatSearchValue($value, array $field, $expression = null)
                     return $value;
                 }
 
-                //search values for date time should added the % wildcards to search for time values.
+                // search values for date time should added the % wildcards to search for time values.
                 if ($field['type'] === 'datetime') {
                     $value = '%' . $value . '%';
                 }
diff --git a/engine/Shopware/Controllers/Backend/Article.php b/engine/Shopware/Controllers/Backend/Article.php
index 57c280d0f92..e92840d323d 100644
--- a/engine/Shopware/Controllers/Backend/Article.php
+++ b/engine/Shopware/Controllers/Backend/Article.php
@@ -1,29 +1,30 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\DBAL\Connection;
 use Doctrine\ORM\AbstractQuery;
+use Doctrine\ORM\Query;
 use Shopware\Bundle\MediaBundle\Exception\MediaFileExtensionIsBlacklistedException;
 use Shopware\Bundle\MediaBundle\MediaServiceInterface;
 use Shopware\Bundle\StoreFrontBundle\Service\AdditionalTextServiceInterface;
@@ -37,6 +38,7 @@
 use Shopware\Components\Model\QueryBuilder;
 use Shopware\Components\ShopRegistrationServiceInterface;
 use Shopware\Components\Thumbnail\Manager;
+use Shopware\Components\Translation\SwapProductVariantTranslationService;
 use Shopware\Models\Article\Article as Product;
 use Shopware\Models\Article\Configurator\Dependency;
 use Shopware\Models\Article\Configurator\Group;
@@ -425,6 +427,9 @@ public function deleteAllVariantsAction()
         ]);
     }
 
+    /**
+     * @return void
+     */
     public function saveMediaMappingAction()
     {
         $imageId = (int) $this->Request()->getParam('id');
@@ -438,6 +443,10 @@ public function saveMediaMappingAction()
 
         $query = $this->getRepository()->getArticleImageDataQuery($imageId);
         $image = $query->getOneOrNullResult(AbstractQuery::HYDRATE_OBJECT);
+        if (!$image instanceof Image) {
+            throw new ModelNotFoundException(Image::class, $imageId);
+        }
+
         $imageData = $query->getOneOrNullResult(AbstractQuery::HYDRATE_ARRAY);
         $this->getRepository()->getDeleteImageChildrenQuery($imageId)->execute();
 
@@ -752,7 +761,7 @@ public function getPropertyValuesAction()
     public function setPropertyListAction()
     {
         if (!$this->Request()->isPost()) {
-            //don't save the property list on a get request. This will only occur when there is an ext js problem
+            // don't save the property list on a get request. This will only occur when there is an ext js problem
             return;
         }
         $models = $this->get('models');
@@ -794,7 +803,7 @@ public function setPropertyListAction()
                     $propertyValueModel = $propertyValueRepository->find($value['id']);
                 }
                 if ($propertyValueModel === null) {
-                    //search for property value
+                    // search for property value
                     $propertyValueModel = $propertyValueRepository->findOneBy(
                         [
                             'value' => $value['value'],
@@ -807,7 +816,7 @@ public function setPropertyListAction()
                     $models->persist($propertyValueModel);
                 }
                 if (!$propertyValues->contains($propertyValueModel)) {
-                    //add only new values
+                    // add only new values
                     $propertyValues->add($propertyValueModel);
                 }
             }
@@ -834,8 +843,6 @@ public function setPropertyListAction()
      */
     public function getArticleCategories($articleId)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
-
         $builder = $this->get('models')->createQueryBuilder();
         $builder->select(['categories.id'])
             ->from(Category::class, 'categories', 'categories.id')
@@ -872,8 +879,6 @@ public function getArticleCategories($articleId)
      */
     public function getArticleSimilars($articleId)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
-
         $result = $this->getRepository()
             ->getArticleSimilarsQuery($articleId)
             ->getArrayResult();
@@ -896,8 +901,6 @@ public function getArticleSimilars($articleId)
      */
     public function getArticleRelatedProductStreams($articleId)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
-
         $result = $this->get(ModelManager::class)->getRepository(Product::class)
             ->getArticleRelatedProductStreamsQuery($articleId)
             ->getArrayResult();
@@ -919,8 +922,6 @@ public function getArticleRelatedProductStreams($articleId)
      */
     public function getArticleRelated($articleId)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
-
         $result = $this->getRepository()
             ->getArticleRelatedQuery($articleId)
             ->getArrayResult();
@@ -946,8 +947,6 @@ public function getArticleRelated($articleId)
      */
     public function getArticleImages($articleId)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
-
         $mediaService = Shopware()->Container()->get(MediaServiceInterface::class);
 
         $thumbnailManager = Shopware()->Container()->get(Manager::class);
@@ -968,6 +967,9 @@ public function getArticleImages($articleId)
         $result = $builder->getQuery()->getArrayResult();
 
         foreach ($result as &$item) {
+            if (empty($item['media'])) {
+                continue;
+            }
             $thumbnails = $thumbnailManager->getMediaThumbnails(
                 $item['media']['name'],
                 $item['media']['type'],
@@ -1006,8 +1008,6 @@ public function getArticleImages($articleId)
      */
     public function getArticleLinks($articleId)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
-
         $result = $this->getRepository()
             ->getArticleLinksQuery($articleId)
             ->getArrayResult();
@@ -1038,8 +1038,6 @@ public function getArticleLinks($articleId)
      */
     public function getArticleDownloads($articleId)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
-
         $result = $this->getRepository()
             ->getArticleDownloadsQuery($articleId)
             ->getArrayResult();
@@ -1065,8 +1063,6 @@ public function getArticleDownloads($articleId)
      */
     public function getArticleCustomerGroups($articleId)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
-
         $result = $this->getRepository()
             ->getArticleCustomerGroupsQuery($articleId)
             ->getArrayResult();
@@ -1088,12 +1084,10 @@ public function getArticleCustomerGroups($articleId)
      *
      * @param int $articleId
      *
-     * @return array
+     * @return array|null
      */
     public function getArticleConfiguratorSet($articleId)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
-
         $builder = $this->get('models')->createQueryBuilder();
         $builder->select(['configuratorSet', 'groups', 'options'])
             ->from(Set::class, 'configuratorSet')
@@ -1108,7 +1102,7 @@ public function getArticleConfiguratorSet($articleId)
 
         $result = $builder->getQuery()->getArrayResult();
 
-        return $result[0];
+        return $result[0] ?? null;
     }
 
     /**
@@ -1125,8 +1119,6 @@ public function getArticleConfiguratorSet($articleId)
      */
     public function getArticleDependencies($configuratorSetId)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
-
         return $this->getRepository()
             ->getConfiguratorDependenciesQuery($configuratorSetId)
             ->getArrayResult();
@@ -1147,13 +1139,11 @@ public function getArticleDependencies($configuratorSetId)
      */
     public function getArticleConfiguratorTemplate($articleId, $tax)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
-
         $query = $this->getRepository()->getConfiguratorTemplateByArticleIdQuery($articleId);
 
         $configuratorTemplate = $query->getArrayResult();
 
-        $prices = $configuratorTemplate[0]['prices'];
+        $prices = $configuratorTemplate[0]['prices'] ?? null;
 
         if (!empty($prices)) {
             $configuratorTemplate[0]['prices'] = $this->formatPricesFromNetToGross($prices, $tax);
@@ -1325,6 +1315,9 @@ public function createConfiguratorVariantsAction()
         $detailData = $this->setDetailDataReferences($detailData, $product);
 
         $configuratorSet = $product->getConfiguratorSet();
+        if (!$configuratorSet instanceof Set) {
+            throw new Exception(\sprintf('Should not happen. The product with the given ID "%s" must be a variant product at this point.', $productId));
+        }
         $dependencies = $this->getRepository()->getConfiguratorDependenciesQuery($configuratorSet->getId())->getArrayResult();
         $priceVariations = $this->getRepository()->getConfiguratorPriceVariationsQuery($configuratorSet->getId())->getArrayResult();
 
@@ -1503,6 +1496,16 @@ public function deleteDetailAction()
             }
             if ($model->getId() !== $product->getMainDetail()->getId()) {
                 $this->get('models')->remove($model);
+
+                $configuratorSet = $product->getConfiguratorSet();
+                if (!$configuratorSet instanceof Set) {
+                    continue;
+                }
+                $setId = $configuratorSet->getId();
+                foreach ($detail['configuratorOptions'] as $option) {
+                    $sql = 'DELETE FROM s_article_configurator_set_option_relations WHERE set_id = :setId AND option_id = :optionId;';
+                    $this->container->get(Connection::class)->executeQuery($sql, ['setId' => $setId, 'optionId' => $option['id']]);
+                }
             }
         }
         $this->get('models')->flush();
@@ -1595,11 +1598,11 @@ public function getEsdAction()
             $query->setHydrationMode(AbstractQuery::HYDRATE_ARRAY);
             $paginator = $this->getModelManager()->createPaginator($query);
 
-            //returns the total count of the query
+            // returns the total count of the query
             $totalResult = $paginator->count();
 
-            //returns the customer data
-            $result = $paginator->getIterator()->getArrayCopy();
+            // returns the customer data
+            $result = iterator_to_array($paginator);
 
             $products = $this->buildListProducts($result);
             $products = $this->getAdditionalTexts($products);
@@ -1626,13 +1629,13 @@ public function getEsdAction()
 
         $paginator = $this->getModelManager()->createPaginator($query);
 
-        //returns the total count of the query
+        // returns the total count of the query
         $totalResult = $paginator->count();
 
-        //returns the customer data
-        $result = $paginator->getIterator()->getArrayCopy();
+        // returns the customer data
+        $result = iterator_to_array($paginator);
 
-        //inserts esd attributes into the result
+        // inserts esd attributes into the result
         $result = $this->getEsdListingAttributes($result);
 
         $this->View()->assign([
@@ -1660,11 +1663,11 @@ public function getSerialsAction()
 
         $paginator = $this->getModelManager()->createPaginator($query);
 
-        //returns the total count of the query
+        // returns the total count of the query
         $totalResult = $paginator->count();
 
-        //returns the customer data
-        $result = $paginator->getIterator()->getArrayCopy();
+        // returns the customer data
+        $result = iterator_to_array($paginator);
 
         $this->View()->assign([
             'data' => $result,
@@ -1681,7 +1684,7 @@ public function createEsdAction()
         if (!$variant) {
             $this->View()->assign([
                 'success' => false,
-                'message' => sprintf('Product variant by id %s not found', $variantId),
+                'message' => \sprintf('Product variant by id %s not found', $variantId),
             ]);
 
             return;
@@ -1710,7 +1713,7 @@ public function saveEsdAction()
         if (!$esd) {
             $this->View()->assign([
                 'success' => false,
-                'message' => sprintf('ESD by id %s not found', $esdId),
+                'message' => \sprintf('ESD by id %s not found', $esdId),
             ]);
 
             return;
@@ -1833,11 +1836,7 @@ public function deleteUnusedSerialsAction()
      */
     public function getFreeSerialCount($esdId)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
-
-        $query = $this->getRepository()->getFreeSerialsCountByEsdQuery($esdId);
-
-        return $query->getSingleScalarResult();
+        return (int) $this->getRepository()->getFreeSerialsCountByEsdQuery($esdId)->getSingleScalarResult();
     }
 
     /**
@@ -1853,7 +1852,7 @@ public function saveSerialsAction()
         if (!$esd) {
             $this->View()->assign([
                 'success' => false,
-                'message' => sprintf('ESD by id %s not found', $esdId),
+                'message' => \sprintf('ESD by id %s not found', $esdId),
             ]);
 
             return;
@@ -2003,7 +2002,7 @@ public function uploadEsdFileAction()
         $filePath = (string) $file->getRealPath();
         $upstream = fopen($filePath, 'rb');
         if (!\is_resource($upstream)) {
-            throw new RuntimeException(sprintf('Could not open file at: %s', $filePath));
+            throw new RuntimeException(\sprintf('Could not open file at: %s', $filePath));
         }
         $filesystem->writeStream($destinationPath, $upstream);
         fclose($upstream);
@@ -2042,7 +2041,7 @@ public function getEsdDownloadAction()
 
         $response = $this->Response();
         $response->headers->set('content-type', $mimeType);
-        $response->headers->set('content-disposition', sprintf('attachment; filename="%s"', basename($path)));
+        $response->headers->set('content-disposition', \sprintf('attachment; filename="%s"', basename($path)));
         $response->headers->set('content-length', $meta['size']);
         $response->headers->set('content-transfer-encoding', 'binary');
         $response->sendHeaders();
@@ -2050,7 +2049,7 @@ public function getEsdDownloadAction()
 
         $upstream = $filesystem->readStream($path);
         if (!\is_resource($upstream)) {
-            throw new RuntimeException(sprintf('Could not open file from: %s', $path));
+            throw new RuntimeException(\sprintf('Could not open file from: %s', $path));
         }
         $downstream = fopen('php://output', 'wb');
         if (!\is_resource($downstream)) {
@@ -2077,13 +2076,11 @@ public function getEsdDownloadAction()
      */
     public function getChartData()
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
-
         $productId = $this->Request()->getParam('articleId');
         $dateFormat = '%Y%m';
         $limit = 12;
 
-        $sql = sprintf("
+        $sql = \sprintf("
             SELECT
                 SUM(price*quantity) AS revenue,
                 SUM(quantity) AS orders,
@@ -2141,10 +2138,11 @@ public function regenerateVariantOrderNumbersAction()
         $commands = $this->prepareNumberSyntax($syntax);
 
         $builder = $this->getVariantsWithOptionsBuilder($productId, $offset, $limit);
+        /** @var Query<ProductVariant> $query */
         $query = $builder->getQuery();
         $query->setHydrationMode(AbstractQuery::HYDRATE_OBJECT);
         $paginator = $this->getModelManager()->createPaginator($query);
-        $details = $paginator->getIterator()->getArrayCopy();
+        $details = iterator_to_array($paginator);
 
         $counter = $offset;
         if ($offset == 0) {
@@ -2256,7 +2254,7 @@ public function previewDetailAction()
 
         Shopware()->Session()->set('Admin', true);
 
-        $url = $this->Front()->Router()->assemble(
+        $url = $this->Front()->ensureRouter()->assemble(
             [
                 'module' => 'frontend',
                 'controller' => 'detail',
@@ -2393,7 +2391,7 @@ protected function getConfiguratorDependencyRepository()
     }
 
     /**
-     * @deprecated in 5.6, will be removed in 5.7 without a replacement
+     * @deprecated in 5.6, will be removed in 5.8 without a replacement
      *
      * Helper function to get access to the configuratorGroup repository.
      *
@@ -2401,7 +2399,7 @@ protected function getConfiguratorDependencyRepository()
      */
     protected function getConfiguratorGroupRepository()
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         if ($this->configuratorGroupRepository === null) {
             $this->configuratorGroupRepository = $this->get('models')->getRepository(Group::class);
@@ -3023,8 +3021,11 @@ protected function removeAllConfiguratorVariants($articleId)
             ->getQuery()
             ->execute();
 
-        $sql = 'DELETE FROM s_article_configurator_option_relations WHERE article_id IN (?)';
-        Shopware()->Db()->query($sql, [implode(',', $detailIds)]);
+        $this->get(Connection::class)->createQueryBuilder()
+            ->delete('s_article_configurator_option_relations')
+            ->where('article_id IN (:detailIds)')
+            ->setParameter('detailIds', $detailIds, Connection::PARAM_INT_ARRAY)
+            ->execute();
 
         $builder = $this->get('models')->createQueryBuilder();
         $builder->delete(Price::class, 'prices')
@@ -3097,9 +3098,14 @@ protected function saveDetail($data, $detail)
         if (!$variant instanceof ProductVariant) {
             throw new ModelNotFoundException(ProductVariant::class, $detail->getId());
         }
+
         if ($data['standard']) {
             $product = $variant->getArticle();
             $mainDetail = $product->getMainDetail();
+            if (!$mainDetail instanceof ProductVariant) {
+                throw new ModelNotFoundException(ProductVariant::class, $detail->getId());
+            }
+
             $mainDetail->setKind(2);
             $product->setMainDetail($variant);
             $this->get('models')->persist($mainDetail);
@@ -3108,7 +3114,7 @@ protected function saveDetail($data, $detail)
 
             // If main variant changed, swap translations
             if ($mainDetail->getId() !== $variant->getId()) {
-                $this->swapDetailTranslations($variant, $mainDetail);
+                $this->container->get(SwapProductVariantTranslationService::class)->swapProductVariantTranslation($variant, $mainDetail);
             }
         }
 
@@ -3231,9 +3237,10 @@ protected function formatPricesFromNetToGross($prices, $tax)
         foreach ($prices as $key => $price) {
             $customerGroup = $price['customerGroup'];
             if ($customerGroup['taxInput']) {
-                $price['price'] = $price['price'] / 100 * (100 + $tax['tax']);
-                $price['pseudoPrice'] = $price['pseudoPrice'] / 100 * (100 + $tax['tax']);
-                $price['regulationPrice'] = $price['regulationPrice'] / 100 * (100 + $tax['tax']);
+                $taxValue = $tax['tax'] ?? 0;
+                $price['price'] = $price['price'] / 100 * (100 + $taxValue);
+                $price['pseudoPrice'] = $price['pseudoPrice'] / 100 * (100 + $taxValue);
+                $price['regulationPrice'] = $price['regulationPrice'] / 100 * (100 + $taxValue);
             }
             $prices[$key] = $price;
         }
@@ -3332,15 +3339,15 @@ protected function prepareGeneratorData(array $groups, $offset, $limit)
         $selectSql = [];
 
         // We have remove the first group id, but we need the first id in the select, from and where path.
-        $selectSql[] = sprintf($selectTemplate, $firstId, $firstId, $firstId, $firstId, $firstId, $firstId, $firstId, $firstId, $firstId, $firstId, $firstId, $firstId);
-        $groupSql[] = sprintf($fromTemplate, $firstId, $firstId, $firstId, $firstId);
-        $whereSql = sprintf($whereTemplate, $firstId, $firstId, $firstId, implode(',', $first['options']));
+        $selectSql[] = \sprintf($selectTemplate, $firstId, $firstId, $firstId, $firstId, $firstId, $firstId, $firstId, $firstId, $firstId, $firstId, $firstId, $firstId);
+        $groupSql[] = \sprintf($fromTemplate, $firstId, $firstId, $firstId, $firstId);
+        $whereSql = \sprintf($whereTemplate, $firstId, $firstId, $firstId, implode(',', $first['options']));
 
         // Now we iterate all other groups, and create a select sql path and a cross join sql path.
         foreach ($activeGroups as $group) {
             $groupId = (int) $group['id'];
-            $selectSql[] = sprintf($selectTemplate, $groupId, $groupId, $groupId, $groupId, $groupId, $groupId, $groupId, $groupId, $groupId, $groupId, $groupId, $groupId);
-            $groupSql[] = sprintf($joinTemplate, $groupId, $groupId, $groupId, $groupId, implode(',', $group['options']), $groupId, $groupId, $groupId);
+            $selectSql[] = \sprintf($selectTemplate, $groupId, $groupId, $groupId, $groupId, $groupId, $groupId, $groupId, $groupId, $groupId, $groupId, $groupId, $groupId);
+            $groupSql[] = \sprintf($joinTemplate, $groupId, $groupId, $groupId, $groupId, implode(',', $group['options']), $groupId, $groupId, $groupId);
         }
 
         // Concat the sql statement
@@ -3362,6 +3369,9 @@ protected function prepareGeneratorData(array $groups, $offset, $limit)
     protected function deleteVariantsForAllDeactivatedOptions($article, $selectedOptions)
     {
         $configuratorSet = $article->getConfiguratorSet();
+        if (!$configuratorSet instanceof Set) {
+            return;
+        }
         $oldOptions = $configuratorSet->getOptions();
         $ids = [];
         foreach ($oldOptions as $oldOption) {
@@ -3450,7 +3460,7 @@ protected function prepareVariantData($variant, $detailData, &$counter, $depende
             return false;
         }
 
-        //create the new variant data
+        // create the new variant data
         $variantData = [
             'active' => 1,
             'configuratorOptions' => $optionsModels,
@@ -3517,11 +3527,11 @@ protected function prepareVariantPrice($detailData, $priceVariations, $optionIds
     }
 
     /**
-     * @deprecated in 5.6, will be removed in 5.7 without a replacement
+     * @deprecated in 5.6, will be removed in 5.8 without a replacement
      */
     protected function getDependencyByOptionId($optionId, $dependencies)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         $returnValue = [];
         foreach ($dependencies as $dependency) {
@@ -3761,17 +3771,18 @@ protected function prepareAvoidCustomerGroups($data)
      */
     protected function prepareConfiguratorAssociatedData($data, $article)
     {
+        $modelManger = $this->get('models');
         if (!empty($data['configuratorSetId'])) {
-            $data['configuratorSet'] = $this->get('models')->find(Set::class, $data['configuratorSetId']);
-        } elseif ($data['isConfigurator']) {
+            $data['configuratorSet'] = $modelManger->find(Set::class, $data['configuratorSetId']);
+        } elseif (!empty($data['isConfigurator'])) {
             $set = new Set();
             $set->setName('Set-' . $data['mainDetail']['number']);
             $set->setPublic(false);
             $data['configuratorSet'] = $set;
         } else {
-            // If the product has an configurator set, we have to remove this set if it isn't used for other products
+            // If the product has a configurator set, we have to remove this set if it isn't used for other products
             if ($article->getConfiguratorSet() && $article->getConfiguratorSet()->getId()) {
-                $builder = $this->get('models')->createQueryBuilder();
+                $builder = $modelManger->createQueryBuilder();
                 $products = $builder->select(['articles'])
                     ->from(Product::class, 'articles')
                     ->where('articles.configuratorSetId = ?1')
@@ -3780,8 +3791,17 @@ protected function prepareConfiguratorAssociatedData($data, $article)
                     ->getArrayResult();
 
                 if (\count($products) <= 1) {
-                    $set = $this->get('models')->find(Set::class, $article->getConfiguratorSet()->getId());
-                    $this->get('models')->remove($set);
+                    $set = $modelManger->find(Set::class, $article->getConfiguratorSet()->getId());
+                    $modelManger->remove($set);
+                }
+
+                $variant = $article->getMainDetail();
+                if ($variant instanceof ProductVariant && $variant->getConfiguratorOptions()->count() > 0) {
+                    $modelManger->getConnection()->delete('s_article_configurator_option_relations', [
+                        'article_id' => $variant->getId(),
+                    ]);
+
+                    $data['mainDetail']['additionalText'] = '';
                 }
             }
             $data['configuratorSet'] = null;
@@ -3848,9 +3868,9 @@ protected function prepareArticleAssociatedData($data)
      */
     protected function prepareMainDetailAssociatedData($data)
     {
-        $data['mainDetail'] = $data['mainDetail'][0];
-        $data['mainDetail']['active'] = $data['active'];
-        $data['mainDetail']['lastStock'] = (int) ($data['lastStock'] >= 0 ? $data['lastStock'] : 0);
+        $data['mainDetail'] = $data['mainDetail'][0] ?? null;
+        $data['mainDetail']['active'] = $data['active'] ?? null;
+        $data['mainDetail']['lastStock'] = max((int) ($data['lastStock'] ?? 0), 0);
 
         if (!empty($data['mainDetail']['unitId'])) {
             $data['mainDetail']['unit'] = $this->get('models')->find(Unit::class, $data['mainDetail']['unitId']);
@@ -3872,7 +3892,7 @@ protected function prepareMainDetailAssociatedData($data)
     protected function prepareCategoryAssociatedData($data)
     {
         $categories = [];
-        foreach ($data['categories'] as $categoryData) {
+        foreach ($data['categories'] ?? [] as $categoryData) {
             if (!empty($categoryData['id'])) {
                 $model = $this->get('models')->find(Category::class, $categoryData['id']);
                 $categories[] = $model;
@@ -3948,7 +3968,7 @@ protected function prepareSeoCategoryAssociatedData($data, $article)
     protected function prepareRelatedAssociatedData($data, $article)
     {
         $related = [];
-        foreach ($data['related'] as $relatedData) {
+        foreach ($data['related'] ?? [] as $relatedData) {
             if (empty($relatedData['id'])) {
                 continue;
             }
@@ -3957,7 +3977,7 @@ protected function prepareRelatedAssociatedData($data, $article)
                 throw new ModelNotFoundException(Product::class, $relatedData['id']);
             }
 
-            //if the user select the cross
+            // if the user select the cross
             if ($relatedData['cross'] && !$relatedProduct->getRelated()->contains($article)) {
                 $relatedProduct->getRelated()->add($article);
                 $this->get('models')->persist($relatedProduct);
@@ -3979,7 +3999,7 @@ protected function prepareRelatedAssociatedData($data, $article)
     protected function prepareRelatedProductStreamsData($data)
     {
         $relatedStreams = [];
-        foreach ($data['streams'] as $relatedProductStreamData) {
+        foreach ($data['streams'] ?? [] as $relatedProductStreamData) {
             if (empty($relatedProductStreamData['id'])) {
                 continue;
             }
@@ -4005,7 +4025,7 @@ protected function prepareRelatedProductStreamsData($data)
     protected function prepareSimilarAssociatedData($data, $article)
     {
         $similar = [];
-        foreach ($data['similar'] as $similarData) {
+        foreach ($data['similar'] ?? [] as $similarData) {
             if (empty($similarData['id'])) {
                 continue;
             }
@@ -4014,7 +4034,7 @@ protected function prepareSimilarAssociatedData($data, $article)
                 throw new ModelNotFoundException(Product::class, $similarData['id']);
             }
 
-            //if the user select the cross
+            // if the user select the cross
             if ($similarData['cross'] && !$similarProduct->getSimilar()->contains($article)) {
                 $similarProduct->getSimilar()->add($article);
                 $this->get('models')->persist($similarProduct);
@@ -4035,6 +4055,10 @@ protected function prepareSimilarAssociatedData($data, $article)
      */
     protected function prepareImageAssociatedData($data)
     {
+        if (!isset($data['images']) || !\is_array($data['images']) || \count($data['images']) === 0) {
+            return $data;
+        }
+
         $position = 1;
         foreach ($data['images'] as &$imageData) {
             $imageData['position'] = $position;
@@ -4065,7 +4089,7 @@ protected function prepareImageAssociatedData($data)
      */
     protected function prepareMainPricesAssociatedData($data, $article)
     {
-        $data['mainDetail']['prices'] = $this->preparePricesAssociatedData($data['mainPrices'], $article, $data['tax']);
+        $data['mainDetail']['prices'] = $this->preparePricesAssociatedData($data['mainPrices'] ?? [], $article, $data['tax']);
 
         return $data;
     }
@@ -4091,7 +4115,7 @@ protected function preparePricesAssociatedData($prices, $article, $tax)
 
             $priceData['to'] = (int) $priceData['to'];
 
-            // If the "to" value isn't numeric, set the place holder "beliebig"
+            // If the "to" value isn't numeric, set the placeholder "beliebig"
             if ($priceData['to'] <= 0) {
                 $priceData['to'] = 'beliebig';
             }
@@ -4120,6 +4144,10 @@ protected function preparePricesAssociatedData($prices, $article, $tax)
      */
     protected function prepareLinkAssociatedData($data)
     {
+        if (!isset($data['links']) || !\is_array($data['links']) || \count($data['links']) === 0) {
+            return $data;
+        }
+
         foreach ($data['links'] as &$linkData) {
             $linkData['link'] = trim($linkData['link']);
             // Map the boolean ExtJS link target to the string format which used in the database
@@ -4138,6 +4166,10 @@ protected function prepareLinkAssociatedData($data)
      */
     protected function prepareDownloadAssociatedData($data)
     {
+        if (!isset($data['downloads']) || !\is_array($data['downloads']) || \count($data['downloads']) === 0) {
+            return $data;
+        }
+
         $mediaService = Shopware()->Container()->get(MediaServiceInterface::class);
         foreach ($data['downloads'] as &$downloadData) {
             $downloadData['file'] = $mediaService->normalize($downloadData['file']);
@@ -4286,7 +4318,7 @@ protected function increaseAutoNumber($autoNumber, $number)
      * @param int|null $offset
      * @param int|null $limit
      *
-     * @return \Doctrine\ORM\QueryBuilder|QueryBuilder
+     * @return QueryBuilder
      */
     protected function getVariantsWithOptionsBuilder($articleId, $offset = null, $limit = null)
     {
@@ -4333,6 +4365,7 @@ protected function interpretNumberSyntax(Product $article, ProductVariant $detai
                 $name[] = $counter;
             }
         }
+
         // Return all command results, concat with a dot
         return implode('.', $name);
     }
@@ -4420,24 +4453,24 @@ protected function prepareNumberSyntax($syntax)
      */
     protected function getCommandMapping($syntax)
     {
-        //we have to explode the current command to resolve the multiple properties.
+        // we have to explode the current command to resolve the multiple properties.
         $paths = explode('.', $syntax);
 
-        //we have to map the different properties to define the start cursor object.
+        // we have to map the different properties to define the start cursor object.
         switch ($paths[0]) {
-            //options are only available for the different product variants
+            // options are only available for the different product variants
             case 'options':
                 $cursor = 'detail';
                 $paths[0] = 'configuratorOptions';
                 break;
-            //all other commands will rout to the product
+                // all other commands will rout to the product
             default:
                 $cursor = 'article';
         }
 
         $commands = [];
 
-        //now we convert the property names to the getter functions.
+        // now we convert the property names to the getter functions.
         foreach ($paths as $path) {
             $commands[] = ['origin' => $path, 'command' => 'get' . ucfirst($path)];
         }
@@ -4449,7 +4482,7 @@ protected function getCommandMapping($syntax)
     }
 
     /**
-     * @deprecated in 5.6, will be removed in 5.7 without a replacement
+     * @deprecated in 5.6, will be removed in 5.8 without a replacement
      *
      * Internal helper function to get the field names of the passed violation array.
      *
@@ -4459,7 +4492,7 @@ protected function getCommandMapping($syntax)
      */
     protected function getViolationFields($violations)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         $fields = [];
         foreach ($violations as $violation) {
@@ -4469,95 +4502,6 @@ protected function getViolationFields($violations)
         return $fields;
     }
 
-    /**
-     * Helper method which swaps the translations of the newMainDetail and the oldMainDetail
-     * Needed because mainDetails' translations are stored for the product, not for the variant itself
-     *
-     * @param ProductVariant $newMainDetail
-     * @param ProductVariant $oldMainDetail
-     */
-    private function swapDetailTranslations($newMainDetail, $oldMainDetail)
-    {
-        $productId = $oldMainDetail->getArticle()->getId();
-
-        // Get available translations for the old mainDetail (stored on the product)
-        $sql = "
-            SELECT objectlanguage, objectdata
-            FROM s_core_translations
-            WHERE objecttype = 'article' AND objectkey = ?
-        ";
-        $oldTranslations = Shopware()->Db()->fetchAssoc($sql, [$productId]);
-
-        // Get available translations for the new mainDetail (stored for the detail)
-        $sql = "
-            SELECT objectlanguage, objectdata
-            FROM s_core_translations
-            WHERE objecttype='variant' AND objectkey = ?
-        ";
-        $newTranslations = Shopware()->Db()->fetchAssoc($sql, [$newMainDetail->getId()]);
-
-        // We need to determine which of the old product translations can be used for the translation of the
-        // variant which was the mainDetail before.
-        // We'll get a list of translatable variant fields from the variant which is going to become the new mainDetail
-        $translatedFields = [];
-        foreach ($newTranslations as $values) {
-            $data = $values['objectdata'];
-            $unserialized = @unserialize($data, ['allowed_classes' => false]);
-
-            if ($unserialized === false) {
-                $unserialized = [];
-            }
-
-            foreach ($unserialized as $field => $translation) {
-                if (!\array_key_exists($field, $translatedFields)) {
-                    $translatedFields[$field] = true;
-                }
-            }
-        }
-
-        // Save the old product translation as new variant translations
-        foreach ($oldTranslations as $language => $values) {
-            $data = @unserialize($values['objectdata'], ['allowed_classes' => false]);
-            if ($data === false) {
-                $data = [];
-            }
-
-            $newData = array_intersect_key($data, $translatedFields);
-            $this->getTranslationComponent()->write(
-                $language,
-                'variant',
-                $oldMainDetail->getId(),
-                $newData
-            );
-        }
-
-        // Save the new mainDetail translations as product translations
-        foreach ($newTranslations as $language => $values) {
-            $data = @unserialize($values['objectdata'], ['allowed_classes' => false]);
-            if ($data === false) {
-                $data = [];
-            }
-
-            $newData = array_intersect_key($data, $translatedFields);
-            // We need to check and include old translations, as an product
-            // translation is a superset of a variant translation
-            if ($oldValues = $oldTranslations[$language]) {
-                $oldData = @unserialize($oldValues['objectdata'], ['allowed_classes' => false]);
-                if ($oldData === false) {
-                    $oldData = [];
-                }
-
-                $newData = array_merge($oldData, $newData);
-            }
-            $this->getTranslationComponent()->write(
-                $language,
-                'article',
-                $productId,
-                $newData
-            );
-        }
-    }
-
     /**
      * @param array        $detailData
      * @param Product|null $article
diff --git a/engine/Shopware/Controllers/Backend/ArticleList.php b/engine/Shopware/Controllers/Backend/ArticleList.php
index ea887b6bcc1..70a095f2c55 100644
--- a/engine/Shopware/Controllers/Backend/ArticleList.php
+++ b/engine/Shopware/Controllers/Backend/ArticleList.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Bundle\AttributeBundle\Repository\ProductRepository;
@@ -85,6 +85,8 @@ public function getMultiEditRepository()
 
     /**
      * Returns an array with all the columns the user is able to show / edit and their configuration
+     *
+     * @retrun void
      */
     public function columnConfigAction()
     {
@@ -102,6 +104,8 @@ public function columnConfigAction()
 
     /**
      * Called when a single entity (=> product) is stored
+     *
+     * @retrun void
      */
     public function saveSingleEntityAction()
     {
@@ -128,12 +132,10 @@ public function saveSingleEntityAction()
         ]);
     }
 
-    /**
-     * Backup related operations
-     */
-
     /**
      * Controller action for deleting a given plugin
+     *
+     * @retrun void
      */
     public function deleteAction()
     {
@@ -151,12 +153,19 @@ public function deleteAction()
 
     /**
      * Controller action for restoring a given backup
+     *
+     * @retrun void
      */
     public function restoreAction()
     {
         $resource = $this->Request()->getParam('resource');
-        $id = $this->Request()->getParam('id');
-        $offset = $this->Request()->getParam('offset');
+        $id = \is_null($this->Request()->getParam('id')) ? null : (int) $this->Request()->getParam('id');
+
+        if (!\is_int($id)) {
+            throw new DomainException('No ID was provided');
+        }
+
+        $offset = (int) $this->Request()->getParam('offset', 0);
 
         /** @var ResourceInterface $resource */
         $resource = $this->container->get('multi_edit.' . $resource);
@@ -170,6 +179,8 @@ public function restoreAction()
 
     /**
      * Returns the backups available for the current resource
+     *
+     * @retrun void
      */
     public function listAction()
     {
@@ -185,10 +196,6 @@ public function listAction()
         $this->View()->assign($result);
     }
 
-    /**
-     * Batch process related operations
-     */
-
     /**
      * Currently returns an array of a hardcoded default operation. Might be use for storing operations in the future
      *
@@ -210,6 +217,8 @@ public function getOperationsAction()
 
     /**
      * Returns an array of operators
+     *
+     * @retrun void
      */
     public function getOperatorsAction()
     {
@@ -239,6 +248,8 @@ public function getOperatorsAction()
 
     /**
      * Returns a list of columns the user is able to edit
+     *
+     * @retrun void
      */
     public function getEditableColumnsAction()
     {
@@ -277,6 +288,8 @@ function ($operator, $id) {
 
     /**
      * Runs the batch process
+     *
+     * @retrun void
      */
     public function batchAction()
     {
@@ -296,12 +309,10 @@ public function batchAction()
         );
     }
 
-    /**
-     * Filter related operations
-     */
-
     /**
      * Controller action which will return the grammar of the requested resource
+     *
+     * @retrun void
      */
     public function getGrammarAction()
     {
@@ -321,6 +332,8 @@ public function getGrammarAction()
 
     /**
      * Controller action that will return suggested values for a given resource and a given attribute
+     *
+     * @retrun void
      */
     public function getValuesAction()
     {
@@ -351,6 +364,8 @@ public function getValuesAction()
 
     /**
      * Controller action which filters the products
+     *
+     * @retrun void
      */
     public function filterAction()
     {
@@ -399,6 +414,8 @@ public function filterAction()
 
     /**
      * Returns a list of all available filters
+     *
+     * @retrun void
      */
     public function getFilterAction()
     {
@@ -420,15 +437,17 @@ public function getFilterAction()
 
     /**
      * Save/update a given filter. Also called when a filter is (un)favored
+     *
+     * @retrun void
      */
     public function saveFilterAction()
     {
         $data = $this->Request()->getParams();
-        $id = $this->Request()->getParam('id', null);
+        $id = \is_null($this->Request()->getParam('id')) ? null : (int) $this->Request()->getParam('id');
 
         $filter = null;
-        if ($id) {
-            $filter = $this->getMultiEditRepository()->find((int) $id);
+        if (\is_int($id)) {
+            $filter = $this->getMultiEditRepository()->find($id);
         }
         if (!$filter instanceof Filter) {
             $filter = new Filter();
@@ -448,6 +467,8 @@ public function saveFilterAction()
 
     /**
      * Delete a given filter
+     *
+     * @retrun void
      */
     public function deleteFilterAction()
     {
@@ -474,7 +495,7 @@ public function deleteFilterAction()
     /**
      * Controller action called while the batch queue is created
      *
-     * @throws RuntimeException
+     * @retrun void
      */
     public function createQueueAction()
     {
@@ -486,13 +507,13 @@ public function createQueueAction()
         $offset = $this->Request()->getParam('offset', 0);
         $filterArray = json_decode($filterArray, true);
         if ($filterArray === false) {
-            throw new RuntimeException(sprintf('Could not decode "%s"', $this->Request()->getParam('filterArray')));
+            throw new RuntimeException(\sprintf('Could not decode "%s"', $this->Request()->getParam('filterArray')));
         }
 
         /** @var array|false $operations */
         $operations = json_decode($operations, true);
         if ($operations === false) {
-            throw new RuntimeException(sprintf('Could not decode "%s"', $this->Request()->getParam('operations')));
+            throw new RuntimeException(\sprintf('Could not decode "%s"', $this->Request()->getParam('operations')));
         }
 
         /** @var ResourceInterface $resource */
@@ -509,10 +530,12 @@ public function createQueueAction()
 
     /**
      * Event listener function of the product store of the backend module.
+     *
+     * @retrun void
      */
     public function deleteProductAction()
     {
-        $id = (int) $this->Request()->getParam('Detail_id');
+        $id = \is_null($this->Request()->getParam('Detail_id')) ? null : (int) $this->Request()->getParam('Detail_id');
 
         /** @var Detail $variant */
         $variant = $this->getDetailRepository()->find($id);
@@ -538,14 +561,7 @@ public function deleteProductAction()
         }
     }
 
-    /**
-     * Normalize filter
-     *
-     * @param string $filter
-     *
-     * @return string
-     */
-    private function normalizeFilter($filter)
+    private function normalizeFilter(string $filter): string
     {
         return strtolower((string) preg_replace('/[^\da-z]/i', '_', strip_tags($filter)));
     }
@@ -553,9 +569,11 @@ private function normalizeFilter($filter)
     /**
      * Translate filter name and description
      *
-     * @param array $filter
+     * @param array<string, string> $filter
+     *
+     * @return array<string, string>
      */
-    private function translateFilter($filter)
+    private function translateFilter(array $filter): array
     {
         $name = 'filterName-' . $this->normalizeFilter($filter['name']);
         $description = 'filterDescription-' . $this->normalizeFilter($filter['description']);
@@ -569,20 +587,18 @@ private function translateFilter($filter)
 
     /**
      * Internal helper function to get access to the product repository.
-     *
-     * @return ProductModelRepository
      */
-    private function getDetailRepository()
+    private function getDetailRepository(): ProductModelRepository
     {
         return $this->get('models')->getRepository(Detail::class);
     }
 
     /**
-     * @param array[] $result
+     * @param array{data: array<array<string, mixed>>, total: int} $result
      *
-     * @return array[]
+     * @return array{data: array<array<string, mixed>>, total: int}
      */
-    private function addAdditionalText($result)
+    private function addAdditionalText(array $result): array
     {
         $products = $this->buildListProducts($result['data']);
 
@@ -594,23 +610,22 @@ private function addAdditionalText($result)
             if (!isset($products[$number])) {
                 continue;
             }
-            $product = $products[$number];
-            $item['Detail_additionalText_dynamic'] = $product->getAdditional();
+            $item['Detail_additionalText_dynamic'] = $products[$number]->getAdditional();
         }
 
         return $result;
     }
 
     /**
-     * @param array[] $result
+     * @param array<array<string, mixed>> $result
      *
-     * @return ListProduct[]
+     * @return array<string, ListProduct>
      */
-    private function buildListProducts($result)
+    private function buildListProducts(array $result): array
     {
         $products = [];
         foreach ($result as $item) {
-            $number = $item['Detail_number'];
+            $number = (string) $item['Detail_number'];
 
             $product = new ListProduct(
                 $item['Article_id'],
@@ -628,10 +643,8 @@ private function buildListProducts($result)
 
     /**
      * @param array[] $ast
-     *
-     * @return bool
      */
-    private function displayVariants($ast)
+    private function displayVariants($ast): bool
     {
         foreach ($ast as $filter) {
             if (!isset($filter['token'])) {
@@ -706,10 +719,7 @@ private function filterByRepository(): array
         return ['data' => $sortedData, 'total' => $result->getCount()];
     }
 
-    /**
-     * @return SearchCriteria
-     */
-    private function createCriteria(Enlight_Controller_Request_Request $request)
+    private function createCriteria(Enlight_Controller_Request_Request $request): SearchCriteria
     {
         if ($request->getParam('showVariants', false) === 'true') {
             $criteria = new SearchCriteria(Detail::class);
@@ -723,7 +733,8 @@ private function createCriteria(Enlight_Controller_Request_Request $request)
         $criteria->sortings = $request->getParam('sort', []);
         $criteria->conditions = $request->getParam('filters', []);
 
-        $categoryId = (int) $request->getParam('categoryId');
+        $categoryId = (int) $request->getParam('categoryId', 0);
+
         if ($categoryId > 0) {
             $criteria->conditions[] = ['property' => 'categoryIds', 'value' => $categoryId, 'expression' => 'IN'];
         }
diff --git a/engine/Shopware/Controllers/Backend/ArticlePriceVariation.php b/engine/Shopware/Controllers/Backend/ArticlePriceVariation.php
index 36064d4abc7..2752add4903 100644
--- a/engine/Shopware/Controllers/Backend/ArticlePriceVariation.php
+++ b/engine/Shopware/Controllers/Backend/ArticlePriceVariation.php
@@ -1,27 +1,28 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+use Shopware\Components\Model\ModelManager;
 use Shopware\Models\Article\Article;
 use Shopware\Models\Article\Configurator\PriceVariation;
 use Shopware\Models\Article\Configurator\Set;
@@ -57,14 +58,12 @@ public function createPriceVariationAction()
         try {
             $data = $this->Request()->getPost();
 
-            /** @var PriceVariation $priceVariation */
             $priceVariation = new PriceVariation();
 
             $data = $this->implodePriceVariation($data);
 
             $priceVariation->fromArray($data);
-            $modelManager = $this->get(\Shopware\Components\Model\ModelManager::class);
-            /** @var Set|null $configuratorSet */
+            $modelManager = $this->get(ModelManager::class);
             $configuratorSet = $modelManager
                     ->getRepository(Set::class)
                     ->find($data['configuratorSetId']);
diff --git a/engine/Shopware/Controllers/Backend/Banner.php b/engine/Shopware/Controllers/Backend/Banner.php
index f116c03a22f..88c774ea011 100644
--- a/engine/Shopware/Controllers/Backend/Banner.php
+++ b/engine/Shopware/Controllers/Backend/Banner.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Bundle\MediaBundle\MediaServiceInterface;
@@ -39,6 +39,7 @@ class Shopware_Controllers_Backend_Banner extends Shopware_Controllers_Backend_E
      * Test repository injection variable
      *
      * @var BannerRepository
+     *
      * @scope private
      */
     public static $testRepository;
@@ -348,6 +349,7 @@ private function prepareDateAndTime($date, $time)
         }
         $datePart = new DateTime($date);
         $timePart = new DateTime($time);
+
         // Fill the timePart with the datePart
         return $timePart->setDate((int) $datePart->format('Y'), (int) $datePart->format('m'), (int) $datePart->format('d'));
     }
diff --git a/engine/Shopware/Controllers/Backend/Base.php b/engine/Shopware/Controllers/Backend/Base.php
index a2ff76c0038..d2abccb49a6 100644
--- a/engine/Shopware/Controllers/Backend/Base.php
+++ b/engine/Shopware/Controllers/Backend/Base.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\DBAL\Connection;
@@ -37,7 +37,6 @@
 use Shopware\Models\Article\Supplier;
 use Shopware\Models\Blog\Blog;
 use Shopware\Models\Category\Category;
-use Shopware\Models\Category\Repository;
 use Shopware\Models\Config\Element;
 use Shopware\Models\Country\Area;
 use Shopware\Models\Country\Country;
@@ -74,6 +73,8 @@
  */
 class Shopware_Controllers_Backend_Base extends Shopware_Controllers_Backend_ExtJs implements CSRFWhitelistAware
 {
+    private const AS_STRING = ' as ';
+
     /**
      * Initials the script renderer and handles the json request.
      * If the internal customer repository isn't initialed the
@@ -580,7 +581,7 @@ public function getArticlesAction()
         $total = $paginator->count();
 
         // Select all shop as array
-        $data = $paginator->getIterator()->getArrayCopy();
+        $data = iterator_to_array($paginator);
 
         // Return the data and total count
         $this->View()->assign(['success' => true, 'data' => $data, 'total' => $total]);
@@ -619,12 +620,17 @@ public function getVariantsAction()
             'supplier.name as supplierName',
             'supplier.id as supplierId',
             'details.additionalText',
+            'prices.price',
+            'taxes.tax',
         ];
 
         $builder->select($fields);
         $builder->from('s_articles_details', 'details');
         $builder->innerJoin('details', 's_articles', 'articles', 'details.articleID = articles.id');
+        $builder->innerJoin('articles', 's_core_tax', 'taxes', 'articles.taxID = taxes.id');
         $builder->innerJoin('articles', 's_articles_supplier', 'supplier', 'supplier.id = articles.supplierID');
+        $builder->innerJoin('details', 's_articles_prices', 'prices', 'details.id = prices.articledetailsID');
+        $builder->where('prices.pricegroup = "EK"');
 
         $filters = $this->Request()->getParam('filter', []);
         foreach ($filters as $filter) {
@@ -648,7 +654,8 @@ public function getVariantsAction()
         }
 
         $builder->setFirstResult($this->Request()->getParam('start'))
-            ->setMaxResults($this->Request()->getParam('limit'));
+            ->setMaxResults($this->Request()->getParam('limit'))
+            ->orderBy('details.id', 'ASC');
 
         $result = $builder->execute()->fetchAll(PDO::FETCH_ASSOC);
 
@@ -656,6 +663,10 @@ public function getVariantsAction()
 
         $result = $this->addAdditionalTextForVariant($result);
 
+        foreach ($result as $index => $variant) {
+            $result[$index]['price'] = round($variant['price'] / 100 * (100 + $variant['tax']), 2);
+        }
+
         $this->View()->assign(['success' => true, 'data' => $result, 'total' => $total]);
     }
 
@@ -958,10 +969,13 @@ public function getAvailableHashesAction()
         ]);
     }
 
+    /**
+     * @return void
+     */
     public function getAvailableCaptchasAction()
     {
         $captchaRepository = $this->get('shopware.captcha.repository');
-        $namespace = $namespace = Shopware()->Snippets()->getNamespace('backend/captcha/display_names');
+        $namespace = Shopware()->Snippets()->getNamespace('backend/captcha/display_names');
         $availableCaptchas = $captchaRepository->getList();
         $result = [];
 
@@ -1032,15 +1046,20 @@ public function validateEmailAction()
         $this->Front()->Plugins()->ViewRenderer()->setNoRender();
         $this->Front()->Plugins()->Json()->setRenderer(false);
 
-        $email = $this->Request()->getParam('value');
+        $emails = array_map('trim', explode(',', (string) $this->Request()->getParam('value', '')));
 
         /** @var EmailValidatorInterface $emailValidator */
         $emailValidator = $this->container->get(EmailValidator::class);
-        if ($emailValidator->isValid($email)) {
-            $this->Response()->setContent(1);
-        } else {
-            $this->Response()->setContent('');
+
+        foreach ($emails as $email) {
+            if (!$emailValidator->isValid($email)) {
+                $this->Response()->setContent('');
+
+                return;
+            }
         }
+
+        $this->Response()->setContent(1);
     }
 
     public function getSalutationsAction()
@@ -1171,62 +1190,12 @@ public function getStaticsAction(Request $request): void
         $this->View()->assign(['success' => true, 'data' => $data, 'total' => $total]);
     }
 
-    /**
-     * Add the table alias to the passed filter and sort parameters.
-     *
-     * @return array
-     */
-    private function prepareParam(array $properties, array $fields)
-    {
-        if (empty($properties)) {
-            return $properties;
-        }
-
-        foreach ($properties as $key => $property) {
-            if (\array_key_exists($property['property'], $fields)) {
-                $property['property'] = $fields[$property['property']];
-            }
-            $properties[$key] = $property;
-        }
-
-        return $properties;
-    }
-
-    /**
-     * Prepares the sort params for the variant search
-     *
-     * @return array
-     */
-    private function prepareVariantParam(array $properties, array $fields)
-    {
-        // Maps the fields to the correct table
-        foreach ($properties as $key => $property) {
-            foreach ($fields as $field) {
-                $asStr = ' as ';
-                $dotPos = strpos($field, '.');
-                $asPos = strpos($field, $asStr, 1);
-
-                if ($asPos) {
-                    $fieldName = substr($field, $asPos + \strlen($asStr));
-                } else {
-                    $fieldName = substr($field, $dotPos + 1);
-                }
-
-                if ($fieldName == $property['property']) {
-                    $properties[$key]['property'] = $field;
-                }
-            }
-        }
-
-        return $properties;
-    }
-
     /**
      * Adds the additional text for variants
      *
      * @param array $data
      */
-    private function addAdditionalTextForVariant($data)
+    protected function addAdditionalTextForVariant($data)
     {
         $variantIds = [];
         $tmpVariant = [];
@@ -1263,26 +1232,66 @@ private function addAdditionalTextForVariant($data)
         $builder->where('details.id IN (:detailsId)');
         $builder->setParameter('detailsId', $variantIds, Connection::PARAM_INT_ARRAY);
 
-        $statement = $builder->execute();
-        $result = $statement->fetchAll(PDO::FETCH_ASSOC);
+        $result = $builder->execute()->fetchAllAssociative();
 
         $tmpVariant = $this->buildDynamicText($tmpVariant, $result);
 
-        // Maps the associative data array back to an normal indexed array
-        $data = [];
-        foreach ($tmpVariant as $variant) {
-            $data[] = $variant;
+        // Maps the associative data array back to a normal indexed array
+        return array_values($tmpVariant);
+    }
+
+    /**
+     * Prepares the sort params for the variant search
+     */
+    private function prepareVariantParam(array $properties, array $fields): array
+    {
+        // Maps the fields to the correct table
+        foreach ($properties as $key => $property) {
+            foreach ($fields as $field) {
+                $asStr = self::AS_STRING;
+                $dotPos = strpos($field, '.');
+                $asPos = strpos($field, $asStr, 1);
+
+                if ($asPos) {
+                    $fieldName = substr($field, $asPos + \strlen($asStr));
+                } else {
+                    $fieldName = substr($field, $dotPos + 1);
+                }
+
+                if ($fieldName == $property['property']) {
+                    $properties[$key]['property'] = $field;
+                }
+            }
         }
 
-        return $data;
+        return $properties;
     }
 
     /**
-     * Helper function to generate the additional text dynamically
+     * Add the table alias to the passed filter and sort parameters.
      *
      * @return array
      */
-    private function buildDynamicText(array $data, array $variantsWithoutAdditionalText)
+    private function prepareParam(array $properties, array $fields)
+    {
+        if (empty($properties)) {
+            return $properties;
+        }
+
+        foreach ($properties as $key => $property) {
+            if (\array_key_exists($property['property'], $fields)) {
+                $property['property'] = $fields[$property['property']];
+            }
+            $properties[$key] = $property;
+        }
+
+        return $properties;
+    }
+
+    /**
+     * Helper function to generate the additional text dynamically
+     */
+    private function buildDynamicText(array $data, array $variantsWithoutAdditionalText): array
     {
         foreach ($variantsWithoutAdditionalText as $variantWithoutAdditionalText) {
             $variantData = &$data[$variantWithoutAdditionalText['id']];
@@ -1299,10 +1308,7 @@ private function buildDynamicText(array $data, array $variantsWithoutAdditionalT
         return $data;
     }
 
-    /**
-     * @return array
-     */
-    private function getAvailableSalutationKeys()
+    private function getAvailableSalutationKeys(): array
     {
         $builder = Shopware()->Container()->get(ModelManager::class)->createQueryBuilder();
         $builder->select(['element', 'values'])
@@ -1321,19 +1327,16 @@ private function getAvailableSalutationKeys()
         foreach ($data['values'] as $shopValue) {
             $value = array_merge($value, explode(',', $shopValue['value']));
         }
-        $value = array_unique(array_filter($value));
 
-        return $value;
+        return array_unique(array_filter($value));
     }
 
     /**
      * Replaces the locales with the snippets data
      *
-     * @param array $data
-     *
      * @return array $data
      */
-    private function getSnippetsForLocales($data)
+    private function getSnippetsForLocales(array $data): array
     {
         $snippets = $this->container->get('snippets');
         foreach ($data as &$locale) {
diff --git a/engine/Shopware/Controllers/Backend/Blog.php b/engine/Shopware/Controllers/Backend/Blog.php
index 6a6a4744bc6..f85946e4d85 100644
--- a/engine/Shopware/Controllers/Backend/Blog.php
+++ b/engine/Shopware/Controllers/Backend/Blog.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\ORM\AbstractQuery;
@@ -30,11 +30,12 @@
 use Shopware\Models\Article\Repository as ProductRepository;
 use Shopware\Models\Blog\Blog;
 use Shopware\Models\Blog\Comment;
-use Shopware\Models\Blog\Media;
+use Shopware\Models\Blog\Media as BlogMedia;
 use Shopware\Models\Blog\Repository as BlogRepository;
 use Shopware\Models\Blog\Tag;
 use Shopware\Models\Category\Category;
 use Shopware\Models\Category\Repository as CategoryRepository;
+use Shopware\Models\Media\Media;
 use Shopware\Models\User\User;
 
 /**
@@ -76,11 +77,11 @@ class Shopware_Controllers_Backend_Blog extends Shopware_Controllers_Backend_Ext
      *
      * Helper Method to get access to the category repository.
      *
-     * @return Shopware\Models\Category\Repository
+     * @return CategoryRepository
      */
     public function getCategoryRepository()
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         if ($this->categoryRepository === null) {
             $this->categoryRepository = $this->getManager()->getRepository(Category::class);
@@ -98,7 +99,7 @@ public function getCategoryRepository()
      */
     public function getArticleRepository()
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         if ($this->articleRepository === null) {
             $this->articleRepository = $this->getManager()->getRepository(Product::class);
@@ -112,11 +113,11 @@ public function getArticleRepository()
      *
      * Helper Method to get access to the blog repository.
      *
-     * @return Shopware\Models\Blog\Repository
+     * @return BlogRepository
      */
     public function getRepository()
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         if ($this->blogRepository === null) {
             $this->blogRepository = $this->getManager()->getRepository(Blog::class);
@@ -134,7 +135,7 @@ public function getRepository()
      */
     public function getBlogCommentRepository()
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         if ($this->blogCommentRepository === null) {
             $this->blogCommentRepository = $this->getManager()->getRepository(Comment::class);
@@ -495,8 +496,8 @@ protected function prepareMediaDataForSaving($mediaData)
     {
         $mediaModels = [];
         foreach ($mediaData as $media) {
-            $mediaModel = new Media();
-            $media['media'] = $this->getManager()->find(\Shopware\Models\Media\Media::class, $media['mediaId']);
+            $mediaModel = new BlogMedia();
+            $media['media'] = $this->getManager()->find(Media::class, $media['mediaId']);
             unset($media['mediaId']);
             $mediaModel->fromArray($media);
             $mediaModels[] = $mediaModel;
diff --git a/engine/Shopware/Controllers/Backend/CSRFToken.php b/engine/Shopware/Controllers/Backend/CSRFToken.php
index 754477ceaeb..9cd8e1493f2 100644
--- a/engine/Shopware/Controllers/Backend/CSRFToken.php
+++ b/engine/Shopware/Controllers/Backend/CSRFToken.php
@@ -1,28 +1,31 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+use Shopware\Components\CSRFTokenValidator;
 use Shopware\Components\CSRFWhitelistAware;
+use Shopware\Components\Random;
 
 class Shopware_Controllers_Backend_CSRFToken extends Shopware_Controllers_Backend_ExtJs implements CSRFWhitelistAware
 {
@@ -32,7 +35,7 @@ class Shopware_Controllers_Backend_CSRFToken extends Shopware_Controllers_Backen
     public function init()
     {
         Shopware()->Plugins()->Backend()->Auth()->setNoAuth();
-        $this->Front()->Plugins()->ViewRenderer()->setNoRender(true);
+        $this->Front()->Plugins()->ViewRenderer()->setNoRender();
         parent::init();
     }
 
@@ -48,17 +51,20 @@ public function getWhitelistedCSRFActions()
 
     /**
      * Generates a token and fills the cookie and session
+     *
+     * @return void
      */
     public function generateAction()
     {
         /** @var Enlight_Components_Session_Namespace $session */
-        $session = Shopware()->BackendSession();
+        $session = $this->container->get('backendsession');
 
-        if (!$token = $session->offsetGet('X-CSRF-Token')) {
-            $token = \Shopware\Components\Random::getAlphanumericString(30);
-            $session->offsetSet('X-CSRF-Token', $token);
+        $token = $session->get(CSRFTokenValidator::CSRF_TOKEN_HEADER);
+        if (!\is_string($token)) {
+            $token = Random::getAlphanumericString(30);
+            $session->set(CSRFTokenValidator::CSRF_TOKEN_HEADER, $token);
         }
 
-        $this->Response()->headers->set('x-csrf-token', $token);
+        $this->Response()->headers->set(CSRFTokenValidator::CSRF_TOKEN_RESPONSE_HEADER, $token);
     }
 }
diff --git a/engine/Shopware/Controllers/Backend/Cache.php b/engine/Shopware/Controllers/Backend/Cache.php
index f2cde867a2f..cc566264fd2 100644
--- a/engine/Shopware/Controllers/Backend/Cache.php
+++ b/engine/Shopware/Controllers/Backend/Cache.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\ORM\AbstractQuery;
@@ -29,28 +29,6 @@
 use Shopware\Components\Theme\PathResolver;
 use Shopware\Models\Shop\Shop;
 
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
 class Shopware_Controllers_Backend_Cache extends Shopware_Controllers_Backend_ExtJs
 {
     /**
diff --git a/engine/Shopware/Controllers/Backend/CanceledOrder.php b/engine/Shopware/Controllers/Backend/CanceledOrder.php
index a37a8bdb089..a2bb3958c38 100644
--- a/engine/Shopware/Controllers/Backend/CanceledOrder.php
+++ b/engine/Shopware/Controllers/Backend/CanceledOrder.php
@@ -1,28 +1,29 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\ORM\AbstractQuery;
+use Doctrine\ORM\Query;
 use Shopware\Bundle\CartBundle\CartPositionsMode;
 use Shopware\Bundle\MailBundle\Service\LogEntryBuilder;
 use Shopware\Components\Model\ModelManager;
@@ -43,6 +44,9 @@
  */
 class Shopware_Controllers_Backend_CanceledOrder extends Shopware_Controllers_Backend_ExtJs
 {
+    /**
+     * @return void
+     */
     public function convertOrderAction()
     {
         if (!($orderId = $this->Request()->getParam('orderId'))) {
@@ -93,7 +97,6 @@ public function convertOrderAction()
         $numberModel->setNumber($newOrderNumber);
 
         // Set new ordernumber to the order and its details
-        /** @var Order $orderModel */
         $orderModel = $this->get('models')->find(Order::class, $orderId);
         $orderModel->setNumber((string) $newOrderNumber);
         foreach ($orderModel->getDetails() as $detailModel) {
@@ -125,7 +128,6 @@ public function convertOrderAction()
             $result[0]['customer']['defaultShippingAddress'] = $result[0]['customer']['defaultBillingAddress'];
         }
 
-        /** @var Customer $customer */
         $customer = $this->get('models')->find(Customer::class, $result[0]['customer']['id']);
 
         // Copy customer number into billing address from customer
@@ -136,7 +138,6 @@ public function convertOrderAction()
             return (string) $value;
         }, $result[0]['customer']['defaultBillingAddress']);
 
-        /** @var Country $billingCountry */
         $billingCountry = $this->get('models')->find(Country::class, $result[0]['customer']['defaultBillingAddress']['countryId']);
 
         // Create new entry in s_order_billingaddress
@@ -152,7 +153,6 @@ public function convertOrderAction()
             return (string) $value;
         }, $result[0]['customer']['defaultShippingAddress']);
 
-        /** @var Country $shippingCountry */
         $shippingCountry = $this->get('models')->find(Country::class, $result[0]['customer']['defaultShippingAddress']['countryId']);
 
         // Create new entry in s_order_shippingaddress
@@ -164,7 +164,6 @@ public function convertOrderAction()
         $this->get('models')->persist($shippingModel);
 
         // Finally set the order to be a regular order
-        /** @var Status $statusModel */
         $statusModel = $this->get('models')->find(Status::class, 1);
         $orderModel->setOrderStatus($statusModel);
 
@@ -176,6 +175,8 @@ public function convertOrderAction()
     /**
      * Get last viewports/exit pages. This way you can determine, where the customers do have
      * problems with the shop system.
+     *
+     * @return void
      */
     public function getViewportsAction()
     {
@@ -267,6 +268,8 @@ public function getViewportsAction()
 
     /**
      * Get available vouchers for a customer who canceled his order.
+     *
+     * @return void
      */
     public function getVoucherAction()
     {
@@ -294,10 +297,13 @@ public function getVoucherAction()
 
     /**
      * Sends a CanceledQuestion Mail to a given mail-address
+     *
+     * @return void
      */
     public function sendCanceledQuestionMailAction()
     {
-        if (!($mailTo = $this->Request()->getParam('mail'))) {
+        $mailTo = $this->Request()->getParam('mail');
+        if (!$mailTo) {
             $this->View()->assign([
                 'success' => false,
                 'message' => $this->translateMessage('errorMessage/noMail', 'No mail passed.'),
@@ -306,7 +312,8 @@ public function sendCanceledQuestionMailAction()
             return;
         }
 
-        if (!($template = $this->Request()->getParam('template'))) {
+        $template = $this->Request()->getParam('template');
+        if (!$template) {
             $this->View()->assign([
                 'success' => false,
                 'message' => $this->translateMessage('errorMessage/noTemplate', 'No template passed.'),
@@ -325,7 +332,8 @@ public function sendCanceledQuestionMailAction()
             return;
         }
 
-        if (!($customerId = $this->Request()->getParam('customerId'))) {
+        $customerId = $this->Request()->getParam('customerId');
+        if (!$customerId) {
             $this->View()->assign([
                 'success' => false,
                 'message' => $this->translateMessage('errorMessage/noCustomerId', 'No customerId passed.'),
@@ -334,7 +342,8 @@ public function sendCanceledQuestionMailAction()
             return;
         }
 
-        if (!($orderId = $this->Request()->getParam('orderId'))) {
+        $orderId = $this->Request()->getParam('orderId');
+        if (!$orderId) {
             $this->View()->assign([
                 'success' => false,
                 'message' => $this->translateMessage('errorMessage/noOrderId', 'No orderId passed.'),
@@ -344,8 +353,7 @@ public function sendCanceledQuestionMailAction()
         }
 
         $code = null;
-        // Set the template depending on the voucherId. -1 is a special Id, which defines
-        // the 'Ask for Reason' question.
+        // Set the template depending on the voucherId. -1 is a special ID, which defines the 'Ask for Reason' question.
         if ($template === 'sCANCELEDQUESTION') {
             $context = [];
         } else {
@@ -358,24 +366,24 @@ public function sendCanceledQuestionMailAction()
 
                 return;
             }
-            if ($code[0]['validTo'] !== null) {
-                $code[0]['validTo'] = $code[0]['validTo']->format('Y-m-d');
+            if ($code['validTo'] !== null) {
+                $code['validTo'] = $code['validTo']->format('Y-m-d');
             }
-            if ($code[0]['validFrom'] !== null) {
-                $code[0]['validFrom'] = $code[0]['validFrom']->format('Y-m-d');
+            if ($code['validFrom'] !== null) {
+                $code['validFrom'] = $code['validFrom']->format('Y-m-d');
             }
             $context = [
-                'sVouchercode' => $code[0]['code'],
-                'sVouchervalue' => $code[0]['value'],
-                'sVouchervalidto' => $code[0]['validTo'],
-                'sVouchervalidfrom' => $code[0]['validFrom'],
-                'sVoucherpercental' => $code[0]['percental'],
+                'sVouchercode' => $code['code'],
+                'sVouchervalue' => $code['value'],
+                'sVouchervalidto' => $code['validTo'],
+                'sVouchervalidfrom' => $code['validFrom'],
+                'sVoucherpercental' => $code['percental'],
             ];
         }
 
         // Find the shop matching the order
         $orderModel = $this->get('models')->find(Order::class, $orderId);
-        if (!$orderModel instanceof Shopware\Models\Order\Order) {
+        if (!$orderModel instanceof Order) {
             $shop = $this->get('models')->getRepository(Shop::class)->getActiveDefault();
         } else {
             $shop = $orderModel->getLanguageSubShop();
@@ -402,19 +410,21 @@ public function sendCanceledQuestionMailAction()
         }
 
         // Mark the used voucher-code as reserved for our user
-        $builder = $this->get('models')->createQueryBuilder();
-        $builder->update(Code::class, 'code')
+        if (\is_array($code)) {
+            $builder = $this->get('models')->createQueryBuilder();
+            $builder->update(Code::class, 'code')
                 ->set('code.customerId', $customerId)
                 ->where('code.id = ?1')
                 ->andWhere('code.customerId is NULL')
-                ->setParameter(1, $code[0]['id'])
+                ->setParameter(1, $code['id'])
                 ->getQuery()
                 ->execute();
+        }
 
         // Write to db that Voucher/Mail was already sent
         // For compatibility reason this is done the same way it was done in Shopware 3
         if ($template === 'sCANCELEDQUESTION') {
-            // 'Frage gesendet' marks a order, when its customer got a "Ask Reason" mail
+            // 'Frage gesendet' marks an order, when its customer got an "Ask Reason" mail
             // Compatible with Shopware 3
 
             $orderRepository = $this->get('models')->getRepository(Order::class);
@@ -433,6 +443,8 @@ public function sendCanceledQuestionMailAction()
 
     /**
      * Get data for the statistics view
+     *
+     * @return void
      */
     public function getStatisticsAction()
     {
@@ -478,6 +490,8 @@ public function getStatisticsAction()
 
     /**
      * Gert articles from canceled orders
+     *
+     * @return void
      */
     public function getArticleAction()
     {
@@ -548,6 +562,8 @@ public function getArticleAction()
 
     /**
      * Read canceled baskets
+     *
+     * @return void
      */
     public function getBasketAction()
     {
@@ -623,6 +639,8 @@ public function getBasketAction()
 
     /**
      * Read canceled orders from database
+     *
+     * @return void
      */
     public function getOrderAction()
     {
@@ -659,11 +677,12 @@ public function getOrderAction()
         $builder->setFirstResult($offset)
                 ->setMaxResults($limit);
 
+        /** @var Query<array<string, mixed>> $query */
         $query = $builder->getQuery();
         $query->setHydrationMode(AbstractQuery::HYDRATE_ARRAY);
         $paginator = $this->getModelManager()->createPaginator($query);
         $total = $paginator->count();
-        $orders = $paginator->getIterator()->getArrayCopy();
+        $orders = iterator_to_array($paginator);
 
         // Translate payment and dispatch method names.
         $translationComponent = $this->get(Shopware_Components_Translation::class);
@@ -678,6 +697,8 @@ public function getOrderAction()
 
     /**
      * Delete an order
+     *
+     * @return void
      */
     public function deleteOrderAction()
     {
@@ -731,35 +752,31 @@ protected function initAcl()
 
     /**
      * Read free codes from the database. If no free codes are available, null will be returned
+     *
+     * @return array<string, mixed>|null
      */
     private function getFreeVoucherCode(int $voucherId): ?array
     {
-        $builder = $this->get('models')->createQueryBuilder();
-        $builder->select([
-            'voucherCodes.id',
-            'voucherCodes.code',
-            'voucher.validTo',
-            'voucher.value',
-            'voucher.percental',
-            'voucher.validFrom',
-        ])
-                ->from(Voucher::class, 'voucher')
-                ->leftJoin('voucher.codes', 'voucherCodes')
-                ->where('voucher.modus = ?1')
-                ->andWhere('voucher.id = :voucherId')
-                ->andWhere('voucher.validTo >= CURRENT_DATE() OR voucher.validTo is NULL')
-                ->andWhere('voucherCodes.customerId is NULL')
-                ->andWhere('voucherCodes.cashed = 0')
-                ->setParameter(1, 1)
-                ->setParameter('voucherId', $voucherId)
-                ->setMaxResults(1);
-        $query = $builder->getQuery();
-        $total = $this->get('models')->getQueryCount($query);
-        if ($total === 0) {
-            return null;
-        }
-
-        return $query->getArrayResult();
+        return $this->get('models')->createQueryBuilder()
+            ->select([
+                'voucherCodes.id',
+                'voucherCodes.code',
+                'voucher.validTo',
+                'voucher.value',
+                'voucher.percental',
+                'voucher.validFrom',
+            ])
+            ->from(Voucher::class, 'voucher')
+            ->leftJoin('voucher.codes', 'voucherCodes')
+            ->where('voucher.modus = 1')
+            ->andWhere('voucher.id = :voucherId')
+            ->andWhere('voucher.validTo >= CURRENT_DATE() OR voucher.validTo is NULL')
+            ->andWhere('voucherCodes.customerId is NULL')
+            ->andWhere('voucherCodes.cashed = 0')
+            ->setParameter('voucherId', $voucherId)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult(AbstractQuery::HYDRATE_ARRAY);
     }
 
     /**
@@ -789,7 +806,6 @@ private function getOutOfStockProducts(Order $order): array
 
     private function getOrderPositionByProduct(ProductVariant $variant, Order $order): ?Detail
     {
-        /** @var Detail $detail */
         foreach ($order->getDetails() as $detail) {
             if (!$this->isProductPosition($detail)) {
                 continue;
@@ -825,7 +841,7 @@ private function getProductsOfOrder(Order $order): array
      * Function which calculates, validates and updates the new in stock when a cancelled order will be transformed into
      * a regular order
      */
-    private function convertCancelledOrderInStock(Order $orderModel): bool
+    private function convertCancelledOrderInStock(Order $orderModel): void
     {
         $entityManager = $this->get(ModelManager::class);
 
@@ -843,8 +859,6 @@ private function convertCancelledOrderInStock(Order $orderModel): bool
 
             $entityManager->persist($product);
         }
-
-        return true;
     }
 
     /**
diff --git a/engine/Shopware/Controllers/Backend/Category.php b/engine/Shopware/Controllers/Backend/Category.php
index 360357c730c..cd5b09399fe 100644
--- a/engine/Shopware/Controllers/Backend/Category.php
+++ b/engine/Shopware/Controllers/Backend/Category.php
@@ -1,37 +1,40 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Query\QueryBuilder;
 use Doctrine\ORM\AbstractQuery;
+use Doctrine\ORM\Query;
 use Shopware\Components\CategoryHandling\CategoryDuplicator;
 use Shopware\Components\Model\CategoryDenormalization;
 use Shopware\Components\Model\ModelManager;
 use Shopware\Models\Article\Article;
-use Shopware\Models\Article\Repository;
 use Shopware\Models\Category\Category;
+use Shopware\Models\Category\Repository as CategoryRepository;
 use Shopware\Models\Customer\Customer;
 use Shopware\Models\Customer\Group;
+use Shopware\Models\Customer\Repository as CustomerRepository;
 use Shopware\Models\Media\Media;
 use Shopware\Models\ProductStream\ProductStream;
 use Shopware_Components_Snippet_Manager as SnippetManager;
@@ -44,12 +47,12 @@
 class Shopware_Controllers_Backend_Category extends Shopware_Controllers_Backend_ExtJs
 {
     /**
-     * @var \Shopware\Models\Category\Repository
+     * @var CategoryRepository
      */
     protected $repository;
 
     /**
-     * @var \Shopware\Models\Customer\Repository
+     * @var CustomerRepository
      */
     protected $customerRepository;
 
@@ -76,12 +79,10 @@ public function __construct(ModelManager $em, SnippetManager $translation)
      *
      * Helper Method to get access to the category repository.
      *
-     * @return Shopware\Models\Category\Repository
+     * @return CategoryRepository
      */
     public function getRepository()
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
-
         if ($this->repository === null) {
             $this->repository = $this->em->getRepository(Category::class);
         }
@@ -96,8 +97,6 @@ public function getRepository()
      */
     public function getCategoryComponent()
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
-
         return Shopware()->Container()->get('categorydenormalization');
     }
 
@@ -183,13 +182,14 @@ public function getDetailAction()
             $node = is_numeric($node) ? (int) $node : 1;
             $filter[] = ['property' => 'c.parentId', 'value' => $node];
         }
+        /** @var Query<array<string, mixed>> $query */
         $query = $this->getRepository()->getBackendDetailQuery($node)->getQuery();
         $query->setHydrationMode(AbstractQuery::HYDRATE_ARRAY);
         $paginator = $this->getModelManager()->createPaginator($query);
-        $data = $paginator->getIterator()->getArrayCopy();
+        $data = iterator_to_array($paginator);
         $data = $data[0];
 
-        $data['imagePath'] = $data['media']['id'];
+        $data['imagePath'] = $data['media']['id'] ?? null;
 
         $this->View()->assign(['success' => true, 'data' => $data]);
     }
@@ -260,7 +260,7 @@ public function getIdPathAction()
      */
     public function getPathByQuery($query = null, $separator = '>', $parents = false)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         if (empty($query)) {
             $where = 'parent=1';
@@ -343,7 +343,7 @@ public function getArticlesAction()
         ];
 
         /** @var QueryBuilder $builder */
-        $builder = $this->get(\Doctrine\DBAL\Connection::class)->createQueryBuilder();
+        $builder = $this->get(Connection::class)->createQueryBuilder();
         $builder->select([
             'SQL_CALC_FOUND_ROWS articles.id as articleId',
             'articles.name',
@@ -366,7 +366,7 @@ public function getArticlesAction()
         $builder->setParameters($params);
         $result = $builder->execute()->fetchAll();
 
-        $count = $this->get(\Doctrine\DBAL\Connection::class)->fetchColumn('SELECT FOUND_ROWS()');
+        $count = $this->get(Connection::class)->fetchColumn('SELECT FOUND_ROWS()');
 
         $this->View()->assign([
             'success' => true,
@@ -414,7 +414,7 @@ public function getCategoryArticlesAction()
 
         $paginator = $this->getModelManager()->createPaginator($query);
 
-        $data = $paginator->getIterator()->getArrayCopy();
+        $data = iterator_to_array($paginator);
         $count = $paginator->count();
 
         $this->View()->assign([
@@ -535,10 +535,8 @@ public function saveNewChildPositionsAction()
      */
     public function saveDetail()
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
-
         $params = $this->Request()->getParams();
-        $categoryId = (int) $params['id'];
+        $categoryId = (int) ($params['id'] ?? 0);
 
         $repo = $this->em->getRepository(Category::class);
 
@@ -547,7 +545,7 @@ public function saveDetail()
             $this->em->persist($categoryModel);
 
             // Find parent for newly created category
-            $params['parentId'] = is_numeric($params['parentId']) ? (int) $params['parentId'] : 1;
+            $params['parentId'] = isset($params['parentId']) && is_numeric($params['parentId']) ? (int) $params['parentId'] : 1;
             /** @var Category $parentCategory */
             $parentCategory = $repo->find($params['parentId']);
             $categoryModel->setParent($parentCategory);
@@ -578,7 +576,7 @@ public function saveDetail()
         }
 
         $categoryModel->setStream(null);
-        if ($params['streamId']) {
+        if (isset($params['streamId'])) {
             $params['stream'] = $this->em->find(ProductStream::class, (int) $params['streamId']);
         }
 
@@ -598,12 +596,13 @@ public function saveDetail()
         $this->em->flush();
 
         $categoryId = $categoryModel->getId();
+        /** @var Query<array<string, mixed>> $query */
         $query = $repo->getBackendDetailQuery($categoryId)->getQuery();
         $query->setHydrationMode(AbstractQuery::HYDRATE_ARRAY);
         $paginator = $this->em->createPaginator($query);
-        $data = $paginator->getIterator()->getArrayCopy();
+        $data = iterator_to_array($paginator);
         $data = $data[0];
-        $data['imagePath'] = $data['media']['path'];
+        $data['imagePath'] = $data['media']['path'] ?? null;
 
         $this->View()->assign(['success' => true, 'data' => $data, 'total' => \count($data)]);
     }
@@ -906,7 +905,7 @@ protected function addCategoryArticles($categoryId, $articleIds)
     protected function prepareMediaAssociatedData($data)
     {
         if (!empty($data['imagePath'])) {
-            $data['media'] = $this->get(\Shopware\Components\Model\ModelManager::class)->find(Media::class, $data['imagePath']);
+            $data['media'] = $this->get(ModelManager::class)->find(Media::class, $data['imagePath']);
         } else {
             $data['media'] = null;
         }
@@ -917,7 +916,7 @@ protected function prepareMediaAssociatedData($data)
     /**
      * Helper Method to get access to the customer repository.
      *
-     * @return \Shopware\Models\Customer\Repository
+     * @return CustomerRepository
      */
     private function getCustomerRepository()
     {
@@ -930,15 +929,11 @@ private function getCustomerRepository()
 
     /**
      * This method loads the customer group models for the passed ids in the "customerGroups" parameter.
-     *
-     * @param array $data
-     *
-     * @return array
      */
-    private function prepareCustomerGroupsAssociatedData($data)
+    private function prepareCustomerGroupsAssociatedData(array $data): array
     {
         $customerGroups = [];
-        foreach ($data['customerGroups'] as $customerGroupData) {
+        foreach ($data['customerGroups'] ?? [] as $customerGroupData) {
             if (!empty($customerGroupData['id'])) {
                 $model = $this->em->find(Group::class, $customerGroupData['id']);
                 $customerGroups[] = $model;
diff --git a/engine/Shopware/Controllers/Backend/Config.php b/engine/Shopware/Controllers/Backend/Config.php
index a166ffcdac4..cd63a735c90 100644
--- a/engine/Shopware/Controllers/Backend/Config.php
+++ b/engine/Shopware/Controllers/Backend/Config.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\Common\Collections\ArrayCollection;
@@ -30,7 +30,6 @@
 use Shopware\Components\Model\Exception\ModelNotFoundException;
 use Shopware\Components\Model\ModelEntity;
 use Shopware\Components\Model\ModelRepository;
-use Shopware\Components\Model\QueryBuilder;
 use Shopware\Models\Article\Unit;
 use Shopware\Models\Category\Category;
 use Shopware\Models\Config\Element as ConfigElement;
@@ -75,6 +74,8 @@ class Shopware_Controllers_Backend_Config extends Shopware_Controllers_Backend_E
 
     /**
      * Return the config form navigation
+     *
+     * @return void
      */
     public function getNavigationAction()
     {
@@ -153,6 +154,8 @@ public function getNavigationAction()
 
     /**
      * Returns a form with values and elements
+     *
+     * @return void
      */
     public function getFormAction()
     {
@@ -164,7 +167,6 @@ public function getFormAction()
 
         $fallback = $this->getFallbackLocaleId($locale->getId());
 
-        /** @var QueryBuilder $builder */
         $builder = $repository->createQueryBuilder('form')
             ->leftJoin('form.elements', 'element')
             ->leftJoin('form.translations', 'formTranslation', Join::WITH, 'formTranslation.localeId IN (:localeId, :fallbackId)', 'formTranslation.localeId')
@@ -216,7 +218,7 @@ public function getFormAction()
             $store = $values['options']['store'];
 
             // Replace the store, which may contain multiple translations, with a store with translated messages:
-            if ($values['options']['translateUsingSnippets']) {
+            if (!empty($values['options']['translateUsingSnippets'])) {
                 $values['options']['store'] = $this->translateStoreUsingSnippets($store, $values['options']['namespace']);
             } else {
                 $values['options']['store'] = $this->translateStore($language, $store, $storeFallbackLocales);
@@ -238,12 +240,14 @@ public function getFormAction()
 
     /**
      * Save values from a config form
+     *
+     * @return void
      */
     public function saveFormAction()
     {
         $shopRepository = $this->getRepository('shop');
         if (!$shopRepository instanceof ShopRepository) {
-            throw new RuntimeException(sprintf('%s needed', ShopRepository::class));
+            throw new RuntimeException(\sprintf('%s needed', ShopRepository::class));
         }
         $elements = $this->Request()->getParam('elements');
 
@@ -258,13 +262,12 @@ public function saveFormAction()
 
     /**
      * Return a list of values for extended forms
+     *
+     * @return void
      */
     public function getListAction()
     {
-        /** @var string $name */
-        $name = $this->Request()->get('_repositoryClass');
-
-        /** @var QueryBuilder $builder */
+        $name = (string) $this->Request()->get('_repositoryClass');
         $builder = $this->getRepository($name)->createQueryBuilder($name);
 
         switch ($name) {
@@ -345,6 +348,8 @@ public function getListAction()
 
     /**
      * Return a list of values for extended forms
+     *
+     * @return void
      */
     public function getTableListAction()
     {
@@ -397,7 +402,7 @@ public function getTableListAction()
                     ];
                     $row['data'] = !\is_string($row['data']) ? var_export($row['data'], true) : $row['data'];
                 }
-                //get the total count
+                // get the total count
                 $select->reset(Zend_Db_Select::FROM);
                 $select->reset(Zend_Db_Select::LIMIT_COUNT);
                 $select->reset(Zend_Db_Select::LIMIT_OFFSET);
@@ -455,11 +460,12 @@ public function getTableListAction()
 
     /**
      * Return values for extended forms
+     *
+     * @return void
      */
     public function getValuesAction()
     {
-        $name = $this->Request()->get('_repositoryClass');
-        /** @var QueryBuilder $builder */
+        $name = (string) $this->Request()->get('_repositoryClass');
         $builder = $this->getRepository($name)->createQueryBuilder($name);
 
         switch ($name) {
@@ -531,6 +537,8 @@ public function getValuesAction()
 
     /**
      * Save the custom table values
+     *
+     * @return void
      */
     public function saveValuesAction()
     {
@@ -555,7 +563,7 @@ public function saveValuesAction()
         switch ($name) {
             case 'tax':
                 if (!$model instanceof Tax) {
-                    throw new RuntimeException(sprintf('Model object is not an instance of expected class "%s"', Tax::class));
+                    throw new RuntimeException(\sprintf('Model object is not an instance of expected class "%s"', Tax::class));
                 }
                 $this->saveTaxRules($data, $model);
 
@@ -564,7 +572,7 @@ public function saveValuesAction()
             case 'customerGroup':
                 if (isset($data['discounts'])) {
                     if (!$model instanceof CustomerGroup) {
-                        throw new RuntimeException(sprintf('Model object is not an instance of expected class "%s"', CustomerGroup::class));
+                        throw new RuntimeException(\sprintf('Model object is not an instance of expected class "%s"', CustomerGroup::class));
                     }
                     $model->getDiscounts()->clear();
                     $manager->flush();
@@ -709,10 +717,11 @@ public function saveValuesAction()
                 break;
 
             case 'document':
-                if ($data['id']) {
-                    if (!$model instanceof Document) {
-                        throw new RuntimeException(sprintf('Model object is not an instance of expected class "%s"', Document::class));
-                    }
+                if (!$model instanceof Document) {
+                    throw new RuntimeException(\sprintf('Model object is not an instance of expected class "%s"', Document::class));
+                }
+
+                if (!empty($data['id'])) {
                     $elements = new ArrayCollection();
                     foreach ($data['elements'] as $element) {
                         $elementModel = $this->getRepository('documentElement')->find($element['id']);
@@ -777,6 +786,8 @@ public function saveValuesAction()
 
     /**
      * Save the custom table values
+     *
+     * @return void
      */
     public function saveTableValuesAction()
     {
@@ -840,6 +851,8 @@ public function saveTableValuesAction()
 
     /**
      * Save form values values with shop reverence
+     *
+     * @return void
      */
     public function deleteValuesAction()
     {
@@ -877,6 +890,8 @@ public function deleteValuesAction()
 
     /**
      * Save the custom table values
+     *
+     * @return void
      */
     public function deleteTableValuesAction()
     {
@@ -984,7 +999,7 @@ protected function getRepository($name)
                     $repository = DocumentElement::class;
                     break;
                 default:
-                    throw new RuntimeException(sprintf('Repository with name "%s" not found', $name));
+                    throw new RuntimeException(\sprintf('Repository with name "%s" not found', $name));
             }
             self::$repositories[$name] = $this->get('models')->getRepository($repository);
         }
@@ -1003,11 +1018,12 @@ protected function getTable($name)
     }
 
     /**
-     * @param string|int $localeId
+     * @param string|int           $localeId
+     * @param array<string, mixed> $values
      *
-     * @return array
+     * @return array<string, mixed>
      */
-    private function translateValues($localeId, array $values)
+    private function translateValues($localeId, array $values): array
     {
         if (!\array_key_exists('translations', $values)) {
             return $values;
@@ -1044,12 +1060,15 @@ private function translateValues($localeId, array $values)
      *              array(4, 'A string without translation')
      *          );
      *
-     * @param string $language        the preferred locale (e.g., the user's locale)
-     * @param array  $fallbackLocales a list of locales (e.g., ['en_GB', 'en'])
+     * @param string                                    $language        the preferred locale (e.g., the user's locale)
+     * @param array<array<string|array<string>>>|string $store
+     * @param array<string>                             $fallbackLocales a list of locales (e.g., ['en_GB', 'en'])
+     *
+     * @return array<array<string|array<string>>>|string
      */
-    private function translateStore($language, $store, array $fallbackLocales)
+    private function translateStore(string $language, $store, array $fallbackLocales)
     {
-        if (!\is_array($store)) {
+        if (\is_string($store)) {
             return $store;
         }
 
@@ -1080,11 +1099,9 @@ private function translateStore($language, $store, array $fallbackLocales)
     }
 
     /**
-     * @param string $namespace
-     *
      * @return array
      */
-    private function translateStoreUsingSnippets(array $store, $namespace)
+    private function translateStoreUsingSnippets(array $store, string $namespace)
     {
         $namespace = $this->container->get('snippets')->getNamespace($namespace);
         foreach ($store as &$row) {
@@ -1102,9 +1119,10 @@ private function translateStoreUsingSnippets(array $store, $namespace)
     }
 
     /**
-     * @return string|null
+     * @param array<string, string> $value
+     * @param array<string>         $tryLocales
      */
-    private function getTranslation(array $value, array $tryLocales)
+    private function getTranslation(array $value, array $tryLocales): ?string
     {
         foreach ($tryLocales as $tryLocale) {
             if (isset($value[$tryLocale])) {
@@ -1115,7 +1133,10 @@ private function getTranslation(array $value, array $tryLocales)
         return null;
     }
 
-    private function createDocumentElements($model)
+    /**
+     * @return ArrayCollection<int, DocumentElement>
+     */
+    private function createDocumentElements(Document $model): ArrayCollection
     {
         $elementCollection = new ArrayCollection();
 
@@ -1260,13 +1281,24 @@ private function createDocumentElements($model)
     /**
      * Simple validation for backend config elements
      *
-     * @param array $elementData
-     * @param array $value
-     *
-     * @return bool
+     * @param mixed|null           $value
+     * @param array<string, mixed> $elementData
      */
-    private function validateData($elementData, $value)
+    private function validateData(array $elementData, $value): bool
     {
+        switch ($elementData['type']) {
+            case 'number':
+                $option = $elementData['options'];
+
+                if (isset($option['minValue']) && (float) $option['minValue'] > $value) {
+                    return false;
+                }
+
+                if (isset($option['maxValue']) && (float) $option['maxValue'] < $value) {
+                    return false;
+                }
+        }
+
         switch ($elementData['name']) {
             /*
              * Add rules for a bad case and return false to abort saving
@@ -1322,7 +1354,7 @@ private function beforeSaveElement(array $elementData): void
     /**
      * @return int[] indexed by shop id
      */
-    private function getShopLocaleMapping()
+    private function getShopLocaleMapping(): array
     {
         $connection = Shopware()->Container()->get(Connection::class);
         $query = $connection->createQueryBuilder();
@@ -1335,11 +1367,11 @@ private function getShopLocaleMapping()
     }
 
     /**
-     * @param array $elementData
+     * @param array<string, mixed> $elementData
      *
      * @throws DBALException
      */
-    private function createSalutationSnippets($elementData): void
+    private function createSalutationSnippets(array $elementData): void
     {
         $connection = Shopware()->Container()->get(Connection::class);
 
@@ -1372,12 +1404,18 @@ private function createSalutationSnippets($elementData): void
     }
 
     /**
-     * @param array $elementData
+     * @param array<string, mixed>      $elementData
+     * @param array<string>|string|null $value
+     *
+     * @return array<string>|string|null
      */
-    private function prepareValue($elementData, $value)
+    private function prepareValue(array $elementData, $value)
     {
         switch ($elementData['name']) {
             case 'shopsalutations':
+                if (!\is_string($value)) {
+                    throw new InvalidArgumentException('Value for config option "shopsalutations" needs to be a string');
+                }
                 $values = explode(',', $value);
                 $value = implode(',', array_map('trim', $values));
                 break;
@@ -1386,7 +1424,10 @@ private function prepareValue($elementData, $value)
         return $value;
     }
 
-    private function saveElement(array $elementData, Shop $defaultShop)
+    /**
+     * @param array<string, mixed> $elementData
+     */
+    private function saveElement(array $elementData, Shop $defaultShop): void
     {
         $shopRepository = $this->getRepository('shop');
 
@@ -1463,32 +1504,25 @@ private function saveElement(array $elementData, Shop $defaultShop)
         ]);
     }
 
-    /**
-     * @param int $currentLocaleId
-     *
-     * @return int
-     */
-    private function getFallbackLocaleId($currentLocaleId)
+    private function getFallbackLocaleId(int $currentLocaleId): int
     {
         if ($currentLocaleId === 1) {
             return 1;
         }
 
-        $fallback = (int) $this->container->get(Connection::class)->fetchColumn(
+        return (int) $this->container->get(Connection::class)->fetchColumn(
             "SELECT id FROM s_core_locales WHERE locale = 'en_GB'"
         );
-
-        return $fallback;
     }
 
     /**
      * Replaces the locales with the snippets data
      *
-     * @param array $data
+     * @param array<array<string, string>> $data
      *
-     * @return array $data
+     * @return array<array<string, string>> $data
      */
-    private function getSnippetsForLocales($data)
+    private function getSnippetsForLocales(array $data): array
     {
         $snippets = $this->container->get('snippets');
         foreach ($data as &$locale) {
diff --git a/engine/Shopware/Controllers/Backend/CoreLicense.php b/engine/Shopware/Controllers/Backend/CoreLicense.php
index 6674e2ecab1..d4b0ab3a108 100644
--- a/engine/Shopware/Controllers/Backend/CoreLicense.php
+++ b/engine/Shopware/Controllers/Backend/CoreLicense.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\DBAL\Connection;
diff --git a/engine/Shopware/Controllers/Backend/CustomFacet.php b/engine/Shopware/Controllers/Backend/CustomFacet.php
index b453d68edd3..7a02768ea66 100644
--- a/engine/Shopware/Controllers/Backend/CustomFacet.php
+++ b/engine/Shopware/Controllers/Backend/CustomFacet.php
@@ -1,27 +1,28 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+use Doctrine\DBAL\Connection;
 use Shopware\Models\Search\CustomFacet;
 
 /**
@@ -36,7 +37,7 @@ public function changePositionAction()
         $id = (int) $this->Request()->getParam('id');
         $position = (int) $this->Request()->getParam('position');
 
-        $connection = $this->container->get(\Doctrine\DBAL\Connection::class);
+        $connection = $this->container->get(Connection::class);
 
         $connection->executeUpdate(
             'UPDATE s_search_custom_facet SET position = position - 1 WHERE position <= :position',
@@ -55,7 +56,7 @@ public function copyCategorySettingsAction()
     {
         $categoryId = (int) $this->Request()->getParam('categoryId');
 
-        $connection = $this->container->get(\Doctrine\DBAL\Connection::class);
+        $connection = $this->container->get(Connection::class);
 
         $data = $connection->fetchAssoc(
             'SELECT `hidefilter`, `facet_ids` FROM s_categories WHERE id = :id',
diff --git a/engine/Shopware/Controllers/Backend/CustomSorting.php b/engine/Shopware/Controllers/Backend/CustomSorting.php
index d345bf3f899..2761692bce9 100644
--- a/engine/Shopware/Controllers/Backend/CustomSorting.php
+++ b/engine/Shopware/Controllers/Backend/CustomSorting.php
@@ -1,27 +1,28 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+use Doctrine\DBAL\Connection;
 use Shopware\Models\Search\CustomSorting;
 
 /**
@@ -35,7 +36,7 @@ public function copyCategorySettingsAction()
     {
         $categoryId = (int) $this->Request()->getParam('categoryId');
 
-        $connection = $this->container->get(\Doctrine\DBAL\Connection::class);
+        $connection = $this->container->get(Connection::class);
 
         $data = $connection->fetchAssoc(
             'SELECT `hide_sortings`, `sorting_ids` FROM s_categories WHERE id = :id',
@@ -59,7 +60,7 @@ public function changePositionAction()
         $id = (int) $this->Request()->getParam('id');
         $position = (int) $this->Request()->getParam('position');
 
-        $connection = $this->container->get(\Doctrine\DBAL\Connection::class);
+        $connection = $this->container->get(Connection::class);
 
         $connection->executeUpdate(
             'UPDATE s_search_custom_sorting SET position = position - 1 WHERE position <= :position',
diff --git a/engine/Shopware/Controllers/Backend/Customer.php b/engine/Shopware/Controllers/Backend/Customer.php
index 8836a6f0b51..74520b4c452 100644
--- a/engine/Shopware/Controllers/Backend/Customer.php
+++ b/engine/Shopware/Controllers/Backend/Customer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\DBAL\Connection;
@@ -410,10 +410,10 @@ public function saveAction()
      */
     public function deleteAction()
     {
-        //get posted customers
+        // get posted customers
         $customers = $this->Request()->getParam('customers', [['id' => $this->Request()->getParam('id')]]);
 
-        //iterate the customers and add the remove action
+        // iterate the customers and add the remove action
         foreach ($customers as $customer) {
             $entity = $this->getRepository()->find($customer['id']);
             if ($entity === null) {
@@ -421,7 +421,7 @@ public function deleteAction()
             }
             $this->getManager()->remove($entity);
         }
-        //Performs all of the collected actions.
+        // Performs all of the collected actions.
         $this->getManager()->flush();
 
         $this->View()->assign([
@@ -502,14 +502,14 @@ public function performOrderAction()
             'shopId' => $shop->getId(),
         ]);
 
-        $url = $this->Front()->Router()->assemble([
+        $url = $this->Front()->ensureRouter()->assemble([
             'action' => 'performOrderRedirect',
             'hash' => $hash,
             'fullPath' => true,
         ]);
 
         if ($shop->getHost()) {
-            //change the url to the subshop url
+            // change the url to the subshop url
             $url = str_replace('://' . $this->Request()->getHttpHost(), '://' . $shop->getHost(), $url);
         }
 
@@ -530,8 +530,10 @@ public function performOrderRedirectAction()
 
         $data = $optinService->get(OptinServiceInterface::TYPE_CUSTOMER_LOGIN_FROM_BACKEND, $hash);
 
-        if ($data === null) {
+        if (!\is_array($data)) {
             $this->redirect(['module' => 'backend', 'controller' => 'index', 'action' => 'index']);
+
+            return;
         }
 
         $optinService->delete(OptinServiceInterface::TYPE_CUSTOMER_LOGIN_FROM_BACKEND, $hash);
@@ -779,8 +781,8 @@ private function getCustomer(int $id): array
         }
 
         $namespace = Shopware()->Container()->get('snippets')->getNamespace('frontend/salutation');
-        $data['defaultBillingAddress']['salutationSnippet'] = $namespace->get($data['defaultBillingAddress']['salutation']);
-        $data['defaultShippingAddress']['salutationSnippet'] = $namespace->get($data['defaultShippingAddress']['salutation']);
+        $data['defaultBillingAddress']['salutationSnippet'] = $namespace->get($data['defaultBillingAddress']['salutation'] ?? null);
+        $data['defaultShippingAddress']['salutationSnippet'] = $namespace->get($data['defaultShippingAddress']['salutation'] ?? null);
         $data['customerStreamIds'] = $this->fetchCustomerStreams($id);
 
         if ($data['firstLogin'] instanceof DateTimeInterface && $data['firstLogin']->getTimestamp() < 0) {
@@ -791,6 +793,9 @@ private function getCustomer(int $id): array
             $data['lastLogin'] = new DateTime('@0');
         }
 
+        unset($data['sessionId']);
+        unset($data['hashPassword']);
+
         return $data;
     }
 
@@ -820,13 +825,13 @@ private function prepareCustomerData(array $params, Customer $customer, ?Payment
         }
 
         // If a different payment method is selected, it must also be placed in the "paymentPreset" so that the risk management that does not reset.
-        if ($customer->getPaymentId() !== $params['paymentId']) {
+        if (isset($params['paymentId']) && $customer->getPaymentId() !== $params['paymentId']) {
             $params['paymentPreset'] = $params['paymentId'];
         }
 
         if (empty($params['shipping'][0]['firstName']) && empty($params['shipping'][0]['lastName'])) {
             // Shipping params are empty use the billing ones
-            $params['shipping'][0] = $params['billing'][0];
+            $params['shipping'][0] = $params['billing'][0] ?? null;
         }
 
         if ($paymentData && !empty($params['paymentData'])) {
diff --git a/engine/Shopware/Controllers/Backend/CustomerQuickView.php b/engine/Shopware/Controllers/Backend/CustomerQuickView.php
index 5aa8464b943..b565c66b9a6 100644
--- a/engine/Shopware/Controllers/Backend/CustomerQuickView.php
+++ b/engine/Shopware/Controllers/Backend/CustomerQuickView.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\DBAL\Connection;
@@ -309,6 +309,6 @@ private function loadFromRepository(): array
             }
         }
 
-        return ['success' => true, 'data' => array_values($sortedData), 'total' => $result->getCount()];
+        return ['success' => true, 'data' => $sortedData, 'total' => $result->getCount()];
     }
 }
diff --git a/engine/Shopware/Controllers/Backend/CustomerStream.php b/engine/Shopware/Controllers/Backend/CustomerStream.php
index 8c229075ae3..486129a17cf 100644
--- a/engine/Shopware/Controllers/Backend/CustomerStream.php
+++ b/engine/Shopware/Controllers/Backend/CustomerStream.php
@@ -1,28 +1,30 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\DBAL\Connection;
+use Shopware\Components\Api\Exception\NotFoundException;
 use Shopware\Components\Api\Resource\CustomerStream as CustomerStreamApi;
 use Shopware\Components\Model\ModelManager;
 use Shopware\Models\CustomerStream\CustomerStream;
@@ -38,7 +40,11 @@ class Shopware_Controllers_Backend_CustomerStream extends Shopware_Controllers_B
 
     public function delete($id)
     {
-        $this->getApiResource()->delete($id);
+        try {
+            $this->getApiResource()->delete((int) $id);
+        } catch (NotFoundException $e) {
+            return ['success' => false, 'error' => 'The passed id parameter exists no more.'];
+        }
 
         return ['success' => true];
     }
@@ -59,7 +65,7 @@ public function save($data)
         }
 
         if ($data['id']) {
-            $entity = $this->getApiResource()->update($data['id'], $data);
+            $entity = $this->getApiResource()->update((int) $data['id'], $data);
         } else {
             $entity = $this->getApiResource()->create($data);
         }
@@ -127,7 +133,7 @@ public function indexStreamAction()
         $this->View()->assign([
             'success' => true,
             'finish' => false,
-            'text' => sprintf($snippets->get('refresh_stream'), $handled, $total),
+            'text' => \sprintf($snippets->get('refresh_stream'), $handled, $total),
             'progress' => $handled / $total,
         ]);
     }
@@ -187,7 +193,7 @@ public function buildSearchIndexAction()
             'success' => true,
             'finish' => false,
             'params' => ['lastId' => (int) array_pop($ids)],
-            'text' => sprintf($snippets->get('refresh_customer'), $handled, $total),
+            'text' => \sprintf($snippets->get('refresh_customer'), $handled, $total),
             'progress' => $handled / $total,
         ]);
     }
@@ -199,12 +205,16 @@ public function loadStreamAction()
     {
         $request = $this->Request();
 
+        $streamId = $request->getParam('streamId');
+        if ($streamId !== null) {
+            $streamId = (int) $streamId;
+        }
         $result = $this->getApiResource()->getOne(
-            $request->getParam('streamId'),
+            $streamId,
             (int) $request->getParam('start', 0),
             (int) $request->getParam('limit', 50),
-            $request->getParam('conditions'),
-            $request->getParam('sorting')
+            $request->getParam('conditions', ''),
+            $request->getParam('sorting', '')
         );
 
         $data = $this->container->get(CustomerStreamRepositoryInterface::class)->fetchBackendListing($result->getIds());
diff --git a/engine/Shopware/Controllers/Backend/Document.php b/engine/Shopware/Controllers/Backend/Document.php
index 2bb6510b7ac..6960bd4c549 100644
--- a/engine/Shopware/Controllers/Backend/Document.php
+++ b/engine/Shopware/Controllers/Backend/Document.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\CSRFWhitelistAware;
diff --git a/engine/Shopware/Controllers/Backend/Emotion.php b/engine/Shopware/Controllers/Backend/Emotion.php
index a5abcce13be..220858ea8f2 100644
--- a/engine/Shopware/Controllers/Backend/Emotion.php
+++ b/engine/Shopware/Controllers/Backend/Emotion.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\Common\Collections\ArrayCollection;
@@ -36,6 +36,7 @@
 use Shopware\Components\Emotion\Exception\MappingRequiredException;
 use Shopware\Components\Model\Exception\ModelNotFoundException;
 use Shopware\Components\Model\ModelManager;
+use Shopware\Components\Model\QueryBuilder;
 use Shopware\Components\Random;
 use Shopware\Components\ShopRegistrationServiceInterface;
 use Shopware\Models\Category\Category;
@@ -213,14 +214,14 @@ public function detailAction()
                 $entry = $filterResult;
 
                 switch (strtolower($entry['valueType'])) {
-                    case 'json':
+                    case Field::VALUE_TYPE_JSON:
                         if ($entry['value'] !== '') {
                             $value = Zend_Json::decode($entry['value']);
                         } else {
                             $value = null;
                         }
                         break;
-                    case 'string':
+                    case Field::VALUE_TYPE_STRING:
                     default:
                         $value = $entry['value'];
                         break;
@@ -334,7 +335,7 @@ public function uploadAction()
 
             $this->View()->assign([
                 'success' => false,
-                'message' => sprintf(
+                'message' => \sprintf(
                     'Uploaded file %s is no zip file',
                     $name
                 ),
@@ -343,19 +344,19 @@ public function uploadAction()
             return;
         }
 
-        $downloadPath = sprintf('%s%s', sys_get_temp_dir(), DIRECTORY_SEPARATOR);
+        $downloadPath = \sprintf('%s%s', sys_get_temp_dir(), DIRECTORY_SEPARATOR);
 
         if (!is_writable($downloadPath)) {
             $this->View()->assign([
                 'success' => false,
-                'error' => sprintf("Target Directory %s isn't writable", $downloadPath),
+                'error' => \sprintf("Target Directory %s isn't writable", $downloadPath),
             ]);
 
             return;
         }
 
-        $tempFile = sprintf('%s%s', Random::getAlphanumericString(32), '.zip');
-        $copyTo = sprintf('%s%s', $downloadPath, $tempFile);
+        $tempFile = \sprintf('%s%s', Random::getAlphanumericString(32), '.zip');
+        $copyTo = \sprintf('%s%s', $downloadPath, $tempFile);
 
         $fileSystem->copy($file, $copyTo);
         $fileSystem->remove($file->getPathname());
@@ -373,7 +374,7 @@ public function uploadAction()
      */
     public function importAction()
     {
-        $filePath = sprintf(
+        $filePath = \sprintf(
             '%s%s%s',
             sys_get_temp_dir(),
             DIRECTORY_SEPARATOR,
@@ -407,7 +408,7 @@ public function afterImportAction()
                 throw new InvalidArgumentException('File path can not be empty', 1);
             }
 
-            $filePath = sprintf(
+            $filePath = \sprintf(
                 '%s%s%s',
                 sys_get_temp_dir(),
                 DIRECTORY_SEPARATOR,
@@ -963,7 +964,7 @@ protected function getTemplates($offset = null, $limit = null, $id = null)
             $result = [
                 'success' => true,
                 'total' => $paginator->count(),
-                'data' => $paginator->getIterator()->getArrayCopy(),
+                'data' => iterator_to_array($paginator),
             ];
         } catch (Exception $e) {
             return ['success' => false, 'error' => $e->getMessage()];
@@ -977,7 +978,7 @@ protected function getTemplates($offset = null, $limit = null, $id = null)
      * @param int|null $limit
      * @param int|null $id
      *
-     * @return Doctrine\ORM\QueryBuilder|Shopware\Components\Model\QueryBuilder
+     * @return QueryBuilder
      */
     protected function getTemplatesQuery($offset = null, $limit = null, $id = null)
     {
@@ -1356,16 +1357,16 @@ private function createElementData(Emotion $emotion, array $element, array $elem
     /**
      * Method for processing the different value types of the data fields.
      *
-     * @param array|string $value
+     * @param array<array<string, mixed>>|string|null $value
      */
-    private function processDataFieldValue(Field $field, $value): string
+    private function processDataFieldValue(Field $field, $value): ?string
     {
         $valueType = strtolower($field->getValueType());
         $xType = $field->getXType();
 
         $mediaFields = $this->getMediaXTypes();
 
-        if ($valueType === 'json') {
+        if ($valueType === Field::VALUE_TYPE_JSON) {
             if (\is_array($value)) {
                 foreach ($value as &$val) {
                     if (!isset($val['path'])) {
@@ -1379,10 +1380,14 @@ private function processDataFieldValue(Field $field, $value): string
             $value = Zend_Json::encode($value);
         }
 
-        if (\in_array($xType, $mediaFields, true) && $this->mediaService->isEncoded($value)) {
+        if (\is_string($value) && \in_array($xType, $mediaFields, true) && $this->mediaService->isEncoded($value)) {
             $value = $this->mediaService->normalize($value);
         }
 
+        if (\is_array($value)) {
+            throw new UnexpectedValueException(\sprintf('Use field value type "%s" if arrays should be saved. Got value type "%s" instead', Field::VALUE_TYPE_JSON, $valueType));
+        }
+
         return $value;
     }
 
@@ -1468,6 +1473,8 @@ private function deleteTranslations(array $emotions): void
     }
 
     /**
+     * @param Query<Template> $query
+     *
      * @return Paginator<Template>
      */
     private function getQueryPaginator(Query $query): Paginator
@@ -1583,7 +1590,7 @@ private function getSeoUrlFromRouter(int $emotionId, int $shopId): ?string
 
         $this->get(ShopRegistrationServiceInterface::class)->registerShop($parent);
 
-        return $this->Front()->Router()->assemble([
+        return $this->Front()->ensureRouter()->assemble([
             'controller' => 'campaign',
             'module' => 'frontend',
             'emotionId' => $emotionId,
diff --git a/engine/Shopware/Controllers/Backend/EmotionPreset.php b/engine/Shopware/Controllers/Backend/EmotionPreset.php
index 496e402507e..cc484bf0caf 100644
--- a/engine/Shopware/Controllers/Backend/EmotionPreset.php
+++ b/engine/Shopware/Controllers/Backend/EmotionPreset.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\ORM\NoResultException;
@@ -141,7 +141,7 @@ public function saveAction()
         $transformer = $this->container->get(EmotionToPresetDataTransformerInterface::class);
         $data = $this->Request()->getParams();
 
-        if (!$data['emotionId']) {
+        if (empty($data['emotionId'])) {
             $this->View()->assign(['success' => false]);
 
             return;
@@ -149,7 +149,7 @@ public function saveAction()
 
         $data = array_merge($data, $transformer->transform($data['emotionId']));
 
-        if ($data['id']) {
+        if (!empty($data['id'])) {
             $resource->update($data['id'], $data, $this->getLocale());
         } else {
             $resource->create($data, $this->getLocale());
diff --git a/engine/Shopware/Controllers/Backend/Error.php b/engine/Shopware/Controllers/Backend/Error.php
index 1195d9b385d..6795d0eb209 100644
--- a/engine/Shopware/Controllers/Backend/Error.php
+++ b/engine/Shopware/Controllers/Backend/Error.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Shopware_Controllers_Backend_Error extends Shopware_Controllers_Frontend_Error
@@ -29,7 +29,7 @@ public function preDispatch(): void
         parent::preDispatch();
 
         $contentType = $this->Request()->getHeader('Content-Type');
-        if ($contentType && strpos($contentType, 'application/json') === 0) {
+        if ($contentType && str_starts_with($contentType, 'application/json')) {
             $this->Front()->Plugins()->Json()->setRenderer();
             $this->View()->assign('success', false);
         }
diff --git a/engine/Shopware/Controllers/Backend/Export.php b/engine/Shopware/Controllers/Backend/Export.php
index c4514f08d05..f0533b9910f 100644
--- a/engine/Shopware/Controllers/Backend/Export.php
+++ b/engine/Shopware/Controllers/Backend/Export.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\CSRFWhitelistAware;
@@ -82,7 +82,7 @@ public function indexAction()
 
         $diffInterval = time();
         if ($productFeed->getCacheRefreshed()) {
-            $diffInterval = $diffInterval - $productFeed->getCacheRefreshed()->getTimestamp();
+            $diffInterval -= $productFeed->getCacheRefreshed()->getTimestamp();
         }
 
         if ($diffInterval >= $productFeed->getInterval() || !file_exists($filePath)) {
@@ -124,9 +124,8 @@ public function getWhitelistedCSRFActions()
     private function generateExport($output)
     {
         $outputHandle = fopen($output, 'w');
-
-        if (!\is_resource($outputHandle)) {
-            throw new \RuntimeException(sprintf('Output file %s can not be opened', $outputHandle));
+        if ($outputHandle === false) {
+            throw new RuntimeException(\sprintf('Output file %s can not be opened', $output));
         }
 
         $this->export->sSmarty = $this->View()->Engine();
@@ -192,7 +191,7 @@ private function createOutputDirectory()
     {
         $dirName = $this->container->getParameter('shopware.product_export.cache_dir');
         if (!\is_string($dirName)) {
-            throw new \RuntimeException('Parameter shopware.product_export.cache_dir has to be an string');
+            throw new RuntimeException('Parameter shopware.product_export.cache_dir has to be an string');
         }
 
         if (!file_exists($dirName)) {
diff --git a/engine/Shopware/Controllers/Backend/ExtJs.php b/engine/Shopware/Controllers/Backend/ExtJs.php
index f28799c14ed..11e44516087 100644
--- a/engine/Shopware/Controllers/Backend/ExtJs.php
+++ b/engine/Shopware/Controllers/Backend/ExtJs.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 abstract class Shopware_Controllers_Backend_ExtJs extends Enlight_Controller_Action
@@ -27,7 +27,7 @@ abstract class Shopware_Controllers_Backend_ExtJs extends Enlight_Controller_Act
     /**
      * Array with all permissions to check in this controller
      *
-     * @var array
+     * @var array<string, array{privilege: string, errorMessage: string}>
      */
     protected $aclPermissions = [];
 
@@ -43,7 +43,7 @@ public function init()
         $this->Front()->Plugins()->JsonRequest()
             ->setParseInput()
             ->setParseParams(['group', 'sort', 'filter'])
-            ->setPadding($this->Request()->targetField);
+            ->setPadding($this->Request()->get('targetField'));
 
         // Call controller acl rules (user - defined)
         $this->initAcl();
@@ -63,7 +63,7 @@ public function preDispatch()
     /**
      * Returns all acl permissions
      *
-     * @return array
+     * @return array<string, array{privilege: string, errorMessage: string}>
      */
     public function getAclRules()
     {
@@ -72,6 +72,8 @@ public function getAclRules()
 
     /**
      * Needs to be present for the script renderer
+     *
+     * @return void
      */
     public function indexAction()
     {
@@ -87,6 +89,8 @@ public function indexAction()
 
     /**
      * Needs to be present for the script renderer
+     *
+     * @return void
      */
     public function loadAction()
     {
@@ -116,6 +120,8 @@ protected function initAcl()
      * @param string $action       Name of action with or without 'Action'-suffix
      * @param string $privilege    Name of privilege as you have set in s_core_acl_privileges
      * @param string $errorMessage Optionally error message to show if permission denied
+     *
+     * @return void
      */
     protected function addAclPermission($action, $privilege, $errorMessage = '')
     {
@@ -150,7 +156,7 @@ protected function _isAllowed($privilege, $resource = null, $role = null)
     /**
      * @param mixed|null $identity
      *
-     * @return bool|string
+     * @return string
      */
     protected function getTinyMceLang($identity)
     {
@@ -167,36 +173,6 @@ protected function getTinyMceLang($identity)
         return 'en';
     }
 
-    /**
-     * @param string $module
-     * @param string $controller
-     * @param string $file
-     *
-     * @return string
-     */
-    private function inflectPath($module, $controller, $file)
-    {
-        return sprintf(
-            '%s/%s/%s.js',
-            mb_strtolower($this->camelCaseToUnderScore($module)),
-            mb_strtolower($this->camelCaseToUnderScore($controller)),
-            mb_strtolower($this->camelCaseToUnderScore($file))
-        );
-    }
-
-    /**
-     * @param string $input
-     *
-     * @return string
-     */
-    private function camelCaseToUnderScore($input)
-    {
-        $pattern = ['#(?<=(?:\p{Lu}))(\p{Lu}\p{Ll})#', '#(?<=(?:\p{Ll}|\p{Nd}))(\p{Lu})#'];
-        $replacement = ['_\1', '_\1'];
-
-        return preg_replace($pattern, $replacement, $input);
-    }
-
     private function enableBrowserCache(): void
     {
         if ($this->container->getParameter('shopware.template.forceCompile')) {
diff --git a/engine/Shopware/Controllers/Backend/Feedback.php b/engine/Shopware/Controllers/Backend/Feedback.php
deleted file mode 100644
index 329a9f6ef11..00000000000
--- a/engine/Shopware/Controllers/Backend/Feedback.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-use Doctrine\DBAL\Connection;
-use Shopware\Components\CacheManager;
-use Shopware\Components\ShopwareReleaseStruct;
-
-/**
- * Empty controller due to the fact that we've no logic here. The Shopware_Controllers_Backend_ExtJs handles the rest.
- */
-class Shopware_Controllers_Backend_Feedback extends Shopware_Controllers_Backend_ExtJs
-{
-    public function loadAction()
-    {
-        /** @var ShopwareReleaseStruct $shopwareRelease */
-        $shopwareRelease = $this->container->get('shopware.release');
-
-        $this->View()->assign('SHOPWARE_VERSION', $shopwareRelease->getVersion());
-        $this->View()->assign('SHOPWARE_VERSION_TEXT', $shopwareRelease->getVersionText());
-        $this->View()->assign('SHOPWARE_REVISION', $shopwareRelease->getRevision());
-
-        parent::loadAction();
-    }
-
-    public function disableInstallationSurveyAction()
-    {
-        $conn = $this->container->get(Connection::class);
-        $elementId = $conn->fetchColumn('SELECT id FROM s_core_config_elements WHERE name LIKE "installationSurvey"');
-        $valueId = $conn->fetchColumn('SELECT id FROM s_core_config_values WHERE element_id = :elementId', ['elementId' => $elementId]);
-        $data = [
-            'element_id' => $elementId,
-            'shop_id' => 1,
-            'value' => serialize(false),
-        ];
-        if ($valueId) {
-            $conn->update(
-                's_core_config_values',
-                $data,
-                ['id' => $valueId]
-            );
-        } else {
-            $conn->insert('s_core_config_values', $data);
-        }
-        $cacheManager = $this->get(CacheManager::class);
-        $cacheManager->clearConfigCache();
-    }
-}
diff --git a/engine/Shopware/Controllers/Backend/FirstRunWizard.php b/engine/Shopware/Controllers/Backend/FirstRunWizard.php
index 23434f24b9c..832574a0671 100644
--- a/engine/Shopware/Controllers/Backend/FirstRunWizard.php
+++ b/engine/Shopware/Controllers/Backend/FirstRunWizard.php
@@ -1,28 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-use Shopware\Bundle\PluginInstallerBundle\Service\AccountManagerService;
 use Shopware\Bundle\PluginInstallerBundle\StoreClient;
 use Shopware\Bundle\PluginInstallerBundle\Struct\AccessTokenStruct;
 use Shopware\Bundle\PluginInstallerBundle\Struct\LocaleStruct;
@@ -156,7 +155,7 @@ public function saveConfigurationAction()
                     continue;
                 }
 
-                $configValue = sprintf(
+                $configValue = \sprintf(
                     "<div>\n<img src=\"{media path='%s'}\" style=\"max-height: 20mm\" alt=\"Logo\"><br />",
                     $configValue
                 );
@@ -201,7 +200,7 @@ public function saveConfigurationAction()
 
             if ($key === 'logo') {
                 $hash = Random::getAlphanumericString(16);
-                $value = sprintf(
+                $value = \sprintf(
                     '<p><img id="tinymce-editor-image-%s" class="tinymce-editor-image tinymce-editor-image-%s" src="{media path=\'%s\'}" style="max-height: 20mm;" data-src="%s" /></p>',
                     $hash,
                     $hash,
@@ -388,7 +387,6 @@ public function registerNewIdAction()
         $password = $this->Request()->getParam('password');
         $email = $this->Request()->getParam('email');
 
-        /** @var AccountManagerService $accountManagerService */
         $accountManagerService = $this->container->get('shopware_plugininstaller.account_manager_service');
 
         try {
@@ -566,7 +564,7 @@ private function renderPayPalView(string $view): void
         $this->get('plugins')->Controller()->ViewRenderer()->setNoRender(false);
         $this->Front()->Plugins()->Json()->setRenderer(false);
 
-        $this->View()->loadTemplate(sprintf('backend/first_run_wizard/template/%s.tpl', $view));
+        $this->View()->loadTemplate(\sprintf('backend/first_run_wizard/template/%s.tpl', $view));
     }
 
     private function getVersion(): string
@@ -590,16 +588,14 @@ private function getVersion(): string
      *
      * @return LocaleStruct|null Information about the current locale
      */
-    private function getCurrentLocale()
+    private function getCurrentLocale(): ?LocaleStruct
     {
         static $locales;
 
-        if (empty($locales)) {
-            /** @var AccountManagerService $accountManagerService */
+        if (\is_array($locales) && empty($locales)) {
             $accountManagerService = $this->container->get('shopware_plugininstaller.account_manager_service');
 
             try {
-                /** @var LocaleStruct[] $serverLocales */
                 $serverLocales = $accountManagerService->getLocales();
             } catch (Exception $e) {
                 $this->View()->assign([
@@ -615,12 +611,9 @@ private function getCurrentLocale()
             }
         }
 
-        $user = Shopware()->Container()->get('auth')->getIdentity();
-        /** @var \Shopware\Models\Shop\Locale $locale */
-        $locale = $user->locale;
-        $localeCode = $locale->getLocale();
+        $localeCode = Shopware()->Container()->get('auth')->getIdentity()->locale->getLocale();
 
-        return \array_key_exists($localeCode, $locales) ? $locales[$localeCode] : null;
+        return $locales[$localeCode] ?? null;
     }
 
     /**
diff --git a/engine/Shopware/Controllers/Backend/FirstRunWizardPluginManager.php b/engine/Shopware/Controllers/Backend/FirstRunWizardPluginManager.php
index ad36a8c9f81..d596ab7bd1d 100644
--- a/engine/Shopware/Controllers/Backend/FirstRunWizardPluginManager.php
+++ b/engine/Shopware/Controllers/Backend/FirstRunWizardPluginManager.php
@@ -1,40 +1,44 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-use Shopware\Bundle\PluginInstallerBundle\Service\AccountManagerService;
 use Shopware\Bundle\PluginInstallerBundle\Service\FirstRunWizardPluginStoreService;
+use Shopware\Bundle\PluginInstallerBundle\StoreClient;
 use Shopware\Bundle\PluginInstallerBundle\Struct\LocaleStruct;
-use Shopware\Bundle\PluginInstallerBundle\Struct\PluginStruct;
+use SwagPaymentPayPalUnified\Setup\FirstRunWizardInstaller;
 
 class Shopware_Controllers_Backend_FirstRunWizardPluginManager extends Shopware_Controllers_Backend_ExtJs
 {
+    /**
+     * @var array<string, LocaleStruct>
+     */
+    public static array $locales = [];
+
     /**
      * Loads integrated plugins from SBP
      */
     public function getIntegratedPluginsAction()
     {
-        /** @var FirstRunWizardPluginStoreService $firstRunWizardPluginStore */
         $firstRunWizardPluginStore = $this->container->get(FirstRunWizardPluginStoreService::class);
 
         $isoFromRequest = $this->Request()->get('iso');
@@ -44,7 +48,6 @@ public function getIntegratedPluginsAction()
         $isoCode = substr($isoCode, -2);
 
         try {
-            /** @var PluginStruct[] $plugins */
             $plugins = $firstRunWizardPluginStore->getIntegratedPlugins($isoCode, $this->getVersion());
         } catch (Exception $e) {
             $this->View()->assign([
@@ -66,11 +69,9 @@ public function getIntegratedPluginsAction()
      */
     public function getRecommendedPluginsAction()
     {
-        /** @var FirstRunWizardPluginStoreService $firstRunWizardPluginStore */
         $firstRunWizardPluginStore = $this->container->get(FirstRunWizardPluginStoreService::class);
 
         try {
-            /** @var PluginStruct[] $plugins */
             $plugins = $firstRunWizardPluginStore->getRecommendedPlugins($this->getCurrentLocale(), $this->getVersion());
         } catch (Exception $e) {
             $this->View()->assign([
@@ -92,11 +93,9 @@ public function getRecommendedPluginsAction()
      */
     public function getDemoDataPluginsAction()
     {
-        /** @var FirstRunWizardPluginStoreService $firstRunWizardPluginStore */
         $firstRunWizardPluginStore = $this->container->get(FirstRunWizardPluginStoreService::class);
 
         try {
-            /** @var PluginStruct[] $plugins */
             $plugins = $firstRunWizardPluginStore->getDemoDataPlugins($this->getCurrentLocale(), $this->getVersion());
         } catch (Exception $e) {
             $this->View()->assign([
@@ -120,11 +119,9 @@ public function getLocalizationPluginsAction()
     {
         $localization = $this->Request()->get('localeId');
 
-        /** @var FirstRunWizardPluginStoreService $firstRunWizardPluginStore */
         $firstRunWizardPluginStore = $this->container->get(FirstRunWizardPluginStoreService::class);
 
         try {
-            /** @var PluginStruct[] $plugins */
             $plugins = $firstRunWizardPluginStore->getLocalizationPlugins($localization, $this->getCurrentLocale(), $this->getVersion());
         } catch (Exception $e) {
             $this->View()->assign([
@@ -146,11 +143,9 @@ public function getLocalizationPluginsAction()
      */
     public function getLocalizationsAction()
     {
-        /** @var FirstRunWizardPluginStoreService $firstRunWizardPluginStore */
         $firstRunWizardPluginStore = $this->container->get(FirstRunWizardPluginStoreService::class);
 
         try {
-            /** @var LocaleStruct[] $localizations */
             $localizations = $firstRunWizardPluginStore->getLocalizations($this->getCurrentLocale(), $this->getVersion());
         } catch (Exception $e) {
             $this->View()->assign([
@@ -172,7 +167,6 @@ public function getLocalizationsAction()
      */
     public function getIntegratedPluginsCountriesAction()
     {
-        /** @var FirstRunWizardPluginStoreService $firstRunWizardPluginStore */
         $firstRunWizardPluginStore = $this->container->get(FirstRunWizardPluginStoreService::class);
 
         try {
@@ -197,11 +191,9 @@ public function getIntegratedPluginsCountriesAction()
      */
     public function getAvailableLocalizationsAction()
     {
-        /** @var FirstRunWizardPluginStoreService $firstRunWizardPluginStore */
         $firstRunWizardPluginStore = $this->container->get(FirstRunWizardPluginStoreService::class);
 
         try {
-            /** @var LocaleStruct[] $localizations */
             $localizations = $firstRunWizardPluginStore->getAvailableLocalizations($this->getCurrentLocale(), $this->getVersion());
         } catch (Exception $e) {
             $this->View()->assign([
@@ -212,8 +204,7 @@ public function getAvailableLocalizationsAction()
             return;
         }
 
-        /** @var \Shopware\Bundle\PluginInstallerBundle\StoreClient $storeClient */
-        $storeClient = $this->container->get(\Shopware\Bundle\PluginInstallerBundle\StoreClient::class);
+        $storeClient = $this->container->get(StoreClient::class);
         $storeClient->doTrackEvent('First Run Wizard started');
 
         $this->View()->assign([
@@ -230,11 +221,10 @@ public function saveConfigurationAction(): void
         $payPalPlusEnabled = (bool) $this->Request()->getParam('payPalPlus');
 
         if (!class_exists('\SwagPaymentPayPalUnified\Setup\FirstRunWizardInstaller')) {
-            throw new \Exception(sprintf('Class %s does not exist.', '\SwagPaymentPayPalUnified\Setup\FirstRunWizardInstaller'));
+            throw new Exception(\sprintf('Class %s does not exist.', '\SwagPaymentPayPalUnified\Setup\FirstRunWizardInstaller'));
         }
 
-        /** @var \SwagPaymentPayPalUnified\Setup\FirstRunWizardInstaller $payPalInstaller */
-        $payPalInstaller = new \SwagPaymentPayPalUnified\Setup\FirstRunWizardInstaller();
+        $payPalInstaller = new FirstRunWizardInstaller();
         $payPalInstaller->saveConfiguration($this->get('dbal_connection'), [
             'clientId' => $clientId,
             'clientSecret' => $clientSecret,
@@ -252,7 +242,7 @@ private function getVersion(): string
         $version = $this->container->getParameter('shopware.release.version');
 
         if (!\is_string($version)) {
-            throw new \RuntimeException('Parameter shopware.release.version has to be an string');
+            throw new RuntimeException('Parameter shopware.release.version has to be an string');
         }
 
         return $version;
@@ -264,34 +254,25 @@ private function getVersion(): string
      *
      * @return LocaleStruct|null Information about the current locale
      */
-    private function getCurrentLocale()
+    private function getCurrentLocale(): ?LocaleStruct
     {
-        static $locales;
-
-        if (empty($locales)) {
-            /** @var AccountManagerService $accountManagerService */
+        if (empty(self::$locales)) {
             $accountManagerService = $this->container->get('shopware_plugininstaller.account_manager_service');
 
-            /** @var LocaleStruct[] $serverLocales */
-            $serverLocales = $accountManagerService->getLocales();
-
-            foreach ($serverLocales as $serverLocale) {
-                $locales[$serverLocale->getName()] = $serverLocale;
+            foreach ($accountManagerService->getLocales() as $serverLocale) {
+                self::$locales[$serverLocale->getName()] = $serverLocale;
             }
         }
 
-        $user = Shopware()->Container()->get('auth')->getIdentity();
-        /** @var \Shopware\Models\Shop\Locale $locale */
-        $locale = $user->locale;
-        $localeCode = $locale->getLocale();
+        $localeCode = $this->container->get('auth')->getIdentity()->locale->getLocale();
 
-        if (\array_key_exists($localeCode, $locales)) {
-            return $locales[$localeCode];
+        if (\array_key_exists($localeCode, self::$locales)) {
+            return self::$locales[$localeCode];
         }
 
         // Fallback to english locale when available
-        if (\array_key_exists('en_GB', $locales)) {
-            return $locales['en_GB'];
+        if (\array_key_exists('en_GB', self::$locales)) {
+            return self::$locales['en_GB'];
         }
 
         return null;
diff --git a/engine/Shopware/Controllers/Backend/Form.php b/engine/Shopware/Controllers/Backend/Form.php
index 3d544d56c6d..38127545086 100644
--- a/engine/Shopware/Controllers/Backend/Form.php
+++ b/engine/Shopware/Controllers/Backend/Form.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\ORM\OptimisticLockException;
@@ -35,14 +35,14 @@ class Shopware_Controllers_Backend_Form extends Shopware_Controllers_Backend_Ext
     /**
      * @var FormRepository
      */
-    public $repository = null;
+    public $repository;
 
     /**
      * Contains the shopware model manager
      *
      * @var ModelManager
      */
-    public $manager = null;
+    public $manager;
 
     /**
      * Returns available forms
diff --git a/engine/Shopware/Controllers/Backend/Index.php b/engine/Shopware/Controllers/Backend/Index.php
index 1456b667c35..8666c447f83 100644
--- a/engine/Shopware/Controllers/Backend/Index.php
+++ b/engine/Shopware/Controllers/Backend/Index.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\CSRFWhitelistAware;
@@ -29,9 +29,6 @@
 
 class Shopware_Controllers_Backend_Index extends Enlight_Controller_Action implements CSRFWhitelistAware
 {
-    public const MIN_DAYS_INSTALLATION_SURVEY = 14;
-    public const MIN_DAYS_BI_TEASER = 10;
-
     /**
      * @var Shopware_Plugins_Backend_Auth_Bootstrap
      */
@@ -39,6 +36,8 @@ class Shopware_Controllers_Backend_Index extends Enlight_Controller_Action imple
 
     /**
      * Loads auth and script renderer resource
+     *
+     * @return void
      */
     public function init()
     {
@@ -89,6 +88,8 @@ public function preDispatch()
      * Backend Menu
      * Licence Information
      * Rss-Data for example
+     *
+     * @return void
      */
     public function indexAction()
     {
@@ -125,7 +126,7 @@ public function indexAction()
         $controller = Zend_Json::encode($controller);
         $this->View()->assign('controller', $controller, true);
 
-        $this->View()->assign('maxParameterLength', (int) ini_get('suhosin.get.max_value_length') + 0, true);
+        $this->View()->assign('maxParameterLength', (int) \ini_get('suhosin.get.max_value_length') + 0, true);
 
         $firstRunWizardEnabled = $this->isFirstRunWizardEnabled($identity);
         $sbpLogin = 0;
@@ -136,7 +137,6 @@ public function indexAction()
         }
         $this->View()->assign('sbpLogin', $sbpLogin, true);
         $this->View()->assign('firstRunWizardEnabled', $firstRunWizardEnabled, true);
-        $this->View()->assign('installationSurvey', $this->checkForInstallationSurveyNecessity($identity), true);
 
         $config = $this->get(Shopware_Components_Config::class);
 
@@ -146,18 +146,20 @@ public function indexAction()
         $this->View()->assign('SHOPWARE_VERSION_TEXT', $shopwareRelease->getVersionText());
         $this->View()->assign('SHOPWARE_REVISION', $shopwareRelease->getRevision());
         $this->View()->assign('updateWizardStarted', $config->get('updateWizardStarted'));
-        $this->View()->assign('feedbackRequired', $this->checkIsFeedbackRequired());
-        $this->View()->assign('biOverviewEnabled', $this->isBIOverviewEnabled());
-        $this->View()->assign('biIsActive', $this->isBIActive());
         $this->View()->assign('extJsDeveloperModeActive', $this->container->getParameter('shopware.extjs.developer_mode'));
     }
 
+    /**
+     * @return void
+     */
     public function authAction()
     {
     }
 
     /**
      * Allows changing the locale by sending a Shopware localeId or an ISO-3166 locale (e.g. de_DE)
+     *
+     * @return void
      */
     public function changeLocaleAction()
     {
@@ -214,6 +216,8 @@ public function changeLocaleAction()
      * Load action for the script renderer.
      *
      * @throws Enlight_Controller_Exception
+     *
+     * @return void
      */
     public function loadAction()
     {
@@ -233,6 +237,8 @@ public function loadAction()
      * Load action for the script renderer.
      *
      * @throws Enlight_Controller_Exception
+     *
+     * @return void
      */
     public function menuAction()
     {
@@ -260,10 +266,8 @@ public function menuAction()
      * Returns if the first run wizard should be loaded in the current backend instance
      *
      * @param stdClass $identity
-     *
-     * @return bool
      */
-    private function isFirstRunWizardEnabled($identity)
+    private function isFirstRunWizardEnabled($identity): bool
     {
         // Only admins can see the wizard
         if ($identity->role->getAdmin()) {
@@ -273,12 +277,7 @@ private function isFirstRunWizardEnabled($identity)
         return false;
     }
 
-    /**
-     * @param int|null $parentId
-     *
-     * @return array
-     */
-    private function buildTree(array $nodes, $parentId = null)
+    private function buildTree(array $nodes, ?int $parentId = null): array
     {
         $menuTree = [];
         foreach ($nodes as $key => $node) {
@@ -293,69 +292,4 @@ private function buildTree(array $nodes, $parentId = null)
 
         return $menuTree;
     }
-
-    /**
-     * @return bool
-     */
-    private function checkIsFeedbackRequired()
-    {
-        $shopwareVersionText = $this->container->getParameter('shopware.release.version_text');
-
-        return !\in_array($shopwareVersionText, ['', '___VERSION_TEXT___'], true);
-    }
-
-    /**
-     * @param stdClass $identity
-     *
-     * @return bool
-     */
-    private function checkForInstallationSurveyNecessity($identity)
-    {
-        if ($this->checkIsFeedbackRequired() || !$identity->role->getAdmin()) {
-            return false;
-        }
-        $installationSurvey = $this->container->get(Shopware_Components_Config::class)->get('installationSurvey', false);
-        $installationDate = DateTime::createFromFormat('Y-m-d H:i', $this->container->get(Shopware_Components_Config::class)->get('installationDate'));
-        if (!$installationSurvey || !$installationDate) {
-            return false;
-        }
-        $interval = $installationDate->diff(new DateTime());
-
-        return $interval->days >= self::MIN_DAYS_INSTALLATION_SURVEY;
-    }
-
-    /**
-     * @return bool
-     */
-    private function isBIOverviewEnabled()
-    {
-        if (!$this->get(Shopware_Components_Config::class)->get('benchmarkTeaser')) {
-            return false;
-        }
-
-        $configRepository = $this->get('shopware.benchmark_bundle.repository.config');
-
-        $shopwareVersionText = $this->container->getParameter('shopware.release.version_text');
-
-        $waitingOver = true;
-        $installationDate = DateTime::createFromFormat('Y-m-d H:i', $this->container->get(Shopware_Components_Config::class)->get('installationDate'));
-        if ($installationDate) {
-            $interval = $installationDate->diff(new DateTime());
-
-            if ($interval->days < self::MIN_DAYS_BI_TEASER) {
-                $waitingOver = false;
-            }
-        }
-
-        return $waitingOver && $shopwareVersionText !== '___VERSION_TEXT___' && $configRepository->getConfigsCount() === 0;
-    }
-
-    private function isBIActive(): bool
-    {
-        $configRepository = $this->get('shopware.benchmark_bundle.repository.config');
-
-        $validShopCount = \count($configRepository->getValidShops());
-
-        return $validShopCount > 0;
-    }
 }
diff --git a/engine/Shopware/Controllers/Backend/Log.php b/engine/Shopware/Controllers/Backend/Log.php
index 49b504f98de..a49043f7190 100644
--- a/engine/Shopware/Controllers/Backend/Log.php
+++ b/engine/Shopware/Controllers/Backend/Log.php
@@ -1,30 +1,32 @@
 <?php
 
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\CSRFWhitelistAware;
+use Shopware\Components\Log\Parser\LogfileParser;
 use Shopware\Models\Log\Log;
+use Symfony\Component\Finder\Finder;
 
 class Shopware_Controllers_Backend_Log extends Shopware_Controllers_Backend_ExtJs implements CSRFWhitelistAware
 {
@@ -58,7 +60,7 @@ public function preDispatch()
         if ($this->Request()->getActionName() === 'downloadLogFile') {
             $this->Front()->Plugins()->ViewRenderer()->setNoRender();
         } elseif (!\in_array($this->Request()->getActionName(), ['index', 'load'])) {
-            $this->Front()->Plugins()->Json()->setRenderer(true);
+            $this->Front()->Plugins()->Json()->setRenderer();
         }
     }
 
@@ -66,6 +68,8 @@ public function preDispatch()
      * This function is called, when the user opens the log-module.
      * It reads the logs from s_core_log
      * Additionally it sets a filterValue
+     *
+     * @return void
      */
     public function getLogsAction()
     {
@@ -113,6 +117,8 @@ public function getLogsAction()
     /**
      * This function is called when the user wants to delete a log.
      * It only handles the deletion.
+     *
+     * @return void
      */
     public function deleteLogsAction()
     {
@@ -120,7 +126,7 @@ public function deleteLogsAction()
             $params = $this->Request()->getParams();
             unset($params['module'], $params['controller'], $params['action'], $params['_dc']);
 
-            if ($params[0]) {
+            if (!empty($params[0])) {
                 foreach ($params as $values) {
                     $logModel = $this->get('models')->find(Log::class, $values['id']);
 
@@ -142,15 +148,20 @@ public function deleteLogsAction()
     /**
      * This logging method has been moved to \Shopware\Controllers\Backend\Logger::createLogAction
      *
-     * @deprecated in Shopware 5.6, to be removed in 5.7. Use \Shopware\Controllers\Backend\Logger::createLogAction instead
+     * @deprecated in Shopware 5.6, to be removed in 5.8. Use \Shopware\Controllers\Backend\Logger::createLogAction instead
+     *
+     * @return void
      */
     public function createLogAction()
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed in 5.7. Use \Shopware\Controllers\Backend\Logger::createLogAction instead.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed in 5.8. Use \Shopware\Controllers\Backend\Logger::createLogAction instead.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         $this->forward('createLog', 'logger', 'backend');
     }
 
+    /**
+     * @return void
+     */
     public function downloadLogFileAction()
     {
         $logDir = $this->get('kernel')->getLogDir();
@@ -188,6 +199,9 @@ public function downloadLogFileAction()
         stream_copy_to_stream($file, $out);
     }
 
+    /**
+     * @return void
+     */
     public function getLogFileListAction()
     {
         $logDir = $this->get('kernel')->getLogDir();
@@ -196,22 +210,22 @@ public function getLogFileListAction()
 
         // filter against input
         $query = trim($this->Request()->getParam('query', ''));
-        foreach ($files as $k => $file) {
+        $files = array_filter(array_map(function ($file) use ($query, $defaultFile) {
             if ($query !== '' && mb_stripos($file[0], $query) === false) {
-                unset($files[$k]);
-                continue;
+                return null;
             }
-            $files[$k] = [
+
+            return [
                 'name' => $file[0],
                 'channel' => $file['channel'],
                 'environment' => $file['environment'],
                 'date' => $file['date'],
-                'default' => $file[0] === $defaultFile,
+                'default' => $file[0] === $defaultFile[0],
             ];
-        }
+        }, $files));
 
-        $start = $this->Request()->getParam('start', 0);
-        $limit = $this->Request()->getParam('limit', 100);
+        $start = (int) $this->Request()->getParam('start', 0);
+        $limit = (int) $this->Request()->getParam('limit', 100);
 
         $count = \count($files);
         $files = \array_slice($files, $start, $limit);
@@ -223,6 +237,9 @@ public function getLogFileListAction()
         ]);
     }
 
+    /**
+     * @return void
+     */
     public function getLogListAction()
     {
         $logDir = $this->get('kernel')->getLogDir();
@@ -242,17 +259,16 @@ public function getLogListAction()
         }
 
         $file = $logDir . '/' . $logFile;
-        $start = $this->Request()->getParam('start', 0);
-        $limit = $this->Request()->getParam('limit', 100);
-        $sort = $this->Request()->getParam('sort');
+        $start = (int) $this->Request()->getParam('start', 0);
+        $limit = (int) $this->Request()->getParam('limit', 100);
+        $sort = $this->Request()->getParam('sort', []);
 
         $reverse = false;
         if (!isset($sort[0]['direction']) || $sort[0]['direction'] === 'DESC') {
             $reverse = true;
         }
 
-        /** @var \Shopware\Components\Log\Parser\LogfileParser $reader */
-        $reader = $this->get('shopware.log.fileparser');
+        $reader = $this->get(LogfileParser::class);
 
         $data = $reader->parseLogFile(
             $file,
@@ -272,17 +288,14 @@ public function getLogListAction()
     /**
      * Returns an array of all log files in the given directory.
      *
-     * @param string $logDir
-     *
-     * @return array
+     * @return list<array<string>>
      */
-    private function getLogFiles($logDir)
+    private function getLogFiles(string $logDir): array
     {
-        $finder = new Symfony\Component\Finder\Finder();
+        $finder = new Finder();
         $finder->files()->name('*.log')->in($logDir);
 
         $matches = [];
-        /** @var \Symfony\Component\Finder\SplFileInfo $file */
         foreach ($finder as $file) {
             $name = $file->getBasename();
             if (preg_match('/^(?P<channel>[^_]+)_(?P<environment>[^-]+)\-(?P<date>[0-9-]+)\.log$/', $name, $match)) {
@@ -298,15 +311,14 @@ private function getLogFiles($logDir)
     /**
      * Checks whether the specified log file exists in the log directory. If so, he returns it.
      *
-     * @param array  $files
-     * @param string $name
+     * @param list<array<string>> $files
      *
      * @return false|string
      */
-    private function getLogFile($files, $name)
+    private function getLogFile(array $files, string $name)
     {
         foreach ($files as $file) {
-            if ($name == $file[0]) {
+            if ($name === $file[0]) {
                 return $name;
             }
         }
@@ -315,10 +327,12 @@ private function getLogFile($files, $name)
     }
 
     /**
-     * @return false|string
+     * @param list<array<string>> $files
+     *
+     * @return array<string>
      */
-    private function getDefaultLogFile(array $files)
+    private function getDefaultLogFile(array $files): array
     {
-        return isset($files[0]) ? $files[0] : false;
+        return $files[0] ?? [''];
     }
 }
diff --git a/engine/Shopware/Controllers/Backend/Logger.php b/engine/Shopware/Controllers/Backend/Logger.php
index 344fefc1b6d..579e5ede66e 100644
--- a/engine/Shopware/Controllers/Backend/Logger.php
+++ b/engine/Shopware/Controllers/Backend/Logger.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Controllers\Backend;
diff --git a/engine/Shopware/Controllers/Backend/Login.php b/engine/Shopware/Controllers/Backend/Login.php
index 69e1676a96a..825f639a872 100644
--- a/engine/Shopware/Controllers/Backend/Login.php
+++ b/engine/Shopware/Controllers/Backend/Login.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\CSRFWhitelistAware;
@@ -132,7 +132,7 @@ public function logoutAction()
     /**
      * @deprecated in 5.6, will be private in 5.8
      *
-     * @return \Shopware_Plugins_Backend_Auth_Bootstrap
+     * @return Shopware_Plugins_Backend_Auth_Bootstrap
      */
     public function getPlugin()
     {
diff --git a/engine/Shopware/Controllers/Backend/Mail.php b/engine/Shopware/Controllers/Backend/Mail.php
index 137a8fa4926..0560ed8a2a9 100644
--- a/engine/Shopware/Controllers/Backend/Mail.php
+++ b/engine/Shopware/Controllers/Backend/Mail.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\ORM\AbstractQuery;
diff --git a/engine/Shopware/Controllers/Backend/ManualSorting.php b/engine/Shopware/Controllers/Backend/ManualSorting.php
index a7f45533286..b1b1f1a175d 100644
--- a/engine/Shopware/Controllers/Backend/ManualSorting.php
+++ b/engine/Shopware/Controllers/Backend/ManualSorting.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Controllers\Backend;
diff --git a/engine/Shopware/Controllers/Backend/MediaManager.php b/engine/Shopware/Controllers/Backend/MediaManager.php
index 8401ef545a3..3a037adf387 100644
--- a/engine/Shopware/Controllers/Backend/MediaManager.php
+++ b/engine/Shopware/Controllers/Backend/MediaManager.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\Common\Collections\ArrayCollection;
@@ -28,19 +28,24 @@
 use Doctrine\ORM\OptimisticLockException;
 use Doctrine\ORM\ORMException;
 use Doctrine\ORM\ORMInvalidArgumentException;
-use Doctrine\ORM\TransactionRequiredException;
 use Shopware\Bundle\MediaBundle\MediaReplaceServiceInterface;
 use Shopware\Bundle\MediaBundle\MediaServiceInterface;
 use Shopware\Components\CSRFWhitelistAware;
 use Shopware\Components\Model\ModelManager;
+use Shopware\Components\Model\QueryBuilder;
 use Shopware\Components\Thumbnail\Manager;
 use Shopware\Models\Media\Album;
 use Shopware\Models\Media\Media;
+use Shopware\Models\Media\Repository;
 use Shopware\Models\Media\Settings;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class Shopware_Controllers_Backend_MediaManager extends Shopware_Controllers_Backend_ExtJs implements CSRFWhitelistAware
 {
+    private const UNSORTED_ALBUM_ID = -10;
+    private const FILE_NOT_FOUND_MESSAGE = 'file not found';
+    private const FALLBACK_USER_ID = 0;
+
     public static $fileUploadBlacklist = [
         'php',
         'php3',
@@ -81,7 +86,7 @@ public function getWhitelistedCSRFActions()
      * The "find" method provides an automatic recursive call to determine the sub-albums with them,
      * so that the sub-albums not to be loaded on demand.
      *
-     * @throws NonUniqueResultException
+     * @return void
      */
     public function getAlbumsAction()
     {
@@ -94,11 +99,7 @@ public function getAlbumsAction()
             ->orderBy('album.position', 'ASC');
 
         if (!empty($albumId)) {
-            if (strpos($albumId, ',') !== false) {
-                $albumId = explode(',', $albumId);
-            } else {
-                $albumId = [$albumId];
-            }
+            $albumId = explode(',', $albumId);
             $builder->andWhere('album.id IN(:albumId)')
                 ->setParameter('albumId', $albumId);
         }
@@ -106,7 +107,8 @@ public function getAlbumsAction()
         $albums = $builder->getQuery()->getResult();
 
         $albums = $this->toTree($albums);
-        $filter = $this->Request()->albumFilter;
+        $filter = $this->Request()->getParam('albumFilter');
+
         if (!empty($filter)) {
             $albums = $this->filterAlbums($albums, $filter);
         }
@@ -118,8 +120,7 @@ public function getAlbumsAction()
      * method sets the correct HTTP-Header to trigger the save dialog of the browser
      * and disables all available renderers.
      *
-     * @throws Exception
-     * @throws NonUniqueResultException
+     * @return void
      */
     public function downloadAction()
     {
@@ -130,14 +131,14 @@ public function downloadAction()
         $media = $this->getMedia($mediaId)->getQuery()->getOneOrNullResult(AbstractQuery::HYDRATE_ARRAY);
 
         if (!$media) {
-            echo 'file not found';
+            echo self::FILE_NOT_FOUND_MESSAGE;
 
             return;
         }
 
         $file = $media['path'];
-        $tmpFileName = $media['name'] . '.' . $media['extension'];
-        $mediaService = Shopware()->Container()->get(MediaServiceInterface::class);
+        $tmpFileName = \sprintf('%s.%s', $media['name'], $media['extension']);
+        $mediaService = $this->get(MediaServiceInterface::class);
 
         @set_time_limit(0);
         $response = $this->Response();
@@ -155,33 +156,27 @@ public function downloadAction()
      * The media listing supports a filter, paging and order function, which can be controlled
      * by the parameters: "filter", "order", "limit", "start"
      *
-     * @throws ORMException
-     * @throws OptimisticLockException
-     * @throws ORMInvalidArgumentException
-     * @throws TransactionRequiredException
+     * @return void
      */
     public function getAlbumMediaAction()
     {
         $order = $this->prefixProperties($this->Request()->getParam('sort', []), 'media');
         $limit = $this->Request()->getParam('limit');
         $offset = $this->Request()->getParam('start');
-        $filter = $this->Request()->filter;
+        $filter = $this->Request()->getParam('filter');
         $filter = $filter[0]['value'];
         $albumID = $this->Request()->getParam('albumID');
         // Restrict to certain file types
-        $validTypes = $this->Request()->getParam('validTypes');
-        if (!empty($validTypes)) {
-            $validTypes = explode('|', $validTypes);
-        } else {
-            $validTypes = [];
-        }
+        $validTypes = $this->Request()->getParam('validTypes', '');
+        $validTypes = explode('|', $validTypes);
 
         if ($albumID === null || $albumID === 0) {
             // If no albumId is given load the unsorted album
-            $albumID = -10;
+            $albumID = self::UNSORTED_ALBUM_ID;
         }
 
-        $repository = $this->get('models')->getRepository(Media::class);
+        /** @var Repository $repository */
+        $repository = $this->get(ModelManager::class)->getRepository(Media::class);
         $query = $repository->getAlbumMediaQuery($albumID, $filter, $order, $offset, $limit, $validTypes);
 
         $paginator = $this->getModelManager()->createPaginator($query);
@@ -192,7 +187,6 @@ public function getAlbumMediaAction()
         $mediaList = $query->getResult(AbstractQuery::HYDRATE_ARRAY);
         $mediaService = $this->get(MediaServiceInterface::class);
 
-        /** @var array $media */
         foreach ($mediaList as &$media) {
             $media['path'] = $mediaService->getUrl($media['path']);
             $media['virtualPath'] = $mediaService->normalize($media['path']);
@@ -239,10 +233,13 @@ public function getAlbumMediaAction()
      *  userID      => id of the user, which uploaded the media
      *  created     => upload date
      * </code>
+     *
+     * @return void
      */
     public function getMediaDetailAction()
     {
         $params = $this->Request()->getParams();
+
         if (!isset($params['mediaID']) || empty($params['mediaID'])) {
             $this->View()->assign(['success' => false, 'message' => 'No valid media Id']);
 
@@ -269,7 +266,7 @@ public function getMediaDetailAction()
      * Controller action which allows to request the media
      * data over a mediaId parameter or over the path property of a media model.
      *
-     * @throws Exception
+     * @retrun void
      */
     public function getMediaAction()
     {
@@ -297,7 +294,7 @@ public function getMediaAction()
         if (!empty($id)) {
             $builder->where('media.id = :id');
             $builder->setParameter('id', $id);
-        } elseif (!empty($path)) {
+        } else {
             $builder->where('media.path = :path');
             $builder->setParameter('path', $path);
         }
@@ -305,7 +302,7 @@ public function getMediaAction()
         $data = $builder->getQuery()->getArrayResult();
         $data = $data[0];
 
-        $mediaService = Shopware()->Container()->get(MediaServiceInterface::class);
+        $mediaService = $this->get(MediaServiceInterface::class);
         if ($data['path']) {
             $data['path'] = $mediaService->getUrl($data['path']);
         }
@@ -318,10 +315,7 @@ public function getMediaAction()
      * Expects the media id. Throws an exception if the media id isn't passed or the media
      * can't be found.
      *
-     * @throws ORMException
-     * @throws OptimisticLockException
-     * @throws ORMInvalidArgumentException
-     * @throws TransactionRequiredException
+     * @return void
      */
     public function removeMediaAction()
     {
@@ -329,6 +323,7 @@ public function removeMediaAction()
         if (!isset($params['id']) || empty($params['id'])) {
             $this->View()->assign(['success' => false, 'message' => 'No valid media Id']);
         }
+
         $id = $params['id'];
 
         // Load the media model
@@ -336,7 +331,7 @@ public function removeMediaAction()
 
         // Check if the media is loaded.
         if ($media === null || empty($media)) {
-            $this->View()->assign(['success' => false, 'message' => sprintf('Media with id %s not found', $id)]);
+            $this->View()->assign(['success' => false, 'message' => \sprintf('Media with id %s not found', $id)]);
 
             return;
         }
@@ -355,10 +350,7 @@ public function removeMediaAction()
      * The removeAlbumAction function removes an album, which identified by the passed albumID parameter.
      * System albums (id < 0) can't be removed.
      *
-     * @throws ORMException
-     * @throws OptimisticLockException
-     * @throws ORMInvalidArgumentException
-     * @throws TransactionRequiredException
+     * @return void
      */
     public function removeAlbumAction()
     {
@@ -369,16 +361,18 @@ public function removeAlbumAction()
             foreach ($params['albums'] as $album) {
                 $this->removeAlbum($album);
             }
-        } else {
-            $this->removeAlbum($params);
+
+            return;
         }
+
+        $this->removeAlbum($params);
     }
 
     /**
      * The uploadAction function is responsible for the uploading of media.
      * If no album id passed, the uploaded media is assigned to the unsorted album.
      *
-     * @throws Exception
+     * @return void
      */
     public function uploadAction()
     {
@@ -407,7 +401,7 @@ public function uploadAction()
         // Create a new model and set the properties
         $media = new Media();
 
-        $albumId = !empty($params['albumID']) ? $params['albumID'] : -10;
+        $albumId = !empty($params['albumID']) ? $params['albumID'] : self::UNSORTED_ALBUM_ID;
         /** @var Album|null $album */
         $album = $this->get('models')->find(Album::class, $albumId);
 
@@ -421,11 +415,12 @@ public function uploadAction()
         $media->setDescription('');
         $media->setCreated(new DateTime());
 
-        $identity = Shopware()->Container()->get('auth')->getIdentity();
+        $identity = $this->get('auth')->getIdentity();
+
         if ($identity !== null) {
             $media->setUserId($identity->id);
         } else {
-            $media->setUserId(0);
+            $media->setUserId(self::FALLBACK_USER_ID);
         }
 
         $this->Response()->headers->set('content-type', 'text/plain');
@@ -441,11 +436,11 @@ public function uploadAction()
 
             if ($media->getType() === Media::TYPE_IMAGE // GD doesn't support the following image formats
                 && !\in_array($media->getExtension(), ['tif', 'tiff'], true)) {
-                $manager = Shopware()->Container()->get(Manager::class);
+                $manager = $this->get(Manager::class);
                 $manager->createMediaThumbnail($media, [], true);
             }
 
-            $mediaService = Shopware()->Container()->get(MediaServiceInterface::class);
+            $mediaService = $this->get(MediaServiceInterface::class);
             $data[0]['path'] = $mediaService->getUrl($data[0]['path']);
 
             $this->View()->assign(['success' => true, 'data' => $data[0]]);
@@ -469,11 +464,12 @@ public function uploadAction()
      *  thumbnailSize    => [array]  Array of thumbnail sizes
      * </code>
      *
-     * @throws Exception
+     * @return void
      */
     public function saveAlbumAction()
     {
         $data = $this->Request()->getParams();
+        $album = null;
 
         if (!empty($data['id'])) {
             $repo = $this->getManager()->getRepository(Media::class);
@@ -482,12 +478,15 @@ public function saveAlbumAction()
             $album = $builder->getQuery()->getOneOrNullResult(
                 AbstractQuery::HYDRATE_OBJECT
             );
-            if (!$album) {
+
+            if (!$album instanceof Album) {
                 $this->View()->assign(['success' => false, 'message' => 'Invalid album id passed']);
 
-                return false;
+                return;
             }
-        } else {
+        }
+
+        if (!$album instanceof Album) {
             $album = new Album();
             $this->getManager()->persist($album);
         }
@@ -516,11 +515,7 @@ public function saveAlbumAction()
      *  - description => detailed description of the media
      * </code>
      *
-     * @throws Exception
-     * @throws ORMException
-     * @throws OptimisticLockException
-     * @throws ORMInvalidArgumentException
-     * @throws TransactionRequiredException
+     * @return void
      */
     public function saveMediaAction()
     {
@@ -533,15 +528,17 @@ public function saveMediaAction()
             foreach ($params['media'] as $media) {
                 $this->saveMedia($media);
             }
-        } else {
-            $this->saveMedia($params);
+
+            return;
         }
+
+        $this->saveMedia($params);
     }
 
     /**
      * This method creates thumbnails based on the request.
      *
-     * @throws NonUniqueResultException
+     * @return void
      */
     public function createThumbnailsAction()
     {
@@ -603,6 +600,8 @@ public function emptyTrashAction()
 
     /**
      * Generates virtual paths to full qualified urls in batch
+     *
+     * @return void
      */
     public function getMediaUrlsAction()
     {
@@ -621,7 +620,7 @@ public function getMediaUrlsAction()
     }
 
     /**
-     * @throws Exception
+     * @return void
      */
     public function singleReplaceAction()
     {
@@ -670,7 +669,7 @@ protected function initAcl()
      *
      * @throws Exception
      *
-     * @return array|bool
+     * @return array
      */
     protected function resolveAlbumData(array $data, $album)
     {
@@ -707,8 +706,8 @@ protected function resolveAlbumData(array $data, $album)
             $thumbnailSizes = [];
 
             foreach ($data['thumbnailSize'] as $size) {
-                if (!empty($size['value']) && $size['value'] !== '') {
-                    $thumbnailSizes[] = $size['value'];
+                if (!empty($size['value'])) {
+                    $thumbnailSizes[] = str_replace(' ', '', $size['value']);
                 }
             }
         }
@@ -718,8 +717,8 @@ protected function resolveAlbumData(array $data, $album)
         }
 
         $thumbnailHighDpi = isset($data['thumbnailHighDpi']) && $data['thumbnailHighDpi'];
-        $thumbnailQuality = $data['thumbnailQuality'] ?: 90;
-        $thumbnailHighDpiQuality = $data['thumbnailHighDpiQuality'] ?: 70;
+        $thumbnailQuality = $data['thumbnailQuality'] ?? 90;
+        $thumbnailHighDpiQuality = $data['thumbnailHighDpiQuality'] ?? 70;
 
         $albumId = $album->getId();
         if (empty($albumId) && $data['parent'] !== null) {
@@ -763,12 +762,7 @@ protected function prefixProperties(array $properties = [], $prefix = '')
         return $properties;
     }
 
-    /**
-     * Internal helper function to get access to the entity manager.
-     *
-     * @return ModelManager
-     */
-    private function getManager()
+    private function getManager(): ModelManager
     {
         if ($this->manager === null) {
             $this->manager = $this->get('models');
@@ -780,34 +774,33 @@ private function getManager()
     /**
      * Filters the loaded tree node with the passed filter value.
      *
-     * @param string $search
-     *
-     * @return array
+     * @return array<int, array<string, mixed>>
      */
-    private function filterAlbums(array $albums, $search)
+    private function filterAlbums(array $albums, string $search): array
     {
         $found = [];
+        $foundChildren = [];
 
         foreach ($albums as $album) {
             if (stripos($album['text'], $search) === 0) {
                 $found[] = $album;
             }
-            $children = $album['data'];
-            if (\count($children) > 0) {
-                $foundChildren = $this->filterAlbums($children, $search);
-                $found = array_merge($found, $foundChildren);
+            $children = $album['data'] ?? null;
+
+            if (\is_array($children) && \count($children) > 0) {
+                $foundChildren[] = $this->filterAlbums($children, $search);
             }
         }
 
-        return $found;
+        return array_merge($found, ...$foundChildren);
     }
 
     /**
      * Returns all thumbnails paths according to the given media object
      *
-     * @return array
+     * @return array<string, string>
      */
-    private function getMediaThumbnailPaths(array $media)
+    private function getMediaThumbnailPaths(array $media): array
     {
         if ($media['type'] !== Media::TYPE_IMAGE) {
             return [];
@@ -826,10 +819,11 @@ private function getMediaThumbnailPaths(array $media)
         // Iterate thumbnail sizes
         foreach ($sizes as $size) {
             if (strpos($size, 'x') === false) {
-                $size = $size . 'x' . $size;
+                $size = \sprintf('%sx%s', $size, $size);
             }
 
             $projectDir = $this->container->getParameter('shopware.app.rootDir');
+
             if (!\is_string($projectDir)) {
                 throw new RuntimeException('Parameter shopware.app.rootDir has to be an string');
             }
@@ -841,7 +835,7 @@ private function getMediaThumbnailPaths(array $media)
             if (DIRECTORY_SEPARATOR !== '/') {
                 $path = str_replace(DIRECTORY_SEPARATOR, '/', $path);
             }
-            $thumbnails[$size] = $path;
+            $thumbnails[(string) $size] = $path;
         }
 
         return $thumbnails;
@@ -849,12 +843,8 @@ private function getMediaThumbnailPaths(array $media)
 
     /**
      * Removes special characters from a filename
-     *
-     * @param string $name
-     *
-     * @return string
      */
-    private function removeSpecialCharacters($name)
+    private function removeSpecialCharacters(string $name): string
     {
         $name = iconv('utf-8', 'ascii//translit', $name);
         $name = preg_replace('#[^A-Za-z0-9\-_]#', '-', $name);
@@ -866,12 +856,8 @@ private function removeSpecialCharacters($name)
 
     /**
      * Internal helper function to get a single media.
-     *
-     * @param int $id
-     *
-     * @return Doctrine\ORM\QueryBuilder
      */
-    private function getMedia($id)
+    private function getMedia(int $id): QueryBuilder
     {
         $builder = $this->get('models')->createQueryBuilder();
 
@@ -884,26 +870,23 @@ private function getMedia($id)
     /**
      * Internal helper function to handle batch processing to remove the albums.
      *
-     * @throws ORMException
-     * @throws OptimisticLockException
-     * @throws ORMInvalidArgumentException
-     * @throws TransactionRequiredException
+     * @param array<string, mixed> $params
      */
-    private function removeAlbum(array $params)
+    private function removeAlbum(array $params): void
     {
         $albumId = (int) $params['albumID'];
         // Album id passed?
         if (empty($albumId)) {
             $this->View()->assign(['success' => false, 'message' => 'No valid album Id']);
 
-            return false;
+            return;
         }
 
         // System albums have a negative id, such albums can't be deleted
         if ($albumId < 0) {
             $this->View()->assign(['success' => false, 'message' => 'System albums can not be deleted']);
 
-            return false;
+            return;
         }
 
         $album = $this->get('models')->find(Album::class, $albumId);
@@ -911,10 +894,10 @@ private function removeAlbum(array $params)
         $settings = $repo->findOneBy(['albumId' => $albumId]);
 
         // Album can't be found
-        if ($album === null) {
+        if (!$album instanceof Album) {
             $this->View()->assign(['success' => false, 'message' => 'Album not found']);
 
-            return false;
+            return;
         }
 
         // Try to delete the album
@@ -933,8 +916,10 @@ private function removeAlbum(array $params)
     /**
      * Internal helper function to set the passed params to the media model and save the media.
      * Created to handle the batch processing.
+     *
+     * @param array<string, mixed> $params
      */
-    private function saveMedia(array $params)
+    private function saveMedia(array $params): void
     {
         if (isset($params['id']) && !empty($params['id']) && $params['id'] > 0) {
             /** @var Media|null $media */
@@ -945,7 +930,7 @@ private function saveMedia(array $params)
             return;
         }
 
-        if ($media === null) {
+        if (!$media instanceof Media) {
             $this->View()->assign(['success' => false, 'message' => 'Media not found']);
 
             return;
@@ -954,8 +939,9 @@ private function saveMedia(array $params)
         $oldName = $media->getName();
         $media->setName($params['name']);
         $name = $media->getName();
-        $mediaService = Shopware()->Container()->get(MediaServiceInterface::class);
+        $mediaService = $this->get(MediaServiceInterface::class);
         $projectDir = Shopware()->Container()->getParameter('shopware.app.rootDir');
+
         if (!\is_string($projectDir)) {
             throw new RuntimeException('Parameter shopware.app.rootDir has to be an string');
         }
@@ -976,9 +962,9 @@ private function saveMedia(array $params)
 
         // Check if a new album id is passed and is valid
         if (isset($params['newAlbumID']) && !empty($params['newAlbumID'])) {
-            /** @var Album|null $album */
-            $album = Shopware()->Container()->get(ModelManager::class)->getRepository(Album::class)->find($params['newAlbumID']);
-            if ($album) {
+            $album = $this->get(ModelManager::class)->getRepository(Album::class)->find($params['newAlbumID']);
+
+            if ($album instanceof Album) {
                 $media->setAlbum($album);
                 $media->setAlbumId($params['newAlbumID']);
             }
@@ -1008,13 +994,13 @@ private function saveMedia(array $params)
     /**
      * @throws Exception
      */
-    private function createThumbnailsForMovedMedia(Media $media)
+    private function createThumbnailsForMovedMedia(Media $media): void
     {
-        $albumRepository = Shopware()->Container()->get(ModelManager::class)->getRepository(Album::class);
+        $albumRepository = $this->get(ModelManager::class)->getRepository(Album::class);
 
-        /** @var Album|null $album */
         $album = $albumRepository->find($media->getAlbumId());
-        if ($album) {
+
+        if ($album instanceof Album) {
             $media->removeAlbumThumbnails($album->getSettings()->getThumbnailSize(), $media->getFileName());
             $media->createAlbumThumbnails($album);
         }
@@ -1026,12 +1012,12 @@ private function createThumbnailsForMovedMedia(Media $media)
      * If an album have sub-albums, the number of associated media of the sub-album added to the
      * media count of the parent album.
      *
-     * @param array|ArrayCollection $data
-     * @param array|null            $parent
+     * @param array<string, mixed>|ArrayCollection $data
+     * @param array<string, mixed>|null            $parent
      *
-     * @return array
+     * @return array<int, array<string, mixed>>
      */
-    private function toTree($data, &$parent = null)
+    private function toTree($data, &$parent = null): array
     {
         $result = [];
         $count = 0;
@@ -1041,7 +1027,9 @@ private function toTree($data, &$parent = null)
             $result[] = $node;
             $count += $node['mediaCount'];
         }
-        $parent['mediaCount'] += $count;
+        if (\is_array($parent)) {
+            $parent['mediaCount'] += $count;
+        }
 
         return $result;
     }
@@ -1050,21 +1038,19 @@ private function toTree($data, &$parent = null)
      * Converts the album properties into tree node properties.
      * If the album has sub-albums, iterates the children recursively.
      *
-     * @throws NonUniqueResultException
-     *
-     * @return array
+     * @return array<string, mixed>
      */
-    private function getAlbumNodeProperties(Album $album)
+    private function getAlbumNodeProperties(Album $album): array
     {
-        $repository = $this->get('models')->getRepository(Media::class);
+        /** @var Repository $repository */
+        $repository = $this->get(ModelManager::class)->getRepository(Media::class);
         $query = $repository->getAlbumMediaQuery($album->getId());
 
-        $paginator = $this->getModelManager()->createPaginator($query);
-
         // Returns the total count of the query
-        $totalResult = $paginator->count();
+        $totalResult = $this->getModelManager()->createPaginator($query)->count();
 
         $parentId = null;
+
         if ($album->getParent()) {
             $parentId = $album->getParent()->getId();
         }
@@ -1083,7 +1069,7 @@ private function getAlbumNodeProperties(Album $album)
         $albumData = $settingsQuery->getOneOrNullResult(AbstractQuery::HYDRATE_ARRAY);
         $settings = $albumData['settings'];
 
-        if (!empty($settings) && $settings !== null) {
+        if (!empty($settings)) {
             $node['iconCls'] = $settings['icon'];
             $node['createThumbnails'] = $settings['createThumbnails'];
             $node['thumbnailHighDpi'] = $settings['thumbnailHighDpi'];
@@ -1114,13 +1100,9 @@ private function getAlbumNodeProperties(Album $album)
     }
 
     /**
-     * @param int $albumId
-     *
      * @throws NonUniqueResultException
-     *
-     * @return Settings
      */
-    private function getAlbumSettings($albumId)
+    private function getAlbumSettings(int $albumId): ?Settings
     {
         $builder = $this->getModelManager()->createQueryBuilder();
 
@@ -1134,13 +1116,9 @@ private function getAlbumSettings($albumId)
     }
 
     /**
-     * @param int $albumId
-     * @param int $offset
-     * @param int $limit
-     *
      * @return Media[]
      */
-    private function getMediaForAlbumId($albumId, $offset, $limit)
+    private function getMediaForAlbumId(int $albumId, int $offset, int $limit): array
     {
         $builder = $this->getModelManager()->createQueryBuilder();
 
@@ -1155,6 +1133,9 @@ private function getMediaForAlbumId($albumId, $offset, $limit)
         return $builder->getQuery()->getResult();
     }
 
+    /**
+     * @return array<string, mixed>
+     */
     private function parseExceptionForResponse(Exception $exception): array
     {
         return array_merge(
diff --git a/engine/Shopware/Controllers/Backend/Newsletter.php b/engine/Shopware/Controllers/Backend/Newsletter.php
index 7ab57f6ad44..97cbd863447 100644
--- a/engine/Shopware/Controllers/Backend/Newsletter.php
+++ b/engine/Shopware/Controllers/Backend/Newsletter.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Bundle\MailBundle\Service\Filter\NewsletterMailFilter;
@@ -29,6 +29,7 @@
 use Shopware\Components\Routing\RouterInterface;
 use Shopware\Components\ShopRegistrationServiceInterface;
 use Shopware\Components\Validator\EmailValidator;
+use Shopware\Models\Newsletter\Container;
 use Shopware\Models\Plugin\Plugin;
 use Shopware\Models\Shop\Shop;
 use Symfony\Component\HttpFoundation\Response;
@@ -106,6 +107,10 @@ public function viewAction()
         }
 
         $mailing = $this->initMailing($mailingID);
+        if (!\is_array($mailing)) {
+            return;
+        }
+
         $template = $this->initTemplate($mailing);
 
         if (!empty($mailaddressID)) {
@@ -222,6 +227,10 @@ public function mailAction()
             $emails = [$this->Request()->getParam('testmail')];
         }
 
+        if (!\is_array($mailing)) {
+            return;
+        }
+
         $template = $this->initTemplate($mailing);
 
         $from = $template->fetch('string:' . $mailing['sendermail'], $template);
@@ -271,9 +280,9 @@ public function mailAction()
             if (!$validator->isValid($user['email'])) {
                 echo "Skipped invalid email\n";
             // SW-4526
-                // Don't `continue` with next iteration without setting user's lastmailing
-                // else the mailing.status will never be set to 2
-                // and sending the mail will block
+            // Don't `continue` with next iteration without setting user's lastmailing
+            // else the mailing.status will never be set to 2
+            // and sending the mail will block
             } else {
                 try {
                     $mail->send();
@@ -383,8 +392,6 @@ public function logAction()
      */
     public function initMailing($mailingID = null)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
-
         $mailing = $this->getMailing($mailingID);
         if (empty($mailing)) {
             return null;
@@ -426,8 +433,6 @@ public function initMailing($mailingID = null)
      */
     public function initTemplate($mailing)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
-
         $template = clone Shopware()->Template();
         $shop = Shopware()->Shop();
         $inheritance = Shopware()->Container()->get('theme_inheritance');
@@ -442,7 +447,7 @@ public function initTemplate($mailing)
         $template->assign('sUser', $user, true);
         $hash = $this->createHash((int) $user['mailaddressID'], (int) $mailing['id']);
         $template->assign('sCampaignHash', $hash, true);
-        $template->assign('sRecommendations', $this->getMailingSuggest($mailing['id'], $user['id']), true);
+        $template->assign('sRecommendations', $this->getMailingSuggest($mailing['id'], $user['userID']), true);
         $template->assign('sVoucher', $this->getMailingVoucher($mailing['id']), true);
         $template->assign('sCampaign', $this->getMailingDetails($mailing['id']), true);
         $template->assign('sConfig', Shopware()->Config());
@@ -477,8 +482,6 @@ public function initTemplate($mailing)
      */
     public function getMailing($id = null)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
-
         if (!empty($id)) {
             $where = Shopware()->Db()->quoteInto('cm.id=?', $id);
         } else {
@@ -505,18 +508,19 @@ public function getMailing($id = null)
      */
     public function getMailingDetails($id)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
-
         $details = Shopware()->Modules()->Marketing()->sMailCampaignsGetDetail((int) $id);
+        if (!\is_array($details)) {
+            return [];
+        }
 
         foreach ($details['containers'] as $key => $container) {
-            if ($container['type'] === 'ctVoucher') {
+            if ($container['type'] === Container::TYPE_VOUCHER) {
                 if (!empty($container['value'])) {
                     $details['voucher'] = $container['value'];
                 }
-                $details['containers'][$key]['type'] = 'ctText';
+                $details['containers'][$key]['type'] = Container::TYPE_TEXT;
             }
-            if ($container['type'] === 'ctSuggest') {
+            if ($container['type'] === Container::TYPE_SUGGEST) {
                 $details['suggest'] = true;
             }
         }
@@ -548,10 +552,8 @@ public function getMailingSuggest($id, $userID)
      */
     public function getMailingVoucher($id)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
-
         $sql = 'SELECT value FROM s_campaigns_containers WHERE type=? AND promotionID=?';
-        $voucherID = Shopware()->Db()->fetchOne($sql, ['ctVoucher', $id]);
+        $voucherID = Shopware()->Db()->fetchOne($sql, [Container::TYPE_VOUCHER, $id]);
         if (empty($voucherID)) {
             return false;
         }
@@ -577,8 +579,6 @@ public function getMailingVoucher($id)
      */
     public function getMailingEmails($id)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
-
         $sql = 'SELECT `groups`, languageID FROM s_campaigns_mailings WHERE id=?';
         $mailing = Shopware()->Db()->fetchRow($sql, [$id]);
 
@@ -588,16 +588,16 @@ public function getMailingEmails($id)
 
         $customerGroups = [];
         $recipientGroups = [];
-        $mailing['groups'] = unserialize($mailing['groups'], ['allowed_classes' => false]);
+        $mailing['groups'] = unserialize($mailing['groups'], ['allowed_classes' => false]) ?: [];
 
         // The first element holds the selected customer groups for the current newsletter
-        foreach ($mailing['groups'][0] as $customerGroupKey => $customerGroupValue) {
+        foreach ($mailing['groups'][0] ?? [] as $customerGroupKey => $customerGroupValue) {
             $customerGroups[] = Shopware()->Db()->quoteInto('su.customergroup=?', $customerGroupKey);
         }
         $customerGroups = implode(' OR ', $customerGroups);
 
         // The second element holds the selected *newsletter* groups for the current newsletter
-        foreach ($mailing['groups'][1] as $customerGroupKey => $customerGroupValue) {
+        foreach ($mailing['groups'][1] ?? [] as $customerGroupKey => $customerGroupValue) {
             $recipientGroups[] = Shopware()->Db()->quoteInto('sc.groupID=?', $customerGroupKey);
         }
         $recipientGroups = implode(' OR ', $recipientGroups);
@@ -661,8 +661,6 @@ public function getMailingEmails($id)
      */
     public function getVoucherCode($voucherID)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
-
         $sql = '
             SELECT id, code
             FROM s_emarketing_voucher_codes evc
@@ -691,8 +689,6 @@ public function getVoucherCode($voucherID)
      */
     public function getMailingUserByEmail($email)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
-
         $select = '
             cm.email, cm.email as newsletter, cg.name as `group`,
             IFNULL(u.salutation, nd.salutation) as salutation,
@@ -760,8 +756,6 @@ public function getMailingUserByEmail($email)
      */
     public function preFilter($source)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
-
         $source = str_replace('<suggestions></suggestions>', '{include file="suggest`$sMailing.template`"}', $source);
         $source = str_replace('<weblog></weblog>', '<img src="{url module=backend controller=newsletter action=log mailing=$sMailing.id mailaddress=$sUser.mailaddressID fullPath}" style="width:1px;height:1px">', $source);
         $source = str_replace('@suggestions', '{include file="alt/suggest`$sMailing.template`"}', $source);
@@ -782,8 +776,6 @@ public function preFilter($source)
      */
     public function outputFilter($source)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
-
         $source = preg_replace('#(src|background)="([^:"./][^:"]+)"#Umsi', '$1="../../campaigns/$2"', $source);
         $callback = [Shopware()->Plugins()->Core()->PostFilter(), 'rewriteSrc'];
 
@@ -801,8 +793,6 @@ public function outputFilter($source)
      */
     public function altFilter($source)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
-
         $source = preg_replace('#<a.+href="(.*)".*>#Umsi', '$1', $source);
         $source = str_replace(['<br />', '</p>', '&nbsp;'], ["\n", "\n", ' '], $source);
         $source = trim(strip_tags((string) preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s', '', $source)));
@@ -822,8 +812,6 @@ public function altFilter($source)
      */
     public function trackFilter($source, $mailingID)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
-
         $track = 'sPartner=sCampaign' . (int) $mailingID;
         $host = preg_quote(Shopware()->Config()->get('BasePath'), '#');
         $pattern = '#href="(https?://' . $host . '[^<]*[?][^<]+)"#Umsi';
@@ -842,9 +830,6 @@ public function trackFilter($source, $mailingID)
      */
     public function createHash()
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
-
-        // todo@all Create new method to get same secret hashes for values
         $license = '';
         $parts = \func_get_args();
         $parts[] = $license;
diff --git a/engine/Shopware/Controllers/Backend/NewsletterManager.php b/engine/Shopware/Controllers/Backend/NewsletterManager.php
index f5ad2a9f77c..e1df521898f 100644
--- a/engine/Shopware/Controllers/Backend/NewsletterManager.php
+++ b/engine/Shopware/Controllers/Backend/NewsletterManager.php
@@ -1,45 +1,56 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\DBALException;
+use Doctrine\ORM\AbstractQuery;
+use Doctrine\ORM\Query;
+use Shopware\Components\Model\ModelManager;
+use Shopware\Models\Newsletter\Address;
+use Shopware\Models\Newsletter\Group;
+use Shopware\Models\Newsletter\Newsletter;
+use Shopware\Models\Newsletter\Repository;
+use Shopware\Models\Newsletter\Sender;
+
 class Shopware_Controllers_Backend_NewsletterManager extends Shopware_Controllers_Backend_ExtJs
 {
     // Used to store a reference to the newsletter repository
-    protected $campaignsRepository = null;
+    protected $campaignsRepository;
 
     /**
      * @deprecated in 5.6, will be private in 5.8
      *
      * Helper Method to get access to the campaigns repository.
      *
-     * @return Shopware\Models\Newsletter\Repository
+     * @return Repository
      */
     public function getCampaignsRepository()
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         if ($this->campaignsRepository === null) {
-            $this->campaignsRepository = $this->get('models')->getRepository(\Shopware\Models\Newsletter\Newsletter::class);
+            $this->campaignsRepository = $this->get('models')->getRepository(Newsletter::class);
         }
 
         return $this->campaignsRepository;
@@ -81,7 +92,7 @@ public function createRecipientAction()
             return;
         }
 
-        $model = new \Shopware\Models\Newsletter\Address();
+        $model = new Address();
         $model->setGroupId($groupId);
         $model->setEmail($email);
         $model->setIsCustomer(false);
@@ -142,23 +153,23 @@ public function getGroupsAction()
             GROUP BY campaignGroup.groupkey) as t
             ORDER BY :field :direction LIMIT :limit OFFSET :offset';
 
-        /** @var \Doctrine\DBAL\Connection $db */
-        $db = $this->get(\Doctrine\DBAL\Connection::class);
+        /** @var Connection $db */
+        $db = $this->get(Connection::class);
 
         try {
             $query = $db->prepare($sql);
-            $query->bindParam('field', $field, \PDO::PARAM_STR);
-            $query->bindParam('direction', $direction, \PDO::PARAM_STR);
-            $query->bindParam('limit', $limit, \PDO::PARAM_INT);
-            $query->bindParam('offset', $offset, \PDO::PARAM_INT);
+            $query->bindParam('field', $field, PDO::PARAM_STR);
+            $query->bindParam('direction', $direction, PDO::PARAM_STR);
+            $query->bindParam('limit', $limit, PDO::PARAM_INT);
+            $query->bindParam('offset', $offset, PDO::PARAM_INT);
             $query->execute();
 
             $this->View()->assign([
                 'success' => true,
-                'data' => $query->fetchAll(\PDO::FETCH_ASSOC),
+                'data' => $query->fetchAll(PDO::FETCH_ASSOC),
                 'total' => $db->fetchColumn('SELECT FOUND_ROWS()'),
             ]);
-        } catch (\Doctrine\DBAL\DBALException $exception) {
+        } catch (DBALException $exception) {
             $this->View()->assign([
                 'success' => false,
                 'message' => $exception->getMessage(),
@@ -184,8 +195,8 @@ public function updateRecipientAction()
             return;
         }
 
-        /** @var \Shopware\Models\Newsletter\Newsletter|null $newsletter */
-        $newsletter = $this->get('models')->find(\Shopware\Models\Newsletter\Address::class, $id);
+        /** @var Newsletter|null $newsletter */
+        $newsletter = $this->get('models')->find(Address::class, $id);
         if ($newsletter === null) {
             $this->View()->assign([
                 'success' => false,
@@ -219,8 +230,8 @@ public function deleteNewsletterAction()
             return;
         }
 
-        $model = $this->get('models')->find(\Shopware\Models\Newsletter\Newsletter::class, $id);
-        if (!$model instanceof \Shopware\Models\Newsletter\Newsletter) {
+        $model = $this->get('models')->find(Newsletter::class, $id);
+        if (!$model instanceof Newsletter) {
             $this->View()->assign([
                 'success' => false,
                 'message' => $this->translateMessage('error_msg/no_newsletter', 'Newsletter not found'),
@@ -260,9 +271,9 @@ public function deleteRecipientGroupAction()
                 continue;
             }
 
-            $model = $this->get('models')->find(\Shopware\Models\Newsletter\Group::class, $id);
+            $model = $this->get('models')->find(Group::class, $id);
 
-            if (!$model instanceof \Shopware\Models\Newsletter\Group) {
+            if (!$model instanceof Group) {
                 continue;
             }
             $this->get('models')->remove($model);
@@ -297,9 +308,9 @@ public function deleteRecipientAction()
                 continue;
             }
 
-            $model = $this->get('models')->find(\Shopware\Models\Newsletter\Address::class, $id);
+            $model = $this->get('models')->find(Address::class, $id);
 
-            if (!$model instanceof \Shopware\Models\Newsletter\Address) {
+            if (!$model instanceof Address) {
                 continue;
             }
             $this->get('models')->remove($model);
@@ -334,9 +345,9 @@ public function deleteSenderAction()
                 continue;
             }
 
-            $model = $this->get('models')->find(\Shopware\Models\Newsletter\Sender::class, $id);
+            $model = $this->get('models')->find(Sender::class, $id);
 
-            if (!$model instanceof \Shopware\Models\Newsletter\Sender) {
+            if (!$model instanceof Sender) {
                 continue;
             }
             $this->get('models')->remove($model);
@@ -363,14 +374,14 @@ public function createNewsletterAction()
         }
 
         $data['groups'] = $this->serializeGroup($data['groups']);
-        $data['date'] = new \DateTime();
+        $data['date'] = new DateTime();
 
         // Flatten the newsletter->containers->text field: Each container as only one text-field
         foreach ($data['containers'] as $key => $value) {
             $data['containers'][$key]['text'] = $data['containers'][$key]['text'][0];
         }
 
-        $model = new \Shopware\Models\Newsletter\Newsletter();
+        $model = new Newsletter();
         $model->fromArray($data);
 
         $this->get('models')->persist($model);
@@ -413,8 +424,8 @@ public function updateNewsletterAction()
         }
 
         // First of all get rid of the old containers and text fields
-        $model = $this->get('models')->find(\Shopware\Models\Newsletter\Newsletter::class, $id);
-        if (!$model instanceof \Shopware\Models\Newsletter\Newsletter) {
+        $model = $this->get('models')->find(Newsletter::class, $id);
+        if (!$model instanceof Newsletter) {
             $this->View()->assign([
                 'success' => false,
                 'message' => $this->translateMessage('error_msg/no_newsletter', 'Newsletter not found'),
@@ -438,9 +449,9 @@ public function updateNewsletterAction()
         unset($data['date'], $data['locked']);
         $data['groups'] = $this->serializeGroup($data['groups']);
 
-        $model = $this->get('models')->find(\Shopware\Models\Newsletter\Newsletter::class, $id);
+        $model = $this->get('models')->find(Newsletter::class, $id);
 
-        if (!$model instanceof \Shopware\Models\Newsletter\Newsletter) {
+        if (!$model instanceof Newsletter) {
             $this->View()->assign([
                 'success' => false,
                 'message' => $this->translateMessage('error_msg/no_newsletter', 'Newsletter not found'),
@@ -464,7 +475,7 @@ public function createNewsletterGroupAction()
     {
         $data = $this->Request()->getParams();
 
-        $groupModel = new Shopware\Models\Newsletter\Group();
+        $groupModel = new Group();
         $groupModel->fromArray($data);
         $this->get('models')->persist($groupModel);
         $this->get('models')->flush();
@@ -479,7 +490,7 @@ public function createSenderAction()
     {
         $data = $this->Request()->getParams();
 
-        $senderModel = new Shopware\Models\Newsletter\Sender();
+        $senderModel = new Sender();
         $senderModel->fromArray($data);
         $this->get('models')->persist($senderModel);
         $this->get('models')->flush();
@@ -504,7 +515,7 @@ public function updateSenderAction()
             return;
         }
 
-        $model = $this->get('models')->find(\Shopware\Models\Newsletter\Sender::class, $id);
+        $model = $this->get('models')->find(Sender::class, $id);
         if ($model === null) {
             $this->View()->assign([
                 'success' => false,
@@ -532,13 +543,13 @@ public function listRecipientsAction()
         $offset = $this->Request()->getParam('start', 0);
 
         $query = $this->getCampaignsRepository()->getListAddressesQuery($filter, $sort, $limit, $offset);
-        $query->setHydrationMode(\Doctrine\ORM\AbstractQuery::HYDRATE_ARRAY);
+        $query->setHydrationMode(AbstractQuery::HYDRATE_ARRAY);
 
         $paginator = $this->getModelManager()->createPaginator($query);
         // Returns the total count of the query
         $totalResult = $paginator->count();
         // Returns the customer data
-        $result = $paginator->getIterator()->getArrayCopy();
+        $result = iterator_to_array($paginator);
 
         $this->View()->assign([
             'success' => true,
@@ -559,12 +570,12 @@ public function listSenderAction()
 
         $query = $this->getCampaignsRepository()->getListSenderQuery($filter, $sort, $limit, $offset);
 
-        $query->setHydrationMode(\Doctrine\ORM\AbstractQuery::HYDRATE_ARRAY);
+        $query->setHydrationMode(AbstractQuery::HYDRATE_ARRAY);
         $paginator = $this->getModelManager()->createPaginator($query);
         // Returns the total count of the query
         $totalResult = $paginator->count();
         // Returns the customer data
-        $result = $paginator->getIterator()->getArrayCopy();
+        $result = iterator_to_array($paginator);
 
         $this->View()->assign([
             'success' => true,
@@ -580,7 +591,7 @@ public function listSenderAction()
      */
     public function getPreviewNewslettersQuery()
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         $builder = $this->get('models')->createQueryBuilder();
 
@@ -589,7 +600,7 @@ public function getPreviewNewslettersQuery()
             'container',
             'text',
         ]);
-        $builder->from(\Shopware\Models\Newsletter\Newsletter::class, 'mailing')
+        $builder->from(Newsletter::class, 'mailing')
             ->leftJoin('mailing.containers', 'container')
             ->leftJoin('container.text', 'text')
             ->where('mailing.status = -1');
@@ -629,16 +640,17 @@ public function listNewslettersAction()
         $revenues = Shopware()->Db()->fetchAssoc($sql);
 
         // Get newsletters
+        /** @var Query<array<string, mixed>> $query */
         $query = $this->getCampaignsRepository()->getListNewslettersQuery($filter, $sort, $limit, $offset);
 
-        $query->setHydrationMode(\Doctrine\ORM\AbstractQuery::HYDRATE_ARRAY);
+        $query->setHydrationMode(AbstractQuery::HYDRATE_ARRAY);
         $paginator = $this->getModelManager()->createPaginator($query);
 
         // Returns the total count of the query
         $totalResult = $paginator->count();
 
         // Returns the customer data
-        $result = $paginator->getIterator()->getArrayCopy();
+        $result = iterator_to_array($paginator);
 
         // Get address count via plain sql in order to improve the speed
         $ids = [];
@@ -699,10 +711,10 @@ public function releaseNewsletterAction()
             return;
         }
 
-        $modelManager = $this->get(\Shopware\Components\Model\ModelManager::class);
-        $model = $modelManager->find(\Shopware\Models\Newsletter\Newsletter::class, $id);
+        $modelManager = $this->get(ModelManager::class);
+        $model = $modelManager->find(Newsletter::class, $id);
 
-        if ($model instanceof Shopware\Models\Newsletter\Newsletter) {
+        if ($model instanceof Newsletter) {
             $model->setStatus($active);
         } else {
             $this->View()->assign([
diff --git a/engine/Shopware/Controllers/Backend/Notification.php b/engine/Shopware/Controllers/Backend/Notification.php
index d343bf125ee..0fd0f432c3f 100644
--- a/engine/Shopware/Controllers/Backend/Notification.php
+++ b/engine/Shopware/Controllers/Backend/Notification.php
@@ -1,56 +1,55 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+use Doctrine\ORM\AbstractQuery;
 use Shopware\Models\Article\Article;
 
 class Shopware_Controllers_Backend_Notification extends Shopware_Controllers_Backend_ExtJs
 {
     /**
      * returns a JSON string to with all found articles for the backend listing
+     *
+     * @return void
      */
     public function getArticleListAction()
     {
         try {
-            $limit = (int) $this->Request()->limit;
-            $offset = (int) $this->Request()->start;
-
-            /** @var array $filter */
-            $filter = $this->Request()->getParam('filter', []);
+            $limit = (int) $this->Request()->get('limit', 20);
+            $offset = (int) $this->Request()->get('start', 0);
+            $filter = (array) $this->Request()->getParam('filter', []);
 
-            //order data
+            // order data
             $order = (array) $this->Request()->getParam('sort', []);
 
             $repository = $this->get('models')->getRepository(Article::class);
             $dataQuery = $repository->getArticlesWithRegisteredNotificationsQuery($filter, $offset, $limit, $order);
-            $data = $dataQuery->getArrayResult();
 
-            // manually calc the totalAmount cause the paginate($this->get('models')->getQueryCount) doesn't work with this query
-            $dataQuery->setFirstResult(0);
-            $totalCount = \count($dataQuery->getArrayResult());
+            $data = $dataQuery->getResult(AbstractQuery::HYDRATE_ARRAY);
+            $totalCount = (int) $repository->getProductsWithNotificationsCountQuery()->getOneOrNullResult(AbstractQuery::HYDRATE_SINGLE_SCALAR);
 
             $summaryQuery = $repository->getArticlesWithRegisteredNotificationsQuery($filter, $offset, $limit, $order, true);
-            $summaryData = $summaryQuery->getOneOrNullResult(\Doctrine\ORM\AbstractQuery::HYDRATE_ARRAY);
+            $summaryData = $summaryQuery->getOneOrNullResult(AbstractQuery::HYDRATE_ARRAY);
 
             $this->View()->assign(
                 [
@@ -68,18 +67,19 @@ public function getArticleListAction()
 
     /**
      * returns a JSON string to with all found customers for the backend listing
+     *
+     * @return void
      */
     public function getCustomerListAction()
     {
         try {
-            $limit = (int) $this->Request()->limit;
-            $offset = (int) $this->Request()->start;
-            $productOrderNumber = $this->Request()->orderNumber;
+            $limit = (int) $this->Request()->get('limit', 20);
+            $offset = (int) $this->Request()->get('start', 0);
+            $productOrderNumber = $this->Request()->get('orderNumber');
 
-            /** @var array $filter */
-            $filter = $this->Request()->getParam('filter', []);
+            $filter = (array) $this->Request()->getParam('filter', []);
 
-            //order data
+            // order data
             $order = (array) $this->Request()->getParam('sort', []);
 
             $repository = $this->get('models')->getRepository(Article::class);
diff --git a/engine/Shopware/Controllers/Backend/Order.php b/engine/Shopware/Controllers/Backend/Order.php
index 77a970a17f0..4fa002e13f0 100644
--- a/engine/Shopware/Controllers/Backend/Order.php
+++ b/engine/Shopware/Controllers/Backend/Order.php
@@ -1,28 +1,26 @@
 <?php
 
 declare(strict_types=1);
-
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\DBAL\Connection;
@@ -33,11 +31,14 @@
 use Shopware\Bundle\AttributeBundle\Repository\SearchCriteria;
 use Shopware\Bundle\MailBundle\Service\LogEntryBuilder;
 use Shopware\Bundle\OrderBundle\Service\CalculationServiceInterface;
+use Shopware\Bundle\OrderBundle\Service\OrderListProductServiceInterface;
+use Shopware\Bundle\StoreFrontBundle\Struct\ShopContextInterface;
 use Shopware\Bundle\StoreFrontBundle\Struct\Tax as TaxStruct;
 use Shopware\Components\CSRFWhitelistAware;
 use Shopware\Components\Model\ModelManager;
 use Shopware\Components\Model\QueryBuilder;
 use Shopware\Components\Random;
+use Shopware\Components\ShopRegistrationServiceInterface;
 use Shopware\Components\StateTranslatorService;
 use Shopware\Models\Article\Detail as ProductVariant;
 use Shopware\Models\Article\Unit;
@@ -69,6 +70,8 @@
 
 class Shopware_Controllers_Backend_Order extends Shopware_Controllers_Backend_ExtJs implements CSRFWhitelistAware
 {
+    private const DEFAULT_CUSTOMER_GROUP = 'EK';
+
     /**
      * @deprecated - Will be private and an instance property in Shopware 5.8
      *
@@ -114,7 +117,7 @@ class Shopware_Controllers_Backend_Order extends Shopware_Controllers_Backend_Ex
 
     /**
      * @deprecated - Will be removed in Shopware 5.8 without a replacement
-     * Contains the dynamic receipt repository
+     * Contains the order document repository
      *
      * @var OrderDocumentRepository
      */
@@ -213,7 +216,7 @@ public function loadListAction()
      * @param int[]  $orderIds
      * @param string $docType
      *
-     * @return Query
+     * @return Query<Order>
      */
     public function getOrderDocumentsQuery($orderIds, $docType)
     {
@@ -242,7 +245,7 @@ public function getOrderDocumentsQuery($orderIds, $docType)
      * @param int|null                                                               $offset
      * @param int|null                                                               $limit
      *
-     * @return Query
+     * @return Query<Status>
      */
     public function getOrderStatusQuery($filter = null, $order = null, $offset = null, $limit = null)
     {
@@ -419,7 +422,7 @@ public function getStatusHistoryAction()
 
         $namespace = $this->get('snippets')->getNamespace('backend/order');
 
-        //the backend order module have no function to create a new order so an order id must be passed.
+        // the backend order module have no function to create a new order so an order id must be passed.
         if (empty($orderId)) {
             $this->View()->assign([
                 'success' => false,
@@ -578,7 +581,7 @@ public function saveAction()
             try {
                 $mail = $this->getMailForOrder($order->getId(), $status->getId());
             } catch (Exception $e) {
-                $warning = sprintf(
+                $warning = \sprintf(
                     $namespace->get('warning/mail_creation_failed'),
                     $status->getName(),
                     $e->getMessage()
@@ -895,7 +898,7 @@ public function batchProcessAction()
                 $modelManager->flush($order);
             } catch (Exception $e) {
                 $data['success'] = false;
-                $data['errorMessage'] = sprintf(
+                $data['errorMessage'] = \sprintf(
                     $namespace->get('save_order_failed', 'Error when saving the order. Error: %s'),
                     $e->getMessage()
                 );
@@ -927,7 +930,7 @@ public function batchProcessAction()
             } catch (Exception $e) {
                 $data['mail'] = null;
                 $data['success'] = false;
-                $data['errorMessage'] = sprintf(
+                $data['errorMessage'] = \sprintf(
                     $namespace->get('send_mail_failed', 'Error when sending mail. Error: %s'),
                     $e->getMessage()
                 );
@@ -981,7 +984,7 @@ public function mergeDocumentsAction()
         $models = $this->getOrderDocumentsQuery($data->orders, $data->docType)->getResult();
         foreach ($models as $model) {
             foreach ($model->getDocuments() as $document) {
-                $file = $this->downloadFileFromFilesystem(sprintf('documents/%s.pdf', $document->getHash()));
+                $file = $this->downloadFileFromFilesystem(\sprintf('documents/%s.pdf', $document->getHash()));
                 if ($file !== null) {
                     $files[] = $file;
                 }
@@ -1106,7 +1109,7 @@ public function deleteDocumentAction()
                 ->setParameter('documentId', $documentId)
                 ->execute();
 
-            $file = sprintf('documents/%s.pdf', $documentHash);
+            $file = \sprintf('documents/%s.pdf', $documentHash);
             if ($filesystem->has($file)) {
                 $filesystem->delete($file);
             }
@@ -1226,7 +1229,7 @@ public function createDocumentAction()
 
         $query = $this->getRepository()->getOrdersQuery([['property' => 'orders.id', 'value' => $orderId]], null, 0, 1);
         $query->setHydrationMode(AbstractQuery::HYDRATE_ARRAY);
-        $order = $this->getModelManager()->createPaginator($query)->getIterator()->getArrayCopy();
+        $order = iterator_to_array($this->getModelManager()->createPaginator($query));
 
         $order = $translationComponent->translateOrders($order);
 
@@ -1245,7 +1248,7 @@ public function createDocumentAction()
     public function openPdfAction()
     {
         $filesystem = $this->container->get('shopware.filesystem.private');
-        $file = sprintf('documents/%s.pdf', basename($this->Request()->getParam('id')));
+        $file = \sprintf('documents/%s.pdf', basename($this->Request()->getParam('id')));
 
         if ($filesystem->has($file) === false) {
             $this->View()->assign([
@@ -1283,7 +1286,7 @@ public function openPdfAction()
             $this->View()->assign([
                 'success' => false,
                 'data' => $this->Request()->getParams(),
-                'message' => sprintf('Could not open file: %s', $file),
+                'message' => \sprintf('Could not open file: %s', $file),
             ]);
 
             return;
@@ -1433,7 +1436,7 @@ protected function getDispatchRepository()
      */
     protected function getDocumentRepository()
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         if (self::$documentRepository === null) {
             self::$documentRepository = $this->getManager()->getRepository(Document::class);
@@ -1503,10 +1506,10 @@ protected function getList($filter, $sort, $offset, $limit)
             $order['locale'] = $order['languageSubShop']['locale'];
 
             // Deprecated: use payment instance
-            $order['debit'] = $order['customer']['debit'];
+            $order['debit'] = $order['customer']['debit'] ?? null;
             $order['customerEmail'] = $order['customer']['email'];
-            $order['billing']['salutationSnippet'] = $namespace->get($order['billing']['salutation']);
-            $order['shipping']['salutationSnippet'] = $namespace->get($order['shipping']['salutation']);
+            $order['billing']['salutationSnippet'] = $namespace->get($order['billing']['salutation'] ?? '');
+            $order['shipping']['salutationSnippet'] = $namespace->get($order['shipping']['salutation'] ?? '');
 
             foreach ($order['details'] as &$orderDetail) {
                 $number = $orderDetail['articleNumber'];
@@ -1577,19 +1580,19 @@ private function resolveSortParameter(array $sorts): array
                     $resolved[] = ['property' => 'customer.email', 'direction' => $direction];
                     break;
 
-                // Custom sort field for customer name
+                    // Custom sort field for customer name
                 case $sort['property'] === 'customerName':
                     $resolved[] = ['property' => 'billing.lastName', 'direction' => $direction];
                     $resolved[] = ['property' => 'billing.firstName', 'direction' => $direction];
                     $resolved[] = ['property' => 'billing.company', 'direction' => $direction];
                     break;
 
-                // Contains no sql prefix? add orders as default prefix
+                    // Contains no sql prefix? add orders as default prefix
                 case !str_contains($sort['property'], '.'):
                     $resolved[] = ['property' => 'orders.' . $sort['property'], 'direction' => $direction];
                     break;
 
-                // Already prefixed with an alias?
+                    // Already prefixed with an alias?
                 default:
                     $resolved[] = $sort;
             }
@@ -1809,7 +1812,7 @@ private function addAttachments(Enlight_Components_Mail $mail, int $orderId, arr
         $filesystem = $this->container->get('shopware.filesystem.private');
 
         foreach ($attachments as $attachment) {
-            $filePath = sprintf('documents/%s.pdf', $attachment['hash']);
+            $filePath = \sprintf('documents/%s.pdf', $attachment['hash']);
             $fileName = $this->getFileName($orderId, (int) $attachment['type'][0]['id']);
 
             if ($filesystem->has($filePath) === false) {
@@ -1945,13 +1948,28 @@ private function getPositionAssociatedData(array $data, Order $order): array
             unset($data['status']);
         }
 
-        $data = $this->checkTaxRule($data, $order);
+        $shopContext = $this->createShopContext($order);
+        $data = $this->checkTaxRule($data, $shopContext);
+        $orderPosition = null;
+        foreach ($order->getDetails() as $position) {
+            if ($position->getId() === (int) $data['id']) {
+                $orderPosition = $position;
+                break;
+            }
+        }
+        // Only get graduated price if a new position should be added or quantity has changed
+        if (($orderPosition === null || $orderPosition->getQuantity() !== (int) $data['quantity'])
+            && $this->hasProductGraduatedPrices($data['articleNumber'], $order)
+        ) {
+            $data = $this->checkPrice($data, $order, $shopContext);
+        }
 
         $variant = $this->getManager()->getRepository(ProductVariant::class)
             ->findOneBy(['number' => $data['articleNumber']]);
 
-        // Load ean, unit and pack unit (translate if needed)
+        // Load articleDetailId, ean, unit and pack unit (translate if needed)
         if ($variant instanceof ProductVariant) {
+            $data['articleDetail'] = $variant;
             $mainVariant = $variant->getArticle()->getMainDetail();
             $data['ean'] = $variant->getEan();
             if (!\is_string($data['ean']) && $mainVariant instanceof ProductVariant) {
@@ -2025,12 +2043,59 @@ private function getPositionAssociatedData(array $data, Order $order): array
         return $data;
     }
 
+    private function createShopContext(Order $order): ShopContextInterface
+    {
+        $customerGroupKey = $this->getCustomerGroupKey($order);
+        $areaId = null;
+        $countryId = null;
+        $stateId = null;
+
+        $currencyId = (int) $this->container->get(Connection::class)->fetchOne(
+            'SELECT `id` FROM `s_core_currencies` WHERE `currency` = :currency',
+            ['currency' => $order->getCurrency()]
+        );
+
+        $shippingAddress = $order->getShipping();
+        if ($shippingAddress instanceof Shipping) {
+            $countryId = $shippingAddress->getCountry()->getId();
+
+            $area = $shippingAddress->getCountry()->getArea();
+            if ($area instanceof Area) {
+                $areaId = $area->getId();
+            }
+
+            $state = $shippingAddress->getState();
+            if ($state instanceof State) {
+                $stateId = $state->getId();
+            }
+        }
+
+        $shop = $order->getShop();
+
+        return $this->container->get('shopware_storefront.shop_context_factory')->create(
+            $shop->getBaseUrl() ?? '',
+            $shop->getId(),
+            $currencyId,
+            $customerGroupKey,
+            $areaId,
+            $countryId,
+            $stateId
+        );
+    }
+
+    private function getCustomerGroupKey(Order $order): string
+    {
+        $customer = $order->getCustomer();
+
+        return $customer instanceof Customer ? $customer->getGroupKey() : self::DEFAULT_CUSTOMER_GROUP;
+    }
+
     /**
      * @param array<string, mixed> $data
      *
      * @return array<string, mixed>
      */
-    private function checkTaxRule(array $data, Order $order): array
+    private function checkTaxRule(array $data, ShopContextInterface $shopContext): array
     {
         $taxId = $data['taxId'];
         if (empty($taxId)) {
@@ -2044,26 +2109,6 @@ private function checkTaxRule(array $data, Order $order): array
             $data['taxRate'] = (float) $tax->getTax();
         }
 
-        $shop = $order->getShop();
-        $areaId = null;
-        $countryId = null;
-        $billingAddress = $order->getBilling();
-        if ($billingAddress instanceof Billing) {
-            $countryId = $billingAddress->getCountry()->getId();
-
-            $area = $billingAddress->getCountry()->getArea();
-            if ($area instanceof Area) {
-                $areaId = $area->getId();
-            }
-        }
-        $shopContext = $this->get('shopware_storefront.shop_context_factory')->create(
-            $shop->getBaseUrl() ?? '',
-            $shop->getId(),
-            null,
-            null,
-            $areaId,
-            $countryId
-        );
         $taxRule = $shopContext->getTaxRule($taxId);
         if ($taxRule instanceof TaxStruct) {
             $data['taxRate'] = (float) $taxRule->getTax();
@@ -2072,6 +2117,62 @@ private function checkTaxRule(array $data, Order $order): array
         return $data;
     }
 
+    private function hasProductGraduatedPrices(string $productNumber, Order $order): bool
+    {
+        $customerGroupKey = $this->getCustomerGroupKey($order);
+
+        $sql = 'SELECT prices.pricegroup, count(*)
+                FROM s_articles_prices AS prices
+                INNER JOIN s_articles_details ON prices.articledetailsID = s_articles_details.id
+                WHERE s_articles_details.ordernumber = :productNumber
+                GROUP BY prices.pricegroup;';
+
+        $result = $this->container->get(Connection::class)->executeQuery($sql, ['productNumber' => $productNumber])->fetchAllKeyValue();
+
+        return (isset($result[$customerGroupKey]) && $result[$customerGroupKey] > 1) || $result[self::DEFAULT_CUSTOMER_GROUP] > 1;
+    }
+
+    /**
+     * @param array<string, mixed> $data
+     *
+     * @return array<string, mixed>
+     */
+    private function checkPrice(array $data, Order $order, ShopContextInterface $shopContext): array
+    {
+        $orderListProductService = $this->container->get(OrderListProductServiceInterface::class);
+
+        if (!$orderListProductService instanceof OrderListProductServiceInterface) {
+            return $data;
+        }
+
+        $shopRegistrationService = $this->container->get(ShopRegistrationServiceInterface::class);
+        $shop = $order->getShop();
+        $shopRegistrationService->registerShop($shop);
+
+        $listProduct = $orderListProductService->getList([$data['articleNumber']], $shopContext);
+        if (empty($listProduct)) {
+            return $data;
+        }
+
+        $prices = $listProduct[$data['articleNumber']]['prices'];
+        if (\is_array($prices)) {
+            foreach ($prices as $graduatedPrice) {
+                if ($data['quantity'] >= $graduatedPrice['valFrom'] && ($data['quantity'] <= $graduatedPrice['valTo'] || $graduatedPrice['valTo'] === null)) {
+                    $data['price'] = $graduatedPrice['price_numeric'];
+                    break;
+                }
+            }
+            $data['total'] = $this->calculateTotal($data['price'], $data['quantity']);
+        }
+
+        return $data;
+    }
+
+    private function calculateTotal(float $price, int $quantity): float
+    {
+        return $price * $quantity;
+    }
+
     /**
      * Internal helper function which insert the order association data into the passed data array.
      *
@@ -2085,7 +2186,7 @@ private function getAssociatedData(array $data): array
         if (!empty($data['customerId'])) {
             $data['customer'] = $this->getManager()->find(Customer::class, $data['customerId']);
         } else {
-            //if no customer id passed, we have to unset the array element, otherwise the existing customer model would be overwritten
+            // if no customer id passed, we have to unset the array element, otherwise the existing customer model would be overwritten
             unset($data['customer']);
         }
 
@@ -2212,7 +2313,7 @@ private function downloadFileFromFilesystem(string $path): ?string
         if (!\is_resource($source)) {
             $this->View()->assign([
                 'success' => false,
-                'message' => sprintf('Could not read from path: %s', $path),
+                'message' => \sprintf('Could not read from path: %s', $path),
             ]);
 
             return null;
@@ -2221,7 +2322,7 @@ private function downloadFileFromFilesystem(string $path): ?string
         if (!\is_resource($downstream)) {
             $this->View()->assign([
                 'success' => false,
-                'message' => sprintf('Could not read from path: %s', $tmpFile),
+                'message' => \sprintf('Could not read from path: %s', $tmpFile),
             ]);
 
             return null;
@@ -2325,7 +2426,7 @@ private function getTemplateNameForDocumentTypeId(?int $documentTypeId = null):
 
     private function getCurrentLocale(): ?ShopLocale
     {
-        return $this->get('auth')->getIdentity()->locale;
+        return $this->get('auth')->getIdentity()->locale ?? null;
     }
 
     private function checkIfOrderHasBeenModifiedSince(DateTime $lastOrderChange, Order $order, Enlight_Components_Snippet_Namespace $namespace): bool
diff --git a/engine/Shopware/Controllers/Backend/OrderProductSearch.php b/engine/Shopware/Controllers/Backend/OrderProductSearch.php
new file mode 100644
index 00000000000..001e259fb21
--- /dev/null
+++ b/engine/Shopware/Controllers/Backend/OrderProductSearch.php
@@ -0,0 +1,160 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Controllers\Backend;
+
+use Doctrine\DBAL\Connection;
+use RuntimeException;
+use Shopware\Bundle\StoreFrontBundle\Struct\Tax as TaxStruct;
+use Shopware\Components\Model\Exception\ModelNotFoundException;
+use Shopware\Components\Model\ModelManager;
+use Shopware\Models\Customer\Customer;
+use Shopware\Models\Customer\Group;
+use Shopware\Models\Order\Order;
+use Shopware\Models\Order\Shipping;
+use Shopware\Models\Shop\Shop;
+use Shopware_Controllers_Backend_Base;
+
+class OrderProductSearch extends Shopware_Controllers_Backend_Base
+{
+    private const DEFAULT_CUSTOMER_GROUP = 'EK';
+    private const DEFAULT_PRODUCT_QUANTITY = 1;
+    private const PLACEHOLDER_UP_TO = 'beliebig';
+
+    public function getProductVariantsAction(): void
+    {
+        $orderId = (int) $this->Request()->getParam('orderId');
+        if ($orderId === 0) {
+            throw new RuntimeException('The parameter orderId is not set');
+        }
+
+        $order = $this->container->get(ModelManager::class)->find(Order::class, $orderId);
+        if (!$order instanceof Order) {
+            throw new ModelNotFoundException(Order::class, $orderId);
+        }
+
+        $customer = $order->getCustomer();
+        if (!$customer instanceof Customer) {
+            throw new ModelNotFoundException(Customer::class, $orderId);
+        }
+
+        $orderShippingAddress = $order->getShipping();
+        if (!$orderShippingAddress instanceof Shipping) {
+            throw new ModelNotFoundException(Shipping::class, $orderId);
+        }
+
+        $shop = $order->getShop();
+        if (!$shop instanceof Shop) {
+            throw new ModelNotFoundException(Shop::class, $orderId);
+        }
+
+        $customerGroup = $customer->getGroup() ?? $this->container->get(ModelManager::class)->getRepository(Group::class)->findOneBy(['key' => self::DEFAULT_CUSTOMER_GROUP]);
+        if (!$customerGroup instanceof Group) {
+            throw new ModelNotFoundException(Group::class, $orderId);
+        }
+        $customerGroupKey = $customerGroup->getKey();
+
+        $area = $orderShippingAddress->getCountry()->getArea();
+        $state = $orderShippingAddress->getState();
+        $shopContext = $this->container->get('shopware_storefront.shop_context_factory')->create(
+            $shop->getBaseUrl() ?? '',
+            $shop->getId(),
+            null,
+            $customerGroupKey,
+            $area ? $area->getId() : null,
+            $orderShippingAddress->getCountry()->getId(),
+            $state ? $state->getId() : null
+        );
+
+        $builder = $this->container->get(Connection::class)->createQueryBuilder();
+
+        $fields = [
+            'details.id',
+            'product.name',
+            'product.active',
+            'product.taxId',
+            'details.ordernumber',
+            'product.id as articleId',
+            'details.inStock',
+            'supplier.name as supplierName',
+            'supplier.id as supplierId',
+            'details.additionalText',
+            'COALESCE(customer_group_prices.price,default_prices.price) AS price',
+        ];
+
+        $builder->select($fields);
+        $builder->from('s_articles_details', 'details');
+        $builder->innerJoin('details', 's_articles', 'product', 'details.articleID = product.id');
+        $builder->innerJoin('product', 's_articles_supplier', 'supplier', 'supplier.id = product.supplierID');
+        $builder->leftJoin('details', 's_articles_prices', 'default_prices',
+            'details.id = default_prices.articledetailsID
+            AND default_prices.pricegroup = :defaultCustomerGroup
+            AND (:quantity >= default_prices.from AND (default_prices.to = :placeholderUpTo OR :quantity <= default_prices.to))');
+        $builder->leftJoin('details', 's_articles_prices', 'customer_group_prices',
+            'details.id = customer_group_prices.articledetailsID
+            AND customer_group_prices.pricegroup = :customerGroup
+            AND (:quantity >= customer_group_prices.from AND (customer_group_prices.to = :placeholderUpTo OR :quantity <= customer_group_prices.to))');
+        $builder->setParameters([
+            'defaultCustomerGroup' => self::DEFAULT_CUSTOMER_GROUP,
+            'customerGroup' => $customerGroupKey,
+            'quantity' => self::DEFAULT_PRODUCT_QUANTITY,
+            'placeholderUpTo' => self::PLACEHOLDER_UP_TO,
+        ]);
+
+        foreach ($this->Request()->getParam('filter', []) as $filter) {
+            if ($filter['property'] === 'free') {
+                $builder->andWhere(
+                    $builder->expr()->or(
+                        'details.ordernumber LIKE :free',
+                        'product.name LIKE :free',
+                        'supplier.name LIKE :free'
+                    )
+                );
+                $builder->setParameter(':free', $filter['value']);
+            }
+        }
+
+        $builder->setFirstResult($this->Request()->getParam('start'))
+            ->setMaxResults($this->Request()->getParam('limit'))
+            ->orderBy('details.id', 'ASC');
+
+        $result = $builder->execute()->fetchAllAssociative();
+
+        $total = (int) $builder->getConnection()->fetchOne('SELECT FOUND_ROWS()');
+
+        $result = $this->addAdditionalTextForVariant($result);
+
+        foreach ($result as $index => $variant) {
+            $taxRule = $shopContext->getTaxRule($variant['taxId']);
+            if ($taxRule instanceof TaxStruct) {
+                $result[$index]['tax'] = (float) $taxRule->getTax();
+            }
+
+            $result[$index]['price'] = $customerGroup->getTax() === true ? round((float) $variant['price'] / 100 * (100 + $result[$index]['tax']), 2) : round((float) $variant['price'], 2);
+        }
+
+        $this->View()->assign(['success' => true, 'data' => $result, 'total' => $total]);
+    }
+}
diff --git a/engine/Shopware/Controllers/Backend/Overview.php b/engine/Shopware/Controllers/Backend/Overview.php
index a8396dbef51..c2f64036db8 100644
--- a/engine/Shopware/Controllers/Backend/Overview.php
+++ b/engine/Shopware/Controllers/Backend/Overview.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Shopware_Controllers_Backend_Overview extends Shopware_Controllers_Backend_ExtJs
diff --git a/engine/Shopware/Controllers/Backend/Partner.php b/engine/Shopware/Controllers/Backend/Partner.php
index 950624c9558..6bf638c7278 100644
--- a/engine/Shopware/Controllers/Backend/Partner.php
+++ b/engine/Shopware/Controllers/Backend/Partner.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\Common\Collections\ArrayCollection;
@@ -29,6 +29,7 @@
 use Shopware\Components\CSRFWhitelistAware;
 use Shopware\Components\ShopRegistrationServiceInterface;
 use Shopware\Models\Customer\Customer;
+use Shopware\Models\Order\Order;
 use Shopware\Models\Partner\Partner;
 use Shopware\Models\Shop\Shop;
 
@@ -219,7 +220,7 @@ public function mapCustomerAccountAction()
             return;
         }
 
-        echo sprintf(
+        echo \sprintf(
             '%s %s %s %s|%d',
             $customer->getNumber(),
             $customer->getFirstname() . ' ' . $customer->getLastname(),
@@ -316,7 +317,7 @@ public function redirectToPartnerLinkAction()
 
         $this->get(ShopRegistrationServiceInterface::class)->registerShop($shop);
 
-        $url = $this->Front()->Router()->assemble(['module' => 'frontend', 'controller' => 'index']);
+        $url = $this->Front()->ensureRouter()->assemble(['module' => 'frontend', 'controller' => 'index']);
 
         $this->redirect($url . '?sPartner=' . urlencode($partnerId));
     }
@@ -348,10 +349,12 @@ protected function initAcl()
 
     /**
      * Helper function returns total count of the passed query builder
+     *
+     * @param Query<Order> $dataQuery
      */
     private function getStatisticListTotalCount(Query $dataQuery): ?int
     {
-        //userCurrencyFactor has not to be part of the count parameters
+        // userCurrencyFactor has not to be part of the count parameters
         $originalParameters = $dataQuery->getParameters();
         $countParameters = new ArrayCollection();
 
@@ -399,6 +402,7 @@ private function getToDate(): DateTime
         } else {
             $toDate = new DateTime($toDate);
         }
+
         // To get the right value cause 2012-02-02 is smaller than 2012-02-02 15:33:12
         return $toDate->add(new DateInterval('P1D'));
     }
diff --git a/engine/Shopware/Controllers/Backend/Payment.php b/engine/Shopware/Controllers/Backend/Payment.php
index c304c341107..ee5398d0077 100644
--- a/engine/Shopware/Controllers/Backend/Payment.php
+++ b/engine/Shopware/Controllers/Backend/Payment.php
@@ -1,28 +1,31 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\ORM\ORMException;
 use Shopware\Models\Country\Country;
+use Shopware\Models\Country\Repository;
 use Shopware\Models\Payment\Payment;
 use Shopware\Models\Shop\Shop;
 
@@ -34,7 +37,7 @@ class Shopware_Controllers_Backend_Payment extends Shopware_Controllers_Backend_
     protected $repository;
 
     /**
-     * @var \Shopware\Models\Country\Repository
+     * @var Repository
      */
     protected $countryRepository;
 
@@ -74,7 +77,7 @@ public function getPaymentsAction()
         // The standard $translationComponent->translatePayments can not be used here since the
         // description may not be overridden. The field is edible and if the translation is
         // shown in the edit field, there is a high chance of a user saving the translation as description.
-        $translator = $this->get(\Shopware_Components_Translation::class)->getObjectTranslator('config_payment');
+        $translator = $this->get(Shopware_Components_Translation::class)->getObjectTranslator('config_payment');
         $results = array_map(function ($payment) use ($translator) {
             return $translator->translateObjectProperty($payment, 'description', 'translatedDescription', $payment['description']);
         }, $results);
@@ -103,28 +106,27 @@ public function createPaymentsAction()
         try {
             $params = $this->Request()->getParams();
             unset($params['action']);
-            $repository = $this->get('models')->getRepository(\Shopware\Models\Payment\Payment::class);
+            $repository = $this->get('models')->getRepository(Payment::class);
             $existingModel = $repository->findByName($params['name']);
-
             if ($existingModel) {
-                throw new \Doctrine\ORM\ORMException('The name is already in use.');
+                throw new ORMException('The name is already in use.');
             }
             if ($params['source'] == 0) {
                 $params['source'] = null;
             }
 
             $paymentModel = new Payment();
-            $countries = $params['countries'];
+            $countries = $params['countries'] ?? [];
             $countryArray = [];
             foreach ($countries as $country) {
-                $countryArray[] = $this->get('models')->find(\Shopware\Models\Country\Country::class, $country['id']);
+                $countryArray[] = $this->get('models')->find(Country::class, $country['id']);
             }
             $params['countries'] = $countryArray;
 
-            $shops = $params['shops'];
+            $shops = $params['shops'] ?? [];
             $shopArray = [];
             foreach ($shops as $shop) {
-                $shopArray[] = $this->get('models')->find(\Shopware\Models\Shop\Shop::class, $shop['id']);
+                $shopArray[] = $this->get('models')->find(Shop::class, $shop['id']);
             }
             $params['shops'] = $shopArray;
 
@@ -135,7 +137,7 @@ public function createPaymentsAction()
 
             $params['id'] = $paymentModel->getId();
             $this->View()->assign(['success' => true, 'data' => $params]);
-        } catch (\Doctrine\ORM\ORMException $e) {
+        } catch (ORMException $e) {
             $this->View()->assign(['success' => false, 'errorMsg' => $e->getMessage()]);
         }
     }
@@ -148,14 +150,13 @@ public function updatePaymentsAction()
     {
         try {
             $id = $this->Request()->getParam('id');
-            /** @var Payment $payment */
             $payment = $this->get('models')->find(Payment::class, $id);
             $action = $payment->getAction();
             $data = $this->Request()->getParams();
-            $data['surcharge'] = str_replace(',', '.', $data['surcharge']);
-            $data['debitPercent'] = str_replace(',', '.', $data['debitPercent']);
+            $data['surcharge'] = str_replace(',', '.', $data['surcharge'] ?? '');
+            $data['debitPercent'] = str_replace(',', '.', $data['debitPercent'] ?? '');
 
-            $countries = new \Doctrine\Common\Collections\ArrayCollection();
+            $countries = new ArrayCollection();
             if (!empty($data['countries'])) {
                 // Clear all countries, to save the old and new ones then
                 $payment->getCountries()->clear();
@@ -166,7 +167,7 @@ public function updatePaymentsAction()
                 $data['countries'] = $countries;
             }
 
-            $shops = new \Doctrine\Common\Collections\ArrayCollection();
+            $shops = new ArrayCollection();
             if (!empty($data['shops'])) {
                 // Clear all shops, to save the old and new ones then
                 $payment->getShops()->clear();
@@ -176,7 +177,7 @@ public function updatePaymentsAction()
                 }
                 $data['shops'] = $shops;
             }
-            $data['surchargeString'] = $this->filterSurchargeString($data['surchargeString'], $data['countries']);
+            $data['surchargeString'] = $this->filterSurchargeString($data['surchargeString'] ?? '', $data['countries'] ?? []);
 
             $payment->fromArray($data);
 
@@ -199,14 +200,14 @@ public function updatePaymentsAction()
             $this->get('models')->persist($payment);
             $this->get('models')->flush();
 
-            if ($data['active']) {
+            if (!empty($data['active'])) {
                 $data['iconCls'] = 'sprite-tick';
             } else {
                 $data['iconCls'] = 'sprite-cross';
             }
 
             $this->View()->assign(['success' => true, 'data' => $data]);
-        } catch (\Doctrine\ORM\ORMException $e) {
+        } catch (ORMException $e) {
             $this->View()->assign(['success' => false, 'errorMsg' => $e->getMessage()]);
         }
     }
@@ -220,7 +221,6 @@ public function deletePaymentAction()
         }
         $repository = $this->get('models')->getRepository(Payment::class);
         $id = $this->Request()->get('id');
-        /** @var Payment $model */
         $model = $repository->find($id);
         if ($model->getSource() == 1) {
             try {
@@ -238,7 +238,7 @@ public function deletePaymentAction()
     /**
      * Internal helper function to get access to the country repository.
      *
-     * @return \Shopware\Models\Country\Repository
+     * @return Repository
      */
     private function getCountryRepository()
     {
@@ -296,12 +296,9 @@ private function formatResult($results)
     }
 
     /**
-     * @param string                             $surchargeString
-     * @param \Shopware\Models\Country\Country[] $countries
-     *
-     * @return string
+     * @param Country[] $countries
      */
-    private function filterSurchargeString($surchargeString, $countries)
+    private function filterSurchargeString(string $surchargeString, array $countries): string
     {
         $buffer = [];
         $surcharges = explode(';', $surchargeString);
diff --git a/engine/Shopware/Controllers/Backend/Performance.php b/engine/Shopware/Controllers/Backend/Performance.php
index f49c93bfd07..7f1fef096ba 100644
--- a/engine/Shopware/Controllers/Backend/Performance.php
+++ b/engine/Shopware/Controllers/Backend/Performance.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\Common\Collections\ArrayCollection;
@@ -170,7 +170,7 @@ public function saveConfigAction()
      */
     public function saveConfigData(array $data)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         foreach ($data as $values) {
             foreach ($values as $configKey => $value) {
@@ -190,7 +190,7 @@ public function saveConfigData(array $data)
      */
     public function prepareDataForSaving($data)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         $output = [];
         $output['httpCache'] = $this->prepareHttpCacheConfigForSaving($data['httpCache'][0]);
@@ -215,7 +215,7 @@ public function prepareDataForSaving($data)
      */
     public function prepareForSavingDefault(array $data)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         unset($data['id']);
 
@@ -231,7 +231,7 @@ public function prepareForSavingDefault(array $data)
      */
     public function prepareSeoConfigForSaving(array $data)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         unset($data['id']);
 
@@ -258,7 +258,7 @@ public function prepareSeoConfigForSaving(array $data)
      */
     public function prepareHttpCacheConfigForSaving(array $data)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         $modelManager = $this->container->get(ModelManager::class);
         $repo = $modelManager->getRepository(Plugin::class);
@@ -310,7 +310,7 @@ function ($url) {
      */
     public function saveConfig($name, $value)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         $modelManager = $this->container->get(ModelManager::class);
         $shopRepository = $modelManager->getRepository(Shop::class);
@@ -371,7 +371,7 @@ public function saveConfig($name, $value)
      */
     public function readConfig($configName, $defaultValue = '')
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         // If we have a simple config item, we can return it by using Shopware()->Config()
         if (strpos($configName, ':') === false) {
@@ -619,13 +619,13 @@ protected function getPerformanceCheckData()
                 'id' => 1,
                 'name' => Shopware()->Snippets()->getNamespace('backend/performance/main')->get('cache/apc'),
                 'value' => \extension_loaded('apcu'),
-                'valid' => \extension_loaded('apcu') === true && ini_get('apc.enabled') ? self::PERFORMANCE_VALID : self::PERFORMANCE_INVALID,
+                'valid' => \extension_loaded('apcu') === true && \ini_get('apc.enabled') ? self::PERFORMANCE_VALID : self::PERFORMANCE_INVALID,
             ],
             [
                 'id' => 3,
                 'name' => Shopware()->Snippets()->getNamespace('backend/performance/main')->get('cache/zend'),
                 'value' => \extension_loaded('Zend OPcache'),
-                'valid' => \extension_loaded('Zend OPcache') === true && ini_get('opcache.enable') ? self::PERFORMANCE_VALID : self::PERFORMANCE_INVALID,
+                'valid' => \extension_loaded('Zend OPcache') === true && \ini_get('opcache.enable') ? self::PERFORMANCE_VALID : self::PERFORMANCE_INVALID,
             ],
             [
                 'id' => 4,
@@ -777,8 +777,8 @@ private function prepareSitemapConfig(): array
             'sitemapLastRefresh',
         ]);
 
-        $sitemapConfig['customUrls'] = $this->get(ConfigHandler::class)->get(Confighandler::CUSTOM_URLS_KEY);
-        $sitemapConfig['excludedUrls'] = $this->get(ConfigHandler::class)->get(Confighandler::EXCLUDED_URLS_KEY);
+        $sitemapConfig['customUrls'] = $this->get(ConfigHandler::class)->get(ConfigHandler::CUSTOM_URLS_KEY);
+        $sitemapConfig['excludedUrls'] = $this->get(ConfigHandler::class)->get(ConfigHandler::EXCLUDED_URLS_KEY);
 
         $sitemapConfig['excludedUrls'] = array_map(function ($excludeUrl) {
             $excludeUrl['resource'] = $this->convertModelToResource($excludeUrl['resource']);
diff --git a/engine/Shopware/Controllers/Backend/PluginInstaller.php b/engine/Shopware/Controllers/Backend/PluginInstaller.php
index 996844d7f5c..41c170d9aea 100644
--- a/engine/Shopware/Controllers/Backend/PluginInstaller.php
+++ b/engine/Shopware/Controllers/Backend/PluginInstaller.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Controllers\Backend;
@@ -49,7 +49,7 @@ public function preDispatch()
     {
         parent::preDispatch();
 
-        $this->pluginManager = $this->get(\Shopware\Bundle\PluginInstallerBundle\Service\InstallerService::class);
+        $this->pluginManager = $this->get(InstallerService::class);
     }
 
     public function installPluginAction()
@@ -66,7 +66,7 @@ public function installPluginAction()
         if (!$plugin instanceof Plugin) {
             $this->View()->assign([
                 'success' => false,
-                'message' => sprintf('Plugin not found %s', $this->Request()->getParam('technicalName')),
+                'message' => \sprintf('Plugin not found %s', $this->Request()->getParam('technicalName')),
             ]);
 
             return;
@@ -88,7 +88,7 @@ public function updateAction()
 
         $plugin = $this->getPluginModel($technicalName);
 
-        //disable plugin and save state
+        // disable plugin and save state
         $active = $plugin->getActive();
         $plugin->setActive(false);
         $this->get(ModelManager::class)->flush();
@@ -227,7 +227,7 @@ public function uploadAction()
         if ($extension !== 'zip') {
             $this->View()->assign([
                 'success' => false,
-                'message' => sprintf('Wrong archive extension %s. Zip archive expected', $extension),
+                'message' => \sprintf('Wrong archive extension %s. Zip archive expected', $extension),
             ]);
             unlink($file->getPathname());
 
diff --git a/engine/Shopware/Controllers/Backend/PluginManager.php b/engine/Shopware/Controllers/Backend/PluginManager.php
index 647529efae3..2d713417986 100644
--- a/engine/Shopware/Controllers/Backend/PluginManager.php
+++ b/engine/Shopware/Controllers/Backend/PluginManager.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Controllers\Backend;
diff --git a/engine/Shopware/Controllers/Backend/Premium.php b/engine/Shopware/Controllers/Backend/Premium.php
index 8a74b21e634..3bc8b5de26c 100644
--- a/engine/Shopware/Controllers/Backend/Premium.php
+++ b/engine/Shopware/Controllers/Backend/Premium.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Models\Article\Detail;
@@ -54,7 +54,7 @@ public function preDispatch()
 
     public function getSubShopsAction()
     {
-        //load shop repository
+        // load shop repository
         $repository = $this->get('models')->getRepository(Shop::class);
 
         $builder = $repository->createQueryBuilder('shops');
@@ -68,10 +68,10 @@ public function getSubShopsAction()
         $builder->leftJoin('shops.locale', 'shopLocale');
         $query = $builder->getQuery();
 
-        //select all shops as array
+        // select all shops as array
         $data = $query->getArrayResult();
 
-        //return the data and total count
+        // return the data and total count
         $this->View()->assign(['success' => true, 'data' => $data]);
     }
 
@@ -86,12 +86,12 @@ public function getPremiumArticlesAction()
         $start = $this->Request()->get('start');
         $limit = $this->Request()->get('limit');
 
-        //order data
+        // order data
         $order = (array) $this->Request()->getParam('sort', []);
 
-        //If a search-filter is set
+        // If a search-filter is set
         if ($this->Request()->get('filter')) {
-            //Get the value itself
+            // Get the value itself
             $filter = $this->Request()->get('filter');
             $filter = $filter[\count($filter) - 1];
             $filterValue = $filter['value'];
@@ -127,7 +127,7 @@ public function createPremiumArticleAction()
 
         $params = $this->Request()->getParams();
         $params['startPrice'] = str_replace(',', '.', $params['startPrice']);
-        $premiumModel = new Shopware\Models\Premium\Premium();
+        $premiumModel = new Premium();
 
         try {
             if (empty($params['orderNumberExport'])) {
@@ -136,10 +136,10 @@ public function createPremiumArticleAction()
             if (empty($params['orderNumber'])) {
                 throw new Exception('No ordernumber was entered.');
             }
-            //Fills the model by using the array $params
+            // Fills the model by using the array $params
             $premiumModel->fromArray($params);
 
-            //find the shop-model by using the subShopId
+            // find the shop-model by using the subShopId
             /** @var Shop $shop */
             $shop = $this->get('models')->find(Shop::class, $params['shopId']);
             $premiumModel->setShop($shop);
@@ -148,7 +148,7 @@ public function createPremiumArticleAction()
             $productVariant = $this->getArticleDetailRepository()->findOneBy(['number' => $params['orderNumber']]);
             $premiumModel->setArticleDetail($productVariant);
 
-            //If the product is already set as a premium-product
+            // If the product is already set as a premium-product
             $repository = $this->get('models')->getRepository(Premium::class);
             $result = $repository->findByOrderNumber($params['orderNumber']);
             $result = $this->get('models')->toArray($result);
@@ -159,7 +159,7 @@ public function createPremiumArticleAction()
                 return;
             }
 
-            //saves the model
+            // saves the model
             $this->get('models')->persist($premiumModel);
             $this->get('models')->flush();
 
@@ -190,7 +190,7 @@ public function editPremiumArticleAction()
             if (empty($params['orderNumberExport'])) {
                 $params['orderNumberExport'] = $params['orderNumber'];
             }
-            //Replace a comma with a dot
+            // Replace a comma with a dot
             $params['startPrice'] = str_replace(',', '.', $params['startPrice']);
 
             $premiumModel->fromArray($params);
diff --git a/engine/Shopware/Controllers/Backend/ProductFeed.php b/engine/Shopware/Controllers/Backend/ProductFeed.php
index 8f421009678..6dfff2b90a9 100644
--- a/engine/Shopware/Controllers/Backend/ProductFeed.php
+++ b/engine/Shopware/Controllers/Backend/ProductFeed.php
@@ -1,33 +1,34 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Shopware\Models\Article\Article;
+use Shopware\Models\Article\Repository as ProductRepository;
 use Shopware\Models\Article\Supplier;
 use Shopware\Models\Category\Category;
 use Shopware\Models\ProductFeed\ProductFeed;
-use Shopware\Models\ProductFeed\Repository;
+use Shopware\Models\Shop\Repository as ShopRepository;
 use Shopware\Models\Shop\Shop;
 
 /**
@@ -40,12 +41,12 @@
 class Shopware_Controllers_Backend_ProductFeed extends Shopware_Controllers_Backend_ExtJs
 {
     /**
-     * @var \Shopware\Models\Article\Repository
+     * @var ProductRepository
      */
     protected $articleRepository;
 
     /**
-     * @var \Shopware\Models\Shop\Repository
+     * @var ShopRepository
      */
     protected $shopRepository;
 
@@ -144,7 +145,7 @@ public function saveFeedAction()
     {
         $params = $this->Request()->getParams();
 
-        $feedId = $params['id'];
+        $feedId = $params['id'] ?? null;
         if (!empty($feedId)) {
             // Edit Product Feed
             /** @var ProductFeed $productFeed */
@@ -202,10 +203,10 @@ public function saveFeedAction()
 
         if (!is_dir($cacheDir)) {
             if (@mkdir($cacheDir, 0777, true) === false) {
-                throw new RuntimeException(sprintf("Unable to create the %s directory (%s)\n", 'Productexport', $cacheDir));
+                throw new RuntimeException(\sprintf("Unable to create the %s directory (%s)\n", 'Productexport', $cacheDir));
             }
         } elseif (!is_writable($cacheDir)) {
-            throw new RuntimeException(sprintf("Unable to write in the %s directory (%s)\n", 'Productexport', $cacheDir));
+            throw new RuntimeException(\sprintf("Unable to write in the %s directory (%s)\n", 'Productexport', $cacheDir));
         }
 
         $fileName = $productFeed->getHash() . '_' . $productFeed->getFileName();
@@ -289,7 +290,7 @@ protected function initAcl()
     /**
      * Helper function to get access to the shop repository.
      *
-     * @return \Shopware\Models\Shop\Repository
+     * @return ShopRepository
      */
     private function getShopRepository()
     {
@@ -303,7 +304,7 @@ private function getShopRepository()
     /**
      * Helper function to get access to the article repository.
      *
-     * @return \Shopware\Models\Article\Repository
+     * @return ProductRepository
      */
     private function getArticleRepository()
     {
diff --git a/engine/Shopware/Controllers/Backend/ProductStream.php b/engine/Shopware/Controllers/Backend/ProductStream.php
index 1b4d80eeb93..2c57388c579 100644
--- a/engine/Shopware/Controllers/Backend/ProductStream.php
+++ b/engine/Shopware/Controllers/Backend/ProductStream.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\DBAL\Connection;
diff --git a/engine/Shopware/Controllers/Backend/Property.php b/engine/Shopware/Controllers/Backend/Property.php
index 5fe26af5489..2318d86f838 100644
--- a/engine/Shopware/Controllers/Backend/Property.php
+++ b/engine/Shopware/Controllers/Backend/Property.php
@@ -1,30 +1,34 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+use Doctrine\DBAL\Connection;
+use Doctrine\ORM\AbstractQuery;
+use Shopware\Components\Model\ModelManager;
 use Shopware\Models\Media\Media;
 use Shopware\Models\Property\Group;
 use Shopware\Models\Property\Option;
+use Shopware\Models\Property\Repository;
 use Shopware\Models\Property\Value;
 
 class Shopware_Controllers_Backend_Property extends Shopware_Controllers_Backend_ExtJs
@@ -32,12 +36,12 @@ class Shopware_Controllers_Backend_Property extends Shopware_Controllers_Backend
     /**
      * Entity Manager
      *
-     * @var \Shopware\Components\Model\ModelManager
+     * @var ModelManager
      */
     protected $manager;
 
     /**
-     * @var \Shopware\Models\Property\Repository
+     * @var Repository
      */
     protected $propertyRepository;
 
@@ -88,18 +92,18 @@ public function createSetAction()
         $group = new Group();
         $group->fromArray($params);
 
-        $modelManager = $this->get(\Shopware\Components\Model\ModelManager::class);
+        $modelManager = $this->get(ModelManager::class);
         try {
             $modelManager->persist($group);
             $modelManager->flush();
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             $this->View()->assign(['success' => false, 'message' => $e->getMessage()]);
 
             return;
         }
         $data = $this->getPropertyRepository()
                      ->getGroupDetailQuery($group->getId())
-                     ->getOneOrNullResult(\Doctrine\ORM\AbstractQuery::HYDRATE_ARRAY);
+                     ->getOneOrNullResult(AbstractQuery::HYDRATE_ARRAY);
 
         $this->View()->assign(['success' => true, 'data' => $data]);
     }
@@ -136,7 +140,7 @@ public function updateSetAction()
 
         $data = $this->getPropertyRepository()
                      ->getGroupDetailQuery($group->getId())
-                     ->getOneOrNullResult(\Doctrine\ORM\AbstractQuery::HYDRATE_ARRAY);
+                     ->getOneOrNullResult(AbstractQuery::HYDRATE_ARRAY);
 
         $this->View()->assign(['success' => true, 'data' => $data]);
     }
@@ -149,14 +153,14 @@ public function deleteSetAction()
             return;
         }
 
-        $group = $this->get(\Shopware\Components\Model\ModelManager::class)->getRepository(Group::class)->find($id);
+        $group = $this->get(ModelManager::class)->getRepository(Group::class)->find($id);
         if (!$group) {
             $this->View()->assign(['success' => false, 'message' => 'Group not found']);
 
             return;
         }
 
-        $modelManager = $this->get(\Shopware\Components\Model\ModelManager::class);
+        $modelManager = $this->get(ModelManager::class);
         try {
             $modelManager->remove($group);
             $modelManager->flush();
@@ -203,7 +207,7 @@ public function onAddAssignmentAction()
 
         try {
             $this->get('models')->flush();
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             $this->View()->assign(['success' => false, 'message' => $e->getMessage()]);
 
             return;
@@ -244,7 +248,7 @@ public function removeOptionFromGroupAction()
 
         try {
             $this->get('models')->flush();
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             $this->View()->assign(['success' => false, 'message' => $e->getMessage()]);
 
             return;
@@ -266,9 +270,9 @@ public function getGroupsAction()
         $options = $query->getArrayResult();
 
         $this->View()->assign([
-           'success' => true,
-           'data' => $options,
-           'total' => $totalCount,
+            'success' => true,
+            'data' => $options,
+            'total' => $totalCount,
         ]);
     }
 
@@ -279,7 +283,7 @@ public function createGroupAction()
         $option = new Option();
         $option->fromArray($params);
 
-        $modelManager = $this->get(\Shopware\Components\Model\ModelManager::class);
+        $modelManager = $this->get(ModelManager::class);
         try {
             $modelManager->persist($option);
             $modelManager->flush();
@@ -345,7 +349,7 @@ public function deleteGroupAction()
             return;
         }
 
-        $modelManager = $this->get(\Shopware\Components\Model\ModelManager::class);
+        $modelManager = $this->get(ModelManager::class);
         try {
             // Cascades remove to associated values
             $modelManager->remove($option);
@@ -397,7 +401,7 @@ public function createOptionAction()
         $postValue = $request->getPost('value');
         $value = new Value($option, $postValue);
 
-        $modelManager = $this->get(\Shopware\Components\Model\ModelManager::class);
+        $modelManager = $this->get(ModelManager::class);
         try {
             $modelManager->persist($value);
             $modelManager->flush();
@@ -430,7 +434,7 @@ public function updateOptionAction()
         $value->setValue($request->getPost('value'));
 
         if ($request->has('mediaId') && $request->getParam('mediaId')) {
-            $media = $this->get(\Shopware\Components\Model\ModelManager::class)->find(Media::class, $request->getPost('mediaId'));
+            $media = $this->get(ModelManager::class)->find(Media::class, $request->getPost('mediaId'));
             $value->setMedia($media);
         } else {
             $value->setMedia(null);
@@ -448,7 +452,7 @@ public function updateOptionAction()
         $query->where('value.id = ?0')
             ->setParameter(0, $value->getId());
 
-        $data = $query->getQuery()->getOneOrNullResult(\Doctrine\ORM\AbstractQuery::HYDRATE_ARRAY);
+        $data = $query->getQuery()->getOneOrNullResult(AbstractQuery::HYDRATE_ARRAY);
         $this->View()->assign(['success' => true, 'data' => $data]);
     }
 
@@ -470,7 +474,7 @@ public function deleteOptionAction()
             return;
         }
 
-        $modelManager = $this->get(\Shopware\Components\Model\ModelManager::class);
+        $modelManager = $this->get(ModelManager::class);
         try {
             $modelManager->remove($value);
             $modelManager->flush();
@@ -550,7 +554,7 @@ public function changeAssignmentPositionAction()
     /**
      * Helper function to get access to the property repository.
      *
-     * @return \Shopware\Models\Property\Repository
+     * @return Repository
      */
     private function getPropertyRepository()
     {
@@ -564,7 +568,7 @@ private function getPropertyRepository()
     /**
      * Internal helper function to get access to the entity manager.
      *
-     * @return \Shopware\Components\Model\ModelManager
+     * @return ModelManager
      */
     private function getManager()
     {
@@ -581,6 +585,6 @@ private function getManager()
     private function removeSetRelationsFromProducts($filterSetId)
     {
         $sql = 'UPDATE s_articles SET filtergroupID = null WHERE filtergroupID = ?';
-        $this->get(\Doctrine\DBAL\Connection::class)->executeUpdate($sql, [$filterSetId]);
+        $this->get(Connection::class)->executeUpdate($sql, [$filterSetId]);
     }
 }
diff --git a/engine/Shopware/Controllers/Backend/RiskManagement.php b/engine/Shopware/Controllers/Backend/RiskManagement.php
index e0fc0fbf7fa..e4f4706dccf 100644
--- a/engine/Shopware/Controllers/Backend/RiskManagement.php
+++ b/engine/Shopware/Controllers/Backend/RiskManagement.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Models\Payment\RuleSet;
@@ -110,8 +110,8 @@ public function editRuleAction()
             unset($params['action']);
             unset($params['_dc']);
 
-            //2-dimensional array
-            if ($params[0]) {
+            // 2-dimensional array
+            if (!empty($params[0])) {
                 $data = [];
                 foreach ($params as $values) {
                     $ruleModel = $this->get('models')->find(RuleSet::class, $values['id']);
diff --git a/engine/Shopware/Controllers/Backend/Search.php b/engine/Shopware/Controllers/Backend/Search.php
index 6cfe5c8106d..26aa0a9f3a3 100644
--- a/engine/Shopware/Controllers/Backend/Search.php
+++ b/engine/Shopware/Controllers/Backend/Search.php
@@ -4,23 +4,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\DBAL\Connection;
@@ -71,7 +70,7 @@ public function searchAction()
         }
 
         $pagination = $this->getPaginator($builder);
-        $data = $pagination->getIterator()->getArrayCopy();
+        $data = iterator_to_array($pagination);
 
         $data = $this->hydrateSearchResult($entity, $data);
 
diff --git a/engine/Shopware/Controllers/Backend/Shipping.php b/engine/Shopware/Controllers/Backend/Shipping.php
index e9a888aee7c..b967846009d 100644
--- a/engine/Shopware/Controllers/Backend/Shipping.php
+++ b/engine/Shopware/Controllers/Backend/Shipping.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\Common\Collections\ArrayCollection;
@@ -83,19 +83,12 @@ public function getShippingCostsAction()
         $paginator = $this->getModelManager()->createPaginator($query);
         // Returns the total count of the query
         $totalResult = $paginator->count();
-        $shippingCosts = $paginator->getIterator()->getArrayCopy();
+        $shippingCosts = iterator_to_array($paginator);
         $shippingCosts = $this->convertShippingCostsDates($shippingCosts);
 
-        // Translate dispatch methods
-        // The standard $translationComponent->translateDispatches can not be used here since the
-        // name and the description may not be overridden. Both fields are edible and if the translation is
-        // shown in the edit field, there is a high chance of a user saving the translation as name.
-        $translator = $this->get(Shopware_Components_Translation::class)->getObjectTranslator('config_dispatch');
-        $shippingCosts = array_map(static function ($dispatchMethod) use ($translator) {
-            $translatedDispatchMethod = $translator->translateObjectProperty($dispatchMethod, 'dispatch_name', 'translatedName', $dispatchMethod['name']);
-
-            return $translator->translateObjectProperty($translatedDispatchMethod, 'dispatch_description', 'translatedDescription', $dispatchMethod['description']);
-        }, $shippingCosts);
+        if ($totalResult > 0) {
+            $shippingCosts = $this->translateDispatchMethods($shippingCosts);
+        }
 
         $this->View()->assign(['success' => true, 'data' => $shippingCosts, 'total' => $totalResult]);
     }
@@ -122,9 +115,13 @@ public function getListAction()
         $paginator = $this->getModelManager()->createPaginator($query);
         // Returns the total count of the query
         $totalResult = $paginator->count();
-        $shippingCosts = $paginator->getIterator()->getArrayCopy();
+        $shippingCosts = iterator_to_array($paginator);
         $shippingCosts = $this->convertShippingCostsDates($shippingCosts);
 
+        if ($totalResult > 0) {
+            $shippingCosts = $this->translateDispatchMethods($shippingCosts);
+        }
+
         $this->View()->assign(['success' => true, 'data' => $shippingCosts, 'total' => $totalResult]);
     }
 
@@ -472,10 +469,10 @@ private function saveDispatch(): void
         }
 
         // Clean up params and init some fields
-        $payments = $params['payments'];
-        $holidays = $params['holidays'];
-        $countries = $params['countries'];
-        $categories = $params['categories'];
+        $payments = $params['payments'] ?? [];
+        $holidays = $params['holidays'] ?? [];
+        $countries = $params['countries'] ?? [];
+        $categories = $params['categories'] ?? [];
 
         if (!isset($params['shippingFree']) || $params['shippingFree'] === '' || $params['shippingFree'] === '0') {
             $params['shippingFree'] = null;
@@ -492,19 +489,19 @@ private function saveDispatch(): void
         $params['customerGroupId'] = $this->cleanData($params['customerGroupId']);
         $params['bindTimeFrom'] = $this->cleanData($params['bindTimeFrom']);
         $params['bindTimeTo'] = $this->cleanData($params['bindTimeTo']);
-        $params['bindInStock'] = $this->cleanData($params['bindInStock']);
+        $params['bindInStock'] = $this->cleanData($params['bindInStock'] ?? null);
         $params['bindWeekdayFrom'] = $this->cleanData($params['bindWeekdayFrom']);
         $params['bindWeekdayTo'] = $this->cleanData($params['bindWeekdayTo']);
         $params['bindWeightFrom'] = $this->cleanData($params['bindWeightFrom']);
         $params['bindWeightTo'] = $this->cleanData($params['bindWeightTo']);
         $params['bindPriceFrom'] = $this->cleanData($params['bindPriceFrom']);
-        $params['bindPriceTo'] = $this->cleanData($params['bindPriceTo']);
+        $params['bindPriceTo'] = $this->cleanData($params['bindPriceTo'] ?? null);
         $params['bindSql'] = $this->cleanData($params['bindSql']);
         $params['calculationSql'] = $this->cleanData($params['calculationSql']);
 
         if (!empty($params['bindTimeFrom'])) {
             $bindTimeFrom = new Zend_Date();
-            $bindTimeFrom->set($params['bindTimeFrom'], Zend_Date::TIME_SHORT);
+            $bindTimeFrom->set((string) $params['bindTimeFrom'], Zend_Date::TIME_SHORT);
             $bindTimeFrom = (int) $bindTimeFrom->get(Zend_Date::MINUTE) * 60 + (int) $bindTimeFrom->get(Zend_Date::HOUR) * 60 * 60;
             $params['bindTimeFrom'] = $bindTimeFrom;
         } else {
@@ -513,7 +510,7 @@ private function saveDispatch(): void
 
         if (!empty($params['bindTimeTo'])) {
             $bindTimeTo = new Zend_Date();
-            $bindTimeTo->set($params['bindTimeTo'], Zend_Date::TIME_SHORT);
+            $bindTimeTo->set((string) $params['bindTimeTo'], Zend_Date::TIME_SHORT);
             $bindTimeTo = (int) $bindTimeTo->get(Zend_Date::MINUTE) * 60 + (int) $bindTimeTo->get(Zend_Date::HOUR) * 60 * 60;
             $params['bindTimeTo'] = $bindTimeTo;
         } else {
@@ -669,4 +666,23 @@ private function cleanData($inputValue)
 
         return $inputValue;
     }
+
+    /**
+     * @param array<array<mixed>> $shippingCosts
+     *
+     * @return array<array<mixed>> $shippingCosts
+     */
+    private function translateDispatchMethods(array $shippingCosts): array
+    {
+        // The standard $translationComponent->translateDispatches can not be used here since the
+        // name and the description may not be overridden. Both fields are edible and if the translation is
+        // shown in the edit field, there is a high chance of a user saving the translation as name.
+        $translator = $this->get(Shopware_Components_Translation::class)->getObjectTranslator('config_dispatch');
+
+        return array_map(static function ($dispatchMethod) use ($translator) {
+            $translatedDispatchMethod = $translator->translateObjectProperty($dispatchMethod, 'dispatch_name', 'translatedName', $dispatchMethod['name']);
+
+            return $translator->translateObjectProperty($translatedDispatchMethod, 'dispatch_description', 'translatedDescription', $dispatchMethod['description']);
+        }, $shippingCosts);
+    }
 }
diff --git a/engine/Shopware/Controllers/Backend/Site.php b/engine/Shopware/Controllers/Backend/Site.php
index f2f78e5d87b..67871fe6ea7 100644
--- a/engine/Shopware/Controllers/Backend/Site.php
+++ b/engine/Shopware/Controllers/Backend/Site.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\ORM\AbstractQuery;
@@ -177,7 +177,7 @@ public function deleteGroupAction()
 
                 // If the current site is associated with the requested group and has no other groups
                 if (\in_array($key, $groups) && \count($groups) == 1) {
-                    //set group to gDisabled to prevent orphanage
+                    // set group to gDisabled to prevent orphanage
                     Shopware()->Db()->query(
                         'UPDATE s_cms_static SET grouping = ? WHERE id = ?',
                         ['disabled', $site['id']]
@@ -210,13 +210,13 @@ public function deleteGroupAction()
      */
     public function deleteSiteAction()
     {
-        //get id
+        // get id
         $params = $this->Request()->getParams();
         $siteId = empty($params['siteId']) ? null : $params['siteId'];
 
         if (!empty($siteId)) {
             try {
-                //remove site
+                // remove site
                 $model = $this->getSiteRepository()->find($siteId);
                 if ($model !== null) {
                     $this->getManager()->remove($model);
@@ -224,15 +224,15 @@ public function deleteSiteAction()
 
                 $this->getManager()->flush();
 
-                //set the parentID of all children to 0
-                //we don't want orphans
+                // set the parentID of all children to 0
+                // we don't want orphans
                 $sql = 'UPDATE s_cms_static SET parentID = 0 WHERE parentID = ?';
                 Shopware()->Db()->query($sql, [$siteId]);
 
-                //hand siteId to view
+                // hand siteId to view
                 $this->View()->assign(['success' => true, 'data' => $siteId]);
             } catch (Exception $e) {
-                //catch all errors
+                // catch all errors
                 $this->View()->assign(['success' => false, 'message' => $e->getMessage()]);
             }
         }
@@ -245,7 +245,7 @@ public function deleteSiteAction()
      */
     public function saveSiteAction()
     {
-        //get the id from the helperId field
+        // get the id from the helperId field
         $params = $this->Request()->getParams();
         $siteId = empty($params['helperId']) ? null : $params['helperId'];
 
@@ -395,7 +395,7 @@ private function getSiteRepository()
     /**
      * Internal helper function to get access to the entity manager.
      *
-     * @return Shopware\Components\Model\ModelManager
+     * @return ModelManager
      */
     private function getManager()
     {
diff --git a/engine/Shopware/Controllers/Backend/Snippet.php b/engine/Shopware/Controllers/Backend/Snippet.php
index 9ed63212a1d..4ba14c17832 100644
--- a/engine/Shopware/Controllers/Backend/Snippet.php
+++ b/engine/Shopware/Controllers/Backend/Snippet.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Enlight_Components_Db_Adapter_Pdo_Mysql as PdoConnection;
@@ -416,7 +416,7 @@ public function importSnippetAction()
         if ($destPath === false || !file_exists($destPath)) {
             echo json_encode([
                 'success' => false,
-                'message' => sprintf("Destination directory '%s' does not exist.", $destPath),
+                'message' => \sprintf("Destination directory '%s' does not exist.", $destPath),
             ]);
 
             return;
@@ -425,7 +425,7 @@ public function importSnippetAction()
         if (!is_writable($destPath)) {
             echo json_encode([
                 'success' => false,
-                'message' => sprintf("Destination directory '%s' does not have write permissions.", $destPath),
+                'message' => \sprintf("Destination directory '%s' does not have write permissions.", $destPath),
             ]);
 
             return;
@@ -435,7 +435,7 @@ public function importSnippetAction()
         if ($filePath === false) {
             echo json_encode([
                 'success' => false,
-                'message' => sprintf('Could not create a tmp file for %s', $filePath),
+                'message' => \sprintf('Could not create a tmp file for %s', $filePath),
             ]);
 
             return;
@@ -444,7 +444,7 @@ public function importSnippetAction()
         if (move_uploaded_file($_FILES['file']['tmp_name'], $filePath) === false) {
             echo json_encode([
                 'success' => false,
-                'message' => sprintf('Could not move %s to %s.', $_FILES['file']['tmp_name'], $filePath),
+                'message' => \sprintf('Could not move %s to %s.', $_FILES['file']['tmp_name'], $filePath),
             ]);
 
             return;
@@ -515,7 +515,7 @@ public function importSnippetAction()
                     $translation['shopID'],
                     $value,
                     $dirty,
-                 ]);
+                ]);
 
                 ++$counter;
             }
@@ -619,7 +619,7 @@ public function exportSnippetAction()
                 $value = $this->database->quote($row['value']);
                 $value = str_replace("\n", '\\n', $value);
 
-                $rows[] = sprintf(
+                $rows[] = \sprintf(
                     "(%s, %s, %s, '%s', '%s', '%s', NOW(), %d)",
                     $this->database->quote($row['namespace']),
                     $this->database->quote($row['name']),
@@ -669,10 +669,7 @@ public function getNamespacesAction()
             return;
         }
 
-        /** @var \Doctrine\ORM\QueryBuilder $builder */
-        $builder = $this->get('models')
-                             ->getRepository('Shopware\Models\Snippet\Snippet')
-                             ->createQueryBuilder('snippet');
+        $builder = $this->get('models')->getRepository(Snippet::class)->createQueryBuilder('snippet');
 
         $builder->select('snippet.namespace, count(snippet.id) as snippetCount')
                 ->groupBy('snippet.namespace')
@@ -683,9 +680,9 @@ public function getNamespacesAction()
         $result = $this->prepareNamespaceTree($result);
 
         $this->View()->assign([
-           'success' => true,
-           'data' => $result,
-           'total' => \count($result),
+            'success' => true,
+            'data' => $result,
+            'total' => \count($result),
         ]);
     }
 
@@ -700,10 +697,9 @@ public function removeNamespaceAction()
             return;
         }
 
-        /** @var \Doctrine\ORM\QueryBuilder $builder */
         $builder = $this->get('models')->createQueryBuilder();
 
-        $builder->delete('Shopware\Models\Snippet\Snippet', 's')
+        $builder->delete(Snippet::class, 's')
                 ->andWhere('s.namespace LIKE :namespace')
                 ->orWhere('s.namespace LIKE :namespaceWildcard')
                 ->setParameter('namespace', $namespace)
@@ -712,8 +708,8 @@ public function removeNamespaceAction()
         $result = $result = $builder->getQuery()->execute();
 
         $this->View()->assign([
-           'success' => true,
-           'data' => $result,
+            'success' => true,
+            'data' => $result,
         ]);
     }
 
@@ -870,7 +866,7 @@ protected function toTree($item)
      */
     protected function prefixProperties($properties = [], $prefix = '')
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         foreach ($properties as $key => $property) {
             if (isset($property['property'])) {
diff --git a/engine/Shopware/Controllers/Backend/Supplier.php b/engine/Shopware/Controllers/Backend/Supplier.php
index 7719d81c9d3..0838ac2410c 100644
--- a/engine/Shopware/Controllers/Backend/Supplier.php
+++ b/engine/Shopware/Controllers/Backend/Supplier.php
@@ -1,43 +1,43 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Bundle\MediaBundle\MediaServiceInterface;
+use Shopware\Models\Article\Article;
 use Shopware\Models\Article\Repository;
 use Shopware\Models\Article\Supplier;
 
 class Shopware_Controllers_Backend_Supplier extends Shopware_Controllers_Backend_ExtJs
 {
-    /**
-     * @var Repository
-     */
-    private $repository;
+    private ?Repository $repository = null;
 
     /**
      * Deletes a Supplier from the database
      * Feeds the view with an json encoded array containing
      * - success : boolean Set to true if everything went well otherwise it is set to false
      * - data    : int  Id of the deleted supplier
+     *
+     * @return void
      */
     public function deleteSupplierAction()
     {
@@ -48,7 +48,7 @@ public function deleteSupplierAction()
         }
 
         $id = (int) $this->Request()->get('id');
-        $supplierModel = $this->get('models')->find('Shopware\Models\Article\Supplier', $id);
+        $supplierModel = $this->get('models')->find(Supplier::class, $id);
 
         $this->get('models')->remove($supplierModel);
         $this->get('models')->flush();
@@ -67,6 +67,8 @@ public function deleteSupplierAction()
      *          - link : String
      *          - articleCounter : Int
      *          - description : String
+     *
+     * @return void
      */
     public function getSuppliersAction()
     {
@@ -98,13 +100,13 @@ public function getSuppliersAction()
         $mediaService = Shopware()->Container()->get(MediaServiceInterface::class);
 
         foreach ($suppliers as &$supplier) {
-            $supplier['description'] = strip_tags($supplier['description']);
+            $supplier['description'] = strip_tags((string) $supplier['description']);
             $supplier['image'] = $mediaService->getUrl($supplier['image']);
         }
         unset($supplier);
 
         $this->View()->assign([
-            'success' => !empty($suppliers),
+            'success' => true,
             'data' => $suppliers,
             'total' => $total,
         ]);
@@ -114,6 +116,8 @@ public function getSuppliersAction()
      * This method is called if a new supplier should be written to the database.
      * It works as a wrapper around the saveSupplier method to use ACL
      * ACL configuration is done in initAcl()
+     *
+     * @return void
      */
     public function createSupplierAction()
     {
@@ -124,6 +128,8 @@ public function createSupplierAction()
      * This method is called if a supplier should be updated.
      * It works as a wrapper around the saveSupplier method to use ACL
      * ACL configuration is done in initAcl()
+     *
+     * @return void
      */
     public function updateSupplierAction()
     {
@@ -143,6 +149,8 @@ public function updateSupplierAction()
      *          - articleCounter : Int
      *          - description : String
      * [-errorMsg] : String containing the error message
+     *
+     * @return void
      */
     public function saveSuppliers()
     {
@@ -151,11 +159,9 @@ public function saveSuppliers()
 
             return;
         }
-        /** @var Supplier $supplierModel */
-        $supplierModel = null;
         $id = (int) $this->Request()->get('id');
         if ($id > 0) {
-            $supplierModel = $this->get('models')->find('Shopware\Models\Article\Supplier', $id);
+            $supplierModel = $this->get('models')->find(Supplier::class, $id);
         } else {
             $supplierModel = new Supplier();
         }
@@ -167,7 +173,7 @@ public function saveSuppliers()
         $supplierModel->setChanged();
 
         $mediaData = $this->Request()->get('media-manager-selection');
-        if (!empty($mediaData) && $mediaData !== null) {
+        if (!empty($mediaData)) {
             $supplierModel->setImage($this->Request()->get('media-manager-selection'));
         }
 
@@ -202,7 +208,7 @@ public function saveSuppliers()
      */
     public function getAllSupplier()
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         $filter = $this->Request()->getParam('filter');
         $sort = $this->Request()->getParam('sort', [['property' => 'name']]);
@@ -222,6 +228,8 @@ public function getAllSupplier()
      * Gets a single supplier
      *
      * @param int $id
+     *
+     * @return void
      */
     protected function getSingleSupplier($id)
     {
@@ -255,13 +263,11 @@ protected function initAcl()
 
     /**
      * Internal helper function to get access to the form repository.
-     *
-     * @return Repository
      */
-    private function getRepository()
+    private function getRepository(): Repository
     {
         if ($this->repository === null) {
-            $this->repository = $this->get('models')->getRepository('Shopware\Models\Article\Article');
+            $this->repository = $this->get('models')->getRepository(Article::class);
         }
 
         return $this->repository;
diff --git a/engine/Shopware/Controllers/Backend/Systeminfo.php b/engine/Shopware/Controllers/Backend/Systeminfo.php
index 004618bd53b..5468c61fd94 100644
--- a/engine/Shopware/Controllers/Backend/Systeminfo.php
+++ b/engine/Shopware/Controllers/Backend/Systeminfo.php
@@ -1,27 +1,30 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+use Doctrine\DBAL\Connection;
+use Shopware\Bundle\MediaBundle\OptimizerService;
 use Shopware\Components\CSRFWhitelistAware;
 
 /**
@@ -46,7 +49,7 @@ public function initAcl()
     public function preDispatch()
     {
         if (!\in_array($this->Request()->getActionName(), ['index', 'load', 'info'])) {
-            $this->Front()->Plugins()->Json()->setRenderer(true);
+            $this->Front()->Plugins()->Json()->setRenderer();
         }
     }
 
@@ -55,14 +58,16 @@ public function preDispatch()
      * The array also contains a status, whether the minimum requirements are met
      * The encoder-configs are excluded, because they are needed in another store
      * getEncoderAction loads those two encoder-configs
+     *
+     * @return void
      */
     public function getConfigListAction()
     {
         $result = $this->get('shopware.requirements')->toArray();
 
-        foreach ($result['checks'] as $key => &$config) {
+        foreach ($result['checks'] as $key => $config) {
             // Those configs mustn't be displayed in the grid
-            if ($config['name'] == 'mod_rewrite') {
+            if ($config['name'] === 'mod_rewrite') {
                 unset($result['checks'][$key]);
             }
         }
@@ -71,6 +76,8 @@ public function getConfigListAction()
 
     /**
      * Function to get all necessary paths and a status, whether the paths are available
+     *
+     * @return void
      */
     public function getPathListAction()
     {
@@ -80,6 +87,8 @@ public function getPathListAction()
 
     /**
      * Function to get all necessary files and the status, whether those files match with the original Shopware-Files
+     *
+     * @return void
      */
     public function getFileListAction()
     {
@@ -94,71 +103,80 @@ public function getFileListAction()
         $skipList = [
         ];
 
-        $list = new Shopware_Components_Check_File($fileName, Shopware()->DocPath(), $skipList);
+        $list = new Shopware_Components_Check_File(
+            $fileName,
+            $this->container->getParameter('shopware.app.rootDir'),
+            $skipList
+        );
 
         $this->View()->assign(['success' => true, 'data' => $list->toArray()]);
     }
 
     /**
      * Function to get all plugins and its version.
+     *
+     * @return void
      */
     public function getVersionListAction()
     {
-        $select = Shopware()->Db()->select()->from(
-            's_core_plugins',
-            ['version', 'name', 'namespace', 'source']
-        );
-
-        $rows = Shopware()->Db()->fetchAll($select);
+        $rows = $this->get(Connection::class)->createQueryBuilder()
+            ->select(['version', 'name', 'namespace', 'source'])
+            ->from('s_core_plugins')
+            ->execute()
+            ->fetchAllAssociative();
 
         foreach ($rows as $key => $row) {
             $rows[$key]['name'] = $row['namespace'] . '/' . $row['source'] . '/' . $row['name'];
         }
 
-        array_unshift($rows, ['name' => 'Shopware', 'version' => Shopware()->Config()->get('Version')]);
+        array_unshift($rows, ['name' => 'Shopware', 'version' => $this->get('config')->get('Version')]);
 
         $this->View()->assign(['success' => true, 'data' => $rows]);
     }
 
     /**
      * Function to get timezone diff
+     *
+     * @return void
      */
     public function getTimezoneAction()
     {
+        $connection = $this->get(Connection::class);
         $offset = 0;
+        $timeZone = '';
         try {
-            $sql = <<<'SQL'
-                SELECT timeZones.timeZone
-                FROM (
-                    SELECT @@SESSION.time_zone AS timeZone
-                    UNION
-                    SELECT @@system_time_zone AS timeZone
-                ) AS timeZones
-                WHERE timeZone != 'SYSTEM'
-                LIMIT 1
-SQL;
-
-            $timezone = $this->container->get(\Doctrine\DBAL\Connection::class)
-                ->query($sql)
-                ->fetchColumn(0);
-
-            if (\in_array($timezone[0], ['-', '+'], true)) {
-                $databaseZone = new DateTimeZone($timezone);
+            $timeZone = $connection->executeQuery('SELECT @@SESSION.time_zone')->fetchOne();
+
+            if ($timeZone === 'SYSTEM') {
+                $timeZone = $connection->executeQuery('SELECT @@system_time_zone')->fetchOne();
+            }
+        } catch (PDOException $e) {
+        }
+
+        if (!empty($timeZone)) {
+            $databaseZone = null;
+            if (\in_array($timeZone[0], ['-', '+'], true)) {
+                $databaseZone = new DateTimeZone($timeZone);
             } else {
-                $databaseZone = timezone_open(timezone_name_from_abbr($timezone));
+                $timeZoneFromAbbr = timezone_name_from_abbr($timeZone);
+                if (\is_string($timeZoneFromAbbr)) {
+                    $databaseZone = timezone_open($timeZoneFromAbbr);
+                    if (!$databaseZone instanceof DateTimeZone) {
+                        $databaseZone = null;
+                    }
+                }
             }
 
             $phpZone = timezone_open(date_default_timezone_get());
-            $databaseTime = new DateTime('now', $databaseZone);
-
-            if (!empty($timezone)) {
+            if ($databaseZone instanceof DateTimeZone && $phpZone instanceof DateTimeZone) {
+                $databaseTime = new DateTime('now', $databaseZone);
                 $offset = abs($databaseZone->getOffset(new DateTime()) - $phpZone->getOffset($databaseTime));
             }
-        } catch (\PDOException $e) {
         }
+
         if (empty($offset)) {
             $sql = 'SELECT UNIX_TIMESTAMP()-' . time();
-            $offset = $this->container->get(\Doctrine\DBAL\Connection::class)->query($sql)->fetchColumn(0);
+            $offset = (int) $connection->executeQuery($sql)->fetchOne();
         }
 
         $this->View()->assign(['success' => true, 'offset' => $offset < 60 ? 0 : round($offset / 60)]);
@@ -166,10 +184,12 @@ public function getTimezoneAction()
 
     /**
      * Function to display the phpinfo
+     *
+     * @return void
      */
     public function infoAction()
     {
-        Shopware()->Front()->Plugins()->ViewRenderer()->setNoRender();
+        $this->get('front')->Plugins()->ViewRenderer()->setNoRender();
         $_COOKIE = [];
         $_REQUEST = [];
         $_SERVER['HTTP_COOKIE'] = null;
@@ -179,9 +199,12 @@ public function infoAction()
         phpinfo();
     }
 
+    /**
+     * @return void
+     */
     public function getOptimizersAction()
     {
-        $optimizers = $this->get(\Shopware\Bundle\MediaBundle\OptimizerService::class)->getOptimizers();
+        $optimizers = $this->get(OptimizerService::class)->getOptimizers();
         $optimizerResult = [];
 
         foreach ($optimizers as $optimizer) {
@@ -197,11 +220,6 @@ public function getOptimizersAction()
         $this->View()->assign('total', \count($optimizerResult));
     }
 
-    /**
-     * Returns a list with actions which should not be validated for CSRF protection
-     *
-     * @return string[]
-     */
     public function getWhitelistedCSRFActions()
     {
         return [
diff --git a/engine/Shopware/Controllers/Backend/Theme.php b/engine/Shopware/Controllers/Backend/Theme.php
index 5ee1be2c1e7..0899ef72d6b 100644
--- a/engine/Shopware/Controllers/Backend/Theme.php
+++ b/engine/Shopware/Controllers/Backend/Theme.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Bundle\PluginInstallerBundle\Service\ZipUtils;
@@ -27,7 +27,7 @@
 use Shopware\Components\Model\Exception\ModelNotFoundException;
 use Shopware\Components\OptinServiceInterface;
 use Shopware\Components\ShopRegistrationServiceInterface;
-use Shopware\Components\Theme;
+use Shopware\Components\Theme\Generator as ThemeGenerator;
 use Shopware\Components\Theme\Installer;
 use Shopware\Components\Theme\PathResolver;
 use Shopware\Components\Theme\Service;
@@ -112,7 +112,7 @@ public function previewAction()
                 'sessionValue' => $session->get('sessionId'),
             ]);
 
-            $url = $this->Front()->Router()->assemble([
+            $url = $this->Front()->ensureRouter()->assemble([
                 'module' => 'frontend',
                 'controller' => 'index',
                 'themeHash' => $hash,
@@ -175,11 +175,11 @@ public function createAction()
             $parent = $this->getRepository()->find($parentId);
 
             if (!$parent instanceof Template) {
-                throw new Exception(sprintf('Shop template by id %s not found', $parentId));
+                throw new Exception(\sprintf('Shop template by id %s not found', $parentId));
             }
         }
 
-        $this->container->get(\Shopware\Components\Theme\Generator::class)->generateTheme(
+        $this->container->get(ThemeGenerator::class)->generateTheme(
             $this->Request()->getParams(),
             $parent
         );
@@ -250,14 +250,14 @@ public function uploadAction()
 
             $system->remove($file->getPathname());
 
-            throw new Exception(sprintf('Uploaded file %s is no zip file', $name));
+            throw new Exception(\sprintf('Uploaded file %s is no zip file', $name));
         }
         $targetDirectory = $this->container->get(PathResolver::class)->getFrontendThemeDirectory();
 
         if (!is_writable($targetDirectory)) {
             $this->View()->assign([
                 'success' => false,
-                'error' => sprintf("Target Directory %s isn't writable", $targetDirectory),
+                'error' => \sprintf("Target Directory %s isn't writable", $targetDirectory),
             ]);
 
             return;
diff --git a/engine/Shopware/Controllers/Backend/Translation.php b/engine/Shopware/Controllers/Backend/Translation.php
index 929dab62bd7..9278a822a26 100644
--- a/engine/Shopware/Controllers/Backend/Translation.php
+++ b/engine/Shopware/Controllers/Backend/Translation.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Models\Shop\Shop;
@@ -27,7 +27,7 @@
 class Shopware_Controllers_Backend_Translation extends Shopware_Controllers_Backend_ExtJs
 {
     /**
-     * @var \Shopware_Components_Translation|null
+     * @var Shopware_Components_Translation|null
      */
     protected $translation;
 
@@ -100,7 +100,7 @@ public function saveTranslationAction()
     protected function getTranslation()
     {
         if (!isset($this->translation)) {
-            $this->translation = $this->container->get(\Shopware_Components_Translation::class);
+            $this->translation = $this->container->get(Shopware_Components_Translation::class);
         }
 
         return $this->translation;
diff --git a/engine/Shopware/Controllers/Backend/UpdateWizard.php b/engine/Shopware/Controllers/Backend/UpdateWizard.php
index 99d99f7d08b..169f9f50136 100644
--- a/engine/Shopware/Controllers/Backend/UpdateWizard.php
+++ b/engine/Shopware/Controllers/Backend/UpdateWizard.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\DBAL\Connection;
@@ -29,29 +29,35 @@
 use Shopware\Bundle\PluginInstallerBundle\Service\AccountManagerService;
 use Shopware\Bundle\PluginInstallerBundle\Service\PluginLicenceService;
 use Shopware\Bundle\PluginInstallerBundle\Struct\AccessTokenStruct;
+use Shopware\Components\CacheManager;
+use ShopwarePlugins\SwagUpdate\Components\PluginCheck;
 
 class Shopware_Controllers_Backend_UpdateWizard extends Shopware_Controllers_Backend_ExtJs
 {
+    /**
+     * @return void
+     */
     public function indexAction()
     {
         /** @var Connection $connection */
-        $connection = $this->get(\Doctrine\DBAL\Connection::class);
+        $connection = $this->get(Connection::class);
         $sql = "INSERT IGNORE INTO `s_core_config_elements` (`id`, `form_id`, `name`, `value`, `label`, `description`, `type`, `required`, `position`, `scope`)
                 VALUES (NULL, '0', 'updateWizardStarted', 'b:1;', '', '', 'checkbox', '0', '0', '1');";
-        $connection->executeUpdate($sql);
+        $connection->executeStatement($sql);
 
-        Shopware()->Container()->get(\Shopware\Components\CacheManager::class)->clearConfigCache();
+        Shopware()->Container()->get(CacheManager::class)->clearConfigCache();
     }
 
+    /**
+     * @return void
+     */
     public function updateAction()
     {
-        $pluginCheck = new \ShopwarePlugins\SwagUpdate\Components\PluginCheck($this->container);
+        $pluginCheck = new PluginCheck($this->container);
 
-        /** @var PluginLicenceService $licenceService */
-        $licenceService = $this->get(\Shopware\Bundle\PluginInstallerBundle\Service\PluginLicenceService::class);
+        $licenceService = $this->get(PluginLicenceService::class);
 
-        /** @var AccountManagerService $accountService */
-        $accountService = $this->get(\Shopware\Bundle\PluginInstallerBundle\Service\AccountManagerService::class);
+        $accountService = $this->get(AccountManagerService::class);
 
         $request = new UpdateLicencesRequest(
             $this->getVersion(),
@@ -70,12 +76,12 @@ public function updateAction()
 
         $plugins = $pluginCheck->checkInstalledPluginsAvailableForNewVersion($this->getVersion());
 
-        $updatable = array_filter($plugins, function ($plugin) {
-            return $plugin['updatable'];
+        $updatable = array_filter($plugins, static function ($plugin) {
+            return (bool) $plugin['updatable'];
         });
 
-        $notUpdatable = array_filter($plugins, function ($plugin) {
-            return $plugin['inStore'] == false;
+        $notUpdatable = array_filter($plugins, static function ($plugin) {
+            return !(bool) $plugin['inStore'];
         });
 
         $this->View()->assign([
@@ -87,10 +93,7 @@ public function updateAction()
         ]);
     }
 
-    /**
-     * @return string
-     */
-    private function getLocale()
+    private function getLocale(): string
     {
         return $this->container->get('auth')->getIdentity()->locale->getLocale();
     }
@@ -100,19 +103,16 @@ private function getVersion(): string
         $version = $this->container->getParameter('shopware.release.version');
 
         if (!\is_string($version)) {
-            throw new \RuntimeException('Parameter shopware.release.version has to be an string');
+            throw new RuntimeException('Parameter shopware.release.version has to be an string');
         }
 
         return $version;
     }
 
-    /**
-     * @return AccessTokenStruct|null
-     */
-    private function getAccessToken()
+    private function getAccessToken(): AccessTokenStruct
     {
         if (!$this->get('backendsession')->offsetExists('store_token')) {
-            return null;
+            throw new RuntimeException('Store token not found. Please log into the account in the plugin manager.');
         }
 
         $allowedClassList = [
@@ -125,7 +125,7 @@ private function getAccessToken()
         );
     }
 
-    private function handleException(Exception $e)
+    private function handleException(Exception $e): void
     {
         if (!($e instanceof StoreException)) {
             $this->View()->assign(['success' => false, 'message' => $e->getMessage()]);
@@ -145,12 +145,8 @@ private function handleException(Exception $e)
         ]);
     }
 
-    /**
-     * @return mixed|string
-     */
-    private function getExceptionMessage(StoreException $exception)
+    private function getExceptionMessage(StoreException $exception): string
     {
-        /** @var \Enlight_Components_Snippet_Namespace $namespace */
         $namespace = $this->get('snippets')
             ->getNamespace('backend/plugin_manager/exceptions');
 
diff --git a/engine/Shopware/Controllers/Backend/UserConfig.php b/engine/Shopware/Controllers/Backend/UserConfig.php
index 0b28e79a7ba..bb6813bc178 100644
--- a/engine/Shopware/Controllers/Backend/UserConfig.php
+++ b/engine/Shopware/Controllers/Backend/UserConfig.php
@@ -1,27 +1,29 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+use Doctrine\DBAL\Connection;
+
 class Shopware_Controllers_Backend_UserConfig extends Shopware_Controllers_Backend_ExtJs
 {
     public function getAction()
@@ -30,7 +32,7 @@ public function getAction()
 
         $name = $this->Request()->getParam('name');
 
-        $config = $this->container->get(\Doctrine\DBAL\Connection::class)->fetchColumn(
+        $config = $this->container->get(Connection::class)->fetchColumn(
             'SELECT config FROM s_core_auth_config WHERE user_id = :id AND `name` = :name',
             [':id' => $identity, ':name' => $name]
         );
@@ -46,9 +48,9 @@ public function saveAction()
 
         $config = $this->Request()->getParam('config');
 
-        $this->container->get(\Doctrine\DBAL\Connection::class)->executeUpdate(
-            'INSERT INTO s_core_auth_config (user_id, `name`, `config`) 
-             VALUES (:id, :name, :config) 
+        $this->container->get(Connection::class)->executeUpdate(
+            'INSERT INTO s_core_auth_config (user_id, `name`, `config`)
+             VALUES (:id, :name, :config)
              ON DUPLICATE KEY UPDATE `config`= :config',
             [':id' => $identity, ':name' => $name, ':config' => $config]
         );
diff --git a/engine/Shopware/Controllers/Backend/UserManager.php b/engine/Shopware/Controllers/Backend/UserManager.php
index 0404a873190..f348ea1d840 100644
--- a/engine/Shopware/Controllers/Backend/UserManager.php
+++ b/engine/Shopware/Controllers/Backend/UserManager.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\DBAL\Connection;
@@ -226,7 +226,7 @@ public function updateRoleAction()
             $params['enabled'] = false;
         }
 
-        if ($params['admin'] === 'on' || $params['admin'] === true || $params['admin'] === 1) {
+        if (isset($params['admin']) && ($params['admin'] === 'on' || $params['admin'] === true || $params['admin'] === 1)) {
             $params['admin'] = true;
         } else {
             $params['admin'] = false;
@@ -288,7 +288,7 @@ public function getRolesAction()
 
         // Strip roles with parent id set
         foreach ($roles as &$role) {
-            if ($role['parentID'] != null) {
+            if (!empty($role['parentID'])) {
                 unset($role);
             }
         }
@@ -389,7 +389,7 @@ public function deleteUserAction()
             $this->View()->assign([
                 'success' => false,
                 'data' => $this->Request()->getParams(),
-                'message' => sprintf('User with ID "%s" not found', $userID),
+                'message' => \sprintf('User with ID "%s" not found', $userID),
             ]);
 
             return;
diff --git a/engine/Shopware/Controllers/Backend/Vote.php b/engine/Shopware/Controllers/Backend/Vote.php
index ba832ec2f3d..49d3c6f8ac2 100644
--- a/engine/Shopware/Controllers/Backend/Vote.php
+++ b/engine/Shopware/Controllers/Backend/Vote.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\DBAL\Connection;
@@ -36,7 +36,7 @@ class Shopware_Controllers_Backend_Vote extends Shopware_Controllers_Backend_App
 
     public function save($data)
     {
-        if (!empty($data['answer']) && $data['answer_date'] == null) {
+        if (!empty($data['answer']) && empty($data['answer_date'])) {
             $data['answerDate'] = new DateTime();
         }
         if (empty($data['shopId'])) {
@@ -57,7 +57,7 @@ protected function getList($offset, $limit, $sort = [], $filter = [], array $who
             return $list;
         }
 
-        //assign shops over additional query to improve performance
+        // assign shops over additional query to improve performance
         $shops = $this->getShops($shopIds);
 
         return $this->assignShops($list, $shops);
diff --git a/engine/Shopware/Controllers/Backend/Voucher.php b/engine/Shopware/Controllers/Backend/Voucher.php
index 112625da011..605c92d6de4 100644
--- a/engine/Shopware/Controllers/Backend/Voucher.php
+++ b/engine/Shopware/Controllers/Backend/Voucher.php
@@ -1,33 +1,35 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\ORM\AbstractQuery;
 use Shopware\Components\CSRFWhitelistAware;
 use Shopware\Components\Model\Exception\ModelNotFoundException;
+use Shopware\Components\Model\ModelManager;
 use Shopware\Components\Random;
 use Shopware\Models\Tax\Tax;
 use Shopware\Models\Voucher\Code;
+use Shopware\Models\Voucher\Repository;
 use Shopware\Models\Voucher\Voucher;
 
 class Shopware_Controllers_Backend_Voucher extends Shopware_Controllers_Backend_ExtJs implements CSRFWhitelistAware
@@ -35,12 +37,12 @@ class Shopware_Controllers_Backend_Voucher extends Shopware_Controllers_Backend_
     /**
      * Entity Manager
      *
-     * @var \Shopware\Components\Model\ModelManager
+     * @var ModelManager
      */
     protected $manager;
 
     /**
-     * @var \Shopware\Models\Voucher\Repository
+     * @var Repository
      */
     protected $voucherRepository;
 
@@ -61,16 +63,18 @@ public function preDispatch()
 
     /**
      * Deletes a Supplier from the database
+     *
+     * @return void
      */
     public function deleteVoucherAction()
     {
         $multipleVouchers = $this->Request()->getPost('vouchers');
-        $voucherRequestData = empty($multipleVouchers) ? [['id' => $this->Request()->id]] : $multipleVouchers;
+        $voucherRequestData = empty($multipleVouchers) ? [['id' => $this->Request()->getParam('id')]] : $multipleVouchers;
         foreach ($voucherRequestData as $voucher) {
             // First delete the voucher codes because this could be to huge for doctrine
-            $this->deleteAllVoucherCodesById($voucher['id']);
+            $this->deleteAllVoucherCodesById((int) $voucher['id']);
 
-            /** @var \Shopware\Models\Voucher\Voucher $model */
+            /** @var Voucher $model */
             $model = $this->getVoucherRepository()->find($voucher['id']);
             $this->getManager()->remove($model);
         }
@@ -80,13 +84,15 @@ public function deleteVoucherAction()
 
     /**
      * Returns a JSON string containing all Suppliers
+     *
+     * @return void
      */
     public function getVoucherAction()
     {
-        $offset = (int) $this->Request()->start;
-        $limit = (int) $this->Request()->limit;
-        $filter = $this->Request()->filter;
-        $filter = $filter[0]['value'];
+        $offset = (int) $this->Request()->getParam('start');
+        $limit = (int) $this->Request()->getParam('limit');
+        $filter = $this->Request()->getParam('filter');
+        $filter = $filter[0]['value'] ?? null;
         $sqlBindings = [];
         $searchSQL = '';
 
@@ -99,9 +105,9 @@ public function getVoucherAction()
             $sqlBindings['filter'] = '%' . $filter . '%';
         }
         // Sorting data
-        $sortData = $this->Request()->sort;
-        $sortField = $sortData[0]['property'];
-        $dir = $sortData[0]['direction'];
+        $sortData = $this->Request()->getParam('sort');
+        $sortField = $sortData[0]['property'] ?? null;
+        $dir = $sortData[0]['direction'] ?? null;
         $sort = '';
         if ((!empty($sortField) && $dir === 'ASC') || $dir === 'DESC') {
             // To prevent sql-injections
@@ -139,14 +145,16 @@ public function getVoucherAction()
 
     /**
      * Returns a JSON string containing all Voucher Codes
+     *
+     * @return void
      */
     public function getVoucherCodesAction()
     {
-        $voucherId = (int) $this->Request()->voucherID;
+        $voucherId = (int) $this->Request()->getParam('voucherID');
 
         $orderBy = $this->Request()->getParam('sort');
         $filter = $this->Request()->getParam('filter');
-        $filter = $filter[0]['value'];
+        $filter = $filter[0]['value'] ?? null;
         $offset = $this->Request()->getParam('start');
         $limit = $this->Request()->getParam('limit');
 
@@ -156,26 +164,28 @@ public function getVoucherCodesAction()
         $paginator = $this->getManager()->createPaginator($dataQuery);
 
         $totalCount = $paginator->count();
-        $voucherCodes = $paginator->getIterator()->getArrayCopy();
+        $voucherCodes = iterator_to_array($paginator);
 
         $this->View()->assign(['success' => true, 'data' => $voucherCodes, 'totalCount' => $totalCount]);
     }
 
     /**
      * creates all necessary voucher codes
+     *
+     * @return void
      */
     public function createVoucherCodesAction()
     {
-        $voucherId = (int) $this->Request()->voucherId;
-        $numberOfUnits = (int) $this->Request()->numberOfUnits;
-        $codePattern = $this->Request()->codePattern;
+        $voucherId = (int) $this->Request()->getParam('voucherId');
+        $numberOfUnits = (int) $this->Request()->getParam('numberOfUnits');
+        $codePattern = (string) $this->Request()->getParam('codePattern');
 
         $codePattern = str_replace('%D', '%d', $codePattern);
         $codePattern = str_replace('%S', '%s', $codePattern);
-        $deletePreviousVoucherCodes = $this->Request()->deletePreviousVoucherCodes;
+        $deletePreviousVoucherCodes = $this->Request()->getParam('deletePreviousVoucherCodes');
         $createdVoucherCodes = 0;
 
-        //verify the pattern of the code only the first time of batch processing batch
+        // verify the pattern of the code only the first time of batch processing batch
         if (!empty($codePattern) && $deletePreviousVoucherCodes === 'true') {
             if (!$this->validateCodePattern($codePattern, $numberOfUnits)) {
                 $this->View()->assign(['success' => false, 'errorMsg' => 'CodePattern not complex enough']);
@@ -183,7 +193,7 @@ public function createVoucherCodesAction()
                 return;
             }
         }
-        //first delete available codes
+        // first delete available codes
         if ($deletePreviousVoucherCodes === 'true') {
             $this->deleteAllVoucherCodesById($voucherId);
 
@@ -192,12 +202,12 @@ public function createVoucherCodesAction()
             return;
         }
         do {
-            //generate voucher codes till the numberOfUnits is reached
-            $this->generateVoucherCodes($voucherId, ($numberOfUnits - $createdVoucherCodes), $codePattern);
+            // generate voucher codes till the numberOfUnits is reached
+            $this->generateVoucherCodes($voucherId, $numberOfUnits - $createdVoucherCodes, $codePattern);
 
             $query = $this->getVoucherRepository()->getVoucherCodeCountQuery($voucherId);
             $result = $query->getOneOrNullResult(AbstractQuery::HYDRATE_ARRAY);
-            $createdVoucherCodes = $result['countCode'];
+            $createdVoucherCodes = (int) $result['countCode'];
         } while ($createdVoucherCodes < $numberOfUnits);
 
         $this->View()->assign(['success' => true, 'generatedVoucherCodes' => $createdVoucherCodes]);
@@ -205,14 +215,15 @@ public function createVoucherCodesAction()
 
     /**
      * Updates a single voucher code by the given parameters.
+     *
+     * @return void
      */
     public function updateVoucherCodesAction()
     {
         $codeId = (int) $this->Request()->getParam('id');
-        /** @var Code|null $code */
-        $code = $this->get(\Shopware\Components\Model\ModelManager::class)->getRepository(Code::class)->find($codeId);
+        $code = $this->get(ModelManager::class)->getRepository(Code::class)->find($codeId);
 
-        if (!$code) {
+        if (!$code instanceof Code) {
             $this->View()->assign(['success' => false]);
 
             return;
@@ -222,26 +233,28 @@ public function updateVoucherCodesAction()
         $code->setCode($this->Request()->getParam('code'));
         $code->setCustomerId($this->Request()->getParam('customerId'));
 
-        $this->get(\Shopware\Components\Model\ModelManager::class)->persist($code);
-        $this->get(\Shopware\Components\Model\ModelManager::class)->flush($code);
+        $this->get(ModelManager::class)->persist($code);
+        $this->get(ModelManager::class)->flush($code);
 
         $this->View()->assign(['success' => true]);
     }
 
     /**
      * exports all voucher codes via csv
+     *
+     * @return void
      */
     public function exportVoucherCodeAction()
     {
         $this->Front()->Plugins()->Json()->setRenderer(false);
-        $voucherId = (int) $this->Request()->voucherId;
+        $voucherId = (int) $this->Request()->getParam('voucherId');
 
         $dataQuery = $this->getVoucherRepository()->getVoucherCodeListQuery($voucherId);
         $resultArray = $dataQuery->getArrayResult();
 
         $this->Response()->headers->set('content-type', 'text/csv; charset=utf-8');
         $this->Response()->headers->set('content-disposition', 'attachment;filename=voucherCodes.csv');
-        //use this to set the BOM to show it in the right way for excel and stuff
+        // use this to set the BOM to show it in the right way for excel and stuff
         echo "\xEF\xBB\xBF";
         $fp = fopen('php://output', 'w');
         if (!\is_resource($fp)) {
@@ -257,21 +270,26 @@ public function exportVoucherCodeAction()
 
     /**
      * Action for the Detail Voucher Form to load all needed data
+     *
+     * @return void
      */
     public function getVoucherDetailAction()
     {
-        $voucherID = (int) $this->Request()->voucherID;
+        $voucherID = (int) $this->Request()->getParam('voucherID');
 
         $query = $this->getVoucherRepository()->getVoucherDetailQuery($voucherID);
-        $model = $query->getOneOrNullResult(\Doctrine\ORM\AbstractQuery::HYDRATE_OBJECT);
-        $voucher = $query->getOneOrNullResult(\Doctrine\ORM\AbstractQuery::HYDRATE_ARRAY);
+        $model = $query->getOneOrNullResult(AbstractQuery::HYDRATE_OBJECT);
+        if (!$model instanceof Voucher) {
+            throw new ModelNotFoundException(Voucher::class, $voucherID);
+        }
+        $voucher = $query->getOneOrNullResult(AbstractQuery::HYDRATE_ARRAY);
 
-        if ($model->getValidFrom() instanceof \DateTime) {
+        if ($model->getValidFrom() instanceof DateTime) {
             $voucher['validFrom'] = $model->getValidFrom()->format('d.m.Y');
         } else {
             $voucher['validFrom'] = null;
         }
-        if ($model->getValidTo() instanceof \DateTime) {
+        if ($model->getValidTo() instanceof DateTime) {
             $voucher['validTo'] = $model->getValidTo()->format('d.m.Y');
         } else {
             $voucher['validTo'] = null;
@@ -283,6 +301,8 @@ public function getVoucherDetailAction()
     /**
      * get the Tax configuration
      * Used for the backend tax-combobox
+     *
+     * @return void
      */
     public function getTaxConfigurationAction()
     {
@@ -295,16 +315,18 @@ public function getTaxConfigurationAction()
 
     /**
      * Creates a new voucher with the passed values
+     *
+     * @return void
      */
     public function saveVoucherAction()
     {
         $params = $this->Request()->getParams();
-        $voucherId = empty($params['voucherID']) ? $params['id'] : $params['voucherID'];
+        $voucherId = empty($params['voucherID']) ? $params['id'] ?? null : $params['voucherID'];
         if (!empty($voucherId)) {
             if (!$this->_isAllowed('update', 'voucher')) {
                 return;
             }
-            //edit voucher
+            // edit voucher
             $voucher = $this->getVoucherRepository()->find($voucherId);
             if (!$voucher instanceof Voucher) {
                 throw new ModelNotFoundException(Voucher::class, $voucherId);
@@ -313,11 +335,11 @@ public function saveVoucherAction()
             if (!$this->_isAllowed('create', 'voucher')) {
                 return;
             }
-            //new voucher
+            // new voucher
             $voucher = new Voucher();
         }
 
-        //save empty values
+        // save empty values
         $params = array_merge([
             'validFrom' => null,
             'validTo' => null,
@@ -333,18 +355,20 @@ public function saveVoucherAction()
         $this->getManager()->flush();
         $data = $this->getVoucherRepository()
             ->getVoucherDetailQuery($voucher->getId())
-            ->getOneOrNullResult(\Doctrine\ORM\AbstractQuery::HYDRATE_ARRAY);
+            ->getOneOrNullResult(AbstractQuery::HYDRATE_ARRAY);
 
         $this->View()->assign(['success' => true, 'data' => $data]);
     }
 
     /**
      * checks if the entered vouchercode is already defined or not
+     *
+     * @return void
      */
     public function validateVoucherCodeAction()
     {
-        $voucherCode = $this->Request()->value;
-        $voucherID = (int) $this->Request()->param;
+        $voucherCode = $this->Request()->getParam('value');
+        $voucherID = (int) $this->Request()->getParam('param');
         $voucherData = $this->getVoucherRepository()
             ->getValidateVoucherCodeQuery($voucherCode, $voucherID)
             ->getArrayResult();
@@ -358,11 +382,13 @@ public function validateVoucherCodeAction()
 
     /**
      * checks if the entered ordercode is already defined or not
+     *
+     * @return void
      */
     public function validateOrderCodeAction()
     {
-        $orderCode = $this->Request()->value;
-        $voucherID = (int) $this->Request()->param;
+        $orderCode = $this->Request()->getParam('value');
+        $voucherID = (int) $this->Request()->getParam('param');
         $voucherData = $this->getVoucherRepository()
             ->getValidateOrderCodeQuery($orderCode, $voucherID)
             ->getArrayResult();
@@ -428,11 +454,13 @@ protected function initAcl()
      * @param int    $voucherId
      * @param int    $numberOfUnits
      * @param string $codePattern
+     *
+     * @return void
      */
     protected function generateVoucherCodes($voucherId, $numberOfUnits, $codePattern)
     {
         $values = [];
-        //wrote in standard sql cause in this case its way faster than doctrine models
+        // wrote in standard sql cause in this case its way faster than doctrine models
         $sql = 'INSERT IGNORE INTO s_emarketing_voucher_codes (voucherID, code) VALUES';
         for ($i = 1; $i <= $numberOfUnits; ++$i) {
             $code = $this->generateCode($codePattern);
@@ -448,7 +476,7 @@ protected function generateVoucherCodes($voucherId, $numberOfUnits, $codePattern
     /**
      * Helper function to get access to the voucher repository.
      *
-     * @return \Shopware\Models\Voucher\Repository
+     * @return Repository
      */
     private function getVoucherRepository()
     {
@@ -462,7 +490,7 @@ private function getVoucherRepository()
     /**
      * Internal helper function to get access to the entity manager.
      *
-     * @return Shopware\Components\Model\ModelManager
+     * @return ModelManager
      */
     private function getManager()
     {
@@ -493,21 +521,16 @@ private function generateCode($codePattern)
 
     /**
      * validates the code pattern
-     *
-     * @param string $codePattern
-     * @param int    $numberOfUnits
-     *
-     * @return bool
      */
-    private function validateCodePattern($codePattern, $numberOfUnits)
+    private function validateCodePattern(string $codePattern, int $numberOfUnits): bool
     {
         $numberOfStringValues = substr_count($codePattern, '%s');
         $numberOfDigitValues = substr_count($codePattern, '%d');
 
         $numberOfDigitValues = 10 ** $numberOfDigitValues;
-        $numberOfDigitValues = $numberOfDigitValues == 1 ? 0 : $numberOfDigitValues;
+        $numberOfDigitValues = $numberOfDigitValues === 1 ? 0 : $numberOfDigitValues;
         $numberOfStringValues = 26 ** $numberOfStringValues;
-        $numberOfStringValues = $numberOfStringValues == 1 ? 0 : $numberOfStringValues;
+        $numberOfStringValues = $numberOfStringValues === 1 ? 0 : $numberOfStringValues;
         if (empty($numberOfDigitValues)) {
             $numberOfPossibleCodes = $numberOfStringValues;
         } elseif (empty($numberOfStringValues)) {
@@ -522,17 +545,13 @@ private function validateCodePattern($codePattern, $numberOfUnits)
     /**
      * replaced all matching patterns
      *
-     * @param string $generatedCode
-     * @param array  $range
-     * @param string $pattern
-     *
-     * @return string
+     * @param array<string|int> $range
      */
-    private function replaceAllMatchingPatterns($generatedCode, $range, $pattern)
+    private function replaceAllMatchingPatterns(string $generatedCode, array $range, string $pattern): string
     {
         $allPatternsReplaced = false;
         while (!$allPatternsReplaced) {
-            $generatedCode = (string) preg_replace('/\\' . $pattern . '/', $range[Random::getInteger(1, \count($range) - 1)], $generatedCode, 1);
+            $generatedCode = (string) preg_replace('/\\' . $pattern . '/', (string) $range[Random::getInteger(1, \count($range) - 1)], $generatedCode, 1);
             $allPatternsReplaced = substr_count($generatedCode, $pattern) == 0;
         }
 
@@ -541,10 +560,8 @@ private function replaceAllMatchingPatterns($generatedCode, $range, $pattern)
 
     /**
      * helper method to fast delete all voucher codes
-     *
-     * @param int $voucherId
      */
-    private function deleteAllVoucherCodesById($voucherId)
+    private function deleteAllVoucherCodesById(int $voucherId): void
     {
         $allVouchersDeleted = false;
         while (!$allVouchersDeleted) {
diff --git a/engine/Shopware/Controllers/Backend/Widgets.php b/engine/Shopware/Controllers/Backend/Widgets.php
index ceb7920c2b1..7d673afd408 100644
--- a/engine/Shopware/Controllers/Backend/Widgets.php
+++ b/engine/Shopware/Controllers/Backend/Widgets.php
@@ -1,27 +1,30 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+use Doctrine\ORM\AbstractQuery;
+use Doctrine\ORM\ORMException;
+use Shopware\Components\Model\ModelManager;
 use Shopware\Models\Mail\Mail;
 use Shopware\Models\Shop\Locale;
 use Shopware\Models\User\User;
@@ -34,11 +37,11 @@ class Shopware_Controllers_Backend_Widgets extends Shopware_Controllers_Backend_
      * Returns the list of active widgets for the current logged
      * in user as an JSON string.
      *
-     * @public
+     * @return void
      */
     public function getListAction()
     {
-        $auth = Shopware()->Container()->get('auth');
+        $auth = $this->get('auth');
 
         if (!$auth->hasIdentity()) {
             $this->View()->assign(['success' => false]);
@@ -49,7 +52,7 @@ public function getListAction()
         $identity = $auth->getIdentity();
         $userID = (int) $identity->id;
 
-        $builder = Shopware()->Container()->get(\Shopware\Components\Model\ModelManager::class)->createQueryBuilder();
+        $builder = $this->get(ModelManager::class)->createQueryBuilder();
         $builder->select(['widget', 'view', 'plugin'])
             ->from(Widget::class, 'widget')
             ->leftJoin('widget.views', 'view', 'WITH', 'view.authId = ?1')
@@ -79,10 +82,12 @@ public function getListAction()
 
     /**
      * Sets the position for a single widget
+     *
+     * @return void
      */
     public function savePositionAction()
     {
-        $auth = Shopware()->Container()->get('auth');
+        $auth = $this->get('auth');
 
         if (!$auth->hasIdentity()) {
             $this->View()->assign(['success' => false]);
@@ -91,15 +96,9 @@ public function savePositionAction()
         }
 
         $request = $this->Request();
-        $column = $request->getParam('column');
-        $position = $request->getParam('position');
-        $id = $request->getParam('id');
-
-        if (!$auth->hasIdentity()) {
-            $this->View()->assign(['success' => false]);
-
-            return;
-        }
+        $column = (int) $request->getParam('column');
+        $position = (int) $request->getParam('position');
+        $id = (int) $request->getParam('id');
 
         $this->setWidgetPosition($id, $position, $column);
 
@@ -108,10 +107,12 @@ public function savePositionAction()
 
     /**
      * Sets the positions for all given widget ids
+     *
+     * @return void
      */
     public function savePositionsAction()
     {
-        $auth = Shopware()->Container()->get('auth');
+        $auth = $this->get('auth');
 
         if (!$auth->hasIdentity()) {
             $this->View()->assign(['success' => false]);
@@ -122,7 +123,7 @@ public function savePositionsAction()
         $widgets = $this->Request()->getParam('widgets');
 
         foreach ($widgets as $widget) {
-            $this->setWidgetPosition($widget['id'], $widget['position'], $widget['column']);
+            $this->setWidgetPosition((int) $widget['id'], (int) $widget['position'], (int) $widget['column']);
         }
 
         $this->View()->assign(['success' => true]);
@@ -130,6 +131,8 @@ public function savePositionsAction()
 
     /**
      * Creates a new widget for the active backend user.
+     *
+     * @return void
      */
     public function addWidgetViewAction()
     {
@@ -151,18 +154,14 @@ public function addWidgetViewAction()
         $data = $request->getParam('data', []);
 
         $model = new View();
-        $model->setWidget(
-            $this->get(\Shopware\Components\Model\ModelManager::class)->find(Widget::class, $widgetId)
-        );
-        $model->setAuth(
-            $this->get(\Shopware\Components\Model\ModelManager::class)->find(User::class, $userID)
-        );
+        $model->setWidget($this->get(ModelManager::class)->find(Widget::class, $widgetId));
+        $model->setAuth($this->get(ModelManager::class)->find(User::class, $userID));
         $model->setColumn($column);
         $model->setPosition($position);
         $model->setData($data);
 
-        $this->get(\Shopware\Components\Model\ModelManager::class)->persist($model);
-        $this->get(\Shopware\Components\Model\ModelManager::class)->flush();
+        $this->get(ModelManager::class)->persist($model);
+        $this->get(ModelManager::class)->flush();
         $viewId = $model->getId();
 
         $this->View()->assign(['success' => !empty($viewId), 'viewId' => $viewId]);
@@ -170,10 +169,12 @@ public function addWidgetViewAction()
 
     /**
      * Removes active widgets by the passed views param
+     *
+     * @return void
      */
     public function removeWidgetViewAction()
     {
-        $auth = Shopware()->Container()->get('auth');
+        $auth = $this->get('auth');
 
         if (!$auth->hasIdentity()) {
             $this->View()->assign(['success' => false]);
@@ -184,9 +185,9 @@ public function removeWidgetViewAction()
         $request = $this->Request();
         $id = $request->getParam('id');
 
-        if ($model = Shopware()->Container()->get(\Shopware\Components\Model\ModelManager::class)->find(View::class, $id)) {
-            Shopware()->Container()->get(\Shopware\Components\Model\ModelManager::class)->remove($model);
-            Shopware()->Container()->get(\Shopware\Components\Model\ModelManager::class)->flush();
+        if ($model = $this->get(ModelManager::class)->find(View::class, $id)) {
+            $this->get(ModelManager::class)->remove($model);
+            $this->get(ModelManager::class)->flush();
         }
 
         $this->View()->assign(['success' => true]);
@@ -196,7 +197,7 @@ public function removeWidgetViewAction()
      * Gets the turnover and visitors amount for the
      * chart and the grid in the "Turnover - Yesterday and today"-widget.
      *
-     * @public
+     * @return void
      */
     public function getTurnOverVisitorsAction()
     {
@@ -205,7 +206,7 @@ public function getTurnOverVisitorsAction()
 
         // Get turnovers
         /** @var array $fetchAmount */
-        $fetchAmount = Shopware()->Container()->get('db')->fetchRow(
+        $fetchAmount = $this->get('db')->fetchRow(
             'SELECT
                 (
                     SELECT sum(invoice_amount/currencyFactor) AS amount
@@ -235,7 +236,7 @@ public function getTurnOverVisitorsAction()
         $fetchAmount['yesterday'] = round($fetchAmount['yesterday'], 2);
 
         // Get visitors
-        $fetchVisitors = Shopware()->Container()->get('db')->fetchRow(
+        $fetchVisitors = $this->get('db')->fetchRow(
             'SELECT
                 (
                     SELECT SUM(uniquevisits)
@@ -251,7 +252,7 @@ public function getTurnOverVisitorsAction()
         );
 
         // Get new customers
-        $fetchCustomers = Shopware()->Container()->get('db')->fetchRow(
+        $fetchCustomers = $this->get('db')->fetchRow(
             'SELECT
                 (
                     SELECT COUNT(DISTINCT id)
@@ -267,7 +268,7 @@ public function getTurnOverVisitorsAction()
         );
 
         // Get order-count
-        $fetchOrders = Shopware()->Container()->get('db')->fetchRow(
+        $fetchOrders = $this->get('db')->fetchRow(
             'SELECT
                 (
                     SELECT COUNT(DISTINCT id) AS orders
@@ -301,20 +302,20 @@ public function getTurnOverVisitorsAction()
             :startDate
         ";
 
-        $fetchConversion = Shopware()->Container()->get('db')->fetchRow(
+        $fetchConversion = $this->get('db')->fetchRow(
             $sql,
             [
                 'startDate' => $startDate->format('Y-m-d H:i:s'),
             ]
         );
 
-        if ($fetchConversion['visitors'] != 0) {
+        if (\is_array($fetchConversion) && $fetchConversion['visitors'] != 0) {
             $fetchConversion = number_format($fetchConversion['countOrders'] / $fetchConversion['visitors'] * 100, 2);
         } else {
             $fetchConversion = number_format(0, 2);
         }
 
-        $namespace = Shopware()->Container()->get('snippets')->getNamespace('backend/widget/controller');
+        $namespace = $this->get('snippets')->getNamespace('backend/widget/controller');
         $this->View()->assign(
             [
                 'success' => true,
@@ -343,7 +344,7 @@ public function getTurnOverVisitorsAction()
      * Gets the last visitors and customers for
      * the chart and the grid in the "Customers and visitors"-widget.
      *
-     * @public
+     * @return void
      */
     public function getVisitorsAction()
     {
@@ -357,7 +358,7 @@ public function getVisitorsAction()
         GROUP BY datum
         ';
 
-        $data = Shopware()->Container()->get('db')->fetchAll($sql, [$timeBack]);
+        $data = $this->get('db')->fetchAll($sql, [$timeBack]);
 
         $result = [];
         foreach ($data as $row) {
@@ -369,7 +370,7 @@ public function getVisitorsAction()
         }
 
         // Get current users online
-        $currentUsers = Shopware()->Container()->get('db')->fetchOne(
+        $currentUsers = $this->get('db')->fetchOne(
             'SELECT COUNT(DISTINCT remoteaddr)
             FROM s_statistics_currentusers
             WHERE time > DATE_SUB(NOW(), INTERVAL 3 MINUTE)'
@@ -379,7 +380,7 @@ public function getVisitorsAction()
         }
 
         // Get current users logged in
-        $fetchLoggedInUsers = Shopware()->Container()->get('db')->fetchAll("
+        $fetchLoggedInUsers = $this->get('db')->fetchAll("
             SELECT s.userID,
             (SELECT SUM(quantity * price) AS amount FROM s_order_basket WHERE userID = s.userID GROUP BY sessionID ORDER BY id DESC LIMIT 1) AS amount,
             (SELECT IF(ub.company<>'',ub.company,CONCAT(ub.firstname,' ',ub.lastname)) FROM s_user_addresses AS ub INNER JOIN s_user AS u ON u.default_billing_address_id = ub.id WHERE u.id = s.userID) AS customer
@@ -406,10 +407,13 @@ public function getVisitorsAction()
         );
     }
 
+    /**
+     * @return void
+     */
     public function getShopwareNewsAction()
     {
         /** @var Shopware_Components_Auth $auth */
-        $auth = Shopware()->Container()->get('auth');
+        $auth = $this->get('auth');
         $user = $auth->getIdentity();
         $result = $this->fetchRssFeedData($user->locale);
 
@@ -424,7 +428,7 @@ public function getShopwareNewsAction()
     /**
      * Gets the latest orders for the "last orders" widget.
      *
-     * @public
+     * @return void
      */
     public function getLastOrdersAction()
     {
@@ -442,7 +446,7 @@ public function getLastOrdersAction()
         ';
 
         /** @var array $result */
-        $result = Shopware()->Container()->get('db')->fetchAll($sql);
+        $result = $this->get('db')->fetchAll($sql);
         foreach ($result as &$order) {
             $order['customer'] = htmlentities(
                 $order['company'] ? $order['company'] : $order['firstname'] . ' ' . $order['lastname'],
@@ -451,7 +455,7 @@ public function getLastOrdersAction()
             );
 
             if ($order['currencyFactor'] != 0) {
-                $amount = round(($order['invoice_amount'] / $order['currencyFactor']), 2);
+                $amount = round($order['invoice_amount'] / $order['currencyFactor'], 2);
             } else {
                 $amount = 0;
             }
@@ -475,11 +479,11 @@ public function getLastOrdersAction()
      * Gets the saved notice from the database and
      * assigns it to the view-
      *
-     * @public
+     * @return void
      */
     public function getNoticeAction()
     {
-        $userID = $_SESSION['ShopwareBackend']['Auth']->id;
+        $userID = $_SESSION['ShopwareBackend']['Auth']->id ?? null;
 
         if (empty($userID)) {
             $this->View()->assign(['success' => false, 'message' => 'No user id']);
@@ -487,10 +491,8 @@ public function getNoticeAction()
             return;
         }
 
-        $noticeMsg = Shopware()->Container()->get('db')->fetchOne(
-            '
-                    SELECT notes FROM s_plugin_widgets_notes WHERE userID = ?
-                    ',
+        $noticeMsg = $this->get('db')->fetchOne(
+            'SELECT notes FROM s_plugin_widgets_notes WHERE userID = ?',
             [$userID]
         );
 
@@ -500,13 +502,13 @@ public function getNoticeAction()
     /**
      * Saves the notice text from the notice widget.
      *
-     * @public
+     * @return void
      */
     public function saveNoticeAction()
     {
         $noticeMsg = (string) $this->Request()->getParam('notice');
 
-        $userID = $_SESSION['ShopwareBackend']['Auth']->id;
+        $userID = $_SESSION['ShopwareBackend']['Auth']->id ?? null;
 
         if (empty($userID)) {
             $this->View()->assign(['success' => false, 'message' => 'No user id']);
@@ -514,9 +516,9 @@ public function saveNoticeAction()
             return;
         }
 
-        if (Shopware()->Container()->get('db')->fetchOne('SELECT id FROM s_plugin_widgets_notes WHERE userID = ?', [$userID])) {
+        if ($this->get('db')->fetchOne('SELECT id FROM s_plugin_widgets_notes WHERE userID = ?', [$userID])) {
             // Update
-            Shopware()->Container()->get('db')->query(
+            $this->get('db')->query(
                 '
                             UPDATE s_plugin_widgets_notes SET notes = ? WHERE userID = ?
                             ',
@@ -524,7 +526,7 @@ public function saveNoticeAction()
             );
         } else {
             // Insert
-            Shopware()->Container()->get('db')->query(
+            $this->get('db')->query(
                 '
                             INSERT INTO s_plugin_widgets_notes (userID, notes)
                             VALUES (?,?)
@@ -552,7 +554,7 @@ public function getUnverifiedRatingsAction(): void
     /**
      * Gets the last registered merchant for the "merchant unlock" widget.
      *
-     * @public
+     * @return void
      */
     public function getLastMerchantAction()
     {
@@ -573,7 +575,7 @@ public function getLastMerchantAction()
         ORDER BY s_user.firstlogin DESC";
 
         /** @var array $fetchUsersToUnlock */
-        $fetchUsersToUnlock = Shopware()->Container()->get('db')->fetchAll($sql);
+        $fetchUsersToUnlock = $this->get('db')->fetchAll($sql);
 
         foreach ($fetchUsersToUnlock as &$user) {
             $user['customergroup_name'] = htmlentities($user['customergroup_name'], ENT_COMPAT | ENT_HTML401, 'UTF-8');
@@ -585,8 +587,10 @@ public function getLastMerchantAction()
     }
 
     /**
-     * Creates the deny or allow mail from the db and assigns it to
+     * Creates the "deny" or "allow" mail from the db and assigns it to
      * the view.
+     *
+     * @return void
      */
     public function requestMerchantFormAction()
     {
@@ -599,15 +603,15 @@ public function requestMerchantFormAction()
         } else {
             $tplMail = 'sCUSTOMERGROUP%sREJECTED';
         }
-        $tplMail = sprintf($tplMail, $customerGroup);
+        $tplMail = \sprintf($tplMail, $customerGroup);
 
-        $builder = $this->container->get(\Shopware\Components\Model\ModelManager::class)->createQueryBuilder();
+        $builder = $this->container->get(ModelManager::class)->createQueryBuilder();
         $builder->select(['customer.email', 'customer.languageId'])
             ->from('Shopware\Models\Customer\Customer', 'customer')
             ->where('customer.id = ?1')
             ->setParameter(1, $userId);
 
-        $customer = $builder->getQuery()->getOneOrNullResult(\Doctrine\ORM\AbstractQuery::HYDRATE_ARRAY);
+        $customer = $builder->getQuery()->getOneOrNullResult(AbstractQuery::HYDRATE_ARRAY);
         if (empty($customer) || empty($customer['email'])) {
             $this->View()->assign(
                 [
@@ -617,7 +621,7 @@ public function requestMerchantFormAction()
                 ]
             );
 
-            return false;
+            return;
         }
 
         $mailModel = $this->getModelManager()->getRepository(Mail::class)->findOneBy(
@@ -640,10 +644,10 @@ public function requestMerchantFormAction()
                 ]
             );
 
-            return true;
+            return;
         }
 
-        $translationReader = $this->container->get(\Shopware_Components_Translation::class);
+        $translationReader = $this->container->get(Shopware_Components_Translation::class);
         $translation = $translationReader->read($customer['languageId'], 'config_mails', $mailModel->getId());
         $mailModel->setTranslation($translation);
 
@@ -662,11 +666,13 @@ public function requestMerchantFormAction()
     /**
      * Sends the mail to the merchant if the inquiry was
      * successful or was declined.
+     *
+     * @return void
      */
     public function sendMailToMerchantAction()
     {
         $params = $this->Request()->getParams();
-        $mail = clone Shopware()->Container()->get('mail');
+        $mail = clone $this->get('mail');
 
         $toMail = $params['toMail'];
         $fromName = $params['fromName'];
@@ -679,7 +685,7 @@ public function sendMailToMerchantAction()
         if (!$toMail || !$fromName || !$fromMail || !$subject || !$content || !$userId) {
             $this->View()->assign(['success' => false, 'message' => 'All required fields needs to be filled.']);
 
-            return false;
+            return;
         }
 
         $content = preg_replace('`<br(?: /)?>([\\n\\r])`', '$1', $params['content']);
@@ -702,17 +708,17 @@ public function sendMailToMerchantAction()
         if (!$mail->send()) {
             $this->View()->assign(['success' => false, 'message' => 'The mail could not be sent.']);
 
-            return false;
+            return;
         }
         if ($status == 'accepted') {
-            Shopware()->Container()->get('db')->query(
+            $this->get('db')->query(
                 "
                                     UPDATE s_user SET customergroup = validation, validation = '' WHERE id = ?
                                     ",
                 [$userId]
             );
         } else {
-            Shopware()->Container()->get('db')->query(
+            $this->get('db')->query(
                 "
                                     UPDATE s_user SET validation = '' WHERE id = ?
                                     ",
@@ -726,32 +732,23 @@ public function sendMailToMerchantAction()
     /**
      * Gets a widget by id and sets its column / row position
      *
-     * @param int $viewId
-     * @param int $position
-     * @param int $column
-     *
-     * @throws \Doctrine\ORM\ORMException
+     * @throws ORMException
      */
-    private function setWidgetPosition($viewId, $position, $column)
+    private function setWidgetPosition(int $viewId, int $position, int $column): void
     {
-        $model = Shopware()->Container()->get(\Shopware\Components\Model\ModelManager::class)->find('Shopware\Models\Widget\View', $viewId);
+        $model = $this->get(ModelManager::class)->find(View::class, $viewId);
         $model->setPosition($position);
         $model->setColumn($column);
 
-        Shopware()->Container()->get(\Shopware\Components\Model\ModelManager::class)->persist($model);
-        Shopware()->Container()->get(\Shopware\Components\Model\ModelManager::class)->flush();
+        $this->get(ModelManager::class)->persist($model);
+        $this->get(ModelManager::class)->flush();
     }
 
-    /**
-     * @param int $limit
-     *
-     * @return array
-     */
-    private function fetchRssFeedData(Locale $locale, $limit = 5)
+    private function fetchRssFeedData(Locale $locale, int $limit = 5): array
     {
         $lang = 'de';
 
-        if ($locale->getLocale() != 'de_DE') {
+        if ($locale->getLocale() !== 'de_DE') {
             $lang = 'en';
         }
 
@@ -761,24 +758,21 @@ private function fetchRssFeedData(Locale $locale, $limit = 5)
         $streamContextOptions['http']['timeout'] = 20;
 
         try {
-            $xml = new \SimpleXMLElement(
+            $xml = new SimpleXMLElement(
                 file_get_contents(
                     'https://' . $lang . '.shopware.com/news/?sRss=1',
                     false,
                     stream_context_create($streamContextOptions)
                 )
             );
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             return [];
         }
 
-        /*
-         * @var \SimpleXMLElement
-         */
         foreach ($xml->channel->item as $news) {
             $tmp = (array) $news->children();
 
-            $date = new \DateTime($tmp['pubDate']);
+            $date = new DateTime($tmp['pubDate']);
 
             $result[] = [
                 'title' => $tmp['title'],
diff --git a/engine/Shopware/Controllers/Frontend/Account.php b/engine/Shopware/Controllers/Frontend/Account.php
index 0b373765d4c..fcf72f1e6f6 100644
--- a/engine/Shopware/Controllers/Frontend/Account.php
+++ b/engine/Shopware/Controllers/Frontend/Account.php
@@ -1,28 +1,26 @@
 <?php
 
 declare(strict_types=1);
-
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\DBAL\Connection;
@@ -37,6 +35,7 @@
 use Shopware\Bundle\StoreFrontBundle\Gateway\CountryGatewayInterface;
 use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface;
 use Shopware\Components\Captcha\CaptchaValidator;
+use Shopware\Components\Captcha\NoCaptcha;
 use Shopware\Components\Compatibility\LegacyStructConverter;
 use Shopware\Components\Model\ModelManager;
 use Shopware\Components\Random;
@@ -49,8 +48,6 @@
 
 class Shopware_Controllers_Frontend_Account extends Enlight_Controller_Action
 {
-    private const DEFAULT_CAPTCHA_SETTING = 'nocaptcha';
-
     private const CONFIG_PASSWORD_RESET_CAPTCHA = 'passwordResetCaptcha';
 
     /**
@@ -102,8 +99,11 @@ public function preDispatch()
             return;
         }
 
-        $activeBillingAddressId = $customerData['additional']['user']['default_billing_address_id'];
-        $activeShippingAddressId = $customerData['additional']['user']['default_shipping_address_id'];
+        $this->response->headers->addCacheControlDirective('no-store');
+        $this->response->headers->addCacheControlDirective('no-cache');
+
+        $activeBillingAddressId = $customerData['additional']['user']['default_billing_address_id'] ?? null;
+        $activeShippingAddressId = $customerData['additional']['user']['default_shipping_address_id'] ?? null;
 
         if (!empty($customerData['shippingaddress']['country']['id'])) {
             $country = $this->get(CountryGatewayInterface::class)->getCountry($customerData['shippingaddress']['country']['id'], $this->get(ContextServiceInterface::class)->getContext());
@@ -488,7 +488,7 @@ public function passwordAction()
     public function sendResetPasswordConfirmationMail($email)
     {
         $snippets = Shopware()->Snippets()->getNamespace('frontend/account/password');
-        if ($this->config->get(self::CONFIG_PASSWORD_RESET_CAPTCHA) !== self::DEFAULT_CAPTCHA_SETTING) {
+        if ($this->config->get(self::CONFIG_PASSWORD_RESET_CAPTCHA) !== NoCaptcha::CAPTCHA_METHOD) {
             if (!empty($this->config->get('CaptchaColor'))) {
                 if (!$this->captchaValidator->validateByName($this->config->get(self::CONFIG_PASSWORD_RESET_CAPTCHA), $this->Request())) {
                     return [
@@ -514,8 +514,8 @@ public function sendResetPasswordConfirmationMail($email)
         $hash = Random::getAlphanumericString(32);
 
         $context = [
-            'sUrlReset' => $this->Front()->Router()->assemble(['controller' => 'account', 'action' => 'resetPassword', 'hash' => $hash]),
-            'sUrl' => $this->Front()->Router()->assemble(['controller' => 'account', 'action' => 'resetPassword']),
+            'sUrlReset' => $this->Front()->ensureRouter()->assemble(['controller' => 'account', 'action' => 'resetPassword', 'hash' => $hash]),
+            'sUrl' => $this->Front()->ensureRouter()->assemble(['controller' => 'account', 'action' => 'resetPassword']),
             'sKey' => $hash,
         ];
 
@@ -557,17 +557,7 @@ public function sendResetPasswordConfirmationMail($email)
         $mail->addTo($email);
         $mail->send();
 
-        // Invalidate existing hashes
-        $connection->update(
-            's_core_optin',
-            [
-                'datum' => (new DateTimeImmutable('-1 day'))->format(DATE_ATOM),
-            ],
-            [
-                'type' => 'swPassword',
-                'data' => $customerId,
-            ]
-        );
+        $this->invalidateExistingPasswordLinkHashes($customerId);
 
         // Add the hash to the optin table
         $sql = "INSERT INTO `s_core_optin` (`type`, `datum`, `hash`, `data`) VALUES ('swPassword', NOW(), ?, ?)";
@@ -733,6 +723,7 @@ public function saveEmailAction()
 
         if ($form->isSubmitted() && $form->isValid()) {
             $this->customerService->update($customer);
+            $this->invalidateExistingPasswordLinkHashes($customer->getId());
             $this->get('session')->offsetSet('sUserMail', $customer->getEmail());
             $this->get('session')->offsetSet('userInfo', null);
             $this->redirect(['controller' => 'account', 'action' => 'profile', 'success' => true, 'section' => 'email']);
@@ -827,6 +818,22 @@ private function renderTrackingLink(string $link, string $trackingCode): ?string
         return preg_replace($regEx, $trackingCode, $link);
     }
 
+    private function invalidateExistingPasswordLinkHashes(int $customerId): void
+    {
+        /* @var Connection $connection */
+        $connection = $this->get(Connection::class);
+        $connection->update(
+            's_core_optin',
+            [
+                'datum' => (new DateTimeImmutable('-1 day'))->format(DATE_ATOM),
+            ],
+            [
+                'type' => 'swPassword',
+                'data' => $customerId,
+            ]
+        );
+    }
+
     /**
      * Delete old expired password-hashes after two hours
      */
@@ -890,7 +897,12 @@ private function getForwardParameters(): array
 
     private function isOneTimeAccount(): bool
     {
-        return $this->container->get('session')->offsetGet('sOneTimeAccount')
-            || (int) $this->View()->getAssign('sUserData')['additional']['user']['accountmode'] === Customer::ACCOUNT_MODE_FAST_LOGIN;
+        $customerData = $this->View()->getAssign('sUserData');
+        if (!isset($customerData['additional']['user'])) {
+            return false;
+        }
+
+        return $this->container->get('session')->get('sOneTimeAccount')
+            || (int) $customerData['additional']['user']['accountmode'] === Customer::ACCOUNT_MODE_FAST_LOGIN;
     }
 }
diff --git a/engine/Shopware/Controllers/Frontend/Address.php b/engine/Shopware/Controllers/Frontend/Address.php
index 3e3a90c3f39..99bb9b118a6 100644
--- a/engine/Shopware/Controllers/Frontend/Address.php
+++ b/engine/Shopware/Controllers/Frontend/Address.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Bundle\AccountBundle\Form\Account\AddressFormType;
@@ -392,9 +392,11 @@ public function handleExtraAction()
     }
 
     /**
-     * @return array
+     * @param FormInterface<Address> $form
+     *
+     * @return array<string, mixed>
      */
-    private function getFormViewData(FormInterface $form)
+    private function getFormViewData(FormInterface $form): array
     {
         $errorFlags = [];
         $errorMessages = [];
@@ -416,7 +418,6 @@ private function getFormViewData(FormInterface $form)
             array_unshift($errorMessages, $errorMessage);
         }
 
-        /** @var Address $address */
         $address = $form->getViewData();
 
         $formData = array_merge(
diff --git a/engine/Shopware/Controllers/Frontend/AjaxSearch.php b/engine/Shopware/Controllers/Frontend/AjaxSearch.php
index cb6ef485e73..aad1536d828 100644
--- a/engine/Shopware/Controllers/Frontend/AjaxSearch.php
+++ b/engine/Shopware/Controllers/Frontend/AjaxSearch.php
@@ -1,30 +1,34 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Bundle\SearchBundle\Criteria;
+use Shopware\Bundle\SearchBundle\ProductSearchInterface;
 use Shopware\Bundle\SearchBundle\ProductSearchResult;
 use Shopware\Bundle\SearchBundle\SearchTermPreProcessorInterface;
+use Shopware\Bundle\SearchBundle\StoreFrontCriteriaFactoryInterface;
+use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface;
+use Shopware\Bundle\StoreFrontBundle\Service\ListProductServiceInterface;
 use Shopware\Bundle\StoreFrontBundle\Struct\ListProduct;
 use Shopware\Bundle\StoreFrontBundle\Struct\ShopContextInterface;
 use Shopware\Components\Compatibility\LegacyStructConverter;
@@ -41,8 +45,7 @@ public function indexAction()
     {
         $this->View()->loadTemplate('frontend/search/ajax.tpl');
 
-        /** @var SearchTermPreProcessorInterface $processor */
-        $processor = $this->get(\Shopware\Bundle\SearchBundle\SearchTermPreProcessorInterface::class);
+        $processor = $this->get(SearchTermPreProcessorInterface::class);
         $term = $processor->process($this->Request()->getParam('sSearch'));
 
         if (!$term || \strlen($term) < Shopware()->Config()->get('MinSearchLenght')) {
@@ -52,9 +55,9 @@ public function indexAction()
         $this->setDefaultSorting();
 
         /** @var ShopContextInterface $context */
-        $context = $this->get(\Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface::class)->getShopContext();
+        $context = $this->get(ContextServiceInterface::class)->getShopContext();
 
-        $criteria = $this->get(\Shopware\Bundle\SearchBundle\StoreFrontCriteriaFactoryInterface::class)
+        $criteria = $this->get(StoreFrontCriteriaFactoryInterface::class)
             ->createAjaxSearchCriteria($this->Request(), $context);
 
         $result = $this->search($term, $criteria, $context);
@@ -79,7 +82,7 @@ private function convertProducts(ProductSearchResult $result)
         foreach ($result->getProducts() as $product) {
             $productArray = $this->get(LegacyStructConverter::class)->convertListProductStruct($product);
 
-            $productArray['link'] = $this->Front()->Router()->assemble([
+            $productArray['link'] = $this->Front()->ensureRouter()->assemble([
                 'controller' => 'detail',
                 'sArticle' => $product->getId(),
                 'number' => $product->getNumber(),
@@ -98,7 +101,7 @@ private function setDefaultSorting()
             return;
         }
 
-        $sortings = $this->container->get(\Shopware_Components_Config::class)->get('searchSortings');
+        $sortings = $this->container->get(Shopware_Components_Config::class)->get('searchSortings');
         $sortings = array_filter(explode('|', $sortings));
         $this->Request()->setParam('sSort', array_shift($sortings));
     }
@@ -113,10 +116,10 @@ private function search($term, Criteria $criteria, ShopContextInterface $context
         $result = null;
 
         // If the search for product numbers is active, do that first
-        if ((int) $this->get(\Shopware_Components_Config::class)->get('activateNumberSearch') === 1) {
+        if ((int) $this->get(Shopware_Components_Config::class)->get('activateNumberSearch') === 1) {
             // Check if search-term is a valid product-number
             /** @var ListProduct|null $directHit */
-            $directHit = $this->get(\Shopware\Bundle\StoreFrontBundle\Service\ListProductServiceInterface::class)
+            $directHit = $this->get(ListProductServiceInterface::class)
                 ->get($term, $context);
 
             if ($directHit) {
@@ -127,7 +130,7 @@ private function search($term, Criteria $criteria, ShopContextInterface $context
 
         // If number search is inactive or didn't find anything, do a regular search
         if (!$result || $result->getTotalCount() === 0) {
-            $result = $this->get(\Shopware\Bundle\SearchBundle\ProductSearchInterface::class)->search($criteria, $context);
+            $result = $this->get(ProductSearchInterface::class)->search($criteria, $context);
         }
 
         return $result;
diff --git a/engine/Shopware/Controllers/Frontend/Blog.php b/engine/Shopware/Controllers/Frontend/Blog.php
index 92f4a071945..a9b310b1a4e 100644
--- a/engine/Shopware/Controllers/Frontend/Blog.php
+++ b/engine/Shopware/Controllers/Frontend/Blog.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\ORM\AbstractQuery;
@@ -74,6 +74,9 @@ class Shopware_Controllers_Frontend_Blog extends Enlight_Controller_Action
      */
     protected $blogBaseUrl;
 
+    /**
+     * @return void
+     */
     public function init()
     {
         $this->blogBaseUrl = Shopware()->Config()->get('baseFile');
@@ -142,15 +145,17 @@ public function getCommentConfirmRepository()
 
     /**
      * Index action method
+     *
+     * @return void
      */
     public function indexAction()
     {
         $categoryId = (int) $this->Request()->getQuery('sCategory');
         $page = (int) $this->request->getParam('sPage', 1);
         $page = $page >= 1 ? $page : 1;
-        $filterDate = urldecode($this->Request()->getParam('sFilterDate'));
-        $filterAuthor = urldecode($this->Request()->getParam('sFilterAuthor'));
-        $filterTags = urldecode($this->Request()->getParam('sFilterTags'));
+        $filterDate = urldecode($this->Request()->getParam('sFilterDate', ''));
+        $filterAuthor = urldecode($this->Request()->getParam('sFilterAuthor', ''));
+        $filterTags = urldecode($this->Request()->getParam('sFilterTags', ''));
 
         // Redirect if blog's category is not a child of the current shop's category
         $shopCategory = $this->get('shop')->getCategory();
@@ -182,7 +187,7 @@ public function indexAction()
         $totalResult = $paginator->count();
 
         // Returns the blog article data
-        $blogArticles = $paginator->getIterator()->getArrayCopy();
+        $blogArticles = iterator_to_array($paginator);
 
         $blogArticles = $this->translateBlogArticles($blogArticles);
 
@@ -236,11 +241,13 @@ public function indexAction()
 
         // Make sure the category exists and is a blog category
         if (empty($categoryContent) || !$categoryContent['blog']) {
-            throw new Enlight_Controller_Exception(sprintf('Blog category by id "%d" is invalid', $categoryId), 404);
+            throw new Enlight_Controller_Exception(\sprintf('Blog category by id "%d" is invalid', $categoryId), 404);
         }
 
         if (!empty($categoryContent['external'])) {
-            return $this->redirect($categoryContent['external'], ['code' => 301]);
+            $this->redirect($categoryContent['external'], ['code' => 301]);
+
+            return;
         }
 
         $assigningData = [
@@ -273,6 +280,8 @@ public function indexAction()
      * Contains the logic for the detail page of a blog article
      *
      * @throws Enlight_Controller_Exception
+     *
+     * @return void
      */
     public function detailAction()
     {
@@ -291,7 +300,7 @@ public function detailAction()
 
         // Redirect if the blog item is not available
         if (empty($blogArticleData) || empty($blogArticleData['active'])) {
-            throw new Enlight_Controller_Exception(sprintf('Blog article with id %d not found or inactive', $blogArticleId), 404);
+            throw new Enlight_Controller_Exception(\sprintf('Blog article with id %d not found or inactive', $blogArticleId), 404);
         }
 
         // Redirect if category is not available, inactive or external
@@ -309,7 +318,9 @@ public function detailAction()
         }
 
         if (isset($location)) {
-            return $this->redirect($location, ['code' => 301]);
+            $this->redirect($location, ['code' => 301]);
+
+            return;
         }
 
         // Load the right template
@@ -320,11 +331,13 @@ public function detailAction()
         $this->View()->assign('userLoggedIn', !empty(Shopware()->Session()->get('sUserId')));
         if (!empty(Shopware()->Session()->get('sUserId')) && empty($this->Request()->get('name'))
             && $this->Request()->getParam('__cache') === null) {
-            $userData = Shopware()->Modules()->Admin()->sGetUserData();
-            $this->View()->assign('sFormData', [
-                'eMail' => $userData['additional']['user']['email'],
-                'name' => $userData['billingaddress']['firstname'] . ' ' . $userData['billingaddress']['lastname'],
-            ]);
+            $customerData = Shopware()->Modules()->Admin()->sGetUserData();
+            if (\is_array($customerData)) {
+                $this->View()->assign('sFormData', [
+                    'eMail' => $customerData['additional']['user']['email'],
+                    'name' => $customerData['billingaddress']['firstname'] . ' ' . $customerData['billingaddress']['lastname'],
+                ]);
+            }
         }
 
         $mediaIds = array_column($blogArticleData['media'], 'mediaId');
@@ -355,7 +368,7 @@ public function detailAction()
 
         // Generate breadcrumb
         $breadcrumb = $this->getCategoryBreadcrumb($blogArticleData['categoryId']);
-        $blogDetailLink = $this->Front()->Router()->assemble([
+        $blogDetailLink = $this->Front()->ensureRouter()->assemble([
             'sViewport' => 'blog', 'sCategory' => $blogArticleData['categoryId'],
             'action' => 'detail', 'blogArticle' => $blogArticleId,
         ]);
@@ -374,12 +387,13 @@ public function detailAction()
      * Rating action method
      *
      * Save and review the blog comment and rating
+     *
+     * @return void
      */
     public function ratingAction()
     {
         $blogArticleId = (int) $this->Request()->getParam('blogArticle');
-        /** @var bool|array $sErrorFlag */
-        $sErrorFlag = null;
+        $sErrorFlag = [];
 
         if (!empty($blogArticleId)) {
             $blogArticleQuery = $this->getRepository()->getDetailQuery($blogArticleId, $this->get('shop')->getId());
@@ -401,13 +415,15 @@ public function ratingAction()
 
                     $this->sSaveComment($commentData, $blogArticleId);
 
-                    return $this->forward('detail');
+                    $this->forward('detail');
+
+                    return;
                 }
                 $sErrorFlag['invalidHash'] = true;
             }
 
             // Validation only occurs when entering data, but not on failed Double-Opt-In
-            if (!$sErrorFlag['invalidHash']) {
+            if (!($sErrorFlag['invalidHash'] ?? false)) {
                 if (empty($this->Request()->name)) {
                     $sErrorFlag['name'] = true;
                 }
@@ -451,14 +467,14 @@ public function ratingAction()
                     $this->get('models')->persist($blogCommentModel);
                     $this->get('models')->flush();
 
-                    $link = $this->Front()->Router()->assemble(['sViewport' => 'blog', 'action' => 'rating', 'blogArticle' => $blogArticleId, 'sConfirmation' => $hash]);
+                    $link = $this->Front()->ensureRouter()->assemble(['sViewport' => 'blog', 'action' => 'rating', 'blogArticle' => $blogArticleId, 'sConfirmation' => $hash]);
 
                     $context = ['sConfirmLink' => $link, 'sArticle' => ['title' => $blogArticleData['title']]];
                     $mail = Shopware()->TemplateMail()->createMail('sOPTINBLOGCOMMENT', $context);
                     $mail->addTo($this->Request()->getParam('eMail'));
                     $mail->send();
                 } else {
-                    //Save comment
+                    // Save comment
                     $commentData = $this->Request()->getPost();
                     $this->sSaveComment($commentData, $blogArticleId);
                 }
@@ -483,7 +499,7 @@ public function ratingAction()
      */
     public function getDateFilterData($blogCategoryIds, $selectedFilters, $shopId = null)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         // Date filter query
         $dateFilterData = $this->repository
@@ -506,7 +522,7 @@ public function getDateFilterData($blogCategoryIds, $selectedFilters, $shopId =
      */
     public function getAuthorFilterData($blogCategoryIds, $filter, $shopId = null)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         // Date filter query
         $filterData = $this->repository
@@ -529,7 +545,7 @@ public function getAuthorFilterData($blogCategoryIds, $filter, $shopId = null)
      */
     public function getTagsFilterData($blogCategoryIds, $filter, $shopId = null)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         // Date filter query
         $filterData = $this->repository
@@ -550,7 +566,7 @@ public function getTagsFilterData($blogCategoryIds, $filter, $shopId = null)
      */
     public function getCategoryBreadcrumb($categoryId)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.8.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         return array_reverse(Shopware()->Modules()->Categories()->sGetCategoriesByParent($categoryId));
     }
@@ -562,6 +578,8 @@ public function getCategoryBreadcrumb($categoryId)
      * @param int   $blogArticleId
      *
      * @throws Enlight_Exception
+     *
+     * @return void
      */
     protected function sSaveComment($commentData, $blogArticleId)
     {
@@ -627,19 +645,19 @@ protected function getPagerData($totalResult, $limitEnd, $page, $categoryId, arr
                 $userParams['sPage'] = $i;
 
                 $pages['numbers'][$i]['value'] = $i;
-                $pages['numbers'][$i]['link'] = $this->Front()->Router()->assemble($userParams);
+                $pages['numbers'][$i]['link'] = $this->Front()->ensureRouter()->assemble($userParams);
             }
             // Previous page
             if ($page !== 1) {
                 $userParams['sPage'] = $page - 1;
-                $pages['previous'] = $this->Front()->Router()->assemble($userParams);
+                $pages['previous'] = $this->Front()->ensureRouter()->assemble($userParams);
             } else {
                 $pages['previous'] = null;
             }
             // Next page
             if ($page !== $numberPages) {
                 $userParams['sPage'] = $page + 1;
-                $pages['next'] = $this->Front()->Router()->assemble($userParams);
+                $pages['next'] = $this->Front()->ensureRouter()->assemble($userParams);
             } else {
                 $pages['next'] = null;
             }
@@ -651,9 +669,12 @@ protected function getPagerData($totalResult, $limitEnd, $page, $categoryId, arr
     /**
      * Helper method to fill the data set with the right category link
      *
-     * @param string $requestParameterName
-     * @param string $requestParameterValue
-     * @param bool   $addRemoveProperty     | true to add a remove property to remove the selected filters
+     * @param array<array<string, mixed>> $filterData
+     * @param string                      $requestParameterName
+     * @param string                      $requestParameterValue
+     * @param bool                        $addRemoveProperty     | true to add a remove property to remove the selected filters
+     *
+     * @return array<array<string, mixed>>
      */
     protected function addLinksToFilter(array $filterData, $requestParameterName, $requestParameterValue, $addRemoveProperty = true)
     {
diff --git a/engine/Shopware/Controllers/Frontend/Campaign.php b/engine/Shopware/Controllers/Frontend/Campaign.php
index a7ceb55df30..87d343f74a1 100644
--- a/engine/Shopware/Controllers/Frontend/Campaign.php
+++ b/engine/Shopware/Controllers/Frontend/Campaign.php
@@ -1,39 +1,41 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface;
+
 class Shopware_Controllers_Frontend_Campaign extends Enlight_Controller_Action
 {
     /**
      * Renders a shopping world as a landingpage.
      *
-     * @throws \Exception
-     * @throws \Enlight_Controller_Exception
+     * @throws Exception
+     * @throws Enlight_Controller_Exception
      */
     public function indexAction()
     {
         $emotionId = (int) $this->Request()->getParam('emotionId');
-        $shopContext = $this->get(\Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface::class)->getShopContext();
+        $shopContext = $this->get(ContextServiceInterface::class)->getShopContext();
 
         $result = $this->get('shopware.emotion.emotion_landingpage_loader')->load(
             $emotionId,
diff --git a/engine/Shopware/Controllers/Frontend/Checkout.php b/engine/Shopware/Controllers/Frontend/Checkout.php
index 348cbe4f82d..c9b7f8824a3 100644
--- a/engine/Shopware/Controllers/Frontend/Checkout.php
+++ b/engine/Shopware/Controllers/Frontend/Checkout.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\DBAL\Connection;
@@ -39,13 +38,16 @@
 use Shopware\Components\Cart\TaxAggregatorInterface;
 use Shopware\Components\CSRFGetProtectionAware;
 use Shopware\Components\Model\ModelManager;
+use Shopware\Models\Country\Country;
 use Shopware\Models\Customer\Address;
+use Shopware\Models\Customer\Customer;
 use Shopware\Models\Shop\Currency;
 use ShopwarePlugin\PaymentMethods\Components\BasePaymentMethod;
 use Symfony\Component\HttpFoundation\Request as SymfonyRequest;
 
 /**
- * @phpstan-type CheckoutBasketArray array{content?: array<string, mixed>, Amount?: string, AmountNet?: string, Quantity?: int, AmountNumeric: float, AmountNetNumeric: float, AmountWithTax?: string, AmountWithTaxNumeric?: float, sCurrencyId: int, sCurrencyName: string, sCurrencyFactor: float, sShippingcosts: float, sShippingcostsTax: float|null, sShippingcostsTaxProportional?: array<\Shopware\Components\Cart\Struct\Price>, sShippingcostsNet: float, sShippingcostsWithTax: float, sShippingcostsDifference: float|null, sTaxRates: array<string, float>, sAmount: float, sAmountTax: float, sAmountWithTax?: float}
+ * @phpstan-type CheckoutBasketArray array{content?: array<string, mixed>, Amount?: string, AmountNet?: string, Quantity?: int, AmountNumeric: float, AmountNetNumeric: float, AmountWithTax?: string, AmountWithTaxNumeric?: float, sCurrencyId: int, sCurrencyName: string, sCurrencyFactor: float, sShippingcosts: float, sShippingcostsTax: float|null, sShippingcostsTaxProportional?: array<\Shopware\Components\Cart\Struct\Price>, sShippingcostsNet: float, sShippingcostsWithTax: float, sShippingcostsDifference?: float|null, sTaxRates: array<string, float>, sAmount: float, sAmountTax: float, sAmountWithTax?: float}
+ *
  * @phpstan-import-type ShippingCostArray from \sAdmin
  */
 class Shopware_Controllers_Frontend_Checkout extends Enlight_Controller_Action implements CSRFGetProtectionAware
@@ -77,6 +79,8 @@ class Shopware_Controllers_Frontend_Checkout extends Enlight_Controller_Action i
      * Init method that get called automatically
      *
      * Set class properties
+     *
+     * @return void
      */
     public function init()
     {
@@ -86,9 +90,6 @@ public function init()
         $this->taxAggregator = Shopware()->Container()->get(TaxAggregatorInterface::class);
     }
 
-    /**
-     * @return array
-     */
     public function getCSRFProtectedActions()
     {
         return [
@@ -105,9 +106,6 @@ public function getCSRFProtectedActions()
         ];
     }
 
-    /**
-     * Pre dispatch method
-     */
     public function preDispatch()
     {
         $events = Shopware()->Container()->get('events');
@@ -123,6 +121,8 @@ public function preDispatch()
      * @deprecated in 5.6, will be protected in 5.8
      *
      * Called if the sAdmin resets the selected customer payment to the shop preset
+     *
+     * @return void
      */
     public function flagPaymentBlocked()
     {
@@ -150,6 +150,8 @@ public function postDispatch()
 
     /**
      * Forward to cart or confirm action depending on user state
+     *
+     * @return void
      */
     public function indexAction()
     {
@@ -163,9 +165,12 @@ public function indexAction()
     /**
      * Read all data from objects / models that are required in cart view
      * (User-Data / Payment-Data / Basket-Data etc.)
+     *
+     * @return void
      */
     public function cartAction()
     {
+        $accountMode = (int) ($this->View()->getAssign('sUserData')['additional']['user']['accountmode'] ?? Customer::ACCOUNT_MODE_CUSTOMER);
         $country = $this->getSelectedCountry();
         $this->View()->assign('sCountry', $country);
         $this->View()->assign('sPayment', $this->getSelectedPayment());
@@ -173,7 +178,7 @@ public function cartAction()
         $this->View()->assign('sCountryList', $this->getCountryList());
         $this->View()->assign('sPayments', $this->getPayments());
         $this->View()->assign('sDispatches', $this->getDispatches());
-        $this->View()->assign('sDispatchNoOrder', (int) $this->View()->getAssign('sUserData')['additional']['user']['accountmode'] === 0 && $this->getDispatchNoOrder());
+        $this->View()->assign('sDispatchNoOrder', $accountMode === Customer::ACCOUNT_MODE_CUSTOMER && $this->getDispatchNoOrder());
         $this->View()->assign('sState', $this->getSelectedState());
 
         $this->View()->assign('sUserData', $this->getUserData());
@@ -181,9 +186,9 @@ public function cartAction()
         $this->View()->assign('sInvalidCartItems', $this->getInvalidProducts($this->View()->getAssign('sBasket')));
 
         $this->View()->assign(CheckoutKey::SHIPPING_COSTS, $this->View()->getAssign('sBasket')[CheckoutKey::SHIPPING_COSTS]);
-        $this->View()->assign(CheckoutKey::SHIPPING_COSTS_DIFFERENCE, $this->View()->getAssign('sBasket')[CheckoutKey::SHIPPING_COSTS_DIFFERENCE]);
+        $this->View()->assign(CheckoutKey::SHIPPING_COSTS_DIFFERENCE, $this->View()->getAssign('sBasket')[CheckoutKey::SHIPPING_COSTS_DIFFERENCE] ?? null);
         $this->View()->assign(CheckoutKey::AMOUNT, $this->View()->getAssign('sBasket')[CheckoutKey::AMOUNT]);
-        $this->View()->assign(CheckoutKey::AMOUNT_WITH_TAX, $this->View()->getAssign('sBasket')[CheckoutKey::AMOUNT_WITH_TAX]);
+        $this->View()->assign(CheckoutKey::AMOUNT_WITH_TAX, $this->View()->getAssign('sBasket')[CheckoutKey::AMOUNT_WITH_TAX] ?? 0.0);
         $this->View()->assign(CheckoutKey::AMOUNT_TAX, $this->View()->getAssign('sBasket')[CheckoutKey::AMOUNT_TAX]);
         $this->View()->assign('sAmountNet', $this->View()->getAssign('sBasket')[CartKey::AMOUNT_NET_NUMERIC]);
 
@@ -213,7 +218,7 @@ public function cartAction()
      */
     public function confirmAction()
     {
-        if (empty($this->View()->sUserLoggedIn)) {
+        if (empty($this->View()->getAssign('sUserLoggedIn'))) {
             $this->forward(
                 'login',
                 'account',
@@ -255,9 +260,9 @@ public function confirmAction()
 
         $this->View()->assign('sLaststock', $this->basket->sCheckBasketQuantities());
         $this->View()->assign(CheckoutKey::SHIPPING_COSTS, $this->View()->getAssign('sBasket')[CheckoutKey::SHIPPING_COSTS]);
-        $this->View()->assign(CheckoutKey::SHIPPING_COSTS_DIFFERENCE, $this->View()->getAssign('sBasket')[CheckoutKey::SHIPPING_COSTS_DIFFERENCE]);
+        $this->View()->assign(CheckoutKey::SHIPPING_COSTS_DIFFERENCE, $this->View()->getAssign('sBasket')[CheckoutKey::SHIPPING_COSTS_DIFFERENCE] ?? null);
         $this->View()->assign(CheckoutKey::AMOUNT, $this->View()->getAssign('sBasket')[CheckoutKey::AMOUNT]);
-        $this->View()->assign(CheckoutKey::AMOUNT_WITH_TAX, $this->View()->getAssign('sBasket')[CheckoutKey::AMOUNT_WITH_TAX]);
+        $this->View()->assign(CheckoutKey::AMOUNT_WITH_TAX, $this->View()->getAssign('sBasket')[CheckoutKey::AMOUNT_WITH_TAX] ?? 0.0);
         $this->View()->assign(CheckoutKey::AMOUNT_TAX, $this->View()->getAssign('sBasket')[CheckoutKey::AMOUNT_TAX]);
         $this->View()->assign('sAmountNet', $this->View()->getAssign('sBasket')[CartKey::AMOUNT_NET_NUMERIC]);
 
@@ -278,9 +283,10 @@ public function confirmAction()
             return;
         }
 
+        $normalizer = $this->container->get('shopware.components.cart.proportional_cart_normalizer');
         $sOrderVariables = $this->View()->getAssign();
         $sOrderVariables['sBasketView'] = $sOrderVariables['sBasket'];
-        $sOrderVariables['sBasket'] = $this->getBasket(false);
+        $sOrderVariables['sBasket'] = $normalizer->normalize($sOrderVariables['sBasketView']);
 
         $this->session['sOrderVariables'] = new ArrayObject($sOrderVariables, ArrayObject::ARRAY_AS_PROPS);
 
@@ -336,13 +342,14 @@ public function confirmAction()
 
         $this->View()->assign('invalidBillingAddress', !$this->isValidAddress($activeBillingAddressId, $activeShippingAddressId === $activeBillingAddressId));
         $this->View()->assign('invalidShippingAddress', !$this->isValidAddress($activeShippingAddressId, true));
-        $this->View()->assign('sBasket', $this->getBasket());
     }
 
     /**
      * Called from confirmAction View
      * Customers requests to finish current order
      * Check if all conditions match and save order
+     *
+     * @return void
      */
     public function finishAction()
     {
@@ -357,7 +364,9 @@ public function finishAction()
 
             if (empty($order)) {
                 if ($this->Request()->isGet()) {
-                    return $this->forward('confirm');
+                    $this->forward('confirm');
+
+                    return;
                 }
             } else {
                 $this->View()->assign($order);
@@ -383,12 +392,16 @@ public function finishAction()
         }
 
         if (empty($this->session['sOrderVariables']) || $this->getMinimumCharge() || $this->getEsdNote() || $this->getDispatchNoOrder() || $this->View()->getAssign('sInvalidCartItems')) {
-            return $this->forward('confirm');
+            $this->forward('confirm');
+
+            return;
         }
 
         $checkQuantities = $this->basket->sCheckBasketQuantities();
         if (!empty($checkQuantities['hideBasket'])) {
-            return $this->forward('confirm');
+            $this->forward('confirm');
+
+            return;
         }
 
         $orderVariables = $this->session['sOrderVariables']->getArrayCopy();
@@ -428,18 +441,20 @@ public function finishAction()
         if (!empty($agreements)) {
             $this->View()->assign('sAGBError', \array_key_exists('agbError', $agreements));
 
-            return $this->forward(
+            $this->forward(
                 'confirm',
                 null,
                 null,
                 ['agreementErrors' => $agreements]
             );
+
+            return;
         }
 
         if (!$this->basket->validateVoucher($this->session['sessionId'], $this->session['sUserId'])) {
             $namespace = $this->container->get('snippets')->getNamespace('frontend/basket/internalMessages');
 
-            return $this->forward(
+            $this->forward(
                 'confirm',
                 null,
                 null,
@@ -447,34 +462,38 @@ public function finishAction()
                     $namespace->get('VoucherFailureAlreadyUsed', 'This voucher was used in an previous order'),
                 ]]
             );
+
+            return;
         }
 
-        if (empty($activeBillingAddressId = $this->session->offsetGet('checkoutBillingAddressId'))) {
+        $activeBillingAddressId = $this->session->offsetGet('checkoutBillingAddressId');
+        if (empty($activeBillingAddressId)) {
             $activeBillingAddressId = $this->View()->getAssign('sUserData')['additional']['user']['default_billing_address_id'];
         }
 
-        if (empty($activeShippingAddressId = $this->session->offsetGet('checkoutShippingAddressId'))) {
+        $activeShippingAddressId = $this->session->offsetGet('checkoutShippingAddressId');
+        if (empty($activeShippingAddressId)) {
             $activeShippingAddressId = $this->View()->getAssign('sUserData')['additional']['user']['default_shipping_address_id'];
         }
 
         $activeBillingAddressId = (int) $activeBillingAddressId;
         $activeShippingAddressId = (int) $activeShippingAddressId;
 
-        if (!$this->isValidAddress($activeBillingAddressId, false) || !$this->isValidAddress($activeShippingAddressId, true)) {
+        if (!$this->isValidAddress($activeBillingAddressId) || !$this->isValidAddress($activeShippingAddressId, true)) {
             $this->forward('confirm');
 
             return;
         }
 
-        if (!empty($this->session['sNewsletter'])) {
-            $this->admin->sUpdateNewsletter(true, $this->admin->sGetUserMailById(), true);
-        }
+        $this->updateNewsletter();
 
         if ($this->Request()->isGet()) {
-            return $this->forward('confirm');
+            $this->forward('confirm');
+
+            return;
         }
 
-        $this->updateCurrencyDependencies($basket[CheckoutKey::CURRENCY_ID]);
+        $this->updateCurrencyDependencies((int) $basket[CheckoutKey::CURRENCY_ID]);
 
         $this->saveOrder();
         $this->saveDefaultAddresses();
@@ -500,6 +519,8 @@ public function finishAction()
      * Used during the checkout process
      * Returns the user to the shop homepage
      * If the user has a noAccount account, it is automatically logged out
+     *
+     * @return void
      */
     public function returnAction()
     {
@@ -508,12 +529,14 @@ public function returnAction()
             Shopware()->Modules()->Basket()->sRefreshBasket();
         }
 
-        return $this->redirect(['controller' => 'index']);
+        $this->redirect(['controller' => 'index']);
     }
 
     /**
      * If any external payment mean chooses by customer
      * Forward to payment page after order submitting
+     *
+     * @return void
      */
     public function paymentAction()
     {
@@ -521,7 +544,9 @@ public function paymentAction()
                 || $this->getMinimumCharge()
                 || $this->getEsdNote()
                 || $this->getDispatchNoOrder()) {
-            return $this->forward('confirm');
+            $this->forward('confirm');
+
+            return;
         }
 
         if ($this->Request()->getParam('sNewsletter') !== null) {
@@ -538,25 +563,27 @@ public function paymentAction()
         if (!empty($agreements)) {
             $this->View()->assign('sAGBError', \array_key_exists('agbError', $agreements));
 
-            return $this->forward(
+            $this->forward(
                 'confirm',
                 null,
                 null,
                 ['agreementErrors' => $agreements]
             );
+
+            return;
         }
 
         $this->View()->assign('sAGBError', false);
 
         if (empty($this->View()->getAssign('sPayment')['embediframe'])
                 && empty($this->View()->getAssign('sPayment')['action'])) {
-            return $this->forward('confirm');
-        }
+            $this->forward('confirm');
 
-        if (!empty($this->session['sNewsletter'])) {
-            $this->admin->sUpdateNewsletter(true, $this->admin->sGetUserMailById(), true);
+            return;
         }
 
+        $this->updateNewsletter();
+
         if (!empty($this->View()->getAssign('sPayment')['embediframe'])) {
             $embedded = $this->View()->getAssign('sPayment')['embediframe'];
             $embedded = preg_replace('#^[./]+#', '', $embedded);
@@ -580,20 +607,27 @@ public function paymentAction()
      * request param "sQuantity" = quantity
      *
      * @throws LogicException
+     *
+     * @return void
      */
     public function addArticleAction()
     {
         $this->validatePostMethod();
 
-        $ordernumber = trim($this->Request()->getParam('sAdd'));
+        $orderNumber = trim($this->Request()->getParam('sAdd'));
         $quantity = (int) $this->Request()->getParam('sQuantity');
-        $productId = Shopware()->Modules()->Articles()->sGetArticleIdByOrderNumber($ordernumber);
+        $productId = Shopware()->Modules()->Articles()->sGetArticleIdByOrderNumber($orderNumber);
+        $instockInfo = $this->getInstockInfo($orderNumber, $quantity);
+
+        $this->View()->assign('sBasketInfo', $instockInfo);
 
-        $this->View()->assign('sBasketInfo', $this->getInstockInfo($ordernumber, $quantity));
+        if ($instockInfo !== null) {
+            $this->session->offsetSet('sErrorMessages', $instockInfo);
+        }
 
         if (!empty($productId)) {
-            $insertId = $this->basket->sAddArticle($ordernumber, $quantity);
-            $this->View()->assign('sArticleName', Shopware()->Modules()->Articles()->sGetArticleNameByOrderNumber($ordernumber));
+            $insertId = $this->basket->sAddArticle($orderNumber, $quantity);
+            $this->View()->assign('sArticleName', Shopware()->Modules()->Articles()->sGetArticleNameByOrderNumber($orderNumber));
             if (!empty($insertId)) {
                 $basket = $this->getBasket();
                 foreach ($basket[CartKey::POSITIONS] ?? [] as $item) {
@@ -635,6 +669,8 @@ public function addArticleAction()
      *
      * request param "sAddAccessories" = List of product order numbers separated by ;
      * request param "sAddAccessoriesQuantity" = List of product quantities separated by ;
+     *
+     * @return void
      */
     public function addAccessoriesAction()
     {
@@ -651,6 +687,8 @@ public function addAccessoriesAction()
      *
      * request param "sDelete" = id from s_basket identifying the product to delete
      * Forward to cart / confirmation page after success
+     *
+     * @return void
      */
     public function deleteArticleAction()
     {
@@ -666,6 +704,8 @@ public function deleteArticleAction()
      * request param "sArticle" = The product to update
      * request param "sQuantity" = new quantity
      * Forward to cart / confirm view after success
+     *
+     * @return void
      */
     public function changeQuantityAction()
     {
@@ -680,6 +720,8 @@ public function changeQuantityAction()
      *
      * At failure view variable sVoucherError will give further information
      * At success return to cart / confirm view
+     *
+     * @return void
      */
     public function addVoucherAction()
     {
@@ -697,6 +739,8 @@ public function addVoucherAction()
      *
      * request param "sAddPremium" - ordernumber of bonus product (defined in s_articles_premiums)
      * Return to cart / confirm page on success
+     *
+     * @return void
      */
     public function addPremiumAction()
     {
@@ -710,7 +754,7 @@ public function addPremiumAction()
                     )
                 );
             } else {
-                $this->basket->sSYSTEM->_GET['sAddPremium'] = $this->Request()->getParam('sAddPremium');
+                $this->front->ensureRequest()->setQuery('sAddPremium', $this->Request()->getParam('sAddPremium'));
                 $this->basket->sInsertPremium();
             }
         }
@@ -723,10 +767,13 @@ public function addPremiumAction()
     /**
      * On any change on country, payment or dispatch recalculate shipping costs
      * and forward to cart / confirm view
+     *
+     * @return void
      */
     public function calculateShippingCostsAction()
     {
-        if ($countryId = $this->Request()->getPost('sCountry')) {
+        $countryId = $this->Request()->getPost('sCountry');
+        if ($countryId) {
             if (!$this->isShippingAllowed((int) $countryId)) {
                 $this->View()->assign('countryNotAllowedForShipping', true);
             }
@@ -761,21 +808,27 @@ public function calculateShippingCostsAction()
 
     /**
      * Action to handle selection of shipping and payment methods
+     *
+     * @return void
      */
     public function shippingPaymentAction()
     {
         if (empty($this->View()->sUserLoggedIn)) {
-            return $this->forward(
+            $this->forward(
                 'login',
                 'account',
                 null,
                 ['sTarget' => 'checkout', 'sTargetAction' => 'shippingPayment', 'showNoAccount' => true]
             );
+
+            return;
         }
 
         // Redirect if basket is empty
         if (!\array_key_exists(CartKey::POSITIONS, $this->getBasket())) {
-            return $this->redirect(['controller' => 'checkout', 'action' => 'cart']);
+            $this->redirect(['controller' => 'checkout', 'action' => 'cart']);
+
+            return;
         }
 
         // Load payment options, select option and details
@@ -801,33 +854,37 @@ public function shippingPaymentAction()
         $this->View()->assign('sDispatch', $this->getSelectedDispatch());
         $this->View()->assign('sDispatches', $this->getDispatches($this->View()->getAssign('sFormData')['payment']));
 
-        // We might change the shop context here so we need to initialize it again
+        // We might change the shop context here, so we need to initialize it again
         $this->get(ContextServiceInterface::class)->initializeShopContext();
 
         $this->View()->assign('sBasket', $this->getBasket());
 
         $this->View()->assign('sLaststock', $this->basket->sCheckBasketQuantities());
         $this->View()->assign(CheckoutKey::SHIPPING_COSTS, $this->View()->getAssign('sBasket')[CheckoutKey::SHIPPING_COSTS]);
-        $this->View()->assign(CheckoutKey::SHIPPING_COSTS_DIFFERENCE, $this->View()->getAssign('sBasket')[CheckoutKey::SHIPPING_COSTS_DIFFERENCE]);
+        $this->View()->assign(CheckoutKey::SHIPPING_COSTS_DIFFERENCE, $this->View()->getAssign('sBasket')[CheckoutKey::SHIPPING_COSTS_DIFFERENCE] ?? null);
         $this->View()->assign(CheckoutKey::AMOUNT, $this->View()->getAssign('sBasket')[CheckoutKey::AMOUNT]);
-        $this->View()->assign(CheckoutKey::AMOUNT_WITH_TAX, $this->View()->getAssign('sBasket')[CheckoutKey::AMOUNT_WITH_TAX]);
+        $this->View()->assign(CheckoutKey::AMOUNT_WITH_TAX, $this->View()->getAssign('sBasket')[CheckoutKey::AMOUNT_WITH_TAX] ?? 0.0);
         $this->View()->assign(CheckoutKey::AMOUNT_TAX, $this->View()->getAssign('sBasket')[CheckoutKey::AMOUNT_TAX]);
         $this->View()->assign('sAmountNet', $this->View()->getAssign('sBasket')[CartKey::AMOUNT_NET_NUMERIC]);
         $this->View()->assign('sRegisterFinished', !empty($this->session['sRegisterFinished']));
         $this->View()->assign('sTargetAction', 'shippingPayment');
 
         if ($this->Request()->getParam('isXHR')) {
-            return $this->View()->loadTemplate('frontend/checkout/shipping_payment_core.tpl');
+            $this->View()->loadTemplate('frontend/checkout/shipping_payment_core.tpl');
         }
     }
 
     /**
      * Action to simultaneously save shipping and payment details
+     *
+     * @return void
      */
     public function saveShippingPaymentAction()
     {
         if (!$this->Request()->isPost()) {
-            return $this->forward('shippingPayment');
+            $this->forward('shippingPayment');
+
+            return;
         }
 
         // Load data from request
@@ -840,7 +897,9 @@ public function saveShippingPaymentAction()
             $this->admin->sUpdatePayment($payment);
             $this->setDispatch($dispatch, $payment);
 
-            return $this->forward('shippingPayment');
+            $this->forward('shippingPayment');
+
+            return;
         }
 
         $sErrorFlag = [];
@@ -864,11 +923,13 @@ public function saveShippingPaymentAction()
             $this->View()->assign('sErrorFlag', $sErrorFlag);
             $this->View()->assign('sErrorMessages', $sErrorMessages);
 
-            return $this->forward('shippingPayment');
+            $this->forward('shippingPayment');
+
+            return;
         }
 
         // Validate the payment details
-        Shopware()->Modules()->Admin()->sSYSTEM->_POST['sPayment'] = $payment;
+        $this->front->ensureRequest()->setPost('sPayment', $payment);
         $checkData = $this->admin->sValidateStep3();
 
         // Problem with the payment details, return error
@@ -876,7 +937,9 @@ public function saveShippingPaymentAction()
             $this->View()->assign('sErrorFlag', $checkData['checkPayment']['sErrorFlag']);
             $this->View()->assign('sErrorMessages', $checkData['checkPayment']['sErrorMessages']);
 
-            return $this->forward('shippingPayment');
+            $this->forward('shippingPayment');
+
+            return;
         }
 
         // Save payment method details to db
@@ -885,8 +948,11 @@ public function saveShippingPaymentAction()
         }
 
         // Save the payment info
-        $previousPayment = Shopware()->Modules()->Admin()->sGetUserData();
-        $previousPayment = $previousPayment['additional']['user']['paymentID'];
+        $customerData = Shopware()->Modules()->Admin()->sGetUserData();
+        if (!\is_array($customerData)) {
+            throw new RuntimeException('Could not get customer data');
+        }
+        $previousPayment = $customerData['additional']['user']['paymentID'];
 
         $previousPayment = $this->admin->sGetPaymentMeanById($previousPayment);
         if ($previousPayment['paymentTable']) {
@@ -911,36 +977,39 @@ public function saveShippingPaymentAction()
      *
      * Get complete user-data as an array to use in view
      *
-     * @return array
+     * @return array<string, mixed>
      */
     public function getUserData()
     {
         $system = Shopware()->System();
-        $userData = $this->admin->sGetUserData();
-        if (!empty($userData['additional']['countryShipping'])) {
+        $customerData = $this->admin->sGetUserData();
+        if (!\is_array($customerData)) {
+            throw new RuntimeException('Could not get customer data');
+        }
+        if (!empty($customerData['additional']['countryShipping'])) {
             $system->sUSERGROUPDATA = Shopware()->Db()->fetchRow('
                 SELECT * FROM s_core_customergroups
                 WHERE groupkey = ?
             ', [$system->sUSERGROUP]);
 
-            $taxFree = $this->isTaxFreeDelivery($userData);
+            $taxFree = $this->isTaxFreeDelivery($customerData);
             $this->session->offsetSet('taxFree', $taxFree);
 
             if ($taxFree) {
                 $system->sUSERGROUPDATA['tax'] = 0;
-                $system->sCONFIG['sARTICLESOUTPUTNETTO'] = 1; //Old template
+                $system->sCONFIG['sARTICLESOUTPUTNETTO'] = 1; // Old template
                 Shopware()->Session()->set('sUserGroupData', $system->sUSERGROUPDATA);
-                $userData['additional']['charge_vat'] = false;
-                $userData['additional']['show_net'] = false;
+                $customerData['additional']['charge_vat'] = false;
+                $customerData['additional']['show_net'] = false;
                 Shopware()->Session()->set('sOutputNet', true);
             } else {
-                $userData['additional']['charge_vat'] = true;
-                $userData['additional']['show_net'] = !empty($system->sUSERGROUPDATA['tax']);
+                $customerData['additional']['charge_vat'] = true;
+                $customerData['additional']['show_net'] = !empty($system->sUSERGROUPDATA['tax']);
                 Shopware()->Session()->set('sOutputNet', empty($system->sUSERGROUPDATA['tax']));
             }
         }
 
-        return $userData;
+        return $customerData;
     }
 
     /**
@@ -948,17 +1017,18 @@ public function getUserData()
      *
      * Create temporary order in s_order_basket on confirm page
      * Used to track failed / aborted orders
+     *
+     * @return void
      */
     public function saveTemporaryOrder()
     {
         $order = Shopware()->Modules()->Order();
 
-        $orgBasketData = $this->View()->getAssign('sBasket');
-        $this->View()->assign('sBasket', $this->getBasket(false));
+        $normalizer = $this->container->get('shopware.components.cart.proportional_cart_normalizer');
 
         $order->sUserData = $this->View()->getAssign('sUserData');
-        $order->sComment = isset($this->session['sComment']) ? $this->session['sComment'] : '';
-        $order->sBasketData = $this->View()->getAssign('sBasket');
+        $order->sComment = $this->session['sComment'] ?? '';
+        $order->sBasketData = $normalizer->normalize($this->View()->getAssign('sBasket'));
         $order->sAmount = $this->View()->getAssign('sBasket')[CheckoutKey::AMOUNT];
         $order->sAmountWithTax = !empty($this->View()->getAssign('sBasket')[CartKey::AMOUNT_WITH_TAX_NUMERIC]) ? $this->View()->getAssign('sBasket')[CartKey::AMOUNT_WITH_TAX_NUMERIC] : $this->View()->getAssign('sBasket')[CartKey::AMOUNT_NUMERIC];
         $order->sAmountNet = $this->View()->getAssign('sBasket')[CartKey::AMOUNT_NET_NUMERIC];
@@ -969,8 +1039,6 @@ public function saveTemporaryOrder()
         $order->sNet = !$this->View()->getAssign('sUserData')['additional']['charge_vat'];
         $order->deviceType = $this->Request()->getDeviceType();
 
-        $this->View()->assign('sBasket', $orgBasketData);
-
         $order->sDeleteTemporaryOrder();    // Delete previous temporary orders
         $order->sCreateTemporaryOrder();    // Create new temporary order
     }
@@ -979,17 +1047,18 @@ public function saveTemporaryOrder()
      * @deprecated in 5.6, will be protected in 5.8
      *
      * Finish order - set some object properties to do this
+     *
+     * @return string|false
      */
     public function saveOrder()
     {
         $order = Shopware()->Modules()->Order();
 
-        $orgBasketData = $this->View()->getAssign('sBasket');
         $normalizer = $this->container->get('shopware.components.cart.proportional_cart_normalizer');
 
         $order->sUserData = $this->View()->getAssign('sUserData');
-        $order->sComment = isset($this->session['sComment']) ? $this->session['sComment'] : '';
-        $order->sBasketData = $normalizer->normalize($orgBasketData);
+        $order->sComment = $this->session['sComment'] ?? '';
+        $order->sBasketData = $normalizer->normalize($this->View()->getAssign('sBasket'));
         $order->sAmount = $this->View()->getAssign('sBasket')[CheckoutKey::AMOUNT];
         $order->sAmountWithTax = !empty($this->View()->getAssign('sBasket')[CartKey::AMOUNT_WITH_TAX_NUMERIC]) ? $this->View()->getAssign('sBasket')[CartKey::AMOUNT_WITH_TAX_NUMERIC] : $this->View()->getAssign('sBasket')[CartKey::AMOUNT_NUMERIC];
         $order->sAmountNet = $this->View()->getAssign('sBasket')[CartKey::AMOUNT_NET_NUMERIC];
@@ -1000,8 +1069,6 @@ public function saveOrder()
         $order->sNet = !$this->View()->getAssign('sUserData')['additional']['charge_vat'];
         $order->deviceType = $this->Request()->getDeviceType();
 
-        $this->View()->assign('sBasket', $orgBasketData);
-
         return $order->sSaveOrder();
     }
 
@@ -1044,7 +1111,9 @@ public function getInstockInfo($orderNumber, $quantity)
                     'Unfortunately we can not deliver the desired product in sufficient quantity',
                     true
                 );
-            } elseif ($inStock['instock'] < $inStock['quantity']) {
+            }
+
+            if ($inStock['instock'] < $inStock['quantity']) {
                 $result = 'Unfortunately we can not deliver the desired product in sufficient quantity. (#0 of #1 in stock).';
                 $result = Shopware()->Snippets()->getNamespace('frontend')->get(
                     'CheckoutArticleLessStock',
@@ -1067,7 +1136,7 @@ public function getInstockInfo($orderNumber, $quantity)
      *
      * @param string $ordernumber
      *
-     * @return array with product id / current basket quantity / instock / laststock
+     * @return array<string, mixed> with product id / current basket quantity / instock / laststock
      */
     public function getAvailableStock($ordernumber)
     {
@@ -1087,12 +1156,11 @@ public function getAvailableStock($ordernumber)
             AND ob.modus=0
             WHERE a.id=ad.articleID
         ';
-        $row = Shopware()->Db()->fetchRow($sql, [
-                $ordernumber,
-                Shopware()->Session()->get('sessionId'),
-            ]);
 
-        return $row;
+        return Shopware()->Db()->fetchRow($sql, [
+            $ordernumber,
+            Shopware()->Session()->get('sessionId'),
+        ]);
     }
 
     /**
@@ -1123,6 +1191,7 @@ public function getShippingCosts()
      * @param bool $mergeProportional
      *
      * @return array<string, mixed>
+     *
      * @phpstan-return CheckoutBasketArray
      */
     public function getBasket($mergeProportional = true)
@@ -1251,18 +1320,19 @@ public function getTaxRates($basket)
      *
      * @param int $articleID
      *
-     * @return array
+     * @return array<array<string, mixed>>
      */
     public function getSimilarShown($articleID)
     {
-        Shopware()->Modules()->Marketing()->sBlacklist = $this->basket->sGetBasketIds();
+        $productIdsInCart = $this->basket->sGetBasketIds();
+        Shopware()->Modules()->Marketing()->sBlacklist = $productIdsInCart ?? [];
 
-        $similarId = Shopware()->Modules()->Marketing()->sGetSimilaryShownArticles($articleID);
+        $similarProducts = Shopware()->Modules()->Marketing()->sGetSimilaryShownArticles($articleID);
 
         $similars = [];
-        if (!empty($similarId)) {
-            foreach ($similarId as $similarID) {
-                $temp = Shopware()->Modules()->Articles()->sGetPromotionById('fix', 0, (int) $similarID['id']);
+        if (!empty($similarProducts)) {
+            foreach ($similarProducts as $similarProduct) {
+                $temp = Shopware()->Modules()->Articles()->sGetPromotionById('fix', 0, (int) $similarProduct['id']);
                 if (!empty($temp)) {
                     $similars[] = $temp;
                 }
@@ -1280,17 +1350,18 @@ public function getSimilarShown($articleID)
      *
      * @param int $articleID
      *
-     * @return array
+     * @return array<array<string, mixed>>
      */
     public function getBoughtToo($articleID)
     {
-        Shopware()->Modules()->Marketing()->sBlacklist = $this->basket->sGetBasketIds();
+        $productIdsInCart = $this->basket->sGetBasketIds();
+        Shopware()->Modules()->Marketing()->sBlacklist = $productIdsInCart ?? [];
 
-        $alsoBoughtId = Shopware()->Modules()->Marketing()->sGetAlsoBoughtArticles($articleID);
+        $alsoBoughtProducts = Shopware()->Modules()->Marketing()->sGetAlsoBoughtArticles($articleID);
         $alsoBoughts = [];
-        if (!empty($alsoBoughtId)) {
-            foreach ($alsoBoughtId as $alsoBoughtItem) {
-                $temp = Shopware()->Modules()->Articles()->sGetPromotionById('fix', 0, (int) $alsoBoughtItem['id']);
+        if (!empty($alsoBoughtProducts)) {
+            foreach ($alsoBoughtProducts as $alsoBoughtProduct) {
+                $temp = Shopware()->Modules()->Articles()->sGetPromotionById('fix', 0, (int) $alsoBoughtProduct['id']);
                 if (!empty($temp)) {
                     $alsoBoughts[] = $temp;
                 }
@@ -1305,7 +1376,7 @@ public function getBoughtToo($articleID)
      *
      * Get configured minimum charge to check in order processing
      *
-     * @return bool
+     * @return float|false
      */
     public function getMinimumCharge()
     {
@@ -1329,7 +1400,7 @@ public function getDispatchNoOrder()
      *
      * Get all premium products that are configured and available for this order
      *
-     * @return array
+     * @return array<array<string, mixed>>
      */
     public function getPremiums()
     {
@@ -1399,7 +1470,7 @@ public function getInquiryLink()
      *
      * Get all countries from database via sAdmin object
      *
-     * @return array list of countries
+     * @return array<int, array<string, mixed>> list of countries
      */
     public function getCountryList()
     {
@@ -1411,7 +1482,9 @@ public function getCountryList()
      *
      * Get all dispatches available in selected country from sAdmin object
      *
-     * @return array|false list of dispatches
+     * @param int|null $paymentId
+     *
+     * @return array<int, array<string, mixed>>|false list of dispatches
      */
     public function getDispatches($paymentId = null)
     {
@@ -1430,7 +1503,7 @@ public function getDispatches($paymentId = null)
      *
      * Returns all available payment methods from sAdmin object
      *
-     * @return array list of payment methods
+     * @return array<array<string, mixed>> list of payment methods
      */
     public function getPayments()
     {
@@ -1473,7 +1546,7 @@ public function getSelectedCountry()
      * Get current selected country - if no country is selected, choose first one from list
      * of available countries
      *
-     * @return array with country information
+     * @return array<string, mixed> with country information
      */
     public function getSelectedState()
     {
@@ -1491,7 +1564,7 @@ public function getSelectedState()
      *
      * Get selected payment or do payment mean selection automatically
      *
-     * @return array|false
+     * @return array<string, mixed>|false
      */
     public function getSelectedPayment()
     {
@@ -1511,7 +1584,7 @@ public function getSelectedPayment()
         $paymentClass = $this->admin->sInitiatePaymentClass($payment);
         if ($payment && $paymentClass instanceof BasePaymentMethod) {
             $data = $paymentClass->getCurrentPaymentDataAsArray(Shopware()->Session()->get('sUserId'));
-            $payment['validation'] = $paymentClass->validate($data);
+            $payment['validation'] = $paymentClass->validate($data ?? []);
             if (!empty($data)) {
                 $payment['data'] = $data;
             }
@@ -1530,10 +1603,10 @@ public function getSelectedPayment()
         $payment = $this->getDefaultPaymentMethod($paymentMethods);
 
         $this->session['sPaymentID'] = (int) $payment['id'];
-        $this->front->Request()->setPost('sPayment', (int) $payment['id']);
+        $this->front->ensureRequest()->setPost('sPayment', (int) $payment['id']);
         $this->admin->sUpdatePayment();
 
-        //if customer logged in and payment switched to fallback, display cart notice. Otherwise anonymous customers will see the message too
+        // if customer logged in and payment switched to fallback, display cart notice. Otherwise anonymous customers will see the message too
         if (Shopware()->Session()->get('sUserId')) {
             $this->flagPaymentBlocked();
         }
@@ -1546,7 +1619,7 @@ public function getSelectedPayment()
      *
      * Get selected dispatch or select a default dispatch
      *
-     * @return bool|array
+     * @return array<string, mixed>|false
      */
     public function getSelectedDispatch()
     {
@@ -1596,9 +1669,9 @@ public function setDispatch($dispatchId, $paymentId = null)
             }
         }
 
-        // If it was not found, we fallback to the default (head of supported)
+        // If it was not found, we fall back to the default (head of supported)
         $defaultDispatch = array_shift($supportedDispatches);
-        $this->session['sDispatch'] = $defaultDispatch['id'];
+        $this->session['sDispatch'] = (int) ($defaultDispatch['id'] ?? 0);
 
         return $this->session['sDispatch'];
     }
@@ -1608,6 +1681,8 @@ public function setDispatch($dispatchId, $paymentId = null)
      *
      * This action will get redirected from the default addArticleAction
      * when the request was an AJAX request.
+     *
+     * @return void
      */
     public function ajaxAddArticleAction()
     {
@@ -1625,7 +1700,7 @@ public function ajaxAddArticleAction()
      *
      * After the product was added to the basket, the whole cart content will be returned.
      *
-     * @throws LogicException
+     * @return void
      */
     public function ajaxAddArticleCartAction()
     {
@@ -1660,6 +1735,8 @@ public function ajaxAddArticleCartAction()
      * This id is expected to get passed by the 'sDelete' parameter.
      *
      * After the product was removed from the basket, the whole cart content will be returned.
+     *
+     * @return void
      */
     public function ajaxDeleteArticleCartAction()
     {
@@ -1680,6 +1757,8 @@ public function ajaxDeleteArticleCartAction()
      * This action loads the cart content and returns it.
      * Its purpose is to return all necessary information in a minimal template
      * for a good performance so e.g. ajax requests are finished more quickly.
+     *
+     * @return void
      */
     public function ajaxCartAction()
     {
@@ -1704,18 +1783,20 @@ public function ajaxCartAction()
         $view->assign(CheckoutKey::SHIPPING_COSTS, $basket[CheckoutKey::SHIPPING_COSTS]);
         $view->assign(CheckoutKey::SHIPPING_COSTS_DIFFERENCE, $basket[CheckoutKey::SHIPPING_COSTS_DIFFERENCE] ?? null);
         $view->assign(CheckoutKey::AMOUNT, $basket[CheckoutKey::AMOUNT]);
-        $view->assign(CheckoutKey::AMOUNT_WITH_TAX, $basket[CheckoutKey::AMOUNT_WITH_TAX] ?? null);
+        $view->assign(CheckoutKey::AMOUNT_WITH_TAX, $basket[CheckoutKey::AMOUNT_WITH_TAX] ?? 0.0);
         $view->assign(CheckoutKey::AMOUNT_TAX, $basket[CheckoutKey::AMOUNT_TAX]);
         $view->assign('sAmountNet', $basket[CartKey::AMOUNT_NET_NUMERIC]);
         $view->assign('sDispatches', $this->getDispatches());
-        $accountMode = (int) $this->View()->getAssign('sUserData')['additional']['user']['accountmode'];
-        $view->assign('sDispatchNoOrder', ($accountMode === 0 && $this->getDispatchNoOrder()));
+        $accountMode = (int) ($this->View()->getAssign('sUserData')['additional']['user']['accountmode'] ?? null);
+        $view->assign('sDispatchNoOrder', $accountMode === 0 && $this->getDispatchNoOrder());
         $view->assign('showShippingCalculation', (bool) $this->Request()->getParam('openShippingCalculations'));
         $view->assign('sMinimumSurcharge', $this->getMinimumCharge());
     }
 
     /**
      * Get current amount from cart via ajax to display in realtime
+     *
+     * @return void
      */
     public function ajaxAmountAction()
     {
@@ -1739,10 +1820,12 @@ public function ajaxAmountAction()
 
     /**
      * Sets a temporary session variable which holds an address for the current order
+     *
+     * @return void
      */
     public function setAddressAction()
     {
-        $this->Front()->Plugins()->ViewRenderer()->setNoRender(true);
+        $this->Front()->Plugins()->ViewRenderer()->setNoRender();
         $target = $this->Request()->getParam('target', 'shipping');
         $sessionKey = $target === 'shipping' ? 'checkoutShippingAddressId' : 'checkoutBillingAddressId';
 
@@ -1757,11 +1840,9 @@ public function setAddressAction()
     /**
      * Validates if the provided customer should get a tax free delivery
      *
-     * @param array $userData
-     *
-     * @return bool
+     * @param array<string, mixed> $userData
      */
-    protected function isTaxFreeDelivery($userData)
+    protected function isTaxFreeDelivery(array $userData): bool
     {
         if (!empty($userData['additional']['countryShipping']['taxfree'])) {
             return true;
@@ -1781,11 +1862,11 @@ protected function isTaxFreeDelivery($userData)
     }
 
     /**
-     * @param array $basket
+     * @param CheckoutBasketArray $basket
      *
-     * @return array
+     * @return array<string, bool>
      */
-    private function getInvalidAgreements($basket, Request $request)
+    private function getInvalidAgreements(array $basket, Request $request): array
     {
         $errors = [];
 
@@ -1812,12 +1893,10 @@ private function getInvalidAgreements($basket, Request $request)
     /**
      * checks if the current user selected an available payment method
      *
-     * @param array $currentPayment
-     * @param array $payments
-     *
-     * @return bool
+     * @param array<string, mixed>        $currentPayment
+     * @param array<array<string, mixed>> $payments
      */
-    private function checkPaymentAvailability($currentPayment, $payments)
+    private function checkPaymentAvailability(array $currentPayment, array $payments): bool
     {
         foreach ($payments as $availablePayment) {
             if ($availablePayment['id'] === $currentPayment['id']) {
@@ -1829,10 +1908,10 @@ private function checkPaymentAvailability($currentPayment, $payments)
     }
 
     /**
-     * @param string|array $accessories
-     * @param array        $quantities
+     * @param string|array<string>      $accessories
+     * @param array<numeric-string|int> $quantities
      */
-    private function addAccessories($accessories, $quantities)
+    private function addAccessories($accessories, array $quantities): void
     {
         if (\is_string($accessories)) {
             $accessories = explode(';', $accessories);
@@ -1856,13 +1935,11 @@ private function addAccessories($accessories, $quantities)
     }
 
     /**
-     * Helper function that checks whether or not the given basket has an esd product in it.
-     *
-     * @param array $basket
+     * Helper function that checks whether the given basket has an esd product in it.
      *
-     * @return bool
+     * @param CheckoutBasketArray $basket
      */
-    private function basketHasEsdProducts($basket)
+    private function basketHasEsdProducts(array $basket): bool
     {
         if (!isset($basket[CartKey::POSITIONS])) {
             return false;
@@ -1879,14 +1956,12 @@ private function basketHasEsdProducts($basket)
 
     /**
      * Helper function that iterates through the basket products.
-     * It checks if an product is a service product by comparing its attributes
+     * It checks if a product is a service product by comparing its attributes
      * with the plugin config serviceAttrField value.
      *
-     * @param array $basket
-     *
-     * @return bool
+     * @param CheckoutBasketArray $basket
      */
-    private function basketHasServiceProducts($basket)
+    private function basketHasServiceProducts(array $basket): bool
     {
         $config = Shopware()->Config();
 
@@ -1902,7 +1977,7 @@ private function basketHasServiceProducts($basket)
         foreach ($basket[CartKey::POSITIONS] as $cartItem) {
             $serviceAttr = $cartItem['additional_details'][$attrName];
 
-            if ($serviceAttr && $serviceAttr != 'false') {
+            if ($serviceAttr && $serviceAttr !== 'false') {
                 return true;
             }
         }
@@ -1912,8 +1987,10 @@ private function basketHasServiceProducts($basket)
 
     /**
      * Helper function that iterates through the basket products.
-     * If checks if the basket has a normal product e.g. not an esd product
+     * It checks if the basket has a normal product e.g. not an esd product
      * and not a product with the service attribute is set to true.
+     *
+     * @param CheckoutBasketArray $basket
      */
     private function basketHasMixedProducts(array $basket): bool
     {
@@ -1929,8 +2006,11 @@ private function basketHasMixedProducts(array $basket): bool
                 continue;
             }
 
+            if (empty($attrName)) {
+                continue;
+            }
             $serviceAttr = $cartItem['additional_details'][$attrName];
-            if (empty($attrName) || ($serviceAttr && $serviceAttr != 'false')) {
+            if ($serviceAttr && $serviceAttr !== 'false') {
                 continue;
             }
 
@@ -1944,19 +2024,20 @@ private function basketHasMixedProducts(array $basket): bool
      * Handles payment method validation fail on checkout
      * Redirects the user to the payment edit page
      */
-    private function onPaymentMethodValidationFail()
+    private function onPaymentMethodValidationFail(): void
     {
-        $target = ['controller' => 'checkout', 'action' => 'shippingPayment'];
-        $this->redirect($target);
+        $this->redirect(['controller' => 'checkout', 'action' => 'shippingPayment']);
     }
 
     /**
      * Selects the default payment method defined in the backend. If no payment method is defined,
      * the first payment method of the provided list will be returned.
      *
-     * @return array
+     * @param non-empty-array<array<string, mixed>> $paymentMethods
+     *
+     * @return array<string, mixed>
      */
-    private function getDefaultPaymentMethod(array $paymentMethods)
+    private function getDefaultPaymentMethod(array $paymentMethods): array
     {
         $payment = null;
 
@@ -1977,7 +2058,7 @@ private function getDefaultPaymentMethod(array $paymentMethods)
     /**
      * Resets the temporary session address ids back to default
      */
-    private function resetTemporaryAddresses()
+    private function resetTemporaryAddresses(): void
     {
         $this->session->offsetUnset('checkoutBillingAddressId');
         $this->session->offsetUnset('checkoutShippingAddressId');
@@ -1986,7 +2067,7 @@ private function resetTemporaryAddresses()
     /**
      * Sets the default addresses for the user if he decided to use the temporary addresses as new default
      */
-    private function saveDefaultAddresses()
+    private function saveDefaultAddresses(): void
     {
         $billingId = $this->session->offsetGet('checkoutBillingAddressId');
         $shippingId = $this->session->offsetGet('checkoutShippingAddressId');
@@ -2025,20 +2106,20 @@ private function saveDefaultAddresses()
 
     /**
      * Validates the given address id with current shop configuration
-     *
-     * @param int  $addressId
-     * @param bool $isShippingAddress
-     *
-     * @return bool
      */
-    private function isValidAddress($addressId, $isShippingAddress = false)
+    private function isValidAddress(int $addressId, bool $isShippingAddress = false): bool
     {
         $address = $this->get(ModelManager::class)->find(Address::class, $addressId);
+        if (!$address instanceof Address || !$address->getCountry() instanceof Country) {
+            $this->View()->assign('invalidShippingCountry', true);
+
+            return false;
+        }
 
         $context = $this->get(ContextServiceInterface::class)->getContext();
         $country = $this->get(CountryGatewayInterface::class)->getCountry($address->getCountry()->getId(), $context);
 
-        if ($address && $isShippingAddress && !$country->allowShipping()) {
+        if ($isShippingAddress && !$country->allowShipping()) {
             $this->View()->assign('invalidShippingCountry', true);
 
             return false;
@@ -2048,12 +2129,9 @@ private function isValidAddress($addressId, $isShippingAddress = false)
     }
 
     /**
-     * @param int    $orderNumber
-     * @param string $source
-     *
-     * @return array
+     * @return array<string, mixed>
      */
-    private function getOrderAddress($orderNumber, $source)
+    private function getOrderAddress(string $orderNumber, string $source): array
     {
         $builder = $this->get(Connection::class)->createQueryBuilder();
         $context = $this->get(ContextServiceInterface::class)->getShopContext();
@@ -2070,30 +2148,28 @@ private function getOrderAddress($orderNumber, $source)
         $countryStruct = $this->get(CountryGatewayInterface::class)->getCountry($address['countryID'], $context);
         $stateStruct = $this->get(CountryGatewayInterface::class)->getState($address['stateID'], $context);
 
-        $address['country'] = json_decode(json_encode($countryStruct), true);
-        $address['state'] = json_decode(json_encode($stateStruct), true);
+        $address['country'] = json_decode(json_encode($countryStruct, JSON_THROW_ON_ERROR), true);
+        $address['state'] = json_decode(json_encode($stateStruct, JSON_THROW_ON_ERROR), true);
         $address['attribute'] = $this->get(DataLoader::class)->load($sourceTable . '_attributes', $address['id']);
 
         return $address;
     }
 
     /**
-     * @return bool
+     * @param array<string, mixed> $addressA
+     * @param array<string, mixed> $addressB
      */
-    private function areAddressesEqual(array $addressA, array $addressB)
+    private function areAddressesEqual(array $addressA, array $addressB): bool
     {
-        $unset = ['id', 'customernumber', 'phone', 'ustid'];
-        foreach ($unset as $key) {
+        // 'country' and 'state' are arrays, but not relevant as the IDs are also present which will then be compared
+        foreach (['id', 'userID', 'orderID', 'customernumber', 'phone', 'ustid', 'country', 'state', 'attribute'] as $key) {
             unset($addressA[$key], $addressB[$key]);
         }
 
         return \count(array_diff($addressA, $addressB)) === 0;
     }
 
-    /**
-     * @return string
-     */
-    private function persistBasket()
+    private function persistBasket(): string
     {
         $generator = $this->get('basket_signature_generator');
         $basket = $this->session->offsetGet('sOrderVariables')->getArrayCopy();
@@ -2107,10 +2183,8 @@ private function persistBasket()
 
     /**
      * Updates all currency dependencies (e.g. in the shop model or in the shop context).
-     *
-     * @param int $currencyId
      */
-    private function updateCurrencyDependencies($currencyId)
+    private function updateCurrencyDependencies(int $currencyId): void
     {
         $currencyModel = $this->get(ModelManager::class)->find(Currency::class, $currencyId);
 
@@ -2123,10 +2197,18 @@ private function updateCurrencyDependencies($currencyId)
         $this->get(ContextServiceInterface::class)->initializeShopContext();
     }
 
+    /**
+     * @param CheckoutBasketArray $basket
+     *
+     * @return list<string>
+     */
     private function getInvalidProducts(array $basket): array
     {
-        $products = [];
+        if (!isset($basket[CartKey::POSITIONS])) {
+            return [];
+        }
 
+        $products = [];
         foreach ($basket[CartKey::POSITIONS] as $item) {
             if ((int) $item['modus'] !== CartPositionsMode::PRODUCT) {
                 continue;
@@ -2176,4 +2258,11 @@ private function validatePostMethod(): void
             throw new LogicException('This action only admits post requests');
         }
     }
+
+    private function updateNewsletter(): void
+    {
+        if (!empty($this->session['sNewsletter'])) {
+            $this->admin->sUpdateNewsletter(true, (string) $this->admin->sGetUserMailById(), true);
+        }
+    }
 }
diff --git a/engine/Shopware/Controllers/Frontend/Compare.php b/engine/Shopware/Controllers/Frontend/Compare.php
index dca9e04b7ca..5b88ea8075a 100644
--- a/engine/Shopware/Controllers/Frontend/Compare.php
+++ b/engine/Shopware/Controllers/Frontend/Compare.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Shopware_Controllers_Frontend_Compare extends Enlight_Controller_Action
diff --git a/engine/Shopware/Controllers/Frontend/Csrftoken.php b/engine/Shopware/Controllers/Frontend/Csrftoken.php
index 1f5df3a9e75..84ff6d59b93 100644
--- a/engine/Shopware/Controllers/Frontend/Csrftoken.php
+++ b/engine/Shopware/Controllers/Frontend/Csrftoken.php
@@ -1,46 +1,50 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+use Shopware\Components\CSRFTokenValidator;
+use Shopware\Components\Random;
+
 class Shopware_Controllers_Frontend_Csrftoken extends Enlight_Controller_Action
 {
-    private const CSRF_TOKEN_HEADER = 'x-csrf-token';
-
     /**
      * Loads auth and script renderer resource
      */
     public function preDispatch()
     {
-        $this->Front()->Plugins()->ViewRenderer()->setNoRender(true);
+        $this->Front()->Plugins()->ViewRenderer()->setNoRender();
     }
 
     /**
      * Generates a token and fills the cookie and session
+     *
+     * @return void
      */
     public function indexAction()
     {
-        $token = \Shopware\Components\Random::getAlphanumericString(30);
+        $token = Random::getAlphanumericString(30);
 
-        $this->Response()->headers->set(self::CSRF_TOKEN_HEADER, $token);
+        $this->Response()->headers->set(CSRFTokenValidator::CSRF_TOKEN_RESPONSE_HEADER, $token);
     }
 }
diff --git a/engine/Shopware/Controllers/Frontend/Custom.php b/engine/Shopware/Controllers/Frontend/Custom.php
index f20385a24c0..0ae9534254f 100644
--- a/engine/Shopware/Controllers/Frontend/Custom.php
+++ b/engine/Shopware/Controllers/Frontend/Custom.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Bundle\ControllerBundle\Exceptions\ResourceNotFoundException;
diff --git a/engine/Shopware/Controllers/Frontend/Detail.php b/engine/Shopware/Controllers/Frontend/Detail.php
index 0f7b0c95b04..253cdd70d1e 100644
--- a/engine/Shopware/Controllers/Frontend/Detail.php
+++ b/engine/Shopware/Controllers/Frontend/Detail.php
@@ -1,29 +1,32 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Random;
 use Shopware\Components\Validator\EmailValidator;
+use Shopware\Models\Category\Category;
+use Shopware_Components_Config as Config;
 
 class Shopware_Controllers_Frontend_Detail extends Enlight_Controller_Action
 {
@@ -34,27 +37,27 @@ class Shopware_Controllers_Frontend_Detail extends Enlight_Controller_Action
      */
     public function preDispatch()
     {
-        $this->View()->setScope(Enlight_Template_Manager::SCOPE_PARENT);
+        $this->View()->setScope(Smarty::SCOPE_PARENT);
     }
 
     /**
      * Error action method for not found/inactive products
      * Can throw an exception that is handled by the default error controller
      * or show a custom page with related products
+     *
+     * @return void
      */
     public function errorAction()
     {
-        $config = $this->container->get(\Shopware_Components_Config::class);
+        $config = $this->container->get(Config::class);
         if (!$config->get('RelatedArticlesOnArticleNotFound')) {
             throw new Enlight_Controller_Exception('Product not found', 404);
         }
 
-        $this->Response()->setStatusCode(
-            $config->get('PageNotFoundCode', 404)
-        );
-        $this->View()->assign('sRelatedArticles', Shopware()->Modules()->Marketing()->sGetSimilarArticles(
-            (int) $this->Request()->sArticle,
-            4
+        $this->Response()->setStatusCode($config->get('PageNotFoundCode', 404));
+        $this->View()->assign('sRelatedArticles', $this->container->get('modules')->Marketing()->sGetSimilarArticles(
+            (int) $this->Request()->getParam('sArticle'),
+            (int) $config->get('maxcrosssimilar', 4)
         ));
     }
 
@@ -63,91 +66,97 @@ public function errorAction()
      *
      * Read the product details and base rating form data
      * Loads on demand a custom template
+     *
+     * @return void
      */
     public function indexAction()
     {
-        $id = (int) $this->Request()->sArticle;
-        $tpl = (string) $this->Request()->template;
+        $id = (int) $this->Request()->getParam('sArticle');
+        $tpl = (string) $this->Request()->getParam('template');
 
         if ($id <= 0) {
-            return $this->forward('error');
+            $this->forward('error');
+
+            return;
         }
 
-        $this->View()->assign('sAction', isset($this->View()->sAction) ? $this->View()->sAction : 'index', true);
-        $this->View()->assign('sErrorFlag', isset($this->View()->sErrorFlag) ? $this->View()->sErrorFlag : [], true);
-        $this->View()->assign('sFormData', isset($this->View()->sFormData) ? $this->View()->sFormData : [], true);
-        $this->View()->assign('userLoggedIn', (bool) Shopware()->Session()->offsetGet('sUserId'));
+        $view = $this->View();
+        $view->assign('sAction', $view->getAssign('sAction') ?: 'index', true);
+        $view->assign('sErrorFlag', $view->getAssign('sErrorFlag') ?: [], true);
+        $view->assign('sFormData', $view->getAssign('sFormData') ?: [], true);
+        $view->assign('userLoggedIn', (bool) $this->container->get('session')->get('sUserId'));
 
-        if (!empty(Shopware()->Session()->get('sUserId')) && empty($this->Request()->get('sVoteName'))
+        if (!empty($this->container->get('session')->get('sUserId')) && empty($this->Request()->get('sVoteName'))
             && $this->Request()->getParam('__cache') !== null) {
-            $userData = Shopware()->Modules()->Admin()->sGetUserData();
-            $this->View()->assign('sFormData', [
-                'sVoteMail' => $userData['additional']['user']['email'],
-                'sVoteName' => $userData['billingaddress']['firstname'] . ' ' . $userData['billingaddress']['lastname'],
-            ]);
+            $userData = $this->container->get('modules')->Admin()->sGetUserData();
+            if (\is_array($userData)) {
+                $view->assign('sFormData', [
+                    'sVoteMail' => $userData['additional']['user']['email'],
+                    'sVoteName' => $userData['billingaddress']['firstname'] . ' ' . $userData['billingaddress']['lastname'],
+                ]);
+            }
         }
 
         $number = $this->Request()->getParam('number');
         $selection = $this->Request()->getParam('group', []);
 
-        $categoryId = $this->Request()->get('sCategory');
+        $categoryId = (int) $this->Request()->get('sCategory');
         if (!$this->isValidCategory($categoryId)) {
             $categoryId = 0;
         }
 
         try {
-            $product = Shopware()->Modules()->Articles()->sGetArticleById(
+            $product = $this->container->get('modules')->Articles()->sGetArticleById(
                 $id,
                 $categoryId,
                 $number,
                 $selection
             );
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             $product = null;
         }
 
         if (empty($product) || empty($product['articleName'])) {
-            return $this->forward('error');
+            $this->forward('error');
+
+            return;
         }
 
         $this->Request()->setQuery('sCategory', $product['categoryID']);
 
         $template = trim($product['template']);
         if (!empty($template)) {
-            $this->View()->loadTemplate('frontend/detail/' . $product['template']);
+            $view->loadTemplate('frontend/detail/' . $product['template']);
         } elseif (!empty($product['mode'])) {
-            $this->View()->loadTemplate('frontend/blog/detail.tpl');
+            $view->loadTemplate('frontend/blog/detail.tpl');
         } elseif ($tpl === 'ajax') {
-            $this->View()->loadTemplate('frontend/detail/ajax.tpl');
+            $view->loadTemplate('frontend/detail/ajax.tpl');
         }
 
-        $product = Shopware()->Modules()->Articles()->sGetConfiguratorImage($product);
+        $product = $this->container->get('modules')->Articles()->sGetConfiguratorImage($product);
         $product['sBundles'] = false;
 
-        if (!empty(Shopware()->Config()->get('InquiryID'))) {
-            $this->View()->assign('sInquiry', $this->Front()->Router()->assemble([
+        if (!empty($this->container->get(Config::class)->get('InquiryID'))) {
+            $view->assign('sInquiry', $this->Front()->ensureRouter()->assemble([
                 'sViewport' => 'support',
-                'sFid' => Shopware()->Config()->get('InquiryID'),
+                'sFid' => $this->container->get(Config::class)->get('InquiryID'),
                 'sInquiry' => 'detail',
                 'sOrdernumber' => $product['ordernumber'],
             ]));
         }
 
         if (!empty($product['categoryID'])) {
-            $breadcrumb = array_reverse(Shopware()->Modules()->sCategories()->sGetCategoriesByParent($product['categoryID']));
+            $breadcrumb = array_reverse($this->container->get('modules')->Categories()->sGetCategoriesByParent($product['categoryID']));
             $categoryInfo = end($breadcrumb);
         } else {
             $breadcrumb = [];
             $categoryInfo = null;
         }
 
-        // SW-3493 sArticle->getArticleById and sBasket->sGetGetBasket differ in camelcase
-        $product['sReleaseDate'] = $product['sReleasedate'];
-
-        $this->View()->assign('sBreadcrumb', $breadcrumb);
-        $this->View()->assign('sCategoryInfo', $categoryInfo);
-        $this->View()->assign('sArticle', $product);
-        $this->View()->assign('rand', Random::getAlphanumericString(32));
+        $view->assign('sBreadcrumb', $breadcrumb);
+        $view->assign('sCategoryInfo', $categoryInfo);
+        $view->assign('sArticle', $product);
+        $view->assign('rand', Random::getAlphanumericString(32));
     }
 
     /**
@@ -155,13 +164,15 @@ public function indexAction()
      *
      * Fetches the correct product corresponding to the given order number.
      * Assigns the product information to the sArticle view variable.
+     *
+     * @return void
      */
     public function productQuickViewAction()
     {
         $orderNumber = (string) $this->Request()->get('ordernumber');
 
         if (empty($orderNumber)) {
-            throw new \InvalidArgumentException('Argument ordernumber missing');
+            throw new InvalidArgumentException('Argument ordernumber missing');
         }
 
         $productService = $this->get('shopware_storefront.list_product_service');
@@ -169,8 +180,7 @@ public function productQuickViewAction()
 
         $product = $productService->get($orderNumber, $context);
         if (!$product) {
-            $dbal = $this->get('dbal_connection');
-            $productOrderNumber = $dbal->fetchColumn(
+            $productOrderNumber = $this->get('dbal_connection')->fetchOne(
                 'SELECT ordernumber FROM s_addon_premiums WHERE ordernumber_export = :ordernumber',
                 [':ordernumber' => $orderNumber]
             );
@@ -187,38 +197,45 @@ public function productQuickViewAction()
      * Rating action method
      *
      * Save and review the product rating
+     *
+     * @return void
      */
     public function ratingAction()
     {
-        $id = (int) $this->Request()->sArticle;
+        $id = (int) $this->Request()->getParam('sArticle');
         if (empty($id)) {
-            return $this->forward('error');
+            $this->forward('error');
+
+            return;
         }
 
-        $product = Shopware()->Modules()->Articles()->sGetArticleNameByArticleId($id);
+        $product = $this->container->get('modules')->Articles()->sGetArticleNameByArticleId($id);
         if (empty($product)) {
-            return $this->forward('error');
+            $this->forward('error');
+
+            return;
         }
 
         $voteConfirmed = false;
 
-        if ($hash = $this->Request()->sConfirmation) {
-            $getVote = Shopware()->Db()->fetchRow('
-                SELECT * FROM s_core_optin WHERE hash = ?
-            ', [$hash]);
+        $hash = $this->Request()->getParam('sConfirmation');
+        if ($hash) {
+            $getVote = $this->container->get('db')->fetchRow(
+                'SELECT * FROM s_core_optin WHERE hash = ?',
+                [$hash]
+            );
             if (!empty($getVote['data'])) {
-                Shopware()->System()->_POST = unserialize($getVote['data'], ['allowed_classes' => false]);
+                $this->container->get('front')->ensureRequest()->setPost(unserialize($getVote['data'], ['allowed_classes' => false]));
                 $voteConfirmed = true;
-                Shopware()->Db()->query('DELETE FROM s_core_optin WHERE hash = ?', [$hash]);
+                $this->container->get('db')->query('DELETE FROM s_core_optin WHERE hash = ?', [$hash]);
             }
         }
 
-        if (empty(Shopware()->System()->_POST['sVoteSummary'])) {
+        if (empty($this->container->get('front')->ensureRequest()->getPost('sVoteSummary'))) {
             $sErrorFlag['sVoteSummary'] = true;
         }
 
         if (!$voteConfirmed) {
-            /** @var \Shopware\Components\Captcha\CaptchaValidator $captchaValidator */
             $captchaValidator = $this->container->get('shopware.captcha.validator');
 
             if (!$captchaValidator->validate($this->Request())) {
@@ -227,27 +244,27 @@ public function ratingAction()
         }
 
         $validator = $this->container->get(EmailValidator::class);
-        if (!empty(Shopware()->Config()->sOPTINVOTE)
-            && (empty(Shopware()->System()->_POST['sVoteMail'])
-                || !$validator->isValid(Shopware()->System()->_POST['sVoteMail']))
+        if (!empty($this->container->get(Config::class)->get('sOPTINVOTE'))
+            && (empty($this->container->get('front')->ensureRequest()->getPost('sVoteMail'))
+                || !$validator->isValid($this->container->get('front')->ensureRequest()->getPost('sVoteMail')))
         ) {
             $sErrorFlag['sVoteMail'] = true;
         }
 
+        $view = $this->View();
+
         if (empty($sErrorFlag)) {
-            if (!empty(Shopware()->Config()->sOPTINVOTE)
-                && !$voteConfirmed && empty(Shopware()->Session()->get('sUserId'))
+            if (!empty($this->container->get(Config::class)->get('sOPTINVOTE'))
+                && !$voteConfirmed && empty($this->container->get('session')->get('sUserId'))
             ) {
-                $hash = \Shopware\Components\Random::getAlphanumericString(32);
-                $sql = '
-                    INSERT INTO s_core_optin (datum, hash, data, type)
-                    VALUES (NOW(), ?, ?, "swProductVote")
-                ';
-                Shopware()->Db()->query($sql, [
-                    $hash, serialize(Shopware()->System()->_POST->toArray()),
+                $hash = Random::getAlphanumericString(32);
+                $sql = "INSERT INTO s_core_optin (datum, hash, data, type)
+                        VALUES (NOW(), ?, ?, 'swProductVote')";
+                $this->container->get('db')->query($sql, [
+                    $hash, serialize($this->container->get('front')->ensureRequest()->getPost()),
                 ]);
 
-                $link = $this->Front()->Router()->assemble([
+                $link = $this->Front()->ensureRouter()->assemble([
                     'sViewport' => 'detail',
                     'action' => 'rating',
                     'sArticle' => $id,
@@ -259,19 +276,19 @@ public function ratingAction()
                     'sArticle' => ['articleName' => $product],
                 ];
 
-                $mail = Shopware()->TemplateMail()->createMail('sOPTINVOTE', $context);
+                $mail = $this->container->get('templatemail')->createMail('sOPTINVOTE', $context);
                 $mail->addTo($this->Request()->getParam('sVoteMail'));
                 $mail->send();
             } else {
-                unset(Shopware()->Config()->sOPTINVOTE);
-                Shopware()->Modules()->Articles()->sSaveComment($id);
+                $this->container->get(Config::class)->offsetUnset('sOPTINVOTE');
+                $this->container->get('modules')->Articles()->sSaveComment($id);
             }
         } else {
-            $this->View()->assign('sFormData', Shopware()->System()->_POST->toArray());
-            $this->View()->assign('sErrorFlag', $sErrorFlag);
+            $view->assign('sFormData', $this->container->get('front')->ensureRequest()->getPost());
+            $view->assign('sErrorFlag', $sErrorFlag);
         }
 
-        $this->View()->assign('sAction', 'ratingAction');
+        $view->assign('sAction', 'ratingAction');
 
         $this->forward(
             $this->Request()->getParam('sTargetAction', 'index'),
@@ -281,17 +298,17 @@ public function ratingAction()
 
     /**
      * Checks if the provided $categoryId is in the current shop's category tree
-     *
-     * @param int $categoryId
-     *
-     * @return bool
      */
-    private function isValidCategory($categoryId)
+    private function isValidCategory(int $categoryId): bool
     {
-        $defaultShopCategoryId = Shopware()->Shop()->getCategory()->getId();
+        $category = $this->container->get('shop')->getCategory();
+        if (!$category instanceof Category) {
+            return false;
+        }
+
+        $defaultShopCategoryId = $category->getId();
 
-        $repository = $this->get('models')->getRepository('Shopware\Models\Category\Category');
-        $categoryPath = $repository->getPathById($categoryId);
+        $categoryPath = $this->get('models')->getRepository(Category::class)->getPathById($categoryId);
 
         if (!$categoryPath) {
             return true;
diff --git a/engine/Shopware/Controllers/Frontend/Error.php b/engine/Shopware/Controllers/Frontend/Error.php
index be5d7257a3d..785116db719 100644
--- a/engine/Shopware/Controllers/Frontend/Error.php
+++ b/engine/Shopware/Controllers/Frontend/Error.php
@@ -1,33 +1,38 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface;
+use Shopware\Components\CSRFTokenValidationException;
 use Shopware\Components\CSRFWhitelistAware;
+use Shopware\Components\Theme\PathResolver;
 
 class Shopware_Controllers_Frontend_Error extends Enlight_Controller_Action implements CSRFWhitelistAware
 {
     /**
      * Disable front plugins
+     *
+     * @return void
      */
     public function init()
     {
@@ -50,7 +55,7 @@ public function preDispatch()
             $this->enableBackendTheme();
         }
 
-        if ($this->Request()->isXmlHttpRequest() || !Shopware()->Container()->initialized('db')) {
+        if ($this->Request()->isXmlHttpRequest() || !$this->container->initialized('db')) {
             $this->View()->loadTemplate($templateModule . '/error/exception.tpl');
         } elseif (isset($_ENV['SHELL']) || PHP_SAPI === 'cli') {
             $this->View()->loadTemplate($templateModule . '/error/cli.tpl');
@@ -72,6 +77,8 @@ public function preDispatch()
     /**
      * Controller action that handles all error rendering
      * either by itself or by delegating specific scenarios to other actions
+     *
+     * @return void
      */
     public function errorAction()
     {
@@ -102,13 +109,15 @@ public function errorAction()
 
     /**
      * Handles "Page Not Found" errors
+     *
+     * @return void
      */
     public function pageNotFoundErrorAction()
     {
         $response = $this->Response();
 
-        $targetEmotionId = Shopware()->Config()->get('PageNotFoundDestination');
-        $targetErrorCode = Shopware()->Config()->get('PageNotFoundCode', 404);
+        $targetEmotionId = (int) $this->get('config')->get('PageNotFoundDestination');
+        $targetErrorCode = $this->get('config')->get('PageNotFoundCode', 404);
 
         $response->setStatusCode($targetErrorCode);
 
@@ -119,8 +128,8 @@ public function pageNotFoundErrorAction()
             case -2:
             case null:
                 $this->forward(
-                    Shopware()->Front()->Dispatcher()->getDefaultAction(),
-                    Shopware()->Front()->Dispatcher()->getDefaultControllerName()
+                    $this->get('front')->Dispatcher()->getDefaultAction(),
+                    $this->get('front')->Dispatcher()->getDefaultControllerName()
                 );
                 break;
             case -1:
@@ -131,15 +140,15 @@ public function pageNotFoundErrorAction()
                 try {
                     $result = $this->get('shopware.emotion.emotion_landingpage_loader')->load(
                         $targetEmotionId,
-                        $this->get(\Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface::class)->getShopContext()
+                        $this->get(ContextServiceInterface::class)->getShopContext()
                     );
 
                     $this->View()->loadTemplate('frontend/campaign/index.tpl');
-                    $this->View()->assign(json_decode(json_encode($result), true));
-                } catch (\Exception $ex) {
+                    $this->View()->assign(json_decode((string) json_encode($result), true));
+                } catch (Exception $ex) {
                     $this->forward(
-                        Shopware()->Front()->Dispatcher()->getDefaultAction(),
-                        Shopware()->Front()->Dispatcher()->getDefaultControllerName()
+                        $this->get('front')->Dispatcher()->getDefaultAction(),
+                        $this->get('front')->Dispatcher()->getDefaultControllerName()
                     );
                 }
         }
@@ -147,6 +156,8 @@ public function pageNotFoundErrorAction()
 
     /**
      * Generic error handling controller action
+     *
+     * @return void
      */
     public function genericErrorAction()
     {
@@ -155,7 +166,7 @@ public function genericErrorAction()
         $response->setStatusCode($errorCode);
 
         if ($this->Request()->getModuleName() === 'frontend') {
-            $this->View()->assign('Shop', Shopware()->Shop());
+            $this->View()->assign('Shop', $this->get('shop'));
         }
 
         $error = $this->Request()->getParam('error_handler');
@@ -165,14 +176,14 @@ public function genericErrorAction()
          * to pass it to the template
         */
         if ($this->Front()->getParam('showException')) {
-            $rootDir = Shopware()->Container()->getParameter('shopware.app.rootDir');
+            $rootDir = $this->container->getParameter('shopware.app.rootDir');
             if (!\is_string($rootDir)) {
-                throw new \RuntimeException('Parameter shopware.app.rootDir has to be an string');
+                throw new RuntimeException('Parameter shopware.app.rootDir has to be an string');
             }
 
             $path = $rootDir . '/';
 
-            /** @var \Exception $exception */
+            /** @var Exception $exception */
             $exception = $error->exception;
             $errorFile = $exception->getFile();
             $errorFile = str_replace($path, '', $errorFile);
@@ -195,6 +206,9 @@ public function genericErrorAction()
         }
     }
 
+    /**
+     * @return void
+     */
     public function serviceAction()
     {
         $this->Response()->setStatusCode(503);
@@ -220,10 +234,10 @@ public function getWhitelistedCSRFActions()
      * Ensure the backend theme is enabled.
      * This is important in cases when a backend request uses the storefront context eg. "$shop->registerResources($this)".
      */
-    private function enableBackendTheme()
+    private function enableBackendTheme(): void
     {
-        $directory = Shopware()->Container()->get(\Shopware\Components\Theme\PathResolver::class)->getExtJsThemeDirectory();
-        Shopware()->Container()->get('template')->setTemplateDir([
+        $directory = $this->get(PathResolver::class)->getExtJsThemeDirectory();
+        $this->get('template')->setTemplateDir([
             'backend' => $directory,
             'include_dir' => '.',
         ]);
@@ -231,17 +245,15 @@ private function enableBackendTheme()
 
     /**
      * Checks if the Response contains a CSRF Token validation exception
-     *
-     * @return bool
      */
-    private function isCsrfValidationException()
+    private function isCsrfValidationException(): bool
     {
         $exceptions = $this->Response()->getException();
         if (empty($exceptions)) {
             return false;
         }
         foreach ($exceptions as $exception) {
-            if ($exception instanceof \Shopware\Components\CSRFTokenValidationException) {
+            if ($exception instanceof CSRFTokenValidationException) {
                 return true;
             }
         }
diff --git a/engine/Shopware/Controllers/Frontend/Forms.php b/engine/Shopware/Controllers/Frontend/Forms.php
index 4be63ed310e..ceac852e208 100644
--- a/engine/Shopware/Controllers/Frontend/Forms.php
+++ b/engine/Shopware/Controllers/Frontend/Forms.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\ORM\AbstractQuery;
@@ -30,6 +30,7 @@
 use Shopware\Components\Privacy\IpAnonymizerInterface;
 use Shopware\Components\Random;
 use Shopware\Components\Validator\EmailValidator;
+use Shopware\Components\Validator\NoUrlValidator;
 use Shopware\Models\Form\Form;
 
 /**
@@ -211,7 +212,7 @@ protected function getContent($formId)
 
                         $product = Shopware()->Modules()->Articles()->sGetArticleNameByOrderNumber($orderNumber);
 
-                        $element['value'] = sprintf('%s (%s)', $product, $this->get('shopware.escaper')->escapeHtml($orderNumber));
+                        $element['value'] = \sprintf('%s (%s)', $product, $this->get('shopware.escaper')->escapeHtml($orderNumber));
                         $this->_elements[$id]['value'] = $element['value'];
                     } catch (InvalidOrderNumberException $exception) {
                         // Explicit empty catch
@@ -227,10 +228,10 @@ protected function getContent($formId)
                             $getBasket = Shopware()->Modules()->Basket()->sGetBasket();
                             foreach ($getBasket[CartKey::POSITIONS] ?? [] as $basketRow) {
                                 if (empty($basketRow['modus'])) {
-                                    $text .= sprintf(
+                                    $text .= \sprintf(
                                         "\n%s x %s (%s) - %s %s",
                                         $basketRow['quantity'],
-                                            $basketRow['articlename'],
+                                        $basketRow['articlename'],
                                         $basketRow['ordernumber'],
                                         $basketRow['price'],
                                         Shopware()->System()->sCurrency['currency']
@@ -255,7 +256,7 @@ protected function getContent($formId)
                     }
                 }
 
-                $fields[$id] = $this->_createInputElement($element, $this->_postData[$id]);
+                $fields[$id] = $this->_createInputElement($element, $this->_postData[$id] ?? null);
                 $labels[$id] = $this->_createLabelElement($element);
             }
         }
@@ -297,7 +298,7 @@ protected function _createLabelElement($element)
         if ($element['typ'] === 'text2') {
             $output .= str_replace(';', '/', (string) $element['label']);
         } else {
-            $output .= (string) ($element['label']);
+            $output .= (string) $element['label'];
         }
         if ((bool) $element['required'] === true) {
             $output .= '*';
@@ -310,7 +311,7 @@ protected function _createLabelElement($element)
     /**
      * Create input element method
      *
-     * @param string|null $post
+     * @param array<string>|string|null $post
      *
      * @return string
      */
@@ -334,7 +335,11 @@ protected function _createInputElement(array $element, $post = null)
             case 'email':
             case 'text':
             case 'textarea':
+            case 'alphanumeric':
             case 'file':
+                if (\is_array($post)) {
+                    break;
+                }
                 $post = $this->_filterInput($post);
                 if (empty($post) && !empty($element['value'])) {
                     $post = $element['value'];
@@ -346,6 +351,9 @@ protected function _createInputElement(array $element, $post = null)
                 break;
 
             case 'text2':
+                if (!\is_array($post)) {
+                    break;
+                }
                 $post[0] = $this->_filterInput($post[0]);
                 if (empty($post[0]) && !empty($element['value'][0])) {
                     $post[0] = $element['value'][0];
@@ -369,7 +377,7 @@ protected function _createInputElement(array $element, $post = null)
             case 'hidden':
             case 'email':
             case 'text':
-                $output .= sprintf(
+                $output .= \sprintf(
                     "<input type=\"%s\" class=\"%s %s\" %s value=\"%s\" id=\"%s\" %s name=\"%s\"/>\r\n",
                     $element['typ'],
                     $element['class'],
@@ -382,13 +390,27 @@ protected function _createInputElement(array $element, $post = null)
                 );
                 break;
 
+            case 'nourl':
+                $output .= \sprintf(
+                    "<input type=\"%s\" class=\"%s %s\" %s value=\"%s\" id=\"%s\" %s name=\"%s\"/>\r\n",
+                    'text',
+                    $element['class'],
+                    $requiredField,
+                    $requiredFieldAria,
+                    $post,
+                    $element['name'],
+                    $placeholder,
+                    $element['name']
+                );
+                break;
+
             case 'checkbox':
                 if ($post == $element['value']) {
                     $checked = ' checked';
                 } else {
                     $checked = '';
                 }
-                $output .= sprintf(
+                $output .= \sprintf(
                     "<input type=\"%s\" class=\"%s %s\" %s value=\"%s\" id=\"%s\" name=\"%s\"%s/>\r\n",
                     $element['typ'],
                     $element['class'],
@@ -402,7 +424,7 @@ protected function _createInputElement(array $element, $post = null)
                 break;
 
             case 'file':
-                $output .= sprintf(
+                $output .= \sprintf(
                     "<input type=\"%s\" class=\"%s %s file\" %s id=\"%s\" %s name=\"%s\" maxlength=\"100000\" accept=\"%s\"/>\r\n",
                     $element['typ'],
                     $element['class'],
@@ -421,29 +443,29 @@ protected function _createInputElement(array $element, $post = null)
 
                 if (strpos($element['label'], ';') !== false) {
                     $placeholders = explode(';', $element['label']);
-                    $placeholder0 = sprintf('placeholder="%s%s"', $placeholders[0], $requiredFieldSnippet);
-                    $placeholder1 = sprintf('placeholder="%s%s"', $placeholders[1], $requiredFieldSnippet);
+                    $placeholder0 = \sprintf('placeholder="%s%s"', $placeholders[0], $requiredFieldSnippet);
+                    $placeholder1 = \sprintf('placeholder="%s%s"', $placeholders[1], $requiredFieldSnippet);
                 } else {
                     $placeholder0 = $placeholder;
                     $placeholder1 = $placeholder;
                 }
 
-                $output .= sprintf(
+                $output .= \sprintf(
                     "<input type=\"text\" class=\"%s %s\" %s value=\"%s\" %s id=\"%s\" name=\"%s\"/>\r\n",
                     $element['class'][0],
                     $requiredField,
                     $requiredFieldAria,
-                    $post[0],
+                    $post[0] ?? null,
                     $placeholder0,
                     $element['name'][0],
                     $element['name'][0]
                 );
-                $output .= sprintf(
+                $output .= \sprintf(
                     "<input type=\"text\" class=\"%s %s\" %s value=\"%s\" %s id=\"%s\" name=\"%s\"/>\r\n",
                     $element['class'][1],
                     $requiredField,
                     $requiredFieldAria,
-                    $post[1],
+                    $post[1] ?? null,
                     $placeholder1,
                     $element['name'][1],
                     $element['name'][1]
@@ -454,7 +476,7 @@ protected function _createInputElement(array $element, $post = null)
                 if (empty($post) && $element['value']) {
                     $post = $element['value'];
                 }
-                $output .= sprintf(
+                $output .= \sprintf(
                     "<textarea class=\"%s %s\" %s id=\"%s\" %s name=\"%s\">%s</textarea>\r\n",
                     $element['class'],
                     $requiredField,
@@ -468,7 +490,7 @@ protected function _createInputElement(array $element, $post = null)
 
             case 'select':
                 $values = explode(';', $element['value']);
-                $output .= sprintf(
+                $output .= \sprintf(
                     "<select class=\"%s %s\" %s id=\"%s\" name=\"%s\">\r\n\t", $element['class'],
                     $requiredField,
                     $requiredFieldAria,
@@ -483,15 +505,15 @@ protected function _createInputElement(array $element, $post = null)
                 $label = $element['label'] . $requiredFieldSnippet;
 
                 if (empty($post)) {
-                    $output .= sprintf('<option selected="selected" %s value="">%s</option>', $requiredField, $label);
+                    $output .= \sprintf('<option selected="selected" %s value="">%s</option>', $requiredField, $label);
                 } else {
-                    $output .= sprintf('<option %s value="">%s</option>', $requiredField, $label);
+                    $output .= \sprintf('<option %s value="">%s</option>', $requiredField, $label);
                 }
                 foreach ($values as $value) {
                     if ($value == $post) {
-                        $output .= sprintf('<option selected>%s</option>', $value);
+                        $output .= \sprintf('<option selected>%s</option>', $value);
                     } else {
-                        $output .= sprintf('<option>%s</option>', $value);
+                        $output .= \sprintf('<option>%s</option>', $value);
                     }
                 }
                 $output .= "</select>\r\n";
@@ -506,7 +528,7 @@ protected function _createInputElement(array $element, $post = null)
                         $checked = ' checked';
                     }
 
-                    $output .= sprintf(
+                    $output .= \sprintf(
                         '<input type="radio" class="%s %s" value="%s" id="%s" name="%s"%s> %s ',
                         $element['class'],
                         $requiredField,
@@ -525,14 +547,21 @@ protected function _createInputElement(array $element, $post = null)
     }
 
     /**
-     * @param string $input
+     * @param string|null $input
      *
      * @return string
      */
     protected function _filterInput($input)
     {
+        if (!\is_string($input)) {
+            return '';
+        }
+
         // Remove all control characters, unassigned, private use, formatting and surrogate code points
         $input = preg_replace('#[^\PC\s]#u', '', $input);
+        if (!\is_string($input)) {
+            return '';
+        }
 
         $temp = str_replace('"', '', $input);
         if (preg_match('#{\s*/*literal\s*}#i', $temp) > 0) {
@@ -556,6 +585,7 @@ protected function _validateInput(array $inputs, array $elements)
         $errors = [];
 
         $emailValidator = $this->container->get(EmailValidator::class);
+        $noUrlValidator = $this->container->get(NoUrlValidator::class);
 
         foreach ($elements as $element) {
             $valid = true;
@@ -607,7 +637,7 @@ protected function _validateInput(array $inputs, array $elements)
                             $valid = false;
                             break;
                         }
-                        $host = trim(substr($value, strpos($value, '@') + 1));
+                        $host = trim(substr($value, strpos($value, '@') + 1) ?: '');
                         if (empty($host) || !gethostbyname($host)) {
                             unset($value);
                             $valid = false;
@@ -625,6 +655,14 @@ protected function _validateInput(array $inputs, array $elements)
                         }
                         break;
 
+                    case 'nourl':
+                        if (!$noUrlValidator->isValid($value)) {
+                            unset($value);
+                            $valid = false;
+                            break;
+                        }
+                        break;
+
                     default:
                         $value = trim(strip_tags($value));
                         if (empty($value)) {
@@ -679,7 +717,10 @@ protected function translateForm(Form $form, array &$fields)
                 $data = [];
 
                 foreach ($translation as $key => $value) {
-                    $data[str_replace('__attribute_', '', $key)] = $value;
+                    $newKey = str_replace('__attribute_', '', $key);
+                    if (\is_string($newKey)) {
+                        $data[$newKey] = $value;
+                    }
                 }
 
                 $form->getAttribute()->fromArray($data);
diff --git a/engine/Shopware/Controllers/Frontend/Index.php b/engine/Shopware/Controllers/Frontend/Index.php
index 36f5ad53c44..ffa7a22874a 100644
--- a/engine/Shopware/Controllers/Frontend/Index.php
+++ b/engine/Shopware/Controllers/Frontend/Index.php
@@ -1,30 +1,33 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Bundle\EmotionBundle\Service\StoreFrontEmotionDeviceConfiguration;
+use Shopware\Bundle\EmotionBundle\Service\StoreFrontEmotionDeviceConfigurationInterface;
+use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface;
 use Shopware\Bundle\StoreFrontBundle\Struct\ShopContextInterface;
 use Shopware\Components\OptinServiceInterface;
+use Shopware\Models\CustomerStream\CustomerStreamRepositoryInterface;
 use Symfony\Component\HttpFoundation\Cookie;
 
 class Shopware_Controllers_Frontend_Index extends Enlight_Controller_Action
@@ -41,17 +44,17 @@ public function indexAction()
         }
 
         /** @var ShopContextInterface $context */
-        $context = Shopware()->Container()->get(\Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface::class)->getShopContext();
+        $context = Shopware()->Container()->get(ContextServiceInterface::class)->getShopContext();
         $categoryId = $context->getShop()->getCategory()->getId();
 
         /** @var StoreFrontEmotionDeviceConfiguration $service */
-        $service = $this->get(\Shopware\Bundle\EmotionBundle\Service\StoreFrontEmotionDeviceConfigurationInterface::class);
+        $service = $this->get(StoreFrontEmotionDeviceConfigurationInterface::class);
         $emotions = $service->getCategoryConfiguration($categoryId, $context);
 
         $categoryContent = Shopware()->Modules()->Categories()->sGetCategoryContent($categoryId);
 
         $this->View()->assign([
-            'hasCustomerStreamEmotion' => $this->container->get(\Shopware\Models\CustomerStream\CustomerStreamRepositoryInterface::class)->hasCustomerStreamEmotions($categoryId),
+            'hasCustomerStreamEmotion' => $this->container->get(CustomerStreamRepositoryInterface::class)->hasCustomerStreamEmotions($categoryId),
             'emotions' => $emotions,
             'hasEmotion' => !empty($emotions),
             'sCategoryContent' => $categoryContent,
@@ -72,7 +75,7 @@ private function handleThemeHash()
             return false;
         }
 
-        $optinService = $this->container->get(\Shopware\Components\OptinServiceInterface::class);
+        $optinService = $this->container->get(OptinServiceInterface::class);
 
         $data = $optinService->get(OptinServiceInterface::TYPE_THEME_PREVIEW, $hash);
 
diff --git a/engine/Shopware/Controllers/Frontend/Listing.php b/engine/Shopware/Controllers/Frontend/Listing.php
index c81064a75aa..07c6c61e9b4 100644
--- a/engine/Shopware/Controllers/Frontend/Listing.php
+++ b/engine/Shopware/Controllers/Frontend/Listing.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Enlight_Controller_Request_RequestHttp as Request;
@@ -40,9 +40,11 @@
 use Shopware\Components\ProductStream\CriteriaFactoryInterface;
 use Shopware\Components\ProductStream\FacetFilterInterface;
 use Shopware\Components\ProductStream\RepositoryInterface as ProductStreamRepositoryInterface;
+use Shopware\Models\Category\Category;
 use Shopware\Models\Category\Repository as CategoryRepository;
 use Shopware\Models\CustomerStream\CustomerStreamRepositoryInterface;
 use Shopware\Models\Emotion\Emotion;
+use Symfony\Component\HttpFoundation\Response;
 
 class Shopware_Controllers_Frontend_Listing extends Enlight_Controller_Action
 {
@@ -118,8 +120,8 @@ public function indexAction(Request $request, ShopContextInterface $shopContext)
         );
 
         $location = $this->getRedirectLocation($categoryContent, $emotionConfiguration['hasEmotion'], $shopContext);
-        if (!empty($location)) {
-            $this->redirect($location, ['code' => 301]);
+        if (\is_string($location)) {
+            $this->redirect($location, ['code' => Response::HTTP_MOVED_PERMANENTLY]);
 
             return;
         }
@@ -156,7 +158,7 @@ public function layoutAction(Request $request)
 
         $categoryContent = Shopware()->Modules()->Categories()->sGetCategoryContent($categoryId);
 
-        $config = $this->getEmotionConfiguration($categoryId, true, $categoryContent['streamId']);
+        $config = $this->getEmotionConfiguration($categoryId, true, $categoryContent['streamId'] ?? null);
 
         $config = array_merge($config, [
             'sBanner' => Shopware()->Modules()->Marketing()->sBanner($categoryId),
@@ -257,7 +259,7 @@ public function manufacturerAction(ShopContextInterface $context)
      *
      * @param int $categoryId
      *
-     * @return array listing breadcrumb
+     * @return array<array{id: int, name: string, blog: bool, link: string}> listing breadcrumb
      *
      * @deprecated in 5.6, will be private in 5.8
      */
@@ -275,7 +277,7 @@ public function getBreadcrumb($categoryId)
      * @param bool $withStreams
      * @param int  $streamId
      *
-     * @return array{emotions: array, hasEmotion: bool, showListing: bool, isHomePage: bool, showListingButton: bool}
+     * @return array{emotions: array<array<string, mixed>>, hasEmotion: bool, showListing: bool, isHomePage: bool, showListingButton: bool}
      */
     protected function getEmotionConfiguration($categoryId, $withStreams = false, $streamId = null)
     {
@@ -330,39 +332,42 @@ private function hasProducts(int $categoryId, ShopContextInterface $context, ?in
 
     /**
      * @param array<string, mixed> $categoryContent
-     *
-     * @return array{controller?: string, sArticle?: int}
      */
-    private function getRedirectLocation(array $categoryContent, bool $hasEmotion, ShopContextInterface $context): array
+    private function getRedirectLocation(array $categoryContent, bool $hasEmotion, ShopContextInterface $context): ?string
     {
-        $location = [];
-
-        $checkRedirect = ($hasEmotion && $this->Request()->getParam('sPage')) || (!$hasEmotion);
+        if (\is_string($categoryContent['external']) && $categoryContent['external'] !== '') {
+            return $categoryContent['external'];
+        }
 
-        if (!empty($categoryContent['external'])) {
-            $location = $categoryContent['external'];
-        } elseif ($this->isShopsBaseCategoryPage($categoryContent['id'])) {
-            $location = ['controller' => 'index'];
-        } elseif ($checkRedirect && $this->config->get('categoryDetailLink')) {
-            $criteria = $this->storeFrontCriteriaFactory->createListingCriteria($this->Request(), $context);
+        if ($this->isShopsBaseCategoryPage($categoryContent['id'])) {
+            return $this->Front()->ensureRouter()->assemble(['controller' => 'index']);
+        }
 
-            $criteria->resetFacets()
-                ->resetConditions()
-                ->resetSorting()
-                ->offset(0)
-                ->limit(2)
-                ->setFetchCount(false);
+        $checkRedirect = ($hasEmotion && $this->Request()->getParam('sPage')) || (!$hasEmotion);
 
-            $result = $this->productNumberSearch->search($criteria, $context);
+        if (!$checkRedirect || !$this->config->get('categoryDetailLink')) {
+            return null;
+        }
 
-            if (\count($result->getProducts()) === 1) {
-                $products = $result->getProducts();
-                $first = array_shift($products);
-                $location = ['controller' => 'detail', 'sArticle' => $first->getId()];
-            }
+        $criteria = $this->storeFrontCriteriaFactory->createListingCriteria($this->Request(), $context);
+        $criteria->resetFacets()
+            ->resetConditions()
+            ->resetSorting()
+            ->offset(0)
+            ->limit(2)
+            ->setFetchCount(false);
+        $result = $this->productNumberSearch->search($criteria, $context);
+        if (\count($result->getProducts()) !== 1) {
+            return null;
         }
 
-        return $location;
+        $products = $result->getProducts();
+        $firstProducts = array_shift($products);
+
+        return $this->Front()->ensureRouter()->assemble([
+            'controller' => 'detail',
+            'sArticle' => $firstProducts->getId(),
+        ]);
     }
 
     /**
@@ -398,7 +403,12 @@ private function getSeoDataOfManufacturer(Manufacturer $manufacturer): array
      */
     private function isValidCategoryPath(int $categoryId): bool
     {
-        $defaultShopCategoryId = Shopware()->Shop()->getCategory()->getId();
+        $category = $this->get('shop')->getCategory();
+        if (!$category instanceof Category) {
+            return false;
+        }
+
+        $defaultShopCategoryId = $category->getId();
 
         $categoryPath = $this->categoryRepository->getPathById($categoryId);
 
@@ -408,7 +418,7 @@ private function isValidCategoryPath(int $categoryId): bool
 
         if (!\array_key_exists($defaultShopCategoryId, $categoryPath)) {
             $this->Request()->setQuery('sCategory', $defaultShopCategoryId);
-            $this->Response()->setStatusCode(404);
+            $this->Response()->setStatusCode(Response::HTTP_NOT_FOUND);
 
             return false;
         }
@@ -422,7 +432,12 @@ private function isValidCategoryPath(int $categoryId): bool
      */
     private function isShopsBaseCategoryPage(int $categoryId): bool
     {
-        $defaultShopCategoryId = Shopware()->Shop()->getCategory()->getId();
+        $category = $this->get('shop')->getCategory();
+        if (!$category instanceof Category) {
+            return false;
+        }
+
+        $defaultShopCategoryId = $category->getId();
 
         $queryParamsWhiteList = ['controller', 'action', 'sCategory', 'sViewport', 'rewriteUrl', 'module'];
         $queryParamsNames = array_keys($this->Request()->getParams());
@@ -434,7 +449,8 @@ private function isShopsBaseCategoryPage(int $categoryId): bool
     /**
      * Determines if the product listing has to be loaded/shown at all
      *
-     * @param array<string, mixed> $emotions
+     * @param array<array<string, mixed>> $emotions
+     * @param array<int>                  $devicesWithEmotion
      */
     private function hasListing(array $emotions, array $devicesWithEmotion): bool
     {
@@ -476,7 +492,7 @@ private function hasListing(array $emotions, array $devicesWithEmotion): bool
      *
      * @param array<string, mixed> $emotions
      *
-     * @return int[]
+     * @return array<int>
      */
     private function getDevicesWithListing(array $emotions): array
     {
@@ -653,7 +669,9 @@ private function loadListing(array $emotionConfiguration, Request $request): boo
     }
 
     /**
-     * @param array<string, mixed> $emotions
+     * @param array<array<string, mixed>> $emotions
+     *
+     * @return array<array<string, mixed>>
      */
     private function filterListingEmotions(array $emotions): array
     {
diff --git a/engine/Shopware/Controllers/Frontend/Media.php b/engine/Shopware/Controllers/Frontend/Media.php
index a90f26ba7d9..614e39dad06 100644
--- a/engine/Shopware/Controllers/Frontend/Media.php
+++ b/engine/Shopware/Controllers/Frontend/Media.php
@@ -1,27 +1,29 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+use Shopware\Bundle\MediaBundle\MediaServiceInterface;
+
 class Shopware_Controllers_Frontend_Media extends Enlight_Controller_Action
 {
     /**
@@ -36,7 +38,7 @@ public function init()
 
     public function fallbackAction()
     {
-        $mediaService = $this->get(\Shopware\Bundle\MediaBundle\MediaServiceInterface::class);
+        $mediaService = $this->get(MediaServiceInterface::class);
         $requestedImage = $this->Request()->getRequestUri();
 
         if (!$mediaService->has($requestedImage)) {
diff --git a/engine/Shopware/Controllers/Frontend/Newsletter.php b/engine/Shopware/Controllers/Frontend/Newsletter.php
index ce5e8417a25..01091d54ca3 100644
--- a/engine/Shopware/Controllers/Frontend/Newsletter.php
+++ b/engine/Shopware/Controllers/Frontend/Newsletter.php
@@ -1,27 +1,30 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface;
+use Shopware\Components\Random;
+
 class Shopware_Controllers_Frontend_Newsletter extends Enlight_Controller_Action
 {
     /**
@@ -34,7 +37,7 @@ public function indexAction()
         $this->View()->assign('sUserLoggedIn', Shopware()->Modules()->Admin()->sCheckUser());
 
         $this->front->setParam('voteConfirmed', $this->View()->voteConfirmed);
-        $this->front->setParam('optinNow', (new \DateTime())->format('Y-m-d H:i:s'));
+        $this->front->setParam('optinNow', (new DateTime())->format('Y-m-d H:i:s'));
 
         if ($this->Request()->get('sUnsubscribe') !== null) {
             $this->View()->assign('sUnsubscribe', true);
@@ -60,7 +63,7 @@ public function indexAction()
             return;
         }
 
-        $config = $this->container->get(\Shopware_Components_Config::class);
+        $config = $this->container->get(Shopware_Components_Config::class);
         $noCaptchaAfterLogin = $config->get('noCaptchaAfterLogin');
         // redirect user if captcha is active and request is sent from the footer
         if (strtolower($config->get('newsletterCaptcha')) !== 'nocaptcha'
@@ -81,10 +84,10 @@ public function indexAction()
             if ($this->View()->getAssign('sStatus')['code'] == 3) {
                 if ($this->View()->getAssign('sStatus')['isNewRegistration']) {
                     Shopware()->Modules()->Admin()->sNewsletterSubscription(Shopware()->System()->_POST['newsletter'], true);
-                    $hash = \Shopware\Components\Random::getAlphanumericString(32);
+                    $hash = Random::getAlphanumericString(32);
                     $data = serialize(Shopware()->System()->_POST->toArray());
 
-                    $link = $this->Front()->Router()->assemble(['sViewport' => 'newsletter', 'action' => 'index', 'sConfirmation' => $hash]);
+                    $link = $this->Front()->ensureRouter()->assemble(['sViewport' => 'newsletter', 'action' => 'index', 'sConfirmation' => $hash]);
 
                     $this->sendMail(Shopware()->System()->_POST['newsletter'], 'sOPTINNEWSLETTER', $link);
 
@@ -114,7 +117,7 @@ public function listingAction()
 
         $customergroups = $this->getCustomerGroups();
         $customergroups = Shopware()->Db()->quote($customergroups);
-        $context = $this->container->get(\Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface::class)->getShopContext();
+        $context = $this->container->get(ContextServiceInterface::class)->getShopContext();
 
         $page = (int) $this->Request()->getQuery('sPage', 1);
         $perPage = (int) Shopware()->Config()->get('contentPerPage', 12);
@@ -143,7 +146,7 @@ public function listingAction()
 
         $content = [];
         while ($row = $result->fetch()) {
-            $row['link'] = $this->Front()->Router()->assemble(['action' => 'detail', 'sID' => $row['id'], 'p' => $page]);
+            $row['link'] = $this->Front()->ensureRouter()->assemble(['action' => 'detail', 'sID' => $row['id'], 'p' => $page]);
             $content[] = $row;
         }
 
@@ -155,7 +158,7 @@ public function listingAction()
                 $pages['numbers'][$i]['markup'] = false;
             }
             $pages['numbers'][$i]['value'] = $i;
-            $pages['numbers'][$i]['link'] = $this->Front()->Router()->assemble(['sViewport' => 'newsletter', 'action' => 'listing', 'p' => $i]);
+            $pages['numbers'][$i]['link'] = $this->Front()->ensureRouter()->assemble(['sViewport' => 'newsletter', 'action' => 'listing', 'p' => $i]);
         }
 
         $this->View()->assign('sPage', $page);
@@ -172,7 +175,7 @@ public function detailAction()
     {
         $customergroups = $this->getCustomerGroups();
         $customergroups = Shopware()->Db()->quote($customergroups);
-        $context = $this->container->get(\Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface::class)->getShopContext();
+        $context = $this->container->get(ContextServiceInterface::class)->getShopContext();
 
         $sql = "
             SELECT id, IF(datum='00-00-0000','',datum) as `date`, subject as description, sendermail, sendername
@@ -190,11 +193,11 @@ public function detailAction()
             $license = '';
             $content['hash'] = [$content['id'], $license];
             $content['hash'] = md5(implode('|', $content['hash']));
-            $content['link'] = $this->Front()->Router()->assemble(['module' => 'backend', 'controller' => 'newsletter', 'id' => $content['id'], 'hash' => $content['hash'], 'fullPath' => true]);
+            $content['link'] = $this->Front()->ensureRouter()->assemble(['module' => 'backend', 'controller' => 'newsletter', 'id' => $content['id'], 'hash' => $content['hash'], 'fullPath' => true]);
         }
 
         $this->View()->assign('sContentItem', $content);
-        $this->View()->assign('sBackLink', $this->Front()->Router()->assemble(['action' => 'listing']) . '?p=' . (int) $this->Request()->getParam('p', 1));
+        $this->View()->assign('sBackLink', $this->Front()->ensureRouter()->assemble(['action' => 'listing']) . '?p=' . (int) $this->Request()->getParam('p', 1));
     }
 
     /**
diff --git a/engine/Shopware/Controllers/Frontend/Note.php b/engine/Shopware/Controllers/Frontend/Note.php
index 2c663d8bae5..c6b653edc24 100644
--- a/engine/Shopware/Controllers/Frontend/Note.php
+++ b/engine/Shopware/Controllers/Frontend/Note.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Shopware_Controllers_Frontend_Note extends Enlight_Controller_Action
@@ -38,6 +38,9 @@ public function postDispatch()
         Shopware()->Session()->set('sNotesQuantity', Shopware()->Modules()->Basket()->sCountNotes());
     }
 
+    /**
+     * @return void
+     */
     public function indexAction()
     {
         $view = $this->View();
@@ -46,6 +49,9 @@ public function indexAction()
         $view->assign('sOneTimeAccount', Shopware()->Session()->offsetGet('sOneTimeAccount'));
     }
 
+    /**
+     * @return void
+     */
     public function deleteAction()
     {
         if (!empty($this->Request()->sDelete)) {
@@ -55,9 +61,12 @@ public function deleteAction()
         $this->redirect(['action' => 'index']);
     }
 
+    /**
+     * @return void
+     */
     public function addAction()
     {
-        $orderNumber = $this->Request()->getParam('ordernumber');
+        $orderNumber = (string) $this->Request()->getParam('ordernumber');
 
         if ($this->addNote($orderNumber)) {
             $this->View()->assign('sArticleName', Shopware()->Modules()->Articles()->sGetArticleNameByOrderNumber($orderNumber));
@@ -66,6 +75,9 @@ public function addAction()
         $this->redirect(['action' => 'index']);
     }
 
+    /**
+     * @return void
+     */
     public function ajaxAddAction()
     {
         $this->Request()->setHeader('Content-Type', 'application/json');
@@ -73,13 +85,13 @@ public function ajaxAddAction()
 
         $this->Response()->setContent(json_encode(
             [
-                'success' => $this->addNote($this->Request()->getParam('ordernumber')),
+                'success' => $this->addNote((string) $this->Request()->getParam('ordernumber')),
                 'notesCount' => (int) Shopware()->Modules()->Basket()->sCountNotes(),
             ]
         ));
     }
 
-    private function addNote($orderNumber)
+    private function addNote(string $orderNumber): bool
     {
         if (empty($orderNumber)) {
             return false;
@@ -88,7 +100,7 @@ private function addNote($orderNumber)
         $productId = Shopware()->Modules()->Articles()->sGetArticleIdByOrderNumber($orderNumber);
         $productName = Shopware()->Modules()->Articles()->sGetArticleNameByOrderNumber($orderNumber);
 
-        if (empty($productId)) {
+        if (empty($productId) || empty($productName)) {
             return false;
         }
 
diff --git a/engine/Shopware/Controllers/Frontend/Payment.php b/engine/Shopware/Controllers/Frontend/Payment.php
index 2fa781a8781..15bea969e24 100644
--- a/engine/Shopware/Controllers/Frontend/Payment.php
+++ b/engine/Shopware/Controllers/Frontend/Payment.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Bundle\CartBundle\CartKey;
@@ -74,7 +74,7 @@ public function createPaymentUniqueId()
      * @param int    $paymentStatusId
      * @param bool   $sendStatusMail
      *
-     * @return int|false
+     * @return string|false
      */
     public function saveOrder($transactionId, $paymentUniqueId, $paymentStatusId = null, $sendStatusMail = false)
     {
@@ -88,14 +88,17 @@ public function saveOrder($transactionId, $paymentUniqueId, $paymentStatusId = n
             AND status!=-1 AND userID=?
         ';
         $orderNumber = Shopware()->Db()->fetchOne($sql, [
-                $transactionId,
-                $paymentUniqueId,
-                Shopware()->Session()->get('sUserId'),
-            ]);
+            $transactionId,
+            $paymentUniqueId,
+            Shopware()->Session()->get('sUserId'),
+        ]);
 
         if (empty($orderNumber)) {
             $user = $this->getUser();
             $basket = $this->getBasket();
+            if (!\is_array($basket)) {
+                throw new RuntimeException('Cart must not be empty at this point');
+            }
 
             $order = Shopware()->Modules()->Order();
             $order->sUserData = $user;
@@ -138,9 +141,9 @@ public function savePaymentStatus($transactionId, $paymentUniqueId, $paymentStat
             AND status!=-1
         ';
         $orderId = (int) Shopware()->Db()->fetchOne($sql, [
-                $transactionId,
-                $paymentUniqueId,
-            ]);
+            $transactionId,
+            $paymentUniqueId,
+        ]);
         $order = Shopware()->Modules()->Order();
         $order->setPaymentStatus($orderId, $paymentStatusId, $sendStatusMail);
     }
@@ -154,6 +157,9 @@ public function getAmount()
     {
         $user = $this->getUser();
         $basket = $this->getBasket();
+        if (!\is_array($basket)) {
+            return 0.0;
+        }
         if (!empty($user['additional']['charge_vat'])) {
             return empty($basket[CartKey::AMOUNT_WITH_TAX_NUMERIC]) ? $basket[CartKey::AMOUNT_NUMERIC] : $basket[CartKey::AMOUNT_WITH_TAX_NUMERIC];
         }
@@ -164,17 +170,20 @@ public function getAmount()
     /**
      * Returns shipment amount as float
      *
-     * @return string
+     * @return float
      */
     public function getShipment()
     {
         $user = $this->getUser();
         $basket = $this->getBasket();
+        if (!\is_array($basket)) {
+            return 0.0;
+        }
         if (!empty($user['additional']['charge_vat'])) {
             return $basket[CheckoutKey::SHIPPING_COSTS_WITH_TAX];
         }
 
-        return str_replace(',', '.', $basket[CheckoutKey::SHIPPING_COSTS]);
+        return (float) str_replace(',', '.', $basket[CheckoutKey::SHIPPING_COSTS]);
     }
 
     /**
@@ -261,7 +270,7 @@ protected function loadBasketFromSignature($signature)
         $data = $persister->load($signature);
 
         if (!$data) {
-            throw new RuntimeException(sprintf('Basket for signature %s not found', $signature));
+            throw new RuntimeException(\sprintf('Basket for signature %s not found', $signature));
         }
 
         $persister->delete($signature);
@@ -313,12 +322,11 @@ protected function sendSignatureIsInvalidNotificationMail($paymentName, $orderNu
 Payment transaction number: %s.
 EOD;
 
-        $content = sprintf($content, $paymentName, $orderNumber, $transactionNumber);
+        $content = \sprintf($content, $paymentName, $orderNumber, $transactionNumber);
 
         try {
-            /** @var Enlight_Components_Mail $mail */
             $mail = $this->get('mail');
-            $mail->addTo($this->get(\Shopware_Components_Config::class)->get('mail'));
+            $mail->addTo($this->get(Shopware_Components_Config::class)->get('mail'));
             $mail->setSubject('An invalid basket signature occured');
             $mail->setBodyHtml($content);
             $mail->setAssociation(LogEntryBuilder::ORDER_NUMBER_ASSOCIATION, $orderNumber);
@@ -326,7 +334,6 @@ protected function sendSignatureIsInvalidNotificationMail($paymentName, $orderNu
         } catch (Exception $e) {
         }
 
-        /** @var \Shopware\Components\Logger $logger */
         $logger = $this->get('corelogger');
         $logger->log('error', $content);
     }
diff --git a/engine/Shopware/Controllers/Frontend/Register.php b/engine/Shopware/Controllers/Frontend/Register.php
index 3e96abfee38..b70d1093ca4 100644
--- a/engine/Shopware/Controllers/Frontend/Register.php
+++ b/engine/Shopware/Controllers/Frontend/Register.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\DBAL\Connection;
@@ -36,7 +36,6 @@
 use Shopware\Components\Model\ModelManager;
 use Shopware\Models\Customer\Address;
 use Shopware\Models\Customer\Customer;
-use Symfony\Component\Form\Form;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -182,7 +181,7 @@ public function saveRegisterAction()
         ]));
 
         $customer->setReferer((string) $session->offsetGet('sReferer'));
-        $customer->setValidation((string) $data['register']['personal']['sValidation']);
+        $customer->setValidation((string) ($data['register']['personal']['sValidation'] ?? ''));
         $customer->setAffiliate((int) $session->offsetGet('sPartner'));
         $customer->setPaymentId((int) $session->offsetGet('sPaymentID'));
         $customer->setDoubleOptinRegister($doubleOptinRegister);
@@ -269,8 +268,13 @@ public function confirmValidationAction()
             return;
         }
 
-        if (($data = unserialize($result, ['allowed_classes' => false])) === false || !isset($data['customerId'])) {
-            throw new InvalidArgumentException(sprintf('The data for hash \'%s\' is corrupted.', $hash));
+        try {
+            $data = unserialize($result, ['allowed_classes' => false]);
+        } catch (Throwable $e) {
+            $data = false;
+        }
+        if ($data === false || !isset($data['customerId'])) {
+            throw new InvalidArgumentException(\sprintf('The data for hash \'%s\' is corrupted.', $hash));
         }
         $customerId = (int) $data['customerId'];
 
@@ -407,6 +411,11 @@ private function shouldRedirectToTarget(): bool
         return $this->isUserLoggedIn() && empty($this->get('session')->offsetGet('sRegisterFinished'));
     }
 
+    /**
+     * @param FormInterface<Customer>|FormInterface<Address> $form
+     *
+     * @return array<string, string>
+     */
     private function getFormErrors(FormInterface $form): array
     {
         if ($form->isSubmitted() && $form->isValid()) {
@@ -435,12 +444,12 @@ private function getPostData(): array
         $data = $this->request->getPost();
 
         $countryStateName = 'country_state_' . $data['register']['billing']['country'];
-        $data['register']['billing']['state'] = $data['register']['billing'][$countryStateName];
+        $data['register']['billing']['state'] = $data['register']['billing'][$countryStateName] ?? null;
 
-        $countryStateName = 'country_shipping_state_' . $data['register']['shipping']['country'];
-        $data['register']['shipping']['state'] = $data['register']['shipping'][$countryStateName];
+        $countryStateName = 'country_shipping_state_' . ($data['register']['shipping']['country'] ?? null);
+        $data['register']['shipping']['state'] = $data['register']['shipping'][$countryStateName] ?? null;
         $data['register']['billing'] += $data['register']['personal'];
-        $data['register']['shipping']['phone'] = $data['register']['personal']['phone'];
+        $data['register']['shipping']['phone'] = $data['register']['personal']['phone'] ?? null;
 
         if (!$data['register']['personal']['accountmode']) {
             $data['register']['personal']['accountmode'] = Customer::ACCOUNT_MODE_CUSTOMER;
@@ -541,7 +550,12 @@ private function redirectCustomer(array $params = []): void
         $this->redirect(array_merge($location, $params));
     }
 
-    private function createCustomerForm(array $data): Form
+    /**
+     * @param array<string, mixed> $data
+     *
+     * @return FormInterface<Customer>
+     */
+    private function createCustomerForm(array $data): FormInterface
     {
         $customer = new Customer();
         $form = $this->createForm(PersonalFormType::class, $customer);
@@ -550,7 +564,12 @@ private function createCustomerForm(array $data): Form
         return $form;
     }
 
-    private function createBillingForm(array $data): Form
+    /**
+     * @param array<string, mixed> $data
+     *
+     * @return FormInterface<Address>
+     */
+    private function createBillingForm(array $data): FormInterface
     {
         $address = new Address();
         $form = $this->createForm(AddressFormType::class, $address);
@@ -559,7 +578,12 @@ private function createBillingForm(array $data): Form
         return $form;
     }
 
-    private function createShippingForm(array $data): Form
+    /**
+     * @param array<string, mixed> $data
+     *
+     * @return FormInterface<Address>
+     */
+    private function createShippingForm(array $data): FormInterface
     {
         $address = new Address();
         $form = $this->createForm(AddressFormType::class, $address);
@@ -573,7 +597,7 @@ private function sendRegistrationMail(Customer $customer): void
         try {
             Shopware()->Modules()->Admin()->sSaveRegisterSendConfirmation($customer->getEmail());
         } catch (Exception $e) {
-            $message = sprintf('Could not send user registration email to address %s', $customer->getEmail());
+            $message = \sprintf('Could not send user registration email to address %s', $customer->getEmail());
             $this->get('corelogger')->error($message, ['exception' => $e->getMessage()]);
         }
     }
diff --git a/engine/Shopware/Controllers/Frontend/RobotsTxt.php b/engine/Shopware/Controllers/Frontend/RobotsTxt.php
index 1ef093595ff..2777a03b48b 100644
--- a/engine/Shopware/Controllers/Frontend/RobotsTxt.php
+++ b/engine/Shopware/Controllers/Frontend/RobotsTxt.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Model\ModelManager;
diff --git a/engine/Shopware/Controllers/Frontend/Search.php b/engine/Shopware/Controllers/Frontend/Search.php
index baa7ad2aef4..e65b48f0ca6 100644
--- a/engine/Shopware/Controllers/Frontend/Search.php
+++ b/engine/Shopware/Controllers/Frontend/Search.php
@@ -1,31 +1,36 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+use Shopware\Bundle\SearchBundle\ProductSearchInterface;
 use Shopware\Bundle\SearchBundle\ProductSearchResult;
 use Shopware\Bundle\SearchBundle\SearchTermPreProcessorInterface;
-use Shopware\Bundle\StoreFrontBundle\Struct\ShopContextInterface;
+use Shopware\Bundle\SearchBundle\StoreFrontCriteriaFactoryInterface;
+use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface;
+use Shopware\Bundle\StoreFrontBundle\Service\CustomSortingServiceInterface;
+use Shopware\Components\Compatibility\LegacyStructConverter;
 use Shopware\Components\QueryAliasMapper;
+use Shopware\Components\Routing\RouterInterface;
 
 class Shopware_Controllers_Frontend_Search extends Enlight_Controller_Action
 {
@@ -49,27 +54,27 @@ public function defaultSearchAction()
         // Check if we have a one to one match for order number, then redirect
         $location = $this->searchFuzzyCheck($term);
         if (!empty($location)) {
-            return $this->redirect($location);
+            $this->redirect($location);
+
+            return;
         }
 
         $this->View()->loadTemplate('frontend/search/fuzzy.tpl');
 
-        $minLengthSearchTerm = $this->get(\Shopware_Components_Config::class)->get('minSearchLenght');
+        $minLengthSearchTerm = $this->get(Shopware_Components_Config::class)->get('minSearchLenght');
         if (\strlen($term) < (int) $minLengthSearchTerm) {
             return;
         }
 
-        /** @var ShopContextInterface $context */
-        $context = $this->get(\Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface::class)->getShopContext();
+        $context = $this->get(ContextServiceInterface::class)->getShopContext();
 
-        $criteria = Shopware()->Container()->get(\Shopware\Bundle\SearchBundle\StoreFrontCriteriaFactoryInterface::class)
+        $criteria = Shopware()->Container()->get(StoreFrontCriteriaFactoryInterface::class)
             ->createSearchCriteria($this->Request(), $context);
 
-        /** @var ProductSearchResult $result */
-        $result = $this->get(\Shopware\Bundle\SearchBundle\ProductSearchInterface::class)->search($criteria, $context);
+        $result = $this->get(ProductSearchInterface::class)->search($criteria, $context);
         $products = $this->convertProducts($result);
 
-        if ($this->get(\Shopware_Components_Config::class)->get('traceSearch', true)) {
+        if ($this->get(Shopware_Components_Config::class)->get('traceSearch', true)) {
             $this->get('shopware_searchdbal.search_term_logger')->logResult(
                 $criteria,
                 $result,
@@ -77,18 +82,18 @@ public function defaultSearchAction()
             );
         }
 
-        $pageCounts = $this->get(\Shopware_Components_Config::class)->get('fuzzySearchSelectPerPage');
+        $pageCounts = $this->get(Shopware_Components_Config::class)->get('fuzzySearchSelectPerPage');
 
         $request = $this->Request()->getParams();
         $request['sSearchOrginal'] = $term;
 
-        /** @var \Shopware\Components\QueryAliasMapper $mapper */
         $mapper = $this->get(QueryAliasMapper::class);
 
-        $service = Shopware()->Container()->get(\Shopware\Bundle\StoreFrontBundle\Service\CustomSortingServiceInterface::class);
+        $service = Shopware()->Container()->get(CustomSortingServiceInterface::class);
 
-        $sortingIds = $this->container->get(\Shopware_Components_Config::class)->get('searchSortings');
+        $sortingIds = $this->container->get(Shopware_Components_Config::class)->get('searchSortings');
         $sortingIds = array_filter(explode('|', $sortingIds));
+        $sortingIds = array_map('\intval', $sortingIds);
         $sortings = $service->getList($sortingIds, $context);
 
         $this->View()->assign([
@@ -108,7 +113,7 @@ public function defaultSearchAction()
                 'sArticles' => $products,
                 'sArticlesCount' => $result->getTotalCount(),
             ],
-            'productBoxLayout' => $this->get(\Shopware_Components_Config::class)->get('searchProductBoxLayout'),
+            'productBoxLayout' => $this->get(Shopware_Components_Config::class)->get('searchProductBoxLayout'),
         ]);
     }
 
@@ -121,8 +126,7 @@ public function defaultSearchAction()
      */
     protected function searchFuzzyCheck($search)
     {
-        /** @var Shopware_Components_Config $config */
-        $config = $this->get(\Shopware_Components_Config::class);
+        $config = $this->get(Shopware_Components_Config::class);
         if (!$config->get('activateNumberSearch')) {
             return false;
         }
@@ -140,7 +144,7 @@ protected function searchFuzzyCheck($search)
                 LIMIT 2
             ';
             $products = $this->get('db')->fetchAll($sql, [$search]);
-            if ($products[0]['configurator_set_id']) {
+            if (!empty($products[0]['configurator_set_id'])) {
                 $number = $products[0]['ordernumber'];
             }
 
@@ -159,7 +163,7 @@ protected function searchFuzzyCheck($search)
                 $products = $this->get('db')->fetchCol($sql, [$search, $like_search]);
             }
         }
-        if (!empty($products) && \count($products) == 1) {
+        if (!empty($products) && \count($products) === 1) {
             $sql = '
                 SELECT ac.articleID
                 FROM  s_articles_categories_ro ac
@@ -176,7 +180,7 @@ protected function searchFuzzyCheck($search)
                 $products[0],
             ]);
         }
-        if (!empty($products) && \count($products) == 1) {
+        if (!empty($products) && \count($products) === 1) {
             $assembleParams = [
                 'sViewport' => 'detail',
                 'sArticle' => $products[0],
@@ -190,20 +194,17 @@ protected function searchFuzzyCheck($search)
                 $assembleParams['sPartner'] = $partner;
             }
 
-            return $this->get(\Shopware\Components\Routing\RouterInterface::class)->assemble($assembleParams);
+            return $this->get(RouterInterface::class)->assemble($assembleParams);
         }
 
         return false;
     }
 
-    /**
-     * @return array|null
-     */
-    private function convertProducts(ProductSearchResult $result)
+    private function convertProducts(ProductSearchResult $result): ?array
     {
         $products = [];
         foreach ($result->getProducts() as $product) {
-            $productArray = $this->get(\Shopware\Components\Compatibility\LegacyStructConverter::class)->convertListProductStruct($product);
+            $productArray = $this->get(LegacyStructConverter::class)->convertListProductStruct($product);
 
             $products[] = $productArray;
         }
@@ -215,17 +216,11 @@ private function convertProducts(ProductSearchResult $result)
         return $products;
     }
 
-    /**
-     * @return string
-     */
-    private function getSearchTerm()
+    private function getSearchTerm(): string
     {
         $term = $this->Request()->getParam('sSearch', '');
 
-        /** @var SearchTermPreProcessorInterface $processor */
-        $processor = $this->get(\Shopware\Bundle\SearchBundle\SearchTermPreProcessorInterface::class);
-
-        return $processor->process($term);
+        return $this->get(SearchTermPreProcessorInterface::class)->process($term);
     }
 
     private function setDefaultSorting()
@@ -234,7 +229,7 @@ private function setDefaultSorting()
             return;
         }
 
-        $sortings = $this->container->get(\Shopware_Components_Config::class)->get('searchSortings');
+        $sortings = $this->container->get(Shopware_Components_Config::class)->get('searchSortings');
         $sortings = array_filter(explode('|', $sortings));
         $this->Request()->setParam('sSort', array_shift($sortings));
     }
diff --git a/engine/Shopware/Controllers/Frontend/Sitemap.php b/engine/Shopware/Controllers/Frontend/Sitemap.php
index 17e30b4d469..a615494a329 100644
--- a/engine/Shopware/Controllers/Frontend/Sitemap.php
+++ b/engine/Shopware/Controllers/Frontend/Sitemap.php
@@ -1,28 +1,29 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\DBAL\Connection;
+use Shopware\Bundle\SitemapBundle\Service\LinkFilter;
 use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface;
 use Shopware\Components\Model\ModelManager;
 use Shopware\Models\Emotion\Emotion;
@@ -191,7 +192,7 @@ private function getSitesByShopId(int $shopId): array
     private function convertSite($site, array $translations)
     {
         $site = array_merge($site, $this->fetchTranslation($site['id'], $translations));
-        $site['hideOnSitemap'] = !$this->filterLink($site['link']);
+        $site['hideOnSitemap'] = !LinkFilter::filterLink($site['link']);
 
         $site = array_merge(
             $site,
@@ -244,28 +245,6 @@ private function fetchTranslation(int $objectKey, array $translations): array
         return [];
     }
 
-    /**
-     * Helper function to filter predefined links, which should not be in the sitemap (external links, sitemap links itself)
-     * Returns false, if the link is not allowed
-     */
-    private function filterLink(string $link): bool
-    {
-        if (empty($link)) {
-            return true;
-        }
-
-        $userParams = (string) parse_url($link, PHP_URL_QUERY);
-        parse_str($userParams, $userParamsArray);
-
-        $blacklist = ['', 'sitemap', 'sitemapXml'];
-
-        if (\in_array($userParamsArray['sViewport'], $blacklist, true)) {
-            return false;
-        }
-
-        return true;
-    }
-
     /**
      * Helper function to get all supplier pages
      */
@@ -311,9 +290,9 @@ private function getLandingPages(): array
         foreach ($campaigns as &$campaign) {
             $translation = $this->fetchTranslation($campaign['id'], $translations);
 
-            $translation['seo_title'] = $translation['seoTitle'];
-            $translation['seo_keywords'] = $translation['seoKeywords'];
-            $translation['seo_description'] = $translation['seoDescription'];
+            $translation['seo_title'] = $translation['seoTitle'] ?? null;
+            $translation['seo_keywords'] = $translation['seoKeywords'] ?? null;
+            $translation['seo_description'] = $translation['seoDescription'] ?? null;
 
             $campaign = array_merge($campaign, $translation);
 
@@ -344,7 +323,7 @@ private function getLandingPages(): array
      * Helper function to filter emotion campaigns
      * Returns false, if the campaign starts later or is outdated
      */
-    private function filterCampaign(DateTimeInterface $from = null, DateTimeInterface $to = null): bool
+    private function filterCampaign(?DateTimeInterface $from = null, ?DateTimeInterface $to = null): bool
     {
         $now = new DateTime();
 
@@ -385,7 +364,7 @@ private function getSitemapArray(int $id, string $name, string $viewport, string
             $userParamsArray = array_merge($userParamsArray, $link);
         }
 
-        $link = $this->Front()->Router()->assemble($userParamsArray);
+        $link = $this->Front()->ensureRouter()->assemble($userParamsArray);
 
         return [
             'id' => $id,
diff --git a/engine/Shopware/Controllers/Frontend/SitemapXml.php b/engine/Shopware/Controllers/Frontend/SitemapXml.php
index 3b3210cd7ed..0b212197616 100644
--- a/engine/Shopware/Controllers/Frontend/SitemapXml.php
+++ b/engine/Shopware/Controllers/Frontend/SitemapXml.php
@@ -1,41 +1,41 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
- * @deprecated Will be removed in Shopware 5.7
+ * @deprecated Will be removed in Shopware 5.8
  */
 class Shopware_Controllers_Frontend_SitemapXml extends Enlight_Controller_Action
 {
     /**
      * Index action method
+     *
+     * @return void
      */
     public function indexAction()
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
-        $this->redirect([
-            'controller' => 'sitemap_index.xml',
-        ]);
+        $this->redirect(['controller' => 'sitemap_index.xml']);
     }
 }
diff --git a/engine/Shopware/Controllers/Frontend/Tellafriend.php b/engine/Shopware/Controllers/Frontend/Tellafriend.php
index 5118de4ac81..39c5050cd4a 100644
--- a/engine/Shopware/Controllers/Frontend/Tellafriend.php
+++ b/engine/Shopware/Controllers/Frontend/Tellafriend.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Random;
@@ -36,7 +36,7 @@ public function init()
 
     public function preDispatch()
     {
-        $config = $this->container->get(\Shopware_Components_Config::class);
+        $config = $this->container->get(Shopware_Components_Config::class);
 
         if (!$config->get('showTellAFriend')) {
             throw new Enlight_Controller_Exception('Tell a friend is not activated for the current shop', 404);
@@ -89,7 +89,6 @@ public function indexAction()
             }
 
             if (!empty(Shopware()->Config()->get('CaptchaColor'))) {
-                /** @var \Shopware\Components\Captcha\CaptchaValidator $captchaValidator */
                 $captchaValidator = $this->container->get('shopware.captcha.validator');
 
                 if (!$captchaValidator->validate($this->Request())) {
@@ -99,7 +98,7 @@ public function indexAction()
 
             if ($variables['sError'] == false) {
                 // Prepare eMail
-                $product['linkDetails'] = $this->Front()->Router()->assemble(['sViewport' => 'detail', 'sArticle' => $product['articleID']]);
+                $product['linkDetails'] = $this->Front()->ensureRouter()->assemble(['sViewport' => 'detail', 'sArticle' => $product['articleID']]);
 
                 $context = [
                     'sName' => $this->sSYSTEM->_POST['sName'],
@@ -122,7 +121,7 @@ public function indexAction()
                 $mail->send();
 
                 $this->View()->assign('sSuccess', true);
-                $url = $this->Front()->Router()->assemble(['controller' => 'tellafriend', 'action' => 'success']);
+                $url = $this->Front()->ensureRouter()->assemble(['controller' => 'tellafriend', 'action' => 'success']);
                 $this->redirect($url);
             } else {
                 $this->View()->assign('sError', true);
diff --git a/engine/Shopware/Controllers/Frontend/Tracking.php b/engine/Shopware/Controllers/Frontend/Tracking.php
index 5638d7695d8..d57fa19f1f3 100644
--- a/engine/Shopware/Controllers/Frontend/Tracking.php
+++ b/engine/Shopware/Controllers/Frontend/Tracking.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Models\Banner\Banner;
diff --git a/engine/Shopware/Controllers/Widgets/Blog.php b/engine/Shopware/Controllers/Widgets/Blog.php
index a63ee24ffdf..2c3b954bc30 100644
--- a/engine/Shopware/Controllers/Widgets/Blog.php
+++ b/engine/Shopware/Controllers/Widgets/Blog.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Controllers\Widgets;
@@ -35,5 +34,6 @@ public function formAction(): void
         $this->Response()->headers->set('cache-control', 'private');
         $this->View()->assign('sFormData', $this->Request()->getParam('formData'));
         $this->View()->assign('sErrorFlag', $this->Request()->getParam('errorFlags'));
+        $this->View()->assign('sArticleId', $this->Request()->getParam('sArticleId'));
     }
 }
diff --git a/engine/Shopware/Controllers/Widgets/Campaign.php b/engine/Shopware/Controllers/Widgets/Campaign.php
index 61977d21656..c21db7a1ab7 100644
--- a/engine/Shopware/Controllers/Widgets/Campaign.php
+++ b/engine/Shopware/Controllers/Widgets/Campaign.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Models\Emotion\Repository;
@@ -45,7 +45,7 @@ public function preDispatch()
      */
     public function getEmotion($repository)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         $emotionId = (int) $this->Request()->getParam('emotionId');
         $query = $repository->getEmotionById($emotionId);
diff --git a/engine/Shopware/Controllers/Widgets/Captcha.php b/engine/Shopware/Controllers/Widgets/Captcha.php
index 7d66722a9b6..e4d3be1cd90 100644
--- a/engine/Shopware/Controllers/Widgets/Captcha.php
+++ b/engine/Shopware/Controllers/Widgets/Captcha.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Captcha\Exception\CaptchaNotFoundException;
@@ -34,12 +35,14 @@ public function preDispatch()
         $this->Response()->setHeader('x-robots-tag', 'noindex');
     }
 
+    /**
+     * @return void
+     */
     public function refreshCaptchaAction()
     {
         $this->Front()->Plugins()->ViewRenderer()->setNoRender();
 
-        $legacyCaptcha = $this->container->get('shopware.captcha.legacy_captcha');
-        $templateData = $legacyCaptcha->getTemplateData();
+        $templateData = $this->container->get('shopware.captcha.legacy_captcha')->getTemplateData();
 
         $img = $templateData['img'];
         $rand = $templateData['sRand'];
@@ -51,24 +54,24 @@ public function refreshCaptchaAction()
     }
 
     /**
-     * Index action method
+     * Creates the captcha images and delivers it as a PNG with the proper HTTP header.
      *
-     * Creates the captcha images and delivers it as a PNG
-     * with the proper HTTP header.
+     * @return void
      */
     public function indexAction()
     {
-        $captchaRepository = $this->container->get('shopware.captcha.repository');
-        $captcha = $captchaRepository->getConfiguredCaptcha();
+        $captcha = $this->container->get('shopware.captcha.repository')->getConfiguredCaptcha();
 
         $captchaName = $captcha->getName();
-        $this->View()->loadTemplate(sprintf('widgets/captcha/%s.tpl', $captchaName));
+        $this->View()->loadTemplate(\sprintf('widgets/captcha/%s.tpl', $captchaName));
         $this->View()->assign($captcha->getTemplateData());
     }
 
     /**
      * Assigns a captcha by the passed name in the request to the view.
-     * If no name assign noCaptcha
+     * If no name is given, "noCaptcha" is used.
+     *
+     * @return void
      */
     public function getCaptchaByNameAction()
     {
@@ -83,7 +86,7 @@ public function getCaptchaByNameAction()
             $captcha = $captchaRepository->getCaptchaByName('nocaptcha');
         }
 
-        $this->View()->loadTemplate(sprintf('widgets/captcha/%s.tpl', $captcha->getName()));
+        $this->View()->loadTemplate(\sprintf('widgets/captcha/%s.tpl', $captcha->getName()));
         $this->View()->assign($captcha->getTemplateData());
     }
 }
diff --git a/engine/Shopware/Controllers/Widgets/Checkout.php b/engine/Shopware/Controllers/Widgets/Checkout.php
index bf3ccd1d599..e2e5aad5959 100644
--- a/engine/Shopware/Controllers/Widgets/Checkout.php
+++ b/engine/Shopware/Controllers/Widgets/Checkout.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Shopware_Controllers_Widgets_Checkout extends Enlight_Controller_Action
diff --git a/engine/Shopware/Controllers/Widgets/Compare.php b/engine/Shopware/Controllers/Widgets/Compare.php
index 1210a32cf50..e1934dc0a1b 100644
--- a/engine/Shopware/Controllers/Widgets/Compare.php
+++ b/engine/Shopware/Controllers/Widgets/Compare.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Shopware_Controllers_Widgets_Compare extends Enlight_Controller_Action
diff --git a/engine/Shopware/Controllers/Widgets/Emotion.php b/engine/Shopware/Controllers/Widgets/Emotion.php
index 66c8435b46e..af1101bd86a 100644
--- a/engine/Shopware/Controllers/Widgets/Emotion.php
+++ b/engine/Shopware/Controllers/Widgets/Emotion.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Bundle\EmotionBundle\Service\EmotionServiceInterface;
@@ -143,8 +143,8 @@ public function previewAction()
 
         $this->View()->assign($viewAssignments);
 
-        //fake to prevent rendering the templates with the widgets module.
-        //otherwise the template engine don't accept to load templates of the `frontend` module
+        // fake to prevent rendering the templates with the widgets module.
+        // otherwise the template engine don't accept to load templates of the `frontend` module
         $this->Request()->setModuleName('frontend');
     }
 
diff --git a/engine/Shopware/Controllers/Widgets/Error.php b/engine/Shopware/Controllers/Widgets/Error.php
index 36d4c5bf640..6f862d9b527 100644
--- a/engine/Shopware/Controllers/Widgets/Error.php
+++ b/engine/Shopware/Controllers/Widgets/Error.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Shopware_Controllers_Widgets_Error extends Shopware_Controllers_Frontend_Error
diff --git a/engine/Shopware/Controllers/Widgets/Index.php b/engine/Shopware/Controllers/Widgets/Index.php
index 9233de8c35e..046ac0bf158 100644
--- a/engine/Shopware/Controllers/Widgets/Index.php
+++ b/engine/Shopware/Controllers/Widgets/Index.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Models\Shop\DetachedShop;
diff --git a/engine/Shopware/Controllers/Widgets/Listing.php b/engine/Shopware/Controllers/Widgets/Listing.php
index 59c253eb593..ee735f74200 100644
--- a/engine/Shopware/Controllers/Widgets/Listing.php
+++ b/engine/Shopware/Controllers/Widgets/Listing.php
@@ -1,28 +1,30 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\DBAL\Connection;
+use Shopware\Bundle\SearchBundle\FacetInterface;
 use Shopware\Bundle\SearchBundle\ProductSearchInterface;
 use Shopware\Bundle\SearchBundle\ProductSearchResult;
 use Shopware\Bundle\SearchBundle\StoreFrontCriteriaFactoryInterface;
@@ -38,12 +40,10 @@
 use Shopware\Components\ProductStream\Repository;
 use Shopware\Components\QueryAliasMapper;
 use Shopware\Models\Shop\Shop;
+use Shopware\Models\Shop\Template;
 
 class Shopware_Controllers_Widgets_Listing extends Enlight_Controller_Action
 {
-    /**
-     * Pre dispatch method
-     */
     public function preDispatch(): void
     {
         $this->Response()->setHeader('x-robots-tag', 'noindex');
@@ -69,16 +69,14 @@ public function productNavigationAction(): void
             }
 
             if (!$this->Request()->has('sSort')) {
-                $default = $this->get(Shopware_Components_Config::class)->get('defaultListingSorting');
+                $default = $this->container->get(Shopware_Components_Config::class)->get('defaultListingSorting');
                 $this->Request()->setParam('sSort', $default);
             }
 
-            /** @var sArticles $articleModule */
-            $articleModule = Shopware()->Modules()->Articles();
-            $navigation = $articleModule->getProductNavigation($orderNumber, $categoryId, $this->Request());
+            $navigation = $this->container->get('modules')->Articles()->getProductNavigation($orderNumber, $categoryId, $this->Request());
 
-            $linkRewriter = static function ($link) {
-                return Shopware()->Modules()->Core()->sRewriteLink($link);
+            $linkRewriter = function ($link) {
+                return $this->container->get('modules')->Core()->sRewriteLink($link);
             };
 
             if (isset($navigation['previousProduct'])) {
@@ -110,16 +108,21 @@ public function productNavigationAction(): void
     /**
      * Topseller action for getting topsellers
      * by category with perPage filtering
+     *
+     * @return void
      */
     public function topSellerAction()
     {
         $perPage = (int) $this->Request()->getParam('perPage', 4);
-        $this->View()->assign('sCharts', Shopware()->Modules()->Articles()->sGetArticleCharts(
+        $this->View()->assign('sCharts', $this->container->get('modules')->Articles()->sGetArticleCharts(
             $this->Request()->getParam('sCategory')
         ));
         $this->View()->assign('perPage', $perPage);
     }
 
+    /**
+     * @return void
+     */
     public function productsAction()
     {
         $numbers = $this->Request()->getParam('numbers');
@@ -146,9 +149,12 @@ public function productsAction()
         $this->View()->assign(['sArticles' => $convertedProducts, 'articles' => $convertedProducts]);
     }
 
+    /**
+     * @return void
+     */
     public function streamAction()
     {
-        $streamId = $this->Request()->getParam('streamId');
+        $streamId = (int) $this->Request()->getParam('streamId');
 
         if ($this->Request()->get('type') === 'slider') {
             $this->View()->loadTemplate('frontend/_includes/product_slider.tpl');
@@ -177,10 +183,12 @@ public function streamAction()
 
     /**
      * Tag cloud by category
+     *
+     * @return void
      */
     public function tagCloudAction()
     {
-        $config = Shopware()->Plugins()->Frontend()->TagCloud()->Config();
+        $config = $this->container->get('plugins')->Frontend()->TagCloud()->Config();
 
         if (empty($config->get('show'))) {
             return;
@@ -188,8 +196,8 @@ public function tagCloudAction()
 
         $controller = $this->Request()->getParam('sController', $this->Request()->getControllerName());
 
-        if (strpos($config->get('controller'), $controller) !== false) {
-            $this->View()->assign('sCloud', Shopware()->Modules()->Marketing()->sBuildTagCloud(
+        if (str_contains($config->get('controller'), $controller)) {
+            $this->View()->assign('sCloud', $this->container->get('modules')->Marketing()->sBuildTagCloud(
                 $this->Request()->getParam('sCategory')
             ));
         }
@@ -198,6 +206,8 @@ public function tagCloudAction()
     /**
      * Loads the listing count for the provided listing parameters.
      * Sets a json response with: `facets`, `totalCount` and `products`.
+     *
+     * @return void
      */
     public function listingCountAction()
     {
@@ -230,7 +240,7 @@ public function listingCountAction()
     }
 
     /**
-     * Gets a Callback-Function (callback) and the Id of an category (categoryID) from Request and read its first child-level
+     * @return void
      */
     public function getCategoryAction()
     {
@@ -242,7 +252,7 @@ public function getCategoryAction()
     }
 
     /**
-     * Gets a Callback-Function (callback) and the Id of an category (categoryID) from Request and read its first child-level
+     * @return void
      */
     public function getCustomPageAction()
     {
@@ -264,11 +274,9 @@ public function getCustomPageAction()
     /**
      * Helper function to return the category information by category id
      *
-     * @param int $categoryId
-     *
-     * @return array
+     * @return array<string, mixed>
      */
-    private function getCategoryById($categoryId)
+    private function getCategoryById(int $categoryId): array
     {
         $childrenIds = $this->getCategoryChildrenIds($categoryId);
         $childrenIds[] = $categoryId;
@@ -293,13 +301,11 @@ private function getCategoryById($categoryId)
     }
 
     /**
-     * @param int $categoryId
-     *
      * @throws Exception
      *
-     * @return array
+     * @return array<int>
      */
-    private function getCategoryChildrenIds($categoryId)
+    private function getCategoryChildrenIds(int $categoryId): array
     {
         $query = $this->container->get(Connection::class)->createQueryBuilder();
         $query->select('category.id')
@@ -308,10 +314,10 @@ private function getCategoryChildrenIds($categoryId)
             ->andWhere('category.active = 1')
             ->setParameter(':parentId', $categoryId);
 
-        return $query->execute()->fetchAll(PDO::FETCH_COLUMN);
+        return array_map('\intval', $query->execute()->fetchFirstColumn());
     }
 
-    private function setSearchResultResponse(ProductSearchResult $result)
+    private function setSearchResultResponse(ProductSearchResult $result): void
     {
         $body = [
             'totalCount' => $result->getTotalCount(),
@@ -319,42 +325,39 @@ private function setSearchResultResponse(ProductSearchResult $result)
 
         if ($this->Request()->getParam('loadFacets')) {
             $body['facets'] = array_values($result->getFacets());
+            $body['listing'] = false;
+            $body['pagination'] = false;
         }
         if ($this->Request()->getParam('loadProducts')) {
-            $body['listing'] = $this->fetchListing($result);
-            $body['pagination'] = $this->fetchPagination($result);
+            $this->prepareListing($result);
+            $body['listing'] = true;
+            $this->preparePagination($result);
+            $body['pagination'] = true;
         }
         $this->View()->assign($body);
 
         $this->Response()->headers->set('Shopware-Listing-Total', (string) $result->getTotalCount());
     }
 
-    /**
-     * @param int $categoryId
-     * @param int $productStreamId
-     *
-     * @return ProductSearchResult
-     */
-    private function fetchStreamListing($categoryId, $productStreamId)
+    private function fetchStreamListing(int $categoryId, int $productStreamId): ProductSearchResult
     {
-        $contextService = $this->get(ContextServiceInterface::class);
-        $context = $contextService->getShopContext();
+        $context = $this->container->get(ContextServiceInterface::class)->getShopContext();
 
-        $factory = $this->get(CriteriaFactoryInterface::class);
-        $criteria = $factory->createCriteria($this->Request(), $context);
+        $criteria = $this->container->get(CriteriaFactoryInterface::class)->createCriteria($this->Request(), $context);
 
-        $streamRepository = $this->get(Repository::class);
+        $streamRepository = $this->container->get(Repository::class);
         $streamRepository->prepareCriteria($criteria, $productStreamId);
 
-        $facetService = $this->get(CustomFacetServiceInterface::class);
-        $facets = $facetService->getFacetsOfCategories([$categoryId], $context);
-
-        $facets = array_shift($facets);
+        $facets = $this->container->get(CustomFacetServiceInterface::class)->getFacetsOfCategories([$categoryId], $context);
+        $facets = $facets[$categoryId];
         foreach ($facets as $facet) {
-            $criteria->addFacet($facet->getFacet());
+            $customFacet = $facet->getFacet();
+            if ($customFacet instanceof FacetInterface) {
+                $criteria->addFacet($customFacet);
+            }
         }
 
-        $facetFilter = $this->get('shopware_product_stream.facet_filter');
+        $facetFilter = $this->container->get('shopware_product_stream.facet_filter');
         $facetFilter->add($criteria);
 
         $criteria->setGeneratePartialFacets(
@@ -365,7 +368,7 @@ private function fetchStreamListing($categoryId, $productStreamId)
             $criteria->resetFacets();
         }
 
-        $search = $this->get(ProductSearchInterface::class);
+        $search = $this->container->get(ProductSearchInterface::class);
 
         if (!$this->Request()->getParam('loadProducts')) {
             $criteria->limit(1);
@@ -386,16 +389,11 @@ private function fetchStreamListing($categoryId, $productStreamId)
         );
     }
 
-    /**
-     * @return ProductSearchResult
-     */
-    private function fetchCategoryListing()
+    private function fetchCategoryListing(): ProductSearchResult
     {
-        $contextService = $this->get(ContextServiceInterface::class);
-        $context = $contextService->getShopContext();
+        $context = $this->container->get(ContextServiceInterface::class)->getShopContext();
 
-        $factory = $this->get(StoreFrontCriteriaFactoryInterface::class);
-        $criteria = $factory->createListingCriteria($this->Request(), $context);
+        $criteria = $this->container->get(StoreFrontCriteriaFactoryInterface::class)->createListingCriteria($this->Request(), $context);
 
         $criteria->setGeneratePartialFacets(
             $this->container->get(Shopware_Components_Config::class)->get('listingMode') === 'filter_ajax_reload'
@@ -405,7 +403,7 @@ private function fetchCategoryListing()
             $criteria->resetFacets();
         }
 
-        $search = $this->get(ProductSearchInterface::class);
+        $search = $this->container->get(ProductSearchInterface::class);
 
         if (!$this->Request()->getParam('loadProducts')) {
             $criteria->limit(1);
@@ -414,16 +412,11 @@ private function fetchCategoryListing()
         return $search->search($criteria, $context);
     }
 
-    /**
-     * @return ProductSearchResult
-     */
-    private function fetchSearchListing()
+    private function fetchSearchListing(): ProductSearchResult
     {
-        $contextService = $this->get(ContextServiceInterface::class);
-        $context = $contextService->getShopContext();
+        $context = $this->container->get(ContextServiceInterface::class)->getShopContext();
 
-        $factory = $this->get(StoreFrontCriteriaFactoryInterface::class);
-        $criteria = $factory->createSearchCriteria($this->Request(), $context);
+        $criteria = $this->container->get(StoreFrontCriteriaFactoryInterface::class)->createSearchCriteria($this->Request(), $context);
 
         $criteria->setGeneratePartialFacets(
             $this->container->get(Shopware_Components_Config::class)->get('listingMode') === 'filter_ajax_reload'
@@ -433,7 +426,7 @@ private function fetchSearchListing()
             $criteria->resetFacets();
         }
 
-        $search = $this->get(ProductSearchInterface::class);
+        $search = $this->container->get(ProductSearchInterface::class);
 
         if (!$this->Request()->getParam('loadProducts')) {
             $criteria->limit(1);
@@ -442,19 +435,16 @@ private function fetchSearchListing()
         return $search->search($criteria, $context);
     }
 
-    /**
-     * @return string
-     */
-    private function fetchListing(ProductSearchResult $result)
+    private function prepareListing(ProductSearchResult $result): void
     {
         $categoryId = (int) $this->Request()->getParam('sCategory');
 
         if ($this->Request()->has('productBoxLayout')) {
             $boxLayout = $this->Request()->get('productBoxLayout');
         } else {
-            $boxLayout = $this->get(Shopware_Components_Config::class)->get('searchProductBoxLayout');
+            $boxLayout = $this->container->get(Shopware_Components_Config::class)->get('searchProductBoxLayout');
             if ($categoryId) {
-                $boxLayout = Shopware()->Modules()->Categories()->getProductBoxLayout($categoryId);
+                $boxLayout = $this->container->get('modules')->Categories()->getProductBoxLayout($categoryId);
             }
         }
 
@@ -467,21 +457,16 @@ private function fetchListing(ProductSearchResult $result)
             'pageIndex' => (int) $this->Request()->getParam('sPage'),
             'productBoxLayout' => $boxLayout,
             'sCategoryCurrent' => $categoryId,
-            'sCategoryContent' => Shopware()->Modules()->Categories()->sGetCategoryContent($categoryId),
+            'sCategoryContent' => $this->container->get('modules')->Categories()->sGetCategoryContent($categoryId),
         ]);
 
-        $this->get('events')->notify('Shopware_Controllers_Widgets_Listing_fetchListing_preFetch', [
+        $this->container->get('events')->notify('Shopware_Controllers_Widgets_Listing_fetchListing_preFetch', [
             'result' => $result,
             'subject' => $this,
         ]);
-
-        return $this->View()->fetch('frontend/listing/listing_ajax.tpl');
     }
 
-    /**
-     * @return string
-     */
-    private function fetchPagination(ProductSearchResult $result)
+    private function preparePagination(ProductSearchResult $result): void
     {
         $sPerPage = (int) $this->Request()->getParam('sPerPage');
 
@@ -493,36 +478,31 @@ private function fetchPagination(ProductSearchResult $result)
             'sPage' => (int) $this->Request()->getParam('sPage'),
             'pages' => ceil($result->getTotalCount() / $sPerPage),
             'baseUrl' => $this->Request()->getBaseUrl() . $this->Request()->getPathInfo(),
-            'pageSizes' => explode('|', $this->container->get(\Shopware_Components_Config::class)->get('numberArticlesToShow')),
+            'pageSizes' => explode('|', $this->container->get(Shopware_Components_Config::class)->get('numberArticlesToShow')),
             'shortParameters' => $this->container->get(QueryAliasMapper::class)->getQueryAliases(),
             'limit' => $sPerPage,
         ]);
 
-        $this->get('events')->notify('Shopware_Controllers_Widgets_Listing_fetchPagination_preFetch', [
+        $this->container->get('events')->notify('Shopware_Controllers_Widgets_Listing_fetchPagination_preFetch', [
             'result' => $result,
             'subject' => $this,
         ]);
-
-        return $this->View()->fetch('frontend/listing/actions/action-pagination.tpl');
     }
 
     /**
      * @param int|null $categoryId
      *
-     * @return array
+     * @return array<string, mixed>
      */
-    private function convertProductsResult(ProductSearchResult $result, $categoryId)
+    private function convertProductsResult(ProductSearchResult $result, $categoryId): array
     {
-        $converter = $this->get(LegacyStructConverter::class);
-
-        $products = $converter->convertListProductStructList($result->getProducts());
+        $products = $this->container->get(LegacyStructConverter::class)->convertListProductStructList($result->getProducts());
 
         if (empty($products)) {
             return $products;
         }
 
-        $useShortDescription = $this->get('config')->get('useShortDescriptionInListing');
-        if ($useShortDescription) {
+        if ($this->container->get('config')->get('useShortDescriptionInListing')) {
             foreach ($products as &$product) {
                 if (\strlen($product['description']) > 5) {
                     $product['description_long'] = $product['description'];
@@ -531,7 +511,7 @@ private function convertProductsResult(ProductSearchResult $result, $categoryId)
             unset($product);
         }
 
-        return $this->get(ListingLinkRewriteServiceInterface::class)->rewriteLinks(
+        return $this->container->get(ListingLinkRewriteServiceInterface::class)->rewriteLinks(
             $result->getCriteria(),
             $products,
             $result->getContext(),
@@ -539,21 +519,23 @@ private function convertProductsResult(ProductSearchResult $result, $categoryId)
         );
     }
 
-    private function loadThemeConfig()
+    private function loadThemeConfig(): void
     {
-        $inheritance = $this->container->get('theme_inheritance');
-
         $shop = $this->container->get('shop');
         if (!$shop instanceof Shop) {
-            throw new RuntimeException('Shop is not initialized correctly in DI container');
+            return;
         }
 
-        $config = $inheritance->buildConfig($shop->getTemplate(), $shop, false);
+        $template = $shop->getTemplate();
+        if (!$template instanceof Template) {
+            return;
+        }
+
+        $inheritance = $this->container->get('theme_inheritance');
+        $config = $inheritance->buildConfig($template, $shop, false);
 
-        $this->get('template')->addPluginsDir(
-            $inheritance->getSmartyDirectories(
-                $shop->getTemplate()
-            )
+        $this->container->get('template')->addPluginsDir(
+            $inheritance->getSmartyDirectories($template)
         );
         $this->View()->assign('theme', $config);
     }
diff --git a/engine/Shopware/Controllers/Widgets/Recommendation.php b/engine/Shopware/Controllers/Widgets/Recommendation.php
index 1c75807c2dc..db947887d8c 100644
--- a/engine/Shopware/Controllers/Widgets/Recommendation.php
+++ b/engine/Shopware/Controllers/Widgets/Recommendation.php
@@ -1,27 +1,31 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface;
+use Shopware\Bundle\StoreFrontBundle\Service\ListProductServiceInterface;
+use Shopware\Components\Compatibility\LegacyStructConverter;
+
 class Shopware_Controllers_Widgets_Recommendation extends Enlight_Controller_Action
 {
     /**
@@ -108,10 +112,10 @@ private function getPromotions($numbers)
             return [];
         }
 
-        $context = $this->get(\Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface::class)->getShopContext();
-        $products = $this->get(\Shopware\Bundle\StoreFrontBundle\Service\ListProductServiceInterface::class)
+        $context = $this->get(ContextServiceInterface::class)->getShopContext();
+        $products = $this->get(ListProductServiceInterface::class)
             ->getList($numbers, $context);
 
-        return $this->get(\Shopware\Components\Compatibility\LegacyStructConverter::class)->convertListProductStructList($products);
+        return $this->get(LegacyStructConverter::class)->convertListProductStructList($products);
     }
 }
diff --git a/engine/Shopware/Core/sAdmin.php b/engine/Shopware/Core/sAdmin.php
index 68918b3f33e..2fcbfbb2631 100644
--- a/engine/Shopware/Core/sAdmin.php
+++ b/engine/Shopware/Core/sAdmin.php
@@ -4,37 +4,38 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Query\QueryBuilder;
+use Shopware\Bundle\AccountBundle\Form\Account\PersonalFormType;
 use Shopware\Bundle\AccountBundle\Service\OptInLoginService;
 use Shopware\Bundle\AccountBundle\Service\OptInLoginServiceInterface;
 use Shopware\Bundle\AttributeBundle\Service\CrudServiceInterface;
 use Shopware\Bundle\AttributeBundle\Service\DataLoader;
 use Shopware\Bundle\AttributeBundle\Service\DataLoaderInterface;
 use Shopware\Bundle\CartBundle\CartKey;
+use Shopware\Bundle\OrderBundle\Service\ShippingCostServiceInterface;
 use Shopware\Bundle\StoreFrontBundle\Gateway\PaymentGatewayInterface;
 use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface;
 use Shopware\Bundle\StoreFrontBundle\Service\ListProductServiceInterface;
-use Shopware\Components\Captcha\CaptchaValidator;
+use Shopware\Bundle\StoreFrontBundle\Struct\Tax;
 use Shopware\Components\Cart\CartOrderNumberProviderInterface;
 use Shopware\Components\Cart\CartPersistServiceInterface;
 use Shopware\Components\Cart\ConditionalLineItemServiceInterface;
@@ -49,6 +50,7 @@
 use Shopware\Components\Validator\EmailValidatorInterface;
 use Shopware\Models\Customer\Address;
 use Shopware\Models\Customer\Customer;
+use Shopware\Models\Dispatch\Dispatch;
 use Shopware\Models\Mail\Mail;
 use ShopwarePlugin\PaymentMethods\Components\BasePaymentMethod;
 
@@ -58,7 +60,7 @@
  *
  * @phpstan-type ShippingCostArray array{value: string, factor: string, brutto: float, surcharge: float, taxMode: string, tax: float, netto: float, shippingfree?: float, difference?: array{float: float, formated: string}}
  */
-class sAdmin implements \Enlight_Hook
+class sAdmin implements Enlight_Hook
 {
     public const NO_SHIPPING_COSTS = [
         'value' => '0',
@@ -70,6 +72,8 @@ class sAdmin implements \Enlight_Hook
         'netto' => 0.0,
     ];
 
+    public const FALLBACK_USER_ID = 0;
+
     /**
      * Check if current active shop has own registration
      *
@@ -97,133 +101,94 @@ class sAdmin implements \Enlight_Hook
     /**
      * Database connection which used for each database operation in this class.
      * Injected over the class constructor
-     *
-     * @var Enlight_Components_Db_Adapter_Pdo_Mysql
      */
-    private $db;
+    private Enlight_Components_Db_Adapter_Pdo_Mysql $db;
 
     /**
      * Event manager which is used for the event system of shopware.
      * Injected over the class constructor
-     *
-     * @var Enlight_Event_EventManager
      */
-    private $eventManager;
+    private Enlight_Event_EventManager $eventManager;
 
     /**
      * Shopware configuration object which used for
      * each config access in this class.
      * Injected over the class constructor
-     *
-     * @var Shopware_Components_Config
      */
-    private $config;
+    private Shopware_Components_Config $config;
 
     /**
      * Shopware session object.
      * Injected over the class constructor
-     *
-     * @var Enlight_Components_Session_Namespace
      */
-    private $session;
+    private Enlight_Components_Session_Namespace $session;
 
     /**
      * Request wrapper object
-     *
-     * @var Enlight_Controller_Front
      */
-    private $front;
+    private Enlight_Controller_Front $front;
 
     /**
      * Shopware password encoder.
      * Injected over the class constructor
-     *
-     * @var Manager
      */
-    private $passwordEncoder;
+    private Manager $passwordEncoder;
 
     /**
      * The snippet manager
-     *
-     * @var Shopware_Components_Snippet_Manager
      */
-    private $snippetManager;
+    private Shopware_Components_Snippet_Manager $snippetManager;
 
-    /**
-     * @var ContextServiceInterface
-     */
-    private $contextService;
+    private ContextServiceInterface $contextService;
 
     /**
      * Module manager for core class instances
-     *
-     * @var Shopware_Components_Modules
      */
-    private $moduleManager;
+    private Shopware_Components_Modules $moduleManager;
 
     /**
      * Email address validator
-     *
-     * @var EmailValidatorInterface
      */
-    private $emailValidator;
+    private EmailValidatorInterface $emailValidator;
 
-    /**
-     * @var DataLoaderInterface
-     */
-    private $attributeLoader;
+    private DataLoaderInterface $attributeLoader;
 
-    /**
-     * @var Shopware_Components_Translation
-     */
-    private $translationComponent;
+    private Shopware_Components_Translation $translationComponent;
 
-    /**
-     * @var Connection
-     */
-    private $connection;
+    private Connection $connection;
 
-    /**
-     * @var OptInLoginServiceInterface
-     */
-    private $optInLoginService;
+    private OptInLoginServiceInterface $optInLoginService;
 
-    /**
-     * @var ConditionalLineItemServiceInterface
-     */
-    private $conditionalLineItemService;
+    private ConditionalLineItemServiceInterface $conditionalLineItemService;
 
-    /**
-     * @var CartOrderNumberProviderInterface
-     */
-    private $cartOrderNumberProvider;
+    private CartOrderNumberProviderInterface $cartOrderNumberProvider;
 
-    /**
-     * @var array
-     */
-    private $cache = [
+    private array $cache = [
         'country' => [],
         'payment' => [],
     ];
 
     private CSRFTokenValidator $csrfTokenValidator;
 
+    private ShippingCostServiceInterface $shippingCostService;
+
     public function __construct(
-        Enlight_Components_Db_Adapter_Pdo_Mysql $db = null,
-        Enlight_Event_EventManager $eventManager = null,
-        Shopware_Components_Config $config = null,
-        Enlight_Components_Session_Namespace $session = null,
-        Enlight_Controller_Front $front = null,
-        Manager $passwordEncoder = null,
-        Shopware_Components_Snippet_Manager $snippetManager = null,
-        Shopware_Components_Modules $moduleManager = null,
-        sSystem $systemModule = null,
-        ContextServiceInterface $contextService = null,
-        EmailValidatorInterface $emailValidator = null,
-        Shopware_Components_Translation $translationComponent = null,
-        Connection $connection = null,
-        OptInLoginServiceInterface $optInLoginService = null,
-        CSRFTokenValidator $csrfTokenValidator = null
+        ?Enlight_Components_Db_Adapter_Pdo_Mysql $db = null,
+        ?Enlight_Event_EventManager $eventManager = null,
+        ?Shopware_Components_Config $config = null,
+        ?Enlight_Components_Session_Namespace $session = null,
+        ?Enlight_Controller_Front $front = null,
+        ?Manager $passwordEncoder = null,
+        ?Shopware_Components_Snippet_Manager $snippetManager = null,
+        ?Shopware_Components_Modules $moduleManager = null,
+        ?sSystem $systemModule = null,
+        ?ContextServiceInterface $contextService = null,
+        ?EmailValidatorInterface $emailValidator = null,
+        ?Shopware_Components_Translation $translationComponent = null,
+        ?Connection $connection = null,
+        ?OptInLoginServiceInterface $optInLoginService = null,
+        ?CSRFTokenValidator $csrfTokenValidator = null,
+        ?ShippingCostServiceInterface $shippingCostService = null
     ) {
         $this->db = $db ?: Shopware()->Db();
         $this->eventManager = $eventManager ?: Shopware()->Events();
@@ -242,12 +207,13 @@ public function __construct(
         $this->emailValidator = $emailValidator ?: Shopware()->Container()->get(EmailValidator::class);
         $this->subshopId = $this->contextService->getShopContext()->getShop()->getParentId();
         $this->attributeLoader = Shopware()->Container()->get(DataLoader::class);
-        $this->translationComponent = $translationComponent ?: Shopware()->Container()->get(\Shopware_Components_Translation::class);
+        $this->translationComponent = $translationComponent ?: Shopware()->Container()->get(Shopware_Components_Translation::class);
         $this->connection = $connection ?: Shopware()->Container()->get(Connection::class);
         $this->optInLoginService = $optInLoginService ?: Shopware()->Container()->get(OptInLoginService::class);
         $this->conditionalLineItemService = Shopware()->Container()->get(ConditionalLineItemServiceInterface::class);
         $this->cartOrderNumberProvider = Shopware()->Container()->get(CartOrderNumberProviderInterface::class);
         $this->csrfTokenValidator = $csrfTokenValidator ?: Shopware()->Container()->get(CSRFTokenValidator::class);
+        $this->shippingCostService = $shippingCostService ?: Shopware()->Container()->get(ShippingCostServiceInterface::class);
     }
 
     /**
@@ -276,22 +242,25 @@ public function sGetPaymentMeanById($id, $user = false)
         $sEsd = $this->moduleManager->Basket()->sCheckForESD();
         $isMobile = $this->front->Request()->getDeviceType() === 'mobile';
 
-        if (!\is_array($user)) {
-            $user = [];
+        $customer = $user;
+        if (!\is_array($customer)) {
+            $customer = [];
         }
 
+        $paymentId = $data['id'] ?? null;
+
         // Check for risk management
         // If rules match, reset to default payment mean if this payment mean was not
         // set by shop owner
 
         // Hide payment means which are not active
-        if (!$data['active'] && $data['id'] != $user['additional']['user']['paymentpreset']) {
+        if (empty($data['active']) && $paymentId != ($customer['additional']['user']['paymentpreset'] ?? null)) {
             $resetPayment = $this->config->get('sPAYMENTDEFAULT');
         }
 
         // If esd - order, hide payment means which
         // are not available for esd
-        if (!$data['esdactive'] && $sEsd) {
+        if (empty($data['esdactive']) && $sEsd) {
             $resetPayment = $this->config->get('sPAYMENTDEFAULT');
         }
 
@@ -301,14 +270,13 @@ public function sGetPaymentMeanById($id, $user = false)
         }
 
         // Check additional rules
-        if (
-            $this->sManageRisks($data['id'], null, $user)
-            && $data['id'] != $user['additional']['user']['paymentpreset']
+        if ($this->sManageRisks($paymentId, null, $customer)
+            && $paymentId != ($customer['additional']['user']['paymentpreset'] ?? null)
         ) {
             $resetPayment = $this->config->get('sPAYMENTDEFAULT');
         }
 
-        if (!empty($user['additional']['countryShipping']['id'])) {
+        if (!empty($customer['additional']['countryShipping']['id'])) {
             $sql = '
                 SELECT 1
                 FROM s_core_paymentmeans p
@@ -335,7 +303,7 @@ public function sGetPaymentMeanById($id, $user = false)
                 $sql,
                 [
                     $this->contextService->getShopContext()->getShop()->getId(),
-                    $user['additional']['countryShipping']['id'],
+                    $customer['additional']['countryShipping']['id'],
                     $id,
                 ]
             );
@@ -344,7 +312,7 @@ public function sGetPaymentMeanById($id, $user = false)
             }
         }
 
-        if ($resetPayment && $user['additional']['user']['id']) {
+        if ($resetPayment && ($customer['additional']['user']['id'] ?? null)) {
             $this->eventManager->notify(
                 'Shopware_Modules_Admin_Payment_Fallback',
                 $data
@@ -353,14 +321,14 @@ public function sGetPaymentMeanById($id, $user = false)
             $this->db->update(
                 's_user',
                 ['paymentID' => $resetPayment],
-                ['id = ?' => $user['additional']['user']['id']]
+                ['id = ?' => $customer['additional']['user']['id']]
             );
             $data = ['id' => $resetPayment];
         }
 
-        if (isset($data['id'])) {
+        if (isset($paymentId)) {
             $data = Shopware()->Container()->get(PaymentGatewayInterface::class)
-                ->getList([$data['id']], $this->contextService->getShopContext());
+                ->getList([$paymentId], $this->contextService->getShopContext());
 
             if (!empty($data)) {
                 $data = Shopware()->Container()->get(LegacyStructConverter::class)
@@ -368,29 +336,30 @@ public function sGetPaymentMeanById($id, $user = false)
             }
         }
 
-        $data = $this->eventManager->filter(
+        return $this->eventManager->filter(
             'Shopware_Modules_Admin_GetPaymentMeanById_DataFilter',
             $data,
-            ['subject' => $this, 'id' => $id, 'user' => $user]
+            ['subject' => $this, 'id' => $id, 'user' => $customer]
         );
-
-        return $data;
     }
 
     /**
      * Get all available payments
      *
-     * @return array Payments data
+     * @return array<array<string, mixed>> Payments data
      */
     public function sGetPaymentMeans()
     {
         $isMobile = $this->front->Request()->getDeviceType() === 'mobile';
 
         $user = $this->sGetUserData();
+        if (!\is_array($user)) {
+            throw new RuntimeException('Could not get customer data');
+        }
 
         $sEsd = $this->moduleManager->Basket()->sCheckForESD();
 
-        $countryID = (int) $user['additional']['countryShipping']['id'];
+        $countryID = (int) ($user['additional']['countryShipping']['id'] ?? 0);
         $subShopID = (int) $this->contextService->getShopContext()->getShop()->getId();
         if (empty($countryID)) {
             $countryID = $this->db->fetchOne(
@@ -447,7 +416,7 @@ public function sGetPaymentMeans()
 
         foreach ($paymentMethods as $payKey => $payValue) {
             // Hide payment means which are not active
-            if (empty($payValue['active']) && $payValue['id'] != $user['additional']['user']['paymentpreset']) {
+            if (empty($payValue['active']) && $payValue['id'] != ($user['additional']['user']['paymentpreset'] ?? 0)) {
                 unset($paymentMethods[$payKey]);
                 continue;
             }
@@ -465,9 +434,8 @@ public function sGetPaymentMeans()
             }
 
             // Check additional rules
-            if (
-                $this->sManageRisks($payValue['id'], null, $user)
-                && $payValue['id'] != $user['additional']['user']['paymentpreset']
+            if ($this->sManageRisks($payValue['id'], null, $user)
+                && $payValue['id'] != ($user['additional']['user']['paymentpreset'] ?? 0)
             ) {
                 unset($paymentMethods[$payKey]);
             }
@@ -495,7 +463,7 @@ public function sGetPaymentMeans()
     /**
      * Loads the system class of the specified payment mean
      *
-     * @param array $paymentData Array with payment data
+     * @param array|null $paymentData Array with payment data
      *
      * @throws Enlight_Exception If no payment classes were loaded
      *
@@ -506,10 +474,12 @@ public function sInitiatePaymentClass($paymentData)
         /** @var array<string, string> $dirs */
         $dirs = [];
 
-        if (str_ends_with($paymentData['class'], '.php')) {
-            $index = substr($paymentData['class'], 0, (int) strpos($paymentData['class'], '.php'));
-        } else {
-            $index = $paymentData['class'];
+        if (\is_array($paymentData)) {
+            if (str_ends_with($paymentData['class'], '.php')) {
+                $index = substr($paymentData['class'], 0, (int) strpos($paymentData['class'], '.php'));
+            } else {
+                $index = $paymentData['class'];
+            }
         }
 
         $dirs = $this->eventManager->filter(
@@ -518,7 +488,7 @@ public function sInitiatePaymentClass($paymentData)
             ['subject' => $this]
         );
 
-        $class = \array_key_exists($index, $dirs) ? $dirs[$index] : $dirs['default'];
+        $class = isset($index) && \array_key_exists($index, $dirs) ? $dirs[$index] : $dirs['default'];
         if (!$class) {
             throw new Enlight_Exception('sValidateStep3 #02: Payment classes dir not loaded');
         }
@@ -602,7 +572,7 @@ public function sUpdateNewsletter($status, $email, $customer = false)
                 $hash = Random::getAlphanumericString(32);
                 $data = serialize(['newsletter' => $email, 'subscribeToNewsletter' => true]);
 
-                $link = $this->front->Router()->assemble([
+                $link = $this->front->ensureRouter()->assemble([
                     'sViewport' => 'newsletter',
                     'action' => 'index',
                     'sConfirmation' => $hash,
@@ -725,6 +695,9 @@ public function logout()
 
             $countries = $this->sGetCountryList();
             $country = reset($countries);
+            if (!\is_array($country)) {
+                $country = null;
+            }
 
             $this->sGetPremiumShippingcosts($country);
 
@@ -750,16 +723,11 @@ public function logout()
      */
     public function sLogin($ignoreAccountMode = false)
     {
-        if (
-        $this->eventManager->notifyUntil(
-            'Shopware_Modules_Admin_Login_Start',
-            [
-                'subject' => $this,
-                'ignoreAccountMode' => $ignoreAccountMode,
-                'post' => $this->front->Request()->getPost(),
-            ]
-        )
-        ) {
+        if ($this->eventManager->notifyUntil('Shopware_Modules_Admin_Login_Start', [
+            'subject' => $this,
+            'ignoreAccountMode' => $ignoreAccountMode,
+            'post' => $this->front->Request()->getPost(),
+        ])) {
             return false;
         }
 
@@ -767,7 +735,7 @@ public function sLogin($ignoreAccountMode = false)
         $sErrorMessages = null;
 
         // If fields are not set, markup these fields
-        $email = strtolower($this->front->Request()->getPost('email'));
+        $email = strtolower($this->front->Request()->getPost('email', ''));
         if (empty($email)) {
             $sErrorFlag['email'] = true;
         }
@@ -879,12 +847,10 @@ public function sLogin($ignoreAccountMode = false)
      */
     public function sCheckUser()
     {
-        if (
-        $this->eventManager->notifyUntil(
+        if ($this->eventManager->notifyUntil(
             'Shopware_Modules_Admin_CheckUser_Start',
             ['subject' => $this]
-        )
-        ) {
+        )) {
             return false;
         }
 
@@ -915,7 +881,7 @@ public function sCheckUser()
                 $passwordChangeDate,
                 $userMail,
                 $userId,
-                (int) ini_get('session.gc_maxlifetime'),
+                (int) \ini_get('session.gc_maxlifetime'),
             ]
         );
         $getUser = $getUser ?: [];
@@ -990,7 +956,7 @@ public function sGetCountryTranslation($country = [])
         if ($translationData[$country['id']]['countryname']) {
             $country['countryname'] = $translationData[$country['id']]['countryname'];
         }
-        if ($translationData[$country['id']]['notice']) {
+        if (isset($translationData[$country['id']]['notice'])) {
             $country['notice'] = $translationData[$country['id']]['notice'];
         }
 
@@ -1024,13 +990,13 @@ public function sGetDispatchTranslation($dispatch = [])
         }
 
         // Pass (possible) translation to country
-        if ($translationData[$dispatch['id']]['dispatch_name']) {
+        if (isset($translationData[$dispatch['id']]['dispatch_name'])) {
             $dispatch['name'] = $translationData[$dispatch['id']]['dispatch_name'];
         }
-        if ($translationData[$dispatch['id']]['dispatch_description']) {
+        if (isset($translationData[$dispatch['id']]['dispatch_description'])) {
             $dispatch['description'] = $translationData[$dispatch['id']]['dispatch_description'];
         }
-        if ($translationData[$dispatch['id']]['dispatch_status_link']) {
+        if (isset($translationData[$dispatch['id']]['dispatch_status_link'])) {
             $dispatch['status_link'] = $translationData[$dispatch['id']]['dispatch_status_link'];
         }
 
@@ -1105,7 +1071,7 @@ public function sGetCountryStateTranslation($state = null)
     /**
      * Get list of currently active countries. Includes states and translations
      *
-     * @return array Country list
+     * @return array<int, array<string, mixed>> Country list, indexed by ID
      */
     public function sGetCountryList()
     {
@@ -1123,13 +1089,11 @@ public function sGetCountryList()
             return $country;
         }, $countryList);
 
-        $countryList = $this->eventManager->filter(
+        return $this->eventManager->filter(
             'Shopware_Modules_Admin_GetCountries_FilterResult',
             $countryList,
             ['subject' => $this]
         );
-
-        return $countryList;
     }
 
     /**
@@ -1142,12 +1106,10 @@ public function sGetCountryList()
      */
     public function sSaveRegisterSendConfirmation($email)
     {
-        if (
-        $this->eventManager->notifyUntil(
+        if ($this->eventManager->notifyUntil(
             'Shopware_Modules_Admin_SaveRegisterSendConfirmation_Start',
             ['subject' => $this, 'email' => $email]
-        )
-        ) {
+        )) {
             return false;
         }
 
@@ -1155,7 +1117,6 @@ public function sSaveRegisterSendConfirmation($email)
             return false;
         }
 
-        /** @var \Shopware\Bundle\StoreFrontBundle\Struct\Shop $shop */
         $shop = $this->contextService->getShopContext()->getShop();
         $shopUrl = 'http://' . $shop->getHost() . $shop->getUrl();
 
@@ -1232,8 +1193,7 @@ public function sGetDownloads($destinationPage = 1, $perPage = 10)
         );
 
         foreach ($getOrders as $orderKey => $orderValue) {
-            if (
-                ($this->config->get('sARTICLESOUTPUTNETTO') && !$this->sSYSTEM->sUSERGROUPDATA['tax'])
+            if (($this->config->get('sARTICLESOUTPUTNETTO') && !$this->sSYSTEM->sUSERGROUPDATA['tax'])
                 || (!$this->sSYSTEM->sUSERGROUPDATA['tax'] && $this->sSYSTEM->sUSERGROUPDATA['id'])
             ) {
                 $getOrders[$orderKey]['invoice_amount'] = $this->moduleManager->Articles()
@@ -1475,7 +1435,7 @@ public function sGetUserByMail($email)
      *
      * @param int $id User id
      *
-     * @return array first name/last name
+     * @return array{firstname: string, lastname: string}|array{}
      */
     public function sGetUserNameById($id)
     {
@@ -1483,18 +1443,16 @@ public function sGetUserNameById($id)
     }
 
     /**
-     * Get all data from the current logged in user
+     * Get all data from the current logged-in user
      *
-     * @return array|false User data, of false if interrupted
+     * @return array<string, mixed>|false User data, of false if interrupted
      */
     public function sGetUserData()
     {
-        if (
-        $this->eventManager->notifyUntil(
+        if ($this->eventManager->notifyUntil(
             'Shopware_Modules_Admin_GetUserData_Start',
             ['subject' => $this]
-        )
-        ) {
+        )) {
             return false;
         }
         $register = $this->session->offsetGet('sRegister');
@@ -1513,7 +1471,8 @@ public function sGetUserData()
 
         // If user is logged in
         $userId = (int) $this->session->offsetGet('sUserId');
-        if ($userId !== 0) {
+
+        if ($userId !== self::FALLBACK_USER_ID) {
             $userData = $this->getUserBillingData($userId, $userData);
 
             $userData = $this->getUserCountryData($userData, $userId);
@@ -1536,9 +1495,9 @@ public function sGetUserData()
         } else {
             // No user logged in
             $register = $this->session->offsetGet('sRegister');
-            if (
-                $this->session->offsetGet('sCountry')
-                && $this->session->offsetGet('sCountry') != $register['billing']['country']
+
+            if ($this->session->offsetGet('sCountry')
+                && $this->session->offsetGet('sCountry') != ($register['billing']['country'] ?? 0)
             ) {
                 $register['billing']['country'] = (int) $this->session->offsetGet('sCountry');
                 $this->session->offsetSet('sRegister', $register);
@@ -1546,7 +1505,7 @@ public function sGetUserData()
 
             $userData['additional']['country'] = $this->db->fetchRow(
                 $countryQuery,
-                [(int) $register['billing']['country']]
+                [(int) ($register['billing']['country'] ?? 0)]
             );
             $userData['additional']['country'] = $userData['additional']['country'] ?: [];
             $userData['additional']['countryShipping'] = $userData['additional']['country'];
@@ -1554,13 +1513,11 @@ public function sGetUserData()
             $userData['additional']['stateShipping']['id'] = !empty($state) ? $state : 0;
         }
 
-        $userData = $this->eventManager->filter(
+        return $this->eventManager->filter(
             'Shopware_Modules_Admin_GetUserData_FilterResult',
             $userData,
             ['subject' => $this, 'id' => $this->session->offsetGet('sUserId')]
         );
-
-        return $userData;
     }
 
     /**
@@ -1603,8 +1560,7 @@ public function sManageRisks($paymentID, $basket, $user)
             } elseif ($rule['rule1'] && $rule['rule2']) {
                 $rule['rule1'] = 'sRisk' . $rule['rule1'];
                 $rule['rule2'] = 'sRisk' . $rule['rule2'];
-                if (
-                    $this->executeRiskRule($rule['rule1'], $user, $basket, $rule['value1'], $paymentID)
+                if ($this->executeRiskRule($rule['rule1'], $user, $basket, $rule['value1'], $paymentID)
                     && $this->executeRiskRule($rule['rule2'], $user, $basket, $rule['value2'], $paymentID)
                 ) {
                     return true;
@@ -1628,8 +1584,7 @@ public function sManageRisks($paymentID, $basket, $user)
      */
     public function executeRiskRule($rule, $user, $basket, $value, $paymentID = null)
     {
-        if (
-        $event = $this->eventManager->notifyUntil(
+        if ($event = $this->eventManager->notifyUntil(
             'Shopware_Modules_Admin_Execute_Risk_Rule_' . $rule,
             [
                 'rule' => $rule,
@@ -1638,8 +1593,7 @@ public function executeRiskRule($rule, $user, $basket, $value, $paymentID = null
                 'value' => $value,
                 'paymentID' => $paymentID,
             ]
-        )
-        ) {
+        )) {
             return $event->getReturn();
         }
 
@@ -1889,6 +1843,10 @@ public function sRiskBILLINGLANDISNOT($user, $order, $value)
      */
     public function sRiskNEWCUSTOMER($user, $order, $value)
     {
+        if (!isset($user['additional']['user'])) {
+            return true;
+        }
+
         return date('Y-m-d') == $user['additional']['user']['firstlogin']
             || !$user['additional']['user']['firstlogin'];
     }
@@ -2196,15 +2154,15 @@ public function sRiskDIFFER($user, $order, $value)
         // Compare street and zipcode.
         // Return true if any of them doesn't match.
         return (
-                strtolower(
-                    trim($user['shippingaddress']['street'])
-                ) != strtolower(
-                    trim($user['billingaddress']['street'])
-                )
-            ) || (
-                trim($user['shippingaddress']['zipcode'])
-                != trim($user['billingaddress']['zipcode'])
-            );
+            strtolower(
+                trim($user['shippingaddress']['street'])
+            ) !== strtolower(
+                trim($user['billingaddress']['street'])
+            )
+        ) || (
+            trim($user['shippingaddress']['zipcode'])
+            !== trim($user['billingaddress']['zipcode'])
+        );
     }
 
     /**
@@ -2300,9 +2258,9 @@ public function sRiskCURRENCIESISOISNOT($user, $order, $value)
      *
      * @param string $email       Email address
      * @param bool   $unsubscribe If true, remove email address from mailing list
-     * @param int    $groupID     Id of the mailing list group
+     * @param int    $groupID     ID of the mailing list group
      *
-     * @return array Array with the result of the operation
+     * @return array{code: int, message?: string, sErrorFlag?: array<string, true>, isNewRegistration?: bool} Array with the result of the operation
      */
     public function sNewsletterSubscription($email, $unsubscribe = false, $groupID = null)
     {
@@ -2310,14 +2268,12 @@ public function sNewsletterSubscription($email, $unsubscribe = false, $groupID =
             $errorFlag = [];
             $config = Shopware()->Container()->get(Shopware_Components_Config::class);
 
-            if (
-                $this->shouldVerifyCaptcha($config)
+            if ($this->shouldVerifyCaptcha($config)
                 && (bool) $this->front->Request()->getParam('voteConfirmed', false) === false
             ) {
-                /** @var CaptchaValidator $captchaValidator */
                 $captchaValidator = Shopware()->Container()->get('shopware.captcha.validator');
 
-                if (!$captchaValidator->validateByName($config->get('newsletterCaptcha'), $this->front->Request())) {
+                if (!$captchaValidator->validateByName($config->get('newsletterCaptcha'), $this->front->ensureRequest())) {
                     return [
                         'code' => 7,
                     ];
@@ -2366,6 +2322,16 @@ public function sNewsletterSubscription($email, $unsubscribe = false, $groupID =
                     ->get('NewsletterFailureInvalid', 'Enter valid eMail address'),
             ];
         }
+
+        if (preg_match(PersonalFormType::DOMAIN_NAME_REGEX, $this->front->Request()->getPost('firstname', '')) === 1
+            || preg_match(PersonalFormType::DOMAIN_NAME_REGEX, $this->front->Request()->getPost('lastname', '')) === 1) {
+            return [
+                'code' => 10,
+                'message' => $this->snippetManager->getNamespace('frontend/account/internalMessages')
+                    ->get('UrlInFieldFailure', 'A URL is not allowed in this field'),
+            ];
+        }
+
         if (!$unsubscribe) {
             $result = $this->subscribeNewsletter($email, $groupID);
         } else {
@@ -2401,6 +2367,7 @@ public function sNewsletterSubscription($email, $unsubscribe = false, $groupID =
                     $groupID,
                 ]
             );
+            $request = $this->front->ensureRequest();
 
             if (empty($mailDataExists)) {
                 $sql = '
@@ -2413,13 +2380,13 @@ public function sNewsletterSubscription($email, $unsubscribe = false, $groupID =
                 $this->connection->executeQuery($sql, [
                     $email,
                     $groupID,
-                    $this->front->Request()->getPost('salutation'),
-                    $this->front->Request()->getPost('title'),
-                    $this->front->Request()->getPost('firstname'),
-                    $this->front->Request()->getPost('lastname'),
-                    $this->front->Request()->getPost('street'),
-                    $this->front->Request()->getPost('zipcode'),
-                    $this->front->Request()->getPost('city'),
+                    $request->getPost('salutation', 'not_defined'),
+                    $request->getPost('title'),
+                    $request->getPost('firstname'),
+                    $request->getPost('lastname'),
+                    $request->getPost('street'),
+                    $request->getPost('zipcode'),
+                    $request->getPost('city'),
                     $added,
                     $doubleOptInConfirmed,
                 ]);
@@ -2428,12 +2395,12 @@ public function sNewsletterSubscription($email, $unsubscribe = false, $groupID =
                     's_campaigns_maildata',
                     [
                         'groupID' => $groupID,
-                        'salutation' => $this->front->Request()->getPost('salutation'),
-                        'title' => $this->front->Request()->getPost('title'),
-                        'firstname' => $this->front->Request()->getPost('firstname'),
-                        'lastname' => $this->front->Request()->getPost('lastname'),
-                        'street' => $this->front->Request()->getPost('street'),
-                        'city' => $this->front->Request()->getPost('city'),
+                        'salutation' => $request->getPost('salutation', 'not_defined'),
+                        'title' => $request->getPost('title'),
+                        'firstname' => $request->getPost('firstname'),
+                        'lastname' => $request->getPost('lastname'),
+                        'street' => $request->getPost('street'),
+                        'city' => $request->getPost('city'),
                     ],
                     [
                         'email' => $email,
@@ -2635,7 +2602,7 @@ public function sGetDispatchBasket($countryID = null, $paymentID = null, $stateI
         if (!empty($paymentID)) {
             $paymentID = (int) $paymentID;
         } elseif (!empty($userId)) {
-            $user = $this->sGetUserData();
+            $user = $this->sGetUserData() ?: [];
             $paymentID = (int) $user['additional']['payment']['id'];
         } elseif (!empty($postPaymentId)) {
             $paymentID = (int) $postPaymentId;
@@ -2714,7 +2681,7 @@ public function sGetPremiumDispatch($dispatchID = null)
      * @param int $paymentID Payment mean id
      * @param int $stateId   Country state id
      *
-     * @return array Shipping methods data
+     * @return array<int, array<string, mixed>> Shipping methods data, indexed by ID
      */
     public function sGetPremiumDispatches($countryID = null, $paymentID = null, $stateId = null)
     {
@@ -2741,7 +2708,7 @@ public function sGetPremiumDispatches($countryID = null, $paymentID = null, $sta
 
         $sqlBasket = [];
         foreach ($basket as $key => $value) {
-            $sqlBasket[] = $this->connection->quote($value) . " as `$key`";
+            $sqlBasket[] = $this->connection->quote($value ?? '') . " as `$key`";
         }
         $sqlBasket = implode(',', $sqlBasket);
 
@@ -2764,12 +2731,12 @@ public function sGetPremiumDispatches($countryID = null, $paymentID = null, $sta
             'b.*',
         ])
             ->from('s_premium_dispatch', 'd')
-            ->join('d', sprintf('(SELECT %s)', $sqlBasket), 'b', '1=1')
+            ->join('d', \sprintf('(SELECT %s)', $sqlBasket), 'b', '1=1')
             ->join('d', 's_premium_dispatch_countries', 'dc', 'd.id = dc.dispatchID AND dc.countryID=b.countryID')
             ->join('d', 's_premium_dispatch_paymentmeans', 'dp', 'd.id = dp.dispatchID AND dp.paymentID=b.paymentID')
             ->leftJoin('d', 's_premium_holidays', 'h', 'h.date = CURDATE()')
             ->leftJoin('d', 's_premium_dispatch_holidays', 'dh', 'd.id=dh.dispatchID AND h.id=dh.holidayID')
-            ->leftJoin('d', sprintf('(%s)', $joinSubSelect->getSQL()), 'dk', 'dk.dispatchID=d.id')
+            ->leftJoin('d', \sprintf('(%s)', $joinSubSelect->getSQL()), 'dk', 'dk.dispatchID=d.id')
             ->leftJoin('b', 's_user', 'u', ' u.id=b.userID AND u.active=1')
             ->leftJoin('u', 's_user_addresses', 'ub', 'ub.user_id = u.id AND ub.id = :billingAddressId')
             ->leftJoin('u', 's_user_addresses', 'us', 'us.user_id = u.id AND us.id = :shippingAddressId')
@@ -2914,7 +2881,7 @@ public function sGetPremiumDispatchSurcharge($basket, $type = 2)
         }
         $sql_basket = [];
         foreach ($basket as $key => $value) {
-            $sql_basket[] = $this->db->quote($value) . " as `$key`";
+            $sql_basket[] = $this->db->quote($value ?? '') . " as `$key`";
         }
         $sql_basket = implode(', ', $sql_basket);
 
@@ -3000,7 +2967,7 @@ public function sGetPremiumDispatchSurcharge($basket, $type = 2)
             ]
         );
 
-        $surcharge = $this->calculateDispatchSurcharge($basket, $dispatches);
+        $surcharge = $this->shippingCostService->calculateDispatchesSurcharge($basket, $dispatches);
 
         $surcharge = $this->eventManager->filter(
             'Shopware_Modules_Admin_sGetPremiumDispatchSurcharge_FilterSurcharge',
@@ -3008,7 +2975,7 @@ public function sGetPremiumDispatchSurcharge($basket, $type = 2)
             ['subject' => $this, 'dispatches' => $dispatches]
         );
 
-        return $surcharge;
+        return (float) $surcharge;
     }
 
     /**
@@ -3033,7 +3000,7 @@ public function sGetPremiumShippingcosts($country = null)
         }
 
         $this->db->delete('s_order_basket', [
-            'sessionID = ?' => $this->session->offsetGet('sessionId'),
+            'sessionID = ?' => $this->session->get('sessionId'),
             'modus IN (?)' => [3, 4],
             'ordernumber IN (?)' => array_merge(...[
                 $this->cartOrderNumberProvider->getAll(CartOrderNumberProviderInterface::PAYMENT_ABSOLUTE),
@@ -3045,7 +3012,7 @@ public function sGetPremiumShippingcosts($country = null)
         ]);
 
         $basket = $this->sGetDispatchBasket(empty($country['id']) ? null : $country['id']);
-        if (empty($basket) || $basket['count_article'] == 0) {
+        if (empty($basket) || (int) $basket['count_article'] === 0) {
             return false;
         }
         $country = $this->sGetCountry($basket['countryID']);
@@ -3081,7 +3048,7 @@ public function sGetPremiumShippingcosts($country = null)
             $discount_tax
         );
 
-        $dispatch = $this->sGetPremiumDispatch((int) $this->session->offsetGet('sDispatch'));
+        $dispatch = $this->sGetPremiumDispatch((int) $this->session->offsetGet('sDispatch')) ?: [];
 
         $payment = $this->handlePaymentMeanSurcharge(
             $country,
@@ -3099,8 +3066,7 @@ public function sGetPremiumShippingcosts($country = null)
             $dispatch['shippingfree'] = round($dispatch['shippingfree'] / (100 + $discount_tax) * 100, 2);
         }
 
-        if (
-            (!empty($dispatch['shippingfree']) && $dispatch['shippingfree'] <= $basket['amount_display'])
+        if ((!empty($dispatch['shippingfree']) && $dispatch['shippingfree'] <= $basket['amount_display'])
             || empty($basket['count_article'])
             || (!empty($basket['shippingfree']) && empty($dispatch['bind_shippingfree']))
         ) {
@@ -3108,9 +3074,10 @@ public function sGetPremiumShippingcosts($country = null)
                 $tax = (float) $basket['max_tax'];
 
                 if (!empty($dispatch['tax_calculation'])) {
-                    $context = Shopware()->Container()->get(ContextServiceInterface::class)->getShopContext();
-                    $taxRule = $context->getTaxRule($dispatch['tax_calculation']);
-                    $tax = $taxRule->getTax();
+                    $taxRule = $this->contextService->getShopContext()->getTaxRule($dispatch['tax_calculation']);
+                    if ($taxRule instanceof Tax) {
+                        $tax = $taxRule->getTax();
+                    }
                 }
 
                 return [
@@ -3127,17 +3094,16 @@ public function sGetPremiumShippingcosts($country = null)
             return self::NO_SHIPPING_COSTS;
         }
 
-        if (empty($dispatch['calculation'])) {
-            $from = round($basket['weight'], 3);
-        } elseif ($dispatch['calculation'] == 1) {
-            $from = round($basket['amount'], 2);
-        } elseif ($dispatch['calculation'] == 2) {
-            $from = round($basket['count_article']);
-        } elseif ($dispatch['calculation'] == 3) {
-            $from = round((float) $basket['calculation_value_' . $dispatch['id']], 2);
-        } else {
+        try {
+            $calculationType = (int) $dispatch['calculation'];
+            if (!\in_array($calculationType, Dispatch::CALCULATIONS, true)) {
+                throw new RuntimeException(\sprintf('Invalid shipping calculation type "%d"', $calculationType));
+            }
+            $from = $this->shippingCostService->getShippingCostMultiplier($calculationType, $basket, $dispatch);
+        } catch (RuntimeException $e) {
             return false;
         }
+
         $result = $this->db->fetchRow(
             'SELECT `value` , `factor`
              FROM `s_premium_shippingcosts`
@@ -3160,6 +3126,7 @@ public function sGetPremiumShippingcosts($country = null)
             ];
         }
         $result['brutto'] = $result['value'];
+
         if (!empty($result['factor'])) {
             $result['brutto'] += $result['factor'] / 100 * $from;
         }
@@ -3169,15 +3136,14 @@ public function sGetPremiumShippingcosts($country = null)
         }
         $result['brutto'] *= $currencyFactor;
         $result['brutto'] = round($result['brutto'], 2);
-        if (
-            !empty($payment['surcharge'])
-            && $dispatch['surcharge_calculation'] != 2
+        if (!empty($payment['surcharge'])
+            && (int) $dispatch['surcharge_calculation'] !== Dispatch::SURCHARGE_CALCULATION_NEVER
             && (empty($basket['shippingfree']) || empty($dispatch['surcharge_calculation']))
         ) {
             $result['surcharge'] = $payment['surcharge'];
             $result['brutto'] += $result['surcharge'];
         }
-        if ($result['brutto'] < 0) {
+        if (!is_numeric($result['brutto']) || $result['brutto'] < 0) {
             return self::NO_SHIPPING_COSTS;
         }
 
@@ -3187,6 +3153,10 @@ public function sGetPremiumShippingcosts($country = null)
             $result['tax'] = $basket['max_tax'];
         } else {
             $result['tax'] = $dispatch['tax_calculation_value'];
+            $taxRule = $this->contextService->getShopContext()->getTaxRule($dispatch['tax_calculation']);
+            if ($taxRule instanceof Tax) {
+                $result['tax'] = $taxRule->getTax();
+            }
         }
         $result['tax'] = (float) $result['tax'];
         $result['netto'] = round($result['brutto'] * 100 / (100 + $result['tax']), 2);
@@ -3268,7 +3238,7 @@ protected function loginUser($getUser, $email, $password, $isPreHashed, $encoder
                 ]
             );
 
-            //destroy cookie
+            // destroy cookie
             $this->front->Response()->setCookie('sUniqueID');
         }
 
@@ -3337,11 +3307,9 @@ private function hasProductAttributeMatch(string $attribute, string $value, stri
      * Sends a mail to the given recipient with a given template.
      * If the opt in parameter is set, the sConfirmLink variable will be filled by the opt in link.
      *
-     * @param string      $recipient
      * @param string|Mail $template
-     * @param string      $optIn
      */
-    private function sendMail($recipient, $template, $optIn = '')
+    private function sendMail(string $recipient, $template, string $optIn = ''): void
     {
         $context = [];
 
@@ -3372,12 +3340,10 @@ private function regenerateSessionId(bool $ignoreUserTable = false): void
     {
         $oldSessionId = $this->session->getId();
 
-        if (
-        $this->eventManager->notifyUntil(
+        if ($this->eventManager->notifyUntil(
             'Shopware_Modules_Admin_regenerateSessionId_Start',
             ['subject' => $this, 'sessionId' => $oldSessionId]
-        )
-        ) {
+        )) {
             return;
         }
 
@@ -3419,14 +3385,13 @@ private function regenerateSessionId(bool $ignoreUserTable = false): void
     /**
      * Overwrite sUserData['billingaddress'] with chosen address
      *
-     * @return array
+     * @return array<string, mixed>
      */
-    private function overwriteBillingAddress(array $userData)
+    private function overwriteBillingAddress(array $userData): array
     {
         // Temporarily overwrite billing address
-        if (
-            !$this->session->offsetGet('checkoutBillingAddressId')
-            || Shopware()->Front()->Request()->getControllerName() !== 'checkout'
+        if (!$this->session->offsetGet('checkoutBillingAddressId')
+            || \strtolower(Shopware()->Front()->Request()->getControllerName()) !== 'checkout'
         ) {
             return $userData;
         }
@@ -3452,14 +3417,13 @@ private function overwriteBillingAddress(array $userData)
     /**
      * Overwrite sUserData['shippingaddress'] with chosen address
      *
-     * @return array
+     * @return array<string, mixed>
      */
-    private function overwriteShippingAddress(array $userData)
+    private function overwriteShippingAddress(array $userData): array
     {
         // Temporarily overwrite shipping address
-        if (
-            !$this->session->offsetGet('checkoutShippingAddressId') || Shopware()->Front()->Request()
-                ->getControllerName() !== 'checkout'
+        if (!$this->session->offsetGet('checkoutShippingAddressId')
+            || \strtolower(Shopware()->Front()->Request()->getControllerName()) !== 'checkout'
         ) {
             return $userData;
         }
@@ -3487,7 +3451,7 @@ private function overwriteShippingAddress(array $userData)
      *
      * @return array<string, mixed>
      */
-    private function convertToLegacyAddressArray(Address $address)
+    private function convertToLegacyAddressArray(Address $address): array
     {
         $output = Shopware()->Models()->toArray($address);
 
@@ -3524,9 +3488,9 @@ private function convertToLegacyAddressArray(Address $address)
     /**
      * @param bool $isShippingAddress changes keys in sUserData
      *
-     * @return array
+     * @return array<string, mixed>
      */
-    private function completeUserCountryData(array $userData, $isShippingAddress = false)
+    private function completeUserCountryData(array $userData, bool $isShippingAddress = false): array
     {
         $sql = <<<'SQL'
 SELECT c.*, a.name AS countryarea
@@ -3569,14 +3533,11 @@ private function completeUserCountryData(array $userData, $isShippingAddress = f
      * Called when provided user data is incorrect
      * Handles account lockdown detection and brute force protection
      *
-     * @param string        $addScopeSql
-     * @param string        $email
-     * @param string[]|null $sErrorMessages
-     * @param string        $password
+     * @param list<string> $sErrorMessages
      *
-     * @return array
+     * @return list<string>
      */
-    private function failedLoginUser($addScopeSql, $email, $sErrorMessages, $password)
+    private function failedLoginUser(string $addScopeSql, string $email, ?array $sErrorMessages, string $password): array
     {
         if ($sErrorMessages === null) {
             $sErrorMessages = [];
@@ -3589,7 +3550,7 @@ private function failedLoginUser($addScopeSql, $email, $sErrorMessages, $passwor
         $getUser = $this->db->fetchRow($sql, [$email]);
 
         // If the verification process is active, the customer has an email sent date, but no confirm date
-        if ($getUser['doubleOptinRegister'] && $getUser['doubleOptinEmailSentDate'] !== null && $getUser['doubleOptinConfirmDate'] === null) {
+        if ($getUser && $getUser['doubleOptinRegister'] && $getUser['doubleOptinEmailSentDate'] !== null && $getUser['doubleOptinConfirmDate'] === null) {
             $hash = $this->optInLoginService->refreshOptInHashForUser(
                 (int) $getUser['id'],
                 (int) $getUser['register_opt_in_id'],
@@ -3659,10 +3620,7 @@ private function failedLoginUser($addScopeSql, $email, $sErrorMessages, $passwor
         return $sErrorMessages;
     }
 
-    /**
-     * @param string $hash
-     */
-    private function resendConfirmationMail(array $userInfo, $hash)
+    private function resendConfirmationMail(array $userInfo, string $hash): void
     {
         $link = Shopware()->Container()->get(RouterInterface::class)->assemble([
             'sViewport' => 'register',
@@ -3694,11 +3652,9 @@ private function resendConfirmationMail(array $userInfo, $hash)
     /**
      * Helper method for sAdmin::sGetOpenOrderData()
      *
-     * @param string $orderKey
-     *
-     * @return array
+     * @return array<string, mixed>
      */
-    private function processOpenOrderDetails(array $orderValue, array $orders, $orderKey)
+    private function processOpenOrderDetails(array $orderValue, array $orders, string $orderKey): array
     {
         /** @var array $orderDetails */
         $orderDetails = $this->db->fetchAll(
@@ -3793,6 +3749,7 @@ private function processOpenOrderDetails(array $orderValue, array $orders, $orde
                     . $orderDetailsValue['id'];
             }
         }
+
         $orders[$orderKey]['activeBuyButton'] = 1;
         $orders[$orderKey]['details'] = $orderDetails;
 
@@ -3803,12 +3760,11 @@ private function processOpenOrderDetails(array $orderValue, array $orders, $orde
      * Helper function for sAdmin::sGetUserData()
      * Gets user country data
      *
-     * @param array $userData
-     * @param int   $userId
+     * @param array<string, mixed> $userData
      *
-     * @return array
+     * @return array<string, mixed>
      */
-    private function getUserCountryData($userData, $userId)
+    private function getUserCountryData(array $userData, int $userId): array
     {
         // Query country information
         $userData['additional']['country'] = $this->db->fetchRow(
@@ -3846,7 +3802,7 @@ private function getUserCountryData($userData, $userId)
      * Helper function for sAdmin::sGetUserData()
      * Gets user shipping data (address, payment)
      *
-     *  @return array<string, mixed>
+     * @return array<string, mixed>
      */
     private function getUserShippingData(int $userId, array $userData, string $countryQuery): array
     {
@@ -3854,12 +3810,12 @@ private function getUserShippingData(int $userId, array $userData, string $count
 
         $customer = $entityManager->find(Customer::class, $userId);
         if (!$customer instanceof Customer) {
-            throw new \InvalidArgumentException('User with provided id not found');
+            throw new InvalidArgumentException('User with provided id not found');
         }
 
         $shipping = $this->getShippingAddressData($entityManager, $customer);
         if ($shipping === null) {
-            throw new \UnexpectedValueException('No shipping address found for user with provided userId');
+            throw new UnexpectedValueException('No shipping address found for user with provided userId');
         }
 
         $userData['shippingaddress'] = $shipping;
@@ -3911,14 +3867,16 @@ private function getUserShippingData(int $userId, array $userData, string $count
      * Helper function for sAdmin::sGetUserData()
      * Gets user billing data
      *
-     * @throws Exception
+     * @param array<string, mixed> $userData
+     *
+     * @return array<string, mixed>
      */
     private function getUserBillingData(int $userId, array $userData): array
     {
         $entityManager = Shopware()->Container()->get(ModelManager::class);
         $customer = $entityManager->find(Customer::class, $userId);
         if (!$customer) {
-            throw new Exception(sprintf('Customer with id %s not found', $userId));
+            throw new Exception(\sprintf('Customer with id %s not found', $userId));
         }
         $billing = $this->convertToLegacyAddressArray($customer->getDefaultBillingAddress());
         $billing['attributes'] = $this->attributeLoader->load('s_user_addresses_attributes', $billing['id']);
@@ -3930,6 +3888,8 @@ private function getUserBillingData(int $userId, array $userData): array
     /**
      * Helper method for sAdmin::sNewsletterSubscription
      * Subscribes the provided email address to the newsletter group
+     *
+     * @return array{code: int, message: string, isNewRegistration?: bool}
      */
     private function subscribeNewsletter(string $email, int $groupID): array
     {
@@ -3988,64 +3948,6 @@ private function subscribeNewsletter(string $email, int $groupID): array
         ];
     }
 
-    /**
-     * Helper method for sAdmin::sGetPremiumDispatchSurcharge()
-     * Calculates the surcharge for the current basket and dispatches
-     *
-     * @param array $basket
-     * @param array $dispatches
-     *
-     * @return float
-     */
-    private function calculateDispatchSurcharge($basket, $dispatches)
-    {
-        $surcharge = 0;
-
-        if (empty($dispatches)) {
-            return $surcharge;
-        }
-
-        foreach ($dispatches as $dispatch) {
-            if (empty($dispatch['calculation'])) {
-                $from = round((float) $basket['weight'], 3);
-            } elseif ($dispatch['calculation'] == 1) {
-                if (
-                    ($this->config->get('sARTICLESOUTPUTNETTO') && !$this->sSYSTEM->sUSERGROUPDATA['tax'])
-                    || (!$this->sSYSTEM->sUSERGROUPDATA['tax'] && $this->sSYSTEM->sUSERGROUPDATA['id'])
-                ) {
-                    $from = round((float) $basket['amount_net'], 2);
-                } else {
-                    $from = round((float) $basket['amount'], 2);
-                }
-            } elseif ($dispatch['calculation'] == 2) {
-                $from = (int) $basket['count_article'];
-            } elseif ($dispatch['calculation'] == 3) {
-                $from = (int) $basket['calculation_value_' . $dispatch['id']];
-            } else {
-                continue;
-            }
-            $result = $this->db->fetchRow(
-                'SELECT `value` , factor
-                FROM s_premium_shippingcosts
-                WHERE `from` <= ?
-                AND dispatchID = ?
-                ORDER BY `from` DESC
-                LIMIT 1',
-                [$from, $dispatch['id']]
-            );
-
-            if ($result === false) {
-                continue;
-            }
-            $surcharge += $result['value'];
-            if (!empty($result['factor'])) {
-                $surcharge += $result['factor'] / 100 * $from;
-            }
-        }
-
-        return $surcharge;
-    }
-
     private function handleBasketDiscount(float $amount, float $currencyFactor, float $discount_tax): void
     {
         $discount_basket_ordernumber = $this->cartOrderNumberProvider->get(CartOrderNumberProviderInterface::DISCOUNT);
@@ -4084,7 +3986,7 @@ private function handleDispatchDiscount(array $basket, float $discountTax): void
             ->getNamespace('backend/static/discounts_surcharges')
             ->get('shipping_discount_name', 'Basket discount');
 
-        $discount = $this->sGetPremiumDispatchSurcharge($basket, 3);
+        $discount = $this->sGetPremiumDispatchSurcharge($basket, Dispatch::TYPE_DISCOUNT);
 
         if (!empty($discount)) {
             $currencyFactor = empty($this->sSYSTEM->sCurrency['factor']) ? 1 : $this->sSYSTEM->sCurrency['factor'];
@@ -4107,7 +4009,7 @@ private function handleDispatchSurcharge(array $basket, float $discountTax): voi
             ->getNamespace('backend/static/discounts_surcharges')
             ->get('shipping_surcharge_name', 'Dispatch surcharge');
 
-        $discount = $this->sGetPremiumDispatchSurcharge($basket, 4);
+        $discount = $this->sGetPremiumDispatchSurcharge($basket, Dispatch::TYPE_DISPATCH_SURCHARGE_ON_POSITION);
 
         if (!empty($discount)) {
             $currencyFactor = empty($this->sSYSTEM->sCurrency['factor']) ? 1 : $this->sSYSTEM->sCurrency['factor'];
@@ -4127,18 +4029,12 @@ private function handleDispatchSurcharge(array $basket, float $discountTax): voi
      * Helper method for sAdmin::sGetPremiumShippingcosts()
      * Calculates payment mean surcharge
      *
-     * @param array $country
-     * @param array $payment
-     * @param float $currencyFactor
-     * @param array $dispatch
-     * @param float $discount_tax
-     *
-     * @return array
+     * @return array<string, mixed>
      */
-    private function handlePaymentMeanSurcharge($country, $payment, $currencyFactor, $dispatch, $discount_tax)
+    private function handlePaymentMeanSurcharge(array $country, array $payment, float $currencyFactor, array $dispatch, float $discount_tax): array
     {
-        $surcharge_ordernumber = $this->cartOrderNumberProvider->get(CartOrderNumberProviderInterface::PAYMENT_ABSOLUTE);
-        $percent_ordernumber = $this->cartOrderNumberProvider->get(CartOrderNumberProviderInterface::PAYMENT_PERCENT);
+        $surchargeOrdernumber = $this->cartOrderNumberProvider->get(CartOrderNumberProviderInterface::PAYMENT_ABSOLUTE);
+        $percentOrdernumber = $this->cartOrderNumberProvider->get(CartOrderNumberProviderInterface::PAYMENT_PERCENT);
 
         // Country surcharge
         if (!empty($payment['country_surcharge'][$country['countryiso']])) {
@@ -4147,7 +4043,7 @@ private function handlePaymentMeanSurcharge($country, $payment, $currencyFactor,
         $payment['surcharge'] = round($payment['surcharge'] * $currencyFactor, 2);
 
         // Fixed surcharge
-        if (!empty($payment['surcharge']) && (empty($dispatch) || $dispatch['surcharge_calculation'] == 3)) {
+        if (!empty($payment['surcharge']) && (empty($dispatch) || (int) $dispatch['surcharge_calculation'] === Dispatch::SURCHARGE_CALCULATION_AS_CART_ITEM)) {
             $surcharge = round($payment['surcharge'], 2);
             $payment['surcharge'] = 0;
 
@@ -4163,7 +4059,7 @@ private function handlePaymentMeanSurcharge($country, $payment, $currencyFactor,
 
             $this->conditionalLineItemService->addConditionalLineItem(
                 $surcharge_name,
-                $surcharge_ordernumber,
+                $surchargeOrdernumber,
                 $surcharge,
                 $discount_tax,
                 4
@@ -4171,7 +4067,7 @@ private function handlePaymentMeanSurcharge($country, $payment, $currencyFactor,
         }
 
         // Percentage surcharge
-        if (!empty($payment['debit_percent']) && (empty($dispatch) || $dispatch['surcharge_calculation'] != 2)) {
+        if (!empty($payment['debit_percent']) && (empty($dispatch) || (int) $dispatch['surcharge_calculation'] !== Dispatch::SURCHARGE_CALCULATION_NEVER)) {
             $amount = (float) $this->db->fetchOne(
                 'SELECT SUM(quantity*price) AS amount
                 FROM s_order_basket
@@ -4193,7 +4089,7 @@ private function handlePaymentMeanSurcharge($country, $payment, $currencyFactor,
 
             $this->conditionalLineItemService->addConditionalLineItem(
                 $percent_name,
-                $percent_ordernumber,
+                $percentOrdernumber,
                 $percent,
                 $discount_tax,
                 4
@@ -4206,12 +4102,8 @@ private function handlePaymentMeanSurcharge($country, $payment, $currencyFactor,
     /**
      * Convenience function to check if there is at least one order with the
      * provided cleared status.
-     *
-     * @param int $cleared
-     *
-     * @return bool
      */
-    private function riskCheckClearedLevel($cleared)
+    private function riskCheckClearedLevel(int $cleared): bool
     {
         if (!$this->session->offsetGet('sUserId')) {
             return false;
@@ -4231,22 +4123,13 @@ private function riskCheckClearedLevel($cleared)
 
     /**
      * Helper function to return the current date formatted
-     *
-     * @param string $format
-     *
-     * @return string
      */
-    private function getCurrentDateFormatted($format = 'Y-m-d H:i:s')
+    private function getCurrentDateFormatted(string $format = 'Y-m-d H:i:s'): string
     {
-        $date = new DateTime();
-
-        return $date->format($format);
+        return (new DateTime())->format($format);
     }
 
-    /**
-     * @return int
-     */
-    private function getBillingAddressId()
+    private function getBillingAddressId(): int
     {
         if ($this->session->offsetGet('checkoutBillingAddressId')) {
             return (int) $this->session->offsetGet('checkoutBillingAddressId');
@@ -4264,10 +4147,7 @@ private function getBillingAddressId()
         );
     }
 
-    /**
-     * @return int
-     */
-    private function getShippingAddressId()
+    private function getShippingAddressId(): int
     {
         if ($this->session->offsetGet('checkoutShippingAddressId')) {
             return (int) $this->session->offsetGet('checkoutShippingAddressId');
@@ -4285,24 +4165,13 @@ private function getShippingAddressId()
         );
     }
 
-    /**
-     * @param Shopware_Components_Config $config
-     *
-     * @return bool
-     */
-    private function shouldVerifyCaptcha($config)
+    private function shouldVerifyCaptcha(Shopware_Components_Config $config): bool
     {
         return $config->get('newsletterCaptcha') !== 'nocaptcha'
             && !($config->get('noCaptchaAfterLogin') && Shopware()->Modules()->Admin()->sCheckUser());
     }
 
-    /**
-     * @param string $amount
-     * @param string $amount_net
-     *
-     * @return QueryBuilder
-     */
-    private function getBasketQueryBuilder($amount, $amount_net)
+    private function getBasketQueryBuilder(string $amount, string $netAmount): QueryBuilder
     {
         $queryBuilder = $this->connection->createQueryBuilder()
             ->select([
@@ -4313,7 +4182,7 @@ private function getBasketQueryBuilder($amount, $amount_net)
                 'SUM(IF(a.id,b.quantity,0)) as count_article',
                 'MAX(b.shippingfree) as shippingfree',
                 'SUM(IF(b.modus=0,' . $amount . '/b.currencyFactor,0)) as amount',
-                'SUM(IF(b.modus=0,' . $amount_net . '/b.currencyFactor,0)) as amount_net',
+                'SUM(IF(b.modus=0,' . $netAmount . '/b.currencyFactor,0)) as amount_net',
                 'SUM(CAST(b.price as DECIMAL(10,2))*b.quantity) as amount_display',
                 'MAX(d.length) as `length`',
                 'MAX(d.height) as height',
@@ -4335,7 +4204,7 @@ private function getBasketQueryBuilder($amount, $amount_net)
     }
 
     /**
-     * @return array<string, mixed>
+     * @return array<string, mixed>|null
      */
     private function getShippingAddressData(ModelManager $entityManager, Customer $customer): ?array
     {
diff --git a/engine/Shopware/Core/sArticles.php b/engine/Shopware/Core/sArticles.php
index 87cb0823c7f..602d270990d 100644
--- a/engine/Shopware/Core/sArticles.php
+++ b/engine/Shopware/Core/sArticles.php
@@ -1,31 +1,30 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\DBAL\Connection;
 use Doctrine\ORM\AbstractQuery;
 use Shopware\Bundle\MediaBundle\MediaServiceInterface;
-use Shopware\Bundle\SearchBundle;
 use Shopware\Bundle\SearchBundle\Condition\VariantCondition;
 use Shopware\Bundle\SearchBundle\Criteria;
 use Shopware\Bundle\SearchBundle\FacetResultInterface;
@@ -41,7 +40,6 @@
 use Shopware\Bundle\StoreFrontBundle\Service\ConfiguratorServiceInterface;
 use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface;
 use Shopware\Bundle\StoreFrontBundle\Service\Core\ConfiguratorService;
-use Shopware\Bundle\StoreFrontBundle\Service\Core\ListingLinkRewriteService;
 use Shopware\Bundle\StoreFrontBundle\Service\ListingLinkRewriteServiceInterface;
 use Shopware\Bundle\StoreFrontBundle\Service\ListProductServiceInterface;
 use Shopware\Bundle\StoreFrontBundle\Service\ProductNumberServiceInterface;
@@ -101,120 +99,62 @@ class sArticles implements Enlight_Hook
     /**
      * @var ArticleRepository
      */
-    protected $articleRepository = null;
+    protected $articleRepository;
 
     /**
      * @var MediaRepository
      */
-    protected $mediaRepository = null;
+    protected $mediaRepository;
 
-    /**
-     * @var ContextServiceInterface
-     */
-    private $contextService;
+    private ContextServiceInterface $contextService;
 
-    /**
-     * @var Shopware_Components_Config
-     */
-    private $config;
+    private Shopware_Components_Config $config;
 
-    /**
-     * @var ListProductServiceInterface
-     */
-    private $listProductService;
+    private ListProductServiceInterface $listProductService;
 
-    /**
-     * @var ProductServiceInterface
-     */
-    private $productService;
+    private ProductServiceInterface $productService;
 
-    /**
-     * @var ConfiguratorServiceInterface
-     */
-    private $configuratorService;
+    private ConfiguratorServiceInterface $configuratorService;
 
-    /**
-     * @var PropertyServiceInterface
-     */
-    private $propertyService;
+    private PropertyServiceInterface $propertyService;
 
-    /**
-     * @var AdditionalTextServiceInterface
-     */
-    private $additionalTextService;
+    private AdditionalTextServiceInterface $additionalTextService;
 
-    /**
-     * @var SearchBundle\ProductSearch
-     */
-    private $searchService;
+    private ProductSearchInterface $searchService;
 
-    /**
-     * @var Enlight_Event_EventManager
-     */
-    private $eventManager;
+    private Enlight_Event_EventManager $eventManager;
 
-    /**
-     * @var Enlight_Components_Db_Adapter_Pdo_Mysql
-     */
-    private $db;
+    private Enlight_Components_Db_Adapter_Pdo_Mysql $db;
 
-    /**
-     * @var LegacyStructConverter
-     */
-    private $legacyStructConverter;
+    private Connection $connection;
 
-    /**
-     * @var LegacyEventManager
-     */
-    private $legacyEventManager;
+    private LegacyStructConverter $legacyStructConverter;
 
-    /**
-     * @var QueryAliasMapper
-     */
-    private $queryAliasMapper;
+    private LegacyEventManager $legacyEventManager;
 
-    /**
-     * @var Enlight_Controller_Front
-     */
-    private $frontController;
+    private QueryAliasMapper $queryAliasMapper;
 
-    /**
-     * @var ProductNumberSearchInterface
-     */
-    private $productNumberSearch;
+    private Enlight_Controller_Front $frontController;
 
-    /**
-     * @var Enlight_Components_Session_Namespace
-     */
-    private $session;
+    private ProductNumberSearchInterface $productNumberSearch;
 
-    /**
-     * @var StoreFrontCriteriaFactoryInterface
-     */
-    private $storeFrontCriteriaFactory;
+    private Enlight_Components_Session_Namespace $session;
 
-    /**
-     * @var array
-     */
-    private $cachePromotions = [];
+    private StoreFrontCriteriaFactoryInterface $storeFrontCriteriaFactory;
 
     /**
-     * @var sArticlesComparisons
+     * @var array<int>
      */
-    private $productComparisons;
+    private array $cachePromotions = [];
 
-    /**
-     * @var ProductNumberServiceInterface
-     */
-    private $productNumberService;
+    private sArticlesComparisons $productComparisons;
 
-    /**
-     * @var ListingLinkRewriteService
-     */
-    private $listingLinkRewriteService;
+    private ProductNumberServiceInterface $productNumberService;
+
+    private ListingLinkRewriteServiceInterface $listingLinkRewriteService;
 
     public function __construct(
-        Category $category = null,
+        ?Category $category = null,
         $translationId = null,
         $customerGroupId = null
     ) {
@@ -227,6 +167,7 @@ public function __construct(
 
         $this->config = $container->get(Shopware_Components_Config::class);
         $this->db = $container->get('db');
+        $this->connection = $container->get(Connection::class);
         $this->eventManager = $container->get('events');
         $this->contextService = $container->get(ContextServiceInterface::class);
         $this->listProductService = $container->get(ListProductServiceInterface::class);
@@ -309,7 +250,7 @@ public function sGetComparisonList()
      */
     public function sGetComparisonProperties($articles)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Use the sArticlesComparisons::sGetComparisonProperties instead.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Use the sArticlesComparisons::sGetComparisonProperties instead.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         return $this->productComparisons->sGetComparisonProperties($articles);
     }
@@ -326,7 +267,7 @@ public function sGetComparisonProperties($articles)
      */
     public function sFillUpComparisonArticles($properties, $articles)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Use sArticlesComparisons::sFillUpComparisonArticles instead.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Use sArticlesComparisons::sFillUpComparisonArticles instead.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         return $this->productComparisons->sFillUpComparisonArticles($properties, $articles);
     }
@@ -340,7 +281,7 @@ public function sFillUpComparisonArticles($properties, $articles)
      */
     public function sGetArticleProperties($articleId)
     {
-        $orderNumber = $this->getOrderNumberByProductId($articleId);
+        $orderNumber = $this->getOrderNumberByProductId((int) $articleId);
         if (!$orderNumber) {
             return [];
         }
@@ -381,7 +322,7 @@ public function sSaveComment($article)
             $sVoteStars = 0;
         }
 
-        $sVoteStars = $sVoteStars / 2;
+        $sVoteStars /= 2;
 
         if ($this->config['sVOTEUNLOCK']) {
             $active = 0;
@@ -406,8 +347,7 @@ public function sSaveComment($article)
             $shopId = $container->get('shop')->getId();
         }
 
-        $connection = $container->get(Connection::class);
-        $query = $connection->createQueryBuilder();
+        $query = $this->connection->createQueryBuilder();
         $query->insert('s_articles_vote');
         $query->values([
             'articleID' => ':productId',
@@ -438,7 +378,7 @@ public function sSaveComment($article)
             throw new Enlight_Exception('sSaveComment #00: Could not save comment');
         }
 
-        $insertId = $connection->lastInsertId();
+        $insertId = $this->connection->lastInsertId();
         if (!isset($this->session['sArticleCommentInserts'])) {
             $this->session['sArticleCommentInserts'] = new ArrayObject();
         }
@@ -457,7 +397,7 @@ public function sSaveComment($article)
      */
     public function sGetArticlesBySupplier($supplierID = null)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         if (!empty($supplierID)) {
             $this->frontController->Request()->setQuery('sSearch', $supplierID);
@@ -476,13 +416,12 @@ public function sGetArticlesBySupplier($supplierID = null)
 
     /**
      * @param int|null $categoryId
-     * @param Criteria $criteria
      *
      * @throws Enlight_Exception
      *
      * @return ListingArray|false
      */
-    public function sGetArticlesByCategory($categoryId = null, Criteria $criteria = null)
+    public function sGetArticlesByCategory($categoryId = null, ?Criteria $criteria = null)
     {
         if (Shopware()->Events()->notifyUntil('Shopware_Modules_Articles_sGetArticlesByCategory_Start', [
             'subject' => $this,
@@ -522,7 +461,7 @@ public function sGetArticlesByCategory($categoryId = null, Criteria $criteria =
      */
     public function sGetSupplierById($id)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         $id = (int) $id;
         $categoryId = (int) $this->frontController->Request()->getQuery('sCategory');
@@ -571,10 +510,10 @@ public function sCalculatingPrice($price, $tax, $taxId = 0, $article = [])
 
         // Calculate global discount
         if ($this->sSYSTEM->sUSERGROUPDATA['mode'] && $this->sSYSTEM->sUSERGROUPDATA['discount']) {
-            $price = $price - ($price / 100 * $this->sSYSTEM->sUSERGROUPDATA['discount']);
+            $price -= ($price / 100 * $this->sSYSTEM->sUSERGROUPDATA['discount']);
         }
         if ($this->sSYSTEM->sCurrency['factor']) {
-            $price = $price * (float) $this->sSYSTEM->sCurrency['factor'];
+            $price *= (float) $this->sSYSTEM->sCurrency['factor'];
         }
 
         // Condition Output-Netto AND NOT overwrite by customer-group
@@ -595,8 +534,7 @@ public function sCalculatingPrice($price, $tax, $taxId = 0, $article = [])
      */
     public function getTaxRateByConditions($taxId)
     {
-        $context = $this->contextService->getShopContext();
-        $taxRate = $context->getTaxRule($taxId);
+        $taxRate = $this->contextService->getShopContext()->getTaxRule($taxId);
         if ($taxRate) {
             return number_format($taxRate->getTax(), 2);
         }
@@ -633,7 +571,7 @@ public function sCalculatingPriceNum(
         }
         // Calculating global discount
         if ($this->sSYSTEM->sUSERGROUPDATA['mode'] && $this->sSYSTEM->sUSERGROUPDATA['discount']) {
-            $price = $price - ($price / 100 * $this->sSYSTEM->sUSERGROUPDATA['discount']);
+            $price -= ($price / 100 * $this->sSYSTEM->sUSERGROUPDATA['discount']);
         }
 
         // Support tax rate defined by certain conditions
@@ -724,7 +662,7 @@ public function sGetArticleCharts($category = null)
      */
     public function sCheckIfEsd($id, $detailsID, $realtime = false)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         // Check if this product is esd-only (check in variants, too -> later)
         $id = (int) $id;
@@ -759,6 +697,7 @@ public function sCheckIfEsd($id, $detailsID, $realtime = false)
      */
     public function getProductNavigation($orderNumber, $categoryId, Enlight_Controller_Request_RequestHttp $request)
     {
+        $categoryId = (int) $categoryId;
         $context = $this->contextService->getShopContext();
 
         $criteria = $this->createProductNavigationCriteria($categoryId, $context, $request);
@@ -915,7 +854,7 @@ public function sGetPricegroupDiscount(
                     $getBlockPricings[$i]['to'] = $percent['to'];
                     if ($i === 0 && $ignore) {
                         $getBlockPricings[$i]['price'] = $this->sCalculatingPrice(
-                            ($listprice / 100 * 100),
+                            $listprice / 100 * 100,
                             $articleData['tax'],
                             $articleData['taxID'],
                             $articleData
@@ -926,7 +865,7 @@ public function sGetPricegroupDiscount(
                             $percent['percent'] -= $divPercent;
                         }
                         $getBlockPricings[$i]['price'] = $this->sCalculatingPrice(
-                            ($listprice / 100 * (100 - $percent['percent'])),
+                            $listprice / 100 * (100 - $percent['percent']),
                             $articleData['tax'],
                             $articleData['taxID'],
                             $articleData
@@ -969,7 +908,7 @@ public function sGetCheapestPrice(
         $returnArrayIfConfigurator = false,
         $checkLiveshopping = false
     ) {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         if ($group != $this->sSYSTEM->sUSERGROUP) {
             $fetchGroup = $group;
@@ -1052,7 +991,7 @@ public function sGetCheapestPrice(
 
         $getGroups = $this->db->fetchAll($sql, [$pricegroup, $this->sSYSTEM->sUSERGROUP]);
 
-        //if there are no discounts for this customergroup don't show "ab:"
+        // if there are no discounts for this customergroup don't show "ab:"
         if (empty($getGroups)) {
             return $cheapestPrice;
         }
@@ -1100,7 +1039,7 @@ public function sGetCheapestPrice(
      * Get one product with all available data
      *
      * @param int         $id          article id
-     * @param string|null $sCategoryID
+     * @param int|null    $sCategoryID
      * @param string|null $number
      *
      * @return array
@@ -1216,7 +1155,7 @@ public function sFormatPrice($price)
         $price = str_replace('.', ',', (string) $price); // Replaces points with commas
         $commaPos = strpos((string) $price, ',');
         if ($commaPos) {
-            $part = substr((string) $price, $commaPos + 1, \strlen((string) $price) - $commaPos);
+            $part = (string) substr((string) $price, $commaPos + 1, \strlen((string) $price) - $commaPos);
             switch (\strlen($part)) {
                 case 1:
                     $price .= '0';
@@ -1245,7 +1184,7 @@ public function sFormatPrice($price)
     public function sRound($moneyfloat = null)
     {
         if (is_numeric($moneyfloat)) {
-            $moneyfloat = sprintf('%F', $moneyfloat);
+            $moneyfloat = \sprintf('%F', $moneyfloat);
         }
         $money_str = explode('.', (string) $moneyfloat);
         if (empty($money_str[1])) {
@@ -1266,7 +1205,7 @@ public function sRound($moneyfloat = null)
     /**
      * @param string $ordernumber
      *
-     * @return array|false
+     * @return array<string, mixed>|false
      */
     public function sGetProductByOrdernumber($ordernumber)
     {
@@ -1287,15 +1226,16 @@ public function sGetProductByOrdernumber($ordernumber)
     /**
      * Get basic product data in various modes (firmly defined by id, random, top, new)
      *
-     * @param string $mode      Modus (fix, random, top, new)
-     * @param int    $category  filter by category
-     * @param int    $value     product id / ordernumber for firmly definied products
-     * @param bool   $withImage
+     * @param string                    $mode      Modus (fix, random, top, new)
+     * @param int                       $category  filter by category
+     * @param int|string|numeric-string $value     product id / order number for firmly defined products
+     * @param bool                      $withImage
      *
-     * @return array|false
+     * @return array<string, mixed>|false
      */
     public function sGetPromotionById($mode, $category = 0, $value = 0, $withImage = false)
     {
+        $category = (int) $category;
         $notifyUntil = $this->eventManager->notifyUntil(
             'Shopware_Modules_Articles_GetPromotionById_Start',
             [
@@ -1310,13 +1250,13 @@ public function sGetPromotionById($mode, $category = 0, $value = 0, $withImage =
             return false;
         }
 
-        $value = $this->getPromotionNumberByMode($mode, $category, $value, $withImage);
+        $value = $this->getPromotionNumberByMode($mode, $category, $value);
 
-        if (!$value) {
+        if ($value === '') {
             return false;
         }
 
-        $result = $this->getPromotion((int) $category, $value);
+        $result = $this->getPromotion($category, $value);
 
         if (!$result) {
             return false;
@@ -1417,7 +1357,7 @@ public function getArticleMainCover($articleId, $articleAlbum)
      */
     public function getArticleListingCover($articleId, $forceMainImage = false)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Use the sArticles::sGetArticlePictures instead.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Use the sArticles::sGetArticlePictures instead.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         return $this->sGetArticlePictures($articleId, true, 0, null, false, false, $forceMainImage);
     }
@@ -1559,7 +1499,7 @@ public function sGetArticleIdByOrderNumber($ordernumber)
      * @param bool   $returnAll   Return only name or additional data, too
      * @param bool   $translate   Disables the translation of the product if set to false
      *
-     * @return string|array|false
+     * @return ($returnAll is true ? array{id: numeric-string, main_detail_id: numeric-string, did: numeric-string, articleName: string, additionaltext: string, configurator_set_id: numeric-string} : string)|false
      */
     public function sGetArticleNameByOrderNumber($orderNumber, $returnAll = false, $translate = true)
     {
@@ -1633,15 +1573,16 @@ public function sGetArticleNameByOrderNumber($orderNumber, $returnAll = false, $
      * @param int  $articleId
      * @param bool $returnAll
      *
-     * @return string name
+     * @return ($returnAll is true ? array{id: numeric-string, main_detail_id: numeric-string, did: numeric-string, articleName: string, configurator_set_id: numeric-string} : string)|false
      */
     public function sGetArticleNameByArticleId($articleId, $returnAll = false)
     {
-        $ordernumber = $this->db->fetchOne('
-            SELECT ordernumber FROM s_articles_details WHERE kind=1 AND articleID=?
-        ', [$articleId]);
+        $orderNumber = (string) $this->db->fetchOne(
+            'SELECT ordernumber FROM s_articles_details WHERE kind=1 AND articleID=?',
+            [$articleId]
+        );
 
-        return $this->sGetArticleNameByOrderNumber($ordernumber, $returnAll);
+        return $this->sGetArticleNameByOrderNumber($orderNumber, $returnAll);
     }
 
     /**
@@ -1655,7 +1596,7 @@ public function sGetArticleNameByArticleId($articleId, $returnAll = false)
      */
     public function sGetArticleTaxById($id)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         $checkForProduct = $this->db->fetchRow(
             'SELECT s_core_tax.tax AS tax
@@ -1684,7 +1625,7 @@ public function sGetArticleTaxById($id)
      */
     public function sGetTranslations($data, $object)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Use sArticle::sGetTranslation instead.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Use sArticle::sGetTranslation instead.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         if (Shopware()->Shop()->get('skipbackend') || empty($data)) {
             return $data;
@@ -1888,7 +1829,6 @@ public function sGetTranslation($data, $id, $object, $language = null)
     public function sGetConfiguratorImage($sArticle, $sCombination = '')
     {
         if (!empty($sArticle['sConfigurator']) || !empty($sCombination)) {
-            $foundImage = false;
             $configuratorImages = false;
             $mainKey = 0;
 
@@ -1896,22 +1836,23 @@ public function sGetConfiguratorImage($sArticle, $sCombination = '')
                 if (!empty($sArticle['image']['res']['description'])) {
                     $sArticle['image']['description'] = $sArticle['image']['res']['description'];
                 }
-                $sArticle['image']['relations'] = $sArticle['image']['res']['relations'];
-                foreach ($sArticle['sConfigurator'] as $key => $group) {
-                    foreach ($group['values'] as $key2 => $option) {
-                        $groupVal = $group['groupnameOrig'] ? $group['groupnameOrig'] : $group['groupname'];
+                $sArticle['image']['relations'] = $sArticle['image']['res']['relations'] ?? null;
+                foreach ($sArticle['sConfigurator'] as $group) {
+                    foreach ($group['values'] as $option) {
+                        $groupVal = $group['groupnameOrig'] ?? $group['groupname'];
                         $groupVal = str_replace(['/', ' '], '', $groupVal);
-                        $optionVal = $option['optionnameOrig'] ? $option['optionnameOrig'] : $option['optionname'];
+                        $optionVal = $option['optionnameOrig'] ?? $option['optionname'];
                         $optionVal = str_replace(['/', ' '], '', $optionVal);
                         if (!empty($option['selected'])) {
                             $replacedOptionVal = str_replace(' ', '', $optionVal);
-                            $referenceImages[strtolower($groupVal . ':' . $optionVal)] = true;
+                            \assert(\is_string($replacedOptionVal));
+                            $referenceImages[strtolower(\sprintf('%s:%s', $groupVal, $replacedOptionVal))] = true;
                         }
                     }
                 }
 
                 foreach (array_merge($sArticle['images'] ?? [], [\count($sArticle['images'] ?? []) => $sArticle['image']]) as $value) {
-                    if (preg_match('/(.*){(.*)}/', $value['relations'])) {
+                    if (preg_match('/(.*){(.*)}/', $value['relations'] ?? '')) {
                         $configuratorImages = true;
 
                         break;
@@ -1955,11 +1896,11 @@ public function sGetConfiguratorImage($sArticle, $sCombination = '')
 
                     preg_match('/(.*){(.*)}/', $string, $stringParsed);
 
-                    $relation = $stringParsed[1];
-                    $available = explode('/', $stringParsed[2]);
+                    $relation = $stringParsed[1] ?? '';
+                    $available = explode('/', $stringParsed[2] ?? '');
 
                     if (!@\count($available)) {
-                        $available = [0 => $stringParsed[2]];
+                        $available = [0 => $stringParsed[2] ?? ''];
                     }
 
                     $imageFailedCheck = [];
@@ -1997,7 +1938,8 @@ public function sGetConfiguratorImage($sArticle, $sCombination = '')
 
         if (!empty($sArticle['images'])) {
             foreach ($sArticle['images'] as $key => $image) {
-                if ($image['relations'] === '&{}' || $image['relations'] === '||{}') {
+                $relations = $image['relations'] ?? '';
+                if ($relations === '&{}' || $relations === '||{}') {
                     $sArticle['images'][$key]['relations'] = '';
                 }
             }
@@ -2056,17 +1998,15 @@ protected function getRandomArticle($mode, $category = 0)
             $value = $diff[array_rand($diff)];
         }
 
-        $this->cachePromotions[] = $value;
+        $this->cachePromotions[] = (int) $value;
 
         return $value;
     }
 
     /**
      * Helper function to get access to the media repository.
-     *
-     * @return MediaRepository
      */
-    private function getMediaRepository()
+    private function getMediaRepository(): MediaRepository
     {
         if ($this->mediaRepository === null) {
             $this->mediaRepository = Shopware()->Models()->getRepository(Media::class);
@@ -2077,10 +2017,8 @@ private function getMediaRepository()
 
     /**
      * Helper function to get access to the product repository.
-     *
-     * @return ArticleRepository
      */
-    private function getProductRepository()
+    private function getProductRepository(): ArticleRepository
     {
         if ($this->articleRepository === null) {
             $this->articleRepository = Shopware()->Models()->getRepository(Article::class);
@@ -2090,17 +2028,13 @@ private function getProductRepository()
     }
 
     /**
-     * @param int $categoryId
-     *
      * @throws Exception
-     *
-     * @return Criteria
      */
     private function createProductNavigationCriteria(
-        $categoryId,
+        int $categoryId,
         ShopContextInterface $context,
         Enlight_Controller_Request_RequestHttp $request
-    ) {
+    ): Criteria {
         $streamId = $this->getStreamIdOfCategory($categoryId);
         if ($streamId === null) {
             return $this->storeFrontCriteriaFactory->createProductNavigationCriteria(
@@ -2120,34 +2054,23 @@ private function createProductNavigationCriteria(
         return $criteria;
     }
 
-    /**
-     * @param int $categoryId
-     *
-     * @return int|null
-     */
-    private function getStreamIdOfCategory($categoryId)
+    private function getStreamIdOfCategory(int $categoryId): ?int
     {
         $streamId = $this->db->fetchOne('SELECT `stream_id` FROM `s_categories` WHERE id = ?', [$categoryId]);
 
-        if ($streamId === null) {
+        if (empty($streamId)) {
             return null;
         }
 
         return (int) $streamId;
     }
 
-    /**
-     * @param string $orderNumber
-     * @param int    $categoryId
-     *
-     * @return array
-     */
     private function buildNavigation(
         ProductNumberSearchResult $searchResult,
-        $orderNumber,
-        $categoryId,
+        string $orderNumber,
+        int $categoryId,
         ShopContextInterface $context
-    ) {
+    ): array {
         $products = array_values($searchResult->getProducts());
 
         if (empty($products)) {
@@ -2164,13 +2087,12 @@ private function buildNavigation(
 
             $navigation = [];
 
-            if ($previousProduct) {
-                $previousProduct = $this->listProductService->get($previousProduct->getNumber(), $context);
-                $navigation['previousProduct']['orderNumber'] = $previousProduct->getNumber();
-                $navigation['previousProduct']['link'] = $this->config->get('sBASEFILE') . '?sViewport=detail&sDetails=' . $previousProduct->getId() . '&sCategory=' . $categoryId;
-                $navigation['previousProduct']['name'] = $previousProduct->getName();
+            if ($previousProduct && $previousListProduct = $this->listProductService->get($previousProduct->getNumber(), $context)) {
+                $navigation['previousProduct']['orderNumber'] = $previousListProduct->getNumber();
+                $navigation['previousProduct']['link'] = $this->config->get('sBASEFILE') . '?sViewport=detail&sDetails=' . $previousListProduct->getId() . '&sCategory=' . $categoryId;
+                $navigation['previousProduct']['name'] = $previousListProduct->getName();
 
-                $previousCover = $previousProduct->getCover();
+                $previousCover = $previousListProduct->getCover();
                 if ($previousCover) {
                     $navigation['previousProduct']['image'] = $this->legacyStructConverter->convertMediaStruct(
                         $previousCover
@@ -2178,14 +2100,12 @@ private function buildNavigation(
                 }
             }
 
-            if ($nextProduct) {
-                $nextProduct = $this->listProductService->get($nextProduct->getNumber(), $context);
-
-                $navigation['nextProduct']['orderNumber'] = $nextProduct->getNumber();
-                $navigation['nextProduct']['link'] = $this->config->get('sBASEFILE') . '?sViewport=detail&sDetails=' . $nextProduct->getId() . '&sCategory=' . $categoryId;
-                $navigation['nextProduct']['name'] = $nextProduct->getName();
+            if ($nextProduct && $nextListProduct = $this->listProductService->get($nextProduct->getNumber(), $context)) {
+                $navigation['nextProduct']['orderNumber'] = $nextListProduct->getNumber();
+                $navigation['nextProduct']['link'] = $this->config->get('sBASEFILE') . '?sViewport=detail&sDetails=' . $nextListProduct->getId() . '&sCategory=' . $categoryId;
+                $navigation['nextProduct']['name'] = $nextListProduct->getName();
 
-                $nextCover = $nextProduct->getCover();
+                $nextCover = $nextListProduct->getCover();
                 if ($nextCover) {
                     $navigation['nextProduct']['image'] = $this->legacyStructConverter->convertMediaStruct(
                         $nextCover
@@ -2202,12 +2122,7 @@ private function buildNavigation(
         return [];
     }
 
-    /**
-     * @param int $categoryId
-     *
-     * @return string
-     */
-    private function buildCategoryLink($categoryId, Enlight_Controller_Request_RequestHttp $request)
+    private function buildCategoryLink(int $categoryId, Enlight_Controller_Request_RequestHttp $request): string
     {
         $params = $this->queryAliasMapper->replaceLongParams($request->getParams());
 
@@ -2230,7 +2145,7 @@ private function buildCategoryLink($categoryId, Enlight_Controller_Request_Reque
 
         $queryPrams = http_build_query($params, '', '&');
 
-        return $this->config->get('sBASEFILE') . '?' . $queryPrams;
+        return \sprintf('%s?%s', $this->config->get('sBASEFILE'), $queryPrams);
     }
 
     /**
@@ -2256,7 +2171,10 @@ private function getConfiguratorType($productId)
         return (int) $type;
     }
 
-    private function getPromotionNumberByMode($mode, $category, $value, $withImage)
+    /**
+     * @param int|string|numeric-string $value
+     */
+    private function getPromotionNumberByMode(string $mode, int $category, $value): string
     {
         switch ($mode) {
             case 'top':
@@ -2270,28 +2188,31 @@ private function getPromotionNumberByMode($mode, $category, $value, $withImage)
         }
 
         if (!$value) {
-            return false;
+            return '';
         }
 
-        if (is_numeric($value)) {
-            $number = $this->getOrderNumberByProductId($value);
-            if ($number) {
-                $value = $number;
+        $checkOrderNumber = $this->connection->fetchOne(
+            'SELECT `ordernumber` FROM `s_articles_details` WHERE `ordernumber` = :orderNumber',
+            ['orderNumber' => $value]
+        );
+        if ($checkOrderNumber === false) {
+            $number = $this->getOrderNumberByProductId((int) $value);
+            if ($number !== '') {
+                return $number;
             }
         }
 
-        return $value;
+        return (string) $value;
     }
 
     /**
      * Internal helper function to convert the image data from the database to the frontend structure.
      *
-     * @param array $image
-     * @param Album $productAlbum
+     * @param array<string, mixed>|null $image
      *
-     * @return array
+     * @return array<string, mixed>
      */
-    private function getDataOfProductImage($image, $productAlbum)
+    private function getDataOfProductImage(?array $image, Album $productAlbum): array
     {
         // Initial the data array
         $imageData = [];
@@ -2323,8 +2244,7 @@ private function getDataOfProductImage($image, $productAlbum)
 
         // Attributes as array as they come from non configurator products
         if (!empty($image['attribute'])) {
-            unset($image['attribute']['id']);
-            unset($image['attribute']['articleImageId']);
+            unset($image['attribute']['id'], $image['attribute']['articleImageId']);
             $imageData['attribute'] = $image['attribute'];
         } else {
             $imageData['attribute'] = [];
@@ -2344,11 +2264,11 @@ private function getDataOfProductImage($image, $productAlbum)
         }
 
         foreach ($sizes as $key => $size) {
-            if (strpos($size, 'x') === 0) {
-                $size = $size . 'x' . $size;
+            if (str_starts_with($size, 'x')) {
+                $size = \sprintf('%sx%s', $size, $size);
             }
 
-            if ($image['type'] === Media::TYPE_IMAGE || $image['media']['type'] === Media::TYPE_IMAGE) {
+            if (isset($image['type']) && $image['type'] === Media::TYPE_IMAGE || $image['media']['type'] === Media::TYPE_IMAGE) {
                 $imageData['src'][$key] = $mediaService->getUrl('media/image/thumbnail/' . $image['path'] . '_' . $size . '.' . $image['extension']);
 
                 if ($highDpiThumbnails) {
@@ -2378,7 +2298,7 @@ private function getDataOfProductImage($image, $productAlbum)
      * Returns a minified product which can be used for listings,
      * sliders or emotions.
      *
-     * @return array|false
+     * @return array<string, mixed>|false
      */
     private function getPromotion(?int $category, string $number)
     {
@@ -2398,8 +2318,8 @@ private function getPromotion(?int $category, string $number)
             $promotion['linkDetails'] .= "&sCategory=$category";
         }
 
-        //check if the product has a configured property set which stored in s_filter.
-        //the mini product doesn't contains this data so we have to load this lazy.
+        // check if the product has a configured property set which stored in s_filter.
+        // the mini product doesn't contains this data so we have to load this lazy.
         if (!$product->hasProperties()) {
             return $promotion;
         }
@@ -2454,7 +2374,7 @@ private function getListing(
 
             $product['description_long'] = $this->sOptimizeText($product['description_long']);
 
-            $products[$product['ordernumber']] = $product;
+            $products[(string) $product['ordernumber']] = $product;
         }
 
         $products = $this->listingLinkRewriteService->rewriteLinks($criteria, $products, $context);
@@ -2627,7 +2547,7 @@ private function getLinksOfProduct(ListProduct $product, $categoryId, $addNumber
      */
     private function getDescriptionKeywords($longDescription)
     {
-        //sDescriptionKeywords
+        // sDescriptionKeywords
         $string = strip_tags(html_entity_decode($longDescription, ENT_COMPAT | ENT_HTML401, 'UTF-8'));
         $string = str_replace(',', '', $string);
         $words = preg_split('/ /', $string, -1, PREG_SPLIT_NO_EMPTY);
@@ -2670,26 +2590,24 @@ private function getCurrentSelection(array $selection): array
             $selection = $this->frontController->Request()->getParam('group');
         }
 
+        $formattedSelection = [];
         foreach ($selection as $groupId => $optionId) {
             $groupId = (int) $groupId;
             $optionId = (int) $optionId;
 
             if ($groupId <= 0 || $optionId <= 0) {
-                unset($selection[$groupId]);
+                continue;
             }
+
+            $formattedSelection[$groupId] = $optionId;
         }
 
-        return $selection;
+        return $formattedSelection;
     }
 
-    /**
-     * @param int $productId
-     *
-     * @return string
-     */
-    private function getOrderNumberByProductId($productId)
+    private function getOrderNumberByProductId(int $productId): string
     {
-        return $this->db->fetchOne(
+        return (string) $this->db->fetchOne(
             'SELECT ordernumber
              FROM s_articles_details
                 INNER JOIN s_articles
diff --git a/engine/Shopware/Core/sArticlesComparisons.php b/engine/Shopware/Core/sArticlesComparisons.php
index 0c5c89dbd44..c6a2d56df3f 100644
--- a/engine/Shopware/Core/sArticlesComparisons.php
+++ b/engine/Shopware/Core/sArticlesComparisons.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface;
@@ -107,7 +107,7 @@ public function sAddComparison($articleId)
         }
 
         // Check if this product is already noted
-        $checkForProduct = $this->db->fetchRow(
+        $checkForProduct = $this->db->fetchOne(
             'SELECT id FROM s_order_comparisons WHERE sessionID=? AND articleID=?',
             [$this->session->offsetGet('sessionId'), $productId]
         );
@@ -122,31 +122,31 @@ public function sAddComparison($articleId)
             return 'max_reached';
         }
 
-        if (!$checkForProduct['id']) {
-            $productName = $this->db->fetchOne(
-                'SELECT s_articles.name AS articleName FROM s_articles WHERE id = ?',
-                [$productId]
-            );
+        if ($checkForProduct !== false) {
+            return true;
+        }
 
-            if (!$productName) {
-                return false;
-            }
+        $productName = $this->db->fetchOne(
+            'SELECT s_articles.name AS articleName FROM s_articles WHERE id = ?',
+            [$productId]
+        );
 
-            $sql = '
-            INSERT INTO s_order_comparisons (sessionID, userID, articlename, articleID, datum)
-            VALUES (?,?,?,?,now())
-            ';
+        if (!$productName) {
+            return false;
+        }
 
-            $queryNewPrice = $this->db->executeUpdate($sql, [
-                $this->session->offsetGet('sessionId'),
-                empty($this->session['sUserId']) ? 0 : $this->session['sUserId'],
-                $productName,
-                $productId,
-            ]);
+        $sql = 'INSERT INTO s_order_comparisons (sessionID, userID, articlename, articleID, datum)
+                VALUES (?,?,?,?,now())';
 
-            if (!$queryNewPrice) {
-                throw new Enlight_Exception('sArticles##sAddComparison##01: Error in SQL-query');
-            }
+        $queryNewPrice = $this->db->executeUpdate($sql, [
+            $this->session->offsetGet('sessionId'),
+            empty($this->session['sUserId']) ? 0 : $this->session['sUserId'],
+            $productName,
+            $productId,
+        ]);
+
+        if (!$queryNewPrice) {
+            throw new Enlight_Exception('sArticles##sAddComparison##01: Error in SQL-query');
         }
 
         return true;
@@ -212,6 +212,9 @@ public function sGetComparisonList()
         foreach ($checkForProduct as $product) {
             if ($product['articleID']) {
                 $promotion = $this->articleModule->sGetPromotionById('fix', 0, (int) $product['articleID']);
+                if (!\is_array($promotion)) {
+                    continue;
+                }
                 $promotion['linkDetails'] = $promotion['linkVariant'];
                 $products[] = $promotion;
             }
@@ -236,7 +239,7 @@ public function sGetComparisonProperties($articles)
         $properties = [];
 
         foreach ($articles as $product) {
-            //get all properties in the right order
+            // get all properties in the right order
             $sql = "SELECT
                       options.id,
                       options.name,
@@ -269,7 +272,7 @@ public function sGetComparisonProperties($articles)
 
             foreach ($productProperties as $productProperty) {
                 if (!\array_key_exists($productProperty['id'], $properties)) {
-                    //the key is not part of the array so add it to the end
+                    // the key is not part of the array so add it to the end
                     $properties[$productProperty['id']] = $this->extractPropertyTranslation($productProperty);
                 }
             }
@@ -291,7 +294,7 @@ public function sFillUpComparisonArticles($properties, $articles)
         foreach ($articles as $productKey => $product) {
             $productProperties = [];
             foreach ($properties as $propertyKey => $property) {
-                if (\is_array($product['sProperties']) && \array_key_exists($propertyKey, $product['sProperties'])) {
+                if (isset($product['sProperties']) && \is_array($product['sProperties']) && \array_key_exists($propertyKey, $product['sProperties'])) {
                     $productProperties[$propertyKey] = $product['sProperties'][$propertyKey];
                 } else {
                     $productProperties[$propertyKey] = null;
diff --git a/engine/Shopware/Core/sBasket.php b/engine/Shopware/Core/sBasket.php
index de56cd64586..9a6c4301207 100644
--- a/engine/Shopware/Core/sBasket.php
+++ b/engine/Shopware/Core/sBasket.php
@@ -4,23 +4,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\DBAL\Connection;
@@ -37,6 +36,7 @@
 use Shopware\Components\Cart\CartOrderNumberProviderInterface;
 use Shopware\Components\Cart\Struct\CartItemStruct;
 use Shopware\Components\Cart\Struct\DiscountContext;
+use Shopware\Components\Compatibility\LegacyStructConverter;
 use Shopware\Components\Random;
 use Symfony\Component\HttpFoundation\Cookie;
 
@@ -45,7 +45,7 @@
  *
  * @phpstan-type BasketArray array{content?:array<array<string, mixed>>, Amount?:string, AmountNet?:string, Quantity?:int, AmountNumeric?:float, AmountNetNumeric?:float, AmountWithTax?:string, AmountWithTaxNumeric?:float}
  */
-class sBasket implements \Enlight_Hook
+class sBasket implements Enlight_Hook
 {
     /**
      * Pointer to sSystem object
@@ -152,19 +152,19 @@ class sBasket implements \Enlight_Hook
     private $cartOrderNumberProvider;
 
     /**
-     * @throws \Exception
+     * @throws Exception
      */
     public function __construct(
-        Enlight_Components_Db_Adapter_Pdo_Mysql $db = null,
-        Enlight_Event_EventManager $eventManager = null,
-        Shopware_Components_Snippet_Manager $snippetManager = null,
-        Shopware_Components_Config $config = null,
-        Enlight_Components_Session_Namespace $session = null,
-        Enlight_Controller_Front $front = null,
-        Shopware_Components_Modules $moduleManager = null,
-        sSystem $systemModule = null,
-        ContextServiceInterface $contextService = null,
-        AdditionalTextServiceInterface $additionalTextService = null
+        ?Enlight_Components_Db_Adapter_Pdo_Mysql $db = null,
+        ?Enlight_Event_EventManager $eventManager = null,
+        ?Shopware_Components_Snippet_Manager $snippetManager = null,
+        ?Shopware_Components_Config $config = null,
+        ?Enlight_Components_Session_Namespace $session = null,
+        ?Enlight_Controller_Front $front = null,
+        ?Shopware_Components_Modules $moduleManager = null,
+        ?sSystem $systemModule = null,
+        ?ContextServiceInterface $contextService = null,
+        ?AdditionalTextServiceInterface $additionalTextService = null
     ) {
         $this->db = $db ?: Shopware()->Db();
         $this->eventManager = $eventManager ?: Shopware()->Events();
@@ -239,7 +239,7 @@ public function sGetAmountArticles()
             ]
         );
 
-        $result = $queryBuilder->execute()->fetch(\PDO::FETCH_ASSOC);
+        $result = $queryBuilder->execute()->fetch(PDO::FETCH_ASSOC);
 
         return $result === false ? [] : $result;
     }
@@ -334,10 +334,10 @@ public function sGetAmountRestrictedArticles($articles, $supplier)
      * Update vouchers in cart
      * Used only internally in sBasket
      *
-     * @throws \Exception
-     * @throws \Enlight_Exception
-     * @throws \Enlight_Event_Exception
-     * @throws \Zend_Db_Adapter_Exception
+     * @throws Exception
+     * @throws Enlight_Exception
+     * @throws Enlight_Event_Exception
+     * @throws Zend_Db_Adapter_Exception
      */
     public function sUpdateVoucher()
     {
@@ -354,9 +354,9 @@ public function sUpdateVoucher()
      * Insert basket discount
      * Used only internally in sBasket::sGetBasket()
      *
-     * @throws \Enlight_Exception
-     * @throws \Enlight_Event_Exception
-     * @throws \Zend_Db_Adapter_Exception
+     * @throws Enlight_Exception
+     * @throws Enlight_Event_Exception
+     * @throws Zend_Db_Adapter_Exception
      */
     public function sInsertDiscount()
     {
@@ -426,7 +426,7 @@ public function sInsertDiscount()
             $tax = 19;
         }
 
-        if (!$this->sSYSTEM->sUSERGROUPDATA['tax'] && $this->sSYSTEM->sUSERGROUPDATA['id']) {
+        if (empty($this->sSYSTEM->sUSERGROUPDATA['tax']) && $this->sSYSTEM->sUSERGROUPDATA['id']) {
             $discountNet = $discount;
         } else {
             $discountNet = round($discount / (100 + $tax) * 100, 3);
@@ -492,6 +492,7 @@ public function sInsertDiscount()
             );
 
             $this->db->insert('s_order_basket', $params);
+            $this->db->insert('s_order_basket_attributes', ['basketID' => $this->db->lastInsertId()]);
         }
     }
 
@@ -515,7 +516,7 @@ public function sCheckForDiscount()
      * Add premium products to cart
      * Used internally in sBasket and in CheckoutController
      *
-     * @throws \Zend_Db_Adapter_Exception
+     * @throws Zend_Db_Adapter_Exception
      *
      * @return bool|int
      */
@@ -620,7 +621,7 @@ public function sInsertPremium()
                 'variant'
             );
 
-            $product = new StoreFrontBundle\Struct\ListProduct(
+            $product = new ListProduct(
                 $premium['articleID'],
                 $premium['variantID'],
                 $premium['ordernumber']
@@ -709,10 +710,10 @@ public function getMaxTax()
      * @param string $voucherCode Voucher code
      * @param string $basket
      *
-     * @throws \Exception
-     * @throws \Enlight_Exception
-     * @throws \Enlight_Event_Exception
-     * @throws \Zend_Db_Adapter_Exception
+     * @throws Exception
+     * @throws Enlight_Exception
+     * @throws Enlight_Event_Exception
+     * @throws Zend_Db_Adapter_Exception
      *
      * @return array|bool True if successful, false if stopped by an event, array with error data if one occurred
      */
@@ -728,16 +729,19 @@ public function sAddVoucher($voucherCode, $basket = '')
         $voucherCode = strtolower(trim(stripslashes($voucherCode)));
 
         // Load the voucher details
+        $date = new DateTime();
+        $date = $date->format('Y-m-d');
+
         $voucherDetails = $this->db->fetchRow(
             'SELECT *
               FROM s_emarketing_vouchers
               WHERE modus != 1
-              AND LOWER(vouchercode) = ?
+              AND LOWER(vouchercode) = :vouchercode
               AND (
-                (valid_to >= CURDATE() AND valid_from <= CURDATE())
-                OR valid_to IS NULL
+                (valid_to >= :date OR valid_to IS NULL)
+                AND (valid_from <= :date OR valid_from IS NULL)
               )',
-            [$voucherCode]
+            ['vouchercode' => $voucherCode, 'date' => $date]
         ) ?: [];
 
         $individualCode = false;
@@ -750,8 +754,8 @@ public function sAddVoucher($voucherCode, $basket = '')
             return ['sErrorFlag' => true, 'sErrorMessages' => $sErrorMessages];
         }
 
-        if ($voucherDetails['id']) {
-            // If we have voucher details, its a reusable code
+        if (!empty($voucherDetails['id'])) {
+            // If we have voucher details, it's a reusable code
             // We need to check how many times it has already been used
             $usedVoucherCount = $this->db->fetchRow(
                 'SELECT COUNT(id) AS vouchers
@@ -761,7 +765,7 @@ public function sAddVoucher($voucherCode, $basket = '')
                 [$voucherDetails['ordercode']]
             ) ?: [];
         } else {
-            // If we don't have voucher details yet, need to check if its a one-time code
+            // If we don't have voucher details yet, need to check if it's a one-time code
             $voucherCodeDetails = $this->db->fetchRow(
                 'SELECT id, voucherID, code as vouchercode FROM s_emarketing_voucher_codes c WHERE c.code = ? AND c.cashed != 1 LIMIT 1;',
                 [$voucherCode]
@@ -772,20 +776,18 @@ public function sAddVoucher($voucherCode, $basket = '')
                     'SELECT description, numberofunits, customergroup, value, restrictarticles,
                     minimumcharge, shippingfree, bindtosupplier, taxconfig, valid_from,
                     valid_to, ordercode, modus, percental, strict, subshopID, customer_stream_ids
-                    FROM s_emarketing_vouchers WHERE modus = 1 AND id = ? AND (
-                      (valid_to >= CURDATE()
-                          AND valid_from <= CURDATE()
-                      )
-                      OR valid_to is NULL
+                    FROM s_emarketing_vouchers
+                    WHERE modus = 1 AND id = :voucherId AND (
+                        (valid_to >= :date OR valid_to IS NULL) AND (valid_from <= :date OR valid_from IS NULL)
                 ) LIMIT 1',
-                    [(int) $voucherCodeDetails['voucherID']]
+                    ['voucherId' => (int) $voucherCodeDetails['voucherID'], 'date' => $date]
                 ) ?: [];
                 unset($voucherCodeDetails['voucherID']);
                 $voucherDetails = array_merge($voucherCodeDetails, $voucherDetails);
-                $individualCode = $voucherDetails && $voucherDetails['description'];
+                $individualCode = $voucherDetails && ($voucherDetails['description'] ?? null);
             }
         }
-        $streams = array_filter(explode('|', $voucherDetails['customer_stream_ids']));
+        $streams = array_filter(explode('|', $voucherDetails['customer_stream_ids'] ?? ''));
 
         if (!empty($streams)) {
             $context = $this->contextService->getShopContext();
@@ -807,7 +809,7 @@ public function sAddVoucher($voucherCode, $basket = '')
         // 3 - Voucher is reusable and has already been used to the limit
         if (!$voucherDetails
             || !$voucherCode
-            || ($voucherDetails['numberofunits'] <= $usedVoucherCount['vouchers'] && !$individualCode)
+            || (($voucherDetails['numberofunits'] ?? 0) <= ($usedVoucherCount['vouchers'] ?? 0) && !$individualCode)
         ) {
             $sErrorMessages[] = $this->snippetManager->getNamespace('frontend/basket/internalMessages')->get(
                 'VoucherFailureNotFound',
@@ -873,15 +875,15 @@ public function sAddVoucher($voucherCode, $basket = '')
             $voucherDetails['value'] *= $factor;
         }
 
-        $basketValue = $amount['totalAmount'] / $factor;
+        $basketValue = ($amount['totalAmount'] ?? 0) / $factor;
         // Check if the basket's value is above the voucher's
         if ($basketValue < $voucherDetails['minimumcharge']) {
             $snippet = $this->snippetManager->getNamespace('frontend/basket/internalMessages')->get(
                 'VoucherFailureMinimumCharge',
                 'The minimum charge for this voucher is {$sMinimumCharge|currency}'
             );
-            $smarty = Shopware()->Container()->get(\Enlight_Template_Manager::class);
-            $template = $smarty->createTemplate(sprintf('string:%s', $snippet));
+            $smarty = Shopware()->Container()->get(Enlight_Template_Manager::class);
+            $template = $smarty->createTemplate(\sprintf('string:%s', $snippet));
             $template->assign('sMinimumCharge', $voucherDetails['minimumcharge']);
 
             $sErrorMessages[] = $template->fetch();
@@ -907,7 +909,6 @@ public function sAddVoucher($voucherCode, $basket = '')
 
         if ($this->proportionalTaxCalculation && !$this->session->get('taxFree') && $voucherDetails['taxconfig'] === 'auto') {
             $taxCalculator = Shopware()->Container()->get('shopware.cart.proportional_tax_calculator');
-            $system = Shopware()->Container()->get('system');
             $prices = $this->basketHelper->getPositionPrices(
                 new DiscountContext(
                     $this->session->get('sessionId'),
@@ -978,6 +979,8 @@ public function sAddVoucher($voucherCode, $basket = '')
                 );
 
                 $this->db->query($sql, $params);
+                $insertId = (int) $this->db->lastInsertId('s_order_basket');
+                $this->connection->insert('s_order_basket_attributes', ['basketID' => $insertId]);
             }
 
             return !empty($prices);
@@ -1033,7 +1036,8 @@ public function sAddVoucher($voucherCode, $basket = '')
             return false;
         }
 
-        $insertId = $this->db->lastInsertId('s_order_basket');
+        $insertId = (int) $this->db->lastInsertId('s_order_basket');
+        $this->connection->insert('s_order_basket_attributes', ['basketID' => $insertId]);
 
         $this->eventManager->notify(
             'Shopware_Modules_Basket_AddVoucher_Inserted',
@@ -1088,7 +1092,7 @@ public function sCheckMinimumCharge()
 
         if ($minimumOrder && !$this->sSYSTEM->sUSERGROUPDATA['minimumordersurcharge']) {
             $amount = $this->sGetAmount();
-            if ($amount['totalAmount'] < ($minimumOrder * $factor)) {
+            if (($amount['totalAmount'] ?? 0) < ($minimumOrder * $factor)) {
                 return $minimumOrder * $factor;
             }
         }
@@ -1100,8 +1104,8 @@ public function sCheckMinimumCharge()
      * Add surcharge for payment means to cart
      * Used only internally in sBasket::sGetBasket
      *
-     * @throws \Enlight_Exception
-     * @throws \Zend_Db_Adapter_Exception
+     * @throws Enlight_Exception
+     * @throws Zend_Db_Adapter_Exception
      *
      * @return false|null False on failure, null on success
      */
@@ -1145,7 +1149,7 @@ public function sInsertSurcharge()
             $tax = 19;
         }
 
-        if (!$this->sSYSTEM->sUSERGROUPDATA['tax'] && $this->sSYSTEM->sUSERGROUPDATA['id']) {
+        if (empty($this->sSYSTEM->sUSERGROUPDATA['tax']) && $this->sSYSTEM->sUSERGROUPDATA['id']) {
             $discountNet = $minimumOrderSurcharge;
         } else {
             $discountNet = round($minimumOrderSurcharge / (100 + $tax) * 100, 3);
@@ -1204,19 +1208,20 @@ public function sInsertSurcharge()
             );
         } else {
             $this->db->insert('s_order_basket', $params);
+            $this->db->insert('s_order_basket_attributes', ['basketID' => $this->db->lastInsertId()]);
         }
 
         return null;
     }
 
     /**
-     * Add percentual surcharge
+     * Add percentage surcharge
      * Used only internally in sBasket::sGetBasket
      *
-     * @throws \Enlight_Exception
-     * @throws \Zend_Db_Adapter_Exception
+     * @throws Enlight_Exception
+     * @throws Zend_Db_Adapter_Exception
      *
-     * @return false|void|null False on failure, null on success
+     * @return false|null False on failure, null on success
      */
     public function sInsertSurchargePercent()
     {
@@ -1282,7 +1287,7 @@ public function sInsertSurchargePercent()
             $tax = 19;
         }
 
-        if (!$this->sSYSTEM->sUSERGROUPDATA['tax'] && $this->sSYSTEM->sUSERGROUPDATA['id']) {
+        if (empty($this->sSYSTEM->sUSERGROUPDATA['tax']) && $this->sSYSTEM->sUSERGROUPDATA['id']) {
             $discountNet = $surcharge;
         } else {
             $discountNet = round($surcharge / (100 + $tax) * 100, 3);
@@ -1332,6 +1337,7 @@ public function sInsertSurchargePercent()
         }
 
         $this->db->insert('s_order_basket', $params);
+        $this->db->insert('s_order_basket_attributes', ['basketID' => $this->db->lastInsertId()]);
 
         return null;
     }
@@ -1353,10 +1359,10 @@ public function sCountBasket()
     /**
      * Updates cart and returns it.
      *
-     * @throws \Exception
-     * @throws \Enlight_Exception
-     * @throws \Enlight_Event_Exception
-     * @throws \Zend_Db_Adapter_Exception
+     * @throws Exception
+     * @throws Enlight_Exception
+     * @throws Enlight_Event_Exception
+     * @throws Zend_Db_Adapter_Exception
      *
      * @phpstan-return BasketArray
      *
@@ -1414,8 +1420,8 @@ public function sGetBasket()
     /**
      * Returns all basket data without refresh
      *
-     * @throws \Exception
-     * @throws \Enlight_Exception
+     * @throws Exception
+     * @throws Enlight_Exception
      *
      * @phpstan-return BasketArray
      *
@@ -1492,13 +1498,12 @@ public function sGetBasketData()
                 $result[CartKey::POSITIONS][$key]['tax'] = $calcDifference;
             }
         }
-        $result = $this->eventManager->filter(
+
+        return $this->eventManager->filter(
             'Shopware_Modules_Basket_GetBasket_FilterResult',
             $result,
             ['subject' => $this]
         );
-
-        return $result;
     }
 
     /**
@@ -1509,9 +1514,9 @@ public function sGetBasketData()
      * @param string $articleName
      * @param string $articleOrderNumber
      *
-     * @throws \DomainException
-     * @throws \Enlight_Exception         If entry could not be added to database
-     * @throws \Zend_Db_Adapter_Exception
+     * @throws DomainException
+     * @throws Enlight_Exception         If entry could not be added to database
+     * @throws Zend_Db_Adapter_Exception
      *
      * @return bool If operation was successful
      */
@@ -1569,7 +1574,7 @@ public function sAddNote($articleID, $articleName, $articleOrderNumber)
      * Get all products current on wishlist
      * Used in the NoteController
      *
-     * @throws \Exception
+     * @throws Exception
      *
      * @return array Product notes
      */
@@ -1577,7 +1582,7 @@ public function sGetNotes()
     {
         $notes = $this->getNoteProducts();
         if (empty($notes)) {
-            return $notes;
+            return [];
         }
 
         $numbers = array_column($notes, 'ordernumber');
@@ -1616,22 +1621,21 @@ public function sCountNotes()
     {
         $responseCookies = $this->front->Response()->getCookies();
 
-        if (!empty($responseCookies['sUniqueID-/']['value']) && $responseCookies['sUniqueID-/']['value']) {
+        if (!empty($responseCookies['sUniqueID-/']['value'])) {
             $uniqueId = $responseCookies['sUniqueID-/']['value'];
         } else {
             $uniqueId = $this->front->Request()->getCookie('sUniqueID');
         }
 
-        $count = (int) $this->db->fetchOne('
-            SELECT COUNT(*) FROM s_order_notes n, s_articles a
-            WHERE (sUniqueID = ? OR (userID != 0 AND userID = ?))
-            AND a.id = n.articleID AND a.active = 1
-        ', [
-            empty($uniqueId) ? $this->session->get('sessionId') : $uniqueId,
-            $this->session->get('sUserId', 0),
-        ]);
-
-        return $count;
+        return (int) $this->db->fetchOne(
+            'SELECT COUNT(*) FROM s_order_notes n, s_articles a
+             WHERE (sUniqueID = ? OR (userID != 0 AND userID = ?))
+                AND a.id = n.articleID AND a.active = 1',
+            [
+                empty($uniqueId) ? $this->session->get('sessionId') : $uniqueId,
+                $this->session->get('sUserId', 0),
+            ]
+        );
     }
 
     /**
@@ -1640,8 +1644,8 @@ public function sCountNotes()
      *
      * @param int $id Id of the wishlist line
      *
-     * @throws \Zend_Db_Adapter_Exception
-     * @throws \Enlight_Exception         If entry could not be deleted from database
+     * @throws Zend_Db_Adapter_Exception
+     * @throws Enlight_Exception         If entry could not be deleted from database
      *
      * @return bool if the operation was successful
      */
@@ -1685,9 +1689,9 @@ public function sDeleteNote($id)
      * @param int $id       Basket entry id
      * @param int $quantity Quantity
      *
-     * @throws \Enlight_Event_Exception
-     * @throws \Zend_Db_Adapter_Exception
-     * @throws \Enlight_Exception         If database could not be updated
+     * @throws Enlight_Event_Exception
+     * @throws Zend_Db_Adapter_Exception
+     * @throws Enlight_Exception         If database could not be updated
      *
      * @return false|null
      */
@@ -1792,7 +1796,7 @@ public function updateCartItems(array $cartItems)
                         'price' => $grossPrice,
                         'netprice' => $netPrice,
                         'currencyFactor' => $this->sSYSTEM->sCurrency['factor'],
-                        'articlename' => $additionalInfo['name'],
+                        'articlename' => $additionalInfo['name'] ?? null,
                     ]
                 );
 
@@ -1829,7 +1833,7 @@ public function updateCartItems(array $cartItems)
                         $params
                     );
                 } catch (Zend_Db_Exception $e) {
-                    throw new Enlight_Exception(sprintf('Basket Update ##01 Could not update quantity %s', $sql));
+                    throw new Enlight_Exception(\sprintf('Basket Update ##01 Could not update quantity %s', $sql));
                 }
             }
         }
@@ -1942,10 +1946,10 @@ public function sDeleteArticle($id)
      * @param string $id       Order number (s_articles_details.ordernumber)
      * @param int    $quantity Amount
      *
-     * @throws \Exception
-     * @throws \Enlight_Exception         If no price could be determined, or a database error occurs
-     * @throws \Enlight_Event_Exception
-     * @throws \Zend_Db_Adapter_Exception
+     * @throws Exception
+     * @throws Enlight_Exception         If no price could be determined, or a database error occurs
+     * @throws Enlight_Event_Exception
+     * @throws Zend_Db_Adapter_Exception
      *
      * @return int|false Id of the inserted basket entry, or false on failure
      */
@@ -2063,7 +2067,7 @@ public function sAddArticle($id, $quantity = 1)
         try {
             $this->db->query($sql, $params);
         } catch (Zend_Db_Exception $e) {
-            throw new Enlight_Exception(sprintf('BASKET-INSERT #02 SQL-Error%s', $sql));
+            throw new Enlight_Exception(\sprintf('BASKET-INSERT #02 SQL-Error%s', $sql));
         }
 
         $insertId = (int) $this->db->lastInsertId();
@@ -2097,10 +2101,10 @@ public function clearBasket()
      * Refresh basket after login / currency change
      * Used in multiple locations
      *
-     * @throws \Exception
-     * @throws \Enlight_Exception
-     * @throws \Enlight_Event_Exception
-     * @throws \Zend_Db_Adapter_Exception
+     * @throws Exception
+     * @throws Enlight_Exception
+     * @throws Enlight_Event_Exception
+     * @throws Zend_Db_Adapter_Exception
      */
     public function sRefreshBasket()
     {
@@ -2239,13 +2243,13 @@ private static function roundTotal($total)
     }
 
     /**
-     * @throws \Exception
+     * @throws Exception
      *
      * @return array
      */
     private function convertListProductToNote(ListProduct $product, array $note)
     {
-        $structConverter = Shopware()->Container()->get(\Shopware\Components\Compatibility\LegacyStructConverter::class);
+        $structConverter = Shopware()->Container()->get(LegacyStructConverter::class);
         /** @var array $promotion */
         $promotion = $structConverter->convertListProductStruct($product);
 
@@ -2293,7 +2297,7 @@ private function getNoteProducts()
      * @param string $orderNumber
      * @param string $sessionId
      *
-     * @throws \Enlight_Event_Exception
+     * @throws Enlight_Event_Exception
      *
      * @return array Example: ["id" => "731", "quantity" => "100"]
      */
@@ -2333,7 +2337,7 @@ private function checkIfProductIsInBasket($productId, $orderNumber, $sessionId)
     private function filterUsedVoucher($userId, $voucherDetails)
     {
         $sErrorMessages = [];
-        if ($userId && $voucherDetails['id']) {
+        if ($userId && !empty($voucherDetails['id'])) {
             $queryVoucher = $this->db->fetchAll(
                 'SELECT s_order_details.id AS id
                     FROM s_order, s_order_details
@@ -2597,8 +2601,8 @@ private function getBasketImage($image)
      *
      * @param array<array<string, mixed>> $getProducts
      *
-     * @throws \Exception
-     * @throws \Enlight_Event_Exception
+     * @throws Exception
+     * @throws Enlight_Event_Exception
      *
      * @return array{0: array<array<string, mixed>>, 1: float, 2: float, 3: int, 4: float}
      */
@@ -2717,7 +2721,7 @@ private function getBasketProducts(array $getProducts): array
                         ->round($netprice, $tax, $quantity);
 
                     // If basket comprised any discount, calculate brutto-value for the discount
-                    if ($this->sSYSTEM->sUSERGROUPDATA['basketdiscount'] && $this->sCheckForDiscount()) {
+                    if ($this->contextService->getShopContext()->getCurrentCustomerGroup()->getPercentageDiscount() && $this->sCheckForDiscount()) {
                         $discount += ($getProducts[$key]['amountWithTax'] / 100 * $this->sSYSTEM->sUSERGROUPDATA['basketdiscount']);
                     }
                 } elseif ($getProducts[$key]['modus'] == CartPositionsMode::CUSTOMER_GROUP_DISCOUNT) {
@@ -2727,13 +2731,13 @@ private function getBasketProducts(array $getProducts): array
                     $getProducts[$key]['amountWithTax'] = round(1 * (round($price, 2) / 100 * (100 + $tax)), 2);
 
                     if ($this->sSYSTEM->sUSERGROUPDATA['basketdiscount'] && $this->sCheckForDiscount()) {
-                        $discount += ($getProducts[$key]['amountWithTax'] / 100 * ($this->sSYSTEM->sUSERGROUPDATA['basketdiscount']));
+                        $discount += ($getProducts[$key]['amountWithTax'] / 100 * $this->sSYSTEM->sUSERGROUPDATA['basketdiscount']);
                     }
                 } elseif ($getProducts[$key]['modus'] == CartPositionsMode::PAYMENT_SURCHARGE_OR_DISCOUNT
                                  || $getProducts[$key]['modus'] == CartPositionsMode::SWAG_BUNDLE_DISCOUNT
                 ) {
                     $getProducts[$key]['amountWithTax'] = round(1 * ($price / 100 * (100 + $tax)), 2);
-                    if ($this->sSYSTEM->sUSERGROUPDATA['basketdiscount'] && $this->sCheckForDiscount()) {
+                    if (isset($this->sSYSTEM->sUSERGROUPDATA['basketdiscount']) && $this->sCheckForDiscount()) {
                         $discount += ($getProducts[$key]['amountWithTax'] / 100 * $this->sSYSTEM->sUSERGROUPDATA['basketdiscount']);
                     }
                 }
@@ -2741,7 +2745,7 @@ private function getBasketProducts(array $getProducts): array
 
             $getProducts[$key]['amount'] = $quantity * round($price, 2);
 
-            //reset purchaseunit and save the original value in purchaseunitTemp
+            // reset purchaseunit and save the original value in purchaseunitTemp
             if ($getProducts[$key]['purchaseunit'] > 0) {
                 $getProducts[$key]['purchaseunitTemp'] = $getProducts[$key]['purchaseunit'];
                 $getProducts[$key]['purchaseunit'] = 1;
@@ -2831,7 +2835,7 @@ private function getBasketProducts(array $getProducts): array
     }
 
     /**
-     * @throws \Enlight_Event_Exception
+     * @throws Enlight_Event_Exception
      *
      * @return array<array<string, mixed>>
      */
@@ -2886,9 +2890,9 @@ private function loadBasketProducts(): array
     /**
      * Gets additional product info for sUpdateArticle
      *
-     * @param CartItemStruct[] $cartItems
+     * @param array<CartItemStruct> $cartItems
      */
-    private function getAdditionalInfoForUpdateProduct(array $cartItems)
+    private function getAdditionalInfoForUpdateProduct(array $cartItems): void
     {
         $ids = [];
         foreach ($cartItems as $cartItem) {
@@ -2928,12 +2932,12 @@ private function getAdditionalInfoForUpdateProduct(array $cartItems)
             ],
             [
                 'ids' => Connection::PARAM_INT_ARRAY,
-                'sessionId' => \PDO::PARAM_STR,
-                'mainCategoryId' => \PDO::PARAM_INT,
+                'sessionId' => PDO::PARAM_STR,
+                'mainCategoryId' => PDO::PARAM_INT,
             ]
         );
 
-        $additionalInformation = $stmt->fetchAll(\PDO::FETCH_GROUP | \PDO::FETCH_UNIQUE);
+        $additionalInformation = $stmt->fetchAll(PDO::FETCH_GROUP | PDO::FETCH_UNIQUE);
         $products = Shopware()->Container()->get(ListProductGatewayInterface::class)->getList(
             array_column($additionalInformation, 'ordernumber'),
             $this->contextService->getShopContext()
@@ -2947,27 +2951,27 @@ private function getAdditionalInfoForUpdateProduct(array $cartItems)
             $additionalInfo = [];
             $quantity = $cartItem->getQuantity();
 
-            if ($additionalInformation[$cartItem->getId()]) {
+            if (isset($additionalInformation[$cartItem->getId()])) {
                 $additionalInfo = $additionalInformation[$cartItem->getId()];
             }
             // Check if quantity matches minimum purchase
-            if (!$additionalInfo['minpurchase']) {
+            if (empty($additionalInfo['minpurchase'])) {
                 $additionalInfo['minpurchase'] = 1;
             }
 
-            $additionalInfo['blocked_customer_groups'] = array_filter(explode('|', $additionalInfo['blocked_customer_groups']));
+            $additionalInfo['blocked_customer_groups'] = array_filter(explode('|', $additionalInfo['blocked_customer_groups'] ?? ''));
 
             if ($quantity < $additionalInfo['minpurchase']) {
                 $quantity = $additionalInfo['minpurchase'];
             }
 
             // Check if quantity matches the step requirements
-            if (!$additionalInfo['purchasesteps']) {
+            if (empty($additionalInfo['purchasesteps'])) {
                 $additionalInfo['purchasesteps'] = 1;
             }
 
             if (($quantity / $additionalInfo['purchasesteps']) != (int) ($quantity / $additionalInfo['purchasesteps'])) {
-                $quantity = (int) ($quantity / $additionalInfo['purchasesteps']) * $additionalInfo['purchasesteps'];
+                $quantity = (int) (($quantity / $additionalInfo['purchasesteps']) * $additionalInfo['purchasesteps']);
             }
 
             $maxPurchase = $this->config->get('sMAXPURCHASE');
@@ -2984,7 +2988,7 @@ private function getAdditionalInfoForUpdateProduct(array $cartItems)
                 $additionalInfo['purchaseunit'] = 1;
             }
 
-            if (isset($products[$additionalInfo['ordernumber']])) {
+            if (isset($additionalInfo['ordernumber']) && isset($products[$additionalInfo['ordernumber']])) {
                 $additionalInfo['product'] = $products[$additionalInfo['ordernumber']];
 
                 $additionalInfo['name'] = $additionalInfo['product']->getName();
@@ -3004,7 +3008,7 @@ private function getAdditionalInfoForUpdateProduct(array $cartItems)
      *
      * @param CartItemStruct[] $cartItems
      *
-     * @throws \Enlight_Event_Exception
+     * @throws Enlight_Event_Exception
      */
     private function getPricesForItemUpdates(array $cartItems)
     {
@@ -3038,13 +3042,13 @@ private function getPricesForItemUpdates(array $cartItems)
             ]
         );
 
-        $itemPrices = $queryBuilder->execute()->fetchAll(\PDO::FETCH_GROUP | \PDO::FETCH_ASSOC);
+        $itemPrices = $queryBuilder->execute()->fetchAll(PDO::FETCH_GROUP | PDO::FETCH_ASSOC);
         $customerPriceGroup = $this->sSYSTEM->sUSERGROUP;
 
         /** @var CartItemStruct $cartItem */
         foreach ($cartItems as $cartItem) {
             $quantity = $cartItem->getQuantity();
-            $prices = $itemPrices[$cartItem->getId()];
+            $prices = $itemPrices[$cartItem->getId()] ?? null;
             $additionalInfo = $cartItem->getAdditionalInfo();
             $priceResult = [];
 
@@ -3093,14 +3097,14 @@ private function getPricesForItemUpdates(array $cartItems)
      *
      * @param int $quantity
      *
-     * @throws \Enlight_Exception
+     * @throws Enlight_Exception
      *
      * @return array
      */
     private function getTaxesForUpdateProduct($quantity, array $queryNewPrice, array $queryAdditionalInfo)
     {
         // Determinate tax rate for this cart position
-        $taxRate = $this->moduleManager->Articles()->getTaxRateByConditions($queryNewPrice['taxID']);
+        $taxRate = (float) $this->moduleManager->Articles()->getTaxRateByConditions($queryNewPrice['taxID']);
 
         $netPrice = $queryNewPrice['price'];
 
@@ -3131,8 +3135,8 @@ private function getTaxesForUpdateProduct($quantity, array $queryNewPrice, array
 
         // Recalculate price per item, if purchase unit is set
         if ($queryAdditionalInfo['purchaseunit'] != 0) {
-            $grossPrice = $grossPrice / $queryAdditionalInfo['purchaseunit'];
-            $netPrice = $netPrice / $queryAdditionalInfo['purchaseunit'];
+            $grossPrice /= $queryAdditionalInfo['purchaseunit'];
+            $netPrice /= $queryAdditionalInfo['purchaseunit'];
         }
 
         if (empty($this->sSYSTEM->sCurrency['factor'])) {
@@ -3170,7 +3174,7 @@ private function getTaxesForUpdateProduct($quantity, array $queryNewPrice, array
     }
 
     /**
-     * @throws \Enlight_Exception
+     * @throws Enlight_Exception
      *
      * @return array
      */
@@ -3190,7 +3194,7 @@ private function getPriceForAddProduct(array $product)
             ->setParameter('pricegroup', $this->sSYSTEM->sUSERGROUP)
             ->setParameter('defaultPriceGroup', $defaultPriceGroup)
             ->execute()
-            ->fetchAll(\PDO::FETCH_GROUP | \PDO::FETCH_UNIQUE | \PDO::FETCH_ASSOC);
+            ->fetchAll(PDO::FETCH_GROUP | PDO::FETCH_UNIQUE | PDO::FETCH_ASSOC);
 
         $price = $prices[$defaultPriceGroup];
 
@@ -3240,7 +3244,7 @@ private function getPriceForAddProduct(array $product)
      *
      * @param string $id Product order number
      *
-     * @throws \Exception
+     * @throws Exception
      *
      * @return array|false Product data, or false if none found
      */
@@ -3310,7 +3314,7 @@ private function getProductForAddProduct($id)
 
     private function getBasketQuantity(int $quantity, array $basketProduct, array $product): int
     {
-        $newQuantity = ($quantity + $basketProduct['quantity']) ?: 0;
+        $newQuantity = $quantity + ($basketProduct['quantity'] ?? 0);
 
         if ($product['laststock'] && $newQuantity > $product['instock']) {
             return (int) $product['instock'];
diff --git a/engine/Shopware/Core/sCategories.php b/engine/Shopware/Core/sCategories.php
index 1c278ea11ac..4687eb384d0 100644
--- a/engine/Shopware/Core/sCategories.php
+++ b/engine/Shopware/Core/sCategories.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\DBAL\Connection;
@@ -275,7 +275,7 @@ public function sGetMainCategories()
      *
      * @param int $id Id of the category
      *
-     * @return array Array of categories in path
+     * @return array<array{id: int, name: string, blog: bool, link: string}> Array of categories in path
      */
     public function sGetCategoriesByParent($id)
     {
@@ -309,7 +309,7 @@ public function sGetCategoriesByParent($id)
      * @param int $depth    Depth to use, defaults to null (unlimited depth)
      * @param int $shopId   Needed for shop limitation
      *
-     * @return array Category tree for the provided args
+     * @return list<array<string, mixed>> Category tree for the provided args
      */
     public function sGetWholeCategoryTree($parentId = null, $depth = null, $shopId = null)
     {
@@ -427,9 +427,9 @@ protected function sGetCategoriesByParentId($id)
     }
 
     /**
-     * @param array $categories
+     * @param list<array<string, mixed>> $categories
      *
-     * @return array
+     * @return list<array<string, mixed>>
      */
     protected function mapCategoryTree($categories)
     {
@@ -438,7 +438,7 @@ protected function mapCategoryTree($categories)
             $category['description'] = $category['name'];
             $category['link'] = $category['external'] ?: $url . $category['id'];
             $category['hidetop'] = $category['hideTop'];
-            if ($category['sub']) {
+            if (isset($category['sub'])) {
                 $category['sub'] = $this->mapCategoryTree($category['sub']);
             }
         }
@@ -465,10 +465,7 @@ private function getChildrenCountOfCategories($ids)
             ->groupBy('parent')
             ->setParameter(':ids', $ids, Connection::PARAM_INT_ARRAY);
 
-        /** @var PDOStatement $statement */
-        $statement = $query->execute();
-
-        return $statement->fetchAll(PDO::FETCH_KEY_PAIR);
+        return $query->execute()->fetchAllKeyValue();
     }
 
     /**
@@ -495,10 +492,7 @@ private function getCategoryIdsWithParent($ids)
             ->setParameter(':parentId', $ids, Connection::PARAM_INT_ARRAY)
             ->setParameter(':shopId', '%|' . $shopId . '|%');
 
-        /** @var PDOStatement $statement */
-        $statement = $query->execute();
-
-        return $statement->fetchAll(PDO::FETCH_KEY_PAIR);
+        return $query->execute()->fetchAllKeyValue();
     }
 
     /**
@@ -517,10 +511,7 @@ private function getCategoryPath($id)
             ->where('category.id = :id')
             ->setParameter(':id', $id);
 
-        /** @var PDOStatement $statement */
-        $statement = $query->execute();
-
-        $path = $statement->fetch(PDO::FETCH_COLUMN);
+        $path = $query->execute()->fetchOne();
 
         $ids = [$id];
 
diff --git a/engine/Shopware/Core/sCms.php b/engine/Shopware/Core/sCms.php
index e443ccd0306..1625faad68d 100644
--- a/engine/Shopware/Core/sCms.php
+++ b/engine/Shopware/Core/sCms.php
@@ -1,34 +1,36 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+use Shopware\Bundle\AttributeBundle\Service\DataLoader;
+
 /**
  * Shopware class that handle static shop pages and dynamic content
  * Used to handle pages such as "Help", etc
  *
  * Used by Frontend_Custom and Frontend_Content controllers
  */
-class sCms implements \Enlight_Hook
+class sCms implements Enlight_Hook
 {
     /**
      * Database connection which used for each database operation in this class.
@@ -51,13 +53,13 @@ class sCms implements \Enlight_Hook
     private $translationComponent;
 
     public function __construct(
-        Enlight_Components_Db_Adapter_Pdo_Mysql $db = null,
-        Enlight_Controller_Front $front = null,
-        Shopware_Components_Translation $translationComponent = null
+        ?Enlight_Components_Db_Adapter_Pdo_Mysql $db = null,
+        ?Enlight_Controller_Front $front = null,
+        ?Shopware_Components_Translation $translationComponent = null
     ) {
         $this->db = $db ?: Shopware()->Db();
         $this->front = $front ?: Shopware()->Front();
-        $this->translationComponent = $translationComponent ?: Shopware()->Container()->get(\Shopware_Components_Translation::class);
+        $this->translationComponent = $translationComponent ?: Shopware()->Container()->get(Shopware_Components_Translation::class);
     }
 
     /**
@@ -104,7 +106,7 @@ public function sGetStaticPage($staticId = null, $shopId = null)
         }
 
         // load attributes
-        $staticPage['attribute'] = Shopware()->Container()->get(\Shopware\Bundle\AttributeBundle\Service\DataLoader::class)->load('s_cms_static_attributes', $staticId);
+        $staticPage['attribute'] = Shopware()->Container()->get(DataLoader::class)->load('s_cms_static_attributes', $staticId);
 
         if ($translations) {
             foreach ($translations as $property => $translation) {
diff --git a/engine/Shopware/Core/sCore.php b/engine/Shopware/Core/sCore.php
index 23b1184415a..a2d6fee1256 100644
--- a/engine/Shopware/Core/sCore.php
+++ b/engine/Shopware/Core/sCore.php
@@ -1,31 +1,31 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
  * Shopware Class providing helper functions for post dispatch url rewriting
  */
-class sCore implements \Enlight_Hook
+class sCore implements Enlight_Hook
 {
     /**
      * The Front controller object
@@ -52,7 +52,7 @@ public function sBuildLink($sVariables)
         $url = [];
         $allowedCategoryVariables = ['sCategory', 'sPage'];
 
-        $tempGET = $this->front->Request() ? $this->front->Request()->getParams() : null;
+        $tempGET = $this->front->Request() ? $this->front->Request()->getParams() : [];
 
         // If viewport is available, this will be the first variable
         if (!empty($tempGET['sViewport'])) {
@@ -96,14 +96,14 @@ public function sBuildLink($sVariables)
     /**
      * Tries to rewrite the provided link using SEO friendly urls
      *
-     * @param string $link  the link to rewrite
-     * @param string $title title of the link or related element
+     * @param string|null $link  the link to rewrite
+     * @param string|null $title title of the link or related element
      *
      * @return mixed|string Complete url, rewritten if possible
      */
     public function sRewriteLink($link = null, $title = null)
     {
-        $url = html_entity_decode(str_replace(',', '=', $link));
+        $url = html_entity_decode(str_replace(',', '=', $link ?? ''));
         $query = (string) parse_url($url, PHP_URL_QUERY);
         parse_str($query, $queryArray);
 
@@ -112,6 +112,11 @@ public function sRewriteLink($link = null, $title = null)
         }
         $queryArray['module'] = 'frontend';
 
-        return $this->front->Router()->assemble($queryArray);
+        $newQueryArray = [];
+        foreach ($queryArray as $key => $queryItem) {
+            $newQueryArray[(string) $key] = $queryItem;
+        }
+
+        return $this->front->ensureRouter()->assemble($newQueryArray);
     }
 }
diff --git a/engine/Shopware/Core/sExport.php b/engine/Shopware/Core/sExport.php
index 02b1f6c7646..b3b305a5e1f 100644
--- a/engine/Shopware/Core/sExport.php
+++ b/engine/Shopware/Core/sExport.php
@@ -1,31 +1,33 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+use Doctrine\DBAL\Connection;
 use Doctrine\ORM\AbstractQuery;
 use Shopware\Bundle\AttributeBundle\Service\CrudService;
 use Shopware\Bundle\AttributeBundle\Service\CrudServiceInterface;
 use Shopware\Bundle\MediaBundle\MediaServiceInterface;
+use Shopware\Bundle\OrderBundle\Service\ShippingCostServiceInterface;
 use Shopware\Bundle\StoreFrontBundle\Service\AdditionalTextServiceInterface;
 use Shopware\Bundle\StoreFrontBundle\Service\ConfiguratorServiceInterface;
 use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface;
@@ -34,6 +36,7 @@
 use Shopware\Components\Model\Exception\ModelNotFoundException;
 use Shopware\Components\ShopRegistrationServiceInterface;
 use Shopware\Components\Thumbnail\Manager;
+use Shopware\Models\Dispatch\Dispatch;
 use Shopware\Models\Media\Album;
 use Shopware\Models\Media\Media;
 use Shopware\Models\Media\Repository;
@@ -122,7 +125,7 @@ class sExport implements Enlight_Hook
     protected $mediaRepository;
 
     /**
-     * @var Album
+     * @var Album|null
      */
     protected $articleMediaAlbum;
 
@@ -137,6 +140,8 @@ class sExport implements Enlight_Hook
 
     private Enlight_Components_Db_Adapter_Pdo_Mysql $db;
 
+    private Connection $connection;
+
     private Shopware_Components_Config $config;
 
     private ConfiguratorServiceInterface $configuratorService;
@@ -146,20 +151,26 @@ class sExport implements Enlight_Hook
      */
     private array $cdnConfig;
 
+    private ShippingCostServiceInterface $shippingCostService;
+
     public function __construct(
-        ContextServiceInterface $contextService = null,
-        Enlight_Components_Db_Adapter_Pdo_Mysql $db = null,
-        Shopware_Components_Config $config = null,
-        ConfiguratorServiceInterface $configuratorService = null
+        ?ContextServiceInterface $contextService = null,
+        ?Enlight_Components_Db_Adapter_Pdo_Mysql $db = null,
+        ?Shopware_Components_Config $config = null,
+        ?ConfiguratorServiceInterface $configuratorService = null,
+        ?Connection $connection = null,
+        ?ShippingCostServiceInterface $shippingCostService = null
     ) {
         $container = Shopware()->Container();
 
         $this->contextService = $contextService ?: $container->get(ContextServiceInterface::class);
         $this->additionalTextService = $container->get(AdditionalTextServiceInterface::class);
         $this->db = $db ?: $container->get('db');
+        $this->connection = $connection ?: $container->get(Connection::class);
         $this->config = $config ?: $container->get(Shopware_Components_Config::class);
         $this->configuratorService = $configuratorService ?: $container->get(ConfiguratorServiceInterface::class);
         $this->cdnConfig = (array) $container->getParameter('shopware.cdn');
+        $this->shippingCostService = $shippingCostService ?: $container->get(ShippingCostServiceInterface::class);
     }
 
     /**
@@ -343,7 +354,7 @@ public function sInitSettings()
 
         $this->shop = $shop;
 
-        $this->sSYSTEM->sCONFIG = Shopware()->Config();
+        $this->sSYSTEM->sCONFIG = $this->config;
     }
 
     /**
@@ -367,7 +378,7 @@ public function sInitSmarty()
         $this->sSmarty->registerPlugin('modifier', 'shippingcost', [$this, 'sGetArticleShippingcost']);
         $this->sSmarty->registerPlugin('modifier', 'property', [$this, 'sGetArticleProperties']);
 
-        $this->sSmarty->assign('sConfig', $this->sSYSTEM->sCONFIG);
+        $this->sSmarty->assign('sConfig', $this->config);
         $this->sSmarty->assign('shopData', $this->shopData);
         $this->sSmarty->assign('sCurrency', $this->sCurrency);
         $this->sSmarty->assign('sCustomergroup', $this->sCustomergroup);
@@ -403,7 +414,7 @@ public function sHtmlEntities($string, $char_set = null)
     }
 
     /**
-     * @param string      $string
+     * @param string|null $string
      * @param string      $esc_type
      * @param string|null $char_set
      *
@@ -415,14 +426,17 @@ public function sFormatString($string, $esc_type = '', $char_set = null)
     }
 
     /**
-     * @param string      $string
+     * @param string|null $string
      * @param string      $esc_type
      * @param string|null $char_set
      *
-     * @return mixed|string
+     * @return string
      */
     public function sEscapeString($string, $esc_type = '', $char_set = null)
     {
+        if ($string === null) {
+            $string = '';
+        }
         if (empty($esc_type)) {
             if (!empty($this->sSettings['formatID']) && $this->sSettings['formatID'] == 3) {
                 $esc_type = 'html';
@@ -481,7 +495,7 @@ public function sEscapeString($string, $esc_type = '', $char_set = null)
 
             case 'quotes':
                 // Escape unescaped single quotes
-                return preg_replace("%(?<!\\\\)'%", "\\'", $string);
+                return (string) preg_replace("%(?<!\\\\)'%", "\\'", $string);
 
             case 'hex':
                 // Escape every character into hex
@@ -531,6 +545,8 @@ public function sEscapeString($string, $esc_type = '', $char_set = null)
 
                 return $_res;
         }
+
+        return $string;
     }
 
     /**
@@ -541,7 +557,7 @@ public function sEscapeString($string, $esc_type = '', $char_set = null)
      */
     public function sGetArticleLink($articleID, $title = '')
     {
-        return Shopware()->Modules()->Core()->sRewriteLink($this->sSYSTEM->sCONFIG['sBASEFILE'] . "?sViewport=detail&sArticle=$articleID", $title) . (empty($this->sSettings['partnerID']) ? '' : '?sPartner=' . urlencode($this->sSettings['partnerID']));
+        return Shopware()->Modules()->Core()->sRewriteLink($this->config->get('sBASEFILE') . "?sViewport=detail&sArticle=$articleID", $title) . (empty($this->sSettings['partnerID']) ? '' : '?sPartner=' . urlencode($this->sSettings['partnerID']));
     }
 
     /**
@@ -569,9 +585,13 @@ public function sGetImageLink($hash, $imageSize = null)
         $fileName = pathinfo($hash, PATHINFO_FILENAME);
 
         // Get thumbnail sizes
-        $sizes = $this->articleMediaAlbum
-            ->getSettings()
-            ->getThumbnailSize();
+        $sizes = [];
+        if ($this->articleMediaAlbum) {
+            $settings = $this->articleMediaAlbum->getSettings();
+            if ($settings) {
+                $sizes = $settings->getThumbnailSize();
+            }
+        }
 
         $sizes = array_map(function ($size) {
             $parts = explode('x', $size);
@@ -1369,7 +1389,7 @@ public function sGetPaymentmean($payment)
      */
     public function sGetDispatch($dispatch = null, $country = null)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.8. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         if (empty($dispatch)) {
             $sql_order = '';
@@ -1421,13 +1441,13 @@ public function sGetDispatch($dispatch = null, $country = null)
      * @param int|null $countryID
      * @param int|null $paymentID
      *
-     * @return array<string, mixed>|false
+     * @return array<string, string>|false
      */
     public function sGetDispatchBasket($article, $countryID = null, $paymentID = null)
     {
         $sql_select = '';
-        if (!empty($this->sSYSTEM->sCONFIG['sPREMIUMSHIPPIUNGASKETSELECT'])) {
-            $sql_select .= ', ' . $this->sSYSTEM->sCONFIG['sPREMIUMSHIPPIUNGASKETSELECT'];
+        if (!empty($this->config->get('sPREMIUMSHIPPIUNGASKETSELECT'))) {
+            $sql_select .= ', ' . $this->config->get('sPREMIUMSHIPPIUNGASKETSELECT');
         }
         $sql = 'SELECT id, calculation_sql FROM s_premium_dispatch WHERE calculation=3';
         $calculations = $this->db->fetchPairs($sql);
@@ -1519,7 +1539,7 @@ public function sGetDispatchBasket($article, $countryID = null, $paymentID = nul
             ]);
         } catch (Exception $e) {
             echo $e->getMessage();
-            exit();
+            exit;
         }
 
         if (empty($basket)) {
@@ -1699,7 +1719,7 @@ public function sGetPremiumDispatch($basket, $dispatch = null)
     }
 
     /**
-     * @param array $basket
+     * @param array<string, mixed> $basket
      *
      * @return float|false
      */
@@ -1709,18 +1729,18 @@ public function sGetPremiumDispatchSurcharge($basket)
             return false;
         }
 
-        $sql = 'SELECT id, bind_sql FROM s_premium_dispatch WHERE type=2 AND bind_sql IS NOT NULL';
-        $statements = $this->db->fetchPairs($sql);
+        $sql = 'SELECT id, bind_sql FROM s_premium_dispatch WHERE type=:type AND active=1 AND bind_sql IS NOT NULL';
+        $activeSurcharges = $this->connection->executeQuery($sql, ['type' => Dispatch::TYPE_SURCHARGE])->fetchAllKeyValue();
 
         $sql_where = '';
-        foreach ($statements as $dispatchID => $statement) {
+        foreach ($activeSurcharges as $dispatchID => $statement) {
             $sql_where .= "
             AND ( d.id!=$dispatchID OR ($statement))
             ";
         }
         $sql_basket = [];
         foreach ($basket as $key => $value) {
-            $sql_basket[] = $this->db->quote($value) . " as `$key`";
+            $sql_basket[] = $this->connection->quote($value) . " as `$key`";
         }
         $sql_basket = implode(', ', $sql_basket);
 
@@ -1787,41 +1807,10 @@ public function sGetPremiumDispatchSurcharge($basket)
             $sql_where
             GROUP BY d.id
         ";
-        $dispatches = $this->db->fetchAll($sql);
-        $surcharge = 0;
-        if (!empty($dispatches)) {
-            foreach ($dispatches as $dispatch) {
-                if (empty($dispatch['calculation'])) {
-                    $from = round($basket['weight'], 3);
-                } elseif ($dispatch['calculation'] == 1) {
-                    $from = round($basket['amount'], 2);
-                } elseif ($dispatch['calculation'] == 2) {
-                    $from = round($basket['count_article']);
-                } elseif ($dispatch['calculation'] == 3) {
-                    $from = round($basket['calculation_value_' . $dispatch['id']], 2);
-                } else {
-                    continue;
-                }
-                $sql = "
-                SELECT `value` , `factor`
-                FROM `s_premium_shippingcosts`
-                WHERE `from` <= $from
-                AND `dispatchID` = {$dispatch['id']}
-                ORDER BY `from` DESC
-                LIMIT 1
-            ";
-                $result = $this->db->fetchRow($sql);
-                if (!$result) {
-                    continue;
-                }
-                $surcharge += $result['value'];
-                if (!empty($result['factor'])) {
-                    $surcharge += $result['factor'] / 100 * $from;
-                }
-            }
-        }
 
-        return (float) $surcharge;
+        $dispatches = $this->connection->fetchAllAssociative($sql);
+
+        return $this->shippingCostService->calculateDispatchesSurcharge($basket, $dispatches);
     }
 
     /**
@@ -1854,36 +1843,12 @@ public function sGetArticlePremiumShippingcosts($article, $payment, $country, $d
             return 0;
         }
 
-        if (empty($dispatchData['calculation'])) {
-            $from = round($basket['weight'], 3);
-        } elseif ($dispatchData['calculation'] == 1) {
-            $from = round($basket['amount'], 2);
-        } elseif ($dispatchData['calculation'] == 2) {
-            $from = round($basket['count_article']);
-        } elseif ($dispatchData['calculation'] == 3) {
-            $from = round($basket['calculation_value_' . $dispatchData['id']], 2);
-        } else {
-            return false;
-        }
-
-        $sql = "
-            SELECT `value` , `factor`
-            FROM `s_premium_shippingcosts`
-            WHERE `from`<=$from
-            AND `dispatchID`={$dispatchData['id']}
-            ORDER BY `from` DESC
-            LIMIT 1
-        ";
-        $result = $this->db->fetchRow($sql);
-
-        if (empty($result)) {
+        try {
+            $result['shippingcosts'] = $this->shippingCostService->calculateDispatchSurcharge($basket, $dispatchData);
+        } catch (RuntimeException $e) {
             return false;
         }
 
-        $result['shippingcosts'] = $result['value'];
-        if (!empty($result['factor'])) {
-            $result['shippingcosts'] += $result['factor'] / 100 * $from;
-        }
         $result['surcharge'] = $this->sGetPremiumDispatchSurcharge($basket);
         if (!empty($result['surcharge'])) {
             $result['shippingcosts'] += $result['surcharge'];
@@ -1893,7 +1858,7 @@ public function sGetArticlePremiumShippingcosts($article, $payment, $country, $d
         }
         $result['shippingcosts'] *= $this->sCurrency['factor'];
         $result['shippingcosts'] = round($result['shippingcosts'], 2);
-        if (!empty($payment['surcharge']) && $dispatchData['surcharge_calculation'] != 2 && (empty($article['shippingfree']) || empty($dispatchData['surcharge_calculation']))) {
+        if (!empty($payment['surcharge']) && (int) $dispatchData['surcharge_calculation'] !== Dispatch::SURCHARGE_CALCULATION_NEVER && (empty($article['shippingfree']) || empty($dispatchData['surcharge_calculation']))) {
             $result['shippingcosts'] += $payment['surcharge'];
         }
 
@@ -1976,7 +1941,11 @@ private function fixShopHost(string $url, string $adapterType): string
             return $url;
         }
 
-        $url = str_replace(parse_url($url, PHP_URL_HOST), $this->shopData['host'], $url);
+        if (\in_array(parse_url($url, PHP_URL_PORT), [443, 80, null])) {
+            $url = str_replace(parse_url($url, PHP_URL_HOST), $this->shopData['host'], $url);
+        } else {
+            $url = str_replace(parse_url($url, PHP_URL_HOST) . ':' . parse_url($url, PHP_URL_PORT), $this->shopData['host'], $url);
+        }
 
         if ($this->shopData['secure']) {
             return str_replace('http:', 'https:', $url);
@@ -2026,7 +1995,7 @@ private function hasMediaUrl(): bool
 
     private function ensurePHPTimeLimit(): void
     {
-        $maxExecutionTime = (int) ini_get('max_execution_time');
+        $maxExecutionTime = (int) \ini_get('max_execution_time');
         if ($maxExecutionTime <= self::DISABLED_MAX_EXECUTION_TIME || $maxExecutionTime >= self::DEFAULT_MAX_EXECUTION_TIME) {
             return;
         }
diff --git a/engine/Shopware/Core/sMarketing.php b/engine/Shopware/Core/sMarketing.php
index 37b69dd5b52..d2b3b671d55 100644
--- a/engine/Shopware/Core/sMarketing.php
+++ b/engine/Shopware/Core/sMarketing.php
@@ -1,29 +1,29 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Query\QueryBuilder;
 use Shopware\Bundle\MediaBundle\MediaServiceInterface;
 use Shopware\Bundle\StoreFrontBundle\Service\AdditionalTextServiceInterface;
 use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface;
@@ -31,8 +31,10 @@
 use Shopware\Bundle\StoreFrontBundle\Struct\ListProduct;
 use Shopware\Bundle\StoreFrontBundle\Struct\Media;
 use Shopware\Components\Compatibility\LegacyStructConverter;
+use Shopware\Components\ContainerAwareEventManager;
+use Shopware\Components\Model\ModelManager;
 use Shopware\Models\Banner\Banner;
-use Shopware\Models\Category\Category;
+use Shopware\Models\Newsletter\Container;
 use Shopware\Models\Tracking\Banner as TrackingBanner;
 
 /**
@@ -50,7 +52,7 @@ class sMarketing implements Enlight_Hook
     /**
      * Array with blacklisted products (already in basket)
      *
-     * @var array
+     * @var array<int>
      */
     public $sBlacklist = [];
 
@@ -68,33 +70,67 @@ class sMarketing implements Enlight_Hook
 
     private AdditionalTextServiceInterface $additionalTextService;
 
-    private Enlight_Components_Db_Adapter_Pdo_Mysql $db;
-
     private Shopware_Components_Config $config;
 
     private sArticles $productModule;
 
+    private sBasket $basketModule;
+
     private Enlight_Controller_Front $front;
 
-    public function __construct(
-        ContextServiceInterface $contextService = null,
-        AdditionalTextServiceInterface $additionalTextService = null,
-        Shopware_Components_Config $config = null,
-        sArticles $productModule = null,
-        Enlight_Controller_Front $front = null
-    ) {
-        $this->categoryId = (int) Shopware()->Shop()->getCategory()->getId();
-        $this->customerGroupId = (int) Shopware()->Modules()->System()->sUSERGROUPDATA['id'];
+    private Connection $connection;
+
+    private ModelManager $modelManager;
 
-        $this->contextService = $contextService ?? Shopware()->Container()->get(ContextServiceInterface::class);
-        $this->additionalTextService = $additionalTextService ?? Shopware()->Container()->get(AdditionalTextServiceInterface::class);
+    private MediaServiceInterface $mediaService;
 
-        $this->db = Shopware()->Db();
-        $this->config = $config ?? Shopware()->Config();
-        $this->productModule = $productModule ?? Shopware()->Modules()->Articles();
-        $this->front = $front ?: Shopware()->Front();
+    private StorefrontMediaServiceInterface $storefrontMediaService;
+
+    private LegacyStructConverter $legacyStructConverter;
+
+    private ContainerAwareEventManager $eventManager;
+
+    public function __construct(
+        ?ContextServiceInterface $contextService = null,
+        ?AdditionalTextServiceInterface $additionalTextService = null,
+        ?Shopware_Components_Config $config = null,
+        ?sArticles $productModule = null,
+        ?sBasket $basketModule = null,
+        ?Enlight_Controller_Front $front = null,
+        ?Connection $connection = null,
+        ?ModelManager $modelManager = null,
+        ?MediaServiceInterface $mediaService = null,
+        ?StorefrontMediaServiceInterface $storefrontMediaService = null,
+        ?LegacyStructConverter $legacyStructConverter = null,
+        ?ContainerAwareEventManager $eventManager = null
+    ) {
+        $container = Shopware()->Container();
+
+        $category = $container->get('shop')->getCategory();
+        $this->categoryId = (int) ($category ? $category->getId() : 0);
+        $this->contextService = $contextService ?? $container->get(ContextServiceInterface::class);
+        $this->customerGroupId = (int) $this->contextService->getShopContext()->getCurrentCustomerGroup()->getId();
+
+        $this->additionalTextService = $additionalTextService ?? $container->get(AdditionalTextServiceInterface::class);
+
+        $this->config = $config ?? $container->get('config');
+        $this->productModule = $productModule ?? $container->get('modules')->Articles();
+        $this->basketModule = $basketModule ?? $container->get('modules')->Basket();
+        $this->front = $front ?: $container->get('front');
+        $this->connection = $connection ?: $container->get(Connection::class);
+        $this->modelManager = $modelManager ?: $container->get(ModelManager::class);
+        $this->mediaService = $mediaService ?: $container->get(MediaServiceInterface::class);
+        $this->storefrontMediaService = $storefrontMediaService ?: $container->get(StorefrontMediaServiceInterface::class);
+        $this->legacyStructConverter = $legacyStructConverter ?: $container->get(LegacyStructConverter::class);
+        $this->eventManager = $eventManager ?: $container->get(ContainerAwareEventManager::class);
     }
 
+    /**
+     * @param int $articleId
+     * @param int $limit
+     *
+     * @return array<array<string, mixed>>
+     */
     public function sGetSimilaryShownArticles($articleId, $limit = 0)
     {
         if (empty($limit)) {
@@ -104,8 +140,7 @@ public function sGetSimilaryShownArticles($articleId, $limit = 0)
 
         $where = '';
         if (!empty($this->sBlacklist)) {
-            $where = Shopware()->Db()->quote($this->sBlacklist);
-            $where = 'AND similarShown.related_article_id NOT IN (' . $where . ')';
+            $where = \sprintf(' AND similarShown.related_article_id NOT IN (%s)', implode(',', $this->sBlacklist));
         }
 
         $sql = "
@@ -144,13 +179,13 @@ public function sGetSimilaryShownArticles($articleId, $limit = 0)
             ORDER BY similarShown.viewed DESC, similarShown.related_article_id DESC
             LIMIT $limit";
 
-        $similarShownProducts = Shopware()->Db()->fetchAll($sql, [
+        $similarShownProducts = $this->connection->fetchAllAssociative($sql, [
             'articleId' => (int) $articleId,
             'categoryId' => (int) $this->categoryId,
             'customerGroupId' => (int) $this->customerGroupId,
         ]);
 
-        Shopware()->Events()->notify('Shopware_Modules_Marketing_GetSimilarShownArticles', [
+        $this->eventManager->notify('Shopware_Modules_Marketing_GetSimilarShownArticles', [
             'subject' => $this,
             'articles' => $similarShownProducts,
         ]);
@@ -158,6 +193,12 @@ public function sGetSimilaryShownArticles($articleId, $limit = 0)
         return $similarShownProducts;
     }
 
+    /**
+     * @param int $articleID
+     * @param int $limit
+     *
+     * @return array<array<string, mixed>>
+     */
     public function sGetAlsoBoughtArticles($articleID, $limit = 0)
     {
         if (empty($limit)) {
@@ -167,8 +208,7 @@ public function sGetAlsoBoughtArticles($articleID, $limit = 0)
         $where = '';
 
         if (!empty($this->sBlacklist)) {
-            $where = Shopware()->Db()->quote($this->sBlacklist);
-            $where = ' AND alsoBought.related_article_id NOT IN (' . $where . ')';
+            $where = \sprintf(' AND alsoBought.related_article_id NOT IN (%s)', implode(',', $this->sBlacklist));
         }
 
         $sql = "
@@ -206,13 +246,13 @@ public function sGetAlsoBoughtArticles($articleID, $limit = 0)
             LIMIT $limit
         ";
 
-        $alsoBought = Shopware()->Db()->fetchAll($sql, [
+        $alsoBought = $this->connection->fetchAllAssociative($sql, [
             'articleId' => (int) $articleID,
             'categoryId' => (int) $this->categoryId,
             'customerGroupId' => (int) $this->customerGroupId,
         ]);
 
-        Shopware()->Events()->notify('Shopware_Modules_Marketing_AlsoBoughtArticles', [
+        $this->eventManager->notify('Shopware_Modules_Marketing_AlsoBoughtArticles', [
             'subject' => $this,
             'articles' => $alsoBought,
         ]);
@@ -226,14 +266,13 @@ public function sGetAlsoBoughtArticles($articleID, $limit = 0)
      * @param int $sCategory
      * @param int $limit
      *
-     * @return array|false Contains all information about the banner-object
+     * @return array<string, mixed>|array<array<string, mixed>>|false Contains all information about the banner-object
      */
     public function sBanner($sCategory, $limit = 1)
     {
         $limit = (int) $limit;
         try {
-            $bannerRepository = Shopware()->Models()->getRepository(Banner::class);
-            $bannerQuery = $bannerRepository->getAllActiveBanners($sCategory, $limit);
+            $bannerQuery = $this->modelManager->getRepository(Banner::class)->getAllActiveBanners($sCategory, $limit);
             if ($bannerQuery) {
                 $getBanners = $bannerQuery->getArrayResult();
             } else {
@@ -244,15 +283,13 @@ public function sBanner($sCategory, $limit = 1)
         }
 
         $images = array_column($getBanners, 'image');
-        $mediaService = Shopware()->Container()->get(MediaServiceInterface::class);
-
-        array_walk($images, function (&$image) use ($mediaService) {
-            $image = $mediaService->normalize($image);
+        array_walk($images, function (&$image) {
+            $image = $this->mediaService->normalize($image);
         });
 
         $mediaIds = $this->getMediaIdsOfPath($images);
-        $context = Shopware()->Container()->get(ContextServiceInterface::class)->getShopContext();
-        $medias = Shopware()->Container()->get(StorefrontMediaServiceInterface::class)->getList($mediaIds, $context);
+        $context = $this->contextService->getShopContext();
+        $medias = $this->storefrontMediaService->getList($mediaIds, $context);
 
         foreach ($getBanners as &$getAffectedBanners) {
             // converting to old format
@@ -265,15 +302,14 @@ public function sBanner($sCategory, $limit = 1)
 
             $media = $this->getMediaByPath($medias, $getAffectedBanners['image']);
             if ($media !== null) {
-                $media = Shopware()->Container()->get(LegacyStructConverter::class)->convertMediaStruct($media);
+                $media = $this->legacyStructConverter->convertMediaStruct($media);
                 $getAffectedBanners['media'] = $media;
             }
 
-            $statRepository = Shopware()->Models()->getRepository(TrackingBanner::class);
-            $bannerStatistics = $statRepository->getOrCreateBannerStatsModel($getAffectedBanners['id']);
+            $bannerStatistics = $this->modelManager->getRepository(TrackingBanner::class)->getOrCreateBannerStatsModel($getAffectedBanners['id']);
             $bannerStatistics->increaseViews();
-            Shopware()->Models()->persist($bannerStatistics);
-            Shopware()->Models()->flush($bannerStatistics);
+            $this->modelManager->persist($bannerStatistics);
+            $this->modelManager->flush($bannerStatistics);
 
             if (!empty($getAffectedBanners['link'])) {
                 $query = [
@@ -282,30 +318,31 @@ public function sBanner($sCategory, $limit = 1)
                     'action' => 'countBannerClick',
                     'bannerId' => $getAffectedBanners['id'],
                 ];
-                $getAffectedBanners['link'] = Shopware()->Front()->Router()->assemble($query);
+                $getAffectedBanners['link'] = $this->front->ensureRouter()->assemble($query);
             }
         }
-        if ($limit == 1) {
+        if ($limit === 1) {
             $getBanners = $getBanners[0];
         }
 
         return $getBanners;
     }
 
+    /**
+     * @return array<array<string, mixed>>
+     */
     public function sGetPremiums()
     {
         $context = $this->contextService->getContext();
 
-        $sql = '
-            SELECT id, esdarticle FROM s_order_basket
-            WHERE sessionID=?
-            AND modus=0
-            ORDER BY esdarticle DESC
-        ';
+        $sql = 'SELECT id, esdarticle FROM s_order_basket
+                WHERE sessionID=?
+                    AND modus=0
+                ORDER BY esdarticle DESC';
 
-        $checkForEsdOnly = $this->db->fetchAll(
+        $checkForEsdOnly = $this->connection->fetchAllAssociative(
             $sql,
-            [$this->sSYSTEM->sSESSION_ID]
+            [Shopware()->Session()->get('sessionId')]
         );
 
         foreach ($checkForEsdOnly as $esdCheck) {
@@ -319,7 +356,7 @@ public function sGetPremiums()
             return [];
         }
 
-        $sBasketAmount = $this->sSYSTEM->sMODULES['sBasket']->sGetAmount();
+        $sBasketAmount = $this->basketModule->sGetAmount();
         if (empty($sBasketAmount['totalAmount'])) {
             $sBasketAmount = 0;
         } else {
@@ -328,7 +365,9 @@ public function sGetPremiums()
         $sql = '
             SELECT
                 p.ordernumber AS premium_ordernumber,
-                startprice, subshopID, a.id AS articleID,
+                startprice,
+                subshopID,
+                a.id AS articleID,
                 a.main_detail_id
             FROM
                 s_addon_premiums p,
@@ -340,11 +379,10 @@ public function sGetPremiums()
             ORDER BY p.startprice ASC
         ';
         $activeShopId = $context->getShop()->getId();
-        $premiums = $this->db->fetchAll($sql, [$activeShopId]);
+        $premiums = $this->connection->fetchAllAssociative($sql, [$activeShopId]);
 
+        $activeFactor = $context->getCurrency()->getFactor();
         foreach ($premiums as &$premium) {
-            $activeFactor = $this->sSYSTEM->sCurrency['factor'];
-
             if ($premium['subshopID'] === '0') {
                 $sql = '
                 SELECT factor FROM s_core_currencies
@@ -352,7 +390,7 @@ public function sGetPremiums()
                   ON s_core_shops.currency_id = s_core_currencies.id
                 WHERE s_core_shops.`default` = 1 LIMIT 1
                 ';
-                $premiumFactor = Shopware()->Db()->fetchOne($sql, []);
+                $premiumFactor = $this->connection->fetchOne($sql, []);
             } else {
                 $sql = '
                 SELECT factor FROM s_core_currencies
@@ -360,11 +398,11 @@ public function sGetPremiums()
                   ON s_core_shops.currency_id = s_core_currencies.id
                 WHERE s_core_shops.id = ? LIMIT 1
                 ';
-                $premiumFactor = Shopware()->Db()->fetchOne($sql, [$activeShopId]);
+                $premiumFactor = $this->connection->fetchOne($sql, [$activeShopId]);
             }
 
             if ($premiumFactor != 0) {
-                $activeFactor = $activeFactor / $premiumFactor;
+                $activeFactor /= $premiumFactor;
             } else {
                 $activeFactor = 0;
             }
@@ -389,14 +427,19 @@ public function sGetPremiums()
             );
             $premium['startprice'] = $this->productModule->sFormatPrice($premium['startprice']);
             $premium['sVariants'] = $this->getVariantDetailsForPremiumProducts(
-                $premium['articleID'],
-                $premium['main_detail_id']
+                (int) $premium['articleID'],
+                (int) $premium['main_detail_id']
             );
         }
 
         return $premiums;
     }
 
+    /**
+     * @param int|null $categoryId
+     *
+     * @return array<array<string, mixed>>
+     */
     public function sBuildTagCloud($categoryId = null)
     {
         $categoryId = (int) $categoryId;
@@ -424,18 +467,18 @@ public function sBuildTagCloud($categoryId = null)
             FROM s_articles a
             INNER JOIN s_articles_categories_ro ac
                 ON  ac.articleID = a.id
-                AND ac.categoryID = $categoryId
+                AND ac.categoryID = :categoryId
             INNER JOIN s_categories c
                 ON  c.id = ac.categoryID
                 AND c.active = 1
 
             LEFT JOIN s_emarketing_lastarticles r
             ON a.id = r.articleID
-            AND r.time >= DATE_SUB(NOW(),INTERVAL $tagTime DAY)
+            AND r.time >= DATE_SUB(NOW(),INTERVAL :tagTime DAY)
 
             LEFT JOIN s_articles_avoid_customergroups ag
             ON ag.articleID=a.id
-            AND ag.customergroupID={$this->customerGroupId}
+            AND ag.customergroupID=:customerGroupId
 
             WHERE a.active = 1
             AND ag.articleID IS NULL
@@ -445,18 +488,21 @@ public function sBuildTagCloud($categoryId = null)
             LIMIT $tagSize
         ";
 
-        $products = $this->db->fetchAssoc($sql);
-        array_walk($products, function (&$product) {
-            unset($product['articleID']);
-        });
+        $products = $this->connection->executeQuery($sql, [
+            'categoryId' => $categoryId,
+            'tagTime' => $tagTime,
+            'customerGroupId' => $this->customerGroupId,
+        ])->fetchAllAssociativeIndexed();
 
         if (empty($products)) {
             return [];
         }
-        $products = $this->productModule->sGetTranslations($products, 'article');
+        foreach ($products as $id => &$product) {
+            $product = $this->productModule->sGetTranslation($product, $id, 'article');
+        }
 
         $pos = 1;
-        $anz = \count($products);
+        $productCount = \count($products);
         if (!empty($this->config->get('sTAGCLOUDSPLIT'))) {
             $steps = (int) $this->config->get('sTAGCLOUDSPLIT');
         } else {
@@ -471,15 +517,15 @@ public function sBuildTagCloud($categoryId = null)
 
         foreach ($products as $productId => $product) {
             $name = strip_tags(html_entity_decode($product['articleName'], ENT_QUOTES, 'UTF-8'));
-            $name = preg_replace('/[^\\w0-9äöüßÄÖÜ´`.-]/u', ' ', $name);
-            $name = preg_replace('/\s\s+/', ' ', $name);
+            $name = (string) preg_replace('/[^\\w0-9äöüßÄÖÜ´`.-]/u', ' ', $name);
+            $name = (string) preg_replace('/\s\s+/', ' ', $name);
             $name = (string) preg_replace('/\(.*\)/', '', $name);
             $name = trim($name, ' -');
             $products[$productId]['articleID'] = $productId;
             $products[$productId]['name'] = $name;
 
-            if ($anz != 0) {
-                $products[$productId]['class'] = $class . round($pos / $anz * $steps);
+            if ($productCount !== 0) {
+                $products[$productId]['class'] = $class . round($pos / $productCount * $steps);
             } else {
                 $products[$productId]['class'] = $class . 0;
             }
@@ -497,7 +543,7 @@ public function sBuildTagCloud($categoryId = null)
      * @param int|null $articleId
      * @param int|null $limit
      *
-     * @return array
+     * @return list<array<string, mixed>>
      */
     public function sGetSimilarArticles($articleId = null, $limit = null)
     {
@@ -529,8 +575,7 @@ public function sGetSimilarArticles($articleId = null, $limit = null)
         AND ag.customergroupID = {$this->customerGroupId}
 
       INNER JOIN s_articles_similar s
-        ON s.articleID = a.id
-        AND s.relatedarticle = a.id
+        ON s.relatedarticle = a.id
 
       INNER JOIN s_articles_categories_ro s1
         ON s1.articleID = a.id
@@ -542,6 +587,7 @@ public function sGetSimilarArticles($articleId = null, $limit = null)
       WHERE a.active = 1
         AND ag.articleID IS NULL
         AND a.id != {$productId}
+        AND s.articleID = {$productId}
 
     LIMIT {$limit}
   )
@@ -616,7 +662,7 @@ public function sGetSimilarArticles($articleId = null, $limit = null)
 
 SQL;
 
-        $similarProductIds = $this->db->fetchCol($sql);
+        $similarProductIds = $this->connection->fetchFirstColumn($sql);
 
         $similarProducts = [];
         if (!empty($similarProductIds)) {
@@ -631,24 +677,25 @@ public function sGetSimilarArticles($articleId = null, $limit = null)
         return $similarProducts;
     }
 
+    /**
+     * @param int $id
+     *
+     * @return array<string, mixed>|false
+     */
     public function sMailCampaignsGetDetail($id)
     {
-        $sql = "
-        SELECT * FROM s_campaigns_mailings
-        WHERE id=$id
-        ";
-        $getCampaigns = $this->db->fetchRow($sql);
+        $sql = "SELECT * FROM s_campaigns_mailings
+                WHERE id=$id";
+        $getCampaigns = $this->connection->fetchAssociative($sql);
 
         if (!$getCampaigns) {
             return false;
         }
         // Fetch all positions
-        $sql = "
-            SELECT id, type, description, value FROM s_campaigns_containers
-            WHERE promotionID=$id
-            ORDER BY position
-            ";
-        $sql = Shopware()->Events()->filter(
+        $sql = "SELECT id, type, description, value FROM s_campaigns_containers
+                WHERE promotionID=$id
+                ORDER BY position";
+        $sql = $this->eventManager->filter(
             'Shopware_Modules_Marketing_MailCampaignsGetDetail_FilterSQL',
             $sql,
             [
@@ -657,61 +704,72 @@ public function sMailCampaignsGetDetail($id)
             ]
         );
 
-        $getCampaignContainers = $this->db->fetchAll($sql);
-        $mediaService = Shopware()->Container()->get(MediaServiceInterface::class);
+        $getCampaignContainers = $this->connection->fetchAllAssociative($sql);
 
         foreach ($getCampaignContainers as $campaignKey => $campaignValue) {
+            $parentId = $campaignValue['id'];
             switch ($campaignValue['type']) {
-                case 'ctBanner':
+                case Container::TYPE_BANNER:
                     // Query Banner
-                    $getBanner = $this->db->fetchRow("
-                        SELECT image, link, linkTarget, description FROM s_campaigns_banner
-                        WHERE parentID={$campaignValue['id']}
-                        ");
+                    $getBanner = $this->connection->fetchAssociative(
+                        'SELECT image, link, linkTarget, description
+                         FROM s_campaigns_banner
+                         WHERE parentID=:parentId',
+                        ['parentId' => $parentId]
+                    );
+                    if (!\is_array($getBanner)) {
+                        break;
+                    }
                     // Rewrite banner
                     if ($getBanner['image']) {
-                        $getBanner['image'] = $mediaService->getUrl($getBanner['image']);
+                        $getBanner['image'] = $this->mediaService->getUrl($getBanner['image']);
                     }
 
-                    if (strpos($getBanner['link'], 'http') === false && $getBanner['link']) {
+                    if (!str_contains($getBanner['link'], 'http') && $getBanner['link']) {
                         $getBanner['link'] = 'http://' . $getBanner['link'];
                     }
 
                     $getCampaignContainers[$campaignKey]['description'] = $getBanner['description'];
                     $getCampaignContainers[$campaignKey]['data'] = $getBanner;
                     break;
-                case 'ctLinks':
+                case Container::TYPE_LINKS:
                     // Query links
-                    $getLinks = $this->db->fetchAll("
-                        SELECT description, link, target FROM s_campaigns_links
-                        WHERE parentID={$campaignValue['id']}
-                        ORDER BY position
-                        ");
+                    $getLinks = $this->connection->fetchAllAssociative(
+                        'SELECT description, link, target
+                         FROM s_campaigns_links
+                         WHERE parentID=:parentId
+                         ORDER BY position',
+                        ['parentId' => $parentId]
+                    );
                     $getCampaignContainers[$campaignKey]['data'] = $getLinks;
                     break;
-                case 'ctArticles':
-                    $sql = "
-                        SELECT articleordernumber, type FROM s_campaigns_articles
-                        WHERE parentID={$campaignValue['id']}
-                        ORDER BY position
-                        ";
-
-                    $getProducts = $this->db->fetchAll($sql);
+                case Container::TYPE_PRODUCTS:
+                    $sql = 'SELECT articleordernumber, type
+                            FROM s_campaigns_articles
+                            WHERE parentID=:parentId
+                            ORDER BY position';
+
+                    $getProducts = $this->connection->fetchAllAssociative($sql, ['parentId' => $parentId]);
                     $getCampaignContainers[$campaignKey]['data'] = $this->sGetMailCampaignsProducts($getProducts);
                     break;
-                case 'ctText':
-                case 'ctVoucher':
-                    $getText = $this->db->fetchRow("
-                            SELECT headline, html,image,alignment,link FROM s_campaigns_html
-                            WHERE parentID={$campaignValue['id']}
-                        ");
+                case Container::TYPE_TEXT:
+                case Container::TYPE_VOUCHER:
+                    $getText = $this->connection->fetchAssociative(
+                        'SELECT headline, html, image, alignment, link
+                         FROM s_campaigns_html
+                         WHERE parentID=:parentId',
+                        ['parentId' => $parentId]
+                    );
+                    if (!\is_array($getText)) {
+                        break;
+                    }
                     if ($getText['image']) {
-                        $getText['image'] = $mediaService->getUrl($getText['image']);
+                        $getText['image'] = $this->mediaService->getUrl($getText['image']);
                     }
-                    if (strpos($getText['link'], 'http') === false && $getText['link']) {
+                    if (!str_contains($getText['link'], 'http') && $getText['link']) {
                         $getText['link'] = 'http://' . $getText['link'];
                     }
-                    $getCampaignContainers[$campaignKey]['description'] = $getText['headline'];
+                    $getCampaignContainers[$campaignKey]['description'] = htmlspecialchars($getText['headline'], ENT_COMPAT);
                     $getCampaignContainers[$campaignKey]['data'] = $getText;
                     break;
             }
@@ -723,15 +781,11 @@ public function sMailCampaignsGetDetail($id)
 
     /**
      * @param Media[] $media
-     * @param string  $path
-     *
-     * @return Media|null
      */
-    private function getMediaByPath($media, $path)
+    private function getMediaByPath(array $media, string $path): ?Media
     {
-        $mediaService = Shopware()->Container()->get(MediaServiceInterface::class);
         foreach ($media as $single) {
-            if ($mediaService->normalize($single->getFile()) == $path) {
+            if ($this->mediaService->normalize($single->getFile()) === $path) {
                 return $single;
             }
         }
@@ -742,12 +796,9 @@ private function getMediaByPath($media, $path)
     /**
      * For the provided product id, returns the associated variant numbers and additional texts
      *
-     * @param int $productId
-     * @param int $mainDetailId
-     *
-     * @return array
+     * @return array<string, array{ordernumber: string, additionaltext: string}>
      */
-    private function getVariantDetailsForPremiumProducts($productId, $mainDetailId)
+    private function getVariantDetailsForPremiumProducts(int $productId, int $mainVariantId): array
     {
         $context = $this->contextService->getShopContext();
 
@@ -756,7 +807,7 @@ private function getVariantDetailsForPremiumProducts($productId, $mainDetailId)
             WHERE articleID = :articleId AND kind != 3';
 
         $products = [];
-        $variantsData = Shopware()->Db()->fetchAll(
+        $variantsData = $this->connection->fetchAllAssociative(
             $sql,
             ['articleId' => $productId]
         );
@@ -768,14 +819,14 @@ private function getVariantDetailsForPremiumProducts($productId, $mainDetailId)
                 $variantData['ordernumber']
             );
 
-            if ($variantData['id'] == $mainDetailId) {
-                $variantData = Shopware()->Modules()->Articles()->sGetTranslation(
+            if ($variantData['id'] == $mainVariantId) {
+                $variantData = $this->productModule->sGetTranslation(
                     $variantData,
                     $productId,
                     'article'
                 );
             } else {
-                $variantData = Shopware()->Modules()->Articles()->sGetTranslation(
+                $variantData = $this->productModule->sGetTranslation(
                     $variantData,
                     $variantData['id'],
                     'variant'
@@ -802,43 +853,40 @@ function (ListProduct $elem) {
     /**
      * Processes the newsletter articles and returns the corresponding data.
      *
-     * @param array $products
+     * @param array<array<string, mixed>> $products
      *
-     * @return array
+     * @return list<array<string, mixed>|false>
      */
-    private function sGetMailCampaignsProducts($products)
+    private function sGetMailCampaignsProducts(array $products): array
     {
-        /** @var ContextServiceInterface $contextService */
-        $contextService = Shopware()->Container()->get(ContextServiceInterface::class);
-        $categoryId = $contextService->getShopContext()->getShop()->getCategory()->getId();
+        $categoryId = $this->contextService->getShopContext()->getShop()->getCategory()->getId();
 
         $productData = [];
-        foreach ($products as $article) {
-            $productData[] = Shopware()->Modules()->Articles()
-                ->sGetPromotionById($article['type'], $categoryId, $article['articleordernumber']);
+        foreach ($products as $product) {
+            $productData[] = $this->productModule->sGetPromotionById($product['type'], $categoryId, $product['articleordernumber']);
         }
 
         return $productData;
     }
 
     /**
-     * @param string[] $images
+     * @param array<string> $images
      *
      * @throws Exception
      *
-     * @return int[]
+     * @return array<int>
      */
-    private function getMediaIdsOfPath($images)
+    private function getMediaIdsOfPath(array $images): array
     {
-        /** @var QueryBuilder $query */
-        $query = Shopware()->Container()->get(Connection::class)->createQueryBuilder();
-        $query->select(['media.id'])
+        $ids = $this->connection
+            ->createQueryBuilder()
+            ->select(['media.id'])
             ->from('s_media', 'media')
             ->where('media.path IN (:path)')
-            ->setParameter(':path', $images, Connection::PARAM_STR_ARRAY);
-
-        $statement = $query->execute();
+            ->setParameter(':path', $images, Connection::PARAM_STR_ARRAY)
+            ->execute()
+            ->fetchFirstColumn();
 
-        return $statement->fetchAll(PDO::FETCH_COLUMN);
+        return array_map('intval', $ids);
     }
 }
diff --git a/engine/Shopware/Core/sOrder.php b/engine/Shopware/Core/sOrder.php
index 9ffc1aa3189..00957c25363 100644
--- a/engine/Shopware/Core/sOrder.php
+++ b/engine/Shopware/Core/sOrder.php
@@ -1,29 +1,31 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Bundle\AttributeBundle\Service\DataLoader;
+use Shopware\Bundle\AttributeBundle\Service\DataLoaderInterface;
 use Shopware\Bundle\AttributeBundle\Service\DataPersister;
+use Shopware\Bundle\AttributeBundle\Service\DataPersisterInterface;
 use Shopware\Bundle\CartBundle\CartKey;
 use Shopware\Bundle\CartBundle\CartPositionsMode;
 use Shopware\Bundle\CartBundle\CheckoutKey;
@@ -63,12 +65,12 @@ class sOrder implements Enlight_Hook
      *
      * @var array
      */
-    public $sShippingData;
+    public $sShippingData = [];
 
     /**
      * User comment to save within this order
      *
-     * @var string
+     * @var string|null
      */
     public $sComment;
 
@@ -132,7 +134,7 @@ class sOrder implements Enlight_Hook
     /**
      * TransactionID (epayment)
      *
-     * @var string
+     * @var string|null
      */
     public $bookingId;
 
@@ -223,29 +225,27 @@ class sOrder implements Enlight_Hook
     private $numberRangeIncrementer;
 
     /**
-     * @var Shopware\Bundle\AttributeBundle\Service\DataLoaderInterface
+     * @var DataLoaderInterface
      */
     private $attributeLoader;
 
     /**
-     * @var Shopware\Bundle\AttributeBundle\Service\DataPersisterInterface
+     * @var DataPersisterInterface
      */
     private $attributePersister;
 
     /**
-     * @var Shopware\Components\Model\ModelManager
+     * @var ModelManager
      */
     private $modelManager;
 
     /**
      * Injects all dependencies which are required for this class.
      *
-     * @param ContextServiceInterface $contextService
-     *
      * @throws Exception
      */
     public function __construct(
-        ContextServiceInterface $contextService = null
+        ?ContextServiceInterface $contextService = null
     ) {
         $container = Shopware()->Container();
 
@@ -294,7 +294,7 @@ public function handleESDOrder($basketRow, $orderID, $orderDetailsID)
         // Check if current order number is an esd variant.
         $esdProduct = $this->getVariantEsd($basketRow['ordernumber']);
 
-        if (!$esdProduct['id']) {
+        if (!$esdProduct || !$esdProduct['id']) {
             return $basketRow;
         }
 
@@ -318,7 +318,7 @@ public function handleESDOrder($basketRow, $orderID, $orderDetailsID)
             // Not enough serial numbers anymore, inform merchant
             $context = [
                 'sArticleName' => $basketRow['articlename'],
-                'sMail' => $this->sUserData['additional']['user']['email'],
+                'sMail' => $this->sUserData['additional']['user']['email'] ?? null,
             ];
 
             $mail = Shopware()->TemplateMail()->createMail('sNOSERIALS', $context);
@@ -359,6 +359,8 @@ public function handleESDOrder($basketRow, $orderID, $orderDetailsID)
 
     /**
      * Delete temporary created order
+     *
+     * @return void
      */
     public function sDeleteTemporaryOrder()
     {
@@ -388,10 +390,12 @@ public function sDeleteTemporaryOrder()
      * Create temporary order (for order cancellation reports)
      *
      * @throws Enlight_Exception
+     *
+     * @return void
      */
     public function sCreateTemporaryOrder()
     {
-        $this->sShippingData[CartKey::AMOUNT_NUMERIC] = $this->sShippingData[CartKey::AMOUNT_NUMERIC] ? $this->sShippingData[CartKey::AMOUNT_NUMERIC] : '0';
+        $this->sShippingData[CartKey::AMOUNT_NUMERIC] = $this->sShippingData[CartKey::AMOUNT_NUMERIC] ?? '0';
         if (!$this->sShippingcostsNumeric) {
             $this->sShippingcostsNumeric = 0.;
         }
@@ -468,7 +472,7 @@ public function sCreateTemporaryOrder()
             $affectedRows = $this->db->insert('s_order', $data);
             $orderID = $this->db->lastInsertId();
         } catch (Exception $e) {
-            throw new Enlight_Exception(sprintf('##sOrder-sTemporaryOrder-#01:%s', $e->getMessage()), 0, $e);
+            throw new Enlight_Exception(\sprintf('##sOrder-sTemporaryOrder-#01:%s', $e->getMessage()), 0, $e);
         }
         if (!$affectedRows || !$orderID) {
             throw new Enlight_Exception('##sOrder-sTemporaryOrder-#01: No rows affected or no order id saved', 0);
@@ -496,7 +500,7 @@ public function sCreateTemporaryOrder()
             if (!$basketRow['taxID']) {
                 $basketRow['taxID'] = '0';
             }
-            if (!$basketRow['releasedate']) {
+            if (empty($basketRow['releasedate'])) {
                 $basketRow['releasedate'] = null;
             }
 
@@ -504,7 +508,7 @@ public function sCreateTemporaryOrder()
                 'orderID' => $orderID,
                 'ordernumber' => 0,
                 'articleID' => $basketRow['articleID'],
-                'articleDetailID' => $basketRow['additional_details']['articleDetailsID'],
+                'articleDetailID' => $basketRow['additional_details']['articleDetailsID'] ?? null,
                 'articleordernumber' => $basketRow['ordernumber'],
                 'price' => $basketRow['priceNumeric'],
                 'quantity' => $basketRow['quantity'],
@@ -521,7 +525,7 @@ public function sCreateTemporaryOrder()
                 $this->db->insert('s_order_details', $data);
                 $orderDetailId = $this->db->lastInsertId();
             } catch (Exception $e) {
-                throw new Enlight_Exception(sprintf('##sOrder-sTemporaryOrder-Position-#02:%s', $e->getMessage()), 0, $e);
+                throw new Enlight_Exception(\sprintf('##sOrder-sTemporaryOrder-Position-#02:%s', $e->getMessage()), 0, $e);
             }
 
             // Create order detail attributes
@@ -532,13 +536,15 @@ public function sCreateTemporaryOrder()
 
     /**
      * Finally save order and send order confirmation to customer
+     *
+     * @return string|false
      */
     public function sSaveOrder()
     {
-        $this->sComment = stripslashes($this->sComment);
+        $this->sComment = stripslashes($this->sComment ?? '');
         $this->sComment = stripcslashes($this->sComment);
 
-        $this->sShippingData[CartKey::AMOUNT_NUMERIC] = $this->sShippingData[CartKey::AMOUNT_NUMERIC] ?: '0';
+        $this->sShippingData[CartKey::AMOUNT_NUMERIC] = $this->sShippingData[CartKey::AMOUNT_NUMERIC] ?? '0';
 
         if ($this->isTransactionExist($this->bookingId)) {
             return false;
@@ -604,7 +610,7 @@ public function sSaveOrder()
             'invoice_amount_net' => $this->sBasketData[CartKey::AMOUNT_NET_NUMERIC],
             'invoice_shipping' => (float) $this->sShippingcostsNumeric,
             'invoice_shipping_net' => (float) $this->sShippingcostsNumericNet,
-            'invoice_shipping_tax_rate' => isset($this->sBasketData[CheckoutKey::SHIPPING_COSTS_TAX_PROPORTIONAL]) ? 0 : $this->sBasketData[CheckoutKey::SHIPPING_COSTS_TAX],
+            'invoice_shipping_tax_rate' => isset($this->sBasketData[CheckoutKey::SHIPPING_COSTS_TAX_PROPORTIONAL]) ? 0 : ($this->sBasketData[CheckoutKey::SHIPPING_COSTS_TAX] ?? 0),
             'ordertime' => new Zend_Db_Expr('NOW()'),
             'changed' => new Zend_Db_Expr('NOW()'),
             'status' => 0,
@@ -640,11 +646,11 @@ public function sSaveOrder()
             $this->db->commit();
         } catch (Exception $e) {
             $this->db->rollBack();
-            throw new Enlight_Exception(sprintf('Shopware Order Fatal-Error %s :%s', $_SERVER['HTTP_HOST'], $e->getMessage()), 0, $e);
+            throw new Enlight_Exception(\sprintf('Shopware Order Fatal-Error %s :%s', $_SERVER['HTTP_HOST'], $e->getMessage()), 0, $e);
         }
 
         if (!$affectedRows || !$orderID) {
-            throw new Enlight_Exception(sprintf('Shopware Order Fatal-Error %s : No rows affected or no order id created.', $_SERVER['HTTP_HOST']), 0);
+            throw new Enlight_Exception(\sprintf('Shopware Order Fatal-Error %s : No rows affected or no order id created.', $_SERVER['HTTP_HOST']), 0);
         }
 
         try {
@@ -659,7 +665,7 @@ public function sSaveOrder()
                 );
             }
         } catch (Exception $e) {
-            //Payment method code failure
+            // Payment method code failure
         }
 
         $attributeData = $this->eventManager->filter(
@@ -703,7 +709,7 @@ public function sSaveOrder()
                 VALUES (%d, %s, %d, %s, %f, %d, %s, %d, %s, %d, %d, %d, %f, %s, %s, %s, %s)
             ';
 
-            $sql = sprintf(
+            $sql = \sprintf(
                 $preparedQuery,
                 $orderID,
                 $this->db->quote((string) $orderNumber),
@@ -719,8 +725,8 @@ public function sSaveOrder()
                 $basketRow['taxID'],
                 $basketRow['tax_rate'],
                 $this->db->quote((string) $basketRow['ean']),
-                $this->db->quote((string) $basketRow['itemUnit']),
-                $this->db->quote((string) $basketRow['packunit']),
+                $this->db->quote((string) ($basketRow['itemUnit'] ?? '')),
+                $this->db->quote((string) ($basketRow['packunit'] ?? '')),
                 $basketRow['additional_details']['articleDetailsID'] ?? 'null'
             );
 
@@ -733,7 +739,7 @@ public function sSaveOrder()
 
             // Check for individual voucher - code
             if ($basketRow['modus'] == CartPositionsMode::VOUCHER) {
-                //reserve the basket voucher for the current user.
+                // reserve the basket voucher for the current user.
                 $this->reserveVoucher(
                     $basketRow['ordernumber'],
                     $this->sUserData['additional']['user']['id'],
@@ -749,7 +755,7 @@ public function sSaveOrder()
                 $this->db->executeUpdate($sql);
                 $orderdetailsID = (int) $this->db->lastInsertId();
             } catch (Exception $e) {
-                throw new Enlight_Exception(sprintf('Shopware Order Fatal-Error %s :%s', $_SERVER['HTTP_HOST'], $e->getMessage()), 0, $e);
+                throw new Enlight_Exception(\sprintf('Shopware Order Fatal-Error %s :%s', $_SERVER['HTTP_HOST'], $e->getMessage()), 0, $e);
             }
 
             $this->sBasketData[CartKey::POSITIONS][$key]['orderDetailId'] = $orderdetailsID;
@@ -818,7 +824,7 @@ public function sSaveOrder()
             'sAmountNumeric' => $this->sAmountWithTax ? $this->sAmountWithTax : $this->sAmount,
             'sAmountNet' => $this->sSYSTEM->sMODULES['sArticles']->sFormatPrice($this->sBasketData[CartKey::AMOUNT_NET_NUMERIC]) . ' ' . $this->sBasketData[CheckoutKey::CURRENCY_NAME],
             'sAmountNetNumeric' => $this->sBasketData[CartKey::AMOUNT_NET_NUMERIC],
-            'sTaxRates' => $this->sBasketData[CheckoutKey::TAX_RATES],
+            'sTaxRates' => $this->sBasketData[CheckoutKey::TAX_RATES] ?? null,
             'ordernumber' => $orderNumber,
             'sOrderDay' => date('d.m.Y'),
             'sOrderTime' => date('H:i'),
@@ -887,37 +893,37 @@ public function sendMail($variables)
         $shopContext = $this->contextService->getShopContext();
 
         $context = [
-            'sOrderDetails' => $variables['sOrderDetails'],
+            'sOrderDetails' => $variables['sOrderDetails'] ?? null,
 
-            'billingaddress' => $variables['billingaddress'],
-            'shippingaddress' => $variables['shippingaddress'],
+            'billingaddress' => $variables['billingaddress'] ?? null,
+            'shippingaddress' => $variables['shippingaddress'] ?? null,
             'additional' => $variables['additional'],
 
-            'sTaxRates' => $variables[CheckoutKey::TAX_RATES],
-            'sShippingCosts' => $variables['sShippingCosts'],
-            'sAmount' => $variables[CheckoutKey::AMOUNT],
-            'sAmountNumeric' => $variables['sAmountNumeric'],
-            'sAmountNet' => $variables['sAmountNet'],
-            'sAmountNetNumeric' => $variables['sAmountNetNumeric'],
+            'sTaxRates' => $variables[CheckoutKey::TAX_RATES] ?? null,
+            'sShippingCosts' => $variables['sShippingCosts'] ?? null,
+            'sAmount' => $variables[CheckoutKey::AMOUNT] ?? null,
+            'sAmountNumeric' => $variables['sAmountNumeric'] ?? null,
+            'sAmountNet' => $variables['sAmountNet'] ?? null,
+            'sAmountNetNumeric' => $variables['sAmountNetNumeric'] ?? null,
 
-            'sOrderNumber' => $variables['ordernumber'],
-            'sOrderDay' => $variables['sOrderDay'],
-            'sOrderTime' => $variables['sOrderTime'],
-            'sComment' => $variables['sComment'],
+            'sOrderNumber' => $variables['ordernumber'] ?? null,
+            'sOrderDay' => $variables['sOrderDay'] ?? null,
+            'sOrderTime' => $variables['sOrderTime'] ?? null,
+            'sComment' => $variables['sComment'] ?? null,
 
-            'attributes' => $variables['attributes'],
-            'sCurrency' => $this->sBasketData[CheckoutKey::CURRENCY_NAME],
+            'attributes' => $variables['attributes'] ?? null,
+            'sCurrency' => $this->sBasketData[CheckoutKey::CURRENCY_NAME] ?? null,
 
             'sLanguage' => $shopContext->getShop()->getId(),
 
             'sSubShop' => $shopContext->getShop()->getId(),
 
-            'sEsd' => $variables['sEsd'],
+            'sEsd' => $variables['sEsd'] ?? null,
             'sNet' => $this->sNet,
         ];
 
         // Support for individual payment means with custom-tables
-        if ($variables['additional']['payment']['table']) {
+        if (!empty($variables['additional']['payment']['table'])) {
             $paymentTable = $this->db->fetchRow(
                 "SELECT * FROM {$variables['additional']['payment']['table']}
                  WHERE userID=?",
@@ -928,11 +934,11 @@ public function sendMail($variables)
             $context['sPaymentTable'] = [];
         }
 
-        if ($variables['sDispatch']) {
+        if (isset($variables['sDispatch'])) {
             $context['sDispatch'] = $variables['sDispatch'];
         }
 
-        if ($variables['sBookingID']) {
+        if (isset($variables['sBookingID'])) {
             $context['sBookingID'] = $variables['sBookingID'];
         }
 
@@ -955,10 +961,19 @@ public function sendMail($variables)
         }
 
         if (!($mail instanceof Zend_Mail)) {
-            $mail = Shopware()->TemplateMail()->createMail('sORDER', $context);
+            $overrideConfig = $this->eventManager->filter(
+                'Shopware_Modules_Order_SendMail_CreateMail_FilterOverrideConfig',
+                [],
+                [
+                    'subject' => $this,
+                    'context' => $context,
+                    'variables' => $variables,
+                ]
+            );
+            $mail = Shopware()->TemplateMail()->createMail('sORDER', $context, null, $overrideConfig);
         }
 
-        $mail->addTo($this->sUserData['additional']['user']['email']);
+        $mail->addTo($this->sUserData['additional']['user']['email'] ?? '');
 
         if (!$this->config->get('sNO_ORDER_MAIL')) {
             $mail->addBcc($this->config->get('sMAIL'));
@@ -1078,9 +1093,9 @@ public function sSaveBillingAddress($address, $id)
             ':countryID' => $address['countryID'],
             ':stateID' => $address['stateID'],
             ':ustid' => $address['ustid'],
-            ':additional_address_line1' => $address['additional_address_line1'],
-            ':additional_address_line2' => $address['additional_address_line2'],
-            ':title' => $address['title'],
+            ':additional_address_line1' => $address['additional_address_line1'] ?? null,
+            ':additional_address_line2' => $address['additional_address_line2'] ?? null,
+            ':title' => $address['title'] ?? null,
         ];
         $array = $this->eventManager->filter(
             'Shopware_Modules_Order_SaveBilling_FilterArray',
@@ -1183,12 +1198,12 @@ public function sSaveShippingAddress($address, $id)
             ':street' => (string) $address['street'],
             ':zipcode' => (string) $address['zipcode'],
             ':city' => (string) $address['city'],
-            ':phone' => (string) $address['phone'],
+            ':phone' => (string) ($address['phone'] ?? ''),
             ':countryID' => $address['countryID'],
             ':stateID' => $address['stateID'],
-            ':additional_address_line1' => (string) $address['additional_address_line1'],
-            ':additional_address_line2' => (string) $address['additional_address_line2'],
-            ':title' => (string) $address['title'],
+            ':additional_address_line1' => (string) ($address['additional_address_line1'] ?? ''),
+            ':additional_address_line2' => (string) ($address['additional_address_line2'] ?? ''),
+            ':title' => (string) ($address['title'] ?? ''),
         ];
         $array = $this->eventManager->filter(
             'Shopware_Modules_Order_SaveShipping_FilterArray',
@@ -1297,19 +1312,27 @@ public function createStatusMail($orderId, $statusId, $templateName = null)
     {
         $statusId = (int) $statusId;
         $orderId = (int) $orderId;
-        $dispatch = null;
 
         if (empty($templateName)) {
             $templateName = 'sORDERSTATEMAIL' . $statusId;
         }
 
-        if (empty($orderId) || !is_numeric($statusId)) {
+        if ($orderId === 0) {
+            return null;
+        }
+
+        $mailModel = $this->modelManager->getRepository(Mail::class)->findOneBy(
+            ['name' => $templateName]
+        );
+
+        if (!$mailModel instanceof Mail) {
             return null;
         }
 
         $order = $this->getOrderForStatusMail($orderId);
         $orderDetails = $this->getOrderDetailsForStatusMail($orderId);
 
+        $dispatch = null;
         if (!empty($order['dispatchID'])) {
             $dispatch = $this->db->fetchRow('
                 SELECT id, name, description FROM s_premium_dispatch
@@ -1348,14 +1371,6 @@ public function createStatusMail($orderId, $statusId, $templateName = null)
             $order['payment_description'] = $payment['description'];
         }
 
-        $mailModel = $this->modelManager->getRepository(Mail::class)->findOneBy(
-            ['name' => $templateName]
-        );
-
-        if (!$mailModel) {
-            return null;
-        }
-
         $context = [
             'sOrder' => $order,
             'sOrderDetails' => $orderDetails,
@@ -1455,7 +1470,7 @@ public function setPaymentStatus($orderId, $paymentStatusId, $sendStatusMail = f
     }
 
     /**
-     * Set payment status by order id
+     * Set order status by order id
      *
      * @param int         $orderId
      * @param int         $orderStatusId
@@ -1796,13 +1811,13 @@ private function getAvailableSerialsOfEsd($esdId)
      * Checks if the passed transaction id is already set as transaction id of an
      * existing order.
      *
-     * @param string $transactionId
+     * @param string|null $transactionId
      *
      * @return bool
      */
     private function isTransactionExist($transactionId)
     {
-        if (\strlen($transactionId) <= 3) {
+        if (!\is_string($transactionId) || \strlen($transactionId) <= 3) {
             return false;
         }
 
@@ -1921,7 +1936,7 @@ private function getOrderDetailsForMail(array $basketRows)
                 $content['articlename'] = str_replace("\n\n", "\n", $content['articlename']);
             }
 
-            $content['ordernumber'] = trim(html_entity_decode($content['ordernumber']));
+            $content['ordernumber'] = trim(html_entity_decode($content['ordernumber'] ?? ''));
 
             $details[] = $content;
         }
@@ -1982,7 +1997,7 @@ private function getUserDataForMail(array $userData)
     {
         $userData['billingaddress'] = $this->htmlEntityDecodeRecursive($userData['billingaddress']);
         $userData['shippingaddress'] = $this->htmlEntityDecodeRecursive($userData['shippingaddress']);
-        $userData['country'] = $this->htmlEntityDecodeRecursive($userData['country']);
+        $userData['country'] = $this->htmlEntityDecodeRecursive($userData['country'] ?? null);
 
         $userData['additional']['payment']['description'] = html_entity_decode(
             $userData['additional']['payment']['description']
@@ -2001,7 +2016,7 @@ private function htmlEntityDecodeRecursive(?array $data): ?array
         }
 
         $func = static function ($item) use (&$func) {
-            return \is_array($item) ? array_map($func, $item) : html_entity_decode($item);
+            return \is_array($item) ? array_map($func, $item) : html_entity_decode((string) $item);
         };
 
         return array_map($func, $data);
@@ -2026,25 +2041,25 @@ private function formatBasketRow($basketRow)
             $basketRow['articlename']
         );
 
-        if (!$basketRow['price']) {
+        if (empty($basketRow['price'])) {
             $basketRow['price'] = '0,00';
         }
-        if (!$basketRow['esdarticle']) {
+        if (empty($basketRow['esdarticle'])) {
             $basketRow['esdarticle'] = '0';
         }
-        if (!$basketRow['modus']) {
+        if (empty($basketRow['modus'])) {
             $basketRow['modus'] = '0';
         }
-        if (!$basketRow['taxID']) {
+        if (empty($basketRow['taxID'])) {
             $basketRow['taxID'] = '0';
         }
-        if ($this->sNet == true) {
+        if ($this->sNet) {
             $basketRow['taxID'] = '0';
         }
-        if (!$basketRow['ean']) {
+        if (empty($basketRow['ean'])) {
             $basketRow['ean'] = '';
         }
-        if (!$basketRow['releasedate']) {
+        if (empty($basketRow['releasedate'])) {
             $basketRow['releasedate'] = '0000-00-00';
         }
 
@@ -2089,7 +2104,7 @@ private function getOrderStatus($orderId)
      */
     private function logOrderMailException(Exception $e, $orderNumber, $email)
     {
-        $message = sprintf(
+        $message = \sprintf(
             'Could not send order mail for ordernumber %s to address %s',
             $orderNumber,
             $email
diff --git a/engine/Shopware/Core/sRewriteTable.php b/engine/Shopware/Core/sRewriteTable.php
index 823ce9650a6..e1f16d94efb 100644
--- a/engine/Shopware/Core/sRewriteTable.php
+++ b/engine/Shopware/Core/sRewriteTable.php
@@ -1,29 +1,30 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\ORM\AbstractQuery;
 use Shopware\Bundle\AttributeBundle\Repository\SearchCriteria;
+use Shopware\Bundle\AttributeBundle\Service\CrudServiceInterface;
 use Shopware\Bundle\ContentTypeBundle\Services\FrontendTypeTranslatorInterface;
 use Shopware\Bundle\ContentTypeBundle\Services\RepositoryInterface;
 use Shopware\Bundle\ContentTypeBundle\Services\TypeProvider;
@@ -79,14 +80,14 @@ class sRewriteTable implements Enlight_Hook
      *
      * @var PDOStatement
      */
-    protected $preparedUpdate = null;
+    protected $preparedUpdate;
 
     /**
      * Prepared insert PDOStatement for the s_core_rewrite_urls table.
      *
      * @var PDOStatement
      */
-    protected $preparedInsert = null;
+    protected $preparedInsert;
 
     /**
      * Database connection which used for each database operation in this class.
@@ -133,30 +134,19 @@ class sRewriteTable implements Enlight_Hook
     private $translationComponent;
 
     /**
-     * @param Enlight_Components_Db_Adapter_Pdo_Mysql $db
-     * @param Shopware_Components_Config              $config
-     * @param ModelManager                            $modelManager
-     * @param sSystem                                 $systemModule
-     * @param Enlight_Template_Manager                $template
-     * @param Shopware_Components_Modules             $moduleManager
-     * @param SlugInterface                           $slug
-     * @param ContextServiceInterface                 $contextService
-     * @param ShopPageServiceInterface                $shopPageService
-     * @param Shopware_Components_Translation         $translationComponent
-     *
      * @throws Exception
      */
     public function __construct(
-        Enlight_Components_Db_Adapter_Pdo_Mysql $db = null,
-        Shopware_Components_Config $config = null,
-        ModelManager $modelManager = null,
-        sSystem $systemModule = null,
-        Enlight_Template_Manager $template = null,
-        Shopware_Components_Modules $moduleManager = null,
-        SlugInterface $slug = null,
-        ContextServiceInterface $contextService = null,
-        ShopPageServiceInterface $shopPageService = null,
-        Shopware_Components_Translation $translationComponent = null
+        ?Enlight_Components_Db_Adapter_Pdo_Mysql $db = null,
+        ?Shopware_Components_Config $config = null,
+        ?ModelManager $modelManager = null,
+        ?sSystem $systemModule = null,
+        ?Enlight_Template_Manager $template = null,
+        ?Shopware_Components_Modules $moduleManager = null,
+        ?SlugInterface $slug = null,
+        ?ContextServiceInterface $contextService = null,
+        ?ShopPageServiceInterface $shopPageService = null,
+        ?Shopware_Components_Translation $translationComponent = null
     ) {
         $this->db = $db ?: Shopware()->Db();
         $this->config = $config ?: Shopware()->Config();
@@ -241,7 +231,7 @@ public function baseSetup()
      * @param string $lastUpdate
      *
      * @throws SmartyException
-     * @throws \Enlight_Event_Exception
+     * @throws Enlight_Event_Exception
      * @throws Zend_Db_Adapter_Exception
      * @throws Exception
      *
@@ -410,7 +400,7 @@ public function sCreateRewriteTableCategories($offset = null, $limit = null)
      * @param int    $offset
      *
      * @throws Zend_Db_Adapter_Exception
-     * @throws \Enlight_Event_Exception
+     * @throws Enlight_Event_Exception
      *
      * @return string
      */
@@ -488,12 +478,18 @@ public function sCreateRewriteTableArticles($lastUpdate, $limit = 1000, $offset
      */
     public function getSeoArticleQuery()
     {
-        return "
+        $attributesList = Shopware()->Container()->get(CrudServiceInterface::class)->getList('s_articles_attributes');
+        $attributes = [];
+        foreach ($attributesList as $attribute) {
+            if ($attribute->isIdentifier()) {
+                continue;
+            }
+            $attributes[] = 'at.' . $attribute->getColumnName();
+        }
+
+        return '
             SELECT a.*, d.ordernumber, d.suppliernumber, s.name AS supplier, a.datum AS date,
-                d.releasedate, a.changetime AS changed, ct.objectdata, ctf.objectdata AS objectdataFallback, at.attr1, at.attr2,
-                at.attr3, at.attr4, at.attr5, at.attr6, at.attr7, at.attr8, at.attr9,
-                at.attr10,at.attr11, at.attr12, at.attr13, at.attr14, at.attr15, at.attr16,
-                at.attr17, at.attr18, at.attr19, at.attr20
+                d.releasedate, a.changetime AS changed, ct.objectdata, ctf.objectdata AS objectdataFallback, ' . implode(',', $attributes) . "
             FROM s_articles a
 
             INNER JOIN s_articles_categories_ro ac
@@ -536,13 +532,13 @@ public function getSeoArticleQuery()
      * @param int|null $offset
      * @param int|null $limit
      */
-    public function sCreateRewriteTableBlog($offset = null, $limit = null, ShopContextInterface $context = null)
+    public function sCreateRewriteTableBlog($offset = null, $limit = null, ?ShopContextInterface $context = null)
     {
         $query = $this->modelManager->getRepository(Category::class)
             ->getBlogCategoriesByParentQuery(Shopware()->Shop()->get('parentID'));
         $blogCategories = $query->getArrayResult();
 
-        //get all blog category ids
+        // get all blog category ids
         $blogCategoryIds = [];
         foreach ($blogCategories as $blogCategory) {
             $blogCategoryIds[] = $blogCategory['id'];
@@ -694,12 +690,12 @@ public function sCreateRewriteTableForSingleCampaign(
      *
      * @throws Exception
      */
-    public function sCreateRewriteTableContent($offset = null, $limit = null, ShopContextInterface $context = null)
+    public function sCreateRewriteTableContent($offset = null, $limit = null, ?ShopContextInterface $context = null)
     {
-        //form urls
+        // form urls
         $this->insertFormUrls($offset, $limit, $context);
 
-        //static pages urls
+        // static pages urls
         $this->insertStaticPageUrls($offset, $limit, $context);
     }
 
@@ -749,7 +745,7 @@ public function createContentTypeUrls(ShopContextInterface $context): void
                 $path = $this->template->fetch('string:' . $type->getSeoUrlTemplate(), ['type' => $typeArray, 'item' => $item, 'context' => $context]);
                 $path = $this->sCleanupPath($path);
 
-                $org_path = sprintf('sViewport=%s&sAction=detail&id=%d', $type->getControllerName(), $item['id']);
+                $org_path = \sprintf('sViewport=%s&sAction=detail&id=%d', $type->getControllerName(), $item['id']);
                 $this->sInsertUrl($org_path, $path);
             }
         }
@@ -872,7 +868,7 @@ public function sCategoryPath($categoryId)
      */
     public function getData()
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         return $this->data;
     }
@@ -985,13 +981,12 @@ private function sCategoryPathByProductId($productId, $parentId = null)
     /**
      * Generates and inserts the form seo urls
      *
-     * @param int                  $offset
-     * @param int                  $limit
-     * @param ShopContextInterface $context
+     * @param int $offset
+     * @param int $limit
      *
      * @throws Exception
      */
-    private function insertFormUrls($offset, $limit, ShopContextInterface $context = null)
+    private function insertFormUrls($offset, $limit, ?ShopContextInterface $context = null)
     {
         $context = $this->createFallbackContext($context);
         $shopId = $context->getShop()->getId();
@@ -1037,15 +1032,14 @@ private function insertFormUrls($offset, $limit, ShopContextInterface $context =
     /**
      * Generates and inserts static page urls
      *
-     * @param int                  $offset
-     * @param int                  $limit
-     * @param ShopContextInterface $context
+     * @param int $offset
+     * @param int $limit
      *
      * @throws Exception
      * @throws SmartyException
      * @throws Zend_Db_Statement_Exception
      */
-    private function insertStaticPageUrls($offset, $limit, ShopContextInterface $context = null)
+    private function insertStaticPageUrls($offset, $limit, ?ShopContextInterface $context = null)
     {
         $context = $this->createFallbackContext($context);
         $shopId = $context->getShop()->getId();
@@ -1155,7 +1149,7 @@ private function getManufacturerIds($offset = null, $limit = null)
      *
      * @return ShopContextInterface
      */
-    private function createFallbackContext(ShopContextInterface $context = null)
+    private function createFallbackContext(?ShopContextInterface $context = null)
     {
         if ($context) {
             return $context;
diff --git a/engine/Shopware/Core/sSystem.php b/engine/Shopware/Core/sSystem.php
index d437f21271a..ada8172806f 100644
--- a/engine/Shopware/Core/sSystem.php
+++ b/engine/Shopware/Core/sSystem.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\LegacyRequestWrapper\CookieWrapper;
@@ -175,7 +175,7 @@ class sSystem implements Enlight_Hook
     /**
      * @param Enlight_Controller_Request_Request $request The request object
      */
-    public function __construct(Enlight_Controller_Request_Request $request = null)
+    public function __construct(?Enlight_Controller_Request_Request $request = null)
     {
         $request = $request ?: Enlight_Controller_Request_RequestHttp::createFromGlobals();
         $this->postWrapper = new PostWrapper($request);
diff --git a/engine/Shopware/Kernel.php b/engine/Shopware/Kernel.php
index 8ee2106672f..d30a8f942dc 100644
--- a/engine/Shopware/Kernel.php
+++ b/engine/Shopware/Kernel.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware;
@@ -33,8 +33,6 @@
 use Shopware\Bundle\AccountBundle\AccountBundle;
 use Shopware\Bundle\AttributeBundle\AttributeBundle;
 use Shopware\Bundle\AttributeBundle\DependencyInjection\Compiler\StaticResourcesCompilerPass;
-use Shopware\Bundle\BenchmarkBundle\BenchmarkBundle;
-use Shopware\Bundle\BenchmarkBundle\DependencyInjection\Compiler\MatcherCompilerPass;
 use Shopware\Bundle\ContentTypeBundle\ContentTypeBundle;
 use Shopware\Bundle\ContentTypeBundle\DependencyInjection\RegisterDynamicController;
 use Shopware\Bundle\ContentTypeBundle\DependencyInjection\RegisterFieldsCompilerPass;
@@ -289,7 +287,7 @@ public function setPhpSettings(array $settings, $prefix = '')
     {
         foreach ($settings as $key => $value) {
             $key = empty($prefix) ? $key : $prefix . $key;
-            if (is_scalar($value)) {
+            if (\is_scalar($value)) {
                 ini_set($key, (string) $value);
             } elseif (\is_array($value)) {
                 $this->setPhpSettings($value, $key . '.');
@@ -460,7 +458,6 @@ public function registerBundles(): array
         return [
             new AccountBundle(),
             new AttributeBundle(),
-            new BenchmarkBundle(),
             new CookieBundle(),
             new ContentTypeBundle(),
             new ControllerBundle(),
@@ -550,7 +547,7 @@ protected function initializeContainer()
 
         $cache = new ConfigCache(
             $this->config['hook']['proxyDir'] . '/' . $class . '.php',
-            true //always check for file modified time
+            true // always check for file modified time
         );
 
         if (!$cache->isFresh()) {
@@ -625,10 +622,10 @@ protected function buildContainer()
         foreach ($runtimeDirectories as $name => $dir) {
             if (!is_dir($dir)) {
                 if (@mkdir($dir, 0777, true) === false && !is_dir($dir)) {
-                    throw new RuntimeException(sprintf("Unable to create the %s directory (%s)\n", $name, $dir));
+                    throw new RuntimeException(\sprintf("Unable to create the %s directory (%s)\n", $name, $dir));
                 }
             } elseif (!is_writable($dir)) {
-                throw new RuntimeException(sprintf("Unable to write in the %s directory (%s)\n", $name, $dir));
+                throw new RuntimeException(\sprintf("Unable to write in the %s directory (%s)\n", $name, $dir));
             }
         }
 
@@ -673,7 +670,6 @@ protected function prepareContainer(ContainerBuilder $container)
         $container->addCompilerPass(new StaticResourcesCompilerPass());
         $container->addCompilerPass(new AddConsoleCommandPass());
         $container->addCompilerPass(new ConfigureContainerAwareCommands());
-        $container->addCompilerPass(new MatcherCompilerPass());
         $container->addCompilerPass(new LegacyApiResourcesPass());
         $container->addCompilerPass(new ConfigureApiResourcesPass(), PassConfig::TYPE_OPTIMIZE, -500);
         $container->addCompilerPass(new RegisterFieldsCompilerPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, 500);
diff --git a/engine/Shopware/Models/Analytics/Repository.php b/engine/Shopware/Models/Analytics/Repository.php
index d6cdd751a7f..5b22348e51f 100644
--- a/engine/Shopware/Models/Analytics/Repository.php
+++ b/engine/Shopware/Models/Analytics/Repository.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Analytics;
@@ -61,7 +61,7 @@ public function __construct(Connection $connection, Enlight_Event_EventManager $
      *
      * @return Result
      */
-    public function getDailyVisitors(DateTimeInterface $from = null, DateTimeInterface $to = null)
+    public function getDailyVisitors(?DateTimeInterface $from = null, ?DateTimeInterface $to = null)
     {
         $builder = $this->createDailyVisitorsBuilder($from, $to);
 
@@ -91,7 +91,7 @@ public function getDailyVisitors(DateTimeInterface $from = null, DateTimeInterfa
      *
      * @return Result
      */
-    public function getDailyShopVisitors(DateTimeInterface $from = null, DateTimeInterface $to = null, array $shopIds = [])
+    public function getDailyShopVisitors(?DateTimeInterface $from = null, ?DateTimeInterface $to = null, array $shopIds = [])
     {
         $builder = $this->createDailyVisitorsBuilder($from, $to);
 
@@ -154,7 +154,7 @@ public function getDailyShopOrders(DateTimeInterface $from, DateTimeInterface $t
      *
      * @return Result
      */
-    public function getDailyRegistrations(DateTimeInterface $from = null, DateTimeInterface $to = null)
+    public function getDailyRegistrations(?DateTimeInterface $from = null, ?DateTimeInterface $to = null)
     {
         $builder = $this->createDailyRegistrationsBuilder($from, $to);
 
@@ -180,7 +180,7 @@ public function getDailyRegistrations(DateTimeInterface $from = null, DateTimeIn
      *
      * @return Result
      */
-    public function getDailyTurnover(DateTimeInterface $from = null, DateTimeInterface $to = null)
+    public function getDailyTurnover(?DateTimeInterface $from = null, ?DateTimeInterface $to = null)
     {
         $builder = $this->createDailyTurnoverBuilder($from, $to);
 
@@ -207,7 +207,7 @@ public function getDailyTurnover(DateTimeInterface $from = null, DateTimeInterfa
      *                'referrer' => 'https://www.google.de/',
      *                )
      */
-    public function getVisitedReferrer($offset, $limit, DateTimeInterface $from = null, DateTimeInterface $to = null)
+    public function getVisitedReferrer($offset, $limit, ?DateTimeInterface $from = null, ?DateTimeInterface $to = null)
     {
         $builder = $this->createVisitedReferrerBuilder($from, $to);
 
@@ -225,7 +225,7 @@ public function getVisitedReferrer($offset, $limit, DateTimeInterface $from = nu
      *
      * @return Result
      */
-    public function getReferrerRevenue(Shop $shop, DateTimeInterface $from = null, DateTimeInterface $to = null)
+    public function getReferrerRevenue(Shop $shop, ?DateTimeInterface $from = null, ?DateTimeInterface $to = null)
     {
         $builder = $this->createReferrerRevenueBuilder($shop, $from, $to);
 
@@ -244,7 +244,7 @@ public function getReferrerRevenue(Shop $shop, DateTimeInterface $from = null, D
      *
      * @return Result
      */
-    public function getPartnerRevenue($offset, $limit, DateTimeInterface $from = null, DateTimeInterface $to = null)
+    public function getPartnerRevenue($offset, $limit, ?DateTimeInterface $from = null, ?DateTimeInterface $to = null)
     {
         $builder = $this->createPartnerRevenueBuilder($from, $to);
 
@@ -276,7 +276,7 @@ public function getPartnerRevenue($offset, $limit, DateTimeInterface $from = nul
      *          'ordernumber' => 'SW10002841',
      *      ),
      */
-    public function getProductSales($offset, $limit, DateTimeInterface $from = null, DateTimeInterface $to = null)
+    public function getProductSales($offset, $limit, ?DateTimeInterface $from = null, ?DateTimeInterface $to = null)
     {
         $builder = $this->createProductSalesBuilder($from, $to);
 
@@ -307,7 +307,7 @@ public function getProductSales($offset, $limit, DateTimeInterface $from = null,
      *          'salutation' => 'mr',
      *      ),
      */
-    public function getOrdersOfCustomers(DateTimeInterface $from = null, DateTimeInterface $to = null)
+    public function getOrdersOfCustomers(?DateTimeInterface $from = null, ?DateTimeInterface $to = null)
     {
         $builder = $this->createOrdersOfCustomersBuilder($from, $to);
 
@@ -325,7 +325,7 @@ public function getOrdersOfCustomers(DateTimeInterface $from = null, DateTimeInt
      *
      * @return Result
      */
-    public function getAgeOfCustomers(DateTimeInterface $from = null, DateTimeInterface $to = null, array $shopIds = [])
+    public function getAgeOfCustomers(?DateTimeInterface $from = null, ?DateTimeInterface $to = null, array $shopIds = [])
     {
         $builder = $this->createAgeOfCustomersBuilder($from, $to, $shopIds);
 
@@ -359,7 +359,7 @@ public function getAgeOfCustomers(DateTimeInterface $from = null, DateTimeInterf
      *                'node' => '39',
      *                ),
      */
-    public function getProductAmountPerCategory($categoryId, DateTimeInterface $from = null, DateTimeInterface $to = null)
+    public function getProductAmountPerCategory($categoryId, ?DateTimeInterface $from = null, ?DateTimeInterface $to = null)
     {
         $builder = $this->createProductAmountBuilder($from, $to)
             ->addSelect('categories.description as name')
@@ -399,7 +399,7 @@ public function getProductAmountPerCategory($categoryId, DateTimeInterface $from
      *                'name' => 'Example',
      *                )
      */
-    public function getProductAmountPerManufacturer($offset = null, $limit = null, DateTimeInterface $from = null, DateTimeInterface $to = null)
+    public function getProductAmountPerManufacturer($offset = null, $limit = null, ?DateTimeInterface $from = null, ?DateTimeInterface $to = null)
     {
         $builder = $this->createProductAmountBuilder($from, $to)
             ->addSelect('suppliers.name')
@@ -433,7 +433,7 @@ public function getProductAmountPerManufacturer($offset = null, $limit = null, D
      *                'deviceType' => 'tablet',
      *                )
      */
-    public function getProductAmountPerDevice(DateTimeInterface $from = null, DateTimeInterface $to = null, array $shopIds = [])
+    public function getProductAmountPerDevice(?DateTimeInterface $from = null, ?DateTimeInterface $to = null, array $shopIds = [])
     {
         $builder = $this->createAmountBuilder($from, $to, $shopIds)
             ->addSelect('orders.deviceType')
@@ -469,7 +469,7 @@ public function getProductAmountPerDevice(DateTimeInterface $from = null, DateTi
      *                'countResults' => '1390',
      *                )
      */
-    public function getSearchTerms($offset, $limit, DateTimeInterface $from = null, DateTimeInterface $to = null, $sort = [], array $shopIds = [])
+    public function getSearchTerms($offset, $limit, ?DateTimeInterface $from = null, ?DateTimeInterface $to = null, $sort = [], array $shopIds = [])
     {
         $builder = $this->connection->createQueryBuilder();
 
@@ -595,7 +595,7 @@ public function getReferrerSearchTerms($referrer)
      *                'visits9' => '0',
      *                )
      */
-    public function getVisitorImpressions($offset, $limit, DateTimeInterface $from = null, DateTimeInterface $to = null, $sort = [], array $shopIds = [])
+    public function getVisitorImpressions($offset, $limit, ?DateTimeInterface $from = null, ?DateTimeInterface $to = null, $sort = [], array $shopIds = [])
     {
         $builder = $this->createVisitorImpressionBuilder(
             $offset,
@@ -664,7 +664,7 @@ public function getVisitorImpressions($offset, $limit, DateTimeInterface $from =
      *                'name' => 'Deutschland',
      *                ),
      */
-    public function getAmountPerCountry(DateTimeInterface $from = null, DateTimeInterface $to = null, array $shopIds = [])
+    public function getAmountPerCountry(?DateTimeInterface $from = null, ?DateTimeInterface $to = null, array $shopIds = [])
     {
         $builder = $this->createAmountBuilder($from, $to, $shopIds)
             ->addSelect('country.countryname AS name')
@@ -698,7 +698,7 @@ public function getAmountPerCountry(DateTimeInterface $from = null, DateTimeInte
      *                'name' => 'Rechnung',
      *                ),
      */
-    public function getAmountPerPayment(DateTimeInterface $from = null, DateTimeInterface $to = null, array $shopIds = [])
+    public function getAmountPerPayment(?DateTimeInterface $from = null, ?DateTimeInterface $to = null, array $shopIds = [])
     {
         $builder = $this->createAmountBuilder($from, $to, $shopIds)
             ->addSelect('payment.description AS name')
@@ -732,7 +732,7 @@ public function getAmountPerPayment(DateTimeInterface $from = null, DateTimeInte
      *                'name' => 'Standard Versand',
      *                ),
      */
-    public function getAmountPerShipping(DateTimeInterface $from = null, DateTimeInterface $to = null, array $shopIds = [])
+    public function getAmountPerShipping(?DateTimeInterface $from = null, ?DateTimeInterface $to = null, array $shopIds = [])
     {
         $builder = $this->createAmountBuilder($from, $to, $shopIds)
             ->addSelect('dispatch.name AS name')
@@ -775,7 +775,7 @@ public function getAmountPerShipping(DateTimeInterface $from = null, DateTimeInt
      *          'date' => '2001-10-01',
      *      ),
      */
-    public function getAmountPerMonth(DateTimeInterface $from = null, DateTimeInterface $to = null, array $shopIds = [])
+    public function getAmountPerMonth(?DateTimeInterface $from = null, ?DateTimeInterface $to = null, array $shopIds = [])
     {
         $dateCondition = 'DATE_FORMAT(ordertime, \'%Y-%m-04\')';
         $builder = $this->createAmountBuilder($from, $to, $shopIds)
@@ -819,7 +819,7 @@ public function getAmountPerMonth(DateTimeInterface $from = null, DateTimeInterf
      *          'date' => '2000-07-27',
      *      ),
      */
-    public function getAmountPerCalendarWeek(DateTimeInterface $from = null, DateTimeInterface $to = null, array $shopIds = [])
+    public function getAmountPerCalendarWeek(?DateTimeInterface $from = null, ?DateTimeInterface $to = null, array $shopIds = [])
     {
         $dateCondition = 'DATE_SUB(DATE(ordertime), INTERVAL WEEKDAY(ordertime)-3 DAY)';
         $builder = $this->createAmountBuilder($from, $to, $shopIds)
@@ -863,7 +863,7 @@ public function getAmountPerCalendarWeek(DateTimeInterface $from = null, DateTim
      *          'date' => '2002-07-15',
      *      ),
      */
-    public function getAmountPerWeekday(DateTimeInterface $from = null, DateTimeInterface $to = null, array $shopIds = [])
+    public function getAmountPerWeekday(?DateTimeInterface $from = null, ?DateTimeInterface $to = null, array $shopIds = [])
     {
         $builder = $this->createAmountBuilder($from, $to, $shopIds)
             ->addSelect('DATE_FORMAT(ordertime, \'%Y-%m-%d\') AS date')
@@ -906,7 +906,7 @@ public function getAmountPerWeekday(DateTimeInterface $from = null, DateTimeInte
      *          'date' => '1970-01-01 01:00:00',
      *      ),
      */
-    public function getAmountPerHour(DateTimeInterface $from = null, DateTimeInterface $to = null, array $shopIds = [])
+    public function getAmountPerHour(?DateTimeInterface $from = null, ?DateTimeInterface $to = null, array $shopIds = [])
     {
         $dateCondition = 'DATE_FORMAT(ordertime, \'1970-01-01 %H:00:00\')';
 
@@ -951,7 +951,7 @@ public function getAmountPerHour(DateTimeInterface $from = null, DateTimeInterfa
      *          'amount2' => '0',
      *      ),
      */
-    public function getProductImpressions($offset, $limit, DateTimeInterface $from = null, DateTimeInterface $to = null, array $sort = [], array $shopIds = [])
+    public function getProductImpressions($offset, $limit, ?DateTimeInterface $from = null, ?DateTimeInterface $to = null, array $sort = [], array $shopIds = [])
     {
         $builder = $this->createProductImpressionBuilder($offset, $limit);
 
@@ -989,7 +989,7 @@ public function getProductImpressions($offset, $limit, DateTimeInterface $from =
      *
      * @return Result
      */
-    public function getCustomerGroupAmount(DateTimeInterface $from = null, DateTimeInterface $to = null, array $shopIds = [])
+    public function getCustomerGroupAmount(?DateTimeInterface $from = null, ?DateTimeInterface $to = null, array $shopIds = [])
     {
         $builder = $this->createCustomerGroupAmountBuilder($from, $to, $shopIds);
 
@@ -1070,7 +1070,7 @@ protected function createDailyShopOrderBuilder(DateTimeInterface $from, DateTime
      *
      * @return DBALQueryBuilder
      */
-    protected function createDailyTurnoverBuilder(DateTimeInterface $from = null, DateTimeInterface $to = null)
+    protected function createDailyTurnoverBuilder(?DateTimeInterface $from = null, ?DateTimeInterface $to = null)
     {
         $builder = $this->connection->createQueryBuilder();
         $builder->select([
@@ -1100,7 +1100,7 @@ protected function createDailyTurnoverBuilder(DateTimeInterface $from = null, Da
      *
      * @return DBALQueryBuilder
      */
-    protected function createDailyVisitorsBuilder(DateTimeInterface $from = null, DateTimeInterface $to = null)
+    protected function createDailyVisitorsBuilder(?DateTimeInterface $from = null, ?DateTimeInterface $to = null)
     {
         $builder = $this->connection->createQueryBuilder();
 
@@ -1130,7 +1130,7 @@ protected function createDailyVisitorsBuilder(DateTimeInterface $from = null, Da
      *
      * @return DBALQueryBuilder
      */
-    protected function createDailyRegistrationsBuilder(DateTimeInterface $from = null, DateTimeInterface $to = null)
+    protected function createDailyRegistrationsBuilder(?DateTimeInterface $from = null, ?DateTimeInterface $to = null)
     {
         $builder = $this->connection->createQueryBuilder();
 
@@ -1192,7 +1192,7 @@ protected function createProductImpressionBuilder($offset, $limit, array $sort =
      *
      * @return DBALQueryBuilder
      */
-    protected function createProductAmountBuilder(DateTimeInterface $from = null, DateTimeInterface $to = null)
+    protected function createProductAmountBuilder(?DateTimeInterface $from = null, ?DateTimeInterface $to = null)
     {
         $builder = $this->connection->createQueryBuilder();
         $builder->select([
@@ -1227,7 +1227,7 @@ protected function createProductAmountBuilder(DateTimeInterface $from = null, Da
      *                          'displayDate' => 'Monday',
      *                          ),
      */
-    protected function createAmountBuilder(DateTimeInterface $from = null, DateTimeInterface $to = null, array $shopIds = [])
+    protected function createAmountBuilder(?DateTimeInterface $from = null, ?DateTimeInterface $to = null, array $shopIds = [])
     {
         $builder = $this->connection->createQueryBuilder();
         $builder->select([
@@ -1271,7 +1271,7 @@ protected function createAmountBuilder(DateTimeInterface $from = null, DateTimeI
      *
      * @return DBALQueryBuilder
      */
-    protected function createVisitorImpressionBuilder($offset, $limit, DateTimeInterface $from = null, DateTimeInterface $to = null, array $sort = [])
+    protected function createVisitorImpressionBuilder($offset, $limit, ?DateTimeInterface $from = null, ?DateTimeInterface $to = null, array $sort = [])
     {
         $builder = $this->connection->createQueryBuilder();
         $builder->select([
@@ -1304,7 +1304,7 @@ protected function createVisitorImpressionBuilder($offset, $limit, DateTimeInter
      *
      * @return DBALQueryBuilder
      */
-    protected function createAgeOfCustomersBuilder(DateTimeInterface $from = null, DateTimeInterface $to = null, array $shopIds = [])
+    protected function createAgeOfCustomersBuilder(?DateTimeInterface $from = null, ?DateTimeInterface $to = null, array $shopIds = [])
     {
         $builder = $this->connection->createQueryBuilder();
         $builder->select([
@@ -1335,7 +1335,7 @@ protected function createAgeOfCustomersBuilder(DateTimeInterface $from = null, D
      *
      * @return DBALQueryBuilder
      */
-    protected function createOrdersOfCustomersBuilder(DateTimeInterface $from = null, DateTimeInterface $to = null)
+    protected function createOrdersOfCustomersBuilder(?DateTimeInterface $from = null, ?DateTimeInterface $to = null)
     {
         $builder = $this->connection->createQueryBuilder();
 
@@ -1361,7 +1361,7 @@ protected function createOrdersOfCustomersBuilder(DateTimeInterface $from = null
      *
      * @return DBALQueryBuilder
      */
-    protected function createProductSalesBuilder(DateTimeInterface $from = null, DateTimeInterface $to = null)
+    protected function createProductSalesBuilder(?DateTimeInterface $from = null, ?DateTimeInterface $to = null)
     {
         $builder = $this->connection->createQueryBuilder();
         $builder->select([
@@ -1387,7 +1387,7 @@ protected function createProductSalesBuilder(DateTimeInterface $from = null, Dat
      *
      * @return DBALQueryBuilder
      */
-    protected function createPartnerRevenueBuilder(DateTimeInterface $from = null, DateTimeInterface $to = null)
+    protected function createPartnerRevenueBuilder(?DateTimeInterface $from = null, ?DateTimeInterface $to = null)
     {
         $builder = $this->connection->createQueryBuilder();
         $builder->select([
@@ -1413,7 +1413,7 @@ protected function createPartnerRevenueBuilder(DateTimeInterface $from = null, D
      *
      * @return DBALQueryBuilder
      */
-    protected function createReferrerRevenueBuilder(Shop $shop = null, DateTimeInterface $from = null, DateTimeInterface $to = null)
+    protected function createReferrerRevenueBuilder(?Shop $shop = null, ?DateTimeInterface $from = null, ?DateTimeInterface $to = null)
     {
         $builder = $this->connection->createQueryBuilder();
         $builder->select([
@@ -1444,7 +1444,7 @@ protected function createReferrerRevenueBuilder(Shop $shop = null, DateTimeInter
      *
      * @return DBALQueryBuilder
      */
-    protected function createVisitedReferrerBuilder(DateTimeInterface $from = null, DateTimeInterface $to = null)
+    protected function createVisitedReferrerBuilder(?DateTimeInterface $from = null, ?DateTimeInterface $to = null)
     {
         $builder = $this->connection->createQueryBuilder();
         $builder->select([
@@ -1472,7 +1472,7 @@ protected function createVisitedReferrerBuilder(DateTimeInterface $from = null,
      *                          'displayDate' => 'Monday',
      *                          ),
      */
-    protected function createCustomerGroupAmountBuilder(DateTimeInterface $from = null, DateTimeInterface $to = null, array $shopIds = [])
+    protected function createCustomerGroupAmountBuilder(?DateTimeInterface $from = null, ?DateTimeInterface $to = null, array $shopIds = [])
     {
         $builder = $this->createAmountBuilder($from, $to, $shopIds)
             ->addSelect('customerGroups.description as customerGroup')
@@ -1489,7 +1489,7 @@ protected function createCustomerGroupAmountBuilder(DateTimeInterface $from = nu
     /**
      * Helper function which adds the date range condition to an aggregate order query.
      */
-    private function addDateRangeCondition(DBALQueryBuilder $builder, string $column, DateTimeInterface $from = null, DateTimeInterface $to = null): Repository
+    private function addDateRangeCondition(DBALQueryBuilder $builder, string $column, ?DateTimeInterface $from = null, ?DateTimeInterface $to = null): Repository
     {
         if ($from instanceof DateTimeInterface) {
             $builder->andWhere($column . ' >= :fromDate')
diff --git a/engine/Shopware/Models/Article/Article.php b/engine/Shopware/Models/Article/Article.php
index d294340efa4..64d64a1d544 100644
--- a/engine/Shopware/Models/Article/Article.php
+++ b/engine/Shopware/Models/Article/Article.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Article;
@@ -29,6 +29,7 @@
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
 use Shopware\Components\Model\ModelEntity;
+use Shopware\Models\Article\Configurator\Set;
 use Shopware\Models\Article\Configurator\Template\Template;
 use Shopware\Models\Category\Category as ProductCategory;
 use Shopware\Models\Customer\Group as CustomerGroup;
@@ -55,7 +56,6 @@ class Article extends ModelEntity
      *
      * @Assert\NotBlank()
      * @Assert\Valid()
-     *
      * @ORM\OneToOne(targetEntity="Shopware\Models\Tax\Tax")
      * @ORM\JoinColumn(name="taxID", referencedColumnName="id")
      */
@@ -179,7 +179,6 @@ class Article extends ModelEntity
      * @var Supplier|null
      *
      * @Assert\Valid()
-     *
      * @ORM\ManyToOne(targetEntity="Shopware\Models\Article\Supplier", inversedBy="articles", cascade={"persist"})
      * @ORM\JoinColumn(name="supplierID", referencedColumnName="id")
      */
@@ -191,7 +190,6 @@ class Article extends ModelEntity
      * @var ArrayCollection<Detail>
      *
      * @Assert\Valid()
-     *
      * @ORM\OneToMany(targetEntity="Shopware\Models\Article\Detail", mappedBy="article", cascade={"persist"})
      * @ORM\OrderBy({"position" = "ASC"})
      */
@@ -204,7 +202,6 @@ class Article extends ModelEntity
      *
      * @Assert\NotBlank()
      * @Assert\Valid()
-     *
      * @ORM\OneToOne(targetEntity="Shopware\Models\Article\Detail", cascade={"persist", "remove"})
      * @ORM\JoinColumn(name="main_detail_id", referencedColumnName="id")
      */
@@ -216,7 +213,6 @@ class Article extends ModelEntity
      * @var ArrayCollection<Link>
      *
      * @Assert\Valid()
-     *
      * @ORM\OneToMany(targetEntity="Shopware\Models\Article\Link", mappedBy="article", orphanRemoval=true, cascade={"persist"})
      */
     protected $links;
@@ -227,7 +223,6 @@ class Article extends ModelEntity
      * @var ArrayCollection<array-key, Download>
      *
      * @Assert\Valid()
-     *
      * @ORM\OneToMany(targetEntity="Shopware\Models\Article\Download", mappedBy="article", orphanRemoval=true, cascade={"persist"})
      */
     protected $downloads;
@@ -238,7 +233,6 @@ class Article extends ModelEntity
      * @var ArrayCollection<array-key, Image>
      *
      * @Assert\Valid()
-     *
      * @ORM\OneToMany(targetEntity="Shopware\Models\Article\Image", mappedBy="article", orphanRemoval=true, cascade={"persist"})
      * @ORM\OrderBy({"position" = "ASC"})
      */
@@ -266,7 +260,7 @@ class Article extends ModelEntity
     /**
      * OWNING SIDE
      *
-     * @var Configurator\Set|null
+     * @var Set|null
      *
      * @ORM\ManyToOne(targetEntity="Shopware\Models\Article\Configurator\Set", inversedBy="articles", cascade={"persist"})
      * @ORM\JoinColumn(name="configurator_set_id", referencedColumnName="id")
@@ -361,7 +355,6 @@ class Article extends ModelEntity
      * @var string
      *
      * @Assert\NotBlank()
-     *
      * @ORM\Column(name="name", type="string", length=100, nullable=false)
      */
     private $name;
@@ -384,7 +377,6 @@ class Article extends ModelEntity
      * @var DateTimeInterface|null
      *
      * @Assert\DateTime()
-     *
      * @ORM\Column(name="datum", type="date", nullable=true)
      */
     private $added;
@@ -413,7 +405,7 @@ class Article extends ModelEntity
     /**
      * @var string|null
      *
-     * @ORM\Column(name="keywords", type="string", length=255, nullable=true)
+     * @ORM\Column(name="keywords", type="text", nullable=true)
      */
     private $keywords;
 
@@ -442,6 +434,7 @@ class Article extends ModelEntity
      * @var bool|null
      *
      * @deprecated 5.6 will be removed in 5.8
+     *
      * @ORM\Column(name="laststock", type="boolean", nullable=true)
      */
     private $lastStock = false;
@@ -1198,7 +1191,7 @@ public function setAvailableTo($availableTo)
     }
 
     /**
-     * @return Configurator\Set|null
+     * @return Set|null
      */
     public function getConfiguratorSet()
     {
@@ -1206,13 +1199,13 @@ public function getConfiguratorSet()
     }
 
     /**
-     * @param Configurator\Set|null $configuratorSet
+     * @param Set|null $configuratorSet
      *
      * @return Article
      */
     public function setConfiguratorSet($configuratorSet)
     {
-        $this->setManyToOne($configuratorSet, Configurator\Set::class, 'configuratorSet');
+        $this->setManyToOne($configuratorSet, Set::class, 'configuratorSet');
 
         return $this;
     }
diff --git a/engine/Shopware/Models/Article/Configurator/Dependency.php b/engine/Shopware/Models/Article/Configurator/Dependency.php
index 52c2c44bf39..5f5f67d3e96 100644
--- a/engine/Shopware/Models/Article/Configurator/Dependency.php
+++ b/engine/Shopware/Models/Article/Configurator/Dependency.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Article\Configurator;
diff --git a/engine/Shopware/Models/Article/Configurator/Group.php b/engine/Shopware/Models/Article/Configurator/Group.php
index 2fd5feb8c7d..f9b82d84f55 100644
--- a/engine/Shopware/Models/Article/Configurator/Group.php
+++ b/engine/Shopware/Models/Article/Configurator/Group.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Article\Configurator;
diff --git a/engine/Shopware/Models/Article/Configurator/Option.php b/engine/Shopware/Models/Article/Configurator/Option.php
index 7ce4e42a83e..4312e5f665a 100644
--- a/engine/Shopware/Models/Article/Configurator/Option.php
+++ b/engine/Shopware/Models/Article/Configurator/Option.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Article\Configurator;
@@ -51,7 +51,7 @@ class Option extends ModelEntity
     protected $articles;
 
     /**
-     * @var ArrayCollection<\Shopware\Models\Article\Configurator\Set>
+     * @var ArrayCollection<Set>
      *
      * @ORM\ManyToMany(targetEntity="Shopware\Models\Article\Configurator\Set", mappedBy="options")
      */
@@ -105,14 +105,14 @@ class Option extends ModelEntity
     private $group;
 
     /**
-     * @var ArrayCollection<\Shopware\Models\Article\Configurator\Dependency>
+     * @var ArrayCollection<Dependency>
      *
      * @ORM\OneToMany(targetEntity="Shopware\Models\Article\Configurator\Dependency", mappedBy="parentOption", orphanRemoval=true)
      */
     private $dependencyParents;
 
     /**
-     * @var ArrayCollection<\Shopware\Models\Article\Configurator\Dependency>
+     * @var ArrayCollection<Dependency>
      *
      * @ORM\OneToMany(targetEntity="Shopware\Models\Article\Configurator\Dependency", mappedBy="childOption", orphanRemoval=true)
      */
@@ -188,7 +188,7 @@ public function setGroup($group)
     }
 
     /**
-     * @return ArrayCollection<\Shopware\Models\Article\Configurator\Dependency>
+     * @return ArrayCollection<Dependency>
      */
     public function getDependencyParents()
     {
@@ -196,7 +196,7 @@ public function getDependencyParents()
     }
 
     /**
-     * @param ArrayCollection<\Shopware\Models\Article\Configurator\Dependency> $dependencyParents
+     * @param ArrayCollection<Dependency> $dependencyParents
      */
     public function setDependencyParents($dependencyParents)
     {
@@ -204,7 +204,7 @@ public function setDependencyParents($dependencyParents)
     }
 
     /**
-     * @return ArrayCollection<\Shopware\Models\Article\Configurator\Dependency>
+     * @return ArrayCollection<Dependency>
      */
     public function getDependencyChildren()
     {
@@ -212,7 +212,7 @@ public function getDependencyChildren()
     }
 
     /**
-     * @param ArrayCollection<\Shopware\Models\Article\Configurator\Dependency> $dependencyChildren
+     * @param ArrayCollection<Dependency> $dependencyChildren
      */
     public function setDependencyChildren($dependencyChildren)
     {
diff --git a/engine/Shopware/Models/Article/Configurator/PriceVariation.php b/engine/Shopware/Models/Article/Configurator/PriceVariation.php
index d9f305b7f87..72b0c9cc022 100644
--- a/engine/Shopware/Models/Article/Configurator/PriceVariation.php
+++ b/engine/Shopware/Models/Article/Configurator/PriceVariation.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Article\Configurator;
diff --git a/engine/Shopware/Models/Article/Configurator/Set.php b/engine/Shopware/Models/Article/Configurator/Set.php
index 895327d5232..0433bf4f351 100644
--- a/engine/Shopware/Models/Article/Configurator/Set.php
+++ b/engine/Shopware/Models/Article/Configurator/Set.php
@@ -1,31 +1,32 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Article\Configurator;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
+use Shopware\Bundle\StoreFrontBundle\Service\Core\ConfiguratorService;
 use Shopware\Components\Model\ModelEntity;
 use Shopware\Models\Article\Article;
 
@@ -246,7 +247,7 @@ public function getType()
     }
 
     /**
-     * @param int $type
+     * @param ConfiguratorService::CONFIGURATOR_* $type
      */
     public function setType($type)
     {
diff --git a/engine/Shopware/Models/Article/Configurator/Template/Price.php b/engine/Shopware/Models/Article/Configurator/Template/Price.php
index accc9c091c3..5e5efda6351 100644
--- a/engine/Shopware/Models/Article/Configurator/Template/Price.php
+++ b/engine/Shopware/Models/Article/Configurator/Template/Price.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Article\Configurator\Template;
@@ -76,7 +76,7 @@ class Price extends LazyFetchModelEntity
      *
      * @ORM\Column(name="customer_group_key", type="string", length=15, nullable=true)
      */
-    private $customerGroupKey = null;
+    private $customerGroupKey;
 
     /**
      * @var int
diff --git a/engine/Shopware/Models/Article/Configurator/Template/Template.php b/engine/Shopware/Models/Article/Configurator/Template/Template.php
index 8c622e420f0..1ae13b4bd83 100644
--- a/engine/Shopware/Models/Article/Configurator/Template/Template.php
+++ b/engine/Shopware/Models/Article/Configurator/Template/Template.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Article\Configurator\Template;
@@ -53,7 +53,7 @@ class Template extends ModelEntity
     /**
      * INVERSE SIDE
      *
-     * @var ArrayCollection<\Shopware\Models\Article\Configurator\Template\Price>
+     * @var ArrayCollection<Price>
      *
      * @ORM\OneToMany(targetEntity="Shopware\Models\Article\Configurator\Template\Price", mappedBy="template", orphanRemoval=true, cascade={"persist"})
      */
@@ -106,7 +106,6 @@ class Template extends ModelEntity
      *
      * @Assert\NotBlank()
      * @Assert\Regex("/^[a-zA-Z0-9-_. ]+$/")
-     *
      * @ORM\Column(name="order_number", type="string", nullable=false, unique=true)
      */
     private $number = '';
@@ -495,7 +494,7 @@ public function setAttribute($attribute)
     }
 
     /**
-     * @return \Doctrine\Common\Collections\ArrayCollection
+     * @return ArrayCollection
      */
     public function getPrices()
     {
diff --git a/engine/Shopware/Models/Article/Detail.php b/engine/Shopware/Models/Article/Detail.php
index 53c58ed8b8b..40657df49a6 100644
--- a/engine/Shopware/Models/Article/Detail.php
+++ b/engine/Shopware/Models/Article/Detail.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Article;
@@ -152,7 +152,6 @@ class Detail extends ModelEntity
      *
      * @Assert\NotBlank()
      * @ShopwareAssert\OrderNumber
-     *
      * @ORM\Column(name="ordernumber", type="string", nullable=false, unique=true)
      */
     private $number = '';
diff --git a/engine/Shopware/Models/Article/Download.php b/engine/Shopware/Models/Article/Download.php
index ec50a6db905..8afb0fedf1b 100644
--- a/engine/Shopware/Models/Article/Download.php
+++ b/engine/Shopware/Models/Article/Download.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Article;
@@ -37,7 +37,7 @@ class Download extends ModelEntity
     /**
      * OWNING SIDE
      *
-     * @var \Shopware\Models\Article\Article
+     * @var Article
      *
      * @ORM\ManyToOne(targetEntity="Shopware\Models\Article\Article", inversedBy="downloads")
      * @ORM\JoinColumn(name="articleID", referencedColumnName="id", nullable=false)
diff --git a/engine/Shopware/Models/Article/Element.php b/engine/Shopware/Models/Article/Element.php
index ad0a7779dcd..11caea38e1e 100644
--- a/engine/Shopware/Models/Article/Element.php
+++ b/engine/Shopware/Models/Article/Element.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Article;
diff --git a/engine/Shopware/Models/Article/Esd.php b/engine/Shopware/Models/Article/Esd.php
index ff63e22f7c5..0cbc90771c9 100644
--- a/engine/Shopware/Models/Article/Esd.php
+++ b/engine/Shopware/Models/Article/Esd.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Article;
diff --git a/engine/Shopware/Models/Article/EsdSerial.php b/engine/Shopware/Models/Article/EsdSerial.php
index 23effa21a3b..3cc83606a8f 100644
--- a/engine/Shopware/Models/Article/EsdSerial.php
+++ b/engine/Shopware/Models/Article/EsdSerial.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Article;
diff --git a/engine/Shopware/Models/Article/Image.php b/engine/Shopware/Models/Article/Image.php
index 5ec72570a6d..d6dfa7f4a17 100644
--- a/engine/Shopware/Models/Article/Image.php
+++ b/engine/Shopware/Models/Article/Image.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Article;
diff --git a/engine/Shopware/Models/Article/Image/Mapping.php b/engine/Shopware/Models/Article/Image/Mapping.php
index e52ad8db59b..c37d3b897bd 100644
--- a/engine/Shopware/Models/Article/Image/Mapping.php
+++ b/engine/Shopware/Models/Article/Image/Mapping.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Article\Image;
diff --git a/engine/Shopware/Models/Article/Image/Rule.php b/engine/Shopware/Models/Article/Image/Rule.php
index 1280935b421..8de65c55008 100644
--- a/engine/Shopware/Models/Article/Image/Rule.php
+++ b/engine/Shopware/Models/Article/Image/Rule.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Article\Image;
@@ -38,7 +38,7 @@ class Rule extends ModelEntity
     /**
      * OWNING SIDE - BI DIRECTIONAL
      *
-     * @var \Shopware\Models\Article\Image\Mapping
+     * @var Mapping
      *
      * @ORM\ManyToOne(targetEntity="Shopware\Models\Article\Image\Mapping", inversedBy="rules")
      * @ORM\JoinColumn(name="mapping_id", referencedColumnName="id", nullable=false)
@@ -103,7 +103,7 @@ public function setOption($option)
     }
 
     /**
-     * @return \Shopware\Models\Article\Image\Mapping
+     * @return Mapping
      */
     public function getMapping()
     {
@@ -111,7 +111,7 @@ public function getMapping()
     }
 
     /**
-     * @param \Shopware\Models\Article\Image\Mapping $mapping
+     * @param Mapping $mapping
      */
     public function setMapping($mapping)
     {
diff --git a/engine/Shopware/Models/Article/Link.php b/engine/Shopware/Models/Article/Link.php
index 8c2ccbf37a2..481674df245 100644
--- a/engine/Shopware/Models/Article/Link.php
+++ b/engine/Shopware/Models/Article/Link.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Article;
@@ -74,7 +74,6 @@ class Link extends ModelEntity
      * @var string
      *
      * @Assert\NotBlank()
-     *
      * @ORM\Column(name="description", type="string", nullable=false)
      */
     private $name;
@@ -84,7 +83,6 @@ class Link extends ModelEntity
      *
      * @Assert\Url()
      * @Assert\NotBlank()
-     *
      * @ORM\Column(name="link", type="string", nullable=false)
      */
     private $link;
diff --git a/engine/Shopware/Models/Article/Notification.php b/engine/Shopware/Models/Article/Notification.php
index b4d3cd0c63f..a569fd99f87 100644
--- a/engine/Shopware/Models/Article/Notification.php
+++ b/engine/Shopware/Models/Article/Notification.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Article;
@@ -69,7 +69,6 @@ class Notification extends LazyFetchModelEntity
      * @var ProductNotificationAttribute|null
      *
      * @Assert\Valid()
-     *
      * @ORM\OneToOne(targetEntity="Shopware\Models\Attribute\ArticleNotification", mappedBy="articleNotification", cascade={"persist"})
      */
     protected $attribute;
diff --git a/engine/Shopware/Models/Article/Price.php b/engine/Shopware/Models/Article/Price.php
index 8366bcc04be..de65a66822b 100644
--- a/engine/Shopware/Models/Article/Price.php
+++ b/engine/Shopware/Models/Article/Price.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Article;
diff --git a/engine/Shopware/Models/Article/Repository.php b/engine/Shopware/Models/Article/Repository.php
index 4498e4aabe9..4cc30465e47 100644
--- a/engine/Shopware/Models/Article/Repository.php
+++ b/engine/Shopware/Models/Article/Repository.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Article;
@@ -60,7 +60,7 @@ class Repository extends ModelRepository
      *
      * @param int $articleId
      *
-     * @return Query
+     * @return Query<Product>
      */
     public function getArticleBaseDataQuery($articleId)
     {
@@ -100,7 +100,7 @@ public function getArticleBaseDataQueryBuilder($articleId)
      *
      * @param int $articleId
      *
-     * @return Query
+     * @return Query<Product>
      */
     public function getArticleCategoriesQuery($articleId)
     {
@@ -138,7 +138,7 @@ public function getArticleCategoriesQueryBuilder($articleId)
      *
      * @param int $articleId
      *
-     * @return Query
+     * @return Query<Product>
      */
     public function getArticleSimilarsQuery($articleId)
     {
@@ -172,7 +172,7 @@ public function getArticleSimilarsQueryBuilder($articleId)
     /**
      * @param int $articleId
      *
-     * @return Query
+     * @return Query<Product>
      */
     public function getArticleRelatedProductStreamsQuery($articleId)
     {
@@ -206,7 +206,7 @@ public function getArticleRelatedProductStreamsQueryBuilder($articleId)
      *
      * @param int $articleId
      *
-     * @return Query
+     * @return Query<Product>
      */
     public function getArticleRelatedQuery($articleId)
     {
@@ -245,7 +245,7 @@ public function getArticleRelatedQueryBuilder($articleId)
      *
      * @param int $articleId
      *
-     * @return Query
+     * @return Query<Product>
      */
     public function getArticleWithImagesQuery($articleId)
     {
@@ -288,7 +288,7 @@ public function getArticleWithImagesQueryBuilder($articleId)
      *
      * @param int $articleId
      *
-     * @return Query
+     * @return Query<Product>
      */
     public function getArticleLinksQuery($articleId)
     {
@@ -327,7 +327,7 @@ public function getArticleLinksQueryBuilder($articleId)
      *
      * @param int $articleId
      *
-     * @return Query
+     * @return Query<Product>
      */
     public function getArticleDownloadsQuery($articleId)
     {
@@ -366,7 +366,7 @@ public function getArticleDownloadsQueryBuilder($articleId)
      *
      * @param int $articleId
      *
-     * @return Query
+     * @return Query<Product>
      */
     public function getArticleCustomerGroupsQuery($articleId)
     {
@@ -404,7 +404,7 @@ public function getArticleCustomerGroupsQueryBuilder($articleId)
      *
      * @param int $articleId
      *
-     * @return Query
+     * @return Query<Product>
      */
     public function getArticleConfiguratorSetQuery($articleId)
     {
@@ -447,7 +447,7 @@ public function getArticleConfiguratorSetQueryBuilder($articleId)
      *
      * @param int $articleId
      *
-     * @return Query
+     * @return Query<Product>
      */
     public function getArticleQuery($articleId)
     {
@@ -520,7 +520,7 @@ public function getArticleQueryBuilder($articleId)
      * @param int   $articleId
      * @param array $options
      *
-     * @return Query
+     * @return Query<Detail>
      */
     public function getDetailsForOptionIdsQuery($articleId, $options)
     {
@@ -568,7 +568,7 @@ public function getDetailsForOptionIdsQueryBuilder($articleId, $options)
      *
      * @param int $imageId
      *
-     * @return Query
+     * @return Query<Image>
      */
     public function getArticleImageDataQuery($imageId)
     {
@@ -600,7 +600,7 @@ public function getArticleImageDataQueryBuilder($imageId)
      *
      * @param int $imageId
      *
-     * @return Query
+     * @return Query<Image>
      */
     public function getDeleteImageChildrenQuery($imageId)
     {
@@ -631,7 +631,7 @@ public function getDeleteImageChildrenQueryBuilder($imageId)
      *
      * @param int $imageId
      *
-     * @return Query
+     * @return Query<Image>
      */
     public function getArticleImageQuery($imageId)
     {
@@ -667,7 +667,7 @@ public function getArticleImageQueryBuilder($imageId)
      *
      * @param int $articleId
      *
-     * @return Query
+     * @return Query<Product>
      */
     public function getArticleConfiguratorSetByArticleIdQuery($articleId)
     {
@@ -705,7 +705,7 @@ public function getArticleConfiguratorSetByArticleIdQueryBuilder($articleId)
      *
      * @param int $articleId
      *
-     * @return Query
+     * @return Query<Product>
      */
     public function getArticleConfiguratorSetByArticleIdIndexedByIdsQuery($articleId)
     {
@@ -745,7 +745,7 @@ public function getArticleConfiguratorSetByArticleIdIndexedByIdsQueryBuilder($ar
      * @param int $articleId
      * @param int $optionId
      *
-     * @return Query
+     * @return Query<Detail>
      */
     public function getArticleDetailByConfiguratorOptionIdQuery($articleId, $optionId)
     {
@@ -791,7 +791,7 @@ public function getArticleDetailByConfiguratorOptionIdQueryBuilder($articleId, $
      *
      * @param int[] $optionsIds
      *
-     * @return Query
+     * @return Query<ConfiguratorGroup>
      */
     public function getConfiguratorGroupsAndOptionsByOptionsIdsIndexedByOptionIdsQuery($optionsIds)
     {
@@ -826,10 +826,10 @@ public function getConfiguratorGroupsAndOptionsByOptionsIdsIndexedByOptionIdsQue
      * @param int     $articleId
      * @param int     $firstOptionId
      * @param int     $secondOptionId
-     * @param Article $article
+     * @param Product $article
      * @param string  $customerGroupKey
      *
-     * @return Query
+     * @return Query<Detail>
      */
     public function getArticleDetailForTableConfiguratorOptionCombinationQuery(
         $articleId,
@@ -856,7 +856,7 @@ public function getArticleDetailForTableConfiguratorOptionCombinationQuery(
      * @param int           $articleId
      * @param int           $firstOptionId
      * @param int           $secondOptionId
-     * @param array|Article $article
+     * @param array|Product $article
      * @param string        $customerGroupKey
      *
      * @return QueryBuilder
@@ -887,7 +887,7 @@ public function getArticleDetailForTableConfiguratorOptionCombinationQueryBuilde
                 ->setParameter(2, $firstOptionId)
                 ->setParameter(3, $secondOptionId);
 
-        if ($article instanceof Article && $article->getLastStock()) {
+        if ($article instanceof Product && $article->getLastStock()) {
             $builder->andWhere('details.inStock > 0');
         } elseif (\is_array($article) && $article['lastStock']) {
             $builder->andWhere('details.inStock > 0');
@@ -901,7 +901,7 @@ public function getArticleDetailForTableConfiguratorOptionCombinationQueryBuilde
      *
      * @param int $articleId
      *
-     * @return Query
+     * @return Query<Product>
      */
     public function getArticleWithVariantsAndOptionsQuery($articleId)
     {
@@ -935,9 +935,9 @@ public function getArticleWithVariantsAndOptionsQueryBuilder($articleId)
      *
      * @param int           $articleId
      * @param string        $customerGroupKey
-     * @param array|Article $article
+     * @param array|Product $article
      *
-     * @return Query
+     * @return Query<Detail>
      */
     public function getConfiguratorTablePreSelectionItemQuery($articleId, $customerGroupKey, $article)
     {
@@ -952,7 +952,7 @@ public function getConfiguratorTablePreSelectionItemQuery($articleId, $customerG
      *
      * @param int           $articleId
      * @param string        $customerGroupKey
-     * @param array|Article $article
+     * @param array|Product $article
      *
      * @return QueryBuilder
      */
@@ -972,7 +972,7 @@ public function getConfiguratorTablePreSelectionItemQueryBuilder($articleId, $cu
                 ->setParameter('key', $customerGroupKey)
                 ->setParameter(1, $articleId);
 
-        if ($article instanceof Article && $article->getLastStock()) {
+        if ($article instanceof Product && $article->getLastStock()) {
             $builder->andWhere('details.inStock > 0');
         } elseif (\is_array($article) && $article['lastStock']) {
             $builder->andWhere('details.inStock > 0');
@@ -986,7 +986,7 @@ public function getConfiguratorTablePreSelectionItemQueryBuilder($articleId, $cu
      *
      * @param int[] $ids
      *
-     * @return Query
+     * @return Query<ConfiguratorSet>
      */
     public function getConfiguratorSetsWithExcludedIdsQuery($ids)
     {
@@ -1032,7 +1032,7 @@ public function getConfiguratorSetsWithExcludedIdsQueryBuilder($ids)
      *
      * @param int $configuratorSetId
      *
-     * @return Query
+     * @return Query<ConfiguratorSet>
      */
     public function getConfiguratorSetQuery($configuratorSetId)
     {
@@ -1069,7 +1069,7 @@ public function getConfiguratorSetQueryBuilder($configuratorSetId)
      *
      * @param int $configuratorSetId
      *
-     * @return Query
+     * @return Query<ConfiguratorDependency>
      */
     public function getConfiguratorDependenciesQuery($configuratorSetId)
     {
@@ -1103,7 +1103,7 @@ public function getConfiguratorDependenciesQueryBuilder($configuratorSetId)
      *
      * @param int $configuratorSetId
      *
-     * @return Query
+     * @return Query<ConfiguratorDependency>
      */
     public function getConfiguratorDependenciesIndexedByParentIdQuery($configuratorSetId)
     {
@@ -1138,7 +1138,7 @@ public function getConfiguratorDependenciesIndexedByParentIdQueryBuilder($config
      *
      * @param int $configuratorSetId
      *
-     * @return Query
+     * @return Query<ConfiguratorPriceVariation>
      */
     public function getConfiguratorPriceVariationsQuery($configuratorSetId)
     {
@@ -1195,7 +1195,7 @@ public function getArticleConfiguratorSetOptionIds($articleId)
      * Returns an instance of the \Doctrine\ORM\Query object which selects all defined configurator groups.
      * Used for the backend module to display all groups for the article, even the inactive groups.
      *
-     * @return Query
+     * @return Query<ConfiguratorGroup>
      */
     public function getConfiguratorGroupsQuery()
     {
@@ -1225,7 +1225,7 @@ public function getConfiguratorGroupsQueryBuilder()
      *
      * @param int $articleId
      *
-     * @return Query
+     * @return Query<Detail>
      */
     public function getFirstArticleDetailWithKindTwoQuery($articleId)
     {
@@ -1261,7 +1261,7 @@ public function getFirstArticleDetailWithKindTwoQueryBuilder($articleId)
      *
      * @param array|null $filter
      *
-     * @return Query
+     * @return Query<ConfiguratorOption>
      */
     public function getAllConfiguratorOptionsIndexedByIdQuery($filter = null)
     {
@@ -1297,7 +1297,7 @@ public function getAllConfiguratorOptionsIndexedByIdQueryBuilder()
      *
      * @param int $articleId
      *
-     * @return Query
+     * @return Query<Detail>
      */
     public function getConfiguratorListIdsQuery($articleId, $filter = null, $sort = null, $offset = null, $limit = null)
     {
@@ -1352,7 +1352,7 @@ public function getConfiguratorListIdsQueryBuilder($articleId, $filter = null, $
      *
      * @param int[] $ids
      *
-     * @return Query
+     * @return Query<Detail>
      */
     public function getDetailsByIdsQuery($ids, $sort = null)
     {
@@ -1396,7 +1396,7 @@ public function getDetailsByIdsQueryBuilder($ids, $sort = null)
      * Returns a list of all defined price groups. Used for the article
      * detail page in the backend module to assign the article to a price group.
      *
-     * @return Query
+     * @return Query<PriceGroup>
      */
     public function getPriceGroupQuery()
     {
@@ -1424,7 +1424,7 @@ public function getPriceGroupQueryBuilder()
      * Returns an instance of \Doctrine\ORM\Query object which selects a list of
      * all defined taxes. Used for the tax combo box on the article detail page in the article backend module.
      *
-     * @return Query
+     * @return Query<Tax>
      */
     public function getTaxesQuery()
     {
@@ -1452,7 +1452,7 @@ public function getTaxesQueryBuilder()
      * Returns an instance of \Doctrine\ORM\Query object which selects a list of
      * all defined pack units. Used for the unit combo box on the article detail page in the article backend module.
      *
-     * @return Query
+     * @return Query<Unit>
      */
     public function getUnitsQuery()
     {
@@ -1479,7 +1479,7 @@ public function getUnitsQueryBuilder()
      * Returns an instance of \Doctrine\ORM\Query object which selects a list of
      * all article property groups. Used for the property combo box on the article detail page in the article backend module.
      *
-     * @return Query
+     * @return Query<PropertyGroup>
      */
     public function getPropertiesQuery()
     {
@@ -1508,7 +1508,7 @@ public function getPropertiesQueryBuilder()
      *
      * @param int $articleId
      *
-     * @return Query
+     * @return Query<Template>
      */
     public function getConfiguratorTemplateByArticleIdQuery($articleId)
     {
@@ -1550,7 +1550,7 @@ public function getConfiguratorTemplateByArticleIdQueryBuilder($articleId)
      *
      * @param int $articleDetailId
      *
-     * @return Query
+     * @return Query<Price>
      */
     public function getPricesQuery($articleDetailId)
     {
@@ -1586,7 +1586,7 @@ public function getPricesQueryBuilder($articleDetailId)
      *
      * @param int $imageId
      *
-     * @return Query
+     * @return Query<ProductImageAttribute>
      */
     public function getImageAttributesQuery($imageId)
     {
@@ -1620,7 +1620,7 @@ public function getImageAttributesQueryBuilder($imageId)
      *
      * @param int $linkId
      *
-     * @return Query
+     * @return Query<ProductLinkAttribute>
      */
     public function getLinkAttributesQuery($linkId)
     {
@@ -1652,7 +1652,7 @@ public function getLinkAttributesQueryBuilder($linkId)
      *
      * @param int $downloadId
      *
-     * @return Query
+     * @return Query<ProductDownloadAttribute>
      */
     public function getDownloadAttributesQuery($downloadId)
     {
@@ -1684,7 +1684,7 @@ public function getDownloadAttributesQueryBuilder($downloadId)
      *
      * @param int $articleDetailId
      *
-     * @return Query
+     * @return Query<ProductAttribute>
      */
     public function getAttributesQuery($articleDetailId)
     {
@@ -1716,7 +1716,7 @@ public function getAttributesQueryBuilder($articleDetailId)
      *
      * @param int $priceId
      *
-     * @return Query
+     * @return Query<ProductPriceAttribute>
      */
     public function getPriceAttributesQuery($priceId)
     {
@@ -1749,7 +1749,7 @@ public function getPriceAttributesQueryBuilder($priceId)
      * @param string $number
      * @param int    $articleDetailId
      *
-     * @return Query
+     * @return Query<Detail>
      */
     public function getValidateNumberQuery($number, $articleDetailId)
     {
@@ -1786,7 +1786,7 @@ public function getValidateNumberQueryBuilder($number, $articleDetailId)
      * @param int|null   $offset
      * @param int|null   $limit
      *
-     * @return Query
+     * @return Query<Product>
      */
     public function getArticlesWithExcludedIdsQuery($ids = null, $filter = null, $offset = null, $limit = null)
     {
@@ -1843,7 +1843,7 @@ public function getArticlesWithExcludedIdsQueryBuilder($ids = null, $filter = nu
      *
      * @param int $supplierId
      *
-     * @return Query
+     * @return Query<Supplier>
      */
     public function getSupplierQuery($supplierId)
     {
@@ -1874,7 +1874,7 @@ public function getSupplierQueryBuilder($supplierId)
      * Returns a list of all defined article suppliers as array, ordered by the supplier name.
      * Used for the article detail page in the backend module.
      *
-     * @return Query
+     * @return Query<Supplier>
      */
     public function getSuppliersQuery()
     {
@@ -1905,7 +1905,7 @@ public function getSuppliersQueryBuilder()
      * @param int|null   $offset
      * @param int|null   $limit
      *
-     * @return Query
+     * @return Query<Supplier>
      */
     public function getSuppliersWithExcludedIdsQuery($ids = null, $filter = null, $offset = null, $limit = null)
     {
@@ -1956,7 +1956,7 @@ public function getSuppliersWithExcludedIdsQueryBuilder($ids = null, $filter = n
      * @param int|null $limit
      * @param int|null $offset
      *
-     * @return Query
+     * @return Query<Supplier>
      */
     public function getSupplierListQuery($filter, array $orderBy, $limit = null, $offset = null)
     {
@@ -1994,13 +1994,13 @@ public function getSupplierListQueryBuilder($filter, array $orderBy)
         $builder->leftJoin('supplier.articles', 'articles');
         $builder->groupBy('supplier.id');
 
-        if (\is_array($filter) && ($filter[0]['property'] === 'name')) {
-            //filter the displayed columns with the passed filter
+        if (\is_array($filter) && \array_key_exists(0, $filter) && ($filter[0]['property'] === 'name')) {
+            // filter the displayed columns with the passed filter
             $builder
-                ->where('supplier.name LIKE ?1') //Search only the beginning of the customer number.
-                ->orWhere('supplier.description LIKE ?1'); //Full text search for the first name of the customer
+                ->where('supplier.name LIKE ?1') // Search only the beginning of the customer number.
+                ->orWhere('supplier.description LIKE ?1'); // Full text search for the first name of the customer
 
-            //set the filter parameter for the different columns.
+            // set the filter parameter for the different columns.
             $builder->setParameter(1, '%' . $filter[0]['value'] . '%');
         }
 
@@ -2017,7 +2017,7 @@ public function getSupplierListQueryBuilder($filter, array $orderBy)
      * @param int|null    $limit
      * @param array|null  $order
      *
-     * @return Query
+     * @return Query<Vote>
      */
     public function getVoteListQuery($filter = null, $offset = null, $limit = null, $order = null)
     {
@@ -2077,7 +2077,7 @@ public function getVoteListQueryBuilder($filter, $order)
      * @param int|null  $limit
      * @param bool|null $summarize
      *
-     * @return Query
+     * @return Query<Notification>
      */
     public function getArticlesWithRegisteredNotificationsQuery(
         $filter = null,
@@ -2087,7 +2087,7 @@ public function getArticlesWithRegisteredNotificationsQuery(
         $summarize = null
     ) {
         $builder = $this->getArticlesWithRegisteredNotificationsBuilder($filter, $order, $summarize);
-        if (empty($summarize) && !empty($limit) && !empty($offset)) {
+        if (empty($summarize) && !empty($limit) && $offset !== null) {
             $builder->setFirstResult($offset)
                 ->setMaxResults($limit);
         }
@@ -2141,6 +2141,19 @@ public function getArticlesWithRegisteredNotificationsBuilder($filter, $order, $
         return $builder;
     }
 
+    /**
+     * @return Query<Notification>
+     */
+    public function getProductsWithNotificationsCountQuery(): Query
+    {
+        $builder = $this->getEntityManager()->createQueryBuilder();
+        $builder->select('COUNT(DISTINCT notification.articleNumber)');
+
+        $builder->from(Notification::class, 'notification');
+
+        return $builder->getQuery();
+    }
+
     /**
      * Returns an instance of the \Doctrine\ORM\Query object which selects all notification customers by the given articleOrderNumber
      *
@@ -2152,12 +2165,12 @@ public function getArticlesWithRegisteredNotificationsBuilder($filter, $order, $
      *
      * @internal param $articleOrderNumber
      *
-     * @return Query
+     * @return Query<Notification>
      */
     public function getNotificationCustomerByArticleQuery($articleOrderNumber, $filter, $offset, $limit, $order)
     {
         $builder = $this->getNotificationCustomerByArticleBuilder($articleOrderNumber, $filter, $order);
-        if (!empty($limit) && !empty($offset)) {
+        if (!empty($limit) && $offset !== null) {
             $builder->setFirstResult($offset)
                     ->setMaxResults($limit);
         }
@@ -2229,7 +2242,7 @@ public function getNotificationCustomerByArticleBuilder($articleOrderNumber, $fi
      * @param int   $limit
      * @param array $order
      *
-     * @return Query
+     * @return Query<Esd>
      */
     public function getEsdByArticleQuery($articleId, $filter, $offset, $limit, $order)
     {
@@ -2307,7 +2320,7 @@ public function getEsdByArticleQueryBuilder($articleId, $filter, $order)
      * @param int   $limit
      * @param array $order
      *
-     * @return Query
+     * @return Query<EsdSerial>
      */
     public function getSerialsByEsdQuery($esdId, $filter, $offset, $limit, $order)
     {
@@ -2371,7 +2384,7 @@ public function getSerialsByEsdQueryBuilder($esdId, $filter, $order)
      *
      * @param int $esdId
      *
-     * @return Query
+     * @return Query<Esd>
      */
     public function getFreeSerialsCountByEsdQuery($esdId)
     {
@@ -2405,7 +2418,7 @@ public function getFreeSerialsCountByEsdQueryBuilder($esdId)
      *
      * @param int $esdId
      *
-     * @return Query
+     * @return Query<EsdSerial>
      */
     public function getUnusedSerialsByEsdQuery($esdId)
     {
@@ -2439,7 +2452,7 @@ public function getUnusedSerialsByEsdQueryBuilder($esdId)
      *
      * @param int $articleId
      *
-     * @return Query
+     * @return Query<Image>
      */
     public function getArticleCoverImageQuery($articleId)
     {
@@ -2482,7 +2495,7 @@ public function getArticleCoverImageQueryBuilder($articleId)
      *
      * @internal param $article
      *
-     * @return Query
+     * @return Query<Image>
      */
     public function getArticleFallbackCoverQuery($articleId)
     {
@@ -2525,7 +2538,7 @@ public function getArticleFallbackCoverQueryBuilder($articleId)
      * @param int    $offset
      * @param int    $limit
      *
-     * @return Query
+     * @return Query<Image>
      */
     public function getVariantImagesByArticleNumberQuery($number, $offset = null, $limit = null)
     {
@@ -2586,7 +2599,7 @@ public function getVariantImagesByArticleNumberQueryBuilder($number)
      *
      * @param int $articleId
      *
-     * @return Query
+     * @return Query<Image>
      */
     public function getArticleImagesQuery($articleId)
     {
@@ -2625,7 +2638,7 @@ public function getArticleImagesQueryBuilder($articleId)
      *
      * @param int $articleId
      *
-     * @return Query
+     * @return Query<Price>
      */
     public function getRemovePricesQuery($articleId)
     {
@@ -2657,7 +2670,7 @@ public function getRemovePricesQueryBuilder($articleId)
      *
      * @param int $articleDetailId
      *
-     * @return Query
+     * @return Query<ProductAttribute>
      */
     public function getRemoveAttributesQuery($articleDetailId)
     {
@@ -2688,7 +2701,7 @@ public function getRemoveAttributesQueryBuilder($articleDetailId)
      *
      * @param int $articleId
      *
-     * @return Query
+     * @return Query<Esd>
      */
     public function getRemoveESDQuery($articleId)
     {
@@ -2720,7 +2733,7 @@ public function getRemoveESDQueryBuilder($articleId)
      *
      * @param int $articleId
      *
-     * @return Query
+     * @return Query<Translation>
      */
     public function getRemoveArticleTranslationsQuery($articleId)
     {
@@ -2753,7 +2766,7 @@ public function getRemoveArticleTranslationsQueryBuilder($articleId)
      *
      * @param int $detailId
      *
-     * @return Query
+     * @return Query<Translation>
      */
     public function getRemoveVariantTranslationsQuery($detailId)
     {
@@ -2786,7 +2799,7 @@ public function getRemoveVariantTranslationsQueryBuilder($detailId)
      *
      * @param int $detailId
      *
-     * @return Query
+     * @return Query<Image>
      */
     public function getRemoveImageQuery($detailId)
     {
@@ -2817,7 +2830,7 @@ public function getRemoveImageQueryBuilder($detailId)
      *
      * @param int $detailId
      *
-     * @return Query
+     * @return Query<Detail>
      */
     public function getRemoveDetailQuery($detailId)
     {
diff --git a/engine/Shopware/Models/Article/SeoCategory.php b/engine/Shopware/Models/Article/SeoCategory.php
index 58af085b4d8..e2290062884 100644
--- a/engine/Shopware/Models/Article/SeoCategory.php
+++ b/engine/Shopware/Models/Article/SeoCategory.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Article;
diff --git a/engine/Shopware/Models/Article/Supplier.php b/engine/Shopware/Models/Article/Supplier.php
index 28d922b3142..6021c09f807 100644
--- a/engine/Shopware/Models/Article/Supplier.php
+++ b/engine/Shopware/Models/Article/Supplier.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Article;
@@ -75,7 +75,7 @@ class Supplier extends ModelEntity
      *
      * @var string|null
      *
-     * @ORM\Column(name="meta_keywords", type="string", nullable=true)
+     * @ORM\Column(name="meta_keywords", type="text", nullable=true)
      */
     protected $metaKeywords;
 
@@ -83,7 +83,7 @@ class Supplier extends ModelEntity
      * INVERSE SIDE
      * Articles can be bound to a specific supplier
      *
-     * @var ArrayCollection<\Shopware\Models\Article\Article>
+     * @var ArrayCollection<Article>
      *
      * @ORM\OneToMany(targetEntity="Shopware\Models\Article\Article", mappedBy="supplier", fetch="EXTRA_LAZY")
      * @ORM\JoinColumn(name="id", referencedColumnName="supplierID")
@@ -278,7 +278,7 @@ public function setDescription($description)
     /**
      * Returns all articles assigned to this supplier
      *
-     * @return ArrayCollection<\Shopware\Models\Article\Article>
+     * @return ArrayCollection<Article>
      */
     public function getArticles()
     {
@@ -288,7 +288,7 @@ public function getArticles()
     /**
      * Takes an array of articles, in most cases doctrine will take care of this.
      *
-     * @param ArrayCollection<\Shopware\Models\Article\Article> $articles
+     * @param ArrayCollection<Article> $articles
      *
      * @return Supplier
      */
diff --git a/engine/Shopware/Models/Article/SupplierRepository.php b/engine/Shopware/Models/Article/SupplierRepository.php
index 8697c59d61d..abaaef2b435 100644
--- a/engine/Shopware/Models/Article/SupplierRepository.php
+++ b/engine/Shopware/Models/Article/SupplierRepository.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Article;
@@ -42,7 +42,7 @@ class SupplierRepository extends ModelRepository
      * @param int|null $offset
      * @param int|null $limit
      *
-     * @return Query
+     * @return Query<Supplier>
      */
     public function getFriendlyUrlSuppliersQuery($offset = null, $limit = null)
     {
@@ -93,7 +93,7 @@ public function getFriendlyUrlSuppliersCountQueryBuilder()
      *
      * @param int $manufacturerId
      *
-     * @return Query
+     * @return Query<Supplier>
      */
     public function getDetailQuery($manufacturerId)
     {
@@ -127,7 +127,7 @@ public function getDetailQueryBuilder($manufacturerId)
     /**
      * Returns the \Doctrine\ORM\Query to select all manufacturers for example for the backend tree
      *
-     * @return Query
+     * @return Query<Supplier>
      */
     public function getListQuery(array $filterBy, array $orderBy, $limit = null, $offset = null)
     {
diff --git a/engine/Shopware/Models/Article/Unit.php b/engine/Shopware/Models/Article/Unit.php
index b953a1d4f58..7378169c817 100644
--- a/engine/Shopware/Models/Article/Unit.php
+++ b/engine/Shopware/Models/Article/Unit.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Article;
@@ -37,7 +37,7 @@ class Unit extends ModelEntity
     /**
      * INVERSE SIDE
      *
-     * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Article\Detail>
+     * @var ArrayCollection<Detail>
      *
      * @ORM\OneToMany(targetEntity="Shopware\Models\Article\Detail", mappedBy="unit")
      */
@@ -120,7 +120,7 @@ public function getName()
     }
 
     /**
-     * @return \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Article\Detail>
+     * @return ArrayCollection<Detail>
      */
     public function getArticles()
     {
@@ -128,7 +128,7 @@ public function getArticles()
     }
 
     /**
-     * @param \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Article\Detail>|null $articles
+     * @param ArrayCollection<Detail>|null $articles
      */
     public function setArticles($articles)
     {
diff --git a/engine/Shopware/Models/Article/Vote.php b/engine/Shopware/Models/Article/Vote.php
index a63a4de49dd..8fba893b440 100644
--- a/engine/Shopware/Models/Article/Vote.php
+++ b/engine/Shopware/Models/Article/Vote.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Article;
diff --git a/engine/Shopware/Models/Attribute/Configuration.php b/engine/Shopware/Models/Attribute/Configuration.php
index c9a9273c585..8abaaa9a040 100644
--- a/engine/Shopware/Models/Attribute/Configuration.php
+++ b/engine/Shopware/Models/Attribute/Configuration.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Attribute;
@@ -88,6 +88,7 @@ class Configuration extends ModelEntity
 
     /**
      * @var bool
+     *
      * @ORM\Column(name="readonly", type="boolean", nullable=false)
      */
     private $readonly = false;
@@ -139,7 +140,7 @@ class Configuration extends ModelEntity
      *
      * @ORM\Column(name="array_store", type="text", nullable=true)
      */
-    private $arrayStore = null;
+    private $arrayStore;
 
     /**
      * @return int
diff --git a/engine/Shopware/Models/Banner/Banner.php b/engine/Shopware/Models/Banner/Banner.php
index d9442a9f3d0..e72cc6625f2 100644
--- a/engine/Shopware/Models/Banner/Banner.php
+++ b/engine/Shopware/Models/Banner/Banner.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Banner;
diff --git a/engine/Shopware/Models/Banner/Repository.php b/engine/Shopware/Models/Banner/Repository.php
index dfd5fe00d5c..905a0583251 100644
--- a/engine/Shopware/Models/Banner/Repository.php
+++ b/engine/Shopware/Models/Banner/Repository.php
@@ -1,32 +1,34 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Banner;
 
 use DateTime;
 use Doctrine\DBAL\Connection;
+use Doctrine\ORM\Query;
 use Shopware\Components\Model\ModelRepository;
+use Shopware\Components\Model\QueryBuilder;
 
 /**
  * Repository for the banner model (Shopware\Models\Banner\Banner).
@@ -43,7 +45,7 @@ class Repository extends ModelRepository
      *
      * @param int|null $filter
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Banner>
      */
     public function getBanners($filter = null)
     {
@@ -60,6 +62,8 @@ public function getBanners($filter = null)
      * @param int|null $filter    Category ID
      * @param int      $limit     Limit
      * @param bool     $randomize
+     *
+     * @return Query<Banner>|null
      */
     public function getAllActiveBanners($filter = null, $limit = 0, $randomize = false)
     {
@@ -76,7 +80,7 @@ public function getAllActiveBanners($filter = null, $limit = 0, $randomize = fal
 
         $ids = $this->getBannerIds($filter, $limit);
         if (!\count($ids)) {
-            return false;
+            return null;
         }
 
         $builder->andWhere('banner.id IN (?7)')
@@ -92,7 +96,7 @@ public function getAllActiveBanners($filter = null, $limit = 0, $randomize = fal
      *
      * @param int|null $filter
      *
-     * @return \Shopware\Components\Model\QueryBuilder
+     * @return QueryBuilder
      */
     public function getBannerMainQuery($filter = null)
     {
diff --git a/engine/Shopware/Models/Benchmark/BenchmarkConfig.php b/engine/Shopware/Models/Benchmark/BenchmarkConfig.php
deleted file mode 100644
index 5c356e45fdc..00000000000
--- a/engine/Shopware/Models/Benchmark/BenchmarkConfig.php
+++ /dev/null
@@ -1,438 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Models\Benchmark;
-
-use DateTime;
-use DateTimeInterface;
-use DateTimeZone;
-use Doctrine\ORM\Mapping as ORM;
-use Shopware\Components\Model\ModelEntity;
-
-/**
- * @ORM\Table(name="s_benchmark_config")
- * @ORM\Entity(repositoryClass="Repository")
- * @ORM\HasLifecycleCallbacks()
- */
-class BenchmarkConfig extends ModelEntity
-{
-    /**
-     * Primary Key
-     *
-     * @var string
-     *
-     * @ORM\Id()
-     * @ORM\Column(name="id", type="guid", nullable=false)
-     */
-    private $id;
-
-    /**
-     * The shop id for this config
-     *
-     * @var int
-     *
-     * @ORM\Column(name="shop_id", type="integer", nullable=false)
-     */
-    private $shopId;
-
-    /**
-     * Defines the date and time when the statistics were sent the last time
-     *
-     * @var DateTimeInterface
-     *
-     * @ORM\Column(name="last_sent", type="datetime", nullable=false)
-     */
-    private $lastSent;
-
-    /**
-     * Defines the date and time when the last statistics where retrieved from the server
-     *
-     * @var DateTimeInterface
-     *
-     * @ORM\Column(name="last_received", type="datetime", nullable=false)
-     */
-    private $lastReceived;
-
-    /**
-     * The id of the last order that was sent to the server
-     *
-     * @var int
-     *
-     * @ORM\Column(name="last_order_id", type="integer", nullable=false)
-     */
-    private $lastOrderId;
-
-    /**
-     * The id of the last customer that was sent to the server
-     *
-     * @var int
-     *
-     * @ORM\Column(name="last_customer_id", type="integer", nullable=false)
-     */
-    private $lastCustomerId;
-
-    /**
-     * The id of the last product that was sent to the server
-     *
-     * @var int
-     *
-     * @ORM\Column(name="last_product_id", type="integer", nullable=false)
-     */
-    private $lastProductId;
-
-    /**
-     * The id of the last analytics that was sent to the server
-     *
-     * @var int
-     *
-     * @ORM\Column(name="last_analytics_id", type="integer", nullable=false)
-     */
-    private $lastAnalyticsId;
-
-    /**
-     * The most recent date to figure out which orders have been updated since they have last been transmitted
-     *
-     * @var DateTimeInterface|null
-     *
-     * @ORM\Column(name="last_updated_orders_date", type="datetime", nullable=true)
-     */
-    private $lastUpdatedOrdersDate;
-
-    /**
-     * The batch size in which entities are to be transmitted
-     *
-     * @var int
-     *
-     * @ORM\Column(name="batch_size", type="integer", nullable=false)
-     */
-    private $batchSize;
-
-    /**
-     * The industry the shop is in
-     *
-     * @var int
-     *
-     * @ORM\Column(name="industry", type="integer", nullable=false)
-     */
-    private $industry;
-
-    /**
-     * The shop type, e.g. "b2b" or "b2c"
-     *
-     * @var string
-     *
-     * @ORM\Column(name="type", type="string", nullable=false)
-     */
-    private $type;
-
-    /**
-     * The latest token provided by the server
-     *
-     * @var string|null
-     *
-     * @ORM\Column(name="response_token", type="string", length=200, nullable=true)
-     */
-    private $token;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="cached_template", type="text", nullable=false)
-     */
-    private $cachedTemplate;
-
-    /**
-     * Flag which defines if the service is active at all
-     *
-     * @var bool
-     *
-     * @ORM\Column(name="active", type="boolean", nullable=false)
-     */
-    private $active;
-
-    /**
-     * Flag which defines if the current shop is locked for transmitting data.
-     *
-     * @var DateTimeInterface|null
-     *
-     * @ORM\Column(name="locked", type="datetime", nullable=true)
-     */
-    private $locked;
-
-    /**
-     * @param string $id
-     */
-    public function __construct($id)
-    {
-        $this->id = $id;
-
-        // Default values
-        $this->lastReceived = new DateTime('1970-01-01 00:00:00', new DateTimeZone('UTC'));
-        $this->lastSent = new DateTime('1970-01-01 00:00:00', new DateTimeZone('UTC'));
-        $this->lastOrderId = 0;
-        $this->lastCustomerId = 0;
-        $this->lastProductId = 0;
-        $this->lastAnalyticsId = 0;
-        $this->batchSize = 1000;
-        $this->active = false;
-    }
-
-    /**
-     * @return int
-     */
-    public function getShopId()
-    {
-        return $this->shopId;
-    }
-
-    /**
-     * @param int $shopId
-     */
-    public function setShopId($shopId)
-    {
-        $this->shopId = $shopId;
-    }
-
-    /**
-     * @return DateTimeInterface
-     */
-    public function getLastSent()
-    {
-        return $this->lastSent;
-    }
-
-    public function setLastSent(DateTimeInterface $lastSent)
-    {
-        $this->lastSent = $lastSent;
-    }
-
-    /**
-     * @return DateTimeInterface
-     */
-    public function getLastReceived()
-    {
-        return $this->lastReceived;
-    }
-
-    public function setLastReceived(DateTimeInterface $lastReceived)
-    {
-        $this->lastReceived = $lastReceived;
-    }
-
-    /**
-     * @return int
-     */
-    public function getLastOrderId()
-    {
-        return (int) $this->lastOrderId;
-    }
-
-    /**
-     * @param int $lastOrderId
-     */
-    public function setLastOrderId($lastOrderId)
-    {
-        $this->lastOrderId = (int) $lastOrderId;
-    }
-
-    /**
-     * @return int
-     */
-    public function getLastCustomerId()
-    {
-        return (int) $this->lastCustomerId;
-    }
-
-    /**
-     * @param int $lastCustomerId
-     */
-    public function setLastCustomerId($lastCustomerId)
-    {
-        $this->lastCustomerId = (int) $lastCustomerId;
-    }
-
-    /**
-     * @return int
-     */
-    public function getLastProductId()
-    {
-        return (int) $this->lastProductId;
-    }
-
-    /**
-     * @param int $lastProductId
-     */
-    public function setLastProductId($lastProductId)
-    {
-        $this->lastProductId = (int) $lastProductId;
-    }
-
-    /**
-     * @return int
-     */
-    public function getLastAnalyticsId()
-    {
-        return (int) $this->lastAnalyticsId;
-    }
-
-    /**
-     * @param int $lastAnalyticsId
-     */
-    public function setLastAnalyticsId($lastAnalyticsId)
-    {
-        $this->lastAnalyticsId = (int) $lastAnalyticsId;
-    }
-
-    /**#
-     * @return \DateTimeInterface|null
-     */
-    public function getLastUpdatedOrdersDate()
-    {
-        return $this->lastUpdatedOrdersDate;
-    }
-
-    public function setLastUpdatedOrdersDate(DateTimeInterface $lastUpdatedOrdersDate = null)
-    {
-        $this->lastUpdatedOrdersDate = $lastUpdatedOrdersDate;
-    }
-
-    /**
-     * @return int
-     */
-    public function getBatchSize()
-    {
-        return $this->batchSize;
-    }
-
-    /**
-     * @param int $batchSize
-     */
-    public function setBatchSize($batchSize)
-    {
-        $this->batchSize = (int) $batchSize;
-    }
-
-    /**
-     * @return int
-     */
-    public function getIndustry()
-    {
-        return $this->industry;
-    }
-
-    /**
-     * @param int $industry
-     */
-    public function setIndustry($industry)
-    {
-        $this->industry = (int) $industry;
-    }
-
-    /**
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * @param string $type
-     */
-    public function setType($type)
-    {
-        $this->type = $type;
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getToken()
-    {
-        return $this->token;
-    }
-
-    /**
-     * @param string|null $token
-     */
-    public function setToken($token)
-    {
-        $this->token = $token;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCachedTemplate()
-    {
-        return $this->cachedTemplate;
-    }
-
-    /**
-     * @param string $cachedTemplate
-     */
-    public function setCachedTemplate($cachedTemplate)
-    {
-        $this->cachedTemplate = $cachedTemplate;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isActive()
-    {
-        return $this->active;
-    }
-
-    /**
-     * @param bool $active
-     */
-    public function setActive($active)
-    {
-        $this->active = (bool) $active;
-    }
-
-    /**
-     * @return DateTimeInterface|null
-     */
-    public function getLocked()
-    {
-        return $this->locked;
-    }
-
-    public function setLocked(DateTimeInterface $locked = null)
-    {
-        $this->locked = $locked;
-    }
-
-    /**
-     * Returns the uuid.
-     *
-     * @return string
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-}
diff --git a/engine/Shopware/Models/Benchmark/Repository.php b/engine/Shopware/Models/Benchmark/Repository.php
deleted file mode 100644
index 2ef96dbd26c..00000000000
--- a/engine/Shopware/Models/Benchmark/Repository.php
+++ /dev/null
@@ -1,327 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Models\Benchmark;
-
-use DateTime;
-use DateTimeZone;
-use PDO;
-use Ramsey\Uuid\Uuid;
-use Shopware\Components\Model\ModelRepository;
-
-/**
- * @extends ModelRepository<BenchmarkConfig>
- */
-class Repository extends ModelRepository
-{
-    /**
-     * @param int $shopId
-     *
-     * @return BenchmarkConfig|null
-     */
-    public function getConfigForShop($shopId)
-    {
-        /** @var BenchmarkConfig $return */
-        $return = $this->findOneBy(['shopId' => $shopId]);
-
-        return $return;
-    }
-
-    public function saveShopConfigs(array $newConfigs)
-    {
-        $savedConfigs = $this->getShopConfigs();
-
-        $allShopIds = $this->getAllViableShopIds();
-
-        foreach ($allShopIds as $shopId => $shopName) {
-            // Config for this shop is already in database, skip
-            if (\array_key_exists($shopId, $savedConfigs)) {
-                continue;
-            }
-
-            $uuid = \Ramsey\Uuid\Uuid::uuid4();
-            $configModel = new BenchmarkConfig($uuid->getBytes());
-            $configModel->setShopId($shopId);
-
-            $configModel->setIndustry(0);
-            $configModel->setType('b2c');
-            $configModel->setActive(false);
-
-            // Config for this shop was sent from on-boarding
-            if (\array_key_exists($shopId, $newConfigs)) {
-                $config = $newConfigs[$shopId];
-
-                // Config is also complete, both type and industry were set
-                if ($config['industry'] && $config['type']) {
-                    $configModel->setIndustry($config['industry']);
-                    $configModel->setType($config['type']);
-                    $configModel->setActive(true);
-                }
-            }
-
-            $this->getEntityManager()->persist($configModel);
-        }
-
-        $this->getEntityManager()->flush();
-    }
-
-    public function save(BenchmarkConfig $config)
-    {
-        $em = $this->getEntityManager();
-
-        $em->merge($config);
-        $em->persist($config);
-        $em->flush($config);
-    }
-
-    /**
-     * @return array
-     */
-    public function getShopsWithValidTemplate()
-    {
-        $queryBuilder = $this->getEntityManager()->getConnection()->createQueryBuilder();
-
-        return $queryBuilder->select([
-                'configs.shop_id as arrayKey',
-                'configs.shop_id as shopId',
-                'shops.name as shopName',
-            ])
-            ->from('s_benchmark_config', 'configs')
-            ->innerJoin('configs', 's_core_shops', 'shops', 'shops.id = configs.shop_id')
-            ->where('configs.last_received > NOW() - INTERVAL 7 DAY')
-            ->andWhere('configs.cached_template IS NOT NULL')
-            ->execute()
-            ->fetchAll(PDO::FETCH_GROUP | PDO::FETCH_UNIQUE | PDO::FETCH_ASSOC);
-    }
-
-    /**
-     * @param bool $addShopName
-     *
-     * @return array
-     */
-    public function getShopConfigs($addShopName = false)
-    {
-        $queryBuilder = $this->getEntityManager()->getConnection()->createQueryBuilder();
-
-        $queryBuilder->select([
-                'configs.shop_id as arrayKey',
-                'configs.shop_id as shopId',
-                'configs.active',
-                'configs.last_sent as lastSent',
-                'configs.last_received as lastReceived',
-                'configs.last_order_id as lastOrderId',
-                'configs.last_customer_id as lastCustomerId',
-                'configs.last_product_id as lastProductId',
-                'configs.batch_size as batchSize',
-                'configs.industry',
-                'configs.type',
-                'configs.response_token as responseToken',
-            ])
-            ->from('s_benchmark_config', 'configs');
-
-        if ($addShopName) {
-            $queryBuilder->addSelect('shops.name as shopName')
-                ->innerJoin('configs', 's_core_shops', 'shops', 'shops.id = configs.shop_id')
-                ->orderBy('configs.shop_id', 'ASC');
-        }
-
-        return $queryBuilder->execute()->fetchAll(PDO::FETCH_GROUP | PDO::FETCH_UNIQUE | PDO::FETCH_ASSOC);
-    }
-
-    /**
-     * Synchronizes benchmark config
-     */
-    public function synchronizeShops()
-    {
-        $queryBuilder = $this->getEntityManager()->getConnection()->createQueryBuilder();
-
-        $shopIds = $queryBuilder->select('id')
-            ->from('s_core_shops', 'shop')
-            ->where('shop.main_id IS NULL')
-            ->execute()
-            ->fetchAll(PDO::FETCH_COLUMN);
-
-        /** @var BenchmarkConfig[] $configs */
-        $configs = $this->findAll();
-
-        $benchmarkShopIds = array_map(function ($config) {
-            return $config->getShopId();
-        }, $configs);
-
-        foreach ($configs as $config) {
-            if (!\in_array($config->getShopId(), $shopIds)) {
-                // Shop does not exist anymore
-                $this->getEntityManager()->remove($config);
-            }
-        }
-
-        foreach ($shopIds as $shopId) {
-            if (!\in_array($shopId, $benchmarkShopIds)) {
-                $config = new BenchmarkConfig(Uuid::uuid4()->toString());
-                $config->setShopId($shopId);
-                $this->getEntityManager()->persist($config);
-            }
-        }
-
-        $this->getEntityManager()->flush();
-    }
-
-    /**
-     * Only returns valid and active shops.
-     *
-     * @return array
-     */
-    public function getValidShops()
-    {
-        $queryBuilder = $this->getEntityManager()->getConnection()->createQueryBuilder();
-
-        return $queryBuilder->select('configs.id')
-            ->from('s_benchmark_config', 'configs')
-            ->where('configs.active = 1 AND configs.industry != 0')
-            ->execute()
-            ->fetchAll(PDO::FETCH_COLUMN);
-    }
-
-    /**
-     * @return int
-     */
-    public function getConfigsCount()
-    {
-        $queryBuilder = $this->getEntityManager()->getConnection()->createQueryBuilder();
-
-        return (int) $queryBuilder->select('COUNT(configs.id)')
-            ->from('s_benchmark_config', 'configs')
-            ->execute()
-            ->fetchColumn();
-    }
-
-    /**
-     * @return BenchmarkConfig|null
-     */
-    public function getNextTransmissionShopConfig()
-    {
-        $queryBuilder = $this->getEntityManager()->createQueryBuilder();
-
-        $yesterday = new DateTime('now', new DateTimeZone('UTC'));
-        $yesterday = $yesterday->modify('-1 day');
-
-        $lastHour = new DateTime('now', new DateTimeZone('UTC'));
-        $lastHour = $lastHour->modify('-1 hour');
-
-        return $queryBuilder->select('configs')
-            ->from(BenchmarkConfig::class, 'configs')
-            ->where('configs.lastSent < :yesterday')
-            ->andWhere('configs.active = 1')
-            ->andWhere('configs.industry != 0')
-            ->andWhere('configs.locked IS NULL OR configs.locked < :lastHour')
-            ->setParameter(':yesterday', $yesterday->format('Y-m-d H:i:s'))
-            ->setParameter(':lastHour', $lastHour->format('Y-m-d H:i:s'))
-            ->orderBy('configs.shopId', 'ASC')
-            ->setMaxResults(1)
-            ->getQuery()
-            ->getOneOrNullResult();
-    }
-
-    /**
-     * @return BenchmarkConfig|null
-     */
-    public function getNextReceivingShopConfig()
-    {
-        $queryBuilder = $this->getEntityManager()->createQueryBuilder();
-
-        $now = new DateTime('now', new DateTimeZone('UTC'));
-        $now = $now->modify('-1 day');
-
-        return $queryBuilder->select('configs')
-            ->from(BenchmarkConfig::class, 'configs')
-            ->where('configs.lastReceived < :dateNow')
-            ->andWhere('configs.lastSent > configs.lastReceived')
-            ->andWhere('configs.active = 1')
-            ->andWhere('configs.industry != 0')
-            ->andWhere('configs.token IS NOT NULL')
-            ->setParameter(':dateNow', $now->format('Y-m-d H:i:s'))
-            ->orderBy('configs.shopId')
-            ->setMaxResults(1)
-            ->getQuery()
-            ->getOneOrNullResult();
-    }
-
-    /**
-     * @param int $shopId
-     */
-    public function lockShop($shopId)
-    {
-        $queryBuilder = $this->getEntityManager()->getConnection()->createQueryBuilder();
-        $now = new DateTime('now', new DateTimeZone('UTC'));
-
-        $queryBuilder->update('s_benchmark_config')
-            ->set('locked', ':now')
-            ->where('shop_id = :shopId')
-            ->setParameter(':shopId', $shopId)
-            ->setParameter(':now', $now->format('Y-m-d H:i:s'))
-            ->execute();
-    }
-
-    /**
-     * @param int $shopId
-     */
-    public function unlockShop($shopId)
-    {
-        $queryBuilder = $this->getEntityManager()->getConnection()->createQueryBuilder();
-
-        $queryBuilder->update('s_benchmark_config')
-            ->set('locked', 'NULL')
-            ->where('shop_id = :shopId')
-            ->setParameter(':shopId', $shopId)
-            ->execute();
-    }
-
-    /**
-     * @return array
-     */
-    public function getShopIds()
-    {
-        $queryBuilder = $this->getEntityManager()->getConnection()->createQueryBuilder();
-
-        return $queryBuilder->select('configs.shop_id')
-            ->from('s_benchmark_config', 'configs')
-            ->where('configs.industry != 0')
-            ->execute()
-            ->fetchAll(PDO::FETCH_COLUMN);
-    }
-
-    /**
-     * @return array
-     */
-    private function getAllViableShopIds()
-    {
-        $queryBuilder = $this->getEntityManager()->getConnection()->createQueryBuilder();
-
-        return $queryBuilder->select('shops.id, shops.name')
-            ->from('s_core_shops', 'shops')
-            ->where('shops.main_id IS NULL')
-            ->execute()
-            ->fetchAll(PDO::FETCH_KEY_PAIR);
-    }
-}
diff --git a/engine/Shopware/Models/Blog/Blog.php b/engine/Shopware/Models/Blog/Blog.php
index 3f84277547a..f805ecadd6f 100644
--- a/engine/Shopware/Models/Blog/Blog.php
+++ b/engine/Shopware/Models/Blog/Blog.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Blog;
@@ -110,7 +110,7 @@ class Blog extends ModelEntity
      *
      * @ORM\Column(name="author_id", type="integer", nullable=true)
      */
-    private $authorId = null;
+    private $authorId;
 
     /**
      * Flag which shows if the blog is active or not. 1= active otherwise inactive
@@ -140,7 +140,7 @@ class Blog extends ModelEntity
      *
      * @ORM\Column(name="views", type="integer", nullable=true)
      */
-    private $views = null;
+    private $views;
 
     /**
      * @var DateTimeInterface
@@ -154,7 +154,7 @@ class Blog extends ModelEntity
      *
      * @ORM\Column(name="category_id", type="integer", nullable=true)
      */
-    private $categoryId = null;
+    private $categoryId;
 
     /**
      * @var Category|null
@@ -174,7 +174,7 @@ class Blog extends ModelEntity
     /**
      * @var string|null
      *
-     * @ORM\Column(name="meta_keywords", type="string", nullable=true)
+     * @ORM\Column(name="meta_keywords", type="text", nullable=true)
      */
     private $metaKeyWords;
 
diff --git a/engine/Shopware/Models/Blog/Comment.php b/engine/Shopware/Models/Blog/Comment.php
index 3ab4dbd9aca..0f65132b764 100644
--- a/engine/Shopware/Models/Blog/Comment.php
+++ b/engine/Shopware/Models/Blog/Comment.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Blog;
diff --git a/engine/Shopware/Models/Blog/Media.php b/engine/Shopware/Models/Blog/Media.php
index b0c80aa88cd..d6e4cd0fbd8 100644
--- a/engine/Shopware/Models/Blog/Media.php
+++ b/engine/Shopware/Models/Blog/Media.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Blog;
diff --git a/engine/Shopware/Models/Blog/Repository.php b/engine/Shopware/Models/Blog/Repository.php
index d3111bda579..1788efb6f26 100644
--- a/engine/Shopware/Models/Blog/Repository.php
+++ b/engine/Shopware/Models/Blog/Repository.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Blog;
@@ -50,11 +50,11 @@ class Repository extends ModelRepository
      * @param int|null $limit
      * @param int|null $shopId
      *
-     * @return Query
+     * @return Query<Blog>
      *
      *@internal param $blogCategory
      */
-    public function getListQuery($blogCategoryIds, $offset = null, $limit = null, array $filter = null, $shopId = null)
+    public function getListQuery($blogCategoryIds, $offset = null, $limit = null, ?array $filter = null, $shopId = null)
     {
         $builder = $this->getListQueryBuilder($blogCategoryIds, $filter, $shopId);
         if (!empty($offset)) {
@@ -130,7 +130,7 @@ public function getListQueryBuilder($blogCategoryIds, $filter, $shopId = null)
      * @param int      $blogId
      * @param int|null $shopId
      *
-     * @return Query
+     * @return Query<Comment>
      */
     public function getAverageVoteQuery($blogId, $shopId = null)
     {
@@ -171,7 +171,7 @@ public function getAverageVoteQueryBuilder($blogId, $shopId = null)
      *
      * @param int $blogId
      *
-     * @return Query
+     * @return Query<Tag>
      */
     public function getTagsByBlogId($blogId)
     {
@@ -208,7 +208,7 @@ public function getTagsByBlogIdBuilder($blogId)
      * @param array    $filter
      * @param int|null $shopId
      *
-     * @return Query
+     * @return Query<Blog>
      */
     public function getDisplayDateFilterQuery($categoryIds, $filter, $shopId = null)
     {
@@ -246,7 +246,7 @@ public function getDisplayDateFilterQueryBuilder($categoryIds, $filter, $shopId
      * @param array    $filter
      * @param int|null $shopId
      *
-     * @return Query
+     * @return Query<Blog>
      */
     public function getAuthorFilterQuery($categoryIds, $filter, $shopId = null)
     {
@@ -285,7 +285,7 @@ public function getAuthorFilterQueryBuilder($categoryIds, $filter, $shopId = nul
      * @param array    $filter
      * @param int|null $shopId
      *
-     * @return Query
+     * @return Query<Blog>
      */
     public function getTagsFilterQuery($categoryIds, $filter, $shopId = null)
     {
@@ -362,9 +362,9 @@ public function getFilterQueryBuilder($categoryIds, $filter, $shopId = null)
      * @param int|null                                               $offset
      * @param int|null                                               $limit
      *
-     * @return Query
+     * @return Query<Blog>
      */
-    public function getBackendListQuery($blogCategoryIds, array $filter = null, $order = null, $offset = null, $limit = null)
+    public function getBackendListQuery($blogCategoryIds, ?array $filter = null, $order = null, $offset = null, $limit = null)
     {
         $builder = $this->getBackendListQueryBuilder($blogCategoryIds, $filter, $order);
         if ($offset !== null) {
@@ -428,7 +428,7 @@ public function getBackendListQueryBuilder($blogCategoryIds, array $filter, $ord
      * @param int      $blogArticleId
      * @param int|null $shopId
      *
-     * @return Query
+     * @return Query<Blog>
      */
     public function getDetailQuery($blogArticleId, $shopId = null)
     {
@@ -482,7 +482,7 @@ public function getDetailQueryBuilder($blogArticleId, $shopId = null)
      *
      * @param array $filter
      *
-     * @return Query
+     * @return Query<Blog>
      */
     public function getBackendDetailQuery($filter)
     {
@@ -522,7 +522,7 @@ public function getBackedDetailQueryBuilder($filter)
      * @param int   $offset
      * @param int   $limit
      *
-     * @return Query
+     * @return Query<Comment>
      */
     public function getBlogCommentsById($blogId, $filter, $order, $offset, $limit)
     {
@@ -586,7 +586,7 @@ public function getBlogCommentsByIdBuilder($blogId, $filter, $order)
      *
      * @param int $blogId
      *
-     * @return Query
+     * @return Query<Tag>
      */
     public function getBlogTagsById($blogId)
     {
diff --git a/engine/Shopware/Models/Blog/Tag.php b/engine/Shopware/Models/Blog/Tag.php
index d5ded8391e1..8e62f56acd4 100644
--- a/engine/Shopware/Models/Blog/Tag.php
+++ b/engine/Shopware/Models/Blog/Tag.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Blog;
diff --git a/engine/Shopware/Models/Category/Category.php b/engine/Shopware/Models/Category/Category.php
index 31b2c55acd2..df59336138f 100644
--- a/engine/Shopware/Models/Category/Category.php
+++ b/engine/Shopware/Models/Category/Category.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Category;
@@ -31,7 +31,6 @@
 use Doctrine\ORM\Mapping as ORM;
 use Shopware\Components\Model\ModelEntity;
 use Shopware\Models\ProductStream\ProductStream;
-use Shopware\Models\Shop\Shop;
 
 /**
  * Shopware Categories
@@ -253,7 +252,7 @@ class Category extends ModelEntity
      *
      * @ORM\Column(name="product_box_layout", type="string", length=50, nullable=true)
      */
-    private $productBoxLayout = null;
+    private $productBoxLayout;
 
     /**
      * @var bool
@@ -432,7 +431,7 @@ public function getParentId()
      *
      * @return Category
      */
-    public function setParent(Category $parent = null)
+    public function setParent(?Category $parent = null)
     {
         $this->parent = $parent;
 
@@ -1031,7 +1030,7 @@ public function getStream()
         return $this->stream;
     }
 
-    public function setStream(ProductStream $stream = null)
+    public function setStream(?ProductStream $stream = null)
     {
         $this->stream = $stream;
     }
diff --git a/engine/Shopware/Models/Category/ManualSorting.php b/engine/Shopware/Models/Category/ManualSorting.php
index 5d3c4958239..e362512d91c 100644
--- a/engine/Shopware/Models/Category/ManualSorting.php
+++ b/engine/Shopware/Models/Category/ManualSorting.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Category;
diff --git a/engine/Shopware/Models/Category/Repository.php b/engine/Shopware/Models/Category/Repository.php
index d9438b3233d..929766acb52 100644
--- a/engine/Shopware/Models/Category/Repository.php
+++ b/engine/Shopware/Models/Category/Repository.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Category;
@@ -95,7 +95,7 @@ public function getPathById($id, $field = 'name', $separator = null)
      * @param int|null $offset
      * @param bool     $selectOnlyActive
      *
-     * @return Query
+     * @return Query<Category>
      */
     public function getListQuery(array $filterBy, array $orderBy = [], $limit = null, $offset = null, $selectOnlyActive = true)
     {
@@ -156,12 +156,12 @@ public function getBackendDetailQuery($categoryId)
     {
         $builder = $this->getEntityManager()->createQueryBuilder();
         $builder->select([
-                'category',
-                'attribute',
-                'emotions',
-                'customerGroups',
-                'media',
-            ])
+            'category',
+            'attribute',
+            'emotions',
+            'customerGroups',
+            'media',
+        ])
             ->from($this->getEntityName(), 'category')
             ->leftJoin('category.attribute', 'attribute')
             ->leftJoin('category.emotions', 'emotions')
@@ -223,7 +223,7 @@ public function getListQueryBuilder(array $filterBy, array $orderBy = [], $limit
      *
      * @param int $categoryId
      *
-     * @return Query
+     * @return Query<Category>
      */
     public function getDetailQuery($categoryId)
     {
@@ -238,7 +238,7 @@ public function getDetailQuery($categoryId)
      *
      * @param int $categoryId
      *
-     * @return Query
+     * @return Query<Category>
      */
     public function getDetailQueryWithoutArticles($categoryId)
     {
@@ -319,7 +319,7 @@ public function getDetailQueryBuilderWithoutArticles($categoryId)
      * @param int      $parentId
      * @param int|null $customerGroupId
      *
-     * @return Query
+     * @return Query<Category>
      */
     public function getActiveByParentIdQuery($parentId, $customerGroupId = null)
     {
@@ -336,7 +336,7 @@ public function getActiveByParentIdQuery($parentId, $customerGroupId = null)
      * @param int      $articleId
      * @param int|null $parentId
      *
-     * @return Query
+     * @return Query<Category>
      */
     public function getActiveByArticleIdQuery($articleId, $parentId = null)
     {
@@ -362,7 +362,7 @@ public function getActiveByArticleIdQuery($articleId, $parentId = null)
      * @param int      $id              The id of the category
      * @param int|null $customerGroupId
      *
-     * @return Query
+     * @return Query<Category>
      */
     public function getActiveByIdQuery($id, $customerGroupId = null)
     {
@@ -387,7 +387,7 @@ public function getActiveByIdQuery($id, $customerGroupId = null)
      * @param int|null $depth
      * @param int|null $shopId
      *
-     * @return array
+     * @return list<array<string, mixed>>
      */
     public function getActiveChildrenTree($id, $customerGroupId = null, $depth = null, $shopId = null)
     {
@@ -471,7 +471,7 @@ public function getChildrenCountList($id)
         $builder = $this->getCategoriesByParentBuilder($id);
         $builder->select('COUNT(categories) as categoriesCount');
 
-        return $builder->getQuery()->getSingleScalarResult();
+        return (int) $builder->getQuery()->getSingleScalarResult();
     }
 
     /**
@@ -521,7 +521,7 @@ public function getActiveArticleIdByCategoryId($category)
      *
      * @internal param $filterBy
      *
-     * @return Query
+     * @return Query<Category>
      */
     public function getBlogCategoriesByParentQuery($parentId, $offset = null, $limit = null)
     {
@@ -578,7 +578,7 @@ public function getCategoriesByParentBuilder($parentId, $offset = null, $limit =
      *
      * @param array $filterBy
      *
-     * @return Query
+     * @return Query<Category>
      */
     public function getBlogCategoryTreeListQuery($filterBy)
     {
@@ -734,7 +734,7 @@ protected function getActiveQueryBuilder($customerGroupId = null, $shopId = null
                     ->andHaving('COUNT(cg.id) = 0');
         }
 
-        //to prevent a temporary table and file sort we have to set the same sort and group by condition
+        // to prevent a temporary table and file sort we have to set the same sort and group by condition
         $builder->groupBy('c.parentId')
             ->addGroupBy('c.position')
             ->addGroupBy('c.id')
diff --git a/engine/Shopware/Models/CommentConfirm/CommentConfirm.php b/engine/Shopware/Models/CommentConfirm/CommentConfirm.php
index 60b755c9138..348591035f2 100644
--- a/engine/Shopware/Models/CommentConfirm/CommentConfirm.php
+++ b/engine/Shopware/Models/CommentConfirm/CommentConfirm.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\CommentConfirm;
diff --git a/engine/Shopware/Models/CommentConfirm/Repository.php b/engine/Shopware/Models/CommentConfirm/Repository.php
index ea82f525488..dd9157e800c 100644
--- a/engine/Shopware/Models/CommentConfirm/Repository.php
+++ b/engine/Shopware/Models/CommentConfirm/Repository.php
@@ -1,31 +1,32 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\CommentConfirm;
 
 use Doctrine\ORM\Query;
 use Shopware\Components\Model\ModelRepository;
+use Shopware\Components\Model\QueryBuilder;
 
 /**
  * Repository for the CommentConfirm model (Shopware\Models\CommentConfirm\CommentConfirm).
@@ -42,7 +43,7 @@ class Repository extends ModelRepository
      *
      * @param string $hash
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<CommentConfirm>
      */
     public function getConfirmationByHashQuery($hash)
     {
@@ -57,7 +58,7 @@ public function getConfirmationByHashQuery($hash)
      *
      * @param string $hash
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getConfirmationByHashBuilder($hash)
     {
diff --git a/engine/Shopware/Models/Config/Element.php b/engine/Shopware/Models/Config/Element.php
index 33eb617c79a..1d7a52408d3 100644
--- a/engine/Shopware/Models/Config/Element.php
+++ b/engine/Shopware/Models/Config/Element.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Config;
@@ -244,7 +244,7 @@ public function getLabel()
     }
 
     /**
-     * @param \Shopware\Models\Config\Form $form
+     * @param Form $form
      */
     public function setForm($form)
     {
diff --git a/engine/Shopware/Models/Config/ElementTranslation.php b/engine/Shopware/Models/Config/ElementTranslation.php
index c5e851aced8..80a3bea45d2 100644
--- a/engine/Shopware/Models/Config/ElementTranslation.php
+++ b/engine/Shopware/Models/Config/ElementTranslation.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Config;
@@ -66,14 +66,14 @@ class ElementTranslation extends ModelEntity
      *
      * @ORM\Column(name="description", type="string", nullable=true)
      */
-    private $description = null;
+    private $description;
 
     /**
      * @var string|null
      *
      * @ORM\Column(name="label", type="string", nullable=true)
      */
-    private $label = null;
+    private $label;
 
     /**
      * @var int
diff --git a/engine/Shopware/Models/Config/Form.php b/engine/Shopware/Models/Config/Form.php
index ea7482330f0..5edae2fdd26 100644
--- a/engine/Shopware/Models/Config/Form.php
+++ b/engine/Shopware/Models/Config/Form.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Config;
@@ -234,9 +234,9 @@ public function getElement($name)
     }
 
     /**
-     * @param string $type
-     * @param string $name
-     * @param array  $options
+     * @param string               $type
+     * @param string               $name
+     * @param array<string, mixed> $options
      *
      * @return Form
      */
diff --git a/engine/Shopware/Models/Config/FormTranslation.php b/engine/Shopware/Models/Config/FormTranslation.php
index 56e9f23f3fb..b848fd27eab 100644
--- a/engine/Shopware/Models/Config/FormTranslation.php
+++ b/engine/Shopware/Models/Config/FormTranslation.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Config;
diff --git a/engine/Shopware/Models/Config/Value.php b/engine/Shopware/Models/Config/Value.php
index 09e83dba905..1f872e0b831 100644
--- a/engine/Shopware/Models/Config/Value.php
+++ b/engine/Shopware/Models/Config/Value.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Config;
diff --git a/engine/Shopware/Models/Country/Area.php b/engine/Shopware/Models/Country/Area.php
index 92288031f89..0f39379f95f 100644
--- a/engine/Shopware/Models/Country/Area.php
+++ b/engine/Shopware/Models/Country/Area.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Country;
@@ -39,7 +39,7 @@ class Area extends ModelEntity
      * The countries property is the inverse side of the association between area and countries.
      * The association is joined over the area id field and the areaID field of the country.
      *
-     * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Country\Country>
+     * @var ArrayCollection<Country>
      *
      * @ORM\OneToMany(targetEntity="Shopware\Models\Country\Country", mappedBy="area", orphanRemoval=true, cascade={"persist"})
      */
@@ -59,14 +59,14 @@ class Area extends ModelEntity
      *
      * @ORM\Column(name="name", type="string", length=255, nullable=true)
      */
-    private $name = null;
+    private $name;
 
     /**
      * @var int|null
      *
      * @ORM\Column(name="active", type="integer", nullable=true)
      */
-    private $active = null;
+    private $active;
 
     public function __construct()
     {
@@ -122,7 +122,7 @@ public function getActive()
     }
 
     /**
-     * @return \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Country\Country>
+     * @return ArrayCollection<Country>
      */
     public function getCountries()
     {
@@ -130,12 +130,12 @@ public function getCountries()
     }
 
     /**
-     * @param \Shopware\Models\Country\Country[]|null $countries
+     * @param Country[]|null $countries
      *
      * @return Area
      */
     public function setCountries($countries)
     {
-        return $this->setOneToMany($countries, \Shopware\Models\Country\Country::class, 'countries', 'area');
+        return $this->setOneToMany($countries, Country::class, 'countries', 'area');
     }
 }
diff --git a/engine/Shopware/Models/Country/Country.php b/engine/Shopware/Models/Country/Country.php
index b67a53bd61f..48c770eb21b 100644
--- a/engine/Shopware/Models/Country/Country.php
+++ b/engine/Shopware/Models/Country/Country.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Country;
@@ -40,7 +40,7 @@
  * </code>
  * The s_core_countries table has the follows indices:
  * <code>
-
+ *
  * </code>
  *
  * @ORM\Entity(repositoryClass="Repository")
diff --git a/engine/Shopware/Models/Country/Repository.php b/engine/Shopware/Models/Country/Repository.php
index 4a799bf7e53..f447a8763cc 100644
--- a/engine/Shopware/Models/Country/Repository.php
+++ b/engine/Shopware/Models/Country/Repository.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Country;
@@ -28,6 +28,7 @@
 use Doctrine\ORM\Query\Expr\OrderBy;
 use Shopware\Components\Model\ModelRepository;
 use Shopware\Components\Model\QueryBuilder;
+use Shopware\Models\Attribute\Country as CountryAttribute;
 use Shopware\Models\Attribute\CountryState;
 
 /**
@@ -43,8 +44,7 @@ class Repository extends ModelRepository
      * @param int|null                  $offset
      * @param int|null                  $limit
      *
-     * @return Query
-     * @return Query
+     * @return Query<Country>
      */
     public function getCountriesQuery($filter = null, $order = null, $offset = null, $limit = null)
     {
@@ -81,9 +81,9 @@ public function getCountriesQueryBuilder($filter = null, $order = null)
             'area.id as areaId',
         ]);
         $builder->from(Country::class, 'countries')
-        ->leftJoin('countries.area', 'area');
+            ->leftJoin('countries.area', 'area');
 
-        if ($filter[0]['property'] === 'areaId') {
+        if (\is_array($filter) && $filter[0]['property'] === 'areaId') {
             $builder->where('area.id = :areaId');
             $builder->setParameter('areaId', $filter[0]['value']);
         } elseif ($filter !== null) {
@@ -131,7 +131,7 @@ public function getCountriesWithStatesQueryBuilder($filter = null, $order = null
      *
      * @param int $areaId
      *
-     * @return Query
+     * @return Query<Country>
      */
     public function getCountriesByAreaIdQuery($areaId)
     {
@@ -162,7 +162,7 @@ public function getCountriesByAreaIdQueryBuilder($areaId)
      * Returns an instance of \Doctrine\ORM\Query object which selects a
      * list of areas.
      *
-     * @return Query
+     * @return Query<Area>
      */
     public function getAreasQuery()
     {
@@ -190,7 +190,7 @@ public function getAreasQueryBuilder()
      *
      * @param int $countryId
      *
-     * @return Query
+     * @return Query<Country>
      */
     public function getCountryQuery($countryId)
     {
@@ -224,7 +224,7 @@ public function getCountryQueryBuilder($countryId)
      *
      * @param int $countryId
      *
-     * @return Query
+     * @return Query<CountryAttribute>
      */
     public function getCountryAttributesQuery($countryId)
     {
@@ -246,7 +246,7 @@ public function getCountryAttributesQueryBuilder($countryId)
         $builder = $this->getEntityManager()->createQueryBuilder();
 
         return $builder->select(['attribute'])
-                         ->from(\Shopware\Models\Attribute\Country::class, 'attribute')
+                         ->from(CountryAttribute::class, 'attribute')
                          ->where('attribute.countryId = ?1')
                          ->setParameter(1, $countryId);
     }
@@ -257,7 +257,7 @@ public function getCountryAttributesQueryBuilder($countryId)
      *
      * @param int $countryId
      *
-     * @return Query
+     * @return Query<State>
      */
     public function getStatesByCountryIdQuery($countryId)
     {
@@ -291,7 +291,7 @@ public function getStatesByCountryIdQueryBuilder($countryId)
      *
      * @param int $stateId
      *
-     * @return Query
+     * @return Query<CountryState>
      */
     public function getStateAttributesQuery($stateId)
     {
diff --git a/engine/Shopware/Models/Country/State.php b/engine/Shopware/Models/Country/State.php
index fc45c859be9..5af3f604084 100644
--- a/engine/Shopware/Models/Country/State.php
+++ b/engine/Shopware/Models/Country/State.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Country;
diff --git a/engine/Shopware/Models/Customer/Address.php b/engine/Shopware/Models/Customer/Address.php
index 87197dc642b..06373705712 100644
--- a/engine/Shopware/Models/Customer/Address.php
+++ b/engine/Shopware/Models/Customer/Address.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Customer;
@@ -103,7 +103,7 @@ class Address extends ModelEntity
      *
      * @ORM\Column(name="salutation", type="string", length=30, nullable=false)
      */
-    protected $salutation = '';
+    protected $salutation = 'not_defined';
 
     /**
      * Contains the first name of the address
@@ -571,7 +571,7 @@ public function getState()
         return $this->state;
     }
 
-    public function setState(State $state = null)
+    public function setState(?State $state = null)
     {
         $this->state = $state;
     }
diff --git a/engine/Shopware/Models/Customer/AddressRepository.php b/engine/Shopware/Models/Customer/AddressRepository.php
index 23c955d68ae..fa093e05e72 100644
--- a/engine/Shopware/Models/Customer/AddressRepository.php
+++ b/engine/Shopware/Models/Customer/AddressRepository.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Customer;
@@ -54,7 +54,7 @@ public function getListArray($userId)
      * @param int $limit
      * @param int $offset
      *
-     * @return Query
+     * @return Query<Address>
      */
     public function getListQuery(array $criteria = [], array $orderBy = [], $limit = 25, $offset = 0)
     {
@@ -64,7 +64,7 @@ public function getListQuery(array $criteria = [], array $orderBy = [], $limit =
     /**
      * @param int $addressId
      *
-     * @return Query
+     * @return Query<Address>
      */
     public function getOne($addressId)
     {
@@ -97,7 +97,7 @@ public function getOneByUser($addressId, $userId)
      *
      * @param int $userId
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     protected function getByUserQueryBuilder($userId)
     {
@@ -123,7 +123,7 @@ protected function getByUserQueryBuilder($userId)
      *
      * @param int $addressId
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     protected function getDetailQueryBuilder($addressId)
     {
@@ -153,7 +153,7 @@ protected function getDetailQueryBuilder($addressId)
      *
      * @param array<array{property: string, direction: string}> $orderBy
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     protected function getListQueryBuilder(array $filterBy = [], array $orderBy = [], $limit = null, $offset = null)
     {
diff --git a/engine/Shopware/Models/Customer/Customer.php b/engine/Shopware/Models/Customer/Customer.php
index a2ef622b977..190b6c27ba8 100644
--- a/engine/Shopware/Models/Customer/Customer.php
+++ b/engine/Shopware/Models/Customer/Customer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Customer;
@@ -449,10 +449,9 @@ class Customer extends LazyFetchModelEntity
      * @var string|null
      *
      * @Assert\NotBlank()
-     *
      * @ORM\Column(name="salutation", type="text", nullable=true)
      */
-    private $salutation;
+    private $salutation = 'not_defined';
 
     /**
      * @var string|null
@@ -834,9 +833,9 @@ public function getValidation()
     }
 
     /**
-     * Setter function for the affiliate column property, which is a flag whether the customer is a shop partner.
+     * Setter function for the affiliate column property, which indicates if the customer is a shop partner.
      * 0 => Customer isn't a shop partner
-     * 1 => Customer is a shop partner
+     * Other than 0 => ID of @see \Shopware\Models\Partner\Partner model
      *
      * @param int $affiliate
      *
@@ -850,9 +849,9 @@ public function setAffiliate($affiliate)
     }
 
     /**
-     * Getter function for the affiliate column property, which is a flag whether the customer is a shop partner.
+     * Getter function for the affiliate column property, which indicates if the customer is a shop partner.
      * 0 => Customer isn't a shop partner
-     * 1 => Customer is a shop partner
+     * Other than 0 => ID of @see \Shopware\Models\Partner\Partner model
      *
      * @return int
      */
diff --git a/engine/Shopware/Models/Customer/Discount.php b/engine/Shopware/Models/Customer/Discount.php
index ba1a37582eb..5ca0607fce8 100644
--- a/engine/Shopware/Models/Customer/Discount.php
+++ b/engine/Shopware/Models/Customer/Discount.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Customer;
diff --git a/engine/Shopware/Models/Customer/Group.php b/engine/Shopware/Models/Customer/Group.php
index aee11b1056b..86bf245493c 100644
--- a/engine/Shopware/Models/Customer/Group.php
+++ b/engine/Shopware/Models/Customer/Group.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Customer;
diff --git a/engine/Shopware/Models/Customer/PaymentData.php b/engine/Shopware/Models/Customer/PaymentData.php
index 249e92c7a1e..8fdc97413ff 100644
--- a/engine/Shopware/Models/Customer/PaymentData.php
+++ b/engine/Shopware/Models/Customer/PaymentData.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Customer;
diff --git a/engine/Shopware/Models/Customer/PaymentDataRepository.php b/engine/Shopware/Models/Customer/PaymentDataRepository.php
index e3d7c3bc2ee..06915206883 100644
--- a/engine/Shopware/Models/Customer/PaymentDataRepository.php
+++ b/engine/Shopware/Models/Customer/PaymentDataRepository.php
@@ -1,30 +1,31 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Customer;
 
 use Shopware\Components\Model\ModelRepository;
+use Shopware\Components\Model\QueryBuilder;
 
 /**
  * Shopware Payment Data Repository
@@ -37,13 +38,13 @@ class PaymentDataRepository extends ModelRepository
      * @param int|null $userId
      * @param string   $paymentName
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getCurrentPaymentDataQueryBuilder($userId, $paymentName)
     {
         $builder = $this->getEntityManager()->createQueryBuilder();
         $builder->select(['paymentdata']);
-        $builder->from(\Shopware\Models\Customer\PaymentData::class, 'paymentdata')
+        $builder->from(PaymentData::class, 'paymentdata')
             ->leftJoin('paymentdata.paymentMean', 'paymentmean')
             ->leftJoin('paymentdata.customer', 'customer')
             ->where('customer.id = :userId')
diff --git a/engine/Shopware/Models/Customer/PriceGroup.php b/engine/Shopware/Models/Customer/PriceGroup.php
index 5b3425156bb..43a0bdc2ab4 100644
--- a/engine/Shopware/Models/Customer/PriceGroup.php
+++ b/engine/Shopware/Models/Customer/PriceGroup.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Customer;
@@ -49,7 +49,7 @@ class PriceGroup extends ModelEntity
     /**
      * INVERSE SIDE
      *
-     * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Customer\Customer>
+     * @var \Doctrine\Common\Collections\ArrayCollection<Customer>
      *
      * @ORM\OneToMany(targetEntity="Shopware\Models\Customer\Customer", mappedBy="priceGroup")
      */
@@ -143,7 +143,7 @@ public function getName()
      * the Customer.group property (OWNING SIDE) and the Group.customers (INVERSE SIDE) property.
      * The customer data is joined over the s_user.groupkey field.
      *
-     * @return \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Customer\Customer>
+     * @return \Doctrine\Common\Collections\ArrayCollection<Customer>
      */
     public function getCustomers()
     {
@@ -156,7 +156,7 @@ public function getCustomers()
      * the Customer.group property (OWNING SIDE) and the Group.customers (INVERSE SIDE) property.
      * The customer data is joined over the s_user.groupkey field.
      *
-     * @param \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Customer\Customer> $customers
+     * @param \Doctrine\Common\Collections\ArrayCollection<Customer> $customers
      */
     public function setCustomers($customers)
     {
@@ -174,7 +174,7 @@ public function getNetto()
     /**
      * @param int $netto
      *
-     * @return \Shopware\Models\Customer\PriceGroup
+     * @return PriceGroup
      */
     public function setNetto($netto)
     {
@@ -194,7 +194,7 @@ public function getActive()
     /**
      * @param int $active
      *
-     * @return \Shopware\Models\Customer\PriceGroup
+     * @return PriceGroup
      */
     public function setActive($active)
     {
diff --git a/engine/Shopware/Models/Customer/Repository.php b/engine/Shopware/Models/Customer/Repository.php
index e7297573850..24fc2c9f742 100644
--- a/engine/Shopware/Models/Customer/Repository.php
+++ b/engine/Shopware/Models/Customer/Repository.php
@@ -1,30 +1,32 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Customer;
 
 use Doctrine\DBAL\Connection;
+use Doctrine\ORM\Query;
+use Doctrine\ORM\Query\Expr\Join;
 use Shopware\Components\Model\ModelRepository;
 use Shopware\Components\Model\QueryBuilder;
 use Shopware\Models\Order\Order;
@@ -45,7 +47,7 @@ class Repository extends ModelRepository
      *
      * @param int $customerId
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Customer>
      */
     public function getCustomerDetailQuery($customerId)
     {
@@ -60,7 +62,7 @@ public function getCustomerDetailQuery($customerId)
      *
      * @param int $customerId
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getCustomerDetailQueryBuilder($customerId)
     {
@@ -68,7 +70,7 @@ public function getCustomerDetailQueryBuilder($customerId)
         $subQueryBuilder = $this->getEntityManager()->createQueryBuilder();
         $subQueryBuilder->select('SUM(canceledOrders.invoiceAmount)')
             ->from(Customer::class, 'customer2')
-            ->leftJoin('customer2.orders', 'canceledOrders', \Doctrine\ORM\Query\Expr\Join::WITH, 'canceledOrders.cleared = 16')
+            ->leftJoin('customer2.orders', 'canceledOrders', Join::WITH, 'canceledOrders.cleared = 16')
             ->where('customer2.id = :customerId');
 
         $builder = $this->getEntityManager()->createQueryBuilder();
@@ -92,8 +94,8 @@ public function getCustomerDetailQueryBuilder($customerId)
                 ->leftJoin('customer.shop', 'shop')
                 ->leftJoin('customer.languageSubShop', 'subShop')
                 ->leftJoin('subShop.locale', 'locale')
-                ->leftJoin('customer.paymentData', 'paymentData', \Doctrine\ORM\Query\Expr\Join::WITH, 'paymentData.paymentMean = customer.paymentId')
-                ->leftJoin('customer.orders', 'doneOrders', \Doctrine\ORM\Query\Expr\Join::WITH, 'doneOrders.status <> -1 AND doneOrders.status <> 4')
+                ->leftJoin('customer.paymentData', 'paymentData', Join::WITH, 'paymentData.paymentMean = customer.paymentId')
+                ->leftJoin('customer.orders', 'doneOrders', Join::WITH, 'doneOrders.status <> -1 AND doneOrders.status <> 4')
                 ->where('customer.id = :customerId')
                 ->setParameter('customerId', $customerId);
 
@@ -106,7 +108,7 @@ public function getCustomerDetailQueryBuilder($customerId)
      * Returns an instance of \Doctrine\ORM\Query object which selects a list of
      * all defined customer groups. Used to create the customer group price tabs on the article detail page in the article backend module.
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Group>
      */
     public function getCustomerGroupsQuery()
     {
@@ -119,7 +121,7 @@ public function getCustomerGroupsQuery()
      * Helper function to create the query builder for the "getCustomerGroupsQuery" function.
      * This function can be hooked to modify the query builder of the query object.
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getCustomerGroupsQueryBuilder()
     {
@@ -137,7 +139,7 @@ public function getCustomerGroupsQueryBuilder()
      * @param int|null $limit
      * @param int|null $offset
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Order>
      */
     public function getOrdersQuery($customerId, $filter = null, $orderBy = null, $limit = null, $offset = null)
     {
@@ -158,7 +160,7 @@ public function getOrdersQuery($customerId, $filter = null, $orderBy = null, $li
      * @param string|null $filter
      * @param array|null  $orderBy
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getOrdersQueryBuilder($customerId, $filter = null, $orderBy = null)
     {
@@ -220,7 +222,7 @@ public function getOrdersQueryBuilder($customerId, $filter = null, $orderBy = nu
      * @param int|null    $customerId
      * @param int|null    $shopId
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Customer>
      */
     public function getValidateEmailQuery($email = null, $customerId = null, $shopId = null)
     {
@@ -237,7 +239,7 @@ public function getValidateEmailQuery($email = null, $customerId = null, $shopId
      * @param int|null    $customerId
      * @param int|null    $shopId
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getValidateEmailQueryBuilder($email = null, $customerId = null, $shopId = null)
     {
@@ -269,7 +271,7 @@ public function getValidateEmailQueryBuilder($email = null, $customerId = null,
      * @param int   $offset
      * @param int   $limit
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Group>
      */
     public function getCustomerGroupsWithoutIdsQuery($usedIds, $offset, $limit)
     {
@@ -282,11 +284,11 @@ public function getCustomerGroupsWithoutIdsQuery($usedIds, $offset, $limit)
      * Helper function to create the query builder for the "getCustomerGroupsQuery" function.
      * This function can be hooked to modify the query builder of the query object.
      *
-     * @param int[] $usedIds
-     * @param int   $offset
-     * @param int   $limit
+     * @param int[]    $usedIds
+     * @param int      $offset
+     * @param int|null $limit
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getCustomerGroupsWithoutIdsQueryBuilder($usedIds, $offset, $limit)
     {
diff --git a/engine/Shopware/Models/CustomerStream/CustomerStream.php b/engine/Shopware/Models/CustomerStream/CustomerStream.php
index 0034ead7f53..48129e21aff 100644
--- a/engine/Shopware/Models/CustomerStream/CustomerStream.php
+++ b/engine/Shopware/Models/CustomerStream/CustomerStream.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\CustomerStream;
@@ -59,7 +59,6 @@ class CustomerStream extends ModelEntity
      * @var string
      *
      * @Assert\NotBlank()
-     *
      * @ORM\Column(name="name", type="string", nullable=false)
      */
     private $name;
@@ -89,7 +88,6 @@ class CustomerStream extends ModelEntity
      * @var DateTimeInterface|null
      *
      * @Assert\DateTime()
-     *
      * @ORM\Column(name="freeze_up", type="datetime", nullable=true)
      */
     private $freezeUp;
@@ -103,7 +101,7 @@ public function getId()
     }
 
     /**
-     * return string
+     * @return string
      */
     public function getName()
     {
@@ -112,6 +110,8 @@ public function getName()
 
     /**
      * @param string $name
+     *
+     * @return void
      */
     public function setName($name)
     {
@@ -128,6 +128,8 @@ public function getDescription()
 
     /**
      * @param string $description
+     *
+     * @return void
      */
     public function setDescription($description)
     {
@@ -144,6 +146,8 @@ public function getConditions()
 
     /**
      * @param string|null $conditions
+     *
+     * @return void
      */
     public function setConditions($conditions)
     {
@@ -160,6 +164,8 @@ public function getFreezeUp()
 
     /**
      * @param DateTimeInterface|string|null $freezeUp
+     *
+     * @return void
      */
     public function setFreezeUp($freezeUp)
     {
@@ -179,6 +185,8 @@ public function isStatic()
 
     /**
      * @param bool $static
+     *
+     * @return void
      */
     public function setStatic($static)
     {
@@ -186,7 +194,7 @@ public function setStatic($static)
     }
 
     /**
-     * @return CustomerStreamAttribute
+     * @return CustomerStreamAttribute|null
      */
     public function getAttribute()
     {
diff --git a/engine/Shopware/Models/CustomerStream/CustomerStreamRepository.php b/engine/Shopware/Models/CustomerStream/CustomerStreamRepository.php
index eece1d176e9..6a153e832ac 100644
--- a/engine/Shopware/Models/CustomerStream/CustomerStreamRepository.php
+++ b/engine/Shopware/Models/CustomerStream/CustomerStreamRepository.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\CustomerStream;
@@ -50,10 +50,10 @@ public function __construct(Connection $connection)
     public function hasCustomerStreamEmotions($categoryId)
     {
         return $this->connection->fetchColumn(
-            'SELECT emotion.id 
-            FROM s_emotion emotion 
-            INNER JOIN s_emotion_categories categories 
-                ON categories.emotion_id = emotion.id 
+            'SELECT emotion.id
+            FROM s_emotion emotion
+            INNER JOIN s_emotion_categories categories
+                ON categories.emotion_id = emotion.id
                 AND categories.category_id = :id
             WHERE emotion.customer_stream_ids IS NOT NULL AND emotion.active = 1
             LIMIT 1',
@@ -68,7 +68,6 @@ public function fetchBackendListing(array $ids)
     {
         $streams = $this->fetchStreamsForCustomers($ids);
 
-        /** @var \Doctrine\DBAL\Query\QueryBuilder $query */
         $query = $this->connection->createQueryBuilder();
         $query->select('*');
         $query->from('s_customer_search_index', 'search_index');
@@ -128,7 +127,7 @@ public function getNotIndexedCount()
             'SELECT COUNT(customers.id)
              FROM s_user customers
              WHERE customers.id NOT IN (
-                 SELECT search_index.id 
+                 SELECT search_index.id
                  FROM s_customer_search_index search_index
                  WHERE search_index.index_time >= :indexTime
              )',
@@ -161,7 +160,7 @@ public function fetchSearchIndexIds($offset, $full = false)
         } else {
             $query->andWhere(
                 'user.id NOT IN (
-                SELECT search_index.id 
+                SELECT search_index.id
                 FROM s_customer_search_index search_index
                 WHERE search_index.index_time >= :indexTime)'
             );
@@ -352,7 +351,6 @@ private function createAmountPerMonthQuery(DateTime $date)
      */
     private function createStreamAmountQuery(DateTime $date, $streamId = null)
     {
-        /** @var \Doctrine\DBAL\Query\QueryBuilder $query */
         $query = $this->connection->createQueryBuilder();
         $query->select([
             "DATE_FORMAT(orders.ordertime, '%Y-%m')",
diff --git a/engine/Shopware/Models/CustomerStream/CustomerStreamRepositoryInterface.php b/engine/Shopware/Models/CustomerStream/CustomerStreamRepositoryInterface.php
index 18df0124055..480d577eabc 100644
--- a/engine/Shopware/Models/CustomerStream/CustomerStreamRepositoryInterface.php
+++ b/engine/Shopware/Models/CustomerStream/CustomerStreamRepositoryInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\CustomerStream;
diff --git a/engine/Shopware/Models/CustomerStream/Mapping.php b/engine/Shopware/Models/CustomerStream/Mapping.php
index b3aa9e04b43..f412971edbb 100644
--- a/engine/Shopware/Models/CustomerStream/Mapping.php
+++ b/engine/Shopware/Models/CustomerStream/Mapping.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\CustomerStream;
diff --git a/engine/Shopware/Models/Dispatch/Dispatch.php b/engine/Shopware/Models/Dispatch/Dispatch.php
index bb9b5575e99..8f1ad88f84a 100644
--- a/engine/Shopware/Models/Dispatch/Dispatch.php
+++ b/engine/Shopware/Models/Dispatch/Dispatch.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Dispatch;
@@ -56,6 +56,28 @@
  */
 class Dispatch extends ModelEntity
 {
+    public const TYPE_STANDARD = 0;
+    public const TYPE_ALTERNATIVE = 1;
+    public const TYPE_SURCHARGE = 2;
+    public const TYPE_DISCOUNT = 3;
+    public const TYPE_DISPATCH_SURCHARGE_ON_POSITION = 4;
+
+    public const CALCULATION_WEIGHT = 0;
+    public const CALCULATION_PRICE = 1;
+    public const CALCULATION_NUMBER_OF_PRODUCTS = 2;
+    public const CALCULATION_CUSTOM = 3;
+    public const CALCULATIONS = [
+        self::CALCULATION_WEIGHT,
+        self::CALCULATION_PRICE,
+        self::CALCULATION_NUMBER_OF_PRODUCTS,
+        self::CALCULATION_CUSTOM,
+    ];
+
+    public const SURCHARGE_CALCULATION_ALWAYS = 0;
+    public const SURCHARGE_CALCULATION_EXCLUDE_SHIPPING_FREE_PRODUCTS = 1;
+    public const SURCHARGE_CALCULATION_NEVER = 2;
+    public const SURCHARGE_CALCULATION_AS_CART_ITEM = 3;
+
     /**
      * INVERSE SIDE
      *
@@ -100,9 +122,9 @@ class Dispatch extends ModelEntity
      *  - Standard Shipping == 0
      *  - Alternate Shipping == 1
      *  - Surcharge Shipping == 2
-     *  - Reduction Shipping == 3
+     *  - Discount Shipping == 3
      *
-     * @var int
+     * @var self::TYPE_*
      *
      * @ORM\Column(name="type", type="integer", nullable=false)
      */
@@ -149,10 +171,10 @@ class Dispatch extends ModelEntity
      * Known types:
      *  - 0 == Weight
      *  - 1 == Price
-     *  - 2 == Number of articles
-     *  - 3 == Own Calculation
+     *  - 2 == Number of products
+     *  - 3 == Custom calculation
      *
-     * @var int
+     * @var self::CALCULATION_*
      *
      * @ORM\Column(name="calculation", type="integer", nullable=false)
      */
@@ -162,11 +184,11 @@ class Dispatch extends ModelEntity
      * Type of the calculation
      * Known Types:
      *  - 0 == Always
-     *  - 1 == Exclude dispatch fee free products
+     *  - 1 == Exclude shipping free products
      *  - 2 == Never
      *  - 3 == Display as basket item
      *
-     * @var int
+     * @var self::SURCHARGE_CALCULATION_*
      *
      * @ORM\Column(name="surcharge_calculation", type="integer", nullable=false)
      */
@@ -445,7 +467,7 @@ public function getName()
     }
 
     /**
-     * @param int $type
+     * @param self::TYPE_* $type
      *
      * @return Dispatch
      */
@@ -457,7 +479,7 @@ public function setType($type)
     }
 
     /**
-     * @return int
+     * @return self::TYPE_*
      */
     public function getType()
     {
@@ -545,7 +567,7 @@ public function getPosition()
     }
 
     /**
-     * @param int $calculation
+     * @param self::CALCULATION_* $calculation
      *
      * @return Dispatch
      */
@@ -557,7 +579,7 @@ public function setCalculation($calculation)
     }
 
     /**
-     * @return int
+     * @return self::CALCULATION_*
      */
     public function getCalculation()
     {
@@ -565,7 +587,7 @@ public function getCalculation()
     }
 
     /**
-     * @param int $surchargeCalculation
+     * @param self::SURCHARGE_CALCULATION_* $surchargeCalculation
      *
      * @return Dispatch
      */
@@ -577,7 +599,7 @@ public function setSurchargeCalculation($surchargeCalculation)
     }
 
     /**
-     * @return int
+     * @return self::SURCHARGE_CALCULATION_*
      */
     public function getSurchargeCalculation()
     {
diff --git a/engine/Shopware/Models/Dispatch/Holiday.php b/engine/Shopware/Models/Dispatch/Holiday.php
index f7baaf0be9b..6056b1b1ba4 100644
--- a/engine/Shopware/Models/Dispatch/Holiday.php
+++ b/engine/Shopware/Models/Dispatch/Holiday.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Dispatch;
diff --git a/engine/Shopware/Models/Dispatch/Repository.php b/engine/Shopware/Models/Dispatch/Repository.php
index 18d5879b024..a74310eb894 100644
--- a/engine/Shopware/Models/Dispatch/Repository.php
+++ b/engine/Shopware/Models/Dispatch/Repository.php
@@ -1,38 +1,37 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Dispatch;
 
 use Doctrine\DBAL\Connection;
-use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\Query\Expr\Join;
-use Doctrine\ORM\Query\Expr\OrderBy;
 use Shopware\Components\Model\ModelRepository;
 use Shopware\Components\Model\QueryBuilder;
 use Shopware\Models\Country\Country;
 use Shopware\Models\Payment\Payment;
+use Shopware\Models\Shop\Shop;
 
 /**
  * Repository for the customer model (Shopware\Models\Dispatch\Dispatch).
@@ -49,7 +48,7 @@ class Repository extends ModelRepository
      * @param int|null          $offset
      * @param int|null          $limit
      *
-     * @return Query
+     * @return Query<Dispatch>
      */
     public function getDispatchesQuery($filter = null, $order = null, $offset = null, $limit = null)
     {
@@ -69,7 +68,7 @@ public function getDispatchesQuery($filter = null, $order = null, $offset = null
      * @param array<string, string>|array<array{property: string, value: mixed, expression?: string}>|null $filter
      * @param string|array<array{property: string, direction: string}>|null                                $order
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getDispatchesQueryBuilder($filter = null, $order = null)
     {
@@ -99,7 +98,7 @@ public function getDispatchesQueryBuilder($filter = null, $order = null)
      * @param int|null    $limit      - Reduce the number of returned data sets
      * @param int|null    $offset     - Start the output based on that offset
      *
-     * @return Query
+     * @return Query<Dispatch>
      */
     public function getShippingCostsQuery($dispatchId = null, $filter = null, $order = [], $limit = null, $offset = null)
     {
@@ -123,7 +122,7 @@ public function getShippingCostsQuery($dispatchId = null, $filter = null, $order
      * @param int|null    $limit  - Reduce the number of returned data sets
      * @param int|null    $offset - Start the output based on that offset
      *
-     * @return Query
+     * @return Query<Dispatch>
      */
     public function getListQuery($filter = null, $order = [], $limit = null, $offset = null)
     {
@@ -147,7 +146,7 @@ public function getListQuery($filter = null, $order = [], $limit = null, $offset
      * @param string|null $filter     - Used to search in the name and description of the dispatch data set
      * @param array       $order      - Name of the field which should considered as sorting field
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getShippingCostsQueryBuilder($dispatchId = null, $filter = null, $order = [])
     {
@@ -184,7 +183,7 @@ public function getShippingCostsQueryBuilder($dispatchId = null, $filter = null,
      * @param string|null $filter - Used to search in the name and description of the dispatch data set
      * @param array       $order  - Name of the field which should considered as sorting field
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getListQueryBuilder($filter = null, $order = [])
     {
@@ -214,7 +213,7 @@ public function getListQueryBuilder($filter = null, $order = [])
      * @param int|null    $limit      Count of the selected data
      * @param int|null    $offset     Start index of the selected data
      *
-     * @return Query
+     * @return Query<ShippingCost>
      */
     public function getShippingCostsMatrixQuery($dispatchId = null, $filter = null, $limit = null, $offset = null)
     {
@@ -230,7 +229,7 @@ public function getShippingCostsMatrixQuery($dispatchId = null, $filter = null,
      *
      * @param int $dispatchId - If this parameter is given, only one data set will be returned
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getShippingCostsMatrixQueryBuilder($dispatchId = null)
     {
@@ -253,7 +252,7 @@ public function getShippingCostsMatrixQueryBuilder($dispatchId = null)
      *
      * @param int $dispatchId
      *
-     * @return AbstractQuery
+     * @return Query<void, void>
      */
     public function getPurgeShippingCostsMatrixQuery($dispatchId = null)
     {
@@ -270,7 +269,7 @@ public function getPurgeShippingCostsMatrixQuery($dispatchId = null)
      * @param int|null   $limit
      * @param int|null   $offset
      *
-     * @return Query
+     * @return Query<Payment>
      */
     public function getPaymentQuery($filter = null, $order = null, $limit = null, $offset = null)
     {
@@ -292,7 +291,7 @@ public function getPaymentQuery($filter = null, $order = null, $limit = null, $o
      * @param array|null $filter
      * @param array|null $order
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getPaymentQueryBuilder($filter = null, $order = null)
     {
@@ -327,7 +326,7 @@ public function getPaymentQueryBuilder($filter = null, $order = null)
      * @param int|null   $limit
      * @param int|null   $offset
      *
-     * @return Query
+     * @return Query<Country>
      */
     public function getCountryQuery($filter = null, $order = null, $limit = null, $offset = null)
     {
@@ -349,7 +348,7 @@ public function getCountryQuery($filter = null, $order = null, $limit = null, $o
      * @param array|null $filter
      * @param array|null $order
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getCountryQueryBuilder($filter = null, $order = null)
     {
@@ -390,7 +389,7 @@ public function getCountryQueryBuilder($filter = null, $order = null)
      * @param int|null   $limit
      * @param int|null   $offset
      *
-     * @return Query
+     * @return Query<Holiday>
      */
     public function getHolidayQuery($filter = null, $order = null, $limit = null, $offset = null)
     {
@@ -411,7 +410,7 @@ public function getHolidayQuery($filter = null, $order = null, $limit = null, $o
      * @param array|null $filter
      * @param array|null $order
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getHolidayQueryBuilder($filter = null, $order = null)
     {
@@ -435,15 +434,15 @@ public function getHolidayQueryBuilder($filter = null, $order = null)
     /**
      * Selects all shipping costs with a deleted shop
      *
-     * @return Query
+     * @return Query<Dispatch>
      */
     public function getDispatchWithDeletedShopsQuery()
     {
         $builder = $this->getEntityManager()->createQueryBuilder();
 
         $builder->select('dispatch')
-            ->from('Shopware\Models\Dispatch\Dispatch', 'dispatch')
-            ->leftJoin('Shopware\Models\Shop\Shop', 'shop', Join::WITH, 'dispatch.multiShopId = shop.id')
+            ->from(Dispatch::class, 'dispatch')
+            ->leftJoin(Shop::class, 'shop', Join::WITH, 'dispatch.multiShopId = shop.id')
             ->andWhere('dispatch.multiShopId IS NOT NULL')
             ->andWhere('shop.id IS NULL');
 
@@ -456,11 +455,11 @@ public function getDispatchWithDeletedShopsQuery()
      * @param string     $modelPrefix
      * @param array|null $orderBy
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
-    protected function sortOrderQuery(\Doctrine\ORM\QueryBuilder $builder, $modelPrefix, $orderBy)
+    protected function sortOrderQuery(QueryBuilder $builder, $modelPrefix, $orderBy)
     {
-        //order the query with the passed orderBy parameter
+        // order the query with the passed orderBy parameter
         if (!empty($orderBy)) {
             foreach ($orderBy as $order) {
                 if (!isset($order['direction'])) {
diff --git a/engine/Shopware/Models/Dispatch/ShippingCost.php b/engine/Shopware/Models/Dispatch/ShippingCost.php
index 09fd4c29cd6..904dae53d35 100644
--- a/engine/Shopware/Models/Dispatch/ShippingCost.php
+++ b/engine/Shopware/Models/Dispatch/ShippingCost.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Dispatch;
diff --git a/engine/Shopware/Models/Document/Data/OrderData.php b/engine/Shopware/Models/Document/Data/OrderData.php
index 1358f72e31c..047e6103399 100644
--- a/engine/Shopware/Models/Document/Data/OrderData.php
+++ b/engine/Shopware/Models/Document/Data/OrderData.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /*
@@ -29,405 +29,405 @@
 return [
     '_id' => 59,
     '_order' => new ArrayObject([
-            'id' => '59',
+        'id' => '59',
+        'ordernumber' => '20003',
+        'userID' => '3',
+        'invoice_amount' => '56.84',
+        'invoice_amount_net' => '47.76',
+        'invoice_shipping' => '3.9',
+        'invoice_shipping_net' => '3.28',
+        'ordertime' => '2014-08-12 08:54:33',
+        'status' => '0',
+        'cleared' => '17',
+        'paymentID' => '5',
+        'transactionID' => '',
+        'comment' => '',
+        'customercomment' => '',
+        'internalcomment' => '',
+        'net' => '0',
+        'taxfree' => '0',
+        'partnerID' => '',
+        'temporaryID' => '',
+        'referer' => '',
+        'cleareddate' => null,
+        'trackingcode' => '',
+        'language' => '2',
+        'dispatchID' => '9',
+        'currency' => 'EUR',
+        'currencyFactor' => '1',
+        'subshopID' => '1',
+        'remote_addr' => '127.0.0.1',
+        'deviceType' => 'desktop',
+        'factor' => '1',
+        'currencyID' => '1',
+        'templatechar' => '&euro;',
+        'currencyName' => 'Euro',
+        'attributes' => [
+            'id' => '3',
+            'orderID' => '59',
+            'attribute1' => '',
+            'attribute2' => '',
+            'attribute3' => '',
+            'attribute4' => '',
+            'attribute5' => '',
+            'attribute6' => '',
+        ],
+    ]),
+    '_positions' => new ArrayObject([
+        0 => [
+            'id' => '209',
+            'orderID' => '59',
             'ordernumber' => '20003',
-            'userID' => '3',
-            'invoice_amount' => '56.84',
-            'invoice_amount_net' => '47.76',
-            'invoice_shipping' => '3.9',
-            'invoice_shipping_net' => '3.28',
-            'ordertime' => '2014-08-12 08:54:33',
+            'articleID' => '178',
+            'articleordernumber' => 'SW10178',
+            'price' => '19.95',
+            'quantity' => '1',
+            'name' => 'Strandtuch "Ibiza"',
             'status' => '0',
-            'cleared' => '17',
-            'paymentID' => '5',
-            'transactionID' => '',
-            'comment' => '',
-            'customercomment' => '',
-            'internalcomment' => '',
-            'net' => '0',
-            'taxfree' => '0',
-            'partnerID' => '',
-            'temporaryID' => '',
-            'referer' => '',
-            'cleareddate' => null,
-            'trackingcode' => '',
-            'language' => '2',
-            'dispatchID' => '9',
-            'currency' => 'EUR',
-            'currencyFactor' => '1',
-            'subshopID' => '1',
-            'remote_addr' => '127.0.0.1',
-            'deviceType' => 'desktop',
-            'factor' => '1',
-            'currencyID' => '1',
-            'templatechar' => '&euro;',
-            'currencyName' => 'Euro',
+            'shipped' => '0',
+            'shippedgroup' => '0',
+            'releasedate' => null,
+            'modus' => '0',
+            'esdarticle' => '0',
+            'taxID' => '1',
+            'tax_rate' => '19',
+            'config' => '',
+            'articleTaxID' => '1',
+            'attr1' => '',
+            'attr2' => '',
+            'attr3' => '',
+            'attr4' => '',
+            'attr5' => '',
+            'attr6' => '',
+            'attr7' => '',
+            'attr8' => '',
+            'attr9' => '',
+            'attr10' => '',
+            'attr11' => '',
+            'attr12' => '',
+            'attr13' => '',
+            'attr14' => '',
+            'attr15' => '',
+            'attr16' => '',
+            'attr17' => null,
+            'attr18' => '',
+            'attr19' => '',
+            'attr20' => '',
             'attributes' => [
-                    'id' => '3',
-                    'orderID' => '59',
-                    'attribute1' => '',
-                    'attribute2' => '',
-                    'attribute3' => '',
-                    'attribute4' => '',
-                    'attribute5' => '',
-                    'attribute6' => '',
-                ],
-        ]),
-    '_positions' => new ArrayObject([
-            0 => [
-                    'id' => '209',
-                    'orderID' => '59',
-                    'ordernumber' => '20003',
-                    'articleID' => '178',
-                    'articleordernumber' => 'SW10178',
-                    'price' => '19.95',
-                    'quantity' => '1',
-                    'name' => 'Strandtuch "Ibiza"',
-                    'status' => '0',
-                    'shipped' => '0',
-                    'shippedgroup' => '0',
-                    'releasedate' => null,
-                    'modus' => '0',
-                    'esdarticle' => '0',
-                    'taxID' => '1',
-                    'tax_rate' => '19',
-                    'config' => '',
-                    'articleTaxID' => '1',
-                    'attr1' => '',
-                    'attr2' => '',
-                    'attr3' => '',
-                    'attr4' => '',
-                    'attr5' => '',
-                    'attr6' => '',
-                    'attr7' => '',
-                    'attr8' => '',
-                    'attr9' => '',
-                    'attr10' => '',
-                    'attr11' => '',
-                    'attr12' => '',
-                    'attr13' => '',
-                    'attr14' => '',
-                    'attr15' => '',
-                    'attr16' => '',
-                    'attr17' => null,
-                    'attr18' => '',
-                    'attr19' => '',
-                    'attr20' => '',
-                    'attributes' => [
-                            'id' => '9',
-                            'detailID' => '209',
-                            'attribute1' => '',
-                            'attribute2' => '',
-                            'attribute3' => '',
-                            'attribute4' => '',
-                            'attribute5' => '',
-                            'attribute6' => '',
-                        ],
-                    'tax' => '19',
-                    'netto' => 16.764705882352938,
-                    'amount_netto' => 16.760000000000002,
-                    'amount' => 19.949999999999999,
-                ],
-            1 => [
-                    'id' => '210',
-                    'orderID' => '59',
-                    'ordernumber' => '20003',
-                    'articleID' => '177',
-                    'articleordernumber' => 'SW10177',
-                    'price' => '34.99',
-                    'quantity' => '1',
-                    'name' => 'Strandtuch Stripes für Kinder',
-                    'status' => '0',
-                    'shipped' => '0',
-                    'shippedgroup' => '0',
-                    'releasedate' => null,
-                    'modus' => '0',
-                    'esdarticle' => '0',
-                    'taxID' => '1',
-                    'tax_rate' => '19',
-                    'config' => '',
-                    'articleTaxID' => '1',
-                    'attr1' => '',
-                    'attr2' => '',
-                    'attr3' => '',
-                    'attr4' => '',
-                    'attr5' => '',
-                    'attr6' => '',
-                    'attr7' => '',
-                    'attr8' => '',
-                    'attr9' => '',
-                    'attr10' => '',
-                    'attr11' => '',
-                    'attr12' => '',
-                    'attr13' => '',
-                    'attr14' => '',
-                    'attr15' => '',
-                    'attr16' => '',
-                    'attr17' => null,
-                    'attr18' => '',
-                    'attr19' => '',
-                    'attr20' => '',
-                    'attributes' => [
-                            'id' => '10',
-                            'detailID' => '210',
-                            'attribute1' => '',
-                            'attribute2' => '',
-                            'attribute3' => '',
-                            'attribute4' => '',
-                            'attribute5' => '',
-                            'attribute6' => '',
-                        ],
-                    'tax' => '19',
-                    'netto' => 29.403361344537814,
-                    'amount_netto' => 29.399999999999999,
-                    'amount' => 34.990000000000002,
-                ],
-            2 => [
-                    'id' => '211',
-                    'orderID' => '59',
-                    'ordernumber' => '20003',
-                    'articleID' => '0',
-                    'articleordernumber' => 'SHIPPINGDISCOUNT',
-                    'price' => '-2',
-                    'quantity' => '1',
-                    'name' => 'Warenkorbrabatt',
-                    'status' => '0',
-                    'shipped' => '0',
-                    'shippedgroup' => '0',
-                    'releasedate' => null,
-                    'modus' => '4',
-                    'esdarticle' => '0',
-                    'taxID' => '0',
-                    'tax_rate' => '19',
-                    'config' => '',
-                    'articleTaxID' => null,
-                    'attr1' => null,
-                    'attr2' => null,
-                    'attr3' => null,
-                    'attr4' => null,
-                    'attr5' => null,
-                    'attr6' => null,
-                    'attr7' => null,
-                    'attr8' => null,
-                    'attr9' => null,
-                    'attr10' => null,
-                    'attr11' => null,
-                    'attr12' => null,
-                    'attr13' => null,
-                    'attr14' => null,
-                    'attr15' => null,
-                    'attr16' => null,
-                    'attr17' => null,
-                    'attr18' => null,
-                    'attr19' => null,
-                    'attr20' => null,
-                    'attributes' => [
-                            'id' => '11',
-                            'detailID' => '211',
-                            'attribute1' => '',
-                            'attribute2' => '',
-                            'attribute3' => '',
-                            'attribute4' => '',
-                            'attribute5' => '',
-                            'attribute6' => '',
-                        ],
-                    'tax' => '19',
-                    'netto' => -1.680672268907563,
-                    'amount_netto' => -1.6799999999999999,
-                    'amount' => -2,
-                ],
-            3 => [
-                    'quantity' => 1,
-                    'netto' => 3.2773109243697482,
-                    'tax' => 19,
-                    'price' => '3.9',
-                    'amount' => '3.9',
-                    'modus' => 1,
-                    'amount_netto' => 3.2773109243697482,
-                    'articleordernumber' => '',
-                    'name' => 'Versandkosten',
-                ],
-        ]),
+                'id' => '9',
+                'detailID' => '209',
+                'attribute1' => '',
+                'attribute2' => '',
+                'attribute3' => '',
+                'attribute4' => '',
+                'attribute5' => '',
+                'attribute6' => '',
+            ],
+            'tax' => '19',
+            'netto' => 16.764705882352938,
+            'amount_netto' => 16.760000000000002,
+            'amount' => 19.949999999999999,
+        ],
+        1 => [
+            'id' => '210',
+            'orderID' => '59',
+            'ordernumber' => '20003',
+            'articleID' => '177',
+            'articleordernumber' => 'SW10177',
+            'price' => '34.99',
+            'quantity' => '1',
+            'name' => 'Strandtuch Stripes für Kinder',
+            'status' => '0',
+            'shipped' => '0',
+            'shippedgroup' => '0',
+            'releasedate' => null,
+            'modus' => '0',
+            'esdarticle' => '0',
+            'taxID' => '1',
+            'tax_rate' => '19',
+            'config' => '',
+            'articleTaxID' => '1',
+            'attr1' => '',
+            'attr2' => '',
+            'attr3' => '',
+            'attr4' => '',
+            'attr5' => '',
+            'attr6' => '',
+            'attr7' => '',
+            'attr8' => '',
+            'attr9' => '',
+            'attr10' => '',
+            'attr11' => '',
+            'attr12' => '',
+            'attr13' => '',
+            'attr14' => '',
+            'attr15' => '',
+            'attr16' => '',
+            'attr17' => null,
+            'attr18' => '',
+            'attr19' => '',
+            'attr20' => '',
+            'attributes' => [
+                'id' => '10',
+                'detailID' => '210',
+                'attribute1' => '',
+                'attribute2' => '',
+                'attribute3' => '',
+                'attribute4' => '',
+                'attribute5' => '',
+                'attribute6' => '',
+            ],
+            'tax' => '19',
+            'netto' => 29.403361344537814,
+            'amount_netto' => 29.399999999999999,
+            'amount' => 34.990000000000002,
+        ],
+        2 => [
+            'id' => '211',
+            'orderID' => '59',
+            'ordernumber' => '20003',
+            'articleID' => '0',
+            'articleordernumber' => 'SHIPPINGDISCOUNT',
+            'price' => '-2',
+            'quantity' => '1',
+            'name' => 'Warenkorbrabatt',
+            'status' => '0',
+            'shipped' => '0',
+            'shippedgroup' => '0',
+            'releasedate' => null,
+            'modus' => '4',
+            'esdarticle' => '0',
+            'taxID' => '0',
+            'tax_rate' => '19',
+            'config' => '',
+            'articleTaxID' => null,
+            'attr1' => null,
+            'attr2' => null,
+            'attr3' => null,
+            'attr4' => null,
+            'attr5' => null,
+            'attr6' => null,
+            'attr7' => null,
+            'attr8' => null,
+            'attr9' => null,
+            'attr10' => null,
+            'attr11' => null,
+            'attr12' => null,
+            'attr13' => null,
+            'attr14' => null,
+            'attr15' => null,
+            'attr16' => null,
+            'attr17' => null,
+            'attr18' => null,
+            'attr19' => null,
+            'attr20' => null,
+            'attributes' => [
+                'id' => '11',
+                'detailID' => '211',
+                'attribute1' => '',
+                'attribute2' => '',
+                'attribute3' => '',
+                'attribute4' => '',
+                'attribute5' => '',
+                'attribute6' => '',
+            ],
+            'tax' => '19',
+            'netto' => -1.680672268907563,
+            'amount_netto' => -1.6799999999999999,
+            'amount' => -2,
+        ],
+        3 => [
+            'quantity' => 1,
+            'netto' => 3.2773109243697482,
+            'tax' => 19,
+            'price' => '3.9',
+            'amount' => '3.9',
+            'modus' => 1,
+            'amount_netto' => 3.2773109243697482,
+            'articleordernumber' => '',
+            'name' => 'Versandkosten',
+        ],
+    ]),
     '_userID' => '3',
     '_user' => new ArrayObject([
-            'id' => '3',
-            'password' => '$2y$10$GAGAC6.1kMRvN4RRcLrYleDx.EfWhHcW./cmoOQg11sjFUY73SO.C',
-            'encoder' => 'bcrypt',
-            'email' => 'demo@shopware.com',
-            'customernumber' => '20005',
+        'id' => '3',
+        'password' => '$2y$10$GAGAC6.1kMRvN4RRcLrYleDx.EfWhHcW./cmoOQg11sjFUY73SO.C',
+        'encoder' => 'bcrypt',
+        'email' => 'demo@shopware.com',
+        'customernumber' => '20005',
+        'active' => '1',
+        'accountmode' => '0',
+        'confirmationkey' => '',
+        'paymentID' => '5',
+        'firstlogin' => '2014-08-12',
+        'lastlogin' => '2014-08-12 08:54:50',
+        'sessionID' => 'l7s18dvemmftmfeedh80f5c3d7',
+        'newsletter' => '0',
+        'validation' => '',
+        'affiliate' => '0',
+        'customergroup' => 'EK',
+        'paymentpreset' => '0',
+        'language' => '2',
+        'subshopID' => '1',
+        'referer' => '',
+        'pricegroupID' => null,
+        'internalcomment' => '',
+        'failedlogins' => '0',
+        'lockeduntil' => null,
+        'customergroupID' => '1',
+    ]),
+    '_billing' => new ArrayObject([
+        'id' => '3',
+        'userID' => '3',
+        'orderID' => '59',
+        'company' => '',
+        'department' => '',
+        'salutation' => 'mr',
+        'firstname' => 'Muster',
+        'lastname' => 'Kunde',
+        'street' => 'Musterstraße 3',
+        'zipcode' => '50000',
+        'city' => 'Berlin',
+        'phone' => '123456789',
+        'countryID' => '2',
+        'stateID' => '0',
+        'ustid' => '',
+        'additional_address_line1' => '',
+        'additional_address_line2' => '',
+        'country' => new ArrayObject([
+            'id' => '2',
+            'countryname' => 'Deutschland',
+            'countryiso' => 'DE',
+            'areaID' => '1',
+            'countryen' => 'GERMANY',
+            'position' => '1',
+            'notice' => '',
+            'taxfree' => '0',
+            'taxfree_ustid' => '0',
+            'taxfree_ustid_checked' => '0',
             'active' => '1',
-            'accountmode' => '0',
-            'confirmationkey' => '',
-            'paymentID' => '5',
-            'firstlogin' => '2014-08-12',
-            'lastlogin' => '2014-08-12 08:54:50',
-            'sessionID' => 'l7s18dvemmftmfeedh80f5c3d7',
-            'newsletter' => '0',
-            'validation' => '',
-            'affiliate' => '0',
-            'customergroup' => 'EK',
-            'paymentpreset' => '0',
-            'language' => '2',
-            'subshopID' => '1',
-            'referer' => '',
-            'pricegroupID' => null,
-            'internalcomment' => '',
-            'failedlogins' => '0',
-            'lockeduntil' => null,
-            'customergroupID' => '1',
+            'iso3' => 'DEU',
+            'display_state_in_registration' => '0',
+            'force_state_in_registration' => '0',
         ]),
-    '_billing' => new ArrayObject([
+        'state' => [
+        ],
+        'attributes' => [
             'id' => '3',
-            'userID' => '3',
-            'orderID' => '59',
-            'company' => '',
-            'department' => '',
-            'salutation' => 'mr',
-            'firstname' => 'Muster',
-            'lastname' => 'Kunde',
-            'street' => 'Musterstraße 3',
-            'zipcode' => '50000',
-            'city' => 'Berlin',
-            'phone' => '123456789',
-            'countryID' => '2',
-            'stateID' => '0',
-            'ustid' => '',
-            'additional_address_line1' => '',
-            'additional_address_line2' => '',
-            'country' => new ArrayObject([
-                    'id' => '2',
-                    'countryname' => 'Deutschland',
-                    'countryiso' => 'DE',
-                    'areaID' => '1',
-                    'countryen' => 'GERMANY',
-                    'position' => '1',
-                    'notice' => '',
-                    'taxfree' => '0',
-                    'taxfree_ustid' => '0',
-                    'taxfree_ustid_checked' => '0',
-                    'active' => '1',
-                    'iso3' => 'DEU',
-                    'display_state_in_registration' => '0',
-                    'force_state_in_registration' => '0',
-                ]),
-            'state' => [
-                ],
-            'attributes' => [
-                    'id' => '3',
-                    'billingID' => '3',
-                    'text1' => '',
-                    'text2' => '',
-                    'text3' => '',
-                    'text4' => '',
-                    'text5' => '',
-                    'text6' => '',
-                ],
-        ]),
+            'billingID' => '3',
+            'text1' => '',
+            'text2' => '',
+            'text3' => '',
+            'text4' => '',
+            'text5' => '',
+            'text6' => '',
+        ],
+    ]),
     '_shipping' => new ArrayObject([
+        'id' => '3',
+        'userID' => '3',
+        'orderID' => '59',
+        'company' => 'Muster Firma',
+        'department' => 'Muster Abteilung',
+        'salutation' => 'mr',
+        'firstname' => 'Muster',
+        'lastname' => 'Kunde',
+        'street' => 'Musterweg 2',
+        'zipcode' => '60000',
+        'city' => 'Frankfurt',
+        'countryID' => '2',
+        'stateID' => '0',
+        'additional_address_line1' => '',
+        'additional_address_line2' => '',
+        'attributes' => [
             'id' => '3',
-            'userID' => '3',
-            'orderID' => '59',
-            'company' => 'Muster Firma',
-            'department' => 'Muster Abteilung',
-            'salutation' => 'mr',
-            'firstname' => 'Muster',
-            'lastname' => 'Kunde',
-            'street' => 'Musterweg 2',
-            'zipcode' => '60000',
-            'city' => 'Frankfurt',
-            'countryID' => '2',
-            'stateID' => '0',
-            'additional_address_line1' => '',
-            'additional_address_line2' => '',
-            'attributes' => [
-                    'id' => '3',
-                    'shippingID' => '3',
-                    'text1' => '',
-                    'text2' => '',
-                    'text3' => '',
-                    'text4' => '',
-                    'text5' => '',
-                    'text6' => '',
-                ],
-            'country' => new ArrayObject([
-                    'id' => '2',
-                    'countryname' => 'Deutschland',
-                    'countryiso' => 'DE',
-                    'areaID' => '1',
-                    'countryen' => 'GERMANY',
-                    'position' => '1',
-                    'notice' => '',
-                    'taxfree' => '0',
-                    'taxfree_ustid' => '0',
-                    'taxfree_ustid_checked' => '0',
-                    'active' => '1',
-                    'iso3' => 'DEU',
-                    'display_state_in_registration' => '0',
-                    'force_state_in_registration' => '0',
-                ]),
-            'state' => [
-                ],
-        ]),
-    '_payment' => new ArrayObject([
-            'id' => '5',
-            'name' => 'prepayment',
-            'description' => 'Vorkasse',
-            'template' => 'prepayment.tpl',
-            'class' => 'prepayment.php',
-            'table' => '',
-            'hide' => '0',
-            'additionaldescription' => 'Sie zahlen einfach vorab und erhalten die Ware bequem und günstig bei Zahlungseingang nach Hause geliefert.',
-            'debit_percent' => '0',
-            'surcharge' => '0',
-            'surchargestring' => '',
+            'shippingID' => '3',
+            'text1' => '',
+            'text2' => '',
+            'text3' => '',
+            'text4' => '',
+            'text5' => '',
+            'text6' => '',
+        ],
+        'country' => new ArrayObject([
+            'id' => '2',
+            'countryname' => 'Deutschland',
+            'countryiso' => 'DE',
+            'areaID' => '1',
+            'countryen' => 'GERMANY',
             'position' => '1',
+            'notice' => '',
+            'taxfree' => '0',
+            'taxfree_ustid' => '0',
+            'taxfree_ustid_checked' => '0',
             'active' => '1',
-            'esdactive' => '0',
-            'embediframe' => '',
-            'hideprospect' => '0',
-            'action' => null,
-            'pluginID' => null,
-            'source' => null,
-            'mobile_inactive' => '0',
+            'iso3' => 'DEU',
+            'display_state_in_registration' => '0',
+            'force_state_in_registration' => '0',
         ]),
+        'state' => [
+        ],
+    ]),
+    '_payment' => new ArrayObject([
+        'id' => '5',
+        'name' => 'prepayment',
+        'description' => 'Vorkasse',
+        'template' => 'prepayment.tpl',
+        'class' => 'prepayment.php',
+        'table' => '',
+        'hide' => '0',
+        'additionaldescription' => 'Sie zahlen einfach vorab und erhalten die Ware bequem und günstig bei Zahlungseingang nach Hause geliefert.',
+        'debit_percent' => '0',
+        'surcharge' => '0',
+        'surchargestring' => '',
+        'position' => '1',
+        'active' => '1',
+        'esdactive' => '0',
+        'embediframe' => '',
+        'hideprospect' => '0',
+        'action' => null,
+        'pluginID' => null,
+        'source' => null,
+        'mobile_inactive' => '0',
+    ]),
     '_paymentInstances' => new ArrayObject([
-            0 => [
-                    'id' => '1',
-                    'payment_mean_id' => '5',
-                    'order_id' => '59',
-                    'user_id' => '3',
-                    'firstname' => 'Muster',
-                    'lastname' => 'Kunde',
-                    'address' => 'Musterstraße 2',
-                    'zipcode' => '50000',
-                    'city' => 'Berlin',
-                    'account_number' => null,
-                    'account_holder' => null,
-                    'bank_name' => null,
-                    'bank_code' => null,
-                    'bic' => null,
-                    'iban' => null,
-                    'amount' => '56.8400',
-                    'created_at' => '2014-08-12',
-                ],
-        ]),
+        0 => [
+            'id' => '1',
+            'payment_mean_id' => '5',
+            'order_id' => '59',
+            'user_id' => '3',
+            'firstname' => 'Muster',
+            'lastname' => 'Kunde',
+            'address' => 'Musterstraße 2',
+            'zipcode' => '50000',
+            'city' => 'Berlin',
+            'account_number' => null,
+            'account_holder' => null,
+            'bank_name' => null,
+            'bank_code' => null,
+            'bic' => null,
+            'iban' => null,
+            'amount' => '56.8400',
+            'created_at' => '2014-08-12',
+        ],
+    ]),
     '_dispatch' => new ArrayObject([
-            'name' => 'Standard Versand',
-            'description' => '',
-        ]),
+        'name' => 'Standard Versand',
+        'description' => '',
+    ]),
     '_net' => false,
     '_summaryNet' => false,
     '_amountNetto' => 47.757310924369747,
     '_amount' => 56.839999999999996,
     '_tax' => [
-            '19.00' => 9.0826890756302507,
-        ],
+        '19.00' => 9.0826890756302507,
+    ],
     '_currency' => new ArrayObject([
-            'currency' => 'EUR',
-            'name' => 'Euro',
-            'factor' => '1',
-            'char' => '&euro;',
-        ]),
+        'currency' => 'EUR',
+        'name' => 'Euro',
+        'factor' => '1',
+        'char' => '&euro;',
+    ]),
     '_shippingCosts' => '3.9',
     '_shippingCostsAsPosition' => true,
     '_discount' => -2,
diff --git a/engine/Shopware/Models/Document/Document.php b/engine/Shopware/Models/Document/Document.php
index a843ae13353..18fadeb8c59 100644
--- a/engine/Shopware/Models/Document/Document.php
+++ b/engine/Shopware/Models/Document/Document.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Document;
@@ -134,7 +134,7 @@ class Document extends ModelEntity
     /**
      * INVERSED SIDE
      *
-     * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Document\Element>
+     * @var ArrayCollection<Element>
      *
      * @ORM\OneToMany(targetEntity="\Shopware\Models\Document\Element", mappedBy="document", orphanRemoval=true, cascade={"persist"})
      * @ORM\JoinColumn(name="id", referencedColumnName="documentID")
@@ -161,7 +161,7 @@ public function getId()
      *
      * @param string $name
      *
-     * @return \Shopware\Models\Document\Document
+     * @return Document
      */
     public function setName($name)
     {
@@ -185,7 +185,7 @@ public function getName()
      *
      * @param string $key
      *
-     * @return \Shopware\Models\Document\Document
+     * @return Document
      */
     public function setKey($key)
     {
@@ -209,7 +209,7 @@ public function getKey()
      *
      * @param string $template
      *
-     * @return \Shopware\Models\Document\Document
+     * @return Document
      */
     public function setTemplate($template)
     {
@@ -233,7 +233,7 @@ public function getTemplate()
      *
      * @param string $numbers
      *
-     * @return \Shopware\Models\Document\Document
+     * @return Document
      */
     public function setNumbers($numbers)
     {
@@ -257,7 +257,7 @@ public function getNumbers()
      *
      * @param int $bottom
      *
-     * @return \Shopware\Models\Document\Document
+     * @return Document
      */
     public function setBottom($bottom)
     {
@@ -281,7 +281,7 @@ public function getBottom()
      *
      * @param int $left
      *
-     * @return \Shopware\Models\Document\Document
+     * @return Document
      */
     public function setLeft($left)
     {
@@ -305,7 +305,7 @@ public function getLeft()
      *
      * @param int $pageBreak
      *
-     * @return \Shopware\Models\Document\Document
+     * @return Document
      */
     public function setPageBreak($pageBreak)
     {
@@ -329,7 +329,7 @@ public function getPageBreak()
      *
      * @param int $right
      *
-     * @return \Shopware\Models\Document\Document
+     * @return Document
      */
     public function setRight($right)
     {
@@ -353,7 +353,7 @@ public function getRight()
      *
      * @param int $top
      *
-     * @return \Shopware\Models\Document\Document
+     * @return Document
      */
     public function setTop($top)
     {
@@ -375,13 +375,13 @@ public function getTop()
     /**
      * Sets the form-elements.
      *
-     * @param \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Document\Element>|Element[] $elements
+     * @param ArrayCollection<Element>|Element[] $elements
      *
      * @return Document
      */
     public function setElements($elements)
     {
-        $this->setOneToMany($elements, \Shopware\Models\Document\Element::class, 'elements', 'document');
+        $this->setOneToMany($elements, Element::class, 'elements', 'document');
 
         return $this;
     }
@@ -389,7 +389,7 @@ public function setElements($elements)
     /**
      * Gets the form-elements.
      *
-     * @return \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Document\Element>
+     * @return ArrayCollection<Element>
      */
     public function getElements()
     {
diff --git a/engine/Shopware/Models/Document/Element.php b/engine/Shopware/Models/Document/Element.php
index 295dac96f9f..801d13baedd 100644
--- a/engine/Shopware/Models/Document/Element.php
+++ b/engine/Shopware/Models/Document/Element.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Document;
diff --git a/engine/Shopware/Models/Document/Order.php b/engine/Shopware/Models/Document/Order.php
index fb5cf3a2e56..05622e0ee1c 100644
--- a/engine/Shopware/Models/Document/Order.php
+++ b/engine/Shopware/Models/Document/Order.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Bundle\CartBundle\CartKey;
@@ -201,7 +201,7 @@ class Shopware_Models_Document_Order extends Enlight_Class implements Enlight_Ho
     public function __construct($id, $config = [])
     {
         // Test-data for preview mode
-        if ((bool) $config['_preview'] === true && (bool) $config['_previewSample'] === true) {
+        if ($config['_preview'] && ($config['_previewSample'] ?? null)) {
             $array = $this->getDemoData();
 
             $array['_order']->language = 1;
@@ -216,7 +216,7 @@ public function __construct($id, $config = [])
         $this->_id = $id;
         $this->_config = $config;
         $this->_summaryNet = (bool) ($config['summaryNet'] ?? false);
-        $this->_shippingCostsAsPosition = (bool) $config['shippingCostsAsPosition'];
+        $this->_shippingCostsAsPosition = (bool) ($config['shippingCostsAsPosition'] ?? false);
 
         $this->getOrder();
 
@@ -278,7 +278,7 @@ public function __get($var_name)
         if (property_exists($this, $var_name)) {
             return $this->$var_name;
         }
-        throw new Enlight_Exception(sprintf('Property %s does not exist', $var_name));
+        throw new Enlight_Exception(\sprintf('Property %s does not exist', $var_name));
     }
 
     /**
@@ -298,7 +298,7 @@ public function getOrder()
             [$this->_id]);
 
         if (!\is_array($order)) {
-            throw new Enlight_Exception(sprintf('Order with id %d not found!', $this->_id));
+            throw new Enlight_Exception(\sprintf('Order with id %d not found!', $this->_id));
         }
 
         $this->_order = new ArrayObject($order, ArrayObject::ARRAY_AS_PROPS);
@@ -400,7 +400,7 @@ public function processOrder()
                         if ($shippingTax !== null) {
                             foreach ($shippingTax as $key => $val) {
                                 if (isset($this->_tax[$key])) {
-                                    $this->_tax[$key] = $this->_tax[$key] + $val;
+                                    $this->_tax[$key] += $val;
                                 } else {
                                     $this->_tax[$key] = $val;
                                 }
@@ -962,17 +962,17 @@ private function getTaxRateByApproximateTaxRate(
                 ';
 
         $taxRate = Shopware()->Db()->fetchOne($sql, [
-                $approximateTaxRate, // p.e. 19.971195391 (approx. 20% VAT)
-                $approximateTaxRate,
-                $maxDiff, //default: 0.1
-                $approximateTaxRate,
-                $approximateTaxRate,
-                $maxDiff,
-                $areaId, //p.e. 3 (Europe)
-                $countryId, // p.e. 23 (AT)
-                $stateId, //p.e. 0
-                $customerGroupId, //p.e. 1 (EK)
-            ]);
+            $approximateTaxRate, // p.e. 19.971195391 (approx. 20% VAT)
+            $approximateTaxRate,
+            $maxDiff, // default: 0.1
+            $approximateTaxRate,
+            $approximateTaxRate,
+            $maxDiff,
+            $areaId, // p.e. 3 (Europe)
+            $countryId, // p.e. 23 (AT)
+            $stateId, // p.e. 0
+            $customerGroupId, // p.e. 1 (EK)
+        ]);
 
         if ($taxRate === false) {
             $taxRate = round($approximateTaxRate);
@@ -1040,7 +1040,7 @@ private function getCountry(int $countryId): array
     {
         $country = $this->countryGateway->getCountry($countryId, $this->context);
         if (!$country instanceof Country) {
-            throw new RuntimeException(sprintf('Country with ID "%s" not found', $countryId));
+            throw new RuntimeException(\sprintf('Country with ID "%s" not found', $countryId));
         }
 
         return $this->structConverter->convertCountryStruct($country);
diff --git a/engine/Shopware/Models/Emotion/Data.php b/engine/Shopware/Models/Emotion/Data.php
index 0820bfe0e45..d16561c48f7 100644
--- a/engine/Shopware/Models/Emotion/Data.php
+++ b/engine/Shopware/Models/Emotion/Data.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Emotion;
@@ -117,7 +117,7 @@ class Data extends ModelEntity
      *
      * @ORM\Column(name="value", type="text", nullable=true)
      */
-    private $value = null;
+    private $value;
 
     public function __clone()
     {
diff --git a/engine/Shopware/Models/Emotion/Element.php b/engine/Shopware/Models/Emotion/Element.php
index 656ce5b443e..98269da9340 100644
--- a/engine/Shopware/Models/Emotion/Element.php
+++ b/engine/Shopware/Models/Emotion/Element.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Emotion;
diff --git a/engine/Shopware/Models/Emotion/ElementViewport.php b/engine/Shopware/Models/Emotion/ElementViewport.php
index a0bfbf159f7..b461b1ed87b 100644
--- a/engine/Shopware/Models/Emotion/ElementViewport.php
+++ b/engine/Shopware/Models/Emotion/ElementViewport.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Emotion;
@@ -34,7 +34,7 @@
 class ElementViewport extends ModelEntity
 {
     /**
-     * @var \Shopware\Models\Emotion\Element
+     * @var Element
      *
      * @ORM\ManyToOne(targetEntity="Shopware\Models\Emotion\Element", inversedBy="viewports")
      * @ORM\JoinColumn(name="elementID", referencedColumnName="id", nullable=false)
@@ -42,7 +42,7 @@ class ElementViewport extends ModelEntity
     protected $element;
 
     /**
-     * @var \Shopware\Models\Emotion\Emotion
+     * @var Emotion
      *
      * @ORM\ManyToOne(targetEntity="\Shopware\Models\Emotion\Emotion")
      * @ORM\JoinColumn(name="emotionID", referencedColumnName="id", nullable=false)
diff --git a/engine/Shopware/Models/Emotion/Emotion.php b/engine/Shopware/Models/Emotion/Emotion.php
index 09989b6cf21..f5735bad39f 100644
--- a/engine/Shopware/Models/Emotion/Emotion.php
+++ b/engine/Shopware/Models/Emotion/Emotion.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Emotion;
@@ -225,7 +225,7 @@ class Emotion extends ModelEntity
     /**
      * @var string
      *
-     * @ORM\Column(name="seo_description", type="string", length=255, nullable=false)
+     * @ORM\Column(name="seo_description", type="text", nullable=false)
      */
     private $seoDescription;
 
@@ -339,6 +339,7 @@ class Emotion extends ModelEntity
      * only_listing => only displayed in category listing page
      *
      * @var string
+     *
      * @ORM\Column(name="listing_visibility", type="string", nullable=false)
      */
     private $listingVisibility = self::LISTING_VISIBILITY_ONLY_START;
@@ -739,10 +740,7 @@ public function getTemplate()
         return $this->template;
     }
 
-    /**
-     * @param Template $template
-     */
-    public function setTemplate(Template $template = null)
+    public function setTemplate(?Template $template = null)
     {
         $this->template = $template;
     }
diff --git a/engine/Shopware/Models/Emotion/LandingPage.php b/engine/Shopware/Models/Emotion/LandingPage.php
index b95257c0579..7e11d699965 100644
--- a/engine/Shopware/Models/Emotion/LandingPage.php
+++ b/engine/Shopware/Models/Emotion/LandingPage.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Emotion;
diff --git a/engine/Shopware/Models/Emotion/Library/Component.php b/engine/Shopware/Models/Emotion/Library/Component.php
index 3aeeadaf80b..eb74af4c555 100644
--- a/engine/Shopware/Models/Emotion/Library/Component.php
+++ b/engine/Shopware/Models/Emotion/Library/Component.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Emotion\Library;
@@ -589,6 +589,29 @@ public function createTextField(array $options)
         return $this->createField($options);
     }
 
+    /**
+     * Creates a no URL Ext.form.field.Text element.
+     * http://docs.sencha.com/extjs/4.2.2/#!/api/Ext.form.field.Text
+     *
+     * options {
+     *     string $name       Required; Logical name of the component field
+     *     string $fieldLabel optional; Ext JS form field label
+     *     string $allowBlank Optional; Defines if the value can contain null
+     * }
+     *
+     * @param array{name: string, fieldLabel?: string, allowBlank?: bool} $options
+     *
+     * @return Field
+     */
+    public function createNoUrlField(array $options)
+    {
+        $options += [
+            'xtype' => 'nourl',
+        ];
+
+        return $this->createField($options);
+    }
+
     /**
      * Creates a Ext.form.field.TextArea element.
      * http://docs.sencha.com/extjs/4.2.2/#!/api/Ext.form.field.TextArea
diff --git a/engine/Shopware/Models/Emotion/Library/Field.php b/engine/Shopware/Models/Emotion/Library/Field.php
index eb7dfe8164f..5ca1ec784ab 100644
--- a/engine/Shopware/Models/Emotion/Library/Field.php
+++ b/engine/Shopware/Models/Emotion/Library/Field.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Emotion\Library;
@@ -33,6 +33,9 @@
  */
 class Field extends ModelEntity
 {
+    public const VALUE_TYPE_JSON = 'json';
+    public const VALUE_TYPE_STRING = 'string';
+
     /**
      * Unique identifier field of the element model.
      *
diff --git a/engine/Shopware/Models/Emotion/Preset.php b/engine/Shopware/Models/Emotion/Preset.php
index d41ec0e810b..5153988065b 100644
--- a/engine/Shopware/Models/Emotion/Preset.php
+++ b/engine/Shopware/Models/Emotion/Preset.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Emotion;
@@ -38,7 +38,7 @@
 class Preset extends ModelEntity
 {
     /**
-     * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Emotion\PresetTranslation>
+     * @var ArrayCollection<PresetTranslation>
      *
      * @ORM\OneToMany(targetEntity="Shopware\Models\Emotion\PresetTranslation", mappedBy="preset", orphanRemoval=true, cascade={"persist"})
      */
@@ -68,7 +68,6 @@ class Preset extends ModelEntity
      * @var string
      *
      * @Assert\NotBlank()
-     *
      * @ORM\Column(name="name", type="string", length=255, nullable=false)
      */
     private $name;
@@ -115,7 +114,6 @@ class Preset extends ModelEntity
      * @var string
      *
      * @Assert\NotBlank()
-     *
      * @ORM\Column(name="preset_data", type="text", nullable=false)
      */
     private $presetData;
@@ -308,17 +306,17 @@ public function setHidden($hidden)
     }
 
     /**
-     * @param \Shopware\Models\Emotion\PresetTranslation[] $translations
+     * @param PresetTranslation[] $translations
      *
      * @return Preset
      */
     public function setTranslations(array $translations)
     {
-        return $this->setOneToMany($translations, \Shopware\Models\Emotion\PresetTranslation::class, 'translations', 'preset');
+        return $this->setOneToMany($translations, PresetTranslation::class, 'translations', 'preset');
     }
 
     /**
-     * @return \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Emotion\PresetTranslation>
+     * @return ArrayCollection<PresetTranslation>
      */
     public function getTranslations()
     {
diff --git a/engine/Shopware/Models/Emotion/PresetTranslation.php b/engine/Shopware/Models/Emotion/PresetTranslation.php
index 350d793cffb..99448b52674 100644
--- a/engine/Shopware/Models/Emotion/PresetTranslation.php
+++ b/engine/Shopware/Models/Emotion/PresetTranslation.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Emotion;
@@ -36,7 +36,7 @@
 class PresetTranslation extends ModelEntity
 {
     /**
-     * @var \Shopware\Models\Emotion\Preset
+     * @var Preset
      *
      * @ORM\ManyToOne(targetEntity="Shopware\Models\Emotion\Preset", inversedBy="translations")
      * @ORM\JoinColumn(name="presetID", referencedColumnName="id", nullable=false)
diff --git a/engine/Shopware/Models/Emotion/Repository.php b/engine/Shopware/Models/Emotion/Repository.php
index de4c01583f9..19bc11f16dd 100644
--- a/engine/Shopware/Models/Emotion/Repository.php
+++ b/engine/Shopware/Models/Emotion/Repository.php
@@ -1,31 +1,32 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Emotion;
 
 use DateTime;
 use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Query\QueryBuilder as DBALQueryBuilder;
 use Doctrine\ORM\Query;
 use Shopware\Components\Model\ModelRepository;
 use Shopware\Components\Model\QueryBuilder;
@@ -43,7 +44,7 @@ class Repository extends ModelRepository
      * @param string                                                        $filter
      * @param string|array<array{property: string, direction: string}>|null $orderBy
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getListQueryBuilder($filter = null, $orderBy = null)
     {
@@ -72,7 +73,7 @@ public function getListQueryBuilder($filter = null, $orderBy = null)
      * @param string|null $filterBy
      * @param int|null    $categoryId
      *
-     * @return \Doctrine\DBAL\Query\QueryBuilder
+     * @return DBALQueryBuilder
      */
     public function getListingQuery($filter = null, $filterBy = null, $categoryId = null)
     {
@@ -199,7 +200,7 @@ public function getListingQuery($filter = null, $filterBy = null, $categoryId =
      * @param int       $offset
      * @param int       $limit
      *
-     * @return Query
+     * @return Query<Emotion>
      */
     public function getNameListQuery($filter = null, $orderBy = null, $offset = null, $limit = null)
     {
@@ -219,7 +220,7 @@ public function getNameListQuery($filter = null, $orderBy = null, $offset = null
      * @param bool                                                          $filter
      * @param string|array<array{property: string, direction: string}>|null $orderBy
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getNameListQueryBuilder($filter = null, $orderBy = null)
     {
@@ -249,7 +250,7 @@ public function getNameListQueryBuilder($filter = null, $orderBy = null)
      *
      * @param int $emotionId
      *
-     * @return Query
+     * @return Query<Emotion>
      */
     public function getEmotionDetailQuery($emotionId)
     {
@@ -264,7 +265,7 @@ public function getEmotionDetailQuery($emotionId)
      *
      * @param int $emotionId
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getEmotionDetailQueryBuilder($emotionId)
     {
@@ -290,7 +291,7 @@ public function getEmotionDetailQueryBuilder($emotionId)
      * @param int $elementId
      * @param int $componentId
      *
-     * @return Query
+     * @return Query<Data>
      */
     public function getElementDataQuery($elementId, $componentId)
     {
@@ -306,7 +307,7 @@ public function getElementDataQuery($elementId, $componentId)
      * @param int $elementId
      * @param int $componentId
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getElementDataQueryBuilder($elementId, $componentId)
     {
@@ -348,7 +349,7 @@ public function getElementsViewports($elementIds)
      *
      * @param int $emotionId
      *
-     * @return Query
+     * @return Query<EmotionAttribute>
      */
     public function getEmotionAttributesQuery($emotionId)
     {
@@ -363,7 +364,7 @@ public function getEmotionAttributesQuery($emotionId)
      *
      * @param int $emotionId
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getEmotionAttributesQueryBuilder($emotionId)
     {
@@ -379,7 +380,7 @@ public function getEmotionAttributesQueryBuilder($emotionId)
     /**
      * @param int $categoryId
      *
-     * @return Query
+     * @return Query<Emotion>
      */
     public function getCategoryBaseEmotionsQuery($categoryId)
     {
@@ -391,7 +392,7 @@ public function getCategoryBaseEmotionsQuery($categoryId)
     /**
      * @param int $categoryId
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getCategoryBaseEmotionsQueryBuilder($categoryId)
     {
@@ -435,7 +436,7 @@ public function getEmotionElementsQuery($emotionId)
      * @param int $offset
      * @param int $limit
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getCampaigns($offset = null, $limit = null)
     {
@@ -455,7 +456,7 @@ public function getCampaigns($offset = null, $limit = null)
     /**
      * @param int $shopId
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getCampaignsByShopId($shopId)
     {
@@ -491,7 +492,7 @@ public function getEmotionById($id)
     /**
      * @param int[] $elementIds
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     private function getElementViewportsQueryBuilder($elementIds)
     {
diff --git a/engine/Shopware/Models/Emotion/Template.php b/engine/Shopware/Models/Emotion/Template.php
index ee42c1efc93..bf4f7f10993 100644
--- a/engine/Shopware/Models/Emotion/Template.php
+++ b/engine/Shopware/Models/Emotion/Template.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Emotion;
@@ -38,7 +38,7 @@
 class Template extends ModelEntity
 {
     /**
-     * @var ArrayCollection<\Shopware\Models\Emotion\Emotion>
+     * @var ArrayCollection<Emotion>
      *
      * @ORM\OneToMany(targetEntity="Shopware\Models\Emotion\Emotion", mappedBy="template")
      */
diff --git a/engine/Shopware/Models/Form/Field.php b/engine/Shopware/Models/Form/Field.php
index 48a10735d88..c3a562d351d 100644
--- a/engine/Shopware/Models/Form/Field.php
+++ b/engine/Shopware/Models/Form/Field.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Form;
@@ -295,7 +295,7 @@ public function setTyp($typ)
     }
 
     /**
-     * Get typ of field
+     * Get type of field
      *
      * @return string
      */
@@ -305,7 +305,7 @@ public function getTyp()
     }
 
     /**
-     * Set whether or not this field is required
+     * Set whether this field is required or not
      *
      * @param int $required
      *
@@ -319,7 +319,7 @@ public function setRequired($required)
     }
 
     /**
-     * Get whether or not this field is required
+     * Get whether this field is required or not
      *
      * @return int
      */
diff --git a/engine/Shopware/Models/Form/Form.php b/engine/Shopware/Models/Form/Form.php
index b486e634c60..6d7793ee05a 100644
--- a/engine/Shopware/Models/Form/Form.php
+++ b/engine/Shopware/Models/Form/Form.php
@@ -1,31 +1,33 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Form;
 
+use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
 use Shopware\Components\Model\ModelEntity;
+use Shopware\Models\Attribute\Form as FormAttribute;
 
 /**
  * Shopware field model represents a single form
@@ -52,7 +54,7 @@ class Form extends ModelEntity
     /**
      * INVERSE SIDE
      *
-     * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Form\Field>
+     * @var ArrayCollection<Field>
      *
      * @ORM\OneToMany(targetEntity="Shopware\Models\Form\Field", mappedBy="form", orphanRemoval=true, cascade={"persist"})
      */
@@ -61,7 +63,7 @@ class Form extends ModelEntity
     /**
      * INVERSE SIDE
      *
-     * @var \Shopware\Models\Attribute\Form|null
+     * @var FormAttribute|null
      *
      * @ORM\OneToOne(targetEntity="Shopware\Models\Attribute\Form", mappedBy="form", orphanRemoval=true, cascade={"persist"})
      */
@@ -149,7 +151,7 @@ class Form extends ModelEntity
     /**
      * @var string|null
      *
-     * @ORM\Column(name="meta_keywords", type="string", length=255, nullable=true)
+     * @ORM\Column(name="meta_keywords", type="text", nullable=true)
      */
     private $metaKeywords = '';
 
@@ -169,13 +171,13 @@ class Form extends ModelEntity
 
     public function __construct()
     {
-        $this->fields = new \Doctrine\Common\Collections\ArrayCollection();
+        $this->fields = new ArrayCollection();
     }
 
     /**
      * Returns a clone of this form incl. it's fields
      *
-     * @return \Shopware\Models\Form\Form
+     * @return Form
      */
     public function getClone()
     {
@@ -193,7 +195,7 @@ public function getClone()
     }
 
     /**
-     * @return \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Form\Field>
+     * @return ArrayCollection<Field>
      */
     public function getFields()
     {
@@ -201,21 +203,19 @@ public function getFields()
     }
 
     /**
-     * @param \Shopware\Models\Form\Field[]|null $fields
+     * @param Field[]|null $fields
      *
      * @return Form
      */
     public function setFields($fields)
     {
-        return $this->setOneToMany($fields, \Shopware\Models\Form\Field::class, 'fields', 'form');
+        return $this->setOneToMany($fields, Field::class, 'fields', 'form');
     }
 
     /**
      * Adds a field
      *
-     * @param \Shopware\Models\Form\Field $field
-     *
-     * @return \Shopware\Models\Form\Form
+     * @return Form
      */
     public function addField(Field $field)
     {
@@ -264,7 +264,7 @@ public function getName()
     /**
      * @param string $name
      *
-     * @return \Shopware\Models\Form\Form
+     * @return Form
      */
     public function setName($name)
     {
@@ -276,7 +276,7 @@ public function setName($name)
     /**
      * @param string $text
      *
-     * @return \Shopware\Models\Form\Form
+     * @return Form
      */
     public function setText($text)
     {
@@ -296,7 +296,7 @@ public function getText()
     /**
      * @param string $email
      *
-     * @return \Shopware\Models\Form\Form
+     * @return Form
      */
     public function setEmail($email)
     {
@@ -316,7 +316,7 @@ public function getEmail()
     /**
      * @param string $emailTemplate
      *
-     * @return \Shopware\Models\Form\Form
+     * @return Form
      */
     public function setEmailTemplate($emailTemplate)
     {
@@ -336,7 +336,7 @@ public function getEmailTemplate()
     /**
      * @param string $emailSubject
      *
-     * @return \Shopware\Models\Form\Form
+     * @return Form
      */
     public function setEmailSubject($emailSubject)
     {
@@ -356,7 +356,7 @@ public function getEmailSubject()
     /**
      * @param string $text2
      *
-     * @return \Shopware\Models\Form\Form
+     * @return Form
      */
     public function setText2($text2)
     {
@@ -376,7 +376,7 @@ public function getText2()
     /**
      * @param int $ticketTypeid
      *
-     * @return \Shopware\Models\Form\Form
+     * @return Form
      */
     public function setTicketTypeid($ticketTypeid)
     {
@@ -396,7 +396,7 @@ public function getTicketTypeid()
     /**
      * @param string $isocode
      *
-     * @return \Shopware\Models\Form\Form
+     * @return Form
      */
     public function setIsocode($isocode)
     {
@@ -462,7 +462,7 @@ public function getMetaKeywords()
     }
 
     /**
-     * @return \Shopware\Models\Attribute\Form|null
+     * @return FormAttribute|null
      */
     public function getAttribute()
     {
@@ -470,13 +470,13 @@ public function getAttribute()
     }
 
     /**
-     * @param \Shopware\Models\Attribute\Form|array|null $attribute
+     * @param FormAttribute|array|null $attribute
      *
      * @return Form
      */
     public function setAttribute($attribute)
     {
-        return $this->setOneToOne($attribute, \Shopware\Models\Attribute\Form::class, 'attribute', 'form');
+        return $this->setOneToOne($attribute, FormAttribute::class, 'attribute', 'form');
     }
 
     /**
diff --git a/engine/Shopware/Models/Form/Repository.php b/engine/Shopware/Models/Form/Repository.php
index 4e84fe963e1..b92faa94c43 100644
--- a/engine/Shopware/Models/Form/Repository.php
+++ b/engine/Shopware/Models/Form/Repository.php
@@ -1,31 +1,33 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Form;
 
+use Doctrine\ORM\Query;
 use Shopware\Components\Model\ModelRepository;
 use Shopware\Components\Model\QueryBuilder;
+use Shopware\Models\Attribute\Form as FormAttribute;
 
 /**
  * @extends ModelRepository<Form>
@@ -40,7 +42,7 @@ class Repository extends ModelRepository
      * @param int        $offset
      * @param int        $limit
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Form>
      */
     public function getListQuery($filter, $orderBy, $offset, $limit)
     {
@@ -58,7 +60,7 @@ public function getListQuery($filter, $orderBy, $offset, $limit)
      * @param array|null $filter
      * @param array|null $orderBy
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getListQueryBuilder($filter = null, $orderBy = null)
     {
@@ -86,7 +88,7 @@ public function getListQueryBuilder($filter = null, $orderBy = null)
      * @param int      $formId
      * @param int|null $shopId
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Form>
      */
     public function getFormQuery($formId, $shopId = null)
     {
@@ -101,7 +103,7 @@ public function getFormQuery($formId, $shopId = null)
      * @param int      $formId
      * @param int|null $shopId
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Form>
      */
     public function getActiveFormQuery($formId, $shopId = null)
     {
@@ -117,13 +119,13 @@ public function getActiveFormQuery($formId, $shopId = null)
      * @param int      $formId
      * @param int|null $shopId
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getFormQueryBuilder($formId, $shopId = null)
     {
         $builder = $this->getEntityManager()->createQueryBuilder();
         $builder->select(['forms', 'fields', 'attribute'])
-            ->from(\Shopware\Models\Form\Form::class, 'forms')
+            ->from(Form::class, 'forms')
             ->leftJoin('forms.fields', 'fields')
             ->leftJoin('forms.attribute', 'attribute')
             ->where('forms.id = :form_id')
@@ -144,7 +146,7 @@ public function getFormQueryBuilder($formId, $shopId = null)
      *
      * @param int $formId
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<FormAttribute>
      */
     public function getAttributesQuery($formId)
     {
@@ -159,13 +161,13 @@ public function getAttributesQuery($formId)
      *
      * @param int $formId
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getAttributesQueryBuilder($formId)
     {
         $builder = $this->getEntityManager()->createQueryBuilder();
         $builder->select(['attribute'])
-            ->from(\Shopware\Models\Attribute\Form::class, 'attribute')
+            ->from(FormAttribute::class, 'attribute')
             ->where('attribute.formId = ?1')
             ->setParameter(1, $formId);
 
diff --git a/engine/Shopware/Models/Log/Log.php b/engine/Shopware/Models/Log/Log.php
index 5321ee259bd..73ebab30d1e 100644
--- a/engine/Shopware/Models/Log/Log.php
+++ b/engine/Shopware/Models/Log/Log.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Log;
diff --git a/engine/Shopware/Models/Mail/Attachment.php b/engine/Shopware/Models/Mail/Attachment.php
index 591a5373249..2ded4e22c54 100644
--- a/engine/Shopware/Models/Mail/Attachment.php
+++ b/engine/Shopware/Models/Mail/Attachment.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Mail;
@@ -71,7 +71,7 @@ class Attachment extends File
      */
     protected $mail;
 
-    public function __construct(Mail $mail, Media $media, Shop $shop = null)
+    public function __construct(Mail $mail, Media $media, ?Shop $shop = null)
     {
         $this->mail = $mail;
         $this->media = $media;
@@ -114,7 +114,7 @@ public function getShopId()
         return null;
     }
 
-    public function setShop(Shop $shop = null)
+    public function setShop(?Shop $shop = null)
     {
         $this->shop = $shop;
     }
diff --git a/engine/Shopware/Models/Mail/Contact.php b/engine/Shopware/Models/Mail/Contact.php
index ce03398b483..908d4c40af4 100644
--- a/engine/Shopware/Models/Mail/Contact.php
+++ b/engine/Shopware/Models/Mail/Contact.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Mail;
diff --git a/engine/Shopware/Models/Mail/File.php b/engine/Shopware/Models/Mail/File.php
index 81a8774eaa8..7e139cc173b 100644
--- a/engine/Shopware/Models/Mail/File.php
+++ b/engine/Shopware/Models/Mail/File.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Mail;
diff --git a/engine/Shopware/Models/Mail/Log.php b/engine/Shopware/Models/Mail/Log.php
index 77b30189408..07fecbd800f 100644
--- a/engine/Shopware/Models/Mail/Log.php
+++ b/engine/Shopware/Models/Mail/Log.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Mail;
diff --git a/engine/Shopware/Models/Mail/LogRepository.php b/engine/Shopware/Models/Mail/LogRepository.php
index cb1cf920de0..f5d7f1e6499 100644
--- a/engine/Shopware/Models/Mail/LogRepository.php
+++ b/engine/Shopware/Models/Mail/LogRepository.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Mail;
@@ -28,8 +28,8 @@
 use DateTimeInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\ClassMetadata;
-use Doctrine\ORM\QueryBuilder;
 use Shopware\Components\Model\ModelRepository;
+use Shopware\Components\Model\QueryBuilder;
 
 /**
  * @extends ModelRepository<Log>
@@ -100,9 +100,7 @@ public function getDeleteByDateQueryBuilder(?DateTimeInterface $since, ?DateTime
     protected function addDateConstraint(QueryBuilder $qb, ?DateTimeInterface $since, ?DateTimeInterface $until): void
     {
         $qb->andWhere('log.sentAt BETWEEN :since AND :until')
-            ->setParameters([
-                'since' => $since ?: $this->minDate,
-                'until' => $until ?: $this->maxDate,
-            ]);
+            ->setParameter('since', $since ?: $this->minDate)
+            ->setParameter('until', $until ?: $this->maxDate);
     }
 }
diff --git a/engine/Shopware/Models/Mail/LogRepositoryInterface.php b/engine/Shopware/Models/Mail/LogRepositoryInterface.php
index 6fc872efae3..91f89ded96f 100644
--- a/engine/Shopware/Models/Mail/LogRepositoryInterface.php
+++ b/engine/Shopware/Models/Mail/LogRepositoryInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Mail;
@@ -45,6 +45,8 @@ public function findByDate(?DateTimeInterface $since, ?DateTimeInterface $until)
      * The deleteByDate method removes all log entries created between $since and $until.
      * If either of the parameters is left out, the default constant MIN_DATE (since) or MAX_DATE (until)
      * is used.
+     *
+     * @return int|mixed
      */
     public function deleteByDate(?DateTimeInterface $since, ?DateTimeInterface $until);
 
diff --git a/engine/Shopware/Models/Mail/Mail.php b/engine/Shopware/Models/Mail/Mail.php
index 44dc9398b5e..d429e3764f4 100644
--- a/engine/Shopware/Models/Mail/Mail.php
+++ b/engine/Shopware/Models/Mail/Mail.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Mail;
diff --git a/engine/Shopware/Models/Mail/Repository.php b/engine/Shopware/Models/Mail/Repository.php
index c74e5ee4059..4ca0d0276ce 100644
--- a/engine/Shopware/Models/Mail/Repository.php
+++ b/engine/Shopware/Models/Mail/Repository.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Mail;
@@ -39,7 +39,7 @@ class Repository extends ModelRepository
      *
      * @param int $mailId
      *
-     * @return Query
+     * @return Query<Mail>
      */
     public function getMailQuery($mailId)
     {
@@ -74,7 +74,7 @@ public function getMailQueryBuilder($mailId)
      *
      * @param int $mailId
      *
-     * @return Query
+     * @return Query<MailAttribute>
      */
     public function getAttributesQuery($mailId)
     {
@@ -109,7 +109,7 @@ public function getAttributesQueryBuilder($mailId)
      * @param string   $name
      * @param int|null $mailId
      *
-     * @return Query
+     * @return Query<Mail>
      */
     public function getValidateNameQuery($name, $mailId = null)
     {
@@ -149,9 +149,9 @@ public function getValidateNameQueryBuilder($name, $mailId = null)
      * @param int|null     $offset
      * @param int|null     $limit
      *
-     * @return Query
+     * @return Query<Mail>
      */
-    public function getMailListQuery(array $filter = [], array $order = null, $offset = null, $limit = null)
+    public function getMailListQuery(array $filter = [], ?array $order = null, $offset = null, $limit = null)
     {
         return $this->getMailsListQueryBuilder($filter, $order, $offset, $limit)->getQuery();
     }
@@ -162,7 +162,7 @@ public function getMailListQuery(array $filter = [], array $order = null, $offse
      *
      * @return QueryBuilder
      */
-    public function getMailsListQueryBuilder(array $filter = [], array $order = null, $offset = null, $limit = null)
+    public function getMailsListQueryBuilder(array $filter = [], ?array $order = null, $offset = null, $limit = null)
     {
         $builder = $this->getEntityManager()->createQueryBuilder();
         $builder
diff --git a/engine/Shopware/Models/Media/Album.php b/engine/Shopware/Models/Media/Album.php
index 053addb62f4..9afc3afc238 100644
--- a/engine/Shopware/Models/Media/Album.php
+++ b/engine/Shopware/Models/Media/Album.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Media;
diff --git a/engine/Shopware/Models/Media/Media.php b/engine/Shopware/Models/Media/Media.php
index d318ec41806..95e2db8cc55 100644
--- a/engine/Shopware/Models/Media/Media.php
+++ b/engine/Shopware/Models/Media/Media.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Media;
@@ -230,7 +230,7 @@ class Media extends ModelEntity
     /**
      * Internal container for the uploaded file.
      *
-     * @var UploadedFile
+     * @var File
      */
     private $file;
 
@@ -568,8 +568,6 @@ public function getFile()
      * Setter method for the file property. If the file is set, the file information will be extracted
      * and set into the internal properties.
      *
-     * @param UploadedFile $file
-     *
      * @return Media
      */
     public function setFile(File $file)
@@ -716,7 +714,7 @@ public function onLoad()
     public function onRemove()
     {
         $mediaService = Shopware()->Container()->get(MediaServiceInterface::class);
-        //check if file exist and remove it
+        // check if file exist and remove it
         if ($mediaService->has($this->path)) {
             $mediaService->delete($this->path);
         }
@@ -770,8 +768,6 @@ public function createAlbumThumbnails(Album $album)
             if (!is_numeric($data['width'])) {
                 continue;
             }
-            // If no height configured, set 0
-            $data['height'] = isset($data['height']) ? $data['height'] : 0;
 
             // Create thumbnail with the configured size
             $this->createThumbnail((int) $data['width'], (int) $data['height']);
@@ -824,7 +820,7 @@ public function removeAlbumThumbnails($thumbnailSizes, $fileName)
     /**
      * Returns the converted file name.
      *
-     * @return bool|string
+     * @return string
      */
     public function getFileName()
     {
@@ -832,7 +828,6 @@ public function getFileName()
             return $this->removeSpecialCharacters($this->name) . '.' . $this->extension;
         }
 
-        // Do whatever you want to generate a unique name
         return Random::getAlphanumericString(13) . '.' . $this->extension;
     }
 
@@ -1277,12 +1272,7 @@ private function setFileInfo()
         }
     }
 
-    /**
-     * @param string $name
-     *
-     * @return string
-     */
-    private function removeSpecialCharacters($name)
+    private function removeSpecialCharacters(string $name): string
     {
         $name = iconv('utf-8', 'ascii//translit', $name);
         $name = preg_replace('#[^A-Za-z0-9\-_]#', '-', $name);
diff --git a/engine/Shopware/Models/Media/MediaSubscriber.php b/engine/Shopware/Models/Media/MediaSubscriber.php
index 9a89c0bee10..02cc942d8e9 100644
--- a/engine/Shopware/Models/Media/MediaSubscriber.php
+++ b/engine/Shopware/Models/Media/MediaSubscriber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Media;
diff --git a/engine/Shopware/Models/Media/Repository.php b/engine/Shopware/Models/Media/Repository.php
index 3f382d8ffa0..fc8f26bddd3 100644
--- a/engine/Shopware/Models/Media/Repository.php
+++ b/engine/Shopware/Models/Media/Repository.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Media;
@@ -46,7 +46,7 @@ class Repository extends ModelRepository
      * @param int|null   $offset
      * @param int|null   $limit
      *
-     * @return Query
+     * @return Query<Media>
      */
     public function getMediaListQuery($filter = null, $orderBy = null, $limit = null, $offset = null)
     {
@@ -66,7 +66,7 @@ public function getMediaListQuery($filter = null, $orderBy = null, $limit = null
      * @param array<string, string>|array<array{property: string, value: mixed, expression?: string}>|null $filter
      * @param string|array<array{property: string, direction: string}>|null                                $orderBy
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getMediaListQueryBuilder($filter, $orderBy)
     {
@@ -96,7 +96,7 @@ public function getMediaListQueryBuilder($filter, $orderBy)
      * @param int|null                  $limit
      * @param array|null                $validTypes
      *
-     * @return Query
+     * @return Query<Media>
      */
     public function getAlbumMediaQuery($albumId, $filter = null, $orderBy = null, $offset = null, $limit = null, $validTypes = null)
     {
@@ -118,7 +118,7 @@ public function getAlbumMediaQuery($albumId, $filter = null, $orderBy = null, $o
      * @param string|OrderBy|null $orderBy
      * @param array|null          $validTypes
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getAlbumMediaQueryBuilder($albumId, $filter = null, $orderBy = null, $validTypes = null)
     {
@@ -136,7 +136,7 @@ public function getAlbumMediaQueryBuilder($albumId, $filter = null, $orderBy = n
         }
 
         // Filter for file types
-        if ($validTypes !== null && \is_array($validTypes) && !empty($validTypes)) {
+        if ($validTypes !== null && \is_array($validTypes) && !empty($validTypes) && !empty(array_filter($validTypes))) {
             $builder->andWhere('media.extension IN (?2)');
             $builder->setParameter(2, $validTypes);
         }
@@ -154,7 +154,7 @@ public function getAlbumMediaQueryBuilder($albumId, $filter = null, $orderBy = n
      *
      * @param int $albumId
      *
-     * @return Query
+     * @return Query<Album>
      */
     public function getAlbumWithSettingsQuery($albumId)
     {
@@ -169,7 +169,7 @@ public function getAlbumWithSettingsQuery($albumId)
      *
      * @param int $albumId
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getAlbumWithSettingsQueryBuilder($albumId)
     {
@@ -188,7 +188,7 @@ public function getAlbumWithSettingsQueryBuilder($albumId)
      *
      * @param string $path
      *
-     * @return Query
+     * @return Query<Media>
      */
     public function getMediaByPathQuery($path)
     {
@@ -203,7 +203,7 @@ public function getMediaByPathQuery($path)
      *
      * @param string $path
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getMediaByPathQueryBuilder($path)
     {
diff --git a/engine/Shopware/Models/Media/Settings.php b/engine/Shopware/Models/Media/Settings.php
index 4c7ade5cb97..78a9b33e540 100644
--- a/engine/Shopware/Models/Media/Settings.php
+++ b/engine/Shopware/Models/Media/Settings.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Media;
diff --git a/engine/Shopware/Models/Menu/Menu.php b/engine/Shopware/Models/Menu/Menu.php
index 7a7807a61ae..d08e96dd5c7 100644
--- a/engine/Shopware/Models/Menu/Menu.php
+++ b/engine/Shopware/Models/Menu/Menu.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Menu;
@@ -312,7 +312,7 @@ public function getParent()
         return $this->parent;
     }
 
-    public function setParent(Menu $parent = null)
+    public function setParent(?Menu $parent = null)
     {
         // Parent may be null when this menu item should be a main menu item
         if ($parent) {
diff --git a/engine/Shopware/Models/Menu/Repository.php b/engine/Shopware/Models/Menu/Repository.php
index da879fc9614..2edd72d430a 100644
--- a/engine/Shopware/Models/Menu/Repository.php
+++ b/engine/Shopware/Models/Menu/Repository.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Menu;
diff --git a/engine/Shopware/Models/MultiEdit/Backup.php b/engine/Shopware/Models/MultiEdit/Backup.php
index 6641d44292e..a842a4f50a6 100644
--- a/engine/Shopware/Models/MultiEdit/Backup.php
+++ b/engine/Shopware/Models/MultiEdit/Backup.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\MultiEdit;
diff --git a/engine/Shopware/Models/MultiEdit/Filter.php b/engine/Shopware/Models/MultiEdit/Filter.php
index 6a0f20fa498..321614520ef 100644
--- a/engine/Shopware/Models/MultiEdit/Filter.php
+++ b/engine/Shopware/Models/MultiEdit/Filter.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\MultiEdit;
diff --git a/engine/Shopware/Models/MultiEdit/Queue.php b/engine/Shopware/Models/MultiEdit/Queue.php
index 75954a3dcb2..8f94a67a662 100644
--- a/engine/Shopware/Models/MultiEdit/Queue.php
+++ b/engine/Shopware/Models/MultiEdit/Queue.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\MultiEdit;
@@ -40,7 +40,7 @@ class Queue extends ModelEntity
     /**
      * INVERSE SIDE
      *
-     * @var ArrayCollection<\Shopware\Models\MultiEdit\QueueArticle>
+     * @var ArrayCollection<QueueArticle>
      *
      * @ORM\OneToMany(targetEntity="Shopware\Models\MultiEdit\QueueArticle", mappedBy="queue", cascade={"persist"},  fetch="EXTRA_LAZY")
      */
@@ -154,7 +154,7 @@ public function getOperations()
     }
 
     /**
-     * @param \Doctrine\Common\Collections\ArrayCollection $articleDetails
+     * @param ArrayCollection $articleDetails
      */
     public function setArticleDetails($articleDetails)
     {
@@ -162,7 +162,7 @@ public function setArticleDetails($articleDetails)
     }
 
     /**
-     * @return \Doctrine\Common\Collections\ArrayCollection
+     * @return ArrayCollection
      */
     public function getArticleDetails()
     {
diff --git a/engine/Shopware/Models/MultiEdit/QueueArticle.php b/engine/Shopware/Models/MultiEdit/QueueArticle.php
index 71a5a5db74a..c151d1abc20 100644
--- a/engine/Shopware/Models/MultiEdit/QueueArticle.php
+++ b/engine/Shopware/Models/MultiEdit/QueueArticle.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\MultiEdit;
diff --git a/engine/Shopware/Models/MultiEdit/Repository.php b/engine/Shopware/Models/MultiEdit/Repository.php
index 1d726d85fae..0b009f2be8b 100644
--- a/engine/Shopware/Models/MultiEdit/Repository.php
+++ b/engine/Shopware/Models/MultiEdit/Repository.php
@@ -1,30 +1,32 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\MultiEdit;
 
+use Doctrine\ORM\Query;
 use Shopware\Components\Model\ModelRepository;
+use Shopware\Components\Model\QueryBuilder;
 
 /**
  * @extends ModelRepository<Backup|Filter|Queue|QueueArticle>
@@ -36,7 +38,7 @@ class Repository extends ModelRepository
      *
      * @param string|null $filter
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Filter>
      */
     public function getListQuery($filter = null)
     {
@@ -51,24 +53,22 @@ public function getListQuery($filter = null)
      *
      * @param string|null $filter
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getListQueryBuilder($filter)
     {
-        $builder = $this->getEntityManager()->createQueryBuilder()
+        return $this->getEntityManager()->createQueryBuilder()
             ->select('filter')
-            ->from('Shopware\Models\MultiEdit\Filter', 'filter');
-
-        return $builder;
+            ->from(Filter::class, 'filter');
     }
 
     /**
      * Returns an instance of the \Doctrine\ORM\Query object which selects all backup entities
      *
-     * @param int $offset
-     * @param int $limit
+     * @param int|null $offset
+     * @param int      $limit
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Backup>
      */
     public function getBackupListQuery($offset, $limit)
     {
@@ -86,15 +86,13 @@ public function getBackupListQuery($offset, $limit)
      * Helper function to create the query builder for the "getBackupListQuery" function.
      * This function can be hooked to modify the query builder of the query object.
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getBackupListQueryBuilder()
     {
-        $builder = $this->getEntityManager()->createQueryBuilder()
+        return $this->getEntityManager()->createQueryBuilder()
             ->select('backup')
-            ->from('Shopware\Models\MultiEdit\Backup', 'backup')
+            ->from(Backup::class, 'backup')
             ->orderBy('backup.date', 'DESC');
-
-        return $builder;
     }
 }
diff --git a/engine/Shopware/Models/Newsletter/Address.php b/engine/Shopware/Models/Newsletter/Address.php
index 6d10a560bcb..38d77b08080 100644
--- a/engine/Shopware/Models/Newsletter/Address.php
+++ b/engine/Shopware/Models/Newsletter/Address.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Newsletter;
diff --git a/engine/Shopware/Models/Newsletter/ContactData.php b/engine/Shopware/Models/Newsletter/ContactData.php
index cf461b2489a..332aec14287 100644
--- a/engine/Shopware/Models/Newsletter/ContactData.php
+++ b/engine/Shopware/Models/Newsletter/ContactData.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Newsletter;
@@ -59,7 +59,7 @@ class ContactData extends ModelEntity
      *
      * @ORM\Column(name="salutation", type="string", nullable=true)
      */
-    protected $salutation;
+    protected $salutation = 'not_defined';
 
     /**
      * @var string|null
diff --git a/engine/Shopware/Models/Newsletter/Container.php b/engine/Shopware/Models/Newsletter/Container.php
index 045a7dae16e..2872d106eef 100644
--- a/engine/Shopware/Models/Newsletter/Container.php
+++ b/engine/Shopware/Models/Newsletter/Container.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Newsletter;
@@ -40,6 +40,13 @@
  */
 class Container extends ModelEntity
 {
+    public const TYPE_TEXT = 'ctText';
+    public const TYPE_PRODUCTS = 'ctArticles';
+    public const TYPE_BANNER = 'ctBanner';
+    public const TYPE_LINKS = 'ctLinks';
+    public const TYPE_VOUCHER = 'ctVoucher';
+    public const TYPE_SUGGEST = 'ctSuggest';
+
     /**
      * INVERSE SIDE
      *
@@ -127,7 +134,7 @@ class Container extends ModelEntity
     /**
      * Type of the container (sText, sBanner etc)
      *
-     * @var string
+     * @var self::TYPE_*
      *
      * @ORM\Column(name="type", type="string", length=255, nullable=false)
      */
@@ -190,7 +197,7 @@ public function getPosition()
     }
 
     /**
-     * @param string $type
+     * @param self::TYPE_* $type
      */
     public function setType($type)
     {
@@ -198,7 +205,7 @@ public function setType($type)
     }
 
     /**
-     * @return string
+     * @return self::TYPE_*
      */
     public function getType()
     {
@@ -245,7 +252,7 @@ public function getValue()
     public function setText($text)
     {
         $return = $this->setOneToOne($text, Text::class, 'text', 'container');
-        $this->setType('ctText');
+        $this->setType(self::TYPE_TEXT);
 
         return $return;
     }
@@ -266,7 +273,7 @@ public function getText()
     public function setArticles($articles)
     {
         $return = $this->setOneToMany($articles, Article::class, 'articles', 'container');
-        $this->setType('ctArticles');
+        $this->setType(self::TYPE_PRODUCTS);
 
         return $return;
     }
@@ -287,7 +294,7 @@ public function getArticles()
     public function setBanner($banner)
     {
         $return = $this->setOneToOne($banner, Banner::class, 'banner', 'container');
-        $this->setType('ctBanner');
+        $this->setType(self::TYPE_BANNER);
 
         return $return;
     }
@@ -308,7 +315,7 @@ public function getBanner()
     public function setLinks($links)
     {
         $return = $this->setOneToMany($links, Link::class, 'links', 'container');
-        $this->setType('ctLinks');
+        $this->setType(self::TYPE_LINKS);
 
         return $return;
     }
diff --git a/engine/Shopware/Models/Newsletter/ContainerType/Article.php b/engine/Shopware/Models/Newsletter/ContainerType/Article.php
index ade39a4e4a4..5d092852593 100644
--- a/engine/Shopware/Models/Newsletter/ContainerType/Article.php
+++ b/engine/Shopware/Models/Newsletter/ContainerType/Article.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Newsletter\ContainerType;
@@ -76,7 +76,7 @@ class Article extends LazyFetchModelEntity
      *
      * @ORM\Column(name="parentID", type="integer", length=11, nullable=true)
      */
-    private $containerId = null;
+    private $containerId;
 
     /**
      * Ordernumber of the product
@@ -129,7 +129,7 @@ public function getId()
     public function setContainer($container)
     {
         $this->container = $container;
-        $container->setType('ctArticles');
+        $container->setType(Container::TYPE_PRODUCTS);
     }
 
     /**
diff --git a/engine/Shopware/Models/Newsletter/ContainerType/Banner.php b/engine/Shopware/Models/Newsletter/ContainerType/Banner.php
index 89112acbf7d..97aabb8db4b 100644
--- a/engine/Shopware/Models/Newsletter/ContainerType/Banner.php
+++ b/engine/Shopware/Models/Newsletter/ContainerType/Banner.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Newsletter\ContainerType;
@@ -65,7 +65,7 @@ class Banner extends ModelEntity
      *
      * @ORM\Column(name="parentID", type="integer", length=11, nullable=false)
      */
-    private $containerId = null;
+    private $containerId;
 
     /**
      * Image of the banner
@@ -171,7 +171,7 @@ public function getTarget()
     public function setContainer($container)
     {
         $this->container = $container;
-        $container->setType('ctBanner');
+        $container->setType(Container::TYPE_BANNER);
     }
 
     /**
diff --git a/engine/Shopware/Models/Newsletter/ContainerType/Link.php b/engine/Shopware/Models/Newsletter/ContainerType/Link.php
index ed56e7cb2a8..d9e30a82d0f 100644
--- a/engine/Shopware/Models/Newsletter/ContainerType/Link.php
+++ b/engine/Shopware/Models/Newsletter/ContainerType/Link.php
@@ -1,31 +1,32 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Newsletter\ContainerType;
 
 use Doctrine\ORM\Mapping as ORM;
 use Shopware\Components\Model\ModelEntity;
+use Shopware\Models\Newsletter\Container;
 
 /**
  * Shopware text model represents a link container type.
@@ -39,7 +40,7 @@ class Link extends ModelEntity
      * OWNING SIDE
      * Owning side of relation between container type 'article' and parent container
      *
-     * @var \Shopware\Models\Newsletter\Container|null
+     * @var Container|null
      *
      * @ORM\ManyToOne(targetEntity="Shopware\Models\Newsletter\Container", inversedBy="links")
      * @ORM\JoinColumn(name="parentID", referencedColumnName="id")
@@ -165,16 +166,16 @@ public function getTarget()
     }
 
     /**
-     * @param \Shopware\Models\Newsletter\Container $container
+     * @param Container $container
      */
     public function setContainer($container)
     {
         $this->container = $container;
-        $container->setType('ctLinks');
+        $container->setType(Container::TYPE_LINKS);
     }
 
     /**
-     * @return \Shopware\Models\Newsletter\Container|null
+     * @return Container|null
      */
     public function getContainer()
     {
diff --git a/engine/Shopware/Models/Newsletter/ContainerType/Text.php b/engine/Shopware/Models/Newsletter/ContainerType/Text.php
index dde22517a47..565cddc7cc1 100644
--- a/engine/Shopware/Models/Newsletter/ContainerType/Text.php
+++ b/engine/Shopware/Models/Newsletter/ContainerType/Text.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Newsletter\ContainerType;
@@ -123,10 +123,10 @@ public function getAlignment()
     }
 
     /**
-     * @param Container $container
-     * @param string    $type
+     * @param Container         $container
+     * @param Container::TYPE_* $type
      */
-    public function setContainer($container, $type = 'ctText')
+    public function setContainer($container, $type = Container::TYPE_TEXT)
     {
         $this->container = $container;
         $container->setType($type);
diff --git a/engine/Shopware/Models/Newsletter/Group.php b/engine/Shopware/Models/Newsletter/Group.php
index deab6c1fb37..cdb65cb604a 100644
--- a/engine/Shopware/Models/Newsletter/Group.php
+++ b/engine/Shopware/Models/Newsletter/Group.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Newsletter;
diff --git a/engine/Shopware/Models/Newsletter/Newsletter.php b/engine/Shopware/Models/Newsletter/Newsletter.php
index 1173cdec027..ea9bffe5d34 100644
--- a/engine/Shopware/Models/Newsletter/Newsletter.php
+++ b/engine/Shopware/Models/Newsletter/Newsletter.php
@@ -1,30 +1,31 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Newsletter;
 
 use DateTimeInterface;
+use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
 use Shopware\Components\Model\ModelEntity;
 
@@ -42,7 +43,7 @@ class Newsletter extends ModelEntity
      * This is the inverse side of the association between newsletters and mail-addresses which have already
      * received the given newsletter.
      *
-     * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Newsletter\Address>
+     * @var ArrayCollection<Address>
      *
      * @ORM\OneToMany(targetEntity="Shopware\Models\Newsletter\Address", mappedBy="lastNewsletter")
      */
@@ -196,14 +197,14 @@ class Newsletter extends ModelEntity
      *
      * @ORM\Column(name="timed_delivery", type="datetime", nullable=true)
      */
-    private $timedDelivery = null;
+    private $timedDelivery;
 
     /**
      * INVERSE SIDE
      *
      * Inverse side of the mailing-container association
      *
-     * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Newsletter\Container>
+     * @var ArrayCollection<Container>
      *
      * @ORM\OneToMany(targetEntity="Shopware\Models\Newsletter\Container", mappedBy="newsletter", cascade={"persist", "remove"})
      */
@@ -211,7 +212,7 @@ class Newsletter extends ModelEntity
 
     public function __construct()
     {
-        $this->containers = new \Doctrine\Common\Collections\ArrayCollection();
+        $this->containers = new ArrayCollection();
     }
 
     /**
@@ -455,17 +456,17 @@ public function getTemplateId()
     }
 
     /**
-     * @param \Shopware\Models\Newsletter\Container[] $containers
+     * @param Container[] $containers
      *
      * @return Newsletter
      */
     public function setContainers($containers)
     {
-        return $this->setOneToMany($containers, \Shopware\Models\Newsletter\Container::class, 'containers', 'newsletter');
+        return $this->setOneToMany($containers, Container::class, 'containers', 'newsletter');
     }
 
     /**
-     * @return \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Newsletter\Container>
+     * @return ArrayCollection<Container>
      */
     public function getContainers()
     {
diff --git a/engine/Shopware/Models/Newsletter/Repository.php b/engine/Shopware/Models/Newsletter/Repository.php
index 3d535d89200..78f1a4555bb 100644
--- a/engine/Shopware/Models/Newsletter/Repository.php
+++ b/engine/Shopware/Models/Newsletter/Repository.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Newsletter;
@@ -44,7 +44,7 @@ class Repository extends ModelRepository
      * @param int|null            $limit
      * @param int|null            $offset
      *
-     * @return Query
+     * @return Query<Group>
      */
     public function getListGroupsQuery($filter = null, $order = null, $limit = null, $offset = null)
     {
@@ -94,7 +94,7 @@ public function getListGroupsQueryBuilder($filter = null, $order = null)
      * @param int|null            $limit
      * @param int|null            $offset
      *
-     * @return Query
+     * @return Query<Address>
      */
     public function getListAddressesQuery($filter = null, $order = null, $limit = null, $offset = null)
     {
@@ -155,7 +155,7 @@ public function getListAddressesQueryBuilder($filter = null, $order = null)
      * @param int|null            $limit
      * @param int|null            $offset
      *
-     * @return Query
+     * @return Query<Sender>
      */
     public function getListSenderQuery($filter = null, $order = null, $limit = null, $offset = null)
     {
@@ -208,7 +208,7 @@ public function getListSenderQueryBuilder($filter = null, $order = null)
      * @param int|null            $limit
      * @param int|null            $offset
      *
-     * @return Query
+     * @return Query<Newsletter>
      */
     public function getListNewslettersQuery($filter = null, $order = null, $limit = null, $offset = null)
     {
diff --git a/engine/Shopware/Models/Newsletter/Sender.php b/engine/Shopware/Models/Newsletter/Sender.php
index 07329d05508..cfc2ae8b3f5 100644
--- a/engine/Shopware/Models/Newsletter/Sender.php
+++ b/engine/Shopware/Models/Newsletter/Sender.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Newsletter;
diff --git a/engine/Shopware/Models/Order/Basket.php b/engine/Shopware/Models/Order/Basket.php
index cdf9eab186f..f630b1a7bd4 100644
--- a/engine/Shopware/Models/Order/Basket.php
+++ b/engine/Shopware/Models/Order/Basket.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Order;
diff --git a/engine/Shopware/Models/Order/Billing.php b/engine/Shopware/Models/Order/Billing.php
index 18faaed00fe..fbf210c4650 100644
--- a/engine/Shopware/Models/Order/Billing.php
+++ b/engine/Shopware/Models/Order/Billing.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Order;
diff --git a/engine/Shopware/Models/Order/Detail.php b/engine/Shopware/Models/Order/Detail.php
index c56b6346402..694f7445230 100644
--- a/engine/Shopware/Models/Order/Detail.php
+++ b/engine/Shopware/Models/Order/Detail.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Order;
@@ -125,7 +125,6 @@ class Detail extends ModelEntity
      * @var int
      *
      * @Assert\NotBlank()
-     *
      * @ORM\Column(name="articleID", type="integer", nullable=false)
      */
     private $articleId;
@@ -141,7 +140,6 @@ class Detail extends ModelEntity
      * @var float
      *
      * @Assert\NotBlank()
-     *
      * @ORM\Column(name="tax_rate", type="float", nullable=false)
      */
     private $taxRate;
@@ -171,7 +169,6 @@ class Detail extends ModelEntity
      * @var string
      *
      * @Assert\NotBlank()
-     *
      * @ORM\Column(name="articleordernumber", type="string", length=255, nullable=false)
      */
     private $articleNumber;
@@ -180,7 +177,6 @@ class Detail extends ModelEntity
      * @var float
      *
      * @Assert\NotBlank()
-     *
      * @ORM\Column(name="price", type="float", nullable=false)
      */
     private $price;
@@ -189,7 +185,6 @@ class Detail extends ModelEntity
      * @var int
      *
      * @Assert\NotBlank()
-     *
      * @ORM\Column(name="quantity", type="integer", nullable=false)
      */
     private $quantity;
@@ -198,7 +193,6 @@ class Detail extends ModelEntity
      * @var string
      *
      * @Assert\NotBlank()
-     *
      * @ORM\Column(name="name", type="string", length=255, nullable=false)
      */
     private $articleName;
@@ -382,7 +376,7 @@ public function getArticleDetail()
         return $this->articleDetail;
     }
 
-    public function setArticleDetail(ArticleDetail $articleDetail = null)
+    public function setArticleDetail(?ArticleDetail $articleDetail = null)
     {
         $this->articleDetail = $articleDetail;
     }
diff --git a/engine/Shopware/Models/Order/DetailStatus.php b/engine/Shopware/Models/Order/DetailStatus.php
index bbb1ef87252..96148a3dbbc 100644
--- a/engine/Shopware/Models/Order/DetailStatus.php
+++ b/engine/Shopware/Models/Order/DetailStatus.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Order;
diff --git a/engine/Shopware/Models/Order/Document/Document.php b/engine/Shopware/Models/Order/Document/Document.php
index 92cc2d36ac4..dd658dfeb6a 100644
--- a/engine/Shopware/Models/Order/Document/Document.php
+++ b/engine/Shopware/Models/Order/Document/Document.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Order\Document;
diff --git a/engine/Shopware/Models/Order/Document/Repository.php b/engine/Shopware/Models/Order/Document/Repository.php
index dfa60062356..15a72cc8c32 100644
--- a/engine/Shopware/Models/Order/Document/Repository.php
+++ b/engine/Shopware/Models/Order/Document/Repository.php
@@ -1,29 +1,31 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Order\Document;
 
+use Doctrine\ORM\Query;
+use Doctrine\ORM\QueryBuilder;
 use Shopware\Components\Model\ModelRepository;
 
 /**
@@ -51,7 +53,7 @@ class Repository extends ModelRepository
      * @param int|null   $limit
      * @param int|null   $offset
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Document>
      */
     public function getListQuery($orderId, $filter = null, $orderBy = null, $limit = null, $offset = null)
     {
@@ -77,11 +79,11 @@ public function getListQuery($orderId, $filter = null, $orderBy = null, $limit =
     /**
      * Helper function which sets the fromPath and the selectPath for the order list query.
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
-    protected function selectListQuery(\Doctrine\ORM\QueryBuilder $builder)
+    protected function selectListQuery(QueryBuilder $builder)
     {
-        //select the different entities
+        // select the different entities
         $builder->select([
             'documents.id as id',
             'documents.date as date',
@@ -94,14 +96,14 @@ protected function selectListQuery(\Doctrine\ORM\QueryBuilder $builder)
             'type.name as typeName',
         ]);
 
-        //join the required tables for the order list
-        $builder->from('Shopware\Models\Order\Document\Document', 'documents')
+        // join the required tables for the order list
+        $builder->from(Document::class, 'documents')
                 ->join('documents.type', 'type');
 
         return $builder;
     }
 
-    protected function filterListQuery(\Doctrine\ORM\QueryBuilder $builder, $filter = null)
+    protected function filterListQuery(QueryBuilder $builder, $filter = null)
     {
         return $builder;
     }
diff --git a/engine/Shopware/Models/Order/Esd.php b/engine/Shopware/Models/Order/Esd.php
index 128eefd4502..08ec2f723e3 100644
--- a/engine/Shopware/Models/Order/Esd.php
+++ b/engine/Shopware/Models/Order/Esd.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Order;
diff --git a/engine/Shopware/Models/Order/History.php b/engine/Shopware/Models/Order/History.php
index a9f9c7d0dc5..286b2eee003 100644
--- a/engine/Shopware/Models/Order/History.php
+++ b/engine/Shopware/Models/Order/History.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Order;
@@ -91,7 +91,7 @@ class History extends ModelEntity
      *
      * @ORM\Column(name="userID", type="integer", nullable=true)
      */
-    private $userId = null;
+    private $userId;
 
     /**
      * The $previousOrderStatusId property contains the id of the previous order status of the order.
@@ -101,7 +101,7 @@ class History extends ModelEntity
      *
      * @ORM\Column(name="previous_order_status_id", type="integer", nullable=true)
      */
-    private $previousOrderStatusId = null;
+    private $previousOrderStatusId;
 
     /**
      * The $orderStatusId property contains the id of the current order status of the order.
@@ -111,7 +111,7 @@ class History extends ModelEntity
      *
      * @ORM\Column(name="order_status_id", type="integer", nullable=true)
      */
-    private $orderStatusId = null;
+    private $orderStatusId;
 
     /**
      * The $previousPaymentStatusId property contains the id of the previous payment status of the order.
@@ -121,7 +121,7 @@ class History extends ModelEntity
      *
      * @ORM\Column(name="previous_payment_status_id", type="integer", nullable=true)
      */
-    private $previousPaymentStatusId = null;
+    private $previousPaymentStatusId;
 
     /**
      * The $paymentStatusId property contains the id of the current payment status of the order.
@@ -131,7 +131,7 @@ class History extends ModelEntity
      *
      * @ORM\Column(name="payment_status_id", type="integer", nullable=true)
      */
-    private $paymentStatusId = null;
+    private $paymentStatusId;
 
     /**
      * The $comment property allows the user to add a comment for the status change.
@@ -148,7 +148,7 @@ class History extends ModelEntity
      * The $order property in this model is the owning side of the association of the order status history and the
      * order model. The $history property of the order model is the inverse side of this association.
      *
-     * @var \Shopware\Models\Order\Order
+     * @var Order
      *
      * @ORM\ManyToOne(targetEntity="\Shopware\Models\Order\Order", inversedBy="history")
      * @ORM\JoinColumn(name="orderID", referencedColumnName="id", nullable=false)
@@ -174,7 +174,7 @@ class History extends ModelEntity
      * previous order status model. This association is an uni-directional association. That means that the order
      * status model don't know anything about the order status history.
      *
-     * @var \Shopware\Models\Order\Status|null
+     * @var Status|null
      *
      * @ORM\OneToOne(targetEntity="\Shopware\Models\Order\Status")
      * @ORM\JoinColumn(name="previous_order_status_id", referencedColumnName="id")
@@ -187,7 +187,7 @@ class History extends ModelEntity
      * current order status model. This association is an uni-directional association. That means that the order
      * status model don't know anything about the order status history.
      *
-     * @var \Shopware\Models\Order\Status|null
+     * @var Status|null
      *
      * @ORM\OneToOne(targetEntity="\Shopware\Models\Order\Status")
      * @ORM\JoinColumn(name="order_status_id", referencedColumnName="id")
@@ -200,7 +200,7 @@ class History extends ModelEntity
      * previous payment status model. This association is an uni-directional association. That means that the payment
      * status model don't know anything about the order status history.
      *
-     * @var \Shopware\Models\Order\Status|null
+     * @var Status|null
      *
      * @ORM\OneToOne(targetEntity="\Shopware\Models\Order\Status")
      * @ORM\JoinColumn(name="previous_payment_status_id", referencedColumnName="id")
@@ -213,7 +213,7 @@ class History extends ModelEntity
      * current payment status model. This association is an uni-directional association. That means that the payment
      * status model don't know anything about the order status history.
      *
-     * @var \Shopware\Models\Order\Status|null
+     * @var Status|null
      *
      * @ORM\OneToOne(targetEntity="\Shopware\Models\Order\Status")
      * @ORM\JoinColumn(name="payment_status_id", referencedColumnName="id")
@@ -250,7 +250,7 @@ public function getId()
      *
      * @param \Shopware\Models\User\User $user
      *
-     * @return \Shopware\Models\Order\History
+     * @return History
      */
     public function setUser($user)
     {
@@ -280,7 +280,7 @@ public function getUser()
      *
      * @param string $comment
      *
-     * @return \Shopware\Models\Order\History
+     * @return History
      */
     public function setComment($comment)
     {
@@ -307,9 +307,9 @@ public function getComment()
      * The $order property in this model is the owning side of the association of the order status history and the
      * order model. The $history property of the order model is the inverse side of this association.
      *
-     * @param \Shopware\Models\Order\Order $order
+     * @param Order $order
      *
-     * @return \Shopware\Models\Order\History
+     * @return History
      */
     public function setOrder($order)
     {
@@ -324,7 +324,7 @@ public function setOrder($order)
      * The $order property in this model is the owning side of the association of the order status history and the
      * order model. The $history property of the order model is the inverse side of this association.
      *
-     * @return \Shopware\Models\Order\Order
+     * @return Order
      */
     public function getOrder()
     {
@@ -338,9 +338,9 @@ public function getOrder()
      * current order status model. This association is an uni-directional association. That means that the order
      * status model don't know anything about the order status history.
      *
-     * @param \Shopware\Models\Order\Status $orderStatus
+     * @param Status $orderStatus
      *
-     * @return \Shopware\Models\Order\History
+     * @return History
      */
     public function setOrderStatus($orderStatus)
     {
@@ -356,7 +356,7 @@ public function setOrderStatus($orderStatus)
      * current order status model. This association is an uni-directional association. That means that the order
      * status model don't know anything about the order status history.
      *
-     * @return \Shopware\Models\Order\Status|null
+     * @return Status|null
      */
     public function getOrderStatus()
     {
@@ -370,9 +370,9 @@ public function getOrderStatus()
      * current payment status model. This association is an uni-directional association. That means that the payment
      * status model don't know anything about the order status history.
      *
-     * @param \Shopware\Models\Order\Status $paymentStatus
+     * @param Status $paymentStatus
      *
-     * @return \Shopware\Models\Order\History
+     * @return History
      */
     public function setPaymentStatus($paymentStatus)
     {
@@ -388,7 +388,7 @@ public function setPaymentStatus($paymentStatus)
      * current payment status model. This association is an uni-directional association. That means that the payment
      * status model don't know anything about the order status history.
      *
-     * @return \Shopware\Models\Order\Status|null
+     * @return Status|null
      */
     public function getPaymentStatus()
     {
@@ -402,9 +402,9 @@ public function getPaymentStatus()
      * previous order status model. This association is an uni-directional association. That means that the order
      * status model don't know anything about the order status history.
      *
-     * @param \Shopware\Models\Order\Status $previousOrderStatus
+     * @param Status $previousOrderStatus
      *
-     * @return \Shopware\Models\Order\History
+     * @return History
      */
     public function setPreviousOrderStatus($previousOrderStatus)
     {
@@ -420,7 +420,7 @@ public function setPreviousOrderStatus($previousOrderStatus)
      * previous order status model. This association is an uni-directional association. That means that the order
      * status model don't know anything about the order status history.
      *
-     * @return \Shopware\Models\Order\Status|null
+     * @return Status|null
      */
     public function getPreviousOrderStatus()
     {
@@ -434,9 +434,9 @@ public function getPreviousOrderStatus()
      * previous payment status model. This association is an uni-directional association. That means that the payment
      * status model don't know anything about the order status history.
      *
-     * @param \Shopware\Models\Order\Status $previousPaymentStatus
+     * @param Status $previousPaymentStatus
      *
-     * @return \Shopware\Models\Order\History
+     * @return History
      */
     public function setPreviousPaymentStatus($previousPaymentStatus)
     {
@@ -452,7 +452,7 @@ public function setPreviousPaymentStatus($previousPaymentStatus)
      * previous payment status model. This association is an uni-directional association. That means that the payment
      * status model don't know anything about the order status history.
      *
-     * @return \Shopware\Models\Order\Status|null
+     * @return Status|null
      */
     public function getPreviousPaymentStatus()
     {
diff --git a/engine/Shopware/Models/Order/Number.php b/engine/Shopware/Models/Order/Number.php
index dbe36372c94..f88be500f57 100644
--- a/engine/Shopware/Models/Order/Number.php
+++ b/engine/Shopware/Models/Order/Number.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Order;
diff --git a/engine/Shopware/Models/Order/Order.php b/engine/Shopware/Models/Order/Order.php
index 065a9aab72e..8f0ce84273c 100644
--- a/engine/Shopware/Models/Order/Order.php
+++ b/engine/Shopware/Models/Order/Order.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Order;
@@ -109,7 +109,6 @@ class Order extends ModelEntity
      *
      * @ORM\OneToOne(targetEntity="\Shopware\Models\Dispatch\Dispatch")
      * @ORM\JoinColumn(name="dispatchID", referencedColumnName="id", nullable=false)
-     *
      * @Assert\NotBlank()
      */
     protected $dispatch;
@@ -122,7 +121,6 @@ class Order extends ModelEntity
      *
      * @ORM\OneToOne(targetEntity="\Shopware\Models\Shop\Shop")
      * @ORM\JoinColumn(name="subshopID", referencedColumnName="id", nullable=false)
-     *
      * @Assert\NotBlank()
      */
     protected $shop;
@@ -148,7 +146,6 @@ class Order extends ModelEntity
      * @var Status
      *
      * @Assert\NotBlank()
-     *
      * @ORM\OneToOne(targetEntity="\Shopware\Models\Order\Status")
      * @ORM\JoinColumn(name="cleared", referencedColumnName="id", nullable=false)
      */
@@ -310,7 +307,6 @@ class Order extends ModelEntity
      * @var float
      *
      * @Assert\NotBlank()
-     *
      * @ORM\Column(name="invoice_amount", type="float", nullable=false)
      */
     private $invoiceAmount;
@@ -319,7 +315,6 @@ class Order extends ModelEntity
      * @var float
      *
      * @Assert\NotBlank()
-     *
      * @ORM\Column(name="invoice_amount_net", type="float", nullable=false)
      */
     private $invoiceAmountNet;
@@ -328,7 +323,6 @@ class Order extends ModelEntity
      * @var float
      *
      * @Assert\NotBlank()
-     *
      * @ORM\Column(name="invoice_shipping", type="float", nullable=false)
      */
     private $invoiceShipping;
@@ -337,7 +331,6 @@ class Order extends ModelEntity
      * @var float
      *
      * @Assert\NotBlank()
-     *
      * @ORM\Column(name="invoice_shipping_net", type="float", nullable=false)
      */
     private $invoiceShippingNet;
@@ -354,7 +347,7 @@ class Order extends ModelEntity
      *
      * @ORM\Column(name="ordertime", type="datetime", nullable=false)
      */
-    private $orderTime = null;
+    private $orderTime;
 
     /**
      * @var string
@@ -397,7 +390,6 @@ class Order extends ModelEntity
      * @var int
      *
      * @Assert\NotBlank()
-     *
      * @ORM\Column(name="taxfree", type="integer", nullable=false)
      */
     private $taxFree;
@@ -421,7 +413,7 @@ class Order extends ModelEntity
      *
      * @ORM\Column(name="cleareddate", type="datetime", nullable=true)
      */
-    private $clearedDate = null;
+    private $clearedDate;
 
     /**
      * @var string
@@ -434,7 +426,6 @@ class Order extends ModelEntity
      * @var string
      *
      * @Assert\NotBlank()
-     *
      * @ORM\Column(name="language", type="string", length=10, nullable=false)
      */
     private $languageIso;
@@ -1129,7 +1120,7 @@ public function setHistory($history)
      */
     public function calculateInvoiceAmount()
     {
-        trigger_error(sprintf(
+        trigger_error(\sprintf(
             '%s:%s is deprecated since Shopware 5.7 and will be removed with 5.8. Please use the service with id `%s` instead',
             __CLASS__,
             __METHOD__,
diff --git a/engine/Shopware/Models/Order/OrderHistorySubscriber.php b/engine/Shopware/Models/Order/OrderHistorySubscriber.php
index f8ed63fc5c9..ad51631d2c5 100644
--- a/engine/Shopware/Models/Order/OrderHistorySubscriber.php
+++ b/engine/Shopware/Models/Order/OrderHistorySubscriber.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Order;
diff --git a/engine/Shopware/Models/Order/Repository.php b/engine/Shopware/Models/Order/Repository.php
index a02a63e31dc..e9a60a6c1c3 100644
--- a/engine/Shopware/Models/Order/Repository.php
+++ b/engine/Shopware/Models/Order/Repository.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Order;
@@ -63,7 +63,7 @@ class Repository extends ModelRepository
      * @param int|null       $offset
      * @param int|null       $limit
      *
-     * @return Query
+     * @return Query<Status>
      */
     public function getPaymentStatusQuery($filter = null, $order = null, $offset = null, $limit = null)
     {
@@ -117,7 +117,7 @@ public function getPaymentStatusQueryBuilder($filter = null, $order = null)
      * @param int|null    $offset
      * @param int|null    $limit
      *
-     * @return Query
+     * @return Query<Status>
      */
     public function getOrderStatusQuery($filter = null, $order = null, $offset = null, $limit = null)
     {
@@ -171,7 +171,7 @@ public function getOrderStatusQueryBuilder($filter = null, $order = null)
      * @param int|null                                                               $offset
      * @param int|null                                                               $limit
      *
-     * @return Query
+     * @return Query<Order>
      */
     public function getOrdersQuery($filters = null, $orderBy = null, $offset = null, $limit = null)
     {
@@ -270,7 +270,7 @@ public function getOrdersQueryBuilder($filters = null, $orderBy = null)
     /**
      * Returns an instance of the \Doctrine\ORM\Query object which can be extended for customization
      *
-     * @return Query
+     * @return Query<DetailStatus>
      */
     public function getDetailStatusQuery()
     {
@@ -302,7 +302,7 @@ public function getDetailStatusQueryBuilder()
      * @param int|null    $offset
      * @param int|null    $limit
      *
-     * @return Query
+     * @return Query<History>
      */
     public function getOrderStatusHistoryListQuery($orderId, $orderBy = null, $offset = null, $limit = null)
     {
@@ -351,7 +351,7 @@ public function getOrderStatusHistoryListQueryBuilder($orderId, $orderBy = null)
     /**
      * Returns an instance of the \Doctrine\ORM\Query object which can be extended for customization
      *
-     * @return Query
+     * @return Query<Document>
      */
     public function getDocumentTypesQuery()
     {
@@ -384,7 +384,7 @@ public function getDocumentTypesQueryBuilder()
      *  - voucher.value
      *  - voucher.minimumCharge
      *
-     * @return Query
+     * @return Query<array<string, mixed>>
      */
     public function getVoucherQuery()
     {
@@ -394,12 +394,12 @@ public function getVoucherQuery()
         $builder = Shopware()->Models()->createQueryBuilder();
 
         return $builder->select([
-                'voucher.id',
-                'voucher.description',
-                'voucher.voucherCode',
-                'voucher.value',
-                'voucher.minimumCharge',
-            ])
+            'voucher.id',
+            'voucher.description',
+            'voucher.voucherCode',
+            'voucher.value',
+            'voucher.minimumCharge',
+        ])
            ->from(Voucher::class, 'voucher')
            ->join('voucher.codes', 'codes')
            ->where('(voucher.validTo>= :today OR voucher.validTo IS NULL)')
@@ -563,14 +563,13 @@ public function getPayments(array $orderIds)
     public function search($offset = null, $limit = null, $filters = [], $sortings = [])
     {
         $em = $this->getEntityManager();
-        $builder = $em->createQueryBuilder();
-
-        $builder->select(['orders.id']);
-        $builder->from(Order::class, 'orders');
-        $builder->leftJoin('orders.attribute', 'attribute');
-        $builder->andWhere('orders.number IS NOT NULL');
-        $builder->andWhere('orders.status != :cancelStatus');
-        $builder->setParameter(':cancelStatus', -1);
+        $builder = $em->createQueryBuilder()
+            ->select(['orders.id'])
+            ->from(Order::class, 'orders')
+            ->leftJoin('orders.attribute', 'attribute')
+            ->andWhere('orders.number IS NOT NULL')
+            ->andWhere('orders.status != :cancelStatus')
+            ->setParameter(':cancelStatus', -1);
 
         $builder = $this->filterListQuery($builder, $filters);
         $builder = $this->sortListQuery($builder, $sortings);
@@ -581,13 +580,14 @@ public function search($offset = null, $limit = null, $filters = [], $sortings =
         if ($limit !== null) {
             $builder->setMaxResults($limit);
         }
+        /** @var Query<array{id: int}> $query */
         $query = $builder->getQuery();
         $query->setHydrationMode(AbstractQuery::HYDRATE_ARRAY);
         $paginator = $em->createPaginator($query);
 
         return [
             'total' => $paginator->count(),
-            'orders' => $paginator->getIterator()->getArrayCopy(),
+            'orders' => iterator_to_array($paginator),
         ];
     }
 
@@ -761,11 +761,9 @@ protected function searchInOrders($term)
     }
 
     /**
-     * @param string $term
-     *
      * @return array<int, int|string>
      */
-    private function searchOrderIds($term)
+    private function searchOrderIds(string $term): array
     {
         $orders = $this->searchInOrders($term);
 
@@ -784,12 +782,9 @@ private function searchOrderIds($term)
     }
 
     /**
-     * @param string $term
-     * @param int[]  $excludeOrders
-     *
-     * @return array
+     * @param int[] $excludeOrders
      */
-    private function searchCustomers($term, array $excludeOrders = [])
+    private function searchCustomers(string $term, array $excludeOrders = []): array
     {
         $query = $this->getEntityManager()->getConnection()->createQueryBuilder();
         $query->select(['DISTINCT customer.id']);
diff --git a/engine/Shopware/Models/Order/Shipping.php b/engine/Shopware/Models/Order/Shipping.php
index 2af78a22568..677b4b8caaa 100644
--- a/engine/Shopware/Models/Order/Shipping.php
+++ b/engine/Shopware/Models/Order/Shipping.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Order;
diff --git a/engine/Shopware/Models/Order/Status.php b/engine/Shopware/Models/Order/Status.php
index 9227983af49..85c282def66 100644
--- a/engine/Shopware/Models/Order/Status.php
+++ b/engine/Shopware/Models/Order/Status.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Order;
diff --git a/engine/Shopware/Models/Partner/Partner.php b/engine/Shopware/Models/Partner/Partner.php
index 4a6f249eaec..6ff7cb80ddd 100644
--- a/engine/Shopware/Models/Partner/Partner.php
+++ b/engine/Shopware/Models/Partner/Partner.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Partner;
@@ -30,6 +30,7 @@
 use Doctrine\ORM\Mapping as ORM;
 use Shopware\Components\Model\ModelEntity;
 use Shopware\Components\Security\AttributeCleanerTrait;
+use Shopware\Models\Attribute\Partner as PartnerAttribute;
 
 /**
  * Standard Export Model Entity
@@ -48,7 +49,7 @@ class Partner extends ModelEntity
     /**
      * INVERSE SIDE
      *
-     * @var \Shopware\Models\Attribute\Partner|null
+     * @var PartnerAttribute|null
      *
      * @ORM\OneToOne(targetEntity="Shopware\Models\Attribute\Partner", mappedBy="partner", orphanRemoval=true, cascade={"persist"})
      */
@@ -588,7 +589,7 @@ public function setCustomerId($customerId)
     }
 
     /**
-     * @return \Shopware\Models\Attribute\Partner|null
+     * @return PartnerAttribute|null
      */
     public function getAttribute()
     {
@@ -596,12 +597,12 @@ public function getAttribute()
     }
 
     /**
-     * @param \Shopware\Models\Attribute\Partner|array|null $attribute
+     * @param PartnerAttribute|array|null $attribute
      *
-     * @return \Shopware\Models\Partner\Partner
+     * @return Partner
      */
     public function setAttribute($attribute)
     {
-        return $this->setOneToOne($attribute, \Shopware\Models\Attribute\Partner::class, 'attribute', 'partner');
+        return $this->setOneToOne($attribute, PartnerAttribute::class, 'attribute', 'partner');
     }
 }
diff --git a/engine/Shopware/Models/Partner/Repository.php b/engine/Shopware/Models/Partner/Repository.php
index c973d18fe4f..0f53e833f0b 100644
--- a/engine/Shopware/Models/Partner/Repository.php
+++ b/engine/Shopware/Models/Partner/Repository.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Partner;
@@ -49,7 +49,7 @@ class Repository extends ModelRepository
      * @param int|null                                               $offset
      * @param int|null                                               $limit
      *
-     * @return Query
+     * @return Query<Partner>
      */
     public function getListQuery($order = null, $offset = null, $limit = null)
     {
@@ -77,14 +77,14 @@ public function getListQueryBuilder($order)
         /** @var QueryBuilder $builder */
         $builder = $this->getEntityManager()->createQueryBuilder();
         $builder->select([
-                'partner.id',
-                'partner.company as company',
-                'partner.active as active',
-                'partner.date as date',
-                'partner.idCode as idCode',
-                '(' . $this->getDatePartListDQL('o') . ') as yearlyAmount',
-                '(' . $this->getDatePartListDQL('om', true) . ') as monthlyAmount',
-            ])
+            'partner.id',
+            'partner.company as company',
+            'partner.active as active',
+            'partner.date as date',
+            'partner.idCode as idCode',
+            '(' . $this->getDatePartListDQL('o') . ') as yearlyAmount',
+            '(' . $this->getDatePartListDQL('om', true) . ') as monthlyAmount',
+        ])
             ->from(Partner::class, 'partner');
 
         if (!empty($order)) {
@@ -99,7 +99,7 @@ public function getListQueryBuilder($order)
      *
      * @param array $filter
      *
-     * @return Query
+     * @return Query<Partner>
      */
     public function getDetailQuery($filter)
     {
@@ -114,7 +114,7 @@ public function getDetailQuery($filter)
      *
      * @param array $filter
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getDetailQueryBuilder($filter)
     {
@@ -137,7 +137,7 @@ public function getDetailQueryBuilder($filter)
      * @param DateTimeInterface $toDate
      * @param float|int         $userCurrencyFactor
      *
-     * @return Query
+     * @return Query<Order>
      */
     public function getStatisticListQuery($order, $offset, $limit, $partnerId, $summary, $fromDate, $toDate, $userCurrencyFactor = 1)
     {
@@ -161,7 +161,7 @@ public function getStatisticListQuery($order, $offset, $limit, $partnerId, $summ
      * @param DateTimeInterface                                      $toDate
      * @param float|int                                              $userCurrencyFactor
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getStatisticListQueryBuilder($order, $partnerId, $summary, $fromDate, $toDate, $userCurrencyFactor = 1)
     {
@@ -170,19 +170,19 @@ public function getStatisticListQueryBuilder($order, $partnerId, $summary, $from
         $expr = $this->getEntityManager()->getExpressionBuilder();
 
         $builder->select([
-                'o.orderTime as orderTime',
-                'o.id as id',
-                'o.number as number',
-                'SUM((o.invoiceAmountNet - o.invoiceShippingNet) / (o.currencyFactor / :userCurrencyFactor)) as netTurnOver',
-                'SUM((o.invoiceAmountNet - o.invoiceShippingNet) / (o.currencyFactor / :userCurrencyFactor) / 100 * partner.percent) as provision',
-                'customer.email as customerEmail',
-                'billing.company as customerCompany',
-                'customer.firstname as customerFirstName',
-                'customer.lastname as customerLastName',
-                'customer.number as customerNumber',
-                'orderState.name as orderStatus',
-                'orderState.id as orderStatusId',
-            ])
+            'o.orderTime as orderTime',
+            'o.id as id',
+            'o.number as number',
+            'SUM((o.invoiceAmountNet - o.invoiceShippingNet) / (o.currencyFactor / :userCurrencyFactor)) as netTurnOver',
+            'SUM((o.invoiceAmountNet - o.invoiceShippingNet) / (o.currencyFactor / :userCurrencyFactor) / 100 * partner.percent) as provision',
+            'customer.email as customerEmail',
+            'billing.company as customerCompany',
+            'customer.firstname as customerFirstName',
+            'customer.lastname as customerLastName',
+            'customer.number as customerNumber',
+            'orderState.name as orderStatus',
+            'orderState.id as orderStatusId',
+        ])
             ->from(Order::class, 'o')
             ->leftJoin('o.partner', 'partner')
             ->leftJoin('o.orderStatus', 'orderState')
@@ -217,7 +217,7 @@ public function getStatisticListQueryBuilder($order, $partnerId, $summary, $from
      * @param DateTimeInterface $toDate
      * @param float|int         $userCurrencyFactor
      *
-     * @return Query
+     * @return Query<Order>
      */
     public function getStatisticChartQuery($partnerId, $fromDate, $toDate, $userCurrencyFactor = 1)
     {
@@ -235,17 +235,17 @@ public function getStatisticChartQuery($partnerId, $fromDate, $toDate, $userCurr
      * @param DateTimeInterface $toDate
      * @param float|int         $userCurrencyFactor
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getStatisticChartQueryBuilder($partnerId, $fromDate, $toDate, $userCurrencyFactor = 1)
     {
         $builder = $this->getEntityManager()->createQueryBuilder();
         $builder->select([
-                'o.orderTime as date',
-                'DATE_FORMAT(o.orderTime,\'%Y-%V\') as timeScale',
-                'SUM((o.invoiceAmountNet - o.invoiceShippingNet) / (o.currencyFactor / :userCurrencyFactor)) as netTurnOver',
-                'SUM((o.invoiceAmountNet - o.invoiceShippingNet) / (o.currencyFactor / :userCurrencyFactor) / 100 * partner.percent) as provision',
-            ])
+            'o.orderTime as date',
+            'DATE_FORMAT(o.orderTime,\'%Y-%V\') as timeScale',
+            'SUM((o.invoiceAmountNet - o.invoiceShippingNet) / (o.currencyFactor / :userCurrencyFactor)) as netTurnOver',
+            'SUM((o.invoiceAmountNet - o.invoiceShippingNet) / (o.currencyFactor / :userCurrencyFactor) / 100 * partner.percent) as provision',
+        ])
             ->from(Order::class, 'o')
             ->leftJoin('o.partner', 'partner')
             ->where('partner.id = ?0')
@@ -270,7 +270,7 @@ public function getStatisticChartQueryBuilder($partnerId, $fromDate, $toDate, $u
      *
      * @deprecated since 5.6.3, will be removed with 5.8
      *
-     * @return Query
+     * @return Query<Customer>
      */
     public function getCustomerForMappingQuery($mappingValue)
     {
@@ -287,7 +287,7 @@ public function getCustomerForMappingQuery($mappingValue)
      *
      * @deprecated since 5.6.3, will be removed with 5.8
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getCustomerForMappingQueryBuilder($mappingValue)
     {
@@ -318,7 +318,7 @@ public function getCustomerForMappingQueryBuilder($mappingValue)
      * @param string $trackingCode
      * @param int    $partnerId
      *
-     * @return Query
+     * @return Query<Partner>
      */
     public function getValidateTrackingCodeQuery($trackingCode, $partnerId)
     {
@@ -334,7 +334,7 @@ public function getValidateTrackingCodeQuery($trackingCode, $partnerId)
      * @param string $trackingCode
      * @param int    $partnerId
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getValidateTrackingCodeQueryBuilder($trackingCode, $partnerId)
     {
@@ -352,12 +352,9 @@ public function getValidateTrackingCodeQueryBuilder($trackingCode, $partnerId)
     /**
      * Helper method to get the date part of the dql query
      *
-     * @param string $alias
-     * @param bool   $monthlyAmount | whether to add the selection of a month or not
-     *
-     * @return string
+     * @param bool $monthlyAmount | whether to add the selection of a month or not
      */
-    private function getDatePartListDQL($alias, $monthlyAmount = false)
+    private function getDatePartListDQL(string $alias, bool $monthlyAmount = false): string
     {
         $builder = Shopware()->Models()->createQueryBuilder();
         $builder->from(Order::class, $alias)
diff --git a/engine/Shopware/Models/Payment/Payment.php b/engine/Shopware/Models/Payment/Payment.php
index 78a07377eb4..8e38a260904 100644
--- a/engine/Shopware/Models/Payment/Payment.php
+++ b/engine/Shopware/Models/Payment/Payment.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Payment;
diff --git a/engine/Shopware/Models/Payment/PaymentInstance.php b/engine/Shopware/Models/Payment/PaymentInstance.php
index 60cd1078df7..8469400fd34 100644
--- a/engine/Shopware/Models/Payment/PaymentInstance.php
+++ b/engine/Shopware/Models/Payment/PaymentInstance.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Payment;
diff --git a/engine/Shopware/Models/Payment/PaymentInstanceRepository.php b/engine/Shopware/Models/Payment/PaymentInstanceRepository.php
index 59defda2b4e..2b50d2447fa 100644
--- a/engine/Shopware/Models/Payment/PaymentInstanceRepository.php
+++ b/engine/Shopware/Models/Payment/PaymentInstanceRepository.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Payment;
diff --git a/engine/Shopware/Models/Payment/Repository.php b/engine/Shopware/Models/Payment/Repository.php
index b6ff434627e..56209a6c6e8 100644
--- a/engine/Shopware/Models/Payment/Repository.php
+++ b/engine/Shopware/Models/Payment/Repository.php
@@ -1,31 +1,33 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Payment;
 
+use Doctrine\ORM\Query;
 use Shopware\Components\Model\ModelRepository;
 use Shopware\Components\Model\QueryBuilder;
+use Shopware\Models\Attribute\Payment as PaymentAttribute;
 
 /**
  * Shopware Payment Model
@@ -44,7 +46,7 @@ class Repository extends ModelRepository
      * @param int|null          $offset
      * @param int|null          $limit
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Payment>
      */
     public function getActivePaymentsQuery($filter = null, $order = null, $offset = null, $limit = null)
     {
@@ -63,7 +65,7 @@ public function getActivePaymentsQuery($filter = null, $order = null, $offset =
      * @param array|null        $filter
      * @param string|array|null $order
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getActivePaymentsQueryBuilder($filter = null, $order = null)
     {
@@ -97,7 +99,7 @@ public function getActivePaymentsQueryBuilder($filter = null, $order = null)
      * @param int|null          $offset
      * @param int|null          $limit
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Payment>
      */
     public function getAllPaymentsQuery($filter = null, $order = null, $offset = null, $limit = null)
     {
@@ -116,7 +118,7 @@ public function getAllPaymentsQuery($filter = null, $order = null, $offset = nul
      * @param array|null        $filter
      * @param string|array|null $order
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getAllPaymentsQueryBuilder($filter = null, $order = null)
     {
@@ -148,7 +150,7 @@ public function getAllPaymentsQueryBuilder($filter = null, $order = null)
      * @param int|null   $offset
      * @param int|null   $limit
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Payment>
      */
     public function getListQuery($filter = null, $order = null, $offset = null, $limit = null)
     {
@@ -166,7 +168,7 @@ public function getListQuery($filter = null, $order = null, $offset = null, $lim
      * @param int|null   $offset
      * @param int|null   $limit
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getListQueryBuilder($filter = null, $order = null, $offset = null, $limit = null)
     {
@@ -202,7 +204,7 @@ public function getListQueryBuilder($filter = null, $order = null, $offset = nul
      *
      * @param int $paymentId
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<PaymentAttribute>
      */
     public function getAttributesQuery($paymentId)
     {
@@ -217,13 +219,13 @@ public function getAttributesQuery($paymentId)
      *
      * @param int $paymentId
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getAttributesQueryBuilder($paymentId)
     {
         $builder = $this->getEntityManager()->createQueryBuilder();
         $builder->select(['attribute'])
-            ->from(\Shopware\Models\Attribute\Payment::class, 'attribute')
+            ->from(PaymentAttribute::class, 'attribute')
             ->where('attribute.paymentId = ?1')
             ->setParameter(1, $paymentId);
 
diff --git a/engine/Shopware/Models/Payment/RuleSet.php b/engine/Shopware/Models/Payment/RuleSet.php
index cdcaed38763..a18db70acee 100644
--- a/engine/Shopware/Models/Payment/RuleSet.php
+++ b/engine/Shopware/Models/Payment/RuleSet.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Payment;
diff --git a/engine/Shopware/Models/Plugin/License.php b/engine/Shopware/Models/Plugin/License.php
index 1fe078a2b3d..58329e9882c 100644
--- a/engine/Shopware/Models/Plugin/License.php
+++ b/engine/Shopware/Models/Plugin/License.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Plugin;
@@ -80,6 +80,7 @@ class License extends ModelEntity
 
     /**
      * @var string
+     *
      * @ORM\Column(name="notation", type="string", nullable=false)
      */
     private $notation;
@@ -134,7 +135,7 @@ class License extends ModelEntity
     private $pluginId;
 
     /**
-     * @var \Shopware\Models\Plugin\Plugin|null
+     * @var Plugin|null
      *
      * @ORM\ManyToOne(targetEntity="Shopware\Models\Plugin\Plugin", inversedBy="licenses")
      * @ORM\JoinColumn(name="plugin_id", referencedColumnName="id")
diff --git a/engine/Shopware/Models/Plugin/Plugin.php b/engine/Shopware/Models/Plugin/Plugin.php
index 998e72d550b..330c6773c69 100644
--- a/engine/Shopware/Models/Plugin/Plugin.php
+++ b/engine/Shopware/Models/Plugin/Plugin.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Plugin;
@@ -29,6 +29,12 @@
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
 use Shopware\Components\Model\ModelEntity;
+use Shopware\Models\Config\Form;
+use Shopware\Models\Emotion\Library\Component;
+use Shopware\Models\Menu\Menu;
+use Shopware\Models\Payment\Payment;
+use Shopware\Models\Shop\Template;
+use Shopware\Models\Widget\Widget;
 
 /**
  * @ORM\Table(name="s_core_plugins")
@@ -37,7 +43,7 @@
 class Plugin extends ModelEntity
 {
     /**
-     * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Emotion\Library\Component>
+     * @var ArrayCollection<Component>
      *
      * @ORM\OneToMany(targetEntity="Shopware\Models\Emotion\Library\Component", mappedBy="plugin", orphanRemoval=true, cascade={"all"})
      */
@@ -223,7 +229,7 @@ class Plugin extends ModelEntity
     /**
      * INVERSE SIDE
      *
-     * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Config\Form>
+     * @var ArrayCollection<Form>
      *
      * @ORM\OneToMany(targetEntity="\Shopware\Models\Config\Form", mappedBy="plugin", cascade={"all"})
      * @ORM\JoinColumn(name="id", referencedColumnName="plugin_id")
@@ -234,7 +240,7 @@ class Plugin extends ModelEntity
     /**
      * INVERSE SIDE
      *
-     * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Menu\Menu>
+     * @var ArrayCollection<Menu>
      *
      * @ORM\OneToMany(targetEntity="\Shopware\Models\Menu\Menu", mappedBy="plugin", cascade={"all"})
      * @ORM\JoinColumn(name="id", referencedColumnName="pluginID")
@@ -245,7 +251,7 @@ class Plugin extends ModelEntity
     /**
      * INVERSE SIDE
      *
-     * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Payment\Payment>
+     * @var ArrayCollection<Payment>
      *
      * @ORM\OneToMany(targetEntity="\Shopware\Models\Payment\Payment", mappedBy="plugin", cascade={"all"})
      * @ORM\JoinColumn(name="id", referencedColumnName="pluginID")
@@ -256,7 +262,7 @@ class Plugin extends ModelEntity
     /**
      * INVERSE SIDE
      *
-     * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Shop\Template>
+     * @var ArrayCollection<Template>
      *
      * @ORM\OneToMany(targetEntity="\Shopware\Models\Shop\Template", mappedBy="plugin", cascade={"all"})
      * @ORM\JoinColumn(name="id", referencedColumnName="plugin_id")
@@ -267,7 +273,7 @@ class Plugin extends ModelEntity
     /**
      * INVERSE SIDE
      *
-     * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Widget\Widget>
+     * @var ArrayCollection<Widget>
      *
      * @ORM\OneToMany(targetEntity="\Shopware\Models\Widget\Widget", mappedBy="plugin", cascade={"all"})
      * @ORM\JoinColumn(name="id", referencedColumnName="plugin_id")
@@ -276,7 +282,7 @@ class Plugin extends ModelEntity
     private $widgets;
 
     /**
-     * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Plugin\License>
+     * @var ArrayCollection<License>
      *
      * @ORM\OneToMany(targetEntity="Shopware\Models\Plugin\License", mappedBy="plugin")
      * @ORM\OrderBy({"type" = "ASC"})
@@ -572,7 +578,7 @@ public function setLink($link)
     }
 
     /**
-     * @return \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Config\Form>
+     * @return ArrayCollection<Form>
      */
     public function getConfigForms()
     {
@@ -580,7 +586,7 @@ public function getConfigForms()
     }
 
     /**
-     * @param \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Config\Form> $configForms
+     * @param ArrayCollection<Form> $configForms
      */
     public function setConfigForms($configForms)
     {
@@ -588,7 +594,7 @@ public function setConfigForms($configForms)
     }
 
     /**
-     * @return \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Menu\Menu>
+     * @return ArrayCollection<Menu>
      */
     public function getMenuItems()
     {
@@ -596,7 +602,7 @@ public function getMenuItems()
     }
 
     /**
-     * @param \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Menu\Menu> $menuItems
+     * @param ArrayCollection<Menu> $menuItems
      */
     public function setMenuItems($menuItems)
     {
@@ -604,7 +610,7 @@ public function setMenuItems($menuItems)
     }
 
     /**
-     * @return \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Payment\Payment>
+     * @return ArrayCollection<Payment>
      */
     public function getPayments()
     {
@@ -612,7 +618,7 @@ public function getPayments()
     }
 
     /**
-     * @param \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Payment\Payment> $payments
+     * @param ArrayCollection<Payment> $payments
      */
     public function setPayments($payments)
     {
@@ -620,7 +626,7 @@ public function setPayments($payments)
     }
 
     /**
-     * @return \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Shop\Template>
+     * @return ArrayCollection<Template>
      */
     public function getTemplates()
     {
@@ -628,7 +634,7 @@ public function getTemplates()
     }
 
     /**
-     * @param \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Shop\Template> $templates
+     * @param ArrayCollection<Template> $templates
      */
     public function setTemplates($templates)
     {
@@ -636,7 +642,7 @@ public function setTemplates($templates)
     }
 
     /**
-     * @return \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Plugin\License>
+     * @return ArrayCollection<License>
      */
     public function getLicenses()
     {
@@ -644,7 +650,7 @@ public function getLicenses()
     }
 
     /**
-     * @param \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Plugin\License> $licenses
+     * @param ArrayCollection<License> $licenses
      */
     public function setLicenses($licenses)
     {
@@ -684,7 +690,7 @@ public function setUpdateSource($updateSource)
     }
 
     /**
-     * @return \Doctrine\Common\Collections\ArrayCollection
+     * @return ArrayCollection
      */
     public function getEmotionComponents()
     {
@@ -692,7 +698,7 @@ public function getEmotionComponents()
     }
 
     /**
-     * @param \Doctrine\Common\Collections\ArrayCollection $emotionComponents
+     * @param ArrayCollection $emotionComponents
      */
     public function setEmotionComponents($emotionComponents)
     {
@@ -700,7 +706,7 @@ public function setEmotionComponents($emotionComponents)
     }
 
     /**
-     * @return \Doctrine\Common\Collections\ArrayCollection
+     * @return ArrayCollection
      */
     public function getWidgets()
     {
@@ -708,7 +714,7 @@ public function getWidgets()
     }
 
     /**
-     * @param \Doctrine\Common\Collections\ArrayCollection $widgets
+     * @param ArrayCollection $widgets
      */
     public function setWidgets($widgets)
     {
diff --git a/engine/Shopware/Models/Premium/Premium.php b/engine/Shopware/Models/Premium/Premium.php
index 43d7072cc62..a462c552257 100644
--- a/engine/Shopware/Models/Premium/Premium.php
+++ b/engine/Shopware/Models/Premium/Premium.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Premium;
diff --git a/engine/Shopware/Models/Premium/Repository.php b/engine/Shopware/Models/Premium/Repository.php
index 5a45f7b4f13..0a719a2306a 100644
--- a/engine/Shopware/Models/Premium/Repository.php
+++ b/engine/Shopware/Models/Premium/Repository.php
@@ -1,29 +1,30 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Premium;
 
+use Doctrine\ORM\Query;
 use Shopware\Components\Model\ModelRepository;
 use Shopware\Components\Model\QueryBuilder;
 
@@ -46,7 +47,7 @@ class Repository extends ModelRepository
      * @param array<array{property: string, direction: string}> $order
      * @param string|null                                       $filterValue
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Premium>
      */
     public function getBackendPremiumListQuery($start, $limit, $order, $filterValue = null)
     {
@@ -60,7 +61,7 @@ public function getBackendPremiumListQuery($start, $limit, $order, $filterValue
             'premium.shopId as shopId',
             'subshop.name as subShopName',
             'article.name as name',
-            ])
+        ])
             ->from($this->getEntityName(), 'premium')
             ->leftJoin('premium.shop', 'subshop')
             ->leftJoin('premium.articleDetail', 'detail')
diff --git a/engine/Shopware/Models/Price/Discount.php b/engine/Shopware/Models/Price/Discount.php
index 7008a24da47..83f3f058f09 100644
--- a/engine/Shopware/Models/Price/Discount.php
+++ b/engine/Shopware/Models/Price/Discount.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Price;
@@ -45,7 +45,7 @@ class Discount extends ModelEntity
     private $id;
 
     /**
-     * @var \Shopware\Models\Price\Group|null
+     * @var Group|null
      *
      * @ORM\ManyToOne(targetEntity="Shopware\Models\Price\Group", inversedBy="discounts")
      * @ORM\JoinColumn(name="groupID", referencedColumnName="id")
@@ -79,14 +79,14 @@ class Discount extends ModelEntity
      *
      * @ORM\Column(name="customergroupID", type="integer", nullable=true)
      */
-    private $customerGroupId = null;
+    private $customerGroupId;
 
     /**
      * @var int|null
      *
      * @ORM\Column(name="groupID", type="integer", nullable=true)
      */
-    private $groupId = null;
+    private $groupId;
 
     /**
      * @return int
diff --git a/engine/Shopware/Models/Price/Group.php b/engine/Shopware/Models/Price/Group.php
index d38bf325154..b86bf2b2816 100644
--- a/engine/Shopware/Models/Price/Group.php
+++ b/engine/Shopware/Models/Price/Group.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Price;
@@ -37,7 +37,7 @@
 class Group extends ModelEntity
 {
     /**
-     * @var \Doctrine\Common\Collections\ArrayCollection<Discount>
+     * @var ArrayCollection<Discount>
      *
      * @ORM\OneToMany(targetEntity="Discount", mappedBy="group", orphanRemoval=true, cascade={"all"})
      */
@@ -93,7 +93,7 @@ public function getName()
     }
 
     /**
-     * @return \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Price\Discount>
+     * @return ArrayCollection<Discount>
      */
     public function getDiscounts()
     {
@@ -107,6 +107,6 @@ public function getDiscounts()
      */
     public function setDiscounts($discounts)
     {
-        return $this->setOneToMany($discounts, \Shopware\Models\Price\Discount::class, 'discounts', 'group');
+        return $this->setOneToMany($discounts, Discount::class, 'discounts', 'group');
     }
 }
diff --git a/engine/Shopware/Models/ProductFeed/ProductFeed.php b/engine/Shopware/Models/ProductFeed/ProductFeed.php
index 314f529c04b..b8a8d3e414a 100644
--- a/engine/Shopware/Models/ProductFeed/ProductFeed.php
+++ b/engine/Shopware/Models/ProductFeed/ProductFeed.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\ProductFeed;
diff --git a/engine/Shopware/Models/ProductFeed/Repository.php b/engine/Shopware/Models/ProductFeed/Repository.php
index 7bd22f977a7..f18c11a955b 100644
--- a/engine/Shopware/Models/ProductFeed/Repository.php
+++ b/engine/Shopware/Models/ProductFeed/Repository.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\ProductFeed;
@@ -27,6 +27,7 @@
 use Doctrine\ORM\Query;
 use Shopware\Components\Model\ModelRepository;
 use Shopware\Components\Model\QueryBuilder;
+use Shopware\Models\Attribute\ProductFeed as ProductFeedAttribute;
 
 /**
  * Repository for the ProductFeed model (Shopware\Models\ProductFeed\ProductFeed).
@@ -47,7 +48,7 @@ class Repository extends ModelRepository
      * @param int|null                                               $offset
      * @param int|null                                               $limit
      *
-     * @return Query
+     * @return Query<ProductFeed>
      */
     public function getListQuery($orderBy = null, $offset = null, $limit = null)
     {
@@ -65,9 +66,9 @@ public function getListQuery($orderBy = null, $offset = null, $limit = null)
      *
      * @param array<array{property: string, direction: string}>|null $orderBy
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
-    public function getListQueryBuilder(array $orderBy = null)
+    public function getListQueryBuilder(?array $orderBy = null)
     {
         /** @var QueryBuilder $builder */
         $builder = $this->getEntityManager()->createQueryBuilder();
@@ -94,7 +95,7 @@ public function getListQueryBuilder(array $orderBy = null)
      * Returns an instance of the \Doctrine\ORM\Query object which select a list of active
      * product feeds.
      *
-     * @return Query
+     * @return Query<ProductFeed>
      */
     public function getActiveListQuery()
     {
@@ -107,7 +108,7 @@ public function getActiveListQuery()
      * Helper function to create the query builder for the "getActiveListQuery" function.
      * This function can be hooked to modify the query builder of the query object.
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getActiveListQueryBuilder()
     {
@@ -128,7 +129,7 @@ public function getActiveListQueryBuilder()
      *
      * @param int $feedId
      *
-     * @return Query
+     * @return Query<ProductFeed>
      */
     public function getDetailQuery($feedId)
     {
@@ -143,7 +144,7 @@ public function getDetailQuery($feedId)
      *
      * @param int $feedId
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getDetailQueryBuilder($feedId)
     {
@@ -165,7 +166,7 @@ public function getDetailQueryBuilder($feedId)
      *
      * @param int $productFeedId
      *
-     * @return Query
+     * @return Query<ProductFeedAttribute>
      */
     public function getAttributesQuery($productFeedId)
     {
@@ -180,13 +181,13 @@ public function getAttributesQuery($productFeedId)
      *
      * @param int $productFeedId
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getAttributesQueryBuilder($productFeedId)
     {
         $builder = $this->getEntityManager()->createQueryBuilder();
         $builder->select(['attribute'])
-                ->from(\Shopware\Models\Attribute\ProductFeed::class, 'attribute')
+                ->from(ProductFeedAttribute::class, 'attribute')
                 ->where('attribute.productFeedId = ?1')
                 ->setParameter(1, $productFeedId);
 
diff --git a/engine/Shopware/Models/ProductStream/ProductStream.php b/engine/Shopware/Models/ProductStream/ProductStream.php
index b2e0e3f500e..7a408e04d5f 100644
--- a/engine/Shopware/Models/ProductStream/ProductStream.php
+++ b/engine/Shopware/Models/ProductStream/ProductStream.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\ProductStream;
@@ -34,6 +34,9 @@
  */
 class ProductStream extends ModelEntity
 {
+    public const TYPE_CONDITION = 1;
+    public const TYPE_SELECTION = 2;
+
     /**
      * INVERSE SIDE
      *
@@ -67,7 +70,7 @@ class ProductStream extends ModelEntity
     private $description;
 
     /**
-     * @var int
+     * @var self::TYPE_*
      *
      * @ORM\Column(name="type", type="integer", nullable=false)
      */
@@ -151,7 +154,7 @@ public function setConditions($conditions)
     }
 
     /**
-     * @return int
+     * @return self::TYPE_*
      */
     public function getType()
     {
@@ -159,7 +162,7 @@ public function getType()
     }
 
     /**
-     * @param int $type
+     * @param self::TYPE_* $type
      */
     public function setType($type)
     {
diff --git a/engine/Shopware/Models/Property/Group.php b/engine/Shopware/Models/Property/Group.php
index 7a76f8564bc..bb3d80fd3e9 100644
--- a/engine/Shopware/Models/Property/Group.php
+++ b/engine/Shopware/Models/Property/Group.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Property;
@@ -103,7 +103,7 @@ class Group extends ModelEntity
     private $relations;
 
     /**
-     * @var ArrayCollection<\Shopware\Models\Article\Article>
+     * @var ArrayCollection<Article>
      *
      * @ORM\OneToMany(targetEntity="Shopware\Models\Article\Article", mappedBy="propertyGroup", fetch="EXTRA_LAZY")
      * @ORM\JoinColumn(name="id", referencedColumnName="filtergroupID")
diff --git a/engine/Shopware/Models/Property/Option.php b/engine/Shopware/Models/Property/Option.php
index c8f2cbbfe5a..286347a82eb 100644
--- a/engine/Shopware/Models/Property/Option.php
+++ b/engine/Shopware/Models/Property/Option.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Property;
diff --git a/engine/Shopware/Models/Property/Relation.php b/engine/Shopware/Models/Property/Relation.php
index 61686ca92ab..b8175becb95 100644
--- a/engine/Shopware/Models/Property/Relation.php
+++ b/engine/Shopware/Models/Property/Relation.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Property;
@@ -47,7 +47,8 @@ class Relation extends ModelEntity
     /**
      * The resource property is the owning side of the association between relation and group.
      *
-     * @var \Shopware\Models\Property\Group|null
+     * @var Group|null
+     *
      * @ORM\ManyToOne(targetEntity="\Shopware\Models\Property\Group", inversedBy="relations")
      * @ORM\JoinColumn(name="groupID", referencedColumnName="id", nullable=true)
      */
@@ -63,7 +64,8 @@ class Relation extends ModelEntity
     /**
      * The resource property is the owning side of the association between relation and option.
      *
-     * @var \Shopware\Models\Property\Option|null
+     * @var Option|null
+     *
      * @ORM\ManyToOne(targetEntity="\Shopware\Models\Property\Option", inversedBy="relations")
      * @ORM\JoinColumn(name="optionID", referencedColumnName="id", nullable=true)
      */
@@ -92,7 +94,7 @@ public function getId()
     }
 
     /**
-     * @param \Shopware\Models\Property\Option $option
+     * @param Option $option
      */
     public function setOption($option)
     {
@@ -100,7 +102,7 @@ public function setOption($option)
     }
 
     /**
-     * @return \Shopware\Models\Property\Option|null
+     * @return Option|null
      */
     public function getOption()
     {
@@ -108,7 +110,7 @@ public function getOption()
     }
 
     /**
-     * @param \Shopware\Models\Property\Group $group
+     * @param Group $group
      */
     public function setGroup($group)
     {
@@ -116,7 +118,7 @@ public function setGroup($group)
     }
 
     /**
-     * @return \Shopware\Models\Property\Group|null
+     * @return Group|null
      */
     public function getGroup()
     {
diff --git a/engine/Shopware/Models/Property/Repository.php b/engine/Shopware/Models/Property/Repository.php
index 8933ecefb1e..cc942d1471a 100644
--- a/engine/Shopware/Models/Property/Repository.php
+++ b/engine/Shopware/Models/Property/Repository.php
@@ -1,31 +1,35 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Property;
 
+use Doctrine\ORM\Query;
+use Doctrine\ORM\Query\Expr\OrderBy;
 use Shopware\Components\Model\ModelRepository;
-use Shopware\Components\Model\Query\SqlWalker;
+use Shopware\Components\Model\Query\SqlWalker\ForceIndexWalker;
+use Shopware\Components\Model\QueryBuilder;
+use Shopware\Models\Attribute\PropertyGroup;
 
 /**
  * @extends ModelRepository<Group>
@@ -35,12 +39,12 @@ class Repository extends ModelRepository
     /**
      * Returns an instance of the \Doctrine\ORM\Query object which allows you to get property relations
      *
-     * @param array|null                                   $filter
-     * @param string|\Doctrine\ORM\Query\Expr\OrderBy|null $order
-     * @param int|null                                     $limit
-     * @param int|null                                     $offset
+     * @param array|null          $filter
+     * @param string|OrderBy|null $order
+     * @param int|null            $limit
+     * @param int|null            $offset
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Relation>
      */
     public function getPropertyRelationQuery($filter = null, $order = null, $limit = null, $offset = null)
     {
@@ -57,10 +61,10 @@ public function getPropertyRelationQuery($filter = null, $order = null, $limit =
      * Helper function to create the query builder for the "getPropertyRelationQuery" function.
      * This function can be hooked to modify the query builder of the query object.
      *
-     * @param array|null                                   $filter
-     * @param string|\Doctrine\ORM\Query\Expr\OrderBy|null $order
+     * @param array|null          $filter
+     * @param string|OrderBy|null $order
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getPropertyRelationQueryBuilder($filter, $order)
     {
@@ -68,7 +72,7 @@ public function getPropertyRelationQueryBuilder($filter, $order)
         $builder->select([
             'relations',
         ]);
-        $builder->from(\Shopware\Models\Property\Relation::class, 'relations')
+        $builder->from(Relation::class, 'relations')
             ->leftJoin('relations.option', 'options')
             ->leftJoin('relations.group', 'groups');
 
@@ -85,12 +89,12 @@ public function getPropertyRelationQueryBuilder($filter, $order)
     /**
      * Receives all known property groups
      *
-     * @param array|null                                         $filter
-     * @param array|string|\Doctrine\ORM\Query\Expr\OrderBy|null $order
-     * @param int                                                $limit
-     * @param int                                                $offset
+     * @param array|null                $filter
+     * @param array|string|OrderBy|null $order
+     * @param int                       $limit
+     * @param int                       $offset
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Group>
      */
     public function getListGroupsQuery($filter = null, $order = null, $limit = null, $offset = null)
     {
@@ -108,10 +112,10 @@ public function getListGroupsQuery($filter = null, $order = null, $limit = null,
      * Helper function to create the query builder for the "getListGroupsQuery" function.
      * This function can be hooked to modify the query builder of the query object.
      *
-     * @param array|null                                   $filter
-     * @param string|\Doctrine\ORM\Query\Expr\OrderBy|null $order
+     * @param array|null          $filter
+     * @param string|OrderBy|null $order
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getListGroupsQueryBuilder($filter = null, $order = null)
     {
@@ -121,7 +125,7 @@ public function getListGroupsQueryBuilder($filter = null, $order = null)
             'options',
             'attributes',
         ]);
-        $builder->from(\Shopware\Models\Property\Group::class, 'groups')
+        $builder->from(Group::class, 'groups')
             ->leftJoin('groups.options', 'options')
             ->leftJoin('groups.attribute', 'attributes');
 
@@ -142,7 +146,7 @@ public function getListGroupsQueryBuilder($filter = null, $order = null)
      * @param int   $limit
      * @param array $filter
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Group>
      */
     public function getSetsQuery($offset, $limit, $filter)
     {
@@ -164,13 +168,13 @@ public function getSetsQuery($offset, $limit, $filter)
      *
      * @param array $filter
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getSetsQueryBuilder($filter)
     {
         $builder = $this->getEntityManager()->createQueryBuilder();
         $builder->select(['groups', 'attribute'])
-                ->from(\Shopware\Models\Property\Group::class, 'groups')
+                ->from(Group::class, 'groups')
                 ->leftJoin('groups.attribute', 'attribute')
                 ->orderBy('groups.position');
 
@@ -189,7 +193,7 @@ public function getSetsQueryBuilder($filter)
      * @param int   $limit
      * @param array $filter
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Option>
      */
     public function getOptionsQuery($offset, $limit, $filter)
     {
@@ -211,13 +215,13 @@ public function getOptionsQuery($offset, $limit, $filter)
      *
      * @param array $filter
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getOptionsQueryBuilder($filter)
     {
         $builder = $this->getEntityManager()->createQueryBuilder();
         $builder->select(['options'])
-                ->from(\Shopware\Models\Property\Option::class, 'options')
+                ->from(Option::class, 'options')
                 ->orderBy('options.name');
 
         if (!empty($filter[0]['value'])) {
@@ -233,13 +237,14 @@ public function getOptionsQueryBuilder($filter)
      *
      * @param int $setId
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Option>
      */
     public function getSetAssignsQuery($setId)
     {
-        $builder = $this->getSetAssignsQueryBuilder($setId);
+        /** @var Query<Option> $query */
+        $query = $this->getSetAssignsQueryBuilder($setId)->getQuery();
 
-        return $this->getForceIndexQuery($builder->getQuery(), null, true);
+        return $this->getForceIndexQuery($query, null, true);
     }
 
     /**
@@ -248,7 +253,7 @@ public function getSetAssignsQuery($setId)
      *
      * @param int $setId
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getSetAssignsQueryBuilder($setId)
     {
@@ -260,7 +265,7 @@ public function getSetAssignsQueryBuilder($setId)
             'relations.position',
         ]);
 
-        $builder->from(\Shopware\Models\Property\Option::class, 'options')
+        $builder->from(Option::class, 'options')
                 ->innerJoin('options.relations', 'relations')
                 ->where('relations.groupId = :id')
                 ->setParameter('id', $setId)
@@ -275,7 +280,7 @@ public function getSetAssignsQueryBuilder($setId)
      *
      * @param int $groupId
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<PropertyGroup>
      */
     public function getAttributesQuery($groupId)
     {
@@ -290,15 +295,15 @@ public function getAttributesQuery($groupId)
      *
      * @param int $groupId
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getAttributesQueryBuilder($groupId)
     {
         $builder = $this->getEntityManager()->createQueryBuilder();
         $builder->select(['attribute'])
-                      ->from(\Shopware\Models\Attribute\PropertyGroup::class, 'attribute')
-                      ->where('attribute.propertyGroupId = ?1')
-                      ->setParameter(1, $groupId);
+            ->from(PropertyGroup::class, 'attribute')
+            ->where('attribute.propertyGroupId = ?1')
+            ->setParameter(1, $groupId);
 
         return $builder;
     }
@@ -309,7 +314,7 @@ public function getAttributesQueryBuilder($groupId)
      *
      * @param int $groupId
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Group>
      */
     public function getGroupDetailQuery($groupId)
     {
@@ -324,13 +329,13 @@ public function getGroupDetailQuery($groupId)
      *
      * @param int $groupId
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getGroupDetailQueryBuilder($groupId)
     {
         $builder = $this->getEntityManager()->createQueryBuilder();
         $builder->select(['groups', 'attribute'])
-                ->from(\Shopware\Models\Property\Group::class, 'groups')
+                ->from(Group::class, 'groups')
                 ->leftJoin('groups.attribute', 'attribute')
                 ->where('groups.id = ?1')
                 ->setParameter(1, $groupId);
@@ -343,7 +348,7 @@ public function getGroupDetailQueryBuilder($groupId)
      *
      * @param int $optionId
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Value>
      */
     public function getPropertyValueByOptionIdQuery($optionId)
     {
@@ -358,13 +363,13 @@ public function getPropertyValueByOptionIdQuery($optionId)
      *
      * @param int $optionId
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getPropertyValueByOptionIdQueryBuilder($optionId)
     {
         $builder = $this->getEntityManager()->createQueryBuilder();
         $builder->select(['value', 'media'])
-                ->from(\Shopware\Models\Property\Value::class, 'value')
+                ->from(Value::class, 'value')
                 ->leftJoin('value.media', 'media')
                 ->where('value.optionId = ?0')
                 ->orderBy('value.position', 'ASC')
@@ -376,20 +381,18 @@ public function getPropertyValueByOptionIdQueryBuilder($optionId)
     /**
      * Helper function to set the FORCE INDEX path.
      *
-     * @param \Doctrine\ORM\Query $query
-     * @param string              $index
-     * @param bool                $straightJoin
+     * @param Query<Option> $query
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Option>
      */
-    private function getForceIndexQuery($query, $index = null, $straightJoin = false)
+    private function getForceIndexQuery(Query $query, ?string $index = null, bool $straightJoin = false): Query
     {
-        $query->setHint(\Doctrine\ORM\Query::HINT_CUSTOM_OUTPUT_WALKER, 'Shopware\Components\Model\Query\SqlWalker\ForceIndexWalker');
+        $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, ForceIndexWalker::class);
         if ($index !== null) {
-            $query->setHint(SqlWalker\ForceIndexWalker::HINT_FORCE_INDEX, $index);
+            $query->setHint(ForceIndexWalker::HINT_FORCE_INDEX, $index);
         }
         if ($straightJoin) {
-            $query->setHint(SqlWalker\ForceIndexWalker::HINT_STRAIGHT_JOIN, true);
+            $query->setHint(ForceIndexWalker::HINT_STRAIGHT_JOIN, true);
         }
 
         return $query;
diff --git a/engine/Shopware/Models/Property/Value.php b/engine/Shopware/Models/Property/Value.php
index cc675efb86e..986dbbf076c 100644
--- a/engine/Shopware/Models/Property/Value.php
+++ b/engine/Shopware/Models/Property/Value.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Property;
diff --git a/engine/Shopware/Models/Search/CustomFacet.php b/engine/Shopware/Models/Search/CustomFacet.php
index ca594a0492b..b09c96e145d 100644
--- a/engine/Shopware/Models/Search/CustomFacet.php
+++ b/engine/Shopware/Models/Search/CustomFacet.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Search;
diff --git a/engine/Shopware/Models/Search/CustomSorting.php b/engine/Shopware/Models/Search/CustomSorting.php
index 976f67261b7..6319b45b4a3 100644
--- a/engine/Shopware/Models/Search/CustomSorting.php
+++ b/engine/Shopware/Models/Search/CustomSorting.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Search;
diff --git a/engine/Shopware/Models/Shop/Currency.php b/engine/Shopware/Models/Shop/Currency.php
index 1b9ae134197..448f5193ec4 100644
--- a/engine/Shopware/Models/Shop/Currency.php
+++ b/engine/Shopware/Models/Shop/Currency.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Shop;
diff --git a/engine/Shopware/Models/Shop/DetachedShop.php b/engine/Shopware/Models/Shop/DetachedShop.php
index 966a65cd4e2..73b508ee093 100644
--- a/engine/Shopware/Models/Shop/DetachedShop.php
+++ b/engine/Shopware/Models/Shop/DetachedShop.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Shop;
@@ -41,6 +41,10 @@ public static function createFromShop(Shop $shop)
         $self = new self();
 
         foreach ($shop as $field => $value) {
+            if (\in_array($field, ['__initializer__', '__cloner__', '__isInitialized__'], true)) {
+                /* skip properties from Doctrine proxies @see \Doctrine\Common\Proxy\ProxyGenerator */
+                continue;
+            }
             $self->{$field} = $value;
         }
 
diff --git a/engine/Shopware/Models/Shop/Exception/ShopCurrencyNotSetException.php b/engine/Shopware/Models/Shop/Exception/ShopCurrencyNotSetException.php
index 75313b67920..0e424d93f75 100644
--- a/engine/Shopware/Models/Shop/Exception/ShopCurrencyNotSetException.php
+++ b/engine/Shopware/Models/Shop/Exception/ShopCurrencyNotSetException.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Shop\Exception;
diff --git a/engine/Shopware/Models/Shop/Exception/ShopLocaleNotSetException.php b/engine/Shopware/Models/Shop/Exception/ShopLocaleNotSetException.php
index 1015a8a3fa6..4aabad89ac9 100644
--- a/engine/Shopware/Models/Shop/Exception/ShopLocaleNotSetException.php
+++ b/engine/Shopware/Models/Shop/Exception/ShopLocaleNotSetException.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Shop\Exception;
diff --git a/engine/Shopware/Models/Shop/Locale.php b/engine/Shopware/Models/Shop/Locale.php
index 94b9ad0ba37..71fb47b2dc6 100644
--- a/engine/Shopware/Models/Shop/Locale.php
+++ b/engine/Shopware/Models/Shop/Locale.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Shop;
diff --git a/engine/Shopware/Models/Shop/Repository.php b/engine/Shopware/Models/Shop/Repository.php
index 27fa926f427..1d0ddba3a5a 100644
--- a/engine/Shopware/Models/Shop/Repository.php
+++ b/engine/Shopware/Models/Shop/Repository.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Shop;
@@ -45,7 +45,7 @@ class Repository extends ModelRepository
      * @param int|null          $offset
      * @param int|null          $limit
      *
-     * @return Query
+     * @return Query<Locale>
      */
     public function getLocalesListQuery($filter = null, $order = null, $offset = null, $limit = null)
     {
@@ -74,7 +74,7 @@ public function getLocalesListQueryBuilder($filter = null, $order = null)
             'locale',
         ];
         $builder->select($fields);
-        $builder->from(\Shopware\Models\Shop\Locale::class, 'locale');
+        $builder->from(Locale::class, 'locale');
         if ($filter !== null) {
             $builder->addFilter($filter);
         }
@@ -94,7 +94,7 @@ public function getLocalesListQueryBuilder($filter = null, $order = null)
      * @param int|null          $limit
      * @param bool              $orderByShopPositionAsDefault Deprecated since 5.6.3, will be default starting with Shopware 5.8.
      *
-     * @return Query
+     * @return Query<Shop>
      */
     public function getBaseListQuery($filter = null, $order = null, $offset = null, $limit = null, bool $orderByShopPositionAsDefault = false)
     {
@@ -115,7 +115,7 @@ public function getBaseListQuery($filter = null, $order = null, $offset = null,
      * @param int               $offset
      * @param int               $limit
      *
-     * @return Query
+     * @return Query<Shop>
      */
     public function getShopsWithThemes($filter = null, $order = null, $offset = null, $limit = null)
     {
@@ -186,7 +186,7 @@ public function getBaseListQueryBuilder($filter = null, $order = null, bool $ord
     /**
      * Returns the \Doctrine\ORM\Query to select all categories for example for the backend tree
      *
-     * @return Query
+     * @return Query<Shop>
      */
     public function getListQuery(array $filterBy, array $orderBy, $limit = null, $offset = null)
     {
@@ -256,7 +256,7 @@ public function getMainListQueryBuilder(bool $orderByShopPositionAsDefault = fal
      * Returns an instance of \Doctrine\ORM\Query object which selects a list of
      * sub shops. Used for the shop combo box on the article detail page in the article backend module.
      *
-     * @return Query
+     * @return Query<Shop>
      */
     public function getMainListQuery()
     {
@@ -402,7 +402,7 @@ public function getActiveShopByRequestAsArray(Enlight_Controller_Request_Request
 
         $shops = $this->getShopsArrayByHost($host);
 
-        //returns the right shop depending on the url
+        // returns the right shop depending on the url
         $shop = $this->findShopForRequest($shops, $requestPath);
 
         if ($shop !== null) {
@@ -413,7 +413,7 @@ public function getActiveShopByRequestAsArray(Enlight_Controller_Request_Request
     }
 
     /**
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getQueryBuilder()
     {
@@ -450,7 +450,7 @@ public function getQueryBuilder()
     }
 
     /**
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getActiveQueryBuilder()
     {
@@ -494,7 +494,7 @@ protected function findShopForRequest($shops, $requestPath)
     {
         $shop = null;
         foreach ($shops as $currentShop) {
-            //if the base url matches exactly the basePath we have found the main shop but the loop will continue
+            // if the base url matches exactly the basePath we have found the main shop but the loop will continue
             if ($currentShop['base_url'] === $currentShop['base_path']) {
                 if ($shop === null) {
                     $shop = $currentShop;
@@ -551,20 +551,15 @@ private function fetchAndFixShop($shop)
         return $this->fixActive($shop);
     }
 
-    /**
-     * @param string $host
-     *
-     * @return array
-     */
-    private function getShopsArrayByHost($host)
+    private function getShopsArrayByHost(string $host): array
     {
         $query = $this->getDbalShopsQuery();
         $query->andWhere('shop.active = 1');
         $query->andWhere('(shop.host = :host OR (shop.host IS NULL AND main_shop.host = :host))');
         $query->setParameter(':host', $host);
-        $shops = $query->execute()->fetchAll(PDO::FETCH_ASSOC);
+        $shops = $query->execute()->fetchAllAssociative();
 
-        usort($shops, function ($a, $b) {
+        usort($shops, function (array $a, array $b): int {
             if ($a['is_main'] && !$b['is_main']) {
                 return -1;
             }
@@ -574,7 +569,7 @@ private function getShopsArrayByHost($host)
             }
 
             if ($a['is_main'] === $b['is_main']) {
-                return $a['position'] > $b['position'];
+                return $a['position'] <=> $b['position'];
             }
 
             return 0;
@@ -634,7 +629,7 @@ private function getDbalShopsQuery()
     }
 
     /**
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     private function getActiveMainShopQueryBuilder()
     {
@@ -663,7 +658,7 @@ private function getActiveMainShopQueryBuilder()
     }
 
     /**
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     private function getActiveSubShopQueryBuilder()
     {
diff --git a/engine/Shopware/Models/Shop/Shop.php b/engine/Shopware/Models/Shop/Shop.php
index e8ae46494da..e55badeaea9 100644
--- a/engine/Shopware/Models/Shop/Shop.php
+++ b/engine/Shopware/Models/Shop/Shop.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Shop;
@@ -668,11 +668,9 @@ public function get($name)
     }
 
     /**
-     * @return Shop
-     *
      * @deprecated Shop::registerResources is deprecated since 5.6 and will be removed with 5.8. Use service ShopRegistrationService instead
      */
-    public function registerResources(): self
+    public function registerResources(): Shop
     {
         trigger_error('Shop::registerResources is deprecated since 5.6 and will be removed with 5.8. Use service ShopRegistrationService instead', E_USER_DEPRECATED);
 
diff --git a/engine/Shopware/Models/Shop/Template.php b/engine/Shopware/Models/Shop/Template.php
index 758d21406c7..a5024b4e584 100644
--- a/engine/Shopware/Models/Shop/Template.php
+++ b/engine/Shopware/Models/Shop/Template.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Shop;
@@ -46,7 +46,7 @@ class Template extends ModelEntity
      * @ORM\ManyToOne(targetEntity="\Shopware\Models\Shop\Template")
      * @ORM\JoinColumn(name="parent_id", referencedColumnName="id")
      */
-    protected $parent = null;
+    protected $parent;
 
     /**
      * @var ArrayCollection<Shop>
@@ -420,7 +420,7 @@ public function toString()
         return $this->getTemplate();
     }
 
-    public function setParent(Template $parent = null)
+    public function setParent(?Template $parent = null)
     {
         $this->parent = $parent;
     }
diff --git a/engine/Shopware/Models/Shop/TemplateConfig/Element.php b/engine/Shopware/Models/Shop/TemplateConfig/Element.php
index a775ebe9fba..ed01101ab73 100644
--- a/engine/Shopware/Models/Shop/TemplateConfig/Element.php
+++ b/engine/Shopware/Models/Shop/TemplateConfig/Element.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Shop\TemplateConfig;
@@ -88,21 +88,21 @@ class Element extends ModelEntity
      *
      * @ORM\Column(name="selection", type="array", nullable=true)
      */
-    protected $selection = null;
+    protected $selection;
 
     /**
      * @var string|null
      *
      * @ORM\Column(name="field_label", type="string", nullable=true)
      */
-    protected $fieldLabel = null;
+    protected $fieldLabel;
 
     /**
      * @var string|null
      *
      * @ORM\Column(name="support_text", type="string", nullable=true)
      */
-    protected $supportText = null;
+    protected $supportText;
 
     /**
      * @var bool
diff --git a/engine/Shopware/Models/Shop/TemplateConfig/Layout.php b/engine/Shopware/Models/Shop/TemplateConfig/Layout.php
index e77014f8baa..7f1b11954a7 100644
--- a/engine/Shopware/Models/Shop/TemplateConfig/Layout.php
+++ b/engine/Shopware/Models/Shop/TemplateConfig/Layout.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Shop\TemplateConfig;
@@ -107,6 +107,7 @@ class Layout extends ModelEntity
 
     /**
      * @var ArrayCollection<Element>
+     *
      * @ORM\OneToMany(targetEntity="Element", mappedBy="container"))
      */
     protected $elements;
diff --git a/engine/Shopware/Models/Shop/TemplateConfig/Set.php b/engine/Shopware/Models/Shop/TemplateConfig/Set.php
index f75b04443ce..395d712b927 100644
--- a/engine/Shopware/Models/Shop/TemplateConfig/Set.php
+++ b/engine/Shopware/Models/Shop/TemplateConfig/Set.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Shop\TemplateConfig;
diff --git a/engine/Shopware/Models/Shop/TemplateConfig/Value.php b/engine/Shopware/Models/Shop/TemplateConfig/Value.php
index 51aabe97c54..80f1ec54bfc 100644
--- a/engine/Shopware/Models/Shop/TemplateConfig/Value.php
+++ b/engine/Shopware/Models/Shop/TemplateConfig/Value.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Shop\TemplateConfig;
@@ -36,6 +36,7 @@ class Value extends ModelEntity
 {
     /**
      * @var Element
+     *
      * @ORM\ManyToOne(
      *     targetEntity="Shopware\Models\Shop\TemplateConfig\Element",
      *     inversedBy="values"
@@ -46,6 +47,7 @@ class Value extends ModelEntity
 
     /**
      * @var Shop
+     *
      * @ORM\ManyToOne(targetEntity="Shopware\Models\Shop\Shop")
      * @ORM\JoinColumn(name="shop_id", referencedColumnName="id", nullable=false)
      */
@@ -62,18 +64,21 @@ class Value extends ModelEntity
 
     /**
      * @var int
+     *
      * @ORM\Column(name="element_id", type="integer", nullable=false)
      */
     private $elementId;
 
     /**
      * @var int
+     *
      * @ORM\Column(name="shop_id", type="integer", nullable=false)
      */
     private $shopId;
 
     /**
      * @var array
+     *
      * @ORM\Column(name="value", type="array", nullable=false)
      */
     private $value;
diff --git a/engine/Shopware/Models/Site/Group.php b/engine/Shopware/Models/Site/Group.php
index 93c5a09e9e7..4697ba9e140 100644
--- a/engine/Shopware/Models/Site/Group.php
+++ b/engine/Shopware/Models/Site/Group.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Site;
@@ -68,7 +68,7 @@ class Group extends ModelEntity
     private $active = true;
 
     /**
-     * @var \Shopware\Models\Site\Group|null
+     * @var Group|null
      *
      * @ORM\ManyToOne(targetEntity="Shopware\Models\Site\Group")
      * @ORM\JoinColumn(name="mapping_id", nullable=true, referencedColumnName="id")
@@ -116,7 +116,7 @@ public function setName($name)
     }
 
     /**
-     * @return \Shopware\Models\Site\Group|null
+     * @return Group|null
      */
     public function getMapping()
     {
@@ -124,7 +124,7 @@ public function getMapping()
     }
 
     /**
-     * @param \Shopware\Models\Site\Group|null $mapping
+     * @param Group|null $mapping
      */
     public function setMapping($mapping)
     {
diff --git a/engine/Shopware/Models/Site/Repository.php b/engine/Shopware/Models/Site/Repository.php
index 2331110a846..dd3086042bb 100644
--- a/engine/Shopware/Models/Site/Repository.php
+++ b/engine/Shopware/Models/Site/Repository.php
@@ -1,31 +1,33 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Site;
 
+use Doctrine\ORM\Query;
 use Shopware\Components\Model\ModelRepository;
 use Shopware\Components\Model\QueryBuilder;
+use Shopware\Models\Attribute\Site as SiteAttribute;
 
 /**
  * Repository for the site model (Shopware\Models\Site\Site).
@@ -42,9 +44,9 @@ class Repository extends ModelRepository
      * @param int|null $limit
      * @param int|null $offset
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Group>
      */
-    public function getGroupListQuery(array $filterBy = null, array $orderBy = null, $limit = null, $offset = null)
+    public function getGroupListQuery(?array $filterBy = null, ?array $orderBy = null, $limit = null, $offset = null)
     {
         $builder = $this->getGroupListQueryBuilder($filterBy, $orderBy, $limit, $offset);
 
@@ -58,13 +60,13 @@ public function getGroupListQuery(array $filterBy = null, array $orderBy = null,
      * @param int|null $limit
      * @param int|null $offset
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
-    public function getGroupListQueryBuilder(array $filterBy = null, array $orderBy = null, $limit = null, $offset = null)
+    public function getGroupListQueryBuilder(?array $filterBy = null, ?array $orderBy = null, $limit = null, $offset = null)
     {
         /** @var QueryBuilder $builder */
         $builder = $this->getEntityManager()->createQueryBuilder();
-        $builder->from(\Shopware\Models\Site\Group::class, 'g');
+        $builder->from(Group::class, 'g');
         $builder->leftJoin('g.mapping', 'm');
 
         $builder->select([
@@ -97,7 +99,7 @@ public function getGroupListQueryBuilder(array $filterBy = null, array $orderBy
      * @param string $nodeName
      * @param int    $shopId
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Site>
      */
     public function getSitesByNodeNameQuery($nodeName, $shopId = null)
     {
@@ -113,13 +115,13 @@ public function getSitesByNodeNameQuery($nodeName, $shopId = null)
      * @param string $nodeName
      * @param int    $shopId
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getSitesByNodeNameQueryBuilder($nodeName, $shopId = null)
     {
         $builder = $this->getEntityManager()->createQueryBuilder();
         $builder->select(['sites', 'children', 'attribute', 'childrenAttribute'])
-                ->from(\Shopware\Models\Site\Site::class, 'sites')
+                ->from(Site::class, 'sites')
                 ->leftJoin('sites.attribute', 'attribute')
                 ->leftJoin('sites.children', 'children')
                 ->leftJoin('children.attribute', 'childrenAttribute')
@@ -147,7 +149,7 @@ public function getSitesByNodeNameQueryBuilder($nodeName, $shopId = null)
      *
      * @param int $siteId
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<SiteAttribute>
      */
     public function getAttributesQuery($siteId)
     {
@@ -162,13 +164,13 @@ public function getAttributesQuery($siteId)
      *
      * @param int $siteId
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getAttributesQueryBuilder($siteId)
     {
         $builder = $this->getEntityManager()->createQueryBuilder();
         $builder->select(['attribute'])
-                      ->from(\Shopware\Models\Attribute\Site::class, 'attribute')
+                      ->from(SiteAttribute::class, 'attribute')
                       ->where('attribute.siteId = ?1')
                       ->setParameter(1, $siteId);
 
@@ -180,7 +182,7 @@ public function getAttributesQueryBuilder($siteId)
      *
      * @param int $siteId
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Site>
      */
     public function getSiteQuery($siteId)
     {
@@ -195,13 +197,13 @@ public function getSiteQuery($siteId)
      *
      * @param int $siteId
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getSiteQueryBuilder($siteId)
     {
         $builder = $this->getEntityManager()->createQueryBuilder();
         $builder->select(['site'])
-                ->from(\Shopware\Models\Site\Site::class, 'site')
+                ->from(Site::class, 'site')
                 ->leftJoin('site.attribute', 'attribute')
                 ->where('site.id = ?1')
                 ->setParameter(1, $siteId);
@@ -216,7 +218,7 @@ public function getSiteQueryBuilder($siteId)
      * @param int $offset
      * @param int $limit
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Site>
      */
     public function getSitesWithoutLinkQuery($shopId, $offset, $limit)
     {
@@ -232,13 +234,13 @@ public function getSitesWithoutLinkQuery($shopId, $offset, $limit)
      *
      * @param int $shopId
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getSitesWithoutLinkQueryBuilder($shopId = null)
     {
         $builder = $this->getEntityManager()->createQueryBuilder();
         $builder->select(['site'])
-            ->from(\Shopware\Models\Site\Site::class, 'site')
+            ->from(Site::class, 'site')
             ->where('site.link = \'\'')
             ->andWhere('(site.shopIds LIKE :shopId OR site.shopIds IS NULL)')
             ->setParameter('shopId', '%|' . $shopId . '|%');
diff --git a/engine/Shopware/Models/Site/Site.php b/engine/Shopware/Models/Site/Site.php
index 165e17295de..49aa7f20d8b 100644
--- a/engine/Shopware/Models/Site/Site.php
+++ b/engine/Shopware/Models/Site/Site.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Site;
@@ -124,7 +124,7 @@ class Site extends ModelEntity
     /**
      * @var string
      *
-     * @ORM\Column(name="meta_keywords", type="string", nullable=false)
+     * @ORM\Column(name="meta_keywords", type="text", nullable=false)
      */
     private $metaKeywords;
 
diff --git a/engine/Shopware/Models/Sitemap/CustomUrl.php b/engine/Shopware/Models/Sitemap/CustomUrl.php
index fbdf3ce4090..e039f9dd680 100644
--- a/engine/Shopware/Models/Sitemap/CustomUrl.php
+++ b/engine/Shopware/Models/Sitemap/CustomUrl.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Sitemap;
diff --git a/engine/Shopware/Models/Sitemap/ExcludedUrl.php b/engine/Shopware/Models/Sitemap/ExcludedUrl.php
index 3d5e2bc735e..4f30de006e6 100644
--- a/engine/Shopware/Models/Sitemap/ExcludedUrl.php
+++ b/engine/Shopware/Models/Sitemap/ExcludedUrl.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Sitemap;
diff --git a/engine/Shopware/Models/Snippet/Snippet.php b/engine/Shopware/Models/Snippet/Snippet.php
index cb59ef3eb06..5d4cb68aebc 100644
--- a/engine/Shopware/Models/Snippet/Snippet.php
+++ b/engine/Shopware/Models/Snippet/Snippet.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Snippet;
@@ -120,7 +120,7 @@ public function getId()
     /**
      * @param string $namespace
      *
-     * @return \Shopware\Models\Snippet\Snippet
+     * @return Snippet
      */
     public function setNamespace($namespace)
     {
@@ -140,7 +140,7 @@ public function getNamespace()
     /**
      * @param int $shopid
      *
-     * @return \Shopware\Models\Snippet\Snippet
+     * @return Snippet
      */
     public function setShopId($shopid)
     {
@@ -160,7 +160,7 @@ public function getShopId()
     /**
      * @param int $localeid
      *
-     * @return \Shopware\Models\Snippet\Snippet
+     * @return Snippet
      */
     public function setLocaleId($localeid)
     {
@@ -180,7 +180,7 @@ public function getLocaleId()
     /**
      * @param string $name
      *
-     * @return \Shopware\Models\Snippet\Snippet
+     * @return Snippet
      */
     public function setName($name)
     {
@@ -200,7 +200,7 @@ public function getName()
     /**
      * @param string $value
      *
-     * @return \Shopware\Models\Snippet\Snippet
+     * @return Snippet
      */
     public function setValue($value)
     {
@@ -220,7 +220,7 @@ public function getValue()
     /**
      * @param DateTimeInterface|string $created
      *
-     * @return \Shopware\Models\Snippet\Snippet
+     * @return Snippet
      */
     public function setCreated($created = 'now')
     {
@@ -244,7 +244,7 @@ public function getCreated()
     /**
      * @param DateTimeInterface|string $updated
      *
-     * @return \Shopware\Models\Snippet\Snippet
+     * @return Snippet
      */
     public function setUpdated($updated = 'now')
     {
diff --git a/engine/Shopware/Models/Snippet/SnippetRepository.php b/engine/Shopware/Models/Snippet/SnippetRepository.php
index e8a045c4c88..7243d2e9fa7 100644
--- a/engine/Shopware/Models/Snippet/SnippetRepository.php
+++ b/engine/Shopware/Models/Snippet/SnippetRepository.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Snippet;
diff --git a/engine/Shopware/Models/Tax/Repository.php b/engine/Shopware/Models/Tax/Repository.php
index 5bddc32c5ea..e70c1e4cfa0 100644
--- a/engine/Shopware/Models/Tax/Repository.php
+++ b/engine/Shopware/Models/Tax/Repository.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Tax;
@@ -83,21 +83,27 @@ public function getTaxRateByConditions($taxId, $areaId, $countryId, $stateId, $c
         ];
 
         $dbalConnection = $this->getEntityManager()->getConnection();
-        $taxRate = $dbalConnection->fetchAssoc($sql, $parameters);
+        $taxRate = $dbalConnection->fetchAssociative($sql, $parameters);
 
         if (empty($taxRate['id'])) {
-            $taxRate = $dbalConnection->fetchAssoc('SELECT tax FROM s_core_tax WHERE id = ?', [$taxId]);
+            $taxRate = $dbalConnection->fetchAssociative('SELECT tax FROM s_core_tax WHERE id = ?', [$taxId]);
         }
 
         return $taxRate['tax'];
     }
 
-    public function getTaxQuery(array $filters = null, array $orderBy = null, int $offset = null, int $limit = null): Query
+    /**
+     * @param array<string, mixed>|array<array{property: string, value: mixed, expression?: string, operator?: string|null}>|null $filters
+     * @param array<array{property: string, direction?: string}>|null                                                             $orderBy
+     *
+     * @return Query<Tax>
+     */
+    public function getTaxQuery(?array $filters = null, ?array $orderBy = null, ?int $offset = null, ?int $limit = null): Query
     {
         return $this->getTaxQueryBuilder($filters, $orderBy, $offset, $limit)->getQuery();
     }
 
-    public function getTaxQueryBuilder(array $filters = null, array $orderBy = null, int $offset = null, int $limit = null): QueryBuilder
+    public function getTaxQueryBuilder(?array $filters = null, ?array $orderBy = null, ?int $offset = null, ?int $limit = null): QueryBuilder
     {
         /** @var QueryBuilder $builder */
         $builder = $this->getEntityManager()->createQueryBuilder();
diff --git a/engine/Shopware/Models/Tax/Rule.php b/engine/Shopware/Models/Tax/Rule.php
index c50a425e2b1..a0ebebc1124 100644
--- a/engine/Shopware/Models/Tax/Rule.php
+++ b/engine/Shopware/Models/Tax/Rule.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Tax;
@@ -85,21 +85,21 @@ class Rule extends ModelEntity
      *
      * @ORM\Column(name="areaID", type="integer", nullable=true)
      */
-    private $areaId = null;
+    private $areaId;
 
     /**
      * @var int|null
      *
      * @ORM\Column(name="countryID", type="integer", nullable=true)
      */
-    private $countryId = null;
+    private $countryId;
 
     /**
      * @var int|null
      *
      * @ORM\Column(name="stateID", type="integer", nullable=true)
      */
-    private $stateId = null;
+    private $stateId;
 
     /**
      * @var int
@@ -142,6 +142,7 @@ class Rule extends ModelEntity
      * The association is joined over the tax rule stateID field and the id field of the state.
      *
      * @var State|null
+     *
      * @ORM\OneToOne(targetEntity="\Shopware\Models\Country\State")
      * @ORM\JoinColumn(name="stateID", referencedColumnName="id")
      */
diff --git a/engine/Shopware/Models/Tax/Tax.php b/engine/Shopware/Models/Tax/Tax.php
index 150036c9cf3..c390114f730 100644
--- a/engine/Shopware/Models/Tax/Tax.php
+++ b/engine/Shopware/Models/Tax/Tax.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Tax;
diff --git a/engine/Shopware/Models/Theme/Settings.php b/engine/Shopware/Models/Theme/Settings.php
index 3d0a1aadaab..c28d8acc9a5 100644
--- a/engine/Shopware/Models/Theme/Settings.php
+++ b/engine/Shopware/Models/Theme/Settings.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Theme;
diff --git a/engine/Shopware/Models/Tracking/ArticleImpression.php b/engine/Shopware/Models/Tracking/ArticleImpression.php
index a3b86969270..37ee44891e1 100644
--- a/engine/Shopware/Models/Tracking/ArticleImpression.php
+++ b/engine/Shopware/Models/Tracking/ArticleImpression.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Tracking;
@@ -51,6 +51,7 @@ class ArticleImpression extends ModelEntity
      * Autoincrement Identifier
      *
      * @var int
+     *
      * @ORM\Column(name="id", type="integer", nullable=false)
      * @ORM\Id()
      * @ORM\GeneratedValue(strategy="IDENTITY")
diff --git a/engine/Shopware/Models/Tracking/Banner.php b/engine/Shopware/Models/Tracking/Banner.php
index d98979ea2b6..e3823987a1a 100644
--- a/engine/Shopware/Models/Tracking/Banner.php
+++ b/engine/Shopware/Models/Tracking/Banner.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Tracking;
@@ -55,6 +55,7 @@ class Banner extends ModelEntity
      * Autoincrement Identifier
      *
      * @var int
+     *
      * @ORM\Column(name="id", type="integer", nullable=false)
      * @ORM\Id()
      * @ORM\GeneratedValue(strategy="IDENTITY")
diff --git a/engine/Shopware/Models/Tracking/Repository.php b/engine/Shopware/Models/Tracking/Repository.php
index f9a06f5bea0..8289aeaa86c 100644
--- a/engine/Shopware/Models/Tracking/Repository.php
+++ b/engine/Shopware/Models/Tracking/Repository.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Tracking;
@@ -45,7 +45,7 @@ class Repository extends ModelRepository
      *
      * @return Banner
      */
-    public function getOrCreateBannerStatsModel($bannerId, DateTimeInterface $date = null)
+    public function getOrCreateBannerStatsModel($bannerId, ?DateTimeInterface $date = null)
     {
         if ($date === null) {
             $date = new DateTime();
@@ -72,7 +72,7 @@ public function getOrCreateBannerStatsModel($bannerId, DateTimeInterface $date =
      * @param DateTimeInterface|null $date
      * @param string|null            $deviceType
      *
-     * @return Query
+     * @return Query<ArticleImpression>
      */
     public function getArticleImpressionQuery($articleId, $shopId, $date = null, $deviceType = null)
     {
diff --git a/engine/Shopware/Models/Translation/Translation.php b/engine/Shopware/Models/Translation/Translation.php
index 74dee0dabe0..f7b0e8f3945 100644
--- a/engine/Shopware/Models/Translation/Translation.php
+++ b/engine/Shopware/Models/Translation/Translation.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Translation;
@@ -156,7 +156,7 @@ public function setShop(Shop $shop)
     }
 
     /**
-     * @return \Shopware\Models\Shop\Shop
+     * @return Shop
      */
     public function getShop()
     {
diff --git a/engine/Shopware/Models/User/Privilege.php b/engine/Shopware/Models/User/Privilege.php
index 210c43e088e..4f356232be5 100644
--- a/engine/Shopware/Models/User/Privilege.php
+++ b/engine/Shopware/Models/User/Privilege.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\User;
diff --git a/engine/Shopware/Models/User/Repository.php b/engine/Shopware/Models/User/Repository.php
index 2f2a5b1aa29..5fa674ef5d4 100644
--- a/engine/Shopware/Models/User/Repository.php
+++ b/engine/Shopware/Models/User/Repository.php
@@ -1,31 +1,34 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\User;
 
+use Doctrine\ORM\Query;
 use Shopware\Components\Model\ModelRepository;
 use Shopware\Components\Model\QueryBuilder;
+use Shopware\Models\Attribute\User as UserAttribute;
+use Shopware\Models\User\Resource as UserResource;
 
 /**
  * Repository for the customer model (Shopware\Models\User\User).
@@ -44,7 +47,7 @@ class Repository extends ModelRepository
      *
      * @param int $userId
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<User>
      */
     public function getUserDetailQuery($userId)
     {
@@ -81,7 +84,7 @@ public function getUserDetailQueryBuilder($userId)
      * @param int|null    $offset
      * @param array|null  $orderBy
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<User>
      */
     public function getUsersQuery($filter = null, $limit = null, $offset = null, $orderBy = null)
     {
@@ -137,7 +140,7 @@ public function getUsersQueryBuilder($filter = null)
      * @param int|null $offset
      * @param int|null $limit
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Role>
      */
     public function getRolesQuery($offset = null, $limit = null)
     {
@@ -171,7 +174,7 @@ public function getRolesQueryBuilder()
      *
      * @param int $userId
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<UserAttribute>
      */
     public function getAttributesQuery($userId)
     {
@@ -192,7 +195,7 @@ public function getAttributesQueryBuilder($userId)
     {
         $builder = $this->getEntityManager()->createQueryBuilder();
         $builder->select(['attribute'])
-                ->from(\Shopware\Models\Attribute\User::class, 'attribute')
+                ->from(UserAttribute::class, 'attribute')
                 ->where('attribute.userId = ?1')
                 ->setParameter(1, $userId);
 
@@ -204,7 +207,7 @@ public function getAttributesQueryBuilder($userId)
      *
      * @param string|null $filter
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<UserResource>
      */
     public function getResourcesQuery($filter = null)
     {
@@ -226,7 +229,7 @@ public function getResourcesQueryBuilder($filter = null)
         $builder = $this->getEntityManager()->createQueryBuilder();
 
         $builder->select(['resources', 'privileges', 'requirements'])
-                ->from('Shopware\Models\User\Resource', 'resources')
+                ->from(UserResource::class, 'resources')
                 ->leftJoin('resources.privileges', 'privileges')
                 ->leftJoin('privileges.requirements', 'requirements')
                 ->orderBy('resources.name');
@@ -245,7 +248,7 @@ public function getResourcesQueryBuilder($filter = null)
      *
      * @param int $roleId
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Rule>
      */
     public function getResourcesWithAdminRuleQuery($roleId)
     {
@@ -278,7 +281,7 @@ public function getResourcesWithAdminRuleQueryBuilder($roleId)
     /**
      * Returns an instance of the \Doctrine\ORM\Query object which select all role data for the passed role id.
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Role>
      */
     public function getRoleDetailQuery()
     {
@@ -309,7 +312,7 @@ public function getRoleDetailQueryBuilder()
      *
      * @param int $resourceId
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<UserResource>
      */
     public function getResourceDeleteQuery($resourceId)
     {
@@ -329,7 +332,7 @@ public function getResourceDeleteQuery($resourceId)
     public function getResourceDeleteQueryBuilder($resourceId)
     {
         $builder = $this->getEntityManager()->createQueryBuilder();
-        $builder->delete(Resource::class, 'resource')
+        $builder->delete(UserResource::class, 'resource')
                 ->where('resource.id = ?1')
                 ->setParameter(1, $resourceId);
 
@@ -341,7 +344,7 @@ public function getResourceDeleteQueryBuilder($resourceId)
      *
      * @param int $privilegeId
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Privilege>
      */
     public function getPrivilegeDeleteQuery($privilegeId)
     {
@@ -374,7 +377,7 @@ public function getPrivilegeDeleteQueryBuilder($privilegeId)
      *
      * @param int $resourceId
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Privilege>
      */
     public function getPrivilegeDeleteByResourceIdQuery($resourceId)
     {
@@ -407,7 +410,7 @@ public function getPrivilegeDeleteByResourceIdQueryBuilder($resourceId)
      *
      * @param int $privilegeId
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Rule>
      */
     public function getRuleDeleteByPrivilegeIdQuery($privilegeId)
     {
@@ -439,7 +442,7 @@ public function getRuleDeleteByPrivilegeIdQueryBuilder($privilegeId)
      *
      * @param int $roleId
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Rule>
      */
     public function getRuleDeleteByRoleIdQuery($roleId)
     {
@@ -472,7 +475,7 @@ public function getRuleDeleteByRoleIdQueryBuilder($roleId)
      *
      * @param int $resourceId
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Rule>
      */
     public function getRuleDeleteByResourceIdQuery($resourceId)
     {
@@ -504,7 +507,7 @@ public function getRuleDeleteByResourceIdQueryBuilder($resourceId)
      *
      * @param int $roleId
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Rule>
      */
     public function getAdminRuleDeleteQuery($roleId)
     {
diff --git a/engine/Shopware/Models/User/Resource.php b/engine/Shopware/Models/User/Resource.php
index 9becd4b861d..5a653b8d714 100644
--- a/engine/Shopware/Models/User/Resource.php
+++ b/engine/Shopware/Models/User/Resource.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\User;
@@ -75,7 +75,7 @@ class Resource extends ModelEntity implements Zend_Acl_Resource_Interface
      * The privileges property is the inverse side of the association between resource and privileges.
      * The association is joined over the s_core_acl_privileges.resourceID field and the s_core_acl_resources.id
      *
-     * @var ArrayCollection<\Shopware\Models\User\Privilege>
+     * @var ArrayCollection<Privilege>
      *
      * @ORM\OneToMany(targetEntity="Shopware\Models\User\Privilege", mappedBy="resource")
      */
@@ -86,7 +86,7 @@ class Resource extends ModelEntity implements Zend_Acl_Resource_Interface
      */
     public function __construct()
     {
-        $this->privileges = new \Doctrine\Common\Collections\ArrayCollection();
+        $this->privileges = new ArrayCollection();
     }
 
     /**
@@ -100,7 +100,7 @@ public function getId()
     /**
      * @param string $name
      *
-     * @return \Shopware\Models\User\Resource
+     * @return $this
      */
     public function setName($name)
     {
diff --git a/engine/Shopware/Models/User/Role.php b/engine/Shopware/Models/User/Role.php
index 6571ac1ff93..0578518c0a6 100644
--- a/engine/Shopware/Models/User/Role.php
+++ b/engine/Shopware/Models/User/Role.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\User;
@@ -114,7 +114,7 @@ class Role extends ModelEntity implements Zend_Acl_Role_Interface
      * The privileges property is the inverse side of the association between resource and privileges.
      * The association is joined over the s_core_acl_privileges.resourceID field and the s_core_acl_resources.id
      *
-     * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\User\Rule>
+     * @var \Doctrine\Common\Collections\ArrayCollection<Rule>
      *
      * @ORM\OneToMany(targetEntity="Shopware\Models\User\Rule", mappedBy="role", cascade={"remove"})
      */
@@ -124,7 +124,7 @@ class Role extends ModelEntity implements Zend_Acl_Role_Interface
      * The children property contains all inherited Shopware\Models\User\Role instances.
      * The children inherits all privileges from his parent.
      *
-     * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\User\Role>
+     * @var \Doctrine\Common\Collections\ArrayCollection<Role>
      *
      * @ORM\OneToMany(targetEntity="\Shopware\Models\User\Role", mappedBy="parent")
      */
@@ -134,7 +134,7 @@ class Role extends ModelEntity implements Zend_Acl_Role_Interface
      * The parent property contains the instance of the inherited Shopware\Models\User\Role
      * model. The Role inherits all privileges from his parent.
      *
-     * @var \Shopware\Models\User\Role|null
+     * @var Role|null
      *
      * @ORM\ManyToOne(targetEntity="\Shopware\Models\User\Role", inversedBy="children")
      * @ORM\JoinColumn(name="parentID", referencedColumnName="id")
@@ -299,7 +299,7 @@ public function getUsers()
      *
      * @param \Doctrine\Common\Collections\ArrayCollection $users
      *
-     * @return \Shopware\Models\User\Role
+     * @return Role
      */
     public function setUsers($users)
     {
@@ -357,7 +357,7 @@ public function setChildren($children)
      * contains the inherited parent role. The association is defined over
      * the Role.id property and the Role.parentId property.
      *
-     * @return \Shopware\Models\User\Role|null
+     * @return Role|null
      */
     public function getParent()
     {
@@ -370,7 +370,7 @@ public function getParent()
      * contains the inherited parent role. The association is defined over
      * the Role.id property and the Role.parentId property.
      *
-     * @param \Shopware\Models\User\Role|null $parent
+     * @param Role|null $parent
      */
     public function setParent($parent)
     {
diff --git a/engine/Shopware/Models/User/Rule.php b/engine/Shopware/Models/User/Rule.php
index 2e4cc9f8161..a2fc8a26c9f 100644
--- a/engine/Shopware/Models/User/Rule.php
+++ b/engine/Shopware/Models/User/Rule.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\User;
diff --git a/engine/Shopware/Models/User/User.php b/engine/Shopware/Models/User/User.php
index b0f34e2bbe7..010fb1a2b82 100644
--- a/engine/Shopware/Models/User/User.php
+++ b/engine/Shopware/Models/User/User.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\User;
diff --git a/engine/Shopware/Models/Voucher/Code.php b/engine/Shopware/Models/Voucher/Code.php
index ffdd13de85c..51ac2ad9578 100644
--- a/engine/Shopware/Models/Voucher/Code.php
+++ b/engine/Shopware/Models/Voucher/Code.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Voucher;
@@ -57,7 +57,7 @@ class Code extends ModelEntity
      *
      * @ORM\Column(name="userID", type="integer", nullable=true)
      */
-    private $customerId = null;
+    private $customerId;
 
     /**
      * @var string
diff --git a/engine/Shopware/Models/Voucher/Repository.php b/engine/Shopware/Models/Voucher/Repository.php
index cceb58bd97f..e4236eb7e0d 100644
--- a/engine/Shopware/Models/Voucher/Repository.php
+++ b/engine/Shopware/Models/Voucher/Repository.php
@@ -1,30 +1,32 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Voucher;
 
 use Doctrine\ORM\Query;
+use Doctrine\ORM\Query\Expr\OrderBy;
+use Doctrine\ORM\QueryBuilder;
 use Shopware\Components\Model\ModelRepository;
 
 /**
@@ -42,13 +44,13 @@ class Repository extends ModelRepository
      * Returns an instance of the \Doctrine\ORM\Query object which select a list of voucher
      * codes for the passed voucher id.
      *
-     * @param int|null                                     $voucherId
-     * @param string|null                                  $filter
-     * @param string|\Doctrine\ORM\Query\Expr\OrderBy|null $order
-     * @param int|null                                     $offset
-     * @param int|null                                     $limit
+     * @param int|null            $voucherId
+     * @param string|null         $filter
+     * @param string|OrderBy|null $order
+     * @param int|null            $offset
+     * @param int|null            $limit
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Code>
      */
     public function getVoucherCodeListQuery($voucherId = null, $filter = null, $order = null, $offset = null, $limit = null)
     {
@@ -65,11 +67,11 @@ public function getVoucherCodeListQuery($voucherId = null, $filter = null, $orde
      * Helper function to create the query builder for the "getVoucherCodeListQuery" function.
      * This function can be hooked to modify the query builder of the query object.
      *
-     * @param int|null                                     $voucherId
-     * @param string|null                                  $filter
-     * @param string|\Doctrine\ORM\Query\Expr\OrderBy|null $order
+     * @param int|null            $voucherId
+     * @param string|null         $filter
+     * @param string|OrderBy|null $order
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getVoucherCodeListQueryBuilder($voucherId = null, $filter = null, $order = null)
     {
@@ -83,7 +85,7 @@ public function getVoucherCodeListQueryBuilder($voucherId = null, $filter = null
             'customer.lastname as lastName',
             'customer.number as number',
         ]);
-        $builder->from(\Shopware\Models\Voucher\Code::class, 'codes')
+        $builder->from(Code::class, 'codes')
             ->leftJoin('codes.customer', 'customer')
             ->where('codes.voucherId = ?1')
             ->setParameter(1, $voucherId);
@@ -108,7 +110,7 @@ public function getVoucherCodeListQueryBuilder($voucherId = null, $filter = null
      *
      * @param int $voucherId
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Code>
      */
     public function getVoucherCodeCountQuery($voucherId)
     {
@@ -123,13 +125,13 @@ public function getVoucherCodeCountQuery($voucherId)
      *
      * @param int $voucherId
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getVoucherCodeCountQueryBuilder($voucherId)
     {
         $builder = $this->getEntityManager()->createQueryBuilder();
         $builder->select([$builder->expr()->count('code.id') . 'as countCode'])
-            ->from(\Shopware\Models\Voucher\Code::class, 'code')
+            ->from(Code::class, 'code')
             ->where('code.voucherId = ?1')
             ->setParameter(1, $voucherId);
 
@@ -141,13 +143,11 @@ public function getVoucherCodeCountQueryBuilder($voucherId)
      *
      * @param int $voucherId
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Code>
      */
     public function getVoucherCodeDeleteByVoucherIdQuery($voucherId)
     {
-        $builder = $this->getVoucherCodeDeleteByVoucherIdQueryBuilder($voucherId);
-
-        return $builder->getQuery();
+        return $this->getVoucherCodeDeleteByVoucherIdQueryBuilder($voucherId)->getQuery();
     }
 
     /**
@@ -156,12 +156,12 @@ public function getVoucherCodeDeleteByVoucherIdQuery($voucherId)
      *
      * @param int $voucherId
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getVoucherCodeDeleteByVoucherIdQueryBuilder($voucherId)
     {
         $builder = $this->getEntityManager()->createQueryBuilder();
-        $builder->delete(\Shopware\Models\Voucher\Code::class, 'code')
+        $builder->delete(Code::class, 'code')
             ->where('code.voucherId = ?1')
             ->setMaxResults(10000)
             ->setParameter(1, $voucherId);
@@ -175,7 +175,7 @@ public function getVoucherCodeDeleteByVoucherIdQueryBuilder($voucherId)
      *
      * @param int $voucherId
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Voucher>
      */
     public function getVoucherDetailQuery($voucherId)
     {
@@ -190,13 +190,13 @@ public function getVoucherDetailQuery($voucherId)
      *
      * @param int $voucherId
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getVoucherDetailQueryBuilder($voucherId)
     {
         $builder = $this->getEntityManager()->createQueryBuilder();
         $builder->select(['vouchers', 'attribute'])
-            ->from(\Shopware\Models\Voucher\Voucher::class, 'vouchers')
+            ->from(Voucher::class, 'vouchers')
             ->leftJoin('vouchers.attribute', 'attribute')
             ->where('vouchers.id = ?1')
             ->setParameter(1, $voucherId);
@@ -211,7 +211,7 @@ public function getVoucherDetailQueryBuilder($voucherId)
      * @param string $code
      * @param int    $voucherId
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Voucher>
      */
     public function getValidateVoucherCodeQuery($code, $voucherId = null)
     {
@@ -227,7 +227,7 @@ public function getValidateVoucherCodeQuery($code, $voucherId = null)
      * @param string $code
      * @param int    $voucherId
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getValidateVoucherCodeQueryBuilder($code, $voucherId = null)
     {
@@ -251,7 +251,7 @@ public function getValidateVoucherCodeQueryBuilder($code, $voucherId = null)
      * @param string $code
      * @param int    $voucherId
      *
-     * @return \Doctrine\ORM\Query
+     * @return Query<Voucher>
      */
     public function getValidateOrderCodeQuery($code, $voucherId = null)
     {
@@ -267,7 +267,7 @@ public function getValidateOrderCodeQuery($code, $voucherId = null)
      * @param string $code
      * @param int    $voucherId
      *
-     * @return \Doctrine\ORM\QueryBuilder
+     * @return QueryBuilder
      */
     public function getValidateOrderCodeQueryBuilder($code, $voucherId = null)
     {
diff --git a/engine/Shopware/Models/Voucher/Voucher.php b/engine/Shopware/Models/Voucher/Voucher.php
index e996733d4b9..e13530a72ed 100644
--- a/engine/Shopware/Models/Voucher/Voucher.php
+++ b/engine/Shopware/Models/Voucher/Voucher.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Voucher;
@@ -41,7 +41,7 @@ class Voucher extends ModelEntity
     /**
      * INVERSE SIDE
      *
-     * @var \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Voucher\Code>
+     * @var ArrayCollection<Code>
      *
      * @ORM\OneToMany(targetEntity="Shopware\Models\Voucher\Code", mappedBy="voucher", orphanRemoval=true, cascade={"persist"})
      */
@@ -652,7 +652,7 @@ public function getTaxConfig()
     }
 
     /**
-     * @return \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Voucher\Code>
+     * @return ArrayCollection<Code>
      */
     public function getCodes()
     {
@@ -660,7 +660,7 @@ public function getCodes()
     }
 
     /**
-     * @param \Doctrine\Common\Collections\ArrayCollection<\Shopware\Models\Voucher\Code>|array|null $codes
+     * @param ArrayCollection<Code>|array|null $codes
      *
      * @return Voucher
      */
diff --git a/engine/Shopware/Models/Widget/View.php b/engine/Shopware/Models/Widget/View.php
index 84da63ede99..1c551613b5b 100644
--- a/engine/Shopware/Models/Widget/View.php
+++ b/engine/Shopware/Models/Widget/View.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Widget;
diff --git a/engine/Shopware/Models/Widget/Widget.php b/engine/Shopware/Models/Widget/Widget.php
index 5482c28c8eb..705e883c8c8 100644
--- a/engine/Shopware/Models/Widget/Widget.php
+++ b/engine/Shopware/Models/Widget/Widget.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Models\Widget;
diff --git a/engine/Shopware/Plugins/Default/Backend/Auth/Bootstrap.php b/engine/Shopware/Plugins/Default/Backend/Auth/Bootstrap.php
index 02c1988b2a7..d321756bb4a 100644
--- a/engine/Shopware/Plugins/Default/Backend/Auth/Bootstrap.php
+++ b/engine/Shopware/Plugins/Default/Backend/Auth/Bootstrap.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\DependencyInjection\Bridge\Db;
@@ -149,6 +149,8 @@ public function isAllowed($params)
      * Set local no auth property
      *
      * @param bool $flag
+     *
+     * @return void
      */
     public function setNoAuth($flag = true)
     {
@@ -159,6 +161,8 @@ public function setNoAuth($flag = true)
      * Set local no acl property
      *
      * @param bool $flag
+     *
+     * @return void
      */
     public function setNoAcl($flag = true)
     {
@@ -188,13 +192,17 @@ public function shouldUseAcl()
     /**
      * This pre-dispatch event-hook checks backend permissions
      *
+     * @param Enlight_Controller_ActionEventArgs $args
+     *
      * @throws Enlight_Controller_Exception
+     *
+     * @return void
      */
     public function onPreDispatchBackend(Enlight_Event_EventArgs $args)
     {
         $this->action = $args->getSubject();
         $this->request = $this->action->Request();
-        $this->aclResource = strtolower($this->request->getControllerName());
+        $this->aclResource = strtolower(str_replace('_', '', $this->request->getControllerName()));
 
         if ($this->aclResource === 'error' || $this->request->getModuleName() !== 'backend') {
             return;
@@ -248,7 +256,7 @@ public function checkAuth()
             }
 
             if (!$this->isAllowed($test)) {
-                throw new Enlight_Controller_Exception($test['errorMessage'] ?: 'Permission denied', 401);
+                throw new Enlight_Controller_Exception($test['errorMessage'] ?? 'Permission denied', 401);
             }
 
             return $auth;
@@ -264,6 +272,8 @@ public function checkAuth()
      *
      * @throws Exception
      * @throws SmartyException
+     *
+     * @return void
      */
     public function registerAclPlugin($auth)
     {
@@ -401,10 +411,10 @@ public function onInitResourceBackendSession(Enlight_Event_EventArgs $args)
      * database adapter by default
      *
      * @throws SmartyException
-     * @throws \Enlight_Exception
+     * @throws Enlight_Exception
      * @throws Exception
      *
-     * @return \Zend_Auth
+     * @return Zend_Auth
      */
     public function onInitResourceAuth(Enlight_Event_EventArgs $args)
     {
@@ -436,6 +446,8 @@ public function getCapabilities()
      * Init backend locales
      *
      * @throws Exception
+     *
+     * @return void
      */
     protected function initLocale()
     {
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Bootstrap.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Bootstrap.php
index e1dca85559f..9793a04b19a 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Bootstrap.php
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Bootstrap.php
@@ -1,31 +1,27 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-use Shopware\Components\OpenSSLVerifier;
-use Shopware\Models\Config\Form;
-use ShopwarePlugins\SwagUpdate\Components\UpdateCheck;
-
 class Shopware_Plugins_Backend_SwagUpdate_Bootstrap extends Shopware_Components_Plugin_Bootstrap
 {
     public function getVersion()
@@ -50,13 +46,6 @@ public function install()
             'onGetSwagUpdateControllerPath'
         );
 
-        $this->subscribeEvent(
-            'Enlight_Bootstrap_InitResource_SwagUpdateUpdateCheck',
-            'onInitUpdateCheck'
-        );
-
-        $this->installForm($this->Form());
-
         $this->createMenuItem([
             'label' => 'SwagUpdate',
             'controller' => 'SwagUpdate',
@@ -85,6 +74,8 @@ public function afterInit()
     /**
      * When index backend module was loaded, add our snippet- and template-directory
      * Also extend the template
+     *
+     * @return void
      */
     public function onBackendIndexPostDispatch(Enlight_Controller_ActionEventArgs $args)
     {
@@ -114,91 +105,4 @@ public function onGetSwagUpdateControllerPath(Enlight_Event_EventArgs $args)
 
         return __DIR__ . '/Controllers/Backend/SwagUpdate.php';
     }
-
-    /**
-     * Returns an instance of the UpdateCheck component
-     */
-    public function onInitUpdateCheck()
-    {
-        return new UpdateCheck(
-            $this->Config()->get('update-api-endpoint'),
-            $this->Config()->get('update-channel'),
-            $this->Config()->get('update-verify-signature'),
-            Shopware()->Container()->get(OpenSSLVerifier::class),
-            Shopware()->Container()->get('shopware.release')
-        );
-    }
-
-    protected function installForm(Form $form)
-    {
-        $form->setElement(
-            'select',
-            'update-channel',
-            [
-                'label' => 'Channel',
-                'value' => 'stable',
-                'store' => [
-                    ['stable', 'stable'],
-                    ['beta',   'beta'],
-                    ['rc',     'rc'],
-                    ['dev',    'dev'],
-                ],
-            ]
-        );
-
-        $form->setElement('text', 'update-api-endpoint', [
-            'label' => 'API Endpoint',
-            'required' => true,
-            'value' => 'http://update-api.shopware.com/v1/',
-            'hidden' => true,
-        ]);
-
-        $form->setElement('text', 'update-fake-version', [
-            'label' => 'Fake Version',
-            'hidden' => true,
-        ]);
-
-        $form->setElement('text', 'update-code', [
-            'label' => 'Code',
-            'value' => '',
-        ]);
-
-        $form->setElement('boolean', 'update-verify-signature', [
-            'label' => 'Verify Signature',
-            'hidden' => true,
-            'value' => true,
-        ]);
-
-        $form->setElement('text', 'update-feedback-api-endpoint', [
-            'label' => 'Feedback API Endpoint',
-            'required' => true,
-            'value' => 'http://feedback.update-api.shopware.com/v1/',
-            'hidden' => true,
-        ]);
-
-        $form->setElement('boolean', 'update-send-feedback', [
-            'label' => 'Send feedback',
-            'value' => true,
-        ]);
-
-        $form->setElement('text', 'update-unique-id', [
-            'label' => 'Unique identifier',
-            'value' => '', // value will be populated on first access
-            'hidden' => true,
-        ]);
-
-        $this->addFormTranslations(
-            ['de_DE' => [
-                'update-code' => [
-                    'label' => 'Aktionscode',
-                ],
-                'update-send-feedback' => [
-                    'label' => 'Feedback senden',
-                ],
-                'update-channel' => [
-                    'label' => 'Update Kanal',
-                ],
-            ]]
-        );
-    }
 }
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Archive/Adapter.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Archive/Adapter.php
index f7c52336c00..8c7e637f0d8 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Archive/Adapter.php
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Archive/Adapter.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace ShopwarePlugins\SwagUpdate\Components\Archive;
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Archive/Entry/Zip.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Archive/Entry/Zip.php
index ab57005becc..8282addb397 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Archive/Entry/Zip.php
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Archive/Entry/Zip.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace ShopwarePlugins\SwagUpdate\Components\Archive\Entry;
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Archive/Zip.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Archive/Zip.php
index a0dd4dd9e5b..c1cd4464726 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Archive/Zip.php
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Archive/Zip.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace ShopwarePlugins\SwagUpdate\Components\Archive;
@@ -111,25 +111,25 @@ protected function getErrorMessage($retval, $file)
     {
         switch ($retval) {
             case ZipArchive::ER_EXISTS:
-                return sprintf("File '%s' already exists.", $file);
+                return \sprintf("File '%s' already exists.", $file);
             case ZipArchive::ER_INCONS:
-                return sprintf("Zip archive '%s' is inconsistent.", $file);
+                return \sprintf("Zip archive '%s' is inconsistent.", $file);
             case ZipArchive::ER_INVAL:
-                return sprintf('Invalid argument (%s)', $file);
+                return \sprintf('Invalid argument (%s)', $file);
             case ZipArchive::ER_MEMORY:
-                return sprintf('Malloc failure (%s)', $file);
+                return \sprintf('Malloc failure (%s)', $file);
             case ZipArchive::ER_NOENT:
-                return sprintf("No such zip file: '%s'", $file);
+                return \sprintf("No such zip file: '%s'", $file);
             case ZipArchive::ER_NOZIP:
-                return sprintf("'%s' is not a zip archive.", $file);
+                return \sprintf("'%s' is not a zip archive.", $file);
             case ZipArchive::ER_OPEN:
-                return sprintf("Can't open zip file: %s", $file);
+                return \sprintf("Can't open zip file: %s", $file);
             case ZipArchive::ER_READ:
-                return sprintf('Zip read error (%s)', $file);
+                return \sprintf('Zip read error (%s)', $file);
             case ZipArchive::ER_SEEK:
-                return sprintf('Zip seek error (%s)', $file);
+                return \sprintf('Zip seek error (%s)', $file);
             default:
-                return sprintf("'%s' is not a valid zip archive, got error code: %s", $file, $retval);
+                return \sprintf("'%s' is not a valid zip archive, got error code: %s", $file, $retval);
         }
     }
 }
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/CheckInterface.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/CheckInterface.php
index d06f737a0c2..9591608b8e4 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/CheckInterface.php
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/CheckInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace ShopwarePlugins\SwagUpdate\Components;
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/EmotionTemplateCheck.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/EmotionTemplateCheck.php
index ab81843c0dc..a1444cea55a 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/EmotionTemplateCheck.php
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/EmotionTemplateCheck.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace ShopwarePlugins\SwagUpdate\Components\Checks;
@@ -78,7 +78,7 @@ public function check($requirement)
         return [
             'type' => self::CHECK_TYPE,
             'errorLevel' => $requirement['level'],
-            'message' => sprintf(
+            'message' => \sprintf(
                 $this->namespace->get('check_emotiontemplate_failure'),
                 implode(',', $names)
             ),
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/LicenseCheck.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/LicenseCheck.php
index 2279f2944a1..f0a52c44e7e 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/LicenseCheck.php
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/LicenseCheck.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace ShopwarePlugins\SwagUpdate\Components\Checks;
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/MySQLVersionCheck.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/MySQLVersionCheck.php
index 5429848b3e8..758644873a5 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/MySQLVersionCheck.php
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/MySQLVersionCheck.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace ShopwarePlugins\SwagUpdate\Components\Checks;
@@ -75,7 +75,7 @@ public function check($requirement)
             return [
                 'type' => self::CHECK_TYPE,
                 'errorLevel' => Validation::REQUIREMENT_VALID,
-                'message' => sprintf(
+                'message' => \sprintf(
                     $successMessage,
                     $minMySQLVersion,
                     $version
@@ -84,13 +84,13 @@ public function check($requirement)
         }
 
         return [
-                'type' => self::CHECK_TYPE,
-                'errorLevel' => $requirement['level'],
-                'message' => sprintf(
-                    $failMessage,
-                    $minMySQLVersion,
-                    $version
-                ),
-            ];
+            'type' => self::CHECK_TYPE,
+            'errorLevel' => $requirement['level'],
+            'message' => \sprintf(
+                $failMessage,
+                $minMySQLVersion,
+                $version
+            ),
+        ];
     }
 }
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/PHPExtensionCheck.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/PHPExtensionCheck.php
index d2546133257..d18f69adf23 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/PHPExtensionCheck.php
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/PHPExtensionCheck.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace ShopwarePlugins\SwagUpdate\Components\Checks;
@@ -69,7 +69,7 @@ public function check($requirement)
             return [
                 'type' => self::CHECK_TYPE,
                 'errorLevel' => Validation::REQUIREMENT_VALID,
-                'message' => sprintf(
+                'message' => \sprintf(
                     $successMessage,
                     $requiredExtension
                 ),
@@ -77,12 +77,12 @@ public function check($requirement)
         }
 
         return [
-                'type' => self::CHECK_TYPE,
-                'errorLevel' => $requirement['level'],
-                'message' => sprintf(
-                    $failMessage,
-                    $requiredExtension
-                ),
-            ];
+            'type' => self::CHECK_TYPE,
+            'errorLevel' => $requirement['level'],
+            'message' => \sprintf(
+                $failMessage,
+                $requiredExtension
+            ),
+        ];
     }
 }
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/PHPVersionCheck.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/PHPVersionCheck.php
index ea0c24cb406..17287002d25 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/PHPVersionCheck.php
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/PHPVersionCheck.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace ShopwarePlugins\SwagUpdate\Components\Checks;
@@ -71,7 +71,7 @@ public function check($requirement)
             return [
                 'type' => self::CHECK_TYPE,
                 'errorLevel' => Validation::REQUIREMENT_VALID,
-                'message' => sprintf(
+                'message' => \sprintf(
                     $successMessage,
                     $minPHPVersion,
                     PHP_VERSION
@@ -80,13 +80,13 @@ public function check($requirement)
         }
 
         return [
-                'type' => self::CHECK_TYPE,
-                'errorLevel' => $requirement['level'],
-                'message' => sprintf(
-                    $failMessage,
-                    $minPHPVersion,
-                    PHP_VERSION
-                ),
-            ];
+            'type' => self::CHECK_TYPE,
+            'errorLevel' => $requirement['level'],
+            'message' => \sprintf(
+                $failMessage,
+                $minPHPVersion,
+                PHP_VERSION
+            ),
+        ];
     }
 }
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/RegexCheck.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/RegexCheck.php
index 58f6af772c5..2c01cebbced 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/RegexCheck.php
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/RegexCheck.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace ShopwarePlugins\SwagUpdate\Components\Checks;
@@ -83,10 +83,10 @@ public function check($requirement)
         $files = array_keys($results);
 
         return [
-                'type' => self::CHECK_TYPE,
-                'errorLevel' => $requirement['level'],
-                'message' => sprintf($message, implode('<br>', $files)),
-            ];
+            'type' => self::CHECK_TYPE,
+            'errorLevel' => $requirement['level'],
+            'message' => \sprintf($message, implode('<br>', $files)),
+        ];
     }
 
     /**
@@ -119,7 +119,7 @@ private function scanDirectoryForRegex($path, $regex, $regexFile = null)
             }
 
             $realPath = $splFileInfo->getRealPath();
-            if (strpos($realPath, 'SwagUpdateCheck') !== false) {
+            if (str_contains($realPath, 'SwagUpdateCheck')) {
                 continue;
             }
 
@@ -144,7 +144,7 @@ private function searchFileForRegex($file, $regex)
     {
         $content = file_get_contents($file);
         if (preg_match_all($regex, $content, $matches)) {
-            return $matches;
+            return true;
         }
 
         return false;
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/WritableCheck.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/WritableCheck.php
index c3ad42bed2b..759027385e7 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/WritableCheck.php
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Checks/WritableCheck.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace ShopwarePlugins\SwagUpdate\Components\Checks;
@@ -88,7 +88,7 @@ public function check($requirement)
             return [
                 'type' => self::CHECK_TYPE,
                 'errorLevel' => Validation::REQUIREMENT_VALID,
-                'message' => sprintf(
+                'message' => \sprintf(
                     $successMessage,
                     implode('<br>', $checkedDirectories)
                 ),
@@ -96,12 +96,12 @@ public function check($requirement)
         }
 
         return [
-                'type' => self::CHECK_TYPE,
-                'errorLevel' => $requirement['level'],
-                'message' => sprintf(
-                    $failMessage,
-                    implode('<br>', $directories)
-                ),
-            ];
+            'type' => self::CHECK_TYPE,
+            'errorLevel' => $requirement['level'],
+            'message' => \sprintf(
+                $failMessage,
+                implode('<br>', $directories)
+            ),
+        ];
     }
 }
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Download.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Download.php
index 089c6bcac3b..81c511013f8 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Download.php
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Download.php
@@ -1,30 +1,31 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace ShopwarePlugins\SwagUpdate\Components;
 
 use Exception;
+use RuntimeException;
 use SplFileObject;
 
 class Download
@@ -91,12 +92,17 @@ public function shouldHalt()
      */
     public function downloadFile($sourceUri, $destinationUri, $totalSize, $hash)
     {
-        if (($destination = fopen($destinationUri, 'a+')) === false) {
-            throw new Exception(sprintf('Destination "%s" is invalid.', $destinationUri));
+        if (!\is_string($sourceUri) || $sourceUri === '') {
+            throw new RuntimeException('Invalid sourceUri given');
+        }
+
+        $destination = fopen($destinationUri, 'a+');
+        if (!\is_resource($destination)) {
+            throw new Exception(\sprintf('Destination "%s" is invalid.', $destinationUri));
         }
 
         if (filesize($destinationUri) > 0) {
-            throw new Exception(sprintf('File on destination %s does already exist.', $destinationUri));
+            throw new Exception(\sprintf('File on destination %s does already exist.', $destinationUri));
         }
 
         $partFile = $destinationUri . '.part';
@@ -163,12 +169,8 @@ public function downloadFile($sourceUri, $destinationUri, $totalSize, $hash)
         $error = curl_error($ch);
         curl_close($ch);
 
-        if ($isError && !$isHalted) {
-            throw new Exception('Wrong http code');
-        }
-
-        if ($result === false && !$isHalted) {
-            throw new Exception($error);
+        if (($result === false || $isError) && !$isHalted) {
+            throw new Exception($error ?: 'Unknown error');
         }
 
         clearstatcache(false, $partFile->getPathname());
@@ -179,16 +181,12 @@ public function downloadFile($sourceUri, $destinationUri, $totalSize, $hash)
             // close local file connections before move for windows
             $partFilePath = $partFile->getPathname();
 
-            if (\is_resource($destination)) {
-                fclose($destination);
-            }
+            fclose($destination);
 
             unset($partFile);
             $this->moveFile($partFilePath, $destinationUri);
-        }
-
-        // close local file
-        if (\is_resource($destination)) {
+        } else {
+            // close local file
             fclose($destination);
         }
 
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Exception/ApiLimitExceededException.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Exception/ApiLimitExceededException.php
new file mode 100644
index 00000000000..53e737e4551
--- /dev/null
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Exception/ApiLimitExceededException.php
@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace ShopwarePlugins\SwagUpdate\Components\Exception;
+
+use Exception;
+
+class ApiLimitExceededException extends Exception
+{
+    /**
+     * @var string
+     */
+    protected $message = 'ApiLimit';
+}
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/ExtensionMissingException.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Exception/ExtensionMissingException.php
similarity index 51%
rename from engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/ExtensionMissingException.php
rename to engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Exception/ExtensionMissingException.php
index 241e1080681..a46325a590b 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/ExtensionMissingException.php
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Exception/ExtensionMissingException.php
@@ -1,28 +1,28 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace ShopwarePlugins\SwagUpdate\Components;
+namespace ShopwarePlugins\SwagUpdate\Components\Exception;
 
 use RuntimeException;
 
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Exception/ReleasePackageNotFoundException.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Exception/ReleasePackageNotFoundException.php
new file mode 100644
index 00000000000..61442940e03
--- /dev/null
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Exception/ReleasePackageNotFoundException.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace ShopwarePlugins\SwagUpdate\Components\Exception;
+
+use Exception;
+
+class ReleasePackageNotFoundException extends Exception
+{
+}
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Exception/UpdatePackageNotFoundException.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Exception/UpdatePackageNotFoundException.php
new file mode 100644
index 00000000000..a7900a8abe7
--- /dev/null
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Exception/UpdatePackageNotFoundException.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace ShopwarePlugins\SwagUpdate\Components\Exception;
+
+use Exception;
+
+class UpdatePackageNotFoundException extends Exception
+{
+}
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/ExtJsResultMapper.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/ExtJsResultMapper.php
index 155bc8b8b57..5625d42e84e 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/ExtJsResultMapper.php
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/ExtJsResultMapper.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace ShopwarePlugins\SwagUpdate\Components;
@@ -36,7 +36,7 @@ class ExtJsResultMapper
      *
      * @throws Exception
      *
-     * @return array
+     * @return array<string, bool|int|string>
      */
     public function toExtJs($result)
     {
@@ -65,6 +65,6 @@ public function toExtJs($result)
             ];
         }
 
-        throw new Exception(sprintf('Result type %s can not be mapped.', \get_class($result)));
+        throw new Exception(\sprintf('Result type %s can not be mapped.', \get_class($result)));
     }
 }
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/FeedbackCollector.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/FeedbackCollector.php
deleted file mode 100644
index 445d1efefbf..00000000000
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/FeedbackCollector.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace ShopwarePlugins\SwagUpdate\Components;
-
-use Shopware\Components\ShopwareReleaseStruct;
-use Zend_Http_Client;
-use Zend_Http_Response;
-
-class FeedbackCollector
-{
-    /**
-     * @var string
-     */
-    private $apiEndpoint;
-
-    /**
-     * @var string
-     */
-    private $uniqueId;
-
-    /**
-     * @var ShopwareReleaseStruct
-     */
-    private $release;
-
-    /**
-     * @param string $apiEndpoint
-     * @param string $uniqueId
-     */
-    public function __construct($apiEndpoint, $uniqueId, ShopwareReleaseStruct $release)
-    {
-        $this->apiEndpoint = rtrim($apiEndpoint, '/');
-        $this->uniqueId = $uniqueId;
-        $this->release = $release;
-    }
-
-    /**
-     * @return Zend_Http_Response
-     */
-    public function sendData()
-    {
-        $data = $this->gatherData();
-
-        return $this->submitData($data);
-    }
-
-    /**
-     * @return Zend_Http_Response
-     */
-    private function submitData(array $data)
-    {
-        $dataString = json_encode($data);
-
-        $apiUrl = $this->apiEndpoint . '/submission';
-
-        $client = new Zend_Http_Client($apiUrl, [
-            'timeout' => 1,
-            'useragent' => 'Shopware/' . $this->release->getVersion(),
-        ]);
-
-        $response = $client->setRawData($dataString)->setEncType('application/json')->request('POST');
-
-        return $response;
-    }
-
-    /**
-     * @return array
-     */
-    private function gatherData()
-    {
-        $db = Shopware()->Models()->getConnection();
-        $serverSoftware = isset($_SERVER['SERVER_SOFTWARE']) ? $_SERVER['SERVER_SOFTWARE'] : null;
-
-        // Get languages of all active shops, sort by default shop first
-        $shopLanguages = $db->fetchAll(
-            'SELECT s_core_locales.locale as locale
-            FROM s_core_shops
-            LEFT JOIN s_core_locales ON s_core_locales.id = s_core_shops.locale_id
-            WHERE s_core_shops.active = 1
-            ORDER BY s_core_shops.default DESC;'
-        );
-        $mainLanguage = array_shift($shopLanguages);
-        array_walk($shopLanguages, function (&$item) {
-            $item = $item['locale'];
-        });
-
-        $data = [
-            'unique' => $this->uniqueId,
-            'data' => [
-                'phpversion' => PHP_VERSION,
-                'phpversion_id' => PHP_VERSION_ID,
-                'os' => PHP_OS,
-                'arch' => php_uname('m'),
-                'dist' => php_uname('r'),
-                'sapi' => PHP_SAPI,
-                'shopware_version' => $this->release->getVersion(),
-                'shopware_version_text' => $this->release->getVersionText(),
-                'shopware_version_revision' => $this->release->getRevision(),
-                'max_execution_time' => ini_get('max_execution_time'),
-                'memory_limit' => ini_get('memory_limit'),
-                'serverSoftware' => $serverSoftware,
-                'mysql_version' => $db->fetchColumn('SELECT VERSION()'),
-                'extension' => get_loaded_extensions(),
-                'main_language' => $mainLanguage['locale'],
-                'sub_languages' => $shopLanguages,
-            ],
-        ];
-
-        return $data;
-    }
-}
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/FileSystem.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/FileSystem.php
index 6cda19a596c..addbe8de5f4 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/FileSystem.php
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/FileSystem.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace ShopwarePlugins\SwagUpdate\Components;
@@ -123,7 +123,7 @@ public function checkDirectoryPermissions($directory, $fixPermission = false)
     private function fixDirectoryPermission(SplFileInfo $fileInfo)
     {
         try {
-            $permission = substr(sprintf('%o', $fileInfo->getPerms()), -4);
+            $permission = substr(\sprintf('%o', $fileInfo->getPerms()), -4);
         } catch (Exception $e) {
             // cannot get permissions...
             return;
@@ -144,7 +144,7 @@ private function fixDirectoryPermission(SplFileInfo $fileInfo)
     private function fixFilePermission(SplFileInfo $fileInfo)
     {
         try {
-            $permission = substr(sprintf('%o', $fileInfo->getPerms()), -4);
+            $permission = substr(\sprintf('%o', $fileInfo->getPerms()), -4);
         } catch (Exception $e) {
             // cannot get permissions...
             return;
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/PluginCheck.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/PluginCheck.php
index 844730c1301..d7df001a256 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/PluginCheck.php
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/PluginCheck.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace ShopwarePlugins\SwagUpdate\Components;
@@ -82,7 +82,7 @@ public function checkInstalledPluginsAvailableForNewVersion($version)
                     'message' => $description,
                     'updatable' => $inStore && version_compare($plugin['version'], $storePlugins[$key]->getVersion(), '<'),
                     'updatableAfterUpgrade' => $inStore && $targetVersionUpdateAvailable && $storePlugins[$key]->getVersion() !== $updatesAvailable[$key]->getVersion(),
-                    'id' => sprintf('plugin_incompatible-%s', $name),
+                    'id' => \sprintf('plugin_incompatible-%s', $name),
                     'technicalName' => $technicalName,
                     'errorLevel' => $targetVersionUpdateAvailable ? Validation::REQUIREMENT_VALID : Validation::REQUIREMENT_WARNING,
                     'success' => true,
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/DownloadStep.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/DownloadStep.php
index 6f604b75821..fdad1b56875 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/DownloadStep.php
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/DownloadStep.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace ShopwarePlugins\SwagUpdate\Components\Steps;
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/ErrorResult.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/ErrorResult.php
index ac7adfebba3..6d710543b6d 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/ErrorResult.php
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/ErrorResult.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace ShopwarePlugins\SwagUpdate\Components\Steps;
@@ -44,11 +44,10 @@ class ErrorResult
     private $args;
 
     /**
-     * @param string    $message
-     * @param Exception $exception
-     * @param array     $args
+     * @param string $message
+     * @param array  $args
      */
-    public function __construct($message, Exception $exception = null, $args = [])
+    public function __construct($message, ?Exception $exception = null, $args = [])
     {
         $this->message = $message;
         $this->exception = $exception;
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/FinishResult.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/FinishResult.php
index 9c5560a1bcc..7dec2fb07c6 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/FinishResult.php
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/FinishResult.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace ShopwarePlugins\SwagUpdate\Components\Steps;
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/UnpackStep.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/UnpackStep.php
index 18b4fec53cc..4792aaa4e37 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/UnpackStep.php
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/UnpackStep.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace ShopwarePlugins\SwagUpdate\Components\Steps;
@@ -71,7 +71,7 @@ public function run($offset)
             $source->seek($offset);
         } catch (Exception $e) {
             @unlink($this->source);
-            throw new Exception(sprintf('Could not open update package:<br>%s', $e->getMessage()), 0, $e);
+            throw new Exception(\sprintf('Could not open update package:<br>%s', $e->getMessage()), 0, $e);
         }
 
         /** @var ZipEntry $entry */
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/ValidResult.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/ValidResult.php
index a42f5520c19..47258304415 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/ValidResult.php
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Steps/ValidResult.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace ShopwarePlugins\SwagUpdate\Components\Steps;
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Struct/Struct.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Struct/Struct.php
index a7cb5e43d59..cdb0eecf515 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Struct/Struct.php
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Struct/Struct.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace ShopwarePlugins\SwagUpdate\Components\Struct;
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Struct/Version.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Struct/Version.php
index 850c5b17b7b..55c651d7c63 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Struct/Version.php
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Struct/Version.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace ShopwarePlugins\SwagUpdate\Components\Struct;
@@ -75,9 +75,4 @@ class Version extends Struct
      * @var string
      */
     public $sha256;
-
-    /**
-     * @var bool
-     */
-    public $signature_verified;
 }
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/UpdateCheck.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/UpdateCheck.php
index e9718cbb192..1c670abec2e 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/UpdateCheck.php
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/UpdateCheck.php
@@ -1,148 +1,166 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace ShopwarePlugins\SwagUpdate\Components;
 
-use Exception;
-use Shopware\Components\OpenSSLVerifier;
-use Shopware\Components\ShopwareReleaseStruct;
+use ShopwarePlugins\SwagUpdate\Components\Exception\ApiLimitExceededException;
+use ShopwarePlugins\SwagUpdate\Components\Exception\ReleasePackageNotFoundException;
+use ShopwarePlugins\SwagUpdate\Components\Exception\UpdatePackageNotFoundException;
 use ShopwarePlugins\SwagUpdate\Components\Struct\Version;
+use Symfony\Component\HttpFoundation\Response;
 use Zend_Http_Client;
-use Zend_Http_Client_Exception;
 use Zend_Json;
+use Zend_Json_Exception;
 
 class UpdateCheck
 {
-    /**
-     * @var string
-     */
-    private $apiEndpoint;
+    public const SECURITY_IDENTIFIER = '[SECURITY_RELEASE]';
 
-    /**
-     * @var string
-     */
-    private $channel;
+    private Zend_Http_Client $client;
 
-    /**
-     * @var bool
-     */
-    private $verifySignature;
-
-    /**
-     * @var OpenSSLVerifier
-     */
-    private $verificator;
-
-    /**
-     * @var ShopwareReleaseStruct
-     */
-    private $release;
+    private bool $preRelease;
 
-    /**
-     * @param string $apiEndpoint
-     * @param string $channel
-     * @param bool   $verifySignature
-     */
-    public function __construct($apiEndpoint, $channel, $verifySignature, OpenSSLVerifier $verificator, ShopwareReleaseStruct $release)
-    {
-        $this->apiEndpoint = rtrim($apiEndpoint, '/');
-        $this->channel = $channel;
-        $this->verifySignature = $verifySignature;
-        $this->verificator = $verificator;
-        $this->release = $release;
-    }
-
-    /**
-     * @param bool $verify
-     */
-    public function setVerifyResponseSignature($verify = true)
+    public function __construct(Zend_Http_Client $client, bool $preRelease)
     {
-        $this->verifySignature = $verify;
+        $this->client = $client;
+        $this->preRelease = $preRelease;
     }
 
     /**
-     * @param string $shopwareVersion
+     * @deprecated Additional Parameter `$params` will be removed with Shopware 5.8, as it is not used anymore
+     *
+     * @param string               $shopwareVersion
+     * @param array<string, mixed> $params
      *
      * @return Version|null
      */
     public function checkUpdate($shopwareVersion, array $params = [])
     {
-        $url = $this->apiEndpoint . '/release/update';
+        if ($shopwareVersion === '___VERSION___') {
+            return null;
+        }
 
-        $client = new Zend_Http_Client($url, [
-            'timeout' => 5,
-            'useragent' => 'Shopware/' . $this->release->getVersion(),
-        ]);
+        $response = $this->client->request();
 
-        $client->setParameterGet('shopware_version', $shopwareVersion);
-        $client->setParameterGet('channel', $this->channel);
-        $client->setParameterGet($params);
+        if ($response->getStatus() === Response::HTTP_FORBIDDEN) {
+            throw new ApiLimitExceededException();
+        }
 
-        try {
-            $response = $client->request();
-        } catch (Zend_Http_Client_Exception $e) {
-            // Do not show exception to user if request times out
+        if ($response->getStatus() === Response::HTTP_NOT_FOUND) {
             return null;
         }
 
         $body = $response->getBody();
 
-        $verified = false;
-        if ($this->verifySignature) {
-            $signature = $response->getHeader('X-Shopware-Signature');
-            $this->verifyBody($signature, $body);
-            $verified = true;
+        if (!\is_string($body)) {
+            return null;
         }
 
-        if ($body != '') {
-            $json = Zend_Json::decode($body, true);
-        } else {
-            $json = null;
+        if ($body === '') {
+            return null;
         }
-        $json['signagure_verified'] = $verified;
 
-        if ($response->getStatus() == '404') {
+        try {
+            $json = Zend_Json::decode($body);
+        } catch (Zend_Json_Exception $e) {
             return null;
         }
 
-        return new Version($json);
+        try {
+            return $this->createVersionFromGithubResponse($shopwareVersion, $json);
+        } catch (ReleasePackageNotFoundException|UpdatePackageNotFoundException $exception) {
+            return null;
+        }
     }
 
     /**
-     * @param string $signature
-     * @param string $body
+     * @param array<string, mixed> $releaseInformation
      *
-     * @throws Exception
+     * @throws UpdatePackageNotFoundException
+     * @throws ReleasePackageNotFoundException
      */
-    private function verifyBody($signature, $body)
+    private function createVersionFromGithubResponse(string $shopwareVersion, array $releaseInformation): Version
     {
-        if (!$this->verificator->isSystemSupported()) {
-            throw new ExtensionMissingException('openssl');
+        $latestRelease = $this->getRelease($shopwareVersion, $releaseInformation);
+
+        $installPackage = $this->getUpdatePackage($latestRelease['assets']);
+
+        $parts = explode('_', $installPackage['name']);
+        $sha1 = array_pop($parts);
+
+        return new Version([
+            'version' => $latestRelease['tag_name'],
+            'release_date' => $latestRelease['created_at'],
+            'size' => $installPackage['size'],
+            'uri' => $installPackage['browser_download_url'],
+            'changelog' => $latestRelease['html_url'],
+            'isNewer' => true,
+            'security_update' => str_contains(self::SECURITY_IDENTIFIER, $latestRelease['body']),
+            'sha1' => str_replace('.zip', '', $sha1),
+        ]);
+    }
+
+    /**
+     * @param array<string, mixed> $releaseInformation
+     *
+     * @throws ReleasePackageNotFoundException
+     *
+     * @return array<string, mixed>
+     */
+    private function getRelease(string $shopwareVersion, array $releaseInformation): array
+    {
+        foreach ($releaseInformation as $release) {
+            $release['tag_name'] = ltrim($release['tag_name'], 'v');
+            if (version_compare($shopwareVersion, $release['tag_name'], '>=')) {
+                continue;
+            }
+
+            if ((bool) $release['prerelease'] !== $this->preRelease) {
+                continue;
+            }
+
+            return $release;
         }
 
-        if (!$this->verificator->isValid($body, $signature)) {
-            throw new Exception('Signature is not valid. Try downloading again');
+        throw new ReleasePackageNotFoundException();
+    }
+
+    /**
+     * @param array<string, mixed> $assets
+     *
+     * @throws UpdatePackageNotFoundException
+     *
+     * @return array<string, mixed>
+     */
+    private function getUpdatePackage(array $assets): array
+    {
+        foreach ($assets as $asset) {
+            if (str_contains($asset['name'], 'update_')) {
+                return $asset;
+            }
         }
+
+        throw new UpdatePackageNotFoundException();
     }
 }
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Validation.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Validation.php
index 7ee44ee2f1a..ec2f93a9217 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Validation.php
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Validation.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace ShopwarePlugins\SwagUpdate\Components;
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Controllers/Backend/SwagUpdate.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Controllers/Backend/SwagUpdate.php
index 2bce174f843..2b20072f078 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Controllers/Backend/SwagUpdate.php
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Controllers/Backend/SwagUpdate.php
@@ -1,29 +1,28 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\DBAL\Connection;
-use Shopware\Bundle\PluginInstallerBundle\Service\UniqueIdGenerator\UniqueIdGenerator;
 use Shopware\Components\CSRFWhitelistAware;
 use ShopwarePlugins\SwagUpdate\Components\Checks\EmotionTemplateCheck;
 use ShopwarePlugins\SwagUpdate\Components\Checks\LicenseCheck;
@@ -32,9 +31,8 @@
 use ShopwarePlugins\SwagUpdate\Components\Checks\PHPVersionCheck;
 use ShopwarePlugins\SwagUpdate\Components\Checks\RegexCheck;
 use ShopwarePlugins\SwagUpdate\Components\Checks\WritableCheck;
-use ShopwarePlugins\SwagUpdate\Components\ExtensionMissingException;
+use ShopwarePlugins\SwagUpdate\Components\Exception\ExtensionMissingException;
 use ShopwarePlugins\SwagUpdate\Components\ExtJsResultMapper;
-use ShopwarePlugins\SwagUpdate\Components\FeedbackCollector;
 use ShopwarePlugins\SwagUpdate\Components\FileSystem as SwagUpdateFileSystem;
 use ShopwarePlugins\SwagUpdate\Components\PluginCheck;
 use ShopwarePlugins\SwagUpdate\Components\Steps\DownloadStep;
@@ -53,6 +51,9 @@ class Shopware_Controllers_Backend_SwagUpdate extends Shopware_Controllers_Backe
      */
     public const CACHE_KEY = 'swag_update_response';
 
+    /**
+     * @return void
+     */
     public function changelogAction()
     {
         try {
@@ -79,29 +80,20 @@ public function changelogAction()
             return;
         }
 
-        $user = Shopware()->Container()->get('auth')->getIdentity();
-        $userLang = $this->getUserLanguage($user);
-        $languagePriorities = [
-            $userLang,
-            'en',
-            'de',
-        ];
-
         $assignedData = [
             'version' => $data->version,
+            'changelog' => $data->changelog,
         ];
 
-        $changeLog = $this->getLocalizedChangeLog($data, $languagePriorities);
-        if ($changeLog !== null) {
-            $assignedData['changelog'] = $changeLog['changelog'];
-        }
-
         $this->View()->assign([
             'success' => true,
             'data' => $assignedData,
         ]);
     }
 
+    /**
+     * @return void
+     */
     public function requirementsAction()
     {
         $data = $this->getCachedVersion();
@@ -140,9 +132,20 @@ public function requirementsAction()
         ]);
     }
 
+    /**
+     * @return void
+     */
     public function pluginsAction()
     {
         $data = $this->getCachedVersion();
+        if (!$data instanceof Version) {
+            $this->View()->assign([
+                'success' => false,
+                'data' => [],
+            ]);
+
+            return;
+        }
 
         $version = $data->version;
 
@@ -155,6 +158,9 @@ public function pluginsAction()
         ]);
     }
 
+    /**
+     * @return void
+     */
     public function isUpdateAllowedAction()
     {
         $fs = new SwagUpdateFileSystem();
@@ -165,7 +171,7 @@ public function isUpdateAllowedAction()
             $wrongPermissionCount = \count($result);
 
             $this->container->get('corelogger')->error(
-                sprintf('SwagUpdate: There are %d files without write permission. FTP credentials are needed.', $wrongPermissionCount),
+                \sprintf('SwagUpdate: There are %d files without write permission. FTP credentials are needed.', $wrongPermissionCount),
                 $result
             );
 
@@ -184,23 +190,11 @@ public function isUpdateAllowedAction()
         ]);
     }
 
+    /**
+     * @return void
+     */
     public function popupAction()
     {
-        $config = $this->getPluginConfig();
-
-        if ($config['update-send-feedback']) {
-            $apiEndpoint = $config['update-feedback-api-endpoint'];
-            $shopwareRelease = $this->container->get('shopware.release');
-
-            $collector = new FeedbackCollector($apiEndpoint, $this->getUnique(), $shopwareRelease);
-
-            try {
-                $collector->sendData();
-            } catch (Exception $e) {
-                // ignore for now
-            }
-        }
-
         try {
             $data = $this->fetchUpdateVersion();
         } catch (Exception $e) {
@@ -233,6 +227,9 @@ public function popupAction()
         }
     }
 
+    /**
+     * @return void
+     */
     public function startUpdateAction()
     {
         $clientIp = $this->Request()->getClientIp();
@@ -247,6 +244,10 @@ public function startUpdateAction()
         ];
 
         $version = $this->getCachedVersion();
+        if (!$version instanceof Version) {
+            throw new Exception('Could not get version');
+        }
+
         $payload['version'] = $version->version;
 
         $session = Shopware()->BackendSession();
@@ -260,12 +261,15 @@ public function startUpdateAction()
         $updateFilePath = $projectDir . 'files/update/update.json';
 
         if (!file_put_contents($updateFilePath, $payload)) {
-            throw new Exception(sprintf('Could not write file %s', $updateFilePath));
+            throw new Exception(\sprintf('Could not write file %s', $updateFilePath));
         }
 
         $this->redirect($base . '/recovery/update/index.php');
     }
 
+    /**
+     * @return void
+     */
     public function downloadAction()
     {
         $offset = (int) $this->Request()->get('offset', 0);
@@ -290,9 +294,23 @@ public function downloadAction()
         }
     }
 
+    /**
+     * @return void
+     */
     public function unpackAction()
     {
-        $version = $this->getCachedVersion();
+        try {
+            $version = $this->getCachedVersion();
+        } catch (Exception $e) {
+            $this->View()->assign([
+                'success' => false,
+                'data' => [],
+                'message' => $e->getMessage(),
+            ]);
+
+            return;
+        }
+
         if (!$version instanceof Version) {
             $this->View()->assign('message', 'Could not get version information');
             $this->View()->assign('success', false);
@@ -337,7 +355,7 @@ public function getWhitelistedCSRFActions()
     /**
      * @param string $path the path of the directory to be iterated over
      *
-     * @return RecursiveIteratorIterator
+     * @return RecursiveIteratorIterator<RecursiveDirectoryIterator>
      */
     protected function createRecursiveFileIterator($path)
     {
@@ -352,10 +370,7 @@ protected function createRecursiveFileIterator($path)
         );
     }
 
-    /**
-     * @param string $fileDir
-     */
-    private function replaceRecoveryFiles($fileDir)
+    private function replaceRecoveryFiles(string $fileDir): void
     {
         $recoveryDir = $fileDir . '/recovery';
         if (!is_dir($recoveryDir)) {
@@ -376,36 +391,12 @@ private function replaceRecoveryFiles($fileDir)
         }
     }
 
-    /**
-     * Returns unique id of this shop installation.
-     * If no unique id exists it will be created.
-     */
-    private function getUnique(): string
-    {
-        return $this->container->get(UniqueIdGenerator::class)->getUniqueId();
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    private function getPluginConfig(): array
-    {
-        return Shopware()->Plugins()->Backend()->SwagUpdate()->Config()->toArray();
-    }
-
     private function getShopwareVersion(): string
     {
-        $pluginConfig = $this->getPluginConfig();
-
-        if (!empty($pluginConfig['update-fake-version'])) {
-            $shopwareVersion = $pluginConfig['update-fake-version'];
-        } else {
-            $shopwareVersion = $this->container->getParameter('shopware.release.version');
-
-            $versionText = $this->container->getParameter('shopware.release.version_text');
-            if (!empty($versionText)) {
-                $shopwareVersion .= '-' . $versionText;
-            }
+        $shopwareVersion = $this->container->getParameter('shopware.release.version');
+        $versionText = $this->container->getParameter('shopware.release.version_text');
+        if (!empty($versionText) && $versionText !== '___VERSION_TEXT___') {
+            $shopwareVersion .= '-' . $versionText;
         }
 
         return $shopwareVersion;
@@ -414,7 +405,8 @@ private function getShopwareVersion(): string
     private function getCachedVersion(): ?Version
     {
         $cache = $this->get(Zend_Cache_Core::class);
-        if (false === $version = $cache->load(self::CACHE_KEY)) {
+        $version = $cache->load(self::CACHE_KEY);
+        if ($version === false) {
             $version = $this->fetchUpdateVersion();
         }
 
@@ -425,13 +417,8 @@ private function fetchUpdateVersion(): ?Version
     {
         $shopwareVersion = $this->getShopwareVersion();
 
-        $pluginConfig = $this->getPluginConfig();
-        $params = [
-            'code' => $pluginConfig['update-code'],
-        ];
-
         $update = $this->get('swagupdateupdatecheck');
-        $result = $update->checkUpdate($shopwareVersion, $params);
+        $result = $update->checkUpdate($shopwareVersion);
 
         $cache = $this->get(Zend_Cache_Core::class);
         $cache->save($result, self::CACHE_KEY, [], 60);
@@ -455,28 +442,12 @@ private function createDestinationFromVersion(Version $version): string
      * Map result object to extjs array format
      *
      * @param ValidResult|FinishResult|ErrorResult $result
-     */
-    private function mapResult($result): array
-    {
-        $mapper = new ExtJsResultMapper();
-
-        return $mapper->toExtJs($result);
-    }
-
-    /**
-     * @param string[] $languages
      *
-     * @return string[]
+     * @return array<string, bool|int|string>
      */
-    private function getLocalizedChangeLog(Version $version, array $languages): ?array
+    private function mapResult($result): array
     {
-        while ($language = array_shift($languages)) {
-            if (isset($version->changelog[$language])) {
-                return $version->changelog[$language];
-            }
-        }
-
-        return null;
+        return (new ExtJsResultMapper())->toExtJs($result);
     }
 
     private function getUserLanguage(stdClass $user): string
@@ -484,7 +455,7 @@ private function getUserLanguage(stdClass $user): string
         $locale = $user->locale;
         $locale = strtolower($locale->getLocale());
 
-        return substr($locale, 0, 2);
+        return substr($locale, 0, 2) ?: 'en';
     }
 
     private function checkSecurityPlugin(): bool
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Snippets/backend/swag_update/main.ini b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Snippets/backend/swag_update/main.ini
index 68dde57b5c9..44a2ef4d754 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Snippets/backend/swag_update/main.ini
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Snippets/backend/swag_update/main.ini
@@ -79,6 +79,7 @@ security_update_window/text = "<h2>Warning!</h2>A new security update is availab
 security_update_window/cancel = "Close"
 security_update_window/update = "Open software update"
 ftp/invalid_permissions = "Invalid file permissions"
+release_information = "You can see the current release information for [1] here."
 
 [de_DE]
 cancel = "Abbrechen"
@@ -160,4 +161,5 @@ security_update_window/title = "Sicherheitsupdate verfügbar"
 security_update_window/text = "<h2>Achtung!</h2>Ein neues Sicherheitsupdate ist verfügbar. Um die Sicherheit Deiner Installation zu gewährleisten, empfehlen wir Dir schnellstmöglich ein Update durchzuführen oder alternativ unser <a href=\"https://store.shopware.com/swag575294366635f/shopware-sicherheits-plugin.html\" target=\"_blank\" rel=\"noopener\">Sicherheits-Plugin</a> zu installieren.<br><br><ul><li><a href=\"[0]\" target=\"_blank\" rel=\"noopener\">Changelog ansehen</a></li></ul>"
 security_update_window/cancel = "Schließen"
 security_update_window/update = "Softwareaktualisierung öffnen"
-ftp/invalid_permissions = "Invalide Datei Rechte"
\ No newline at end of file
+ftp/invalid_permissions = "Invalide Datei Rechte"
+release_information = "Du kannst die aktuellen Release-Informationen zu [1] hier einsehen."
\ No newline at end of file
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/index/view/swag_update_menu.js b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/index/view/swag_update_menu.js
index 1f48e9c91ca..f6d3c5f1771 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/index/view/swag_update_menu.js
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/index/view/swag_update_menu.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {namespace name="backend/swag_update/main"}
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/app.js b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/app.js
index 235b5926efe..272eab18ca4 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/app.js
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 Ext.define('Shopware.apps.SwagUpdate', {
     extend: 'Enlight.app.SubApplication',
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/controller/main.js b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/controller/main.js
index 0a47f828218..880c447c4d3 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/controller/main.js
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {namespace name="backend/swag_update/main"}
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/controller/progress.js b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/controller/progress.js
index 58afff9c643..4de78df285c 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/controller/progress.js
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/controller/progress.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {namespace name="backend/swag_update/main"}
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/model/changelog.js b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/model/changelog.js
index 95baabc6d20..d7fa8be321b 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/model/changelog.js
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/model/changelog.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 Ext.define('Shopware.apps.SwagUpdate.model.Changelog', {
 
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/model/plugins.js b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/model/plugins.js
index e66f86dcc8d..ea018121366 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/model/plugins.js
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/model/plugins.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 Ext.define('Shopware.apps.SwagUpdate.model.Plugins', {
 
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/model/requirement.js b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/model/requirement.js
index 40c7f271a84..2326fc4f710 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/model/requirement.js
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/model/requirement.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 Ext.define('Shopware.apps.SwagUpdate.model.Requirement', {
 
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/store/changelog.js b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/store/changelog.js
index 82d956d54d4..12499cfb833 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/store/changelog.js
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/store/changelog.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 Ext.define('Shopware.apps.SwagUpdate.store.Changelog', {
 
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/store/plugins.js b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/store/plugins.js
index 113afc39cb6..050bf70ea15 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/store/plugins.js
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/store/plugins.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 Ext.define('Shopware.apps.SwagUpdate.store.Plugins', {
 
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/store/requirements.js b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/store/requirements.js
index 0cd4989a12f..3929db502da 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/store/requirements.js
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/store/requirements.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 Ext.define('Shopware.apps.SwagUpdate.store.Requirements', {
     extend: 'Ext.data.Store',
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/no_update.js b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/no_update.js
index 2a5a62b55dc..9f1991582ba 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/no_update.js
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/no_update.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/swag_update/main"}
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/progress.js b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/progress.js
index 56d15ba38a7..ddc5475ec06 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/progress.js
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/progress.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/swag_update/main"}
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/security_update_window.js b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/security_update_window.js
index 35a2f6d5959..6591841d1cf 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/security_update_window.js
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/security_update_window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {namespace name="backend/swag_update/main"}
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/window.js b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/window.js
index 585558928d8..02b74013daa 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/window.js
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {namespace name="backend/swag_update/main"}
@@ -180,8 +179,9 @@ Ext.define('Shopware.apps.SwagUpdate.view.Window', {
         var me = this;
 
         var text = Ext.String.format(
-            '<div class="swag-update-changelog">[0]</div>',
-            me.changelog.get('changelog')
+            '<div class="swag-update-changelog"><br><a href="[0]">{s name="release_information"}{/s}</a></div>',
+            me.changelog.get('changelog'),
+            me.changelog.get('version')
         );
 
         return Ext.create('Ext.panel.Panel', {
diff --git a/engine/Shopware/Plugins/Default/Core/ControllerBase/Bootstrap.php b/engine/Shopware/Plugins/Default/Core/ControllerBase/Bootstrap.php
index ca1dc4f5ce9..ea5191498da 100644
--- a/engine/Shopware/Plugins/Default/Core/ControllerBase/Bootstrap.php
+++ b/engine/Shopware/Plugins/Default/Core/ControllerBase/Bootstrap.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface;
@@ -145,14 +145,11 @@ public function getCategories($parentId)
     public function getMenu($shopId = null, $activePageId = null)
     {
         if ($shopId === null) {
-            $context = Shopware()->Container()->get(ContextServiceInterface::class)->getShopContext();
+            $context = $this->get(ContextServiceInterface::class)->getShopContext();
             $shopId = $context->getShop()->getId();
         }
 
-        $data = Shopware()->Container()->get(SitePageMenu::class)
-            ->getTree($shopId, $activePageId);
-
-        return $data;
+        return $this->get(SitePageMenu::class)->getTree($shopId, $activePageId);
     }
 
     /**
diff --git a/engine/Shopware/Plugins/Default/Core/Cron/Bootstrap.php b/engine/Shopware/Plugins/Default/Core/Cron/Bootstrap.php
index c99490db972..0edfda34072 100644
--- a/engine/Shopware/Plugins/Default/Core/Cron/Bootstrap.php
+++ b/engine/Shopware/Plugins/Default/Core/Cron/Bootstrap.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Shopware_Plugins_Core_Cron_Bootstrap extends Shopware_Components_Plugin_Bootstrap
diff --git a/engine/Shopware/Plugins/Default/Core/Cron/Cron.php b/engine/Shopware/Plugins/Default/Core/Cron/Cron.php
index 3f543a080cd..277de1b7111 100644
--- a/engine/Shopware/Plugins/Default/Core/Cron/Cron.php
+++ b/engine/Shopware/Plugins/Default/Core/Cron/Cron.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\CSRFWhitelistAware;
diff --git a/engine/Shopware/Plugins/Default/Core/CronBirthday/Bootstrap.php b/engine/Shopware/Plugins/Default/Core/CronBirthday/Bootstrap.php
index 175f03d7b19..6ca462d6c13 100644
--- a/engine/Shopware/Plugins/Default/Core/CronBirthday/Bootstrap.php
+++ b/engine/Shopware/Plugins/Default/Core/CronBirthday/Bootstrap.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\ShopRegistrationServiceInterface;
@@ -144,7 +144,7 @@ public function onRun(Shopware_Components_Cron_CronJob $job)
             $shop = $repository->getActiveById($shopId);
             $this->get(ShopRegistrationServiceInterface::class)->registerShop($shop);
 
-            //language subshopID
+            // language subshopID
             $context = [
                 'sUser' => $user,
                 'sVoucher' => $voucher,
diff --git a/engine/Shopware/Plugins/Default/Core/CronProductExport/Bootstrap.php b/engine/Shopware/Plugins/Default/Core/CronProductExport/Bootstrap.php
index fadafab7a8e..15e26191cb3 100644
--- a/engine/Shopware/Plugins/Default/Core/CronProductExport/Bootstrap.php
+++ b/engine/Shopware/Plugins/Default/Core/CronProductExport/Bootstrap.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Models\ProductFeed\ProductFeed;
@@ -49,7 +49,7 @@ public function onRun(Enlight_Components_Cron_EventArgs $job)
     {
         $this->exportProductFiles();
 
-        return sprintf('%s succeeded.', $job->getName());
+        return \sprintf('%s succeeded.', $job->getName());
     }
 
     /**
@@ -65,10 +65,10 @@ public function exportProductFiles()
         $cacheDir = Shopware()->Container()->getParameter('shopware.product_export.cache_dir');
         if (!is_dir($cacheDir)) {
             if (@mkdir($cacheDir, 0777, true) === false) {
-                throw new \RuntimeException(sprintf("Unable to create the %s directory (%s)\n", 'Productexport', $cacheDir));
+                throw new RuntimeException(\sprintf("Unable to create the %s directory (%s)\n", 'Productexport', $cacheDir));
             }
         } elseif (!is_writable($cacheDir)) {
-            throw new \RuntimeException(sprintf("Unable to write in the %s directory (%s)\n", 'Productexport', $cacheDir));
+            throw new RuntimeException(\sprintf("Unable to write in the %s directory (%s)\n", 'Productexport', $cacheDir));
         }
 
         $export = Shopware()->Modules()->Export();
@@ -86,7 +86,7 @@ public function exportProductFiles()
             } elseif ($feedModel->getInterval() > 0) {
                 $diffInterval = time();
                 if ($feedModel->getCacheRefreshed()) {
-                    $diffInterval = $diffInterval - $feedModel->getCacheRefreshed()->getTimestamp();
+                    $diffInterval -= $feedModel->getCacheRefreshed()->getTimestamp();
                 }
 
                 if ($diffInterval < $feedModel->getInterval() && file_exists($filePath)) {
diff --git a/engine/Shopware/Plugins/Default/Core/CronRating/Bootstrap.php b/engine/Shopware/Plugins/Default/Core/CronRating/Bootstrap.php
index c0a7cd0fe16..23f5f6fbce2 100644
--- a/engine/Shopware/Plugins/Default/Core/CronRating/Bootstrap.php
+++ b/engine/Shopware/Plugins/Default/Core/CronRating/Bootstrap.php
@@ -1,29 +1,30 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface;
 use Shopware\Bundle\StoreFrontBundle\Service\MediaServiceInterface;
+use Shopware\Bundle\StoreFrontBundle\Struct\BaseProduct;
 use Shopware\Components\Compatibility\LegacyStructConverter;
 use Shopware\Components\Routing\RouterInterface;
 use Shopware\Components\ShopRegistrationServiceInterface;
@@ -411,25 +412,19 @@ public function getPositions($orderIds)
      *
      * by using the corresponding shopId for every order's positions.
      *
-     * @param array $orderPositions
-     *
-     * @return array
+     * @return array<int, array<string, BaseProduct>>
      */
-    private function structurePositionsArray($orderPositions)
+    private function structurePositionsArray(array $orderPositions): array
     {
         $shopPositionNumbers = [];
 
-        foreach ($orderPositions as $order_id => $positions) {
-            $firstPosition = $positions[array_keys($positions)[0]];
-            $shopId = is_numeric($firstPosition['language']) ? $firstPosition['language'] : $firstPosition['subshopID'];
-
-            if (!\is_array($shopPositionNumbers[$shopId])) {
-                $shopPositionNumbers[$shopId] = [];
-            }
+        foreach ($orderPositions as $positions) {
+            $firstPosition = $positions[array_key_first($positions)];
+            $shopId = is_numeric($firstPosition['language']) ? (int) $firstPosition['language'] : (int) $firstPosition['subshopID'];
 
             $shopPositionNumbers[$shopId] = array_merge(
                 array_column($positions, 'articleordernumber'),
-                $shopPositionNumbers[$shopId]
+                $shopPositionNumbers[$shopId] ?? []
             );
         }
 
diff --git a/engine/Shopware/Plugins/Default/Core/CronStock/Bootstrap.php b/engine/Shopware/Plugins/Default/Core/CronStock/Bootstrap.php
index d9c3d0296f7..118d237fea7 100644
--- a/engine/Shopware/Plugins/Default/Core/CronStock/Bootstrap.php
+++ b/engine/Shopware/Plugins/Default/Core/CronStock/Bootstrap.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Shopware_Plugins_Core_CronStock_Bootstrap extends Shopware_Components_Plugin_Bootstrap
diff --git a/engine/Shopware/Plugins/Default/Core/ErrorHandler/Bootstrap.php b/engine/Shopware/Plugins/Default/Core/ErrorHandler/Bootstrap.php
index 70efc1d0dbf..2fd34ca5648 100644
--- a/engine/Shopware/Plugins/Default/Core/ErrorHandler/Bootstrap.php
+++ b/engine/Shopware/Plugins/Default/Core/ErrorHandler/Bootstrap.php
@@ -1,28 +1,29 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Monolog\Handler\BufferHandler;
+use Monolog\Logger as MonologLogger;
 use Shopware\Components\CSRFTokenValidationException;
 use Shopware\Components\Log\Formatter\HtmlFormatter;
 use Shopware\Components\Log\Handler\EnlightMailHandler;
@@ -181,8 +182,8 @@ public function errorHandler($errno, $errstr, $errfile, $errline)
             return;
         }
 
-        // Ignore access to not initialized variables in smarty templates
-        if ($errno === E_NOTICE && stripos($errfile, '/var/cache/') !== false && stripos($errfile, '/templates/') !== false) {
+        // Ignore access to not initialized variables in smarty templates. Since PHP 8.0 those are warnings
+        if (\in_array($errno, [E_NOTICE, E_WARNING], true) && str_contains($errfile, '/var/cache/') && str_contains($errfile, '/templates/')) {
             return;
         }
 
@@ -290,16 +291,16 @@ public function onDispatchLoopShutdown(Enlight_Controller_EventArgs $args)
     public function createMailHandler()
     {
         /** @var Shopware_Components_Config $config */
-        $config = $this->get(\Shopware_Components_Config::class);
+        $config = $this->get(Shopware_Components_Config::class);
 
-        $logLevel = \Monolog\Logger::toMonologLevel($config->get('logMailLevel'));
+        $logLevel = MonologLogger::toMonologLevel($config->get('logMailLevel'));
         $recipients = array_filter(explode("\n", $config->get('logMailAddress')));
 
         if (\count($recipients) < 1) {
             $recipients[] = $config->get('mail');
         }
 
-        $mailer = new \Enlight_Components_Mail();
+        $mailer = new Enlight_Components_Mail();
         $mailer->addTo($recipients);
         $mailer->setSubject('Error in shop "' . $config->get('shopName') . '".');
         $mailHandler = new EnlightMailHandler($mailer, $logLevel);
diff --git a/engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php b/engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
index 3add27750cb..765163c4199 100644
--- a/engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
+++ b/engine/Shopware/Plugins/Default/Core/HttpCache/Bootstrap.php
@@ -1,29 +1,28 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\Common\EventArgs;
-use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Proxy\Proxy;
 use Enlight_Controller_Request_Request as Request;
 use Enlight_Controller_Response_ResponseHttp as Response;
@@ -216,8 +215,6 @@ public function getCapabilities()
      * Enable plugin method
      * Although plugin is flagged as capability: enable => false,
      * it can still be enabled/disabled programmatically
-     *
-     * @return bool
      */
     public function enable()
     {
@@ -228,8 +225,6 @@ public function enable()
      * Disable plugin method
      * Although plugin is flagged as capability: enable => false,
      * it can still be enabled/disabled programmatically
-     *
-     * @return bool
      */
     public function disable()
     {
@@ -238,6 +233,8 @@ public function disable()
 
     /**
      * Install config-form
+     *
+     * @return void
      */
     public function installForm()
     {
@@ -303,14 +300,12 @@ public function installForm()
      * Fallback to auto-detection if proxy-url is not configured and $request is given.
      * Returns null if $request is not given or auto-detection fails.
      *
-     * @param Request $request
-     *
      * @return string|null
      */
-    public function getProxyUrl(Request $request = null)
+    public function getProxyUrl(?Request $request = null)
     {
-        $proxyUrl = trim($this->Config()->get('proxy'));
-        if (!empty($proxyUrl)) {
+        $proxyUrl = trim((string) $this->Config()->get('proxy', ''));
+        if ($proxyUrl !== '') {
             return $proxyUrl;
         }
 
@@ -321,16 +316,12 @@ public function getProxyUrl(Request $request = null)
                    . $request->getBaseUrl() . '/';
         }
 
-        $em = $this->get(ModelManager::class);
-        $repository = $em->getRepository(Shop::class);
-
-        $shop = $repository->findOneBy(['default' => true]);
-
+        $shop = $this->get(ModelManager::class)->getRepository(Shop::class)->findOneBy(['default' => true]);
         if (!$shop->getHost()) {
             return null;
         }
 
-        return sprintf(
+        return \sprintf(
             '%s://%s%s/',
             $shop->getSecure() ? 'https' : 'http',
             $shop->getHost(),
@@ -340,6 +331,8 @@ public function getProxyUrl(Request $request = null)
 
     /**
      * Do http caching jobs
+     *
+     * @return void
      */
     public function onPreDispatch(Enlight_Controller_ActionEventArgs $args)
     {
@@ -388,13 +381,15 @@ public function renderEsiTag(Enlight_Controller_Request_RequestHttp $request, ar
             $params['nocache'] = 1;
         }
 
-        $url = sprintf('%s/?%s', $request->getBaseUrl(), http_build_query($params, '', '&'));
+        $url = \sprintf('%s/?%s', $request->getBaseUrl(), http_build_query($params, '', '&'));
 
         return '<esi:include src="' . $url . '" />';
     }
 
     /**
      * On post dispatch we try to find affected articleIds displayed during this request
+     *
+     * @return void
      */
     public function onPostDispatch(Enlight_Controller_ActionEventArgs $args)
     {
@@ -440,6 +435,8 @@ public function onClearHttpCache(Shopware_Components_Cron_CronJob $job)
         if ($this->clearCache()) {
             return "Cleared HTTP-Cache\n";
         }
+
+        return '';
     }
 
     /**
@@ -451,6 +448,8 @@ public function onClearHttpCache(Shopware_Components_Cron_CronJob $job)
      * <code>
      * Shopware()->Events()->notify('Shopware_Plugins_HttpCache_ClearCache');
      * </code>
+     *
+     * @return void
      */
     public function onClearCache(Enlight_Event_EventArgs $args)
     {
@@ -471,6 +470,8 @@ public function onClearCache(Enlight_Event_EventArgs $args)
      *     array('cacheId' => 'a123')
      * );
      * </code>
+     *
+     * @return void
      */
     public function onInvalidateCacheId(Enlight_Event_EventArgs $args)
     {
@@ -487,6 +488,8 @@ public function onInvalidateCacheId(Enlight_Event_EventArgs $args)
 
     /**
      * Sets the Shopware cache headers
+     *
+     * @return bool
      */
     public function setCacheHeaders()
     {
@@ -526,7 +529,9 @@ public function setCacheHeaders()
     }
 
     /**
-     * This methods sets the nocache-cookie if actions in the shop are triggered
+     * This method sets the nocache-cookie if actions in the shop are triggered
+     *
+     * @return void
      */
     public function setNoCacheCookie()
     {
@@ -551,6 +556,8 @@ public function setNoCacheCookie()
      *
      * @param string $newTag
      * @param bool   $remove
+     *
+     * @return void
      */
     public function setNoCacheTag($newTag, $remove = false)
     {
@@ -591,6 +598,8 @@ public function setNoCacheTag($newTag, $remove = false)
      * Helper function to flag the request with cacheIds to invalidate the caching.
      *
      * @param array $cacheIds
+     *
+     * @return void
      */
     public function setCacheIdHeader($cacheIds = [])
     {
@@ -610,6 +619,8 @@ public function setCacheIdHeader($cacheIds = [])
 
     /**
      * Execute cache invalidation after Doctrine flush
+     *
+     * @return void
      */
     public function postFlush(EventArgs $eventArgs)
     {
@@ -622,6 +633,8 @@ public function postFlush(EventArgs $eventArgs)
 
     /**
      * Cache invalidation based on model events
+     *
+     * @return void
      */
     public function onPostPersist(Enlight_Event_EventArgs $eventArgs)
     {
@@ -689,7 +702,6 @@ public function onPostPersist(Enlight_Event_EventArgs $eventArgs)
             $this->cacheInvalidationBuffer[$cacheId] = true;
         }
 
-        /** @var EntityManager $entityManager */
         $entityManager = Shopware()->Container()->get(ModelManager::class);
         $entityManager->getEventManager()->addEventListener(['postFlush'], $this);
     }
@@ -699,6 +711,8 @@ public function onPostPersist(Enlight_Event_EventArgs $eventArgs)
      *
      * @param int   $cacheTime
      * @param array $cacheIds
+     *
+     * @return void
      */
     public function enableControllerCache($cacheTime = 3600, $cacheIds = [])
     {
@@ -708,13 +722,15 @@ public function enableControllerCache($cacheTime = 3600, $cacheIds = [])
 
     /**
      * Helper function to disable the http cache for a single shopware controller
+     *
+     * @return void
      */
     public function disableControllerCache()
     {
         $this->response->headers->set('cache-control', 'private', true);
     }
 
-    private function getResponseCookie(Response $response)
+    private function getResponseCookie(Response $response): ?string
     {
         $cookies = $response->getCookies();
         foreach ($cookies as $cookie) {
@@ -728,10 +744,8 @@ private function getResponseCookie(Response $response)
 
     /**
      * Clears the cache
-     *
-     * @return bool
      */
-    private function clearCache()
+    private function clearCache(): bool
     {
         return $this->invalidate();
     }
@@ -741,12 +755,8 @@ private function clearCache()
      *
      * This sends a http-ban-request to the proxyUrl containing
      * the $cacheId in the x-shopware-invalidates http-header
-     *
-     * @param string $cacheId
-     *
-     * @return bool
      */
-    private function invalidateCacheId($cacheId)
+    private function invalidateCacheId(string $cacheId): bool
     {
         if (!$this->Config()->get('proxyPrune')) {
             return false;
@@ -759,14 +769,14 @@ private function invalidateCacheId($cacheId)
      * Will send BAN requests to all configured reverse proxies. If cacheId is provided,
      * the corresponding headers will be set.
      *
-     * @param string $cacheId If set, only pages including these cacheIds will be invalidated
+     * @param string|null $cacheId If set, only pages including these cacheIds will be invalidated
      *
      * @return bool True will be returned, if *all* operations succeeded
      */
-    private function invalidate($cacheId = null)
+    private function invalidate(?string $cacheId = null): bool
     {
-        $proxyUrl = trim($this->Config()->get('proxy'));
-        if (!empty($proxyUrl)) {
+        $proxyUrl = trim((string) $this->Config()->get('proxy', ''));
+        if ($proxyUrl !== '') {
             return $this->invalidateWithBANRequest($proxyUrl, $cacheId);
         }
 
@@ -784,12 +794,9 @@ private function invalidate($cacheId = null)
     }
 
     /**
-     * @param string $urls    Comma separated URLs
-     * @param string $cacheId
-     *
-     * @return bool
+     * @param string $urls Comma separated URLs
      */
-    private function invalidateWithBANRequest($urls, $cacheId)
+    private function invalidateWithBANRequest(string $urls, ?string $cacheId): bool
     {
         // Expand + trim proxies (comma separated)
         $urls = array_map(
@@ -825,12 +832,7 @@ private function invalidateWithBANRequest($urls, $cacheId)
         return $success;
     }
 
-    /**
-     * @param string $cacheId
-     *
-     * @return bool
-     */
-    private function invalidateWithStore($cacheId = null)
+    private function invalidateWithStore(?string $cacheId = null): bool
     {
         /** @var HttpCache $httpCache */
         $httpCache = $this->get('httpcache');
@@ -852,7 +854,7 @@ private function invalidateWithStore($cacheId = null)
      *
      * @param Response $response A Response instance
      */
-    private function addSurrogateControl(Response $response)
+    private function addSurrogateControl(Response $response): void
     {
         $response->headers->set('Surrogate-Control', 'content="ESI/1.0"', true);
     }
@@ -867,17 +869,17 @@ private function addSurrogateControl(Response $response)
     private function hasSurrogateEsiCapability(Request $request): bool
     {
         $value = $request->getHeader('Surrogate-Capability');
-        if ($value === false) {
+        if (empty($value)) {
             return false;
         }
 
-        return strpos($value, 'ESI/1.0') !== false;
+        return str_contains($value, 'ESI/1.0');
     }
 
     /**
      * Add context cookie
      */
-    private function addContextCookie(Request $request, Response $response)
+    private function addContextCookie(Request $request, Response $response): void
     {
         /** @var CacheControl $cacheControl */
         $cacheControl = $this->get('http_cache.cache_control');
diff --git a/engine/Shopware/Plugins/Default/Core/HttpCache/CacheControl.php b/engine/Shopware/Plugins/Default/Core/HttpCache/CacheControl.php
index fb5c88ca54b..4f5692da351 100644
--- a/engine/Shopware/Plugins/Default/Core/HttpCache/CacheControl.php
+++ b/engine/Shopware/Plugins/Default/Core/HttpCache/CacheControl.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace ShopwarePlugins\HttpCache;
@@ -32,7 +32,6 @@
 use Shopware\Components\HttpCache\CacheRouteGenerationService;
 use Shopware\Components\HttpCache\CacheTimeServiceInterface;
 use Shopware\Components\HttpCache\DefaultRouteService;
-use Symfony\Component\HttpFoundation\Cookie;
 
 class CacheControl
 {
@@ -179,7 +178,7 @@ public function useNoCacheControl(Request $request, Response $response, $shopId)
     public function getNoCacheTagsForRequest(Request $request, $shopId)
     {
         $tags = [];
-        $autoAdmin = $this->config['admin'];
+        $autoAdmin = $this->config['admin'] ?? null;
 
         if (!empty($autoAdmin)) {
             $tags[] = 'admin-' . $shopId;
@@ -285,7 +284,7 @@ public function useNoCacheParameterForEsi(Request $request, $targetName)
      */
     public function setContextCacheKey(Request $request, ShopContextInterface $context, Response $response)
     {
-        //not logged in => reset global context cookie
+        // not logged in => reset global context cookie
         if (!$this->session->offsetGet('sUserGroup')) {
             $this->resetCookies($request, $response);
 
diff --git a/engine/Shopware/Plugins/Default/Core/HttpCache/CacheIdCollector.php b/engine/Shopware/Plugins/Default/Core/HttpCache/CacheIdCollector.php
index 999deac9d52..d021b5c381e 100644
--- a/engine/Shopware/Plugins/Default/Core/HttpCache/CacheIdCollector.php
+++ b/engine/Shopware/Plugins/Default/Core/HttpCache/CacheIdCollector.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace ShopwarePlugins\HttpCache;
diff --git a/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php b/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
index 572fee7cc05..357d7f5a176 100644
--- a/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
+++ b/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Bootstrap.php
@@ -1,27 +1,29 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+use Shopware\Models\Article\Article;
+
 class Shopware_Plugins_Core_MarketingAggregate_Bootstrap extends Shopware_Components_Plugin_Bootstrap
 {
     /**
@@ -167,7 +169,7 @@ public function initSimilarShownResource()
      */
     public function afterSimilarShownArticlesReset(Enlight_Event_EventArgs $arguments)
     {
-        if (!($this->isSimilarShownActivated())) {
+        if (!$this->isSimilarShownActivated()) {
             return $arguments->getReturn();
         }
 
@@ -195,7 +197,7 @@ public function afterSimilarShownArticlesReset(Enlight_Event_EventArgs $argument
      */
     public function beforeSetLastArticle(Enlight_Event_EventArgs $arguments)
     {
-        if (Shopware()->Session()->get('Bot') || !($this->isSimilarShownActivated())) {
+        if (Shopware()->Session()->get('Bot') || !$this->isSimilarShownActivated()) {
             return $arguments->getReturn();
         }
 
@@ -250,7 +252,7 @@ public function refreshSimilarShown(Enlight_Event_EventArgs $arguments)
             self::AGGREGATE_STRATEGY_LIVE
         );
 
-        if ($strategy !== self::AGGREGATE_STRATEGY_CRON_JOB || !($this->isSimilarShownActivated())) {
+        if ($strategy !== self::AGGREGATE_STRATEGY_CRON_JOB || !$this->isSimilarShownActivated()) {
             return true;
         }
 
@@ -364,13 +366,13 @@ public function initTopSellerResource()
      */
     public function incrementTopSeller(Enlight_Event_EventArgs $arguments)
     {
-        if (Shopware()->Session()->get('Bot') || !($this->isTopSellerActivated())) {
+        if (Shopware()->Session()->get('Bot') || !$this->isTopSellerActivated()) {
             return $arguments->getReturn();
         }
 
         $details = $arguments->getDetails();
         foreach ($details as $article) {
-            if ($article['modus'] != 0 || empty($article['articleID'])) {
+            if (($article['modus'] ?? null) != 0 || empty($article['articleID'])) {
                 continue;
             }
 
@@ -423,7 +425,7 @@ public function afterTopSellerSelected(Enlight_Event_EventArgs $arguments)
             self::AGGREGATE_STRATEGY_LIVE
         );
 
-        if ($strategy !== self::AGGREGATE_STRATEGY_LIVE || !($this->isTopSellerActivated())) {
+        if ($strategy !== self::AGGREGATE_STRATEGY_LIVE || !$this->isTopSellerActivated()) {
             return $arguments->getReturn();
         }
 
@@ -441,12 +443,11 @@ public function refreshArticle(Enlight_Event_EventArgs $arguments)
             return;
         }
 
-        /** @var \Shopware\Models\Article\Article $product */
         $product = $arguments->getEntity();
-        if (!($product instanceof \Shopware\Models\Article\Article)) {
+        if (!$product instanceof Article) {
             return;
         }
-        if (!($product->getId()) > 0) {
+        if (!($product->getId() > 0)) {
             return;
         }
 
diff --git a/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/AlsoBought.php b/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/AlsoBought.php
index ed8d73792d0..7bfaea40490 100644
--- a/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/AlsoBought.php
+++ b/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/AlsoBought.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
@@ -141,7 +141,7 @@ public function refreshMultipleBoughtArticles($combinations = [])
      */
     public function getOrderTime($interval = 365)
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be removed with 5.7. Will be removed without replacement.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         $orderTime = new DateTime();
         $orderTime->sub(new DateInterval('P' . (int) $interval . 'D'));
diff --git a/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/SimilarShown.php b/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/SimilarShown.php
index e10c8f59029..90f3b17c8c8 100644
--- a/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/SimilarShown.php
+++ b/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/SimilarShown.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
@@ -33,7 +33,7 @@ class Shopware_Components_SimilarShown extends Enlight_Class
     /**
      * Resets the similar show article data.
      */
-    public function resetSimilarShown(DateTime $validationTime = null)
+    public function resetSimilarShown(?DateTime $validationTime = null)
     {
         if ($validationTime) {
             $sql = 'DELETE FROM s_articles_similar_shown_ro WHERE init_date <= :validationTime';
@@ -85,13 +85,13 @@ public function initSimilarShown($offset = null, $limit = null)
             VALUES (:article_id, :related_article_id, :viewed, :init_date)
         ');
 
-        //iterate all selected articles which has to be initialed
+        // iterate all selected articles which has to be initialed
         foreach ($articles as $articleId) {
-            //now we select all similar articles of the s_emarketing_lastarticles table
+            // now we select all similar articles of the s_emarketing_lastarticles table
             $preparedSelect->execute(['articleId' => $articleId]);
             $combinations = $preparedSelect->fetchAll();
 
-            //at least we have to insert each combination in the aggregate s_articles_similar_shown_ro table.
+            // at least we have to insert each combination in the aggregate s_articles_similar_shown_ro table.
             foreach ($combinations as $combination) {
                 $preparedInsert->execute($combination);
             }
@@ -142,10 +142,10 @@ public function updateElapsedSimilarShownArticles($limit = null)
      */
     public function getSimilarShownValidationTime()
     {
-        //get similar shown validation time
+        // get similar shown validation time
         $interval = Shopware()->Config()->get('similarValidationTime', 10);
 
-        //create a new date time object to create the current date subtract the configured date interval.
+        // create a new date time object to create the current date subtract the configured date interval.
         $orderTime = new DateTime();
         $orderTime->sub(new DateInterval('P' . $interval . 'D'));
 
diff --git a/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/TopSeller.php b/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/TopSeller.php
index 36dc9a84c48..6c9b0dcd3ca 100644
--- a/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/TopSeller.php
+++ b/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Components/TopSeller.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
@@ -236,9 +236,9 @@ protected function getTopSellerSelect()
         $sumSelect = ' SUM(IF(s_order.id, IFNULL(details.quantity, 0), 0))  ';
         if ($usePseudoSales) {
             // If this value is set to true, the articles.pseudosales column has to be added to the sales value.
-            $sumSelect = $sumSelect . ' + articles.pseudosales ';
+            $sumSelect .= ' + articles.pseudosales ';
         }
-        $sumSelect = $sumSelect . ' as sales ';
+        $sumSelect .= ' as sales ';
 
         return $sumSelect;
     }
diff --git a/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Controllers/AlsoBought.php b/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Controllers/AlsoBought.php
index 4d98a525a10..ad74be36b97 100644
--- a/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Controllers/AlsoBought.php
+++ b/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Controllers/AlsoBought.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Shopware_Controllers_Backend_AlsoBought extends Shopware_Controllers_Backend_ExtJs
diff --git a/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Controllers/SimilarShown.php b/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Controllers/SimilarShown.php
index 8e870707b56..0a39c50fe32 100644
--- a/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Controllers/SimilarShown.php
+++ b/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Controllers/SimilarShown.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Shopware_Controllers_Backend_SimilarShown extends Shopware_Controllers_Backend_ExtJs
@@ -33,7 +33,7 @@ class Shopware_Controllers_Backend_SimilarShown extends Shopware_Controllers_Bac
      */
     public function SimilarShown()
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.7.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.7.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         return Shopware()->Container()->get('similarshown');
     }
diff --git a/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Controllers/TopSeller.php b/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Controllers/TopSeller.php
index ecd0cdf4c53..90d9a413ce3 100644
--- a/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Controllers/TopSeller.php
+++ b/engine/Shopware/Plugins/Default/Core/MarketingAggregate/Controllers/TopSeller.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Shopware_Controllers_Backend_TopSeller extends Shopware_Controllers_Backend_ExtJs
@@ -33,7 +33,7 @@ class Shopware_Controllers_Backend_TopSeller extends Shopware_Controllers_Backen
      */
     public function TopSeller()
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.7.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.7.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         return Shopware()->Container()->get('topseller');
     }
diff --git a/engine/Shopware/Plugins/Default/Core/PasswordEncoder/Bootstrap.php b/engine/Shopware/Plugins/Default/Core/PasswordEncoder/Bootstrap.php
index e851b924fbb..b72f76bdc92 100644
--- a/engine/Shopware/Plugins/Default/Core/PasswordEncoder/Bootstrap.php
+++ b/engine/Shopware/Plugins/Default/Core/PasswordEncoder/Bootstrap.php
@@ -1,35 +1,35 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Password\Encoder\PasswordEncoderInterface;
 use Shopware\Components\Password\Manager;
 
 /*
- * @see rfc for argon2 in PHP -> https://wiki.php.net/rfc/argon2_password_hash
+ * @see implementation https://github.com/php/php-src/blob/master/ext/sodium/sodium_pwhash.c#L37
  */
 if (!\defined('PASSWORD_ARGON2_DEFAULT_MEMORY_COST')) {
-    \define('PASSWORD_ARGON2_DEFAULT_MEMORY_COST', 1024); // 1KiB
+    \define('PASSWORD_ARGON2_DEFAULT_MEMORY_COST', 64 << 10); // 1KiB
 }
 
 if (!\defined('PASSWORD_ARGON2_DEFAULT_TIME_COST')) {
@@ -64,32 +64,41 @@ public function install()
         return true;
     }
 
+    /**
+     * @return array<string, int>
+     */
     public function getArgon2Options(): array
     {
         $config = $this->Config();
 
         return [
-            'memory_cost' => $config['argon2MemoryCost'],
-            'time_cost' => $config['argon2TimeCost'],
-            'threads' => $config['argon2Threads'],
+            'memory_cost' => (int) $config['argon2MemoryCost'],
+            'time_cost' => (int) $config['argon2TimeCost'],
+            'threads' => (int) $config['argon2Threads'],
         ];
     }
 
+    /**
+     * @return array<string, int>
+     */
     public function getBcryptOptions(): array
     {
         $config = $this->Config();
 
         return [
-            'cost' => $config['bcryptCost'],
+            'cost' => (int) $config['bcryptCost'],
         ];
     }
 
+    /**
+     * @return array<string, int>
+     */
     public function getSha256Options(): array
     {
         $config = $this->Config();
 
         return [
-            'iterations' => $config['sha256iterations'],
+            'iterations' => (int) $config['sha256iterations'],
             'salt_len' => 22,
         ];
     }
@@ -120,6 +129,8 @@ public function onInitResourcePasswordEncoder(Enlight_Event_EventArgs $args): Ma
 
     /**
      * This method registers shopware's default hash algorithm
+     *
+     * @return PasswordEncoderInterface[]
      */
     public function onAddEncoder(Enlight_Event_EventArgs $args): array
     {
@@ -179,7 +190,7 @@ protected function createForm(): void
         $form->setElement('number', 'argon2MemoryCost', [
             'description' => 'Ein höherer Speicherverbrauch macht es einem möglichen Angreifer schwerer, ein passendes Klartext-Passwort zu erzeugen.',
             'label' => 'Argon2-Speicher',
-            'minValue' => 1 << 20,
+            'minValue' => 1 << 10,
             'maxValue' => 1 << 62,
             'required' => true,
             'value' => PASSWORD_ARGON2_DEFAULT_MEMORY_COST,
diff --git a/engine/Shopware/Plugins/Default/Core/PaymentMethods/Bootstrap.php b/engine/Shopware/Plugins/Default/Core/PaymentMethods/Bootstrap.php
index 37f3c2c3222..b67ea4b6375 100644
--- a/engine/Shopware/Plugins/Default/Core/PaymentMethods/Bootstrap.php
+++ b/engine/Shopware/Plugins/Default/Core/PaymentMethods/Bootstrap.php
@@ -1,27 +1,31 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+use ShopwarePlugin\PaymentMethods\Components\DebitPaymentMethod;
+use ShopwarePlugin\PaymentMethods\Components\GenericPaymentMethod;
+use ShopwarePlugin\PaymentMethods\Components\SepaPaymentMethod;
+
 class Shopware_Plugins_Core_PaymentMethods_Bootstrap extends Shopware_Components_Plugin_Bootstrap
 {
     /**
@@ -96,15 +100,17 @@ public function addPaymentClass(Enlight_Event_EventArgs $args)
 
         $this->Application()->Loader()->registerNamespace('ShopwarePlugin\PaymentMethods\Components', __DIR__ . '/Components/');
 
-        $dirs['debit'] = 'ShopwarePlugin\PaymentMethods\Components\DebitPaymentMethod';
-        $dirs['sepa'] = 'ShopwarePlugin\PaymentMethods\Components\SepaPaymentMethod';
-        $dirs['default'] = 'ShopwarePlugin\PaymentMethods\Components\GenericPaymentMethod';
+        $dirs['debit'] = DebitPaymentMethod::class;
+        $dirs['sepa'] = SepaPaymentMethod::class;
+        $dirs['default'] = GenericPaymentMethod::class;
 
         return $dirs;
     }
 
     /**
      * Add View path to Smarty
+     *
+     * @return void
      */
     public function addPaths(Enlight_Event_EventArgs $arguments)
     {
@@ -117,13 +123,15 @@ public function addPaths(Enlight_Event_EventArgs $arguments)
 
     /**
      * Called when the BackendOrderPostDispatch Event is triggered
+     *
+     * @return void
      */
     public function onBackendOrderPostDispatch(Enlight_Event_EventArgs $args)
     {
         /** @var Enlight_View_Default $view */
         $view = $args->getSubject()->View();
 
-        //if the controller action name equals "load" we have to load all application components
+        // if the controller action name equals "load" we have to load all application components
         if ($args->getRequest()->getActionName() === 'load') {
             $view->addTemplateDir($this->Path() . 'Views/emotion/');
             $view->extendsTemplate(
@@ -137,6 +145,8 @@ public function onBackendOrderPostDispatch(Enlight_Event_EventArgs $args)
 
     /**
      * Called when the BackendCustomerPostDispatch Event is triggered
+     *
+     * @return void
      */
     public function onBackendCustomerPostDispatch(Enlight_Event_EventArgs $args)
     {
@@ -159,7 +169,7 @@ public function onBackendCustomerPostDispatch(Enlight_Event_EventArgs $args)
     /**
      * Registers all necessary events and hooks.
      */
-    private function subscribeEvents()
+    private function subscribeEvents(): void
     {
         $this->subscribeEvent(
             'Shopware_Modules_Admin_InitiatePaymentClass_AddClass',
diff --git a/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/BasePaymentMethod.php b/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/BasePaymentMethod.php
index 58a611ba3d2..3bfbc26cf2c 100644
--- a/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/BasePaymentMethod.php
+++ b/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/BasePaymentMethod.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace ShopwarePlugin\PaymentMethods\Components;
@@ -70,7 +70,7 @@ abstract public function getCurrentPaymentDataAsArray($userId);
      * @param int $userId    The User/Customer Id associated with the current payment
      * @param int $paymentId The Payment Method Id associated with the current payment
      *
-     * @return true|null
+     * @return true
      */
     abstract public function createPaymentInstance($orderId, $userId, $paymentId);
 }
diff --git a/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/DebitPaymentMethod.php b/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/DebitPaymentMethod.php
index 188d8b9dc6f..0d9338bb887 100644
--- a/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/DebitPaymentMethod.php
+++ b/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/DebitPaymentMethod.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace ShopwarePlugin\PaymentMethods\Components;
@@ -27,6 +27,10 @@
 use DateTime;
 use Doctrine\ORM\AbstractQuery;
 use Enlight_Controller_Request_Request;
+use Shopware\Models\Customer\Customer;
+use Shopware\Models\Customer\PaymentData;
+use Shopware\Models\Order\Order;
+use Shopware\Models\Payment\Payment;
 
 /**
  * Replacement class for legacy core/paymentmeans/debit.php class.
@@ -49,7 +53,7 @@ public function validate($paymentData)
         ];
 
         foreach ($fields as $field) {
-            $value = $paymentData[$field] ?: '';
+            $value = $paymentData[$field] ?? '';
             $value = trim($value);
 
             if (empty($value)) {
@@ -77,7 +81,7 @@ public function savePaymentData($userId, Enlight_Controller_Request_Request $req
     {
         $lastPayment = $this->getCurrentPaymentDataAsArray($userId);
 
-        $paymentMean = Shopware()->Models()->getRepository('\Shopware\Models\Payment\Payment')->
+        $paymentMean = Shopware()->Models()->getRepository(Payment::class)->
             getActivePaymentsQuery(['name' => 'debit'])->getOneOrNullResult(AbstractQuery::HYDRATE_ARRAY);
 
         $data = [
@@ -108,19 +112,19 @@ public function savePaymentData($userId, Enlight_Controller_Request_Request $req
      */
     public function getCurrentPaymentDataAsArray($userId)
     {
-        $paymentData = Shopware()->Models()->getRepository('\Shopware\Models\Customer\PaymentData')
+        $paymentData = Shopware()->Models()->getRepository(PaymentData::class)
             ->getCurrentPaymentDataQueryBuilder($userId, 'debit')->getQuery()->getOneOrNullResult(AbstractQuery::HYDRATE_ARRAY);
 
         if (isset($paymentData)) {
-            $arrayData = [
+            return [
                 'sDebitAccount' => $paymentData['accountNumber'],
                 'sDebitBankcode' => $paymentData['bankCode'],
                 'sDebitBankName' => $paymentData['bankName'],
                 'sDebitBankHolder' => $paymentData['accountHolder'],
             ];
-
-            return $arrayData;
         }
+
+        return null;
     }
 
     /**
@@ -130,16 +134,19 @@ public function createPaymentInstance($orderId, $userId, $paymentId)
     {
         $orderAmount = Shopware()->Models()->createQueryBuilder()
             ->select('orders.invoiceAmount')
-            ->from('Shopware\Models\Order\Order', 'orders')
+            ->from(Order::class, 'orders')
             ->where('orders.id = ?1')
             ->setParameter(1, $orderId)
             ->getQuery()
             ->getSingleScalarResult();
 
-        $addressData = Shopware()->Models()->getRepository('Shopware\Models\Customer\Customer')
+        $addressData = Shopware()->Models()->getRepository(Customer::class)
             ->find($userId)->getDefaultBillingAddress();
 
         $debitData = $this->getCurrentPaymentDataAsArray($userId);
+        if (!\is_array($debitData)) {
+            $debitData = [];
+        }
 
         $date = new DateTime();
         $data = [
diff --git a/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/GenericPaymentMethod.php b/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/GenericPaymentMethod.php
index 44d54bf39fd..0ada76fb77b 100644
--- a/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/GenericPaymentMethod.php
+++ b/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/GenericPaymentMethod.php
@@ -1,31 +1,33 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace ShopwarePlugin\PaymentMethods\Components;
 
 use DateTime;
 use Enlight_Controller_Request_Request;
+use Shopware\Models\Customer\Customer;
+use Shopware\Models\Order\Order;
 
 /**
  * Used for all payment methods that require no specific logic
@@ -45,7 +47,7 @@ public function validate($paymentData)
      */
     public function savePaymentData($userId, Enlight_Controller_Request_Request $request)
     {
-        //nothing to do, no return expected
+        // nothing to do, no return expected
     }
 
     /**
@@ -53,7 +55,7 @@ public function savePaymentData($userId, Enlight_Controller_Request_Request $req
      */
     public function getCurrentPaymentDataAsArray($userId)
     {
-        //nothing to do, array expected
+        // nothing to do, array expected
         return [];
     }
 
@@ -64,13 +66,13 @@ public function createPaymentInstance($orderId, $userId, $paymentId)
     {
         $orderAmount = Shopware()->Models()->createQueryBuilder()
             ->select('orders.invoiceAmount')
-            ->from('Shopware\Models\Order\Order', 'orders')
+            ->from(Order::class, 'orders')
             ->where('orders.id = ?1')
             ->setParameter(1, $orderId)
             ->getQuery()
             ->getSingleScalarResult();
 
-        $addressData = Shopware()->Models()->getRepository('Shopware\Models\Customer\Customer')
+        $addressData = Shopware()->Models()->getRepository(Customer::class)
             ->find($userId)->getDefaultBillingAddress();
 
         $date = new DateTime();
diff --git a/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php b/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php
index a392b8c939b..e04a6249b39 100644
--- a/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php
+++ b/engine/Shopware/Plugins/Default/Core/PaymentMethods/Components/SepaPaymentMethod.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace ShopwarePlugin\PaymentMethods\Components;
@@ -31,7 +32,10 @@
 use Exception;
 use Mpdf\Mpdf;
 use Shopware\Bundle\MailBundle\Service\LogEntryBuilder;
+use Shopware\Models\Customer\Customer;
 use Shopware\Models\Customer\PaymentData;
+use Shopware\Models\Order\Order;
+use Shopware\Models\Payment\Payment;
 use Zend_Mime;
 
 /**
@@ -47,13 +51,13 @@ public function validate($paymentData)
         $sErrorFlag = [];
         $sErrorMessages = [];
 
-        if (!$paymentData['sSepaIban'] || trim($paymentData['sSepaIban']) === '') {
+        if (empty($paymentData['sSepaIban']) || trim($paymentData['sSepaIban']) === '') {
             $sErrorFlag['sSepaIban'] = true;
         }
-        if (Shopware()->Config()->get('sepaShowBic') && Shopware()->Config()->get('sepaRequireBic') && (!$paymentData['sSepaBic'] || trim($paymentData['sSepaBic']) === '')) {
+        if (Shopware()->Config()->get('sepaShowBic') && Shopware()->Config()->get('sepaRequireBic') && (empty($paymentData['sSepaBic']) || trim($paymentData['sSepaBic']) === '')) {
             $sErrorFlag['sSepaBic'] = true;
         }
-        if (Shopware()->Config()->get('sepaShowBankName') && Shopware()->Config()->get('sepaRequireBankName') && (!$paymentData['sSepaBankName'] || trim($paymentData['sSepaBankName']) === '')) {
+        if (Shopware()->Config()->get('sepaShowBankName') && Shopware()->Config()->get('sepaRequireBankName') && (empty($paymentData['sSepaBankName']) || trim($paymentData['sSepaBankName']) === '')) {
             $sErrorFlag['sSepaBankName'] = true;
         }
 
@@ -66,7 +70,7 @@ public function validate($paymentData)
             $sErrorMessages[] = Shopware()->Snippets()->getNamespace('frontend/account/internalMessages')->get('ErrorFillIn', 'Please fill in all red fields');
         }
 
-        if ($paymentData['sSepaIban'] && !$this->validateIBAN($paymentData['sSepaIban'])) {
+        if (isset($paymentData['sSepaIban']) && !$this->validateIBAN((string) $paymentData['sSepaIban'])) {
             $sErrorMessages[] = Shopware()->Snippets()->getNamespace('frontend/plugins/payment/sepa')->get('ErrorIBAN', 'Invalid IBAN');
             $sErrorFlag['sSepaIban'] = true;
         }
@@ -88,13 +92,13 @@ public function savePaymentData($userId, Enlight_Controller_Request_Request $req
     {
         $lastPayment = $this->getCurrentPaymentDataAsArray($userId);
 
-        $paymentMean = Shopware()->Models()->getRepository(\Shopware\Models\Payment\Payment::class)->
+        $paymentMean = Shopware()->Models()->getRepository(Payment::class)->
         getAllPaymentsQuery(['name' => 'Sepa'])->getOneOrNullResult(AbstractQuery::HYDRATE_ARRAY);
 
         $data = [
             'use_billing_data' => ($request->getParam('sSepaUseBillingData') === 'true' ? 1 : 0),
             'bankname' => $request->getParam('sSepaBankName'),
-            'iban' => preg_replace('/\s+|\./', '', $request->getParam('sSepaIban')),
+            'iban' => preg_replace('/\s+|\./', '', (string) $request->getParam('sSepaIban')),
             'bic' => $request->getParam('sSepaBic'),
         ];
 
@@ -153,17 +157,26 @@ public function getCurrentPaymentDataAsArray($userId)
      */
     public function createPaymentInstance($orderId, $userId, $paymentId)
     {
+        $userId = (int) $userId;
         $order = Shopware()->Models()->createQueryBuilder()
             ->select(['orders.invoiceAmount', 'orders.number'])
-            ->from('Shopware\Models\Order\Order', 'orders')
+            ->from(Order::class, 'orders')
             ->where('orders.id = ?1')
             ->setParameter(1, $orderId)
             ->getQuery()
             ->getOneOrNullResult(AbstractQuery::HYDRATE_ARRAY);
 
-        $addressData = Shopware()->Models()->getRepository('Shopware\Models\Customer\Customer')
+        $addressData = Shopware()->Models()->getRepository(Customer::class)
             ->find($userId)->getDefaultBillingAddress();
         $paymentData = $this->getCurrentPaymentDataAsArray($userId);
+        if (!\is_array($paymentData)) {
+            $paymentData = [
+                'sSepaUseBillingData' => null,
+                'sSepaBankName' => null,
+                'sSepaBic' => null,
+                'sSepaIban' => null,
+            ];
+        }
 
         $date = new DateTime();
         $data = [
@@ -200,13 +213,16 @@ public function createPaymentInstance($orderId, $userId, $paymentId)
         return true;
     }
 
-    private function validateIBAN($value)
+    private function validateIBAN(string $value): bool
     {
-        if ($value === null || $value === '') {
+        if ($value === '') {
             return false;
         }
 
         $teststring = preg_replace('/\s+|\./', '', $value);
+        if (!\is_string($teststring)) {
+            return false;
+        }
 
         if (\strlen($teststring) < 4) {
             return false;
@@ -217,8 +233,8 @@ private function validateIBAN($value)
             . (string) (\ord($teststring[1]) - 55)
             . substr($teststring, 2, 2);
 
-        $teststring = (string) preg_replace_callback('/[A-Za-z]/', function ($letter) {
-            return (int) (\ord(strtolower($letter[0])) - 87);
+        $teststring = (string) preg_replace_callback('/[A-Za-z]/', function ($letter): string {
+            return (string) (\ord(strtolower($letter[0])) - 87);
         }, $teststring);
 
         $rest = 0;
@@ -235,7 +251,10 @@ private function validateIBAN($value)
         return true;
     }
 
-    private function sendSepaEmail($orderNumber, $userId, $data)
+    /**
+     * @param array<string, mixed> $data
+     */
+    private function sendSepaEmail(string $orderNumber, int $userId, array $data): void
     {
         $mail = Shopware()->TemplateMail()->createMail('sORDERSEPAAUTHORIZATION', [
             'paymentInstance' => [
@@ -245,9 +264,9 @@ private function sendSepaEmail($orderNumber, $userId, $data)
             ],
         ]);
 
-        $customerEmail = Shopware()->Models()->createQueryBuilder()
+        $customerEmail = (string) Shopware()->Models()->createQueryBuilder()
             ->select('customer.email')
-            ->from('Shopware\Models\Customer\Customer', 'customer')
+            ->from(Customer::class, 'customer')
             ->where('customer.id = ?1')
             ->setParameter(1, $userId)
             ->getQuery()
@@ -299,7 +318,7 @@ private function sendSepaEmail($orderNumber, $userId, $data)
         try {
             $mail->send();
         } catch (Exception $e) {
-            //TODO: Handle email sending failure
+            // TODO: Handle email sending failure
         }
     }
 }
diff --git a/engine/Shopware/Plugins/Default/Core/PaymentMethods/Views/emotion/backend/customer/payment_methods/controller/detail.js b/engine/Shopware/Plugins/Default/Core/PaymentMethods/Views/emotion/backend/customer/payment_methods/controller/detail.js
index 7cab42fca99..d2803df5e65 100644
--- a/engine/Shopware/Plugins/Default/Core/PaymentMethods/Views/emotion/backend/customer/payment_methods/controller/detail.js
+++ b/engine/Shopware/Plugins/Default/Core/PaymentMethods/Views/emotion/backend/customer/payment_methods/controller/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/engine/Shopware/Plugins/Default/Core/PaymentMethods/Views/emotion/backend/order/payment_methods/controller/detail.js b/engine/Shopware/Plugins/Default/Core/PaymentMethods/Views/emotion/backend/order/payment_methods/controller/detail.js
index 18584b4e24f..17b4bf05414 100644
--- a/engine/Shopware/Plugins/Default/Core/PaymentMethods/Views/emotion/backend/order/payment_methods/controller/detail.js
+++ b/engine/Shopware/Plugins/Default/Core/PaymentMethods/Views/emotion/backend/order/payment_methods/controller/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/engine/Shopware/Plugins/Default/Core/PostFilter/Bootstrap.php b/engine/Shopware/Plugins/Default/Core/PostFilter/Bootstrap.php
index f56883749ef..6a2bdfb6d1a 100644
--- a/engine/Shopware/Plugins/Default/Core/PostFilter/Bootstrap.php
+++ b/engine/Shopware/Plugins/Default/Core/PostFilter/Bootstrap.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\DBAL\Connection;
@@ -87,9 +87,9 @@ public function onFilterRender(Enlight_Event_EventArgs $args)
                     // Remove comments
                     '#/\*.*?\*/#ms' => '',
                     '#^\s*//.*$#m' => '',
-                    //'#\n\s+#ms' => '',
+                    // '#\n\s+#ms' => '',
                     '#^\s+#ms' => '',
-                    //'#\s+$#ms' => '',
+                    // '#\s+$#ms' => '',
                 ];
 
                 return preg_replace(array_keys($expressions), array_values($expressions), $source);
@@ -147,7 +147,7 @@ public function &filterSource($source)
     /**
      * Rewrite source link
      *
-     * @see \Shopware_Controllers_Backend_Newsletter::outputFilter
+     * @see Shopware_Controllers_Backend_Newsletter::outputFilter
      *
      * @param array $src
      *
diff --git a/engine/Shopware/Plugins/Default/Core/RebuildIndex/Bootstrap.php b/engine/Shopware/Plugins/Default/Core/RebuildIndex/Bootstrap.php
index a117a900757..09323911822 100644
--- a/engine/Shopware/Plugins/Default/Core/RebuildIndex/Bootstrap.php
+++ b/engine/Shopware/Plugins/Default/Core/RebuildIndex/Bootstrap.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Bundle\SearchBundleDBAL\SearchTerm\SearchIndexer;
diff --git a/engine/Shopware/Plugins/Default/Core/RebuildIndex/Components/SeoIndex.php b/engine/Shopware/Plugins/Default/Core/RebuildIndex/Components/SeoIndex.php
index 87f69a310f2..0067cc32923 100644
--- a/engine/Shopware/Plugins/Default/Core/RebuildIndex/Components/SeoIndex.php
+++ b/engine/Shopware/Plugins/Default/Core/RebuildIndex/Components/SeoIndex.php
@@ -1,30 +1,29 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\ORM\NonUniqueResultException;
 use Doctrine\ORM\NoResultException;
-use Doctrine\ORM\Query;
 use Shopware\Bundle\ContentTypeBundle\Services\TypeProvider;
 use Shopware\Components\ShopRegistrationServiceInterface;
 use Shopware\Models\Article\Supplier;
@@ -179,7 +178,6 @@ public function countBlogs($shopId)
         $this->registerShop($shopId);
 
         // Get blog categories
-        /** @var Query $query */
         $query = Shopware()->Models()->getRepository(Category::class)->getBlogCategoriesByParentQuery(Shopware()->Shop()->get('parentID'));
         $blogCategories = $query->getArrayResult();
 
diff --git a/engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/SearchIndex.php b/engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/SearchIndex.php
index bf2c73233f8..e243b79115d 100644
--- a/engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/SearchIndex.php
+++ b/engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/SearchIndex.php
@@ -1,27 +1,29 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+use Shopware\Bundle\SearchBundleDBAL\SearchTerm\SearchIndexer;
+
 class Shopware_Controllers_Backend_SearchIndex extends Shopware_Controllers_Backend_ExtJs
 {
     /**
@@ -31,7 +33,7 @@ public function buildAction()
     {
         @set_time_limit(1200);
 
-        $indexer = $this->get(\Shopware\Bundle\SearchBundleDBAL\SearchTerm\SearchIndexer::class);
+        $indexer = $this->get(SearchIndexer::class);
         $indexer->build();
 
         $this->View()->assign(['success' => true]);
diff --git a/engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/Seo.php b/engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/Seo.php
index 24bbd026931..f323e38e987 100644
--- a/engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/Seo.php
+++ b/engine/Shopware/Plugins/Default/Core/RebuildIndex/Controllers/Seo.php
@@ -1,27 +1,30 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface;
+use Shopware\Models\Shop\Shop;
+
 class Shopware_Controllers_Backend_Seo extends Shopware_Controllers_Backend_ExtJs
 {
     /**
@@ -33,7 +36,7 @@ class Shopware_Controllers_Backend_Seo extends Shopware_Controllers_Backend_ExtJ
      */
     public function SeoIndex()
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.7.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.7.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         return Shopware()->Container()->get('seoindex');
     }
@@ -47,7 +50,7 @@ public function SeoIndex()
      */
     public function RewriteTable()
     {
-        trigger_error(sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.7.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
+        trigger_error(\sprintf('%s:%s is deprecated since Shopware 5.6 and will be private with 5.7.', __CLASS__, __METHOD__), E_USER_DEPRECATED);
 
         return Shopware()->Modules()->RewriteTable();
     }
@@ -166,7 +169,7 @@ public function seoBlogAction()
         $shop = $this->SeoIndex()->registerShop($shopId);
 
         $this->RewriteTable()->baseSetup();
-        $context = $this->get(\Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface::class)->createShopContext($shopId);
+        $context = $this->get(ContextServiceInterface::class)->createShopContext($shopId);
         $this->RewriteTable()->sCreateRewriteTableBlog($offset, $limit, $context);
 
         $this->View()->assign([
@@ -267,7 +270,7 @@ public function seoSupplierAction()
 
         // Create shop
         $this->SeoIndex()->registerShop($shopId);
-        $context = $this->get(\Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface::class)->createShopContext($shopId);
+        $context = $this->get(ContextServiceInterface::class)->createShopContext($shopId);
 
         // Make sure a template is available
         $this->RewriteTable()->baseSetup();
@@ -285,7 +288,7 @@ public function seoContentTypeAction(): void
 
         // Create shop
         $this->SeoIndex()->registerShop($shopId);
-        $context = $this->get(\Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface::class)->createShopContext($shopId);
+        $context = $this->get(ContextServiceInterface::class)->createShopContext($shopId);
 
         // Make sure a template is available
         $this->RewriteTable()->baseSetup();
@@ -301,9 +304,9 @@ public function seoContentTypeAction(): void
      * passed shop id. The offset and limit parameter are used
      * to update only an offset of article urls.
      *
-     * @param int                        $offset
-     * @param int                        $limit
-     * @param \Shopware\Models\Shop\Shop $shop
+     * @param int  $offset
+     * @param int  $limit
+     * @param Shop $shop
      */
     protected function seoArticle($offset, $limit, $shop)
     {
@@ -318,7 +321,7 @@ protected function seoArticle($offset, $limit, $shop)
         $sql = $this->RewriteTable()->getSeoArticleQuery();
         $sql = Shopware()->Db()->limit($sql, $limit, $offset);
 
-        $shopFallbackId = ($shop->getFallback() instanceof \Shopware\Models\Shop\Shop) ? $shop->getFallback()->getId() : null;
+        $shopFallbackId = ($shop->getFallback() instanceof Shop) ? $shop->getFallback()->getId() : null;
 
         $articles = Shopware()->Db()->fetchAll($sql, [
             $shop->get('parentID'),
diff --git a/engine/Shopware/Plugins/Default/Core/RestApi/Bootstrap.php b/engine/Shopware/Plugins/Default/Core/RestApi/Bootstrap.php
index 5fe396f0682..669b3cd6438 100644
--- a/engine/Shopware/Plugins/Default/Core/RestApi/Bootstrap.php
+++ b/engine/Shopware/Plugins/Default/Core/RestApi/Bootstrap.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Model\ModelManager;
@@ -77,6 +77,8 @@ public function afterInit()
 
     /**
      * Listener method for the Enlight_Controller_Front_DispatchLoopStartup event.
+     *
+     * @return void
      */
     public function onDispatchLoopStartup(Enlight_Controller_EventArgs $args)
     {
@@ -95,6 +97,8 @@ public function onDispatchLoopStartup(Enlight_Controller_EventArgs $args)
 
     /**
      * This pre-dispatch event-hook checks permissions
+     *
+     * @return void
      */
     public function onFrontPreDispatch(Enlight_Controller_EventArgs $args)
     {
@@ -160,7 +164,7 @@ public function onFrontPreDispatch(Enlight_Controller_EventArgs $args)
     public function onInitResourceAuth(Enlight_Event_EventArgs $args)
     {
         if (!$this->isApiCall) {
-            return;
+            return null;
         }
 
         $adapter = new Zend_Auth_Adapter_Http([
diff --git a/engine/Shopware/Plugins/Default/Core/RestApi/Components/BasicAuthResolver.php b/engine/Shopware/Plugins/Default/Core/RestApi/Components/BasicAuthResolver.php
index abeb3f1eb51..f3e793f558f 100644
--- a/engine/Shopware/Plugins/Default/Core/RestApi/Components/BasicAuthResolver.php
+++ b/engine/Shopware/Plugins/Default/Core/RestApi/Components/BasicAuthResolver.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace ShopwarePlugins\RestApi\Components;
diff --git a/engine/Shopware/Plugins/Default/Core/RestApi/Components/Router.php b/engine/Shopware/Plugins/Default/Core/RestApi/Components/Router.php
index beabd13e851..6f36955ffca 100644
--- a/engine/Shopware/Plugins/Default/Core/RestApi/Components/Router.php
+++ b/engine/Shopware/Plugins/Default/Core/RestApi/Components/Router.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace ShopwarePlugins\RestApi\Components;
diff --git a/engine/Shopware/Plugins/Default/Core/RestApi/Components/StaticResolver.php b/engine/Shopware/Plugins/Default/Core/RestApi/Components/StaticResolver.php
index f87dd23e749..701d462efb1 100644
--- a/engine/Shopware/Plugins/Default/Core/RestApi/Components/StaticResolver.php
+++ b/engine/Shopware/Plugins/Default/Core/RestApi/Components/StaticResolver.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace ShopwarePlugins\RestApi\Components;
diff --git a/engine/Shopware/Plugins/Default/Core/Router/Bootstrap.php b/engine/Shopware/Plugins/Default/Core/Router/Bootstrap.php
index 05344d165d4..a617b0d39e5 100644
--- a/engine/Shopware/Plugins/Default/Core/Router/Bootstrap.php
+++ b/engine/Shopware/Plugins/Default/Core/Router/Bootstrap.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Enlight_Controller_Request_Request as Request;
@@ -89,7 +89,7 @@ public function onRouteStartup(Enlight_Controller_EventArgs $args)
                 $shop->setBasePath('');
             }
 
-            $request->setSecure();
+            $request->setSecure($shop->getSecure());
             $request->setBasePath($shop->getBasePath());
             $request->setBaseUrl($shop->getBaseUrl());
             $request->setHttpHost($shop->getHost());
@@ -237,11 +237,11 @@ protected function upgradeShop($request, $response)
             }
         }
 
-        //currency switch
+        // currency switch
         if ($cookieKey === 'currency') {
             $path = rtrim((string) $shop->getBasePath(), '/') . '/';
             $response->headers->setCookie(new Cookie($cookieKey, $cookieValue, 0, $path, null, $request->isSecure()));
-            $url = sprintf(
+            $url = \sprintf(
                 '%s://%s%s',
                 $request->getScheme(),
                 $request->getHttpHost(),
@@ -389,8 +389,8 @@ protected function getNewShopUrl(Request $request, Shop $newShop)
             $url = '/' . $url;
         }
 
-        //build full redirect url to allow host switches
-        return sprintf(
+        // build full redirect url to allow host switches
+        return \sprintf(
             '%s://%s%s%s',
             $request->getScheme(),
             $host,
@@ -406,13 +406,13 @@ protected function getNewShopUrl(Request $request, Shop $newShop)
      */
     protected function shouldRedirect(Request $request, Shop $shop)
     {
-        return //for example: template preview, direct shop selection via url
+        return // for example: template preview, direct shop selection via url
             (
                 $request->isGet()
                 && $request->getQuery('__shop') !== null
                 && (int) $request->getQuery('__shop') !== (int) $shop->getId()
             )
-            //for example: shop language switch
+            // for example: shop language switch
             || (
                 $request->isPost()
                 && $request->getPost('__shop') !== null
@@ -476,7 +476,7 @@ private function removePartOfUrl(string $requestUri, string $url): string
     private function validateShop(Shop $shop): void
     {
         if (!$shop->getCustomerGroup() instanceof CustomerGroup) {
-            throw new RuntimeException(sprintf("Shop '%s (id: %s)' has no customer group.", $shop->getName(), $shop->getId()));
+            throw new RuntimeException(\sprintf("Shop '%s (id: %s)' has no customer group.", $shop->getName(), $shop->getId()));
         }
 
         $shop->getCurrency();
@@ -484,11 +484,11 @@ private function validateShop(Shop $shop): void
 
         $mainShop = $shop->getMain() ?? $shop;
         if (!$mainShop->getTemplate()) {
-            throw new RuntimeException(sprintf("Shop '%s (id: %s)' has no template.", $shop->getName(), $shop->getId()));
+            throw new RuntimeException(\sprintf("Shop '%s (id: %s)' has no template.", $shop->getName(), $shop->getId()));
         }
 
         if (!$mainShop->getDocumentTemplate()) {
-            throw new RuntimeException(sprintf("Shop '%s (id: %s)' has no document template.", $shop->getName(), $shop->getId()));
+            throw new RuntimeException(\sprintf("Shop '%s (id: %s)' has no document template.", $shop->getName(), $shop->getId()));
         }
     }
 
diff --git a/engine/Shopware/Plugins/Default/Core/System/Bootstrap.php b/engine/Shopware/Plugins/Default/Core/System/Bootstrap.php
index fc1d5bbc9a5..9ff4e6562b0 100644
--- a/engine/Shopware/Plugins/Default/Core/System/Bootstrap.php
+++ b/engine/Shopware/Plugins/Default/Core/System/Bootstrap.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
@@ -53,6 +53,8 @@ public function install()
     /**
      * Listener method of the Enlight_Controller_Front_DispatchLoopShutdown event.
      * If the request is from a Bot, discard the session
+     *
+     * @return void
      */
     public function onDispatchLoopShutdown(Enlight_Controller_EventArgs $args)
     {
@@ -67,7 +69,7 @@ public function onDispatchLoopShutdown(Enlight_Controller_EventArgs $args)
 
         /** @var Shopware_Plugins_Frontend_Statistics_Bootstrap $plugin */
         $plugin = Shopware()->Plugins()->Frontend()->Statistics();
-        if ($plugin->checkIsBot($args->getRequest()->getHeader('USER_AGENT'))) {
+        if ($plugin->checkIsBot($args->getRequest()->getHeader('USER_AGENT') ?: '')) {
             $this->get('session')->invalidate();
         }
     }
@@ -75,7 +77,7 @@ public function onDispatchLoopShutdown(Enlight_Controller_EventArgs $args)
     /**
      * Event listener method
      *
-     * @return \sSystem
+     * @return sSystem
      */
     public function onInitResourceSystem(Enlight_Event_EventArgs $args)
     {
@@ -97,7 +99,7 @@ public function onInitResourceSystem(Enlight_Event_EventArgs $args)
             if ($request !== null && Shopware()->Session()->get('Bot') === null) {
                 /** @var Shopware_Plugins_Frontend_Statistics_Bootstrap $plugin */
                 $plugin = Shopware()->Plugins()->Frontend()->Statistics();
-                Shopware()->Session()->set('Bot', $plugin->checkIsBot($request->getHeader('USER_AGENT')));
+                Shopware()->Session()->set('Bot', $plugin->checkIsBot($request->getHeader('USER_AGENT') ?: ''));
             }
             $system->sBotSession = Shopware()->Session()->get('Bot');
         }
@@ -124,7 +126,7 @@ public function onInitResourceSystem(Enlight_Event_EventArgs $args)
                 ', [$system->sUSERGROUP]);
             }
             if (empty($system->sUSERGROUPDATA['tax']) && !empty($system->sUSERGROUPDATA['id'])) {
-                $config['sARTICLESOUTPUTNETTO'] = 1; //Old template
+                $config['sARTICLESOUTPUTNETTO'] = 1; // Old template
                 Shopware()->Session()->set('sOutputNet', true);
             } else {
                 Shopware()->Session()->set('sOutputNet', false);
@@ -146,7 +148,7 @@ public function onInitResourceSystem(Enlight_Event_EventArgs $args)
     /**
      * Event listener method
      *
-     * @return \Shopware_Components_Modules
+     * @return Shopware_Components_Modules
      */
     public static function onInitResourceModules(Enlight_Event_EventArgs $args)
     {
diff --git a/engine/Shopware/Plugins/Default/Core/ViewportForward/Bootstrap.php b/engine/Shopware/Plugins/Default/Core/ViewportForward/Bootstrap.php
index d562ce9157f..cfcb9d9e5bb 100644
--- a/engine/Shopware/Plugins/Default/Core/ViewportForward/Bootstrap.php
+++ b/engine/Shopware/Plugins/Default/Core/ViewportForward/Bootstrap.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Shopware_Plugins_Core_ViewportForward_Bootstrap extends Shopware_Components_Plugin_Bootstrap
@@ -66,9 +66,9 @@ public static function onPreDispatch(Enlight_Event_EventArgs $args)
                 break;
             case 'supplier':
                 $url = $args->getSubject()->Router()->assemble([
-                        'controller' => 'listing',
-                        'action' => 'manufacturer',
-                        'sSupplier' => $request->getParam('sSupplier'),
+                    'controller' => 'listing',
+                    'action' => 'manufacturer',
+                    'sSupplier' => $request->getParam('sSupplier'),
                 ]);
                 $args->getSubject()->Response()->setRedirect($url, 301);
                 break;
diff --git a/engine/Shopware/Plugins/Default/Frontend/AdvancedMenu/Bootstrap.php b/engine/Shopware/Plugins/Default/Frontend/AdvancedMenu/Bootstrap.php
index a2b59714123..c49bfe06ef8 100644
--- a/engine/Shopware/Plugins/Default/Frontend/AdvancedMenu/Bootstrap.php
+++ b/engine/Shopware/Plugins/Default/Frontend/AdvancedMenu/Bootstrap.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\Common\Collections\ArrayCollection;
@@ -89,7 +88,7 @@ public function onCollectLessFiles(): ArrayCollection
     }
 
     /**
-     * @return ArrayCollection<int, string>
+     * @return ArrayCollection<int, literal-string&non-falsy-string>
      */
     public function onCollectJavascriptFiles(): ArrayCollection
     {
@@ -135,11 +134,11 @@ public function getAdvancedMenu($category, $activeCategoryId, $depth)
     {
         $context = $this->get(ContextServiceInterface::class)->getShopContext();
 
-        $cacheKey = sprintf(
+        $cacheKey = \sprintf(
             'Shopware_AdvancedMenu_Tree_%s_%s_%s',
             $context->getShop()->getId(),
             $category,
-            ($this->Config()->get('includeCustomergroup') ? $context->getCurrentCustomerGroup()->getId() : 'x')
+            $this->Config()->get('includeCustomergroup') ? $context->getCurrentCustomerGroup()->getId() : 'x'
         );
 
         $cacheKey = $this->get('events')->filter('Shopware_Plugins_AdvancedMenu_CacheKey', $cacheKey, [
diff --git a/engine/Shopware/Plugins/Default/Frontend/CronRefresh/Bootstrap.php b/engine/Shopware/Plugins/Default/Frontend/CronRefresh/Bootstrap.php
index 6d40c722137..4bf61e1f787 100644
--- a/engine/Shopware/Plugins/Default/Frontend/CronRefresh/Bootstrap.php
+++ b/engine/Shopware/Plugins/Default/Frontend/CronRefresh/Bootstrap.php
@@ -1,27 +1,30 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+use Doctrine\DBAL\Connection;
+use Shopware\Bundle\SearchBundleDBAL\SearchTerm\SearchIndexer;
+
 /**
  * Shopware Plugin Frontend CronRefresh
  *
@@ -51,11 +54,10 @@ public function install()
      */
     public function onCronJobClearing(Shopware_Components_Cron_CronJob $job)
     {
-        /** @var \Doctrine\DBAL\Connection $connection */
-        $connection = $this->get(\Doctrine\DBAL\Connection::class);
+        $connection = $this->get(Connection::class);
 
         // Delete all entries from lastarticles older than 30 days
-        $lastArticleTime = $this->get(\Shopware_Components_Config::class)->get('lastarticles_time', 30);
+        $lastArticleTime = $this->get(Shopware_Components_Config::class)->get('lastarticles_time', 30);
 
         $sql = "DELETE FROM s_emarketing_lastarticles WHERE `time` < date_add(current_date, INTERVAL -{$lastArticleTime} DAY)";
 
@@ -76,8 +78,8 @@ public function onCronJobClearing(Shopware_Components_Cron_CronJob $job)
         $result = $connection->executeQuery($sql);
         $data['log']['rows'] = $result->rowCount();
 
-        $data['referrer']['rows'] = $this->deleteOldReferrerData($this->get(\Shopware_Components_Config::class)->get('maximumReferrerAge'));
-        $data['article_impression']['rows'] = $this->deleteOldArticleImpressionData($this->get(\Shopware_Components_Config::class)->get('maximumImpressionAge'));
+        $data['referrer']['rows'] = $this->deleteOldReferrerData($this->get(Shopware_Components_Config::class)->get('maximumReferrerAge'));
+        $data['article_impression']['rows'] = $this->deleteOldArticleImpressionData($this->get(Shopware_Components_Config::class)->get('maximumImpressionAge'));
 
         // Delete all entries from s_statistics_pool not from the current day
         $sql = 'DELETE FROM s_statistics_pool WHERE datum != CURDATE()';
@@ -97,7 +99,7 @@ public function onCronJobClearing(Shopware_Components_Cron_CronJob $job)
      */
     public function onCronJobSearch(Shopware_Components_Cron_CronJob $job)
     {
-        $indexer = $this->get(\Shopware\Bundle\SearchBundleDBAL\SearchTerm\SearchIndexer::class);
+        $indexer = $this->get(SearchIndexer::class);
         $indexer->build();
     }
 
@@ -115,12 +117,12 @@ private function deleteOldReferrerData($maximumReferrerAge)
         if ($maximumReferrerAge === 0) {
             $maximumReferrerAge = 90;
         }
-        //negate the value and quote it for the sql statement
+        // negate the value and quote it for the sql statement
         $maximumReferrerAge = (int) $maximumReferrerAge * -1;
         $sql = '
             DELETE FROM s_statistics_referer WHERE `datum` < date_add(current_date, INTERVAL ' . $maximumReferrerAge . ' DAY)
         ';
-        $result = $this->get(\Doctrine\DBAL\Connection::class)->executeQuery($sql);
+        $result = $this->get(Connection::class)->executeQuery($sql);
 
         return $result->rowCount();
     }
@@ -139,12 +141,12 @@ private function deleteOldArticleImpressionData($maximumAge)
         if ($maximumAge === 0) {
             $maximumAge = 90;
         }
-        //negate the value and quote it for the sql statement
+        // negate the value and quote it for the sql statement
         $maximumAge = (int) $maximumAge * -1;
         $sql = '
             DELETE FROM  s_statistics_article_impression WHERE `date` < date_add(current_date, INTERVAL ' . $maximumAge . ' DAY)
         ';
-        $result = $this->get(\Doctrine\DBAL\Connection::class)->executeQuery($sql);
+        $result = $this->get(Connection::class)->executeQuery($sql);
 
         return $result->rowCount();
     }
diff --git a/engine/Shopware/Plugins/Default/Frontend/InputFilter/Bootstrap.php b/engine/Shopware/Plugins/Default/Frontend/InputFilter/Bootstrap.php
index 272e34aceeb..154a9ff7701 100644
--- a/engine/Shopware/Plugins/Default/Frontend/InputFilter/Bootstrap.php
+++ b/engine/Shopware/Plugins/Default/Frontend/InputFilter/Bootstrap.php
@@ -1,32 +1,38 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+use Shopware\Models\Config\Form;
+use voku\helper\AntiXSS;
+
 /**
  * Shopware InputFilter Plugin
  */
 class Shopware_Plugins_Frontend_InputFilter_Bootstrap extends Shopware_Components_Plugin_Bootstrap
 {
+    public const ALLOWED_ATTRIBUTES_KEY = 'allowedAttributes';
+    public const ALLOWED_HTML_TAGS_KEY = 'allowedHtmlTags';
+
     /**
      * @var string
      */
@@ -37,6 +43,50 @@ class Shopware_Plugins_Frontend_InputFilter_Bootstrap extends Shopware_Component
      */
     public $xssRegex = 'javascript:|src\s*=|\bon[a-z]+\s*=|style\s*=|\bdata-\w+(?!\.)\b\s?=?';
 
+    /**
+     * @var array<string, array<string>>
+     */
+    public array $stripTagsWhiteList = [
+        'frontend/account/login' => [
+            'password',
+        ],
+        'frontend/account/savepassword' => [
+            'password',
+            'passwordConfirmation',
+            'currentPassword',
+        ],
+        'frontend/register/ajax_validate_email' => [
+            'password',
+        ],
+        'frontend/register/ajax_validate_password' => [
+            'password',
+        ],
+        'frontend/register/saveregister' => [
+            'password',
+        ],
+        'frontend/account/resetpassword' => [
+            'password',
+            'passwordConfirmation',
+        ],
+        'frontend/account/saveemail' => [
+            'currentPassword',
+        ],
+    ];
+
+    /**
+     * @var array<string, array<string, array<string, array<string>>>>
+     *
+     * usage:
+     *
+     * 'frontend/account/login' => [
+     *      'password' => [
+     *           self::ALLOWED_ATTRIBUTES_KEY => [],
+     *           self::ALLOWED_HTML_TAGS_KEY => []
+     *       ]
+     *   ]
+     */
+    public array $allowanceList = [];
+
     /**
      * @var string
      */
@@ -51,7 +101,7 @@ public function install()
         );
 
         $form = $this->Form();
-        /** @var \Shopware\Models\Config\Form $parent */
+        /** @var Form $parent */
         $parent = $this->Forms()->findOneBy(['name' => 'Core']);
         $form->setParent($parent);
 
@@ -102,10 +152,6 @@ public function onRouteShutdown(Enlight_Controller_EventArgs $args)
             $regex[] = $config->own_filter;
         }
 
-        if (empty($regex)) {
-            return;
-        }
-
         $regex = '#' . implode('|', $regex) . '#msi';
 
         $userParams = $request->getUserParams();
@@ -113,33 +159,6 @@ public function onRouteShutdown(Enlight_Controller_EventArgs $args)
             &$_GET, &$_POST, &$_COOKIE, &$_REQUEST, &$_SERVER, &$userParams,
         ];
 
-        $whiteList = [
-            'frontend/account/login' => [
-                'password',
-            ],
-            'frontend/account/savepassword' => [
-                'password',
-                'passwordConfirmation',
-                'currentPassword',
-            ],
-            'frontend/register/ajax_validate_email' => [
-                'password',
-            ],
-            'frontend/register/ajax_validate_password' => [
-                'password',
-            ],
-            'frontend/register/saveregister' => [
-                'password',
-            ],
-            'frontend/account/resetpassword' => [
-                'password',
-                'passwordConfirmation',
-            ],
-            'frontend/account/saveemail' => [
-                'currentPassword',
-            ],
-        ];
-
         $route = strtolower(
             implode(
                 '/',
@@ -147,14 +166,17 @@ public function onRouteShutdown(Enlight_Controller_EventArgs $args)
             )
         );
 
-        $whiteList = \array_key_exists($route, $whiteList) ? $whiteList[$route] : [];
+        $stripTagsWhiteList = \array_key_exists($route, $this->stripTagsWhiteList) ? $this->stripTagsWhiteList[$route] : [];
+        $allowanceList = \array_key_exists($route, $this->allowanceList) ? $this->allowanceList[$route] : [];
         foreach ($process as $key => $val) {
             foreach ($val as $k => $v) {
                 unset($process[$key][$k]);
-                $stripTags = \in_array($k, $whiteList) ? false : $stripTagsConf;
+                $stripTags = \in_array($k, $stripTagsWhiteList) ? false : $stripTagsConf;
+                $allowedHtmlTags = \array_key_exists($k, $allowanceList) ? $allowanceList[$k][self::ALLOWED_HTML_TAGS_KEY] : [];
+                $allowedAttributes = \array_key_exists($k, $allowanceList) ? $allowanceList[$k][self::ALLOWED_ATTRIBUTES_KEY] : [];
 
                 if (\is_string($k)) {
-                    $filteredKey = self::filterValue($k, $regex, $stripTags);
+                    $filteredKey = self::filterValue($k, $regex, $stripTags, $allowedHtmlTags, $allowedAttributes);
                 } else {
                     $filteredKey = $k;
                 }
@@ -164,12 +186,12 @@ public function onRouteShutdown(Enlight_Controller_EventArgs $args)
                 }
 
                 if (\is_array($v)) {
-                    $process[$key][$filteredKey] = self::filterArrayValue($v, $regex, $stripTags);
+                    $process[$key][$filteredKey] = self::filterArrayValue($v, $regex, $stripTags, $allowedHtmlTags, $allowedAttributes);
                     continue;
                 }
 
                 if (\is_string($v)) {
-                    $process[$key][$filteredKey] = self::filterValue($v, $regex, $stripTags);
+                    $process[$key][$filteredKey] = self::filterValue($v, $regex, $stripTags, $allowedHtmlTags, $allowedAttributes);
                     continue;
                 }
 
@@ -188,13 +210,15 @@ public function onRouteShutdown(Enlight_Controller_EventArgs $args)
     /**
      * Filter value by regex
      *
-     * @param string $value
-     * @param string $regex
-     * @param bool   $stripTags
+     * @param string        $value
+     * @param string        $regex
+     * @param bool          $stripTags
+     * @param array<string> $allowedHtmlTags
+     * @param array<string> $allowedAttributes
      *
      * @return string|null
      */
-    public static function filterValue($value, $regex, $stripTags = true)
+    public static function filterValue($value, $regex, $stripTags = true, array $allowedHtmlTags = [], array $allowedAttributes = [])
     {
         if (empty($value)) {
             return $value;
@@ -208,22 +232,29 @@ public static function filterValue($value, $regex, $stripTags = true)
             return null;
         }
 
-        return $value;
+        $antiXss = new AntiXSS();
+        $antiXss->removeEvilAttributes($allowedAttributes);
+        $antiXss->removeEvilHtmlTags($allowedHtmlTags);
+        $value = $antiXss->xss_clean($value);
+
+        return str_replace(['&lt;', '&gt;'], ['<', '>'], $value);
     }
 
     /**
      * @param array<string|int, mixed> $value
+     * @param array<string>            $allowedHtmlTags
+     * @param array<string>            $allowedAttributes
      *
      * @return array<string|int, mixed>|null
      */
-    public static function filterArrayValue(array $value, string $regex, bool $stripTags = true): ?array
+    public static function filterArrayValue(array $value, string $regex, bool $stripTags = true, array $allowedHtmlTags = [], array $allowedAttributes = []): ?array
     {
         $newReturn = [];
         foreach ($value as $valueKey => $valueValue) {
             if (\is_int($valueKey)) {
                 $filteredKey = $valueKey;
             } else {
-                $filteredKey = self::filterValue($valueKey, $regex, $stripTags);
+                $filteredKey = self::filterValue($valueKey, $regex, $stripTags, $allowedHtmlTags, $allowedAttributes);
             }
 
             if ($filteredKey === '' || $filteredKey === null) {
@@ -237,7 +268,7 @@ public static function filterArrayValue(array $value, string $regex, bool $strip
             }
 
             if (\is_string($valueValue)) {
-                $filteredValue = self::filterValue($valueValue, $regex, $stripTags);
+                $filteredValue = self::filterValue($valueValue, $regex, $stripTags, $allowedHtmlTags, $allowedAttributes);
             }
 
             $newReturn[$filteredKey] = $filteredValue;
diff --git a/engine/Shopware/Plugins/Default/Frontend/Notification/Bootstrap.php b/engine/Shopware/Plugins/Default/Frontend/Notification/Bootstrap.php
index c1be2b8c66b..6bab9773b90 100644
--- a/engine/Shopware/Plugins/Default/Frontend/Notification/Bootstrap.php
+++ b/engine/Shopware/Plugins/Default/Frontend/Notification/Bootstrap.php
@@ -1,30 +1,41 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+use Doctrine\DBAL\Connection;
+use Shopware\Bundle\AttributeBundle\Service\DataLoaderInterface;
+use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface;
+use Shopware\Bundle\StoreFrontBundle\Service\ListProductServiceInterface;
+use Shopware\Components\Captcha\CaptchaValidator;
+use Shopware\Components\Captcha\NoCaptcha;
+use Shopware\Components\Model\ModelManager;
 use Shopware\Components\Random;
 use Shopware\Components\Routing\Context;
+use Shopware\Components\Routing\RouterInterface;
+use Shopware\Components\ShopRegistrationServiceInterface;
 use Shopware\Components\Validator\EmailValidator;
+use Shopware\Models\Shop\Shop;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
 
 /**
  * Shopware Notification Plugin
@@ -35,6 +46,8 @@
  */
 class Shopware_Plugins_Frontend_Notification_Bootstrap extends Shopware_Components_Plugin_Bootstrap
 {
+    private const CONFIG_NOTIFY_CAPTCHA = 'notificationCaptchaConfig';
+
     /**
      * Installation of plugin
      * Create-Events to include custom code on product detail page
@@ -69,6 +82,8 @@ public function install()
      * If not available display possibility to register for status updates
      *
      * @static
+     *
+     * @return void
      */
     public function onPostDispatch(Enlight_Event_EventArgs $args)
     {
@@ -84,7 +99,7 @@ public function onPostDispatch(Enlight_Event_EventArgs $args)
 
         $id = (int) $subject->Request()->getParam('sArticle');
         $view = $subject->View();
-        /** @var \Symfony\Component\HttpFoundation\Session\SessionInterface $session */
+        /** @var SessionInterface $session */
         $session = $this->get('session');
 
         $sArticle = $view->getAssign('sArticle');
@@ -95,13 +110,13 @@ public function onPostDispatch(Enlight_Event_EventArgs $args)
 
         if (!empty($notificationProducts)) {
             $sql = 'SELECT `ordernumber` FROM `s_articles_details` WHERE `articleID`=?';
-            $ordernumbers = $this->get('dbal_connection')->fetchColumn($sql, [$id]);
+            $ordernumbers = $this->get(Connection::class)->fetchAssociative($sql, [$id]);
 
             if (!empty($ordernumbers)) {
                 foreach ($ordernumbers as $ordernumber) {
                     if (\in_array($ordernumber, $notificationProducts)) {
                         $notificationVariants[] = $ordernumber;
-                        if ($ordernumber === $sArticle) {
+                        if ($ordernumber === $sArticle['ordernumber']) {
                             $view->assign('NotifyAlreadyRegistered', true);
                         }
                     }
@@ -114,7 +129,7 @@ public function onPostDispatch(Enlight_Event_EventArgs $args)
         $view->assign('ShowNotification', true);
 
         $sNotificationArticleWaitingForOptInApprovement = $session->get('sNotifcationArticleWaitingForOptInApprovement', []);
-        $view->assign('WaitingForOptInApprovement', $sNotificationArticleWaitingForOptInApprovement[$sArticle['ordernumber']]);
+        $view->assign('WaitingForOptInApprovement', $sNotificationArticleWaitingForOptInApprovement[$sArticle['ordernumber']] ?? null);
     }
 
     /**
@@ -123,7 +138,9 @@ public function onPostDispatch(Enlight_Event_EventArgs $args)
      *
      * @static
      *
-     * @return
+     * @throws Exception
+     *
+     * @return void
      */
     public function onNotifyAction(Enlight_Event_EventArgs $args)
     {
@@ -138,15 +155,26 @@ public function onNotifyAction(Enlight_Event_EventArgs $args)
         $sError = false;
         $action->View()->assign('NotifyEmailError', false);
         $notifyOrderNumber = $action->Request()->getParam('notifyOrdernumber');
-        /** @var \Doctrine\DBAL\Connection $connection */
-        $connection = $this->get('dbal_connection');
+        $connection = $this->get(Connection::class);
 
-        /** @var \Symfony\Component\HttpFoundation\Session\SessionInterface $session */
         $session = $this->get('session');
 
         $sNotificatedArticles = $session->get('sNotificatedArticles', []);
 
         if (!empty($notifyOrderNumber)) {
+            $captchaValidator = $this->get(CaptchaValidator::class);
+            $config = $this->get(Shopware_Components_Config::class);
+
+            if ($config->get(self::CONFIG_NOTIFY_CAPTCHA) !== NoCaptcha::CAPTCHA_METHOD) {
+                if (!empty($config->get('CaptchaColor'))) {
+                    if (!$captchaValidator->validateByName($config->get(self::CONFIG_NOTIFY_CAPTCHA), $action->Request())) {
+                        $sError = true;
+                        $action->View()->assign('NotifyCaptchaError', true);
+                        $action->View()->assign('ShowNotification', true);
+                    }
+                }
+            }
+
             $validator = $this->get(EmailValidator::class);
             if (empty($email) || !$validator->isValid($email)) {
                 $sError = true;
@@ -177,7 +205,7 @@ public function onNotifyAction(Enlight_Event_EventArgs $args)
                     $action->View()->assign('NotifyAlreadyRegistered', false);
 
                     $hash = Random::getAlphanumericString(32);
-                    $link = $action->Front()->Router()->assemble([
+                    $link = $action->Front()->ensureRouter()->assemble([
                         'sViewport' => 'detail',
                         'sArticle' => $id,
                         'sNotificationConfirmation' => $hash,
@@ -191,7 +219,7 @@ public function onNotifyAction(Enlight_Event_EventArgs $args)
 
                     $name = $modules->Articles()->sGetArticleNameByOrderNumber($notifyOrderNumber);
 
-                    $basePath = $action->Front()->Router()->assemble(['sViewport' => 'index']);
+                    $basePath = $action->Front()->ensureRouter()->assemble(['sViewport' => 'index']);
                     $modules->System()->_POST['sLanguage'] = Shopware()->Shop()->getId();
                     $modules->System()->_POST['sShopPath'] = $basePath . Shopware()->Config()->get('sBASEFILE');
 
@@ -219,7 +247,7 @@ public function onNotifyAction(Enlight_Event_EventArgs $args)
             }
         }
 
-        return $action->forward('index');
+        $action->forward('index');
     }
 
     /**
@@ -228,20 +256,16 @@ public function onNotifyAction(Enlight_Event_EventArgs $args)
      *
      * @static
      *
-     * @return
+     * @return void
      */
     public function onNotifyConfirmAction(Enlight_Event_EventArgs $args)
     {
         $args->setProcessed(true);
 
-        /** @var Enlight_Controller_Action $action */
+        /** @var Shopware_Controllers_Frontend_Detail $action */
         $action = $args->getSubject();
 
-        /** @var \Doctrine\DBAL\Connection $db */
-        $db = $this->get('dbal_connection');
-
-        /** @var \Symfony\Component\HttpFoundation\Session\SessionInterface $session */
-        $session = $this->get('session');
+        $db = $this->get(Connection::class);
 
         $action->View()->assign('NotifyValid', false);
         $action->View()->assign('NotifyInvalid', false);
@@ -249,7 +273,7 @@ public function onNotifyConfirmAction(Enlight_Event_EventArgs $args)
         $sNotify = $action->Request()->getParam('sNotify');
 
         if (!empty($sNotificationConfirmation) && !empty($sNotify)) {
-            $getConfirmation = $db->fetchAssoc('
+            $getConfirmation = $db->fetchAssociative('
             SELECT * FROM s_core_optin WHERE hash = ?
             ', [$sNotificationConfirmation]);
 
@@ -283,7 +307,6 @@ public function onNotifyConfirmAction(Enlight_Event_EventArgs $args)
 
                 $insertId = $db->lastInsertId();
 
-                /** @var Enlight_Event_EventManager $eventManager */
                 $eventManager = $this->get('events');
 
                 $params = [
@@ -309,6 +332,7 @@ public function onNotifyConfirmAction(Enlight_Event_EventArgs $args)
 
                 $action->View()->assign('NotifyValid', true);
 
+                $session = $this->get('session');
                 $sNotificationArticleWaitingForOptInApprovement = $session->get('sNotifcationArticleWaitingForOptInApprovement', []);
                 $sNotificationArticleWaitingForOptInApprovement[$json_data['notifyOrdernumber']] = true;
                 $session->set('sNotifcationArticleWaitingForOptInApprovement', $sNotificationArticleWaitingForOptInApprovement);
@@ -317,19 +341,21 @@ public function onNotifyConfirmAction(Enlight_Event_EventArgs $args)
             }
         }
 
-        return $action->forward('index');
+        $action->forward('index');
     }
 
     /**
      * Cronjob method
      * Check all products from s_articles_notification
      * Inform customer if any status update available
+     *
+     * @return void
      */
     public function onRunCronJob(Shopware_Components_Cron_CronJob $job)
     {
-        $modelManager = $this->get(\Shopware\Components\Model\ModelManager::class);
+        $modelManager = $this->get(ModelManager::class);
 
-        $conn = $this->get(\Doctrine\DBAL\Connection::class);
+        $conn = $this->get(Connection::class);
 
         $notifications = $conn->createQueryBuilder()
             ->select(
@@ -371,7 +397,7 @@ public function onRunCronJob(Shopware_Components_Cron_CronJob $job)
                 ]
             );
 
-            $product = $queryBuilder->execute()->fetch(\PDO::FETCH_ASSOC);
+            $product = $queryBuilder->execute()->fetch(PDO::FETCH_ASSOC);
 
             if (
                 empty($product)   // No product associated with the specified order number (empty result set)
@@ -382,24 +408,23 @@ public function onRunCronJob(Shopware_Components_Cron_CronJob $job)
                 continue;
             }
 
-            /** @var \Shopware\Bundle\AttributeBundle\Service\DataLoaderInterface $attributeLoader */
-            $attributeLoader = $this->get(\Shopware\Bundle\AttributeBundle\Service\DataLoaderInterface::class);
+            $attributeLoader = $this->get(DataLoaderInterface::class);
             $notify['attribute'] = $attributeLoader->load('s_articles_notification_attributes', $notify['id']);
 
-            $shop = $modelManager->getRepository(\Shopware\Models\Shop\Shop::class)->getActiveById($notify['language']);
+            $shop = $modelManager->getRepository(Shop::class)->getActiveById($notify['language']);
 
             // Continue if shop is inactive or deleted
             if ($shop === null) {
                 continue;
             }
 
-            $this->get(\Shopware\Components\ShopRegistrationServiceInterface::class)->registerShop($shop);
+            $this->get(ShopRegistrationServiceInterface::class)->registerShop($shop);
 
-            $shopContext = Context::createFromShop($shop, $this->get(\Shopware_Components_Config::class));
-            $this->get(\Shopware\Components\Routing\RouterInterface::class)->setContext($shopContext);
-            $sContext = $this->get(\Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface::class)->createShopContext($notify['language']);
+            $shopContext = Context::createFromShop($shop, $this->get(Shopware_Components_Config::class));
+            $this->get(RouterInterface::class)->setContext($shopContext);
+            $sContext = $this->get(ContextServiceInterface::class)->createShopContext($notify['language']);
 
-            $productInformation = $this->get(\Shopware\Bundle\StoreFrontBundle\Service\ListProductServiceInterface::class)->get($notify['ordernumber'], $sContext);
+            $productInformation = $this->get(ListProductServiceInterface::class)->get($notify['ordernumber'], $sContext);
 
             if (empty($productInformation)) {
                 continue;
@@ -407,7 +432,7 @@ public function onRunCronJob(Shopware_Components_Cron_CronJob $job)
 
             $productInformation = $this->get('legacy_struct_converter')->convertListProductStruct($productInformation);
 
-            $link = Shopware()->Front()->Router()->assemble([
+            $link = Shopware()->Front()->ensureRouter()->assemble([
                 'sViewport' => 'detail',
                 'sArticle' => $product['articleID'],
                 'number' => $product['ordernumber'],
diff --git a/engine/Shopware/Plugins/Default/Frontend/RouterRewrite/Bootstrap.php b/engine/Shopware/Plugins/Default/Frontend/RouterRewrite/Bootstrap.php
index 8fb82d7a188..45674cc90cc 100644
--- a/engine/Shopware/Plugins/Default/Frontend/RouterRewrite/Bootstrap.php
+++ b/engine/Shopware/Plugins/Default/Frontend/RouterRewrite/Bootstrap.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
@@ -83,7 +83,7 @@ public function onPreDispatch(Enlight_Controller_EventArgs $args)
         ) {
             return;
         }
-        $router = $args->getSubject()->Router();
+        $router = $args->getSubject()->ensureRouter();
 
         $query = $request->getQuery();
         $location = $router->assemble($query);
diff --git a/engine/Shopware/Plugins/Default/Frontend/Seo/Bootstrap.php b/engine/Shopware/Plugins/Default/Frontend/Seo/Bootstrap.php
index b813c47cc43..615665c5993 100644
--- a/engine/Shopware/Plugins/Default/Frontend/Seo/Bootstrap.php
+++ b/engine/Shopware/Plugins/Default/Frontend/Seo/Bootstrap.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface;
diff --git a/engine/Shopware/Plugins/Default/Frontend/Statistics/Bootstrap.php b/engine/Shopware/Plugins/Default/Frontend/Statistics/Bootstrap.php
index 47e7b04845c..ddad25f5142 100644
--- a/engine/Shopware/Plugins/Default/Frontend/Statistics/Bootstrap.php
+++ b/engine/Shopware/Plugins/Default/Frontend/Statistics/Bootstrap.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Doctrine\DBAL\Connection;
@@ -67,7 +67,7 @@ public function install()
 incywincy;informant;infoseek;infoseeksidewinder;infospider;inspectorwww;intelliagent;irobot;
 israelisearch;javabee;jbot;jcrawler;jobo;jobot;joebot;jubii;jumpstation;katipo;kdd;kilroy;
 ko_yappo_robot;labelgrabber.txt;larbin;linkidator;linkscan;lockon;logo_gif;macworm;
-magpie;marvin;mattie;mediafox;merzscope;meshexplorer;mindcrawler;momspider;monster;motor;
+magpie;marvin;mattie;mediafox;merzscope;meshexplorer;mindcrawler;momspider;monster;
 mwdsearch;netcarta;netmechanic;netscoop;newscan-online;nhse;northstar;occam;octopus;openfind;
 orb_search;packrat;pageboy;parasite;patric;pegasus;perignator;perlcrawler;phantom;piltdownman;
 pimptrain;pioneer;pitkow;pjspider;pka;plumtreewebaccessor;poppi;portalb;puu;python;raven;rbse;
@@ -82,7 +82,7 @@ public function install()
 wz101;xget;awbot;bobby;boris;bumblebee;cscrawler;daviesbot;ezresult;gigabot;gnodspider;internetseer;
 justview;linkbot;linkchecker;nederland.zoek;perman;pompos;pooodle;redalert;shoutcast;slysearch;
 ultraseek;webcompass;yandex;robot;yahoo;bot;psbot;crawl;RSS;larbin;ichiro;Slurp;msnbot;bot;Googlebot;
-ShopWiki;Bot;WebAlta;;abachobot;architext;ask jeeves;frooglebot;googlebot;lycos;spider;HTTPClient',
+ShopWiki;Bot;WebAlta;abachobot;architext;ask jeeves;frooglebot;googlebot;lycos;spider;HTTPClient',
             'scope' => Element::SCOPE_SHOP,
         ]);
 
diff --git a/engine/Shopware/Plugins/Default/Frontend/TagCloud/Bootstrap.php b/engine/Shopware/Plugins/Default/Frontend/TagCloud/Bootstrap.php
index 09e7cea5a83..00832238d92 100644
--- a/engine/Shopware/Plugins/Default/Frontend/TagCloud/Bootstrap.php
+++ b/engine/Shopware/Plugins/Default/Frontend/TagCloud/Bootstrap.php
@@ -1,29 +1,28 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Models\Config\Element;
-use Shopware\Models\Config\Form;
 
 class Shopware_Plugins_Frontend_TagCloud_Bootstrap extends Shopware_Components_Plugin_Bootstrap
 {
diff --git a/engine/Shopware/Shopware.php b/engine/Shopware/Shopware.php
index e4e4eb50aac..79d37ba8922 100644
--- a/engine/Shopware/Shopware.php
+++ b/engine/Shopware/Shopware.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\DependencyInjection\Container;
@@ -78,7 +78,7 @@ public function __call($name, $value = null)
 
         if (!$this->container->has($name)) {
             throw new Enlight_Exception(
-                sprintf('Method "%s::%s" not found failure', \get_class($this), $name),
+                \sprintf('Method "%s::%s" not found failure', \get_class($this), $name),
                 Enlight_Exception::METHOD_NOT_FOUND
             );
         }
diff --git a/license.txt b/license.txt
index 0ba993fcbcb..d3ea281561a 100644
--- a/license.txt
+++ b/license.txt
@@ -1,8 +1,6 @@
 Important:
 
-  Shopware is licensed under a dual license. To check which
-license / edition of Shopware you have installed, please open
-the "About shopware" dialog in the backend.
+  Shopware is licensed under GNU General Public License 3
 
 Additional permission under AGPLv3, Sec. 7:
 
diff --git a/recovery/common/autoload.php b/recovery/common/autoload.php
index 7771944f96d..940c187fba9 100644
--- a/recovery/common/autoload.php
+++ b/recovery/common/autoload.php
@@ -1,27 +1,29 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+use Composer\Autoload\ClassLoader;
+
 if (!file_exists(__DIR__ . '/vendor/autoload.php')) {
     $template = '%s: ';
     if (PHP_SAPI !== 'cli') {
@@ -29,11 +31,11 @@
         header('Content-type: text/html; charset=utf-8', true, 503);
     }
 
-    echo sprintf($template, 'Error');
+    echo \sprintf($template, 'Error');
     echo 'Please execute "composer install --working-dir=' . __DIR__ . '" or "composer install" in the directory ' .
         __DIR__ . " from the command line to install the required dependencies for the install/update application for Shopware 5\n";
 
-    echo sprintf($template, 'Fehler');
+    echo \sprintf($template, 'Fehler');
     echo 'Bitte führen Sie zuerst "composer install --working-dir=' . __DIR__ . '" oder "composer install" im Verzeichnis ' .
         __DIR__ . " aus um alle von der Shopware 5 Installations-/Aktualisierungsanwendung benötigten Abhängigkeiten zu installieren.\n";
 
@@ -43,7 +45,7 @@
 
 \define('SW_PATH', realpath(__DIR__ . '/../../'));
 
-/** @var \Composer\Autoload\ClassLoader $autoloader */
+/** @var ClassLoader $autoloader */
 $autoloader = require_once __DIR__ . '/vendor/autoload.php';
 
 $autoloader->addPsr4(
diff --git a/recovery/common/composer.json b/recovery/common/composer.json
index efde5a30793..8fe451f132f 100644
--- a/recovery/common/composer.json
+++ b/recovery/common/composer.json
@@ -1,13 +1,16 @@
 {
     "require": {
-        "php": "~7.4.0 || ~8.0.0 || ~8.1.0",
-        "knplabs/gaufrette": "0.10.0",
-        "pimple/pimple": "3.5.0",
+        "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
+        "knplabs/gaufrette": "0.11.1",
+        "pimple/pimple": "3.6.2",
         "slim/slim": "2.6.3",
         "symfony/console": "~4.4.34",
         "symfony/finder": "~4.4.30",
         "symfony/polyfill-php80": "^1.23",
-        "symfony/polyfill-php81": "^1.23"
+        "symfony/polyfill-php81": "^1.23",
+        "symfony/polyfill-php82": "^1.23",
+        "symfony/service-contracts": "^2.4",
+        "voku/anti-xss": "^4.1"
     },
     "autoload": {
         "psr-4": {
diff --git a/recovery/common/composer.lock b/recovery/common/composer.lock
index a9e8eeaba47..d98f1d7c5b2 100644
--- a/recovery/common/composer.lock
+++ b/recovery/common/composer.lock
@@ -4,32 +4,34 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "8d7b54b4c33f155311df28320a63c787",
+    "content-hash": "a2dced87d8dcb56ada1109b11c73f611",
     "packages": [
         {
             "name": "knplabs/gaufrette",
-            "version": "v0.10.0",
+            "version": "v0.11.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/KnpLabs/Gaufrette.git",
-                "reference": "ef5ec9d72c06d21febfa09b36d5c3d8e3af9cf8b"
+                "reference": "3cc396cae0f7c7d3f965e6b69d8fc546ffa0f94c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/KnpLabs/Gaufrette/zipball/ef5ec9d72c06d21febfa09b36d5c3d8e3af9cf8b",
-                "reference": "ef5ec9d72c06d21febfa09b36d5c3d8e3af9cf8b",
+                "url": "https://api.github.com/repos/KnpLabs/Gaufrette/zipball/3cc396cae0f7c7d3f965e6b69d8fc546ffa0f94c",
+                "reference": "3cc396cae0f7c7d3f965e6b69d8fc546ffa0f94c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": "^7.4 || ^8.0"
             },
             "conflict": {
                 "microsoft/windowsazure": "<0.4.3"
             },
             "require-dev": {
+                "friendsofphp/php-cs-fixer": "^3.9",
                 "mikey179/vfsstream": "v1.x-dev as 1.7.0",
-                "phpspec/phpspec": "^5.1 || ^6.2",
-                "phpunit/phpunit": "~7.5"
+                "pedrotroller/php-cs-custom-fixer": "^2.28",
+                "phpspec/phpspec": "^7.0",
+                "phpunit/phpunit": "~8.0"
             },
             "suggest": {
                 "ext-fileinfo": "This extension is used to automatically detect the content-type of a file in the AwsS3, OpenCloud, AzureBlogStorage and GoogleCloudStorage adapters",
@@ -70,22 +72,22 @@
             ],
             "support": {
                 "issues": "https://github.com/KnpLabs/Gaufrette/issues",
-                "source": "https://github.com/KnpLabs/Gaufrette/tree/v0.10.0"
+                "source": "https://github.com/KnpLabs/Gaufrette/tree/v0.11.1"
             },
-            "time": "2020-10-05T19:26:39+00:00"
+            "time": "2022-11-03T17:26:17+00:00"
         },
         {
             "name": "pimple/pimple",
-            "version": "v3.5.0",
+            "version": "v3.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/silexphp/Pimple.git",
-                "reference": "a94b3a4db7fb774b3d78dad2315ddc07629e1bed"
+                "reference": "8cfe7f74ac22a433d303914eba9ea4c2a834edce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/silexphp/Pimple/zipball/a94b3a4db7fb774b3d78dad2315ddc07629e1bed",
-                "reference": "a94b3a4db7fb774b3d78dad2315ddc07629e1bed",
+                "url": "https://api.github.com/repos/silexphp/Pimple/zipball/8cfe7f74ac22a433d303914eba9ea4c2a834edce",
+                "reference": "8cfe7f74ac22a433d303914eba9ea4c2a834edce",
                 "shasum": ""
             },
             "require": {
@@ -93,12 +95,12 @@
                 "psr/container": "^1.1 || ^2.0"
             },
             "require-dev": {
-                "symfony/phpunit-bridge": "^5.4@dev"
+                "phpunit/phpunit": "*"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.4.x-dev"
+                    "dev-master": "3.x-dev"
                 }
             },
             "autoload": {
@@ -123,9 +125,9 @@
                 "dependency injection"
             ],
             "support": {
-                "source": "https://github.com/silexphp/Pimple/tree/v3.5.0"
+                "source": "https://github.com/silexphp/Pimple/tree/v3.6.2"
             },
-            "time": "2021-10-28T11:13:42+00:00"
+            "time": "2026-02-26T08:23:44+00:00"
         },
         {
             "name": "psr/container",
@@ -228,16 +230,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v4.4.36",
+            "version": "v4.4.49",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "621379b62bb19af213b569b60013200b11dd576f"
+                "reference": "33fa45ffc81fdcc1ca368d4946da859c8cdb58d9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/621379b62bb19af213b569b60013200b11dd576f",
-                "reference": "621379b62bb19af213b569b60013200b11dd576f",
+                "url": "https://api.github.com/repos/symfony/console/zipball/33fa45ffc81fdcc1ca368d4946da859c8cdb58d9",
+                "reference": "33fa45ffc81fdcc1ca368d4946da859c8cdb58d9",
                 "shasum": ""
             },
             "require": {
@@ -298,7 +300,7 @@
             "description": "Eases the creation of beautiful and testable command line interfaces",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/console/tree/v4.4.36"
+                "source": "https://github.com/symfony/console/tree/v4.4.49"
             },
             "funding": [
                 {
@@ -314,39 +316,184 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-15T10:33:10+00:00"
+            "time": "2022-11-05T17:10:16+00:00"
         },
         {
-            "name": "symfony/deprecation-contracts",
-            "version": "v2.5.0",
+            "name": "symfony/finder",
+            "version": "v4.4.44",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8"
+                "url": "https://github.com/symfony/finder.git",
+                "reference": "66bd787edb5e42ff59d3523f623895af05043e4f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8",
-                "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/66bd787edb5e42ff59d3523f623895af05043e4f",
+                "reference": "66bd787edb5e42ff59d3523f623895af05043e4f",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.1.3",
+                "symfony/polyfill-php80": "^1.16"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Finder\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Finds files and directories via an intuitive fluent interface",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/finder/tree/v4.4.44"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-07-29T07:35:46+00:00"
+        },
+        {
+            "name": "symfony/polyfill-iconv",
+            "version": "v1.31.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-iconv.git",
+                "reference": "48becf00c920479ca2e910c22a5a39e5d47ca956"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/48becf00c920479ca2e910c22a5a39e5d47ca956",
+                "reference": "48becf00c920479ca2e910c22a5a39e5d47ca956",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "provide": {
+                "ext-iconv": "*"
+            },
+            "suggest": {
+                "ext-iconv": "For best performance"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "2.5-dev"
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Iconv\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
                 },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Iconv extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "iconv",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-iconv/tree/v1.31.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-09-09T11:45:10+00:00"
+        },
+        {
+            "name": "symfony/polyfill-intl-grapheme",
+            "version": "v1.31.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
+                "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
+                "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "type": "library",
+            "extra": {
                 "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
                 "files": [
-                    "function.php"
-                ]
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -362,10 +509,18 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "A generic function and convention to trigger deprecation notices",
+            "description": "Symfony polyfill for intl's grapheme_* functions",
             "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "grapheme",
+                "intl",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -381,33 +536,44 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-12T14:48:14+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
-            "name": "symfony/finder",
-            "version": "v4.4.36",
+            "name": "symfony/polyfill-intl-normalizer",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/finder.git",
-                "reference": "1fef05633cd61b629e963e5d8200fb6b67ecf42c"
+                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
+                "reference": "3833d7255cc303546435cb650316bff708a1c75c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/1fef05633cd61b629e963e5d8200fb6b67ecf42c",
-                "reference": "1fef05633cd61b629e963e5d8200fb6b67ecf42c",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c",
+                "reference": "3833d7255cc303546435cb650316bff708a1c75c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1.3",
-                "symfony/polyfill-php80": "^1.16"
+                "php": ">=7.2"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
             },
             "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
             "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
                 "psr-4": {
-                    "Symfony\\Component\\Finder\\": ""
+                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
                 },
-                "exclude-from-classmap": [
-                    "/Tests/"
+                "classmap": [
+                    "Resources/stubs"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -416,18 +582,26 @@
             ],
             "authors": [
                 {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
                 },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Finds files and directories via an intuitive fluent interface",
+            "description": "Symfony polyfill for intl's Normalizer class and related functions",
             "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "intl",
+                "normalizer",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v4.4.36"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -443,24 +617,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-15T10:33:10+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.24.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825"
+                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825",
-                "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341",
+                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "provide": {
                 "ext-mbstring": "*"
@@ -470,21 +644,18 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -510,7 +681,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -526,20 +697,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-30T18:21:41+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-php73",
-            "version": "v1.24.0",
+            "version": "v1.27.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5"
+                "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/cc5db0e22b3cb4111010e48785a97f670b350ca5",
-                "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/9e8ecb5f92152187c4799efd3c96b78ccab18ff9",
+                "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9",
                 "shasum": ""
             },
             "require": {
@@ -548,7 +719,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.27-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -556,12 +727,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php73\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php73\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -589,7 +760,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php73/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-php73/tree/v1.27.0"
             },
             "funding": [
                 {
@@ -605,42 +776,39 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-06-05T21:20:04+00:00"
+            "time": "2022-11-03T14:55:06+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.24.0",
+            "version": "v1.33.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9"
+                "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/57b712b08eddb97c762a8caa32c84e037892d2e9",
-                "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
+                "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php80\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -672,7 +840,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -683,47 +851,128 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-09-13T13:58:33+00:00"
+            "time": "2025-01-02T08:10:11+00:00"
         },
         {
             "name": "symfony/polyfill-php81",
-            "version": "v1.24.0",
+            "version": "v1.38.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php81.git",
-                "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f"
+                "reference": "6bfb9c766cacffbc8e118cb87217d08ed84e5cd7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/5de4ba2d41b15f9bd0e19b2ab9674135813ec98f",
-                "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f",
+                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/6bfb9c766cacffbc8e118cb87217d08ed84e5cd7",
+                "reference": "6bfb9c766cacffbc8e118cb87217d08ed84e5cd7",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
                 "psr-4": {
                     "Symfony\\Polyfill\\Php81\\": ""
                 },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php81/tree/v1.38.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2026-05-26T12:45:58+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php82",
+            "version": "v1.38.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php82.git",
+                "reference": "002dc0cfe5fd4ed6033d48f27d4f19a486c4b04b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php82/zipball/002dc0cfe5fd4ed6033d48f27d4f19a486c4b04b",
+                "reference": "002dc0cfe5fd4ed6033d48f27d4f19a486c4b04b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
+            "autoload": {
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php82\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -742,7 +991,7 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions",
+            "description": "Symfony polyfill backporting some PHP 8.2+ features to lower PHP versions",
             "homepage": "https://symfony.com",
             "keywords": [
                 "compatibility",
@@ -751,7 +1000,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php81/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-php82/tree/v1.38.1"
             },
             "funding": [
                 {
@@ -762,31 +1011,34 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-09-13T13:58:11+00:00"
+            "time": "2026-05-26T12:45:58+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v2.5.0",
+            "version": "v2.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc"
+                "reference": "d664541b99d6fb0247ec5ff32e87238582236204"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc",
-                "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/d664541b99d6fb0247ec5ff32e87238582236204",
+                "reference": "d664541b99d6fb0247ec5ff32e87238582236204",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
-                "psr/container": "^1.1",
-                "symfony/deprecation-contracts": "^2.1"
+                "psr/container": "^1.1"
             },
             "conflict": {
                 "ext-psr": "<1.1|>=2"
@@ -797,7 +1049,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.5-dev"
+                    "dev-main": "2.4-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -834,7 +1086,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v2.5.0"
+                "source": "https://github.com/symfony/service-contracts/tree/v2.4.1"
             },
             "funding": [
                 {
@@ -850,18 +1102,278 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-04T16:48:04+00:00"
+            "time": "2021-11-04T16:37:19+00:00"
+        },
+        {
+            "name": "voku/anti-xss",
+            "version": "4.1.42",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/voku/anti-xss.git",
+                "reference": "bca1f8607e55a3c5077483615cd93bd8f11bd675"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/voku/anti-xss/zipball/bca1f8607e55a3c5077483615cd93bd8f11bd675",
+                "reference": "bca1f8607e55a3c5077483615cd93bd8f11bd675",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0.0",
+                "voku/portable-utf8": "~6.0.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~6.0 || ~7.0 || ~9.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "voku\\helper\\": "src/voku/helper/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "EllisLab Dev Team",
+                    "homepage": "http://ellislab.com/"
+                },
+                {
+                    "name": "Lars Moelleken",
+                    "email": "lars@moelleken.org",
+                    "homepage": "https://www.moelleken.org/"
+                }
+            ],
+            "description": "anti xss-library",
+            "homepage": "https://github.com/voku/anti-xss",
+            "keywords": [
+                "anti-xss",
+                "clean",
+                "security",
+                "xss"
+            ],
+            "support": {
+                "issues": "https://github.com/voku/anti-xss/issues",
+                "source": "https://github.com/voku/anti-xss/tree/4.1.42"
+            },
+            "funding": [
+                {
+                    "url": "https://www.paypal.me/moelleken",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/voku",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/anti-xss",
+                    "type": "open_collective"
+                },
+                {
+                    "url": "https://www.patreon.com/voku",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/voku/anti-xss",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-07-03T14:40:46+00:00"
+        },
+        {
+            "name": "voku/portable-ascii",
+            "version": "2.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/voku/portable-ascii.git",
+                "reference": "b1d923f88091c6bf09699efcd7c8a1b1bfd7351d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/voku/portable-ascii/zipball/b1d923f88091c6bf09699efcd7c8a1b1bfd7351d",
+                "reference": "b1d923f88091c6bf09699efcd7c8a1b1bfd7351d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~6.0 || ~7.0 || ~9.0"
+            },
+            "suggest": {
+                "ext-intl": "Use Intl for transliterator_transliterate() support"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "voku\\": "src/voku/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Lars Moelleken",
+                    "homepage": "https://www.moelleken.org/"
+                }
+            ],
+            "description": "Portable ASCII library - performance optimized (ascii) string functions for php.",
+            "homepage": "https://github.com/voku/portable-ascii",
+            "keywords": [
+                "ascii",
+                "clean",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/voku/portable-ascii/issues",
+                "source": "https://github.com/voku/portable-ascii/tree/2.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://www.paypal.me/moelleken",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/voku",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/portable-ascii",
+                    "type": "open_collective"
+                },
+                {
+                    "url": "https://www.patreon.com/voku",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/voku/portable-ascii",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-11-21T01:49:47+00:00"
+        },
+        {
+            "name": "voku/portable-utf8",
+            "version": "6.0.13",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/voku/portable-utf8.git",
+                "reference": "b8ce36bf26593e5c2e81b1850ef0ffb299d2043f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/voku/portable-utf8/zipball/b8ce36bf26593e5c2e81b1850ef0ffb299d2043f",
+                "reference": "b8ce36bf26593e5c2e81b1850ef0ffb299d2043f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0.0",
+                "symfony/polyfill-iconv": "~1.0",
+                "symfony/polyfill-intl-grapheme": "~1.0",
+                "symfony/polyfill-intl-normalizer": "~1.0",
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/polyfill-php72": "~1.0",
+                "voku/portable-ascii": "~2.0.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "1.9.*@dev",
+                "phpstan/phpstan-strict-rules": "1.4.*@dev",
+                "phpunit/phpunit": "~6.0 || ~7.0 || ~9.0",
+                "thecodingmachine/phpstan-strict-rules": "1.0.*@dev",
+                "voku/phpstan-rules": "3.1.*@dev"
+            },
+            "suggest": {
+                "ext-ctype": "Use Ctype for e.g. hexadecimal digit detection",
+                "ext-fileinfo": "Use Fileinfo for better binary file detection",
+                "ext-iconv": "Use iconv for best performance",
+                "ext-intl": "Use Intl for best performance",
+                "ext-json": "Use JSON for string detection",
+                "ext-mbstring": "Use Mbstring for best performance"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "voku\\": "src/voku/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "(Apache-2.0 or GPL-2.0)"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Hamid Sarfraz",
+                    "homepage": "http://pageconfig.com/"
+                },
+                {
+                    "name": "Lars Moelleken",
+                    "homepage": "http://www.moelleken.org/"
+                }
+            ],
+            "description": "Portable UTF-8 library - performance optimized (unicode) string functions for php.",
+            "homepage": "https://github.com/voku/portable-utf8",
+            "keywords": [
+                "UTF",
+                "clean",
+                "php",
+                "unicode",
+                "utf-8",
+                "utf8"
+            ],
+            "support": {
+                "issues": "https://github.com/voku/portable-utf8/issues",
+                "source": "https://github.com/voku/portable-utf8/tree/6.0.13"
+            },
+            "funding": [
+                {
+                    "url": "https://www.paypal.me/moelleken",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/voku",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/portable-utf8",
+                    "type": "open_collective"
+                },
+                {
+                    "url": "https://www.patreon.com/voku",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/voku/portable-utf8",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-03-08T08:35:38+00:00"
         }
     ],
     "packages-dev": [],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "~7.4.0 || ~8.0.0 || ~8.1.0"
+        "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0"
     },
-    "platform-dev": [],
-    "plugin-api-version": "2.2.0"
+    "platform-dev": {},
+    "plugin-api-version": "2.9.0"
 }
diff --git a/recovery/common/functions.php b/recovery/common/functions.php
index 79ee1e0a9c6..9249f0e162b 100644
--- a/recovery/common/functions.php
+++ b/recovery/common/functions.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 if (!\function_exists('get_magic_quotes_gpc')) {
diff --git a/recovery/common/phpunit.xml.dist b/recovery/common/phpunit.xml.dist
index 151118de58f..8f2ddd187e0 100644
--- a/recovery/common/phpunit.xml.dist
+++ b/recovery/common/phpunit.xml.dist
@@ -11,6 +11,7 @@
     <testsuites>
         <testsuite name="Shopware Installer">
             <directory>../tests/Install</directory>
+            <directory>../tests/Unit</directory>
         </testsuite>
     </testsuites>
 </phpunit>
diff --git a/recovery/common/src/Archive/Adapter.php b/recovery/common/src/Archive/Adapter.php
index f451fcbd9b2..e64f89761e6 100644
--- a/recovery/common/src/Archive/Adapter.php
+++ b/recovery/common/src/Archive/Adapter.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Common\Archive;
diff --git a/recovery/common/src/Archive/Entry/Zip.php b/recovery/common/src/Archive/Entry/Zip.php
index 44def9a3d54..6ccb9127e0c 100644
--- a/recovery/common/src/Archive/Entry/Zip.php
+++ b/recovery/common/src/Archive/Entry/Zip.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Common\Archive\Entry;
diff --git a/recovery/common/src/Archive/Zip.php b/recovery/common/src/Archive/Zip.php
index 2d4c256e153..a197bf57a2d 100644
--- a/recovery/common/src/Archive/Zip.php
+++ b/recovery/common/src/Archive/Zip.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Common\Archive;
@@ -111,25 +111,25 @@ protected function getErrorMessage($retval, $file)
     {
         switch ($retval) {
             case ZipArchive::ER_EXISTS:
-                return sprintf("File '%s' already exists.", $file);
+                return \sprintf("File '%s' already exists.", $file);
             case ZipArchive::ER_INCONS:
-                return sprintf("Zip archive '%s' is inconsistent.", $file);
+                return \sprintf("Zip archive '%s' is inconsistent.", $file);
             case ZipArchive::ER_INVAL:
-                return sprintf('Invalid argument (%s)', $file);
+                return \sprintf('Invalid argument (%s)', $file);
             case ZipArchive::ER_MEMORY:
-                return sprintf('Malloc failure (%s)', $file);
+                return \sprintf('Malloc failure (%s)', $file);
             case ZipArchive::ER_NOENT:
-                return sprintf("No such zip file: '%s'", $file);
+                return \sprintf("No such zip file: '%s'", $file);
             case ZipArchive::ER_NOZIP:
-                return sprintf("'%s' is not a zip archive.", $file);
+                return \sprintf("'%s' is not a zip archive.", $file);
             case ZipArchive::ER_OPEN:
-                return sprintf("Can't open zip file: %s", $file);
+                return \sprintf("Can't open zip file: %s", $file);
             case ZipArchive::ER_READ:
-                return sprintf('Zip read error (%s)', $file);
+                return \sprintf('Zip read error (%s)', $file);
             case ZipArchive::ER_SEEK:
-                return sprintf('Zip seek error (%s)', $file);
+                return \sprintf('Zip seek error (%s)', $file);
             default:
-                return sprintf("'%s' is not a valid zip archive, got error code: %s", $file, $retval);
+                return \sprintf("'%s' is not a valid zip archive, got error code: %s", $file, $retval);
         }
     }
 }
diff --git a/recovery/common/src/DependencyInjection/Container.php b/recovery/common/src/DependencyInjection/Container.php
index d19ca8ca999..8ac3ece640b 100644
--- a/recovery/common/src/DependencyInjection/Container.php
+++ b/recovery/common/src/DependencyInjection/Container.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Common\DependencyInjection;
@@ -74,7 +74,7 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE
         }
 
         if ($invalidBehavior === self::EXCEPTION_ON_INVALID_REFERENCE) {
-            throw new InvalidArgumentException(sprintf('Identifier "%s" is not defined.', $id));
+            throw new InvalidArgumentException(\sprintf('Identifier "%s" is not defined.', $id));
         }
 
         return null;
@@ -110,7 +110,7 @@ public function getParameter($name)
         $config = $this->pimple->offsetGet('config');
 
         if (!$this->hasParameter($name)) {
-            throw new InvalidArgumentException(sprintf('Parameter "%s" is not defined.', $name));
+            throw new InvalidArgumentException(\sprintf('Parameter "%s" is not defined.', $name));
         }
 
         return $config[$name];
diff --git a/recovery/common/src/DependencyInjection/ContainerInterface.php b/recovery/common/src/DependencyInjection/ContainerInterface.php
index 41247a7f2c3..2c50ccd7d91 100644
--- a/recovery/common/src/DependencyInjection/ContainerInterface.php
+++ b/recovery/common/src/DependencyInjection/ContainerInterface.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Common\DependencyInjection;
diff --git a/recovery/common/src/DumpIterator.php b/recovery/common/src/DumpIterator.php
index 30a7d773549..363f01b7e20 100644
--- a/recovery/common/src/DumpIterator.php
+++ b/recovery/common/src/DumpIterator.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Common;
@@ -27,6 +27,7 @@
 use Countable;
 use Exception;
 use OutOfBoundsException;
+use ReturnTypeWillChange;
 use SeekableIterator;
 
 class DumpIterator implements SeekableIterator, Countable
@@ -86,6 +87,7 @@ public function __destruct()
      *
      * @throws OutOfBoundsException
      */
+    #[ReturnTypeWillChange]
     public function seek($position)
     {
         $this->rewind();
@@ -102,11 +104,13 @@ public function seek($position)
     /**
      * @return int
      */
+    #[ReturnTypeWillChange]
     public function count()
     {
         return $this->count;
     }
 
+    #[ReturnTypeWillChange]
     public function rewind()
     {
         rewind($this->stream);
@@ -115,6 +119,7 @@ public function rewind()
         $this->position = 0;
     }
 
+    #[ReturnTypeWillChange]
     public function current()
     {
         return $this->current;
@@ -123,11 +128,13 @@ public function current()
     /**
      * @return int
      */
+    #[ReturnTypeWillChange]
     public function key()
     {
         return $this->position;
     }
 
+    #[ReturnTypeWillChange]
     public function next()
     {
         ++$this->position;
@@ -139,6 +146,7 @@ public function next()
     /**
      * @return bool
      */
+    #[ReturnTypeWillChange]
     public function valid()
     {
         return !feof($this->stream);
diff --git a/recovery/common/src/HttpClient/Client.php b/recovery/common/src/HttpClient/Client.php
index d13081f3093..5e54b280040 100644
--- a/recovery/common/src/HttpClient/Client.php
+++ b/recovery/common/src/HttpClient/Client.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Common\HttpClient;
diff --git a/recovery/common/src/HttpClient/ClientException.php b/recovery/common/src/HttpClient/ClientException.php
index 29bbf66772d..87fee94a64c 100644
--- a/recovery/common/src/HttpClient/ClientException.php
+++ b/recovery/common/src/HttpClient/ClientException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Common\HttpClient;
diff --git a/recovery/common/src/HttpClient/CurlClient.php b/recovery/common/src/HttpClient/CurlClient.php
index 3cd6c32b710..4905079e5bf 100644
--- a/recovery/common/src/HttpClient/CurlClient.php
+++ b/recovery/common/src/HttpClient/CurlClient.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Common\HttpClient;
@@ -93,7 +93,7 @@ private function call($url, $method = self::METHOD_GET, array $header = [], $dat
             throw new ClientException('Invalid URL given');
         }
 
-        //Initializes the cURL instance
+        // Initializes the cURL instance
         $curl = curl_init();
         curl_setopt($curl, CURLOPT_HTTPHEADER, $header);
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
diff --git a/recovery/common/src/HttpClient/Response.php b/recovery/common/src/HttpClient/Response.php
index 82a5a589af8..b3fece3a005 100644
--- a/recovery/common/src/HttpClient/Response.php
+++ b/recovery/common/src/HttpClient/Response.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Common\HttpClient;
diff --git a/recovery/common/src/IOHelper.php b/recovery/common/src/IOHelper.php
index aec5d8cfa4e..3645d898fb2 100644
--- a/recovery/common/src/IOHelper.php
+++ b/recovery/common/src/IOHelper.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Common;
diff --git a/recovery/common/src/Middelware/XssMiddleware.php b/recovery/common/src/Middelware/XssMiddleware.php
new file mode 100644
index 00000000000..dd53ecb7cb8
--- /dev/null
+++ b/recovery/common/src/Middelware/XssMiddleware.php
@@ -0,0 +1,58 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Recovery\Common\Middelware;
+
+use Slim\Middleware;
+use voku\helper\AntiXSS;
+
+class XssMiddleware extends Middleware
+{
+    public function call()
+    {
+        $env = $this->app->environment();
+        $env['slim.input_original'] = $env['slim.input'];
+        $env['slim.input'] = $this->parse($env['slim.input']);
+
+        $this->next->call();
+    }
+
+    private function parse(string $input)
+    {
+        $output = [];
+        if (\function_exists('mb_parse_str') && !isset($this->env['slim.tests.ignore_multibyte'])) {
+            mb_parse_str($input, $output);
+        } else {
+            parse_str($input, $output);
+        }
+
+        /** @var AntiXSS $xss */
+        $xss = new AntiXSS();
+
+        return \is_array($input) ? array_map(function ($data) use ($xss) {
+            return $xss->xss_clean($data);
+        }, $input) : $xss->xss_clean($input);
+    }
+}
diff --git a/recovery/common/src/Service/Notification.php b/recovery/common/src/Service/Notification.php
index f4ab5c294ba..1787b07661f 100644
--- a/recovery/common/src/Service/Notification.php
+++ b/recovery/common/src/Service/Notification.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Common\Service;
@@ -29,26 +30,13 @@
 
 class Notification
 {
-    /**
-     * @var string
-     */
-    private $apiEndPoint;
+    private string $apiEndPoint;
 
-    /**
-     * @var Client
-     */
-    private $client;
+    private Client $client;
 
-    /**
-     * @var string
-     */
-    private $uniqueId;
+    private string $uniqueId;
 
-    /**
-     * @param string $apiEndPoint
-     * @param string $uniqueId
-     */
-    public function __construct($apiEndPoint, $uniqueId, Client $client)
+    public function __construct(string $apiEndPoint, string $uniqueId, Client $client)
     {
         $this->apiEndPoint = $apiEndPoint;
         $this->client = $client;
diff --git a/recovery/common/src/Service/UniqueIdGenerator.php b/recovery/common/src/Service/UniqueIdGenerator.php
index a79449f4485..e7383292852 100644
--- a/recovery/common/src/Service/UniqueIdGenerator.php
+++ b/recovery/common/src/Service/UniqueIdGenerator.php
@@ -1,43 +1,38 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Common\Service;
 
 /**
- * Generates a random unique Id and caches it in a local file.
+ * Generates a random unique ID and caches it in a local file.
  */
 class UniqueIdGenerator
 {
-    /**
-     * @var string
-     */
-    private $cacheFilePath;
+    private string $cacheFilePath;
 
-    /**
-     * @param string $cacheFilePath
-     */
-    public function __construct($cacheFilePath)
+    public function __construct(string $cacheFilePath)
     {
         $this->cacheFilePath = $cacheFilePath;
     }
@@ -75,10 +70,7 @@ public function generateUniqueId($length = 32, $keyspace = '0123456789abcdefghij
         return $str;
     }
 
-    /**
-     * @param string $uniqueId
-     */
-    private function saveUniqueId($uniqueId)
+    private function saveUniqueId(string $uniqueId): void
     {
         file_put_contents($this->cacheFilePath, $uniqueId);
     }
diff --git a/recovery/common/src/Service/UniqueIdPersister.php b/recovery/common/src/Service/UniqueIdPersister.php
index 1e83389764d..48046370ecb 100644
--- a/recovery/common/src/Service/UniqueIdPersister.php
+++ b/recovery/common/src/Service/UniqueIdPersister.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Common\Service;
@@ -27,19 +28,13 @@
 use PDO;
 
 /**
- * Reads the generated unique Id from the generator and stores it into the database.
+ * Reads the generated unique ID from the generator and stores it into the database.
  */
 class UniqueIdPersister
 {
-    /**
-     * @var UniqueIdGenerator
-     */
-    private $uniqueIdGenerator;
+    private UniqueIdGenerator $uniqueIdGenerator;
 
-    /**
-     * @var PDO
-     */
-    private $connection;
+    private PDO $connection;
 
     public function __construct(UniqueIdGenerator $uniqueIdGenerator, PDO $connection)
     {
diff --git a/recovery/common/src/SystemLocker.php b/recovery/common/src/SystemLocker.php
index 5c4a47af3a1..59e9153b615 100644
--- a/recovery/common/src/SystemLocker.php
+++ b/recovery/common/src/SystemLocker.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Common;
diff --git a/recovery/common/src/Utils.php b/recovery/common/src/Utils.php
index d6f0595206f..ad732266c78 100644
--- a/recovery/common/src/Utils.php
+++ b/recovery/common/src/Utils.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Common;
diff --git a/recovery/install/check.php b/recovery/install/check.php
index 2bbef0b5e0f..381fa67ea34 100644
--- a/recovery/install/check.php
+++ b/recovery/install/check.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 error_reporting(-1);
diff --git a/recovery/install/config/production.php b/recovery/install/config/production.php
index 5aab7cd256e..739fabf88e3 100644
--- a/recovery/install/config/production.php
+++ b/recovery/install/config/production.php
@@ -1,27 +1,29 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+use Slim\Log;
+
 return [
     'shopware.root_dir' => realpath(__DIR__ . '/../../../'),
     'check.ping_url' => 'recovery/install/ping.php',
@@ -38,7 +40,7 @@
     'languages' => ['de', 'en', 'nl', 'it', 'fr', 'es', 'pt', 'pl'],
 
     'slim' => [
-        'log.level' => \Slim\Log::DEBUG,
+        'log.level' => Log::DEBUG,
         'log.enabled' => true,
         'debug' => true, // set debug to false so custom error handler is used
         'templates.path' => __DIR__ . '/../templates',
diff --git a/recovery/install/data/lang/de.php b/recovery/install/data/lang/de.php
index a20d069d253..1f85b136582 100644
--- a/recovery/install/data/lang/de.php
+++ b/recovery/install/data/lang/de.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 return [
diff --git a/recovery/install/data/lang/en.php b/recovery/install/data/lang/en.php
index ec28098bf1d..ab2d6a2a476 100644
--- a/recovery/install/data/lang/en.php
+++ b/recovery/install/data/lang/en.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 return [
diff --git a/recovery/install/data/lang/es.php b/recovery/install/data/lang/es.php
index 0390e0b8c32..ba4174be236 100644
--- a/recovery/install/data/lang/es.php
+++ b/recovery/install/data/lang/es.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 return [
diff --git a/recovery/install/data/lang/fr.php b/recovery/install/data/lang/fr.php
index c3f91cf0465..b3026470902 100644
--- a/recovery/install/data/lang/fr.php
+++ b/recovery/install/data/lang/fr.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 return [
diff --git a/recovery/install/data/lang/it.php b/recovery/install/data/lang/it.php
index 1c2b1b8ad59..edf9b79f847 100644
--- a/recovery/install/data/lang/it.php
+++ b/recovery/install/data/lang/it.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 return [
diff --git a/recovery/install/data/lang/nl.php b/recovery/install/data/lang/nl.php
index df3dcb87016..4f135009de7 100644
--- a/recovery/install/data/lang/nl.php
+++ b/recovery/install/data/lang/nl.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 return [
diff --git a/recovery/install/data/lang/pl.php b/recovery/install/data/lang/pl.php
index 8810094150e..49fa7ee2e61 100644
--- a/recovery/install/data/lang/pl.php
+++ b/recovery/install/data/lang/pl.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 return [
diff --git a/recovery/install/data/lang/pt.php b/recovery/install/data/lang/pt.php
index 17a11f7b8bd..09e450c406c 100644
--- a/recovery/install/data/lang/pt.php
+++ b/recovery/install/data/lang/pt.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 return [
diff --git a/recovery/install/index.php b/recovery/install/index.php
index f325b767f7e..af0f775ab0a 100644
--- a/recovery/install/index.php
+++ b/recovery/install/index.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 $lockFile = __DIR__ . '/data/install.lock';
@@ -59,7 +59,7 @@
     return $application->run($input);
 }
 
-//the execution time will be increased, because the import can take a while
+// the execution time will be increased, because the import can take a while
 ini_set('max_execution_time', 120);
 
 // Redirect to no mod rewrite path
diff --git a/recovery/install/ping.php b/recovery/install/ping.php
index 3b7f324ab59..6d8efd1bc11 100644
--- a/recovery/install/ping.php
+++ b/recovery/install/ping.php
@@ -1,29 +1,29 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 header('HTTP/1.1 200 OK');
-//no  cache headers
+// no  cache headers
 header('Expires: Mon, 26 Jul 1990 05:00:00 GMT');
 header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
 header('Cache-Control: no-store, no-cache, must-revalidate');
diff --git a/recovery/install/src/Command/InstallCommand.php b/recovery/install/src/Command/InstallCommand.php
index 85a001b264b..d08bc98179b 100644
--- a/recovery/install/src/Command/InstallCommand.php
+++ b/recovery/install/src/Command/InstallCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Install\Command;
@@ -314,13 +314,13 @@ protected function getShopInfoFromInteractiveShell(Shop $shop)
         $this->IOHelper->writeln('<info>=== Shop Information ===</info>');
 
         $shop->locale = $this->askForShopShopLocale(Locale::getValidLocales(), $shop->locale);
-        $shop->host = $this->IOHelper->ask(sprintf('Shop host (%s): ', $shop->host), $shop->host);
-        $shop->basePath = $this->IOHelper->ask(sprintf('Shop base path (%s): ', $shop->basePath), $shop->basePath);
-        $shop->name = $this->IOHelper->ask(sprintf('Shop name (%s): ', $shop->name), $shop->name);
-        $shop->email = $this->IOHelper->ask(sprintf('Shop email (%s): ', $shop->email), $shop->email);
+        $shop->host = $this->IOHelper->ask(\sprintf('Shop host (%s): ', $shop->host), $shop->host);
+        $shop->basePath = $this->IOHelper->ask(\sprintf('Shop base path (%s): ', $shop->basePath), $shop->basePath);
+        $shop->name = $this->IOHelper->ask(\sprintf('Shop name (%s): ', $shop->name), $shop->name);
+        $shop->email = $this->IOHelper->ask(\sprintf('Shop email (%s): ', $shop->email), $shop->email);
 
         $question = new ChoiceQuestion(
-            sprintf('Shop currency (%s): ', $shop->currency),
+            \sprintf('Shop currency (%s): ', $shop->currency),
             Currency::getValidCurrencies(),
             $shop->currency
         );
@@ -405,7 +405,7 @@ protected function getConnectionInfoFromInteractiveShell(
                 $pdo = $databaseFactory->createPDOConnection($databaseConnectionInformation);
             } catch (PDOException $e) {
                 $IOHelper->writeln('');
-                $IOHelper->writeln(sprintf('Got database error: %s', $e->getMessage()));
+                $IOHelper->writeln(\sprintf('Got database error: %s', $e->getMessage()));
                 $IOHelper->writeln('');
 
                 $databaseConnectionInformation = $databaseInteractor->askDatabaseConnectionInformation(
@@ -780,7 +780,7 @@ private function printStartMessage()
 
         $this->IOHelper->cls();
         $this->IOHelper->printBanner();
-        $this->IOHelper->writeln(sprintf('<info>Welcome to the Shopware %s installer</info>', $version));
+        $this->IOHelper->writeln(\sprintf('<info>Welcome to the Shopware %s installer</info>', $version));
         $this->IOHelper->writeln('');
         $this->IOHelper->ask(new Question('Press return to start installation.', \PHP_EOL));
         $this->IOHelper->cls();
diff --git a/recovery/install/src/Console/Application.php b/recovery/install/src/Console/Application.php
index b6014916fb3..b8f0f08edf8 100644
--- a/recovery/install/src/Console/Application.php
+++ b/recovery/install/src/Console/Application.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Install\Console;
diff --git a/recovery/install/src/ContainerProvider.php b/recovery/install/src/ContainerProvider.php
index 7e828a209e8..d62049e8be1 100644
--- a/recovery/install/src/ContainerProvider.php
+++ b/recovery/install/src/ContainerProvider.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Install;
@@ -42,6 +42,7 @@
 use Shopware\Recovery\Install\Service\ThemeService;
 use Shopware\Recovery\Install\Service\TranslationService;
 use Shopware\Recovery\Install\Service\WebserverCheck;
+use voku\helper\AntiXSS;
 
 class ContainerProvider implements ServiceProviderInterface
 {
@@ -213,5 +214,9 @@ public function register(Container $container)
                 $c['http-client']
             );
         };
+
+        $container['anti.xss'] = function ($c) {
+            return new AntiXSS();
+        };
     }
 }
diff --git a/recovery/install/src/DatabaseFactory.php b/recovery/install/src/DatabaseFactory.php
index 018b024494e..4aa4cd61689 100644
--- a/recovery/install/src/DatabaseFactory.php
+++ b/recovery/install/src/DatabaseFactory.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Install;
diff --git a/recovery/install/src/DatabaseInteractor.php b/recovery/install/src/DatabaseInteractor.php
index 6f7ee417498..e5bb7222c15 100644
--- a/recovery/install/src/DatabaseInteractor.php
+++ b/recovery/install/src/DatabaseInteractor.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Install;
@@ -96,7 +96,7 @@ public function continueWithExistingTables($databaseName, PDO $pdo)
         }
 
         $question = new ConfirmationQuestion(
-            sprintf(
+            \sprintf(
                 'The database %s already contains %s tables. Continue? (yes/no) [no]',
                 $databaseName,
                 $tableCount
@@ -125,7 +125,7 @@ public function askQuestion(Question $question)
     protected function askForDatabaseHostname(
         $defaultHostname
     ) {
-        $question = new Question(sprintf('Please enter database host (%s): ', $defaultHostname), $defaultHostname);
+        $question = new Question(\sprintf('Please enter database host (%s): ', $defaultHostname), $defaultHostname);
         $question->setValidator(
             function ($answer) {
                 if (trim($answer) === '') {
@@ -152,7 +152,7 @@ protected function askForDatabaseUsername(
         if (empty($defaultUsername)) {
             $question = new Question('Please enter database user: ');
         } else {
-            $question = new Question(sprintf('Please enter database user (%s): ', $defaultUsername), $defaultUsername);
+            $question = new Question(\sprintf('Please enter database user (%s): ', $defaultUsername), $defaultUsername);
         }
 
         $question->setValidator(
@@ -180,7 +180,7 @@ protected function askForDatabasePassword(
         if (empty($defaultPassword)) {
             $question = new Question('Please enter database password: ');
         } else {
-            $question = new Question(sprintf('Please enter database password: (%s): ', $defaultPassword), $defaultPassword);
+            $question = new Question(\sprintf('Please enter database password: (%s): ', $defaultPassword), $defaultPassword);
         }
 
         $databaseUser = $this->askQuestion($question);
@@ -196,7 +196,7 @@ protected function askForDatabasePassword(
     private function askForDatabasePort(
         $defaultPort
     ) {
-        $question = new Question(sprintf('Please enter database port (%s): ', $defaultPort), $defaultPort);
+        $question = new Question(\sprintf('Please enter database port (%s): ', $defaultPort), $defaultPort);
         $question->setValidator(
             function ($answer) {
                 if (trim($answer) === '') {
diff --git a/recovery/install/src/MenuHelper.php b/recovery/install/src/MenuHelper.php
index 8af140665eb..fdedb782b22 100644
--- a/recovery/install/src/MenuHelper.php
+++ b/recovery/install/src/MenuHelper.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Install;
diff --git a/recovery/install/src/Requirements.php b/recovery/install/src/Requirements.php
index 4a8d13c5889..bd0f1b1c60c 100644
--- a/recovery/install/src/Requirements.php
+++ b/recovery/install/src/Requirements.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Install;
@@ -47,7 +47,7 @@ class Requirements
     public function __construct($sourceFile, TranslationService $translations)
     {
         if (!is_readable($sourceFile)) {
-            throw new RuntimeException(sprintf('Cannot read requirements file in %s.', $sourceFile));
+            throw new RuntimeException(\sprintf('Cannot read requirements file in %s.', $sourceFile));
         }
 
         $this->sourceFile = $sourceFile;
@@ -160,7 +160,7 @@ private function getRuntimeValue($name)
             return true;
         } elseif (\function_exists($name)) {
             return true;
-        } elseif (($value = ini_get($name)) !== null) {
+        } elseif (($value = \ini_get($name)) !== null) {
             if (strtolower($value) == 'off' || (is_numeric($value) && $value == 0)) {
                 return false;
             } elseif (strtolower($value) == 'on' || (is_numeric($value) && $value == 1)) {
@@ -235,10 +235,10 @@ private function checkOpcache()
             'name' => 'opcache.use_cwd',
             'group' => 'core',
             'required' => 1,
-            'version' => ini_get('opcache.use_cwd'),
-            'result' => ini_get('opcache.use_cwd'),
+            'version' => \ini_get('opcache.use_cwd'),
+            'result' => \ini_get('opcache.use_cwd'),
             'notice' => '',
-            'check' => $this->compare('opcache.use_cwd', ini_get('opcache.use_cwd'), '1'),
+            'check' => $this->compare('opcache.use_cwd', \ini_get('opcache.use_cwd'), '1'),
             'error' => '',
         ]];
 
@@ -248,10 +248,10 @@ private function checkOpcache()
                     'name' => 'opcache.validate_root',
                     'group' => 'core',
                     'required' => 1,
-                    'version' => ini_get('opcache.validate_root'),
-                    'result' => ini_get('opcache.validate_root'),
+                    'version' => \ini_get('opcache.validate_root'),
+                    'result' => \ini_get('opcache.validate_root'),
                     'notice' => '',
-                    'check' => $this->compare('opcache.validate_root', ini_get('opcache.validate_root'), '1'),
+                    'check' => $this->compare('opcache.validate_root', \ini_get('opcache.validate_root'), '1'),
                     'error' => '',
                 ];
             }
@@ -358,7 +358,7 @@ private function checkSessionSavePath()
     {
         if (\function_exists('session_save_path')) {
             return (bool) session_save_path();
-        } elseif (ini_get('session.save_path')) {
+        } elseif (\ini_get('session.save_path')) {
             return true;
         }
 
@@ -372,7 +372,7 @@ private function checkSessionSavePath()
      */
     private function checkSuhosinGetMaxValueLength()
     {
-        $length = (int) ini_get('suhosin.get.max_value_length');
+        $length = (int) \ini_get('suhosin.get.max_value_length');
         if ($length === 0) {
             return 2000;
         }
@@ -426,8 +426,8 @@ private function decodePhpSize($val)
             /* @noinspection PhpMissingBreakStatementInspection */
             case 'g':
                 $val *= 1024;
-            /* @noinspection PhpMissingBreakStatementInspection */
-            // no break
+                /* @noinspection PhpMissingBreakStatementInspection */
+                // no break
             case 'm':
                 $val *= 1024;
                 // no break
@@ -497,7 +497,7 @@ private function handleMaxCompatibleVersion(array $check)
             $maxCompatibleVersion = str_replace('.99', '', $check['maxCompatibleVersion']);
             $key = 'requirements_php_max_compatible_version';
 
-            $check['notice'] = sprintf($this->translations->translate($key), $maxCompatibleVersion);
+            $check['notice'] = \sprintf($this->translations->translate($key), $maxCompatibleVersion);
         }
 
         return $check;
diff --git a/recovery/install/src/RequirementsPath.php b/recovery/install/src/RequirementsPath.php
index 348b2ee640e..3cf0c8161ff 100644
--- a/recovery/install/src/RequirementsPath.php
+++ b/recovery/install/src/RequirementsPath.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Install;
diff --git a/recovery/install/src/RequirementsPathResult.php b/recovery/install/src/RequirementsPathResult.php
index ef89c8e59cb..64bf89f010d 100644
--- a/recovery/install/src/RequirementsPathResult.php
+++ b/recovery/install/src/RequirementsPathResult.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Install;
diff --git a/recovery/install/src/Service/AdminService.php b/recovery/install/src/Service/AdminService.php
index c91276f2298..9197f78a870 100644
--- a/recovery/install/src/Service/AdminService.php
+++ b/recovery/install/src/Service/AdminService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Install\Service;
diff --git a/recovery/install/src/Service/ConfigWriter.php b/recovery/install/src/Service/ConfigWriter.php
index 63f44a2aac6..eb8c39adf33 100644
--- a/recovery/install/src/Service/ConfigWriter.php
+++ b/recovery/install/src/Service/ConfigWriter.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Install\Service;
diff --git a/recovery/install/src/Service/CurrencyService.php b/recovery/install/src/Service/CurrencyService.php
index 33445642c91..597397b6314 100644
--- a/recovery/install/src/Service/CurrencyService.php
+++ b/recovery/install/src/Service/CurrencyService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Install\Service;
diff --git a/recovery/install/src/Service/DatabaseService.php b/recovery/install/src/Service/DatabaseService.php
index a37fd231a6a..4e4bd663300 100644
--- a/recovery/install/src/Service/DatabaseService.php
+++ b/recovery/install/src/Service/DatabaseService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Install\Service;
@@ -105,7 +105,7 @@ public function createDatabase($name, $charset = 'utf8', $collation = 'utf8_unic
         }
 
         return $this->connection->exec(
-            sprintf(
+            \sprintf(
                 '%s DATABASE `%s` CHARACTER SET `%s` COLLATE `%s`',
                 $dbExists ? 'ALTER' : 'CREATE',
                 $name,
@@ -151,7 +151,7 @@ public function checkPrivilegeOnSchema($schema, $permissions)
         }
 
         if (!\is_string($permissions) && !\is_array($permissions)) {
-            $msg = sprintf('String or array expected, got: %s', \gettype($permissions));
+            $msg = \sprintf('String or array expected, got: %s', \gettype($permissions));
             throw new InvalidArgumentException($msg);
         }
 
@@ -235,7 +235,7 @@ public function isSuperUser()
     public function checkUserPrivileges($privileges)
     {
         if (!\is_string($privileges) && !\is_array($privileges)) {
-            $msg = sprintf('String or array expected, got: %s', \gettype($privileges));
+            $msg = \sprintf('String or array expected, got: %s', \gettype($privileges));
             throw new InvalidArgumentException($msg);
         }
 
diff --git a/recovery/install/src/Service/Exceptions/LicenseHostException.php b/recovery/install/src/Service/Exceptions/LicenseHostException.php
index 541ccb5a264..97e19c40db7 100644
--- a/recovery/install/src/Service/Exceptions/LicenseHostException.php
+++ b/recovery/install/src/Service/Exceptions/LicenseHostException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Install\Service\Exceptions;
diff --git a/recovery/install/src/Service/Exceptions/LicenseInvalidException.php b/recovery/install/src/Service/Exceptions/LicenseInvalidException.php
index 8a249d62889..09009b90179 100644
--- a/recovery/install/src/Service/Exceptions/LicenseInvalidException.php
+++ b/recovery/install/src/Service/Exceptions/LicenseInvalidException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Install\Service\Exceptions;
diff --git a/recovery/install/src/Service/Exceptions/LicenseProductKeyException.php b/recovery/install/src/Service/Exceptions/LicenseProductKeyException.php
index e2604a84fc4..46035950a7e 100644
--- a/recovery/install/src/Service/Exceptions/LicenseProductKeyException.php
+++ b/recovery/install/src/Service/Exceptions/LicenseProductKeyException.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Install\Service\Exceptions;
diff --git a/recovery/install/src/Service/LicenseInstaller.php b/recovery/install/src/Service/LicenseInstaller.php
index e631cf6e983..a928bfdd9fc 100644
--- a/recovery/install/src/Service/LicenseInstaller.php
+++ b/recovery/install/src/Service/LicenseInstaller.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Install\Service;
diff --git a/recovery/install/src/Service/LicenseUnpackService.php b/recovery/install/src/Service/LicenseUnpackService.php
index 4c6583705b3..335fdb2d5e0 100644
--- a/recovery/install/src/Service/LicenseUnpackService.php
+++ b/recovery/install/src/Service/LicenseUnpackService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Install\Service;
diff --git a/recovery/install/src/Service/LocalLicenseUnpackService.php b/recovery/install/src/Service/LocalLicenseUnpackService.php
index 03365682cac..2b8aa877dfa 100644
--- a/recovery/install/src/Service/LocalLicenseUnpackService.php
+++ b/recovery/install/src/Service/LocalLicenseUnpackService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Install\Service;
diff --git a/recovery/install/src/Service/LocaleSettingsService.php b/recovery/install/src/Service/LocaleSettingsService.php
index 4aecf13d945..810416f8297 100644
--- a/recovery/install/src/Service/LocaleSettingsService.php
+++ b/recovery/install/src/Service/LocaleSettingsService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Install\Service;
diff --git a/recovery/install/src/Service/ShopService.php b/recovery/install/src/Service/ShopService.php
index be27fff6770..46da971f87c 100644
--- a/recovery/install/src/Service/ShopService.php
+++ b/recovery/install/src/Service/ShopService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Install\Service;
diff --git a/recovery/install/src/Service/ThemeService.php b/recovery/install/src/Service/ThemeService.php
index 1ee5a7b30dd..8ae47be832f 100644
--- a/recovery/install/src/Service/ThemeService.php
+++ b/recovery/install/src/Service/ThemeService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Install\Service;
diff --git a/recovery/install/src/Service/TranslationService.php b/recovery/install/src/Service/TranslationService.php
index 98f97aa5c89..bdbbfe8e323 100644
--- a/recovery/install/src/Service/TranslationService.php
+++ b/recovery/install/src/Service/TranslationService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Install\Service;
diff --git a/recovery/install/src/Service/WebserverCheck.php b/recovery/install/src/Service/WebserverCheck.php
index 32ddd75e4e5..a73747da331 100644
--- a/recovery/install/src/Service/WebserverCheck.php
+++ b/recovery/install/src/Service/WebserverCheck.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Install\Service;
diff --git a/recovery/install/src/Struct/AdminUser.php b/recovery/install/src/Struct/AdminUser.php
index 977d69811c8..24c6333dcd0 100644
--- a/recovery/install/src/Struct/AdminUser.php
+++ b/recovery/install/src/Struct/AdminUser.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Install\Struct;
diff --git a/recovery/install/src/Struct/Currency.php b/recovery/install/src/Struct/Currency.php
index dec97228005..882554f71a3 100644
--- a/recovery/install/src/Struct/Currency.php
+++ b/recovery/install/src/Struct/Currency.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Install\Struct;
diff --git a/recovery/install/src/Struct/DatabaseConnectionInformation.php b/recovery/install/src/Struct/DatabaseConnectionInformation.php
index 1b10b3a5ef4..0497a0aaa6a 100644
--- a/recovery/install/src/Struct/DatabaseConnectionInformation.php
+++ b/recovery/install/src/Struct/DatabaseConnectionInformation.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Install\Struct;
diff --git a/recovery/install/src/Struct/LicenseInformation.php b/recovery/install/src/Struct/LicenseInformation.php
index de3f5321544..32e35910977 100644
--- a/recovery/install/src/Struct/LicenseInformation.php
+++ b/recovery/install/src/Struct/LicenseInformation.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Install\Struct;
diff --git a/recovery/install/src/Struct/LicenseUnpackRequest.php b/recovery/install/src/Struct/LicenseUnpackRequest.php
index 252a421ced2..86231476358 100644
--- a/recovery/install/src/Struct/LicenseUnpackRequest.php
+++ b/recovery/install/src/Struct/LicenseUnpackRequest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Install\Struct;
diff --git a/recovery/install/src/Struct/Locale.php b/recovery/install/src/Struct/Locale.php
index 5228ad218a7..8dc4d579131 100644
--- a/recovery/install/src/Struct/Locale.php
+++ b/recovery/install/src/Struct/Locale.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Install\Struct;
diff --git a/recovery/install/src/Struct/Shop.php b/recovery/install/src/Struct/Shop.php
index f0fc12fec47..506f11e2118 100644
--- a/recovery/install/src/Struct/Shop.php
+++ b/recovery/install/src/Struct/Shop.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Install\Struct;
diff --git a/recovery/install/src/Struct/ShopwareEdition.php b/recovery/install/src/Struct/ShopwareEdition.php
index 82a218682c4..c8fec9d2c87 100644
--- a/recovery/install/src/Struct/ShopwareEdition.php
+++ b/recovery/install/src/Struct/ShopwareEdition.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Install\Struct;
diff --git a/recovery/install/src/Struct/ShopwareEditionValidationRequest.php b/recovery/install/src/Struct/ShopwareEditionValidationRequest.php
index e5b77a72ae6..40586aebc0c 100644
--- a/recovery/install/src/Struct/ShopwareEditionValidationRequest.php
+++ b/recovery/install/src/Struct/ShopwareEditionValidationRequest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Install\Struct;
diff --git a/recovery/install/src/Struct/Struct.php b/recovery/install/src/Struct/Struct.php
index 3bcbd00691d..a34d503ab3b 100644
--- a/recovery/install/src/Struct/Struct.php
+++ b/recovery/install/src/Struct/Struct.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Install\Struct;
diff --git a/recovery/install/src/app.php b/recovery/install/src/app.php
index f4e90a77e3b..9a70f25c3e0 100644
--- a/recovery/install/src/app.php
+++ b/recovery/install/src/app.php
@@ -1,28 +1,30 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Pimple\Container;
+use Shopware\Recovery\Common\Middelware\XssMiddleware;
+use Shopware\Recovery\Common\SystemLocker;
 use Shopware\Recovery\Common\Utils;
 use Shopware\Recovery\Install\ContainerProvider;
 use Shopware\Recovery\Install\DatabaseFactory;
@@ -39,9 +41,12 @@
 use Shopware\Recovery\Install\Service\ShopService;
 use Shopware\Recovery\Install\Service\ThemeService;
 use Shopware\Recovery\Install\Service\TranslationService;
+use Shopware\Recovery\Install\Struct\AdminUser;
 use Shopware\Recovery\Install\Struct\DatabaseConnectionInformation;
 use Shopware\Recovery\Install\Struct\LicenseUnpackRequest;
+use Shopware\Recovery\Install\Struct\Shop;
 use Slim\Slim;
+use voku\helper\AntiXSS;
 
 $config = require __DIR__ . '/../config/production.php';
 $container = new Container();
@@ -73,7 +78,7 @@
 
         // Init db in container
         $container->offsetSet('db', $connection);
-    } catch (\Exception $e) {
+    } catch (Exception $e) {
         // Jump to form
         throw $e;
     }
@@ -143,18 +148,21 @@ function localeForLanguage($language)
     return strtolower($language) . '_' . strtoupper($language);
 }
 
-function prefixSessionVars(Slim $app)
+function prefixSessionVars(Slim $app, Container $container)
 {
+    /** @var AntiXSS $antiXss */
+    $antiXss = $container->offsetGet('anti.xss');
+
     // Save post parameters starting with 'c_' to session
     $params = $app->request()->params();
     foreach ($params as $key => $value) {
         if (strpos($key, 'c_') !== false) {
-            $_SESSION['parameters'][$key] = $value;
+            $_SESSION['parameters'][$key] = $antiXss->xss_clean($value);
         }
     }
 }
 
-prefixSessionVars($app);
+prefixSessionVars($app, $container);
 $selectedLanguage = selectLanguage($container->offsetGet('config')['languages']);
 $translations = require __DIR__ . "/../data/lang/$selectedLanguage.php";
 
@@ -181,6 +189,8 @@ function prefixSessionVars(Slim $app)
 
 $app->setCookie('installed-locale', localeForLanguage($selectedLanguage), time() + 7200, '/');
 
+$app->add(new XssMiddleware());
+
 $app->error(function (Exception $e) use ($app) {
     if (!$app->request()->isAjax()) {
         throw $e;
@@ -308,7 +318,7 @@ function prefixSessionVars(Slim $app)
     try {
         $databaseFactory = new DatabaseFactory();
         $databaseFactory->createPDOConnection($connectionInfo); // check connection
-    } catch (\Exception $e) {
+    } catch (Exception $e) {
         $app->render('database-configuration.php', ['error' => $e->getMessage()]);
 
         return;
@@ -320,7 +330,7 @@ function prefixSessionVars(Slim $app)
         /** @var ConfigWriter $configWriter */
         $configWriter = $container->offsetGet('config.writer');
         $configWriter->writeConfig($connectionInfo);
-    } catch (\Exception $e) {
+    } catch (Exception $e) {
         $app->render('database-configuration.php', ['error' => $e->getMessage()]);
 
         return;
@@ -338,9 +348,9 @@ function prefixSessionVars(Slim $app)
     }
 
     try {
-        /** @var \PDO $connection */
+        /** @var PDO $connection */
         $connection = $container->offsetGet('db');
-    } catch (\Exception $e) {
+    } catch (Exception $e) {
         $menuHelper->setCurrent('database-configuration');
         $app->render(
             'database-configuration.php',
@@ -353,7 +363,7 @@ function prefixSessionVars(Slim $app)
     try {
         $connection->query('SELECT * FROM s_schema_version')->fetchAll();
         $hasSchema = true;
-    } catch (\Exception $e) {
+    } catch (Exception $e) {
         $hasSchema = false;
     }
 
@@ -366,7 +376,7 @@ function prefixSessionVars(Slim $app)
 
     try {
         $container->offsetGet('db');
-    } catch (\Exception $e) {
+    } catch (Exception $e) {
         $menuHelper->setCurrent('database-configuration');
         $app->render('database-configuration.php', ['error' => 'Please fill in all fields']);
 
@@ -393,7 +403,7 @@ function prefixSessionVars(Slim $app)
 
             try {
                 $licenseInformation = $licenseUnpackService->evaluateLicense($unpackRequest, $translationService);
-            } catch (\Exception $e) {
+            } catch (Exception $e) {
                 $app->view()->setData('error', $e->getMessage());
                 $app->render('/edition.php');
 
@@ -424,7 +434,7 @@ function prefixSessionVars(Slim $app)
 
     try {
         $db = $container->offsetGet('db');
-    } catch (\Exception $e) {
+    } catch (Exception $e) {
         $menuHelper->setCurrent('database-configuration');
         $app->render('database-configuration.php', ['error' => 'Please fill in all fields']);
 
@@ -432,7 +442,7 @@ function prefixSessionVars(Slim $app)
     }
 
     if ($app->request()->isPost()) {
-        $adminUser = new \Shopware\Recovery\Install\Struct\AdminUser([
+        $adminUser = new AdminUser([
             'email' => $_SESSION['parameters']['c_config_admin_email'],
             'username' => $_SESSION['parameters']['c_config_admin_username'],
             'name' => $_SESSION['parameters']['c_config_admin_name'],
@@ -440,7 +450,7 @@ function prefixSessionVars(Slim $app)
             'locale' => localeForLanguage($_SESSION['language']),
         ]);
 
-        $shop = new \Shopware\Recovery\Install\Struct\Shop([
+        $shop = new Shop([
             'name' => $_SESSION['parameters']['c_config_shopName'],
             'locale' => $_SESSION['parameters']['c_config_shop_language'],
             'currency' => $_SESSION['parameters']['c_config_shop_currency'],
@@ -463,7 +473,7 @@ function prefixSessionVars(Slim $app)
             $currencyService->updateCurrency($shop);
             $shopService->updateConfig($shop);
             $localeSettingsService->updateLocaleSettings($locale);
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             $hasErrors = true;
             $app->view()->setData('error', $e->getMessage());
         }
@@ -505,7 +515,7 @@ function prefixSessionVars(Slim $app)
 
     $basepath = str_replace('/recovery/install/index.php', '', $_SERVER['SCRIPT_NAME']);
 
-    /** @var \Shopware\Recovery\Common\SystemLocker $systemLocker */
+    /** @var SystemLocker $systemLocker */
     $systemLocker = $container->offsetGet('system.locker');
     $systemLocker();
 
@@ -536,10 +546,10 @@ function prefixSessionVars(Slim $app)
     $response->header('Content-Type', 'application/json');
     $response->status(200);
 
-    /** @var \PDO $db */
+    /** @var PDO $db */
     $db = $container->offsetGet('db');
 
-    /** @var \Shopware\Recovery\Common\DumpIterator $dump */
+    /** @var Shopware\Recovery\Common\DumpIterator $dump */
     $dump = $container->offsetGet('database.dump_iterator');
 
     $offset = (int) $request->get('offset', 0);
@@ -552,13 +562,13 @@ function prefixSessionVars(Slim $app)
     // How many queries should be executed per http request?
     $batchSize = 100;
 
-    /** @var Shopware\Recovery\Install\Service\DatabaseService $databaseService */
+    /** @var DatabaseService $databaseService */
     $databaseService = $container->offsetGet('database.service');
 
     // For end users, we hide the error if we can not create the database or alter it.
     try {
         $databaseService->createDatabase($_SESSION['parameters']['c_database_schema']);
-    } catch (\Exception $e) {
+    } catch (Exception $e) {
     }
 
     $preSql = <<<'EOD'
@@ -621,7 +631,7 @@ function prefixSessionVars(Slim $app)
     $response->header('Content-Type', 'application/json');
     $response->status(200);
 
-    /** @var \Shopware\Recovery\Common\DumpIterator $dump */
+    /** @var Shopware\Recovery\Common\DumpIterator $dump */
     $dump = $container->offsetGet('database.snippet_dump_iterator');
     $offset = (int) $app->request()->get('offset', 0);
     $totalCount = (int) $app->request()->get('totalCount', 0);
@@ -630,7 +640,7 @@ function prefixSessionVars(Slim $app)
         $totalCount = $dump->count();
     }
 
-    /** @var \PDO $conn */
+    /** @var PDO $conn */
     $conn = $container->offsetGet('db');
 
     $preSql = '
@@ -655,7 +665,7 @@ function prefixSessionVars(Slim $app)
         try {
             $conn->exec($current);
             $dump->next();
-        } catch (\PDOException $e) {
+        } catch (PDOException $e) {
             $data = [
                 'query' => $sql,
                 'success' => false,
@@ -694,7 +704,7 @@ function prefixSessionVars(Slim $app)
     try {
         $databaseFactory = new DatabaseFactory();
         $connection = $databaseFactory->createPDOConnection($connectionInfo);
-    } catch (\Exception $e) {
+    } catch (Exception $e) {
         $response->header('Content-Type', 'application/json');
         $response->status(200);
         $response->body(json_encode([]));
diff --git a/recovery/tests/Install/Command/InstallCommandTest.php b/recovery/tests/Install/Command/InstallCommandTest.php
index 8e93b42a567..2d578fddbe1 100644
--- a/recovery/tests/Install/Command/InstallCommandTest.php
+++ b/recovery/tests/Install/Command/InstallCommandTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Tests\Install\Command;
diff --git a/recovery/tests/Traits/InstallCommandTestTrait.php b/recovery/tests/Traits/InstallCommandTestTrait.php
index e3a82e00274..cfcc1a9722e 100644
--- a/recovery/tests/Traits/InstallCommandTestTrait.php
+++ b/recovery/tests/Traits/InstallCommandTestTrait.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Tests\Traits;
diff --git a/recovery/tests/Unit/XssMiddlewareTest.php b/recovery/tests/Unit/XssMiddlewareTest.php
new file mode 100644
index 00000000000..2f03c31a513
--- /dev/null
+++ b/recovery/tests/Unit/XssMiddlewareTest.php
@@ -0,0 +1,72 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Recovery\Tests\Install\Command;
+
+use Generator;
+use PHPUnit\Framework\TestCase;
+use Shopware\Recovery\Common\Middelware\XssMiddleware;
+use Shopware\Recovery\Tests\Traits\InstallCommandTestTrait;
+use Slim\Slim;
+
+class XssMiddlewareTest extends TestCase
+{
+    use InstallCommandTestTrait;
+
+    /**
+     * @dataProvider createInputData
+     */
+    public function testXssMiddleware($slimInputOriginal, $slimInput): void
+    {
+        $settings = [
+            'slim.input' => $slimInputOriginal,
+        ];
+
+        $env = \Slim\Environment::mock($settings);
+
+        $app = new Slim();
+        $app->environment = $env;
+
+        $xssMiddleware = new XssMiddleware();
+        $xssMiddleware->setApplication($app);
+        $xssMiddleware->setNextMiddleware($app);
+        $xssMiddleware->call();
+
+        static::assertEquals($slimInput, $app->environment['slim.input']);
+    }
+
+    public static function createInputData(): Generator
+    {
+        yield 'No xss' => [
+            'adc',
+            'adc',
+        ];
+
+        yield 'Xss' => [
+            '/><script>alert(1)</script>',
+            '/>',
+        ];
+    }
+}
diff --git a/recovery/tests/bootstrap.php b/recovery/tests/bootstrap.php
index 66ed428c456..cc2e0c10e30 100644
--- a/recovery/tests/bootstrap.php
+++ b/recovery/tests/bootstrap.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 $autoloader = require_once __DIR__ . '/../common/autoload.php';
diff --git a/recovery/update/config/config.php b/recovery/update/config/config.php
index ed3219a0e8a..99c41b1b7ee 100644
--- a/recovery/update/config/config.php
+++ b/recovery/update/config/config.php
@@ -1,30 +1,32 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+use Slim\Log;
+
 return [
     'slim' => [
-        'log.level' => \Slim\Log::DEBUG,
+        'log.level' => Log::DEBUG,
         'log.enabled' => true,
         'debug' => true, // set debug to false so custom error handler is used
         'check.ip' => false,
diff --git a/recovery/update/data/lang/de.php b/recovery/update/data/lang/de.php
index 0fe1a61a92f..824890e5f6f 100644
--- a/recovery/update/data/lang/de.php
+++ b/recovery/update/data/lang/de.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 return [
diff --git a/recovery/update/data/lang/en.php b/recovery/update/data/lang/en.php
index 5d5bf4949c9..d7f8d98c7d0 100644
--- a/recovery/update/data/lang/en.php
+++ b/recovery/update/data/lang/en.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 return [
diff --git a/recovery/update/data/lang/nl.php b/recovery/update/data/lang/nl.php
index 601dfd6aac3..5ca6d4a0aef 100644
--- a/recovery/update/data/lang/nl.php
+++ b/recovery/update/data/lang/nl.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 return [
diff --git a/recovery/update/index.php b/recovery/update/index.php
index 959bf821015..cba1930bec7 100644
--- a/recovery/update/index.php
+++ b/recovery/update/index.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 require_once __DIR__ . '/../common/autoload.php';
@@ -28,9 +28,9 @@
 $isManual = is_dir(SW_PATH . '/update-assets');
 if ($isManual) {
     \define('UPDATE_IS_MANUAL', true);
-    \define('UPDATE_FILES_PATH', null);
+    \define('UPDATE_FILES_PATH', '');
     \define('UPDATE_ASSET_PATH', SW_PATH . '/update-assets');
-    \define('UPDATE_META_FILE', null);
+    \define('UPDATE_META_FILE', '');
 } else {
     \define('UPDATE_IS_MANUAL', false);
     \define('UPDATE_FILES_PATH', SW_PATH . '/files/update/files');
diff --git a/recovery/update/src/Cleanup.php b/recovery/update/src/Cleanup.php
index a19685cd6f1..adc323ca052 100644
--- a/recovery/update/src/Cleanup.php
+++ b/recovery/update/src/Cleanup.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Update;
diff --git a/recovery/update/src/CleanupFilesFinder.php b/recovery/update/src/CleanupFilesFinder.php
index c0a9dee55c7..26aeccf8b57 100644
--- a/recovery/update/src/CleanupFilesFinder.php
+++ b/recovery/update/src/CleanupFilesFinder.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Update;
diff --git a/recovery/update/src/Command/UpdateCommand.php b/recovery/update/src/Command/UpdateCommand.php
index 60ac3786286..1c96b84fcc3 100644
--- a/recovery/update/src/Command/UpdateCommand.php
+++ b/recovery/update/src/Command/UpdateCommand.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Update\Command;
@@ -92,7 +92,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $ioService->cls();
             $ioService->printBanner();
             $ioService->writeln('<info>Welcome to the Shopware updater </info>');
-            $ioService->writeln(sprintf('Shopware Version %s', $version));
+            $ioService->writeln(\sprintf('Shopware Version %s', $version));
             $ioService->writeln('');
             $ioService->ask('Press return to start the update.');
             $ioService->cls();
@@ -111,7 +111,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $ioService->writeln('');
         $ioService->writeln('<info>The update has been finished succesfuly.</info>');
         $ioService->writeln('Your shop is currently in maintenance mode.');
-        $ioService->writeln(sprintf('Please delete <question>%s</question> to finish the update.', UPDATE_ASSET_PATH));
+        $ioService->writeln(\sprintf('Please delete <question>%s</question> to finish the update.', UPDATE_ASSET_PATH));
         $ioService->writeln('');
 
         return 0;
@@ -134,8 +134,7 @@ private function unpackFiles()
         /** @var PathBuilder $pathBuilder */
         $pathBuilder = $this->container->get('path.builder');
 
-        $debug = false;
-        $step = new UnpackStep($localFilesytem, $remoteFilesystem, $pathBuilder, $debug);
+        $step = new UnpackStep($localFilesytem, $remoteFilesystem, $pathBuilder, false);
 
         $offset = 0;
         $total = 0;
diff --git a/recovery/update/src/Console/Application.php b/recovery/update/src/Console/Application.php
index c36280ddc57..39d19315680 100644
--- a/recovery/update/src/Console/Application.php
+++ b/recovery/update/src/Console/Application.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Update\Console;
diff --git a/recovery/update/src/Controller/BatchController.php b/recovery/update/src/Controller/BatchController.php
index aba75af3cd5..487220781e9 100644
--- a/recovery/update/src/Controller/BatchController.php
+++ b/recovery/update/src/Controller/BatchController.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Update\Controller;
@@ -132,8 +132,7 @@ public function unpack()
         /** @var PathBuilder $pathBuilder */
         $pathBuilder = $this->container->get('path.builder');
 
-        $debug = false;
-        $step = new UnpackStep($localFilesystem, $remoteFilesystem, $pathBuilder, $debug);
+        $step = new UnpackStep($localFilesystem, $remoteFilesystem, $pathBuilder, false);
 
         $result = $step->run($offset, $total);
 
diff --git a/recovery/update/src/Controller/CleanupController.php b/recovery/update/src/Controller/CleanupController.php
index c407b63f6e7..cfe37f485cb 100644
--- a/recovery/update/src/Controller/CleanupController.php
+++ b/recovery/update/src/Controller/CleanupController.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Update\Controller;
@@ -163,7 +163,7 @@ function ($path) {
     public function deleteOutdatedFolders()
     {
         echo $this->cleanupService->cleanup();
-        exit();
+        exit;
     }
 
     private function cleanupMedia()
diff --git a/recovery/update/src/Controller/RequirementsController.php b/recovery/update/src/Controller/RequirementsController.php
index e70ec92f8fb..d008e185a55 100644
--- a/recovery/update/src/Controller/RequirementsController.php
+++ b/recovery/update/src/Controller/RequirementsController.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Update\Controller;
diff --git a/recovery/update/src/DependencyInjection/Container.php b/recovery/update/src/DependencyInjection/Container.php
index 52c9b9d853a..95c2a977790 100644
--- a/recovery/update/src/DependencyInjection/Container.php
+++ b/recovery/update/src/DependencyInjection/Container.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Update\DependencyInjection;
diff --git a/recovery/update/src/DummyPluginFinder.php b/recovery/update/src/DummyPluginFinder.php
index 715f5f1232f..78f29683a0e 100644
--- a/recovery/update/src/DummyPluginFinder.php
+++ b/recovery/update/src/DummyPluginFinder.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Update;
diff --git a/recovery/update/src/FilePermissionChanger.php b/recovery/update/src/FilePermissionChanger.php
index 3699fa8722a..6294d7e7142 100644
--- a/recovery/update/src/FilePermissionChanger.php
+++ b/recovery/update/src/FilePermissionChanger.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Update;
diff --git a/recovery/update/src/FilesystemFactory.php b/recovery/update/src/FilesystemFactory.php
index f3ec5e2f761..197276e0912 100644
--- a/recovery/update/src/FilesystemFactory.php
+++ b/recovery/update/src/FilesystemFactory.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Update;
diff --git a/recovery/update/src/PathBuilder.php b/recovery/update/src/PathBuilder.php
index 3e4d39309da..e5d63885d8d 100644
--- a/recovery/update/src/PathBuilder.php
+++ b/recovery/update/src/PathBuilder.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Update;
diff --git a/recovery/update/src/PluginCheck.php b/recovery/update/src/PluginCheck.php
index 2457fd9ecbe..67ebb4e29b7 100644
--- a/recovery/update/src/PluginCheck.php
+++ b/recovery/update/src/PluginCheck.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Update;
diff --git a/recovery/update/src/Results/DeleteResult.php b/recovery/update/src/Results/DeleteResult.php
index a74811d8506..64b20cc4157 100644
--- a/recovery/update/src/Results/DeleteResult.php
+++ b/recovery/update/src/Results/DeleteResult.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Update\Results;
diff --git a/recovery/update/src/Steps/ErrorResult.php b/recovery/update/src/Steps/ErrorResult.php
index d67fbc13000..560b8167431 100644
--- a/recovery/update/src/Steps/ErrorResult.php
+++ b/recovery/update/src/Steps/ErrorResult.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Update\Steps;
@@ -44,11 +44,10 @@ class ErrorResult
     private $args;
 
     /**
-     * @param string    $message
-     * @param Exception $exception
-     * @param array     $args
+     * @param string $message
+     * @param array  $args
      */
-    public function __construct($message, Exception $exception = null, $args = [])
+    public function __construct($message, ?Exception $exception = null, $args = [])
     {
         $this->message = $message;
         $this->exception = $exception;
diff --git a/recovery/update/src/Steps/FinishResult.php b/recovery/update/src/Steps/FinishResult.php
index 6681c7f8dcc..508a17a473e 100644
--- a/recovery/update/src/Steps/FinishResult.php
+++ b/recovery/update/src/Steps/FinishResult.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Update\Steps;
diff --git a/recovery/update/src/Steps/MigrationStep.php b/recovery/update/src/Steps/MigrationStep.php
index f6771b4197e..8f1902d1a7c 100644
--- a/recovery/update/src/Steps/MigrationStep.php
+++ b/recovery/update/src/Steps/MigrationStep.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Update\Steps;
@@ -32,7 +32,7 @@
 class MigrationStep
 {
     /**
-     * @var \Shopware\Components\Migrations\Manager
+     * @var Manager
      */
     private $migrationManager;
 
diff --git a/recovery/update/src/Steps/ResultMapper.php b/recovery/update/src/Steps/ResultMapper.php
index 35879f14ae4..ba4814d0f12 100644
--- a/recovery/update/src/Steps/ResultMapper.php
+++ b/recovery/update/src/Steps/ResultMapper.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Update\Steps;
@@ -62,6 +62,6 @@ public function toExtJs($result)
             ];
         }
 
-        throw new Exception(sprintf('Result type %s can not be mapped.', \get_class($result)));
+        throw new Exception(\sprintf('Result type %s can not be mapped.', \get_class($result)));
     }
 }
diff --git a/recovery/update/src/Steps/SnippetStep.php b/recovery/update/src/Steps/SnippetStep.php
index 4098f254e84..e9464dffc62 100644
--- a/recovery/update/src/Steps/SnippetStep.php
+++ b/recovery/update/src/Steps/SnippetStep.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Update\Steps;
diff --git a/recovery/update/src/Steps/UnpackStep.php b/recovery/update/src/Steps/UnpackStep.php
index 339ca29b495..5dfb4d5b897 100644
--- a/recovery/update/src/Steps/UnpackStep.php
+++ b/recovery/update/src/Steps/UnpackStep.php
@@ -1,65 +1,54 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Update\Steps;
 
-use Gaufrette\Filesystem;
+use Gaufrette\FilesystemInterface;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 use RuntimeException;
-use Shopware\Recovery\Update\pathBuilder;
+use Shopware\Recovery\Update\PathBuilder;
 use SplFileInfo;
 
 class UnpackStep
 {
-    /**
-     * @var \Gaufrette\Filesystem
-     */
-    private $localFilesyste;
+    private FilesystemInterface $localFilesystem;
 
-    /**
-     * @var \Gaufrette\Filesystem
-     */
-    private $remoteFilesyste;
+    private FilesystemInterface $remoteFilesystem;
 
-    /**
-     * @var PathBuilder
-     */
-    private $pathBuilder;
+    private PathBuilder $pathBuilder;
 
-    /**
-     * @var bool
-     */
-    private $isDebug;
+    private bool $isDebug;
 
-    /**
-     * @param bool $isDebug
-     */
-    public function __construct(Filesystem $localFilesyste, Filesystem $remoteFilesyste, PathBuilder $pathBuilder, $isDebug = false)
-    {
-        $this->localFilesyste = $localFilesyste;
-        $this->remoteFilesyste = $remoteFilesyste;
+    public function __construct(
+        FilesystemInterface $localFilesystem,
+        FilesystemInterface $remoteFilesystem,
+        PathBuilder $pathBuilder,
+        bool $isDebug = false
+    ) {
+        $this->localFilesystem = $localFilesystem;
+        $this->remoteFilesystem = $remoteFilesystem;
         $this->pathBuilder = $pathBuilder;
         $this->isDebug = $isDebug;
     }
@@ -76,8 +65,8 @@ public function run($offset, $total)
     {
         $inflector = $this->pathBuilder;
 
-        $remoteFs = $this->remoteFilesyste;
-        $localFs = $this->localFilesyste;
+        $remoteFs = $this->remoteFilesystem;
+        $localFs = $this->localFilesystem;
 
         $backupDirRelative = $inflector->getBackupDirRelative();
 
diff --git a/recovery/update/src/Steps/ValidResult.php b/recovery/update/src/Steps/ValidResult.php
index 2844978401c..819b1dea81b 100644
--- a/recovery/update/src/Steps/ValidResult.php
+++ b/recovery/update/src/Steps/ValidResult.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Update\Steps;
diff --git a/recovery/update/src/StoreApi.php b/recovery/update/src/StoreApi.php
index 295aaa83b25..0cebc6831c6 100644
--- a/recovery/update/src/StoreApi.php
+++ b/recovery/update/src/StoreApi.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Update;
diff --git a/recovery/update/src/Struct/Struct.php b/recovery/update/src/Struct/Struct.php
index 9d54a26273b..7dac8554158 100644
--- a/recovery/update/src/Struct/Struct.php
+++ b/recovery/update/src/Struct/Struct.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Update\Struct;
diff --git a/recovery/update/src/Struct/Version.php b/recovery/update/src/Struct/Version.php
index a8f1952fd37..058b677bcf5 100644
--- a/recovery/update/src/Struct/Version.php
+++ b/recovery/update/src/Struct/Version.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Update\Struct;
diff --git a/recovery/update/src/UpdateHtaccess.php b/recovery/update/src/UpdateHtaccess.php
index aa64120d463..c88c775ec98 100644
--- a/recovery/update/src/UpdateHtaccess.php
+++ b/recovery/update/src/UpdateHtaccess.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Update;
@@ -40,44 +39,44 @@ class UpdateHtaccess
      * versions, the file gets replaced with the new .htacces.dist.
      */
     private const OLD_FILES = [
-        'ea1cf343d866211a2cd3fb1cda96c568', // https://github.com/shopware/shopware/blob/2822875087/.htaccess
-        '50201598e7180f7c9165936a9c5f4a53', // https://github.com/shopware/shopware/blob/2822875087/.htaccess + SwagSecurity section
-        'ae5381e3a07011f35a45c066749f76a5', // https://github.com/shopware/shopware/blob/37213e91d5/.htaccess
-        'baeb964cec3d2696e1030a5018b345c6', // https://github.com/shopware/shopware/blob/37213e91d5/.htaccess + SwagSecurity section
-        'e18138d4ef5c4dda6c5a24f796d83109', // https://github.com/shopware/shopware/blob/f307af9286/.htaccess
-        'c0f0bea10c3a8f5b1550d8d537294e32', // https://github.com/shopware/shopware/blob/f307af9286/.htaccess + SwagSecurity section
-        'f45b5cf94584b362960acca19bd79a02', // https://github.com/shopware/shopware/blob/e4b24110b9/.htaccess
-        'fd449fd74ce36aa3f4f01be5b198c42b', // https://github.com/shopware/shopware/blob/e4b24110b9/.htaccess + SwagSecurity section
-        '9d8825b4597f8f46dc40137b7afe2602', // https://github.com/shopware/shopware/blob/dea3a35b71/.htaccess
-        '7dc562c8f584358dae85e335e192c59f', // https://github.com/shopware/shopware/blob/dea3a35b71/.htaccess + SwagSecurity section
-        '657f2a28ce414c1a859f9f104bf16522', // https://github.com/shopware/shopware/blob/649b5a6e0a/.htaccess
-        'a10d145e79029b78c797e58995eb2743', // https://github.com/shopware/shopware/blob/649b5a6e0a/.htaccess + SwagSecurity section
-        'ece5e7d151499f18db260955642bc342', // https://github.com/shopware/shopware/blob/1982fda855/.htaccess
-        'bece28210fc7c53c424999daa2f93303', // https://github.com/shopware/shopware/blob/1982fda855/.htaccess + SwagSecurity section
-        'ebe05d01541cfd3bb4dcb4f46b761c0f', // https://github.com/shopware/shopware/blob/24b7abaa25/.htaccess
-        '16147aac5b54351c55f1cc2403892f40', // https://github.com/shopware/shopware/blob/24b7abaa25/.htaccess + SwagSecurity section
-        '54085d04dbcf32bdc27a464258380240', // https://github.com/shopware/shopware/blob/cf8907c6c5/.htaccess
-        '78f7207131fad361a710991f73620dd6', // https://github.com/shopware/shopware/blob/cf8907c6c5/.htaccess + SwagSecurity section
-        'be8e8ddf9e048dcd127beeb7a1f2b93b', // https://github.com/shopware/shopware/blob/053632e79f/.htaccess
-        'aaa3dae669543f176ec76ef1acb53b1b', // https://github.com/shopware/shopware/blob/053632e79f/.htaccess + SwagSecurity section
-        '33dd62e280adb9809173c3208eb14547', // https://github.com/shopware/shopware/blob/b021d77c8a/.htaccess
-        '7707cd5927b638a258548fd78c31e61a', // https://github.com/shopware/shopware/blob/b021d77c8a/.htaccess + SwagSecurity section
-        '45ef3f6ca5788085a3bb7378a1510c80', // https://github.com/shopware/shopware/blob/4aba9b79ac/.htaccess
-        '79b3663dd1dfa883a6d23b7cc6f56bd0', // https://github.com/shopware/shopware/blob/4aba9b79ac/.htaccess + SwagSecurity section
-        '486f52a32a31b97e11d5a83a0add7541', // https://github.com/shopware/shopware/blob/c0616709fb/.htaccess
-        'ec269ec668c9e64c6e188ee0bdf9c273', // https://github.com/shopware/shopware/blob/c0616709fb/.htaccess + SwagSecurity section
-        '49959e6a8fa61bf38b1c269e97da0d46', // https://github.com/shopware/shopware/blob/2ab66c45c9/.htaccess
-        'afde28bbcdf4f0d437ec44641a6faa3c', // https://github.com/shopware/shopware/blob/2ab66c45c9/.htaccess + SwagSecurity section
-        '1927450e0bcd5a1fbdad879356329f9d', // https://github.com/shopware/shopware/blob/0c0f6ff2e6/.htaccess
-        '7df38ad7aaa2410e363b3945759d9cf4', // https://github.com/shopware/shopware/blob/0c0f6ff2e6/.htaccess + SwagSecurity section
-        '136f3597e8745ae57e7e3139fab84c78', // https://github.com/shopware/shopware/blob/710076a2a2/.htaccess
-        'b3ece266f62b8f7ab75307f2e9734605', // https://github.com/shopware/shopware/blob/710076a2a2/.htaccess + SwagSecurity section
-        'b7f41355e1db0103b48bfe36458e4bb7', // https://github.com/shopware/shopware/blob/bb95afbd01/.htaccess
-        '596eb625c7f2804c10ec7be1ab441c82', // https://github.com/shopware/shopware/blob/bb95afbd01/.htaccess + SwagSecurity section
-        '781a1cdbd51aabf58e4626b3db8fd9c5', // https://github.com/shopware/shopware/blob/08661660a6/.htaccess
-        'aaff6dcc929190c7f65e26fe3ec0538b', // https://github.com/shopware/shopware/blob/08661660a6/.htaccess + SwagSecurity section
-        '5d7e6211ff581e12cbd9769e5b3da4bd', // https://github.com/shopware/shopware/blob/7662e140d2/.htaccess
-        '7ca5b55b89c5a2306307d9b65479791a', // https://github.com/shopware/shopware/blob/7662e140d2/.htaccess + SwagSecurity section
+        'ea1cf343d866211a2cd3fb1cda96c568', // https://github.com/shopware5/shopware/blob/2822875087/.htaccess
+        '50201598e7180f7c9165936a9c5f4a53', // https://github.com/shopware5/shopware/blob/2822875087/.htaccess + SwagSecurity section
+        'ae5381e3a07011f35a45c066749f76a5', // https://github.com/shopware5/shopware/blob/37213e91d5/.htaccess
+        'baeb964cec3d2696e1030a5018b345c6', // https://github.com/shopware5/shopware/blob/37213e91d5/.htaccess + SwagSecurity section
+        'e18138d4ef5c4dda6c5a24f796d83109', // https://github.com/shopware5/shopware/blob/f307af9286/.htaccess
+        'c0f0bea10c3a8f5b1550d8d537294e32', // https://github.com/shopware5/shopware/blob/f307af9286/.htaccess + SwagSecurity section
+        'f45b5cf94584b362960acca19bd79a02', // https://github.com/shopware5/shopware/blob/e4b24110b9/.htaccess
+        'fd449fd74ce36aa3f4f01be5b198c42b', // https://github.com/shopware5/shopware/blob/e4b24110b9/.htaccess + SwagSecurity section
+        '9d8825b4597f8f46dc40137b7afe2602', // https://github.com/shopware5/shopware/blob/dea3a35b71/.htaccess
+        '7dc562c8f584358dae85e335e192c59f', // https://github.com/shopware5/shopware/blob/dea3a35b71/.htaccess + SwagSecurity section
+        '657f2a28ce414c1a859f9f104bf16522', // https://github.com/shopware5/shopware/blob/649b5a6e0a/.htaccess
+        'a10d145e79029b78c797e58995eb2743', // https://github.com/shopware5/shopware/blob/649b5a6e0a/.htaccess + SwagSecurity section
+        'ece5e7d151499f18db260955642bc342', // https://github.com/shopware5/shopware/blob/1982fda855/.htaccess
+        'bece28210fc7c53c424999daa2f93303', // https://github.com/shopware5/shopware/blob/1982fda855/.htaccess + SwagSecurity section
+        'ebe05d01541cfd3bb4dcb4f46b761c0f', // https://github.com/shopware5/shopware/blob/24b7abaa25/.htaccess
+        '16147aac5b54351c55f1cc2403892f40', // https://github.com/shopware5/shopware/blob/24b7abaa25/.htaccess + SwagSecurity section
+        '54085d04dbcf32bdc27a464258380240', // https://github.com/shopware5/shopware/blob/cf8907c6c5/.htaccess
+        '78f7207131fad361a710991f73620dd6', // https://github.com/shopware5/shopware/blob/cf8907c6c5/.htaccess + SwagSecurity section
+        'be8e8ddf9e048dcd127beeb7a1f2b93b', // https://github.com/shopware5/shopware/blob/053632e79f/.htaccess
+        'aaa3dae669543f176ec76ef1acb53b1b', // https://github.com/shopware5/shopware/blob/053632e79f/.htaccess + SwagSecurity section
+        '33dd62e280adb9809173c3208eb14547', // https://github.com/shopware5/shopware/blob/b021d77c8a/.htaccess
+        '7707cd5927b638a258548fd78c31e61a', // https://github.com/shopware5/shopware/blob/b021d77c8a/.htaccess + SwagSecurity section
+        '45ef3f6ca5788085a3bb7378a1510c80', // https://github.com/shopware5/shopware/blob/4aba9b79ac/.htaccess
+        '79b3663dd1dfa883a6d23b7cc6f56bd0', // https://github.com/shopware5/shopware/blob/4aba9b79ac/.htaccess + SwagSecurity section
+        '486f52a32a31b97e11d5a83a0add7541', // https://github.com/shopware5/shopware/blob/c0616709fb/.htaccess
+        'ec269ec668c9e64c6e188ee0bdf9c273', // https://github.com/shopware5/shopware/blob/c0616709fb/.htaccess + SwagSecurity section
+        '49959e6a8fa61bf38b1c269e97da0d46', // https://github.com/shopware5/shopware/blob/2ab66c45c9/.htaccess
+        'afde28bbcdf4f0d437ec44641a6faa3c', // https://github.com/shopware5/shopware/blob/2ab66c45c9/.htaccess + SwagSecurity section
+        '1927450e0bcd5a1fbdad879356329f9d', // https://github.com/shopware5/shopware/blob/0c0f6ff2e6/.htaccess
+        '7df38ad7aaa2410e363b3945759d9cf4', // https://github.com/shopware5/shopware/blob/0c0f6ff2e6/.htaccess + SwagSecurity section
+        '136f3597e8745ae57e7e3139fab84c78', // https://github.com/shopware5/shopware/blob/710076a2a2/.htaccess
+        'b3ece266f62b8f7ab75307f2e9734605', // https://github.com/shopware5/shopware/blob/710076a2a2/.htaccess + SwagSecurity section
+        'b7f41355e1db0103b48bfe36458e4bb7', // https://github.com/shopware5/shopware/blob/bb95afbd01/.htaccess
+        '596eb625c7f2804c10ec7be1ab441c82', // https://github.com/shopware5/shopware/blob/bb95afbd01/.htaccess + SwagSecurity section
+        '781a1cdbd51aabf58e4626b3db8fd9c5', // https://github.com/shopware5/shopware/blob/08661660a6/.htaccess
+        'aaff6dcc929190c7f65e26fe3ec0538b', // https://github.com/shopware5/shopware/blob/08661660a6/.htaccess + SwagSecurity section
+        '5d7e6211ff581e12cbd9769e5b3da4bd', // https://github.com/shopware5/shopware/blob/7662e140d2/.htaccess
+        '7ca5b55b89c5a2306307d9b65479791a', // https://github.com/shopware5/shopware/blob/7662e140d2/.htaccess + SwagSecurity section
     ];
 
     private string $htaccessPath;
diff --git a/recovery/update/src/Utils.php b/recovery/update/src/Utils.php
index 797730f203c..e80edb5b0d5 100644
--- a/recovery/update/src/Utils.php
+++ b/recovery/update/src/Utils.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Recovery\Update;
diff --git a/recovery/update/src/app.php b/recovery/update/src/app.php
index 9e4fe1e4d2a..43adece55d1 100644
--- a/recovery/update/src/app.php
+++ b/recovery/update/src/app.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Pimple\Container as PimpleContainer;
diff --git a/shopware.php b/shopware.php
index 47c6a47187c..4b1ef98e2e3 100644
--- a/shopware.php
+++ b/shopware.php
@@ -3,23 +3,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // Check the minimum required php version
diff --git a/snippets/backend/benchmark/categories.ini b/snippets/backend/benchmark/categories.ini
deleted file mode 100644
index 5f9144e523f..00000000000
--- a/snippets/backend/benchmark/categories.ini
+++ /dev/null
@@ -1,47 +0,0 @@
-[en_GB]
-none_selected = "None"
-animals_pet_supplies = "Animals & Pet Supplies"
-apparel_Accessories = "Apparel & Accessories"
-arts_entertainment = "Arts & Entertainment"
-baby_toddler = "Baby & Toddler"
-business_industrial = "Business & Industrial"
-cameras_optics = "Cameras & Optics"
-electronics = "Electronics"
-food_beverages_tobacco = "Food, Beverages & Tobacco"
-furniture = "Furniture"
-hardware = "Hardware"
-health_beauty = "Health & Beauty"
-home_garden = "Home & Garden"
-luggage_bags = "Luggage & Bags"
-mature = "Mature"
-media = "Media"
-office_supplies = "Office Supplies"
-religious_ceremonial = "Religious & Ceremonial"
-software = "Software"
-sporting_goods = "Sporting Goods"
-toys_games = "Toys & Games"
-vehicles_parts = "Vehicles & Parts"
-
-[de_DE]
-none_selected = "Keine"
-animals_pet_supplies = "Tiere & Tierbedarf"
-apparel_Accessories = "Bekleidung & Accessoires"
-arts_entertainment = "Kunst & Unterhaltung"
-baby_toddler = "Baby & Kleinkind"
-business_industrial = "Wirtschaft & Industrie"
-cameras_optics = "Kameras & Optik"
-electronics = "Elektronik"
-food_beverages_tobacco = "Nahrungsmittel, Getränke & Tabak"
-furniture = "Möbel"
-hardware = "Heimwerkerbedarf"
-health_beauty = "Gesundheit & Schönheit"
-home_garden = "Heim & Garten"
-luggage_bags = "Taschen & Gepäck"
-mature = "Für Erwachsene"
-media = "Medien"
-office_supplies = "Bürobedarf"
-religious_ceremonial = "Religion & Feierlichkeiten"
-software = "Software"
-sporting_goods = "Sportartikel"
-toys_games = "Spielzeuge & Spiele"
-vehicles_parts = "Fahrzeuge & Teile"
\ No newline at end of file
diff --git a/snippets/backend/benchmark/main.ini b/snippets/backend/benchmark/main.ini
deleted file mode 100644
index b5592708817..00000000000
--- a/snippets/backend/benchmark/main.ini
+++ /dev/null
@@ -1,85 +0,0 @@
-[en_GB]
-growlMessage/settings/success/title = "Save successful"
-growlMessage/settings/success/message = "The shopware BI settings were successfully saved"
-growlMessage/settings/error/title = "Error saving the settings"
-settings/title = "Shopware BI Settings"
-overview/title = "Shopware BI Overview"
-settings/fieldsets/shop/title = "Shop selection"
-settings/fieldsets/shop/activation_text = "I would like to participate."
-settings/fieldsets/shop/activation_button = "Participate now"
-settings/fieldsets/shop/deactivation_text = "I want to stop the service."
-settings/fieldsets/shop/deactivation_button = "Stop the service"
-settings/fieldsets/business_plan/save_button = "Save"
-settings/fieldsets/business_plan/title = "Business plan"
-settings/fieldsets/business_plan/b2cText = "Business to Consumer"
-settings/fieldsets/business_plan/b2bText = "Business to Business"
-settings/fieldsets/business_plan/b2cShortText = "B2C"
-settings/fieldsets/business_plan/b2bShortText = "B2B"
-settings/fieldsets/industry/title = "Industry"
-settings/industry_window/title = "Change industry"
-settings/industry_window/save = "Save industry"
-settings/industry_window/label = "Choose industry"
-settings/industry_window/empty = "Please choose your industry"
-settings/industry_window/wrong = "Wrong industry?"
-settings/industry_window/choose_industry = "Please choose an industry first:"
-growlMessage/industry_window/success/title = "Save successful"
-growlMessage/industry_window/success/message = "The chosen industry was saved successfully"
-growlMessage/industry_window/error/title = "Error saving the industry"
-growlMessage/activation/success/title = "Success"
-growlMessage/activation/success/message = "You\'re now participating"
-growlMessage/activation/error/title = "Error"
-growlMessage/activation/confirmation/title = "Participate"
-growlMessage/activation/confirmation/message = "Do you really wish to participate?"
-growlMessage/deactivation/success/title = "Success"
-growlMessage/deactivation/success/message = "You\'re not participating anymore"
-growlMessage/deactivation/error/title = "Error"
-growlMessage/deactivation/confirmation/title = "Signing off"
-growlMessage/deactivation/confirmation/message = "Do you really wish to stop the service?"
-growlMessage/type/success/title = "Save successful"
-growlMessage/type/success/message = "The business plan was successfully saved!"
-growlMessage/type/error/title = "Error"
-window/do_not_show_again = "Do not show again"
-window/close = "Close window"
-
-[de_DE]
-growlMessage/settings/success/title = "Speichern erfolgreich"
-growlMessage/settings/success/message = "Die Shopware BI Einstellungen wurden erfolgreich gespeichert"
-growlMessage/settings/error/title = "Fehler beim Speichern der Einstellungen"
-settings/title = "Shopware BI Einstellungen"
-overview/title = "Shopware BI Übersicht"
-settings/fieldsets/shop/title = "Shop Auswahl"
-settings/fieldsets/shop/activation_text = "Ich möchte teilnehmen"
-settings/fieldsets/shop/activation_button = "Jetzt teilnehmen"
-settings/fieldsets/shop/deactivation_text = "Ich möchte den Dienst beenden."
-settings/fieldsets/shop/deactivation_button = "Nicht mehr teilnehmen"
-settings/fieldsets/business_plan/save_button = "Speichern"
-settings/fieldsets/business_plan/title = "Geschäftsmodell"
-settings/fieldsets/business_plan/b2cText = "Business to Consumer"
-settings/fieldsets/business_plan/b2bText = "Business to Business"
-settings/fieldsets/business_plan/b2cShortText = "B2C"
-settings/fieldsets/business_plan/b2bShortText = "B2B"
-settings/fieldsets/industry/title = "Branche"
-settings/industry_window/title = "Branche ändern"
-settings/industry_window/save = "Branche speichern"
-settings/industry_window/label = "Branche wählen"
-settings/industry_window/empty = "Bitte Branche wählen"
-settings/industry_window/wrong = "Falsche Branche?"
-settings/industry_window/choose_industry = "Bitte wähle zunächst eine Branche:"
-growlMessage/industry_window/success/title = "Speichern erfolgreich"
-growlMessage/industry_window/success/message = "Die gewählte Branche wurde erfolgreich gespeichert"
-growlMessage/industry_window/error/title = "Fehler beim Speichern der Branche"
-growlMessage/activation/success/title = "Erfolg"
-growlMessage/activation/success/message = "Du nimmst nun erfolgreich teil"
-growlMessage/activation/error/title = "Fehler"
-growlMessage/activation/confirmation/title = "Teilnehmen"
-growlMessage/activation/confirmation/message = "Möchtest Du wirklich teilnehmen?"
-growlMessage/deactivation/success/title = "Erfolg"
-growlMessage/deactivation/success/message = "Du nimmst nun nicht länger teil"
-growlMessage/deactivation/error/title = "Fehler"
-growlMessage/deactivation/confirmation/title = "Abmelden"
-growlMessage/deactivation/confirmation/message = "Bist Du sicher, dass Du den Dienst beenden möchtest?"
-growlMessage/type/success/title = "Speichern erfolgreich"
-growlMessage/type/success/message = "Das Geschäftsmodell wurde erfolgreich gespeichert!"
-growlMessage/type/error/title = "Fehler"
-window/do_not_show_again = "Nicht mehr anzeigen"
-window/close = "Fenster schließen"
\ No newline at end of file
diff --git a/snippets/backend/benchmark/statistics.ini b/snippets/backend/benchmark/statistics.ini
deleted file mode 100644
index 546a8fc7756..00000000000
--- a/snippets/backend/benchmark/statistics.ini
+++ /dev/null
@@ -1,175 +0,0 @@
-[en_GB]
-greeting = "Hey!"
-previewDisclaimer = "Attention<br />Preview"
-headlineMain = "Your shop evaluation is complete."
-shopDataText = "<h1>Your shop</h1> <h3>receives an <span class="shop-color">average</span> of <span class="shop-color">{averageOrdersPerDay} orders</span> a day with an <span class="shop-color">order value of {averageAmount}€</span>. Most orders were placed between <span class="shop-color">{averageHourRange}</span>.</h3><div class="nice-graphic"></div>"
-informationHeadline = "Information"
-informationText = "Your <span class="branch-color">industry comparison</span> is still being processed. For the time being, your evaluation only includes <span class="shop-color">your shop data</span>."
-getStartedBtnText = "Let's go"
-turnOverTitle = "Turnover"
-visitorsTitle = "Visitors"
-ordersTitle = "Orders"
-conversionTitle = "Conversion"
-targetGroupsTitle = "Target groups"
-devicesTitle = "End devices"
-top5PaymentsTitle = "Top 5 payment methods"
-top5ShipmentsTitle = "Top 5 shipping methods"
-averageCustomersText = "<h1>Your customers</h1><h3>are on average <span class="shop-color">{averageAge} years old</span>, <span class="shop-color">{womenPercentage}% female</span> and <span class="shop-color">{menPercentage}% male.</span> <span class="shop-color">Note: {noBirthday}%</span> of your customers have not entered their birthday.</h3><div class="nice-graphic"></div>"
-endTitle = "THE END"
-endSubTitle = "Let's rock the future."
-endText = "Do you want to share anything with us? We’d be happy to receive your feedback!"
-endSignOffText = "You can remove your shop from the industry evaluation at any time under the main menu: Marketing - Analysis - Shopware BI - Settings."
-sendFeedbackBtn = "Send feedback"
-industryTitle = "Industry"
-shopTitle = "Shop"
-previousTitle = "Previous year"
-previousTitleShop = "Previous year shop"
-previousTitleIndustry = "Previous year industry"
-periodTitle = "Period"
-totalTitle = "Total"
-womenTitle = "Women"
-menTitle = "Men"
-ageTitle = "Age"
-yearsOldTitle = "years old"
-numbersText = "<h1>Numbers & facts</h1><h3><span class="shop-color">{averagePayments}</span> payment methods are offered. The <span class="shop-color">shipping costs</span> are<span class="shop-color"> approx. {averageShippingCosts} €</span> per order. <span class="shop-color">{shippingReady}%</span> of the items are <span class="shop-color">in stock and ready to ship.</span></h3><div class="nice-graphic"></div>"
-timeUnitDays = "Days"
-timeUnitMonths = "Months"
-disabledText = "Available<br />soon"
-above50Text = "50 +"
-between30And50Text = "30 to 50"
-between15And30Text = "15 to 30"
-weeksText = "Week"
-monthsText = "Month"
-yearsText = "Year"
-freeText = "Free"
-anonymousText = "Anonymous"
-nonBindingText = "Nonbinding"
-startHeadline = "Benchmark for your online shop"
-startText = "Get an evaluation of your shop and compare it with other companies in your industry."
-startButtonText = "Yes – let’s do this!"
-faqHeadline = "Questions & answers"
-question1Headline = "What happens with my data?"
-question1Text = "We treat your data strictly anonymously. The export of your evaluation is accompanied by an anonymous ID, making it impossible to draw any conclusions about you and your shop."
-question2Headline = "What is my data used for?"
-question2Text = "We use the data exclusively for shop evaluations and industry comparisons. The more data we receive for each sector, the more informative and effective the benchmark is compiled."
-question3Headline = "Why is this useful to me?"
-question3Text = "Up until now, you could only see your own statistics and were not able to access the comparative value from other online shops in your industry. The industry comparison from Shopware makes it possible for you to recognise deficits based on facts and figures and take targeted measures. Get to know your shop even better."
-factsHeadline = "The facts"
-fact1 = "Evaluation of your shop data"
-fact2 = "Comparison with industry data"
-fact3 = "Simple usability"
-fact4 = "Auto updates"
-fact5 = "Free of charge"
-fact6 = "Anonymous"
-fact7 = "Nonbinding"
-participationCheck = "Yes, I wish to participate"
-nextButton = "Continue"
-industrySelectionHeadline = "Let’s get started"
-industrySelectionDescription = "Please first select the industry in which you operate so that we can compare your data with other shops in your sector."
-industrySelectionSaveButton = "Save"
-surveyLink = "https://www.surveymonkey.de/r/Shopware-BI-Survey"
-waitingHeadline = "A little patience"
-waitingText = "Your data will be evaluated so that we can provide you with up-to-date evaluations. Depending on the size of the shop, this can take from a few minutes to several hours. Here is a little pastime."
-waitingTextSince6Hours = "Oh, apparently your shop is a little bigger, so the evaluation takes a bit longer. We will soon be able to provide you with your reports!"
-waitingButton = "Okay, I'll be back."
-defaultIndustryText = "List of industries"
-emptyShopConfigText = "Please choose industry & business plan"
-saveIndustryText = "Send shop configurations now!"
-b2cText = "Business to Consumer"
-b2bText = "Business to Business"
-b2cShortText = "B2C"
-b2bShortText = "B2B"
-shopConfigSaveText = "Apply selection"
-shopConfigResetText = "reset"
-shopConfigCancelText = "cancel"
-shopTypeTitle = "Which business model is more appropriate:"
-noPermissionsTitle = "We're sorry! :-("
-noPermissionsMessage = "Unfortunately you have no permissions to edit those settings"
-
-[de_DE]
-greeting = "Hey!"
-previewDisclaimer = "Achtung<br />Preview"
-headlineMain = "Die Auswertung Deiner Shopdaten ist fertig."
-shopDataText = "<h1>Dein Shop</h1> <h3>hat im <span class="shop-color">Durchschnitt</span> am Tag <span class="shop-color">{averageOrdersPerDay} Bestellungen</span> mit einem <span class="shop-color">Bestellwert von {averageAmount}€</span>. Am meisten wurde in der <span class="shop-color">Zeit von {averageHourRange} Uhr</span> bestellt.</h3><div class="nice-graphic"></div>"
-informationHeadline = "Information"
-informationText = "Die <span class="branch-color">Branchendaten</span> werden noch ausgewertet, daher enthält die Auswertung vorerst nur <span class="shop-color">Deine Shopdaten</span>."
-getStartedBtnText = "Los geht's"
-turnOverTitle = "Umsatz"
-visitorsTitle = "Besucher"
-ordersTitle = "Bestellungen"
-conversionTitle = "Conversion"
-targetGroupsTitle = "Zielgruppe"
-devicesTitle = "Endgeräte"
-top5PaymentsTitle = "Top 5 Zahlarten"
-top5ShipmentsTitle = "Top 5 Versandarten"
-averageCustomersText = "<h1>Die Kunden</h1><h3>sind im Durchschnitt <span class="shop-color">{averageAge} Jahre</span> alt, <span class="shop-color">{womenPercentage}% weiblich</span> und <span class="shop-color">{menPercentage}% männlich</span>. <span class="shop-color">Achtung: {noBirthday}%</span> der Kunden haben <span class="shop-color">kein Geburtsdatum</span> angegeben.</h3><div class="nice-graphic"></div>"
-endTitle = "THE END"
-endSubTitle = "Let's rock the future."
-endText = "Möchtest Du etwas loswerden? Hat Dir was gefehlt?"
-endSignOffText = "Eine Abmeldung ist jederzeit möglich im Hauptmenü unter: Marketing - Auswertungen - Shopware BI - Einstellungen."
-sendFeedbackBtn = "Feedback senden"
-industryTitle = "Branche"
-shopTitle = "Shop"
-previousTitle = "Vorjahr"
-previousTitleShop = "Shop Vorjahr"
-previousTitleIndustry = "Branche Vorjahr"
-periodTitle = "Zeitraum"
-totalTitle = "Gesamt"
-womenTitle = "Frauen"
-menTitle = "Männer"
-ageTitle = "Alter"
-yearsOldTitle = "Jahre"
-numbersText = "<h1>Zahlen & Fakten</h1><h3>Es werden <span class="shop-color">{averagePayments} Zahlarten</span> angeboten. Die <span class="shop-color">Versandkosten</span> liegen bei<span class="shop-color"> ca. {averageShippingCosts} €</span> pro Bestellung. <span class="shop-color">{shippingReady}%</span> der Artikel sind <span class="shop-color">vorrätig und versandfertig.</span></h3><div class="nice-graphic"></div>"
-timeUnitDays = "Tage"
-timeUnitMonths = "Monate"
-disabledText = "Bald<br />verfügbar"
-above50Text = "50 +"
-between30And50Text = "30 bis 50"
-between15And30Text = "15 bis 30"
-weeksText = "Woche"
-monthsText = "Monat"
-yearsText = "Jahr"
-freeText = "Kostenlos"
-anonymousText = "Anonym"
-nonBindingText = "Unverbindlich"
-startHeadline = "Shopware BI für Deinen Onlineshop"
-startText = "Erhalte Deine Shop-Auswertung und vergleiche sie mit Unternehmen Deiner Branche."
-startButtonText = "Ja, ich will mehr erfahren"
-faqHeadline = "Fragen & Antworten"
-question1Headline = "Was passiert mit meinen Daten?"
-question1Text = "Wir behandeln Deine Daten immer streng anonym. Der Export mit Deiner Auswertung wird mit einer anonymisierten ID versehen und macht den Rückschluss auf Dich und Deinen Shop unmöglich."
-question2Headline = "Wofür werden meine Daten verwendet/benutzt?"
-question2Text = "Wir verwenden die Daten ausschließlich für Shop-Auswertungen und Branchenvergleiche. Je mehr Daten wir zu jeder Branche erhalten, desto informativer und effektiver wird die Shopware BI zusammengestellt."
-question3Headline = "Warum ist das für mich nützlich?"
-question3Text = "Bisher siehst Du nur Deine eigenen Statistiken und kannst nur selten bis gar nicht den Vergleichswert von anderen Onlineshops Deiner Branche bekommen. Der Branchenvergleich von Shopware macht es Dir möglich, anhand von Zahlen und Fakten Defizite zu erkennen und gezielt Maßnahmen zu ergreifen. Lerne Deinen Shop noch besser kennen."
-factsHeadline = "Die Fakten"
-fact1 = "Auswertung Deiner Shop-Daten"
-fact2 = "Vergleich mit Branchendaten"
-fact3 = "Einfache Usabilty"
-fact4 = "Auto-Aktualisierungen"
-fact5 = "Kostenlos"
-fact6 = "Anonym"
-fact7 = "Unverbindlich"
-participationCheck = "Ich möchte gerne teilnehmen"
-nextButton = "Weiter"
-industrySelectionHeadline = "Los geht's"
-industrySelectionDescription = "Wähle Deine Branche aus, damit die Daten verglichen werden können."
-industrySelectionSaveButton = "Jetzt speichern"
-surveyLink = "https://www.surveymonkey.de/r/Shopware-BI"
-waitingHeadline = "Ein bisschen Geduld"
-waitingText = "Deine Daten werden ausgewertet, damit wir Dir tagesaktuelle Auswertungen zur Verfügung stellen können. Das kann je nach Shopgröße wenige Minuten bis mehreren Stunden dauern. Hier ein kleiner Zeitvertreib."
-waitingTextSince6Hours = "Oh, scheinbar ist Dein Shop etwas größer, sodass die Auswertung etwas länger dauert. Wir werden Dir bald Deine Auswertungen zur Verfügung stellen können!"
-waitingButton = "Ok, ich komme wieder."
-defaultIndustryText = "Auswahlliste Branche"
-emptyShopConfigText = "Bitte wähle Branche & Geschäftsmodell"
-saveIndustryText = "Jetzt Shop-Auswahl senden!"
-b2cText = "Business to Consumer"
-b2bText = "Business to Business"
-b2cShortText = "B2C"
-b2bShortText = "B2B"
-shopConfigSaveText = "Auswahl übernehmen"
-shopConfigResetText = "zurücksetzen"
-shopConfigCancelText = "abbrechen"
-shopTypeTitle = "Welches Geschäftsmodell trifft eher zu:"
-noPermissionsTitle = "Tut uns Leid! :-("
-noPermissionsMessage = "Du hast leider keine Berechtigungen diese Einstellungen zu speichern"
\ No newline at end of file
diff --git a/snippets/backend/benchmark/time_units.ini b/snippets/backend/benchmark/time_units.ini
deleted file mode 100644
index 7be0b28c04b..00000000000
--- a/snippets/backend/benchmark/time_units.ini
+++ /dev/null
@@ -1,41 +0,0 @@
-[en_GB]
-Friday = "Friday"
-Saturday = "Saturday"
-Sunday = "Sunday"
-Monday = "Monday"
-Tuesday = "Tuesday"
-Wednesday = "Wednesday"
-Thursday = "Thursday"
-Jan = "Jan"
-Feb = "Feb"
-Mar = "Mar"
-Apr = "Apr"
-May = "May"
-Jun = "Jun"
-Jul = "Jul"
-Aug = "Aug"
-Sep = "Sep"
-Oct = "Oct"
-Nov = "Nov"
-Dec = "Dec"
-
-[de_DE]
-Friday = "Freitag"
-Saturday = "Samstag"
-Sunday = "Sonntag"
-Monday = "Montag"
-Tuesday = "Dienstag"
-Wednesday = "Mittwoch"
-Thursday = "Donnerstag"
-Jan = "Jan"
-Feb = "Feb"
-Mar = "Mär"
-Apr = "Apr"
-May = "Mai"
-Jun = "Jun"
-Jul = "Jul"
-Aug = "Aug"
-Sep = "Sep"
-Oct = "Okt"
-Nov = "Nov"
-Dec = "Dez"
\ No newline at end of file
diff --git a/snippets/backend/beta_feedback/view/main.ini b/snippets/backend/beta_feedback/view/main.ini
deleted file mode 100644
index 539fd6e6ad5..00000000000
--- a/snippets/backend/beta_feedback/view/main.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[en_GB]
-window/title = "Feedback"
-
-[de_DE]
-window/title = "Feedback"
\ No newline at end of file
diff --git a/snippets/backend/config/controller/main.ini b/snippets/backend/config/controller/main.ini
index a6eec156abf..f7af8d1e485 100644
--- a/snippets/backend/config/controller/main.ini
+++ b/snippets/backend/config/controller/main.ini
@@ -13,6 +13,7 @@ form/message/save_form_success = "Form \"[name]\" has been saved."
 form/message/save_form_title = "Save form"
 form/reset_text = "Reset"
 form/save_text = "Save"
+form/message/config_could_not_be_saved = "The form could not be saved"
 
 [de_DE]
 form/description_title = "Beschreibung"
@@ -28,4 +29,5 @@ form/message/save_form_error = "Forumular \"[name]\" konnte nicht gespeichert we
 form/message/save_form_success = "Formular \"[name]\" wurde gespeichert."
 form/message/save_form_title = "Formular speichern"
 form/reset_text = "Zurücksetzen"
-form/save_text = "Speichern"
\ No newline at end of file
+form/save_text = "Speichern"
+form/message/config_could_not_be_saved = "Die Konfiguration konnte nicht gespeichert werden."
\ No newline at end of file
diff --git a/snippets/backend/customer/view/main.ini b/snippets/backend/customer/view/main.ini
index 8660783d9f1..6bdcba3f3a7 100644
--- a/snippets/backend/customer/view/main.ini
+++ b/snippets/backend/customer/view/main.ini
@@ -109,6 +109,7 @@ monday = "Monday"
 month = "Month"
 mr = "Mr"
 mrs = "Mrs"
+not_defined = 'Not defined'
 newsletter = "Newsletter"
 newsletter_count_suffix = "Recipient(s)"
 next = "Next"
@@ -322,6 +323,7 @@ monday = "Montag"
 month = "Monat"
 mr = "Herr"
 mrs = "Frau"
+not_defined = 'Nicht definiert'
 newsletter = "Newsletter"
 newsletter_count_suffix = "Empfänger"
 next = "Weiter"
diff --git a/snippets/backend/emotion/view/components/youtube.ini b/snippets/backend/emotion/view/components/youtube.ini
index 262c8eb4adb..1acfe11ca7e 100644
--- a/snippets/backend/emotion/view/components/youtube.ini
+++ b/snippets/backend/emotion/view/components/youtube.ini
@@ -10,6 +10,8 @@ video_info = "Hide info"
 video_branding = "Hide video branding"
 video_loop = "Loop video"
 video_loop_help = "Loop is not compatible with start and end times. Video will restart from beginning."
+load_video_on_confirmation = "Load video only after confirmation of the customer"
+previewImage = "Preview image"
 
 [de_DE]
 video_hd = "HD Video verwenden"
@@ -22,4 +24,6 @@ video_end = "Stoppen nach x-Sekunden"
 video_info = "Info ausblenden"
 video_branding = "Branding ausblenden"
 video_loop = "Loop aktivieren"
-video_loop_help = "Loop ist nicht mit Start- und Endzeiten kompatibel. Video wird wieder von Beginn abgespielt."
\ No newline at end of file
+video_loop_help = "Loop ist nicht mit Start- und Endzeiten kompatibel. Video wird wieder von Beginn abgespielt."
+load_video_on_confirmation = "Video erst nach Bestätigung durch den Kunden laden"
+previewImage = "Vorschaubild"
\ No newline at end of file
diff --git a/snippets/backend/feedback/view/preview.ini b/snippets/backend/feedback/view/preview.ini
deleted file mode 100644
index 50e2564db8d..00000000000
--- a/snippets/backend/feedback/view/preview.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[en_GB]
-window/cancel = "Cancel"
-window/open_issuetracker = "Open Issuetracker"
-window/title = "Feedback for preview version"
-window/info_text = "<p><strong>Your feedback is important.</strong></p><p>We are pleased that you are using the Shopware [0] in advance of the final release.</p><p>As an open company, the continuous exchange with our large Community is an extremely important piece of our development. We want to develop our software for the people who us it – it’s all about you! For this reason, we ask that you send us any potential bugs or suggestions for improvement as we gear up for the final release.</p><p>You can easily send us your feedback in our <a href=\"https://issues.shopware.com/#/\" target=\"_blank\">Shopware Issue Tracker</a>. Alternatively, you can also send feedback now or under „Send Feedback”.</p><p>Thank you for your continuous support,</p><p>Your Shopware team</p>"
-window/do_not_show_again = "Do not show again"
-
-[de_DE]
-window/cancel = "Abbrechen"
-window/open_issuetracker = "Issue Tracker öffnen"
-window/title = "Feedback für Vorabversion"
-window/info_text = "<p><strong>Dein Feedback ist uns wichtig.</strong></p><p>Wir freuen uns, dass Du die Vorabversion der Shopware [0] im Einsatz hast.</p><p>Als Open Company ist uns der stetige Austausch mit unserer großen Community enorm wichtig, denn wir entwicklen unsere Software für Menschen, die sie benutzen - für Dich! Deshalb bitten wir Dich, mögliche Bugs oder Verbesserungswünsche, die Dir in dieser Vorabversion auffallen, an uns mitzuteilen.</p><p>Schicke uns Dein Feedback ganz einfach über unseren <a href=\"https://issues.shopware.com/#/\" target=\"_blank\">Shopware Issue Tracker</a>, den Du alternativ auch jetzt direkt oder über die Funktion „Feedback senden“ öffnen kannst.</p><p>Vielen Dank für Deine Unterstützung,</p><p>Dein Shopware-Team</p>"
-window/do_not_show_again = "Nicht mehr anzeigen"
\ No newline at end of file
diff --git a/snippets/backend/feedback/view/survey.ini b/snippets/backend/feedback/view/survey.ini
deleted file mode 100644
index 23a0a510c19..00000000000
--- a/snippets/backend/feedback/view/survey.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[en_GB]
-window/close = "Close"
-window/title = "Feedback"
-window/do_not_show_again = "Do not show again"
-
-[de_DE]
-window/close = "Schließen"
-window/title = "Feedback"
-window/do_not_show_again = "Nicht mehr anzeigen"
\ No newline at end of file
diff --git a/snippets/backend/index/controller/main.ini b/snippets/backend/index/controller/main.ini
index 08871dd9a2d..b00f647f703 100644
--- a/snippets/backend/index/controller/main.ini
+++ b/snippets/backend/index/controller/main.ini
@@ -6,7 +6,6 @@ content/article_overview_open = "Item overview module will be opened."
 content/customer_open = "Customer module will be opened."
 content/order_open = "Order module will be opened."
 content/plugin_open = "Plugin manager module will be opened."
-content/new_benchmark = "New benchmark data available"
 content/paypal_settings_unavailable = "Could not open the PayPal settings module automatically."
 error_reporter/file = "File:"
 error_reporter/line = "Line number:"
@@ -21,7 +20,6 @@ title/key_pressed = "Key combination is pressed"
 title/keyboard_shortcuts = "Keyboard shortcuts"
 title/order = "Order"
 title/plugin_manager = "Plugin manager"
-title/new_benchmark = "Shopware BI"
 title/paypal_settings_unavailable = "PayPal"
 shortcuts/no_shortcuts_acl = "Due to your permissions, there are no shortcuts available."
 open = "Open"
@@ -34,7 +32,6 @@ content/article_overview_open = "Artikelübersicht wird geöffnet."
 content/customer_open = "Kunden wird geöffnet"
 content/order_open = "Bestellungen wird geöffnet."
 content/plugin_open = "Plugin-Manager wird geöffnet."
-content/new_benchmark = "Benchmark Daten wurden aktualisiert"
 content/paypal_settings_unavailable = "Das PayPal-Einstellungsmodul konnte nicht automatisch geöffnet werden."
 error_reporter/file = "Datei:"
 error_reporter/line = "Zeilennummer:"
@@ -49,7 +46,6 @@ title/key_pressed = "Tastenkombination gedrückt"
 title/keyboard_shortcuts = "Tastaturkürzel"
 title/order = "Bestellungen"
 title/plugin_manager = "Plugin Manager"
-title/new_benchmark = "Shopware BI"
 title/paypal_settings_unavailable = "PayPal"
 shortcuts/no_shortcuts_acl = "Aufgrund Ihrer Berechtigungen sind keine Tastenkürzel verfügbar."
 open = "Öffnen"
\ No newline at end of file
diff --git a/snippets/backend/index/view/main.ini b/snippets/backend/index/view/main.ini
index 5cf3984c87c..b6fad3caf12 100644
--- a/snippets/backend/index/view/main.ini
+++ b/snippets/backend/index/view/main.ini
@@ -9,7 +9,6 @@ Article/Detail = "Create"
 Article/List = "Overview"
 ArticleList = "Overview"
 Banner = "Banners"
-Feedback = "Send feedback"
 Blog = "Blog"
 BusinessEssentials = "Business essentials*"
 CanceledOrder = "Cancellation analysis"
@@ -80,9 +79,6 @@ Performance/Frontend = "Items + Categories"
 Theme = "Theme Manager"
 ProductStream/index = "Product streams"
 Attributes = "Free text field management"
-Benchmark = "Shopware BI"
-Benchmark/index = "Overview"
-Benchmark/Settings = "Settings"
 MailManagement = "E-mail management"
 MailLog = "E-mail log"
 ContentTypeManager = "Content Types"
@@ -100,7 +96,6 @@ Article/Detail = "Anlegen"
 Article/List = "Übersicht"
 ArticleList = "Übersicht"
 Banner = "Banner"
-Feedback = "Feedback senden"
 Blog = "Blog"
 BusinessEssentials = "Business Essentials*"
 CanceledOrder = "Abbruch-Analyse"
@@ -171,12 +166,8 @@ Voucher = "Gutscheine"
 Theme = "Theme Manager"
 ProductStream/index = "Product Streams"
 Attributes = "Freitextfeld-Verwaltung"
-Benchmark = "Shopware BI"
-Benchmark/index = "Übersicht"
-Benchmark/Settings = "Einstellungen"
 MailManagement = "E-Mail-Management"
 MailLog = "E-Mail-Log"
 ContentTypeManager = "Inhaltstypen"
 ContentTypeManager/index = "Inhaltstypen"
-Support = "Technischer Support"
-
+Support = "Technischer Support"
\ No newline at end of file
diff --git a/snippets/backend/index/view/widgets.ini b/snippets/backend/index/view/widgets.ini
index 2b25a41ff4a..b10503d8e96 100644
--- a/snippets/backend/index/view/widgets.ini
+++ b/snippets/backend/index/view/widgets.ini
@@ -59,7 +59,6 @@ news/headers/date = "Date"
 news/headers/title = "Title"
 news/title = "Shopware News"
 news/offline_msg = "We can\'t establish a connection to the Shopware server. Please check your connection and try again later."
-shopware_bi = "Shopware BI"
 rating/title = "Unreleased product reviews"
 rating/headers/product = "Product"
 rating/headers/date = "Date"
@@ -128,7 +127,6 @@ news/headers/date = "Datum"
 news/headers/title = "Titel"
 news/title = "Shopware News"
 news/offline_msg = "Wir können leider keine Verbindung zum Shopware Server aufbauen. Bitte prüfe Deine Internet-Verbindung und probiere es erneut."
-shopware_bi = "Shopware BI"
 rating/title = "Nicht freigegebene Produktbewertungen"
 rating/headers/product = "Produkt"
 rating/headers/date = "Datum"
diff --git a/snippets/frontend/account/internalMessages.ini b/snippets/frontend/account/internalMessages.ini
index 489f8939ee9..9c8c2741729 100644
--- a/snippets/frontend/account/internalMessages.ini
+++ b/snippets/frontend/account/internalMessages.ini
@@ -14,6 +14,8 @@ NewsletterMailDeleted = "Your email address has been deleted."
 NewsletterSuccess = "Thank you! We have entered your address."
 UnknownError = "An unknown error has occured."
 DateFailure = "Please enter a valid birthday"
+UrlInFieldFailure = "A URL is not allowed in this field"
+EmptyFieldError = "This field cannot be empty"
 
 [de_DE]
 ErrorFillIn = "Bitte füllen Sie alle rot markierten Felder aus"
@@ -30,4 +32,6 @@ NewsletterFailureNotFound = "Diese E-Mail-Adresse wurde nicht gefunden"
 NewsletterMailDeleted = "Ihre E-Mail-Adresse wurde gelöscht"
 NewsletterSuccess = "Vielen Dank. Wir haben Ihre Adresse eingetragen."
 UnknownError = "Ein unbekannter Fehler ist aufgetreten"
-DateFailure = "Bitte geben Sie ein gültiges Geburtsdatum an"
\ No newline at end of file
+DateFailure = "Bitte geben Sie ein gültiges Geburtsdatum an"
+UrlInFieldFailure = "Eine URL ist in diesem Feld nicht erlaubt"
+EmptyFieldError = "Dieses Feld darf nicht Leer sein"
\ No newline at end of file
diff --git a/snippets/frontend/plugins/notification/index.ini b/snippets/frontend/plugins/notification/index.ini
index 58ff644e70e..548b3fd9466 100644
--- a/snippets/frontend/plugins/notification/index.ini
+++ b/snippets/frontend/plugins/notification/index.ini
@@ -6,6 +6,7 @@ DetailNotifyInfoInvalid = "An error has occurred while validating your email add
 DetailNotifyInfoSuccess = "Please confirm your request by clicking the link provided with the email we just sent you. Assuming successful confirmation, you will be notified as soon as the item is available again."
 DetailNotifyInfoValid = "Thank you! We have successfully saved your request. You will be notified as soon as the item is available again."
 DetailNotifyLabelMail = "Your email address"
+DetailNotifyCaptchaInvalid = "Please fill in the captcha-field correctly."
 
 [de_DE]
 DetailNotifyAlreadyRegistered = "Sie haben sich bereits für eine Benachrichtigung für diesen Artikel eingetragen!"
@@ -14,4 +15,5 @@ DetailNotifyInfoErrorMail = "Bitte geben Sie eine gültige E-Mail-Adresse ein"
 DetailNotifyInfoInvalid = "Bei der Validierung Ihrer E-Mail-Benachrichtigung ist ein Fehler aufgetreten. Eventuell wurde Ihre E-Mail-Adresse bereits validiert."
 DetailNotifyInfoSuccess = "Bestätigen Sie den Link der E-Mail, die wir Ihnen soeben geschickt haben. Wir benachrichtigen Sie dann, sobald der Artikel wieder verfügbar ist."
 DetailNotifyInfoValid = "Vielen Dank! Wir haben Ihre Anfrage gespeichert. Sie werden benachrichtigt sobald der Artikel wieder verfügbar ist."
-DetailNotifyLabelMail = "Ihre E-Mail-Adresse"
\ No newline at end of file
+DetailNotifyLabelMail = "Ihre E-Mail-Adresse"
+DetailNotifyCaptchaInvalid = "Bitte füllen Sie das Captcha-Feld korrekt aus."
\ No newline at end of file
diff --git a/snippets/frontend/salutation.ini b/snippets/frontend/salutation.ini
index 658d36f38eb..0d6548244b4 100644
--- a/snippets/frontend/salutation.ini
+++ b/snippets/frontend/salutation.ini
@@ -1,7 +1,9 @@
 [en_GB]
 mr = "Mr"
 ms = "Ms"
+not_defined = 'Not defined'
 
 [de_DE]
 mr = "Herr"
-ms = "Frau"
\ No newline at end of file
+ms = "Frau"
+not_defined = 'Nicht definiert'
\ No newline at end of file
diff --git a/snippets/widgets/emotion/components/component_youtube.ini b/snippets/widgets/emotion/components/component_youtube.ini
new file mode 100644
index 00000000000..d10639b1148
--- /dev/null
+++ b/snippets/widgets/emotion/components/component_youtube.ini
@@ -0,0 +1,8 @@
+[en_GB]
+PrivacyNotice = "By viewing the video you agree that your data will be transferred to YouTube and that you have read the Privacy policy."
+AcceptButtonLabel = "Accept"
+
+[de_DE]
+
+PrivacyNotice = "Mit dem Aufruf des Videos erklären Sie sich einverstanden, dass Ihre Daten an Youtube übermittelt werden und das Sie die Datenschutzbestimmungen gelesen haben."
+AcceptButtonLabel = "Akzeptieren"
\ No newline at end of file
diff --git a/tests/Functional/Api/AbstractApiTestCase.php b/tests/Functional/Api/AbstractApiTestCase.php
index fe9beddfbb5..cb0c896e227 100644
--- a/tests/Functional/Api/AbstractApiTestCase.php
+++ b/tests/Functional/Api/AbstractApiTestCase.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Api;
diff --git a/tests/Functional/Api/ArticleTest.php b/tests/Functional/Api/ArticleTest.php
index b4cb9f6028c..b834c259dc4 100644
--- a/tests/Functional/Api/ArticleTest.php
+++ b/tests/Functional/Api/ArticleTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Api;
@@ -30,12 +29,15 @@
 use Shopware\Components\Model\ModelManager;
 use Shopware\Models\Property\Option;
 use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
+use Symfony\Component\HttpFoundation\Response;
 
 /**
  * @covers \Shopware_Controllers_Api_Articles
  */
 class ArticleTest extends AbstractApiTestCase
 {
+    use DatabaseTransactionBehaviour;
     use ContainerTrait;
 
     public function testRequestWithoutAuthenticationShouldReturnError(): void
@@ -78,205 +80,9 @@ public function testGetArticlesWithInvalidIdShouldReturnMessage(): void
         static::assertArrayHasKey('message', $result);
     }
 
-    public function testPostArticlesShouldBeSuccessful(): int
+    public function testPostArticlesShouldBeSuccessful(): void
     {
-        $requestData = [
-            'name' => 'Testartikel',
-            'description' => 'Test description',
-            'descriptionLong' => 'Test descriptionLong',
-            'active' => true,
-            'pseudoSales' => 999,
-            'highlight' => true,
-            'keywords' => 'test, testproduct',
-
-            'filterGroupId' => 1,
-
-            'propertyValues' => [
-                [
-                    'value' => 'grün',
-                    'option' => [
-                        'name' => 'Farbe',
-                    ],
-                ],
-                [
-                    'value' => 'testWert',
-                    'option' => [
-                        'name' => 'neueOption' . uniqid((string) mt_rand(), true),
-                    ],
-                ],
-            ],
-
-            'mainDetail' => [
-                'number' => 'swTEST' . uniqid((string) mt_rand(), true),
-                'inStock' => 15,
-                'unitId' => 1,
-
-                'attribute' => [
-                    'attr1' => 'Freitext1',
-                    'attr2' => 'Freitext2',
-                ],
-
-                'minPurchase' => 5,
-                'purchaseSteps' => 2,
-
-                'prices' => [
-                    [
-                        'customerGroupKey' => 'EK',
-                        'from' => 1,
-                        'to' => 20,
-                        'price' => 500,
-                        'regulationPrice' => 119,
-                    ],
-                    [
-                        'customerGroupKey' => 'EK',
-                        'from' => 21,
-                        'to' => '-',
-                        'price' => 400,
-                        'regulationPrice' => 119,
-                    ],
-                ],
-            ],
-
-            'configuratorSet' => [
-                'name' => 'MyConfigurator',
-                'groups' => [
-                    [
-                        'name' => 'Farbe',
-                        'options' => [
-                            ['name' => 'Gelb'],
-                            ['name' => 'Grün'],
-                        ],
-                    ],
-                    [
-                        'name' => 'Größe',
-                        'options' => [
-                            ['name' => 'L'],
-                            ['name' => 'XL'],
-                        ],
-                    ],
-                ],
-            ],
-
-            'images' => [
-                ['link' => 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAABhGlDQ1BJQ0MgcHJvZmlsZQAAKJF9kT1Iw0AcxV9bpSJVh3YQcchQnSyI36NWoQgVQq3QqoPJpV/QpCFJcXEUXAsOfixWHVycdXVwFQTBDxA3NydFFynxf0mhRYwHx/14d+9x9w7w18tMNTtGAVWzjFQiLmSyq0LwFQGE0YtJTEvM1OdEMQnP8XUPH1/vYjzL+9yfo0fJmQzwCcSzTDcs4g3iqU1L57xPHGFFSSE+Jx4x6ILEj1yXXX7jXHDYzzMjRjo1TxwhFgptLLcxKxoq8QRxVFE1yvdnXFY4b3FWy1XWvCd/YSinrSxzneYgEljEEkQIkFFFCWVYiNGqkWIiRftxD/+A4xfJJZOrBEaOBVSgQnL84H/wu1szPz7mJoXiQOeLbX8MAcFdoFGz7e9j226cAIFn4Epr+St1YOaT9FpLix4BfdvAxXVLk/eAyx2g/0mXDMmRAjT9+TzwfkbflAXCt0D3mttbcx+nD0CaukreAAeHwHCBstc93t3V3tu/Z5r9/QDUInLOjro6CQAAAAlwSFlzAAAuIwAALiMBeKU/dgAAAAd0SU1FB+UDEw42F48Am4gAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAADElEQVQI12NgmPsfAAI9AZ115ELHAAAAAElFTkSuQmCC'],
-                ['link' => 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAABhGlDQ1BJQ0MgcHJvZmlsZQAAKJF9kT1Iw0AcxV9bpSJVh3YQcchQnSyI36NWoQgVQq3QqoPJpV/QpCFJcXEUXAsOfixWHVycdXVwFQTBDxA3NydFFynxf0mhRYwHx/14d+9x9w7w18tMNTtGAVWzjFQiLmSyq0LwFQGE0YtJTEvM1OdEMQnP8XUPH1/vYjzL+9yfo0fJmQzwCcSzTDcs4g3iqU1L57xPHGFFSSE+Jx4x6ILEj1yXXX7jXHDYzzMjRjo1TxwhFgptLLcxKxoq8QRxVFE1yvdnXFY4b3FWy1XWvCd/YSinrSxzneYgEljEEkQIkFFFCWVYiNGqkWIiRftxD/+A4xfJJZOrBEaOBVSgQnL84H/wu1szPz7mJoXiQOeLbX8MAcFdoFGz7e9j226cAIFn4Epr+St1YOaT9FpLix4BfdvAxXVLk/eAyx2g/0mXDMmRAjT9+TzwfkbflAXCt0D3mttbcx+nD0CaukreAAeHwHCBstc93t3V3tu/Z5r9/QDUInLOjro6CQAAAAlwSFlzAAAuIwAALiMBeKU/dgAAAAd0SU1FB+UDEw42F48Am4gAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAADElEQVQI12NgmPsfAAI9AZ115ELHAAAAAElFTkSuQmCC'],
-            ],
-
-            'variants' => [
-                [
-                    'number' => 'swTEST.variant.' . uniqid((string) mt_rand(), true),
-                    'inStock' => 17,
-                    // create a new unit
-                    'unit' => [
-                        'unit' => 'xyz',
-                        'name' => 'newUnit',
-                    ],
-
-                    'attribute' => [
-                        'attr3' => 'Freitext3',
-                        'attr4' => 'Freitext4',
-                    ],
-
-                    'configuratorOptions' => [
-                        [
-                            'option' => 'Gelb',
-                            'group' => 'Farbe',
-                        ],
-                        [
-                            'option' => 'XL',
-                            'group' => 'Größe',
-                        ],
-                    ],
-
-                    'minPurchase' => 5,
-                    'purchaseSteps' => 2,
-
-                    'prices' => [
-                        [
-                            'customerGroupKey' => 'H',
-                            'from' => 1,
-                            'to' => 20,
-                            'price' => 500,
-                        ],
-                        [
-                            'customerGroupKey' => 'H',
-                            'from' => 21,
-                            'to' => '-',
-                            'price' => 400,
-                        ],
-                    ],
-                ],
-                [
-                    'number' => 'swTEST.variant.' . uniqid((string) mt_rand(), true),
-                    'inStock' => 17,
-                    // create a new unit
-                    'unit' => [
-                        'unit' => 'xyz',
-                        'name' => 'newUnit',
-                    ],
-
-                    'attribute' => [
-                        'attr3' => 'Freitext3',
-                        'attr4' => 'Freitext4',
-                    ],
-
-                    'configuratorOptions' => [
-                        [
-                            'option' => 'Grün',
-                            'group' => 'Farbe',
-                        ],
-                        [
-                            'option' => 'XL',
-                            'group' => 'Größe',
-                        ],
-                    ],
-
-                    'minPurchase' => 5,
-                    'purchaseSteps' => 2,
-
-                    'prices' => [
-                        [
-                            'customerGroupKey' => 'H',
-                            'from' => 1,
-                            'to' => 20,
-                            'price' => 500,
-                        ],
-                        [
-                            'customerGroupKey' => 'H',
-                            'from' => 21,
-                            'to' => '-',
-                            'price' => 400,
-                        ],
-                    ],
-                ],
-            ],
-
-            'taxId' => 1,
-            'supplierId' => 2,
-
-            'similar' => [
-                ['id' => 5],
-                ['id' => 6],
-            ],
-
-            'categories' => [
-                ['id' => 15],
-                ['id' => 10],
-            ],
-
-            'related' => [
-                ['id' => 3, 'cross' => true],
-                ['id' => 4],
-            ],
-
-            'links' => [
-                ['name' => 'foobar', 'link' => 'http://example.org'],
-                ['name' => 'Video', 'link' => 'http://example.org'],
-            ],
-        ];
-
-        $this->authenticatedApiRequest('POST', '/api/articles/', [], $requestData);
-        $response = $this->client->getResponse();
+        $response = $this->createTestProduct();
 
         static::assertEquals('application/json', $response->headers->get('Content-Type'));
         static::assertNull($response->headers->get('Set-Cookie'));
@@ -289,15 +95,6 @@ public function testPostArticlesShouldBeSuccessful(): int
 
         static::assertArrayHasKey('success', $result);
         static::assertTrue($result['success']);
-
-        $location = $response->headers->get('location');
-        static::assertIsString($location);
-        $locationPars = explode('/', $location);
-        $identifier = (int) array_pop($locationPars);
-
-        static::assertGreaterThan(0, $identifier);
-
-        return $identifier;
     }
 
     public function testPostArticlesWithInvalidDataShouldReturnError(): void
@@ -322,11 +119,10 @@ public function testPostArticlesWithInvalidDataShouldReturnError(): void
         static::assertArrayHasKey('message', $result);
     }
 
-    /**
-     * @depends testPostArticlesShouldBeSuccessful
-     */
-    public function testGetArticlesWithIdShouldBeSuccessful(int $id): void
+    public function testGetArticlesWithIdShouldBeSuccessful(): void
     {
+        $id = $this->getProductIdFromResponse($this->createTestProduct());
+
         $this->authenticatedApiRequest('GET', '/api/articles/' . $id);
         $response = $this->client->getResponse();
 
@@ -352,11 +148,10 @@ public function testGetArticlesWithIdShouldBeSuccessful(int $id): void
         static::assertEquals('Testartikel', $data['name']);
     }
 
-    /**
-     * @depends testPostArticlesShouldBeSuccessful
-     */
-    public function testPutArticlesWithInvalidDataShouldReturnError(int $id): void
+    public function testPutArticlesWithInvalidDataShouldReturnError(): void
     {
+        $id = $this->getProductIdFromResponse($this->createTestProduct());
+
         // required field name is blank
         $testData = [
             'name' => ' ',
@@ -381,11 +176,10 @@ public function testPutArticlesWithInvalidDataShouldReturnError(int $id): void
         static::assertArrayHasKey('message', $result);
     }
 
-    /**
-     * @depends testPostArticlesShouldBeSuccessful
-     */
-    public function testPutArticlesShouldBeSuccessful(int $id): void
+    public function testPutArticlesShouldBeSuccessful(): void
     {
+        $id = $this->getProductIdFromResponse($this->createTestProduct());
+
         $testData = [
             'name' => 'Update',
             'description' => 'Update description',
@@ -458,11 +252,10 @@ public function testPutArticlesShouldBeSuccessful(int $id): void
         static::assertCount(0, $article['similar'] ?? []);
     }
 
-    /**
-     * @depends testPostArticlesShouldBeSuccessful
-     */
-    public function testChangeVariantArticleMainVariantShouldBeSuccessful(int $id): void
+    public function testChangeVariantArticleMainVariantShouldBeSuccessful(): void
     {
+        $id = $this->getProductIdFromResponse($this->createTestProduct());
+
         $this->authenticatedApiRequest('GET', '/api/articles/' . $id);
         $response = $this->client->getResponse();
 
@@ -474,9 +267,7 @@ public function testChangeVariantArticleMainVariantShouldBeSuccessful(int $id):
         static::assertIsString($result);
         $result = json_decode($result, true);
 
-        $variantNumbers = array_map(static function ($item) {
-            return $item['number'];
-        }, $result['data']['details']);
+        $variantNumbers = array_column($result['data']['details'], 'number');
 
         $oldMain = $result['data']['mainDetail']['number'];
 
@@ -524,11 +315,10 @@ public function testChangeVariantArticleMainVariantShouldBeSuccessful(int $id):
         }
     }
 
-    /**
-     * @depends testPostArticlesShouldBeSuccessful
-     */
-    public function testReplaceArticleImagesWithUrlAndMediaId(int $productId): void
+    public function testReplaceArticleImagesWithUrlAndMediaId(): void
     {
+        $productId = $this->getProductIdFromResponse($this->createTestProduct());
+
         $requestData = [
             '__options_images' => [
                 'replace' => 1,
@@ -565,11 +355,10 @@ public function testReplaceArticleImagesWithUrlAndMediaId(int $productId): void
         static::assertEquals($productId, $data['id']);
     }
 
-    /**
-     * @depends testPostArticlesShouldBeSuccessful
-     */
-    public function testReplaceArticleImagesWithInvalidPayload(int $productId): void
+    public function testReplaceArticleImagesWithInvalidPayload(): void
     {
+        $productId = $this->getProductIdFromResponse($this->createTestProduct());
+
         $requestData = [
             '__options_images' => [
                 'replace' => 1,
@@ -597,11 +386,10 @@ public function testReplaceArticleImagesWithInvalidPayload(int $productId): void
         static::assertArrayHasKey('message', $result);
     }
 
-    /**
-     * @depends testPostArticlesShouldBeSuccessful
-     */
-    public function testDeleteArticlesShouldBeSuccessful(int $id): int
+    public function testDeleteArticlesShouldBeSuccessful(): int
     {
+        $id = $this->getProductIdFromResponse($this->createTestProduct());
+
         $this->authenticatedApiRequest('DELETE', '/api/articles/' . $id);
         $response = $this->client->getResponse();
 
@@ -693,83 +481,83 @@ public function testGetArticlesShouldBeSuccessful(): void
     public function getSimpleArticleData(): array
     {
         return [
-              'name' => 'Simple test article',
-              'description' => 'Test description',
-              'descriptionLong' => 'Test descriptionLong',
-              'active' => true,
-              'pseudoSales' => 999,
-              'highlight' => true,
-              'keywords' => 'test, testarticle',
-
-              'filterGroupId' => 1,
-
-              'propertyValues' => [
-                  [
-                      'value' => 'grün',
-                      'option' => [
-                          'name' => 'Farbe',
-                      ],
-                  ],
-                  [
-                      'value' => 'testWert',
-                      'option' => [
-                          'name' => 'neueOption' . uniqid((string) mt_rand(), true),
-                      ],
-                  ],
-              ],
-
-              'mainDetail' => [
-                  'number' => 'swTEST' . uniqid((string) mt_rand(), true),
-                  'inStock' => 15,
-                  'unitId' => 1,
-
-                  'attribute' => [
-                      'attr1' => 'Freitext1',
-                      'attr2' => 'Freitext2',
-                  ],
-
-                  'minPurchase' => 5,
-                  'purchaseSteps' => 2,
-
-                  'prices' => [
-                      [
-                          'customerGroupKey' => 'EK',
-                          'from' => 1,
-                          'to' => 20,
-                          'price' => 500,
-                      ],
-                      [
-                          'customerGroupKey' => 'EK',
-                          'from' => 21,
-                          'to' => '-',
-                          'price' => 400,
-                      ],
-                  ],
-              ],
-
-              'taxId' => 1,
-              'supplierId' => 2,
-
-              'similar' => [
-                  ['id' => 5],
-                  ['id' => 6],
-              ],
-
-              'categories' => [
-                  ['id' => 15],
-                  ['id' => 10],
-              ],
-
-              'related' => [
-                  ['id' => 3, 'cross' => true],
-                  ['id' => 4],
-              ],
-
-              'links' => [
-                  ['name' => 'foobar', 'link' => 'http://example.org'],
-                  ['name' => 'Video', 'link' => 'http://example.org'],
-              ],
-          ];
+            'name' => 'Simple test article',
+            'description' => 'Test description',
+            'descriptionLong' => 'Test descriptionLong',
+            'active' => true,
+            'pseudoSales' => 999,
+            'highlight' => true,
+            'keywords' => 'test, testarticle',
+
+            'filterGroupId' => 1,
+
+            'propertyValues' => [
+                [
+                    'value' => 'grün',
+                    'option' => [
+                        'name' => 'Farbe',
+                    ],
+                ],
+                [
+                    'value' => 'testWert',
+                    'option' => [
+                        'name' => 'neueOption' . uniqid((string) mt_rand(), true),
+                    ],
+                ],
+            ],
+
+            'mainDetail' => [
+                'number' => 'swTEST' . uniqid((string) mt_rand(), true),
+                'inStock' => 15,
+                'unitId' => 1,
+
+                'attribute' => [
+                    'attr1' => 'Freitext1',
+                    'attr2' => 'Freitext2',
+                ],
+
+                'minPurchase' => 5,
+                'purchaseSteps' => 2,
+
+                'prices' => [
+                    [
+                        'customerGroupKey' => 'EK',
+                        'from' => 1,
+                        'to' => 20,
+                        'price' => 500,
+                    ],
+                    [
+                        'customerGroupKey' => 'EK',
+                        'from' => 21,
+                        'to' => '-',
+                        'price' => 400,
+                    ],
+                ],
+            ],
+
+            'taxId' => 1,
+            'supplierId' => 2,
+
+            'similar' => [
+                ['id' => 5],
+                ['id' => 6],
+            ],
+
+            'categories' => [
+                ['id' => 15],
+                ['id' => 10],
+            ],
+
+            'related' => [
+                ['id' => 3, 'cross' => true],
+                ['id' => 4],
+            ],
+
+            'links' => [
+                ['name' => 'foobar', 'link' => 'http://example.org'],
+                ['name' => 'Video', 'link' => 'http://example.org'],
+            ],
+        ];
     }
 
     public function testBatchModeShouldBeSuccessful(): void
@@ -818,7 +606,7 @@ public function testPropertyOptionFilterableIsSetCorrectly(): void
                 ],
             ],
         ];
-        $this->authenticatedApiRequest('PUT', sprintf('/api/articles/%s', $productIdAperitif), [], $data);
+        $this->authenticatedApiRequest('PUT', \sprintf('/api/articles/%s', $productIdAperitif), [], $data);
         $response = $this->client->getResponse();
         static::assertEquals(200, $response->getStatusCode());
         $result = $response->getContent();
@@ -831,4 +619,218 @@ public function testPropertyOptionFilterableIsSetCorrectly(): void
         static::assertInstanceOf(Option::class, $option);
         static::assertTrue($option->isFilterable());
     }
+
+    private function createTestProduct(): Response
+    {
+        $requestData = [
+            'name' => 'Testartikel',
+            'description' => 'Test description',
+            'descriptionLong' => 'Test descriptionLong',
+            'active' => true,
+            'pseudoSales' => 999,
+            'highlight' => true,
+            'keywords' => 'test, testproduct',
+
+            'filterGroupId' => 1,
+
+            'propertyValues' => [
+                [
+                    'value' => 'grün',
+                    'option' => [
+                        'name' => 'Farbe',
+                    ],
+                ],
+                [
+                    'value' => 'testWert',
+                    'option' => [
+                        'name' => 'neueOption' . uniqid((string) mt_rand(), true),
+                    ],
+                ],
+            ],
+
+            'mainDetail' => [
+                'number' => 'swTEST' . uniqid((string) mt_rand(), true),
+                'inStock' => 15,
+                'unitId' => 1,
+
+                'attribute' => [
+                    'attr1' => 'Freitext1',
+                    'attr2' => 'Freitext2',
+                ],
+
+                'minPurchase' => 5,
+                'purchaseSteps' => 2,
+
+                'prices' => [
+                    [
+                        'customerGroupKey' => 'EK',
+                        'from' => 1,
+                        'to' => 20,
+                        'price' => 500,
+                        'regulationPrice' => 119,
+                    ],
+                    [
+                        'customerGroupKey' => 'EK',
+                        'from' => 21,
+                        'to' => '-',
+                        'price' => 400,
+                        'regulationPrice' => 119,
+                    ],
+                ],
+            ],
+
+            'configuratorSet' => [
+                'name' => 'MyConfigurator',
+                'groups' => [
+                    [
+                        'name' => 'Farbe',
+                        'options' => [
+                            ['name' => 'Gelb'],
+                            ['name' => 'Grün'],
+                        ],
+                    ],
+                    [
+                        'name' => 'Größe',
+                        'options' => [
+                            ['name' => 'L'],
+                            ['name' => 'XL'],
+                        ],
+                    ],
+                ],
+            ],
+
+            'images' => [
+                ['link' => 'file://' . __DIR__ . '/fixtures/test-bild.jpg'],
+                ['link' => 'file://' . __DIR__ . '/fixtures/test-bild.jpg'],
+            ],
+
+            'variants' => [
+                [
+                    'number' => 'swTEST.variant.' . uniqid((string) mt_rand(), true),
+                    'inStock' => 17,
+                    // create a new unit
+                    'unit' => [
+                        'unit' => 'xyz',
+                        'name' => 'newUnit',
+                    ],
+
+                    'attribute' => [
+                        'attr3' => 'Freitext3',
+                        'attr4' => 'Freitext4',
+                    ],
+
+                    'configuratorOptions' => [
+                        [
+                            'option' => 'Gelb',
+                            'group' => 'Farbe',
+                        ],
+                        [
+                            'option' => 'XL',
+                            'group' => 'Größe',
+                        ],
+                    ],
+
+                    'minPurchase' => 5,
+                    'purchaseSteps' => 2,
+
+                    'prices' => [
+                        [
+                            'customerGroupKey' => 'H',
+                            'from' => 1,
+                            'to' => 20,
+                            'price' => 500,
+                        ],
+                        [
+                            'customerGroupKey' => 'H',
+                            'from' => 21,
+                            'to' => '-',
+                            'price' => 400,
+                        ],
+                    ],
+                ],
+                [
+                    'number' => 'swTEST.variant.' . uniqid((string) mt_rand(), true),
+                    'inStock' => 17,
+                    // create a new unit
+                    'unit' => [
+                        'unit' => 'xyz',
+                        'name' => 'newUnit',
+                    ],
+
+                    'attribute' => [
+                        'attr3' => 'Freitext3',
+                        'attr4' => 'Freitext4',
+                    ],
+
+                    'configuratorOptions' => [
+                        [
+                            'option' => 'Grün',
+                            'group' => 'Farbe',
+                        ],
+                        [
+                            'option' => 'XL',
+                            'group' => 'Größe',
+                        ],
+                    ],
+
+                    'minPurchase' => 5,
+                    'purchaseSteps' => 2,
+
+                    'prices' => [
+                        [
+                            'customerGroupKey' => 'H',
+                            'from' => 1,
+                            'to' => 20,
+                            'price' => 500,
+                        ],
+                        [
+                            'customerGroupKey' => 'H',
+                            'from' => 21,
+                            'to' => '-',
+                            'price' => 400,
+                        ],
+                    ],
+                ],
+            ],
+
+            'taxId' => 1,
+            'supplierId' => 2,
+
+            'similar' => [
+                ['id' => 5],
+                ['id' => 6],
+            ],
+
+            'categories' => [
+                ['id' => 15],
+                ['id' => 10],
+            ],
+
+            'related' => [
+                ['id' => 3, 'cross' => true],
+                ['id' => 4],
+            ],
+
+            'links' => [
+                ['name' => 'foobar', 'link' => 'http://example.org'],
+                ['name' => 'Video', 'link' => 'http://example.org'],
+            ],
+        ];
+
+        $this->authenticatedApiRequest('POST', '/api/articles/', [], $requestData);
+
+        return $this->client->getResponse();
+    }
+
+    private function getProductIdFromResponse(Response $response): int
+    {
+        $location = $response->headers->get('location');
+        static::assertIsString($location);
+        $locationPars = explode('/', $location);
+        $identifier = (int) array_pop($locationPars);
+
+        static::assertGreaterThan(0, $identifier);
+
+        return $identifier;
+    }
 }
diff --git a/tests/Functional/Api/CategoryTest.php b/tests/Functional/Api/CategoryTest.php
index 5d0e1b18075..85d3a3493d6 100644
--- a/tests/Functional/Api/CategoryTest.php
+++ b/tests/Functional/Api/CategoryTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Api;
diff --git a/tests/Functional/Api/CustomerGroupTest.php b/tests/Functional/Api/CustomerGroupTest.php
index 682ae9798d7..463584ed53c 100644
--- a/tests/Functional/Api/CustomerGroupTest.php
+++ b/tests/Functional/Api/CustomerGroupTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Api;
diff --git a/tests/Functional/Api/CustomerTest.php b/tests/Functional/Api/CustomerTest.php
index b2b17c06e40..148d27ba89d 100644
--- a/tests/Functional/Api/CustomerTest.php
+++ b/tests/Functional/Api/CustomerTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Api;
@@ -394,7 +393,7 @@ public function testGetCustomerWithNumberAsIdWithDuplicateNumberThrowsException(
 
         static::assertCount(2, $customersWithSameNumber);
 
-        $this->authenticatedApiRequest('DELETE', sprintf('/api/customers/%d?useNumberAsId=1', $existingCustomerNumber));
+        $this->authenticatedApiRequest('DELETE', \sprintf('/api/customers/%d?useNumberAsId=1', $existingCustomerNumber));
         $response = $this->client->getResponse();
 
         static::assertInstanceOf(Enlight_Controller_Response_ResponseTestCase::class, $response);
@@ -408,7 +407,7 @@ public function testGetCustomerWithNumberAsIdWithDuplicateNumberThrowsException(
 
         static::assertFalse($response['success']);
         static::assertSame(
-            sprintf(
+            \sprintf(
                 "Identifier 'number' with value '%s' for entity 'Shopware\Models\Customer\Customer' is not unique.",
                 $existingCustomerNumber
             ),
diff --git a/tests/Functional/Api/GenerateArticleImagesTest.php b/tests/Functional/Api/GenerateArticleImagesTest.php
index c3318069850..558d2d86e36 100644
--- a/tests/Functional/Api/GenerateArticleImagesTest.php
+++ b/tests/Functional/Api/GenerateArticleImagesTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Api;
diff --git a/tests/Functional/Api/HttpKernelBrowser.php b/tests/Functional/Api/HttpKernelBrowser.php
index ade9ac7a30a..ef900eef73e 100644
--- a/tests/Functional/Api/HttpKernelBrowser.php
+++ b/tests/Functional/Api/HttpKernelBrowser.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Api;
@@ -48,7 +47,7 @@ class HttpKernelBrowser extends SymfonyHttpKernelBrowser
     /**
      * @param array<string, mixed> $server
      */
-    public function __construct(Kernel $kernel, array $server = [], History $history = null, CookieJar $cookieJar = null)
+    public function __construct(Kernel $kernel, array $server = [], ?History $history = null, ?CookieJar $cookieJar = null)
     {
         $this->container = $kernel->getContainer();
         $this->front = $this->container->get('front');
diff --git a/tests/Functional/Api/ManufacturerTest.php b/tests/Functional/Api/ManufacturerTest.php
index 8dae9e37402..41e12857e86 100644
--- a/tests/Functional/Api/ManufacturerTest.php
+++ b/tests/Functional/Api/ManufacturerTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Api;
@@ -41,6 +40,7 @@ public function testGetManufacturersShouldBeSuccessful(): void
         static::assertSame(200, $response->getStatusCode());
 
         $response = $response->getContent();
+        static::assertIsString($response);
         $response = json_decode($response, true);
 
         static::assertArrayHasKey('success', $response);
@@ -60,7 +60,7 @@ public function testPostManufacturersWithoutNameShouldFailWithMessage(): void
         $requestData = [
             'description' => 'flipflops',
             'image' => [
-                'link' => 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAABhGlDQ1BJQ0MgcHJvZmlsZQAAKJF9kT1Iw0AcxV9bpSJVh3YQcchQnSyI36NWoQgVQq3QqoPJpV/QpCFJcXEUXAsOfixWHVycdXVwFQTBDxA3NydFFynxf0mhRYwHx/14d+9x9w7w18tMNTtGAVWzjFQiLmSyq0LwFQGE0YtJTEvM1OdEMQnP8XUPH1/vYjzL+9yfo0fJmQzwCcSzTDcs4g3iqU1L57xPHGFFSSE+Jx4x6ILEj1yXXX7jXHDYzzMjRjo1TxwhFgptLLcxKxoq8QRxVFE1yvdnXFY4b3FWy1XWvCd/YSinrSxzneYgEljEEkQIkFFFCWVYiNGqkWIiRftxD/+A4xfJJZOrBEaOBVSgQnL84H/wu1szPz7mJoXiQOeLbX8MAcFdoFGz7e9j226cAIFn4Epr+St1YOaT9FpLix4BfdvAxXVLk/eAyx2g/0mXDMmRAjT9+TzwfkbflAXCt0D3mttbcx+nD0CaukreAAeHwHCBstc93t3V3tu/Z5r9/QDUInLOjro6CQAAAAlwSFlzAAAuIwAALiMBeKU/dgAAAAd0SU1FB+UDEw42F48Am4gAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAADElEQVQI12NgmPsfAAI9AZ115ELHAAAAAElFTkSuQmCC',
+                'link' => 'file://' . __DIR__ . '/fixtures/test-bild.jpg',
             ],
         ];
 
@@ -72,6 +72,7 @@ public function testPostManufacturersWithoutNameShouldFailWithMessage(): void
         static::assertSame(400, $response->getStatusCode());
 
         $result = $response->getContent();
+        static::assertIsString($result);
         $result = json_decode($result, true);
 
         static::assertArrayHasKey('success', $result);
@@ -86,7 +87,7 @@ public function testPostManufacturersShouldBeSuccessful(): int
             'name' => 'Foo Bar',
             'description' => 'flipflops',
             'image' => [
-                'link' => 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAABhGlDQ1BJQ0MgcHJvZmlsZQAAKJF9kT1Iw0AcxV9bpSJVh3YQcchQnSyI36NWoQgVQq3QqoPJpV/QpCFJcXEUXAsOfixWHVycdXVwFQTBDxA3NydFFynxf0mhRYwHx/14d+9x9w7w18tMNTtGAVWzjFQiLmSyq0LwFQGE0YtJTEvM1OdEMQnP8XUPH1/vYjzL+9yfo0fJmQzwCcSzTDcs4g3iqU1L57xPHGFFSSE+Jx4x6ILEj1yXXX7jXHDYzzMjRjo1TxwhFgptLLcxKxoq8QRxVFE1yvdnXFY4b3FWy1XWvCd/YSinrSxzneYgEljEEkQIkFFFCWVYiNGqkWIiRftxD/+A4xfJJZOrBEaOBVSgQnL84H/wu1szPz7mJoXiQOeLbX8MAcFdoFGz7e9j226cAIFn4Epr+St1YOaT9FpLix4BfdvAxXVLk/eAyx2g/0mXDMmRAjT9+TzwfkbflAXCt0D3mttbcx+nD0CaukreAAeHwHCBstc93t3V3tu/Z5r9/QDUInLOjro6CQAAAAlwSFlzAAAuIwAALiMBeKU/dgAAAAd0SU1FB+UDEw42F48Am4gAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAADElEQVQI12NgmPsfAAI9AZ115ELHAAAAAElFTkSuQmCC',
+                'link' => 'file://' . __DIR__ . '/fixtures/test-bild.jpg',
             ],
         ];
 
@@ -101,6 +102,7 @@ public function testPostManufacturersShouldBeSuccessful(): int
         );
 
         $result = $response->getContent();
+        static::assertIsString($result);
         $result = json_decode($result, true);
 
         static::assertArrayHasKey('success', $result);
@@ -133,6 +135,7 @@ public function testPutManufacturersWithInvalidDataShouldReturnError(int $id): v
         static::assertSame(400, $response->getStatusCode());
 
         $result = $response->getContent();
+        static::assertIsString($result);
         $result = json_decode($result, true);
 
         static::assertArrayHasKey('success', $result);
@@ -168,6 +171,7 @@ public function testPutManufacturersShouldBeSuccessful(int $id): int
         );
 
         $result = $response->getContent();
+        static::assertIsString($result);
         $result = json_decode($result, true);
 
         static::assertArrayHasKey('success', $result);
@@ -200,6 +204,7 @@ public function testPutManufacturersImageShouldBeSuccessful(int $id): int
         );
 
         $result = $response->getContent();
+        static::assertIsString($result);
         $result = json_decode($result, true);
 
         static::assertArrayHasKey('success', $result);
diff --git a/tests/Functional/Api/MediaTest.php b/tests/Functional/Api/MediaTest.php
index 6b721d1c9d2..079852f3afb 100644
--- a/tests/Functional/Api/MediaTest.php
+++ b/tests/Functional/Api/MediaTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Api;
@@ -129,7 +128,7 @@ public function testPostMediaShouldBeSuccessful(): int
     {
         $requestData = [
             'album' => -1,
-            'file' => 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAABhGlDQ1BJQ0MgcHJvZmlsZQAAKJF9kT1Iw0AcxV9bpSJVh3YQcchQnSyI36NWoQgVQq3QqoPJpV/QpCFJcXEUXAsOfixWHVycdXVwFQTBDxA3NydFFynxf0mhRYwHx/14d+9x9w7w18tMNTtGAVWzjFQiLmSyq0LwFQGE0YtJTEvM1OdEMQnP8XUPH1/vYjzL+9yfo0fJmQzwCcSzTDcs4g3iqU1L57xPHGFFSSE+Jx4x6ILEj1yXXX7jXHDYzzMjRjo1TxwhFgptLLcxKxoq8QRxVFE1yvdnXFY4b3FWy1XWvCd/YSinrSxzneYgEljEEkQIkFFFCWVYiNGqkWIiRftxD/+A4xfJJZOrBEaOBVSgQnL84H/wu1szPz7mJoXiQOeLbX8MAcFdoFGz7e9j226cAIFn4Epr+St1YOaT9FpLix4BfdvAxXVLk/eAyx2g/0mXDMmRAjT9+TzwfkbflAXCt0D3mttbcx+nD0CaukreAAeHwHCBstc93t3V3tu/Z5r9/QDUInLOjro6CQAAAAlwSFlzAAAuIwAALiMBeKU/dgAAAAd0SU1FB+UDEw42F48Am4gAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAADElEQVQI12NgmPsfAAI9AZ115ELHAAAAAElFTkSuQmCC',
+            'file' => 'file://' . __DIR__ . '/fixtures/test-bild.jpg',
             'description' => 'flipflops',
         ];
 
diff --git a/tests/Functional/Api/OrderTest.php b/tests/Functional/Api/OrderTest.php
index 4bf929875ee..6b71c9c66af 100644
--- a/tests/Functional/Api/OrderTest.php
+++ b/tests/Functional/Api/OrderTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Api;
diff --git a/tests/Functional/Api/PaymentMethodsTest.php b/tests/Functional/Api/PaymentMethodsTest.php
index 61ee1bc409d..e52c6a59ca8 100644
--- a/tests/Functional/Api/PaymentMethodsTest.php
+++ b/tests/Functional/Api/PaymentMethodsTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Api;
diff --git a/tests/Functional/Api/VersionTest.php b/tests/Functional/Api/VersionTest.php
index d1778dca67a..077a908dac6 100644
--- a/tests/Functional/Api/VersionTest.php
+++ b/tests/Functional/Api/VersionTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Api;
diff --git a/tests/Functional/Bundle/AccountBundle/Controller/AccountTest.php b/tests/Functional/Bundle/AccountBundle/Controller/AccountTest.php
index 38844f05cc3..52df831044c 100644
--- a/tests/Functional/Bundle/AccountBundle/Controller/AccountTest.php
+++ b/tests/Functional/Bundle/AccountBundle/Controller/AccountTest.php
@@ -5,28 +5,26 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\AccountBundle\Controller;
 
-use Enlight_Components_Db_Adapter_Pdo_Mysql;
 use Enlight_Components_Session_Namespace;
 use Enlight_Components_Test_Controller_TestCase as ControllerTestCase;
 use Shopware_Components_Config;
@@ -126,13 +124,13 @@ public function testNormalLogin(): void
      */
     public function testHashPostLogin(): void
     {
-        //test with md5 password and without the ignoreAccountMode parameter
-        static::assertEmpty($this->session->offsetGet('sUserId'));
+        // test with md5 password and without the ignoreAccountMode parameter
+        static::assertEmpty($this->session->get('sUserId'));
 
         $this->setUserDataToPost();
         $this->dispatch('/account/login');
 
-        static::assertEmpty($this->session->offsetGet('sUserId'));
+        static::assertEmpty($this->session->get('sUserId'));
 
         $this->logoutUser();
     }
@@ -145,7 +143,7 @@ public function testHashPostLogin(): void
      */
     public function testWithoutIgnoreLogin(): void
     {
-        //test the internal call of the method with the $ignoreAccountMode parameter
+        // test the internal call of the method with the $ignoreAccountMode parameter
 
         $this->setUserDataToPost();
         $this->dispatch('/');
@@ -163,7 +161,7 @@ public function testWithoutIgnoreLogin(): void
         static::assertEmpty($result['sErrorMessages']);
 
         $this->logoutUser();
-        //test the internal call of the method without the $ignoreAccountMode parameter
+        // test the internal call of the method without the $ignoreAccountMode parameter
 
         $this->setUserDataToPost();
 
@@ -184,7 +182,7 @@ public function testWithoutIgnoreLogin(): void
      */
     public function testWithIgnoreLogin(): void
     {
-        //test the internal call of the method without the $ignoreAccountMode parameter
+        // test the internal call of the method without the $ignoreAccountMode parameter
         $this->setUserDataToPost();
 
         $this->dispatch('/');
@@ -207,11 +205,11 @@ public function testWithIgnoreLogin(): void
      */
     private function logoutUser(): void
     {
-        //reset the request
+        // reset the request
         $this->reset();
         $this->Request()->setMethod('POST');
         $this->dispatch('/account/logout');
-        //reset the request
+        // reset the request
         $this->reset();
     }
 
@@ -222,9 +220,10 @@ private function setUserDataToPost(): void
     {
         $sql = 'SELECT email, password FROM s_user WHERE id = 1';
         $database = $this->container->get('db');
-        static::assertInstanceOf(Enlight_Components_Db_Adapter_Pdo_Mysql::class, $database);
 
         $userData = $database->fetchRow($sql);
+        static::assertNotEmpty($userData['email']);
+        static::assertNotEmpty($userData['password']);
         $this->Request()->setMethod('POST')
             ->setPost('email', $userData['email'])
             ->setPost('passwordMD5', $userData['password']);
diff --git a/tests/Functional/Bundle/AccountBundle/Controller/AddressTest.php b/tests/Functional/Bundle/AccountBundle/Controller/AddressTest.php
index a48c02c9f62..6b72fdda997 100644
--- a/tests/Functional/Bundle/AccountBundle/Controller/AddressTest.php
+++ b/tests/Functional/Bundle/AccountBundle/Controller/AddressTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\AccountBundle\Controller;
diff --git a/tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php b/tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
index c0ab8c43df7..07439920108 100644
--- a/tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
+++ b/tests/Functional/Bundle/AccountBundle/Controller/RegisterTest.php
@@ -1,39 +1,43 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\AccountBundle\Controller;
 
 use Doctrine\DBAL\Connection;
-use Enlight_Components_Test_Controller_TestCase;
+use Enlight_Components_Test_Controller_TestCase as ControllerTestCase;
 use Enlight_Controller_Response_Response;
+use Exception;
 use InvalidArgumentException;
+use Shopware\Components\Model\ModelManager;
 use Shopware\Models\Customer\Customer;
-use Shopware_Components_Config;
-use Zend_Cache_Core;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
 
-class RegisterTest extends Enlight_Components_Test_Controller_TestCase
+class RegisterTest extends ControllerTestCase
 {
+    use ContainerTrait;
+
     public const TEST_MAIL = 'unittest@mail.com';
     public const SAVE_URL = '/register/saveRegister/sTarget/account/sTargetAction/index';
     public const CONFIRM_URL_PREFIX = '/register/confirmValidation/sConfirmation/';
@@ -47,31 +51,31 @@ public static function tearDownAfterClass(): void
     public function setUp(): void
     {
         parent::setUp();
-        Shopware()->Container()->get(\Doctrine\DBAL\Connection::class)->beginTransaction();
-        $this->deleteCustomer(self::TEST_MAIL);
-        Shopware()->Container()->get(\Shopware\Components\Model\ModelManager::class)->clear();
+        $this->getContainer()->get(Connection::class)->beginTransaction();
+        $this->deleteCustomer();
+        $this->getContainer()->get(ModelManager::class)->clear();
     }
 
     protected function tearDown(): void
     {
         parent::tearDown();
-        Shopware()->Container()->get(\Doctrine\DBAL\Connection::class)->rollback();
-        $this->deleteCustomer(self::TEST_MAIL);
-        Shopware()->Container()->get(\Shopware\Components\Model\ModelManager::class)->clear();
+        $this->getContainer()->get(Connection::class)->rollBack();
+        $this->deleteCustomer();
+        $this->getContainer()->get(ModelManager::class)->clear();
     }
 
-    public function testSimpleRegistration()
+    public function testSimpleRegistration(): void
     {
         $this->Request()->setMethod('POST');
         $this->Request()->setPost([
             'register' => [
                 'personal' => $this->getPersonalData(),
                 'billing' => $this->getBillingData(),
+                'shipping' => $this->getShippingData(),
             ],
         ]);
 
         $this->sendRequestAndAssertCustomer(
-            self::TEST_MAIL,
             [
                 'firstname' => 'first name',
                 'lastname' => 'last name',
@@ -93,20 +97,21 @@ public function testSimpleRegistration()
         );
     }
 
-    public function testDoubleOptInRegistration()
+    public function testDoubleOptInRegistration(): void
     {
         $this->Request()->setMethod('POST');
         $this->Request()->setPost([
             'register' => [
                 'personal' => $this->getPersonalData(),
                 'billing' => $this->getBillingData(),
+                'shipping' => $this->getShippingData(),
             ],
         ]);
 
-        $this->sendRequestAndAssertCustomerWithDoubleOptIn(self::TEST_MAIL);
+        $this->sendRequestAndAssertCustomerWithDoubleOptIn();
     }
 
-    public function testRegistrationWithShipping()
+    public function testRegistrationWithShipping(): void
     {
         $this->Request()->setMethod('POST');
         $this->Request()->setPost([
@@ -120,7 +125,6 @@ public function testRegistrationWithShipping()
         ]);
 
         $this->sendRequestAndAssertCustomer(
-            self::TEST_MAIL,
             ['firstname' => 'first name'],
             ['street' => 'street'],
             [
@@ -137,7 +141,27 @@ public function testRegistrationWithShipping()
         );
     }
 
-    public function testCompanyRegistration()
+    /**
+     * @throws Exception
+     */
+    public function testRegistrationFailsWithURLInName(): void
+    {
+        $this->Request()->setMethod('POST');
+        $this->Request()->setPost([
+            'register' => [
+                'personal' => $this->getPersonalData([
+                    'firstname' => 'https://example.com',
+                    'lastname' => 'https://example.com',
+                ]),
+                'billing' => $this->getBillingData(),
+                'shipping' => $this->getShippingData(),
+            ],
+        ]);
+
+        $this->sendRequestAndAssertNoUrlAllowedInName();
+    }
+
+    public function testCompanyRegistration(): void
     {
         $this->Request()->setMethod('POST');
         $this->Request()->setPost([
@@ -150,11 +174,11 @@ public function testCompanyRegistration()
                     'company' => 'company',
                     'department' => 'department',
                 ]),
+                'shipping' => $this->getShippingData(),
             ],
         ]);
 
         $this->sendRequestAndAssertCustomer(
-            self::TEST_MAIL,
             [
                 'firstname' => 'first name',
             ],
@@ -167,7 +191,7 @@ public function testCompanyRegistration()
         );
     }
 
-    public function testFastRegistration()
+    public function testFastRegistration(): void
     {
         $this->Request()->setMethod('POST');
         $this->Request()->setPost([
@@ -177,11 +201,11 @@ public function testFastRegistration()
                     'accountmode' => Customer::ACCOUNT_MODE_FAST_LOGIN,
                 ]),
                 'billing' => $this->getBillingData(),
+                'shipping' => $this->getShippingData(),
             ],
         ]);
 
         $this->sendRequestAndAssertCustomer(
-            self::TEST_MAIL,
             [
                 'firstname' => 'first name',
                 'lastname' => 'last name',
@@ -198,20 +222,20 @@ public function testFastRegistration()
         );
     }
 
-    public function testDefaultPayment()
+    public function testDefaultPayment(): void
     {
-        Shopware()->Session()->offsetSet('sPaymentID', 6);
+        $this->getContainer()->get('session')->offsetSet('sPaymentID', 6);
 
         $this->Request()->setMethod('POST');
         $this->Request()->setPost([
             'register' => [
                 'personal' => $this->getPersonalData(),
                 'billing' => $this->getBillingData(),
+                'shipping' => $this->getShippingData(),
             ],
         ]);
 
         $this->sendRequestAndAssertCustomer(
-            self::TEST_MAIL,
             [
                 'firstname' => 'first name',
                 'paymentID' => 6,
@@ -228,26 +252,33 @@ public function testDefaultPayment()
         );
     }
 
-    private function sendRequestAndAssertCustomer($email, $personal, $billing = [], $shipping = [])
+    /**
+     * @param array<string, int|string> $personal
+     * @param array<string, int|string> $billing
+     * @param array<string, int|string> $shipping
+     *
+     * @throws Exception
+     */
+    private function sendRequestAndAssertCustomer(array $personal, array $billing = [], array $shipping = []): void
     {
-        $this->doubleOptinSet(false);
+        $this->doubleOptInSet(false);
         $response = $this->dispatch(self::SAVE_URL);
 
         static::assertEquals(302, $response->getHttpResponseCode());
 
         static::assertStringEndsWith(
             '/account',
-            $this->getHeaderLocation($response)
+            $this->getHeaderLocation($response) ?? ''
         );
 
-        $session = Shopware()->Container()->get('session');
-        static::assertNotEmpty($session->offsetGet('sUserId'));
+        $session = $this->getContainer()->get('session');
+        static::assertNotEmpty($session->get('sUserId'));
 
-        $customer = Shopware()->Container()->get(\Doctrine\DBAL\Connection::class)->fetchAssoc(
+        $customer = $this->getContainer()->get(Connection::class)->fetchAssociative(
             'SELECT * FROM s_user WHERE email = :mail AND active = 1 AND doubleOptinEmailSentDate IS NULL LIMIT 1',
-            [':mail' => $email]
+            [':mail' => self::TEST_MAIL]
         );
-        static::assertNotEmpty($customer);
+        static::assertIsArray($customer);
 
         if (!empty($personal)) {
             foreach ($personal as $key => $value) {
@@ -257,99 +288,108 @@ private function sendRequestAndAssertCustomer($email, $personal, $billing = [],
         }
 
         if (!empty($billing)) {
-            $this->assertAddress($email, $billing);
+            $this->assertAddress(self::TEST_MAIL, $billing);
         }
 
         if (!empty($shipping)) {
-            $this->assertAddress($email, $shipping, 'shipping');
+            $this->assertAddress(self::TEST_MAIL, $shipping, 'shipping');
         }
     }
 
-    private function sendRequestAndAssertCustomerWithDoubleOptIn($email)
+    private function sendRequestAndAssertNoUrlAllowedInName(): void
     {
-        $this->doubleOptinSet(true);
+        $this->doubleOptInSet(false);
+        $response = $this->dispatch(self::SAVE_URL);
+
+        static::assertEquals(200, $response->getHttpResponseCode());
+        static::assertIsString($response->getBody());
+        static::assertStringContainsString('Eine URL ist in diesem Feld nicht erlaubt', $response->getBody());
+    }
+
+    private function sendRequestAndAssertCustomerWithDoubleOptIn(): void
+    {
+        $this->doubleOptInSet(true);
         $this->dispatch(self::SAVE_URL);
 
-        /** @var Connection $connection */
-        $connection = Shopware()->Container()->get(\Doctrine\DBAL\Connection::class);
+        $connection = $this->getContainer()->get(Connection::class);
 
-        $customer = $connection->fetchAssoc(
+        $customer = $connection->fetchAssociative(
             'SELECT id, doubleOptinEmailSentDate FROM s_user WHERE email = :mail AND active = 0 AND doubleOptinEmailSentDate IS NOT NULL LIMIT 1',
-            [':mail' => $email]
+            [':mail' => self::TEST_MAIL]
         );
 
-        static::assertNotEmpty($customer);
+        static::assertIsArray($customer);
 
-        $optin = $connection->fetchAssoc(
+        $optIn = $connection->fetchAssociative(
             'SELECT type, data, hash FROM s_core_optin WHERE datum = :datum LIMIT 1',
             [':datum' => $customer['doubleOptinEmailSentDate']]
         );
+        static::assertIsArray($optIn);
 
-        static::assertNotEmpty($optin);
-        static::assertEquals('swRegister', $optin['type']);
-        static::assertNotEmpty($optin['data']);
+        static::assertNotEmpty($optIn);
+        static::assertEquals('swRegister', $optIn['type']);
+        static::assertNotEmpty($optIn['data']);
 
-        $data = unserialize($optin['data']);
+        $data = unserialize($optIn['data']);
         static::assertEquals($customer['id'], $data['customerId']);
-        $this->sendRequestAndAssertDOIConfirmation($email, $optin['hash']);
+        $this->sendRequestAndAssertDOIConfirmation($optIn['hash']);
     }
 
-    private function sendRequestAndAssertDOIConfirmation($email, $hash)
+    private function sendRequestAndAssertDOIConfirmation(string $hash): void
     {
-        /** @var Connection $connection */
-        $connection = Shopware()->Container()->get(\Doctrine\DBAL\Connection::class);
+        $connection = $this->getContainer()->get(Connection::class);
 
         // Create broken data
         $connection->executeQuery(
             'INSERT INTO s_core_optin (type, datum, hash, data)
-             SELECT type, (datum - INTERVAL 1 MINUTE), CONCAT(hash,\'X\'), \'I am definitly not working\' 
+             SELECT type, (datum - INTERVAL 1 MINUTE), CONCAT(hash,\'X\'), \'I am definitely not working\'
              FROM s_core_optin
              WHERE hash = :hash',
             [':hash' => $hash]
         );
 
         $this->reset();
-        $this->doubleOptinSet(true);
+        $this->doubleOptInSet(true);
         $this->dispatch(self::CONFIRM_URL_PREFIX . $hash);
 
-        $customer = $connection->fetchAssoc(
+        $customer = $connection->fetchAssociative(
             'SELECT doubleOptinEmailSentDate FROM s_user WHERE email = :mail AND active = 1 AND doubleOptinEmailSentDate IS NOT NULL AND doubleOptinConfirmDate IS NOT NULL LIMIT 1',
-            [':mail' => $email]
+            [':mail' => self::TEST_MAIL]
         );
-        static::assertNotEmpty($customer);
+        static::assertIsArray($customer);
 
-        $optin = $connection->fetchAssoc(
+        $optIn = $connection->fetchAssociative(
             'SELECT * FROM s_core_optin WHERE datum = :datum LIMIT 1',
             [':datum' => $customer['doubleOptinEmailSentDate']]
         );
-        static::assertEmpty($optin);
+        static::assertFalse($optIn);
 
         // Test broken data
         $this->reset();
-        $this->doubleOptinSet(true);
+        $this->doubleOptInSet(true);
         $this->expectException(InvalidArgumentException::class);
         $this->dispatch(self::CONFIRM_URL_PREFIX . $hash . 'X');
     }
 
-    private function deleteCustomer($email)
+    private function deleteCustomer(): void
     {
-        Shopware()->Container()->get(\Doctrine\DBAL\Connection::class)->executeQuery(
+        $this->getContainer()->get(Connection::class)->executeQuery(
             'DELETE FROM s_user WHERE email = :mail',
-            [':mail' => $email]
+            [':mail' => self::TEST_MAIL]
         );
     }
 
     /**
-     * @param array $data
+     * @param array<string, mixed> $data
      *
-     * @return array
+     * @return array<string, mixed>
      */
-    private function getPersonalData($data = [])
+    private function getPersonalData(array $data = []): array
     {
         return array_merge([
             'salutation' => 'mr',
             'customer_type' => Customer::CUSTOMER_TYPE_PRIVATE,
-            'password' => 'defaultpassword',
+            'password' => 'defaultPassword',
             'email' => self::TEST_MAIL,
             'firstname' => 'first name',
             'lastname' => 'last name',
@@ -357,7 +397,12 @@ private function getPersonalData($data = [])
         ], $data);
     }
 
-    private function getShippingData($data = [])
+    /**
+     * @param array<string, mixed> $data
+     *
+     * @return array<string, mixed>
+     */
+    private function getShippingData(array $data = []): array
     {
         return array_merge([
             'salutation' => 'ms',
@@ -372,7 +417,12 @@ private function getShippingData($data = [])
         ], $data);
     }
 
-    private function getBillingData($data = [])
+    /**
+     * @param array<string, mixed> $data
+     *
+     * @return array<string, mixed>
+     */
+    private function getBillingData(array $data = []): array
     {
         return array_merge([
             'street' => 'street',
@@ -384,23 +434,21 @@ private function getBillingData($data = [])
     }
 
     /**
-     * @param string $email
-     * @param array  $data
-     * @param string $type
+     * @param array<string, mixed> $data
      */
-    private function assertAddress($email, $data, $type = 'billing')
+    private function assertAddress(string $email, array $data, string $type = 'billing'): void
     {
         $column = 'default_billing_address_id';
         if ($type !== 'billing') {
             $column = 'default_shipping_address_id';
         }
 
-        $address = Shopware()->Container()->get(\Doctrine\DBAL\Connection::class)->fetchAssoc(
+        $address = $this->getContainer()->get(Connection::class)->fetchAssociative(
             'SELECT address.* FROM s_user_addresses address, s_user user WHERE user.' . $column . ' = address.id AND user.email = :mail',
             [':mail' => $email]
         );
 
-        static::assertNotEmpty($address);
+        static::assertIsArray($address);
 
         foreach ($data as $key => $value) {
             static::assertArrayHasKey($key, $address);
@@ -408,13 +456,9 @@ private function assertAddress($email, $data, $type = 'billing')
         }
     }
 
-    /**
-     * @return string|null
-     */
-    private function getHeaderLocation(Enlight_Controller_Response_Response $response)
+    private function getHeaderLocation(Enlight_Controller_Response_Response $response): ?string
     {
-        $headers = $response->getHeaders();
-        foreach ($headers as $header) {
+        foreach ($response->getHeaders() as $header) {
             if ($header['name'] === 'Location') {
                 return $header['value'];
             }
@@ -423,13 +467,8 @@ private function getHeaderLocation(Enlight_Controller_Response_Response $respons
         return null;
     }
 
-    /**
-     * @param bool $switch
-     */
-    private function doubleOptinSet($switch)
+    private function doubleOptInSet(bool $switch): void
     {
-        Shopware()->Container()->get(\Shopware\Components\ConfigWriter::class)->save('optinregister', $switch, null, Shopware()->Shop()->getId());
-        Shopware()->Container()->get(Shopware_Components_Config::class)->setShop(Shopware()->Shop());
-        Shopware()->Container()->get(Zend_Cache_Core::class)->clean();
+        $this->setConfig('optinregister', $switch);
     }
 }
diff --git a/tests/Functional/Bundle/AccountBundle/Service/AddressServiceTest.php b/tests/Functional/Bundle/AccountBundle/Service/AddressServiceTest.php
index c877f4476bb..8be776c3ff9 100644
--- a/tests/Functional/Bundle/AccountBundle/Service/AddressServiceTest.php
+++ b/tests/Functional/Bundle/AccountBundle/Service/AddressServiceTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\AccountBundle\Service;
@@ -40,39 +39,21 @@
 
 class AddressServiceTest extends Enlight_Components_Test_TestCase
 {
-    /**
-     * @var AddressServiceInterface
-     */
-    protected static $addressService;
+    private static AddressServiceInterface $addressService;
 
-    /**
-     * @var ModelManager
-     */
-    protected static $modelManager;
+    private static ModelManager $modelManager;
 
-    /**
-     * @var Connection
-     */
-    protected static $connection;
+    private static Connection $connection;
 
-    /**
-     * @var ContextServiceInterface
-     */
-    protected static $contextService;
+    private static ContextServiceInterface $contextService;
 
-    /**
-     * @var RegisterServiceInterface
-     */
-    protected static $registerService;
+    private static RegisterServiceInterface $registerService;
 
     /**
      * @var array<class-string, int[]>
      */
-    protected static array $_cleanup = [];
+    private static array $_cleanup = [];
 
-    /**
-     * Set up fixtures
-     */
     public static function setUpBeforeClass(): void
     {
         self::$addressService = Shopware()->Container()->get(AddressServiceInterface::class);
@@ -157,7 +138,6 @@ public function testCreateAddress(): int
 
         self::$addressService->create($address, $customer);
 
-        static::assertInstanceOf(Address::class, $address);
         static::assertNotNull($address->getId());
 
         foreach ($addressData as $key => $value) {
diff --git a/tests/Functional/Bundle/AccountBundle/Service/CustomerServiceTest.php b/tests/Functional/Bundle/AccountBundle/Service/CustomerServiceTest.php
index d5b420f220b..f3c5d54cf7f 100644
--- a/tests/Functional/Bundle/AccountBundle/Service/CustomerServiceTest.php
+++ b/tests/Functional/Bundle/AccountBundle/Service/CustomerServiceTest.php
@@ -5,37 +5,39 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\AccountBundle\Service;
 
 use Doctrine\DBAL\Connection;
-use Enlight_Components_Test_TestCase;
+use PHPUnit\Framework\TestCase;
 use Shopware\Bundle\AccountBundle\Service\CustomerServiceInterface;
 use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface;
 use Shopware\Components\Api\Exception\ValidationException;
 use Shopware\Components\Model\ModelManager;
 use Shopware\Models\Customer\Customer;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 
-class CustomerServiceTest extends Enlight_Components_Test_TestCase
+class CustomerServiceTest extends TestCase
 {
+    use DatabaseTransactionBehaviour;
+
     /**
      * @var CustomerServiceInterface
      */
@@ -62,8 +64,6 @@ public static function setUpBeforeClass(): void
         self::$modelManager = Shopware()->Container()->get(ModelManager::class);
         self::$connection = Shopware()->Container()->get(Connection::class);
         self::$contextService = Shopware()->Container()->get(ContextServiceInterface::class);
-
-        self::$modelManager->clear();
     }
 
     /**
@@ -71,12 +71,7 @@ public static function setUpBeforeClass(): void
      */
     public static function tearDownAfterClass(): void
     {
-        parent::tearDownAfterClass();
-
-        self::$modelManager->flush();
         self::$modelManager->clear();
-
-        Shopware()->Container()->reset('router');
     }
 
     public function testUpdateEmail(): void
@@ -90,10 +85,6 @@ public function testUpdateEmail(): void
         self::$customerService->update($customer);
 
         static::assertEquals($newMail, $customer->getEmail());
-
-        // Reset back to default demo mail
-        $customer->setEmail('mustermann@b2b.de');
-        self::$customerService->update($customer);
     }
 
     public function testUpdateExistingEmail(): void
diff --git a/tests/Functional/Bundle/AccountBundle/Service/CustomerUnlockServiceTest.php b/tests/Functional/Bundle/AccountBundle/Service/CustomerUnlockServiceTest.php
index 5668e6f3058..7696e81a2b1 100644
--- a/tests/Functional/Bundle/AccountBundle/Service/CustomerUnlockServiceTest.php
+++ b/tests/Functional/Bundle/AccountBundle/Service/CustomerUnlockServiceTest.php
@@ -5,57 +5,48 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\AccountBundle\Service;
 
-use Enlight_Components_Test_TestCase;
+use Doctrine\DBAL\Connection;
+use PHPUnit\Framework\TestCase;
 use Shopware\Bundle\AccountBundle\Service\CustomerUnlockServiceInterface;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 
-class CustomerUnlockServiceTest extends Enlight_Components_Test_TestCase
+class CustomerUnlockServiceTest extends TestCase
 {
-    public function setUp(): void
-    {
-        parent::setUp();
-
-        Shopware()->Db()->beginTransaction();
-    }
-
-    public function tearDown(): void
-    {
-        parent::tearDown();
-
-        Shopware()->Db()->rollBack();
-    }
+    use DatabaseTransactionBehaviour;
+    use ContainerTrait;
 
     public function testUnlockCustomer(): void
     {
-        Shopware()->Db()->query("INSERT INTO `s_user` (`id`, `password`, `encoder`, `email`, `active`, `accountmode`, `confirmationkey`, `paymentID`, `firstlogin`, `lastlogin`, `sessionID`, `newsletter`, `validation`, `affiliate`, `customergroup`, `paymentpreset`, `language`, `subshopID`, `referer`, `pricegroupID`, `internalcomment`, `failedlogins`, `lockeduntil`, `default_billing_address_id`, `default_shipping_address_id`, `title`, `salutation`, `firstname`, `lastname`, `birthday`, `customernumber`, `login_token`) VALUES
+        $this->getContainer()->get(Connection::class)->executeQuery("INSERT INTO `s_user` (`id`, `password`, `encoder`, `email`, `active`, `accountmode`, `confirmationkey`, `paymentID`, `firstlogin`, `lastlogin`, `sessionID`, `newsletter`, `validation`, `affiliate`, `customergroup`, `paymentpreset`, `language`, `subshopID`, `referer`, `pricegroupID`, `internalcomment`, `failedlogins`, `lockeduntil`, `default_billing_address_id`, `default_shipping_address_id`, `title`, `salutation`, `firstname`, `lastname`, `birthday`, `customernumber`, `login_token`) VALUES
             (2048, 'FooBar', 'bcrypt', 'foo@bar.com', 1, 0, '', 5, '2018-05-24', '2018-05-24 15:55:32', '3pj2eudm344a5904fe3hp6nvf3', 0, '', 0, 'EK', 0, '1', 1, '', NULL, '', 0, '2018-01-01 00:00:00', 5, 5, NULL, 'mr', 'Foo', 'Bar', NULL, '20005', 'token');");
 
         /** @var CustomerUnlockServiceInterface $unlockService */
         $unlockService = Shopware()->Container()->get('shopware_account.customer_unlock_service');
         $unlockService->unlock(2048);
 
-        $lockedUntil = Shopware()->Db()->fetchOne('SELECT lockeduntil FROM s_user WHERE id = 2048');
+        $lockedUntil = $this->getContainer()->get(Connection::class)->fetchOne('SELECT lockeduntil FROM s_user WHERE id = 2048');
 
-        static::assertNull($lockedUntil);
+        static::assertIsNotString($lockedUntil);
     }
 }
diff --git a/tests/Functional/Bundle/AccountBundle/Service/RegisterServiceTest.php b/tests/Functional/Bundle/AccountBundle/Service/RegisterServiceTest.php
index 0abcc5f5fea..60282c4432a 100644
--- a/tests/Functional/Bundle/AccountBundle/Service/RegisterServiceTest.php
+++ b/tests/Functional/Bundle/AccountBundle/Service/RegisterServiceTest.php
@@ -5,30 +5,29 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\AccountBundle\Service;
 
 use Doctrine\DBAL\Connection;
 use Doctrine\ORM\ORMException;
-use Enlight_Components_Test_TestCase;
+use PHPUnit\Framework\TestCase;
 use Shopware\Bundle\AccountBundle\Service\RegisterServiceInterface;
 use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface;
 use Shopware\Bundle\StoreFrontBundle\Struct\Shop;
@@ -38,9 +37,14 @@
 use Shopware\Models\Country\State;
 use Shopware\Models\Customer\Address;
 use Shopware\Models\Customer\Customer;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 
-class RegisterServiceTest extends Enlight_Components_Test_TestCase
+class RegisterServiceTest extends TestCase
 {
+    use DatabaseTransactionBehaviour;
+    use ContainerTrait;
+
     /**
      * @var RegisterServiceInterface
      */
@@ -61,11 +65,6 @@ class RegisterServiceTest extends Enlight_Components_Test_TestCase
      */
     protected static $contextService;
 
-    /**
-     * @var array<class-string, int[]>
-     */
-    protected static array $_cleanup = [];
-
     /**
      * Set up fixtures
      */
@@ -75,8 +74,6 @@ public static function setUpBeforeClass(): void
         self::$modelManager = Shopware()->Container()->get(ModelManager::class);
         self::$connection = Shopware()->Container()->get(Connection::class);
         self::$contextService = Shopware()->Container()->get(ContextServiceInterface::class);
-
-        self::$modelManager->clear();
     }
 
     /**
@@ -84,19 +81,7 @@ public static function setUpBeforeClass(): void
      */
     public static function tearDownAfterClass(): void
     {
-        parent::tearDownAfterClass();
-
-        foreach (self::$_cleanup as $entityName => $ids) {
-            foreach ($ids as $id) {
-                $model = self::$modelManager->find($entityName, $id);
-                static::assertNotNull($model);
-                self::$modelManager->remove($model);
-            }
-        }
-
-        self::$modelManager->flush();
         self::$modelManager->clear();
-
         Shopware()->Container()->reset('router');
     }
 
@@ -171,9 +156,6 @@ public function testRegister(): int
 
         self::$modelManager->refresh($customer);
 
-        self::$_cleanup[Customer::class][] = $customer->getId();
-        self::$_cleanup[Address::class][] = $billing->getId();
-
         $this->assertCustomer($demoData, $customer);
 
         // assert data sync
@@ -183,6 +165,40 @@ public function testRegister(): int
         return $customer->getId();
     }
 
+    public function testRegisterWithoutSalutation(): void
+    {
+        $demoData = $this->getCustomerDemoData();
+        $config = $this->getContainer()->get('config');
+
+        $config->offsetSet('shopSalutationRequired', false);
+        unset($demoData['salutation']);
+        $billingDemoData = $this->getBillingDemoData();
+
+        $shop = $this->getShop();
+
+        $customer = new Customer();
+        $customer->fromArray($demoData);
+
+        $billing = new Address();
+        $billing->fromArray($billingDemoData);
+
+        self::$registerService->register($shop, $customer, $billing);
+
+        static::assertGreaterThan(0, $customer->getId());
+
+        self::$modelManager->refresh($customer);
+
+        $demoData['salutation'] = 'not_defined';
+
+        $this->assertCustomer($demoData, $customer);
+
+        // assert data sync
+        $this->assertAddress($billingDemoData, $customer);
+        $this->assertAddress($billingDemoData, $customer, true);
+
+        $config->offsetSet('shopSalutationRequired', true);
+    }
+
     public function testRegisterWithDifferentShipping(): void
     {
         $demoData = $this->getCustomerDemoData(true);
@@ -206,10 +222,6 @@ public function testRegisterWithDifferentShipping(): void
 
         self::$modelManager->refresh($customer);
 
-        self::$_cleanup[Customer::class][] = $customer->getId();
-        self::$_cleanup[Address::class][] = $billing->getId();
-        self::$_cleanup[Address::class][] = $shipping->getId();
-
         $this->assertCustomer($demoData, $customer);
 
         // assert data sync
@@ -217,11 +229,10 @@ public function testRegisterWithDifferentShipping(): void
         $this->assertAddress($shippingDemoData, $customer, true);
     }
 
-    /**
-     * @depends testRegister
-     */
     public function testRegisterWithExistingEmail(): void
     {
+        $this->testRegister();
+
         $this->expectException(ValidationException::class);
         $demoData = $this->getCustomerDemoData();
 
@@ -301,8 +312,6 @@ private function createCountry(): Country
         self::$modelManager->persist($country);
         self::$modelManager->flush($country);
 
-        self::$_cleanup[Country::class][] = $country->getId();
-
         return self::$modelManager->merge($country);
     }
 
@@ -323,8 +332,6 @@ private function createState(Country $country): State
         self::$modelManager->persist($state);
         self::$modelManager->flush($state);
 
-        self::$_cleanup[State::class][] = $state->getId();
-
         return self::$modelManager->merge($state);
     }
 
diff --git a/tests/Functional/Bundle/AttributeBundle/DataLoaderTest.php b/tests/Functional/Bundle/AttributeBundle/DataLoaderTest.php
index 5da59d43966..1e0ee406346 100644
--- a/tests/Functional/Bundle/AttributeBundle/DataLoaderTest.php
+++ b/tests/Functional/Bundle/AttributeBundle/DataLoaderTest.php
@@ -1,35 +1,38 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\AttributeBundle;
 
 use Doctrine\DBAL\Connection;
 use Exception;
+use PHPUnit\Framework\TestCase;
+use Shopware\Bundle\AttributeBundle\Service\DataLoader;
 use Shopware\Bundle\AttributeBundle\Service\DataLoaderInterface;
+use Shopware\Bundle\AttributeBundle\Service\DataPersister;
 use Shopware\Bundle\AttributeBundle\Service\DataPersisterInterface;
 
-class DataLoaderTest extends \PHPUnit\Framework\TestCase
+class DataLoaderTest extends TestCase
 {
     /**
      * @var DataLoaderInterface
@@ -48,11 +51,11 @@ class DataLoaderTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp(): void
     {
-        $this->connection = Shopware()->Container()->get(\Doctrine\DBAL\Connection::class);
+        $this->connection = Shopware()->Container()->get(Connection::class);
         $this->connection->beginTransaction();
 
-        $this->attributePersister = Shopware()->Container()->get(\Shopware\Bundle\AttributeBundle\Service\DataPersister::class);
-        $this->attributeLoader = Shopware()->Container()->get(\Shopware\Bundle\AttributeBundle\Service\DataLoader::class);
+        $this->attributePersister = Shopware()->Container()->get(DataPersister::class);
+        $this->attributeLoader = Shopware()->Container()->get(DataLoader::class);
 
         parent::setUp();
     }
diff --git a/tests/Functional/Bundle/AttributeBundle/Repository/CustomerRepositoryTest.php b/tests/Functional/Bundle/AttributeBundle/Repository/CustomerRepositoryTest.php
index 701c0c6fb85..746713cf5e8 100644
--- a/tests/Functional/Bundle/AttributeBundle/Repository/CustomerRepositoryTest.php
+++ b/tests/Functional/Bundle/AttributeBundle/Repository/CustomerRepositoryTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\AttributeBundle\Repository;
diff --git a/tests/Functional/Bundle/AttributeBundle/Repository/OrderRepositoryTest.php b/tests/Functional/Bundle/AttributeBundle/Repository/OrderRepositoryTest.php
index 28a1b16aaac..6a8190fad9d 100644
--- a/tests/Functional/Bundle/AttributeBundle/Repository/OrderRepositoryTest.php
+++ b/tests/Functional/Bundle/AttributeBundle/Repository/OrderRepositoryTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\AttributeBundle\Repository;
diff --git a/tests/Functional/Bundle/AttributeBundle/Repository/Reader/OrderReaderTest.php b/tests/Functional/Bundle/AttributeBundle/Repository/Reader/OrderReaderTest.php
index de02f8857c2..a01982454ac 100644
--- a/tests/Functional/Bundle/AttributeBundle/Repository/Reader/OrderReaderTest.php
+++ b/tests/Functional/Bundle/AttributeBundle/Repository/Reader/OrderReaderTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\AttributeBundle\Repository\Reader;
diff --git a/tests/Functional/Bundle/AttributeBundle/SchemaOperatorTest.php b/tests/Functional/Bundle/AttributeBundle/SchemaOperatorTest.php
index feb321cf422..5fcfd0334c8 100644
--- a/tests/Functional/Bundle/AttributeBundle/SchemaOperatorTest.php
+++ b/tests/Functional/Bundle/AttributeBundle/SchemaOperatorTest.php
@@ -1,49 +1,53 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\AttributeBundle;
 
+use Doctrine\DBAL\DBALException;
 use Exception;
 use PHPUnit\Framework\TestCase;
 use Shopware\Bundle\AttributeBundle\Service\ConfigurationStruct;
+use Shopware\Bundle\AttributeBundle\Service\CrudService;
+use Shopware\Bundle\AttributeBundle\Service\TableMapping;
+use Shopware\Bundle\AttributeBundle\Service\TypeMappingInterface;
 
 class SchemaOperatorTest extends TestCase
 {
     public function testDefaultValues(): void
     {
         $types = [
-            'string' => 'test123',
-            'integer' => 123,
-            'float' => 123,
-            'boolean' => 1,
-            'date' => '2010-01-01',
-            'datetime' => '2010-01-01 10:00:00',
-            'text' => 'test123',
-            'html' => 'test123',
-            'combobox' => '1',
-            'multi_selection' => '1',
-            'single_selection' => 'SW10003',
+            TypeMappingInterface::TYPE_STRING => 'test123',
+            TypeMappingInterface::TYPE_INTEGER => 123,
+            TypeMappingInterface::TYPE_FLOAT => 123,
+            TypeMappingInterface::TYPE_BOOLEAN => 1,
+            TypeMappingInterface::TYPE_DATE => '2010-01-01',
+            TypeMappingInterface::TYPE_DATETIME => '2010-01-01 10:00:00',
+            TypeMappingInterface::TYPE_TEXT => 'test123',
+            TypeMappingInterface::TYPE_HTML => 'test123',
+            TypeMappingInterface::TYPE_COMBOBOX => '1',
+            TypeMappingInterface::TYPE_MULTI_SELECTION => '1',
+            TypeMappingInterface::TYPE_SINGLE_SELECTION => 'SW10003',
         ];
 
         $this->iterateTypeArray($types);
@@ -52,17 +56,17 @@ public function testDefaultValues(): void
     public function testNullDefaultValues(): void
     {
         $types = [
-            'string' => null,
-            'integer' => null,
-            'float' => null,
-            'boolean' => null,
-            'date' => null,
-            'datetime' => null,
-            'text' => null,
-            'html' => null,
-            'combobox' => null,
-            'multi_selection' => null,
-            'single_selection' => null,
+            TypeMappingInterface::TYPE_STRING => null,
+            TypeMappingInterface::TYPE_INTEGER => null,
+            TypeMappingInterface::TYPE_FLOAT => null,
+            TypeMappingInterface::TYPE_BOOLEAN => null,
+            TypeMappingInterface::TYPE_DATE => null,
+            TypeMappingInterface::TYPE_DATETIME => null,
+            TypeMappingInterface::TYPE_TEXT => null,
+            TypeMappingInterface::TYPE_HTML => null,
+            TypeMappingInterface::TYPE_COMBOBOX => null,
+            TypeMappingInterface::TYPE_MULTI_SELECTION => null,
+            TypeMappingInterface::TYPE_SINGLE_SELECTION => null,
         ];
 
         $this->iterateTypeArray($types);
@@ -71,17 +75,17 @@ public function testNullDefaultValues(): void
     public function testNullStringDefaultValues(): void
     {
         $types = [
-            'string' => 'NULL',
-            'integer' => 'NULL',
-            'float' => 'NULL',
-            'boolean' => 'NULL',
-            'date' => 'NULL',
-            'datetime' => 'NULL',
-            'text' => 'NULL',
-            'html' => 'NULL',
-            'combobox' => 'NULL',
-            'multi_selection' => 'NULL',
-            'single_selection' => 'NULL',
+            TypeMappingInterface::TYPE_STRING => 'NULL',
+            TypeMappingInterface::TYPE_INTEGER => 'NULL',
+            TypeMappingInterface::TYPE_FLOAT => 'NULL',
+            TypeMappingInterface::TYPE_BOOLEAN => 'NULL',
+            TypeMappingInterface::TYPE_DATE => 'NULL',
+            TypeMappingInterface::TYPE_DATETIME => 'NULL',
+            TypeMappingInterface::TYPE_TEXT => 'NULL',
+            TypeMappingInterface::TYPE_HTML => 'NULL',
+            TypeMappingInterface::TYPE_COMBOBOX => 'NULL',
+            TypeMappingInterface::TYPE_MULTI_SELECTION => 'NULL',
+            TypeMappingInterface::TYPE_SINGLE_SELECTION => 'NULL',
         ];
 
         $this->iterateTypeArray($types);
@@ -92,16 +96,16 @@ public function testNullStringDefaultValues(): void
      */
     public function testDefaultValuesBoolean(): void
     {
-        $this->iterateTypeArray(['boolean' => 1]);
-        $this->iterateTypeArray(['boolean' => 0]);
-        $this->iterateTypeArray(['boolean' => true]);
-        $this->iterateTypeArray(['boolean' => false]);
-        $this->iterateTypeArray(['boolean' => null]);
-        $this->iterateTypeArray(['boolean' => '1']);
-        $this->iterateTypeArray(['boolean' => '0']);
-        $this->iterateTypeArray(['boolean' => 'true']);
-        $this->iterateTypeArray(['boolean' => 'false']);
-        $this->iterateTypeArray(['boolean' => 'null']);
+        $this->iterateTypeArray([TypeMappingInterface::TYPE_BOOLEAN => 1]);
+        $this->iterateTypeArray([TypeMappingInterface::TYPE_BOOLEAN => 0]);
+        $this->iterateTypeArray([TypeMappingInterface::TYPE_BOOLEAN => true]);
+        $this->iterateTypeArray([TypeMappingInterface::TYPE_BOOLEAN => false]);
+        $this->iterateTypeArray([TypeMappingInterface::TYPE_BOOLEAN => null]);
+        $this->iterateTypeArray([TypeMappingInterface::TYPE_BOOLEAN => '1']);
+        $this->iterateTypeArray([TypeMappingInterface::TYPE_BOOLEAN => '0']);
+        $this->iterateTypeArray([TypeMappingInterface::TYPE_BOOLEAN => 'true']);
+        $this->iterateTypeArray([TypeMappingInterface::TYPE_BOOLEAN => 'false']);
+        $this->iterateTypeArray([TypeMappingInterface::TYPE_BOOLEAN => 'null']);
     }
 
     public function testUpdateConfiguration(): void
@@ -109,22 +113,21 @@ public function testUpdateConfiguration(): void
         $service = Shopware()->Container()->get('shopware_attribute.crud_service');
         $tableMapping = Shopware()->Container()->get('shopware_attribute.table_mapping');
         $table = 's_articles_attributes';
-        $columnName = 'attr_' . uniqid((string) mt_rand(), false);
+        $columnName = 'attr_' . uniqid((string) mt_rand());
 
-        $service->update($table, $columnName, 'bool');
+        $service->update($table, $columnName, TypeMappingInterface::TYPE_BOOLEAN);
         static::assertTrue($tableMapping->isTableColumn($table, $columnName));
-        $service->update($table, $columnName, 'date');
+        $service->update($table, $columnName, TypeMappingInterface::TYPE_DATE);
         static::assertTrue($tableMapping->isTableColumn($table, $columnName));
 
-        /** @var ConfigurationStruct|null $column */
         $column = $service->get($table, $columnName);
         static::assertInstanceOf(ConfigurationStruct::class, $column);
-        static::assertEquals('date', $column->getColumnType());
+        static::assertEquals(TypeMappingInterface::TYPE_DATE, $column->getColumnType());
     }
 
     public function testReinsertColumnConfigurationShouldFail(): void
     {
-        $this->expectException(\Doctrine\DBAL\DBALException::class);
+        $this->expectException(DBALException::class);
         $connection = Shopware()->Container()->get('dbal_connection');
         $attributeData = [
             'table_name' => 's_articles_attributes',
@@ -136,14 +139,14 @@ public function testReinsertColumnConfigurationShouldFail(): void
     }
 
     /**
-     * @param array $types
+     * @param array<string, mixed> $types
      *
      * @throws Exception
      */
-    private function iterateTypeArray($types): void
+    private function iterateTypeArray(array $types): void
     {
-        $service = Shopware()->Container()->get(\Shopware\Bundle\AttributeBundle\Service\CrudService::class);
-        $tableMapping = Shopware()->Container()->get(\Shopware\Bundle\AttributeBundle\Service\TableMapping::class);
+        $service = Shopware()->Container()->get(CrudService::class);
+        $tableMapping = Shopware()->Container()->get(TableMapping::class);
         $table = 's_articles_attributes';
 
         foreach ($types as $type => $default) {
diff --git a/tests/Functional/Bundle/BenchmarkBundle/BenchmarkEncryptionTest.php b/tests/Functional/Bundle/BenchmarkBundle/BenchmarkEncryptionTest.php
deleted file mode 100644
index 7ab201cf796..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/BenchmarkEncryptionTest.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Tests\Functional\Bundle\BenchmarkBundle;
-
-use PHPUnit\Framework\TestCase;
-use RuntimeException;
-use Shopware\Bundle\BenchmarkBundle\BenchmarkEncryption;
-
-class BenchmarkEncryptionTest extends TestCase
-{
-    public function testCorrectSignatureIsWorking(): void
-    {
-        $encryption = new BenchmarkEncryption(__DIR__ . '/fixtures/public_test_key.pem');
-
-        $message = 'foobarbaz';
-        $signature = $this->sign($message);
-
-        static::assertTrue($encryption->isSignatureValid($message, $signature));
-    }
-
-    public function testWrongSignatureIsFailing(): void
-    {
-        $encryption = new BenchmarkEncryption(__DIR__ . '/fixtures/public_test_key.pem');
-
-        $message = 'foobarbaz';
-        $signature = 'bazbarfoo';
-
-        static::assertFalse($encryption->isSignatureValid($message, $signature));
-    }
-
-    public function testSignatureIsSupported(): void
-    {
-        $encryption = new BenchmarkEncryption(__DIR__ . '/fixtures/public_test_key.pem');
-
-        static::assertTrue($encryption->isSignatureSupported());
-    }
-
-    /**
-     * Generates a signature for a given message using the private key
-     */
-    private function sign(string $message): string
-    {
-        $signature = '';
-        if (false === $privateKeyResource = openssl_pkey_get_private('file://' . __DIR__ . '/fixtures/private_test_key.pem', '')) {
-            while ($errors[] = openssl_error_string()) {
-            }
-            throw new RuntimeException(sprintf("Could not import private key: \n%s", implode("\n", $errors)));
-        }
-
-        if (openssl_sign($message, $signature, $privateKeyResource) === false) {
-            while ($errors[] = openssl_error_string()) {
-            }
-            throw new RuntimeException(sprintf("Error during private key read: \n%s", implode("\n", $errors)));
-        }
-
-        return base64_encode($signature);
-    }
-}
diff --git a/tests/Functional/Bundle/BenchmarkBundle/BenchmarkTestCase.php b/tests/Functional/Bundle/BenchmarkBundle/BenchmarkTestCase.php
deleted file mode 100644
index 25df159226e..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/BenchmarkTestCase.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Tests\Functional\Bundle\BenchmarkBundle;
-
-use Doctrine\DBAL\Connection;
-use PHPUnit\Framework\TestCase;
-use RuntimeException;
-use Shopware\Components\Model\ModelManager;
-use Shopware\Tests\Functional\Traits\ContainerTrait;
-use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
-
-abstract class BenchmarkTestCase extends TestCase
-{
-    use DatabaseTransactionBehaviour;
-    use ContainerTrait;
-
-    public function setUp(): void
-    {
-        parent::setUp();
-
-        $this->getContainer()->get(ModelManager::class)->clear();
-    }
-
-    protected function installDemoData(string $dataName): void
-    {
-        $dbalConnection = $this->getContainer()->get(Connection::class);
-
-        $fileContent = $this->openDemoDataFile($dataName);
-        $dbalConnection->executeStatement($fileContent);
-    }
-
-    protected function getAssetsFolder(): string
-    {
-        return __DIR__ . '/assets/';
-    }
-
-    protected function openDemoDataFile(string $fileName): string
-    {
-        $fileName .= '.sql';
-        $path = $this->getAssetsFolder();
-        $filePath = $path . $fileName;
-        if (!file_exists($filePath)) {
-            throw new RuntimeException(sprintf('File with name %s does not exist in path %s', $fileName, $path));
-        }
-
-        $content = file_get_contents($filePath);
-        static::assertIsString($content);
-
-        return $content;
-    }
-}
diff --git a/tests/Functional/Bundle/BenchmarkBundle/Controllers/Backend/BenchmarkControllerTest.php b/tests/Functional/Bundle/BenchmarkBundle/Controllers/Backend/BenchmarkControllerTest.php
deleted file mode 100644
index 5d46ab90d23..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/Controllers/Backend/BenchmarkControllerTest.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Tests\Functional\Bundle\BenchmarkBundle\Controllers\Backend;
-
-use Shopware_Controllers_Backend_Benchmark;
-
-class BenchmarkControllerTest extends BenchmarkControllerTestCase
-{
-    protected const CONTROLLER_NAME = Shopware_Controllers_Backend_Benchmark::class;
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testSaveIndustryAction(): void
-    {
-        $controller = $this->getController();
-        static::assertInstanceOf(Shopware_Controllers_Backend_Benchmark::class, $controller);
-
-        $this->installDemoData('benchmark_config');
-
-        $controller->Request()->setParam('shopId', 1);
-        $controller->Request()->setParam('industry', 15);
-
-        $controller->saveIndustryAction();
-
-        static::assertSame('15', $this->loadSettingColumn('config.industry'));
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testSetActiveAction(): void
-    {
-        $controller = $this->getController();
-        static::assertInstanceOf(Shopware_Controllers_Backend_Benchmark::class, $controller);
-
-        $this->installDemoData('benchmark_config');
-
-        $controller->Request()->setParam('shopId', 1);
-        $controller->Request()->setParam('active', 1);
-
-        $controller->setActiveAction();
-
-        static::assertSame('1', $this->loadSettingColumn('config.active'));
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testSaveTypeAction(): void
-    {
-        $controller = $this->getController();
-        static::assertInstanceOf(Shopware_Controllers_Backend_Benchmark::class, $controller);
-
-        $this->installDemoData('benchmark_config');
-
-        $controller->Request()->setParam('shopId', 1);
-        $controller->Request()->setParam('type', 'b2c');
-
-        $controller->saveTypeAction();
-
-        static::assertSame('b2c', $this->loadSettingColumn('config.type'));
-    }
-}
diff --git a/tests/Functional/Bundle/BenchmarkBundle/Controllers/Backend/BenchmarkControllerTestCase.php b/tests/Functional/Bundle/BenchmarkBundle/Controllers/Backend/BenchmarkControllerTestCase.php
deleted file mode 100644
index 67eceb88756..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/Controllers/Backend/BenchmarkControllerTestCase.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Tests\Functional\Bundle\BenchmarkBundle\Controllers\Backend;
-
-use Doctrine\DBAL\Connection;
-use Enlight_Class;
-use Enlight_Controller_Request_RequestTestCase;
-use Enlight_Controller_Response_ResponseTestCase;
-use Enlight_Template_Manager;
-use Enlight_View_Default;
-use Shopware\Tests\Functional\Bundle\BenchmarkBundle\BenchmarkTestCase;
-use Shopware_Controllers_Backend_ExtJs;
-
-class BenchmarkControllerTestCase extends BenchmarkTestCase
-{
-    protected const CONTROLLER_NAME = '';
-
-    protected function getAssetsFolder(): string
-    {
-        return __DIR__ . '/assets/';
-    }
-
-    protected function getController(): Shopware_Controllers_Backend_ExtJs
-    {
-        $controller = Enlight_Class::Instance(static::CONTROLLER_NAME);
-        static::assertInstanceOf(Shopware_Controllers_Backend_ExtJs::class, $controller);
-
-        $controller->initController(new Enlight_Controller_Request_RequestTestCase(), new Enlight_Controller_Response_ResponseTestCase());
-
-        $controller->setContainer($this->getContainer());
-        $controller->setView(new Enlight_View_Default(new Enlight_Template_Manager()));
-
-        return $controller;
-    }
-
-    protected function loadSettingColumn(string $select): string
-    {
-        $queryBuilder = $this->getContainer()->get(Connection::class)->createQueryBuilder();
-
-        return (string) $queryBuilder->select($select)
-            ->from('s_benchmark_config', 'config')
-            ->execute()
-            ->fetchOne();
-    }
-
-    protected function setSetting(string $key, string $value): void
-    {
-        $queryBuilder = $this->getContainer()->get(Connection::class)->createQueryBuilder();
-
-        $queryBuilder->update('s_benchmark_config', 'config')
-            ->set($key, ':value')
-            ->setParameter(':value', $value)
-            ->execute();
-    }
-}
diff --git a/tests/Functional/Bundle/BenchmarkBundle/Controllers/Backend/BenchmarkLocalOverviewControllerTest.php b/tests/Functional/Bundle/BenchmarkBundle/Controllers/Backend/BenchmarkLocalOverviewControllerTest.php
deleted file mode 100644
index a57cf2d9831..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/Controllers/Backend/BenchmarkLocalOverviewControllerTest.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Tests\Functional\Bundle\BenchmarkBundle\Controllers\Backend;
-
-use Enlight_Template_Manager;
-use Shopware\Tests\Functional\Bundle\BenchmarkBundle\Controllers\Backend\Mocks\ViewMock;
-use Shopware_Controllers_Backend_BenchmarkLocalOverview;
-
-class BenchmarkLocalOverviewControllerTest extends BenchmarkControllerTestCase
-{
-    protected const CONTROLLER_NAME = Shopware_Controllers_Backend_BenchmarkLocalOverview::class;
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testRenderActionShouldLoadStart(): void
-    {
-        $controller = $this->getController();
-        static::assertInstanceOf(Shopware_Controllers_Backend_BenchmarkLocalOverview::class, $controller);
-
-        $this->getContainer()->get('dbal_connection')->executeStatement('DELETE FROM s_benchmark_config;');
-        $controller->setView(new ViewMock(new Enlight_Template_Manager()));
-
-        $controller->renderAction();
-
-        $view = $controller->View();
-        static::assertInstanceOf(ViewMock::class, $view);
-        $loadedTemplate = $view->getTemplate();
-
-        static::assertSame('backend/benchmark/template/local/start.tpl', $loadedTemplate);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testRenderActionShouldLoadCustom(): void
-    {
-        $controller = $this->getController();
-        static::assertInstanceOf(Shopware_Controllers_Backend_BenchmarkLocalOverview::class, $controller);
-
-        $this->installDemoData('benchmark_config');
-        $controller->setView(new ViewMock(new Enlight_Template_Manager()));
-        $controller->Request()->setParam('template', 'custom');
-
-        $controller->renderAction();
-
-        $view = $controller->View();
-        static::assertInstanceOf(ViewMock::class, $view);
-        $loadedTemplate = $view->getTemplate();
-
-        static::assertSame('backend/benchmark/template/local/custom.tpl', $loadedTemplate);
-    }
-}
diff --git a/tests/Functional/Bundle/BenchmarkBundle/Controllers/Backend/BenchmarkOverviewControllerTest.php b/tests/Functional/Bundle/BenchmarkBundle/Controllers/Backend/BenchmarkOverviewControllerTest.php
deleted file mode 100644
index 30249c647a5..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/Controllers/Backend/BenchmarkOverviewControllerTest.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Tests\Functional\Bundle\BenchmarkBundle\Controllers\Backend;
-
-use DateTime;
-use Enlight_Controller_Response_ResponseHttp;
-use Enlight_Controller_Response_ResponseTestCase;
-use Enlight_Event_EventArgs;
-use Shopware\Tests\Functional\Bundle\BenchmarkBundle\Controllers\Backend\Mocks\AuthMock;
-use Shopware_Controllers_Backend_BenchmarkOverview;
-
-class BenchmarkOverviewControllerTest extends BenchmarkControllerTestCase
-{
-    protected const CONTROLLER_NAME = Shopware_Controllers_Backend_BenchmarkOverview::class;
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testIndexActionShouldRedirectLocalStart(): void
-    {
-        $controller = $this->getController();
-
-        $this->getContainer()->get('dbal_connection')->executeStatement('DELETE FROM s_benchmark_config;');
-        $controller->indexAction();
-
-        $redirect = $this->getRedirect($controller->Response());
-
-        static::assertStringContainsString('BenchmarkLocalOverview/render/template/start', $redirect);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testIndexActionShouldRedirectCachedFreshStatistics(): void
-    {
-        $controller = $this->getController();
-
-        $this->installDemoData('benchmark_config');
-        $this->setSetting('industry', '1');
-        $this->setSetting('last_received', date('Y-m-d H:i:s'));
-        $this->setSetting('cached_template', '<h2>Placeholder</h2>');
-
-        $controller->indexAction();
-
-        $redirect = $this->getRedirect($controller->Response());
-
-        static::assertStringContainsString('BenchmarkOverview/render', $redirect);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testIndexActionShouldRedirectWaitingFreshStatisticsNoCachedTemplate(): void
-    {
-        $controller = $this->getController();
-
-        $this->installDemoData('benchmark_config');
-        $this->setSetting('industry', '1');
-        $this->setSetting('last_received', date('Y-m-d H:i:s'));
-
-        $controller->indexAction();
-
-        $redirect = $this->getRedirect($controller->Response());
-
-        static::assertStringContainsString('BenchmarkLocalOverview/render/template/waiting', $redirect);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testIndexActionShouldRedirectWaitingInactive(): void
-    {
-        $controller = $this->getController();
-
-        $this->installDemoData('benchmark_config');
-        $this->setSetting('industry', '1');
-        $this->setSetting('active', '0');
-
-        $controller->indexAction();
-
-        $redirect = $this->getRedirect($controller->Response());
-
-        static::assertStringContainsString('BenchmarkLocalOverview/render/template/waiting', $redirect);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testIndexActionShouldRedirectWaitingActiveOutdated(): void
-    {
-        $controller = $this->getController();
-
-        $this->installDemoData('benchmark_config');
-        $this->setSetting('industry', '1');
-        $this->setSetting('last_received', date('Y-m-d H:i:s', strtotime('-31 days')));
-        $this->setSetting('active', '1');
-
-        $controller->indexAction();
-
-        $redirect = $this->getRedirect($controller->Response());
-
-        static::assertStringContainsString('BenchmarkLocalOverview/render/template/waiting', $redirect);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testIndexActionShouldRedirectCachedActive(): void
-    {
-        $controller = $this->getController();
-
-        $this->installDemoData('benchmark_config');
-        $this->setSetting('industry', '1');
-        $this->setSetting('last_received', date('Y-m-d H:i:s', strtotime('-3 days')));
-        $this->setSetting('active', '1');
-        $this->setSetting('cached_template', '<h2>Placeholder</h2>');
-
-        $controller->indexAction();
-
-        $redirect = $this->getRedirect($controller->Response());
-
-        static::assertStringContainsString('BenchmarkOverview/render', $redirect);
-    }
-
-    public function testRenderActionShouldRenderCachedTemplate(): void
-    {
-        $controller = $this->getController();
-
-        $now = new DateTime('now');
-
-        $this->installDemoData('benchmark_config');
-        $this->setSetting('cached_template', '<h2>Placeholder</h2>');
-        $this->setSetting('last_received', $now->format('Y-m-d H:i:s'));
-
-        $this->expectOutputString('<h2>Placeholder</h2>');
-        $controller->renderAction();
-    }
-
-    protected function getController(): Shopware_Controllers_Backend_BenchmarkOverview
-    {
-        $controller = parent::getController();
-        static::assertInstanceOf(Shopware_Controllers_Backend_BenchmarkOverview::class, $controller);
-
-        $this->getContainer()->set('auth', new AuthMock());
-        Shopware()->Plugins()->Backend()->Auth()->onInitResourceAuth(new Enlight_Event_EventArgs());
-
-        return $controller;
-    }
-
-    private function getRedirect(Enlight_Controller_Response_ResponseHttp $response): string
-    {
-        static::assertInstanceOf(Enlight_Controller_Response_ResponseTestCase::class, $response);
-
-        return $response->getHeader('Location');
-    }
-}
diff --git a/tests/Functional/Bundle/BenchmarkBundle/Controllers/Backend/Mocks/AuthMock.php b/tests/Functional/Bundle/BenchmarkBundle/Controllers/Backend/Mocks/AuthMock.php
deleted file mode 100644
index 08358be5a5b..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/Controllers/Backend/Mocks/AuthMock.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Tests\Functional\Bundle\BenchmarkBundle\Controllers\Backend\Mocks;
-
-class AuthMock
-{
-    public function getIdentity(): IdentityMock
-    {
-        return new IdentityMock();
-    }
-}
-
-class IdentityMock
-{
-    public LocaleMock $locale;
-
-    public function __construct()
-    {
-        $this->locale = new LocaleMock();
-    }
-}
-
-class LocaleMock
-{
-    public function getId(): int
-    {
-        return 1;
-    }
-}
diff --git a/tests/Functional/Bundle/BenchmarkBundle/Controllers/Backend/Mocks/ViewMock.php b/tests/Functional/Bundle/BenchmarkBundle/Controllers/Backend/Mocks/ViewMock.php
deleted file mode 100644
index 92bde431ec2..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/Controllers/Backend/Mocks/ViewMock.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Tests\Functional\Bundle\BenchmarkBundle\Controllers\Backend\Mocks;
-
-use Enlight_View_Default;
-
-class ViewMock extends Enlight_View_Default
-{
-    /**
-     * @var string
-     */
-    public $template;
-
-    public function getTemplate(): string
-    {
-        return $this->template;
-    }
-
-    public function loadTemplate($template_name)
-    {
-        $this->template = $template_name;
-
-        return $this;
-    }
-
-    /**
-     * @param string $spec
-     */
-    public function assign($spec, $value = null, $nocache = null, $scope = null)
-    {
-        return $this;
-    }
-}
diff --git a/tests/Functional/Bundle/BenchmarkBundle/Controllers/Backend/assets/benchmark_config.sql b/tests/Functional/Bundle/BenchmarkBundle/Controllers/Backend/assets/benchmark_config.sql
deleted file mode 100644
index 7b506fdca82..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/Controllers/Backend/assets/benchmark_config.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-SET FOREIGN_KEY_CHECKS=0;
-DELETE FROM s_benchmark_config;
-
-INSERT INTO `s_benchmark_config` (`id`, `active`, `shop_id`, `last_sent`, `last_received`, `last_order_id`, `last_customer_id`, `last_product_id`,`batch_size`, `industry`, `type`, `cached_template`)
-VALUES(UNHEX('F9B39136A66B4EA5B651A99483BA0F85'), 0, 1, "1990-01-01 00:00:00", "1990-01-01 00:00:00", 0, 0, 0, 1000, 0, '', NULL);
-
-SET FOREIGN_KEY_CHECKS=1;
diff --git a/tests/Functional/Bundle/BenchmarkBundle/Controllers/Backend/assets/order_basic.sql b/tests/Functional/Bundle/BenchmarkBundle/Controllers/Backend/assets/order_basic.sql
deleted file mode 100644
index 3f843864205..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/Controllers/Backend/assets/order_basic.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-SET FOREIGN_KEY_CHECKS=0;
-DELETE FROM s_order;
-
-INSERT INTO `s_order` (`id`, `ordernumber`, `userID`, `invoice_amount`, `invoice_amount_net`, `paymentID`, `dispatchID`, `invoice_shipping`, `invoice_shipping_net`, `ordertime`, `status`, `cleared`, `transactionID`, `comment`, `customercomment`, `internalcomment`, `net`, `taxfree`, `partnerID`, `temporaryID`, `referer`, `cleareddate`, `trackingcode`, `language`, `currency`, `currencyFactor`, `subshopID`, `remote_addr`, `deviceType`) VALUES
-    (1, '20000', 1, 150.00, 10.00, 4, 7, 0, 0, '2012-08-30 15:50:00', 0, 0, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 'EUR', 1, 1, '', NULL);
-
-SET FOREIGN_KEY_CHECKS=1;
diff --git a/tests/Functional/Bundle/BenchmarkBundle/Providers/AnalyticsProviderTest.php b/tests/Functional/Bundle/BenchmarkBundle/Providers/AnalyticsProviderTest.php
deleted file mode 100644
index e64f47d3a3c..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/Providers/AnalyticsProviderTest.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Tests\Functional\Bundle\BenchmarkBundle\Providers;
-
-use PHPUnit\Framework\Constraint\IsType;
-use Shopware\Bundle\BenchmarkBundle\Provider\AnalyticsProvider;
-
-class AnalyticsProviderTest extends ProviderTestCase
-{
-    protected const SERVICE_ID = AnalyticsProvider::class;
-    protected const EXPECTED_KEYS_COUNT = 2;
-    protected const EXPECTED_TYPES = [
-        'list' => IsType::TYPE_ARRAY,
-        'listByDevice' => IsType::TYPE_ARRAY,
-    ];
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetTotalVisits(): void
-    {
-        $this->installDemoData('analytics');
-
-        $resultData = $this->getBenchmarkData();
-
-        static::assertSame(26, array_sum(array_column($resultData['list'], 'totalUniqueVisits')));
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetTotalVisitsByDevice(): void
-    {
-        $this->installDemoData('analytics');
-
-        $resultData = $this->getBenchmarkData();
-
-        $desktopRows = array_filter($resultData['listByDevice'], function ($value) {
-            return $value['deviceType'] === 'desktop';
-        });
-
-        $mobileRows = array_filter($resultData['listByDevice'], function ($value) {
-            return $value['deviceType'] === 'mobile';
-        });
-
-        static::assertSame(12, array_sum(array_column($desktopRows, 'totalUniqueVisits')));
-        static::assertSame(14, array_sum(array_column($mobileRows, 'totalUniqueVisits')));
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetTotalVisitsByShop(): void
-    {
-        $this->installDemoData('analytics');
-        $provider = $this->getProvider();
-        $resultData = $provider->getBenchmarkData($this->getShopContextByShopId(1));
-
-        static::assertSame(26, array_sum(array_column($resultData['list'], 'totalUniqueVisits')));
-
-        $resultData = $provider->getBenchmarkData($this->getShopContextByShopId(2));
-        static::assertSame(466, array_sum(array_column($resultData['list'], 'totalUniqueVisits')));
-    }
-}
diff --git a/tests/Functional/Bundle/BenchmarkBundle/Providers/CategoriesProviderTest.php b/tests/Functional/Bundle/BenchmarkBundle/Providers/CategoriesProviderTest.php
deleted file mode 100644
index 126d3b958f7..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/Providers/CategoriesProviderTest.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Tests\Functional\Bundle\BenchmarkBundle\Providers;
-
-use PHPUnit\Framework\Constraint\IsType;
-use Shopware\Bundle\BenchmarkBundle\Provider\CategoriesProvider;
-
-class CategoriesProviderTest extends ProviderTestCase
-{
-    protected const SERVICE_ID = CategoriesProvider::class;
-    protected const EXPECTED_KEYS_COUNT = 2;
-    protected const EXPECTED_TYPES = [
-        'products' => [
-            'average' => IsType::TYPE_FLOAT,
-            'max' => IsType::TYPE_INT,
-        ],
-        'tree' => IsType::TYPE_ARRAY,
-    ];
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetAverageProductsPerCategoryPerShop(): void
-    {
-        $this->installDemoData('category_products');
-
-        $provider = $this->getProvider();
-        $resultData = $provider->getBenchmarkData($this->getShopContextByShopId(1));
-        static::assertSame(2.0, $resultData['products']['average']);
-
-        $resultData = $provider->getBenchmarkData($this->getShopContextByShopId(2));
-        static::assertSame(1.0, $resultData['products']['average']);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetMaxProductsPerCategoryPerShop(): void
-    {
-        $this->installDemoData('category_products');
-
-        $provider = $this->getProvider();
-        $resultData = $provider->getBenchmarkData($this->getShopContextByShopId(1));
-        static::assertSame(6, $resultData['products']['max']);
-
-        $resultData = $provider->getBenchmarkData($this->getShopContextByShopId(2));
-        static::assertSame(2, $resultData['products']['max']);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetCategoryTreePerShop(): void
-    {
-        $this->installDemoData('category_products');
-
-        $provider = $this->getProvider();
-        $resultData = $provider->getBenchmarkData($this->getShopContextByShopId(1));
-
-        // First child category, "Example Parent 1"
-        static::assertCount(2, $resultData['tree'][0]['children']);
-        // First child of "Example parent 1", name "Example 3"
-        static::assertCount(1, $resultData['tree'][0]['children'][1]['children']);
-        // Child of "Example 3", name "Example 5"
-        static::assertCount(1, $resultData['tree'][0]['children'][1]['children'][0]['children']);
-
-        static::assertFalse($resultData['tree'][0]['children'][1]['active']);
-        static::assertTrue($resultData['tree'][0]['children'][1]['children'][0]['active']);
-        static::assertTrue($resultData['tree'][0]['children'][0]['hasProductStream']);
-
-        $provider = $this->getProvider();
-        $resultData = $provider->getBenchmarkData($this->getShopContextByShopId(2));
-
-        // First child category, "Example Parent 2"
-        static::assertCount(1, $resultData['tree'][0]['children']);
-        // First child of "Example Parent 2", name "Example 4"
-        static::assertCount(0, $resultData['tree'][0]['children'][0]['children']);
-
-        static::assertTrue($resultData['tree'][0]['active']);
-        static::assertFalse($resultData['tree'][0]['children'][0]['active']);
-    }
-}
diff --git a/tests/Functional/Bundle/BenchmarkBundle/Providers/CustomersProviderTest.php b/tests/Functional/Bundle/BenchmarkBundle/Providers/CustomersProviderTest.php
deleted file mode 100644
index 00dc4efe985..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/Providers/CustomersProviderTest.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Tests\Functional\Bundle\BenchmarkBundle\Providers;
-
-use PHPUnit\Framework\Constraint\IsType;
-use Shopware\Bundle\BenchmarkBundle\Provider\CustomersProvider;
-
-class CustomersProviderTest extends ProviderTestCase
-{
-    protected const SERVICE_ID = CustomersProvider::class;
-    protected const EXPECTED_KEYS_COUNT = 1;
-    protected const EXPECTED_TYPES = [
-        'list' => IsType::TYPE_ARRAY,
-    ];
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetCustomersList(): void
-    {
-        $this->resetConfig();
-        $this->installDemoData('customers');
-        $resultData = $this->getBenchmarkData();
-        $customersList = $resultData['list'];
-
-        static::assertSame(1993, $customersList[0]['birthYear']);
-        static::assertSame(1, $customersList[0]['birthMonth']);
-
-        static::assertTrue($customersList[0]['registered']);
-        static::assertFalse($customersList[1]['registered']);
-
-        static::assertSame('2013-11-25', $customersList[5]['registerDate']);
-
-        static::assertTrue($customersList[4]['hasNewsletter']);
-        static::assertFalse($customersList[5]['hasNewsletter']);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testMatchGenders(): void
-    {
-        $this->resetConfig();
-        $this->installDemoData('customers');
-
-        $resultData = $this->getBenchmarkData();
-        $customersList = $resultData['list'];
-
-        static::assertSame('male', $customersList[0]['gender']);
-        static::assertSame('female', $customersList[1]['gender']);
-        static::assertSame('unknown', $customersList[3]['gender']);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetCustomersTurnOver(): void
-    {
-        $this->resetConfig();
-        $this->installDemoData('customers');
-
-        $resultData = $this->getBenchmarkData();
-        $customersList = $resultData['list'];
-
-        static::assertSame(750.0, $customersList[3]['turnOver']);
-        static::assertSame(850.0, $customersList[4]['turnOver']);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetCustomersListPerShop(): void
-    {
-        $this->installDemoData('customers');
-        $this->installDemoData('second_config');
-        $provider = $this->getProvider();
-
-        $resultData = $provider->getBenchmarkData($this->getShopContextByShopId(1));
-        $customersList = $resultData['list'];
-        static::assertCount(7, $customersList);
-
-        $resultData = $provider->getBenchmarkData($this->getShopContextByShopId(2));
-        $customersList = $resultData['list'];
-        static::assertCount(1, $customersList);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetCustomersListConsidersBatchSize(): void
-    {
-        $this->resetConfig();
-        $this->installDemoData('customers');
-
-        $this->getContainer()->get('dbal_connection')->executeStatement('UPDATE `s_benchmark_config` SET last_customer_id=0, batch_size=1;');
-
-        $resultData = $this->getBenchmarkData();
-        $customersList = $resultData['list'];
-
-        static::assertCount(1, $customersList);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetCustomersListConsidersLastCustomerId(): void
-    {
-        $this->resetConfig();
-        $this->installDemoData('customers');
-
-        $this->getContainer()->get('dbal_connection')->executeStatement('UPDATE `s_benchmark_config` SET last_customer_id=4, batch_size=1;');
-
-        $resultData = $this->getBenchmarkData();
-        $customersList = $resultData['list'];
-
-        static::assertSame(850.0, $customersList[0]['turnOver']);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetCustomersListUpdatesCustomerId(): void
-    {
-        $this->resetConfig();
-        $this->installDemoData('customers');
-
-        $this->getContainer()->get('dbal_connection')->executeStatement('UPDATE `s_benchmark_config` SET last_customer_id=4, batch_size=1 WHERE shop_id=1;');
-
-        $this->sendStatistics();
-
-        static::assertSame('5', (string) $this->getContainer()->get('dbal_connection')->fetchOne('SELECT last_customer_id FROM s_benchmark_config WHERE shop_id=1'));
-    }
-}
diff --git a/tests/Functional/Bundle/BenchmarkBundle/Providers/EmotionsProviderTest.php b/tests/Functional/Bundle/BenchmarkBundle/Providers/EmotionsProviderTest.php
deleted file mode 100644
index c1d044a6e15..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/Providers/EmotionsProviderTest.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Tests\Functional\Bundle\BenchmarkBundle\Providers;
-
-use PHPUnit\Framework\Constraint\IsType;
-use Shopware\Bundle\BenchmarkBundle\Provider\EmotionsProvider;
-
-class EmotionsProviderTest extends ProviderTestCase
-{
-    protected const SERVICE_ID = EmotionsProvider::class;
-    protected const EXPECTED_KEYS_COUNT = 5;
-    protected const EXPECTED_TYPES = [
-        'total' => IsType::TYPE_INT,
-        'landingPages' => IsType::TYPE_INT,
-        'timed' => IsType::TYPE_INT,
-        'elementUsages' => IsType::TYPE_ARRAY,
-        'viewportUsages' => IsType::TYPE_ARRAY,
-    ];
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetTotalEmotions(): void
-    {
-        $this->installDemoData('emotions');
-
-        $resultData = $this->getBenchmarkData();
-
-        static::assertSame(4, $resultData['total']);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetTimedEmotions(): void
-    {
-        $this->installDemoData('emotions');
-
-        $resultData = $this->getBenchmarkData();
-
-        static::assertSame(1, $resultData['timed']);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetLandingPageEmotions(): void
-    {
-        $this->installDemoData('emotions');
-
-        $resultData = $this->getBenchmarkData();
-
-        static::assertSame(2, $resultData['landingPages']);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetElementUsages(): void
-    {
-        $this->installDemoData('emotions');
-
-        $resultData = $this->getBenchmarkData();
-
-        static::assertSame([
-            ['elementCount' => 3, 'elementName' => 'example-element-1'],
-            ['elementCount' => 2, 'elementName' => 'example-element-2'],
-        ], array_intersect([
-            ['elementCount' => 3, 'elementName' => 'example-element-1'],
-            ['elementCount' => 2, 'elementName' => 'example-element-2'],
-        ], $resultData['elementUsages']));
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetViewportUsages(): void
-    {
-        $this->installDemoData('emotions');
-
-        $resultData = $this->getBenchmarkData();
-
-        static::assertSame(
-            ['4', '2', '4', '3', '4'],
-            array_intersect(['4', '2', '4', '3', '4'], $resultData['viewportUsages'])
-        );
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetTotalEmotionsPerShop(): void
-    {
-        $this->installDemoData('emotions');
-
-        $provider = $this->getProvider();
-
-        $resultData = $provider->getBenchmarkData($this->getShopContextByShopId(1));
-        static::assertSame(4, $resultData['total']);
-
-        $resultData = $provider->getBenchmarkData($this->getShopContextByShopId(2));
-        static::assertSame(2, $resultData['total']);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetElementUsagesPerShop(): void
-    {
-        $this->installDemoData('emotions');
-
-        $provider = $this->getProvider();
-
-        $resultData = $provider->getBenchmarkData($this->getShopContextByShopId(1));
-        static::assertSame([
-            ['elementCount' => 3, 'elementName' => 'example-element-1'],
-            ['elementCount' => 2, 'elementName' => 'example-element-2'],
-        ], array_intersect([
-            ['elementCount' => 3, 'elementName' => 'example-element-1'],
-            ['elementCount' => 2, 'elementName' => 'example-element-2'],
-        ], $resultData['elementUsages']));
-
-        $resultData = $provider->getBenchmarkData($this->getShopContextByShopId(2));
-        static::assertSame([
-            ['elementCount' => 2, 'elementName' => 'example-element-1'],
-            ['elementCount' => 1, 'elementName' => 'example-element-2'],
-        ], array_intersect([
-            ['elementCount' => 2, 'elementName' => 'example-element-1'],
-            ['elementCount' => 1, 'elementName' => 'example-element-2'],
-        ], $resultData['elementUsages']));
-    }
-}
diff --git a/tests/Functional/Bundle/BenchmarkBundle/Providers/ManufacturerProviderTest.php b/tests/Functional/Bundle/BenchmarkBundle/Providers/ManufacturerProviderTest.php
deleted file mode 100644
index b424301d790..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/Providers/ManufacturerProviderTest.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Tests\Functional\Bundle\BenchmarkBundle\Providers;
-
-use PHPUnit\Framework\Constraint\IsType;
-use Shopware\Bundle\BenchmarkBundle\Provider\ManufacturerProvider;
-
-class ManufacturerProviderTest extends ProviderTestCase
-{
-    protected const SERVICE_ID = ManufacturerProvider::class;
-    protected const EXPECTED_KEYS_COUNT = 1;
-    protected const EXPECTED_TYPES = [
-        'total' => IsType::TYPE_INT,
-    ];
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetTotalSuppliersPerShop(): void
-    {
-        $this->installDemoData('suppliers');
-
-        $provider = $this->getProvider();
-
-        $resultData = $provider->getBenchmarkData($this->getShopContextByShopId(1));
-        static::assertSame(3, $resultData['total']);
-
-        $resultData = $provider->getBenchmarkData($this->getShopContextByShopId(2));
-        static::assertSame(2, $resultData['total']);
-    }
-}
diff --git a/tests/Functional/Bundle/BenchmarkBundle/Providers/OrdersProviderTest.php b/tests/Functional/Bundle/BenchmarkBundle/Providers/OrdersProviderTest.php
deleted file mode 100644
index e3136b5e4fe..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/Providers/OrdersProviderTest.php
+++ /dev/null
@@ -1,231 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Tests\Functional\Bundle\BenchmarkBundle\Providers;
-
-use Doctrine\DBAL\Connection;
-use PHPUnit\Framework\Constraint\IsType;
-use Shopware\Bundle\BenchmarkBundle\Provider\OrdersProvider;
-
-class OrdersProviderTest extends ProviderTestCase
-{
-    protected const SERVICE_ID = OrdersProvider::class;
-    protected const EXPECTED_KEYS_COUNT = 1;
-    protected const EXPECTED_TYPES = [
-        'list' => IsType::TYPE_ARRAY,
-    ];
-
-    public function testGetArrayKeysFit(): void
-    {
-        $dbalConnection = $this->getContainer()->get(Connection::class);
-        $basicContent = $this->openDemoDataFile('basic_setup');
-        $dbalConnection->executeStatement($basicContent);
-
-        parent::testGetArrayKeysFit();
-    }
-
-    public function testGetValidateTypes(): void
-    {
-        $dbalConnection = $this->getContainer()->get(Connection::class);
-        $basicContent = $this->openDemoDataFile('basic_setup');
-        $dbalConnection->executeStatement($basicContent);
-
-        parent::testGetValidateTypes();
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetOrdersList(): void
-    {
-        $this->resetConfig();
-        $this->installDemoData('orders_detailed');
-
-        $resultData = $this->getBenchmarkData();
-        static::assertArrayHasKey('orderId', $resultData['list'][0]);
-        static::assertArrayHasKey('currency', $resultData['list'][0]);
-        static::assertArrayHasKey('shippingCosts', $resultData['list'][0]);
-        static::assertArrayHasKey('customer', $resultData['list'][0]);
-        static::assertArrayHasKey('analytics', $resultData['list'][0]);
-        static::assertArrayHasKey('shipment', $resultData['list'][0]);
-        static::assertArrayHasKey('payment', $resultData['list'][0]);
-        static::assertArrayHasKey('items', $resultData['list'][0]);
-        static::assertSame(1, $resultData['list'][0]['orderId']);
-        static::assertSame('EUR', $resultData['list'][0]['currency']);
-        static::assertSame(15.0, (float) $resultData['list'][0]['shippingCosts']);
-        static::assertSame([
-            'registered' => true,
-            'birthYear' => 1993,
-            'birthMonth' => 1,
-            'gender' => 'male',
-            'registerDate' => '2011-11-23',
-            'hasNewsletter' => false,
-            'billing' => [
-                'country' => 'DE',
-            ],
-            'shipping' => [
-                'country' => 'GR',
-            ],
-        ], $resultData['list'][0]['customer']);
-        static::assertSame([
-            'device' => 'mobile',
-            'referer' => false,
-        ], $resultData['list'][0]['analytics']);
-        static::assertSame([
-            'name' => 'others',
-            'cost' => [
-                'minPrice' => 14.00,
-                'maxPrice' => 14.00,
-            ],
-        ], $resultData['list'][0]['shipment']);
-        static::assertSame([
-            'name' => 'others',
-            'cost' => [
-                'percentCosts' => 0.0,
-                'absoluteCosts' => 0.0,
-                'absoluteCostsPerCountry' => 0.0,
-            ],
-        ], $resultData['list'][0]['payment']);
-
-        $currentDetailId = 0;
-        foreach ($resultData['list'][0]['items'] as &$orderItem) {
-            static::assertGreaterThan($currentDetailId, $orderItem['detailId']);
-            $currentDetailId = $orderItem['detailId'];
-            unset($orderItem['detailId']);
-        }
-        unset($orderItem);
-
-        static::assertSame([
-            [
-                'unitPrice' => 150.00,
-                'totalPrice' => 150.00,
-                'amount' => 1,
-                'packUnit' => '',
-                'purchaseUnit' => '',
-            ], [
-                'unitPrice' => 20.00,
-                'totalPrice' => 80.00,
-                'amount' => 4,
-                'packUnit' => '',
-                'purchaseUnit' => '',
-            ],
-        ], $resultData['list'][0]['items']);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetOrdersListBatch(): void
-    {
-        $this->installDemoData('orders_detailed');
-
-        $this->getContainer()->get('dbal_connection')->executeStatement('UPDATE `s_benchmark_config` SET last_order_id=0, batch_size=1;');
-        $singleResult = $this->getBenchmarkData();
-
-        static::assertCount(1, $singleResult['list']);
-
-        $this->getContainer()->get('dbal_connection')->executeStatement('UPDATE `s_benchmark_config` SET last_order_id=0, batch_size=5;');
-        $multipleResults = $this->getBenchmarkData();
-
-        static::assertCount(5, $multipleResults['list']);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetOrdersListDateConsidered(): void
-    {
-        $this->installDemoData('orders_detailed');
-
-        $this->getContainer()->get('dbal_connection')->executeStatement('UPDATE `s_benchmark_config` SET last_order_id=4, batch_size=1;');
-        $resultData = $this->getBenchmarkData();
-
-        static::assertSame(5, $resultData['list'][0]['orderId']);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetOrdersListMultipleExecutionsFetchesNewOrders(): void
-    {
-        $this->installDemoData('orders_detailed');
-
-        $this->getContainer()->get('dbal_connection')->executeStatement('UPDATE `s_benchmark_config` SET last_order_id=4, batch_size=1;');
-        $firstResult = $this->getBenchmarkData();
-
-        $this->sendStatistics();
-
-        $secondResult = $this->getBenchmarkData();
-
-        static::assertSame(5, $firstResult['list'][0]['orderId']);
-        static::assertSame(6, $secondResult['list'][0]['orderId']);
-
-        $this->getContainer()->get('dbal_connection')->executeStatement('UPDATE `s_benchmark_config` SET last_order_id=4, batch_size=2;');
-        $thirdResultSet = $this->getBenchmarkData();
-
-        $this->sendStatistics();
-
-        $forthResultSet = $this->getBenchmarkData();
-
-        static::assertSame(5, $thirdResultSet['list'][0]['orderId']);
-        static::assertSame(6, $thirdResultSet['list'][1]['orderId']);
-
-        static::assertSame(7, $forthResultSet['list'][0]['orderId']);
-        // Only seven results possible, no eighth result available
-        static::assertEmpty($forthResultSet['list'][1]);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetOrdersListIdConfigGetsUpdated(): void
-    {
-        $this->installDemoData('orders_detailed');
-
-        $this->getContainer()->get('dbal_connection')->executeStatement('UPDATE `s_benchmark_config` SET last_order_id=4, batch_size=1 WHERE shop_id=1;');
-        $this->sendStatistics();
-
-        static::assertSame(5, (int) $this->getContainer()->get('dbal_connection')->fetchOne('SELECT last_order_id FROM s_benchmark_config WHERE shop_id=1'));
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetOrdersListPerShop(): void
-    {
-        $this->installDemoData('orders_detailed');
-        $this->installDemoData('second_config');
-        $provider = $this->getProvider();
-
-        $this->getContainer()->get('dbal_connection')->executeStatement('UPDATE `s_benchmark_config` SET last_order_id=0, batch_size=10;');
-
-        $resultData = $provider->getBenchmarkData($this->getShopContextByShopId(1));
-        static::assertCount(7, $resultData['list']);
-
-        $resultData = $provider->getBenchmarkData($this->getShopContextByShopId(2));
-        static::assertCount(2, $resultData['list']);
-    }
-}
diff --git a/tests/Functional/Bundle/BenchmarkBundle/Providers/PaymentsProviderTest.php b/tests/Functional/Bundle/BenchmarkBundle/Providers/PaymentsProviderTest.php
deleted file mode 100644
index 23f7aa2cf30..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/Providers/PaymentsProviderTest.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Tests\Functional\Bundle\BenchmarkBundle\Providers;
-
-use PHPUnit\Framework\Constraint\IsType;
-use Shopware\Bundle\BenchmarkBundle\Provider\PaymentsProvider;
-
-class PaymentsProviderTest extends ProviderTestCase
-{
-    protected const SERVICE_ID = PaymentsProvider::class;
-    protected const EXPECTED_KEYS_COUNT = 6;
-    protected const EXPECTED_TYPES = [
-        'activePayments' => IsType::TYPE_INT,
-        'paymentsWithSurcharge' => IsType::TYPE_INT,
-        'paymentsWithReduction' => IsType::TYPE_INT,
-        'paymentsWithPercentagePrice' => IsType::TYPE_INT,
-        'paymentsWithAbsolutePrice' => IsType::TYPE_INT,
-        'paymentUsages' => IsType::TYPE_ARRAY,
-    ];
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetTotalActivePayments(): void
-    {
-        $this->installDemoData('payments');
-
-        $resultData = $this->getBenchmarkData();
-
-        static::assertSame(4, $resultData['activePayments']);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetPaymentsWithSurcharge(): void
-    {
-        $this->installDemoData('payments');
-
-        $resultData = $this->getBenchmarkData();
-
-        static::assertSame(4, $resultData['paymentsWithSurcharge']);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetPaymentsWithReduction(): void
-    {
-        $this->installDemoData('payments');
-
-        $resultData = $this->getBenchmarkData();
-
-        static::assertSame(5, $resultData['paymentsWithReduction']);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetPaymentsWithPercentagePrice(): void
-    {
-        $this->installDemoData('payments');
-
-        $resultData = $this->getBenchmarkData();
-
-        static::assertSame(4, $resultData['paymentsWithPercentagePrice']);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetPaymentsWithAbsolutePrice(): void
-    {
-        $this->installDemoData('payments');
-
-        $resultData = $this->getBenchmarkData();
-
-        static::assertSame(6, $resultData['paymentsWithAbsolutePrice']);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetTotalActivePaymentsPerShop(): void
-    {
-        $this->installDemoData('payments');
-
-        $provider = $this->getProvider();
-
-        $resultData = $provider->getBenchmarkData($this->getShopContextByShopId(1));
-        static::assertSame(4, $resultData['activePayments']);
-
-        $resultData = $provider->getBenchmarkData($this->getShopContextByShopId(2));
-        static::assertSame(5, $resultData['activePayments']);
-    }
-}
diff --git a/tests/Functional/Bundle/BenchmarkBundle/Providers/PluginsProviderTest.php b/tests/Functional/Bundle/BenchmarkBundle/Providers/PluginsProviderTest.php
deleted file mode 100644
index 386a5c54f38..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/Providers/PluginsProviderTest.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Tests\Functional\Bundle\BenchmarkBundle\Providers;
-
-use PHPUnit\Framework\Constraint\IsType;
-use Shopware\Bundle\BenchmarkBundle\Provider\PluginsProvider;
-
-class PluginsProviderTest extends ProviderTestCase
-{
-    protected const SERVICE_ID = PluginsProvider::class;
-    protected const EXPECTED_KEYS_COUNT = 2;
-    protected const EXPECTED_TYPES = [
-        'total' => IsType::TYPE_INT,
-        'shopwarePlugins' => IsType::TYPE_ARRAY,
-    ];
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetTotalPlugins(): void
-    {
-        $this->installDemoData('plugins');
-
-        $resultData = $this->getBenchmarkData();
-
-        static::assertSame(6, $resultData['total']);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetShopwarePlugins(): void
-    {
-        $this->installDemoData('plugins');
-
-        $resultData = $this->getBenchmarkData();
-
-        static::assertSame([
-            [
-                'name' => 'SwagExample2',
-                'active' => 0,
-            ], [
-                'name' => 'SwagExample3',
-                'active' => 1,
-            ], [
-                'name' => 'SwagExample4',
-                'active' => 1,
-            ], [
-                'name' => 'SwagExample5',
-                'active' => 0,
-            ],
-        ], array_intersect([
-            [
-                'name' => 'SwagExample2',
-                'active' => 0,
-            ], [
-                'name' => 'SwagExample3',
-                'active' => 1,
-            ], [
-                'name' => 'SwagExample4',
-                'active' => 1,
-            ], [
-                'name' => 'SwagExample5',
-                'active' => 0,
-            ],
-        ], $resultData['shopwarePlugins']));
-    }
-}
diff --git a/tests/Functional/Bundle/BenchmarkBundle/Providers/ProductsProviderTest.php b/tests/Functional/Bundle/BenchmarkBundle/Providers/ProductsProviderTest.php
deleted file mode 100644
index fa1b05671f1..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/Providers/ProductsProviderTest.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Tests\Functional\Bundle\BenchmarkBundle\Providers;
-
-use PHPUnit\Framework\Constraint\IsType;
-use Shopware\Bundle\BenchmarkBundle\Provider\ProductsProvider;
-use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface;
-
-class ProductsProviderTest extends ProviderTestCase
-{
-    protected const SERVICE_ID = ProductsProvider::class;
-    protected const EXPECTED_KEYS_COUNT = 1;
-    protected const EXPECTED_TYPES = [
-        'list' => IsType::TYPE_ARRAY,
-    ];
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetProductListBasic(): void
-    {
-        $this->installDemoData('products_basic');
-
-        $benchmarkData = $this->getBenchmarkData();
-        $productsList = $benchmarkData['list'];
-
-        static::assertNotEmpty($productsList);
-
-        static::assertFalse($productsList[1]['active']);
-        static::assertTrue($productsList[2]['active']);
-        static::assertSame(8, $productsList[3]['instock']);
-        static::assertSame(20, $productsList[4]['instockMinimum']);
-        static::assertSame(0, $productsList[1]['sale']);
-        static::assertSame(1, $productsList[2]['sale']);
-        static::assertSame(2, $productsList[2]['minPurchase']);
-        static::assertSame(10, $productsList[3]['maxPurchase']);
-        static::assertSame(5, $productsList[4]['purchaseSteps']);
-        static::assertFalse($productsList[0]['shippingFree']);
-        static::assertTrue($productsList[1]['shippingFree']);
-        static::assertSame(10, $productsList[2]['pseudoSales']);
-        static::assertSame(0, $productsList[2]['topSeller']);
-        static::assertSame(1, $productsList[3]['topSeller']);
-        static::assertFalse($productsList[0]['notificationEnabled']);
-        static::assertTrue($productsList[1]['notificationEnabled']);
-        static::assertSame('7', $productsList[1]['shippingTime']);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetVariants(): void
-    {
-        $this->installDemoData('products_variants');
-
-        $benchmarkData = $this->getBenchmarkData();
-        $productsList = $benchmarkData['list'];
-
-        static::assertSame(25, $productsList[4]['variants'][0]['instock']);
-        static::assertSame(30, $productsList[4]['variants'][1]['instock']);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetProductImages(): void
-    {
-        $this->installDemoData('products_images');
-
-        $benchmarkData = $this->getBenchmarkData();
-        $productsList = $benchmarkData['list'];
-
-        static::assertSame('12345', (string) $productsList[0]['images'][0]['fileSize']);
-        static::assertSame('54321', (string) $productsList[0]['images'][1]['fileSize']);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetProductListBasicPerShop(): void
-    {
-        $this->installDemoData('products_basic');
-        $this->installDemoData('second_config');
-
-        $provider = $this->getProvider();
-        $benchmarkData = $provider->getBenchmarkData($this->getContainer()->get(ContextServiceInterface::class)->createShopContext(1));
-        $productsList = $benchmarkData['list'];
-
-        static::assertCount(5, $productsList);
-
-        $benchmarkData = $provider->getBenchmarkData($this->getContainer()->get(ContextServiceInterface::class)->createShopContext(2));
-        $productsList = $benchmarkData['list'];
-
-        static::assertCount(1, $productsList);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetProductListBasicConsidersBatchSize(): void
-    {
-        $this->resetConfig();
-        $this->installDemoData('products_basic');
-
-        $this->getContainer()->get('dbal_connection')->executeStatement('UPDATE `s_benchmark_config` SET last_product_id=4, batch_size=1;');
-
-        $benchmarkData = $this->getBenchmarkData();
-        $productsList = $benchmarkData['list'];
-
-        static::assertCount(1, $productsList);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetProductListBasicConsidersLastProductId(): void
-    {
-        $this->resetConfig();
-        $this->installDemoData('products_basic');
-
-        $this->getContainer()->get('dbal_connection')->executeStatement('UPDATE `s_benchmark_config` SET last_product_id=4, batch_size=1;');
-
-        $benchmarkData = $this->getBenchmarkData();
-        $productsList = $benchmarkData['list'];
-
-        static::assertSame(15, $productsList[0]['instock']);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetProductListBasicUpdatesLastProductId(): void
-    {
-        $this->resetConfig();
-        $this->installDemoData('products_basic');
-
-        $this->getContainer()->get('dbal_connection')->executeStatement('UPDATE `s_benchmark_config` SET last_product_id=4, batch_size=1 WHERE shop_id=1;');
-
-        $this->sendStatistics();
-
-        static::assertSame('5', (string) $this->getContainer()->get('dbal_connection')->fetchOne('SELECT last_product_id FROM s_benchmark_config WHERE shop_id=1'));
-    }
-}
diff --git a/tests/Functional/Bundle/BenchmarkBundle/Providers/ProviderTestCase.php b/tests/Functional/Bundle/BenchmarkBundle/Providers/ProviderTestCase.php
deleted file mode 100644
index 65ec2018f9c..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/Providers/ProviderTestCase.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Tests\Functional\Bundle\BenchmarkBundle\Providers;
-
-use DateTime;
-use DateTimeZone;
-use Doctrine\DBAL\Connection;
-use PHPUnit\Framework\Constraint\IsType;
-use PHPUnit\Framework\ExpectationFailedException;
-use Shopware\Bundle\BenchmarkBundle\BenchmarkProviderInterface;
-use Shopware\Bundle\BenchmarkBundle\Service\StatisticsService;
-use Shopware\Bundle\BenchmarkBundle\StatisticsClient;
-use Shopware\Bundle\BenchmarkBundle\Struct\StatisticsResponse;
-use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface;
-use Shopware\Bundle\StoreFrontBundle\Struct\ShopContextInterface;
-use Shopware\Models\Benchmark\BenchmarkConfig;
-use Shopware\Tests\Functional\Bundle\BenchmarkBundle\BenchmarkTestCase;
-
-abstract class ProviderTestCase extends BenchmarkTestCase
-{
-    protected const SERVICE_ID = '';
-    protected const EXPECTED_KEYS_COUNT = 0;
-    protected const EXPECTED_TYPES = [];
-
-    private ?BenchmarkProviderInterface $provider = null;
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetArrayKeysFit(): void
-    {
-        $resultData = $this->getBenchmarkData();
-        $arrayKeys = array_keys($resultData);
-        static::assertCount(static::EXPECTED_KEYS_COUNT, $arrayKeys);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetValidateTypes(): void
-    {
-        $resultData = $this->getBenchmarkData();
-        foreach (static::EXPECTED_TYPES as $key => $type) {
-            switch ($type) {
-                case IsType::TYPE_ARRAY:
-                    static::assertIsArray($resultData[$key]);
-                    break;
-                case IsType::TYPE_FLOAT:
-                    static::assertIsFloat($resultData[$key]);
-                    break;
-                case IsType::TYPE_INT:
-                    static::assertIsInt($resultData[$key]);
-                    break;
-                case IsType::TYPE_STRING:
-                    static::assertIsString($resultData[$key]);
-                    break;
-            }
-        }
-
-        $this->checkForTypes($resultData, static::EXPECTED_TYPES);
-    }
-
-    protected function installDemoData(string $dataName): void
-    {
-        $dbalConnection = $this->getContainer()->get(Connection::class);
-        $basicContent = $this->openDemoDataFile('basic_setup');
-        $dbalConnection->executeStatement($basicContent);
-        parent::installDemoData($dataName);
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    protected function getBenchmarkData(): array
-    {
-        return $this->getProvider()->getBenchmarkData($this->getContainer()->get(ContextServiceInterface::class)->createShopContext(1));
-    }
-
-    protected function getProvider(): BenchmarkProviderInterface
-    {
-        if ($this->provider === null) {
-            $provider = $this->getContainer()->get(static::SERVICE_ID);
-            static::assertInstanceOf(BenchmarkProviderInterface::class, $provider);
-            $this->provider = $provider;
-        }
-
-        return $this->provider;
-    }
-
-    /**
-     * @param array<string, mixed> $data
-     * @param array<string, mixed> $expectedTypes
-     */
-    protected function checkForTypes(array $data, array $expectedTypes): void
-    {
-        foreach ($data as $resultKey => $resultItem) {
-            if (!$expectedTypes[$resultKey]) {
-                continue;
-            }
-            if (\is_array($expectedTypes[$resultKey])) {
-                $this->checkForTypes($resultItem, $expectedTypes[$resultKey]);
-                continue;
-            }
-            try {
-                switch ($expectedTypes[$resultKey]) {
-                    case IsType::TYPE_ARRAY:
-                        static::assertIsArray($resultItem);
-                        break;
-                    case IsType::TYPE_FLOAT:
-                        static::assertIsFloat($resultItem);
-                        break;
-                    case IsType::TYPE_INT:
-                        static::assertIsInt($resultItem);
-                        break;
-                    case IsType::TYPE_STRING:
-                        static::assertIsString($resultItem);
-                        break;
-                }
-            } catch (ExpectationFailedException $e) {
-                // Print custom error message
-                static::fail(sprintf('Failed asserting that the value for the key %s is of type %s', $resultKey, $expectedTypes[$resultKey]));
-            }
-        }
-    }
-
-    protected function getAssetsFolder(): string
-    {
-        return __DIR__ . '/assets/';
-    }
-
-    protected function getShopContextByShopId(int $shopId): ShopContextInterface
-    {
-        return $this->getContainer()->get(ContextServiceInterface::class)->createShopContext($shopId);
-    }
-
-    protected function resetConfig(): void
-    {
-        $dbalConnection = $this->getContainer()->get('dbal_connection');
-        $dbalConnection->update(
-            's_benchmark_config',
-            [
-                'last_order_id' => '0',
-                'last_customer_id' => '0',
-                'last_product_id' => '0',
-            ],
-            ['NULL' => null]
-        );
-    }
-
-    protected function sendStatistics(): void
-    {
-        $this->getContainer()->get('models')->clear();
-        $response = new StatisticsResponse(new DateTime('now', new DateTimeZone('UTC')), 'foo', false);
-        $client = $this->createMock(StatisticsClient::class);
-        $client->method('sendStatistics')->willReturn($response);
-
-        $service = new StatisticsService(
-            $this->getContainer()->get('shopware.benchmark_bundle.collector'),
-            $client,
-            $this->getContainer()->get('shopware.benchmark_bundle.repository.config'),
-            $this->getContainer()->get('shopware_storefront.context_service'),
-            $this->getContainer()->get('dbal_connection')
-        );
-
-        $config = $this->getContainer()->get('shopware.benchmark_bundle.repository.config')->findOneBy(['shopId' => 1]);
-        static::assertInstanceOf(BenchmarkConfig::class, $config);
-        $service->transmit($config, $config->getBatchSize());
-    }
-}
diff --git a/tests/Functional/Bundle/BenchmarkBundle/Providers/ShopwareProviderTest.php b/tests/Functional/Bundle/BenchmarkBundle/Providers/ShopwareProviderTest.php
deleted file mode 100644
index b308b32250a..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/Providers/ShopwareProviderTest.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Tests\Functional\Bundle\BenchmarkBundle\Providers;
-
-use PHPUnit\Framework\Constraint\IsType;
-use Shopware\Bundle\BenchmarkBundle\Provider\ShopwareProvider;
-
-class ShopwareProviderTest extends ProviderTestCase
-{
-    protected const SERVICE_ID = ShopwareProvider::class;
-    protected const EXPECTED_KEYS_COUNT = 16;
-    protected const EXPECTED_TYPES = [
-        'api' => IsType::TYPE_STRING,
-        'os' => IsType::TYPE_STRING,
-        'arch' => IsType::TYPE_STRING,
-        'dist' => IsType::TYPE_STRING,
-        'serverSoftware' => IsType::TYPE_STRING,
-        'phpVersion' => IsType::TYPE_STRING,
-        'phpVersionId' => IsType::TYPE_INT,
-        'maxExecutionTime' => IsType::TYPE_INT,
-        'memoryLimit' => IsType::TYPE_INT,
-        'sApi' => IsType::TYPE_STRING,
-        'extensions' => IsType::TYPE_ARRAY,
-        'mysqlVersion' => IsType::TYPE_STRING,
-        'version' => IsType::TYPE_STRING,
-        'revision' => IsType::TYPE_STRING,
-        'licence' => IsType::TYPE_STRING,
-        'shops' => IsType::TYPE_INT,
-    ];
-}
diff --git a/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/analytics.sql b/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/analytics.sql
deleted file mode 100644
index febd2b6e776..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/analytics.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-SET FOREIGN_KEY_CHECKS=0;
-DELETE FROM s_statistics_visitors;
-
-INSERT INTO `s_statistics_visitors` (`shopID`, `datum`, `pageimpressions`, `uniquevisits`, `deviceType`) VALUES
-    (1, CURDATE(), 1, 5, 'desktop'),
-    (1, CURDATE(), 2, 6, 'mobile'),
-    (1, CURDATE() - INTERVAL 1 DAY, 3, 7, 'desktop'),
-    (1, CURDATE() - INTERVAL 1 DAY, 4, 8, 'mobile'),
-    (2, CURDATE() - INTERVAL 2 DAY, 123, 456, 'mobile'),
-    (2, CURDATE() - INTERVAL 1 DAY, 9, 10, 'mobile');
-
-SET FOREIGN_KEY_CHECKS=1;
diff --git a/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/basic_setup.sql b/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/basic_setup.sql
deleted file mode 100644
index 918990cb5b1..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/basic_setup.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-SET FOREIGN_KEY_CHECKS=0;
-DELETE FROM s_core_shops;
-DELETE FROM s_categories;
-DELETE FROM s_benchmark_config;
-
-INSERT INTO `s_core_shops` (`id`, `main_id`, `name`, `title`, `position`, `host`, `base_path`, `base_url`, `hosts`, `secure`, `template_id`, `document_template_id`, `category_id`, `locale_id`, `currency_id`, `customer_group_id`, `fallback_id`, `customer_scope`, `default`, `active`) VALUES
-    (1, NULL, 'Shop 1', NULL, 0, 'myShop.de', NULL, NULL, '', 0, 23, 23, 2, 1, 1, 1, NULL, 0, 1, 1),
-    (2, NULL, 'Shop 2', NULL, 0, 'myShop.com', NULL, NULL, '', 0, 23, 23, 3, 2, 1, 1, NULL, 1, 0, 1);
-
-INSERT INTO `s_categories` (`id`, `parent`, `path`, `description`, `position`, `left`, `right`, `level`, `added`, `changed`, `metakeywords`, `metadescription`, `cmsheadline`, `cmstext`, `template`, `active`, `blog`, `external`, `hidefilter`, `hidetop`, `mediaID`, `product_box_layout`, `meta_title`, `stream_id`, `hide_sortings`, `sorting_ids`, `facet_ids`, `external_target`) VALUES
-    (1, NULL, NULL, 'Root', 0, 0, 0, 0, '2012-08-27 22:28:52', '2012-08-27 22:28:52', NULL, NULL, NULL, NULL, NULL, 1, 0, NULL, 0, 0, 0, NULL, NULL, NULL, 0, NULL, NULL, ''),
-    (2, 1, NULL, 'Example Parent 1', 0, 0, 0, 0, '2012-08-27 22:28:52', '2012-08-27 22:28:52', NULL, '', '', '', NULL, 1, 0, '', 0, 0, NULL, NULL, '', NULL, 0, NULL, NULL, ''),
-    (3, 1, NULL, 'Example Parent 2', 0, 0, 0, 0, '2012-08-27 22:28:52', '2012-08-27 22:28:52', NULL, '', '', '', NULL, 1, 0, '', 0, 0, NULL, NULL, '', NULL, 0, NULL, NULL, '');
-
-INSERT INTO `s_benchmark_config` (`id`, `shop_id`, `active`, `last_sent`, `last_received`, `last_order_id`, `last_customer_id`, `last_product_id`, `last_updated_orders_date`, `batch_size`, `industry`, `type`, `response_token`, `cached_template`, `locked`)
-VALUES (UNHEX(''), '1', '1', '1990-01-01 00:00:00', '1990-01-01 00:00:00', '0', '0', '0', '1970-01-01 00:00:00', '1000', '3', 'b2c', NULL, NULL, NULL);
-
-SET FOREIGN_KEY_CHECKS=1;
diff --git a/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/category_products.sql b/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/category_products.sql
deleted file mode 100644
index 9e6119a52a6..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/category_products.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-SET FOREIGN_KEY_CHECKS=0;
-DELETE FROM s_articles_categories;
-
-INSERT INTO `s_categories` (`id`, `parent`, `path`, `description`, `position`, `left`, `right`, `level`, `added`, `changed`, `metakeywords`, `metadescription`, `cmsheadline`, `cmstext`, `template`, `active`, `blog`, `external`, `hidefilter`, `hidetop`, `mediaID`, `product_box_layout`, `meta_title`, `stream_id`, `hide_sortings`, `sorting_ids`, `facet_ids`, `external_target`) VALUES
-    (4, 2, '|2|', 'Example 2', NULL, 0, 0, 0, '2017-10-05 14:56:02', '2017-10-05 14:56:02', NULL, '', '', '', NULL, 1, 0, '', 0, 0, NULL, NULL, '', 1, 0, NULL, NULL, ''),
-    (5, 2, '|2|', 'Example 3', NULL, 0, 0, 0, '2017-10-05 14:56:02', '2017-10-05 14:56:02', NULL, '', '', '', NULL, 0, 0, '', 0, 0, NULL, NULL, '', NULL, 0, NULL, NULL, ''),
-    (6, 3, '|3|', 'Example 4', NULL, 0, 0, 0, '2017-10-05 14:56:02', '2017-10-05 14:56:02', NULL, '', '', '', NULL, 0, 0, '', 0, 0, NULL, NULL, '', NULL, 0, NULL, NULL, ''),
-    (7, 5, '|2|5|', 'Example 5', NULL, 0, 0, 0, '2017-10-05 14:56:02', '2017-10-05 14:56:02', NULL, '', '', '', NULL, 1, 0, '', 0, 0, NULL, NULL, '', NULL, 0, NULL, NULL, ''),
-    (8, 7, '|2|5|7|', 'Example 6', NULL, 0, 0, 0, '2017-10-05 14:56:02', '2017-10-05 14:56:02', NULL, '', '', '', NULL, 1, 0, '', 0, 0, NULL, NULL, '', NULL, 0, NULL, NULL, '');
-
-INSERT INTO `s_articles_categories` (`articleID`, `categoryID`) VALUES
-    (1, 2),
-    (2, 2),
-    (3, 2),
-    (4, 2),
-    (5, 2),
-    (6, 2),
-    (7, 4),
-    (8, 4),
-    (9, 5),
-    (1, 5),
-    (10, 6),
-    (11, 6);
-
-SET FOREIGN_KEY_CHECKS=1;
diff --git a/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/customers.sql b/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/customers.sql
deleted file mode 100644
index d46c81733d5..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/customers.sql
+++ /dev/null
@@ -1,24 +0,0 @@
-SET FOREIGN_KEY_CHECKS=0;
-DELETE FROM s_user;
-DELETE FROM s_user_addresses;
-DELETE FROM s_order;
-
-INSERT INTO `s_user` (`id`, `customernumber`, `default_billing_address_id`, `default_shipping_address_id`, `salutation`, `password`, `encoder`, `email`, `active`, `accountmode`, `confirmationkey`, `paymentID`, `firstlogin`, `lastlogin`, `sessionID`, `newsletter`, `validation`, `affiliate`, `customergroup`, `paymentpreset`, `language`, `subshopID`, `referer`, `pricegroupID`, `internalcomment`, `failedlogins`, `lockeduntil`, `title`, `firstname`, `lastname`, `birthday`, `login_token`) VALUES
-    (1, '20001', 1, 2, 'mr', 'example_password123', 'md5', 'test@example.com', 1, 0, '', 5, '2011-11-23', '2012-01-04 14:12:05', '', 0, '', 0, 'EK', 0, '1', 1, '', NULL, '', 0, NULL, NULL, 'Max', 'Mustermann', '1993-01-01', NULL),
-    (2, '20002', 1, 2, 'mrs', 'example_password123', 'md5', 'test2@example.com', 1, 1, '', 5, '2011-11-23', '2012-01-04 14:12:05', '', 0, '', 0, 'EK', 0, '1', 1, '', NULL, '', 0, NULL, NULL, 'Max', 'Mustermann', '1993-02-01', NULL),
-    (3, '20003', 1, 2, 'ms', 'example_password123', 'md5', 'test3@example.com', 1, 0, '', 5, '2011-11-23', '2012-01-04 14:12:05', '', 0, '', 0, 'EK', 0, '1', 1, '', NULL, '', 0, NULL, NULL, 'Max', 'Mustermann', '1993-03-01', NULL),
-    (4, '20004', 1, 4, 'herr', 'example_password123', 'md5', 'test4@example.com', 1, 0, '', 5, '2011-11-23', '2012-01-04 14:12:05', '', 0, '', 0, 'EK', 0, '1', 1, '', NULL, '', 0, NULL, NULL, 'Max', 'Mustermann', '1994-01-01', NULL),
-    (5, '20005', 1, 4, 'frau', 'example_password123', 'md5', 'test5@example.com', 1, 0, '', 5, '2011-11-23', '2012-01-04 14:12:05', '', 0, '', 0, 'EK', 0, '1', 1, '', NULL, '', 0, NULL, NULL, 'Max', 'Mustermann', '1995-01-01', NULL),
-    (6, '20006', 1, 1, 'ms', 'example_password123', 'md5', 'test6@example.com', 1, 0, '', 5, '2013-11-25', '2012-01-04 14:12:05', '', 0, '', 0, 'EK', 0, '1', 1, '', NULL, '', 0, NULL, NULL, 'Max', 'Mustermann', '1995-01-02', NULL),
-    (7, '20007', 3, 4, 'mrs', 'example_password123', 'md5', 'test7@example.com', 1, 0, '', 5, '2011-11-23', '2012-01-04 14:12:05', '', 0, '', 0, 'EK', 0, '1', 1, '', NULL, '', 0, NULL, NULL, 'Max', 'Mustermann', NULL, NULL),
-    (8, '20008', 3, 4, 'mr', 'example_password123', 'md5', 'test8@example.com', 1, 0, '', 5, '2014-01-01', '2012-01-04 14:12:05', '', 0, '', 0, 'EK', 0, '1', 2, '', NULL, '', 0, NULL, NULL, 'Max', 'Mustermann', NULL, NULL);
-
-INSERT INTO `s_campaigns_mailaddresses` (`customer`, `groupID`, `email`, `lastmailing`, `lastread`, `added`, `double_optin_confirmed`) VALUES
-    (1, 0, 'test5@example.com', 0, 0, '2018-06-07 10:46:11', NULL);
-
-INSERT INTO `s_order` (`ordernumber`, `userID`, `invoice_amount`, `invoice_amount_net`, `invoice_shipping`, `invoice_shipping_net`, `ordertime`, `status`, `cleared`, `paymentID`, `transactionID`, `comment`, `customercomment`, `internalcomment`, `net`, `taxfree`, `partnerID`, `temporaryID`, `referer`, `cleareddate`, `trackingcode`, `language`, `dispatchID`, `currency`, `currencyFactor`, `subshopID`, `remote_addr`, `deviceType`, `changed`) VALUES
-    ('20001', 4, 650, 600, 0, 0, '2012-08-30 10:15:54', 0, 17, 4, '', '', '', '', 1, 0, '', '', '', NULL, '', '1', 9, 'EUR', 1, 1, 'x.x.x.x', NULL, '2018-06-05 11:46:25'),
-    ('20002', 4, 100, 80, 0, 0, '2012-08-30 10:15:54', 0, 17, 4, '', '', '', '', 1, 0, '', '', '', NULL, '', '1', 9, 'EUR', 1, 1, 'x.x.x.x', NULL, '2018-06-05 11:46:25'),
-    ('20003', 5, 850, 800, 0, 0, '2012-08-30 10:15:54', 0, 17, 4, '', '', '', '', 1, 0, '', '', '', NULL, '', '1', 9, 'EUR', 1, 1, 'x.x.x.x', NULL, '2018-06-05 11:46:25');
-
-SET FOREIGN_KEY_CHECKS=1;
diff --git a/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/emotions.sql b/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/emotions.sql
deleted file mode 100644
index 992a21751ef..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/emotions.sql
+++ /dev/null
@@ -1,43 +0,0 @@
-SET FOREIGN_KEY_CHECKS=0;
-DELETE FROM s_emotion;
-DELETE FROM s_emotion_shops;
-DELETE FROM s_emotion_categories;
-DELETE FROM s_emotion_element;
-DELETE FROM s_library_component;
-
-INSERT INTO `s_emotion` (`id`, `active`, `name`, `cols`, `cell_spacing`, `cell_height`, `article_height`, `rows`, `valid_from`, `valid_to`, `userID`, `show_listing`, `is_landingpage`, `seo_title`, `seo_keywords`, `seo_description`, `create_date`, `modified`, `template_id`, `device`, `fullscreen`, `mode`, `position`, `parent_id`, `preview_id`, `preview_secret`, `customer_stream_ids`, `replacement`) VALUES
-    (1, 1, 'Example 1 Shop 1', 4, 10, 185, 2, 20, NULL, NULL, 1, 0, 0, '', '', '', '2017-11-07 09:57:28', '2018-03-06 15:53:29', 1, '0,1,2,3,4', 0, 'fluid', 1, NULL, NULL, NULL, NULL, NULL),
-    (2, 1, 'Example 2 Shop 1', 4, 10, 185, 2, 20, NULL, NULL, 1, 0, 1, '', '', '', '2017-11-07 09:57:28', '2018-03-06 15:53:29', 1, '0,2,4', 0, 'fluid', 1, NULL, NULL, NULL, NULL, NULL),
-    (3, 1, 'Example 3 Shop 1', 4, 10, 185, 2, 20, NULL, NULL, 1, 0, 1, '', '', '', '2017-11-07 09:57:28', '2018-03-06 15:53:29', 1, '0,1,2,3,4', 0, 'fluid', 1, NULL, NULL, NULL, NULL, NULL),
-    (4, 1, 'Example 4 Shop 2', 4, 10, 185, 2, 20, NULL, NULL, 1, 0, 1, '', '', '', '2017-11-07 09:57:28', '2018-03-06 15:53:29', 1, '0,1,2,3,4', 0, 'fluid', 1, NULL, NULL, NULL, NULL, NULL),
-    (5, 1, 'Example 5 Shop 2', 4, 10, 185, 2, 20, '2018-03-07 03:00:00', NULL, 1, 0, 0, '', '', '', '2017-11-07 09:57:28', '2018-03-06 15:53:29', 1, '0,1,2,3,4', 0, 'fluid', 1, NULL, NULL, NULL, NULL, NULL),
-    (6, 1, 'Example 6 Shop 1', 4, 10, 185, 2, 20, NULL, '2018-03-07 05:00:00', 1, 0, 0, '', '', '', '2017-11-07 09:57:28', '2018-03-06 15:53:29', 1, '0,2,3,4', 0, 'fluid', 1, NULL, NULL, NULL, NULL, NULL);
-
-INSERT INTO `s_emotion_shops` (`emotion_id`, `shop_id`) VALUES
-    (2, 1),
-    (3, 1),
-    (4, 2);
-
-INSERT INTO `s_emotion_categories` (`emotion_id`, `category_id`) VALUES
-    (1, 2),
-    (5, 3),
-    (6, 4);
-
-INSERT INTO `s_categories` (`id`, `parent`, `path`, `description`, `position`, `left`, `right`, `level`, `added`, `changed`, `metakeywords`, `metadescription`, `cmsheadline`, `cmstext`, `template`, `active`, `blog`, `external`, `hidefilter`, `hidetop`, `mediaID`, `product_box_layout`, `meta_title`, `stream_id`, `hide_sortings`, `sorting_ids`, `facet_ids`, `external_target`) VALUES
-    (4, 2, '|2|', 'Example 2', NULL, 0, 0, 0, '2017-10-05 14:56:02', '2017-10-05 14:56:02', NULL, '', '', '', NULL, 1, 0, '', 0, 0, NULL, NULL, '', 1, 0, NULL, NULL, '');
-
-INSERT INTO `s_emotion_element` (`emotionID`, `componentID`, `start_row`, `start_col`, `end_row`, `end_col`, `css_class`) VALUES
-    (1, 500, 1, 1, 1, 1, ''),
-    (1, 500, 1, 1, 1, 1, ''),
-    (1, 500, 1, 1, 1, 1, ''),
-    (1, 501, 1, 1, 1, 1, ''),
-    (1, 501, 1, 1, 1, 1, ''),
-    (4, 500, 1, 1, 1, 1, ''),
-    (4, 500, 1, 1, 1, 1, ''),
-    (5, 501, 1, 1, 1, 1, '');
-
-INSERT INTO `s_library_component` (`id`, `name`, `x_type`, `convert_function`, `description`, `template`, `cls`, `pluginID`) VALUES
-    (500, 'Example element 1', 'example-element-1', NULL, '', 'example_html_1', 'html-text-example-1', NULL),
-    (501, 'Example element 2', 'example-element-2', NULL, '', 'example_html_2', 'html-text-example-2', NULL);
-
-SET FOREIGN_KEY_CHECKS=1;
diff --git a/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/orders_basic.sql b/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/orders_basic.sql
deleted file mode 100644
index fdb3cf00f38..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/orders_basic.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-SET FOREIGN_KEY_CHECKS=0;
-DELETE FROM s_order;
-
-INSERT INTO `s_order` (`ordernumber`, `userID`, `invoice_amount`, `invoice_amount_net`, `paymentID`, `dispatchID`, `invoice_shipping`, `invoice_shipping_net`, `ordertime`, `status`, `cleared`, `transactionID`, `comment`, `customercomment`, `internalcomment`, `net`, `taxfree`, `partnerID`, `temporaryID`, `referer`, `cleareddate`, `trackingcode`, `language`, `currency`, `currencyFactor`, `subshopID`, `remote_addr`, `deviceType`, `changed`) VALUES
-    ('20001', 1, 100.00, 90.00, 4, 8, 0, 0, '2012-08-30 10:15:00', 0, 0, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 'EUR', 1, 1, '', NULL, '1993-01-01 00:00:00'),
-    ('20002', 2, 200.00, 80.00, 1, 9, 0, 0, '2012-08-30 15:20:00', 0, 0, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 'EUR', 1, 1, '', NULL, '1993-01-01 00:00:00'),
-    ('20003', 3, 300.00, 70.00, 2, 6, 0, 0, '2012-08-30 15:25:00', 0, 0, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 'EUR', 1, 1, '', NULL, '1993-01-01 00:00:00'),
-    ('20004', 3, 400.00, 60.00, 3, 9, 0, 0, '2012-08-30 15:30:00', 0, 0, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 'EUR', 1, 1, '', NULL, '1993-01-01 00:00:00'),
-    ('20005', 4, 200.00, 50.00, 4, 9, 0, 0, '2012-08-30 15:35:00', 0, 0, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 'EUR', 1, 1, '', NULL, '1993-01-01 00:00:00'),
-    ('20006', 2, 250.00, 85.00, 1, 7, 0, 0, '2012-08-30 15:40:00', 0, 0, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 'EUR', 1, 1, '', NULL, '1993-01-01 00:00:00'),
-    ('20007', 5, 350.00, 75.00, 3, 8, 0, 0, '2012-08-30 15:45:00', 0, 0, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 'EUR', 1, 1, '', NULL, '1993-01-01 00:00:00'),
-    ('20008', 6, 150.00, 10.00, 4, 7, 0, 0, '2012-08-30 15:50:00', 0, 0, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 'EUR', 1, 1, '', NULL, '1993-01-01 00:00:00');
-
-SET FOREIGN_KEY_CHECKS=1;
diff --git a/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/orders_detailed.sql b/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/orders_detailed.sql
deleted file mode 100644
index b0197ad3648..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/orders_detailed.sql
+++ /dev/null
@@ -1,93 +0,0 @@
-SET FOREIGN_KEY_CHECKS=0;
-DELETE FROM s_order;
-DELETE FROM s_order_details;
-DELETE FROM s_core_paymentmeans;
-DELETE FROM s_premium_dispatch;
-DELETE FROM s_premium_shippingcosts;
-DELETE FROM s_user;
-DELETE FROM s_order_billingaddress;
-DELETE FROM s_order_shippingaddress;
-DELETE FROM s_campaigns_mailaddresses;
-
-INSERT INTO `s_order` (`id`, `ordernumber`, `userID`, `invoice_amount`, `invoice_amount_net`, `paymentID`, `dispatchID`, `invoice_shipping`, `invoice_shipping_net`, `ordertime`, `status`, `cleared`, `transactionID`, `comment`, `customercomment`, `internalcomment`, `net`, `taxfree`, `partnerID`, `temporaryID`, `referer`, `cleareddate`, `trackingcode`, `language`, `currency`, `currencyFactor`, `subshopID`, `remote_addr`, `deviceType`, `changed`) VALUES
-    (1, '20001', 1, 100.00, 90.00, 4, 8, 15, 0, '2012-08-30 10:15:00', 0, 0, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 'EUR', 1, 1, '', 'mobile', '1993-01-01 00:00:00'),
-    (2, '20002', 2, 200.00, 80.00, 1, 9, 0, 0, '2012-08-30 15:20:00', 0, 0, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 'DKK', 1, 1, '', NULL, '1993-01-01 00:00:00'),
-    (3, '20003', 3, 300.00, 70.00, 2, 6, 0, 0, '2012-08-30 15:25:00', 0, 0, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 'EUR', 1, 1, '', NULL, '1993-01-01 00:00:00'),
-    (4, '20004', 3, 400.00, 60.00, 3, 9, 0, 0, '2012-08-30 15:30:00', 0, 0, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 'EUR', 1, 1, '', NULL, '1993-01-01 00:00:00'),
-    (5, '20005', 4, 200.00, 50.00, 4, 9, 0, 0, '2012-08-30 15:35:00', 0, 0, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 'EUR', 1, 1, '', NULL, '1994-01-01 00:00:00'),
-    (6, '20006', 2, 250.00, 85.00, 1, 7, 0, 0, '2012-08-30 15:40:00', 0, 0, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 'EUR', 1, 1, '', NULL, '1995-01-01 00:00:00'),
-    (7, '20007', 5, 350.00, 75.00, 3, 8, 0, 0, '2012-08-30 15:45:00', 0, 0, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 'EUR', 1, 1, '', NULL, '1996-01-01 00:00:00'),
-    (8, '20008', 6, 150.00, 10.00, 4, 7, 0, 0, '2012-08-30 15:50:00', 0, 0, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 'EUR', 1, 2, '', NULL, '1997-01-01 00:00:00'),
-    (9, '20009', 6, 120.00, 20.00, 4, 7, 0, 0, '2012-08-30 15:50:00', 0, 0, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 'EUR', 1, 2, '', NULL, '1998-01-01 00:00:00');
-
-INSERT INTO `s_order_details` (`orderID`, `ordernumber`, `articleID`, `articleordernumber`, `price`, `quantity`, `name`, `ean`, `unit`, `pack_unit`, `status`, `shipped`, `shippedgroup`, `releasedate`, `modus`, `esdarticle`, `taxID`, `tax_rate`, `config`) VALUES
-    (1, '20001', 10, 'SW10010', 150.00, 1, 'Example product 1', 'example_ean', NULL, NULL, 0, 0, 0, '2010-01-01', 0, 1, 1, 19, ''),
-    (1, '20001', 11, 'SW10011', 20, 4, 'Example product 2', NULL, NULL, NULL, 0, 0, 0, '2010-01-01', 0, 0, 1, 19, ''),
-    (2, '20002', 12, 'SW10012', 30, 1, 'Example product 3', NULL, 'liter', 'bottles', 0, 0, 0, '2010-01-01', 0, 0, 1, 19, ''),
-    (3, '20003', 13, 'SW10013', 40, 3, 'Example product 4', NULL, NULL, NULL, 0, 0, 0, '2010-01-01', 0, 0, 1, 19, ''),
-    (4, '20004', 14, 'SW10014', 50, 5, 'Example product 5', NULL, NULL, NULL, 0, 0, 0, '2010-01-01', 0, 0, 1, 19, ''),
-    (4, '20004', 15, 'SW10015', 60, 7, 'Example product 6', NULL, NULL, NULL, 0, 0, 0, '2010-01-01', 0, 0, 1, 19, ''),
-    (4, '20004', 16, 'SW10016', 70, 1, 'Example product 7', NULL, NULL, NULL, 0, 0, 0, '2010-01-01', 0, 0, 1, 19, ''),
-    (5, '20005', 17, 'SW10017', 80, 2, 'Example product 8', NULL, NULL, NULL, 0, 0, 0, '2010-01-01', 0, 0, 1, 19, ''),
-    (5, '20005', 18, 'SW10018', 90, 1, 'Example product 9', NULL, NULL, NULL, 0, 0, 0, '2010-01-01', 0, 0, 1, 19, ''),
-    (6, '20006', 19, 'SW10019', 100, 6, 'Example product 10', NULL, NULL, NULL, 0, 0, 0, '2010-01-01', 0, 0, 1, 19, ''),
-    (6, '20006', 20, 'SW10020', 110, 9, 'Example product 11', NULL, NULL, NULL, 0, 0, 0, '2010-01-01', 0, 0, 1, 19, ''),
-    (6, '20006', 21, 'SW10021', 120, 1, 'Example product 12', NULL, NULL, NULL, 0, 0, 0, '2010-01-01', 0, 0, 1, 19, ''),
-    (7, '20007', 22, 'SW10022', 130, 2, 'Example product 13', NULL, NULL, NULL, 0, 0, 0, '2010-01-01', 0, 0, 1, 19, ''),
-    (7, '20007', 23, 'SW10023', 140, 4, 'Example product 14', NULL, NULL, NULL, 0, 0, 0, '2010-01-01', 0, 0, 1, 19, ''),
-    (7, '20007', 24, 'SW10024', 150, 5, 'Example product 15', NULL, NULL, NULL, 0, 0, 0, '2010-01-01', 0, 0, 1, 19, ''),
-    (7, '20007', 25, 'SW10025', 160, 2, 'Example product 16', NULL, NULL, NULL, 0, 0, 0, '2010-01-01', 0, 0, 1, 19, ''),
-    (8, '20008', 26, 'SW10026', 170, 1, 'Example product 17', NULL, NULL, NULL, 0, 0, 0, '2010-01-01', 0, 0, 1, 19, '');
-
-UPDATE `s_benchmark_config` SET last_order_id=0, batch_size=5;
-
-INSERT INTO `s_core_paymentmeans` (`id`, `name`, `description`, `debit_percent`, `surcharge`, `surchargestring`, `template`, `class`, `table`, `hide`, `additionaldescription`, `position`, `active`, `esdactive`, `embediframe`, `hideprospect`, `action`, `pluginID`, `source`, `mobile_inactive`) VALUES
-    (1, 'example1', 'Example 1', 0, 0, '', 'example.tpl', '', '', 0, '', 4, 1, 0, '', 0, '', NULL, NULL, 0),
-    (2, 'example2', 'Example 2', 1, 0, '', 'example.tpl', '', '', 0, '', 4, 1, 0, '', 0, '', NULL, NULL, 0),
-    (3, 'example3', 'Example 3', 0, 2, '', 'example.tpl', '', '', 0, '', 4, 1, 0, '', 0, '', NULL, NULL, 0),
-    (4, 'example4', 'Example 4', 0, 0, 'DE:4;AE:-1', 'example.tpl', '', '', 0, '', 4, 1, 0, '', 0, '', NULL, NULL, 0);
-
-INSERT INTO `s_premium_dispatch` (`id`, `name`, `type`, `description`, `comment`, `active`, `position`, `calculation`, `surcharge_calculation`, `tax_calculation`, `shippingfree`, `multishopID`, `customergroupID`, `bind_shippingfree`, `bind_time_from`, `bind_time_to`, `bind_instock`, `bind_laststock`, `bind_weekday_from`, `bind_weekday_to`, `bind_weight_from`, `bind_weight_to`, `bind_price_from`, `bind_price_to`, `bind_sql`, `status_link`, `calculation_sql`) VALUES
-    (6, 'Example dispatch 1', 0, 'Example description 1', '', 1, 1, 1, 3, 0, NULL, NULL, NULL, 0, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', NULL),
-    (7, 'Example dispatch 2', 1, 'Example description 1', '', 1, 0, 1, 3, 0, NULL, NULL, NULL, 0, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', NULL),
-    (8, 'Example dispatch 3', 3, 'Example description 3', '', 1, 0, 1, 0, 0, NULL, NULL, NULL, 0, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', NULL),
-    (9, 'Example dispatch 4', 0, 'Example description 4', '', 1, 2, 1, 3, 0, NULL, NULL, NULL, 0, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', NULL);
-
-INSERT INTO `s_premium_shippingcosts` (`from`, `value`, `factor`, `dispatchID`) VALUES
-    ('0.000', '15.00', '0.00', 6),
-    ('5.000', '1.00', '0.00', 6),
-    ('0.000', '13.00', '0.00', 7),
-    ('0.000', '14.00', '0.00', 8),
-    ('0.000', '10.00', '0.00', 9),
-    ('5.000', '5.00', '0.00', 9),
-    ('10.000', '2.50', '0.00', 9);
-
-INSERT INTO `s_user` (`id`, `customernumber`, `default_billing_address_id`, `default_shipping_address_id`, `salutation`, `password`, `encoder`, `email`, `active`, `accountmode`, `confirmationkey`, `paymentID`, `firstlogin`, `lastlogin`, `sessionID`, `newsletter`, `validation`, `affiliate`, `customergroup`, `paymentpreset`, `language`, `subshopID`, `referer`, `pricegroupID`, `internalcomment`, `failedlogins`, `lockeduntil`, `title`, `firstname`, `lastname`, `birthday`, `login_token`) VALUES
-    (1, '20001', 1, 1, 'mr', 'example_password123', 'md5', 'test@example.com', 1, 0, '', 5, '2011-11-23', '2012-01-04 14:12:05', '', 0, '', 0, 'EK', 0, '1', 1, '', NULL, '', 0, NULL, NULL, 'Max', 'Mustermann', '1993-01-01', NULL),
-    (2, '20002', 2, 2, 'mrs', 'example_password123', 'md5', 'test2@example.com', 1, 1, '', 5, '2011-11-23', '2012-01-04 14:12:05', '', 0, '', 0, 'EK', 0, '1', 1, '', NULL, '', 0, NULL, NULL, 'Max', 'Mustermann', '1993-02-01', NULL),
-    (3, '20003', 3, 3, 'ms', 'example_password123', 'md5', 'test3@example.com', 1, 1, '', 5, '2011-11-23', '2012-01-04 14:12:05', '', 0, '', 0, 'EK', 0, '1', 1, '', NULL, '', 0, NULL, NULL, 'Max', 'Mustermann', '1993-03-01', NULL),
-    (4, '20004', 5, 5, 'mr', 'example_password123', 'md5', 'test4@example.com', 1, 1, '', 5, '2011-11-23', '2012-01-04 14:12:05', '', 0, '', 0, 'EK', 0, '1', 1, '', NULL, '', 0, NULL, NULL, 'Max', 'Mustermann', '1993-04-01', NULL),
-    (5, '20005', 7, 7, 'herr', 'example_password123', 'md5', 'test5@example.com', 1, 1, '', 5, '2011-11-23', '2012-01-04 14:12:05', '', 0, '', 0, 'EK', 0, '1', 1, '', NULL, '', 0, NULL, NULL, 'Max', 'Mustermann', '1993-05-01', NULL),
-    (6, '20006', 8, 8, 'mrs', 'example_password123', 'md5', 'test6@example.com', 1, 1, '', 5, '2011-11-23', '2012-01-04 14:12:05', '', 0, '', 0, 'EK', 0, '1', 1, '', NULL, '', 0, NULL, NULL, 'Max', 'Mustermann', '1993-06-01', NULL);
-
-INSERT INTO `s_order_billingaddress` (`id`, `userID`, `orderID`, `company`, `department`, `salutation`, `customernumber`, `firstname`, `lastname`, `street`, `zipcode`, `city`, `phone`, `countryID`, `stateID`, `ustid`, `additional_address_line1`, `additional_address_line2`, `title`) VALUES
-    (1, 1, 1, '', '', 'mr', NULL, 'Foo 1', 'Bar 1', 'Example street 1', '00000', 'Example city 1', '012345 / 6789', 2, 3, '', NULL, NULL, NULL),
-    (2, 2, 2, '', '', 'mr', NULL, 'Foo 2', 'Bar 2', 'Example street 2', '00000', 'Example city 2', '012345 / 6789', 3, 3, '', NULL, NULL, NULL),
-    (3, 3, 3, '', '', 'mr', NULL, 'Foo 3', 'Bar 3', 'Example street 3', '00000', 'Example city 3', '012345 / 6789', 4, 3, '', NULL, NULL, NULL),
-    (4, 3, 4, '', '', 'mr', NULL, 'Foo 4', 'Bar 4', 'Example street 4', '00000', 'Example city 4', '012345 / 6789', 4, 3, '', NULL, NULL, NULL),
-    (5, 4, 5, '', '', 'mr', NULL, 'Foo 5', 'Bar 5', 'Example street 5', '00000', 'Example city 5', '012345 / 6789', 5, 3, '', NULL, NULL, NULL),
-    (6, 2, 6, '', '', 'mr', NULL, 'Foo 6', 'Bar 6', 'Example street 6', '00000', 'Example city 6', '012345 / 6789', 3, 3, '', NULL, NULL, NULL),
-    (7, 5, 7, '', '', 'mr', NULL, 'Foo 7', 'Bar 7', 'Example street 7', '00000', 'Example city 7', '012345 / 6789', 6, 3, '', NULL, NULL, NULL),
-    (8, 6, 8, '', '', 'mr', NULL, 'Foo 8', 'Bar 8', 'Example street 8', '00000', 'Example city 8', '012345 / 6789', 7, 3, '', NULL, NULL, NULL);
-
-INSERT INTO `s_order_shippingaddress` (`id`, `userID`, `orderID`, `company`, `department`, `salutation`, `firstname`, `lastname`, `street`, `zipcode`, `city`, `phone`, `countryID`, `stateID`, `additional_address_line1`, `additional_address_line2`, `title`) VALUES
-    (1, 1, 1, '', '', 'mr', 'Foo 1', 'Bar 1', 'Example street 1', '00000', 'Example city 1', '012345 / 6789', 10, 3, NULL, NULL, NULL),
-    (2, 2, 2, '', '', 'mr', 'Foo 2', 'Bar 2', 'Example street 2', '00000', 'Example city 2', '012345 / 6789', 3, 3, NULL, NULL, NULL),
-    (3, 3, 3, '', '', 'mr', 'Foo 3', 'Bar 3', 'Example street 3', '00000', 'Example city 3', '012345 / 6789', 4, 3, NULL, NULL, NULL),
-    (4, 3, 4, '', '', 'mr', 'Foo 4', 'Bar 4', 'Example street 4', '00000', 'Example city 4', '012345 / 6789', 4, 3, NULL, NULL, NULL),
-    (5, 4, 5, '', '', 'mr', 'Foo 5', 'Bar 5', 'Example street 5', '00000', 'Example city 5', '012345 / 6789', 5, 3, NULL, NULL, NULL),
-    (6, 2, 6, '', '', 'mr', 'Foo 6', 'Bar 6', 'Example street 6', '00000', 'Example city 6', '012345 / 6789', 3, 3, NULL, NULL, NULL),
-    (7, 5, 7, '', '', 'mr', 'Foo 7', 'Bar 7', 'Example street 7', '00000', 'Example city 7', '012345 / 6789', 6, 3, NULL, NULL, NULL),
-    (8, 6, 8, '', '', 'mr', 'Foo 8', 'Bar 8', 'Example street 8', '00000', 'Example city 8', '012345 / 6789', 7, 3, NULL, NULL, NULL);
-
-SET FOREIGN_KEY_CHECKS=1;
diff --git a/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/payments.sql b/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/payments.sql
deleted file mode 100644
index 5ee591ff4d0..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/payments.sql
+++ /dev/null
@@ -1,23 +0,0 @@
-SET FOREIGN_KEY_CHECKS=0;
-DELETE FROM s_core_paymentmeans;
-DELETE FROM s_core_paymentmeans_subshops;
-
-INSERT INTO `s_core_paymentmeans` (`id`, `name`, `description`, `debit_percent`, `surcharge`, `surchargestring`, `template`, `class`, `table`, `hide`, `additionaldescription`, `position`, `active`, `esdactive`, `embediframe`, `hideprospect`, `action`, `pluginID`, `source`, `mobile_inactive`) VALUES
-    (1, 'example1', 'Example 1', 0, 0, '', 'example.tpl', '', '', 0, '', 4, 1, 0, '', 0, '', NULL, NULL, 0),
-    (2, 'example2', 'Example 2', 1, 0, '', 'example.tpl', '', '', 0, '', 4, 1, 0, '', 0, '', NULL, NULL, 0),
-    (3, 'example3', 'Example 3', 0, 2, '', 'example.tpl', '', '', 0, '', 4, 1, 0, '', 0, '', NULL, NULL, 0),
-    (4, 'example4', 'Example 4', 0, 0, 'DE:4;AE:-1', 'example.tpl', '', '', 0, '', 4, 0, 0, '', 0, '', NULL, NULL, 0),
-    (5, 'example5', 'Example 5', 0, 0, 'DE:-4', 'example.tpl', '', '', 0, '', 4, 1, 0, '', 0, '', NULL, NULL, 0),
-    (6, 'example6', 'Example 6', -5, 0, '', 'example.tpl', '', '', 0, '', 4, 0, 0, '', 0, '', NULL, NULL, 0),
-    (7, 'example7', 'Example 7', 0, -6, '', 'example.tpl', '', '', 0, '', 4, 0, 0, '', 0, '', NULL, NULL, 0),
-    (8, 'example8', 'Example 8', -7, -8, '', 'example.tpl', '', '', 0, '', 4, 0, 0, '', 0, '', NULL, NULL, 0),
-    (9, 'example9', 'Example 9', 9, 10, '', 'example.tpl', '', '', 0, '', 4, 0, 0, '', 0, '', NULL, NULL, 0),
-    (10, 'example10', 'Example 10', 9, 10, '', 'example.tpl', '', '', 0, '', 4, 0, 0, '', 0, '', NULL, NULL, 0),
-    (11, 'example11', 'Example 11', 9, 10, '', 'example.tpl', '', '', 0, '', 4, 1, 0, '', 0, '', NULL, NULL, 0);
-
-INSERT INTO `s_core_paymentmeans_subshops` (`paymentID`, `subshopID`) VALUES
-    (4, 1),
-    (10, 2),
-    (11, 2);
-
-SET FOREIGN_KEY_CHECKS=1;
diff --git a/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/plugins.sql b/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/plugins.sql
deleted file mode 100644
index b9636a023f4..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/plugins.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-SET FOREIGN_KEY_CHECKS=0;
-DELETE FROM s_core_plugins;
-
-INSERT INTO `s_core_plugins` (`namespace`, `name`, `label`, `version`, `update_version`, `author`, `source`, `description`, `translations`, `description_long`, `active`, `added`, `installation_date`, `update_date`, `refresh_date`, `copyright`, `license`, `support`, `changes`, `link`, `store_version`, `store_date`, `capability_update`, `capability_install`, `capability_enable`, `update_source`, `capability_secure_uninstall`, `in_safe_mode`) VALUES
-    ('ShopwarePlugins', 'SwagExample1', 'Swag Example 1', '1.0.0', NULL, 'some company', 'Local', NULL, NULL, NULL, 0, '2018-03-12 09:30:00', NULL, NULL, '2018-03-12 09:35:40', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, 1, 1, NULL, 0, 0),
-    ('ShopwarePlugins', 'SwagExample2', 'Swag Example 2', '1.0.0', NULL, 'shopware AG', 'Local', NULL, NULL, NULL, 0, '2018-03-12 09:30:00', NULL, NULL, '2018-03-12 09:35:40', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, 1, 1, NULL, 0, 0),
-    ('ShopwarePlugins', 'SwagExample3', 'Swag Example 3', '1.0.0', '1.0.1', 'shopware AG', 'Local', NULL, NULL, NULL, 1, '2018-03-12 09:30:00', NULL, NULL, '2018-03-12 09:35:40', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, 1, 1, NULL, 0, 0),
-    ('ShopwarePlugins', 'SwagExample4', 'Swag Example 4', '1.0.0', '1.1.0', 'shopware AG', 'Local', NULL, NULL, NULL, 1, '2018-03-12 09:30:00', NULL, NULL, '2018-03-12 09:35:40', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, 1, 1, NULL, 0, 0),
-    ('ShopwarePlugins', 'SwagExample5', 'Swag Example 5', '1.0.0', '0.1.0', 'shopware AG', 'Local', NULL, NULL, NULL, 0, '2018-03-12 09:30:00', NULL, NULL, '2018-03-12 09:35:40', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, 1, 1, NULL, 0, 0),
-    ('ShopwarePlugins', 'SwagExample6', 'Swag Example 6', '1.0.0', '1.0.0', 'some company', 'Local', NULL, NULL, NULL, 0, '2018-03-12 09:30:00', NULL, NULL, '2018-03-12 09:35:40', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, 1, 1, NULL, 0, 0);
-
-SET FOREIGN_KEY_CHECKS=1;
diff --git a/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/products_basic.sql b/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/products_basic.sql
deleted file mode 100644
index 462b51f8b5d..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/products_basic.sql
+++ /dev/null
@@ -1,37 +0,0 @@
-SET FOREIGN_KEY_CHECKS=0;
-DELETE FROM s_articles;
-DELETE FROM s_articles_details;
-DELETE FROM s_articles_categories;
-
-INSERT INTO `s_articles` (`id`, `supplierID`, `name`, `description`, `description_long`, `shippingtime`, `datum`, `active`, `taxID`, `pseudosales`, `topseller`, `metaTitle`, `keywords`, `changetime`, `pricegroupID`, `pricegroupActive`, `filtergroupID`, `laststock`, `crossbundlelook`, `notification`, `template`, `mode`, `main_detail_id`, `available_from`, `available_to`, `configurator_set_id`) VALUES
-    (1, 3, 'Example product 1', '', '', NULL, '2017-10-05', 1, 1, 0, 0, '', '', '2017-10-10 09:44:42', NULL, 0, 3, 0, 0, 0, '', 0, 1, NULL, NULL, NULL),
-    (2, 3, 'Example product 2', '', '', NULL, '2017-10-05', 1, 1, 5, 1, '', '', '2017-10-10 10:04:49', NULL, 0, 3, 1, 0, 1, '', 0, 2, NULL, NULL, NULL),
-    (3, 3, 'Example product 3', '', '', NULL, '2017-10-05', 1, 1, 10, 0, '', '', '2017-10-10 10:04:32', NULL, 0, 3, 0, 0, 0, '', 0, 3, NULL, NULL, NULL),
-    (4, 3, 'Example product 4', '', '', NULL, '2017-10-05', 1, 1, 15, 1, '', '', '2017-12-07 12:56:07', NULL, 0, 4, 0, 0, 0, '', 0, 39, NULL, NULL, 6),
-    (5, 1, 'Example product 5', '', '', NULL, '2017-10-05', 1, 1, 20, 0, '', '', '2017-10-10 09:42:07', NULL, 0, 1, 0, 0, 0, '', 0, 23, NULL, NULL, 3),
-    (6, 1, 'Example product 6', '', '', NULL, '2017-10-05', 1, 1, 20, 0, '', '', '2017-10-10 09:42:07', NULL, 0, 1, 0, 0, 0, '', 0, 24, NULL, NULL, NULL);
-
-INSERT INTO `s_articles_details` (`id`, `articleID`, `ordernumber`, `suppliernumber`, `kind`, `additionaltext`, `sales`, `active`, `instock`, `stockmin`, `laststock`, `weight`, `position`, `width`, `height`, `length`, `ean`, `unitID`, `purchasesteps`, `maxpurchase`, `minpurchase`, `purchaseunit`, `referenceunit`, `packunit`, `releasedate`, `shippingfree`, `shippingtime`, `purchaseprice`) VALUES
-    (1, 1, 'SW10001', '', 1, '', 0, 1, 2, 1, 0, 0, 0, NULL, NULL, NULL, '', 9, NULL, NULL, 1, 1.0000, 1.000, '', NULL, 0, '3', 0),
-    (2, 2, 'SW10002', '', 1, '', 0, 0, 4, 3, 0, 0, 0, 1.000, 1.000, 1.000, '', 9, NULL, NULL, 1, 1.0000, 1.000, '', NULL, 1, '7', 0),
-    (3, 3, 'SW10003', '', 1, '', 0, 1, 6, 5, 1, 0, 0, NULL, NULL, NULL, '', 9, NULL, NULL, 2, 1.0000, 1.000, '', NULL, 1, '0', 0),
-    (4, 4, 'SW10004', '', 1, '', 0, 1, 8, 7, 1, 0, 0, NULL, NULL, NULL, '', 9, NULL, 10, 1, 1.0000, 1.000, '', NULL, 0, '', 0),
-    (5, 5, 'SW10005', '', 1, '', 0, 0, 15, 20, 0, 0, 0, NULL, NULL, NULL, '', 9, 5, NULL, 1, 1.0000, 1.000, '', NULL, 1, '2', 0),
-    (6, 6, 'SW10006', '', 1, '', 0, 0, 18, 20, 0, 0, 0, NULL, NULL, NULL, '', 9, 5, NULL, 1, 1.0000, 1.000, '', NULL, 1, '2', 0);
-
-INSERT INTO `s_categories` (`id`, `parent`, `path`, `description`, `position`, `left`, `right`, `level`, `added`, `changed`, `metakeywords`, `metadescription`, `cmsheadline`, `cmstext`, `template`, `active`, `blog`, `external`, `hidefilter`, `hidetop`, `mediaID`, `product_box_layout`, `meta_title`, `stream_id`, `hide_sortings`, `sorting_ids`, `facet_ids`, `external_target`) VALUES
-    (4, 2, '|2|', 'Example 2', NULL, 0, 0, 0, '2017-10-05 14:56:02', '2017-10-05 14:56:02', NULL, '', '', '', NULL, 1, 0, '', 0, 0, NULL, NULL, '', 1, 0, NULL, NULL, ''),
-    (5, 2, '|2|', 'Example 3', NULL, 0, 0, 0, '2017-10-05 14:56:02', '2017-10-05 14:56:02', NULL, '', '', '', NULL, 0, 0, '', 0, 0, NULL, NULL, '', NULL, 0, NULL, NULL, ''),
-    (6, 3, '|3|', 'Example 4', NULL, 0, 0, 0, '2017-10-05 14:56:02', '2017-10-05 14:56:02', NULL, '', '', '', NULL, 0, 0, '', 0, 0, NULL, NULL, '', NULL, 0, NULL, NULL, ''),
-    (7, 5, '|2|5|', 'Example 5', NULL, 0, 0, 0, '2017-10-05 14:56:02', '2017-10-05 14:56:02', NULL, '', '', '', NULL, 1, 0, '', 0, 0, NULL, NULL, '', NULL, 0, NULL, NULL, ''),
-    (8, 7, '|2|5|7|', 'Example 6', NULL, 0, 0, 0, '2017-10-05 14:56:02', '2017-10-05 14:56:02', NULL, '', '', '', NULL, 1, 0, '', 0, 0, NULL, NULL, '', NULL, 0, NULL, NULL, '');
-
-INSERT INTO `s_articles_categories` (`articleID`, `categoryID`) VALUES
-    (1, 2),
-    (2, 2),
-    (3, 2),
-    (4, 2),
-    (5, 2),
-    (6, 3);
-
-SET FOREIGN_KEY_CHECKS=1;
diff --git a/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/products_images.sql b/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/products_images.sql
deleted file mode 100644
index 1cc202228b9..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/products_images.sql
+++ /dev/null
@@ -1,44 +0,0 @@
-SET FOREIGN_KEY_CHECKS=0;
-DELETE FROM s_articles;
-DELETE FROM s_articles_details;
-DELETE FROM s_articles_img;
-DELETE FROM s_media;
-DELETE FROM s_articles_categories;
-
-INSERT INTO `s_articles` (`id`, `supplierID`, `name`, `description`, `description_long`, `shippingtime`, `datum`, `active`, `taxID`, `pseudosales`, `topseller`, `metaTitle`, `keywords`, `changetime`, `pricegroupID`, `pricegroupActive`, `filtergroupID`, `laststock`, `crossbundlelook`, `notification`, `template`, `mode`, `main_detail_id`, `available_from`, `available_to`, `configurator_set_id`) VALUES
-    (1, 3, 'Example product 1', '', '', NULL, '2017-10-05', 1, 1, 0, 0, '', '', '2017-10-10 09:44:42', NULL, 0, 3, 0, 0, 0, '', 0, 1, NULL, NULL, NULL),
-    (2, 3, 'Example product 2', '', '', NULL, '2017-10-05', 1, 1, 5, 1, '', '', '2017-10-10 10:04:49', NULL, 0, 3, 1, 0, 1, '', 0, 2, NULL, NULL, NULL),
-    (3, 3, 'Example product 3', '', '', NULL, '2017-10-05', 1, 1, 10, 0, '', '', '2017-10-10 10:04:32', NULL, 0, 3, 0, 0, 0, '', 0, 3, NULL, NULL, NULL),
-    (4, 3, 'Example product 4', '', '', NULL, '2017-10-05', 1, 1, 15, 1, '', '', '2017-12-07 12:56:07', NULL, 0, 4, 0, 0, 0, '', 0, 39, NULL, NULL, 6),
-    (5, 1, 'Example product 5', '', '', NULL, '2017-10-05', 1, 1, 20, 0, '', '', '2017-10-10 09:42:07', NULL, 0, 1, 0, 0, 0, '', 0, 23, NULL, NULL, 3);
-
-INSERT INTO `s_articles_details` (`articleID`, `ordernumber`, `suppliernumber`, `kind`, `additionaltext`, `sales`, `active`, `instock`, `stockmin`, `laststock`, `weight`, `position`, `width`, `height`, `length`, `ean`, `unitID`, `purchasesteps`, `maxpurchase`, `minpurchase`, `purchaseunit`, `referenceunit`, `packunit`, `releasedate`, `shippingfree`, `shippingtime`, `purchaseprice`) VALUES
-    (1, 'SW10001', '', 1, '', 0, 1, 2, 1, 0, 0, 0, NULL, NULL, NULL, '', 9, NULL, NULL, 1, 1.0000, 1.000, '', NULL, 0, '3', 0),
-    (2, 'SW10002', '', 1, '', 0, 0, 4, 3, 0, 0, 0, 1.000, 1.000, 1.000, '', 9, NULL, NULL, 1, 1.0000, 1.000, '', NULL, 1, '7', 0),
-    (3, 'SW10003', '', 1, '', 0, 1, 6, 5, 1, 0, 0, NULL, NULL, NULL, '', 9, NULL, NULL, 2, 1.0000, 1.000, '', NULL, 1, '0', 0),
-    (4, 'SW10004', '', 1, '', 0, 1, 8, 7, 1, 0, 0, NULL, NULL, NULL, '', 9, NULL, 10, 1, 1.0000, 1.000, '', NULL, 0, '', 0),
-    (5, 'SW10005', '', 1, '', 0, 0, 15, 20, 0, 0, 0, NULL, NULL, NULL, '', 9, 5, NULL, 1, 1.0000, 1.000, '', NULL, 1, '2', 0);
-
-INSERT INTO `s_articles_img` (`articleID`, `img`, `main`, `description`, `position`, `width`, `height`, `relations`, `extension`, `parent_id`, `article_detail_id`, `media_id`) VALUES
-    (1, 'mobile', 1, '', 1, 0, 0, '', 'jpg', NULL, NULL, 1),
-    (1, 'waschmaschine', 1, '', 1, 0, 0, '', 'jpg', NULL, NULL, 2);
-
-INSERT INTO `s_media` (`id`, `albumID`, `name`, `description`, `path`, `type`, `extension`, `file_size`, `width`, `height`, `userID`, `created`) VALUES
-    (1, -1, 'foo', '', 'media/image/foo.jpg', 'IMAGE', 'jpg', 12345, 1280, 1280, 50, '2017-10-05'),
-    (2, -1, 'bar', '', 'media/image/bar.jpg', 'IMAGE', 'jpg', 54321, 1280, 1280, 50, '2017-10-05');
-
-INSERT INTO `s_categories` (`id`, `parent`, `path`, `description`, `position`, `left`, `right`, `level`, `added`, `changed`, `metakeywords`, `metadescription`, `cmsheadline`, `cmstext`, `template`, `active`, `blog`, `external`, `hidefilter`, `hidetop`, `mediaID`, `product_box_layout`, `meta_title`, `stream_id`, `hide_sortings`, `sorting_ids`, `facet_ids`, `external_target`) VALUES
-    (4, 2, '|2|', 'Example 2', NULL, 0, 0, 0, '2017-10-05 14:56:02', '2017-10-05 14:56:02', NULL, '', '', '', NULL, 1, 0, '', 0, 0, NULL, NULL, '', 1, 0, NULL, NULL, ''),
-    (5, 2, '|2|', 'Example 3', NULL, 0, 0, 0, '2017-10-05 14:56:02', '2017-10-05 14:56:02', NULL, '', '', '', NULL, 0, 0, '', 0, 0, NULL, NULL, '', NULL, 0, NULL, NULL, ''),
-    (6, 3, '|3|', 'Example 4', NULL, 0, 0, 0, '2017-10-05 14:56:02', '2017-10-05 14:56:02', NULL, '', '', '', NULL, 0, 0, '', 0, 0, NULL, NULL, '', NULL, 0, NULL, NULL, ''),
-    (7, 5, '|2|5|', 'Example 5', NULL, 0, 0, 0, '2017-10-05 14:56:02', '2017-10-05 14:56:02', NULL, '', '', '', NULL, 1, 0, '', 0, 0, NULL, NULL, '', NULL, 0, NULL, NULL, ''),
-    (8, 7, '|2|5|7|', 'Example 6', NULL, 0, 0, 0, '2017-10-05 14:56:02', '2017-10-05 14:56:02', NULL, '', '', '', NULL, 1, 0, '', 0, 0, NULL, NULL, '', NULL, 0, NULL, NULL, '');
-
-INSERT INTO `s_articles_categories` (`articleID`, `categoryID`) VALUES
-    (1, 2),
-    (2, 2),
-    (3, 2),
-    (4, 2),
-    (5, 2);
-
-SET FOREIGN_KEY_CHECKS=1;
diff --git a/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/products_properties.sql b/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/products_properties.sql
deleted file mode 100644
index 6b025b95258..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/products_properties.sql
+++ /dev/null
@@ -1,51 +0,0 @@
-SET FOREIGN_KEY_CHECKS=0;
-DELETE FROM s_articles;
-DELETE FROM s_articles_details;
-DELETE FROM s_filter_articles;
-DELETE FROM s_filter_values;
-DELETE FROM s_filter_options;
-DELETE FROM s_articles_categories;
-
-INSERT INTO `s_articles` (`id`, `supplierID`, `name`, `description`, `description_long`, `shippingtime`, `datum`, `active`, `taxID`, `pseudosales`, `topseller`, `metaTitle`, `keywords`, `changetime`, `pricegroupID`, `pricegroupActive`, `filtergroupID`, `laststock`, `crossbundlelook`, `notification`, `template`, `mode`, `main_detail_id`, `available_from`, `available_to`, `configurator_set_id`) VALUES
-    (1, 3, 'Example product 1', '', '', NULL, '2017-10-05', 1, 1, 0, 0, '', '', '2017-10-10 09:44:42', NULL, 0, 3, 0, 0, 0, '', 0, 1, NULL, NULL, NULL),
-    (2, 3, 'Example product 2', '', '', NULL, '2017-10-05', 1, 1, 5, 1, '', '', '2017-10-10 10:04:49', NULL, 0, 3, 1, 0, 1, '', 0, 2, NULL, NULL, NULL),
-    (3, 3, 'Example product 3', '', '', NULL, '2017-10-05', 1, 1, 10, 0, '', '', '2017-10-10 10:04:32', NULL, 0, 3, 0, 0, 0, '', 0, 3, NULL, NULL, NULL),
-    (4, 3, 'Example product 4', '', '', NULL, '2017-10-05', 1, 1, 15, 1, '', '', '2017-12-07 12:56:07', NULL, 0, 4, 0, 0, 0, '', 0, 39, NULL, NULL, 6),
-    (5, 1, 'Example product 5', '', '', NULL, '2017-10-05', 1, 1, 20, 0, '', '', '2017-10-10 09:42:07', NULL, 0, 1, 0, 0, 0, '', 0, 23, NULL, NULL, 3);
-
-INSERT INTO `s_articles_details` (`articleID`, `ordernumber`, `suppliernumber`, `kind`, `additionaltext`, `sales`, `active`, `instock`, `stockmin`, `laststock`, `weight`, `position`, `width`, `height`, `length`, `ean`, `unitID`, `purchasesteps`, `maxpurchase`, `minpurchase`, `purchaseunit`, `referenceunit`, `packunit`, `releasedate`, `shippingfree`, `shippingtime`, `purchaseprice`) VALUES
-    (1, 'SW10001', '', 1, '', 0, 1, 2, 1, 0, 0, 0, NULL, NULL, NULL, '', 9, NULL, NULL, 1, 1.0000, 1.000, '', NULL, 0, '3', 0),
-    (2, 'SW10002', '', 1, '', 0, 0, 4, 3, 0, 0, 0, 1.000, 1.000, 1.000, '', 9, NULL, NULL, 1, 1.0000, 1.000, '', NULL, 1, '7', 0),
-    (3, 'SW10003', '', 1, '', 0, 1, 6, 5, 1, 0, 0, NULL, NULL, NULL, '', 9, NULL, NULL, 2, 1.0000, 1.000, '', NULL, 1, '0', 0),
-    (4, 'SW10004', '', 1, '', 0, 1, 8, 7, 1, 0, 0, NULL, NULL, NULL, '', 9, NULL, 10, 1, 1.0000, 1.000, '', NULL, 0, '', 0),
-    (5, 'SW10005', '', 1, '', 0, 0, 15, 20, 0, 0, 0, NULL, NULL, NULL, '', 9, 5, NULL, 1, 1.0000, 1.000, '', NULL, 1, '2', 0);
-
-INSERT INTO `s_filter_articles` (`articleID`, `valueID`) VALUES
-    (3, 1),
-    (3, 2),
-    (3, 3);
-
-INSERT INTO `s_filter_values` (`id`, `optionID`, `value`, `position`, `media_id`) VALUES
-    (1, 1, 'Rot', 0, NULL),
-    (2, 2, 'Kinder', 1, NULL),
-    (3, 2, 'Frauen', 2, NULL);
-
-INSERT INTO `s_filter_options` (`id`, `name`, `filterable`) VALUES
-    (1, 'Farbe', 1),
-    (2, 'Zielgruppe', 1);
-
-INSERT INTO `s_categories` (`id`, `parent`, `path`, `description`, `position`, `left`, `right`, `level`, `added`, `changed`, `metakeywords`, `metadescription`, `cmsheadline`, `cmstext`, `template`, `active`, `blog`, `external`, `hidefilter`, `hidetop`, `mediaID`, `product_box_layout`, `meta_title`, `stream_id`, `hide_sortings`, `sorting_ids`, `facet_ids`, `external_target`) VALUES
-    (4, 2, '|2|', 'Example 2', NULL, 0, 0, 0, '2017-10-05 14:56:02', '2017-10-05 14:56:02', NULL, '', '', '', NULL, 1, 0, '', 0, 0, NULL, NULL, '', 1, 0, NULL, NULL, ''),
-    (5, 2, '|2|', 'Example 3', NULL, 0, 0, 0, '2017-10-05 14:56:02', '2017-10-05 14:56:02', NULL, '', '', '', NULL, 0, 0, '', 0, 0, NULL, NULL, '', NULL, 0, NULL, NULL, ''),
-    (6, 3, '|3|', 'Example 4', NULL, 0, 0, 0, '2017-10-05 14:56:02', '2017-10-05 14:56:02', NULL, '', '', '', NULL, 0, 0, '', 0, 0, NULL, NULL, '', NULL, 0, NULL, NULL, ''),
-    (7, 5, '|2|5|', 'Example 5', NULL, 0, 0, 0, '2017-10-05 14:56:02', '2017-10-05 14:56:02', NULL, '', '', '', NULL, 1, 0, '', 0, 0, NULL, NULL, '', NULL, 0, NULL, NULL, ''),
-    (8, 7, '|2|5|7|', 'Example 6', NULL, 0, 0, 0, '2017-10-05 14:56:02', '2017-10-05 14:56:02', NULL, '', '', '', NULL, 1, 0, '', 0, 0, NULL, NULL, '', NULL, 0, NULL, NULL, '');
-
-INSERT INTO `s_articles_categories` (`articleID`, `categoryID`) VALUES
-    (1, 2),
-    (2, 2),
-    (3, 2),
-    (4, 2),
-    (5, 2);
-
-SET FOREIGN_KEY_CHECKS=1;
diff --git a/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/products_variants.sql b/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/products_variants.sql
deleted file mode 100644
index 2d58284d1b7..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/products_variants.sql
+++ /dev/null
@@ -1,36 +0,0 @@
-SET FOREIGN_KEY_CHECKS=0;
-DELETE FROM s_articles;
-DELETE FROM s_articles_details;
-DELETE FROM s_articles_categories;
-
-INSERT INTO `s_articles` (`id`, `supplierID`, `name`, `description`, `description_long`, `shippingtime`, `datum`, `active`, `taxID`, `pseudosales`, `topseller`, `metaTitle`, `keywords`, `changetime`, `pricegroupID`, `pricegroupActive`, `filtergroupID`, `laststock`, `crossbundlelook`, `notification`, `template`, `mode`, `main_detail_id`, `available_from`, `available_to`, `configurator_set_id`) VALUES
-    (1, 3, 'Example product 1', '', '', NULL, '2017-10-05', 1, 1, 0, 0, '', '', '2017-10-10 09:44:42', NULL, 0, 3, 0, 0, 0, '', 0, 1, NULL, NULL, NULL),
-    (2, 3, 'Example product 2', '', '', NULL, '2017-10-05', 1, 1, 5, 1, '', '', '2017-10-10 10:04:49', NULL, 0, 3, 1, 0, 1, '', 0, 2, NULL, NULL, NULL),
-    (3, 3, 'Example product 3', '', '', NULL, '2017-10-05', 1, 1, 10, 0, '', '', '2017-10-10 10:04:32', NULL, 0, 3, 0, 0, 0, '', 0, 3, NULL, NULL, NULL),
-    (4, 3, 'Example product 4', '', '', NULL, '2017-10-05', 1, 1, 15, 1, '', '', '2017-12-07 12:56:07', NULL, 0, 4, 0, 0, 0, '', 0, 39, NULL, NULL, 6),
-    (5, 1, 'Example product 5', '', '', NULL, '2017-10-05', 1, 1, 20, 0, '', '', '2017-10-10 09:42:07', NULL, 0, 1, 0, 0, 0, '', 0, 23, NULL, NULL, 3);
-
-INSERT INTO `s_articles_details` (`articleID`, `ordernumber`, `suppliernumber`, `kind`, `additionaltext`, `sales`, `active`, `instock`, `stockmin`, `laststock`, `weight`, `position`, `width`, `height`, `length`, `ean`, `unitID`, `purchasesteps`, `maxpurchase`, `minpurchase`, `purchaseunit`, `referenceunit`, `packunit`, `releasedate`, `shippingfree`, `shippingtime`, `purchaseprice`) VALUES
-    (1, 'SW10001', '', 1, '', 0, 1, 2, 1, 0, 0, 0, NULL, NULL, NULL, '', 9, NULL, NULL, 1, 1.0000, 1.000, '', NULL, 0, '3', 0),
-    (2, 'SW10002', '', 1, '', 0, 0, 4, 3, 0, 0, 0, 1.000, 1.000, 1.000, '', 9, NULL, NULL, 1, 1.0000, 1.000, '', NULL, 1, '7', 0),
-    (3, 'SW10003', '', 1, '', 0, 1, 6, 5, 1, 0, 0, NULL, NULL, NULL, '', 9, NULL, NULL, 2, 1.0000, 1.000, '', NULL, 1, '0', 0),
-    (4, 'SW10004', '', 1, '', 0, 1, 8, 7, 1, 0, 0, NULL, NULL, NULL, '', 9, NULL, 10, 1, 1.0000, 1.000, '', NULL, 0, '', 0),
-    (5, 'SW10005', '', 1, '', 0, 0, 15, 20, 0, 0, 0, NULL, NULL, NULL, '', 9, 5, NULL, 1, 1.0000, 1.000, '', NULL, 1, '2', 0),
-    (5, 'SW10005.1', '', 2, '', 0, 0, 25, 20, 0, 0, 0, NULL, NULL, NULL, '', 9, 5, NULL, 1, 1.0000, 1.000, '', NULL, 1, '2', 0),
-    (5, 'SW10005.2', '', 2, '', 0, 0, 30, 20, 0, 0, 0, NULL, NULL, NULL, '', 9, 5, NULL, 1, 1.0000, 1.000, '', NULL, 1, '2', 0);
-
-INSERT INTO `s_categories` (`id`, `parent`, `path`, `description`, `position`, `left`, `right`, `level`, `added`, `changed`, `metakeywords`, `metadescription`, `cmsheadline`, `cmstext`, `template`, `active`, `blog`, `external`, `hidefilter`, `hidetop`, `mediaID`, `product_box_layout`, `meta_title`, `stream_id`, `hide_sortings`, `sorting_ids`, `facet_ids`, `external_target`) VALUES
-    (4, 2, '|2|', 'Example 2', NULL, 0, 0, 0, '2017-10-05 14:56:02', '2017-10-05 14:56:02', NULL, '', '', '', NULL, 1, 0, '', 0, 0, NULL, NULL, '', 1, 0, NULL, NULL, ''),
-    (5, 2, '|2|', 'Example 3', NULL, 0, 0, 0, '2017-10-05 14:56:02', '2017-10-05 14:56:02', NULL, '', '', '', NULL, 0, 0, '', 0, 0, NULL, NULL, '', NULL, 0, NULL, NULL, ''),
-    (6, 3, '|3|', 'Example 4', NULL, 0, 0, 0, '2017-10-05 14:56:02', '2017-10-05 14:56:02', NULL, '', '', '', NULL, 0, 0, '', 0, 0, NULL, NULL, '', NULL, 0, NULL, NULL, ''),
-    (7, 5, '|2|5|', 'Example 5', NULL, 0, 0, 0, '2017-10-05 14:56:02', '2017-10-05 14:56:02', NULL, '', '', '', NULL, 1, 0, '', 0, 0, NULL, NULL, '', NULL, 0, NULL, NULL, ''),
-    (8, 7, '|2|5|7|', 'Example 6', NULL, 0, 0, 0, '2017-10-05 14:56:02', '2017-10-05 14:56:02', NULL, '', '', '', NULL, 1, 0, '', 0, 0, NULL, NULL, '', NULL, 0, NULL, NULL, '');
-
-INSERT INTO `s_articles_categories` (`articleID`, `categoryID`) VALUES
-    (1, 2),
-    (2, 2),
-    (3, 2),
-    (4, 2),
-    (5, 2);
-
-SET FOREIGN_KEY_CHECKS=1;
diff --git a/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/second_config.sql b/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/second_config.sql
deleted file mode 100644
index cc909ac2df2..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/second_config.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-SET FOREIGN_KEY_CHECKS=0;
-
-INSERT INTO `s_benchmark_config` (`id`, `shop_id`, `active`, `last_sent`, `last_received`, `last_order_id`, `last_customer_id`, `last_product_id`, `batch_size`, `industry`, `type`, `response_token`, `cached_template`)
-VALUES (UNHEX('F00'), '2', '1', '1990-01-01 00:00:00', '1990-01-01 00:00:00', '0', '0', '0', '1000', '3', 'b2c', NULL, NULL);
-
-SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
diff --git a/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/shipments.sql b/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/shipments.sql
deleted file mode 100644
index d98bbef6c19..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/shipments.sql
+++ /dev/null
@@ -1,36 +0,0 @@
-SET FOREIGN_KEY_CHECKS=0;
-DELETE FROM s_premium_dispatch;
-DELETE FROM s_premium_shippingcosts;
-DELETE FROM s_order;
-
-INSERT INTO `s_premium_dispatch` (`id`, `name`, `type`, `description`, `comment`, `active`, `position`, `calculation`, `surcharge_calculation`, `tax_calculation`, `shippingfree`, `multishopID`, `customergroupID`, `bind_shippingfree`, `bind_time_from`, `bind_time_to`, `bind_instock`, `bind_laststock`, `bind_weekday_from`, `bind_weekday_to`, `bind_weight_from`, `bind_weight_to`, `bind_price_from`, `bind_price_to`, `bind_sql`, `status_link`, `calculation_sql`) VALUES
-    (1, 'Example dispatch 1', 0, 'Example description 1', '', 1, 1, 1, 3, 0, NULL, NULL, NULL, 0, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', NULL),
-    (2, 'Example dispatch 2', 1, 'Example description 1', '', 1, 0, 1, 3, 0, NULL, NULL, NULL, 0, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', NULL),
-    (3, 'Example dispatch 3', 3, 'Example description 3', '', 1, 0, 1, 0, 0, NULL, NULL, NULL, 0, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', NULL),
-    (4, 'Example dispatch 4', 0, 'Example description 4', '', 1, 2, 1, 3, 0, NULL, NULL, NULL, 0, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', NULL),
-    (5, 'Example dispatch 5', 0, 'Example description 5', '', 1, 1, 1, 3, 0, NULL, NULL, NULL, 0, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', NULL),
-    (6, 'Example dispatch 6', 0, 'Example description 6', '', 1, 1, 1, 3, 0, NULL, NULL, NULL, 0, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', NULL);
-
-INSERT INTO `s_premium_shippingcosts` (`from`, `value`, `factor`, `dispatchID`) VALUES
-    ('0.000', '15.00', '0.00', 1),
-    ('5.000', '1.00', '0.00', 1),
-    ('0.000', '13.00', '0.00', 2),
-    ('0.000', '14.00', '0.00', 3),
-    ('0.000', '10.00', '0.00', 4),
-    ('5.000', '5.00', '0.00', 4),
-    ('10.000', '2.50', '0.00', 4),
-    ('0.000', '15.00', '0.00', 5),
-    ('0.000', '15.00', '0.00', 6);
-
-INSERT INTO `s_order` (`id`, `ordernumber`, `userID`, `invoice_amount`, `invoice_amount_net`, `paymentID`, `dispatchID`, `invoice_shipping`, `invoice_shipping_net`, `ordertime`, `status`, `cleared`, `transactionID`, `comment`, `customercomment`, `internalcomment`, `net`, `taxfree`, `partnerID`, `temporaryID`, `referer`, `cleareddate`, `trackingcode`, `language`, `currency`, `currencyFactor`, `subshopID`, `remote_addr`, `deviceType`) VALUES
-    (1, '20001', 1, 100.00, 90.00, 4, 1, 0, 0, '2012-08-30 10:15:00', 0, 0, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 'EUR', 1, 1, '', NULL),
-    (2, '20002', 2, 200.00, 80.00, 1, 2, 0, 0, '2012-08-30 15:20:00', 0, 0, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 'EUR', 1, 1, '', NULL),
-    (3, '20003', 3, 300.00, 70.00, 2, 3, 0, 0, '2012-08-30 15:25:00', 0, 0, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 'EUR', 1, 1, '', NULL),
-    (4, '20004', 3, 400.00, 60.00, 3, 4, 0, 0, '2012-08-30 15:30:00', 0, 0, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 'EUR', 1, 1, '', NULL),
-    (5, '20005', 4, 200.00, 50.00, 4, 2, 0, 0, '2012-08-30 15:35:00', 0, 0, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 'EUR', 1, 1, '', NULL),
-    (6, '20006', 4, 120.00, 90.00, 4, 6, 0, 0, '2012-08-30 15:35:00', 0, 0, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 'EUR', 1, 1, '', NULL);
-
-INSERT INTO `s_premium_dispatch_categories` (`dispatchID`, `categoryID`) VALUES
-    (6, 2);
-
-SET FOREIGN_KEY_CHECKS=1;
diff --git a/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/suppliers.sql b/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/suppliers.sql
deleted file mode 100644
index 4d6b32efb23..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/Providers/assets/suppliers.sql
+++ /dev/null
@@ -1,19 +0,0 @@
-SET FOREIGN_KEY_CHECKS=0;
-DELETE FROM s_articles;
-DELETE FROM s_articles_categories;
-
-INSERT INTO `s_articles` (`id`, `supplierID`, `name`, `description`, `description_long`, `shippingtime`, `datum`, `active`, `taxID`, `pseudosales`, `topseller`, `metaTitle`, `keywords`, `changetime`, `pricegroupID`, `pricegroupActive`, `filtergroupID`, `laststock`, `crossbundlelook`, `notification`, `template`, `mode`, `main_detail_id`, `available_from`, `available_to`, `configurator_set_id`) VALUES
-    (1, 1, 'Example product 1', '', '', NULL, '2017-10-05', 1, 1, 0, 0, '', '', '2017-10-10 09:44:42', NULL, 0, 3, 0, 0, 0, '', 0, 1, NULL, NULL, NULL),
-    (2, 2, 'Example product 2', '', '', NULL, '2017-10-05', 1, 1, 5, 1, '', '', '2017-10-10 10:04:49', NULL, 0, 3, 1, 0, 1, '', 0, 2, NULL, NULL, NULL),
-    (3, 2, 'Example product 3', '', '', NULL, '2017-10-05', 1, 1, 10, 0, '', '', '2017-10-10 10:04:32', NULL, 0, 3, 0, 0, 0, '', 0, 3, NULL, NULL, NULL),
-    (4, 3, 'Example product 4', '', '', NULL, '2017-10-05', 1, 1, 15, 1, '', '', '2017-12-07 12:56:07', NULL, 0, 4, 0, 0, 0, '', 0, 39, NULL, NULL, 6),
-    (5, 4, 'Example product 5', '', '', NULL, '2017-10-05', 1, 1, 20, 0, '', '', '2017-10-10 09:42:07', NULL, 0, 1, 0, 0, 0, '', 0, 23, NULL, NULL, 3);
-
-INSERT INTO `s_articles_categories` (`articleID`, `categoryID`) VALUES
-    (1, 2),
-    (2, 2),
-    (3, 3),
-    (4, 3),
-    (5, 2);
-
-SET FOREIGN_KEY_CHECKS=1;
diff --git a/tests/Functional/Bundle/BenchmarkBundle/StatisticsClientTest.php b/tests/Functional/Bundle/BenchmarkBundle/StatisticsClientTest.php
deleted file mode 100644
index 066193d0e7a..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/StatisticsClientTest.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Tests\Functional\Bundle\BenchmarkBundle;
-
-use Doctrine\DBAL\Connection;
-use Psr\Log\NullLogger;
-use Ramsey\Uuid\Uuid;
-use Shopware\Bundle\BenchmarkBundle\Exception\StatisticsSendingException;
-use Shopware\Bundle\BenchmarkBundle\StatisticsClient;
-use Shopware\Bundle\BenchmarkBundle\Struct\StatisticsRequest;
-use Shopware\Components\HttpClient\GuzzleHttpClient;
-use Shopware\Components\HttpClient\RequestException;
-use Shopware\Models\Benchmark\BenchmarkConfig;
-
-class StatisticsClientTest extends BenchmarkTestCase
-{
-    public function testResetBenchmarkData(): void
-    {
-        $requestException = new RequestException('Fooo', 420);
-
-        $httpClient = $this->getMockBuilder(GuzzleHttpClient::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $httpClient
-            ->expects(static::once())
-            ->method('post')
-            ->willThrowException($requestException);
-
-        $client = new StatisticsClient(
-            'foo',
-            $httpClient,
-            $this->getContainer()->get('shopware.benchmark_bundle.hydrator.statistics_response_hydrator'),
-            new NullLogger(),
-            $this->getContainer()->get(Connection::class)
-        );
-
-        $config = new BenchmarkConfig(Uuid::uuid4()->toString());
-        $config->setLastProductId(100);
-        $config->setShopId(55);
-
-        $this->getContainer()->get('models')->persist($config);
-        $this->getContainer()->get('models')->flush($config);
-
-        try {
-            $client->sendStatistics(new StatisticsRequest('foo', $config));
-        } catch (StatisticsSendingException $e) {
-            $oldConfig = $config;
-            $config = $this->getContainer()->get('models')->getRepository(BenchmarkConfig::class)->findOneBy(['shopId' => 55]);
-            static::assertInstanceOf(BenchmarkConfig::class, $config);
-
-            static::assertNotEquals($config->getId(), $oldConfig->getId());
-            static::assertSame(0, $config->getLastProductId());
-            static::assertSame(55, $config->getShopId());
-        }
-    }
-}
diff --git a/tests/Functional/Bundle/BenchmarkBundle/fixtures/private_test_key.pem b/tests/Functional/Bundle/BenchmarkBundle/fixtures/private_test_key.pem
deleted file mode 100644
index 1284ab313ff..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/fixtures/private_test_key.pem
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC49S8qDtTog/Wx
-9EbnmujTT7zMhm8RGV8lUP6sSg1Oa4iUe1ynaIrzGRaZl6rV80z85M2mfBXQf5hz
-K1iRU54SaoKzD267OCOFOHnRIw0ZxcWOdPxa7hAmuJpAjXEYv2z08+Z0IC6DxoRV
-WM3tp8hRVMrySsM6wbD5ToO/DuLlEIfVSP96pe4bDoLS5QY3mb4tyTYETsthJrQa
-6k3p/OYFlJWfp0ClODsIgcEUfmN9tuLPVyiT3SslkchsszyvlqdJYIyivMtYauj3
-ipK0V8uCy15dPOhZlEWb/v0pMIhGxkVt/3HXbTrQVkU/mGmfZfY70DnD8zIVoVwA
-b7x+Be/VAgMBAAECggEAUsk74SFeXuyhzpM+IXCPAfZQ1WLe19J5aeSE+Wzz48Py
-EDPfVvdOKl1yZjEiwDz0msV23yvvP7G89N/T9shsmmWeNrOTpq0MCRcsP1XnCUAi
-mw713WVtSUebk4U7uA4GoOWCozu8VjNHDESBd/x/hxfi9uxL0kLcCdsA0UXCfTBU
-CJvY0uhTz3t9d6t5iNUebKsClLyU4xsFSNt9p1JCfqWTpRKq63igrI6rSryAdalQ
-e+Ppi7t7wb8TyLA+BKFovcO2VWCopWSYT7ACCQ7X+EoRHOZyE7MIt3EvGq9p9GEq
-Iove36DpQbiSUTgJYVmuTtT2Gr0EUzMsiW1OZoI9gQKBgQDigXVuutiNwJ2TBNHt
-5YOjGSEDs+WCVk2DJOgvqmiEoHUEwqW2u/6N2vSRErEWC4raFhQlIBD+MXugssMD
-vXJbwiVvXhm71v7IdnJzIysnEdRukbF0+sQW7eIBP/16xSJUbr+HZk1FBVdAgyvm
-Ogx/wpvwsVUWu4ND9gdAkXwnEQKBgQDRCrrAJeqbFpFtlj9844askBkCXqlCED4X
-HMjdNQVGhnFRjSsChJsoGN/DsRiE+9FA98dxaqSBvCf63wc4iWwAjWxVjFjuvmD+
-afJ+nPLBY0e8tz/ZJOzxcmLQNPae9CE9gEnD1nKz2H1eZlq45fE/Pno3TpkEtkwa
-97vLUxNkhQKBgAg2OVOyYneBLDVQT2wYjhUzrAa+VuvKxTSj+ecAfpmQV628gNWH
-K0tpTMSVsOXjtT0C3+gYqYUNtjW1RWy1SZgaCdFnz/cHbGVIJg4WkFHyS4lWruBW
-1xUdurvg3ge9bekxuq/l/ZcrAmbMWqMWJ63aGF05kKQqWC/2k3y7yYyBAoGAIClZ
-cCSlQrUnLMgX/nv3BWeqIV41Bk//bYjlMnts01vt5VEl095ZDMM+8hm2HwerOyak
-DcQNiVRMhmF39+/UqQUZLNRJ/nlV7O6Z+3bkNnKy38sFzL/MoJ0rrMLpSq1ey9qH
-/tRok1j0eOigfqAKDOPs48N48Wumq+N/hhnC+w0CgYAYGJwM7BFkRRVTog7p2mXp
-HzUEblHdX325Fve/xWhoMVmV5ZMHxsB26waWB/LJYdlpVBkByRUars7tvhThz4wg
-QK7aA1w8Q4cLFE0Ar5ZLaraMhfzYbRilH6yFBjCCcxkw2pE44vkSsFpbp4xWNFry
-g7puPDI4n+RZ8Qu193oGjw==
------END PRIVATE KEY-----
diff --git a/tests/Functional/Bundle/BenchmarkBundle/fixtures/public_test_key.pem b/tests/Functional/Bundle/BenchmarkBundle/fixtures/public_test_key.pem
deleted file mode 100644
index 3fa9397097d..00000000000
--- a/tests/Functional/Bundle/BenchmarkBundle/fixtures/public_test_key.pem
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuPUvKg7U6IP1sfRG55ro
-00+8zIZvERlfJVD+rEoNTmuIlHtcp2iK8xkWmZeq1fNM/OTNpnwV0H+YcytYkVOe
-EmqCsw9uuzgjhTh50SMNGcXFjnT8Wu4QJriaQI1xGL9s9PPmdCAug8aEVVjN7afI
-UVTK8krDOsGw+U6Dvw7i5RCH1Uj/eqXuGw6C0uUGN5m+Lck2BE7LYSa0GupN6fzm
-BZSVn6dApTg7CIHBFH5jfbbiz1cok90rJZHIbLM8r5anSWCMorzLWGro94qStFfL
-gsteXTzoWZRFm/79KTCIRsZFbf9x12060FZFP5hpn2X2O9A5w/MyFaFcAG+8fgXv
-1QIDAQAB
------END PUBLIC KEY-----
diff --git a/tests/Functional/Bundle/ContentTypeBundle/FieldResolver/MediaResolverTest.php b/tests/Functional/Bundle/ContentTypeBundle/FieldResolver/MediaResolverTest.php
index 5b93e7a9e29..201ced71ca9 100644
--- a/tests/Functional/Bundle/ContentTypeBundle/FieldResolver/MediaResolverTest.php
+++ b/tests/Functional/Bundle/ContentTypeBundle/FieldResolver/MediaResolverTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\ContentTypeBundle\FieldResolver;
diff --git a/tests/Functional/Bundle/ContentTypeBundle/FieldResolver/ProductResolverTest.php b/tests/Functional/Bundle/ContentTypeBundle/FieldResolver/ProductResolverTest.php
index 3db9621365c..ca8be417b6a 100644
--- a/tests/Functional/Bundle/ContentTypeBundle/FieldResolver/ProductResolverTest.php
+++ b/tests/Functional/Bundle/ContentTypeBundle/FieldResolver/ProductResolverTest.php
@@ -1,78 +1,78 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\ContentTypeBundle\FieldResolver;
 
-use PDO;
+use Doctrine\DBAL\Connection;
 use PHPUnit\Framework\TestCase;
 use Shopware\Bundle\ContentTypeBundle\Field\Shopware\ProductField;
 use Shopware\Bundle\ContentTypeBundle\Field\Shopware\ProductGrid;
-use Shopware\Bundle\ContentTypeBundle\FieldResolver\AbstractResolver;
 use Shopware\Bundle\ContentTypeBundle\FieldResolver\ProductResolver;
 use Shopware\Bundle\ContentTypeBundle\Structs\Field;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
 
 class ProductResolverTest extends TestCase
 {
-    /**
-     * @var AbstractResolver
-     */
-    private $service;
+    use ContainerTrait;
+
+    private ProductResolver $productResolver;
+
+    private Connection $connection;
 
-    /**
-     * @var Field
-     */
-    private $field;
+    private Field $field;
 
     protected function setUp(): void
     {
-        $this->service = Shopware()->Container()->get(ProductResolver::class);
+        $this->productResolver = $this->getContainer()->get(ProductResolver::class);
+        $this->connection = $this->getContainer()->get(Connection::class);
         $this->field = new Field();
         $this->field->setType(new ProductField());
     }
 
     public function testResolve(): void
     {
-        $id = Shopware()->Models()->getConnection()->fetchColumn('SELECT ordernumber from s_articles_details LIMIT 1');
+        $id = $this->connection->fetchOne('SELECT ordernumber FROM s_articles_details ORDER BY id LIMIT 1');
 
-        $this->service->add($id, $this->field);
-        $this->service->resolve();
+        $this->productResolver->add($id, $this->field);
+        $this->productResolver->resolve();
 
-        $product = $this->service->get($id, $this->field);
+        $product = $this->productResolver->get($id, $this->field);
         static::assertIsArray($product);
         static::assertEquals($id, $product['ordernumber']);
     }
 
     public function testMultiResolve(): void
     {
-        $idsArray = Shopware()->Models()->getConnection()->executeQuery('SELECT ordernumber from s_articles_details LIMIT 5')->fetchAll(PDO::FETCH_COLUMN);
+        $idsArray = $this->connection->executeQuery('SELECT ordernumber FROM s_articles_details ORDER BY id LIMIT 5')->fetchFirstColumn();
         $ids = implode('|', $idsArray);
         $this->field->setType(new ProductGrid());
 
-        $this->service->add($ids, $this->field);
-        $this->service->resolve();
+        $this->productResolver->add($ids, $this->field);
+        $this->productResolver->resolve();
 
-        $products = $this->service->get($ids, $this->field);
+        $products = $this->productResolver->get($ids, $this->field);
         static::assertCount(\count($idsArray), $products);
     }
 }
diff --git a/tests/Functional/Bundle/ContentTypeBundle/FieldResolver/ShopResolverTest.php b/tests/Functional/Bundle/ContentTypeBundle/FieldResolver/ShopResolverTest.php
index 44c04778529..44b077f6b1f 100644
--- a/tests/Functional/Bundle/ContentTypeBundle/FieldResolver/ShopResolverTest.php
+++ b/tests/Functional/Bundle/ContentTypeBundle/FieldResolver/ShopResolverTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\ContentTypeBundle\FieldResolver;
diff --git a/tests/Functional/Bundle/ContentTypeBundle/Services/AclSynchronizerTest.php b/tests/Functional/Bundle/ContentTypeBundle/Services/AclSynchronizerTest.php
index 685331b622b..06af75d91f2 100644
--- a/tests/Functional/Bundle/ContentTypeBundle/Services/AclSynchronizerTest.php
+++ b/tests/Functional/Bundle/ContentTypeBundle/Services/AclSynchronizerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\ContentTypeBundle\Services;
diff --git a/tests/Functional/Bundle/ContentTypeBundle/Services/ContentTypeCleanupServiceTest.php b/tests/Functional/Bundle/ContentTypeBundle/Services/ContentTypeCleanupServiceTest.php
index 470a3d805f2..433c5c33aec 100644
--- a/tests/Functional/Bundle/ContentTypeBundle/Services/ContentTypeCleanupServiceTest.php
+++ b/tests/Functional/Bundle/ContentTypeBundle/Services/ContentTypeCleanupServiceTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\ContentTypeBundle\Services;
diff --git a/tests/Functional/Bundle/ContentTypeBundle/Services/ExtjsBuilderTest.php b/tests/Functional/Bundle/ContentTypeBundle/Services/ExtjsBuilderTest.php
index d74bdef312b..1e2b6956f1e 100644
--- a/tests/Functional/Bundle/ContentTypeBundle/Services/ExtjsBuilderTest.php
+++ b/tests/Functional/Bundle/ContentTypeBundle/Services/ExtjsBuilderTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\ContentTypeBundle\Services;
diff --git a/tests/Functional/Bundle/ControllerBundle/ControllerActionTest.php b/tests/Functional/Bundle/ControllerBundle/ControllerActionTest.php
index 8a6aab17285..0e8a35c8cf9 100644
--- a/tests/Functional/Bundle/ControllerBundle/ControllerActionTest.php
+++ b/tests/Functional/Bundle/ControllerBundle/ControllerActionTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\ControllerBundle;
diff --git a/tests/Functional/Bundle/ControllerBundle/TestController/Test.php b/tests/Functional/Bundle/ControllerBundle/TestController/Test.php
index 34963d9aa27..c10f41c37fe 100644
--- a/tests/Functional/Bundle/ControllerBundle/TestController/Test.php
+++ b/tests/Functional/Bundle/ControllerBundle/TestController/Test.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\ControllerBundle\TestController;
diff --git a/tests/Functional/Bundle/ControllerBundle/TestService/FooBar.php b/tests/Functional/Bundle/ControllerBundle/TestService/FooBar.php
index 8b85b65f1ca..8655ef6ac71 100644
--- a/tests/Functional/Bundle/ControllerBundle/TestService/FooBar.php
+++ b/tests/Functional/Bundle/ControllerBundle/TestService/FooBar.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\ControllerBundle\TestService;
diff --git a/tests/Functional/Bundle/CookieBundle/Services/CookieCollectorTest.php b/tests/Functional/Bundle/CookieBundle/Services/CookieCollectorTest.php
index 34dd5f9b043..61d71a80d20 100644
--- a/tests/Functional/Bundle/CookieBundle/Services/CookieCollectorTest.php
+++ b/tests/Functional/Bundle/CookieBundle/Services/CookieCollectorTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CookieBundle\Services;
@@ -126,7 +125,7 @@ class ExampleTestSubscriber
     public static function addInvalidCookie(): CookieCollection
     {
         $cookieCollection = new CookieCollection();
-        $cookieCollection->add(new class() {
+        $cookieCollection->add(new class {
         });
 
         return $cookieCollection;
@@ -148,7 +147,7 @@ public static function addValidCookie(): CookieCollection
     public static function addInvalidCookieGroup(): CookieGroupCollection
     {
         $cookieGroupCollection = new CookieGroupCollection();
-        $cookieGroupCollection->add(new class() {
+        $cookieGroupCollection->add(new class {
         });
 
         return $cookieGroupCollection;
diff --git a/tests/Functional/Bundle/CookieBundle/Services/CookieHandlerTest.php b/tests/Functional/Bundle/CookieBundle/Services/CookieHandlerTest.php
index 0961abd1bd7..8637925ba76 100644
--- a/tests/Functional/Bundle/CookieBundle/Services/CookieHandlerTest.php
+++ b/tests/Functional/Bundle/CookieBundle/Services/CookieHandlerTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CookieBundle\Services;
diff --git a/tests/Functional/Bundle/CookieBundle/Services/CookieRemoveHandlerTest.php b/tests/Functional/Bundle/CookieBundle/Services/CookieRemoveHandlerTest.php
index 04043600da9..51d9d3e1dc7 100644
--- a/tests/Functional/Bundle/CookieBundle/Services/CookieRemoveHandlerTest.php
+++ b/tests/Functional/Bundle/CookieBundle/Services/CookieRemoveHandlerTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CookieBundle\Services;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AccountModeConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AccountModeConditionHandlerTest.php
index ab9fa2b4665..92376eeb923 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AccountModeConditionHandlerTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AccountModeConditionHandlerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AgeConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AgeConditionHandlerTest.php
index d96a29ad305..0e8bc025705 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AgeConditionHandlerTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/AgeConditionHandlerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/CustomerAttributeConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/CustomerAttributeConditionHandlerTest.php
index 41a92f87bfa..2ed132f46b5 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/CustomerAttributeConditionHandlerTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/CustomerAttributeConditionHandlerTest.php
@@ -1,29 +1,30 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
 
+use Shopware\Bundle\AttributeBundle\Service\CrudServiceInterface;
 use Shopware\Bundle\CustomerSearchBundle\Condition\CustomerAttributeCondition;
 use Shopware\Bundle\SearchBundle\ConditionInterface;
 use Shopware\Bundle\SearchBundle\Criteria;
@@ -34,7 +35,7 @@ class CustomerAttributeConditionHandlerTest extends TestCase
 {
     protected function setUp(): void
     {
-        $service = Shopware()->Container()->get(\Shopware\Bundle\AttributeBundle\Service\CrudServiceInterface::class);
+        $service = Shopware()->Container()->get(CrudServiceInterface::class);
         $service->update('s_user_attributes', 'test', 'integer');
         parent::setUp();
     }
@@ -42,18 +43,16 @@ protected function setUp(): void
     protected function tearDown(): void
     {
         parent::tearDown();
-        /** @var CrudService $service */
-        $service = Shopware()->Container()->get(\Shopware\Bundle\AttributeBundle\Service\CrudServiceInterface::class);
+        $service = Shopware()->Container()->get(CrudServiceInterface::class);
         $service->delete('s_user_attributes', 'test');
 
-        /** @var CacheManager $cache */
-        $cache = Shopware()->Container()->get(\Shopware\Components\CacheManager::class);
+        $cache = Shopware()->Container()->get(CacheManager::class);
 
         $cache->clearProxyCache();
         $cache->clearOpCache();
     }
 
-    public function testAttribute()
+    public function testAttribute(): void
     {
         $criteria = new Criteria();
         $criteria->addCondition(
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasAddressWithCountryConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasAddressWithCountryConditionHandlerTest.php
index 3fdaf1bc5b6..28731a95b37 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasAddressWithCountryConditionHandlerTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasAddressWithCountryConditionHandlerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasCanceledOrdersConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasCanceledOrdersConditionHandlerTest.php
index ce6f1129a0f..cb7e0bae802 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasCanceledOrdersConditionHandlerTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasCanceledOrdersConditionHandlerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNewsletterRegistrationConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNewsletterRegistrationConditionHandlerTest.php
index c15176f7f05..ba534d210eb 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNewsletterRegistrationConditionHandlerTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNewsletterRegistrationConditionHandlerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNoAddressWithCountryConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNoAddressWithCountryConditionHandlerTest.php
index c94f3f93a61..5a76142d5d5 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNoAddressWithCountryConditionHandlerTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNoAddressWithCountryConditionHandlerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNoCanceledOrdersConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNoCanceledOrdersConditionHandlerTest.php
index 62278aef9d1..23aff6bfcf9 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNoCanceledOrdersConditionHandlerTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNoCanceledOrdersConditionHandlerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNoNewsletterRegistrationConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNoNewsletterRegistrationConditionHandlerTest.php
index e1161ffb0de..da46d071213 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNoNewsletterRegistrationConditionHandlerTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasNoNewsletterRegistrationConditionHandlerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasOrderCountConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasOrderCountConditionHandlerTest.php
index 233e3b2fa31..c9d0cf39776 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasOrderCountConditionHandlerTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasOrderCountConditionHandlerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasTotalOrderAmountConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasTotalOrderAmountConditionHandlerTest.php
index 74acfe44dd4..ba80d31cbd3 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasTotalOrderAmountConditionHandlerTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/HasTotalOrderAmountConditionHandlerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/IsCustomerSinceConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/IsCustomerSinceConditionHandlerTest.php
index 26e199aa236..e67f7490acd 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/IsCustomerSinceConditionHandlerTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/IsCustomerSinceConditionHandlerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/IsInCustomerGroupConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/IsInCustomerGroupConditionHandlerTest.php
index 59ca27decbd..7e935ea41c2 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/IsInCustomerGroupConditionHandlerTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/IsInCustomerGroupConditionHandlerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/IsNotInCustomerGroupConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/IsNotInCustomerGroupConditionHandlerTest.php
index f605c5f1249..ea1574932fe 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/IsNotInCustomerGroupConditionHandlerTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/IsNotInCustomerGroupConditionHandlerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedInLastDaysConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedInLastDaysConditionHandlerTest.php
index b99af79a208..2f78d74f4c9 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedInLastDaysConditionHandlerTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedInLastDaysConditionHandlerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedInShopConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedInShopConditionHandlerTest.php
index b077d50af28..c3f3136171d 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedInShopConditionHandlerTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedInShopConditionHandlerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedProductConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedProductConditionHandlerTest.php
index 0a9d56bcfb0..04d9aa19ff6 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedProductConditionHandlerTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedProductConditionHandlerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedProductOfCategoryConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedProductOfCategoryConditionHandlerTest.php
index 164ef0ca2d9..4ea452d9efb 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedProductOfCategoryConditionHandlerTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedProductOfCategoryConditionHandlerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedProductOfManufacturerConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedProductOfManufacturerConditionHandlerTest.php
index ccf06bb3f53..d08b0c544e8 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedProductOfManufacturerConditionHandlerTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedProductOfManufacturerConditionHandlerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedWithDeliveryConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedWithDeliveryConditionHandlerTest.php
index dfad3f450ed..7d8d290fcf4 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedWithDeliveryConditionHandlerTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedWithDeliveryConditionHandlerTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedWithPaymentConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedWithPaymentConditionHandlerTest.php
index df878db7002..7fd46c078e0 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedWithPaymentConditionHandlerTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotOrderedWithPaymentConditionHandlerTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotRegisteredInShopConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotRegisteredInShopConditionHandlerTest.php
index 5920e64ddb0..d470a33413b 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotRegisteredInShopConditionHandlerTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotRegisteredInShopConditionHandlerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotSalutationConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotSalutationConditionHandlerTest.php
index ebf052d1586..0174b455132 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotSalutationConditionHandlerTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/NotSalutationConditionHandlerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedAtWeekdayConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedAtWeekdayConditionHandlerTest.php
index c52dd9d2533..a5ad531be89 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedAtWeekdayConditionHandlerTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedAtWeekdayConditionHandlerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedInLastDaysConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedInLastDaysConditionHandlerTest.php
index f4f9be76907..aed4d492cf3 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedInLastDaysConditionHandlerTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedInLastDaysConditionHandlerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedInShopConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedInShopConditionHandlerTest.php
index 194c1692a20..c7897877b78 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedInShopConditionHandlerTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedInShopConditionHandlerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedOnDeviceConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedOnDeviceConditionHandlerTest.php
index 30029cbdc74..d1d599aeb0d 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedOnDeviceConditionHandlerTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedOnDeviceConditionHandlerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedProductConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedProductConditionHandlerTest.php
index 701c931488e..91d0d26bd61 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedProductConditionHandlerTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedProductConditionHandlerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedProductOfCategoryConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedProductOfCategoryConditionHandlerTest.php
index 94949a71e4c..55332d562e4 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedProductOfCategoryConditionHandlerTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedProductOfCategoryConditionHandlerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedProductOfManufacturerConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedProductOfManufacturerConditionHandlerTest.php
index c385086204b..583615304e4 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedProductOfManufacturerConditionHandlerTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedProductOfManufacturerConditionHandlerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedWithDeliveryConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedWithDeliveryConditionHandlerTest.php
index 3f35ca96d3f..5f2f5e35471 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedWithDeliveryConditionHandlerTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedWithDeliveryConditionHandlerTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedWithPaymentConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedWithPaymentConditionHandlerTest.php
index 47f715124eb..199f135cc67 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedWithPaymentConditionHandlerTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/OrderedWithPaymentConditionHandlerTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/RegisteredInShopConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/RegisteredInShopConditionHandlerTest.php
index 7fe9998cfb8..231c7c83628 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/RegisteredInShopConditionHandlerTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/RegisteredInShopConditionHandlerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SalutationConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SalutationConditionHandlerTest.php
index b0bc6be8ac9..a6479081051 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SalutationConditionHandlerTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SalutationConditionHandlerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SearchTermConditionHandlerTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SearchTermConditionHandlerTest.php
index ee7f4610f01..a4b4dc378e8 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SearchTermConditionHandlerTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/ConditionHandler/SearchTermConditionHandlerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL\ConditionHandler;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/CustomerNumberSearchTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/CustomerNumberSearchTest.php
index b7046be24c9..4c6b0632e63 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/CustomerNumberSearchTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/CustomerNumberSearchTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL;
@@ -78,7 +78,7 @@ protected static function customerFromNumber(string $customerNumber = 'none'): a
     {
         return [
             'number' => $customerNumber,
-            'email' => sprintf('%s@example.com', $customerNumber),
+            'email' => \sprintf('%s@example.com', $customerNumber),
             'active' => true,
             'addresses' => array_map(static function ($id) {
                 return ['country_id' => $id];
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/HandlerRegistryTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/HandlerRegistryTest.php
index 4896582202a..7bbbb34a102 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/HandlerRegistryTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/HandlerRegistryTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL;
@@ -62,8 +62,7 @@ class HandlerRegistryTest extends TestCase
 {
     public function testCoreHandlersAreRegistered()
     {
-        /** @var HandlerRegistry $registry */
-        $registry = Shopware()->Container()->get(\Shopware\Bundle\CustomerSearchBundleDBAL\HandlerRegistry::class);
+        $registry = Shopware()->Container()->get(HandlerRegistry::class);
 
         $handlers = $registry->getConditionHandlers();
         $classes = [];
@@ -107,8 +106,7 @@ public function testCoreHandlersAreRegistered()
     public function testNoneSupportConditionThrowsException()
     {
         $this->expectException('RuntimeException');
-        /** @var HandlerRegistry $registry */
-        $registry = Shopware()->Container()->get(\Shopware\Bundle\CustomerSearchBundleDBAL\HandlerRegistry::class);
+        $registry = Shopware()->Container()->get(HandlerRegistry::class);
         $registry->getConditionHandler(new SimpleCondition('test'));
     }
 }
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/PaginationTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/PaginationTest.php
index 101b1726986..89a52b210b8 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/PaginationTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/PaginationTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/SearchResultTest.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/SearchResultTest.php
index e186b83c7e3..6d9203b0ce1 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/SearchResultTest.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/SearchResultTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL;
diff --git a/tests/Functional/Bundle/CustomerSearchBundleDBAL/TestCase.php b/tests/Functional/Bundle/CustomerSearchBundleDBAL/TestCase.php
index 415af0de3a6..f1dc5273a04 100644
--- a/tests/Functional/Bundle/CustomerSearchBundleDBAL/TestCase.php
+++ b/tests/Functional/Bundle/CustomerSearchBundleDBAL/TestCase.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\CustomerSearchBundleDBAL;
@@ -114,7 +114,7 @@ protected function createCustomer(array $customer)
             $customer['addresses'] = [['country_id' => 2]];
         }
 
-        $customerId = $this->insert('s_user', array_merge([
+        $customerData = array_merge([
             'firstname' => 'example',
             'lastname' => 'example',
             'customergroup' => 'EK',
@@ -123,22 +123,22 @@ protected function createCustomer(array $customer)
             'paymentpreset' => 1,
             'subshopID' => $customer['subshopID'] ?? 1000,
             'failedlogins' => 0,
-        ], $customer));
-
-        if (\array_key_exists('addresses', $customer)) {
-            foreach ($customer['addresses'] as $address) {
-                $address['user_id'] = $customerId;
-                $addressId = $this->insert('s_user_addresses', $address);
-
-                $this->connection->update(
-                    's_user',
-                    [
-                        'default_billing_address_id' => $addressId,
-                        'default_shipping_address_id' => $addressId,
-                    ],
-                    ['id' => $customerId]
-                );
-            }
+        ], $customer);
+        unset($customerData['addresses'], $customerData['orders'], $customerData['newsletter']);
+        $customerId = $this->insert('s_user', $customerData);
+
+        foreach ($customer['addresses'] as $address) {
+            $address['user_id'] = $customerId;
+            $addressId = $this->insert('s_user_addresses', $address);
+
+            $this->connection->update(
+                's_user',
+                [
+                    'default_billing_address_id' => $addressId,
+                    'default_shipping_address_id' => $addressId,
+                ],
+                ['id' => $customerId]
+            );
         }
 
         if (\array_key_exists('orders', $customer)) {
@@ -158,11 +158,9 @@ protected function createCustomer(array $customer)
                 $order['userID'] = $customerId;
                 $orderId = $this->insert('s_order', $order);
 
-                if (\array_key_exists('details', $order)) {
-                    foreach ($order['details'] as $detail) {
-                        $detail['orderID'] = $orderId;
-                        $this->insert('s_order_details', $detail);
-                    }
+                foreach ($order['details'] as $detail) {
+                    $detail['orderID'] = $orderId;
+                    $this->insert('s_order_details', $detail);
                 }
             }
         }
diff --git a/tests/Functional/Bundle/ESIndexingBundle/BacklogProcessorTest.php b/tests/Functional/Bundle/ESIndexingBundle/BacklogProcessorTest.php
index 39c6f55d395..03ea9f3877d 100644
--- a/tests/Functional/Bundle/ESIndexingBundle/BacklogProcessorTest.php
+++ b/tests/Functional/Bundle/ESIndexingBundle/BacklogProcessorTest.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\ESIndexingBundle;
@@ -45,25 +46,13 @@ class BacklogProcessorTest extends TestCase
 {
     use DatabaseTransactionBehaviour;
 
-    /**
-     * @var BacklogProcessorInterface
-     */
-    private $backlogProcessor;
+    private BacklogProcessorInterface $backlogProcessor;
 
-    /**
-     * @var BacklogReader
-     */
-    private $backlogReader;
+    private BacklogReader $backlogReader;
 
-    /**
-     * @var Connection
-     */
-    private $connection;
+    private Connection $connection;
 
-    /**
-     * @var ContainerAwareEventManager
-     */
-    private $eventManager;
+    private ContainerAwareEventManager $eventManager;
 
     public function setUp(): void
     {
@@ -83,18 +72,15 @@ public function testBacklogProcessorAdds(): void
 
         $backlog = $this->retrieveLatestBacklog();
 
-        static::assertNotNull($backlog);
         static::assertNotNull($backlog->getPayload());
         static::assertEquals($payloadId, $backlog->getPayload()['id']);
     }
 
     public function testBacklogProcessorProcesses(): void
     {
-        $synchronizers = new ArrayCollection([$this->mockProductSynchronizer()]);
-
         $processor = new BacklogProcessor(
             $this->connection,
-            $synchronizers,
+            new ArrayCollection([$this->mockProductSynchronizer()]),
             $this->eventManager
         );
 
diff --git a/tests/Functional/Bundle/ESIndexingBundle/CombinedConditionQueryBuilderTest.php b/tests/Functional/Bundle/ESIndexingBundle/CombinedConditionQueryBuilderTest.php
index c54508070ea..ec4cd98b4c1 100644
--- a/tests/Functional/Bundle/ESIndexingBundle/CombinedConditionQueryBuilderTest.php
+++ b/tests/Functional/Bundle/ESIndexingBundle/CombinedConditionQueryBuilderTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\ESIndexingBundle;
@@ -45,11 +45,12 @@ public function testCombinedConditionQueryBuilder(): void
         $shopContext = $this->createShopContext();
         $testCondition = new CategoryCondition([1]);
 
-        $query = $combinedConditionQueryBuilder->build([
-            $testCondition,
-        ],
-        new Criteria(),
-        $shopContext
+        $query = $combinedConditionQueryBuilder->build(
+            [
+                $testCondition,
+            ],
+            new Criteria(),
+            $shopContext
         );
 
         static::assertSame([
diff --git a/tests/Functional/Bundle/ESIndexingBundle/Commands/BacklogSyncCommandTest.php b/tests/Functional/Bundle/ESIndexingBundle/Commands/BacklogSyncCommandTest.php
new file mode 100644
index 00000000000..cbe44a027f2
--- /dev/null
+++ b/tests/Functional/Bundle/ESIndexingBundle/Commands/BacklogSyncCommandTest.php
@@ -0,0 +1,91 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Bundle\ESIndexingBundle\Commands;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Elasticsearch\Common\Exceptions\NoNodesAvailableException;
+use PHPUnit\Framework\TestCase;
+use Shopware\Bundle\ESIndexingBundle\BacklogProcessorInterface;
+use Shopware\Bundle\ESIndexingBundle\BacklogReaderInterface;
+use Shopware\Bundle\ESIndexingBundle\Commands\BacklogSyncCommand;
+use Shopware\Bundle\ESIndexingBundle\IdentifierSelector;
+use Shopware\Bundle\ESIndexingBundle\IndexFactory;
+use Shopware\Bundle\ESIndexingBundle\Product\ProductMapping;
+use Shopware\Bundle\ESIndexingBundle\Struct\Backlog;
+use Shopware\Bundle\ESIndexingBundle\Subscriber\ORMBacklogSubscriber;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
+use Symfony\Component\Console\Tester\CommandTester;
+
+class BacklogSyncCommandTest extends TestCase
+{
+    use DatabaseTransactionBehaviour;
+    use ContainerTrait;
+
+    public function testLastBacklogIdIsNotSetIfProcessingFails(): void
+    {
+        $command = $this->createCommand();
+        $commandTester = new CommandTester($command);
+
+        $this->expectException(NoNodesAvailableException::class);
+        $this->expectExceptionMessage('No alive nodes found in your cluster');
+        $commandTester->execute([]);
+    }
+
+    private function createCommand(): BacklogSyncCommand
+    {
+        $backlogReader = $this->createBacklogReader();
+
+        return new BacklogSyncCommand(
+            $this->getContainer()->getParameter('shopware.es.batchsize'),
+            new ArrayCollection([$this->getContainer()->get(ProductMapping::class)]),
+            $backlogReader,
+            $this->getContainer()->get(IdentifierSelector::class),
+            $this->getContainer()->get(IndexFactory::class),
+            $this->getContainer()->get(BacklogProcessorInterface::class)
+        );
+    }
+
+    private function createBacklogReader(): BacklogReaderInterface
+    {
+        $backlogReader = $this->createMock(BacklogReaderInterface::class);
+        $backlogReader->method('read')->willReturn(
+            [
+                new Backlog(
+                    ORMBacklogSubscriber::EVENT_SUPPLIER_DELETED,
+                    ['id' => 1]
+                ),
+                new Backlog(
+                    ORMBacklogSubscriber::EVENT_VARIANT_UPDATED,
+                    ['number' => 'SW10003']
+                ),
+            ]
+        );
+        $backlogReader->expects(static::never())->method('setLastBacklogId');
+
+        return $backlogReader;
+    }
+}
diff --git a/tests/Functional/Bundle/ESIndexingBundle/Commands/IndexPopulateCommandTest.php b/tests/Functional/Bundle/ESIndexingBundle/Commands/IndexPopulateCommandTest.php
index cc379fb9d22..192053258a5 100644
--- a/tests/Functional/Bundle/ESIndexingBundle/Commands/IndexPopulateCommandTest.php
+++ b/tests/Functional/Bundle/ESIndexingBundle/Commands/IndexPopulateCommandTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\ESIndexingBundle\Commands;
diff --git a/tests/Functional/Bundle/ESIndexingBundle/Product/ProductListingVariationLoaderTest.php b/tests/Functional/Bundle/ESIndexingBundle/Product/ProductListingVariationLoaderTest.php
index 2585c890c62..7be903ca01d 100644
--- a/tests/Functional/Bundle/ESIndexingBundle/Product/ProductListingVariationLoaderTest.php
+++ b/tests/Functional/Bundle/ESIndexingBundle/Product/ProductListingVariationLoaderTest.php
@@ -1,28 +1,26 @@
 <?php
 
 declare(strict_types=1);
-
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\ESIndexingBundle\Product;
@@ -35,14 +33,11 @@
 use Shopware\Models\Article\Detail;
 use Shopware\Models\Category\Category;
 use Shopware\Tests\Functional\Bundle\StoreFrontBundle\TestCase;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 
 class ProductListingVariationLoaderTest extends TestCase
 {
-    protected function tearDown(): void
-    {
-        $this->helper->cleanUp();
-        parent::tearDown();
-    }
+    use DatabaseTransactionBehaviour;
 
     public function testAvailabilityWithOne(): void
     {
@@ -92,7 +87,7 @@ public function testAvailabilityWithTwo(): void
 
         $groups = $this->getProductGroups($productData);
         $groupIds = array_keys($groups);
-        list($firstId, $secondId) = $groupIds;
+        [$firstId, $secondId] = $groupIds;
 
         $variantFacet = new VariantFacet([$firstId, $secondId]);
 
@@ -108,7 +103,7 @@ public function testAvailabilityWithTwo(): void
     protected function getProduct(
         string $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $additionally = null
     ): array {
         $product = parent::getProduct($number, $context, $category);
diff --git a/tests/Functional/Bundle/ESIndexingBundle/Property/PropertyQueryFactoryTest.php b/tests/Functional/Bundle/ESIndexingBundle/Property/PropertyQueryFactoryTest.php
index 97233cc9e68..90839947d36 100644
--- a/tests/Functional/Bundle/ESIndexingBundle/Property/PropertyQueryFactoryTest.php
+++ b/tests/Functional/Bundle/ESIndexingBundle/Property/PropertyQueryFactoryTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\ESIndexingBundle\Property;
diff --git a/tests/Functional/Bundle/ESIndexingBundle/Subscriber/ORMBacklogSubscriberTest.php b/tests/Functional/Bundle/ESIndexingBundle/Subscriber/ORMBacklogSubscriberTest.php
index 5ddabd124e2..5fe3f21df90 100644
--- a/tests/Functional/Bundle/ESIndexingBundle/Subscriber/ORMBacklogSubscriberTest.php
+++ b/tests/Functional/Bundle/ESIndexingBundle/Subscriber/ORMBacklogSubscriberTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\ESIndexingBundle\Subscriber;
@@ -89,7 +89,7 @@ public function testORMSubscriberAddsBacklogOnProductUpdate(): void
     {
         $testProduct = $this->createDummyProduct();
 
-        $testProduct->setName(sprintf('%s Update', $testProduct->getName()));
+        $testProduct->setName(\sprintf('%s Update', $testProduct->getName()));
         $this->modelManager->persist($testProduct);
         $this->modelManager->flush();
 
diff --git a/tests/Functional/Bundle/ESIndexingBundle/TextMapping/TextMappingTest.php b/tests/Functional/Bundle/ESIndexingBundle/TextMapping/TextMappingTest.php
index 7f221216d2b..c7ecb97a23f 100644
--- a/tests/Functional/Bundle/ESIndexingBundle/TextMapping/TextMappingTest.php
+++ b/tests/Functional/Bundle/ESIndexingBundle/TextMapping/TextMappingTest.php
@@ -1,30 +1,33 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\ESIndexingBundle\TextMapping;
 
 use Doctrine\DBAL\Connection;
+use Elasticsearch\Client;
+use Shopware\Bundle\ESIndexingBundle\IndexFactory;
 use Shopware\Bundle\ESIndexingBundle\Product\ProductMapping;
 use Shopware\Bundle\StoreFrontBundle\Struct\ShopContext;
 use Shopware\Models\Category\Category;
@@ -35,14 +38,11 @@
  */
 class TextMappingTest extends TestCase
 {
-    /**
-     * @var Connection
-     */
-    private $connection;
+    private Connection $connection;
 
     protected function setUp(): void
     {
-        $this->connection = Shopware()->Container()->get(\Doctrine\DBAL\Connection::class);
+        $this->connection = Shopware()->Container()->get(Connection::class);
         $this->connection->beginTransaction();
 
         parent::setUp();
@@ -55,24 +55,24 @@ public function tearDown(): void
         parent::tearDown();
     }
 
-    public function testKeywordsIsQueryAble()
+    public function testKeywordsIsQueryAble(): void
     {
         $context = $this->getContext();
         $category = $this->helper->createCategory();
 
         $products = $this->createProducts(['test9999' => []], $context, $category);
+        $productNumber = key($products);
+        static::assertIsString($productNumber);
 
-        $this->helper->updateArticle(key($products), ['mainDetail' => [
+        $this->helper->updateProduct($productNumber, ['mainDetail' => [
             'ean' => 444,
-            ],
-        ]);
+        ]]);
 
-        $client = Shopware()->Container()->get(\Elasticsearch\Client::class);
-        $indexFactory = Shopware()->Container()->get(\Shopware\Bundle\ESIndexingBundle\IndexFactory::class);
+        $client = Shopware()->Container()->get(Client::class);
+        $indexFactory = Shopware()->Container()->get(IndexFactory::class);
 
         $this->helper->refreshSearchIndexes($context->getShop());
 
-        /** @var string $version */
         $version = Shopware()->Container()->getParameter('shopware.es.version');
 
         $arguments = [
@@ -101,9 +101,6 @@ public function testKeywordsIsQueryAble()
         static::assertEquals('test9999', $response['hits']['hits'][0]['_id']);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function createProducts(array $products, ShopContext $context, Category $category): array
     {
         $createdProducts = parent::createProducts($products, $context, $category);
diff --git a/tests/Functional/Bundle/EmotionBundle/ComponentHandler/ContentTypeComponentHandlerTest.php b/tests/Functional/Bundle/EmotionBundle/ComponentHandler/ContentTypeComponentHandlerTest.php
index 2f82657dab1..4041ef6d93f 100644
--- a/tests/Functional/Bundle/EmotionBundle/ComponentHandler/ContentTypeComponentHandlerTest.php
+++ b/tests/Functional/Bundle/EmotionBundle/ComponentHandler/ContentTypeComponentHandlerTest.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\EmotionBundle\ComponentHandler;
@@ -47,7 +48,7 @@ public function setUp(): void
         static::assertFalse($this->getContainer()->has('shopware.bundle.content_type.testcontent'));
         $fixtures = file_get_contents(__DIR__ . '/fixtures/fixtures.sql');
         static::assertIsString($fixtures);
-        $this->getContainer()->get(Connection::class)->exec($fixtures);
+        $this->getContainer()->get(Connection::class)->executeStatement($fixtures);
         KernelStorage::unset();
         static::assertTrue($this->getContainer()->has('shopware.bundle.content_type.testcontent'));
     }
@@ -56,20 +57,21 @@ public function tearDown(): void
     {
         parent::tearDown();
 
-        static::assertTrue($this->getContainer()->has('shopware.bundle.content_type.testcontent'));
+        $firstCheck = $this->getContainer()->has('shopware.bundle.content_type.testcontent');
+        static::assertTrue($firstCheck);
         $fixtures = file_get_contents(__DIR__ . '/fixtures/cleanUp.sql');
         static::assertIsString($fixtures);
-        $this->getContainer()->get(Connection::class)->exec($fixtures);
+        $this->getContainer()->get(Connection::class)->executeStatement($fixtures);
         KernelStorage::unset();
-        static::assertFalse($this->getContainer()->has('shopware.bundle.content_type.testcontent'));
+        $secondCheck = $this->getContainer()->has('shopware.bundle.content_type.testcontent');
+        static::assertFalse($secondCheck);
     }
 
     public function testLoadAllSelectedContent(): void
     {
         $contentTypeComponentHandler = $this->getContainer()->get(ContentTypeComponentHandler::class);
 
-        $resolvedDataCollection = new ResolvedDataCollection();
-        $resolvedDataCollection->setBatchResult(new BatchProductSearchResult([]));
+        $resolvedDataCollection = $this->createDataCollection();
         $elementConfig = new ElementConfig();
         $elementConfig->set(ContentTypeComponentHandler::CONTENT_TYPE_KEY, 'testcontent');
         $elementConfig->set(ContentTypeComponentHandler::MODE_KEY, ContentTypeComponentHandler::MODE_SELECTED);
@@ -83,4 +85,25 @@ public function testLoadAllSelectedContent(): void
 
         static::assertCount(6, $element->getData()->get(ContentTypeComponentHandler::ITEMS_KEY));
     }
+
+    public function testHandleDoesNotFailIfElementHasNoContentTypeDefined(): void
+    {
+        $contentTypeComponentHandler = $this->getContainer()->get(ContentTypeComponentHandler::class);
+        $resolvedDataCollection = $this->createDataCollection();
+
+        $elementConfig = new ElementConfig();
+        $element = new Element();
+        $element->setConfig($elementConfig);
+        $shopContext = $this->createShopContext();
+
+        $contentTypeComponentHandler->handle($resolvedDataCollection, $element, $shopContext);
+    }
+
+    private function createDataCollection(): ResolvedDataCollection
+    {
+        $resolvedDataCollection = new ResolvedDataCollection();
+        $resolvedDataCollection->setBatchResult(new BatchProductSearchResult([]));
+
+        return $resolvedDataCollection;
+    }
 }
diff --git a/tests/Functional/Bundle/EmotionBundle/ComponentHandler/EventComponentHandlerTest.php b/tests/Functional/Bundle/EmotionBundle/ComponentHandler/EventComponentHandlerTest.php
index da09922a2f6..02e0caec351 100644
--- a/tests/Functional/Bundle/EmotionBundle/ComponentHandler/EventComponentHandlerTest.php
+++ b/tests/Functional/Bundle/EmotionBundle/ComponentHandler/EventComponentHandlerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\EmotionBundle\ComponentHandler;
diff --git a/tests/Functional/Bundle/EmotionBundle/ComponentHandler/ProductSliderComponentHandlerTest.php b/tests/Functional/Bundle/EmotionBundle/ComponentHandler/ProductSliderComponentHandlerTest.php
index 0cbbd7abaa8..30c5391f6c6 100644
--- a/tests/Functional/Bundle/EmotionBundle/ComponentHandler/ProductSliderComponentHandlerTest.php
+++ b/tests/Functional/Bundle/EmotionBundle/ComponentHandler/ProductSliderComponentHandlerTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\EmotionBundle\ComponentHandler;
diff --git a/tests/Functional/Bundle/EsBackendBundle/BacklogTest.php b/tests/Functional/Bundle/EsBackendBundle/BacklogTest.php
index 616a002d450..2d2bbd89aaf 100644
--- a/tests/Functional/Bundle/EsBackendBundle/BacklogTest.php
+++ b/tests/Functional/Bundle/EsBackendBundle/BacklogTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\EsBackendBundle;
diff --git a/tests/Functional/Bundle/EsBackendBundle/Customer/CustomerIndexingTest.php b/tests/Functional/Bundle/EsBackendBundle/Customer/CustomerIndexingTest.php
new file mode 100644
index 00000000000..58fd2293434
--- /dev/null
+++ b/tests/Functional/Bundle/EsBackendBundle/Customer/CustomerIndexingTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Bundle\EsBackendBundle\Customer;
+
+use Doctrine\DBAL\Connection;
+use Elasticsearch\Client;
+use Enlight_Components_Test_TestCase;
+use Shopware\Tests\Functional\Bundle\StoreFrontBundle\Helper\ProgressHelper;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
+
+/**
+ * @group elasticSearch
+ */
+class CustomerIndexingTest extends Enlight_Components_Test_TestCase
+{
+    use ContainerTrait;
+    use DatabaseTransactionBehaviour;
+
+    public function testCanIndexCustomerWithBirthday(): void
+    {
+        $fixtures = file_get_contents(__DIR__ . '/fixtures/customer.sql');
+        static::assertIsString($fixtures);
+        $this->getContainer()->get(Connection::class)->exec($fixtures);
+
+        $indexer = $this->getContainer()->get('shopware_es_backend.indexer');
+        $indexer->cleanupIndices();
+        $indexer->index(new ProgressHelper());
+
+        $client = $this->getContainer()->get(Client::class);
+
+        static::assertGreaterThanOrEqual(3, $client->count([
+            'index' => 'sw_shop_backend_index_customer',
+        ]));
+    }
+}
diff --git a/tests/Functional/Bundle/EsBackendBundle/Customer/fixtures/customer.sql b/tests/Functional/Bundle/EsBackendBundle/Customer/fixtures/customer.sql
new file mode 100644
index 00000000000..bfa9516b470
--- /dev/null
+++ b/tests/Functional/Bundle/EsBackendBundle/Customer/fixtures/customer.sql
@@ -0,0 +1,2 @@
+INSERT INTO s_user (password, encoder, email, active, accountmode, confirmationkey, paymentID, doubleOptinRegister, doubleOptinEmailSentDate, doubleOptinConfirmDate, firstlogin, lastlogin, sessionID, newsletter, validation, affiliate, customergroup, paymentpreset, language, subshopID, referer, pricegroupID, internalcomment, failedlogins, lockeduntil, default_billing_address_id, default_shipping_address_id, title, salutation, firstname, lastname, birthday, customernumber, login_token, changed, password_change_date, register_opt_in_id) VALUES
+('a256a310bc1e5db755fd392c524028a8', 'md5', 'birthdayChild@example.com', 1, 0, '', 5, 0, null, null, '2011-11-23', '2012-01-04 14:12:05', 'uiorqd755gaar8dn89ukp178c7', 0, '0', 0, 'EK', 0, '1', 1, '', null, '', 0, null, 1, 3, '', 'mr', 'Max', 'Mustermann', '2022-08-09', '20001', null, '2022-08-09 14:49:34', '2022-08-09 12:42:17', null);
diff --git a/tests/Functional/Bundle/MailBundle/LogEntryBuilderTest.php b/tests/Functional/Bundle/MailBundle/LogEntryBuilderTest.php
index 9b56565f9a1..f642fdbebd1 100644
--- a/tests/Functional/Bundle/MailBundle/LogEntryBuilderTest.php
+++ b/tests/Functional/Bundle/MailBundle/LogEntryBuilderTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\MailBundle;
diff --git a/tests/Functional/Bundle/MailBundle/LogEntryMailBuilderTest.php b/tests/Functional/Bundle/MailBundle/LogEntryMailBuilderTest.php
index bac8d4c54f3..cc3a38a9d99 100644
--- a/tests/Functional/Bundle/MailBundle/LogEntryMailBuilderTest.php
+++ b/tests/Functional/Bundle/MailBundle/LogEntryMailBuilderTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\MailBundle;
@@ -53,7 +52,8 @@ protected function setUp(): void
         $this->entryBuilder = new LogEntryBuilder($this->getContainer()->get(ModelManager::class));
         $this->mailBuilder = new LogEntryMailBuilder(
             $this->getContainer()->get('shopware.filesystem.private'),
-            $this->getContainer()->get(MediaServiceInterface::class)
+            $this->getContainer()->get(MediaServiceInterface::class),
+            $this->getContainer()->get('mail')
         );
     }
 
@@ -64,7 +64,6 @@ public function testBuild(): void
         $entry = $this->entryBuilder->build($mail);
         $built = $this->mailBuilder->build($entry);
 
-        static::assertNotNull($built);
         static::assertSame($mail->getFrom(), $built->getFrom());
         static::assertCount(\count($mail->getTo()), $built->getTo());
 
diff --git a/tests/Functional/Bundle/MailBundle/LogRepositoryTest.php b/tests/Functional/Bundle/MailBundle/LogRepositoryTest.php
index 8b56751393b..587749d9f3f 100644
--- a/tests/Functional/Bundle/MailBundle/LogRepositoryTest.php
+++ b/tests/Functional/Bundle/MailBundle/LogRepositoryTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\MailBundle;
@@ -74,7 +73,7 @@ protected function setUp(): void
         $this->builder = new LogEntryBuilder($this->entityManager);
         $this->repository = $this->entityManager->getRepository(Log::class);
 
-        $oneDay = new DateInterval(sprintf('P%dD', 1));
+        $oneDay = new DateInterval(\sprintf('P%dD', 1));
         $this->pastDate = new DateTime(self::PAST_DATE);
         $this->pastDatePlusOneDay = (new DateTime(self::PAST_DATE))->add($oneDay);
         $this->currentDate = new DateTime('now');
@@ -126,21 +125,20 @@ public function testDeleteByDate(): void
      * upper case/lower case, do not lead to problems when they're persisted.
      *
      * This is a regression test for SW-24564.
-     *
-     * @doesNotPerformAssertions
      */
     public function testUniqueConstraintIsCaseSensitive(): void
     {
         $firstMail = $this->createSimpleMail();
         $secondMail = new Enlight_Components_Mail('UTF-8');
 
+        static::assertIsString($firstMail->getSubject());
         $secondMail->setSubject($firstMail->getSubject());
         $secondMail->setFrom(ucfirst($firstMail->getFrom()));
         $secondMail->setBodyText($firstMail->getBodyText()->getRawContent());
 
         // Try to create log entries with addresses the MySQL UNIQUE-constraint would treat as equal.
-        $secondMail->addTo(sprintf('%s ', $firstMail->getRecipients()[0]));
-        $secondMail->addTo(sprintf('    %s     ', $firstMail->getRecipients()[0]));
+        $secondMail->addTo(\sprintf('%s ', $firstMail->getRecipients()[0]));
+        $secondMail->addTo(\sprintf('    %s     ', $firstMail->getRecipients()[0]));
         $secondMail->addTo(ucfirst($firstMail->getRecipients()[0]));
 
         $first = $this->builder->build($firstMail);
diff --git a/tests/Functional/Bundle/MailBundle/LogServiceTest.php b/tests/Functional/Bundle/MailBundle/LogServiceTest.php
index 88b1637f4c5..fa46ad25cf6 100644
--- a/tests/Functional/Bundle/MailBundle/LogServiceTest.php
+++ b/tests/Functional/Bundle/MailBundle/LogServiceTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\MailBundle;
diff --git a/tests/Functional/Bundle/MailBundle/MailBundleTestTrait.php b/tests/Functional/Bundle/MailBundle/MailBundleTestTrait.php
index 23d505bd325..b6e92d38323 100644
--- a/tests/Functional/Bundle/MailBundle/MailBundleTestTrait.php
+++ b/tests/Functional/Bundle/MailBundle/MailBundleTestTrait.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\MailBundle;
@@ -40,7 +39,7 @@ public function createSimpleMail(): Enlight_Components_Mail
         $contentText = 'Lorem ipsum dolor sit amet.';
 
         for ($i = 0; $i < 3; ++$i) {
-            $recipients[] = sprintf('test-%d@example.com', $i);
+            $recipients[] = \sprintf('test-%d@example.com', $i);
         }
 
         $mail->setSubject($subject);
diff --git a/tests/Functional/Bundle/MediaBundle/FilesystemTest.php b/tests/Functional/Bundle/MediaBundle/FilesystemTest.php
index f349aa14871..e09abee8410 100644
--- a/tests/Functional/Bundle/MediaBundle/FilesystemTest.php
+++ b/tests/Functional/Bundle/MediaBundle/FilesystemTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\MediaBundle;
diff --git a/tests/Functional/Bundle/MediaBundle/GarbageCollectorFactoryTest.php b/tests/Functional/Bundle/MediaBundle/GarbageCollectorFactoryTest.php
index eaa1ae7d386..6f728ec3933 100644
--- a/tests/Functional/Bundle/MediaBundle/GarbageCollectorFactoryTest.php
+++ b/tests/Functional/Bundle/MediaBundle/GarbageCollectorFactoryTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\MediaBundle;
diff --git a/tests/Functional/Bundle/MediaBundle/MediaReplaceServiceTest.php b/tests/Functional/Bundle/MediaBundle/MediaReplaceServiceTest.php
index 4de2683fa98..9a597277e40 100644
--- a/tests/Functional/Bundle/MediaBundle/MediaReplaceServiceTest.php
+++ b/tests/Functional/Bundle/MediaBundle/MediaReplaceServiceTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\MediaBundle;
diff --git a/tests/Functional/Bundle/OrderBundle/OrderListProductService.php b/tests/Functional/Bundle/OrderBundle/OrderListProductService.php
index fa8f0451c2b..73b0a9dfe84 100644
--- a/tests/Functional/Bundle/OrderBundle/OrderListProductService.php
+++ b/tests/Functional/Bundle/OrderBundle/OrderListProductService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\OrderBundle;
diff --git a/tests/Functional/Bundle/OrderBundle/StockServiceTest.php b/tests/Functional/Bundle/OrderBundle/StockServiceTest.php
index 24fc50c0b03..40f5e9d097e 100644
--- a/tests/Functional/Bundle/OrderBundle/StockServiceTest.php
+++ b/tests/Functional/Bundle/OrderBundle/StockServiceTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\OrderBundle;
diff --git a/tests/Functional/Bundle/PluginInstallerBundle/Fixture/MyPlugin/MyPlugin.php b/tests/Functional/Bundle/PluginInstallerBundle/Fixture/MyPlugin/MyPlugin.php
index 7f04f2f24be..7e3b1db5198 100644
--- a/tests/Functional/Bundle/PluginInstallerBundle/Fixture/MyPlugin/MyPlugin.php
+++ b/tests/Functional/Bundle/PluginInstallerBundle/Fixture/MyPlugin/MyPlugin.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\PluginInstallerBundle\Fixture\MyPlugin;
diff --git a/tests/Functional/Bundle/PluginInstallerBundle/Service/PluginInstallerTest.php b/tests/Functional/Bundle/PluginInstallerBundle/Service/PluginInstallerTest.php
index efce936d31b..f15f14dbfdb 100644
--- a/tests/Functional/Bundle/PluginInstallerBundle/Service/PluginInstallerTest.php
+++ b/tests/Functional/Bundle/PluginInstallerBundle/Service/PluginInstallerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\PluginInstallerBundle\Service;
diff --git a/tests/Functional/Bundle/PluginInstallerBundle/Service/PluginLocalServiceTest.php b/tests/Functional/Bundle/PluginInstallerBundle/Service/PluginLocalServiceTest.php
index cad37971322..96e0ac0222d 100644
--- a/tests/Functional/Bundle/PluginInstallerBundle/Service/PluginLocalServiceTest.php
+++ b/tests/Functional/Bundle/PluginInstallerBundle/Service/PluginLocalServiceTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\PluginInstallerBundle\Service;
diff --git a/tests/Functional/Bundle/PluginInstallerBundle/Service/SubscriptionServiceTest.php b/tests/Functional/Bundle/PluginInstallerBundle/Service/SubscriptionServiceTest.php
index 363d044a749..1d1394db1fb 100644
--- a/tests/Functional/Bundle/PluginInstallerBundle/Service/SubscriptionServiceTest.php
+++ b/tests/Functional/Bundle/PluginInstallerBundle/Service/SubscriptionServiceTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\PluginInstallerBundle\Service;
diff --git a/tests/Functional/Bundle/PluginInstallerBundle/Service/UniqueIdGeneratorTest.php b/tests/Functional/Bundle/PluginInstallerBundle/Service/UniqueIdGeneratorTest.php
index 686e19b5613..41ac1e9245a 100644
--- a/tests/Functional/Bundle/PluginInstallerBundle/Service/UniqueIdGeneratorTest.php
+++ b/tests/Functional/Bundle/PluginInstallerBundle/Service/UniqueIdGeneratorTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\PluginInstallerBundle\Service;
diff --git a/tests/Functional/Bundle/SearchBundle/BatchProductNumberSearchTest.php b/tests/Functional/Bundle/SearchBundle/BatchProductNumberSearchTest.php
index f74ec8e9708..c3883a02652 100644
--- a/tests/Functional/Bundle/SearchBundle/BatchProductNumberSearchTest.php
+++ b/tests/Functional/Bundle/SearchBundle/BatchProductNumberSearchTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle;
@@ -271,7 +270,7 @@ public function testNonMatchingConditionShouldReturnEmptyArray(): void
     private function assertProductNumbersExists(array $result, array $numbers): void
     {
         array_walk($numbers, function ($number) use ($result) {
-            static::assertArrayHasKey($number, $result, sprintf('Expected "%s" to be in [%s]', $number, implode(', ', array_keys($result))));
+            static::assertArrayHasKey($number, $result, \sprintf('Expected "%s" to be in [%s]', $number, implode(', ', array_keys($result))));
             static::assertSame($number, $result[$number]->getNumber());
         });
     }
diff --git a/tests/Functional/Bundle/SearchBundle/BatchProductSearchTest.php b/tests/Functional/Bundle/SearchBundle/BatchProductSearchTest.php
index 3f36f8d119f..49594a5f7e1 100644
--- a/tests/Functional/Bundle/SearchBundle/BatchProductSearchTest.php
+++ b/tests/Functional/Bundle/SearchBundle/BatchProductSearchTest.php
@@ -5,28 +5,26 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle;
 
-use Doctrine\DBAL\Driver\Connection;
 use Shopware\Bundle\SearchBundle\BatchProductNumberSearchRequest;
 use Shopware\Bundle\SearchBundle\BatchProductSearch;
 use Shopware\Bundle\SearchBundle\Condition\CategoryCondition;
@@ -47,27 +45,13 @@ class BatchProductSearchTest extends TestCase
      */
     private $batchProductSearch;
 
-    /**
-     * @var Connection
-     */
-    private $connection;
-
     protected function setUp(): void
     {
-        $this->connection = Shopware()->Container()->get(\Doctrine\DBAL\Connection::class);
-        $this->connection->beginTransaction();
         $this->batchProductSearch = Shopware()->Container()->get(BatchProductSearch::class);
 
         parent::setUp();
     }
 
-    public function tearDown(): void
-    {
-        $this->connection->rollBack();
-
-        parent::tearDown();
-    }
-
     public function createProducts(array $products, ShopContext $context, Category $category): array
     {
         $articles = parent::createProducts($products, $context, $category);
@@ -81,15 +65,16 @@ public function testWithNumericArticleNumbers(): void
     {
         $context = $this->getContext();
         $category = $this->helper->createCategory();
-        $this->createProducts(['SW10002' => [], 'SW10001' => []], $context, $category);
+
+        $this->createProducts(['ES10002' => [], 'ES10003' => []], $context, $category);
 
         $request = new BatchProductNumberSearchRequest();
-        $request->setProductNumbers('test-1', ['SW10002', 'SW10001']);
+        $request->setProductNumbers('test-1', ['ES10002', 'ES10003']);
 
         $result = $this->batchProductSearch->search($request, $context);
 
-        static::assertArrayHasKey('SW10002', $result->get('test-1'));
-        static::assertArrayHasKey('SW10001', $result->get('test-1'));
+        static::assertArrayHasKey('ES10002', $result->get('test-1'));
+        static::assertArrayHasKey('ES10003', $result->get('test-1'));
     }
 
     public function testWithLessProductsThanRequested(): void
@@ -154,7 +139,7 @@ public function testWithLessProductsThanRequested(): void
     private function assertProductNumbersExists(array $result, array $numbers): void
     {
         array_walk($numbers, function ($number) use ($result) {
-            static::assertArrayHasKey($number, $result, sprintf('Expected "%s" to be in [%s]', $number, implode(', ', array_keys($result))));
+            static::assertArrayHasKey($number, $result, \sprintf('Expected "%s" to be in [%s]', $number, implode(', ', array_keys($result))));
             static::assertNotNull($result[$number]);
             static::assertSame($number, $result[$number]->getNumber());
         });
diff --git a/tests/Functional/Bundle/SearchBundle/Condition/CategoryConditionTest.php b/tests/Functional/Bundle/SearchBundle/Condition/CategoryConditionTest.php
index 2197681aacf..efc3faa607d 100644
--- a/tests/Functional/Bundle/SearchBundle/Condition/CategoryConditionTest.php
+++ b/tests/Functional/Bundle/SearchBundle/Condition/CategoryConditionTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle\Condition;
@@ -81,7 +80,7 @@ public function testConditionCounter(): void
     protected function getProduct(
         string $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $additionally = null
     ): array {
         if ($additionally !== null) {
diff --git a/tests/Functional/Bundle/SearchBundle/Condition/CustomerGroupConditionTest.php b/tests/Functional/Bundle/SearchBundle/Condition/CustomerGroupConditionTest.php
index 0204b5ee3e9..8527bea3870 100644
--- a/tests/Functional/Bundle/SearchBundle/Condition/CustomerGroupConditionTest.php
+++ b/tests/Functional/Bundle/SearchBundle/Condition/CustomerGroupConditionTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle\Condition;
@@ -82,7 +81,7 @@ public function testMultipleCustomerGroups(): void
     protected function getProduct(
         string $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $customerGroups = null
     ): array {
         $product = parent::getProduct($number, $context, $category);
diff --git a/tests/Functional/Bundle/SearchBundle/Condition/HasPseudoPriceConditionCustomerGroupTest.php b/tests/Functional/Bundle/SearchBundle/Condition/HasPseudoPriceConditionCustomerGroupTest.php
new file mode 100644
index 00000000000..e8e1202f12b
--- /dev/null
+++ b/tests/Functional/Bundle/SearchBundle/Condition/HasPseudoPriceConditionCustomerGroupTest.php
@@ -0,0 +1,318 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Bundle\SearchBundle\Condition;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Exception;
+use Generator;
+use Shopware\Bundle\SearchBundle\Condition\HasPseudoPriceCondition;
+use Shopware\Bundle\SearchBundle\Condition\VariantCondition;
+use Shopware\Bundle\StoreFrontBundle\Struct\ShopContext;
+use Shopware\Models\Article\Configurator\Group;
+use Shopware\Models\Category\Category;
+use Shopware\Tests\Functional\Bundle\StoreFrontBundle\Converter;
+use Shopware\Tests\Functional\Bundle\StoreFrontBundle\Helper;
+use Shopware\Tests\Functional\Bundle\StoreFrontBundle\TestCase;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
+
+class HasPseudoPriceConditionCustomerGroupTest extends TestCase
+{
+    use DatabaseTransactionBehaviour;
+
+    private const PRODUCT_NUMBER = 'A';
+
+    private const CURRENT_CUSTOMER_GROUP = 'PHP';
+    private const FALLBACK_CUSTOMER_GROUP = 'EK';
+
+    protected Helper $helper;
+
+    protected Converter $converter;
+
+    /**
+     * @var Group[]
+     */
+    private array $groups = [];
+
+    protected function setUp(): void
+    {
+        $this->helper = new Helper($this->getContainer());
+        parent::setUp();
+    }
+
+    /**
+     * @dataProvider getCustomerGroupPseudoPrices
+     *
+     * @param array<self::PRODUCT_NUMBER> $expectedNumber
+     */
+    public function testPseudoPriceOnlyAvailableForSpecificCustomerGroup(
+        bool $hasCurrentCustomerGroupPseudoPrice,
+        bool $hasFallbackCustomerGroupPseudoPrice,
+        array $expectedNumber
+    ): void {
+        $context = $this->getContext();
+        $fallbackCustomerGroup = $this->converter->convertCustomerGroup($this->helper->createCustomerGroup(['key' => self::FALLBACK_CUSTOMER_GROUP]));
+        $context->setFallbackCustomerGroup($fallbackCustomerGroup);
+        $this->search(
+            [
+                self::PRODUCT_NUMBER => compact('hasCurrentCustomerGroupPseudoPrice', 'hasFallbackCustomerGroupPseudoPrice'),
+            ],
+            $expectedNumber,
+            null,
+            [new HasPseudoPriceCondition()],
+            [],
+            [],
+            $context
+        );
+    }
+
+    public function getCustomerGroupPseudoPrices(): Generator
+    {
+        yield 'No customer group has pseudo price' => [
+            false,
+            false,
+            [],
+        ];
+        yield 'Only current customer group has pseudo price' => [
+            true,
+            false,
+            [self::PRODUCT_NUMBER],
+        ];
+        yield 'Only fallback customer group has pseudo price' => [
+            false,
+            true,
+            [],
+        ];
+        yield 'Current and fallback customer groups have pseudo price' => [
+            true,
+            true,
+            [self::PRODUCT_NUMBER],
+        ];
+    }
+
+    /**
+     * @dataProvider getCustomerGroupPseudoPricesWithVariants
+     *
+     * @param array<self::PRODUCT_NUMBER> $expectedNumber
+     * @param array<string>               $expectedNumber
+     */
+    public function testPseudoPriceOnlyAvailableForSpecificCustomerGroupWithVariants(
+        bool $hasCurrentCustomerGroupPseudoPrice,
+        bool $hasFallbackCustomerGroupPseudoPrice,
+        array $expectedNumber
+    ): void {
+        $this->groups = $this->helper->insertConfiguratorData(
+            [
+                'color' => ['red', 'green'],
+                'size' => ['xl', 'l'],
+            ]
+        );
+
+        $products = [
+            'A' => [
+                'groups' => $this->buildConfigurator(['color' => ['red', 'green'], 'size' => ['xl', 'l']]),
+                'hasCurrentCustomerGroupPseudoPrice' => $hasCurrentCustomerGroupPseudoPrice,
+                'hasFallbackCustomerGroupPseudoPrice' => $hasFallbackCustomerGroupPseudoPrice,
+            ],
+            'B' => [
+                'groups' => $this->buildConfigurator(['color' => ['green'], 'size' => ['xl']]),
+                'hasCurrentCustomerGroupPseudoPrice' => $hasCurrentCustomerGroupPseudoPrice,
+                'hasFallbackCustomerGroupPseudoPrice' => $hasFallbackCustomerGroupPseudoPrice,
+            ],
+            'C' => [
+                'groups' => $this->buildConfigurator(['color' => ['red', 'green']]),
+                'hasCurrentCustomerGroupPseudoPrice' => $hasCurrentCustomerGroupPseudoPrice,
+                'hasFallbackCustomerGroupPseudoPrice' => $hasFallbackCustomerGroupPseudoPrice,
+            ],
+        ];
+
+        $context = $this->getContext();
+        $fallbackCustomerGroup = $this->converter->convertCustomerGroup($this->helper->createCustomerGroup(['key' => self::FALLBACK_CUSTOMER_GROUP]));
+        $context->setFallbackCustomerGroup($fallbackCustomerGroup);
+        $this->search(
+            $products,
+            $expectedNumber,
+            null,
+            [new HasPseudoPriceCondition(), $this->createCondition(['xl', 'l'], 'size', true)],
+            [],
+            [],
+            $context
+        );
+    }
+
+    public function getCustomerGroupPseudoPricesWithVariants(): Generator
+    {
+        yield 'No customer group has pseudo price' => [
+            false,
+            false,
+            [],
+        ];
+        yield 'Only current customer group has pseudo price' => [
+            true,
+            false,
+            ['A1', 'A2', 'B1'],
+        ];
+        yield 'Only fallback customer group has pseudo price' => [
+            false,
+            true,
+            [],
+        ];
+        yield 'Current and fallback customer groups have pseudo price' => [
+            true,
+            true,
+            ['A1', 'A2', 'B1'],
+        ];
+    }
+
+    /**
+     * Creates and return the VariantCondition of the given options of the given group.
+     *
+     * @param array<string> $options
+     */
+    public function createCondition(array $options, string $groupName, bool $expand = false): VariantCondition
+    {
+        $mapping = $this->mapOptions();
+
+        if (!isset($mapping['groups'])) {
+            throw new Exception('Group is not set');
+        }
+
+        if (!isset($mapping['options'])) {
+            throw new Exception('Options is not set');
+        }
+
+        $ids = array_intersect_key(
+            $mapping['options'],
+            array_flip($options)
+        );
+
+        return new VariantCondition(array_values($ids), $expand, $mapping['groups'][$groupName]);
+    }
+
+    protected function getProduct(
+        string $number,
+        ShopContext $context,
+        ?Category $category = null,
+        $additionally = []
+    ): array {
+        static::assertIsArray($additionally);
+
+        $product = parent::getProduct($number, $context, $category, $additionally);
+
+        $currentCustomerGroupPrice = [
+            'from' => 1,
+            'to' => 'beliebig',
+            'price' => 7,
+            'customerGroupKey' => self::CURRENT_CUSTOMER_GROUP,
+            'pseudoPrice' => $additionally['hasCurrentCustomerGroupPseudoPrice'] ? 10 : 0,
+        ];
+        $fallbackCustomerGroupPrice = [
+            'from' => 1,
+            'to' => 'beliebig',
+            'price' => 8,
+            'customerGroupKey' => self::FALLBACK_CUSTOMER_GROUP,
+            'pseudoPrice' => $additionally['hasFallbackCustomerGroupPseudoPrice'] ? 10 : 0,
+        ];
+
+        $product['mainDetail']['prices'] = [
+            $currentCustomerGroupPrice,
+            $fallbackCustomerGroupPrice,
+        ];
+
+        if (!isset($additionally['groups'])) {
+            return $product;
+        }
+
+        $configurator = $this->helper->createConfiguratorSet($additionally['groups']);
+
+        $variants = [
+            'prices' => [
+                $currentCustomerGroupPrice,
+                $fallbackCustomerGroupPrice,
+            ], ];
+
+        $variants = $this->helper->generateVariants(
+            $configurator['groups'],
+            $number,
+            $variants
+        );
+
+        $product['configuratorSet'] = $configurator;
+        $product['variants'] = $variants;
+
+        return $product;
+    }
+
+    /**
+     * Returns the mapping of group and option names to ids.
+     *
+     * @return array{options?: array<string, int>, groups?: array<string, int>}
+     */
+    private function mapOptions(): array
+    {
+        $mapping = [];
+        foreach ($this->groups as $group) {
+            $mapping['groups'][$group->getName()] = $group->getId();
+            foreach ($group->getOptions() as $option) {
+                $mapping['options'][$option->getName()] = $option->getId();
+            }
+        }
+
+        return $mapping;
+    }
+
+    /**
+     * Creates the structure of the configurator.
+     *
+     * @param array<string, array<string>> $expected
+     *
+     * @return Group[]
+     */
+    private function buildConfigurator(array $expected): array
+    {
+        $groups = [];
+        foreach ($expected as $group => $optionNames) {
+            foreach ($this->groups as $globalGroup) {
+                if ($globalGroup->getName() !== $group) {
+                    continue;
+                }
+
+                $options = [];
+                foreach ($globalGroup->getOptions() as $option) {
+                    if (\in_array($option->getName(), $optionNames, true)) {
+                        $options[] = $option;
+                    }
+                }
+
+                $clone = clone $globalGroup;
+                $clone->setOptions(new ArrayCollection($options));
+
+                $groups[] = $clone;
+            }
+        }
+
+        return $groups;
+    }
+}
diff --git a/tests/Functional/Bundle/SearchBundle/Condition/HasPseudoPriceConditionTest.php b/tests/Functional/Bundle/SearchBundle/Condition/HasPseudoPriceConditionTest.php
index 5143ccac96e..5abd992a554 100644
--- a/tests/Functional/Bundle/SearchBundle/Condition/HasPseudoPriceConditionTest.php
+++ b/tests/Functional/Bundle/SearchBundle/Condition/HasPseudoPriceConditionTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle\Condition;
@@ -68,7 +67,7 @@ public function testPseudoPriceOfVariants(): void
     protected function getProduct(
         string $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $data = ['groups' => []]
     ): array {
         $product = parent::getProduct($number, $context, $category);
diff --git a/tests/Functional/Bundle/SearchBundle/Condition/ImmediateDeliveryConditionTest.php b/tests/Functional/Bundle/SearchBundle/Condition/ImmediateDeliveryConditionTest.php
index 1c85f3894a1..9c6e58365aa 100644
--- a/tests/Functional/Bundle/SearchBundle/Condition/ImmediateDeliveryConditionTest.php
+++ b/tests/Functional/Bundle/SearchBundle/Condition/ImmediateDeliveryConditionTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle\Condition;
@@ -43,10 +42,10 @@ public function testNoStock(): void
 
         $this->search(
             [
-                'first' => ['inStock' => 0, 'minPurchase' => 1],
-                'second' => ['inStock' => 0, 'minPurchase' => 1],
-                'third' => ['inStock' => 2, 'minPurchase' => 1],
-                'fourth' => ['inStock' => 1, 'minPurchase' => 1],
+                'first' => ['inStock' => 0, 'minPurchase' => 1, 'createVariants' => false],
+                'second' => ['inStock' => 0, 'minPurchase' => 1, 'createVariants' => false],
+                'third' => ['inStock' => 2, 'minPurchase' => 1, 'createVariants' => false],
+                'fourth' => ['inStock' => 1, 'minPurchase' => 1, 'createVariants' => false],
             ],
             ['third', 'fourth'],
             null,
@@ -60,10 +59,10 @@ public function testMinPurchaseEquals(): void
 
         $this->search(
             [
-                'first' => ['inStock' => 0, 'minPurchase' => 1],
-                'second' => ['inStock' => 0, 'minPurchase' => 1],
-                'third' => ['inStock' => 3, 'minPurchase' => 3],
-                'fourth' => ['inStock' => 20, 'minPurchase' => 20],
+                'first' => ['inStock' => 0, 'minPurchase' => 1, 'createVariants' => false],
+                'second' => ['inStock' => 0, 'minPurchase' => 1, 'createVariants' => false],
+                'third' => ['inStock' => 3, 'minPurchase' => 3, 'createVariants' => false],
+                'fourth' => ['inStock' => 20, 'minPurchase' => 20, 'createVariants' => false],
             ],
             ['third', 'fourth'],
             null,
@@ -77,11 +76,11 @@ public function testSubVariantWithStock(): void
 
         $this->search(
             [
-                'first' => ['inStock' => 0, 'minPurchase' => 1],
-                'second' => ['inStock' => 0, 'minPurchase' => 1],
-                'third' => ['inStock' => 1, 'minPurchase' => 1],
+                'first' => ['inStock' => 0, 'minPurchase' => 1, 'createVariants' => false],
+                'second' => ['inStock' => 0, 'minPurchase' => 1, 'createVariants' => false],
+                'third' => ['inStock' => 1, 'minPurchase' => 1, 'createVariants' => false],
                 'fourth' => ['inStock' => 1, 'minPurchase' => 1, 'createVariants' => true],
-                'fifth' => ['inStock' => 2, 'minPurchase' => 1],
+                'fifth' => ['inStock' => 2, 'minPurchase' => 1, 'createVariants' => false],
             ],
             ['third', 'fifth'],
             null,
@@ -97,7 +96,7 @@ public function testSubVariantWithStock(): void
     protected function getProduct(
         string $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $data = ['inStock' => 0, 'minPurchase' => 1]
     ): array {
         $product = parent::getProduct($number, $context, $category);
@@ -118,10 +117,10 @@ protected function createProduct(
         $additionally
     ): Article {
         if ($additionally['createVariants'] === true) {
-            $fourth = $this->getProduct('fourth', $context, $category);
+            $fourth = $this->getProduct($number, $context, $category);
             $configurator = $this->helper->getConfigurator(
                 $context->getCurrentCustomerGroup(),
-                'fourth'
+                $number
             );
 
             $fourth = array_merge($fourth, $configurator);
diff --git a/tests/Functional/Bundle/SearchBundle/Condition/IsNewConditionTest.php b/tests/Functional/Bundle/SearchBundle/Condition/IsNewConditionTest.php
index d21204a805a..8cf9b317777 100644
--- a/tests/Functional/Bundle/SearchBundle/Condition/IsNewConditionTest.php
+++ b/tests/Functional/Bundle/SearchBundle/Condition/IsNewConditionTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle\Condition;
@@ -63,7 +62,7 @@ public function testIsNew(): void
     protected function getProduct(
         string $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $data = []
     ): array {
         $product = parent::getProduct($number, $context, $category);
diff --git a/tests/Functional/Bundle/SearchBundle/Condition/ManufacturerConditionTest.php b/tests/Functional/Bundle/SearchBundle/Condition/ManufacturerConditionTest.php
index c52628b426f..283c8ab07dc 100644
--- a/tests/Functional/Bundle/SearchBundle/Condition/ManufacturerConditionTest.php
+++ b/tests/Functional/Bundle/SearchBundle/Condition/ManufacturerConditionTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle\Condition;
@@ -84,7 +83,7 @@ public function testMultipleManufacturers(): void
     protected function getProduct(
         string $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $manufacturer = null
     ): array {
         $product = parent::getProduct($number, $context, $category);
diff --git a/tests/Functional/Bundle/SearchBundle/Condition/OrderNumberConditionTest.php b/tests/Functional/Bundle/SearchBundle/Condition/OrderNumberConditionTest.php
index 612bd74e460..f9c6d41726a 100644
--- a/tests/Functional/Bundle/SearchBundle/Condition/OrderNumberConditionTest.php
+++ b/tests/Functional/Bundle/SearchBundle/Condition/OrderNumberConditionTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle\Condition;
@@ -73,7 +72,7 @@ public function createProducts(array $products, ShopContext $context, Category $
     protected function getProduct(
         string $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $name = null
     ): array {
         return parent::getProduct($number, $context, $category);
diff --git a/tests/Functional/Bundle/SearchBundle/Condition/PriceConditionTest.php b/tests/Functional/Bundle/SearchBundle/Condition/PriceConditionTest.php
index 8a58c01e779..6208c10c4af 100644
--- a/tests/Functional/Bundle/SearchBundle/Condition/PriceConditionTest.php
+++ b/tests/Functional/Bundle/SearchBundle/Condition/PriceConditionTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle\Condition;
@@ -148,7 +147,7 @@ public function testPriceGroup(): void
             [
                 'first' => ['EK' => 10],
 
-                //20,- € - 10% price group discount = 18,- €
+                // 20,- € - 10% price group discount = 18,- €
                 'second' => ['prices' => ['EK' => 20], 'priceGroup' => $priceGroup],
                 'third' => ['EK' => 30],
             ],
@@ -177,7 +176,7 @@ public function testPriceGroupWithLastGraduation(): void
         $this->search(
             [
                 'first' => ['EK' => 10],
-                //20,- € - 30% price group discount = 14,- €
+                // 20,- € - 30% price group discount = 14,- €
                 'second' => ['prices' => ['EK' => 20], 'priceGroup' => $priceGroup],
                 'third' => ['EK' => 30],
             ],
@@ -199,7 +198,7 @@ public function testPriceGroupWithLastGraduation(): void
     protected function getProduct(
         string $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $prices = []
     ): array {
         $product = parent::getProduct($number, $context, $category);
@@ -218,14 +217,14 @@ protected function getProduct(
             }
 
             $product['mainDetail']['prices'][] = [
-                 'from' => 1,
-                 'to' => 'beliebig',
-                 'price' => $price,
-                 'customerGroupKey' => $customerGroup,
+                'from' => 1,
+                'to' => 'beliebig',
+                'price' => $price,
+                'customerGroupKey' => $customerGroup,
             ];
         }
 
-        if ($prices['priceGroup']) {
+        if (isset($prices['priceGroup'])) {
             $product['priceGroupActive'] = true;
             $product['priceGroupId'] = $prices['priceGroup']->getId();
         }
diff --git a/tests/Functional/Bundle/SearchBundle/Condition/ProductAttributeConditionTest.php b/tests/Functional/Bundle/SearchBundle/Condition/ProductAttributeConditionTest.php
index 49c9ad512f1..fb7f3559aef 100644
--- a/tests/Functional/Bundle/SearchBundle/Condition/ProductAttributeConditionTest.php
+++ b/tests/Functional/Bundle/SearchBundle/Condition/ProductAttributeConditionTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle\Condition;
@@ -184,7 +183,7 @@ public function testNotNull(): void
     protected function getProduct(
         string $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $attribute = ['attr1' => 10]
     ): array {
         $product = parent::getProduct($number, $context, $category);
diff --git a/tests/Functional/Bundle/SearchBundle/Condition/PropertyConditionTest.php b/tests/Functional/Bundle/SearchBundle/Condition/PropertyConditionTest.php
index 31f4fd63442..269c645e874 100644
--- a/tests/Functional/Bundle/SearchBundle/Condition/PropertyConditionTest.php
+++ b/tests/Functional/Bundle/SearchBundle/Condition/PropertyConditionTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle\Condition;
@@ -275,7 +274,7 @@ public function testTwoPropertyConditionsWithThreeValues(): void
     protected function getProduct(
         string $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $properties = []
     ): array {
         $product = parent::getProduct($number, $context, $category);
diff --git a/tests/Functional/Bundle/SearchBundle/Condition/SalesConditionTest.php b/tests/Functional/Bundle/SearchBundle/Condition/SalesConditionTest.php
index c29e8daad40..b6a7ec3d4ef 100644
--- a/tests/Functional/Bundle/SearchBundle/Condition/SalesConditionTest.php
+++ b/tests/Functional/Bundle/SearchBundle/Condition/SalesConditionTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle\Condition;
diff --git a/tests/Functional/Bundle/SearchBundle/Condition/SearchTermConditionTest.php b/tests/Functional/Bundle/SearchBundle/Condition/SearchTermConditionTest.php
index 966cbe50eed..688b06f446a 100644
--- a/tests/Functional/Bundle/SearchBundle/Condition/SearchTermConditionTest.php
+++ b/tests/Functional/Bundle/SearchBundle/Condition/SearchTermConditionTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle\Condition;
@@ -90,7 +89,7 @@ public function createProducts(array $products, ShopContext $context, Category $
     protected function getProduct(
         string $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $name = null
     ): array {
         $product = parent::getProduct($number, $context, $category);
diff --git a/tests/Functional/Bundle/SearchBundle/Condition/ShippingFreeConditionTest.php b/tests/Functional/Bundle/SearchBundle/Condition/ShippingFreeConditionTest.php
index 45039d216c2..5d1171c80e6 100644
--- a/tests/Functional/Bundle/SearchBundle/Condition/ShippingFreeConditionTest.php
+++ b/tests/Functional/Bundle/SearchBundle/Condition/ShippingFreeConditionTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle\Condition;
@@ -59,7 +58,7 @@ public function testShippingFree(): void
     protected function getProduct(
         string $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $shippingFree = true
     ): array {
         $product = parent::getProduct($number, $context, $category);
diff --git a/tests/Functional/Bundle/SearchBundle/Condition/SimilarProductConditionTest.php b/tests/Functional/Bundle/SearchBundle/Condition/SimilarProductConditionTest.php
index 2676ce5b972..c46e884f6bd 100644
--- a/tests/Functional/Bundle/SearchBundle/Condition/SimilarProductConditionTest.php
+++ b/tests/Functional/Bundle/SearchBundle/Condition/SimilarProductConditionTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle\Condition;
@@ -68,7 +67,7 @@ public function testSimilarProduct(): void
     protected function getProduct(
         string $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $additionally = null
     ): array {
         if ($additionally !== null) {
diff --git a/tests/Functional/Bundle/SearchBundle/Condition/VariantConditionOnSaleTest.php b/tests/Functional/Bundle/SearchBundle/Condition/VariantConditionOnSaleTest.php
index fb3d5327d2b..661cdcb9219 100644
--- a/tests/Functional/Bundle/SearchBundle/Condition/VariantConditionOnSaleTest.php
+++ b/tests/Functional/Bundle/SearchBundle/Condition/VariantConditionOnSaleTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle\Condition;
@@ -592,7 +591,12 @@ public function testMultiCrossExpandOptionSortByPrice(): void
         $this->assertSearchResultSorting($result, ['D3', 'A1']);
     }
 
-    public function createCondition($options, $groupName, $expand = false): VariantCondition
+    /**
+     * Creates and return the VariantCondition of the given options of the given group.
+     *
+     * @param array<string> $options
+     */
+    public function createCondition(array $options, string $groupName, bool $expand = false): VariantCondition
     {
         $mapping = $this->mapOptions();
 
@@ -614,7 +618,7 @@ public function createCondition($options, $groupName, $expand = false): VariantC
     protected function getProduct(
         string $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $data = []
     ): array {
         $product = parent::getProduct($number, $context, $category);
@@ -705,6 +709,8 @@ private function mapOptions(): array
     /**
      * Creates the structure of the configurator.
      *
+     * @param array<string, array<string>> $expected
+     *
      * @return Group[]
      */
     private function buildConfigurator(array $expected): array
diff --git a/tests/Functional/Bundle/SearchBundle/Condition/VariantConditionTest.php b/tests/Functional/Bundle/SearchBundle/Condition/VariantConditionTest.php
index f3a6edc23c2..a69f58d8b83 100644
--- a/tests/Functional/Bundle/SearchBundle/Condition/VariantConditionTest.php
+++ b/tests/Functional/Bundle/SearchBundle/Condition/VariantConditionTest.php
@@ -5,28 +5,28 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle\Condition;
 
 use Doctrine\Common\Collections\ArrayCollection;
+use Exception;
 use Shopware\Bundle\SearchBundle\Condition\VariantCondition;
 use Shopware\Bundle\SearchBundle\Sorting\PriceSorting;
 use Shopware\Bundle\SearchBundle\SortingInterface;
@@ -330,11 +330,21 @@ public function testMultiCrossExpandOptionSortByPrice(): void
 
     /**
      * Creates and return the VariantCondition of the given options of the given group.
+     *
+     * @param array<string> $options
      */
     public function createCondition(array $options, string $groupName, bool $expand = false): VariantCondition
     {
         $mapping = $this->mapOptions();
 
+        if (!isset($mapping['groups'])) {
+            throw new Exception('Group is not set');
+        }
+
+        if (!isset($mapping['options'])) {
+            throw new Exception('Options is not set');
+        }
+
         $ids = array_intersect_key(
             $mapping['options'],
             array_flip($options)
@@ -353,7 +363,7 @@ public function createCondition(array $options, string $groupName, bool $expand
     protected function getProduct(
         string $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $data = []
     ): array {
         $product = parent::getProduct($number, $context, $category);
@@ -393,6 +403,8 @@ protected function getProduct(
 
     /**
      * Returns the mapping of group and option names to ids.
+     *
+     * @return array{options?: array<string, int>, groups?: array<string, int>}
      */
     private function mapOptions(): array
     {
@@ -410,6 +422,8 @@ private function mapOptions(): array
     /**
      * Creates the structure of the configurator.
      *
+     * @param array<string, array<string>> $expected
+     *
      * @return Group[]
      */
     private function buildConfigurator(array $expected): array
diff --git a/tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithCurrencyFactor.php b/tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithCurrencyFactor.php
index 892273e848a..12d1e93340c 100644
--- a/tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithCurrencyFactor.php
+++ b/tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithCurrencyFactor.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle\Condition;
@@ -305,7 +304,7 @@ public function createCondition(array $options, string $groupName, bool $expand
     protected function getProduct(
         string $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $data = []
     ): array {
         $product = parent::getProduct($number, $context, $category);
@@ -529,10 +528,10 @@ private function assertPriceCount(
         $expectedCheapestPriceNumbers = array_keys($prices['cheapestPrice']);
 
         foreach ($numbers as $number) {
-            static::assertContains($number, $expectedCheapestPriceNumbers, sprintf('Cheapest price of product with number: `%s` found but not expected', $number));
+            static::assertContains($number, $expectedCheapestPriceNumbers, \sprintf('Cheapest price of product with number: `%s` found but not expected', $number));
         }
         foreach ($expectedCheapestPriceNumbers as $number) {
-            static::assertContains($number, $numbers, sprintf('Expected cheapest price of product with number: `%s` not found', $number));
+            static::assertContains($number, $numbers, \sprintf('Expected cheapest price of product with number: `%s` not found', $number));
         }
 
         static::assertCount(\count($expectedCheapestPriceNumbers), $products);
@@ -541,10 +540,10 @@ private function assertPriceCount(
         $expectedPseudoPriceNumbers = array_keys($prices['pseudoPrice']);
 
         foreach ($numbers as $number) {
-            static::assertContains($number, $expectedPseudoPriceNumbers, sprintf('Pseudo price of product with number: `%s` found but not expected', $number));
+            static::assertContains($number, $expectedPseudoPriceNumbers, \sprintf('Pseudo price of product with number: `%s` found but not expected', $number));
         }
         foreach ($expectedPseudoPriceNumbers as $number) {
-            static::assertContains($number, $numbers, sprintf('Expected pseudo price of product with number: `%s` not found', $number));
+            static::assertContains($number, $numbers, \sprintf('Expected pseudo price of product with number: `%s` not found', $number));
         }
 
         static::assertCount(\count($expectedPseudoPriceNumbers), $products);
diff --git a/tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithGraduationTest.php b/tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithGraduationTest.php
index 3d2c55b658e..5afc6e91e50 100644
--- a/tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithGraduationTest.php
+++ b/tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithGraduationTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle\Condition;
@@ -73,16 +72,16 @@ public function testSingleNotExpandOptionSortByPrice(): void
                     ],
                 ],
                 'B' => ['groups' => $this->buildConfigurator(['color' => ['green'], 'size' => ['xl']]),
-                        'graduationPrices' => [
-                            [60, 50],
-                        ],
+                    'graduationPrices' => [
+                        [60, 50],
                     ],
+                ],
                 'C' => ['groups' => $this->buildConfigurator(['color' => ['red', 'green'], 'size' => ['xl']]),
-                        'graduationPrices' => [
-                            [100, 50],
-                            [110, 20],
-                        ],
+                    'graduationPrices' => [
+                        [100, 50],
+                        [110, 20],
                     ],
+                ],
             ],
             ['B1', 'A1', 'C1'],
             null,
@@ -563,7 +562,7 @@ public function createCondition(array $options, string $groupName, bool $expand
     protected function getProduct(
         string $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $data = []
     ): array {
         $product = parent::getProduct($number, $context, $category);
diff --git a/tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithPriceGroupTest.php b/tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithPriceGroupTest.php
index 8b559add329..d2fde0fce3c 100644
--- a/tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithPriceGroupTest.php
+++ b/tests/Functional/Bundle/SearchBundle/Condition/VariantConditionWithPriceGroupTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle\Condition;
@@ -244,7 +243,7 @@ public function createCondition($options, $groupName, $expand = false): VariantC
     protected function getProduct(
         string $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $data = []
     ): array {
         $product = parent::getProduct($number, $context, $category);
@@ -266,7 +265,7 @@ protected function getProduct(
             ++$i;
         }
 
-        if ($data['priceGroup']) {
+        if (isset($data['priceGroup'])) {
             $product['priceGroupActive'] = true;
             $product['priceGroupId'] = $data['priceGroup']->getId();
         }
diff --git a/tests/Functional/Bundle/SearchBundle/Condition/VoteAverageConditionTest.php b/tests/Functional/Bundle/SearchBundle/Condition/VoteAverageConditionTest.php
index 1169be73a6f..a1a8b6bd996 100644
--- a/tests/Functional/Bundle/SearchBundle/Condition/VoteAverageConditionTest.php
+++ b/tests/Functional/Bundle/SearchBundle/Condition/VoteAverageConditionTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle\Condition;
@@ -72,16 +71,16 @@ public function testSubShopVotes(): void
         $this->search(
             [
                 'first' => [
-                    1 => [1],   //shop = 1   1x vote with 1 point
-                    2 => [3],    //shop = 2   1x vote with 3 point
+                    1 => [1],   // shop = 1   1x vote with 1 point
+                    2 => [3],    // shop = 2   1x vote with 3 point
                 ],
                 'second' => [
-                    1 => [4],   //shop = 1   1x vote with 4 points
-                    2 => [4],    //shop = 2   1x vote with 4 points
+                    1 => [4],   // shop = 1   1x vote with 4 points
+                    2 => [4],    // shop = 2   1x vote with 4 points
                 ],
                 'third' => [
-                    1 => [4],   //shop = 1   1x vote with 4 points
-                    2 => [2],    //shop = 2   1x vote with 2 points
+                    1 => [4],   // shop = 1   1x vote with 4 points
+                    2 => [2],    // shop = 2   1x vote with 2 points
                 ],
             ],
             ['first', 'second'],
@@ -101,18 +100,18 @@ public function testMixedVotes(): void
         $this->search(
             [
                 'first' => [
-                    null => [5], //no assignment to shop
-                    1 => [1],   //shop = 1   1x vote with 1 point
-                    2 => [4],    //shop = 2   1x vote with 4 point
+                    null => [5], // no assignment to shop
+                    1 => [1],   // shop = 1   1x vote with 1 point
+                    2 => [4],    // shop = 2   1x vote with 4 point
                 ],
                 'second' => [
                     null => [5],
-                    1 => [4],   //shop = 1   1x vote with 4 points
-                    2 => [3],    //shop = 2   1x vote with 2 points
+                    1 => [4],   // shop = 1   1x vote with 4 points
+                    2 => [3],    // shop = 2   1x vote with 2 points
                 ],
                 'third' => [
-                    1 => [4],   //shop = 1   1x vote with 4 points
-                    2 => [5],    //shop = 2   1x vote with 2 points
+                    1 => [4],   // shop = 1   1x vote with 4 points
+                    2 => [5],    // shop = 2   1x vote with 2 points
                 ],
             ],
             ['first', 'third'],
@@ -132,18 +131,18 @@ public function testMixedVotesWithDisabledConfig(): void
         $this->search(
             [
                 'first' => [
-                    null => [5], //no assignment to shop
-                    1 => [1],   //shop = 1   1x vote with 1 point
-                    2 => [4],    //shop = 2   1x vote with 4 point
+                    null => [5], // no assignment to shop
+                    1 => [1],   // shop = 1   1x vote with 1 point
+                    2 => [4],    // shop = 2   1x vote with 4 point
                 ],
                 'second' => [
                     null => [5],
-                    1 => [4],   //shop = 1   1x vote with 4 points
-                    2 => [3],    //shop = 2   1x vote with 2 points
+                    1 => [4],   // shop = 1   1x vote with 4 points
+                    2 => [3],    // shop = 2   1x vote with 2 points
                 ],
                 'third' => [
-                    1 => [4],   //shop = 1   1x vote with 4 points
-                    2 => [5],    //shop = 2   1x vote with 2 points
+                    1 => [4],   // shop = 1   1x vote with 4 points
+                    2 => [5],    // shop = 2   1x vote with 2 points
                 ],
             ],
             ['second', 'third'],
diff --git a/tests/Functional/Bundle/SearchBundle/CriteriaTest.php b/tests/Functional/Bundle/SearchBundle/CriteriaTest.php
index 1c99aadffb7..05da421dbc0 100644
--- a/tests/Functional/Bundle/SearchBundle/CriteriaTest.php
+++ b/tests/Functional/Bundle/SearchBundle/CriteriaTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle;
diff --git a/tests/Functional/Bundle/SearchBundle/Facet/CategoryFacetTest.php b/tests/Functional/Bundle/SearchBundle/Facet/CategoryFacetTest.php
index 70b66d17726..d97bde7120c 100644
--- a/tests/Functional/Bundle/SearchBundle/Facet/CategoryFacetTest.php
+++ b/tests/Functional/Bundle/SearchBundle/Facet/CategoryFacetTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle\Facet;
@@ -173,7 +172,7 @@ public function testNestedCategories(): void
     protected function getProduct(
         string $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $additionally = null
     ): array {
         if ($additionally !== null) {
diff --git a/tests/Functional/Bundle/SearchBundle/Facet/ImmediateDeliveryFacetTest.php b/tests/Functional/Bundle/SearchBundle/Facet/ImmediateDeliveryFacetTest.php
index 4ea34f31c34..1a1e79439e3 100644
--- a/tests/Functional/Bundle/SearchBundle/Facet/ImmediateDeliveryFacetTest.php
+++ b/tests/Functional/Bundle/SearchBundle/Facet/ImmediateDeliveryFacetTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle\Facet;
@@ -99,7 +98,7 @@ public function testFacetWithNoData(): void
     protected function getProduct(
         $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $data = ['inStock' => 0, 'minPurchase' => 1]
     ): array {
         $product = parent::getProduct($number, $context, $category);
diff --git a/tests/Functional/Bundle/SearchBundle/Facet/ManufacturerFacetTest.php b/tests/Functional/Bundle/SearchBundle/Facet/ManufacturerFacetTest.php
index 5fdfddbbaee..c8df9f10056 100644
--- a/tests/Functional/Bundle/SearchBundle/Facet/ManufacturerFacetTest.php
+++ b/tests/Functional/Bundle/SearchBundle/Facet/ManufacturerFacetTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle\Facet;
@@ -113,7 +112,7 @@ public function testMultipleManufacturers(): void
     protected function getProduct(
         $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $manufacturer = null
     ): array {
         $product = parent::getProduct($number, $context, $category);
diff --git a/tests/Functional/Bundle/SearchBundle/Facet/PriceFacetTest.php b/tests/Functional/Bundle/SearchBundle/Facet/PriceFacetTest.php
index caf03e06c26..e98a398aa19 100644
--- a/tests/Functional/Bundle/SearchBundle/Facet/PriceFacetTest.php
+++ b/tests/Functional/Bundle/SearchBundle/Facet/PriceFacetTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle\Facet;
@@ -167,7 +166,7 @@ public function testFacetWithCurrencyFactor(): void
     protected function getProduct(
         $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $prices = []
     ): array {
         $product = parent::getProduct($number, $context, $category);
diff --git a/tests/Functional/Bundle/SearchBundle/Facet/ProductAttributeFacetTest.php b/tests/Functional/Bundle/SearchBundle/Facet/ProductAttributeFacetTest.php
index f76645c9937..18ccbd5ad16 100644
--- a/tests/Functional/Bundle/SearchBundle/Facet/ProductAttributeFacetTest.php
+++ b/tests/Functional/Bundle/SearchBundle/Facet/ProductAttributeFacetTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle\Facet;
@@ -68,7 +67,7 @@ public function testEmptyFilesGetFilteredOut(): void
     protected function getProduct(
         string $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $attribute = ['attr1' => 10]
     ): array {
         $product = parent::getProduct($number, $context, $category);
diff --git a/tests/Functional/Bundle/SearchBundle/Facet/PropertyFacetTest.php b/tests/Functional/Bundle/SearchBundle/Facet/PropertyFacetTest.php
index b2ebdeb2c04..f18d3bbee3f 100644
--- a/tests/Functional/Bundle/SearchBundle/Facet/PropertyFacetTest.php
+++ b/tests/Functional/Bundle/SearchBundle/Facet/PropertyFacetTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle\Facet;
@@ -126,7 +125,7 @@ public function testMultiplePropertySets(): void
     protected function getProduct(
         $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $properties = []
     ): array {
         $product = parent::getProduct($number, $context, $category);
diff --git a/tests/Functional/Bundle/SearchBundle/Facet/ShippingFreeFacetTest.php b/tests/Functional/Bundle/SearchBundle/Facet/ShippingFreeFacetTest.php
index ad70c8e3c36..fa3a898de52 100644
--- a/tests/Functional/Bundle/SearchBundle/Facet/ShippingFreeFacetTest.php
+++ b/tests/Functional/Bundle/SearchBundle/Facet/ShippingFreeFacetTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle\Facet;
@@ -82,7 +81,7 @@ public function testShippingFreeWithoutMatch(): void
     protected function getProduct(
         $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $shippingFree = true
     ): array {
         $product = parent::getProduct($number, $context, $category);
diff --git a/tests/Functional/Bundle/SearchBundle/Facet/VoteAverageFacetTest.php b/tests/Functional/Bundle/SearchBundle/Facet/VoteAverageFacetTest.php
index 069ef77ba9d..c2de08ac37d 100644
--- a/tests/Functional/Bundle/SearchBundle/Facet/VoteAverageFacetTest.php
+++ b/tests/Functional/Bundle/SearchBundle/Facet/VoteAverageFacetTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle\Facet;
@@ -47,7 +46,7 @@ public function testVoteAverageFacet(): void
         $result = $this->search(
             [
                 'first' => [
-                    1 => [1, 2],     //shop = 1    1x vote with 1 point    1x vote with 2 points
+                    1 => [1, 2],     // shop = 1    1x vote with 1 point    1x vote with 2 points
                 ],
                 'second' => [
                     1 => [4, 5],
@@ -83,7 +82,7 @@ public function testVoteFacetWithoutSubshopVotes(): void
         $result = $this->search(
             [
                 'first' => [
-                    1 => [1, 2],     //shop = 1    1x vote with 1 point    1x vote with 2 points
+                    1 => [1, 2],     // shop = 1    1x vote with 1 point    1x vote with 2 points
                 ],
             ],
             ['first'],
@@ -107,7 +106,7 @@ public function testVoteFacetWithSubshopVotes(): void
         $result = $this->search(
             [
                 'first' => [
-                    2 => [1, 2],     //shop = 1    1x vote with 1 point    1x vote with 2 points
+                    2 => [1, 2],     // shop = 1    1x vote with 1 point    1x vote with 2 points
                 ],
             ],
             ['first'],
@@ -129,8 +128,8 @@ public function testVoteFacetWithNotAssignedSubShop(): void
         $result = $this->search(
             [
                 'first' => [
-                    null => [1, 2],      //shop = 1    1x vote with 1 point    1x vote with 2 points
-                    1 => [1, 2],         //shop = null    1x vote with 1 point    1x vote with 2 points
+                    null => [1, 2],      // shop = 1    1x vote with 1 point    1x vote with 2 points
+                    1 => [1, 2],         // shop = null    1x vote with 1 point    1x vote with 2 points
                 ],
             ],
             ['first'],
diff --git a/tests/Functional/Bundle/SearchBundle/HideNoInStockTest.php b/tests/Functional/Bundle/SearchBundle/HideNoInStockTest.php
index 74664ae9d1a..7cc7d85838e 100644
--- a/tests/Functional/Bundle/SearchBundle/HideNoInStockTest.php
+++ b/tests/Functional/Bundle/SearchBundle/HideNoInStockTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle;
diff --git a/tests/Functional/Bundle/SearchBundle/SearchBundleDBALSubscriberTest.php b/tests/Functional/Bundle/SearchBundle/SearchBundleDBALSubscriberTest.php
index ea3d893fd01..61b29c4fbc7 100644
--- a/tests/Functional/Bundle/SearchBundle/SearchBundleDBALSubscriberTest.php
+++ b/tests/Functional/Bundle/SearchBundle/SearchBundleDBALSubscriberTest.php
@@ -5,27 +5,27 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle;
 
+use Doctrine\Common\Collections\ArrayCollection;
 use PHPUnit\Framework\TestCase;
 use Shopware\Bundle\SearchBundle\Condition\CategoryCondition;
 use Shopware\Bundle\SearchBundle\CriteriaRequestHandler\CoreCriteriaRequestHandler;
@@ -46,7 +46,14 @@ public function testValidCreate(): void
             $criteriaRequestHandler,
         ]);
 
-        static::assertInstanceOf(SearchBundleDBALSubscriber::class, $subscriber);
+        $conditionHandlers = $subscriber->registerConditionHandlers();
+        static::assertInstanceOf(ArrayCollection::class, $conditionHandlers);
+        $facetHandlers = $subscriber->registerFacetHandlers();
+        static::assertInstanceOf(ArrayCollection::class, $facetHandlers);
+        $requestHandlers = $subscriber->registerRequestHandlers();
+        static::assertInstanceOf(ArrayCollection::class, $requestHandlers);
+        $sortingHandlers = $subscriber->registerSortingHandlers();
+        static::assertInstanceOf(ArrayCollection::class, $sortingHandlers);
     }
 
     public function testNestedArrays(): void
diff --git a/tests/Functional/Bundle/SearchBundle/Sorting/ManualSortingTest.php b/tests/Functional/Bundle/SearchBundle/Sorting/ManualSortingTest.php
index 8cf00b0ddb0..decb7d923d1 100644
--- a/tests/Functional/Bundle/SearchBundle/Sorting/ManualSortingTest.php
+++ b/tests/Functional/Bundle/SearchBundle/Sorting/ManualSortingTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle\Sorting;
@@ -114,7 +113,7 @@ protected function createProduct(
     protected function search(
         array $products,
         array $expectedNumbers,
-        Category $category = null,
+        ?Category $category = null,
         array $conditions = [],
         array $facets = [],
         array $sortings = [],
diff --git a/tests/Functional/Bundle/SearchBundle/Sorting/PopularitySortingTest.php b/tests/Functional/Bundle/SearchBundle/Sorting/PopularitySortingTest.php
index 0f75de44c4b..96605232909 100644
--- a/tests/Functional/Bundle/SearchBundle/Sorting/PopularitySortingTest.php
+++ b/tests/Functional/Bundle/SearchBundle/Sorting/PopularitySortingTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle\Sorting;
@@ -123,11 +122,11 @@ protected function createProduct(
     protected function search(
         array $products,
         array $expectedNumbers,
-        Category $category = null,
+        ?Category $category = null,
         array $conditions = [],
         array $facets = [],
         array $sortings = [],
-        TestContext $context = null,
+        ?TestContext $context = null,
         array $configs = [],
         bool $variantSearch = false
     ): ProductNumberSearchResult {
diff --git a/tests/Functional/Bundle/SearchBundle/Sorting/PriceSortingTest.php b/tests/Functional/Bundle/SearchBundle/Sorting/PriceSortingTest.php
index 596d0038518..0b568c89580 100644
--- a/tests/Functional/Bundle/SearchBundle/Sorting/PriceSortingTest.php
+++ b/tests/Functional/Bundle/SearchBundle/Sorting/PriceSortingTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle\Sorting;
@@ -165,7 +164,7 @@ protected function getPriceContext($displayGross, $discount = null): TestContext
     protected function getProduct(
         $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $prices = []
     ): array {
         $product = parent::getProduct($number, $context, $category);
@@ -187,7 +186,7 @@ protected function getProduct(
     protected function search(
         array $products,
         array $expectedNumbers,
-        Category $category = null,
+        ?Category $category = null,
         array $conditions = [],
         array $facets = [],
         array $sortings = [],
diff --git a/tests/Functional/Bundle/SearchBundle/Sorting/ProductAttributeSortingTest.php b/tests/Functional/Bundle/SearchBundle/Sorting/ProductAttributeSortingTest.php
index 2ed2139137f..2d5024a03a2 100644
--- a/tests/Functional/Bundle/SearchBundle/Sorting/ProductAttributeSortingTest.php
+++ b/tests/Functional/Bundle/SearchBundle/Sorting/ProductAttributeSortingTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle\Sorting;
@@ -84,7 +83,7 @@ public function testMultipleFieldSorting(): void
     protected function getProduct(
         $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $attribute = ['attr1' => null]
     ): array {
         $product = parent::getProduct($number, $context, $category);
@@ -96,7 +95,7 @@ protected function getProduct(
     protected function search(
         array $products,
         array $expectedNumbers,
-        Category $category = null,
+        ?Category $category = null,
         array $conditions = [],
         array $facets = [],
         array $sortings = [],
diff --git a/tests/Functional/Bundle/SearchBundle/Sorting/ProductNameSortingTest.php b/tests/Functional/Bundle/SearchBundle/Sorting/ProductNameSortingTest.php
index 06c7dd9bf5f..e11614183c5 100644
--- a/tests/Functional/Bundle/SearchBundle/Sorting/ProductNameSortingTest.php
+++ b/tests/Functional/Bundle/SearchBundle/Sorting/ProductNameSortingTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle\Sorting;
@@ -64,7 +63,7 @@ public function testNameSorting(): void
     protected function getProduct(
         $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $name = null
     ): array {
         $product = parent::getProduct($number, $context, $category);
@@ -76,7 +75,7 @@ protected function getProduct(
     protected function search(
         array $products,
         array $expectedNumbers,
-        Category $category = null,
+        ?Category $category = null,
         array $conditions = [],
         array $facets = [],
         array $sortings = [],
diff --git a/tests/Functional/Bundle/SearchBundle/Sorting/ProductNumberSortingTest.php b/tests/Functional/Bundle/SearchBundle/Sorting/ProductNumberSortingTest.php
index 153d1788420..8898a14bb1f 100644
--- a/tests/Functional/Bundle/SearchBundle/Sorting/ProductNumberSortingTest.php
+++ b/tests/Functional/Bundle/SearchBundle/Sorting/ProductNumberSortingTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle\Sorting;
@@ -57,7 +56,7 @@ public function testNameSorting(): void
     protected function search(
         array $products,
         array $expectedNumbers,
-        Category $category = null,
+        ?Category $category = null,
         array $conditions = [],
         array $facets = [],
         array $sortings = [],
diff --git a/tests/Functional/Bundle/SearchBundle/Sorting/ReleaseDateSortingTest.php b/tests/Functional/Bundle/SearchBundle/Sorting/ReleaseDateSortingTest.php
index 330cfd7bebe..a7eadd0417b 100644
--- a/tests/Functional/Bundle/SearchBundle/Sorting/ReleaseDateSortingTest.php
+++ b/tests/Functional/Bundle/SearchBundle/Sorting/ReleaseDateSortingTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundle\Sorting;
@@ -63,7 +62,7 @@ public function testReleaseDateSorting(): void
     protected function getProduct(
         $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $releaseDate = null
     ): array {
         $product = parent::getProduct($number, $context, $category);
@@ -76,7 +75,7 @@ protected function getProduct(
     protected function search(
         array $products,
         array $expectedNumbers,
-        Category $category = null,
+        ?Category $category = null,
         array $conditions = [],
         array $facets = [],
         array $sortings = [],
diff --git a/tests/Functional/Bundle/SearchBundleDBAL/FacetHandler/PropertyFacetHandlerTest.php b/tests/Functional/Bundle/SearchBundleDBAL/FacetHandler/PropertyFacetHandlerTest.php
new file mode 100644
index 00000000000..d66ac0abf81
--- /dev/null
+++ b/tests/Functional/Bundle/SearchBundleDBAL/FacetHandler/PropertyFacetHandlerTest.php
@@ -0,0 +1,131 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Bundle\SearchBundleDBAL\FacetHandler;
+
+use Doctrine\DBAL\Connection;
+use PHPUnit\Framework\TestCase;
+use Shopware\Bundle\SearchBundle\Criteria;
+use Shopware\Bundle\SearchBundle\Facet\LengthFacet;
+use Shopware\Bundle\SearchBundle\Facet\PropertyFacet;
+use Shopware\Bundle\SearchBundle\FacetResult\FacetResultGroup;
+use Shopware\Bundle\SearchBundle\FacetResult\ValueListFacetResult;
+use Shopware\Bundle\SearchBundleDBAL\FacetHandler\PropertyFacetHandler;
+use Shopware\Bundle\StoreFrontBundle\Struct\Property\Set;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
+use Shopware\Tests\Functional\Traits\ShopContextTrait;
+
+class PropertyFacetHandlerTest extends TestCase
+{
+    use DatabaseTransactionBehaviour;
+    use ContainerTrait;
+    use ShopContextTrait;
+
+    private const BOTTLE_SIZE_PROPERTY_NAME = 'Flaschengröße';
+
+    private PropertyFacetHandler $propertyFacetHandler;
+
+    protected function setUp(): void
+    {
+        $this->propertyFacetHandler = $this->getContainer()->get(PropertyFacetHandler::class);
+    }
+
+    public function testSupportsFacetValidInput(): void
+    {
+        static::assertTrue($this->propertyFacetHandler->supportsFacet(new PropertyFacet()));
+    }
+
+    public function testSupportsFacetInvalidInput(): void
+    {
+        static::assertFalse($this->propertyFacetHandler->supportsFacet(new LengthFacet()));
+    }
+
+    public function testGeneratePartialFacetSortedByPosition(): void
+    {
+        $context = $this->createShopContext();
+        $reversedBottleProperties = $this->updateBottleSizePropertyPositions();
+        $this->changeSetSortMode();
+
+        $facetResult = $this->propertyFacetHandler->generatePartialFacet(
+            new PropertyFacet(),
+            new Criteria(),
+            new Criteria(),
+            $context
+        );
+        static::assertInstanceOf(FacetResultGroup::class, $facetResult);
+
+        foreach ($facetResult->getFacetResults() as $facetResult) {
+            if ($facetResult->getLabel() !== self::BOTTLE_SIZE_PROPERTY_NAME) {
+                continue;
+            }
+
+            static::assertInstanceOf(ValueListFacetResult::class, $facetResult);
+
+            $values = $facetResult->getValues();
+            foreach ($reversedBottleProperties as $position => $bottlePropertyId) {
+                static::assertSame((int) $bottlePropertyId, $values[$position]->getId());
+            }
+        }
+    }
+
+    /**
+     * @return array<array<string, string>>
+     */
+    private function updateBottleSizePropertyPositions(): array
+    {
+        $connection = $this->getContainer()->get(Connection::class);
+
+        $reversedBottleProperties = array_reverse($connection->executeQuery(
+            'SELECT position, fs.id
+             FROM s_filter_values AS fs
+             INNER JOIN s_filter_options as fo
+               ON fs.optionID = fo.id
+               AND fo.name LIKE :optionName',
+            ['optionName' => self::BOTTLE_SIZE_PROPERTY_NAME]
+        )->fetchAllKeyValue());
+
+        foreach ($reversedBottleProperties as $position => $bottlePropertyId) {
+            $connection->update('s_filter_values', ['position' => (int) $position], ['id' => (int) $bottlePropertyId]);
+        }
+
+        return $reversedBottleProperties;
+    }
+
+    private function changeSetSortMode(): void
+    {
+        $connection = $this->getContainer()->get(Connection::class);
+        $setId = (int) $connection->executeQuery(
+            'SELECT f.id
+             FROM s_filter AS f
+             INNER JOIN s_filter_relations AS fr
+               ON f.id = fr.groupID
+               AND fr.optionID = (SELECT id FROM s_filter_options WHERE name LIKE :optionName)',
+            ['optionName' => self::BOTTLE_SIZE_PROPERTY_NAME]
+        )->fetchOne();
+
+        $connection->update('s_filter', ['sortmode' => Set::SORT_POSITION], ['id' => $setId]);
+    }
+}
diff --git a/tests/Functional/Bundle/SearchBundleDBAL/SearchIndexerTest.php b/tests/Functional/Bundle/SearchBundleDBAL/SearchIndexerTest.php
index b1b77e888f5..1bb3ca0d36d 100644
--- a/tests/Functional/Bundle/SearchBundleDBAL/SearchIndexerTest.php
+++ b/tests/Functional/Bundle/SearchBundleDBAL/SearchIndexerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundleDBAL;
diff --git a/tests/Functional/Bundle/SearchBundleDBAL/SearchTerm/SearchTermQueryBuilderTest.php b/tests/Functional/Bundle/SearchBundleDBAL/SearchTerm/SearchTermQueryBuilderTest.php
index 682f80cb4ba..0fe10351346 100644
--- a/tests/Functional/Bundle/SearchBundleDBAL/SearchTerm/SearchTermQueryBuilderTest.php
+++ b/tests/Functional/Bundle/SearchBundleDBAL/SearchTerm/SearchTermQueryBuilderTest.php
@@ -1,68 +1,72 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Functional\Bundle\SearchBundleDBAL\SearchTerm;
+namespace Shopware\Tests\Functional\Bundle\SearchBundleDBAL\SearchTerm;
 
 use Doctrine\DBAL\Query\QueryBuilder;
 use PHPUnit\Framework\TestCase;
 use Shopware\Bundle\SearchBundleDBAL\SearchTerm\SearchTermQueryBuilder;
 use Shopware\Models\Article\Article;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
 use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 
 class SearchTermQueryBuilderTest extends TestCase
 {
+    use ContainerTrait;
     use DatabaseTransactionBehaviour;
 
     private const SEARCH_TERM = 'sasse tea';
 
     public function testRankingQueryDoesNotConsiderInactiveProducts(): void
     {
-        $searchTermQueryBuilder = Shopware()->Container()->get(SearchTermQueryBuilder::class);
-        $modelManager = Shopware()->Container()->get('models');
+        $searchTermQueryBuilder = $this->getContainer()->get(SearchTermQueryBuilder::class);
+        $modelManager = $this->getContainer()->get('models');
         $productRepository = $modelManager->getRepository(Article::class);
 
         $query = $searchTermQueryBuilder->buildQuery(self::SEARCH_TERM);
 
         if (!($query instanceof QueryBuilder)) {
-            static::fail(sprintf('Instance of %s expected.', QueryBuilder::class));
+            static::fail(\sprintf('Instance of %s expected.', QueryBuilder::class));
         }
 
         $stmt = $query->execute();
-        $ranking = $stmt->fetchAll();
+        $ranking = $stmt->fetchAllAssociative();
 
         $bestMatch = array_shift($ranking);
+        static::assertIsArray($bestMatch);
         $product = $productRepository->find($bestMatch['product_id']);
 
         if (!($product instanceof Article)) {
-            static::fail(sprintf('Instance of %s expected.', Article::class));
+            static::fail(\sprintf('Instance of %s expected.', Article::class));
         }
 
         $product->setActive(false);
         $modelManager->flush($product);
 
         $stmt = $query->execute();
-        $ranking = $stmt->fetchAll();
+        $ranking = $stmt->fetchAllAssociative();
 
         $bestMatchNew = array_shift($ranking);
 
diff --git a/tests/Functional/Bundle/SearchBundleEs/ConditionHandler/ProductAttributeConditionHandlerTest.php b/tests/Functional/Bundle/SearchBundleEs/ConditionHandler/ProductAttributeConditionHandlerTest.php
index 91e51b9bbfb..01532806767 100644
--- a/tests/Functional/Bundle/SearchBundleEs/ConditionHandler/ProductAttributeConditionHandlerTest.php
+++ b/tests/Functional/Bundle/SearchBundleEs/ConditionHandler/ProductAttributeConditionHandlerTest.php
@@ -1,28 +1,26 @@
 <?php
 
 declare(strict_types=1);
-
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundleEs\ConditionHandler;
diff --git a/tests/Functional/Bundle/SearchBundleEs/FacetHandler/ProductAttributeFacetHandlerTest.php b/tests/Functional/Bundle/SearchBundleEs/FacetHandler/ProductAttributeFacetHandlerTest.php
index ccf825e2454..71513b8a47e 100644
--- a/tests/Functional/Bundle/SearchBundleEs/FacetHandler/ProductAttributeFacetHandlerTest.php
+++ b/tests/Functional/Bundle/SearchBundleEs/FacetHandler/ProductAttributeFacetHandlerTest.php
@@ -1,28 +1,26 @@
 <?php
 
 declare(strict_types=1);
-
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundleEs\FacetHandler;
diff --git a/tests/Functional/Bundle/SearchBundleEs/FacetHandler/_fixtures/ElasticResult.php b/tests/Functional/Bundle/SearchBundleEs/FacetHandler/_fixtures/ElasticResult.php
index e482ea997ca..8bb7d017e9e 100644
--- a/tests/Functional/Bundle/SearchBundleEs/FacetHandler/_fixtures/ElasticResult.php
+++ b/tests/Functional/Bundle/SearchBundleEs/FacetHandler/_fixtures/ElasticResult.php
@@ -1,28 +1,26 @@
 <?php
 
 declare(strict_types=1);
-
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SearchBundleEs\FacetHandler\_fixtures;
diff --git a/tests/Functional/Bundle/SitemapBundle/Provider/CategoryUrlProviderTest.php b/tests/Functional/Bundle/SitemapBundle/Provider/CategoryUrlProviderTest.php
index e1467ab8a79..fcd117c9e7f 100644
--- a/tests/Functional/Bundle/SitemapBundle/Provider/CategoryUrlProviderTest.php
+++ b/tests/Functional/Bundle/SitemapBundle/Provider/CategoryUrlProviderTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SitemapBundle\Provider;
diff --git a/tests/Functional/Bundle/SitemapBundle/Provider/CustomUrlProviderTest.php b/tests/Functional/Bundle/SitemapBundle/Provider/CustomUrlProviderTest.php
index 2fb653f1f9c..7b1dff99ae9 100644
--- a/tests/Functional/Bundle/SitemapBundle/Provider/CustomUrlProviderTest.php
+++ b/tests/Functional/Bundle/SitemapBundle/Provider/CustomUrlProviderTest.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SitemapBundle\Provider;
@@ -27,11 +28,16 @@
 use PHPUnit\Framework\TestCase;
 use Shopware\Bundle\SitemapBundle\Provider\CustomUrlProvider;
 use Shopware\Bundle\SitemapBundle\Service\ConfigHandler;
+use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface;
+use Shopware\Bundle\StoreFrontBundle\Service\Core\ContextService;
 use Shopware\Components\Routing\Context;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
 
 class CustomUrlProviderTest extends TestCase
 {
-    public function testGetUrlsReturnsNoUrls()
+    use ContainerTrait;
+
+    public function testGetUrlsReturnsNoUrls(): void
     {
         $configHandlerStub = $this->createMock(ConfigHandler::class);
         $configHandlerStub->method('get')
@@ -45,7 +51,7 @@ public function testGetUrlsReturnsNoUrls()
         static::assertSame([], $customUrlProvider->getUrls(new Context(), $shopContext));
     }
 
-    public function testGetUrlsReturnsAllUrlsForShop()
+    public function testGetUrlsReturnsAllUrlsForShop(): void
     {
         $shopId = 1;
 
@@ -55,13 +61,14 @@ public function testGetUrlsReturnsAllUrlsForShop()
             ->willReturn([
                 [
                     'url' => 'foo',
-                    'lastMod' => 1546853378,
+                    'lastMod' => '2022-06-13 11:07:47',
                     'changeFreq' => 'weekly',
                     'priority' => 0.5,
                     'shopId' => 2,
-                ], [
+                ],
+                [
                     'url' => 'bar',
-                    'lastMod' => 1546853378,
+                    'lastMod' => '2022-06-13 11:07:47',
                     'changeFreq' => 'weekly',
                     'priority' => 0.5,
                     'shopId' => $shopId,
@@ -72,10 +79,16 @@ public function testGetUrlsReturnsAllUrlsForShop()
 
         $shopContext = $this->getContextService()->createShopContext($shopId);
 
-        static::assertCount(1, $customUrlProvider->getUrls(new Context(), $shopContext));
+        $urls = $customUrlProvider->getUrls(new Context(), $shopContext);
+        static::assertCount(1, $urls);
+
+        static::assertSame(
+            '<url><loc>bar</loc><lastmod>2022-06-13</lastmod><changefreq>weekly</changefreq><priority>0.5</priority></url>',
+            (string) $urls[0]
+        );
     }
 
-    public function testGetUrlsReturnsAllUrlsForShopIdZero()
+    public function testGetUrlsReturnsAllUrlsForShopIdZero(): void
     {
         $shopId = 1;
 
@@ -85,19 +98,21 @@ public function testGetUrlsReturnsAllUrlsForShopIdZero()
             ->willReturn([
                 [
                     'url' => 'foo',
-                    'lastMod' => 1546853378,
+                    'lastMod' => '2022-06-13 11:07:47',
                     'changeFreq' => 'weekly',
                     'priority' => 0.5,
                     'shopId' => 2,
-                ], [
+                ],
+                [
                     'url' => 'bar',
-                    'lastMod' => 1546853378,
+                    'lastMod' => '2022-06-13 11:07:47',
                     'changeFreq' => 'weekly',
                     'priority' => 0.5,
                     'shopId' => 0,
-                ], [
+                ],
+                [
                     'url' => 'fooBar',
-                    'lastMod' => 1546853378,
+                    'lastMod' => '2022-06-13 11:07:47',
                     'changeFreq' => 'weekly',
                     'priority' => 0.5,
                     'shopId' => 0,
@@ -114,7 +129,7 @@ public function testGetUrlsReturnsAllUrlsForShopIdZero()
         static::assertSame('fooBar', $urls[1]->getLoc());
     }
 
-    public function testGetUrlsReturnsNoUrlsWrongShopId()
+    public function testGetUrlsReturnsNoUrlsWrongShopId(): void
     {
         $shopId = 1;
 
@@ -124,7 +139,7 @@ public function testGetUrlsReturnsNoUrlsWrongShopId()
             ->willReturn([
                 [
                     'url' => 'foo',
-                    'lastMod' => 1546853378,
+                    'lastMod' => '2022-06-13 11:07:47',
                     'changeFreq' => 'weekly',
                     'priority' => 0.5,
                     'shopId' => 2,
@@ -138,16 +153,13 @@ public function testGetUrlsReturnsNoUrlsWrongShopId()
         static::assertEmpty($customUrlProvider->getUrls(new Context(), $shopContext));
     }
 
-    private function getCustomUrlProvider(ConfigHandler $configHandlerStub)
+    private function getCustomUrlProvider(ConfigHandler $configHandlerStub): CustomUrlProvider
     {
         return new CustomUrlProvider($configHandlerStub);
     }
 
-    /**
-     * @return \Shopware\Bundle\StoreFrontBundle\Service\Core\ContextService
-     */
-    private function getContextService()
+    private function getContextService(): ContextService
     {
-        return Shopware()->Container()->get(\Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface::class);
+        return $this->getContainer()->get(ContextServiceInterface::class);
     }
 }
diff --git a/tests/Functional/Bundle/SitemapBundle/SitemapLockTest.php b/tests/Functional/Bundle/SitemapBundle/SitemapLockTest.php
index 89de665641c..1f48c30c06a 100644
--- a/tests/Functional/Bundle/SitemapBundle/SitemapLockTest.php
+++ b/tests/Functional/Bundle/SitemapBundle/SitemapLockTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\SitemapBundle;
diff --git a/tests/Functional/Bundle/StoreFrontBundle/BasePriceTest.php b/tests/Functional/Bundle/StoreFrontBundle/BasePriceTest.php
index a4b621629b3..519befd27cf 100644
--- a/tests/Functional/Bundle/StoreFrontBundle/BasePriceTest.php
+++ b/tests/Functional/Bundle/StoreFrontBundle/BasePriceTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\StoreFrontBundle;
diff --git a/tests/Functional/Bundle/StoreFrontBundle/CategoryServiceTest.php b/tests/Functional/Bundle/StoreFrontBundle/CategoryServiceTest.php
index 19f3d36f2b6..78d05fcd025 100644
--- a/tests/Functional/Bundle/StoreFrontBundle/CategoryServiceTest.php
+++ b/tests/Functional/Bundle/StoreFrontBundle/CategoryServiceTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\StoreFrontBundle;
diff --git a/tests/Functional/Bundle/StoreFrontBundle/CheapestPriceTest.php b/tests/Functional/Bundle/StoreFrontBundle/CheapestPriceTest.php
index 5acd1dd277d..ceccf9bdb93 100644
--- a/tests/Functional/Bundle/StoreFrontBundle/CheapestPriceTest.php
+++ b/tests/Functional/Bundle/StoreFrontBundle/CheapestPriceTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\StoreFrontBundle;
diff --git a/tests/Functional/Bundle/StoreFrontBundle/ConfiguratorServiceTest.php b/tests/Functional/Bundle/StoreFrontBundle/ConfiguratorServiceTest.php
index 0dded0fb540..9e26f2530f4 100644
--- a/tests/Functional/Bundle/StoreFrontBundle/ConfiguratorServiceTest.php
+++ b/tests/Functional/Bundle/StoreFrontBundle/ConfiguratorServiceTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\StoreFrontBundle;
@@ -49,10 +48,10 @@ public function testGetProductConfigurator(): void
     {
         $configuratorSet = $this->createConfiguratorSet();
         $combinations = [
-            self::OPTION_ID_1 => [0 => ''],
-            self::OPTION_ID_2 => [0 => ''],
-            self::OPTION_ID_3 => [0 => ''],
-            self::OPTION_ID_4 => [0 => ''],
+            self::OPTION_ID_1 => [[self::OPTION_ID_1]],
+            self::OPTION_ID_2 => [[self::OPTION_ID_2]],
+            self::OPTION_ID_3 => [[self::OPTION_ID_3]],
+            self::OPTION_ID_4 => [[self::OPTION_ID_4]],
         ];
         $configuratorService = $this->createConfiguratorService($configuratorSet, $combinations);
 
@@ -72,14 +71,14 @@ public function testGetProductConfigurator(): void
     }
 
     /**
-     * @param array<int, array<string>> $combinations
+     * @param array<int, array<int, array<int, int>>> $combinations
      */
     private function createConfiguratorService(Set $configuratorSet, array $combinations): ConfiguratorService
     {
         $productConfigurationGateway = $this->createMock(ProductConfigurationGatewayInterface::class);
         $configuratorGateway = $this->createMock(ConfiguratorGatewayInterface::class);
         $configuratorGateway->method('get')->willReturn($configuratorSet);
-        $configuratorGateway->method('getProductCombinations')->willReturn($combinations);
+        $configuratorGateway->method('getAvailableConfigurations')->willReturn($combinations);
 
         return new ConfiguratorService(
             $productConfigurationGateway,
diff --git a/tests/Functional/Bundle/StoreFrontBundle/ConfiguratorTest.php b/tests/Functional/Bundle/StoreFrontBundle/ConfiguratorTest.php
index caa45185132..5cbb19493bf 100644
--- a/tests/Functional/Bundle/StoreFrontBundle/ConfiguratorTest.php
+++ b/tests/Functional/Bundle/StoreFrontBundle/ConfiguratorTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\StoreFrontBundle;
@@ -199,7 +198,7 @@ public function testSelectionConfigurator(): void
     protected function getProduct(
         string $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $additionally = null
     ): array {
         $product = parent::getProduct($number, $context, $category);
diff --git a/tests/Functional/Bundle/StoreFrontBundle/Converter.php b/tests/Functional/Bundle/StoreFrontBundle/Converter.php
index f86838d0c44..bf394a36cec 100644
--- a/tests/Functional/Bundle/StoreFrontBundle/Converter.php
+++ b/tests/Functional/Bundle/StoreFrontBundle/Converter.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\StoreFrontBundle;
@@ -83,12 +82,7 @@ public function convertPriceGroup(PriceGroupModel $entity): PriceGroup
 
     public function convertCategory(CategoryModel $category): Category
     {
-        $struct = new Category();
-        $struct->setId($category->getId());
-        $struct->setName($category->getName());
-        $struct->setPath($category->getPath());
-
-        return $struct;
+        return Category::createFromCategoryEntity($category);
     }
 
     /**
diff --git a/tests/Functional/Bundle/StoreFrontBundle/CoverTest.php b/tests/Functional/Bundle/StoreFrontBundle/CoverTest.php
index 7cddffda200..e6d0789f443 100644
--- a/tests/Functional/Bundle/StoreFrontBundle/CoverTest.php
+++ b/tests/Functional/Bundle/StoreFrontBundle/CoverTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\StoreFrontBundle;
@@ -207,7 +206,7 @@ public function testFallbackImage(): void
     protected function getProduct(
         string $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $imageCount = 1
     ): array {
         $data = parent::getProduct($number, $context, $category);
diff --git a/tests/Functional/Bundle/StoreFrontBundle/DownloadTest.php b/tests/Functional/Bundle/StoreFrontBundle/DownloadTest.php
index 5af515b4909..3a89ff42401 100644
--- a/tests/Functional/Bundle/StoreFrontBundle/DownloadTest.php
+++ b/tests/Functional/Bundle/StoreFrontBundle/DownloadTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\StoreFrontBundle;
@@ -83,7 +82,7 @@ public function testDownloadList(): void
     protected function getProduct(
         string $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $additionally = null
     ): array {
         $product = parent::getProduct($number, $context, $category);
diff --git a/tests/Functional/Bundle/StoreFrontBundle/Gateway/Dbal/ConfiguratorGatewayTest.php b/tests/Functional/Bundle/StoreFrontBundle/Gateway/Dbal/ConfiguratorGatewayTest.php
new file mode 100644
index 00000000000..7d7053e0465
--- /dev/null
+++ b/tests/Functional/Bundle/StoreFrontBundle/Gateway/Dbal/ConfiguratorGatewayTest.php
@@ -0,0 +1,87 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Bundle\StoreFrontBundle\Gateway\Dbal;
+
+use Doctrine\DBAL\Connection;
+use PHPUnit\Framework\TestCase;
+use Shopware\Bundle\StoreFrontBundle\Gateway\ConfiguratorGatewayInterface;
+use Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\ConfiguratorGateway;
+use Shopware\Bundle\StoreFrontBundle\Struct\BaseProduct;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
+
+class ConfiguratorGatewayTest extends TestCase
+{
+    use ContainerTrait;
+    use DatabaseTransactionBehaviour;
+
+    public function testGetProductCombinations(): void
+    {
+        $sqlFile = file_get_contents(__DIR__ . '/fixtures/configurations.sql');
+        static::assertIsString($sqlFile);
+        $this->getContainer()->get(Connection::class)->executeStatement($sqlFile);
+
+        $configuratorGateway = $this->getConfiguratorGateway();
+
+        $baseProduct = new BaseProduct(444444, 444444, 'SWFOO');
+
+        $configuration = $configuratorGateway->getProductCombinations($baseProduct);
+
+        static::assertEqualsCanonicalizing([
+            10 => [20, 30, 40],
+            20 => [10, 11, 30, 40],
+            30 => [10, 11, 20, 40],
+            40 => [10, 11, 20, 30],
+            11 => [20, 30, 40],
+        ], $configuration);
+    }
+
+    public function testGetAvailableConfigurations(): void
+    {
+        $sqlFile = file_get_contents(__DIR__ . '/fixtures/configurations.sql');
+        static::assertIsString($sqlFile);
+        $this->getContainer()->get(Connection::class)->executeStatement($sqlFile);
+
+        $configuratorGateway = $this->getConfiguratorGateway();
+
+        $baseProduct = new BaseProduct(444444, 444444, 'SWFOO');
+
+        $configuration = $configuratorGateway->getAvailableConfigurations($baseProduct);
+
+        static::assertEqualsCanonicalizing([
+            10 => [[10, 20, 30, 40]],
+            20 => [[10, 20, 30, 40], [11, 20, 30, 40]],
+            30 => [[10, 20, 30, 40], [11, 20, 30, 40]],
+            40 => [[10, 20, 30, 40], [11, 20, 30, 40]],
+            11 => [[11, 20, 30, 40]],
+        ], $configuration);
+    }
+
+    public function getConfiguratorGateway(): ConfiguratorGateway
+    {
+        return $this->getContainer()->get(ConfiguratorGatewayInterface::class);
+    }
+}
diff --git a/tests/Functional/Bundle/StoreFrontBundle/Gateway/Dbal/CountryGatewayTest.php b/tests/Functional/Bundle/StoreFrontBundle/Gateway/Dbal/CountryGatewayTest.php
new file mode 100644
index 00000000000..b3cab7523d6
--- /dev/null
+++ b/tests/Functional/Bundle/StoreFrontBundle/Gateway/Dbal/CountryGatewayTest.php
@@ -0,0 +1,87 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Bundle\StoreFrontBundle\Gateway\Dbal;
+
+use Doctrine\DBAL\Connection;
+use PHPUnit\Framework\TestCase;
+use Shopware\Bundle\StoreFrontBundle\Gateway\CountryGatewayInterface;
+use Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\CountryGateway;
+use Shopware\Bundle\StoreFrontBundle\Struct\Country;
+use Shopware\Bundle\StoreFrontBundle\Struct\Currency;
+use Shopware\Bundle\StoreFrontBundle\Struct\Customer\Group;
+use Shopware\Bundle\StoreFrontBundle\Struct\Shop;
+use Shopware\Tests\Functional\Bundle\StoreFrontBundle\TestContext;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
+
+class CountryGatewayTest extends TestCase
+{
+    use ContainerTrait;
+    use DatabaseTransactionBehaviour;
+
+    public function testGetFallbackCountry(): void
+    {
+        $countryGateway = $this->getCountryGateway();
+
+        $shop = new Shop();
+        $shop->setId(1);
+
+        $testContext = new TestContext('', $shop, new Currency(), new Group(), new Group(), [], []);
+
+        $country = $countryGateway->getFallbackCountry($testContext);
+
+        static::assertInstanceOf(Country::class, $country);
+        static::assertTrue($country->isActive());
+        static::assertTrue($country->allowShipping());
+        static::assertEquals('Deutschland', $country->getName());
+    }
+
+    public function testGetFallbackCountryDoesRecognizeTranslations(): void
+    {
+        $sqlFile = file_get_contents(__DIR__ . '/fixtures/country.sql');
+        static::assertIsString($sqlFile);
+        $this->getContainer()->get(Connection::class)->executeStatement($sqlFile);
+
+        $countryGateway = $this->getCountryGateway();
+
+        $shop = new Shop();
+        $shop->setId(1);
+
+        $testContext = new TestContext('', $shop, new Currency(), new Group(), new Group(), [], []);
+
+        $country = $countryGateway->getFallbackCountry($testContext);
+
+        static::assertInstanceOf(Country::class, $country);
+        static::assertTrue($country->isActive());
+        static::assertTrue($country->allowShipping());
+        static::assertEquals('Österreich', $country->getName());
+    }
+
+    public function getCountryGateway(): CountryGateway
+    {
+        return $this->getContainer()->get(CountryGatewayInterface::class);
+    }
+}
diff --git a/tests/Functional/Bundle/StoreFrontBundle/Gateway/Dbal/fixtures/configurations.sql b/tests/Functional/Bundle/StoreFrontBundle/Gateway/Dbal/fixtures/configurations.sql
new file mode 100644
index 00000000000..408f340ca5d
--- /dev/null
+++ b/tests/Functional/Bundle/StoreFrontBundle/Gateway/Dbal/fixtures/configurations.sql
@@ -0,0 +1,26 @@
+INSERT INTO s_articles (id, supplierID, name, description, description_long, shippingtime, datum, active, taxID, pseudosales, topseller, metaTitle, keywords, changetime, pricegroupID, pricegroupActive, filtergroupID, laststock, crossbundlelook, notification, template, mode, main_detail_id, available_from, available_to, configurator_set_id) VALUES
+    (444444, 2, 'FOO', '', '', null, '2012-08-15', 1, 1, 20, 0, null, '', '2012-08-30 16:57:00', 1, 0, 1, 0, 0, 0, '', 0, null, null, null, 8);
+
+INSERT INTO s_articles_details (id, articleID, ordernumber, suppliernumber, kind, additionaltext, sales, active, instock, stockmin, laststock, weight, position, width, height, length, ean, unitID, purchasesteps, maxpurchase, minpurchase, purchaseunit, referenceunit, packunit, releasedate, shippingfree, shippingtime, purchaseprice) VALUES
+(444444, 444444, 'SWFOO', '', 1, '', 0, 1, 25, 0, 0, 0.000, 0, null, null, null, null, 1, null, null, 1, 0.7000, 1.000, 'Flasche(n)', '2012-06-13', 0, '', 0),
+(444445, 444444, 'SWFOO.1', '', 1, '', 0, 1, 25, 0, 0, 0.000, 0, null, null, null, null, 1, null, null, 1, 0.7000, 1.000, 'Flasche(n)', '2012-06-13', 0, '', 0),
+(444446, 444444, 'SWFOO.2', '', 1, '', 0, 1, 25, 0, 1, 0.000, 0, null, null, null, null, 1, null, null, 26, 0.7000, 1.000, 'Flasche(n)', '2012-06-13', 0, '', 0)
+;
+
+INSERT INTO s_article_configurator_option_relations (article_id, option_id) VALUES
+(444444,  10)
+,(444444, 20)
+,(444444, 30)
+,(444444, 40)
+
+,(444445, 11)
+,(444445, 20)
+,(444445, 30)
+,(444445, 40)
+
+,(444446, 10)
+,(444446, 21)
+,(444446, 30)
+,(444446, 40)
+
+;
diff --git a/tests/Functional/Bundle/StoreFrontBundle/Gateway/Dbal/fixtures/country.sql b/tests/Functional/Bundle/StoreFrontBundle/Gateway/Dbal/fixtures/country.sql
new file mode 100644
index 00000000000..19c95912f38
--- /dev/null
+++ b/tests/Functional/Bundle/StoreFrontBundle/Gateway/Dbal/fixtures/country.sql
@@ -0,0 +1 @@
+INSERT INTO s_core_translations (objecttype, objectdata, objectkey, objectlanguage, dirty) VALUES ('config_countries', 'a:1:{i:2;a:2:{s:6:"active";s:1:"0";s:14:"allow_shipping";s:1:"0";}}', 1, '1', 1);
diff --git a/tests/Functional/Bundle/StoreFrontBundle/GraduatedPricesTest.php b/tests/Functional/Bundle/StoreFrontBundle/GraduatedPricesTest.php
index 50c42cb6a5e..bb7453634e5 100644
--- a/tests/Functional/Bundle/StoreFrontBundle/GraduatedPricesTest.php
+++ b/tests/Functional/Bundle/StoreFrontBundle/GraduatedPricesTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\StoreFrontBundle;
@@ -205,7 +204,7 @@ protected function getContext(int $shopId = 1): TestContext
     protected function getProduct(
         string $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $additionally = null
     ): array {
         $data = parent::getProduct($number, $context, $category);
diff --git a/tests/Functional/Bundle/StoreFrontBundle/Helper.php b/tests/Functional/Bundle/StoreFrontBundle/Helper.php
index 33fc20d290b..44161f50c25 100644
--- a/tests/Functional/Bundle/StoreFrontBundle/Helper.php
+++ b/tests/Functional/Bundle/StoreFrontBundle/Helper.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\StoreFrontBundle;
@@ -29,22 +28,10 @@
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\DBAL\Connection;
 use Enlight_Components_Db_Adapter_Pdo_Mysql;
-use Exception;
-use Shopware\Bundle\StoreFrontBundle\Gateway\ConfiguratorGatewayInterface;
-use Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\ConfiguratorGateway;
-use Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\ProductConfigurationGateway;
-use Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\ProductPropertyGateway;
-use Shopware\Bundle\StoreFrontBundle\Gateway\ProductConfigurationGatewayInterface;
-use Shopware\Bundle\StoreFrontBundle\Gateway\ProductPropertyGatewayInterface;
-use Shopware\Bundle\StoreFrontBundle\Service\Core\ConfiguratorService;
-use Shopware\Bundle\StoreFrontBundle\Service\Core\PropertyService;
 use Shopware\Bundle\StoreFrontBundle\Service\ListProductServiceInterface;
-use Shopware\Bundle\StoreFrontBundle\Struct\Configurator\Set as ConfiguratorSet;
 use Shopware\Bundle\StoreFrontBundle\Struct\Customer\Group as CustomerGroupStruct;
 use Shopware\Bundle\StoreFrontBundle\Struct\ListProduct;
-use Shopware\Bundle\StoreFrontBundle\Struct\Property\Set as PropertySet;
 use Shopware\Bundle\StoreFrontBundle\Struct\Shop;
-use Shopware\Bundle\StoreFrontBundle\Struct\ShopContext;
 use Shopware\Bundle\StoreFrontBundle\Struct\ShopContextInterface;
 use Shopware\Bundle\StoreFrontBundle\Struct\Tax as TaxStruct;
 use Shopware\Components\Api\Resource\Article as ProductResource;
@@ -56,7 +43,6 @@
 use Shopware\Models\Article\Article as ProductModel;
 use Shopware\Models\Article\Configurator\Group as ConfiguratorGroup;
 use Shopware\Models\Article\Configurator\Option;
-use Shopware\Models\Article\Detail;
 use Shopware\Models\Article\Supplier;
 use Shopware\Models\Category\Category;
 use Shopware\Models\Customer\Group as CustomerGroup;
@@ -87,102 +73,20 @@ class Helper
 
     private CategoryResource $categoryApi;
 
-    /**
-     * @var string[]
-     */
-    private array $createdProducts = [];
-
-    /**
-     * @var int[]
-     */
-    private array $createdManufacturers = [];
-
-    /**
-     * @var int[]
-     */
-    private array $createdCategories = [];
-
-    /**
-     * @var string[]
-     */
-    private array $createdCustomerGroups = [];
-
-    /**
-     * @var string[]
-     */
-    private array $createdTaxes = [];
-
-    /**
-     * @var string[]
-     */
-    private array $createdCurrencies = [];
-
-    /**
-     * @var int[]
-     */
-    private array $createdConfiguratorGroups = [];
+    private Connection $connection;
 
-    /**
-     * @var string[]
-     */
-    private array $propertyNames = [];
-
-    public function __construct(ContainerInterface $container = null)
+    public function __construct(?ContainerInterface $container = null)
     {
         $this->container = $container ?? Shopware()->Container();
         $this->db = $this->container->get('db');
+        $this->connection = $this->container->get(Connection::class);
         $this->entityManager = $this->container->get('models');
         $this->converter = new Converter();
 
-        $api = new ProductResource();
-        $api->setManager($this->entityManager);
-        $this->articleApi = $api;
-
-        $variantApi = new VariantResource();
-        $variantApi->setManager($this->entityManager);
-        $this->variantApi = $variantApi;
-
-        $translation = new Translation();
-        $translation->setManager($this->entityManager);
-        $this->translationApi = $translation;
-
-        $categoryApi = new CategoryResource();
-        $categoryApi->setManager($this->entityManager);
-        $this->categoryApi = $categoryApi;
-    }
-
-    public function getProductConfigurator(
-        ListProduct $listProduct,
-        ShopContext $context,
-        array $selection = [],
-        ProductConfigurationGateway $productConfigurationGateway = null,
-        ConfiguratorGateway $configuratorGateway = null
-    ): ConfiguratorSet {
-        if ($productConfigurationGateway === null) {
-            $productConfigurationGateway = $this->container->get(ProductConfigurationGatewayInterface::class);
-        }
-        if ($configuratorGateway === null) {
-            $configuratorGateway = $this->container->get(ConfiguratorGatewayInterface::class);
-        }
-
-        $service = new ConfiguratorService(
-            $productConfigurationGateway,
-            $configuratorGateway
-        );
-
-        return $service->getProductConfigurator($listProduct, $context, $selection);
-    }
-
-    public function getProductProperties(
-        ListProduct $product,
-        ShopContext $context,
-        ProductPropertyGateway $productPropertyGateway = null
-    ): PropertySet {
-        if ($productPropertyGateway === null) {
-            $productPropertyGateway = $this->container->get(ProductPropertyGatewayInterface::class);
-        }
-
-        return (new PropertyService($productPropertyGateway))->get($product, $context);
+        $this->articleApi = $this->container->get('shopware.api.article');
+        $this->variantApi = $this->container->get('shopware.api.variant');
+        $this->translationApi = $this->container->get('shopware.api.translation');
+        $this->categoryApi = $this->container->get('shopware.api.category');
     }
 
     /**
@@ -225,7 +129,7 @@ public function getListProduct(string $number, ShopContextInterface $context, ar
     public function getSimpleProduct(
         string $number,
         $tax = null, // Either Model/Tax or Struct/Tax
-        CustomerGroupStruct $customerGroup = null,
+        ?CustomerGroupStruct $customerGroup = null,
         float $priceOffset = 0.00
     ): array {
         if ($tax === null) {
@@ -252,104 +156,11 @@ public function getSimpleProduct(
         return $data;
     }
 
-    public function cleanUp(): void
-    {
-        foreach ($this->propertyNames as $name) {
-            $this->deleteProperties($name);
-        }
-        $this->removePriceGroup();
-        foreach ($this->createdProducts as $number) {
-            $this->removeProduct($number);
-        }
-
-        foreach ($this->createdCustomerGroups as $key) {
-            $this->deleteCustomerGroup($key);
-        }
-
-        foreach ($this->createdTaxes as $tax) {
-            $this->deleteTax($tax);
-        }
-
-        foreach ($this->createdCurrencies as $currency) {
-            $this->deleteCurrency($currency);
-        }
-
-        foreach ($this->createdCategories as $category) {
-            try {
-                $this->categoryApi->delete($category);
-            } catch (Exception $e) {
-            }
-        }
-
-        foreach ($this->createdManufacturers as $manufacturerId) {
-            try {
-                $manufacturer = $this->entityManager->find(Supplier::class, $manufacturerId);
-                if (!$manufacturer) {
-                    continue;
-                }
-
-                $this->entityManager->remove($manufacturer);
-                $this->entityManager->flush();
-            } catch (Exception $e) {
-            }
-        }
-
-        foreach ($this->createdConfiguratorGroups as $groupId) {
-            $group = $this->entityManager->find(ConfiguratorGroup::class, $groupId);
-            if (!$group) {
-                continue;
-            }
-            $this->entityManager->remove($group);
-            $this->entityManager->flush();
-        }
-    }
-
-    public function removeProduct(string $number): void
-    {
-        $productId = $this->db->fetchOne(
-            'SELECT articleID FROM s_articles_details WHERE ordernumber = ?',
-            [$number]
-        );
-
-        if ($productId === false) {
-            return;
-        }
-
-        $product = $this->entityManager->find(ProductModel::class, $productId);
-
-        if ($product) {
-            $this->entityManager->remove($product);
-            $this->entityManager->flush();
-            $this->entityManager->clear();
-        }
-
-        $variantIds = $this->db->fetchCol(
-            'SELECT id FROM s_articles_details WHERE articleID = ?',
-            [$productId]
-        );
-
-        if (empty($variantIds)) {
-            return;
-        }
-
-        foreach ($variantIds as $id) {
-            $detail = $this->entityManager->find(Detail::class, $id);
-            if ($detail) {
-                $this->entityManager->remove($detail);
-                $this->entityManager->flush();
-            }
-        }
-        $this->entityManager->clear();
-    }
-
     /**
      * @param array<string, mixed> $data
      */
     public function createProduct(array $data): ProductModel
     {
-        $this->removeProduct($data['mainDetail']['number']);
-        $this->createdProducts[] = $data['mainDetail']['number'];
-
         return $this->articleApi->create($data);
     }
 
@@ -364,7 +175,10 @@ public function createArticleTranslation(int $articleId, int $shopId): void
         $this->translationApi->create($data);
     }
 
-    public function updateArticle(string $orderNumber, array $data): ProductModel
+    /**
+     * @param array<string, mixed> $data
+     */
+    public function updateProduct(string $orderNumber, array $data): ProductModel
     {
         return $this->articleApi->updateByNumber($orderNumber, $data);
     }
@@ -477,8 +291,6 @@ public function createPriceGroup(array $discounts = []): PriceGroup
             ];
         }
 
-        $this->removePriceGroup();
-
         $priceGroup = new PriceGroup();
         $priceGroup->setName('TEST-GROUP');
 
@@ -513,14 +325,12 @@ public function createCustomerGroup(array $data = []): CustomerGroup
                 'name' => 'Unit test',
                 'tax' => true,
                 'taxInput' => true,
-                'mode' => false, //use discounts?
-                'discount' => 0, //percentage discount
+                'mode' => false, // use discounts?
+                'discount' => 0, // percentage discount
             ],
             $data
         );
 
-        $this->deleteCustomerGroup($data['key']);
-
         $customer = new CustomerGroup();
         $customer->fromArray($data);
 
@@ -528,8 +338,6 @@ public function createCustomerGroup(array $data = []): CustomerGroup
         $this->entityManager->flush($customer);
         $this->entityManager->clear();
 
-        $this->createdCustomerGroups[] = $customer->getKey();
-
         return $customer;
     }
 
@@ -543,8 +351,6 @@ public function createTax(array $data = []): TaxModel
             $data
         );
 
-        $this->deleteTax($data['name']);
-
         $tax = new TaxModel();
         $tax->fromArray($data);
 
@@ -552,8 +358,6 @@ public function createTax(array $data = []): TaxModel
         $this->entityManager->flush();
         $this->entityManager->clear();
 
-        $this->createdTaxes[] = $data['name'];
-
         return $tax;
     }
 
@@ -572,16 +376,12 @@ public function createCurrency(array $data = []): Currency
             $data
         );
 
-        $this->deleteCurrency($data['name']);
-
         $currency->fromArray($data);
 
         $this->entityManager->persist($currency);
         $this->entityManager->flush();
         $this->entityManager->clear();
 
-        $this->createdCurrencies[] = $data['name'];
-
         return $currency;
     }
 
@@ -589,13 +389,7 @@ public function createCategory(array $data = []): Category
     {
         $data = array_merge($this->getCategoryData(), $data);
 
-        $this->deleteCategory($data['name']);
-
-        $category = $this->categoryApi->create($data);
-
-        $this->createdCategories[] = $category->getId();
-
-        return $category;
+        return $this->categoryApi->create($data);
     }
 
     public function createManufacturer(array $data = []): Supplier
@@ -606,8 +400,6 @@ public function createManufacturer(array $data = []): Supplier
         $this->entityManager->persist($manufacturer);
         $this->entityManager->flush();
 
-        $this->createdManufacturers[] = $manufacturer->getId();
-
         return $manufacturer;
     }
 
@@ -627,7 +419,7 @@ public function createVotes(int $articleId, array $points = [], ?int $shopId = n
 
         foreach ($points as $point) {
             $data['points'] = $point;
-            $this->db->insert('s_articles_vote', $data);
+            $this->connection->insert('s_articles_vote', $data);
         }
     }
 
@@ -840,7 +632,7 @@ public function createContext(
         CustomerGroup $currentCustomerGroup,
         ShopModel $shop,
         array $taxes,
-        CustomerGroup $fallbackCustomerGroup = null,
+        ?CustomerGroup $fallbackCustomerGroup = null,
         ?Currency $currency = null
     ): TestContext {
         if ($currency === null) {
@@ -957,12 +749,12 @@ public function insertConfiguratorData(array $groups): array
             $group = new ConfiguratorGroup();
             $group->setName($groupName);
             $group->setPosition($groups);
-            $this->db->executeQuery('DELETE FROM s_article_configurator_groups WHERE name = ?', [$groupName]);
+            $this->connection->executeQuery('DELETE FROM s_article_configurator_groups WHERE name = ?', [$groupName]);
 
             $collection = new ArrayCollection();
             $optionPos = 1;
             foreach ($options as $optionName) {
-                $this->db->executeQuery('DELETE FROM s_article_configurator_options WHERE name = ?', [$optionName]);
+                $this->connection->executeQuery('DELETE FROM s_article_configurator_options WHERE name = ?', [$optionName]);
 
                 $option = new Option();
                 $option->setName($optionName);
@@ -977,8 +769,6 @@ public function insertConfiguratorData(array $groups): array
             $this->entityManager->persist($group);
             $this->entityManager->flush();
             $this->entityManager->clear();
-
-            $this->createdConfiguratorGroups[] = $group->getId();
         }
 
         return $data;
@@ -990,7 +780,7 @@ public function insertConfiguratorData(array $groups): array
      */
     public function generateVariants(
         array $groups,
-        $numberPrefix = null,
+        ?string $numberPrefix = null,
         array $data = []
     ): array {
         $options = [];
@@ -1016,7 +806,7 @@ public function generateVariants(
             $numberPrefix = 'Unit-Test-Variant-';
         }
 
-        $this->db->executeQuery(
+        $this->connection->executeQuery(
             'DELETE FROM s_articles_details WHERE ordernumber LIKE ?',
             [$numberPrefix . '%']
         );
@@ -1040,22 +830,18 @@ public function generateVariants(
 
     private function createProperties(int $groupCount, int $optionCount, string $namePrefix = 'Test'): array
     {
-        $this->propertyNames[] = $namePrefix;
-
-        $this->deleteProperties($namePrefix);
-
-        $this->db->insert('s_filter', ['name' => $namePrefix . '-Set', 'comparable' => 1]);
+        $this->connection->insert('s_filter', ['name' => $namePrefix . '-Set', 'comparable' => 1]);
         $data = $this->db->fetchRow("SELECT * FROM s_filter WHERE name = '" . $namePrefix . "-Set'");
 
         for ($i = 0; $i < $groupCount; ++$i) {
-            $this->db->insert('s_filter_options', [
+            $this->connection->insert('s_filter_options', [
                 'name' => $namePrefix . '-Gruppe-' . $i,
                 'filterable' => 1,
             ]);
             $group = $this->db->fetchRow("SELECT * FROM s_filter_options WHERE name = '" . $namePrefix . '-Gruppe-' . $i . "'");
 
             for ($i2 = 0; $i2 < $optionCount; ++$i2) {
-                $this->db->insert('s_filter_values', [
+                $this->connection->insert('s_filter_values', [
                     'value' => $namePrefix . '-Option-' . $i . '-' . $i2,
                     'optionID' => $group['id'],
                 ]);
@@ -1065,7 +851,7 @@ private function createProperties(int $groupCount, int $optionCount, string $nam
 
             $data['groups'][] = $group;
 
-            $this->db->insert('s_filter_relations', [
+            $this->connection->insert('s_filter_relations', [
                 'optionID' => $group['id'],
                 'groupID' => $data['id'],
             ]);
@@ -1074,28 +860,6 @@ private function createProperties(int $groupCount, int $optionCount, string $nam
         return $data;
     }
 
-    private function deleteProperties(string $namePrefix = 'Test'): void
-    {
-        $this->db->query("DELETE FROM s_filter WHERE name = '" . $namePrefix . "-Set'");
-
-        $ids = $this->db->fetchCol("SELECT id FROM s_filter_options WHERE name LIKE '" . $namePrefix . "-Gruppe%'");
-        foreach ($ids as $id) {
-            $this->db->query('DELETE FROM s_filter_options WHERE id = ?', [$id]);
-            $this->db->query('DELETE FROM s_filter_relations WHERE optionID = ?', [$id]);
-        }
-
-        $this->db->query("DELETE FROM s_filter_values WHERE value LIKE '" . $namePrefix . "-Option%'");
-    }
-
-    private function deleteCategory(string $name): void
-    {
-        $ids = $this->db->fetchCol('SELECT id FROM s_categories WHERE description = ?', [$name]);
-
-        foreach ($ids as $id) {
-            $this->categoryApi->delete($id);
-        }
-    }
-
     private function getVariantsByOptions(int $articleId, array $options): array
     {
         $ids = $this->getProductOptionsByName($articleId, $options);
@@ -1122,65 +886,6 @@ private function getVariantsByOptions(int $articleId, array $options): array
         return array_column($ids, 'article_id');
     }
 
-    private function deleteCustomerGroup(string $key): void
-    {
-        $ids = $this->db->fetchCol('SELECT id FROM s_core_customergroups WHERE groupkey = ?', [$key]);
-        if (!$ids) {
-            return;
-        }
-
-        foreach ($ids as $id) {
-            $customer = $this->entityManager->find(CustomerGroup::class, $id);
-            if (!$customer) {
-                continue;
-            }
-            $this->entityManager->remove($customer);
-            $this->entityManager->flush($customer);
-        }
-        $this->entityManager->clear();
-    }
-
-    private function deleteTax(string $name): void
-    {
-        $ids = $this->db->fetchCol('SELECT id FROM s_core_tax WHERE description = ?', [$name]);
-        if (empty($ids)) {
-            return;
-        }
-
-        foreach ($ids as $id) {
-            $tax = $this->entityManager->find(TaxModel::class, $id);
-            $this->entityManager->remove($tax);
-            $this->entityManager->flush();
-        }
-        $this->entityManager->clear();
-    }
-
-    private function deleteCurrency(string $name): void
-    {
-        $ids = $this->db->fetchCol('SELECT id FROM s_core_currencies WHERE name = ?', [$name]);
-        if (empty($ids)) {
-            return;
-        }
-
-        foreach ($ids as $id) {
-            $tax = $this->entityManager->find(Currency::class, $id);
-            $this->entityManager->remove($tax);
-            $this->entityManager->flush();
-        }
-        $this->entityManager->clear();
-    }
-
-    private function removePriceGroup(): void
-    {
-        $ids = $this->db->fetchCol("SELECT id FROM s_core_pricegroups WHERE description = 'TEST-GROUP'");
-        foreach ($ids as $id) {
-            $group = $this->entityManager->find(PriceGroup::class, $id);
-            $this->entityManager->remove($group);
-            $this->entityManager->flush();
-            $this->entityManager->clear();
-        }
-    }
-
     /**
      * Helper function which combines all array elements
      * of the passed arrays.
diff --git a/tests/Functional/Bundle/StoreFrontBundle/Helper/ProgressHelper.php b/tests/Functional/Bundle/StoreFrontBundle/Helper/ProgressHelper.php
index d80041e60fc..5e1c40c2360 100644
--- a/tests/Functional/Bundle/StoreFrontBundle/Helper/ProgressHelper.php
+++ b/tests/Functional/Bundle/StoreFrontBundle/Helper/ProgressHelper.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\StoreFrontBundle\Helper;
diff --git a/tests/Functional/Bundle/StoreFrontBundle/HrefLangTest.php b/tests/Functional/Bundle/StoreFrontBundle/HrefLangTest.php
index 37d3beb54e5..b9746f8ecad 100644
--- a/tests/Functional/Bundle/StoreFrontBundle/HrefLangTest.php
+++ b/tests/Functional/Bundle/StoreFrontBundle/HrefLangTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\StoreFrontBundle;
diff --git a/tests/Functional/Bundle/StoreFrontBundle/ListProductTest.php b/tests/Functional/Bundle/StoreFrontBundle/ListProductTest.php
index e9ad483e7cf..835f7c0e2d9 100644
--- a/tests/Functional/Bundle/StoreFrontBundle/ListProductTest.php
+++ b/tests/Functional/Bundle/StoreFrontBundle/ListProductTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\StoreFrontBundle;
@@ -58,9 +57,7 @@ public function testProductRequirements(): void
         static::assertNotEmpty($product->getVariantId());
         static::assertNotEmpty($product->getName());
         static::assertNotEmpty($product->getNumber());
-        static::assertNotEmpty($product->getManufacturer());
         static::assertNotEmpty($product->getTax());
-        static::assertNotEmpty($product->getUnit());
 
         static::assertInstanceOf(Unit::class, $product->getUnit());
         static::assertInstanceOf(Manufacturer::class, $product->getManufacturer());
@@ -68,14 +65,11 @@ public function testProductRequirements(): void
         static::assertNotEmpty($product->getPrices());
         static::assertNotEmpty($product->getPriceRules());
         foreach ($product->getPrices() as $price) {
-            static::assertInstanceOf(Price::class, $price);
             static::assertInstanceOf(Unit::class, $price->getUnit());
             static::assertGreaterThanOrEqual(1, $price->getUnit()->getMinPurchase());
         }
 
-        foreach ($product->getPriceRules() as $price) {
-            static::assertInstanceOf(PriceRule::class, $price);
-        }
+        static::assertCount(3, $product->getPriceRules());
 
         static::assertInstanceOf(Price::class, $product->getCheapestPrice());
         static::assertInstanceOf(PriceRule::class, $product->getCheapestPriceRule());
diff --git a/tests/Functional/Bundle/StoreFrontBundle/ManufacturerTest.php b/tests/Functional/Bundle/StoreFrontBundle/ManufacturerTest.php
index ac1e0a2d9f2..2da24c6acfa 100644
--- a/tests/Functional/Bundle/StoreFrontBundle/ManufacturerTest.php
+++ b/tests/Functional/Bundle/StoreFrontBundle/ManufacturerTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\StoreFrontBundle;
@@ -37,7 +36,7 @@ public function testManufacturerList(): void
 
         $manufacturer = $this->helper->createManufacturer([
             'name' => 'testManufacturerList-1',
-            'image' => 'Manufacturer-Cover-1',
+            'image' => 'media/image/Manufacturer-Cover-1',
             'link' => 'www.google.de?manufacturer=1',
             'metaTitle' => 'Meta title',
             'description' => 'Lorem ipsum manufacturer',
@@ -47,7 +46,7 @@ public function testManufacturerList(): void
 
         $manufacturer = $this->helper->createManufacturer([
             'name' => 'testManufacturerList-2',
-            'image' => 'Manufacturer-Cover-2.jpg',
+            'image' => 'media/image/Manufacturer-Cover-2.jpg',
             'link' => 'www.google.de?manufacturer=2',
             'metaTitle' => 'Meta title',
             'description' => 'Lorem ipsum manufacturer',
@@ -57,7 +56,7 @@ public function testManufacturerList(): void
 
         $manufacturer = $this->helper->createManufacturer([
             'name' => 'testManufacturerList-2',
-            'image' => 'Manufacturer-Cover-2.jpg',
+            'image' => 'media/image/Manufacturer-Cover-2.jpg',
             'link' => 'www.google.de?manufacturer=2',
             'metaTitle' => 'Meta title',
             'description' => 'Lorem ipsum manufacturer',
diff --git a/tests/Functional/Bundle/StoreFrontBundle/PriceCalculationTest.php b/tests/Functional/Bundle/StoreFrontBundle/PriceCalculationTest.php
index 9318b6362d1..78c695e1bef 100644
--- a/tests/Functional/Bundle/StoreFrontBundle/PriceCalculationTest.php
+++ b/tests/Functional/Bundle/StoreFrontBundle/PriceCalculationTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\StoreFrontBundle;
diff --git a/tests/Functional/Bundle/StoreFrontBundle/ProductMediaTest.php b/tests/Functional/Bundle/StoreFrontBundle/ProductMediaTest.php
index 4fbf6a23597..36c9c0a6649 100644
--- a/tests/Functional/Bundle/StoreFrontBundle/ProductMediaTest.php
+++ b/tests/Functional/Bundle/StoreFrontBundle/ProductMediaTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\StoreFrontBundle;
@@ -30,7 +29,6 @@
 use Shopware\Bundle\StoreFrontBundle\Gateway\VariantMediaGatewayInterface;
 use Shopware\Bundle\StoreFrontBundle\Service\ListProductServiceInterface;
 use Shopware\Bundle\StoreFrontBundle\Service\ProductServiceInterface;
-use Shopware\Bundle\StoreFrontBundle\Struct;
 use Shopware\Bundle\StoreFrontBundle\Struct\Media;
 use Shopware\Bundle\StoreFrontBundle\Struct\ShopContext;
 use Shopware\Components\Routing\Context;
@@ -142,7 +140,7 @@ public function testProductImagesWithVariant(): void
     protected function getProduct(
         string $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $imageCount = null
     ): array {
         $data = parent::getProduct($number, $context, $category);
@@ -162,7 +160,7 @@ protected function getProduct(
     /**
      * @return array<string, mixed>
      */
-    private function getVariantImageProduct(string $number, Struct\ShopContext $context, int $imageCount = 2): array
+    private function getVariantImageProduct(string $number, ShopContext $context, int $imageCount = 2): array
     {
         $data = $this->getProduct(
             $number,
@@ -188,7 +186,6 @@ private function getVariantImageProduct(string $number, Struct\ShopContext $cont
 
     private function assertMediaFile(string $expected, Media $media): void
     {
-        static::assertInstanceOf(Media::class, $media);
         static::assertNotEmpty($media->getThumbnails());
         static::assertStringContainsString($expected, $media->getFile());
 
diff --git a/tests/Functional/Bundle/StoreFrontBundle/PropertyHydratorTest.php b/tests/Functional/Bundle/StoreFrontBundle/PropertyHydratorTest.php
index a399b6f00c5..4c4cd003075 100644
--- a/tests/Functional/Bundle/StoreFrontBundle/PropertyHydratorTest.php
+++ b/tests/Functional/Bundle/StoreFrontBundle/PropertyHydratorTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\StoreFrontBundle;
@@ -44,6 +43,7 @@ public function setUp(): void
     /**
      * @param array<string, string> $input
      * @param array<string, string> $group
+     *
      * @dataProvider hydrateDataProvider
      */
     public function testHydrate(array $input, array $group): void
diff --git a/tests/Functional/Bundle/StoreFrontBundle/SimilarProductsTest.php b/tests/Functional/Bundle/StoreFrontBundle/SimilarProductsTest.php
index f87d549e30e..e3da120cd0a 100644
--- a/tests/Functional/Bundle/StoreFrontBundle/SimilarProductsTest.php
+++ b/tests/Functional/Bundle/StoreFrontBundle/SimilarProductsTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\StoreFrontBundle;
@@ -167,7 +166,7 @@ public function testSimilarProductsByCategory(): void
     private function getProductObject(
         string $number,
         ShopContext $context,
-        Category $category = null
+        ?Category $category = null
     ): Article {
         $data = $this->getProduct($number, $context, $category);
 
diff --git a/tests/Functional/Bundle/StoreFrontBundle/TestCase.php b/tests/Functional/Bundle/StoreFrontBundle/TestCase.php
index 1fd6ceddfda..285a7258f54 100644
--- a/tests/Functional/Bundle/StoreFrontBundle/TestCase.php
+++ b/tests/Functional/Bundle/StoreFrontBundle/TestCase.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\StoreFrontBundle;
@@ -45,11 +44,13 @@
 use Shopware\Models\Category\Category;
 use Shopware\Models\Customer\Group as CustomerGroupModel;
 use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 use Shopware_Components_Config;
 
 abstract class TestCase extends Enlight_Components_Test_TestCase
 {
     use ContainerTrait;
+    use DatabaseTransactionBehaviour;
 
     protected Helper $helper;
 
@@ -62,14 +63,8 @@ protected function setUp(): void
         parent::setUp();
     }
 
-    protected function tearDown(): void
-    {
-        $this->helper->cleanUp();
-        parent::tearDown();
-    }
-
     /**
-     * @param array<string, array> $products
+     * @param array<string, array<string, mixed>> $products
      *
      * @return Product[]
      */
@@ -104,11 +99,11 @@ public function getEkCustomerGroup(): CustomerGroupStruct
     protected function search(
         array $products,
         array $expectedNumbers,
-        Category $category = null,
+        ?Category $category = null,
         array $conditions = [],
         array $facets = [],
         array $sortings = [],
-        TestContext $context = null,
+        ?TestContext $context = null,
         array $configs = [],
         bool $variantSearch = false
     ): ProductNumberSearchResult {
@@ -223,10 +218,10 @@ protected function assertSearchResult(ProductNumberSearchResult $result, array $
         }, $result->getProducts());
 
         foreach ($numbers as $number) {
-            static::assertContains($number, $expectedNumbers, sprintf('Product with number: `%s` found but not expected', $number));
+            static::assertContains($number, $expectedNumbers, \sprintf('Product with number: `%s` found but not expected', $number));
         }
         foreach ($expectedNumbers as $number) {
-            static::assertContains($number, $numbers, sprintf('Expected product number: `%s` not found', $number));
+            static::assertContains($number, $numbers, \sprintf('Expected product number: `%s` not found', $number));
         }
 
         static::assertCount(\count($expectedNumbers), $result->getProducts());
@@ -246,7 +241,7 @@ protected function assertSearchResultSorting(
             static::assertEquals(
                 $expectedProduct,
                 $product->getNumber(),
-                sprintf(
+                \sprintf(
                     'Expected %s at search result position %s, but got product %s',
                     $expectedProduct,
                     $index,
@@ -283,7 +278,7 @@ protected function getContext(int $shopId = 1): TestContext
     protected function getProduct(
         string $number,
         ShopContext $context,
-        Category $category = null,
+        ?Category $category = null,
         $additionally = []
     ): array {
         $taxRules = $context->getTaxRules();
diff --git a/tests/Functional/Bundle/StoreFrontBundle/TestContext.php b/tests/Functional/Bundle/StoreFrontBundle/TestContext.php
index 6b024de611d..0d564f5f077 100644
--- a/tests/Functional/Bundle/StoreFrontBundle/TestContext.php
+++ b/tests/Functional/Bundle/StoreFrontBundle/TestContext.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\StoreFrontBundle;
@@ -58,14 +57,12 @@ public function setCurrency(Currency $currency): void
         $this->currency = $currency;
     }
 
-    public function setCurrentCustomerGroup(
-        Group $currentCustomerGroup): void
+    public function setCurrentCustomerGroup(Group $currentCustomerGroup): void
     {
         $this->currentCustomerGroup = $currentCustomerGroup;
     }
 
-    public function setFallbackCustomerGroup(
-        Group $fallbackCustomerGroup): void
+    public function setFallbackCustomerGroup(Group $fallbackCustomerGroup): void
     {
         $this->fallbackCustomerGroup = $fallbackCustomerGroup;
     }
diff --git a/tests/Functional/Bundle/StoreFrontBundle/TranslationTest.php b/tests/Functional/Bundle/StoreFrontBundle/TranslationTest.php
index 6c3a9beb804..bf882781818 100644
--- a/tests/Functional/Bundle/StoreFrontBundle/TranslationTest.php
+++ b/tests/Functional/Bundle/StoreFrontBundle/TranslationTest.php
@@ -5,30 +5,32 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\StoreFrontBundle;
 
+use Shopware\Bundle\StoreFrontBundle\Service\ConfiguratorServiceInterface;
+use Shopware\Bundle\StoreFrontBundle\Service\PropertyServiceInterface;
 use Shopware\Bundle\StoreFrontBundle\Struct\Product\Manufacturer;
 use Shopware\Bundle\StoreFrontBundle\Struct\Product\Price;
 use Shopware\Bundle\StoreFrontBundle\Struct\Product\Unit;
+use Shopware\Bundle\StoreFrontBundle\Struct\Property\Set;
 use Shopware\Models\Article\Detail;
 use Shopware\Models\Article\Supplier;
 use Shopware\Models\Article\Unit as UnitModel;
@@ -175,8 +177,9 @@ public function testPropertyTranslation(): void
         $this->helper->createProduct($product);
 
         $listProduct = $this->helper->getListProduct($number, $context);
-        $property = $this->helper->getProductProperties($listProduct, $context);
 
+        $property = $this->getContainer()->get(PropertyServiceInterface::class)->get($listProduct, $context);
+        static::assertInstanceOf(Set::class, $property);
         static::assertEquals('Dummy Translation', $property->getName());
 
         foreach ($property->getGroups() as $group) {
@@ -217,10 +220,7 @@ public function testConfiguratorTranslation(): void
 
         $listProduct = $this->helper->getListProduct($number, $context);
 
-        $configurator = $this->helper->getProductConfigurator(
-            $listProduct,
-            $context
-        );
+        $configurator = $this->getContainer()->get(ConfiguratorServiceInterface::class)->getProductConfigurator($listProduct, $context, []);
 
         foreach ($configurator->getGroups() as $group) {
             $expected = 'Dummy Translation group - ' . $group->getId();
diff --git a/tests/Functional/Bundle/StoreFrontBundle/VoteTest.php b/tests/Functional/Bundle/StoreFrontBundle/VoteTest.php
index 71cb5872c6d..2b6bac6e1c1 100644
--- a/tests/Functional/Bundle/StoreFrontBundle/VoteTest.php
+++ b/tests/Functional/Bundle/StoreFrontBundle/VoteTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Bundle\StoreFrontBundle;
@@ -92,10 +91,10 @@ public function testAverage(): void
     {
         $this->assertShopVotes(
             __FUNCTION__,
-            //generate 2x vote entries for shop "1" with points 1 and 5
+            // generate 2x vote entries for shop "1" with points 1 and 5
             [1 => [1, 5]],
 
-            //expects shop "1" has a count of 3 votes and an average of 6
+            // expects shop "1" has a count of 3 votes and an average of 6
             [1 => ['count' => 2, 'average' => 6]]
         );
     }
@@ -104,10 +103,10 @@ public function testSimpleShopVotes(): void
     {
         $this->assertShopVotes(
             __FUNCTION__,
-            //generate 3x vote entries for shop "1" with points 3,4,5
+            // generate 3x vote entries for shop "1" with points 3,4,5
             [1 => [3, 4, 5]],
 
-            //expects shop "1" has a count of 3 votes and an average of 8 (average*2)
+            // expects shop "1" has a count of 3 votes and an average of 8 (average*2)
             [1 => ['count' => 3, 'average' => 8, 'points' => [3 => 1, 4 => 1, 5 => 1]]]
         );
     }
@@ -116,10 +115,10 @@ public function testShopVotes(): void
     {
         $this->assertShopVotes(
             __FUNCTION__,
-            //generate 3x vote entries for shop "1" with points 3,4,5
+            // generate 3x vote entries for shop "1" with points 3,4,5
             [1 => [3, 4, 5],           2 => [4, 4, 4]],
 
-            //expects shop "1" has a count of 3 votes and an average of 8 (average*2)
+            // expects shop "1" has a count of 3 votes and an average of 8 (average*2)
             [
                 1 => ['count' => 3, 'average' => 8, 'points' => [3 => 1, 4 => 1, 5 => 1]],
                 2 => ['count' => 3, 'average' => 8, 'points' => [4 => 3]],
@@ -132,13 +131,13 @@ public function testLegacyVotes(): void
     {
         $this->assertShopVotes(
             __FUNCTION__,
-            //generate 3x vote entries for shop "null" with points 3,4,5 and shop "1" three times with 4 points
+            // generate 3x vote entries for shop "null" with points 3,4,5 and shop "1" three times with 4 points
             [
                 null => [3, 4, 5],
                 1 => [4, 4, 4],
             ],
 
-            //expects shop "1" has a count of 6 votes and an average of 8 (average*2)
+            // expects shop "1" has a count of 6 votes and an average of 8 (average*2)
             [
                 1 => ['count' => 6, 'average' => 8, 'points' => [3 => 1, 4 => 4, 5 => 1]],
                 2 => ['count' => 3, 'average' => 8, 'points' => [3 => 1, 4 => 1, 5 => 1]],
@@ -188,50 +187,50 @@ public function testDisabledConfig(): void
      */
     private function assertShopVotes(string $number, array $points = [], array $expected = [], array $configs = []): void
     {
-        //switch config values
+        // switch config values
         $config = Shopware()->Container()->get(Shopware_Components_Config::class);
         $originals = [];
         foreach ($configs as $key => $value) {
-            $originals = $config->get($key);
+            $originals[$key] = $config->get($key);
             $config->offsetSet($key, $value);
         }
 
-        //generate simple product
+        // generate simple product
         $context = $this->getContext();
         $data = $this->getProduct($number, $context);
         $product = $this->helper->createProduct($data);
 
-        //generate shop specified votes generated
+        // generate shop specified votes generated
         foreach ($points as $shopId => $shopPoints) {
-            //fix for shop id = null as array key
+            // fix for shop id = null as array key
             if (!\is_int($shopId)) {
                 $shopId = null;
             }
             $this->helper->createVotes($product->getId(), $shopPoints, $shopId);
         }
 
-        //load product struct
+        // load product struct
         $factory = Shopware()->Container()->get('shopware_storefront.base_product_factory');
         $product = $factory->createBaseProduct($number);
         static::assertInstanceOf(BaseProduct::class, $product);
         $service = Shopware()->Container()->get(VoteServiceInterface::class);
 
-        //iterate all expected shop votes/averages
+        // iterate all expected shop votes/averages
         foreach ($expected as $shopId => $data) {
             $context = $this->getContext($shopId);
 
-            //validate vote count of provided shop
+            // validate vote count of provided shop
             if (\array_key_exists('count', $data)) {
                 $votes = $service->get($product, $context);
                 static::assertIsArray($votes);
-                static::assertCount($data['count'], $votes, sprintf('Vote count %s for shop %s of product %s not match', $data['count'], $shopId, $product->getNumber()));
+                static::assertCount($data['count'], $votes, \sprintf('Vote count %s for shop %s of product %s not match', $data['count'], $shopId, $product->getNumber()));
             }
 
-            //validates provided average value of provided shop
+            // validates provided average value of provided shop
             if (\array_key_exists('average', $data)) {
                 $average = $service->getAverage($product, $context);
                 static::assertInstanceOf(VoteAverage::class, $average);
-                static::assertEquals($data['average'], $average->getAverage(), sprintf('Vote average %s for shop %s of product %s not match', $data['average'], $shopId, $product->getNumber()));
+                static::assertEquals($data['average'], $average->getAverage(), \sprintf('Vote average %s for shop %s of product %s not match', $data['average'], $shopId, $product->getNumber()));
             }
 
             if (\array_key_exists('points', $data)) {
@@ -244,13 +243,13 @@ private function assertShopVotes(string $number, array $points = [], array $expe
                 }
 
                 foreach ($data['points'] as $point => $count) {
-                    static::assertArrayHasKey($point, $actual, sprintf('Point count for points %s not exist', $point));
-                    static::assertEquals($count, $actual[$point], sprintf('Expected %s times votes with points %s', $count, $point));
+                    static::assertArrayHasKey($point, $actual, \sprintf('Point count for points %s not exist', $point));
+                    static::assertEquals($count, $actual[$point], \sprintf('Expected %s times votes with points %s', $count, $point));
                 }
             }
         }
 
-        //reset config values
+        // reset config values
         foreach ($originals as $key => $value) {
             $config->offsetSet($key, $value);
         }
diff --git a/tests/Functional/Commands/ConfigSetCommandTest.php b/tests/Functional/Commands/ConfigSetCommandTest.php
index 877b3baeb3c..df8c4de499b 100644
--- a/tests/Functional/Commands/ConfigSetCommandTest.php
+++ b/tests/Functional/Commands/ConfigSetCommandTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Commands;
diff --git a/tests/Functional/Commands/PluginListCommandTest.php b/tests/Functional/Commands/PluginListCommandTest.php
new file mode 100644
index 00000000000..f2dceb014a3
--- /dev/null
+++ b/tests/Functional/Commands/PluginListCommandTest.php
@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Commands;
+
+use PHPUnit\Framework\TestCase;
+use Shopware\Commands\PluginListCommand;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Symfony\Component\Console\Tester\CommandTester;
+
+class PluginListCommandTest extends TestCase
+{
+    use ContainerTrait;
+
+    public function testFilterInputOptionIsString(): void
+    {
+        $command = $this->getContainer()->get(PluginListCommand::class);
+
+        $commandTester = new CommandTester($command);
+
+        $commandTester->execute([]);
+
+        static::assertIsString($command->getDefinition()->getOption('filter')->getDefault());
+        static::assertStringContainsString('shopware AG', $commandTester->getDisplay());
+        static::assertStringNotContainsString('PHP Deprecated:  strtolower(): Passing null to parameter #1 ($string) of type string is deprecated', $commandTester->getDisplay());
+    }
+}
diff --git a/tests/Functional/Commands/RefreshSearchIndexTest.php b/tests/Functional/Commands/RefreshSearchIndexTest.php
new file mode 100644
index 00000000000..2fbfea3f0ce
--- /dev/null
+++ b/tests/Functional/Commands/RefreshSearchIndexTest.php
@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Commands;
+
+use Doctrine\DBAL\Connection;
+use PHPUnit\Framework\TestCase;
+use Shopware\Commands\RefreshSearchIndexCommand;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
+use Symfony\Component\Console\Tester\CommandTester;
+
+class RefreshSearchIndexTest extends TestCase
+{
+    use DatabaseTransactionBehaviour;
+    use ContainerTrait;
+
+    public function testExecuteClearTables(): void
+    {
+        $connection = $this->getContainer()->get(Connection::class);
+        $firstResultForKeywords = $connection->fetchOne('SELECT MAX(id) FROM s_search_keywords');
+
+        $command = $this->getContainer()->get(RefreshSearchIndexCommand::class);
+        $commandTester = new CommandTester($command);
+
+        $input = [
+            '--clear-table' => true,
+        ];
+        $commandTester->execute($input);
+
+        $connection = $this->getContainer()->get(Connection::class);
+
+        static::assertNotEquals($firstResultForKeywords,
+            $connection->fetchOne('SELECT MAX(id) FROM s_search_keywords')
+        );
+    }
+}
diff --git a/tests/Functional/Components/AclTest.php b/tests/Functional/Components/AclTest.php
index 97cb05fc877..1790f3d47ba 100644
--- a/tests/Functional/Components/AclTest.php
+++ b/tests/Functional/Components/AclTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components;
diff --git a/tests/Functional/Components/Api/AddressTest.php b/tests/Functional/Components/Api/AddressTest.php
index e3f88ce2d1e..848bd0130a4 100644
--- a/tests/Functional/Components/Api/AddressTest.php
+++ b/tests/Functional/Components/Api/AddressTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Api;
diff --git a/tests/Functional/Components/Api/ArticleTest.php b/tests/Functional/Components/Api/ArticleTest.php
index 51fdecc61d7..b29e3089d5d 100644
--- a/tests/Functional/Components/Api/ArticleTest.php
+++ b/tests/Functional/Components/Api/ArticleTest.php
@@ -5,268 +5,150 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Api;
 
 use Doctrine\Common\Collections\Criteria;
-use Exception;
+use Doctrine\DBAL\Connection;
 use Shopware\Bundle\AttributeBundle\Service\CrudServiceInterface;
 use Shopware\Bundle\MediaBundle\MediaServiceInterface;
 use Shopware\Components\Api\Exception\NotFoundException;
 use Shopware\Components\Api\Exception\ParameterMissingException;
 use Shopware\Components\Api\Exception\ValidationException;
-use Shopware\Components\Api\Resource\Article;
+use Shopware\Components\Api\Resource\Article as ProductApiResource;
 use Shopware\Components\Api\Resource\Resource;
 use Shopware\Components\Model\ModelEntity;
 use Shopware\Models\Article\Article as ProductModel;
 use Shopware\Models\Article\Configurator\Group as ConfiguratorGroup;
-use Shopware\Models\Article\Configurator\Option;
-use Shopware\Models\Article\Detail;
+use Shopware\Models\Article\Configurator\Option as ConfiguratorOption;
+use Shopware\Models\Article\Configurator\Set;
+use Shopware\Models\Article\Detail as ProductVariant;
 use Shopware\Models\Article\Download;
 use Shopware\Models\Article\Price;
+use Shopware\Models\Article\Supplier;
 use Shopware\Models\Article\Unit;
 use Shopware\Models\Attribute\Article as ProductAttribute;
-use Shopware\Models\Attribute\ArticleImage;
+use Shopware\Models\Attribute\ArticleImage as ProductImage;
 use Shopware\Models\Category\Category;
 use Shopware\Models\Customer\Group as CustomerGroup;
 use Shopware\Models\Media\Media;
+use Shopware\Models\Property\Option as PropertyOption;
 use Shopware\Models\Property\Value;
+use Shopware\Models\Shop\Shop;
+use Shopware\Models\Tax\Tax;
+use Shopware\Tests\Functional\Helper\Utils;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 
 class ArticleTest extends TestCase
 {
+    use DatabaseTransactionBehaviour;
+
     /**
-     * @var Article
+     * @var ProductApiResource
      */
     protected $resource;
 
-    public function createResource(): Article
+    public function createResource(): ProductApiResource
     {
-        return new Article();
+        return new ProductApiResource();
     }
 
     public function testCreateShouldBeSuccessful(): int
     {
-        $testData = [
-            'name' => 'Testartikel',
-            'description' => 'Test description',
-            'descriptionLong' => 'Test descriptionLong',
-            'active' => true,
-            'pseudoSales' => 999,
-            'highlight' => true,
-            'keywords' => 'test, testarticle',
-            'metaTitle' => 'this is a test title with umlauts äöüß',
-            'filterGroupId' => 1,
-            'propertyValues' => [
-                [
-                    'value' => 'grün',
-                    'option' => [
-                        'name' => 'Farbe',
-                    ],
-                ],
-                [
-                    'value' => 'testWert',
-                    'option' => [
-                        'name' => 'neueOption' . uniqid((string) rand()),
-                    ],
-                ],
-            ],
-            'mainDetail' => [
-                'number' => 'swTEST' . uniqid((string) rand()),
-                'inStock' => 15,
-                'unitId' => 1,
-                'attribute' => [
-                    'attr1' => 'Freitext1',
-                    'attr2' => 'Freitext2',
-                ],
-                'minPurchase' => 5,
-                'purchaseSteps' => 2,
-                'prices' => [
-                    [
-                        'customerGroupKey' => 'EK',
-                        'to' => 20,
-                        'price' => 500,
-                    ],
-                    [
-                        'customerGroupKey' => 'EK',
-                        'from' => 21,
-                        'to' => '-',
-                        'price' => 400,
-                    ],
-                ],
-            ],
-            'configuratorSet' => [
-                'name' => 'MeinKonf',
-                'groups' => [
-                    [
-                        'name' => 'Farbe',
-                        'options' => [
-                            ['name' => 'Gelb'],
-                            ['name' => 'grün'],
-                        ],
-                    ],
-                    [
-                        'name' => 'Gräße',
-                        'options' => [
-                            ['name' => 'L'],
-                            ['name' => 'XL'],
-                        ],
-                    ],
-                ],
-            ],
-            'variants' => [
-                [
-                    'number' => 'swTEST.variant.' . uniqid((string) rand()),
-                    'inStock' => 17,
-                    // create a new unit
-                    'unit' => [
-                        'unit' => 'xyz',
-                        'name' => 'newUnit',
-                    ],
-                    'attribute' => [
-                        'attr3' => 'Freitext3',
-                        'attr4' => 'Freitext4',
-                    ],
-                    'configuratorOptions' => [
-                        [
-                            'option' => 'Gelb',
-                            'group' => 'Farbe',
-                        ],
-                        [
-                            'option' => 'XL',
-                            'group' => 'Größe',
-                        ],
-                    ],
-                    'minPurchase' => 5,
-                    'purchaseSteps' => 2,
-                    'prices' => [
-                        [
-                            'customerGroupKey' => 'H',
-                            'to' => 20,
-                            'price' => 500,
-                        ],
-                        [
-                            'customerGroupKey' => 'H',
-                            'from' => 21,
-                            'to' => '-',
-                            'price' => 400,
-                        ],
-                    ],
-                ],
-            ],
-            'taxId' => 1,
-            'supplierId' => 2,
-            'similar' => [
-                ['id' => 5],
-                ['id' => 6],
-            ],
-            'categories' => [
-                ['id' => 15],
-                ['id' => 10],
-            ],
-            'related' => [
-                ['id' => 3, 'cross' => true],
-                ['id' => 4],
-            ],
-            'links' => [
-                ['name' => 'foobar', 'link' => 'http://example.org'],
-                ['name' => 'Video', 'link' => 'http://example.org'],
-            ],
-        ];
-
-        $article = $this->resource->create($testData);
-
-        static::assertInstanceOf(ProductModel::class, $article);
-        static::assertGreaterThan(0, $article->getId());
+        $testData = $this->getTestData();
+        $product = $this->createProduct($testData);
 
-        static::assertEquals($article->getName(), $testData['name']);
-        static::assertEquals($article->getDescription(), $testData['description']);
-        static::assertEquals($article->getMetaTitle(), $testData['metaTitle']);
+        static::assertSame($product->getName(), $testData['name']);
+        static::assertSame($product->getDescription(), $testData['description']);
+        static::assertSame($product->getMetaTitle(), $testData['metaTitle']);
 
-        static::assertEquals($article->getDescriptionLong(), $testData['descriptionLong']);
+        static::assertSame($product->getDescriptionLong(), $testData['descriptionLong']);
 
+        static::assertInstanceOf(ProductVariant::class, $product->getMainDetail());
+        static::assertInstanceOf(ProductAttribute::class, $product->getMainDetail()->getAttribute());
         // Check attributes of main variant
-        static::assertEquals(
-            $article->getMainDetail()->getAttribute()->getAttr1(),
+        static::assertSame(
+            $product->getMainDetail()->getAttribute()->getAttr1(),
             $testData['mainDetail']['attribute']['attr1']
         );
-        static::assertEquals(
-            $article->getMainDetail()->getAttribute()->getAttr2(),
+        static::assertSame(
+            $product->getMainDetail()->getAttribute()->getAttr2(),
             $testData['mainDetail']['attribute']['attr2']
         );
 
         // Check attributes of non-main variant
-        $variant = $article->getDetails()->matching(Criteria::create()->where(
+        $variant = $product->getDetails()->matching(Criteria::create()->where(
             Criteria::expr()->eq('number', $testData['variants'][0]['number'])
         ));
-        static::assertEquals(
+        static::assertSame(
             $variant->first()->getAttribute()->getAttr3(),
             $testData['variants'][0]['attribute']['attr3']
         );
-        static::assertEquals(
+        static::assertSame(
             $variant->first()->getAttribute()->getAttr4(),
             $testData['variants'][0]['attribute']['attr4']
         );
 
-        $propertyValues = $article->getPropertyValues()->getValues();
+        $propertyValues = $product->getPropertyValues()->getValues();
         static::assertCount(\count($testData['propertyValues']), $propertyValues);
         foreach ($propertyValues as $propertyValue) {
             static::assertContains($propertyValue->getValue(), ['grün', 'testWert']);
         }
 
-        static::assertEquals($testData['taxId'], $article->getTax()->getId());
+        static::assertInstanceOf(Tax::class, $product->getTax());
+        static::assertSame($testData['taxId'], $product->getTax()->getId());
 
-        static::assertCount(2, $article->getCategories());
-        static::assertCount(2, $article->getRelated());
-        static::assertCount(2, $article->getSimilar());
-        static::assertCount(2, $article->getLinks());
-        static::assertCount(2, $article->getMainDetail()->getPrices());
-        foreach ($article->getMainDetail()->getPrices() as $price) {
+        static::assertCount(2, $product->getCategories());
+        static::assertCount(2, $product->getRelated());
+        static::assertCount(2, $product->getSimilar());
+        static::assertCount(2, $product->getLinks());
+        static::assertCount(2, $product->getMainDetail()->getPrices());
+        foreach ($product->getMainDetail()->getPrices() as $price) {
             static::assertGreaterThan(0, $price->getFrom());
         }
-        foreach ($article->getDetails() as $variant) {
+        foreach ($product->getDetails() as $variant) {
             foreach ($variant->getPrices() as $price) {
                 static::assertGreaterThan(0, $price->getFrom());
             }
         }
 
-        return $article->getId();
+        return $product->getId();
     }
 
     public function testCreateWithNewUnitShouldBeSuccessful(): int
     {
         $testData = [
-            'name' => 'Testarticle',
+            'name' => 'Testproduct',
             'description' => 'testdescription',
             'descriptionLong' => 'Test descriptionLong',
             'active' => true,
             'pseudoSales' => 999,
             'highlight' => true,
-            'keywords' => 'test, testarticle',
+            'keywords' => 'test, testproduct',
             'tax' => 19,
             'categories' => [
                 ['id' => 15],
                 ['id' => 10],
             ],
             'mainDetail' => [
-                'number' => 'swTEST' . uniqid((string) rand()),
+                'number' => 'swTEST' . uniqid((string) mt_rand()),
                 // create new unit
                 'unit' => [
                     'name' => 'newunit',
@@ -281,34 +163,34 @@ public function testCreateWithNewUnitShouldBeSuccessful(): int
             ],
         ];
 
-        $article = $this->resource->create($testData);
-        // change number for second article
-        $testData['mainDetail']['number'] = 'swTEST' . uniqid((string) rand());
-        $secondArticle = $this->resource->create($testData);
+        $product = $this->createProduct($testData);
+        // change number for second product
+        $testData['mainDetail']['number'] = 'swTEST' . uniqid((string) mt_rand());
+        $secondProduct = $this->createProduct($testData);
 
-        static::assertInstanceOf(ProductModel::class, $article);
-        static::assertGreaterThan(0, $article->getId());
+        static::assertSame($testData['name'], $product->getName());
+        static::assertSame($testData['description'], $product->getDescription());
+        static::assertNull($product->getMetaTitle());
 
-        static::assertEquals($article->getName(), $testData['name']);
-        static::assertEquals($article->getDescription(), $testData['description']);
-        static::assertEquals($article->getMetaTitle(), $testData['metaTitle']);
-
-        foreach ($article->getMainDetail()->getPrices() as $price) {
+        static::assertInstanceOf(ProductVariant::class, $product->getMainDetail());
+        foreach ($product->getMainDetail()->getPrices() as $price) {
             static::assertGreaterThan(0, $price->getFrom());
         }
 
-        static::assertInstanceOf(Unit::class, $article->getMainDetail()->getUnit());
-        static::assertGreaterThan(0, $article->getMainDetail()->getUnit()->getId());
-        static::assertEquals($article->getMainDetail()->getUnit()->getName(), $testData['mainDetail']['unit']['name']);
-        static::assertEquals($article->getMainDetail()->getUnit()->getUnit(), $testData['mainDetail']['unit']['unit']);
+        static::assertInstanceOf(Unit::class, $product->getMainDetail()->getUnit());
+        static::assertGreaterThan(0, $product->getMainDetail()->getUnit()->getId());
+        static::assertSame($testData['mainDetail']['unit']['name'], $product->getMainDetail()->getUnit()->getName());
+        static::assertSame($testData['mainDetail']['unit']['unit'], $product->getMainDetail()->getUnit()->getUnit());
 
-        static::assertEquals($article->getMainDetail()->getUnit()->getId(), $secondArticle->getMainDetail()->getUnit()->getId());
+        static::assertInstanceOf(ProductVariant::class, $secondProduct->getMainDetail());
+        static::assertInstanceOf(Unit::class, $secondProduct->getMainDetail()->getUnit());
+        static::assertSame($product->getMainDetail()->getUnit()->getId(), $secondProduct->getMainDetail()->getUnit()->getId());
 
-        return $article->getId();
+        return $product->getId();
     }
 
     /*
-     * Test that empty article attributes are created
+     * Test that empty product attributes are created
      */
     public function testCreateWithoutAttributes(): void
     {
@@ -322,7 +204,7 @@ public function testCreateWithoutAttributes(): void
             'taxId' => 1,
             'supplierId' => 1,
             'mainDetail' => [
-                'number' => 'swAttr1' . uniqid((string) rand(), true),
+                'number' => 'swAttr1' . uniqid((string) mt_rand(), true),
                 'inStock' => 15,
                 'unitId' => 1,
                 'prices' => [
@@ -332,7 +214,7 @@ public function testCreateWithoutAttributes(): void
             ],
             'variants' => [
                 [
-                    'number' => 'swAttr2' . uniqid((string) rand(), true),
+                    'number' => 'swAttr2' . uniqid((string) mt_rand(), true),
                     'inStock' => 15,
                     'unitId' => 1,
                     'prices' => [
@@ -344,28 +226,29 @@ public function testCreateWithoutAttributes(): void
             'configuratorSet' => $configurator,
         ];
 
-        $article = $this->resource->create($testData);
+        $product = $this->resource->create($testData);
 
         // Load actual database model
         $this->resource->setResultMode(Resource::HYDRATE_OBJECT);
-        $data = $this->resource->getOne($article->getId());
+        $readProduct = $this->resource->getOne($product->getId());
+        static::assertInstanceOf(ProductModel::class, $readProduct);
 
-        static::assertEquals(2, $data->getDetails()->count());
-        foreach ($data->getDetails() as $variant) {
+        static::assertCount(2, $readProduct->getDetails());
+        foreach ($readProduct->getDetails() as $variant) {
             static::assertNotNull($variant->getAttribute());
             static::assertNull($variant->getAttribute()->getAttr1());
         }
     }
 
     /**
-     * Test that creating an article with images generates thumbnails
+     * Test that creating a product with images generates thumbnails
      *
-     * @return int Article Id
+     * @return int Product ID
      */
     public function testCreateWithImageShouldCreateThumbnails(): int
     {
         $testData = [
-            'name' => 'Test article with images',
+            'name' => 'Test product with images',
             'description' => 'Test description',
             'active' => true,
             'filterGroupId' => 1,
@@ -379,7 +262,7 @@ public function testCreateWithImageShouldCreateThumbnails(): int
                 [
                     'value' => 'testWert',
                     'option' => [
-                        'name' => 'neueOption' . uniqid((string) rand()),
+                        'name' => 'neueOption' . uniqid((string) mt_rand()),
                     ],
                 ],
             ],
@@ -387,15 +270,12 @@ public function testCreateWithImageShouldCreateThumbnails(): int
                 [
                     'link' => 'file://' . __DIR__ . '/fixtures/test-bild.jpg',
                 ],
-                [
-                    'link' => 'data:image/png;base64,' . require (__DIR__ . '/fixtures/base64image.php'),
-                ],
                 [
                     'link' => 'file://' . __DIR__ . '/fixtures/variant-image.png',
                 ],
             ],
             'mainDetail' => [
-                'number' => 'swTEST' . uniqid((string) rand()),
+                'number' => 'swTEST' . uniqid((string) mt_rand()),
                 'inStock' => 15,
                 'unitId' => 1,
                 'attribute' => [
@@ -429,7 +309,7 @@ public function testCreateWithImageShouldCreateThumbnails(): int
                         ],
                     ],
                     [
-                        'name' => 'Gräße',
+                        'name' => 'Größe',
                         'options' => [
                             ['name' => 'L'],
                             ['name' => 'XL'],
@@ -439,7 +319,7 @@ public function testCreateWithImageShouldCreateThumbnails(): int
             ],
             'variants' => [
                 [
-                    'number' => 'swTEST.variant.' . uniqid((string) rand()),
+                    'number' => 'swTEST.variant.' . uniqid((string) mt_rand()),
                     'inStock' => 17,
                     // create a new unit
                     'unit' => [
@@ -487,39 +367,37 @@ public function testCreateWithImageShouldCreateThumbnails(): int
             'supplierId' => 2,
         ];
 
-        $article = $this->resource->create($testData);
-
-        static::assertInstanceOf(ProductModel::class, $article);
-        static::assertGreaterThan(0, $article->getId());
-        static::assertCount(4, $article->getImages());
+        $product = $this->createProduct($testData);
+        static::assertCount(3, $product->getImages());
 
         $mediaService = Shopware()->Container()->get(MediaServiceInterface::class);
 
-        foreach ($article->getImages() as $image) {
+        foreach ($product->getImages() as $image) {
+            static::assertInstanceOf(Media::class, $image->getMedia());
             static::assertCount(4, $image->getMedia()->getThumbnails());
             foreach ($image->getMedia()->getThumbnails() as $thumbnail) {
                 static::assertTrue($mediaService->has($thumbnail));
             }
         }
-        foreach ($article->getMainDetail()->getPrices() as $price) {
+        static::assertInstanceOf(ProductVariant::class, $product->getMainDetail());
+        foreach ($product->getMainDetail()->getPrices() as $price) {
             static::assertGreaterThan(0, $price->getFrom());
         }
-        foreach ($article->getDetails() as $variant) {
+        foreach ($product->getDetails() as $variant) {
             foreach ($variant->getPrices() as $price) {
                 static::assertGreaterThan(0, $price->getFrom());
             }
         }
 
-        return $article->getId();
+        return $product->getId();
     }
 
-    /**
-     * @depends testCreateWithImageShouldCreateThumbnails
-     */
-    public function testFlipArticleMainVariantShouldBeSuccessful(int $id): void
+    public function testFlipProductMainVariantShouldBeSuccessful(): void
     {
-        $originalArticle = $this->resource->getOne($id);
-        $mainVariantNumber = (string) $originalArticle['mainDetailId'];
+        $id = $this->testCreateWithImageShouldCreateThumbnails();
+        $originalProduct = $this->resource->getOne($id);
+        static::assertIsArray($originalProduct);
+        $mainVariantNumber = (string) $originalProduct['mainDetailId'];
 
         $testData = [
             'mainDetail' => [
@@ -575,34 +453,35 @@ public function testFlipArticleMainVariantShouldBeSuccessful(int $id): void
             ],
         ];
 
-        $article = $this->resource->update($id, $testData);
+        $product = $this->resource->update($id, $testData);
 
-        static::assertEquals($mainVariantNumber, $article->getMainDetail()->getNumber());
+        static::assertInstanceOf(ProductVariant::class, $product->getMainDetail());
+        static::assertSame($mainVariantNumber, $product->getMainDetail()->getNumber());
     }
 
     /**
-     * Test that updating an Article with images generates thumbnails
-     *
-     * @depends testCreateWithImageShouldCreateThumbnails
+     * Test that updating a Product with images generates thumbnails
      */
-    public function testUpdateWithImageShouldCreateThumbnails(int $id): void
+    public function testUpdateWithImageShouldCreateThumbnails(): void
     {
         $testData = [
             'images' => [
                 [
-                    'link' => 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAABhGlDQ1BJQ0MgcHJvZmlsZQAAKJF9kT1Iw0AcxV9bpSJVh3YQcchQnSyI36NWoQgVQq3QqoPJpV/QpCFJcXEUXAsOfixWHVycdXVwFQTBDxA3NydFFynxf0mhRYwHx/14d+9x9w7w18tMNTtGAVWzjFQiLmSyq0LwFQGE0YtJTEvM1OdEMQnP8XUPH1/vYjzL+9yfo0fJmQzwCcSzTDcs4g3iqU1L57xPHGFFSSE+Jx4x6ILEj1yXXX7jXHDYzzMjRjo1TxwhFgptLLcxKxoq8QRxVFE1yvdnXFY4b3FWy1XWvCd/YSinrSxzneYgEljEEkQIkFFFCWVYiNGqkWIiRftxD/+A4xfJJZOrBEaOBVSgQnL84H/wu1szPz7mJoXiQOeLbX8MAcFdoFGz7e9j226cAIFn4Epr+St1YOaT9FpLix4BfdvAxXVLk/eAyx2g/0mXDMmRAjT9+TzwfkbflAXCt0D3mttbcx+nD0CaukreAAeHwHCBstc93t3V3tu/Z5r9/QDUInLOjro6CQAAAAlwSFlzAAAuIwAALiMBeKU/dgAAAAd0SU1FB+UDEw42F48Am4gAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAADElEQVQI12NgmPsfAAI9AZ115ELHAAAAAElFTkSuQmCC',
+                    'link' => 'file://' . __DIR__ . '/fixtures/test-bild.jpg',
                 ],
             ],
         ];
 
-        $article = $this->resource->update($id, $testData);
+        $id = $this->testCreateWithImageShouldCreateThumbnails();
+        $product = $this->resource->update($id, $testData);
         $mediaService = Shopware()->Container()->get(MediaServiceInterface::class);
 
-        static::assertInstanceOf(ProductModel::class, $article);
-        static::assertGreaterThan(0, $article->getId());
+        static::assertInstanceOf(ProductModel::class, $product);
+        static::assertGreaterThan(0, $product->getId());
 
-        static::assertCount(5, $article->getImages());
-        foreach ($article->getImages() as $image) {
+        static::assertCount(4, $product->getImages());
+        foreach ($product->getImages() as $image) {
+            static::assertInstanceOf(Media::class, $image->getMedia());
             static::assertCount(4, $image->getMedia()->getThumbnails());
             foreach ($image->getMedia()->getThumbnails() as $thumbnail) {
                 static::assertTrue($mediaService->has($thumbnail));
@@ -619,7 +498,7 @@ public function testUpdateWithImageShouldCreateThumbnails(int $id): void
     public function testCreateWithImageShouldCreateThumbnailsWithRightProportions(): void
     {
         $testData = [
-            'name' => 'Test article with images and right proportions',
+            'name' => 'Test product with images and right proportions',
             'description' => 'Test description',
             'active' => true,
             'filterGroupId' => 1,
@@ -633,7 +512,7 @@ public function testCreateWithImageShouldCreateThumbnailsWithRightProportions():
                 [
                     'value' => 'testWert',
                     'option' => [
-                        'name' => 'neueOption' . uniqid((string) rand()),
+                        'name' => 'neueOption' . uniqid((string) mt_rand()),
                     ],
                 ],
             ],
@@ -643,7 +522,7 @@ public function testCreateWithImageShouldCreateThumbnailsWithRightProportions():
                 ],
             ],
             'mainDetail' => [
-                'number' => 'swTEST' . uniqid((string) rand()),
+                'number' => 'swTEST' . uniqid((string) mt_rand()),
                 'inStock' => 15,
                 'unitId' => 1,
                 'attribute' => [
@@ -678,7 +557,7 @@ public function testCreateWithImageShouldCreateThumbnailsWithRightProportions():
                         ],
                     ],
                     [
-                        'name' => 'Gräße',
+                        'name' => 'Größe',
                         'options' => [
                             ['name' => 'L'],
                             ['name' => 'XL'],
@@ -688,7 +567,7 @@ public function testCreateWithImageShouldCreateThumbnailsWithRightProportions():
             ],
             'variants' => [
                 [
-                    'number' => 'swTEST.variant.' . uniqid((string) rand()),
+                    'number' => 'swTEST.variant.' . uniqid((string) mt_rand()),
                     'inStock' => 17,
                     // create a new unit
                     'unit' => [
@@ -736,11 +615,8 @@ public function testCreateWithImageShouldCreateThumbnailsWithRightProportions():
             'supplierId' => 2,
         ];
 
-        $article = $this->resource->create($testData);
-
-        static::assertInstanceOf(ProductModel::class, $article);
-        static::assertGreaterThan(0, $article->getId());
-        static::assertCount(2, $article->getImages());
+        $product = $this->createProduct($testData);
+        static::assertCount(2, $product->getImages());
 
         $proportionalSizes = [
             '200x200',
@@ -751,7 +627,8 @@ public function testCreateWithImageShouldCreateThumbnailsWithRightProportions():
 
         $mediaService = Shopware()->Container()->get(MediaServiceInterface::class);
 
-        foreach ($article->getImages() as $image) {
+        foreach ($product->getImages() as $image) {
+            static::assertInstanceOf(Media::class, $image->getMedia());
             $thumbnails = $image->getMedia()->getThumbnails();
             static::assertCount(4, $thumbnails);
             $thumbnails = array_values($thumbnails);
@@ -770,22 +647,22 @@ public function testCreateWithImageShouldCreateThumbnailsWithRightProportions():
             }
         }
 
-        $this->resource->delete($article->getId());
+        $this->resource->delete($product->getId());
     }
 
     /**
-     * Test creating an article with new configurator set and multiple variants SW-7925
+     * Test creating a product with new configurator set and multiple variants SW-7925
      */
     public function testCreateWithVariantsAndNewConfiguratorSetShouldBeSuccessful(): void
     {
         $testData = [
-            'name' => 'Test article',
+            'name' => 'Test product',
             'description' => 'Test description',
             'descriptionLong' => 'Long test description',
             'active' => true,
             'pseudoSales' => 999,
             'highlight' => true,
-            'keywords' => 'test, testarticle',
+            'keywords' => 'test, testproduct',
             'metaTitle' => 'this is a test title with umlauts äöüß',
             'filterGroupId' => 1,
             'propertyValues' => [
@@ -798,12 +675,12 @@ public function testCreateWithVariantsAndNewConfiguratorSetShouldBeSuccessful():
                 [
                     'value' => 'testWert',
                     'option' => [
-                        'name' => 'neueOption' . uniqid((string) rand()),
+                        'name' => 'neueOption' . uniqid((string) mt_rand()),
                     ],
                 ],
             ],
             'mainDetail' => [
-                'number' => 'swConfigSetMainTest' . uniqid((string) rand()),
+                'number' => 'swConfigSetMainTest' . uniqid((string) mt_rand()),
                 'inStock' => 15,
                 'unitId' => 1,
                 'attribute' => [
@@ -853,7 +730,7 @@ public function testCreateWithVariantsAndNewConfiguratorSetShouldBeSuccessful():
             ],
             'variants' => [
                 [
-                    'number' => 'swConfigSetMainTest.variant.' . uniqid((string) rand()),
+                    'number' => 'swConfigSetMainTest.variant.' . uniqid((string) mt_rand()),
                     'inStock' => 17,
                     // create a new unit
                     'unit' => [
@@ -896,7 +773,7 @@ public function testCreateWithVariantsAndNewConfiguratorSetShouldBeSuccessful():
                     ],
                 ],
                 [
-                    'number' => 'swConfigSetMainTest.variant.' . uniqid((string) rand()),
+                    'number' => 'swConfigSetMainTest.variant.' . uniqid((string) mt_rand()),
                     'inStock' => 18,
                     // create another new unit
                     'unit' => [
@@ -947,38 +824,38 @@ public function testCreateWithVariantsAndNewConfiguratorSetShouldBeSuccessful():
             ],
         ];
 
-        $article = $this->resource->create($testData);
-
-        static::assertInstanceOf(ProductModel::class, $article);
-        static::assertGreaterThan(0, $article->getId());
+        $product = $this->createProduct($testData);
 
-        static::assertEquals($article->getName(), $testData['name']);
-        static::assertEquals($article->getDescription(), $testData['description']);
-        static::assertEquals($article->getMetaTitle(), $testData['metaTitle']);
+        static::assertSame($product->getName(), $testData['name']);
+        static::assertSame($product->getDescription(), $testData['description']);
+        static::assertSame($product->getMetaTitle(), $testData['metaTitle']);
 
-        static::assertEquals($article->getDescriptionLong(), $testData['descriptionLong']);
-        static::assertEquals(
-            $article->getMainDetail()->getAttribute()->getAttr1(),
+        static::assertSame($product->getDescriptionLong(), $testData['descriptionLong']);
+        static::assertInstanceOf(ProductVariant::class, $product->getMainDetail());
+        static::assertInstanceOf(ProductAttribute::class, $product->getMainDetail()->getAttribute());
+        static::assertSame(
+            $product->getMainDetail()->getAttribute()->getAttr1(),
             $testData['mainDetail']['attribute']['attr1']
         );
-        static::assertEquals(
-            $article->getMainDetail()->getAttribute()->getAttr2(),
+        static::assertSame(
+            $product->getMainDetail()->getAttribute()->getAttr2(),
             $testData['mainDetail']['attribute']['attr2']
         );
 
-        $propertyValues = $article->getPropertyValues()->getValues();
+        $propertyValues = $product->getPropertyValues()->getValues();
         static::assertCount(\count($testData['propertyValues']), $propertyValues);
         foreach ($propertyValues as $propertyValue) {
             static::assertContains($propertyValue->getValue(), ['grün', 'testWert']);
         }
 
-        static::assertEquals($testData['taxId'], $article->getTax()->getId());
+        static::assertInstanceOf(Tax::class, $product->getTax());
+        static::assertSame($testData['taxId'], $product->getTax()->getId());
 
-        static::assertCount(2, $article->getCategories());
-        static::assertCount(0, $article->getRelated());
-        static::assertCount(0, $article->getSimilar());
-        static::assertCount(2, $article->getLinks());
-        static::assertCount(2, $article->getMainDetail()->getPrices());
+        static::assertCount(2, $product->getCategories());
+        static::assertCount(0, $product->getRelated());
+        static::assertCount(0, $product->getSimilar());
+        static::assertCount(2, $product->getLinks());
+        static::assertCount(2, $product->getMainDetail()->getPrices());
 
         $groups = Shopware()->Models()->getRepository(ConfiguratorGroup::class)->findBy(
             ['name' => ['Group1', 'Group2']]
@@ -988,46 +865,41 @@ public function testCreateWithVariantsAndNewConfiguratorSetShouldBeSuccessful():
             Shopware()->Models()->remove($group);
         }
 
-        $this->resource->delete($article->getId());
+        $this->resource->delete($product->getId());
     }
 
-    /**
-     * @depends testCreateShouldBeSuccessful
-     */
-    public function testGetOneByNumberShouldBeSuccessful($id): void
+    public function testGetOneByNumberShouldBeSuccessful(): void
     {
+        $id = $this->createProduct($this->getTestData())->getId();
         $this->resource->setResultMode(Resource::HYDRATE_OBJECT);
-        $article = $this->resource->getOne($id);
-        $number = $article->getMainDetail()->getNumber();
-
-        $article = $this->resource->getOneByNumber($number);
-        static::assertEquals($id, $article->getId());
+        $product = $this->resource->getOne($id);
+        static::assertInstanceOf(ProductModel::class, $product);
+        static::assertInstanceOf(ProductVariant::class, $product->getMainDetail());
+        $number = $product->getMainDetail()->getNumber();
+        static::assertIsString($number);
+        $product = $this->resource->getOneByNumber($number);
+        static::assertInstanceOf(ProductModel::class, $product);
+        static::assertSame($id, $product->getId());
     }
 
-    /**
-     * @depends testCreateShouldBeSuccessful
-     */
-    public function testGetOneShouldBeSuccessful($id): void
+    public function testGetOneShouldBeSuccessful(): void
     {
-        $article = $this->resource->getOne($id);
-        static::assertGreaterThan(0, $article['id']);
+        $id = $this->createProduct($this->getTestData())->getId();
+        $product = $this->resource->getOne($id);
+        static::assertIsArray($product);
+        static::assertGreaterThan(0, $product['id']);
     }
 
-    /**
-     * @depends testCreateShouldBeSuccessful
-     */
-    public function testGetOneShouldBeAbleToReturnObject($id): void
+    public function testGetOneShouldBeAbleToReturnObject(): void
     {
+        $id = $this->createProduct($this->getTestData())->getId();
         $this->resource->setResultMode(Resource::HYDRATE_OBJECT);
-        $article = $this->resource->getOne($id);
+        $product = $this->resource->getOne($id);
 
-        static::assertInstanceOf(ProductModel::class, $article);
-        static::assertGreaterThan(0, $article->getId());
+        static::assertInstanceOf(ProductModel::class, $product);
+        static::assertGreaterThan(0, $product->getId());
     }
 
-    /**
-     * @depends testCreateShouldBeSuccessful
-     */
     public function testGetListShouldBeSuccessful(): void
     {
         $result = $this->resource->getList();
@@ -1041,19 +913,18 @@ public function testGetListShouldBeSuccessful(): void
 
     /**
      * Tests that getList uses only the main variants attributes for filtering
-     *
-     * @depends testCreateShouldBeSuccessful
      */
-    public function testGetListShouldUseCorrectDetailsAttribute(int $id): void
+    public function testGetListShouldUseCorrectDetailsAttribute(): void
     {
-        // Filter with attribute of main variant => article found
+        $id = $this->createProduct($this->getTestData())->getId();
+        // Filter with attribute of main variant => product found
         $result = $this->resource->getList(0, 1, [
             'id' => $id,
             'attribute.attr1' => 'Freitext1', // Belongs to main variant
         ]);
 
-        static::assertEquals(1, $result['total']);
-        static::assertEquals($id, $result['data'][0]['id'], (string) $id);
+        static::assertSame(1, $result['total']);
+        static::assertSame($id, $result['data'][0]['id'], (string) $id);
 
         // Filter with attribute of other (non-main) variant => no result
         $result = $this->resource->getList(0, 1, [
@@ -1061,7 +932,7 @@ public function testGetListShouldUseCorrectDetailsAttribute(int $id): void
             'attribute.attr3' => 'Freitext3',
         ]);
 
-        static::assertEquals(0, $result['total']);
+        static::assertSame(0, $result['total']);
     }
 
     public function testCreateWithInvalidDataShouldThrowValidationException(): void
@@ -1076,14 +947,15 @@ public function testCreateWithInvalidDataShouldThrowValidationException(): void
         $this->resource->create($testData);
     }
 
-    /**
-     * @depends testCreateShouldBeSuccessful
-     */
-    public function testUpdateByNumberShouldBeSuccessful($id): ?string
+    public function testUpdateByNumberShouldBeSuccessful(): ?string
     {
+        $id = $this->createProduct($this->getTestData())->getId();
         $this->resource->setResultMode(Resource::HYDRATE_OBJECT);
-        $article = $this->resource->getOne($id);
-        $number = $article->getMainDetail()->getNumber();
+        $product = $this->resource->getOne($id);
+        static::assertInstanceOf(ProductModel::class, $product);
+        static::assertInstanceOf(ProductVariant::class, $product->getMainDetail());
+        $number = $product->getMainDetail()->getNumber();
+        static::assertIsString($number);
 
         $testData = [
             'description' => 'Update description',
@@ -1103,34 +975,32 @@ public function testUpdateByNumberShouldBeSuccessful($id): ?string
             'similar' => [],
         ];
 
-        $article = $this->resource->updateByNumber($number, $testData);
+        $product = $this->resource->updateByNumber($number, $testData);
 
-        static::assertInstanceOf(ProductModel::class, $article);
-        static::assertEquals($id, $article->getId());
-        static::assertEquals($article->getDescription(), $testData['description']);
-        static::assertEquals($article->getDescriptionLong(), $testData['descriptionLong']);
+        static::assertInstanceOf(ProductModel::class, $product);
+        static::assertSame($id, $product->getId());
+        static::assertSame($product->getDescription(), $testData['description']);
+        static::assertSame($product->getDescriptionLong(), $testData['descriptionLong']);
 
-        static::assertEquals($testData['supplierId'], $article->getSupplier()->getId());
+        static::assertInstanceOf(Supplier::class, $product->getSupplier());
+        static::assertSame($testData['supplierId'], $product->getSupplier()->getId());
 
-        $propertyValues = $article->getPropertyValues()->getValues();
+        $propertyValues = $product->getPropertyValues()->getValues();
         static::assertCount(\count($propertyValues), $testData['propertyValues']);
 
         // Categories should be updated
-        static::assertCount(1, $article->getCategories());
+        static::assertCount(1, $product->getCategories());
 
         // Related should be untouched
-        static::assertCount(2, $article->getRelated());
+        static::assertCount(2, $product->getRelated());
 
         // Similar should be removed
-        static::assertCount(0, $article->getSimilar());
+        static::assertCount(0, $product->getSimilar());
 
         return $number;
     }
 
-    /**
-     * @depends testCreateShouldBeSuccessful
-     */
-    public function testUpdateShouldBeSuccessful($id): int
+    public function testUpdateShouldBeSuccessful(): int
     {
         $testData = [
             'description' => 'Update description',
@@ -1150,34 +1020,32 @@ public function testUpdateShouldBeSuccessful($id): int
             'similar' => [],
         ];
 
-        $article = $this->resource->update($id, $testData);
+        $id = $this->createProduct($this->getTestData())->getId();
+        $product = $this->resource->update($id, $testData);
 
-        static::assertInstanceOf(ProductModel::class, $article);
-        static::assertEquals($id, $article->getId());
-        static::assertEquals($article->getDescription(), $testData['description']);
-        static::assertEquals($article->getDescriptionLong(), $testData['descriptionLong']);
-
-        static::assertEquals($testData['supplierId'], $article->getSupplier()->getId());
+        static::assertInstanceOf(ProductModel::class, $product);
+        static::assertSame($id, $product->getId());
+        static::assertSame($product->getDescription(), $testData['description']);
+        static::assertSame($product->getDescriptionLong(), $testData['descriptionLong']);
+        static::assertInstanceOf(Supplier::class, $product->getSupplier());
+        static::assertSame($testData['supplierId'], $product->getSupplier()->getId());
 
-        $propertyValues = $article->getPropertyValues()->getValues();
+        $propertyValues = $product->getPropertyValues()->getValues();
         static::assertCount(\count($propertyValues), $testData['propertyValues']);
 
         // Categories should be updated
-        static::assertCount(1, $article->getCategories());
+        static::assertCount(1, $product->getCategories());
 
         // Related should be untouched
-        static::assertCount(2, $article->getRelated());
+        static::assertCount(2, $product->getRelated());
 
         // Similar should be removed
-        static::assertCount(0, $article->getSimilar());
+        static::assertCount(0, $product->getSimilar());
 
         return $id;
     }
 
-    /**
-     * @depends testCreateShouldBeSuccessful
-     */
-    public function testUpdateWithInvalidDataShouldThrowValidationException($id): void
+    public function testUpdateWithInvalidDataShouldThrowValidationException(): void
     {
         $this->expectException(ValidationException::class);
         // required field name is blank
@@ -1187,6 +1055,7 @@ public function testUpdateWithInvalidDataShouldThrowValidationException($id): vo
             'descriptionLong' => 'Update descriptionLong',
         ];
 
+        $id = $this->createProduct($this->getTestData())->getId();
         $this->resource->update($id, $testData);
     }
 
@@ -1199,18 +1068,16 @@ public function testUpdateWithInvalidIdShouldThrowNotFoundException(): void
     public function testUpdateWithMissingIdShouldThrowParameterMissingException(): void
     {
         $this->expectException(ParameterMissingException::class);
-        $this->resource->update('', []);
+        $this->resource->update(0, []);
     }
 
-    /**
-     * @depends testUpdateShouldBeSuccessful
-     */
-    public function testDeleteShouldBeSuccessful($id): void
+    public function testDeleteShouldBeSuccessful(): void
     {
-        $article = $this->resource->delete($id);
+        $id = $this->createProduct($this->getTestData())->getId();
+        $product = $this->resource->delete($id);
 
-        static::assertInstanceOf(ProductModel::class, $article);
-        static::assertSame(0, (int) $article->getId());
+        static::assertInstanceOf(ProductModel::class, $product);
+        static::assertSame(0, (int) $product->getId());
     }
 
     public function testDeleteWithInvalidIdShouldThrowNotFoundException(): void
@@ -1222,13 +1089,13 @@ public function testDeleteWithInvalidIdShouldThrowNotFoundException(): void
     public function testDeleteWithMissingIdShouldThrowParameterMissingException(): void
     {
         $this->expectException(ParameterMissingException::class);
-        $this->resource->delete('');
+        $this->resource->delete(0);
     }
 
     /**
-     * Test case to add a new article image over a media id.
+     * Test case to add a new product image over a media id.
      */
-    public function testAddArticleMediaOverMediaId(): void
+    public function testAddProductMediaOverMediaId(): void
     {
         $this->resource->update(
             2,
@@ -1243,25 +1110,18 @@ public function testAddArticleMediaOverMediaId(): void
                 ],
             ]
         );
-        $article = $this->resource->getOne(2);
+        $product = $this->resource->getOne(2);
+        static::assertIsArray($product);
 
-        $image = array_pop($article['images']);
-        static::assertEquals(25, $image['mediaId']);
+        $image = array_pop($product['images']);
+        static::assertSame(25, $image['mediaId']);
     }
 
-    public function testUpdateToVariantArticle(): void
+    public function testUpdateToVariantProduct(): void
     {
-        try {
-            $id = $this->resource->getIdFromNumber('turn');
-            if (!empty($id)) {
-                $this->resource->delete($id);
-            }
-        } catch (Exception $e) {
-        }
-
-        $article = $this->createConfiguratorSetProduct();
+        $product = $this->createConfiguratorSetProduct();
 
-        $updateArticle = [
+        $updateProduct = [
             'configuratorSet' => [
                 'groups' => [
                     [
@@ -1348,8 +1208,8 @@ public function testUpdateToVariantArticle(): void
                 ],
             ],
         ];
-        $updated = $this->resource->update($article->getId(), $updateArticle);
-        static::assertEquals('Turnschuhe', $updated->getName(), "Article name don't match");
+        $updated = $this->resource->update($product->getId(), $updateProduct);
+        static::assertSame('Turnschuhe', $updated->getName(), 'Product name does not match');
 
         foreach ($updated->getDetails() as $variant) {
             static::assertContains(
@@ -1358,34 +1218,21 @@ public function testUpdateToVariantArticle(): void
                 'Variant number dont match'
             );
 
-            static::assertCount(2, $variant->getConfiguratorOptions(), 'Configurator option count dont match');
+            static::assertCount(2, $variant->getConfiguratorOptions(), 'Configurator option count does not match');
 
             foreach ($variant->getConfiguratorOptions() as $option) {
                 static::assertContains($option->getName(), ['M', 'S', 'blau', 'grün']);
             }
         }
 
-        try {
-            if (!empty($id)) {
-                $this->resource->delete($id);
-            }
-        } catch (Exception $e) {
-        }
+        $this->resource->delete($updated->getId());
     }
 
     public function testUpdateToConfiguratorSetPosition(): void
     {
-        try {
-            $id = $this->resource->getIdFromNumber('turn');
-            if (!empty($id)) {
-                $this->resource->delete($id);
-            }
-        } catch (Exception $e) {
-        }
-
-        $article = $this->createConfiguratorSetProduct();
+        $product = $this->createConfiguratorSetProduct();
 
-        $updateArticle = [
+        $updateProduct = [
             'configuratorSet' => [
                 'groups' => [
                     [
@@ -1472,8 +1319,8 @@ public function testUpdateToConfiguratorSetPosition(): void
                 ],
             ],
         ];
-        $updated = $this->resource->update($article->getId(), $updateArticle);
-        static::assertEquals('Turnschuhe', $updated->getName(), "Article name doesn't match");
+        $updated = $this->resource->update($product->getId(), $updateProduct);
+        static::assertSame('Turnschuhe', $updated->getName(), 'Product name does not match');
 
         foreach ($updated->getDetails() as $variant) {
             static::assertContains(
@@ -1487,16 +1334,16 @@ public function testUpdateToConfiguratorSetPosition(): void
 
                 switch ($option->getName()) {
                     case 'M':
-                        static::assertEquals(4, $option->getPosition());
+                        static::assertSame(4, $option->getPosition());
                         break;
                     case 'S':
-                        static::assertEquals(123, $option->getPosition());
+                        static::assertSame(123, $option->getPosition());
                         break;
                     case 'blau':
-                        static::assertEquals(11, $option->getPosition());
+                        static::assertSame(11, $option->getPosition());
                         break;
                     case 'grün':
-                        static::assertEquals(99, $option->getPosition());
+                        static::assertSame(99, $option->getPosition());
                         break;
 
                     default:
@@ -1505,27 +1352,14 @@ public function testUpdateToConfiguratorSetPosition(): void
             }
         }
 
-        try {
-            if (!empty($id)) {
-                $this->resource->delete($id);
-            }
-        } catch (Exception $e) {
-        }
+        $this->resource->delete($updated->getId());
     }
 
     public function testUpdateToConfiguratorSetType(): void
     {
-        try {
-            $id = $this->resource->getIdFromNumber('turn');
-            if (!empty($id)) {
-                $this->resource->delete($id);
-            }
-        } catch (Exception $e) {
-        }
-
-        $article = $this->createConfiguratorSetProduct();
+        $product = $this->createConfiguratorSetProduct();
 
-        $updateArticle = [
+        $updateProduct = [
             'configuratorSet' => [
                 'type' => 2,
                 'groups' => [
@@ -1613,30 +1447,18 @@ public function testUpdateToConfiguratorSetType(): void
                 ],
             ],
         ];
-        $updated = $this->resource->update($article->getId(), $updateArticle);
-        static::assertEquals(2, $updated->getConfiguratorSet()->getType(), "ConfiguratorSet.Type doesn't match");
+        $updated = $this->resource->update($product->getId(), $updateProduct);
+        static::assertInstanceOf(Set::class, $updated->getConfiguratorSet());
+        static::assertSame(2, $updated->getConfiguratorSet()->getType(), "ConfiguratorSet.Type doesn't match");
 
-        try {
-            if (!empty($id)) {
-                $this->resource->delete($id);
-            }
-        } catch (Exception $e) {
-        }
+        $this->resource->delete($updated->getId());
     }
 
     public function testUpdateToConfiguratorSetPositionsShouldBeGenerated(): void
     {
-        try {
-            $id = $this->resource->getIdFromNumber('turn');
-            if (!empty($id)) {
-                $this->resource->delete($id);
-            }
-        } catch (Exception $e) {
-        }
-
-        $article = $this->createConfiguratorSetProduct();
+        $product = $this->createConfiguratorSetProduct();
 
-        $updateArticle = [
+        $updateProduct = [
             'configuratorSet' => [
                 'type' => 2,
                 'groups' => [
@@ -1651,39 +1473,25 @@ public function testUpdateToConfiguratorSetPositionsShouldBeGenerated(): void
                 ],
             ],
         ];
-        $options = $this->resource->update($article->getId(), $updateArticle)->getConfiguratorSet()->getOptions();
+        $updated = $this->resource->update($product->getId(), $updateProduct);
+        static::assertInstanceOf(Set::class, $updated->getConfiguratorSet());
+        $options = $updated->getConfiguratorSet()->getOptions();
 
-        static::assertInstanceOf(Option::class, $options[0]);
+        static::assertInstanceOf(ConfiguratorOption::class, $options[0]);
         static::assertSame(0, $options[0]->getPosition());
-        static::assertInstanceOf(Option::class, $options[1]);
+        static::assertInstanceOf(ConfiguratorOption::class, $options[1]);
         static::assertSame(1, $options[1]->getPosition());
-        static::assertInstanceOf(Option::class, $options[2]);
+        static::assertInstanceOf(ConfiguratorOption::class, $options[2]);
         static::assertSame(2, $options[2]->getPosition());
 
-        try {
-            if (!empty($id)) {
-                $this->resource->delete($id);
-            }
-        } catch (Exception $e) {
-        }
+        $this->resource->delete($updated->getId());
     }
 
-    /**
-     * @depends testUpdateToConfiguratorSetPositionsShouldBeGenerated
-     */
     public function testUpdateToConfiguratorSetPositionsShouldOverwritePositions(): void
     {
-        try {
-            $id = $this->resource->getIdFromNumber('turn');
-            if (!empty($id)) {
-                $this->resource->delete($id);
-            }
-        } catch (Exception $e) {
-        }
+        $product = $this->createConfiguratorSetProduct();
 
-        $article = $this->createConfiguratorSetProduct();
-
-        $updateArticle = [
+        $updateProduct = [
             'configuratorSet' => [
                 'type' => 2,
                 'groups' => [
@@ -1698,40 +1506,27 @@ public function testUpdateToConfiguratorSetPositionsShouldOverwritePositions():
                 ],
             ],
         ];
-        $options = $this->resource->update($article->getId(), $updateArticle)->getConfiguratorSet()->getOptions();
 
-        static::assertInstanceOf(Option::class, $options[0]);
+        $updated = $this->resource->update($product->getId(), $updateProduct);
+        static::assertInstanceOf(Set::class, $updated->getConfiguratorSet());
+        $options = $updated->getConfiguratorSet()->getOptions();
+
+        static::assertInstanceOf(ConfiguratorOption::class, $options[0]);
         static::assertSame(5, $options[0]->getPosition());
-        static::assertInstanceOf(Option::class, $options[1]);
+        static::assertInstanceOf(ConfiguratorOption::class, $options[1]);
         static::assertSame(6, $options[1]->getPosition());
-        static::assertInstanceOf(Option::class, $options[2]);
+        static::assertInstanceOf(ConfiguratorOption::class, $options[2]);
         static::assertSame(11, $options[2]->getPosition());
 
-        try {
-            if (!empty($id)) {
-                $this->resource->delete($id);
-            }
-        } catch (Exception $e) {
-        }
+        $this->resource->delete($updated->getId());
     }
 
-    /**
-     * @depends testUpdateToConfiguratorSetPositionsShouldBeGenerated
-     * @depends testUpdateToConfiguratorSetPositionsShouldOverwritePositions
-     */
     public function testUpdateToConfiguratorSetPositionsShouldRemainUntouched(): void
     {
-        try {
-            $id = $this->resource->getIdFromNumber('turn');
-            if (!empty($id)) {
-                $this->resource->delete($id);
-            }
-        } catch (Exception $e) {
-        }
+        $this->testUpdateToConfiguratorSetPositionsShouldOverwritePositions();
+        $product = $this->createConfiguratorSetProduct();
 
-        $article = $this->createConfiguratorSetProduct();
-
-        $updateArticle = [
+        $updateProduct = [
             'configuratorSet' => [
                 'type' => 2,
                 'groups' => [
@@ -1745,26 +1540,26 @@ public function testUpdateToConfiguratorSetPositionsShouldRemainUntouched(): voi
                 ],
             ],
         ];
-        $options = $this->resource->update($article->getId(), $updateArticle)->getConfiguratorSet()->getOptions();
 
-        static::assertInstanceOf(Option::class, $options[0]);
-        static::assertSame(5, $options[0]->getPosition());
-        static::assertInstanceOf(Option::class, $options[1]);
-        static::assertSame(11, $options[1]->getPosition());
+        $updated = $this->resource->update($product->getId(), $updateProduct);
+        static::assertInstanceOf(Set::class, $updated->getConfiguratorSet());
+        $options = $updated->getConfiguratorSet()->getOptions();
 
-        try {
-            if (!empty($id)) {
-                $this->resource->delete($id);
-            }
-        } catch (Exception $e) {
-        }
+        $firstOption = $options[0];
+        static::assertInstanceOf(ConfiguratorOption::class, $firstOption);
+        static::assertSame(5, $firstOption->getPosition());
+        $secondOption = $options[1];
+        static::assertInstanceOf(ConfiguratorOption::class, $secondOption);
+        static::assertSame(11, $secondOption->getPosition());
+
+        $this->resource->delete($updated->getId());
     }
 
     public function testCreateUseConfiguratorId(): string
     {
         $configurator = $this->getSimpleConfiguratorSet(2);
         $variantOptions = $this->getVariantOptionsOfSet($configurator);
-        $variantNumber = 'swVariant' . uniqid((string) rand());
+        $variantNumber = 'swVariant' . uniqid((string) mt_rand());
 
         $testData = [
             'name' => 'Testartikel',
@@ -1774,7 +1569,7 @@ public function testCreateUseConfiguratorId(): string
             'taxId' => 1,
             'supplierId' => 1,
             'mainDetail' => [
-                'number' => 'swTEST' . uniqid((string) rand()),
+                'number' => 'swTEST' . uniqid((string) mt_rand()),
                 'inStock' => 15,
                 'unitId' => 1,
                 'prices' => [
@@ -1795,25 +1590,24 @@ public function testCreateUseConfiguratorId(): string
             'configuratorSet' => $configurator,
         ];
 
-        $article = $this->resource->create($testData);
+        $product = $this->resource->create($testData);
 
         $this->resource->setResultMode(Resource::HYDRATE_ARRAY);
-        $data = $this->resource->getOne($article->getId());
+        $data = $this->resource->getOne($product->getId());
+        static::assertIsArray($data);
 
         static::assertCount(2, $data['details'][0]['configuratorOptions']);
 
         return $variantNumber;
     }
 
-    /**
-     * @depends testCreateUseConfiguratorId
-     */
-    public function testUpdateUseConfiguratorIds($variantNumber): void
+    public function testUpdateUseConfiguratorIds(): void
     {
+        $variantNumber = $this->testCreateUseConfiguratorId();
         $configurator = $this->getSimpleConfiguratorSet(2);
         $variantOptions = $this->getVariantOptionsOfSet($configurator);
 
-        $id = Shopware()->Db()->fetchOne(
+        $id = (int) Shopware()->Db()->fetchOne(
             'SELECT articleID FROM s_articles_details WHERE ordernumber = ?',
             [$variantNumber]
         );
@@ -1830,6 +1624,7 @@ public function testUpdateUseConfiguratorIds($variantNumber): void
         $this->resource->update($id, $data);
 
         $data = $this->resource->getOne($id);
+        static::assertIsArray($data);
         static::assertCount(2, $data['details'][0]['configuratorOptions']);
     }
 
@@ -1840,14 +1635,14 @@ public function testCreateWithMainImages(): int
         );
 
         $builder = Shopware()->Models()->createQueryBuilder();
-        $builder->select(
-            [
-                'media.id as mediaId',
-                '2 as main',
-            ]
-        )->from(Media::class, 'media')->addOrderBy('media.id', 'ASC')->setFirstResult(
-            5
-        )->setMaxResults(4);
+        $builder->select([
+            'media.id as mediaId',
+            '2 as main',
+        ])
+            ->from(Media::class, 'media')
+            ->addOrderBy('media.id', 'ASC')
+            ->setFirstResult(5)
+            ->setMaxResults(4);
 
         /**
          * Get random images.
@@ -1859,36 +1654,36 @@ public function testCreateWithMainImages(): int
 
         $data = $this->getSimpleTestData();
         $data['images'] = $images;
-        $article = $this->resource->create($data);
+        $product = $this->resource->create($data);
 
-        static::assertCount(4, $article->getImages());
+        static::assertCount(4, $product->getImages());
 
         $mainFlagExists = false;
 
-        foreach ($article->getImages() as $image) {
+        foreach ($product->getImages() as $image) {
             if ($image->getMain() === 1) {
                 $mainFlagExists = true;
-                static::assertEquals($expectedMainId, $image->getMedia()->getId());
+                static::assertInstanceOf(Media::class, $image->getMedia());
+                static::assertSame($expectedMainId, $image->getMedia()->getId());
             }
         }
         static::assertTrue($mainFlagExists);
 
-        return $article->getId();
+        return $product->getId();
     }
 
-    /**
-     * @depends testCreateWithMainImages
-     */
-    public function testUpdateWithSingleMainImage($articleId): int
+    public function testUpdateWithSingleMainImage(): int
     {
+        $productId = $this->testCreateWithMainImages();
         $this->resource->setResultMode(
             Resource::HYDRATE_ARRAY
         );
-        $article = $this->resource->getOne($articleId);
+        $product = $this->resource->getOne($productId);
+        static::assertIsArray($product);
 
         $updateImages = [];
         $newId = null;
-        foreach ($article['images'] as $image) {
+        foreach ($product['images'] as $image) {
             if ($image['main'] !== 1) {
                 $updateImages['images'][] = [
                     'id' => $image['id'],
@@ -1898,44 +1693,43 @@ public function testUpdateWithSingleMainImage($articleId): int
                 break;
             }
         }
-        $article = $this->resource->update($articleId, $updateImages);
+        $product = $this->resource->update($productId, $updateImages);
 
-        static::assertCount(4, $article->getImages());
+        static::assertCount(4, $product->getImages());
 
         $hasMain = false;
-        foreach ($article->getImages() as $image) {
+        foreach ($product->getImages() as $image) {
             if ($image->getMain() === 1) {
                 $hasMain = true;
-                static::assertEquals($image->getId(), $newId);
+                static::assertSame($image->getId(), $newId);
             }
         }
         static::assertTrue($hasMain);
 
-        return $article->getId();
+        return $product->getId();
     }
 
-    /**
-     * @depends testUpdateWithSingleMainImage
-     */
-    public function testUpdateWithMainImage($articleId): void
+    public function testUpdateWithMainImage(): void
     {
+        $productId = $this->testUpdateWithSingleMainImage();
         $this->resource->getManager()->clear();
 
         $this->resource->setResultMode(
             Resource::HYDRATE_ARRAY
         );
-        $article = $this->resource->getOne($articleId);
+        $product = $this->resource->getOne($productId);
+        static::assertIsArray($product);
 
         $updateImages = [];
         $lastMainId = null;
 
-        foreach ($article['images'] as $image) {
+        foreach ($product['images'] as $image) {
             $newImageData = [
                 'id' => $image['id'],
                 'main' => $image['main'],
             ];
 
-            if ($image['main'] == 1) {
+            if ((int) $image['main'] === 1) {
                 $lastMainId = $image['id'];
                 $newImageData['main'] = 2;
             }
@@ -1943,6 +1737,7 @@ public function testUpdateWithMainImage($articleId): void
             $updateImages['images'][] = $newImageData;
         }
 
+        static::assertArrayHasKey('images', $updateImages);
         $newMainId = null;
         foreach ($updateImages['images'] as &$image) {
             if ($image['id'] !== $lastMainId) {
@@ -1952,14 +1747,14 @@ public function testUpdateWithMainImage($articleId): void
             }
         }
         unset($image);
-        $article = $this->resource->update($articleId, $updateImages);
-        static::assertCount(4, $article->getImages());
+        $product = $this->resource->update($productId, $updateImages);
+        static::assertCount(4, $product->getImages());
 
         $hasMain = false;
-        foreach ($article->getImages() as $image) {
+        foreach ($product->getImages() as $image) {
             if ($image->getMain() === 1) {
                 $hasMain = true;
-                static::assertEquals($newMainId, $image->getId());
+                static::assertSame($newMainId, $image->getId());
             }
         }
         static::assertTrue($hasMain);
@@ -1972,7 +1767,9 @@ public function testCreateTranslation(): void
     {
         $crud = Shopware()->Container()->get(CrudServiceInterface::class);
 
+        Shopware()->Container()->get(Connection::class)->rollBack();
         $crud->update('s_articles_attributes', 'underscore_test', 'string');
+        Shopware()->Container()->get(Connection::class)->beginTransaction();
 
         $data = $this->getSimpleTestData();
 
@@ -1995,26 +1792,29 @@ public function testCreateTranslation(): void
 
         $data['translations'] = $definedTranslation;
 
-        $article = $this->resource->create($data);
-        $newData = $this->resource->getOne($article->getId());
+        $product = $this->resource->create($data);
+        $newData = $this->resource->getOne($product->getId());
+        static::assertIsArray($newData);
 
         $savedTranslation = $newData['translations'][2];
         $definedTranslation = $definedTranslation[0];
 
-        static::assertEquals($definedTranslation['name'], $savedTranslation['name']);
-        static::assertEquals($definedTranslation['description'], $savedTranslation['description']);
-        static::assertEquals($definedTranslation['descriptionLong'], $savedTranslation['descriptionLong']);
-        static::assertEquals($definedTranslation['shippingTime'], $savedTranslation['shippingTime']);
-        static::assertEquals($definedTranslation['keywords'], $savedTranslation['keywords']);
-        static::assertEquals($definedTranslation['packUnit'], $savedTranslation['packUnit']);
-        static::assertEquals($definedTranslation['__attribute_underscore_test'], $savedTranslation['__attribute_underscore_test']);
+        static::assertSame($definedTranslation['name'], $savedTranslation['name']);
+        static::assertSame($definedTranslation['description'], $savedTranslation['description']);
+        static::assertSame($definedTranslation['descriptionLong'], $savedTranslation['descriptionLong']);
+        static::assertSame($definedTranslation['shippingTime'], $savedTranslation['shippingTime']);
+        static::assertSame($definedTranslation['keywords'], $savedTranslation['keywords']);
+        static::assertSame($definedTranslation['packUnit'], $savedTranslation['packUnit']);
+        static::assertSame($definedTranslation['__attribute_underscore_test'], $savedTranslation['__attribute_underscore_test']);
 
         for ($i = 1; $i <= 20; ++$i) {
             $attr = '__attribute_attr' . $i;
-            static::assertEquals($definedTranslation[$attr], $savedTranslation[$attr]);
+            static::assertSame($definedTranslation[$attr], $savedTranslation[$attr]);
         }
 
+        Shopware()->Container()->get(Connection::class)->rollBack();
         $crud->delete('s_articles_attributes', 'underscore_test');
+        Shopware()->Container()->get(Connection::class)->beginTransaction();
     }
 
     public function testBase64ImageUpload(): void
@@ -2028,49 +1828,50 @@ public function testBase64ImageUpload(): void
         ];
 
         $model = $this->resource->create($data);
-        $this->resource->setResultMode(
-            Resource::HYDRATE_ARRAY
-        );
-        $article = $this->resource->getOne($model->getId());
+        $this->resource->setResultMode(Resource::HYDRATE_ARRAY);
+        $product = $this->resource->getOne($model->getId());
+        static::assertIsArray($product);
 
         $mediaService = Shopware()->Container()->get(MediaServiceInterface::class);
 
-        static::assertCount(\count($data['images']), $article['images']);
-        foreach ($article['images'] as $image) {
+        foreach ($product['images'] as $image) {
             $key = 'media/image/' . $image['path'] . '.' . $image['extension'];
             static::assertTrue($mediaService->has($key));
 
             $imageContent = $mediaService->read($key);
+            static::assertIsString($imageContent);
 
-            $mimeType = finfo_buffer(finfo_open(FILEINFO_MIME_TYPE), $imageContent);
-            static::assertEquals('image/png', $mimeType);
+            $fileInfo = finfo_open(FILEINFO_MIME_TYPE);
+            static::assertNotFalse($fileInfo);
+            $mimeType = finfo_buffer($fileInfo, $imageContent);
+            static::assertSame('image/png', $mimeType);
         }
     }
 
     public function testImageReplacement(): void
     {
         $data = $this->getSimpleTestData();
-        $data['images'] = $this->getImagesForNewArticle();
-        $article = $this->resource->create($data);
+        $data['images'] = $this->getImagesForNewProduct();
+        $product = $this->resource->create($data);
 
         $createdIds = Shopware()->Db()->fetchCol(
-            'SELECT id FROM s_articles_img WHERE articleID = :articleId',
+            'SELECT id FROM s_articles_img WHERE articleID = :productId',
             [
-                ':articleId' => $article->getId(),
+                ':productId' => $product->getId(),
             ]
         );
 
         $data = [
             '__options_images' => ['replace' => true],
-            'images' => $this->getImagesForNewArticle(100),
+            'images' => $this->getImagesForNewProduct(100),
         ];
 
-        $this->resource->update($article->getId(), $data);
+        $this->resource->update($product->getId(), $data);
 
         $updateIds = Shopware()->Db()->fetchCol(
-            'SELECT id FROM s_articles_img WHERE articleID = :articleId',
+            'SELECT id FROM s_articles_img WHERE articleID = :productId',
             [
-                ':articleId' => $article->getId(),
+                ':productId' => $product->getId(),
             ]
         );
 
@@ -2083,20 +1884,20 @@ public function testImageReplacement(): void
     public function testImageReplacementMerge(): void
     {
         $data = $this->getSimpleTestData();
-        $data['images'] = $this->getImagesForNewArticle();
-        $article = $this->resource->create($data);
+        $data['images'] = $this->getImagesForNewProduct();
+        $product = $this->resource->create($data);
 
         $data = [
             '__options_images' => ['replace' => false],
-            'images' => $this->getImagesForNewArticle(40),
+            'images' => $this->getImagesForNewProduct(40),
         ];
 
-        $this->resource->update($article->getId(), $data);
+        $this->resource->update($product->getId(), $data);
 
         $updateIds = Shopware()->Db()->fetchCol(
-            'SELECT id FROM s_articles_img WHERE articleID = :articleId',
+            'SELECT id FROM s_articles_img WHERE articleID = :productId',
             [
-                ':articleId' => $article->getId(),
+                ':productId' => $product->getId(),
             ]
         );
 
@@ -2106,19 +1907,19 @@ public function testImageReplacementMerge(): void
     public function testImageReplacementWithoutOption(): void
     {
         $data = $this->getSimpleTestData();
-        $data['images'] = $this->getImagesForNewArticle();
-        $article = $this->resource->create($data);
+        $data['images'] = $this->getImagesForNewProduct();
+        $product = $this->resource->create($data);
 
         $data = [
-            'images' => $this->getImagesForNewArticle(40),
+            'images' => $this->getImagesForNewProduct(40),
         ];
 
-        $this->resource->update($article->getId(), $data);
+        $this->resource->update($product->getId(), $data);
 
         $updateIds = Shopware()->Db()->fetchCol(
-            'SELECT id FROM s_articles_img WHERE articleID = :articleId',
+            'SELECT id FROM s_articles_img WHERE articleID = :productId',
             [
-                ':articleId' => $article->getId(),
+                ':productId' => $product->getId(),
             ]
         );
 
@@ -2128,7 +1929,7 @@ public function testImageReplacementWithoutOption(): void
     public function testImageAttributes(): void
     {
         $data = $this->getSimpleTestData();
-        $images = $this->getImagesForNewArticle();
+        $images = $this->getImagesForNewProduct();
         foreach ($images as &$image) {
             $image['attribute'] = [
                 'attribute1' => 'attr1',
@@ -2137,8 +1938,8 @@ public function testImageAttributes(): void
         unset($image);
         $data['images'] = $images;
         foreach ($this->resource->create($data)->getImages() as $image) {
-            static::assertInstanceOf(ArticleImage::class, $image->getAttribute());
-            static::assertEquals('attr1', $image->getAttribute()->getAttribute1());
+            static::assertInstanceOf(ProductImage::class, $image->getAttribute());
+            static::assertSame('attr1', $image->getAttribute()->getAttribute1());
             static::assertNull($image->getAttribute()->getAttribute2());
             static::assertNull($image->getAttribute()->getAttribute3());
         }
@@ -2147,12 +1948,15 @@ public function testImageAttributes(): void
     public function testCreateWithDuplicateProperties(): void
     {
         $builder = Shopware()->Models()->createQueryBuilder();
-        $builder->select(['values', 'option'])->from(Value::class, 'values')->innerJoin(
-            'values.option',
-            'option'
-        )->setFirstResult(0)->setMaxResults(20);
+        $builder->select(['values', 'option'])
+            ->from(Value::class, 'values')
+            ->innerJoin('values.option', 'option')
+            ->setFirstResult(0)
+            ->setMaxResults(20);
         $databaseValues = $builder->getQuery()->getArrayResult();
         $properties = [];
+        $valueIds = [];
+        $optionIds = [];
         foreach ($databaseValues as $value) {
             $valueIds[] = $value['id'];
             $optionIds[] = $value['option']['id'];
@@ -2166,12 +1970,13 @@ public function testCreateWithDuplicateProperties(): void
         $data = $this->getSimpleTestData();
         $data['propertyValues'] = $properties;
         $data['filterGroupId'] = 1;
-        $article = $this->resource->create($data);
+        $product = $this->resource->create($data);
         $this->resource->setResultMode(
             Resource::HYDRATE_ARRAY
         );
-        $article = $this->resource->getOne($article->getId());
-        foreach ($article['propertyValues'] as $value) {
+        $product = $this->resource->getOne($product->getId());
+        static::assertIsArray($product);
+        foreach ($product['propertyValues'] as $value) {
             static::assertContains($value['id'], $valueIds);
             static::assertContains($value['optionId'], $optionIds);
         }
@@ -2181,7 +1986,7 @@ public function testCreateWithMultiplePropertiesAndNewGroup(): void
     {
         $data = $this->getSimpleTestData();
 
-        $optionName = 'newOption' . uniqid((string) rand());
+        $optionName = 'newOption' . uniqid((string) mt_rand());
         $properties = [
             [
                 'option' => ['name' => $optionName],
@@ -2195,34 +2000,36 @@ public function testCreateWithMultiplePropertiesAndNewGroup(): void
 
         $data['propertyValues'] = $properties;
         $data['filterGroupId'] = 1;
-        $article = $this->resource->create($data);
-        $this->resource->setResultMode(
-            Resource::HYDRATE_ARRAY
-        );
-        $articleId = $article->getId();
-        $article = $this->resource->getOne($articleId);
+        $product = $this->resource->create($data);
+        $this->resource->setResultMode(Resource::HYDRATE_ARRAY);
+        $productId = $product->getId();
+        $product = $this->resource->getOne($productId);
+        static::assertIsArray($product);
 
         $builder = Shopware()->Models()->createQueryBuilder();
-        $builder->select(['option'])->from(\Shopware\Models\Property\Option::class, 'option')->where(
-            'option.name = :optionName'
-        )->setParameter('optionName', $optionName)->setFirstResult(0)->setMaxResults(20);
+        $builder->select(['option'])
+            ->from(PropertyOption::class, 'option')
+            ->where('option.name = :optionName')
+            ->setParameter('optionName', $optionName)
+            ->setFirstResult(0)
+            ->setMaxResults(20);
         $databaseValuesOptions = $builder->getQuery()->getArrayResult();
 
-        static::assertEquals($article['propertyValues'][0]['optionId'], $article['propertyValues'][1]['optionId']);
+        static::assertSame($product['propertyValues'][0]['optionId'], $product['propertyValues'][1]['optionId']);
         static::assertCount(1, $databaseValuesOptions);
 
-        $this->resource->delete($articleId);
+        $this->resource->delete($productId);
 
-        //delete test values in s_filter_values
+        // delete test values in s_filter_values
         $sql = 'DELETE FROM `s_filter_values` WHERE `optionId` = ?';
         Shopware()->Db()->query($sql, [$databaseValuesOptions[0]['id']]);
 
-        //delete test values in s_filter_relations
+        // delete test values in s_filter_relations
         $sql = 'DELETE FROM `s_filter_relations` WHERE `optionId` = ?';
         Shopware()->Db()->query($sql, [$databaseValuesOptions[0]['id']]);
 
-        //delete test values in s_filter_options
-        $builder->delete(\Shopware\Models\Property\Option::class, 'option')->andWhere(
+        // delete test values in s_filter_options
+        $builder->delete(PropertyOption::class, 'option')->andWhere(
             'option.name = :optionName'
         )->setParameter('optionName', $optionName)->getQuery()->execute();
     }
@@ -2230,12 +2037,15 @@ public function testCreateWithMultiplePropertiesAndNewGroup(): void
     public function testUpdateWithDuplicateProperties(): void
     {
         $builder = Shopware()->Models()->createQueryBuilder();
-        $builder->select(['values', 'option'])->from(Value::class, 'values')->innerJoin(
-            'values.option',
-            'option'
-        )->setFirstResult(0)->setMaxResults(20);
+        $builder->select(['values', 'option'])
+            ->from(Value::class, 'values')
+            ->innerJoin('values.option', 'option')
+            ->setFirstResult(0)
+            ->setMaxResults(20);
         $databaseValues = $builder->getQuery()->getArrayResult();
         $properties = [];
+        $valueIds = [];
+        $optionIds = [];
         foreach ($databaseValues as $value) {
             $valueIds[] = $value['id'];
             $optionIds[] = $value['option']['id'];
@@ -2254,9 +2064,9 @@ public function testUpdateWithDuplicateProperties(): void
         $this->resource->setResultMode(
             Resource::HYDRATE_OBJECT
         );
-        $article = $this->resource->create($data);
-        $article = $this->resource->update($article->getId(), $update);
-        foreach ($article->getPropertyValues() as $value) {
+        $product = $this->resource->create($data);
+        $product = $this->resource->update($product->getId(), $update);
+        foreach ($product->getPropertyValues() as $value) {
             static::assertContains($value->getId(), $valueIds);
             static::assertContains($value->getOption()->getId(), $optionIds);
         }
@@ -2265,11 +2075,12 @@ public function testUpdateWithDuplicateProperties(): void
     public function testPriceReplacement(): void
     {
         $data = $this->getSimpleTestData();
-        $article = $this->resource->create($data);
+        $product = $this->resource->create($data);
+        static::assertInstanceOf(ProductVariant::class, $product->getMainDetail());
 
         $update = [
             'mainDetail' => [
-                'number' => $article->getMainDetail()->getNumber(),
+                'number' => $product->getMainDetail()->getNumber(),
                 '__options_prices' => ['replace' => false],
                 'prices' => [
                     [
@@ -2288,13 +2099,15 @@ public function testPriceReplacement(): void
             ],
         ];
 
-        $article = $this->resource->update($article->getId(), $update);
-        static::assertCount(3, $article->getMainDetail()->getPrices());
+        $product = $this->resource->update($product->getId(), $update);
+        static::assertInstanceOf(ProductModel::class, $product);
+        static::assertInstanceOf(ProductVariant::class, $product->getMainDetail());
+        static::assertCount(3, $product->getMainDetail()->getPrices());
     }
 
     public function testUpdateWithMultiplePropertiesAndNewGroup(): void
     {
-        $optionName = 'newOption' . uniqid((string) rand());
+        $optionName = 'newOption' . uniqid((string) mt_rand());
         $properties = [
             [
                 'option' => ['name' => $optionName],
@@ -2314,36 +2127,40 @@ public function testUpdateWithMultiplePropertiesAndNewGroup(): void
         $this->resource->setResultMode(
             Resource::HYDRATE_OBJECT
         );
-        $article = $this->resource->create($data);
-        $article = $this->resource->update($article->getId(), $update);
+        $product = $this->resource->create($data);
+        $product = $this->resource->update($product->getId(), $update);
 
-        $articleId = $article->getId();
+        $productId = $product->getId();
         $this->resource->setResultMode(
             Resource::HYDRATE_ARRAY
         );
-        $article = $this->resource->getOne($article->getId());
+        $product = $this->resource->getOne($product->getId());
+        static::assertIsArray($product);
 
         $builder = Shopware()->Models()->createQueryBuilder();
-        $builder->select(['option'])->from(\Shopware\Models\Property\Option::class, 'option')->where(
-            'option.name = :optionName'
-        )->setParameter('optionName', $optionName)->setFirstResult(0)->setMaxResults(20);
+        $builder->select(['option'])
+            ->from(PropertyOption::class, 'option')
+            ->where('option.name = :optionName')
+            ->setParameter('optionName', $optionName)
+            ->setFirstResult(0)
+            ->setMaxResults(20);
         $databaseValuesOptions = $builder->getQuery()->getArrayResult();
 
-        static::assertEquals($article['propertyValues'][0]['optionId'], $article['propertyValues'][1]['optionId']);
+        static::assertSame($product['propertyValues'][0]['optionId'], $product['propertyValues'][1]['optionId']);
         static::assertCount(1, $databaseValuesOptions);
 
-        $this->resource->delete($articleId);
+        $this->resource->delete($productId);
 
-        //delete test values in s_filter_values
+        // delete test values in s_filter_values
         $sql = 'DELETE FROM `s_filter_values` WHERE `optionId` = ?';
         Shopware()->Db()->query($sql, [$databaseValuesOptions[0]['id']]);
 
-        //delete test values in s_filter_relations
+        // delete test values in s_filter_relations
         $sql = 'DELETE FROM `s_filter_relations` WHERE `optionId` = ?';
         Shopware()->Db()->query($sql, [$databaseValuesOptions[0]['id']]);
 
-        //delete test values in s_filter_options
-        $builder->delete(\Shopware\Models\Property\Option::class, 'option')->andWhere(
+        // delete test values in s_filter_options
+        $builder->delete(PropertyOption::class, 'option')->andWhere(
             'option.name = :optionName'
         )->setParameter('optionName', $optionName)->getQuery()->execute();
     }
@@ -2376,9 +2193,9 @@ public function testImageConfiguration(): void
         $create['configuratorSet'] = $configurator;
         $create['variants'] = $variants;
 
-        $article = $this->resource->create($create);
+        $product = $this->resource->create($create);
 
-        foreach ($article->getImages() as $image) {
+        foreach ($product->getImages() as $image) {
             static::assertCount(1, $image->getMappings());
 
             foreach ($image->getMappings() as $mapping) {
@@ -2386,13 +2203,14 @@ public function testImageConfiguration(): void
             }
         }
 
-        $this->resource->generateVariantImages($article);
+        $this->resource->generateVariantImages($product);
 
-        $article = $this->resource->getOne($article->getId());
+        $product = $this->resource->getOne($product->getId());
+        static::assertInstanceOf(ProductModel::class, $product);
 
-        foreach ($article->getDetails() as $variant) {
+        foreach ($product->getDetails() as $variant) {
             foreach ($variant->getConfiguratorOptions() as $option) {
-                if ($option->getName() == $usedOption[0]['name']) {
+                if ($option->getName() === $usedOption[0]['name']) {
                     static::assertCount(1, $variant->getImages());
                 }
             }
@@ -2444,28 +2262,32 @@ public function testCustomerGroupReplacement(): void
         $this->internalTestReplaceMode(CustomerGroup::class, 'customerGroups', false);
     }
 
-    public function testArticleDefaultPriceBehavior(): void
+    public function testProductDefaultPriceBehavior(): void
     {
         $data = $this->getSimpleTestData();
 
         $product = $this->resource->create($data);
 
         static::assertInstanceOf(ProductModel::class, $product);
+        static::assertInstanceOf(ProductVariant::class, $product->getMainDetail());
 
         $price = $product->getMainDetail()->getPrices()->first();
         static::assertInstanceOf(Price::class, $price);
 
-        static::assertEquals(
+        static::assertInstanceOf(Tax::class, $product->getTax());
+        static::assertSame(
             400 / (((float) $product->getTax()->getTax() + 100) / 100),
             $price->getPrice(),
             'Customer group price not calculated'
         );
 
         $data = $this->resource->getOne($product->getId());
+        static::assertIsArray($data);
 
-        static::assertEquals(
+        static::assertEqualsWithDelta(
             400 / (((float) $product->getTax()->getTax() + 100) / 100),
-            $data['mainDetail']['prices'][0]['price']
+            $data['mainDetail']['prices'][0]['price'],
+            Utils::FORMER_PHPUNIT_FLOAT_EPSILON
         );
     }
 
@@ -2477,6 +2299,8 @@ public function testSimilarWithNumber(): void
         $similar = [];
         foreach ($products as $product) {
             $model = Shopware()->Models()->find(ProductModel::class, $product['id']);
+            static::assertInstanceOf(ProductModel::class, $model);
+            static::assertInstanceOf(ProductVariant::class, $model->getMainDetail());
 
             $similar[] = ['number' => $model->getMainDetail()->getNumber()];
         }
@@ -2496,6 +2320,8 @@ public function testRelatedWithNumber(): void
         $similar = [];
         foreach ($products as $product) {
             $model = Shopware()->Models()->find(ProductModel::class, $product['id']);
+            static::assertInstanceOf(ProductModel::class, $model);
+            static::assertInstanceOf(ProductVariant::class, $model->getMainDetail());
 
             $similar[] = ['number' => $model->getMainDetail()->getNumber()];
         }
@@ -2512,7 +2338,7 @@ public function testDownloads(): void
         $data = $this->getSimpleTestData();
 
         $data['downloads'] = [
-            ['link' => 'data:image/png;base64,' . require (__DIR__ . '/fixtures/base64image.php')],
+            ['link' => 'file://' . __DIR__ . '/fixtures/shopware_logo.png'],
         ];
 
         $product = $this->resource->create($data);
@@ -2563,24 +2389,27 @@ public function testSeoCategories(): void
 
         foreach ($product->getSeoCategories() as $category) {
             static::assertContains($category->getCategory()->getId(), $ids);
+            static::assertInstanceOf(Shop::class, $category->getShop());
             static::assertContains($category->getShop()->getId(), [1, 2]);
         }
     }
 
-    public function testArticleGrossPrices(): void
+    public function testProductGrossPrices(): void
     {
         $data = $this->getSimpleTestData();
 
-        $article = $this->resource->create($data);
+        $product = $this->resource->create($data);
 
-        static::assertInstanceOf(ProductModel::class, $article);
+        static::assertInstanceOf(ProductModel::class, $product);
+        static::assertInstanceOf(ProductVariant::class, $product->getMainDetail());
 
-        $price = $article->getMainDetail()->getPrices()->first();
+        $price = $product->getMainDetail()->getPrices()->first();
         static::assertInstanceOf(Price::class, $price);
 
-        $net = 400 / (((float) $article->getTax()->getTax() + 100) / 100);
+        static::assertInstanceOf(Tax::class, $product->getTax());
+        $net = 400 / (((float) $product->getTax()->getTax() + 100) / 100);
 
-        static::assertEquals(
+        static::assertSame(
             $net,
             $price->getPrice(),
             'Customer group price not calculated'
@@ -2589,31 +2418,26 @@ public function testArticleGrossPrices(): void
         $this->resource->setResultMode(2);
 
         $data = $this->resource->getOne(
-            $article->getId(),
+            $product->getId(),
             [
                 'considerTaxInput' => true,
             ]
         );
+        static::assertIsArray($data);
 
         $price = $data['mainDetail']['prices'][0];
 
-        static::assertEquals(400, $price['price']);
-        static::assertEquals($net, $price['net']);
+        static::assertEqualsWithDelta(400, $price['price'], Utils::FORMER_PHPUNIT_FLOAT_EPSILON);
+        static::assertEqualsWithDelta($net, $price['net'], Utils::FORMER_PHPUNIT_FLOAT_EPSILON);
+        static::assertEqualsWithDelta(450, $price['pseudoPrice'], Utils::FORMER_PHPUNIT_FLOAT_EPSILON);
+        static::assertEqualsWithDelta(400, $price['regulationPrice'], Utils::FORMER_PHPUNIT_FLOAT_EPSILON);
     }
 
     public function testAssignCategoriesByPathShouldBeSuccessful(): void
     {
-        // Delete previous data
-        try {
-            $id = $this->resource->getIdFromNumber('hollo-1');
-            if (!empty($id)) {
-                $this->resource->delete($id);
-            }
-        } catch (Exception $e) {
-        }
-        // Associate three kinds of categories with the article:
+        // Associate three kinds of categories with the product:
         // category by id, category by path, new category by path
-        $article = $this->resource->create(
+        $product = $this->resource->create(
             [
                 'name' => 'Hähnchenschnitzel Hollo',
                 'active' => true,
@@ -2635,22 +2459,28 @@ public function testAssignCategoriesByPathShouldBeSuccessful(): void
                 ],
             ]
         );
-        $ids = array_map(
-            function ($category) {
-                /* @var Category $category */
+        $ids = array_flip(array_map(
+            static function (Category $category) {
                 return $category->getId();
             },
-            $article->getCategories()->toArray()
-        );
-        $ids = array_flip($ids);
+            $product->getCategories()->toArray()
+        ));
         static::assertArrayHasKey(12, $ids);
         static::assertArrayHasKey(16, $ids);
         static::assertCount(3, $ids);
+
+        $this->resource->delete($product->getId());
     }
 
     public function testBatchModeShouldBeSuccessful(): void
     {
         $createNew = $this->getSimpleTestData();
+        $createNew['translations'] = [
+            2 => [
+                'name' => 'test product',
+                'shopId' => 2,
+            ],
+        ];
         $updateExistingByNumber = [
             'mainDetail' => [
                 'number' => 'SW10003',
@@ -2670,9 +2500,12 @@ public function testBatchModeShouldBeSuccessful(): void
             ]
         );
 
-        static::assertEquals('newKeyword1', $result['existingByNumber']['data']['keywords']);
-        static::assertEquals('newKeyword2', $result['existingById']['data']['keywords']);
-        static::assertEquals('Testartikel', $result['new']['data']['name']);
+        static::assertSame('newKeyword1', $result['existingByNumber']['data']['keywords']);
+        static::assertSame('newKeyword2', $result['existingById']['data']['keywords']);
+        static::assertSame('Testartikel', $result['new']['data']['name']);
+        $newData = $this->resource->getOne($result['new']['data']['id']);
+        static::assertIsArray($newData);
+        static::assertSame('test product', $newData['translations'][2]['name']);
     }
 
     public function testBatchDeleteShouldBeSuccessful(): void
@@ -2697,7 +2530,7 @@ public function testBatchDeleteShouldBeSuccessful(): void
 
     public function testCategoryAssignment(): void
     {
-        $number = 'CategoryAssignment' . uniqid((string) rand());
+        $number = 'CategoryAssignment' . uniqid((string) mt_rand());
 
         $data = $this->getSimpleTestData();
         $data['mainDetail']['number'] = $number;
@@ -2705,16 +2538,16 @@ public function testCategoryAssignment(): void
         $categories = Shopware()->Db()->fetchAll('SELECT id FROM s_categories WHERE parent = 3 ORDER BY id LIMIT 2');
         $data['categories'] = $categories;
 
-        $article = $this->resource->create($data);
+        $product = $this->resource->create($data);
 
         $normal = Shopware()->Db()->fetchCol(
             'SELECT categoryID FROM s_articles_categories WHERE articleID = ?',
-            [$article->getId()]
+            [$product->getId()]
         );
 
         $denormalized = Shopware()->Db()->fetchCol(
             'SELECT categoryID FROM s_articles_categories_ro WHERE articleID = ?',
-            [$article->getId()]
+            [$product->getId()]
         );
 
         static::assertCount(2, $normal);
@@ -2732,16 +2565,16 @@ public function testCategoryAssignment(): void
             'categories' => $rewriteCategories,
         ];
 
-        $this->resource->update($article->getId(), $data);
+        $this->resource->update($product->getId(), $data);
 
         $normal = Shopware()->Db()->fetchCol(
             'SELECT categoryID FROM s_articles_categories WHERE articleID = ?',
-            [$article->getId()]
+            [$product->getId()]
         );
 
         $denormalized = Shopware()->Db()->fetchCol(
             'SELECT categoryID FROM s_articles_categories_ro WHERE articleID = ?',
-            [$article->getId()]
+            [$product->getId()]
         );
 
         static::assertCount(2, $normal);
@@ -2761,16 +2594,16 @@ public function testCategoryAssignment(): void
             '__options_categories' => ['replace' => false],
             'categories' => $additionally,
         ];
-        $this->resource->update($article->getId(), $data);
+        $this->resource->update($product->getId(), $data);
 
         $normal = Shopware()->Db()->fetchCol(
             'SELECT categoryID FROM s_articles_categories WHERE articleID = ?',
-            [$article->getId()]
+            [$product->getId()]
         );
 
         $denormalized = Shopware()->Db()->fetchCol(
             'SELECT categoryID FROM s_articles_categories_ro WHERE articleID = ?',
-            [$article->getId()]
+            [$product->getId()]
         );
 
         static::assertCount(4, $normal);
@@ -2795,7 +2628,7 @@ public function testCategoryAssignment(): void
         }
     }
 
-    public function testVariantImagesOnArticleCreate(): void
+    public function testVariantImagesOnProductCreate(): void
     {
         $data = [
             'descriptionLong' => 'test1',
@@ -2815,7 +2648,7 @@ public function testVariantImagesOnArticleCreate(): void
             ],
             'taxId' => 1,
             'mainDetail' => [
-                'number' => uniqid((string) rand()),
+                'number' => uniqid((string) mt_rand()),
                 'active' => true,
                 'prices' => [
                     [
@@ -2836,37 +2669,37 @@ public function testVariantImagesOnArticleCreate(): void
             ],
             'filterGroupId' => null,
             'images' => [
-                    [
-                        'position' => 0,
-                        'main' => 1,
-                        'mediaId' => 2,
-                        'description' => '147quad1809 603994396334907 1063748094 n',
-                        'options' => [
+                [
+                    'position' => 0,
+                    'main' => 1,
+                    'mediaId' => 2,
+                    'description' => '147quad1809 603994396334907 1063748094 n',
+                    'options' => [
+                        [
                             [
-                                [
-                                    'name' => 'NewVal1',
-                                ],
+                                'name' => 'NewVal1',
                             ],
                         ],
                     ],
-                    [
-                        'position' => 0,
-                        'main' => 2,
-                        'mediaId' => 3,
-                        'description' => 'IMG 7228',
-                        'options' => [
+                ],
+                [
+                    'position' => 0,
+                    'main' => 2,
+                    'mediaId' => 3,
+                    'description' => 'IMG 7228',
+                    'options' => [
+                        [
                             [
-                                [
-                                    'name' => 'Newval2',
-                                ],
+                                'name' => 'Newval2',
                             ],
                         ],
                     ],
                 ],
+            ],
             'lastStock' => true,
             'variants' => [
                 [
-                    'number' => uniqid((string) rand()) . '.1',
+                    'number' => uniqid((string) mt_rand()) . '.1',
                     'active' => true,
                     'prices' => [
                         [
@@ -2890,6 +2723,7 @@ public function testVariantImagesOnArticleCreate(): void
         ];
 
         foreach ($this->resource->create($data)->getImages() as $image) {
+            static::assertInstanceOf(Media::class, $image->getMedia());
             $media = $image->getMedia();
 
             static::assertCount(1, $image->getMappings());
@@ -2903,21 +2737,21 @@ public function testVariantImagesOnArticleCreate(): void
             $rule = array_shift($ruleValues);
 
             if ($media->getId() === 2) {
-                static::assertEquals('NewVal1', $rule->getOption()->getName());
+                static::assertSame('NewVal1', $rule->getOption()->getName());
             } elseif ($media->getId() === 3) {
-                static::assertEquals('Newval2', $rule->getOption()->getName());
+                static::assertSame('Newval2', $rule->getOption()->getName());
             }
         }
     }
 
-    public function testArticleCreateWithNoStock(): void
+    public function testProductCreateWithNoStock(): void
     {
         $data = [
-            'name' => 'article without stock definition',
+            'name' => 'product without stock definition',
             'active' => true,
             'taxId' => 1,
             'mainDetail' => [
-                'number' => 'withoutstock' . uniqid((string) rand()),
+                'number' => 'withoutstock' . uniqid((string) mt_rand()),
                 'prices' => [
                     [
                         'customerGroupKey' => 'EK',
@@ -2928,7 +2762,8 @@ public function testArticleCreateWithNoStock(): void
         ];
 
         $model = $this->resource->create($data);
-
+        static::assertInstanceOf(ProductModel::class, $model);
+        static::assertInstanceOf(ProductVariant::class, $model->getMainDetail());
         static::assertSame(0, $model->getMainDetail()->getInStock());
     }
 
@@ -2945,23 +2780,25 @@ public function testUpdateLastStock(): void
          */
         foreach ([true, false, 1, 0, null] as $val) {
             $temp = $this->resource->update($id, ['mainDetail' => ['lastStock' => $val]]);
+            static::assertInstanceOf(ProductModel::class, $temp);
+            static::assertInstanceOf(ProductVariant::class, $temp->getMainDetail());
 
-            static::assertEquals($val, $temp->getMainDetail()->getLastStock());
+            static::assertSame($val, $temp->getMainDetail()->getLastStock());
         }
 
         $this->resource->delete($id);
     }
 
-    public function testDeletingAnArticleAlsoDeletesDetailsAndAttributes(): void
+    public function testDeletingProductAlsoDeletesDetailsAndAttributes(): void
     {
         $entityManager = Shopware()->Models();
         $productRepository = $entityManager->getRepository(ProductModel::class);
-        $detailRepository = $entityManager->getRepository(Detail::class);
+        $detailRepository = $entityManager->getRepository(ProductVariant::class);
         $attributeRepository = $entityManager->getRepository(ProductAttribute::class);
 
         // Test preparation
 
-        /* Create an article with one main detail and two additional details
+        /* Create a product with one main detail and two additional details
          * (variants). */
         $testData = $this->getSimpleTestData();
         $configurator = $this->getSimpleConfiguratorSet(1, 2);
@@ -2970,7 +2807,7 @@ public function testDeletingAnArticleAlsoDeletesDetailsAndAttributes(): void
             /* While the values are not relevant to the test, and attributes
              * would still be created without them, this test should still work
              * should the logic around when to create attributes change. */
-            function ($variant) {
+            static function (array $variant) {
                 $variant['attribute'] = [
                     'attr1' => 'Free form text 1',
                     'attr2' => 'Free form text 2',
@@ -2984,13 +2821,13 @@ function ($variant) {
         $testData['configuratorSet'] = $configurator;
         $testData['variants'] = $variants;
 
-        /* Save the article, so that we can later test its removal and the
+        /* Save the product, so that we can later test its removal and the
          * removal of its details and attributes. */
-        $createdArticleId = $this->resource->create($testData)->getId();
+        $createdProductId = $this->resource->create($testData)->getId();
 
         // Retrieve identifiers from the database which we need for this test.
         try {
-            $createdProduct = $productRepository->find($createdArticleId);
+            $createdProduct = $productRepository->find($createdProductId);
             static::assertInstanceOf(ProductModel::class, $createdProduct);
             $createdDetails = array_merge(
                 $createdProduct->getDetails()->toArray(),
@@ -3000,14 +2837,17 @@ function ($variant) {
             /* The identifiers of the details the removal of which we will
              * later verify. */
             $createdDetailIds = array_unique(array_map(
-                function ($createdDetail) {
+                static function (ProductVariant $createdDetail) {
                     return $createdDetail->getId();
                 },
                 $createdDetails
             ));
 
-            $createdAttributes = array_map(
-                function ($createdDetail) { return $createdDetail->getAttribute(); },
+            $createdAttributes = array_map(static function (ProductVariant $createdDetail) {
+                self::assertInstanceOf(ProductAttribute::class, $createdDetail->getAttribute());
+
+                return $createdDetail->getAttribute();
+            },
                 $createdDetails
             );
             // Verify we did not break our test setup.
@@ -3016,31 +2856,33 @@ function ($createdDetail) { return $createdDetail->getAttribute(); },
             /* The identifiers of the attributes the removal of which we will
              * later verify. */
             $createdAttributeIds = array_unique(array_map(
-                function ($createdAttribute) { return $createdAttribute->getId(); },
+                static function (ProductAttribute $createdAttribute) {
+                    return $createdAttribute->getId();
+                },
                 $createdAttributes
             ));
             static::assertCount(3, $createdAttributeIds);
 
-            // Verify created article's details match test setup assumptions.
+            // Verify created product's details match test setup assumptions.
             static::assertCount(\count($createdDetailIds), $detailRepository->findBy([
                 'id' => $createdDetailIds,
             ]));
-            // Verify created article's attributes match test setup assumptions.
+            // Verify created product's attributes match test setup assumptions.
             static::assertCount(\count($createdAttributeIds), $attributeRepository->findBy([
                 'id' => $createdAttributeIds,
             ]));
         } finally {
-            // Even if the test setup fails, delete the test's created article.
+            // Even if the test setup fails, delete the test's created product.
 
             // Tested action:
-            $this->resource->delete($createdArticleId);
+            $this->resource->delete($createdProductId);
         }
 
         static::assertNull(
-            $productRepository->find($createdArticleId),
-            sprintf(
-                'Deletion of the article (id = %s) itself failed.',
-                $createdArticleId
+            $productRepository->find($createdProductId),
+            \sprintf(
+                'Deletion of the product (id = %s) itself failed.',
+                $createdProductId
             )
         );
 
@@ -3050,20 +2892,18 @@ function ($createdAttribute) { return $createdAttribute->getId(); },
             $detailRepository->findBy([
                 'id' => $createdDetailIds,
             ]),
-            sprintf(
-                'Deletion of the article\'s (id = %s) details (%s) failed.',
-                $createdArticleId,
+            \sprintf(
+                'Deletion of the product\'s (id = %s) details (%s) failed.',
+                $createdProductId,
                 implode(', ', $createdDetailIds)
             )
         );
         static::assertCount(
             0,
-            $attributeRepository->findBy([
-                'id' => $createdAttributeIds,
-            ]),
-            sprintf(
-                'Deletion of the article\'s (id = %s) details\' (%s) attributes (%s) failed.',
-                $createdArticleId,
+            $attributeRepository->findBy(['id' => $createdAttributeIds]),
+            \sprintf(
+                "Deletion of the product's (id = %s) details' (%s) attributes (%s) failed.",
+                $createdProductId,
                 implode(', ', $createdDetailIds),
                 implode(', ', $createdAttributeIds)
             )
@@ -3072,12 +2912,14 @@ function ($createdAttribute) { return $createdAttribute->getId(); },
 
     /**
      * @group pcovAdapterBrokenTest
+     *
      * @runInSeparateProcess
+     *
      * @preserveGlobalState disabled
      */
     public function testInvalidProductInBatch(): void
     {
-        $minimalTestArticle = [
+        $minimalTestProduct = [
             'id' => 2,
             'images' => [
                 [
@@ -3087,7 +2929,7 @@ public function testInvalidProductInBatch(): void
             ],
         ];
 
-        $result = $this->resource->batch([$minimalTestArticle, $minimalTestArticle]);
+        $result = $this->resource->batch([$minimalTestProduct, $minimalTestProduct]);
 
         static::assertFalse($result[0]['success']);
         static::assertTrue(Shopware()->Models()->isOpen());
@@ -3101,7 +2943,7 @@ public function testDeletingPricesWorksOnReplace(): void
             'descriptionLong' => 'Test descriptionLong',
             'active' => true,
             'mainDetail' => [
-                'number' => 'swTEST' . uniqid((string) rand()),
+                'number' => 'swTEST' . uniqid((string) mt_rand()),
                 'prices' => [
                     [
                         'customerGroupKey' => 'EK',
@@ -3121,7 +2963,7 @@ public function testDeletingPricesWorksOnReplace(): void
                         ],
                     ],
                     [
-                        'name' => 'Gräße',
+                        'name' => 'Größe',
                         'options' => [
                             ['name' => 'L'],
                             ['name' => 'XL'],
@@ -3131,7 +2973,7 @@ public function testDeletingPricesWorksOnReplace(): void
             ],
             'variants' => [
                 [
-                    'number' => 'swTEST.variant.' . uniqid((string) rand()),
+                    'number' => 'swTEST.variant.' . uniqid((string) mt_rand()),
                     'inStock' => 17,
                     // create a new unit
                     'unit' => [
@@ -3176,32 +3018,29 @@ public function testDeletingPricesWorksOnReplace(): void
             ],
         ];
 
-        $article = $this->resource->create($testData);
-
-        static::assertInstanceOf(ProductModel::class, $article);
-        static::assertGreaterThan(0, $article->getId());
+        $product = $this->createProduct($testData);
 
         $countOfPrices = (int) Shopware()->Db()->fetchOne('SELECT COUNT(*) FROM s_articles_prices');
 
         $testData['__options_variants']['replace'] = true;
 
-        $this->resource->update($article->getId(), $testData);
+        $this->resource->update($product->getId(), $testData);
 
         $currentCountOfPrices = (int) Shopware()->Db()->fetchOne('SELECT COUNT(*) FROM s_articles_prices');
 
-        static::assertEquals($countOfPrices, $currentCountOfPrices);
-        $this->resource->delete($article->getId());
+        static::assertSame($countOfPrices, $currentCountOfPrices);
+        $this->resource->delete($product->getId());
     }
 
     /**
-     * Combinations merge the result of dimensional arrays not perfectly
+     * Combinations merge the result of dimensional arrays not perfectly,
      * so we have to clean up the first array level.
      *
-     * @param array[] $combinations
+     * @param list<array{groupId: int, option: string}> $combinations
      *
-     * @return array[]
+     * @return list<array{groupId: int, option: string}>
      */
-    protected function cleanUpCombinations(array $combinations): array
+    private function cleanUpCombinations(array $combinations): array
     {
         foreach ($combinations as &$combination) {
             $combination[] = [
@@ -3215,49 +3054,24 @@ protected function cleanUpCombinations(array $combinations): array
     }
 
     /**
-     * Helper function which combines all array elements
-     * of the passed arrays.
+     * @param class-string<ModelEntity> $entity
      */
-    protected function combinations(array $arrays, int $i = 0): array
-    {
-        if (!isset($arrays[$i])) {
-            return [];
-        }
-        if ($i == \count($arrays) - 1) {
-            return $arrays[$i];
-        }
-
-        // get combinations from subsequent arrays
-        $tmp = $this->combinations($arrays, $i + 1);
-
-        $result = [];
-
-        // concat each array from tmp with each element from $arrays[$i]
-        foreach ($arrays[$i] as $v) {
-            foreach ($tmp as $t) {
-                $result[] = \is_array($t) ? array_merge([$v], $t) : [$v, $t];
-            }
-        }
-
-        return $result;
-    }
-
-    protected function internalTestReplaceMode($entity, $arrayKey, $replace = true): void
+    private function internalTestReplaceMode(string $entity, string $arrayKey, bool $replace = true): void
     {
         // Create keys for getter function and the __options parameter in the update and create
         // Example => "__options_categories"  /  "getCategories"
         $replaceKey = '__options_' . $arrayKey;
         $getter = 'get' . ucfirst($arrayKey);
 
-        // Returns a simple article data set to create an article with a simple main detail
+        // Returns a simple product data set to create a product with a simple main detail
         $data = $this->getSimpleTestData();
 
         // Get an offset of 10 entities for the current entity type, like 10x categories
         $createdEntities = $this->getEntityOffset($entity);
         $data[$arrayKey] = $createdEntities;
 
-        $article = $this->resource->create($data);
-        static::assertCount(\count($createdEntities), $article->$getter());
+        $product = $this->resource->create($data);
+        static::assertCount(\count($createdEntities), $product->$getter());
 
         $updatedEntity = $this->getEntityOffset($entity, 20, 5);
 
@@ -3265,19 +3079,21 @@ protected function internalTestReplaceMode($entity, $arrayKey, $replace = true):
             $replaceKey => ['replace' => $replace],
             $arrayKey => $updatedEntity,
         ];
-        $article = $this->resource->update($article->getId(), $update);
+        $product = $this->resource->update($product->getId(), $update);
 
-        if ($replace == true) {
-            static::assertCount(\count($updatedEntity), $article->$getter());
+        if ($replace) {
+            static::assertCount(\count($updatedEntity), $product->$getter());
         } else {
-            static::assertCount(\count($createdEntities) + \count($updatedEntity), $article->$getter());
+            static::assertCount(\count($createdEntities) + \count($updatedEntity), $product->$getter());
         }
     }
 
     /**
-     * @return array[]
+     * @param array{name: string, groups: array<array<string, mixed>>} $configuratorSet
+     *
+     * @return list<array<string, mixed>>
      */
-    private function getOptionsForImage($configuratorSet, $optionCount = null, $property = 'id'): array
+    private function getOptionsForImage(array $configuratorSet, ?int $optionCount = null, string $property = 'id'): array
     {
         if (!\is_int($optionCount)) {
             $optionCount = rand(1, \count($configuratorSet['groups']) - 1);
@@ -3290,7 +3106,7 @@ private function getOptionsForImage($configuratorSet, $optionCount = null, $prop
             $options[] = [
                 $property => $option[$property],
             ];
-            if (\count($options) == $optionCount) {
+            if (\count($options) === $optionCount) {
                 return $options;
             }
         }
@@ -3299,34 +3115,28 @@ private function getOptionsForImage($configuratorSet, $optionCount = null, $prop
     }
 
     /**
-     * Helper function which creates all variants for
-     * the passed groups with options.
+     * Helper function which creates all variants for the passed groups with options.
+     *
+     * @param array<array<string, mixed>> $groups
+     *
+     * @return list<array<string, mixed>>
      */
-    private function createConfiguratorVariants(
-        array $groups,
-        array $groupMapping = ['key' => 'groupId', 'value' => 'id'],
-        array $optionMapping = ['key' => 'option', 'value' => 'name']
-    ): array {
+    private function createConfiguratorVariants(array $groups): array
+    {
         $options = [];
 
-        $groupArrayKey = $groupMapping['key'];
-        $groupValuesKey = $groupMapping['value'];
-        $optionArrayKey = $optionMapping['key'];
-        $optionValuesKey = $optionMapping['value'];
-
         foreach ($groups as $group) {
             $groupOptions = [];
             foreach ($group['options'] as $option) {
                 $groupOptions[] = [
-                    $groupArrayKey => $group[$groupValuesKey],
-                    $optionArrayKey => $option[$optionValuesKey],
+                    'groupId' => (int) $group['id'],
+                    'option' => (string) $option['name'],
                 ];
             }
             $options[] = $groupOptions;
         }
 
-        $combinations = $this->combinations($options);
-        $combinations = $this->cleanUpCombinations($combinations);
+        $combinations = $this->cleanUpCombinations($options[0]);
 
         $variants = [];
         foreach ($combinations as $combination) {
@@ -3339,19 +3149,19 @@ private function createConfiguratorVariants(
     }
 
     /**
-     * @return array[]
+     * @return array<array<string, mixed>>
      */
-    private function getImagesForNewArticle(int $offset = 10, int $limit = 5): array
+    private function getImagesForNewProduct(int $offset = 10): array
     {
         $builder = Shopware()->Models()->createQueryBuilder();
-        $builder->select(
-            [
-                'media.id as mediaId',
-                '2 as main',
-            ]
-        )->from(Media::class, 'media', 'media.id')->addOrderBy('media.id', 'ASC')->setFirstResult(
-            $offset
-        )->setMaxResults($limit);
+        $builder->select([
+            'media.id as mediaId',
+            '2 as main',
+        ])
+            ->from(Media::class, 'media', 'media.id')
+            ->addOrderBy('media.id', 'ASC')
+            ->setFirstResult($offset)
+            ->setMaxResults(5);
 
         /**
          * Get random images.
@@ -3374,7 +3184,7 @@ private function getSimpleTestData(): array
             'description' => 'Test description',
             'active' => true,
             'mainDetail' => [
-                'number' => 'swTEST' . uniqid((string) rand()),
+                'number' => 'swTEST' . uniqid((string) mt_rand()),
                 'inStock' => 15,
                 'unitId' => 1,
                 'prices' => [
@@ -3383,6 +3193,8 @@ private function getSimpleTestData(): array
                         'from' => 1,
                         'to' => '-',
                         'price' => 400,
+                        'pseudoPrice' => 450,
+                        'regulationPrice' => 400,
                     ],
                 ],
             ],
@@ -3393,9 +3205,9 @@ private function getSimpleTestData(): array
 
     /**
      * @param class-string<ModelEntity> $entity
-     * @param string[]                  $fields
+     * @param list<string>              $fields
      *
-     * @return array[]
+     * @return array<array<string, mixed>>
      */
     private function getEntityOffset(string $entity, int $offset = 0, int $limit = 10, array $fields = ['id']): array
     {
@@ -3409,32 +3221,35 @@ private function getEntityOffset(string $entity, int $offset = 0, int $limit = 1
         }
 
         $builder = Shopware()->Models()->createQueryBuilder();
-        $builder->select($selectFields)->from($entity, 'alias')->setFirstResult($offset)->setMaxResults($limit);
+        $builder->select($selectFields)
+            ->from($entity, 'alias')
+            ->setFirstResult($offset)
+            ->setMaxResults($limit);
 
         return $builder->getQuery()->getArrayResult();
     }
 
     /**
-     * @return array{name: string, groups: array}
+     * @return array{name: string, groups: array<array<string, mixed>>}
      */
-    private function getSimpleConfiguratorSet($groupLimit = 3, $optionLimit = 5): array
+    private function getSimpleConfiguratorSet(int $groupLimit = 3, int $optionLimit = 5): array
     {
         $builder = Shopware()->Models()->createQueryBuilder();
-        $builder->select(['groups.id', 'groups.name'])->from(
-            ConfiguratorGroup::class,
-            'groups'
-        )->setFirstResult(0)->setMaxResults($groupLimit)->orderBy('groups.position', 'ASC');
+        $builder->select(['groups.id', 'groups.name'])
+            ->from(ConfiguratorGroup::class, 'groups')
+            ->setFirstResult(0)
+            ->setMaxResults($groupLimit)
+            ->orderBy('groups.position', 'ASC');
 
         $groups = $builder->getQuery()->getArrayResult();
 
         $builder = Shopware()->Models()->createQueryBuilder();
-        $builder->select(['options.id', 'options.name'])->from(
-            Option::class,
-            'options'
-        )->where('options.groupId = :groupId')->setFirstResult(0)->setMaxResults($optionLimit)->orderBy(
-            'options.position',
-            'ASC'
-        );
+        $builder->select(['options.id', 'options.name'])
+            ->from(ConfiguratorOption::class, 'options')
+            ->where('options.groupId = :groupId')
+            ->setFirstResult(0)
+            ->setMaxResults($optionLimit)
+            ->orderBy('options.position', 'ASC');
 
         foreach ($groups as &$group) {
             $builder->setParameter('groupId', $group['id']);
@@ -3453,7 +3268,7 @@ private function getSimpleConfiguratorSet($groupLimit = 3, $optionLimit = 5): ar
     private function getSimpleVariantData(): array
     {
         return [
-            'number' => 'swTEST' . uniqid((string) rand()),
+            'number' => 'swTEST' . uniqid((string) mt_rand()),
             'inStock' => 100,
             'unitId' => 1,
             'prices' => [
@@ -3468,9 +3283,9 @@ private function getSimpleVariantData(): array
     }
 
     /**
-     * @param array{name: string, groups: array} $configuratorSet
+     * @param array{name: string, groups: array<array<string, mixed>>} $configuratorSet
      *
-     * @return array<array>
+     * @return list<array{optionId: int, groupId: int}>
      */
     private function getVariantOptionsOfSet(array $configuratorSet): array
     {
@@ -3479,8 +3294,8 @@ private function getVariantOptionsOfSet(array $configuratorSet): array
             $id = rand(0, \count($group['options']) - 1);
             $option = $group['options'][$id];
             $options[] = [
-                'optionId' => $option['id'],
-                'groupId' => $group['id'],
+                'optionId' => (int) $option['id'],
+                'groupId' => (int) $group['id'],
             ];
         }
 
@@ -3510,4 +3325,150 @@ private function createConfiguratorSetProduct(): ProductModel
             ]
         );
     }
+
+    /**
+     * @param array<string, mixed> $testData
+     */
+    private function createProduct(array $testData): ProductModel
+    {
+        $product = $this->resource->create($testData);
+
+        static::assertInstanceOf(ProductModel::class, $product);
+        static::assertGreaterThan(0, $product->getId());
+
+        return $product;
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    private function getTestData(): array
+    {
+        return [
+            'name' => 'Testartikel',
+            'description' => 'Test description',
+            'descriptionLong' => 'Test descriptionLong',
+            'active' => true,
+            'pseudoSales' => 999,
+            'highlight' => true,
+            'keywords' => 'test, testproduct',
+            'metaTitle' => 'this is a test title with umlauts äöüß',
+            'filterGroupId' => 1,
+            'propertyValues' => [
+                [
+                    'value' => 'grün',
+                    'option' => [
+                        'name' => 'Farbe',
+                    ],
+                ],
+                [
+                    'value' => 'testWert',
+                    'option' => [
+                        'name' => 'neueOption' . uniqid((string) mt_rand()),
+                    ],
+                ],
+            ],
+            'mainDetail' => [
+                'number' => 'swTEST' . uniqid((string) mt_rand()),
+                'inStock' => 15,
+                'unitId' => 1,
+                'attribute' => [
+                    'attr1' => 'Freitext1',
+                    'attr2' => 'Freitext2',
+                ],
+                'minPurchase' => 5,
+                'purchaseSteps' => 2,
+                'prices' => [
+                    [
+                        'customerGroupKey' => 'EK',
+                        'to' => 20,
+                        'price' => 500,
+                    ],
+                    [
+                        'customerGroupKey' => 'EK',
+                        'from' => 21,
+                        'to' => '-',
+                        'price' => 400,
+                    ],
+                ],
+            ],
+            'configuratorSet' => [
+                'name' => 'MeinKonf',
+                'groups' => [
+                    [
+                        'name' => 'Farbe',
+                        'options' => [
+                            ['name' => 'Gelb'],
+                            ['name' => 'grün'],
+                        ],
+                    ],
+                    [
+                        'name' => 'Größe',
+                        'options' => [
+                            ['name' => 'L'],
+                            ['name' => 'XL'],
+                        ],
+                    ],
+                ],
+            ],
+            'variants' => [
+                [
+                    'number' => 'swTEST.variant.' . uniqid((string) mt_rand()),
+                    'inStock' => 17,
+                    // create a new unit
+                    'unit' => [
+                        'unit' => 'xyz',
+                        'name' => 'newUnit',
+                    ],
+                    'attribute' => [
+                        'attr3' => 'Freitext3',
+                        'attr4' => 'Freitext4',
+                    ],
+                    'configuratorOptions' => [
+                        [
+                            'option' => 'Gelb',
+                            'group' => 'Farbe',
+                        ],
+                        [
+                            'option' => 'XL',
+                            'group' => 'Größe',
+                        ],
+                    ],
+                    'minPurchase' => 5,
+                    'purchaseSteps' => 2,
+                    'prices' => [
+                        [
+                            'customerGroupKey' => 'H',
+                            'to' => 20,
+                            'price' => 500,
+                        ],
+                        [
+                            'customerGroupKey' => 'H',
+                            'from' => 21,
+                            'to' => '-',
+                            'price' => 400,
+                        ],
+                    ],
+                ],
+            ],
+            'taxId' => 1,
+            'supplierId' => 2,
+            'similar' => [
+                ['id' => 5],
+                ['id' => 6],
+            ],
+            'categories' => [
+                ['id' => 15],
+                ['id' => 10],
+            ],
+            'related' => [
+                ['id' => 3, 'cross' => true],
+                ['id' => 4],
+            ],
+            'links' => [
+                ['name' => 'foobar', 'link' => 'http://example.org'],
+                ['name' => 'Video', 'link' => 'http://example.org'],
+            ],
+        ];
+    }
 }
diff --git a/tests/Functional/Components/Api/CacheTest.php b/tests/Functional/Components/Api/CacheTest.php
index 0f64a735184..01f4385c3ca 100644
--- a/tests/Functional/Components/Api/CacheTest.php
+++ b/tests/Functional/Components/Api/CacheTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Api;
@@ -89,7 +88,7 @@ public function testClearTemplateCacheShouldBeSuccessFull(): void
         $this->getResource()->delete('template');
 
         $info = $this->getResource()->getOne('template');
-        static::assertEquals(0, $info['files']);
+        static::assertFalse(isset($info['files']));
     }
 
     /**
@@ -99,10 +98,10 @@ public function testClearHttpCacheShouldBeSuccessFull(): void
     {
         $this->getResource()->delete('http');
         $info = $this->getResource()->getOne('http');
-        static::assertEquals(0, $info['files']);
+        static::assertFalse(isset($info['files']));
 
         $this->getResource()->delete('template');
         $info = $this->getResource()->getOne('template');
-        static::assertEquals(0, $info['files']);
+        static::assertFalse(isset($info['files']));
     }
 }
diff --git a/tests/Functional/Components/Api/CategoryTest.php b/tests/Functional/Components/Api/CategoryTest.php
index 6e2aeb768b0..5b5a3a43732 100644
--- a/tests/Functional/Components/Api/CategoryTest.php
+++ b/tests/Functional/Components/Api/CategoryTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Api;
@@ -229,6 +228,7 @@ public function testCreateCategoryWithTranslation(): void
         $this->resource->setResultMode(Resource::HYDRATE_ARRAY);
 
         $categoryResult = $this->resource->getOne($category->getId());
+        static::assertIsArray($categoryResult);
 
         if (isset($categoryResult['translations'])) {
             static::assertEquals($categoryData['translations'], $categoryResult['translations']);
@@ -264,6 +264,7 @@ public function testCreateCategoryWithTranslationWithUpdate(): void
         $this->resource->setResultMode(Resource::HYDRATE_ARRAY);
 
         $categoryResult = $this->resource->getOne($category->getId());
+        static::assertIsArray($categoryResult);
 
         if (isset($categoryResult['translations'])) {
             static::assertEquals($categoryData['translations'], $categoryResult['translations']);
@@ -287,6 +288,7 @@ public function testCreateCategoryWithTranslationWithUpdate(): void
         $category = $this->resource->update($category->getId(), $categoryData);
 
         $categoryResult = $this->resource->getOne($category->getId());
+        static::assertIsArray($categoryResult);
 
         if (isset($categoryResult['translations'])) {
             static::assertEquals($categoryData['translations'], $categoryResult['translations']);
diff --git a/tests/Functional/Components/Api/CountryTest.php b/tests/Functional/Components/Api/CountryTest.php
index 357a9785e01..70a490a86ac 100644
--- a/tests/Functional/Components/Api/CountryTest.php
+++ b/tests/Functional/Components/Api/CountryTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Api;
@@ -252,8 +251,8 @@ public function testGetList(Country $country): Country
 
         static::assertArrayHasKey('data', $countryData);
         static::assertArrayHasKey('total', $countryData);
-        static::assertCount((2 + \count(self::$existingCountryIds)), $countryData['data']);
-        static::assertEquals($countryData['total'], (2 + \count(self::$existingCountryIds)));
+        static::assertCount(2 + \count(self::$existingCountryIds), $countryData['data']);
+        static::assertEquals($countryData['total'], 2 + \count(self::$existingCountryIds));
 
         return $country;
     }
diff --git a/tests/Functional/Components/Api/CustomerGroupTest.php b/tests/Functional/Components/Api/CustomerGroupTest.php
index c8cce489f46..1e302e73e3b 100644
--- a/tests/Functional/Components/Api/CustomerGroupTest.php
+++ b/tests/Functional/Components/Api/CustomerGroupTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Api;
diff --git a/tests/Functional/Components/Api/CustomerStreamTest.php b/tests/Functional/Components/Api/CustomerStreamTest.php
index 88bb86555ca..b13eb02e608 100644
--- a/tests/Functional/Components/Api/CustomerStreamTest.php
+++ b/tests/Functional/Components/Api/CustomerStreamTest.php
@@ -1,70 +1,59 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Api;
 
 use Doctrine\DBAL\Connection;
-use Enlight_Components_Test_TestCase;
 use Shopware\Components\Api\Resource\CustomerStream;
 use Shopware\Models\CustomerStream\CustomerStream as CustomerStreamEntity;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 
-class CustomerStreamTest extends Enlight_Components_Test_TestCase
+class CustomerStreamTest extends TestCase
 {
+    use ContainerTrait;
+    use DatabaseTransactionBehaviour;
+
     /**
      * @var CustomerStream
      */
     protected $resource;
 
-    /**
-     * @var Connection
-     */
-    protected $connection;
+    private Connection $connection;
 
     protected function setUp(): void
     {
-        Shopware()->Models()->clear();
-
-        $this->resource = $this->createResource();
-        $this->resource->setManager(Shopware()->Models());
-        $this->connection = Shopware()->Container()->get(Connection::class);
-        $this->connection->beginTransaction();
+        $this->connection = $this->getContainer()->get(Connection::class);
         parent::setUp();
     }
 
-    protected function tearDown(): void
-    {
-        parent::tearDown();
-        Shopware()->Models()->clear();
-        $this->connection->rollBack();
-    }
-
     public function createResource()
     {
-        return Shopware()->Container()->get(CustomerStream::class);
+        return $this->getContainer()->get(CustomerStream::class);
     }
 
-    public function testCreateStaticStream()
+    public function testCreateStaticStream(): void
     {
         $data = [
             'name' => 'static stream',
@@ -78,7 +67,7 @@ public function testCreateStaticStream()
         static::assertNotNull($stream->getId());
         static::assertTrue($stream->isStatic());
 
-        $ids = $this->connection->fetchAll(
+        $ids = $this->connection->fetchAllAssociative(
             'SELECT customer_id FROM s_customer_streams_mapping WHERE stream_id = :streamId',
             [':streamId' => $stream->getId()]
         );
@@ -87,4 +76,14 @@ public function testCreateStaticStream()
 
         static::assertEquals([1], $ids);
     }
+
+    public function testGetOneWithInvalidIdShouldThrowNotFoundException(): void
+    {
+        $this->expectNotToPerformAssertions();
+    }
+
+    public function testGetOneWithMissingIdShouldThrowParameterMissingException(): void
+    {
+        $this->expectNotToPerformAssertions();
+    }
 }
diff --git a/tests/Functional/Components/Api/CustomerTest.php b/tests/Functional/Components/Api/CustomerTest.php
index 8fef00c79d3..499034de694 100644
--- a/tests/Functional/Components/Api/CustomerTest.php
+++ b/tests/Functional/Components/Api/CustomerTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Api;
@@ -198,7 +197,7 @@ public function testCreateShouldBeSuccessful(): int
         static::assertEquals($customer->getDefaultBillingAddress()->getAttribute()->getText1(), $testData['billing']['attribute']['text1']);
         static::assertEquals($customer->getDefaultShippingAddress()->getAttribute()->getText1(), $testData['shipping']['attribute']['text1']);
 
-        //test additional address lines
+        // test additional address lines
         static::assertEquals($customer->getDefaultShippingAddress()->getAdditionalAddressLine1(), $testData['shipping']['additionalAddressLine1']);
         static::assertEquals($customer->getDefaultShippingAddress()->getAdditionalAddressLine2(), $testData['shipping']['additionalAddressLine2']);
         static::assertEquals($customer->getDefaultBillingAddress()->getAdditionalAddressLine1(), $testData['billing']['additionalAddressLine1']);
@@ -342,7 +341,7 @@ public function testUpdateShouldBeSuccessful(int $id): int
         static::assertInstanceOf(Address::class, $customer->getDefaultShippingAddress());
         static::assertEquals($customer->getDefaultBillingAddress()->getFirstname(), $testData['billing']['firstname']);
 
-        //test additional fields
+        // test additional fields
         static::assertEquals($customer->getDefaultBillingAddress()->getAdditionalAddressLine1(), $testData['billing']['additionalAddressLine1']);
         static::assertEquals($customer->getDefaultBillingAddress()->getAdditionalAddressLine2(), $testData['billing']['additionalAddressLine2']);
 
diff --git a/tests/Functional/Components/Api/EmotionPresetTest.php b/tests/Functional/Components/Api/EmotionPresetTest.php
index 029d41f0d02..451a30814d9 100644
--- a/tests/Functional/Components/Api/EmotionPresetTest.php
+++ b/tests/Functional/Components/Api/EmotionPresetTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Api;
@@ -35,32 +34,30 @@
 use Shopware\Components\Api\Exception\ValidationException;
 use Shopware\Components\Api\Resource\EmotionPreset;
 use Shopware\Models\Emotion\Preset;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 
 /**
  * @group EmotionPreset
  */
 class EmotionPresetTest extends TestCase
 {
+    use ContainerTrait;
+    use DatabaseTransactionBehaviour;
+
     private Connection $connection;
 
     private EmotionPreset $resource;
 
     protected function setUp(): void
     {
-        $this->connection = Shopware()->Container()->get(Connection::class);
-        $this->connection->beginTransaction();
+        $this->connection = $this->getContainer()->get(Connection::class);
         $this->connection->executeQuery('DELETE FROM s_emotion_presets');
         $this->connection->executeQuery('DELETE FROM s_core_plugins');
-        $this->resource = Shopware()->Container()->get(EmotionPreset::class);
+        $this->resource = $this->getContainer()->get(EmotionPreset::class);
         parent::setUp();
     }
 
-    protected function tearDown(): void
-    {
-        $this->connection->rollBack();
-        parent::tearDown();
-    }
-
     public function testCreate(): void
     {
         $this->resource->create(['name' => 'test', 'presetData' => '[]']);
diff --git a/tests/Functional/Components/Api/ManufacturerTest.php b/tests/Functional/Components/Api/ManufacturerTest.php
index 7fbb05506a4..68013368b4d 100644
--- a/tests/Functional/Components/Api/ManufacturerTest.php
+++ b/tests/Functional/Components/Api/ManufacturerTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Api;
@@ -52,14 +51,14 @@ public function testCreateShouldBeSuccessful(): int
     {
         $date = new DateTime();
         $date->modify('-3 day');
-        $changed = $date->format(DateTime::ISO8601);
+        $changed = $date->format(DateTime::ATOM);
 
         $testData = [
-            'name' => 'fooobar',
-            'description' => 'foobar description with exceptionell long text',
-            'link' => 'http://shopware.com',
+            'name' => 'fooBar',
+            'description' => 'foobar description with exceptional long text',
+            'link' => 'https://www.shopware.com/',
             'image' => [
-                'link' => 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAABhGlDQ1BJQ0MgcHJvZmlsZQAAKJF9kT1Iw0AcxV9bpSJVh3YQcchQnSyI36NWoQgVQq3QqoPJpV/QpCFJcXEUXAsOfixWHVycdXVwFQTBDxA3NydFFynxf0mhRYwHx/14d+9x9w7w18tMNTtGAVWzjFQiLmSyq0LwFQGE0YtJTEvM1OdEMQnP8XUPH1/vYjzL+9yfo0fJmQzwCcSzTDcs4g3iqU1L57xPHGFFSSE+Jx4x6ILEj1yXXX7jXHDYzzMjRjo1TxwhFgptLLcxKxoq8QRxVFE1yvdnXFY4b3FWy1XWvCd/YSinrSxzneYgEljEEkQIkFFFCWVYiNGqkWIiRftxD/+A4xfJJZOrBEaOBVSgQnL84H/wu1szPz7mJoXiQOeLbX8MAcFdoFGz7e9j226cAIFn4Epr+St1YOaT9FpLix4BfdvAxXVLk/eAyx2g/0mXDMmRAjT9+TzwfkbflAXCt0D3mttbcx+nD0CaukreAAeHwHCBstc93t3V3tu/Z5r9/QDUInLOjro6CQAAAAlwSFlzAAAuIwAALiMBeKU/dgAAAAd0SU1FB+UDEw42F48Am4gAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAADElEQVQI12NgmPsfAAI9AZ115ELHAAAAAElFTkSuQmCC',
+                'link' => 'file://' . __DIR__ . '/fixtures/test-bild.jpg',
             ],
 
             'metaTitle' => 'test, test',
diff --git a/tests/Functional/Components/Api/MediaTest.php b/tests/Functional/Components/Api/MediaTest.php
index 1364342e98a..d41a481748b 100644
--- a/tests/Functional/Components/Api/MediaTest.php
+++ b/tests/Functional/Components/Api/MediaTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Api;
@@ -48,7 +47,7 @@ public function testUploadName(): void
         $source = __DIR__ . '/fixtures/test-bild.jpg';
         $dest = __DIR__ . '/fixtures/test-bild-used.jpg';
 
-        //copy image to execute test case multiple times.
+        // copy image to execute test case multiple times.
         @unlink($dest);
         copy($source, $dest);
 
@@ -62,7 +61,7 @@ public function testUploadName(): void
         $this->resource->create($data);
         static::assertTrue($mediaService->has($path));
 
-        //check if the thumbnails are generated
+        // check if the thumbnails are generated
         $path = Shopware()->DocPath('media_image_thumbnail') . 'test-bild-used_140x140.jpg';
         static::assertTrue($mediaService->has($path));
 
@@ -75,7 +74,7 @@ public function testUploadNameWithOver50Characters(): void
         $source = __DIR__ . '/fixtures/test-bild.jpg';
         $dest = __DIR__ . '/fixtures/test-bild-with-more-than-50-characaters-more-more-more-more-used.jpg';
 
-        //copy image to execute test case multiple times.
+        // copy image to execute test case multiple times.
         @unlink($dest);
         copy($source, $dest);
 
@@ -86,7 +85,7 @@ public function testUploadNameWithOver50Characters(): void
         $mediaService = Shopware()->Container()->get(MediaServiceInterface::class);
         static::assertTrue($mediaService->has($pathPicture));
 
-        //check if the thumbnails are generated
+        // check if the thumbnails are generated
         $path = Shopware()->DocPath('media_image_thumbnail') . $media->getName() . '_140x140.jpg';
         static::assertTrue($mediaService->has($path));
 
@@ -134,7 +133,7 @@ public function testReplaceMedia(): void
         $source = __DIR__ . '/fixtures/test-bild.jpg';
         $dest = __DIR__ . '/fixtures/test-bild-used.jpg';
 
-        //copy image to execute test case multiple times.
+        // copy image to execute test case multiple times.
         @unlink($dest);
         copy($source, $dest);
 
@@ -149,7 +148,7 @@ public function testReplaceMedia(): void
 
         $media = $this->resource->create($data);
 
-        //check if the thumbnails are generated
+        // check if the thumbnails are generated
         $this->resource->update($media->getId(), $updateData);
 
         $mediaPath = $mediaService->read($readPath);
@@ -168,7 +167,7 @@ public function testUploadMediaWithNonWhitelistedExtension(): void
         $source = __DIR__ . '/fixtures/test-bild.jpg';
         $dest = __DIR__ . '/fixtures/test-bild-used.foo';
 
-        //copy image to execute test case multiple times.
+        // copy image to execute test case multiple times.
         @unlink($dest);
         copy($source, $dest);
 
diff --git a/tests/Functional/Components/Api/OrderTest.php b/tests/Functional/Components/Api/OrderTest.php
index 1501ec6bacb..efd4ee1da04 100644
--- a/tests/Functional/Components/Api/OrderTest.php
+++ b/tests/Functional/Components/Api/OrderTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Api;
@@ -28,21 +28,29 @@
 use Doctrine\DBAL\Connection;
 use Shopware\Components\Api\Exception\NotFoundException;
 use Shopware\Components\Api\Exception\ParameterMissingException;
-use Shopware\Components\Api\Resource\Order;
+use Shopware\Components\Api\Resource\Order as OrderResource;
 use Shopware\Components\Api\Resource\Resource;
 use Shopware\Models\Order\Detail;
+use Shopware\Models\Order\Order as OrderModel;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 
 class OrderTest extends TestCase
 {
+    use ContainerTrait;
+    use DatabaseTransactionBehaviour;
+
     /**
-     * @var Order
+     * @var OrderResource
      */
     protected $resource;
 
     /**
-     * @var array
+     * @var array<string, mixed>
      */
-    private $order;
+    private array $order;
+
+    private Connection $connection;
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -51,31 +59,28 @@ class OrderTest extends TestCase
     protected function setUp(): void
     {
         parent::setUp();
-        $this->order = Shopware()->Db()->fetchRow('SELECT * FROM `s_order` ORDER BY id DESC LIMIT 1');
-        Shopware()->Container()->get(Connection::class)->beginTransaction();
-    }
-
-    protected function tearDown(): void
-    {
-        Shopware()->Container()->get(Connection::class)->rollback();
-        parent::tearDown();
+        $this->connection = $this->getContainer()->get(Connection::class);
+        $order = $this->connection->executeQuery('SELECT * FROM `s_order` ORDER BY id DESC LIMIT 1')->fetchAssociative();
+        static::assertIsArray($order);
+        $this->order = $order;
     }
 
-    public function createResource(): Order
+    public function createResource(): OrderResource
     {
-        return new Order();
+        return new OrderResource();
     }
 
     public function testGetOneShouldBeSuccessful(): void
     {
         $order = $this->resource->getOne($this->order['id']);
+        static::assertIsArray($order);
         static::assertEquals($this->order['id'], $order['id']);
     }
 
     public function testGetOneByNumberWithInvalidNumberShouldThrowNotFoundException(): void
     {
         $this->expectException(NotFoundException::class);
-        $this->resource->getOneByNumber(9999999);
+        $this->resource->getOneByNumber('SW9999999');
     }
 
     public function testGetOneByNumberWithMissinNumberShouldThrowParameterMissingException(): void
@@ -87,6 +92,7 @@ public function testGetOneByNumberWithMissinNumberShouldThrowParameterMissingExc
     public function testGetOneByNumberShouldBeSuccessful(): void
     {
         $order = $this->resource->getOneByNumber($this->order['ordernumber']);
+        static::assertIsArray($order);
         static::assertEquals($this->order['ordernumber'], $order['number']);
     }
 
@@ -95,14 +101,13 @@ public function testGetOneShouldBeAbleToReturnObject(): void
         $this->resource->setResultMode(Resource::HYDRATE_OBJECT);
         $order = $this->resource->getOne($this->order['id']);
 
-        static::assertInstanceOf(\Shopware\Models\Order\Order::class, $order);
+        static::assertInstanceOf(OrderModel::class, $order);
         static::assertEquals($this->order['id'], $order->getId());
     }
 
     public function testGetListShouldBeSuccessful(): void
     {
         $result = $this->resource->getList();
-
         static::assertIsArray($result);
 
         static::assertArrayHasKey('total', $result);
@@ -114,6 +119,7 @@ public function testGetListShouldBeSuccessful(): void
         static::assertGreaterThanOrEqual(1, \count($result['data']));
 
         $firstOrder = $result['data'][0];
+        static::assertIsArray($firstOrder);
 
         $expectedKeys = [
             'id',
@@ -168,7 +174,7 @@ public function testGetListShouldBeAbleToReturnObjects(): void
         static::assertGreaterThanOrEqual(1, $result['total']);
         static::assertGreaterThanOrEqual(1, $result['data']);
 
-        static::assertInstanceOf(\Shopware\Models\Order\Order::class, $result['data'][0]);
+        static::assertInstanceOf(OrderModel::class, $result['data'][0]);
     }
 
     public function testUpdateWithInvalidIdShouldThrowNotFoundException(): void
@@ -180,7 +186,7 @@ public function testUpdateWithInvalidIdShouldThrowNotFoundException(): void
     public function testUpdateWithMissingIdShouldThrowParameterMissingException(): void
     {
         $this->expectException(ParameterMissingException::class);
-        $this->resource->update('', []);
+        $this->resource->update(0, []);
     }
 
     public function testCreateOrderFailsOnMissingShippingAddress(): void
@@ -189,6 +195,7 @@ public function testCreateOrderFailsOnMissingShippingAddress(): void
         // Get existing order
         $this->resource->setResultMode(Resource::HYDRATE_ARRAY);
         $order = $this->resource->getOne($this->order['id']);
+        static::assertIsArray($order);
 
         $order = $this->filterOrderId($order);
 
@@ -203,6 +210,7 @@ public function testCreateOrderFailsOnMissingBillingAddress(): void
         // Get existing order
         $this->resource->setResultMode(Resource::HYDRATE_ARRAY);
         $order = $this->resource->getOne($this->order['id']);
+        static::assertIsArray($order);
 
         $order = $this->filterOrderId($order);
 
@@ -217,6 +225,7 @@ public function testCreateOrderFailsOnMissingCustomerId(): void
         // Get existing order
         $this->resource->setResultMode(Resource::HYDRATE_ARRAY);
         $order = $this->resource->getOne($this->order['id']);
+        static::assertIsArray($order);
 
         $order = $this->filterOrderId($order);
 
@@ -231,6 +240,7 @@ public function testCreateOrderFailsOnUnknownCustomerId(): void
         // Get existing order
         $this->resource->setResultMode(Resource::HYDRATE_ARRAY);
         $order = $this->resource->getOne($this->order['id']);
+        static::assertIsArray($order);
 
         $order = $this->filterOrderId($order);
 
@@ -245,6 +255,7 @@ public function testCreateOrderFailsOnUnknownCountryIdInBillingAddress(): void
         // Get existing order
         $this->resource->setResultMode(Resource::HYDRATE_ARRAY);
         $order = $this->resource->getOne($this->order['id']);
+        static::assertIsArray($order);
 
         $order = $this->filterOrderId($order);
 
@@ -259,6 +270,7 @@ public function testCreateOrderFailsOnUnknownStateIdInBillingAddress(): void
         // Get existing order
         $this->resource->setResultMode(Resource::HYDRATE_ARRAY);
         $order = $this->resource->getOne($this->order['id']);
+        static::assertIsArray($order);
 
         $order = $this->filterOrderId($order);
 
@@ -273,6 +285,7 @@ public function testCreateOrderFailsOnUnknownCountryIdInShippingAddress(): void
         // Get existing order
         $this->resource->setResultMode(Resource::HYDRATE_ARRAY);
         $order = $this->resource->getOne($this->order['id']);
+        static::assertIsArray($order);
 
         $order = $this->filterOrderId($order);
 
@@ -287,6 +300,7 @@ public function testCreateOrderFailsOnUnknownStateIdInShipppingAddress(): void
         // Get existing order
         $this->resource->setResultMode(Resource::HYDRATE_ARRAY);
         $order = $this->resource->getOne($this->order['id']);
+        static::assertIsArray($order);
 
         $order = $this->filterOrderId($order);
 
@@ -301,6 +315,7 @@ public function testCreateOrderFailsOnUnknownStateIdInDetails(): void
         // Get existing order
         $this->resource->setResultMode(Resource::HYDRATE_ARRAY);
         $order = $this->resource->getOne($this->order['id']);
+        static::assertIsArray($order);
 
         $order = $this->filterOrderId($order);
 
@@ -314,6 +329,7 @@ public function testCreateOrderOnEmptyStateIdInBillingAddress(): void
         // Get existing order
         $this->resource->setResultMode(Resource::HYDRATE_ARRAY);
         $order = $this->resource->getOne($this->order['id']);
+        static::assertIsArray($order);
 
         $order = $this->filterOrderId($order);
         unset($order['billing']['stateId']);
@@ -328,6 +344,7 @@ public function testCreateOrderOnEmptyStateIdInShippingAddress(): void
         // Get existing order
         $this->resource->setResultMode(Resource::HYDRATE_ARRAY);
         $order = $this->resource->getOne($this->order['id']);
+        static::assertIsArray($order);
 
         $order = $this->filterOrderId($order);
         unset($order['shipping']['stateId']);
@@ -343,6 +360,7 @@ public function testCreateOrderOnInvalidStateId(): void
         // Get existing order
         $this->resource->setResultMode(Resource::HYDRATE_ARRAY);
         $order = $this->resource->getOne($this->order['id']);
+        static::assertIsArray($order);
 
         $order = $this->filterOrderId($order);
         $order['shipping']['stateId'] = 9999;
@@ -356,6 +374,7 @@ public function testCreateOrderFailsOnUnknownTaxIdInDetails(): void
         // Get existing order
         $this->resource->setResultMode(Resource::HYDRATE_ARRAY);
         $order = $this->resource->getOne($this->order['id']);
+        static::assertIsArray($order);
 
         $order = $this->filterOrderId($order);
 
@@ -370,6 +389,7 @@ public function testCreateOrderFailsOnMissingOrderStatusId(): void
         // Get existing order
         $this->resource->setResultMode(Resource::HYDRATE_ARRAY);
         $order = $this->resource->getOne($this->order['id']);
+        static::assertIsArray($order);
 
         $order = $this->filterOrderId($order);
 
@@ -384,6 +404,7 @@ public function testCreateOrderFailsOnUnknownOrderStatusId(): void
         // Get existing order
         $this->resource->setResultMode(Resource::HYDRATE_ARRAY);
         $order = $this->resource->getOne($this->order['id']);
+        static::assertIsArray($order);
 
         $order = $this->filterOrderId($order);
 
@@ -398,6 +419,7 @@ public function testCreateOrderFailsOnMissingPaymentId(): void
         // Get existing order
         $this->resource->setResultMode(Resource::HYDRATE_ARRAY);
         $order = $this->resource->getOne($this->order['id']);
+        static::assertIsArray($order);
 
         $order = $this->filterOrderId($order);
 
@@ -412,6 +434,7 @@ public function testCreateOrderFailsOnUnknownPaymentId(): void
         // Get existing order
         $this->resource->setResultMode(Resource::HYDRATE_ARRAY);
         $order = $this->resource->getOne($this->order['id']);
+        static::assertIsArray($order);
 
         $order = $this->filterOrderId($order);
 
@@ -426,6 +449,7 @@ public function testCreateOrderFailsOnMissingPaymentStatusId(): void
         // Get existing order
         $this->resource->setResultMode(Resource::HYDRATE_ARRAY);
         $order = $this->resource->getOne($this->order['id']);
+        static::assertIsArray($order);
 
         $order = $this->filterOrderId($order);
 
@@ -440,6 +464,7 @@ public function testCreateOrderFailsOnUnknownPaymentStatusId(): void
         // Get existing order
         $this->resource->setResultMode(Resource::HYDRATE_ARRAY);
         $order = $this->resource->getOne($this->order['id']);
+        static::assertIsArray($order);
 
         $order = $this->filterOrderId($order);
 
@@ -454,6 +479,7 @@ public function testCreateOrderFailsOnMissingDispatchId(): void
         // Get existing order
         $this->resource->setResultMode(Resource::HYDRATE_ARRAY);
         $order = $this->resource->getOne($this->order['id']);
+        static::assertIsArray($order);
 
         $order = $this->filterOrderId($order);
 
@@ -468,6 +494,7 @@ public function testCreateOrderFailsOnUnknownDispatchId(): void
         // Get existing order
         $this->resource->setResultMode(Resource::HYDRATE_ARRAY);
         $order = $this->resource->getOne($this->order['id']);
+        static::assertIsArray($order);
 
         $order = $this->filterOrderId($order);
 
@@ -482,6 +509,7 @@ public function testCreateOrderFailsOnMissingShopId(): void
         // Get existing order
         $this->resource->setResultMode(Resource::HYDRATE_ARRAY);
         $order = $this->resource->getOne($this->order['id']);
+        static::assertIsArray($order);
 
         $order = $this->filterOrderId($order);
 
@@ -496,6 +524,7 @@ public function testCreateOrderFailsOnUnknownShopId(): void
         // Get existing order
         $this->resource->setResultMode(Resource::HYDRATE_ARRAY);
         $order = $this->resource->getOne($this->order['id']);
+        static::assertIsArray($order);
 
         $order = $this->filterOrderId($order);
 
@@ -509,10 +538,12 @@ public function testCreateOrderByCopy(): void
         // Get existing order
         $this->resource->setResultMode(Resource::HYDRATE_ARRAY);
         $order = $this->resource->getOne($this->order['id']);
+        static::assertIsArray($order);
 
         $oldOrderNumber = (int) $order['number'];
 
         $order = $this->filterOrderId($order);
+        $order['invoiceShippingTaxRate'] = 19.0;
 
         $newOrder = $this->resource->create($order);
 
@@ -528,10 +559,11 @@ public function testCreateOrderByCopy(): void
         static::assertNotNull($newOrder->getShipping());
         static::assertEquals($order['shipping']['city'], $newOrder->getShipping()->getCity());
         static::assertCount(\count($order['details']), $newOrder->getDetails());
-        $firstOrderDetail = $newOrder->getDetails()[0];
+        $firstOrderDetail = $newOrder->getDetails()->first();
         static::assertInstanceOf(Detail::class, $firstOrderDetail);
         static::assertEquals($order['details'][0]['articleName'], $firstOrderDetail->getArticleName());
-        static::assertEquals(($oldOrderNumber + 1), (int) $firstOrderDetail->getNumber());
+        static::assertEquals($oldOrderNumber + 1, (int) $firstOrderDetail->getNumber());
+        static::assertSame($order['invoiceShippingTaxRate'], $newOrder->getInvoiceShippingTaxRate());
     }
 
     public function testUpdateOrderPositionStatusShouldBeSuccessful(): void
@@ -539,6 +571,7 @@ public function testUpdateOrderPositionStatusShouldBeSuccessful(): void
         // Get existing order
         $this->resource->setResultMode(Resource::HYDRATE_ARRAY);
         $order = $this->resource->getOne($this->order['id']);
+        static::assertIsArray($order);
 
         // Update the order details of that order
         $updateArray = [];
@@ -550,6 +583,8 @@ public function testUpdateOrderPositionStatusShouldBeSuccessful(): void
         // Reload the order and check the result
         $this->resource->setResultMode(Resource::HYDRATE_ARRAY);
         $order = $this->resource->getOne($this->order['id']);
+        static::assertIsArray($order);
+        static::assertArrayHasKey('details', $updateArray);
         foreach ($order['details'] as $detail) {
             $currentId = $detail['id'];
 
@@ -563,6 +598,7 @@ public function testCreateOrderWithDocuments(): void
         // Get existing order
         $this->resource->setResultMode(Resource::HYDRATE_ARRAY);
         $order = $this->resource->getOne($this->order['id']);
+        static::assertIsArray($order);
 
         $order = $this->filterOrderId($order);
         $order['documents'] = [
@@ -592,14 +628,15 @@ public function testCreateOrderWithDocuments(): void
     public function testSingleOrderDetailUpdate(): void
     {
         // Get existing order with at least two order items
-        $orderId = (int) Shopware()->Db()
-            ->query('SELECT `orderID`, COUNT(1) `counter` FROM `s_order_details` GROUP BY `orderId` HAVING `counter` > 1 ORDER BY id DESC LIMIT 1')
-            ->fetchColumn();
+        $orderId = (int) $this->connection
+            ->executeQuery('SELECT `orderID`, COUNT(1) `counter` FROM `s_order_details` GROUP BY `orderId` HAVING `counter` > 1 ORDER BY id DESC LIMIT 1')
+            ->fetchOne();
         $this->resource->setResultMode(Resource::HYDRATE_OBJECT);
         $order = $this->resource->getOne($orderId);
+        static::assertInstanceOf(OrderModel::class, $order);
 
-        /** @var Detail $firstDetail */
         $firstDetail = $order->getDetails()->first();
+        static::assertInstanceOf(Detail::class, $firstDetail);
         $newShipped = $firstDetail->getShipped() + 1;
         $orderCount = $order->getDetails()->count();
 
@@ -615,27 +652,27 @@ public function testSingleOrderDetailUpdate(): void
             ],
         ]);
 
-        /** @var Detail|null $firstDetail */
         $firstDetail = $order->getDetails()->filter(static function (Detail $detail) use ($firstDetail): bool {
             return $detail->getId() === $firstDetail->getId();
         })->first();
 
         static::assertEquals($orderCount, $order->getDetails()->count());
-        static::assertNotNull($firstDetail);
+        static::assertInstanceOf(Detail::class, $firstDetail);
         static::assertEquals($newShipped, $firstDetail->getShipped());
     }
 
     public function testSingleOrderDetailUpdateToDeleteOtherItems(): void
     {
         // Get existing order with at least two order items
-        $orderId = (int) Shopware()->Db()
-            ->query('SELECT `orderID`, COUNT(1) `counter` FROM `s_order_details` GROUP BY `orderId` HAVING `counter` > 1 ORDER BY id DESC LIMIT 1')
-            ->fetchColumn();
+        $orderId = (int) $this->connection
+            ->executeQuery('SELECT `orderID`, COUNT(1) `counter` FROM `s_order_details` GROUP BY `orderId` HAVING `counter` > 1 ORDER BY id DESC LIMIT 1')
+            ->fetchOne();
         $this->resource->setResultMode(Resource::HYDRATE_OBJECT);
         $order = $this->resource->getOne($orderId);
+        static::assertInstanceOf(OrderModel::class, $order);
 
-        /** @var Detail $firstDetail */
         $firstDetail = $order->getDetails()->first();
+        static::assertInstanceOf(Detail::class, $firstDetail);
 
         $order = $this->resource->update($order->getId(), [
             'details' => [
@@ -643,7 +680,6 @@ public function testSingleOrderDetailUpdateToDeleteOtherItems(): void
             ],
         ]);
 
-        /** @var Detail|null $firstDetail */
         $firstDetail = $order->getDetails()->filter(static function (Detail $detail) use ($firstDetail): bool {
             return $detail->getId() === $firstDetail->getId();
         })->first();
@@ -652,6 +688,11 @@ public function testSingleOrderDetailUpdateToDeleteOtherItems(): void
         static::assertNotNull($firstDetail);
     }
 
+    /**
+     * @param array<string, mixed> $order
+     *
+     * @return array<string, mixed>
+     */
     private function filterOrderId(array $order): array
     {
         // Remove order Ids and order numbers
diff --git a/tests/Functional/Components/Api/PropertyGroupTest.php b/tests/Functional/Components/Api/PropertyGroupTest.php
index 6847fb5a56b..bfde5bb8e9c 100644
--- a/tests/Functional/Components/Api/PropertyGroupTest.php
+++ b/tests/Functional/Components/Api/PropertyGroupTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Api;
diff --git a/tests/Functional/Components/Api/ResourceTest.php b/tests/Functional/Components/Api/ResourceTest.php
index e9d99e41680..bf723594309 100644
--- a/tests/Functional/Components/Api/ResourceTest.php
+++ b/tests/Functional/Components/Api/ResourceTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Api;
diff --git a/tests/Functional/Components/Api/ShopTest.php b/tests/Functional/Components/Api/ShopTest.php
index 03d51f7fcb8..6b2297cf838 100644
--- a/tests/Functional/Components/Api/ShopTest.php
+++ b/tests/Functional/Components/Api/ShopTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Api;
diff --git a/tests/Functional/Components/Api/TestCase.php b/tests/Functional/Components/Api/TestCase.php
index f6931acf5a7..8868bc651ea 100644
--- a/tests/Functional/Components/Api/TestCase.php
+++ b/tests/Functional/Components/Api/TestCase.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Api;
diff --git a/tests/Functional/Components/Api/TranslationTest.php b/tests/Functional/Components/Api/TranslationTest.php
index e657bd692cc..a017699115f 100644
--- a/tests/Functional/Components/Api/TranslationTest.php
+++ b/tests/Functional/Components/Api/TranslationTest.php
@@ -5,45 +5,57 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Api;
 
+use Doctrine\DBAL\Connection;
 use Shopware\Components\Api\Exception\CustomValidationException;
 use Shopware\Components\Api\Exception\NotFoundException;
 use Shopware\Components\Api\Exception\ParameterMissingException;
 use Shopware\Components\Api\Resource\Translation as TranslationResource;
-use Shopware\Models\Article\Article;
+use Shopware\Models\Article\Article as ProductModel;
 use Shopware\Models\Translation\Translation;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 
 class TranslationTest extends TestCase
 {
+    use ContainerTrait;
+    use DatabaseTransactionBehaviour;
+
+    private const PRODUCT_TYPE = 'article';
+
     /**
      * @var TranslationResource
      */
     protected $resource;
 
-    /**
-     * @return TranslationResource
-     */
-    public function createResource()
+    private Connection $connection;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->connection = $this->getContainer()->get(Connection::class);
+    }
+
+    public function createResource(): TranslationResource
     {
         return new TranslationResource();
     }
@@ -58,7 +70,7 @@ public function testList(): void
         }
     }
 
-    public function testArticleTranslationList(): void
+    public function testProductTranslationList(): void
     {
         $list = $this->resource->getList(0, 5, [
             [
@@ -68,18 +80,13 @@ public function testArticleTranslationList(): void
         ]);
 
         foreach ($list['data'] as $item) {
-            $article = Shopware()->Models()->find(Article::class, $item['key']);
-
-            static::assertInstanceOf(Article::class, $article);
-
-            static::assertEquals(
-                TranslationResource::TYPE_PRODUCT,
-                $item['type']
-            );
+            $product = $this->getContainer()->get('models')->find(ProductModel::class, $item['key']);
+            static::assertInstanceOf(ProductModel::class, $product);
+            static::assertSame(TranslationResource::TYPE_PRODUCT, $item['type']);
         }
     }
 
-    public function testSingleArticleTranslation(): void
+    public function testSingleProductTranslation(): void
     {
         $list = $this->resource->getList(0, 1, [
             [
@@ -88,7 +95,10 @@ public function testSingleArticleTranslation(): void
             ],
             [
                 'property' => 'translation.key',
-                'value' => Shopware()->Db()->fetchOne("SELECT objectkey FROM s_core_translations WHERE objecttype='article' LIMIT 1"),
+                'value' => $this->connection->fetchOne(
+                    'SELECT objectkey FROM s_core_translations WHERE objecttype=:type LIMIT 1',
+                    ['type' => self::PRODUCT_TYPE]
+                ),
             ],
             [
                 'property' => 'translation.shopId',
@@ -99,77 +109,11 @@ public function testSingleArticleTranslation(): void
         static::assertCount(1, $list['data']);
         $data = $list['data'][0];
 
-        static::assertEquals(
-            TranslationResource::TYPE_PRODUCT,
-            $data['type']
-        );
-
+        static::assertSame(TranslationResource::TYPE_PRODUCT, $data['type']);
         static::assertArrayHasKey('name', $data['data']);
         static::assertArrayHasKey('descriptionLong', $data['data']);
     }
 
-    public function testCreateArticle(): int
-    {
-        $data = $this->getDummyData('article');
-
-        $translation = $this->resource->create($data);
-
-        static::assertInstanceOf(Translation::class, $translation);
-        static::assertEquals(
-            $data['key'],
-            $translation->getKey(),
-            'Translation key do not match'
-        );
-        static::assertEquals(
-            $data['type'],
-            $translation->getType(),
-            'Translation type do not match'
-        );
-        static::assertEquals(
-            $data['data'],
-            $this->resource->getTranslationComponent()->unFilterData(
-                'article',
-                $translation->getData()
-            ),
-            'Translation data do not match'
-        );
-
-        return $translation->getKey();
-    }
-
-    public function testCreateArticleByNumber(): int
-    {
-        $data = $this->getDummyData('article');
-        $article = Shopware()->Db()->fetchRow('SELECT ordernumber, articleID FROM s_articles_details LIMIT 1');
-        $data['key'] = $article['ordernumber'];
-
-        $translation = $this->resource->createByNumber($data);
-
-        static::assertInstanceOf(Translation::class, $translation);
-
-        static::assertEquals(
-            $article['articleID'],
-            $translation->getKey(),
-            'Translation key do not match'
-        );
-
-        static::assertEquals(
-            $data['type'],
-            $translation->getType(),
-            'Translation type do not match'
-        );
-        static::assertEquals(
-            $data['data'],
-            $this->resource->getTranslationComponent()->unFilterData(
-                'article',
-                $translation->getData()
-            ),
-            'Translation data do not match'
-        );
-
-        return (int) $article['articleID'];
-    }
-
     /**
      * Checks if variants can be translated
      *
@@ -178,87 +122,65 @@ public function testCreateArticleByNumber(): int
     public function testCreateVariantTranslationByNumber(): void
     {
         $data = $this->getDummyData('variant');
-        //Artikel mit Standardkonfigurator rot / 39
-        $article = Shopware()->Db()->fetchRow("SELECT id, ordernumber, articleID FROM s_articles_details WHERE ordernumber = 'SW10201.11'");
-        $data['key'] = $article['ordernumber'];
+        // Artikel mit Standardkonfigurator rot / 39
+        $product = $this->connection->fetchAssociative("SELECT id, ordernumber, articleID FROM s_articles_details WHERE ordernumber = 'SW10201.11'");
+        static::assertIsArray($product);
+        $data['key'] = $product['ordernumber'];
 
         $translation = $this->resource->createByNumber($data);
 
         static::assertInstanceOf(Translation::class, $translation);
 
-        static::assertEquals(
-            $article['id'],
-            $translation->getKey(),
-            'Translation key do not match'
-        );
-
-        static::assertEquals(
-            $data['type'],
-            $translation->getType(),
-            'Translation type do not match'
-        );
-        static::assertEquals(
+        static::assertSame((int) $product['id'], $translation->getKey(), 'Translation key do not match');
+        static::assertSame($data['type'], $translation->getType());
+        static::assertSame(
             $data['data'],
             $this->resource->getTranslationComponent()->unFilterData(
-                'article',
+                self::PRODUCT_TYPE,
                 $translation->getData()
             ),
             'Translation data do not match'
         );
     }
 
-    /**
-     * @depends testCreateArticle
-     */
-    public function testArticleUpdateOverride(int $key): int
+    public function testProductTranslationUpdateOverride(): void
     {
+        $productId = $this->createProduct();
         $this->resource->setResultMode(2);
         $translation = $this->resource->getList(0, 1, [
-            ['property' => 'translation.type', 'value' => 'article'],
-            ['property' => 'translation.key', 'value' => $key],
+            ['property' => 'translation.type', 'value' => self::PRODUCT_TYPE],
+            ['property' => 'translation.key', 'value' => $productId],
             ['property' => 'translation.shopId', 'value' => 2],
         ]);
-
         $translation = $translation['data'][0];
 
         foreach ($translation['data'] as &$fieldTranslation) {
             $fieldTranslation = 'UPDATE - ' . $fieldTranslation;
         }
+        unset($fieldTranslation);
 
-        $updated = $this->resource->update($key, $translation);
-
-        static::assertEquals(
-            $translation['key'],
-            $updated->getKey(),
-            'Translation key do not match'
-        );
-        static::assertEquals(
-            $translation['type'],
-            $updated->getType(),
-            'Translation type do not match'
-        );
+        $updateResult = $this->resource->update($productId, $translation);
+        static::assertInstanceOf(Translation::class, $updateResult);
 
-        static::assertEquals(
-            $translation['data'],
-            $this->resource->getTranslationComponent()->unFilterData(
-                'article',
-                $updated->getData()
-            ),
-            'Translation data do not match'
-        );
+        $updatedTranslation = $this->resource->getList(0, 1, [
+            ['property' => 'translation.type', 'value' => self::PRODUCT_TYPE],
+            ['property' => 'translation.key', 'value' => $productId],
+            ['property' => 'translation.shopId', 'value' => 2],
+        ]);
+        $updatedTranslation = $updatedTranslation['data'][0];
 
-        return $key;
+        static::assertSame($translation['key'], $updatedTranslation['key'], 'Translation key do not match');
+        static::assertSame($translation['type'], $updatedTranslation['type'], 'Translation type do not match');
+        static::assertSame($translation['data'], $updatedTranslation['data'], 'Translation data do not match');
     }
 
-    /**
-     * @depends testArticleUpdateOverride
-     */
-    public function testArticleUpdateMerge(int $key): void
+    public function testProductTranslationUpdateMerge(): void
     {
+        $productId = $this->createProduct();
         $this->resource->setResultMode(2);
         $translation = $this->resource->getList(0, 1, [
-            ['property' => 'translation.type', 'value' => 'article'],
-            ['property' => 'translation.key', 'value' => $key],
+            ['property' => 'translation.type', 'value' => self::PRODUCT_TYPE],
+            ['property' => 'translation.key', 'value' => $productId],
             ['property' => 'translation.shopId', 'value' => 2],
         ]);
 
@@ -267,34 +189,25 @@ public function testArticleUpdateMerge(int $key): void
             'txtArtikel' => 'Update-2',
         ];
 
-        $updated = $this->resource->update($key, $translation);
+        $updateResult = $this->resource->update($productId, $translation);
+        static::assertInstanceOf(Translation::class, $updateResult);
 
-        static::assertEquals(
-            $translation['key'],
-            $updated->getKey(),
-            'Translation key do not match'
-        );
-        static::assertEquals(
-            $translation['type'],
-            $updated->getType(),
-            'Translation type do not match'
-        );
+        $updatedTranslation = $this->resource->getList(0, 1, [
+            ['property' => 'translation.type', 'value' => self::PRODUCT_TYPE],
+            ['property' => 'translation.key', 'value' => $productId],
+            ['property' => 'translation.shopId', 'value' => 2],
+        ]);
 
-        $dataTranslation = unserialize($updated->getData());
-        static::assertEquals(
-            $translation['data']['txtArtikel'],
-            $dataTranslation['txtArtikel']
-        );
+        $updatedTranslation = $updatedTranslation['data'][0];
 
-        static::assertEquals(
-            'UPDATE - Dummy Translation',
-            $dataTranslation['txtlangbeschreibung']
-        );
+        static::assertSame($translation['key'], $updatedTranslation['key'], 'Translation key do not match');
+        static::assertSame($translation['type'], $updatedTranslation['type'], 'Translation type do not match');
+        static::assertSame($translation['data']['txtArtikel'], $updatedTranslation['data']['name']);
     }
 
     public function testRecursiveMerge(): void
     {
-        $create = $this->getDummyData('article');
+        $create = $this->getDummyData(self::PRODUCT_TYPE);
 
         $create['type'] = 'recursive';
         $create['data'] = [
@@ -323,84 +236,136 @@ public function testRecursiveMerge(): void
             ],
         ];
 
-        $updated = $this->resource->update($created->getKey(), $update);
+        $updateResult = $this->resource->update($created->getKey(), $update);
+        static::assertInstanceOf(Translation::class, $updateResult);
 
-        $updateData = $update['data'];
-        $updatedData = unserialize($updated->getData());
-
-        static::assertEquals(
-            $updateData['a1'],
-            $updatedData['a1'],
-            'First level not updated'
-        );
-
-        static::assertEquals(
-            $updateData['b1']['a2'],
-            $updatedData['b1']['a2'],
-            'Second level not updated'
-        );
+        $updatedTranslation = $this->resource->getList(0, 1, [
+            ['property' => 'translation.key', 'value' => $created->getKey()],
+        ]);
+        $updatedTranslation = $updatedTranslation['data'][0];
 
-        static::assertEquals(
-            $updateData['b1']['b2']['a3'],
-            $updatedData['b1']['b2']['a3'],
-            'Third level not updated'
-        );
+        $updateData = $update['data'];
+        $updatedData = $updatedTranslation['data'];
 
-        static::assertEquals(
-            $create['data']['b1']['b2']['b3']['a4'],
-            $updatedData['b1']['b2']['b3']['a4'],
-            'Fourth level not updated'
-        );
+        static::assertSame($updateData['a1'], $updatedData['a1'], 'First level not updated');
+        static::assertSame($updateData['b1']['a2'], $updatedData['b1']['a2'], 'Second level not updated');
+        static::assertSame($updateData['b1']['b2']['a3'], $updatedData['b1']['b2']['a3'], 'Third level not updated');
+        static::assertSame($create['data']['b1']['b2']['b3']['a4'], $updatedData['b1']['b2']['b3']['a4'], 'Fourth level not updated');
     }
 
     public function testBatch(): void
     {
         $translations = [];
         for ($i = 0; $i < 4; ++$i) {
-            $translations[] = $this->getDummyData('article');
+            $translations[] = $this->getDummyData(self::PRODUCT_TYPE);
         }
 
-        $article = Shopware()->Db()->fetchRow(
+        $product = $this->connection->fetchAssociative(
             'SELECT ordernumber, articleID
             FROM s_articles_details
             LIMIT 1'
         );
-        $translations[0]['key'] = $article['ordernumber'];
+        static::assertIsArray($product);
+        $translations[0]['key'] = $product['ordernumber'];
         $translations[0]['useNumberAsId'] = true;
 
-        $results = $this->resource->batch($translations);
-
-        foreach ($results as $result) {
+        foreach ($this->resource->batch($translations) as $result) {
             static::assertTrue($result['success']);
-            static::assertEquals('update', $result['operation']);
+            static::assertSame('update', $result['operation']);
             static::assertNotEmpty($result['data']);
-            static::assertEquals(2, $result['data']['shopId']);
+            static::assertSame(2, $result['data']['shopId']);
         }
     }
 
-    /**
-     * @depends testCreateArticleByNumber
-     */
-    public function testUpdateByNumber(int $productId): void
+    public function testBatchUpdate(): void
+    {
+        $productId1 = $this->createProduct();
+        $productId2 = $this->createProduct();
+
+        $this->resource->setResultMode(2);
+        $translations = $this->resource->getList(
+            0,
+            2,
+            [
+                ['property' => 'translation.type', 'value' => self::PRODUCT_TYPE],
+                ['property' => 'translation.shopId', 'value' => 2],
+            ],
+            [
+                ['property' => 'translation.id', 'direction' => 'DESC'],
+            ]
+        );
+        $translations = $translations['data'];
+
+        foreach ($translations as &$translation) {
+            static::assertContains($translation['key'], [$productId1, $productId2]);
+            foreach ($translation['data'] as &$fieldTranslation) {
+                $fieldTranslation = 'UPDATE - ' . $fieldTranslation;
+            }
+            unset($fieldTranslation);
+        }
+        unset($translation);
+
+        foreach ($this->resource->batch($translations) as $operation) {
+            static::assertTrue($operation['success']);
+            static::assertSame('update', $operation['operation']);
+        }
+
+        $updatedTranslations = $this->resource->getList(
+            0,
+            2,
+            [
+                ['property' => 'translation.type', 'value' => self::PRODUCT_TYPE],
+                ['property' => 'translation.shopId', 'value' => 2],
+            ],
+            [
+                ['property' => 'translation.id', 'direction' => 'DESC'],
+            ]
+        );
+        $updatedTranslations = $updatedTranslations['data'];
+
+        foreach ($updatedTranslations as $key => $updatedTranslation) {
+            static::assertSame(
+                $translations[$key]['key'],
+                $updatedTranslation['key'],
+                'Translation key do not match'
+            );
+            static::assertSame(
+                $translations[$key]['type'],
+                $updatedTranslation['type'],
+                'Translation type do not match'
+            );
+
+            $dataTranslation = $updatedTranslation['data'];
+            static::assertSame(
+                $translations[$key]['data']['name'],
+                $dataTranslation['name']
+            );
+        }
+    }
+
+    public function testUpdateByNumber(): void
     {
-        $translation = $this->getDummyData('article');
-        $product = Shopware()->Db()->fetchRow(
+        $productId = $this->createProductByNumber();
+        $translation = $this->getDummyData(self::PRODUCT_TYPE);
+        $product = $this->connection->fetchAssociative(
             'SELECT ordernumber, articleID
             FROM s_articles_details
-            WHERE articleID = :articleId
+            WHERE articleID = :productId
             LIMIT 1',
-            [':articleId' => $productId]
+            ['productId' => $productId]
         );
+        static::assertIsArray($product);
         $translation['key'] = $product['ordernumber'];
 
         foreach ($translation['data'] as &$data) {
             $data .= '-UpdateByNumber';
         }
+        unset($data);
 
         $result = $this->resource->updateByNumber($product['ordernumber'], $translation);
 
         static::assertInstanceOf(Translation::class, $result);
-        static::assertEquals($result->getKey(), $product['articleID']);
+        static::assertSame($result->getKey(), (int) $product['articleID']);
         $data = unserialize($result->getData());
 
         foreach ($data as $item) {
@@ -411,7 +376,7 @@ public function testUpdateByNumber(int $productId): void
 
     public function testDelete(): void
     {
-        $data = $this->getDummyData('article');
+        $data = $this->getDummyData(self::PRODUCT_TYPE);
         $translation = $this->resource->create($data);
 
         static::assertInstanceOf(Translation::class, $translation);
@@ -419,20 +384,26 @@ public function testDelete(): void
         unset($data['data']);
 
         $result = $this->resource->delete($data['key'], $data);
-
         static::assertTrue($result);
+
+        $translation = $this->resource->getList(0, 1, [
+            ['property' => 'translation.key', 'value' => $data['key']],
+            ['property' => 'translation.type', 'value' => self::PRODUCT_TYPE],
+        ]);
+        static::assertCount(0, $translation['data']);
     }
 
     public function testDeleteByNumber(): void
     {
-        $data = $this->getDummyData('article');
+        $data = $this->getDummyData(self::PRODUCT_TYPE);
 
-        $article = Shopware()->Db()->fetchRow(
+        $product = $this->connection->fetchAssociative(
             'SELECT ordernumber, articleID
             FROM s_articles_details
             LIMIT 1'
         );
-        $data['key'] = $article['articleID'];
+        static::assertIsArray($product);
+        $data['key'] = $product['articleID'];
 
         $translation = $this->resource->create($data);
 
@@ -440,9 +411,14 @@ public function testDeleteByNumber(): void
 
         unset($data['data']);
 
-        $result = $this->resource->deleteByNumber($article['ordernumber'], $data);
-
+        $result = $this->resource->deleteByNumber($product['ordernumber'], $data);
         static::assertTrue($result);
+
+        $translation = $this->resource->getList(0, 1, [
+            ['property' => 'translation.key', 'value' => $data['key']],
+            ['property' => 'translation.type', 'value' => self::PRODUCT_TYPE],
+        ]);
+        static::assertCount(0, $translation['data']);
     }
 
     public function testLinkNumber(): void
@@ -461,7 +437,8 @@ public function testDownloadNumber(): void
 
     public function testManufacturerNumber(): void
     {
-        $entity = Shopware()->Db()->fetchRow('SELECT * FROM s_articles_supplier LIMIT 1');
+        $entity = $this->connection->fetchAssociative('SELECT * FROM s_articles_supplier LIMIT 1');
+        static::assertIsArray($entity);
         $this->numberCreate('supplier', (int) $entity['id'], $entity['name']);
         $this->numberUpdate('supplier', (int) $entity['id'], $entity['name']);
         $this->numberDelete('supplier', $entity['name']);
@@ -469,7 +446,8 @@ public function testManufacturerNumber(): void
 
     public function testCountryName(): void
     {
-        $entity = Shopware()->Db()->fetchRow('SELECT * FROM s_core_countries LIMIT 1');
+        $entity = $this->connection->fetchAssociative('SELECT * FROM s_core_countries LIMIT 1');
+        static::assertIsArray($entity);
         $this->numberCreate('config_countries', (int) $entity['id'], $entity['countryname']);
         $this->numberUpdate('config_countries', (int) $entity['id'], $entity['countryname']);
         $this->numberDelete('config_countries', $entity['countryname']);
@@ -477,7 +455,8 @@ public function testCountryName(): void
 
     public function testCountryIso(): void
     {
-        $entity = Shopware()->Db()->fetchRow('SELECT * FROM s_core_countries LIMIT 1');
+        $entity = $this->connection->fetchAssociative('SELECT * FROM s_core_countries LIMIT 1');
+        static::assertIsArray($entity);
         $this->numberCreate('config_countries', (int) $entity['id'], $entity['countryiso']);
         $this->numberUpdate('config_countries', (int) $entity['id'], $entity['countryiso']);
         $this->numberDelete('config_countries', $entity['countryiso']);
@@ -485,7 +464,8 @@ public function testCountryIso(): void
 
     public function testCountryStateName(): void
     {
-        $entity = Shopware()->Db()->fetchRow('SELECT * FROM s_core_countries_states LIMIT 1');
+        $entity = $this->connection->fetchAssociative('SELECT * FROM s_core_countries_states LIMIT 1');
+        static::assertIsArray($entity);
         $this->numberCreate('config_country_states', (int) $entity['id'], $entity['name']);
         $this->numberUpdate('config_country_states', (int) $entity['id'], $entity['name']);
         $this->numberDelete('config_country_states', $entity['name']);
@@ -493,7 +473,8 @@ public function testCountryStateName(): void
 
     public function testCountryStateCode(): void
     {
-        $entity = Shopware()->Db()->fetchRow('SELECT * FROM s_core_countries_states LIMIT 1');
+        $entity = $this->connection->fetchAssociative('SELECT * FROM s_core_countries_states LIMIT 1');
+        static::assertIsArray($entity);
         $this->numberCreate('config_country_states', (int) $entity['id'], $entity['shortcode']);
         $this->numberUpdate('config_country_states', (int) $entity['id'], $entity['shortcode']);
         $this->numberDelete('config_country_states', $entity['shortcode']);
@@ -501,7 +482,8 @@ public function testCountryStateCode(): void
 
     public function testDispatchName(): void
     {
-        $entity = Shopware()->Db()->fetchRow('SELECT * FROM s_premium_dispatch LIMIT 1');
+        $entity = $this->connection->fetchAssociative('SELECT * FROM s_premium_dispatch LIMIT 1');
+        static::assertIsArray($entity);
         $this->numberCreate('config_dispatch', (int) $entity['id'], $entity['name']);
         $this->numberUpdate('config_dispatch', (int) $entity['id'], $entity['name']);
         $this->numberDelete('config_dispatch', $entity['name']);
@@ -509,7 +491,8 @@ public function testDispatchName(): void
 
     public function testPaymentName(): void
     {
-        $entity = Shopware()->Db()->fetchRow('SELECT * FROM s_core_paymentmeans LIMIT 1');
+        $entity = $this->connection->fetchAssociative('SELECT * FROM s_core_paymentmeans LIMIT 1');
+        static::assertIsArray($entity);
         $this->numberCreate('config_payment', (int) $entity['id'], $entity['name']);
         $this->numberUpdate('config_payment', (int) $entity['id'], $entity['name']);
         $this->numberDelete('config_payment', $entity['name']);
@@ -517,7 +500,8 @@ public function testPaymentName(): void
 
     public function testPaymentDescription(): void
     {
-        $entity = Shopware()->Db()->fetchRow('SELECT * FROM s_core_paymentmeans LIMIT 1');
+        $entity = $this->connection->fetchAssociative('SELECT * FROM s_core_paymentmeans LIMIT 1');
+        static::assertIsArray($entity);
         $this->numberCreate('config_payment', (int) $entity['id'], $entity['description']);
         $this->numberUpdate('config_payment', (int) $entity['id'], $entity['description']);
         $this->numberDelete('config_payment', $entity['description']);
@@ -525,8 +509,8 @@ public function testPaymentDescription(): void
 
     public function testFilterSetNumber(): void
     {
-        $entity = Shopware()->Db()->fetchRow('SELECT * FROM s_filter LIMIT 1');
-
+        $entity = $this->connection->fetchAssociative('SELECT * FROM s_filter LIMIT 1');
+        static::assertIsArray($entity);
         $this->numberCreate('propertygroup', (int) $entity['id'], $entity['name']);
         $this->numberUpdate('propertygroup', (int) $entity['id'], $entity['name']);
         $this->numberDelete('propertygroup', $entity['name']);
@@ -535,7 +519,6 @@ public function testFilterSetNumber(): void
     public function testFilterGroupNumber(): void
     {
         $entity = $this->getFilterGroupName();
-
         $this->numberCreate('propertyoption', (int) $entity['id'], $entity['name']);
         $this->numberUpdate('propertyoption', (int) $entity['id'], $entity['name']);
         $this->numberDelete('propertyoption', $entity['name']);
@@ -544,7 +527,6 @@ public function testFilterGroupNumber(): void
     public function testFilterOptionNumber(): void
     {
         $entity = $this->getFilterOptionName();
-
         $this->numberCreate('propertyvalue', (int) $entity['id'], $entity['name']);
         $this->numberUpdate('propertyvalue', (int) $entity['id'], $entity['name']);
         $this->numberDelete('propertyvalue', $entity['name']);
@@ -552,10 +534,8 @@ public function testFilterOptionNumber(): void
 
     public function testConfiguratorGroupNumber(): void
     {
-        $entity = Shopware()->Db()->fetchRow('
-            SELECT * FROM s_article_configurator_groups
-        ');
-
+        $entity = $this->connection->fetchAssociative('SELECT * FROM s_article_configurator_groups');
+        static::assertIsArray($entity);
         $this->numberCreate('configuratorgroup', (int) $entity['id'], $entity['name']);
         $this->numberUpdate('configuratorgroup', (int) $entity['id'], $entity['name']);
         $this->numberDelete('configuratorgroup', $entity['name']);
@@ -564,7 +544,6 @@ public function testConfiguratorGroupNumber(): void
     public function testConfiguratorOptionNumber(): void
     {
         $entity = $this->getConfiguratorOptionName();
-
         $this->numberCreate('configuratoroption', (int) $entity['id'], $entity['name']);
         $this->numberUpdate('configuratoroption', (int) $entity['id'], $entity['name']);
         $this->numberDelete('configuratoroption', $entity['name']);
@@ -573,7 +552,7 @@ public function testConfiguratorOptionNumber(): void
     public function testCreateMissingKey(): void
     {
         $this->expectException(ParameterMissingException::class);
-        $data = $this->getDummyData('article');
+        $data = $this->getDummyData(self::PRODUCT_TYPE);
         unset($data['key']);
         $this->resource->create($data);
     }
@@ -581,7 +560,7 @@ public function testCreateMissingKey(): void
     public function testCreateByNumberMissingKey(): void
     {
         $this->expectException(ParameterMissingException::class);
-        $data = $this->getDummyData('article');
+        $data = $this->getDummyData(self::PRODUCT_TYPE);
         unset($data['key']);
         $this->resource->createByNumber($data);
     }
@@ -589,65 +568,66 @@ public function testCreateByNumberMissingKey(): void
     public function testUpdateMissingId(): void
     {
         $this->expectException(ParameterMissingException::class);
-        $data = $this->getDummyData('article');
+        $data = $this->getDummyData(self::PRODUCT_TYPE);
         $this->resource->update(0, $data);
     }
 
     public function testUpdateByNumberMissingId(): void
     {
         $this->expectException(ParameterMissingException::class);
-        $data = $this->getDummyData('article');
+        $data = $this->getDummyData(self::PRODUCT_TYPE);
         $this->resource->updateByNumber('', $data);
     }
 
     public function testDeleteMissingId(): void
     {
         $this->expectException(ParameterMissingException::class);
-        $data = $this->getDummyData('article');
+        $data = $this->getDummyData(self::PRODUCT_TYPE);
         $this->resource->delete(0, $data);
     }
 
     public function testDeleteByNumberMissingId(): void
     {
         $this->expectException(ParameterMissingException::class);
-        $data = $this->getDummyData('article');
+        $data = $this->getDummyData(self::PRODUCT_TYPE);
         $this->resource->deleteByNumber('', $data);
     }
 
     public function testDeleteInvalidTranslation(): void
     {
         $this->expectException(NotFoundException::class);
-        $data = $this->getDummyData('article');
+        $data = $this->getDummyData(self::PRODUCT_TYPE);
         $this->resource->delete(-200, $data);
     }
 
     public function testDeleteByNumberInvalidTranslation(): void
     {
         $this->expectException(NotFoundException::class);
-        $data = $this->getDummyData('article');
+        $data = $this->getDummyData(self::PRODUCT_TYPE);
 
-        $article = Shopware()->Db()->fetchRow('SELECT ordernumber, articleID FROM s_articles_details LIMIT 1');
-        $data['key'] = $article['articleID'];
+        $product = $this->connection->fetchAssociative('SELECT ordernumber, articleID FROM s_articles_details LIMIT 1');
+        static::assertIsArray($product);
+        $data['key'] = $product['articleID'];
 
         $this->resource->create($data);
 
         $this->resource->delete($data['key'], $data);
 
-        $this->resource->deleteByNumber($article['ordernumber'], $data);
+        $this->resource->deleteByNumber($product['ordernumber'], $data);
     }
 
     public function testInvalidTypeByNumber(): void
     {
         $this->expectException(CustomValidationException::class);
-        $data = $this->getDummyData('article');
+        $data = $this->getDummyData(self::PRODUCT_TYPE);
         $data['type'] = 'Invalid';
         $this->resource->createByNumber($data);
     }
 
-    public function testInvalidArticleNumber(): void
+    public function testInvalidProductNumber(): void
     {
         $this->expectException(NotFoundException::class);
-        $data = $this->getDummyData('article');
+        $data = $this->getDummyData(self::PRODUCT_TYPE);
         $data['key'] = 'Invalid-Order-Number';
         $this->resource->createByNumber($data);
     }
@@ -837,15 +817,15 @@ public function testInvalidConfiguratorOptionWithOptionName(): void
     public function testMissingTypeException(): void
     {
         $this->expectException(ParameterMissingException::class);
-        $data = $this->getDummyData('article');
+        $data = $this->getDummyData(self::PRODUCT_TYPE);
         unset($data['type']);
         $this->resource->create($data);
     }
 
-    public function testMissingshopIdException(): void
+    public function testMissingShopIdException(): void
     {
         $this->expectException(ParameterMissingException::class);
-        $data = $this->getDummyData('article');
+        $data = $this->getDummyData(self::PRODUCT_TYPE);
         unset($data['shopId']);
         $this->resource->create($data);
     }
@@ -853,7 +833,7 @@ public function testMissingshopIdException(): void
     public function testMissingDataException(): void
     {
         $this->expectException(ParameterMissingException::class);
-        $data = $this->getDummyData('article');
+        $data = $this->getDummyData(self::PRODUCT_TYPE);
         unset($data['data']);
         $this->resource->create($data);
     }
@@ -861,33 +841,92 @@ public function testMissingDataException(): void
     public function testMissingDataIsArrayException(): void
     {
         $this->expectException(CustomValidationException::class);
-        $data = $this->getDummyData('article');
+        $data = $this->getDummyData(self::PRODUCT_TYPE);
         $data['data'] = 1;
         $this->resource->create($data);
     }
 
     /**
+     * Override test method of parent class because the translation resource has no "getOne" method
+     *
      * @group disable
      */
     public function testGetOneWithMissingPrivilegeShouldThrowPrivilegeException(): void
     {
-        static::assertTrue(true);
+        $this->expectNotToPerformAssertions();
     }
 
     /**
+     * Override test method of parent class because the translation resource has no "getOne" method
+     *
      * @group disable
      */
     public function testGetOneWithInvalidIdShouldThrowNotFoundException(): void
     {
-        static::assertTrue(true);
+        $this->expectNotToPerformAssertions();
     }
 
     /**
+     * Override test method of parent class because the translation resource has no "getOne" method
+     *
      * @group disable
      */
     public function testGetOneWithMissingIdShouldThrowParameterMissingException(): void
     {
-        static::assertTrue(true);
+        $this->expectNotToPerformAssertions();
+    }
+
+    private function createProduct(): int
+    {
+        $data = $this->getDummyData(self::PRODUCT_TYPE);
+
+        $translation = $this->resource->create($data);
+
+        static::assertInstanceOf(Translation::class, $translation);
+        static::assertSame(
+            $data['key'],
+            $translation->getKey(),
+            'Translation key do not match'
+        );
+        static::assertSame(
+            $data['type'],
+            $translation->getType(),
+            'Translation type do not match'
+        );
+        static::assertSame(
+            $data['data'],
+            $this->resource->getTranslationComponent()->unFilterData(
+                self::PRODUCT_TYPE,
+                $translation->getData()
+            ),
+            'Translation data do not match'
+        );
+
+        return $translation->getKey();
+    }
+
+    private function createProductByNumber(): int
+    {
+        $data = $this->getDummyData(self::PRODUCT_TYPE);
+        $product = $this->connection->fetchAssociative('SELECT ordernumber, articleID FROM s_articles_details LIMIT 1');
+        static::assertIsArray($product);
+        $data['key'] = $product['ordernumber'];
+
+        $translation = $this->resource->createByNumber($data);
+
+        static::assertInstanceOf(Translation::class, $translation);
+        static::assertSame((int) $product['articleID'], $translation->getKey(), 'Translation key do not match');
+        static::assertSame($data['type'], $translation->getType(), 'Translation type do not match');
+        static::assertSame(
+            $data['data'],
+            $this->resource->getTranslationComponent()->unFilterData(
+                self::PRODUCT_TYPE,
+                $translation->getData()
+            ),
+            'Translation data do not match'
+        );
+
+        return (int) $product['articleID'];
     }
 
     private function numberCreate(string $type, int $id, string $number): void
@@ -899,7 +938,7 @@ private function numberCreate(string $type, int $id, string $number): void
 
         static::assertInstanceOf(Translation::class, $translation);
 
-        static::assertEquals($id, $translation->getKey());
+        static::assertSame($id, $translation->getKey());
 
         $translated = $this->resource->getTranslationComponent()->unFilterData(
             $type,
@@ -907,7 +946,7 @@ private function numberCreate(string $type, int $id, string $number): void
         );
 
         foreach ($data['data'] as $key => $value) {
-            static::assertEquals($value, $translated[$key]);
+            static::assertSame($value, $translated[$key]);
         }
     }
 
@@ -917,12 +956,13 @@ private function numberUpdate(string $type, int $id, string $number): void
         foreach ($data['data'] as &$item) {
             $item .= '-UPDATED';
         }
+        unset($item);
 
         $translation = $this->resource->updateByNumber($number, $data);
 
         static::assertInstanceOf(Translation::class, $translation);
 
-        static::assertEquals($id, $translation->getKey());
+        static::assertSame($id, $translation->getKey());
 
         $translated = $this->resource->getTranslationComponent()->unFilterData(
             $type,
@@ -930,7 +970,7 @@ private function numberUpdate(string $type, int $id, string $number): void
         );
 
         foreach ($data['data'] as $key => $value) {
-            static::assertEquals($value, $translated[$key]);
+            static::assertSame($value, $translated[$key]);
         }
     }
 
@@ -942,7 +982,7 @@ private function numberDelete(string $type, string $number): void
     }
 
     /**
-     * @return array{type: string, key: int, data: array, shopId: int}
+     * @return array{type: string, key: int, data: array<string, string>, shopId: int}
      */
     private function getDummyData(string $type, int $shopId = 2): array
     {
@@ -960,7 +1000,7 @@ private function getDummyData(string $type, int $shopId = 2): array
     private function getTypeFields(string $type): array
     {
         switch (strtolower($type)) {
-            case 'article':
+            case self::PRODUCT_TYPE:
                 return [
                     'name' => 'Dummy Translation',
                     'description' => 'Dummy Translation',
@@ -1010,7 +1050,7 @@ private function getTypeFields(string $type): array
      */
     private function getFilterGroupName(): array
     {
-        return Shopware()->Db()->fetchRow(
+        $filterOptions = $this->connection->fetchAssociative(
             "SELECT fo.id, CONCAT(f.name, '|', fo.name) as name
              FROM s_filter_options as fo
                 INNER JOIN s_filter_relations as fr
@@ -1019,6 +1059,9 @@ private function getFilterGroupName(): array
                     ON f.id = fr.groupID
              LIMIT 1"
         );
+        static::assertIsArray($filterOptions);
+
+        return $filterOptions;
     }
 
     /**
@@ -1026,7 +1069,7 @@ private function getFilterGroupName(): array
      */
     private function getFilterOptionName(): array
     {
-        return Shopware()->Db()->fetchRow(
+        $filterValues = $this->connection->fetchAssociative(
             "SELECT fv.id, CONCAT(f.name, '|', fo.name, '|', fv.value) as name
              FROM s_filter_values as fv
                  INNER JOIN s_filter_options as fo
@@ -1037,6 +1080,9 @@ private function getFilterOptionName(): array
                      ON f.id = fr.groupID
              LIMIT 1"
         );
+        static::assertIsArray($filterValues);
+
+        return $filterValues;
     }
 
     /**
@@ -1044,12 +1090,15 @@ private function getFilterOptionName(): array
      */
     private function getConfiguratorOptionName(): array
     {
-        return Shopware()->Db()->fetchRow(
+        $configuratorGroups = $this->connection->fetchAssociative(
             "SELECT co.id, CONCAT(cg.name, '|', co.name) as name
              FROM s_article_configurator_groups as cg
                  INNER JOIN s_article_configurator_options as co
                      ON co.group_id = cg.id
              LIMIT 1"
         );
+        static::assertIsArray($configuratorGroups);
+
+        return $configuratorGroups;
     }
 }
diff --git a/tests/Functional/Components/Api/UserTest.php b/tests/Functional/Components/Api/UserTest.php
index d4379429768..9afc0aeafe0 100644
--- a/tests/Functional/Components/Api/UserTest.php
+++ b/tests/Functional/Components/Api/UserTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Api;
diff --git a/tests/Functional/Components/Api/VariantTest.php b/tests/Functional/Components/Api/VariantTest.php
index d3038d3a8be..28aecdfad2f 100644
--- a/tests/Functional/Components/Api/VariantTest.php
+++ b/tests/Functional/Components/Api/VariantTest.php
@@ -1,37 +1,48 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Api;
 
+use Shopware\Bundle\MediaBundle\MediaServiceInterface;
+use Shopware\Components\Api\Exception\CustomValidationException;
 use Shopware\Components\Api\Exception\NotFoundException;
 use Shopware\Components\Api\Exception\ParameterMissingException;
-use Shopware\Components\Api\Resource\Article;
+use Shopware\Components\Api\Resource\Article as ProductResource;
 use Shopware\Components\Api\Resource\Resource;
 use Shopware\Components\Api\Resource\Variant;
+use Shopware\Models\Article\Article as ProductModel;
 use Shopware\Models\Article\Configurator\Group;
+use Shopware\Models\Article\Configurator\Option;
+use Shopware\Models\Article\Configurator\Set;
 use Shopware\Models\Article\Detail;
 use Shopware\Models\Article\Esd;
+use Shopware\Models\Article\Unit;
+use Shopware\Models\Attribute\Article as ProductAttribute;
+use Shopware\Models\Media\Media;
+use Shopware\Models\Tax\Tax;
+use Shopware\Tests\Functional\Helper\Utils;
 
 class VariantTest extends TestCase
 {
@@ -40,10 +51,7 @@ class VariantTest extends TestCase
      */
     protected $resource;
 
-    /**
-     * @var Article
-     */
-    private $resourceArticle;
+    private ProductResource $productResource;
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -55,9 +63,9 @@ protected function setUp(): void
 
         Shopware()->Models()->clear();
 
-        $this->resourceArticle = new Article();
-        $this->resourceArticle->setAcl(Shopware()->Acl());
-        $this->resourceArticle->setManager(Shopware()->Models());
+        $this->productResource = new ProductResource();
+        $this->productResource->setAcl(Shopware()->Acl());
+        $this->productResource->setManager(Shopware()->Models());
     }
 
     /**
@@ -68,8 +76,8 @@ public function createResource()
         return new Variant();
     }
 
-    // Creates a article with variants
-    public function testCreateShouldBeSuccessful()
+    // Creates a product with variants
+    public function testCreateShouldBeSuccessful(): ProductModel
     {
         // required field name is missing
         $testData = [
@@ -79,7 +87,7 @@ public function testCreateShouldBeSuccessful()
             'active' => true,
             'pseudoSales' => 999,
             'highlight' => true,
-            'keywords' => 'test, testarticle',
+            'keywords' => 'test, testproduct',
 
             'mainDetail' => [
                 'number' => 'swTEST' . uniqid((string) rand()),
@@ -121,7 +129,7 @@ public function testCreateShouldBeSuccessful()
                         ],
                     ],
                     [
-                        'name' => 'Gräße',
+                        'name' => 'Größe',
                         'options' => [
                             ['name' => 'L'],
                             ['name' => 'XL'],
@@ -215,34 +223,40 @@ public function testCreateShouldBeSuccessful()
             'supplierId' => 2,
         ];
 
-        $article = $this->resourceArticle->create($testData);
+        $product = $this->productResource->create($testData);
 
-        static::assertInstanceOf('\Shopware\Models\Article\Article', $article);
-        static::assertGreaterThan(0, $article->getId());
+        static::assertInstanceOf(ProductModel::class, $product);
+        static::assertGreaterThan(0, $product->getId());
 
-        static::assertEquals($article->getName(), $testData['name']);
-        static::assertEquals($article->getDescription(), $testData['description']);
+        static::assertEquals($product->getName(), $testData['name']);
+        static::assertEquals($product->getDescription(), $testData['description']);
 
-        static::assertEquals($article->getDescriptionLong(), $testData['descriptionLong']);
-        static::assertEquals($article->getMainDetail()->getAttribute()->getAttr1(), $testData['mainDetail']['attribute']['attr1']);
-        static::assertEquals($article->getMainDetail()->getAttribute()->getAttr2(), $testData['mainDetail']['attribute']['attr2']);
+        static::assertEquals($product->getDescriptionLong(), $testData['descriptionLong']);
+        $mainVariant = $product->getMainDetail();
+        static::assertInstanceOf(Detail::class, $mainVariant);
+        $attribute = $mainVariant->getAttribute();
+        static::assertInstanceOf(ProductAttribute::class, $attribute);
+        static::assertEquals($attribute->getAttr1(), $testData['mainDetail']['attribute']['attr1']);
+        static::assertEquals($attribute->getAttr2(), $testData['mainDetail']['attribute']['attr2']);
 
-        static::assertEquals($testData['taxId'], $article->getTax()->getId());
+        static::assertInstanceOf(Tax::class, $product->getTax());
+        static::assertEquals($testData['taxId'], $product->getTax()->getId());
 
-        static::assertCount(2, $article->getMainDetail()->getPrices());
+        static::assertCount(2, $mainVariant->getPrices());
 
-        return $article;
+        return $product;
     }
 
     /**
      * @depends testCreateShouldBeSuccessful
      */
-    public function testCreateWithExistingOrderNumberShouldThrowCustomValidationException(\Shopware\Models\Article\Article $article)
+    public function testCreateWithExistingOrderNumberShouldThrowCustomValidationException(ProductModel $product): void
     {
-        $this->expectException('Shopware\Components\Api\Exception\CustomValidationException');
+        $this->expectException(CustomValidationException::class);
+        static::assertInstanceOf(Detail::class, $product->getMainDetail());
         $testData = [
-            'articleId' => $article->getId(),
-            'number' => $article->getMainDetail()->getNumber(),
+            'articleId' => $product->getId(),
+            'number' => $product->getMainDetail()->getNumber(),
             'prices' => [
                 [
                     'customerGroupKey' => 'EK',
@@ -256,29 +270,28 @@ public function testCreateWithExistingOrderNumberShouldThrowCustomValidationExce
 
     /**
      * @depends testCreateShouldBeSuccessful
-     *
-     * @return \Shopware\Models\Article\Article
      */
-    public function testGetOneShouldBeSuccessful(\Shopware\Models\Article\Article $article)
+    public function testGetOneShouldBeSuccessful(ProductModel $product): ProductModel
     {
-        $this->resource->setResultMode(Variant::HYDRATE_OBJECT);
+        $this->resource->setResultMode(Resource::HYDRATE_OBJECT);
 
-        /** @var \Shopware\Models\Article\Detail $articleDetail */
-        foreach ($article->getDetails() as $articleDetail) {
-            $articleDetailById = $this->resource->getOne($articleDetail->getId());
-            $articleDetailByNumber = $this->resource->getOneByNumber($articleDetail->getNumber());
+        foreach ($product->getDetails() as $variant) {
+            $variantById = $this->resource->getOne($variant->getId());
+            static::assertInstanceOf(Detail::class, $variantById);
+            $variantByNumber = $this->resource->getOneByNumber($variant->getNumber());
+            static::assertInstanceOf(Detail::class, $variantByNumber);
 
-            static::assertEquals($articleDetail->getId(), $articleDetailById->getId());
-            static::assertEquals($articleDetail->getId(), $articleDetailByNumber->getId());
+            static::assertEquals($variant->getId(), $variantById->getId());
+            static::assertEquals($variant->getId(), $variantByNumber->getId());
         }
 
-        return $article;
+        return $product;
     }
 
     /**
      * @depends testCreateShouldBeSuccessful
      */
-    public function testGetListShouldBeSuccessful()
+    public function testGetListShouldBeSuccessful(): void
     {
         $result = $this->resource->getList();
 
@@ -291,30 +304,27 @@ public function testGetListShouldBeSuccessful()
 
     /**
      * @depends testGetOneShouldBeSuccessful
-     *
-     * @param \Shopware\Models\Article\Article $article
      */
-    public function testDeleteShouldBeSuccessful($article): void
+    public function testDeleteShouldBeSuccessful(ProductModel $product): void
     {
-        $this->resource->setResultMode(Variant::HYDRATE_OBJECT);
+        $this->resource->setResultMode(Resource::HYDRATE_OBJECT);
 
         $deleteByNumber = true;
 
-        /** @var \Shopware\Models\Article\Detail $articleDetail */
-        foreach ($article->getDetails() as $articleDetail) {
+        foreach ($product->getDetails() as $variant) {
             $deleteByNumber = !$deleteByNumber;
 
             if ($deleteByNumber) {
-                $result = $this->resource->delete($articleDetail->getId());
+                $result = $this->resource->delete($variant->getId());
             } else {
-                $result = $this->resource->deleteByNumber($articleDetail->getNumber());
+                $result = $this->resource->deleteByNumber($variant->getNumber());
             }
             static::assertInstanceOf(Detail::class, $result);
             static::assertSame(0, (int) $result->getId());
         }
 
-        // Delete the whole article at last
-        $this->resourceArticle->delete($article->getId());
+        // Delete the whole product at last
+        $this->productResource->delete($product->getId());
     }
 
     public function testDeleteWithInvalidIdShouldThrowNotFoundException(): void
@@ -326,89 +336,89 @@ public function testDeleteWithInvalidIdShouldThrowNotFoundException(): void
     public function testDeleteWithMissingIdShouldThrowParameterMissingException(): void
     {
         $this->expectException(ParameterMissingException::class);
-        $this->resource->delete('');
+        $this->resource->delete(0);
     }
 
-    public function testVariantCreate()
+    public function testVariantCreate(): int
     {
-        $data = $this->getSimpleArticleData();
+        $data = $this->getSimpleProductData();
         $data['mainDetail'] = $this->getSimpleVariantData();
         $configuratorSet = $this->getSimpleConfiguratorSet();
         $data['configuratorSet'] = $configuratorSet;
 
-        $article = $this->resourceArticle->create($data);
-        static::assertCount(0, $article->getDetails());
+        $product = $this->productResource->create($data);
+        static::assertCount(0, $product->getDetails());
 
         $create = $this->getSimpleVariantData();
-        $create['articleId'] = $article->getId();
+        $create['articleId'] = $product->getId();
         $create['configuratorOptions'] = $this->getVariantOptionsOfSet($configuratorSet);
 
         $variant = $this->resource->create($create);
         static::assertCount(\count($create['configuratorOptions']), $variant->getConfiguratorOptions());
 
         $create = $this->getSimpleVariantData();
-        $create['articleId'] = $article->getId();
+        $create['articleId'] = $product->getId();
         $create['configuratorOptions'] = $this->getVariantOptionsOfSet($configuratorSet);
         $variant = $this->resource->create($create);
         static::assertCount(\count($create['configuratorOptions']), $variant->getConfiguratorOptions());
 
-        $this->resourceArticle->setResultMode(Variant::HYDRATE_ARRAY);
-        $id = $article->getId();
-        $article = $this->resourceArticle->getOne($id);
-        static::assertCount(2, $article['details']);
+        $this->productResource->setResultMode(Resource::HYDRATE_ARRAY);
+        $id = $product->getId();
+        $product = $this->productResource->getOne($id);
+        static::assertIsArray($product);
+        static::assertCount(2, $product['details']);
 
         return $id;
     }
 
     /**
      * @depends testVariantCreate
-     *
-     * @param int $articleId
      */
-    public function testVariantUpdate($articleId)
+    public function testVariantUpdate(int $productId): void
     {
-        $this->resourceArticle->setResultMode(Variant::HYDRATE_ARRAY);
-        $article = $this->resourceArticle->getOne($articleId);
+        $this->productResource->setResultMode(Resource::HYDRATE_ARRAY);
+        $product = $this->productResource->getOne($productId);
+        static::assertIsArray($product);
 
-        foreach ($article['details'] as $variantData) {
+        foreach ($product['details'] as $variantData) {
             $updateData = [
-                'articleId' => $articleId,
+                'articleId' => $productId,
                 'inStock' => 2000,
                 'number' => $variantData['number'] . '-Updated',
-                'unitId' => $this->getRandomId('s_core_units'),
-                // Make sure conf. options and groups work in a case insensitive way, just like in the DB
+                'unitId' => $this->getRandomId(),
+                // Make sure conf. options and groups work in a case-insensitive way, just like in the DB
                 'configuratorOptions' => [[
                     'group' => 'farbe',
                     'option' => 'Grün',
                 ], [
-                    'group' => 'Gräße',
+                    'group' => 'Größe',
                     'option' => 'xl',
                 ]],
             ];
             $variant = $this->resource->update($variantData['id'], $updateData);
 
+            static::assertInstanceOf(Unit::class, $variant->getUnit());
             static::assertEquals($variant->getUnit()->getId(), $updateData['unitId']);
             static::assertEquals($variant->getInStock(), $updateData['inStock']);
             static::assertEquals($variant->getNumber(), $updateData['number']);
         }
     }
 
-    public function testVariantImageAssignByMediaId()
+    public function testVariantImageAssignByMediaId(): int
     {
-        $data = $this->getSimpleArticleData();
+        $data = $this->getSimpleProductData();
         $data['mainDetail'] = $this->getSimpleVariantData();
         $configuratorSet = $this->getSimpleConfiguratorSet();
         $data['configuratorSet'] = $configuratorSet;
         $data['images'] = $this->getSimpleMedia(2);
 
-        $article = $this->resourceArticle->create($data);
+        $product = $this->productResource->create($data);
 
         $create = $this->getSimpleVariantData();
-        $create['articleId'] = $article->getId();
+        $create['articleId'] = $product->getId();
         $create['configuratorOptions'] = $this->getVariantOptionsOfSet($configuratorSet);
         $create['images'] = $this->getSimpleMedia(1);
 
-        /** @var \Shopware\Models\Article\Detail $variant */
         $variant = $this->resource->create($create);
 
         static::assertCount(1, $variant->getImages());
@@ -418,15 +428,12 @@ public function testVariantImageAssignByMediaId()
 
     /**
      * @depends testVariantImageAssignByMediaId
-     *
-     * @param int $variantId
-     *
-     * @return int
      */
-    public function testVariantImageReset($variantId)
+    public function testVariantImageReset(int $variantId): int
     {
-        $this->resource->setResultMode(Variant::HYDRATE_OBJECT);
+        $this->resource->setResultMode(Resource::HYDRATE_OBJECT);
         $variant = $this->resource->getOne($variantId);
+        static::assertInstanceOf(Detail::class, $variant);
         static::assertTrue($variant->getImages()->count() > 0);
 
         $update = [
@@ -438,9 +445,7 @@ public function testVariantImageReset($variantId)
 
         static::assertCount(0, $variant->getImages());
 
-        $article = $variant->getArticle();
-        /** @var \Shopware\Models\Article\Image $image */
-        foreach ($article->getImages() as $image) {
+        foreach ($variant->getArticle()->getImages() as $image) {
             static::assertCount(0, $image->getMappings());
         }
 
@@ -449,20 +454,20 @@ public function testVariantImageReset($variantId)
 
     /**
      * @depends testVariantImageReset
-     *
-     * @param int $variantId
      */
-    public function testVariantAddImage($variantId)
+    public function testVariantAddImage(int $variantId): void
     {
-        $this->resource->setResultMode(Variant::HYDRATE_OBJECT);
+        $this->resource->setResultMode(Resource::HYDRATE_OBJECT);
         $variant = $this->resource->getOne($variantId);
-        static::assertTrue($variant->getImages()->count() === 0);
+        static::assertInstanceOf(Detail::class, $variant);
+        static::assertCount(0, $variant->getImages());
 
         $update = [
             'articleId' => $variant->getArticle()->getId(),
             'images' => $this->getSimpleMedia(3),
         ];
         $variant = $this->resource->update($variantId, $update);
+        static::assertInstanceOf(Detail::class, $variant);
         static::assertCount(3, $variant->getImages());
 
         $add = [
@@ -471,13 +476,12 @@ public function testVariantAddImage($variantId)
             'images' => $this->getSimpleMedia(5, 20),
         ];
         $variant = $this->resource->update($variantId, $add);
+        static::assertInstanceOf(Detail::class, $variant);
         static::assertCount(8, $variant->getImages());
 
-        /** @var \Shopware\Models\Article\Image $image */
         foreach ($variant->getArticle()->getImages() as $image) {
             static::assertCount(1, $image->getMappings(), 'No image mapping created!');
 
-            /** @var \Shopware\Models\Article\Image\Mapping $mapping */
             $mapping = $image->getMappings()->current();
             static::assertCount(
                 $variant->getConfiguratorOptions()->count(),
@@ -487,37 +491,34 @@ public function testVariantAddImage($variantId)
         }
     }
 
-    /**
-     * @return int
-     */
-    public function testVariantImageCreateByLink()
+    public function testVariantImageCreateByLink(): int
     {
-        $data = $this->getSimpleArticleData();
+        $data = $this->getSimpleProductData();
         $data['mainDetail'] = $this->getSimpleVariantData();
         $configuratorSet = $this->getSimpleConfiguratorSet();
         $data['configuratorSet'] = $configuratorSet;
-        $article = $this->resourceArticle->create($data);
-        $mediaService = Shopware()->Container()->get(\Shopware\Bundle\MediaBundle\MediaServiceInterface::class);
+        $product = $this->productResource->create($data);
+        $mediaService = Shopware()->Container()->get(MediaServiceInterface::class);
 
         $create = $this->getSimpleVariantData();
-        $create['articleId'] = $article->getId();
+        $create['articleId'] = $product->getId();
         $create['configuratorOptions'] = $this->getVariantOptionsOfSet($configuratorSet);
         $create['images'] = [
             ['link' => 'data:image/png;base64,' . require (__DIR__ . '/fixtures/base64image.php')],
             ['link' => 'file://' . __DIR__ . '/fixtures/variant-image.png'],
         ];
 
-        $this->resourceArticle->setResultMode(Variant::HYDRATE_OBJECT);
-        $this->resource->setResultMode(Variant::HYDRATE_OBJECT);
+        $this->productResource->setResultMode(Resource::HYDRATE_OBJECT);
+        $this->resource->setResultMode(Resource::HYDRATE_OBJECT);
 
-        /** @var \Shopware\Models\Article\Detail $variant */
         $variant = $this->resource->create($create);
-        $article = $this->resourceArticle->getOne($article->getId());
+        static::assertInstanceOf(Detail::class, $variant);
+        $product = $this->productResource->getOne($product->getId());
+        static::assertInstanceOf(ProductModel::class, $product);
 
-        static::assertCount(2, $article->getImages());
+        static::assertCount(2, $product->getImages());
 
-        /** @var \Shopware\Models\Article\Image $image */
-        foreach ($article->getImages() as $image) {
+        foreach ($product->getImages() as $image) {
             $media = null;
             while ($media === null) {
                 if ($image->getMedia()) {
@@ -529,6 +530,7 @@ public function testVariantImageCreateByLink()
                 }
             }
 
+            static::assertInstanceOf(Media::class, $media);
             static::assertCount(4, $media->getThumbnails());
             foreach ($media->getThumbnails() as $thumbnail) {
                 static::assertTrue($mediaService->has(Shopware()->DocPath() . $thumbnail));
@@ -536,7 +538,6 @@ public function testVariantImageCreateByLink()
 
             static::assertCount(1, $image->getMappings(), 'No image mapping created!');
 
-            /** @var \Shopware\Models\Article\Image\Mapping $mapping */
             $mapping = $image->getMappings()->current();
             static::assertCount(
                 $variant->getConfiguratorOptions()->count(),
@@ -548,40 +549,41 @@ public function testVariantImageCreateByLink()
         return $variant->getId();
     }
 
-    public function testVariantDefaultPriceBehavior()
+    public function testVariantDefaultPriceBehavior(): void
     {
-        $data = $this->getSimpleArticleData();
+        $data = $this->getSimpleProductData();
         $data['mainDetail'] = $this->getSimpleVariantData();
 
         $configuratorSet = $this->getSimpleConfiguratorSet();
         $data['configuratorSet'] = $configuratorSet;
 
-        $article = $this->resourceArticle->create($data);
+        $product = $this->productResource->create($data);
 
         $create = $this->getSimpleVariantData();
-        $create['articleId'] = $article->getId();
+        $create['articleId'] = $product->getId();
         $create['configuratorOptions'] = $this->getVariantOptionsOfSet($configuratorSet);
 
         $variant = $this->resource->create($create);
 
         $this->resource->setResultMode(2);
         $data = $this->resource->getOne($variant->getId());
+        static::assertIsArray($data);
 
-        static::assertEquals(400 / 1.19, $data['prices'][0]['price']);
+        static::assertEqualsWithDelta(400 / 1.19, $data['prices'][0]['price'], Utils::FORMER_PHPUNIT_FLOAT_EPSILON);
     }
 
-    public function testVariantGrossPrices()
+    public function testVariantGrossPrices(): void
     {
-        $data = $this->getSimpleArticleData();
+        $data = $this->getSimpleProductData();
         $data['mainDetail'] = $this->getSimpleVariantData();
 
         $configuratorSet = $this->getSimpleConfiguratorSet();
         $data['configuratorSet'] = $configuratorSet;
 
-        $article = $this->resourceArticle->create($data);
+        $product = $this->productResource->create($data);
 
         $create = $this->getSimpleVariantData();
-        $create['articleId'] = $article->getId();
+        $create['articleId'] = $product->getId();
         $create['configuratorOptions'] = $this->getVariantOptionsOfSet($configuratorSet);
 
         $variant = $this->resource->create($create);
@@ -590,25 +592,26 @@ public function testVariantGrossPrices()
         $data = $this->resource->getOne($variant->getId(), [
             'considerTaxInput' => true,
         ]);
+        static::assertIsArray($data);
 
-        static::assertEquals(400, $data['prices'][0]['price']);
+        static::assertEqualsWithDelta(400, $data['prices'][0]['price'], Utils::FORMER_PHPUNIT_FLOAT_EPSILON);
     }
 
-    public function testBatchModeShouldBeSuccessful()
+    public function testBatchModeShouldBeSuccessful(): void
     {
-        $data = $this->getSimpleArticleData();
+        $data = $this->getSimpleProductData();
         $data['mainDetail'] = $this->getSimpleVariantData();
         $configuratorSet = $this->getSimpleConfiguratorSet();
         $data['configuratorSet'] = $configuratorSet;
 
-        $article = $this->resourceArticle->create($data);
-        static::assertCount(0, $article->getDetails());
+        $product = $this->productResource->create($data);
+        static::assertCount(0, $product->getDetails());
 
         // Create 5 new variants
         $batchData = [];
         for ($i = 0; $i < 5; ++$i) {
             $create = $this->getSimpleVariantData();
-            $create['articleId'] = $article->getId();
+            $create['articleId'] = $product->getId();
             $create['configuratorOptions'] = $this->getVariantOptionsOfSet($configuratorSet);
             $batchData[] = $create;
         }
@@ -629,29 +632,30 @@ public function testBatchModeShouldBeSuccessful()
         $this->resource->batch($batchData);
 
         // Check results
-        $this->resourceArticle->setResultMode(Variant::HYDRATE_ARRAY);
-        $id = $article->getId();
-        $article = $this->resourceArticle->getOne($id);
+        $this->productResource->setResultMode(Resource::HYDRATE_ARRAY);
+        $id = $product->getId();
+        $product = $this->productResource->getOne($id);
+        static::assertIsArray($product);
 
-        static::assertCount(5, $article['details']);
-        static::assertEquals(398, round($article['mainDetail']['prices'][0]['price']));
+        static::assertCount(5, $product['details']);
+        static::assertEquals(398, round($product['mainDetail']['prices'][0]['price']));
     }
 
-    public function testNewConfiguratorOptionForVariant()
+    public function testNewConfiguratorOptionForVariant(): void
     {
-        $data = $this->getSimpleArticleData();
+        $data = $this->getSimpleProductData();
         $data['mainDetail'] = $this->getSimpleVariantData();
         $configuratorSet = $this->getSimpleConfiguratorSet(1, 2);
         $data['configuratorSet'] = $configuratorSet;
 
-        $article = $this->resourceArticle->create($data);
+        $product = $this->productResource->create($data);
 
         // Create 5 new variants
         $batchData = [];
         $names = [];
         for ($i = 0; $i < 5; ++$i) {
             $create = $this->getSimpleVariantData();
-            $create['articleId'] = $article->getId();
+            $create['articleId'] = $product->getId();
 
             $options = $this->getVariantOptionsOfSet($configuratorSet);
 
@@ -672,6 +676,7 @@ public function testNewConfiguratorOptionForVariant()
             static::assertTrue($operation['success']);
 
             $variant = $this->resource->getOne($operation['data']['id']);
+            static::assertIsArray($variant);
 
             static::assertCount(1, $variant['configuratorOptions']);
 
@@ -681,7 +686,7 @@ public function testNewConfiguratorOptionForVariant()
         }
     }
 
-    public function testCreateConfiguratorOptionsWithPosition()
+    public function testCreateConfiguratorOptionsWithPosition(): void
     {
         // required field name is missing
         $testData = [
@@ -720,14 +725,14 @@ public function testCreateConfiguratorOptionsWithPosition()
             ],
         ];
 
-        $article = $this->resourceArticle->create($testData);
-        static::assertInstanceOf('\Shopware\Models\Article\Article', $article);
-        static::assertGreaterThan(0, $article->getId());
+        $product = $this->productResource->create($testData);
+        static::assertInstanceOf(ProductModel::class, $product);
+        static::assertGreaterThan(0, $product->getId());
 
-        $groups = $article->getConfiguratorSet()->getGroups();
+        static::assertInstanceOf(Set::class, $product->getConfiguratorSet());
+        $groups = $product->getConfiguratorSet()->getGroups();
         static::assertCount(2, $groups);
 
-        /** @var Group[] $groups */
         foreach ($groups as $group) {
             static::assertCount(2, $group->getOptions());
             foreach ($group->getOptions() as $option) {
@@ -749,7 +754,7 @@ public function testCreateConfiguratorOptionsWithPosition()
         }
     }
 
-    public function testCreateEsdVariant()
+    public function testCreateEsdVariant(): void
     {
         $params = [
             'name' => 'My awesome liquor',
@@ -778,20 +783,22 @@ public function testCreateEsdVariant()
         $esdDir = Shopware()->DocPath('files_' . Shopware()->Config()->get('sESDKEY'));
 
         if (!is_writable($esdDir)) {
-            static::expectExceptionMessageMatches('/Unable to save ESD-file, as the directory ".*" is not writable/');
+            $this->expectExceptionMessageMatches('/Unable to save ESD-file, as the directory ".*" is not writable/');
         }
 
-        $article = $this->resourceArticle->create($params);
+        $product = $this->productResource->create($params);
 
         if (!is_writable($esdDir)) {
             static::markTestIncomplete('Skipping thorough ESD-file-check, as the process is unable to read/write to the file-directory.');
         }
 
-        static::assertInstanceOf(Esd::class, $article->getMainDetail()->getEsd());
-        static::assertEquals('shopware_logo.png', $article->getMainDetail()->getEsd()->getFile());
+        $mainVariant = $product->getMainDetail();
+        static::assertInstanceOf(Detail::class, $mainVariant);
+        static::assertInstanceOf(Esd::class, $mainVariant->getEsd());
+        static::assertEquals('shopware_logo.png', $mainVariant->getEsd()->getFile());
     }
 
-    public function testCreateEsdWithSerialsVariant()
+    public function testCreateEsdWithSerialsVariant(): void
     {
         $params = [
             'name' => 'My awesome liquor',
@@ -838,25 +845,27 @@ public function testCreateEsdWithSerialsVariant()
         $esdDir = Shopware()->DocPath('files_' . Shopware()->Config()->get('sESDKEY'));
 
         if (!is_writable($esdDir)) {
-            static::expectExceptionMessageMatches('/Unable to save ESD-file, as the directory ".*" is not writable/');
+            $this->expectExceptionMessageMatches('/Unable to save ESD-file, as the directory ".*" is not writable/');
         }
 
-        $article = $this->resourceArticle->create($params);
+        $product = $this->productResource->create($params);
 
         if (!is_writable($esdDir)) {
             static::markTestIncomplete('Skipping thorough ESD-file-check, as the process is unable to read/write to the file-directory.');
         }
 
-        static::assertInstanceOf(Esd::class, $article->getMainDetail()->getEsd());
-        static::assertEquals(5, $article->getMainDetail()->getEsd()->getSerials()->count());
-        static::assertTrue($article->getMainDetail()->getEsd()->getHasSerials());
-        static::assertEquals('shopware_logo.png', $article->getMainDetail()->getEsd()->getFile());
+        $mainVariant = $product->getMainDetail();
+        static::assertInstanceOf(Detail::class, $mainVariant);
+        static::assertInstanceOf(Esd::class, $mainVariant->getEsd());
+        static::assertEquals(5, $mainVariant->getEsd()->getSerials()->count());
+        static::assertTrue($mainVariant->getEsd()->getHasSerials());
+        static::assertEquals('shopware_logo.png', $mainVariant->getEsd()->getFile());
     }
 
     /**
      * @depends testCreateEsdVariant
      */
-    public function testCreateEsdReuseVariant()
+    public function testCreateEsdReuseVariant(): void
     {
         $params = [
             'name' => 'My awesome liquor',
@@ -903,41 +912,51 @@ public function testCreateEsdReuseVariant()
         $esdDir = Shopware()->DocPath('files_' . Shopware()->Config()->get('sESDKEY'));
 
         if (!is_writable($esdDir)) {
-            static::expectExceptionMessageMatches('/Unable to save ESD-file, as the directory ".*" is not writable/');
+            $this->expectExceptionMessageMatches('/Unable to save ESD-file, as the directory ".*" is not writable/');
         }
 
-        $article = $this->resourceArticle->create($params);
+        $product = $this->productResource->create($params);
 
         if (!is_writable($esdDir)) {
             static::markTestIncomplete('Skipping thorough ESD-file-check, as the process is unable to read/write to the file-directory.');
         }
 
-        static::assertInstanceOf(Esd::class, $article->getMainDetail()->getEsd());
-        static::assertEquals(5, $article->getMainDetail()->getEsd()->getSerials()->count());
-        static::assertTrue($article->getMainDetail()->getEsd()->getHasSerials());
-        static::assertNotEquals('shopware_logo.png', $article->getMainDetail()->getEsd()->getFile());
+        $mainVariant = $product->getMainDetail();
+        static::assertInstanceOf(Detail::class, $mainVariant);
+        static::assertInstanceOf(Esd::class, $mainVariant->getEsd());
+        static::assertEquals(5, $mainVariant->getEsd()->getSerials()->count());
+        static::assertTrue($mainVariant->getEsd()->getHasSerials());
+        static::assertNotEquals('shopware_logo.png', $mainVariant->getEsd()->getFile());
     }
 
-    private function getVariantOptionsOfSet($configuratorSet)
+    /**
+     * @param array<string, mixed> $configuratorSet
+     *
+     * @return array<array{optionId: int, groupId: int}>
+     */
+    private function getVariantOptionsOfSet(array $configuratorSet): array
     {
         $options = [];
         foreach ($configuratorSet['groups'] as $group) {
             $id = rand(0, \count($group['options']) - 1);
             $option = $group['options'][$id];
             $options[] = [
-                'optionId' => $option['id'],
-                'groupId' => $group['id'],
+                'optionId' => (int) $option['id'],
+                'groupId' => (int) $group['id'],
             ];
         }
 
         return $options;
     }
 
-    private function getSimpleMedia($limit = 5, $offset = 0)
+    /**
+     * @return array<string, mixed>
+     */
+    private function getSimpleMedia(int $limit = 5, int $offset = 0): array
     {
         $builder = Shopware()->Models()->createQueryBuilder();
         $builder->select('media.id  as mediaId')
-            ->from('Shopware\Models\Media\Media', 'media')
+            ->from(Media::class, 'media')
             ->where('media.albumId = -1')
             ->setFirstResult($offset)
             ->setMaxResults($limit);
@@ -945,12 +964,15 @@ private function getSimpleMedia($limit = 5, $offset = 0)
         return $builder->getQuery()->getArrayResult();
     }
 
-    private function getRandomId($table)
+    private function getRandomId(): int
     {
-        return Shopware()->Db()->fetchOne('SELECT id FROM ' . $table . ' LIMIT 1');
+        return (int) Shopware()->Db()->fetchOne('SELECT id FROM s_core_units LIMIT 1');
     }
 
-    private function getSimpleVariantData()
+    /**
+     * @return array{number: string, inStock: int, unitId: int, prices: array<array{customerGroupKey: string, from: int, to: string, price: float}>}
+     */
+    private function getSimpleVariantData(): array
     {
         return [
             'number' => 'swTEST' . uniqid((string) rand()),
@@ -967,7 +989,10 @@ private function getSimpleVariantData()
         ];
     }
 
-    private function getSimpleArticleData()
+    /**
+     * @return array{name: string, description: string, active: bool, taxId: int, supplierId: int}
+     */
+    private function getSimpleProductData(): array
     {
         return [
             'name' => 'Images - Test Artikel',
@@ -978,11 +1003,14 @@ private function getSimpleArticleData()
         ];
     }
 
-    private function getSimpleConfiguratorSet($groupLimit = 3, $optionLimit = 5)
+    /**
+     * @return array{name: string, groups: array<string, mixed>}
+     */
+    private function getSimpleConfiguratorSet(int $groupLimit = 3, int $optionLimit = 5): array
     {
         $builder = Shopware()->Models()->createQueryBuilder();
         $builder->select(['groups.id'])
-            ->from('Shopware\Models\Article\Configurator\Group', 'groups')
+            ->from(Group::class, 'groups')
             ->setFirstResult(0)
             ->setMaxResults($groupLimit)
             ->orderBy('groups.position', 'ASC');
@@ -991,7 +1019,7 @@ private function getSimpleConfiguratorSet($groupLimit = 3, $optionLimit = 5)
 
         $builder = Shopware()->Models()->createQueryBuilder();
         $builder->select(['options.id'])
-            ->from('Shopware\Models\Article\Configurator\Option', 'options')
+            ->from(Option::class, 'options')
             ->where('options.groupId = :groupId')
             ->setFirstResult(0)
             ->setMaxResults($optionLimit)
diff --git a/tests/Functional/Components/Api/fixtures/base64image.php b/tests/Functional/Components/Api/fixtures/base64image.php
index b5eca00e2f3..bf27603dd9d 100644
--- a/tests/Functional/Components/Api/fixtures/base64image.php
+++ b/tests/Functional/Components/Api/fixtures/base64image.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 return 'iVBORw0KGgoAAAANSUhEUgAAA3sAAAFTCAIAAAAPz4LGAAAKrmlDQ1BJQ0MgUHJvZmlsZQAASA2t
diff --git a/tests/Functional/Components/Api/fixtures/variant-image.png b/tests/Functional/Components/Api/fixtures/variant-image.png
index 11aad63fa0a..dd3eebb7d51 100644
Binary files a/tests/Functional/Components/Api/fixtures/variant-image.png and b/tests/Functional/Components/Api/fixtures/variant-image.png differ
diff --git a/tests/Functional/Components/Auth/Adapter/DefaultTest.php b/tests/Functional/Components/Auth/Adapter/DefaultTest.php
index 4ac19b588bf..a58d8d2a449 100644
--- a/tests/Functional/Components/Auth/Adapter/DefaultTest.php
+++ b/tests/Functional/Components/Auth/Adapter/DefaultTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Auth\Adapter;
diff --git a/tests/Functional/Components/Auth/Constraint/NoUrlTest.php b/tests/Functional/Components/Auth/Constraint/NoUrlTest.php
new file mode 100644
index 00000000000..b7eaa897cc7
--- /dev/null
+++ b/tests/Functional/Components/Auth/Constraint/NoUrlTest.php
@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Components\Auth\Constraint;
+
+use PHPUnit\Framework\TestCase;
+use Shopware\Components\Auth\Constraint\NoUrl;
+
+class NoUrlTest extends TestCase
+{
+    public function testNameIsCorrect(): void
+    {
+        $noUrl = new NoUrl();
+        static::assertSame('NoUrlValidator', $noUrl->validatedBy());
+    }
+}
diff --git a/tests/Functional/Components/Auth/Constraint/NoUrlValidatorTest.php b/tests/Functional/Components/Auth/Constraint/NoUrlValidatorTest.php
new file mode 100644
index 00000000000..06bf6b1258e
--- /dev/null
+++ b/tests/Functional/Components/Auth/Constraint/NoUrlValidatorTest.php
@@ -0,0 +1,69 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Components\Auth\Constraint;
+
+use PHPUnit\Framework\TestCase;
+use Shopware\Components\Auth\Constraint\NoUrl;
+use Shopware\Components\Auth\Constraint\NoUrlValidator;
+use Shopware\Components\Validator\NoUrlValidator as Validator;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+
+class NoUrlValidatorTest extends TestCase
+{
+    use ContainerTrait;
+
+    public function testIsNotValidWithUrlInText(): void
+    {
+        $testString = 'https://example.de';
+
+        $snippetManager = $this->getContainer()->get('snippets');
+
+        $noUrlValidator = new NoUrlValidator(
+            $snippetManager,
+            new Validator()
+        );
+
+        // We don't need addError to work. We only need to know if it is called
+        $this->expectExceptionMessage('Call to a member function buildViolation() on null');
+        $noUrlValidator->validate($testString, new NoUrl());
+    }
+
+    public function testIsValidWithoutUrlInText(): void
+    {
+        $testString = 'Test';
+
+        $snippetManager = $this->getContainer()->get('snippets');
+
+        $noUrlValidator = new NoUrlValidator(
+            $snippetManager,
+            new Validator()
+        );
+
+        $noUrlValidator->validate($testString, new NoUrl());
+
+        $this->expectNotToPerformAssertions();
+    }
+}
diff --git a/tests/Functional/Components/AuthTest.php b/tests/Functional/Components/AuthTest.php
index 5d17c58cc2c..177b8f7c81e 100644
--- a/tests/Functional/Components/AuthTest.php
+++ b/tests/Functional/Components/AuthTest.php
@@ -1,34 +1,36 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components;
 
 use DateTime;
-use Enlight_Components_Db_Adapter_Pdo_Mysql;
+use Doctrine\DBAL\Connection;
 use Enlight_Components_Session_Namespace;
-use Enlight_Components_Test_TestCase;
+use PHPUnit\Framework\TestCase;
 use Shopware\Components\Password\Encoder\PasswordEncoderInterface;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
 use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 use Shopware_Components_Auth;
 use Shopware_Components_Auth_Adapter_Default;
@@ -36,41 +38,32 @@
 use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
 use Zend_Auth_Storage_Session;
 
-class AuthTest extends Enlight_Components_Test_TestCase
+class AuthTest extends TestCase
 {
+    use ContainerTrait;
     use DatabaseTransactionBehaviour;
 
-    /**
-     * @var Enlight_Components_Db_Adapter_Pdo_Mysql
-     */
-    private $db;
+    private Connection $connection;
 
-    /**
-     * @var Shopware_Components_Auth
-     */
-    private $auth;
+    private Shopware_Components_Auth $auth;
 
-    /**
-     * @var passwordencoderInterface
-     */
-    private $encoder;
+    private PasswordEncoderInterface $encoder;
 
     protected function setUp(): void
     {
         parent::setUp();
 
-        $this->db = Shopware()->Db();
+        $this->connection = $this->getContainer()->get(Connection::class);
 
         $this->auth = Shopware_Components_Auth::getInstance();
         $this->auth->setStorage(new Zend_Auth_Storage_Session(new Enlight_Components_Session_Namespace(new MockArraySessionStorage())));
 
-        /** @var \Shopware\Components\Password\Manager $passworEncoderRegistry */
-        $passworEncoderRegistry = Shopware()->Container()->get('passwordencoder');
-        $defaultEncoderName = $passworEncoderRegistry->getDefaultpasswordencoderName();
-        $this->encoder = $passworEncoderRegistry->getEncoderByName($defaultEncoderName);
+        $passwordEncoderRegistry = $this->getContainer()->get('passwordencoder');
+        $defaultEncoderName = $passwordEncoderRegistry->getDefaultPasswordEncoderName();
+        $this->encoder = $passwordEncoderRegistry->getEncoderByName($defaultEncoderName);
     }
 
-    public function testAuthenticateWithPassedAdapter()
+    public function testAuthenticateWithPassedAdapter(): void
     {
         // Create adapter
         $adapter = new Shopware_Components_Auth_Adapter_Default(new Session(new MockArraySessionStorage()));
@@ -94,7 +87,7 @@ public function testAuthenticateWithPassedAdapter()
         static::assertEquals($username, $user->username);
     }
 
-    public function testAuthenticateWithSetAdapter()
+    public function testAuthenticateWithSetAdapter(): void
     {
         // Create adapter
         $adapter = new Shopware_Components_Auth_Adapter_Default(new Session(new MockArraySessionStorage()));
@@ -122,13 +115,13 @@ public function testAuthenticateWithSetAdapter()
         static::assertEquals($username, $user->username);
     }
 
-    protected function createAdminUser($username, $password)
+    protected function createAdminUser(string $username, string $password): void
     {
         $name = uniqid((string) rand());
         $email = $name . '@shopware.com';
         $password = $this->encoder->encodePassword($password);
 
-        $this->db->insert('s_core_auth', [
+        $this->connection->insert('s_core_auth', [
             'roleID' => 1,
             'username' => $username,
             'password' => $password,
@@ -136,9 +129,9 @@ protected function createAdminUser($username, $password)
             'localeID' => 1,
             'name' => $name,
             'email' => $email,
-            'active' => true,
+            'active' => 1,
             'failedlogins' => 0,
-            'lockedUntil' => (new DateTime('1970-01-01'))->format('Y-m-d H:i:s'),
+            'lockeduntil' => (new DateTime('1970-01-01'))->format('Y-m-d H:i:s'),
         ]);
     }
 }
diff --git a/tests/Functional/Components/CSRFTokenValidatorTest.php b/tests/Functional/Components/CSRFTokenValidatorTest.php
index 27910ab5ddd..f3e8e55f94c 100644
--- a/tests/Functional/Components/CSRFTokenValidatorTest.php
+++ b/tests/Functional/Components/CSRFTokenValidatorTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components;
diff --git a/tests/Functional/Components/CacheSubscriberTest.php b/tests/Functional/Components/CacheSubscriberTest.php
index f58adcb08da..1664031de21 100644
--- a/tests/Functional/Components/CacheSubscriberTest.php
+++ b/tests/Functional/Components/CacheSubscriberTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components;
diff --git a/tests/Functional/Components/Captcha/CaptchaRepositoryTest.php b/tests/Functional/Components/Captcha/CaptchaRepositoryTest.php
index 96bf9ad631f..1e960459571 100644
--- a/tests/Functional/Components/Captcha/CaptchaRepositoryTest.php
+++ b/tests/Functional/Components/Captcha/CaptchaRepositoryTest.php
@@ -1,37 +1,37 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Captcha;
 
-use Shopware\Components\Captcha\CaptchaRepository;
+use PHPUnit\Framework\TestCase;
 use Shopware\Components\Captcha\Exception\CaptchaNotFoundException;
 
-class CaptchaRepositoryTest extends \PHPUnit\Framework\TestCase
+class CaptchaRepositoryTest extends TestCase
 {
-    public function testThrowCaptchaNotFoundException()
+    public function testThrowCaptchaNotFoundException(): void
     {
-        /** @var CaptchaRepository $captchaRepository */
         $captchaRepository = Shopware()->Container()->get('shopware.captcha.repository');
         $this->expectException(CaptchaNotFoundException::class);
         $captchaRepository->getCaptchaByName('nameIsNotInCaptchaRepository');
diff --git a/tests/Functional/Components/Captcha/CaptchaValidatorTest.php b/tests/Functional/Components/Captcha/CaptchaValidatorTest.php
index 5e8cc37325f..7c5c29c9ac0 100644
--- a/tests/Functional/Components/Captcha/CaptchaValidatorTest.php
+++ b/tests/Functional/Components/Captcha/CaptchaValidatorTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Captcha;
@@ -29,12 +28,15 @@
 use Enlight_Controller_Request_RequestTestCase;
 use Enlight_Template_Manager;
 use PHPUnit\Framework\TestCase;
-use Shopware\Components\Captcha\CaptchaValidator;
 use Shopware\Components\Captcha\DefaultCaptcha;
+use Shopware\Components\Random;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 use Shopware_Components_Config;
 
 class CaptchaValidatorTest extends TestCase
 {
+    use DatabaseTransactionBehaviour;
+
     private DefaultCaptcha $captcha;
 
     public function setUp(): void
@@ -48,7 +50,6 @@ public function setUp(): void
 
     public function testValidateCustomCaptchaHoneypot(): void
     {
-        /** @var CaptchaValidator $validator */
         $validator = Shopware()->Container()->get('shopware.captcha.validator');
         $honeypotParams = include __DIR__ . '/fixtures/honeypotRequest.php';
 
@@ -62,7 +63,6 @@ public function testValidateCustomCaptchaDefault(): void
     {
         $this->captcha->getTemplateData();
 
-        /** @var CaptchaValidator $validator */
         $validator = Shopware()->Container()->get('shopware.captcha.validator');
         $defaultParam = include __DIR__ . '/fixtures/honeypotRequest.php';
         $defaultParam['captchaName'] = 'default';
@@ -81,7 +81,6 @@ public function testInvalidCaptcha(): void
     {
         $this->captcha->getTemplateData();
 
-        /** @var CaptchaValidator $validator */
         $validator = Shopware()->Container()->get('shopware.captcha.validator');
         $defaultParam = include __DIR__ . '/fixtures/honeypotRequest.php';
         $defaultParam['captchaName'] = 'default';
@@ -90,7 +89,7 @@ public function testInvalidCaptcha(): void
         $request->setParams($defaultParam);
 
         // set a random false parameter
-        $request->setParam('sCaptcha', uniqid());
+        $request->setParam('sCaptcha', Random::getString(8));
 
         static::assertFalse($validator->validateByName($defaultParam['captchaName'], $request));
     }
diff --git a/tests/Functional/Components/Captcha/DefaultCaptchaTest.php b/tests/Functional/Components/Captcha/DefaultCaptchaTest.php
index a2194d9d131..1282890a4eb 100644
--- a/tests/Functional/Components/Captcha/DefaultCaptchaTest.php
+++ b/tests/Functional/Components/Captcha/DefaultCaptchaTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Captcha;
diff --git a/tests/Functional/Components/Captcha/fixtures/honeypotRequest.php b/tests/Functional/Components/Captcha/fixtures/honeypotRequest.php
index 46c036dce01..b4b1c5c929b 100644
--- a/tests/Functional/Components/Captcha/fixtures/honeypotRequest.php
+++ b/tests/Functional/Components/Captcha/fixtures/honeypotRequest.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 return [
@@ -29,31 +30,31 @@
     'sTarget' => 'account',
     'sTargetAction' => 'index',
     'register' => [
-            'personal' => [
-                    'customer_type' => 'private',
-                    'salutation' => 'mr',
-                    'firstname' => 'Rainer',
-                    'lastname' => 'Zufall',
-                    'accountmode' => '0',
-                    'email' => 'RainerZufall@random.com',
-                    'password' => 'randomPassword',
-                ],
-            'billing' => [
-                    'street' => 'Zur Hölle',
-                    'zipcode' => '25836',
-                    'city' => 'Nordpol',
-                    'country' => '2',
-                ],
-            'shipping' => [
-                    'company' => '',
-                    'department' => '',
-                    'firstname' => '',
-                    'lastname' => '',
-                    'street' => '',
-                    'zipcode' => '',
-                    'city' => '',
-                ],
+        'personal' => [
+            'customer_type' => 'private',
+            'salutation' => 'mr',
+            'firstname' => 'Rainer',
+            'lastname' => 'Zufall',
+            'accountmode' => '0',
+            'email' => 'RainerZufall@random.com',
+            'password' => 'randomPassword',
+        ],
+        'billing' => [
+            'street' => 'Zur Hölle',
+            'zipcode' => '25836',
+            'city' => 'Nordpol',
+            'country' => '2',
+        ],
+        'shipping' => [
+            'company' => '',
+            'department' => '',
+            'firstname' => '',
+            'lastname' => '',
+            'street' => '',
+            'zipcode' => '',
+            'city' => '',
         ],
+    ],
     'first_name_confirmation' => '',
     'Submit' => '',
     'captchaName' => 'honeypot',
diff --git a/tests/Functional/Components/Cart/BasketQueryHelperTest.php b/tests/Functional/Components/Cart/BasketQueryHelperTest.php
index 799032423f5..931c695ece3 100644
--- a/tests/Functional/Components/Cart/BasketQueryHelperTest.php
+++ b/tests/Functional/Components/Cart/BasketQueryHelperTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Cart;
@@ -42,7 +42,7 @@ class BasketQueryHelperTest extends TestCase
     public function setUp(): void
     {
         $this->queryHelper = new BasketQueryHelper(
-            Shopware()->Container()->get(\Doctrine\DBAL\Connection::class)
+            Shopware()->Container()->get(Connection::class)
         );
     }
 
diff --git a/tests/Functional/Components/Cart/CalculationOnLogoutTest.php b/tests/Functional/Components/Cart/CalculationOnLogoutTest.php
index ad8edfa21ba..3f1e33a67bf 100644
--- a/tests/Functional/Components/Cart/CalculationOnLogoutTest.php
+++ b/tests/Functional/Components/Cart/CalculationOnLogoutTest.php
@@ -1,44 +1,39 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Cart;
 
 use Enlight_Controller_Request_RequestHttp;
-use Shopware\Tests\Functional\Components\CheckoutTest;
+use Shopware\Tests\Functional\Components\CheckoutTestCase;
 use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 
-class CalculationOnLogoutTest extends CheckoutTest
+class CalculationOnLogoutTest extends CheckoutTestCase
 {
     use DatabaseTransactionBehaviour;
 
-    public $clearBasketOnReset = false;
-
-    public function setUp(): void
-    {
-        parent::setUp();
-        Shopware()->Session()->offsetSet('sessionId', null);
-    }
+    public bool $clearBasketOnReset = false;
 
     public function testLogout(): void
     {
@@ -46,13 +41,13 @@ public function testLogout(): void
 
         $this->setConfig('clearBasketAfterLogout', false);
 
-        $productNumber = $this->createArticle(100, 19.00);
+        $productNumber = $this->createProduct(100, 19.00);
         Shopware()->Modules()->Basket()->sAddArticle($productNumber);
         $this->visitCart();
 
         $currentAmount = Shopware()->Session()->get('sBasketAmount');
 
-        $this->loginFrontendUser('H');
+        $this->loginCustomerOfGroup('H');
 
         Shopware()->Modules()->Admin()->logout();
 
diff --git a/tests/Functional/Components/Cart/CartDatabaseViewTest.php b/tests/Functional/Components/Cart/CartDatabaseViewTest.php
new file mode 100644
index 00000000000..fbda92db135
--- /dev/null
+++ b/tests/Functional/Components/Cart/CartDatabaseViewTest.php
@@ -0,0 +1,60 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Components\Cart;
+
+use Doctrine\DBAL\Connection;
+use Shopware\Tests\Functional\Components\CheckoutTestCase;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
+
+class CartDatabaseViewTest extends CheckoutTestCase
+{
+    use ContainerTrait;
+    use DatabaseTransactionBehaviour;
+
+    public bool $clearBasketOnReset = false;
+
+    public function testEnsureCartInViewHasSameIDsAsTheDatabase(): void
+    {
+        $productNumber = $this->createProduct(5, 19.00);
+
+        $this->loginCustomerOfGroup();
+
+        $this->addProduct($productNumber);
+        $this->visitConfirm();
+
+        $cartItems = $this->View()->getAssign('sBasket')['content'];
+        $cartPositionIds = array_map('\intval', array_column($cartItems, 'id'));
+
+        $connection = $this->getContainer()->get(Connection::class);
+        $preparedStatement = $connection->prepare('SELECT id FROM s_order_basket WHERE id = :id');
+        foreach ($cartPositionIds as $cartPositionId) {
+            $preparedStatement->bindValue('id', $cartPositionId);
+            $cartPositionDatabaseId = (int) $preparedStatement->executeQuery()->fetchOne();
+            static::assertSame($cartPositionId, $cartPositionDatabaseId, 'Cart position in view is not the same as in the database.');
+        }
+    }
+}
diff --git a/tests/Functional/Components/Cart/CartMigrationTest.php b/tests/Functional/Components/Cart/CartMigrationTest.php
index 704fd92d81b..91b08e0c042 100644
--- a/tests/Functional/Components/Cart/CartMigrationTest.php
+++ b/tests/Functional/Components/Cart/CartMigrationTest.php
@@ -1,39 +1,42 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Cart;
 
-use Enlight_Controller_Request_RequestHttp;
+use Doctrine\DBAL\Connection;
 use Enlight_Controller_Request_RequestTestCase;
 use PHPUnit\Framework\TestCase;
+use Shopware\Components\Model\ModelManager;
 use Shopware\Components\ShopRegistrationServiceInterface;
 use Shopware\Models\Shop\Shop;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
 use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 use Shopware\Tests\Functional\Traits\FixtureBehaviour;
 
 class CartMigrationTest extends TestCase
 {
+    use ContainerTrait;
     use DatabaseTransactionBehaviour;
     use FixtureBehaviour;
 
@@ -41,45 +44,51 @@ public function testMigrateOnLoginWithEmptyCart(): void
     {
         self::executeFixture(__DIR__ . '/fixture/cart_migration_1.sql');
 
-        Shopware()->Front()->setRequest(new Enlight_Controller_Request_RequestTestCase());
-        Shopware()->Modules()->Basket()->sRefreshBasket();
-        static::assertEquals(0, Shopware()->Session()->get('sBasketAmount'));
+        $this->setFrontRequest();
+        $this->getContainer()->get('modules')->Basket()->sRefreshBasket();
+        static::assertEquals(0, $this->getContainer()->get('session')->get('sBasketAmount'));
 
-        $this->loginFrontendUser();
+        $this->loginCustomer();
 
-        static::assertGreaterThan(0, Shopware()->Session()->get('sBasketAmount'));
+        static::assertGreaterThan(0, $this->getContainer()->get('session')->get('sBasketAmount'));
     }
 
     public function testMigrateOnLoginWithFilledCart(): void
     {
         self::executeFixture(__DIR__ . '/fixture/cart_migration_1.sql');
 
-        Shopware()->Modules()->Basket()->sAddArticle('SW10001');
-        Shopware()->Modules()->Basket()->sRefreshBasket();
+        $this->setFrontRequest();
+        $this->getContainer()->get('modules')->Basket()->sAddArticle('SW10001');
+        $this->getContainer()->get('modules')->Basket()->sRefreshBasket();
+
+        $currentBasketAmount = $this->getContainer()->get('session')->get('sBasketAmount');
 
-        $currentBasketAmount = Shopware()->Session()->get('sBasketAmount');
+        $this->loginCustomer();
 
-        $this->loginFrontendUser();
+        static::assertEquals($currentBasketAmount, $this->getContainer()->get('session')->get('sBasketAmount'));
+    }
 
-        static::assertEquals($currentBasketAmount, Shopware()->Session()->get('sBasketAmount'));
+    private function setFrontRequest(): void
+    {
+        $this->getContainer()->get('front')->setRequest(new Enlight_Controller_Request_RequestTestCase());
     }
 
-    protected function loginFrontendUser(): void
+    private function loginCustomer(): void
     {
-        Shopware()->Front()->setRequest(new Enlight_Controller_Request_RequestHttp());
-        $user = Shopware()->Db()->fetchRow(
-            'SELECT `id`, `email`, `password`, `subshopID`, `language` FROM s_user WHERE `id` = 1'
+        $customer = $this->getContainer()->get(Connection::class)->fetchAssociative(
+            'SELECT `email`, `password`, `language` FROM s_user WHERE `id` = 1'
         );
+        static::assertIsArray($customer);
 
-        $shop = Shopware()->Models()->getRepository(Shop::class)->getActiveById($user['language']);
-        static::assertNotNull($shop);
-        Shopware()->Container()->get(ShopRegistrationServiceInterface::class)->registerResources($shop);
+        $shop = $this->getContainer()->get(ModelManager::class)->getRepository(Shop::class)->getActiveById($customer['language']);
+        static::assertInstanceOf(Shop::class, $shop);
+        $this->getContainer()->get(ShopRegistrationServiceInterface::class)->registerResources($shop);
 
-        Shopware()->Session()->set('Admin', true);
-        Shopware()->System()->_POST = [
-            'email' => $user['email'],
-            'passwordMD5' => $user['password'],
-        ];
-        Shopware()->Modules()->Admin()->sLogin(true);
+        $this->getContainer()->get('front')->ensureRequest()->setPost([
+            'email' => $customer['email'],
+            'passwordMD5' => $customer['password'],
+        ]);
+        $this->getContainer()->get('session')->set('Admin', true);
+        static::assertIsArray($this->getContainer()->get('modules')->Admin()->sLogin(true));
     }
 }
diff --git a/tests/Functional/Components/Cart/CartOrderNumberProviderTest.php b/tests/Functional/Components/Cart/CartOrderNumberProviderTest.php
index f848dac9a50..cce776f2265 100644
--- a/tests/Functional/Components/Cart/CartOrderNumberProviderTest.php
+++ b/tests/Functional/Components/Cart/CartOrderNumberProviderTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Cart;
diff --git a/tests/Functional/Components/Cart/CartPersistServiceTest.php b/tests/Functional/Components/Cart/CartPersistServiceTest.php
index 48b6a223783..942c58c2e38 100644
--- a/tests/Functional/Components/Cart/CartPersistServiceTest.php
+++ b/tests/Functional/Components/Cart/CartPersistServiceTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Cart;
diff --git a/tests/Functional/Components/Cart/CartRaceConditionTest.php b/tests/Functional/Components/Cart/CartRaceConditionTest.php
index a1164025f4b..0d7554ab1cc 100644
--- a/tests/Functional/Components/Cart/CartRaceConditionTest.php
+++ b/tests/Functional/Components/Cart/CartRaceConditionTest.php
@@ -1,40 +1,45 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Cart;
 
-use Shopware\Tests\Functional\Components\CheckoutTest;
+use Doctrine\DBAL\Connection;
+use Shopware\Tests\Functional\Components\CheckoutTestCase;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 
-class CartRaceConditionTest extends CheckoutTest
+class CartRaceConditionTest extends CheckoutTestCase
 {
-    public $clearBasketOnReset = false;
+    use DatabaseTransactionBehaviour;
+
+    public bool $clearBasketOnReset = false;
 
-    public function testPriceChangesInConfirmWithoutPriceModifications()
+    public function testPriceChangesInConfirmWithoutPriceModifications(): void
     {
-        $productNumber = $this->createArticle(5, 19.00);
+        $productNumber = $this->createProduct(5, 19.00);
 
-        $this->loginFrontendUser();
+        $this->loginCustomerOfGroup();
 
         $this->addProduct($productNumber);
         $this->visitConfirm();
@@ -43,24 +48,31 @@ public function testPriceChangesInConfirmWithoutPriceModifications()
 
         $this->visitFinish();
 
-        static::assertEquals($orderAmount, $this->View()->getAssign('sBasket')['AmountNumeric']);
+        static::assertSame($orderAmount, $this->View()->getAssign('sBasket')['AmountNumeric']);
     }
 
-    public function testPriceChangesInConfirmWithPriceModifications()
+    public function testPriceChangesInConfirmWithPriceModifications(): void
     {
-        $productNumber = $this->createArticle(5, 19.00);
+        $productNumber1 = $this->createProduct(5, 19.00);
 
-        $this->loginFrontendUser();
+        $this->loginCustomerOfGroup();
 
-        $this->addProduct($productNumber);
+        $this->addProduct($productNumber1);
         $this->visitConfirm();
 
-        $orderAmount = $this->View()->getAssign('sBasket')['AmountNumeric'];
+        $orderAmount = (float) $this->View()->getAssign('sBasket')['AmountNumeric'];
+        static::assertGreaterThan(0.0, $orderAmount);
 
-        $this->updateProductPrice($productNumber, 20, 19.00);
+        $this->updateProductPrice($productNumber1, 20, 19.00);
 
         $this->visitFinish();
 
-        static::assertEquals($orderAmount, $this->View()->getAssign('sBasket')['AmountNumeric']);
+        $orderNumber = $this->View()->getAssign('sOrderNumber');
+
+        $savedOrderAmount = (float) $this->getContainer()->get(Connection::class)->executeQuery(
+            'SELECT invoice_amount FROM s_order WHERE ordernumber = :orderNumber', ['orderNumber' => $orderNumber]
+        )->fetchOne();
+
+        static::assertSame($orderAmount, $savedOrderAmount);
     }
 }
diff --git a/tests/Functional/Components/Cart/CartToOrderAttributeTest.php b/tests/Functional/Components/Cart/CartToOrderAttributeTest.php
new file mode 100644
index 00000000000..5990663e8ee
--- /dev/null
+++ b/tests/Functional/Components/Cart/CartToOrderAttributeTest.php
@@ -0,0 +1,204 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Components\Cart;
+
+use Doctrine\DBAL\Connection;
+use Enlight_Controller_Request_RequestHttp;
+use Enlight_Controller_Response_ResponseTestCase;
+use Enlight_Event_EventArgs;
+use Enlight_Template_Manager;
+use Enlight_View_Default;
+use PHPUnit\Framework\TestCase;
+use Shopware\Bundle\AttributeBundle\Service\CrudService;
+use Shopware\Bundle\AttributeBundle\Service\TypeMappingInterface;
+use Shopware\Components\Model\ModelManager;
+use Shopware\Models\Order\Order;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\CustomerLoginTrait;
+use Shopware_Controllers_Frontend_Checkout;
+use Symfony\Component\HttpFoundation\Request;
+
+class CartToOrderAttributeTest extends TestCase
+{
+    use ContainerTrait;
+    use CustomerLoginTrait;
+
+    private const TEST_ATTRIBUTE_NAME = 'test_attr';
+    private const TEST_ATTRIBUTE_VALUE = 'test';
+    private const CUSTOMER_ID = 1;
+
+    private CrudService $attributeService;
+
+    private Connection $connection;
+
+    private ModelManager $modelManager;
+
+    protected function setUp(): void
+    {
+        $this->attributeService = $this->getContainer()->get('shopware_attribute.crud_service');
+        $this->connection = $this->getContainer()->get(Connection::class);
+        $this->modelManager = $this->getContainer()->get(ModelManager::class);
+
+        $this->prepareAttributeTables();
+        $this->createListenerToFillCartAttribute();
+    }
+
+    protected function tearDown(): void
+    {
+        $this->removeAttributeColumn();
+    }
+
+    public function testSyncCartAttributeToOrderDetailAttribute(): void
+    {
+        $this->preparePaymentMethod();
+        $controller = $this->createController();
+
+        $addProductRequest = new Enlight_Controller_Request_RequestHttp();
+        $addProductRequest->setMethod(Request::METHOD_POST);
+        $addProductRequest->setPost([
+            'sAdd' => 'SW10064',
+            'sQuantity' => 1,
+        ]);
+        $controller->setRequest($addProductRequest);
+        $controller->Front()->setRequest($addProductRequest);
+        $controller->addArticleAction();
+
+        $confirmRequest = new Enlight_Controller_Request_RequestHttp();
+        $controller->setRequest($confirmRequest);
+        $controller->Front()->setRequest($confirmRequest);
+        $controller->confirmAction();
+
+        $cartPositionsConfirmPage = $controller->View()->getAssign('sBasket')['content'];
+        static::assertCount(3, $cartPositionsConfirmPage);
+        static::assertSame('SW10064', $cartPositionsConfirmPage[0]['ordernumber']);
+        static::assertSame('SHIPPINGDISCOUNT', $cartPositionsConfirmPage[1]['ordernumber']);
+        static::assertSame('sw-payment', $cartPositionsConfirmPage[2]['ordernumber']);
+
+        $controller->View()->loadTemplate('frontend/checkout/finish.tpl');
+        $finishRequest = new Enlight_Controller_Request_RequestHttp([], [
+            'sAGB' => true,
+        ]);
+        $controller->setRequest($finishRequest);
+        $controller->Front()->setRequest($finishRequest);
+        $controller->finishAction();
+
+        $order = $this->connection->executeQuery(
+            'SELECT id, ordernumber
+             FROM s_order
+             ORDER BY id DESC
+             LIMIT 1'
+        )->fetchAssociative();
+        static::assertIsArray($order);
+        static::assertGreaterThan(0, $order['ordernumber']);
+
+        $orderDetailAttributes = $this->connection->executeQuery(
+            'SELECT detailAttributes.*
+             FROM s_order AS `order`
+             INNER JOIN s_order_details details on `order`.id = details.orderID
+             INNER JOIN s_order_details_attributes detailAttributes on details.id = detailAttributes.detailID
+             WHERE `order`.id = :orderId',
+            ['orderId' => $order['id']]
+        )->fetchAllAssociative();
+
+        foreach ($orderDetailAttributes as $orderDetailAttribute) {
+            static::assertSame(self::TEST_ATTRIBUTE_VALUE, $orderDetailAttribute['test_attr']);
+        }
+
+        $this->restorePaymentMethod();
+        $orderObject = $this->modelManager->find(Order::class, $order['id']);
+        static::assertInstanceOf(Order::class, $orderObject);
+        $this->modelManager->remove($orderObject);
+        $this->modelManager->flush($orderObject);
+    }
+
+    private function prepareAttributeTables(): void
+    {
+        $this->attributeService->update(
+            's_order_basket_attributes',
+            self::TEST_ATTRIBUTE_NAME,
+            TypeMappingInterface::TYPE_STRING,
+            [],
+            null,
+            true
+        );
+        $this->modelManager->generateAttributeModels([
+            's_order_basket_attributes',
+            's_order_details_attributes',
+        ]);
+    }
+
+    private function createListenerToFillCartAttribute(): void
+    {
+        $this->getContainer()->get('events')->addListener('Shopware_Modules_Basket_GetBasket_FilterResult',
+            function (Enlight_Event_EventArgs $eventArgs) {
+                foreach ($eventArgs->getReturn()['content'] as $lineItem) {
+                    $this->connection->update(
+                        's_order_basket_attributes',
+                        [self::TEST_ATTRIBUTE_NAME => self::TEST_ATTRIBUTE_VALUE],
+                        ['basketID' => (int) $lineItem['id']],
+                    );
+                }
+            });
+    }
+
+    private function createController(): Shopware_Controllers_Frontend_Checkout
+    {
+        $controller = new Shopware_Controllers_Frontend_Checkout();
+        $controller->setContainer($this->getContainer());
+        $controller->setResponse(new Enlight_Controller_Response_ResponseTestCase());
+        $request = new Enlight_Controller_Request_RequestHttp();
+        $controller->setRequest($request);
+        $controller->setView(new Enlight_View_Default(new Enlight_Template_Manager()));
+
+        $controller->Front()->setRequest($request);
+        $this->getContainer()->get('request_stack')->push($request);
+        $this->loginCustomer(null, self::CUSTOMER_ID);
+
+        $controller->init();
+        $controller->preDispatch();
+
+        return $controller;
+    }
+
+    private function removeAttributeColumn(): void
+    {
+        $this->attributeService->delete('s_order_basket_attributes', self::TEST_ATTRIBUTE_NAME, true);
+        $this->modelManager->generateAttributeModels([
+            's_order_basket_attributes',
+            's_order_details_attributes',
+        ]);
+    }
+
+    private function preparePaymentMethod(): void
+    {
+        $this->connection->update('s_core_paymentmeans', ['debit_percent' => 10], ['name' => 'prepayment']);
+    }
+
+    private function restorePaymentMethod(): void
+    {
+        $this->connection->update('s_core_paymentmeans', ['debit_percent' => 0], ['name' => 'prepayment']);
+    }
+}
diff --git a/tests/Functional/Components/Cart/ConditionalLineItemServiceTest.php b/tests/Functional/Components/Cart/ConditionalLineItemServiceTest.php
new file mode 100644
index 00000000000..2d316c1d066
--- /dev/null
+++ b/tests/Functional/Components/Cart/ConditionalLineItemServiceTest.php
@@ -0,0 +1,115 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Components\Cart;
+
+use Enlight_Components_Session_Namespace;
+use PHPUnit\Framework\TestCase;
+use Shopware\Components\Cart\ConditionalLineItemService;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
+use Shopware_Components_Config;
+use sSystem;
+
+class ConditionalLineItemServiceTest extends TestCase
+{
+    use ContainerTrait;
+    use DatabaseTransactionBehaviour;
+
+    private const TEST_SESSION_ID = 'ConditionalLineItemServiceSessionId';
+
+    public function testAddConditionalLineItemShouldAddAttributeEntry(): void
+    {
+        $this->getConditionalLineItemService()->addConditionalLineItem(
+            'discountName',
+            'SWOrderNumber',
+            10.99,
+            19.00,
+            3
+        );
+
+        static::assertNotNull($this->getDatabaseResult());
+    }
+
+    private function getDatabaseResult(): ?int
+    {
+        $result = $this->getContainer()->get('dbal_connection')->createQueryBuilder()
+            ->select(['basketAttributes.id'])
+            ->from('s_order_basket', 'basket')
+            ->join('basket', 's_order_basket_attributes', 'basketAttributes', 'basket.id = basketAttributes.basketID')
+            ->where('basket.sessionID = :sessionId')
+            ->setParameter('sessionId', self::TEST_SESSION_ID)
+            ->execute()
+            ->fetchOne();
+
+        if (!$result) {
+            return null;
+        }
+
+        return (int) $result;
+    }
+
+    private function getConditionalLineItemService(): ConditionalLineItemService
+    {
+        return new ConditionalLineItemService(
+            $this->createSystemMock(),
+            $this->createSessionMock(),
+            $this->createConfigMock(),
+            $this->getContainer()->get('shopware.cart.basket_helper'),
+            $this->getContainer()->get('dbal_connection')
+        );
+    }
+
+    private function createSystemMock(): sSystem
+    {
+        $sSystemMock = $this->createMock(sSystem::class);
+
+        $sSystemMock->sUSERGROUPDATA = [];
+
+        static::assertInstanceOf(sSystem::class, $sSystemMock);
+
+        return $sSystemMock;
+    }
+
+    private function createSessionMock(): Enlight_Components_Session_Namespace
+    {
+        $sessionMock = $this->createMock(Enlight_Components_Session_Namespace::class);
+        $sessionMock->expects(static::once())->method('get')->willReturn(self::TEST_SESSION_ID);
+
+        static::assertInstanceOf(Enlight_Components_Session_Namespace::class, $sessionMock);
+
+        return $sessionMock;
+    }
+
+    private function createConfigMock(): Shopware_Components_Config
+    {
+        $configMock = $this->createMock(Shopware_Components_Config::class);
+        $configMock->expects(static::once())->method('get')->willReturn(false);
+
+        static::assertInstanceOf(Shopware_Components_Config::class, $configMock);
+
+        return $configMock;
+    }
+}
diff --git a/tests/Functional/Components/Cart/FloatTaxCalculationTest.php b/tests/Functional/Components/Cart/FloatTaxCalculationTest.php
index d4e4bddeb2e..c6832115d96 100644
--- a/tests/Functional/Components/Cart/FloatTaxCalculationTest.php
+++ b/tests/Functional/Components/Cart/FloatTaxCalculationTest.php
@@ -5,31 +5,30 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Cart;
 
 use Doctrine\DBAL\Connection;
-use Shopware\Tests\Functional\Components\CheckoutTest;
+use Shopware\Tests\Functional\Components\CheckoutTestCase;
 
-class FloatTaxCalculationTest extends CheckoutTest
+class FloatTaxCalculationTest extends CheckoutTestCase
 {
     private Connection $connection;
 
@@ -52,7 +51,7 @@ public function tearDown(): void
 
     public function testCartWithVoucher(): void
     {
-        Shopware()->Modules()->Basket()->sAddArticle($this->createArticle(100, 7.75), 1);
+        Shopware()->Modules()->Basket()->sAddArticle($this->createProduct(100, 7.75), 1);
         $voucherCode = $this->createVoucher(10, $this->taxId);
         Shopware()->Modules()->Basket()->sAddVoucher($voucherCode);
 
@@ -67,7 +66,7 @@ public function testCartWithVoucherProportional(): void
     {
         $this->setConfig('proportionalTaxCalculation', true);
 
-        Shopware()->Modules()->Basket()->sAddArticle($this->createArticle(100, 7.75), 1);
+        Shopware()->Modules()->Basket()->sAddArticle($this->createProduct(100, 7.75), 1);
         $voucherCode = $this->createVoucher(10, $this->taxId);
         Shopware()->Modules()->Basket()->sAddVoucher($voucherCode);
 
diff --git a/tests/Functional/Components/Cart/NetRoundingTest.php b/tests/Functional/Components/Cart/NetRoundingTest.php
index 096f6308322..9766677c5c3 100644
--- a/tests/Functional/Components/Cart/NetRoundingTest.php
+++ b/tests/Functional/Components/Cart/NetRoundingTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Cart;
diff --git a/tests/Functional/Components/Cart/PaymentTokenServiceTest.php b/tests/Functional/Components/Cart/PaymentTokenServiceTest.php
index 2daaf8dcd92..02192825e2c 100644
--- a/tests/Functional/Components/Cart/PaymentTokenServiceTest.php
+++ b/tests/Functional/Components/Cart/PaymentTokenServiceTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Cart;
@@ -72,7 +72,7 @@ public function testPaymentTokenValidRequest(): void
 
         static::assertArrayHasKey($key, $cookies);
         static::assertNotNull($this->Response()->getHeader('Location'));
-        static::assertEquals(ini_get('session.cookie_path'), $cookies[$key]['path']);
+        static::assertEquals(\ini_get('session.cookie_path'), $cookies[$key]['path']);
 
         $request = Shopware()->Front()->Request();
         static::assertNotNull($request);
@@ -119,7 +119,6 @@ public function paymentTokenProviders(): array
      */
     public function testPaymentTokenPath(string $virtualUrl, string $path): void
     {
-        session_destroy();
         Shopware()->Container()->reset('session');
 
         $currentUrl = Shopware()->Shop()->getBaseUrl();
@@ -138,7 +137,7 @@ public function testPaymentTokenPath(string $virtualUrl, string $path): void
         $cookies = $this->Response()->getCookies();
         static::assertArrayHasKey($key, $cookies);
         static::assertNotNull($this->Response()->getHeader('Location'));
-        static::assertEquals(ini_get('session.cookie_path'), $cookies[$key]['path']);
+        static::assertEquals(\ini_get('session.cookie_path'), $cookies[$key]['path']);
 
         Shopware()->Shop()->setBaseUrl($currentUrl);
         Shopware()->Shop()->setBasePath($currentPath);
diff --git a/tests/Functional/Components/Cart/ProportionalCartCalculationCustomerGroupTest.php b/tests/Functional/Components/Cart/ProportionalCartCalculationCustomerGroupTest.php
index 14e9d8d8ee7..94f7066d296 100644
--- a/tests/Functional/Components/Cart/ProportionalCartCalculationCustomerGroupTest.php
+++ b/tests/Functional/Components/Cart/ProportionalCartCalculationCustomerGroupTest.php
@@ -1,46 +1,48 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Cart;
 
-use Shopware\Tests\Functional\Components\CheckoutTest;
+use Doctrine\DBAL\Connection;
+use Shopware\Tests\Functional\Components\CheckoutTestCase;
 
 /**
  * @group Basket
  */
-class ProportionalCartCalculationCustomerGroupTest extends CheckoutTest
+class ProportionalCartCalculationCustomerGroupTest extends CheckoutTestCase
 {
     public function setUp(): void
     {
         parent::setUp();
-        Shopware()->Container()->get(\Doctrine\DBAL\Connection::class)->beginTransaction();
+        Shopware()->Container()->get(Connection::class)->beginTransaction();
         $this->setConfig('proportionalTaxCalculation', true);
 
         $this->setPaymentSurcharge(0);
         $this->setCustomerGroupSurcharge(20, 5);
 
-        Shopware()->Container()->get(\Doctrine\DBAL\Connection::class)->executeQuery('UPDATE s_premium_dispatch SET active = 0 WHERE id = 12');
+        Shopware()->Container()->get(Connection::class)->executeQuery('UPDATE s_premium_dispatch SET active = 0 WHERE id = 12');
     }
 
     protected function tearDown(): void
@@ -50,12 +52,12 @@ protected function tearDown(): void
         $this->clearCustomerGroupDiscount('EK');
         $this->setConfig('proportionalTaxCalculation', false);
 
-        Shopware()->Container()->get(\Doctrine\DBAL\Connection::class)->rollBack();
+        Shopware()->Container()->get(Connection::class)->rollBack();
     }
 
     public function testCustomerGroupWithMinimumOrderNormal()
     {
-        Shopware()->Modules()->Basket()->sAddArticle($this->createArticle(5, 19.00), 1);
+        Shopware()->Modules()->Basket()->sAddArticle($this->createProduct(5, 19.00), 1);
 
         $this->dispatch('/checkout/cart');
 
@@ -82,8 +84,8 @@ public function testCustomerGroupWithMinimumOrderNormal()
 
     public function testCustomerGroupWithMinimumOrderTaxes()
     {
-        Shopware()->Modules()->Basket()->sAddArticle($this->createArticle(5, 19.00), 1);
-        Shopware()->Modules()->Basket()->sAddArticle($this->createArticle(3, 7.00), 1);
+        Shopware()->Modules()->Basket()->sAddArticle($this->createProduct(5, 19.00), 1);
+        Shopware()->Modules()->Basket()->sAddArticle($this->createProduct(3, 7.00), 1);
 
         $this->dispatch('/checkout/cart');
 
@@ -113,7 +115,7 @@ public function testCustomerGroupDiscountNormal()
     {
         $this->addCustomerGroupDiscount('EK', 20, 10);
 
-        Shopware()->Modules()->Basket()->sAddArticle($this->createArticle(500, 19.00), 1);
+        Shopware()->Modules()->Basket()->sAddArticle($this->createProduct(500, 19.00), 1);
 
         $this->dispatch('/checkout/cart');
 
@@ -142,8 +144,8 @@ public function testCustomerGroupDiscountNormalMultipleTaxes()
     {
         $this->addCustomerGroupDiscount('EK', 20, 10);
 
-        Shopware()->Modules()->Basket()->sAddArticle($this->createArticle(500, 19.00), 1);
-        Shopware()->Modules()->Basket()->sAddArticle($this->createArticle(500, 7.00), 1);
+        Shopware()->Modules()->Basket()->sAddArticle($this->createProduct(500, 19.00), 1);
+        Shopware()->Modules()->Basket()->sAddArticle($this->createProduct(500, 7.00), 1);
 
         $this->dispatch('/checkout/cart');
 
diff --git a/tests/Functional/Components/Cart/ProportionalCartCalculationDispatchTest.php b/tests/Functional/Components/Cart/ProportionalCartCalculationDispatchTest.php
index 95d3c72c54c..b4eb95a6183 100644
--- a/tests/Functional/Components/Cart/ProportionalCartCalculationDispatchTest.php
+++ b/tests/Functional/Components/Cart/ProportionalCartCalculationDispatchTest.php
@@ -1,43 +1,45 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Cart;
 
-use Shopware\Tests\Functional\Components\CheckoutTest;
+use Doctrine\DBAL\Connection;
+use Shopware\Tests\Functional\Components\CheckoutTestCase;
 
 /**
  * @group Basket
  */
-class ProportionalCartCalculationDispatchTest extends CheckoutTest
+class ProportionalCartCalculationDispatchTest extends CheckoutTestCase
 {
     public function setUp(): void
     {
         parent::setUp();
-        Shopware()->Container()->get(\Doctrine\DBAL\Connection::class)->beginTransaction();
+        Shopware()->Container()->get(Connection::class)->beginTransaction();
         $this->setConfig('proportionalTaxCalculation', true);
 
-        Shopware()->Container()->get(\Doctrine\DBAL\Connection::class)->executeQuery('UPDATE s_premium_dispatch SET active = 0 WHERE id = 12');
+        Shopware()->Container()->get(Connection::class)->executeQuery('UPDATE s_premium_dispatch SET active = 0 WHERE id = 12');
     }
 
     protected function tearDown(): void
@@ -46,15 +48,15 @@ protected function tearDown(): void
 
         $this->setConfig('proportionalTaxCalculation', false);
 
-        Shopware()->Container()->get(\Doctrine\DBAL\Connection::class)->rollBack();
+        Shopware()->Container()->get(Connection::class)->rollBack();
     }
 
-    public function testSurchargeInDispatch()
+    public function testSurchargeInDispatch(): void
     {
         $this->setPaymentSurcharge(5);
-        Shopware()->Container()->get(\Doctrine\DBAL\Connection::class)->executeQuery('UPDATE s_premium_dispatch SET surcharge_calculation = 0');
+        Shopware()->Container()->get(Connection::class)->executeQuery('UPDATE s_premium_dispatch SET surcharge_calculation = 0');
 
-        Shopware()->Modules()->Basket()->sAddArticle($this->createArticle(50, 19.00), 1);
+        Shopware()->Modules()->Basket()->sAddArticle($this->createProduct(50, 19.00));
 
         $this->dispatch('/checkout/cart');
 
@@ -77,13 +79,13 @@ public function testSurchargeInDispatch()
         static::assertCount(1, $sBasket['content']);
     }
 
-    public function testSurchargeInDispatchMultipleTaxes()
+    public function testSurchargeInDispatchMultipleTaxes(): void
     {
         $this->setPaymentSurcharge(5);
-        Shopware()->Container()->get(\Doctrine\DBAL\Connection::class)->executeQuery('UPDATE s_premium_dispatch SET surcharge_calculation = 0');
+        Shopware()->Container()->get(Connection::class)->executeQuery('UPDATE s_premium_dispatch SET surcharge_calculation = 0');
 
-        Shopware()->Modules()->Basket()->sAddArticle($this->createArticle(50, 19.00), 1);
-        Shopware()->Modules()->Basket()->sAddArticle($this->createArticle(50, 7.00), 1);
+        Shopware()->Modules()->Basket()->sAddArticle($this->createProduct(50, 19.00));
+        Shopware()->Modules()->Basket()->sAddArticle($this->createProduct(50, 7.00));
 
         $this->dispatch('/checkout/cart');
 
@@ -106,12 +108,12 @@ public function testSurchargeInDispatchMultipleTaxes()
         static::assertCount(2, $sBasket['content']);
     }
 
-    public function testBasketDiscountIntroducedByDispatch()
+    public function testBasketDiscountIntroducedByDispatch(): void
     {
         $this->setPaymentSurcharge(0);
-        Shopware()->Container()->get(\Doctrine\DBAL\Connection::class)->executeQuery('UPDATE s_premium_dispatch SET active = 1 WHERE id = 12');
+        Shopware()->Container()->get(Connection::class)->executeQuery('UPDATE s_premium_dispatch SET active = 1 WHERE id = 12');
 
-        Shopware()->Modules()->Basket()->sAddArticle($this->createArticle(50, 19.00), 1);
+        Shopware()->Modules()->Basket()->sAddArticle($this->createProduct(50, 19.00));
 
         $this->dispatch('/checkout/cart');
 
@@ -136,13 +138,13 @@ public function testBasketDiscountIntroducedByDispatch()
         $this->hasBasketItem($sBasket['content'], 'Warenkorbrabatt', -2, -1.6806722689076, 'SHIPPINGDISCOUNT');
     }
 
-    public function testBasketDiscountIntroducedByDispatchMultipleTaxes()
+    public function testBasketDiscountIntroducedByDispatchMultipleTaxes(): void
     {
         $this->setPaymentSurcharge(0);
-        Shopware()->Container()->get(\Doctrine\DBAL\Connection::class)->executeQuery('UPDATE s_premium_dispatch SET active = 1 WHERE id = 12');
+        Shopware()->Container()->get(Connection::class)->executeQuery('UPDATE s_premium_dispatch SET active = 1 WHERE id = 12');
 
-        Shopware()->Modules()->Basket()->sAddArticle($this->createArticle(50, 19.00), 1);
-        Shopware()->Modules()->Basket()->sAddArticle($this->createArticle(50, 7.00), 1);
+        Shopware()->Modules()->Basket()->sAddArticle($this->createProduct(50, 19.00));
+        Shopware()->Modules()->Basket()->sAddArticle($this->createProduct(50, 7.00));
 
         $this->dispatch('/checkout/cart');
 
@@ -157,7 +159,7 @@ public function testBasketDiscountIntroducedByDispatchMultipleTaxes()
         static::assertEquals(3.9, $sBasket['sShippingcosts']);
         static::assertEquals(3.9, $sBasket['sShippingcostsWithTax']);
         static::assertEquals(19.0, $sBasket['sShippingcostsTax']);
-        static::assertEquals(3.4708433038255415, $sBasket['sShippingcostsNet']);
+        static::assertEquals(3.470843303825543, $sBasket['sShippingcostsNet']);
 
         static::assertTrue(isset($sBasket['sShippingcostsTaxProportional']));
         static::assertCount(2, $sBasket['sTaxRates']);
diff --git a/tests/Functional/Components/Cart/ProportionalCartCalculationSurchargeTest.php b/tests/Functional/Components/Cart/ProportionalCartCalculationSurchargeTest.php
index 303aa644029..e783d4dc58a 100644
--- a/tests/Functional/Components/Cart/ProportionalCartCalculationSurchargeTest.php
+++ b/tests/Functional/Components/Cart/ProportionalCartCalculationSurchargeTest.php
@@ -1,49 +1,47 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Cart;
 
-use Shopware\Tests\Functional\Components\CheckoutTest;
+use Doctrine\DBAL\Connection;
+use Shopware\Tests\Functional\Components\CheckoutTestCase;
 
 /**
  * @group Basket
  */
-class ProportionalCartCalculationSurchargeTest extends CheckoutTest
+class ProportionalCartCalculationSurchargeTest extends CheckoutTestCase
 {
     /**
-     * A article with 7% tax
-     *
-     * @var string
+     * A product with 7% tax
      */
-    private $tax7;
+    private string $tax7;
 
     /**
-     * A article with 19% tax
-     *
-     * @var string
+     * A product with 19% tax
      */
-    private $tax19;
+    private string $tax19;
 
     public function setUp(): void
     {
@@ -51,30 +49,30 @@ public function setUp(): void
 
         $this->setConfig('proportionalTaxCalculation', true);
         $this->setPaymentSurcharge(0);
-        Shopware()->Container()->get(\Doctrine\DBAL\Connection::class)->beginTransaction();
+        Shopware()->Container()->get(Connection::class)->beginTransaction();
 
         $this->setCustomerGroupSurcharge(0, 0);
 
-        Shopware()->Container()->get(\Doctrine\DBAL\Connection::class)->executeQuery('UPDATE s_premium_dispatch SET active = 0 WHERE id = 12');
+        Shopware()->Container()->get(Connection::class)->executeQuery('UPDATE s_premium_dispatch SET active = 0 WHERE id = 12');
 
-        $this->tax7 = $this->createArticle(10, 7.00);
-        $this->tax19 = $this->createArticle(10, 19.00);
+        $this->tax7 = $this->createProduct(10, 7.00);
+        $this->tax19 = $this->createProduct(10, 19.00);
     }
 
     protected function tearDown(): void
     {
         parent::tearDown();
 
-        Shopware()->Container()->get(\Doctrine\DBAL\Connection::class)->rollBack();
+        Shopware()->Container()->get(Connection::class)->rollBack();
 
         $this->setConfig('proportionalTaxCalculation', false);
         $this->setPaymentSurcharge(0);
     }
 
-    public function testMultipleTaxesWithoutDiscounts()
+    public function testMultipleTaxesWithoutDiscounts(): void
     {
-        Shopware()->Modules()->Basket()->sAddArticle($this->tax7, 1);
-        Shopware()->Modules()->Basket()->sAddArticle($this->tax19, 1);
+        Shopware()->Modules()->Basket()->sAddArticle($this->tax7);
+        Shopware()->Modules()->Basket()->sAddArticle($this->tax19);
 
         $this->dispatch('/checkout/cart');
 
@@ -101,12 +99,12 @@ public function testMultipleTaxesWithoutDiscounts()
         $this->reset();
     }
 
-    public function testMultipleTaxesWithPaymentSurchargeAbsolute()
+    public function testMultipleTaxesWithPaymentSurchargeAbsolute(): void
     {
         $this->setPaymentSurcharge(10);
 
-        Shopware()->Modules()->Basket()->sAddArticle($this->tax7, 1);
-        Shopware()->Modules()->Basket()->sAddArticle($this->tax19, 1);
+        Shopware()->Modules()->Basket()->sAddArticle($this->tax7);
+        Shopware()->Modules()->Basket()->sAddArticle($this->tax19);
 
         $this->dispatch('/checkout/cart');
 
@@ -136,12 +134,12 @@ public function testMultipleTaxesWithPaymentSurchargeAbsolute()
         $this->reset();
     }
 
-    public function testMultipleTaxesWithPaymentSurchargePercent()
+    public function testMultipleTaxesWithPaymentSurchargePercent(): void
     {
         $this->setPaymentSurcharge(0, 10);
 
-        Shopware()->Modules()->Basket()->sAddArticle($this->tax7, 1);
-        Shopware()->Modules()->Basket()->sAddArticle($this->tax19, 1);
+        Shopware()->Modules()->Basket()->sAddArticle($this->tax7);
+        Shopware()->Modules()->Basket()->sAddArticle($this->tax19);
 
         $this->dispatch('/checkout/cart');
 
@@ -171,12 +169,12 @@ public function testMultipleTaxesWithPaymentSurchargePercent()
         $this->reset();
     }
 
-    public function testMultipleTaxesWithPaymentSurchargePercentCountry()
+    public function testMultipleTaxesWithPaymentSurchargePercentCountry(): void
     {
         $this->setPaymentSurcharge(0, 0, 'DE:10');
 
-        Shopware()->Modules()->Basket()->sAddArticle($this->tax7, 1);
-        Shopware()->Modules()->Basket()->sAddArticle($this->tax19, 1);
+        Shopware()->Modules()->Basket()->sAddArticle($this->tax7);
+        Shopware()->Modules()->Basket()->sAddArticle($this->tax19);
 
         $this->dispatch('/checkout/cart');
 
@@ -206,12 +204,12 @@ public function testMultipleTaxesWithPaymentSurchargePercentCountry()
         $this->reset();
     }
 
-    public function testMultipleTaxesWithPaymentSurchargeAbsoluteNegative()
+    public function testMultipleTaxesWithPaymentSurchargeAbsoluteNegative(): void
     {
         $this->setPaymentSurcharge(-10);
 
-        Shopware()->Modules()->Basket()->sAddArticle($this->tax7, 1);
-        Shopware()->Modules()->Basket()->sAddArticle($this->tax19, 1);
+        Shopware()->Modules()->Basket()->sAddArticle($this->tax7);
+        Shopware()->Modules()->Basket()->sAddArticle($this->tax19);
 
         $this->dispatch('/checkout/cart');
 
@@ -241,12 +239,12 @@ public function testMultipleTaxesWithPaymentSurchargeAbsoluteNegative()
         $this->reset();
     }
 
-    public function testMultipleTaxesWithPaymentSurchargePercentNegative()
+    public function testMultipleTaxesWithPaymentSurchargePercentNegative(): void
     {
         $this->setPaymentSurcharge(0, -10);
 
-        Shopware()->Modules()->Basket()->sAddArticle($this->tax7, 1);
-        Shopware()->Modules()->Basket()->sAddArticle($this->tax19, 1);
+        Shopware()->Modules()->Basket()->sAddArticle($this->tax7);
+        Shopware()->Modules()->Basket()->sAddArticle($this->tax19);
 
         $this->dispatch('/checkout/cart');
 
@@ -276,12 +274,12 @@ public function testMultipleTaxesWithPaymentSurchargePercentNegative()
         $this->reset();
     }
 
-    public function testMultipleTaxesWithPaymentSurchargePercentCountryNegative()
+    public function testMultipleTaxesWithPaymentSurchargePercentCountryNegative(): void
     {
         $this->setPaymentSurcharge(0, 0, 'DE:-10');
 
-        Shopware()->Modules()->Basket()->sAddArticle($this->tax7, 1);
-        Shopware()->Modules()->Basket()->sAddArticle($this->tax19, 1);
+        Shopware()->Modules()->Basket()->sAddArticle($this->tax7);
+        Shopware()->Modules()->Basket()->sAddArticle($this->tax19);
 
         $this->dispatch('/checkout/cart');
 
diff --git a/tests/Functional/Components/Cart/ProportionalCartCalculationVoucherTest.php b/tests/Functional/Components/Cart/ProportionalCartCalculationVoucherTest.php
index 6b90b68ca59..33de94caa72 100644
--- a/tests/Functional/Components/Cart/ProportionalCartCalculationVoucherTest.php
+++ b/tests/Functional/Components/Cart/ProportionalCartCalculationVoucherTest.php
@@ -1,46 +1,48 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Cart;
 
-use Shopware\Tests\Functional\Components\CheckoutTest;
+use Doctrine\DBAL\Connection;
+use Shopware\Tests\Functional\Components\CheckoutTestCase;
 
 /**
  * @group Basket
  */
-class ProportionalCartCalculationVoucherTest extends CheckoutTest
+class ProportionalCartCalculationVoucherTest extends CheckoutTestCase
 {
     public function setUp(): void
     {
         parent::setUp();
-        Shopware()->Container()->get(\Doctrine\DBAL\Connection::class)->beginTransaction();
+        Shopware()->Container()->get(Connection::class)->beginTransaction();
         $this->setConfig('proportionalTaxCalculation', true);
 
         $this->setPaymentSurcharge(0);
         $this->setCustomerGroupSurcharge(0, 0);
 
-        Shopware()->Container()->get(\Doctrine\DBAL\Connection::class)->executeQuery('UPDATE s_premium_dispatch SET active = 0 WHERE id = 12');
+        Shopware()->Container()->get(Connection::class)->executeQuery('UPDATE s_premium_dispatch SET active = 0 WHERE id = 12');
     }
 
     protected function tearDown(): void
@@ -50,13 +52,13 @@ protected function tearDown(): void
         $this->clearCustomerGroupDiscount('EK');
         $this->setConfig('proportionalTaxCalculation', false);
 
-        Shopware()->Container()->get(\Doctrine\DBAL\Connection::class)->rollBack();
+        Shopware()->Container()->get(Connection::class)->rollBack();
     }
 
-    public function testAbsoluteVoucher()
+    public function testAbsoluteVoucher(): void
     {
         $this->setVoucherTax('absolut', 'default');
-        Shopware()->Modules()->Basket()->sAddArticle($this->createArticle(50, 19.00), 1);
+        Shopware()->Modules()->Basket()->sAddArticle($this->createProduct(50, 19.00));
         Shopware()->Modules()->Basket()->sAddVoucher('absolut');
 
         $this->dispatch('/checkout/cart');
@@ -82,12 +84,12 @@ public function testAbsoluteVoucher()
         $this->hasBasketItem($sBasket['content'], 'Gutschein', -5, -4.2016806722689, 'GUTABS');
     }
 
-    public function testAbsoluteVoucherMultipleTaxesWithMaxTax()
+    public function testAbsoluteVoucherMultipleTaxesWithMaxTax(): void
     {
         $this->setVoucherTax('GUTABS', 'default');
 
-        Shopware()->Modules()->Basket()->sAddArticle($this->createArticle(50, 19.00), 1);
-        Shopware()->Modules()->Basket()->sAddArticle($this->createArticle(50, 7.00), 1);
+        Shopware()->Modules()->Basket()->sAddArticle($this->createProduct(50, 19.00));
+        Shopware()->Modules()->Basket()->sAddArticle($this->createProduct(50, 7.00));
         Shopware()->Modules()->Basket()->sAddVoucher('absolut');
 
         $this->dispatch('/checkout/cart');
@@ -103,7 +105,7 @@ public function testAbsoluteVoucherMultipleTaxesWithMaxTax()
         static::assertEquals(3.9, $sBasket['sShippingcosts']);
         static::assertEquals(3.9, $sBasket['sShippingcostsWithTax']);
         static::assertEquals(19.0, $sBasket['sShippingcostsTax']);
-        static::assertEquals(3.4708433038255415, $sBasket['sShippingcostsNet']);
+        static::assertEquals(3.470843303825543, $sBasket['sShippingcostsNet']);
 
         static::assertTrue(isset($sBasket['sShippingcostsTaxProportional']));
         static::assertCount(2, $sBasket['sTaxRates']);
@@ -113,12 +115,12 @@ public function testAbsoluteVoucherMultipleTaxesWithMaxTax()
         $this->hasBasketItem($sBasket['content'], 'Gutschein', -5, -4.202, 'GUTABS');
     }
 
-    public function testAbsoluteVoucherMultipleTaxes()
+    public function testAbsoluteVoucherMultipleTaxes(): void
     {
         $this->setVoucherTax('GUTABS', 'auto');
 
-        Shopware()->Modules()->Basket()->sAddArticle($this->createArticle(50, 19.00), 1);
-        Shopware()->Modules()->Basket()->sAddArticle($this->createArticle(50, 7.00), 1);
+        Shopware()->Modules()->Basket()->sAddArticle($this->createProduct(50, 19.00));
+        Shopware()->Modules()->Basket()->sAddArticle($this->createProduct(50, 7.00));
         Shopware()->Modules()->Basket()->sAddVoucher('absolut');
 
         $this->dispatch('/checkout/cart');
@@ -134,7 +136,7 @@ public function testAbsoluteVoucherMultipleTaxes()
         static::assertEquals(3.9, $sBasket['sShippingcosts']);
         static::assertEquals(3.9, $sBasket['sShippingcostsWithTax']);
         static::assertEquals(19.0, $sBasket['sShippingcostsTax']);
-        static::assertEquals(3.4708433038255415, $sBasket['sShippingcostsNet']);
+        static::assertEquals(3.470843303825543, $sBasket['sShippingcostsNet']);
 
         static::assertTrue(isset($sBasket['sShippingcostsTaxProportional']));
         static::assertCount(2, $sBasket['sTaxRates']);
@@ -145,11 +147,11 @@ public function testAbsoluteVoucherMultipleTaxes()
         $this->hasBasketItem($sBasket['content'], 'Gutschein (19%)', -2.37, -1.9892912917379, 'GUTABS');
     }
 
-    public function testPercentVoucher()
+    public function testPercentVoucher(): void
     {
         $this->setVoucherTax('GUTPROZ', 'default');
 
-        Shopware()->Modules()->Basket()->sAddArticle($this->createArticle(100, 19.00), 1);
+        Shopware()->Modules()->Basket()->sAddArticle($this->createProduct(100, 19.00));
         Shopware()->Modules()->Basket()->sAddVoucher('prozentual');
 
         $this->dispatch('/checkout/cart');
@@ -175,11 +177,11 @@ public function testPercentVoucher()
         $this->hasBasketItem($sBasket['content'], 'Gutschein 10 %', -10, -8.403, 'GUTPROZ');
     }
 
-    public function testPercentVoucherProportionalWithOneTax()
+    public function testPercentVoucherProportionalWithOneTax(): void
     {
         $this->setVoucherTax('GUTPROZ', 'auto');
 
-        Shopware()->Modules()->Basket()->sAddArticle($this->createArticle(100, 19.00), 1);
+        Shopware()->Modules()->Basket()->sAddArticle($this->createProduct(100, 19.00));
         Shopware()->Modules()->Basket()->sAddVoucher('prozentual');
 
         $this->dispatch('/checkout/cart');
@@ -205,12 +207,12 @@ public function testPercentVoucherProportionalWithOneTax()
         $this->hasBasketItem($sBasket['content'], 'Gutschein 10 %', -10, -8.4033613445378, 'GUTPROZ');
     }
 
-    public function testPercentVoucherProportionalWithMultipleTaxes()
+    public function testPercentVoucherProportionalWithMultipleTaxes(): void
     {
         $this->setVoucherTax('GUTPROZ', 'auto');
 
-        Shopware()->Modules()->Basket()->sAddArticle($this->createArticle(50, 19.00), 1);
-        Shopware()->Modules()->Basket()->sAddArticle($this->createArticle(50, 7.00), 1);
+        Shopware()->Modules()->Basket()->sAddArticle($this->createProduct(50, 19.00));
+        Shopware()->Modules()->Basket()->sAddArticle($this->createProduct(50, 7.00));
         Shopware()->Modules()->Basket()->sAddVoucher('prozentual');
 
         $this->dispatch('/checkout/cart');
@@ -226,7 +228,7 @@ public function testPercentVoucherProportionalWithMultipleTaxes()
         static::assertEquals(3.9, $sBasket['sShippingcosts']);
         static::assertEquals(3.9, $sBasket['sShippingcostsWithTax']);
         static::assertEquals(19.0, $sBasket['sShippingcostsTax']);
-        static::assertEquals(3.4708433038255415, $sBasket['sShippingcostsNet']);
+        static::assertEquals(3.470843303825543, $sBasket['sShippingcostsNet']);
 
         static::assertTrue(isset($sBasket['sShippingcostsTaxProportional']));
         static::assertCount(2, $sBasket['sTaxRates']);
@@ -237,12 +239,12 @@ public function testPercentVoucherProportionalWithMultipleTaxes()
         $this->hasBasketItem($sBasket['content'], 'Gutschein 10 % (19%)', -5, -4.2016806722689, 'GUTPROZ');
     }
 
-    public function testProportionalBasketView()
+    public function testProportionalBasketView(): void
     {
         $this->setVoucherTax('GUTABS', 'auto');
 
-        Shopware()->Modules()->Basket()->sAddArticle($this->createArticle(50, 19.00), 1);
-        Shopware()->Modules()->Basket()->sAddArticle($this->createArticle(50, 7.00), 1);
+        Shopware()->Modules()->Basket()->sAddArticle($this->createProduct(50, 19.00));
+        Shopware()->Modules()->Basket()->sAddArticle($this->createProduct(50, 7.00));
         Shopware()->Modules()->Basket()->sAddVoucher('absolut');
 
         $this->dispatch('/checkout/cart');
diff --git a/tests/Functional/Components/Cart/ProportionalTaxCalculatorTest.php b/tests/Functional/Components/Cart/ProportionalTaxCalculatorTest.php
index 68c6241e2ae..e5c97e2b339 100644
--- a/tests/Functional/Components/Cart/ProportionalTaxCalculatorTest.php
+++ b/tests/Functional/Components/Cart/ProportionalTaxCalculatorTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Cart;
@@ -76,9 +75,9 @@ public function testAbsoluteCalculationWithOneTax(): void
         static::assertCount(1, $calculatedProportional);
 
         static::assertEquals(10, $calculatedProportional[0]->getPrice());
-        static::assertEquals(8.4033613445378, $calculatedProportional[0]->getNetPrice());
+        static::assertEquals(8.403361344537815, $calculatedProportional[0]->getNetPrice());
         static::assertEquals(19, $calculatedProportional[0]->getTaxRate());
-        static::assertEquals(1.5966386554622, $calculatedProportional[0]->getTax());
+        static::assertEquals(1.596638655462185, $calculatedProportional[0]->getTax());
     }
 
     public function testAbsoluteCalculation(): void
@@ -99,10 +98,10 @@ public function testAbsoluteCalculation(): void
         static::assertEquals(0.7558922160413462, $calculatedProportional[0]->getTax());
 
         // 7%
-        static::assertEquals(5.2657276995305, $calculatedProportional[1]->getPrice());
-        static::assertEquals(4.9212408406827, $calculatedProportional[1]->getNetPrice());
+        static::assertEquals(5.265727699530516, $calculatedProportional[1]->getPrice());
+        static::assertEquals(4.921240840682725, $calculatedProportional[1]->getNetPrice());
         static::assertEquals(7, $calculatedProportional[1]->getTaxRate());
-        static::assertEquals(0.34448685884779, $calculatedProportional[1]->getTax());
+        static::assertEquals(0.3444868588477908, $calculatedProportional[1]->getTax());
     }
 
     public function testPercentCalculationWithOneTax(): void
@@ -116,7 +115,7 @@ public function testPercentCalculationWithOneTax(): void
         static::assertCount(1, $calculatedProportional);
 
         static::assertEquals(3, $calculatedProportional['1f0e3dad99908345f7439f8ffabdffc4']->getPrice());
-        static::assertEquals(2.5210084033613, $calculatedProportional['1f0e3dad99908345f7439f8ffabdffc4']->getNetPrice());
+        static::assertEquals(2.5210084033613445, $calculatedProportional['1f0e3dad99908345f7439f8ffabdffc4']->getNetPrice());
         static::assertEquals(19, $calculatedProportional['1f0e3dad99908345f7439f8ffabdffc4']->getTaxRate());
     }
 
@@ -132,11 +131,11 @@ public function testPercentCalculation(): void
         static::assertCount(2, $calculatedProportional);
 
         static::assertEquals(3, $calculatedProportional['1f0e3dad99908345f7439f8ffabdffc4']->getPrice());
-        static::assertEquals(2.5210084033613, $calculatedProportional['1f0e3dad99908345f7439f8ffabdffc4']->getNetPrice());
+        static::assertEquals(2.5210084033613445, $calculatedProportional['1f0e3dad99908345f7439f8ffabdffc4']->getNetPrice());
         static::assertEquals(19, $calculatedProportional['1f0e3dad99908345f7439f8ffabdffc4']->getTaxRate());
 
         static::assertEquals(3, $calculatedProportional['8f14e45fceea167a5a36dedd4bea2543']->getPrice());
-        static::assertEquals(2.803738317757, $calculatedProportional['8f14e45fceea167a5a36dedd4bea2543']->getNetPrice());
+        static::assertEquals(2.803738317757009, $calculatedProportional['8f14e45fceea167a5a36dedd4bea2543']->getNetPrice());
         static::assertEquals(7, $calculatedProportional['8f14e45fceea167a5a36dedd4bea2543']->getTaxRate());
     }
 
@@ -185,17 +184,17 @@ public function testCalculateThereIsNoPriceWithNAN(Price $price): void
 
         static::assertFalse(
             is_nan($result->getPrice()),
-            sprintf($messageTemplate, 'Price', $result->getPrice())
+            \sprintf($messageTemplate, 'Price', $result->getPrice())
         );
 
         static::assertFalse(
             is_nan($result->getNetPrice()),
-            sprintf($messageTemplate, 'NetPrice', $result->getNetPrice())
+            \sprintf($messageTemplate, 'NetPrice', $result->getNetPrice())
         );
 
         static::assertFalse(
             is_nan($result->getTax()),
-            sprintf($messageTemplate, 'Tax', $result->getTax())
+            \sprintf($messageTemplate, 'Tax', $result->getTax())
         );
     }
 
diff --git a/tests/Functional/Components/Cart/fixture/cart_migration_1.sql b/tests/Functional/Components/Cart/fixture/cart_migration_1.sql
index ad3fa5afece..46814df340c 100644
--- a/tests/Functional/Components/Cart/fixture/cart_migration_1.sql
+++ b/tests/Functional/Components/Cart/fixture/cart_migration_1.sql
@@ -1,3 +1,3 @@
-INSERT INTO `s_order_basket` (`id`, `sessionID`, `userID`, `articlename`, `articleID`, `ordernumber`, `shippingfree`, `quantity`, `price`, `netprice`, `tax_rate`, `datum`, `modus`, `esdarticle`, `partnerID`, `lastviewport`, `useragent`, `config`, `currencyFactor`) VALUES
-(NULL, '52f0cf0e9f3737fd42f8371ec79fbd5a', 1, 'Münsterländer Aperitif 16%', 3, 'SW10003', 0, 1, 14.95, 12.563025210084, 19, '2019-04-05 09:09:54', 0, 0, '', 'account', 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.86 Safari/537.36', '', 1),
-(NULL, '52f0cf0e9f3737fd42f8371ec79fbd5a', 0, 'Warenkorbrabatt', 0, 'SHIPPINGDISCOUNT', 0, 1, -2, -1.68, 19, '2019-04-05 09:10:30', 4, 0, '', '', '', '', 1);
+INSERT INTO `s_order_basket` (`userID`, `articlename`, `articleID`, `ordernumber`, `shippingfree`, `quantity`, `price`, `netprice`, `tax_rate`, `datum`, `modus`, `esdarticle`, `partnerID`, `lastviewport`, `useragent`, `config`, `currencyFactor`) VALUES
+(1, 'Münsterländer Aperitif 16%', 3, 'SW10003', 0, 1, 14.95, 12.563025210084, 19, '2019-04-05 09:09:54', 0, 0, '', 'account', 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.86 Safari/537.36', '', 1),
+(1, 'Warenkorbrabatt', 0, 'SHIPPINGDISCOUNT', 0, 1, -2, -1.68, 19, '2019-04-05 09:10:30', 4, 0, '', '', '', '', 1);
diff --git a/tests/Functional/Components/CheckoutTest.php b/tests/Functional/Components/CheckoutTestCase.php
similarity index 61%
rename from tests/Functional/Components/CheckoutTest.php
rename to tests/Functional/Components/CheckoutTestCase.php
index d723a1310c4..b4e286d8ae9 100644
--- a/tests/Functional/Components/CheckoutTest.php
+++ b/tests/Functional/Components/CheckoutTestCase.php
@@ -1,51 +1,49 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components;
 
 use Doctrine\DBAL\Connection;
-use Enlight_Components_Test_Controller_TestCase;
-use Enlight_Controller_Request_RequestHttp;
+use Enlight_Components_Test_Controller_TestCase as ControllerTestCase;
 use Shopware\Components\Random;
-use Shopware\Components\ShopRegistrationServiceInterface;
-use Shopware\Models\Shop\Repository;
-use Shopware\Models\Shop\Shop;
 use Shopware\Tests\Functional\Bundle\StoreFrontBundle\Helper;
 use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\CustomerLoginTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 
-abstract class CheckoutTest extends Enlight_Components_Test_Controller_TestCase
+abstract class CheckoutTestCase extends ControllerTestCase
 {
     use ContainerTrait;
+    use CustomerLoginTrait;
+    use DatabaseTransactionBehaviour;
 
     public const USER_AGENT = 'Mozilla/5.0 (Android; Tablet; rv:14.0) Gecko/14.0 Firefox/14.0';
 
-    public $clearBasketOnReset = true;
+    public bool $clearBasketOnReset = true;
 
-    /**
-     * @var Helper
-     */
-    protected $apiHelper;
+    protected Helper $apiHelper;
 
     public function setUp(): void
     {
@@ -53,13 +51,7 @@ public function setUp(): void
         $this->apiHelper = new Helper($this->getContainer());
     }
 
-    protected function tearDown(): void
-    {
-        parent::tearDown();
-        $this->apiHelper->cleanUp();
-    }
-
-    public function reset()
+    public function reset(): void
     {
         parent::reset();
 
@@ -70,13 +62,7 @@ public function reset()
         $this->Request()->setHeader('User-Agent', self::USER_AGENT);
     }
 
-    /**
-     * @param int   $price
-     * @param float $taxRate
-     *
-     * @return string
-     */
-    protected function createArticle($price = 10, $taxRate = 19.0)
+    protected function createProduct(float $price = 10, float $taxRate = 19.0): string
     {
         $orderNumber = 'swTEST' . uniqid((string) rand());
 
@@ -111,9 +97,9 @@ protected function createArticle($price = 10, $taxRate = 19.0)
         return $orderNumber;
     }
 
-    protected function updateProductPrice($orderNumber, $price, $taxRate)
+    protected function updateProductPrice(string $orderNumber, float $price, float $taxRate): void
     {
-        $this->apiHelper->updateArticle($orderNumber, [
+        $this->apiHelper->updateProduct($orderNumber, [
             'mainDetail' => [
                 'prices' => [
                     [
@@ -129,13 +115,9 @@ protected function updateProductPrice($orderNumber, $price, $taxRate)
     }
 
     /**
-     * @param float $value
-     * @param int   $taxId
-     * @param int   $percent
-     *
-     * @return string
+     * @param 0|1 $percental
      */
-    protected function createVoucher($value, $taxId, $percent = 1)
+    protected function createVoucher(float $value, int $taxId, int $percental = 1): string
     {
         $code = Random::getAlphanumericString(12);
         $this->getContainer()->get(Connection::class)
@@ -149,21 +131,17 @@ protected function createVoucher($value, $taxId, $percent = 1)
                 'ordercode' => $code,
                 'modus' => 0,
                 'numorder' => 1000,
-                'percental' => $percent,
-                'taxconfig' => $taxId,
+                'percental' => $percental,
+                'taxconfig' => (string) $taxId,
             ]);
 
         return $code;
     }
 
     /**
-     * @param array  $sBasket
-     * @param string $itemName
-     * @param float  $itemPrice
-     * @param float  $itemNetPrice
-     * @param string $itemOrdernumber
+     * @param array<array<string, mixed>> $sBasket
      */
-    protected function hasBasketItem($sBasket, $itemName, $itemPrice, $itemNetPrice, $itemOrdernumber)
+    protected function hasBasketItem(array $sBasket, string $itemName, float $itemPrice, float $itemNetPrice, string $itemOrdernumber): void
     {
         $cartItemFound = false;
         foreach ($sBasket as $item) {
@@ -178,16 +156,11 @@ protected function hasBasketItem($sBasket, $itemName, $itemPrice, $itemNetPrice,
         }
 
         if (!$cartItemFound) {
-            static::fail(sprintf('Cart item by name "%s" not found', $itemName));
+            static::fail(\sprintf('Cart item by name "%s" not found', $itemName));
         }
     }
 
-    /**
-     * @param int    $surchargeAbsolute
-     * @param int    $surchargePercent
-     * @param string $surchargeCountry
-     */
-    protected function setPaymentSurcharge($surchargeAbsolute, $surchargePercent = 0, $surchargeCountry = '')
+    protected function setPaymentSurcharge(float $surchargeAbsolute, float $surchargePercent = 0.0, string $surchargeCountry = ''): void
     {
         $this->getContainer()->get(Connection::class)->executeQuery('UPDATE s_core_paymentmeans SET surcharge = ?, debit_percent = ?, surchargestring = ?', [
             $surchargeAbsolute,
@@ -196,11 +169,7 @@ protected function setPaymentSurcharge($surchargeAbsolute, $surchargePercent = 0
         ]);
     }
 
-    /**
-     * @param float $minOrderValue
-     * @param float $surcharge
-     */
-    protected function setCustomerGroupSurcharge($minOrderValue, $surcharge)
+    protected function setCustomerGroupSurcharge(float $minOrderValue, float $surcharge): void
     {
         $this->getContainer()->get(Connection::class)->executeQuery('UPDATE s_core_customergroups SET minimumorder = ?, minimumordersurcharge = ?', [
             $minOrderValue,
@@ -208,12 +177,7 @@ protected function setCustomerGroupSurcharge($minOrderValue, $surcharge)
         ]);
     }
 
-    /**
-     * @param string $customerGroupKey
-     * @param float  $discountStart
-     * @param float  $discountValuePercent
-     */
-    protected function addCustomerGroupDiscount($customerGroupKey, $discountStart, $discountValuePercent)
+    protected function addCustomerGroupDiscount(string $customerGroupKey, float $discountStart, float $discountValuePercent): void
     {
         $this->clearCustomerGroupDiscount($customerGroupKey);
         $this->getContainer()->get(Connection::class)->executeQuery('INSERT INTO s_core_customergroups_discounts VALUES (null, (SELECT id FROM s_core_customergroups WHERE groupkey = ?), ?, ?)', [
@@ -223,19 +187,12 @@ protected function addCustomerGroupDiscount($customerGroupKey, $discountStart, $
         ]);
     }
 
-    /**
-     * @param string $customerGroupKey
-     */
-    protected function clearCustomerGroupDiscount($customerGroupKey)
+    protected function clearCustomerGroupDiscount(string $customerGroupKey): void
     {
         $this->getContainer()->get(Connection::class)->executeQuery('DELETE FROM s_core_customergroups_discounts WHERE groupID = (SELECT id FROM s_core_customergroups WHERE groupkey = ?)', [$customerGroupKey]);
     }
 
-    /**
-     * @param string $orderCode
-     * @param string $taxConfig
-     */
-    protected function setVoucherTax($orderCode, $taxConfig)
+    protected function setVoucherTax(string $orderCode, string $taxConfig): void
     {
         $this->getContainer()->get(Connection::class)->update('s_emarketing_vouchers', [
             'taxconfig' => $taxConfig,
@@ -244,32 +201,17 @@ protected function setVoucherTax($orderCode, $taxConfig)
         ]);
     }
 
-    /**
-     * Login as a frontend user
-     */
-    protected function loginFrontendUser(string $group = 'EK')
+    protected function loginCustomerOfGroup(string $group = 'EK'): void
     {
-        Shopware()->Front()->setRequest(new Enlight_Controller_Request_RequestHttp());
-        $user = Shopware()->Db()->fetchRow(
+        $customer = Shopware()->Db()->fetchRow(
             'SELECT id, email, password, subshopID, language FROM s_user WHERE customergroup = ? LIMIT 1',
             $group
         );
 
-        /** @var Repository $repository */
-        $repository = Shopware()->Models()->getRepository(Shop::class);
-        $shop = $repository->getActiveById($user['language']);
-
-        $this->getContainer()->get(ShopRegistrationServiceInterface::class)->registerShop($shop);
-
-        Shopware()->Session()->set('Admin', true);
-        Shopware()->System()->_POST = [
-            'email' => $user['email'],
-            'passwordMD5' => $user['password'],
-        ];
-        Shopware()->Modules()->Admin()->sLogin(true);
+        $this->loginCustomer(null, (int) $customer['id'], $customer['email'], null, 2, 3, $group);
     }
 
-    protected function addProduct($productNumber, $quantity = 1)
+    protected function addProduct(string $productNumber, int $quantity = 1): void
     {
         $this->reset();
         $this->Request()->setMethod('POST');
@@ -279,20 +221,20 @@ protected function addProduct($productNumber, $quantity = 1)
         $this->dispatch('/checkout/addArticle');
     }
 
-    protected function visitCart()
+    protected function visitCart(): void
     {
         $this->reset();
         $this->dispatch('/checkout/cart');
     }
 
-    protected function visitConfirm()
+    protected function visitConfirm(): void
     {
         $this->reset();
         $this->Request()->setMethod('POST');
         $this->dispatch('/checkout/confirm');
     }
 
-    protected function visitFinish()
+    protected function visitFinish(): void
     {
         $this->reset();
         $this->Request()->setMethod('POST');
diff --git a/tests/Functional/Components/Config/ConfigTest.php b/tests/Functional/Components/Config/ConfigTest.php
index 562704d6754..d5421827522 100644
--- a/tests/Functional/Components/Config/ConfigTest.php
+++ b/tests/Functional/Components/Config/ConfigTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Config;
diff --git a/tests/Functional/Components/Config/ShopwareConfigTest.php b/tests/Functional/Components/Config/ShopwareConfigTest.php
index fb8fea2fcae..22f018d01c8 100644
--- a/tests/Functional/Components/Config/ShopwareConfigTest.php
+++ b/tests/Functional/Components/Config/ShopwareConfigTest.php
@@ -1,117 +1,99 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+namespace Shopware\Tests\Functional\Components\Config;
+
+use Enlight_Components_Test_TestCase;
+use Shopware\Components\Model\ModelManager;
 use Shopware\Models\Config\Form;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
 use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
+use Zend_Cache_Core;
 
 class ShopwareConfigTest extends Enlight_Components_Test_TestCase
 {
+    use ContainerTrait;
     use DatabaseTransactionBehaviour;
 
-    /**
-     * Random plugin id that should be unique
-     */
     public const PLUGIN_ID = 20095;
-    public const PLUGIN_NAME = 'Testplugin';
+    public const PLUGIN_NAME = 'TestPlugin';
+
+    private ModelManager $modelManager;
 
-    /**
-     * @throws \Doctrine\ORM\ORMException
-     * @throws \Doctrine\ORM\OptimisticLockException
-     */
     protected function setUp(): void
     {
         parent::setUp();
 
-        $form = $this->initForm();
-        $form->setElement('text', 'mail', ['value' => 'other@email.org']);
-        $form->setElement('number', 'sometestkey', ['value' => 0]);
+        $this->modelManager = $this->getContainer()->get(ModelManager::class);
+        $this->createForm();
 
-        Shopware()->Models()->flush();
-
-        // force reload from database
-        Shopware()->Container()->reset('cache');
-        Shopware()->Container()->reset('config');
+        $this->getContainer()->get(Zend_Cache_Core::class)->clean();
+        $this->getContainer()->get('config')->setShop($this->getContainer()->get('shop'));
     }
 
-    /**
-     * @throws \Doctrine\DBAL\DBALException
-     */
     protected function tearDown(): void
     {
-        // force reload from database
-        Shopware()->Container()->reset('cache');
-        Shopware()->Container()->reset('config');
+        $form = $this->modelManager->getRepository(Form::class)->findOneBy(['name' => self::PLUGIN_NAME]);
+        static::assertInstanceOf(Form::class, $form);
+        $this->modelManager->remove($form);
+        $this->modelManager->flush($form);
 
         parent::tearDown();
     }
 
-    /**
-     * Test case
-     */
-    public function testCoreConfigIgnored()
+    public function testCoreConfigIgnored(): void
     {
-        static::assertNotEquals('other@email.org', Shopware()->Config()->get('mail'));
+        static::assertNotEquals('other@email.org', $this->getContainer()->get('config')->get('mail'));
     }
 
-    /**
-     * Test case
-     */
-    public function testCoreConfigNoCollision()
+    public function testCoreConfigNoCollision(): void
     {
-        static::assertEquals(0, Shopware()->Config()->get('sometestkey'));
+        static::assertSame(123, $this->getContainer()->get('config')->get('sometestkey'));
     }
 
-    /**
-     * Test case
-     */
-    public function testCoreConfigPrefixed()
+    public function testCoreConfigPrefixed(): void
     {
-        static::assertEquals('other@email.org', Shopware()->Config()->get(static::PLUGIN_NAME . '::mail'));
+        static::assertSame('other@email.org', $this->getContainer()->get('config')->get(static::PLUGIN_NAME . '::mail'));
     }
 
-    protected function initForm()
+    private function createForm(): void
     {
-        $repo = Shopware()->Models()->getRepository(Form::class);
-        $form = $repo->findOneBy(['name' => self::PLUGIN_NAME]);
-
-        if (!$form) {
-            $form = new Form();
-            $form->setPluginId(static::PLUGIN_ID);
+        $form = new Form();
+        $form->setPluginId(static::PLUGIN_ID);
 
-            $form->setName(self::PLUGIN_NAME);
-            $form->setLabel(self::PLUGIN_NAME);
-            $form->setDescription('');
+        $form->setName(self::PLUGIN_NAME);
+        $form->setLabel(self::PLUGIN_NAME);
+        $form->setDescription('');
 
-            /** @var Form $parent */
-            $parent = $repo->findOneBy([
-                'name' => 'Other',
-            ]);
+        $parent = $this->modelManager->getRepository(Form::class)->findOneBy(['name' => 'Other']);
 
-            $form->setParent($parent);
-            Shopware()->Models()->persist($form);
-        }
+        $form->setParent($parent);
+        $form->setElement('text', 'mail', ['value' => 'other@email.org']);
+        $form->setElement('number', 'sometestkey', ['value' => 123]);
 
-        return $form;
+        $this->modelManager->persist($form);
+        $this->modelManager->flush($form);
     }
 }
diff --git a/tests/Functional/Components/Console/ApplicationTest.php b/tests/Functional/Components/Console/ApplicationTest.php
new file mode 100644
index 00000000000..ba7a5f5a994
--- /dev/null
+++ b/tests/Functional/Components/Console/ApplicationTest.php
@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Components\Console;
+
+use PHPUnit\Framework\TestCase;
+use Shopware\Components\Console\Application;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Symfony\Component\Console\Input\StringInput;
+use Symfony\Component\Console\Output\BufferedOutput;
+
+class ApplicationTest extends TestCase
+{
+    use ContainerTrait;
+
+    public function testDoRun(): void
+    {
+        $kernel = $this->getContainer()->get('kernel');
+        $consoleApplication = new Application($kernel);
+        $input = new StringInput('_completion --generate-hook --shell-type=bash');
+        $output = new BufferedOutput();
+        $consoleApplication->doRun($input, $output);
+
+        static::assertStringContainsString('_completion', $output->fetch());
+    }
+}
diff --git a/tests/Functional/Components/DependencyInjection/Bridge/CacheTest.php b/tests/Functional/Components/DependencyInjection/Bridge/CacheTest.php
index 26d7a87931d..bd3e5903da0 100644
--- a/tests/Functional/Components/DependencyInjection/Bridge/CacheTest.php
+++ b/tests/Functional/Components/DependencyInjection/Bridge/CacheTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\DependencyInjection\Bridge;
@@ -37,140 +36,125 @@ class CacheTest extends TestCase
 
     private ShopwareReleaseStruct $release;
 
-    public function setUp(): void
+    private string $testDir;
+
+    private string $cacheDirectory;
+
+    private string $cacheFile;
+
+    protected function setUp(): void
     {
         $this->release = new ShopwareReleaseStruct('5.5.0', '', '4711');
+        $this->testDir = $this->createTestDir();
+        $this->cacheDirectory = $this->testDir . '/shopware_test--0';
+        $this->cacheFile = $this->cacheDirectory . '/shopware_test---bar';
+    }
+
+    protected function tearDown(): void
+    {
+        $this->deleteDirectory($this->testDir);
     }
 
     public function testWorldReadWriteExecutable(): void
     {
-        $testDir = sys_get_temp_dir() . '/umask-test';
         $options = [
             'hashed_directory_perm' => 0777 & ~umask(),
             'cache_file_perm' => 0666 & ~umask(),
             'hashed_directory_level' => 1,
-            'cache_dir' => $testDir,
+            'cache_dir' => $this->testDir,
             'file_name_prefix' => 'shopware_test',
         ];
 
-        mkdir($testDir);
-
-        $cache = (new Cache())->factory('file', [
-            'automatic_serialization' => true,
-        ], $options, $this->release);
-        $cache->save('foo', 'bar');
-
-        $cacheDirectory = $testDir . '/shopware_test--0';
-        $cacheFile = $cacheDirectory . '/shopware_test---bar';
+        $this->createCache($options);
 
-        $dirPermissions = fileperms($cacheDirectory) & 0777;
-        $filePermissions = fileperms($cacheFile) & 0777;
-
-        static::assertFileExists($cacheDirectory);
-        static::assertFileExists($cacheFile);
-
-        static::assertEquals($options['hashed_directory_perm'], $dirPermissions);
-        static::assertEquals($options['cache_file_perm'], $filePermissions);
-
-        $this->deleteDirectory($testDir);
+        $this->assertCacheDirectory($options);
     }
 
     public function testUserReadWriteExecutable(): void
     {
-        $testDir = sys_get_temp_dir() . '/umask-test';
         $options = [
             'hashed_directory_perm' => 0700 & ~umask(),
             'cache_file_perm' => 0600 & ~umask(),
             'hashed_directory_level' => 1,
-            'cache_dir' => $testDir,
+            'cache_dir' => $this->testDir,
             'file_name_prefix' => 'shopware_test',
         ];
 
-        mkdir($testDir);
-
-        $cache = (new Cache())->factory('file', [
-            'automatic_serialization' => true,
-        ], $options, $this->release);
-        $cache->save('foo', 'bar');
-
-        $cacheDirectory = $testDir . '/shopware_test--0';
-        $cacheFile = $cacheDirectory . '/shopware_test---bar';
-
-        $dirPermissions = fileperms($cacheDirectory) & 0777;
-        $filePermissions = fileperms($cacheFile) & 0777;
-
-        static::assertFileExists($cacheDirectory);
-        static::assertFileExists($cacheFile);
-
-        static::assertEquals($options['hashed_directory_perm'], $dirPermissions);
-        static::assertEquals($options['cache_file_perm'], $filePermissions);
+        $this->createCache($options);
 
-        $this->deleteDirectory($testDir);
+        $this->assertCacheDirectory($options);
     }
 
     public function testMixedReadWriteExecutable(): void
     {
-        $testDir = sys_get_temp_dir() . '/umask-test';
         $options = [
             'hashed_directory_perm' => 0755 & ~umask(),
             'cache_file_perm' => 0600 & ~umask(),
             'hashed_directory_level' => 1,
-            'cache_dir' => $testDir,
+            'cache_dir' => $this->testDir,
             'file_name_prefix' => 'shopware_test',
         ];
 
-        mkdir($testDir);
-
-        $cache = (new Cache())->factory('file', [
-            'automatic_serialization' => true,
-        ], $options, $this->release);
-        $cache->save('foo', 'bar');
-
-        $cacheDirectory = $testDir . '/shopware_test--0';
-        $cacheFile = $cacheDirectory . '/shopware_test---bar';
+        $this->createCache($options);
 
-        $dirPermissions = fileperms($cacheDirectory) & 0777;
-        $filePermissions = fileperms($cacheFile) & 0777;
-
-        static::assertFileExists($cacheDirectory);
-        static::assertFileExists($cacheFile);
-
-        static::assertEquals($options['hashed_directory_perm'], $dirPermissions);
-        static::assertEquals($options['cache_file_perm'], $filePermissions);
-
-        $this->deleteDirectory($testDir);
+        $this->assertCacheDirectory($options);
     }
 
     public function testWorldReadWriteExecutableAsString(): void
     {
-        $testDir = sys_get_temp_dir() . '/umask-test';
         $options = [
             'hashed_directory_perm' => '0777',
             'cache_file_perm' => '0666',
             'hashed_directory_level' => 1,
-            'cache_dir' => $testDir,
+            'cache_dir' => $this->testDir,
             'file_name_prefix' => 'shopware_test',
         ];
 
-        mkdir($testDir);
+        $this->createCache($options);
+
+        $dirPermissions = fileperms($this->cacheDirectory) & 0777;
+        $filePermissions = fileperms($this->cacheFile) & 0777;
+
+        static::assertFileExists($this->cacheDirectory);
+        static::assertFileExists($this->cacheFile);
 
+        static::assertSame(octdec($options['hashed_directory_perm']), $dirPermissions);
+        static::assertSame(octdec($options['cache_file_perm']), $filePermissions);
+    }
+
+    private function createTestDir(): string
+    {
+        $testDir = sys_get_temp_dir() . '/umask-test';
+        if (!is_dir($testDir)) {
+            mkdir($testDir);
+        }
+
+        return $testDir;
+    }
+
+    /**
+     * @param array<string, mixed> $options
+     */
+    private function createCache(array $options): void
+    {
         $cache = (new Cache())->factory('file', [
             'automatic_serialization' => true,
         ], $options, $this->release);
         $cache->save('foo', 'bar');
+    }
 
-        $cacheDirectory = $testDir . '/shopware_test--0';
-        $cacheFile = $cacheDirectory . '/shopware_test---bar';
-
-        $dirPermissions = fileperms($cacheDirectory) & 0777;
-        $filePermissions = fileperms($cacheFile) & 0777;
-
-        static::assertFileExists($cacheDirectory);
-        static::assertFileExists($cacheFile);
+    /**
+     * @param array<string, mixed> $options
+     */
+    private function assertCacheDirectory(array $options): void
+    {
+        $dirPermissions = fileperms($this->cacheDirectory) & 0777;
+        $filePermissions = fileperms($this->cacheFile) & 0777;
 
-        static::assertEquals(octdec($options['hashed_directory_perm']), $dirPermissions);
-        static::assertEquals(octdec($options['cache_file_perm']), $filePermissions);
+        static::assertFileExists($this->cacheDirectory);
+        static::assertFileExists($this->cacheFile);
 
-        $this->deleteDirectory($testDir);
+        static::assertSame($options['hashed_directory_perm'], $dirPermissions);
+        static::assertSame($options['cache_file_perm'], $filePermissions);
     }
 }
diff --git a/tests/Functional/Components/DependencyInjection/Bridge/DbTest.php b/tests/Functional/Components/DependencyInjection/Bridge/DbTest.php
new file mode 100644
index 00000000000..3a4b03cb00c
--- /dev/null
+++ b/tests/Functional/Components/DependencyInjection/Bridge/DbTest.php
@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Components\DependencyInjection\Bridge;
+
+use PHPUnit\Framework\TestCase;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+
+class DbTest extends TestCase
+{
+    use ContainerTrait;
+
+    public function testIntsAreReturnedAsStringsFromTheDB(): void
+    {
+        $database = $this->getContainer()->get('db');
+
+        $result = $database->fetchOne('Select 1');
+
+        static::assertIsString($result);
+    }
+
+    public function testIntsAreReturnedAsStringsFromTheConnectionTest(): void
+    {
+        $database = $this->getContainer()->get('dbal_connection');
+
+        $result = $database->fetchOne('Select 1');
+
+        static::assertIsString($result);
+    }
+}
diff --git a/tests/Functional/Components/DependencyInjection/Compiler/ConfigureApiResourcesPassTest.php b/tests/Functional/Components/DependencyInjection/Compiler/ConfigureApiResourcesPassTest.php
index f0e28d50b39..e96d2550ecd 100644
--- a/tests/Functional/Components/DependencyInjection/Compiler/ConfigureApiResourcesPassTest.php
+++ b/tests/Functional/Components/DependencyInjection/Compiler/ConfigureApiResourcesPassTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\DependencyInjection\Compiler;
diff --git a/tests/Functional/Components/DependencyInjection/Compiler/ConfigureContainerAwareCommandsTest.php b/tests/Functional/Components/DependencyInjection/Compiler/ConfigureContainerAwareCommandsTest.php
index 022582e77a1..df92a2ffd6c 100644
--- a/tests/Functional/Components/DependencyInjection/Compiler/ConfigureContainerAwareCommandsTest.php
+++ b/tests/Functional/Components/DependencyInjection/Compiler/ConfigureContainerAwareCommandsTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\DependencyInjection\Compiler;
diff --git a/tests/Functional/Components/DependencyInjection/Compiler/LegacyApiResourcesPassTest.php b/tests/Functional/Components/DependencyInjection/Compiler/LegacyApiResourcesPassTest.php
index d2d40601f18..bd11a7f9191 100644
--- a/tests/Functional/Components/DependencyInjection/Compiler/LegacyApiResourcesPassTest.php
+++ b/tests/Functional/Components/DependencyInjection/Compiler/LegacyApiResourcesPassTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\DependencyInjection\Compiler;
@@ -45,7 +44,7 @@ public function testLegacyServiceGettingAssigned(): void
         $container
             ->register('shopware.api.mynewresource.hasalreadytag')
             ->setClass(Article::class)
-            ->setTags(['shopware.api.mynewresource.hasalreadytag'])
+            ->setTags(['shopware.api.mynewresource.hasalreadytag' => ['attr' => ['foo']]])
             ->setPublic(true);
 
         $container->compile();
diff --git a/tests/Functional/Components/DependencyInjection/ContainerTest.php b/tests/Functional/Components/DependencyInjection/ContainerTest.php
index e9216ad5c3a..aef5fe93959 100644
--- a/tests/Functional/Components/DependencyInjection/ContainerTest.php
+++ b/tests/Functional/Components/DependencyInjection/ContainerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\DependencyInjection;
diff --git a/tests/Functional/Components/DependencyInjection/DecoratingService.php b/tests/Functional/Components/DependencyInjection/DecoratingService.php
index 8194fe02fcd..07ec7f46c9a 100644
--- a/tests/Functional/Components/DependencyInjection/DecoratingService.php
+++ b/tests/Functional/Components/DependencyInjection/DecoratingService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\DependencyInjection;
diff --git a/tests/Functional/Components/DependencyInjection/LegacyPhpDumperTest.php b/tests/Functional/Components/DependencyInjection/LegacyPhpDumperTest.php
index 764b829fe8f..f0da0bc4c69 100644
--- a/tests/Functional/Components/DependencyInjection/LegacyPhpDumperTest.php
+++ b/tests/Functional/Components/DependencyInjection/LegacyPhpDumperTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\DependencyInjection;
@@ -59,12 +58,12 @@ public function testGetServiceCallShouldNotFireEventForPrivateServices(): void
         $testContainer = new TestContainerLegacyPhpDumperTest();
 
         $privateCalled = false;
-        $testContainer->get('events')->addListener(sprintf('Enlight_Bootstrap_InitResource_%s', PrivateTestService::class), function () use (&$privateCalled) {
+        $testContainer->get('events')->addListener(\sprintf('Enlight_Bootstrap_InitResource_%s', PrivateTestService::class), function () use (&$privateCalled) {
             $privateCalled = true;
         });
 
         $publicCalled = false;
-        $testContainer->get('events')->addListener(sprintf('Enlight_Bootstrap_InitResource_%s', PublicTestService::class), function () use (&$publicCalled) {
+        $testContainer->get('events')->addListener(\sprintf('Enlight_Bootstrap_InitResource_%s', PublicTestService::class), function () use (&$publicCalled) {
             $publicCalled = true;
         });
 
diff --git a/tests/Functional/Components/DependencyInjection/OriginalService.php b/tests/Functional/Components/DependencyInjection/OriginalService.php
index 8fcd58320ff..ca6de3cd1e2 100644
--- a/tests/Functional/Components/DependencyInjection/OriginalService.php
+++ b/tests/Functional/Components/DependencyInjection/OriginalService.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\DependencyInjection;
diff --git a/tests/Functional/Components/DependencyInjection/_fixtures/PrivateTestService.php b/tests/Functional/Components/DependencyInjection/_fixtures/PrivateTestService.php
index 27492c38bc2..a8d4c5065fd 100644
--- a/tests/Functional/Components/DependencyInjection/_fixtures/PrivateTestService.php
+++ b/tests/Functional/Components/DependencyInjection/_fixtures/PrivateTestService.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\DependencyInjection\_fixtures;
diff --git a/tests/Functional/Components/DependencyInjection/_fixtures/PublicTestService.php b/tests/Functional/Components/DependencyInjection/_fixtures/PublicTestService.php
index cea05e83646..e7658583516 100644
--- a/tests/Functional/Components/DependencyInjection/_fixtures/PublicTestService.php
+++ b/tests/Functional/Components/DependencyInjection/_fixtures/PublicTestService.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\DependencyInjection\_fixtures;
diff --git a/tests/Functional/Components/Emotion/Preset/EmotionToPresetDataTransformerTest.php b/tests/Functional/Components/Emotion/Preset/EmotionToPresetDataTransformerTest.php
index b09a3b6fbef..9d539bc7a42 100644
--- a/tests/Functional/Components/Emotion/Preset/EmotionToPresetDataTransformerTest.php
+++ b/tests/Functional/Components/Emotion/Preset/EmotionToPresetDataTransformerTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Emotion\Preset;
@@ -32,12 +31,17 @@
 use ReflectionMethod;
 use Shopware\Components\Emotion\Preset\EmotionToPresetDataTransformer;
 use Shopware\Components\Emotion\Preset\EmotionToPresetDataTransformerInterface;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 
 /**
  * @group EmotionPreset
  */
 class EmotionToPresetDataTransformerTest extends TestCase
 {
+    use ContainerTrait;
+    use DatabaseTransactionBehaviour;
+
     /**
      * @var EmotionToPresetDataTransformer
      */
@@ -50,18 +54,12 @@ class EmotionToPresetDataTransformerTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->connection = Shopware()->Container()->get(Connection::class);
-        $this->connection->beginTransaction();
+        $this->connection = $this->getContainer()->get(Connection::class);
 
         $this->connection->executeQuery('DELETE FROM s_emotion_presets');
         $this->connection->executeQuery('DELETE FROM s_core_plugins');
 
-        $this->transformer = Shopware()->Container()->get(EmotionToPresetDataTransformerInterface::class);
-    }
-
-    protected function tearDown(): void
-    {
-        $this->connection->rollBack();
+        $this->transformer = $this->getContainer()->get(EmotionToPresetDataTransformerInterface::class);
     }
 
     public function testShouldFailBecauseOfMissingEmotion(): void
diff --git a/tests/Functional/Components/Emotion/Preset/PresetDataSynchronizerTest.php b/tests/Functional/Components/Emotion/Preset/PresetDataSynchronizerTest.php
index 09764c1389e..206ff494792 100644
--- a/tests/Functional/Components/Emotion/Preset/PresetDataSynchronizerTest.php
+++ b/tests/Functional/Components/Emotion/Preset/PresetDataSynchronizerTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Emotion\Preset;
@@ -32,48 +31,38 @@
 use Shopware\Components\Emotion\Preset\Exception\PresetAssetImportException;
 use Shopware\Components\Emotion\Preset\PresetDataSynchronizer;
 use Shopware\Components\Emotion\Preset\PresetDataSynchronizerInterface;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 
 /**
  * @group EmotionPreset
  */
 class PresetDataSynchronizerTest extends TestCase
 {
-    /**
-     * @var PresetDataSynchronizer
-     */
-    private $synchronizerService;
+    use ContainerTrait;
+    use DatabaseTransactionBehaviour;
 
-    /**
-     * @var EmotionPreset
-     */
-    private $presetResource;
+    private PresetDataSynchronizer $synchronizerService;
 
-    /**
-     * @var Connection
-     */
-    private $connection;
+    private EmotionPreset $presetResource;
+
+    private Connection $connection;
 
     private string $imageData;
 
     protected function setUp(): void
     {
-        $this->connection = Shopware()->Container()->get(Connection::class);
-        $this->connection->beginTransaction();
+        $this->connection = $this->getContainer()->get(Connection::class);
 
         $this->connection->executeQuery('DELETE FROM s_emotion_presets');
         $this->connection->executeQuery('DELETE FROM s_core_plugins');
 
-        $this->synchronizerService = Shopware()->Container()->get(PresetDataSynchronizerInterface::class);
-        $this->presetResource = Shopware()->Container()->get(EmotionPreset::class);
+        $this->synchronizerService = $this->getContainer()->get(PresetDataSynchronizerInterface::class);
+        $this->presetResource = $this->getContainer()->get(EmotionPreset::class);
 
         $this->imageData = 'data:image/gif;base64,R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs=';
     }
 
-    protected function tearDown(): void
-    {
-        $this->connection->rollBack();
-    }
-
     public function testAssetImportWithPresetAlreadyImported(): void
     {
         $preset = $this->presetResource->create(['name' => 'test', 'presetData' => '[]', 'assetsImported' => true]);
diff --git a/tests/Functional/Components/Emotion/Preset/PresetInstallerTest.php b/tests/Functional/Components/Emotion/Preset/PresetInstallerTest.php
index 5a7c6a30ae8..48e4adae570 100644
--- a/tests/Functional/Components/Emotion/Preset/PresetInstallerTest.php
+++ b/tests/Functional/Components/Emotion/Preset/PresetInstallerTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Emotion\Preset;
@@ -30,43 +29,34 @@
 use PHPUnit\Framework\TestCase;
 use Shopware\Components\Emotion\Preset\PresetInstaller;
 use Shopware\Components\Emotion\Preset\PresetMetaDataInterface;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 
 /**
  * @group EmotionPreset
  */
 class PresetInstallerTest extends TestCase
 {
-    /**
-     * @var PresetInstaller
-     */
-    private $presetInstaller;
+    use ContainerTrait;
+    use DatabaseTransactionBehaviour;
 
-    /**
-     * @var Connection
-     */
-    private $connection;
+    private PresetInstaller $presetInstaller;
+
+    private Connection $connection;
 
     protected function setUp(): void
     {
-        $this->connection = Shopware()->Container()->get(Connection::class);
-        $this->connection->beginTransaction();
+        $this->connection = $this->getContainer()->get(Connection::class);
 
         $this->connection->executeQuery('DELETE FROM s_emotion_presets');
-        $this->connection->executeQuery('DELETE FROM s_core_plugins');
-
-        $this->presetInstaller = Shopware()->Container()->get('shopware.emotion.preset_installer');
-    }
 
-    protected function tearDown(): void
-    {
-        $this->connection->rollBack();
+        $this->presetInstaller = $this->getContainer()->get('shopware.emotion.preset_installer');
     }
 
     public function testPresetInstallationShouldSucceedWithEmptyPresetData(): void
     {
         $presetMetaData = $this->buildMetaDataMock('foo');
 
-        static::assertInstanceOf(PresetMetaDataInterface::class, $presetMetaData);
         $this->presetInstaller->installOrUpdate([$presetMetaData]);
         $presets = $this->connection->fetchAllAssociative('SELECT * FROM s_emotion_presets');
 
@@ -80,7 +70,6 @@ public function testPresetUpdateShouldSucceedWithEmptyPresetData(): void
         $presetMetaData = $this->buildMetaDataMock('foo');
         $presetMetaDataUpdate = $this->buildMetaDataMock('foo', true);
 
-        static::assertInstanceOf(PresetMetaDataInterface::class, $presetMetaData);
         $this->presetInstaller->installOrUpdate([$presetMetaData]);
         $presets = $this->connection->fetchAllAssociative('SELECT * FROM s_emotion_presets');
 
diff --git a/tests/Functional/Components/Emotion/Preset/PresetLoaderTest.php b/tests/Functional/Components/Emotion/Preset/PresetLoaderTest.php
index 07c9bcbb2ca..e8e8e086181 100644
--- a/tests/Functional/Components/Emotion/Preset/PresetLoaderTest.php
+++ b/tests/Functional/Components/Emotion/Preset/PresetLoaderTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Emotion\Preset;
diff --git a/tests/Functional/Components/HttpCache/CacheRouteInstallerTest.php b/tests/Functional/Components/HttpCache/CacheRouteInstallerTest.php
index 2939e0e4b1b..15c728ccfd2 100644
--- a/tests/Functional/Components/HttpCache/CacheRouteInstallerTest.php
+++ b/tests/Functional/Components/HttpCache/CacheRouteInstallerTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\HttpCache;
diff --git a/tests/Functional/Components/LegacyRequestWrapper/GetWrapperTest.php b/tests/Functional/Components/LegacyRequestWrapper/GetWrapperTest.php
index 2ec410eccda..1912d6c564a 100644
--- a/tests/Functional/Components/LegacyRequestWrapper/GetWrapperTest.php
+++ b/tests/Functional/Components/LegacyRequestWrapper/GetWrapperTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\LegacyRequestWrapper;
diff --git a/tests/Functional/Components/LegacyRequestWrapper/PostWrapperTest.php b/tests/Functional/Components/LegacyRequestWrapper/PostWrapperTest.php
index f518add0af0..3c8b38f1f32 100644
--- a/tests/Functional/Components/LegacyRequestWrapper/PostWrapperTest.php
+++ b/tests/Functional/Components/LegacyRequestWrapper/PostWrapperTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\LegacyRequestWrapper;
diff --git a/tests/Functional/Components/MailTest.php b/tests/Functional/Components/MailTest.php
new file mode 100644
index 00000000000..d0b5b32e8fb
--- /dev/null
+++ b/tests/Functional/Components/MailTest.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Components;
+
+use Enlight_Components_Mail;
+use PHPUnit\Framework\TestCase;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+
+class MailTest extends TestCase
+{
+    use ContainerTrait;
+
+    public function testMessageId(): void
+    {
+        $mailTransport = $this->getContainer()->get('mailtransport');
+
+        $mail = new Enlight_Components_Mail(null, 'test.com');
+        $mail->setBodyText('Test Hello');
+        $mail->addTo('test@example.com');
+
+        $mail->send($mailTransport);
+
+        $headers = $mail->getHeaders();
+        static::assertArrayHasKey('Message-Id', $headers);
+        $messageId = $headers['Message-Id'][0];
+        static::assertIsString($messageId);
+        static::assertStringContainsString('@test.com', $messageId);
+        static::assertStringStartsWith('<', $messageId);
+        static::assertStringEndsWith('>', $messageId);
+    }
+}
diff --git a/tests/Functional/Components/Migrations/Migrations_Migration1607Test.php b/tests/Functional/Components/Migrations/Migrations_Migration1607Test.php
index 6fa081db372..a613d518e12 100644
--- a/tests/Functional/Components/Migrations/Migrations_Migration1607Test.php
+++ b/tests/Functional/Components/Migrations/Migrations_Migration1607Test.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Migrations;
diff --git a/tests/Functional/Components/Model/CacheTest.php b/tests/Functional/Components/Model/CacheTest.php
index 5866affd134..89c3d4a8c65 100644
--- a/tests/Functional/Components/Model/CacheTest.php
+++ b/tests/Functional/Components/Model/CacheTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Model;
diff --git a/tests/Functional/Components/Model/GeneratorTest.php b/tests/Functional/Components/Model/GeneratorTest.php
index 31867067bc4..5092168f1c5 100644
--- a/tests/Functional/Components/Model/GeneratorTest.php
+++ b/tests/Functional/Components/Model/GeneratorTest.php
@@ -1,32 +1,36 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Model;
 
+use PHPUnit\Framework\TestCase;
+use Shopware\Bundle\AttributeBundle\Service\CrudService;
+use Shopware\Bundle\AttributeBundle\Service\CrudServiceInterface;
 use Shopware\Components\Model\Generator;
+use Shopware\Components\Model\ModelManager;
 
-class GeneratorTest extends \PHPUnit\Framework\TestCase
+class GeneratorTest extends TestCase
 {
     public const TEST_TABLE_NAME = 's_articles_attributes';
     public const TEST_ATTRIBUTE_FIELD_PREFIX = 'test_';
@@ -34,24 +38,24 @@ class GeneratorTest extends \PHPUnit\Framework\TestCase
     public const TEST_ATTRIBUTE_PROPERTY_NAME = 'testNotNullDefaultValueField';
 
     /**
-     * @var \Shopware\Components\Model\ModelManager
+     * @var ModelManager
      */
     public $em;
 
     /**
-     * @var \Shopware\Bundle\AttributeBundle\Service\CrudServiceInterface
+     * @var CrudServiceInterface
      */
     public $cs;
 
     /**
-     * @var \Shopware\Components\Model\Generator
+     * @var Generator
      */
     public $generator;
 
     public function setUp(): void
     {
         parent::setUp();
-        $this->cs = Shopware()->Container()->get(\Shopware\Bundle\AttributeBundle\Service\CrudService::class);
+        $this->cs = Shopware()->Container()->get(CrudService::class);
         $this->em = Shopware()->Models();
         $this->generator = new Generator(
             $this->em->getConnection()->getSchemaManager(),
diff --git a/tests/Functional/Components/MultiEdit/Resource/Product/BackupTest.php b/tests/Functional/Components/MultiEdit/Resource/Product/BackupTest.php
new file mode 100644
index 00000000000..b96fcf0b95f
--- /dev/null
+++ b/tests/Functional/Components/MultiEdit/Resource/Product/BackupTest.php
@@ -0,0 +1,60 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Components\MultiEdit\Resource\Product;
+
+use Doctrine\DBAL\Connection;
+use PHPUnit\Framework\TestCase;
+use Shopware\Components\MultiEdit\Resource\Product\Backup;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
+
+class BackupTest extends TestCase
+{
+    use DatabaseTransactionBehaviour;
+    use ContainerTrait;
+
+    private const FIXTURE_BACKUP_ID = 3;
+    private const FIXTURE_PRODUCT_ID = 3;
+    private const DIRECTORY_PLACEHOLDER = '__DIRECTORY__';
+
+    public function testBackupRestore(): void
+    {
+        /** @var Connection $connection */
+        $connection = $this->getContainer()->get(Connection::class);
+        $result = $connection->executeQuery('SELECT maxpurchase  FROM s_articles_details WHERE id = ' . self::FIXTURE_PRODUCT_ID)->fetchOne();
+        static::assertNotEquals(1, (int) $result);
+
+        $sql = file_get_contents(__DIR__ . '/fixtures/fixtures.sql');
+        static::assertIsString($sql);
+        $sql = str_replace(self::DIRECTORY_PLACEHOLDER, $this->getContainer()->getParameter('kernel.project_dir'), $sql);
+        $this->getContainer()->get('dbal_connection')->executeStatement($sql);
+
+        $this->getContainer()->get(Backup::class)->restore(self::FIXTURE_BACKUP_ID, 0);
+
+        $result = $connection->executeQuery('SELECT maxpurchase  FROM s_articles_details WHERE id = ' . self::FIXTURE_PRODUCT_ID)->fetchOne();
+        static::assertEquals(1, (int) $result);
+    }
+}
diff --git a/tests/Functional/Components/MultiEdit/Resource/Product/fixtures/fixtures.sql b/tests/Functional/Components/MultiEdit/Resource/Product/fixtures/fixtures.sql
new file mode 100644
index 00000000000..30678e42fa3
--- /dev/null
+++ b/tests/Functional/Components/MultiEdit/Resource/Product/fixtures/fixtures.sql
@@ -0,0 +1,2 @@
+INSERT INTO s_multi_edit_backup (id, filter_string, operation_string, items, date, size, path, hash) VALUES
+(3, 'ISMAIN', 'Detail.maxPurchase set 100', 1, '2022-09-05 15:41:12', 719, '__DIRECTORY__/tests/Functional/Components/MultiEdit/Resource/Product/fixtures/me-backup-1662385272/me-backup-1662385272.zip', 'fd2925e4400a49f4436ed29fd666ea63d0b131ff');
diff --git a/tests/Functional/Components/MultiEdit/Resource/Product/fixtures/me-backup-1662385272/me-backup-1662385272.zip b/tests/Functional/Components/MultiEdit/Resource/Product/fixtures/me-backup-1662385272/me-backup-1662385272.zip
new file mode 100644
index 00000000000..c9e9170ce51
Binary files /dev/null and b/tests/Functional/Components/MultiEdit/Resource/Product/fixtures/me-backup-1662385272/me-backup-1662385272.zip differ
diff --git a/tests/Functional/Components/NumberRangeIncrementerTest.php b/tests/Functional/Components/NumberRangeIncrementerTest.php
index 65dbca0af5f..77cd4d6ba86 100644
--- a/tests/Functional/Components/NumberRangeIncrementerTest.php
+++ b/tests/Functional/Components/NumberRangeIncrementerTest.php
@@ -1,64 +1,60 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components;
 
+use Doctrine\DBAL\Connection;
+use PHPUnit\Framework\TestCase;
 use RuntimeException;
 use Shopware\Components\NumberRangeIncrementer;
-use Shopware\Components\NumberRangeIncrementerInterface;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 
-class NumberRangeIncrementerTest extends \PHPUnit\Framework\TestCase
+class NumberRangeIncrementerTest extends TestCase
 {
-    /**
-     * @var \Doctrine\DBAL\Connection
-     */
-    public $connection;
+    use ContainerTrait;
+    use DatabaseTransactionBehaviour;
+
+    private Connection $connection;
 
     public function setUp(): void
     {
         parent::setUp();
 
-        $this->connection = Shopware()->Container()->get(\Doctrine\DBAL\Connection::class);
-    }
-
-    public function testItShouldImplementInterface()
-    {
-        $manager = new NumberRangeIncrementer($this->connection);
-        static::assertInstanceOf(NumberRangeIncrementerInterface::class, $manager);
+        $this->connection = $this->getContainer()->get(Connection::class);
     }
 
-    public function testIncrement()
+    public function testIncrement(): void
     {
         // Fetch actual number from DB
         $rangeName = 'invoice';
-        $expectedNumber = $this->connection->fetchColumn(
+        $expectedNumber = $this->connection->fetchOne(
             'SELECT number
-            FROM s_order_number
-            WHERE name = ?',
-            [
-                $rangeName,
-            ]
+             FROM s_order_number
+             WHERE name = ?',
+            [$rangeName]
         );
         ++$expectedNumber;
 
@@ -67,7 +63,7 @@ public function testIncrement()
         static::assertEquals($expectedNumber, $manager->increment($rangeName));
     }
 
-    public function testIncrementWithInvalidName()
+    public function testIncrementWithInvalidName(): void
     {
         $manager = new NumberRangeIncrementer($this->connection);
 
diff --git a/tests/Functional/Components/OptinServiceTest.php b/tests/Functional/Components/OptinServiceTest.php
index 57866611116..80a3796b468 100644
--- a/tests/Functional/Components/OptinServiceTest.php
+++ b/tests/Functional/Components/OptinServiceTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components;
@@ -39,7 +39,7 @@ class OptinServiceTest extends TestCase
     protected function setUp(): void
     {
         Shopware()->Models()->getConnection()->beginTransaction();
-        $this->service = Shopware()->Container()->get(\Shopware\Components\OptinServiceInterface::class);
+        $this->service = Shopware()->Container()->get(OptinServiceInterface::class);
     }
 
     protected function tearDown(): void
diff --git a/tests/Functional/Components/Plugin/BootstrapTest.php b/tests/Functional/Components/Plugin/BootstrapTest.php
index 1699420e0f3..8eefdeba629 100644
--- a/tests/Functional/Components/Plugin/BootstrapTest.php
+++ b/tests/Functional/Components/Plugin/BootstrapTest.php
@@ -5,36 +5,94 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Plugin;
 
+use Enlight_Config;
 use PHPUnit\Framework\TestCase;
 use Shopware\Tests\Functional\Components\Plugin\fixtures\TestPlugin;
-use Shopware_Components_Plugin_Bootstrap;
 
 class BootstrapTest extends TestCase
 {
     public function testInstantiation(): void
     {
-        $pluginInstance = new TestPlugin('Test');
-        static::assertInstanceOf(Shopware_Components_Plugin_Bootstrap::class, $pluginInstance);
+        $expectedPluginName = 'Test';
+        $pluginInstance = new TestPlugin($expectedPluginName);
+        $pluginName = $pluginInstance->getName();
+        static::assertSame($expectedPluginName, $pluginName);
+    }
+
+    /**
+     * @dataProvider pluginVersionProvider
+     */
+    public function testHasNewerVersion(?string $currentVersion, ?string $updateVersion, bool $isNewer): void
+    {
+        $currentPluginConfig = new Enlight_Config(['version' => $currentVersion]);
+        $updatePluginConfig = new Enlight_Config(['version' => $updateVersion]);
+
+        $pluginBootstrap = new TestPlugin('test');
+
+        static::assertSame($isNewer, $pluginBootstrap->hasInfoNewerVersion($updatePluginConfig, $currentPluginConfig));
+    }
+
+    /**
+     * @return list<array{currentVersion: ?string, updateVersion: ?string, isNewer: bool}>
+     */
+    public function pluginVersionProvider(): array
+    {
+        return [
+            [
+                'currentVersion' => '2.0.0',
+                'updateVersion' => '2.0.0',
+                'isNewer' => false,
+            ],
+            [
+                'currentVersion' => '1.0.0',
+                'updateVersion' => '2.0.0',
+                'isNewer' => true,
+            ],
+            [
+                'currentVersion' => null,
+                'updateVersion' => '2.0.0',
+                'isNewer' => true,
+            ],
+            [
+                'currentVersion' => '2.0.0',
+                'updateVersion' => null,
+                'isNewer' => false,
+            ],
+            [
+                'currentVersion' => '1',
+                'updateVersion' => '1.0.0',
+                'isNewer' => false,
+            ],
+            [
+                'currentVersion' => '0',
+                'updateVersion' => '0.0.1',
+                'isNewer' => true,
+            ],
+            [
+                'currentVersion' => '0',
+                'updateVersion' => '0',
+                'isNewer' => false,
+            ],
+        ];
     }
 }
diff --git a/tests/Functional/Components/Plugin/ConfigReaderTest.php b/tests/Functional/Components/Plugin/ConfigReaderTest.php
index 45993982695..a7bf62dc5be 100644
--- a/tests/Functional/Components/Plugin/ConfigReaderTest.php
+++ b/tests/Functional/Components/Plugin/ConfigReaderTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Plugin;
diff --git a/tests/Functional/Components/Plugin/ConfigWriterTest.php b/tests/Functional/Components/Plugin/ConfigWriterTest.php
index 87dbb4e8f39..a82cebc6557 100644
--- a/tests/Functional/Components/Plugin/ConfigWriterTest.php
+++ b/tests/Functional/Components/Plugin/ConfigWriterTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Plugin;
diff --git a/tests/Functional/Components/Plugin/FormSynchronizerTest.php b/tests/Functional/Components/Plugin/FormSynchronizerTest.php
index 5848867bd7e..723af07a427 100644
--- a/tests/Functional/Components/Plugin/FormSynchronizerTest.php
+++ b/tests/Functional/Components/Plugin/FormSynchronizerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Plugin;
diff --git a/tests/Functional/Components/Plugin/LegacyConfigReaderTest.php b/tests/Functional/Components/Plugin/LegacyConfigReaderTest.php
index 709f9359fea..c504af27ba0 100644
--- a/tests/Functional/Components/Plugin/LegacyConfigReaderTest.php
+++ b/tests/Functional/Components/Plugin/LegacyConfigReaderTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Plugin;
diff --git a/tests/Functional/Components/Plugin/LegacyConfigWriterTest.php b/tests/Functional/Components/Plugin/LegacyConfigWriterTest.php
index af81b447c70..1fa55e2e12d 100644
--- a/tests/Functional/Components/Plugin/LegacyConfigWriterTest.php
+++ b/tests/Functional/Components/Plugin/LegacyConfigWriterTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Plugin;
diff --git a/tests/Functional/Components/Plugin/MenuSynchronizerTest.php b/tests/Functional/Components/Plugin/MenuSynchronizerTest.php
index 2e9b0cb28d1..d52058115f9 100644
--- a/tests/Functional/Components/Plugin/MenuSynchronizerTest.php
+++ b/tests/Functional/Components/Plugin/MenuSynchronizerTest.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Plugin;
@@ -29,11 +30,12 @@
 use PHPUnit\Framework\TestCase;
 use Shopware\Components\Model\ModelManager;
 use Shopware\Components\Plugin\MenuSynchronizer;
+use Shopware\Models\Menu\Repository;
 use Shopware\Models\Plugin\Plugin;
 
 class MenuSynchronizerTest extends TestCase
 {
-    public function testIndexNotPartOfSnippet()
+    public function testIndexNotPartOfSnippet(): void
     {
         $this->executeTestAndCheckResult([
             [
@@ -51,13 +53,11 @@ public function testIndexNotPartOfSnippet()
             'localeID' => 2,
             'name' => 'SomeController',
             'value' => 'EN Label',
-            'created' => date('Y-m-d H:i:s', time()),
-            'updated' => date('Y-m-d H:i:s', time()),
             'dirty' => 0,
         ]);
     }
 
-    public function testIndexLowerCaseIsPartOfSnippet()
+    public function testIndexLowerCaseIsPartOfSnippet(): void
     {
         $this->executeTestAndCheckResult(
             [
@@ -77,14 +77,12 @@ public function testIndexLowerCaseIsPartOfSnippet()
                 'localeID' => 2,
                 'name' => 'SomeController/index',
                 'value' => 'EN Label',
-                'created' => date('Y-m-d H:i:s', time()),
-                'updated' => date('Y-m-d H:i:s', time()),
                 'dirty' => 0,
             ]
         );
     }
 
-    public function testOtherActionIsPartOfSnippet()
+    public function testOtherActionIsPartOfSnippet(): void
     {
         $this->executeTestAndCheckResult(
             [
@@ -104,27 +102,33 @@ public function testOtherActionIsPartOfSnippet()
                 'localeID' => 2,
                 'name' => 'SomeController/FooBar',
                 'value' => 'EN Label',
-                'created' => date('Y-m-d H:i:s', time()),
-                'updated' => date('Y-m-d H:i:s', time()),
                 'dirty' => 0,
             ]
         );
     }
 
-    protected function executeTestAndCheckResult(array $menu, array $expectedQueryParameters)
+    /**
+     * @param array<array<string, mixed>> $menu
+     * @param array<string, string|int>   $expectedQueryParameters
+     */
+    protected function executeTestAndCheckResult(array $menu, array $expectedQueryParameters): void
     {
         $connection = $this->createMock(Connection::class);
-        $connection->method('createQueryBuilder')
-            ->willReturn($this->createMock(QueryBuilder::class));
+        $connection->method('createQueryBuilder')->willReturn($this->createMock(QueryBuilder::class));
         $connection->expects(static::once())
             ->method('insert')
-            ->with('s_core_snippets', $expectedQueryParameters);
+            ->with('s_core_snippets', static::callback(static function ($value) use ($expectedQueryParameters) {
+                return !array_diff($expectedQueryParameters, $value);
+            }));
 
         $modelManagerMock = $this->createMock(ModelManager::class);
-        $modelManagerMock->method('getConnection')
-            ->willReturn($connection);
+        $modelManagerMock->method('getConnection')->willReturn($connection);
+        $modelManagerMock->method('getRepository')->willReturn($this->createMock(Repository::class));
+
+        $plugin = new Plugin();
+        $plugin->setId(PHP_INT_MAX);
 
         $menuSynchronizer = new MenuSynchronizer($modelManagerMock);
-        $menuSynchronizer->synchronize(new Plugin(), $menu);
+        $menuSynchronizer->synchronize($plugin, $menu);
     }
 }
diff --git a/tests/Functional/Components/Plugin/PluginMigrationTest.php b/tests/Functional/Components/Plugin/PluginMigrationTest.php
index 064a8709c65..0bd27136df8 100644
--- a/tests/Functional/Components/Plugin/PluginMigrationTest.php
+++ b/tests/Functional/Components/Plugin/PluginMigrationTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Plugin;
@@ -138,6 +138,6 @@ private function assertTableNotExists(string $table): void
 
     private function assertTableColumnExists(string $table, string $column)
     {
-        static::assertTrue((bool) Shopware()->Db()->fetchOne(sprintf('show columns FROM %s WHERE `Field` = ?', $table), [$column]));
+        static::assertTrue((bool) Shopware()->Db()->fetchOne(\sprintf('show columns FROM %s WHERE `Field` = ?', $table), [$column]));
     }
 }
diff --git a/tests/Functional/Components/Plugin/TestCase.php b/tests/Functional/Components/Plugin/TestCase.php
index 9eb3d3529b9..6cffa3644a6 100644
--- a/tests/Functional/Components/Plugin/TestCase.php
+++ b/tests/Functional/Components/Plugin/TestCase.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Plugin;
@@ -59,7 +59,7 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase
 
     public static function setUpBeforeClass(): void
     {
-        self::$pluginManager = Shopware()->Container()->get(\Shopware\Bundle\PluginInstallerBundle\Service\InstallerService::class);
+        self::$pluginManager = Shopware()->Container()->get(InstallerService::class);
         $loadedPlugins = static::$ensureLoadedPlugins;
 
         foreach ($loadedPlugins as $key => $value) {
diff --git a/tests/Functional/Components/Plugin/fixtures/2-rename-foo.php b/tests/Functional/Components/Plugin/fixtures/2-rename-foo.php
index f596fff2790..9f3555d4b40 100644
--- a/tests/Functional/Components/Plugin/fixtures/2-rename-foo.php
+++ b/tests/Functional/Components/Plugin/fixtures/2-rename-foo.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace SwagTest\Migrations;
diff --git a/tests/Functional/Components/Plugin/fixtures/SwagTest/Resources/migrations/1-add-foo.php b/tests/Functional/Components/Plugin/fixtures/SwagTest/Resources/migrations/1-add-foo.php
index 9821df2371b..e7e4b3d79d9 100644
--- a/tests/Functional/Components/Plugin/fixtures/SwagTest/Resources/migrations/1-add-foo.php
+++ b/tests/Functional/Components/Plugin/fixtures/SwagTest/Resources/migrations/1-add-foo.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace SwagTest\Migrations;
diff --git a/tests/Functional/Components/Plugin/fixtures/SwagTest/SwagTest.php b/tests/Functional/Components/Plugin/fixtures/SwagTest/SwagTest.php
index 55aaccefdc4..1fe468c7e72 100644
--- a/tests/Functional/Components/Plugin/fixtures/SwagTest/SwagTest.php
+++ b/tests/Functional/Components/Plugin/fixtures/SwagTest/SwagTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace SwagTest;
diff --git a/tests/Functional/Components/Plugin/fixtures/TestPlugin.php b/tests/Functional/Components/Plugin/fixtures/TestPlugin.php
index 3bd6d403644..41b364e3a2f 100644
--- a/tests/Functional/Components/Plugin/fixtures/TestPlugin.php
+++ b/tests/Functional/Components/Plugin/fixtures/TestPlugin.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Plugin\fixtures;
diff --git a/tests/Functional/Components/Privacy/ConfigDependentIpAnonymizerTest.php b/tests/Functional/Components/Privacy/ConfigDependentIpAnonymizerTest.php
index 401ec0530d3..1c67ece4aa2 100644
--- a/tests/Functional/Components/Privacy/ConfigDependentIpAnonymizerTest.php
+++ b/tests/Functional/Components/Privacy/ConfigDependentIpAnonymizerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Privacy;
@@ -90,12 +90,12 @@ public function testDispatchLogLocalhostIpv4()
             ->setClientIp('127.0.0.1')
             ->setMethod('POST')
             ->setPost([
-            'type' => 'backend',
-            'key' => 'Shopcache',
-            'text' => 'Shopcache wurde geleert',
-            'user' => 'Demo user',
-            'value4' => '',
-        ]);
+                'type' => 'backend',
+                'key' => 'Shopcache',
+                'text' => 'Shopcache wurde geleert',
+                'user' => 'Demo user',
+                'value4' => '',
+            ]);
         $this->dispatch('/backend/Logger/createLog');
         $data = $this->View()->getAssign('data');
 
diff --git a/tests/Functional/Components/Privacy/CookieRemoveSubscriberTest.php b/tests/Functional/Components/Privacy/CookieRemoveSubscriberTest.php
index 02f489177e8..813c82bf4c5 100644
--- a/tests/Functional/Components/Privacy/CookieRemoveSubscriberTest.php
+++ b/tests/Functional/Components/Privacy/CookieRemoveSubscriberTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Privacy;
@@ -34,11 +33,8 @@
 use Enlight_Template_Manager;
 use Enlight_View_Default;
 use PHPUnit\Framework\TestCase;
-use Shopware\Bundle\CookieBundle\CookieCollection;
 use Shopware\Bundle\CookieBundle\Services\CookieHandler;
 use Shopware\Bundle\CookieBundle\Services\CookieRemoveHandler;
-use Shopware\Bundle\CookieBundle\Structs\CookieGroupStruct;
-use Shopware\Bundle\CookieBundle\Structs\CookieStruct;
 use Shopware\Components\Privacy\CookieRemoveSubscriber;
 use Shopware_Controllers_Frontend_Index;
 
@@ -65,7 +61,7 @@ public function testPostDispatchDoesNothingRemovalInactive(): void
         $cookieRemoveSubscriber->onPostDispatch($this->getEventArgs($controller));
 
         // More code than allowed got executed if this fails
-        static::assertNotEmpty($controller->Response()->getCookies());
+        static::assertCount(2, $controller->Response()->getCookies());
     }
 
     public function testPostDispatchDoesNothingAllowAllModeCookieSet(): void
@@ -73,9 +69,8 @@ public function testPostDispatchDoesNothingAllowAllModeCookieSet(): void
         Shopware()->Config()->offsetSet('cookie_note_mode', CookieRemoveSubscriber::COOKIE_MODE_ALL);
         Shopware()->Config()->offsetSet('show_cookie_note', 1);
 
-        $_COOKIE['allowCookie'] = 1;
-
         $controller = $this->getController();
+        $controller->Request()->cookies->set('allowCookie', 1);
 
         // May not be removed, since further code may not be executed
         $controller->Response()->setCookie('notRemoved', 'foo');
@@ -152,7 +147,7 @@ public function testPostDispatchAddsCookieGroupsViewVariableTechnicallyRequired(
         static::assertNotNull($controller->View()->getAssign('cookieGroups'));
     }
 
-    private function getEventArgs(Enlight_Controller_Action $controller = null): Enlight_Controller_ActionEventArgs
+    private function getEventArgs(?Enlight_Controller_Action $controller = null): Enlight_Controller_ActionEventArgs
     {
         return new Enlight_Controller_ActionEventArgs([
             'subject' => $controller ?: $this->getController(),
@@ -179,19 +174,3 @@ private function getCookieRemoveSubscriber(bool $httpCacheEnabled = true): Cooki
         );
     }
 }
-
-class PreserveCookieFromRemovingSubscriber
-{
-    public function addCookie(): CookieCollection
-    {
-        $cookieCollection = new CookieCollection();
-        $cookieCollection->add(new CookieStruct(
-            'keepMe',
-            '/^keepMe$/',
-            'keepMe',
-            CookieGroupStruct::PERSONALIZATION
-        ));
-
-        return $cookieCollection;
-    }
-}
diff --git a/tests/Functional/Components/Privacy/IpAnonymizerTest.php b/tests/Functional/Components/Privacy/IpAnonymizerTest.php
index a4869a788b7..03ae2f815a5 100644
--- a/tests/Functional/Components/Privacy/IpAnonymizerTest.php
+++ b/tests/Functional/Components/Privacy/IpAnonymizerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Privacy;
diff --git a/tests/Functional/Components/Privacy/PrivacyServiceTest.php b/tests/Functional/Components/Privacy/PrivacyServiceTest.php
index 097a5e2a51a..d490a190c77 100644
--- a/tests/Functional/Components/Privacy/PrivacyServiceTest.php
+++ b/tests/Functional/Components/Privacy/PrivacyServiceTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Privacy;
@@ -148,7 +147,7 @@ public function testCleanupCanceledBasketsShouldBeDeleted(): void
      */
     private function getUserFromDb(int $id)
     {
-        return $this->connection->executeQuery('SELECT id FROM s_user WHERE id = ' . $id)->fetchAssociative();
+        return $this->connection->executeQuery('SELECT id FROM s_user WHERE id = :id', ['id' => $id])->fetchAssociative();
     }
 
     /**
@@ -158,7 +157,7 @@ private function getUserFromDb(int $id)
      */
     private function getOrdersByCustomerIdFromDb(int $customerId): array
     {
-        return $this->connection->executeQuery('SELECT id FROM s_order WHERE userID = "' . $customerId . '"')->fetchAllAssociative();
+        return $this->connection->executeQuery('SELECT id FROM s_order WHERE userID = :customerId', ['customerId' => $customerId])->fetchAllAssociative();
     }
 
     /**
@@ -168,7 +167,7 @@ private function getOrdersByCustomerIdFromDb(int $customerId): array
      */
     private function getBasketsByCustomerIdFromDb(int $customerId): array
     {
-        return $this->connection->executeQuery('SELECT id FROM s_order_basket WHERE userID = "' . $customerId . '"')->fetchAllAssociative();
+        return $this->connection->executeQuery('SELECT id FROM s_order_basket WHERE userID = :customerId', ['customerId' => $customerId])->fetchAllAssociative();
     }
 
     /**
@@ -184,20 +183,20 @@ private function createCustomer(int $sinceMonth): int
         $date = (new DateTime($sqlDate))->format('Y-m-d');
 
         $this->connection->insert('s_user', [
-                'password' => '098f6bcd4621d373cade4e832627b4f6',
-                'encoder' => 'md5',
-                'email' => uniqid('test', true) . '@test.com',
-                'accountmode' => 1,
-                'active' => '1',
-                'firstlogin' => $date,
-                'lastlogin' => $date,
-                'subshopID' => '1',
-                'customergroup' => 'EK',
-                'salutation' => 'mr',
-                'firstname' => '',
-                'lastname' => '',
-                'birthday' => '1990-01-01',
-            ]);
+            'password' => '098f6bcd4621d373cade4e832627b4f6',
+            'encoder' => 'md5',
+            'email' => uniqid('test', true) . '@test.com',
+            'accountmode' => 1,
+            'active' => '1',
+            'firstlogin' => $date,
+            'lastlogin' => $date,
+            'subshopID' => '1',
+            'customergroup' => 'EK',
+            'salutation' => 'mr',
+            'firstname' => '',
+            'lastname' => '',
+            'birthday' => '1990-01-01',
+        ]);
 
         return (int) $this->connection->lastInsertId();
     }
diff --git a/tests/Functional/Components/ProductStream/RepositoryTest.php b/tests/Functional/Components/ProductStream/RepositoryTest.php
new file mode 100644
index 00000000000..a89c8932928
--- /dev/null
+++ b/tests/Functional/Components/ProductStream/RepositoryTest.php
@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Components\ProductStream;
+
+use Doctrine\DBAL\Connection;
+use PHPUnit\Framework\TestCase;
+use Psr\Log\NullLogger;
+use Shopware\Bundle\SearchBundle\Criteria;
+use Shopware\Components\LogawareReflectionHelper;
+use Shopware\Components\ProductStream\Repository;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
+
+class RepositoryTest extends TestCase
+{
+    use ContainerTrait;
+    use DatabaseTransactionBehaviour;
+
+    private const NOT_EXISTING_PRODUCT_STREAM_ID = 99999;
+
+    public function testPrepareCriteriaWithInvalidStreamId(): void
+    {
+        $repo = new Repository(
+            $this->getContainer()->get(Connection::class),
+            new LogawareReflectionHelper(new NullLogger()),
+        );
+
+        $this->expectNotToPerformAssertions();
+        // reading a product stream with an invalid ID should not throw an error
+        $repo->prepareCriteria(new Criteria(), self::NOT_EXISTING_PRODUCT_STREAM_ID);
+    }
+}
diff --git a/tests/Functional/Components/RandomTest.php b/tests/Functional/Components/RandomTest.php
index 16479ac8161..08ece8f3827 100644
--- a/tests/Functional/Components/RandomTest.php
+++ b/tests/Functional/Components/RandomTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components;
@@ -33,11 +32,12 @@ class RandomTest extends Enlight_Components_Test_TestCase
 {
     public function testGeneratePassword(): void
     {
-        $sets = [];
-        $sets[] = 'abcdefghjkmnpqrstuvwxyz';
-        $sets[] = 'ABCDEFGHJKMNPQRSTUVWXYZ';
-        $sets[] = '23456789';
-        $sets[] = '!@#$%&*?';
+        $sets = [
+            'lowerCase' => 'abcdefghjkmnpqrstuvwxyz',
+            'upperCase' => 'ABCDEFGHJKMNPQRSTUVWXYZ',
+            'numbers' => '123456789',
+            'specialChars' => '!@#$%&*?',
+        ];
 
         $chars = implode('', $sets);
 
@@ -56,7 +56,9 @@ public function testGeneratePassword(): void
             }
         }
 
-        static::assertEmpty($sets);
+        foreach ($sets as $kind => $set) {
+            static::fail(\sprintf('Password does not contain following set: %s', $kind));
+        }
     }
 
     public function testGetBoolean(): void
diff --git a/tests/Functional/Components/ReflectionHelperTest.php b/tests/Functional/Components/ReflectionHelperTest.php
index dd61def2d9e..1d84d63cd13 100644
--- a/tests/Functional/Components/ReflectionHelperTest.php
+++ b/tests/Functional/Components/ReflectionHelperTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components;
diff --git a/tests/Functional/Components/Router/Generators/RewriteGeneratorTest.php b/tests/Functional/Components/Router/Generators/RewriteGeneratorTest.php
index f90bfeefcb6..af57838ce97 100644
--- a/tests/Functional/Components/Router/Generators/RewriteGeneratorTest.php
+++ b/tests/Functional/Components/Router/Generators/RewriteGeneratorTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Router\Generators;
diff --git a/tests/Functional/Components/Router/RouterTest.php b/tests/Functional/Components/Router/RouterTest.php
index 20da66048e3..b798ccf358b 100644
--- a/tests/Functional/Components/Router/RouterTest.php
+++ b/tests/Functional/Components/Router/RouterTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Router;
@@ -110,7 +109,8 @@ public function testArrayParams(array $params): void
         static::assertIsString($url);
         $match = $router->match($url);
         static::assertIsArray($match);
-        static::assertEquals(array_intersect($match, $params), $params);
+        unset($match['module'], $match['controller'], $match['action'], $match['index']);
+        static::assertEquals($params, $match);
     }
 
     public function getTestParamsProvider(): array
diff --git a/tests/Functional/Components/Router/RouterTestObject.php b/tests/Functional/Components/Router/RouterTestObject.php
deleted file mode 100644
index fe1b6bedcd3..00000000000
--- a/tests/Functional/Components/Router/RouterTestObject.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Functional\Components\Router;
-
-use Enlight_Components_Test_TestCase;
-use InvalidArgumentException;
-use Shopware\Components\Routing\Context;
-use stdClass;
-
-class RouterTestObject extends Enlight_Components_Test_TestCase
-{
-    protected $errorHandler;
-
-    /**
-     * @before
-     */
-    public function prepareUserAsException(): void
-    {
-        $this->errorHandler = set_error_handler(static function (int $errno, string $errstr) {
-            throw new InvalidArgumentException($errstr, $errno);
-        }, E_USER_DEPRECATED);
-    }
-
-    /**
-     * @after
-     */
-    public function restoreErrorHandler(): void
-    {
-        restore_error_handler();
-    }
-
-    /**
-     * tests for passing an object to assemble
-     */
-    public function testArrayParamsWithObject(): void
-    {
-        $router = Shopware()->Container()->get('router');
-        $localRouter = clone $router;
-
-        $context = new Context();
-        $context->setShopId(1);
-        $localRouter->setContext($context);
-
-        $cls = new stdClass();
-        $cls->test = 'It\'s a class';
-
-        $this->expectException(InvalidArgumentException::class);
-
-        $localRouter->assemble(['foo' => $cls]);
-    }
-}
diff --git a/tests/Functional/Components/Routing/Matchers/RewriteMatcherTest.php b/tests/Functional/Components/Routing/Matchers/RewriteMatcherTest.php
index cc027120bdf..4535fa51c12 100644
--- a/tests/Functional/Components/Routing/Matchers/RewriteMatcherTest.php
+++ b/tests/Functional/Components/Routing/Matchers/RewriteMatcherTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Routing\Matchers;
diff --git a/tests/Functional/Components/SitePageMenuTest.php b/tests/Functional/Components/SitePageMenuTest.php
index 34ec19a936b..0c754c3c5f1 100644
--- a/tests/Functional/Components/SitePageMenuTest.php
+++ b/tests/Functional/Components/SitePageMenuTest.php
@@ -5,31 +5,28 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components;
 
 use Doctrine\DBAL\Connection;
 use PHPUnit\Framework\TestCase;
-use Shopware\Components\Routing\Router;
-use Shopware\Components\Routing\RouterInterface;
 use Shopware\Components\SitePageMenu;
 use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 
@@ -64,7 +61,7 @@ public function testSiteWithoutLink(): void
         static::assertCount(1, $pages['left']);
 
         $page = array_shift($pages['left']);
-        static::assertSame($this->getPath() . '/custom/index/sCustom/1', $page['link']);
+        static::assertStringEndsWith('/custom/index/sCustom/1', $page['link']);
     }
 
     public function testSiteWithExternalLink(): void
@@ -139,19 +136,6 @@ public function testSiteWithOldViewport(): void
         static::assertCount(1, $pages['left']);
 
         $page = array_shift($pages['left']);
-        static::assertSame($this->getPath() . '/cat/index/sCategory/300', $page['link']);
-    }
-
-    private function getPath(): string
-    {
-        /** @var Router $router */
-        $router = Shopware()->Container()->get(RouterInterface::class);
-        $path = implode('/', [
-            $router->getContext()->getHost(),
-            $router->getContext()->getBaseUrl(),
-        ]);
-        $protocol = $router->getContext()->isSecure() ? 'https' : 'http';
-
-        return rtrim($protocol . '://' . $path, '/');
+        static::assertStringEndsWith('/cat/index/sCategory/300', $page['link']);
     }
 }
diff --git a/tests/Functional/Components/Snippet/DatabaseHandlerTest.php b/tests/Functional/Components/Snippet/DatabaseHandlerTest.php
index 394c76a1a26..aa15c5c419b 100644
--- a/tests/Functional/Components/Snippet/DatabaseHandlerTest.php
+++ b/tests/Functional/Components/Snippet/DatabaseHandlerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Snippet;
diff --git a/tests/Functional/Components/Snippet/SnippetStructureTest.php b/tests/Functional/Components/Snippet/SnippetStructureTest.php
index 3db44465bcc..91c05002661 100644
--- a/tests/Functional/Components/Snippet/SnippetStructureTest.php
+++ b/tests/Functional/Components/Snippet/SnippetStructureTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Snippet;
diff --git a/tests/Functional/Components/StateTranslatorServiceTest.php b/tests/Functional/Components/StateTranslatorServiceTest.php
index 11ccabf7275..4de5ae7dc90 100644
--- a/tests/Functional/Components/StateTranslatorServiceTest.php
+++ b/tests/Functional/Components/StateTranslatorServiceTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components;
diff --git a/tests/Functional/Components/StreamProtocolValidatorTest.php b/tests/Functional/Components/StreamProtocolValidatorTest.php
index 8201e3bc8e7..44b8cd88297 100644
--- a/tests/Functional/Components/StreamProtocolValidatorTest.php
+++ b/tests/Functional/Components/StreamProtocolValidatorTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components;
diff --git a/tests/Functional/Components/StringCompilerTest.php b/tests/Functional/Components/StringCompilerTest.php
index defb8b3d2e3..c788d3e3303 100644
--- a/tests/Functional/Components/StringCompilerTest.php
+++ b/tests/Functional/Components/StringCompilerTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components;
diff --git a/tests/Functional/Components/Template/TemplateManagerTest.php b/tests/Functional/Components/Template/TemplateManagerTest.php
index d168a03f48b..f0c326f8e41 100644
--- a/tests/Functional/Components/Template/TemplateManagerTest.php
+++ b/tests/Functional/Components/Template/TemplateManagerTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Template;
@@ -89,14 +88,14 @@ public function testFetchInvalidExtends(): void
     public function testValidPermissionsAreSet(): void
     {
         $testDir = sys_get_temp_dir() . '/tpl-test';
+        if (!is_dir($testDir)) {
+            mkdir($testDir);
+        }
         $backendOptions = [
             'hashed_directory_perm' => 0777 & ~umask(),
             'cache_file_perm' => 0666 & ~umask(),
         ];
-        /** @var Enlight_Template_Manager $template */
-        $template = Enlight_Class::Instance('Enlight_Template_Manager', [null, $backendOptions]);
-
-        mkdir($testDir);
+        $template = Enlight_Class::Instance(Enlight_Template_Manager::class, [null, $backendOptions]);
 
         $cacheDirectory = $testDir . '/compile-test';
         $cacheFile = $cacheDirectory . '/8843d7f92416211de9ebb963ff4ce28125932878.string.php';
diff --git a/tests/Functional/Components/TemplateMailTest.php b/tests/Functional/Components/TemplateMailTest.php
index ad4dfcb2503..3dbf2068c5c 100644
--- a/tests/Functional/Components/TemplateMailTest.php
+++ b/tests/Functional/Components/TemplateMailTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components;
@@ -29,15 +28,19 @@
 use Doctrine\ORM\EntityRepository;
 use Enlight_Components_Mail;
 use Enlight_Components_Test_TestCase;
+use Enlight_Event_EventArgs;
 use Shopware\Components\Model\ModelManager;
 use Shopware\Models\Mail\Attachment;
 use Shopware\Models\Mail\Mail;
 use Shopware\Models\Shop\Shop;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
 use Shopware_Components_StringCompiler;
 use Shopware_Components_TemplateMail;
 
 class TemplateMailTest extends Enlight_Components_Test_TestCase
 {
+    use ContainerTrait;
+
     private Shopware_Components_TemplateMail $mail;
 
     /**
@@ -48,7 +51,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $stringCompiler = new Shopware_Components_StringCompiler(Shopware()->Template());
+        $stringCompiler = new Shopware_Components_StringCompiler($this->getContainer()->get('template'));
 
         $repository = $this->createMock(EntityRepository::class);
         $repository->method('findOneBy')->willReturn(null);
@@ -57,7 +60,7 @@ protected function setUp(): void
         $manager->method('getRepository')->willReturn($repository);
 
         $this->mail = new Shopware_Components_TemplateMail();
-        $this->mail->setShop(Shopware()->Shop());
+        $this->mail->setShop($this->getContainer()->get('shop'));
         $this->mail->setModelManager($manager);
         $this->mail->setStringCompiler($stringCompiler);
     }
@@ -96,7 +99,7 @@ public function testLoadSmartyTemplateLoadsValues(): void
         $templateMock = $this->getSmartyMailMockObject();
 
         $context = [
-            'sConfig' => ['sSHOPNAME' => 'Shopware 3.5 Demo', 'sMAIL' => 'info@example.com'],
+            'sConfig' => ['sSHOPNAME' => 'Shopware 5 Demo', 'sMAIL' => 'info@example.com'],
             'sShopURL' => 'http://demo.shopware.de',
         ];
 
@@ -104,11 +107,11 @@ public function testLoadSmartyTemplateLoadsValues(): void
 
         $result = $this->mail->loadValues($mail, $templateMock);
 
-        static::assertEquals('Ihr Bestellung bei Shopware 3.5 Demo', $result->getSubject());
-        static::assertEquals('Shopware 3.5 Demo', $result->getFromName());
+        static::assertEquals('Ihr Bestellung bei Shopware 5 Demo', $result->getSubject());
+        static::assertEquals('Shopware 5 Demo', $result->getFromName());
         static::assertEquals('info@example.com', $result->getFrom());
-        static::assertEquals('Testbestellung bei Shopware 3.5 Demo', $result->getBodyText(true));
-        static::assertEquals('Testbestellung HTML bei Shopware 3.5 Demo', $result->getBodyHtml(true));
+        static::assertEquals('Testbestellung bei Shopware 5 Demo', $result->getBodyText(true));
+        static::assertEquals('Testbestellung HTML bei Shopware 5 Demo', $result->getBodyHtml(true));
     }
 
     public function testCreateMailWorks(): void
@@ -116,17 +119,48 @@ public function testCreateMailWorks(): void
         $templateMock = $this->getSmartyMailMockObject();
 
         $context = [
-            'sConfig' => ['sSHOPNAME' => 'Shopware 3.5 Demo', 'sMAIL' => 'info@example.com'],
+            'sConfig' => ['sSHOPNAME' => 'Shopware 5 Demo', 'sMAIL' => 'info@example.com'],
             'sShopURL' => 'http://demo.shopware.de',
         ];
 
         $result = $this->mail->createMail($templateMock, $context);
 
-        static::assertEquals('Ihr Bestellung bei Shopware 3.5 Demo', $result->getSubject());
-        static::assertEquals('Shopware 3.5 Demo', $result->getFromName());
+        static::assertEquals('Ihr Bestellung bei Shopware 5 Demo', $result->getSubject());
+        static::assertEquals('Shopware 5 Demo', $result->getFromName());
+        static::assertEquals('info@example.com', $result->getFrom());
+        static::assertEquals('Testbestellung bei Shopware 5 Demo', $result->getBodyText(true));
+        static::assertEquals('Testbestellung HTML bei Shopware 5 Demo', $result->getBodyHtml(true));
+    }
+
+    public function testCreateMailEventMailContextIsConsidered(): void
+    {
+        $eventManager = $this->getContainer()->get('events');
+        $eventManager->addListener('TemplateMail_CreateMail_MailContext', function (Enlight_Event_EventArgs $args) {
+            $context = $args->getReturn();
+            $context['sConfig']['sSHOPNAME'] = 'Shopware Foo Bar Demo';
+
+            return $context;
+        });
+
+        $templateMock = $this->getSmartyMailMockObject();
+
+        $context = [
+            'sConfig' => ['sSHOPNAME' => 'Shopware 5 Demo', 'sMAIL' => 'info@example.com'],
+            'sShopURL' => 'https://shopware.local',
+        ];
+
+        $result = $this->mail->createMail($templateMock, $context);
+
+        static::assertEquals('Ihr Bestellung bei Shopware Foo Bar Demo', $result->getSubject());
+        static::assertEquals('Shopware Foo Bar Demo', $result->getFromName());
         static::assertEquals('info@example.com', $result->getFrom());
-        static::assertEquals('Testbestellung bei Shopware 3.5 Demo', $result->getBodyText(true));
-        static::assertEquals('Testbestellung HTML bei Shopware 3.5 Demo', $result->getBodyHtml(true));
+        static::assertEquals('Testbestellung bei Shopware Foo Bar Demo', $result->getBodyText(true));
+        static::assertEquals('Testbestellung HTML bei Shopware Foo Bar Demo', $result->getBodyHtml(true));
+
+        $listeners = $eventManager->getListeners('TemplateMail_CreateMail_MailContext');
+        foreach ($listeners as $listener) {
+            $eventManager->removeListener($listener);
+        }
     }
 
     public function testCreateMailWithInvalidTemplateNameShouldThrowException(): void
@@ -141,8 +175,8 @@ public function testCreateMailWithInvalidTemplateNameShouldThrowException(): voi
     public function testCreateMailWithoutShop(): void
     {
         $templateMail = new Shopware_Components_TemplateMail();
-        $templateMail->setModelManager(Shopware()->Models());
-        $templateMail->setStringCompiler(new Shopware_Components_StringCompiler(Shopware()->Template()));
+        $templateMail->setModelManager($this->getContainer()->get(ModelManager::class));
+        $templateMail->setStringCompiler(new Shopware_Components_StringCompiler($this->getContainer()->get('template')));
 
         $mail = $templateMail->createMail('sOrder');
 
@@ -155,7 +189,7 @@ public function testCreateMailWithoutShop(): void
     public function testCreateMailWithoutShopTemplate(): void
     {
         // Prepare new shop without template
-        $entityManager = Shopware()->Container()->get(ModelManager::class);
+        $entityManager = $this->getContainer()->get(ModelManager::class);
         $defaultShop = $entityManager->find(Shop::class, 1);
         $newShop = new Shop();
         $newShop->setMain($defaultShop);
@@ -180,7 +214,7 @@ public function testCreateMailWithoutShopTemplate(): void
     public function testCreateMailWithoutMainShopTemplate(): void
     {
         // Prepare new shop and main shop without templates
-        $entityManager = Shopware()->Container()->get(ModelManager::class);
+        $entityManager = $this->getContainer()->get(ModelManager::class);
         $newMainShop = new Shop();
         $newMainShop->setName('New Main Shop');
         $entityManager->persist($newMainShop);
@@ -249,26 +283,14 @@ private function getSimpleMailMockObject(): Mail
 
     private function getSmartyMailMockObject(): Mail
     {
-        $templateMock = $this->createMock(Mail::class);
-
-        $templateMock->method('getFromMail')
-            ->willReturn('{$sConfig.sMAIL}');
-
-        $templateMock->method('getFromName')
-            ->willReturn('{$sConfig.sSHOPNAME}');
-
-        $templateMock->method('getSubject')
-            ->willReturn('Ihr Bestellung bei {$sConfig.sSHOPNAME}');
-
-        $templateMock->method('getContent')
-            ->willReturn('Testbestellung bei {$sConfig.sSHOPNAME}');
-
-        $templateMock->method('getContentHtml')
-            ->willReturn('Testbestellung HTML bei {$sConfig.sSHOPNAME}');
-
-        $templateMock->method('isHtml')
-            ->willReturn(true);
-
-        return $templateMock;
+        $mail = new Mail();
+        $mail->setFromMail('{$sConfig.sMAIL}');
+        $mail->setFromName('{$sConfig.sSHOPNAME}');
+        $mail->setSubject('Ihr Bestellung bei {$sConfig.sSHOPNAME}');
+        $mail->setContent('Testbestellung bei {$sConfig.sSHOPNAME}');
+        $mail->setContentHtml('Testbestellung HTML bei {$sConfig.sSHOPNAME}');
+        $mail->setIsHtml();
+
+        return $mail;
     }
 }
diff --git a/tests/Functional/Components/Theme/Base.php b/tests/Functional/Components/Theme/Base.php
index e7e2f54fca9..afa85626fef 100644
--- a/tests/Functional/Components/Theme/Base.php
+++ b/tests/Functional/Components/Theme/Base.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Theme;
@@ -42,90 +43,72 @@
 class Base extends Enlight_Components_Test_TestCase
 {
     /**
-     * @return MockObject
+     * @return ModelManager&MockObject
      */
-    protected function getEntityManager()
+    protected function getEntityManager(): ModelManager
     {
         return $this->createMock(ModelManager::class);
     }
 
     /**
-     * @return MockObject
+     * @return Enlight_Event_EventManager&MockObject
      */
-    protected function getEventManager()
+    protected function getEventManager(): Enlight_Event_EventManager
     {
         return $this->createMock(Enlight_Event_EventManager::class);
     }
 
     /**
-     * @return MockObject
+     * @return PathResolver&MockObject
      */
-    protected function getPathResolver()
+    protected function getPathResolver(): PathResolver
     {
         return $this->createMock(PathResolver::class);
     }
 
     /**
-     * @return MockObject
+     * @return Util&MockObject
      */
-    protected function getUtilClass()
+    protected function getUtilClass(): Util
     {
         return $this->createMock(Util::class);
     }
 
-    /**
-     * @return MockObject
-     */
-    protected function getConfigurator()
+    protected function getConfigurator(): Configurator
     {
         return $this->createMock(Configurator::class);
     }
 
-    /**
-     * @return MockObject
-     */
-    protected function getFormPersister()
+    protected function getFormPersister(): ThemePersister
     {
         return $this->createMock(ThemePersister::class);
     }
 
-    /**
-     * @return TestBareTheme
-     */
-    protected function getBareTheme()
+    protected function getBareTheme(): TestBareTheme
     {
         require_once __DIR__ . '/Themes/TestBare/Theme.php';
 
         return new TestBareTheme();
     }
 
-    /**
-     * @return Theme
-     */
-    protected function getResponsiveTheme()
+    protected function getResponsiveTheme(): Theme
     {
         require_once __DIR__ . '/Themes/TestResponsive/Theme.php';
 
         return new Theme();
     }
 
-    /**
-     * @return Template
-     */
-    protected function getTemplate()
+    protected function getTemplate(): Template
     {
         return $this->createMock(Template::class);
     }
 
-    /**
-     * @return MockObject
-     */
-    protected function getShopRepository()
+    protected function getShopRepository(): Repository
     {
         return $this->createMock(Repository::class);
     }
 
-    protected function getSnippetHandler()
+    protected function getSnippetHandler(): DatabaseHandler
     {
         return $this->createMock(DatabaseHandler::class);
     }
@@ -133,9 +116,9 @@ protected function getSnippetHandler()
     /**
      * Call protected/private method of a class.
      *
-     * @param object $object     Instantiated object that we will run method on
-     * @param string $methodName Method name to call
-     * @param array  $parameters array of parameters to pass into method
+     * @param object      $object     Instantiated object that we will run method on
+     * @param string      $methodName Method name to call
+     * @param list<mixed> $parameters array of parameters to pass into method
      *
      * @return mixed method return
      */
diff --git a/tests/Functional/Components/Theme/ConfiguratorTest.php b/tests/Functional/Components/Theme/ConfiguratorTest.php
index b5881c9fee3..3ea8a6228ab 100644
--- a/tests/Functional/Components/Theme/ConfiguratorTest.php
+++ b/tests/Functional/Components/Theme/ConfiguratorTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Theme;
@@ -157,7 +156,7 @@ public function testValidateConfigSuccess(): void
             [$container]
         );
 
-        static::assertTrue(true, 'validateConfig doesn\'t throw an exception');
+        $this->expectNotToPerformAssertions();
     }
 
     public function testValidateConfigException(): void
diff --git a/tests/Functional/Components/Theme/InheritanceTest.php b/tests/Functional/Components/Theme/InheritanceTest.php
index f8b8cc8100e..6b1bbf2df08 100644
--- a/tests/Functional/Components/Theme/InheritanceTest.php
+++ b/tests/Functional/Components/Theme/InheritanceTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Theme;
diff --git a/tests/Functional/Components/Theme/InstallerTest.php b/tests/Functional/Components/Theme/InstallerTest.php
index cace2a13915..61d621f5996 100644
--- a/tests/Functional/Components/Theme/InstallerTest.php
+++ b/tests/Functional/Components/Theme/InstallerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Theme;
@@ -64,7 +64,7 @@ public function testSynchronizeThemeDirectory()
             $this->getSnippetHandler(),
             Shopware()->Container()->get(\Shopware\Components\Theme\Service::class),
         );
-        //creates a directory iterator for the default theme directory (engine/Shopware/Themes)
+        // creates a directory iterator for the default theme directory (engine/Shopware/Themes)
         $directories = new DirectoryIterator(
             __DIR__ . '/Themes/'
         );
diff --git a/tests/Functional/Components/Theme/Themes/TestBare/Theme.php b/tests/Functional/Components/Theme/Themes/TestBare/Theme.php
index d2ab0fdbddc..07cbd56084e 100644
--- a/tests/Functional/Components/Theme/Themes/TestBare/Theme.php
+++ b/tests/Functional/Components/Theme/Themes/TestBare/Theme.php
@@ -1,41 +1,43 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Themes\TestBare;
 
+use Shopware\Components\Form\Container\Tab;
+use Shopware\Components\Form\Container\TabContainer;
+
 class Theme extends \Shopware\Components\Theme
 {
-    protected $extends;
-
     protected $javascript = ['bare_1.js', 'bare_2.js'];
 
     protected $css = ['bare_1.css', 'bare_2.css'];
 
     protected $injectBeforePlugins = true;
 
-    public function createConfig(\Shopware\Components\Form\Container\TabContainer $container)
+    public function createConfig(TabContainer $container): void
     {
-        $container->addTab(new \Shopware\Components\Form\Container\Tab('bare', 'bare'));
+        $container->addTab(new Tab('bare', 'bare'));
     }
 }
diff --git a/tests/Functional/Components/Theme/Themes/TestResponsive/Theme.php b/tests/Functional/Components/Theme/Themes/TestResponsive/Theme.php
index abdfed8043d..10933ef2cdc 100644
--- a/tests/Functional/Components/Theme/Themes/TestResponsive/Theme.php
+++ b/tests/Functional/Components/Theme/Themes/TestResponsive/Theme.php
@@ -1,49 +1,49 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Themes\TestResponsive;
 
+use Doctrine\Common\Collections\ArrayCollection;
+use Shopware\Components\Form\Container\Tab;
+use Shopware\Components\Form\Container\TabContainer;
 use Shopware\Components\Theme\ConfigSet;
 
 class Theme extends \Shopware\Components\Theme
 {
     protected $extend = 'TestBare';
 
-    protected $inheritanceConfig = true;
-
     protected $javascript = ['responsive_1.js', 'responsive_2.js'];
 
     protected $css = ['responsive_1.css', 'responsive_2.css'];
 
-    protected $injectBeforePlugins = false;
-
-    public function createConfig(\Shopware\Components\Form\Container\TabContainer $container)
+    public function createConfig(TabContainer $container): void
     {
-        $container->addTab(new \Shopware\Components\Form\Container\Tab('responsive', 'responsive'));
+        $container->addTab(new Tab('responsive', 'responsive'));
     }
 
-    public function createConfigSets(\Doctrine\Common\Collections\ArrayCollection $collection)
+    public function createConfigSets(ArrayCollection $collection): void
     {
         $collection->add(new ConfigSet('set1', ['value1' => 1]));
         $collection->add(new ConfigSet('set2', ['value1' => 2]));
diff --git a/tests/Functional/Components/Thumbnail/ManagerTest.php b/tests/Functional/Components/Thumbnail/ManagerTest.php
index 4da9cf6abbf..0c14d0ea0d2 100644
--- a/tests/Functional/Components/Thumbnail/ManagerTest.php
+++ b/tests/Functional/Components/Thumbnail/ManagerTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components\Thumbnail;
@@ -209,7 +208,9 @@ private function getMediaModel(): Media
 
         $sourcePath = __DIR__ . DIRECTORY_SEPARATOR . 'fixtures' . DIRECTORY_SEPARATOR . 'sw_icon.png';
         $imagePath = 'media/unknown/sw_icon.png';
-        $mediaService->write($imagePath, file_get_contents($sourcePath));
+        $content = file_get_contents($sourcePath);
+        static::assertIsString($content);
+        $mediaService->write($imagePath, $content);
 
         $file = new File($sourcePath);
 
diff --git a/tests/Functional/Components/Translation/SwapProductVariantTranslationServiceTest.php b/tests/Functional/Components/Translation/SwapProductVariantTranslationServiceTest.php
new file mode 100644
index 00000000000..e2bff449942
--- /dev/null
+++ b/tests/Functional/Components/Translation/SwapProductVariantTranslationServiceTest.php
@@ -0,0 +1,171 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Components\Translation;
+
+use Doctrine\DBAL\Connection;
+use PHPUnit\Framework\TestCase;
+use Shopware\Components\Translation\SwapProductVariantTranslationService;
+use Shopware\Components\Translation\SwapProductVariantTranslationServiceInterface;
+use Shopware\Models\Article\Article as Product;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
+use Shopware_Components_Translation;
+
+class SwapProductVariantTranslationServiceTest extends TestCase
+{
+    use DatabaseTransactionBehaviour;
+    use ContainerTrait;
+
+    private const PRODUCT_ID = 32100273;
+    private const PRODUCT_MAIN_VARIANT_ID = 32100828;
+    private const PRODUCT_VARIANT_1_ID = 32100829;
+    private const PRODUCT_VARIANT_2_ID = 32100830;
+    private const LANGUAGE_ID = 2;
+
+    public function testSwapProductVariantTranslation(): void
+    {
+        $sql = file_get_contents(__DIR__ . '/_fixtures/variant_product_with_attribute_translations.sql');
+        static::assertIsString($sql);
+
+        $connection = $this->getContainer()->get('dbal_connection');
+        $connection->executeStatement(
+            $sql,
+            [
+                'productId' => self::PRODUCT_ID,
+                'mainVariantId' => self::PRODUCT_MAIN_VARIANT_ID,
+                'variantIdOne' => self::PRODUCT_VARIANT_1_ID,
+                'variantIdTwo' => self::PRODUCT_VARIANT_2_ID,
+            ]
+        );
+
+        $product = $this->getContainer()->get('models')->find(Product::class, self::PRODUCT_ID);
+        static::assertInstanceOf(Product::class, $product);
+
+        $swapTranslationService = $this->getSwapTranslationService();
+
+        $oldMainDetails = $product->getDetails()->get(0);
+        $newMainDetails = $product->getDetails()->get(1);
+
+        // swap translations for the first time
+        $swapTranslationService->swapProductVariantTranslation($newMainDetails, $oldMainDetails);
+        // make translation changes
+        $translationService = $this->getContainer()->get(Shopware_Components_Translation::class);
+        $translationService->write(
+            self::LANGUAGE_ID,
+            SwapProductVariantTranslationServiceInterface::OBJECT_TYPE_VARIANT,
+            self::PRODUCT_MAIN_VARIANT_ID,
+            ['__attribute_attr1' => 'Change one', '__attribute_attr2' => 'Change one', '__attribute_attr3' => '']
+        );
+        // swap translation back
+        $swapTranslationService->swapProductVariantTranslation($oldMainDetails, $newMainDetails);
+        // make translation changes again
+        $translationService = $this->getContainer()->get(Shopware_Components_Translation::class);
+        $translationService->write(
+            self::LANGUAGE_ID,
+            SwapProductVariantTranslationServiceInterface::OBJECT_TYPE_PRODUCT,
+            self::PRODUCT_ID,
+            ['__attribute_attr1' => 'Change two', '__attribute_attr2' => 'Change two', '__attribute_attr3' => '']
+        );
+
+        $allProductTranslationsResult = $this->getAllProductTranslationsResult();
+
+        static::assertCount(6, $allProductTranslationsResult);
+        static::assertCount(
+            2,
+            array_filter($allProductTranslationsResult, function ($translation) {
+                return $translation['objecttype'] === SwapProductVariantTranslationServiceInterface::OBJECT_TYPE_PRODUCT;
+            })
+        );
+        static::assertCount(
+            4,
+            array_filter($allProductTranslationsResult, function ($translation) {
+                return $translation['objecttype'] === SwapProductVariantTranslationServiceInterface::OBJECT_TYPE_VARIANT;
+            })
+        );
+
+        $mainVariantTranslationResult = $this->getTranslations(SwapProductVariantTranslationServiceInterface::OBJECT_TYPE_VARIANT, self::PRODUCT_MAIN_VARIANT_ID, self::LANGUAGE_ID);
+        static::assertCount(0, $mainVariantTranslationResult);
+
+        $productTranslationResult = $this->getTranslations(SwapProductVariantTranslationServiceInterface::OBJECT_TYPE_PRODUCT, self::PRODUCT_ID, self::LANGUAGE_ID);
+        static::assertCount(1, $productTranslationResult);
+
+        $productTranslationResult = array_shift($productTranslationResult);
+        static::assertIsArray($productTranslationResult);
+        static::assertArrayHasKey('objectdata', $productTranslationResult);
+
+        $objectDataResult = $productTranslationResult['objectdata'];
+        $unserializedObjectData = unserialize($objectDataResult);
+        static::assertIsArray($unserializedObjectData);
+        static::assertCount(2, $unserializedObjectData);
+
+        foreach ($unserializedObjectData as $result) {
+            static::assertSame('Change two', $result);
+        }
+    }
+
+    private function getSwapTranslationService(): SwapProductVariantTranslationService
+    {
+        return new SwapProductVariantTranslationService(
+            $this->getContainer()->get(Connection::class)
+        );
+    }
+
+    /**
+     * @return array<int,mixed>
+     */
+    private function getAllProductTranslationsResult(): array
+    {
+        $queryBuilder = $this->getContainer()->get(Connection::class)->createQueryBuilder();
+
+        return $queryBuilder->select(['*'])
+            ->from('s_core_translations')
+            ->where('objecttype IN (:objectType)')
+            ->andWhere('objectkey IN (:objectKey)')
+            ->setParameter('objectType', ['article', 'variant'], Connection::PARAM_STR_ARRAY)
+            ->setParameter('objectKey', [self::PRODUCT_ID, self::PRODUCT_MAIN_VARIANT_ID, self::PRODUCT_VARIANT_1_ID, self::PRODUCT_VARIANT_2_ID], Connection::PARAM_STR_ARRAY)
+            ->execute()
+            ->fetchAllAssociative();
+    }
+
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function getTranslations(string $objectType, int $objectKey, int $languageId): array
+    {
+        $queryBuilder = $this->getContainer()->get(Connection::class)->createQueryBuilder();
+
+        return $queryBuilder->select(['*'])
+            ->from('s_core_translations')
+            ->where('objecttype = :objecttype')
+            ->andWhere('objectkey = :objectkey')
+            ->andWhere('objectlanguage = :objectLanguage')
+            ->setParameter('objecttype', $objectType)
+            ->setParameter('objectkey', $objectKey)
+            ->setParameter('objectLanguage', $languageId)
+            ->execute()
+            ->fetchAllAssociative();
+    }
+}
diff --git a/tests/Functional/Components/Translation/_fixtures/variant_product_with_attribute_translations.sql b/tests/Functional/Components/Translation/_fixtures/variant_product_with_attribute_translations.sql
new file mode 100644
index 00000000000..45366da0473
--- /dev/null
+++ b/tests/Functional/Components/Translation/_fixtures/variant_product_with_attribute_translations.sql
@@ -0,0 +1,39 @@
+INSERT INTO `s_articles` (`id`, `supplierID`, `name`, `description`, `description_long`, `shippingtime`, `datum`,
+                          `active`, `taxID`, `pseudosales`, `topseller`, `metaTitle`, `keywords`, `changetime`,
+                          `pricegroupID`, `pricegroupActive`, `filtergroupID`, `laststock`, `crossbundlelook`,
+                          `notification`, `template`, `mode`, `main_detail_id`, `available_from`, `available_to`,
+                          `configurator_set_id`)
+VALUES (:productId, 1, 'Translation test product', '',
+        '<p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.</p>',
+        NULL, '2023-06-06', 1, 1, 0, 0, '', '', '2023-06-06 08:21:23', NULL, 0, NULL, 0, 0, 0, '', 0, :mainVariantId, NULL, NULL,
+        36);
+
+INSERT INTO `s_articles_details` (`id`, `articleID`, `ordernumber`, `suppliernumber`, `kind`, `additionaltext`, `sales`, `active`, `instock`, `stockmin`, `laststock`, `weight`, `position`, `width`, `height`, `length`, `ean`, `unitID`, `purchasesteps`, `maxpurchase`, `minpurchase`, `purchaseunit`, `referenceunit`, `packunit`, `releasedate`, `shippingfree`, `shippingtime`, `purchaseprice`) VALUES
+    (:mainVariantId, :productId, 'SW19856321', '', 1, '', 0, 1, 0, 0, 0, NULL, 0, NULL, NULL, NULL, '', NULL, NULL, NULL, 1, NULL, NULL, '', NULL, 0, '', 0),
+    (:variantIdOne, :productId, 'SW19856321.4', '', 2, '', 0, 1, 0, 0, 0, NULL, 0, NULL, NULL, NULL, '', NULL, NULL, NULL, 1, NULL, NULL, '', NULL, 0, '', 0),
+    (:variantIdTwo, :productId, 'SW19856321.5', '', 2, '', 0, 1, 0, 0, 0, NULL, 0, NULL, NULL, NULL, '', NULL, NULL, NULL, 1, NULL, NULL, '', NULL, 0, '', 0);
+
+INSERT INTO `s_articles_attributes` (`articledetailsID`, `attr1`, `attr2`, `attr3`, `attr4`, `attr5`, `attr6`, `attr7`, `attr8`, `attr9`, `attr10`, `attr11`, `attr12`, `attr13`, `attr14`, `attr15`, `attr16`, `attr17`, `attr18`, `attr19`, `attr20`) VALUES
+    (:mainVariantId, '0,2 Liter Freitext - 1', '0,2 Liter Freitext - 2', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+    (:variantIdOne, '0,7 Liter Freitext - 1', '0,7 Liter Freitext - 2', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+    (:variantIdTwo, '1 Liter Freitext - 1', '1 Liter Freitext - 2', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+INSERT INTO `s_articles_categories` (`articleID`, `categoryID`) VALUES
+    (:productId, 14),
+    (:productId, 50);
+
+INSERT INTO `s_articles_prices` (`pricegroup`, `from`, `to`, `articleID`, `articledetailsID`, `price`, `pseudoprice`, `regulation_price`, `baseprice`, `percent`) VALUES
+    ('EK', 1, 'beliebig', :productId, :mainVariantId, 84.025210084034, 0, 0, NULL, 10.00),
+    ('EK', 1, 'beliebig', :productId, :variantIdOne, 84.025210084034, 0, 0, NULL, 10.00),
+    ('EK', 1, 'beliebig', :productId, :variantIdTwo, 84.025210084034, 0, 0, NULL, 10.00);
+
+INSERT INTO `s_articles_translations` (`articleID`, `languageID`, `name`, `keywords`, `description`, `description_long`, `description_clear`, `shippingtime`, `attr1`, `attr2`, `attr3`, `attr4`, `attr5`) VALUES
+    (:productId, 2, '', '', '', '', '', '', '0,2 Litre Freetext - 1', '0,2 Litre Freetext - 2', '', '', '');
+
+INSERT INTO `s_core_translations` (`objecttype`, `objectdata`, `objectkey`, `objectlanguage`, `dirty`) VALUES
+    ('article', 'a:2:{s:17:\"__attribute_attr1\";s:22:\"0,2 Litre Freetext - 1\";s:17:\"__attribute_attr2\";s:22:\"0,2 Litre Freetext - 2\";}', :productId, '2', 1),
+    ('variant', 'a:2:{s:17:\"__attribute_attr1\";s:22:\"0,7 Litre Freetext - 1\";s:17:\"__attribute_attr2\";s:22:\"0,7 Litre Freetext - 2\";}', :variantIdOne, '2', 1),
+    ('variant', 'a:2:{s:17:\"__attribute_attr1\";s:20:\"1 Litre Freetext - 1\";s:17:\"__attribute_attr2\";s:20:\"1 Litre Freetext - 2\";}', :variantIdTwo, '2', 1),
+    ('article', 'a:2:{s:17:\"__attribute_attr1\";s:22:\"0,2 Foo Bar - 1\";s:17:\"__attribute_attr2\";s:22:\"0,2 Litre Freetext - 2\";}', :productId, '3', 1),
+    ('variant', 'a:2:{s:17:\"__attribute_attr1\";s:22:\"0,7 Foo Bar - 1\";s:17:\"__attribute_attr2\";s:22:\"0,7 Litre Freetext - 2\";}', :variantIdOne, '3', 1),
+    ('variant', 'a:2:{s:17:\"__attribute_attr1\";s:20:\"1 Foo Bar - 1\";s:17:\"__attribute_attr2\";s:20:\"1 Litre Freetext - 2\";}', :variantIdTwo, '3', 1);
diff --git a/tests/Functional/Components/TranslationTest.php b/tests/Functional/Components/TranslationTest.php
index 754c7880b2c..98c2b0f3f94 100644
--- a/tests/Functional/Components/TranslationTest.php
+++ b/tests/Functional/Components/TranslationTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Components;
diff --git a/tests/Functional/Components/_fixtures/OrdersWithoutDocument.php b/tests/Functional/Components/_fixtures/OrdersWithoutDocument.php
index 58f36fddffe..01a0da705a6 100644
--- a/tests/Functional/Components/_fixtures/OrdersWithoutDocument.php
+++ b/tests/Functional/Components/_fixtures/OrdersWithoutDocument.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 return [
diff --git a/tests/Functional/Controllers/Backend/AnalyticsTest.php b/tests/Functional/Controllers/Backend/AnalyticsTest.php
index 29e49ae8bf4..ce25dba222b 100644
--- a/tests/Functional/Controllers/Backend/AnalyticsTest.php
+++ b/tests/Functional/Controllers/Backend/AnalyticsTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Backend;
@@ -171,7 +170,7 @@ public function testGetOverview(): void
     {
         $this->getContainer()->get('events')->addListener('Shopware_Analytics_ShopStatisticTurnover', function (Enlight_Event_EventArgs $args) {
             $queryBuilder = $args->getReturn();
-            $queryBuilder->addSelect(sprintf('COUNT(orders.id) as %s', self::TEST_SELECT_KEY));
+            $queryBuilder->addSelect(\sprintf('COUNT(orders.id) as %s', self::TEST_SELECT_KEY));
         });
 
         $request = new Enlight_Controller_Request_RequestTestCase();
@@ -1154,7 +1153,7 @@ private function getSearchTermFromReferrerUrl(string $url): string
     {
         preg_match_all(
             '#[?&]([qp]|query|highlight|encquery|url|field-keywords|as_q|sucheall|satitle|KW)=([^&\$]+)#',
-            utf8_encode($url) . '&',
+            mb_convert_encoding($url, 'UTF-8', 'ISO-8859-1') . '&',
             $matches
         );
         if (empty($matches[0])) {
diff --git a/tests/Functional/Controllers/Backend/ApplicationTest.php b/tests/Functional/Controllers/Backend/ApplicationTest.php
index 98b6eb0b488..ad15d2d3236 100644
--- a/tests/Functional/Controllers/Backend/ApplicationTest.php
+++ b/tests/Functional/Controllers/Backend/ApplicationTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Backend;
@@ -30,10 +30,8 @@
 use Generator;
 use PHPUnit\Framework\TestCase;
 use ReflectionClass;
-use Shopware\Components\DependencyInjection\Container;
-use Shopware\Models\Customer\Address;
+use Shopware\Tests\Functional\Controllers\Backend\Mock\ApplicationControllerMock;
 use Shopware\Tests\Functional\Traits\ContainerTrait;
-use Shopware_Controllers_Backend_Application;
 
 class ApplicationTest extends TestCase
 {
@@ -41,6 +39,8 @@ class ApplicationTest extends TestCase
 
     /**
      * @dataProvider formatSearchValueTestDataProvider
+     *
+     * @param array{0: string, 1: array{type: string}} $parameter
      */
     public function testFormatSearchValue(array $parameter, string $expectedResult): void
     {
@@ -54,13 +54,37 @@ public function testFormatSearchValue(array $parameter, string $expectedResult):
         static::assertSame($expectedResult, $result);
     }
 
+    /**
+     * @return array<array{0: array{0: string, 1: array{type: string}}, 1: string}>
+     */
+    public function formatSearchValueTestDataProvider(): array
+    {
+        return [
+            [['', ['type' => '']], '%%'],
+            [['test', ['type' => '']], '%test%'],
+            [['12-12', ['type' => '']], '%12-12%'],
+            [['12-12', ['type' => 'date']], '%12-12%'],
+            [['12-12', ['type' => 'datetime']], '%12-12%'],
+            [['2019-1016', ['type' => 'date']], '%2019-1016%'],
+            [['2019-10-16', ['type' => 'datetime']], '%2019-10-16%'],
+            [['2019-1016', ['type' => 'datetime']], '%2019-1016%'],
+            [['23.06.1999', ['type' => 'datetime']], '%1999-06-23%'],
+            [['23-1999', ['type' => 'date']], '%23-1999%'],
+            [['23-1999', ['type' => 'datetime']], '%23-1999%'],
+            [['2319-991', ['type' => 'datetime']], '%2319-991%'],
+            [['2019-991', ['type' => 'date']], '%2019-991%'],
+            [['2019-991', ['type' => 'datetime']], '%2019-991%'],
+            [['2019-10-16', ['type' => 'date']], '2019-10-16'],
+            [['23.06.1999', ['type' => 'date']], '1999-06-23'],
+        ];
+    }
+
     /**
      * @dataProvider searchProvider
      */
     public function testGetSearchAssociationQueryDoesNotContainUnnecessaryParameters(?string $search, ?int $id): void
     {
-        $controller = new ApplicationControllerDerivateMock();
-        static::assertInstanceOf(Container::class, $this->getContainer());
+        $controller = new ApplicationControllerMock();
         $controller->setContainer($this->getContainer());
 
         $getAssociationModel = Closure::bind(function (string $association): string {
@@ -103,30 +127,8 @@ public function testGetSearchAssociationQueryDoesNotContainUnnecessaryParameters
         }
     }
 
-    public function formatSearchValueTestDataProvider(): array
-    {
-        return [
-            [['', ['type' => '']], '%%'],
-            [['test', ['type' => '']], '%test%'],
-            [['12-12', ['type' => '']], '%12-12%'],
-            [['12-12', ['type' => 'date']], '%12-12%'],
-            [['12-12', ['type' => 'datetime']], '%12-12%'],
-            [['2019-1016', ['type' => 'date']], '%2019-1016%'],
-            [['2019-10-16', ['type' => 'datetime']], '%2019-10-16%'],
-            [['2019-1016', ['type' => 'datetime']], '%2019-1016%'],
-            [['23.06.1999', ['type' => 'datetime']], '%1999-06-23%'],
-            [['23-1999', ['type' => 'date']], '%23-1999%'],
-            [['23-1999', ['type' => 'datetime']], '%23-1999%'],
-            [['2319-991', ['type' => 'datetime']], '%2319-991%'],
-            [['2019-991', ['type' => 'date']], '%2019-991%'],
-            [['2019-991', ['type' => 'datetime']], '%2019-991%'],
-            [['2019-10-16', ['type' => 'date']], '2019-10-16'],
-            [['23.06.1999', ['type' => 'date']], '1999-06-23'],
-        ];
-    }
-
     /**
-     * @return Generator<string, array>
+     * @return Generator<string, list<mixed>>
      */
     public function searchProvider(): Generator
     {
@@ -137,24 +139,14 @@ public function searchProvider(): Generator
         yield 'search parameter empty, id set' => ['', 2];
         yield 'search parameter set, id set' => ['24146963-df33-4ca8-b8ca-97eb4885e832', 2];
     }
-}
-
-/**
- * @extends \Shopware_Controllers_Backend_Application<Address>
- */
-class ApplicationControllerMock extends Shopware_Controllers_Backend_Application
-{
-    protected $model = Address::class;
-
-    protected $alias = 'address';
-}
 
-/**
- * @extends \Shopware_Controllers_Backend_Application<Address>
- */
-class ApplicationControllerDerivateMock extends Shopware_Controllers_Backend_Application
-{
-    protected $model = Address::class;
+    public function testGetDetail(): void
+    {
+        $controller = new ApplicationControllerMock();
+        $controller->setContainer($this->getContainer());
 
-    protected $alias = 'address';
+        $detail = $controller->getDetail(9999);
+        static::assertTrue($detail['success']);
+        static::assertEmpty($detail['data']);
+    }
 }
diff --git a/tests/Functional/Controllers/Backend/ArticleTest.php b/tests/Functional/Controllers/Backend/ArticleTest.php
index 208d74524d8..742752506b2 100644
--- a/tests/Functional/Controllers/Backend/ArticleTest.php
+++ b/tests/Functional/Controllers/Backend/ArticleTest.php
@@ -1,101 +1,88 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Backend;
 
 use Doctrine\DBAL\Connection;
-use Enlight_Components_Test_Controller_TestCase;
+use Enlight_Controller_Request_RequestHttp;
 use Enlight_Controller_Request_RequestTestCase;
 use Enlight_Template_Manager;
 use Enlight_View_Default;
-use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 use ReflectionClass;
-use ReflectionMethod;
-use Shopware\Models\Article\Article;
-use Shopware\Models\Article\Detail;
+use sBasket;
+use Shopware\Bundle\StoreFrontBundle\Service\ConfiguratorServiceInterface;
+use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface;
+use Shopware\Bundle\StoreFrontBundle\Service\ListProductServiceInterface;
+use Shopware\Bundle\StoreFrontBundle\Struct\Configurator\Set as StoreFrontConfiguratorSet;
+use Shopware\Bundle\StoreFrontBundle\Struct\ListProduct;
+use Shopware\Components\Model\ModelManager;
+use Shopware\Models\Article\Article as Product;
+use Shopware\Models\Article\Configurator\Set;
+use Shopware\Models\Article\Detail as Variant;
 use Shopware\Tests\Functional\Bundle\StoreFrontBundle\Helper;
 use Shopware\Tests\Functional\Traits\ContainerTrait;
 use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 use Shopware_Controllers_Backend_Article;
+use Symfony\Component\HttpFoundation\Request;
 
-class ArticleTest extends Enlight_Components_Test_Controller_TestCase
+class ArticleTest extends TestCase
 {
     use ContainerTrait;
     use DatabaseTransactionBehaviour;
 
-    /**
-     * @var ReflectionMethod
-     */
-    private $prepareNumberSyntaxMethod;
-
-    /**
-     * @var ReflectionMethod
-     */
-    private $interpretNumberSyntaxMethod;
-
-    /**
-     * @var MockObject|Shopware_Controllers_Backend_Article
-     */
-    private $controller;
-
-    /**
-     * Standard set up for every test - just disable auth
-     */
-    public function setUp(): void
-    {
-        parent::setUp();
+    private const PRODUCT_WITH_VARIANTS_ID = 180;
+    private const PRODUCT_ID_SPACHTELMASSE = 272;
 
-        // Disable auth and acl
-        Shopware()->Plugins()->Backend()->Auth()->setNoAuth();
-        Shopware()->Plugins()->Backend()->Auth()->setNoAcl();
+    private Shopware_Controllers_Backend_Article $controller;
 
-        $this->controller = $this->createPartialMock(Shopware_Controllers_Backend_Article::class, []);
+    private ModelManager $modelManager;
 
-        $class = new ReflectionClass($this->controller);
-
-        $this->prepareNumberSyntaxMethod = $class->getMethod('prepareNumberSyntax');
-        $this->prepareNumberSyntaxMethod->setAccessible(true);
+    private sBasket $basketModule;
 
-        $this->interpretNumberSyntaxMethod = $class->getMethod('interpretNumberSyntax');
-        $this->interpretNumberSyntaxMethod->setAccessible(true);
-    }
+    private ConfiguratorServiceInterface $configuratorService;
 
-    public function tearDown(): void
+    public function setUp(): void
     {
-        parent::tearDown();
-        Shopware()->Plugins()->Backend()->Auth()->setNoAuth(false);
-        Shopware()->Plugins()->Backend()->Auth()->setNoAcl(false);
+        $this->controller = new Shopware_Controllers_Backend_Article();
+        $this->controller->setContainer($this->getContainer());
+        $this->controller->setView(new Enlight_View_Default(new Enlight_Template_Manager()));
+
+        $this->modelManager = $this->getContainer()->get(ModelManager::class);
+        $this->basketModule = $this->getContainer()->get('modules')->Basket();
+        $this->configuratorService = $this->getContainer()->get(ConfiguratorServiceInterface::class);
     }
 
     /**
-     * Tests whether an article cannot be overwritten by a save request that bases on outdated data. (The article in the
-     * database is newer than that one the request body is based on.)
+     * Tests whether a product cannot be overwritten by a save request that bases on outdated data.
+     * (The product in the database is newer than that one the request body is based on.)
      */
     public function testSaveArticleOverwriteProtection(): void
     {
         $helper = new Helper($this->getContainer());
-        $article = $helper->createProduct([
+        $product = $helper->createProduct([
             'name' => 'Testartikel',
             'description' => 'Test description',
             'active' => true,
@@ -120,40 +107,46 @@ public function testSaveArticleOverwriteProtection(): void
 
         // Prepare post data for request
         $postData = [
-            'id' => $article->getId(),
-            'changed' => $article->getChanged()->format('c'),
+            'id' => $product->getId(),
+            'changed' => $product->getChanged()->format('c'),
         ];
 
         // Try to change the entity with the correct timestamp. This should work
-        $this->Request()
-            ->setMethod('POST')
-            ->setPost($postData);
+        $request = new Enlight_Controller_Request_RequestHttp();
+        $request->setMethod(Request::METHOD_POST);
+        $request->setPost($postData);
+        $this->controller->setRequest($request);
+        $this->controller->saveAction();
 
-        $this->dispatch('backend/Article/save');
-        static::assertTrue($this->View()->getAssign('success'));
+        static::assertTrue($this->controller->View()->getAssign('success'));
 
         // Now use an outdated timestamp. The controller should detect this and fail.
         $postData['changed'] = '2008-08-07 18:11:31';
-        $this->Request()
-            ->setMethod('POST')
-            ->setPost($postData);
-
-        $this->dispatch('backend/Article/save');
-        static::assertFalse($this->View()->getAssign('success'));
+        $request = new Enlight_Controller_Request_RequestHttp();
+        $request->setMethod(Request::METHOD_POST);
+        $request->setPost($postData);
+        $this->controller->setRequest($request);
+        $this->controller->saveAction();
+        static::assertFalse($this->controller->View()->getAssign('success'));
     }
 
     public function testInterpretNumberSyntax(): void
     {
-        $article = new Article();
+        $product = new Product();
 
-        $detail = new Detail();
+        $detail = new Variant();
         $detail->setNumber('SW500');
-        $article->setMainDetail($detail);
+        $product->setMainDetail($detail);
 
-        $commands = $this->prepareNumberSyntaxMethod->invokeArgs($this->controller, ['{mainDetail.number}.{n}']);
+        $class = new ReflectionClass($this->controller);
+        $prepareNumberSyntaxMethod = $class->getMethod('prepareNumberSyntax');
+        $prepareNumberSyntaxMethod->setAccessible(true);
+        $commands = $prepareNumberSyntaxMethod->invokeArgs($this->controller, ['{mainDetail.number}.{n}']);
 
-        $result = $this->interpretNumberSyntaxMethod->invokeArgs($this->controller, [
-            $article,
+        $interpretNumberSyntaxMethod = $class->getMethod('interpretNumberSyntax');
+        $interpretNumberSyntaxMethod->setAccessible(true);
+        $result = $interpretNumberSyntaxMethod->invokeArgs($this->controller, [
+            $product,
             $detail,
             $commands,
             2,
@@ -171,34 +164,168 @@ public function testSaveNetRegulationPrice(): void
             'taxId' => 1,
             'autoNumber' => '10002',
             'mainPrices' => [
-                    0 => [
-                            'id' => 0,
-                            'from' => 1,
-                            'to' => 'Beliebig',
-                            'price' => 10,
-                            'pseudoPrice' => 0,
-                            'regulationPrice' => 119,
-                            'percent' => 0,
-                            'customerGroupKey' => 'EK',
-                        ],
+                [
+                    'from' => 1,
+                    'to' => 'Beliebig',
+                    'price' => 10,
+                    'pseudoPrice' => 0,
+                    'regulationPrice' => 119,
+                    'percent' => 0,
+                    'customerGroupKey' => 'EK',
                 ],
+            ],
         ];
 
-        $view = new Enlight_View_Default(new Enlight_Template_Manager());
         $request = new Enlight_Controller_Request_RequestTestCase();
-
         $request->setPost($product);
-        $this->controller->setView($view);
         $this->controller->setRequest($request);
-        $this->controller->setContainer($this->getContainer());
         $this->controller->saveAction();
 
-        $data = $view->getAssign('data');
-        $firstArticle = array_pop($data);
+        $data = $this->controller->View()->getAssign('data');
+        $firstProduct = array_pop($data);
 
-        $regulationPrice = $this->getContainer()->get(Connection::class)->fetchOne('SELECT regulation_price FROM s_articles_prices WHERE articleID = ' . $firstArticle['id']);
+        $regulationPrice = $this->modelManager->getConnection()->fetchOne('SELECT regulation_price FROM s_articles_prices WHERE articleID = ' . $firstProduct['id']);
 
-        //(119 / 119) * 100
+        // (119 / 119) * 100
         static::assertEquals(100, (float) $regulationPrice);
     }
+
+    public function testProductNameAfterTurningVariantItemBackToDefaultProduct(): void
+    {
+        $product = $this->modelManager->getRepository(Product::class)->find(self::PRODUCT_WITH_VARIANTS_ID);
+        static::assertInstanceOf(Product::class, $product);
+        $productName = $product->getName();
+
+        $variant = $product->getMainDetail();
+        static::assertInstanceOf(Variant::class, $variant);
+        $ordernumber = (string) $variant->getNumber();
+        static::assertInstanceOf(Set::class, $product->getConfiguratorSet());
+
+        $configOptions = $variant->getConfiguratorOptions();
+        static::assertGreaterThan(0, $configOptions->count());
+        $options = [];
+        foreach ($configOptions as $option) {
+            $options[] = $option->getName();
+        }
+
+        $productNameInBasket = $this->addToBasket($ordernumber);
+        static::assertSame($productName . ' ' . implode(' /', $options), $productNameInBasket);
+
+        $this->deleteVariants();
+        $this->turnToDefaultProduct();
+
+        $this->modelManager->clear();
+        $product = $this->modelManager->getRepository(Product::class)->find(self::PRODUCT_WITH_VARIANTS_ID);
+        static::assertInstanceOf(Product::class, $product);
+        $variant = $product->getMainDetail();
+        static::assertInstanceOf(Variant::class, $variant);
+
+        static::assertNull($product->getConfiguratorSet());
+        static::assertCount(0, $variant->getConfiguratorOptions());
+        static::assertSame('', $variant->getAdditionalText());
+
+        $productNameInBasket = $this->addToBasket($ordernumber);
+        static::assertSame($productName, $productNameInBasket);
+    }
+
+    public function testVariantOptionsNotShownOnProductDetailPageAfterDeletingThese(): void
+    {
+        $product = $this->modelManager->getRepository(Product::class)->find(self::PRODUCT_WITH_VARIANTS_ID);
+        static::assertInstanceOf(Product::class, $product);
+        $variant = $product->getMainDetail();
+        static::assertInstanceOf(Variant::class, $variant);
+        $ordernumber = $variant->getNumber();
+        static::assertIsString($ordernumber);
+
+        $this->deleteVariants();
+
+        $context = $this->getContainer()->get(ContextServiceInterface::class)->getShopContext();
+        $product = Shopware()->Container()->get(ListProductServiceInterface::class)->get($ordernumber, $context);
+        static::assertInstanceOf(ListProduct::class, $product);
+        $configurator = $this->configuratorService->getProductConfigurator(
+            $product,
+            $context,
+            []
+        );
+        static::assertInstanceOf(StoreFrontConfiguratorSet::class, $configurator);
+        foreach ($configurator->getGroups() as $group) {
+            static::assertCount(1, $group->getOptions());
+        }
+    }
+
+    public function testGetArticleImagesIfImageWasDeleted(): void
+    {
+        $manipulatedImagePosition = 2;
+        $connection = $this->getContainer()->get(Connection::class);
+        $connection->update('s_articles_img', ['media_id' => null], ['position' => $manipulatedImagePosition]);
+        $images = $this->controller->getArticleImages(self::PRODUCT_ID_SPACHTELMASSE);
+
+        foreach ($images as $image) {
+            if ((int) $image['position'] === $manipulatedImagePosition) {
+                static::assertNull($image['media']);
+            } else {
+                static::assertIsArray($image['media']);
+            }
+        }
+    }
+
+    private function addToBasket(string $ordernumber): string
+    {
+        $this->basketModule->sAddArticle($ordernumber);
+        $sql = 'SELECT articlename FROM s_order_basket WHERE sessionID = :sessionId;';
+        $productName = $this->modelManager->getConnection()->executeQuery($sql, ['sessionId' => $this->getContainer()->get('session')->getId()])->fetchOne();
+        $this->basketModule->sDeleteBasket();
+        static::assertSame(0, $this->basketModule->sCountBasket());
+
+        return $productName;
+    }
+
+    private function deleteVariants(): void
+    {
+        $sql = '
+        SELECT
+            ad.id,
+            acor.option_id
+        FROM
+            s_articles_details AS ad,
+            s_article_configurator_option_relations AS acor
+        WHERE
+            ad.articleID = :id AND acor.article_id = ad.id';
+
+        $variantDatas = $this->modelManager->getConnection()->executeQuery($sql, ['id' => self::PRODUCT_WITH_VARIANTS_ID])->fetchAllAssociative();
+        static::assertGreaterThan(1, \count($variantDatas), 'This product has no variants.');
+
+        $params = [
+            'details' => [],
+        ];
+
+        for ($i = 0, $size = \count($variantDatas); $i < $size; ++$i) {
+            $params['details'][$i] = ['id' => (int) $variantDatas[$i]['id']];
+            $params['details'][$i]['configuratorOptions'][] = ['id' => (int) $variantDatas[$i]['option_id']];
+        }
+
+        $request = new Enlight_Controller_Request_RequestTestCase();
+        $request->setParams($params);
+        $this->controller->setRequest($request);
+        $this->controller->deleteDetailAction();
+
+        static::assertTrue($this->controller->View()->getAssign('success'));
+
+        $variants = $this->modelManager->getConnection()->executeQuery($sql, ['id' => self::PRODUCT_WITH_VARIANTS_ID])->fetchAllAssociative();
+        static::assertCount(1, $variants);
+    }
+
+    private function turnToDefaultProduct(): void
+    {
+        $productDataParams = require __DIR__ . '/_fixtures/article/productData.php';
+
+        $request = new Enlight_Controller_Request_RequestTestCase();
+        $request->setParams($productDataParams);
+        $this->controller->setRequest($request);
+        $this->controller->saveAction();
+
+        $response = $this->controller->View()->getAssign();
+        static::assertTrue($response['success']);
+        static::assertSame('', $response['data'][0]['mainDetail']['additionalText']);
+    }
 }
diff --git a/tests/Functional/Controllers/Backend/BannerTest.php b/tests/Functional/Controllers/Backend/BannerTest.php
index 4efc426fe88..e03031b8f62 100644
--- a/tests/Functional/Controllers/Backend/BannerTest.php
+++ b/tests/Functional/Controllers/Backend/BannerTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Backend;
diff --git a/tests/Functional/Controllers/Backend/BaseTest.php b/tests/Functional/Controllers/Backend/BaseTest.php
new file mode 100644
index 00000000000..cf1c7cd45d7
--- /dev/null
+++ b/tests/Functional/Controllers/Backend/BaseTest.php
@@ -0,0 +1,267 @@
+<?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Controllers\Backend;
+
+use Enlight_Components_Test_Controller_TestCase;
+use Enlight_Controller_Request_RequestTestCase;
+use Enlight_Controller_Response_ResponseTestCase;
+use Enlight_Template_Manager;
+use Enlight_View_Default;
+use Generator;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
+use Shopware_Controllers_Backend_Base;
+use Shopware_Plugins_Backend_Auth_Bootstrap as AuthPlugin;
+
+class BaseTest extends Enlight_Components_Test_Controller_TestCase
+{
+    use ContainerTrait;
+    use DatabaseTransactionBehaviour;
+
+    private AuthPlugin $authPlugin;
+
+    /**
+     * Standard set up for every test - just disable auth
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->authPlugin = $this->getContainer()->get('plugins')->Backend()->Auth();
+        $this->authPlugin->setNoAuth();
+    }
+
+    public function tearDown(): void
+    {
+        parent::tearDown();
+
+        $this->authPlugin->setNoAuth(false);
+    }
+
+    /**
+     * @dataProvider provideSearchString
+     *
+     * @param array<array{total: int, id: string, name: string, description: string, active: string, ordernumber: string, articleId: string, inStock: string, supplierName: string, supplierId: string, additionalText: string, price: float}> $expectedResults
+     */
+    public function testGetVariantsActionConfirmReturnValues(string $searchTerm, bool $hasResults, array $expectedResults = []): void
+    {
+        $params = [
+            'articles' => 'true',
+            'variants' => 'true',
+            'configurator' => 'true',
+            'page' => 1,
+            'start' => 0,
+            'limit' => 10,
+            'filter' => [[
+                'property' => 'free',
+                'value' => '%' . $searchTerm . '%',
+                'operator' => null,
+                'expression' => null,
+            ]],
+        ];
+
+        $request = new Enlight_Controller_Request_RequestTestCase();
+        $request->setParams($params);
+
+        $controller = $this->createController();
+        $controller->setRequest($request);
+        $controller->getVariantsAction();
+        $jsonBody = $controller->View()->getAssign();
+
+        static::assertIsArray($jsonBody);
+        static::assertIsArray($jsonBody['data']);
+        static::assertIsBool($jsonBody['success']);
+        static::assertIsInt($jsonBody['total']);
+
+        if (!$hasResults) {
+            static::assertEmpty($jsonBody['data']);
+            static::assertEquals(0, $jsonBody['total']);
+
+            return;
+        }
+
+        static::assertLessThanOrEqual($params['limit'], \count($jsonBody['data']));
+        static::assertArrayHasKey('id', $jsonBody['data'][0]);
+        static::assertIsString($jsonBody['data'][0]['id']);
+        static::assertArrayHasKey('name', $jsonBody['data'][0]);
+        static::assertIsString($jsonBody['data'][0]['name']);
+        static::assertArrayHasKey('description', $jsonBody['data'][0]);
+        static::assertIsString($jsonBody['data'][0]['description']);
+        static::assertArrayHasKey('active', $jsonBody['data'][0]);
+        static::assertIsString($jsonBody['data'][0]['active']);
+        static::assertArrayHasKey('ordernumber', $jsonBody['data'][0]);
+        static::assertIsString($jsonBody['data'][0]['ordernumber']);
+        static::assertArrayHasKey('articleId', $jsonBody['data'][0]);
+        static::assertIsString($jsonBody['data'][0]['articleId']);
+        static::assertArrayHasKey('inStock', $jsonBody['data'][0]);
+        static::assertIsString($jsonBody['data'][0]['inStock']);
+        static::assertArrayHasKey('supplierName', $jsonBody['data'][0]);
+        static::assertIsString($jsonBody['data'][0]['supplierName']);
+        static::assertArrayHasKey('supplierId', $jsonBody['data'][0]);
+        static::assertIsString($jsonBody['data'][0]['supplierId']);
+        static::assertArrayHasKey('additionalText', $jsonBody['data'][0]);
+        static::assertIsString($jsonBody['data'][0]['additionalText']);
+        static::assertArrayHasKey('price', $jsonBody['data'][0]);
+        static::assertIsFloat($jsonBody['data'][0]['price']);
+
+        if (!empty($expectedResults)) {
+            static::assertEquals($expectedResults['total'], $jsonBody['total']);
+            static::assertEquals((int) $expectedResults['inStock'], (int) $jsonBody['data'][0]['inStock']);
+            unset($expectedResults['inStock'], $expectedResults['total']);
+            foreach ($expectedResults as $key => $value) {
+                static::assertEquals($value, $jsonBody['data'][0][$key]);
+            }
+        }
+    }
+
+    /**
+     * @return array<array{0: string, 1: bool, 2?:array{total: int, id: string, name: string, description: string, active: string, ordernumber: string, articleId: string, inStock: string, supplierName: string, supplierId: string, additionalText: string, price: float}}>
+     */
+    public function provideSearchString(): array
+    {
+        return [
+            'orderNumber explicit' => ['SW10178', true, [
+                'total' => 1,
+                'id' => '407',
+                'name' => 'Strandtuch "Ibiza"',
+                'description' => 'paulatim Praecepio lex Edoceo sis conticinium Furtum Heidelberg casula Toto pes an jugiter pe.',
+                'active' => '1',
+                'ordernumber' => 'SW10178',
+                'articleId' => '178',
+                'inStock' => '84',
+                'supplierName' => 'Beachdreams Clothes',
+                'supplierId' => '12',
+                'additionalText' => '',
+                'price' => 19.95,
+            ]],
+            'orderNumber' => ['SW1022', true, [
+                'total' => 10,
+                'id' => '749',
+                'name' => 'Prämienartikel ab 250 Euro Warenkorb Wert',
+                'description' => 'Diesen Artikel können die Kunden kostenpflichtig erwerben oder kostenlos als Prämienartikel ab einem Warenkorb Wert von 250 Euro bekommen.',
+                'active' => '1',
+                'ordernumber' => 'SW10221',
+                'articleId' => '211',
+                'inStock' => '100',
+                'supplierName' => 'Example',
+                'supplierId' => '14',
+                'additionalText' => '',
+                'price' => 50,
+            ]],
+            'supplierName' => ['Sasse', true, [
+                'total' => 10,
+                'id' => '3',
+                'name' => 'Münsterländer Aperitif 16%',
+                'description' => 'ubi ait animadverto poema adicio',
+                'active' => '1',
+                'ordernumber' => 'SW10003',
+                'articleId' => '3',
+                'inStock' => '25',
+                'supplierName' => 'Feinbrennerei Sasse',
+                'supplierId' => '2',
+                'additionalText' => '',
+                'price' => 14.95,
+            ]],
+            'productName' => ['sommer', true, [
+                'total' => 10,
+                'id' => '364',
+                'name' => 'Sommer Sandale Ocean Blue 36',
+                'description' => 'Scelestus nam Comiter, tepesco ansa per ferox for Expiscor. Ex accuse homo avaritia sudo Gandavum.Sem furca pica.',
+                'active' => '1',
+                'ordernumber' => 'SW10160.1',
+                'articleId' => '160',
+                'inStock' => '19',
+                'supplierName' => 'Beachdreams Clothes',
+                'supplierId' => '12',
+                'additionalText' => '36',
+                'price' => 29.99,
+            ]],
+            'productName not exists' => ['lorem', false],
+            'productName not mapped to category' => ['Bikini Ocean Blue', true, [
+                'total' => 1,
+                'id' => '297',
+                'name' => 'Bikini Ocean Blue',
+                'description' => 'Commodo cum mel voluptarius Pariter modicus opto coepto, maligo spes Resono Curvo escendo adsum per Frutex, ubi ait animadve.',
+                'active' => '1',
+                'ordernumber' => 'SW10150',
+                'articleId' => '150',
+                'inStock' => '45',
+                'supplierName' => 'Beachdreams Clothes',
+                'supplierId' => '12',
+                'additionalText' => '',
+                'price' => 9.99,
+            ]],
+        ];
+    }
+
+    /**
+     * @dataProvider provideEmails
+     */
+    public function testValidateEmailAction(string $emails, bool $expectedIsValid): void
+    {
+        $request = new Enlight_Controller_Request_RequestTestCase();
+        $response = new Enlight_Controller_Response_ResponseTestCase();
+        $request->setParam('value', $emails);
+
+        $controller = $this->createController();
+        $controller->setRequest($request);
+        $controller->setResponse($response);
+        $controller->validateEmailAction();
+
+        static::assertSame($expectedIsValid, (bool) $response->getContent());
+    }
+
+    /**
+     * @return Generator<string, array{emails: string, expectedIsValid: bool}>
+     */
+    public function provideEmails(): Generator
+    {
+        yield '1 mail shall be valid' => [
+            'emails' => 'email@shopware.com',
+            'expectedIsValid' => true,
+        ];
+        yield '3 mails shall be valid' => [
+            'emails' => 'email@shopware.com,email2@shopware.com,email3@shopware.com',
+            'expectedIsValid' => true,
+        ];
+        yield '3 mails with whitespaces shall be valid' => [
+            'emails' => 'email@shopware.com , email2@shopware.com , email3@shopware.com',
+            'expectedIsValid' => true,
+        ];
+        yield '3 mail shall be invalid' => [
+            'emails' => 'email@shopware.com,email2@shopware.com,email3@shopware.com||test',
+            'expectedIsValid' => false,
+        ];
+    }
+
+    private function createController(): Shopware_Controllers_Backend_Base
+    {
+        $controller = $this->getContainer()->get('shopware_controllers_backend_base');
+        $controller->setView(new Enlight_View_Default(new Enlight_Template_Manager()));
+        $controller->setContainer($this->getContainer());
+
+        return $controller;
+    }
+}
diff --git a/tests/Functional/Controllers/Backend/CanceledOrderTest.php b/tests/Functional/Controllers/Backend/CanceledOrderTest.php
index 04edc24c54c..5f5b5786af3 100644
--- a/tests/Functional/Controllers/Backend/CanceledOrderTest.php
+++ b/tests/Functional/Controllers/Backend/CanceledOrderTest.php
@@ -1,84 +1,72 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Backend;
 
-use Enlight_Components_Test_Plugin_TestCase;
+use Doctrine\DBAL\Connection;
+use Enlight_Controller_Request_RequestHttp;
+use Enlight_Template_Manager;
+use Enlight_View_Default;
+use PHPUnit\Framework\TestCase;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
+use Shopware_Controllers_Backend_CanceledOrder;
 
-class CanceledOrderTest extends Enlight_Components_Test_Plugin_TestCase
+class CanceledOrderTest extends TestCase
 {
-    public const FIRST_DUMMY_SESSION_ID = '1231231231231231231231231231231231231320';
-    public const SECOND_DUMMY_SESSION_ID = '1231231231231231231231231231231231231321';
-
-    /**
-     * Set up test case, fix demo data where needed
-     */
-    public function setUp(): void
-    {
-        parent::setUp();
-
-        // Insert test order
-        $sql = "
-              INSERT INTO `s_order_basket` (`sessionID`, `userID`, `articlename`, `articleID`, `ordernumber`, `shippingfree`, `quantity`, `price`, `netprice`, `tax_rate`, `datum`, `modus`, `esdarticle`, `partnerID`, `lastviewport`, `useragent`, `config`, `currencyFactor`) VALUES
-                (:firstSession, 0, 'Sonnenbrille Red', 170, 'SW10170', 0, 4, 39.95, 33.571428571429, 19, '2101-09-11 11:49:54', 0, 0, '', 'index', 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:22.0) Gecko/20100101 Firefox/22.0 FirePHP/0.7.2', '', 1),
-                (:firstSession, 0, 'Fliegenklatsche grün', 98, 'SW10101', 0, 1, 0.79, 0.66386554621849, 19, '2101-09-11 11:50:02', 0, 0, '', 'index', 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:22.0) Gecko/20100101 Firefox/22.0 FirePHP/0.7.2', '', 1),
-                (:firstSession, 0, 'Bumerang', 245, 'SW10236', 0, 1, 20, 16.806722689076, 19, '2101-09-11 11:50:13', 0, 0, '', 'index', 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:22.0) Gecko/20100101 Firefox/22.0 FirePHP/0.7.2', '', 1),
-                (:secondSession, 0, 'Dartscheibe Circle', 240, 'SW10231', 0, 1, 49.99, 42.008403361345, 19, '2101-09-11 11:50:17', 0, 0, '', '', '', '', 1),
-                (:secondSession, 0, 'Dartpfeil Steel Atomic', 241, 'SW10232', 0, 1, 14.99, 12.596638655462, 19, '2101-09-11 11:50:20', 0, 0, '', '', '', '', 1),
-                (:firstSession, 0, 'Dart Automat Standgerät', 239, 'SW10230', 0, 1, 2499, 2100, 19, '2101-09-10 11:50:22', 0, 0, '', 'index', 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:22.0) Gecko/20100101 Firefox/22.0 FirePHP/0.7.2', '', 1),
-                (:firstSession, 0, 'Warenkorbrabatt', 0, 'SHIPPINGDISCOUNT', 0, 1, -2, -1.68, 19, '2101-09-10 11:50:22', 4, 0, '', 'index', 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:22.0) Gecko/20100101 Firefox/22.0 FirePHP/0.7.2', '', 1);
-        ";
-
-        Shopware()->Db()->query($sql, ['firstSession' => self::FIRST_DUMMY_SESSION_ID, 'secondSession' => self::SECOND_DUMMY_SESSION_ID]);
-    }
+    use ContainerTrait;
+    use DatabaseTransactionBehaviour;
 
-    /**
-     * Cleaning up testData
-     */
-    protected function tearDown(): void
-    {
-        parent::tearDown();
+    private const FIRST_DUMMY_SESSION_ID = '1231231231231231231231231231231231231320';
+    private const SECOND_DUMMY_SESSION_ID = '1231231231231231231231231231231231231321';
 
-        $sql = '
-            DELETE FROM `s_order_basket` WHERE `sessionID` = :firstSession;
-            DELETE FROM `s_order_basket` WHERE `sessionID` = :secondSession;
-        ';
-
-        Shopware()->Db()->query($sql, ['firstSession' => self::FIRST_DUMMY_SESSION_ID, 'secondSession' => self::SECOND_DUMMY_SESSION_ID]);
-    }
+    private const DEMO_CUSTOMER_ID = 1;
+    private const DEMO_CANCELED_ORDER_ID = 52;
+    private const DEMO_VOUCHER_ID = 4;
+    private const TEST_MAIL_ADDRESS = 'test@example.com';
+    private const TEMPLATE_CANCELED_QUESTION = 'sCANCELEDQUESTION';
+    private const TEMPLATE_CANCELED_VOUCHER = 'sCANCELEDVOUCHER';
 
     /**
      * Test if the canceled order statistic returns the right values
      *
      * @ticket SW-6624
      */
-    public function testCanceledOrderSummary()
+    public function testCanceledOrderSummary(): void
     {
-        Shopware()->Plugins()->Backend()->Auth()->setNoAuth();
+        $this->insertTestOrder();
 
-        $this->dispatch('backend/CanceledOrder/getBasket?fromDate=2101-09-10T00%3A00%3A00&toDate=2101-09-11T00%3A00%3A00');
-        $data = $this->View()->getAssign('data');
+        $controller = $this->getController();
+        $request = new Enlight_Controller_Request_RequestHttp();
+        $request->setQuery([
+            'fromDate' => '2101-09-10T00:00:00',
+            'toDate' => '2101-09-11T00:00:00',
+        ]);
+        $controller->setRequest($request);
+        $controller->getBasketAction();
+
+        $data = $controller->View()->getAssign('data');
 
         $firstRow = $data[0];
         static::assertEquals('2101-09-10', $firstRow['date']);
@@ -96,4 +84,164 @@ public function testCanceledOrderSummary()
         static::assertEquals('2101', $secondRow['year']);
         static::assertEquals('9', $secondRow['month']);
     }
+
+    public function testSendCanceledQuestionMailActionWithoutMailParameter(): void
+    {
+        $controller = $this->getController();
+        $request = new Enlight_Controller_Request_RequestHttp();
+        $controller->setRequest($request);
+        $controller->sendCanceledQuestionMailAction();
+
+        $view = $controller->View();
+        static::assertFalse($view->getAssign('success'));
+        static::assertSame('Es wurde keine E-Mail übergeben.', $view->getAssign('message'));
+    }
+
+    public function testSendCanceledQuestionMailActionWithoutTemplateParameter(): void
+    {
+        $controller = $this->getController();
+        $request = new Enlight_Controller_Request_RequestHttp();
+        $request->setParams([
+            'mail' => self::TEST_MAIL_ADDRESS,
+        ]);
+        $controller->setRequest($request);
+        $controller->sendCanceledQuestionMailAction();
+
+        $view = $controller->View();
+        static::assertFalse($view->getAssign('success'));
+        static::assertSame('Es wurde kein Template übergeben.', $view->getAssign('message'));
+    }
+
+    public function testSendCanceledQuestionMailActionWithoutVoucherIdParameter(): void
+    {
+        $controller = $this->getController();
+        $request = new Enlight_Controller_Request_RequestHttp();
+        $request->setParams([
+            'mail' => self::TEST_MAIL_ADDRESS,
+            'template' => self::TEMPLATE_CANCELED_VOUCHER,
+        ]);
+        $controller->setRequest($request);
+        $controller->sendCanceledQuestionMailAction();
+
+        $view = $controller->View();
+        static::assertFalse($view->getAssign('success'));
+        static::assertSame('Es wurde kein voucherId (GutscheinId) übergeben.', $view->getAssign('message'));
+    }
+
+    public function testSendCanceledQuestionMailActionWithoutCustomerIdParameter(): void
+    {
+        $controller = $this->getController();
+        $request = new Enlight_Controller_Request_RequestHttp();
+        $request->setParams([
+            'mail' => self::TEST_MAIL_ADDRESS,
+            'template' => self::TEMPLATE_CANCELED_QUESTION,
+        ]);
+        $controller->setRequest($request);
+        $controller->sendCanceledQuestionMailAction();
+
+        $view = $controller->View();
+        static::assertFalse($view->getAssign('success'));
+        static::assertSame('Es wurde keine customerId (KundenId) übergeben.', $view->getAssign('message'));
+    }
+
+    public function testSendCanceledQuestionMailActionWithoutOrderIdParameter(): void
+    {
+        $controller = $this->getController();
+        $request = new Enlight_Controller_Request_RequestHttp();
+        $request->setParams([
+            'mail' => self::TEST_MAIL_ADDRESS,
+            'template' => self::TEMPLATE_CANCELED_QUESTION,
+            'customerId' => self::DEMO_CUSTOMER_ID,
+        ]);
+        $controller->setRequest($request);
+        $controller->sendCanceledQuestionMailAction();
+
+        $view = $controller->View();
+        static::assertFalse($view->getAssign('success'));
+        static::assertSame('Es wurde keine orderId übergeben.', $view->getAssign('message'));
+    }
+
+    public function testSendCanceledQuestionMailActionWithoutVoucher(): void
+    {
+        $controller = $this->getController();
+        $request = new Enlight_Controller_Request_RequestHttp();
+        $request->setParams([
+            'mail' => self::TEST_MAIL_ADDRESS,
+            'template' => self::TEMPLATE_CANCELED_QUESTION,
+            'customerId' => self::DEMO_CUSTOMER_ID,
+            'orderId' => self::DEMO_CANCELED_ORDER_ID,
+        ]);
+        $controller->setRequest($request);
+        $controller->sendCanceledQuestionMailAction();
+
+        $view = $controller->View();
+        static::assertTrue($view->getAssign('success'));
+        $comment = $this->getContainer()->get(Connection::class)->fetchOne(
+            'SELECT comment FROM s_order WHERE id = :id',
+            ['id' => self::DEMO_CANCELED_ORDER_ID]
+        );
+        static::assertSame('Frage gesendet', $comment);
+    }
+
+    public function testSendCanceledQuestionMailActionWithVoucher(): void
+    {
+        $controller = $this->getController();
+        $request = new Enlight_Controller_Request_RequestHttp();
+        $request->setParams([
+            'mail' => self::TEST_MAIL_ADDRESS,
+            'template' => self::TEMPLATE_CANCELED_VOUCHER,
+            'voucherId' => self::DEMO_VOUCHER_ID,
+            'customerId' => self::DEMO_CUSTOMER_ID,
+            'orderId' => self::DEMO_CANCELED_ORDER_ID,
+        ]);
+        $controller->setRequest($request);
+        $controller->sendCanceledQuestionMailAction();
+
+        $view = $controller->View();
+        static::assertTrue($view->getAssign('success'));
+
+        $comment = $this->getContainer()->get(Connection::class)->fetchOne(
+            'SELECT comment FROM s_order WHERE id = :id',
+            ['id' => self::DEMO_CANCELED_ORDER_ID]
+        );
+        static::assertSame(' Gutschein gesendet', $comment);
+
+        $codes = $this->getContainer()->get(Connection::class)->fetchAllAssociative(
+            'SELECT * FROM s_emarketing_voucher_codes WHERE userID = :customerId',
+            ['customerId' => self::DEMO_CUSTOMER_ID]
+        );
+        static::assertCount(1, $codes);
+        $code = $codes[0];
+        static::assertSame(self::DEMO_VOUCHER_ID, (int) $code['voucherID']);
+        static::assertFalse((bool) $code['cashed']);
+        static::assertStringStartsWith('23A7B', $code['code']);
+    }
+
+    private function getController(): Shopware_Controllers_Backend_CanceledOrder
+    {
+        $controller = new Shopware_Controllers_Backend_CanceledOrder();
+        $controller->setContainer($this->getContainer());
+        $controller->setView(new Enlight_View_Default(new Enlight_Template_Manager()));
+
+        return $controller;
+    }
+
+    private function insertTestOrder(): void
+    {
+        $sql = "
+              INSERT INTO `s_order_basket` (`sessionID`, `userID`, `articlename`, `articleID`, `ordernumber`, `shippingfree`, `quantity`, `price`, `netprice`, `tax_rate`, `datum`, `modus`, `esdarticle`, `partnerID`, `lastviewport`, `useragent`, `config`, `currencyFactor`) VALUES
+                (:firstSession, 0, 'Sonnenbrille Red', 170, 'SW10170', 0, 4, 39.95, 33.571428571429, 19, '2101-09-11 11:49:54', 0, 0, '', 'index', 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:22.0) Gecko/20100101 Firefox/22.0 FirePHP/0.7.2', '', 1),
+                (:firstSession, 0, 'Fliegenklatsche grün', 98, 'SW10101', 0, 1, 0.79, 0.66386554621849, 19, '2101-09-11 11:50:02', 0, 0, '', 'index', 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:22.0) Gecko/20100101 Firefox/22.0 FirePHP/0.7.2', '', 1),
+                (:firstSession, 0, 'Bumerang', 245, 'SW10236', 0, 1, 20, 16.806722689076, 19, '2101-09-11 11:50:13', 0, 0, '', 'index', 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:22.0) Gecko/20100101 Firefox/22.0 FirePHP/0.7.2', '', 1),
+                (:secondSession, 0, 'Dartscheibe Circle', 240, 'SW10231', 0, 1, 49.99, 42.008403361345, 19, '2101-09-11 11:50:17', 0, 0, '', '', '', '', 1),
+                (:secondSession, 0, 'Dartpfeil Steel Atomic', 241, 'SW10232', 0, 1, 14.99, 12.596638655462, 19, '2101-09-11 11:50:20', 0, 0, '', '', '', '', 1),
+                (:firstSession, 0, 'Dart Automat Standgerät', 239, 'SW10230', 0, 1, 2499, 2100, 19, '2101-09-10 11:50:22', 0, 0, '', 'index', 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:22.0) Gecko/20100101 Firefox/22.0 FirePHP/0.7.2', '', 1),
+                (:firstSession, 0, 'Warenkorbrabatt', 0, 'SHIPPINGDISCOUNT', 0, 1, -2, -1.68, 19, '2101-09-10 11:50:22', 4, 0, '', 'index', 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:22.0) Gecko/20100101 Firefox/22.0 FirePHP/0.7.2', '', 1);
+        ";
+
+        $this->getContainer()->get(Connection::class)->executeStatement($sql, [
+            'firstSession' => self::FIRST_DUMMY_SESSION_ID,
+            'secondSession' => self::SECOND_DUMMY_SESSION_ID,
+        ]);
+    }
 }
diff --git a/tests/Functional/Controllers/Backend/CategoryTest.php b/tests/Functional/Controllers/Backend/CategoryTest.php
index c1f705f3925..065166b0527 100644
--- a/tests/Functional/Controllers/Backend/CategoryTest.php
+++ b/tests/Functional/Controllers/Backend/CategoryTest.php
@@ -1,57 +1,57 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Backend;
 
 use DateTime;
 use Doctrine\DBAL\Connection;
-use Enlight_Components_Test_Controller_TestCase;
+use Doctrine\DBAL\Exception;
+use Enlight_Components_Test_Controller_TestCase as ControllerTestCase;
+use Shopware\Components\Model\ModelManager;
 use Shopware\Models\Category\Category;
 use Shopware\Models\Category\Repository;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
 
-class CategoryTest extends Enlight_Components_Test_Controller_TestCase
+class CategoryTest extends ControllerTestCase
 {
-    /**
-     * @var Repository
-     */
-    protected $repository;
+    use ContainerTrait;
+
+    private Repository $repository;
 
     /**
-     * @var array
+     * @var array{parentId: int, name: string, active: bool}
      */
-    private $dummyData = [
-         'parentId' => 1,
-         'name' => 'unitTestCategory',
-         'active' => 1,
+    private array $dummyData = [
+        'parentId' => 1,
+        'name' => 'unitTestCategory',
+        'active' => true,
     ];
 
-    private $updateMetaDescription = 'testMetaDescription';
+    private string $updateMetaDescription = 'testMetaDescription';
 
-    /**
-     * @var \Shopware\Components\Model\ModelManager
-     */
-    private $manager;
+    private ModelManager $manager;
 
     /**
      * Standard set up for every test - just disable auth
@@ -60,12 +60,12 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $this->manager = Shopware()->Models();
-        $this->repository = Shopware()->Models()->getRepository(Category::class);
+        $this->manager = $this->getContainer()->get('models');
+        $this->repository = $this->manager->getRepository(Category::class);
 
         // Disable auth and acl
-        Shopware()->Plugins()->Backend()->Auth()->setNoAuth();
-        Shopware()->Plugins()->Backend()->Auth()->setNoAcl();
+        $this->getContainer()->get('plugins')->Backend()->Auth()->setNoAuth();
+        $this->getContainer()->get('plugins')->Backend()->Auth()->setNoAcl();
     }
 
     public function testGetList(): void
@@ -82,11 +82,11 @@ public function testGetList(): void
         $params['node'] = 1;
         $this->Request()->setParams($params);
         $this->dispatch('backend/Category/getList');
-        static::assertTrue($this->View()->success);
-        $returnData = $this->View()->data;
+        static::assertTrue($this->View()->getAssign('success'));
+        $returnData = $this->View()->getAssign('data');
 
         static::assertNotEmpty($returnData);
-        static::assertGreaterThan(0, $this->View()->total);
+        static::assertGreaterThan(0, $this->View()->getAssign('total'));
         $foundDummy = [];
         foreach ($returnData as $dummyData) {
             if ($dummyData['name'] === $dummy->getName()) {
@@ -111,22 +111,22 @@ public function testSaveDetail(): int
         // Test new category
         $this->Request()->setParams($params);
         $this->dispatch('backend/Category/createDetail');
-        static::assertTrue($this->View()->success);
-        static::assertEquals($this->dummyData['name'], $this->View()->data['name']);
+        static::assertTrue($this->View()->getAssign('success'));
+        static::assertEquals($this->dummyData['name'], $this->View()->getAssign('data')['name']);
 
         // Test update category
-        $params['id'] = $this->View()->data['id'];
+        $params['id'] = $this->View()->getAssign('data')['id'];
         $params['metaDescription'] = $this->updateMetaDescription;
         $this->Request()->setParams($params);
         $this->dispatch('backend/Category/updateDetail');
-        static::assertTrue($this->View()->success);
-        static::assertEquals($this->updateMetaDescription, $this->View()->data['metaDescription']);
+        static::assertTrue($this->View()->getAssign('success'));
+        static::assertEquals($this->updateMetaDescription, $this->View()->getAssign('data')['metaDescription']);
 
-        return $this->View()->data['id'];
+        return $this->View()->getAssign('data')['id'];
     }
 
     /**
-     * @throws \Doctrine\DBAL\Exception
+     * @throws Exception
      */
     public function testSaveDetailFullParam(): void
     {
@@ -136,12 +136,10 @@ public function testSaveDetailFullParam(): void
         ]);
         $this->dispatch('backend/Category/updateDetail');
 
-        $connection = Shopware()->Container()->get(Connection::class);
-
-        $result = $connection->executeQuery(
+        $result = $this->getContainer()->get(Connection::class)->executeQuery(
             "SELECT facet_ids FROM s_categories WHERE description = 'Genusswelten'"
         );
-        $result = $result->fetchAll();
+        $result = $result->fetchAllAssociative();
 
         static::assertSame('|12|5|2|4|10|11|3|6|7|8|9|', $result[0]['facet_ids']);
     }
@@ -149,17 +147,15 @@ public function testSaveDetailFullParam(): void
     /**
      * @depends testSaveDetail
      *
-     * @param string $id
-     *
-     * @return string the id to for the testGetDetail Method
+     * @return int the id to for the testGetDetail Method
      */
-    public function testGetDetail($id): string
+    public function testGetDetail(int $id): int
     {
         $params['node'] = $id;
         $this->Request()->setParams($params);
         $this->dispatch('backend/Category/getDetail');
-        static::assertTrue($this->View()->success);
-        $returningData = $this->View()->data;
+        static::assertTrue($this->View()->getAssign('success'));
+        $returningData = $this->View()->getAssign('data');
         $dummyData = $this->dummyData;
 
         static::assertEquals($dummyData['parentId'], $returningData['parentId']);
@@ -175,13 +171,13 @@ public function testGetDetail($id): string
      *
      * @depends testGetDetail
      */
-    public function testGetIdPath($id): void
+    public function testGetIdPath(int $id): void
     {
         $params['categoryIds'] = $id;
         $this->Request()->setParams($params);
         $this->dispatch('backend/Category/getIdPath');
-        static::assertTrue($this->View()->success);
-        $categoryPath = $this->View()->data;
+        static::assertTrue($this->View()->getAssign('success'));
+        $categoryPath = $this->View()->getAssign('data');
         static::assertNotEmpty($categoryPath);
         static::assertCount(2, explode('/', $categoryPath[0]));
     }
@@ -191,37 +187,35 @@ public function testGetIdPath($id): void
      *
      * @depends testGetDetail
      */
-    public function testMoveTreeItem($id): void
+    public function testMoveTreeItem(int $id): void
     {
         // Test move to another position
         $params['id'] = $id;
         $params['position'] = 2;
         $this->Request()->setParams($params);
         $this->dispatch('backend/Category/moveTreeItem');
-        static::assertTrue($this->View()->success);
+        static::assertTrue($this->View()->getAssign('success'));
 
         $params['id'] = $id;
         $params['position'] = 2;
         $params['parentId'] = 3;
         $this->Request()->setParams($params);
         $this->dispatch('backend/Category/moveTreeItem');
-        static::assertTrue($this->View()->success);
+        static::assertTrue($this->View()->getAssign('success'));
 
         $movedCategoryModel = $this->repository->find($id);
         static::assertNotNull($movedCategoryModel);
         $parentModel = $movedCategoryModel->getParent();
         static::assertNotNull($parentModel);
 
-        // parentCategory should be Deutsch Id = 3
+        // parentCategory should be "Deutsch" ID = 3
         static::assertEquals(3, $parentModel->getId());
     }
 
     /**
      * @depends testGetDetail
-     *
-     * @param string $id
      */
-    public function testDelete($id): void
+    public function testDelete(int $id): void
     {
         $params['id'] = $id;
         $categoryModel = $this->repository->find($id);
@@ -231,7 +225,7 @@ public function testDelete($id): void
 
         $this->Request()->setParams($params);
         $this->dispatch('backend/Category/delete');
-        static::assertTrue($this->View()->success);
+        static::assertTrue($this->View()->getAssign('success'));
         $categoryModel = $this->repository->find($id);
         static::assertNull($categoryModel);
     }
@@ -247,11 +241,11 @@ public function testUpdatingInvalidCategory(): void
         // Test new category
         $this->Request()->setParams($params);
         $this->dispatch('backend/Category/createDetail');
-        static::assertFalse($this->View()->success);
-        static::assertNotEmpty($this->View()->message);
+        static::assertFalse($this->View()->getAssign('success'));
+        static::assertNotEmpty($this->View()->getAssign('message'));
 
-        $snippet = Shopware()->Container()->get('snippets')->getNamespace('backend/category/main');
-        static::assertEquals($snippet->get('saveDetailInvalidCategoryId', 'Invalid categoryId'), $this->View()->message);
+        $snippet = $this->getContainer()->get('snippets')->getNamespace('backend/category/main');
+        static::assertEquals($snippet->get('saveDetailInvalidCategoryId', 'Invalid categoryId'), $this->View()->getAssign('message'));
     }
 
     /**
diff --git a/tests/Functional/Controllers/Backend/ConfigGetFormTest.php b/tests/Functional/Controllers/Backend/ConfigGetFormTest.php
index 2d1a5af5a9b..45cdf2976d6 100644
--- a/tests/Functional/Controllers/Backend/ConfigGetFormTest.php
+++ b/tests/Functional/Controllers/Backend/ConfigGetFormTest.php
@@ -5,49 +5,57 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Backend;
 
-use Enlight_Components_Test_Controller_TestCase;
-use Exception;
+use Enlight_Components_Test_Controller_TestCase as ControllerTestCase;
+use Enlight_Controller_Response_ResponseTestCase;
+use Shopware\Models\Config\Form;
+use Shopware\Models\Shop\Locale;
+use Shopware\Models\User\Role;
+use Shopware\Models\User\User;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 
-class ConfigGetFormTest extends Enlight_Components_Test_Controller_TestCase
+class ConfigGetFormTest extends ControllerTestCase
 {
-    public const TEST_USER_USERNAME = 'testuser';
-    public const TEST_ROLE_NAME = 'testadminrole';
-    public const TEST_FORM_NAME = 'FormUnderTest';
-    public const TEST_FORM_ELEMENT_NAME = 'formElementUnderTest';
-    public const TEST_LOCALE_LOCALE = 'test_TEST';
-    public const TEST_FORM_ELEMENT_STORE_TRANSLATIONS_WITH_FALLBACKS = [
+    use ContainerTrait;
+    use DatabaseTransactionBehaviour;
+
+    private const TEST_USER_USERNAME = 'testuser';
+    private const TEST_ROLE_NAME = 'testadminrole';
+    private const TEST_FORM_NAME = 'FormUnderTest';
+    private const TEST_FORM_ELEMENT_NAME = 'formElementUnderTest';
+    private const TEST_LOCALE_LOCALE = 'test_TEST';
+    private const TEST_FORM_ELEMENT_STORE_TRANSLATIONS_WITH_FALLBACKS = [
         'aa_DJ' => 'aa_DJ: Language fallback that should never happen if there is an en/en_GB locale',
         'de_DE' => 'de_DE: Getestete Einstellung',
         self::TEST_LOCALE_LOCALE => 'test_TEST: Tested Test Translation',
         'en_GB' => 'en_GB: Tested Setting',
         'en' => 'en: Tested Setting (fallback)',
     ];
-    public const TEST_FORM_ELEMENT_STORE_TRANSLATIONS_WITHOUT_FALLBACK = [
+    private const TEST_FORM_ELEMENT_STORE_TRANSLATIONS_WITHOUT_FALLBACK = [
         'aa_DJ' => 'aa_DJ: Language fallback that should never happen',
         self::TEST_LOCALE_LOCALE => 'test_TEST: Tested Test Translation',
     ];
-    public const TEST_FORM_ELEMENT_STORE_TRANSLATIONS_WITH_EN_FALLBACK = [
+    private const TEST_FORM_ELEMENT_STORE_TRANSLATIONS_WITH_EN_FALLBACK = [
         'aa_DJ' => 'aa_DJ: Language fallback that should never happen if there is an en/en_GB locale',
         'en' => 'en: Fallback locale translation',
         self::TEST_LOCALE_LOCALE => 'test_TEST: Tested Test Translation',
@@ -56,12 +64,12 @@ class ConfigGetFormTest extends Enlight_Components_Test_Controller_TestCase
     /**
      * Locales that where created on the fly for the tests.
      *
-     * @var array an array of locales (e.g. ['test_TEST', 'de_DE'])
+     * @var list<string> an array of locales (e.g. ['test_TEST', 'de_DE'])
      *
      * @see self::getLocaleIdOrCreate creates locales for the tests
      * @see self::formLocaleTestCleanup removes these locales
      */
-    protected $temporaryLocales = [];
+    private array $temporaryLocales = [];
 
     public function setUp(): void
     {
@@ -76,66 +84,66 @@ public function tearDown(): void
         parent::tearDown();
     }
 
-    public function testFormElementSettingTranslationIsUserLocaleIfMatching()
+    public function testFormElementSettingTranslationIsUserLocaleIfMatching(): void
     {
-        $this->createAndLoginAdminUserWithLocaleId($this->getLocaleIdOrCreate(static::TEST_LOCALE_LOCALE));
-        $storeSettings = $this->getTranslatedFormElementStoreSettings(static::TEST_FORM_ELEMENT_STORE_TRANSLATIONS_WITH_FALLBACKS);
+        $this->createAndLoginAdminUserWithLocaleId($this->getLocaleIdOrCreate(self::TEST_LOCALE_LOCALE));
+        $storeSettings = $this->getTranslatedFormElementStoreSettings(self::TEST_FORM_ELEMENT_STORE_TRANSLATIONS_WITH_FALLBACKS);
         static::assertEquals(
-            static::TEST_FORM_ELEMENT_STORE_TRANSLATIONS_WITH_FALLBACKS[static::TEST_LOCALE_LOCALE],
+            self::TEST_FORM_ELEMENT_STORE_TRANSLATIONS_WITH_FALLBACKS[self::TEST_LOCALE_LOCALE],
             $storeSettings[0][1]
         );
     }
 
-    public function testFormElementSettingTranslationIsFallbackIfNonTranslatedUserLocale()
+    public function testFormElementSettingTranslationIsFallbackIfNonTranslatedUserLocale(): void
     {
         $this->createAndLoginAdminUserWithLocaleId($this->getLocaleIdOrCreate('fr_FR'));
-        $storeSettings = $this->getTranslatedFormElementStoreSettings(static::TEST_FORM_ELEMENT_STORE_TRANSLATIONS_WITH_FALLBACKS);
+        $storeSettings = $this->getTranslatedFormElementStoreSettings(self::TEST_FORM_ELEMENT_STORE_TRANSLATIONS_WITH_FALLBACKS);
         static::assertEquals(
-            static::TEST_FORM_ELEMENT_STORE_TRANSLATIONS_WITH_FALLBACKS['en_GB'],
+            self::TEST_FORM_ELEMENT_STORE_TRANSLATIONS_WITH_FALLBACKS['en_GB'],
             $storeSettings[0][1],
             'Should be the en_GB translation, as that is the translation of the first, hard-coded fallback locale.'
         );
     }
 
-    public function testFormElementSettingTranslationIsFallbackIfNonTranslatedUserTerritory()
+    public function testFormElementSettingTranslationIsFallbackIfNonTranslatedUserTerritory(): void
     {
         $this->createAndLoginAdminUserWithLocaleId($this->getLocaleIdOrCreate('de_CH'));
-        $storeSettings = $this->getTranslatedFormElementStoreSettings(static::TEST_FORM_ELEMENT_STORE_TRANSLATIONS_WITH_FALLBACKS);
+        $storeSettings = $this->getTranslatedFormElementStoreSettings(self::TEST_FORM_ELEMENT_STORE_TRANSLATIONS_WITH_FALLBACKS);
         static::assertEquals(
-            static::TEST_FORM_ELEMENT_STORE_TRANSLATIONS_WITH_FALLBACKS['en_GB'],
+            self::TEST_FORM_ELEMENT_STORE_TRANSLATIONS_WITH_FALLBACKS['en_GB'],
             $storeSettings[0][1],
             'Should be the en_GB translation, as that is the translation of the first, hard-coded fallback locale.'
             . ' Here, de_DE exists as well, but we define there is no logic to match potentially "similar" locales.'
         );
     }
 
-    public function testFormElementSettingTranslationIsFirstTranslationIfUnmatchedAndWithoutFallbacks()
+    public function testFormElementSettingTranslationIsFirstTranslationIfUnmatchedAndWithoutFallbacks(): void
     {
         $this->createAndLoginAdminUserWithLocaleId($this->getLocaleIdOrCreate('en_GB'));
-        $storeSettings = $this->getTranslatedFormElementStoreSettings(static::TEST_FORM_ELEMENT_STORE_TRANSLATIONS_WITHOUT_FALLBACK);
+        $storeSettings = $this->getTranslatedFormElementStoreSettings(self::TEST_FORM_ELEMENT_STORE_TRANSLATIONS_WITHOUT_FALLBACK);
         static::assertEquals(
-            static::TEST_FORM_ELEMENT_STORE_TRANSLATIONS_WITHOUT_FALLBACK['aa_DJ'],
+            self::TEST_FORM_ELEMENT_STORE_TRANSLATIONS_WITHOUT_FALLBACK['aa_DJ'],
             $storeSettings[0][1],
             'If no matching translation and no locale-based (en_GB, en) translation exists, should use '
             . 'the first (index-based) translation from the store settings.'
         );
     }
 
-    public function testFormElementSettingTranslationIsEnglishFallbackIfBritishEnglishDoesNotExist()
+    public function testFormElementSettingTranslationIsEnglishFallbackIfBritishEnglishDoesNotExist(): void
     {
         $this->createAndLoginAdminUserWithLocaleId($this->getLocaleIdOrCreate('de_DE'));
-        $storeSettings = $this->getTranslatedFormElementStoreSettings(static::TEST_FORM_ELEMENT_STORE_TRANSLATIONS_WITH_EN_FALLBACK);
+        $storeSettings = $this->getTranslatedFormElementStoreSettings(self::TEST_FORM_ELEMENT_STORE_TRANSLATIONS_WITH_EN_FALLBACK);
         static::assertEquals(
-            static::TEST_FORM_ELEMENT_STORE_TRANSLATIONS_WITH_EN_FALLBACK['en'],
+            self::TEST_FORM_ELEMENT_STORE_TRANSLATIONS_WITH_EN_FALLBACK['en'],
             $storeSettings[0][1],
             'If neither a matching location, nor the preferred en_GB fallback exist, should fall back to '
             . 'en translation'
         );
     }
 
-    public function testFormElementSettingTranslationCanBeFixedString()
+    public function testFormElementSettingTranslationCanBeFixedString(): void
     {
-        $this->createAndLoginAdminUserWithLocaleId($this->getLocaleIdOrCreate(static::TEST_LOCALE_LOCALE));
+        $this->createAndLoginAdminUserWithLocaleId($this->getLocaleIdOrCreate(self::TEST_LOCALE_LOCALE));
         $storeSettings = $this->getTranslatedFormElementStoreSettings('A fixed string');
         static::assertEquals(
             'A fixed string',
@@ -152,27 +160,26 @@ public function testFormElementSettingTranslationCanBeFixedString()
      *
      * @see self::formLocaleTestCleanup removes the user
      */
-    protected function createAndLoginAdminUserWithLocaleId($localeId)
+    private function createAndLoginAdminUserWithLocaleId($localeId): void
     {
-        $entityManager = Shopware()->Models();
+        $entityManager = $this->getContainer()->get('models');
 
-        $user = new \Shopware\Models\User\User();
-        $user->setUsername(static::TEST_USER_USERNAME);
+        $user = new User();
+        $user->setUsername(self::TEST_USER_USERNAME);
         $user->setLocaleId($localeId);
         // Set lockedUntil to the past, so the user can log in.
         $user->setLockedUntil('1970-01-01 00:00:00 UTC');
 
         // Set password analogously to \Shopware\Commands\AdminCreateCommand::setPassword:
-        /** @var \Shopware\Components\Password\Manager $passworEncoderRegistry */
-        $passworEncoderRegistry = Shopware()->Container()->get('passwordencoder');
-        $defaultEncoderName = $passworEncoderRegistry->getDefaultPasswordEncoderName();
-        $encoder = $passworEncoderRegistry->getEncoderByName($defaultEncoderName);
+        $passwordEncoderRegistry = $this->getContainer()->get('passwordencoder');
+        $defaultEncoderName = $passwordEncoderRegistry->getDefaultPasswordEncoderName();
+        $encoder = $passwordEncoderRegistry->getEncoderByName($defaultEncoderName);
         $user->setPassword($encoder->encodePassword('testpassword'));
         $user->setEncoder($encoder->getName());
 
         // The user must have a role and shall be an admin.
-        $userRole = new \Shopware\Models\User\Role();
-        $userRole->setName(static::TEST_ROLE_NAME);
+        $userRole = new Role();
+        $userRole->setName(self::TEST_ROLE_NAME);
         $userRole->setDescription('test admin role description');
         $userRole->setSource('custom');
         $userRole->setAdmin(1);
@@ -188,7 +195,7 @@ protected function createAndLoginAdminUserWithLocaleId($localeId)
         // Login user.
         $this->Request()->setMethod('POST');
         $this->Request()->setPost([
-            'username' => static::TEST_USER_USERNAME,
+            'username' => self::TEST_USER_USERNAME,
             'password' => 'testpassword',
         ]);
         $loginResponse = $this->dispatch('backend/Login/login');
@@ -198,25 +205,25 @@ protected function createAndLoginAdminUserWithLocaleId($localeId)
         $this->resetResponse();
     }
 
-    protected function formLocaleTestCleanup()
+    private function formLocaleTestCleanup(): void
     {
-        $entityManager = Shopware()->Models();
+        $entityManager = $this->getContainer()->get('models');
 
         $oldEntities = array_merge(
-            $entityManager->getRepository('Shopware\Models\Shop\Locale')->findBy([
+            $entityManager->getRepository(Locale::class)->findBy([
                 'locale' => array_merge(
-                    [static::TEST_LOCALE_LOCALE],
+                    [self::TEST_LOCALE_LOCALE],
                     $this->temporaryLocales
                 ),
             ]),
-            $entityManager->getRepository('Shopware\Models\User\User')->findBy([
-                'username' => static::TEST_USER_USERNAME,
+            $entityManager->getRepository(User::class)->findBy([
+                'username' => self::TEST_USER_USERNAME,
             ]),
-            $entityManager->getRepository('Shopware\Models\User\Role')->findBy([
-                'name' => static::TEST_ROLE_NAME,
+            $entityManager->getRepository(Role::class)->findBy([
+                'name' => self::TEST_ROLE_NAME,
             ]),
-            $entityManager->getRepository('Shopware\Models\Config\Form')->findBy([
-                'name' => static::TEST_FORM_NAME,
+            $entityManager->getRepository(Form::class)->findBy([
+                'name' => self::TEST_FORM_NAME,
             ])
         );
 
@@ -228,11 +235,11 @@ protected function formLocaleTestCleanup()
         $this->temporaryLocales = [];
     }
 
-    protected function getLocaleIdOrCreate($locale)
+    private function getLocaleIdOrCreate(string $locale): int
     {
-        $entityManager = Shopware()->Models();
+        $entityManager = $this->getContainer()->get('models');
 
-        $foundLocale = $entityManager->getRepository('Shopware\Models\Shop\Locale')->findOneBy([
+        $foundLocale = $entityManager->getRepository(Locale::class)->findOneBy([
             'locale' => $locale,
         ]);
 
@@ -240,7 +247,7 @@ protected function getLocaleIdOrCreate($locale)
             return $foundLocale->getId();
         }
 
-        $newLocale = new \Shopware\Models\Shop\Locale();
+        $newLocale = new Locale();
         $newLocale->setLocale($locale);
         $newLocale->setLanguage('<' . $locale . ' language name as created for ' . \get_class($this) . '>');
         $newLocale->setTerritory('<' . $locale . ' territory name>');
@@ -248,7 +255,7 @@ protected function getLocaleIdOrCreate($locale)
         // Flush $newLocale to database,so we can retrieve its new id afterwards.
         $entityManager->flush($newLocale);
 
-        $this->temporaryLocales[] = $newLocale;
+        $this->temporaryLocales[] = $locale;
 
         return $newLocale->getId();
     }
@@ -259,19 +266,19 @@ protected function getLocaleIdOrCreate($locale)
      *
      * A user must already be logged for a locale to be selectable and to prevent a redirect to /backend/.
      *
-     * @param string|array $settingsTranslations
+     * @param string|array<string, string> $settingsTranslations
      *
-     * @return array the element's store
+     * @return array<list<string>> the element's store
      */
-    protected function getTranslatedFormElementStoreSettings($settingsTranslations)
+    private function getTranslatedFormElementStoreSettings($settingsTranslations): array
     {
-        $entityManager = Shopware()->Models();
+        $entityManager = $this->getContainer()->get('models');
 
-        $form = new \Shopware\Models\Config\Form();
-        $form->setName(static::TEST_FORM_NAME);
+        $form = new Form();
+        $form->setName(self::TEST_FORM_NAME);
         $form->setElement(
             'select',
-            static::TEST_FORM_ELEMENT_NAME,
+            self::TEST_FORM_ELEMENT_NAME,
             [
                 'label' => 'The Form Element Under Test',
                 'store' => [
@@ -292,20 +299,21 @@ protected function getTranslatedFormElementStoreSettings($settingsTranslations)
             ],
         ];
 
-        $requestUrl = sprintf(
+        $requestUrl = \sprintf(
             'backend/Config/getForm?filter=%s&page=1&_dc=' . time() . '&page=1&start=0&limit=25',
             urlencode(json_encode($requestFilter, JSON_THROW_ON_ERROR))
         );
 
         // Disable ACLs for this request:
         $this->Request()->setMethod('GET');
-        Shopware()->Plugins()->Backend()->Auth()->setNoAcl();
+        $this->getContainer()->get('plugins')->Backend()->Auth()->setNoAcl();
         try {
             $response = $this->dispatch($requestUrl);
         } finally {
             // Re-enable ACLs:
-            Shopware()->Plugins()->Backend()->Auth()->setNoAcl(false);
+            $this->getContainer()->get('plugins')->Backend()->Auth()->setNoAcl(false);
         }
+        static::assertInstanceOf(Enlight_Controller_Response_ResponseTestCase::class, $response);
 
         static::assertMatchesRegularExpression(',^\s*application/json\s*(;.*)?$,u', $response->getHeader('Content-Type'));
 
@@ -316,35 +324,28 @@ protected function getTranslatedFormElementStoreSettings($settingsTranslations)
 
         $responseBody = $response->getBody();
         static::assertIsString($responseBody);
-        $responseDataTransferObject = json_decode($responseBody);
-        if (json_last_error() !== JSON_ERROR_NONE) {
-            throw new Exception('JSON parse error: ' . json_last_error_msg() . ' for request to ' . $requestUrl . ' which returned ' . $responseBody);
-        }
-        if (!\is_object($responseDataTransferObject)) {
-            throw new Exception('Response could not be parsed to an object for request to ' . $requestUrl . ' which returned ' . $responseBody);
-        }
+        $responseDataTransferObject = json_decode($responseBody, true, 512, JSON_THROW_ON_ERROR);
 
         // Basic assertions about the response to catch non-test-related errors early:
-        static::assertTrue($responseDataTransferObject->success);
-        static::assertNotEmpty($responseDataTransferObject->data);
+        static::assertTrue($responseDataTransferObject['success']);
+        static::assertNotEmpty($responseDataTransferObject['data']);
 
-        $formData = $responseDataTransferObject->data;
-        $formDataErrorMessageSuffix = ' Form data does not match expectation: '
-            . json_encode($formData);
+        $formData = $responseDataTransferObject['data'];
+        $formDataErrorMessageSuffix = ' Form data does not match expectation: ' . json_encode($formData);
 
         static::assertNotEmpty(
-            $formData->elements,
+            $formData['elements'],
             'Form elements are missing.' . $formDataErrorMessageSuffix
         );
         static::assertNotEmpty(
-            $formData->elements[0]->options,
+            $formData['elements'][0]['options'],
             'Form element options are missing.' . $formDataErrorMessageSuffix
         );
         static::assertNotEmpty(
-            $formData->elements[0]->options->store,
+            $formData['elements'][0]['options']['store'],
             'Form element store options are missing.' . $formDataErrorMessageSuffix
         );
 
-        return $formData->elements[0]->options->store;
+        return $formData['elements'][0]['options']['store'];
     }
 }
diff --git a/tests/Functional/Controllers/Backend/ConfigTest.php b/tests/Functional/Controllers/Backend/ConfigTest.php
index c92571c59a4..1b704826972 100644
--- a/tests/Functional/Controllers/Backend/ConfigTest.php
+++ b/tests/Functional/Controllers/Backend/ConfigTest.php
@@ -1,55 +1,66 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Backend;
 
-use Enlight_Components_Test_Controller_TestCase;
+use Doctrine\DBAL\Connection;
+use Enlight_Components_Test_Controller_TestCase as ControllerTestCase;
+use Generator;
 use Shopware\Models\Shop\Locale;
+use Shopware\Models\Shop\Shop;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
+use Shopware\Tests\TestReflectionHelper;
+use Shopware_Controllers_Backend_Config;
 
-class ConfigTest extends Enlight_Components_Test_Controller_TestCase
+class ConfigTest extends ControllerTestCase
 {
+    use ContainerTrait;
+    use DatabaseTransactionBehaviour;
+
     /**
      * Tests the cron job config pagination
      */
-    public function testCronJobPaginationConfig()
+    public function testCronJobPaginationConfig(): void
     {
-        Shopware()->Plugins()->Backend()->Auth()->setNoAuth();
+        $this->getContainer()->get('plugins')->Backend()->Auth()->setNoAuth();
         $this->checkTableListConfig('cronJob');
 
         $this->reset();
 
-        Shopware()->Plugins()->Backend()->Auth()->setNoAuth();
+        $this->getContainer()->get('plugins')->Backend()->Auth()->setNoAuth();
         $this->checkGetTableListConfigPagination('cronJob');
     }
 
     /**
      * Tests the cron job search
      */
-    public function testCronJobSearchConfig()
+    public function testCronJobSearchConfig(): void
     {
-        $sql = 'SELECT count(*) FROM  s_crontab';
-        $totalCronJobCount = Shopware()->Db()->fetchOne($sql);
+        $sql = 'SELECT count(*) FROM s_crontab';
+        $totalCronJobCount = (int) $this->getContainer()->get(Connection::class)->fetchOne($sql);
 
         // Test the search
         $this->checkGetTableListSearch('a', $totalCronJobCount, 'cronJob');
@@ -63,26 +74,26 @@ public function testCronJobSearchConfig()
     /**
      * Tests the searchField config pagination
      */
-    public function testSearchFieldConfig()
+    public function testSearchFieldConfig(): void
     {
-        Shopware()->Plugins()->Backend()->Auth()->setNoAuth();
+        $this->getContainer()->get('plugins')->Backend()->Auth()->setNoAuth();
         $this->checkTableListConfig('searchField');
 
         $this->reset();
 
-        Shopware()->Plugins()->Backend()->Auth()->setNoAuth();
+        $this->getContainer()->get('plugins')->Backend()->Auth()->setNoAuth();
         $this->checkGetTableListConfigPagination('searchField');
     }
 
     /**
      * Tests the cron job search
      */
-    public function testSearchFieldSearchConfig()
+    public function testSearchFieldSearchConfig(): void
     {
         $sql = 'SELECT count(*)
                 FROM s_search_fields f
                 LEFT JOIN s_search_tables t on f.tableID = t.id';
-        $totalCronJobCount = Shopware()->Db()->fetchOne($sql);
+        $totalCronJobCount = (int) $this->getContainer()->get(Connection::class)->fetchOne($sql);
 
         $this->checkGetTableListSearch('b', $totalCronJobCount, 'searchField');
 
@@ -94,9 +105,9 @@ public function testSearchFieldSearchConfig()
     /**
      * Tests the existence of the document type key
      */
-    public function testPersistDocumentTypeKey()
+    public function testPersistDocumentTypeKey(): void
     {
-        Shopware()->Plugins()->Backend()->Auth()->setNoAuth();
+        $this->getContainer()->get('plugins')->Backend()->Auth()->setNoAuth();
 
         $newTestDocumentType = [
             'id' => 0,
@@ -114,20 +125,22 @@ public function testPersistDocumentTypeKey()
 
         $this->Request()->setPost($newTestDocumentType);
         $response = $this->dispatch('backend/Config/saveValues?_repositoryClass=document');
+        $body = $response->getBody();
+        static::assertIsString($body);
 
-        static::assertTrue(json_decode($response->getBody(), true)['success']);
+        static::assertTrue(json_decode($body, true)['success']);
 
-        Shopware()->Db()->query('DELETE FROM `s_core_documents` WHERE `key`="first_test_document";');
+        $this->getContainer()->get(Connection::class)->executeQuery('DELETE FROM `s_core_documents` WHERE `key`="first_test_document";');
     }
 
     /**
      * Tests whether the list of pdf documents includes its translations
      */
-    public function testIfPDFDocumentsListIncludesTranslation()
+    public function testIfPDFDocumentsListIncludesTranslation(): void
     {
         // Set up
-        Shopware()->Plugins()->Backend()->Auth()->setNoAuth(false);
-        Shopware()->Plugins()->Backend()->Auth()->setNoAcl();
+        $this->getContainer()->get('plugins')->Backend()->Auth()->setNoAuth(false);
+        $this->getContainer()->get('plugins')->Backend()->Auth()->setNoAcl();
 
         // Login
         $this->Request()->setMethod('POST');
@@ -151,8 +164,10 @@ public function testIfPDFDocumentsListIncludesTranslation()
         $this->Request()->setMethod('GET');
         $getString = http_build_query($getParams);
         $response = $this->dispatch('backend/Config/getList?' . $getString);
+        $body = $response->getBody();
+        static::assertIsString($body);
 
-        $responseJSON = json_decode($response->getBody(), true);
+        $responseJSON = json_decode($body, true);
         static::assertTrue($responseJSON['success']);
 
         foreach ($responseJSON['data'] as $documentType) {
@@ -160,19 +175,21 @@ public function testIfPDFDocumentsListIncludesTranslation()
         }
 
         $this->reset();
-        Shopware()->Container()->reset('translation');
+        $this->getContainer()->reset('translation');
 
         // Check for English translations
-        $user = Shopware()->Container()->get('auth')->getIdentity();
-        $user->locale = Shopware()->Models()->getRepository(
+        $user = $this->getContainer()->get('auth')->getIdentity();
+        $user->locale = $this->getContainer()->get('models')->getRepository(
             Locale::class
         )->find(2);
 
         $this->Request()->setMethod('GET');
         $getString = http_build_query($getParams);
         $response = $this->dispatch('backend/Config/getList?' . $getString);
+        $body = $response->getBody();
+        static::assertIsString($body);
 
-        $responseJSON = json_decode($response->getBody(), true);
+        $responseJSON = json_decode($body, true);
         static::assertTrue($responseJSON['success']);
 
         foreach ($responseJSON['data'] as $documentType) {
@@ -194,11 +211,111 @@ public function testIfPDFDocumentsListIncludesTranslation()
     }
 
     /**
-     * Tests the config tableList
+     * @param array<string, mixed> $elementData
      *
-     * @param string $tableListName
+     * @dataProvider getSaveElementData
+     */
+    public function testSaveElement(array $elementData): void
+    {
+        $saveElementMethod = TestReflectionHelper::getMethod(Shopware_Controllers_Backend_Config::class, 'saveElement');
+        $configController = new Shopware_Controllers_Backend_Config();
+        $configController->setContainer($this->getContainer());
+
+        $eventCalled = false;
+        $this->getContainer()->get('events')->addListener(
+            'Shopware_Controllers_Backend_Config_After_Save_Config_Element',
+            function () use (&$eventCalled) {
+                $eventCalled = true;
+            }
+        );
+        $shop = $this->createMock(Shop::class);
+        $saveElementMethod->invokeArgs($configController, [$elementData, $shop]);
+
+        static::assertTrue($eventCalled);
+    }
+
+    public function getSaveElementData(): Generator
+    {
+        $sql = 'SELECT id FROM s_core_config_elements';
+        $elementId = (int) $this->getContainer()->get(Connection::class)->fetchOne($sql);
+
+        yield 'Save button' => [
+            [
+                'id' => $elementId,
+                'name' => 'basicSettingsGroup',
+                'value' => null,
+                'label' => 'Grundeinstellungen',
+                'description' => null,
+                'type' => 'button',
+                'required' => false,
+                'scope' => 1,
+                'options' => [],
+                'values' => [
+                    [
+                        'id' => null,
+                        'shopId' => 1,
+                        'value' => null,
+                    ],
+                    [
+                        'id' => null,
+                        'shopId' => 2,
+                        'value' => null,
+                    ],
+                ],
+            ],
+        ];
+        yield 'Save multi select' => [
+            [
+                'id' => $elementId,
+                'name' => 'multiselect',
+                'value' => 'one',
+                'label' => 'multiselect',
+                'description' => null,
+                'type' => 'select',
+                'required' => false,
+                'scope' => 1,
+                'options' => [
+                    'multiSelect' => true,
+                    'store' => [
+                        [
+                            'one',
+                            'One',
+                        ],
+                        [
+                            'two',
+                            'Two',
+                        ],
+                        [
+                            'three',
+                            'Three',
+                        ],
+                    ],
+                    'queryMode' => 'remote',
+                ],
+                'values' => [
+                    [
+                        'id' => null,
+                        'shopId' => 1,
+                        'value' => [
+                            'one',
+                        ],
+                    ],
+                    [
+                        'id' => null,
+                        'shopId' => 2,
+                        'value' => [
+                            'one',
+                        ],
+                    ],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Tests the config tableList
      */
-    private function checkTableListConfig($tableListName)
+    private function checkTableListConfig(string $tableListName): void
     {
         // Should return more than 2 items
         $this->Request()->setMethod('GET');
@@ -210,10 +327,8 @@ private function checkTableListConfig($tableListName)
 
     /**
      * Tests the config table list with pagination
-     *
-     * @param strin $tableListName
      */
-    private function checkGetTableListConfigPagination($tableListName)
+    private function checkGetTableListConfigPagination(string $tableListName): void
     {
         $this->Request()->setMethod('GET');
         $this->dispatch('backend/Config/getTableList/_repositoryClass/' . $tableListName . '?page=1&start=0&limit=2');
@@ -225,12 +340,8 @@ private function checkGetTableListConfigPagination($tableListName)
 
     /**
      * Checks the search of the table list config
-     *
-     * @param string $searchTerm
-     * @param int    $totalCount
-     * @param string $tableListName
      */
-    private function checkGetTableListSearch($searchTerm, $totalCount, $tableListName)
+    private function checkGetTableListSearch(string $searchTerm, int $totalCount, string $tableListName): void
     {
         $queryParams = [
             'page' => '1',
@@ -247,7 +358,7 @@ private function checkGetTableListSearch($searchTerm, $totalCount, $tableListNam
         ];
         $query = http_build_query($queryParams);
         $url = 'backend/Config/getTableList/_repositoryClass/' . $tableListName . '?';
-        Shopware()->Plugins()->Backend()->Auth()->setNoAuth();
+        $this->getContainer()->get('plugins')->Backend()->Auth()->setNoAuth();
         $this->dispatch($url . $query);
         $returnData = $this->View()->getAssign('data');
         static::assertGreaterThan(0, \count($returnData));
@@ -257,11 +368,8 @@ private function checkGetTableListSearch($searchTerm, $totalCount, $tableListNam
 
     /**
      * Checks the search and the pagination of the table list config
-     *
-     * @param string $searchTerm
-     * @param string $tableListName
      */
-    private function checkGetTableListSearchWithPagination($searchTerm, $tableListName)
+    private function checkGetTableListSearchWithPagination(string $searchTerm, string $tableListName): void
     {
         $queryParams = [
             'page' => '1',
@@ -279,7 +387,7 @@ private function checkGetTableListSearchWithPagination($searchTerm, $tableListNa
 
         $query = http_build_query($queryParams);
         $url = 'backend/Config/getTableList/_repositoryClass/' . $tableListName . '?';
-        Shopware()->Plugins()->Backend()->Auth()->setNoAuth();
+        $this->getContainer()->get('plugins')->Backend()->Auth()->setNoAuth();
         $this->dispatch($url . $query);
         $returnData = $this->View()->getAssign('data');
         static::assertCount(2, $returnData);
diff --git a/tests/Functional/Controllers/Backend/ContentTypeManagerTest.php b/tests/Functional/Controllers/Backend/ContentTypeManagerTest.php
new file mode 100644
index 00000000000..1e7db9bb16a
--- /dev/null
+++ b/tests/Functional/Controllers/Backend/ContentTypeManagerTest.php
@@ -0,0 +1,85 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Controllers\Backend;
+
+use Enlight_Controller_Request_RequestHttp;
+use Enlight_Template_Manager;
+use Enlight_View_Default;
+use Generator;
+use PHPUnit\Framework\TestCase;
+use Shopware\Bundle\ContentTypeBundle\Controller\Backend\ContentTypeManager;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
+
+class ContentTypeManagerTest extends TestCase
+{
+    use ContainerTrait;
+    use DatabaseTransactionBehaviour;
+
+    /**
+     * @dataProvider searchQueries
+     */
+    public function testFieldsAction(string $searchQuery, int $expectedCount): void
+    {
+        $controller = $this->getController();
+        $request = new Enlight_Controller_Request_RequestHttp();
+        $request->setParam('query', $searchQuery);
+        $controller->setRequest($request);
+
+        $controller->fieldsAction();
+
+        $fields = $controller->View()->getAssign('data');
+        static::assertCount($expectedCount, $fields);
+    }
+
+    public function searchQueries(): Generator
+    {
+        yield 'No search query' => [
+            '',
+            15,
+        ];
+
+        yield 'Search for "Pro" uppercase' => [
+            'Pro',
+            2,
+        ];
+
+        yield 'Search for "pro" lowercase' => [
+            'Pro',
+            2,
+        ];
+    }
+
+    private function getController(): ContentTypeManager
+    {
+        $view = new Enlight_View_Default(new Enlight_Template_Manager());
+        $controller = $this->getContainer()->get(ContentTypeManager::class);
+        $controller->setView($view);
+        $controller->setContainer($this->getContainer());
+
+        return $controller;
+    }
+}
diff --git a/tests/Functional/Controllers/Backend/CustomerStreamTest.php b/tests/Functional/Controllers/Backend/CustomerStreamTest.php
new file mode 100644
index 00000000000..17218bdf59b
--- /dev/null
+++ b/tests/Functional/Controllers/Backend/CustomerStreamTest.php
@@ -0,0 +1,65 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Controllers\Backend;
+
+use Enlight_Controller_Request_RequestHttp;
+use Enlight_Template_Manager;
+use Enlight_View_Default;
+use PHPUnit\Framework\TestCase;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
+use Shopware_Controllers_Backend_CustomerStream;
+
+class CustomerStreamTest extends TestCase
+{
+    use ContainerTrait;
+    use DatabaseTransactionBehaviour;
+
+    public function testLoadStreamAction(): void
+    {
+        $controller = $this->getController();
+        $request = new Enlight_Controller_Request_RequestHttp();
+        $request->setParam('streamId', '');
+
+        $controller->setRequest($request);
+
+        $controller->loadStreamAction();
+
+        $assign = $controller->View()->getAssign();
+        static::assertTrue($assign['success']);
+        static::assertEmpty($assign['data']);
+        static::assertSame(0, $assign['total']);
+    }
+
+    private function getController(): Shopware_Controllers_Backend_CustomerStream
+    {
+        $controller = new Shopware_Controllers_Backend_CustomerStream();
+        $controller->setContainer($this->getContainer());
+        $controller->setView(new Enlight_View_Default(new Enlight_Template_Manager()));
+
+        return $controller;
+    }
+}
diff --git a/tests/Functional/Controllers/Backend/CustomerTest.php b/tests/Functional/Controllers/Backend/CustomerTest.php
index ed27ca3b41c..8ddaf246642 100644
--- a/tests/Functional/Controllers/Backend/CustomerTest.php
+++ b/tests/Functional/Controllers/Backend/CustomerTest.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Backend;
@@ -35,13 +36,13 @@
 use Shopware\Models\Customer\PaymentData;
 use Shopware\Models\Customer\Repository;
 use Shopware\Models\Payment\Payment;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 
 class CustomerTest extends Enlight_Components_Test_Controller_TestCase
 {
-    /**
-     * @var Repository
-     */
-    protected $repository;
+    use DatabaseTransactionBehaviour;
+
+    private Repository $repository;
 
     private ModelManager $manager;
 
@@ -60,6 +61,23 @@ public function setUp(): void
         Shopware()->Plugins()->Backend()->Auth()->setNoAcl();
     }
 
+    public function testSensitiveDataIsNotSend(): void
+    {
+        $customer = $this->createDummyCustomer();
+
+        $params = [
+            'customerID' => $customer->getId(),
+        ];
+        $this->Request()->setMethod('POST')->setPost($params);
+        $this->dispatch('/backend/Customer/getDetail');
+
+        $body = $this->View()->getAssign();
+        static::assertTrue($body['success']);
+        static::assertArrayNotHasKey('hashPassword', $body['data']);
+        static::assertArrayNotHasKey('sessionId', $body['data']);
+        static::assertEquals('test@phpunit.org', $body['data']['email']);
+    }
+
     /**
      * Test saveAction controller action - change payment mean
      *
@@ -74,6 +92,7 @@ public function testChangeCustomerPaymentMean(): void
         $debit = $this->manager
             ->getRepository(Payment::class)
             ->findOneBy(['name' => 'debit']);
+        static::assertInstanceOf(Payment::class, $debit);
 
         static::assertNotNull($customer->getChanged());
         $params = [
@@ -85,7 +104,7 @@ public function testChangeCustomerPaymentMean(): void
         $this->dispatch('/backend/Customer/save');
         $jsonBody = $this->View()->getAssign();
 
-        static::assertTrue($this->View()->success);
+        static::assertTrue($this->View()->getAssign('success'));
         static::assertEquals($debit->getId(), $jsonBody['data']['paymentId']);
 
         $this->manager->refresh($customer);
@@ -103,6 +122,7 @@ public function testAddCustomerPaymentDataWithDebit(): int
         $debit = $this->manager
             ->getRepository(Payment::class)
             ->findOneBy(['name' => 'debit']);
+        static::assertInstanceOf(Payment::class, $debit);
 
         $params = [
             'paymentId' => $debit->getId(),
@@ -122,16 +142,16 @@ public function testAddCustomerPaymentDataWithDebit(): int
         $this->dispatch('/backend/Customer/save');
         $jsonBody = $this->View()->getAssign();
 
-        static::assertTrue($this->View()->success);
+        static::assertTrue($this->View()->getAssign('success'));
         static::assertEquals($debit->getId(), $jsonBody['data']['paymentId']);
 
-        $dummyData = $this->repository->find($this->View()->data['id']);
-        static::assertNotNull($dummyData);
+        $customer = $this->repository->find($this->View()->getAssign('data')['id']);
+        static::assertInstanceOf(Customer::class, $customer);
 
-        static::assertEquals($debit->getId(), $dummyData->getPaymentId());
-        static::assertCount(1, $dummyData->getPaymentData()->toArray());
+        static::assertEquals($debit->getId(), $customer->getPaymentId());
+        static::assertCount(1, $customer->getPaymentData()->toArray());
 
-        $paymentDataArray = $dummyData->getPaymentData()->toArray();
+        $paymentDataArray = $customer->getPaymentData()->toArray();
         $paymentData = array_shift($paymentDataArray);
         static::assertInstanceOf(PaymentData::class, $paymentData);
         static::assertEquals('Account Holder Name', $paymentData->getAccountHolder());
@@ -142,7 +162,7 @@ public function testAddCustomerPaymentDataWithDebit(): int
         static::assertEmpty($paymentData->getIban());
         static::assertFalse($paymentData->getUseBillingData());
 
-        return $dummyData->getId();
+        return $customer->getId();
     }
 
     /**
@@ -153,6 +173,7 @@ public function testAddCustomerWithAddress(): void
         $debit = $this->manager
             ->getRepository(Payment::class)
             ->findOneBy(['name' => 'debit']);
+        static::assertInstanceOf(Payment::class, $debit);
 
         $params = [
             'paymentId' => $debit->getId(),
@@ -163,7 +184,7 @@ public function testAddCustomerWithAddress(): void
         $this->dispatch('/backend/Customer/save');
         $jsonBody = $this->View()->getAssign();
 
-        static::assertTrue($this->View()->success);
+        static::assertTrue($this->View()->getAssign('success'));
         static::assertEquals($debit->getId(), $jsonBody['data']['paymentId']);
 
         $params = [
@@ -171,7 +192,7 @@ public function testAddCustomerWithAddress(): void
             'defaultAddress' => '',
             'setDefaultBillingAddress' => true,
             'setDefaultShippingAddress' => true,
-            'user_id' => $this->View()->data['id'],
+            'user_id' => $this->View()->getAssign('data')['id'],
             'company' => 'company',
             'department' => 'department',
             'vatId' => 'vatId',
@@ -202,54 +223,61 @@ public function testAddCustomerWithAddress(): void
 
         $this->dispatch('/backend/Address/create');
 
-        /** @var Customer $dummyData */
-        $dummyData = $this->repository->find($params['user_id']);
-
-        static::assertEquals('firstname', $dummyData->getDefaultBillingAddress()->getFirstname());
-        static::assertEquals('lastname', $dummyData->getDefaultBillingAddress()->getLastname());
-        static::assertEquals('department', $dummyData->getDefaultBillingAddress()->getDepartment());
-        static::assertEquals('vatId', $dummyData->getDefaultBillingAddress()->getVatId());
-        static::assertEquals('title', $dummyData->getDefaultBillingAddress()->getTitle());
-        static::assertEquals('zipcode', $dummyData->getDefaultBillingAddress()->getZipcode());
-        static::assertEquals('city', $dummyData->getDefaultBillingAddress()->getCity());
-        static::assertEquals('street', $dummyData->getDefaultBillingAddress()->getStreet());
-        static::assertEquals('additionalAddressLine1', $dummyData->getDefaultBillingAddress()->getAdditionalAddressLine1());
-        static::assertEquals('additionalAddressLine2', $dummyData->getDefaultBillingAddress()->getAdditionalAddressLine2());
-
-        static::assertEquals('firstname', $dummyData->getDefaultShippingAddress()->getFirstname());
-        static::assertEquals('lastname', $dummyData->getDefaultShippingAddress()->getLastname());
-        static::assertEquals('department', $dummyData->getDefaultShippingAddress()->getDepartment());
-        static::assertEquals('vatId', $dummyData->getDefaultShippingAddress()->getVatId());
-        static::assertEquals('title', $dummyData->getDefaultShippingAddress()->getTitle());
-        static::assertEquals('zipcode', $dummyData->getDefaultShippingAddress()->getZipcode());
-        static::assertEquals('city', $dummyData->getDefaultShippingAddress()->getCity());
-        static::assertEquals('street', $dummyData->getDefaultShippingAddress()->getStreet());
-        static::assertEquals('additionalAddressLine1', $dummyData->getDefaultShippingAddress()->getAdditionalAddressLine1());
-        static::assertEquals('additionalAddressLine2', $dummyData->getDefaultShippingAddress()->getAdditionalAddressLine2());
+        $customer = $this->repository->find($params['user_id']);
+        static::assertInstanceOf(Customer::class, $customer);
+
+        $billingAddress = $customer->getDefaultBillingAddress();
+        static::assertInstanceOf(Address::class, $billingAddress);
+        static::assertEquals('firstname', $billingAddress->getFirstname());
+        static::assertEquals('lastname', $billingAddress->getLastname());
+        static::assertEquals('department', $billingAddress->getDepartment());
+        static::assertEquals('vatId', $billingAddress->getVatId());
+        static::assertEquals('title', $billingAddress->getTitle());
+        static::assertEquals('zipcode', $billingAddress->getZipcode());
+        static::assertEquals('city', $billingAddress->getCity());
+        static::assertEquals('street', $billingAddress->getStreet());
+        static::assertEquals('additionalAddressLine1', $billingAddress->getAdditionalAddressLine1());
+        static::assertEquals('additionalAddressLine2', $billingAddress->getAdditionalAddressLine2());
+
+        $shippingAddress = $customer->getDefaultShippingAddress();
+        static::assertInstanceOf(Address::class, $shippingAddress);
+        static::assertEquals('firstname', $shippingAddress->getFirstname());
+        static::assertEquals('lastname', $shippingAddress->getLastname());
+        static::assertEquals('department', $shippingAddress->getDepartment());
+        static::assertEquals('vatId', $shippingAddress->getVatId());
+        static::assertEquals('title', $shippingAddress->getTitle());
+        static::assertEquals('zipcode', $shippingAddress->getZipcode());
+        static::assertEquals('city', $shippingAddress->getCity());
+        static::assertEquals('street', $shippingAddress->getStreet());
+        static::assertEquals('additionalAddressLine1', $shippingAddress->getAdditionalAddressLine1());
+        static::assertEquals('additionalAddressLine2', $shippingAddress->getAdditionalAddressLine2());
     }
 
     /**
      * Test saveAction controller action - Update an existing customer
-     *
-     * @depends testAddCustomerPaymentDataWithDebit
      */
-    public function testUpdateCustomerPaymentDataWithSepa($dummyDataId): void
+    public function testUpdateCustomerPaymentDataWithSepa(): void
     {
-        /** @var Customer $dummyData */
-        $dummyData = $this->repository->find($dummyDataId);
+        $customerId = $this->testAddCustomerPaymentDataWithDebit();
+        $customer = $this->repository->find($customerId);
+        static::assertInstanceOf(Customer::class, $customer);
+
         $sepa = $this->manager
             ->getRepository(Payment::class)
             ->findOneBy(['name' => 'sepa']);
+        static::assertInstanceOf(Payment::class, $sepa);
+
         $debit = $this->manager
             ->getRepository(Payment::class)
             ->findOneBy(['name' => 'debit']);
+        static::assertInstanceOf(Payment::class, $debit);
 
-        static::assertEquals($debit->getId(), $dummyData->getPaymentId());
-        static::assertCount(1, $dummyData->getPaymentData()->toArray());
-        static::assertNotNull($dummyData->getChanged());
+        static::assertEquals($debit->getId(), $customer->getPaymentId());
+        static::assertCount(1, $customer->getPaymentData()->toArray());
+        static::assertNotNull($customer->getChanged());
 
         $params = [
-            'id' => $dummyData->getId(),
+            'id' => $customer->getId(),
             'paymentId' => $sepa->getId(),
             'paymentData' => [[
                 'accountHolder' => '',
@@ -260,23 +288,22 @@ public function testUpdateCustomerPaymentDataWithSepa($dummyDataId): void
                 'iban' => '456iban654',
                 'useBillingData' => true,
             ]],
-            'changed' => $dummyData->getChanged()->format('c'),
+            'changed' => $customer->getChanged()->format('c'),
         ];
         $this->Request()->setMethod('POST')->setPost($params);
         $this->dispatch('/backend/Customer/save');
         $jsonBody = $this->View()->getAssign();
 
-        static::assertTrue($this->View()->success);
+        static::assertTrue($this->View()->getAssign('success'));
         static::assertEquals($sepa->getId(), $jsonBody['data']['paymentId']);
 
-        $this->manager->refresh($dummyData);
+        $this->manager->refresh($customer);
 
-        static::assertEquals($sepa->getId(), $dummyData->getPaymentId());
-        $paymentDataArray = $dummyData->getPaymentData()->toArray();
+        static::assertEquals($sepa->getId(), $customer->getPaymentId());
+        $paymentDataArray = $customer->getPaymentData()->toArray();
         static::assertCount(2, $paymentDataArray);
 
         // Old debit payment data is still there, it's just not used currently
-        /** @var PaymentData $paymentData */
         $paymentData = array_shift($paymentDataArray);
         static::assertInstanceOf(PaymentData::class, $paymentData);
         static::assertEquals('Account Holder Name', $paymentData->getAccountHolder());
@@ -288,7 +315,6 @@ public function testUpdateCustomerPaymentDataWithSepa($dummyDataId): void
         static::assertFalse($paymentData->getUseBillingData());
 
         // New SEPA data
-        /** @var PaymentData $paymentData */
         $paymentData = array_shift($paymentDataArray);
         static::assertInstanceOf(PaymentData::class, $paymentData);
         static::assertEmpty($paymentData->getAccountHolder());
@@ -299,7 +325,7 @@ public function testUpdateCustomerPaymentDataWithSepa($dummyDataId): void
         static::assertEquals('456iban654', $paymentData->getIban());
         static::assertTrue($paymentData->getUseBillingData());
 
-        $this->manager->remove($dummyData);
+        $this->manager->remove($customer);
         $this->manager->flush();
     }
 
@@ -312,8 +338,8 @@ public function testPerformOrderAction(): void
 
         $this->Request()->setParams(['id' => $customer->getId()]);
 
-        /** @var Enlight_Controller_Response_ResponseTestCase $response */
         $response = $this->dispatch('backend/Customer/performOrder');
+        static::assertInstanceOf(Enlight_Controller_Response_ResponseTestCase::class, $response);
 
         $headerLocation = $response->getHeader('Location');
         $this->reset();
@@ -348,7 +374,7 @@ public function testSaveCustomerOverwriteProtection(): void
             ->setMethod('POST')
             ->setPost($postData);
         $this->dispatch('backend/Customer/save');
-        static::assertTrue($this->View()->success);
+        static::assertTrue($this->View()->getAssign('success'));
 
         // Now use an outdated timestamp. The controller should detect this and fail.
         $postData['changed'] = '2008-08-07 18:11:31';
@@ -356,7 +382,7 @@ public function testSaveCustomerOverwriteProtection(): void
             ->setMethod('POST')
             ->setPost($postData);
         $this->dispatch('backend/Customer/save');
-        static::assertFalse($this->View()->success);
+        static::assertFalse($this->View()->getAssign('success'));
     }
 
     /**
@@ -369,7 +395,9 @@ public function testCustomerId(): void
         $customer = Shopware()->Models()->find(Customer::class, $dummy->getId());
 
         static::assertInstanceOf(Customer::class, $customer);
-        static::assertEquals('1', $customer->getGroup()->getId());
+        $customerGroup = $customer->getGroup();
+        static::assertInstanceOf(Group::class, $customerGroup);
+        static::assertSame(1, $customerGroup->getId());
     }
 
     /**
@@ -390,7 +418,9 @@ private function createDummyCustomer(): Customer
     {
         $dummyData = new Customer();
         $dummyData->setEmail('test@phpunit.org');
-        $dummyData->setGroup($this->manager->find(Group::class, 1));
+        $customerGroup = $this->manager->find(Group::class, 1);
+        static::assertInstanceOf(Group::class, $customerGroup);
+        $dummyData->setGroup($customerGroup);
         $this->manager->persist($dummyData);
         $this->manager->flush();
 
diff --git a/tests/Functional/Controllers/Backend/EmotionPresetTest.php b/tests/Functional/Controllers/Backend/EmotionPresetTest.php
index 53bf8c8cee1..c391f270816 100644
--- a/tests/Functional/Controllers/Backend/EmotionPresetTest.php
+++ b/tests/Functional/Controllers/Backend/EmotionPresetTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Backend;
diff --git a/tests/Functional/Controllers/Backend/ErrorTest.php b/tests/Functional/Controllers/Backend/ErrorTest.php
index 345be9b2d83..132039fcafd 100644
--- a/tests/Functional/Controllers/Backend/ErrorTest.php
+++ b/tests/Functional/Controllers/Backend/ErrorTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Backend;
@@ -34,13 +33,17 @@
 use Enlight_Template_Manager;
 use Enlight_View_Default;
 use PHPUnit\Framework\TestCase;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
 use Shopware_Controllers_Backend_Error;
 
 class ErrorTest extends TestCase
 {
+    use ContainerTrait;
+
     public function testJsonRenderWillBeActivated(): void
     {
         $controller = new Shopware_Controllers_Backend_Error();
+        $controller->setContainer($this->getContainer());
         $request = new Enlight_Controller_Request_RequestHttp();
         $request->setHeader('CONTENT_TYPE', 'application/json');
         $controller->setRequest($request);
diff --git a/tests/Functional/Controllers/Backend/FormTest.php b/tests/Functional/Controllers/Backend/FormTest.php
index 4fdd6ec3e7b..31acdb00205 100644
--- a/tests/Functional/Controllers/Backend/FormTest.php
+++ b/tests/Functional/Controllers/Backend/FormTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Backend;
diff --git a/tests/Functional/Controllers/Backend/LogTest.php b/tests/Functional/Controllers/Backend/LogTest.php
index 573b3ae71f2..ea6b3264d81 100644
--- a/tests/Functional/Controllers/Backend/LogTest.php
+++ b/tests/Functional/Controllers/Backend/LogTest.php
@@ -1,30 +1,32 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Backend;
 
 use DateTime;
+use Doctrine\DBAL\Connection;
 use Enlight_Components_Test_Controller_TestCase;
 
 class LogTest extends Enlight_Components_Test_Controller_TestCase
@@ -44,11 +46,10 @@ public function setUp(): void
      * Tests the getLogsAction()
      * to test if reading the logs is working
      */
-    public function testGetLogs()
+    public function testGetLogs(): void
     {
-        /* @var \Enlight_Controller_Response_ResponseTestCase */
         $this->dispatch('backend/log/getLogs');
-        static::assertTrue($this->View()->success);
+        static::assertTrue($this->View()->getAssign('success'));
 
         $jsonBody = $this->View()->getAssign();
 
@@ -61,11 +62,11 @@ public function testGetLogs()
      * This test tests the creating of a new log.
      * This function is called before testDeleteLogs
      */
-    public function testCreateLog()
+    public function testCreateLog(): int
     {
-        Shopware()->Container()->get(\Doctrine\DBAL\Connection::class)->beginTransaction();
+        Shopware()->Container()->get(Connection::class)->beginTransaction();
 
-        $this->Request()->setClientIp('10.0.0.3', false);
+        $this->Request()->setClientIp('10.0.0.3');
         $this->Request()->setMethod('POST')->setPost(
             [
                 'type' => 'backend',
@@ -78,7 +79,7 @@ public function testCreateLog()
         );
 
         $this->dispatch('backend/logger/createLog');
-        static::assertTrue($this->View()->success);
+        static::assertTrue($this->View()->getAssign('success'));
 
         $jsonBody = $this->View()->getAssign();
 
@@ -93,10 +94,8 @@ public function testCreateLog()
      * This test-method tests the deleting of a log.
      *
      * @depends testCreateLog
-     *
-     * @param string $lastId
      */
-    public function testDeleteLogs($lastId)
+    public function testDeleteLogs(int $lastId): void
     {
         $this->Request()->setMethod('POST')->setPost(['id' => $lastId]);
 
@@ -105,20 +104,21 @@ public function testDeleteLogs($lastId)
         $jsonBody = $this->View()->getAssign();
 
         static::assertArrayHasKey('success', $jsonBody);
+        static::assertTrue($jsonBody['success']);
         static::assertArrayHasKey('data', $jsonBody);
 
-        Shopware()->Container()->get(\Doctrine\DBAL\Connection::class)->rollBack();
+        Shopware()->Container()->get(Connection::class)->rollBack();
     }
 
     /**
      * This test tests the creating of a new log.
      * This function is called before testDeleteLogs
      */
-    public function testCreateDeprecatedLog()
+    public function testCreateDeprecatedLog(): void
     {
-        Shopware()->Container()->get(\Doctrine\DBAL\Connection::class)->beginTransaction();
+        Shopware()->Container()->get(Connection::class)->beginTransaction();
 
-        $this->Request()->setClientIp('10.0.0.3', false);
+        $this->Request()->setClientIp('10.0.0.3');
         $this->Request()->setMethod('POST')->setPost(
             [
                 'type' => 'backend',
@@ -130,8 +130,8 @@ public function testCreateDeprecatedLog()
             ]
         );
 
-        $this->dispatch('backend/log/createLog');
-        static::assertTrue($this->View()->success);
+        $this->dispatch('backend/logger/createLog');
+        static::assertTrue($this->View()->getAssign('success'));
 
         $jsonBody = $this->View()->getAssign();
 
@@ -139,7 +139,7 @@ public function testCreateDeprecatedLog()
         static::assertArrayHasKey('success', $jsonBody);
         static::assertArrayHasKey('id', $jsonBody['data']);
 
-        Shopware()->Container()->get(\Doctrine\DBAL\Connection::class)->rollBack();
+        Shopware()->Container()->get(Connection::class)->rollBack();
     }
 
     public function testSystemLogList(): void
@@ -195,11 +195,10 @@ public function testSystemLogListWithFilter(): void
         $pluginLogger->info('Running test...');
         $coreLogger->info('Running test...');
 
-        /** @var string $environment */
         $environment = $container->getParameter('kernel.environment');
 
         // test filtering
-        $file = sprintf('core_%s', $environment);
+        $file = \sprintf('core_%s', $environment);
         $this->Request()->setParams([
             'limit' => 1,
             'query' => $file,
diff --git a/tests/Functional/Controllers/Backend/MailTest.php b/tests/Functional/Controllers/Backend/MailTest.php
index bd618244089..789e9e25626 100644
--- a/tests/Functional/Controllers/Backend/MailTest.php
+++ b/tests/Functional/Controllers/Backend/MailTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Backend;
@@ -28,10 +28,7 @@
 
 class MailTest extends Enlight_Components_Test_Controller_TestCase
 {
-    /**
-     * @var array
-     */
-    public $testData = [
+    public array $testData = [
         'name' => 'Testmail123',
         'fromMail' => 'Shopware Demoshop',
         'fromName' => 'info@example.com',
diff --git a/tests/Functional/Controllers/Backend/MediaManagerTest.php b/tests/Functional/Controllers/Backend/MediaManagerTest.php
index 5b66e95ce46..029bb5ae93e 100644
--- a/tests/Functional/Controllers/Backend/MediaManagerTest.php
+++ b/tests/Functional/Controllers/Backend/MediaManagerTest.php
@@ -1,51 +1,48 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Backend;
 
-use Enlight_Components_Test_Controller_TestCase;
+use Enlight_Controller_Request_RequestTestCase;
+use Enlight_Template_Manager;
+use Enlight_View_Default;
+use PHPUnit\Framework\TestCase;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
+use Shopware_Controllers_Backend_MediaManager;
 
-class MediaManagerTest extends Enlight_Components_Test_Controller_TestCase
+class MediaManagerTest extends TestCase
 {
-    /**
-     * Standard set up for every test - just disable auth
-     */
-    public function setUp(): void
-    {
-        parent::setUp();
-
-        // Disable auth and acl
-        Shopware()->Plugins()->Backend()->Auth()->setNoAuth();
-        Shopware()->Plugins()->Backend()->Auth()->setNoAcl();
-    }
+    use ContainerTrait;
+    use DatabaseTransactionBehaviour;
 
     /**
      * Creates a new album,
      * checks if the new album has inherited the parents settings
-     * and deletes it afterwards
+     * and deletes it afterward
      */
-    public function testAlbumInheritance()
+    public function testAlbumInheritance(): void
     {
         $params = [
             'albumID' => '',
@@ -57,25 +54,36 @@ public function testAlbumInheritance()
             'parentId' => '-11',
             'position' => '',
             'text' => 'PHPUNIT_ALBUM',
-            'thumbnailSize' => '',
+            'thumbnailSize' => [],
         ];
 
-        $this->Request()->setMethod('POST')->setPost($params);
-        $this->dispatch('/backend/MediaManager/saveAlbum');
+        $request = new Enlight_Controller_Request_RequestTestCase();
+        $request->setParams($params);
+
+        $controller = $this->getController();
+        $controller->setRequest($request);
+        $controller->saveAlbumAction();
 
-        $jsonBody = $this->View()->getAssign();
+        $jsonBody = $controller->View()->getAssign();
         static::assertTrue($jsonBody['success']);
 
-        $this->resetRequest();
-        $this->resetResponse();
-        $this->Request()->setMethod('GET')->setParams(['albumId' => '-11']);
-        $this->dispatch('/backend/MediaManager/getAlbums');
+        $request = new Enlight_Controller_Request_RequestTestCase();
+        $request->setParams(['albumId' => '-11']);
+        $controller = $this->getController();
+        $controller->getAlbumsAction();
 
-        $jsonBody = $this->View()->getAssign();
+        $jsonBody = $controller->View()->getAssign();
         static::assertTrue($jsonBody['success']);
 
-        $parentNode = $jsonBody['data'][0];
-        $newAlbum = $parentNode['data'][\count($parentNode['data']) - 1];
+        $parentNode = null;
+        foreach ($jsonBody['data'] as $nodes) {
+            if ($nodes['id'] === -11) {
+                $parentNode = $nodes;
+                break;
+            }
+        }
+
+        $newAlbum = $parentNode['data'][0];
 
         static::assertEquals($parentNode['thumbnailSize'], $newAlbum['thumbnailSize']);
         static::assertEquals($parentNode['thumbnailHighDpi'], $newAlbum['thumbnailHighDpi']);
@@ -86,14 +94,77 @@ public function testAlbumInheritance()
         static::assertEquals(1, $newAlbum['leaf']);
         static::assertEquals('sprite-target', $newAlbum['iconCls']);
 
-        $this->resetRequest();
-        $this->resetResponse();
-        $this->Request()->setMethod('POST')->setPost([
-            'albumID' => $newAlbum['id'],
-        ]);
-        $this->dispatch('/backend/MediaManager/removeAlbum');
+        $request = new Enlight_Controller_Request_RequestTestCase();
+        $request->setParam('albumID', $newAlbum['id']);
+        $controller = $this->getController();
+        $controller->setRequest($request);
+        $controller->removeAlbumAction();
+        $jsonBody = $controller->View()->getAssign();
+
+        static::assertTrue($jsonBody['success']);
+    }
+
+    public function testResolveAlbumDataRemoveWhiteSpaces(): void
+    {
+        $params = [
+            'albumID' => '',
+            'createThumbnails' => '',
+            'iconCls' => 'sprite-target',
+            'id' => '',
+            'leaf' => false,
+            'mediaCount' => '',
+            'position' => '',
+            'text' => 'PHPUNIT_ALBUM',
+            'thumbnailSize' => [
+                [
+                    'index' => 6,
+                    'value' => '50 x 50',
+                ],
+            ],
+        ];
+
+        $request = new Enlight_Controller_Request_RequestTestCase();
+        $request->setParams($params);
 
-        $jsonBody = $this->View()->getAssign();
+        $controller = $this->getController();
+        $controller->setRequest($request);
+        $controller->saveAlbumAction();
+
+        $jsonBody = $controller->View()->getAssign();
         static::assertTrue($jsonBody['success']);
+
+        $albumId = $jsonBody['data']['id'];
+        $db = $this->getContainer()->get('dbal_connection');
+
+        $thumbnailSize = $db->fetchOne('SELECT thumbnail_size FROM s_media_album_settings WHERE albumID = ?;', [$albumId]);
+
+        static::assertStringContainsString('50x50', $thumbnailSize);
+        static::assertStringNotContainsString('50 x 50', $thumbnailSize);
+    }
+
+    public function testGetAlbumsDoesNotThrowErrorIfNoDataIsAvailable(): void
+    {
+        $request = new Enlight_Controller_Request_RequestTestCase();
+        $request->setParam('albumFilter', 'foo');
+
+        $controller = $this->getController();
+        $controller->setRequest($request);
+        $controller->getAlbumsAction();
+        $results = $controller->View()->getAssign();
+
+        static::assertTrue($results['success']);
+        static::assertEmpty($results['data']);
+        static::assertSame(0, $results['total']);
+    }
+
+    public function getController(): Shopware_Controllers_Backend_MediaManager
+    {
+        $view = new Enlight_View_Default(new Enlight_Template_Manager());
+
+        $controller = $this->getContainer()->get('shopware_controllers_backend_mediamanager');
+        $controller->setView($view);
+        $controller->setContainer($this->getContainer());
+
+        return $controller;
     }
 }
diff --git a/tests/Functional/Controllers/Backend/Mock/ApplicationControllerMock.php b/tests/Functional/Controllers/Backend/Mock/ApplicationControllerMock.php
new file mode 100644
index 00000000000..6270d2ba5ea
--- /dev/null
+++ b/tests/Functional/Controllers/Backend/Mock/ApplicationControllerMock.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Controllers\Backend\Mock;
+
+use Shopware\Models\Customer\Address;
+use Shopware_Controllers_Backend_Application;
+
+/**
+ * @extends \Shopware_Controllers_Backend_Application<Address>
+ */
+class ApplicationControllerMock extends Shopware_Controllers_Backend_Application
+{
+    protected $model = Address::class;
+
+    protected $alias = 'address';
+}
diff --git a/tests/Functional/Controllers/Backend/NewsletterManagerTest.php b/tests/Functional/Controllers/Backend/NewsletterManagerTest.php
index 5326dc20641..e89246eae1f 100644
--- a/tests/Functional/Controllers/Backend/NewsletterManagerTest.php
+++ b/tests/Functional/Controllers/Backend/NewsletterManagerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Backend;
diff --git a/tests/Functional/Controllers/Backend/NewsletterTest.php b/tests/Functional/Controllers/Backend/NewsletterTest.php
index 20c6af1688e..06a2f158d94 100644
--- a/tests/Functional/Controllers/Backend/NewsletterTest.php
+++ b/tests/Functional/Controllers/Backend/NewsletterTest.php
@@ -1,29 +1,31 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Backend;
 
+use Doctrine\DBAL\Connection;
 use Enlight_Components_Test_Plugin_TestCase;
 use Shopware\Tests\Functional\Traits\ContainerTrait;
 use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
@@ -39,10 +41,9 @@ public function setUp(): void
         Shopware()->Plugins()->Backend()->Auth()->setNoAuth();
         Shopware()->Plugins()->Backend()->Auth()->setNoAcl();
 
-        /** @var string $sql */
         $sql = file_get_contents(__DIR__ . '/_fixtures/newsletter/mail.sql');
         static::assertIsString($sql);
-        Shopware()->Models()->getConnection()->exec($sql);
+        $this->getContainer()->get(Connection::class)->executeStatement($sql);
     }
 
     /**
@@ -51,14 +52,18 @@ public function setUp(): void
     public function testNewsletterLock(): void
     {
         $this->Front()->setParam('noViewRenderer', false);
-        Shopware()->Config()->offsetSet('MailCampaignsPerCall', 1);
+        $this->setConfig('MailCampaignsPerCall', 1);
 
         $this->dispatch('/backend/newsletter/cron');
-        static::assertMatchesRegularExpression('#[0-9]+ Recipients fetched#', $this->Response()->getBody());
+        $responseBody = $this->Response()->getBody();
+        static::assertIsString($responseBody);
+        static::assertMatchesRegularExpression('#\d+ Recipients fetched#', $responseBody);
         $this->reset();
 
         $this->dispatch('/backend/newsletter/cron');
-        static::assertMatchesRegularExpression('#Wait [0-9]+ seconds ...#', $this->Response()->getBody());
+        $responseBody = $this->Response()->getBody();
+        static::assertIsString($responseBody);
+        static::assertMatchesRegularExpression('#Wait \d+ seconds ...#', $responseBody);
         $this->reset();
     }
 
diff --git a/tests/Functional/Controllers/Backend/NotificationTest.php b/tests/Functional/Controllers/Backend/NotificationTest.php
index c2659eb4b1f..c4fec20acaf 100644
--- a/tests/Functional/Controllers/Backend/NotificationTest.php
+++ b/tests/Functional/Controllers/Backend/NotificationTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Backend;
@@ -28,6 +28,20 @@
 
 class NotificationTest extends Enlight_Components_Test_Controller_TestCase
 {
+    private const TEST_PRODUCT_LIST_LIMIT = 2;
+    private const TEST_PRODUCT_LIST_FIRST_PAGE_OFFSET = 0;
+    private const TEST_PRODUCT_LIST_SECOND_PAGE_OFFSET = 2;
+    private const TEST_PRODUCT_LIST_TOTAL_RESULTS = 3;
+    private const TEST_PRODUCT_LIST_FIRST_PAGE_ITEMS_COUNT = 2;
+    private const TEST_PRODUCT_LIST_SECOND_PAGE_ITEMS_COUNT = 1;
+
+    private const TEST_CUSTOMER_LIST_LIMIT = 2;
+    private const TEST_CUSTOMER_LIST_FIRST_PAGE_OFFSET = 0;
+    private const TEST_CUSTOMER_LIST_SECOND_PAGE_OFFSET = 2;
+    private const TEST_CUSTOMER_LIST_TOTAL_RESULTS = 3;
+    private const TEST_CUSTOMER_LIST_FIRST_PAGE_ITEMS_COUNT = 2;
+    private const TEST_CUSTOMER_LIST_SECOND_PAGE_ITEMS_COUNT = 1;
+
     /**
      * Standard set up for every test - just disable auth
      */
@@ -41,7 +55,10 @@ public function setUp(): void
         $sql = "INSERT IGNORE INTO `s_articles_notification` (`id`, `ordernumber`, `date`, `mail`, `send`, `language`, `shopLink`) VALUES
                 (1111111111, 'SW2001', '2010-10-04 10:46:56', 'test@example.de', 0, '1', 'http://example.com/'),
                 (1111111112, 'SW2003', '2010-10-05 10:46:55', 'test@example.com', 1, '1', 'http://example.com/'),
-                (1111111113, 'SW2001', '2010-10-04 10:46:54', 'test@example.org', 1, '1', 'http://example.com/');";
+                (1111111113, 'SW2001', '2010-10-04 10:46:54', 'test@example.org', 1, '1', 'http://example.com/'),
+                (1111111114, 'SW2005', '2024-03-27 10:00:00', 'test@example.org', 1, '1', 'http://example.com/'),
+                (1111111115, 'SW2001', '2024-03-27 10:01:00', 'john@example.org', 1, '1', 'http://example.com/')
+       ;";
         Shopware()->Db()->query($sql);
     }
 
@@ -51,49 +68,90 @@ public function setUp(): void
     protected function tearDown(): void
     {
         parent::tearDown();
-        $sql = 'DELETE FROM s_articles_notification WHERE id IN (1111111111, 1111111112, 1111111113)';
+        $sql = 'DELETE FROM s_articles_notification WHERE id IN (1111111111, 1111111112, 1111111113, 1111111114, 1111111115)';
         Shopware()->Db()->query($sql);
     }
 
     /**
      * test getList controller action
      */
-    public function testGetArticleList()
+    public function testGetArticleListFirstPage(): void
     {
-        $this->dispatch('backend/Notification/getArticleList');
-        static::assertTrue($this->View()->success);
-        $returnData = $this->View()->data;
+        $parameter = [
+            'limit' => self::TEST_PRODUCT_LIST_LIMIT,
+            'start' => self::TEST_PRODUCT_LIST_FIRST_PAGE_OFFSET,
+        ];
+        $getParameter = http_build_query($parameter);
+
+        $this->dispatch('backend/Notification/getArticleList?' . $getParameter);
+        static::assertTrue($this->View()->getAssign('success'));
+        $returnData = $this->View()->getAssign('data');
         static::assertNotEmpty($returnData);
-        static::assertCount(2, $returnData);
+
+        static::assertCount(self::TEST_PRODUCT_LIST_FIRST_PAGE_ITEMS_COUNT, $returnData);
+        static::assertSame(self::TEST_PRODUCT_LIST_TOTAL_RESULTS, $this->View()->getAssign('totalCount'));
         $listingFirstEntry = $returnData[0];
 
         // cause of the DataSet you can assert fix values
-        static::assertEquals(2, $listingFirstEntry['registered']);
-        static::assertEquals('SW2001', $listingFirstEntry['number']);
-        static::assertEquals(1, $listingFirstEntry['notNotified']);
+        static::assertSame(3, $listingFirstEntry['registered']);
+        static::assertSame('SW2001', $listingFirstEntry['number']);
+        static::assertSame('1', $listingFirstEntry['notNotified']);
+    }
+
+    /**
+     * test getList controller action
+     */
+    public function testGetArticleListSecondPage(): void
+    {
+        $parameter = [
+            'limit' => self::TEST_PRODUCT_LIST_LIMIT,
+            'start' => self::TEST_PRODUCT_LIST_SECOND_PAGE_OFFSET,
+        ];
+        $getParameter = http_build_query($parameter);
+
+        $this->dispatch('backend/Notification/getArticleList?' . $getParameter);
+        static::assertTrue($this->View()->getAssign('success'));
+        $returnData = $this->View()->getAssign('data');
+        static::assertNotEmpty($returnData);
+
+        static::assertCount(self::TEST_PRODUCT_LIST_SECOND_PAGE_ITEMS_COUNT, $returnData);
+        static::assertSame(self::TEST_PRODUCT_LIST_TOTAL_RESULTS, $this->View()->getAssign('totalCount'));
+        $listingFirstEntry = $returnData[0];
+
+        static::assertSame(1, $listingFirstEntry['registered']);
+        static::assertSame('SW2005', $listingFirstEntry['number']);
+        static::assertSame('0', $listingFirstEntry['notNotified']);
     }
 
     /**
      * test getCustomerList controller action
      */
-    public function testGetCustomerList()
+    public function testGetCustomerList(): void
     {
-        $params['orderNumber'] = 'SW2001';
+        $params = [
+            'orderNumber' => 'SW2001',
+            'limit' => self::TEST_CUSTOMER_LIST_LIMIT,
+            'start' => self::TEST_CUSTOMER_LIST_FIRST_PAGE_OFFSET,
+        ];
+
         $this->Request()->setParams($params);
         $this->dispatch('backend/Notification/getCustomerList');
         static::assertTrue($this->View()->getAssign('success'));
 
+        $totalCount = $this->View()->getAssign('totalCount');
+        static::assertSame(self::TEST_CUSTOMER_LIST_TOTAL_RESULTS, $totalCount);
+
         $returnData = $this->View()->getAssign('data');
-        static::assertCount(2, $returnData);
+        static::assertCount(self::TEST_CUSTOMER_LIST_FIRST_PAGE_ITEMS_COUNT, $returnData);
         $listingFirstEntry = $returnData[0];
         $listingSecondEntry = $returnData[1];
 
         // cause of the DataSet you can assert fix values
-        static::assertEquals('test@example.de', $listingFirstEntry['mail']);
-        static::assertEquals(0, $listingFirstEntry['notified']);
+        static::assertSame('test@example.de', $listingFirstEntry['mail']);
+        static::assertSame(0, $listingFirstEntry['notified']);
 
-        static::assertEquals('test@example.org', $listingSecondEntry['mail']);
-        static::assertEquals(1, $listingSecondEntry['notified']);
+        static::assertSame('test@example.org', $listingSecondEntry['mail']);
+        static::assertSame(1, $listingSecondEntry['notified']);
 
         $params['orderNumber'] = 'SW2003';
         $this->Request()->setParams($params);
@@ -103,8 +161,31 @@ public function testGetCustomerList()
         $returnData = $this->View()->getAssign('data');
 
         static::assertCount(1, $returnData);
-        static::assertEquals('test@example.com', $returnData[0]['mail']);
+        static::assertSame('test@example.com', $returnData[0]['mail']);
         static::assertNotEmpty($returnData[0]['name']);
         static::assertNotEmpty($returnData[0]['customerId']);
     }
+
+    public function testGetCustomerListSecondPage(): void
+    {
+        $params = [
+            'orderNumber' => 'SW2001',
+            'limit' => self::TEST_CUSTOMER_LIST_LIMIT,
+            'start' => self::TEST_CUSTOMER_LIST_SECOND_PAGE_OFFSET,
+        ];
+
+        $this->Request()->setParams($params);
+        $this->dispatch('backend/Notification/getCustomerList');
+        static::assertTrue($this->View()->getAssign('success'));
+
+        $totalCount = $this->View()->getAssign('totalCount');
+        static::assertSame(self::TEST_CUSTOMER_LIST_TOTAL_RESULTS, $totalCount);
+
+        $returnData = $this->View()->getAssign('data');
+        static::assertCount(self::TEST_CUSTOMER_LIST_SECOND_PAGE_ITEMS_COUNT, $returnData);
+        $listingFirstEntry = $returnData[0];
+
+        static::assertSame('john@example.org', $listingFirstEntry['mail']);
+        static::assertSame(1, $listingFirstEntry['notified']);
+    }
 }
diff --git a/tests/Functional/Controllers/Backend/OrderProductSearchTest.php b/tests/Functional/Controllers/Backend/OrderProductSearchTest.php
new file mode 100644
index 00000000000..5b013af9380
--- /dev/null
+++ b/tests/Functional/Controllers/Backend/OrderProductSearchTest.php
@@ -0,0 +1,696 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Controllers\Backend;
+
+use Doctrine\DBAL\Connection;
+use Doctrine\ORM\EntityNotFoundException;
+use Enlight_Components_Test_Controller_TestCase;
+use Enlight_Controller_Request_RequestTestCase;
+use Enlight_Template_Manager;
+use Enlight_View_Default;
+use Exception;
+use Generator;
+use Shopware\Components\Model\Exception\ModelNotFoundException;
+use Shopware\Controllers\Backend\OrderProductSearch;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
+use Shopware_Plugins_Backend_Auth_Bootstrap as AuthPlugin;
+
+/**
+ * @phpstan-type GetProductVariantsExpectedResults array<array{total: int, id: string, name: string, active: string, taxID: string, tax: float, ordernumber: string, articleId: string, inStock: string, supplierName: string, supplierId: string, additionalText: string, price: float}>
+ */
+class OrderProductSearchTest extends Enlight_Components_Test_Controller_TestCase
+{
+    use ContainerTrait;
+    use DatabaseTransactionBehaviour;
+
+    private const ORDER_ID_CUSTOMER_GROUP_MERCHANT = 15;
+    private const ORDER_ID_CUSTOMER_GROUP_DEFAULT = 57;
+    private const ORDER_ID_NOT_EXIST = 999;
+    private const CUSTOMER_GROUP_ID_MERCHANT = 2;
+    private const CUSTOMER_ID_NOT_EXIST = 777;
+    private const FINLAND_COUNTRY_ID = 8;
+    private const DENMARK_COUNTRY_ID = 7;
+    private const AREA_ID_EUROPE = 3;
+    private const TAX_ID_7_PERCENT = 4;
+    private const TAX_ID_19_PERCENT = 1;
+    private const SEARCH_PARAMS_FILTER_PROPERTY = 'free';
+
+    private AuthPlugin $authPlugin;
+
+    private Connection $connection;
+
+    /**
+     * Standard set up for every test - just disable auth
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->authPlugin = $this->getContainer()->get('plugins')->Backend()->Auth();
+        $this->authPlugin->setNoAuth();
+        $this->connection = $this->getContainer()->get(Connection::class);
+    }
+
+    public function tearDown(): void
+    {
+        parent::tearDown();
+
+        $this->authPlugin->setNoAuth(false);
+    }
+
+    /**
+     * @dataProvider provideSearchDataAndReturnValues
+     *
+     * @param array<string, mixed> $searchParams
+     *
+     * @phpstan-param GetProductVariantsExpectedResults $expectedResults
+     *
+     * @throws Exception
+     */
+    public function testGetProductVariantsActionConfirmReturnValues(array $searchParams, bool $hasResults, array $expectedResults = []): void
+    {
+        $params = $this->getSearchParams($searchParams);
+
+        $request = new Enlight_Controller_Request_RequestTestCase();
+        $request->setParams($params);
+
+        $controller = $this->getController();
+        $controller->setRequest($request);
+        $controller->getProductVariantsAction();
+        $results = $controller->View()->getAssign();
+
+        static::assertIsArray($results);
+        static::assertIsArray($results['data']);
+        static::assertIsBool($results['success']);
+        static::assertIsInt($results['total']);
+
+        if (!$hasResults) {
+            static::assertEmpty($results['data']);
+            static::assertSame(0, $results['total']);
+
+            return;
+        }
+
+        static::assertLessThanOrEqual($params['limit'], \count($results['data']));
+        static::assertArrayHasKey('id', $results['data'][0]);
+        static::assertArrayHasKey('name', $results['data'][0]);
+        static::assertArrayHasKey('active', $results['data'][0]);
+        static::assertArrayHasKey('ordernumber', $results['data'][0]);
+        static::assertArrayHasKey('articleId', $results['data'][0]);
+        static::assertArrayHasKey('inStock', $results['data'][0]);
+        static::assertArrayHasKey('supplierName', $results['data'][0]);
+        static::assertArrayHasKey('supplierId', $results['data'][0]);
+        static::assertArrayHasKey('additionalText', $results['data'][0]);
+        static::assertArrayHasKey('price', $results['data'][0]);
+        static::assertIsFloat($results['data'][0]['price']);
+        static::assertIsFloat($results['data'][0]['tax']);
+        static::assertArrayHasKey('taxId', $results['data'][0]);
+
+        if (!empty($expectedResults)) {
+            static::assertSame($expectedResults['total'], $results['total']);
+            unset($expectedResults['total']);
+            foreach ($expectedResults as $key => $value) {
+                static::assertSame($value, $results['data'][0][$key], 'test key: ' . $key);
+            }
+        }
+    }
+
+    /**
+     * @return Generator<array{searchParams: array{searchString: string, orderId: int}, hasResults: bool, 3?:GetProductVariantsExpectedResults}>
+     */
+    public function provideSearchDataAndReturnValues(): Generator
+    {
+        yield 'searchTerm: orderNumber explicit - customer group: "H" (config: netto-prices-in-shop)' => [
+            'searchParams' => [
+                'searchString' => 'SW10178',
+                'orderId' => self::ORDER_ID_CUSTOMER_GROUP_MERCHANT,
+                'filterProperty' => self::SEARCH_PARAMS_FILTER_PROPERTY,
+            ],
+            'hasResults' => true,
+            [
+                'total' => 1,
+                'id' => '407',
+                'name' => 'Strandtuch "Ibiza"',
+                'active' => '1',
+                'taxId' => '1',
+                'tax' => 19.0,
+                'ordernumber' => 'SW10178',
+                'articleId' => '178',
+                'inStock' => '84',
+                'supplierName' => 'Beachdreams Clothes',
+                'supplierId' => '12',
+                'additionalText' => '',
+                'price' => 16.76,
+            ],
+        ];
+        yield 'searchTerm: productName - customer group: "H" (config: netto-prices-in-shop) - graduated price-product' => [
+            'searchParams' => [
+                'searchString' => 'Staffelpreis',
+                'orderId' => self::ORDER_ID_CUSTOMER_GROUP_MERCHANT,
+                'filterProperty' => self::SEARCH_PARAMS_FILTER_PROPERTY,
+            ],
+            'hasResults' => true,
+            [
+                'total' => 1,
+                'id' => '747',
+                'name' => 'Staffelpreise',
+                'active' => '1',
+                'taxId' => '1',
+                'tax' => 19.0,
+                'ordernumber' => 'SW10208',
+                'articleId' => '209',
+                'inStock' => '529',
+                'supplierName' => 'Example',
+                'supplierId' => '14',
+                'additionalText' => '',
+                'price' => 0.84,
+            ],
+        ];
+        yield 'searchTerm: productName - customer group: "EK" - graduated price-product' => [
+            'searchParams' => [
+                'searchString' => 'Staffelpreis',
+                'orderId' => self::ORDER_ID_CUSTOMER_GROUP_DEFAULT,
+                'filterProperty' => self::SEARCH_PARAMS_FILTER_PROPERTY,
+            ],
+            'hasResults' => true,
+            [
+                'total' => 1,
+                'id' => '747',
+                'name' => 'Staffelpreise',
+                'active' => '1',
+                'taxId' => '1',
+                'tax' => 19.0,
+                'ordernumber' => 'SW10208',
+                'articleId' => '209',
+                'inStock' => '529',
+                'supplierName' => 'Example',
+                'supplierId' => '14',
+                'additionalText' => '',
+                'price' => 1.00,
+            ],
+        ];
+        yield 'searchTerm: productName - customer group: "H" (config: netto-prices-in-shop)' => [
+            'searchParams' => [
+                'searchString' => 'schoko',
+                'orderId' => self::ORDER_ID_CUSTOMER_GROUP_MERCHANT,
+                'filterProperty' => self::SEARCH_PARAMS_FILTER_PROPERTY,
+            ],
+            'hasResults' => true,
+            [
+                'total' => 1,
+                'id' => '46',
+                'name' => 'Schokoleim',
+                'active' => '1',
+                'taxId' => '4',
+                'tax' => 7.0,
+                'ordernumber' => 'SW10039',
+                'articleId' => '40',
+                'inStock' => '50',
+                'supplierName' => 'The Deli Garage',
+                'supplierId' => '4',
+                'additionalText' => '',
+                'price' => 8.39,
+            ],
+        ];
+        yield 'searchTerm: supplier with products not mapped to a category - customer group: "EK"' => [
+            'searchParams' => [
+                'searchString' => 'trusted',
+                'orderId' => self::ORDER_ID_CUSTOMER_GROUP_DEFAULT,
+                'filterProperty' => self::SEARCH_PARAMS_FILTER_PROPERTY,
+            ],
+            'hasResults' => true,
+            [
+                'total' => 10,
+                'id' => '804',
+                'name' => 'Käuferschutz',
+                'active' => '1',
+                'taxId' => '1',
+                'tax' => 19.0,
+                'ordernumber' => 'TS100629_500_30_GBP',
+                'articleId' => '249',
+                'inStock' => '0',
+                'supplierName' => 'Trusted Shops',
+                'supplierId' => '17',
+                'additionalText' => null,
+                'price' => 0.98,
+            ],
+        ];
+        yield 'searchTerm: productName - customer group: "EK" - variants' => [
+            'searchParams' => [
+                'searchString' => 'flip',
+                'orderId' => self::ORDER_ID_CUSTOMER_GROUP_DEFAULT,
+                'filterProperty' => self::SEARCH_PARAMS_FILTER_PROPERTY,
+            ],
+            'hasResults' => true,
+            [
+                'total' => 10,
+                'id' => '322',
+                'name' => 'Flip Flops, in mehreren Farben verfügbar blau / 39/40',
+                'active' => '1',
+                'taxId' => '1',
+                'tax' => 19.0,
+                'ordernumber' => 'SW10153.1',
+                'articleId' => '153',
+                'inStock' => '67',
+                'supplierName' => 'Beachdreams Clothes',
+                'supplierId' => '12',
+                'additionalText' => 'blau / 39/40',
+                'price' => 6.99,
+            ],
+        ];
+        yield 'param $filter[\'property\'] is not \'free\' shall return 10 products without filter - customer group: "EK"' => [
+            'searchParams' => [
+                'searchString' => 'ibiza',
+                'orderId' => self::ORDER_ID_CUSTOMER_GROUP_DEFAULT,
+                'filterProperty' => '',
+            ],
+            'hasResults' => true,
+            [
+                'total' => 10,
+                'id' => '3',
+                'name' => 'Münsterländer Aperitif 16%',
+                'active' => '1',
+                'taxId' => '1',
+                'tax' => 19.0,
+                'ordernumber' => 'SW10003',
+                'articleId' => '3',
+                'inStock' => '25',
+                'supplierName' => 'Feinbrennerei Sasse',
+                'supplierId' => '2',
+                'additionalText' => '',
+                'price' => 14.95,
+            ],
+        ];
+        yield 'searchTerm not exists' => [
+            'searchParams' => [
+                'searchString' => 'lorem',
+                'orderId' => self::ORDER_ID_CUSTOMER_GROUP_DEFAULT,
+                'filterProperty' => self::SEARCH_PARAMS_FILTER_PROPERTY,
+            ],
+            'hasResults' => false,
+        ];
+    }
+
+    /**
+     * @dataProvider provideDataForDifferentProductPricesForCustomerGroups
+     *
+     * @param array<string, mixed>        $searchParams
+     * @param array<string, float>        $expectedValues
+     * @param array<array<string, mixed>> $sqlParamsTaxRule
+     * @param array<string, mixed>        $sqlParamsProduct
+     * @param array<string, mixed>        $sqlParamsShippingAddress
+     * @param array<string, int>          $sqlParamsPriceConfig
+     *
+     * @throws Exception
+     * @throws \Doctrine\DBAL\Driver\Exception
+     */
+    public function testCustomerGroupPricesAndTaxRules(
+        array $searchParams,
+        array $expectedValues,
+        array $sqlParamsTaxRule,
+        array $sqlParamsProduct,
+        array $sqlParamsShippingAddress,
+        array $sqlParamsPriceConfig
+    ): void {
+        if (!empty($sqlParamsTaxRule)) {
+            $this->createTaxRules($sqlParamsTaxRule);
+        }
+
+        if (!empty($sqlParamsProduct)) {
+            $this->createCustomerGroupSpecificProductPrice($sqlParamsProduct);
+        }
+
+        if (!empty($sqlParamsShippingAddress)) {
+            $this->changeShippingAddress($sqlParamsShippingAddress);
+        }
+
+        if (!empty($sqlParamsPriceConfig)) {
+            $this->setCustomerGroupSpecificPriceConfig($sqlParamsPriceConfig);
+        }
+
+        $params = $this->getSearchParams($searchParams);
+
+        $request = new Enlight_Controller_Request_RequestTestCase();
+        $request->setParams($params);
+
+        $controller = $this->getController();
+        $controller->setRequest($request);
+        $controller->getProductVariantsAction();
+        $results = $controller->View()->getAssign();
+
+        static::assertIsArray($results);
+        static::assertIsArray($results['data']);
+        static::assertTrue($results['success']);
+        static::assertSame($expectedValues['price'], $results['data'][0]['price']);
+        static::assertSame($expectedValues['tax'], $results['data'][0]['tax']);
+    }
+
+    /**
+     * @return Generator<array{searchParams: array<string, mixed>, expectedValues: array<string, float>, sqlParamsTaxRule: array<array<string, mixed>>, sqlParamsProduct: array<string, mixed>, sqlParamsShippingAddress: array<string, mixed>, sqlParamsPriceConfig: array<string, int>}>
+     */
+    public function provideDataForDifferentProductPricesForCustomerGroups(): Generator
+    {
+        yield 'customer group: "H" with a specific product-price - net-prices in frontend' => [
+            'searchParams' => [
+                'searchString' => 'stuhl',
+                'orderId' => self::ORDER_ID_CUSTOMER_GROUP_MERCHANT,
+                'filterProperty' => self::SEARCH_PARAMS_FILTER_PROPERTY,
+            ],
+            'expectedValues' => [
+                'price' => 100.00,
+                'tax' => 19.00,
+            ],
+            'sqlParamsTaxRule' => [],
+            'sqlParamsProduct' => [
+                'productId' => 74,
+                'customerGroup' => 'H',
+                'productDetailsId' => 137,
+            ],
+            'sqlParamsShippingAddress' => [],
+            'sqlParamsPriceConfig' => [],
+        ];
+        yield 'customer group: "H", shipping address doesn\'t match with a tax-rule and with no specific product-price should use default-price - net-prices in frontend' => [
+            'searchParams' => [
+                'searchString' => 'stuhl',
+                'orderId' => self::ORDER_ID_CUSTOMER_GROUP_MERCHANT,
+                'filterProperty' => self::SEARCH_PARAMS_FILTER_PROPERTY,
+            ],
+            'expectedValues' => [
+                'price' => 63.02,
+                'tax' => 19.00,
+            ],
+            'sqlParamsTaxRule' => [
+                [
+                    'areaID' => self::AREA_ID_EUROPE,
+                    'countryID' => self::DENMARK_COUNTRY_ID,
+                    'stateID' => null,
+                    'groupID' => self::TAX_ID_19_PERCENT,
+                    'customer_groupID' => self::CUSTOMER_GROUP_ID_MERCHANT,
+                    'tax' => 10.00,
+                    'name' => 'Denmark',
+                ],
+            ],
+            'sqlParamsProduct' => [],
+            'sqlParamsShippingAddress' => [],
+            'sqlParamsPriceConfig' => [],
+        ];
+        yield 'customer group: "H", shipping address match with tax-rule + custom product price - gross-prices in frontend' => [
+            'searchParams' => [
+                'filterProperty' => self::SEARCH_PARAMS_FILTER_PROPERTY,
+                'searchString' => 'Schokoleim',
+                'orderId' => self::ORDER_ID_CUSTOMER_GROUP_MERCHANT,
+            ],
+            'expectedValues' => [
+                'price' => 200.00,
+                'tax' => 100.00,
+            ],
+            'sqlParamsTaxRule' => [
+                [
+                    'areaID' => self::AREA_ID_EUROPE,
+                    'countryID' => self::DENMARK_COUNTRY_ID,
+                    'stateID' => null,
+                    'groupID' => self::TAX_ID_7_PERCENT,
+                    'customer_groupID' => self::CUSTOMER_GROUP_ID_MERCHANT,
+                    'tax' => 10.00,
+                    'name' => 'Denmark',
+                ],
+                [
+                    'areaID' => self::AREA_ID_EUROPE,
+                    'countryID' => self::FINLAND_COUNTRY_ID,
+                    'stateID' => null,
+                    'groupID' => self::TAX_ID_7_PERCENT,
+                    'customer_groupID' => self::CUSTOMER_GROUP_ID_MERCHANT,
+                    'tax' => 100.00,
+                    'name' => 'Finland',
+                ],
+            ],
+            'sqlParamsProduct' => [
+                'productId' => 40,
+                'customerGroup' => 'H',
+                'productDetailsId' => 46,
+            ],
+            'sqlParamsShippingAddress' => [
+                'countryID' => self::FINLAND_COUNTRY_ID,
+                'stateID' => null,
+                'orderID' => self::ORDER_ID_CUSTOMER_GROUP_MERCHANT,
+            ],
+            'sqlParamsPriceConfig' => [
+                'customerGroupId' => self::CUSTOMER_GROUP_ID_MERCHANT,
+                'grossPrices' => 1,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider provideSearchParamsThatThrowsExceptions
+     *
+     * @param array<string, mixed> $searchParams
+     * @param array<string, mixed> $exception
+     *
+     * @throws Exception
+     */
+    public function testGetProductVariantsActionThrowsExceptions(array $searchParams, array $exception): void
+    {
+        $params = $this->getSearchParams($searchParams);
+
+        $request = new Enlight_Controller_Request_RequestTestCase();
+        $request->setParams($params);
+
+        $controller = $this->getController();
+        $controller->setRequest($request);
+        $this->expectException($exception['type']);
+        $this->expectExceptionMessage($exception['message']);
+        $controller->getProductVariantsAction();
+    }
+
+    /**
+     * @return Generator<array{searchParams: array<string, mixed>, exception: array<string, mixed>}>
+     */
+    public function provideSearchParamsThatThrowsExceptions(): Generator
+    {
+        yield 'missing orderId' => [
+            'searchParams' => [
+                'searchString' => 'stuhl',
+                'filterProperty' => self::SEARCH_PARAMS_FILTER_PROPERTY,
+            ],
+            'exception' => [
+                'type' => 'RuntimeException',
+                'message' => 'The parameter orderId is not set',
+            ],
+        ];
+        yield 'orderId not exist' => [
+            'searchParams' => [
+                'searchString' => 'stuhl',
+                'filterProperty' => self::SEARCH_PARAMS_FILTER_PROPERTY,
+                'orderId' => self::ORDER_ID_NOT_EXIST,
+            ],
+            'exception' => [
+                'type' => 'RuntimeException',
+                'message' => 'Shopware\Models\Order\Order" for id "' . self::ORDER_ID_NOT_EXIST,
+            ],
+        ];
+    }
+
+    /**
+     * @throws \Doctrine\DBAL\Exception
+     * @throws Exception
+     */
+    public function testGetProductVariantsActionThrowsExceptionsCustomerNotFound(): void
+    {
+        $params = require __DIR__ . '/_assets/getProductVariantsParams.php';
+        static::assertIsArray($params);
+        $params['orderId'] = self::ORDER_ID_CUSTOMER_GROUP_MERCHANT;
+        $params['filter']['property'] = self::SEARCH_PARAMS_FILTER_PROPERTY;
+
+        $sql = 'UPDATE s_order SET userID = :userId WHERE id = :orderId;';
+        $this->connection->executeQuery($sql, [
+            'orderId' => self::ORDER_ID_CUSTOMER_GROUP_MERCHANT,
+            'userId' => self::CUSTOMER_ID_NOT_EXIST,
+        ]
+        );
+
+        $request = new Enlight_Controller_Request_RequestTestCase();
+        $request->setParams($params);
+
+        $controller = $this->getController();
+        $controller->setRequest($request);
+        $this->expectException(EntityNotFoundException::class);
+        $this->expectExceptionMessage("Entity of type 'Shopware\Models\Customer\Customer' for IDs id(" . self::CUSTOMER_ID_NOT_EXIST . ')');
+        $controller->getProductVariantsAction();
+    }
+
+    /**
+     * @throws \Doctrine\DBAL\Exception
+     * @throws Exception
+     */
+    public function testGetProductVariantsActionThrowsExceptionsShippingNotFound(): void
+    {
+        $params = require __DIR__ . '/_assets/getProductVariantsParams.php';
+        static::assertIsArray($params);
+        $params['orderId'] = self::ORDER_ID_CUSTOMER_GROUP_DEFAULT;
+        $params['filter']['property'] = self::SEARCH_PARAMS_FILTER_PROPERTY;
+
+        $sql = 'UPDATE s_order_shippingaddress SET orderID = :orderIdNotExist WHERE orderID = :orderId;';
+        $this->connection->executeQuery($sql, [
+            'orderId' => self::ORDER_ID_CUSTOMER_GROUP_DEFAULT,
+            'orderIdNotExist' => self::ORDER_ID_NOT_EXIST,
+        ]
+        );
+
+        $request = new Enlight_Controller_Request_RequestTestCase();
+        $request->setParams($params);
+
+        $controller = $this->getController();
+        $controller->setRequest($request);
+        $this->expectException(ModelNotFoundException::class);
+        $this->expectExceptionMessage('Model of "Shopware\Models\Order\Shipping" for id "' . self::ORDER_ID_CUSTOMER_GROUP_DEFAULT . '"');
+        $controller->getProductVariantsAction();
+    }
+
+    /**
+     * @param array<array<string, mixed>> $sqlParams
+     *
+     * @throws \Doctrine\DBAL\Exception
+     * @throws \Doctrine\DBAL\Driver\Exception
+     */
+    private function createTaxRules(array $sqlParams): void
+    {
+        $taxRules = 'SELECT * FROM s_core_tax_rules';
+        static::assertSame(0, (int) $this->connection->executeQuery($taxRules)->rowCount());
+
+        $sql = file_get_contents(__DIR__ . '/_fixtures/order/tax_rules_2.sql');
+        static::assertIsString($sql);
+        foreach ($sqlParams as $params) {
+            $this->connection->executeQuery(
+                $sql,
+                [
+                    'areaID' => $params['areaID'],
+                    'countryID' => $params['countryID'],
+                    'stateID' => $params['stateID'],
+                    'groupID' => $params['groupID'],
+                    'customer_groupID' => $params['customer_groupID'],
+                    'tax' => $params['tax'],
+                    'name' => $params['name'],
+                ]
+            );
+        }
+
+        static::assertCount(\count($sqlParams), $this->connection->executeQuery($taxRules)->fetchAllAssociative());
+    }
+
+    /**
+     * @param array<string, mixed> $sqlParams
+     *
+     * @throws \Doctrine\DBAL\Exception
+     * @throws \Doctrine\DBAL\Driver\Exception
+     */
+    private function createCustomerGroupSpecificProductPrice(array $sqlParams): void
+    {
+        $countProductPricesQuery = 'SELECT count(*) FROM s_articles_prices WHERE articledetailsID = :productDetailsId AND pricegroup = :customerGroup';
+        static::assertSame(0, (int) $this->connection->executeQuery(
+            $countProductPricesQuery, ['productDetailsId' => $sqlParams['productDetailsId'], 'customerGroup' => $sqlParams['customerGroup']]
+        )->fetchOne(), 'A customer-group specific price has already been assigned to this product');
+
+        $sql = file_get_contents(__DIR__ . '/_fixtures/order/customerGroupSpecificPrices.sql');
+        static::assertIsString($sql);
+        $this->connection->executeStatement($sql, ['customerGroup' => $sqlParams['customerGroup'], 'productId' => $sqlParams['productId'], 'productDetailsId' => $sqlParams['productDetailsId']]);
+
+        static::assertSame(1, (int) $this->connection->executeQuery(
+            $countProductPricesQuery, ['productDetailsId' => $sqlParams['productDetailsId'], 'customerGroup' => $sqlParams['customerGroup']]
+        )->fetchOne());
+    }
+
+    /**
+     * @param array<string, mixed> $sqlParams
+     *
+     * @throws \Doctrine\DBAL\Exception
+     */
+    private function changeShippingAddress(array $sqlParams): void
+    {
+        $sql = file_get_contents(__DIR__ . '/_fixtures/order/shipping_address.sql');
+        static::assertIsString($sql);
+        $this->connection->executeQuery(
+            $sql, [
+                'countryID' => $sqlParams['countryID'],
+                'stateID' => $sqlParams['stateID'],
+                'orderID' => $sqlParams['orderID'],
+            ]
+        );
+    }
+
+    /**
+     * @param array<string, int> $sqlParams
+     */
+    private function setCustomerGroupSpecificPriceConfig(array $sqlParams): void
+    {
+        $sql = 'UPDATE s_core_customergroups SET tax = :grossPricesInFrontend  WHERE id = :customerGroupId;';
+        $this->connection->executeQuery(
+            $sql, [
+                'customerGroupId' => $sqlParams['customerGroupId'],
+                'grossPricesInFrontend' => $sqlParams['grossPrices'],
+            ]
+        );
+    }
+
+    /**
+     * @param array<string, mixed> $searchParams
+     *
+     * @return array<string, mixed>
+     */
+    private function getSearchParams(array $searchParams): array
+    {
+        $params = [
+            'articles' => 'true',
+            'variants' => 'true',
+            'configurator' => 'true',
+            'page' => 1,
+            'start' => 0,
+            'limit' => 10,
+            'filter' => [[
+                'property' => $searchParams['filterProperty'],
+                'value' => '%' . $searchParams['searchString'] . '%',
+                'operator' => null,
+                'expression' => null,
+            ]],
+        ];
+
+        if (isset($searchParams['orderId'])) {
+            $params['orderId'] = $searchParams['orderId'];
+        }
+
+        return $params;
+    }
+
+    private function getController(): OrderProductSearch
+    {
+        $controller = $this->getContainer()->get(OrderProductSearch::class);
+        $controller->setView(new Enlight_View_Default(new Enlight_Template_Manager()));
+        $controller->setContainer($this->getContainer());
+
+        return $controller;
+    }
+}
diff --git a/tests/Functional/Controllers/Backend/OrderTest.php b/tests/Functional/Controllers/Backend/OrderTest.php
index 0308b4a77b0..151e990ef4f 100644
--- a/tests/Functional/Controllers/Backend/OrderTest.php
+++ b/tests/Functional/Controllers/Backend/OrderTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Backend;
@@ -30,9 +29,15 @@
 use DateTimeInterface;
 use DateTimeZone;
 use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Exception;
 use Enlight_Components_Test_Controller_TestCase as ControllerTestCase;
-use Exception;
+use Enlight_Controller_Request_RequestTestCase;
+use Enlight_Template_Manager;
+use Enlight_View_Default;
+use Generator;
+use RuntimeException;
 use Shopware\Components\Model\ModelManager;
+use Shopware\Models\Article\Detail as ArticleDetail;
 use Shopware\Models\Order\Detail;
 use Shopware\Models\Order\Order;
 use Shopware\Models\Shop\Locale;
@@ -40,6 +45,7 @@
 use Shopware\Models\Tax\Tax;
 use Shopware\Tests\Functional\Traits\ContainerTrait;
 use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
+use Shopware_Controllers_Backend_Order;
 use Shopware_Plugins_Backend_Auth_Bootstrap as AuthPlugin;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -48,11 +54,33 @@ class OrderTest extends ControllerTestCase
     use ContainerTrait;
     use DatabaseTransactionBehaviour;
 
-    private const TAX_RULE_ID = 9999;
     private const ORDER_DETAIL_ID = 6789;
     private const ORDER_ID = 12345;
+    private const ORDER_ID_DEMODATA_EK = 57;
+    private const ORDER_ID_DEMODATA_H = 15;
     private const CUSTOMER_ID = 9999;
     private const NEW_TAX_ID = 1234;
+    private const NEW_TAX = 20.50;
+    private const CUSTOMER_GROUP_ID_DEFAULT = 1;
+    private const CUSTOMER_GROUP_ID_MERCHANT = 2;
+    private const CUSTOMER_GROUP_KEY_DEFAULT = 'EK';
+    private const CUSTOMER_GROUP_KEY_MERCHANT = 'H';
+    private const GERMANY_COUNTRY_ID = 2;
+    private const NRW_STATE_ID = 3;
+    private const GERMANY_AREA_ID = 1;
+    private const ARTICLE_ID = 29;
+    private const ARTICLE_DETAIL_ID = 35;
+    private const ARTICLE_DETAIL_NUMBER = 'SW10028';
+    private const PRODUCT_GRADUATED_PRICES_DEMODATA_ORDER_NUMBER = 'SW10208';
+    private const PRODUCT_GRADUATED_PRICES_DEMODATA_PRODUCT_ID = 209;
+    private const PRODUCT_GRADUATED_PRICES_DEMODATA_PRODUCT_VARIANT_ID = 747;
+    private const PRODUCT_GRADUATED_PRICES_DEMODATA_NAME = 'Staffelpreise';
+    private const PRODUCT_GRADUATED_PRICES_VARIANT1_ORDER_NUMBER = 'SW10090.1';
+    private const PRODUCT_GRADUATED_PRICES_VARIANT1_PRODUCT_VARIANT_ID = 153;
+    private const PRODUCT_GRADUATED_PRICES_VARIANT2_ORDER_NUMBER = 'SW10090.2';
+    private const PRODUCT_GRADUATED_PRICES_VARIANT2_PRODUCT_VARIANT_ID = 154;
+    private const PRODUCT_GRADUATED_PRICES_VARIANT_NAME = 'Teigschaber';
+    private const PRODUCT_GRADUATED_PRICES_VARIANT_PRODUCT_ID = 89;
 
     private Connection $connection;
 
@@ -196,7 +224,7 @@ public function testSavingOrderWithDifferentTimeZone(): void
 
         $orderTime = $data['orderTime'];
         $oldDate = clone $orderTime;
-        $orderTime->setTimezone(new DateTimeZone('US/Alaska'));
+        $orderTime->setTimezone(new DateTimeZone('America/Anchorage'));
 
         $data['orderTime'] = new DateTime($orderTime->format(DateTime::ATOM));
         if (isset($data['changed'])) {
@@ -215,15 +243,246 @@ public function testSavingOrderWithDifferentTimeZone(): void
         static::assertSame($oldDate->getTimestamp(), $this->View()->getAssign('data')['orderTime']->getTimestamp());
     }
 
-    public function testSavePositionActionWithTaxRule(): void
+    /**
+     * @dataProvider provideProductParamsForSavePositionActionTestingGraduatedPrices
+     *
+     * @param array<string, mixed>     $params
+     * @param array<string, int|float> $expectedValues
+     *
+     * @throws Exception
+     */
+    public function testSavePositionActionReturnValuesForGraduatedPricesByAddingNewPositions(array $params, array $expectedValues): void
+    {
+        $productPricesSql = file_get_contents(__DIR__ . '/_fixtures/article/graduatedPrices.sql');
+        static::assertIsString($productPricesSql);
+        $this->connection->executeQuery($productPricesSql);
+
+        $order = $this->modelManager->find(Order::class, $params['orderId']);
+        static::assertInstanceOf(Order::class, $order);
+        $request = new Enlight_Controller_Request_RequestTestCase();
+        $request->setParams(array_merge([
+            'id' => 0,
+            'mode' => 0,
+            'statusId' => 0,
+            'statusDescription' => '',
+            'taxId' => 1,
+            'taxRate' => 0,
+            'taxDescription' => '',
+            'inStock' => 0,
+            'changed' => $order->getChanged() ? $order->getChanged()->format(DateTimeInterface::ATOM) : '',
+        ], $params));
+
+        $controller = $this->getController();
+        $controller->setRequest($request);
+        $controller->savePositionAction();
+
+        $results = $controller->View()->getAssign();
+
+        static::assertSame($expectedValues['price'], $results['data']['price']);
+        static::assertSame($expectedValues['total'], $results['data']['total']);
+    }
+
+    /**
+     * @return Generator<array{params: array{orderId: int, articleNumber: string, articleName: string, articleId: int, articleDetailId: int, quantity: int}, expectedValues: array{price: float, total: int|float}}>
+     */
+    public function provideProductParamsForSavePositionActionTestingGraduatedPrices(): Generator
+    {
+        yield 'customer-group H with netto-shop-price-config has to return fallback prices for EK' => [
+            'params' => [
+                'orderId' => self::ORDER_ID_DEMODATA_H,
+                'articleNumber' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_ORDER_NUMBER,
+                'articleName' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_NAME,
+                'articleId' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_PRODUCT_ID,
+                'articleDetailId' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_PRODUCT_VARIANT_ID,
+                'quantity' => 30,
+            ],
+            'expectedValues' => [
+                'price' => 0.67,
+                'total' => 20.1,
+            ],
+        ];
+        yield 'customer-group EK' => [
+            'params' => [
+                'orderId' => self::ORDER_ID_DEMODATA_EK,
+                'articleNumber' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_ORDER_NUMBER,
+                'articleName' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_NAME,
+                'articleId' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_PRODUCT_ID,
+                'articleDetailId' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_PRODUCT_VARIANT_ID,
+                'quantity' => 30,
+            ],
+            'expectedValues' => [
+                'price' => 0.80,
+                'total' => 24.0,
+            ],
+        ];
+        yield 'product with variants - variant 1 - customer-group EK' => [
+            'params' => [
+                'orderId' => self::ORDER_ID_DEMODATA_EK,
+                'articleNumber' => self::PRODUCT_GRADUATED_PRICES_VARIANT1_ORDER_NUMBER,
+                'articleName' => self::PRODUCT_GRADUATED_PRICES_VARIANT_NAME,
+                'articleId' => self::PRODUCT_GRADUATED_PRICES_VARIANT_PRODUCT_ID,
+                'articleDetailId' => self::PRODUCT_GRADUATED_PRICES_VARIANT1_PRODUCT_VARIANT_ID,
+                'quantity' => 5,
+            ],
+            'expectedValues' => [
+                'price' => 1.99,
+                'total' => 9.95,
+            ],
+        ];
+        yield 'product with variants - variant 2 - customer-group EK' => [
+            'params' => [
+                'orderId' => self::ORDER_ID_DEMODATA_EK,
+                'articleNumber' => self::PRODUCT_GRADUATED_PRICES_VARIANT2_ORDER_NUMBER,
+                'articleName' => self::PRODUCT_GRADUATED_PRICES_VARIANT_NAME,
+                'articleId' => self::PRODUCT_GRADUATED_PRICES_VARIANT_PRODUCT_ID,
+                'articleDetailId' => self::PRODUCT_GRADUATED_PRICES_VARIANT2_PRODUCT_VARIANT_ID,
+                'quantity' => 21,
+            ],
+            'expectedValues' => [
+                'price' => 1.29,
+                'total' => 27.09,
+            ],
+        ];
+        yield 'product with variants - variant 1 - customer-group H - netto' => [
+            'params' => [
+                'orderId' => self::ORDER_ID_DEMODATA_H,
+                'articleNumber' => self::PRODUCT_GRADUATED_PRICES_VARIANT1_ORDER_NUMBER,
+                'articleName' => self::PRODUCT_GRADUATED_PRICES_VARIANT_NAME,
+                'articleId' => self::PRODUCT_GRADUATED_PRICES_VARIANT_PRODUCT_ID,
+                'articleDetailId' => self::PRODUCT_GRADUATED_PRICES_VARIANT1_PRODUCT_VARIANT_ID,
+                'quantity' => 10,
+            ],
+            'expectedValues' => [
+                'price' => 1.99,
+                'total' => 19.9,
+            ],
+        ];
+        yield 'product with variants - variant 2 - customer-group H - netto' => [
+            'params' => [
+                'orderId' => self::ORDER_ID_DEMODATA_H,
+                'articleNumber' => self::PRODUCT_GRADUATED_PRICES_VARIANT2_ORDER_NUMBER,
+                'articleName' => self::PRODUCT_GRADUATED_PRICES_VARIANT_NAME,
+                'articleId' => self::PRODUCT_GRADUATED_PRICES_VARIANT_PRODUCT_ID,
+                'articleDetailId' => self::PRODUCT_GRADUATED_PRICES_VARIANT2_PRODUCT_VARIANT_ID,
+                'quantity' => 42,
+            ],
+            'expectedValues' => [
+                'price' => 0.89,
+                'total' => 37.38,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider provideProductParamsForSavePositionActionOnExistingPosition
+     *
+     * @param array{quantity?: int, price?: float, total?: float} $params
+     * @param array{price: float, total: float}                   $expectedValues
+     */
+    public function testSavePositionActionReturnValuesForGraduatedPricesOnExistingPosition(array $params, array $expectedValues): void
+    {
+        $order = $this->modelManager->getRepository(Order::class)->findOneBy([]);
+        static::assertInstanceOf(Order::class, $order);
+        $newPositionParams = [
+            'id' => 0,
+            'orderId' => $order->getId(),
+            'articleNumber' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_ORDER_NUMBER,
+            'articleName' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_NAME,
+            'articleId' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_PRODUCT_ID,
+            'articleDetailId' => self::PRODUCT_GRADUATED_PRICES_DEMODATA_PRODUCT_VARIANT_ID,
+            'mode' => 0,
+            'quantity' => 2,
+            'statusId' => 0,
+            'statusDescription' => '',
+            'taxId' => 1,
+            'taxRate' => 19.0,
+            'taxDescription' => '',
+            'inStock' => 0,
+            'changed' => $order->getChanged() ? $order->getChanged()->format(DateTimeInterface::ATOM) : '',
+        ];
+
+        $request = new Enlight_Controller_Request_RequestTestCase();
+        $request->setParams($newPositionParams);
+
+        $controller = $this->getController();
+        $controller->setRequest($request);
+        $controller->savePositionAction();
+        $results = $controller->View()->getAssign();
+
+        static::assertTrue($results['success'], $results['message'] ?? '');
+        static::assertSame(0.84, $results['data']['price']);
+        static::assertSame(1.68, $results['data']['total']);
+
+        $this->modelManager->refresh($order);
+        $changeQuantityParams = [
+            'id' => $results['data']['id'],
+            'price' => $results['data']['price'],
+            'total' => $results['data']['total'],
+            'changed' => $order->getChanged() ? $order->getChanged()->format(DateTimeInterface::ATOM) : '',
+        ];
+        $changeQuantityParams = array_merge($newPositionParams, $changeQuantityParams, $params);
+
+        $request = new Enlight_Controller_Request_RequestTestCase();
+        $request->setParams($changeQuantityParams);
+
+        $controller->setRequest($request);
+        $controller->savePositionAction();
+        $results = $controller->View()->getAssign();
+
+        static::assertTrue($results['success'], $results['message'] ?? '');
+        static::assertSame($expectedValues['price'], $results['data']['price']);
+        static::assertSame($expectedValues['total'], $results['data']['total']);
+    }
+
+    /**
+     * @return Generator<array{params: array{quantity?: int, price?: float, total?: float}, expectedValues: array{price: float, total: float}}>
+     */
+    public function provideProductParamsForSavePositionActionOnExistingPosition(): Generator
+    {
+        yield 'Only change quantity, graduated price should be considered' => [
+            'params' => [
+                'quantity' => 20,
+            ],
+            'expectedValues' => [
+                'price' => 0.76,
+                'total' => 15.2,
+            ],
+        ];
+        yield 'Only change price, graduated price should be ignored' => [
+            'params' => [
+                'price' => 0.15,
+                'total' => 0.30,
+            ],
+            'expectedValues' => [
+                'price' => 0.15,
+                'total' => 0.30,
+            ],
+        ];
+        yield 'Change quantity and price, graduated price should be considered' => [
+            'params' => [
+                'quantity' => 30,
+                'price' => 0.15,
+                'total' => 0.30,
+            ],
+            'expectedValues' => [
+                'price' => 0.67,
+                'total' => 20.1,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider provideTaxRuleParams
+     */
+    public function testSavePositionActionWithTaxRule(int $customerGroupId, string $customerGroupKey): void
     {
-        $this->prepareTestSavePositionActionWithTaxRule();
+        $this->prepareTestSavePositionActionWithTaxRule($customerGroupId, $customerGroupKey);
 
         $order = $this->modelManager->find(Order::class, self::ORDER_ID);
         static::assertInstanceOf(Order::class, $order);
 
-        $this->Request()->setMethod(Request::METHOD_POST);
-        $this->Request()->setPost([
+        $request = new Enlight_Controller_Request_RequestTestCase();
+        $request->setParams([
             'id' => 0,
             'orderId' => self::ORDER_ID,
             'mode' => 0,
@@ -240,21 +499,32 @@ public function testSavePositionActionWithTaxRule(): void
             'taxDescription' => '',
             'inStock' => 0,
             'total' => 28.99,
-            'changed' => $order->getChanged()->format(DateTimeInterface::ISO8601),
+            'changed' => $order->getChanged()->format(DateTimeInterface::ATOM),
         ]);
 
-        $this->authPlugin->setNoAuth();
-        $this->dispatch('/backend/order/savePosition');
+        $controller = $this->getController();
+        $controller->setRequest($request);
+        $controller->savePositionAction();
 
-        $order = $this->modelManager->find(Order::class, self::ORDER_ID);
-        static::assertInstanceOf(Order::class, $order);
+        $results = $controller->View()->getAssign();
+        static::assertTrue($results['success'], $results['message'] ?? '');
 
-        $expectedTaxRate = (float) $this->connection->executeQuery('SELECT tax FROM s_core_tax_rules WHERE id = :id', ['id' => self::TAX_RULE_ID])->fetchOne();
-
-        $data = $this->View()->getAssign('data');
-        static::assertTrue($this->View()->getAssign('success'), (string) $this->View()->getAssign('message'));
+        static::assertSame(self::NEW_TAX, $results['data']['taxRate']);
+    }
 
-        static::assertSame($expectedTaxRate, $data['taxRate']);
+    /**
+     * @return Generator<array{customerGroupId: int, customerGroupKey: string}>
+     */
+    public function provideTaxRuleParams(): Generator
+    {
+        yield 'EK' => [
+            'customerGroupId' => self::CUSTOMER_GROUP_ID_DEFAULT,
+            'customerGroupKey' => self::CUSTOMER_GROUP_KEY_DEFAULT,
+        ];
+        yield 'H' => [
+            'customerGroupId' => self::CUSTOMER_GROUP_ID_MERCHANT,
+            'customerGroupKey' => self::CUSTOMER_GROUP_KEY_MERCHANT,
+        ];
     }
 
     public function testSavePositionActionWithDifferentTax(): void
@@ -264,8 +534,8 @@ public function testSavePositionActionWithDifferentTax(): void
         $order = $this->modelManager->find(Order::class, self::ORDER_ID);
         static::assertInstanceOf(Order::class, $order);
 
-        $this->Request()->setMethod(Request::METHOD_POST);
-        $this->Request()->setPost([
+        $request = new Enlight_Controller_Request_RequestTestCase();
+        $request->setParams([
             'id' => self::ORDER_DETAIL_ID,
             'orderId' => self::ORDER_ID,
             'mode' => 0,
@@ -282,11 +552,13 @@ public function testSavePositionActionWithDifferentTax(): void
             'taxDescription' => '',
             'inStock' => 0,
             'total' => 70.58,
-            'changed' => $order->getChanged()->format(DateTimeInterface::ISO8601),
+            'changed' => $order->getChanged()->format(DateTimeInterface::ATOM),
         ]);
 
         $this->authPlugin->setNoAuth();
-        $this->dispatch('/backend/order/savePosition');
+        $controller = $this->getController();
+        $controller->setRequest($request);
+        $controller->savePositionAction();
 
         $order = $this->modelManager->find(Order::class, self::ORDER_ID);
         static::assertInstanceOf(Order::class, $order);
@@ -299,6 +571,52 @@ public function testSavePositionActionWithDifferentTax(): void
         static::assertSame(self::NEW_TAX_ID, $tax->getId());
     }
 
+    public function testSaveOrderPositionActionWithArticleDetailRelation(): void
+    {
+        $this->prepareTestSaveOrderPositionActionWithArticleDetailRelation();
+
+        $order = $this->modelManager->find(Order::class, self::ORDER_ID);
+        static::assertInstanceOf(Order::class, $order);
+
+        $request = new Enlight_Controller_Request_RequestTestCase();
+        $request->setParams([
+            'id' => 0,
+            'orderId' => self::ORDER_ID,
+            'mode' => 0,
+            'articleId' => self::ARTICLE_ID,
+            'articleDetailId' => null,
+            'articleNumber' => self::ARTICLE_DETAIL_NUMBER,
+            'articleName' => '',
+            'quantity' => 1,
+            'statusId' => 0,
+            'statusDescription' => '',
+            'price' => 27.00,
+            'taxId' => 1,
+            'taxRate' => 0,
+            'taxDescription' => '',
+            'inStock' => 0,
+            'total' => 27.00,
+            'changed' => $order->getChanged()->format(DateTimeInterface::ATOM),
+        ]);
+
+        $this->authPlugin->setNoAuth();
+        $controller = $this->getController();
+        $controller->setRequest($request);
+        $controller->savePositionAction();
+
+        $orderDetail = $this->modelManager->getRepository(Detail::class)->findOneBy([
+            'orderId' => self::ORDER_ID,
+            'articleNumber' => self::ARTICLE_DETAIL_NUMBER,
+        ]);
+
+        static::assertInstanceOf(Detail::class, $orderDetail);
+        $articleDetail = $orderDetail->getArticleDetail();
+        static::assertInstanceOf(ArticleDetail::class, $articleDetail);
+
+        static::assertSame(self::ARTICLE_DETAIL_ID, $articleDetail->getId());
+        static::assertSame(self::ARTICLE_DETAIL_NUMBER, $articleDetail->getNumber());
+    }
+
     /**
      * Test the list of orders the corresponding translations
      */
@@ -489,8 +807,6 @@ public function testFilterOrdersBySupplier(): void
      * Tests a data array for an entry with a specified key value pair
      *
      * @param array<array<string, mixed>> $data
-     *
-     * @throws Exception
      */
     private function assertElementWithKeyValuePairExists(string $expected, string $dataKey, int $id, array $data): void
     {
@@ -502,7 +818,7 @@ private function assertElementWithKeyValuePairExists(string $expected, string $d
             }
         }
 
-        throw new Exception('Entry not found');
+        throw new RuntimeException('Entry not found');
     }
 
     /**
@@ -836,15 +1152,20 @@ private function getPostData(): array
         ];
     }
 
-    private function prepareTestSavePositionActionWithTaxRule(): void
+    private function prepareTestSavePositionActionWithTaxRule(int $customerGroupId, string $customerGroupKey): void
     {
         $taxRuleSQL = file_get_contents(__DIR__ . '/_fixtures/order/tax_rules.sql');
         static::assertIsString($taxRuleSQL);
-        $this->connection->executeStatement($taxRuleSQL, ['taxRuleId' => self::TAX_RULE_ID]);
+        $this->connection->executeStatement($taxRuleSQL, [
+            'customerGroupId' => $customerGroupId,
+        ]);
 
         $customerSql = file_get_contents(__DIR__ . '/_fixtures/order/customer.sql');
         static::assertIsString($customerSql);
-        $this->connection->executeStatement($customerSql, ['customerId' => self::CUSTOMER_ID]);
+        $this->connection->executeStatement($customerSql, [
+            'customerId' => self::CUSTOMER_ID,
+            'customerGroup' => $customerGroupKey,
+        ]);
 
         $orderSql = file_get_contents(__DIR__ . '/_fixtures/order/order.sql');
         static::assertIsString($orderSql);
@@ -852,6 +1173,9 @@ private function prepareTestSavePositionActionWithTaxRule(): void
             'orderDetailId' => self::ORDER_DETAIL_ID,
             'orderId' => self::ORDER_ID,
             'customerId' => self::CUSTOMER_ID,
+            'countryId' => self::GERMANY_COUNTRY_ID,
+            'stateId' => self::NRW_STATE_ID,
+            'areaId' => self::GERMANY_AREA_ID,
         ]);
     }
 
@@ -859,11 +1183,16 @@ private function prepareTestSavePositionActionWithDifferentTax(): void
     {
         $taxRuleSQL = file_get_contents(__DIR__ . '/_fixtures/order/new_tax.sql');
         static::assertIsString($taxRuleSQL);
-        $this->connection->executeStatement($taxRuleSQL, ['taxRuleId' => self::NEW_TAX_ID]);
+        $this->connection->executeStatement($taxRuleSQL, [
+            'taxRuleId' => self::NEW_TAX_ID,
+        ]);
 
         $customerSql = file_get_contents(__DIR__ . '/_fixtures/order/customer.sql');
         static::assertIsString($customerSql);
-        $this->connection->executeStatement($customerSql, ['customerId' => self::CUSTOMER_ID]);
+        $this->connection->executeStatement($customerSql, [
+            'customerId' => self::CUSTOMER_ID,
+            'customerGroup' => self::CUSTOMER_GROUP_KEY_DEFAULT,
+        ]);
 
         $orderSql = file_get_contents(__DIR__ . '/_fixtures/order/order.sql');
         static::assertIsString($orderSql);
@@ -871,6 +1200,39 @@ private function prepareTestSavePositionActionWithDifferentTax(): void
             'orderDetailId' => self::ORDER_DETAIL_ID,
             'orderId' => self::ORDER_ID,
             'customerId' => self::CUSTOMER_ID,
+            'countryId' => self::GERMANY_COUNTRY_ID,
+            'stateId' => null,
+            'areaId' => null,
         ]);
     }
+
+    private function prepareTestSaveOrderPositionActionWithArticleDetailRelation(): void
+    {
+        $customerSql = file_get_contents(__DIR__ . '/_fixtures/order/customer.sql');
+        static::assertIsString($customerSql);
+        $this->connection->executeStatement($customerSql, [
+            'customerId' => self::CUSTOMER_ID,
+            'customerGroup' => self::CUSTOMER_GROUP_KEY_DEFAULT,
+        ]);
+
+        $orderSql = file_get_contents(__DIR__ . '/_fixtures/order/order.sql');
+        static::assertIsString($orderSql);
+        $this->connection->executeStatement($orderSql, [
+            'orderDetailId' => self::ORDER_DETAIL_ID,
+            'orderId' => self::ORDER_ID,
+            'customerId' => self::CUSTOMER_ID,
+            'countryId' => self::GERMANY_COUNTRY_ID,
+            'stateId' => null,
+            'areaId' => null,
+        ]);
+    }
+
+    private function getController(): Shopware_Controllers_Backend_Order
+    {
+        $controller = $this->getContainer()->get('shopware_controllers_backend_order');
+        $controller->setView(new Enlight_View_Default(new Enlight_Template_Manager()));
+        $controller->setContainer($this->getContainer());
+
+        return $controller;
+    }
 }
diff --git a/tests/Functional/Controllers/Backend/PartnerTest.php b/tests/Functional/Controllers/Backend/PartnerTest.php
index 56f1ed66b64..ba33be3dd25 100644
--- a/tests/Functional/Controllers/Backend/PartnerTest.php
+++ b/tests/Functional/Controllers/Backend/PartnerTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Backend;
@@ -94,7 +93,7 @@ public function setUp(): void
      */
     public function testGetList(): void
     {
-        //delete old data
+        // delete old data
         $repositoryData = $this->repository->findBy(['company' => $this->dummyData['company']]);
         foreach ($repositoryData as $testDummy) {
             $this->manager->remove($testDummy);
@@ -128,14 +127,14 @@ public function testGetList(): void
     public function testSavePartner(): int
     {
         $params = $this->dummyData;
-        //test new partner
+        // test new partner
         $this->Request()->setParams($params);
         $this->dispatch('backend/Partner/savePartner');
         static::assertTrue($this->View()->getAssign('success'));
         static::assertCount(19, $this->View()->getAssign('data'));
         static::assertEquals('streetDummy', $this->View()->getAssign('data')['street']);
 
-        //test update partner
+        // test update partner
         $params['id'] = $this->View()->getAssign('data')['id'];
         $params['street'] = $this->updateStreet;
         $this->Request()->setParams($params);
@@ -210,7 +209,7 @@ public function testValidateTrackingCode(int $id): int
         $body = $this->Response()->getBody();
         static::assertEmpty($body);
 
-        //delete the new dummy
+        // delete the new dummy
         $this->manager->remove($newDummy);
         $this->manager->flush();
 
diff --git a/tests/Functional/Controllers/Backend/PaymentTest.php b/tests/Functional/Controllers/Backend/PaymentTest.php
index 74a98f9503f..64a2e2042ee 100644
--- a/tests/Functional/Controllers/Backend/PaymentTest.php
+++ b/tests/Functional/Controllers/Backend/PaymentTest.php
@@ -1,34 +1,43 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Backend;
 
 use Enlight_Components_Test_Controller_TestCase;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 
 class PaymentTest extends Enlight_Components_Test_Controller_TestCase
 {
-    private $testDataCreate = [
+    use ContainerTrait;
+    use DatabaseTransactionBehaviour;
+
+    /**
+     * @var array<string, mixed>
+     */
+    private array $testDataCreate = [
         'name' => 'New payment',
         'description' => 'New payment',
         'source' => 1,
@@ -55,19 +64,18 @@ public function setUp(): void
         parent::setUp();
 
         // Disable auth and acl
-        Shopware()->Plugins()->Backend()->Auth()->setNoAuth();
-        Shopware()->Plugins()->Backend()->Auth()->setNoAcl();
+        $this->getContainer()->get('plugins')->Backend()->Auth()->setNoAuth();
+        $this->getContainer()->get('plugins')->Backend()->Auth()->setNoAcl();
     }
 
     /**
      * Tests the getPaymentsAction()
      * to test if reading the payments is working
      */
-    public function testGetPayments()
+    public function testGetPayments(): void
     {
-        /* @var \Enlight_Controller_Response_ResponseTestCase */
         $this->dispatch('backend/payment/getPayments');
-        static::assertTrue($this->View()->success);
+        static::assertTrue($this->View()->getAssign('success'));
 
         $jsonBody = $this->View()->getAssign();
 
@@ -79,11 +87,10 @@ public function testGetPayments()
      * Tests the getCountriesAction()
      * to test if reading the countries is working
      */
-    public function testGetCountries()
+    public function testGetCountries(): void
     {
-        /* @var \Enlight_Controller_Response_ResponseTestCase */
         $this->dispatch('backend/payment/getCountries');
-        static::assertTrue($this->View()->success);
+        static::assertTrue($this->View()->getAssign('success'));
 
         $jsonBody = $this->View()->getAssign();
 
@@ -93,15 +100,15 @@ public function testGetCountries()
 
     /**
      * Function to test creating a new payment
+     *
+     * @return array<string, mixed>
      */
-    public function testCreatePayments()
+    public function testCreatePayments(): array
     {
-        Shopware()->Db()->exec('DELETE FROM s_core_paymentmeans WHERE name = "New payment"');
-
         $this->Request()->setMethod('POST')->setPost($this->testDataCreate);
         $this->dispatch('backend/payment/createPayments');
 
-        static::assertTrue($this->View()->success);
+        static::assertTrue($this->View()->getAssign('success'));
         $jsonBody = $this->View()->getAssign();
 
         static::assertArrayHasKey('data', $jsonBody);
@@ -112,17 +119,14 @@ public function testCreatePayments()
 
     /**
      * Function to test updating a payment
-     *
-     * @param array $data Contains the data of the created payment
-     * @depends testCreatePayments
      */
-    public function testUpdatePayments($data)
+    public function testUpdatePayments(): void
     {
+        $data = $this->testCreatePayments();
         $this->Request()->setMethod('POST')->setPost(['id' => $data['id'], 'name' => 'Neue Zahlungsart']);
 
-        /* @var \Enlight_Controller_Response_ResponseTestCase */
         $this->dispatch('backend/payment/updatePayments');
-        static::assertTrue($this->View()->success);
+        static::assertTrue($this->View()->getAssign('success'));
 
         $jsonBody = $this->View()->getAssign();
 
@@ -132,17 +136,15 @@ public function testUpdatePayments($data)
 
     /**
      * Function to test deleting a payment
-     *
-     * @param array $data Contains the data of the created payment
-     * @depends testCreatePayments
      */
-    public function testDeletePayment($data)
+    public function testDeletePayment(): void
     {
+        $data = $this->testCreatePayments();
+        $this->resetRequest();
         $this->Request()->setMethod('POST')->setPost(['id' => $data['id']]);
 
-        /* @var \Enlight_Controller_Response_ResponseTestCase */
         $this->dispatch('backend/payment/deletePayment');
-        static::assertTrue($this->View()->success);
+        static::assertTrue($this->View()->getAssign('success'));
 
         $jsonBody = $this->View()->getAssign();
 
diff --git a/tests/Functional/Controllers/Backend/PremiumTest.php b/tests/Functional/Controllers/Backend/PremiumTest.php
index 3fbe04baa1a..fe969b0a84d 100644
--- a/tests/Functional/Controllers/Backend/PremiumTest.php
+++ b/tests/Functional/Controllers/Backend/PremiumTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Backend;
@@ -107,6 +107,7 @@ public function testCreatePremiumArticle()
      * The testCreatePremiumArticle method is called before.
      *
      * @param string $lastId The id of the last created article
+     *
      * @depends testCreatePremiumArticle
      */
     public function testEditPremiumArticle($lastId)
diff --git a/tests/Functional/Controllers/Backend/ProductFeedTest.php b/tests/Functional/Controllers/Backend/ProductFeedTest.php
index da40b1485a0..49a9d34b529 100644
--- a/tests/Functional/Controllers/Backend/ProductFeedTest.php
+++ b/tests/Functional/Controllers/Backend/ProductFeedTest.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Backend;
@@ -28,14 +29,17 @@
 use Shopware\Components\Model\ModelManager;
 use Shopware\Models\ProductFeed\ProductFeed;
 use Shopware\Models\ProductFeed\Repository;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
 
 class ProductFeedTest extends Enlight_Components_Test_Controller_TestCase
 {
+    use ContainerTrait;
+
+    private Repository $repository;
+
     /**
-     * @var Repository
+     * @var array<string, string|null>
      */
-    protected $repository;
-
     private array $feedData = [
         'name' => 'UnitTest Produktsuche',
         'lastExport' => '2012-06-13 13:45:12',
@@ -77,18 +81,18 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $this->manager = Shopware()->Models();
-        $this->repository = Shopware()->Models()->getRepository(ProductFeed::class);
+        $this->manager = $this->getContainer()->get('models');
+        $this->repository = $this->manager->getRepository(ProductFeed::class);
 
         // Disable auth and acl
-        Shopware()->Plugins()->Backend()->Auth()->setNoAuth();
-        Shopware()->Plugins()->Backend()->Auth()->setNoAcl();
+        $this->getContainer()->get('plugins')->Backend()->Auth()->setNoAuth();
+        $this->getContainer()->get('plugins')->Backend()->Auth()->setNoAcl();
     }
 
     /**
      * test the feed list
      */
-    public function testGetFeeds()
+    public function testGetFeeds(): void
     {
         // Delete old data
         $feeds = $this->repository->findBy(['hash' => '0805bbb935327228edb5374083b81416']);
@@ -98,15 +102,14 @@ public function testGetFeeds()
         $this->manager->flush();
 
         $feed = $this->createDummy();
-        /* @var \Enlight_Controller_Response_ResponseTestCase */
         $this->dispatch('backend/ProductFeed/getFeeds?page=1&start=0&limit=30');
-        static::assertTrue($this->View()->success);
-        $returnData = $this->View()->data;
+        static::assertTrue($this->View()->getAssign('success'));
+        $returnData = $this->View()->getAssign('data');
         static::assertNotEmpty($returnData);
-        static::assertGreaterThan(0, $this->View()->totalCount);
+        static::assertGreaterThan(0, $this->View()->getAssign('totalCount'));
         $foundDummyFeed = [];
         foreach ($returnData as $feedData) {
-            if ($feedData['name'] == $feed->getName()) {
+            if ($feedData['name'] === $feed->getName()) {
                 $foundDummyFeed = $feedData;
             }
         }
@@ -121,17 +124,17 @@ public function testGetFeeds()
      *
      * @return int The id to for the testUpdateFeed Method
      */
-    public function testAddFeed()
+    public function testAddFeed(): int
     {
         $params = $this->feedData;
         $this->Request()->setParams($params);
 
         $this->dispatch('backend/ProductFeed/saveFeed');
-        static::assertTrue($this->View()->success);
-        static::assertNotEmpty($this->View()->data);
-        static::assertEquals($params['name'], $this->View()->data['name']);
+        static::assertTrue($this->View()->getAssign('success'));
+        static::assertNotEmpty($this->View()->getAssign('data'));
+        static::assertEquals($params['name'], $this->View()->getAssign('data')['name']);
 
-        return $this->View()->data['id'];
+        return $this->View()->getAssign('data')['id'];
     }
 
     /**
@@ -139,17 +142,15 @@ public function testAddFeed()
      *
      * @depends testAddFeed
      *
-     * @param string $id
-     *
-     * @return string The id to for the testUpdateFeed Method
+     * @return int The id to for the testUpdateFeed Method
      */
-    public function testGetDetailFeed($id)
+    public function testGetDetailFeed(int $id): int
     {
         $params['feedId'] = $id;
         $this->Request()->setParams($params);
         $this->dispatch('backend/ProductFeed/getDetailFeed');
-        static::assertTrue($this->View()->success);
-        $returningData = $this->View()->data;
+        static::assertTrue($this->View()->getAssign('success'));
+        $returningData = $this->View()->getAssign('data');
         $dummyFeedData = $this->feedData;
         static::assertEquals($dummyFeedData['name'], $returningData['name']);
         static::assertEquals($dummyFeedData['active'], $returningData['active']);
@@ -170,10 +171,8 @@ public function testGetDetailFeed($id)
      * test updating a feed
      *
      * @depends testGetDetailFeed
-     *
-     * @param string $id
      */
-    public function testUpdateFeed($id)
+    public function testUpdateFeed(int $id): int
     {
         $params = $this->feedData;
         $params['feedId'] = $id;
@@ -182,9 +181,9 @@ public function testUpdateFeed($id)
 
         $this->dispatch('backend/ProductFeed/saveFeed');
 
-        static::assertTrue($this->View()->success);
-        static::assertNotEmpty($this->View()->data);
-        static::assertEquals($params['name'], $this->View()->data['name']);
+        static::assertTrue($this->View()->getAssign('success'));
+        static::assertNotEmpty($this->View()->getAssign('data'));
+        static::assertEquals($params['name'], $this->View()->getAssign('data')['name']);
 
         return $id;
     }
@@ -193,45 +192,41 @@ public function testUpdateFeed($id)
      * test delete the feed method
      *
      * @depends testUpdateFeed
-     *
-     * @param string $id
      */
-    public function testDeleteFeed($id)
+    public function testDeleteFeed(int $id): void
     {
         $params = [];
-        $params['id'] = (int) $id;
+        $params['id'] = $id;
         $this->Request()->setParams($params);
         $this->dispatch('backend/ProductFeed/deleteFeed');
-        static::assertTrue($this->View()->success);
+        static::assertTrue($this->View()->getAssign('success'));
         static::assertNull($this->repository->find($params['id']));
     }
 
     /**
      * test getSuppliers action
      */
-    public function testGetSuppliersAction()
+    public function testGetSuppliersAction(): void
     {
         $this->dispatch('backend/ProductFeed/getSuppliers');
-        static::assertTrue($this->View()->success);
-        static::assertGreaterThan(0, $this->View()->total);
+        static::assertTrue($this->View()->getAssign('success'));
+        static::assertGreaterThan(0, $this->View()->getAssign('total'));
     }
 
     /**
      * test getArticles action
      */
-    public function testGetArticlesAction()
+    public function testGetArticlesAction(): void
     {
         $this->dispatch('backend/ProductFeed/getArticles');
-        static::assertTrue($this->View()->success);
-        static::assertCount(20, $this->View()->data);
+        static::assertTrue($this->View()->getAssign('success'));
+        static::assertCount(20, $this->View()->getAssign('data'));
     }
 
     /**
      * Creates the dummy feed
-     *
-     * @return ProductFeed
      */
-    private function getDummyFeed()
+    private function getDummyFeed(): ProductFeed
     {
         $feed = new ProductFeed();
         $feedData = $this->feedData;
@@ -242,10 +237,8 @@ private function getDummyFeed()
 
     /**
      * helper method to create the dummy object
-     *
-     * @return ProductFeed
      */
-    private function createDummy()
+    private function createDummy(): ProductFeed
     {
         $feed = $this->getDummyFeed();
         $this->manager->persist($feed);
diff --git a/tests/Functional/Controllers/Backend/RiskManagementTest.php b/tests/Functional/Controllers/Backend/RiskManagementTest.php
index a0542cf54cc..3449449a804 100644
--- a/tests/Functional/Controllers/Backend/RiskManagementTest.php
+++ b/tests/Functional/Controllers/Backend/RiskManagementTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Backend;
@@ -103,6 +103,7 @@ public function testCreateRule()
      * The testCreatePremiumArticle method is called before.
      *
      * @param string $lastId The id of the last created article
+     *
      * @depends testCreateRule
      */
     public function testEditRule($lastId)
@@ -122,8 +123,9 @@ public function testEditRule($lastId)
 
         $jsonBody = $this->View()->getAssign();
 
-        static::assertArrayHasKey('data', $jsonBody);
         static::assertArrayHasKey('success', $jsonBody);
+        static::assertTrue($jsonBody['success'], $jsonBody['errorMsg'] ?? '');
+        static::assertArrayHasKey('data', $jsonBody);
     }
 
     /**
diff --git a/tests/Functional/Controllers/Backend/SearchTest.php b/tests/Functional/Controllers/Backend/SearchTest.php
index 576a6907972..d3dce5bd196 100644
--- a/tests/Functional/Controllers/Backend/SearchTest.php
+++ b/tests/Functional/Controllers/Backend/SearchTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Backend;
@@ -32,10 +32,7 @@ class SearchTest extends Enlight_Components_Test_Controller_TestCase
 {
     use ContainerTrait;
 
-    /**
-     * @var Helper
-     */
-    private $helper;
+    private Helper $helper;
 
     /**
      * Standard set up for every test - just disable auth
@@ -54,7 +51,7 @@ public function setUp(): void
     /**
      * @group elasticSearch
      */
-    public function testSearchForVariants()
+    public function testSearchForVariants(): void
     {
         $this->helper->refreshBackendSearchIndex();
 
@@ -64,5 +61,6 @@ public function testSearchForVariants()
         $jsonBody = $this->View()->getAssign();
 
         static::assertEquals(2, $jsonBody['searchResult']['articles']['SW10002.1']['kind']);
+        $this->reset();
     }
 }
diff --git a/tests/Functional/Controllers/Backend/ShippingTest.php b/tests/Functional/Controllers/Backend/ShippingTest.php
index c0718246ab7..e1cd9d28890 100644
--- a/tests/Functional/Controllers/Backend/ShippingTest.php
+++ b/tests/Functional/Controllers/Backend/ShippingTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Backend;
diff --git a/tests/Functional/Controllers/Backend/SupplierTest.php b/tests/Functional/Controllers/Backend/SupplierTest.php
index 7ff0a2e41fd..bca5d30146e 100644
--- a/tests/Functional/Controllers/Backend/SupplierTest.php
+++ b/tests/Functional/Controllers/Backend/SupplierTest.php
@@ -1,30 +1,31 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Backend;
 
 use Enlight_Components_Test_Controller_TestCase;
+use Exception;
 
 class SupplierTest extends Enlight_Components_Test_Controller_TestCase
 {
@@ -132,4 +133,29 @@ public function testDeleteSupplier(array $lastSupplier)
         $this->dispatch('backend/supplier/deleteSupplier');
         static::assertTrue($this->View()->success);
     }
+
+    /**
+     * Test if getSuppliers will also assign true when no suppliers have been found
+     *
+     * @throws Exception
+     */
+    public function testGetZeroSuppliers(): void
+    {
+        Shopware()->Plugins()->Backend()->Auth()->setNoAuth();
+        $this->Request()->setMethod('GET');
+        $filter = json_encode([
+            'property' => 'name',
+            'value' => 'thismanufacturerdoesnotexist',
+            'operator' => null,
+            'expression' => null,
+        ]);
+        $query_params = urlencode(\sprintf('[%s]', $filter));
+        $this->dispatch('backend/supplier/getSuppliers?filter=' . $query_params);
+        static::assertTrue($this->View()->getAssign('success'));
+
+        $jsonBody = $this->View()->getAssign();
+        static::assertArrayHasKey('total', $jsonBody);
+        static::assertArrayHasKey('data', $jsonBody);
+        static::assertArrayHasKey('success', $jsonBody);
+    }
 }
diff --git a/tests/Functional/Controllers/Backend/SysteminfoTest.php b/tests/Functional/Controllers/Backend/SystemInfoTest.php
similarity index 64%
rename from tests/Functional/Controllers/Backend/SysteminfoTest.php
rename to tests/Functional/Controllers/Backend/SystemInfoTest.php
index e153abfc638..c65f64ea254 100644
--- a/tests/Functional/Controllers/Backend/SysteminfoTest.php
+++ b/tests/Functional/Controllers/Backend/SystemInfoTest.php
@@ -1,32 +1,33 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Backend;
 
 use Enlight_Components_Test_Controller_TestCase;
 
-class SysteminfoTest extends Enlight_Components_Test_Controller_TestCase
+class SystemInfoTest extends Enlight_Components_Test_Controller_TestCase
 {
     /**
      * Standard set up for every test - just disable auth
@@ -40,13 +41,14 @@ public function setUp(): void
         Shopware()->Plugins()->Backend()->Auth()->setNoAcl();
     }
 
-    public function testGetConfigList()
+    public function testGetConfigList(): void
     {
         $response = $this->dispatch('backend/systeminfo/getConfigList');
 
-        static::assertTrue($this->View()->success);
+        static::assertTrue($this->View()->getAssign('success'));
 
         $body = $response->getBody();
+        static::assertIsString($body);
         $jsonBody = json_decode($body, true);
 
         static::assertArrayHasKey('data', $jsonBody);
@@ -58,13 +60,14 @@ public function testGetConfigList()
         static::assertArrayHasKey('status', $jsonBody['data'][0]);
     }
 
-    public function testGetPathList()
+    public function testGetPathList(): void
     {
         $response = $this->dispatch('backend/systeminfo/getPathList');
 
-        static::assertTrue($this->View()->success);
+        static::assertTrue($this->View()->getAssign('success'));
 
         $body = $response->getBody();
+        static::assertIsString($body);
         $jsonBody = json_decode($body, true);
 
         static::assertArrayHasKey('data', $jsonBody);
@@ -74,26 +77,28 @@ public function testGetPathList()
         static::assertArrayHasKey('result', $jsonBody['data'][0]);
     }
 
-    public function testGetFileList()
+    public function testGetFileList(): void
     {
         $response = $this->dispatch('backend/systeminfo/getFileList');
 
-        static::assertTrue($this->View()->success);
+        static::assertTrue($this->View()->getAssign('success'));
 
         $body = $response->getBody();
+        static::assertIsString($body);
         $jsonBody = json_decode($body, true);
 
         static::assertArrayHasKey('data', $jsonBody);
         static::assertArrayHasKey('success', $jsonBody);
     }
 
-    public function testGetVersionList()
+    public function testGetVersionList(): void
     {
         $response = $this->dispatch('backend/systeminfo/getVersionList');
 
-        static::assertTrue($this->View()->success);
+        static::assertTrue($this->View()->getAssign('success'));
 
         $body = $response->getBody();
+        static::assertIsString($body);
         $jsonBody = json_decode($body, true);
 
         static::assertArrayHasKey('data', $jsonBody);
@@ -101,4 +106,16 @@ public function testGetVersionList()
         static::assertArrayHasKey('name', $jsonBody['data'][0]);
         static::assertArrayHasKey('version', $jsonBody['data'][0]);
     }
+
+    public function testGetTimezone(): void
+    {
+        $response = $this->dispatch('backend/systeminfo/getTimezone');
+
+        static::assertTrue($this->View()->getAssign('success'));
+
+        $body = $response->getBody();
+        static::assertIsString($body);
+        $jsonBody = json_decode($body, true);
+        static::assertIsInt($jsonBody['offset']);
+    }
 }
diff --git a/tests/Functional/Controllers/Backend/UserManagerTest.php b/tests/Functional/Controllers/Backend/UserManagerTest.php
index c9cd7fbb531..a92d1a1f534 100644
--- a/tests/Functional/Controllers/Backend/UserManagerTest.php
+++ b/tests/Functional/Controllers/Backend/UserManagerTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Backend;
@@ -29,15 +28,18 @@
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Query\QueryBuilder;
 use Enlight_Components_Test_Controller_TestCase;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 
 class UserManagerTest extends Enlight_Components_Test_Controller_TestCase
 {
+    use DatabaseTransactionBehaviour;
+
     /**
      * Temporary user data
      *
      * @var array{username: string, password: string, localeId: int, roleId: int, name: string, email: string, active: bool}
      */
-    protected array $temporaryUserData = [
+    private array $temporaryUserData = [
         'username' => 'UserManagerTemporaryUser',
         'password' => 'test',
         'localeId' => 1,
@@ -52,7 +54,7 @@ class UserManagerTest extends Enlight_Components_Test_Controller_TestCase
      *
      * @var array{id: int|null, localeId: int, roleId: int, active: bool, username: string, name: string, email: string, password: string, admin: bool, encoder: string, disabledCache: bool, lockedUntil: string}
      */
-    protected array $temporaryAdminUserData = [
+    private array $temporaryAdminUserData = [
         'id' => null,
         'localeId' => 1,
         'roleId' => 1,
@@ -78,7 +80,7 @@ public function setUp(): void
     }
 
     /**
-     * Verify that we can not login with a user that doesn't exists (yet)
+     * Verify that we can not log in with a user that doesn't exist (yet)
      */
     public function testWrongAdminLogin(): void
     {
@@ -99,30 +101,29 @@ public function testWrongAdminLogin(): void
      */
     public function testCreateAdminUser(): void
     {
-        //Delete the user in case the username is duplicated
+        // Delete the user in case the username is duplicated
         $this->deleteUserByUsername($this->temporaryAdminUserData['username']);
 
         $this->Request()->setParams($this->temporaryAdminUserData);
 
         $this->dispatch('/backend/UserManager/updateUser');
 
-        //Verify that the admin user creation was successful
+        // Verify that the admin user creation was successful
         static::assertTrue($this->View()->getAssign('success'));
     }
 
     /**
      * Verify that the previously created admin user can login with a correct password
-     *
-     * @depends testCreateAdminUser
      */
     public function testAdminLogin(): void
     {
+        $this->testCreateAdminUser();
         $this->enableAuth();
 
         $this->resetRequest();
         $this->Request()->setParams([
-           'username' => $this->temporaryAdminUserData['username'],
-           'password' => $this->temporaryAdminUserData['password'],
+            'username' => $this->temporaryAdminUserData['username'],
+            'password' => $this->temporaryAdminUserData['password'],
         ]);
 
         $this->dispatch('/backend/Login/login');
@@ -168,17 +169,16 @@ public function testUserAdd(): string
 
     /**
      * Test edit of users
-     *
-     * @depends testUserAdd
      */
-    public function testUserEdit(string $username): string
+    public function testUserEdit(): string
     {
+        $username = $this->testUserAdd();
         $this->resetRequest()
         ->resetResponse();
 
         $user = $this->getUserByUsername($username);
 
-        $randomName = sprintf('RandomName_%s', md5((string) rand(0, time())));
+        $randomName = \sprintf('RandomName_%s', md5((string) rand(0, time())));
 
         static::assertGreaterThan(0, $user['id']);
 
@@ -199,11 +199,10 @@ public function testUserEdit(string $username): string
 
     /**
      * Test deleting of users
-     *
-     * @depends testUserEdit
      */
-    public function testUserDelete(string $username): void
+    public function testUserDelete(): void
     {
+        $username = $this->testUserAdd();
         $user = $this->getUserByUsername($username);
 
         static::assertGreaterThan(0, $user['id']);
@@ -213,7 +212,7 @@ public function testUserDelete(string $username): void
 
         static::assertTrue(
             $this->View()->getAssign('success'),
-            sprintf(
+            \sprintf(
                 'User %s with id %s not found',
                 $user['id'],
                 $user['username']
@@ -253,7 +252,7 @@ public function testUserDetails(): void
         static::assertEquals($user['id'], $this->View()->getAssign('data')['id']);
 
         // Check that result does not contain passwords
-        static::assertNull($this->View()->getAssign('data')['password']);
+        static::assertFalse(isset($this->View()->getAssign('data')['password']));
     }
 
     /**
@@ -289,11 +288,10 @@ public function testCreateRole(): string
 
     /**
      * Test editing of roles
-     *
-     * @depends testCreateRole
      */
-    public function testEditRole(string $randomRoleName): int
+    public function testEditRole(): int
     {
+        $randomRoleName = $this->testCreateRole();
         $randomRole = Shopware()->Container()
             ->get(Connection::class)
             ->createQueryBuilder()
@@ -318,11 +316,10 @@ public function testEditRole(string $randomRoleName): int
 
     /**
      * Test deleting of roles
-     *
-     * @depends testEditRole
      */
-    public function testDeleteRole(int $randomRoleId): void
+    public function testDeleteRole(): void
     {
+        $randomRoleId = $this->testEditRole();
         $this->Request()->setParam('id', $randomRoleId);
         $this->dispatch('backend/UserManager/deleteRole');
 
@@ -396,7 +393,7 @@ private function getUserByUsername(string $username): array
      */
     private function deleteUserByUsername(string $name): void
     {
-        //Delete the admin user if it exists before attempting to create it (else we will have a duplicate user error)
+        // Delete the admin user if it exists before attempting to create it (else we will have a duplicate user error)
         Shopware()->Container()
             ->get(Connection::class)
             ->executeQuery(
diff --git a/tests/Functional/Controllers/Backend/VoteTest.php b/tests/Functional/Controllers/Backend/VoteTest.php
index 08ac3da0650..e0368eb6d29 100644
--- a/tests/Functional/Controllers/Backend/VoteTest.php
+++ b/tests/Functional/Controllers/Backend/VoteTest.php
@@ -1,33 +1,37 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Backend;
 
 use Enlight_Components_Test_Controller_TestCase;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 
 class VoteTest extends Enlight_Components_Test_Controller_TestCase
 {
+    use DatabaseTransactionBehaviour;
+
     /**
      * Standard set up for every test - just disable auth
      */
@@ -41,68 +45,66 @@ public function setUp(): void
     }
 
     /**
-     * Test method to test the getVotesAction-method, which gets all article-votes
+     * Test method to test the getVotesAction-method, which gets all product-votes
      *
-     * @return array Contains the article, which is created in this method
+     * @return array<string, mixed> Contains the product, which is created in this method
      */
-    public function testGetVotes()
+    public function testGetVotes(): array
     {
         $sql = 'DELETE FROM s_articles_vote';
-        Shopware()->Db()->query($sql, []);
+        Shopware()->Db()->query($sql);
         $sql = "INSERT INTO s_articles_vote (`articleID`, `name`, `headline`, `comment`, `points`, `datum`, `active`, `email`, `answer`, `answer_date`)
                 VALUES ('3', 'Patrick', 'Super!', 'Gutes Produkt!', '4', '2012-03-04 16:30:43', '1', 'test@example.com', '', '')";
-        Shopware()->Db()->query($sql, []);
+        Shopware()->Db()->query($sql);
 
         $sql = "SELECT * FROM s_articles_vote WHERE articleID = 3 AND name='Patrick'";
-        $data = Shopware()->Db()->fetchRow($sql, []);
+        $data = Shopware()->Db()->fetchRow($sql);
 
         $this->dispatch('backend/vote/list');
-        static::assertTrue($this->View()->success);
+        static::assertTrue($this->View()->getAssign('success'));
 
-        static::assertNotNull($this->View()->data);
-        static::assertNotNull($this->View()->total);
+        static::assertNotNull($this->View()->getAssign('data'));
+        static::assertNotNull($this->View()->getAssign('total'));
 
         // Testing the search-function
         $filter = ['filter' => json_encode([['value' => 'test']])];
         $this->Request()->setMethod('POST')->setPost($filter);
         $this->dispatch('backend/premium/getPremiumArticles');
 
-        static::assertTrue($this->View()->success);
-        static::assertNotNull($this->View()->data);
-        static::assertNotNull($this->View()->total);
+        static::assertTrue($this->View()->getAssign('success'));
+        static::assertNotNull($this->View()->getAssign('data'));
+        static::assertNotNull($this->View()->getAssign('total'));
 
         return $data;
     }
 
     /**
      * Test method to test the answerVoteAction-method, which sets an answer to a vote
-     *
-     * @depends testGetVotes
-     *
-     * @param array $data Contains the article, which is created in testGetVotes
      */
-    public function testAnswerVote($data)
+    public function testAnswerVote(): void
     {
+        $data = $this->testGetVotes();
+        $this->resetRequest()->resetResponse();
+
         $data['answer'] = 'Test';
         $this->Request()->setMethod('POST')->setPost($data);
 
         $this->dispatch('backend/vote/update');
 
-        static::assertTrue($this->View()->success);
-        static::assertNotNull($this->View()->data);
-        static::assertNotNull($this->View()->data['answer_date']);
+        static::assertTrue($this->View()->getAssign('success'));
+        static::assertIsArray($this->View()->getAssign('data'));
+        static::assertSame('Test', $this->View()->getAssign('data')['answer']);
     }
 
     /**
      * Test method to test the acceptVoteAction-method, which sets the active-property to 1, so the vote is enabled
      * in the frontend
-     *
-     * @depends testGetVotes
-     *
-     * @param array $data Contains the article, which is created in testGetVotes
      */
-    public function testAcceptVote($data)
+    public function testAcceptVote(): void
     {
+        $data = $this->testGetVotes();
+        $this->resetRequest()->resetResponse();
+
         $sql = 'UPDATE s_articles_vote SET active=0 WHERE id=?';
         Shopware()->Db()->query($sql, [$data['id']]);
 
@@ -112,21 +114,20 @@ public function testAcceptVote($data)
 
         $this->dispatch('backend/vote/update');
 
-        static::assertTrue($this->View()->success);
-        static::assertNotNull($this->View()->data);
+        static::assertTrue($this->View()->getAssign('success'));
+        static::assertNotNull($this->View()->getAssign('data'));
     }
 
     /**
-     * Test method to test the deleteVoteAction-method, which deletes the article created in the testGetVotes-method
-     *
-     * @depends testGetVotes
-     *
-     * @param array $data Contains the article, which is created in testGetVotes
+     * Test method to test the deleteVoteAction-method, which deletes the product created in the testGetVotes-method
      */
-    public function testDeleteVote($data)
+    public function testDeleteVote(): void
     {
+        $data = $this->testGetVotes();
+        $this->resetRequest()->resetResponse();
+
         $this->Request()->setMethod('POST')->setPost($data);
         $this->dispatch('backend/vote/delete');
-        static::assertTrue($this->View()->success);
+        static::assertTrue($this->View()->getAssign('success'));
     }
 }
diff --git a/tests/Functional/Controllers/Backend/VoucherTest.php b/tests/Functional/Controllers/Backend/VoucherTest.php
index c2b5e183fa1..c7c3eee5555 100644
--- a/tests/Functional/Controllers/Backend/VoucherTest.php
+++ b/tests/Functional/Controllers/Backend/VoucherTest.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Backend;
@@ -32,12 +33,7 @@
 class VoucherTest extends Enlight_Components_Test_Controller_TestCase
 {
     /**
-     * @var Repository
-     */
-    protected $repository;
-
-    /**
-     * Voucher dummy data
+     * @var array<string, mixed>
      */
     private array $voucherData = [
         'description' => 'description',
@@ -60,14 +56,10 @@ class VoucherTest extends Enlight_Components_Test_Controller_TestCase
         'value' => '10',
     ];
 
-    /**
-     * @var ModelManager
-     */
-    private $manager;
+    private Repository $repository;
+
+    private ModelManager $manager;
 
-    /**
-     * Standard set up for every test - just disable auth
-     */
     public function setUp(): void
     {
         parent::setUp();
@@ -80,10 +72,7 @@ public function setUp(): void
         Shopware()->Plugins()->Backend()->Auth()->setNoAcl();
     }
 
-    /**
-     * test the voucher list
-     */
-    public function testGetVoucher()
+    public function testGetVoucher(): void
     {
         // Delete old data
         $vouchers = $this->repository->findBy(['orderCode' => '65168phpunit']);
@@ -95,10 +84,10 @@ public function testGetVoucher()
         $voucher = $this->createDummy();
 
         $this->dispatch('backend/voucher/getVoucher?page=1&start=0&limit=2000');
-        static::assertTrue($this->View()->success);
-        $returnData = $this->View()->data;
+        static::assertTrue($this->View()->getAssign('success'));
+        $returnData = $this->View()->getAssign('data');
         static::assertNotEmpty($returnData);
-        static::assertGreaterThan(0, $this->View()->totalCount);
+        static::assertGreaterThan(0, $this->View()->getAssign('totalCount'));
         $lastInsert = $returnData[\count($returnData) - 1];
         static::assertEquals($voucher->getId(), $lastInsert['id']);
 
@@ -106,42 +95,31 @@ public function testGetVoucher()
         $this->manager->flush();
     }
 
-    /**
-     * test adding a voucher
-     *
-     * @return string The id to for the testUpdateVoucher Method
-     */
-    public function testAddVoucher()
+    public function testAddVoucher(): int
     {
-        $this->manager->getConnection()->executeUpdate('DELETE FROM s_emarketing_vouchers WHERE ordercode = :code', [
+        $this->manager->getConnection()->executeStatement('DELETE FROM s_emarketing_vouchers WHERE ordercode = :code', [
             ':code' => $this->voucherData['orderCode'],
         ]);
 
         $params = $this->voucherData;
         $this->Request()->setParams($params);
         $this->dispatch('backend/voucher/saveVoucher');
-        static::assertTrue($this->View()->success);
-        static::assertEquals($params['description'], $this->View()->data['description']);
+        static::assertTrue($this->View()->getAssign('success'));
+        static::assertEquals($params['description'], $this->View()->getAssign('data')['description']);
 
-        return $this->View()->data['id'];
+        return $this->View()->getAssign('data')['id'];
     }
 
     /**
-     * the the getVoucherDetail Method
-     *
      * @depends testAddVoucher
-     *
-     * @param string $id
-     *
-     * @return string the id to for the testUpdateVoucher Method
      */
-    public function testGetVoucherDetail($id)
+    public function testGetVoucherDetail(int $id): int
     {
         $params['voucherID'] = $id;
         $this->Request()->setParams($params);
         $this->dispatch('backend/voucher/getVoucherDetail');
-        static::assertTrue($this->View()->success);
-        $returningData = $this->View()->data;
+        static::assertTrue($this->View()->getAssign('success'));
+        $returningData = $this->View()->getAssign('data');
         $voucherData = $this->voucherData;
         static::assertEquals($voucherData['description'], $returningData['description']);
         static::assertEquals($voucherData['numberOfUnits'], $returningData['numberOfUnits']);
@@ -154,11 +132,9 @@ public function testGetVoucherDetail($id)
     }
 
     /**
-     * test the voucherCode validation methods with the created voucher
-     *
      * @depends testAddVoucher
      */
-    public function testValidateVoucherCode()
+    public function testValidateVoucherCode(): void
     {
         $params = [];
         $voucherModel = $this->createDummy(false);
@@ -186,13 +162,9 @@ public function testValidateVoucherCode()
     }
 
     /**
-     * Test the orderCode validation methods with the created voucher
-     *
      * @depends testAddVoucher
-     *
-     * @param string $id
      */
-    public function testValidateOrderCode($id)
+    public function testValidateOrderCode(int $id): void
     {
         $params = [];
         $voucherData = $this->voucherData;
@@ -217,13 +189,9 @@ public function testValidateOrderCode($id)
     }
 
     /**
-     * Test updating a voucher
-     *
      * @depends testGetVoucherDetail
-     *
-     * @param string $id
      */
-    public function testUpdateVoucher($id)
+    public function testUpdateVoucher(int $id): int
     {
         $params = $this->voucherData;
         $params['id'] = $id;
@@ -231,59 +199,47 @@ public function testUpdateVoucher($id)
         $this->Request()->setParams($params);
 
         $this->dispatch('backend/voucher/saveVoucher');
-        static::assertTrue($this->View()->success);
-        static::assertEquals($params['description'], $this->View()->data['description']);
+        static::assertTrue($this->View()->getAssign('success'));
+        static::assertEquals($params['description'], $this->View()->getAssign('data')['description']);
 
         return $id;
     }
 
     /**
-     * Test generating voucher codes
-     *
      * @depends testUpdateVoucher
-     *
-     * @param string $id
      */
-    public function testGenerateVoucherCodes($id)
+    public function testGenerateVoucherCodes(int $id): int
     {
         $voucherData = $this->voucherData;
         $params = [];
         $params['numberOfUnits'] = $voucherData['numberOfUnits'];
-        $params['voucherId'] = (int) $id;
+        $params['voucherId'] = $id;
         $this->Request()->setParams($params);
         $this->dispatch('backend/voucher/createVoucherCodes');
-        static::assertTrue($this->View()->success);
+        static::assertTrue($this->View()->getAssign('success'));
 
         return $id;
     }
 
     /**
-     * Test the listing of the voucher codes
-     *
      * @depends testGenerateVoucherCodes
-     *
-     * @param string $id
      */
-    public function testGetVoucherCodes($id)
+    public function testGetVoucherCodes(int $id): int
     {
         $this->dispatch('backend/voucher/getVoucherCodes?voucherID=' . $id);
-        static::assertTrue($this->View()->success);
-        static::assertCount(50, $this->View()->data);
+        static::assertTrue($this->View()->getAssign('success'));
+        static::assertCount(50, $this->View()->getAssign('data'));
 
         return $id;
     }
 
     /**
-     * Test the exportVoucherCode Method
-     *
      * @depends testGetVoucherCodes
-     *
-     * @param string $id
      */
-    public function testExportVoucherCode($id)
+    public function testExportVoucherCode(int $id): int
     {
         $params = [];
-        $params['voucherId'] = (int) $id;
+        $params['voucherId'] = $id;
         $this->Request()->setParams($params);
         $this->dispatch('backend/voucher/exportVoucherCode');
         $header = $this->Response()->getHeaders();
@@ -299,40 +255,26 @@ public function testExportVoucherCode($id)
     }
 
     /**
-     * Test the delete the voucher method
-     *
      * @depends testExportVoucherCode
-     *
-     * @param string $id
      */
-    public function testDeleteVoucher($id)
+    public function testDeleteVoucher(int $id): void
     {
         $params = [];
-        $params['id'] = (int) $id;
+        $params['id'] = $id;
         $this->Request()->setParams($params);
         $this->dispatch('backend/voucher/deleteVoucher');
-        static::assertTrue($this->View()->success);
+        static::assertTrue($this->View()->getAssign('success'));
         static::assertNull($this->repository->find($params['id']));
     }
 
-    /**
-     * Test getTaxConfiguration Method
-     */
-    public function testGetTaxConfiguration()
+    public function testGetTaxConfiguration(): void
     {
         $this->dispatch('backend/voucher/getTaxConfiguration');
-        static::assertTrue($this->View()->success);
-        static::assertNotEmpty($this->View()->data);
+        static::assertTrue($this->View()->getAssign('success'));
+        static::assertNotEmpty($this->View()->getAssign('data'));
     }
 
-    /**
-     * Creates the dummy voucher
-     *
-     * @param bool $individualMode
-     *
-     * @return Voucher
-     */
-    private function getDummyVoucher($individualMode = true)
+    private function getDummyVoucher(bool $individualMode = true): Voucher
     {
         $voucher = new Voucher();
         $voucherData = $this->voucherData;
@@ -345,14 +287,7 @@ private function getDummyVoucher($individualMode = true)
         return $voucher;
     }
 
-    /**
-     * Helper method to create the dummy object
-     *
-     * @param bool $individualMode
-     *
-     * @return Voucher
-     */
-    private function createDummy($individualMode = true)
+    private function createDummy(bool $individualMode = true): Voucher
     {
         $voucher = $this->getDummyVoucher($individualMode);
         $this->manager->persist($voucher);
diff --git a/tests/Functional/Controllers/Backend/WidgetsTest.php b/tests/Functional/Controllers/Backend/WidgetsTest.php
index 287f918f8bf..4b7800414eb 100644
--- a/tests/Functional/Controllers/Backend/WidgetsTest.php
+++ b/tests/Functional/Controllers/Backend/WidgetsTest.php
@@ -1,35 +1,36 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Backend;
 
+use Closure;
 use DateInterval;
 use DateTime;
 use Doctrine\DBAL\Connection;
 use Enlight_Components_Test_Controller_TestCase;
 use Enlight_Plugin_Namespace;
-use Enlight_Plugin_PluginManager;
 use Enlight_View;
 use Generator;
 use PHPUnit\Framework\Constraint\Constraint;
@@ -37,7 +38,6 @@
 use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 use Shopware_Controllers_Backend_Widgets;
 use Shopware_Plugins_Backend_Auth_Bootstrap;
-use UnexpectedValueException;
 use Zend_Db_Expr;
 
 class WidgetsTest extends Enlight_Components_Test_Controller_TestCase
@@ -56,23 +56,10 @@ public function setUp(): void
         parent::setUp();
 
         $pluginManager = $this->getContainer()->get('plugin_manager');
-
-        if (!($pluginManager instanceof Enlight_Plugin_PluginManager)) {
-            throw new UnexpectedValueException(sprintf('Couldn\'t load %s', Enlight_Plugin_PluginManager::class));
-        }
-
         $backendPlugins = $pluginManager->get('Backend');
-
-        if (!($backendPlugins instanceof Enlight_Plugin_Namespace)) {
-            throw new UnexpectedValueException(sprintf('Couldn\'t load %s', Enlight_Plugin_Namespace::class));
-        }
-
+        static::assertInstanceOf(Enlight_Plugin_Namespace::class, $backendPlugins);
         $authPlugin = $backendPlugins->get('Auth');
-
-        if (!($authPlugin instanceof Shopware_Plugins_Backend_Auth_Bootstrap)) {
-            throw new UnexpectedValueException(sprintf('Couldn\'t load %s', Shopware_Plugins_Backend_Auth_Bootstrap::class));
-        }
-
+        static::assertInstanceOf(Shopware_Plugins_Backend_Auth_Bootstrap::class, $authPlugin);
         $this->authPlugin = $authPlugin;
 
         $this->authPlugin->setNoAuth();
@@ -93,7 +80,7 @@ protected function tearDown(): void
         $this->authPlugin->setNoAcl(false);
     }
 
-    public function testConversionIsEmpty()
+    public function testConversionIsEmpty(): void
     {
         $this->dispatch('backend/widgets/getTurnOverVisitors');
 
@@ -103,7 +90,7 @@ public function testConversionIsEmpty()
         static::assertEquals('0.00', $response['conversion']);
     }
 
-    public function testConversionIsCalucatedFromBeginningOfDay()
+    public function testConversionIsCalculatedFromBeginningOfDay(): void
     {
         $date = new DateTime();
         $date->sub(new DateInterval('P7DT1M'));
@@ -136,7 +123,7 @@ public function testConversionIsCalucatedFromBeginningOfDay()
         static::assertEquals('100.00', $response['conversion']);
     }
 
-    public function testConversionStillWorks()
+    public function testConversionStillWorks(): void
     {
         $date = new DateTime();
         $date->sub(new DateInterval('P6DT59M'));
@@ -169,7 +156,7 @@ public function testConversionStillWorks()
         static::assertEquals('100.00', $response['conversion']);
     }
 
-    public function testIfNoConversionAfterEightDays()
+    public function testIfNoConversionAfterEightDays(): void
     {
         $date = new DateTime();
         $date->sub(new DateInterval('P8D'));
@@ -205,7 +192,7 @@ public function testIfNoConversionAfterEightDays()
     /**
      * test the getVisitorsAction
      */
-    public function testGetVisitorsWithCompanyAction()
+    public function testGetVisitorsWithCompanyAction(): void
     {
         $addressData = [
             'company' => 'TestCompany',
@@ -224,7 +211,7 @@ public function testGetVisitorsWithCompanyAction()
 
         // Check if success
         static::assertArrayHasKey('success', $response);
-        // Check if has data
+        // Check if response has data
         static::assertArrayHasKey('data', $response);
         // Check if data contains customers
         static::assertArrayHasKey('customers', $response['data']);
@@ -234,7 +221,7 @@ public function testGetVisitorsWithCompanyAction()
         static::assertEquals($addressData['company'], $response['data']['customers'][0]['customer']);
     }
 
-    public function testGetVisitorsWithoutCompanyAction()
+    public function testGetVisitorsWithoutCompanyAction(): void
     {
         $addressData = [
             'salutation' => 'mr',
@@ -252,7 +239,7 @@ public function testGetVisitorsWithoutCompanyAction()
 
         // Check if success
         static::assertArrayHasKey('success', $response);
-        // Check if has data
+        // Check if response has data
         static::assertArrayHasKey('data', $response);
         // Check if data contains customers
         static::assertArrayHasKey('customers', $response['data']);
@@ -265,7 +252,7 @@ public function testGetVisitorsWithoutCompanyAction()
         );
     }
 
-    public function testGetVisitorsWithEmptyCompanyAction()
+    public function testGetVisitorsWithEmptyCompanyAction(): void
     {
         $addressData = [
             'company' => '',
@@ -284,7 +271,7 @@ public function testGetVisitorsWithEmptyCompanyAction()
 
         // Check if success
         static::assertArrayHasKey('success', $response);
-        // Check if has data
+        // Check if response has data
         static::assertArrayHasKey('data', $response);
         // Check if data contains customers
         static::assertArrayHasKey('customers', $response['data']);
@@ -299,8 +286,7 @@ public function testGetVisitorsWithEmptyCompanyAction()
      */
     public function testGetNoticeChecksBackendAuth(object $auth, Enlight_View $view): void
     {
-        $controller = new Shopware_Controllers_Backend_Widgets();
-        $controller->setView($view);
+        $controller = $this->createController($view);
 
         $_SESSION['ShopwareBackend']['Auth'] = $auth;
 
@@ -316,9 +302,8 @@ public function testSaveNoticeChecksBackendAuth(object $auth, Enlight_View $view
     {
         $this->Request()->setParam('notice', 'bf0b9d61-8f55-4f2c-818b-9d0891178df8');
 
-        $controller = new Shopware_Controllers_Backend_Widgets();
+        $controller = $this->createController($view);
         $controller->setRequest($this->Request());
-        $controller->setView($view);
 
         $_SESSION['ShopwareBackend']['Auth'] = $auth;
 
@@ -358,7 +343,7 @@ public function backendAuthProvider(): Generator
      */
     private function getViewMockCheckingForAssign(array $arguments): Enlight_View
     {
-        $view = static::createMock(Enlight_View::class);
+        $view = $this->createMock(Enlight_View::class);
         $view->expects(static::once())
             ->method('assign')
             ->with(...$arguments);
@@ -367,7 +352,7 @@ private function getViewMockCheckingForAssign(array $arguments): Enlight_View
     }
 
     /**
-     * @return \Closure(array<string, mixed>): bool
+     * @return Closure(array<string, mixed>): bool
      */
     private function getResponseSuccessValidator(bool $expectSuccess): callable
     {
@@ -376,7 +361,7 @@ private function getResponseSuccessValidator(bool $expectSuccess): callable
         };
     }
 
-    private function prepareTestGetVisitors($addressData)
+    private function prepareTestGetVisitors(array $addressData): void
     {
         $this->connection->insert('s_user', [
             'password' => '098f6bcd4621d373cade4e832627b4f6',
@@ -416,4 +401,13 @@ private function prepareTestGetVisitors($addressData)
             'deviceType' => 'Test',
         ]);
     }
+
+    private function createController(Enlight_View $view): Shopware_Controllers_Backend_Widgets
+    {
+        $controller = new Shopware_Controllers_Backend_Widgets();
+        $controller->setContainer($this->getContainer());
+        $controller->setView($view);
+
+        return $controller;
+    }
 }
diff --git a/tests/Functional/Controllers/Backend/_assets/getProductVariantsParams.php b/tests/Functional/Controllers/Backend/_assets/getProductVariantsParams.php
new file mode 100644
index 00000000000..cd64f3e8442
--- /dev/null
+++ b/tests/Functional/Controllers/Backend/_assets/getProductVariantsParams.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+return [
+    'articles' => 'true',
+    'variants' => 'true',
+    'configurator' => 'true',
+    'page' => 1,
+    'start' => 0,
+    'limit' => 10,
+    'filter' => [[
+        'property' => 'free',
+        'value' => '%stuhl%',
+        'operator' => null,
+        'expression' => null,
+    ]],
+];
diff --git a/tests/Functional/Controllers/Backend/_fixtures/article/graduatedPrices.sql b/tests/Functional/Controllers/Backend/_fixtures/article/graduatedPrices.sql
new file mode 100644
index 00000000000..59532ea7259
--- /dev/null
+++ b/tests/Functional/Controllers/Backend/_fixtures/article/graduatedPrices.sql
@@ -0,0 +1,9 @@
+UPDATE s_articles_prices SET `to` = '5' WHERE s_articles_prices.articledetailsID = 153;
+UPDATE s_articles_prices SET `to` = '20' WHERE s_articles_prices.articledetailsID = 154;
+INSERT INTO s_articles_prices (`pricegroup`, `from`, `to`, `articleID`, `articledetailsID`, `price`, `pseudoprice`, `regulation_price`, `percent`)
+VALUES ('EK', 6, 'beliebig', 89, 153, 1.3361344537815, 0, 0, 20.10),
+       ('EK', 21, 'beliebig', 89, 154, 1.0840336134454, 0, 0, 35.18),
+       ('H', 1, '10', 89, 153, 1.99, 0, 0, 0.00),
+       ('H', 11, 'beliebig', 89, 153, 0.99, 0, 0, 50.25),
+       ('H', 1, '30', 89, 154, 1.99, 0, 0, 0.00),
+       ('H', 31, 'beliebig', 89, 154, 0.89, 0, 0, 55.28);
diff --git a/tests/Functional/Controllers/Backend/_fixtures/article/productData.php b/tests/Functional/Controllers/Backend/_fixtures/article/productData.php
new file mode 100644
index 00000000000..eb0a7da45e0
--- /dev/null
+++ b/tests/Functional/Controllers/Backend/_fixtures/article/productData.php
@@ -0,0 +1,99 @@
+<?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+return $params = [
+    'id' => 180,
+    'mainDetailId' => 417,
+    'configuratorSetId' => null,
+    'supplierId' => 5,
+    'supplierName' => '',
+    'name' => 'Reisekoffer, in mehreren Farben',
+    'added' => '16.07.2012',
+    'changed' => '2012-08-21T15:30:23+02:00',
+    'active' => true,
+    'taxId' => 1,
+    'template' => '',
+    'autoNumber' => '',
+    'avoidCustomerGroups' => [],
+    'isConfigurator' => false,
+    'categories' => [
+        [
+            'id' => 36,
+            'name' => 'Deutsch>Sommerwelten>On World Tour',
+            'allowDrag' => false,
+            'parentId' => null,
+            'leaf' => false,
+        ],
+    ],
+    'customerGroups' => [],
+    'mainPrices' => [
+        [
+            'id' => 483,
+            'from' => 1,
+            'to' => 'beliebig',
+            'price' => 89.99000000000024,
+            'pseudoPrice' => 99.9957,
+            'regulationPrice' => 0,
+            'percent' => 0,
+            'cloned' => false,
+            'customerGroupKey' => 'EK',
+            'customerGroup' => [
+                [
+                    'id' => 1,
+                    'key' => 'EK',
+                    'name' => 'Shopkunden',
+                    'tax' => true,
+                    'taxInput' => true,
+                    'mode' => false,
+                    'discount' => 0,
+                ],
+            ],
+        ],
+    ],
+    'mainDetail' => [
+        [
+            'id' => 417,
+            'articleId' => 180,
+            'number' => 'SW10180.1',
+            'additionalText' => 'blau',
+            'supplierNumber' => '',
+            'active' => true,
+            'inStock' => 124,
+            'stockMin' => 0,
+            'lastStock' => false,
+            'kind' => 1,
+            'position' => 0,
+            'minPurchase' => 1,
+            'maxPurchase' => null,
+            'purchasePrice' => 0,
+            'price' => 0,
+            'standard' => true,
+            'prices' => [],
+            'configuratorOptions' => [],
+        ],
+    ],
+    'configuratorSet' => [],
+    'configuratorTemplate' => [],
+    'dependencies' => [],
+];
diff --git a/tests/Functional/Controllers/Backend/_fixtures/order/customer.sql b/tests/Functional/Controllers/Backend/_fixtures/order/customer.sql
index 6da272637fd..73d9d8de571 100644
--- a/tests/Functional/Controllers/Backend/_fixtures/order/customer.sql
+++ b/tests/Functional/Controllers/Backend/_fixtures/order/customer.sql
@@ -6,6 +6,6 @@ INSERT INTO `s_user` (`id`, `password`, `encoder`, `email`, `active`, `accountmo
                       `title`, `salutation`, `firstname`, `lastname`, `birthday`, `customernumber`, `login_token`,
                       `changed`, `password_change_date`, `register_opt_in_id`)
 VALUES (:customerId, '$2y$10$f8dUOFLOd0QOkzrqffu4EOXexhv..LVe72TwaOem0KXV2AyEjODvK', 'bcrypt', 'test@shopware.com', 1, 0, '', 5,
-        0, NULL, NULL, '2021-12-30', '2021-12-30 11:28:33', 'ppvfk1jhcno42d801k3o8e0j94', 0, '', 0, 'EK', 0, '1', 1, '',
+        0, NULL, NULL, '2021-12-30', '2021-12-30 11:28:33', 'ppvfk1jhcno42d801k3o8e0j94', 0, '', 0, :customerGroup, 0, '1', 1, '',
         NULL, '', 0, NULL, 5, 5, NULL, 'mr', 'Bruce', 'Wayne', NULL, '20005', 'b7d6a2a8-f8bb-40b5-af7e-3feac81bc23a.1',
         '2021-12-30 11:27:51', '2021-12-30 11:27:51', NULL);
diff --git a/tests/Functional/Controllers/Backend/_fixtures/order/customerGroupSpecificPrices.sql b/tests/Functional/Controllers/Backend/_fixtures/order/customerGroupSpecificPrices.sql
new file mode 100644
index 00000000000..aa047f616da
--- /dev/null
+++ b/tests/Functional/Controllers/Backend/_fixtures/order/customerGroupSpecificPrices.sql
@@ -0,0 +1,2 @@
+INSERT INTO `s_articles_prices` (`pricegroup`, `from`,`to`,`articleID`,`articledetailsID`,`price`,`pseudoprice`,`regulation_price`,`baseprice`,`percent`)
+VALUES (:customerGroup, 1, "beliebig", :productId, :productDetailsId, 100, 0, 0, NULL, 0.00);
diff --git a/tests/Functional/Controllers/Backend/_fixtures/order/order.sql b/tests/Functional/Controllers/Backend/_fixtures/order/order.sql
index 557780a7c4b..9a7bce65091 100644
--- a/tests/Functional/Controllers/Backend/_fixtures/order/order.sql
+++ b/tests/Functional/Controllers/Backend/_fixtures/order/order.sql
@@ -17,7 +17,7 @@ INSERT INTO `s_order_billingaddress` (`id`, `userID`, `orderID`, `company`, `dep
                                       `customernumber`, `firstname`, `lastname`, `street`, `zipcode`, `city`, `phone`,
                                       `countryID`, `stateID`, `ustid`, `additional_address_line1`,
                                       `additional_address_line2`, `title`)
-VALUES (12345, :customerId, :orderId, '', '', 'mr', '20005', 'Bruce', 'Wayne', 'Test Street 123', '11111', 'Gotham', '', 5, NULL,
+VALUES (12345, :customerId, :orderId, '', '', 'mr', '20005', 'Bruce', 'Wayne', 'Test Street 123', '11111', 'Gotham', '', :countryId, :stateId,
         NULL, NULL, NULL, NULL);
 
 INSERT INTO `s_order_shippingaddress` (`id`, `userID`, `orderID`, `company`, `department`, `salutation`, `firstname`,
diff --git a/tests/Functional/Controllers/Backend/_fixtures/order/shipping_address.sql b/tests/Functional/Controllers/Backend/_fixtures/order/shipping_address.sql
new file mode 100644
index 00000000000..b21c952681f
--- /dev/null
+++ b/tests/Functional/Controllers/Backend/_fixtures/order/shipping_address.sql
@@ -0,0 +1 @@
+UPDATE s_order_shippingaddress SET countryID = :countryID, stateID = :stateID WHERE orderID = :orderID;
diff --git a/tests/Functional/Controllers/Backend/_fixtures/order/tax_rules.sql b/tests/Functional/Controllers/Backend/_fixtures/order/tax_rules.sql
index 72f3518fe51..5270c73a573 100644
--- a/tests/Functional/Controllers/Backend/_fixtures/order/tax_rules.sql
+++ b/tests/Functional/Controllers/Backend/_fixtures/order/tax_rules.sql
@@ -1,2 +1,2 @@
-INSERT INTO `s_core_tax_rules` (`id`, `areaID`, `countryID`, `stateID`, `groupID`, `customer_groupID`, `tax`, `name`, `active`)
-VALUES (:taxRuleId, 3, 5, NULL, 1, 1, '20.50', 'Test 20', 1);
+INSERT INTO `s_core_tax_rules` (`areaID`, `countryID`, `stateID`, `groupID`, `customer_groupID`, `tax`, `name`, `active`)
+VALUES (3, 5, NULL, 1, :customerGroupId, '20.5', 'Test Belgium', 1);
diff --git a/tests/Functional/Controllers/Backend/_fixtures/order/tax_rules_2.sql b/tests/Functional/Controllers/Backend/_fixtures/order/tax_rules_2.sql
new file mode 100644
index 00000000000..706bddc5e4e
--- /dev/null
+++ b/tests/Functional/Controllers/Backend/_fixtures/order/tax_rules_2.sql
@@ -0,0 +1,2 @@
+INSERT INTO `s_core_tax_rules` (`areaID`, `countryID`, `stateID`, `groupID`, `customer_groupID`, `tax`, `name`, `active`)
+VALUES (:areaID, :countryID, :stateID, :groupID, :customer_groupID, :tax, :name, 1);
diff --git a/tests/Functional/Controllers/Frontend/AccountTest.php b/tests/Functional/Controllers/Frontend/AccountTest.php
index 9075465c0bf..cf7ed132bd5 100644
--- a/tests/Functional/Controllers/Frontend/AccountTest.php
+++ b/tests/Functional/Controllers/Frontend/AccountTest.php
@@ -5,36 +5,47 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Frontend;
 
 use Doctrine\DBAL\Connection;
 use Enlight_Components_Test_Controller_TestCase as ControllerTestCase;
+use Enlight_Controller_Request_RequestTestCase;
+use Enlight_Controller_Response_ResponseTestCase;
+use Enlight_View_Default;
+use Shopware\Components\Model\ModelManager;
+use Shopware\Models\Customer\Customer;
 use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\CustomerLoginTrait;
 use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
+use Shopware_Controllers_Frontend_Account;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 
 class AccountTest extends ControllerTestCase
 {
     use ContainerTrait;
     use DatabaseTransactionBehaviour;
+    use CustomerLoginTrait;
+
+    private const NEW_MAIL_ADDRESS = 'test1@example.com';
 
     private Connection $connection;
 
@@ -55,18 +66,28 @@ public function testPasswordWillBeChanged(): void
         $hash = $this->getNextResetHash('test@example.com');
         $before = $this->getPasswordForEmail('test@example.com');
 
-        $this->Request()
-            ->setMethod('POST')
-            ->setPost(
-                [
-                    'hash' => $hash,
-                    'password' => [
-                        'password' => 'shopware1',
-                        'passwordConfirmation' => 'shopware1',
-                    ],
-                ]
-            );
-        $this->dispatch('account/resetPassword');
+        $controller = $this->getController();
+        $request = new Enlight_Controller_Request_RequestTestCase();
+        $response = new Enlight_Controller_Response_ResponseTestCase();
+
+        $front = $this->getContainer()->get('front');
+        $front->setRequest($request);
+        $front->setResponse($response);
+
+        $request->setMethod(Request::METHOD_POST);
+        $request->setPost([
+            'hash' => $hash,
+            'password' => [
+                'password' => 'shopware1',
+                'passwordConfirmation' => 'shopware1',
+            ],
+        ]);
+
+        $controller->setFront($front);
+        $controller->setRequest($request);
+        $controller->setResponse($response);
+        $controller->init();
+        $controller->resetPasswordAction();
 
         $changed = $this->getPasswordForEmail('test@example.com');
 
@@ -78,19 +99,20 @@ public function testPasswordWillNotChangeOnErrorDifferentPasswords(): void
         $hash = $this->getNextResetHash('test@example.com');
         $before = $this->getPasswordForEmail('test@example.com');
 
-        $this->Request()
-            ->setMethod('POST')
-            ->setPost(
-                [
-                    'hash' => $hash,
-                    'password' => [
-                        'password' => 'shopware1',
-                        'passwordConfirmation' => 'shopware12',
-                    ],
-                ]
-            );
+        $controller = $this->getController();
+        $request = new Enlight_Controller_Request_RequestTestCase();
+
+        $request->setMethod(Request::METHOD_POST);
+        $request->setPost([
+            'hash' => $hash,
+            'password' => [
+                'password' => 'shopware1',
+                'passwordConfirmation' => 'shopware12',
+            ],
+        ]);
 
-        $this->dispatch('account/resetPassword');
+        $controller->setRequest($request);
+        $controller->resetPasswordAction();
 
         $after = $this->getPasswordForEmail('test@example.com');
 
@@ -103,18 +125,20 @@ public function testPasswordWillNotChangeOnErrorToShort(): void
         $hash = $this->getNextResetHash('test@example.com');
         $before = $this->getPasswordForEmail('test@example.com');
 
-        $this->Request()
-            ->setMethod('POST')
-            ->setPost(
-                [
-                    'hash' => $hash,
-                    'password' => [
-                        'password' => 'test',
-                        'passwordConfirmation' => 'test',
-                    ],
-                ]
-            );
-        $this->dispatch('account/resetPassword');
+        $controller = $this->getController();
+        $request = new Enlight_Controller_Request_RequestTestCase();
+
+        $request->setMethod(Request::METHOD_POST);
+        $request->setPost([
+            'hash' => $hash,
+            'password' => [
+                'password' => 'test',
+                'passwordConfirmation' => 'test',
+            ],
+        ]);
+
+        $controller->setRequest($request);
+        $controller->resetPasswordAction();
 
         $after = $this->getPasswordForEmail('test@example.com');
 
@@ -129,18 +153,20 @@ public function testPasswordWillBeChangedOnInvalidCustomers(): void
         // Make user invalid
         $this->connection->executeStatement('UPDATE `s_user` SET `salutation` = null WHERE `email` = :email', ['email' => 'test@example.com']);
 
-        $this->Request()
-            ->setMethod('POST')
-            ->setPost(
-                [
-                    'hash' => $hash,
-                    'password' => [
-                        'password' => 'shopware12',
-                        'passwordConfirmation' => 'shopware12',
-                    ],
-                ]
-            );
-        $this->dispatch('account/resetPassword');
+        $controller = $this->getController();
+        $request = new Enlight_Controller_Request_RequestTestCase();
+
+        $request->setMethod(Request::METHOD_POST);
+        $request->setPost([
+            'hash' => $hash,
+            'password' => [
+                'password' => 'shopware12',
+                'passwordConfirmation' => 'shopware12',
+            ],
+        ]);
+
+        $controller->setRequest($request);
+        $controller->resetPasswordAction();
 
         $changed = $this->getPasswordForEmail('test@example.com');
         static::assertSame($before, $changed);
@@ -148,10 +174,17 @@ public function testPasswordWillBeChangedOnInvalidCustomers(): void
 
     public function testNoServerErrorOnMissingHashParameter(): void
     {
-        $this->Request()->setMethod('GET');
-        $response = $this->dispatch('account/resetPassword');
+        $controller = $this->getController();
+        $request = new Enlight_Controller_Request_RequestTestCase();
+        $response = new Enlight_Controller_Response_ResponseTestCase();
+
+        $request->setMethod(Request::METHOD_GET);
+
+        $controller->setRequest($request);
+        $controller->setResponse($response);
+        $controller->resetPasswordAction();
 
-        static::assertNotNull($response);
+        static::assertSame(Response::HTTP_OK, $response->getStatusCode());
     }
 
     /**
@@ -163,32 +196,80 @@ public function testExistingHashIsInvalidated(): void
         $secondHash = $this->getNextResetHash('test@example.com');
         $before = $this->getPasswordForEmail('test@example.com');
 
-        $this->Request()
-            ->setMethod('POST')
-            ->setPost(
-                [
-                    'hash' => $hash,
-                    'password' => [
-                        'password' => 'fd12179f-d454-42e4-ae90-9271f806088d',
-                        'passwordConfirmation' => 'fd12179f-d454-42e4-ae90-9271f806088d',
-                    ],
-                ]
-            );
-        $this->dispatch('account/resetPassword');
+        $controller = $this->getController();
+        $request = new Enlight_Controller_Request_RequestTestCase();
+
+        $request->setMethod(Request::METHOD_POST);
+        $request->setPost([
+            'hash' => $hash,
+            'password' => [
+                'password' => 'fd12179f-d454-42e4-ae90-9271f806088d',
+                'passwordConfirmation' => 'fd12179f-d454-42e4-ae90-9271f806088d',
+            ],
+        ]);
+
+        $controller->setRequest($request);
+        $controller->resetPasswordAction();
 
         $changed = $this->getPasswordForEmail('test@example.com');
 
         static::assertSame($before, $changed);
     }
 
+    public function testHashIsNotValidAfterUserChangesMailAddress(): void
+    {
+        $hash = $this->getNextResetHash('test@example.com');
+
+        $this->loginCustomer();
+
+        $customer = $this->getContainer()->get(ModelManager::class)->find(Customer::class, $this->getContainer()->get('session')->get('sUserId'));
+        static::assertInstanceOf(Customer::class, $customer);
+
+        $controller = $this->getController();
+        $request = new Enlight_Controller_Request_RequestTestCase();
+        $response = new Enlight_Controller_Response_ResponseTestCase();
+
+        $request->setMethod(Request::METHOD_POST);
+        $request->setPost([
+            'email' => [
+                'email' => 'test1@example.com',
+                'emailConfirmation' => 'test1@example.com',
+                'currentPassword' => 'shopware',
+            ],
+        ]);
+
+        $controller->setRequest($request);
+        $controller->setResponse($response);
+        $controller->init();
+        $controller->saveEmailAction();
+
+        static::assertSame(self::NEW_MAIL_ADDRESS, $customer->getEmail(), 'Newly set email was not taken over.');
+
+        $this->logOutCustomer();
+
+        $request = new Enlight_Controller_Request_RequestTestCase();
+        $request->setMethod(Request::METHOD_GET)->setParam('hash', $hash);
+        $controller->setRequest($request);
+        $controller->resetPasswordAction();
+
+        $view = $controller->View()->getAssign();
+
+        static::assertTrue($view['invalidToken'], 'Password-reset-link is still valid');
+        static::assertArrayHasKey('sErrorMessages', $view);
+    }
+
     private function getNextResetHash(string $mail): string
     {
         // Request a variant that is not the default one
-        $this->Request()
-            ->setMethod('POST')
-            ->setPost('email', $mail);
+        $controller = $this->getController();
+        $request = new Enlight_Controller_Request_RequestTestCase();
+
+        $request->setMethod(Request::METHOD_POST)->setParam('email', $mail);
+        $controller->setRequest($request);
+        $controller->passwordAction();
+
+        static::assertTrue($controller->View()->getAssign('sSuccess'));
 
-        $this->dispatch('account/password');
         $this->reset();
 
         return $this->connection->fetchOne(
@@ -198,6 +279,19 @@ private function getNextResetHash(string $mail): string
         );
     }
 
+    private function getController(): Shopware_Controllers_Frontend_Account
+    {
+        $controller = new Shopware_Controllers_Frontend_Account(
+            $this->getContainer()->get('config'),
+            $this->getContainer()->get('shopware.captcha.validator')
+        );
+
+        $controller->setView(new Enlight_View_Default($this->getContainer()->get('template')));
+        $controller->setContainer($this->getContainer());
+
+        return $controller;
+    }
+
     private function getPasswordForEmail(string $email): ?string
     {
         return $this->connection->fetchOne('SELECT `password` FROM `s_user` WHERE `email` = :email', ['email' => $email]) ?: null;
diff --git a/tests/Functional/Controllers/Frontend/AddressTest.php b/tests/Functional/Controllers/Frontend/AddressTest.php
new file mode 100644
index 00000000000..e57fd490c06
--- /dev/null
+++ b/tests/Functional/Controllers/Frontend/AddressTest.php
@@ -0,0 +1,153 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Controllers\Frontend;
+
+use Enlight_Controller_Request_RequestTestCase;
+use Enlight_Controller_Response_ResponseTestCase;
+use Enlight_Template_Manager;
+use Enlight_View_Default;
+use PHPUnit\Framework\TestCase;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\CustomerLoginTrait;
+use Shopware_Components_Config;
+use Symfony\Component\HttpFoundation\Request;
+
+class AddressTest extends TestCase
+{
+    use ContainerTrait;
+    use CustomerLoginTrait;
+
+    public function testCreateActionWithMissingFirstNameHasError(): void
+    {
+        $this->loginCustomer();
+
+        $controller = $this->getContainer()->get('shopware_controllers_frontend_address');
+        $controller->setContainer($this->getContainer());
+
+        $request = new Enlight_Controller_Request_RequestTestCase();
+        $request->setMethod(Request::METHOD_POST);
+        $request->setPost([
+            'address' => [
+                'additional' => [
+                    'customer_type' => 'private',
+                ],
+                'salutation' => 'mr',
+                'firstname' => '',
+                'lastname' => 'Test',
+                'street' => 'Test Street 123',
+                'zipcode' => 12345,
+                'city' => 'Test Town',
+                'country' => 2,
+            ],
+        ]);
+        $controller->setRequest($request);
+        $this->getContainer()->get('front')->setRequest($request);
+
+        $view = new Enlight_View_Default(new Enlight_Template_Manager());
+        $controller->setView($view);
+
+        $controller->preDispatch();
+        $controller->createAction();
+
+        static::assertTrue($view->getAssign('error_flags')['firstname']);
+    }
+
+    public function testCreateActionWithoutSalutationWorksWithNotRequiredSalutation(): void
+    {
+        $this->loginCustomer();
+
+        /** @var Shopware_Components_Config $config */
+        $config = $this->getContainer()->get('config');
+        $config->offsetSet('shopSalutationRequired', false);
+
+        $controller = $this->getContainer()->get('shopware_controllers_frontend_address');
+        $controller->setContainer($this->getContainer());
+
+        $response = new Enlight_Controller_Response_ResponseTestCase();
+        $controller->setResponse($response);
+        $request = new Enlight_Controller_Request_RequestTestCase();
+        $request->setMethod(Request::METHOD_POST);
+        $request->setPost([
+            'address' => [
+                'additional' => [
+                    'customer_type' => 'private',
+                ],
+                'firstname' => 'Test',
+                'lastname' => 'Test',
+                'street' => 'Test Street 123',
+                'zipcode' => 12345,
+                'city' => 'Test Town',
+                'country' => 2,
+            ],
+        ]);
+        $controller->setRequest($request);
+        $this->getContainer()->get('front')->setRequest($request);
+
+        $view = new Enlight_View_Default(new Enlight_Template_Manager());
+        $controller->setView($view);
+
+        $controller->preDispatch();
+        $controller->createAction();
+
+        static::assertEmpty($view->getAssign('error_flags'));
+
+        $config->offsetSet('shopSalutationRequired', true);
+    }
+
+    public function testCreateActionWithoutSalutationFails(): void
+    {
+        $this->loginCustomer();
+
+        $controller = $this->getContainer()->get('shopware_controllers_frontend_address');
+        $controller->setContainer($this->getContainer());
+
+        $request = new Enlight_Controller_Request_RequestTestCase();
+        $request->setMethod(Request::METHOD_POST);
+        $request->setPost([
+            'address' => [
+                'additional' => [
+                    'customer_type' => 'private',
+                ],
+                'firstname' => 'Test',
+                'lastname' => 'Test',
+                'street' => 'Test Street 123',
+                'zipcode' => 12345,
+                'city' => 'Test Town',
+                'country' => 2,
+            ],
+        ]);
+        $controller->setRequest($request);
+        $this->getContainer()->get('front')->setRequest($request);
+
+        $view = new Enlight_View_Default(new Enlight_Template_Manager());
+        $controller->setView($view);
+
+        $controller->preDispatch();
+        $controller->createAction();
+
+        static::assertTrue($view->getAssign('error_flags')['salutation']);
+    }
+}
diff --git a/tests/Functional/Controllers/Frontend/BlogTest.php b/tests/Functional/Controllers/Frontend/BlogTest.php
index 74b02feef88..a611ff0bbbc 100644
--- a/tests/Functional/Controllers/Frontend/BlogTest.php
+++ b/tests/Functional/Controllers/Frontend/BlogTest.php
@@ -1,29 +1,31 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Frontend;
 
+use Doctrine\DBAL\Connection;
 use Enlight_Components_Test_Plugin_TestCase;
 use Exception;
 use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
@@ -32,17 +34,19 @@ class BlogTest extends Enlight_Components_Test_Plugin_TestCase
 {
     use DatabaseTransactionBehaviour;
 
+    private Connection $connection;
+
     public function setUp(): void
     {
         parent::setUp();
 
-        $this->connection = Shopware()->Container()->get(\Doctrine\DBAL\Connection::class);
+        $this->connection = Shopware()->Container()->get(Connection::class);
     }
 
     /**
      * Tests the behavior if the blog article is not activated
      */
-    public function testDispatchNoActiveBlogItem()
+    public function testDispatchNoActiveBlogItem(): void
     {
         $this->expectException('Enlight_Exception');
         $this->expectExceptionCode('404');
@@ -55,7 +59,7 @@ public function testDispatchNoActiveBlogItem()
     /**
      * Tests the behavior if the BlogItem does not exist anymore
      */
-    public function testDispatchNotExistingBlogItem()
+    public function testDispatchNotExistingBlogItem(): void
     {
         $this->expectException('Enlight_Exception');
         $this->expectExceptionCode('404');
@@ -63,10 +67,10 @@ public function testDispatchNotExistingBlogItem()
         static::assertTrue($this->Response()->isRedirect());
     }
 
-    public function testDispatchInactiveCategory()
+    public function testDispatchInactiveCategory(): void
     {
         // Deactivate blog category
-        $this->connection->exec('UPDATE `s_categories` SET `active` = 0 WHERE `id` = 17');
+        $this->connection->executeStatement('UPDATE `s_categories` SET `active` = 0 WHERE `id` = 17');
 
         // Should be redirected because blog category is inactive
         $ex = null;
@@ -75,6 +79,7 @@ public function testDispatchInactiveCategory()
         } catch (Exception $e) {
             $ex = $e;
         }
+        static::assertInstanceOf(Exception::class, $ex);
         static::assertEquals(404, $ex->getCode());
 
         // Should be redirected because blog category is inactive
@@ -89,7 +94,7 @@ public function testDispatchInactiveCategory()
     /**
      * Test that requesting a non-blog category-id creates a redirect
      */
-    public function testDispatchNonBlogCategory()
+    public function testDispatchNonBlogCategory(): void
     {
         $this->expectException('Enlight_Exception');
         $this->expectExceptionCode('404');
@@ -100,17 +105,18 @@ public function testDispatchNonBlogCategory()
      * Test redirect when the blog category does not exist
      *
      * @dataProvider invalidCategoryUrlDataProvider
-     *
-     * @param string $url
      */
-    public function testDispatchNotExistingBlogCategory($url)
+    public function testDispatchNotExistingBlogCategory(string $url): void
     {
         $this->expectException('Enlight_Exception');
         $this->expectExceptionCode('404');
         $this->dispatch($url);
     }
 
-    public function invalidCategoryUrlDataProvider()
+    /**
+     * @return list<list<string>>
+     */
+    public function invalidCategoryUrlDataProvider(): array
     {
         return [
             ['/blog/?sCategory=14'], // Not a blog category
diff --git a/tests/Functional/Controllers/Frontend/CheckoutTest.php b/tests/Functional/Controllers/Frontend/CheckoutTest.php
index 91a147c0783..52cfe22486c 100644
--- a/tests/Functional/Controllers/Frontend/CheckoutTest.php
+++ b/tests/Functional/Controllers/Frontend/CheckoutTest.php
@@ -5,57 +5,73 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Frontend;
 
 use Doctrine\DBAL\Connection;
 use Enlight_Components_Test_Plugin_TestCase;
-use Enlight_Controller_Request_RequestHttp;
+use Enlight_Controller_Request_RequestTestCase;
+use Enlight_Controller_Response_ResponseTestCase;
+use Enlight_Template_Manager;
 use Enlight_View_Default;
 use LogicException;
+use sAdmin;
+use sBasket;
 use Shopware\Bundle\CartBundle\CheckoutKey;
 use Shopware\Bundle\OrderBundle\Service\CalculationServiceInterface;
 use Shopware\Components\Model\ModelManager;
-use Shopware\Components\ShopRegistrationServiceInterface;
 use Shopware\Models\Customer\Group as CustomerGroup;
 use Shopware\Models\Order\Order;
 use Shopware\Models\Shop\Shop;
+use Shopware\Tests\Functional\Helper\Utils;
 use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\CustomerLoginTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 use Shopware_Components_Translation;
+use Shopware_Controllers_Frontend_Checkout;
 use Symfony\Component\HttpFoundation\Request;
 
 class CheckoutTest extends Enlight_Components_Test_Plugin_TestCase
 {
     use ContainerTrait;
+    use CustomerLoginTrait;
+    use DatabaseTransactionBehaviour;
 
     private const PRODUCT_NUMBER = 'SW10239';
     private const USER_AGENT = 'Mozilla/5.0 (Android; Tablet; rv:14.0) Gecko/14.0 Firefox/14.0';
     private const ENGLISH_SHOP_ID = 2;
     private const COUNTRY_SETTINGS_TRANSLATION_KEY = 'config_countries';
+    private const PAYMENT_ID_INVOICE = 4;
+    private const ERROR_MESSAGE_LAST_STOCK = 'Leider können wir den von Ihnen gewünschten Artikel nicht mehr in ausreichender Stückzahl liefern.';
 
     private Connection $connection;
 
+    private sAdmin $adminModule;
+
+    private sBasket $basketModule;
+
     protected function setUp(): void
     {
         $this->connection = $this->getContainer()->get(Connection::class);
+        $this->adminModule = $this->getContainer()->get('modules')->Admin();
+        $this->basketModule = $this->getContainer()->get('modules')->Basket();
         parent::setUp();
     }
 
@@ -135,6 +151,39 @@ public function testAddToBasketReturnsHtml(): void
         $this->getContainer()->get('modules')->Basket()->sDeleteBasket();
     }
 
+    public function testAddProductActionErrorMessages(): void
+    {
+        $this->connection->executeQuery(
+            'UPDATE s_articles_details, s_articles SET s_articles_details.laststock = 1, s_articles.laststock = 1 WHERE s_articles_details.ordernumber = :ordernumber AND s_articles.id = s_articles_details.articleID',
+            [':ordernumber' => self::PRODUCT_NUMBER]
+        );
+
+        $controller = $this->createController();
+        $request = new Enlight_Controller_Request_RequestTestCase();
+        $response = new Enlight_Controller_Response_ResponseTestCase();
+
+        $front = $this->getContainer()->get('front');
+        $front->setRequest($request);
+        $front->setResponse($response);
+
+        $request->setMethod(Request::METHOD_POST);
+        $request->setPost([
+            'sAdd' => self::PRODUCT_NUMBER,
+        ]);
+
+        $controller->setFront($front);
+        $controller->setRequest($request);
+        $controller->setResponse($response);
+        $controller->init();
+        $controller->addArticleAction();
+
+        static::assertTrue($controller->Response()->isRedirect());
+        static::assertSame(302, $controller->Response()->getHttpResponseCode());
+        static::assertStringEndsWith('/index/cart', $response->getHeader('Location'));
+        static::assertSame(self::ERROR_MESSAGE_LAST_STOCK, $this->getContainer()->get('session')->get('sErrorMessages'));
+        static::assertSame(self::ERROR_MESSAGE_LAST_STOCK, $controller->View()->getAssign('sBasketInfo'));
+    }
+
     /**
      * Tests that products can't add to basket over HTTP-GET
      */
@@ -154,7 +203,7 @@ public function testAddBasketOverGetFails(): void
     public function testRequestPaymentWithoutAGB(): void
     {
         // Login
-        $this->loginFrontendUser();
+        $this->loginCustomer();
 
         // Add product to basket
         $this->addBasketProduct(self::USER_AGENT, 5);
@@ -183,7 +232,7 @@ public function testRequestPaymentWithoutAGB(): void
     public function testRequestPaymentWithoutServiceAgreement(): void
     {
         // Login
-        $this->loginFrontendUser();
+        $this->loginCustomer();
 
         // Add product to basket
         $this->addBasketProduct(self::USER_AGENT, 5);
@@ -253,7 +302,7 @@ public function testCartActionWithEnglishTranslationAndWithTranslatedCountrySett
 
     public function testRedirectShippingPaymentPageOnEmptyBasket(): void
     {
-        $this->loginFrontendUser();
+        $this->loginCustomer();
         $this->getContainer()->get('modules')->Basket()->sDeleteBasket();
 
         $this->Request()->setMethod('GET');
@@ -280,6 +329,52 @@ public function testCorrectRenderingOfErrorSnippet(): void
         static::assertStringContainsString('<li>foo</li><li>test</li>', $template);
     }
 
+    public function testIsSetFlagPaymentBlocked(): void
+    {
+        $this->loginCustomer();
+
+        static::assertTrue($this->adminModule->sUpdatePayment(self::PAYMENT_ID_INVOICE));
+
+        $this->connection->insert(
+            's_core_rulesets',
+            [
+                'paymentID' => 4,
+                'rule1' => 'ORDERVALUEMORE',
+                'value1' => 100,
+            ]
+        );
+
+        $this->basketModule->sAddArticle('SW10067');
+        static::assertGreaterThanOrEqual(100, $this->basketModule->sGetAmount()['totalAmount']);
+
+        $basket = $this->getContainer()->get('modules')->Basket()->sGetBasketData();
+        $request = new Enlight_Controller_Request_RequestTestCase();
+        $request->setControllerName('checkout');
+        $front = $this->getContainer()->get('front');
+        $front->setRequest($request);
+        $userData = $this->getContainer()->get('modules')->Admin()->sGetUserData();
+        static::assertIsArray($userData);
+        static::assertTrue($this->getContainer()->get('modules')->Admin()->sManageRisks(self::PAYMENT_ID_INVOICE, $basket, $userData));
+
+        $response = new Enlight_Controller_Response_ResponseTestCase();
+        $controller = $this->getContainer()->get('shopware_controllers_frontend_checkout');
+        $controller->setContainer($this->getContainer());
+        $front->setRequest($request);
+        $front->setResponse($response);
+
+        $controller->setFront($front);
+        $controller->setRequest($request);
+        $controller->setResponse($response);
+        $controller->setView(new Enlight_View_Default(new Enlight_Template_Manager()));
+
+        $controller->init();
+        $controller->ajaxCartAction();
+
+        static::assertTrue($controller->View()->getAssign('paymentBlocked'));
+
+        $this->logOutCustomer();
+    }
+
     /**
      * Compares the calculated price from a basket with the calculated price from \Shopware\Bundle\OrderBundle\Service\CalculationService::recalculateOrderTotals()
      * It does so by creating via the frontend controllers, and comparing the amount (net & gross) with the values provided by
@@ -307,7 +402,7 @@ private function runCheckoutTest(bool $net): void
         // Simulate checkout in frontend
 
         // Login
-        $this->loginFrontendUser();
+        $this->loginCustomer();
 
         // Add product to basket
         $this->addBasketProduct(self::USER_AGENT, 5);
@@ -354,33 +449,11 @@ private function runCheckoutTest(bool $net): void
         $messageNet = 'InvoiceAmountNet' . ($net ? ' (net shop)' : '') . ': ' . $previousInvoiceAmountNet . ' from sBasket, ' . $order->getInvoiceAmountNet() . ' from getInvoiceAmountNet';
 
         // Test that sBasket calculation matches calculateInvoiceAmount
-        static::assertEquals($order->getInvoiceAmount(), $previousInvoiceAmount, $message);
-        static::assertEquals($order->getInvoiceAmountNet(), $previousInvoiceAmountNet, $messageNet);
+        static::assertEqualsWithDelta($order->getInvoiceAmount(), $previousInvoiceAmount, Utils::FORMER_PHPUNIT_FLOAT_EPSILON, $message);
+        static::assertEqualsWithDelta($order->getInvoiceAmountNet(), $previousInvoiceAmountNet, Utils::FORMER_PHPUNIT_FLOAT_EPSILON, $messageNet);
 
         $this->getContainer()->get('modules')->Basket()->sDeleteBasket();
-    }
-
-    /**
-     * Login as a frontend user
-     */
-    private function loginFrontendUser(): void
-    {
-        $user = $this->connection->fetchAssociative(
-            'SELECT id, email, password, subshopID, language FROM s_user WHERE id = 1'
-        );
-        static::assertIsArray($user);
-
-        $shop = $this->getContainer()->get(ModelManager::class)->getRepository(Shop::class)->getActiveById($user['language']);
-        static::assertInstanceOf(Shop::class, $shop);
-
-        $this->getContainer()->get(ShopRegistrationServiceInterface::class)->registerShop($shop);
-
-        $request = new Enlight_Controller_Request_RequestHttp();
-        $request->setPost('email', $user['email']);
-        $request->setPost('passwordMD5', $user['password']);
-        $this->getContainer()->get('front')->setRequest($request);
-        $this->getContainer()->get('session')->set('Admin', true);
-        $this->getContainer()->get('modules')->Admin()->sLogin(true);
+        $this->reset();
     }
 
     /**
@@ -399,4 +472,12 @@ private function addBasketProduct(string $userAgent, int $quantity = 1): string
 
         return $this->getContainer()->get('session')->getId();
     }
+
+    private function createController(): Shopware_Controllers_Frontend_Checkout
+    {
+        $controller = $this->getContainer()->get('shopware_controllers_frontend_checkout');
+        $controller->setView(new Enlight_View_Default(new Enlight_Template_Manager()));
+
+        return $controller;
+    }
 }
diff --git a/tests/Functional/Controllers/Frontend/CustomTest.php b/tests/Functional/Controllers/Frontend/CustomTest.php
index 0150eae196c..46ce9569f5d 100644
--- a/tests/Functional/Controllers/Frontend/CustomTest.php
+++ b/tests/Functional/Controllers/Frontend/CustomTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Frontend;
@@ -30,7 +29,6 @@
 use Enlight_Components_Test_Controller_TestCase as ControllerTestCase;
 use Enlight_Template_Manager;
 use Enlight_View_Default;
-use Shopware\Components\DependencyInjection\Container;
 use Shopware\Tests\Functional\Traits\ContainerTrait;
 use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 use Shopware_Controllers_Frontend_Custom;
@@ -58,7 +56,6 @@ private function getController(): Shopware_Controllers_Frontend_Custom
         $controller->setRequest($this->Request());
 
         $container = $this->getContainer();
-        static::assertInstanceOf(Container::class, $container);
         $controller->setContainer($container);
         $controller->setView(new Enlight_View_Default(new Enlight_Template_Manager()));
 
diff --git a/tests/Functional/Controllers/Frontend/DetailTest.php b/tests/Functional/Controllers/Frontend/DetailTest.php
index 4924e375154..9d52ac93d70 100644
--- a/tests/Functional/Controllers/Frontend/DetailTest.php
+++ b/tests/Functional/Controllers/Frontend/DetailTest.php
@@ -1,59 +1,126 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Frontend;
 
 use Doctrine\DBAL\Connection;
-use Enlight_Components_Test_Controller_TestCase;
+use Enlight_Components_Test_Controller_TestCase as ControllerTestCase;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
 use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 
-class DetailTest extends Enlight_Components_Test_Controller_TestCase
+class DetailTest extends ControllerTestCase
 {
+    use ContainerTrait;
     use DatabaseTransactionBehaviour;
 
+    private const PRODUCT_ID_WITH_SIMILAR_PRODUCTS = 2;
+
+    private Connection $connection;
+
     public function setUp(): void
     {
         parent::setUp();
 
-        $this->connection = Shopware()->Container()->get(Connection::class);
+        $this->connection = $this->getContainer()->get(Connection::class);
+    }
+
+    public function testProductWithSimilarProducts(): void
+    {
+        $this->dispatch('/genusswelten/2/muensterlaender-lagerkorn-32');
+        $product = $this->View()->getAssign('sArticle');
+
+        $similarProducts = $product['sSimilarArticles'];
+
+        static::assertCount(6, $similarProducts);
+    }
+
+    public function testProductWithMaxSimilarProducts(): void
+    {
+        $maxSimilarConfigBefore = (int) $this->getContainer()->get('config')->get('maxcrosssimilar');
+        $maxSimilarConfigNew = 3;
+        static::assertNotSame($maxSimilarConfigNew, $maxSimilarConfigBefore);
+        $this->setConfig('maxcrosssimilar', $maxSimilarConfigNew);
+        $this->dispatch('/genusswelten/2/muensterlaender-lagerkorn-32');
+        $product = $this->View()->getAssign('sArticle');
+
+        $similarProducts = $product['sSimilarArticles'];
+
+        static::assertCount($maxSimilarConfigNew, $similarProducts);
+
+        $this->setConfig('maxcrosssimilar', $maxSimilarConfigBefore);
+    }
+
+    public function testErrorActionShowsDirectSimilarProductsFirst(): void
+    {
+        $similarProductIds = $this->connection->fetchFirstColumn(
+            'SELECT relatedarticle FROM s_articles_similar WHERE articleID = :productId',
+            ['productId' => self::PRODUCT_ID_WITH_SIMILAR_PRODUCTS]
+        );
+        $similarProductIds = array_map('\intval', $similarProductIds);
+
+        $this->Request()->setParam('sArticle', self::PRODUCT_ID_WITH_SIMILAR_PRODUCTS);
+        $this->dispatch('/detail/error');
+        $similarProducts = $this->View()->getAssign('sRelatedArticles');
+
+        $shownSimilarProductIds = array_map('\intval', array_column($similarProducts, 'articleID'));
+
+        foreach ($similarProductIds as $similarProductId) {
+            static::assertContains($similarProductId, $shownSimilarProductIds);
+        }
     }
 
-    public function testDefaultVariant()
+    public function testErrorActionConsiderMaxSimilarProductsConfig(): void
+    {
+        $maxSimilarConfigBefore = (int) $this->getContainer()->get('config')->get('maxcrosssimilar');
+        $maxSimilarConfigNew = 3;
+        static::assertNotSame($maxSimilarConfigNew, $maxSimilarConfigBefore);
+        $this->setConfig('maxcrosssimilar', $maxSimilarConfigNew);
+
+        $this->Request()->setParam('sArticle', self::PRODUCT_ID_WITH_SIMILAR_PRODUCTS);
+        $this->dispatch('/detail/error');
+        $similarProducts = $this->View()->getAssign('sRelatedArticles');
+
+        static::assertCount($maxSimilarConfigNew, $similarProducts);
+
+        $this->setConfig('maxcrosssimilar', $maxSimilarConfigBefore);
+    }
+
+    public function testDefaultVariant(): void
     {
         // Request a variant that is not the default one
-        $this->Request()
-            ->setMethod('POST');
+        $this->Request()->setMethod('POST');
 
         $this->dispatch('/beispiele/konfiguratorartikel/202/artikel-mit-standardkonfigurator?c=22');
 
-        $article = $this->View()->getAssign('sArticle');
+        $product = $this->View()->getAssign('sArticle');
 
-        static::assertEquals('SW10201.2', $article['ordernumber']);
-        static::assertEquals(444, $article['articleDetailsID']);
+        static::assertSame('SW10201.2', $product['ordernumber']);
+        static::assertSame(444, $product['articleDetailsID']);
     }
 
-    public function testNonDefaultVariant()
+    public function testNonDefaultVariant(): void
     {
         // Request a variant that is not the default one
         $this->Request()
@@ -65,32 +132,33 @@ public function testNonDefaultVariant()
 
         $this->dispatch('/beispiele/konfiguratorartikel/202/artikel-mit-standardkonfigurator?c=22');
 
-        $article = $this->View()->getAssign('sArticle');
-        static::assertEquals('SW10201.5', $article['ordernumber']);
-        static::assertEquals('447', $article['articleDetailsID']);
+        $product = $this->View()->getAssign('sArticle');
+        static::assertSame('SW10201.5', $product['ordernumber']);
+        static::assertSame(447, $product['articleDetailsID']);
     }
 
     /**
-     * @param string|null $gtin
-     * @param string      $value
-     *
-     * @dataProvider gtinDataprovider
+     * @dataProvider gtinDataProvider
      */
-    public function testGtins($gtin, $value)
+    public function testGtins(?string $gtin, string $value): void
     {
-        $this->connection->executeUpdate('UPDATE `s_articles_details` SET `ean`=? WHERE `ordernumber`="SW10006"', [$value]);
+        $this->connection->executeStatement("UPDATE `s_articles_details` SET `ean`=? WHERE `ordernumber`='SW10006'", [$value]);
 
-        $response = $this->dispatch('/genusswelten/edelbraende/6/cigar-special-40');
+        $body = $this->dispatch('/genusswelten/edelbraende/6/cigar-special-40')->getBody();
+        static::assertIsString($body);
 
-        if ($gtin) {
-            static::assertStringContainsString($gtin, $response->getBody());
-            static::assertStringContainsString('"' . trim($value) . '"', $response->getBody());
+        if (\is_string($gtin)) {
+            static::assertStringContainsString($gtin, $body);
+            static::assertStringContainsString(\sprintf('"%s"', trim($value)), $body);
         } else {
-            static::assertStringNotContainsString(trim($value), $response->getBody());
+            static::assertStringNotContainsString(trim($value), $body);
         }
     }
 
-    public function gtinDataprovider()
+    /**
+     * @return list<array{gtin: string|null, value: string}>
+     */
+    public function gtinDataProvider(): array
     {
         return [
             ['gtin' => 'gtin8', 'value' => '12345678'],
@@ -105,14 +173,21 @@ public function gtinDataprovider()
         ];
     }
 
-    public function testProductQuickView()
+    public function testProductQuickView(): void
     {
-        $dbal = Shopware()->Container()->get('dbal_connection');
-        $ordernumber_export = 't3st' . mt_rand(1000, 9999);
-        $ordernumber = 'SW10170';
-        $dbal->insert('s_addon_premiums', ['startprice' => 0, 'ordernumber' => $ordernumber, 'ordernumber_export' => $ordernumber_export, 'subshopID' => 0]);
-        $this->dispatch('/detail/productQuickView?ordernumber=' . $ordernumber_export);
-        $sArticle = $this->View()->getAssign('sArticle');
-        static::assertEquals($ordernumber, $sArticle['ordernumber']);
+        $orderNumberExport = 't3st' . mt_rand(1000, 9999);
+        $orderNumber = 'SW10170';
+        $this->connection->insert(
+            's_addon_premiums',
+            [
+                'startprice' => 0,
+                'ordernumber' => $orderNumber,
+                'ordernumber_export' => $orderNumberExport,
+                'subshopID' => 0,
+            ]
+        );
+        $this->dispatch('/detail/productQuickView?ordernumber=' . $orderNumberExport);
+        $product = $this->View()->getAssign('sArticle');
+        static::assertSame($orderNumber, $product['ordernumber']);
     }
 }
diff --git a/tests/Functional/Controllers/Frontend/ExpectResourceNotFoundExceptionTest.php b/tests/Functional/Controllers/Frontend/ExpectResourceNotFoundExceptionTest.php
index d9ad1f0b615..240459d0a88 100644
--- a/tests/Functional/Controllers/Frontend/ExpectResourceNotFoundExceptionTest.php
+++ b/tests/Functional/Controllers/Frontend/ExpectResourceNotFoundExceptionTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Frontend;
@@ -62,14 +61,14 @@ public function testListingIndexExpectedResourceNotFoundException(): void
         $this->getContainer()->get('dbal_connection')->executeStatement($sql);
 
         $this->expectException(ResourceNotFoundException::class);
-        $this->expectErrorMessage('Category not found. The request comes from: "notFound". Module: "frontend", Controller: "listing", Action: "index"');
+        $this->expectExceptionMessage('Category not found. The request comes from: "notFound". Module: "frontend", Controller: "listing", Action: "index"');
         $this->dispatch('/cat/?sCategory=312', true);
     }
 
     public function testCustomIndexExpectedResourceNotFoundException(): void
     {
         $this->expectException(ResourceNotFoundException::class);
-        $this->expectErrorMessage('Custom page not found. The request comes from: "notFound". Module: "frontend", Controller: "custom", Action: "index"');
+        $this->expectExceptionMessage('Custom page not found. The request comes from: "notFound". Module: "frontend", Controller: "custom", Action: "index"');
         $this->dispatch('/custom/?sCustom=312', true);
     }
 }
diff --git a/tests/Functional/Controllers/Frontend/FormTest.php b/tests/Functional/Controllers/Frontend/FormTest.php
index aa3731b4cda..4e2f94c1396 100644
--- a/tests/Functional/Controllers/Frontend/FormTest.php
+++ b/tests/Functional/Controllers/Frontend/FormTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Frontend;
diff --git a/tests/Functional/Controllers/Frontend/ListingTest.php b/tests/Functional/Controllers/Frontend/ListingTest.php
index df961aaf014..0dff617ed71 100644
--- a/tests/Functional/Controllers/Frontend/ListingTest.php
+++ b/tests/Functional/Controllers/Frontend/ListingTest.php
@@ -1,58 +1,69 @@
 <?php
 
 declare(strict_types=1);
-
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Frontend;
 
 use Doctrine\DBAL\Connection;
-use Enlight_Components_Test_Controller_TestCase;
+use Enlight_Components_Test_Controller_TestCase as ControllerTestCase;
 use Enlight_Controller_Exception;
+use Shopware\Components\Model\ModelManager;
+use Shopware\Models\Article\Article as Product;
 use Shopware\Models\Category\Category;
 use Shopware\Tests\Functional\Traits\ContainerTrait;
 use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
+use Symfony\Component\HttpFoundation\Response;
 
-class ListingTest extends Enlight_Components_Test_Controller_TestCase
+class ListingTest extends ControllerTestCase
 {
     use ContainerTrait;
     use DatabaseTransactionBehaviour;
 
+    private const CATEGORY_LINK = '/cat/?sCategory=%s';
+
+    private ModelManager $modelManager;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->modelManager = $this->getContainer()->get(ModelManager::class);
+    }
+
     /**
      * Test that requesting an existing category-id is successful
      */
     public function testDispatchExistingCategory(): void
     {
-        $this->dispatch('/cat/?sCategory=14');
-        static::assertEquals(200, $this->Response()->getHttpResponseCode());
+        $this->dispatch(\sprintf(self::CATEGORY_LINK, 14));
+        static::assertSame(Response::HTTP_OK, $this->Response()->getHttpResponseCode());
     }
 
     public function testDispatchExistingCategoryWithPageNotAvailable(): void
     {
         $this->expectException(Enlight_Controller_Exception::class);
-        $this->dispatch('/cat/?sCategory=14&sPage=2');
-        static::assertEquals(200, $this->Response()->getHttpResponseCode());
+        $this->dispatch(\sprintf(self::CATEGORY_LINK . '&sPage=2', 14));
+        static::assertSame(Response::HTTP_OK, $this->Response()->getHttpResponseCode());
     }
 
     /**
@@ -61,8 +72,8 @@ public function testDispatchExistingCategoryWithPageNotAvailable(): void
     public function testDispatchNonExistingCategory(): void
     {
         $this->expectException('Enlight_Exception');
-        $this->dispatch('/cat/?sCategory=4711');
-        static::assertEquals(404, $this->Response()->getHttpResponseCode());
+        $this->dispatch(\sprintf(self::CATEGORY_LINK, 4711));
+        static::assertSame(Response::HTTP_NOT_FOUND, $this->Response()->getHttpResponseCode());
         static::assertTrue($this->Response()->isRedirect());
     }
 
@@ -72,8 +83,8 @@ public function testDispatchNonExistingCategory(): void
     public function testDispatchEmptyCategoryId(): void
     {
         $this->expectException('Enlight_Exception');
-        $this->dispatch('/cat/?sCategory=');
-        static::assertEquals(404, $this->Response()->getHttpResponseCode());
+        $this->dispatch(\sprintf(self::CATEGORY_LINK, ''));
+        static::assertSame(Response::HTTP_NOT_FOUND, $this->Response()->getHttpResponseCode());
         static::assertTrue($this->Response()->isRedirect());
     }
 
@@ -83,8 +94,8 @@ public function testDispatchEmptyCategoryId(): void
     public function testDispatchSubshopCategoryId(): void
     {
         $this->expectException('Enlight_Exception');
-        $this->dispatch('/cat/?sCategory=43');
-        static::assertEquals(404, $this->Response()->getHttpResponseCode());
+        $this->dispatch(\sprintf(self::CATEGORY_LINK, 43));
+        static::assertSame(Response::HTTP_NOT_FOUND, $this->Response()->getHttpResponseCode());
         static::assertTrue($this->Response()->isRedirect());
     }
 
@@ -94,11 +105,63 @@ public function testDispatchSubshopCategoryId(): void
     public function testDispatchBlogCategory(): void
     {
         $this->expectException('Enlight_Exception');
-        $this->dispatch('/cat/?sCategory=17');
-        static::assertEquals(404, $this->Response()->getHttpResponseCode());
+        $this->dispatch(\sprintf(self::CATEGORY_LINK, 17));
+        static::assertSame(Response::HTTP_NOT_FOUND, $this->Response()->getHttpResponseCode());
         static::assertTrue($this->Response()->isRedirect());
     }
 
+    public function testExternalLink(): void
+    {
+        $externalLink = 'https://www.google.com';
+
+        $category = $this->createNewCategory();
+        $category->setExternal($externalLink);
+        $this->modelManager->persist($category);
+        $this->modelManager->flush($category);
+
+        $this->dispatch(\sprintf(self::CATEGORY_LINK, $category->getId()));
+
+        static::assertSame(Response::HTTP_MOVED_PERMANENTLY, $this->Response()->getHttpResponseCode());
+        static::assertTrue($this->Response()->isRedirect());
+
+        static::assertStringContainsString($externalLink, $this->Response()->getHeader('location'));
+    }
+
+    public function testCategoryRedirectToProductDetailPageDirectly(): void
+    {
+        $this->setConfig('categoryDetailLink', true);
+
+        $category = $this->createNewCategory();
+        $this->modelManager->persist($category);
+        $this->modelManager->flush($category);
+
+        $product = $this->modelManager->getRepository(Product::class)->findOneBy([
+            'active' => true,
+            'name' => 'Emmelkamp Holunder Likör 18%',
+        ]);
+
+        static::assertInstanceOf(Product::class, $product);
+
+        $productCategories = $product->getCategories();
+        $productCategories->add($category);
+        $product->setCategories($productCategories);
+
+        $this->modelManager->persist($product);
+        $this->modelManager->flush($product);
+        $this->modelManager->clear();
+
+        $this->dispatch(\sprintf(self::CATEGORY_LINK, $category->getId()));
+
+        static::assertSame(Response::HTTP_MOVED_PERMANENTLY, $this->Response()->getHttpResponseCode());
+        static::assertTrue($this->Response()->isRedirect());
+
+        $firstSpace = strpos($product->getName(), ' ');
+        static::assertIsInt($firstSpace);
+        $firstPartOfProductName = strtolower(substr($product->getName(), 0, $firstSpace));
+
+        static::assertStringContainsString($firstPartOfProductName, $this->Response()->getHeader('location'));
+    }
+
     /**
      * Test the home redirect if the base category called directly
      * The request should return a 301 redirection to the base homepage.
@@ -111,9 +174,9 @@ public function testHomeRedirect(): void
         static::assertInstanceOf(Category::class, $mainCategory);
         $mainCategoryId = $mainCategory->getId();
 
-        $this->dispatch(sprintf('/cat/index/sCategory/%s', $mainCategoryId));
+        $this->dispatch(\sprintf(self::CATEGORY_LINK, $mainCategoryId));
 
-        static::assertEquals(301, $this->Response()->getHttpResponseCode());
+        static::assertSame(Response::HTTP_MOVED_PERMANENTLY, $this->Response()->getHttpResponseCode());
     }
 
     public function testManufacturerPage(): void
@@ -158,11 +221,24 @@ public function testCategoryWithProductStream(): void
         $connection->executeStatement($createCategoryWithStreamSQL, ['streamId' => $streamId]);
         $categoryId = (int) $connection->lastInsertId();
 
-        $this->dispatch(sprintf('/cat/?sCategory=%d', $categoryId));
+        $this->dispatch(\sprintf(self::CATEGORY_LINK, $categoryId));
 
-        static::assertEquals(200, $this->Response()->getHttpResponseCode());
+        static::assertSame(Response::HTTP_OK, $this->Response()->getHttpResponseCode());
         $responseBody = $this->Response()->getBody();
         static::assertIsString($responseBody);
         static::assertStringContainsString('filter-panel--content', $responseBody, 'No filters available in the HTML');
     }
+
+    private function createNewCategory(): Category
+    {
+        $mainCategory = $this->modelManager->find(Category::class, 3);
+        static::assertInstanceOf(Category::class, $mainCategory);
+
+        $category = new Category();
+        $category->setName('Test');
+        $category->setParent($mainCategory);
+        $category->setActive(true);
+
+        return $category;
+    }
 }
diff --git a/tests/Functional/Controllers/Frontend/RegisterWithCaptchaTest.php b/tests/Functional/Controllers/Frontend/RegisterWithCaptchaTest.php
index 36c917e7914..b824d5719a2 100644
--- a/tests/Functional/Controllers/Frontend/RegisterWithCaptchaTest.php
+++ b/tests/Functional/Controllers/Frontend/RegisterWithCaptchaTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Frontend;
@@ -30,10 +29,12 @@
 use Enlight_Components_Test_Plugin_TestCase;
 use Shopware\Components\Captcha\DefaultCaptcha;
 use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 
 class RegisterWithCaptchaTest extends Enlight_Components_Test_Plugin_TestCase
 {
     use ContainerTrait;
+    use DatabaseTransactionBehaviour;
 
     private const USER_AGENT = 'Mozilla/5.0 (Android; Tablet; rv:14.0) Gecko/14.0 Firefox/14.0';
 
@@ -158,7 +159,7 @@ public function testInvalidDefault(): void
 
     private function saveRegisterCaptchaConfig(string $value): void
     {
-        $formattedValue = sprintf('s:%d:"%s";', \strlen($value), $value);
+        $formattedValue = \sprintf('s:%d:"%s";', \strlen($value), $value);
         $this->getContainer()->get(Connection::class)->executeQuery(
             'UPDATE s_core_config_elements SET value = ? WHERE name = ?',
             [$formattedValue, 'registerCaptcha']
diff --git a/tests/Functional/Controllers/Frontend/ResetPasswordWithCaptchaTest.php b/tests/Functional/Controllers/Frontend/ResetPasswordWithCaptchaTest.php
index 389122b50ad..ca7bb2a4ac4 100644
--- a/tests/Functional/Controllers/Frontend/ResetPasswordWithCaptchaTest.php
+++ b/tests/Functional/Controllers/Frontend/ResetPasswordWithCaptchaTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Frontend;
@@ -154,7 +153,7 @@ public function testInvalidHoneypot(): void
 
     private function savePasswordResetCaptchaConfig(string $value): void
     {
-        $formattedValue = sprintf('s:%d:"%s";', \strlen($value), $value);
+        $formattedValue = \sprintf('s:%d:"%s";', \strlen($value), $value);
         $this->getContainer()->get(Connection::class)->executeQuery(
             'UPDATE s_core_config_elements SET value = ? WHERE name = ?',
             [$formattedValue, 'passwordResetCaptcha']
diff --git a/tests/Functional/Controllers/Frontend/RobotsTxtTest.php b/tests/Functional/Controllers/Frontend/RobotsTxtTest.php
index 90a0793f162..46664842467 100644
--- a/tests/Functional/Controllers/Frontend/RobotsTxtTest.php
+++ b/tests/Functional/Controllers/Frontend/RobotsTxtTest.php
@@ -1,28 +1,26 @@
 <?php
 
 declare(strict_types=1);
-
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Frontend;
diff --git a/tests/Functional/Controllers/Frontend/SearchTest.php b/tests/Functional/Controllers/Frontend/SearchTest.php
index 00ca943e45d..786a5a77284 100644
--- a/tests/Functional/Controllers/Frontend/SearchTest.php
+++ b/tests/Functional/Controllers/Frontend/SearchTest.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Frontend;
@@ -35,25 +36,32 @@ public function tearDown(): void
         parent::tearDown();
     }
 
-    public function testAjaxSearch()
+    public function testAjaxSearch(): void
     {
         $this->dispatch('ajax_search?sSearch=ipad');
 
         // Check for valid markup
-        // Ignore whitespace, since this testcase checks wether the list is structured correctly (li following ul)
+        // Ignore whitespace, since this testcase checks whether the list is structured correctly (li following ul)
         self::assertStringContainsStringIgnoringWhitespace(
             '<ul class="results--list"> <li class="list--entry',
-            $this->Response()->getBody()
+            $this->getResponseContent()
         );
         // Check for expected search link and number of results
         self::assertStringContainsStringIgnoringWhitespace(
-            '/search?sSearch=ipad" class="search-result--link entry--all-results-link block"> <i class="icon--arrow-right"></i> Alle Ergebnisse anzeigen </a> <span class="entry--all-results-number block"> 1 Treffer </span>',
-            $this->Response()->getBody()
+            '/search?sSearch=ipad" class="search-result--link entry--all-results-link block"',
+            $this->getResponseContent()
+        );
+
+        // Split up because of post filter
+        self::assertStringContainsStringIgnoringWhitespace(
+            '> <i class="icon--arrow-right"></i> Alle Ergebnisse anzeigen </a> <span class="entry--all-results-number block"> 1 Treffer </span>',
+            $this->getResponseContent()
         );
+
         // Check for expected name and price
         self::assertStringContainsStringIgnoringWhitespace(
             ' alt="iPadtasche mit Stiftmappe" class="media--image"> </span> <span class="entry--name block"> iPadtasche mit Stiftmappe </span> <span class="entry--price block"> <div class="product--price"> <span class="price--default is--nowrap"> 39,99&nbsp;&euro; * </span> </div> <div class="price--unit" title="Inhalt"> </div> </span> </a> </li> <li class="entry--all-results block-group result--item">',
-            $this->Response()->getBody()
+            $this->getResponseContent()
         );
 
         $this->Response()->clearBody();
@@ -71,10 +79,10 @@ public function testAjaxSearch()
         $body = $this->Response()->getBody();
 
         static::assertIsString($body);
-        static::assertStringNotContainsStringIgnoringCase('an error has occured', $body); // Check for error-handler response as well, which would fake a HTTP 200 OK response
+        static::assertStringNotContainsStringIgnoringCase('an error has occurred', $body); // Check for error-handler response as well, which would fake a HTTP 200 OK response
         static::assertStringNotContainsStringIgnoringCase('ein fehler ist aufgetreten', $body);
 
-        //search for an emoji, might not be displayed correctly in IDE
+        // search for an emoji, might not be displayed correctly in IDE
         $this->Response()->clearBody();
         $this->dispatch('ajax_search?sSearch=👨‍🚒');
 
@@ -83,25 +91,28 @@ public function testAjaxSearch()
         $body = $this->Response()->getBody();
 
         static::assertIsString($body);
-        static::assertStringNotContainsStringIgnoringCase('an error has occured', $body); // Check for error-handler response as well, which would fake a HTTP 200 OK response
+        static::assertStringNotContainsStringIgnoringCase('an error has occurred', $body); // Check for error-handler response as well, which would fake a HTTP 200 OK response
         static::assertStringNotContainsStringIgnoringCase('ein fehler ist aufgetreten', $body);
     }
 
     /**
      * @dataProvider searchTermProvider
      */
-    public function testSearchEscapes(string $term, string $filtered)
+    public function testSearchEscapes(string $term, string $filtered): void
     {
-        $this->dispatch(sprintf('search?sSearch=%s', $term));
+        $this->dispatch(\sprintf('search?sSearch=%s', $term));
 
         $body = $this->Response()->getBody();
 
         static::assertIsString($body);
-        static::assertStringContainsString($filtered, $body, sprintf('Expected filtered term "%s" not found on search page', $filtered));
-        static::assertStringNotContainsString($term, $body, sprintf('Malicious term "%s" found on search page', $term));
+        static::assertStringContainsString($filtered, $body, \sprintf('Expected filtered term "%s" not found on search page', $filtered));
+        static::assertStringNotContainsString($term, $body, \sprintf('Malicious term "%s" found on search page', $term));
     }
 
-    public function searchTermProvider()
+    /**
+     * @return list<list<string>>
+     */
+    public function searchTermProvider(): array
     {
         return [
             ['"Apostrophes"', htmlentities(strip_tags('"Apostrophes"'))],
@@ -120,12 +131,20 @@ public function searchTermProvider()
         ];
     }
 
-    private static function assertStringContainsStringIgnoringWhitespace(string $needle, string $haystack, string $message = ''): void
+    private static function assertStringContainsStringIgnoringWhitespace(string $needle, string $haystack): void
     {
-        static::assertStringContainsString(
-            preg_replace('/\s/', '', $needle),
-            preg_replace('/\s/', '', $haystack),
-            $message
-        );
+        $needle = preg_replace('/\s/', '', $needle);
+        static::assertIsString($needle);
+        $haystack = preg_replace('/\s/', '', $haystack);
+        static::assertIsString($haystack);
+        static::assertStringContainsString($needle, $haystack);
+    }
+
+    private function getResponseContent(): string
+    {
+        $content = $this->Response()->getBody();
+        static::assertIsString($content);
+
+        return $content;
     }
 }
diff --git a/tests/Functional/Controllers/Frontend/SitemapTest.php b/tests/Functional/Controllers/Frontend/SitemapTest.php
index f8057c2e63e..9e03f318a04 100644
--- a/tests/Functional/Controllers/Frontend/SitemapTest.php
+++ b/tests/Functional/Controllers/Frontend/SitemapTest.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Frontend;
@@ -28,25 +29,29 @@
 use Enlight_Components_Test_Controller_TestCase;
 use Enlight_Template_Manager;
 use Enlight_View_Default;
+use Shopware\Components\Model\ModelManager;
 use Shopware\Components\ShopRegistrationServiceInterface;
 use Shopware\Models\Shop\Shop;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
 use Shopware_Controllers_Frontend_Sitemap;
 
 class SitemapTest extends Enlight_Components_Test_Controller_TestCase
 {
+    use ContainerTrait;
+
     public static function tearDownAfterClass(): void
     {
         Shopware()->Container()->get(ShopRegistrationServiceInterface::class)->registerShop(Shopware()->Models()->getRepository(Shop::class)->getActiveDefault());
     }
 
     /**
-     * @param int $shopId
-     *
      * @dataProvider sitemapDataprovider
      */
-    public function testIndex($shopId, array $sitemapData)
+    public function testIndex(int $shopId, array $sitemapData): void
     {
-        Shopware()->Container()->get(ShopRegistrationServiceInterface::class)->registerShop(Shopware()->Models()->getRepository(Shop::class)->find($shopId));
+        $shop = $this->getContainer()->get(ModelManager::class)->getRepository(Shop::class)->find($shopId);
+        static::assertInstanceOf(Shop::class, $shop);
+        $this->getContainer()->get(ShopRegistrationServiceInterface::class)->registerShop($shop);
 
         $controller = $this->getController();
         $controller->indexAction();
@@ -69,10 +74,7 @@ public function testIndex($shopId, array $sitemapData)
         }
     }
 
-    /**
-     * @return array
-     */
-    public function sitemapDataprovider()
+    public function sitemapDataprovider(): array
     {
         return [
             [
@@ -104,18 +106,15 @@ public function sitemapDataprovider()
         ];
     }
 
-    /**
-     * @return Shopware_Controllers_Frontend_Sitemap
-     */
-    private function getController()
+    private function getController(): Shopware_Controllers_Frontend_Sitemap
     {
-        /** @var Shopware_Controllers_Frontend_Sitemap $controller */
         $controller = Enlight_Class::Instance(Shopware_Controllers_Frontend_Sitemap::class, [
             $this->Request(),
             $this->Response(),
         ]);
+        static::assertInstanceOf(Shopware_Controllers_Frontend_Sitemap::class, $controller);
 
-        $controller->setContainer(Shopware()->Container());
+        $controller->setContainer($this->getContainer());
         $controller->setView(new Enlight_View_Default(new Enlight_Template_Manager()));
 
         return $controller;
diff --git a/tests/Functional/Controllers/Frontend/SitemapXmlTest.php b/tests/Functional/Controllers/Frontend/SitemapXmlTest.php
deleted file mode 100644
index a3842facd24..00000000000
--- a/tests/Functional/Controllers/Frontend/SitemapXmlTest.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Tests\Functional\Controllers\Frontend;
-
-use Enlight_Components_Test_Controller_TestCase;
-
-class SitemapXmlTest extends Enlight_Components_Test_Controller_TestCase
-{
-    public function testIndex()
-    {
-        $this->dispatch('/SitemapXml');
-
-        static::assertEquals(302, $this->Response()->getHttpResponseCode());
-    }
-}
diff --git a/tests/Functional/Controllers/Frontend/fixtures/captchaRequest.php b/tests/Functional/Controllers/Frontend/fixtures/captchaRequest.php
index a12cd004786..1b6f44c4a97 100644
--- a/tests/Functional/Controllers/Frontend/fixtures/captchaRequest.php
+++ b/tests/Functional/Controllers/Frontend/fixtures/captchaRequest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 return [
@@ -29,31 +29,31 @@
     'sTarget' => 'account',
     'sTargetAction' => 'index',
     'register' => [
-            'personal' => [
-                    'customer_type' => 'private',
-                    'salutation' => 'mr',
-                    'firstname' => 'Rainer',
-                    'lastname' => 'Zufall',
-                    'accountmode' => '0',
-                    'email' => 'RainerZufall@' . uniqid() . '.com',
-                    'password' => 'randomPassword',
-                ],
-            'billing' => [
-                    'street' => 'Zur Hölle',
-                    'zipcode' => '25836',
-                    'city' => 'Nordpol',
-                    'country' => '2',
-                ],
-            'shipping' => [
-                    'company' => '',
-                    'department' => '',
-                    'firstname' => '',
-                    'lastname' => '',
-                    'street' => '',
-                    'zipcode' => '',
-                    'city' => '',
-                ],
+        'personal' => [
+            'customer_type' => 'private',
+            'salutation' => 'mr',
+            'firstname' => 'Rainer',
+            'lastname' => 'Zufall',
+            'accountmode' => '0',
+            'email' => 'RainerZufall@' . uniqid() . '.com',
+            'password' => 'randomPassword',
+        ],
+        'billing' => [
+            'street' => 'Zur Hölle',
+            'zipcode' => '25836',
+            'city' => 'Nordpol',
+            'country' => '2',
+        ],
+        'shipping' => [
+            'company' => '',
+            'department' => '',
+            'firstname' => '',
+            'lastname' => '',
+            'street' => '',
+            'zipcode' => '',
+            'city' => '',
         ],
+    ],
     'first_name_confirmation' => '',
     'Submit' => '',
 ];
diff --git a/tests/Functional/Controllers/Widgets/IndexTest.php b/tests/Functional/Controllers/Widgets/IndexTest.php
index 18136d52c84..fe283bac525 100644
--- a/tests/Functional/Controllers/Widgets/IndexTest.php
+++ b/tests/Functional/Controllers/Widgets/IndexTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Widgets;
@@ -31,7 +31,7 @@ class IndexTest extends Enlight_Components_Test_Controller_TestCase
     /**
      * @ticket SW-8127
      */
-    public function testShopMenu()
+    public function testShopMenu(): void
     {
         $this->dispatch('/Widgets/Index/shopMenu');
         static::assertEquals(200, $this->Response()->getHttpResponseCode());
diff --git a/tests/Functional/Controllers/Widgets/ListingTest.php b/tests/Functional/Controllers/Widgets/ListingTest.php
index 86342cd94da..406412cac77 100644
--- a/tests/Functional/Controllers/Widgets/ListingTest.php
+++ b/tests/Functional/Controllers/Widgets/ListingTest.php
@@ -5,33 +5,29 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Widgets;
 
 use Enlight_Controller_Request_RequestTestCase;
 use Enlight_Controller_Response_ResponseTestCase;
-use Enlight_Template_Manager;
-use Enlight_View_Default;
 use PHPUnit\Framework\TestCase;
-use Shopware\Components\DependencyInjection\Container;
 use Shopware\Tests\Functional\Bundle\StoreFrontBundle\Helper;
 use Shopware\Tests\Functional\Traits\ContainerTrait;
 use Shopware_Controllers_Widgets_Listing as ListingController;
@@ -65,12 +61,10 @@ public function testListingCountActionWithHTMLInFacets(): void
 
         $controller->listingCountAction();
 
-        $controller->View()->addTemplateDir(__DIR__ . '/../../../../themes/Frontend/Bare', 'test');
-
         $html = $controller->View()->fetch('widgets/listing/listing_count.tpl');
 
         preg_match('/<div id="facets">(.*?)<\/div>/s', $html, $match);
-        $facetsJson = trim($match[1]);
+        $facetsJson = trim($match[1] ?? '');
         $facets = json_decode(htmlspecialchars_decode($facetsJson, ENT_QUOTES), true);
         static::assertIsArray($facets);
 
@@ -84,6 +78,28 @@ public function testListingCountActionWithHTMLInFacets(): void
         static::fail('Test facet not found');
     }
 
+    public function testListingCountActionHasProducts(): void
+    {
+        $controller = $this->getController();
+        $controller->Request()->setParam('sCategory', '14');
+        $controller->Request()->setParam('loadProducts', '1');
+
+        $controller->listingCountAction();
+
+        $viewAssigns = $controller->View()->getAssign();
+        static::assertTrue($viewAssigns['listing']);
+        static::assertTrue($viewAssigns['pagination']);
+        $response = $controller->Response();
+        static::assertInstanceOf(Enlight_Controller_Response_ResponseTestCase::class, $response);
+        static::assertSame('12', $response->getHeader('Shopware-Listing-Total'));
+
+        $html = $controller->View()->fetch('widgets/listing/listing_count.tpl');
+        static::assertStringContainsString('<div id="result">', $html);
+        static::assertStringContainsString('<div id="listing">', $html);
+        static::assertStringContainsString('<div id="pagination">', $html);
+        static::assertStringContainsString('<div class="product--box box--basic"', $html);
+    }
+
     private function getController(): ListingController
     {
         $controller = new ListingController();
@@ -94,15 +110,15 @@ private function getController(): ListingController
         $front = $this->getContainer()->get('front');
         $front->setRequest($request);
         $front->setResponse($response);
+        $front->Plugins()->load('ViewRenderer');
 
         $container = $this->getContainer();
-        static::assertInstanceOf(Container::class, $container);
 
         $controller->setContainer($container);
         $controller->setFront($front);
         $controller->setRequest($request);
         $controller->setResponse($response);
-        $controller->setView(new Enlight_View_Default(new Enlight_Template_Manager()));
+        $controller->initController($controller->Request(), $controller->Response());
 
         return $controller;
     }
diff --git a/tests/Functional/Controllers/Widgets/Stub/TestFacet.php b/tests/Functional/Controllers/Widgets/Stub/TestFacet.php
index 0979df8c461..e393f68f115 100644
--- a/tests/Functional/Controllers/Widgets/Stub/TestFacet.php
+++ b/tests/Functional/Controllers/Widgets/Stub/TestFacet.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Widgets\Stub;
diff --git a/tests/Functional/Controllers/Widgets/Stub/TestHydrator.php b/tests/Functional/Controllers/Widgets/Stub/TestHydrator.php
index 9d9f6a77a93..9a5ee947a8c 100644
--- a/tests/Functional/Controllers/Widgets/Stub/TestHydrator.php
+++ b/tests/Functional/Controllers/Widgets/Stub/TestHydrator.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Controllers\Widgets\Stub;
diff --git a/tests/Functional/Core/AdminSGetUserDataTest.php b/tests/Functional/Core/AdminSGetUserDataTest.php
index ada2a6e8d1a..cf6ff6a3c61 100644
--- a/tests/Functional/Core/AdminSGetUserDataTest.php
+++ b/tests/Functional/Core/AdminSGetUserDataTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Core;
diff --git a/tests/Functional/Core/AdminTest.php b/tests/Functional/Core/AdminTest.php
index 4c0334e5253..eb57b616313 100644
--- a/tests/Functional/Core/AdminTest.php
+++ b/tests/Functional/Core/AdminTest.php
@@ -5,48 +5,66 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Core;
 
 use DateTime;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\DBAL\Connection;
 use Enlight_Components_Session_Namespace;
 use Enlight_Controller_Front;
 use Enlight_Controller_Request_Request;
 use Enlight_Controller_Request_RequestHttp;
+use Enlight_Controller_Request_RequestTestCase;
+use Enlight_Controller_Response_ResponseTestCase;
+use Generator;
 use PHPUnit\Framework\TestCase;
 use sAdmin;
 use sBasket;
 use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface;
+use Shopware\Components\Api\Resource\Customer as CustomerResource;
 use Shopware\Components\Model\ModelManager;
+use Shopware\Components\Random;
 use Shopware\Models\Customer\Customer;
+use Shopware\Models\Customer\Group;
+use Shopware\Models\Dispatch\Dispatch;
 use Shopware\Models\Payment\Payment;
+use Shopware\Models\Tax\Rule;
+use Shopware\Models\Tax\Tax;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
 use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
+use Shopware\Tests\TestReflectionHelper;
 use Shopware_Components_Config;
 use Shopware_Components_Snippet_Manager;
 use ShopwarePlugin\PaymentMethods\Components\BasePaymentMethod;
+use Symfony\Component\HttpFoundation\Cookie;
+use Symfony\Component\HttpFoundation\Response;
 
 class AdminTest extends TestCase
 {
+    use ContainerTrait;
     use DatabaseTransactionBehaviour;
 
+    private const DEFAULT_SHIPPING_METHOD_ID = 9;
+    private const DEFAULT_CUSTOMER_GROUP_ID = 1;
+
     private sAdmin $module;
 
     private sBasket $basketModule;
@@ -59,34 +77,32 @@ class AdminTest extends TestCase
 
     private Enlight_Controller_Front $front;
 
+    private Connection $connection;
+
     public function setUp(): void
     {
         parent::setUp();
 
-        Shopware()->Container()->get(ModelManager::class)->clear();
-        Shopware()->Front()->setRequest(new Enlight_Controller_Request_RequestHttp());
-
-        $this->module = Shopware()->Modules()->Admin();
-        $this->config = Shopware()->Config();
-        $this->session = Shopware()->Session();
-        $this->front = Shopware()->Front();
-        $this->snippetManager = Shopware()->Snippets();
-        $this->basketModule = Shopware()->Modules()->Basket();
-        $systemModule = Shopware()->System();
-        $systemModule->sCurrency = Shopware()->Db()->fetchRow('SELECT * FROM s_core_currencies WHERE currency LIKE "EUR"');
-        $systemModule->sSESSION_ID = null;
+        $this->getContainer()->get(ModelManager::class)->clear();
+        $this->getContainer()->get('front')->setRequest(new Enlight_Controller_Request_RequestTestCase());
+        $this->getContainer()->get('front')->setResponse(new Enlight_Controller_Response_ResponseTestCase());
+
+        $this->module = $this->getContainer()->get('modules')->Admin();
+        $this->config = $this->getContainer()->get('config');
+        $this->session = $this->getContainer()->get('session');
+        $this->front = $this->getContainer()->get('front');
+        $this->snippetManager = $this->getContainer()->get('snippets');
+        $this->basketModule = $this->getContainer()->get('modules')->Basket();
+        $this->connection = $this->getContainer()->get(Connection::class);
         $this->session->offsetSet('sessionId', null);
     }
 
     protected function tearDown(): void
     {
         parent::tearDown();
-        Shopware()->Container()->get(ModelManager::class)->clear();
+        $this->getContainer()->get(ModelManager::class)->clear();
     }
 
-    /**
-     * @covers \sAdmin::sGetPaymentMeanById
-     */
     public function testsGetPaymentMeanById(): void
     {
         // Fetching non-existing payment means returns null
@@ -118,15 +134,12 @@ public function testsGetPaymentMeanById(): void
 
         $customer = $this->createDummyCustomer();
 
-        static::assertEquals($this->config->get('defaultPayment'), $customer->getPaymentId());
+        static::assertSame((int) $this->config->get('defaultPayment'), $customer->getPaymentId());
 
         $this->deleteDummyCustomer($customer);
         $this->session->offsetSet('sUserId', null);
     }
 
-    /**
-     * @covers \sAdmin::sGetPaymentMeans
-     */
     public function testsGetPaymentMeans(): void
     {
         foreach ($this->module->sGetPaymentMeans() as $paymentMean) {
@@ -142,19 +155,18 @@ public function testsGetPaymentMeans(): void
         }
     }
 
-    /**
-     * @covers \sAdmin::sInitiatePaymentClass
-     */
     public function testsInitiatePaymentClass(): void
     {
-        $payments = Shopware()->Models()->getRepository(Payment::class)->findAll();
+        $payments = $this->getContainer()->get(ModelManager::class)->getRepository(Payment::class)->findAll();
 
         foreach ($payments as $payment) {
             $paymentClass = $this->module->sInitiatePaymentClass($this->module->sGetPaymentMeanById($payment->getId()));
             static::assertInstanceOf(BasePaymentMethod::class, $paymentClass);
-            Shopware()->Front()->setRequest(new Enlight_Controller_Request_RequestHttp());
+            $this->getContainer()->get('front')->setRequest(new Enlight_Controller_Request_RequestHttp());
 
-            $requestData = Shopware()->Front()->Request()->getParams();
+            $request = $this->getContainer()->get('front')->Request();
+            static::assertInstanceOf(Enlight_Controller_Request_Request::class, $request);
+            $requestData = $request->getParams();
             $validationResult = $paymentClass->validate($requestData);
             static::assertIsArray($validationResult);
             if (\count($validationResult)) {
@@ -164,9 +176,6 @@ public function testsInitiatePaymentClass(): void
         }
     }
 
-    /**
-     * @covers \sAdmin::sValidateStep3
-     */
     public function testExceptionInsValidateStep3(): void
     {
         $this->expectException('Enlight_Exception');
@@ -174,9 +183,6 @@ public function testExceptionInsValidateStep3(): void
         $this->module->sValidateStep3();
     }
 
-    /**
-     * @covers \sAdmin::sValidateStep3
-     */
     public function testsValidateStep3(): void
     {
         $this->getRequest()->setPost('sPayment', 2);
@@ -197,26 +203,23 @@ public function testsValidateStep3(): void
         static::assertInstanceOf(BasePaymentMethod::class, $result['sPaymentObject']);
     }
 
-    /**
-     * @covers \sAdmin::sUpdateNewsletter
-     */
     public function testsUpdateNewsletter(): void
     {
         $email = uniqid((string) rand()) . 'test@foobar.com';
 
         // Test insertion
         static::assertTrue($this->module->sUpdateNewsletter(true, $email));
-        $newsletterSubscription = Shopware()->Db()->fetchRow(
+        $newsletterSubscription = $this->connection->fetchAssociative(
             'SELECT * FROM s_campaigns_mailaddresses WHERE email = ?',
             [$email]
         );
-        static::assertNotNull($newsletterSubscription);
-        static::assertEquals(0, $newsletterSubscription['customer']);
-        static::assertEquals(1, $newsletterSubscription['groupID']);
+        static::assertIsArray($newsletterSubscription);
+        static::assertSame(0, (int) $newsletterSubscription['customer']);
+        static::assertSame(self::DEFAULT_CUSTOMER_GROUP_ID, (int) $newsletterSubscription['groupID']);
 
         // Test removal
         static::assertTrue($this->module->sUpdateNewsletter(false, $email));
-        $newsletterSubscription = Shopware()->Db()->fetchRow(
+        $newsletterSubscription = $this->connection->fetchAssociative(
             'SELECT * FROM s_campaigns_mailaddresses WHERE email = ?',
             [$email]
         );
@@ -224,26 +227,23 @@ public function testsUpdateNewsletter(): void
 
         // Retest insertion for customers
         static::assertTrue($this->module->sUpdateNewsletter(true, $email, true));
-        $newsletterSubscription = Shopware()->Db()->fetchRow(
+        $newsletterSubscription = $this->connection->fetchAssociative(
             'SELECT * FROM s_campaigns_mailaddresses WHERE email = ?',
             [$email]
         );
-        static::assertNotNull($newsletterSubscription);
-        static::assertEquals(1, $newsletterSubscription['customer']);
-        static::assertEquals(0, $newsletterSubscription['groupID']);
+        static::assertIsArray($newsletterSubscription);
+        static::assertSame(1, (int) $newsletterSubscription['customer']);
+        static::assertSame(0, (int) $newsletterSubscription['groupID']);
 
         // Test removal
         static::assertTrue($this->module->sUpdateNewsletter(false, $email));
-        $newsletterSubscription = Shopware()->Db()->fetchRow(
+        $newsletterSubscription = $this->connection->fetchAssociative(
             'SELECT * FROM s_campaigns_mailaddresses WHERE email = ?',
             [$email]
         );
         static::assertFalse($newsletterSubscription);
     }
 
-    /**
-     * @covers \sAdmin::sUpdatePayment
-     */
     public function testsUpdatePayment(): void
     {
         // Test no user id
@@ -254,9 +254,9 @@ public function testsUpdatePayment(): void
 
         // Test that operation succeeds even without payment id
         static::assertTrue($this->module->sUpdatePayment());
-        static::assertEquals(
+        static::assertSame(
             0,
-            Shopware()->Db()->fetchOne('SELECT paymentID FROM s_user WHERE id = ?', [$customer->getId()])
+            (int) $this->connection->fetchOne('SELECT paymentID FROM s_user WHERE id = ?', [$customer->getId()])
         );
 
         // Setup dummy test data and test with it
@@ -264,18 +264,15 @@ public function testsUpdatePayment(): void
             'sPayment' => 2,
         ]);
         static::assertTrue($this->module->sUpdatePayment());
-        static::assertEquals(
+        static::assertSame(
             2,
-            Shopware()->Db()->fetchOne('SELECT paymentID FROM s_user WHERE id = ?', [$customer->getId()])
+            (int) $this->connection->fetchOne('SELECT paymentID FROM s_user WHERE id = ?', [$customer->getId()])
         );
 
         $this->deleteDummyCustomer($customer);
         $this->session->offsetSet('sUserId', null);
     }
 
-    /**
-     * @covers \sAdmin::sLogin
-     */
     public function testsLogin(): void
     {
         // Test with no data, get error
@@ -325,13 +322,13 @@ public function testsLogin(): void
         static::assertNull($result['sErrorMessages']);
 
         // Test wrong pre-hashed password. Need a user with md5 encoded password
-        Shopware()->Db()->update(
+        $this->connection->update(
             's_user',
             [
                 'password' => md5('fooobar'),
                 'encoder' => 'md5',
             ],
-            'id = ' . $customer->getId()
+            ['id' => $customer->getId()]
         );
 
         $this->getRequest()->setPost([
@@ -362,18 +359,19 @@ public function testsLogin(): void
         static::assertNull($result['sErrorFlag']);
         static::assertNull($result['sErrorMessages']);
 
-        $modifiedMd5User = Shopware()->Db()->fetchRow(
+        $modifiedMd5User = $this->connection->fetchAssociative(
             'SELECT * FROM s_user WHERE id = ?',
             [$customer->getId()]
         );
+        static::assertIsArray($modifiedMd5User);
 
         // Test that it's the same user, but with different last login
-        static::assertEquals($modifiedMd5User['email'], $customer->getEmail());
-        static::assertEquals($modifiedMd5User['password'], md5('fooobar'));
+        static::assertSame($modifiedMd5User['email'], $customer->getEmail());
+        static::assertSame($modifiedMd5User['password'], md5('fooobar'));
         static::assertNotEquals($modifiedMd5User['lastlogin'], $customer->getLastLogin() ? $customer->getLastLogin()->format('Y-m-d H:i:s') : null);
 
         // Test inactive account
-        Shopware()->Db()->update('s_user', ['active' => 0], 'id = ' . $customer->getId());
+        $this->connection->update('s_user', ['active' => 0], ['id' => $customer->getId()]);
         $result = $this->module->sLogin(true);
         static::assertIsArray($result);
         static::assertArrayHasKey('sErrorFlag', $result);
@@ -390,7 +388,7 @@ public function testsLogin(): void
         );
 
         // Test brute force lockout
-        Shopware()->Db()->update('s_user', ['active' => 1], 'id = ' . $customer->getId());
+        $this->connection->update('s_user', ['active' => 1], ['id' => $customer->getId()]);
         $this->getRequest()->setPost([
             'email' => $customer->getEmail(),
             'password' => 'asasasasas',
@@ -423,9 +421,6 @@ public function testsLogin(): void
         $this->session->offsetSet('sUserId', null);
     }
 
-    /**
-     * @covers \sAdmin::sCheckUser
-     */
     public function testsCheckUser(): void
     {
         $customer = $this->createDummyCustomer();
@@ -449,10 +444,12 @@ public function testsCheckUser(): void
         static::assertTrue($this->module->sCheckUser());
 
         // Force timeout
-        Shopware()->Db()->update('s_user', ['lastlogin' => '2000-01-01 00:00:00'], 'id = ' . $customer->getId());
+        $this->connection->update('s_user', ['lastlogin' => '2000-01-01 00:00:00'], ['id' => $customer->getId()]);
         static::assertFalse($this->module->sCheckUser());
 
-        static::assertEquals($customer->getGroup()->getKey(), $this->session->offsetGet('sUserGroup'));
+        $customerGroup = $customer->getGroup();
+        static::assertInstanceOf(Group::class, $customerGroup);
+        static::assertSame($customerGroup->getKey(), $this->session->offsetGet('sUserGroup'));
         static::assertIsArray($this->session->offsetGet('sUserGroupData'));
         static::assertArrayHasKey('groupkey', $this->session->offsetGet('sUserGroupData'));
         static::assertArrayHasKey('description', $this->session->offsetGet('sUserGroupData'));
@@ -467,13 +464,10 @@ public function testsCheckUser(): void
         $this->session->offsetSet('sUserId', null);
     }
 
-    /**
-     * @covers \sAdmin::sGetCountryTranslation
-     */
     public function testsGetCountryTranslation(): void
     {
         // Backup existing data and inject demo data
-        $existingData = Shopware()->Db()->fetchRow("
+        $existingData = $this->connection->fetchAssociative("
             SELECT * FROM s_core_translations
             WHERE objecttype = 'config_countries' AND objectlanguage = 2
         ");
@@ -496,15 +490,15 @@ public function testsGetCountryTranslation(): void
             ),
         ];
 
-        if ($existingData) {
-            Shopware()->Db()->update('s_core_translations', $demoData, 'id = ' . $existingData['id']);
+        if (\is_array($existingData)) {
+            $this->connection->update('s_core_translations', $demoData, ['id' => $existingData['id']]);
         } else {
-            Shopware()->Db()->insert('s_core_translations', $demoData);
+            $this->connection->insert('s_core_translations', $demoData);
         }
 
         // Test loading all data, should return the test data
-        $shopId = Shopware()->Container()->get(ContextServiceInterface::class)->getShopContext()->getShop()->getId();
-        Shopware()->Container()->get(ContextServiceInterface::class)->getShopContext()->getShop()->setId(2);
+        $shopId = $this->getContainer()->get(ContextServiceInterface::class)->getShopContext()->getShop()->getId();
+        $this->getContainer()->get(ContextServiceInterface::class)->getShopContext()->getShop()->setId(2);
 
         $result = $this->module->sGetCountryTranslation();
         static::assertCount(2, $result);
@@ -512,12 +506,12 @@ public function testsGetCountryTranslation(): void
         static::assertArrayHasKey(5, $result);
         static::assertArrayHasKey('active', $result[2]);
         static::assertArrayHasKey('countryname', $result[2]);
-        static::assertEquals(1, $result[2]['active']);
-        static::assertEquals('Germany', $result[2]['countryname']);
+        static::assertSame(1, (int) $result[2]['active']);
+        static::assertSame('Germany', $result[2]['countryname']);
         static::assertArrayHasKey('active', $result[5]);
         static::assertArrayHasKey('countryname', $result[5]);
-        static::assertEquals(1, $result[5]['active']);
-        static::assertEquals('Belgium', $result[5]['countryname']);
+        static::assertSame(1, (int) $result[5]['active']);
+        static::assertSame('Belgium', $result[5]['countryname']);
 
         // Test with just one country
         $result = $this->module->sGetCountryTranslation(['id' => 2, 'randomField' => 'randomValue']);
@@ -526,28 +520,25 @@ public function testsGetCountryTranslation(): void
         static::assertArrayHasKey('active', $result);
         static::assertArrayHasKey('countryname', $result);
         static::assertArrayHasKey('randomField', $result);
-        static::assertEquals(2, $result['id']);
-        static::assertEquals(1, $result['active']);
-        static::assertEquals('Germany', $result['countryname']);
-        static::assertEquals('randomValue', $result['randomField']);
+        static::assertSame(2, $result['id']);
+        static::assertSame(1, (int) $result['active']);
+        static::assertSame('Germany', $result['countryname']);
+        static::assertSame('randomValue', $result['randomField']);
 
         // If backup data exists, restore it
         if ($existingData) {
             $existingDataId = $existingData['id'];
             unset($existingData['id']);
-            Shopware()->Db()->update('s_core_translations', $existingData, 'id = ' . $existingDataId);
+            $this->connection->update('s_core_translations', $existingData, ['id' => $existingDataId]);
         }
 
-        Shopware()->Container()->get(ContextServiceInterface::class)->getShopContext()->getShop()->setId($shopId);
+        $this->getContainer()->get(ContextServiceInterface::class)->getShopContext()->getShop()->setId($shopId);
     }
 
-    /**
-     * @covers \sAdmin::sGetDispatchTranslation
-     */
     public function testsGetDispatchTranslation(): void
     {
         // Backup existing data and inject demo data
-        $existingData = Shopware()->Db()->fetchRow("
+        $existingData = $this->connection->fetchAssociative("
             SELECT * FROM s_core_translations
             WHERE objecttype = 'config_dispatch' AND objectlanguage = 2
         ");
@@ -558,7 +549,7 @@ public function testsGetDispatchTranslation(): void
             'objecttype' => 'config_dispatch',
             'objectdata' => serialize(
                 [
-                    9 => [
+                    self::DEFAULT_SHIPPING_METHOD_ID => [
                         'dispatch_name' => 'Standard shipping',
                         'dispatch_description' => 'Standard shipping description',
                         'dispatch_status_link' => 'http://www.dhl.com',
@@ -572,64 +563,61 @@ public function testsGetDispatchTranslation(): void
             ),
         ];
 
-        if ($existingData) {
-            Shopware()->Db()->update('s_core_translations', $demoData, 'id = ' . $existingData['id']);
+        if (\is_array($existingData)) {
+            $this->connection->update('s_core_translations', $demoData, ['id' => $existingData['id']]);
         } else {
-            Shopware()->Db()->insert('s_core_translations', $demoData);
+            $this->connection->insert('s_core_translations', $demoData);
         }
 
         // Test loading all data, should return the test data
-        $shopId = Shopware()->Container()->get(ContextServiceInterface::class)->getShopContext()->getShop()->getId();
-        Shopware()->Container()->get(ContextServiceInterface::class)->getShopContext()->getShop()->setId(2);
+        $shopId = $this->getContainer()->get(ContextServiceInterface::class)->getShopContext()->getShop()->getId();
+        $this->getContainer()->get(ContextServiceInterface::class)->getShopContext()->getShop()->setId(2);
 
         $result = $this->module->sGetDispatchTranslation();
         static::assertCount(2, $result);
-        static::assertArrayHasKey(9, $result);
+        static::assertArrayHasKey(self::DEFAULT_SHIPPING_METHOD_ID, $result);
         static::assertArrayHasKey(10, $result);
-        static::assertArrayHasKey('dispatch_name', $result[9]);
-        static::assertArrayHasKey('dispatch_description', $result[9]);
-        static::assertArrayHasKey('dispatch_status_link', $result[9]);
+        static::assertArrayHasKey('dispatch_name', $result[self::DEFAULT_SHIPPING_METHOD_ID]);
+        static::assertArrayHasKey('dispatch_description', $result[self::DEFAULT_SHIPPING_METHOD_ID]);
+        static::assertArrayHasKey('dispatch_status_link', $result[self::DEFAULT_SHIPPING_METHOD_ID]);
         static::assertArrayHasKey('dispatch_name', $result[10]);
         static::assertArrayHasKey('dispatch_description', $result[10]);
         static::assertArrayHasKey('dispatch_status_link', $result[10]);
-        static::assertEquals('Standard shipping', $result[9]['dispatch_name']);
-        static::assertEquals('Standard shipping description', $result[9]['dispatch_description']);
-        static::assertEquals('http://www.dhl.com', $result[9]['dispatch_status_link']);
-        static::assertEquals('Shipping by weight', $result[10]['dispatch_name']);
-        static::assertEquals('Shipping by weight description', $result[10]['dispatch_description']);
-        static::assertEquals('url', $result[10]['dispatch_status_link']);
+        static::assertSame('Standard shipping', $result[self::DEFAULT_SHIPPING_METHOD_ID]['dispatch_name']);
+        static::assertSame('Standard shipping description', $result[self::DEFAULT_SHIPPING_METHOD_ID]['dispatch_description']);
+        static::assertSame('http://www.dhl.com', $result[self::DEFAULT_SHIPPING_METHOD_ID]['dispatch_status_link']);
+        static::assertSame('Shipping by weight', $result[10]['dispatch_name']);
+        static::assertSame('Shipping by weight description', $result[10]['dispatch_description']);
+        static::assertSame('url', $result[10]['dispatch_status_link']);
 
         // Test with just one shipping method
-        $result = $this->module->sGetDispatchTranslation(['id' => 9, 'randomField' => 'randomValue']);
+        $result = $this->module->sGetDispatchTranslation(['id' => self::DEFAULT_SHIPPING_METHOD_ID, 'randomField' => 'randomValue']);
         static::assertCount(5, $result);
         static::assertArrayHasKey('id', $result);
         static::assertArrayHasKey('name', $result);
         static::assertArrayHasKey('description', $result);
         static::assertArrayHasKey('status_link', $result);
         static::assertArrayHasKey('randomField', $result);
-        static::assertEquals(9, $result['id']);
-        static::assertEquals('Standard shipping', $result['name']);
-        static::assertEquals('Standard shipping description', $result['description']);
-        static::assertEquals('http://www.dhl.com', $result['status_link']);
-        static::assertEquals('randomValue', $result['randomField']);
+        static::assertSame(self::DEFAULT_SHIPPING_METHOD_ID, $result['id']);
+        static::assertSame('Standard shipping', $result['name']);
+        static::assertSame('Standard shipping description', $result['description']);
+        static::assertSame('http://www.dhl.com', $result['status_link']);
+        static::assertSame('randomValue', $result['randomField']);
 
         // If backup data exists, restore it
         if ($existingData) {
             $existingDataId = $existingData['id'];
             unset($existingData['id']);
-            Shopware()->Db()->update('s_core_translations', $existingData, 'id = ' . $existingDataId);
+            $this->connection->update('s_core_translations', $existingData, ['id' => $existingDataId]);
         }
 
-        Shopware()->Container()->get(ContextServiceInterface::class)->getShopContext()->getShop()->setId($shopId);
+        $this->getContainer()->get(ContextServiceInterface::class)->getShopContext()->getShop()->setId($shopId);
     }
 
-    /**
-     * @covers \sAdmin::sGetPaymentTranslation
-     */
     public function testsGetPaymentTranslation(): void
     {
         // Backup existing data and inject demo data
-        $existingData = Shopware()->Db()->fetchRow("
+        $existingData = $this->connection->fetchAssociative("
             SELECT * FROM s_core_translations
             WHERE objecttype = 'config_payment' AND objectlanguage = 2
         ");
@@ -663,15 +651,15 @@ public function testsGetPaymentTranslation(): void
             ),
         ];
 
-        if ($existingData) {
-            Shopware()->Db()->update('s_core_translations', $demoData, 'id = ' . $existingData['id']);
+        if (\is_array($existingData)) {
+            $this->connection->update('s_core_translations', $demoData, ['id' => $existingData['id']]);
         } else {
-            Shopware()->Db()->insert('s_core_translations', $demoData);
+            $this->connection->insert('s_core_translations', $demoData);
         }
 
         // Test loading all data, should return the test data
-        $shopId = Shopware()->Container()->get(ContextServiceInterface::class)->getShopContext()->getShop()->getId();
-        Shopware()->Container()->get(ContextServiceInterface::class)->getShopContext()->getShop()->setId(2);
+        $shopId = $this->getContainer()->get(ContextServiceInterface::class)->getShopContext()->getShop()->getId();
+        $this->getContainer()->get(ContextServiceInterface::class)->getShopContext()->getShop()->setId(2);
 
         $result = $this->module->sGetPaymentTranslation();
         static::assertCount(5, $result);
@@ -686,12 +674,12 @@ public function testsGetPaymentTranslation(): void
         static::assertArrayHasKey('additionalDescription', $result[3]);
         static::assertArrayHasKey('description', $result[5]);
         static::assertArrayHasKey('additionalDescription', $result[5]);
-        static::assertEquals('Debit', $result[2]['description']);
-        static::assertEquals('Additional text', $result[2]['additionalDescription']);
-        static::assertEquals('Cash on delivery', $result[3]['description']);
-        static::assertEquals('(including 2.00 Euro VAT)', $result[3]['additionalDescription']);
-        static::assertEquals('Paid in advance', $result[5]['description']);
-        static::assertEquals('The goods are delivered directly upon receipt of payment.', $result[5]['additionalDescription']);
+        static::assertSame('Debit', $result[2]['description']);
+        static::assertSame('Additional text', $result[2]['additionalDescription']);
+        static::assertSame('Cash on delivery', $result[3]['description']);
+        static::assertSame('(including 2.00 Euro VAT)', $result[3]['additionalDescription']);
+        static::assertSame('Paid in advance', $result[5]['description']);
+        static::assertSame('The goods are delivered directly upon receipt of payment.', $result[5]['additionalDescription']);
 
         // Test with just one payment mean
         $result = $this->module->sGetPaymentTranslation(['id' => 2, 'randomField' => 'randomValue']);
@@ -700,28 +688,25 @@ public function testsGetPaymentTranslation(): void
         static::assertArrayHasKey('description', $result);
         static::assertArrayHasKey('additionaldescription', $result);
         static::assertArrayHasKey('randomField', $result);
-        static::assertEquals(2, $result['id']);
-        static::assertEquals('Debit', $result['description']);
-        static::assertEquals('Additional text', $result['additionaldescription']);
-        static::assertEquals('randomValue', $result['randomField']);
+        static::assertSame(2, $result['id']);
+        static::assertSame('Debit', $result['description']);
+        static::assertSame('Additional text', $result['additionaldescription']);
+        static::assertSame('randomValue', $result['randomField']);
 
         // If backup data exists, restore it
         if ($existingData) {
             $existingDataId = $existingData['id'];
             unset($existingData['id']);
-            Shopware()->Db()->update('s_core_translations', $existingData, 'id = ' . $existingDataId);
+            $this->connection->update('s_core_translations', $existingData, ['id' => $existingDataId]);
         }
 
-        Shopware()->Container()->get(ContextServiceInterface::class)->getShopContext()->getShop()->setId($shopId);
+        $this->getContainer()->get(ContextServiceInterface::class)->getShopContext()->getShop()->setId($shopId);
     }
 
-    /**
-     * @covers \sAdmin::sGetCountryStateTranslation
-     */
     public function testsGetCountryStateTranslation(): void
     {
         // Backup existing data and inject demo data
-        $existingData = Shopware()->Db()->fetchRow("
+        $existingData = $this->connection->fetchAssociative("
             SELECT * FROM s_core_translations
             WHERE objecttype = 'config_country_states' AND objectlanguage = 1
         ");
@@ -742,17 +727,17 @@ public function testsGetCountryStateTranslation(): void
             ),
         ];
 
-        if ($existingData) {
-            Shopware()->Db()->update('s_core_translations', $demoData, 'id = ' . $existingData['id']);
+        if (\is_array($existingData)) {
+            $this->connection->update('s_core_translations', $demoData, ['id' => $existingData['id']]);
         } else {
-            Shopware()->Db()->insert('s_core_translations', $demoData);
+            $this->connection->insert('s_core_translations', $demoData);
         }
 
         // Test with default shop, return empty array
         static::assertCount(0, $this->module->sGetCountryStateTranslation());
 
         // Hack the current system shop, so we can properly test this
-        Shopware()->Shop()->setDefault(false);
+        $this->getContainer()->get('shop')->setDefault(false);
 
         $result = $this->module->sGetCountryStateTranslation();
         static::assertCount(2, $result);
@@ -760,14 +745,14 @@ public function testsGetCountryStateTranslation(): void
         static::assertArrayHasKey(24, $result);
         static::assertArrayHasKey('name', $result[23]);
         static::assertArrayHasKey('name', $result[24]);
-        static::assertEquals('Arkansas (english)', $result[23]['name']);
-        static::assertEquals('California', $result[24]['name']);
+        static::assertSame('Arkansas (english)', $result[23]['name']);
+        static::assertSame('California', $result[24]['name']);
 
         // Create a stub of a Shop for fallback.
-        $shopFallbackId = Shopware()->Container()->get(ContextServiceInterface::class)->getShopContext()->getShop()->getFallbackId();
-        Shopware()->Container()->get(ContextServiceInterface::class)->getShopContext()->getShop()->setFallbackId(10000);
+        $shopFallbackId = $this->getContainer()->get(ContextServiceInterface::class)->getShopContext()->getShop()->getFallbackId();
+        $this->getContainer()->get(ContextServiceInterface::class)->getShopContext()->getShop()->setFallbackId(10000);
 
-        Shopware()->Db()->insert('s_core_translations', [
+        $this->connection->insert('s_core_translations', [
             'objectkey' => 1,
             'objectlanguage' => 10000,
             'objecttype' => 'config_country_states',
@@ -789,24 +774,21 @@ public function testsGetCountryStateTranslation(): void
         static::assertArrayHasKey('name', $result[2]);
         static::assertArrayHasKey('name', $result[23]);
         static::assertArrayHasKey('name', $result[24]);
-        static::assertEquals('asdfasfdasdfa', $result[2]['name']);
-        static::assertEquals('Arkansas (english)', $result[23]['name']);
-        static::assertEquals('California', $result[24]['name']);
+        static::assertSame('asdfasfdasdfa', $result[2]['name']);
+        static::assertSame('Arkansas (english)', $result[23]['name']);
+        static::assertSame('California', $result[24]['name']);
 
         // If backup data exists, restore it
         if ($existingData) {
             $existingDataId = $existingData['id'];
             unset($existingData['id']);
-            Shopware()->Db()->update('s_core_translations', $existingData, 'id = ' . $existingDataId);
+            $this->connection->update('s_core_translations', $existingData, ['id' => $existingDataId]);
         }
-        Shopware()->Db()->delete('s_core_translations', 'objectlanguage = 10000');
+        $this->connection->delete('s_core_translations', ['objectlanguage' => 10000]);
 
-        Shopware()->Container()->get(ContextServiceInterface::class)->getShopContext()->getShop()->setFallbackId($shopFallbackId);
+        $this->getContainer()->get(ContextServiceInterface::class)->getShopContext()->getShop()->setFallbackId($shopFallbackId);
     }
 
-    /**
-     * @covers \sAdmin::sGetCountryList
-     */
     public function testsGetCountryList(): void
     {
         // Test with default country data
@@ -825,11 +807,11 @@ public function testsGetCountryList(): void
         }
 
         // Add translations
-        $existingCountryData = Shopware()->Db()->fetchRow("
+        $existingCountryData = $this->connection->fetchAssociative("
             SELECT * FROM s_core_translations
             WHERE objecttype = 'config_countries' AND objectlanguage = 1
         ");
-        $existingStateData = Shopware()->Db()->fetchRow("
+        $existingStateData = $this->connection->fetchAssociative("
             SELECT * FROM s_core_translations
             WHERE objecttype = 'config_country_states' AND objectlanguage = 1
         ");
@@ -863,24 +845,25 @@ public function testsGetCountryList(): void
             ),
         ];
 
-        if ($existingCountryData) {
-            Shopware()->Db()->update('s_core_translations', $demoCountryData, 'id = ' . $existingCountryData['id']);
+        if (\is_array($existingCountryData)) {
+            $this->connection->update('s_core_translations', $demoCountryData, ['id' => $existingCountryData['id']]);
         } else {
-            Shopware()->Db()->insert('s_core_translations', $demoCountryData);
+            $this->connection->insert('s_core_translations', $demoCountryData);
         }
-        if ($existingStateData) {
-            Shopware()->Db()->update('s_core_translations', $demoStateData, 'id = ' . $existingStateData['id']);
+        if (\is_array($existingStateData)) {
+            $this->connection->update('s_core_translations', $demoStateData, ['id' => $existingStateData['id']]);
         } else {
-            Shopware()->Db()->insert('s_core_translations', $demoStateData);
+            $this->connection->insert('s_core_translations', $demoStateData);
         }
 
-        //Hack current context, so next test works
-        $context = Shopware()->Container()->get('shopware_storefront.context_service')->getShopContext();
+        // Hack current context, so next test works
+        $context = $this->getContainer()->get('shopware_storefront.context_service')->getShopContext();
         $context->getShop()->setIsDefault(false);
 
         // Test with translations but display_states = false
         $result = $this->module->sGetCountryList();
         $country = array_shift($result); // Germany
+        static::assertIsArray($country);
         static::assertArrayHasKey('id', $country);
         static::assertArrayHasKey('countryname', $country);
         static::assertArrayHasKey('countryiso', $country);
@@ -892,17 +875,18 @@ public function testsGetCountryList(): void
         static::assertArrayHasKey('states', $country);
         static::assertArrayHasKey('flag', $country);
         static::assertCount(0, $country['states']);
-        static::assertEquals('Germany', $country['countryname']);
+        static::assertSame('Germany', $country['countryname']);
 
         // Make Germany display states, so we can test it
-        $existingGermanyData = Shopware()->Db()->fetchRow("
+        $existingGermanyData = $this->connection->fetchAssociative("
             SELECT * FROM s_core_countries
             WHERE countryiso = 'DE'
         ");
-        Shopware()->Db()->update(
+        static::assertIsArray($existingGermanyData);
+        $this->connection->update(
             's_core_countries',
             ['display_state_in_registration' => 1],
-            'id = ' . $existingGermanyData['id']
+            ['id' => $existingGermanyData['id']]
         );
 
         // Test with translations and states
@@ -919,7 +903,7 @@ public function testsGetCountryList(): void
         static::assertArrayHasKey('states', $country);
         static::assertArrayHasKey('flag', $country);
         static::assertCount(16, $country['states']);
-        static::assertEquals('Germany', $country['countryname']);
+        static::assertSame('Germany', $country['countryname']);
         foreach ($country['states'] as $state) {
             static::assertArrayHasKey('id', $state);
             static::assertArrayHasKey('countryID', $state);
@@ -930,29 +914,26 @@ public function testsGetCountryList(): void
         static::assertContains('111', array_column($country['states'], 'name'));
 
         // If backup data exists, restore it
-        if ($existingCountryData) {
+        if (\is_array($existingCountryData)) {
             $existingCountryDataId = $existingCountryData['id'];
             unset($existingCountryData['id']);
-            Shopware()->Db()->update('s_core_translations', $existingCountryData, 'id = ' . $existingCountryDataId);
+            $this->connection->update('s_core_translations', $existingCountryData, ['id' => $existingCountryDataId]);
         }
-        if ($existingStateData) {
+        if (\is_array($existingStateData)) {
             $existingStateDataId = $existingStateData['id'];
             unset($existingStateData['id']);
-            Shopware()->Db()->update('s_core_translations', $existingStateData, 'id = ' . $existingStateDataId);
-        }
-        if ($existingGermanyData) {
-            $existingGermanyDataId = $existingGermanyData['id'];
-            unset($existingGermanyData['id']);
-            Shopware()->Db()->update('s_core_countries', $existingGermanyData, 'id = ' . $existingGermanyDataId);
+            $this->connection->update('s_core_translations', $existingStateData, ['id' => $existingStateDataId]);
         }
 
+        $existingGermanyDataId = $existingGermanyData['id'];
+        unset($existingGermanyData['id']);
+        $this->connection->update('s_core_countries', $existingGermanyData, ['id' => $existingGermanyDataId]);
+
         // Remove shop hack
         $context->getShop()->setIsDefault(true);
     }
 
     /**
-     * @covers \sAdmin::sGetDownloads
-     *
      * @return array<string, mixed>
      */
     public function testsGetDownloads(): array
@@ -969,12 +950,12 @@ public function testsGetDownloads(): array
             'ordernumber' => uniqid((string) rand()),
             'userID' => $customer->getId(),
             'invoice_amount' => '37.99',
-            'invoice_amount_net' => '31.92',
+            'invoice_amount_net' => 31.92,
             'invoice_shipping' => '0',
-            'invoice_shipping_net' => '0',
+            'invoice_shipping_net' => 0.0,
             'ordertime' => '2014-03-14 10:26:20',
-            'status' => '0',
-            'cleared' => '17',
+            'status' => 0,
+            'cleared' => 17,
             'paymentID' => '4',
             'transactionID' => '',
             'comment' => '',
@@ -995,8 +976,8 @@ public function testsGetDownloads(): array
             'remote_addr' => '127.0.0.1',
         ];
 
-        Shopware()->Db()->insert('s_order', $orderData);
-        $orderId = Shopware()->Db()->lastInsertId();
+        $this->connection->insert('s_order', $orderData);
+        $orderId = $this->connection->lastInsertId();
 
         $orderDetailsData = [
             'orderID' => $orderId,
@@ -1017,8 +998,8 @@ public function testsGetDownloads(): array
             'config' => '',
         ];
 
-        Shopware()->Db()->insert('s_order_details', $orderDetailsData);
-        $orderDetailId = Shopware()->Db()->lastInsertId();
+        $this->connection->insert('s_order_details', $orderDetailsData);
+        $orderDetailId = $this->connection->lastInsertId();
 
         $orderEsdData = [
             'serialID' => '8',
@@ -1029,10 +1010,10 @@ public function testsGetDownloads(): array
             'datum' => '2014-03-14 10:26:20',
         ];
 
-        Shopware()->Db()->insert('s_order_esd', $orderEsdData);
+        $this->connection->insert('s_order_esd', $orderEsdData);
 
         // Mock a login
-        $orderEsdId = Shopware()->Db()->lastInsertId();
+        $orderEsdId = $this->connection->lastInsertId();
 
         // Calling the method should now return the expected data
         $downloads = $this->module->sGetDownloads();
@@ -1051,15 +1032,15 @@ public function testsGetDownloads(): array
         static::assertArrayHasKey('cleared', $esd);
         static::assertArrayHasKey('comment', $esd);
         static::assertArrayHasKey('details', $esd);
-        static::assertEquals($orderData['ordernumber'], $esd['ordernumber']);
-        static::assertEquals('37,99', $esd['invoice_amount']);
-        static::assertEquals($orderData['invoice_amount_net'], $esd['invoice_amount_net']);
-        static::assertEquals($orderData['invoice_shipping'], $esd['invoice_shipping']);
-        static::assertEquals($orderData['invoice_shipping_net'], $esd['invoice_shipping_net']);
-        static::assertEquals('14.03.2014 10:26', $esd['datum']);
-        static::assertEquals($orderData['status'], $esd['status']);
-        static::assertEquals($orderData['cleared'], $esd['cleared']);
-        static::assertEquals($orderData['comment'], $esd['comment']);
+        static::assertSame($orderData['ordernumber'], $esd['ordernumber']);
+        static::assertSame('37,99', $esd['invoice_amount']);
+        static::assertSame($orderData['invoice_amount_net'], (float) $esd['invoice_amount_net']);
+        static::assertSame($orderData['invoice_shipping'], $esd['invoice_shipping']);
+        static::assertSame($orderData['invoice_shipping_net'], (float) $esd['invoice_shipping_net']);
+        static::assertSame('14.03.2014 10:26', $esd['datum']);
+        static::assertSame($orderData['status'], (int) $esd['status']);
+        static::assertSame($orderData['cleared'], (int) $esd['cleared']);
+        static::assertSame($orderData['comment'], $esd['comment']);
         static::assertCount(1, $esd['details']);
         $esdDetail = end($esd['details']);
 
@@ -1082,8 +1063,8 @@ public function testsGetDownloads(): array
     }
 
     /**
-     * @covers \sAdmin::sGetOpenOrderData
      * @depends testsGetDownloads
+     *
      * @ticket SW-5653
      *
      * @param array<string, mixed> $demoData
@@ -1129,10 +1110,10 @@ public function testsGetOpenOrderData(array $demoData): void
             'remote_addr' => '172.16.10.71',
         ];
 
-        Shopware()->Db()->insert('s_order', $orderData);
-        $orderId = Shopware()->Db()->lastInsertId();
+        $this->connection->insert('s_order', $orderData);
+        $orderId = $this->connection->lastInsertId();
 
-        Shopware()->Db()->query("
+        $this->connection->executeStatement("
             INSERT IGNORE INTO `s_order_details` (`orderID`, `ordernumber`, `articleID`, `articleordernumber`, `price`, `quantity`, `name`, `status`, `shipped`, `shippedgroup`, `releasedate`, `modus`, `esdarticle`, `taxID`, `tax_rate`, `config`) VALUES
             (?, ?, 12, 'SW10012', 9.99, 1, 'Kobra Vodka 37,5%', 0, 0, 0, NULL, 0, 0, 1, 19, ''),
             (?, ?, 0, 'SHIPPINGDISCOUNT', -2, 1, 'Warenkorbrabatt', 0, 0, 0, NULL, 4, 0, 0, 19, ''),
@@ -1179,27 +1160,21 @@ public function testsGetOpenOrderData(array $demoData): void
 
             // This tests SW-5653
             if ($order['id'] == $orderId) {
-                static::assertNotEmpty($order);
-                static::assertEquals($orderNumber, $order['ordernumber']);
-                static::assertEquals($customer->getId(), $order['userID']);
+                static::assertSame($orderNumber, $order['ordernumber']);
+                static::assertSame($customer->getId(), (int) $order['userID']);
                 break;
             }
         }
 
-        Shopware()->Db()->delete('s_order_esd', 'id = ' . $orderEsdId);
-        Shopware()->Db()->delete('s_order_details', 'orderID = ' . $orderId);
-        Shopware()->Db()->delete('s_order_details', 'orderID = ' . $oldOrderId);
-        Shopware()->Db()->delete('s_order', 'id = ' . $orderId);
-        Shopware()->Db()->delete('s_order', 'id = ' . $oldOrderId);
+        $this->connection->delete('s_order_esd', ['id' => $orderEsdId]);
+        $this->connection->delete('s_order_details', ['orderID' => $orderId]);
+        $this->connection->delete('s_order_details', ['orderID' => $oldOrderId]);
+        $this->connection->delete('s_order', ['id' => $orderId]);
+        $this->connection->delete('s_order', ['id' => $oldOrderId]);
         $this->deleteDummyCustomer($customer);
         $this->session->offsetSet('sUserId', null);
     }
 
-    /**
-     * @covers \sAdmin::sGetUserMailById
-     * @covers \sAdmin::sGetUserByMail
-     * @covers \sAdmin::sGetUserNameById
-     */
     public function testGetEmailAndUser(): void
     {
         $this->session->clear();
@@ -1209,15 +1184,15 @@ public function testGetEmailAndUser(): void
         // Test sGetUserMailById with null and expected cases
         static::assertNull($this->module->sGetUserMailById());
         $this->session->offsetSet('sUserId', $customer->getId());
-        static::assertEquals($customer->getEmail(), $this->module->sGetUserMailById());
+        static::assertSame($customer->getEmail(), $this->module->sGetUserMailById());
 
         // Test sGetUserByMail with null and expected cases
         static::assertNull($this->module->sGetUserByMail(uniqid((string) rand())));
-        static::assertEquals($customer->getId(), $this->module->sGetUserByMail($customer->getEmail()));
+        static::assertSame($customer->getId(), $this->module->sGetUserByMail($customer->getEmail()));
 
         // Test sGetUserNameById with null and expected cases
-        static::assertEmpty($this->module->sGetUserNameById(uniqid((string) rand())));
-        static::assertEquals(
+        static::assertEmpty($this->module->sGetUserNameById(random_int(10000, PHP_INT_MAX)));
+        static::assertSame(
             ['firstname' => 'Max', 'lastname' => 'Mustermann'],
             $this->module->sGetUserNameById($customer->getId())
         );
@@ -1226,15 +1201,13 @@ public function testGetEmailAndUser(): void
         $this->session->offsetSet('sUserId', null);
     }
 
-    /**
-     * @covers \sAdmin::sGetUserData
-     */
     public function testsGetUserDataWithoutLogin(): void
     {
         $this->session->clear();
 
-        static::assertEquals(
-            ['additional' => [
+        static::assertSame(
+            [
+                'additional' => [
                     'country' => [],
                     'countryShipping' => [],
                     'stateShipping' => ['id' => 0],
@@ -1246,7 +1219,8 @@ public function testsGetUserDataWithoutLogin(): void
         $this->session->offsetSet('sCountry', 20);
 
         static::assertEquals(
-            ['additional' => [
+            [
+                'additional' => [
                     'country' => [
                         'id' => '20',
                         'countryname' => 'Namibia',
@@ -1290,9 +1264,6 @@ public function testsGetUserDataWithoutLogin(): void
         );
     }
 
-    /**
-     * @covers \sAdmin::sGetUserData
-     */
     public function testsGetUserDataWithLogin(): void
     {
         $customer = $this->createDummyCustomer();
@@ -1355,8 +1326,8 @@ public function testsGetUserDataWithLogin(): void
                     'confirmationkey' => '',
                     'paymentID' => 5,
                     'customernumber' => $customer->getNumber(),
-                    'firstlogin' => $customer->getFirstLogin()->format('Y-m-d'),
-                    'lastlogin' => $customer->getLastLogin()->format('Y-m-d H:i:s'),
+                    'firstlogin' => $customer->getFirstLogin() ? $customer->getFirstLogin()->format('Y-m-d') : null,
+                    'lastlogin' => $customer->getLastLogin() ? $customer->getLastLogin()->format('Y-m-d H:i:s') : null,
                     'sessionID' => '',
                     'newsletter' => 0,
                     'validation' => '',
@@ -1448,59 +1419,24 @@ public function testsGetUserDataWithLogin(): void
         $this->session->offsetSet('sUserId', null);
     }
 
-    /**
-     * @covers \sAdmin::sManageRisks
-     * @covers \sAdmin::sRiskORDERVALUELESS
-     * @covers \sAdmin::sRiskORDERVALUEMORE
-     * @covers \sAdmin::sRiskCUSTOMERGROUPIS
-     * @covers \sAdmin::sRiskCUSTOMERGROUPISNOT
-     * @covers \sAdmin::sRiskZIPCODE
-     * @covers \sAdmin::sRiskBILLINGZIPCODE
-     * @covers \sAdmin::sRiskZONEIS
-     * @covers \sAdmin::sRiskBILLINGZONEIS
-     * @covers \sAdmin::sRiskZONEISNOT
-     * @covers \sAdmin::sRiskBILLINGZONEISNOT
-     * @covers \sAdmin::sRiskLANDIS
-     * @covers \sAdmin::sRiskBILLINGLANDIS
-     * @covers \sAdmin::sRiskLANDISNOT
-     * @covers \sAdmin::sRiskBILLINGLANDISNOT
-     * @covers \sAdmin::sRiskNEWCUSTOMER
-     * @covers \sAdmin::sRiskORDERPOSITIONSMORE
-     * @covers \sAdmin::sRiskATTRIS
-     * @covers \sAdmin::sRiskATTRISNOT
-     * @covers \sAdmin::sRiskDUNNINGLEVELONE
-     * @covers \sAdmin::sRiskDUNNINGLEVELTWO
-     * @covers \sAdmin::sRiskDUNNINGLEVELTHREE
-     * @covers \sAdmin::sRiskINKASSO
-     * @covers \sAdmin::sRiskLASTORDERLESS
-     * @covers \sAdmin::sRiskARTICLESFROM
-     * @covers \sAdmin::sRiskLASTORDERSLESS
-     * @covers \sAdmin::sRiskPREGSTREET
-     * @covers \sAdmin::sRiskDIFFER
-     * @covers \sAdmin::sRiskCUSTOMERNR
-     * @covers \sAdmin::sRiskLASTNAME
-     * @covers \sAdmin::sRiskSUBSHOP
-     * @covers \sAdmin::sRiskSUBSHOPNOT
-     * @covers \sAdmin::sRiskCURRENCIESISOIS
-     * @covers \sAdmin::sRiskCURRENCIESISOISNOT
-     */
     public function testsManageRisks(): void
     {
-        $customer = $this->createDummyCustomer();
-        $this->session->offsetSet('sUserId', $customer->getId());
+        $customerModel = $this->createDummyCustomer();
+        $this->session->offsetSet('sUserId', $customerModel->getId());
 
         $basket = [
             'content' => 1,
             'AmountNumeric' => 10,
         ];
-        $user = $this->module->sGetUserData();
+        $customerData = $this->module->sGetUserData();
+        static::assertIsArray($customerData);
 
         $date = new DateTime();
 
         // Inject demo data
         $orderData = [
             'ordernumber' => uniqid((string) rand()),
-            'userID' => $customer->getId(),
+            'userID' => $customerModel->getId(),
             'invoice_amount' => '37.99',
             'invoice_amount_net' => '31.92',
             'invoice_shipping' => '0',
@@ -1528,16 +1464,16 @@ public function testsManageRisks(): void
             'remote_addr' => '127.0.0.1',
         ];
 
-        Shopware()->Db()->insert('s_order', $orderData);
-        $orderId = Shopware()->Db()->lastInsertId();
+        $this->connection->insert('s_order', $orderData);
+        $orderId = $this->connection->lastInsertId();
 
         // No rules, returns false
-        static::assertFalse($this->module->sManageRisks(2, $basket, $user));
+        static::assertFalse($this->module->sManageRisks(2, $basket, $customerData));
 
         // Test all rules
 
         // sRiskORDERVALUELESS
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
@@ -1545,11 +1481,11 @@ public function testsManageRisks(): void
                 'value1' => 20,
             ]
         );
-        $firstTestRuleId = Shopware()->Db()->lastInsertId();
-        static::assertTrue($this->module->sManageRisks(2, $basket, $user));
+        $firstTestRuleId = $this->connection->lastInsertId();
+        static::assertTrue($this->module->sManageRisks(2, $basket, $customerData));
 
         // sRiskORDERVALUEMORE
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
@@ -1558,16 +1494,15 @@ public function testsManageRisks(): void
             ]
         );
         // Test 'OR' logic between different rules (only one needs to be true)
-        static::assertTrue($this->module->sManageRisks(2, $basket, $user));
+        static::assertTrue($this->module->sManageRisks(2, $basket, $customerData));
 
         // Deleting the first rule, only a false one is left
-        Shopware()->Db()->delete('s_core_rulesets', 'id = ' . $firstTestRuleId);
-        static::assertFalse($this->module->sManageRisks(2, $basket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        $this->connection->delete('s_core_rulesets', ['id' => $firstTestRuleId]);
+        static::assertFalse($this->module->sManageRisks(2, $basket, $customerData));
 
         // sRiskCUSTOMERGROUPIS
         // sRiskCUSTOMERGROUPISNOT
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
@@ -1579,11 +1514,10 @@ public function testsManageRisks(): void
         );
 
         // Test 'AND' logic between the two parts of the same rule (both need to be true)
-        static::assertFalse($this->module->sManageRisks(2, $basket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertFalse($this->module->sManageRisks(2, $basket, $customerData));
 
         // sRiskZIPCODE
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
@@ -1591,11 +1525,10 @@ public function testsManageRisks(): void
                 'value1' => '98765',
             ]
         );
-        static::assertTrue($this->module->sManageRisks(2, $basket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertTrue($this->module->sManageRisks(2, $basket, $customerData));
 
         // sRiskBILLINGZIPCODE
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
@@ -1604,11 +1537,11 @@ public function testsManageRisks(): void
             ]
         );
 
-        static::assertTrue($this->module->sManageRisks(2, $basket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertTrue($this->module->sManageRisks(2, $basket, $customerData));
+        $this->connection->createQueryBuilder()->delete('s_core_rulesets')->where('id >= ' . $firstTestRuleId)->execute();
 
         // sRiskZONEIS
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
@@ -1616,11 +1549,10 @@ public function testsManageRisks(): void
                 'value1' => '12345',
             ]
         );
-        static::assertFalse($this->module->sManageRisks(2, $basket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertFalse($this->module->sManageRisks(2, $basket, $customerData));
 
         // sRiskZONEISNOT
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
@@ -1628,12 +1560,11 @@ public function testsManageRisks(): void
                 'value1' => '12345',
             ]
         );
-        static::assertTrue($this->module->sManageRisks(2, $basket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertTrue($this->module->sManageRisks(2, $basket, $customerData));
 
         // sRiskLANDIS
         // sRiskLANDISNOT
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
@@ -1643,12 +1574,11 @@ public function testsManageRisks(): void
                 'value2' => 'UK',
             ]
         );
-        static::assertTrue($this->module->sManageRisks(2, $basket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertTrue($this->module->sManageRisks(2, $basket, $customerData));
 
         // sRiskBILLINGLANDIS
         // sRiskBILLINGLANDISNOT
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
@@ -1658,22 +1588,21 @@ public function testsManageRisks(): void
                 'value2' => 'UK',
             ]
         );
-        static::assertTrue($this->module->sManageRisks(2, $basket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertTrue($this->module->sManageRisks(2, $basket, $customerData));
 
         // sRiskNEWCUSTOMER
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
                 'rule1' => 'NEWCUSTOMER',
             ]
         );
-        static::assertTrue($this->module->sManageRisks(2, $basket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertTrue($this->module->sManageRisks(2, $basket, $customerData));
+        $this->connection->createQueryBuilder()->delete('s_core_rulesets')->where('id >= ' . $firstTestRuleId)->execute();
 
         // sRiskORDERPOSITIONSMORE
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
@@ -1681,15 +1610,13 @@ public function testsManageRisks(): void
                 'value1' => '2',
             ]
         );
-        static::assertFalse($this->module->sManageRisks(2, $basket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertFalse($this->module->sManageRisks(2, $basket, $customerData));
 
-        $this->module->sSYSTEM->sSESSION_ID = uniqid((string) rand());
-        $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID);
+        $this->generateBasketSession();
         $this->basketModule->sAddArticle('SW10118.8');
 
         // sRiskATTRIS
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
@@ -1699,12 +1626,12 @@ public function testsManageRisks(): void
         );
 
         $fullBasket = $this->basketModule->sGetBasket();
-        static::assertTrue($this->module->sManageRisks(2, $fullBasket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertTrue($this->module->sManageRisks(2, $fullBasket, $customerData));
+        $this->connection->createQueryBuilder()->delete('s_core_rulesets')->where('id >= ' . $firstTestRuleId)->execute();
 
         $this->basketModule->sAddArticle('SW10118.8');
         // sRiskATTRISNOT
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
@@ -1712,55 +1639,50 @@ public function testsManageRisks(): void
                 'value1' => '17|null',
             ]
         );
-        static::assertFalse($this->module->sManageRisks(2, $fullBasket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertFalse($this->module->sManageRisks(2, $fullBasket, $customerData));
 
         // sRiskDUNNINGLEVELONE
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
                 'rule1' => 'DUNNINGLEVELONE',
             ]
         );
-        static::assertFalse($this->module->sManageRisks(2, $fullBasket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertFalse($this->module->sManageRisks(2, $fullBasket, $customerData));
 
         // sRiskDUNNINGLEVELTWO
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
                 'rule1' => 'DUNNINGLEVELTWO',
             ]
         );
-        static::assertFalse($this->module->sManageRisks(2, $fullBasket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertFalse($this->module->sManageRisks(2, $fullBasket, $customerData));
 
         // sRiskDUNNINGLEVELTHREE
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
                 'rule1' => 'DUNNINGLEVELTHREE',
             ]
         );
-        static::assertFalse($this->module->sManageRisks(2, $fullBasket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertFalse($this->module->sManageRisks(2, $fullBasket, $customerData));
 
         // sRiskINKASSO
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
                 'rule1' => 'INKASSO',
             ]
         );
-        static::assertTrue($this->module->sManageRisks(2, $fullBasket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertTrue($this->module->sManageRisks(2, $fullBasket, $customerData));
 
         // sRiskLASTORDERLESS
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
@@ -1768,11 +1690,11 @@ public function testsManageRisks(): void
                 'value1' => '1',
             ]
         );
-        static::assertTrue($this->module->sManageRisks(2, $fullBasket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertTrue($this->module->sManageRisks(2, $fullBasket, $customerData));
+        $this->connection->createQueryBuilder()->delete('s_core_rulesets')->where('id >= ' . $firstTestRuleId)->execute();
 
         // sRiskARTICLESFROM
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
@@ -1780,11 +1702,10 @@ public function testsManageRisks(): void
                 'value1' => '1',
             ]
         );
-        static::assertFalse($this->module->sManageRisks(2, $fullBasket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertFalse($this->module->sManageRisks(2, $fullBasket, $customerData));
 
         // sRiskARTICLESFROM
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
@@ -1792,11 +1713,10 @@ public function testsManageRisks(): void
                 'value1' => '9',
             ]
         );
-        static::assertTrue($this->module->sManageRisks(2, $fullBasket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertTrue($this->module->sManageRisks(2, $fullBasket, $customerData));
 
         // sRiskLASTORDERSLESS
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
@@ -1804,11 +1724,11 @@ public function testsManageRisks(): void
                 'value1' => '9',
             ]
         );
-        static::assertTrue($this->module->sManageRisks(2, $fullBasket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertTrue($this->module->sManageRisks(2, $fullBasket, $customerData));
+        $this->connection->createQueryBuilder()->delete('s_core_rulesets')->where('id >= ' . $firstTestRuleId)->execute();
 
         // sRiskLASTORDERSLESS
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
@@ -1816,11 +1736,10 @@ public function testsManageRisks(): void
                 'value1' => '0',
             ]
         );
-        static::assertFalse($this->module->sManageRisks(2, $fullBasket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertFalse($this->module->sManageRisks(2, $fullBasket, $customerData));
 
         // sRiskPREGSTREET
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
@@ -1828,11 +1747,11 @@ public function testsManageRisks(): void
                 'value1' => 'Merkel',
             ]
         );
-        static::assertTrue($this->module->sManageRisks(2, $fullBasket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertTrue($this->module->sManageRisks(2, $fullBasket, $customerData));
+        $this->connection->createQueryBuilder()->delete('s_core_rulesets')->where('id >= ' . $firstTestRuleId)->execute();
 
         // sRiskPREGSTREET
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
@@ -1840,11 +1759,10 @@ public function testsManageRisks(): void
                 'value1' => 'Google',
             ]
         );
-        static::assertFalse($this->module->sManageRisks(2, $fullBasket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertFalse($this->module->sManageRisks(2, $fullBasket, $customerData));
 
         // sRiskPREGBILLINGSTREET
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
@@ -1852,34 +1770,32 @@ public function testsManageRisks(): void
                 'value1' => 'Google',
             ]
         );
-        static::assertFalse($this->module->sManageRisks(2, $fullBasket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertFalse($this->module->sManageRisks(2, $fullBasket, $customerData));
 
         // sRiskDIFFER
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
                 'rule1' => 'DIFFER',
             ]
         );
-        static::assertTrue($this->module->sManageRisks(2, $fullBasket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertTrue($this->module->sManageRisks(2, $fullBasket, $customerData));
 
         // sRiskCUSTOMERNR
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
                 'rule1' => 'CUSTOMERNR',
-                'value1' => $customer->getNumber(),
+                'value1' => $customerModel->getNumber(),
             ]
         );
-        static::assertTrue($this->module->sManageRisks(2, $fullBasket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertTrue($this->module->sManageRisks(2, $fullBasket, $customerData));
+        $this->connection->createQueryBuilder()->delete('s_core_rulesets')->where('id >= ' . $firstTestRuleId)->execute();
 
         // sRiskCUSTOMERNR
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
@@ -1887,11 +1803,10 @@ public function testsManageRisks(): void
                 'value1' => 'ThisIsNeverGoingToBeACustomerNumber',
             ]
         );
-        static::assertFalse($this->module->sManageRisks(2, $fullBasket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertFalse($this->module->sManageRisks(2, $fullBasket, $customerData));
 
         // sRiskLASTNAME
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
@@ -1899,11 +1814,11 @@ public function testsManageRisks(): void
                 'value1' => 'Mustermann',
             ]
         );
-        static::assertTrue($this->module->sManageRisks(2, $fullBasket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertTrue($this->module->sManageRisks(2, $fullBasket, $customerData));
+        $this->connection->createQueryBuilder()->delete('s_core_rulesets')->where('id >= ' . $firstTestRuleId)->execute();
 
         // sRiskLASTNAME
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
@@ -1911,11 +1826,10 @@ public function testsManageRisks(): void
                 'value1' => 'NotMustermann',
             ]
         );
-        static::assertFalse($this->module->sManageRisks(2, $fullBasket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertFalse($this->module->sManageRisks(2, $fullBasket, $customerData));
 
         // sRiskSUBSHOP
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
@@ -1923,11 +1837,11 @@ public function testsManageRisks(): void
                 'value1' => '1',
             ]
         );
-        static::assertTrue($this->module->sManageRisks(2, $fullBasket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertTrue($this->module->sManageRisks(2, $fullBasket, $customerData));
+        $this->connection->createQueryBuilder()->delete('s_core_rulesets')->where('id >= ' . $firstTestRuleId)->execute();
 
         // sRiskSUBSHOP
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
@@ -1935,11 +1849,10 @@ public function testsManageRisks(): void
                 'value1' => '2',
             ]
         );
-        static::assertFalse($this->module->sManageRisks(2, $fullBasket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertFalse($this->module->sManageRisks(2, $fullBasket, $customerData));
 
         // sRiskSUBSHOPNOT
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
@@ -1947,11 +1860,11 @@ public function testsManageRisks(): void
                 'value1' => '2',
             ]
         );
-        static::assertTrue($this->module->sManageRisks(2, $fullBasket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertTrue($this->module->sManageRisks(2, $fullBasket, $customerData));
+        $this->connection->createQueryBuilder()->delete('s_core_rulesets')->where('id >= ' . $firstTestRuleId)->execute();
 
         // sRiskSUBSHOPNOT
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
@@ -1959,11 +1872,10 @@ public function testsManageRisks(): void
                 'value1' => '1',
             ]
         );
-        static::assertFalse($this->module->sManageRisks(2, $fullBasket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertFalse($this->module->sManageRisks(2, $fullBasket, $customerData));
 
         // sRiskCURRENCIESISOIS
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
@@ -1971,11 +1883,11 @@ public function testsManageRisks(): void
                 'value1' => 'eur',
             ]
         );
-        static::assertTrue($this->module->sManageRisks(2, $fullBasket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertTrue($this->module->sManageRisks(2, $fullBasket, $customerData));
+        $this->connection->createQueryBuilder()->delete('s_core_rulesets')->where('id >= ' . $firstTestRuleId)->execute();
 
         // sRiskCURRENCIESISOIS
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
@@ -1983,11 +1895,10 @@ public function testsManageRisks(): void
                 'value1' => 'yen',
             ]
         );
-        static::assertFalse($this->module->sManageRisks(2, $fullBasket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertFalse($this->module->sManageRisks(2, $fullBasket, $customerData));
 
         // sRiskCURRENCIESISOISNOT
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
@@ -1995,11 +1906,10 @@ public function testsManageRisks(): void
                 'value1' => 'eur',
             ]
         );
-        static::assertFalse($this->module->sManageRisks(2, $fullBasket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertFalse($this->module->sManageRisks(2, $fullBasket, $customerData));
 
         // sRiskCURRENCIESISOISNOT
-        Shopware()->Db()->insert(
+        $this->connection->insert(
             's_core_rulesets',
             [
                 'paymentID' => 2,
@@ -2007,17 +1917,13 @@ public function testsManageRisks(): void
                 'value1' => 'yen',
             ]
         );
-        static::assertTrue($this->module->sManageRisks(2, $fullBasket, $user));
-        Shopware()->Db()->delete('s_core_rulesets', 'id >= ' . $firstTestRuleId);
+        static::assertTrue($this->module->sManageRisks(2, $fullBasket, $customerData));
 
-        Shopware()->Db()->delete('s_order', 'id = ' . $orderId);
-        $this->deleteDummyCustomer($customer);
+        $this->connection->delete('s_order', ['id' => $orderId]);
+        $this->deleteDummyCustomer($customerModel);
         $this->session->offsetSet('sUserId', null);
     }
 
-    /**
-     * @covers \sAdmin::sNewsletterSubscription
-     */
     public function testsNewsletterSubscriptionWithPostData(): void
     {
         // Test subscribe with empty post field and empty address, fail validation
@@ -2034,60 +1940,82 @@ public function testsNewsletterSubscriptionWithPostData(): void
         static::assertSame(['newsletter' => true], $result['sErrorFlag']);
     }
 
-    /**
-     * @covers \sAdmin::sNewsletterSubscription
-     */
+    public function testsNewsletterSubscriptionWithURLInFirstAndLastname(): void
+    {
+        // Test subscribe with empty post field and empty address, fail validation
+        $this->getRequest()->setPost([
+            'subscribeToNewsletter' => 1,
+            'newsletter' => 'test@example.org',
+            'salutation' => 'mr',
+            'firstname' => 'https://example.org',
+            'lastname' => 'https://example.org',
+            'street' => 'teststraße 1',
+            'zipcode' => '12345',
+            'city' => 'test',
+        ]);
+
+        $result = $this->module->sNewsletterSubscription('test@example.org');
+
+        static::assertArrayHasKey('code', $result);
+        static::assertArrayHasKey('message', $result);
+        static::assertSame(10, $result['code']);
+
+        $message = $this->snippetManager->getNamespace('frontend/account/internalMessages')
+        ->get('UrlInFieldFailure', 'A URL is not allowed in this field');
+        static::assertSame($message, $result['message']);
+    }
+
     public function testsNewsletterSubscription(): void
     {
         $validAddress = uniqid((string) rand()) . '@shopware.com';
 
         // Test unsubscribe with non existing email, fail
         $result = $this->module->sNewsletterSubscription(uniqid((string) rand()) . '@shopware.com', true);
-        static::assertEquals(
+        static::assertSame(
             [
                 'code' => 4,
                 'message' => $this->snippetManager->getNamespace('frontend/account/internalMessages')
-                        ->get('NewsletterFailureNotFound', 'This mail address could not be found'),
+                    ->get('NewsletterFailureNotFound', 'This mail address could not be found'),
             ],
             $result
         );
 
         // Test unsubscribe with empty post field, fail validation
         $result = $this->module->sNewsletterSubscription('', true);
-        static::assertEquals(
+        static::assertSame(
             [
                 'code' => 6,
                 'message' => $this->snippetManager->getNamespace('frontend/account/internalMessages')
-                        ->get('NewsletterFailureMail', 'Enter eMail address'),
+                    ->get('NewsletterFailureMail', 'Enter eMail address'),
             ],
             $result
         );
 
         // Test with empty field, fail validation
         $result = $this->module->sNewsletterSubscription('');
-        static::assertEquals(
+        static::assertSame(
             [
                 'code' => 6,
                 'message' => $this->snippetManager->getNamespace('frontend/account/internalMessages')
-                        ->get('NewsletterFailureMail', 'Enter eMail address'),
+                    ->get('NewsletterFailureMail', 'Enter eMail address'),
             ],
             $result
         );
 
         // Test with malformed email, fail validation
         $result = $this->module->sNewsletterSubscription('thisIsNotAValidEmailAddress');
-        static::assertEquals(
+        static::assertSame(
             [
                 'code' => 1,
                 'message' => $this->snippetManager->getNamespace('frontend/account/internalMessages')
-                        ->get('NewsletterFailureInvalid', 'Enter valid eMail address'),
+                    ->get('NewsletterFailureInvalid', 'Enter valid eMail address'),
             ],
             $result
         );
 
         // Check that test email does not exist
         static::assertFalse(
-            Shopware()->Db()->fetchRow(
+            $this->connection->fetchAssociative(
                 'SELECT email, groupID FROM s_campaigns_mailaddresses WHERE email LIKE ?',
                 [$validAddress]
             )
@@ -2095,11 +2023,11 @@ public function testsNewsletterSubscription(): void
 
         // Test with correct unique email, all ok
         $result = $this->module->sNewsletterSubscription($validAddress);
-        static::assertEquals(
+        static::assertSame(
             [
                 'code' => 3,
                 'message' => $this->snippetManager->getNamespace('frontend/account/internalMessages')
-                        ->get('NewsletterSuccess', 'Thank you for receiving our newsletter'),
+                    ->get('NewsletterSuccess', 'Thank you for receiving our newsletter'),
                 'isNewRegistration' => true,
             ],
             $result
@@ -2111,7 +2039,7 @@ public function testsNewsletterSubscription(): void
                 'email' => $validAddress,
                 'groupID' => $this->config->get('sNEWSLETTERDEFAULTGROUP'),
             ],
-            Shopware()->Db()->fetchRow(
+            $this->connection->fetchAssociative(
                 'SELECT email, groupID FROM s_campaigns_mailaddresses WHERE email LIKE ?',
                 [$validAddress]
             )
@@ -2123,7 +2051,7 @@ public function testsNewsletterSubscription(): void
                     'groupID' => $this->config->get('sNEWSLETTERDEFAULTGROUP'),
                 ],
             ],
-            Shopware()->Db()->fetchAll(
+            $this->connection->fetchAllAssociative(
                 'SELECT email, groupID FROM s_campaigns_maildata WHERE email LIKE ?',
                 [$validAddress]
             )
@@ -2131,11 +2059,11 @@ public function testsNewsletterSubscription(): void
 
         // Test with same email, fail
         $result = $this->module->sNewsletterSubscription($validAddress);
-        static::assertEquals(
+        static::assertSame(
             [
                 'code' => 3,
                 'message' => $this->snippetManager->getNamespace('frontend/account/internalMessages')
-                        ->get('NewsletterSuccess', 'Thank you! We have entered your address.'),
+                    ->get('NewsletterSuccess', 'Thank you! We have entered your address.'),
                 'isNewRegistration' => false,
             ],
             $result
@@ -2144,11 +2072,11 @@ public function testsNewsletterSubscription(): void
         // Test with same email in a different list, fail
         $groupId = rand(1, 9999);
         $result = $this->module->sNewsletterSubscription($validAddress, false, $groupId);
-        static::assertEquals(
+        static::assertSame(
             [
                 'code' => 3,
                 'message' => $this->snippetManager->getNamespace('frontend/account/internalMessages')
-                        ->get('NewsletterSuccess', 'Thank you! We have entered your address.'),
+                    ->get('NewsletterSuccess', 'Thank you! We have entered your address.'),
                 'isNewRegistration' => false,
             ],
             $result
@@ -2162,7 +2090,7 @@ public function testsNewsletterSubscription(): void
                     'groupID' => $this->config->get('sNEWSLETTERDEFAULTGROUP'),
                 ],
             ],
-            Shopware()->Db()->fetchAll(
+            $this->connection->fetchAllAssociative(
                 'SELECT email, groupID FROM s_campaigns_mailaddresses WHERE email LIKE ?',
                 [$validAddress]
             )
@@ -2178,7 +2106,7 @@ public function testsNewsletterSubscription(): void
                     'groupID' => $groupId,
                 ],
             ],
-            Shopware()->Db()->fetchAll(
+            $this->connection->fetchAllAssociative(
                 'SELECT email, groupID FROM s_campaigns_maildata WHERE email LIKE ?',
                 [$validAddress]
             )
@@ -2186,18 +2114,18 @@ public function testsNewsletterSubscription(): void
 
         // Test unsubscribe the same email, all ok
         $result = $this->module->sNewsletterSubscription($validAddress, true);
-        static::assertEquals(
+        static::assertSame(
             [
                 'code' => 5,
                 'message' => $this->snippetManager->getNamespace('frontend/account/internalMessages')
-                        ->get('NewsletterMailDeleted', 'Your mail address was deleted'),
+                    ->get('NewsletterMailDeleted', 'Your mail address was deleted'),
             ],
             $result
         );
 
         // Check that test email address was removed
         static::assertFalse(
-            Shopware()->Db()->fetchRow(
+            $this->connection->fetchAssociative(
                 'SELECT email, groupID FROM s_campaigns_mailaddresses WHERE email LIKE ?',
                 [$validAddress]
             )
@@ -2211,28 +2139,25 @@ public function testsNewsletterSubscription(): void
                     'groupID' => $groupId,
                 ],
             ],
-            Shopware()->Db()->fetchAll(
+            $this->connection->fetchAllAssociative(
                 'SELECT email, groupID FROM s_campaigns_maildata WHERE email LIKE ?',
                 [$validAddress]
             )
         );
 
-        Shopware()->Db()->delete(
+        $this->connection->delete(
             's_campaigns_maildata',
-            'email LIKE "' . $validAddress . '"'
+            ['email' => $validAddress]
         );
     }
 
-    /**
-     * @covers \sAdmin::sGetCountry
-     */
     public function testsGetCountry(): void
     {
         // Empty argument, return false
         static::assertFalse($this->module->sGetCountry(''));
 
         // No matching country, return empty array
-        static::assertEquals([], $this->module->sGetCountry(-1));
+        static::assertSame([], $this->module->sGetCountry(-1));
 
         // Valid country returns valid data
         $result = $this->module->sGetCountry('de');
@@ -2252,26 +2177,23 @@ public function testsGetCountry(): void
         );
 
         // Fetching for id or iso code gives the same result
-        static::assertEquals(
+        static::assertSame(
             $this->module->sGetCountry($result['id']),
             $result
         );
     }
 
-    /**
-     * @covers \sAdmin::sGetPaymentMean
-     */
     public function testsGetPaymentmean(): void
     {
         // Empty argument, return false
         static::assertFalse($this->module->sGetPaymentMean(''));
 
         // No matching payment mean, return empty array
-        static::assertEquals(['country_surcharge' => []], $this->module->sGetPaymentMean(-1));
+        static::assertSame(['country_surcharge' => []], $this->module->sGetPaymentMean(-1));
 
         // Valid country returns valid data
         $result = $this->module->sGetPaymentMean(
-            Shopware()->Db()->fetchOne('SELECT id FROM s_core_paymentmeans WHERE name = "prepayment"')
+            $this->connection->fetchOne('SELECT id FROM s_core_paymentmeans WHERE name = "prepayment"')
         );
         static::assertIsArray($result);
 
@@ -2298,21 +2220,18 @@ public function testsGetPaymentmean(): void
                 'pluginID' => null,
                 'source' => null,
                 'country_surcharge' => [
-                    ],
+                ],
             ],
             $result
         );
 
         // Fetching for id or iso code gives the same result
-        static::assertEquals(
+        static::assertSame(
             $this->module->sGetPaymentMean($result['name']),
             $result
         );
     }
 
-    /**
-     * @covers \sAdmin::sGetDispatchBasket
-     */
     public function testsGetDispatchBasket(): void
     {
         $this->session->clear();
@@ -2321,8 +2240,7 @@ public function testsGetDispatchBasket(): void
         // No basket, return false
         static::assertFalse($this->module->sGetDispatchBasket());
 
-        $this->module->sSYSTEM->sSESSION_ID = uniqid((string) rand());
-        $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID);
+        $this->generateBasketSession();
         $this->basketModule->sAddArticle('SW10118.8');
 
         // With the correct data, return properly formatted array
@@ -2354,18 +2272,14 @@ public function testsGetDispatchBasket(): void
         static::assertArrayHasKey('sessionID', $result);
     }
 
-    /**
-     * @covers \sAdmin::sGetPremiumDispatches
-     */
     public function testsGetPremiumDispatches(): void
     {
         $this->session->clear();
 
         // No basket, return empty array,
-        static::assertEquals([], $this->module->sGetPremiumDispatches());
+        static::assertSame([], $this->module->sGetPremiumDispatches());
 
-        $this->module->sSYSTEM->sSESSION_ID = uniqid((string) rand());
-        $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID);
+        $this->generateBasketSession();
         $this->basketModule->sAddArticle('SW10118.8');
 
         $result = $this->module->sGetPremiumDispatches();
@@ -2380,64 +2294,147 @@ public function testsGetPremiumDispatches(): void
         }
     }
 
-    /**
-     * @covers \sAdmin::sGetPremiumDispatchSurcharge
-     */
     public function testsGetPremiumDispatchSurcharge(): void
     {
         $this->session->clear();
 
         // No basket, return false,
-        static::assertFalse($this->module->sGetPremiumDispatchSurcharge(null));
+        static::assertFalse($this->module->sGetPremiumDispatchSurcharge([]));
 
-        $this->module->sSYSTEM->sSESSION_ID = uniqid((string) rand());
-        $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID);
+        $this->generateBasketSession();
         $this->basketModule->sAddArticle('SW10010');
         $fullBasket = $this->module->sGetDispatchBasket();
+        static::assertIsArray($fullBasket);
 
         $result = $this->module->sGetPremiumDispatchSurcharge($fullBasket);
-        static::assertEquals(0, $result);
+        static::assertSame(0.0, $result);
     }
 
-    /**
-     * @covers \sAdmin::sGetPremiumShippingcosts
-     */
     public function testsGetPremiumShippingcosts(): void
     {
+        $this->generateBasketSession();
+
         // No basket, return false,
         static::assertFalse($this->module->sGetPremiumShippingcosts());
 
+        $germany = null;
         foreach ($this->module->sGetCountryList() as $country) {
-            if ($country['countryiso']) {
+            if ($country['countryiso'] === 'DE') {
                 $germany = $country;
                 break;
             }
         }
+        static::assertIsArray($germany);
 
-        $this->module->sSYSTEM->sSESSION_ID = uniqid((string) rand());
-        $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID);
         $this->basketModule->sAddArticle('SW10010');
 
         // With country data, no dispatch method
-        static::assertEquals(
-            sAdmin::NO_SHIPPING_COSTS,
-            $this->module->sGetPremiumShippingcosts($germany)
-        );
+        $noResult = $this->module->sGetPremiumShippingcosts($germany);
+        static::assertSame(sAdmin::NO_SHIPPING_COSTS, $noResult);
 
         // With dispatch method
-        $this->session->offsetSet('sDispatch', 9);
+        $this->session->offsetSet('sDispatch', self::DEFAULT_SHIPPING_METHOD_ID);
         $result = $this->module->sGetPremiumShippingcosts($germany);
         static::assertIsArray($result);
-        static::assertArrayHasKey('brutto', $result);
-        static::assertArrayHasKey('netto', $result);
-        static::assertArrayHasKey('value', $result);
-        static::assertArrayHasKey('factor', $result);
-        static::assertArrayHasKey('surcharge', $result);
-        static::assertArrayHasKey('tax', $result);
+        static::assertSame('3.90', $result['value']);
+        static::assertSame('0.00', $result['factor']);
+        static::assertSame(3.9, $result['brutto']);
+        static::assertSame(0.0, $result['surcharge']);
+        static::assertSame('0', $result['taxMode']);
+        static::assertSame(19.0, $result['tax']);
+        static::assertSame(3.28, $result['netto']);
+    }
+
+    public function testsGetPremiumShippingcostsWithCountryTaxRule(): void
+    {
+        $austria = null;
+        foreach ($this->module->sGetCountryList() as $country) {
+            if ($country['countryiso'] === 'AT') {
+                $austria = $country;
+                break;
+            }
+        }
+        static::assertIsArray($austria);
+
+        $expectedTaxValue = 20.0;
+
+        $newTax = new Tax();
+        $newTax->setTax('19.0');
+        $newTax->setName('Test tax');
+        $taxRule = new Rule();
+        $taxRule->setTax((string) $expectedTaxValue);
+        $taxRule->setName('Test tax austria');
+        $taxRule->setActive(true);
+        $taxRule->setCountryId($austria['id']);
+        $taxRule->setAreaId($austria['areaId']);
+        $taxRule->setGroup($newTax);
+        $taxRule->setCustomerGroupId(self::DEFAULT_CUSTOMER_GROUP_ID);
+        $newTax->setRules(new ArrayCollection([$taxRule]));
+
+        $modelManager = $this->getContainer()->get(ModelManager::class);
+        $modelManager->persist($newTax);
+        $modelManager->flush($newTax);
+        $modelManager->refresh($newTax);
+
+        $dispatch = $modelManager->find(Dispatch::class, self::DEFAULT_SHIPPING_METHOD_ID);
+        static::assertInstanceOf(Dispatch::class, $dispatch);
+        $dispatch->setTaxCalculation($newTax->getId());
+        $modelManager->persist($dispatch);
+        $modelManager->flush($dispatch);
+
+        $this->session->offsetSet('sCountry', $austria['id']);
+        $this->session->offsetSet('sArea', $austria['areaId']);
+        $this->session->offsetSet('sDispatch', self::DEFAULT_SHIPPING_METHOD_ID);
+        $this->getContainer()->get(ContextServiceInterface::class)->initializeShopContext();
+
+        $this->generateBasketSession();
+        $this->basketModule->sAddArticle('SW10010');
+
+        $result = $this->module->sGetPremiumShippingcosts($austria);
+        static::assertIsArray($result);
+        static::assertSame($newTax->getId(), (int) $result['taxMode']);
+        static::assertSame($expectedTaxValue, $result['tax']);
+    }
+
+    public function testCsrfTokenAreUpdatedLogout(): void
+    {
+        static::assertCount(0, $this->getResponse()->headers->getCookies());
+
+        $customer = $this->createDummyCustomer();
+
+        // Test successful login
+        $this->getRequest()->setPost([
+            'email' => $customer->getEmail(),
+            'password' => 'fooobar',
+        ]);
+        $this->module->sLogin();
+
+        $csrfCookies = array_filter($this->getResponse()->headers->getCookies(), static function ($cookie) {
+            return $cookie->getName() === '__csrf_token-1';
+        });
+        $cookie = array_pop($csrfCookies);
+        static::assertInstanceOf(Cookie::class, $cookie);
+        $token = $cookie->getValue();
+        static::assertIsString($token);
+
+        $this->getContainer()->get('front')->setResponse(new Enlight_Controller_Response_ResponseTestCase());
+
+        $this->module->logout();
+
+        $csrfCookies = array_filter($this->getResponse()->headers->getCookies(), static function ($cookie) {
+            return $cookie->getName() === '__csrf_token-1';
+        });
+        $cookie = array_pop($csrfCookies);
+        static::assertInstanceOf(Cookie::class, $cookie);
+        $newToken = $cookie->getValue();
+        static::assertIsString($newToken);
+
+        static::assertNotEquals($token, $newToken);
     }
 
     /**
-     * @param array<string, array> $userData
+     * @param array<string, array<string, mixed>> $userData
+     *
      * @dataProvider dataProviderDataCustomerAttributeIsNot
      */
     public function testCustomerAttributeIsNot(array $userData, string $attribute, bool $expectation): void
@@ -2445,10 +2442,7 @@ public function testCustomerAttributeIsNot(array $userData, string $attribute, b
         static::assertSame($expectation, $this->module->sRiskCUSTOMERATTRISNOT($userData, [], $attribute));
     }
 
-    /**
-     * @return array<int, array>
-     */
-    public function dataProviderDataCustomerAttributeIsNot(): iterable
+    public function dataProviderDataCustomerAttributeIsNot(): Generator
     {
         // Not logged in
         yield [
@@ -2509,6 +2503,64 @@ public function dataProviderDataCustomerAttributeIsNot(): iterable
         ];
     }
 
+    public function testOverwriteBillingAddressShouldAcceptUpperCaseCheckoutControllerName(): void
+    {
+        $reflectionMethod = TestReflectionHelper::getMethod(sAdmin::class, 'overwriteBillingAddress');
+
+        $request = $this->front->Request();
+        static::assertInstanceOf(Enlight_Controller_Request_Request::class, $request);
+
+        $requestControllerNameResetValue = $request->getControllerName();
+        $checkoutBillingAddressIdSessionResetValue = $this->session->offsetGet('checkoutBillingAddressId');
+        $sUserIdSessionResetValue = $this->session->offsetGet('sUserId');
+
+        $this->session->offsetSet('checkoutBillingAddressId', 3);
+        $this->session->offsetSet('sUserId', 1);
+        $request->setControllerName('Checkout');
+
+        $userData = ['billingaddress' => []];
+
+        $result = $reflectionMethod->invoke($this->module, $userData);
+
+        static::assertSame(3, $result['billingaddress']['id']);
+
+        $this->session->offsetSet('checkoutBillingAddressId', $checkoutBillingAddressIdSessionResetValue);
+        $this->session->offsetSet('sUserId', $sUserIdSessionResetValue);
+        $request->setControllerName($requestControllerNameResetValue);
+    }
+
+    public function testOverwriteShippingAddressShouldAcceptUpperCaseCheckoutControllerName(): void
+    {
+        $reflectionMethod = TestReflectionHelper::getMethod(sAdmin::class, 'overwriteShippingAddress');
+        $reflectionMethod->setAccessible(true);
+
+        $request = $this->front->Request();
+        static::assertInstanceOf(Enlight_Controller_Request_Request::class, $request);
+
+        $requestControllerNameResetValue = $request->getControllerName();
+        $checkoutBillingAddressIdSessionResetValue = $this->session->offsetGet('checkoutBillingAddressId');
+        $sUserIdSessionResetValue = $this->session->offsetGet('sUserId');
+
+        $this->session->offsetSet('checkoutShippingAddressId', 3);
+        $this->session->offsetSet('sUserId', 1);
+        $request->setControllerName('Checkout');
+
+        $userData = ['shippingaddress' => []];
+
+        $result = $reflectionMethod->invoke($this->module, $userData);
+
+        static::assertSame(3, $result['shippingaddress']['id']);
+
+        $this->session->offsetSet('checkoutBillingAddressId', $checkoutBillingAddressIdSessionResetValue);
+        $this->session->offsetSet('sUserId', $sUserIdSessionResetValue);
+        $request->setControllerName($requestControllerNameResetValue);
+    }
+
+    private function generateBasketSession(): void
+    {
+        $this->session->offsetSet('sessionId', Random::getAlphanumericString(32));
+    }
+
     /**
      * @param mixed[] $expected
      * @param mixed[] $actual
@@ -2592,8 +2644,8 @@ private function createDummyCustomer(): Customer
             ],
         ];
 
-        $customerResource = new \Shopware\Components\Api\Resource\Customer();
-        $customerResource->setManager(Shopware()->Models());
+        $customerResource = new CustomerResource();
+        $customerResource->setManager($this->getContainer()->get(ModelManager::class));
 
         return $customerResource->create($testData);
     }
@@ -2603,17 +2655,25 @@ private function createDummyCustomer(): Customer
      */
     private function deleteDummyCustomer(Customer $customer): void
     {
-        Shopware()->Db()->delete('s_user_addresses', 'user_id = ' . $customer->getId());
-        Shopware()->Db()->delete('s_core_payment_data', 'user_id = ' . $customer->getId());
-        Shopware()->Db()->delete('s_user_attributes', 'userID = ' . $customer->getId());
-        Shopware()->Db()->delete('s_user', 'id = ' . $customer->getId());
+        $this->connection->delete('s_user_addresses', ['user_id' => $customer->getId()]);
+        $this->connection->delete('s_core_payment_data', ['user_id' => $customer->getId()]);
+        $this->connection->delete('s_user_attributes', ['userID' => $customer->getId()]);
+        $this->connection->delete('s_user', ['id' => $customer->getId()]);
     }
 
     private function getRequest(): Enlight_Controller_Request_Request
     {
         $request = $this->front->Request();
-        static::assertNotNull($request);
+        static::assertInstanceOf(Enlight_Controller_Request_Request::class, $request);
 
         return $request;
     }
+
+    private function getResponse(): Response
+    {
+        $response = $this->front->Response();
+        static::assertInstanceOf(Response::class, $response);
+
+        return $response;
+    }
 }
diff --git a/tests/Functional/Core/sArticlesTest.php b/tests/Functional/Core/ArticlesTest.php
similarity index 71%
rename from tests/Functional/Core/sArticlesTest.php
rename to tests/Functional/Core/ArticlesTest.php
index 6df68f7bacf..6c514c7b996 100644
--- a/tests/Functional/Core/sArticlesTest.php
+++ b/tests/Functional/Core/ArticlesTest.php
@@ -1,44 +1,53 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+namespace Shopware\Tests\Functional\Core;
+
+use Enlight_Components_Test_Controller_TestCase;
+use sArticles;
+use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface;
+use Shopware\Models\Category\Category;
 use Shopware\Tests\Functional\Helper\Utils;
 
-class sArticlesTest extends Enlight_Components_Test_Controller_TestCase
+class ArticlesTest extends Enlight_Components_Test_Controller_TestCase
 {
-    public function testCanInstanciatesArticles()
+    public function testCanInstanciatesArticles(): void
     {
         $sArticles = new sArticles();
-        $categoryId = Shopware()->Shop()->getCategory()->getId();
+        $category = Shopware()->Shop()->getCategory();
+        static::assertNotNull($category);
+        $categoryId = $category->getId();
         $translationId = !Shopware()->Shop()->getDefault() ? Shopware()->Shop()->getId() : null;
-        $customerGroupId = (int) Shopware()->Modules()->System()->sUSERGROUPDATA['id'];
+        $customerGroupId = Shopware()->Container()->get(ContextServiceInterface::class)->getShopContext()->getCurrentCustomerGroup()->getId();
 
         $this->assertsArticlesState($sArticles, $categoryId, $translationId, $customerGroupId);
     }
 
-    public function testCanInjectParameters()
+    public function testCanInjectParameters(): void
     {
-        $category = new \Shopware\Models\Category\Category();
+        $category = new Category();
 
         $categoryId = 1;
         $translationId = 12;
@@ -55,7 +64,7 @@ public function testCanInjectParameters()
      *
      * @ticket SW-4887
      */
-    public function testPriceGroupForMainVariant()
+    public function testPriceGroupForMainVariant(): void
     {
         // Add price group
         $sql = '
@@ -67,7 +76,7 @@ public function testPriceGroupForMainVariant()
 
         $this->dispatch('/');
 
-        Shopware()->Container()->get(\Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface::class)->initializeShopContext();
+        Shopware()->Container()->get(ContextServiceInterface::class)->initializeShopContext();
 
         $correctPrice = '18,99';
         $article = Shopware()->Modules()->Articles()->sGetArticleById(
@@ -86,7 +95,7 @@ public function testPriceGroupForMainVariant()
     /**
      * @ticket SW-5391
      */
-    public function testsGetPromotionByIdWithNonExistingArticle()
+    public function testsGetPromotionByIdWithNonExistingArticle(): void
     {
         $result = Shopware()->Modules()->Articles()->sGetPromotionById('fix', 0, 9999999);
 
@@ -98,7 +107,7 @@ public function testsGetPromotionByIdWithNonExistingArticle()
      * Assert that numbers that are small enough to be represented as floating points by PHP when they are converted to
      * string are rounded correctly by sArticles::sRound.
      */
-    public function testsRoundWithFloatingPointRepresentation()
+    public function testsRoundWithFloatingPointRepresentation(): void
     {
         $sArticles = new sArticles();
         $input = 0.00001; // 1.0E-5
@@ -114,7 +123,7 @@ public function testsRoundWithFloatingPointRepresentation()
      * converted to string are rounded correctly by sArticles::sRound. Also assert that they are not represented as -0
      * (negative zero)
      */
-    public function testsRoundWithFloatingPointRepresentationNegative()
+    public function testsRoundWithFloatingPointRepresentationNegative(): void
     {
         $sArticles = new sArticles();
         $input = -0.00001; // -1.0E-5
@@ -131,7 +140,7 @@ public function testsRoundWithFloatingPointRepresentationNegative()
      * Assert that numbers that are small enough to be represented as floating points by PHP when they are converted to
      * string are rounded correctly by sArticles::sRound.
      */
-    public function testsRoundWithFloatingPointRepresentationLarge()
+    public function testsRoundWithFloatingPointRepresentationLarge(): void
     {
         $sArticles = new sArticles();
         $input = 100000000000000.0; // 1.0E14
@@ -142,9 +151,9 @@ public function testsRoundWithFloatingPointRepresentationLarge()
         static::assertEquals(100000000000000, $result);
     }
 
-    protected function assertsArticlesState($sArticles, $categoryId, $translationId, $customerGroupId)
+    private function assertsArticlesState(sArticles $sArticles, int $categoryId, ?int $translationId, int $customerGroupId): void
     {
-        static::assertInstanceOf('Shopware\Models\Category\Category', Utils::hijackAndReadProperty($sArticles, 'category'));
+        static::assertInstanceOf(Category::class, Utils::hijackAndReadProperty($sArticles, 'category'));
         static::assertEquals($categoryId, Utils::hijackAndReadProperty($sArticles, 'categoryId'));
         static::assertEquals($translationId, Utils::hijackAndReadProperty($sArticles, 'translationId'));
         static::assertEquals($customerGroupId, Utils::hijackAndReadProperty($sArticles, 'customerGroupId'));
diff --git a/tests/Functional/Core/BasketAddBasketAttributesTest.php b/tests/Functional/Core/BasketAddBasketAttributesTest.php
new file mode 100644
index 00000000000..b7fba58caec
--- /dev/null
+++ b/tests/Functional/Core/BasketAddBasketAttributesTest.php
@@ -0,0 +1,224 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Core;
+
+use Enlight_Components_Session_Namespace;
+use Enlight_Components_Snippet_Namespace;
+use Enlight_Controller_Front;
+use Enlight_Event_EventManager;
+use PHPUnit\Framework\TestCase;
+use sBasket;
+use Shopware\Bundle\StoreFrontBundle\Service\AdditionalTextServiceInterface;
+use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
+use Shopware_Components_Config;
+use Shopware_Components_Modules;
+use Shopware_Components_Snippet_Manager;
+use sSystem;
+
+class BasketAddBasketAttributesTest extends TestCase
+{
+    use ContainerTrait;
+    use DatabaseTransactionBehaviour;
+
+    private const TEST_SESSION_ID = 'BasketAddBasketAttributesTestSessionId';
+
+    /**
+     * @before
+     */
+    public function prepareDatabase(): void
+    {
+        $sql = file_get_contents(__DIR__ . '/fixtures/basket_add_basket_attribute_test.sql');
+        static::assertIsString($sql);
+
+        $this->getContainer()->get('dbal_connection')->executeQuery($sql);
+    }
+
+    public function testInsertDiscount(): void
+    {
+        $this->createSBasket()->sInsertDiscount();
+
+        static::assertNotNull($this->getDatabaseResult());
+    }
+
+    public function testInsertSurcharge(): void
+    {
+        $this->createSBasket()->sInsertSurcharge();
+
+        static::assertNotNull($this->getDatabaseResult());
+    }
+
+    public function testInsertSurchargePercent(): void
+    {
+        $this->createSBasket()->sInsertSurchargePercent();
+
+        static::assertNotNull($this->getDatabaseResult());
+    }
+
+    private function getDatabaseResult(): ?int
+    {
+        $result = $this->getContainer()->get('dbal_connection')->createQueryBuilder()
+            ->select(['basketAttributes.id'])
+            ->from('s_order_basket', 'basket')
+            ->join('basket', 's_order_basket_attributes', 'basketAttributes', 'basket.id = basketAttributes.basketID')
+            ->where('basket.sessionID = :sessionId')
+            ->setParameter('sessionId', self::TEST_SESSION_ID)
+            ->execute()
+            ->fetchOne();
+
+        if (!$result) {
+            return null;
+        }
+
+        return (int) $result;
+    }
+
+    private function createSBasket(): sBasket
+    {
+        return new sBasket(
+            $this->getContainer()->get('db'),
+            $this->createEventManagerMock(),
+            $this->createSnippetManagerMock(),
+            $this->createConfigMock(),
+            $this->createSessionMock(),
+            $this->createFrontControllerMock(),
+            $this->createModulesMock(),
+            $this->createSystemMock(),
+            $this->createContextServiceMock(),
+            $this->createAdditionalTextServiceMock()
+        );
+    }
+
+    private function createAdditionalTextServiceMock(): AdditionalTextServiceInterface
+    {
+        $additionalTextServiceMock = $this->createMock(AdditionalTextServiceInterface::class);
+
+        static::assertInstanceOf(AdditionalTextServiceInterface::class, $additionalTextServiceMock);
+
+        return $additionalTextServiceMock;
+    }
+
+    private function createContextServiceMock(): ContextServiceInterface
+    {
+        $contextServiceMock = $this->createMock(ContextServiceInterface::class);
+
+        static::assertInstanceOf(ContextServiceInterface::class, $contextServiceMock);
+
+        return $contextServiceMock;
+    }
+
+    private function createSystemMock(): sSystem
+    {
+        $sSystemMock = $this->createMock(sSystem::class);
+
+        $sSystemMock->sUSERGROUPDATA = ['id' => 1, 'minimumorder' => 100, 'minimumordersurcharge' => 1];
+        $sSystemMock->sCurrency['factor'] = 1;
+
+        static::assertInstanceOf(sSystem::class, $sSystemMock);
+
+        return $sSystemMock;
+    }
+
+    private function createModulesMock(): Shopware_Components_Modules
+    {
+        $modulesMock = $this->createMock(Shopware_Components_Modules::class);
+
+        static::assertInstanceOf(Shopware_Components_Modules::class, $modulesMock);
+
+        return $modulesMock;
+    }
+
+    private function createFrontControllerMock(): Enlight_Controller_Front
+    {
+        $frontControllerMock = $this->createMock(Enlight_Controller_Front::class);
+
+        static::assertInstanceOf(Enlight_Controller_Front::class, $frontControllerMock);
+
+        return $frontControllerMock;
+    }
+
+    private function createSessionMock(): Enlight_Components_Session_Namespace
+    {
+        $sessionMock = $this->createMock(Enlight_Components_Session_Namespace::class);
+
+        $sessionMock->method('get')->willReturnMap([
+            ['sessionId', null, self::TEST_SESSION_ID],
+            ['taxFree', null, false],
+            ['sPaymentID', null, 2],
+        ]);
+
+        static::assertInstanceOf(Enlight_Components_Session_Namespace::class, $sessionMock);
+
+        return $sessionMock;
+    }
+
+    private function createConfigMock(): Shopware_Components_Config
+    {
+        $configMock = $this->createMock(Shopware_Components_Config::class);
+
+        static::assertInstanceOf(Shopware_Components_Config::class, $configMock);
+
+        return $configMock;
+    }
+
+    private function createSnippetManagerMock(): Shopware_Components_Snippet_Manager
+    {
+        $snippetNameSpaceMock = $this->createMock(Enlight_Components_Snippet_Namespace::class);
+        $snippetNameSpaceMock->method('get')->willReturn('AnyDiscountName');
+
+        $snippetManagerMock = $this->createMock(Shopware_Components_Snippet_Manager::class);
+        $snippetManagerMock->method('getNamespace')->willReturn($snippetNameSpaceMock);
+
+        static::assertInstanceOf(Shopware_Components_Snippet_Manager::class, $snippetManagerMock);
+
+        return $snippetManagerMock;
+    }
+
+    private function createEventManagerMock(): Enlight_Event_EventManager
+    {
+        $params = [
+            'sessionID' => 'BasketAddBasketAttributesTestSessionId',
+            'articlename' => '-5 % AnyDiscountName',
+            'articleID' => 0,
+            'ordernumber' => 'sw-discount',
+            'quantity' => 1,
+            'price' => -0.55,
+            'netprice' => -0.55,
+            'tax_rate' => 19,
+            'datum' => '2023-01-04 13:16:50',
+            'modus' => 3,
+            'currencyFactor' => 1,
+        ];
+
+        $eventManagerMock = $this->createMock(Enlight_Event_EventManager::class);
+        $eventManagerMock->method('filter')->willReturn($params);
+
+        static::assertInstanceOf(Enlight_Event_EventManager::class, $eventManagerMock);
+
+        return $eventManagerMock;
+    }
+}
diff --git a/tests/Functional/Core/sBasketSAddVoucherTest.php b/tests/Functional/Core/BasketSAddVoucherTest.php
similarity index 56%
rename from tests/Functional/Core/sBasketSAddVoucherTest.php
rename to tests/Functional/Core/BasketSAddVoucherTest.php
index 427ff5ff01f..664cc910365 100644
--- a/tests/Functional/Core/sBasketSAddVoucherTest.php
+++ b/tests/Functional/Core/BasketSAddVoucherTest.php
@@ -1,33 +1,38 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+namespace Shopware\Tests\Functional\Core;
+
+use Enlight_Controller_Front;
+use Enlight_Controller_Request_RequestTestCase;
 use PHPUnit\Framework\TestCase;
 use Shopware\Tests\Functional\Traits\CustomerLoginTrait;
 use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 use Shopware\Tests\Functional\Traits\FixtureBehaviour;
 
-class sBasketSAddVoucherTest extends TestCase
+class BasketSAddVoucherTest extends TestCase
 {
     use FixtureBehaviour;
     use CustomerLoginTrait;
@@ -37,17 +42,15 @@ public function testsAddVoucherExpiredVoucher(): void
     {
         $voucherCode = 'foobar01';
 
-        $this->executeFixture(__DIR__ . '/fixtures/add-expired-voucher.sql');
+        static::executeFixture(__DIR__ . '/fixtures/add-expired-voucher.sql');
 
         $this->loginCustomer();
 
         $frontendController = Shopware()->Container()->get('front');
-        static::assertInstanceOf(\Enlight_Controller_Front::class, $frontendController);
-        $frontendController->setRequest(new \Enlight_Controller_Request_RequestTestCase());
-
-        $basket = Shopware()->Modules()->Basket();
+        static::assertInstanceOf(Enlight_Controller_Front::class, $frontendController);
+        $frontendController->setRequest(new Enlight_Controller_Request_RequestTestCase());
 
-        $result = $basket->sAddVoucher($voucherCode);
+        $result = Shopware()->Modules()->Basket()->sAddVoucher($voucherCode);
 
         static::assertIsArray($result);
         static::assertTrue($result['sErrorFlag']);
diff --git a/tests/Functional/Core/BasketTest.php b/tests/Functional/Core/BasketTest.php
index c0e302df036..a41de4350ce 100644
--- a/tests/Functional/Core/BasketTest.php
+++ b/tests/Functional/Core/BasketTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Core;
@@ -42,6 +41,7 @@
 use Shopware\Models\Article\Detail;
 use Shopware\Models\Customer\Customer;
 use Shopware\Tests\Functional\Bundle\StoreFrontBundle\Helper;
+use Shopware\Tests\Functional\Helper\Utils;
 use Shopware\Tests\Functional\Traits\ContainerTrait;
 use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 use Shopware_Components_Config;
@@ -85,15 +85,14 @@ public function testsGetAmount(): void
     {
         // Test with empty session, expect empty array
         static::assertEquals([], $this->module->sGetAmount());
-        $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true);
-        $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID);
+        $this->generateBasketSession();
 
         $this->connection->insert(
             's_order_basket',
             [
                 'price' => 123,
                 'quantity' => 2,
-                'sessionID' => $this->session->get('sessionId'),
+                'sessionID' => $this->getSessionId(),
             ]
         );
 
@@ -104,7 +103,7 @@ public function testsGetAmount(): void
 
         $this->connection->delete(
             's_order_basket',
-            ['sessionID' => $this->session->get('sessionId')]
+            ['sessionID' => $this->getSessionId()]
         );
     }
 
@@ -142,7 +141,7 @@ public function testsCheckBasketQuantitiesWithLowerQuantityThanAvailable(): void
             [
                 'price' => 123,
                 'quantity' => $inStockProduct['instock'] - 1,
-                'sessionID' => $this->session->get('sessionId'),
+                'sessionID' => $this->getSessionId(),
                 'ordernumber' => $inStockProduct['ordernumber'],
                 'articleID' => $inStockProduct['articleID'],
             ]
@@ -181,7 +180,7 @@ public function testsCheckBasketQuantitiesWithHigherQuantityThanAvailable(): voi
             [
                 'price' => 123,
                 'quantity' => $outStockProduct['instock'] + 1,
-                'sessionID' => $this->session->get('sessionId'),
+                'sessionID' => $this->getSessionId(),
                 'ordernumber' => $outStockProduct['ordernumber'],
                 'articleID' => $outStockProduct['articleID'],
             ]
@@ -205,7 +204,7 @@ public function testsCheckBasketQuantitiesWithHigherQuantityThanAvailable(): voi
             [
                 'price' => 123,
                 'quantity' => $inStockProduct['instock'] - 1,
-                'sessionID' => $this->session->get('sessionId'),
+                'sessionID' => $this->getSessionId(),
                 'ordernumber' => $inStockProduct['ordernumber'],
                 'articleID' => $inStockProduct['articleID'],
             ]
@@ -224,7 +223,7 @@ public function testsCheckBasketQuantitiesWithHigherQuantityThanAvailable(): voi
         // Clear the current cart
         $this->connection->delete(
             's_order_basket',
-            ['sessionID' => $this->session->get('sessionId')]
+            ['sessionID' => $this->getSessionId()]
         );
     }
 
@@ -250,7 +249,7 @@ public function testsCheckBasketQuantitiesWithoutStockControl(): void
             [
                 'price' => 123,
                 'quantity' => $ignoreStockProduct['instock'] + 1,
-                'sessionID' => $this->session->get('sessionId'),
+                'sessionID' => $this->getSessionId(),
                 'ordernumber' => $ignoreStockProduct['ordernumber'],
                 'articleID' => $ignoreStockProduct['articleID'],
             ]
@@ -267,7 +266,7 @@ public function testsCheckBasketQuantitiesWithoutStockControl(): void
         // Housekeeping
         $this->connection->delete(
             's_order_basket',
-            ['sessionID' => $this->session->get('sessionId')]
+            ['sessionID' => $this->getSessionId()]
         );
     }
 
@@ -286,15 +285,15 @@ public function testsGetAmountRestrictedArticles(): void
         $this->generateBasketSession();
 
         // Add two products to the basket
-        $randomProductOne = $this->getRandomProduct();
-        $randomProductTwo = $this->getRandomProduct(null, $randomProductOne['supplierID']);
+        $randomProductOne = $this->getProductWithLowestVariantId();
+        $randomProductTwo = $this->getProductWithLowestVariantId(null, $randomProductOne['supplierID']);
 
         $this->connection->insert(
             's_order_basket',
             [
                 'price' => 2,
                 'quantity' => 1,
-                'sessionID' => $this->session->get('sessionId'),
+                'sessionID' => $this->getSessionId(),
                 'ordernumber' => $randomProductOne['ordernumber'],
                 'articleID' => $randomProductOne['articleID'],
             ]
@@ -304,7 +303,7 @@ public function testsGetAmountRestrictedArticles(): void
             [
                 'price' => 3,
                 'quantity' => 1,
-                'sessionID' => $this->session->get('sessionId'),
+                'sessionID' => $this->getSessionId(),
                 'ordernumber' => $randomProductTwo['ordernumber'],
                 'articleID' => $randomProductTwo['articleID'],
             ]
@@ -394,7 +393,7 @@ public function testsGetAmountRestrictedArticles(): void
         // Housekeeping
         $this->connection->delete(
             's_order_basket',
-            ['sessionID' => $this->session->get('sessionId')]
+            ['sessionID' => $this->getSessionId()]
         );
     }
 
@@ -404,8 +403,7 @@ public function testsInsertPremium(): void
         static::assertTrue($this->module->sInsertPremium());
 
         // Create session id
-        $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true);
-        $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID);
+        $this->generateBasketSession();
 
         // Test with session, expect true
         static::assertTrue($this->module->sInsertPremium());
@@ -454,7 +452,7 @@ public function testsInsertPremium(): void
             [
                 'price' => 1,
                 'quantity' => 1,
-                'sessionID' => $this->session->get('sessionId'),
+                'sessionID' => $this->getSessionId(),
                 'ordernumber' => $normalProduct['ordernumber'],
                 'articleID' => $normalProduct['articleID'],
                 'modus' => 0,
@@ -465,7 +463,7 @@ public function testsInsertPremium(): void
             1,
             $this->connection->fetchOne(
                 'SELECT count(*) FROM s_order_basket WHERE sessionID = ?',
-                [$this->module->sSYSTEM->sSESSION_ID]
+                [$this->getSessionId()]
             )
         );
 
@@ -476,7 +474,7 @@ public function testsInsertPremium(): void
             [
                 'price' => 1,
                 'quantity' => 1,
-                'sessionID' => $this->session->get('sessionId'),
+                'sessionID' => $this->getSessionId(),
                 'ordernumber' => $premiumProductOne['ordernumber'],
                 'articleID' => $premiumProductOne['id'],
                 'modus' => 1,
@@ -487,7 +485,7 @@ public function testsInsertPremium(): void
             [
                 'price' => 1,
                 'quantity' => 1,
-                'sessionID' => $this->session->get('sessionId'),
+                'sessionID' => $this->getSessionId(),
                 'ordernumber' => $premiumProductTwo['ordernumber'],
                 'articleID' => $premiumProductTwo['id'],
                 'modus' => 1,
@@ -498,7 +496,7 @@ public function testsInsertPremium(): void
             1,
             $this->connection->fetchOne(
                 'SELECT count(*) FROM s_order_basket WHERE sessionID = ?',
-                [$this->module->sSYSTEM->sSESSION_ID]
+                [$this->getSessionId()]
             )
         );
 
@@ -515,7 +513,7 @@ public function testsInsertPremium(): void
             [
                 'price' => 10000,
                 'quantity' => 1,
-                'sessionID' => $this->session->get('sessionId'),
+                'sessionID' => $this->getSessionId(),
                 'ordernumber' => $normalProduct['ordernumber'],
                 'articleID' => $normalProduct['articleID'],
                 'modus' => 0,
@@ -531,7 +529,7 @@ public function testsInsertPremium(): void
             2,
             $this->connection->fetchOne(
                 'SELECT count(*) FROM s_order_basket WHERE sessionID = ?',
-                [$this->module->sSYSTEM->sSESSION_ID]
+                [$this->getSessionId()]
             )
         );
 
@@ -542,14 +540,14 @@ public function testsInsertPremium(): void
             3,
             $this->connection->fetchOne(
                 'SELECT count(*) FROM s_order_basket WHERE sessionID = ?',
-                [$this->module->sSYSTEM->sSESSION_ID]
+                [$this->getSessionId()]
             )
         );
 
         // Housekeeping
         $this->connection->delete(
             's_order_basket',
-            ['sessionID' => $this->session->get('sessionId')]
+            ['sessionID' => $this->getSessionId()]
         );
     }
 
@@ -558,31 +556,30 @@ public function testPremiumOrderNumberExport(): void
         $this->connection->beginTransaction();
 
         // Create session id
-        $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true);
-        $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID);
+        $this->generateBasketSession();
 
         // Test with session, expect true
         static::assertTrue($this->module->sInsertPremium());
 
         $ordernumberExport = 'test' . random_int(1000, 9999);
 
-        //Insert a new Premium product that has a ordernumber_export different from the ordernumber
+        // Insert a new Premium product that has a ordernumber_export different from the ordernumber
         $this->connection->insert('s_addon_premiums', ['startprice' => 0, 'ordernumber' => 'SW10137', 'ordernumber_export' => $ordernumberExport, 'subshopID' => 0]);
 
-        //sInsertPremium gets the premium to add from the Request, therefore we do set it here
+        // sInsertPremium gets the premium to add from the Request, therefore we do set it here
         $front = $this->getContainer()->get('front');
         static::assertInstanceOf(Enlight_Controller_Request_Request::class, $front->Request());
         $front->Request()->setQuery('sAddPremium', 'SW10137');
 
-        //add the premium item to the basket
+        // add the premium item to the basket
         $this->module->sInsertPremium();
 
-        //check if the ordernumber_export from s_addon_premiums has been added to s_order_basket as ordernumber
+        // check if the ordernumber_export from s_addon_premiums has been added to s_order_basket as ordernumber
         static::assertEquals(
             $ordernumberExport,
             $this->connection->fetchOne(
                 'SELECT ordernumber FROM s_order_basket WHERE sessionID = ? AND modus = 1',
-                [$this->module->sSYSTEM->sSESSION_ID]
+                [$this->getSessionId()]
             )
         );
 
@@ -596,8 +593,7 @@ public function testGetMaxTax(): void
         static::assertFalse($this->module->getMaxTax());
 
         // Create session id
-        $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true);
-        $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID);
+        $this->generateBasketSession();
 
         // Test with session and empty basket, expect false
         static::assertFalse($this->module->getMaxTax());
@@ -622,7 +618,7 @@ public function testGetMaxTax(): void
             [
                 'price' => 100,
                 'quantity' => 1,
-                'sessionID' => $this->session->get('sessionId'),
+                'sessionID' => $this->getSessionId(),
                 'ordernumber' => $products[0]['ordernumber'],
                 'articleID' => $products[0]['articleID'],
                 'tax_rate' => $products[0]['tax'],
@@ -636,7 +632,7 @@ public function testGetMaxTax(): void
             [
                 'price' => 100,
                 'quantity' => 1,
-                'sessionID' => $this->session->get('sessionId'),
+                'sessionID' => $this->getSessionId(),
                 'ordernumber' => $products[1]['ordernumber'],
                 'articleID' => $products[1]['articleID'],
                 'tax_rate' => $products[1]['tax'],
@@ -649,7 +645,7 @@ public function testGetMaxTax(): void
         // Housekeeping
         $this->connection->delete(
             's_order_basket',
-            ['sessionID' => $this->session->get('sessionId')]
+            ['sessionID' => $this->getSessionId()]
         );
     }
 
@@ -668,8 +664,7 @@ public function testsAddVoucherWithAbsoluteVoucher(): void
         );
 
         // Create session id and try again, same results
-        $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true);
-        $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID);
+        $this->generateBasketSession();
         $result = $this->module->sAddVoucher('');
         static::assertIsArray($result);
         static::assertArrayHasKey('sErrorFlag', $result);
@@ -692,8 +687,7 @@ public function testsAddVoucherWithAbsoluteVoucher(): void
             'modus' => 0,
         ];
         $this->connection->insert('s_emarketing_vouchers', $voucherData);
-        $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true);
-        $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID);
+        $this->generateBasketSession();
         $result = $this->module->sAddVoucher('testOne');
 
         static::assertIsArray($result);
@@ -706,8 +700,7 @@ public function testsAddVoucherWithAbsoluteVoucher(): void
         $currencyDe = $this->getContainer()->get(Zend_Currency::class);
         $this->getContainer()->set('currency', new Zend_Currency('GBP', new Zend_Locale('en_GB')));
 
-        $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true);
-        $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID);
+        $this->generateBasketSession();
         $result = $this->module->sAddVoucher('testOne');
         static::assertIsArray($result);
         static::assertArrayHasKey('sErrorFlag', $result);
@@ -719,13 +712,13 @@ public function testsAddVoucherWithAbsoluteVoucher(): void
         $this->getContainer()->set('currency', $currencyDe);
 
         // Add one product to the basket with enough value to use discount
-        $randomProduct = $this->getRandomProduct();
+        $randomProduct = $this->getProductWithLowestVariantId();
         $this->connection->insert(
             's_order_basket',
             [
                 'price' => $voucherData['minimumcharge'] + 1,
                 'quantity' => 1,
-                'sessionID' => $this->session->get('sessionId'),
+                'sessionID' => $this->getSessionId(),
                 'ordernumber' => $randomProduct['ordernumber'],
                 'articleID' => $randomProduct['articleID'],
             ]
@@ -760,13 +753,14 @@ public function testsAddVoucherWithAbsoluteVoucher(): void
 
         $previousAmount = $this->module->sGetAmount();
         // Voucher should work ok now
-        static::assertTrue($this->module->sAddVoucher('testOne'));
+        $result = $this->module->sAddVoucher('testOne');
+        static::assertTrue($result);
         static::assertLessThan($previousAmount, $this->module->sGetAmount());
 
         // Test the voucher values with tax from user group
         $discount = $this->connection->fetchAssociative(
             'SELECT * FROM s_order_basket WHERE modus = 2 and sessionID = ?',
-            [$this->module->sSYSTEM->sSESSION_ID]
+            [$this->getSessionId()]
         );
         static::assertIsArray($discount);
         static::assertEquals($voucherData['value'] * -1, $discount['price']);
@@ -790,7 +784,7 @@ public function testsAddVoucherWithAbsoluteVoucher(): void
         // Housekeeping
         $this->connection->delete(
             's_order_basket',
-            ['sessionID' => $this->session->get('sessionId')]
+            ['sessionID' => $this->getSessionId()]
         );
         $this->connection->delete(
             's_emarketing_vouchers',
@@ -829,8 +823,7 @@ public function testsAddVoucherWithLimitedVoucher(): void
 
         $customer = $this->createDummyCustomer();
         $this->session['sUserId'] = $customer->getId();
-        $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true);
-        $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID);
+        $this->generateBasketSession();
 
         // Test with one-time code, fail due to minimum amount (cart is empty)
         $result = $this->module->sAddVoucher($voucherCodeData['code']);
@@ -841,13 +834,13 @@ public function testsAddVoucherWithLimitedVoucher(): void
         static::assertContains('Der Mindestumsatz für diesen Gutschein beträgt 10,00&nbsp;&euro;', $result['sErrorMessages']);
 
         // Add one product to the basket with enough value to use discount
-        $randomProduct = $this->getRandomProduct();
+        $randomProduct = $this->getProductWithLowestVariantId();
         $this->connection->insert(
             's_order_basket',
             [
                 'price' => $voucherData['minimumcharge'] + 1,
                 'quantity' => 1,
-                'sessionID' => $this->session->get('sessionId'),
+                'sessionID' => $this->getSessionId(),
                 'ordernumber' => $randomProduct['ordernumber'],
                 'articleID' => $randomProduct['articleID'],
             ]
@@ -855,13 +848,14 @@ public function testsAddVoucherWithLimitedVoucher(): void
 
         $previousAmount = $this->module->sGetAmount();
         // Test with one-time code, success
-        static::assertTrue($this->module->sAddVoucher($voucherCodeData['code']));
+        $result = $this->module->sAddVoucher($voucherCodeData['code']);
+        static::assertTrue($result);
         static::assertLessThan($previousAmount, $this->module->sGetAmount());
 
         // Test the voucher values. This voucher has no taxes
         $discount = $this->connection->fetchAssociative(
             'SELECT * FROM s_order_basket WHERE modus = 2 and sessionID = ?',
-            [$this->module->sSYSTEM->sSESSION_ID]
+            [$this->getSessionId()]
         );
         static::assertIsArray($discount);
         static::assertEquals($voucherData['value'] * -1, $discount['price']);
@@ -885,7 +879,7 @@ public function testsAddVoucherWithLimitedVoucher(): void
         // Housekeeping
         $this->connection->delete(
             's_order_basket',
-            ['sessionID' => $this->session->get('sessionId')]
+            ['sessionID' => $this->getSessionId()]
         );
         $this->connection->delete(
             's_emarketing_vouchers',
@@ -925,17 +919,16 @@ public function testsAddVoucherWithSubShopVoucher(): void
 
         $customer = $this->createDummyCustomer();
         $this->session['sUserId'] = $customer->getId();
-        $this->module->sSYSTEM->sSESSION_ID = uniqid((string) random_int(PHP_INT_MIN, PHP_INT_MAX), true);
-        $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID);
+        $this->generateBasketSession();
 
         // Add one product to the basket with enough value to use discount
-        $randomProduct = $this->getRandomProduct();
+        $randomProduct = $this->getProductWithLowestVariantId();
         $this->connection->insert(
             's_order_basket',
             [
                 'price' => $voucherData['minimumcharge'] + 1,
                 'quantity' => 1,
-                'sessionID' => $this->session->get('sessionId'),
+                'sessionID' => $this->getSessionId(),
                 'ordernumber' => $randomProduct['ordernumber'],
                 'articleID' => $randomProduct['articleID'],
             ]
@@ -946,13 +939,14 @@ public function testsAddVoucherWithSubShopVoucher(): void
 
         $previousAmount = $this->module->sGetAmount();
         // Test with one-time code, success
-        static::assertTrue($this->module->sAddVoucher($voucherData['vouchercode']));
+        $result = $this->module->sAddVoucher($voucherData['vouchercode']);
+        static::assertTrue($result);
         static::assertLessThan($previousAmount, $this->module->sGetAmount());
 
         // Test the voucher values with custom tax from voucher
         $discount = $this->connection->fetchAssociative(
             'SELECT * FROM s_order_basket WHERE modus = 2 and sessionID = ?',
-            [$this->module->sSYSTEM->sSESSION_ID]
+            [$this->getSessionId()]
         );
         static::assertIsArray($discount);
         static::assertEquals($voucherData['value'] * -1, $discount['price']);
@@ -975,7 +969,7 @@ public function testsAddVoucherWithSubShopVoucher(): void
         // Housekeeping
         $this->connection->delete(
             's_order_basket',
-            ['sessionID' => $this->session->get('sessionId')]
+            ['sessionID' => $this->getSessionId()]
         );
         $this->connection->delete(
             's_emarketing_vouchers',
@@ -1023,17 +1017,16 @@ public function testsAddVoucherWithMultipleVouchers(): void
 
         $customer = $this->createDummyCustomer();
         $this->session['sUserId'] = $customer->getId();
-        $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true);
-        $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID);
+        $this->generateBasketSession();
 
         // Add one product to the basket with enough value to use discount
-        $randomProduct = $this->getRandomProduct();
+        $randomProduct = $this->getProductWithLowestVariantId();
         $this->connection->insert(
             's_order_basket',
             [
                 'price' => $voucherOneData['minimumcharge'] + 1,
                 'quantity' => 1,
-                'sessionID' => $this->session->get('sessionId'),
+                'sessionID' => $this->getSessionId(),
                 'ordernumber' => $randomProduct['ordernumber'],
                 'articleID' => $randomProduct['articleID'],
             ]
@@ -1064,7 +1057,7 @@ public function testsAddVoucherWithMultipleVouchers(): void
         // Housekeeping
         $this->connection->delete(
             's_order_basket',
-            ['sessionID' => $this->session->get('sessionId')]
+            ['sessionID' => $this->getSessionId()]
         );
         $this->connection->delete(
             's_emarketing_vouchers',
@@ -1110,17 +1103,16 @@ public function testsAddVoucherWithCustomerGroup(): void
         );
         $this->module->sSYSTEM->sUSERGROUPDATA['id'] = $randomCustomerGroup[1]['id'];
         $this->session['sUserId'] = $customer->getId();
-        $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true);
-        $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID);
+        $this->generateBasketSession();
 
         // Add one product to the basket with enough value to use discount
-        $randomProduct = $this->getRandomProduct();
+        $randomProduct = $this->getProductWithLowestVariantId();
         $this->connection->insert(
             's_order_basket',
             [
                 'price' => $voucherData['minimumcharge'] + 1,
                 'quantity' => 1,
-                'sessionID' => $this->session->get('sessionId'),
+                'sessionID' => $this->getSessionId(),
                 'ordernumber' => $randomProduct['ordernumber'],
                 'articleID' => $randomProduct['articleID'],
             ]
@@ -1156,7 +1148,7 @@ public function testsAddVoucherWithCustomerGroup(): void
         // Housekeeping
         $this->connection->delete(
             's_order_basket',
-            ['sessionID' => $this->session->get('sessionId')]
+            ['sessionID' => $this->getSessionId()]
         );
         $this->connection->delete(
             's_emarketing_vouchers',
@@ -1193,8 +1185,7 @@ public function testsAddVoucherWithArticle(): void
 
         $customer = $this->createDummyCustomer();
         $this->session['sUserId'] = $customer->getId();
-        $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true);
-        $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID);
+        $this->generateBasketSession();
 
         // Add one product to the basket with enough value to use discount
         $this->connection->insert(
@@ -1202,7 +1193,7 @@ public function testsAddVoucherWithArticle(): void
             [
                 'price' => $voucherData['minimumcharge'] + 1,
                 'quantity' => 1,
-                'sessionID' => $this->session->get('sessionId'),
+                'sessionID' => $this->getSessionId(),
                 'ordernumber' => $randomArticles[1]['ordernumber'],
                 'articleID' => $randomArticles[1]['articleID'],
             ]
@@ -1227,7 +1218,7 @@ public function testsAddVoucherWithArticle(): void
             [
                 'price' => $voucherData['minimumcharge'] + 1,
                 'quantity' => 1,
-                'sessionID' => $this->session->get('sessionId'),
+                'sessionID' => $this->getSessionId(),
                 'ordernumber' => $randomArticles[0]['ordernumber'],
                 'articleID' => $randomArticles[0]['articleID'],
             ]
@@ -1241,7 +1232,7 @@ public function testsAddVoucherWithArticle(): void
         // Housekeeping
         $this->connection->delete(
             's_order_basket',
-            ['sessionID' => $this->session->get('sessionId')]
+            ['sessionID' => $this->getSessionId()]
         );
         $this->connection->delete(
             's_emarketing_vouchers',
@@ -1270,11 +1261,10 @@ public function testsAddVoucherWithCurrencyFactor(): void
         );
 
         // Fetch a random product
-        $randomProduct = $this->getRandomProduct();
+        $randomProduct = $this->getProductWithLowestVariantId();
 
         // Generate session id
-        $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true);
-        $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID);
+        $this->generateBasketSession();
 
         // Define different currency factors to test
         foreach ([0, .5, 1, 1.5, 2] as $currencyFactor) {
@@ -1292,7 +1282,7 @@ public function testsAddVoucherWithCurrencyFactor(): void
                 [
                     'price' => $basketAmountWithoutVoucher,
                     'quantity' => 1,
-                    'sessionID' => $this->session->get('sessionId'),
+                    'sessionID' => $this->getSessionId(),
                     'ordernumber' => $randomProduct['ordernumber'],
                     'articleID' => $randomProduct['articleID'],
                 ]
@@ -1305,7 +1295,7 @@ public function testsAddVoucherWithCurrencyFactor(): void
             // Housekeeping
             $this->connection->delete(
                 's_order_basket',
-                ['sessionID' => $this->session->get('sessionId')]
+                ['sessionID' => $this->getSessionId()]
             );
         }
 
@@ -1320,8 +1310,8 @@ public function testsAddVoucherWithSupplier(): void
     {
         $this->session->clear();
 
-        $randomProductOne = $this->getRandomProduct();
-        $randomProductTwo = $this->getRandomProduct(null, $randomProductOne['supplierID']);
+        $randomProductOne = $this->getProductWithLowestVariantId();
+        $randomProductTwo = $this->getProductWithLowestVariantId(null, $randomProductOne['supplierID']);
 
         $voucherData = [
             'vouchercode' => 'testOne',
@@ -1347,7 +1337,7 @@ public function testsAddVoucherWithSupplier(): void
             [
                 'price' => $voucherData['minimumcharge'] + 1,
                 'quantity' => 1,
-                'sessionID' => $this->session->get('sessionId'),
+                'sessionID' => $this->getSessionId(),
                 'ordernumber' => $randomProductTwo['ordernumber'],
                 'articleID' => $randomProductTwo['articleID'],
             ]
@@ -1379,7 +1369,7 @@ public function testsAddVoucherWithSupplier(): void
             [
                 'price' => $voucherData['minimumcharge'] + 1,
                 'quantity' => 1,
-                'sessionID' => $this->session->get('sessionId'),
+                'sessionID' => $this->getSessionId(),
                 'ordernumber' => $randomProductOne['ordernumber'],
                 'articleID' => $randomProductOne['articleID'],
             ]
@@ -1393,7 +1383,7 @@ public function testsAddVoucherWithSupplier(): void
         // Housekeeping
         $this->connection->delete(
             's_order_basket',
-            ['sessionID' => $this->session->get('sessionId')]
+            ['sessionID' => $this->getSessionId()]
         );
         $this->connection->delete(
             's_emarketing_vouchers',
@@ -1402,19 +1392,80 @@ public function testsAddVoucherWithSupplier(): void
         $this->deleteDummyCustomer($customer);
     }
 
+    /**
+     * @dataProvider provideVoucherDates
+     */
+    public function testsAddVoucherDateCheck(?string $from, ?string $to, bool $hasValidDate): void
+    {
+        $voucherData = [
+            'vouchercode' => 'testTwo',
+            'description' => 'testTwo description',
+            'numberofunits' => 1,
+            'numorder' => 1,
+            'modus' => 0,
+            'percental' => 1,
+            'restrictarticles' => '',
+            'strict' => 0,
+            'taxconfig' => 'auto',
+            'minimumcharge' => 10,
+            'value' => 50,
+            'ordercode' => uniqid('ordercode', true),
+            'valid_from' => $from,
+            'valid_to' => $to,
+        ];
+
+        $this->connection->insert(
+            's_emarketing_vouchers',
+            $voucherData
+        );
+
+        $this->generateBasketSession();
+        $product = $this->getProductWithLowestVariantId();
+        $this->module->sAddArticle($product['ordernumber']);
+
+        if ($hasValidDate) {
+            static::assertTrue($this->module->sAddVoucher($voucherData['vouchercode']));
+            static::assertIsArray($this->module->sGetVoucher());
+        } else {
+            static::assertIsArray($this->module->sAddVoucher($voucherData['vouchercode']));
+            static::assertFalse($this->module->sGetVoucher());
+        }
+    }
+
+    /**
+     * @return array<array{0: string|null, 1: string|null, 2: bool}>
+     */
+    public function provideVoucherDates(): array
+    {
+        $datePast = '2020-04-01';
+        $dateFuture = '2099-04-01';
+
+        return [
+            'null null' => [null, null, true],
+            'null past' => [null, $datePast, false],
+            'null future' => [null, $dateFuture, true],
+            'past null' => [$datePast, null, true],
+            'past past' => [$datePast, $datePast, false],
+            'past future' => [$datePast, $dateFuture, true],
+            'future null' => [$dateFuture, null, false],
+            'future past' => [$dateFuture, $datePast, false],
+            'future future' => [$dateFuture, $dateFuture, false],
+        ];
+    }
+
     public function testsGetBasketIds(): void
     {
-        $randomProductOne = $this->getRandomProduct();
+        $randomProductOne = $this->getProductWithLowestVariantId();
         $randomProducts = [
             $randomProductOne,
-            $this->getRandomProduct($randomProductOne['id']),
+            $this->getProductWithLowestVariantId($randomProductOne['id']),
         ];
 
-        $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true);
-        $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID);
+        $this->generateBasketSession();
 
         // Test with empty basket, empty
-        static::assertNull($this->module->sGetBasketIds());
+        $noIds = $this->module->sGetBasketIds();
+        static::assertNull($noIds);
 
         // Add the first product to the basket, test we get the product id
         $this->connection->insert(
@@ -1422,7 +1473,7 @@ public function testsGetBasketIds(): void
             [
                 'price' => 1,
                 'quantity' => 1,
-                'sessionID' => $this->session->get('sessionId'),
+                'sessionID' => $this->getSessionId(),
                 'ordernumber' => $randomProducts[0]['ordernumber'],
                 'articleID' => $randomProducts[0]['articleID'],
             ]
@@ -1438,7 +1489,7 @@ public function testsGetBasketIds(): void
             [
                 'price' => 1,
                 'quantity' => 1,
-                'sessionID' => $this->session->get('sessionId'),
+                'sessionID' => $this->getSessionId(),
                 'ordernumber' => $randomProducts[0]['ordernumber'],
                 'articleID' => $randomProducts[0]['articleID'],
             ]
@@ -1454,7 +1505,7 @@ public function testsGetBasketIds(): void
             [
                 'price' => 1,
                 'quantity' => 1,
-                'sessionID' => $this->session->get('sessionId'),
+                'sessionID' => $this->getSessionId(),
                 'ordernumber' => $randomProducts[1]['ordernumber'],
                 'articleID' => $randomProducts[1]['articleID'],
             ]
@@ -1474,7 +1525,7 @@ public function testsGetBasketIds(): void
         // Housekeeping
         $this->connection->delete(
             's_order_basket',
-            ['sessionID' => $this->session->get('sessionId')]
+            ['sessionID' => $this->getSessionId()]
         );
     }
 
@@ -1493,17 +1544,16 @@ public function testsCheckMinimumCharge(): void
         // Test with empty cart, expect 10
         static::assertEquals(10, $this->module->sCheckMinimumCharge());
 
-        $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true);
-        $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID);
+        $this->generateBasketSession();
 
         // Add one product to the basket with enough value to use discount
-        $randomArticle = $this->getRandomProduct();
+        $randomArticle = $this->getProductWithLowestVariantId();
         $this->connection->insert(
             's_order_basket',
             [
                 'price' => 2,
                 'quantity' => 1,
-                'sessionID' => $this->session->get('sessionId'),
+                'sessionID' => $this->getSessionId(),
                 'ordernumber' => $randomArticle['ordernumber'],
                 'articleID' => $randomArticle['articleID'],
             ]
@@ -1518,7 +1568,7 @@ public function testsCheckMinimumCharge(): void
             [
                 'price' => 20,
                 'quantity' => 1,
-                'sessionID' => $this->session->get('sessionId'),
+                'sessionID' => $this->getSessionId(),
                 'ordernumber' => $randomArticle['ordernumber'],
                 'articleID' => $randomArticle['articleID'],
             ]
@@ -1531,7 +1581,7 @@ public function testsCheckMinimumCharge(): void
         $this->module->sSYSTEM->sUSERGROUPDATA['minimumordersurcharge'] = $oldMinimumOrderSurcharge;
         $this->connection->delete(
             's_order_basket',
-            ['sessionID' => $this->session->get('sessionId')]
+            ['sessionID' => $this->getSessionId()]
         );
     }
 
@@ -1548,17 +1598,16 @@ public function testsInsertSurcharge(): void
             )
         );
 
-        $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true);
-        $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID);
+        $this->generateBasketSession();
 
         // Add one product to the basket with value lower that minimumordersurcharge
-        $randomProduct = $this->getRandomProduct();
+        $randomProduct = $this->getProductWithLowestVariantId();
         $this->connection->insert(
             's_order_basket',
             [
                 'price' => 2,
                 'quantity' => 1,
-                'sessionID' => $this->session->get('sessionId'),
+                'sessionID' => $this->getSessionId(),
                 'ordernumber' => $randomProduct['ordernumber'],
                 'articleID' => $randomProduct['articleID'],
             ]
@@ -1568,12 +1617,11 @@ public function testsInsertSurcharge(): void
         $this->module->sSYSTEM->sUSERGROUPDATA['minimumorder'] = 10;
 
         // Check that we have no surcharge
-        static::assertEmpty(
-            $this->connection->fetchAssociative(
-                'SELECT * FROM s_order_basket WHERE sessionID = ? AND modus=4',
-                [$this->module->sSYSTEM->sSESSION_ID]
-            )
+        $surchargeRowBefore = $this->connection->fetchAssociative(
+            'SELECT * FROM s_order_basket WHERE sessionID = ? AND modus=4',
+            [$this->getSessionId()]
         );
+        static::assertEmpty($surchargeRowBefore);
 
         // Add surcharge, expect success (null)
         static::assertNull(
@@ -1586,7 +1634,7 @@ public function testsInsertSurcharge(): void
         // Fetch the surcharge row, should have price 5
         $surchargeRow = $this->connection->fetchAssociative(
             'SELECT * FROM s_order_basket WHERE sessionID = ? AND modus=4',
-            [$this->module->sSYSTEM->sSESSION_ID]
+            [$this->getSessionId()]
         );
         static::assertIsArray($surchargeRow);
         static::assertEquals(5, $surchargeRow['price']);
@@ -1596,7 +1644,7 @@ public function testsInsertSurcharge(): void
         $this->module->sSYSTEM->sUSERGROUPDATA['minimumordersurcharge'] = $oldMinimumOrderSurcharge;
         $this->connection->delete(
             's_order_basket',
-            ['sessionID' => $this->session->get('sessionId')]
+            ['sessionID' => $this->getSessionId()]
         );
     }
 
@@ -1626,8 +1674,7 @@ public function testsInsertSurchargePercent(): void
             ['id' => $customer->getId()]
         );
         $this->session['sUserId'] = $customer->getId();
-        $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true);
-        $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID);
+        $this->generateBasketSession();
 
         // Empty basket, expect false
         static::assertFalse(
@@ -1638,13 +1685,13 @@ public function testsInsertSurchargePercent(): void
         );
 
         // Add one product to the basket with low amount
-        $randomProduct = $this->getRandomProduct();
+        $randomProduct = $this->getProductWithLowestVariantId();
         $this->connection->insert(
             's_order_basket',
             [
                 'price' => 2,
                 'quantity' => 1,
-                'sessionID' => $this->session->get('sessionId'),
+                'sessionID' => $this->getSessionId(),
                 'ordernumber' => $randomProduct['ordernumber'],
                 'articleID' => $randomProduct['articleID'],
             ]
@@ -1654,7 +1701,7 @@ public function testsInsertSurchargePercent(): void
         static::assertEmpty(
             $this->connection->fetchAssociative(
                 'SELECT * FROM s_order_basket WHERE sessionID = ? AND modus=4',
-                [$this->module->sSYSTEM->sSESSION_ID]
+                [$this->getSessionId()]
             )
         );
 
@@ -1669,7 +1716,7 @@ public function testsInsertSurchargePercent(): void
         // Fetch the surcharge row, should have price 5
         $surchargeRow = $this->connection->fetchAssociative(
             'SELECT * FROM s_order_basket WHERE sessionID = ? AND modus = 4',
-            [$this->module->sSYSTEM->sSESSION_ID]
+            [$this->getSessionId()]
         );
         static::assertIsArray($surchargeRow);
         static::assertEquals(2 / 100 * 5, $surchargeRow['price']);
@@ -1678,7 +1725,7 @@ public function testsInsertSurchargePercent(): void
         $this->deleteDummyCustomer($customer);
         $this->connection->delete(
             's_order_basket',
-            ['sessionID' => $this->session->get('sessionId')]
+            ['sessionID' => $this->getSessionId()]
         );
         $this->connection->delete(
             's_core_paymentmeans',
@@ -1688,20 +1735,20 @@ public function testsInsertSurchargePercent(): void
 
     public function testsGetBasket(): void
     {
+        $this->session->clear();
+        $this->generateBasketSession();
+
         // Test with empty basket
         static::assertEquals([], $this->module->sGetBasket());
 
-        $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true);
-        $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID);
-
         // Add one product to the basket with low amount
-        $randomProduct = $this->getRandomProduct();
+        $randomProduct = $this->getProductWithLowestVariantId();
         $this->connection->insert(
             's_order_basket',
             [
                 'price' => 2,
                 'quantity' => 1,
-                'sessionID' => $this->session->get('sessionId'),
+                'sessionID' => $this->getSessionId(),
                 'ordernumber' => $randomProduct['ordernumber'],
                 'articleID' => $randomProduct['articleID'],
             ]
@@ -1773,11 +1820,11 @@ public function testsGetBasket(): void
         static::assertArrayHasKey(CartKey::AMOUNT_NUMERIC, $result);
         static::assertSame(14.95, $result[CartKey::AMOUNT_NUMERIC]);
         static::assertArrayHasKey(CartKey::AMOUNT_NET_NUMERIC, $result);
-        static::assertSame(12.56, ($result[CartKey::AMOUNT_NET_NUMERIC]));
+        static::assertSame(12.56, $result[CartKey::AMOUNT_NET_NUMERIC]);
         static::assertArrayHasKey(CartKey::AMOUNT_WITH_TAX, $result);
-        static::assertSame('0', ($result[CartKey::AMOUNT_WITH_TAX]));
+        static::assertSame('0', $result[CartKey::AMOUNT_WITH_TAX]);
         static::assertArrayHasKey(CartKey::AMOUNT_WITH_TAX_NUMERIC, $result);
-        static::assertSame(0.0, ($result[CartKey::AMOUNT_WITH_TAX_NUMERIC]));
+        static::assertSame(0.0, $result[CartKey::AMOUNT_WITH_TAX_NUMERIC]);
         static::assertArrayHasKey(CartKey::QUANTITY, $result);
         static::assertSame(1, $result[CartKey::QUANTITY]);
     }
@@ -1785,58 +1832,54 @@ public function testsGetBasket(): void
     public function testsGetBasketDataHasNumericCartItemAmounts(): void
     {
         $resourceHelper = new Helper($this->getContainer());
-        try {
-            $product = $resourceHelper->createProduct([
-                'name' => 'Testartikel',
-                'description' => 'Test description',
-                'active' => true,
-                'mainDetail' => [
-                    'number' => 'swTEST' . uniqid((string) mt_rand(), true),
-                    'inStock' => 15,
-                    'lastStock' => true,
-                    'unitId' => 1,
-                    'prices' => [
-                        [
-                            'customerGroupKey' => 'EK',
-                            'from' => 1,
-                            'to' => '-',
-                            'price' => 29.97,
-                        ],
-                    ],
-                ],
-                'taxId' => 4,
-                'supplierId' => 2,
-                'categories' => [
+
+        $product = $resourceHelper->createProduct([
+            'name' => 'Testartikel',
+            'description' => 'Test description',
+            'active' => true,
+            'mainDetail' => [
+                'number' => 'swTEST' . uniqid((string) mt_rand(), true),
+                'inStock' => 15,
+                'lastStock' => true,
+                'unitId' => 1,
+                'prices' => [
                     [
-                        'id' => 10,
+                        'customerGroupKey' => 'EK',
+                        'from' => 1,
+                        'to' => '-',
+                        'price' => 29.97,
                     ],
                 ],
-            ]);
-            $customerGroup = $resourceHelper->createCustomerGroup();
-            $this->session['sUserId'] = $this->createDummyCustomer()->getId();
-            $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true);
-            $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID);
-            $this->module->sSYSTEM->sUSERGROUPDATA['id'] = $customerGroup->getId();
-
-            // Add the product to the basket
-            static::assertInstanceOf(Detail::class, $product->getMainDetail());
-            static::assertIsString($product->getMainDetail()->getNumber());
-            $this->module->sAddArticle($product->getMainDetail()->getNumber(), 2);
-            $this->module->sRefreshBasket();
-            $basketData = $this->module->sGetBasketData();
-
-            // Assert that a valid basket was returned
-            static::assertArrayHasKey(CartKey::POSITIONS, $basketData);
-            // Assert that there is a numeric basket amount
-            static::assertArrayHasKey('amountNumeric', $basketData[CartKey::POSITIONS][0], 'amountNumeric for cart item should exist');
-            static::assertArrayHasKey('amountnetNumeric', $basketData[CartKey::POSITIONS][0], 'amountnetNumeric for cart item should exist');
-            static::assertGreaterThan(0, $basketData[CartKey::POSITIONS][0]['amountNumeric']);
-            static::assertGreaterThan(0, $basketData[CartKey::POSITIONS][0]['amountnetNumeric']);
-            static::assertEquals(29.97 * 2, $basketData[CartKey::POSITIONS][0]['amountNumeric'], 'amountNumeric for cart item should respect cart item quantity');
-            static::assertEqualsWithDelta(29.97 * 2, $basketData[CartKey::POSITIONS][0]['amountNumeric'], 0.001, 'amountNumeric for cart item should respect cart item quantity');
-        } finally {
-            $resourceHelper->cleanUp();
-        }
+            ],
+            'taxId' => 4,
+            'supplierId' => 2,
+            'categories' => [
+                [
+                    'id' => 10,
+                ],
+            ],
+        ]);
+        $customerGroup = $resourceHelper->createCustomerGroup();
+        $this->session['sUserId'] = $this->createDummyCustomer()->getId();
+        $this->generateBasketSession();
+        $this->module->sSYSTEM->sUSERGROUPDATA['id'] = $customerGroup->getId();
+
+        // Add the product to the basket
+        static::assertInstanceOf(Detail::class, $product->getMainDetail());
+        static::assertIsString($product->getMainDetail()->getNumber());
+        $this->module->sAddArticle($product->getMainDetail()->getNumber(), 2);
+        $this->module->sRefreshBasket();
+        $basketData = $this->module->sGetBasketData();
+
+        // Assert that a valid basket was returned
+        static::assertArrayHasKey(CartKey::POSITIONS, $basketData);
+        // Assert that there is a numeric basket amount
+        static::assertArrayHasKey('amountNumeric', $basketData[CartKey::POSITIONS][0], 'amountNumeric for cart item should exist');
+        static::assertArrayHasKey('amountnetNumeric', $basketData[CartKey::POSITIONS][0], 'amountnetNumeric for cart item should exist');
+        static::assertGreaterThan(0, $basketData[CartKey::POSITIONS][0]['amountNumeric']);
+        static::assertGreaterThan(0, $basketData[CartKey::POSITIONS][0]['amountnetNumeric']);
+        static::assertEquals(29.97 * 2, $basketData[CartKey::POSITIONS][0]['amountNumeric'], 'amountNumeric for cart item should respect cart item quantity');
+        static::assertEqualsWithDelta(29.97 * 2, $basketData[CartKey::POSITIONS][0]['amountNumeric'], 0.001, 'amountNumeric for cart item should respect cart item quantity');
     }
 
     /**
@@ -1855,98 +1898,89 @@ public function testsGetBasketDataHasNumericCartItemAmounts(): void
     public function testsGetBasketDataNegativeCloseToZeroTotal(): void
     {
         $resourceHelper = new Helper($this->getContainer());
-        try {
-            // Setup product for the first basket position - a product that costs EUR 29.97
-            $product = $resourceHelper->createProduct([
-                'name' => 'Testartikel',
-                'description' => 'Test description',
-                'active' => true,
-                'mainDetail' => [
-                    'number' => 'swTEST' . uniqid((string) mt_rand(), true),
-                    'inStock' => 15,
-                    'lastStock' => true,
-                    'unitId' => 1,
-                    'prices' => [
-                        [
-                            'customerGroupKey' => 'EK',
-                            'from' => 1,
-                            'to' => '-',
-                            'price' => 29.97,
-                        ],
-                    ],
-                ],
-                'taxId' => 4,
-                'supplierId' => 2,
-                'categories' => [
+
+        // Setup product for the first basket position - a product that costs EUR 29.97
+        $product = $resourceHelper->createProduct([
+            'name' => 'Testartikel',
+            'description' => 'Test description',
+            'active' => true,
+            'mainDetail' => [
+                'number' => 'swTEST' . uniqid((string) mt_rand(), true),
+                'inStock' => 15,
+                'lastStock' => true,
+                'unitId' => 1,
+                'prices' => [
                     [
-                        'id' => 10,
+                        'customerGroupKey' => 'EK',
+                        'from' => 1,
+                        'to' => '-',
+                        'price' => 29.97,
                     ],
                 ],
-            ]);
-            // Setup discount for the second basket position - a shipping discount of EUR -2.8
-            $dispatchDiscountId = $this->connection->fetchOne(
-                'SELECT * FROM s_premium_dispatch WHERE type = 3'
-            );
-            $this->connection->update(
-                's_premium_shippingcosts',
-                ['value' => 2.8],
-                ['dispatchID' => $dispatchDiscountId]
-            );
-            // Setup discount for the third basket position - a basket discount covering the remainder of the basket (-27.17)
-            $customerGroup = $resourceHelper->createCustomerGroup();
-            $this->connection->insert(
-                's_core_customergroups_discounts',
+            ],
+            'taxId' => 4,
+            'supplierId' => 2,
+            'categories' => [
                 [
-                    'groupID' => $customerGroup->getId(),
-                    // discount by the full remaining value of the basket - EUR 27.17 / EUR 29.97 = 90.65 %
-                    'basketdiscount' => 90.65,
-                    'basketdiscountstart' => 10,
-                ]
-            );
-            $customerGroupDiscountId = $this->connection->lastInsertId('s_core_customergroups_discounts');
-            // Setup the user and their session
-            $customer = $this->createDummyCustomer();
-            $this->connection->update(
-                's_user',
-                ['customergroup' => $customerGroup->getKey()],
-                ['id' => $customer->getId()]
-            );
-            $this->session['sUserId'] = $customer->getId();
-            $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true);
-            $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID);
-            $this->module->sSYSTEM->sUSERGROUPDATA['id'] = $customerGroup->getId();
-
-            // Actually add the product to the basket
-            static::assertInstanceOf(Detail::class, $product->getMainDetail());
-            static::assertIsString($product->getMainDetail()->getNumber());
-            $this->module->sAddArticle($product->getMainDetail()->getNumber());
-            // Run sBasket::sRefreshBasket() in order to add the discounts to the basket
-            $this->module->sRefreshBasket();
-            // Run sGetBasketData() to show the rounding error aborting the computation
-            $basketData = $this->module->sGetBasketData();
-            // Run sGetAmount() to show that this function is affected by the issue as well
-            $this->module->sGetAmount();
-
-            // Assert that a valid basket was returned
-            static::assertArrayHasKey(CartKey::AMOUNT_NUMERIC, $basketData);
-            // Assert that the total is approximately 0.00
-            static::assertEquals(0, $basketData[CartKey::AMOUNT_NUMERIC], 'total is approxmately 0.00');
-            static::assertEqualsWithDelta(0, $basketData[CartKey::AMOUNT_NUMERIC], 0.0001, 'total is approxmately 0.00');
-        } finally {
-            // Delete test resources
-            if (isset($customerGroupDiscountId)) {
-                $this->connection->delete('s_core_customergroups_discounts', ['id' => $customerGroupDiscountId]);
-            }
-            $resourceHelper->cleanUp();
-        }
+                    'id' => 10,
+                ],
+            ],
+        ]);
+        // Setup discount for the second basket position - a shipping discount of EUR -2.8
+        $dispatchDiscountId = $this->connection->fetchOne(
+            'SELECT * FROM s_premium_dispatch WHERE type = 3'
+        );
+        $this->connection->update(
+            's_premium_shippingcosts',
+            ['value' => 2.8],
+            ['dispatchID' => $dispatchDiscountId]
+        );
+        // Setup discount for the third basket position - a basket discount covering the remainder of the basket (-27.17)
+        $customerGroup = $resourceHelper->createCustomerGroup();
+        $this->connection->insert(
+            's_core_customergroups_discounts',
+            [
+                'groupID' => $customerGroup->getId(),
+                // discount by the full remaining value of the basket - EUR 27.17 / EUR 29.97 = 90.65 %
+                'basketdiscount' => 90.65,
+                'basketdiscountstart' => 10,
+            ]
+        );
+        $customerGroupDiscountId = $this->connection->lastInsertId('s_core_customergroups_discounts');
+        // Setup the user and their session
+        $customer = $this->createDummyCustomer();
+        $this->connection->update(
+            's_user',
+            ['customergroup' => $customerGroup->getKey()],
+            ['id' => $customer->getId()]
+        );
+        $this->session['sUserId'] = $customer->getId();
+        $this->generateBasketSession();
+        $this->module->sSYSTEM->sUSERGROUPDATA['id'] = $customerGroup->getId();
+
+        // Actually add the product to the basket
+        static::assertInstanceOf(Detail::class, $product->getMainDetail());
+        static::assertIsString($product->getMainDetail()->getNumber());
+        $this->module->sAddArticle($product->getMainDetail()->getNumber());
+        // Run sBasket::sRefreshBasket() in order to add the discounts to the basket
+        $this->module->sRefreshBasket();
+        // Run sGetBasketData() to show the rounding error aborting the computation
+        $basketData = $this->module->sGetBasketData();
+        // Run sGetAmount() to show that this function is affected by the issue as well
+        $this->module->sGetAmount();
+        // Assert that a valid basket was returned
+        static::assertArrayHasKey(CartKey::AMOUNT_NUMERIC, $basketData);
+        // Assert that the total is approximately 0.00
+        static::assertEqualsWithDelta(0, $basketData[CartKey::AMOUNT_NUMERIC], Utils::FORMER_PHPUNIT_FLOAT_EPSILON, 'total is approximately 0.00');
+        static::assertEqualsWithDelta(0, $basketData[CartKey::AMOUNT_NUMERIC], 0.0001, 'total is approximately 0.00');
     }
 
     public function testsGetBasketWithInvalidProduct(): void
     {
-        static::assertEquals([], $this->module->sGetBasket());
+        $this->session->clear();
+        $this->generateBasketSession();
 
-        $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true);
-        $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID);
+        static::assertEquals([], $this->module->sGetBasket());
 
         // Setup product for the first basket position - a product that costs EUR 29.97
         $product = (new Helper($this->getContainer()))->createProduct([
@@ -1982,7 +2016,7 @@ public function testsGetBasketWithInvalidProduct(): void
             [
                 'price' => 2,
                 'quantity' => 1,
-                'sessionID' => $this->session->get('sessionId'),
+                'sessionID' => $this->getSessionId(),
                 'ordernumber' => $product->getMainDetail()->getNumber(),
                 'articleID' => $product->getId(),
             ]
@@ -2000,11 +2034,10 @@ public function testsGetBasketWithInvalidProduct(): void
 
     public function testsAddNote(): void
     {
-        $front = $this->getContainer()->get('front');
         $_COOKIE['sUniqueID'] = Random::getAlphanumericString(32);
 
         // Add one product to the basket with low amount
-        $randomProduct = $this->getRandomProduct();
+        $randomProduct = $this->getProductWithLowestVariantId();
 
         static::assertEquals(0, $this->connection->fetchOne(
             'SELECT COUNT(DISTINCT id) FROM s_order_notes WHERE sUniqueID = ? AND ordernumber = ?',
@@ -2034,7 +2067,7 @@ public function testsGetNotes(): void
         $this->session->clear();
         $_COOKIE['sUniqueID'] = Random::getAlphanumericString(32);
 
-        $randomProduct = $this->getRandomProduct();
+        $randomProduct = $this->getProductWithLowestVariantId();
         // Test with no id in cookie
         static::assertEquals([], $this->module->sGetNotes());
         static::assertTrue($this->module->sAddNote(
@@ -2050,7 +2083,7 @@ public function testsGetNotes(): void
     public function testsCountNotes(): void
     {
         $_COOKIE['sUniqueID'] = Random::getAlphanumericString(32);
-        $randomProductOne = $this->getRandomProduct();
+        $randomProductOne = $this->getProductWithLowestVariantId();
         static::assertTrue($this->module->sAddNote(
             $randomProductOne['articleID'],
             $randomProductOne['name'],
@@ -2059,7 +2092,7 @@ public function testsCountNotes(): void
         static::assertEquals(1, $this->module->sCountNotes());
 
         // Add another product to the basket
-        $randomProductTwo = $this->getRandomProduct($randomProductOne['id']);
+        $randomProductTwo = $this->getProductWithLowestVariantId($randomProductOne['id']);
 
         static::assertTrue($this->module->sAddNote(
             $randomProductTwo['articleID'],
@@ -2073,10 +2106,10 @@ public function testsCountNotes(): void
     public function testsDeleteNote(): void
     {
         $_COOKIE['sUniqueID'] = Random::getAlphanumericString(32);
-        $randomProductOne = $this->getRandomProduct();
+        $randomProductOne = $this->getProductWithLowestVariantId();
         $randomProducts = [
             $randomProductOne,
-            $this->getRandomProduct($randomProductOne['id']),
+            $this->getProductWithLowestVariantId($randomProductOne['id']),
         ];
 
         static::assertTrue($this->module->sAddNote(
@@ -2090,28 +2123,17 @@ public function testsDeleteNote(): void
             $randomProducts[1]['ordernumber']
         ));
 
-        // Null argument, return null
+        // Test deleting an invalid ID
         static::assertFalse($this->module->sDeleteNote(0));
 
-        // Get random product that's not in the basket
-        $randomNotPresentProductId = $this->connection->fetchOne(
-            'SELECT detail.id FROM s_articles_details detail
-            INNER JOIN s_articles product
-              ON product.id = detail.articleID
-            WHERE detail.active = 1
-            AND detail.id NOT IN (?)
-            LIMIT 1',
-            [array_column($randomProducts, 'id')]
-        );
+        // Check that we currently have 2 products
+        static::assertSame(2, $this->module->sCountNotes());
 
-        // Check that we currently have 2 articles
-        static::assertEquals(2, $this->module->sCountNotes());
-
-        // Get true even if product is not in the wishlist
-        static::assertTrue($this->module->sDeleteNote($randomNotPresentProductId));
+        // Get true even if note ID is not in the database
+        static::assertTrue($this->module->sDeleteNote(PHP_INT_MAX));
 
-        // Check that we still have 2 articles
-        static::assertEquals(2, $this->module->sCountNotes());
+        // Check that we still have 2 products
+        static::assertSame(2, $this->module->sCountNotes());
 
         $noteIds = $this->connection->fetchFirstColumn(
             'SELECT id FROM s_order_notes detail
@@ -2119,17 +2141,17 @@ public function testsDeleteNote(): void
             [$_COOKIE['sUniqueID']]
         );
 
-        // Get true even if product is not in the wishlist
+        // Remove first product
         static::assertTrue($this->module->sDeleteNote($noteIds[0]));
 
         // Check that we now have 1 product
-        static::assertEquals(1, $this->module->sCountNotes());
+        static::assertSame(1, $this->module->sCountNotes());
 
-        // Get true even if product is not in the wishlist
+        // Remove second product
         static::assertTrue($this->module->sDeleteNote($noteIds[1]));
 
         // Check that we now have an empty wishlist
-        static::assertEquals(0, $this->module->sCountNotes());
+        static::assertSame(0, $this->module->sCountNotes());
     }
 
     public function testsUpdateArticle(): void
@@ -2140,13 +2162,13 @@ public function testsUpdateArticle(): void
         $this->generateBasketSession();
 
         // Get random product
-        $randomProduct = $this->getRandomProduct();
+        $randomProduct = $this->getProductWithLowestVariantId();
         $this->connection->insert(
             's_order_basket',
             [
                 'price' => 0.01,
                 'quantity' => 1,
-                'sessionID' => $this->session->get('sessionId'),
+                'sessionID' => $this->getSessionId(),
                 'ordernumber' => $randomProduct['ordernumber'],
                 'articleID' => $randomProduct['articleID'],
             ]
@@ -2171,7 +2193,7 @@ public function testsUpdateArticle(): void
         // Housekeeping
         $this->connection->delete(
             's_order_basket',
-            ['sessionID' => $this->session->get('sessionId')]
+            ['sessionID' => $this->getSessionId()]
         );
     }
 
@@ -2180,8 +2202,7 @@ public function testsCheckForESD(): void
         // No session, expect false
         static::assertFalse($this->module->sCheckForESD());
 
-        $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true);
-        $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID);
+        $this->generateBasketSession();
 
         // Get random non-esd product and add it to the basket
         $randomNoESDProduct = $this->connection->fetchAssociative(
@@ -2229,7 +2250,7 @@ public function testsCheckForESD(): void
         // Housekeeping
         $this->connection->delete(
             's_order_basket',
-            ['sessionID' => $this->session->get('sessionId')]
+            ['sessionID' => $this->getSessionId()]
         );
         $this->connection->update(
             's_articles_details',
@@ -2248,8 +2269,7 @@ public function testsDeleteBasket(): void
         // No session, expect false
         static::assertFalse($this->module->sDeleteBasket());
 
-        $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true);
-        $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID);
+        $this->generateBasketSession();
 
         static::assertNull($this->module->sDeleteBasket());
 
@@ -2283,15 +2303,14 @@ public function testsDeleteBasket(): void
 
     public function testsDeleteArticle(): void
     {
+        $this->generateBasketSession();
+
         // No id, expect null
         static::assertNull($this->module->sDeleteArticle(0));
 
         // Random id, expect null
         static::assertNull($this->module->sDeleteArticle(9999999));
 
-        $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true);
-        $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID);
-
         // Get random product and add it to the basket
         $randomProduct = $this->connection->fetchAssociative(
             'SELECT detail.* FROM s_articles_details detail
@@ -2323,8 +2342,7 @@ public function testsAddArticle(): void
         // No id, expect false
         static::assertFalse($this->module->sAddArticle(''));
 
-        $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true);
-        $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID);
+        $this->generateBasketSession();
 
         // Get random product with stock control and add it to the basket
         $randomProductOne = $this->connection->fetchAssociative(
@@ -2406,7 +2424,7 @@ public function testsAddArticle(): void
         // Housekeeping
         $this->connection->delete(
             's_order_basket',
-            ['sessionID' => $this->session->get('sessionId')]
+            ['sessionID' => $this->getSessionId()]
         );
     }
 
@@ -2459,8 +2477,7 @@ public function testsPriceCalculationTaxfreeWithPriceGroupDiscount(): void
         $this->session->set('sUserGroupData', $customerGroupData);
 
         // Setup session
-        $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true);
-        $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID);
+        $this->generateBasketSession();
 
         static::assertInstanceOf(Detail::class, $product->getMainDetail());
         static::assertIsString($product->getMainDetail()->getNumber());
@@ -2482,15 +2499,11 @@ public function testsPriceCalculationTaxfreeWithPriceGroupDiscount(): void
         static::assertArrayHasKey(CartKey::AMOUNT_NUMERIC, $basketData);
         static::assertArrayHasKey(CartKey::AMOUNT_NET_NUMERIC, $basketData);
         static::assertEquals($basketData[CartKey::AMOUNT_NUMERIC], $basketData[CartKey::AMOUNT_NET_NUMERIC]);
-
-        // Delete test resources
-        $resourceHelper->cleanUp();
     }
 
     public function testMinPurchaseMultipleTimesAdded(): void
     {
-        $this->module->sSYSTEM->sSESSION_ID = uniqid((string) mt_rand(), true);
-        $this->session->offsetSet('sessionId', $this->module->sSYSTEM->sSESSION_ID);
+        $this->generateBasketSession();
 
         $this->connection->executeStatement('UPDATE s_articles_details SET minpurchase = 2 WHERE ordernumber = "SW10239"');
 
@@ -2504,14 +2517,23 @@ public function testMinPurchaseMultipleTimesAdded(): void
         static::assertSame(4, (int) $cart[CartKey::POSITIONS][0]['quantity']);
     }
 
-    private function generateBasketSession(): string
+    public function testUpdateCartItemsWithPurchaseSteps(): void
     {
-        // Create session id
-        $sessionId = Random::getAlphanumericString(32);
-        $this->module->sSYSTEM->sSESSION_ID = $sessionId;
-        $this->session->offsetSet('sessionId', $sessionId);
+        $this->generateBasketSession();
+
+        $this->connection->executeStatement('UPDATE s_articles_details SET purchasesteps = 4 WHERE ordernumber = "SW10239"');
 
-        return $sessionId;
+        $this->module->sAddArticle('SW10239');
+
+        $cart = $this->module->sGetBasketData();
+
+        static::assertArrayHasKey(CartKey::POSITIONS, $cart);
+        static::assertSame(1, (int) $cart[CartKey::POSITIONS][0]['quantity']);
+    }
+
+    private function generateBasketSession(): void
+    {
+        $this->session->offsetSet('sessionId', Random::getAlphanumericString(32));
     }
 
     /**
@@ -2612,7 +2634,7 @@ private function invokeMethod(object $object, string $methodName, array $paramet
     /**
      * @return array{id: int, articleID: int, name: string, ordernumber: string, supplierID: int}
      */
-    private function getRandomProduct(?int $excludeProductId = null, ?int $excludeManufacturerId = null): array
+    private function getProductWithLowestVariantId(?int $excludeProductId = null, ?int $excludeManufacturerId = null): array
     {
         $query = $this->connection->createQueryBuilder()
             ->select('variant.id, variant.articleID, product.name, variant.ordernumber, product.supplierID')
@@ -2623,6 +2645,7 @@ private function getRandomProduct(?int $excludeProductId = null, ?int $excludeMa
             ->andWhere('ordernumber IS NOT NULL')
             ->andWhere('product.supplierID IS NOT NULL')
             ->andWhere('product.name IS NOT NULL')
+            ->orderBy('variant.id')
             ->setMaxResults(1);
 
         if ($excludeProductId !== null) {
@@ -2649,4 +2672,9 @@ private function getRandomProduct(?int $excludeProductId = null, ?int $excludeMa
 
         return $randomProduct;
     }
+
+    private function getSessionId(): string
+    {
+        return $this->session->get('sessionId');
+    }
 }
diff --git a/tests/Functional/Core/sCategoriesTest.php b/tests/Functional/Core/CategoriesTest.php
similarity index 64%
rename from tests/Functional/Core/sCategoriesTest.php
rename to tests/Functional/Core/CategoriesTest.php
index 5e6f1d08944..76b95bfcda9 100644
--- a/tests/Functional/Core/sCategoriesTest.php
+++ b/tests/Functional/Core/CategoriesTest.php
@@ -1,56 +1,71 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-class sCategoriesTest extends Enlight_Components_Test_Controller_TestCase
+namespace Shopware\Tests\Functional\Core;
+
+use Doctrine\DBAL\Connection;
+use Enlight_Components_Test_Controller_TestCase;
+use sCategories;
+use Shopware\Models\Shop\Shop;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+
+class CategoriesTest extends Enlight_Components_Test_Controller_TestCase
 {
-    /**
-     * @var sCategories
-     */
-    private $module;
+    use ContainerTrait;
+
+    private sCategories $module;
+
+    private Connection $connection;
+
+    private Shop $shop;
 
     public function setUp(): void
     {
-        $this->module = Shopware()->Modules()->Categories();
+        $this->module = $this->getContainer()->get('modules')->Categories();
+        $this->connection = $this->getContainer()->get(Connection::class);
+        $this->shop = $this->getContainer()->get('shop');
         parent::setUp();
     }
 
     /**
      * @covers \sCategories::sGetCategories
      */
-    public function testGetCategoriesWithShopCategory()
+    public function testGetCategoriesWithShopCategory(): void
     {
-        $categoryTree = $this->module->sGetCategories(Shopware()->Shop()->get('parentID'));
+        $categoryTree = $this->module->sGetCategories($this->shop->get('parentID'));
 
-        $ids = Shopware()->Db()->fetchCol("SELECT id from s_categories WHERE path LIKE '|" . Shopware()->Shop()->get('parentID') . "|'");
+        $ids = $this->connection->fetchFirstColumn("SELECT id from s_categories WHERE path LIKE '|" . $this->shop->get('parentID') . "|'");
         $ids = array_map('\intval', $ids);
 
         foreach ($categoryTree as $key => $category) {
+            static::assertIsArray($category);
             static::assertContains($key, $ids);
             static::assertArrayHasKey('subcategories', $category);
             static::assertCount(0, $category['subcategories']);
             static::assertArrayHasKey('id', $category);
-            static::assertEquals($key, $category['id']);
+            static::assertSame($key, $category['id']);
             $this->validateCategory($category);
         }
     }
@@ -58,13 +73,12 @@ public function testGetCategoriesWithShopCategory()
     /**
      * @covers \sCategories::sGetCategories
      */
-    public function testGetCategoriesWithSubcategory()
+    public function testGetCategoriesWithSubcategory(): void
     {
-        $categoryTree = $this->module->sGetCategories(13);
-
-        foreach ($categoryTree as $key => $category) {
+        foreach ($this->module->sGetCategories(13) as $key => $category) {
+            static::assertIsArray($category);
             static::assertArrayHasKey('id', $category);
-            static::assertEquals($key, $category['id']);
+            static::assertSame($key, $category['id']);
             $this->validateCategory($category, 'subcategories');
         }
     }
@@ -72,37 +86,37 @@ public function testGetCategoriesWithSubcategory()
     /**
      * @covers \sCategories::sGetCategoryIdByArticleId
      */
-    public function testsGetCategoryIdByArticleId()
+    public function testsGetCategoryIdByArticleId(): void
     {
-        //first category which assigned to the product 2
-        static::assertEquals(14, $this->module->sGetCategoryIdByArticleId(2));
+        // first category which assigned to the product 2
+        static::assertSame(14, $this->module->sGetCategoryIdByArticleId(2));
 
         // Check that searching in default category or with null is the same
-        static::assertEquals(
-            $this->module->sGetCategoryIdByArticleId(2, Shopware()->Shop()->get('parentID')),
+        static::assertSame(
+            $this->module->sGetCategoryIdByArticleId(2, $this->shop->get('parentID')),
             $this->module->sGetCategoryIdByArticleId(2)
         );
 
         // Check that searching in different trees gives different results
         static::assertNotEquals(
-            $this->module->sGetCategoryIdByArticleId(2, Shopware()->Shop()->get('parentID')),
+            $this->module->sGetCategoryIdByArticleId(2, $this->shop->get('parentID')),
             $this->module->sGetCategoryIdByArticleId(2, 39)
         );
 
         // provide own parent id to filter returned category id
-        static::assertEquals(
+        static::assertSame(
             21,
             $this->module->sGetCategoryIdByArticleId(2, 10)
         );
 
         // Check that searching for an article where it doesn't exist returns 0
-        static::assertEquals(0, $this->module->sGetCategoryIdByArticleId(75, 39));
+        static::assertSame(0, $this->module->sGetCategoryIdByArticleId(75, 39));
     }
 
     /**
      * @covers \sCategories::sGetCategoriesByParent
      */
-    public function testsGetCategoriesByParent()
+    public function testsGetCategoriesByParent(): void
     {
         // Calling on subcategory return path
         $path = $this->module->sGetCategoriesByParent(21);
@@ -115,7 +129,7 @@ public function testsGetCategoriesByParent()
         }
 
         // Calling on shop category return empty array
-        static::assertCount(0, $this->module->sGetCategoriesByParent(Shopware()->Shop()->get('parentID')));
+        static::assertCount(0, $this->module->sGetCategoriesByParent($this->shop->get('parentID')));
 
         // Assert root category
         $path = $this->module->sGetCategoriesByParent(1);
@@ -125,15 +139,15 @@ public function testsGetCategoriesByParent()
             static::assertArrayHasKey('name', $category);
             static::assertArrayHasKey('blog', $category);
             static::assertArrayHasKey('link', $category);
-            static::assertEquals('Root', $category['name']);
-            static::assertEquals(1, $category['id']);
+            static::assertSame('Root', $category['name']);
+            static::assertSame(1, $category['id']);
         }
     }
 
     /**
      * @covers \sCategories::sGetWholeCategoryTree
      */
-    public function testsGetWholeCategoryTree()
+    public function testsGetWholeCategoryTree(): void
     {
         // Calling on leaf node should return empty array
         static::assertCount(0, $this->module->sGetWholeCategoryTree(21));
@@ -141,12 +155,13 @@ public function testsGetWholeCategoryTree()
         // Default arguments should work
         static::assertEquals(
             $this->module->sGetWholeCategoryTree(),
-            $this->module->sGetWholeCategoryTree(Shopware()->Shop()->get('parentID'))
+            $this->module->sGetWholeCategoryTree($this->shop->get('parentID'))
         );
 
         // Calling on root node should return a complete tree
         $categoryTree = $this->module->sGetWholeCategoryTree(1);
         foreach ($categoryTree as $category) {
+            static::assertIsArray($category);
             static::assertArrayHasKey('id', $category);
             static::assertArrayHasKey('sub', $category);
             static::assertGreaterThan(0, \count($category['sub']));
@@ -154,9 +169,8 @@ public function testsGetWholeCategoryTree()
         }
 
         // Inactive categories are not loaded
-        $inactive = Shopware()->Db()->fetchOne('SELECT parent FROM s_categories WHERE active = 0');
-        $inactiveParentCategory = $this->module->sGetWholeCategoryTree($inactive);
-        foreach ($inactiveParentCategory as $category) {
+        $inactive = $this->connection->fetchOne('SELECT parent FROM s_categories WHERE active = 0');
+        foreach ($this->module->sGetWholeCategoryTree($inactive) as $category) {
             $this->validateCategory($category, 'sub');
             static::assertNotEquals($inactive, $category['id']);
         }
@@ -181,18 +195,19 @@ public function testsGetWholeCategoryTree()
     /**
      * @covers \sCategories::sGetCategoryContent
      */
-    public function testsGetCategoryContent()
+    public function testsGetCategoryContent(): void
     {
         // Call dispatch as we need the Router to be available inside sCore
         $this->dispatch('/');
 
         // Default arguments should work
         static::assertEquals(
-            $this->module->sGetCategoryContent(null),
-            $this->module->sGetCategoryContent(Shopware()->Shop()->get('parentID'))
+            $this->module->sGetCategoryContent(0),
+            $this->module->sGetCategoryContent($this->shop->get('parentID'))
         );
 
         $categoryArray = $this->module->sGetCategoryContent(21);
+        static::assertIsArray($categoryArray);
         static::assertArrayHasKey('id', $categoryArray);
         static::assertArrayHasKey('parentId', $categoryArray);
         static::assertArrayHasKey('name', $categoryArray);
@@ -208,12 +223,12 @@ public function testsGetCategoryContent()
     /**
      * @covers \sCategories::sGetCategoryPath
      */
-    public function testsGetCategoryPath()
+    public function testsGetCategoryPath(): void
     {
         // Default arguments should work
-        static::assertEquals(
+        static::assertSame(
             $this->module->sGetCategoryPath(21),
-            $this->module->sGetCategoryPath(21, Shopware()->Shop()->get('parentID'))
+            $this->module->sGetCategoryPath(21, $this->shop->get('parentID'))
         );
 
         // Looking for elements in root gives full path
@@ -229,41 +244,43 @@ public function testsGetCategoryPath()
      *
      * @ticket SW-5098
      */
-    public function testGetWholeCategoryTree()
+    public function testGetWholeCategoryTree(): void
     {
-        //set Category "Tees und Zubehör" to inactive so the childs should not be displayed
+        // set Category "Tees und Zubehör" to inactive so the children should not be displayed
         $sql = "UPDATE `s_categories` SET `active` = '0' WHERE `id` =11";
-        Shopware()->Db()->exec($sql);
+        $this->connection->executeStatement($sql);
 
         $allCategories = $this->module->sGetWholeCategoryTree(3, 3);
 
-        //get "Genusswelten" this category should not have the inactive category "Tees and Zubehör" as subcategory
+        // get "Genusswelten" this category should not have the inactive category "Tees and Zubehör" as subcategory
         $category = $this->getCategoryById($allCategories, 5);
         static::assertIsArray($category);
-        //search for Tees und Zubehör
+        // search for Tees und Zubehör
         $result = $this->getCategoryById($category['sub'], 11);
         static::assertEmpty($result);
 
-        //if the parent category is inactive the child's should not be displayed
-        //category = "Genusswelten" the active child "Tees" and "Tees und Zubehör" should not be return because the father ist inactive
+        // if the parent category is inactive the child's should not be displayed
+        // category = "Genusswelten" the active child "Tees" and "Tees und Zubehör" should not be return because the father ist inactive
         $result = $this->getCategoryById($category['sub'], 12);
         static::assertEmpty($result);
 
         $result = $this->getCategoryById($category['sub'], 13);
         static::assertEmpty($result);
 
-        //set Category "Tees und Zubehör" to inactive so the childs should not be displayed
+        // set Category "Tees und Zubehör" to inactive so the children should not be displayed
         $sql = "UPDATE `s_categories` SET `active` = '1' WHERE `id` = 11";
-        Shopware()->Db()->exec($sql);
+        $this->connection->executeStatement($sql);
     }
 
     /**
-     * Returns a category by the category id
+     * @param list<array<string, mixed>> $allCategories
+     *
+     * @return array<string, mixed>|null
      */
     private function getCategoryById(array $allCategories, int $categoryId): ?array
     {
         foreach ($allCategories as $category) {
-            if ($category['id'] == $categoryId) {
+            if ((int) $category['id'] === $categoryId) {
                 return $category;
             }
         }
@@ -271,7 +288,10 @@ private function getCategoryById(array $allCategories, int $categoryId): ?array
         return null;
     }
 
-    private function validateCategory($categoryArray, $subcategoriesIndex = null)
+    /**
+     * @param array<string, mixed> $categoryArray
+     */
+    private function validateCategory(array $categoryArray, ?string $subcategoriesIndex = null): void
     {
         static::assertArrayHasKey('id', $categoryArray);
         static::assertArrayHasKey('name', $categoryArray);
diff --git a/tests/Functional/Core/sCmsTest.php b/tests/Functional/Core/CmsTest.php
similarity index 75%
rename from tests/Functional/Core/sCmsTest.php
rename to tests/Functional/Core/CmsTest.php
index a7c30807589..0403f762a4d 100644
--- a/tests/Functional/Core/sCmsTest.php
+++ b/tests/Functional/Core/CmsTest.php
@@ -1,45 +1,52 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-class sCmsTest extends Enlight_Components_Test_Controller_TestCase
+namespace Shopware\Tests\Functional\Core;
+
+use Doctrine\DBAL\Connection;
+use Enlight_Components_Test_Controller_TestCase;
+use sCms;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+
+class CmsTest extends Enlight_Components_Test_Controller_TestCase
 {
-    /**
-     * @var sCms
-     */
-    private $module;
+    use ContainerTrait;
+
+    private sCms $module;
 
     public function setUp(): void
     {
         $this->Front()->setRequest($this->Request());
-        $this->module = Shopware()->Modules()->Cms();
+        $this->module = $this->getContainer()->get('modules')->Cms();
         parent::setUp();
     }
 
     /**
      * @covers \sCms::sGetStaticPage
      */
-    public function testsGetStaticPage()
+    public function testsGetStaticPage(): void
     {
         // Without argument, returns false
         static::assertFalse($this->module->sGetStaticPage());
@@ -47,10 +54,10 @@ public function testsGetStaticPage()
         // Non-existent id returns false
         static::assertFalse($this->module->sGetStaticPage(0));
 
-        $pageIds = Shopware()->Db()->fetchCol('SELECT id FROM s_cms_static  LIMIT 10');
-
+        $pageIds = $this->getContainer()->get(Connection::class)->fetchFirstColumn('SELECT id FROM s_cms_static  LIMIT 10');
         foreach ($pageIds as $pageId) {
             $page = $this->module->sGetStaticPage($pageId);
+            static::assertIsArray($page);
 
             static::assertArrayHasKey('id', $page);
             static::assertArrayHasKey('description', $page);
diff --git a/tests/Functional/Core/sCoreTest.php b/tests/Functional/Core/CoreTest.php
similarity index 67%
rename from tests/Functional/Core/sCoreTest.php
rename to tests/Functional/Core/CoreTest.php
index 60f3818eb5a..49753fc0eb9 100644
--- a/tests/Functional/Core/sCoreTest.php
+++ b/tests/Functional/Core/CoreTest.php
@@ -1,48 +1,56 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-class sCoreTest extends Enlight_Components_Test_Controller_TestCase
+namespace Shopware\Tests\Functional\Core;
+
+use Doctrine\DBAL\Connection;
+use Enlight_Components_Test_Controller_TestCase;
+use sCore;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+
+class CoreTest extends Enlight_Components_Test_Controller_TestCase
 {
-    /**
-     * @var sCore
-     */
-    private $module;
+    use ContainerTrait;
+
+    private sCore $module;
 
     public function setUp(): void
     {
-        $this->module = Shopware()->Modules()->Core();
+        parent::setUp();
+        $this->module = $this->getContainer()->get('modules')->Core();
     }
 
     /**
      * @covers \sCore::sBuildLink
      */
-    public function testsBuildLink()
+    public function testsBuildLink(): void
     {
         // Empty data will return empty string
         $request = $this->Request()->setParams([]);
         $this->Front()->setRequest($request);
-        static::assertEquals('', $this->module->sBuildLink([]));
+        static::assertSame('', $this->module->sBuildLink([]));
 
         // Provided sVariables are passed into the url, except 'coreID' and 'sPartner'
         $sVariablesTestResult = $this->module->sBuildLink([
@@ -62,9 +70,9 @@ public function testsBuildLink()
         static::assertArrayHasKey('variables', $resultArray);
         static::assertArrayNotHasKey('coreID', $resultArray);
         static::assertArrayNotHasKey('sPartner', $resultArray);
-        static::assertEquals('with', $resultArray['some']);
-        static::assertEquals('test', $resultArray['other']);
-        static::assertEquals('values', $resultArray['variables']);
+        static::assertSame('with', $resultArray['some']);
+        static::assertSame('test', $resultArray['other']);
+        static::assertSame('values', $resultArray['variables']);
 
         // Provided sVariables override _GET, not overlapping get included from both
         // Also test that null values don't get passed on
@@ -91,13 +99,13 @@ public function testsBuildLink()
         static::assertArrayHasKey('variables', $resultArray);
         static::assertArrayNotHasKey('nullVariables', $resultArray);
         static::assertArrayNotHasKey('nullGet', $resultArray);
-        static::assertEquals('used', $resultArray['just']);
-        static::assertEquals('for', $resultArray['some']);
-        static::assertEquals('with', $resultArray['other']);
-        static::assertEquals('values', $resultArray['variables']);
+        static::assertSame('used', $resultArray['just']);
+        static::assertSame('for', $resultArray['some']);
+        static::assertSame('with', $resultArray['other']);
+        static::assertSame('values', $resultArray['variables']);
 
         // Test that sViewport=cat only keeps sCategory and sPage from GET
-        // Test that they can still be overwriten by sVariables
+        // Test that they can still be overwritten by sVariables
         $request = $this->Request()->setParams([
             'sViewport' => 'cat',
             'sCategory' => 'getCategory',
@@ -121,11 +129,11 @@ public function testsBuildLink()
         static::assertArrayHasKey('other', $resultArray);
         static::assertArrayHasKey('variables', $resultArray);
         static::assertArrayNotHasKey('foo', $resultArray);
-        static::assertEquals('cat', $resultArray['sViewport']);
-        static::assertEquals('sVariablesCategory', $resultArray['sCategory']);
-        static::assertEquals('getPage', $resultArray['sPage']);
-        static::assertEquals('with', $resultArray['other']);
-        static::assertEquals('values', $resultArray['variables']);
+        static::assertSame('cat', $resultArray['sViewport']);
+        static::assertSame('sVariablesCategory', $resultArray['sCategory']);
+        static::assertSame('getPage', $resultArray['sPage']);
+        static::assertSame('with', $resultArray['other']);
+        static::assertSame('values', $resultArray['variables']);
 
         // Test that overriding sViewport doesn't override the special behavior
         $request = $this->Request()->setParams([
@@ -152,17 +160,17 @@ public function testsBuildLink()
         static::assertArrayHasKey('other', $resultArray);
         static::assertArrayHasKey('variables', $resultArray);
         static::assertArrayNotHasKey('foo', $resultArray);
-        static::assertEquals('test', $resultArray['sViewport']);
-        static::assertEquals('sVariablesCategory', $resultArray['sCategory']);
-        static::assertEquals('getPage', $resultArray['sPage']);
-        static::assertEquals('with', $resultArray['other']);
-        static::assertEquals('values', $resultArray['variables']);
+        static::assertSame('test', $resultArray['sViewport']);
+        static::assertSame('sVariablesCategory', $resultArray['sCategory']);
+        static::assertSame('getPage', $resultArray['sPage']);
+        static::assertSame('with', $resultArray['other']);
+        static::assertSame('values', $resultArray['variables']);
     }
 
     /**
      * @covers \sCore::sRewriteLink
      */
-    public function testsRewriteLink()
+    public function testsRewriteLink(): void
     {
         // Call dispatch as we need the Router to be available inside sCore
         $this->dispatch('/');
@@ -173,19 +181,21 @@ public function testsRewriteLink()
         static::assertIsString($baseUrl);
         static::assertGreaterThan(0, \strlen($baseUrl));
 
+        $connection = $this->getContainer()->get(Connection::class);
+        $shopId = $this->getContainer()->get('shop')->getId();
         // Fetch all rows and test them
-        $paths = Shopware()->Db()->fetchCol(
+        $paths = $connection->fetchFirstColumn(
             'SELECT org_path FROM s_core_rewrite_urls WHERE subshopID = ?',
-            [Shopware()->Shop()->getId()]
+            [$shopId]
         );
         foreach ($paths as $path) {
-            $expectedPath = Shopware()->Db()->fetchOne(
+            $expectedPath = $connection->fetchOne(
                 'SELECT path FROM s_core_rewrite_urls WHERE subshopID = ? AND org_path = ? ORDER BY main DESC LIMIT 1',
-                [Shopware()->Shop()->getId(), $path]
+                [$shopId, $path]
             );
 
-            static::assertEquals(strtolower($baseUrl . $expectedPath), $this->module->sRewriteLink('?' . $path));
-            static::assertEquals(strtolower($baseUrl . $expectedPath), $this->module->sRewriteLink('?' . $path, 'testTitle'));
+            static::assertSame(strtolower($baseUrl . $expectedPath), $this->module->sRewriteLink('?' . $path));
+            static::assertSame(strtolower($baseUrl . $expectedPath), $this->module->sRewriteLink('?' . $path, 'testTitle'));
         }
     }
 }
diff --git a/tests/Functional/Core/ExportTest.php b/tests/Functional/Core/ExportTest.php
index 2006d04ca65..59ac37a0348 100644
--- a/tests/Functional/Core/ExportTest.php
+++ b/tests/Functional/Core/ExportTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Core;
@@ -31,7 +30,9 @@
 use PHPUnit\Framework\TestCase;
 use RuntimeException;
 use sExport;
+use Shopware\Components\Model\ModelManager;
 use Shopware\Components\Model\ModelRepository;
+use Shopware\Models\Dispatch\Dispatch;
 use Shopware\Models\ProductFeed\ProductFeed;
 use Shopware\Tests\Functional\Traits\ContainerTrait;
 use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
@@ -68,10 +69,10 @@ public function setUp(): void
 
         if (!is_dir($this->cacheDir)) {
             if (@mkdir($this->cacheDir, 0777, true) === false) {
-                throw new RuntimeException(sprintf("Unable to create directory '%s'\n", $this->cacheDir));
+                throw new RuntimeException(\sprintf("Unable to create directory '%s'\n", $this->cacheDir));
             }
         } elseif (!is_writable($this->cacheDir)) {
-            throw new RuntimeException(sprintf("Unable to write in directory '%s'\n", $this->cacheDir));
+            throw new RuntimeException(\sprintf("Unable to write in directory '%s'\n", $this->cacheDir));
         }
 
         $this->connection = $this->getContainer()->get('dbal_connection');
@@ -153,6 +154,80 @@ public function testMainNumbersAreIncludedInTheExport(): void
         static::assertArrayHasKey('mainnumber', $result);
     }
 
+    public function testsGetPremiumDispatchSurchargeInactiveSurcharge(): void
+    {
+        $testSurcharge = new Dispatch();
+        $testSurcharge->setName('Test surcharge');
+        $testSurcharge->setDescription('');
+        $testSurcharge->setComment('');
+        $testSurcharge->setPosition(0);
+        $testSurcharge->setCalculation(Dispatch::CALCULATION_WEIGHT);
+        $testSurcharge->setSurchargeCalculation(Dispatch::SURCHARGE_CALCULATION_ALWAYS);
+        $testSurcharge->setTaxCalculation(0);
+        $testSurcharge->setBindLastStock(0);
+
+        $testSurcharge->setType(Dispatch::TYPE_SURCHARGE);
+        $testSurcharge->setActive(false);
+        $testSurcharge->setBindSql('foo=bar');
+
+        $this->getContainer()->get(ModelManager::class)->persist($testSurcharge);
+        $this->getContainer()->get(ModelManager::class)->flush($testSurcharge);
+
+        $cart = [
+            'instock' => '1',
+            'stockmin' => '1',
+            'laststock' => '0',
+            'weight' => '0.000',
+            'count_article' => '1',
+            'shippingfree' => '0',
+            'amount' => '19.99',
+            'max_tax' => '19.00',
+            'userID' => '',
+            'has_topseller' => '0',
+            'has_comment' => '',
+            'has_esd' => '0',
+            'articleID' => '2',
+            'countryID' => '2',
+            'paymentID' => '5',
+            'customergroupID' => '1',
+            'multishopID' => '1',
+            'sessionID' => 'testSessionId',
+        ];
+        $surcharge = $this->export->sGetPremiumDispatchSurcharge($cart);
+
+        static::assertSame(0.0, $surcharge);
+    }
+
+    public function testsGetPremiumDispatchSurchargeActiveSurcharge(): void
+    {
+        $this->connection->executeStatement(
+            "INSERT INTO `s_premium_dispatch` (`name`, `type`, `description`, `comment`, `active`, `position`, `calculation`, `surcharge_calculation`, `tax_calculation`, `bind_shippingfree`, `bind_laststock`)
+             VALUES ('Test', :type, '', '', 1, 0, 1, 0, 0, 0, 0);",
+            ['type' => Dispatch::TYPE_SURCHARGE]
+        );
+
+        $cart = [
+            'instock' => '1',
+            'stockmin' => '1',
+            'laststock' => '0',
+            'weight' => '0.000',
+            'count_article' => '1',
+            'shippingfree' => '0',
+            'amount' => '19.99',
+            'max_tax' => '19.00',
+            'userID' => '',
+            'has_topseller' => '0',
+            'has_comment' => '',
+            'has_esd' => '0',
+            'articleID' => '2',
+            'customergroupID' => '1',
+            'multishopID' => '1',
+        ];
+        $surcharge = $this->export->sGetPremiumDispatchSurcharge($cart);
+
+        static::assertSame(0.0, $surcharge);
+    }
+
     private function generateFeed(int $feedId): string
     {
         $productFeed = $this->repository->find($feedId);
diff --git a/tests/Functional/Core/MarketingTest.php b/tests/Functional/Core/MarketingTest.php
new file mode 100644
index 00000000000..f6543a2107b
--- /dev/null
+++ b/tests/Functional/Core/MarketingTest.php
@@ -0,0 +1,89 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Core;
+
+use Doctrine\DBAL\Connection;
+use PHPUnit\Framework\TestCase;
+use Shopware\Models\Newsletter\Container;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use sMarketing;
+
+class MarketingTest extends TestCase
+{
+    use ContainerTrait;
+
+    public function testMailCampaignsGetDetail(): void
+    {
+        $newsletterId = $this->prepareNewsletter();
+
+        $marketingModule = $this->getContainer()->get('modules')->getModule('Marketing');
+        static::assertInstanceOf(sMarketing::class, $marketingModule);
+
+        $newsletter = $marketingModule->sMailCampaignsGetDetail($newsletterId);
+        static::assertIsArray($newsletter);
+
+        static::assertSame("&lt;script&gt;alert('XSS')&lt;/script&gt;", $newsletter['containers'][0]['description']);
+    }
+
+    public function testBuildTagCloud(): void
+    {
+        $marketingModule = $this->getContainer()->get('modules')->getModule('Marketing');
+        static::assertInstanceOf(sMarketing::class, $marketingModule);
+
+        $tagCloud = $marketingModule->sBuildTagCloud();
+        static::assertTrue(array_is_list($tagCloud));
+        $firstTag = $tagCloud[0];
+        static::assertIsArray($firstTag);
+        static::assertArrayHasKey('articleName', $firstTag);
+        static::assertArrayHasKey('relevance', $firstTag);
+        static::assertArrayHasKey('articleID', $firstTag);
+        static::assertArrayHasKey('name', $firstTag);
+        static::assertArrayHasKey('class', $firstTag);
+        static::assertArrayHasKey('link', $firstTag);
+        static::assertStringStartsWith('shopware.php?sViewport=detail&sArticle=', $firstTag['link']);
+    }
+
+    private function prepareNewsletter(): int
+    {
+        $connection = $this->getContainer()->get(Connection::class);
+
+        $connection->insert('s_campaigns_mailings', []);
+        $newsletterId = (int) $connection->lastInsertId();
+
+        $connection->insert('s_campaigns_containers', [
+            'promotionID' => $newsletterId,
+            'type' => Container::TYPE_TEXT,
+        ]);
+        $newsletterContainerId = (int) $connection->lastInsertId();
+
+        $connection->insert('s_campaigns_html', [
+            'parentID' => $newsletterContainerId,
+            'headline' => "<script>alert('XSS')</script>",
+        ]);
+
+        return $newsletterId;
+    }
+}
diff --git a/tests/Functional/Core/OrderTest.php b/tests/Functional/Core/OrderTest.php
index 30c1a221896..b182fd8d8bf 100644
--- a/tests/Functional/Core/OrderTest.php
+++ b/tests/Functional/Core/OrderTest.php
@@ -5,28 +5,28 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Core;
 
 use Doctrine\ORM\AbstractQuery;
+use Enlight_Components_Mail;
 use Enlight_Controller_Request_RequestHttp as ShopwareRequest;
 use Enlight_Event_EventArgs;
 use PHPUnit\Framework\TestCase;
@@ -68,7 +68,8 @@ public function testGetOrderNumber(): void
     }
 
     /**
-     * @covers \sOrder::sendMail()
+     * @covers \sOrder::sendMail
+     *
      * @ticket SW-8261
      */
     public function testSendMailPaymentData(): void
@@ -89,10 +90,9 @@ public function testSendMailPaymentData(): void
             ]
         );
 
-        // Register the event listener, so that we test the value of "$context"
         Shopware()->Events()->addListener(
-            'Shopware_Modules_Order_SendMail_Create',
-            [$this, 'validatePaymentContextData']
+            'Shopware_Modules_Order_SendMail_FilterContext',
+            [$this, 'extendPaymentContextDataToPreventFailures']
         );
 
         Shopware()->Front()->setRequest(new ShopwareRequest());
@@ -100,19 +100,55 @@ public function testSendMailPaymentData(): void
         $variables = [
             'additional' => [
                 'payment' => Shopware()->Modules()->Admin()->sGetPaymentMeanById(
-                    Shopware()->Db()->fetchRow('SELECT * FROM s_core_paymentmeans WHERE name LIKE "debit"')
+                    (int) Shopware()->Db()->fetchOne('SELECT id FROM s_core_paymentmeans WHERE name LIKE "debit"')
                 ),
+                'country' => [
+                    'countryname' => 'Deutschland',
+                ],
+                'countryShipping' => [
+                    'countryname' => 'Deutschland',
+                ],
+            ],
+            'billingaddress' => [
+                'company' => '',
+                'firstname' => 'Test',
+                'lastname' => 'Foo',
+                'street' => 'Ebbinghoff',
+                'streetnumber' => '10',
+                'zipcode' => '48624',
+                'city' => 'Schöppingen',
+                'ustid' => '',
+            ],
+            'shippingaddress' => [
+                'company' => '',
+                'firstname' => 'Test',
+                'lastname' => 'Foo',
+                'street' => 'Ebbinghoff',
+                'streetnumber' => '10',
+                'zipcode' => '48624',
+                'city' => 'Schöppingen',
+            ],
+            'sDispatch' => [
+                'name' => 'test',
+                'description' => 'foo',
             ],
         ];
 
         $this->module->sendMail($variables);
     }
 
-    public function validatePaymentContextData(Enlight_Event_EventArgs $args): void
+    public function extendPaymentContextDataToPreventFailures(Enlight_Event_EventArgs $args): void
     {
-        $context = $args->get('context');
+        $context = $args->getReturn();
         static::assertIsArray($context['sPaymentTable']);
         static::assertCount(0, $context['sPaymentTable']);
+
+        $context['sPaymentTable']['account'] = null;
+        $context['sPaymentTable']['bankcode'] = null;
+        $context['sPaymentTable']['bankname'] = null;
+        $context['sPaymentTable']['bankholder'] = null;
+
+        $args->setReturn($context);
     }
 
     public function testTransactionExistTrue(): void
@@ -341,12 +377,12 @@ public function testSSaveBillingAddress(): void
         $billingAttr = $billing->getAttribute();
 
         if ($billingAttr !== null) {
-            static::assertSame($originalBillingAddress['text1'], $billingAttr->getText1());
-            static::assertSame($originalBillingAddress['text2'], $billingAttr->getText2());
-            static::assertSame($originalBillingAddress['text3'], $billingAttr->getText3());
-            static::assertSame($originalBillingAddress['text4'], $billingAttr->getText4());
-            static::assertSame($originalBillingAddress['text5'], $billingAttr->getText5());
-            static::assertSame($originalBillingAddress['text6'], $billingAttr->getText6());
+            static::assertSame($originalBillingAddress['text1'] ?? null, $billingAttr->getText1());
+            static::assertSame($originalBillingAddress['text2'] ?? null, $billingAttr->getText2());
+            static::assertSame($originalBillingAddress['text3'] ?? null, $billingAttr->getText3());
+            static::assertSame($originalBillingAddress['text4'] ?? null, $billingAttr->getText4());
+            static::assertSame($originalBillingAddress['text5'] ?? null, $billingAttr->getText5());
+            static::assertSame($originalBillingAddress['text6'] ?? null, $billingAttr->getText6());
             Shopware()->Models()->remove($billingAttr);
         }
         Shopware()->Models()->remove($billing);
@@ -375,12 +411,12 @@ public function testSaveShippingAddress(): void
         $shippingAttr = $shipping->getAttribute();
 
         if ($shippingAttr !== null) {
-            static::assertSame($originalBillingAddress['text1'], $shippingAttr->getText1());
-            static::assertSame($originalBillingAddress['text2'], $shippingAttr->getText2());
-            static::assertSame($originalBillingAddress['text3'], $shippingAttr->getText3());
-            static::assertSame($originalBillingAddress['text4'], $shippingAttr->getText4());
-            static::assertSame($originalBillingAddress['text5'], $shippingAttr->getText5());
-            static::assertSame($originalBillingAddress['text6'], $shippingAttr->getText6());
+            static::assertSame($originalBillingAddress['text1'] ?? null, $shippingAttr->getText1());
+            static::assertSame($originalBillingAddress['text2'] ?? null, $shippingAttr->getText2());
+            static::assertSame($originalBillingAddress['text3'] ?? null, $shippingAttr->getText3());
+            static::assertSame($originalBillingAddress['text4'] ?? null, $shippingAttr->getText4());
+            static::assertSame($originalBillingAddress['text5'] ?? null, $shippingAttr->getText5());
+            static::assertSame($originalBillingAddress['text6'] ?? null, $shippingAttr->getText6());
             Shopware()->Models()->remove($shippingAttr);
         }
 
@@ -480,6 +516,9 @@ public function testHandleESDOrder(): void
                 'getVariantEsd',
                 [$basketRow['ordernumber']]
             );
+            if (!\is_array($esdArticle)) {
+                continue;
+            }
 
             $availableSerials = $this->invokeMethod(
                 $this->module,
@@ -708,7 +747,31 @@ public function testEKOrder(): void
         $requestStack->pop();
     }
 
-    protected function createOrder(): void
+    public function testCreateStatusMailWithNoStatusButWithTemplateNameShouldReturnMailObject(): void
+    {
+        $mail = $this->module->createStatusMail(15, 0, 'sORDERDOCUMENTS');
+        static::assertInstanceOf(Enlight_Components_Mail::class, $mail);
+    }
+
+    public function testCreateStatusMailWithNoStatusAndNoTemplateShouldReturnNull(): void
+    {
+        $mail = $this->module->createStatusMail(15, 0);
+        static::assertNull($mail);
+    }
+
+    public function testCreateStatusMailWithStatusShouldReturnMailObject(): void
+    {
+        $mail = $this->module->createStatusMail(15, 1);
+        static::assertInstanceOf(Enlight_Components_Mail::class, $mail);
+    }
+
+    public function testCreateStatusMailWithUnknownTemplateShouldReturnNull(): void
+    {
+        $mail = $this->module->createStatusMail(15, 1, 'doesNotExist');
+        static::assertNull($mail);
+    }
+
+    private function createOrder(): void
     {
         $products = $this->getRandomProducts();
 
@@ -736,7 +799,7 @@ protected function createOrder(): void
         ];
     }
 
-    protected function createDummyOrder(): int
+    private function createDummyOrder(): int
     {
         $number = 'SW-' . uniqid((string) mt_rand(), true);
         Shopware()->Db()->insert('s_order', [
@@ -775,6 +838,7 @@ protected function createDummyOrder(): int
     private function getHighestProductsTax(array $products): float
     {
         $productTax = array_column($products, 'tax_rate');
+        static::assertNotEmpty($productTax);
 
         return (float) max($productTax);
     }
@@ -896,7 +960,7 @@ private function getRandomUser(): array
             [':key' => $user['customergroup']]
         );
 
-        $taxFree = (bool) ($countryShipping['taxfree']);
+        $taxFree = (bool) $countryShipping['taxfree'];
         if ($countryShipping['taxfree_ustid'] && $countryShipping['id'] == $country['id'] && $billing['ustid']) {
             $taxFree = true;
         }
diff --git a/tests/Functional/Core/RewriteTest.php b/tests/Functional/Core/RewriteTest.php
new file mode 100644
index 00000000000..84c1cbc56c1
--- /dev/null
+++ b/tests/Functional/Core/RewriteTest.php
@@ -0,0 +1,232 @@
+<?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Core;
+
+use DateTimeImmutable;
+use Doctrine\DBAL\Connection;
+use Enlight_Components_Test_TestCase;
+use Shopware\Bundle\AttributeBundle\Service\ConfigurationStruct;
+use Shopware\Bundle\AttributeBundle\Service\CrudServiceInterface;
+use Shopware\Bundle\AttributeBundle\Service\DataLoaderInterface;
+use Shopware\Bundle\AttributeBundle\Service\DataPersisterInterface;
+use Shopware\Components\Model\ModelManager;
+use Shopware\Components\Routing\Context;
+use Shopware\Components\Routing\RouterInterface;
+use Shopware\Components\ShopRegistrationServiceInterface;
+use Shopware\Models\Shop\Shop;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware_Components_Config;
+use sRewriteTable;
+
+class RewriteTest extends Enlight_Components_Test_TestCase
+{
+    use ContainerTrait;
+
+    private const ATTRIBUTE_NAME = 'sw_foo';
+
+    private const ATTRIBUTE_VALUE = 'loremipsum';
+
+    private const NEW_ROUTER_PRODUCT_TEMPLATE = '{sCategoryPath articleID=$sArticle.id}/{$sArticle.id}/{$sArticle.name}/{if $sArticle.' . self::ATTRIBUTE_NAME . '}{$sArticle.' . self::ATTRIBUTE_NAME . '}{/if}';
+
+    private const DEFAULT_PRODUCT_URL = 'Sommerwelten/Beachwear/178/Strandtuch-Ibiza';
+
+    private const PRODUCT_DETAILS_ID = 407;
+
+    private const PRODUCT_ID = 178;
+
+    /**
+     * @var sRewriteTable
+     */
+    private $rewriteTable;
+
+    private ModelManager $entityManager;
+
+    private Shopware_Components_Config $config;
+
+    private DataPersisterInterface $dataPersister;
+
+    private DataLoaderInterface $dataLoader;
+
+    private RouterInterface $router;
+
+    private CrudServiceInterface $attributesService;
+
+    private DateTimeImmutable $date;
+
+    private Shop $shop;
+
+    private Connection $connection;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->rewriteTable = Shopware()->Modules()->RewriteTable();
+        $this->attributesService = $this->getContainer()->get(CrudServiceInterface::class);
+        $this->entityManager = $this->getContainer()->get(ModelManager::class);
+        $this->config = $this->getContainer()->get('config');
+        $this->dataPersister = $this->getContainer()->get(DataPersisterInterface::class);
+        $this->dataLoader = $this->getContainer()->get(DataLoaderInterface::class);
+        $this->router = $this->getContainer()->get(RouterInterface::class);
+        $this->date = new DateTimeImmutable();
+        $this->connection = $this->getContainer()->get(Connection::class);
+
+        $shop = $this->entityManager->find(Shop::class, 1);
+        static::assertInstanceOf(Shop::class, $shop);
+        $this->shop = $shop;
+    }
+
+    /**
+     * * @dataProvider provider
+     */
+    public function testRewriteString(string $string, string $result): void
+    {
+        static::assertEquals($result, $this->rewriteTable->sCleanupPath($string));
+    }
+
+    /**
+     * @return array<array{0: string, 1: string}>
+     */
+    public function provider(): array
+    {
+        return [
+            [' a  b ', 'a-b'],
+            ['hello', 'hello'],
+            ['Hello', 'Hello'],
+            ['Hello World', 'Hello-World'],
+            ['Hello-World', 'Hello-World'],
+            ['Hello:World', 'Hello-World'],
+            ['Hello,World', 'Hello-World'],
+            ['Hello;World', 'Hello-World'],
+            ['Hello&World', 'Hello-World'],
+            ['Hello & World', 'Hello-World'],
+            ['Hello.World.html', 'Hello.World.html'],
+            ['Hello World.html', 'Hello-World.html'],
+            ['Hello World!', 'Hello-World'],
+            ['Hello World!.html', 'Hello-World.html'],
+            ['Hello / World', 'Hello/World'],
+            ['Hello/World', 'Hello/World'],
+            ['H+e#l1l--o/W§o r.l:d)', 'H-e-l1l-o/W-o-r.l-d'],
+            [': World', 'World'],
+            ['Nguyễn Đăng Khoa', 'Nguyen-Dang-Khoa'],
+            ['Ä ä Ö ö Ü ü ß', 'AE-ae-OE-oe-UE-ue-ss'],
+            ['Á À á à É È é è Ó Ò ó ò Ñ ñ Ú Ù ú ù', 'A-A-a-a-E-E-e-e-O-O-o-o-N-n-U-U-u-u'],
+            ['Â â Ê ê Ô ô Û û', 'A-a-E-e-O-o-U-u'],
+            ['Â â Ê ê Ô ô Û 1', 'A-a-E-e-O-o-U-1'],
+            ['Привет мир', 'Privet-mir'],
+            ['Привіт світ', 'Privit-svit'],
+            ['°¹²³@', '0123at'],
+            ['Mórë thån wørds', 'More-thaan-woerds'],
+            ['Блоґ їжачка', 'Blog-jizhachka'],
+            ['фильм', 'film'],
+            ['драма', 'drama'],
+            ['ελληνικά', 'ellinika'],
+            ['C’est du français !', 'C-est-du-francais'],
+            ['Één jaar', 'Een-jaar'],
+            ['tiếng việt rất khó', 'tieng-viet-rat-kho'],
+        ];
+    }
+
+    public function testCustomAttributesInSeoProductUrl(): void
+    {
+        $this->getContainer()->get(ShopRegistrationServiceInterface::class)->registerShop($this->shop);
+
+        $this->createCustomProductAttribute();
+
+        $this->connection->beginTransaction();
+        $this->connection->executeStatement(
+            'UPDATE s_articles SET changetime = :changeTime WHERE id = :productId;',
+            [
+                'changeTime' => $this->date->modify('-1 days')->format('Y:m:d H:i:s'),
+                'productId' => self::PRODUCT_ID,
+            ]
+        );
+
+        $this->enterDataToNewAttribute();
+
+        $this->setCustomProductSeoUrl();
+        static::assertSame(self::NEW_ROUTER_PRODUCT_TEMPLATE, $this->config->get('routerarticletemplate'));
+
+        $this->rebuildSeoIndex();
+
+        $url = $this->checkProductUrl();
+        static::assertStringEndsWith(self::ATTRIBUTE_VALUE, $url);
+
+        $this->connection->rollBack();
+        $this->entityManager->clear();
+
+        $this->removeCustomProductAttribute();
+        static::assertNull($this->attributesService->get('s_articles_attributes', self::ATTRIBUTE_NAME));
+
+        $url = $this->checkProductUrl();
+        static::assertStringContainsString(strtolower(self::DEFAULT_PRODUCT_URL), strtolower($url));
+        static::assertStringEndsNotWith(self::ATTRIBUTE_VALUE, $url);
+    }
+
+    private function createCustomProductAttribute(): void
+    {
+        $this->attributesService->update(
+            's_articles_attributes',
+            self::ATTRIBUTE_NAME,
+            'string'
+        );
+
+        $this->entityManager->generateAttributeModels(['s_articles_attributes']);
+
+        $column = $this->attributesService->get('s_articles_attributes', self::ATTRIBUTE_NAME);
+        static::assertInstanceOf(ConfigurationStruct::class, $column);
+    }
+
+    private function enterDataToNewAttribute(): void
+    {
+        $this->dataPersister->persist([self::ATTRIBUTE_NAME => self::ATTRIBUTE_VALUE], 's_articles_attributes', self::PRODUCT_DETAILS_ID);
+        $result = $this->dataLoader->load('s_articles_attributes', self::PRODUCT_DETAILS_ID);
+        static::assertSame(self::ATTRIBUTE_VALUE, $result[self::ATTRIBUTE_NAME]);
+    }
+
+    private function setCustomProductSeoUrl(): void
+    {
+        $this->setConfig('routerarticletemplate', self::NEW_ROUTER_PRODUCT_TEMPLATE);
+    }
+
+    private function rebuildSeoIndex(): void
+    {
+        $this->rewriteTable->baseSetup();
+        $this->rewriteTable->sCreateRewriteTableArticles($this->date->modify('-2 days')->format('Y:m:d H:i:s'));
+    }
+
+    private function checkProductUrl(): string
+    {
+        $context = Context::createFromShop($this->shop, $this->config);
+        static::assertInstanceOf(Context::class, $context);
+
+        return $this->router->assemble(['controller' => 'detail', 'action' => 'index', 'sArticle' => self::PRODUCT_ID], $context);
+    }
+
+    private function removeCustomProductAttribute(): void
+    {
+        $this->attributesService->delete('s_articles_attributes', self::ATTRIBUTE_NAME);
+    }
+}
diff --git a/tests/Functional/Core/fixtures/basket_add_basket_attribute_test.sql b/tests/Functional/Core/fixtures/basket_add_basket_attribute_test.sql
new file mode 100644
index 00000000000..a39641bbffd
--- /dev/null
+++ b/tests/Functional/Core/fixtures/basket_add_basket_attribute_test.sql
@@ -0,0 +1,5 @@
+INSERT INTO `s_order_basket` (`sessionID`, `userID`, `articlename`, `articleID`, `ordernumber`, `shippingfree`, `quantity`, `price`, `netprice`, `tax_rate`, `datum`, `modus`, `esdarticle`, `partnerID`, `lastviewport`, `useragent`, `config`, `currencyFactor`) VALUES
+    ('BasketAddBasketAttributesTestSessionId',	0,	'discountName',	0,	'SWOrderNumber',	0,	1,	10.99,	9.24,	19,	'2023-01-04 10:44:26',	1,	0,	'',	'',	'',	'',	1),
+    ('BasketAddBasketAttributesTestSessionId',	0,	'discountName',	0,	'OtherSWOrderNumber',	0,	1,	1.99,	0.924,	19,	'2023-01-04 10:44:26',	0,	0,	'',	'',	'',	'',	1);
+
+INSERT INTO `s_core_customergroups_discounts` (`groupID`, `basketdiscount`, `basketdiscountstart`) VALUES (	1,	5,	10);
diff --git a/tests/Functional/Core/sRewriteTest.php b/tests/Functional/Core/sRewriteTest.php
deleted file mode 100644
index fff34604fdc..00000000000
--- a/tests/Functional/Core/sRewriteTest.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-class sRewriteTest extends PHPUnit\Framework\TestCase
-{
-    /**
-     * @var sRewriteTable
-     */
-    private $rewriteTable;
-
-    public function setUp(): void
-    {
-        $this->rewriteTable = Shopware()->Modules()->RewriteTable();
-    }
-
-    /**
-     * * @dataProvider provider
-     */
-    public function testRewriteString($string, $result)
-    {
-        static::assertEquals($result, $this->rewriteTable->sCleanupPath($string));
-    }
-
-    public function provider()
-    {
-        return [
-            [' a  b ', 'a-b'],
-            ['hello', 'hello'],
-            ['Hello', 'Hello'],
-            ['Hello World', 'Hello-World'],
-            ['Hello-World', 'Hello-World'],
-            ['Hello:World', 'Hello-World'],
-            ['Hello,World', 'Hello-World'],
-            ['Hello;World', 'Hello-World'],
-            ['Hello&World', 'Hello-World'],
-            ['Hello & World', 'Hello-World'],
-            ['Hello.World.html', 'Hello.World.html'],
-            ['Hello World.html', 'Hello-World.html'],
-            ['Hello World!', 'Hello-World'],
-            ['Hello World!.html', 'Hello-World.html'],
-            ['Hello / World', 'Hello/World'],
-            ['Hello/World', 'Hello/World'],
-            ['H+e#l1l--o/W§o r.l:d)', 'H-e-l1l-o/W-o-r.l-d'],
-            [': World', 'World'],
-            ['Nguyễn Đăng Khoa', 'Nguyen-Dang-Khoa'],
-            ['Ä ä Ö ö Ü ü ß', 'AE-ae-OE-oe-UE-ue-ss'],
-            ['Á À á à É È é è Ó Ò ó ò Ñ ñ Ú Ù ú ù', 'A-A-a-a-E-E-e-e-O-O-o-o-N-n-U-U-u-u'],
-            ['Â â Ê ê Ô ô Û û', 'A-a-E-e-O-o-U-u'],
-            ['Â â Ê ê Ô ô Û 1', 'A-a-E-e-O-o-U-1'],
-            ['Привет мир', 'Privet-mir'],
-            ['Привіт світ', 'Privit-svit'],
-            ['°¹²³@', '0123at'],
-            ['Mórë thån wørds', 'More-thaan-woerds'],
-            ['Блоґ їжачка', 'Blog-jizhachka'],
-            ['фильм', 'film'],
-            ['драма', 'drama'],
-            ['ελληνικά', 'ellinika'],
-            ['C’est du français !', 'C-est-du-francais'],
-            ['Één jaar', 'Een-jaar'],
-            ['tiếng việt rất khó', 'tieng-viet-rat-kho'],
-        ];
-    }
-}
diff --git a/tests/Functional/Helper/Utils.php b/tests/Functional/Helper/Utils.php
index 8bdb8b4bb7e..bb98d948e4a 100644
--- a/tests/Functional/Helper/Utils.php
+++ b/tests/Functional/Helper/Utils.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Helper;
@@ -31,6 +30,8 @@
 
 class Utils
 {
+    public const FORMER_PHPUNIT_FLOAT_EPSILON = 0.0000000001;
+
     /**
      * @return array<mixed>|callable|null
      */
@@ -41,7 +42,7 @@ public static function bindAndCall(Closure $fn, object $newThis)
             throw new RuntimeException('Could not create closure function');
         }
 
-        return $func(); //faster
+        return $func(); // faster
     }
 
     /**
diff --git a/tests/Functional/KernelStorage.php b/tests/Functional/KernelStorage.php
index a45aa1f9d43..6d4f45a582e 100644
--- a/tests/Functional/KernelStorage.php
+++ b/tests/Functional/KernelStorage.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional;
diff --git a/tests/Functional/Library/Enlight/Template/Plugins/CurrencyModifierTest.php b/tests/Functional/Library/Enlight/Template/Plugins/CurrencyModifierTest.php
new file mode 100644
index 00000000000..3a295decd94
--- /dev/null
+++ b/tests/Functional/Library/Enlight/Template/Plugins/CurrencyModifierTest.php
@@ -0,0 +1,54 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Library\Enlight\Template\Plugins;
+
+use Enlight_Template_Manager;
+use Enlight_View_Default;
+use Generator;
+use PHPUnit\Framework\TestCase;
+
+class CurrencyModifierTest extends TestCase
+{
+    /**
+     * @dataProvider currencyValues
+     *
+     * @param float|string $currencyValue
+     */
+    public function testModifier($currencyValue, string $expectedFormattedCurrencyValue): void
+    {
+        $template = new Enlight_View_Default(new Enlight_Template_Manager());
+        $template->Engine()->loadPlugin('smarty_modifier_currency');
+        static::assertSame($expectedFormattedCurrencyValue, \smarty_modifier_currency($currencyValue));
+    }
+
+    public function currencyValues(): Generator
+    {
+        yield 'Currency value with comma' => ['1,23', '1,23&nbsp;&euro;'];
+        yield 'Currency value as float' => [1.23, '1,23&nbsp;&euro;'];
+        yield 'Currency value as numeric string' => ['1.23', '1,23&nbsp;&euro;'];
+        yield 'Currency value with special chars' => ['\'"<>&1', '0,00&nbsp;&euro;'];
+    }
+}
diff --git a/tests/Functional/Library/Zend/ZendDBTest.php b/tests/Functional/Library/Zend/ZendDBTest.php
new file mode 100644
index 00000000000..1ce713944c3
--- /dev/null
+++ b/tests/Functional/Library/Zend/ZendDBTest.php
@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Library\Zend;
+
+use PHPUnit\Framework\TestCase;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Zend_Db_Adapter_Exception;
+
+class ZendDBTest extends TestCase
+{
+    use ContainerTrait;
+
+    public function testAdapterException(): void
+    {
+        $dbConnection = $this->getContainer()->get('db');
+
+        $this->expectException(Zend_Db_Adapter_Exception::class);
+        $this->expectExceptionMessageMatches("/SQLSTATE\[42S02\]: Base table or view not found: 1146 Table '.*\.foobar' doesn't exist/");
+        $this->expectExceptionCode(0);
+        $dbConnection->exec('SELECT * FROM foobar');
+    }
+}
diff --git a/tests/Functional/Library/ZendLocaleTest.php b/tests/Functional/Library/Zend/ZendLocaleTest.php
similarity index 53%
rename from tests/Functional/Library/ZendLocaleTest.php
rename to tests/Functional/Library/Zend/ZendLocaleTest.php
index d45171cf6bf..f7d1613ea30 100644
--- a/tests/Functional/Library/ZendLocaleTest.php
+++ b/tests/Functional/Library/Zend/ZendLocaleTest.php
@@ -1,34 +1,38 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Functional\Library;
+namespace Shopware\Tests\Functional\Library\Zend;
 
 use Doctrine\DBAL\Connection;
 use PHPUnit\Framework\TestCase;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
 
 class ZendLocaleTest extends TestCase
 {
+    use ContainerTrait;
+
     public const KNOWN_FAILURE = [
         'wo_SN',
         'tt_RU',
@@ -64,21 +68,20 @@ class ZendLocaleTest extends TestCase
     ];
 
     /**
-     * @param string $localName
      * @dataProvider getLocales
      */
-    public function testLocalCreation($localName)
+    public function testLocalCreation(string $localName): void
     {
-        static::assertFileExists(sprintf('%s/engine/Library/Zend/Locale/Data/%s.xml', Shopware()->DocPath(), $localName));
+        static::assertFileExists(\sprintf('%s/engine/Library/Zend/Locale/Data/%s.xml', Shopware()->DocPath(), $localName));
     }
 
     /**
-     * @return array
+     * @return array<int, array<string, mixed>>
      */
-    public function getLocales()
+    public function getLocales(): array
     {
-        $con = Shopware()->Container()->get(\Doctrine\DBAL\Connection::class);
+        $sql = 'SELECT locale FROM s_core_locales WHERE locale NOT IN(?)';
 
-        return $con->fetchAll('SELECT locale FROM s_core_locales WHERE locale NOT IN(?)', [self::KNOWN_FAILURE], [Connection::PARAM_STR_ARRAY]);
+        return $this->getContainer()->get(Connection::class)->fetchAllAssociative($sql, [self::KNOWN_FAILURE], [Connection::PARAM_STR_ARRAY]);
     }
 }
diff --git a/tests/Functional/Models/Article/ArticleTest.php b/tests/Functional/Models/Article/ArticleTest.php
new file mode 100644
index 00000000000..c3d730223ff
--- /dev/null
+++ b/tests/Functional/Models/Article/ArticleTest.php
@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Models\Article;
+
+use Enlight_Components_Test_TestCase;
+use Shopware\Components\Model\ModelManager;
+use Shopware\Models\Article\Article;
+use Shopware\Models\Article\Repository;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
+
+class ArticleTest extends Enlight_Components_Test_TestCase
+{
+    use ContainerTrait;
+    use DatabaseTransactionBehaviour;
+
+    private ModelManager $entityManager;
+
+    private Repository $repository;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->entityManager = $this->getContainer()->get(ModelManager::class);
+        $this->repository = $this->entityManager->getRepository(Article::class);
+    }
+
+    public function testProductKeywordsMediumtextDatatype(): void
+    {
+        $product = $this->repository->find(23);
+        static::assertInstanceOf(Article::class, $product);
+
+        $keywords = require __DIR__ . '/../_assets/keywords.php';
+        static::assertIsString($keywords);
+        $product->setKeywords($keywords);
+
+        $this->entityManager->persist($product);
+        $this->entityManager->flush($product);
+
+        static::assertSame($keywords, $product->getKeywords());
+    }
+}
diff --git a/tests/Functional/Models/Article/DetailTest.php b/tests/Functional/Models/Article/DetailTest.php
index 18f785e9eb9..468cbbbb98c 100644
--- a/tests/Functional/Models/Article/DetailTest.php
+++ b/tests/Functional/Models/Article/DetailTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Models\Article;
@@ -116,15 +115,15 @@ public function testChangingOrderNumberRegexIsWorking(): void
                 'number' => '€SW100066@1',
             ],
             [
-                'regex' => '/^[\w-_.@€]+$/',
+                'regex' => '/^[\w\-_.@€]+$/',
                 'number' => '@SW100066€1',
             ],
             [
-                'regex' => '/^[\w\s-_.@€]+$/',
+                'regex' => '/^[\w\s\-_.@€]+$/',
                 'number' => '€SW1 00 066@1',
             ],
             [
-                'regex' => '/^[\w\u-_.@€]+$/',
+                'regex' => '/^[\p{L}\p{N}\p{P}\p{S}]+$/u',
                 'number' => '€SW100💙066@1',
             ],
         ];
@@ -153,6 +152,6 @@ private function internalTestChangingOrderNumberRegexIsWorking(string $regex, st
 
         $violations = $this->em->validate($detail);
 
-        static::assertEquals(0, $violations->count(), sprintf('Number "%s" does not match regex "%s"', $number, $regex));
+        static::assertEquals(0, $violations->count(), \sprintf('Number "%s" does not match regex "%s"', $number, $regex));
     }
 }
diff --git a/tests/Functional/Models/Article/SupplierTest.php b/tests/Functional/Models/Article/SupplierTest.php
new file mode 100644
index 00000000000..b5c05578319
--- /dev/null
+++ b/tests/Functional/Models/Article/SupplierTest.php
@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Models\Article;
+
+use Enlight_Components_Test_TestCase;
+use Shopware\Components\Model\ModelManager;
+use Shopware\Models\Article\Supplier;
+use Shopware\Models\Article\SupplierRepository;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
+
+class SupplierTest extends Enlight_Components_Test_TestCase
+{
+    use ContainerTrait;
+    use DatabaseTransactionBehaviour;
+
+    private ModelManager $entityManager;
+
+    private SupplierRepository $repository;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->entityManager = $this->getContainer()->get(ModelManager::class);
+        $this->repository = $this->entityManager->getRepository(Supplier::class);
+    }
+
+    public function testSupplierKeywordsMediumtextDatatype(): void
+    {
+        $supplier = $this->repository->find(3);
+        static::assertInstanceOf(Supplier::class, $supplier);
+
+        $keywords = require __DIR__ . '/../_assets/keywords.php';
+        static::assertIsString($keywords);
+        $supplier->setMetaKeywords($keywords);
+
+        $this->entityManager->persist($supplier);
+        $this->entityManager->flush($supplier);
+
+        static::assertSame($keywords, $supplier->getMetaKeywords());
+    }
+}
diff --git a/tests/Functional/Models/Blog/BlogTest.php b/tests/Functional/Models/Blog/BlogTest.php
new file mode 100644
index 00000000000..915f3c602f5
--- /dev/null
+++ b/tests/Functional/Models/Blog/BlogTest.php
@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Models\Blog;
+
+use Enlight_Components_Test_TestCase;
+use Shopware\Components\Model\ModelManager;
+use Shopware\Models\Blog\Blog;
+use Shopware\Models\Blog\Repository;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
+
+class BlogTest extends Enlight_Components_Test_TestCase
+{
+    use ContainerTrait;
+    use DatabaseTransactionBehaviour;
+
+    private ModelManager $entityManager;
+
+    private Repository $repository;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->entityManager = $this->getContainer()->get(ModelManager::class);
+        $this->repository = $this->entityManager->getRepository(Blog::class);
+    }
+
+    public function testBlogKeywordsMediumtextDatatype(): void
+    {
+        $blog = $this->repository->find(3);
+        static::assertInstanceOf(Blog::class, $blog);
+
+        $keywords = require __DIR__ . '/../_assets/keywords.php';
+        static::assertIsString($keywords);
+        $blog->setMetaKeyWords($keywords);
+
+        $this->entityManager->persist($blog);
+        $this->entityManager->flush($blog);
+
+        static::assertSame($keywords, $blog->getMetaKeyWords());
+    }
+}
diff --git a/tests/Functional/Models/Category/BlogCategoryTreeListQueryTest.php b/tests/Functional/Models/Category/BlogCategoryTreeListQueryTest.php
index da8f74e4845..5406dfe2a5d 100644
--- a/tests/Functional/Models/Category/BlogCategoryTreeListQueryTest.php
+++ b/tests/Functional/Models/Category/BlogCategoryTreeListQueryTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Models\Category;
@@ -45,8 +44,6 @@ class BlogCategoryTreeListQueryTest extends Enlight_Components_Test_TestCase
                 'position' => 0,
                 'blog' => false,
                 'childrenCount' => '1',
-                'emotions' => null,
-                'articles' => null,
             ],
             1 => [
                 'id' => 39,
@@ -54,8 +51,6 @@ class BlogCategoryTreeListQueryTest extends Enlight_Components_Test_TestCase
                 'position' => 1,
                 'blog' => false,
                 'childrenCount' => '1',
-                'emotions' => null,
-                'articles' => null,
             ],
         ],
         3 => [
@@ -65,8 +60,6 @@ class BlogCategoryTreeListQueryTest extends Enlight_Components_Test_TestCase
                 'position' => 5,
                 'blog' => true,
                 'childrenCount' => '0',
-                'emotions' => null,
-                'articles' => null,
             ],
         ],
         39 => [
@@ -76,8 +69,6 @@ class BlogCategoryTreeListQueryTest extends Enlight_Components_Test_TestCase
                 'position' => 0,
                 'blog' => true,
                 'childrenCount' => '0',
-                'emotions' => null,
-                'articles' => null,
             ],
         ],
     ];
@@ -88,7 +79,7 @@ public function testQuery(): void
             $filter = [['property' => 'c.parentId', 'value' => $id]];
             $query = $this->getRepo()->getBlogCategoryTreeListQuery($filter);
             $data = $this->removeDates($query->getArrayResult());
-            static::assertEquals($data, $expected);
+            static::assertEquals($expected, $data);
         }
     }
 
@@ -110,13 +101,17 @@ protected function removeDates(array $data): array
     {
         foreach ($data as &$subCategory) {
             unset($subCategory['changed'], $subCategory['cmsText'], $subCategory['added']);
-            foreach ($subCategory['emotions'] as &$emotion) {
-                unset($emotion['createDate'], $emotion['modified']);
+            if (isset($subCategory['emotions'])) {
+                foreach ($subCategory['emotions'] as &$emotion) {
+                    unset($emotion['createDate'], $emotion['modified']);
+                }
             }
             unset($emotion);
 
-            foreach ($subCategory['articles'] as &$article) {
-                unset($article['added'], $article['changed'], $article['mainDetail']['releaseDate']);
+            if (isset($subCategory['articles'])) {
+                foreach ($subCategory['articles'] as &$article) {
+                    unset($article['added'], $article['changed'], $article['mainDetail']['releaseDate']);
+                }
             }
         }
 
diff --git a/tests/Functional/Models/Category/PathByIdTest.php b/tests/Functional/Models/Category/PathByIdTest.php
index d197ebfa2e1..b736d915a98 100644
--- a/tests/Functional/Models/Category/PathByIdTest.php
+++ b/tests/Functional/Models/Category/PathByIdTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Models\Category;
@@ -121,7 +120,7 @@ public function testGetPathByIdWithDefaultParameters(int $categoryId, array $exp
     /**
      * @dataProvider simpleNameArrayProvider
      *
-     *                                      @param array<int, string> $expectedResult
+     * @param array<int, string> $expectedResult
      */
     public function testGetPathByIdWithDefaultNameParameter(int $categoryId, array $expectedResult): void
     {
@@ -132,7 +131,7 @@ public function testGetPathByIdWithDefaultNameParameter(int $categoryId, array $
     /**
      * @dataProvider simpleIdArrayProvider
      *
-     *                                    @param array<int, int> $expectedResult
+     * @param array<int, int> $expectedResult
      */
     public function testGetPathByIdWithIdParameter(int $categoryId, array $expectedResult): void
     {
@@ -143,7 +142,7 @@ public function testGetPathByIdWithIdParameter(int $categoryId, array $expectedR
     /**
      * @dataProvider multiArrayProvider
      *
-     *                                 @param array<int, array> $expectedResult
+     * @param array<int, array> $expectedResult
      */
     public function testGetPathByIdShouldReturnArray(int $categoryId, array $expectedResult): void
     {
diff --git a/tests/Functional/Models/Country/CountryTest.php b/tests/Functional/Models/Country/CountryTest.php
index ea76bab17b6..e4af694b5f6 100644
--- a/tests/Functional/Models/Country/CountryTest.php
+++ b/tests/Functional/Models/Country/CountryTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Models\Country;
diff --git a/tests/Functional/Models/Customer/CustomerTest.php b/tests/Functional/Models/Customer/CustomerTest.php
index d3227b18d13..7cfda3b4a84 100644
--- a/tests/Functional/Models/Customer/CustomerTest.php
+++ b/tests/Functional/Models/Customer/CustomerTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Models\Customer;
diff --git a/tests/Functional/Models/CustomerStream/CustomerStreamRepositoryTest.php b/tests/Functional/Models/CustomerStream/CustomerStreamRepositoryTest.php
index 5c390c10425..f550fa95334 100644
--- a/tests/Functional/Models/CustomerStream/CustomerStreamRepositoryTest.php
+++ b/tests/Functional/Models/CustomerStream/CustomerStreamRepositoryTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Models\CustomerStream;
@@ -101,6 +100,9 @@ public function testCountDoesNotIncrease(): void
         static::assertSame($customerCountBefore, $customerCountAfter);
     }
 
+    /**
+     * @return array{customer: 0, groupID: 1, email: 'someone@example.com', lastmailing: 0, lastread: 0, added: numeric-string, double_optin_confirmed: null}
+     */
     private static function getCampaignsEntryData(): array
     {
         return [
@@ -114,17 +116,23 @@ private static function getCampaignsEntryData(): array
         ];
     }
 
+    /**
+     * @return array{name: 'Teststream', static: false, description: 'Stream created for testing purposes', conditions: string, indexStream: true}
+     */
     private static function getCustomerStreamData(): array
     {
         return [
             'name' => 'Teststream',
             'static' => false,
             'description' => 'Stream created for testing purposes',
-            'conditions' => '{"Shopware\\Bundle\\CustomerSearchBundle\\Condition\\HasOrderCountCondition":{"minimumOrderCount":0}}',
+            'conditions' => '{"Shopware\\\\Bundle\\\\CustomerSearchBundle\\\\Condition\\\\HasOrderCountCondition":{"minimumOrderCount":0}}',
             'indexStream' => true,
         ];
     }
 
+    /**
+     * @return array{salutation: 'mr', firstname: 'Some', lastname: 'One', email: 'someone@example.com', password: 'loremIpsumDolorSitAmet'}
+     */
     private static function getCustomerData(): array
     {
         return [
diff --git a/tests/Functional/Models/Document/OrderTest.php b/tests/Functional/Models/Document/OrderTest.php
index abac3a9a8d5..f27c14c73d3 100644
--- a/tests/Functional/Models/Document/OrderTest.php
+++ b/tests/Functional/Models/Document/OrderTest.php
@@ -5,29 +5,29 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Models\Document;
 
 use Closure;
 use PHPUnit\Framework\TestCase;
+use Shopware\Tests\Functional\Helper\Utils;
 use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 use Shopware\Tests\Functional\Traits\FixtureBehaviour;
 use Shopware_Components_Document;
@@ -59,7 +59,7 @@ function (): array {
 
         static::assertIsArray($tax);
         static::assertArrayHasKey('20.00', $tax);
-        static::assertEquals(3.31, $tax['20.00']);
+        static::assertEqualsWithDelta(3.31, $tax['20.00'], Utils::FORMER_PHPUNIT_FLOAT_EPSILON);
     }
 
     public function testProportionalTaxCalculation(): void
diff --git a/tests/Functional/Models/Emotion/EmotionTest.php b/tests/Functional/Models/Emotion/EmotionTest.php
new file mode 100644
index 00000000000..814a83c5a81
--- /dev/null
+++ b/tests/Functional/Models/Emotion/EmotionTest.php
@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Models\Emotion;
+
+use Enlight_Components_Test_TestCase;
+use Shopware\Components\Model\ModelManager;
+use Shopware\Models\Emotion\Emotion;
+use Shopware\Models\Emotion\Repository;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
+
+class EmotionTest extends Enlight_Components_Test_TestCase
+{
+    use ContainerTrait;
+    use DatabaseTransactionBehaviour;
+
+    private ModelManager $entityManager;
+
+    private Repository $repository;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->entityManager = $this->getContainer()->get(ModelManager::class);
+        $this->repository = $this->entityManager->getRepository(Emotion::class);
+    }
+
+    public function testEmotionKeywordsMediumtextDatatype(): void
+    {
+        $emotion = $this->repository->find(9);
+        static::assertInstanceOf(Emotion::class, $emotion);
+
+        $keywords = require __DIR__ . '/../_assets/keywords.php';
+        static::assertIsString($keywords);
+        $emotion->setSeoKeywords($keywords);
+
+        $this->entityManager->persist($emotion);
+        $this->entityManager->flush($emotion);
+
+        static::assertSame($keywords, $emotion->getSeoKeywords());
+    }
+}
diff --git a/tests/Functional/Models/EsdTest.php b/tests/Functional/Models/EsdTest.php
index fde73edf0fb..26f99e5e91c 100644
--- a/tests/Functional/Models/EsdTest.php
+++ b/tests/Functional/Models/EsdTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Models;
diff --git a/tests/Functional/Models/Form/FormTest.php b/tests/Functional/Models/Form/FormTest.php
new file mode 100644
index 00000000000..ee999490219
--- /dev/null
+++ b/tests/Functional/Models/Form/FormTest.php
@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Models\Form;
+
+use Enlight_Components_Test_TestCase;
+use Shopware\Components\Model\ModelManager;
+use Shopware\Models\Form\Form;
+use Shopware\Models\Form\Repository;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
+
+class FormTest extends Enlight_Components_Test_TestCase
+{
+    use ContainerTrait;
+    use DatabaseTransactionBehaviour;
+
+    private ModelManager $entityManager;
+
+    private Repository $repository;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->entityManager = $this->getContainer()->get(ModelManager::class);
+        $this->repository = $this->entityManager->getRepository(Form::class);
+    }
+
+    public function testFormKeywordsMediumtextDatatype(): void
+    {
+        $form = $this->repository->find(5);
+        static::assertInstanceOf(Form::class, $form);
+
+        $keywords = require __DIR__ . '/../_assets/keywords.php';
+        static::assertIsString($keywords);
+        $form->setMetaKeywords($keywords);
+
+        $this->entityManager->persist($form);
+        $this->entityManager->flush($form);
+
+        static::assertSame($keywords, $form->getMetaKeywords());
+    }
+}
diff --git a/tests/Functional/Models/FormTest.php b/tests/Functional/Models/FormTest.php
index ed098954bf8..c95248311b5 100644
--- a/tests/Functional/Models/FormTest.php
+++ b/tests/Functional/Models/FormTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Models;
diff --git a/tests/Functional/Models/LazyLoadingTest.php b/tests/Functional/Models/LazyLoadingTest.php
index d0cbc73f7bd..bae8250b153 100644
--- a/tests/Functional/Models/LazyLoadingTest.php
+++ b/tests/Functional/Models/LazyLoadingTest.php
@@ -5,30 +5,29 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Models;
 
-use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 use PHPUnit\Framework\TestCase;
+use Shopware\Components\Model\ModelManager;
 use Shopware\Components\Random;
 use Shopware\Models\Article\Configurator\Template\Price as ConfiguratorPrice;
 use Shopware\Models\Article\Notification;
@@ -42,10 +41,7 @@
 
 class LazyLoadingTest extends TestCase
 {
-    /**
-     * @var EntityManager
-     */
-    private $em;
+    private ModelManager $em;
 
     public static function tearDownAfterClass(): void
     {
@@ -298,17 +294,19 @@ public function testArticleNotification(): void
         $conn = $this->em->getConnection();
 
         $orderNumber = $conn->fetchOne('SELECT ordernumber FROM s_articles_details');
+        static::assertIsString($orderNumber);
         $email = $conn->fetchOne('SELECT email FROM s_user');
+        static::assertIsString($email);
 
         $conn->insert('s_articles_notification', [
             'ordernumber' => $orderNumber,
             'mail' => $email,
         ]);
 
-        $id = $conn->lastInsertId();
+        $id = (int) $conn->lastInsertId();
 
         $notification = $this->em->getRepository(Notification::class)->find($id);
-        static::assertNotNull($notification);
+        static::assertInstanceOf(Notification::class, $notification);
         static::assertEquals($orderNumber, $notification->getArticleDetail()->getNumber());
         static::assertEquals($email, $notification->getCustomer()->getEmail());
 
@@ -338,10 +336,10 @@ public function testTemplatePrice(): void
         $conn->insert('s_article_configurator_template_prices', [
             'customer_group_key' => 'ek',
         ]);
-        $id = $conn->lastInsertId();
+        $id = (int) $conn->lastInsertId();
 
         $templatePrice = $this->em->getRepository(ConfiguratorPrice::class)->find($id);
-        static::assertNotNull($templatePrice);
+        static::assertInstanceOf(ConfiguratorPrice::class, $templatePrice);
         static::assertNotNull($templatePrice->getCustomerGroup());
         static::assertEquals('EK', $templatePrice->getCustomerGroup()->getKey());
 
@@ -356,10 +354,11 @@ public function testNewsletterAddress(): void
     {
         $conn = $this->em->getConnection();
         $email = $conn->fetchOne('SELECT email FROM s_user');
+        static::assertIsString($email);
         $conn->insert('s_campaigns_mailaddresses', [
             'email' => $email,
         ]);
-        $id = $conn->lastInsertId();
+        $id = (int) $conn->lastInsertId();
 
         $address = $this->em->getRepository(Address::class)->find($id);
         static::assertInstanceOf(Address::class, $address);
@@ -387,14 +386,15 @@ public function testArticleContainerType(): void
     {
         $conn = $this->em->getConnection();
         $orderNumber = $conn->fetchOne('SELECT ordernumber FROM s_articles_details ORDER by id');
+        static::assertIsString($orderNumber);
         $conn->insert('s_campaigns_articles', [
             'articleordernumber' => $orderNumber,
         ]);
 
-        $id = $conn->lastInsertId();
+        $id = (int) $conn->lastInsertId();
 
         $productContainerType = $this->em->getRepository(NewsletterProduct::class)->find($id);
-        static::assertNotNull($productContainerType);
+        static::assertInstanceOf(NewsletterProduct::class, $productContainerType);
         static::assertEquals($orderNumber, $productContainerType->getArticleDetail()->getNumber());
 
         $conn->delete('s_campaigns_articles', ['id' => $id]);
diff --git a/tests/Functional/Models/Mail/LogTest.php b/tests/Functional/Models/Mail/LogTest.php
index cc939859e04..e22f01401b2 100644
--- a/tests/Functional/Models/Mail/LogTest.php
+++ b/tests/Functional/Models/Mail/LogTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Models\Mail;
diff --git a/tests/Functional/Models/MailTest.php b/tests/Functional/Models/MailTest.php
index 0a1543467de..d3733b560a7 100644
--- a/tests/Functional/Models/MailTest.php
+++ b/tests/Functional/Models/MailTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Models;
diff --git a/tests/Functional/Models/Order/BillingTest.php b/tests/Functional/Models/Order/BillingTest.php
index fe078497845..b68dadb723a 100644
--- a/tests/Functional/Models/Order/BillingTest.php
+++ b/tests/Functional/Models/Order/BillingTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Models\Order;
diff --git a/tests/Functional/Models/Order/OrderDocumentDocumentTest.php b/tests/Functional/Models/Order/OrderDocumentDocumentTest.php
index e6503e40f92..a7b3befdb21 100644
--- a/tests/Functional/Models/Order/OrderDocumentDocumentTest.php
+++ b/tests/Functional/Models/Order/OrderDocumentDocumentTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Models\Order;
@@ -35,11 +34,13 @@
 use Shopware\Models\Order\Document\Document;
 use Shopware\Models\Shop\Shop;
 use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 use Shopware_Components_Document;
 
 class OrderDocumentDocumentTest extends Enlight_Components_Test_TestCase
 {
     use ContainerTrait;
+    use DatabaseTransactionBehaviour;
 
     private ModelManager $modelManager;
 
@@ -72,6 +73,7 @@ public function testDocumentForInactiveSubshop(): void
         // Flush changed shop to the database, needed for the Document code
         $this->modelManager->flush($shop);
 
+        $document = null;
         try {
             /*
              * Used to fail with the following error before allowing inactive subshops
diff --git a/tests/Functional/Models/Order/OrderTest.php b/tests/Functional/Models/Order/OrderTest.php
index a7f060c7eff..67c054a354b 100644
--- a/tests/Functional/Models/Order/OrderTest.php
+++ b/tests/Functional/Models/Order/OrderTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Models\Order;
diff --git a/tests/Functional/Models/Order/ShippingTest.php b/tests/Functional/Models/Order/ShippingTest.php
index fb184ba7b01..23f392e7d8a 100644
--- a/tests/Functional/Models/Order/ShippingTest.php
+++ b/tests/Functional/Models/Order/ShippingTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Models\Order;
diff --git a/tests/Functional/Models/Order/StatusTest.php b/tests/Functional/Models/Order/StatusTest.php
index 1bf306c0193..fee11877d02 100644
--- a/tests/Functional/Models/Order/StatusTest.php
+++ b/tests/Functional/Models/Order/StatusTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Models\Order;
diff --git a/tests/Functional/Models/Shop/ShopRepositoryTest.php b/tests/Functional/Models/Shop/ShopRepositoryTest.php
index d7dad507479..f1876bd1b2f 100644
--- a/tests/Functional/Models/Shop/ShopRepositoryTest.php
+++ b/tests/Functional/Models/Shop/ShopRepositoryTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Models\Shop;
@@ -103,22 +102,22 @@ public function testGetActiveByRequest(): void
         // Tests copied for SW-6768
         $this->callGetActiveShopByRequest($this->mainShop['base_path'] . '/en', 'testShop3');
 
-        //check virtual url with superfluous / like localhost/en/
+        // check virtual url with superfluous / like localhost/en/
         $this->callGetActiveShopByRequest($this->mainShop['base_path'] . '/en/', 'testShop3');
 
-        //check virtual url with direct controller call like localhost/en/blog
+        // check virtual url with direct controller call like localhost/en/blog
         $this->callGetActiveShopByRequest($this->mainShop['base_path'] . '/en/blog', 'testShop3');
 
-        //check base shop with direct controller call like localhost/en/blog
+        // check base shop with direct controller call like localhost/en/blog
         $this->callGetActiveShopByRequest($this->mainShop['base_path'] . '/blog', $this->mainShop['name']);
 
-        //check without virtual url but an url with the same beginning like localhost/entsorgung
+        // check without virtual url but an url with the same beginning like localhost/entsorgung
         $this->callGetActiveShopByRequest($this->mainShop['base_path'] . '/entsorgung', $this->mainShop['name']);
 
-        //check different virtual url with like localhost/ente
+        // check different virtual url with like localhost/ente
         $this->callGetActiveShopByRequest($this->mainShop['base_path'] . '/en/uk', 'testShop2');
 
-        //check without virtual url it has to choose the main shop instead of the language shop without the virtual url
+        // check without virtual url it has to choose the main shop instead of the language shop without the virtual url
         $this->callGetActiveShopByRequest($this->mainShop['base_path'], $this->mainShop['name']);
 
         // These are just some basic urls
@@ -186,6 +185,7 @@ public function getMultiShopLocationTestData(): array
 
     /**
      * @dataProvider getMultiShopLocationTestData
+     *
      * @ticket SW-4858
      */
     public function testMultiShopLocation(string $host, string $alias): void
diff --git a/tests/Functional/Models/Site/SiteTest.php b/tests/Functional/Models/Site/SiteTest.php
new file mode 100644
index 00000000000..56e1a432b4c
--- /dev/null
+++ b/tests/Functional/Models/Site/SiteTest.php
@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Models\Site;
+
+use Enlight_Components_Test_TestCase;
+use Shopware\Components\Model\ModelManager;
+use Shopware\Models\Site\Repository;
+use Shopware\Models\Site\Site;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
+
+class SiteTest extends Enlight_Components_Test_TestCase
+{
+    use ContainerTrait;
+    use DatabaseTransactionBehaviour;
+
+    private ModelManager $entityManager;
+
+    private Repository $repository;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->entityManager = $this->getContainer()->get(ModelManager::class);
+        $this->repository = $this->entityManager->getRepository(Site::class);
+    }
+
+    public function testSiteKeywordsMediumtextDatatype(): void
+    {
+        $site = $this->repository->find(3);
+        static::assertInstanceOf(Site::class, $site);
+
+        $keywords = require __DIR__ . '/../_assets/keywords.php';
+        static::assertIsString($keywords);
+        $site->setMetaKeywords($keywords);
+
+        $this->entityManager->persist($site);
+        $this->entityManager->flush($site);
+
+        static::assertSame($keywords, $site->getMetaKeywords());
+    }
+}
diff --git a/tests/Functional/Models/SnippetTest.php b/tests/Functional/Models/SnippetTest.php
index f4c12aa43a6..4fc1d614c11 100644
--- a/tests/Functional/Models/SnippetTest.php
+++ b/tests/Functional/Models/SnippetTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Models;
diff --git a/tests/Functional/Models/VoucherTest.php b/tests/Functional/Models/VoucherTest.php
index 70ec4bdd15b..04d354c4a14 100644
--- a/tests/Functional/Models/VoucherTest.php
+++ b/tests/Functional/Models/VoucherTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Models;
diff --git a/tests/Functional/Models/_assets/keywords.php b/tests/Functional/Models/_assets/keywords.php
new file mode 100644
index 00000000000..785e80728de
--- /dev/null
+++ b/tests/Functional/Models/_assets/keywords.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+return 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, At accusam aliquyam diam diam dolore dolores duo eirmod eos erat, et nonumy sed tempor et et invidunt justo labore Stet clita ea et gubergren, kasd magna no rebum. sanctus sea sed takimata ut vero voluptua. est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat. Consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, At accusam aliquyam diam diam dolore dolores duo eirmod eos erat, et nonumy sed tempor et et invidunt justo labore Stet clita ea et gubergren, kasd magna no rebum. sanctus sea sed takimata ut vero voluptua. est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat. Consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis au';
diff --git a/tests/Functional/Modules/Acl/RemoveAndCreateResourceTest.php b/tests/Functional/Modules/Acl/RemoveAndCreateResourceTest.php
index db043eeb68a..b2c990f6db6 100644
--- a/tests/Functional/Modules/Acl/RemoveAndCreateResourceTest.php
+++ b/tests/Functional/Modules/Acl/RemoveAndCreateResourceTest.php
@@ -1,36 +1,42 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+namespace Shopware\Tests\Functional\Modules\Acl;
+
+use Enlight_Components_Test_TestCase;
+use Shopware\Components\Model\ModelManager;
 use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
+use Shopware_Components_Acl;
 
 class RemoveAndCreateResourceTest extends Enlight_Components_Test_TestCase
 {
     use DatabaseTransactionBehaviour;
 
-    public function testRemoveAndCreateAresource()
+    public function testRemoveAndCreateResource(): void
     {
-        $em = Shopware()->Container()->get(\Shopware\Components\Model\ModelManager::class);
+        $em = Shopware()->Container()->get(ModelManager::class);
 
         $acl = new Shopware_Components_Acl($em);
 
diff --git a/tests/Functional/Modules/Articles/BasePriceCalculationTest.php b/tests/Functional/Modules/Articles/BasePriceCalculationTest.php
index c75b23e7947..bd04de3423b 100644
--- a/tests/Functional/Modules/Articles/BasePriceCalculationTest.php
+++ b/tests/Functional/Modules/Articles/BasePriceCalculationTest.php
@@ -5,28 +5,28 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Modules\Articles;
 
 use Enlight_Components_Test_Plugin_TestCase;
+use Shopware\Tests\Functional\Helper\Utils;
 
 /**
  * tests the base price calculation
@@ -35,8 +35,6 @@
  */
 class BasePriceCalculationTest extends Enlight_Components_Test_Plugin_TestCase
 {
-    private const FORMER_PHPUNIT_FLOAT_EPSILON = 0.0000000001;
-
     /**
      * Set up test case, fix demo data where needed
      */
@@ -91,7 +89,7 @@ public function testCalculateReferencePrice(): void
                 $data['purchaseUnit'],
                 $data['referenceUnit']
             );
-            static::assertEqualsWithDelta($expectedData[$key], $referencePrice, self::FORMER_PHPUNIT_FLOAT_EPSILON);
+            static::assertEqualsWithDelta($expectedData[$key], $referencePrice, Utils::FORMER_PHPUNIT_FLOAT_EPSILON);
         }
     }
 
diff --git a/tests/Functional/Modules/Articles/CompareTest.php b/tests/Functional/Modules/Articles/CompareTest.php
index 7ee62f37313..3d8defc3073 100644
--- a/tests/Functional/Modules/Articles/CompareTest.php
+++ b/tests/Functional/Modules/Articles/CompareTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Modules\Articles;
@@ -63,9 +62,9 @@ public function Module(): sArticles
 
     public function testDeleteComparison(): void
     {
-        $article = $this->getTestProductId();
-        static::assertTrue($this->Module()->sAddComparison($article));
-        $this->Module()->sDeleteComparison($article);
+        $productId = $this->getTestProductId();
+        static::assertTrue($this->Module()->sAddComparison($productId));
+        $this->Module()->sDeleteComparison($productId);
         static::assertEmpty($this->Module()->sGetComparisons());
     }
 
@@ -85,6 +84,14 @@ public function testAddComparison(): void
         static::assertNotEmpty($this->Module()->sGetComparisons());
     }
 
+    public function testAddComparisonSameProductTwice(): void
+    {
+        $productId = $this->getTestProductId();
+        static::assertTrue($this->Module()->sAddComparison($productId));
+        static::assertTrue($this->Module()->sAddComparison($productId));
+        static::assertCount(1, $this->Module()->sGetComparisons());
+    }
+
     public function testGetComparisons(): void
     {
         static::assertTrue($this->Module()->sAddComparison($this->getTestProductId()));
diff --git a/tests/Functional/Modules/Articles/SeoCategoryTest.php b/tests/Functional/Modules/Articles/SeoCategoryTest.php
index 4ccd38f43c4..e716940fdf6 100644
--- a/tests/Functional/Modules/Articles/SeoCategoryTest.php
+++ b/tests/Functional/Modules/Articles/SeoCategoryTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Modules\Articles;
diff --git a/tests/Functional/Modules/Articles/fixtures/category_filters.php b/tests/Functional/Modules/Articles/fixtures/category_filters.php
index 587a98ae5ca..d68152f3c53 100644
--- a/tests/Functional/Modules/Articles/fixtures/category_filters.php
+++ b/tests/Functional/Modules/Articles/fixtures/category_filters.php
@@ -1,28 +1,26 @@
 <?php
 
 declare(strict_types=1);
-
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 return [
diff --git a/tests/Functional/Modules/Articles/sGetArticleByIdTest.php b/tests/Functional/Modules/Articles/sGetArticleByIdTest.php
index 131334bb992..32ed2fc24a7 100644
--- a/tests/Functional/Modules/Articles/sGetArticleByIdTest.php
+++ b/tests/Functional/Modules/Articles/sGetArticleByIdTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Modules\Articles;
@@ -3542,9 +3541,9 @@ private function assertArticleData(array $expected, array $data): void
             }
 
             static::assertEquals(
-                $expected[$property],
+                $expected[$property] ?? null,
                 $data[$property],
-                sprintf('Property %s dont match for article : %s - %s', $property, $expected['ordernumber'], $expected['articleName'])
+                \sprintf('Property %s dont match for article : %s - %s', $property, $expected['ordernumber'], $expected['articleName'])
             );
         }
     }
@@ -3554,7 +3553,7 @@ private function assertLinks(array $expected, array $data): void
         static::assertCount(
             \count($expected['sLinks']),
             $data['sLinks'],
-            sprintf("Link count doesn't match for article : %s - %s", $expected['ordernumber'], $expected['articleName'])
+            \sprintf("Link count doesn't match for article : %s - %s", $expected['ordernumber'], $expected['articleName'])
         );
     }
 
@@ -3580,7 +3579,7 @@ private function assertRelated(array $expected, array $data): void
                 static::assertEquals(
                     $expectedArticle[$property],
                     $gotArticle[$property],
-                    sprintf("sRelatedArticles property %s doesn't match for article %s - %s", $property, $expected['ordernumber'], $expected['articleName'])
+                    \sprintf("sRelatedArticles property %s doesn't match for article %s - %s", $property, $expected['ordernumber'], $expected['articleName'])
                 );
             }
         }
diff --git a/tests/Functional/Modules/Articles/sGetArticlesByCategoryTest.php b/tests/Functional/Modules/Articles/sGetArticlesByCategoryTest.php
index 41b2f0fb866..6efcda639d7 100644
--- a/tests/Functional/Modules/Articles/sGetArticlesByCategoryTest.php
+++ b/tests/Functional/Modules/Articles/sGetArticlesByCategoryTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Modules\Articles;
diff --git a/tests/Functional/Modules/Category/sGetCategoriesTest.php b/tests/Functional/Modules/Category/sGetCategoriesTest.php
index e895b54a58a..c7f26e73d1b 100644
--- a/tests/Functional/Modules/Category/sGetCategoriesTest.php
+++ b/tests/Functional/Modules/Category/sGetCategoriesTest.php
@@ -1,38 +1,41 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Modules\Category;
 
+use Doctrine\DBAL\Connection;
 use Enlight_Components_Test_TestCase;
 use sCategories;
 use Shopware\Bundle\MediaBundle\MediaServiceInterface;
 use Shopware\Tests\Functional\Bundle\StoreFrontBundle\Helper;
 use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 
 class sGetCategoriesTest extends Enlight_Components_Test_TestCase
 {
     use ContainerTrait;
+    use DatabaseTransactionBehaviour;
 
     /**
      * @var Helper
@@ -47,8 +50,9 @@ class sGetCategoriesTest extends Enlight_Components_Test_TestCase
     protected function setUp(): void
     {
         $this->helper = new Helper($this->getContainer());
+        $connection = $this->getContainer()->get(Connection::class);
 
-        Shopware()->Db()->query(
+        $connection->executeQuery(
             "DELETE FROM s_categories WHERE description LIKE 'Foo%' AND parent = 3"
         );
 
@@ -59,12 +63,6 @@ protected function setUp(): void
         parent::setUp();
     }
 
-    protected function tearDown(): void
-    {
-        $this->helper->cleanUp();
-        parent::tearDown();
-    }
-
     public function testWithMainId()
     {
         $first1 = $this->helper->createCategory(['name' => 'first1', 'parent' => 3]);
diff --git a/tests/Functional/Plugins/Core/HttpCache/BootstrapTest.php b/tests/Functional/Plugins/Core/HttpCache/BootstrapTest.php
index cbb24e5cf94..a77caba3be7 100644
--- a/tests/Functional/Plugins/Core/HttpCache/BootstrapTest.php
+++ b/tests/Functional/Plugins/Core/HttpCache/BootstrapTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Plugins\Core\HttpCache;
@@ -60,14 +60,14 @@ class BootstrapTest extends Enlight_Components_Test_Controller_TestCase
 
     public function setUp(): void
     {
-        Shopware()->Container()->reset(\Shopware\Bundle\PluginInstallerBundle\Service\InstallerService::class);
+        Shopware()->Container()->reset(InstallerService::class);
         Shopware()->Container()->reset('shopware_plugininstaller.plugin_manager');
         Shopware()->Container()->reset(LegacyPluginInstaller::class);
         Shopware()->Container()->reset('shopware_plugininstaller.legacy_plugin_installer');
 
-        $this->connection = Shopware()->Container()->get(\Doctrine\DBAL\Connection::class);
-        $this->pluginManager = Shopware()->Container()->get(\Shopware\Bundle\PluginInstallerBundle\Service\InstallerService::class);
-        $this->cacheManager = Shopware()->Container()->get(\Shopware\Components\CacheManager::class);
+        $this->connection = Shopware()->Container()->get(Connection::class);
+        $this->pluginManager = Shopware()->Container()->get(InstallerService::class);
+        $this->cacheManager = Shopware()->Container()->get(CacheManager::class);
 
         $plugin = $this->pluginManager->getPluginByName('HttpCache');
 
diff --git a/tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php b/tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php
index d598601f6d1..f8d63382bfb 100644
--- a/tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php
+++ b/tests/Functional/Plugins/Core/HttpCache/DynamicCacheTimeServiceTest.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Plugins\Core\HttpCache;
@@ -34,23 +35,25 @@
 use Shopware\Bundle\PluginInstallerBundle\Service\LegacyPluginInstaller;
 use Shopware\Components\HttpCache\CacheTimeServiceInterface;
 use Shopware\Components\HttpCache\DynamicCacheTimeService;
-use Shopware\Models\Article\Article;
+use Shopware\Components\Model\ModelManager;
+use Shopware\Models\Article\Article as Product;
+use Shopware\Models\Article\Detail;
 use Shopware\Models\Blog\Blog;
 use Shopware\Models\Category\Category;
 use Shopware\Models\Emotion\Emotion;
-use Shopware\Models\Plugin\Plugin;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 
 class DynamicCacheTimeServiceTest extends TestCase
 {
-    /**
-     * @var CacheTimeServiceInterface
-     */
-    private $cacheTimeService;
+    use ContainerTrait;
+    use DatabaseTransactionBehaviour;
 
-    /**
-     * @var int
-     */
-    private $defaultTime;
+    private CacheTimeServiceInterface $cacheTimeService;
+
+    private int $defaultTime;
+
+    private ModelManager $modelManager;
 
     /**
      * {@inheritdoc}
@@ -64,7 +67,6 @@ public static function setUpBeforeClass(): void
 
         $pluginManager = Shopware()->Container()->get(InstallerService::class);
 
-        /** @var Plugin $plugin */
         $plugin = $pluginManager->getPluginByName('HttpCache');
 
         $pluginManager->installPlugin($plugin);
@@ -85,23 +87,23 @@ public static function tearDownAfterClass(): void
      */
     public function setUp(): void
     {
-        $this->cacheTimeService = Shopware()->Container()->get(CacheTimeServiceInterface::class);
-
+        $this->cacheTimeService = $this->getContainer()->get(CacheTimeServiceInterface::class);
         $this->defaultTime = 3600;
+        $this->modelManager = $this->getContainer()->get(ModelManager::class);
 
         Shopware()->Models()->clear();
     }
 
-    public function testServiceIsAvailable()
+    public function testServiceIsAvailable(): void
     {
         static::assertInstanceOf(DynamicCacheTimeService::class, $this->cacheTimeService);
     }
 
-    public function testProductDetailTimeCalculation()
+    public function testProductDetailTimeCalculation(): void
     {
         $product = $this->createTestProduct();
         $request = $this->getProductRequest($product);
-        Shopware()->Container()->get('front')->setRequest($request);
+        $this->getContainer()->get('front')->setRequest($request);
 
         /**
          * The release date of products only contains information about the day, not minutes or seconds,
@@ -111,14 +113,14 @@ public function testProductDetailTimeCalculation()
         $productCacheTime = $this->cacheTimeService->getCacheTime($request);
         static::assertLessThanOrEqual($this->defaultTime, $productCacheTime);
 
-        Shopware()->Models()->remove($product);
+        $this->modelManager->remove($product);
     }
 
-    public function testCategoryTimeCalculation()
+    public function testCategoryTimeCalculation(): void
     {
         $category = $this->createTestCategory();
-        $request = $this->getcategoryRequest($category);
-        Shopware()->Container()->get('front')->setRequest($request);
+        $request = $this->getCategoryRequest($category);
+        $this->getContainer()->get('front')->setRequest($request);
 
         /*
          * Test if the five minute time difference is correctly recognised by the CacheTimeService.
@@ -129,14 +131,14 @@ public function testCategoryTimeCalculation()
         $emotionCacheTime = $this->cacheTimeService->getCacheTime($request);
         static::assertLessThan(5, abs(300 - $emotionCacheTime));
 
-        Shopware()->Models()->remove($category);
+        $this->modelManager->remove($category);
     }
 
-    public function testBlogTimeCalculation()
+    public function testBlogTimeCalculation(): void
     {
         $blog = $this->createTestBlog();
         $request = $this->getBlogRequest($blog);
-        Shopware()->Container()->get('front')->setRequest($request);
+        $this->getContainer()->get('front')->setRequest($request);
 
         /*
          * Test if the five minute time difference is correctly recognised by the CacheTimeService.
@@ -147,14 +149,14 @@ public function testBlogTimeCalculation()
         $blogCacheTime = $this->cacheTimeService->getCacheTime($request);
         static::assertLessThan(5, abs(300 - $blogCacheTime));
 
-        Shopware()->Models()->remove($blog);
+        $this->modelManager->remove($blog);
     }
 
-    public function testBlogListingTimeCalculation()
+    public function testBlogListingTimeCalculation(): void
     {
         $blog = $this->createTestBlogWithCategory();
         $request = $this->getBlogListingRequest($blog);
-        Shopware()->Container()->get('front')->setRequest($request);
+        $this->getContainer()->get('front')->setRequest($request);
 
         /*
          * Test if the five minute time difference is correctly recognised by the CacheTimeService.
@@ -165,52 +167,43 @@ public function testBlogListingTimeCalculation()
         $blogCacheTime = $this->cacheTimeService->getCacheTime($request);
         static::assertLessThan(5, abs(300 - $blogCacheTime));
 
-        Shopware()->Models()->remove($blog);
+        $this->modelManager->remove($blog);
     }
 
-    /**
-     * @return Enlight_Controller_Request_RequestTestCase
-     */
-    private function getBlogListingRequest(Blog $blog)
+    private function getBlogListingRequest(Blog $blog): Enlight_Controller_Request_RequestTestCase
     {
         $request = new Enlight_Controller_Request_RequestTestCase();
         $request->setParams([
             'module' => 'frontend',
             'controller' => 'blog',
             'action' => 'index',
-            'sCategory' => sprintf('%d', $blog->getCategoryId()),
+            'sCategory' => \sprintf('%d', $blog->getCategoryId()),
         ]);
 
         return $request;
     }
 
-    /**
-     * @return Enlight_Controller_Request_RequestTestCase
-     */
-    private function getBlogRequest(Blog $blog)
+    private function getBlogRequest(Blog $blog): Enlight_Controller_Request_RequestTestCase
     {
         $request = new Enlight_Controller_Request_RequestTestCase();
         $request->setParams([
             'module' => 'frontend',
             'controller' => 'blog',
             'action' => 'detail',
-            'blogArticle' => sprintf('%d', $blog->getId()),
+            'blogArticle' => \sprintf('%d', $blog->getId()),
         ]);
 
         return $request;
     }
 
-    /**
-     * @return Blog|null
-     */
-    private function createTestBlog()
+    private function createTestBlog(): Blog
     {
         try {
             $blog = new Blog();
             $blog->fromArray($this->getBlogTestData());
 
-            Shopware()->Models()->persist($blog);
-            Shopware()->Models()->flush();
+            $this->modelManager->persist($blog);
+            $this->modelManager->flush();
 
             return $blog;
         } catch (Exception $e) {
@@ -218,10 +211,7 @@ private function createTestBlog()
         }
     }
 
-    /**
-     * @return Blog|null
-     */
-    private function createTestBlogWithCategory()
+    private function createTestBlogWithCategory(): Blog
     {
         try {
             $blog = $this->createTestBlog();
@@ -229,8 +219,8 @@ private function createTestBlogWithCategory()
 
             $blog->setCategoryId($blogCategory->getId());
 
-            Shopware()->Models()->persist($blog);
-            Shopware()->Models()->flush();
+            $this->modelManager->persist($blog);
+            $this->modelManager->flush();
 
             return $blog;
         } catch (Exception $e) {
@@ -238,33 +228,27 @@ private function createTestBlogWithCategory()
         }
     }
 
-    /**
-     * @return Enlight_Controller_Request_RequestTestCase
-     */
-    private function getcategoryRequest(Category $category)
+    private function getCategoryRequest(Category $category): Enlight_Controller_Request_RequestTestCase
     {
         $request = new Enlight_Controller_Request_RequestTestCase();
         $request->setParams([
             'module' => 'frontend',
             'controller' => 'listing',
             'action' => 'index',
-            'sCategory' => sprintf('%d', $category->getId()),
+            'sCategory' => \sprintf('%d', $category->getId()),
         ]);
 
         return $request;
     }
 
-    /**
-     * @return Emotion|null
-     */
-    private function createTestEmotion()
+    private function createTestEmotion(): Emotion
     {
         try {
             $emotion = new Emotion();
             $emotion->fromArray($this->getEmotionTestData());
 
-            Shopware()->Models()->persist($emotion);
-            Shopware()->Models()->flush();
+            $this->modelManager->persist($emotion);
+            $this->modelManager->flush();
 
             return $emotion;
         } catch (Exception $e) {
@@ -272,16 +256,13 @@ private function createTestEmotion()
         }
     }
 
-    /**
-     * @return Category|null
-     */
-    private function createTestCategory()
+    private function createTestCategory(): Category
     {
         try {
             $category = new Category();
-            $category->setActive(1);
+            $category->setActive(true);
             $category->setName('MyTestCategory');
-            $category->setParent(Shopware()->Models()->getRepository(Category::class)->find(1));
+            $category->setParent($this->modelManager->getRepository(Category::class)->find(1));
 
             $emotion = $this->createTestEmotion();
 
@@ -293,8 +274,8 @@ private function createTestCategory()
                 new ArrayCollection([$emotion])
             );
 
-            Shopware()->Models()->persist($category);
-            Shopware()->Models()->flush();
+            $this->modelManager->persist($category);
+            $this->modelManager->flush();
 
             return $category;
         } catch (Exception $e) {
@@ -302,30 +283,25 @@ private function createTestCategory()
         }
     }
 
-    /**
-     * @return Enlight_Controller_Request_RequestTestCase
-     */
-    private function getProductRequest(Article $product)
+    private function getProductRequest(Product $product): Enlight_Controller_Request_RequestTestCase
     {
+        static::assertInstanceOf(Detail::class, $product->getMainDetail());
         $request = new Enlight_Controller_Request_RequestTestCase();
         $request->setParams([
             'module' => 'frontend',
             'controller' => 'detail',
             'action' => 'index',
-            'sArticle' => sprintf('%d', $product->getId()),
+            'sArticle' => \sprintf('%d', $product->getId()),
             'number' => $product->getMainDetail()->getNumber(),
         ]);
 
         return $request;
     }
 
-    /**
-     * @return Article|null
-     */
-    private function createTestProduct()
+    private function createTestProduct(): Product
     {
         try {
-            $product = new Article();
+            $product = new Product();
 
             $product->fromArray($this->getProductTestData());
             /*
@@ -333,12 +309,13 @@ private function createTestProduct()
              * so the timestamp "five minutes from now" will evaluate to the previous midnight.
              * Therefore we need to add another day, so it'll evaluate to the next midnight.
              */
+            static::assertInstanceOf(Detail::class, $product->getMainDetail());
             $product->getMainDetail()->setReleaseDate((new DateTime())->add(
                 new DateInterval('P1D')
             ));
 
-            Shopware()->Models()->persist($product);
-            Shopware()->Models()->flush();
+            $this->modelManager->persist($product);
+            $this->modelManager->flush();
 
             return $product;
         } catch (Exception $e) {
@@ -347,18 +324,18 @@ private function createTestProduct()
     }
 
     /**
-     * @return array
+     * @return array<string, mixed>
      */
-    private function getProductTestData()
+    private function getProductTestData(): array
     {
         return [
-            'name' => 'Testarticle',
-            'description' => 'testdescription',
+            'name' => 'Test product',
+            'description' => 'test description',
             'descriptionLong' => 'Test descriptionLong',
             'active' => true,
             'pseudoSales' => 999,
             'highlight' => true,
-            'keywords' => 'test, testarticle',
+            'keywords' => 'test, testproduct',
             'taxId' => 1,
             'mainDetail' => [
                 'active' => 1,
@@ -369,9 +346,9 @@ private function getProductTestData()
     }
 
     /**
-     * @return array
+     * @return array<string, mixed>
      */
-    private function getEmotionTestData()
+    private function getEmotionTestData(): array
     {
         return [
             'active' => 1,
@@ -392,9 +369,9 @@ private function getEmotionTestData()
     }
 
     /**
-     * @return array
+     * @return array<string, mixed>
      */
-    private function getBlogTestData()
+    private function getBlogTestData(): array
     {
         return [
             'title' => 'MyTestBlog',
@@ -406,10 +383,7 @@ private function getBlogTestData()
         ];
     }
 
-    /**
-     * @return DateTime
-     */
-    private function getTimestampFiveMinutesFromNow()
+    private function getTimestampFiveMinutesFromNow(): DateTime
     {
         return (new DateTime())->add(new DateInterval('PT5M'));
     }
diff --git a/tests/Functional/Plugins/Core/MarketingAggregate/AbstractMarketing.php b/tests/Functional/Plugins/Core/MarketingAggregate/AbstractMarketing.php
index f111c65ffe9..70b520f97a0 100644
--- a/tests/Functional/Plugins/Core/MarketingAggregate/AbstractMarketing.php
+++ b/tests/Functional/Plugins/Core/MarketingAggregate/AbstractMarketing.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Plugins\Core\MarketingAggregate;
@@ -115,7 +115,7 @@ protected function saveConfig($name, $value)
 
         $shop = $shopRepository->find($shopRepository->getActiveDefault()->getId());
 
-        if (strpos($name, ':') !== false) {
+        if (str_contains($name, ':')) {
             list($formName, $name) = explode(':', $name, 2);
         }
 
@@ -125,7 +125,7 @@ protected function saveConfig($name, $value)
             $findBy['form'] = $form;
         }
 
-        /** @var \Shopware\Models\Config\Element $element */
+        /** @var Element $element */
         $element = $elementRepository->findOneBy($findBy);
 
         $defaultValue = $element->getValue();
diff --git a/tests/Functional/Plugins/Core/MarketingAggregate/Components/AlsoBoughtTest.php b/tests/Functional/Plugins/Core/MarketingAggregate/Components/AlsoBoughtTest.php
index 50dae14fe3f..9e7abda5fcf 100644
--- a/tests/Functional/Plugins/Core/MarketingAggregate/Components/AlsoBoughtTest.php
+++ b/tests/Functional/Plugins/Core/MarketingAggregate/Components/AlsoBoughtTest.php
@@ -1,44 +1,48 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Plugins\Core\MarketingAggregate\Components;
 
+use Doctrine\DBAL\Connection;
 use Shopware\Tests\Functional\Plugins\Core\MarketingAggregate\AbstractMarketing;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
 use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 
 class AlsoBoughtTest extends AbstractMarketing
 {
     use DatabaseTransactionBehaviour;
+    use ContainerTrait;
 
     public function setUp(): void
     {
         parent::setUp();
+        $connection = $this->getContainer()->get(Connection::class);
 
-        $this->Db()->query('DELETE FROM s_articles_also_bought_ro ');
-        $this->Db()->query('DELETE FROM s_order_details');
+        $connection->executeQuery('DELETE FROM s_articles_also_bought_ro ');
+        $connection->executeQuery('DELETE FROM s_order_details');
 
-        $this->Db()->query("
+        $connection->executeQuery("
             INSERT INTO `s_order_details` (`id`, `orderID`, `ordernumber`, `articleID`, `articleordernumber`, `price`, `quantity`, `name`, `status`, `shipped`, `shippedgroup`, `releasedate`, `modus`, `esdarticle`, `taxID`, `tax_rate`, `config`) VALUES
             (178, 52, '0', 227, 'SW10002841', 35.99, 31, 'Aufschlag bei Zahlungsarten', 0, 0, 0, NULL, 0, 0, 1, 19, ''),
             (179, 52, '0', 145, 'SW10145', 17.99, 1, 'Mütze Vintage Driver', 0, 0, 0, NULL, 0, 0, 1, 19, ''),
diff --git a/tests/Functional/Plugins/Core/MarketingAggregate/Components/SimilarShownTest.php b/tests/Functional/Plugins/Core/MarketingAggregate/Components/SimilarShownTest.php
index 273baa61cf2..7ab4049cde9 100644
--- a/tests/Functional/Plugins/Core/MarketingAggregate/Components/SimilarShownTest.php
+++ b/tests/Functional/Plugins/Core/MarketingAggregate/Components/SimilarShownTest.php
@@ -1,41 +1,43 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Plugins\Core\MarketingAggregate\Components;
 
 use Enlight_Event_EventArgs;
 use Shopware\Tests\Functional\Plugins\Core\MarketingAggregate\AbstractMarketing;
+use Symfony\Component\HttpFoundation\Response;
 
 class SimilarShownTest extends AbstractMarketing
 {
-    public function testResetSimilarShown()
+    public function testResetSimilarShown(): void
     {
         $this->SimilarShown()->resetSimilarShown();
         static::assertCount(0, $this->getAllSimilarShown());
     }
 
-    public function testInitSimilarShown()
+    public function testInitSimilarShown(): void
     {
         $this->insertDemoData();
 
@@ -46,7 +48,7 @@ public function testInitSimilarShown()
         static::assertCount(144, $data);
     }
 
-    public function testUpdateElapsedSimilarShownArticles()
+    public function testUpdateElapsedSimilarShownArticles(): void
     {
         $this->insertDemoData();
 
@@ -68,7 +70,7 @@ public function testUpdateElapsedSimilarShownArticles()
         );
     }
 
-    public function testRefreshSimilarShown()
+    public function testRefreshSimilarShown(): void
     {
         $this->insertDemoData();
         $this->SimilarShown()->initSimilarShown();
@@ -76,20 +78,20 @@ public function testRefreshSimilarShown()
         $similarShown = $this->getAllSimilarShown();
 
         foreach ($similarShown as $combination) {
-            $this->SimilarShown()->refreshSimilarShown($combination['article_id'], $combination['related_article_id']);
+            $this->SimilarShown()->refreshSimilarShown((int) $combination['article_id'], (int) $combination['related_article_id']);
             $updated = $this->getAllSimilarShown(
                 ' WHERE article_id = ' . $combination['article_id'] .
                 ' AND related_article_id = ' . $combination['related_article_id']
             );
             $updated = $updated[0];
-            static::assertEquals($combination['viewed'] + 1, $updated['viewed']);
+            static::assertSame((int) $combination['viewed'] + 1, (int) $updated['viewed']);
         }
     }
 
     /**
      * @group skipElasticSearch
      */
-    public function testSimilarShownLiveRefresh()
+    public function testSimilarShownLiveRefresh(): void
     {
         $this->insertDemoData();
         $this->SimilarShown()->initSimilarShown();
@@ -98,7 +100,7 @@ public function testSimilarShownLiveRefresh()
         $this->saveConfig('similarRefreshStrategy', 3);
         Shopware()->Container()->get('cache')->clean();
 
-        $this->setSimilarShownInvalid('2010-01-01', 'LIMIT 20');
+        $this->setSimilarShownInvalid(' LIMIT 20');
 
         Shopware()->Events()->notify('Shopware_Plugins_LastArticles_ResetLastArticles', []);
 
@@ -107,7 +109,7 @@ public function testSimilarShownLiveRefresh()
         static::assertCount($countBefore - 20, $articles);
     }
 
-    public function testSimilarCronJobRefresh()
+    public function testSimilarCronJobRefresh(): void
     {
         $this->insertDemoData();
         $this->SimilarShown()->initSimilarShown();
@@ -118,7 +120,7 @@ public function testSimilarCronJobRefresh()
         $this->setSimilarShownInvalid();
 
         $result = $this->dispatch('/sommerwelten/accessoires/170/sonnenbrille-red');
-        static::assertEquals(200, $result->getHttpResponseCode());
+        static::assertSame(Response::HTTP_OK, $result->getHttpResponseCode());
 
         $articles = $this->getAllSimilarShown(" WHERE init_date > '2010-01-01' ");
         static::assertCount(0, $articles);
@@ -126,7 +128,7 @@ public function testSimilarCronJobRefresh()
         $cron = $this->Db()->fetchRow("SELECT * FROM s_crontab WHERE action = 'RefreshSimilarShown'");
         static::assertNotEmpty($cron);
 
-        //the cron plugin isn't installed, so we can't use a dispatch on /backend/cron
+        // the cron plugin isn't installed, so we can't use a dispatch on /backend/cron
         $this->Plugin()->refreshSimilarShown(new Enlight_Event_EventArgs(['subject' => $this]));
 
         $articles = $this->getAllSimilarShown(" WHERE init_date > '2010-01-01' ");
@@ -136,7 +138,10 @@ public function testSimilarCronJobRefresh()
         );
     }
 
-    protected function getDemoData()
+    /**
+     * @return list<array{articleID: string, sessionID: string, time: string, userID: string, shopID: string}>
+     */
+    private function getDemoData(): array
     {
         return require __DIR__ . '/fixtures/similarShown.php';
     }
@@ -144,7 +149,7 @@ protected function getDemoData()
     /**
      * The demo data contains 144 combinations of the similar shown articles for three users.
      */
-    protected function insertDemoData()
+    private function insertDemoData(): void
     {
         $this->Db()->query('DELETE FROM s_emarketing_lastarticles');
         $statement = $this->Db()->prepare(
@@ -156,20 +161,18 @@ protected function insertDemoData()
         }
     }
 
-    protected function getAllSimilarShown($condition = '')
+    /**
+     * @return array<array<string, string>>
+     */
+    private function getAllSimilarShown(string $condition = ''): array
     {
         return $this->Db()->fetchAll('SELECT * FROM s_articles_similar_shown_ro ' . $condition);
     }
 
-    protected function resetSimilarShown($condition = '')
-    {
-        $this->Db()->query('DELETE FROM s_articles_similar_shown_ro ' . $condition);
-    }
-
-    protected function setSimilarShownInvalid($date = '2010-01-01', $condition = '')
+    private function setSimilarShownInvalid(string $condition = ''): void
     {
         $this->Db()->query(' UPDATE s_articles_similar_shown_ro SET init_date = :date ' . $condition, [
-            'date' => $date,
+            'date' => '2010-01-01',
         ]);
     }
 }
diff --git a/tests/Functional/Plugins/Core/MarketingAggregate/Components/TopSellerTest.php b/tests/Functional/Plugins/Core/MarketingAggregate/Components/TopSellerTest.php
index 827ec279e6f..c734737f6e8 100644
--- a/tests/Functional/Plugins/Core/MarketingAggregate/Components/TopSellerTest.php
+++ b/tests/Functional/Plugins/Core/MarketingAggregate/Components/TopSellerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Plugins\Core\MarketingAggregate\Components;
@@ -48,27 +48,27 @@ public function testInitTopSeller()
 
     public function testUpdateElapsedTopSeller()
     {
-        //init top seller to be sure that all articles has a row
+        // init top seller to be sure that all articles has a row
         $this->resetTopSeller();
         $this->TopSeller()->initTopSeller();
 
         $this->Db()->query("UPDATE s_articles_top_seller_ro SET last_cleared = '2010-01-01'");
 
-        //check if the update script was successfully
+        // check if the update script was successfully
         $topSeller = $this->getAllTopSeller(" WHERE last_cleared > '2010-01-01' ");
         static::assertCount(0, $topSeller);
 
-        //update only 50 top seller articles to test the limit function
+        // update only 50 top seller articles to test the limit function
         $this->TopSeller()->updateElapsedTopSeller(50);
 
-        //check if only 50 top seller was updated.
+        // check if only 50 top seller was updated.
         $topSeller = $this->getAllTopSeller(" WHERE last_cleared > '2010-01-01' ");
         static::assertCount(
             50,
             $topSeller
         );
 
-        //now we can update the all other top seller data
+        // now we can update the all other top seller data
         $this->TopSeller()->updateElapsedTopSeller();
         static::assertCount(
             \count($this->getAllTopSeller()),
@@ -149,7 +149,7 @@ public function testTopSellerCronJobRefresh()
         $cron = $this->Db()->fetchRow("SELECT * FROM s_crontab WHERE action = 'RefreshTopSeller'");
         static::assertNotEmpty($cron);
 
-        //the cron plugin isn't installed, so we can't use a dispatch on /backend/cron
+        // the cron plugin isn't installed, so we can't use a dispatch on /backend/cron
         $this->Plugin()->refreshTopSeller();
 
         $topSeller = $this->getAllTopSeller(" WHERE last_cleared > '2010-01-01' ");
@@ -175,7 +175,7 @@ public function testTopSellerManualRefresh()
         $topSeller = $this->getAllTopSeller(" WHERE last_cleared > '2010-01-01' ");
         static::assertCount(0, $topSeller);
 
-        //the cron plugin isn't installed, so we can't use a dispatch on /backend/cron
+        // the cron plugin isn't installed, so we can't use a dispatch on /backend/cron
         $this->Plugin()->refreshTopSeller();
 
         $topSeller = $this->getAllTopSeller(" WHERE last_cleared > '2010-01-01' ");
diff --git a/tests/Functional/Plugins/Core/MarketingAggregate/Components/fixtures/similarShown.php b/tests/Functional/Plugins/Core/MarketingAggregate/Components/fixtures/similarShown.php
index a15448e7837..2c7857cd6bd 100644
--- a/tests/Functional/Plugins/Core/MarketingAggregate/Components/fixtures/similarShown.php
+++ b/tests/Functional/Plugins/Core/MarketingAggregate/Components/fixtures/similarShown.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 return [
diff --git a/tests/Functional/Plugins/Core/MarketingAggregate/Modules/ArticleTest.php b/tests/Functional/Plugins/Core/MarketingAggregate/Modules/ArticleTest.php
index abc1feb1338..2f0f94e02b0 100644
--- a/tests/Functional/Plugins/Core/MarketingAggregate/Modules/ArticleTest.php
+++ b/tests/Functional/Plugins/Core/MarketingAggregate/Modules/ArticleTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Plugins\Core\MarketingAggregate\Modules;
@@ -62,8 +62,8 @@ public function testTopSellerSelection(): void
 
         $topSeller = array_values($topSeller);
 
-        //the article "2" pseudo sales are set to 1000 so we expect that this will be the first article
-        //in the top seller slider.
+        // the article "2" pseudo sales are set to 1000 so we expect that this will be the first article
+        // in the top seller slider.
         static::assertEquals(4, $topSeller[0]['articleID']);
         static::assertEquals(3, $topSeller[1]['articleID']);
 
diff --git a/tests/Functional/Plugins/Core/PaymentMethods/Components/SepaPaymentMethodTest.php b/tests/Functional/Plugins/Core/PaymentMethods/Components/SepaPaymentMethodTest.php
index 889b5f0aa09..2010fce83c2 100644
--- a/tests/Functional/Plugins/Core/PaymentMethods/Components/SepaPaymentMethodTest.php
+++ b/tests/Functional/Plugins/Core/PaymentMethods/Components/SepaPaymentMethodTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Plugins\Core\PaymentMethods\Components;
@@ -53,7 +52,7 @@ public static function setUpBeforeClass(): void
             $pluginDir . '/Components/'
         );
 
-        //SEPA needs to be active for this. Also, we need to save existing status to later restore it
+        // SEPA needs to be active for this. Also, we need to save existing status to later restore it
         $sepaPaymentMean = Shopware()->Models()->getRepository(Payment::class)->findOneBy(['name' => 'Sepa']);
         static::assertNotNull($sepaPaymentMean);
 
@@ -147,7 +146,7 @@ public function testCreatePaymentInstanceWithNoPaymentData(): void
         $paymentId = 6;
         Shopware()->Session()->set('sUserId', $userId);
 
-        //for now, don't test email
+        // for now, don't test email
         Shopware()->Config()->offsetSet('sepaSendEmail', false);
 
         self::$sepaPaymentMethod->createPaymentInstance($orderId, $userId, $paymentId);
@@ -218,7 +217,7 @@ public function testCreatePaymentInstance(): void
         $paymentId = 6;
         Shopware()->Session()->set('sUserId', $userId);
 
-        //for now, don't test email
+        // for now, don't test email
         Shopware()->Config()->offsetSet('sepaSendEmail', false);
 
         self::$sepaPaymentMethod->createPaymentInstance($orderId, $userId, $paymentId);
diff --git a/tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php b/tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php
index 31491d71e1b..4048dd958d7 100644
--- a/tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php
+++ b/tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Plugins\Core\RestApi\Components;
@@ -48,11 +47,6 @@ public function setUp(): void
         $this->router = new Router();
     }
 
-    public function testCanGetInstance(): void
-    {
-        static::assertInstanceOf(Router::class, $this->router);
-    }
-
     /**
      * @return array<array<string|int|bool>>
      */
@@ -71,6 +65,7 @@ public function routeGetProvider(): array
 
     /**
      * @covers \ShopwarePlugins\RestApi\Components\Router::assembleRoute
+     *
      * @dataProvider routeGetProvider
      *
      * @param string|false $expectedId
@@ -109,6 +104,7 @@ public function routePostProvider(): array
 
     /**
      * @covers \ShopwarePlugins\RestApi\Components\Router::assembleRoute
+     *
      * @dataProvider routePostProvider
      *
      * @param string|false $expectedId
@@ -146,6 +142,7 @@ public function routePutProvider(): array
 
     /**
      * @covers \ShopwarePlugins\RestApi\Components\Router::assembleRoute
+     *
      * @dataProvider routePutProvider
      *
      * @param string|false $expectedId
@@ -185,6 +182,7 @@ public function routeDeleteProvider(): array
 
     /**
      * @covers \ShopwarePlugins\RestApi\Components\Router::assembleRoute
+     *
      * @dataProvider routeDeleteProvider
      *
      * @param string|false $expectedId
diff --git a/tests/Functional/Plugins/Core/Router/BootstrapTest.php b/tests/Functional/Plugins/Core/Router/BootstrapTest.php
index fb5260ee9be..5ef806a48e6 100644
--- a/tests/Functional/Plugins/Core/Router/BootstrapTest.php
+++ b/tests/Functional/Plugins/Core/Router/BootstrapTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Plugins\Core\Router;
diff --git a/tests/Functional/Plugins/Frontend/NotificationTest.php b/tests/Functional/Plugins/Frontend/NotificationTest.php
new file mode 100644
index 00000000000..530dd997887
--- /dev/null
+++ b/tests/Functional/Plugins/Frontend/NotificationTest.php
@@ -0,0 +1,213 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Plugins\Frontend;
+
+use Doctrine\DBAL\Connection;
+use Enlight_Components_Test_Plugin_TestCase;
+use Exception;
+use Shopware\Bundle\PluginInstallerBundle\Service\InstallerService;
+use Shopware\Bundle\PluginInstallerBundle\Service\LegacyPluginInstaller;
+use Shopware\Components\Captcha\DefaultCaptcha;
+use Shopware\Components\Captcha\Exception\CaptchaNotFoundException;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
+
+class NotificationTest extends Enlight_Components_Test_Plugin_TestCase
+{
+    use ContainerTrait;
+    use DatabaseTransactionBehaviour;
+
+    public const PRODUCT_ID = 272;
+
+    public const NOTIFY_POST_PARAMETERS = [
+        'notifyOrdernumber' => 'SW10239',
+        'sNotificationemail' => 'test@example.de',
+    ];
+
+    public const NOTIFICATION_ACTION_URL = 'genusswelten/koestlichkeiten/272/spachtelmasse?action=notify&number=SW10239';
+    public const NOTIFICATION_DETAIL_URL = 'genusswelten/koestlichkeiten/272/spachtelmasse?number=SW10239';
+
+    /**
+     * @throws \Doctrine\DBAL\Exception
+     */
+    public function setUp(): void
+    {
+        $this->getContainer()->reset(InstallerService::class);
+        $this->getContainer()->reset(LegacyPluginInstaller::class);
+        $pluginManager = $this->getContainer()->get(InstallerService::class);
+
+        $pluginManager->refreshPluginList();
+
+        $plugin = $pluginManager->getPluginByName('Notification');
+
+        $pluginManager->installPlugin($plugin);
+        $pluginManager->activatePlugin($plugin);
+
+        $this->getContainer()->reset('plugins')->load('plugins');
+
+        $sql = 'UPDATE s_articles SET notification = 1 WHERE id = ' . self::PRODUCT_ID;
+        $this->getContainer()->get('dbal_connection')->executeQuery($sql);
+        parent::setUp();
+    }
+
+    public function tearDown(): void
+    {
+        $this->saveNotifyCaptcha('nocaptcha');
+        parent::tearDown();
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function testValidateCaptchaWithInvalidName(): void
+    {
+        $this->saveNotifyCaptcha('notExistingCaptchaOption');
+        $random = md5(uniqid());
+        $sessionVars = ['sCaptcha' => $random];
+        $this->getContainer()->get('session')->offsetSet(DefaultCaptcha::SESSION_KEY, $sessionVars);
+
+        $postParameter = self::NOTIFY_POST_PARAMETERS;
+        $postParameter['sCaptcha'] = $random;
+
+        $this->Request()->setMethod('POST');
+        $this->Request()->setPost($postParameter);
+        $this->expectException(CaptchaNotFoundException::class);
+        $this->dispatch(self::NOTIFICATION_ACTION_URL);
+    }
+
+    public function testNoCaptcha(): void
+    {
+        $this->saveNotifyCaptcha('nocaptcha');
+        $postParameter = self::NOTIFY_POST_PARAMETERS;
+
+        $this->Request()->setMethod('POST');
+        $this->Request()->setPost($postParameter);
+
+        $this->dispatch(self::NOTIFICATION_ACTION_URL);
+
+        $viewVariables = $this->View()->getAssign();
+        static::assertArrayNotHasKey('NotifyCaptchaError', $viewVariables);
+    }
+
+    public function testHoneypot(): void
+    {
+        $this->saveNotifyCaptcha('honeypot');
+        $postParameter = self::NOTIFY_POST_PARAMETERS;
+
+        $this->Request()->setMethod('POST');
+        $this->Request()->setPost($postParameter);
+
+        $this->dispatch(self::NOTIFICATION_ACTION_URL);
+
+        $viewVariables = $this->View()->getAssign();
+
+        static::assertArrayNotHasKey('NotifyCaptchaError', $viewVariables);
+    }
+
+    public function testDefault(): void
+    {
+        $this->saveNotifyCaptcha('default');
+        $random = md5(uniqid());
+        $sessionVars = ['sCaptcha' => $random, $random => true];
+
+        $this->getContainer()->get('session')->offsetSet(DefaultCaptcha::SESSION_KEY, $sessionVars);
+
+        $postParameter = self::NOTIFY_POST_PARAMETERS;
+        $postParameter['sCaptcha'] = $random;
+        $this->Request()->setMethod('POST');
+        $this->Request()->setPost($postParameter);
+
+        $this->dispatch(self::NOTIFICATION_ACTION_URL);
+        $viewVariables = $this->View()->getAssign();
+        static::assertArrayNotHasKey('NotifyCaptchaError', $viewVariables);
+    }
+
+    public function testInvalidDefault(): void
+    {
+        $this->saveNotifyCaptcha('default');
+        $random = md5(uniqid());
+        $sessionVars = ['sCaptcha' => $random];
+
+        $this->getContainer()->get('session')->offsetSet(DefaultCaptcha::SESSION_KEY, $sessionVars);
+
+        $postParameter = self::NOTIFY_POST_PARAMETERS;
+        $postParameter['sCaptcha'] = $random;
+
+        $this->Request()->setMethod('POST');
+        $this->Request()->setPost($postParameter);
+
+        $this->dispatch(self::NOTIFICATION_ACTION_URL);
+
+        $viewVariables = $this->View()->getAssign();
+        static::assertArrayHasKey('NotifyCaptchaError', $viewVariables);
+    }
+
+    public function testInvalidHoneypot(): void
+    {
+        $this->saveNotifyCaptcha('honeypot');
+        $postParameter = self::NOTIFY_POST_PARAMETERS;
+        $postParameter['first_name_confirmation'] = uniqid();
+
+        $this->Request()->setMethod('POST');
+        $this->Request()->setPost($postParameter);
+
+        $this->dispatch(self::NOTIFICATION_ACTION_URL);
+
+        $viewVariables = $this->View()->getAssign();
+
+        static::assertArrayHasKey('NotifyCaptchaError', $viewVariables);
+    }
+
+    public function testDetailPageHasNoVariableIfNotNotified(): void
+    {
+        $this->dispatch(self::NOTIFICATION_DETAIL_URL);
+        $viewVariables = $this->View()->getAssign();
+        static::assertArrayNotHasKey('NotifyAlreadyRegistered', $viewVariables);
+    }
+
+    public function testDetailPageHasVariableIfAlreadyNotified(): void
+    {
+        $this->getContainer()->get('session')->offsetSet('sNotificatedArticles', [
+            self::NOTIFY_POST_PARAMETERS['notifyOrdernumber'],
+        ]);
+
+        $this->dispatch(self::NOTIFICATION_DETAIL_URL);
+        $viewVariables = $this->View()->getAssign();
+        static::assertArrayHasKey('NotifyAlreadyRegistered', $viewVariables);
+        static::assertTrue($viewVariables['NotifyAlreadyRegistered']);
+    }
+
+    private function saveNotifyCaptcha(string $value): void
+    {
+        $formattedValue = \sprintf('s:%d:"%s";', \strlen($value), $value);
+        $this->getContainer()->get(Connection::class)->executeQuery(
+            'UPDATE s_core_config_elements SET value = ? WHERE name = ?',
+            [$formattedValue, 'notificationCaptchaConfig']
+        );
+
+        $this->getContainer()->get('cache')->clean();
+    }
+}
diff --git a/tests/Functional/Plugins/Frontend/StatisticsTest.php b/tests/Functional/Plugins/Frontend/StatisticsTest.php
index be03c5d2222..4e6f2ec4be1 100644
--- a/tests/Functional/Plugins/Frontend/StatisticsTest.php
+++ b/tests/Functional/Plugins/Frontend/StatisticsTest.php
@@ -1,28 +1,26 @@
 <?php
 
 declare(strict_types=1);
-
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Plugins\Frontend;
@@ -102,10 +100,10 @@ public function testRefreshCurrentUsers(): void
     public function providerReferer(): array
     {
         return [
-          ['http://google.de/', '123', 'http://google.de/$123', true],
-          ['http://google.de/', null, 'http://google.de/', true],
-          ['http://google.de/', null, 'www.google.de/', false],
-          ['http://google.de/', null, 'http://' . Shopware()->Config()->get('Host') . '/', false],
+            ['http://google.de/', '123', 'http://google.de/$123', true],
+            ['http://google.de/', null, 'http://google.de/', true],
+            ['http://google.de/', null, 'www.google.de/', false],
+            ['http://google.de/', null, 'http://' . Shopware()->Config()->get('Host') . '/', false],
         ];
     }
 
diff --git a/tests/Functional/Recovery/Update/UpdateHtaccessTest.php b/tests/Functional/Recovery/Update/UpdateHtaccessTest.php
index 56c4c269f5f..3cb1cf7db8d 100644
--- a/tests/Functional/Recovery/Update/UpdateHtaccessTest.php
+++ b/tests/Functional/Recovery/Update/UpdateHtaccessTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Recovery\Update;
@@ -309,7 +308,7 @@ public function testCombination(string $currentHtaccess, ?string $newHtaccess, s
         static::assertSame(
             $expected,
             file_get_contents($tmpDir . '/.htaccess'),
-            sprintf('File hash is: %s', md5($currentHtaccess))
+            \sprintf('File hash is: %s', md5($currentHtaccess))
         );
     }
 
diff --git a/tests/Functional/Regressions/Ticket4609Test.php b/tests/Functional/Regressions/Ticket4609Test.php
index 73db4299451..0c697fb613f 100644
--- a/tests/Functional/Regressions/Ticket4609Test.php
+++ b/tests/Functional/Regressions/Ticket4609Test.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Regressions;
diff --git a/tests/Functional/Regressions/Ticket4788Test.php b/tests/Functional/Regressions/Ticket4788Test.php
index f2c2946c520..7413fb9c524 100644
--- a/tests/Functional/Regressions/Ticket4788Test.php
+++ b/tests/Functional/Regressions/Ticket4788Test.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Regressions;
@@ -58,11 +57,11 @@ public function setUp(): void
 
         // Get a copy of article descriptions
         $ids = implode(', ', array_keys($this->articlesToTest));
-        $sql = sprintf('SELECT `id`, `description_long`, `description` FROM s_articles WHERE `id` IN (%s)', $ids);
+        $sql = \sprintf('SELECT `id`, `description_long`, `description` FROM s_articles WHERE `id` IN (%s)', $ids);
         $this->backup = Shopware()->Db()->fetchAssoc($sql);
 
         // Update article description, set UTF-8 string
-        $sql = sprintf('UPDATE s_articles SET `description_long`= ?, `description` = ? WHERE `id` IN (%s)', $ids);
+        $sql = \sprintf('UPDATE s_articles SET `description_long`= ?, `description` = ? WHERE `id` IN (%s)', $ids);
         Shopware()->Db()->query($sql, [$this->longDescription, $this->shortDescription]);
     }
 
@@ -77,7 +76,7 @@ protected function tearDown(): void
         $sql = '';
         $values = [];
         foreach ($this->backup as $key => $fields) {
-            $sql .= sprintf('UPDATE s_articles SET `description_long` = ?, `description` = ? WHERE `id` = %s;', $key);
+            $sql .= \sprintf('UPDATE s_articles SET `description_long` = ?, `description` = ? WHERE `id` = %s;', $key);
             $values[] = $fields['description_long'];
             $values[] = $fields['description'];
         }
@@ -116,7 +115,7 @@ public function testArticleLongDescriptionOnDetailPage(): void
     {
         // Check
         foreach ($this->articlesToTest as $articleId => $categoryId) {
-            $this->dispatch(sprintf('/detail/index/sArticle/%s', $articleId));
+            $this->dispatch(\sprintf('/detail/index/sArticle/%s', $articleId));
             $body = $this->Response()->getBody();
             static::assertIsString($body);
             static::assertStringContainsString($this->longDescription, $body);
diff --git a/tests/Functional/Regressions/Ticket5217Test.php b/tests/Functional/Regressions/Ticket5217Test.php
index 043a86b6041..fa44624ee26 100644
--- a/tests/Functional/Regressions/Ticket5217Test.php
+++ b/tests/Functional/Regressions/Ticket5217Test.php
@@ -5,42 +5,43 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Regressions;
 
 use Enlight_Components_Mail;
 use PHPUnit\Framework\TestCase;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
 
 class Ticket5217Test extends TestCase
 {
+    use ContainerTrait;
+
     /**
      * Test case method
      */
     public function testMailTransport(): void
     {
-        $mailTransport = Shopware()->Container()->get('mailtransport');
+        $mailTransport = $this->getContainer()->get('mailtransport');
 
         $mail = new Enlight_Components_Mail();
-
-        $mail->setBodyText('Test Hallo');
+        $mail->setBodyText('Test Hello');
         $mail->addTo('test@example.com');
 
         $mail = $mail->send($mailTransport);
diff --git a/tests/Functional/Shopware/Bundle/AccountBundle/Service/Validator/CustomerValidatorTest.php b/tests/Functional/Shopware/Bundle/AccountBundle/Service/Validator/CustomerValidatorTest.php
new file mode 100644
index 00000000000..a0959d8e6d4
--- /dev/null
+++ b/tests/Functional/Shopware/Bundle/AccountBundle/Service/Validator/CustomerValidatorTest.php
@@ -0,0 +1,153 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\Shopware\Bundle\AccountBundle\Service\Validator;
+
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Shopware\Bundle\AccountBundle\Service\Validator\CustomerValidator;
+use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface;
+use Shopware\Bundle\StoreFrontBundle\Struct\Shop;
+use Shopware\Bundle\StoreFrontBundle\Struct\ShopContextInterface;
+use Shopware\Models\Customer\Customer;
+use Shopware_Components_Config;
+use Symfony\Component\Validator\Constraints\NotBlank;
+use Symfony\Component\Validator\ConstraintViolationListInterface;
+use Symfony\Component\Validator\Validator\ContextualValidatorInterface;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+
+class CustomerValidatorTest extends TestCase
+{
+    private const CUSTOMER_FIRSTNAME = 'Foo';
+    private const CUSTOMER_LASTNAME = 'Bar';
+    private const CUSTOMER_EMAIL = 'foo@bar.com';
+
+    public function testIsValidChecksIfValidationIsRequired(): void
+    {
+        $salutation = 'mr';
+
+        $violationsMock = $this->createConstraintViolationListMock();
+
+        $validatorMock = $this->createValidatorMock($violationsMock, $salutation, 4);
+
+        $customerValidator = new CustomerValidator($validatorMock, $this->createContextMock(), $this->createConfigMock(true));
+
+        $customerValidator->isValid($this->createCustomer($salutation));
+    }
+
+    public function testIsValidChecksIfValidationIsNotRequired(): void
+    {
+        $salutation = 'mrs';
+
+        $violationsMock = $this->createConstraintViolationListMock();
+
+        $validatorMock = $this->createValidatorMock($violationsMock, $salutation, 3);
+
+        $customerValidator = new CustomerValidator($validatorMock, $this->createContextMock(), $this->createConfigMock(false));
+
+        $customerValidator->isValid($this->createCustomer($salutation));
+    }
+
+    /**
+     * @return ConstraintViolationListInterface&MockObject
+     */
+    public function createConstraintViolationListMock(): MockObject
+    {
+        $violationsMock = $this->createMock(ConstraintViolationListInterface::class);
+        $violationsMock->method('count')->willReturn(0);
+
+        return $violationsMock;
+    }
+
+    /**
+     * @param ConstraintViolationListInterface&MockObject $violationsMock
+     *
+     * @return ValidatorInterface|MockObject
+     */
+    public function createValidatorMock(MockObject $violationsMock, string $salutation, int $expectedValidateCallAmount): MockObject
+    {
+        $contextValidatorMock = $this->createMock(ContextualValidatorInterface::class);
+        $contextValidatorMock->method('atPath')->willReturnSelf();
+        $contextValidatorMock->method('getViolations')->willReturn($violationsMock);
+        $contextValidatorMock->expects(static::exactly($expectedValidateCallAmount))->method('validate')->willReturnMap([
+            [self::CUSTOMER_FIRSTNAME, $this->getNotBlankConstraints(), null, $contextValidatorMock],
+            [self::CUSTOMER_LASTNAME, $this->getNotBlankConstraints(), null, $contextValidatorMock],
+            [$salutation, $this->getNotBlankConstraints(), null, $contextValidatorMock],
+            [self::CUSTOMER_EMAIL, $this->getNotBlankConstraints(), null, $contextValidatorMock],
+        ]);
+
+        $validatorMock = $this->createMock(ValidatorInterface::class);
+        $validatorMock->expects(static::once())->method('startContext')->willReturn($contextValidatorMock);
+
+        return $validatorMock;
+    }
+
+    /**
+     * @return Shopware_Components_Config&MockObject
+     */
+    private function createConfigMock(bool $isSalutationRequired): MockObject
+    {
+        $configMock = $this->createMock(Shopware_Components_Config::class);
+        $configMock->method('get')->willReturnMap([
+            ['shopsalutationrequired', null, $isSalutationRequired],
+            ['shopsalutations', null, 'mr, mrs, not_defined'],
+        ]);
+
+        return $configMock;
+    }
+
+    /**
+     * @return ContextServiceInterface&MockObject
+     */
+    private function createContextMock(): MockObject
+    {
+        $shopContextMock = $this->createMock(ShopContextInterface::class);
+        $shopContextMock->method('getShop')->willReturn(new Shop());
+
+        $contextMock = $this->createMock(ContextServiceInterface::class);
+        $contextMock->method('getShopContext')->willReturn($shopContextMock);
+
+        return $contextMock;
+    }
+
+    private function createCustomer(string $salutation): Customer
+    {
+        $customer = new Customer();
+        $customer->setFirstname(self::CUSTOMER_FIRSTNAME);
+        $customer->setLastname(self::CUSTOMER_LASTNAME);
+        $customer->setEmail(self::CUSTOMER_EMAIL);
+        $customer->setSalutation($salutation);
+
+        return $customer;
+    }
+
+    /**
+     * @return array<int,NotBlank>
+     */
+    private function getNotBlankConstraints(): array
+    {
+        return [new NotBlank()];
+    }
+}
diff --git a/tests/Functional/TestKernel.php b/tests/Functional/TestKernel.php
index b2075d2c980..9b89c742c99 100644
--- a/tests/Functional/TestKernel.php
+++ b/tests/Functional/TestKernel.php
@@ -1,28 +1,26 @@
 <?php
 
 declare(strict_types=1);
-
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional;
@@ -46,7 +44,6 @@ public static function start(): TestKernel
         $kernel->boot();
 
         $container = $kernel->getContainer();
-        $container->get('plugins')->Core()->ErrorHandler()->registerErrorHandler(E_ALL | E_STRICT);
 
         $modelManager = $container->get(ModelManager::class);
         $generator = $modelManager->createModelGenerator();
diff --git a/tests/Functional/Traits/ContainerTrait.php b/tests/Functional/Traits/ContainerTrait.php
index 7fdd143eda0..0df952898d3 100644
--- a/tests/Functional/Traits/ContainerTrait.php
+++ b/tests/Functional/Traits/ContainerTrait.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Traits;
diff --git a/tests/Functional/Traits/CustomerLoginTrait.php b/tests/Functional/Traits/CustomerLoginTrait.php
index 9ed1ebc001b..1b28e5588e2 100644
--- a/tests/Functional/Traits/CustomerLoginTrait.php
+++ b/tests/Functional/Traits/CustomerLoginTrait.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Traits;
@@ -32,7 +31,7 @@
 trait CustomerLoginTrait
 {
     public function loginCustomer(
-        string $sessionId = 'sessionId',
+        ?string $sessionId = null,
         int $customerId = 1,
         string $email = 'test@example.com',
         ?string $passwordChangeDate = null,
@@ -56,6 +55,10 @@ public function loginCustomer(
             );
         }
 
+        if (empty($sessionId)) {
+            $sessionId = $session->getId();
+        }
+
         $session->offsetSet('sessionId', $sessionId);
         $session->offsetSet('sUserId', $customerId);
         $session->offsetSet('sUserMail', $email);
diff --git a/tests/Functional/Traits/DatabaseTransactionBehaviour.php b/tests/Functional/Traits/DatabaseTransactionBehaviour.php
index 84d007d6a04..881e4e59d9d 100644
--- a/tests/Functional/Traits/DatabaseTransactionBehaviour.php
+++ b/tests/Functional/Traits/DatabaseTransactionBehaviour.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Traits;
diff --git a/tests/Functional/Traits/DirectoryDeletionTrait.php b/tests/Functional/Traits/DirectoryDeletionTrait.php
index f5aaab65420..40c2ce3ec4d 100644
--- a/tests/Functional/Traits/DirectoryDeletionTrait.php
+++ b/tests/Functional/Traits/DirectoryDeletionTrait.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Traits;
diff --git a/tests/Functional/Traits/FixtureBehaviour.php b/tests/Functional/Traits/FixtureBehaviour.php
index fe49236bd31..0626c1fc78b 100644
--- a/tests/Functional/Traits/FixtureBehaviour.php
+++ b/tests/Functional/Traits/FixtureBehaviour.php
@@ -1,29 +1,30 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Traits;
 
+use Doctrine\DBAL\Connection;
 use RuntimeException;
 
 trait FixtureBehaviour
@@ -33,9 +34,9 @@ protected static function executeFixture(string $name): void
         $sql = file_get_contents($name);
 
         if (!\is_string($sql)) {
-            throw new RuntimeException(sprintf('Could not read fixture "%s"', $name));
+            throw new RuntimeException(\sprintf('Could not read fixture "%s"', $name));
         }
 
-        Shopware()->Container()->get(\Doctrine\DBAL\Connection::class)->exec($sql);
+        Shopware()->Container()->get(Connection::class)->executeStatement($sql);
     }
 }
diff --git a/tests/Functional/Traits/MigrationTestTrait.php b/tests/Functional/Traits/MigrationTestTrait.php
index f97dd045521..8903740be41 100644
--- a/tests/Functional/Traits/MigrationTestTrait.php
+++ b/tests/Functional/Traits/MigrationTestTrait.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Traits;
@@ -29,6 +28,9 @@
 use PDO;
 use Shopware\Components\Migrations\AbstractMigration;
 use Shopware\Components\Migrations\Manager;
+use Shopware\Recovery\Install\DatabaseFactory;
+use Shopware\Recovery\Install\Struct\DatabaseConnectionInformation;
+use UnexpectedValueException;
 
 trait MigrationTestTrait
 {
@@ -41,4 +43,42 @@ public function getMigration(PDO $connection, int $number): AbstractMigration
     {
         return $this->getMigrationManager($connection)->getMigrationsForVersion(0)[$number];
     }
+
+    public function createPDOConnection(): PDO
+    {
+        $rootDirectory = $this->getRootDirectory();
+
+        require_once $rootDirectory . '/recovery/install/src/DatabaseFactory.php';
+        require_once $rootDirectory . '/recovery/install/src/Struct/Struct.php';
+        require_once $rootDirectory . '/recovery/install/src/Struct/DatabaseConnectionInformation.php';
+
+        $configPath = $rootDirectory . '/config.php';
+        if (!is_file($configPath)) {
+            throw new UnexpectedValueException(\sprintf('Config file not found: %s', $configPath));
+        }
+
+        $config = require $configPath;
+
+        $connectionInfo = new DatabaseConnectionInformation();
+        $connectionInfo->username = $config['db']['username'];
+        $connectionInfo->hostname = $config['db']['host'];
+        $connectionInfo->port = $config['db']['port'];
+        $connectionInfo->databaseName = $config['db']['dbname'];
+        $connectionInfo->password = $config['db']['password'];
+
+        $databaseFactory = new DatabaseFactory();
+
+        return $databaseFactory->createPDOConnection($connectionInfo);
+    }
+
+    private function getRootDirectory(): string
+    {
+        $rootDirectory = realpath(__DIR__ . '/../../../');
+
+        if (!\is_string($rootDirectory)) {
+            throw new UnexpectedValueException(\sprintf('Root directory not found: %s', $rootDirectory));
+        }
+
+        return $rootDirectory;
+    }
 }
diff --git a/tests/Functional/Traits/ShopContextTrait.php b/tests/Functional/Traits/ShopContextTrait.php
index 50eef228eca..88002a29f8d 100644
--- a/tests/Functional/Traits/ShopContextTrait.php
+++ b/tests/Functional/Traits/ShopContextTrait.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Functional\Traits;
diff --git a/tests/Functional/_sql/migrations/Migrations_Migration1722Test.php b/tests/Functional/_sql/migrations/Migrations_Migration1722Test.php
new file mode 100644
index 00000000000..835862e51bb
--- /dev/null
+++ b/tests/Functional/_sql/migrations/Migrations_Migration1722Test.php
@@ -0,0 +1,113 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Functional\_sql\migrations;
+
+use Generator;
+use PHPUnit\Framework\TestCase;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+use Shopware\Tests\Functional\Traits\MigrationTestTrait;
+
+class Migrations_Migration1722Test extends TestCase
+{
+    use ContainerTrait;
+    use MigrationTestTrait;
+
+    private const MIGRATION_NUMBER = 1722;
+
+    /**
+     * @dataProvider upTestDataProvider
+     */
+    public function testUp(string $currentStateValue, string $expectedResult): void
+    {
+        $defaultData = $this->getDatabaseResult();
+
+        $this->installTestData($currentStateValue);
+
+        $migration = $this->getMigration($this->createPDOConnection(), self::MIGRATION_NUMBER);
+
+        $migration->up('update');
+        $migration->up('update');
+
+        $result = $this->getDatabaseResult();
+
+        static::assertSame($expectedResult, $result);
+
+        // Reset database
+        $this->installTestData($defaultData);
+    }
+
+    /**
+     * @return Generator<array<int,string>>
+     */
+    public function upTestDataProvider(): Generator
+    {
+        yield 'Should remove motor from start' => [
+            serialize('motor;foo;bar;foo_bar;foo-bar;foo bar;'),
+            serialize('foo;bar;foo_bar;foo-bar;foo bar;'),
+        ];
+
+        yield 'Should remove motor two times' => [
+            serialize('motor;foo;bar;foo_bar;motor;foo-bar;foo bar;'),
+            serialize('foo;bar;foo_bar;foo-bar;foo bar;'),
+        ];
+
+        yield 'Should remove motor from the middle' => [
+            serialize('foo;bar;foo_bar;foo-bar;motor;foo bar;'),
+            serialize('foo;bar;foo_bar;foo-bar;foo bar;'),
+        ];
+
+        yield 'Should remove motor from the end' => [
+            serialize('foo;bar;foo_bar;foo-bar;foo bar;motor;'),
+            serialize('foo;bar;foo_bar;foo-bar;foo bar;'),
+        ];
+    }
+
+    private function getDatabaseResult(): string
+    {
+        $result = $this->getContainer()->get('dbal_connection')->createQueryBuilder()
+            ->select(['value'])
+            ->from('s_core_config_elements')
+            ->where('name LIKE "botBlackList"')
+            ->execute()
+            ->fetchOne();
+
+        if (!\is_string($result)) {
+            static::fail('Database value is not a string');
+        }
+
+        return $result;
+    }
+
+    private function installTestData(string $testData): void
+    {
+        $this->getContainer()->get('dbal_connection')->createQueryBuilder()
+            ->update('s_core_config_elements')
+            ->set('value', ':newValue')
+            ->where('name = "botBlackList"')
+            ->setParameter('newValue', $testData)
+            ->execute();
+    }
+}
diff --git a/tests/Functional/bootstrap.php b/tests/Functional/bootstrap.php
index 07303cd0190..ff2a29b2628 100644
--- a/tests/Functional/bootstrap.php
+++ b/tests/Functional/bootstrap.php
@@ -4,23 +4,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 require __DIR__ . '/../../autoload.php';
diff --git a/tests/Functional/config.php b/tests/Functional/config.php
index 929aaf030cd..e44920267c6 100644
--- a/tests/Functional/config.php
+++ b/tests/Functional/config.php
@@ -1,29 +1,29 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 return array_replace_recursive($this->loadConfig($this->AppPath() . 'Configs/Default.php'), [
-     'front' => [
+    'front' => [
         'throwExceptions' => true,
         'disableOutputBuffering' => false,
         'showException' => true,
diff --git a/tests/Mink/Extension/ShopwareExtension/Context/Initializer/KernelAwareInitializer.php b/tests/Mink/Extension/ShopwareExtension/Context/Initializer/KernelAwareInitializer.php
index 0f1e31a4b99..151eb31871a 100644
--- a/tests/Mink/Extension/ShopwareExtension/Context/Initializer/KernelAwareInitializer.php
+++ b/tests/Mink/Extension/ShopwareExtension/Context/Initializer/KernelAwareInitializer.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Behat\ShopwareExtension\Context\Initializer;
@@ -34,10 +35,7 @@
 
 final class KernelAwareInitializer implements ContextInitializer, EventSubscriberInterface
 {
-    /**
-     * @var Kernel
-     */
-    private $kernel;
+    private Kernel $kernel;
 
     /**
      * Initializes initializer.
@@ -50,7 +48,7 @@ public function __construct(Kernel $kernel)
     /**
      * {@inheritdoc}
      */
-    public static function getSubscribedEvents()
+    public static function getSubscribedEvents(): array
     {
         return [
             ScenarioTested::BEFORE => ['bootKernel', 15],
@@ -61,7 +59,7 @@ public static function getSubscribedEvents()
     /**
      * {@inheritdoc}
      */
-    public function initializeContext(Context $context)
+    public function initializeContext(Context $context): void
     {
         if (!$context instanceof KernelAwareContext) {
             return;
@@ -73,7 +71,7 @@ public function initializeContext(Context $context)
     /**
      * Boots HttpKernel before each scenario.
      */
-    public function bootKernel()
+    public function bootKernel(): void
     {
         $this->kernel->boot();
     }
diff --git a/tests/Mink/Extension/ShopwareExtension/Context/KernelAwareContext.php b/tests/Mink/Extension/ShopwareExtension/Context/KernelAwareContext.php
index d532124599b..295aec2b4a6 100644
--- a/tests/Mink/Extension/ShopwareExtension/Context/KernelAwareContext.php
+++ b/tests/Mink/Extension/ShopwareExtension/Context/KernelAwareContext.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Behat\ShopwareExtension\Context;
@@ -32,5 +33,5 @@ interface KernelAwareContext extends Context
     /**
      * Sets Kernel instance.
      */
-    public function setKernel(Kernel $kernel);
+    public function setKernel(Kernel $kernel): void;
 }
diff --git a/tests/Mink/Extension/ShopwareExtension/ServiceContainer/ShopwareExtension.php b/tests/Mink/Extension/ShopwareExtension/ServiceContainer/ShopwareExtension.php
index ff0cbeb45d2..25246666103 100644
--- a/tests/Mink/Extension/ShopwareExtension/ServiceContainer/ShopwareExtension.php
+++ b/tests/Mink/Extension/ShopwareExtension/ServiceContainer/ShopwareExtension.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Behat\ShopwareExtension\ServiceContainer;
@@ -28,6 +29,9 @@
 use Behat\Testwork\EventDispatcher\ServiceContainer\EventDispatcherExtension;
 use Behat\Testwork\ServiceContainer\Extension as ExtensionInterface;
 use Behat\Testwork\ServiceContainer\ExtensionManager;
+use Shopware\Behat\ShopwareExtension\Context\Initializer\KernelAwareInitializer;
+use Shopware\Kernel;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
@@ -39,27 +43,25 @@ class ShopwareExtension implements ExtensionInterface
 
     /**
      * Returns the extension config key.
-     *
-     * @return string
      */
-    public function getConfigKey()
+    public function getConfigKey(): string
     {
         return 'shopware';
     }
 
-    public function initialize(ExtensionManager $extensionManager)
+    public function initialize(ExtensionManager $extensionManager): void
     {
     }
 
     /**
      * Setups configuration for the extension.
      */
-    public function configure(ArrayNodeDefinition $builder)
+    public function configure(ArrayNodeDefinition $builder): void
     {
         $boolFilter = function ($v) {
             $filtered = filter_var($v, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
 
-            return ($filtered === null) ? $v : $filtered;
+            return $filtered ?? $v;
         };
 
         $builder
@@ -75,7 +77,7 @@ public function configure(ArrayNodeDefinition $builder)
                             ->defaultValue('engine/Shopware/Kernel.php')
                         ->end()
                         ->scalarNode('class')
-                            ->defaultValue('Shopware\Kernel')
+                            ->defaultValue(Kernel::class)
                         ->end()
                         ->scalarNode('env')
                             ->defaultValue('production')
@@ -94,8 +96,10 @@ public function configure(ArrayNodeDefinition $builder)
 
     /**
      * Loads extension services into temporary container.
+     *
+     * @param array<string, mixed> $config
      */
-    public function load(ContainerBuilder $container, array $config)
+    public function load(ContainerBuilder $container, array $config): void
     {
         $this->loadContextInitializer($container);
         $this->loadKernel($container, $config['kernel']);
@@ -106,18 +110,19 @@ public function load(ContainerBuilder $container, array $config)
      *
      * @api
      */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         // get base path
-        /** @var string $basePath */
         $basePath = $container->getParameter('paths.base');
+        if (!\is_string($basePath)) {
+            Helper::throwException('Invalid container parameter "paths.base"');
+        }
 
         // find and require bootstrap
-        /** @var string $bootstrapPath */
         $bootstrapPath = $container->getParameter('shopware_extension.kernel.bootstrap');
-
-        if ($bootstrapPath) {
-            if (file_exists($bootstrap = $basePath . '/' . $bootstrapPath)) {
+        if (\is_string($bootstrapPath)) {
+            $bootstrap = $basePath . '/' . $bootstrapPath;
+            if (file_exists($bootstrap)) {
                 require_once $bootstrap;
             } elseif (file_exists($bootstrapPath)) {
                 require_once $bootstrapPath;
@@ -125,18 +130,22 @@ public function process(ContainerBuilder $container)
         }
 
         // find and require kernel
-        /** @var string $kernelPath */
         $kernelPath = $container->getParameter('shopware_extension.kernel.path');
-        if (file_exists($kernel = $basePath . '/' . $kernelPath)) {
+        if (!\is_string($kernelPath)) {
+            Helper::throwException('Invalid container parameter "shopware_extension.kernel.path"');
+        }
+
+        $kernel = $basePath . '/' . $kernelPath;
+        if (file_exists($kernel)) {
             $container->getDefinition(self::KERNEL_ID)->setFile($kernel);
         } elseif (file_exists($kernelPath)) {
             $container->getDefinition(self::KERNEL_ID)->setFile($kernelPath);
         }
     }
 
-    private function loadContextInitializer(ContainerBuilder $container)
+    private function loadContextInitializer(ContainerBuilder $container): void
     {
-        $definition = new Definition('Shopware\Behat\ShopwareExtension\Context\Initializer\KernelAwareInitializer', [
+        $definition = new Definition(KernelAwareInitializer::class, [
             new Reference(self::KERNEL_ID),
         ]);
         $definition->addTag(ContextExtension::INITIALIZER_TAG, ['priority' => 0]);
@@ -144,7 +153,10 @@ private function loadContextInitializer(ContainerBuilder $container)
         $container->setDefinition('shopware_extension.context_initializer.kernel_aware', $definition);
     }
 
-    private function loadKernel(ContainerBuilder $container, array $config)
+    /**
+     * @param array<string, mixed> $config
+     */
+    private function loadKernel(ContainerBuilder $container, array $config): void
     {
         $definition = new Definition($config['class'], [
             $config['env'],
diff --git a/tests/Mink/Page/Backend/Backend/Backend.php b/tests/Mink/Page/Backend/Backend/Backend.php
new file mode 100644
index 00000000000..790672e23eb
--- /dev/null
+++ b/tests/Mink/Page/Backend/Backend/Backend.php
@@ -0,0 +1,81 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Mink\Page\Backend\Backend;
+
+use SensioLabs\Behat\PageObjectExtension\PageObject\Page;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
+
+class Backend extends Page
+{
+    public const TIMEOUT_MILLISECONDS = 500;
+
+    /**
+     * @var string
+     */
+    protected $path = '/backend/';
+
+    public function login(string $user, string $password): void
+    {
+        $userNameInput = $this->find('xpath', "//input[@name='username']");
+        if ($userNameInput === null) {
+            Helper::throwException('No user name input element found');
+        }
+        $userNameInput->setValue($user);
+
+        $passwordInput = $this->find('xpath', "//input[@name='password']");
+        if ($passwordInput === null) {
+            Helper::throwException('No password input element found');
+        }
+        $passwordInput->setValue($password);
+
+        $loginButton = $this->find('xpath', "//button[@data-action='login']");
+        if ($loginButton === null) {
+            Helper::throwException('No login button found');
+        }
+        $loginButton->click();
+    }
+
+    public function openModule(string $moduleName): void
+    {
+        $name = 'Shopware.apps.' . $moduleName;
+        $this->getSession()->evaluateScript("openNewModule('$name');");
+    }
+
+    public function verifyModule(): void
+    {
+        $selector = "document.querySelector('.x-window-header-text') !== null";
+        $result = $this->getSession()->wait(self::TIMEOUT_MILLISECONDS, $selector);
+        if (!$result) {
+            Helper::throwException('No Module was opened');
+        }
+
+        $selector = "document.querySelector('.x-window-header-text').innerHTML != 'Shopware Fehler Reporter'";
+        $result = $this->getSession()->wait(self::TIMEOUT_MILLISECONDS, $selector);
+        if (!$result) {
+            Helper::throwException('Error Module was opened');
+        }
+    }
+}
diff --git a/tests/Mink/features/bootstrap/Page/Backend/ContentTypeManager.php b/tests/Mink/Page/Backend/ContentTypeManager/ContentTypeManager.php
similarity index 57%
rename from tests/Mink/features/bootstrap/Page/Backend/ContentTypeManager.php
rename to tests/Mink/Page/Backend/ContentTypeManager/ContentTypeManager.php
index 9153e09518b..9dcc6b0162a 100644
--- a/tests/Mink/features/bootstrap/Page/Backend/ContentTypeManager.php
+++ b/tests/Mink/Page/Backend/ContentTypeManager/ContentTypeManager.php
@@ -5,34 +5,33 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Page\Backend;
+namespace Shopware\Tests\Mink\Page\Backend\ContentTypeManager;
 
 use Behat\Mink\Element\NodeElement;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Element;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Exception\ElementNotFoundException;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Page;
-use Shopware\Tests\Mink\Element\Backend\ContentTypeManagerDetailWindow;
-use Shopware\Tests\Mink\Element\Backend\ContentTypeManagerFieldWindow;
-use Shopware\Tests\Mink\Element\Backend\ContentTypeManagerListWindow;
+use Shopware\Tests\Mink\Page\Backend\ContentTypeManager\Elements\ContentTypeManagerDetailWindow;
+use Shopware\Tests\Mink\Page\Backend\ContentTypeManager\Elements\ContentTypeManagerFieldWindow;
+use Shopware\Tests\Mink\Page\Backend\ContentTypeManager\Elements\ContentTypeManagerListWindow;
 use Throwable;
 
 class ContentTypeManager extends Page
@@ -62,6 +61,9 @@ public function clickSaveContentTypeButton(): void
         $this->getDetailWindow()->getSaveButton()->press();
     }
 
+    /**
+     * @param class-string<Element> $name
+     */
     public function switchTab(string $name): void
     {
         $this->getDetailWindow()->getTab($name)->click();
@@ -69,42 +71,26 @@ public function switchTab(string $name): void
 
     public function getListWindow(): ContentTypeManagerListWindow
     {
-        $window = $this->getElement(ContentTypeManagerListWindow::class);
-
-        if ($window instanceof ContentTypeManagerListWindow) {
-            return $window;
-        }
-
-        throw new ElementNotFoundException(sprintf('Couldn\'t find "%s" on the current page', ContentTypeManagerListWindow::class));
+        return $this->getElement(ContentTypeManagerListWindow::class);
     }
 
     public function getDetailWindow(): ContentTypeManagerDetailWindow
     {
-        $window = $this->getElement(ContentTypeManagerDetailWindow::class);
-
-        if ($window instanceof ContentTypeManagerDetailWindow) {
-            return $window;
-        }
-
-        throw new ElementNotFoundException(sprintf('Couldn\'t find "%s" on the current page', ContentTypeManagerDetailWindow::class));
+        return $this->getElement(ContentTypeManagerDetailWindow::class);
     }
 
     public function getFieldWindow(): ContentTypeManagerFieldWindow
     {
-        $window = $this->getElement(ContentTypeManagerFieldWindow::class);
-
-        if ($window instanceof ContentTypeManagerFieldWindow) {
-            return $window;
-        }
-
-        throw new ElementNotFoundException(sprintf('Couldn\'t find "%s" on the current page', ContentTypeManagerFieldWindow::class));
+        return $this->getElement(ContentTypeManagerFieldWindow::class);
     }
 
     protected function verifyPage(): void
     {
         $listWindowPresent = $this->waitFor(10, function (ContentTypeManager $page): bool {
             try {
-                return $page->getListWindow() instanceof Element;
+                $page->getListWindow();
+
+                return true;
             } catch (Throwable $e) {
                 return false;
             }
@@ -114,7 +100,7 @@ protected function verifyPage(): void
             return;
         }
 
-        throw new ElementNotFoundException(sprintf('Couldn\'t find "%s" on the current page', ContentTypeManagerListWindow::class));
+        throw new ElementNotFoundException(\sprintf("Couldn't find '%s' on the current page", ContentTypeManagerListWindow::class));
     }
 
     private function clickUsingJs(NodeElement $el, ?NodeElement $contextNode = null): void
@@ -133,7 +119,7 @@ private function clickUsingJs(NodeElement $el, ?NodeElement $contextNode = null)
 JS;
 
         $this->getDriver()->executeScript(
-            sprintf($script, $contextNode ? $contextNode->getXpath() : '', $el->getXpath()
+            \sprintf($script, $contextNode ? $contextNode->getXpath() : '', $el->getXpath()
             )
         );
     }
diff --git a/tests/Mink/Page/Backend/ContentTypeManager/Elements/AddButton.php b/tests/Mink/Page/Backend/ContentTypeManager/Elements/AddButton.php
new file mode 100644
index 00000000000..6b03c3af688
--- /dev/null
+++ b/tests/Mink/Page/Backend/ContentTypeManager/Elements/AddButton.php
@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Mink\Page\Backend\ContentTypeManager\Elements;
+
+use SensioLabs\Behat\PageObjectExtension\PageObject\Element;
+
+class AddButton extends Element
+{
+    /**
+     * @var array<string, string>
+     */
+    protected $selector = ['xpath' => "//*[@class='x-btn-icon sprite-plus-circle-frame']/.."];
+}
diff --git a/tests/Mink/Page/Backend/ContentTypeManager/Elements/AddFieldButton.php b/tests/Mink/Page/Backend/ContentTypeManager/Elements/AddFieldButton.php
new file mode 100644
index 00000000000..6a23b9a3682
--- /dev/null
+++ b/tests/Mink/Page/Backend/ContentTypeManager/Elements/AddFieldButton.php
@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Mink\Page\Backend\ContentTypeManager\Elements;
+
+use SensioLabs\Behat\PageObjectExtension\PageObject\Element;
+
+class AddFieldButton extends Element
+{
+    /**
+     * @var array<string, string>
+     */
+    protected $selector = ['xpath' => "//*[@class='x-btn-icon sprite-plus-circle-frame']/../../button[normalize-space()='Neues Feld erstellen']"];
+}
diff --git a/tests/Mink/features/bootstrap/Element/Backend/ContentTypeManagerDetailWindow.php b/tests/Mink/Page/Backend/ContentTypeManager/Elements/ContentTypeManagerDetailWindow.php
similarity index 56%
rename from tests/Mink/features/bootstrap/Element/Backend/ContentTypeManagerDetailWindow.php
rename to tests/Mink/Page/Backend/ContentTypeManager/Elements/ContentTypeManagerDetailWindow.php
index 3221252c3c6..8eb8ba4a80b 100644
--- a/tests/Mink/features/bootstrap/Element/Backend/ContentTypeManagerDetailWindow.php
+++ b/tests/Mink/Page/Backend/ContentTypeManager/Elements/ContentTypeManagerDetailWindow.php
@@ -5,26 +5,25 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element\Backend;
+namespace Shopware\Tests\Mink\Page\Backend\ContentTypeManager\Elements;
 
 use Behat\Mink\Element\NodeElement;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Element;
@@ -42,22 +41,27 @@ class ContentTypeManagerDetailWindow extends Element
     protected $elements = [
         'Allgemein' => ['xpath' => "//button[normalize-space()='Allgemein']"],
         'Felder' => ['xpath' => "//button[normalize-space()='Felder']"],
-        'Add field button' => ['xpath' => "//*[@class='x-btn-icon sprite-plus-circle-frame']/../../button[normalize-space()='Neues Feld erstellen']"],
-        'Save button' => '.x-btn.primary button[role="button"]',
     ];
 
     public function getAddFieldButton(): NodeElement
     {
-        return $this->getElement('Add field button');
+        return $this->getElement(AddFieldButton::class);
     }
 
-    public function getTab(string $name): NodeElement
+    /**
+     * @template TElement of Element
+     *
+     * @param class-string<TElement> $name
+     *
+     * @return TElement
+     */
+    public function getTab(string $name): Element
     {
         return $this->getElement($name);
     }
 
     public function getSaveButton(): NodeElement
     {
-        return $this->getElement('Save button');
+        return $this->getElement(SaveButton::class);
     }
 }
diff --git a/tests/Mink/features/bootstrap/Element/Backend/ContentTypeManagerFieldWindow.php b/tests/Mink/Page/Backend/ContentTypeManager/Elements/ContentTypeManagerFieldWindow.php
similarity index 52%
rename from tests/Mink/features/bootstrap/Element/Backend/ContentTypeManagerFieldWindow.php
rename to tests/Mink/Page/Backend/ContentTypeManager/Elements/ContentTypeManagerFieldWindow.php
index 3f976debaf1..b1138bf6f5e 100644
--- a/tests/Mink/features/bootstrap/Element/Backend/ContentTypeManagerFieldWindow.php
+++ b/tests/Mink/Page/Backend/ContentTypeManager/Elements/ContentTypeManagerFieldWindow.php
@@ -5,29 +5,27 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element\Backend;
+namespace Shopware\Tests\Mink\Page\Backend\ContentTypeManager\Elements;
 
 use Behat\Mink\Element\NodeElement;
-use Shopware\Tests\Mink\Element\SelectorScopedElement;
 
 class ContentTypeManagerFieldWindow extends SelectorScopedElement
 {
@@ -37,14 +35,14 @@ class ContentTypeManagerFieldWindow extends SelectorScopedElement
     protected $selector = ".x-window[id^='content-type-manager-field-window']";
 
     /**
-     * @var array<string, string|array>
+     * @var array<string, array<string, string>>
      */
     protected $elements = [
-        'Save button' => ['css' => '.x-btn.primary button[role="button"]'],
+        SaveButton::class => ['css' => '.x-btn.primary button[role="button"]'],
     ];
 
     public function getSaveButton(): NodeElement
     {
-        return $this->getElement('Save button');
+        return $this->getElement(SaveButton::class);
     }
 }
diff --git a/tests/Mink/features/bootstrap/Element/Backend/ContentTypeManagerListWindow.php b/tests/Mink/Page/Backend/ContentTypeManager/Elements/ContentTypeManagerListWindow.php
similarity index 51%
rename from tests/Mink/features/bootstrap/Element/Backend/ContentTypeManagerListWindow.php
rename to tests/Mink/Page/Backend/ContentTypeManager/Elements/ContentTypeManagerListWindow.php
index 81a1bed0944..01a80749451 100644
--- a/tests/Mink/features/bootstrap/Element/Backend/ContentTypeManagerListWindow.php
+++ b/tests/Mink/Page/Backend/ContentTypeManager/Elements/ContentTypeManagerListWindow.php
@@ -5,26 +5,25 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element\Backend;
+namespace Shopware\Tests\Mink\Page\Backend\ContentTypeManager\Elements;
 
 use Behat\Mink\Element\NodeElement;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Element;
@@ -36,15 +35,8 @@ class ContentTypeManagerListWindow extends Element
      */
     protected $selector = ".x-window[id^='content-type-manager-list-window']";
 
-    /**
-     * @var array<string, string|array>
-     */
-    protected $elements = [
-        'Add button' => ['xpath' => "//*[@class='x-btn-icon sprite-plus-circle-frame']/.."],
-    ];
-
     public function getAddButton(): NodeElement
     {
-        return $this->getElement('Add button')->getParent();
+        return $this->getElement(AddButton::class)->getParent();
     }
 }
diff --git a/tests/Mink/Page/Backend/ContentTypeManager/Elements/SaveButton.php b/tests/Mink/Page/Backend/ContentTypeManager/Elements/SaveButton.php
new file mode 100644
index 00000000000..04c2f54ed82
--- /dev/null
+++ b/tests/Mink/Page/Backend/ContentTypeManager/Elements/SaveButton.php
@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Mink\Page\Backend\ContentTypeManager\Elements;
+
+use SensioLabs\Behat\PageObjectExtension\PageObject\Element;
+
+class SaveButton extends Element
+{
+    /**
+     * @var string
+     */
+    protected $selector = '.x-btn.primary button[role="button"]';
+}
diff --git a/tests/Mink/features/bootstrap/Element/SelectorScopedElement.php b/tests/Mink/Page/Backend/ContentTypeManager/Elements/SelectorScopedElement.php
similarity index 68%
rename from tests/Mink/features/bootstrap/Element/SelectorScopedElement.php
rename to tests/Mink/Page/Backend/ContentTypeManager/Elements/SelectorScopedElement.php
index ca976416087..1d8cf855234 100644
--- a/tests/Mink/features/bootstrap/Element/SelectorScopedElement.php
+++ b/tests/Mink/Page/Backend/ContentTypeManager/Elements/SelectorScopedElement.php
@@ -5,31 +5,30 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Backend\ContentTypeManager\Elements;
 
 use Behat\Mink\Session;
-use RuntimeException;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Element;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Factory;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
 
 class SelectorScopedElement extends Element
 {
@@ -44,7 +43,7 @@ public function __construct(Session $session, Factory $factory)
             $parentType = \is_array($parentSelector) ? array_key_first($parentSelector) : 'css';
 
             if ($childType !== $parentType) {
-                throw new RuntimeException(sprintf('Combining the parent element\'s %s selector with the childs %s selector won\'t work.', $parentType, $childType));
+                Helper::throwException(\sprintf("Combining the parent element's %s selector with the child's %s selector won't work.", $parentType, $childType));
             }
 
             return implode(
diff --git a/tests/Mink/features/bootstrap/Page/Backend/CustomRecipes.php b/tests/Mink/Page/Backend/CustomRecipes/CustomRecipes.php
similarity index 53%
rename from tests/Mink/features/bootstrap/Page/Backend/CustomRecipes.php
rename to tests/Mink/Page/Backend/CustomRecipes/CustomRecipes.php
index aab97e8de64..475dfc1d9b1 100644
--- a/tests/Mink/features/bootstrap/Page/Backend/CustomRecipes.php
+++ b/tests/Mink/Page/Backend/CustomRecipes/CustomRecipes.php
@@ -5,31 +5,29 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Page\Backend;
+namespace Shopware\Tests\Mink\Page\Backend\CustomRecipes;
 
-use SensioLabs\Behat\PageObjectExtension\PageObject\Element;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Exception\ElementNotFoundException;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Page;
-use Shopware\Tests\Mink\Element\Backend\CustomRecipesListWindow;
+use Shopware\Tests\Mink\Page\Backend\CustomRecipes\Elements\CustomRecipesListWindow;
 use Throwable;
 
 class CustomRecipes extends Page
@@ -46,20 +44,16 @@ public function clickAddButton(): void
 
     public function getCustomRecipesListWindow(): CustomRecipesListWindow
     {
-        $window = $this->getElement(CustomRecipesListWindow::class);
-
-        if ($window instanceof CustomRecipesListWindow) {
-            return $window;
-        }
-
-        throw new ElementNotFoundException(sprintf('Couldn\'t find "%s" on the current page', CustomRecipesListWindow::class));
+        return $this->getElement(CustomRecipesListWindow::class);
     }
 
     protected function verifyPage(): void
     {
         $recipesWindowPresent = $this->waitFor(10, function (CustomRecipes $page): bool {
             try {
-                return $page->getCustomRecipesListWindow() instanceof Element;
+                $page->getCustomRecipesListWindow();
+
+                return true;
             } catch (Throwable $e) {
                 return false;
             }
@@ -69,6 +63,6 @@ protected function verifyPage(): void
             return;
         }
 
-        throw new ElementNotFoundException(sprintf('Couldn\'t find "%s" on the current page', CustomRecipesListWindow::class));
+        throw new ElementNotFoundException(\sprintf("Couldn't find '%s' on the current page", CustomRecipesListWindow::class));
     }
 }
diff --git a/tests/Mink/features/bootstrap/Element/Backend/CustomRecipesListWindow.php b/tests/Mink/Page/Backend/CustomRecipes/Elements/CustomRecipesListWindow.php
similarity index 51%
rename from tests/Mink/features/bootstrap/Element/Backend/CustomRecipesListWindow.php
rename to tests/Mink/Page/Backend/CustomRecipes/Elements/CustomRecipesListWindow.php
index 2820cce06b0..0a3c6cbe90f 100644
--- a/tests/Mink/features/bootstrap/Element/Backend/CustomRecipesListWindow.php
+++ b/tests/Mink/Page/Backend/CustomRecipes/Elements/CustomRecipesListWindow.php
@@ -5,29 +5,29 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element\Backend;
+namespace Shopware\Tests\Mink\Page\Backend\CustomRecipes\Elements;
 
 use Behat\Mink\Element\NodeElement;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Element;
+use Shopware\Tests\Mink\Page\Backend\ContentTypeManager\Elements\AddButton;
 
 class CustomRecipesListWindow extends Element
 {
@@ -36,15 +36,8 @@ class CustomRecipesListWindow extends Element
      */
     protected $selector = ".x-window[id^='CustomRecipes-list-window']";
 
-    /**
-     * @var array<string, string|array>
-     */
-    protected $elements = [
-        'Add button' => ['xpath' => "//*[@class='x-btn-icon sprite-plus-circle-frame']/.."],
-    ];
-
     public function getAddButton(): NodeElement
     {
-        return $this->getElement('Add button')->getParent();
+        return $this->getElement(AddButton::class)->getParent();
     }
 }
diff --git a/tests/Mink/features/bootstrap/Page/Account.php b/tests/Mink/Page/Frontend/Account/Account.php
similarity index 74%
rename from tests/Mink/features/bootstrap/Page/Account.php
rename to tests/Mink/Page/Frontend/Account/Account.php
index e53f56c625b..59f492900f4 100644
--- a/tests/Mink/features/bootstrap/Page/Account.php
+++ b/tests/Mink/Page/Frontend/Account/Account.php
@@ -1,39 +1,41 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Page;
+namespace Shopware\Tests\Mink\Page\Frontend\Account;
 
-use Behat\Mink\Element\NodeElement;
+use Behat\Mink\Exception\ResponseTextException;
 use Behat\Mink\WebAssert;
 use Exception;
-use SensioLabs\Behat\PageObjectExtension\PageObject\Element;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Page;
-use Shopware\Tests\Mink\Element\AccountOrder;
-use Shopware\Tests\Mink\Element\AccountPayment;
-use Shopware\Tests\Mink\Element\AddressBox;
-use Shopware\Tests\Mink\Helper;
-use Shopware\Tests\Mink\HelperSelectorInterface;
+use Shopware\Tests\Mink\Page\Frontend\Account\Elements\AccountBilling;
+use Shopware\Tests\Mink\Page\Frontend\Account\Elements\AccountOrder;
+use Shopware\Tests\Mink\Page\Frontend\Account\Elements\AccountPayment;
+use Shopware\Tests\Mink\Page\Frontend\Account\Elements\AccountShipping;
+use Shopware\Tests\Mink\Page\Frontend\Address\Elements\AddressBox;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\HelperSelectorInterface;
 
 class Account extends Page implements HelperSelectorInterface
 {
@@ -45,7 +47,7 @@ class Account extends Page implements HelperSelectorInterface
     /**
      * {@inheritdoc}
      */
-    public function getCssSelectors()
+    public function getCssSelectors(): array
     {
         return [
             'payment' => 'div.account--payment.account--box strong',
@@ -68,26 +70,26 @@ public function getCssSelectors()
     /**
      * {@inheritdoc}
      */
-    public function getNamedSelectors()
+    public function getNamedSelectors(): array
     {
         return [
-            'loginButton' => ['de' => 'Anmelden',                 'en' => 'Login'],
-            'forgotPasswordLink' => ['de' => 'Passwort vergessen?',      'en' => 'Forgot your password?'],
-            'sendButton' => ['de' => 'Weiter',                   'en' => 'Continue'],
-
-            'myAccountLink' => ['de' => 'Übersicht',                'en' => 'Overview'],
-            'profileLink' => ['de' => 'Persönliche Daten',        'en' => 'Profile'],
-            'addressesLink' => ['de' => 'Adressen',                 'en' => 'Addresses'],
-            'myOrdersLink' => ['de' => 'Bestellungen',             'en' => 'orders'],
-            'myEsdDownloadsLink' => ['de' => 'Sofortdownloads',          'en' => 'Instant downloads'],
-            'changePaymentLink' => ['de' => 'Zahlungsarten',            'en' => 'Payment methods'],
-            'noteLink' => ['de' => 'Merkzettel',               'en' => 'Wish list'],
-            'logoutLink' => ['de' => 'Abmelden',                 'en' => 'Logout'],
-
-            'changePaymentButton' => ['de' => 'Ändern',                   'en' => 'Change'],
-            'changeBillingButton' => ['de' => 'Adresse speichern',        'en' => 'Change address'],
-            'changeShippingButton' => ['de' => 'Adresse speichern',        'en' => 'Change address'],
-            'saveAddressButton' => ['de' => 'Adresse speichern',        'en' => 'Save address'],
+            'loginButton' => ['de' => 'Anmelden', 'en' => 'Login'],
+            'forgotPasswordLink' => ['de' => 'Passwort vergessen?', 'en' => 'Forgot your password?'],
+            'sendButton' => ['de' => 'Weiter', 'en' => 'Continue'],
+
+            'myAccountLink' => ['de' => 'Übersicht', 'en' => 'Overview'],
+            'profileLink' => ['de' => 'Persönliche Daten', 'en' => 'Profile'],
+            'addressesLink' => ['de' => 'Adressen', 'en' => 'Addresses'],
+            'myOrdersLink' => ['de' => 'Bestellungen', 'en' => 'orders'],
+            'myEsdDownloadsLink' => ['de' => 'Sofortdownloads', 'en' => 'Instant downloads'],
+            'changePaymentLink' => ['de' => 'Zahlungsarten', 'en' => 'Payment methods'],
+            'noteLink' => ['de' => 'Merkzettel', 'en' => 'Wish list'],
+            'logoutLink' => ['de' => 'Abmelden', 'en' => 'Logout'],
+
+            'changePaymentButton' => ['de' => 'Ändern', 'en' => 'Change'],
+            'changeBillingButton' => ['de' => 'Adresse speichern', 'en' => 'Change address'],
+            'changeShippingButton' => ['de' => 'Adresse speichern', 'en' => 'Change address'],
+            'saveAddressButton' => ['de' => 'Adresse speichern', 'en' => 'Save address'],
             'loginAgain' => ['de' => 'Erneut Anmelden', 'en' => 'Login again'],
         ];
     }
@@ -95,13 +97,9 @@ public function getNamedSelectors()
     /**
      * Verify if we're on an expected page. Throw an exception if not.
      *
-     * @param string $action
-     *
      * @throws Exception
-     *
-     * @return bool
      */
-    public function verifyPage($action = '')
+    public function verifyPage(string $action = ''): bool
     {
         if ($action === 'Dashboard' || empty($action)) {
             if ($this->verifyPageDashboard()) {
@@ -131,11 +129,8 @@ public function verifyPage($action = '')
 
     /**
      * Logins a user
-     *
-     * @param string $email
-     * @param string $password
      */
-    public function login($email, $password)
+    public function login(string $email, string $password): void
     {
         $this->fillField('email', $email);
         $this->fillField('password', $password);
@@ -143,7 +138,7 @@ public function login($email, $password)
         Helper::pressNamedButton($this, 'loginButton');
     }
 
-    public function clickLoginAgain()
+    public function clickLoginAgain(): void
     {
         Helper::clickNamedLink($this, 'loginAgain');
     }
@@ -151,11 +146,9 @@ public function clickLoginAgain()
     /**
      * Check if the user was successfully logged in
      *
-     * @param string $username
-     *
-     * @throws \Behat\Mink\Exception\ResponseTextException
+     * @throws ResponseTextException
      */
-    public function verifyLogin($username)
+    public function verifyLogin(string $username): void
     {
         $assert = new WebAssert($this->getSession());
         $assert->pageTextContains(
@@ -166,22 +159,16 @@ public function verifyLogin($username)
 
     /**
      * Logout a customer (important when using the Selenium driver)
-     *
-     * @return bool
      */
-    public function logout()
+    public function logout(): void
     {
         Helper::clickNamedLink($this, 'logoutLink');
     }
 
     /**
      * Changes the password of the user
-     *
-     * @param string $currentPassword
-     * @param string $password
-     * @param string $passwordConfirmation
      */
-    public function changePassword($currentPassword, $password, $passwordConfirmation = null)
+    public function changePassword(string $currentPassword, string $password, ?string $passwordConfirmation = null): void
     {
         $data = [
             [
@@ -194,7 +181,7 @@ public function changePassword($currentPassword, $password, $passwordConfirmatio
             ],
             [
                 'field' => 'password[passwordConfirmation]',
-                'value' => ($passwordConfirmation !== null) ? $passwordConfirmation : $password,
+                'value' => $passwordConfirmation ?? $password,
             ],
         ];
 
@@ -204,12 +191,8 @@ public function changePassword($currentPassword, $password, $passwordConfirmatio
 
     /**
      * Changes the email address of the user
-     *
-     * @param string $password
-     * @param string $email
-     * @param string $emailConfirmation
      */
-    public function changeEmail($password, $email, $emailConfirmation = null)
+    public function changeEmail(string $password, string $email, ?string $emailConfirmation = null): void
     {
         $data = [
             [
@@ -222,7 +205,7 @@ public function changeEmail($password, $email, $emailConfirmation = null)
             ],
             [
                 'field' => 'email[emailConfirmation]',
-                'value' => ($emailConfirmation !== null) ? $emailConfirmation : $email,
+                'value' => $emailConfirmation ?? $email,
             ],
         ];
 
@@ -270,7 +253,7 @@ public function createArbitraryAddress($values)
      */
     public function changePaymentMethod($data = [])
     {
-        $element = $this->getElement('AccountPayment');
+        $element = $this->getElement(AccountPayment::class);
         Helper::clickNamedLink($element, 'changeButton');
 
         Helper::fillForm($this, 'paymentForm', $data);
@@ -286,8 +269,7 @@ public function changePaymentMethod($data = [])
      */
     public function checkPaymentMethod($paymentMethod)
     {
-        /** @var AccountPayment $element */
-        $element = $this->getElement('AccountPayment');
+        $element = $this->getElement(AccountPayment::class);
 
         $properties = [
             'paymentMethod' => $paymentMethod,
@@ -299,7 +281,7 @@ public function checkPaymentMethod($paymentMethod)
             return;
         }
 
-        $message = sprintf(
+        $message = \sprintf(
             'The current payment method is "%s" (should be "%s")',
             $result['value'],
             $result['value2']
@@ -308,10 +290,7 @@ public function checkPaymentMethod($paymentMethod)
         Helper::throwException($message);
     }
 
-    /**
-     * @param string $orderNumber
-     */
-    public function checkOrder(AccountOrder $order, $orderNumber, array $articles)
+    public function checkOrder(AccountOrder $order, string $orderNumber, array $articles): void
     {
         $this->getSession()->executeScript('$(\'[data-collapse-panel]\').click()');
         sleep(1);
@@ -323,11 +302,8 @@ public function checkOrder(AccountOrder $order, $orderNumber, array $articles)
 
     /**
      * Checks the billing or shipping address
-     *
-     * @param string $type
-     * @param string $address
      */
-    public function checkAddress($type, $address)
+    public function checkAddress(string $type, string $address): void
     {
         $this->open();
 
@@ -339,12 +315,13 @@ public function checkAddress($type, $address)
         $type = strtolower($type);
         $type = ucfirst($type);
 
-        $addressBox = $this->getElement('Account' . $type);
+        /** @var class-string<AccountBilling|AccountShipping> $elementClass */
+        $elementClass = 'Account' . $type;
+        $addressBox = $this->getElement($elementClass);
         $addressData = Helper::getElementProperty($addressBox, 'address');
 
         $givenAddress = [];
 
-        /** @var Element $data */
         foreach ($addressData as $data) {
             $part = $data->getHtml();
             $parts = explode('<br />', $part);
@@ -365,7 +342,7 @@ public function checkAddress($type, $address)
             return;
         }
 
-        $message = sprintf(
+        $message = \sprintf(
             'The addresses are different! ("%s" not was found in "%s")',
             $result['value2'],
             $result['value']
@@ -384,20 +361,12 @@ public function register(array $data)
         Helper::pressNamedButton($this, 'sendButton');
     }
 
-    /**
-     * @param string $name
-     */
-    public function chooseAddress(AddressBox $addresses, $name)
+    public function chooseAddress(AddressBox $addresses, string $name): void
     {
         $this->searchAddress($addresses, $name);
     }
 
-    /**
-     * @param string $salutation
-     * @param string $firstname
-     * @param string $lastname
-     */
-    public function changeProfile($salutation, $firstname, $lastname)
+    public function changeProfile(string $salutation, string $firstname, string $lastname): void
     {
         $data = [
             [
@@ -426,15 +395,15 @@ public function changeProfile($salutation, $firstname, $lastname)
     protected function verifyPageDashboard()
     {
         return (Helper::hasNamedLinks($this, [
-                'myAccountLink',
-                'profileLink',
-                'addressesLink',
-                'myOrdersLink',
-                'myEsdDownloadsLink',
-                'changePaymentLink',
-                'noteLink',
-                'logoutLink',
-            ]) === true) ?: false;
+            'myAccountLink',
+            'profileLink',
+            'addressesLink',
+            'myOrdersLink',
+            'myEsdDownloadsLink',
+            'changePaymentLink',
+            'noteLink',
+            'logoutLink',
+        ]) === true) ?: false;
     }
 
     /**
@@ -491,15 +460,12 @@ protected function verifyPageRegister()
     }
 
     /**
-     * @param string $name
-     *
      * @throws Exception
      */
-    protected function searchAddress(AddressBox $addresses, $name)
+    protected function searchAddress(AddressBox $addresses, string $name): void
     {
-        /** @var AddressBox $address */
         foreach ($addresses as $address) {
-            if (strpos($address->getProperty('title'), $name) === false) {
+            if (!str_contains($address->getProperty('title'), $name)) {
                 continue;
             }
 
@@ -510,7 +476,6 @@ protected function searchAddress(AddressBox $addresses, $name)
 
         $messages = ['The address "' . $name . '" is not available. Available are:'];
 
-        /** @var AddressBox $address */
         foreach ($addresses as $address) {
             $messages[] = $address->getProperty('title');
         }
@@ -520,10 +485,8 @@ protected function searchAddress(AddressBox $addresses, $name)
 
     /**
      * Helper method checks the order number
-     *
-     * @param string $orderNumber
      */
-    private function checkOrderNumber(AccountOrder $order, $orderNumber)
+    private function checkOrderNumber(AccountOrder $order, string $orderNumber): void
     {
         $properties = [
             'number' => $orderNumber,
@@ -535,7 +498,7 @@ private function checkOrderNumber(AccountOrder $order, $orderNumber)
             return;
         }
 
-        $message = sprintf(
+        $message = \sprintf(
             'The order number is "%s" (should be "%s")',
             $result['value'],
             $result['value2']
@@ -571,7 +534,7 @@ private function checkOrderPositions(AccountOrder $order, array $articles)
             return;
         }
 
-        $message = sprintf(
+        $message = \sprintf(
             'The %s of a position is different! (is "%s", should be "%s")',
             $result['key'],
             $result['value'],
@@ -583,11 +546,9 @@ private function checkOrderPositions(AccountOrder $order, array $articles)
     /**
      * Helper method checks the ESD articles
      *
-     * @param string $date
-     *
      * @throws Exception
      */
-    private function checkEsdArticles($date, array $articles)
+    private function checkEsdArticles(string $date, array $articles)
     {
         $esd = [];
 
@@ -609,9 +570,8 @@ private function checkEsdArticles($date, array $articles)
         $locator = Helper::getRequiredSelector($this, 'esdDownloadName');
         $downloads = [];
 
-        /** @var NodeElement $esdDownload */
         foreach ($elements['esdDownloads'] as $esdDownload) {
-            if (strpos($esdDownload->getText(), $date) !== false) {
+            if (str_contains($esdDownload->getText(), $date)) {
                 $downloads[] = $this->find('css', $locator)->getText();
             }
         }
@@ -623,7 +583,7 @@ private function checkEsdArticles($date, array $articles)
                 }
 
                 if ($download === end($downloads)) {
-                    $message = sprintf('ESD-Article "%s" not found in account!', $givenEsd);
+                    $message = \sprintf('ESD-Article "%s" not found in account!', $givenEsd);
                     Helper::throwException($message);
                 }
             }
diff --git a/tests/Mink/features/bootstrap/Element/AccountBilling.php b/tests/Mink/Page/Frontend/Account/Elements/AccountBilling.php
similarity index 68%
rename from tests/Mink/features/bootstrap/Element/AccountBilling.php
rename to tests/Mink/Page/Frontend/Account/Elements/AccountBilling.php
index f32f8e11f22..6d1cf19976b 100644
--- a/tests/Mink/features/bootstrap/Element/AccountBilling.php
+++ b/tests/Mink/Page/Frontend/Account/Elements/AccountBilling.php
@@ -1,31 +1,33 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Frontend\Account\Elements;
 
 use SensioLabs\Behat\PageObjectExtension\PageObject\Element;
-use Shopware\Tests\Mink\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\HelperSelectorInterface;
 
 /**
  * Element: AccountBilling
@@ -34,7 +36,7 @@
  * Available retrievable properties:
  * - address (Element[], please use Account::checkAddress())
  */
-class AccountBilling extends Element implements \Shopware\Tests\Mink\HelperSelectorInterface
+class AccountBilling extends Element implements HelperSelectorInterface
 {
     /**
      * @var array
diff --git a/tests/Mink/features/bootstrap/Element/AccountOrder.php b/tests/Mink/Page/Frontend/Account/Elements/AccountOrder.php
similarity index 84%
rename from tests/Mink/features/bootstrap/Element/AccountOrder.php
rename to tests/Mink/Page/Frontend/Account/Elements/AccountOrder.php
index 330d184befa..9144deb46f6 100644
--- a/tests/Mink/features/bootstrap/Element/AccountOrder.php
+++ b/tests/Mink/Page/Frontend/Account/Elements/AccountOrder.php
@@ -1,31 +1,33 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Frontend\Account\Elements;
 
 use Behat\Mink\Element\NodeElement;
-use Shopware\Tests\Mink\Helper;
+use Shopware\Tests\Mink\Page\Helper\Elements\MultipleElement;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
 
 /**
  * Element: AccountOrder
@@ -37,7 +39,7 @@
 class AccountOrder extends MultipleElement
 {
     /**
-     * @var array
+     * @var array<string, string>
      */
     protected $selector = ['css' => '.order--item'];
 
@@ -105,7 +107,6 @@ public function getPositions($locators = ['product', 'currentPrice', 'quantity',
         $elements = Helper::findAllOfElements($this, ['positions']);
         $positions = [];
 
-        /** @var NodeElement $position */
         foreach ($elements['positions'] as $position) {
             $positions[] = $this->getOrderPositionData($position, $selectors);
         }
diff --git a/tests/Mink/features/bootstrap/Element/AccountPayment.php b/tests/Mink/Page/Frontend/Account/Elements/AccountPayment.php
similarity index 68%
rename from tests/Mink/features/bootstrap/Element/AccountPayment.php
rename to tests/Mink/Page/Frontend/Account/Elements/AccountPayment.php
index 1af304631b5..60170e8cad7 100644
--- a/tests/Mink/features/bootstrap/Element/AccountPayment.php
+++ b/tests/Mink/Page/Frontend/Account/Elements/AccountPayment.php
@@ -1,31 +1,33 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Frontend\Account\Elements;
 
 use SensioLabs\Behat\PageObjectExtension\PageObject\Element;
-use Shopware\Tests\Mink\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\HelperSelectorInterface;
 
 /**
  * Element: AccountPayment
@@ -34,7 +36,7 @@
  * Available retrievable properties:
  * -
  */
-class AccountPayment extends Element implements \Shopware\Tests\Mink\HelperSelectorInterface
+class AccountPayment extends Element implements HelperSelectorInterface
 {
     /**
      * @var array
diff --git a/tests/Mink/features/bootstrap/Element/AccountShipping.php b/tests/Mink/Page/Frontend/Account/Elements/AccountShipping.php
similarity index 68%
rename from tests/Mink/features/bootstrap/Element/AccountShipping.php
rename to tests/Mink/Page/Frontend/Account/Elements/AccountShipping.php
index 6e302710fd7..441a188c2d8 100644
--- a/tests/Mink/features/bootstrap/Element/AccountShipping.php
+++ b/tests/Mink/Page/Frontend/Account/Elements/AccountShipping.php
@@ -1,31 +1,33 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Frontend\Account\Elements;
 
 use SensioLabs\Behat\PageObjectExtension\PageObject\Element;
-use Shopware\Tests\Mink\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\HelperSelectorInterface;
 
 /**
  * Element: AccountShipping
@@ -34,7 +36,7 @@
  * Available retrievable properties:
  * - address (Element[], please use Account::checkAddress())
  */
-class AccountShipping extends Element implements \Shopware\Tests\Mink\HelperSelectorInterface
+class AccountShipping extends Element implements HelperSelectorInterface
 {
     /**
      * @var array
diff --git a/tests/Mink/features/bootstrap/Page/Address.php b/tests/Mink/Page/Frontend/Address/Address.php
similarity index 50%
rename from tests/Mink/features/bootstrap/Page/Address.php
rename to tests/Mink/Page/Frontend/Address/Address.php
index 3f1ae103c73..e816e5fbcf9 100644
--- a/tests/Mink/features/bootstrap/Page/Address.php
+++ b/tests/Mink/Page/Frontend/Address/Address.php
@@ -1,32 +1,33 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Page;
+namespace Shopware\Tests\Mink\Page\Frontend\Address;
 
-use Shopware\Tests\Mink\HelperSelectorInterface;
+use Shopware\Tests\Mink\Page\Frontend\Account\Account;
 
-class Address extends Account implements HelperSelectorInterface
+class Address extends Account
 {
     /**
      * @var string
@@ -36,7 +37,7 @@ class Address extends Account implements HelperSelectorInterface
     /**
      * {@inheritdoc}
      */
-    public function getCssSelectors()
+    public function getCssSelectors(): array
     {
         return [
             'addressForm' => 'div.account--address-form form',
diff --git a/tests/Mink/features/bootstrap/Page/AddressDelete.php b/tests/Mink/Page/Frontend/Address/AddressDelete.php
similarity index 52%
rename from tests/Mink/features/bootstrap/Page/AddressDelete.php
rename to tests/Mink/Page/Frontend/Address/AddressDelete.php
index a7c1b1ab857..b0be35a7ebf 100644
--- a/tests/Mink/features/bootstrap/Page/AddressDelete.php
+++ b/tests/Mink/Page/Frontend/Address/AddressDelete.php
@@ -1,32 +1,33 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Page;
+namespace Shopware\Tests\Mink\Page\Frontend\Address;
 
-use Shopware\Tests\Mink\HelperSelectorInterface;
+use Shopware\Tests\Mink\Page\Frontend\Account\Account;
 
-class AddressDelete extends Account implements HelperSelectorInterface
+class AddressDelete extends Account
 {
     /**
      * @var string
@@ -36,14 +37,14 @@ class AddressDelete extends Account implements HelperSelectorInterface
     /**
      * {@inheritdoc}
      */
-    public function getCssSelectors()
+    public function getCssSelectors(): array
     {
         return [
             'panelTitle' => 'h1.panel--title',
         ];
     }
 
-    public function getNamedSelectors()
+    public function getNamedSelectors(): array
     {
         return [
             'confirmDeleteButton' => ['de' => 'Bestätigen', 'en' => 'Confirm'],
diff --git a/tests/Mink/features/bootstrap/Page/AddressEdit.php b/tests/Mink/Page/Frontend/Address/AddressEdit.php
similarity index 53%
rename from tests/Mink/features/bootstrap/Page/AddressEdit.php
rename to tests/Mink/Page/Frontend/Address/AddressEdit.php
index 71b1ea72af7..685054e3bb2 100644
--- a/tests/Mink/features/bootstrap/Page/AddressEdit.php
+++ b/tests/Mink/Page/Frontend/Address/AddressEdit.php
@@ -1,32 +1,33 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Page;
+namespace Shopware\Tests\Mink\Page\Frontend\Address;
 
-use Shopware\Tests\Mink\HelperSelectorInterface;
+use Shopware\Tests\Mink\Page\Frontend\Account\Account;
 
-class AddressEdit extends Account implements HelperSelectorInterface
+class AddressEdit extends Account
 {
     /**
      * @var string
@@ -36,14 +37,14 @@ class AddressEdit extends Account implements HelperSelectorInterface
     /**
      * {@inheritdoc}
      */
-    public function getCssSelectors()
+    public function getCssSelectors(): array
     {
         return [
             'addressForm' => 'div.address-form--panel',
         ];
     }
 
-    public function getNamedSelectors()
+    public function getNamedSelectors(): array
     {
         return [
             'saveAddressButton' => ['de' => 'Adresse speichern', 'en' => 'Save address'],
diff --git a/tests/Mink/features/bootstrap/Element/AddressBox.php b/tests/Mink/Page/Frontend/Address/Elements/AddressBox.php
similarity index 64%
rename from tests/Mink/features/bootstrap/Element/AddressBox.php
rename to tests/Mink/Page/Frontend/Address/Elements/AddressBox.php
index ac20b4d3431..5336e6e0a7c 100644
--- a/tests/Mink/features/bootstrap/Element/AddressBox.php
+++ b/tests/Mink/Page/Frontend/Address/Elements/AddressBox.php
@@ -1,28 +1,31 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Frontend\Address\Elements;
+
+use Shopware\Tests\Mink\Page\Helper\Elements\MultipleElement;
 
 /**
  * Element: AddressBox
@@ -34,7 +37,7 @@
 class AddressBox extends MultipleElement
 {
     /**
-     * @var array
+     * @var array<string, string>
      */
     protected $selector = ['css' => 'div.address--container .panel'];
 
diff --git a/tests/Mink/features/bootstrap/Element/AddressManagementAddressBox.php b/tests/Mink/Page/Frontend/Address/Elements/AddressManagementAddressBox.php
similarity index 83%
rename from tests/Mink/features/bootstrap/Element/AddressManagementAddressBox.php
rename to tests/Mink/Page/Frontend/Address/Elements/AddressManagementAddressBox.php
index 790822be9d8..d3f0369e246 100644
--- a/tests/Mink/features/bootstrap/Element/AddressManagementAddressBox.php
+++ b/tests/Mink/Page/Frontend/Address/Elements/AddressManagementAddressBox.php
@@ -1,30 +1,32 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Frontend\Address\Elements;
 
-use Shopware\Tests\Mink\Helper;
+use Shopware\Tests\Mink\Page\Helper\Elements\MultipleElement;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
 
 /**
  * Element: AddressManagementAddressBox
@@ -36,7 +38,7 @@
 class AddressManagementAddressBox extends MultipleElement
 {
     /**
-     * @var array
+     * @var array<string, string>
      */
     protected $selector = ['css' => 'div.address--box'];
 
diff --git a/tests/Mink/features/bootstrap/Element/Article.php b/tests/Mink/Page/Frontend/Article/Elements/Article.php
similarity index 67%
rename from tests/Mink/features/bootstrap/Element/Article.php
rename to tests/Mink/Page/Frontend/Article/Elements/Article.php
index 0382832975a..68faec0d8b8 100644
--- a/tests/Mink/features/bootstrap/Element/Article.php
+++ b/tests/Mink/Page/Frontend/Article/Elements/Article.php
@@ -1,30 +1,32 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Frontend\Article\Elements;
 
-use Shopware\Tests\Mink\Helper;
+use Shopware\Tests\Mink\Page\Helper\Elements\MultipleElement;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
 
 /**
  * Element: Article
@@ -39,17 +41,17 @@
  * Currently not retrievable properties:
  * - image (string)
  */
-class Article extends MultipleElement implements \Shopware\Tests\Mink\HelperSelectorInterface
+class Article extends MultipleElement
 {
     /**
-     * @var array
+     * @var array<string, string>
      */
     protected $selector = ['css' => 'div.emotion--product'];
 
     /**
      * {@inheritdoc}
      */
-    public function getCssSelectors()
+    public function getCssSelectors(): array
     {
         return [
             'name' => '.product--title',
@@ -58,10 +60,7 @@ public function getCssSelectors()
         ];
     }
 
-    /**
-     * @return string
-     */
-    public function getNameProperty()
+    public function getNameProperty(): string
     {
         $elements = Helper::findElements($this, ['name', 'link']);
 
@@ -74,20 +73,14 @@ public function getNameProperty()
         return Helper::getUnique($names);
     }
 
-    /**
-     * @return string
-     */
-    public function getImageProperty()
+    public function getImageProperty(): string
     {
         $elements = Helper::findElements($this, ['image']);
 
         return $elements['image']->getAttribute('src');
     }
 
-    /**
-     * @return string
-     */
-    public function getLinkProperty()
+    public function getLinkProperty(): string
     {
         $elements = Helper::findElements($this, ['name', 'link']);
 
@@ -99,10 +92,7 @@ public function getLinkProperty()
         return Helper::getUnique($links);
     }
 
-    /**
-     * @return float
-     */
-    public function getPriceProperty()
+    public function getPriceProperty(): float
     {
         $elements = Helper::findElements($this, ['price']);
 
diff --git a/tests/Mink/features/bootstrap/Element/ArticleBox.php b/tests/Mink/Page/Frontend/Article/Elements/ArticleBox.php
similarity index 61%
rename from tests/Mink/features/bootstrap/Element/ArticleBox.php
rename to tests/Mink/Page/Frontend/Article/Elements/ArticleBox.php
index 4e5b35606f0..f7b11a77376 100644
--- a/tests/Mink/features/bootstrap/Element/ArticleBox.php
+++ b/tests/Mink/Page/Frontend/Article/Elements/ArticleBox.php
@@ -1,30 +1,32 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Frontend\Article\Elements;
 
-use Shopware\Tests\Mink\Helper;
+use Shopware\Tests\Mink\Page\Helper\Elements\MultipleElement;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
 
 /**
  * Element: ArticleBox
@@ -33,17 +35,17 @@
  * Available retrievable properties:
  * - address (Element[], please use Account::checkAddress())
  */
-class ArticleBox extends CartPosition
+class ArticleBox extends MultipleElement
 {
     /**
-     * @var array
+     * @var array<string, string>
      */
     protected $selector = ['css' => 'div.product--box.box--basic'];
 
     /**
      * {@inheritdoc}
      */
-    public function getCssSelectors()
+    public function getCssSelectors(): array
     {
         return [
             'name' => 'div.product--info > a:product--title',
@@ -54,7 +56,7 @@ public function getCssSelectors()
     /**
      * {@inheritdoc}
      */
-    public function getNamedSelectors()
+    public function getNamedSelectors(): array
     {
         return [
             'compare' => ['de' => 'Vergleichen',  'en' => 'Compare'],
@@ -64,10 +66,8 @@ public function getNamedSelectors()
 
     /**
      * Returns the price
-     *
-     * @return float
      */
-    public function getPriceProperty()
+    public function getPriceProperty(): float
     {
         $price = $this->getProperty('price');
 
diff --git a/tests/Mink/features/bootstrap/Element/ArticleEvaluation.php b/tests/Mink/Page/Frontend/Article/Elements/ArticleEvaluation.php
similarity index 73%
rename from tests/Mink/features/bootstrap/Element/ArticleEvaluation.php
rename to tests/Mink/Page/Frontend/Article/Elements/ArticleEvaluation.php
index 4c1ceaac869..30e04449b69 100644
--- a/tests/Mink/features/bootstrap/Element/ArticleEvaluation.php
+++ b/tests/Mink/Page/Frontend/Article/Elements/ArticleEvaluation.php
@@ -1,30 +1,32 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Frontend\Article\Elements;
 
-use Shopware\Tests\Mink\Helper;
+use Shopware\Tests\Mink\Page\Frontend\Blog\Elements\BlogComment;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
 
 /**
  * Element: ArticleEvaluation
@@ -36,7 +38,7 @@
 class ArticleEvaluation extends BlogComment
 {
     /**
-     * @var array
+     * @var array<string, string>
      */
     protected $selector = ['css' => 'div.review--entry:not(.is--answer)'];
 
diff --git a/tests/Mink/features/bootstrap/Element/ArticleSlider.php b/tests/Mink/Page/Frontend/Article/Elements/ArticleSlider.php
similarity index 75%
rename from tests/Mink/features/bootstrap/Element/ArticleSlider.php
rename to tests/Mink/Page/Frontend/Article/Elements/ArticleSlider.php
index b4eec91cd39..d68d379b244 100644
--- a/tests/Mink/features/bootstrap/Element/ArticleSlider.php
+++ b/tests/Mink/Page/Frontend/Article/Elements/ArticleSlider.php
@@ -1,31 +1,33 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Frontend\Article\Elements;
 
 use Behat\Mink\Element\NodeElement;
-use Shopware\Tests\Mink\Helper;
+use Shopware\Tests\Mink\Page\Frontend\Homepage\Elements\SliderElement;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
 
 /**
  * Element: ArticleSlider
@@ -37,10 +39,10 @@
  * - alt (string, e.g. "foo")
  * - title (string, e.g. "bar")
  */
-class ArticleSlider extends SliderElement implements \Shopware\Tests\Mink\HelperSelectorInterface
+class ArticleSlider extends SliderElement
 {
     /**
-     * @var array
+     * @var array<string, string>
      */
     protected $selector = ['css' => 'div.emotion--product-slider'];
 
@@ -108,14 +110,17 @@ public function getNameProperty(NodeElement $slide)
 
     /**
      * Returns the price
-     *
-     * @return float
      */
-    public function getPriceProperty(NodeElement $slide)
+    public function getPriceProperty(NodeElement $slide): float
     {
         $selector = Helper::getRequiredSelector($this, 'slidePrice');
         preg_match('(\d+,\d{2})', $slide->find('css', $selector)->getHtml(), $price);
 
-        return Helper::floatValue(current($price));
+        $currentPrice = current($price);
+        if ($currentPrice === false) {
+            return 0.0;
+        }
+
+        return Helper::floatValue($currentPrice);
     }
 }
diff --git a/tests/Mink/features/bootstrap/Page/Blog.php b/tests/Mink/Page/Frontend/Blog/Blog.php
similarity index 78%
rename from tests/Mink/features/bootstrap/Page/Blog.php
rename to tests/Mink/Page/Frontend/Blog/Blog.php
index 8185822d092..4d63fd7bdfd 100644
--- a/tests/Mink/features/bootstrap/Page/Blog.php
+++ b/tests/Mink/Page/Frontend/Blog/Blog.php
@@ -1,34 +1,35 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Page;
+namespace Shopware\Tests\Mink\Page\Frontend\Blog;
 
 use Exception;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Page;
-use Shopware\Tests\Mink\Element\BlogComment;
-use Shopware\Tests\Mink\Helper;
-use Shopware\Tests\Mink\HelperSelectorInterface;
+use Shopware\Tests\Mink\Page\Frontend\Blog\Elements\BlogComment;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\HelperSelectorInterface;
 
 class Blog extends Page implements HelperSelectorInterface
 {
@@ -92,11 +93,9 @@ public function writeComment(array $data)
     /**
      * Checks the evaluations of the current article
      *
-     * @param string $average
-     *
      * @throws Exception
      */
-    public function checkComments(BlogComment $blogComments, $average, array $comments)
+    public function checkComments(BlogComment $blogComments, string $average, array $comments)
     {
         $this->checkRating($blogComments, $average);
 
@@ -109,7 +108,7 @@ public function checkComments(BlogComment $blogComments, $average, array $commen
 
         $messages = ['The following comments are wrong:'];
         foreach ($result as $evaluation) {
-            $messages[] = sprintf(
+            $messages[] = \sprintf(
                 '%s - Bewertung: %s (%s is "%s", should be "%s")',
                 $evaluation['properties']['author'],
                 $evaluation['properties']['stars'],
@@ -135,11 +134,9 @@ public function openCommentSection()
     /**
      * Helper function to check the rating of a blog comment
      *
-     * @param string $average
-     *
      * @throws Exception
      */
-    protected function checkRating(BlogComment $blogComments, $average)
+    protected function checkRating(BlogComment $blogComments, string $average): void
     {
         $elements = Helper::findElements($this, ['articleRating', 'articleRatingCount']);
 
@@ -152,7 +149,7 @@ protected function checkRating(BlogComment $blogComments, $average)
         $result = Helper::checkArray($check);
 
         if ($result !== true) {
-            $message = sprintf('There was a different value of the rating! (%s: "%s" instead of "%s")', $result, $check[$result][0], $check[$result][1]);
+            $message = \sprintf('There was a different value of the rating! (%s: "%s" instead of "%s")', $result, $check[$result][0], $check[$result][1]);
             Helper::throwException($message);
         }
     }
diff --git a/tests/Mink/features/bootstrap/Element/BlogArticle.php b/tests/Mink/Page/Frontend/Blog/Elements/BlogArticle.php
similarity index 72%
rename from tests/Mink/features/bootstrap/Element/BlogArticle.php
rename to tests/Mink/Page/Frontend/Blog/Elements/BlogArticle.php
index c9c581a1ff3..d888a206d42 100644
--- a/tests/Mink/features/bootstrap/Element/BlogArticle.php
+++ b/tests/Mink/Page/Frontend/Blog/Elements/BlogArticle.php
@@ -1,32 +1,34 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Frontend\Blog\Elements;
 
 use Behat\Mink\Element\NodeElement;
 use Exception;
-use Shopware\Tests\Mink\Helper;
+use Shopware\Tests\Mink\Page\Helper\Elements\MultipleElement;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
 
 /**
  * Element: BlogArticle
@@ -38,17 +40,17 @@
  * - alt (string, e.g. "foo")
  * - title (string, e.g. "bar")
  */
-class BlogArticle extends MultipleElement implements \Shopware\Tests\Mink\HelperSelectorInterface
+class BlogArticle extends MultipleElement
 {
     /**
-     * @var array
+     * @var array<string, string>
      */
     protected $selector = ['css' => 'div.emotion--blog'];
 
     /**
      * {@inheritdoc}
      */
-    public function getCssSelectors()
+    public function getCssSelectors(): array
     {
         return [
             'article' => '.blog--entry',
@@ -65,13 +67,12 @@ public function getCssSelectors()
      *
      * @return array[]
      */
-    public function getArticles(array $properties)
+    public function getArticles(array $properties): array
     {
         $elements = Helper::findAllOfElements($this, ['article']);
 
         $articles = [];
 
-        /** @var NodeElement $article */
         foreach ($elements['article'] as $article) {
             $articleProperties = [];
 
@@ -88,10 +89,8 @@ public function getArticles(array $properties)
 
     /**
      * Returns the title of the blog article
-     *
-     * @return string
      */
-    public function getTitleProperty(NodeElement $article)
+    public function getTitleProperty(NodeElement $article): string
     {
         $selectors = Helper::getRequiredSelectors($this, ['articleTitle', 'articleLink']);
 
@@ -108,10 +107,8 @@ public function getTitleProperty(NodeElement $article)
 
     /**
      * Returns the image of the blog article
-     *
-     * @return string|null
      */
-    public function getImageProperty(NodeElement $article)
+    public function getImageProperty(NodeElement $article): ?string
     {
         $selector = Helper::getRequiredSelector($this, 'articleLink');
 
@@ -120,10 +117,8 @@ public function getImageProperty(NodeElement $article)
 
     /**
      * Returns the link to the blog article
-     *
-     * @return string
      */
-    public function getLinkProperty(NodeElement $article)
+    public function getLinkProperty(NodeElement $article): string
     {
         $selectors = Helper::getRequiredSelectors($this, ['articleTitle', 'articleLink']);
 
@@ -137,10 +132,8 @@ public function getLinkProperty(NodeElement $article)
 
     /**
      * Returns the text preview of the blog article
-     *
-     * @return string|null
      */
-    public function getTextProperty(NodeElement $article)
+    public function getTextProperty(NodeElement $article): ?string
     {
         $selector = Helper::getRequiredSelector($this, 'articleText');
 
@@ -153,19 +146,17 @@ public function getTextProperty(NodeElement $article)
      * @param string[] $titles
      *
      * @throws Exception
-     *
-     * @return string
      */
-    protected function getUniqueTitle(array $titles)
+    protected function getUniqueTitle(array $titles): string
     {
         $title = array_unique($titles);
 
         switch (\count($title)) {
-            //normal case
+            // normal case
             case 1:
                 return current($title);
 
-            //if blog article name is too long, it will be cut. So it's different from the other and has to be checked separately
+                // if blog article name is too long, it will be cut. So it's different from the other and has to be checked separately
             case 2:
                 $check = [$title];
                 $result = Helper::checkArray($check);
@@ -179,7 +170,7 @@ protected function getUniqueTitle(array $titles)
         if ($result !== true) {
             $messages = ['The blog article has different titles!'];
             foreach ($title as $key => $value) {
-                $messages[] = sprintf('"%s" (Key: "%s")', $value, $key);
+                $messages[] = \sprintf('"%s" (Key: "%s")', $value, $key);
             }
 
             Helper::throwException($messages);
diff --git a/tests/Mink/features/bootstrap/Element/BlogArticleBox.php b/tests/Mink/Page/Frontend/Blog/Elements/BlogArticleBox.php
similarity index 57%
rename from tests/Mink/features/bootstrap/Element/BlogArticleBox.php
rename to tests/Mink/Page/Frontend/Blog/Elements/BlogArticleBox.php
index ec109f7f04e..0a9319b9b5d 100644
--- a/tests/Mink/features/bootstrap/Element/BlogArticleBox.php
+++ b/tests/Mink/Page/Frontend/Blog/Elements/BlogArticleBox.php
@@ -1,28 +1,31 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Frontend\Blog\Elements;
+
+use Shopware\Tests\Mink\Page\Frontend\Article\Elements\ArticleBox;
 
 /**
  * Element: BlogArticleBox
@@ -34,7 +37,7 @@
 class BlogArticleBox extends ArticleBox
 {
     /**
-     * @var array
+     * @var array<string, string>
      */
     protected $selector = ['css' => 'div.blog--crossselling div.product-slider--item'];
 }
diff --git a/tests/Mink/features/bootstrap/Element/BlogBox.php b/tests/Mink/Page/Frontend/Blog/Elements/BlogBox.php
similarity index 56%
rename from tests/Mink/features/bootstrap/Element/BlogBox.php
rename to tests/Mink/Page/Frontend/Blog/Elements/BlogBox.php
index cf10008a3c4..bcbe7d0cf56 100644
--- a/tests/Mink/features/bootstrap/Element/BlogBox.php
+++ b/tests/Mink/Page/Frontend/Blog/Elements/BlogBox.php
@@ -1,28 +1,31 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Frontend\Blog\Elements;
+
+use Shopware\Tests\Mink\Page\Helper\Elements\MultipleElement;
 
 /**
  * Element: BlogBox
@@ -31,17 +34,17 @@
  * Available retrievable properties:
  * - address (Element[], please use Account::checkAddress())
  */
-class BlogBox extends CartPosition
+class BlogBox extends MultipleElement
 {
     /**
-     * @var array
+     * @var array<string, string>
      */
     protected $selector = ['css' => 'div.blog--box.panel'];
 
     /**
      * {@inheritdoc}
      */
-    public function getCssSelectors()
+    public function getCssSelectors(): array
     {
         return [];
     }
@@ -49,7 +52,7 @@ public function getCssSelectors()
     /**
      * {@inheritdoc}
      */
-    public function getNamedSelectors()
+    public function getNamedSelectors(): array
     {
         return [
             'readMore' => ['de' => 'Mehr lesen', 'en' => 'Read more'],
diff --git a/tests/Mink/features/bootstrap/Element/BlogComment.php b/tests/Mink/Page/Frontend/Blog/Elements/BlogComment.php
similarity index 80%
rename from tests/Mink/features/bootstrap/Element/BlogComment.php
rename to tests/Mink/Page/Frontend/Blog/Elements/BlogComment.php
index a9d83c9b658..546ce6fdbbb 100644
--- a/tests/Mink/features/bootstrap/Element/BlogComment.php
+++ b/tests/Mink/Page/Frontend/Blog/Elements/BlogComment.php
@@ -1,31 +1,33 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Frontend\Blog\Elements;
 
 use Behat\Mink\Element\NodeElement;
-use Shopware\Tests\Mink\Helper;
+use Shopware\Tests\Mink\Page\Helper\Elements\MultipleElement;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
 
 /**
  * Element: BlogComment
@@ -37,7 +39,7 @@
 class BlogComment extends MultipleElement
 {
     /**
-     * @var array
+     * @var array<string, string>
      */
     protected $selector = ['css' => 'ul.comments--list > li.list--entry'];
 
diff --git a/tests/Mink/features/bootstrap/Page/CheckoutCart.php b/tests/Mink/Page/Frontend/Checkout/CheckoutCart.php
similarity index 64%
rename from tests/Mink/features/bootstrap/Page/CheckoutCart.php
rename to tests/Mink/Page/Frontend/Checkout/CheckoutCart.php
index c213090c2d5..195a1aafef8 100644
--- a/tests/Mink/features/bootstrap/Page/CheckoutCart.php
+++ b/tests/Mink/Page/Frontend/Checkout/CheckoutCart.php
@@ -5,33 +5,36 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Page;
+namespace Shopware\Tests\Mink\Page\Frontend\Checkout;
 
+use Behat\Mink\Exception\ResponseTextException;
 use Exception;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Page;
-use Shopware\Tests\Mink\Element\CartPosition;
-use Shopware\Tests\Mink\Helper;
+use Shopware\Tests\Mink\Page\Frontend\Account\Account;
+use Shopware\Tests\Mink\Page\Frontend\Checkout\Elements\CartPositionProduct;
+use Shopware\Tests\Mink\Page\Frontend\Checkout\Elements\CartPositionRebate;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\HelperSelectorInterface;
 
-class CheckoutCart extends Page implements \Shopware\Tests\Mink\HelperSelectorInterface
+class CheckoutCart extends Page implements HelperSelectorInterface
 {
     /**
      * @var string
@@ -41,7 +44,7 @@ class CheckoutCart extends Page implements \Shopware\Tests\Mink\HelperSelectorIn
     /**
      * {@inheritdoc}
      */
-    public function getCssSelectors()
+    public function getCssSelectors(): array
     {
         return [
             'aggregationAmounts' => 'ul.aggregation--list',
@@ -66,27 +69,25 @@ public function getCssSelectors()
     /**
      * {@inheritdoc}
      */
-    public function getNamedSelectors()
+    public function getNamedSelectors(): array
     {
         return [
-            'checkout' => ['de' => 'Zur Kasse',   'en' => 'Checkout'],
-            'sum' => ['de' => 'Summe:', 'en' => 'Proceed to checkout'],
-            'shipping' => ['de' => 'Versandkosten:', 'en' => 'Proceed to checkout'],
-            'total' => ['de' => 'Gesamtsumme:', 'en' => 'Proceed to checkout'],
-            'sumWithoutVat' => ['de' => 'Gesamtsumme ohne MwSt.:', 'en' => 'Proceed to checkout'],
-            'tax' => ['de' => 'zzgl. %d' . html_entity_decode('&nbsp;') . '%% MwSt.:', 'en' => 'Proceed to checkout'],
-            'changePaymentButton' => ['de' => 'Weiter', 'en' => 'Next'],
+            'checkout' => ['de' => 'Zur Kasse', 'en' => 'Checkout'],
+            'sum' => ['de' => 'Summe:', 'en' => 'Sum:'],
+            'shipping' => ['de' => 'Versandkosten:', 'en' => 'Shipping costs:'],
+            'total' => ['de' => 'Gesamtsumme:', 'en' => 'Total amount:'],
+            'sumWithoutVat' => ['de' => 'Gesamtsumme ohne MwSt.:', 'en' => 'Total amount without VAT:'],
+            'tax' => ['de' => 'zzgl. %d %% MwSt.:', 'en' => 'Plus %d %% VAT:'],
+            'changePaymentButton' => ['de' => 'Weiter', 'en' => 'Next:'],
         ];
     }
 
     /**
      * Checks the aggregation
      *
-     * @param array $aggregation
-     *
      * @throws Exception
      */
-    public function checkAggregation($aggregation)
+    public function checkAggregation(array $aggregation): void
     {
         $elements = Helper::findAllOfElements($this, ['aggregationLabels', 'aggregationValues']);
         $lang = Helper::getCurrentLanguage();
@@ -107,7 +108,7 @@ public function checkAggregation($aggregation)
         $result = Helper::checkArray($check);
 
         if ($result !== true) {
-            $message = sprintf(
+            $message = \sprintf(
                 'The value of "%s" is "%s"! (should be "%s")',
                 $result,
                 $check[$result][1],
@@ -120,10 +121,8 @@ public function checkAggregation($aggregation)
 
     /**
      * Adds a voucher to the cart
-     *
-     * @param string $voucher
      */
-    public function addVoucher($voucher)
+    public function addVoucher(string $voucher): void
     {
         $elements = Helper::findElements($this, ['addVoucherInput', 'addVoucherSubmit']);
 
@@ -133,21 +132,19 @@ public function addVoucher($voucher)
 
     /**
      * Adds an article to the cart
-     *
-     * @param string $article
      */
-    public function addArticle($article)
+    public function addProduct(string $product): void
     {
         $elements = Helper::findElements($this, ['addArticleInput', 'addArticleSubmit']);
 
-        $elements['addArticleInput']->setValue($article);
+        $elements['addArticleInput']->setValue($product);
         $elements['addArticleSubmit']->press();
     }
 
     /**
      * Remove a product from the cart
      */
-    public function removeProduct(CartPosition $item)
+    public function removeProduct(CartPositionProduct $item): void
     {
         Helper::pressNamedButton($item, 'remove');
     }
@@ -155,9 +152,9 @@ public function removeProduct(CartPosition $item)
     /**
      * Remove the voucher from the cart
      *
-     * @throws \Behat\Mink\Exception\ResponseTextException
+     * @throws ResponseTextException
      */
-    public function removeVoucher()
+    public function removeVoucher(): void
     {
         $elements = Helper::findElements($this, ['removeVoucher']);
         $elements['removeVoucher']->click();
@@ -166,9 +163,8 @@ public function removeVoucher()
     /**
      * Removes all products from the cart
      */
-    public function emptyCart(CartPosition $items)
+    public function emptyCart(CartPositionProduct $items): void
     {
-        /** @var CartPosition $item */
         foreach ($items as $item) {
             $this->removeProduct($item);
         }
@@ -177,12 +173,12 @@ public function emptyCart(CartPosition $items)
     /**
      * Fills the cart with products
      */
-    public function fillCartWithProducts(array $items)
+    public function fillCartWithProducts(array $items): void
     {
         $originalPath = $this->path;
 
         foreach ($items as $item) {
-            $this->path = sprintf('/checkout/addArticle/sAdd/%s/sQuantity/%d', $item['number'], $item['quantity']);
+            $this->path = \sprintf('/checkout/addArticle/sAdd/%s/sQuantity/%d', $item['number'], $item['quantity']);
             $this->open();
         }
 
@@ -193,16 +189,16 @@ public function fillCartWithProducts(array $items)
      * Checks the cart positions
      * Available properties are: number (required), name (required), quantity, itemPrice, sum
      */
-    public function checkCartProducts(CartPosition $cartPositions, array $items)
+    public function checkCartProducts(CartPositionProduct $cartPositions, array $items): void
     {
         Helper::assertElementCount($cartPositions, \count($items));
-        $items = Helper::floatArray($items, ['quantity', 'itemPrice', 'sum']);
+        $items = Helper::floatArray($items, ['itemPrice', 'sum']);
         $result = Helper::assertElements($items, $cartPositions);
 
         if ($result !== true) {
             $messages = ['The following articles are wrong:'];
             foreach ($result as $product) {
-                $messages[] = sprintf(
+                $messages[] = \sprintf(
                     '%s - %s (%s is "%s", should be "%s")',
                     $product['properties']['number'],
                     $product['properties']['name'],
@@ -235,49 +231,44 @@ public function verifyPage(string $language = ''): bool
     /**
      * Proceeds to the confirmation page
      */
-    public function proceedToOrderConfirmation()
+    public function proceedToOrderConfirmation(): void
     {
         if ($this->verifyPage()) {
             Helper::clickNamedLink($this, 'checkout');
         }
 
-        $this->getPage('CheckoutConfirm')->verifyPage();
+        $this->getPage(CheckoutConfirm::class)->verifyPage();
     }
 
     /**
      * Proceeds to the confirmation page with login
-     *
-     * @param string $eMail
-     * @param string $password
      */
-    public function proceedToOrderConfirmationWithLogin($eMail, $password)
+    public function proceedToOrderConfirmationWithLogin(string $eMail, string $password): void
     {
         if ($this->verifyPage()) {
             Helper::clickNamedLink($this, 'checkout');
         }
 
-        $this->getPage('Account')->login($eMail, $password);
-        $this->getPage('CheckoutConfirm')->verifyPage();
+        $this->getPage(Account::class)->login($eMail, $password);
+        $this->getPage(CheckoutConfirm::class)->verifyPage();
     }
 
     /**
      * Proceeds to the confirmation page with registration
      */
-    public function proceedToOrderConfirmationWithRegistration(array $data)
+    public function proceedToOrderConfirmationWithRegistration(array $data): void
     {
         if ($this->verifyPage()) {
             Helper::clickNamedLink($this, 'checkout');
         }
 
-        $this->getPage('Account')->register($data);
+        $this->getPage(Account::class)->register($data);
     }
 
     /**
      * Changes the payment method
-     *
-     * @param array $data
      */
-    public function changePaymentMethod($data = [])
+    public function changePaymentMethod(array $data = []): void
     {
         $data[0]['field'] = 'payment';
         $this->changeShippingMethod($data);
@@ -285,10 +276,8 @@ public function changePaymentMethod($data = [])
 
     /**
      * Changes the shipping method
-     *
-     * @param array $data
      */
-    public function changeShippingMethod($data = [])
+    public function changeShippingMethod(array $data = []): void
     {
         Helper::fillForm($this, 'shippingPaymentForm', $data, true);
 
@@ -297,7 +286,7 @@ public function changeShippingMethod($data = [])
         Helper::pressNamedButton($this, 'changePaymentButton');
     }
 
-    public function resetCart()
+    public function resetCart(): void
     {
         $originalPath = $this->path;
 
@@ -315,64 +304,58 @@ public function resetCart()
         $this->open();
     }
 
-    protected function verify(array $urlParameters)
+    /**
+     * @param list<array{taxRate: string, value: string}> $taxValues
+     */
+    public function checkPositionTaxes(CartPositionRebate $cartPositionToCheck, array $taxValues): void
+    {
+        $positionText = $cartPositionToCheck->getText();
+        foreach ($taxValues as $taxValue) {
+            $taxString = \sprintf('%s: %s', $taxValue['taxRate'], $taxValue['value']);
+            if (!str_contains($positionText, $taxString)) {
+                Helper::throwException(\sprintf('Could not find tax "%s" in position "%s"', $taxString, $positionText));
+            }
+        }
+    }
+
+    protected function verify(array $urlParameters): void
     {
         $this->verifyResponse();
         $this->verifyPage();
     }
 
-    /**
-     * @param string $key
-     * @param string $language
-     *
-     * @return string
-     */
-    private function getLabel($key, $language)
+    private function getLabel(string $key, string $language): string
     {
         $labels = $this->getNamedSelectors();
 
-        if (strpos($key, '%') !== false) {
-            $taxRate = (int) $key;
+        if (str_contains($key, '%')) {
+            $taxRate = (float) $key;
 
-            return sprintf($labels['tax'][$language], $taxRate);
+            return \sprintf($labels['tax'][$language], $taxRate);
         }
 
         if (isset($labels[$key][$language])) {
             return $labels[$key][$language];
         }
 
-        $message = sprintf('Label "%s" is not defined for language key "%s"', $key, $language);
+        $message = \sprintf('Label "%s" is not defined for language key "%s"', $key, $language);
         Helper::throwException($message, Helper::EXCEPTION_PENDING);
     }
 
     /**
-     * @param string $labelKey
-     * @param string $language
-     *
      * @throws Exception
-     *
-     * @return int
      */
-    private function getAggregationPosition(array $labels, $labelKey, $language)
+    private function getAggregationPosition(array $labels, string $labelKey, string $language): int
     {
         $givenLabel = $this->getLabel($labelKey, $language);
 
-        $key = 0;
-        $lastKey = max(array_keys($labels));
-
-        do {
-            if (\array_key_exists($key, $labels)) {
-                $readLabel = $labels[$key]->getText();
-
-                if ($givenLabel === $readLabel) {
-                    return $key;
-                }
+        foreach ($labels as $key => $label) {
+            if ($givenLabel === $label->getText()) {
+                return $key;
             }
+        }
 
-            ++$key;
-        } while ($key <= $lastKey);
-
-        $message = sprintf('Label "%s" does not exist on the page! ("%s")', $labelKey, $givenLabel);
+        $message = \sprintf('Label "%s" does not exist on the page! ("%s")', $labelKey, $givenLabel);
         Helper::throwException($message);
     }
 }
diff --git a/tests/Mink/features/bootstrap/Page/CheckoutConfirm.php b/tests/Mink/Page/Frontend/Checkout/CheckoutConfirm.php
similarity index 71%
rename from tests/Mink/features/bootstrap/Page/CheckoutConfirm.php
rename to tests/Mink/Page/Frontend/Checkout/CheckoutConfirm.php
index ec44263fa6e..6fe9c44d49b 100644
--- a/tests/Mink/features/bootstrap/Page/CheckoutConfirm.php
+++ b/tests/Mink/Page/Frontend/Checkout/CheckoutConfirm.php
@@ -1,38 +1,43 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Page;
+namespace Shopware\Tests\Mink\Page\Frontend\Checkout;
 
 use Behat\Mink\Driver\Selenium2Driver;
 use Behat\Mink\Exception\ResponseTextException;
 use Behat\Mink\WebAssert;
 use Exception;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Page;
-use Shopware\Tests\Mink\Element\CheckoutPayment;
-use Shopware\Tests\Mink\Helper;
-
-class CheckoutConfirm extends Page implements \Shopware\Tests\Mink\HelperSelectorInterface
+use Shopware\Tests\Mink\Page\Frontend\Account\Account;
+use Shopware\Tests\Mink\Page\Frontend\Checkout\Elements\CheckoutBilling;
+use Shopware\Tests\Mink\Page\Frontend\Checkout\Elements\CheckoutPayment;
+use Shopware\Tests\Mink\Page\Frontend\Checkout\Elements\CheckoutShipping;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\HelperSelectorInterface;
+
+class CheckoutConfirm extends Page implements HelperSelectorInterface
 {
     /**
      * @var string
@@ -42,7 +47,7 @@ class CheckoutConfirm extends Page implements \Shopware\Tests\Mink\HelperSelecto
     /**
      * {@inheritdoc}
      */
-    public function getCssSelectors()
+    public function getCssSelectors(): array
     {
         return [
             'shippingPaymentForm' => 'form.payment',
@@ -68,7 +73,7 @@ public function getCssSelectors()
     /**
      * {@inheritdoc}
      */
-    public function getNamedSelectors()
+    public function getNamedSelectors(): array
     {
         return [
             'gtc' => ['de' => 'AGB und Widerrufsbelehrung', 'en' => 'Terms, conditions and cancellation policy'],
@@ -81,7 +86,7 @@ public function getNamedSelectors()
     /**
      * Verify if we're on an expected page. Throw an exception if not.
      */
-    public function verifyPage()
+    public function verifyPage(): void
     {
         if ($this->getDriver() instanceof Selenium2Driver) {
             $this->getSession()->wait(5000, '$("#sAGB").length > 0');
@@ -101,10 +106,8 @@ public function verifyPage()
 
     /**
      * Returns the order number from finish page
-     *
-     * @return int
      */
-    public function getOrderNumber()
+    public function getOrderNumber(): string
     {
         $elements = Helper::findElements($this, ['orderNumber']);
 
@@ -112,13 +115,13 @@ public function getOrderNumber()
 
         preg_match("/\d+/", $orderDetails, $orderNumber);
 
-        return (int) $orderNumber[0];
+        return (string) ($orderNumber[0] ?? '');
     }
 
     /**
      * Proceeds the checkout
      */
-    public function proceedToCheckout()
+    public function proceedToCheckout(): void
     {
         $this->checkField('sAGB');
         Helper::pressNamedButton($this, 'confirmButton');
@@ -127,7 +130,7 @@ public function proceedToCheckout()
     /**
      * Changes the payment method
      */
-    public function changePaymentMethod(array $data = [])
+    public function changePaymentMethod(array $data = []): void
     {
         $data[0]['field'] = 'payment';
         $this->changeShippingMethod($data);
@@ -136,12 +139,12 @@ public function changePaymentMethod(array $data = [])
     /**
      * Changes the billing address
      */
-    public function changeBillingAddress(array $data = [])
+    public function changeBillingAddress(array $data = []): void
     {
-        $element = $this->getElement('CheckoutBilling');
+        $element = $this->getElement(CheckoutBilling::class);
         Helper::clickNamedLink($element, 'changeButton');
 
-        $account = $this->getPage('Account');
+        $account = $this->getPage(Account::class);
         Helper::fillForm($account, 'billingForm', $data);
         Helper::pressNamedButton($account, 'changeBillingButton');
     }
@@ -149,14 +152,14 @@ public function changeBillingAddress(array $data = [])
     /**
      * Changes the shipping address
      */
-    public function changeShippingAddress(array $data = [])
+    public function changeShippingAddress(array $data = []): void
     {
-        $element = $this->getElement('CheckoutShipping');
+        $element = $this->getElement(CheckoutShipping::class);
         $url = $element->find('css', 'a[title="Adresse ändern"]')->getAttribute('href');
 
         $this->getSession()->visit($url);
 
-        $account = $this->getPage('Account');
+        $account = $this->getPage(Account::class);
         Helper::fillForm($account, 'shippingForm', $data);
         Helper::pressNamedButton($account, 'changeShippingButton');
     }
@@ -164,9 +167,9 @@ public function changeShippingAddress(array $data = [])
     /**
      * Changes the shipping method
      */
-    public function changeShippingMethod(array $data = [])
+    public function changeShippingMethod(array $data = []): void
     {
-        $element = $this->getElement('CheckoutPayment');
+        $element = $this->getElement(CheckoutPayment::class);
         Helper::clickNamedLink($element, 'changeButton');
 
         Helper::fillForm($this, 'shippingPaymentForm', $data, true);
@@ -179,14 +182,11 @@ public function changeShippingMethod(array $data = [])
     /**
      * Checks the name of the current payment method
      *
-     * @param string $paymentMethod
-     *
      * @throws Exception
      */
-    public function checkPaymentMethod($paymentMethod)
+    public function checkPaymentMethod(string $paymentMethod): void
     {
-        /** @var CheckoutPayment $element */
-        $element = $this->getElement('CheckoutPayment');
+        $element = $this->getElement(CheckoutPayment::class);
 
         $properties = [
             'paymentMethod' => $paymentMethod,
@@ -198,7 +198,7 @@ public function checkPaymentMethod($paymentMethod)
             return;
         }
 
-        $message = sprintf(
+        $message = \sprintf(
             'The current payment method is "%s" (should be "%s")',
             $result['value'],
             $result['value2']
@@ -209,10 +209,8 @@ public function checkPaymentMethod($paymentMethod)
 
     /**
      * Creates a new address and saves it
-     *
-     * @param array $values
      */
-    public function createArbitraryAddress($values)
+    public function createArbitraryAddress(array $values): void
     {
         Helper::fillForm($this, 'addressForm', $values);
         $button = $this->find('css', '.address--form-actions > button');
@@ -221,20 +219,15 @@ public function createArbitraryAddress($values)
 
     /**
      * Changes the values in a modal address form and saves the form
-     *
-     * @param array $values
      */
-    public function changeModalAddress($values)
+    public function changeModalAddress(array $values): void
     {
         Helper::fillForm($this, 'addressForm', $values);
         $button = $this->find('named', ['button', 'Adresse speichern']);
         $button->press();
     }
 
-    /**
-     * @param string $path
-     */
-    public function checkoutUsingGet($path)
+    public function checkoutUsingGet(string $path): void
     {
         $this->getDriver()->visit($path);
     }
diff --git a/tests/Mink/features/bootstrap/Element/CartPosition.php b/tests/Mink/Page/Frontend/Checkout/Elements/CartPositionProduct.php
similarity index 69%
rename from tests/Mink/features/bootstrap/Element/CartPosition.php
rename to tests/Mink/Page/Frontend/Checkout/Elements/CartPositionProduct.php
index d08d66d1366..3e140c90d6e 100644
--- a/tests/Mink/features/bootstrap/Element/CartPosition.php
+++ b/tests/Mink/Page/Frontend/Checkout/Elements/CartPositionProduct.php
@@ -1,35 +1,37 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Frontend\Checkout\Elements;
 
 use Exception;
-use Shopware\Tests\Mink\Helper;
+use Shopware\Tests\Mink\Page\Helper\Elements\MultipleElement;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
 
 /**
- * Element: CartPosition
- * Location: Cart positions on cart and checkout confirm page
+ * Element: CartPositionProduct
+ * Location: Cart positions with products on cart and checkout confirm page
  *
  * Available retrievable properties:
  * - number (string, e.g. "SW10181")
@@ -38,10 +40,10 @@
  * - itemPrice (float, e.g. "139,99")
  * - sum (float, e.g. "139,99")
  */
-class CartPosition extends MultipleElement
+class CartPositionProduct extends MultipleElement
 {
     /**
-     * @var array
+     * @var array<string, string>
      */
     protected $selector = ['css' => 'div.row--product'];
 
@@ -73,32 +75,20 @@ public function getNamedSelectors()
 
     /**
      * Returns the product name
-     *
-     * @return string
      */
-    public function getNameProperty()
+    public function getNameProperty(): string
     {
         $elements = Helper::findElements($this, ['name', 'thumbnailLink', 'thumbnailImage']);
 
         $names = [
-            'articleTitle' => $elements['name']->getAttribute('title'),
-            'articleThumbnailLinkTitle' => $elements['thumbnailLink']->getAttribute('title'),
+            'articleTitle' => $elements['name']->getAttribute('title') ?? '',
+            'articleThumbnailLinkTitle' => $elements['thumbnailLink']->getAttribute('title') ?? '',
             'articleName' => rtrim($elements['name']->getText(), '.'),
         ];
 
         return $this->getUniqueName($names);
     }
 
-    /**
-     * Returns the quantity
-     *
-     * @return float
-     */
-    public function getQuantityProperty()
-    {
-        return $this->getFloatProperty('quantity');
-    }
-
     /**
      * Returns the item price
      *
@@ -120,20 +110,20 @@ public function getSumProperty()
     }
 
     /**
-     * @throws Exception
+     * @param array<string, string> $names
      *
-     * @return string
+     * @throws Exception
      */
-    protected function getUniqueName(array $names)
+    private function getUniqueName(array $names): string
     {
         $name = array_unique($names);
 
         switch (\count($name)) {
-            //normal case
+            // normal case
             case 1:
                 return current($name);
 
-            //if articleName is too long, it will be cut. So it's different from the other and has to be checked separately
+                // if articleName is too long, it will be cut. So it's different from the other and has to be checked separately
             case 2:
                 $check = [$name];
                 $result = Helper::checkArray($check);
@@ -147,7 +137,7 @@ protected function getUniqueName(array $names)
         if ($result !== true) {
             $messages = ['The cart item has different names!'];
             foreach ($name as $key => $value) {
-                $messages[] = sprintf('"%s" (Key: "%s")', $value, $key);
+                $messages[] = \sprintf('"%s" (Key: "%s")', $value, $key);
             }
 
             Helper::throwException($messages);
@@ -158,12 +148,8 @@ protected function getUniqueName(array $names)
 
     /**
      * Helper method to read a float property
-     *
-     * @param string $propertyName
-     *
-     * @return float
      */
-    protected function getFloatProperty($propertyName)
+    private function getFloatProperty(string $propertyName): float
     {
         $element = Helper::findElements($this, [$propertyName]);
 
diff --git a/tests/Mink/Page/Frontend/Checkout/Elements/CartPositionRebate.php b/tests/Mink/Page/Frontend/Checkout/Elements/CartPositionRebate.php
new file mode 100644
index 00000000000..2e5a1d2fec3
--- /dev/null
+++ b/tests/Mink/Page/Frontend/Checkout/Elements/CartPositionRebate.php
@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Mink\Page\Frontend\Checkout\Elements;
+
+use Shopware\Tests\Mink\Page\Helper\Elements\MultipleElement;
+
+/**
+ * Element: CartPositionRebate
+ * Location: Cart positions with discounts or surcharges on cart and checkout confirm page
+ */
+class CartPositionRebate extends MultipleElement
+{
+    /**
+     * @var array<string, string>
+     */
+    protected $selector = ['css' => 'div.row--rebate'];
+}
diff --git a/tests/Mink/features/bootstrap/Element/CheckoutAddressBox.php b/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutAddressBox.php
similarity index 80%
rename from tests/Mink/features/bootstrap/Element/CheckoutAddressBox.php
rename to tests/Mink/Page/Frontend/Checkout/Elements/CheckoutAddressBox.php
index 0367d201ab0..1dac8fc6199 100644
--- a/tests/Mink/features/bootstrap/Element/CheckoutAddressBox.php
+++ b/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutAddressBox.php
@@ -1,30 +1,32 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Frontend\Checkout\Elements;
 
-use Shopware\Tests\Mink\Helper;
+use Shopware\Tests\Mink\Page\Helper\Elements\MultipleElement;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
 
 /**
  * Element: CheckoutAddressBox
@@ -36,7 +38,7 @@
 class CheckoutAddressBox extends MultipleElement
 {
     /**
-     * @var array
+     * @var array<string, string>
      */
     protected $selector = ['css' => 'div.information--panel'];
 
@@ -84,12 +86,7 @@ public function hasTitle($title)
         return false;
     }
 
-    /**
-     * @param array $givenAddress
-     *
-     * @return bool
-     */
-    public function containsAdress($givenAddress)
+    public function containsAdress(array $givenAddress): bool
     {
         $testAddress = [];
 
diff --git a/tests/Mink/features/bootstrap/Element/CheckoutAddressBoxModal.php b/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutAddressBoxModal.php
similarity index 82%
rename from tests/Mink/features/bootstrap/Element/CheckoutAddressBoxModal.php
rename to tests/Mink/Page/Frontend/Checkout/Elements/CheckoutAddressBoxModal.php
index 12579203ac8..a529c84871e 100644
--- a/tests/Mink/features/bootstrap/Element/CheckoutAddressBoxModal.php
+++ b/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutAddressBoxModal.php
@@ -1,30 +1,32 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Frontend\Checkout\Elements;
 
-use Shopware\Tests\Mink\Helper;
+use Shopware\Tests\Mink\Page\Helper\Elements\MultipleElement;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
 
 /**
  * Element: CheckoutAddressBox
@@ -36,7 +38,7 @@
 class CheckoutAddressBoxModal extends MultipleElement
 {
     /**
-     * @var array
+     * @var array<string, string>
      */
     protected $selector = ['css' => 'div.address--box'];
 
diff --git a/tests/Mink/features/bootstrap/Element/CheckoutBilling.php b/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutBilling.php
similarity index 64%
rename from tests/Mink/features/bootstrap/Element/CheckoutBilling.php
rename to tests/Mink/Page/Frontend/Checkout/Elements/CheckoutBilling.php
index 5612751b5ee..54d9d768783 100644
--- a/tests/Mink/features/bootstrap/Element/CheckoutBilling.php
+++ b/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutBilling.php
@@ -1,30 +1,32 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Frontend\Checkout\Elements;
 
 use SensioLabs\Behat\PageObjectExtension\PageObject\Element;
+use Shopware\Tests\Mink\Tests\General\Helpers\HelperSelectorInterface;
 
 /**
  * Element: CheckoutBilling
@@ -33,7 +35,7 @@
  * Available retrievable properties:
  * - ???
  */
-class CheckoutBilling extends Element implements \Shopware\Tests\Mink\HelperSelectorInterface
+class CheckoutBilling extends Element implements HelperSelectorInterface
 {
     /**
      * @var array
diff --git a/tests/Mink/features/bootstrap/Element/CheckoutModalAddressEditor.php b/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutModalAddressEditor.php
similarity index 65%
rename from tests/Mink/features/bootstrap/Element/CheckoutModalAddressEditor.php
rename to tests/Mink/Page/Frontend/Checkout/Elements/CheckoutModalAddressEditor.php
index b7694b60327..77ad95ff854 100644
--- a/tests/Mink/features/bootstrap/Element/CheckoutModalAddressEditor.php
+++ b/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutModalAddressEditor.php
@@ -1,28 +1,31 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Frontend\Checkout\Elements;
+
+use Shopware\Tests\Mink\Page\Helper\Elements\MultipleElement;
 
 /**
  * Element: CheckoutModalAddressEditor
@@ -34,7 +37,7 @@
 class CheckoutModalAddressEditor extends MultipleElement
 {
     /**
-     * @var array
+     * @var array<string, string>
      */
     protected $selector = ['css' => 'div.address-manager--editor'];
 
diff --git a/tests/Mink/features/bootstrap/Element/CheckoutModalAddressSelection.php b/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutModalAddressSelection.php
similarity index 61%
rename from tests/Mink/features/bootstrap/Element/CheckoutModalAddressSelection.php
rename to tests/Mink/Page/Frontend/Checkout/Elements/CheckoutModalAddressSelection.php
index f5613281417..2c68599ba81 100644
--- a/tests/Mink/features/bootstrap/Element/CheckoutModalAddressSelection.php
+++ b/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutModalAddressSelection.php
@@ -1,28 +1,31 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Frontend\Checkout\Elements;
+
+use Shopware\Tests\Mink\Page\Helper\Elements\MultipleElement;
 
 /**
  * Element: CheckoutModalAddressSelection
@@ -34,7 +37,7 @@
 class CheckoutModalAddressSelection extends MultipleElement
 {
     /**
-     * @var array
+     * @var array<string, string>
      */
     protected $selector = ['css' => 'div.address-manager--selection'];
 
diff --git a/tests/Mink/features/bootstrap/Element/CheckoutPayment.php b/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutPayment.php
similarity index 67%
rename from tests/Mink/features/bootstrap/Element/CheckoutPayment.php
rename to tests/Mink/Page/Frontend/Checkout/Elements/CheckoutPayment.php
index fc9905cea03..8ad88595c59 100644
--- a/tests/Mink/features/bootstrap/Element/CheckoutPayment.php
+++ b/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutPayment.php
@@ -1,31 +1,33 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Frontend\Checkout\Elements;
 
 use SensioLabs\Behat\PageObjectExtension\PageObject\Element;
-use Shopware\Tests\Mink\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\HelperSelectorInterface;
 
 /**
  * Element: CheckoutPayment
@@ -34,7 +36,7 @@
  * Available retrievable properties:
  * - address (Element[], please use Account::checkAddress())
  */
-class CheckoutPayment extends Element implements \Shopware\Tests\Mink\HelperSelectorInterface
+class CheckoutPayment extends Element implements HelperSelectorInterface
 {
     /**
      * @var array
diff --git a/tests/Mink/features/bootstrap/Element/CheckoutShipping.php b/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutShipping.php
similarity index 64%
rename from tests/Mink/features/bootstrap/Element/CheckoutShipping.php
rename to tests/Mink/Page/Frontend/Checkout/Elements/CheckoutShipping.php
index 223d2afcc35..d3503cfc1bd 100644
--- a/tests/Mink/features/bootstrap/Element/CheckoutShipping.php
+++ b/tests/Mink/Page/Frontend/Checkout/Elements/CheckoutShipping.php
@@ -1,30 +1,32 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Frontend\Checkout\Elements;
 
 use SensioLabs\Behat\PageObjectExtension\PageObject\Element;
+use Shopware\Tests\Mink\Tests\General\Helpers\HelperSelectorInterface;
 
 /**
  * Element: CheckoutShipping
@@ -33,7 +35,7 @@
  * Available retrievable properties:
  * - ???
  */
-class CheckoutShipping extends Element implements \Shopware\Tests\Mink\HelperSelectorInterface
+class CheckoutShipping extends Element implements HelperSelectorInterface
 {
     /**
      * @var array
diff --git a/tests/Mink/features/bootstrap/Page/Detail.php b/tests/Mink/Page/Frontend/Detail/Detail.php
similarity index 77%
rename from tests/Mink/features/bootstrap/Page/Detail.php
rename to tests/Mink/Page/Frontend/Detail/Detail.php
index b8db7f4c5ed..28d8d2b0e57 100644
--- a/tests/Mink/features/bootstrap/Page/Detail.php
+++ b/tests/Mink/Page/Frontend/Detail/Detail.php
@@ -1,35 +1,36 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Page;
+namespace Shopware\Tests\Mink\Page\Frontend\Detail;
 
-use Behat\Mink\Element\NodeElement;
 use Exception;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Page;
-use Shopware\Tests\Mink\Element\ArticleEvaluation;
-use Shopware\Tests\Mink\Helper;
-use Shopware\Tests\Mink\HelperSelectorInterface;
+use Shopware\Tests\Mink\Page\Frontend\Article\Elements\ArticleEvaluation;
+use Shopware\Tests\Mink\Page\Frontend\Checkout\CheckoutCart;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\HelperSelectorInterface;
 
 class Detail extends Page implements HelperSelectorInterface
 {
@@ -39,7 +40,7 @@ class Detail extends Page implements HelperSelectorInterface
     protected $path = '/detail/index/sArticle/{articleId}?number={number}';
 
     /**
-     * @var string[]
+     * @var array<string, string>
      */
     protected $configuratorTypes = [
         'table' => 'configurator--form',
@@ -50,7 +51,7 @@ class Detail extends Page implements HelperSelectorInterface
     /**
      * {@inheritdoc}
      */
-    public function getCssSelectors()
+    public function getCssSelectors(): array
     {
         return [
             'productRating' => 'div.product--rating-container .product--rating > meta',
@@ -65,7 +66,7 @@ public function getCssSelectors()
     /**
      * {@inheritdoc}
      */
-    public function getNamedSelectors()
+    public function getNamedSelectors(): array
     {
         return [
             'notificationFormSubmit' => ['de' => 'Eintragen', 'en' => 'Enter'],
@@ -81,7 +82,7 @@ public function getNamedSelectors()
     /**
      * Verify if we're on an expected page. Throw an exception if not.
      */
-    public function verifyPage()
+    public function verifyPage(): void
     {
         $links = Helper::hasNamedLinks($this, ['commentLink', 'inquiryLink']);
         $buttons = Helper::hasNamedButtons($this, ['compareLink', 'rememberLink']);
@@ -111,10 +112,8 @@ public function verifyPage()
 
     /**
      * Puts the current article <quantity> times to basket
-     *
-     * @param int $quantity
      */
-    public function addToBasket($quantity = 1)
+    public function addToBasket(string $quantity = '1'): void
     {
         $this->fillField('sQuantity', $quantity);
         $this->find('css', "button[name='In den Warenkorb']")->click();
@@ -129,7 +128,7 @@ static function () use ($page) {
         $this->find('css', "a[title='Warenkorb bearbeiten']")->click();
     }
 
-    public function toBasket($offcanvasCart = false)
+    public function toBasket(bool $offcanvasCart = false): void
     {
         if ($offcanvasCart) {
             $text = 'Warenkorb anzeigen';
@@ -151,19 +150,16 @@ public function toBasket($offcanvasCart = false)
 
         $this->clickLink($text);
 
-        /** @var CheckoutCart $checkoutCartPage */
-        $checkoutCartPage = $this->getPage('CheckoutCart');
+        $checkoutCartPage = $this->getPage(CheckoutCart::class);
         $checkoutCartPage->verifyPage();
     }
 
     /**
      * Checks the evaluations of the current article
      *
-     * @param string $average
-     *
      * @throws Exception
      */
-    public function checkEvaluations(ArticleEvaluation $articleEvaluations, $average, array $evaluations)
+    public function checkEvaluations(ArticleEvaluation $articleEvaluations, string $average, array $evaluations): void
     {
         $this->checkRating($articleEvaluations, $average);
 
@@ -176,7 +172,7 @@ public function checkEvaluations(ArticleEvaluation $articleEvaluations, $average
 
         $messages = ['The following $evaluations are wrong:'];
         foreach ($result as $evaluation) {
-            $messages[] = sprintf(
+            $messages[] = \sprintf(
                 '%s - Bewertung: %s (%s is "%s", should be "%s")',
                 $evaluation['properties']['author'],
                 $evaluation['properties']['stars'],
@@ -193,12 +189,12 @@ public function checkEvaluations(ArticleEvaluation $articleEvaluations, $average
      *
      * @param array[] $configuration
      */
-    public function configure(array $configuration)
+    public function configure(array $configuration): void
     {
         $configuratorType = '';
 
         foreach ($configuration as $group) {
-            $field = sprintf('group[%d]', $group['groupId']);
+            $field = \sprintf('group[%d]', $group['groupId']);
             $this->selectFieldOption($field, $group['value']);
 
             if ($configuratorType === 'select') {
@@ -219,25 +215,22 @@ public function configure(array $configuration)
     }
 
     /**
-     * @param string $configuratorOption
-     * @param string $configuratorGroup
-     *
      * @throws Exception
      */
-    public function canNotSelectConfiguratorOption($configuratorOption, $configuratorGroup)
+    public function canNotSelectConfiguratorOption(string $configuratorOption, string $configuratorGroup): void
     {
         $group = $this->findField($configuratorGroup);
 
         if (empty($group)) {
-            $message = sprintf('Configurator group "%s" was not found!', $configuratorGroup);
+            $message = \sprintf('Configurator group "%s" was not found!', $configuratorGroup);
             Helper::throwException($message);
         }
 
         $options = $group->findAll('css', 'option');
 
         foreach ($options as $option) {
-            if ($option->getText() == $configuratorOption) {
-                $message = sprintf('Configurator option %s founded but should not', $configuratorOption);
+            if ($option->getText() === $configuratorOption) {
+                $message = \sprintf('Configurator option %s founded but should not', $configuratorOption);
                 Helper::throwException($message);
             }
         }
@@ -246,7 +239,7 @@ public function canNotSelectConfiguratorOption($configuratorOption, $configurato
     /**
      * Writes an evaluation
      */
-    public function writeEvaluation(array $data)
+    public function writeEvaluation(array $data): void
     {
         Helper::fillForm($this, 'voteForm', $data);
         Helper::pressNamedButton($this, 'voteFormSubmit');
@@ -262,14 +255,12 @@ public function writeEvaluation(array $data)
      *
      * @throws Exception
      */
-    public function checkSelect($select, $min, $max, $graduation)
+    public function checkSelect(string $select, string $min, string $max, int $graduation): void
     {
         $selectBox = $this->findField($select);
-        $min = (string) $min;
-        $max = (string) $max;
 
         if (empty($selectBox)) {
-            $message = sprintf('Select box "%s" was not found!', $select);
+            $message = \sprintf('Select box "%s" was not found!', $select);
             Helper::throwException($message);
         }
 
@@ -282,16 +273,15 @@ public function checkSelect($select, $min, $max, $graduation)
         $unit = isset($parts[1]) ? ' ' . $parts[1] : '';
 
         if ($optionText !== $min) {
-            $errors[] = sprintf('The first option of "%s" is "%s"! (should be "%s")', $select, $optionText, $min);
+            $errors[] = \sprintf('The first option of "%s" is "%s"! (should be "%s")', $select, $optionText, $min);
         }
 
-        /** @var NodeElement $option */
         while ($option = next($options)) {
             $optionText = $option->getText();
             $value += $graduation;
 
             if ($optionText !== $value . $unit) {
-                $errors[] = sprintf(
+                $errors[] = \sprintf(
                     'There is the invalid option "%s" in "%s"! ("%s" expected)',
                     $optionText,
                     $select,
@@ -301,7 +291,7 @@ public function checkSelect($select, $min, $max, $graduation)
         }
 
         if ($optionText !== $max) {
-            $errors[] = sprintf('The last option of "%s" is "%s"! (should be "%s")', $select, $value, $max);
+            $errors[] = \sprintf('The last option of "%s" is "%s"! (should be "%s")', $select, $value, $max);
         }
 
         if (!empty($errors)) {
@@ -311,10 +301,8 @@ public function checkSelect($select, $min, $max, $graduation)
 
     /**
      * Fills the notification form and submits it
-     *
-     * @param string $email
      */
-    public function submitNotification($email)
+    public function submitNotification(string $email): void
     {
         $data = [
             [
@@ -329,7 +317,7 @@ public function submitNotification($email)
         $elements['notificationSubmit']->press();
     }
 
-    public function openEvaluationSection()
+    public function openEvaluationSection(): void
     {
         $evaluationTab = $this->getSession()
             ->getPage()
@@ -341,11 +329,9 @@ public function openEvaluationSection()
     }
 
     /**
-     * @param string $average
-     *
      * @throws Exception
      */
-    protected function checkRating(ArticleEvaluation $articleEvaluations, $average)
+    protected function checkRating(ArticleEvaluation $articleEvaluations, string $average): void
     {
         $elements = Helper::findElements($this, ['productRating', 'productRatingCount']);
         $check = [
@@ -357,7 +343,7 @@ protected function checkRating(ArticleEvaluation $articleEvaluations, $average)
         $result = Helper::checkArray($check);
 
         if ($result !== true) {
-            $message = sprintf('There was a different value of the evaluation! (%s: "%s" instead of %s)', $result, $check[$result][0], $check[$result][1]);
+            $message = \sprintf('There was a different value of the evaluation! (%s: "%s" instead of %s)', $result, $check[$result][0], $check[$result][1]);
             Helper::throwException($message);
         }
     }
diff --git a/tests/Mink/features/bootstrap/Page/Form.php b/tests/Mink/Page/Frontend/Form/Form.php
similarity index 74%
rename from tests/Mink/features/bootstrap/Page/Form.php
rename to tests/Mink/Page/Frontend/Form/Form.php
index 9f2745155a6..b15efbcb267 100644
--- a/tests/Mink/features/bootstrap/Page/Form.php
+++ b/tests/Mink/Page/Frontend/Form/Form.php
@@ -1,34 +1,35 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Page;
+namespace Shopware\Tests\Mink\Page\Frontend\Form;
 
 use Behat\Mink\Element\NodeElement;
 use Exception;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Page;
-use Shopware\Tests\Mink\Helper;
-use Shopware\Tests\Mink\HelperSelectorInterface;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\HelperSelectorInterface;
 
 class Form extends Page implements HelperSelectorInterface
 {
@@ -65,7 +66,7 @@ public function getNamedSelectors()
      *
      * @throws Exception
      */
-    public function verifyPage()
+    public function verifyPage(): void
     {
         $errors = [];
 
@@ -88,13 +89,18 @@ public function verifyPage()
      *
      * @throws Exception
      */
-    public function checkCaptcha()
+    public function checkCaptcha(): void
     {
         $placeholderSelector = Helper::getRequiredSelector($this, 'captchaPlaceholder');
-        /** @var NodeElement $placeholder */
         $placeholder = $this->find('css', $placeholderSelector);
+        if (!$placeholder instanceof NodeElement) {
+            Helper::throwException('Could not find captchaPlaceholder');
+        }
 
         $parentFormInput = $placeholder->find('xpath', "/ancestor::form[1]/descendant::input[@type='text']");
+        if (!$parentFormInput instanceof NodeElement) {
+            Helper::throwException('Could not find parent form input');
+        }
         $parentFormInput->focus();
 
         if (!$this->getSession()->wait(5000, "$('$placeholderSelector').children().length > 0")) {
@@ -104,7 +110,6 @@ public function checkCaptcha()
 
         $this->getSession()->wait(5000);
 
-        /** @var NodeElement[] $elements */
         $elements = Helper::findElements($this, ['captchaPlaceholder']);
         if (empty($elements['captchaPlaceholder']->getText())) {
             $message = 'The captcha was not loaded correctly!';
@@ -115,7 +120,7 @@ public function checkCaptcha()
     /**
      * Fills the fields of the inquiry form with $data and submits it
      */
-    public function submitInquiryForm(array $data)
+    public function submitInquiryForm(array $data): void
     {
         Helper::fillForm($this, 'inquiryForm', $data);
         Helper::pressNamedButton($this, 'submitButton');
diff --git a/tests/Mink/features/bootstrap/Page/GenericPage.php b/tests/Mink/Page/Frontend/Generic/GenericPage.php
similarity index 76%
rename from tests/Mink/features/bootstrap/Page/GenericPage.php
rename to tests/Mink/Page/Frontend/Generic/GenericPage.php
index a9fd33c2f27..60b979cb995 100644
--- a/tests/Mink/features/bootstrap/Page/GenericPage.php
+++ b/tests/Mink/Page/Frontend/Generic/GenericPage.php
@@ -5,37 +5,36 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Page;
+namespace Shopware\Tests\Mink\Page\Frontend\Generic;
 
 use SensioLabs\Behat\PageObjectExtension\PageObject\Page;
-use Shopware\Tests\Mink\Helper;
-use Shopware\Tests\Mink\HelperSelectorInterface;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\HelperSelectorInterface;
 
 class GenericPage extends Page implements HelperSelectorInterface
 {
     /**
      * {@inheritdoc}
      */
-    public function getCssSelectors()
+    public function getCssSelectors(): array
     {
         return [
             'canonical' => 'link[rel=canonical]',
@@ -48,7 +47,7 @@ public function getCssSelectors()
     /**
      * {@inheritdoc}
      */
-    public function getNamedSelectors()
+    public function getNamedSelectors(): array
     {
         return [];
     }
@@ -58,12 +57,8 @@ public function getNamedSelectors()
      * Fails validation if the matches are not exact for either argument
      * If null arguments are provided, no next page link is expected, and validation
      * will fail if one is found
-     *
-     * @param string      $locator
-     * @param string|null $path
-     * @param array       $query
      */
-    public function checkLink($locator, $path = null, $query = [])
+    public function checkLink(string $locator, ?string $path = null, array $query = []): void
     {
         $elements = Helper::findElements($this, [$locator], false);
 
@@ -89,7 +84,7 @@ public function checkLink($locator, $path = null, $query = [])
         $expectedUrlParts = parse_url($expectedUrl);
 
         if ($linkParts != $expectedUrlParts) {
-            $message = sprintf(
+            $message = \sprintf(
                 'Link "%s" does not match expected value "%s" while looking for ' . $locator,
                 $link,
                 $expectedUrl
@@ -101,10 +96,8 @@ public function checkLink($locator, $path = null, $query = [])
 
     /**
      * Checks if the robots meta exists and matches the expected content
-     *
-     * @param array $content
      */
-    public function checkRobots($content = [])
+    public function checkRobots(array $content = []): void
     {
         $elements = Helper::findElements($this, ['robots']);
         $robotsValue = $elements['robots']->getAttribute('content');
@@ -116,7 +109,7 @@ public function checkRobots($content = [])
         $robotsParts = array_map('trim', $robotsParts);
 
         if ($robotsParts != $content) {
-            $message = sprintf(
+            $message = \sprintf(
                 'Canonical link "%s" does not match expected value "%s"',
                 implode(', ', $robotsParts),
                 implode(', ', $content)
diff --git a/tests/Mink/features/bootstrap/Element/Banner.php b/tests/Mink/Page/Frontend/Homepage/Elements/Banner.php
similarity index 73%
rename from tests/Mink/features/bootstrap/Element/Banner.php
rename to tests/Mink/Page/Frontend/Homepage/Elements/Banner.php
index 50909702c79..d4d9dea48b2 100644
--- a/tests/Mink/features/bootstrap/Element/Banner.php
+++ b/tests/Mink/Page/Frontend/Homepage/Elements/Banner.php
@@ -1,31 +1,33 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Frontend\Homepage\Elements;
 
-use Shopware\Tests\Mink\Helper;
-use Shopware\Tests\Mink\HelperSelectorInterface;
+use Behat\Mink\Exception\ElementException;
+use Shopware\Tests\Mink\Page\Helper\Elements\MultipleElement;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
 
 /**
  * Element: Banner
@@ -36,10 +38,10 @@
  * - link (string, e.g. "/Campaign/index/emotionId/6")
  * - mapping (array[])
  */
-class Banner extends MultipleElement implements HelperSelectorInterface
+class Banner extends MultipleElement
 {
     /**
-     * @var array
+     * @var array<string, string>
      */
     protected $selector = ['css' => 'div.emotion--banner'];
 
@@ -99,7 +101,7 @@ public function getMapping()
     /**
      * Clicks the banner link
      *
-     * @throws \Behat\Mink\Exception\ElementException
+     * @throws ElementException
      */
     public function click()
     {
diff --git a/tests/Mink/features/bootstrap/Element/CategoryTeaser.php b/tests/Mink/Page/Frontend/Homepage/Elements/CategoryTeaser.php
similarity index 73%
rename from tests/Mink/features/bootstrap/Element/CategoryTeaser.php
rename to tests/Mink/Page/Frontend/Homepage/Elements/CategoryTeaser.php
index e3d46ec8738..6fdf3143a6e 100644
--- a/tests/Mink/features/bootstrap/Element/CategoryTeaser.php
+++ b/tests/Mink/Page/Frontend/Homepage/Elements/CategoryTeaser.php
@@ -1,30 +1,32 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Frontend\Homepage\Elements;
 
-use Shopware\Tests\Mink\Helper;
+use Shopware\Tests\Mink\Page\Helper\Elements\MultipleElement;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
 
 /**
  * Element: CategoryTeaser
@@ -35,10 +37,10 @@
  * - image (string, e.g. "genuss_tees_banner.jpg")
  * - link (string, e.g. "/genusswelten/tees-und-zubehoer/")
  */
-class CategoryTeaser extends MultipleElement implements \Shopware\Tests\Mink\HelperSelectorInterface
+class CategoryTeaser extends MultipleElement
 {
     /**
-     * @var array
+     * @var array<string, string>
      */
     protected $selector = ['css' => 'div.emotion--category-teaser'];
 
diff --git a/tests/Mink/features/bootstrap/Element/CompareColumn.php b/tests/Mink/Page/Frontend/Homepage/Elements/CompareColumn.php
similarity index 82%
rename from tests/Mink/features/bootstrap/Element/CompareColumn.php
rename to tests/Mink/Page/Frontend/Homepage/Elements/CompareColumn.php
index 88a61e4497f..5360d03fdd2 100644
--- a/tests/Mink/features/bootstrap/Element/CompareColumn.php
+++ b/tests/Mink/Page/Frontend/Homepage/Elements/CompareColumn.php
@@ -1,30 +1,32 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Frontend\Homepage\Elements;
 
-use Shopware\Tests\Mink\Helper;
+use Shopware\Tests\Mink\Page\Helper\Elements\MultipleElement;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
 
 /**
  * Element: CompareColumn
@@ -33,10 +35,10 @@
  * Available retrievable properties:
  * - address (Element[], please use Account::checkAddress())
  */
-class CompareColumn extends MultipleElement implements \Shopware\Tests\Mink\HelperSelectorInterface
+class CompareColumn extends MultipleElement
 {
     /**
-     * @var array
+     * @var array<string, string>
      */
     protected $selector = ['css' => 'ul.compare--group-list:not(.list--head)'];
 
diff --git a/tests/Mink/features/bootstrap/Element/ManufacturerSlider.php b/tests/Mink/Page/Frontend/Homepage/Elements/ManufacturerSlider.php
similarity index 73%
rename from tests/Mink/features/bootstrap/Element/ManufacturerSlider.php
rename to tests/Mink/Page/Frontend/Homepage/Elements/ManufacturerSlider.php
index 495f004c5af..ae71dd37d3b 100644
--- a/tests/Mink/features/bootstrap/Element/ManufacturerSlider.php
+++ b/tests/Mink/Page/Frontend/Homepage/Elements/ManufacturerSlider.php
@@ -1,32 +1,32 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Frontend\Homepage\Elements;
 
 use Behat\Mink\Element\NodeElement;
-use Shopware\Tests\Mink\Helper;
-use Shopware\Tests\Mink\HelperSelectorInterface;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
 
 /**
  * Element: ManufacturerSlider
@@ -35,10 +35,10 @@
  * Available retrievable properties:
  * - address (Element[], please use Account::checkAddress())
  */
-class ManufacturerSlider extends SliderElement implements HelperSelectorInterface
+class ManufacturerSlider extends SliderElement
 {
     /**
-     * @var array
+     * @var array<string, string>
      */
     protected $selector = ['css' => 'div.emotion--manufacturer'];
 
diff --git a/tests/Mink/features/bootstrap/Element/SearchForm.php b/tests/Mink/Page/Frontend/Homepage/Elements/SearchForm.php
similarity index 64%
rename from tests/Mink/features/bootstrap/Element/SearchForm.php
rename to tests/Mink/Page/Frontend/Homepage/Elements/SearchForm.php
index a77872889e3..60a5f2e3098 100644
--- a/tests/Mink/features/bootstrap/Element/SearchForm.php
+++ b/tests/Mink/Page/Frontend/Homepage/Elements/SearchForm.php
@@ -1,30 +1,32 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Frontend\Homepage\Elements;
 
 use SensioLabs\Behat\PageObjectExtension\PageObject\Element;
+use Shopware\Tests\Mink\Tests\General\Helpers\HelperSelectorInterface;
 
 /**
  * Element: SearchForm
@@ -33,7 +35,7 @@
  * Available retrievable properties:
  * - address (Element[], please use Account::checkAddress())
  */
-class SearchForm extends Element implements \Shopware\Tests\Mink\HelperSelectorInterface
+class SearchForm extends Element implements HelperSelectorInterface
 {
     /**
      * @var array
diff --git a/tests/Mink/features/bootstrap/Element/SliderElement.php b/tests/Mink/Page/Frontend/Homepage/Elements/SliderElement.php
similarity index 74%
rename from tests/Mink/features/bootstrap/Element/SliderElement.php
rename to tests/Mink/Page/Frontend/Homepage/Elements/SliderElement.php
index f8343fecb5c..00e68d17441 100644
--- a/tests/Mink/features/bootstrap/Element/SliderElement.php
+++ b/tests/Mink/Page/Frontend/Homepage/Elements/SliderElement.php
@@ -1,31 +1,33 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Frontend\Homepage\Elements;
 
 use Behat\Mink\Element\NodeElement;
-use Shopware\Tests\Mink\Helper;
+use Shopware\Tests\Mink\Page\Helper\Elements\MultipleElement;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
 
 class SliderElement extends MultipleElement
 {
@@ -42,7 +44,7 @@ public function __call($name, $arguments)
         preg_match('/^get([A-Z]{1}[a-zA-Z]+)Property$/', $name, $property);
 
         if (!$property) {
-            parent::__call($name, $arguments);
+            return parent::__call($name, $arguments);
         }
 
         return $this->getSlideProperty($arguments[0], lcfirst($property[1]));
@@ -74,7 +76,6 @@ public function getSlides(array $properties)
         $elements = Helper::findAllOfElements($this, ['slide']);
         $slides = [];
 
-        /** @var NodeElement $slide */
         foreach ($elements['slide'] as $slide) {
             $slideProperties = [];
 
diff --git a/tests/Mink/features/bootstrap/Element/YouTube.php b/tests/Mink/Page/Frontend/Homepage/Elements/YouTube.php
similarity index 61%
rename from tests/Mink/features/bootstrap/Element/YouTube.php
rename to tests/Mink/Page/Frontend/Homepage/Elements/YouTube.php
index b17a1acd1eb..63a02fc0321 100644
--- a/tests/Mink/features/bootstrap/Element/YouTube.php
+++ b/tests/Mink/Page/Frontend/Homepage/Elements/YouTube.php
@@ -1,30 +1,32 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Frontend\Homepage\Elements;
 
-use Shopware\Tests\Mink\Helper;
+use Shopware\Tests\Mink\Page\Helper\Elements\MultipleElement;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
 
 /**
  * Element: YouTube
@@ -33,10 +35,10 @@
  * Available retrievable properties:
  * - code (string, e.g. "RVz71XsJIEA")
  */
-class YouTube extends MultipleElement implements \Shopware\Tests\Mink\HelperSelectorInterface
+class YouTube extends MultipleElement
 {
     /**
-     * @var array
+     * @var array<string, string>
      */
     protected $selector = ['css' => 'div.emotion--element.youtube-element'];
 
diff --git a/tests/Mink/features/bootstrap/Page/Homepage.php b/tests/Mink/Page/Frontend/Homepage/Homepage.php
similarity index 82%
rename from tests/Mink/features/bootstrap/Page/Homepage.php
rename to tests/Mink/Page/Frontend/Homepage/Homepage.php
index bf391ad719d..706c3fae7b3 100644
--- a/tests/Mink/features/bootstrap/Page/Homepage.php
+++ b/tests/Mink/Page/Frontend/Homepage/Homepage.php
@@ -1,42 +1,45 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Page;
+namespace Shopware\Tests\Mink\Page\Frontend\Homepage;
 
 use Behat\Mink\Driver\Selenium2Driver;
+use Behat\Mink\Exception\ElementNotFoundException;
 use Behat\Mink\WebAssert;
 use Exception;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Page;
-use Shopware\Tests\Mink\Element\Article;
-use Shopware\Tests\Mink\Element\Banner;
-use Shopware\Tests\Mink\Element\BlogArticle;
-use Shopware\Tests\Mink\Element\CategoryTeaser;
-use Shopware\Tests\Mink\Element\CompareColumn;
-use Shopware\Tests\Mink\Element\SliderElement;
-use Shopware\Tests\Mink\Element\YouTube;
-use Shopware\Tests\Mink\Helper;
-use Shopware\Tests\Mink\HelperSelectorInterface;
+use Shopware\Tests\Mink\Page\Frontend\Article\Elements\Article;
+use Shopware\Tests\Mink\Page\Frontend\Blog\Elements\BlogArticle;
+use Shopware\Tests\Mink\Page\Frontend\Homepage\Elements\Banner;
+use Shopware\Tests\Mink\Page\Frontend\Homepage\Elements\CategoryTeaser;
+use Shopware\Tests\Mink\Page\Frontend\Homepage\Elements\CompareColumn;
+use Shopware\Tests\Mink\Page\Frontend\Homepage\Elements\SearchForm;
+use Shopware\Tests\Mink\Page\Frontend\Homepage\Elements\SliderElement;
+use Shopware\Tests\Mink\Page\Frontend\Homepage\Elements\YouTube;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\HelperSelectorInterface;
 
 class Homepage extends Page implements HelperSelectorInterface
 {
@@ -83,10 +86,8 @@ public function verifyPage()
 
     /**
      * Searches the given term in the shop
-     *
-     * @param string $searchTerm
      */
-    public function searchFor($searchTerm)
+    public function searchFor(string $searchTerm): void
     {
         $data = [
             [
@@ -95,7 +96,7 @@ public function searchFor($searchTerm)
             ],
         ];
 
-        $searchForm = $this->getElement('SearchForm');
+        $searchForm = $this->getElement(SearchForm::class);
         Helper::fillForm($searchForm, 'searchForm', $data);
         Helper::pressNamedButton($searchForm, 'searchButton');
         $this->verifyResponse();
@@ -103,10 +104,8 @@ public function searchFor($searchTerm)
 
     /**
      * Search the given term using live search
-     *
-     * @param string $searchTerm
      */
-    public function receiveSearchResultsFor($searchTerm)
+    public function receiveSearchResultsFor(string $searchTerm): void
     {
         $data = [
             [
@@ -115,13 +114,12 @@ public function receiveSearchResultsFor($searchTerm)
             ],
         ];
 
-        $searchForm = $this->getElement('SearchForm');
+        $searchForm = $this->getElement(SearchForm::class);
         Helper::fillForm($searchForm, 'searchForm', $data);
-        $this->getSession()->wait(10000, "$('ul.results--list').children().length > 0");
-        $this->getSession()->wait(1000);
+        $this->getSession()->wait(250000, "$('ul.results--list').children().length > 0");
     }
 
-    public function receiveNoResultsMessageForKeyword()
+    public function receiveNoResultsMessageForKeyword(): void
     {
         // $keyword gets ignored in responsive template
         $assert = new WebAssert($this->getSession());
@@ -131,11 +129,9 @@ public function receiveNoResultsMessageForKeyword()
     /**
      * Changes the currency
      *
-     * @param string $currency
-     *
-     * @throws \Behat\Mink\Exception\ElementNotFoundException
+     * @throws ElementNotFoundException
      */
-    public function changeCurrency($currency)
+    public function changeCurrency(string $currency): void
     {
         if (!$this->getDriver() instanceof Selenium2Driver) {
             Helper::throwException('Changing the currency in Responsive template requires Javascript!');
@@ -193,7 +189,7 @@ public function checkLinkedBanner(Banner $banner, $image, $link = null)
             return;
         }
 
-        $message = sprintf(
+        $message = \sprintf(
             'The banner %s is "%s" (should be "%s")',
             $result['key'],
             $result['value'],
@@ -249,7 +245,7 @@ public function checkBlogArticles(BlogArticle $blogArticle, $articles)
         }
 
         $message = [
-            sprintf('The slides have a different %s!', $result['key']),
+            \sprintf('The slides have a different %s!', $result['key']),
             'Given: ' . $result['value'],
             'Expected: ' . $result['value2'],
         ];
@@ -297,7 +293,7 @@ public function checkSlider(SliderElement $slider, array $slides)
         }
 
         $message = [
-            sprintf('The slides have a different %s!', $result['key']),
+            \sprintf('The slides have a different %s!', $result['key']),
             'Given: ' . print_r($result['value'], true),
             'Expected: ' . print_r($result['value2'], true),
         ];
@@ -328,7 +324,7 @@ public function checkManufacturerSlider(SliderElement $slider, array $slides)
         }
 
         $message = [
-            sprintf('The slides have a different %s!', $result['key']),
+            \sprintf('The slides have a different %s!', $result['key']),
             'Given: ' . print_r($result['value'], true),
             'Expected: ' . print_r($result['value2'], true),
         ];
@@ -357,7 +353,7 @@ public function checkCategoryTeaser(CategoryTeaser $teaser, $name, $image, $link
             return;
         }
 
-        $message = sprintf(
+        $message = \sprintf(
             'The category teaser %s is "%s" (should be "%s")',
             $result['key'],
             $result['value'],
@@ -381,7 +377,7 @@ public function checkArticle(Article $article, array $data)
             return;
         }
 
-        $message = sprintf(
+        $message = \sprintf(
             'The article %s is "%s" (should be "%s")',
             $result['key'],
             $result['value'],
diff --git a/tests/Mink/features/bootstrap/Element/Paging.php b/tests/Mink/Page/Frontend/Listing/Elements/Paging.php
similarity index 70%
rename from tests/Mink/features/bootstrap/Element/Paging.php
rename to tests/Mink/Page/Frontend/Listing/Elements/Paging.php
index 668df7c20e5..72027fb87f0 100644
--- a/tests/Mink/features/bootstrap/Element/Paging.php
+++ b/tests/Mink/Page/Frontend/Listing/Elements/Paging.php
@@ -5,29 +5,29 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Frontend\Listing\Elements;
 
 use SensioLabs\Behat\PageObjectExtension\PageObject\Element;
-use Shopware\Tests\Mink\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\HelperSelectorInterface;
 
 /**
  * Element: Paging
@@ -36,7 +36,7 @@
  * Available retrievable properties:
  * - address (Element[], please use Account::checkAddress())
  */
-class Paging extends Element implements \Shopware\Tests\Mink\HelperSelectorInterface
+class Paging extends Element implements HelperSelectorInterface
 {
     /**
      * @var array
@@ -76,7 +76,7 @@ public function moveDirection($direction, $steps = 1)
 
             if ($result !== true) {
                 Helper::throwException(
-                    [sprintf('There is no more "%s" button! (after %d steps)', $direction, $i)]
+                    [\sprintf('There is no more "%s" button! (after %d steps)', $direction, $i)]
                 );
             }
 
@@ -91,7 +91,7 @@ public function moveToPage($page)
     {
         while (!$this->hasLink($page)) {
             if ($this->noElement('next', false)) {
-                $message = sprintf('Page %d was not found!', $page);
+                $message = \sprintf('Page %d was not found!', $page);
                 Helper::throwException($message);
             }
             $this->moveDirection('next');
@@ -108,9 +108,9 @@ public function moveToPage($page)
      */
     public function noElement($locator, $throwException = true)
     {
-        if (Helper::getRequiredSelector($this, $locator)) { //previous or next
+        if (Helper::getRequiredSelector($this, $locator)) { // previous or next
             $result = Helper::countElements($this, $locator);
-        } else { //page number (1, 2, 3, 4, ...)
+        } else { // page number (1, 2, 3, 4, ...)
             $result = !$this->hasLink($locator);
         }
 
@@ -119,7 +119,7 @@ public function noElement($locator, $throwException = true)
         }
 
         if ($throwException) {
-            $message = sprintf('The Paging Link "%s" exists, but should not!', $locator);
+            $message = \sprintf('The Paging Link "%s" exists, but should not!', $locator);
             Helper::throwException($message);
         }
 
diff --git a/tests/Mink/features/bootstrap/Page/Listing.php b/tests/Mink/Page/Frontend/Listing/Listing.php
similarity index 72%
rename from tests/Mink/features/bootstrap/Page/Listing.php
rename to tests/Mink/Page/Frontend/Listing/Listing.php
index 5b96efb46ba..dffe66c38c4 100644
--- a/tests/Mink/features/bootstrap/Page/Listing.php
+++ b/tests/Mink/Page/Frontend/Listing/Listing.php
@@ -1,36 +1,36 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Page;
+namespace Shopware\Tests\Mink\Page\Frontend\Listing;
 
-use Behat\Mink\Element\NodeElement;
 use Exception;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Page;
-use Shopware\Tests\Mink\Element\ArticleBox;
-use Shopware\Tests\Mink\Element\FilterGroup;
-use Shopware\Tests\Mink\Helper;
-use Shopware\Tests\Mink\HelperSelectorInterface;
+use Shopware\Tests\Mink\Page\Frontend\Article\Elements\ArticleBox;
+use Shopware\Tests\Mink\Page\Helper\Elements\FilterGroup;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\HelperSelectorInterface;
 
 class Listing extends Page implements HelperSelectorInterface
 {
@@ -129,9 +129,8 @@ public function filter(FilterGroup $filterGroups, array $properties)
     {
         $this->clickLink('Filtern');
 
-        $this->spin(function () {
+        Helper::spin(function () {
             $elements = Helper::findElements($this, ['filterShowResults']);
-            /** @var NodeElement $showResults */
             $showResults = $elements['filterShowResults'];
             if ($showResults->isVisible()) {
                 return true;
@@ -154,10 +153,10 @@ public function filter(FilterGroup $filterGroups, array $properties)
      */
     public function checkView($view)
     {
-        $elements = array_filter(Helper::findElements($this, ['viewTable', 'viewList'], false));
+        $elements = Helper::findElements($this, ['viewTable', 'viewList'], false);
 
         if (key($elements) !== $view) {
-            $message = sprintf('"%s" is active! (should be "%s")', key($elements), $view);
+            $message = \sprintf('"%s" is active! (should be "%s")', key($elements), $view);
             Helper::throwException($message);
         }
     }
@@ -177,7 +176,7 @@ public function checkListing($name, $negation = false)
         }
 
         if (!$result) {
-            $message = sprintf(
+            $message = \sprintf(
                 'The article "%s" is%s in the listing, but should%s.',
                 $name,
                 $negation ? '' : ' not',
@@ -201,7 +200,7 @@ public function checkArticleBox(ArticleBox $articleBox, array $properties)
             return;
         }
 
-        $message = sprintf(
+        $message = \sprintf(
             'The %s is "%s" (should be "%s")',
             $result['key'],
             $result['value'],
@@ -211,37 +210,6 @@ public function checkArticleBox(ArticleBox $articleBox, array $properties)
         Helper::throwException($message);
     }
 
-    /**
-     * Based on Behat's own example
-     *
-     * @see http://docs.behat.org/en/v2.5/cookbook/using_spin_functions.html#adding-a-timeout
-     *
-     * @param callable $lambda
-     * @param int      $wait
-     *
-     * @throws Exception
-     *
-     * @return bool
-     */
-    public function spin($lambda, $wait = 60)
-    {
-        $time = time();
-        $stopTime = $time + $wait;
-        while (time() < $stopTime) {
-            try {
-                if ($lambda($this)) {
-                    return true;
-                }
-            } catch (Exception $e) {
-                // do nothing
-            }
-
-            usleep(250000);
-        }
-
-        throw new Exception("Spin function timed out after {$wait} seconds");
-    }
-
     /**
      * Resets all filters
      */
@@ -253,11 +221,10 @@ protected function resetFilters()
             return;
         }
         $elements = Helper::findElements($this, ['filterShowResults']);
-        /** @var NodeElement $showResults */
         $showResults = $elements['filterShowResults'];
 
         $activeProperties[0]->click();
-        $this->spin(function () use ($showResults) {
+        Helper::spin(function () use ($showResults) {
             if (!$showResults->hasClass('is--loading')) {
                 usleep(100);
 
@@ -277,13 +244,11 @@ protected function resetFilters()
     protected function setFilters(FilterGroup $filterGroups, array $properties)
     {
         $elements = Helper::findElements($this, ['filterShowResults']);
-        /** @var NodeElement $showResults */
         $showResults = $elements['filterShowResults'];
 
         foreach ($properties as $property) {
             $found = false;
 
-            /** @var FilterGroup $filterGroup */
             foreach ($filterGroups as $filterGroup) {
                 $filterGroupName = rtrim($filterGroup->getText(), ' +');
 
@@ -292,11 +257,11 @@ protected function setFilters(FilterGroup $filterGroups, array $properties)
                     $success = $filterGroup->setProperty($property['value']);
 
                     if (!$success) {
-                        $message = sprintf('The value "%s" was not found for filter "%s"!', $property['value'], $property['filter']);
+                        $message = \sprintf('The value "%s" was not found for filter "%s"!', $property['value'], $property['filter']);
                         Helper::throwException($message);
                     }
 
-                    $this->spin(function () use ($showResults) {
+                    Helper::spin(function () use ($showResults) {
                         if (!$showResults->hasClass('is--loading')) {
                             return true;
                         }
@@ -309,41 +274,12 @@ protected function setFilters(FilterGroup $filterGroups, array $properties)
             }
 
             if (!$found) {
-                $message = sprintf('The filter "%s" was not found!', $property['filter']);
+                $message = \sprintf('The filter "%s" was not found!', $property['filter']);
                 Helper::throwException($message);
             }
         }
     }
 
-    /**
-     * Based on Behat's own example
-     *
-     * @see http://docs.behat.org/en/v2.5/cookbook/using_spin_functions.html#adding-a-timeout
-     *
-     * @param callable $lambda
-     * @param int      $wait
-     *
-     * @return bool
-     */
-    protected function spinWithNoException($lambda, $wait = 60)
-    {
-        $time = time();
-        $stopTime = $time + $wait;
-        while (time() < $stopTime) {
-            try {
-                if ($lambda($this)) {
-                    return true;
-                }
-            } catch (Exception $e) {
-                // do nothing
-            }
-
-            usleep(250000);
-        }
-
-        return false;
-    }
-
     /**
      * Checks, if a product is in the listing
      *
@@ -367,9 +303,8 @@ private function isArticleInListing($name)
     private function pressShowResults()
     {
         $elements = Helper::findElements($this, ['filterShowResults']);
-        /** @var NodeElement $showResults */
         $showResults = $elements['filterShowResults'];
-        $this->spin(function () use ($showResults) {
+        Helper::spin(function () use ($showResults) {
             if (!$showResults->hasClass('is--loading')) {
                 return true;
             }
diff --git a/tests/Mink/features/bootstrap/Page/Newsletter.php b/tests/Mink/Page/Frontend/Newsletter/Newsletter.php
similarity index 84%
rename from tests/Mink/features/bootstrap/Page/Newsletter.php
rename to tests/Mink/Page/Frontend/Newsletter/Newsletter.php
index b1f35ec8e40..ea615bf2818 100644
--- a/tests/Mink/features/bootstrap/Page/Newsletter.php
+++ b/tests/Mink/Page/Frontend/Newsletter/Newsletter.php
@@ -1,33 +1,34 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Page;
+namespace Shopware\Tests\Mink\Page\Frontend\Newsletter;
 
 use Exception;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Page;
-use Shopware\Tests\Mink\Helper;
-use Shopware\Tests\Mink\HelperSelectorInterface;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\HelperSelectorInterface;
 
 class Newsletter extends Page implements HelperSelectorInterface
 {
diff --git a/tests/Mink/features/bootstrap/Element/NotePosition.php b/tests/Mink/Page/Frontend/Note/Elements/NotePosition.php
similarity index 72%
rename from tests/Mink/features/bootstrap/Element/NotePosition.php
rename to tests/Mink/Page/Frontend/Note/Elements/NotePosition.php
index 5544473164a..9020ee65e5e 100644
--- a/tests/Mink/features/bootstrap/Element/NotePosition.php
+++ b/tests/Mink/Page/Frontend/Note/Elements/NotePosition.php
@@ -1,31 +1,32 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Frontend\Note\Elements;
 
-use Shopware\Tests\Mink\Helper;
-use Shopware\Tests\Mink\HelperSelectorInterface;
+use Shopware\Tests\Mink\Page\Helper\Elements\MultipleElement;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
 
 /**
  * Element: NotePosition
@@ -34,17 +35,17 @@
  * Available retrievable properties:
  * - address (Element[], please use Account::checkAddress())
  */
-class NotePosition extends CartPosition implements HelperSelectorInterface
+class NotePosition extends MultipleElement
 {
     /**
-     * @var array
+     * @var array<string, string>
      */
     protected $selector = ['css' => 'div.note--item'];
 
     /**
      * {@inheritdoc}
      */
-    public function getCssSelectors()
+    public function getCssSelectors(): array
     {
         return [
             'name' => 'a.note--title',
@@ -60,7 +61,7 @@ public function getCssSelectors()
     /**
      * {@inheritdoc}
      */
-    public function getNamedSelectors()
+    public function getNamedSelectors(): array
     {
         return [
             'remove' => ['de' => 'Löschen',       'en' => 'Delete'],
@@ -70,10 +71,8 @@ public function getNamedSelectors()
 
     /**
      * Returns the product name
-     *
-     * @return string
      */
-    public function getNameProperty()
+    public function getNameProperty(): string
     {
         $elements = Helper::findElements($this, ['name', 'thumbnailLink', 'thumbnailImage', 'detailLink']);
 
@@ -89,10 +88,8 @@ public function getNameProperty()
 
     /**
      * Returns the image source path
-     *
-     * @return string
      */
-    public function getImageProperty()
+    public function getImageProperty(): string
     {
         $element = Helper::findElements($this, ['thumbnailImage']);
 
@@ -101,10 +98,8 @@ public function getImageProperty()
 
     /**
      * Returns the link to the product
-     *
-     * @return string
      */
-    public function getLinkProperty()
+    public function getLinkProperty(): string
     {
         $elements = Helper::findElements($this, ['name', 'thumbnailLink', 'detailLink']);
 
diff --git a/tests/Mink/features/bootstrap/Page/Note.php b/tests/Mink/Page/Frontend/Note/Note.php
similarity index 77%
rename from tests/Mink/features/bootstrap/Page/Note.php
rename to tests/Mink/Page/Frontend/Note/Note.php
index 56fb400e20d..b8987e32e4d 100644
--- a/tests/Mink/features/bootstrap/Page/Note.php
+++ b/tests/Mink/Page/Frontend/Note/Note.php
@@ -1,33 +1,34 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Page;
+namespace Shopware\Tests\Mink\Page\Frontend\Note;
 
 use Exception;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Page;
-use Shopware\Tests\Mink\Element\NotePosition;
-use Shopware\Tests\Mink\Helper;
+use Shopware\Tests\Mink\Page\Frontend\Note\Elements\NotePosition;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
 
 class Note extends Page
 {
@@ -58,7 +59,7 @@ public function fillNoteWithProducts(array $items)
         $originalPath = $this->path;
 
         foreach ($items as $item) {
-            $this->path = sprintf('/note/add/ordernumber/%s', $item['number']);
+            $this->path = \sprintf('/note/add/ordernumber/%s', $item['number']);
             $this->open();
         }
 
diff --git a/tests/Mink/features/bootstrap/Element/SitemapGroup.php b/tests/Mink/Page/Frontend/Sitemap/Elements/SitemapGroup.php
similarity index 79%
rename from tests/Mink/features/bootstrap/Element/SitemapGroup.php
rename to tests/Mink/Page/Frontend/Sitemap/Elements/SitemapGroup.php
index 6d7c77b8b1d..543c8c51fdf 100644
--- a/tests/Mink/features/bootstrap/Element/SitemapGroup.php
+++ b/tests/Mink/Page/Frontend/Sitemap/Elements/SitemapGroup.php
@@ -1,30 +1,32 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Frontend\Sitemap\Elements;
 
 use Behat\Mink\Element\NodeElement;
+use Shopware\Tests\Mink\Page\Helper\Elements\MultipleElement;
 
 /**
  * Element: SitemapGroup
@@ -36,7 +38,7 @@
 class SitemapGroup extends MultipleElement
 {
     /**
-     * @var array
+     * @var array<string, string>
      */
     protected $selector = ['css' => '.sitemap--navigation-head'];
 
@@ -71,7 +73,6 @@ public function getTitle()
      */
     public function getTitleLinkData(array $element)
     {
-        /** @var NodeElement $titleLink */
         $titleLink = $element[0];
 
         return [
@@ -91,7 +92,6 @@ public function getLevel1Data(array $elements)
     {
         $result = [];
 
-        /** @var NodeElement $element */
         foreach ($elements as $element) {
             $result[] = [
                 'value' => $element->getText(),
diff --git a/tests/Mink/features/bootstrap/Page/Sitemap.php b/tests/Mink/Page/Frontend/Sitemap/Sitemap.php
similarity index 71%
rename from tests/Mink/features/bootstrap/Page/Sitemap.php
rename to tests/Mink/Page/Frontend/Sitemap/Sitemap.php
index c15d6054952..63b8d76c266 100644
--- a/tests/Mink/features/bootstrap/Page/Sitemap.php
+++ b/tests/Mink/Page/Frontend/Sitemap/Sitemap.php
@@ -1,33 +1,34 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Page;
+namespace Shopware\Tests\Mink\Page\Frontend\Sitemap;
 
 use Exception;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Page;
-use Shopware\Tests\Mink\Element\SitemapGroup;
-use Shopware\Tests\Mink\Helper;
+use Shopware\Tests\Mink\Page\Frontend\Sitemap\Elements\SitemapGroup;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
 
 class Sitemap extends Page
 {
@@ -46,14 +47,13 @@ public function open(array $urlParameters = ['xml' => ''])
 
     /**
      * @param SitemapGroup|string $group
-     * @param string              $link
      *
      * @throws Exception
      */
-    public function checkGroup($group, $link, array $sites)
+    public function checkGroup($group, string $link, array $sites): void
     {
         if (!($group instanceof SitemapGroup)) {
-            $message = sprintf('Sitemap group "%s" was not found!', $group);
+            $message = \sprintf('Sitemap group "%s" was not found!', $group);
             Helper::throwException($message);
         }
 
@@ -105,14 +105,14 @@ private function checkGroupTitleLink($title, $link, array $data)
         }
 
         if ($result === 'title') {
-            $message = sprintf('Title of "%s" has a different value! (is "%s")', $check['title'][1], $check['title'][0]);
+            $message = \sprintf('Title of "%s" has a different value! (is "%s")', $check['title'][1], $check['title'][0]);
         } elseif (empty($link)) {
             $message = [
-                sprintf('There is a link for the group "%s"!', $title),
+                \sprintf('There is a link for the group "%s"!', $title),
                 $check['link'][0],
             ];
         } else {
-            $message = sprintf('The link of "%s" is different! ("%s" not found in "%s")', $title, $check['link'][1], $check['link'][0]);
+            $message = \sprintf('The link of "%s" is different! ("%s" not found in "%s")', $title, $check['link'][1], $check['link'][0]);
         }
 
         Helper::throwException($message);
@@ -140,7 +140,7 @@ private function checkGroupSite($title, $link, array $data)
             }
         }
 
-        $message = sprintf('The site "%s" with link "%s" was not found!', $title, $link);
+        $message = \sprintf('The site "%s" with link "%s" was not found!', $title, $link);
         Helper::throwException($message);
     }
 }
diff --git a/tests/Mink/features/bootstrap/Page/SitemapIndexXml.php b/tests/Mink/Page/Frontend/Sitemap/SitemapIndexXml.php
similarity index 58%
rename from tests/Mink/features/bootstrap/Page/SitemapIndexXml.php
rename to tests/Mink/Page/Frontend/Sitemap/SitemapIndexXml.php
index 0d32523acca..a1ad3e48cf5 100644
--- a/tests/Mink/features/bootstrap/Page/SitemapIndexXml.php
+++ b/tests/Mink/Page/Frontend/Sitemap/SitemapIndexXml.php
@@ -5,30 +5,29 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Page;
+namespace Shopware\Tests\Mink\Page\Frontend\Sitemap;
 
 use Exception;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Page;
-use Shopware\Tests\Mink\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
 
 class SitemapIndexXml extends Page
 {
@@ -50,9 +49,9 @@ public function checkXml(array $links)
             Helper::throwException('Sitemap is missing in /sitemap_index.xml');
         }
 
-        $expected = sprintf('%s/web/sitemap/shop-1/%s', $homepageUrl, $links[0]['name']);
-        if ($xml['sitemap']['loc'] !== $expected) {
-            Helper::throwException(sprintf('Sitemap url does not match excepted, excepted: %s, given %s', $expected, $xml['sitemap']['loc']));
+        $expected = \sprintf('/web/sitemap/shop-1/%s', $links[0]['name']);
+        if (!str_contains($xml['sitemap']['loc'], $expected)) {
+            Helper::throwException(\sprintf('Sitemap url does not match excepted, excepted: %s, given %s', $expected, $xml['sitemap']['loc']));
         }
     }
 }
diff --git a/tests/Mink/features/bootstrap/Element/BannerSlider.php b/tests/Mink/Page/Helper/Elements/BannerSlider.php
similarity index 68%
rename from tests/Mink/features/bootstrap/Element/BannerSlider.php
rename to tests/Mink/Page/Helper/Elements/BannerSlider.php
index 04cfb46fcc9..dd4d1c0577b 100644
--- a/tests/Mink/features/bootstrap/Element/BannerSlider.php
+++ b/tests/Mink/Page/Helper/Elements/BannerSlider.php
@@ -1,31 +1,33 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Helper\Elements;
 
 use Behat\Mink\Element\NodeElement;
-use Shopware\Tests\Mink\Helper;
+use Shopware\Tests\Mink\Page\Frontend\Homepage\Elements\SliderElement;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
 
 /**
  * Element: BannerSlider
@@ -37,17 +39,17 @@
  * - alt (string, e.g. "foo")
  * - title (string, e.g. "bar")
  */
-class BannerSlider extends SliderElement implements \Shopware\Tests\Mink\HelperSelectorInterface
+class BannerSlider extends SliderElement
 {
     /**
-     * @var array
+     * @var array<string, string>
      */
     protected $selector = ['css' => 'div.emotion--banner-slider'];
 
     /**
      * {@inheritdoc}
      */
-    public function getCssSelectors()
+    public function getCssSelectors(): array
     {
         return [
             'slide' => 'div.banner-slider--item',
@@ -58,10 +60,8 @@ public function getCssSelectors()
 
     /**
      * Returns the slide image
-     *
-     * @return string
      */
-    public function getImageProperty(NodeElement $slide)
+    public function getImageProperty(NodeElement $slide): string
     {
         $selector = Helper::getRequiredSelector($this, 'slideImage');
 
@@ -70,10 +70,8 @@ public function getImageProperty(NodeElement $slide)
 
     /**
      * Returns the slide link
-     *
-     * @return string|null
      */
-    public function getLinkProperty(NodeElement $slide)
+    public function getLinkProperty(NodeElement $slide): ?string
     {
         $selector = Helper::getRequiredSelector($this, 'slideLink');
 
@@ -82,10 +80,8 @@ public function getLinkProperty(NodeElement $slide)
 
     /**
      * Returns the alt-attribute of the slide image
-     *
-     * @return string|null
      */
-    protected function getAltProperty(NodeElement $slide)
+    protected function getAltProperty(NodeElement $slide): ?string
     {
         $selector = Helper::getRequiredSelector($this, 'slideImage');
 
diff --git a/tests/Mink/features/bootstrap/Element/FilterGroup.php b/tests/Mink/Page/Helper/Elements/FilterGroup.php
similarity index 73%
rename from tests/Mink/features/bootstrap/Element/FilterGroup.php
rename to tests/Mink/Page/Helper/Elements/FilterGroup.php
index 9a950bba64f..5bd35817856 100644
--- a/tests/Mink/features/bootstrap/Element/FilterGroup.php
+++ b/tests/Mink/Page/Helper/Elements/FilterGroup.php
@@ -1,31 +1,31 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Helper\Elements;
 
-use Behat\Mink\Element\NodeElement;
-use Shopware\Tests\Mink\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
 
 /**
  * Element: FilterGroup
@@ -37,7 +37,7 @@
 class FilterGroup extends MultipleElement
 {
     /**
-     * @var array
+     * @var array<string, string>
      */
     protected $selector = ['css' => 'div.filter--container label.filter-panel--title'];
 
@@ -62,7 +62,6 @@ public function setProperty($propertyName)
 
         $elements = Helper::findElements($this, ['properties']);
 
-        /** @var NodeElement $propertyContainer */
         $propertyContainer = $elements['properties'];
 
         if (!$propertyContainer->hasField($propertyName)) {
diff --git a/tests/Mink/features/bootstrap/Element/HeaderCart.php b/tests/Mink/Page/Helper/Elements/HeaderCart.php
similarity index 66%
rename from tests/Mink/features/bootstrap/Element/HeaderCart.php
rename to tests/Mink/Page/Helper/Elements/HeaderCart.php
index 873b84310fe..df3ed1a7b9e 100644
--- a/tests/Mink/features/bootstrap/Element/HeaderCart.php
+++ b/tests/Mink/Page/Helper/Elements/HeaderCart.php
@@ -1,32 +1,34 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Helper\Elements;
 
 use Exception;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Element;
-use Shopware\Tests\Mink\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\HelperSelectorInterface;
 
 /**
  * Element: HeaderCart
@@ -35,7 +37,7 @@
  * Available retrievable properties:
  * - address (Element[], please use Account::checkAddress())
  */
-class HeaderCart extends Element implements \Shopware\Tests\Mink\HelperSelectorInterface
+class HeaderCart extends Element implements HelperSelectorInterface
 {
     /**
      * @var array
@@ -63,12 +65,9 @@ public function getNamedSelectors()
     }
 
     /**
-     * @param string $quantity
-     * @param float  $amount
-     *
      * @throws Exception
      */
-    public function checkCart($quantity, $amount)
+    public function checkCart(int $quantity, string $amount): void
     {
         $element = Helper::findElements($this, ['quantity', 'amount']);
 
@@ -80,7 +79,7 @@ public function checkCart($quantity, $amount)
         $result = Helper::checkArray($check);
 
         if ($result !== true) {
-            $message = sprintf(
+            $message = \sprintf(
                 'The %s of the header cart is wrong! (%s instead of %s)',
                 $result,
                 $check[$result][0],
@@ -89,11 +88,4 @@ public function checkCart($quantity, $amount)
             Helper::throwException($message);
         }
     }
-
-    public function clickCart()
-    {
-        $element = Helper::findElements($this, 'link');
-
-        $element['link']->click();
-    }
 }
diff --git a/tests/Mink/features/bootstrap/Element/LanguageSwitcher.php b/tests/Mink/Page/Helper/Elements/LanguageSwitcher.php
similarity index 57%
rename from tests/Mink/features/bootstrap/Element/LanguageSwitcher.php
rename to tests/Mink/Page/Helper/Elements/LanguageSwitcher.php
index 4c740ec9f70..245d8439016 100644
--- a/tests/Mink/features/bootstrap/Element/LanguageSwitcher.php
+++ b/tests/Mink/Page/Helper/Elements/LanguageSwitcher.php
@@ -1,31 +1,34 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Helper\Elements;
 
+use Behat\Mink\Exception\ElementNotFoundException;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Element;
-use Shopware\Tests\Mink\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\HelperSelectorInterface;
 
 /**
  * Element: LanguageSwitcher
@@ -34,17 +37,17 @@
  * Available retrievable properties:
  * - address (Element[], please use Account::checkAddress())
  */
-class LanguageSwitcher extends Element implements \Shopware\Tests\Mink\HelperSelectorInterface
+class LanguageSwitcher extends Element implements HelperSelectorInterface
 {
     /**
-     * @var array
+     * @var array<string, string>
      */
     protected $selector = ['css' => 'div.top-bar--language select.language--select'];
 
     /**
      * {@inheritdoc}
      */
-    public function getCssSelectors()
+    public function getCssSelectors(): array
     {
         return [
             'languages' => 'option',
@@ -54,7 +57,7 @@ public function getCssSelectors()
     /**
      * {@inheritdoc}
      */
-    public function getNamedSelectors()
+    public function getNamedSelectors(): array
     {
         return [];
     }
@@ -62,17 +65,14 @@ public function getNamedSelectors()
     /**
      * Returns the current language
      * Use this only for asserts. If you only need the current language, use Helper::getCurrentLanguage().
-     *
-     * @return string
      */
-    public function getCurrentLanguage()
+    public function getCurrentLanguage(): string
     {
         $languageKeys = [1 => 'de', 2 => 'en'];
 
-        $languages = $this->findAll('css', Helper::getRequiredSelector($this, 'languages'));
+        $selector = Helper::getRequiredSelector($this, 'languages');
 
-        /** @var Element $language */
-        foreach ($languages as $language) {
+        foreach ($this->findAll('css', $selector) as $language) {
             if ($language->getAttribute('selected')) {
                 return $languageKeys[$language->getAttribute('value')];
             }
@@ -84,11 +84,9 @@ public function getCurrentLanguage()
     /**
      * Changes the language
      *
-     * @param string $language
-     *
-     * @throws \Behat\Mink\Exception\ElementNotFoundException
+     * @throws ElementNotFoundException
      */
-    public function setLanguage($language)
+    public function setLanguage(string $language): void
     {
         $this->selectOption($language);
         Helper::setCurrentLanguage($language);
diff --git a/tests/Mink/features/bootstrap/Element/MultipleElement.php b/tests/Mink/Page/Helper/Elements/MultipleElement.php
similarity index 55%
rename from tests/Mink/features/bootstrap/Element/MultipleElement.php
rename to tests/Mink/Page/Helper/Elements/MultipleElement.php
index 61cacfb44c8..9ef6774e231 100644
--- a/tests/Mink/features/bootstrap/Element/MultipleElement.php
+++ b/tests/Mink/Page/Helper/Elements/MultipleElement.php
@@ -1,48 +1,49 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink\Element;
+namespace Shopware\Tests\Mink\Page\Helper\Elements;
 
+use Behat\Mink\Element\Element as MinkElement;
 use Behat\Mink\Element\NodeElement;
 use Behat\Mink\Session;
 use Countable;
 use Iterator;
+use ReturnTypeWillChange;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Element;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Factory;
-use Shopware\Tests\Mink\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\HelperSelectorInterface;
 
-abstract class MultipleElement extends Element implements Countable, Iterator, \Shopware\Tests\Mink\HelperSelectorInterface
+abstract class MultipleElement extends Element implements Countable, Iterator, HelperSelectorInterface
 {
-    /**
-     * @var string
-     */
-    private $xPath;
+    private string $xPath = '';
 
     /**
-     * @var NodeElement[] array
+     * @var array<NodeElement> array
      */
-    private $siblings;
+    private array $siblings;
 
     public function __construct(Session $session, Factory $factory)
     {
@@ -64,7 +65,7 @@ public function __call($name, $arguments)
         preg_match('/^get([A-Z]{1}[a-zA-Z]+)Property$/', $name, $property);
 
         if (!$property) {
-            parent::__call($name, $arguments);
+            return parent::__call($name, $arguments);
         }
 
         return $this->getProperty(lcfirst($property[1]));
@@ -89,9 +90,9 @@ public function getNamedSelectors()
     /**
      * Have to be called after get the MultipleElement to find all its siblings
      *
-     * @return $this
+     * @return static
      */
-    public function setParent(\Behat\Mink\Element\Element $parent)
+    public function setParent(MinkElement $parent)
     {
         \assert(\is_array($this->selector));
         $selectorType = key($this->selector);
@@ -109,10 +110,8 @@ public function setParent(\Behat\Mink\Element\Element $parent)
 
     /**
      * Returns the XPath of the current element
-     *
-     * @return string
      */
-    public function getXpath()
+    public function getXpath(): string
     {
         return $this->xPath;
     }
@@ -120,11 +119,9 @@ public function getXpath()
     /**
      * Sets the instance to the element to use.
      *
-     * @param int $position
-     *
-     * @return MultipleElement $this
+     * @return static
      */
-    public function setInstance($position = 0)
+    public function setInstance(int $position = 0)
     {
         $position = ($position > 0) ? $position - 1 : $this->key();
         $this->xPath = $this->siblings[$position]->getXpath();
@@ -132,42 +129,21 @@ public function setInstance($position = 0)
         return $this;
     }
 
-    /**
-     * (PHP 5 &gt;= 5.1.0)<br/>
-     * Count elements of an object
-     *
-     * @see http://php.net/manual/en/countable.count.php
-     *
-     * @return int the custom count as an integer.
-     *             </p>
-     *             <p>
-     *             The return value is cast to an integer
-     */
-    public function count()
+    public function count(): int
     {
         return \count($this->siblings);
     }
 
     /**
-     * (PHP 5 &gt;= 5.0.0)<br/>
-     * Return the current element
-     *
-     * @see http://php.net/manual/en/iterator.current.php
-     *
-     * @return MultipleElement can return any type
+     * @return static
      */
+    #[ReturnTypeWillChange]
     public function current()
     {
         return $this;
     }
 
-    /**
-     * (PHP 5 &gt;= 5.0.0)<br/>
-     * Move forward to next element
-     *
-     * @see http://php.net/manual/en/iterator.next.php
-     */
-    public function next()
+    public function next(): void
     {
         next($this->siblings);
         if ($this->valid()) {
@@ -176,55 +152,30 @@ public function next()
     }
 
     /**
-     * (PHP 5 &gt;= 5.0.0)<br/>
-     * Return the key of the current element
-     *
-     * @see http://php.net/manual/en/iterator.key.php
-     *
      * @return mixed scalar on success, or null on failure
      */
+    #[ReturnTypeWillChange]
     public function key()
     {
         return key($this->siblings);
     }
 
-    /**
-     * (PHP 5 &gt;= 5.0.0)<br/>
-     * Checks if current position is valid
-     *
-     * @see http://php.net/manual/en/iterator.valid.php
-     *
-     * @return bool the return value will be casted to boolean and then evaluated.
-     *              Returns true on success or false on failure
-     */
-    public function valid()
+    public function valid(): bool
     {
         return (bool) current($this->siblings);
     }
 
-    /**
-     * (PHP 5 &gt;= 5.0.0)<br/>
-     * Rewind the Iterator to the first element
-     *
-     * @see http://php.net/manual/en/iterator.rewind.php
-     */
-    public function rewind()
+    public function rewind(): void
     {
         reset($this->siblings);
         $this->setInstance();
     }
 
-    /**
-     * Removes the current element
-     */
-    public function remove()
+    public function remove(): void
     {
         unset($this->siblings[$this->key()]);
     }
 
-    /**
-     * Default method to get an element property
-     */
     public function getProperty(string $property): string
     {
         $element = Helper::findElements($this, [$property]);
diff --git a/tests/Mink/README.md b/tests/Mink/README.md
index fba54b5608b..b2e83261afd 100644
--- a/tests/Mink/README.md
+++ b/tests/Mink/README.md
@@ -29,13 +29,13 @@ Make sure Selenium is up and running.
 ### Run single feature
 
 ```shell
-./behat features/search.feature
+./behat Tests/Frontend/Homepage/search.feature
 ```
 
 To append unimplemented snippets to a context
 
 ```shell
-./behat features/search.feature --append-snippets
+./behat Tests/Frontend/Homepage/search.feature --append-snippets
 ```
 
 ## Selenium
@@ -45,18 +45,17 @@ Note that you need a Java SDK installation on your system.
 ### Download
 
 ```shell
-wget http://selenium-release.storage.googleapis.com/3.10/selenium-server-standalone-3.10.0.jar
+wget http://selenium-release.storage.googleapis.com/3.141/selenium-server-standalone-3.141.59.jar
 ```
 
 ### Install chromedriver
 
 Check the version of your Chrome first.
 You might need to adjust the version.
-Open https://chromedriver.storage.googleapis.com to see available versions.
+Open https://chromedriver.chromium.org/home and follow the instructions to get the chromedriver.
 
 ```shell
-sudo apt install -y unzip xvfb libxi6 libgconf-2-4
-wget https://chromedriver.storage.googleapis.com/92.0.4515.107/chromedriver_linux64.zip
+wget https://storage.googleapis.com/chrome-for-testing-public/122.0.6261.128/linux64/chromedriver-linux64.zip
 unzip chromedriver_linux64.zip
 sudo mv chromedriver /usr/bin/chromedriver
 sudo chown root:root /usr/bin/chromedriver
@@ -67,10 +66,10 @@ sudo chmod +x /usr/bin/chromedriver
 
 Opens the mink execution in a browser, so you can see what happens.
 ```shell
-java -jar selenium-server-standalone-3.10.0.jar
+java -jar selenium-server-standalone-3.141.59.jar
 ```
 
 The tests are done in the shell and you see only the Mink output.
 ```shell
-xvfb-run java -Dwebdriver.chrome.driver=/usr/bin/chromedriver -jar selenium-server-standalone-3.10.0.jar
+xvfb-run java -Dwebdriver.chrome.driver=/usr/bin/chromedriver -jar selenium-server-standalone-3.141.59.jar
 ```
diff --git a/tests/Mink/features/backend.feature b/tests/Mink/Tests/Backend/Backend/backend.feature
similarity index 100%
rename from tests/Mink/features/backend.feature
rename to tests/Mink/Tests/Backend/Backend/backend.feature
diff --git a/tests/Mink/Tests/Backend/Backend/bootstrap/BackendContext.php b/tests/Mink/Tests/Backend/Backend/bootstrap/BackendContext.php
new file mode 100644
index 00000000000..e3312ac8481
--- /dev/null
+++ b/tests/Mink/Tests/Backend/Backend/bootstrap/BackendContext.php
@@ -0,0 +1,143 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Mink\Tests\Backend\Backend\bootstrap;
+
+use Shopware\Tests\Mink\Page\Backend\Backend\Backend;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\SubContext;
+
+class BackendContext extends SubContext
+{
+    /**
+     * @Given /^I am logged in to the backend as an admin user$/
+     */
+    public function iAmLoggedInToTheBackendAsAnAdminUser(): void
+    {
+        $page = $this->getPage(Backend::class);
+        $page->open();
+
+        // See if we already are logged in
+        if ($this->waitIfThereIsText('Marketing')) {
+            return;
+        }
+
+        $this->waitForText('Shopware Backend Login', 10);
+
+        $page->login('demo', 'demo');
+        $this->waitForText('Marketing');
+    }
+
+    /**
+     * @When /^I open the module "([^"]*)"$/
+     */
+    public function iOpenTheModule(string $moduleName): void
+    {
+        Helper::spin(static function (BackendContext $context) use ($moduleName) {
+            $backendPage = $context->getPage(Backend::class);
+            $backendPage->openModule($moduleName);
+
+            return true;
+        }, Helper::DEFAULT_WAIT_TIME, $this);
+    }
+
+    /**
+     * @Then /^The module should open a window$/
+     */
+    public function theModuleShouldOpenAWindow(): void
+    {
+        Helper::spin(static function (BackendContext $context) {
+            $backendPage = $context->getPage(Backend::class);
+            $backendPage->verifyModule();
+
+            return true;
+        }, Helper::DEFAULT_WAIT_TIME, $this);
+    }
+
+    /**
+     * @Then I should see a dropdown appear
+     */
+    public function iShouldSeeADropdownAppear(): void
+    {
+        Helper::spin(static function (BackendContext $context) {
+            return $context->getPage(Backend::class)->find('css', '.x-boundlist-item') !== null;
+        }, Helper::DEFAULT_WAIT_TIME, $this);
+    }
+
+    /**
+     * @Then I should see a success message
+     */
+    public function iShouldSeeASuccessMessage(): void
+    {
+        $this->waitIfThereIsText('Erfolgreich');
+    }
+
+    /**
+     * @Then There should be a window with the alias :alias
+     */
+    public function thereShouldBeAWindowWithTheAlias(string $alias): bool
+    {
+        $script = <<<'JS'
+return Shopware.app.Application.getActiveWindows().filter(function(activeWindow) {
+    return activeWindow.alias.some(function (alias) {
+        return alias.endsWith('%s');
+    });
+}).length > 0;
+JS;
+
+        return (bool) $this->getDriver()->evaluateScript(\sprintf($script, $alias));
+    }
+
+    /**
+     * Checks via a string exists
+     */
+    protected function checkIfThereIsText(string $text, SubContext $context): bool
+    {
+        $result = $context->getSession()->getPage()->findAll('xpath', \sprintf("//*[contains(., '%s')]", $text));
+
+        return !empty($result);
+    }
+
+    /**
+     * Checks via spin function if a string exists, with sleep at the beginning (default 2)
+     */
+    protected function waitForText(string $text, int $sleep = 2): void
+    {
+        sleep($sleep);
+        Helper::spin(function (BackendContext $context) use ($text) {
+            return $this->checkIfThereIsText($text, $context);
+        }, Helper::DEFAULT_WAIT_TIME, $this);
+    }
+
+    /**
+     * Checks via spin function if a string exists, with sleep at the beginning (default 5)
+     */
+    protected function waitIfThereIsText(string $text, int $wait = 5): bool
+    {
+        return Helper::spinWithNoException(function (BackendContext $context) use ($text) {
+            return $this->checkIfThereIsText($text, $context);
+        }, $wait, $this);
+    }
+}
diff --git a/tests/Mink/features/bootstrap/BackendContentTypeManagerContext.php b/tests/Mink/Tests/Backend/ContentTypes/bootstrap/BackendContentTypeManagerContext.php
similarity index 68%
rename from tests/Mink/features/bootstrap/BackendContentTypeManagerContext.php
rename to tests/Mink/Tests/Backend/ContentTypes/bootstrap/BackendContentTypeManagerContext.php
index 61ab5bb8e91..10db043d17f 100644
--- a/tests/Mink/features/bootstrap/BackendContentTypeManagerContext.php
+++ b/tests/Mink/Tests/Backend/ContentTypes/bootstrap/BackendContentTypeManagerContext.php
@@ -5,28 +5,29 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink;
+namespace Shopware\Tests\Mink\Tests\Backend\ContentTypes\bootstrap;
 
-use Shopware\Tests\Mink\Page\Backend\ContentTypeManager;
+use SensioLabs\Behat\PageObjectExtension\PageObject\Element;
+use Shopware\Tests\Mink\Page\Backend\ContentTypeManager\ContentTypeManager;
+use Shopware\Tests\Mink\Tests\General\Helpers\SubContext;
 
 class BackendContentTypeManagerContext extends SubContext
 {
@@ -71,6 +72,8 @@ public function iClickOnTheSaveContentTypeButton(): void
 
     /**
      * @When I switch to the :name tab
+     *
+     * @param class-string<Element> $name
      */
     public function iSwitchToTheTab(string $name): void
     {
diff --git a/tests/Mink/features/bootstrap/BackendCustomRecipesContext.php b/tests/Mink/Tests/Backend/ContentTypes/bootstrap/BackendCustomRecipesContext.php
similarity index 58%
rename from tests/Mink/features/bootstrap/BackendCustomRecipesContext.php
rename to tests/Mink/Tests/Backend/ContentTypes/bootstrap/BackendCustomRecipesContext.php
index 054e77f5f40..eec54725a71 100644
--- a/tests/Mink/features/bootstrap/BackendCustomRecipesContext.php
+++ b/tests/Mink/Tests/Backend/ContentTypes/bootstrap/BackendCustomRecipesContext.php
@@ -5,28 +5,28 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink;
+namespace Shopware\Tests\Mink\Tests\Backend\ContentTypes\bootstrap;
 
-use Shopware\Tests\Mink\Page\Backend\CustomRecipes;
+use Shopware\Tests\Mink\Page\Backend\CustomRecipes\CustomRecipes;
+use Shopware\Tests\Mink\Tests\General\Helpers\SubContext;
 
 class BackendCustomRecipesContext extends SubContext
 {
diff --git a/tests/Mink/features/backend_content_types.feature b/tests/Mink/Tests/Backend/ContentTypes/content_types.feature
similarity index 94%
rename from tests/Mink/features/backend_content_types.feature
rename to tests/Mink/Tests/Backend/ContentTypes/content_types.feature
index 1910431e207..040db177201 100644
--- a/tests/Mink/features/backend_content_types.feature
+++ b/tests/Mink/Tests/Backend/ContentTypes/content_types.feature
@@ -23,6 +23,8 @@ Feature: Content Types module should work
         Then I should see a dropdown appear
 
         When I click on the button to save the field
+        And I should see "Produkt"
+        And I should see "Produktauswahl"
         And I click on the button to save the content type
         Then I should see a success message
 
diff --git a/tests/Mink/features/bootstrap/ExportContext.php b/tests/Mink/Tests/Backend/Export/bootstrap/ExportContext.php
similarity index 74%
rename from tests/Mink/features/bootstrap/ExportContext.php
rename to tests/Mink/Tests/Backend/Export/bootstrap/ExportContext.php
index 94106ced013..75291552973 100644
--- a/tests/Mink/features/bootstrap/ExportContext.php
+++ b/tests/Mink/Tests/Backend/Export/bootstrap/ExportContext.php
@@ -5,40 +5,40 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink;
+namespace Shopware\Tests\Mink\Tests\Backend\Export\bootstrap;
 
 use Behat\Gherkin\Node\TableNode;
 use Doctrine\DBAL\Connection;
 use Exception;
 use InvalidArgumentException;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\SubContext;
+use SimpleXMLElement;
 
 class ExportContext extends SubContext
 {
     /**
      * Some config values necessary for the interpretation of the results.
-     *
-     * @var array
      */
-    protected $mappings = [
+    protected array $mappings = [
         'xml' => ['id' => 4713, 'file' => 'export.xml'],
         'csv' => ['id' => 4711, 'delimiter' => ';', 'file' => 'export.csv'],
         'txt tab' => ['id' => 4712, 'delimiter' => "\t", 'file' => 'export.txt'],
@@ -47,33 +47,27 @@ class ExportContext extends SubContext
 
     /**
      * Used for the creation of the test subshop
-     *
-     * @var string
      */
-    private $subShopDomain = 'exporttestshop.test';
+    private string $subShopDomain = 'exporttestshop.test';
 
     /**
      * Fetches the  feed from the server
      *
-     * @param string $format
-     *
      * @Given I export the feed in :format format
      */
-    public function iExportTheFeedFor($format)
+    public function iExportTheFeedFor(string $format): void
     {
         $this->getSession()->visit($this->pathTo($this->mappings[$format]));
     }
 
     /**
-     * @param string $name
-     * @param string $format
      * @param string $subshop Anything else than "subshop" will be treated as "shop"
      *
      * @throws Exception
      *
      * @Then /^I should see the feed "(?P<name>[^"]*)" with format "(?P<format>[^"]*)" in the "(?P<subshop>[^"]*)" export:$/
      */
-    public function iShouldSeeFeedWithFormatInTheExport($name, $format, $subshop, TableNode $entries)
+    public function iShouldSeeFeedWithFormatInTheExport(string $name, string $format, string $subshop, TableNode $entries): void
     {
         switch ($format) {
             case 'xml':
@@ -96,15 +90,14 @@ public function iShouldSeeFeedWithFormatInTheExport($name, $format, $subshop, Ta
      *
      * @BeforeScenario @productFeeds
      */
-    public function enableExports()
+    public function enableExports(): void
     {
-        /** @var Connection $dbal */
-        $dbal = Shopware()->Container()->get(\Doctrine\DBAL\Connection::class);
+        $dbal = Shopware()->Container()->get(Connection::class);
         $dump = <<<'SQL'
 INSERT INTO s_export VALUES (4711,'csv','2000-01-01 00:00:00',1,'4ebfa063359a73c356913df45b3fbe7f',1,0,'2017-02-27 14:10:18',0,1,'2017-02-27 14:10:18','export.csv',2,NULL,1,1,'',NULL,0,0,0,0,0,'','{strip}id{#S#}title{#S#}url{#S#}image{#S#}price{#S#}versand{#S#}währung {/strip}{#L#}','{strip}\n{$sArticle.ordernumber|escape}{#S#}\n{$sArticle.name|strip_tags|strip|truncate:80:\"...\":true|escape|htmlentities}{#S#}\n{$sArticle.articleID|link:$sArticle.name|escape}{#S#}\n{$sArticle.image|image:2}{#S#}\n{$sArticle.price|escape:\"number\"}{#S#}\nDE::DHL:{$sArticle|@shippingcost:\"prepayment\":\"de\"}{#S#}\n{$sCurrency.currency}\n{/strip}{#L#}','',0,1,1,'2000-01-01 00:00:00',0),(4712,'txt tab','2000-01-01 00:00:00',1,'4ebfa063359a73c356913df45b3fbe7f',1,0,'2017-02-27 14:10:18',0,2,'2017-02-27 14:10:18','export.txt',2,NULL,1,1,'',NULL,0,0,0,0,0,'','{strip}id{#S#}title{#S#}url{#S#}image{#S#}price{#S#}versand{#S#}währung{/strip}{#L#}','{strip}\n{$sArticle.ordernumber|escape}{#S#}\n{$sArticle.name|strip_tags|strip|truncate:80:"...":true|escape|htmlentities}{#S#}\n{$sArticle.articleID|link:$sArticle.name|escape}{#S#}\n{$sArticle.image|image:2}{#S#}\n{$sArticle.price|escape:"number"}{#S#}\nDE::DHL:{$sArticle|@shippingcost:"prepayment":"de"}{#S#}\n{$sCurrency.currency}\n{/strip}{#L#}','',0,1,1,'2000-01-01 00:00:00',0),(4713,'xml','2000-01-01 00:00:00',1,'4ebfa063359a73c356913df45b3fbe7f',1,0,'2000-01-01 00:00:00',0,3,'0000-00-00 00:00:00','export.xml',2,NULL,1,1,'',NULL,0,0,0,0,0,'','<?xml version="1.0" encoding="UTF-8" ?>\n<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">\n<channel>\n    <atom:link href="http://{$sConfig.sBASEPATH}/engine/connectors/export/{$sSettings.id}/{$sSettings.hash}/{$sSettings.filename}" rel="self" type="application/rss+xml" />\n    <title>{$sConfig.sSHOPNAME}</title>\n<link>http://{$sConfig.sBASEPATH}</link>\n    <language>{$sLanguage.isocode}-{$sLanguage.isocode}</language>\n    <image>\n        <url>http://{$sConfig.sBASEPATH}/templates/0/de/media/img/default/store/logo.gif</url>\n        <title>{$sConfig.sSHOPNAME}</title>\n        <link>http://{$sConfig.sBASEPATH}</link>\n    </image>{#L#}','<item> \n    <title>{$sArticle.name|strip_tags|htmlspecialchars_decode|strip|escape}</title>\n    <id>{$sArticle.ordernumber|escape}</id>\n    <url>{$sArticle.articleID|link:$sArticle.name}</url>\n    <description>{if $sArticle.image}\n        <a href="{$sArticle.articleID|link:$sArticle.name}" style="border:0 none;">\n            <img src="{$sArticle.image|image:0}" align="right" style="padding: 0pt 0pt 12px 12px; float: right;" />\n        </a>\n{/if}\n        {$sArticle.description_long|strip_tags|regex_replace:"/[^\\wöäüÖÄÜß .?!,&:%;\\-\\"\']/i":""|trim|truncate:900:"..."|escape}\n    </description>\n    <image>{$sArticle.image|image:2}</image>\n <price>{$sArticle.price|escape:"number"}</price><category>{$sArticle.articleID|category:">"|htmlspecialchars_decode|escape}</category>\n{if $sArticle.changed}     {assign var="sArticleChanged" value=$sArticle.changed|strtotime}<pubDate>{"r"|date:$sArticleChanged}</pubDate>{"rn"}{/if}\n</item>{#L#}','</channel>\n</rss>',0,1,1,'2000-01-01 00:00:00',0),(4714,'txt pipe','2000-01-01 00:00:00',1,'4ebfa063359a73c356913df45b3fbe7f',1,0,'2017-02-27 14:10:18',0,4,'2017-02-27 14:10:18','export.txt',2,NULL,1,1,'',NULL,0,0,0,0,0,'','{strip}id{#S#}title{#S#}url{#S#}image{#S#}price{#S#}versand{#S#}währung{/strip}{#L#}','{strip}\n{$sArticle.ordernumber|escape}{#S#}\n{$sArticle.name|strip_tags|strip|truncate:80:"...":true|escape|htmlentities}{#S#}\n{$sArticle.articleID|link:$sArticle.name|escape}{#S#}\n{$sArticle.image|image:2}{#S#}\n{$sArticle.price|escape:"number"}{#S#}\nDE::DHL:{$sArticle|@shippingcost:"prepayment":"de"}{#S#}\n{$sCurrency.currency}\n{/strip}{#L#}','',0,1,1,'2000-01-01 00:00:00',0)
 SQL;
 
-        $dbal->exec($dump);
+        $dbal->executeStatement($dump);
     }
 
     /**
@@ -112,11 +105,10 @@ public function enableExports()
      *
      * @AfterScenario @productFeeds
      */
-    public function disableExports()
+    public function disableExports(): void
     {
-        /** @var Connection $dbal */
-        $dbal = Shopware()->Container()->get('Doctrine\DBAL\Connection');
-        $dbal->exec('DELETE FROM s_export WHERE id in (4711, 4712, 4713, 4714)');
+        $dbal = Shopware()->Container()->get(Connection::class);
+        $dbal->executeStatement('DELETE FROM s_export WHERE id in (4711, 4712, 4713, 4714)');
     }
 
     /**
@@ -124,15 +116,14 @@ public function disableExports()
      *
      * @BeforeScenario @withSubshop
      */
-    public function createSubshop()
+    public function createSubshop(): void
     {
-        /** @var Connection $dbal */
-        $dbal = Shopware()->Container()->get(\Doctrine\DBAL\Connection::class);
-        $dbal->exec('INSERT INTO s_core_shops
+        $dbal = Shopware()->Container()->get(Connection::class);
+        $dbal->executeStatement("INSERT INTO s_core_shops
             (id, main_id, name, title, position, host, base_path, base_url, hosts, secure, template_id, document_template_id, category_id, locale_id, currency_id, customer_group_id, fallback_id, customer_scope, `default`, active) VALUES
-            ("3", NULL, "Export Testshop", "Export Testshop", "0", "' . $this->subShopDomain . '", NULL, NULL, "", "0", "23", "23", "3", "1", "1", "1", "1", "0", "0", "1");');
+            ('3', NULL, 'Export Testshop', 'Export Testshop', '0', :subShopDomain, NULL, NULL, '', '0', '23', '23', '3', '1', '1', '1', '1', '0', '0', '1');", ['subShopDomain' => $this->subShopDomain]);
 
-        $dbal->exec('UPDATE s_export SET languageID=3 WHERE id in (4711, 4712, 4713, 4714)');
+        $dbal->executeStatement('UPDATE s_export SET languageID = 3 WHERE id in (4711, 4712, 4713, 4714)');
     }
 
     /**
@@ -140,31 +131,26 @@ public function createSubshop()
      *
      * @AfterScenario @withSubshop
      */
-    public static function removeSubshop()
+    public static function removeSubshop(): void
     {
-        /** @var Connection $dbal */
-        $dbal = Shopware()->Container()->get(\Doctrine\DBAL\Connection::class);
-        $dbal->exec('DELETE FROM s_core_shops WHERE id=3');
+        $dbal = Shopware()->Container()->get(Connection::class);
+        $dbal->executeStatement('DELETE FROM s_core_shops WHERE id=3');
     }
 
     /**
      * Builds a feed-url for a given row from the s_export table.
-     *
-     * @return string
      */
-    protected function pathTo(array $feed)
+    protected function pathTo(array $feed): string
     {
-        return rtrim($this->getMinkParameter('base_url'), '/') . "/backend/export/index/{$feed['file']}?feedID={$feed['id']}&hash=4ebfa063359a73c356913df45b3fbe7f";
+        return rtrim($this->getMinkParameter('base_url') ?? '', '/') . "/backend/export/index/{$feed['file']}?feedID={$feed['id']}&hash=4ebfa063359a73c356913df45b3fbe7f";
     }
 
-    /**
-     * @param string $content
-     *
-     * @return array
-     */
-    private function parseXml($content)
+    private function parseXml(string $content): array
     {
         $dom = simplexml_load_string($content);
+        if (!$dom instanceof SimpleXMLElement) {
+            Helper::throwException('Could not create XML element');
+        }
         $items = $dom->xpath('//item');
 
         $result = [];
@@ -177,18 +163,16 @@ private function parseXml($content)
 
     /**
      * Parses the csv content of an export into an associative array.
-     *
-     * @param string $content
-     * @param string $delimiter
-     *
-     * @return array
      */
-    private function parseCsv($content, $delimiter)
+    private function parseCsv(string $content, string $delimiter): array
     {
         $rows = str_getcsv(html_entity_decode($content), "\n");
 
         $header = null;
         foreach ($rows as &$row) {
+            if (!\is_string($row)) {
+                continue;
+            }
             $row = str_getcsv($row, $delimiter);
 
             if (!$header) {
@@ -203,13 +187,10 @@ private function parseCsv($content, $delimiter)
         return $rows;
     }
 
-    /**
-     * @param array $export
-     * @param bool  $shopType
-     */
-    private function validate(TableNode $entries, $export, $shopType)
+    private function validate(TableNode $entries, array $export, string $shopType): void
     {
-        $baseUrl = rtrim($this->getMinkParameter('base_url'), '/');
+        $baseUrl = rtrim($this->getMinkParameter('base_url') ?? '', '/');
+
         $basePath = trim((string) parse_url($baseUrl, PHP_URL_PATH), '/');
         $subshopBaseUrl = rtrim('http://' . $this->subShopDomain . '/' . $basePath, '/');
 
@@ -222,7 +203,6 @@ private function validate(TableNode $entries, $export, $shopType)
                     continue;
                 }
 
-                /** @var array $entry */
                 foreach ($entry as $key => $value) {
                     $this->assertKeyExists($key, $row);
 
@@ -240,21 +220,20 @@ private function validate(TableNode $entries, $export, $shopType)
         }
     }
 
-    private function assertKeyExists($key, array $row)
+    /**
+     * @param string|int $key
+     */
+    private function assertKeyExists($key, array $row): void
     {
         if (!\array_key_exists($key, $row)) {
             Helper::throwException("Field '$key' was not found in export row " . print_r($row, true));
         }
     }
 
-    /**
-     * @param string $expected
-     * @param string $actual
-     */
-    private function assertStringsEqual($expected, $actual)
+    private function assertStringsEqual(string $expected, string $actual): void
     {
         if (strcasecmp($expected, $actual) !== 0) {
-            Helper::throwException("Content '{$expected}' expected, found '{$actual}' instead.");
+            Helper::throwException(\sprintf("Content '%s' expected, found '%s' instead.", $expected, $actual));
         }
     }
 }
diff --git a/tests/Mink/features/export.feature b/tests/Mink/Tests/Backend/Export/export.feature
similarity index 100%
rename from tests/Mink/features/export.feature
rename to tests/Mink/Tests/Backend/Export/export.feature
diff --git a/tests/Mink/features/homepage.feature b/tests/Mink/Tests/Backend/Homepage/homepage.feature
similarity index 100%
rename from tests/Mink/features/homepage.feature
rename to tests/Mink/Tests/Backend/Homepage/homepage.feature
diff --git a/tests/Mink/features/account.feature b/tests/Mink/Tests/Frontend/Account/account.feature
similarity index 100%
rename from tests/Mink/features/account.feature
rename to tests/Mink/Tests/Frontend/Account/account.feature
diff --git a/tests/Mink/features/account_addressManagement.feature b/tests/Mink/Tests/Frontend/Account/account_addressManagement.feature
similarity index 100%
rename from tests/Mink/features/account_addressManagement.feature
rename to tests/Mink/Tests/Frontend/Account/account_addressManagement.feature
diff --git a/tests/Mink/features/account_changeLoginData.feature b/tests/Mink/Tests/Frontend/Account/account_changeLoginData.feature
similarity index 100%
rename from tests/Mink/features/account_changeLoginData.feature
rename to tests/Mink/Tests/Frontend/Account/account_changeLoginData.feature
diff --git a/tests/Mink/features/bootstrap/AccountContext.php b/tests/Mink/Tests/Frontend/Account/bootstrap/AccountContext.php
similarity index 57%
rename from tests/Mink/features/bootstrap/AccountContext.php
rename to tests/Mink/Tests/Frontend/Account/bootstrap/AccountContext.php
index 116e71df2cd..3a8cd35a33f 100644
--- a/tests/Mink/features/bootstrap/AccountContext.php
+++ b/tests/Mink/Tests/Frontend/Account/bootstrap/AccountContext.php
@@ -5,96 +5,99 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink;
+namespace Shopware\Tests\Mink\Tests\Frontend\Account\bootstrap;
 
 use Behat\Gherkin\Node\TableNode;
 use Behat\Mink\WebAssert;
 use Doctrine\DBAL\Connection;
-use Shopware\Tests\Mink\Element\AddressManagementAddressBox;
-use Shopware\Tests\Mink\Page\Account;
-use Shopware\Tests\Mink\Page\Address;
-use Shopware\Tests\Mink\Page\AddressDelete;
-use Shopware\Tests\Mink\Page\AddressEdit;
-use Shopware\Tests\Mink\Page\CheckoutConfirm;
+use Shopware\Tests\Mink\Page\Frontend\Account\Account;
+use Shopware\Tests\Mink\Page\Frontend\Address\Address;
+use Shopware\Tests\Mink\Page\Frontend\Address\AddressDelete;
+use Shopware\Tests\Mink\Page\Frontend\Address\AddressEdit;
+use Shopware\Tests\Mink\Page\Frontend\Address\Elements\AddressBox;
+use Shopware\Tests\Mink\Page\Frontend\Address\Elements\AddressManagementAddressBox;
+use Shopware\Tests\Mink\Page\Frontend\Checkout\CheckoutCart;
+use Shopware\Tests\Mink\Page\Frontend\Checkout\CheckoutConfirm;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\SubContext;
 
 class AccountContext extends SubContext
 {
     /**
      * @Given /^I log in with email "(?P<email>[^"]*)" and password "(?P<password>[^"]*)"$/
      */
-    public function iLogInAsWithPassword($email, $password)
+    public function iLogInAsWithPassword(string $email, string $password): void
     {
-        $this->getPage('Account')->login($email, $password);
+        $this->getPage(Account::class)->login($email, $password);
     }
 
     /**
      * @Given /^I log in successful as "(?P<username>[^"]*)" with email "(?P<email>[^"]*)" and password "(?P<password>[^"]*)"$/
      */
-    public function iLogInSuccessfulAsWithPassword($username, $email, $password)
+    public function iLogInSuccessfulAsWithPassword(string $username, string $email, string $password): void
     {
         Shopware()->Container()->get(Connection::class)->executeQuery('DELETE FROM s_order_basket');
 
-        $this->getPage('Account')->login($email, $password);
-        $this->getPage('Account')->verifyLogin($username);
+        $this->getPage(Account::class)->login($email, $password);
+        $this->getPage(Account::class)->verifyLogin($username);
     }
 
     /**
      * @When /^I log me out$/
      */
-    public function iLogMeOut()
+    public function iLogMeOut(): void
     {
-        $this->getPage('Account')->logout();
+        $this->getPage(Account::class)->logout();
     }
 
     /**
      * @When /^I click on login again$/
      */
-    public function iClickOnLoginAgain()
+    public function iClickOnLoginAgain(): void
     {
-        $this->getPage('Account')->clickLoginAgain();
+        $this->getPage(Account::class)->clickLoginAgain();
     }
 
     /**
      * @Then /^I change my email with password "(?P<password>[^"]*)" to "(?P<new>[^"]*)"$/
      * @Then /^I change my email with password "(?P<password>[^"]*)" to "(?P<new>[^"]*)" with confirmation "(?P<confirmation>[^"]*)"$/
      */
-    public function iChangeMyEmailWithPasswordToWithConfirmation($password, $email, $emailConfirmation = null)
+    public function iChangeMyEmailWithPasswordToWithConfirmation(string $password, string $email, ?string $emailConfirmation = null): void
     {
-        $this->getPage('Account')->changeEmail($password, $email, $emailConfirmation);
+        $this->getPage(Account::class)->changeEmail($password, $email, $emailConfirmation);
     }
 
     /**
      * @Then /^I change my password from "(?P<old>[^"]*)" to "(?P<new>[^"]*)"$/
      * @Then /^I change my password from "(?P<old>[^"]*)" to "(?P<new>[^"]*)" with confirmation "(?P<confirmation>[^"]*)"$/
      */
-    public function iChangeMyPasswordFromToWithConfirmation($currentPassword, $password, $passwordConfirmation = null)
+    public function iChangeMyPasswordFromToWithConfirmation(string $currentPassword, string $password, ?string $passwordConfirmation = null): void
     {
-        $this->getPage('Account')->changePassword($currentPassword, $password, $passwordConfirmation);
+        $this->getPage(Account::class)->changePassword($currentPassword, $password, $passwordConfirmation);
     }
 
     /**
      * @Given /^I change my billing address:$/
      */
-    public function iChangeMyBillingAddress(TableNode $table)
+    public function iChangeMyBillingAddress(TableNode $table): void
     {
         $pageInfo = Helper::getPageInfo($this->getSession(), ['controller']);
         if (!\is_array($pageInfo)) {
@@ -103,10 +106,15 @@ public function iChangeMyBillingAddress(TableNode $table)
         $pageName = ucfirst($pageInfo['controller']);
 
         if ($pageName === 'Checkout') {
-            $pageName = 'CheckoutConfirm';
+            $pageName = CheckoutConfirm::class;
+        } elseif ($pageName === 'Account') {
+            $pageName = Account::class;
+        } elseif ($pageName === 'Address') {
+            $pageName = Address::class;
+        } else {
+            Helper::throwException('Wrong page for changing the billing address');
         }
 
-        /** @var Account|CheckoutConfirm $page */
         $page = $this->getPage($pageName);
         $data = $table->getHash();
 
@@ -116,7 +124,7 @@ public function iChangeMyBillingAddress(TableNode $table)
     /**
      * @Given /^I change my shipping address:$/
      */
-    public function iChangeMyShippingAddress(TableNode $table)
+    public function iChangeMyShippingAddress(TableNode $table): void
     {
         $pageInfo = Helper::getPageInfo($this->getSession(), ['controller']);
         if (!\is_array($pageInfo)) {
@@ -125,10 +133,15 @@ public function iChangeMyShippingAddress(TableNode $table)
         $pageName = ucfirst($pageInfo['controller']);
 
         if ($pageName === 'Checkout') {
-            $pageName = 'CheckoutConfirm';
+            $pageName = CheckoutConfirm::class;
+        } elseif ($pageName === 'Account') {
+            $pageName = Account::class;
+        } elseif ($pageName === 'Address') {
+            $pageName = Address::class;
+        } else {
+            Helper::throwException('Wrong page for changing the shipping address');
         }
 
-        /** @var Account|CheckoutConfirm $page */
         $page = $this->getPage($pageName);
         $data = $table->getHash();
 
@@ -138,24 +151,24 @@ public function iChangeMyShippingAddress(TableNode $table)
     /**
      * @Given /^the "([^"]*)" address should be "([^"]*)"$/
      */
-    public function theAddressShouldBe($type, $address)
+    public function theAddressShouldBe(string $type, string $address): void
     {
-        $this->getPage('Account')->checkAddress($type, $address);
+        $this->getPage(Account::class)->checkAddress($type, $address);
     }
 
     /**
      * @Given /^I register me:$/
      */
-    public function iRegisterMe(TableNode $table)
+    public function iRegisterMe(TableNode $table): void
     {
-        $this->getPage('Account')->register($table->getHash());
+        $this->getPage(Account::class)->register($table->getHash());
     }
 
     /**
      * @When /^I change the payment method to (?P<paymentId>\d+)$/
      * @When /^I change the payment method to (?P<paymentId>\d+):$/
      */
-    public function iChangeThePaymentMethodTo($payment, TableNode $table = null)
+    public function iChangeThePaymentMethodTo(int $paymentId, ?TableNode $table = null): void
     {
         $pageInfo = Helper::getPageInfo($this->getSession(), ['controller', 'action']);
         if (!\is_array($pageInfo)) {
@@ -164,15 +177,18 @@ public function iChangeThePaymentMethodTo($payment, TableNode $table = null)
         $pageName = ucfirst($pageInfo['controller']);
 
         if ($pageName === 'Checkout') {
-            $pageName = ($pageInfo['action'] === 'shippingpayment') ? 'CheckoutCart' : 'CheckoutConfirm';
+            $pageName = ($pageInfo['action'] === 'shippingpayment') ? CheckoutCart::class : CheckoutConfirm::class;
+        } elseif ($pageName === 'Account') {
+            $pageName = Account::class;
+        } else {
+            Helper::throwException('Wrong page to change payment method');
         }
 
-        /** @var Account|CheckoutConfirm $page */
         $page = $this->getPage($pageName);
         $data = [
             [
                 'field' => 'register[payment]',
-                'value' => $payment,
+                'value' => $paymentId,
             ],
         ];
 
@@ -186,13 +202,13 @@ public function iChangeThePaymentMethodTo($payment, TableNode $table = null)
     /**
      * @Then /^the current payment method should be "([^"]*)"$/
      */
-    public function theCurrentPaymentMethodShouldBe($paymentMethod)
+    public function theCurrentPaymentMethodShouldBe(string $paymentMethod): void
     {
         $pageInfo = Helper::getPageInfo($this->getSession(), ['controller']);
         if (!\is_array($pageInfo)) {
             Helper::throwException('Could not get page info');
         }
-        $pageName = (ucfirst($pageInfo['controller']) === 'Checkout') ? 'CheckoutConfirm' : 'Account';
+        $pageName = (ucfirst($pageInfo['controller']) === 'Checkout') ? CheckoutConfirm::class : Account::class;
 
         $this->getPage($pageName)->checkPaymentMethod($paymentMethod);
     }
@@ -200,12 +216,11 @@ public function theCurrentPaymentMethodShouldBe($paymentMethod)
     /**
      * @When /^I choose the address "([^"]*)"$/
      */
-    public function iChooseTheAddress($name)
+    public function iChooseTheAddress(string $name): void
     {
-        /** @var Account $page */
-        $page = $this->getPage('Account');
+        $page = $this->getPage(Account::class);
 
-        $addresses = $this->getMultipleElement($page, 'AddressBox');
+        $addresses = $this->getMultipleElement($page, AddressBox::class);
 
         $page->chooseAddress($addresses, $name);
     }
@@ -213,17 +228,20 @@ public function iChooseTheAddress($name)
     /**
      * @Given /^I change my profile with "([^"]*)" "([^"]*)" "([^"]*)"$/
      */
-    public function iChangeMyProfileWith($salutation, $firstname, $lastname)
+    public function iChangeMyProfileWith(string $salutation, string $firstname, string $lastname): void
     {
-        $this->getPage('Account')->changeProfile($salutation, $firstname, $lastname);
+        $this->getPage(Account::class)->changeProfile($salutation, $firstname, $lastname);
     }
 
     /**
      * @Given /^I should be welcomed with "([^"]*)"$/
      */
-    public function iShouldBeWelcomedWith($welcome)
+    public function iShouldBeWelcomedWith(string $welcome): void
     {
         $welcome = preg_replace("/\s\s+/", ' ', $welcome);
+        if (!\is_string($welcome)) {
+            Helper::throwException('Invalid welcome text');
+        }
 
         $assert = new WebAssert($this->getSession());
         $assert->pageTextContains($welcome);
@@ -232,35 +250,31 @@ public function iShouldBeWelcomedWith($welcome)
     /**
      * @Given /^there should be an address "([^"]*)"$/
      */
-    public function thereShouldBeAnAddress($address)
+    public function thereShouldBeAnAddress(string $address): void
     {
-        /** @var Account|Address $page */
-        $page = $this->getPage('Address');
+        $page = $this->getPage(Address::class);
 
         $address = str_replace('<ignore>', '', $address);
         $testAddress = array_values(array_filter(explode(', ', $address)));
 
-        /** @var array $addressManagementAddressBoxes */
-        $addressManagementAddressBoxes = $this->getMultipleElement($page, 'AddressManagementAddressBox');
+        $addressManagementAddressBoxes = $this->getMultipleElement($page, AddressManagementAddressBox::class);
 
-        /** @var AddressManagementAddressBox $box */
         foreach ($addressManagementAddressBoxes as $box) {
             if ($box->containsAdress($testAddress)) {
                 return;
             }
         }
 
-        $message = sprintf('Newly created address not found! (%s)', $address);
+        $message = \sprintf('Newly created address not found! (%s)', $address);
         Helper::throwException($message);
     }
 
     /**
      * @Given /^I create a new address:$/
      */
-    public function iCreateANewAddress(TableNode $table)
+    public function iCreateANewAddress(TableNode $table): void
     {
-        /** @var Address $page */
-        $page = $this->getPage('Address');
+        $page = $this->getPage(Address::class);
         $data = $table->getHash();
 
         $page->createArbitraryAddress($data);
@@ -269,23 +283,20 @@ public function iCreateANewAddress(TableNode $table)
     /**
      * @Given /^I click "([^"]*)" on address "([^"]*)"$/
      */
-    public function iClickOnAddress($locator, $address)
+    public function iClickOnAddress(string $locator, string $address): void
     {
-        /** @var Account|Address $page */
-        $page = $this->getPage('Address');
+        $page = $this->getPage(Address::class);
 
         $testAddress = array_values(array_filter(explode(', ', $address)));
 
-        /** @var array $addressManagementAddressBoxes */
-        $addressManagementAddressBoxes = $this->getMultipleElement($page, 'AddressManagementAddressBox');
+        $addressManagementAddressBoxes = $this->getMultipleElement($page, AddressManagementAddressBox::class);
 
-        /** @var AddressManagementAddressBox $box */
         foreach ($addressManagementAddressBoxes as $box) {
             if ($box->containsAdress($testAddress) === false) {
                 continue;
             }
 
-            if ($this->endsWith($locator, 'Button')) {
+            if (str_ends_with($locator, 'Button')) {
                 Helper::pressNamedButton($box, $locator);
 
                 return;
@@ -296,26 +307,23 @@ public function iClickOnAddress($locator, $address)
             return;
         }
 
-        $message = sprintf('Given address not found! (%s)', $address);
+        $message = \sprintf('Given address not found! (%s)', $address);
         Helper::throwException($message);
     }
 
     /**
      * @Then /^I should see only "([^"]*)" with title "([^"]*)"$/
      */
-    public function iShouldSeeOnlyWithTitle($address, $addressTitle)
+    public function iShouldSeeOnlyWithTitle(string $address, string $addressTitle): void
     {
-        /** @var Account|Address $page */
-        $page = $this->getPage('Address');
+        $page = $this->getPage(Address::class);
 
         $testAddress = array_values(array_filter(explode(', ', $address)));
 
-        /** @var array $addressManagementAddressBoxes */
-        $addressManagementAddressBoxes = $this->getMultipleElement($page, 'AddressManagementAddressBox');
+        $addressManagementAddressBoxes = $this->getMultipleElement($page, AddressManagementAddressBox::class);
 
         $addressCount = 0;
 
-        /** @var AddressManagementAddressBox $box */
         foreach ($addressManagementAddressBoxes as $box) {
             if ($box->containsAdress($testAddress) && $box->hasTitle($addressTitle)) {
                 ++$addressCount;
@@ -323,7 +331,7 @@ public function iShouldSeeOnlyWithTitle($address, $addressTitle)
         }
 
         if ($addressCount !== 1) {
-            $message = sprintf('Wrong number of given addresses titled "%s" found! Expected 1, found %d.', $addressTitle, $addressCount);
+            $message = \sprintf('Wrong number of given addresses titled "%s" found! Expected 1, found %d.', $addressTitle, $addressCount);
             Helper::throwException($message);
         }
     }
@@ -331,10 +339,9 @@ public function iShouldSeeOnlyWithTitle($address, $addressTitle)
     /**
      * @Given /^I change the current address to:$/
      */
-    public function iChangeTheCurrentAddressTo(TableNode $table)
+    public function iChangeTheCurrentAddressTo(TableNode $table): void
     {
-        /** @var Account|AddressEdit $page */
-        $page = $this->getPage('AddressEdit');
+        $page = $this->getPage(AddressEdit::class);
 
         $data = $table->getHash();
 
@@ -345,17 +352,14 @@ public function iChangeTheCurrentAddressTo(TableNode $table)
     /**
      * @Given /^I delete the address "([^"]*)"$/
      */
-    public function iDeleteTheAddress($address)
+    public function iDeleteTheAddress(string $address): void
     {
-        /** @var Account|Address $page */
-        $page = $this->getPage('Address');
+        $page = $this->getPage(Address::class);
 
         $testAddress = array_values(array_filter(explode(', ', $address)));
 
-        /** @var array $addressManagementAddressBoxes */
-        $addressManagementAddressBoxes = $this->getMultipleElement($page, 'AddressManagementAddressBox');
+        $addressManagementAddressBoxes = $this->getMultipleElement($page, AddressManagementAddressBox::class);
 
-        /** @var AddressManagementAddressBox $box */
         foreach ($addressManagementAddressBoxes as $box) {
             if ($box->containsAdress($testAddress) === false) {
                 continue;
@@ -363,8 +367,7 @@ public function iDeleteTheAddress($address)
 
             Helper::clickNamedLink($box, 'deleteLink');
 
-            /** @var AddressDelete $page */
-            $page = $this->getPage('AddressDelete');
+            $page = $this->getPage(AddressDelete::class);
 
             Helper::pressNamedButton($page, 'confirmDeleteButton');
             break;
@@ -374,17 +377,14 @@ public function iDeleteTheAddress($address)
     /**
      * @Then /^there must not be an address "([^"]*)"$/
      */
-    public function thereMustNotBeAnAddress($address)
+    public function thereMustNotBeAnAddress(string $address): void
     {
-        /** @var Account|Address $page */
-        $page = $this->getPage('Address');
+        $page = $this->getPage(Address::class);
 
         $testAddress = array_values(array_filter(explode(', ', $address)));
 
-        /** @var array $addressManagementAddressBoxes */
-        $addressManagementAddressBoxes = $this->getMultipleElement($page, 'AddressManagementAddressBox');
+        $addressManagementAddressBoxes = $this->getMultipleElement($page, AddressManagementAddressBox::class);
 
-        /** @var AddressManagementAddressBox $box */
         foreach ($addressManagementAddressBoxes as $box) {
             if ($box->containsAdress($testAddress)) {
                 $message = 'Wrong number of given addresses found! Expected 0, found at least 1.';
@@ -396,25 +396,17 @@ public function thereMustNotBeAnAddress($address)
     /**
      * @Then /^I must not see "([^"]*)" in box with "([^"]*)" title$/
      */
-    public function iMustNotSeeInBoxWithTitle($elementName, $title)
+    public function iMustNotSeeInBoxWithTitle(string $elementName, string $title): void
     {
-        /** @var Account|Address $page */
-        $page = $this->getPage('Address');
+        $page = $this->getPage(Address::class);
 
-        /** @var array $addressManagementAddressBoxes */
-        $addressManagementAddressBoxes = $this->getMultipleElement($page, 'AddressManagementAddressBox');
+        $addressManagementAddressBoxes = $this->getMultipleElement($page, AddressManagementAddressBox::class);
 
-        /** @var AddressManagementAddressBox $box */
         foreach ($addressManagementAddressBoxes as $box) {
             if ($box->hasTitle($title) && ($box->hasLink($elementName) || $box->hasButton($elementName))) {
-                $message = sprintf('Wrong number of boxes with title "%s" and delete button found! Expected 0, found at least 1.', $title);
+                $message = \sprintf('Wrong number of boxes with title "%s" and delete button found! Expected 0, found at least 1.', $title);
                 Helper::throwException($message);
             }
         }
     }
-
-    private function endsWith($haystack, $needle)
-    {
-        return preg_match('/' . $needle . '$/', $haystack);
-    }
 }
diff --git a/tests/Mink/features/blog.feature b/tests/Mink/Tests/Frontend/Blog/blog.feature
similarity index 87%
rename from tests/Mink/features/blog.feature
rename to tests/Mink/Tests/Frontend/Blog/blog.feature
index 88487586d69..8f2d97c26db 100644
--- a/tests/Mink/features/blog.feature
+++ b/tests/Mink/Tests/Frontend/Blog/blog.feature
@@ -3,22 +3,22 @@ Feature: Blog
 
     Background:
         Given I am on the blog category 17
-        And   I should see 3 elements of type "BlogBox"
+        And   I should see 3 elements of type "\Shopware\Tests\Mink\Page\Frontend\Blog\Elements\BlogBox"
 
     @filter
     Scenario: I can filter the blog articles by its date
         Given I follow "2012-08"
-        Then  I should see 3 elements of type "BlogBox"
+        Then  I should see 3 elements of type "\Shopware\Tests\Mink\Page\Frontend\Blog\Elements\BlogBox"
         And   I should see "Der Sommer wird bunt 22.08.12"
         And   I should see "Sonnenschutz - so gehören Sie zur Crème de la Crème 18.08.12"
         And   I should see "Ich packe meinen Koffer… 08.08.12"
 
-    @crossselling @knownFailing
+    @crossselling
     Scenario Outline: I can see some matching articles on each blog article page
         Given I click to read the blog article on position <position>
         Then  I should see "<title>"
         Then  I should see "Passende Artikel"
-        And   I should see <count> elements of type "BlogArticleBox"
+        And   I should see <count> elements of type "\Shopware\Tests\Mink\Page\Frontend\Blog\Elements\BlogArticleBox"
 
         Examples:
             | position | title                                               | count |
diff --git a/tests/Mink/Tests/Frontend/Blog/bootstrap/BlogContext.php b/tests/Mink/Tests/Frontend/Blog/bootstrap/BlogContext.php
new file mode 100644
index 00000000000..9abd53c7e09
--- /dev/null
+++ b/tests/Mink/Tests/Frontend/Blog/bootstrap/BlogContext.php
@@ -0,0 +1,96 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Mink\Tests\Frontend\Blog\bootstrap;
+
+use Behat\Gherkin\Node\TableNode;
+use Doctrine\DBAL\Connection;
+use Shopware\Tests\Mink\Page\Frontend\Blog\Blog;
+use Shopware\Tests\Mink\Page\Frontend\Blog\Elements\BlogBox;
+use Shopware\Tests\Mink\Page\Frontend\Blog\Elements\BlogComment;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\SubContext;
+
+class BlogContext extends SubContext
+{
+    /**
+     * @Given /^I am on the blog category (?P<categoryId>\d+)$/
+     * @Given /^I go to the blog category (?P<categoryId>\d+)$/
+     */
+    public function iAmOnTheBlogCategory(int $categoryId): void
+    {
+        $this->getPage(Blog::class)->open(['categoryId' => $categoryId]);
+    }
+
+    /**
+     * @Given /^I click to read the blog article on position (\d+)$/
+     */
+    public function iClickToReadTheBlogArticleOnPosition(int $position): void
+    {
+        $page = $this->getPage(Blog::class);
+
+        $blogBox = $this->getMultipleElement($page, BlogBox::class, $position);
+        Helper::clickNamedLink($blogBox, 'readMore');
+    }
+
+    /**
+     * @When /^I write a comment:$/
+     */
+    public function iWriteAComment(TableNode $data): void
+    {
+        $this->getPage(Blog::class)->writeComment($data->getHash());
+    }
+
+    /**
+     * @When /^the shop owner activates my latest comment$/
+     */
+    public function theShopOwnerActivateMyLatestComment(): void
+    {
+        $sql = 'UPDATE `s_blog_comments` SET `active`= 1 ORDER BY id DESC LIMIT 1';
+        $this->getService(Connection::class)->executeStatement($sql);
+        $this->getSession()->reload();
+    }
+
+    /**
+     * @Then /^I should see an average evaluation of (\d+) from following comments:$/
+     */
+    public function iShouldSeeAnAverageEvaluationOfFromFollowingComments(string $average, TableNode $comments): void
+    {
+        $page = $this->getPage(Blog::class);
+
+        $blogComments = $this->getMultipleElement($page, BlogComment::class);
+
+        $page->checkComments($blogComments, $average, $comments->getHash());
+    }
+
+    /**
+     * @When /^I open the comment form$/
+     */
+    public function iOpenTheCommentForm(): void
+    {
+        $page = $this->getPage(Blog::class);
+        $page->openCommentSection();
+    }
+}
diff --git a/tests/Mink/features/bootstrap/CheckoutContext.php b/tests/Mink/Tests/Frontend/Checkout/bootstrap/CheckoutContext.php
similarity index 69%
rename from tests/Mink/features/bootstrap/CheckoutContext.php
rename to tests/Mink/Tests/Frontend/Checkout/bootstrap/CheckoutContext.php
index ca83e8f7b51..1e3c1511654 100644
--- a/tests/Mink/features/bootstrap/CheckoutContext.php
+++ b/tests/Mink/Tests/Frontend/Checkout/bootstrap/CheckoutContext.php
@@ -1,31 +1,31 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink;
+namespace Shopware\Tests\Mink\Tests\Frontend\Checkout\bootstrap;
 
 use Behat\Gherkin\Node\TableNode;
-use Behat\Mink\Driver\Selenium2Driver;
 use Behat\Mink\Exception\ResponseTextException;
 use Doctrine\DBAL\Connection;
 use Exception;
@@ -37,52 +37,54 @@
 use Shopware\Models\Article\Detail as ProductVariant;
 use Shopware\Models\Price\Discount;
 use Shopware\Models\Price\Group;
-use Shopware\Tests\Mink\Element\AccountOrder;
-use Shopware\Tests\Mink\Element\CartPosition;
-use Shopware\Tests\Mink\Element\CheckoutAddressBox;
-use Shopware\Tests\Mink\Element\CheckoutAddressBoxModal;
-use Shopware\Tests\Mink\Element\MultipleElement;
-use Shopware\Tests\Mink\Page\Account;
-use Shopware\Tests\Mink\Page\CheckoutCart;
-use Shopware\Tests\Mink\Page\CheckoutConfirm;
-use Shopware\Tests\Mink\Page\Detail;
+use Shopware\Tests\Mink\Page\Frontend\Account\Account;
+use Shopware\Tests\Mink\Page\Frontend\Account\Elements\AccountOrder;
+use Shopware\Tests\Mink\Page\Frontend\Checkout\CheckoutCart;
+use Shopware\Tests\Mink\Page\Frontend\Checkout\CheckoutConfirm;
+use Shopware\Tests\Mink\Page\Frontend\Checkout\Elements\CartPositionProduct;
+use Shopware\Tests\Mink\Page\Frontend\Checkout\Elements\CartPositionRebate;
+use Shopware\Tests\Mink\Page\Frontend\Checkout\Elements\CheckoutAddressBox;
+use Shopware\Tests\Mink\Page\Frontend\Checkout\Elements\CheckoutAddressBoxModal;
+use Shopware\Tests\Mink\Page\Frontend\Checkout\Elements\CheckoutModalAddressSelection;
+use Shopware\Tests\Mink\Page\Frontend\Detail\Detail;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\SubContext;
 
 class CheckoutContext extends SubContext
 {
     /**
      * @When /^I add the voucher "(?P<code>[^"]*)" to my basket$/
      */
-    public function iAddTheVoucherToMyBasket($voucher)
+    public function iAddTheVoucherToMyBasket(string $voucher): void
     {
-        $this->getPage('CheckoutCart')->addVoucher($voucher);
+        $this->getPage(CheckoutCart::class)->addVoucher($voucher);
     }
 
     /**
      * @When /^I remove the voucher$/
      */
-    public function iRemoveTheVoucher()
+    public function iRemoveTheVoucher(): void
     {
-        $this->getPage('CheckoutCart')->removeVoucher();
+        $this->getPage(CheckoutCart::class)->removeVoucher();
     }
 
     /**
-     * @When /^I add the article "(?P<articleNr>[^"]*)" to my basket$/
+     * @When /^I add the article "(?P<product>[^"]*)" to my basket$/
      */
-    public function iAddTheArticleToMyBasket($article)
+    public function iAddTheArticleToMyBasket(string $product): void
     {
-        $this->getPage('CheckoutCart')->addArticle($article);
+        $this->getPage(CheckoutCart::class)->addProduct($product);
     }
 
     /**
-     * @When /^I add the article "(?P<articleNr>[^"]*)" to my basket over HTTP GET$/
+     * @When /^I add the article "(?P<productNumber>[^"]*)" to my basket over HTTP GET$/
      */
-    public function iAddTheArticleToMyBasketOverHttpGet($article)
+    public function iAddTheArticleToMyBasketOverHttpGet(string $productNumber): void
     {
         try {
-            /** @var CheckoutCart $page */
-            $page = $this->getPage('CheckoutCart');
+            $page = $this->getPage(CheckoutCart::class);
             $page->resetCart();
-            $page->fillCartWithProducts([['number' => $article, 'quantity' => 1]]);
+            $page->fillCartWithProducts([['number' => $productNumber, 'quantity' => 1]]);
         } catch (Exception $unexpectedPageException) {
         }
     }
@@ -90,139 +92,128 @@ public function iAddTheArticleToMyBasketOverHttpGet($article)
     /**
      * @When /^I remove the article on position (?P<num>\d+)$/
      */
-    public function iRemoveTheArticleOnPosition($position)
+    public function iRemoveTheArticleOnPosition(int $position): void
     {
-        /** @var CheckoutCart $page */
-        $page = $this->getPage('CheckoutCart');
+        $page = $this->getPage(CheckoutCart::class);
 
-        /** @var CartPosition $cartPosition */
-        $cartPosition = $this->getMultipleElement($page, 'CartPosition', $position);
+        $cartPosition = $this->getMultipleElement($page, CartPositionProduct::class, $position);
         $page->removeProduct($cartPosition);
     }
 
     /**
      * @Given /^my finished order should look like this:$/
      */
-    public function myFinishedOrderShouldLookLikeThis(TableNode $positions)
+    public function myFinishedOrderShouldLookLikeThis(TableNode $positions): void
     {
-        $orderNumber = $this->getPage('CheckoutConfirm')->getOrderNumber();
+        $orderNumber = $this->getPage(CheckoutConfirm::class)->getOrderNumber();
         $values = $positions->getHash();
 
-        /** @var Account $page */
-        $page = $this->getPage('Account');
+        $page = $this->getPage(Account::class);
 
         $page->open();
         Helper::clickNamedLink($page, 'myOrdersLink');
 
-        /** @var AccountOrder $order */
-        $order = $this->getMultipleElement($page, 'AccountOrder');
+        $order = $this->getMultipleElement($page, AccountOrder::class);
         $page->checkOrder($order, $orderNumber, $values);
     }
 
     /**
      * @Given /^the aggregations should look like this:$/
      */
-    public function theAggregationsShouldLookLikeThis(TableNode $aggregations)
+    public function theAggregationsShouldLookLikeThis(TableNode $aggregations): void
     {
         $aggregations = $aggregations->getHash();
-        $this->getPage('CheckoutCart')->checkAggregation($aggregations);
+        $this->getPage(CheckoutCart::class)->checkAggregation($aggregations);
     }
 
     /**
      * @When /^I proceed to order confirmation$/
      */
-    public function iProceedToOrderConfirmation()
+    public function iProceedToOrderConfirmation(): void
     {
-        $this->getPage('CheckoutCart')->proceedToOrderConfirmation();
+        $this->getPage(CheckoutCart::class)->proceedToOrderConfirmation();
     }
 
     /**
      * @Given /^I proceed to order confirmation with email "([^"]*)" and password "([^"]*)"$/
      */
-    public function iProceedToOrderConfirmationWithEmailAndPassword($email, $password)
+    public function iProceedToOrderConfirmationWithEmailAndPassword(string $email, string $password): void
     {
-        $this->getPage('CheckoutCart')->proceedToOrderConfirmationWithLogin($email, $password);
+        $this->getPage(CheckoutCart::class)->proceedToOrderConfirmationWithLogin($email, $password);
     }
 
     /**
      * @Given /^I proceed to checkout as:$/
      */
-    public function iProceedToCheckoutAs(TableNode $table)
+    public function iProceedToCheckoutAs(TableNode $table): void
     {
-        $this->getPage('CheckoutCart')->proceedToOrderConfirmationWithRegistration($table->getHash());
+        $this->getPage(CheckoutCart::class)->proceedToOrderConfirmationWithRegistration($table->getHash());
     }
 
     /**
      * @When /^I proceed to checkout$/
      */
-    public function iProceedToCheckout()
+    public function iProceedToCheckout(): void
     {
-        $this->getPage('CheckoutConfirm')->proceedToCheckout();
+        $this->getPage(CheckoutConfirm::class)->proceedToCheckout();
     }
 
     /**
      * @When /^I change the shipping method to (?P<shippingId>\d+)$/
      */
-    public function iChangeTheShippingMethodTo($shipping)
+    public function iChangeTheShippingMethodTo(int $shippingId): void
     {
         $data = [
             [
                 'field' => 'sDispatch',
-                'value' => $shipping,
+                'value' => $shippingId,
             ],
         ];
 
-        $this->getPage('CheckoutConfirm')->changeShippingMethod($data);
+        $this->getPage(CheckoutConfirm::class)->changeShippingMethod($data);
     }
 
     /**
      * @Given /^the cart contains the following products:$/
      */
-    public function theCartContainsTheFollowingProducts(TableNode $items)
+    public function theCartContainsTheFollowingProducts(TableNode $items): void
     {
-        /** @var Detail $detailPage */
-        $detailPage = $this->getPage('Detail');
+        $detailPage = $this->getPage(Detail::class);
 
         foreach ($items->getIterator() as $row) {
             $detailPage->open(['articleId' => $row['articleId'], 'number' => $row['number']]);
             $detailPage->addToBasket($row['quantity']);
         }
-
-        if ($this->getDriver() instanceof Selenium2Driver) {
-//            $detailPage->toBasket();
-        }
     }
 
     /**
      * @Then /^the cart should contain the following products:$/
      */
-    public function theCartShouldContainTheFollowingProducts(TableNode $items)
+    public function theCartShouldContainTheFollowingProducts(TableNode $items): void
     {
-        /** @var CheckoutCart $page */
-        $page = $this->getPage('CheckoutCart');
+        $page = $this->getPage(CheckoutCart::class);
 
-        /** @var CartPosition $cartPositions */
-        $cartPositions = $this->getMultipleElement($page, 'CartPosition');
+        $cartPositions = $this->getMultipleElement($page, CartPositionProduct::class);
         $page->checkCartProducts($cartPositions, $items->getHash());
     }
 
     /**
-     * @Given /^The article "(?P<articleNr>[^"]*)" is assigned to the price group "([^"]*)"$/
+     * @Given /^The article "(?P<productNumber>[^"]*)" is assigned to the price group "([^"]*)"$/
      */
-    public function theArticleIsAssignedToThePriceGroup($articleNumber, $priceGroupName)
+    public function theArticleIsAssignedToThePriceGroup(string $productNumber, string $priceGroupName): void
     {
         $modelManager = $this->getService(ModelManager::class);
 
         $priceGroup = $modelManager->getRepository(Group::class)->findOneBy(['name' => $priceGroupName]);
-        $productVariant = $modelManager->getRepository(ProductVariant::class)->findOneBy(['number' => $articleNumber]);
+        $productVariant = $modelManager->getRepository(ProductVariant::class)->findOneBy(['number' => $productNumber]);
 
-        if ($productVariant === null) {
-            Helper::throwException('Article with number "' . $articleNumber . '" was not found.');
+        if (!$productVariant instanceof ProductVariant) {
+            Helper::throwException(\sprintf('Product with number "%s" was not found.', $productNumber));
         }
 
-        $article = $productVariant->getArticle();
-        $article->setPriceGroupActive(true);
-        $article->setPriceGroup($priceGroup);
+        $product = $productVariant->getArticle();
+        $product->setPriceGroupActive(true);
+        $product->setPriceGroup($priceGroup);
 
         $modelManager->flush();
     }
@@ -230,9 +221,8 @@ public function theArticleIsAssignedToThePriceGroup($articleNumber, $priceGroupN
     /**
      * @Given /^A price group named "([^"]*)" that grants "([^"]*)" discount$/
      */
-    public function aPriceGroupNamedThatGrantsDiscount($priceGroupName, $grantedDiscount)
+    public function aPriceGroupNamedThatGrantsDiscount(string $priceGroupName, string $grantedDiscount): void
     {
-        /** @var ModelManager $modelManager */
         $modelManager = $this->getService(ModelManager::class);
 
         $priceGroup = $modelManager->getRepository(Group::class)->findOneBy(['name' => $priceGroupName]);
@@ -267,7 +257,7 @@ public function aPriceGroupNamedThatGrantsDiscount($priceGroupName, $grantedDisc
     /**
      * @Given /^there is a category defined:$/
      */
-    public function thereIsACategoryDefined(TableNode $table)
+    public function thereIsACategoryDefined(TableNode $table): void
     {
         $categories = $table->getHash();
 
@@ -294,7 +284,7 @@ public function thereIsACategoryDefined(TableNode $table)
     /**
      * @Given /^the following product exist:$/
      */
-    public function theFollowingProductExist(TableNode $table)
+    public function theFollowingProductExist(TableNode $table): void
     {
         $products = $table->getHash();
 
@@ -345,7 +335,7 @@ public function theFollowingProductExist(TableNode $table)
     /**
      * @Given /^the manufacturer exist:$/
      */
-    public function theManufacturerExist(TableNode $table)
+    public function theManufacturerExist(TableNode $table): void
     {
         $manufactures = $table->getHash();
 
@@ -368,7 +358,7 @@ public function theManufacturerExist(TableNode $table)
     /**
      * @Given /^the customer group exist:$/
      */
-    public function theCustomerGroupExist(TableNode $table)
+    public function theCustomerGroupExist(TableNode $table): void
     {
         $groups = $table->getHash();
 
@@ -391,16 +381,16 @@ public function theCustomerGroupExist(TableNode $table)
     }
 
     /**
-     * @Given /^The article "(?P<articleNr>[^"]*)" has no active price group$/
+     * @Given /^The article "(?P<productNumber>[^"]*)" has no active price group$/
      */
-    public function theArticleHasNoActivePriceGroup($articleNumber)
+    public function theArticleHasNoActivePriceGroup(string $productNumber): void
     {
         $modelManager = $this->getService(ModelManager::class);
 
-        $productVariant = $modelManager->getRepository(ProductVariant::class)->findOneBy(['number' => $articleNumber]);
+        $productVariant = $modelManager->getRepository(ProductVariant::class)->findOneBy(['number' => $productNumber]);
 
-        if ($productVariant === null) {
-            Helper::throwException('Article with number "' . $articleNumber . '" was not found.');
+        if (!$productVariant instanceof ProductVariant) {
+            Helper::throwException('Product with number "' . $productNumber . '" was not found.');
         }
 
         $product = $productVariant->getArticle();
@@ -413,15 +403,12 @@ public function theArticleHasNoActivePriceGroup($articleNumber)
     /**
      * @When /^I click the link "([^"]*)" in the address box with title "([^"]*)"$/
      */
-    public function iClickTheLinkInTheAddressBoxWithTitle($linkName, $title)
+    public function iClickTheLinkInTheAddressBoxWithTitle(string $linkName, string $title): void
     {
-        /** @var CheckoutConfirm $page */
-        $page = $this->getPage('CheckoutConfirm');
+        $page = $this->getPage(CheckoutConfirm::class);
 
-        /** @var MultipleElement $checkoutAddressBoxes */
-        $checkoutAddressBoxes = $this->getMultipleElement($page, 'CheckoutAddressBox');
+        $checkoutAddressBoxes = $this->getMultipleElement($page, CheckoutAddressBox::class);
 
-        /** @var CheckoutAddressBox $box */
         foreach ($checkoutAddressBoxes as $box) {
             if ($box->hasTitle($title)) {
                 Helper::clickNamedLink($box, $linkName);
@@ -434,13 +421,11 @@ public function iClickTheLinkInTheAddressBoxWithTitle($linkName, $title)
     /**
      * @When /^I click on the link "([^"]*)"$/
      */
-    public function iClickOnTheLink($linkName)
+    public function iClickOnTheLink(string $linkName): void
     {
-        /** @var CheckoutConfirm $page */
-        $page = $this->getPage('CheckoutConfirm');
+        $page = $this->getPage(CheckoutConfirm::class);
 
-        /** @var MultipleElement $checkoutModalAddressSelections */
-        $checkoutModalAddressSelections = $this->getMultipleElement($page, 'CheckoutModalAddressSelection');
+        $checkoutModalAddressSelections = $this->getMultipleElement($page, CheckoutModalAddressSelection::class);
 
         Helper::assertElementCount($checkoutModalAddressSelections, 1);
 
@@ -450,10 +435,9 @@ public function iClickOnTheLink($linkName)
     /**
      * @When /^I create the address:$/
      */
-    public function iCreateTheAddress(TableNode $table)
+    public function iCreateTheAddress(TableNode $table): void
     {
-        /** @var CheckoutConfirm $page */
-        $page = $this->getPage('CheckoutConfirm');
+        $page = $this->getPage(CheckoutConfirm::class);
         $data = $table->getHash();
 
         $page->createArbitraryAddress($data);
@@ -462,9 +446,9 @@ public function iCreateTheAddress(TableNode $table)
     /**
      * @Then /^I should see appear "([^"]*)"$/
      */
-    public function iShouldSeeAppear($text)
+    public function iShouldSeeAppear(string $text): void
     {
-        $this->spin(function ($context) use ($text) {
+        Helper::spin(function () use ($text) {
             try {
                 $this->getMink()->assertSession($this->getSession())->pageTextContains(str_replace('\\"', '"', $text));
 
@@ -477,38 +461,10 @@ public function iShouldSeeAppear($text)
         });
     }
 
-    /**
-     * Based on Behat's own example
-     *
-     * @see http://docs.behat.org/en/v2.5/cookbook/using_spin_functions.html#adding-a-timeout
-     *
-     * @param int $wait
-     *
-     * @throws Exception
-     */
-    public function spin($lambda, $wait = 60)
-    {
-        $time = time();
-        $stopTime = $time + $wait;
-        while (time() < $stopTime) {
-            try {
-                if ($lambda($this)) {
-                    return;
-                }
-            } catch (Exception $e) {
-                // do nothing
-            }
-
-            usleep(250000);
-        }
-
-        throw new Exception("Spin function timed out after {$wait} seconds");
-    }
-
     /**
      * @When /^I wait for "([^"]*)" seconds$/
      */
-    public function iWaitForSeconds($seconds)
+    public function iWaitForSeconds(int $seconds): void
     {
         $wait = 0;
         while ($wait < $seconds) {
@@ -520,41 +476,35 @@ public function iWaitForSeconds($seconds)
     /**
      * @Given /^there should be a modal addressbox "([^"]*)"$/
      */
-    public function thereShouldBeAModalAddressbox($address)
+    public function thereShouldBeAModalAddressbox(string $address): void
     {
-        /** @var CheckoutConfirm $page */
-        $page = $this->getPage('CheckoutConfirm');
+        $page = $this->getPage(CheckoutConfirm::class);
 
         $testAddress = array_values(array_filter(explode(', ', $address)));
 
-        /** @var MultipleElement $checkoutAddressBoxes */
-        $checkoutAddressBoxes = $this->getMultipleElement($page, 'CheckoutAddressBoxModal');
+        $checkoutAddressBoxes = $this->getMultipleElement($page, CheckoutAddressBoxModal::class);
 
-        /** @var CheckoutAddressBoxModal $box */
         foreach ($checkoutAddressBoxes as $box) {
             if ($box->containsAdress($testAddress)) {
                 return;
             }
         }
 
-        $message = sprintf('Given address not found! (%s)', $address);
+        $message = \sprintf('Given address not found! (%s)', $address);
         Helper::throwException($message);
     }
 
     /**
      * @When /^I click "([^"]*)" on modal addressbox "([^"]*)"$/
      */
-    public function iClickOnModalAddressbox($buttonName, $address)
+    public function iClickOnModalAddressbox(string $buttonName, string $address): void
     {
-        /** @var CheckoutConfirm $page */
-        $page = $this->getPage('CheckoutConfirm');
+        $page = $this->getPage(CheckoutConfirm::class);
 
         $testAddress = array_values(array_filter(explode(', ', $address)));
 
-        /** @var MultipleElement $checkoutAddressBoxes */
-        $checkoutAddressBoxes = $this->getMultipleElement($page, 'CheckoutAddressBoxModal');
+        $checkoutAddressBoxes = $this->getMultipleElement($page, CheckoutAddressBoxModal::class);
 
-        /** @var CheckoutAddressBoxModal $box */
         foreach ($checkoutAddressBoxes as $box) {
             if ($box->containsAdress($testAddress)) {
                 Helper::pressNamedButton($box, $buttonName);
@@ -563,24 +513,26 @@ public function iClickOnModalAddressbox($buttonName, $address)
             }
         }
 
-        $message = sprintf('Expected address not found! (%s)', $address);
+        $message = \sprintf('Expected address not found! (%s)', $address);
         Helper::throwException($message);
     }
 
     /**
      * @Then /^I should see appear "([^"]*)" in addressbox "([^"]*)" after "([^"]*)" disappeared$/
      */
-    public function iShouldSeeAppearInAddressboxAfterDisappeared($address, $title, $titleToDisappear)
+    public function iShouldSeeAppearInAddressboxAfterDisappeared(string $address, string $title, string $titleToDisappear): void
     {
-        /** @var CheckoutConfirm $page */
-        $page = $this->getPage('CheckoutConfirm');
+        $page = $this->getPage(CheckoutConfirm::class);
 
         $testAddress = array_values(array_filter(explode(', ', $address)));
         if (empty(trim($testAddress[0]))) {
             $testAddress = array_shift($testAddress);
         }
+        if (!\is_array($testAddress)) {
+            Helper::throwException('Invalid address given');
+        }
 
-        $this->spin(function ($context) use ($titleToDisappear) {
+        Helper::spin(function () use ($titleToDisappear) {
             try {
                 $this->getMink()->assertSession($this->getSession())->pageTextNotContains(str_replace('\\"', '"', $titleToDisappear));
 
@@ -592,27 +544,24 @@ public function iShouldSeeAppearInAddressboxAfterDisappeared($address, $title, $
             return false;
         });
 
-        /** @var MultipleElement $checkoutAddressBoxes */
-        $checkoutAddressBoxes = $this->getMultipleElement($page, 'CheckoutAddressBox');
+        $checkoutAddressBoxes = $this->getMultipleElement($page, CheckoutAddressBox::class);
 
-        /** @var CheckoutAddressBox $box */
         foreach ($checkoutAddressBoxes as $box) {
             if ($box->hasTitle($title) && $box->containsAdress($testAddress)) {
                 return;
             }
         }
 
-        $message = sprintf('Expected to find address as %s! (%s)', $title, $address);
+        $message = \sprintf('Expected to find address as %s! (%s)', $title, $address);
         Helper::throwException($message);
     }
 
     /**
      * @When /^I change the address:$/
      */
-    public function iChangeTheAddress(TableNode $table)
+    public function iChangeTheAddress(TableNode $table): void
     {
-        /** @var CheckoutConfirm $page */
-        $page = $this->getPage('CheckoutConfirm');
+        $page = $this->getPage(CheckoutConfirm::class);
         $data = $table->getHash();
 
         $page->changeModalAddress($data);
@@ -621,14 +570,13 @@ public function iChangeTheAddress(TableNode $table)
     /**
      * @Given /^I set "([^"]*)" as default after "([^"]*)" disappeared$/
      */
-    public function iSetAsDefaultAfterDisappeared($address, $titleToDisappear)
+    public function iSetAsDefaultAfterDisappeared(string $address, string $titleToDisappear): void
     {
-        /** @var CheckoutConfirm $page */
-        $page = $this->getPage('CheckoutConfirm');
+        $page = $this->getPage(CheckoutConfirm::class);
 
         $testAddress = array_values(array_filter(explode(', ', $address)));
 
-        $this->spin(function ($context) use ($titleToDisappear) {
+        Helper::spin(function () use ($titleToDisappear) {
             try {
                 $this->getMink()->assertSession($this->getSession())->pageTextNotContains(str_replace('\\"', '"', $titleToDisappear));
 
@@ -640,10 +588,8 @@ public function iSetAsDefaultAfterDisappeared($address, $titleToDisappear)
             return false;
         });
 
-        /** @var MultipleElement $checkoutAddressBoxes */
-        $checkoutAddressBoxes = $this->getMultipleElement($page, 'CheckoutAddressBox');
+        $checkoutAddressBoxes = $this->getMultipleElement($page, CheckoutAddressBox::class);
 
-        /** @var CheckoutAddressBox $box */
         foreach ($checkoutAddressBoxes as $box) {
             if ($box->hasTitle('Zahlung und Versand') === false && $box->containsAdress($testAddress)) {
                 $box->checkField('set_as_default_billing');
@@ -652,66 +598,61 @@ public function iSetAsDefaultAfterDisappeared($address, $titleToDisappear)
             }
         }
 
-        $message = sprintf('Expected address not found! (%s)', $address);
+        $message = \sprintf('Expected address not found! (%s)', $address);
         Helper::throwException($message);
     }
 
     /**
      * @Then /^the "([^"]*)" addressbox must contain "([^"]*)"$/
      */
-    public function theAddressboxMustContain($title, $address)
+    public function theAddressboxMustContain(string $title, string $address): bool
     {
-        /** @var CheckoutConfirm $page */
-        $page = $this->getPage('CheckoutConfirm');
+        $page = $this->getPage(CheckoutConfirm::class);
 
         $testAddress = array_values(array_filter(explode(', ', $address)));
 
-        /** @var MultipleElement $checkoutAddressBoxes */
-        $checkoutAddressBoxes = $this->getMultipleElement($page, 'CheckoutAddressBox');
+        $checkoutAddressBoxes = $this->getMultipleElement($page, CheckoutAddressBox::class);
 
-        /** @var CheckoutAddressBox $box */
         foreach ($checkoutAddressBoxes as $box) {
             if ($box->hasTitle($title) && $box->containsAdress($testAddress)) {
                 return true;
             }
         }
 
-        $message = sprintf('Expected to find address "%s" as "%s", but didn\'t.', $address, $title);
+        $message = \sprintf('Expected to find address "%s" as "%s", but didn\'t.', $address, $title);
         Helper::throwException($message);
     }
 
     /**
      * @When /^I click "([^"]*)" to add the article to the cart$/
      */
-    public function iClickToAddTheArticleToTheCart($locator)
+    public function iClickToAddTheArticleToTheCart(string $locator): void
     {
-        /** @var Detail $page */
-        $page = $this->getPage('Detail');
+        $page = $this->getPage(Detail::class);
         Helper::pressNamedButton($page, $locator);
     }
 
     /**
      * @Given /^I open the cart page$/
      */
-    public function iOpenTheCartPage()
+    public function iOpenTheCartPage(): void
     {
-        $this->getPage('CheckoutCart')->open();
+        $this->getPage(CheckoutCart::class)->open();
     }
 
     /**
      * @Then /^I open the order confirmation page$/
      */
-    public function iOpenTheOrderConfirmationPage()
+    public function iOpenTheOrderConfirmationPage(): void
     {
-        $this->getPage('CheckoutConfirm')->open();
+        $this->getPage(CheckoutConfirm::class)->open();
     }
 
     /**
      * @BeforeScenario @taxation
      */
-    public function addCustomTaxation()
+    public function addCustomTaxation(): void
     {
-        /** @var Connection $dbal */
         $dbal = $this->getService(Connection::class);
         $sql = <<<'EOD'
             INSERT INTO s_core_tax_rules (areaID, countryID, stateID, groupID, customer_groupID, tax, name, active)
@@ -723,9 +664,8 @@ public function addCustomTaxation()
     /**
      * @AfterScenario @taxation
      */
-    public function removeCustomTaxation()
+    public function removeCustomTaxation(): void
     {
-        /** @var Connection $dbal */
         $dbal = $this->getService(Connection::class);
         $sql = <<<'EOD'
             DELETE FROM s_core_tax_rules
@@ -737,9 +677,8 @@ public function removeCustomTaxation()
     /**
      * @BeforeScenario @dispatchsurcharge
      */
-    public function addCustomDispatchSurcharge()
+    public function addCustomDispatchSurcharge(): void
     {
-        /** @var Connection $dbal */
         $dbal = $this->getService(Connection::class);
         $sql = <<<"EOD"
             INSERT INTO `s_premium_dispatch` (`id`, `name`, `type`, `description`, `comment`, `active`, `position`, `calculation`, `surcharge_calculation`, `tax_calculation`, `shippingfree`, `multishopID`, `customergroupID`, `bind_shippingfree`, `bind_time_from`, `bind_time_to`, `bind_instock`, `bind_laststock`, `bind_weekday_from`, `bind_weekday_to`, `bind_weight_from`, `bind_weight_to`, `bind_price_from`, `bind_price_to`, `bind_sql`, `status_link`, `calculation_sql`)
@@ -772,9 +711,8 @@ public function addCustomDispatchSurcharge()
     /**
      * @AfterScenario @dispatchsurcharge
      */
-    public function removeCustomDispatchSurcharge()
+    public function removeCustomDispatchSurcharge(): void
     {
-        /** @var Connection $dbal */
         $dbal = $this->getService(Connection::class);
         $sql = <<<'EOD'
             SET @dispatchId = (SELECT id FROM `s_premium_dispatch` WHERE `name` = 'Sonderaufschlag');
@@ -800,9 +738,8 @@ public function removeCustomDispatchSurcharge()
     /**
      * @BeforeFeature @checkoutadressmanagement
      */
-    public static function createUserForCheckoutAddressManagementTest()
+    public static function createUserForCheckoutAddressManagementTest(): void
     {
-        /** @var Connection $dbal */
         $dbal = Shopware()->Container()->get(Connection::class);
         $sql = <<<'EOD'
 INSERT INTO `s_user`
@@ -851,9 +788,8 @@ public static function createUserForCheckoutAddressManagementTest()
     /**
      * @BeforeScenario @paymentsurcharge
      */
-    public function addCustomPaymentSurcharge()
+    public function addCustomPaymentSurcharge(): void
     {
-        /** @var Connection $dbal */
         $dbal = $this->getService(Connection::class);
         $sql = <<<'EOD'
             UPDATE s_core_paymentmeans SET debit_percent = 10 WHERE id = 5;
@@ -864,9 +800,8 @@ public function addCustomPaymentSurcharge()
     /**
      * @AfterScenario @paymentsurcharge
      */
-    public function removeCustomPaymentSurcharge()
+    public function removeCustomPaymentSurcharge(): void
     {
-        /** @var Connection $dbal */
         $dbal = $this->getService(Connection::class);
         $sql = <<<'EOD'
             UPDATE s_core_paymentmeans SET debit_percent = 0 WHERE id = 5;
@@ -876,11 +811,34 @@ public function removeCustomPaymentSurcharge()
 
     /**
      * @Given I checkout using GET
-     *
-     * @param string $path
      */
-    public function iCheckoutUsingGet($path = '/checkout/finish')
+    public function iCheckoutUsingGet(string $path = '/checkout/finish'): void
+    {
+        $this->getSession()->executeScript(\sprintf('window.location.href = \'%s\'', $path));
+    }
+
+    /**
+     * @Given /^Position "([^"]*)" contains following taxes$/
+     */
+    public function positionContainsFollowingTaxes(string $cartPositionName, TableNode $taxes): void
     {
-        $this->getSession()->executeScript(sprintf('window.location.href = \'%s\'', $path));
+        /** @var list<array{taxRate: string, value: string}> $taxValues */
+        $taxValues = $taxes->getHash();
+
+        $page = $this->getPage(CheckoutCart::class);
+        $cartPositions = $this->getMultipleElement($page, CartPositionRebate::class);
+        $cartPositionToCheck = null;
+        foreach ($cartPositions as $cartPosition) {
+            if (str_contains($cartPosition->getText(), $cartPositionName)) {
+                $cartPositionToCheck = $cartPosition;
+                break;
+            }
+        }
+
+        if (!$cartPositionToCheck instanceof CartPositionRebate) {
+            Helper::throwException(\sprintf('No discount or surcharge element found with name: "%s"', $cartPositionName));
+        }
+
+        $page->checkPositionTaxes($cartPositionToCheck, $taxValues);
     }
 }
diff --git a/tests/Mink/features/checkout.feature b/tests/Mink/Tests/Frontend/Checkout/checkout.feature
similarity index 72%
rename from tests/Mink/features/checkout.feature
rename to tests/Mink/Tests/Frontend/Checkout/checkout.feature
index 7f8a855d757..7192a1b150c 100644
--- a/tests/Mink/features/checkout.feature
+++ b/tests/Mink/Tests/Frontend/Checkout/checkout.feature
@@ -57,7 +57,7 @@ Feature: Checkout articles
         Then  I should see "Vielen Dank für Ihre Bestellung bei Shopware Demo!"
 
     @paymentsurcharge
-    Scenario:   I can switch to payment method with percentual surcharge and everything is calculated correctly
+    Scenario:   I can switch to payment method with percentage surcharge and everything is calculated correctly
         Given   I proceed to order confirmation
         When    I change the payment method to 5
         And     Wait until ajax requests are done
@@ -74,6 +74,44 @@ Feature: Checkout articles
         When  I proceed to checkout
         Then  I should see "Vielen Dank für Ihre Bestellung bei Shopware Demo!"
 
+    @proportionalTax @configChange
+    Scenario:   I can checkout the cart with different tax items
+        Given   the config value of "proportionalTaxCalculation" is 1
+        And     I add the article "SW10036" to my basket
+        Then    I proceed to order confirmation
+        When    I change the payment method to 4
+        And     Wait until ajax requests are done
+        Then    the current payment method should be "Rechnung"
+        And     I should see "Zuschlag für Zahlungsart"
+        And     the aggregations should look like this:
+            | label         | value   |
+            | sum           | 65,04 € |
+            | shipping      | 3,90 €  |
+            | total         | 68,94 € |
+            | sumWithoutVat | 60,20 € |
+            | 7%            | 1,58 €  |
+            | 19%           | 7,15 €  |
+        And   I should see "AGB und Widerrufsbelehrung"
+        And   I should see 2 ".product--essential-features" elements
+        And   Position "Warenkorbrabatt" contains following taxes
+            | taxRate | value   |
+            | 7%      | -0,04 € |
+            | 19%     | -0,20 € |
+        And   Position "Zuschlag für Zahlungsart" contains following taxes
+            | taxRate | value  |
+            | 7%      | 0,12 € |
+            | 19%     | 0,50 € |
+        When  I proceed to checkout
+        Then  I should see "Vielen Dank für Ihre Bestellung bei Shopware Demo!"
+        And     the aggregations should look like this:
+            | label         | value   |
+            | sum           | 65,04 € |
+            | shipping      | 3,90 €  |
+            | total         | 68,94 € |
+            | sumWithoutVat | 60,20 € |
+            | 7%            | 1,58 €  |
+            | 19%           | 7,15 €  |
+
     @shipping @payment
     Scenario: I can change the shipping-country to a non-EU-country and back and pay via bill
         Given I proceed to order confirmation
diff --git a/tests/Mink/features/checkout_account.feature b/tests/Mink/Tests/Frontend/Checkout/checkout_account.feature
similarity index 100%
rename from tests/Mink/features/checkout_account.feature
rename to tests/Mink/Tests/Frontend/Checkout/checkout_account.feature
diff --git a/tests/Mink/features/checkout_addressManagement.feature b/tests/Mink/Tests/Frontend/Checkout/checkout_addressManagement.feature
similarity index 100%
rename from tests/Mink/features/checkout_addressManagement.feature
rename to tests/Mink/Tests/Frontend/Checkout/checkout_addressManagement.feature
diff --git a/tests/Mink/features/checkout_cart.feature b/tests/Mink/Tests/Frontend/Checkout/checkout_cart.feature
similarity index 79%
rename from tests/Mink/features/checkout_cart.feature
rename to tests/Mink/Tests/Frontend/Checkout/checkout_cart.feature
index dccac21fcd3..e979a3253da 100644
--- a/tests/Mink/features/checkout_cart.feature
+++ b/tests/Mink/Tests/Frontend/Checkout/checkout_cart.feature
@@ -48,16 +48,16 @@ Feature: Checkout articles (scenario origin is cart with one product in it)
     @fastOrder @payment @shipping
     Scenario: I can finish my order with different payment and delivery methods
         Given I proceed to checkout as:
-            | field       | register[personal] | register[billing] |
+            | field         | register[personal] | register[billing] |
             | customer_type | private            |                   |
-            | salutation  | mr                 |                   |
-            | firstname   | Max                |                   |
-            | lastname    | Mustermann         |                   |
-            | accountmode | 1                  |                   |
-            | email       | test@example.de    |                   |
-            | street      |                    | Musterstr. 55     |
-            | zipcode     |                    | 55555             |
-            | city        |                    | Musterhausen      |
+            | salutation    | mr                 |                   |
+            | firstname     | Max                |                   |
+            | lastname      | Mustermann         |                   |
+            | accountmode   | 1                  |                   |
+            | email         | test@example.de    |                   |
+            | street        |                    | Musterstr. 55     |
+            | zipcode       |                    | 55555             |
+            | city          |                    | Musterhausen      |
         And   I change the payment method to 2:
             | field            | value          |
             | sDebitAccount    | 123456789      |
@@ -147,10 +147,10 @@ Feature: Checkout articles (scenario origin is cart with one product in it)
         And I add the article "SW10205.2" to my basket
         And I add the article "SW10205.3" to my basket
         Then  the cart should contain the following products:
-            | number  | name                       | quantity | itemPrice | sum    |
-            | SW10181 | Reisekoffer Set      | 1        | 139,99    | 139,99 |
-            | SW10003 | Münsterländer Aperitif 16% | 1        | 14,95     | 14,95  |
-            | SW10205.2 | Artikel mit Grundpreisberechnung | 1        | 400,00     | 400,00  |
+            | number    | name                             | quantity | itemPrice | sum    |
+            | SW10181   | Reisekoffer Set                  | 1        | 139,99    | 139,99 |
+            | SW10003   | Münsterländer Aperitif 16%       | 1        | 14,95     | 14,95  |
+            | SW10205.2 | Artikel mit Grundpreisberechnung | 1        | 400,00    | 400,00 |
             | SW10205.3 | Artikel mit Grundpreisberechnung | 1        | 50,00     | 50,00  |
 
     @calculation
@@ -158,37 +158,37 @@ Feature: Checkout articles (scenario origin is cart with one product in it)
         Given I add the article "SW10206" to my basket
         Then  the cart should contain the following products:
             | number  | name                                  | quantity | itemPrice | sum    |
-            | SW10181 | Reisekoffer Set      | 1        | 139,99    | 139,99 |
+            | SW10181 | Reisekoffer Set                       | 1        | 139,99    | 139,99 |
             | SW10206 | Staffelung, Mindest- / Maximalabnahme | 3        | 200,00    | 600,00 |
 
     @calculation
     Scenario: I add an article with pseudo price to the cart and get the correct price
         Given I add the article "SW10207" to my basket
         Then  the cart should contain the following products:
-            | number  | name                                  | quantity | itemPrice | sum    |
-            | SW10181 | Reisekoffer Set      | 1        | 139,99    | 139,99 |
-            | SW10207 | Pseudopreis | 1        | 500,00    | 500,00 |
+            | number  | name            | quantity | itemPrice | sum    |
+            | SW10181 | Reisekoffer Set | 1        | 139,99    | 139,99 |
+            | SW10207 | Pseudopreis     | 1        | 500,00    | 500,00 |
 
     @calculation
     Scenario: I add an article with an additional price to the cart and get the correct price
         Given I add the article "SW10204.7" to my basket
         Then  the cart should contain the following products:
-            | number  | name                                  | quantity | itemPrice | sum    |
-            | SW10181 | Reisekoffer Set      | 1        | 139,99    | 139,99 |
+            | number    | name                                                                  | quantity | itemPrice | sum    |
+            | SW10181   | Reisekoffer Set                                                       | 1        | 139,99    | 139,99 |
             | SW10204.7 | Artikel mit Aufpreiskonfigurator mit Figuren und Ball-Set / 36 Monate | 1        | 279,65    | 279,65 |
 
-  @calculation
-  Scenario: I add an article with a new price group, add it to the cart and get the correct price
-    Given A price group named "UNITTEST" that grants "50%" discount
-    Given The article "SW10205.2" is assigned to the price group "UNITTEST"
-    Then I add the article "SW10205.2" to my basket
-    Then  the cart should contain the following products:
-      | number    | name                                                                  | quantity | itemPrice | sum    |
-      | SW10181 | Reisekoffer Set      | 1        | 139,99    | 139,99 |
-      | SW10205.2 | Artikel mit Grundpreisberechnung | 1        | 200,00     | 200,00  |
+    @calculation
+    Scenario: I add an article with a new price group, add it to the cart and get the correct price
+        Given A price group named "UNITTEST" that grants "50%" discount
+        Given The article "SW10205.2" is assigned to the price group "UNITTEST"
+        Then I add the article "SW10205.2" to my basket
+        Then  the cart should contain the following products:
+            | number    | name                             | quantity | itemPrice | sum    |
+            | SW10181   | Reisekoffer Set                  | 1        | 139,99    | 139,99 |
+            | SW10205.2 | Artikel mit Grundpreisberechnung | 1        | 200,00    | 200,00 |
 
     @calculation @repair
-        Scenario: I should repair my database changes until we've implemented the new test structure :)
+    Scenario: I should repair my database changes until we've implemented the new test structure :)
         Given the customer group exist:
             | key | taxInput |
             | EK  | 1        |
diff --git a/tests/Mink/features/checkout_cart_value.feature b/tests/Mink/Tests/Frontend/Checkout/checkout_cart_value.feature
similarity index 100%
rename from tests/Mink/features/checkout_cart_value.feature
rename to tests/Mink/Tests/Frontend/Checkout/checkout_cart_value.feature
diff --git a/tests/Mink/features/checkout_confirm.feature b/tests/Mink/Tests/Frontend/Checkout/checkout_confirm.feature
similarity index 100%
rename from tests/Mink/features/checkout_confirm.feature
rename to tests/Mink/Tests/Frontend/Checkout/checkout_confirm.feature
diff --git a/tests/Mink/features/checkout_tax.feature b/tests/Mink/Tests/Frontend/Checkout/checkout_tax.feature
similarity index 100%
rename from tests/Mink/features/checkout_tax.feature
rename to tests/Mink/Tests/Frontend/Checkout/checkout_tax.feature
diff --git a/tests/Mink/features/checkout_voucher.feature b/tests/Mink/Tests/Frontend/Checkout/checkout_voucher.feature
similarity index 100%
rename from tests/Mink/features/checkout_voucher.feature
rename to tests/Mink/Tests/Frontend/Checkout/checkout_voucher.feature
diff --git a/tests/Mink/features/bootstrap/DetailContext.php b/tests/Mink/Tests/Frontend/Detail/bootstrap/DetailContext.php
similarity index 62%
rename from tests/Mink/features/bootstrap/DetailContext.php
rename to tests/Mink/Tests/Frontend/Detail/bootstrap/DetailContext.php
index 9e9290b1ebc..7f7744cf64b 100644
--- a/tests/Mink/features/bootstrap/DetailContext.php
+++ b/tests/Mink/Tests/Frontend/Detail/bootstrap/DetailContext.php
@@ -1,76 +1,80 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink;
+namespace Shopware\Tests\Mink\Tests\Frontend\Detail\bootstrap;
 
 use Behat\Gherkin\Node\TableNode;
 use Behat\Mink\Element\NodeElement;
 use Behat\Mink\Exception\ElementNotFoundException;
-use Shopware\Tests\Mink\Element\ArticleEvaluation;
-use Shopware\Tests\Mink\Page\Detail;
+use Doctrine\DBAL\Connection;
+use Shopware\Bundle\PluginInstallerBundle\Service\InstallerService;
+use Shopware\Tests\Mink\Page\Frontend\Article\Elements\ArticleEvaluation;
+use Shopware\Tests\Mink\Page\Frontend\Detail\Detail;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\SubContext;
 
 class DetailContext extends SubContext
 {
     /**
-     * @Given /^I am on the detail page for article (?P<articleId>\d+)$/
-     * @When /^I go to the detail page for article (?P<articleId>\d+)$/
+     * @Given /^I am on the detail page for article (?P<productId>\d+)$/
+     *
+     * @When /^I go to the detail page for article (?P<productId>\d+)$/
      */
-    public function iAmOnTheDetailPageForArticle($articleId): void
+    public function iAmOnTheDetailPageForArticle(int $productId): void
     {
-        $this->getPage('Detail')->open(['articleId' => $articleId, 'number' => null]);
+        $this->getPage(Detail::class)->open(['articleId' => $productId, 'number' => '']);
     }
 
     /**
-     * @Given /^I am on the detail page for variant "(?P<number>[^"]*)" of article (?P<articleId>\d+)$/
-     * @When /^I go to the detail page for variant "(?P<number>[^"]*)" of article (?P<articleId>\d+)$/
+     * @Given /^I am on the detail page for variant "(?P<number>[^"]*)" of article (?P<productId>\d+)$/
+     *
+     * @When /^I go to the detail page for variant "(?P<number>[^"]*)" of article (?P<productId>\d+)$/
      */
-    public function iAmOnTheDetailPageForVariantOfArticle($number, $articleId): void
+    public function iAmOnTheDetailPageForVariantOfArticle(string $number, int $productId): void
     {
-        $this->getPage('Detail')->open(['articleId' => $articleId, 'number' => $number]);
+        $this->getPage(Detail::class)->open(['articleId' => $productId, 'number' => $number]);
     }
 
     /**
      * @When /^I put the article into the basket$/
      * @When /^I put the article "(?P<quantity>[^"]*)" times into the basket$/
      */
-    public function iPutTheArticleTimesIntoTheBasket($quantity = 1): void
+    public function iPutTheArticleTimesIntoTheBasket(string $quantity = '1'): void
     {
-        /** @var Detail $page */
-        $page = $this->getPage('Detail');
+        $page = $this->getPage(Detail::class);
         $page->addToBasket($quantity);
     }
 
     /**
      * @Given /^I should see an average customer evaluation of (?P<average>\d+) from following evaluations:$/
      */
-    public function iShouldSeeAnAverageCustomerEvaluationOfFromFollowingEvaluations($average, TableNode $evaluations): void
+    public function iShouldSeeAnAverageCustomerEvaluationOfFromFollowingEvaluations(string $average, TableNode $evaluations): void
     {
-        /** @var \Shopware\Tests\Mink\Page\Detail $page */
-        $page = $this->getPage('Detail');
+        $page = $this->getPage(Detail::class);
 
-        /** @var ArticleEvaluation $articleEvaluations */
-        $articleEvaluations = $this->getMultipleElement($page, 'ArticleEvaluation');
+        $articleEvaluations = $this->getMultipleElement($page, ArticleEvaluation::class);
         $evaluations = $evaluations->getHash();
 
         $page->checkEvaluations($articleEvaluations, $average, $evaluations);
@@ -83,15 +87,15 @@ public function iChooseTheFollowingArticleConfiguration(TableNode $configuration
     {
         $configuration = $configuration->getHash();
 
-        $this->getPage('Detail')->configure($configuration);
+        $this->getPage(Detail::class)->configure($configuration);
     }
 
     /**
      * @Then /^I can not select "([^"]*)" from "([^"]*)"$/
      */
-    public function iCanNotSelectFrom($configuratorOption, $configuratorGroup): void
+    public function iCanNotSelectFrom(string $configuratorOption, string $configuratorGroup): void
     {
-        $this->getPage('Detail')->canNotSelectConfiguratorOption($configuratorOption, $configuratorGroup);
+        $this->getPage(Detail::class)->canNotSelectConfiguratorOption($configuratorOption, $configuratorGroup);
     }
 
     /**
@@ -99,33 +103,33 @@ public function iCanNotSelectFrom($configuratorOption, $configuratorGroup): void
      */
     public function iWriteAnEvaluation(TableNode $data): void
     {
-        $this->getPage('Detail')->writeEvaluation($data->getHash());
+        $this->getPage(Detail::class)->writeEvaluation($data->getHash());
     }
 
     /**
      * @When /^the shop owner activates my latest evaluation$/
      * @When /^the shop owner activates my latest (\d+) evaluations$/
      */
-    public function theShopOwnerActivateMyLatestEvaluation($limit = 1): void
+    public function theShopOwnerActivateMyLatestEvaluation(int $limit = 1): void
     {
         $sql = 'UPDATE `s_articles_vote` SET `active`= 1 ORDER BY id DESC LIMIT ' . $limit;
-        $this->getService('db')->exec($sql);
+        $this->getService(Connection::class)->executeStatement($sql);
     }
 
     /**
      * @Given /^I can select every (\d+)\. option of "([^"]*)" from "([^"]*)" to "([^"]*)"$/
      */
-    public function iCanSelectEveryOptionOfFromTo($graduation, $select, $min, $max): void
+    public function iCanSelectEveryOptionOfFromTo(int $graduation, string $select, string $min, string $max): void
     {
-        $this->getPage('Detail')->checkSelect($select, $min, $max, $graduation);
+        $this->getPage(Detail::class)->checkSelect($select, $min, $max, $graduation);
     }
 
     /**
      * @When /^I submit the notification form with "([^"]*)"$/
      */
-    public function iSubmitTheNotificationFormWith($email): void
+    public function iSubmitTheNotificationFormWith(string $email): void
     {
-        $this->getPage('Detail')->submitNotification($email);
+        $this->getPage(Detail::class)->submitNotification($email);
     }
 
     /**
@@ -133,8 +137,7 @@ public function iSubmitTheNotificationFormWith($email): void
      */
     public function iOpenTheEvaluationForm(): void
     {
-        /** @var Detail $page */
-        $page = $this->getPage('Detail');
+        $page = $this->getPage(Detail::class);
         $page->openEvaluationSection();
     }
 
@@ -143,8 +146,7 @@ public function iOpenTheEvaluationForm(): void
      */
     public function theNotificationPluginIsActivated(): void
     {
-        /** @var \Shopware\Bundle\PluginInstallerBundle\Service\InstallerService $pluginManager */
-        $pluginManager = $this->getService(\Shopware\Bundle\PluginInstallerBundle\Service\InstallerService::class);
+        $pluginManager = $this->getService(InstallerService::class);
         $plugin = $pluginManager->getPluginByName('Notification');
         $pluginManager->activatePlugin($plugin);
     }
@@ -154,8 +156,7 @@ public function theNotificationPluginIsActivated(): void
      */
     public function theNotificationPluginIsDeactivated(): void
     {
-        /** @var \Shopware\Bundle\PluginInstallerBundle\Service\InstallerService $pluginManager */
-        $pluginManager = $this->getService(\Shopware\Bundle\PluginInstallerBundle\Service\InstallerService::class);
+        $pluginManager = $this->getService(InstallerService::class);
         $plugin = $pluginManager->getPluginByName('Notification');
         $pluginManager->deactivatePlugin($plugin);
     }
@@ -165,7 +166,7 @@ public function theNotificationPluginIsDeactivated(): void
      */
     public function iOpenTheComparisonMenu(): void
     {
-        $page = $this->getPage('Detail');
+        $page = $this->getPage(Detail::class);
         $openMenu = $page->find('css', '.entry--compare');
 
         if (!($openMenu instanceof NodeElement)) {
@@ -181,7 +182,7 @@ public function iOpenTheComparisonMenu(): void
      */
     public function iCompareTheCurrentProduct(): void
     {
-        $page = $this->getPage('Detail');
+        $page = $this->getPage(Detail::class);
         $doCompare = $page->find('css', '.action--compare');
 
         if (!($doCompare instanceof NodeElement)) {
@@ -197,7 +198,7 @@ public function iCompareTheCurrentProduct(): void
      */
     public function iStartTheComparison(): void
     {
-        $page = $this->getPage('Detail');
+        $page = $this->getPage(Detail::class);
         $startComparison = $page->find('css', '.btn--compare-start');
 
         if (!($startComparison instanceof NodeElement)) {
@@ -215,7 +216,7 @@ public function iStartTheComparison(): void
      */
     public function iPressButtonForProductDetails(): void
     {
-        $page = $this->getPage('Detail');
+        $page = $this->getPage(Detail::class);
         $goDetails = $page->find('css', '.btn--product');
 
         if (!($goDetails instanceof NodeElement)) {
@@ -230,7 +231,7 @@ public function iPressButtonForProductDetails(): void
      */
     public function iShouldSeeDetailPage(): void
     {
-        $page = $this->getPage('Detail');
+        $page = $this->getPage(Detail::class);
 
         $page->waitFor(4, function () use ($page) {
             return $page->find('xpath', '//*a[text()="Artikel mit Bewertung"]') === null;
diff --git a/tests/Mink/Tests/Frontend/Detail/bootstrap/FormContext.php b/tests/Mink/Tests/Frontend/Detail/bootstrap/FormContext.php
new file mode 100644
index 00000000000..3dd96ea6d0e
--- /dev/null
+++ b/tests/Mink/Tests/Frontend/Detail/bootstrap/FormContext.php
@@ -0,0 +1,57 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Mink\Tests\Frontend\Detail\bootstrap;
+
+use Behat\Gherkin\Node\TableNode;
+use Shopware\Tests\Mink\Page\Frontend\Form\Form;
+use Shopware\Tests\Mink\Tests\General\Helpers\SubContext;
+
+class FormContext extends SubContext
+{
+    /**
+     * @Given /^I am on form (\d+)$/
+     */
+    public function iAmOnForm(int $id): void
+    {
+        $this->getPage(Form::class)->open(['formId' => $id]);
+    }
+
+    /**
+     * @Given /^I should see a captcha$/
+     */
+    public function iShouldSeeACaptcha(): void
+    {
+        $this->getPage(Form::class)->checkCaptcha();
+    }
+
+    /**
+     * @When I submit the inquiry form with:
+     */
+    public function iSubmitTheInquiryFormWith(TableNode $data): void
+    {
+        $this->getPage(Form::class)->submitInquiryForm($data->getHash());
+    }
+}
diff --git a/tests/Mink/features/configurator.feature b/tests/Mink/Tests/Frontend/Detail/configurator.feature
similarity index 100%
rename from tests/Mink/features/configurator.feature
rename to tests/Mink/Tests/Frontend/Detail/configurator.feature
diff --git a/tests/Mink/features/detail.feature b/tests/Mink/Tests/Frontend/Detail/detail.feature
similarity index 86%
rename from tests/Mink/features/detail.feature
rename to tests/Mink/Tests/Frontend/Detail/detail.feature
index c77dc24486c..2ef7fcb6ae8 100644
--- a/tests/Mink/features/detail.feature
+++ b/tests/Mink/Tests/Frontend/Detail/detail.feature
@@ -58,27 +58,28 @@ Feature: Detail page
         When  I select "Deutsch" from "__shop"
         Then  I should see "Magnete London"
 
-    @captchaInactive @evaluations
-    Scenario: I can write an evaluation
-        Given I am on the detail page for article 100
-        Then  I follow "Bewertungen"
-        And   I should see "Bewertung schreiben"
-        When  I write an evaluation:
-            | field        | value           |
-            | sVoteName    | Max Mustermann  |
-            | sVoteStars   | 3               |
-            | sVoteSummary | Neue Bewertung  |
-            | sVoteComment | Hallo Welt      |
-        Then  I should not see "Bitte füllen Sie alle rot markierten Felder aus"
-        But   I should see "Vielen Dank für die Abgabe Ihrer Bewertung! Ihre Bewertung wird nach Überprüfung freigeschaltet."
-        But   I should not see "Hallo Welt"
-
-        When  the shop owner activates my latest evaluation
-        And   I am on the detail page for article 100
-        Then  I follow "Bewertungen"
-        Then  I should see an average customer evaluation of 3 from following evaluations:
-            | author         | stars | headline       | comment    |
-            | Max Mustermann | 3     | Neue Bewertung | Hallo Welt |
+#    TODO: This tests is deactivated, because is is flaky. See https://github.com/shopware5/shopware/issues/2634
+#    @captchaInactive @evaluations
+#    Scenario: I can write an evaluation
+#        Given I am on the detail page for article 100
+#        Then  I follow "Bewertungen"
+#        And   I should see "Bewertung schreiben"
+#        When  I write an evaluation:
+#            | field        | value           |
+#            | sVoteName    | Max Mustermann  |
+#            | sVoteStars   | 3               |
+#            | sVoteSummary | Neue Bewertung  |
+#            | sVoteComment | Hallo Welt      |
+#        Then  I should not see "Bitte füllen Sie alle rot markierten Felder aus"
+#        But   I should see "Vielen Dank für die Abgabe Ihrer Bewertung! Ihre Bewertung wird nach Überprüfung freigeschaltet."
+#        But   I should not see "Hallo Welt"
+#
+#        When  the shop owner activates my latest evaluation
+#        And   I am on the detail page for article 100
+#        Then  I follow "Bewertungen"
+#        Then  I should see an average customer evaluation of 3 from following evaluations:
+#            | author         | stars | headline       | comment    |
+#            | Max Mustermann | 3     | Neue Bewertung | Hallo Welt |
 
     @graduatedPrices
     Scenario Outline: An article can have graduated prices
diff --git a/tests/Mink/features/detail_recommendation.feature b/tests/Mink/Tests/Frontend/Detail/detail_recommendation.feature
similarity index 100%
rename from tests/Mink/features/detail_recommendation.feature
rename to tests/Mink/Tests/Frontend/Detail/detail_recommendation.feature
diff --git a/tests/Mink/features/form.feature b/tests/Mink/Tests/Frontend/Detail/form.feature
similarity index 79%
rename from tests/Mink/features/form.feature
rename to tests/Mink/Tests/Frontend/Detail/form.feature
index 1104f40fe70..e8be465191f 100644
--- a/tests/Mink/features/form.feature
+++ b/tests/Mink/Tests/Frontend/Detail/form.feature
@@ -50,17 +50,18 @@ Feature: forms
             | nachname | Musterfrau |
         Then  I should see "Ihre Anfrage wurde versendet!"
 
-    @javascript
-    Scenario Outline: Each form has its captcha
-        Given I am on form <formId>
-        Then  I should see "<formTitle>"
-        And   I should see a captcha
-
-        Examples:
-            | formId | formTitle          |
-            | 5      | Kontaktformular    |
-            | 8      | Partnerformular    |
-            | 9      | Defektes Produkt   |
-            | 10     | Rückgabe           |
-            | 16     | Anfrage-Formular   |
-            | 22     | Support beantragen |
+#Todo: Activate
+#    @javascript @captcha
+#    Scenario Outline: Each form has its captcha
+#        Given I am on form <formId>
+#        Then  I should see "<formTitle>"
+#        And   I should see a captcha
+#
+#        Examples:
+#            | formId | formTitle          |
+#            | 5      | Kontaktformular    |
+#            | 8      | Partnerformular    |
+#            | 9      | Defektes Produkt   |
+#            | 10     | Rückgabe           |
+#            | 16     | Anfrage-Formular   |
+#            | 22     | Support beantragen |
diff --git a/tests/Mink/features/emotion.feature b/tests/Mink/Tests/Frontend/Emotion/emotion.feature
similarity index 100%
rename from tests/Mink/features/emotion.feature
rename to tests/Mink/Tests/Frontend/Emotion/emotion.feature
diff --git a/tests/Mink/features/bootstrap/SecurityContext.php b/tests/Mink/Tests/Frontend/Homepage/bootstrap/SecurityContext.php
similarity index 70%
rename from tests/Mink/features/bootstrap/SecurityContext.php
rename to tests/Mink/Tests/Frontend/Homepage/bootstrap/SecurityContext.php
index 16c2a04da66..9c19ad13487 100644
--- a/tests/Mink/features/bootstrap/SecurityContext.php
+++ b/tests/Mink/Tests/Frontend/Homepage/bootstrap/SecurityContext.php
@@ -1,32 +1,36 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink;
+namespace Shopware\Tests\Mink\Tests\Frontend\Homepage\bootstrap;
+
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\SubContext;
 
 class SecurityContext extends SubContext
 {
-    public static $configPath = __DIR__ . '/../../../../config.php';
+    public static $configPath = __DIR__ . '/../../../../../../config.php';
 
     public static $testConfig = [];
 
@@ -78,6 +82,6 @@ public function theHttpResponseCodeShouldBe($expectedCode)
             return;
         }
 
-        Helper::throwException(sprintf('Expected http response code %d, got %d instead.', $expectedCode, $code));
+        Helper::throwException(\sprintf('Expected http response code %d, got %d instead.', $expectedCode, $code));
     }
 }
diff --git a/tests/Mink/features/bootstrap/ShopwareContext.php b/tests/Mink/Tests/Frontend/Homepage/bootstrap/ShopwareContext.php
similarity index 52%
rename from tests/Mink/features/bootstrap/ShopwareContext.php
rename to tests/Mink/Tests/Frontend/Homepage/bootstrap/ShopwareContext.php
index 247fa7ac056..19203b1745f 100644
--- a/tests/Mink/features/bootstrap/ShopwareContext.php
+++ b/tests/Mink/Tests/Frontend/Homepage/bootstrap/ShopwareContext.php
@@ -1,94 +1,108 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink;
+namespace Shopware\Tests\Mink\Tests\Frontend\Homepage\bootstrap;
 
+use Behat\Behat\Context\Environment\InitializedContextEnvironment;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\Gherkin\Node\TableNode;
-use RuntimeException;
-use Shopware\Tests\Mink\Element\CompareColumn;
-use Shopware\Tests\Mink\Page\Homepage;
+use Behat\Mink\Element\NodeElement;
+use Doctrine\DBAL\Connection;
+use Shopware\Tests\Mink\Page\Frontend\Article\Elements\Article;
+use Shopware\Tests\Mink\Page\Frontend\Article\Elements\ArticleSlider;
+use Shopware\Tests\Mink\Page\Frontend\Blog\Elements\BlogArticle;
+use Shopware\Tests\Mink\Page\Frontend\Homepage\Elements\Banner;
+use Shopware\Tests\Mink\Page\Frontend\Homepage\Elements\CategoryTeaser;
+use Shopware\Tests\Mink\Page\Frontend\Homepage\Elements\CompareColumn;
+use Shopware\Tests\Mink\Page\Frontend\Homepage\Elements\ManufacturerSlider;
+use Shopware\Tests\Mink\Page\Frontend\Homepage\Elements\YouTube;
+use Shopware\Tests\Mink\Page\Frontend\Homepage\Homepage;
+use Shopware\Tests\Mink\Page\Frontend\Newsletter\Newsletter;
+use Shopware\Tests\Mink\Page\Helper\Elements\BannerSlider;
+use Shopware\Tests\Mink\Page\Helper\Elements\HeaderCart;
+use Shopware\Tests\Mink\Tests\General\Helpers\FeatureContext;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\SubContext;
 
 class ShopwareContext extends SubContext
 {
-    /**
-     * @var FeatureContext
-     */
-    protected $featureContext;
+    protected FeatureContext $featureContext;
 
     /**
      * @BeforeScenario
      */
-    public function gatherContexts(BeforeScenarioScope $scope)
+    public function gatherContexts(BeforeScenarioScope $scope): void
     {
         $environment = $scope->getEnvironment();
+        if (!$environment instanceof InitializedContextEnvironment) {
+            Helper::throwException('Scope has unexpected environment');
+        }
 
-        $this->featureContext = $environment->getContext('Shopware\Tests\Mink\FeatureContext');
+        $this->featureContext = $environment->getContext(FeatureContext::class);
     }
 
     /**
      * @When /^I search for "(?P<searchTerm>[^"]*)"$/
      */
-    public function iSearchFor($searchTerm)
+    public function iSearchFor(string $searchTerm): void
     {
-        $this->getPage('Homepage')->searchFor($searchTerm);
+        $this->getPage(Homepage::class)->searchFor($searchTerm);
     }
 
     /**
      * @When /^I received the search-results for "(?P<searchTerm>[^"]*)"$/
      */
-    public function iReceivedTheSearchResultsFor($searchTerm)
+    public function iReceivedTheSearchResultsFor(string $searchTerm): void
     {
-        $this->getPage('Homepage')->receiveSearchResultsFor($searchTerm);
+        $this->getPage(Homepage::class)->receiveSearchResultsFor($searchTerm);
     }
 
     /**
      * @Then /^I should see the no results message for keyword "([^"]*)"$/
      */
-    public function iShouldSeeTheNoResultsMessageForKeyword($keyword)
+    public function iShouldSeeTheNoResultsMessageForKeyword(): void
     {
-        $this->getPage('Homepage')->receiveNoResultsMessageForKeyword($keyword);
+        $this->getPage(Homepage::class)->receiveNoResultsMessageForKeyword();
     }
 
     /**
      * @When /^I change the currency to "(?P<currency>[^"]*)"$/
      */
-    public function iChangeTheCurrencyTo($currency)
+    public function iChangeTheCurrencyTo(string $currency): void
     {
-        $this->getPage('Homepage')->changeCurrency($currency);
+        $this->getPage(Homepage::class)->changeCurrency($currency);
     }
 
     /**
      * @Then /^the comparison should contain the following products:$/
      */
-    public function theComparisonShouldContainTheFollowingProducts(TableNode $items)
+    public function theComparisonShouldContainTheFollowingProducts(TableNode $items): void
     {
-        /** @var Homepage $page */
-        $page = $this->getPage('Homepage');
+        $page = $this->getPage(Homepage::class);
 
-        /** @var CompareColumn $compareColumns */
-        $compareColumns = $this->getMultipleElement($page, 'CompareColumn');
+        $compareColumns = $this->getMultipleElement($page, CompareColumn::class);
 
         $page->checkComparisonProducts($compareColumns, $items->getHash());
     }
@@ -96,18 +110,21 @@ public function theComparisonShouldContainTheFollowingProducts(TableNode $items)
     /**
      * @Then /^the cart should contain (?P<quantity>\d+) articles with a value of "(?P<amount>[^"]*)"$/
      */
-    public function theCartShouldContainArticlesWithAValueOf($quantity, $amount)
+    public function theCartShouldContainArticlesWithAValueOf(int $quantity, string $amount): void
     {
-        $this->getElement('HeaderCart')->checkCart($quantity, $amount);
+        $this->getElement(HeaderCart::class)->checkCart($quantity, $amount);
     }
 
     /**
      * @When /^I subscribe to the newsletter with "(?P<email>[^"]*)"$/
      * @When /^I subscribe to the newsletter with "(?P<email>[^"]*)" :$/
      */
-    public function iSubscribeToTheNewsletterWith($email, TableNode $additionalData = null)
+    public function iSubscribeToTheNewsletterWith(string $email, ?TableNode $additionalData = null): void
     {
         $pageInfo = Helper::getPageInfo($this->getSession(), ['controller']);
+        if (!\is_array($pageInfo)) {
+            Helper::throwException('Could not get page info');
+        }
         $pageName = ucfirst($pageInfo['controller']);
         $data = [
             [
@@ -117,12 +134,16 @@ public function iSubscribeToTheNewsletterWith($email, TableNode $additionalData
         ];
 
         if ($pageName === 'Index') {
-            $pageName = 'Homepage';
-        } elseif (($pageName === 'Newsletter') && $additionalData) {
-            $data = array_merge($data, $additionalData->getHash());
+            $pageName = Homepage::class;
+        } elseif ($pageName === 'Newsletter') {
+            $pageName = Newsletter::class;
+            if ($additionalData) {
+                $data = array_merge($data, $additionalData->getHash());
+            }
+        } else {
+            Helper::throwException('Wrong page for subscribing to newsletter');
         }
 
-        /** @var Homepage|\Shopware\Tests\Mink\Page\Newsletter $page */
         $page = $this->getPage($pageName);
         $page->subscribeNewsletter($data);
     }
@@ -131,7 +152,7 @@ public function iSubscribeToTheNewsletterWith($email, TableNode $additionalData
      * @When /^I unsubscribe the newsletter$/
      * @When /^I unsubscribe the newsletter with "(?P<email>[^"]*)"$/
      */
-    public function iUnsubscribeTheNewsletter($email = null)
+    public function iUnsubscribeTheNewsletter(?string $email = null): void
     {
         $data = [];
 
@@ -144,17 +165,17 @@ public function iUnsubscribeTheNewsletter($email = null)
             ];
         }
 
-        $this->getPage('Newsletter')->unsubscribeNewsletter($data);
+        $this->getPage(Newsletter::class)->unsubscribeNewsletter($data);
     }
 
     /**
      * @When /^I click the link in my latest email$/
      * @When /^I click the links in my latest (\d+) emails$/
      */
-    public function iConfirmTheLinkInTheEmail($limit = 1)
+    public function iConfirmTheLinkInTheEmail(int $limit = 1): void
     {
         $sql = 'SELECT `type`, `hash` FROM `s_core_optin` ORDER BY `id` DESC LIMIT ' . $limit;
-        $hashes = $this->getService('db')->fetchAll($sql);
+        $hashes = $this->getService(Connection::class)->fetchAllAssociative($sql);
 
         $session = $this->getSession();
         $link = $session->getCurrentUrl();
@@ -162,9 +183,9 @@ public function iConfirmTheLinkInTheEmail($limit = 1)
         foreach ($hashes as $optin) {
             if ($optin['type'] === 'swPassword') {
                 $mask = '%saccount/resetPassword/hash/%s';
-                $link = $this->getPage('Homepage')->getShopUrl();
+                $link = $this->getPage(Homepage::class)->getShopUrl();
 
-                $confirmationLink = sprintf($mask, $link, $optin['hash']);
+                $confirmationLink = \sprintf($mask, $link, $optin['hash']);
                 $session->visit($confirmationLink);
 
                 return;
@@ -178,19 +199,19 @@ public function iConfirmTheLinkInTheEmail($limit = 1)
             $link = substr($link, 0, $anchor);
         }
 
-        //Blogartikel-Bewertung
+        // Blogartikel-Bewertung
         if (empty($query)) {
             $mask = '%s/sConfirmation/%s';
         } else {
             parse_str($query, $args);
 
             switch ($args['action']) {
-                //Artikel-Benachrichtigungen
+                // Artikel-Benachrichtigungen
                 case 'notify':
                     $mask = '%s&sNotificationConfirmation=%s&sNotify=1&action=notifyConfirm';
                     break;
 
-                //Artikel-Bewertungen
+                    // Artikel-Bewertungen
                 default:
                     $mask = '%s&sConfirmation=%s';
                     break;
@@ -198,7 +219,7 @@ public function iConfirmTheLinkInTheEmail($limit = 1)
         }
 
         foreach ($hashes as $optin) {
-            $confirmationLink = sprintf($mask, $link, $optin['hash']);
+            $confirmationLink = \sprintf($mask, $link, $optin['hash']);
             $session->visit($confirmationLink);
         }
     }
@@ -206,7 +227,7 @@ public function iConfirmTheLinkInTheEmail($limit = 1)
     /**
      * @When /^I enable the config "([^"]*)"$/
      */
-    public function iEnableTheConfig($configName)
+    public function iEnableTheConfig(string $configName): void
     {
         $this->theConfigValueOfIs($configName, true);
     }
@@ -214,7 +235,7 @@ public function iEnableTheConfig($configName)
     /**
      * @When /^I disable the config "([^"]*)"$/
      */
-    public function iDisableTheConfig($configName)
+    public function iDisableTheConfig(string $configName): void
     {
         $this->theConfigValueOfIs($configName, false);
     }
@@ -222,8 +243,10 @@ public function iDisableTheConfig($configName)
     /**
      * @When /^the config value of "([^"]*)" is (\d+)$/
      * @When /^the config value of "([^"]*)" is "([^"]*)"$/
+     *
+     * @param bool|int|string $value
      */
-    public function theConfigValueOfIs($configName, $value)
+    public function theConfigValueOfIs(string $configName, $value): void
     {
         $this->featureContext->changeConfigValue($configName, $value);
     }
@@ -231,7 +254,7 @@ public function theConfigValueOfIs($configName, $value)
     /**
      * @When the emotion world has loaded
      */
-    public function theEmotionWorldHasLoaded()
+    public function theEmotionWorldHasLoaded(): void
     {
         $this->getSession()->wait(15000, "$($(':plugin-swEmotionLoader').get(0)).data('plugin_swEmotionLoader').isLoading == false");
     }
@@ -240,7 +263,7 @@ public function theEmotionWorldHasLoaded()
      * @Given /^I should see a banner with image "(?P<image>[^"]*)"$/
      * @Given /^I should see a banner with image "(?P<image>[^"]*)" to "(?P<link>[^"]*)"$/
      */
-    public function iShouldSeeABanner($image, $link = null)
+    public function iShouldSeeABanner(string $image, ?string $link = null): void
     {
         $this->iShouldSeeABannerOnPositionWithImage(1, $image, $link);
     }
@@ -249,20 +272,18 @@ public function iShouldSeeABanner($image, $link = null)
      * @Given /^I should see a banner on position (\d+) with image "([^"]*)"$/
      * @Given /^I should see a banner on position (\d+) with image "([^"]*)" to "([^"]*)"$/
      */
-    public function iShouldSeeABannerOnPositionWithImage($position, $image, $link = null)
+    public function iShouldSeeABannerOnPositionWithImage(int $position, string $image, ?string $link = null): void
     {
-        /** @var Homepage $page */
-        $page = $this->getPage('Homepage');
+        $page = $this->getPage(Homepage::class);
 
-        /** @var \Shopware\Tests\Mink\Element\Banner $banner */
-        $banner = $this->getMultipleElement($page, 'Banner', $position);
+        $banner = $this->getMultipleElement($page, Banner::class, $position);
         $page->checkLinkedBanner($banner, $image, $link);
     }
 
     /**
      * @Given /^I should see a banner with image "(?P<image>[^"]*)" and mapping:$/
      */
-    public function iShouldSeeABannerWithMapping($image, TableNode $mapping)
+    public function iShouldSeeABannerWithMapping(string $image, TableNode $mapping): void
     {
         $this->iShouldSeeABannerOnPositionWithImageAndMapping(1, $image, $mapping);
     }
@@ -270,13 +291,11 @@ public function iShouldSeeABannerWithMapping($image, TableNode $mapping)
     /**
      * @Given /^I should see a banner on position (\d+) with image "([^"]*)" and mapping:$/
      */
-    public function iShouldSeeABannerOnPositionWithImageAndMapping($position, $image, TableNode $mapping)
+    public function iShouldSeeABannerOnPositionWithImageAndMapping(int $position, string $image, TableNode $mapping): void
     {
-        /** @var Homepage $page */
-        $page = $this->getPage('Homepage');
+        $page = $this->getPage(Homepage::class);
 
-        /** @var \Shopware\Tests\Mink\Element\Banner $banner */
-        $banner = $this->getMultipleElement($page, 'Banner', $position);
+        $banner = $this->getMultipleElement($page, Banner::class, $position);
         $mapping = $mapping->getHash();
 
         $page->checkMappedBanner($banner, $image, $mapping);
@@ -285,13 +304,11 @@ public function iShouldSeeABannerOnPositionWithImageAndMapping($position, $image
     /**
      * @Given /^the product box on position (\d+) should have the following properties:$/
      */
-    public function iShouldSeeAnArticle($position, TableNode $data)
+    public function iShouldSeeAnArticle(int $position, TableNode $data): void
     {
-        /** @var Homepage $page */
-        $page = $this->getPage('Homepage');
+        $page = $this->getPage(Homepage::class);
 
-        /** @var \Shopware\Tests\Mink\Element\Article $article */
-        $article = $this->getMultipleElement($page, 'Article', $position);
+        $article = $this->getMultipleElement($page, Article::class, $position);
 
         $page->checkArticle($article, $data->getHash());
     }
@@ -299,13 +316,11 @@ public function iShouldSeeAnArticle($position, TableNode $data)
     /**
      * @Given /^the category teaser on position (\d+) for "(?P<name>[^"]*)" should have the image "(?P<image>[^"]*)" and link to "(?P<link>[^"]*)"$/
      */
-    public function iShouldSeeACategoryTeaserWithImageTo($position, $name, $image, $link)
+    public function iShouldSeeACategoryTeaserWithImageTo(int $position, string $name, string $image, string $link): void
     {
-        /** @var Homepage $page */
-        $page = $this->getPage('Homepage');
+        $page = $this->getPage(Homepage::class);
 
-        /** @var \Shopware\Tests\Mink\Element\CategoryTeaser $teaser */
-        $teaser = $this->getMultipleElement($page, 'CategoryTeaser', $position);
+        $teaser = $this->getMultipleElement($page, CategoryTeaser::class, $position);
 
         $page->checkCategoryTeaser($teaser, $name, $image, $link);
     }
@@ -313,12 +328,11 @@ public function iShouldSeeACategoryTeaserWithImageTo($position, $name, $image, $
     /**
      * @Given /^I should see some blog articles:$/
      */
-    public function iShouldSeeSomeBlogArticles(TableNode $articles)
+    public function iShouldSeeSomeBlogArticles(TableNode $articles): void
     {
-        /** @var Homepage $page */
-        $page = $this->getPage('Homepage');
+        $page = $this->getPage(Homepage::class);
 
-        $blogArticle = $this->getMultipleElement($page, 'BlogArticle', 1);
+        $blogArticle = $this->getMultipleElement($page, BlogArticle::class, 1);
 
         $articles = $articles->getHash();
 
@@ -328,13 +342,11 @@ public function iShouldSeeSomeBlogArticles(TableNode $articles)
     /**
      * @Then /^I should see a banner slider:$/
      */
-    public function iShouldSeeABannerSlider(TableNode $slides)
+    public function iShouldSeeABannerSlider(TableNode $slides): void
     {
-        /** @var Homepage $page */
-        $page = $this->getPage('Homepage');
+        $page = $this->getPage(Homepage::class);
 
-        /** @var \Shopware\Tests\Mink\Element\BannerSlider $slider */
-        $slider = $this->getMultipleElement($page, 'BannerSlider', 1);
+        $slider = $this->getMultipleElement($page, BannerSlider::class, 1);
 
         $page->checkSlider($slider, $slides->getHash());
     }
@@ -342,12 +354,11 @@ public function iShouldSeeABannerSlider(TableNode $slides)
     /**
      * @Given /^I should see a YouTube-Video "(?P<code>[^"]*)"$/
      */
-    public function iShouldSeeAYoutubeVideo($code)
+    public function iShouldSeeAYoutubeVideo(string $code): void
     {
-        /** @var Homepage $page */
-        $page = $this->getPage('Homepage');
+        $page = $this->getPage(Homepage::class);
 
-        $youtube = $this->getMultipleElement($page, 'YouTube', 1);
+        $youtube = $this->getMultipleElement($page, YouTube::class, 1);
 
         $page->checkYoutubeVideo($youtube, $code);
     }
@@ -355,13 +366,11 @@ public function iShouldSeeAYoutubeVideo($code)
     /**
      * @Then /^I should see a manufacturer slider:$/
      */
-    public function iShouldSeeAManufacturerSlider(TableNode $manufacturers)
+    public function iShouldSeeAManufacturerSlider(TableNode $manufacturers): void
     {
-        /** @var Homepage $page */
-        $page = $this->getPage('Homepage');
+        $page = $this->getPage(Homepage::class);
 
-        /** @var \Shopware\Tests\Mink\Element\ManufacturerSlider $slider */
-        $slider = $this->getMultipleElement($page, 'ManufacturerSlider', 1);
+        $slider = $this->getMultipleElement($page, ManufacturerSlider::class, 1);
 
         $page->checkManufacturerSlider($slider, $manufacturers->getHash());
     }
@@ -369,15 +378,13 @@ public function iShouldSeeAManufacturerSlider(TableNode $manufacturers)
     /**
      * @Then /^I should see an article slider:$/
      */
-    public function iShouldSeeAnArticleSlider(TableNode $articles)
+    public function iShouldSeeAnArticleSlider(TableNode $productTable): void
     {
-        /** @var Homepage $page */
-        $page = $this->getPage('Homepage');
+        $page = $this->getPage(Homepage::class);
 
-        /** @var \Shopware\Tests\Mink\Element\ManufacturerSlider $slider */
-        $slider = $this->getMultipleElement($page, 'ArticleSlider', 1);
+        $slider = $this->getMultipleElement($page, ArticleSlider::class, 1);
 
-        $products = Helper::floatArray($articles->getHash(), ['price']);
+        $products = Helper::floatArray($productTable->getHash(), ['price']);
 
         $page->checkSlider($slider, $products);
     }
@@ -385,7 +392,7 @@ public function iShouldSeeAnArticleSlider(TableNode $articles)
     /**
      * @Then /^I the language should be "([^"]*)"$/
      */
-    public function iTheLanguageShouldBe($language)
+    public function iTheLanguageShouldBe(string $language): void
     {
         Helper::setCurrentLanguage($language);
     }
@@ -393,7 +400,7 @@ public function iTheLanguageShouldBe($language)
     /**
      * @When I scroll to the bottom of the page
      */
-    public function iScrollToTheBottomOfThePage()
+    public function iScrollToTheBottomOfThePage(): void
     {
         $this->getDriver()->executeScript('window.scrollTo(0, document.body.scrollHeight);');
     }
@@ -401,21 +408,24 @@ public function iScrollToTheBottomOfThePage()
     /**
      * @When /^I click "([^"]*)"$/
      */
-    public function iClick($selector)
+    public function iClick(string $selector): void
     {
         $element = $this->getSession()->getPage()->findField($selector);
+        if (!$element instanceof NodeElement) {
+            Helper::throwException(\sprintf('Could not find element with selector "%s"', $selector));
+        }
         $element->click();
     }
 
     /**
      * @When /^I follow "(?P<link>(?:[^"]|\\")*)" on Account menu$/
      */
-    public function clickLinkInAccount($link)
+    public function clickLinkInAccount(string $link): void
     {
-        $element = $this->getSession()->getPage()->findAll('xpath', sprintf('//*[contains(concat(" ",normalize-space(@class)," ")," account--menu ")]//li//a[contains(text(),\'%s\')]', $link));
+        $element = $this->getSession()->getPage()->findAll('xpath', \sprintf('//*[contains(concat(" ",normalize-space(@class)," ")," account--menu ")]//li//a[contains(text(),\'%s\')]', $link));
 
         if (!isset($element[1])) {
-            throw new RuntimeException(sprintf('Cannot find element with name "%s"', $link));
+            Helper::throwException(\sprintf('Cannot find element with name "%s"', $link));
         }
 
         $element[1]->click();
@@ -424,7 +434,7 @@ public function clickLinkInAccount($link)
     /**
      * @When /^Wait until ajax requests are done$/
      */
-    public function waitForAjaxRequestsDone()
+    public function waitForAjaxRequestsDone(): void
     {
         $session = $this->getSession();
         $this->getSession()->getPage()->waitFor(2000, static function () use ($session) {
diff --git a/tests/Mink/features/search.feature b/tests/Mink/Tests/Frontend/Homepage/search.feature
similarity index 81%
rename from tests/Mink/features/search.feature
rename to tests/Mink/Tests/Frontend/Homepage/search.feature
index 4ec64a32635..adaa491f6c6 100644
--- a/tests/Mink/features/search.feature
+++ b/tests/Mink/Tests/Frontend/Homepage/search.feature
@@ -20,15 +20,15 @@ Feature: Search things
     Scenario: Search with many hits
         When I search for "str"
         Then I should see "Zu \"str\" wurden 13 Artikel gefunden!"
-        But  I should see 12 elements of type "ArticleBox"
+        But  I should see 12 elements of type "\Shopware\Tests\Mink\Page\Frontend\Article\Elements\ArticleBox"
 
     @javascript @noinfinitescrolling
     Scenario: Search with special uri characters
         When I search for "101% alle"
         Then I should see "Zu \"101% alle\" wurden 74 Artikel gefunden!"
-        But  I should see 12 elements of type "ArticleBox"
+        But  I should see 12 elements of type "\Shopware\Tests\Mink\Page\Frontend\Article\Elements\ArticleBox"
         When I browse to next page 6 times
-        Then I should see 2 elements of type "ArticleBox"
+        Then I should see 2 elements of type "\Shopware\Tests\Mink\Page\Frontend\Article\Elements\ArticleBox"
         But  I should see "Zu \"101% alle\" wurden 74 Artikel gefunden!"
 
     Scenario: Search with no hits
@@ -54,9 +54,9 @@ Feature: Search things
     Scenario: Infinite Scrolling is active in search results
         When I search for "art"
         Then I should see "Zu \"art\" wurden 17 Artikel gefunden!"
-        And  I should see 12 elements of type "ArticleBox"
+        And  I should see 12 elements of type "\Shopware\Tests\Mink\Page\Frontend\Article\Elements\ArticleBox"
         When I scroll to the bottom of the page
-        Then I should see 17 elements of type "ArticleBox" eventually
+        Then I should see 17 elements of type "\Shopware\Tests\Mink\Page\Frontend\Article\Elements\ArticleBox" eventually
 
     @javascript
     Scenario Outline: Live-Search with hits
diff --git a/tests/Mink/features/security.feature b/tests/Mink/Tests/Frontend/Homepage/security.feature
similarity index 100%
rename from tests/Mink/features/security.feature
rename to tests/Mink/Tests/Frontend/Homepage/security.feature
diff --git a/tests/Mink/Tests/Frontend/Listing/bootstrap/ListingContext.php b/tests/Mink/Tests/Frontend/Listing/bootstrap/ListingContext.php
new file mode 100644
index 00000000000..66e47173d06
--- /dev/null
+++ b/tests/Mink/Tests/Frontend/Listing/bootstrap/ListingContext.php
@@ -0,0 +1,166 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Mink\Tests\Frontend\Listing\bootstrap;
+
+use Behat\Gherkin\Node\TableNode;
+use Shopware\Tests\Mink\Page\Frontend\Article\Elements\ArticleBox;
+use Shopware\Tests\Mink\Page\Frontend\Listing\Elements\Paging;
+use Shopware\Tests\Mink\Page\Frontend\Listing\Listing;
+use Shopware\Tests\Mink\Page\Helper\Elements\FilterGroup;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\SubContext;
+
+class ListingContext extends SubContext
+{
+    /**
+     * @Given /^I am on the listing page:$/
+     * @Given /^I go to the listing page:$/
+     */
+    public function iAmOnTheListingPage(TableNode $params): void
+    {
+        $params = $params->getHash();
+
+        $this->getPage(Listing::class)->openListing($params);
+    }
+
+    /**
+     * @Given /^I am on the listing page for category (?P<categoryId>\d+)$/
+     * @Given /^I am on the listing page for category (?P<categoryId>\d+) on page (?P<page>\d+)$/
+     */
+    public function iAmOnTheListingPageForCategoryOnPage(int $categoryId, ?int $page = null): void
+    {
+        $params = [
+            [
+                'parameter' => 'sCategory',
+                'value' => $categoryId,
+            ],
+        ];
+
+        if ($page) {
+            $params[] = [
+                'parameter' => 'sPage',
+                'value' => $page,
+            ];
+        }
+
+        $this->getPage(Listing::class)->openListing($params, false);
+    }
+
+    /**
+     * @When /^I set the filter to:$/
+     * @When /^I reset all filters$/
+     */
+    public function iSetTheFilterTo(?TableNode $filter = null): void
+    {
+        $properties = [];
+
+        if ($filter) {
+            $properties = $filter->getHash();
+        }
+
+        $page = $this->getPage(Listing::class);
+
+        $filterGroups = $this->getMultipleElement($page, FilterGroup::class);
+        $page->filter($filterGroups, $properties);
+    }
+
+    /**
+     * @Then /^the articles should be shown in a table-view$/
+     */
+    public function theArticlesShouldBeShownInATableView(): void
+    {
+        $this->getPage(Listing::class)->checkView('viewTable');
+    }
+
+    /**
+     * @Then /^the articles should be shown in a list-view$/
+     */
+    public function theArticlesShouldBeShownInAListView(): void
+    {
+        $this->getPage(Listing::class)->checkView('viewList');
+    }
+
+    /**
+     * @Then /^the article on position (?P<num>\d+) should have this properties:$/
+     */
+    public function theArticleOnPositionShouldHaveThisProperties(int $position, TableNode $properties): void
+    {
+        $page = $this->getPage(Listing::class);
+
+        $articleBox = $this->getMultipleElement($page, ArticleBox::class, $position);
+        $properties = Helper::convertTableHashToArray($properties->getHash());
+        $page->checkArticleBox($articleBox, $properties);
+    }
+
+    /**
+     * @When /^I browse to (previous|next) page$/
+     * @When /^I browse to (previous|next) page (\d+) times$/
+     */
+    public function iBrowseTimesToPage(string $direction, int $steps = 1): void
+    {
+        $this->getElement(Paging::class)->moveDirection($direction, $steps);
+    }
+
+    /**
+     * @Then /^I should not be able to browse to (previous|next) page$/
+     */
+    public function iShouldNotBeAbleToBrowseToPage(string $direction): void
+    {
+        $this->getElement(Paging::class)->noElement($direction);
+    }
+
+    /**
+     * @When /^I browse to page (\d+)$/
+     */
+    public function iBrowseToPage(int $page): void
+    {
+        $this->getElement(Paging::class)->moveToPage($page);
+    }
+
+    /**
+     * @Given /^I should not be able to browse to page (\d+)$/
+     */
+    public function iShouldNotBeAbleToBrowseToPage2(string $page): void
+    {
+        $this->getElement(Paging::class)->noElement($page);
+    }
+
+    /**
+     * @Then /^I should see the article "([^"]*)" in listing$/
+     */
+    public function iShouldSeeTheArticleInListing(string $name): void
+    {
+        $this->getPage(Listing::class)->checkListing($name);
+    }
+
+    /**
+     * @Given /^I should not see the article "([^"]*)" in listing$/
+     */
+    public function iShouldNotSeeTheArticleInListing(string $name): void
+    {
+        $this->getPage(Listing::class)->checkListing($name, true);
+    }
+}
diff --git a/tests/Mink/features/bootstrap/SeoContext.php b/tests/Mink/Tests/Frontend/Listing/bootstrap/SeoContext.php
similarity index 55%
rename from tests/Mink/features/bootstrap/SeoContext.php
rename to tests/Mink/Tests/Frontend/Listing/bootstrap/SeoContext.php
index e76e887871f..5d66ad377e1 100644
--- a/tests/Mink/features/bootstrap/SeoContext.php
+++ b/tests/Mink/Tests/Frontend/Listing/bootstrap/SeoContext.php
@@ -1,40 +1,41 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink;
+namespace Shopware\Tests\Mink\Tests\Frontend\Listing\bootstrap;
 
-use Shopware\Tests\Mink\Page\GenericPage;
+use Shopware\Tests\Mink\Page\Frontend\Generic\GenericPage;
+use Shopware\Tests\Mink\Tests\General\Helpers\SubContext;
 
 class SeoContext extends SubContext
 {
     /**
      * @Then /^I should not see pagination metas$/
      */
-    public function iShouldNotSeePaginationMetas()
+    public function iShouldNotSeePaginationMetas(): void
     {
-        /** @var GenericPage $page */
-        $page = $this->getPage('GenericPage');
+        $page = $this->getPage(GenericPage::class);
         $page->checkLink('prev');
         $page->checkLink('next');
     }
@@ -45,42 +46,42 @@ public function iShouldNotSeePaginationMetas()
      * @Then /^I should see (prev|next) page meta with link "(?P<path>[^"]*)"$/
      * @Then /^I should see (prev|next) page meta with link "(?P<path>[^"]*)" and page (?P<page>\d+)$/
      */
-    public function iShouldSeePageMetaWithLinkAndPage($locator, $path, $page = null)
+    public function iShouldSeePageMetaWithLinkAndPage(string $locator, string $path, ?string $page = null): void
     {
         if ($page) {
             $params = [
                 'p' => $page,
             ];
         } else {
-            $params = null;
+            $params = [];
         }
 
-        $this->getPage('GenericPage')->checkLink($locator, $path, $params);
+        $this->getPage(GenericPage::class)->checkLink($locator, $path, $params);
     }
 
     /**
      * @Then /^I should see (canonical) link$/
      * @Then /^I should see (prev|next) page meta$/
      */
-    public function iShouldSeePageMeta($locator)
+    public function iShouldSeePageMeta(string $locator): void
     {
-        $this->getPage('GenericPage')->checkLink($locator);
+        $this->getPage(GenericPage::class)->checkLink($locator);
     }
 
     /**
      * @Then /^I should not see (canonical) link$/
      * @Then /^I should not see (prev|next) page meta$/
      */
-    public function iShouldNotSeePageMeta($locator)
+    public function iShouldNotSeePageMeta(string $locator): void
     {
-        $this->getPage('GenericPage')->checkLink($locator);
+        $this->getPage(GenericPage::class)->checkLink($locator);
     }
 
     /**
      * @Then /^I should see robots meta "(?P<metaOne>[^"]*)"$/
      * @Then /^I should see robots metas "(?P<metaOne>[^"]*)" and "(?P<metaTwo>[^"]*)"$/
      */
-    public function iShouldRobotsMeta($metaOne, $metaTwo = null)
+    public function iShouldRobotsMeta(string $metaOne, ?string $metaTwo = null): void
     {
         $metas = [$metaOne];
 
@@ -88,6 +89,6 @@ public function iShouldRobotsMeta($metaOne, $metaTwo = null)
             $metas[] = $metaTwo;
         }
 
-        $this->getPage('GenericPage')->checkRobots($metas);
+        $this->getPage(GenericPage::class)->checkRobots($metas);
     }
 }
diff --git a/tests/Mink/features/listing.feature b/tests/Mink/Tests/Frontend/Listing/listing.feature
similarity index 74%
rename from tests/Mink/features/listing.feature
rename to tests/Mink/Tests/Frontend/Listing/listing.feature
index c915b41460e..ef4b8e81b8a 100644
--- a/tests/Mink/features/listing.feature
+++ b/tests/Mink/Tests/Frontend/Listing/listing.feature
@@ -1,28 +1,6 @@
 @listing
 Feature: Show Listing
 
-#    @filter @javascript @knownFailing
-#    Scenario: I can filter the articles by custom filters
-#        Given I am on the listing page:
-#            | parameter | value |
-#            | sCategory | 21    |
-#
-#        When  I set the filter to:
-#            | filter        | value     |
-#            | Geschmack     | mild      |
-#            | Flaschengröße | 0,5 Liter |
-#            | Alkoholgehalt | >30%      |
-#        Then  I should see 4 elements of type "ArticleBox" eventually
-#
-#        When  I set the filter to:
-#            | filter          | value   |
-#            | Trinktemperatur | Gekühlt |
-#            | Farbe           | rot     |
-#        Then  I should see 2 elements of type "ArticleBox" eventually
-#
-#        When  I reset all filters
-#        Then  I should see 10 elements of type "ArticleBox" eventually
-
     @sort @javascript
     Scenario: I can change the sort
         Given I am on the listing page:
diff --git a/tests/Mink/features/listing_seo.feature b/tests/Mink/Tests/Frontend/Listing/listing_seo.feature
similarity index 100%
rename from tests/Mink/features/listing_seo.feature
rename to tests/Mink/Tests/Frontend/Listing/listing_seo.feature
diff --git a/tests/Mink/features/newsletter.feature b/tests/Mink/Tests/Frontend/Newsletter/newsletter.feature
similarity index 100%
rename from tests/Mink/features/newsletter.feature
rename to tests/Mink/Tests/Frontend/Newsletter/newsletter.feature
diff --git a/tests/Mink/features/bootstrap/NoteContext.php b/tests/Mink/Tests/Frontend/Note/bootstrap/NoteContext.php
similarity index 56%
rename from tests/Mink/features/bootstrap/NoteContext.php
rename to tests/Mink/Tests/Frontend/Note/bootstrap/NoteContext.php
index 0e84d72bda0..804c85adb9b 100644
--- a/tests/Mink/features/bootstrap/NoteContext.php
+++ b/tests/Mink/Tests/Frontend/Note/bootstrap/NoteContext.php
@@ -1,32 +1,35 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink;
+namespace Shopware\Tests\Mink\Tests\Frontend\Note\bootstrap;
 
 use Behat\Gherkin\Node\TableNode;
-use Shopware\Tests\Mink\Element\NotePosition;
-use Shopware\Tests\Mink\Page\Note;
+use Shopware\Tests\Mink\Page\Frontend\Note\Elements\NotePosition;
+use Shopware\Tests\Mink\Page\Frontend\Note\Note;
+use Shopware\Tests\Mink\Tests\General\Helpers\Helper;
+use Shopware\Tests\Mink\Tests\General\Helpers\SubContext;
 
 class NoteContext extends SubContext
 {
@@ -34,7 +37,7 @@ class NoteContext extends SubContext
      * @When /^I remove the article from my note$/
      * @When /^I remove the article on position (?P<num>\d+) of my note$/
      */
-    public function iRemoveTheArticleOnPositionOfMyNote($position = 1)
+    public function iRemoveTheArticleOnPositionOfMyNote(int $position = 1): void
     {
         $this->pressActionButton($position, 'remove');
     }
@@ -42,7 +45,7 @@ public function iRemoveTheArticleOnPositionOfMyNote($position = 1)
     /**
      * @When /^I put the article on position (?P<num>\d+) of my note in the basket$/
      */
-    public function iPutTheArticleOnPositionOfMyNoteInTheBasket($position)
+    public function iPutTheArticleOnPositionOfMyNoteInTheBasket(int $position): void
     {
         $this->clickActionLink($position, 'order');
     }
@@ -50,7 +53,7 @@ public function iPutTheArticleOnPositionOfMyNoteInTheBasket($position)
     /**
      * @When /^I compare the article on position (?P<num>\d+) of my note$/
      */
-    public function iCompareTheArticleOnPositionOfMyNote($position)
+    public function iCompareTheArticleOnPositionOfMyNote(int $position): void
     {
         $this->pressActionButton($position, 'compare');
     }
@@ -58,7 +61,7 @@ public function iCompareTheArticleOnPositionOfMyNote($position)
     /**
      * @When /^I visit the detail page of the article on position (?P<num>\d+) of my note$/
      */
-    public function iVisitTheDetailPageOfTheArticleOnPositionOfMyNote($position)
+    public function iVisitTheDetailPageOfTheArticleOnPositionOfMyNote(int $position): void
     {
         $this->clickActionLink($position, 'details');
     }
@@ -66,10 +69,9 @@ public function iVisitTheDetailPageOfTheArticleOnPositionOfMyNote($position)
     /**
      * @Given /^the note contains the following products:$/
      */
-    public function theNoteContainsTheFollowingProducts(TableNode $items)
+    public function theNoteContainsTheFollowingProducts(TableNode $items): void
     {
-        /** @var Note $page */
-        $page = $this->getPage('Note');
+        $page = $this->getPage(Note::class);
         $page->open();
         $page->fillNoteWithProducts($items->getHash());
         $this->theNoteShouldContainTheFollowingProducts($items);
@@ -78,33 +80,28 @@ public function theNoteContainsTheFollowingProducts(TableNode $items)
     /**
      * @Then /^the note should contain the following products:$/
      */
-    public function theNoteShouldContainTheFollowingProducts(TableNode $items)
+    public function theNoteShouldContainTheFollowingProducts(TableNode $items): void
     {
-        /** @var Note $page */
-        $page = $this->getPage('Note');
+        $page = $this->getPage(Note::class);
 
-        $notePositions = $this->getMultipleElement($page, 'NotePosition');
+        $notePositions = $this->getMultipleElement($page, NotePosition::class);
 
         $page->checkNoteProducts($notePositions, $items->getHash());
     }
 
-    private function clickActionLink($position, $name)
+    private function clickActionLink(int $position, string $name): void
     {
-        /** @var Note $page */
-        $page = $this->getPage('Note');
+        $page = $this->getPage(Note::class);
 
-        /** @var NotePosition $notePosition */
-        $notePosition = $this->getMultipleElement($page, 'NotePosition', $position);
+        $notePosition = $this->getMultipleElement($page, NotePosition::class, $position);
         Helper::clickNamedLink($notePosition, $name);
     }
 
-    private function pressActionButton($position, $name)
+    private function pressActionButton(int $position, string $name): void
     {
-        /** @var Note $page */
-        $page = $this->getPage('Note');
+        $page = $this->getPage(Note::class);
 
-        /** @var NotePosition $notePosition */
-        $notePosition = $this->getMultipleElement($page, 'NotePosition', $position);
+        $notePosition = $this->getMultipleElement($page, NotePosition::class, $position);
         Helper::pressNamedButton($notePosition, $name);
     }
 }
diff --git a/tests/Mink/features/note.feature b/tests/Mink/Tests/Frontend/Note/note.feature
similarity index 85%
rename from tests/Mink/features/note.feature
rename to tests/Mink/Tests/Frontend/Note/note.feature
index 5a33568fc72..f3e961977bc 100644
--- a/tests/Mink/features/note.feature
+++ b/tests/Mink/Tests/Frontend/Note/note.feature
@@ -9,10 +9,10 @@ Feature: Note
 
     Scenario: I can remove articles from my note
         When  I remove the article on position 2 of my note
-        Then  I should see 1 element of type "NotePosition"
+        Then  I should see 1 element of type "\Shopware\Tests\Mink\Page\Frontend\Note\Elements\NotePosition"
 
         When  I remove the article on position 1 of my note
-        Then  I should see 0 element of type "NotePosition"
+        Then  I should see 0 element of type "\Shopware\Tests\Mink\Page\Frontend\Note\Elements\NotePosition"
 
     @comparison
     Scenario: I can compare articles from my note
@@ -40,7 +40,7 @@ Feature: Note
         When  I press the button "remember" of the element "ArticleBox" on position 2
         And   Wait until ajax requests are done
         And   I am on the page "Note"
-        Then  I should see 2 element of type "NotePosition"
+        Then  I should see 2 element of type "\Shopware\Tests\Mink\Page\Frontend\Note\Elements\NotePosition"
 
         When  I follow "Ausweichversandkosten"
         And   I follow "Versandkosten"
@@ -50,4 +50,4 @@ Feature: Note
         When  I press the button "remember" of the element "ArticleBox" on position 4
         And   Wait until ajax requests are done
         And   I am on the page "Note"
-        Then  I should see 3 element of type "NotePosition"
+        Then  I should see 3 element of type "\Shopware\Tests\Mink\Page\Frontend\Note\Elements\NotePosition"
diff --git a/tests/Mink/features/bootstrap/SitemapContext.php b/tests/Mink/Tests/Frontend/Sitemap/bootstrap/SitemapContext.php
similarity index 51%
rename from tests/Mink/features/bootstrap/SitemapContext.php
rename to tests/Mink/Tests/Frontend/Sitemap/bootstrap/SitemapContext.php
index 3c699cd5529..65cf2b1bebc 100644
--- a/tests/Mink/features/bootstrap/SitemapContext.php
+++ b/tests/Mink/Tests/Frontend/Sitemap/bootstrap/SitemapContext.php
@@ -1,63 +1,68 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink;
+namespace Shopware\Tests\Mink\Tests\Frontend\Sitemap\bootstrap;
 
 use Behat\Gherkin\Node\TableNode;
+use Shopware\Tests\Mink\Page\Frontend\Sitemap\Elements\SitemapGroup;
+use Shopware\Tests\Mink\Page\Frontend\Sitemap\Sitemap;
+use Shopware\Tests\Mink\Page\Frontend\Sitemap\SitemapIndexXml;
+use Shopware\Tests\Mink\Tests\General\Helpers\SubContext;
 
 class SitemapContext extends SubContext
 {
     /**
      * @Given /^I am on the sitemap\.xml$/
      */
-    public function iAmOnTheSitemapXml()
+    public function iAmOnTheSitemapXml(): void
     {
-        $this->getPage('Sitemap')->open(['xml' => '.xml']);
+        $this->getPage(Sitemap::class)->open(['xml' => '.xml']);
     }
 
     /**
      * @Given /^I am on the sitemap_index\.xml$/
      */
-    public function iAmOnTheSitemapIndexXml()
+    public function iAmOnTheSitemapIndexXml(): void
     {
-        $this->getPage('SitemapIndexXml')->open();
+        $this->getPage(SitemapIndexXml::class)->open();
     }
 
     /**
      * @Then /^I should see the group "([^"]*)"$/
      * @Then /^I should see the group "([^"]*)":$/
      */
-    public function iShouldSeeTheGroup($name, TableNode $entries = null)
+    public function iShouldSeeTheGroup(string $name, ?TableNode $entries = null): void
     {
-        $this->iShouldSeeTheGroupWithLink($name, null, $entries);
+        $this->iShouldSeeTheGroupWithLink($name, '', $entries);
     }
 
     /**
      * @Then /^I should see the group "([^"]*)" with link "([^"]*)"$/
      * @Then /^I should see the group "([^"]*)" with link "([^"]*)":$/
      */
-    public function iShouldSeeTheGroupWithLink($name, $link, TableNode $entries = null)
+    public function iShouldSeeTheGroupWithLink(string $name, string $link, ?TableNode $entries = null): void
     {
         $links = [];
 
@@ -65,15 +70,12 @@ public function iShouldSeeTheGroupWithLink($name, $link, TableNode $entries = nu
             $links = $entries->getHash();
         }
 
-        /** @var \Shopware\Tests\Mink\Page\Sitemap $page */
-        $page = $this->getPage('Sitemap');
+        $page = $this->getPage(Sitemap::class);
 
-        /** @var \Shopware\Tests\Mink\Element\SitemapGroup $groups */
-        $groups = $this->getMultipleElement($page, 'SitemapGroup');
+        $groups = $this->getMultipleElement($page, SitemapGroup::class);
 
         $sitemapGroup = $name;
 
-        /** @var \Shopware\Tests\Mink\Element\SitemapGroup $group */
         foreach ($groups as $group) {
             if ($group->getTitle() === $name) {
                 $sitemapGroup = $group;
@@ -87,9 +89,9 @@ public function iShouldSeeTheGroupWithLink($name, $link, TableNode $entries = nu
     /**
      * @Then /^I should see the sitemap files:$/
      */
-    public function thereShouldBeTheseLinksInTheXml(TableNode $links)
+    public function thereShouldBeTheseLinksInTheXml(TableNode $links): void
     {
         $links = $links->getHash();
-        $this->getPage('SitemapIndexXml')->checkXml($links);
+        $this->getPage(SitemapIndexXml::class)->checkXml($links);
     }
 }
diff --git a/tests/Mink/features/sitemap.feature b/tests/Mink/Tests/Frontend/Sitemap/sitemap.feature
similarity index 100%
rename from tests/Mink/features/sitemap.feature
rename to tests/Mink/Tests/Frontend/Sitemap/sitemap.feature
diff --git a/tests/Mink/features/bootstrap/FeatureContext.php b/tests/Mink/Tests/General/Helpers/FeatureContext.php
similarity index 70%
rename from tests/Mink/features/bootstrap/FeatureContext.php
rename to tests/Mink/Tests/General/Helpers/FeatureContext.php
index 5ca092a6677..70df19e1988 100644
--- a/tests/Mink/features/bootstrap/FeatureContext.php
+++ b/tests/Mink/Tests/General/Helpers/FeatureContext.php
@@ -5,44 +5,43 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink;
+namespace Shopware\Tests\Mink\Tests\General\Helpers;
 
 use Behat\Behat\Context\SnippetAcceptingContext;
 use Behat\Behat\Hook\Scope\AfterStepScope;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
-use Behat\Mink\Driver\BrowserKitDriver;
 use Behat\Mink\Driver\Selenium2Driver;
 use Behat\Mink\Exception\Exception as MinkException;
 use Behat\Mink\Session;
 use Behat\Testwork\Hook\Scope\BeforeSuiteScope;
 use Behat\Testwork\Suite\Suite;
 use Behat\Testwork\Tester\Result\TestResult;
+use DateTime;
 use Doctrine\DBAL\Connection;
-use RuntimeException;
 use Shopware\Bundle\PluginInstallerBundle\Service\InstallerService;
 use Shopware\Components\CacheManager;
 use Shopware\Components\ConfigWriter;
 use Shopware\Components\Model\ModelManager;
 use Shopware\Components\Theme\Installer;
+use Shopware\Kernel;
 use Shopware_Components_Config;
 
 class FeatureContext extends SubContext implements SnippetAcceptingContext
@@ -73,12 +72,12 @@ class FeatureContext extends SubContext implements SnippetAcceptingContext
 
     /**
      * Initializes context.
-     * Every scenario gets it's own context object.
+     * Every scenario gets its own context object.
      */
     public function __construct()
     {
         if (!self::$suite->hasSetting('template')) {
-            throw new RuntimeException('Template not set. Please start testsuite using the --profile argument.');
+            Helper::throwException('Template not set. Please start testsuite using the --profile argument.');
         }
 
         $this->registerErrorHandler();
@@ -106,7 +105,7 @@ public function before(BeforeScenarioScope $scope): void
 
         $isResettable = \count(array_intersect(self::$doNotResetFeatureTags, $scope->getFeature()->getTags())) < 1;
 
-        // Scenario skips a line so it's not a new example
+        // Scenario skips a line, so it's not a new example
         if ($isResettable && $scope->getScenario()->getLine() !== self::$lastScenarioLine + 1) {
             $this->reset();
         }
@@ -172,9 +171,8 @@ public function takeScreenshotAfterFailedStep(AfterStepScope $scope): void
      */
     public function saveScreenshot(?string $filename = null, ?string $filepath = null): void
     {
-        // Under Cygwin, uniqid with more_entropy must be set to true.
-        // No effect in other environments.
-        $filename = $filename ?: sprintf('%s_%s_%s.%s', $this->getMinkParameter('browser_name'), date('c'), uniqid('', true), 'png');
+        $generatedFilename = \sprintf('%s_%s.%s', $this->getMinkParameter('browser_name'), $this->getDateTimeWithRandomString(), 'png');
+        $filename = $filename ?: $generatedFilename;
         $filepath = $filepath ?: (ini_get('upload_tmp_dir') ?: sys_get_temp_dir());
         file_put_contents($filepath . '/' . $filename, $this->getSession()->getScreenshot());
     }
@@ -184,7 +182,6 @@ public function saveScreenshot(?string $filename = null, ?string $filepath = nul
      */
     public function changeConfigValue(string $configName, $value): void
     {
-        /** @var Connection $dbal */
         $dbal = $this->getService(Connection::class);
         $configId = $dbal->fetchOne(
             'SELECT `id` FROM `s_core_config_elements` WHERE `name` = ?',
@@ -192,13 +189,12 @@ public function changeConfigValue(string $configName, $value): void
         );
 
         if (!$configId) {
-            $message = sprintf('Configuration "%s" doesn\'t exist!', $configName);
+            $message = \sprintf('Configuration "%s" doesn\'t exist!', $configName);
             Helper::throwException($message);
         }
 
         $this->dirtyConfigElements[] = $configId;
 
-        /** @var ConfigWriter $configWriter */
         $configWriter = $this->getService(ConfigWriter::class);
 
         $configWriter->save($configName, $value);
@@ -222,8 +218,8 @@ public function clearConfigValues(): void
         $dirtyElements = implode(',', $this->dirtyConfigElements);
         $this->dirtyConfigElements = [];
 
-        $sql = sprintf('DELETE FROM `s_core_config_values` WHERE `element_id` IN (%s)', $dirtyElements);
-        $this->getService('db')->exec($sql);
+        $sql = 'DELETE FROM `s_core_config_values` WHERE `element_id` IN (:dirtyElements)';
+        $this->getService(Connection::class)->executeStatement($sql, ['dirtyElements' => $dirtyElements]);
 
         $this->clearCache();
     }
@@ -233,7 +229,6 @@ public function clearConfigValues(): void
      */
     public function clearCache(): void
     {
-        /** @var CacheManager $cacheManager */
         $cacheManager = $this->getService(CacheManager::class);
         $cacheManager->clearConfigCache();
         $cacheManager->clearTemplateCache();
@@ -244,30 +239,29 @@ public function clearCache(): void
     public function registerErrorHandler(): void
     {
         error_reporting(-1);
-        $errorNameMap = [
-            E_ERROR => 'E_ERROR',
-            E_WARNING => 'E_WARNING',
-            E_PARSE => 'E_PARSE',
-            E_NOTICE => 'E_NOTICE',
-            E_CORE_ERROR => 'E_CORE_ERROR',
-            E_CORE_WARNING => 'E_CORE_WARNING',
-            E_COMPILE_ERROR => 'E_COMPILE_ERROR',
-            E_COMPILE_WARNING => 'E_COMPILE_WARNING',
-            E_USER_ERROR => 'E_USER_ERROR',
-            E_USER_WARNING => 'E_USER_WARNING',
-            E_USER_NOTICE => 'E_USER_NOTICE',
-            E_STRICT => 'E_STRICT',
-            E_RECOVERABLE_ERROR => 'E_RECOVERABLE_ERROR',
-            E_DEPRECATED => 'E_DEPRECATED',
-            E_USER_DEPRECATED => 'E_USER_DEPRECATED',
-            E_ALL => 'E_ALL',
-        ];
-
-        set_error_handler(function ($errno, $errstr, $errfile, $errline) use ($errorNameMap) {
-            $filepath = $this->getService('kernel')->getRootdir() . '/build/logs/mink';
-
-            // No effect in other environments.
-            $filename = sprintf('errors_%s_%s.%s', date('c'), uniqid('', true), 'log');
+
+        set_error_handler(function ($errno, $errstr, $errfile, $errline) {
+            $errorNameMap = [
+                E_ERROR => 'E_ERROR',
+                E_WARNING => 'E_WARNING',
+                E_PARSE => 'E_PARSE',
+                E_NOTICE => 'E_NOTICE',
+                E_CORE_ERROR => 'E_CORE_ERROR',
+                E_CORE_WARNING => 'E_CORE_WARNING',
+                E_COMPILE_ERROR => 'E_COMPILE_ERROR',
+                E_COMPILE_WARNING => 'E_COMPILE_WARNING',
+                E_USER_ERROR => 'E_USER_ERROR',
+                E_USER_WARNING => 'E_USER_WARNING',
+                E_USER_NOTICE => 'E_USER_NOTICE',
+                E_STRICT => 'E_STRICT',
+                E_RECOVERABLE_ERROR => 'E_RECOVERABLE_ERROR',
+                E_DEPRECATED => 'E_DEPRECATED',
+                E_USER_DEPRECATED => 'E_USER_DEPRECATED',
+                E_ALL => 'E_ALL',
+            ];
+            $filepath = $this->getService(Kernel::class)->getRootDir() . '/build/logs/mink';
+
+            $filename = \sprintf('errors_%s.%s', $this->getDateTimeWithRandomString(), 'log');
             $filepath .= '/' . $filename;
             file_put_contents($filepath, $errorNameMap[$errno] . ': ' . $errstr, FILE_APPEND);
 
@@ -280,7 +274,6 @@ public function registerErrorHandler(): void
      */
     public static function deactivateInfiniteScrolling(): void
     {
-        /** @var Connection $dbal */
         $dbal = Shopware()->Container()->get(Connection::class);
 
         $sql = "SET @elementId = (SELECT id FROM `s_core_templates_config_elements` WHERE `name` = 'infiniteScrolling');
@@ -298,7 +291,6 @@ public static function deactivateInfiniteScrolling(): void
      */
     public static function activateInfiniteScrolling(): void
     {
-        /** @var Connection $dbal */
         $dbal = Shopware()->Container()->get(Connection::class);
 
         $sql = "SET @elementId = (SELECT id FROM `s_core_templates_config_elements` WHERE `name` = 'infiniteScrolling');
@@ -316,32 +308,29 @@ private function prepare(): void
         $em = $this->getService(ModelManager::class);
         $em->generateAttributeModels();
 
-        //refresh s_core_templates
+        // refresh s_core_templates
         $this->registerErrorHandler();
         $this->getService(Installer::class)->synchronize();
         restore_error_handler();
 
-        //get the template id
-        $sql = sprintf(
+        // get the template id
+        $sql = \sprintf(
             'SELECT id FROM `s_core_templates` WHERE template = "%s"',
             self::$suite->getSetting('template')
         );
 
-        $templateId = $this->getService('db')->fetchOne($sql);
+        $templateId = $this->getService(Connection::class)->fetchOne($sql);
         if (!$templateId) {
-            throw new RuntimeException(sprintf('Unable to find template by name %s', self::$suite->getSetting('template')));
+            Helper::throwException(\sprintf('Unable to find template by name %s', self::$suite->getSetting('template')));
         }
 
-        //set the template for shop "Deutsch" and activate SEPA payment method
-        $sql = <<<"EOD"
-            UPDATE `s_core_shops` SET `template_id`= $templateId WHERE `id` = 1;
-            UPDATE `s_core_paymentmeans` SET `active`= 1;
-EOD;
-        $this->getService('db')->exec($sql);
+        // set the template for shop "Deutsch" and activate SEPA payment method
+        $sql = 'UPDATE `s_core_shops` SET `template_id`= :templateId WHERE `id` = 1;
+                UPDATE `s_core_paymentmeans` SET `active`= 1;';
+        $this->getService(Connection::class)->executeStatement($sql, ['templateId' => $templateId]);
 
         Helper::setCurrentLanguage('de');
 
-        /** @var InstallerService $pluginManager */
         $pluginManager = $this->getService(InstallerService::class);
 
         // hack to prevent behat error handler kicking in.
@@ -358,8 +347,7 @@ private function reset(): void
     {
         $password = md5('shopware');
 
-        $sql = <<<"EOD"
-            UPDATE s_user SET password = "$password", encoder = "md5", paymentID = 5, failedlogins = 0, lockeduntil = NULL;
+        $sql = "UPDATE s_user SET password = :password, encoder = 'md5', paymentID = 5, failedlogins = 0, lockeduntil = NULL;
 
             SET FOREIGN_KEY_CHECKS = 0;
 
@@ -369,30 +357,26 @@ private function reset(): void
             TRUNCATE s_order_comparisons;
             DELETE FROM s_user WHERE id > 2;
 
-            SET FOREIGN_KEY_CHECKS = 1;
-EOD;
-        $this->getService('db')->exec($sql);
+            SET FOREIGN_KEY_CHECKS = 1;";
+        $this->getService(Connection::class)->executeStatement($sql, ['password' => $password]);
     }
 
     private function logRequest(): void
     {
         $session = $this->getSession();
-        $log = sprintf('Current page: %d %s', $this->getStatusCode(), $session->getCurrentUrl()) . "\n";
-        $log .= $this->getRequestDataLogMessage($session);
+        $log = \sprintf('Current page: %d %s', $this->getStatusCode(), $session->getCurrentUrl()) . "\n";
         $log .= $this->getResponseHeadersLogMessage($session);
         $log .= $this->getRequestContentLogMessage($session);
-        $this->saveLog($log, 'log');
+        $this->saveLog($log);
     }
 
-    private function saveLog(string $content, string $type): void
+    private function saveLog(string $content): void
     {
-        $logDir = $this->getService('kernel')->getRootdir() . '/build/logs/mink';
-
-        $currentDateAsString = date('YmdHis');
+        $logDir = $this->getService(Kernel::class)->getRootDir() . '/build/logs/mink';
 
-        $path = sprintf('%s/behat-%s.%s', $logDir, $currentDateAsString, $type);
+        $path = \sprintf('%s/behat-%s.%s', $logDir, $this->getDateTime(), 'log');
         if (!file_put_contents($path, $content)) {
-            throw new RuntimeException(sprintf('Failed while trying to write log in "%s".', $path));
+            Helper::throwException(\sprintf('Failed while trying to write log in "%s".', $path));
         }
     }
 
@@ -405,19 +389,6 @@ private function getStatusCode(): ?int
         }
     }
 
-    private function getRequestDataLogMessage(Session $session): ?string
-    {
-        $driver = $session->getDriver();
-        if (!$driver instanceof BrowserKitDriver) {
-            return null;
-        }
-        try {
-            return "Request:\n" . print_r($driver->getClient()->getRequest(), true) . "\n";
-        } catch (MinkException $exception) {
-            return null;
-        }
-    }
-
     private function getResponseHeadersLogMessage(Session $session): ?string
     {
         try {
@@ -443,17 +414,26 @@ private function takeScreenshot(): void
             return;
         }
 
-        $filePath = $this->getService('kernel')->getRootdir() . '/build/logs/mink';
+        $filePath = $this->getService(Kernel::class)->getRootDir() . '/build/logs/mink';
 
         $this->saveScreenshot(null, $filePath);
     }
 
     private static function clearTemplateCache(): void
     {
-        /** @var CacheManager $cacheManager */
         $cacheManager = Shopware()->Container()->get(CacheManager::class);
         $cacheManager->clearConfigCache();
         $cacheManager->clearTemplateCache();
         $cacheManager->clearThemeCache();
     }
+
+    private function getDateTimeWithRandomString(): string
+    {
+        return $this->getDateTime() . '_' . uniqid('', true);
+    }
+
+    private function getDateTime(): string
+    {
+        return (new DateTime())->format('Y-m-d--H-i-s');
+    }
 }
diff --git a/tests/Mink/features/bootstrap/Helper.php b/tests/Mink/Tests/General/Helpers/Helper.php
similarity index 77%
rename from tests/Mink/features/bootstrap/Helper.php
rename to tests/Mink/Tests/General/Helpers/Helper.php
index 44e8288fd11..3980b59d272 100644
--- a/tests/Mink/features/bootstrap/Helper.php
+++ b/tests/Mink/Tests/General/Helpers/Helper.php
@@ -5,50 +5,48 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink;
+namespace Shopware\Tests\Mink\Tests\General\Helpers;
 
 use Behat\Behat\Tester\Exception\PendingException;
 use Behat\Mink\Element\DocumentElement;
 use Behat\Mink\Element\NodeElement;
 use Behat\Mink\Session;
 use Exception;
+use RuntimeException;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Element;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Page;
-use Shopware\Tests\Mink\Element\MultipleElement;
+use Shopware\Tests\Mink\Page\Helper\Elements\MultipleElement;
 use WebDriver\Exception\StaleElementReference;
 
 class Helper
 {
     public const EXCEPTION_GENERIC = 1;
     public const EXCEPTION_PENDING = 2;
+    public const DEFAULT_WAIT_TIME = 60;
 
-    private static $language;
+    private static string $language;
 
-    /**
-     * @var MultipleElement
-     */
-    private static $filterElements;
+    private static MultipleElement $filterElements;
 
-    public static function setCurrentLanguage($language)
+    public static function setCurrentLanguage(string $language): void
     {
         self::$language = $language;
     }
@@ -59,16 +57,14 @@ public static function setCurrentLanguage($language)
      * If not, the key of the element will be returned (can be used for more detailed descriptions of faults)
      * Throws an exception if $check has an incorrect format
      *
-     * @param bool $strict
-     *
      * @throws Exception
      *
-     * @return bool|int|string
+     * @return true|array-key
      */
-    public static function checkArray(array $check, $strict = false)
+    public static function checkArray(array $check, bool $strict = false)
     {
         foreach ($check as $key => $comparison) {
-            if ((!\is_array($comparison)) || (\count($comparison) != 2)) {
+            if ((!\is_array($comparison)) || (\count($comparison) !== 2)) {
                 self::throwException('Each comparison have to be an array with exactly two values!');
             }
 
@@ -93,7 +89,7 @@ public static function checkArray(array $check, $strict = false)
                 return $key;
             }
 
-            if (strpos($haystack, $needle) === false) {
+            if (!str_contains($haystack, $needle)) {
                 return $key;
             }
         }
@@ -119,15 +115,13 @@ public static function floatValue($value): float
         $float = str_replace([' ', '.', ','], ['', '', '.'], $value);
         preg_match('/([0-9]+[\\.]?[0-9]*)/', $float, $matches);
 
-        return (float) ($matches[0]);
+        return (float) ($matches[0] ?? 0.0);
     }
 
     /**
      * Converts values with key in $keys to floats
-     *
-     * @return array
      */
-    public static function floatArray(array $values, array $keys = [])
+    public static function floatArray(array $values, array $keys = []): array
     {
         if (\is_array(current($values))) {
             foreach ($values as &$array) {
@@ -151,17 +145,15 @@ public static function floatArray(array $values, array $keys = [])
     }
 
     /**
-     * Helper function to count a HTML-Element on a page.
+     * Helper function to count an HTML-Element on a page.
      * If the number is equal to $count, the function will return true.
      * If the number is not equal to $count, the function will return the count of the element.
      *
-     * @param Element $parent
-     * @param string  $elementLocator
-     * @param int     $count
+     * @param Element&HelperSelectorInterface $parent
      *
      * @return bool|int
      */
-    public static function countElements($parent, $elementLocator, $count = 0)
+    public static function countElements(Element $parent, string $elementLocator, int $count = 0)
     {
         $elements = self::findAllOfElements($parent, [$elementLocator], false);
         $countElements = \count($elements[$elementLocator]);
@@ -176,12 +168,9 @@ public static function countElements($parent, $elementLocator, $count = 0)
     /**
      * Recursive Helper function to compare two arrays over all their levels
      *
-     * @param array $array1
-     * @param array $array2
-     *
      * @return array|bool
      */
-    public static function compareArrays($array1, $array2)
+    public static function compareArrays(array $array1, array $array2)
     {
         foreach ($array1 as $key => $value) {
             if (!\array_key_exists($key, $array2)) {
@@ -222,14 +211,14 @@ public static function compareArrays($array1, $array2)
     /**
      * Finds elements by their selectors
      *
-     * @param Page|Element|HelperSelectorInterface $parent
-     * @param bool                                 $throwExceptions
+     * @param (Page|Element)&HelperSelectorInterface $parent
+     * @param array<string>                          $keys
      *
      * @throws Exception|PendingException
      *
-     * @return Element[]
+     * @return array<string, NodeElement>
      */
-    public static function findElements(HelperSelectorInterface $parent, array $keys, $throwExceptions = true)
+    public static function findElements($parent, array $keys, bool $throwExceptions = true): array
     {
         $notFound = [];
         $elements = [];
@@ -241,6 +230,7 @@ public static function findElements(HelperSelectorInterface $parent, array $keys
 
             if (!$element) {
                 $notFound[$key] = $locator;
+                continue;
             }
 
             $elements[$key] = $element;
@@ -250,7 +240,7 @@ public static function findElements(HelperSelectorInterface $parent, array $keys
             $messages = ['The following elements of ' . \get_class($parent) . ' were not found:'];
 
             foreach ($notFound as $key => $locator) {
-                $messages[] = sprintf('%s ("%s")', $key, $locator);
+                $messages[] = \sprintf('%s ("%s")', $key, $locator);
             }
 
             if (\count($messages) > 1) {
@@ -264,14 +254,11 @@ public static function findElements(HelperSelectorInterface $parent, array $keys
     /**
      * Finds all elements of their selectors
      *
-     * @param Page|Element|HelperSelectorInterface $parent
-     * @param bool                                 $throwExceptions
+     * @param (Page|Element)&HelperSelectorInterface $parent
      *
      * @throws Exception|PendingException
-     *
-     * @return array
      */
-    public static function findAllOfElements(HelperSelectorInterface $parent, array $keys, $throwExceptions = true)
+    public static function findAllOfElements($parent, array $keys, bool $throwExceptions = true): array
     {
         $notFound = [];
         $elements = [];
@@ -292,7 +279,7 @@ public static function findAllOfElements(HelperSelectorInterface $parent, array
             $messages = ['The following elements of ' . \get_class($parent) . ' were not found:'];
 
             foreach ($notFound as $key => $locator) {
-                $messages[] = sprintf('%s ("%s")', $key, $locator);
+                $messages[] = \sprintf('%s ("%s")', $key, $locator);
             }
 
             if (\count($messages) > 1) {
@@ -306,15 +293,15 @@ public static function findAllOfElements(HelperSelectorInterface $parent, array
     /**
      * Returns the requested element css selectors
      *
-     * @param Page|Element|HelperSelectorInterface $parent
-     * @param bool                                 $throwExceptions
+     * @param (Page|Element)&HelperSelectorInterface $parent
+     * @param array<string>                          $keys
      *
      * @throws Exception
      * @throws PendingException
      *
-     * @return array
+     * @return array<string, string>
      */
-    public static function getRequiredSelectors(HelperSelectorInterface $parent, array $keys, $throwExceptions = true)
+    public static function getRequiredSelectors($parent, array $keys, bool $throwExceptions = true): array
     {
         $errors = [];
         $locators = [];
@@ -341,10 +328,10 @@ public static function getRequiredSelectors(HelperSelectorInterface $parent, arr
         $message = ['Following element selectors of ' . \get_class($parent) . ' are wrong:'];
 
         if (isset($errors['noSelector'])) {
-            $message[] = sprintf('%s (not defined)', implode(', ', $errors['noSelector']));
+            $message[] = \sprintf('%s (not defined)', implode(', ', $errors['noSelector']));
         }
         if (isset($errors['emptySelector'])) {
-            $message[] = sprintf('%s (empty)', implode(', ', $errors['emptySelector']));
+            $message[] = \sprintf('%s (empty)', implode(', ', $errors['emptySelector']));
         }
 
         self::throwException($message, self::EXCEPTION_PENDING);
@@ -353,28 +340,29 @@ public static function getRequiredSelectors(HelperSelectorInterface $parent, arr
     /**
      * Returns the css selector of the element
      *
-     * @param string $key
-     *
-     * @return string|bool
+     * @param (Page|Element)&HelperSelectorInterface $parent
      */
-    public static function getRequiredSelector(HelperSelectorInterface $parent, $key)
+    public static function getRequiredSelector(HelperSelectorInterface $parent, string $key): string
     {
         $selectors = self::getRequiredSelectors($parent, [$key], false);
 
-        return (isset($selectors[$key])) ? $selectors[$key] : false;
+        if (isset($selectors[$key])) {
+            return $selectors[$key];
+        }
+
+        self::throwException(\sprintf('Could not find "%s" selector', $key));
     }
 
     /**
      * Throws a generic or pending exception, shows the backtrace to the first context class call
      *
      * @param array|string $messages
-     * @param int          $type
      *
      * @throws Exception|PendingException
      *
      * @return never-return
      */
-    public static function throwException($messages = [], $type = self::EXCEPTION_GENERIC)
+    public static function throwException($messages = [], int $type = self::EXCEPTION_GENERIC): void
     {
         if (!\is_array($messages)) {
             $messages = [$messages];
@@ -386,7 +374,7 @@ public static function throwException($messages = [], $type = self::EXCEPTION_GE
         $debugLine = $debug[0]['line'] ?? '';
 
         $message = [<<<EOD
-Exception thrown in {$debugClass}{$debugType}{$debug[1]['function']}():{$debugLine}
+Exception thrown in $debugClass$debugType{$debug[1]['function']}():$debugLine
 
 Stacktrace:
 EOD
@@ -401,7 +389,7 @@ public static function throwException($messages = [], $type = self::EXCEPTION_GE
 
             $nextType = $next['type'] ?? '';
             $callLine = $call['line'] ?? '';
-            $message[] = "{$next['class']}{$nextType}{$next['function']}():{$callLine}";
+            $message[] = "{$next['class']}$nextType{$next['function']}():$callLine";
         }
 
         $message[] = "\r\nException:";
@@ -411,7 +399,7 @@ public static function throwException($messages = [], $type = self::EXCEPTION_GE
 
         switch ($type) {
             case self::EXCEPTION_GENERIC:
-                throw new Exception($message);
+                throw new RuntimeException($message);
             case self::EXCEPTION_PENDING:
                 throw new PendingException($message);
             default:
@@ -422,21 +410,18 @@ public static function throwException($messages = [], $type = self::EXCEPTION_GE
     /**
      * Checks if a page or element has the requested named link
      *
-     * @param Page|Element|HelperSelectorInterface $parent
-     * @param string                               $key
-     *
-     * @return bool
+     * @param (Page|Element)&HelperSelectorInterface $parent
      */
-    public static function hasNamedLink(HelperSelectorInterface $parent, $key)
+    public static function hasNamedLink(HelperSelectorInterface $parent, string $key): bool
     {
-        return (self::hasNamedLinks($parent, [$key]) === true) ?: false;
+        return self::hasNamedLinks($parent, [$key]) === true;
     }
 
     /**
      * Searches for named links given by $keys. Returns true if all exist, otherwise an array of the not found keys.
      *
-     * @param Page|Element|HelperSelectorInterface $parent
-     * @param string[]                             $keys
+     * @param (Page|Element)&HelperSelectorInterface $parent
+     * @param string[]                               $keys
      *
      * @return bool|string[]
      */
@@ -463,13 +448,12 @@ public static function hasNamedLinks(HelperSelectorInterface $parent, array $key
     /**
      * Clicks the requested named link
      *
-     * @param Page|Element|HelperSelectorInterface $parent
-     * @param string                               $key
+     * @param (Page|Element)&HelperSelectorInterface $parent
      *
      * @throws Exception
      * @throws PendingException
      */
-    public static function clickNamedLink(HelperSelectorInterface $parent, $key)
+    public static function clickNamedLink(HelperSelectorInterface $parent, string $key): void
     {
         $locatorArray = $parent->getNamedSelectors();
 
@@ -483,21 +467,18 @@ public static function clickNamedLink(HelperSelectorInterface $parent, $key)
     /**
      * Checks if a page or element has the requested named link
      *
-     * @param Page|Element|HelperSelectorInterface $parent
-     * @param string                               $key
-     *
-     * @return bool
+     * @param (Page|Element)&HelperSelectorInterface $parent
      */
-    public static function hasNamedButton(HelperSelectorInterface $parent, $key)
+    public static function hasNamedButton(HelperSelectorInterface $parent, string $key): bool
     {
-        return (self::hasNamedButtons($parent, [$key]) === true) ?: false;
+        return self::hasNamedButtons($parent, [$key]) === true;
     }
 
     /**
      * Searches for named buttons given by $keys. Returns true if all exist, otherwise an array of the not found keys.
      *
-     * @param Page|Element|HelperSelectorInterface $parent
-     * @param string[]                             $keys
+     * @param (Page|Element)&HelperSelectorInterface $parent
+     * @param string[]                               $keys
      *
      * @return bool|string[]
      */
@@ -524,10 +505,9 @@ public static function hasNamedButtons(HelperSelectorInterface $parent, array $k
     /**
      * Presses the requested named button
      *
-     * @param Page|Element|HelperSelectorInterface $parent
-     * @param string                               $key
+     * @param (Page|Element)&HelperSelectorInterface $parent
      */
-    public static function pressNamedButton(HelperSelectorInterface $parent, $key)
+    public static function pressNamedButton(HelperSelectorInterface $parent, string $key): void
     {
         $locatorArray = $parent->getNamedSelectors();
 
@@ -540,7 +520,7 @@ public static function pressNamedButton(HelperSelectorInterface $parent, $key)
                 $parent->pressButton($locatorArray[$key][self::$language]);
 
                 return true;
-            } catch (StaleElementReference $e) {
+            } catch (Exception $e) {
                 // got stale element, try again (refresh happens in the $parents pressButton method)
                 return false;
             }
@@ -551,10 +531,8 @@ public static function pressNamedButton(HelperSelectorInterface $parent, $key)
      * Helper method that returns the content block of a page
      *
      * @throws Exception
-     *
-     * @return NodeElement
      */
-    public static function getContentBlock(Page $parent)
+    public static function getContentBlock(Page $parent): NodeElement
     {
         $contentBlocks = [
             'emotion' => 'div#content > div.inner',
@@ -573,16 +551,15 @@ public static function getContentBlock(Page $parent)
     }
 
     /**
-     * Fills a the inputs of a form
+     * Fills inputs of a form
      *
-     * @param Page|Element|HelperSelectorInterface $parent
-     * @param string                               $formKey
-     * @param array                                $values
+     * @param (Page|Element)&HelperSelectorInterface $parent
+     * @param array<array<string, string|int>>       $values
      */
-    public static function fillForm(HelperSelectorInterface $parent, $formKey, $values, bool $waitForOverlays = false)
+    public static function fillForm(HelperSelectorInterface $parent, string $formKey, array $values, bool $waitForOverlays = false): void
     {
         foreach ($values as $value) {
-            $tempFieldName = $fieldName = $value['field'];
+            $tempFieldName = $fieldName = (string) $value['field'];
             unset($value['field']);
 
             foreach ($value as $key => $fieldValue) {
@@ -591,11 +568,11 @@ public static function fillForm(HelperSelectorInterface $parent, $formKey, $valu
                 }
 
                 if ($waitForOverlays) {
-                    Helper::waitForOverlay($parent->getSession()->getPage());
+                    self::waitForOverlay($parent->getSession()->getPage());
                 }
 
                 if ($key !== 'value') {
-                    $fieldName = sprintf('%s[%s]', $key, $tempFieldName);
+                    $fieldName = \sprintf('%s[%s]', $key, $tempFieldName);
                 }
 
                 if (str_contains($fieldName, '.')) {
@@ -612,14 +589,14 @@ public static function fillForm(HelperSelectorInterface $parent, $formKey, $valu
                         continue;
                     }
 
-                    $message = sprintf('The form "%s" has no field "%s"!', $formKey, $fieldName);
+                    $message = \sprintf('The form "%s" has no field "%s"!', $formKey, $fieldName);
                     self::throwException($message);
                 }
 
                 $fieldTag = $field->getTagName();
 
                 if ($fieldTag === 'textarea') {
-                    $field->setValue($fieldValue);
+                    $field->setValue((string) $fieldValue);
                     continue;
                 }
 
@@ -631,22 +608,22 @@ public static function fillForm(HelperSelectorInterface $parent, $formKey, $valu
                             return false;
                         }
 
-                        //Select
+                        // Select
                         if (empty($fieldType)) {
-                            $field->selectOption($fieldValue);
+                            $field->selectOption((string) $fieldValue);
 
                             return true;
                         }
 
-                        //Checkbox
+                        // Checkbox
                         if ($fieldType === 'checkbox') {
                             $field->check();
 
                             return true;
                         }
 
-                        //Text
-                        $field->setValue($fieldValue);
+                        // Text
+                        $field->setValue((string) $fieldValue);
 
                         return true;
                     } catch (StaleElementReference $e) {
@@ -662,10 +639,8 @@ public static function fillForm(HelperSelectorInterface $parent, $formKey, $valu
 
     /**
      * Helper function to get the current language ('de' or 'en')
-     *
-     * @return string
      */
-    public static function getCurrentLanguage()
+    public static function getCurrentLanguage(): string
     {
         return self::$language;
     }
@@ -693,7 +668,7 @@ public static function getPageInfo(Session $session, array $selectionMode)
         if (!$body instanceof NodeElement) {
             self::throwException('body not found');
         }
-        $class = $body->getAttribute('class');
+        $class = (string) $body->getAttribute('class');
 
         foreach ($prefixes as $template => $modes) {
             $activeModes = [];
@@ -737,11 +712,11 @@ public static function getPageInfo(Session $session, array $selectionMode)
     }
 
     /**
-     * @param bool $throwExceptions
+     * @param Element&HelperSelectorInterface $element
      *
-     * @return array
+     * @return array<string, mixed>
      */
-    public static function getElementData(HelperSelectorInterface $element, $throwExceptions = true)
+    public static function getElementData(HelperSelectorInterface $element, bool $throwExceptions = true): array
     {
         $locators = array_keys($element->getCssSelectors());
         $elements = self::findAllOfElements($element, $locators, $throwExceptions);
@@ -759,13 +734,7 @@ public static function getElementData(HelperSelectorInterface $element, $throwEx
         return $result;
     }
 
-    /**
-     * @param string $keyKey
-     * @param string $valueKey
-     *
-     * @return array
-     */
-    public static function convertTableHashToArray(array $hash, $keyKey = 'property', $valueKey = 'value')
+    public static function convertTableHashToArray(array $hash, string $keyKey = 'property', string $valueKey = 'value'): array
     {
         $result = [];
 
@@ -782,17 +751,15 @@ public static function convertTableHashToArray(array $hash, $keyKey = 'property'
      * Returns the unique value of an array, throws in exception if there are differences
      *
      * @throws Exception
-     *
-     * @return string
      */
-    public static function getUnique(array $array)
+    public static function getUnique(array $array): string
     {
         $unique = array_unique($array);
 
         if (\count($unique) > 1) {
             $messages = ['There are more than one unique values in the array!'];
             foreach ($unique as $key => $value) {
-                $messages[] = sprintf('"%s" (Key: "%s")', $value, $key);
+                $messages[] = \sprintf('"%s" (Key: "%s")', $value, $key);
             }
 
             self::throwException($messages);
@@ -802,11 +769,9 @@ public static function getUnique(array $array)
     }
 
     /**
-     * @param string $propertyName
-     *
      * @return string|float|array
      */
-    public static function getElementProperty(Element $element, $propertyName)
+    public static function getElementProperty(Element $element, string $propertyName)
     {
         $method = 'get' . ucfirst($propertyName) . 'Property';
 
@@ -839,7 +804,7 @@ public static function assertElementProperties(Element $element, array $properti
     }
 
     /**
-     * @return bool|array
+     * @return true|array
      */
     public static function searchElements(array $needles, MultipleElement $haystack)
     {
@@ -881,13 +846,11 @@ public static function assertElements(array $needles, MultipleElement $haystack)
 
     /**
      * Global method to check the count of an MultipleElement
-     *
-     * @param int $count
      */
-    public static function assertElementCount(MultipleElement $elements, $count = 0)
+    public static function assertElementCount(MultipleElement $elements, int $count = 0): void
     {
         if ($count !== \count($elements)) {
-            $message = sprintf(
+            $message = \sprintf(
                 'There are %d elements of type "%s" on page (should be %d)',
                 \count($elements),
                 \get_class($elements),
@@ -897,24 +860,26 @@ public static function assertElementCount(MultipleElement $elements, $count = 0)
         }
     }
 
+    public static function spin(callable $lambda, int $wait = self::DEFAULT_WAIT_TIME, ?object $callingClass = null): void
+    {
+        if (!self::spinWithNoException($lambda, $wait, $callingClass)) {
+            self::throwException(\sprintf('Spin function timed out after %s seconds', $wait));
+        }
+    }
+
     /**
      * Based on Behat's own example
      *
      * @see http://docs.behat.org/en/v2.5/cookbook/using_spin_functions.html#adding-a-timeout
-     *
-     * @param callable $lambda
-     * @param int      $wait
-     *
-     * @throws Exception
      */
-    public static function spin($lambda, $wait = 60)
+    public static function spinWithNoException(callable $lambda, int $wait = self::DEFAULT_WAIT_TIME, ?object $callingClass = null): bool
     {
         $time = time();
         $stopTime = $time + $wait;
         while (time() < $stopTime) {
             try {
-                if ($lambda()) {
-                    return;
+                if ($lambda($callingClass)) {
+                    return true;
                 }
             } catch (Exception $e) {
                 // do nothing
@@ -923,13 +888,12 @@ public static function spin($lambda, $wait = 60)
             usleep(250000);
         }
 
-        self::throwException("Spin function timed out after {$wait} seconds");
+        return false;
     }
 
-    public static function waitForOverlay(DocumentElement $page)
+    public static function waitForOverlay(DocumentElement $page): void
     {
         $page->waitFor(4000, static function () use ($page) {
-            $element = null;
             try {
                 $element = $page->find('css', '.js--overlay');
 
@@ -940,12 +904,8 @@ public static function waitForOverlay(DocumentElement $page)
         });
     }
 
-    /**
-     * @return bool
-     */
-    private static function filter(array $var)
+    private static function filter(array $var): bool
     {
-        /** @var MultipleElement $element */
         foreach (self::$filterElements as $element) {
             if (self::assertElementProperties($element, $var) === true) {
                 self::$filterElements->remove();
diff --git a/tests/Mink/features/bootstrap/HelperSelectorInterface.php b/tests/Mink/Tests/General/Helpers/HelperSelectorInterface.php
similarity index 65%
rename from tests/Mink/features/bootstrap/HelperSelectorInterface.php
rename to tests/Mink/Tests/General/Helpers/HelperSelectorInterface.php
index ab8cd81ca1b..3c5da8fc6ba 100644
--- a/tests/Mink/features/bootstrap/HelperSelectorInterface.php
+++ b/tests/Mink/Tests/General/Helpers/HelperSelectorInterface.php
@@ -1,28 +1,29 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink;
+namespace Shopware\Tests\Mink\Tests\General\Helpers;
 
 /**
  * Required to use Helper class
@@ -39,7 +40,7 @@ interface HelperSelectorInterface
      *  'text' = 'p'
      * ]
      *
-     * @return string[]
+     * @return array<string, string>
      */
     public function getCssSelectors();
 
@@ -52,7 +53,7 @@ public function getCssSelectors();
      *  'reset'  = ['de' = 'Zurücksetzen', 'en' = 'Reset']
      * ]
      *
-     * @return array[]
+     * @return array<string, array<string, string>>
      */
     public function getNamedSelectors();
 }
diff --git a/tests/Mink/features/bootstrap/SpecialContext.php b/tests/Mink/Tests/General/Helpers/SpecialContext.php
similarity index 55%
rename from tests/Mink/features/bootstrap/SpecialContext.php
rename to tests/Mink/Tests/General/Helpers/SpecialContext.php
index 3b82740058b..988f672fec5 100644
--- a/tests/Mink/features/bootstrap/SpecialContext.php
+++ b/tests/Mink/Tests/General/Helpers/SpecialContext.php
@@ -1,61 +1,65 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink;
+namespace Shopware\Tests\Mink\Tests\General\Helpers;
 
 use Behat\Gherkin\Node\PyStringNode;
 use Behat\Mink\Element\NodeElement;
 use Behat\Mink\Exception\DriverException;
 use Behat\Mink\Exception\ResponseTextException;
 use Behat\Mink\WebAssert;
-use Exception;
+use Doctrine\DBAL\Connection;
+use SensioLabs\Behat\PageObjectExtension\PageObject\Element;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Page;
-use Shopware\Tests\Mink\Element\MultipleElement;
-use Shopware\Tests\Mink\Page\Homepage;
+use Shopware\Tests\Mink\Page\Frontend\Account\Account;
+use Shopware\Tests\Mink\Page\Frontend\Detail\Detail;
+use Shopware\Tests\Mink\Page\Frontend\Form\Form;
+use Shopware\Tests\Mink\Page\Frontend\Homepage\Homepage;
+use Shopware\Tests\Mink\Page\Frontend\Listing\Listing;
+use Shopware\Tests\Mink\Page\Frontend\Newsletter\Newsletter;
+use Shopware\Tests\Mink\Page\Helper\Elements\MultipleElement;
 
 class SpecialContext extends SubContext
 {
     /**
      * @Given /^the articles from "(?P<name>[^"]*)" have tax id (?P<num>\d+)$/
      */
-    public function theArticlesFromHaveTaxId($supplier, $taxId)
+    public function theArticlesFromHaveTaxId(string $supplier, int $taxId): void
     {
-        $sql = sprintf(
-            'UPDATE s_articles SET taxID = %d WHERE supplierID =
-                (SELECT id FROM s_articles_supplier WHERE name = "%s")',
-            $taxId,
-            $supplier
-        );
-
-        $this->getService('db')->exec($sql);
+        $sql = 'UPDATE s_articles SET taxID = :taxId WHERE supplierID =
+                (SELECT id FROM s_articles_supplier WHERE name = :supplier)';
+
+        $this->getService(Connection::class)->executeStatement($sql, ['taxId' => $taxId, 'supplier' => $supplier]);
     }
 
     /**
      * @Given /^I am on the (page "[^"]*")$/
+     *
      * @When /^I go to the (page "[^"]*")$/
      */
-    public function iAmOnThePage(Page $page)
+    public function iAmOnThePage(Page $page): void
     {
         $page->open();
     }
@@ -63,15 +67,17 @@ public function iAmOnThePage(Page $page)
     /**
      * @Given /^I ignore browser validation$/
      */
-    public function IignoreFormValidations()
+    public function IignoreFormValidations(): void
     {
         $this->getSession()->executeScript('for(var f=document.forms,i=f.length;i--;)f[i].setAttribute("novalidate",i)');
     }
 
     /**
      * @Then /^I should be on the (page "[^"]*")$/
+     *
+     * @param Account|Detail|Newsletter|Listing|Form $page
      */
-    public function iShouldBeOnThePage(Page $page)
+    public function iShouldBeOnThePage(Page $page): void
     {
         $page->verifyPage();
     }
@@ -79,11 +85,12 @@ public function iShouldBeOnThePage(Page $page)
     /**
      * @Then /^I should see (?P<quantity>\d+) element of type "(?P<elementClass>[^"]*)"( eventually)?$/
      * @Then /^I should see (?P<quantity>\d+) elements of type "(?P<elementClass>[^"]*)"( eventually)?$/
+     *
+     * @param class-string<MultipleElement> $elementClass
      */
-    public function iShouldSeeElementsOfType($count, $elementClass, $mode = null)
+    public function iShouldSeeElementsOfType(int $count, string $elementClass, ?string $mode = null): void
     {
-        /** @var Homepage $page */
-        $page = $this->getPage('Homepage');
+        $page = $this->getPage(Homepage::class);
 
         if ($mode === null) {
             $elements = $this->getMultipleElement($page, $elementClass);
@@ -92,7 +99,7 @@ public function iShouldSeeElementsOfType($count, $elementClass, $mode = null)
             return;
         }
 
-        $this->spin(function (SpecialContext $context) use ($page, $count, $elementClass) {
+        Helper::spin(function (SpecialContext $context) use ($page, $count, $elementClass) {
             try {
                 $elements = $context->getMultipleElement($page, $elementClass);
                 Helper::assertElementCount($elements, $count);
@@ -103,13 +110,15 @@ public function iShouldSeeElementsOfType($count, $elementClass, $mode = null)
             }
 
             return false;
-        });
+        }, Helper::DEFAULT_WAIT_TIME, $this);
     }
 
     /**
      * @When /^I follow the link "(?P<linkName>[^"]*)" of the (page "[^"]*")$/
+     *
+     * @param Page&HelperSelectorInterface $page
      */
-    public function iFollowTheLinkOfThePage($linkName, Page $page)
+    public function iFollowTheLinkOfThePage(string $linkName, Page $page): void
     {
         Helper::clickNamedLink($page, $linkName);
     }
@@ -117,26 +126,27 @@ public function iFollowTheLinkOfThePage($linkName, Page $page)
     /**
      * @When /^I follow the link of the element "(?P<elementClass>[^"]*)"$/
      * @When /^I follow the link of the element "(?P<elementClass>[^"]*)" on position (?P<position>\d+)$/
+     *
+     * @param class-string<Element> $elementClass
      */
-    public function iFollowTheLinkOfTheElement($elementClass, $position = 1)
+    public function iFollowTheLinkOfTheElement(string $elementClass, int $position = 1): void
     {
-        $this->iFollowTheLinkOfTheElementOnPosition(null, $elementClass, $position);
+        $this->iFollowTheLinkOfTheElementOnPosition('', $elementClass, $position);
     }
 
     /**
      * @When /^I follow the link "(?P<linkName>[^"]*)" of the element "(?P<elementClass>[^"]*)"$/
      * @When /^I follow the link "(?P<linkName>[^"]*)" of the element "(?P<elementClass>[^"]*)" on position (?P<position>\d+)$/
+     *
+     * @param class-string<Element> $elementClass
      */
-    public function iFollowTheLinkOfTheElementOnPosition($linkName, $elementClass, $position = 1)
+    public function iFollowTheLinkOfTheElementOnPosition(string $linkName, string $elementClass, int $position = 1): void
     {
-        /** @var HelperSelectorInterface $element */
         $element = $this->getElement($elementClass);
 
         if ($element instanceof MultipleElement) {
-            /** @var Homepage $page */
-            $page = $this->getPage('Homepage');
+            $page = $this->getPage(Homepage::class);
 
-            /* @var MultipleElement $element */
             $element->setParent($page);
 
             $element = $element->setInstance($position);
@@ -148,13 +158,17 @@ public function iFollowTheLinkOfTheElementOnPosition($linkName, $elementClass, $
             return;
         }
 
+        if (!$element instanceof HelperSelectorInterface) {
+            Helper::throwException('Element does not implement necessary interface "HelperSelectorInterface"');
+        }
+
         $this->clickNamedLinkWhenClickable($element, $linkName);
     }
 
     /**
      * @Given /^the "(?P<field>[^"]*)" field should contain:$/
      */
-    public function theFieldShouldContain($field, PyStringNode $string)
+    public function theFieldShouldContain(string $field, PyStringNode $string): void
     {
         $assert = new WebAssert($this->getSession());
         $assert->fieldValueEquals($field, $string->getRaw());
@@ -162,17 +176,16 @@ public function theFieldShouldContain($field, PyStringNode $string)
 
     /**
      * @When /^I press the button "([^"]*)" of the element "([^"]*)" on position (\d+)$/
+     *
+     * @param class-string<Element> $elementClass
      */
-    public function iPressTheButtonOfTheElementOnPosition($linkName, $elementClass, $position = 1)
+    public function iPressTheButtonOfTheElementOnPosition(string $linkName, string $elementClass, int $position = 1): void
     {
-        /** @var HelperSelectorInterface $element */
         $element = $this->getElement($elementClass);
 
         if ($element instanceof MultipleElement) {
-            /** @var Homepage $page */
-            $page = $this->getPage('Homepage');
+            $page = $this->getPage(Homepage::class);
 
-            /* @var MultipleElement $element */
             $element->setParent($page);
 
             $element = $element->setInstance($position);
@@ -184,66 +197,21 @@ public function iPressTheButtonOfTheElementOnPosition($linkName, $elementClass,
             return;
         }
 
-        $this->clickNamedButtonWhenClickable($element, $linkName);
-    }
-
-    /**
-     * Based on Behat's own example
-     *
-     * @see http://docs.behat.org/en/v2.5/cookbook/using_spin_functions.html#adding-a-timeout
-     *
-     * @param callable $lambda
-     * @param int      $wait
-     *
-     * @throws Exception
-     *
-     * @return bool
-     */
-    protected function spin($lambda, $wait = 60)
-    {
-        if (!$this->spinWithNoException($lambda, $wait)) {
-            throw new Exception("Spin function timed out after {$wait} seconds");
+        if (!$element instanceof HelperSelectorInterface) {
+            Helper::throwException('Element does not implement necessary interface "HelperSelectorInterface"');
         }
-    }
 
-    /**
-     * Based on Behat's own example
-     *
-     * @see http://docs.behat.org/en/v2.5/cookbook/using_spin_functions.html#adding-a-timeout
-     *
-     * @param callable $lambda
-     * @param int      $wait
-     *
-     * @return bool
-     */
-    protected function spinWithNoException($lambda, $wait = 60)
-    {
-        $time = time();
-        $stopTime = $time + $wait;
-        while (time() < $stopTime) {
-            try {
-                if ($lambda($this)) {
-                    return true;
-                }
-            } catch (Exception $e) {
-                // do nothing
-            }
-
-            usleep(250000);
-        }
-
-        return false;
+        $this->clickNamedButtonWhenClickable($element, $linkName);
     }
 
     /**
-     * Tries to click on a named link until the click is successfull or the timeout is reached
+     * Tries to click on a named link until the click is successful or the timeout is reached
      *
-     * @param string $linkName
-     * @param int    $timeout  Defaults to 60 seconds
+     * @param (Page|Element)&HelperSelectorInterface $element
      */
-    protected function clickNamedLinkWhenClickable(HelperSelectorInterface $element, $linkName, $timeout = 60)
+    protected function clickNamedLinkWhenClickable($element, string $linkName, int $timeout = Helper::DEFAULT_WAIT_TIME): void
     {
-        $this->spin(function (SpecialContext $context) use ($element, $linkName) {
+        Helper::spin(function () use ($element, $linkName) {
             try {
                 Helper::clickNamedLink($element, $linkName);
 
@@ -257,14 +225,13 @@ protected function clickNamedLinkWhenClickable(HelperSelectorInterface $element,
     }
 
     /**
-     * Tries to click on a named button until the click is successfull or the timeout is reached
+     * Tries to click on a named button until the click is successful or the timeout is reached
      *
-     * @param string $key
-     * @param int    $timeout Defaults to 60 seconds
+     * @param (Page|Element)&HelperSelectorInterface $element
      */
-    protected function clickNamedButtonWhenClickable(HelperSelectorInterface $element, $key, $timeout = 60)
+    protected function clickNamedButtonWhenClickable($element, string $key, int $timeout = Helper::DEFAULT_WAIT_TIME): void
     {
-        $this->spin(function (SpecialContext $context) use ($element, $key) {
+        Helper::spin(function () use ($element, $key) {
             try {
                 Helper::pressNamedButton($element, $key);
 
@@ -278,13 +245,11 @@ protected function clickNamedButtonWhenClickable(HelperSelectorInterface $elemen
     }
 
     /**
-     * Tries to click on an element until the click is successfull or the timeout is reached
-     *
-     * @param int $timeout Defaults to 60 seconds
+     * Tries to click on an element until the click is successful or the timeout is reached
      */
-    protected function clickElementWhenClickable(NodeElement $element, $timeout = 60)
+    protected function clickElementWhenClickable(NodeElement $element, int $timeout = Helper::DEFAULT_WAIT_TIME): void
     {
-        $this->spin(function (SpecialContext $context) use ($element) {
+        Helper::spin(function () use ($element) {
             try {
                 $element->click();
 
diff --git a/tests/Mink/features/bootstrap/SubContext.php b/tests/Mink/Tests/General/Helpers/SubContext.php
similarity index 52%
rename from tests/Mink/features/bootstrap/SubContext.php
rename to tests/Mink/Tests/General/Helpers/SubContext.php
index ffb4bb27bc8..844619c470c 100644
--- a/tests/Mink/features/bootstrap/SubContext.php
+++ b/tests/Mink/Tests/General/Helpers/SubContext.php
@@ -1,28 +1,29 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Tests\Mink;
+namespace Shopware\Tests\Mink\Tests\General\Helpers;
 
 use Behat\Mink\Driver\DriverInterface;
 use Behat\Mink\Mink;
@@ -32,40 +33,28 @@
 use SensioLabs\Behat\PageObjectExtension\PageObject\Page;
 use Shopware\Behat\ShopwareExtension\Context\KernelAwareContext;
 use Shopware\Kernel;
-use Shopware\Tests\Mink\Element\MultipleElement;
+use Shopware\Tests\Mink\Page\Helper\Elements\MultipleElement;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 class SubContext extends PageObjectContext implements KernelAwareContext, MinkAwareContext
 {
-    /**
-     * @var Mink
-     */
-    private $mink;
+    private Mink $mink;
 
-    /**
-     * @var array
-     */
-    private $minkParameters;
+    private array $minkParameters;
 
-    /**
-     * @var Kernel
-     */
-    private $kernel;
+    private Kernel $kernel;
 
     /**
      * Sets Mink instance.
      *
      * @param Mink $mink Mink session manager
      */
-    public function setMink(Mink $mink)
+    public function setMink(Mink $mink): void
     {
         $this->mink = $mink;
     }
 
-    /**
-     * @return Mink
-     */
-    public function getMink()
+    public function getMink(): Mink
     {
         return $this->mink;
     }
@@ -73,73 +62,70 @@ public function getMink()
     /**
      * Sets parameters provided for Mink.
      */
-    public function setMinkParameters(array $parameters)
+    public function setMinkParameters(array $parameters): void
     {
         $this->minkParameters = $parameters;
     }
 
     /**
      * Returns specific mink parameter.
-     *
-     * @param string $name
      */
-    public function getMinkParameter($name)
+    public function getMinkParameter(string $name): ?string
     {
-        return isset($this->minkParameters[$name]) ? $this->minkParameters[$name] : null;
+        return $this->minkParameters[$name] ?? null;
     }
 
-    /**
-     * @return Session
-     */
-    public function getSession()
+    public function getSession(): Session
     {
         return $this->mink->getSession();
     }
 
-    /**
-     * @return DriverInterface
-     */
-    public function getDriver()
+    public function getDriver(): DriverInterface
     {
         return $this->getSession()->getDriver();
     }
 
-    public function setKernel(Kernel $kernel)
+    public function setKernel(Kernel $kernel): void
     {
         $this->kernel = $kernel;
     }
 
     /**
      * Returns HttpKernel service container.
-     *
-     * @return ContainerInterface
      */
-    public function getContainer()
+    public function getContainer(): ContainerInterface
     {
         return $this->kernel->getContainer();
     }
 
     /**
-     * @param string $id
+     * @template TService of object
      *
-     * @return mixed Services from the container
+     * @param class-string<TService> $id
+     *
+     * @return TService
      */
-    protected function getService($id)
+    protected function getService(string $id): object
     {
         return $this->getContainer()->get($id);
     }
 
     /**
-     * @param Page   $page        Parent page
-     * @param string $elementName Name of the element
-     * @param int    $instance    Instance of the element
+     * @template TElement of MultipleElement
+     *
+     * @param Page                   $page        Parent page
+     * @param class-string<TElement> $elementName Name of the element
+     * @param int                    $instance    Instance of the element
      *
-     * @return MultipleElement
+     * @return TElement
      */
-    protected function getMultipleElement(Page $page, $elementName, $instance = 1)
+    protected function getMultipleElement(Page $page, string $elementName, int $instance = 1): MultipleElement
     {
-        /** @var MultipleElement $element */
         $element = $this->getElement($elementName);
+        if (!$element instanceof $elementName) {
+            Helper::throwException(\sprintf('Element expected to be a %s', $elementName));
+        }
+
         $element->setParent($page);
 
         if ($instance > 1) {
diff --git a/tests/Mink/Tests/General/Helpers/TransformContext.php b/tests/Mink/Tests/General/Helpers/TransformContext.php
new file mode 100644
index 00000000000..3dffdbd7487
--- /dev/null
+++ b/tests/Mink/Tests/General/Helpers/TransformContext.php
@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Mink\Tests\General\Helpers;
+
+use SensioLabs\Behat\PageObjectExtension\PageObject\Page;
+
+class TransformContext extends SubContext
+{
+    /**
+     * @Transform /^(\d+)$/
+     */
+    public function castStringToNumber(string $string): int
+    {
+        return (int) $string;
+    }
+
+    /**
+     * @Transform /^page "(.*)"$/
+     *
+     * @param class-string<Page> $pageName
+     */
+    public function castPageNameToPage(string $pageName): Page
+    {
+        return $this->getPage($pageName);
+    }
+}
diff --git a/tests/Mink/behat.yml.dist b/tests/Mink/behat.yml.dist
index 8b7e64d40e9..3aa81354b63 100644
--- a/tests/Mink/behat.yml.dist
+++ b/tests/Mink/behat.yml.dist
@@ -3,47 +3,79 @@ default:
         SensioLabs\Behat\PageObjectExtension:
             namespaces:
                 page:
-                    - Shopware\Tests\Mink\Page
-                    - Shopware\Tests\Mink\Page\Backend
+                    - Shopware\Tests\Mink\Page\Helper
+                    - Shopware\Tests\Mink\Page\Backend\Backend
+                    - Shopware\Tests\Mink\Page\Backend\ContentTypeManager
+                    - Shopware\Tests\Mink\Page\Backend\CustomRecipes
+                    - Shopware\Tests\Mink\Page\Frontend\Account
+                    - Shopware\Tests\Mink\Page\Frontend\Address
+                    - Shopware\Tests\Mink\Page\Frontend\Article
+                    - Shopware\Tests\Mink\Page\Frontend\Blog
+                    - Shopware\Tests\Mink\Page\Frontend\Checkout
+                    - Shopware\Tests\Mink\Page\Frontend\Detail
+                    - Shopware\Tests\Mink\Page\Frontend\Form
+                    - Shopware\Tests\Mink\Page\Frontend\Generic
+                    - Shopware\Tests\Mink\Page\Frontend\Homepage
+                    - Shopware\Tests\Mink\Page\Frontend\Listing
+                    - Shopware\Tests\Mink\Page\Frontend\Newsletter
+                    - Shopware\Tests\Mink\Page\Frontend\Note
+                    - Shopware\Tests\Mink\Page\Frontend\Sitemap
                 element:
-                    - Shopware\Tests\Mink\Element
-                    - Shopware\Tests\Mink\Element\Backend
+                    - Shopware\Tests\Mink\Page\Helper\Elements
+                    - Shopware\Tests\Mink\Page\Backend\Backend\Elements
+                    - Shopware\Tests\Mink\Page\Backend\ContentTypeManager\Elements
+                    - Shopware\Tests\Mink\Page\Backend\CustomRecipes\Elements
+                    - Shopware\Tests\Mink\Page\Frontend\Account\Elements
+                    - Shopware\Tests\Mink\Page\Frontend\Address\Elements
+                    - Shopware\Tests\Mink\Page\Frontend\Article\Elements
+                    - Shopware\Tests\Mink\Page\Frontend\Blog\Elements
+                    - Shopware\Tests\Mink\Page\Frontend\Checkout\Elements
+                    - Shopware\Tests\Mink\Page\Frontend\Detail\Elements
+                    - Shopware\Tests\Mink\Page\Frontend\Form\Elements
+                    - Shopware\Tests\Mink\Page\Frontend\Generic\Elements
+                    - Shopware\Tests\Mink\Page\Frontend\Homepage\Elements
+                    - Shopware\Tests\Mink\Page\Frontend\Listing\Elements
+                    - Shopware\Tests\Mink\Page\Frontend\Newsletter\Elements
+                    - Shopware\Tests\Mink\Page\Frontend\Note\Elements
+                    - Shopware\Tests\Mink\Page\Frontend\Sitemap\Elements
+
         Shopware\Behat\ShopwareExtension: ~
         Behat\MinkExtension:
             ## defined in buildscript
-            #base_url: 'http://localhost/shopware/'
-            default_session: 'goutte'
+            base_url: 'http://%sw.host%%sw.path%'
+            show_cmd: 'echo "Scenario failed! Saved current page to %s"'
+            show_tmp_dir: 'build/artifacts/mink'
+            show_auto: true
+            default_session: 'selenium2'
             javascript_session: 'selenium2'
-            goutte: ~
-            selenium2:
-                wd_host: "http://selenium:4444/wd/hub"
             browser_name: chrome
-
-    gherkin:
-        filters:
-            tags: ~@knownFailing
+            selenium2:
+                wd_host: "http://%selenium.host%:4444/wd/hub"
+                capabilities:
+                    browser: chrome
+                    marionette: true
 
     suites:
         default:
-            paths: [ "%paths.base%/features" ]
+            paths: [ "%paths.base%" ]
             template: Responsive
             contexts:
                 - Behat\MinkExtension\Context\MinkContext
-                - Shopware\Tests\Mink\FeatureContext
-                - Shopware\Tests\Mink\AccountContext
-                - Shopware\Tests\Mink\BlogContext
-                - Shopware\Tests\Mink\CheckoutContext
-                - Shopware\Tests\Mink\DetailContext
-                - Shopware\Tests\Mink\FormContext
-                - Shopware\Tests\Mink\ListingContext
-                - Shopware\Tests\Mink\NoteContext
-                - Shopware\Tests\Mink\SeoContext
-                - Shopware\Tests\Mink\ShopwareContext
-                - Shopware\Tests\Mink\SitemapContext
-                - Shopware\Tests\Mink\SpecialContext
-                - Shopware\Tests\Mink\TransformContext
-                - Shopware\Tests\Mink\SecurityContext
-                - Shopware\Tests\Mink\ExportContext
-                - Shopware\Tests\Mink\BackendContext
-                - Shopware\Tests\Mink\BackendContentTypeManagerContext
-                - Shopware\Tests\Mink\BackendCustomRecipesContext
+                - Shopware\Tests\Mink\Tests\General\Helpers\FeatureContext
+                - Shopware\Tests\Mink\Tests\Frontend\Account\bootstrap\AccountContext
+                - Shopware\Tests\Mink\Tests\Frontend\Blog\bootstrap\BlogContext
+                - Shopware\Tests\Mink\Tests\Frontend\Checkout\bootstrap\CheckoutContext
+                - Shopware\Tests\Mink\Tests\Frontend\Detail\bootstrap\DetailContext
+                - Shopware\Tests\Mink\Tests\Frontend\Detail\bootstrap\FormContext
+                - Shopware\Tests\Mink\Tests\Frontend\Listing\bootstrap\ListingContext
+                - Shopware\Tests\Mink\Tests\Frontend\Note\bootstrap\NoteContext
+                - Shopware\Tests\Mink\Tests\Frontend\Listing\bootstrap\SeoContext
+                - Shopware\Tests\Mink\Tests\Frontend\Homepage\bootstrap\ShopwareContext
+                - Shopware\Tests\Mink\Tests\Frontend\Sitemap\bootstrap\SitemapContext
+                - Shopware\Tests\Mink\Tests\General\Helpers\SpecialContext
+                - Shopware\Tests\Mink\Tests\General\Helpers\TransformContext
+                - Shopware\Tests\Mink\Tests\Frontend\Homepage\bootstrap\SecurityContext
+                - Shopware\Tests\Mink\Tests\Backend\Export\bootstrap\ExportContext
+                - Shopware\Tests\Mink\Tests\Backend\Backend\bootstrap\BackendContext
+                - Shopware\Tests\Mink\Tests\Backend\ContentTypes\bootstrap\BackendContentTypeManagerContext
+                - Shopware\Tests\Mink\Tests\Backend\ContentTypes\bootstrap\BackendCustomRecipesContext
diff --git a/tests/Mink/features/bootstrap/BackendContext.php b/tests/Mink/features/bootstrap/BackendContext.php
deleted file mode 100644
index 4cd1d3fbac2..00000000000
--- a/tests/Mink/features/bootstrap/BackendContext.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Tests\Mink;
-
-use Exception;
-use Shopware\Tests\Mink\Page\Backend;
-
-class BackendContext extends SubContext
-{
-    /**
-     * @Given /^I am logged in to the backend as an admin user$/
-     */
-    public function iAmLoggedInToTheBackendAsAnAdminUser()
-    {
-        /** @var Backend $page */
-        $page = $this->getPage('Backend');
-        $page->open();
-
-        // See if we already are logged in
-        if ($this->waitIfThereIsText('Marketing', 5)) {
-            return;
-        }
-
-        $this->waitForText('Shopware Backend Login', 10);
-
-        $page->login('demo', 'demo');
-        $this->waitForText('Marketing');
-    }
-
-    /**
-     * @When /^I open the module "([^"]*)"$/
-     */
-    public function iOpenTheModule(string $moduleName): void
-    {
-        $this->spin(function (BackendContext $context) use ($moduleName) {
-            $backendPage = $context->getPage('Backend');
-            \assert($backendPage instanceof Backend);
-            $backendPage->openModule($moduleName);
-
-            return true;
-        });
-    }
-
-    /**
-     * @Then /^The module should open a window$/
-     */
-    public function theModuleShouldOpenAWindow(): void
-    {
-        $this->getPage('Backend');
-
-        $this->spin(function (BackendContext $context) {
-            $backendPage = $context->getPage('Backend');
-            \assert($backendPage instanceof Backend);
-            $backendPage->verifyModule();
-
-            return true;
-        });
-    }
-
-    /**
-     * @Then I should see a dropdown appear
-     */
-    public function iShouldSeeADropdownAppear(): void
-    {
-        $this->spin(function ($context) {
-            return $context->getPage('Backend')->find('css', '.x-boundlist-item') !== null;
-        });
-    }
-
-    /**
-     * @Then I should see a success message
-     */
-    public function iShouldSeeASuccessMessage(): void
-    {
-        $this->waitIfThereIsText('Erfolgreich', 5);
-    }
-
-    /**
-     * Based on Behat's own example
-     *
-     * @see http://docs.behat.org/en/v2.5/cookbook/using_spin_functions.html#adding-a-timeout
-     *
-     * @param callable $lambda
-     * @param int      $wait
-     *
-     * @throws Exception
-     *
-     * @return bool
-     */
-    public function spin($lambda, $wait = 60)
-    {
-        $time = time();
-        $stopTime = $time + $wait;
-        while (time() < $stopTime) {
-            try {
-                if ($lambda($this)) {
-                    return true;
-                }
-            } catch (Exception $e) {
-                // do nothing
-            }
-
-            usleep(250000);
-        }
-
-        throw new Exception("Spin function timed out after {$wait} seconds");
-    }
-
-    /**
-     * @Then There should be a window with the alias :alias
-     */
-    public function thereShouldBeAWindowWithTheAlias(string $alias): bool
-    {
-        $script = <<<'JS'
-return Shopware.app.Application.getActiveWindows().filter(function(activeWindow) {
-    return activeWindow.alias.some(function (alias) {
-        return alias.endsWith('%s');
-    });
-}).length > 0;
-JS;
-
-        return (bool) $this->getDriver()->evaluateScript(sprintf($script, $alias));
-    }
-
-    /**
-     * Based on Behat's own example
-     *
-     * @see http://docs.behat.org/en/v2.5/cookbook/using_spin_functions.html#adding-a-timeout
-     *
-     * @param callable $lambda
-     * @param int      $wait
-     *
-     * @return bool
-     */
-    protected function spinWithNoException($lambda, $wait = 60)
-    {
-        $time = time();
-        $stopTime = $time + $wait;
-        while (time() < $stopTime) {
-            try {
-                if ($lambda($this)) {
-                    return true;
-                }
-            } catch (Exception $e) {
-                // do nothing
-            }
-
-            usleep(250000);
-        }
-
-        return false;
-    }
-
-    /**
-     * Checks via a string exists
-     *
-     * @param string $text
-     *
-     * @return bool
-     */
-    protected function checkIfThereIsText($text, SubContext $context)
-    {
-        $result = $context->getSession()->getPage()->findAll('xpath', "//*[contains(., '$text')]");
-
-        return !empty($result);
-    }
-
-    /**
-     * Checks via spin function if a string exists, with sleep at the beginning (default 2)
-     *
-     * @param string $text
-     * @param int    $sleep
-     */
-    protected function waitForText($text, $sleep = 2)
-    {
-        sleep($sleep);
-        $this->spin(function (SubContext $context) use ($text) {
-            return $this->checkIfThereIsText($text, $context);
-        });
-    }
-
-    /**
-     * Checks via spin function if a string exists, with sleep at the beginning (default 2)
-     *
-     * @param string $text
-     * @param int    $wait
-     *
-     * @return bool
-     */
-    protected function waitIfThereIsText($text, $wait = 5)
-    {
-        return $this->spinWithNoException(function (SubContext $context) use ($text) {
-            return $this->checkIfThereIsText($text, $context);
-        }, $wait);
-    }
-}
diff --git a/tests/Mink/features/bootstrap/BlogContext.php b/tests/Mink/features/bootstrap/BlogContext.php
deleted file mode 100644
index a678f9511a8..00000000000
--- a/tests/Mink/features/bootstrap/BlogContext.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Tests\Mink;
-
-use Behat\Gherkin\Node\TableNode;
-use Shopware\Tests\Mink\Element\BlogBox;
-use Shopware\Tests\Mink\Page\Blog;
-
-class BlogContext extends SubContext
-{
-    /**
-     * @Given /^I am on the blog category (?P<categoryId>\d+)$/
-     * @Given /^I go to the blog category (?P<categoryId>\d+)$/
-     */
-    public function iAmOnTheBlogCategory($categoryId)
-    {
-        $this->getPage('Blog')->open(['categoryId' => $categoryId]);
-    }
-
-    /**
-     * @Given /^I click to read the blog article on position (\d+)$/
-     */
-    public function iClickToReadTheBlogArticleOnPosition($position)
-    {
-        /** @var Blog $page */
-        $page = $this->getPage('Blog');
-
-        /** @var BlogBox $blogBox */
-        $blogBox = $this->getMultipleElement($page, 'BlogBox', $position);
-        Helper::clickNamedLink($blogBox, 'readMore');
-    }
-
-    /**
-     * @When /^I write a comment:$/
-     */
-    public function iWriteAComment(TableNode $data)
-    {
-        $this->getPage('Blog')->writeComment($data->getHash());
-    }
-
-    /**
-     * @When /^the shop owner activates my latest comment$/
-     */
-    public function theShopOwnerActivateMyLatestComment()
-    {
-        $sql = 'UPDATE `s_blog_comments` SET `active`= 1 ORDER BY id DESC LIMIT 1';
-        $this->getService('db')->exec($sql);
-        $this->getSession()->reload();
-    }
-
-    /**
-     * @Then /^I should see an average evaluation of (\d+) from following comments:$/
-     */
-    public function iShouldSeeAnAverageEvaluationOfFromFollowingComments($average, TableNode $comments)
-    {
-        /** @var \Shopware\Tests\Mink\Page\Blog $page */
-        $page = $this->getPage('Blog');
-
-        /** @var \Shopware\Tests\Mink\Element\MultipleElement $blogComments */
-        $blogComments = $this->getMultipleElement($page, 'BlogComment');
-
-        $page->checkComments($blogComments, $average, $comments->getHash());
-    }
-
-    /**
-     * @When /^I open the comment form$/
-     */
-    public function iOpenTheCommentForm()
-    {
-        /** @var Blog $page */
-        $page = $this->getPage('Blog');
-        $page->openCommentSection();
-    }
-}
diff --git a/tests/Mink/features/bootstrap/FormContext.php b/tests/Mink/features/bootstrap/FormContext.php
deleted file mode 100644
index a646f211282..00000000000
--- a/tests/Mink/features/bootstrap/FormContext.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Tests\Mink;
-
-use Behat\Gherkin\Node\TableNode;
-
-class FormContext extends SubContext
-{
-    /**
-     * @Given /^I am on form (\d+)$/
-     */
-    public function iAmOnForm($id)
-    {
-        $this->getPage('Form')->open(['formId' => $id]);
-    }
-
-    /**
-     * @Given /^I should see a captcha$/
-     */
-    public function iShouldSeeACaptcha()
-    {
-        $this->getPage('Form')->checkCaptcha();
-    }
-
-    /**
-     * @When I submit the inquiry form with:
-     */
-    public function iSubmitTheInquiryFormWith(TableNode $data)
-    {
-        $this->getPage('Form')->submitInquiryForm($data->getHash());
-    }
-}
diff --git a/tests/Mink/features/bootstrap/ListingContext.php b/tests/Mink/features/bootstrap/ListingContext.php
deleted file mode 100644
index d5e1fa5b60c..00000000000
--- a/tests/Mink/features/bootstrap/ListingContext.php
+++ /dev/null
@@ -1,179 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Tests\Mink;
-
-use Behat\Gherkin\Node\TableNode;
-use Shopware\Tests\Mink\Element\ArticleBox;
-use Shopware\Tests\Mink\Element\FilterGroup;
-use Shopware\Tests\Mink\Page\Listing;
-
-class ListingContext extends SubContext
-{
-    /**
-     * @Given /^I am on the listing page:$/
-     * @Given /^I go to the listing page:$/
-     */
-    public function iAmOnTheListingPage(TableNode $params)
-    {
-        $params = $params->getHash();
-
-        $this->getPage('Listing')->openListing($params);
-    }
-
-    /**
-     * @Given /^I am on the listing page for category (?P<categoryId>\d+)$/
-     * @Given /^I am on the listing page for category (?P<categoryId>\d+) on page (?P<page>\d+)$/
-     */
-    public function iAmOnTheListingPageForCategoryOnPage($categoryId, $page = null)
-    {
-        $params = [
-            [
-                'parameter' => 'sCategory',
-                'value' => $categoryId,
-            ],
-        ];
-
-        if ($page) {
-            $params[] = [
-                'parameter' => 'sPage',
-                'value' => $page,
-            ];
-        }
-
-        $this->getPage('Listing')->openListing($params, false);
-    }
-
-    /**
-     * @When /^I set the filter to:$/
-     * @When /^I reset all filters$/
-     */
-    public function iSetTheFilterTo(TableNode $filter = null)
-    {
-        $properties = [];
-
-        if ($filter) {
-            $properties = $filter->getHash();
-        }
-
-        /** @var Listing $page */
-        $page = $this->getPage('Listing');
-
-        /** @var FilterGroup $filterGroups */
-        $filterGroups = $this->getMultipleElement($page, 'FilterGroup');
-        $page->filter($filterGroups, $properties);
-    }
-
-    /**
-     * @Then /^the articles should be shown in a table-view$/
-     */
-    public function theArticlesShouldBeShownInATableView()
-    {
-        $this->getPage('Listing')->checkView('viewTable');
-    }
-
-    /**
-     * @Then /^the articles should be shown in a list-view$/
-     */
-    public function theArticlesShouldBeShownInAListView()
-    {
-        $this->getPage('Listing')->checkView('viewList');
-    }
-
-    /**
-     * @Then /^the article on position (?P<num>\d+) should have this properties:$/
-     */
-    public function theArticleOnPositionShouldHaveThisProperties($position, TableNode $properties)
-    {
-        /** @var Listing $page */
-        $page = $this->getPage('Listing');
-
-        /** @var ArticleBox $articleBox */
-        $articleBox = $this->getMultipleElement($page, 'ArticleBox', $position);
-        $properties = Helper::convertTableHashToArray($properties->getHash());
-        $page->checkArticleBox($articleBox, $properties);
-    }
-
-    /**
-     * @When /^I order the article on position (?P<position>\d+)$/
-     */
-    public function iOrderTheArticleOnPosition($position)
-    {
-        /** @var Listing $page */
-        $page = $this->getPage('Listing');
-
-        /** @var ArticleBox $articleBox */
-        $articleBox = $this->getMultipleElement($page, 'ArticleBox', $position);
-        Helper::clickNamedLink($articleBox, 'order');
-    }
-
-    /**
-     * @When /^I browse to (previous|next) page$/
-     * @When /^I browse to (previous|next) page (\d+) times$/
-     */
-    public function iBrowseTimesToPage($direction, $steps = 1)
-    {
-        $this->getElement('Paging')->moveDirection($direction, $steps);
-    }
-
-    /**
-     * @Then /^I should not be able to browse to (previous|next) page$/
-     */
-    public function iShouldNotBeAbleToBrowseToPage($direction)
-    {
-        $this->getElement('Paging')->noElement($direction);
-    }
-
-    /**
-     * @When /^I browse to page (\d+)$/
-     */
-    public function iBrowseToPage($page)
-    {
-        $this->getElement('Paging')->moveToPage($page);
-    }
-
-    /**
-     * @Given /^I should not be able to browse to page (\d+)$/
-     */
-    public function iShouldNotBeAbleToBrowseToPage2($page)
-    {
-        $this->getElement('Paging')->noElement($page);
-    }
-
-    /**
-     * @Then /^I should see the article "([^"]*)" in listing$/
-     */
-    public function iShouldSeeTheArticleInListing($name)
-    {
-        $this->getPage('Listing')->checkListing($name);
-    }
-
-    /**
-     * @Given /^I should not see the article "([^"]*)" in listing$/
-     */
-    public function iShouldNotSeeTheArticleInListing($name)
-    {
-        $this->getPage('Listing')->checkListing($name, true);
-    }
-}
diff --git a/tests/Mink/features/bootstrap/Page/Backend.php b/tests/Mink/features/bootstrap/Page/Backend.php
deleted file mode 100644
index 140a0513401..00000000000
--- a/tests/Mink/features/bootstrap/Page/Backend.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Tests\Mink\Page;
-
-use Exception;
-use SensioLabs\Behat\PageObjectExtension\PageObject\Page;
-
-class Backend extends Page
-{
-    public const TIMEOUT_MILLISECONDS = 500;
-
-    /**
-     * @var string
-     */
-    protected $path = '/backend/';
-
-    /**
-     * @return array<string, string|array>
-     */
-    public function getXPathSelectors(): array
-    {
-        return [
-            'loginUsernameInput' => "//input[@name='username']",
-            'loginUsernamepassword' => "//input[@name='password']",
-            'loginLoginButton' => "//button[@data-action='login']",
-        ];
-    }
-
-    public function login($user, $password): void
-    {
-        $xpath = $this->getXPathSelectors();
-        $this->find('xpath', $xpath['loginUsernameInput'])->setValue($user);
-        $this->find('xpath', $xpath['loginUsernamepassword'])->setValue($password);
-        $this->find('xpath', $xpath['loginLoginButton'])->click();
-    }
-
-    /**
-     * @param string $moduleName
-     */
-    public function openModule($moduleName): void
-    {
-        $name = 'Shopware.apps.' . $moduleName;
-        $this->getSession()->evaluateScript("openNewModule('$name');");
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function verifyModule(): void
-    {
-        $selector = "document.querySelector('.x-window-header-text') !== null";
-        $result = $this->getSession()->wait(self::TIMEOUT_MILLISECONDS, $selector);
-        if (!$result) {
-            throw new Exception('No Module was opened');
-        }
-
-        $selector = "document.querySelector('.x-window-header-text').innerHTML != 'Shopware Fehler Reporter'";
-        $result = $this->getSession()->wait(self::TIMEOUT_MILLISECONDS, $selector);
-        if (!$result) {
-            throw new Exception('Error Module was opened');
-        }
-    }
-}
diff --git a/tests/Mink/features/bootstrap/TransformContext.php b/tests/Mink/features/bootstrap/TransformContext.php
deleted file mode 100644
index 286cb24930d..00000000000
--- a/tests/Mink/features/bootstrap/TransformContext.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Tests\Mink;
-
-class TransformContext extends SubContext
-{
-    /**
-     * @Transform /^(\d+)$/
-     */
-    public function castStringToNumber($string)
-    {
-        return (int) $string;
-    }
-
-    /**
-     * @Transform /^page "(.*)"$/
-     */
-    public function castPageNameToPage($pageName)
-    {
-        return $this->getPage($pageName);
-    }
-}
diff --git a/tests/PHPStan/Extension/SmartyClassDynamicReturnTypeExtension.php b/tests/PHPStan/Extension/SmartyClassDynamicReturnTypeExtension.php
index fb931b2240f..415dbea89cd 100644
--- a/tests/PHPStan/Extension/SmartyClassDynamicReturnTypeExtension.php
+++ b/tests/PHPStan/Extension/SmartyClassDynamicReturnTypeExtension.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\PHPStan\Extension;
diff --git a/tests/PHPStan/Stub/Behat/Context.stub b/tests/PHPStan/Stub/Behat/Context.stub
new file mode 100644
index 00000000000..5b5420a3244
--- /dev/null
+++ b/tests/PHPStan/Stub/Behat/Context.stub
@@ -0,0 +1,5 @@
+<?php
+
+namespace Behat\Behat\Context;
+
+interface Context{}
diff --git a/tests/PHPStan/Stub/Behat/InitializedContextEnvironment.stub b/tests/PHPStan/Stub/Behat/InitializedContextEnvironment.stub
new file mode 100644
index 00000000000..a59d5735c69
--- /dev/null
+++ b/tests/PHPStan/Stub/Behat/InitializedContextEnvironment.stub
@@ -0,0 +1,16 @@
+<?php
+
+namespace Behat\Behat\Context\Environment;
+
+use Behat\Behat\Context\Context;
+
+final class InitializedContextEnvironment
+{
+    /**
+     * @template TContext of Context
+     * @param class-string<TContext> $class
+     *
+     * @return TContext
+     */
+    public function getContext($class) {}
+}
diff --git a/tests/TestReflectionHelper.php b/tests/TestReflectionHelper.php
index 1a4bb24d92c..8c9fbdd8d8e 100644
--- a/tests/TestReflectionHelper.php
+++ b/tests/TestReflectionHelper.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests;
diff --git a/tests/Unit/ArrayCollectionTest.php b/tests/Unit/ArrayCollectionTest.php
index a36cf262e2c..1ea098b0beb 100644
--- a/tests/Unit/ArrayCollectionTest.php
+++ b/tests/Unit/ArrayCollectionTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit;
diff --git a/tests/Unit/Bundle/BenchmarkBundle/MatcherTest.php b/tests/Unit/Bundle/BenchmarkBundle/MatcherTest.php
deleted file mode 100644
index 87e01341dcd..00000000000
--- a/tests/Unit/Bundle/BenchmarkBundle/MatcherTest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Tests\Unit\Bundle\BenchmarkBundle;
-
-use PHPUnit\Framework\TestCase;
-use Shopware\Bundle\BenchmarkBundle\Service\MatcherService;
-
-class MatcherTest extends TestCase
-{
-    /**
-     * @doesNotPerformAssertions
-     */
-    public function testPaymentMatchers(): void
-    {
-        $matcher = new MatcherService(require __DIR__ . '/../../../../engine/Shopware/Bundle/BenchmarkBundle/DependencyInjection/Resources/payment_matchers.php');
-        $matcher->matchString('foobar');
-    }
-
-    /**
-     * @doesNotPerformAssertions
-     */
-    public function testShippingMatchers(): void
-    {
-        $matcher = new MatcherService(require __DIR__ . '/../../../../engine/Shopware/Bundle/BenchmarkBundle/DependencyInjection/Resources/shipment_matchers.php');
-        $matcher->matchString('foobar');
-    }
-}
diff --git a/tests/Unit/Bundle/BenchmarkBundle/ProviderTest.php b/tests/Unit/Bundle/BenchmarkBundle/ProviderTest.php
deleted file mode 100644
index 9219e211d42..00000000000
--- a/tests/Unit/Bundle/BenchmarkBundle/ProviderTest.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Tests\Unit\Bundle\BenchmarkBundle;
-
-use ArrayObject;
-use PHPUnit\Framework\TestCase;
-use Shopware\Bundle\BenchmarkBundle\BenchmarkCollector;
-use Shopware\Bundle\BenchmarkBundle\BenchmarkProviderInterface;
-use Shopware\Bundle\StoreFrontBundle\Struct\Category;
-use Shopware\Bundle\StoreFrontBundle\Struct\Shop;
-use Shopware\Bundle\StoreFrontBundle\Struct\ShopContext;
-use Shopware\Bundle\StoreFrontBundle\Struct\ShopContextInterface;
-
-class ProviderTest extends TestCase
-{
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGet(): void
-    {
-        $provider = new BenchmarkCollector(new ArrayObject([
-            new ShopBenchmarkProvider(),
-            new FooBenchmarkProvider(),
-            new BarBenchmarkProvider(),
-        ]));
-
-        $result = $provider->get(new ShopContextMock());
-        static::assertArrayHasKey('id', $result);
-        static::assertArrayHasKey('foo', $result);
-        static::assertArrayHasKey('bar', $result);
-        static::assertSame(1, (int) $result['id']);
-        static::assertSame([
-            'foo' => 'bar',
-            'john' => 'doe',
-        ], $result['foo']);
-        static::assertSame([
-            'test' => 'example',
-        ], $result['bar']);
-    }
-
-    /**
-     * @group BenchmarkBundle
-     */
-    public function testGetShouldThrowExceptionNoShopProvider(): void
-    {
-        $provider = new BenchmarkCollector(new ArrayObject([
-            new FooBenchmarkProvider(),
-            new BarBenchmarkProvider(),
-        ]));
-
-        $this->expectExceptionMessage('Necessary data with name \'shop\' not provided.');
-        $provider->get(new ShopContextMock());
-    }
-}
-
-class FooBenchmarkProvider implements BenchmarkProviderInterface
-{
-    public function getName()
-    {
-        return 'foo';
-    }
-
-    public function getBenchmarkData(ShopContextInterface $shopContext)
-    {
-        return [
-            'foo' => 'bar',
-            'john' => 'doe',
-        ];
-    }
-}
-
-class BarBenchmarkProvider implements BenchmarkProviderInterface
-{
-    public function getName()
-    {
-        return 'bar';
-    }
-
-    public function getBenchmarkData(ShopContextInterface $shopContext)
-    {
-        return [
-            'test' => 'example',
-        ];
-    }
-}
-
-class ShopBenchmarkProvider implements BenchmarkProviderInterface
-{
-    public function getName()
-    {
-        return 'shop';
-    }
-
-    public function getBenchmarkData(ShopContextInterface $shopContext)
-    {
-        return [
-            'id' => '1',
-        ];
-    }
-}
-
-class ShopContextMock extends ShopContext
-{
-    public function __construct()
-    {
-    }
-
-    public function getShop()
-    {
-        return new ShopMock();
-    }
-}
-
-class ShopMock extends Shop
-{
-    public function getId(): int
-    {
-        return 1;
-    }
-
-    public function getCategory(): CategoryMock
-    {
-        return new CategoryMock();
-    }
-}
-
-class CategoryMock extends Category
-{
-    public function getId(): int
-    {
-        return 2;
-    }
-}
diff --git a/tests/Unit/Bundle/ContentTypeBundle/DependencyInjection/RegisterDynamicControllerTest.php b/tests/Unit/Bundle/ContentTypeBundle/DependencyInjection/RegisterDynamicControllerTest.php
index e7fa7cc34c0..46d6156b8c3 100644
--- a/tests/Unit/Bundle/ContentTypeBundle/DependencyInjection/RegisterDynamicControllerTest.php
+++ b/tests/Unit/Bundle/ContentTypeBundle/DependencyInjection/RegisterDynamicControllerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\ContentTypeBundle\DependencyInjection;
diff --git a/tests/Unit/Bundle/ContentTypeBundle/DependencyInjection/RegisterFieldsCompilerPassTest.php b/tests/Unit/Bundle/ContentTypeBundle/DependencyInjection/RegisterFieldsCompilerPassTest.php
index c6671c390f9..1c36b058cef 100644
--- a/tests/Unit/Bundle/ContentTypeBundle/DependencyInjection/RegisterFieldsCompilerPassTest.php
+++ b/tests/Unit/Bundle/ContentTypeBundle/DependencyInjection/RegisterFieldsCompilerPassTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\ContentTypeBundle\DependencyInjection;
diff --git a/tests/Unit/Bundle/ContentTypeBundle/DependencyInjection/RegisterTypeRepositoriesTest.php b/tests/Unit/Bundle/ContentTypeBundle/DependencyInjection/RegisterTypeRepositoriesTest.php
index 2b6bec0599c..6f6a20f708a 100644
--- a/tests/Unit/Bundle/ContentTypeBundle/DependencyInjection/RegisterTypeRepositoriesTest.php
+++ b/tests/Unit/Bundle/ContentTypeBundle/DependencyInjection/RegisterTypeRepositoriesTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\ContentTypeBundle\DependencyInjection;
diff --git a/tests/Unit/Bundle/ContentTypeBundle/DependencyInjection/TypeReaderTest.php b/tests/Unit/Bundle/ContentTypeBundle/DependencyInjection/TypeReaderTest.php
index 3df2a3a6fa4..eee36e87295 100644
--- a/tests/Unit/Bundle/ContentTypeBundle/DependencyInjection/TypeReaderTest.php
+++ b/tests/Unit/Bundle/ContentTypeBundle/DependencyInjection/TypeReaderTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\ContentTypeBundle\DependencyInjection;
diff --git a/tests/Unit/Bundle/ContentTypeBundle/Field/Shopware/AbstractGridFieldTest.php b/tests/Unit/Bundle/ContentTypeBundle/Field/Shopware/AbstractGridFieldTest.php
index f233081e582..90e30a73e47 100644
--- a/tests/Unit/Bundle/ContentTypeBundle/Field/Shopware/AbstractGridFieldTest.php
+++ b/tests/Unit/Bundle/ContentTypeBundle/Field/Shopware/AbstractGridFieldTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\ContentTypeBundle\Field\Shopware;
diff --git a/tests/Unit/Bundle/ContentTypeBundle/Field/Shopware/AbstractSingleSelectionFieldTest.php b/tests/Unit/Bundle/ContentTypeBundle/Field/Shopware/AbstractSingleSelectionFieldTest.php
index 1faf3cc2015..41cf1f4c6a5 100644
--- a/tests/Unit/Bundle/ContentTypeBundle/Field/Shopware/AbstractSingleSelectionFieldTest.php
+++ b/tests/Unit/Bundle/ContentTypeBundle/Field/Shopware/AbstractSingleSelectionFieldTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\ContentTypeBundle\Field\Shopware;
diff --git a/tests/Unit/Bundle/ContentTypeBundle/Services/FrontendTypeTranslatorTest.php b/tests/Unit/Bundle/ContentTypeBundle/Services/FrontendTypeTranslatorTest.php
index e41ae5fb3d8..a48738fe5de 100644
--- a/tests/Unit/Bundle/ContentTypeBundle/Services/FrontendTypeTranslatorTest.php
+++ b/tests/Unit/Bundle/ContentTypeBundle/Services/FrontendTypeTranslatorTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\ContentTypeBundle\Services;
diff --git a/tests/Unit/Bundle/ContentTypeBundle/XmlReaderTest.php b/tests/Unit/Bundle/ContentTypeBundle/XmlReaderTest.php
index 2c2d4893e42..554feb44b7d 100644
--- a/tests/Unit/Bundle/ContentTypeBundle/XmlReaderTest.php
+++ b/tests/Unit/Bundle/ContentTypeBundle/XmlReaderTest.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\ContentTypeBundle;
@@ -30,14 +31,10 @@
 use Shopware\Bundle\ContentTypeBundle\Field\TextField;
 use Shopware\Bundle\ContentTypeBundle\Services\TypeBuilder;
 use Shopware\Bundle\ContentTypeBundle\Services\XmlReader\ContentTypesReader;
-use Shopware\Bundle\ContentTypeBundle\Structs\Type;
 
 class XmlReaderTest extends TestCase
 {
-    /**
-     * @var ContentTypesReader
-     */
-    private $reader;
+    private ContentTypesReader $reader;
 
     public function setUp(): void
     {
@@ -52,6 +49,7 @@ public function testReadValidXml(): void
 
         static::assertArrayHasKey('store', $data);
         $store = $data['store'];
+        static::assertIsArray($store);
 
         // Minimum required fields
         static::assertArrayHasKey('name', $store);
@@ -65,8 +63,6 @@ public function testReadValidXml(): void
 
         $type = $this->getTypeBuilder()->createType('store', $store);
 
-        static::assertInstanceOf(Type::class, $type);
-
         static::assertEquals('store', $type->getInternalName());
         static::assertEquals('stores', $type->getName());
         static::assertCount(3, $type->getFields());
@@ -81,8 +77,6 @@ public function testReadWithFallbackToDummy(): void
 
         $type = $this->getTypeBuilder()->createType('store', $store);
 
-        static::assertInstanceOf(Type::class, $type);
-
         static::assertCount(2, $type->getFields());
 
         static::assertInstanceOf(DummyField::class, $type->getFields()[1]->getType());
@@ -101,6 +95,20 @@ public function testReadInvalidTypeNameFile(): void
         $this->reader->read(__DIR__ . '/fixtures/valid_with_invalid_typeName.xml');
     }
 
+    public function testReadValidTypeNameWithNumber(): void
+    {
+        $contentTypes = $this->reader->read(__DIR__ . '/fixtures/valid_with_number_in_typeName.xml');
+        static::assertArrayHasKey('a123Test', $contentTypes);
+        $testContentType = $contentTypes['a123Test'];
+        static::assertSame('TEST 123', $testContentType['name']);
+    }
+
+    public function testReadInvalidTypeNameStartingWithNumberFile(): void
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->reader->read(__DIR__ . '/fixtures/valid_with_invalid_starting_number_in_typeName.xml');
+    }
+
     public function testReadingInvalidFrontendConfiguration(): void
     {
         $this->expectException(InvalidArgumentException::class);
diff --git a/tests/Unit/Bundle/ContentTypeBundle/fixtures/valid_with_invalid_starting_number_in_typeName.xml b/tests/Unit/Bundle/ContentTypeBundle/fixtures/valid_with_invalid_starting_number_in_typeName.xml
new file mode 100644
index 00000000000..2bf10814607
--- /dev/null
+++ b/tests/Unit/Bundle/ContentTypeBundle/fixtures/valid_with_invalid_starting_number_in_typeName.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<contentTypes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../engine/Shopware/Bundle/ContentTypeBundle/Resources/contenttypes.xsd">
+    <types>
+        <type>
+            <typeName>123Test</typeName>
+            <name>TEST 123</name>
+            <fieldSets>
+                <fieldSet>
+                    <field name="name" type="text" required="true">
+                        <label>Name</label>
+                        <showListing>true</showListing>
+                    </field>
+                    <field name="email" type="text">
+                        <label>Email</label>
+                        <showListing>true</showListing>
+                    </field>
+                </fieldSet>
+            </fieldSets>
+        </type>
+    </types>
+</contentTypes>
diff --git a/tests/Unit/Bundle/ContentTypeBundle/fixtures/valid_with_number_in_typeName.xml b/tests/Unit/Bundle/ContentTypeBundle/fixtures/valid_with_number_in_typeName.xml
new file mode 100644
index 00000000000..0e91b310122
--- /dev/null
+++ b/tests/Unit/Bundle/ContentTypeBundle/fixtures/valid_with_number_in_typeName.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<contentTypes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../engine/Shopware/Bundle/ContentTypeBundle/Resources/contenttypes.xsd">
+    <types>
+        <type>
+            <typeName>a123Test</typeName>
+            <name>TEST 123</name>
+            <fieldSets>
+                <fieldSet>
+                    <field name="name" type="text" required="true">
+                        <label>Name</label>
+                        <showListing>true</showListing>
+                    </field>
+                    <field name="email" type="text">
+                        <label>Email</label>
+                        <showListing>true</showListing>
+                    </field>
+                </fieldSet>
+            </fieldSets>
+        </type>
+    </types>
+</contentTypes>
diff --git a/tests/Unit/Bundle/CookieBundle/CookieCollectionTest.php b/tests/Unit/Bundle/CookieBundle/CookieCollectionTest.php
index 1b36c48e504..95026ff1ecd 100644
--- a/tests/Unit/Bundle/CookieBundle/CookieCollectionTest.php
+++ b/tests/Unit/Bundle/CookieBundle/CookieCollectionTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\CookieBundle;
@@ -43,7 +42,7 @@ public function testIsValidReturnsTrue(): void
     public function testIsValidReturnsFalse(): void
     {
         $cookieCollection = new CookieCollection();
-        $cookieCollection->add(new class() {
+        $cookieCollection->add(new class {
         });
 
         static::assertFalse($cookieCollection->isValid());
diff --git a/tests/Unit/Bundle/CookieBundle/CookieGroupCollectionTest.php b/tests/Unit/Bundle/CookieBundle/CookieGroupCollectionTest.php
index 21a934d6d55..0719a702314 100644
--- a/tests/Unit/Bundle/CookieBundle/CookieGroupCollectionTest.php
+++ b/tests/Unit/Bundle/CookieBundle/CookieGroupCollectionTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\CookieBundle;
@@ -44,7 +43,7 @@ public function testIsValidReturnsTrue(): void
     public function testIsValidReturnsFalse(): void
     {
         $cookieGroupCollection = new CookieGroupCollection();
-        $cookieGroupCollection->add(new class() {
+        $cookieGroupCollection->add(new class {
         });
 
         static::assertFalse($cookieGroupCollection->isValid());
diff --git a/tests/Unit/Bundle/ESIndexingBundle/DependencyInjection/Factory/TextMappingFactoryTest.php b/tests/Unit/Bundle/ESIndexingBundle/DependencyInjection/Factory/TextMappingFactoryTest.php
index d9e9cb1ad54..c66234e4f52 100644
--- a/tests/Unit/Bundle/ESIndexingBundle/DependencyInjection/Factory/TextMappingFactoryTest.php
+++ b/tests/Unit/Bundle/ESIndexingBundle/DependencyInjection/Factory/TextMappingFactoryTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\ESIndexingBundle\DependencyInjection\Factory;
diff --git a/tests/Unit/Bundle/ESIndexingBundle/Product/ProductMappingTest.php b/tests/Unit/Bundle/ESIndexingBundle/Product/ProductMappingTest.php
index 1a675b64df6..b5c7f3b5bc2 100644
--- a/tests/Unit/Bundle/ESIndexingBundle/Product/ProductMappingTest.php
+++ b/tests/Unit/Bundle/ESIndexingBundle/Product/ProductMappingTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\ESIndexingBundle\Product;
diff --git a/tests/Unit/Bundle/ESIndexingBundle/Property/PropertyMappingTest.php b/tests/Unit/Bundle/ESIndexingBundle/Property/PropertyMappingTest.php
index a6380922d9e..a24759794bd 100644
--- a/tests/Unit/Bundle/ESIndexingBundle/Property/PropertyMappingTest.php
+++ b/tests/Unit/Bundle/ESIndexingBundle/Property/PropertyMappingTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\ESIndexingBundle\Property;
diff --git a/tests/Unit/Bundle/EmotionBundle/ComponentHandler/EventComponentHandlerTest.php b/tests/Unit/Bundle/EmotionBundle/ComponentHandler/EventComponentHandlerTest.php
index fcdf34b83e2..3922656b12b 100644
--- a/tests/Unit/Bundle/EmotionBundle/ComponentHandler/EventComponentHandlerTest.php
+++ b/tests/Unit/Bundle/EmotionBundle/ComponentHandler/EventComponentHandlerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\EmotionBundle\ComponentHandler;
diff --git a/tests/Unit/Bundle/EsBackendBundle/SearchQueryBuilderTest.php b/tests/Unit/Bundle/EsBackendBundle/SearchQueryBuilderTest.php
new file mode 100644
index 00000000000..45b6bd47719
--- /dev/null
+++ b/tests/Unit/Bundle/EsBackendBundle/SearchQueryBuilderTest.php
@@ -0,0 +1,130 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Unit\Bundle\EsBackendBundle;
+
+use Generator;
+use PHPUnit\Framework\TestCase;
+use Shopware\Bundle\EsBackendBundle\SearchQueryBuilder;
+
+class SearchQueryBuilderTest extends TestCase
+{
+    /**
+     * @dataProvider buildQueryDataProvider
+     *
+     * @param array{bool: array{should: array<array<string, array<string, array<string, string|int>>>>}} $expectedArray
+     */
+    public function testBuildQuery(string $term, array $expectedArray): void
+    {
+        $query = (new SearchQueryBuilder())->buildQuery(['swag_all' => 1], $term);
+
+        static::assertSame($expectedArray, $query->toArray());
+    }
+
+    public function buildQueryDataProvider(): Generator
+    {
+        yield [
+            'foo bar',
+            [
+                'bool' => [
+                    'should' => [
+                        ['match' => ['swag_all' => ['query' => 'foo', 'boost' => 1]]],
+                        ['wildcard' => ['swag_all' => ['value' => '*foo*']]],
+                        ['match' => ['swag_all' => ['query' => 'bar', 'boost' => 1]]],
+                        ['wildcard' => ['swag_all' => ['value' => '*bar*']]],
+                        ['match' => ['swag_all' => ['query' => 'foo bar', 'boost' => 2]]],
+                        ['match' => ['swag_all' => ['query' => 'foo bar', 'boost' => 2]]],
+                    ],
+                ],
+            ],
+        ];
+
+        yield [
+            '/foo.bar-fb\\',
+            [
+                'bool' => [
+                    'should' => [
+                        ['match' => ['swag_all' => ['query' => 'foo', 'boost' => 1]]],
+                        ['wildcard' => ['swag_all' => ['value' => '*foo*']]],
+                        ['match' => ['swag_all' => ['query' => 'bar', 'boost' => 1]]],
+                        ['wildcard' => ['swag_all' => ['value' => '*bar*']]],
+                        ['match' => ['swag_all' => ['query' => 'fb', 'boost' => 1]]],
+                        ['wildcard' => ['swag_all' => ['value' => '*fb*']]],
+                        ['match' => ['swag_all' => ['query' => 'foo bar', 'boost' => 2]]],
+                        ['match' => ['swag_all' => ['query' => 'foo bar fb', 'boost' => 2]]],
+                    ],
+                ],
+            ],
+        ];
+
+        yield [
+            '<test> foo bar',
+            [
+                'bool' => [
+                    'should' => [
+                        ['match' => ['swag_all' => ['query' => 'foo', 'boost' => 1]]],
+                        ['wildcard' => ['swag_all' => ['value' => '*foo*']]],
+                        ['match' => ['swag_all' => ['query' => 'bar', 'boost' => 1]]],
+                        ['wildcard' => ['swag_all' => ['value' => '*bar*']]],
+                        ['match' => ['swag_all' => ['query' => 'foo bar', 'boost' => 2]]],
+                        ['match' => ['swag_all' => ['query' => 'foo bar', 'boost' => 2]]],
+                    ],
+                ],
+            ],
+        ];
+
+        yield [
+            '"foo* bar?',
+            [
+                'bool' => [
+                    'should' => [
+                        ['match' => ['swag_all' => ['query' => 'foo', 'boost' => 1]]],
+                        ['wildcard' => ['swag_all' => ['value' => '*foo*']]],
+                        ['match' => ['swag_all' => ['query' => 'bar', 'boost' => 1]]],
+                        ['wildcard' => ['swag_all' => ['value' => '*bar*']]],
+                        ['match' => ['swag_all' => ['query' => 'foo bar', 'boost' => 2]]],
+                        ['match' => ['swag_all' => ['query' => 'foo bar', 'boost' => 2]]],
+                    ],
+                ],
+            ],
+        ];
+
+        yield [
+            'foo bar a',
+            [
+                'bool' => [
+                    'should' => [
+                        ['match' => ['swag_all' => ['query' => 'foo', 'boost' => 1]]],
+                        ['wildcard' => ['swag_all' => ['value' => '*foo*']]],
+                        ['match' => ['swag_all' => ['query' => 'bar', 'boost' => 1]]],
+                        ['wildcard' => ['swag_all' => ['value' => '*bar*']]],
+                        ['match' => ['swag_all' => ['query' => 'foo bar', 'boost' => 2]]],
+                        ['match' => ['swag_all' => ['query' => 'foo bar', 'boost' => 2]]],
+                    ],
+                ],
+            ],
+        ];
+    }
+}
diff --git a/tests/Unit/Bundle/FormBundle/StringRendererServiceTest.php b/tests/Unit/Bundle/FormBundle/StringRendererServiceTest.php
index 20a78a42bd4..95898a50d95 100644
--- a/tests/Unit/Bundle/FormBundle/StringRendererServiceTest.php
+++ b/tests/Unit/Bundle/FormBundle/StringRendererServiceTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\FormBundle;
diff --git a/tests/Unit/Bundle/FormBundle/fixtures/View.php b/tests/Unit/Bundle/FormBundle/fixtures/View.php
index 4591dae3838..0dc994d390f 100644
--- a/tests/Unit/Bundle/FormBundle/fixtures/View.php
+++ b/tests/Unit/Bundle/FormBundle/fixtures/View.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\FormBundle\fixtures;
@@ -32,21 +32,21 @@ public function getAssign()
             'forceMail' => 0,
             'id' => '5',
             'sSupport' => [
-                    'id' => '5',
-                    'name' => 'Kontaktformular',
-                    'text' => '
+                'id' => '5',
+                'name' => 'Kontaktformular',
+                'text' => '
 Schreiben Sie uns eine eMail.
 
 
 Wir freuen uns auf Ihre Kontaktaufnahme.
 
 ',
-                    'text2' => '
+                'text2' => '
 Ihr Formular wurde versendet!
 
 ',
-                    'email' => 'info@example.com',
-                    'email_template' => 'Kontaktformular Shopware Demoshop
+                'email' => 'info@example.com',
+                'email_template' => 'Kontaktformular Shopware Demoshop
 
 Anrede: {sVars.anrede}
 Vorname: {sVars.vorname}
@@ -59,250 +59,250 @@ public function getAssign()
 
 
 ',
-                    'email_subject' => 'Kontaktformular Shopware',
-                    'metaTitle' => null,
-                    'metaDescription' => null,
-                    'metaKeywords' => null,
-                    'sErrors' => null,
-                    'sElements' => [
-                            24 => [
-                                    'id' => '24',
-                                    'name' => 'anrede',
-                                    'note' => 'Formular Name: {$sSupport.name} und Element Typ: {$sElement.type}',
-                                    'typ' => 'select',
-                                    'required' => '1',
-                                    'label' => 'Anrede',
-                                    'class' => 'normal',
-                                    'value' => 'Frau;Herr',
-                                    'error_msg' => '',
-                                ],
-                            35 => [
-                                    'id' => '35',
-                                    'name' => 'vorname',
-                                    'note' => 'Feld Name: {$sElement.name}',
-                                    'typ' => 'text',
-                                    'required' => '1',
-                                    'label' => 'Vorname',
-                                    'class' => 'normal',
-                                    'value' => '',
-                                    'error_msg' => '',
-                                ],
-                            36 => [
-                                    'id' => '36',
-                                    'name' => 'nachname',
-                                    'note' => 'Formular Name: {$sSupport.name}',
-                                    'typ' => 'text',
-                                    'required' => '1',
-                                    'label' => 'Nachname',
-                                    'class' => 'normal',
-                                    'value' => 'asd {$sElement.name}',
-                                    'error_msg' => '',
-                                ],
-                            37 => [
-                                    'id' => '37',
-                                    'name' => 'email',
-                                    'note' => 'Formular Beschreibung {$sSupport.text}',
-                                    'typ' => 'email',
-                                    'required' => '1',
-                                    'label' => 'eMail-Adresse',
-                                    'class' => 'normal',
-                                    'value' => '',
-                                    'error_msg' => '',
-                                ],
-                            38 => [
-                                    'id' => '38',
-                                    'name' => 'telefon',
-                                    'note' => '',
-                                    'typ' => 'text',
-                                    'required' => '0',
-                                    'label' => 'Telefon',
-                                    'class' => 'normal',
-                                    'value' => '',
-                                    'error_msg' => '',
-                                ],
-                            39 => [
-                                    'id' => '39',
-                                    'name' => 'betreff',
-                                    'note' => '',
-                                    'typ' => 'text',
-                                    'required' => '1',
-                                    'label' => 'Betreff',
-                                    'class' => 'normal',
-                                    'value' => '',
-                                    'error_msg' => '',
-                                ],
-                            40 => [
-                                    'id' => '40',
-                                    'name' => 'kommentar',
-                                    'note' => '',
-                                    'typ' => 'textarea',
-                                    'required' => '1',
-                                    'label' => 'Kommentar',
-                                    'class' => 'normal',
-                                    'value' => '',
-                                    'error_msg' => '',
-                                ],
-                        ],
-                    'sFields' => [
-                            24 => '
+                'email_subject' => 'Kontaktformular Shopware',
+                'metaTitle' => null,
+                'metaDescription' => null,
+                'metaKeywords' => null,
+                'sErrors' => null,
+                'sElements' => [
+                    24 => [
+                        'id' => '24',
+                        'name' => 'anrede',
+                        'note' => 'Formular Name: {$sSupport.name} und Element Typ: {$sElement.type}',
+                        'typ' => 'select',
+                        'required' => '1',
+                        'label' => 'Anrede',
+                        'class' => 'normal',
+                        'value' => 'Frau;Herr',
+                        'error_msg' => '',
+                    ],
+                    35 => [
+                        'id' => '35',
+                        'name' => 'vorname',
+                        'note' => 'Feld Name: {$sElement.name}',
+                        'typ' => 'text',
+                        'required' => '1',
+                        'label' => 'Vorname',
+                        'class' => 'normal',
+                        'value' => '',
+                        'error_msg' => '',
+                    ],
+                    36 => [
+                        'id' => '36',
+                        'name' => 'nachname',
+                        'note' => 'Formular Name: {$sSupport.name}',
+                        'typ' => 'text',
+                        'required' => '1',
+                        'label' => 'Nachname',
+                        'class' => 'normal',
+                        'value' => 'asd {$sElement.name}',
+                        'error_msg' => '',
+                    ],
+                    37 => [
+                        'id' => '37',
+                        'name' => 'email',
+                        'note' => 'Formular Beschreibung {$sSupport.text}',
+                        'typ' => 'email',
+                        'required' => '1',
+                        'label' => 'eMail-Adresse',
+                        'class' => 'normal',
+                        'value' => '',
+                        'error_msg' => '',
+                    ],
+                    38 => [
+                        'id' => '38',
+                        'name' => 'telefon',
+                        'note' => '',
+                        'typ' => 'text',
+                        'required' => '0',
+                        'label' => 'Telefon',
+                        'class' => 'normal',
+                        'value' => '',
+                        'error_msg' => '',
+                    ],
+                    39 => [
+                        'id' => '39',
+                        'name' => 'betreff',
+                        'note' => '',
+                        'typ' => 'text',
+                        'required' => '1',
+                        'label' => 'Betreff',
+                        'class' => 'normal',
+                        'value' => '',
+                        'error_msg' => '',
+                    ],
+                    40 => [
+                        'id' => '40',
+                        'name' => 'kommentar',
+                        'note' => '',
+                        'typ' => 'textarea',
+                        'required' => '1',
+                        'label' => 'Kommentar',
+                        'class' => 'normal',
+                        'value' => '',
+                        'error_msg' => '',
+                    ],
+                ],
+                'sFields' => [
+                    24 => '
 ',
-                            35 => '
+                    35 => '
 Vorname%*%
 
 ',
-                            36 => '
+                    36 => '
 asd {$sElement.name}
 
 ',
-                            37 => '
+                    37 => '
 eMail-Adresse%*%
 
 ',
-                            38 => '
+                    38 => '
 Telefon
 
 ',
-                            39 => '
+                    39 => '
 Betreff%*%
 
 ',
-                            40 => '
+                    40 => '
 Kommentar%*%
 
 ',
-                        ],
-                    'sLabels' => [
-                            24 => 'Anrede*:
+                ],
+                'sLabels' => [
+                    24 => 'Anrede*:
 ',
-                            35 => 'Vorname*:
+                    35 => 'Vorname*:
 ',
-                            36 => 'Nachname*:
+                    36 => 'Nachname*:
 ',
-                            37 => 'eMail-Adresse*:
+                    37 => 'eMail-Adresse*:
 ',
-                            38 => 'Telefon:
+                    38 => 'Telefon:
 ',
-                            39 => 'Betreff*:
+                    39 => 'Betreff*:
 ',
-                            40 => 'Kommentar*:
+                    40 => 'Kommentar*:
 ',
-                        ],
                 ],
+            ],
             'rand' => '0d1d9cd10021eac54c3f80ac32cdb7fd',
             'success' => null,
             'theme' => [
-                    'appleTouchIcon' => 'frontend/_public/src/img/apple-touch-icon-precomposed.png',
-                    'desktopLogo' => 'frontend/_public/src/img/logos/logo--tablet.png',
-                    'favicon' => 'frontend/_public/src/img/favicon.ico',
-                    'mobileLogo' => 'frontend/_public/src/img/logos/logo--mobile.png',
-                    'setPrecomposed' => true,
-                    'tabletLandscapeLogo' => 'frontend/_public/src/img/logos/logo--tablet.png',
-                    'tabletLogo' => 'frontend/_public/src/img/logos/logo--tablet.png',
-                    'win8TileImage' => 'frontend/_public/src/img/win-tile-image.png',
-                    'offcanvasCart' => true,
-                    'offcanvasOverlayPage' => true,
-                    'focusSearch' => false,
-                    'displaySidebar' => true,
-                    'sidebarFilter' => false,
-                    'checkoutHeader' => true,
-                    'checkoutFooter' => true,
-                    'infiniteScrolling' => true,
-                    'infiniteThreshold' => 4,
-                    'lightboxZoomFactor' => 0,
-                    'appleWebAppTitle' => '',
-                    'ajaxVariantSwitch' => true,
-                    'additionalCssData' => '',
-                    'additionalJsLibraries' => '',
-                    'brand-primary' => '#D9400B',
-                    'brand-primary-light' => 'saturate(lighten(@brand-primary, 12%), 5%)',
-                    'brand-secondary' => '#5F7285',
-                    'brand-secondary-dark' => 'darken(@brand-secondary, 15%)',
-                    'gray' => '#F5F5F8',
-                    'gray-light' => 'lighten(@gray, 1%)',
-                    'gray-dark' => 'darken(@gray-light, 10%)',
-                    'border-color' => '@gray-dark',
-                    'highlight-success' => '#2ECC71',
-                    'highlight-error' => '#E74C3C',
-                    'highlight-notice' => '#F1C40F',
-                    'highlight-info' => '#4AA3DF',
-                    'body-bg' => 'darken(@gray-light, 5%)',
-                    'text-color' => '@brand-secondary',
-                    'text-color-dark' => '@brand-secondary-dark',
-                    'link-color' => '@brand-primary',
-                    'link-hover-color' => 'darken(@link-color, 10%)',
-                    'rating-star-color' => '@highlight-notice',
-                    'overlay-bg' => '#000000',
-                    'overlay-theme-dark-bg' => '@overlay-bg',
-                    'overlay-theme-light-bg' => '#FFFFFF',
-                    'overlay-opacity' => '0.7',
-                    'font-base-stack' => '"Open Sans", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;',
-                    'font-headline-stack' => '@font-base-stack',
-                    'font-size-base' => '14',
-                    'font-base-weight' => '500',
-                    'font-light-weight' => '300',
-                    'font-bold-weight' => '700',
-                    'font-size-h1' => '26',
-                    'font-size-h2' => '21',
-                    'font-size-h3' => '18',
-                    'font-size-h4' => '16',
-                    'font-size-h5' => '@font-size-base',
-                    'font-size-h6' => '12',
-                    'btn-font-size' => '14',
-                    'btn-icon-size' => '10',
-                    'btn-default-top-bg' => '#FFFFFF',
-                    'btn-default-bottom-bg' => '@gray-light',
-                    'btn-default-hover-bg' => '#FFFFFF',
-                    'btn-default-text-color' => '@text-color',
-                    'btn-default-hover-text-color' => '@brand-primary',
-                    'btn-default-border-color' => '@border-color',
-                    'btn-default-hover-border-color' => '@brand-primary',
-                    'btn-primary-top-bg' => '@brand-primary-light',
-                    'btn-primary-bottom-bg' => '@brand-primary',
-                    'btn-primary-hover-bg' => '@brand-primary',
-                    'btn-primary-text-color' => '#FFFFFF',
-                    'btn-primary-hover-text-color' => '@btn-primary-text-color',
-                    'btn-secondary-top-bg' => '@brand-secondary',
-                    'btn-secondary-bottom-bg' => '@brand-secondary-dark',
-                    'btn-secondary-hover-bg' => '@brand-secondary-dark',
-                    'btn-secondary-text-color' => '#FFFFFF',
-                    'btn-secondary-hover-text-color' => '@btn-secondary-text-color',
-                    'panel-header-bg' => '@gray-light',
-                    'panel-header-font-size' => '14',
-                    'panel-header-color' => '@text-color',
-                    'panel-border' => '@border-color',
-                    'panel-bg' => '#FFFFFF',
-                    'label-font-size' => '14',
-                    'label-color' => '@text-color',
-                    'input-font-size' => '14',
-                    'input-bg' => '@gray-light',
-                    'input-color' => '@brand-secondary',
-                    'input-placeholder-color' => 'lighten(@text-color, 15%)',
-                    'input-border' => '@border-color',
-                    'input-focus-bg' => '#FFFFFF',
-                    'input-focus-border' => '@brand-primary',
-                    'input-focus-color' => '@brand-secondary',
-                    'input-error-bg' => 'desaturate(lighten(@highlight-error, 38%), 20%)',
-                    'input-error-border' => '@highlight-error',
-                    'input-error-color' => '@highlight-error',
-                    'input-success-bg' => '#FFFFFF',
-                    'input-success-border' => '@highlight-success',
-                    'input-success-color' => '@brand-secondary-dark',
-                    'panel-table-header-bg' => '@panel-bg',
-                    'panel-table-header-color' => '@text-color-dark',
-                    'table-row-bg' => '#FFFFFF',
-                    'table-row-color' => '@brand-secondary',
-                    'table-row-highlight-bg' => 'darken(@table-row-bg, 4%)',
-                    'table-header-bg' => '@brand-secondary',
-                    'table-header-color' => '#FFFFFF',
-                    'badge-discount-bg' => '@highlight-error',
-                    'badge-discount-color' => '#FFFFFF',
-                    'badge-newcomer-bg' => '@highlight-notice',
-                    'badge-newcomer-color' => '#FFFFFF',
-                    'badge-recommendation-bg' => '@highlight-success',
-                    'badge-recommendation-color' => '#FFFFFF',
-                    'badge-download-bg' => '@highlight-info',
-                    'badge-download-color' => '#FFFFFF',
-                ],
+                'appleTouchIcon' => 'frontend/_public/src/img/apple-touch-icon-precomposed.png',
+                'desktopLogo' => 'frontend/_public/src/img/logos/logo--tablet.png',
+                'favicon' => 'frontend/_public/src/img/favicon.ico',
+                'mobileLogo' => 'frontend/_public/src/img/logos/logo--mobile.png',
+                'setPrecomposed' => true,
+                'tabletLandscapeLogo' => 'frontend/_public/src/img/logos/logo--tablet.png',
+                'tabletLogo' => 'frontend/_public/src/img/logos/logo--tablet.png',
+                'win8TileImage' => 'frontend/_public/src/img/win-tile-image.png',
+                'offcanvasCart' => true,
+                'offcanvasOverlayPage' => true,
+                'focusSearch' => false,
+                'displaySidebar' => true,
+                'sidebarFilter' => false,
+                'checkoutHeader' => true,
+                'checkoutFooter' => true,
+                'infiniteScrolling' => true,
+                'infiniteThreshold' => 4,
+                'lightboxZoomFactor' => 0,
+                'appleWebAppTitle' => '',
+                'ajaxVariantSwitch' => true,
+                'additionalCssData' => '',
+                'additionalJsLibraries' => '',
+                'brand-primary' => '#D9400B',
+                'brand-primary-light' => 'saturate(lighten(@brand-primary, 12%), 5%)',
+                'brand-secondary' => '#5F7285',
+                'brand-secondary-dark' => 'darken(@brand-secondary, 15%)',
+                'gray' => '#F5F5F8',
+                'gray-light' => 'lighten(@gray, 1%)',
+                'gray-dark' => 'darken(@gray-light, 10%)',
+                'border-color' => '@gray-dark',
+                'highlight-success' => '#2ECC71',
+                'highlight-error' => '#E74C3C',
+                'highlight-notice' => '#F1C40F',
+                'highlight-info' => '#4AA3DF',
+                'body-bg' => 'darken(@gray-light, 5%)',
+                'text-color' => '@brand-secondary',
+                'text-color-dark' => '@brand-secondary-dark',
+                'link-color' => '@brand-primary',
+                'link-hover-color' => 'darken(@link-color, 10%)',
+                'rating-star-color' => '@highlight-notice',
+                'overlay-bg' => '#000000',
+                'overlay-theme-dark-bg' => '@overlay-bg',
+                'overlay-theme-light-bg' => '#FFFFFF',
+                'overlay-opacity' => '0.7',
+                'font-base-stack' => '"Open Sans", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;',
+                'font-headline-stack' => '@font-base-stack',
+                'font-size-base' => '14',
+                'font-base-weight' => '500',
+                'font-light-weight' => '300',
+                'font-bold-weight' => '700',
+                'font-size-h1' => '26',
+                'font-size-h2' => '21',
+                'font-size-h3' => '18',
+                'font-size-h4' => '16',
+                'font-size-h5' => '@font-size-base',
+                'font-size-h6' => '12',
+                'btn-font-size' => '14',
+                'btn-icon-size' => '10',
+                'btn-default-top-bg' => '#FFFFFF',
+                'btn-default-bottom-bg' => '@gray-light',
+                'btn-default-hover-bg' => '#FFFFFF',
+                'btn-default-text-color' => '@text-color',
+                'btn-default-hover-text-color' => '@brand-primary',
+                'btn-default-border-color' => '@border-color',
+                'btn-default-hover-border-color' => '@brand-primary',
+                'btn-primary-top-bg' => '@brand-primary-light',
+                'btn-primary-bottom-bg' => '@brand-primary',
+                'btn-primary-hover-bg' => '@brand-primary',
+                'btn-primary-text-color' => '#FFFFFF',
+                'btn-primary-hover-text-color' => '@btn-primary-text-color',
+                'btn-secondary-top-bg' => '@brand-secondary',
+                'btn-secondary-bottom-bg' => '@brand-secondary-dark',
+                'btn-secondary-hover-bg' => '@brand-secondary-dark',
+                'btn-secondary-text-color' => '#FFFFFF',
+                'btn-secondary-hover-text-color' => '@btn-secondary-text-color',
+                'panel-header-bg' => '@gray-light',
+                'panel-header-font-size' => '14',
+                'panel-header-color' => '@text-color',
+                'panel-border' => '@border-color',
+                'panel-bg' => '#FFFFFF',
+                'label-font-size' => '14',
+                'label-color' => '@text-color',
+                'input-font-size' => '14',
+                'input-bg' => '@gray-light',
+                'input-color' => '@brand-secondary',
+                'input-placeholder-color' => 'lighten(@text-color, 15%)',
+                'input-border' => '@border-color',
+                'input-focus-bg' => '#FFFFFF',
+                'input-focus-border' => '@brand-primary',
+                'input-focus-color' => '@brand-secondary',
+                'input-error-bg' => 'desaturate(lighten(@highlight-error, 38%), 20%)',
+                'input-error-border' => '@highlight-error',
+                'input-error-color' => '@highlight-error',
+                'input-success-bg' => '#FFFFFF',
+                'input-success-border' => '@highlight-success',
+                'input-success-color' => '@brand-secondary-dark',
+                'panel-table-header-bg' => '@panel-bg',
+                'panel-table-header-color' => '@text-color-dark',
+                'table-row-bg' => '#FFFFFF',
+                'table-row-color' => '@brand-secondary',
+                'table-row-highlight-bg' => 'darken(@table-row-bg, 4%)',
+                'table-header-bg' => '@brand-secondary',
+                'table-header-color' => '#FFFFFF',
+                'badge-discount-bg' => '@highlight-error',
+                'badge-discount-color' => '#FFFFFF',
+                'badge-newcomer-bg' => '@highlight-notice',
+                'badge-newcomer-color' => '#FFFFFF',
+                'badge-recommendation-bg' => '@highlight-success',
+                'badge-recommendation-color' => '#FFFFFF',
+                'badge-download-bg' => '@highlight-info',
+                'badge-download-color' => '#FFFFFF',
+            ],
         ];
     }
 }
diff --git a/tests/Unit/Bundle/MediaBundle/CacheOptimizerServiceTest.php b/tests/Unit/Bundle/MediaBundle/CacheOptimizerServiceTest.php
index 949d195228d..a3586eb7c80 100644
--- a/tests/Unit/Bundle/MediaBundle/CacheOptimizerServiceTest.php
+++ b/tests/Unit/Bundle/MediaBundle/CacheOptimizerServiceTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\MediaBundle;
diff --git a/tests/Unit/Bundle/MediaBundle/CdnOptimizerServiceTest.php b/tests/Unit/Bundle/MediaBundle/CdnOptimizerServiceTest.php
index d33aaeca038..f9cce7fd4f0 100644
--- a/tests/Unit/Bundle/MediaBundle/CdnOptimizerServiceTest.php
+++ b/tests/Unit/Bundle/MediaBundle/CdnOptimizerServiceTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\MediaBundle;
diff --git a/tests/Unit/Bundle/MediaBundle/Commands/MediaOptimizeCommandTest.php b/tests/Unit/Bundle/MediaBundle/Commands/MediaOptimizeCommandTest.php
new file mode 100644
index 00000000000..e560bf54e07
--- /dev/null
+++ b/tests/Unit/Bundle/MediaBundle/Commands/MediaOptimizeCommandTest.php
@@ -0,0 +1,116 @@
+<?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Unit\Bundle\MediaBundle\Commands;
+
+use DateInterval;
+use DateTime;
+use Generator;
+use PHPUnit\Framework\TestCase;
+use ReflectionClass;
+use Shopware\Bundle\MediaBundle\Commands\MediaOptimizeCommand;
+use Shopware\Bundle\MediaBundle\MediaServiceInterface;
+use Shopware\Bundle\MediaBundle\OptimizerServiceInterface;
+use Shopware\Components\Filesystem\PrefixFilesystem;
+use Symfony\Component\Console\Helper\ProgressBar;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\NullOutput;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class MediaOptimizeCommandTest extends TestCase
+{
+    /**
+     * @dataProvider getFiles
+     *
+     * @param array<string, mixed> $file
+     * @param array<string, mixed> $optimizerParameter
+     */
+    public function testOptimizeFilesWithSetModifiedDate(array $file, int $expectedCount, array $optimizerParameter): void
+    {
+        // required as ProgressBar is a final class https://github.com/symfony/symfony/issues/24098
+        $progressBarMock = new ProgressBar(new NullOutput());
+
+        $datetime = new DateTime();
+        $datetime = $datetime->format('d-m-Y h:i:s');
+
+        $input = $this->getMockBuilder(InputInterface::class)->disableOriginalConstructor()->getMock();
+        $media = $this->getMockBuilder(MediaServiceInterface::class)->disableOriginalConstructor()->getMock();
+        $optimizer = $this->getMockBuilder(OptimizerServiceInterface::class)->disableOriginalConstructor()->getMock();
+        $output = $this->getMockBuilder(OutputInterface::class)->disableOriginalConstructor()->getMock();
+
+        $prefixSystem = $this->getMockBuilder(PrefixFilesystem::class)->disableOriginalConstructor()->getMock();
+
+        $media->method('getFilesystem')->willReturn($prefixSystem);
+
+        $prefixSystem->method('listContents')->willReturn([$file]);
+
+        $input->method('getOption')->willReturn($datetime);
+
+        $mediaCommand = new ReflectionClass(MediaOptimizeCommand::class);
+        $mediaCommandMethod = $mediaCommand->getMethod('optimizeFiles');
+        $mediaCommandMethod->setAccessible(true);
+
+        $output->method('getVerbosity')->willReturn(null);
+
+        $optimizer->expects(static::exactly($expectedCount))->method('optimize')->with(...$optimizerParameter)->willReturn(1);
+
+        $moc_instance = new MediaOptimizeCommand();
+
+        $mediaCommandMethod->invokeArgs($moc_instance, ['mock_dir', $input, $media, $optimizer, $progressBarMock, $output]);
+    }
+
+    public function getFiles(): Generator
+    {
+        yield 'Future date' => [
+            [
+                'type' => 'file',
+                'path' => 'media/image/39/c9/ee/grafik-20220712-084133RI1xVeZ6gUpof_1280x1280.png',
+                'timestamp' => (new DateTime())->add(DateInterval::createFromDateString('2 day'))->getTimestamp(),
+                'size' => 75541,
+                'dirname' => 'media/image/39/c9/ee',
+                'basename' => 'grafik-20220712-084133RI1xVeZ6gUpof_1280x1280.png',
+                'extension' => 'png',
+                'filename' => 'grafik-20220712-084133RI1xVeZ6gUpof_1280x1280',
+            ],
+            1,
+            ['media/image/39/c9/ee/grafik-20220712-084133RI1xVeZ6gUpof_1280x1280.png'],
+        ]
+        ;
+
+        yield 'Past date' => [
+            [
+                'type' => 'file',
+                'path' => 'media/image/39/c9/ee/grafik-20220712-084133RI1xVeZ6gUpof_1280x1280.png',
+                'timestamp' => (new DateTime())->sub(DateInterval::createFromDateString('2 day'))->getTimestamp(),
+                'size' => 75541,
+                'dirname' => 'media/image/39/c9/ee',
+                'basename' => 'grafik-20220712-084133RI1xVeZ6gUpof_1280x1280.png',
+                'extension' => 'png',
+                'filename' => 'grafik-20220712-084133RI1xVeZ6gUpof_1280x1280',
+            ],
+            0,
+            [],
+        ];
+    }
+}
diff --git a/tests/Unit/Bundle/MediaBundle/GarbageCollectorTest.php b/tests/Unit/Bundle/MediaBundle/GarbageCollectorTest.php
index 5262a77d562..90aa7306b10 100644
--- a/tests/Unit/Bundle/MediaBundle/GarbageCollectorTest.php
+++ b/tests/Unit/Bundle/MediaBundle/GarbageCollectorTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\MediaBundle;
diff --git a/tests/Unit/Bundle/MediaBundle/MediaExtensionMappingServiceTest.php b/tests/Unit/Bundle/MediaBundle/MediaExtensionMappingServiceTest.php
index d97c9c5b255..e8f7c975ef4 100644
--- a/tests/Unit/Bundle/MediaBundle/MediaExtensionMappingServiceTest.php
+++ b/tests/Unit/Bundle/MediaBundle/MediaExtensionMappingServiceTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\MediaBundle;
diff --git a/tests/Unit/Bundle/MediaBundle/OptimizerServiceTest.php b/tests/Unit/Bundle/MediaBundle/OptimizerServiceTest.php
index 203b20a8342..165b0c28d08 100644
--- a/tests/Unit/Bundle/MediaBundle/OptimizerServiceTest.php
+++ b/tests/Unit/Bundle/MediaBundle/OptimizerServiceTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\MediaBundle;
diff --git a/tests/Unit/Bundle/MediaBundle/Strategy/Md5StrategyTest.php b/tests/Unit/Bundle/MediaBundle/Strategy/Md5StrategyTest.php
index e5c925f6ff2..b5b1303b8dd 100644
--- a/tests/Unit/Bundle/MediaBundle/Strategy/Md5StrategyTest.php
+++ b/tests/Unit/Bundle/MediaBundle/Strategy/Md5StrategyTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\MediaBundle\Strategy;
diff --git a/tests/Unit/Bundle/MediaBundle/Strategy/PlainStrategyTest.php b/tests/Unit/Bundle/MediaBundle/Strategy/PlainStrategyTest.php
index f7c9f05d986..a222c0975d6 100644
--- a/tests/Unit/Bundle/MediaBundle/Strategy/PlainStrategyTest.php
+++ b/tests/Unit/Bundle/MediaBundle/Strategy/PlainStrategyTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\MediaBundle\Strategy;
diff --git a/tests/Unit/Bundle/OrderBundle/ShippingConstServiceTest.php b/tests/Unit/Bundle/OrderBundle/ShippingConstServiceTest.php
new file mode 100644
index 00000000000..52a4fc0d091
--- /dev/null
+++ b/tests/Unit/Bundle/OrderBundle/ShippingConstServiceTest.php
@@ -0,0 +1,75 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Unit\Bundle\OrderBundle;
+
+use Doctrine\DBAL\Connection;
+use PHPUnit\Framework\TestCase;
+use Shopware\Bundle\OrderBundle\Service\ShippingCostService;
+use Shopware\Models\Dispatch\Dispatch;
+
+class ShippingConstServiceTest extends TestCase
+{
+    public function testErrorIsThrownWithNotExistingTypeStrings(): void
+    {
+        $shippingConstService = new ShippingCostService($this->getConnectionMock());
+
+        $this->expectExceptionMessage('Shipping calculation type "99" not supported');
+        $shippingConstService->getShippingCostMultiplier(99, [], []);
+    }
+
+    public function testDefaultShippingCost(): void
+    {
+        $shippingConstService = new ShippingCostService($this->getConnectionMock());
+
+        static::assertSame(1.556, $shippingConstService->getShippingCostMultiplier(Dispatch::CALCULATION_WEIGHT, ['weight' => '1.55555'], []));
+    }
+
+    public function testPriceShippingCost(): void
+    {
+        $shippingConstService = new ShippingCostService($this->getConnectionMock());
+
+        static::assertSame(1.56, $shippingConstService->getShippingCostMultiplier(Dispatch::CALCULATION_PRICE, ['amount' => '1.55555'], []));
+    }
+
+    public function testNumberOfProductsPriceShippingCost(): void
+    {
+        $shippingConstService = new ShippingCostService($this->getConnectionMock());
+
+        static::assertSame(2.0, $shippingConstService->getShippingCostMultiplier(Dispatch::CALCULATION_NUMBER_OF_PRODUCTS, ['count_article' => '2.2'], []));
+    }
+
+    public function testCustomPriceShippingCost(): void
+    {
+        $shippingConstService = new ShippingCostService($this->getConnectionMock());
+
+        static::assertSame(2.22, $shippingConstService->getShippingCostMultiplier(Dispatch::CALCULATION_CUSTOM, ['calculation_value_1' => '2.222'], ['id' => '1']));
+    }
+
+    private function getConnectionMock(): Connection
+    {
+        return $this->getMockBuilder(Connection::class)->disableOriginalConstructor()->getMock();
+    }
+}
diff --git a/tests/Unit/Bundle/PluginInstallerBundle/Fixtures/TestPlugin/TestPlugin.php b/tests/Unit/Bundle/PluginInstallerBundle/Fixtures/TestPlugin/TestPlugin.php
index 315f38acf4b..40b1c43326b 100644
--- a/tests/Unit/Bundle/PluginInstallerBundle/Fixtures/TestPlugin/TestPlugin.php
+++ b/tests/Unit/Bundle/PluginInstallerBundle/Fixtures/TestPlugin/TestPlugin.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace TestPlugin;
diff --git a/tests/Unit/Bundle/PluginInstallerBundle/Fixtures/TestPlugin/plugin.xml b/tests/Unit/Bundle/PluginInstallerBundle/Fixtures/TestPlugin/plugin.xml
index 86baa7dc7c6..15ec076b6d0 100644
--- a/tests/Unit/Bundle/PluginInstallerBundle/Fixtures/TestPlugin/plugin.xml
+++ b/tests/Unit/Bundle/PluginInstallerBundle/Fixtures/TestPlugin/plugin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <plugin xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/shopware/shopware/5.3/engine/Shopware/Components/Plugin/schema/plugin.xsd">
+        xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/shopware5/shopware/5.3/engine/Shopware/Components/Plugin/schema/plugin.xsd">
     <label>TestPlugin</label>
 
     <version>1.0.0</version>
diff --git a/tests/Unit/Bundle/PluginInstallerBundle/Service/PluginInstallerTest.php b/tests/Unit/Bundle/PluginInstallerBundle/Service/PluginInstallerTest.php
index 9ed64036afb..11e066126f6 100644
--- a/tests/Unit/Bundle/PluginInstallerBundle/Service/PluginInstallerTest.php
+++ b/tests/Unit/Bundle/PluginInstallerBundle/Service/PluginInstallerTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\PluginInstallerBundle\Service;
@@ -45,6 +44,7 @@ class PluginInstallerTest extends TestCase
     public function testRefreshPluginList(): void
     {
         $dateTime = new DateTimeImmutable();
+        $dateTimeString = $dateTime->format('Y-m-d H:i:s');
 
         $expectedData = [
             'namespace' => 'ShopwarePlugins',
@@ -54,18 +54,18 @@ public function testRefreshPluginList(): void
             'link' => null,
             'label' => 'TestPlugin',
             'description' => null,
-            'capability_update' => true,
-            'capability_install' => true,
-            'capability_enable' => true,
-            'capability_secure_uninstall' => true,
-            'refresh_date' => $dateTime,
+            'capability_update' => 1,
+            'capability_install' => 1,
+            'capability_enable' => 1,
+            'capability_secure_uninstall' => 1,
+            'refresh_date' => $dateTimeString,
             'translations' => '{"en":{"label":"TestPlugin"}}',
             'changes' => null,
-            'added' => $dateTime,
+            'added' => $dateTimeString,
         ];
 
         $connection = $this->createMock(Connection::class);
-        $connection->expects(static::once())->method('fetchAssoc')->willReturn(null);
+        $connection->expects(static::once())->method('fetchAssociative')->willReturn(null);
         $connection->expects(static::once())->method('insert')->with('s_core_plugins', $expectedData, [
             'added' => 'datetime',
             'refresh_date' => 'datetime',
diff --git a/tests/Unit/Bundle/PluginInstallerBundle/UniqueIdGenerator/UniqueIdGeneratorTest.php b/tests/Unit/Bundle/PluginInstallerBundle/UniqueIdGenerator/UniqueIdGeneratorTest.php
index cc21bf224fa..3efc3448391 100644
--- a/tests/Unit/Bundle/PluginInstallerBundle/UniqueIdGenerator/UniqueIdGeneratorTest.php
+++ b/tests/Unit/Bundle/PluginInstallerBundle/UniqueIdGenerator/UniqueIdGeneratorTest.php
@@ -1,51 +1,55 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
+namespace Shopware\Tests\Unit\Bundle\PluginInstallerBundle\UniqueIdGenerator;
+
+use Doctrine\DBAL\Connection;
 use PHPUnit\Framework\TestCase;
-use Shopware\Bundle\PluginInstallerBundle\Service\UniqueIdGenerator;
+use Shopware\Bundle\PluginInstallerBundle\Service\UniqueIdGenerator\UniqueIdGenerator;
 
 class UniqueIdGeneratorTest extends TestCase
 {
     /**
      * Tests if an existing unique id is returned and not stored again.
      */
-    public function testReturnUniqueIdFromDb()
+    public function testReturnUniqueIdFromDb(): void
     {
-        $connectionMock = $this->getMockBuilder(\Doctrine\DBAL\Connection::class)
+        $connectionMock = $this->getMockBuilder(Connection::class)
             ->disableOriginalConstructor()
-            ->setMethods(['fetchColumn', 'executeUpdate'])
+            ->onlyMethods(['fetchOne', 'executeStatement'])
             ->getMock();
 
-        $connectionMock->expects(static::exactly(1))
-            ->method('fetchColumn')
+        $connectionMock->expects(static::once())
+            ->method('fetchOne')
             ->willReturn('s:32:"xErV4zUsI28DVKfayeIB6rqIOBjR8OEB";');
 
         $connectionMock->expects(static::exactly(0))
-            ->method('executeUpdate')
+            ->method('executeStatement')
             ->willReturn(true);
 
-        $dbStorage = new UniqueIdGenerator\UniqueIdGenerator(
+        $dbStorage = new UniqueIdGenerator(
             $connectionMock
         );
 
@@ -56,22 +60,22 @@ public function testReturnUniqueIdFromDb()
      * Tests if all necessary methods are called to check for an old id in the db
      * and generate & store a new one if none exists.
      */
-    public function testStoringGeneratedIdInDb()
+    public function testStoringGeneratedIdInDb(): void
     {
-        $connectionMock = $this->getMockBuilder(\Doctrine\DBAL\Connection::class)
+        $connectionMock = $this->getMockBuilder(Connection::class)
             ->disableOriginalConstructor()
-            ->setMethods(['fetchColumn', 'executeUpdate'])
+            ->onlyMethods(['fetchOne', 'executeStatement'])
             ->getMock();
 
         $connectionMock->expects(static::exactly(2))
-            ->method('fetchColumn')
+            ->method('fetchOne')
             ->willReturn(null);
 
-        $connectionMock->expects(static::exactly(1))
-            ->method('executeUpdate')
+        $connectionMock->expects(static::once())
+            ->method('executeStatement')
             ->willReturn(true);
 
-        $dbStorage = new UniqueIdGenerator\UniqueIdGenerator(
+        $dbStorage = new UniqueIdGenerator(
             $connectionMock
         );
 
diff --git a/tests/Unit/Bundle/SearchBundle/BatchProductNumberSearchTest.php b/tests/Unit/Bundle/SearchBundle/BatchProductNumberSearchTest.php
index e13f29b1847..14f874c0769 100644
--- a/tests/Unit/Bundle/SearchBundle/BatchProductNumberSearchTest.php
+++ b/tests/Unit/Bundle/SearchBundle/BatchProductNumberSearchTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\SearchBundle;
diff --git a/tests/Unit/Bundle/SearchBundle/BatchProductSearchTest.php b/tests/Unit/Bundle/SearchBundle/BatchProductSearchTest.php
index b520e616c89..e8e36b91713 100644
--- a/tests/Unit/Bundle/SearchBundle/BatchProductSearchTest.php
+++ b/tests/Unit/Bundle/SearchBundle/BatchProductSearchTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\SearchBundle;
diff --git a/tests/Unit/Bundle/SearchBundle/CriteriaTest.php b/tests/Unit/Bundle/SearchBundle/CriteriaTest.php
index c1431e7598c..bab4d771fa1 100644
--- a/tests/Unit/Bundle/SearchBundle/CriteriaTest.php
+++ b/tests/Unit/Bundle/SearchBundle/CriteriaTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\SearchBundle;
diff --git a/tests/Unit/Bundle/SearchBundleDBAL/SearchTerm/TermHelperTest.php b/tests/Unit/Bundle/SearchBundleDBAL/SearchTerm/TermHelperTest.php
index 0ace0a2bd1e..335c9023575 100644
--- a/tests/Unit/Bundle/SearchBundleDBAL/SearchTerm/TermHelperTest.php
+++ b/tests/Unit/Bundle/SearchBundleDBAL/SearchTerm/TermHelperTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\SearchBundleDBAL\SearchTerm;
diff --git a/tests/Unit/Bundle/SitemapBundle/Service/FilterContainerFactoryTest.php b/tests/Unit/Bundle/SitemapBundle/Service/FilterContainerFactoryTest.php
index ff3aa0a72a9..cc71b09da97 100644
--- a/tests/Unit/Bundle/SitemapBundle/Service/FilterContainerFactoryTest.php
+++ b/tests/Unit/Bundle/SitemapBundle/Service/FilterContainerFactoryTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\SitemapBundle\Service;
diff --git a/tests/Unit/Bundle/SitemapBundle/Service/UrlFilterTest.php b/tests/Unit/Bundle/SitemapBundle/Service/UrlFilterTest.php
index d17ea33c2ca..233ab27700c 100644
--- a/tests/Unit/Bundle/SitemapBundle/Service/UrlFilterTest.php
+++ b/tests/Unit/Bundle/SitemapBundle/Service/UrlFilterTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\SitemapBundle\Service;
diff --git a/tests/Unit/Bundle/SitemapBundle/SitemapListenerTest.php b/tests/Unit/Bundle/SitemapBundle/SitemapListenerTest.php
index faea0f1d40d..d17607f2c8d 100644
--- a/tests/Unit/Bundle/SitemapBundle/SitemapListenerTest.php
+++ b/tests/Unit/Bundle/SitemapBundle/SitemapListenerTest.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\SitemapBundle;
@@ -29,26 +30,16 @@
 use Shopware\Bundle\MediaBundle\Adapters\LocalAdapterFactory;
 use Shopware\Bundle\SitemapBundle\Service\SitemapLister;
 use Shopware\Bundle\SitemapBundle\Service\SitemapNameGenerator;
-use Shopware\Bundle\SitemapBundle\Struct\Sitemap;
 use Shopware\Components\DependencyInjection\Container;
 use Shopware\Components\Filesystem\PublicUrlGenerator;
 
 class SitemapListenerTest extends TestCase
 {
-    /**
-     * @var SitemapLister
-     */
-    private $listener;
+    private SitemapLister $listener;
 
-    /**
-     * @var SitemapNameGenerator
-     */
-    private $generator;
+    private SitemapNameGenerator $generator;
 
-    /**
-     * @var Filesystem
-     */
-    private $fs;
+    private Filesystem $fileSystem;
 
     protected function setUp(): void
     {
@@ -56,38 +47,37 @@ protected function setUp(): void
 
         $factory = new LocalAdapterFactory();
 
-        $this->fs = new Filesystem($factory->create([
+        $this->fileSystem = new Filesystem($factory->create([
             'root' => sys_get_temp_dir(),
         ]));
 
-        $this->sitemapFolder = __DIR__ . '/sitemap';
-        $this->generator = new SitemapNameGenerator($this->fs);
+        $this->generator = new SitemapNameGenerator($this->fileSystem);
 
         $generator = new PublicUrlGenerator(new Container(), '', 'https//foo.de', 'foo');
-        $this->listener = new SitemapLister($this->fs, $generator);
+        $this->listener = new SitemapLister($this->fileSystem, $generator);
     }
 
     protected function tearDown(): void
     {
         parent::tearDown();
-        $this->fs->deleteDir('shop-1');
-        $this->fs->deleteDir('shop-2');
+        $this->fileSystem->deleteDir('shop-1');
+        $this->fileSystem->deleteDir('shop-2');
     }
 
-    public function testListEmptyFolder()
+    public function testListEmptyFolder(): void
     {
         static::assertEmpty($this->listener->getSitemaps(1));
     }
 
-    public function testListWithSitemap()
+    public function testListWithSitemap(): void
     {
         $file = $this->generator->getSitemapFilename(1);
-        $this->fs->write($file, '');
+        $this->fileSystem->write($file, '');
 
         $sitemaps = $this->listener->getSitemaps(1);
         static::assertNotEmpty($sitemaps);
 
-        static::assertInstanceOf(Sitemap::class, $sitemaps[0]);
+        static::assertStringStartsWith('foo/', $sitemaps[0]->getFilename());
 
         // Subshop specific sitemaps
         static::assertEmpty($this->listener->getSitemaps(2));
diff --git a/tests/Unit/Bundle/SitemapBundle/SitemapLockTest.php b/tests/Unit/Bundle/SitemapBundle/SitemapLockTest.php
index 6c156f7338f..baf4bb2eadf 100644
--- a/tests/Unit/Bundle/SitemapBundle/SitemapLockTest.php
+++ b/tests/Unit/Bundle/SitemapBundle/SitemapLockTest.php
@@ -1,31 +1,34 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\SitemapBundle;
 
 use DateTime;
+use DateTimeInterface;
 use DateTimeZone;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shopware\Bundle\SitemapBundle\Service\SitemapLock;
 use Shopware\Bundle\StoreFrontBundle\Service\Core\CoreCache;
@@ -34,14 +37,11 @@
 class SitemapLockTest extends TestCase
 {
     /**
-     * @var CoreCache
+     * @var CoreCache&MockObject
      */
-    private $cacheMock;
+    private CoreCache $cacheMock;
 
-    /**
-     * @var int
-     */
-    private $lifeTime;
+    private int $lifeTime;
 
     public function setUp(): void
     {
@@ -49,23 +49,16 @@ public function setUp(): void
 
         $this->lifeTime = 3600;
 
-        $data = sprintf('Locked: %s', (new DateTime('NOW', new DateTimeZone('UTC')))->format(DateTime::ATOM));
-
-        $this->cacheMock = $this->getMockBuilder(\Shopware\Bundle\StoreFrontBundle\Service\Core\CoreCache::class)
+        $this->cacheMock = $this->getMockBuilder(CoreCache::class)
             ->disableOriginalConstructor()
-            ->setMethods(['save', 'fetch'])
             ->getMock();
 
         $this->cacheMock->method('fetch')
             ->with('sitemap-exporter-running-1')
             ->willReturn(false);
-
-        $this->cacheMock->method('save')
-            ->with('sitemap-exporter-running-1', $data, $this->lifeTime)
-            ->willReturn(false);
     }
 
-    public function testAcquireLockDefaultFalse()
+    public function testAcquireLockDefaultFalse(): void
     {
         $shop = new ShopMock();
         $shop->id = 1;
@@ -74,8 +67,13 @@ public function testAcquireLockDefaultFalse()
         static::assertFalse($lock->isLocked($shop));
     }
 
-    public function testAcquireLockWorks()
+    public function testAcquireLockWorks(): void
     {
+        $data = \sprintf('Locked: %s', (new DateTime('NOW', new DateTimeZone('UTC')))->format(DateTimeInterface::ATOM));
+        $this->cacheMock->method('save')
+            ->with('sitemap-exporter-running-1', $data, $this->lifeTime)
+            ->willReturn(false);
+
         $shop = new ShopMock();
         $shop->id = 1;
 
diff --git a/tests/Unit/Bundle/SitemapBundle/SitemapNameGeneratorTest.php b/tests/Unit/Bundle/SitemapBundle/SitemapNameGeneratorTest.php
index 08266de2278..81fe42c15e8 100644
--- a/tests/Unit/Bundle/SitemapBundle/SitemapNameGeneratorTest.php
+++ b/tests/Unit/Bundle/SitemapBundle/SitemapNameGeneratorTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\SitemapBundle;
diff --git a/tests/Unit/Bundle/SitemapBundle/UrlFilter/BaseTest.php b/tests/Unit/Bundle/SitemapBundle/UrlFilter/BaseTest.php
index 38c230c8a28..f81519db15c 100644
--- a/tests/Unit/Bundle/SitemapBundle/UrlFilter/BaseTest.php
+++ b/tests/Unit/Bundle/SitemapBundle/UrlFilter/BaseTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\SitemapBundle\UrlFilter;
diff --git a/tests/Unit/Bundle/SitemapBundle/UrlFilter/Example.php b/tests/Unit/Bundle/SitemapBundle/UrlFilter/Example.php
index 74c3e3da25f..8cb69bcde3e 100644
--- a/tests/Unit/Bundle/SitemapBundle/UrlFilter/Example.php
+++ b/tests/Unit/Bundle/SitemapBundle/UrlFilter/Example.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\SitemapBundle\UrlFilter;
diff --git a/tests/Unit/Bundle/StoreFrontBundle/Gateway/Dbal/ProductHydratorTest.php b/tests/Unit/Bundle/StoreFrontBundle/Gateway/Dbal/ProductHydratorTest.php
new file mode 100644
index 00000000000..a8ba4e4ece1
--- /dev/null
+++ b/tests/Unit/Bundle/StoreFrontBundle/Gateway/Dbal/ProductHydratorTest.php
@@ -0,0 +1,127 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Unit\Bundle\StoreFrontBundle\Gateway\Dbal;
+
+use DateTimeInterface;
+use Generator;
+use PHPUnit\Framework\TestCase;
+use ReflectionClass;
+use Shopware\Bundle\MediaBundle\MediaServiceInterface;
+use Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator\AttributeHydrator;
+use Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator\EsdHydrator;
+use Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator\ManufacturerHydrator;
+use Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator\ProductHydrator;
+use Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator\TaxHydrator;
+use Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator\UnitHydrator;
+use Shopware\Bundle\StoreFrontBundle\Struct\ListProduct;
+
+class ProductHydratorTest extends TestCase
+{
+    /**
+     * @dataProvider assignProductDataTestDataProvider
+     *
+     * @param array<string,mixed> $data
+     */
+    public function testAssignProductData(array $data): void
+    {
+        $listProduct = new ListProduct(1, 1, '');
+        $productHydrator = $this->getProductHydrator();
+        $reflectionMethod = (new ReflectionClass(ProductHydrator::class))->getMethod('assignProductData');
+        $reflectionMethod->setAccessible(true);
+
+        $reflectionMethod->invokeArgs($productHydrator, [$listProduct, $data]);
+
+        static::assertSame($data['__product_name'], $listProduct->getName(), '__product_name');
+        static::assertSame($data['__product_description'], $listProduct->getShortDescription(), '__product_description');
+        static::assertSame($data['__product_description_long'], $listProduct->getLongDescription(), '__product_description_long');
+        static::assertSame($data['__product_metaTitle'], $listProduct->getMetaTitle(), '__product_metaTitle');
+        static::assertSame($data['__product_keywords'], $listProduct->getKeywords(), '__product_keywords');
+        static::assertSame($data['__product_template'], $listProduct->getTemplate(), '__product_template');
+        static::assertSame($data['__product_has_esd'], $listProduct->hasEsd(), '__product_has_esd');
+        static::assertSame($data['__product_pricegroupActive'], $listProduct->isPriceGroupActive(), '__product_pricegroupActive');
+        static::assertSame($data['__topSeller_sales'], $listProduct->getSales(), '');
+        static::assertSame($data['__variant_shippingfree'], $listProduct->isShippingFree(), '__topSeller_sales');
+        static::assertSame($data['__variant_instock'], $listProduct->getStock(), '__variant_instock');
+        static::assertSame($data['__product_main_detail_id'], $listProduct->getMainVariantId(), '__product_main_detail_id');
+        static::assertSame($data['__variant_shippingtime'], $listProduct->getShippingTime(), '__variant_shippingtime');
+        static::assertSame($data['__variant_releasedate'], $listProduct->getReleaseDate(), '__variant_releasedate');
+        static::assertSame($data['__product_datum'], $this->getFormatedDateTime($listProduct->getCreatedAt()), '__product_datum');
+        static::assertSame($data['__product_changetime'], $this->getFormatedDateTime($listProduct->getUpdatedAt()), '__product_changetime');
+        static::assertSame($data['__variant_additionaltext'], $listProduct->getAdditional(), '__variant_additionaltext');
+        static::assertSame($data['__variant_ean'], $listProduct->getEan(), '__variant_ean');
+        static::assertSame($data['__variant_height'], $listProduct->getHeight(), '__variant_height');
+        static::assertSame($data['__variant_length'], $listProduct->getLength(), '__variant_length');
+        static::assertSame($data['__variant_stockmin'], $listProduct->getMinStock(), '__variant_stockmin');
+        static::assertSame($data['__variant_weight'], $listProduct->getWeight(), '__variant_weight');
+        static::assertSame($data['__variant_width'], $listProduct->getWidth(), '__variant_width');
+        static::assertSame($data['__product_has_available_variants'], $listProduct->hasAvailableVariant(), '__product_has_available_variants');
+        static::assertSame($data['__product_fallback_price_count'], $listProduct->getFallbackPriceCount(), '__product_fallback_price_count');
+
+        static::assertSame($data['EXPECTED__product_blocked_customer_groups'], $listProduct->getBlockedCustomerGroupIds(), 'EXPECTED__product_blocked_customer_groups');
+    }
+
+    /**
+     * @return Generator<string,array<int,mixed>>
+     */
+    public function assignProductDataTestDataProvider(): Generator
+    {
+        $productData = require_once __DIR__ . '/_fixtures/ProductData.php';
+
+        yield 'Blocked customer groups is empty string' => [
+            $productData['blocked_customer_groups_is_empty_string'],
+        ];
+
+        yield 'Blocked customer groups is null' => [
+            $productData['blocked_customer_groups_is_null'],
+        ];
+
+        yield 'With blocked customer groups' => [
+            $productData['with_blocked_customer_groups'],
+        ];
+    }
+
+    private function getFormatedDateTime(?DateTimeInterface $dateTime): ?string
+    {
+        if (!$dateTime instanceof DateTimeInterface) {
+            return null;
+        }
+
+        return $dateTime->format('Y-m-d');
+    }
+
+    private function getProductHydrator(): ProductHydrator
+    {
+        $attributeHydrator = new AttributeHydrator();
+
+        return new ProductHydrator(
+            $attributeHydrator,
+            new ManufacturerHydrator($attributeHydrator, $this->createMock(MediaServiceInterface::class)),
+            new TaxHydrator(),
+            new UnitHydrator(),
+            new EsdHydrator($attributeHydrator)
+        );
+    }
+}
diff --git a/tests/Unit/Bundle/StoreFrontBundle/Gateway/Dbal/_fixtures/ProductData.php b/tests/Unit/Bundle/StoreFrontBundle/Gateway/Dbal/_fixtures/ProductData.php
new file mode 100644
index 00000000000..1a6ed84387f
--- /dev/null
+++ b/tests/Unit/Bundle/StoreFrontBundle/Gateway/Dbal/_fixtures/ProductData.php
@@ -0,0 +1,142 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+return [
+    'blocked_customer_groups_is_empty_string' => [
+        '__product_name' => 'First product',
+        '__product_description' => 'First product description',
+        '__product_description_long' => 'First product description long',
+        '__product_laststock' => false,
+        '__product_metaTitle' => 'First product',
+        '__product_filtergroupID' => 0,
+        '__product_topseller' => false,
+        '__product_notification' => false,
+        '__product_keywords' => 'first fast loud',
+        '__product_template' => '',
+        '__product_configurator_set_id' => 0,
+        '__product_has_esd' => false,
+        '__product_pricegroupActive' => false,
+        '__topSeller_sales' => 0,
+        '__variant_shippingfree' => false,
+        '__variant_instock' => 1000,
+        '__variant_suppliernumber' => '100',
+        '__product_main_detail_id' => 1,
+        '__variant_shippingtime' => 3,
+        '__product_shippingtime' => 3,
+        '__variant_releasedate' => null,
+        '__product_datum' => '1970-01-01',
+        '__product_changetime' => '1970-01-01',
+        '__variant_additionaltext' => 'First product variant additionaltext',
+        '__variant_ean' => 'EAN-SW00001',
+        '__variant_height' => 0.0,
+        '__variant_length' => 0.0,
+        '__variant_stockmin' => 10,
+        '__variant_weight' => 0.0,
+        '__variant_width' => 0.0,
+        '__product_blocked_customer_groups' => '',
+        'EXPECTED__product_blocked_customer_groups' => [],
+        '__product_has_available_variants' => true,
+        '__product_fallback_price_count' => 10,
+        '__product_custom_price_count' => 11,
+    ],
+    'blocked_customer_groups_is_null' => [
+        '__product_name' => 'Second product',
+        '__product_description' => 'Second product description',
+        '__product_description_long' => 'Second product description long',
+        '__product_laststock' => false,
+        '__product_metaTitle' => 'Second product',
+        '__product_filtergroupID' => 0,
+        '__product_topseller' => false,
+        '__product_notification' => false,
+        '__product_keywords' => 'second fast loud',
+        '__product_template' => '',
+        '__product_configurator_set_id' => 0,
+        '__product_has_esd' => false,
+        '__product_pricegroupActive' => false,
+        '__topSeller_sales' => 0,
+        '__variant_shippingfree' => false,
+        '__variant_instock' => 1000,
+        '__variant_suppliernumber' => '100',
+        '__product_main_detail_id' => 1,
+        '__variant_shippingtime' => 3,
+        '__product_shippingtime' => 3,
+        '__variant_releasedate' => null,
+        '__product_datum' => '1970-01-01',
+        '__product_changetime' => '1970-01-01',
+        '__variant_additionaltext' => 'Second product variant additionaltext',
+        '__variant_ean' => 'EAN-SW00001',
+        '__variant_height' => 0.0,
+        '__variant_length' => 0.0,
+        '__variant_stockmin' => 10,
+        '__variant_weight' => 0.0,
+        '__variant_width' => 0.0,
+        '__product_blocked_customer_groups' => null,
+        'EXPECTED__product_blocked_customer_groups' => [],
+        '__product_has_available_variants' => true,
+        '__product_fallback_price_count' => 10,
+        '__product_custom_price_count' => 11,
+    ],
+    'with_blocked_customer_groups' => [
+        '__product_name' => 'Third product',
+        '__product_description' => 'Third product description',
+        '__product_description_long' => 'Third product description long',
+        '__product_laststock' => false,
+        '__product_metaTitle' => 'Third product',
+        '__product_filtergroupID' => 0,
+        '__product_topseller' => false,
+        '__product_notification' => false,
+        '__product_keywords' => 'Third fast loud',
+        '__product_template' => '',
+        '__product_configurator_set_id' => 0,
+        '__product_has_esd' => false,
+        '__product_pricegroupActive' => false,
+        '__topSeller_sales' => 0,
+        '__variant_shippingfree' => false,
+        '__variant_instock' => 1000,
+        '__variant_suppliernumber' => '100',
+        '__product_main_detail_id' => 2,
+        '__variant_shippingtime' => 3,
+        '__product_shippingtime' => 3,
+        '__variant_releasedate' => null,
+        '__product_datum' => '1970-01-01',
+        '__product_changetime' => '1970-01-01',
+        '__variant_additionaltext' => 'Third product variant additionaltext',
+        '__variant_ean' => 'EAN-SW00002',
+        '__variant_height' => 0.0,
+        '__variant_length' => 0.0,
+        '__variant_stockmin' => 10,
+        '__variant_weight' => 0.0,
+        '__variant_width' => 0.0,
+        '__product_blocked_customer_groups' => '1|2|3',
+        'EXPECTED__product_blocked_customer_groups' => [
+            '1',
+            '2',
+            '3',
+        ],
+        '__product_has_available_variants' => true,
+        '__product_fallback_price_count' => 10,
+        '__product_custom_price_count' => 11,
+    ],
+];
diff --git a/tests/Unit/Bundle/StoreFrontBundle/Service/BlogServiceTest.php b/tests/Unit/Bundle/StoreFrontBundle/Service/BlogServiceTest.php
index b078be09955..7cc243d28d9 100644
--- a/tests/Unit/Bundle/StoreFrontBundle/Service/BlogServiceTest.php
+++ b/tests/Unit/Bundle/StoreFrontBundle/Service/BlogServiceTest.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\StoreFrontBundle\Service;
diff --git a/tests/Unit/Bundle/StoreFrontBundle/Service/ConfiguratorServiceTest.php b/tests/Unit/Bundle/StoreFrontBundle/Service/ConfiguratorServiceTest.php
new file mode 100644
index 00000000000..537224f76a5
--- /dev/null
+++ b/tests/Unit/Bundle/StoreFrontBundle/Service/ConfiguratorServiceTest.php
@@ -0,0 +1,421 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Unit\Bundle\StoreFrontBundle\Service;
+
+use PHPUnit\Framework\TestCase;
+use Shopware\Bundle\StoreFrontBundle\Gateway\ConfiguratorGatewayInterface;
+use Shopware\Bundle\StoreFrontBundle\Gateway\ProductConfigurationGatewayInterface;
+use Shopware\Bundle\StoreFrontBundle\Service\Core\ConfiguratorService;
+use Shopware\Bundle\StoreFrontBundle\Struct\BaseProduct;
+use Shopware\Bundle\StoreFrontBundle\Struct\Configurator\Group;
+use Shopware\Bundle\StoreFrontBundle\Struct\Configurator\Option;
+use Shopware\Bundle\StoreFrontBundle\Struct\ShopContextInterface;
+use Shopware\Models\Article\Configurator\Set;
+
+class ConfiguratorServiceTest extends TestCase
+{
+    public function testNonActiveVariantsAreProperlySet(): void
+    {
+        $setMock = $this->createMocks();
+
+        $productConfigurationGateway = $this->getMockForAbstractClass(ProductConfigurationGatewayInterface::class);
+        $configurationGateway = $this->getMockForAbstractClass(ConfiguratorGatewayInterface::class);
+        $configurationGateway->method('get')->willReturn($setMock);
+        $configurationGateway->method('getAvailableConfigurations')->willReturn([
+            11 => [[
+                11, 22, 33, 35,
+            ]],
+            22 => [[
+                22, 11, 12, 33, 35,
+            ]],
+            33 => [[
+                33, 22, 11, 12,
+            ]],
+            12 => [[
+                12, 22, 33,
+            ]],
+            35 => [[
+                35, 11, 22,
+            ]],
+        ]);
+
+        $shopContext = $this->getMockForAbstractClass(ShopContextInterface::class);
+        $configuratorService = new ConfiguratorService($productConfigurationGateway, $configurationGateway);
+
+        $baseProduct = new BaseProduct(1, 1, 'sw100');
+
+        $configurator = $configuratorService->getProductConfigurator($baseProduct, $shopContext, [1 => 11, 2 => 22, 3 => 33]);
+
+        $configuratorGroups = $configurator->getGroups();
+        $configuratorGroupOptionsOne = $configuratorGroups[0]->getOptions();
+        static::assertTrue($configuratorGroupOptionsOne[0]->isSelected());
+        static::assertTrue($configuratorGroupOptionsOne[0]->getActive());
+
+        static::assertFalse($configuratorGroupOptionsOne[1]->isSelected());
+        static::assertTrue($configuratorGroupOptionsOne[1]->getActive());
+
+        static::assertFalse($configuratorGroupOptionsOne[2]->getActive());
+
+        $configuratorGroupOptionsTwo = $configuratorGroups[1]->getOptions();
+        static::assertTrue($configuratorGroupOptionsTwo[0]->isSelected());
+        static::assertTrue($configuratorGroupOptionsTwo[0]->getActive());
+        static::assertFalse($configuratorGroupOptionsTwo[1]->getActive());
+        static::assertFalse($configuratorGroupOptionsTwo[2]->getActive());
+
+        $configuratorGroupOptionsThree = $configuratorGroups[2]->getOptions();
+        static::assertTrue($configuratorGroupOptionsThree[0]->isSelected());
+        static::assertTrue($configuratorGroupOptionsThree[0]->getActive());
+
+        static::assertFalse($configuratorGroupOptionsThree[1]->getActive());
+        static::assertTrue($configuratorGroupOptionsThree[2]->getActive());
+    }
+
+    public function testNonActiveVariantsAreProperlySetWithDifferentSelection(): void
+    {
+        $setMock = $this->createMocks();
+
+        $productConfigurationGateway = $this->getMockForAbstractClass(ProductConfigurationGatewayInterface::class);
+        $configurationGateway = $this->getMockForAbstractClass(ConfiguratorGatewayInterface::class);
+        $configurationGateway->method('get')->willReturn($setMock);
+        $configurationGateway->method('getAvailableConfigurations')->willReturn([
+            11 => [[
+                11, 22, 33, 35,
+            ]],
+            22 => [[
+                22, 11, 12, 33, 35,
+            ]],
+            33 => [[
+                33, 22, 11, 12,
+            ]],
+            12 => [[
+                12, 22, 33,
+            ]],
+            35 => [[
+                35, 11, 22,
+            ]],
+        ]);
+
+        $shopContext = $this->getMockForAbstractClass(ShopContextInterface::class);
+        $configuratorService = new ConfiguratorService($productConfigurationGateway, $configurationGateway);
+
+        $baseProduct = new BaseProduct(1, 1, 'sw100');
+
+        $configurator = $configuratorService->getProductConfigurator($baseProduct, $shopContext, [1 => 11, 2 => 22, 3 => 35]);
+
+        $configuratorGroups = $configurator->getGroups();
+        $configuratorGroupOptionsOne = $configuratorGroups[0]->getOptions();
+        static::assertTrue($configuratorGroupOptionsOne[0]->isSelected());
+        static::assertTrue($configuratorGroupOptionsOne[0]->getActive());
+
+        static::assertFalse($configuratorGroupOptionsOne[1]->isSelected());
+        static::assertFalse($configuratorGroupOptionsOne[1]->getActive());
+
+        static::assertFalse($configuratorGroupOptionsOne[2]->getActive());
+
+        $configuratorGroupOptionsTwo = $configuratorGroups[1]->getOptions();
+        static::assertTrue($configuratorGroupOptionsTwo[0]->isSelected());
+        static::assertTrue($configuratorGroupOptionsTwo[0]->getActive());
+        static::assertFalse($configuratorGroupOptionsTwo[1]->getActive());
+        static::assertFalse($configuratorGroupOptionsTwo[2]->getActive());
+
+        $configuratorGroupOptionsThree = $configuratorGroups[2]->getOptions();
+        static::assertFalse($configuratorGroupOptionsThree[0]->isSelected());
+        static::assertTrue($configuratorGroupOptionsThree[0]->getActive());
+
+        static::assertFalse($configuratorGroupOptionsThree[1]->getActive());
+        static::assertTrue($configuratorGroupOptionsThree[2]->getActive());
+        static::assertTrue($configuratorGroupOptionsThree[2]->isSelected());
+    }
+
+    public function testNonActiveVariantsAreProperlySetWithLessSelection(): void
+    {
+        $setMock = $this->createMocks();
+
+        $productConfigurationGateway = $this->getMockForAbstractClass(ProductConfigurationGatewayInterface::class);
+        $configurationGateway = $this->getMockForAbstractClass(ConfiguratorGatewayInterface::class);
+        $configurationGateway->method('get')->willReturn($setMock);
+        $configurationGateway->method('getAvailableConfigurations')->willReturn([
+            11 => [[
+                11, 22, 33, 35,
+            ]],
+            22 => [[
+                22, 11, 12, 33, 35,
+            ]],
+            33 => [[
+                33, 22, 11, 12,
+            ]],
+            12 => [[
+                12, 22, 33,
+            ]],
+            35 => [[
+                35, 11, 22,
+            ]],
+        ]);
+
+        $shopContext = $this->getMockForAbstractClass(ShopContextInterface::class);
+        $configuratorService = new ConfiguratorService($productConfigurationGateway, $configurationGateway);
+
+        $baseProduct = new BaseProduct(1, 1, 'sw100');
+
+        $configurator = $configuratorService->getProductConfigurator($baseProduct, $shopContext, [1 => 12, 2 => 22]);
+
+        $configuratorGroups = $configurator->getGroups();
+        $configuratorGroupOptionsOne = $configuratorGroups[0]->getOptions();
+        static::assertFalse($configuratorGroupOptionsOne[0]->isSelected());
+        static::assertTrue($configuratorGroupOptionsOne[0]->getActive());
+
+        static::assertTrue($configuratorGroupOptionsOne[1]->isSelected());
+        static::assertTrue($configuratorGroupOptionsOne[1]->getActive());
+
+        static::assertFalse($configuratorGroupOptionsOne[2]->getActive());
+
+        $configuratorGroupOptionsTwo = $configuratorGroups[1]->getOptions();
+        static::assertTrue($configuratorGroupOptionsTwo[0]->isSelected());
+        static::assertTrue($configuratorGroupOptionsTwo[0]->getActive());
+        static::assertFalse($configuratorGroupOptionsTwo[1]->getActive());
+        static::assertFalse($configuratorGroupOptionsTwo[2]->getActive());
+
+        $configuratorGroupOptionsThree = $configuratorGroups[2]->getOptions();
+        static::assertFalse($configuratorGroupOptionsThree[0]->isSelected());
+        static::assertTrue($configuratorGroupOptionsThree[0]->getActive());
+
+        static::assertFalse($configuratorGroupOptionsThree[1]->getActive());
+        static::assertFalse($configuratorGroupOptionsThree[2]->getActive());
+        static::assertFalse($configuratorGroupOptionsThree[2]->isSelected());
+    }
+
+    public function testNonActiveVariantsAreProperlySetWithFullUnavailable(): void
+    {
+        $setMock = $this->createMocks();
+
+        $productConfigurationGateway = $this->getMockForAbstractClass(ProductConfigurationGatewayInterface::class);
+        $configurationGateway = $this->getMockForAbstractClass(ConfiguratorGatewayInterface::class);
+        $configurationGateway->method('get')->willReturn($setMock);
+        $configurationGateway->method('getAvailableConfigurations')->willReturn([
+            11 => [[
+                11, 22, 35,
+            ]],
+            22 => [[
+                22, 11, 12, 35,
+            ]],
+            12 => [[
+                12, 22,
+            ]],
+            35 => [[
+                35, 11, 22,
+            ]],
+        ]);
+
+        $shopContext = $this->getMockForAbstractClass(ShopContextInterface::class);
+        $configuratorService = new ConfiguratorService($productConfigurationGateway, $configurationGateway);
+
+        $baseProduct = new BaseProduct(1, 1, 'sw100');
+
+        $configurator = $configuratorService->getProductConfigurator($baseProduct, $shopContext, [1 => 11, 2 => 22]);
+
+        $configuratorGroups = $configurator->getGroups();
+        $configuratorGroupOptionsOne = $configuratorGroups[0]->getOptions();
+        static::assertTrue($configuratorGroupOptionsOne[0]->isSelected());
+        static::assertTrue($configuratorGroupOptionsOne[0]->getActive());
+
+        static::assertFalse($configuratorGroupOptionsOne[1]->isSelected());
+        static::assertTrue($configuratorGroupOptionsOne[1]->getActive());
+
+        static::assertFalse($configuratorGroupOptionsOne[2]->getActive());
+
+        $configuratorGroupOptionsTwo = $configuratorGroups[1]->getOptions();
+        static::assertTrue($configuratorGroupOptionsTwo[0]->isSelected());
+        static::assertTrue($configuratorGroupOptionsTwo[0]->getActive());
+        static::assertFalse($configuratorGroupOptionsTwo[1]->getActive());
+        static::assertFalse($configuratorGroupOptionsTwo[2]->getActive());
+
+        $configuratorGroupOptionsThree = $configuratorGroups[2]->getOptions();
+        static::assertFalse($configuratorGroupOptionsThree[0]->isSelected());
+        static::assertFalse($configuratorGroupOptionsThree[0]->getActive());
+
+        static::assertFalse($configuratorGroupOptionsThree[1]->getActive());
+        static::assertTrue($configuratorGroupOptionsThree[2]->getActive());
+        static::assertFalse($configuratorGroupOptionsThree[2]->isSelected());
+    }
+
+    public function testNoSelectionDoesStillDisableNotAvailableVariants(): void
+    {
+        $optionOne = new Option();
+        $optionOne->setId(111);
+        $optionTwo = new Option();
+        $optionTwo->setId(222);
+
+        $groupOne = $this->getMockBuilder(Group::class)->disableOriginalConstructor()->getMock();
+        $groupOne->method('getId')->willReturn(111);
+        $groupOne->method('setSelected')->willReturn(null);
+        $groupOne->method('getOptions')->willReturn([
+            $optionOne,
+            $optionTwo,
+        ]);
+
+        $setMock = $this->getMockBuilder(Set::class)->disableOriginalConstructor()->getMock();
+        $setMock->method('getGroups')->willReturn([
+            $groupOne,
+        ]);
+        $setMock->method('getType')->willReturn(ConfiguratorService::CONFIGURATOR_TYPE_STANDARD);
+
+        $productConfigurationGateway = $this->getMockForAbstractClass(ProductConfigurationGatewayInterface::class);
+        $configurationGateway = $this->getMockForAbstractClass(ConfiguratorGatewayInterface::class);
+        $configurationGateway->method('get')->willReturn($setMock);
+        $configurationGateway->method('getAvailableConfigurations')->willReturn([111 => [[111]]]);
+
+        $shopContext = $this->getMockForAbstractClass(ShopContextInterface::class);
+        $configuratorService = new ConfiguratorService($productConfigurationGateway, $configurationGateway);
+
+        $baseProduct = new BaseProduct(1, 1, 'sw100');
+
+        $configurator = $configuratorService->getProductConfigurator($baseProduct, $shopContext, []);
+
+        $configuratorGroups = $configurator->getGroups();
+        $configuratorGroupOptionsOne = $configuratorGroups[0]->getOptions();
+
+        static::assertTrue($configuratorGroupOptionsOne[0]->getActive());
+        static::assertFalse($configuratorGroupOptionsOne[1]->getActive());
+    }
+
+    public function testNoConfigurationsAreAvailable(): void
+    {
+        $setMock = $this->createMocks();
+
+        $productConfigurationGateway = $this->getMockForAbstractClass(ProductConfigurationGatewayInterface::class);
+        $configurationGateway = $this->getMockForAbstractClass(ConfiguratorGatewayInterface::class);
+        $configurationGateway->method('get')->willReturn($setMock);
+        $configurationGateway->method('getAvailableConfigurations')->willReturn([]);
+
+        $shopContext = $this->getMockForAbstractClass(ShopContextInterface::class);
+        $configuratorService = new ConfiguratorService($productConfigurationGateway, $configurationGateway);
+
+        $baseProduct = new BaseProduct(1, 1, 'sw100');
+
+        $configurator = $configuratorService->getProductConfigurator($baseProduct, $shopContext, [1 => 11, 2 => 22]);
+
+        $configuratorGroups = $configurator->getGroups();
+        $configuratorGroupOptionsOne = $configuratorGroups[0]->getOptions();
+        static::assertTrue($configuratorGroupOptionsOne[0]->isSelected());
+        static::assertFalse($configuratorGroupOptionsOne[0]->getActive());
+
+        static::assertFalse($configuratorGroupOptionsOne[1]->isSelected());
+        static::assertFalse($configuratorGroupOptionsOne[1]->getActive());
+        static::assertFalse($configuratorGroupOptionsOne[2]->getActive());
+
+        $configuratorGroupOptionsTwo = $configuratorGroups[1]->getOptions();
+        static::assertTrue($configuratorGroupOptionsTwo[0]->isSelected());
+        static::assertFalse($configuratorGroupOptionsTwo[0]->getActive());
+        static::assertFalse($configuratorGroupOptionsTwo[1]->getActive());
+        static::assertFalse($configuratorGroupOptionsTwo[2]->getActive());
+
+        $configuratorGroupOptionsThree = $configuratorGroups[2]->getOptions();
+        static::assertFalse($configuratorGroupOptionsThree[0]->isSelected());
+        static::assertFalse($configuratorGroupOptionsThree[0]->getActive());
+
+        static::assertFalse($configuratorGroupOptionsThree[1]->getActive());
+        static::assertFalse($configuratorGroupOptionsThree[2]->getActive());
+        static::assertFalse($configuratorGroupOptionsThree[2]->isSelected());
+    }
+
+    /**
+     * @return Option[]
+     */
+    private function createOptions(): array
+    {
+        $optionOne = new Option();
+        $optionOne->setId(11);
+
+        $optionOneTwo = new Option();
+        $optionOneTwo->setId(12);
+
+        $optionOneThree = new Option();
+        $optionOneThree->setId(13);
+
+        $optionTwo = new Option();
+        $optionTwo->setId(22);
+
+        $optionTwoThree = new Option();
+        $optionTwoThree->setId(23);
+
+        $optionTwoFour = new Option();
+        $optionTwoFour->setId(24);
+
+        $optionThree = new Option();
+        $optionThree->setId(33);
+
+        $optionThreeFour = new Option();
+        $optionThreeFour->setId(34);
+
+        $optionThreeFive = new Option();
+        $optionThreeFive->setId(35);
+
+        return [$optionOne, $optionOneTwo, $optionOneThree, $optionTwo, $optionTwoThree, $optionTwoFour, $optionThree, $optionThreeFour, $optionThreeFive];
+    }
+
+    private function createMocks(): Set
+    {
+        [$optionOne, $optionOneTwo, $optionOneThree, $optionTwo, $optionTwoThree, $optionTwoFour, $optionThree, $optionThreeFour, $optionThreeFive] = $this->createOptions();
+
+        $groupOne = $this->getMockBuilder(Group::class)->disableOriginalConstructor()->getMock();
+        $groupOne->method('getId')->willReturn(1);
+        $groupOne->method('setSelected')->willReturn(null);
+        $groupOne->method('getOptions')->willReturn([
+            $optionOne,
+            $optionOneTwo,
+            $optionOneThree,
+        ]);
+
+        $groupTwo = $this->getMockBuilder(Group::class)->disableOriginalConstructor()->getMock();
+        $groupTwo->method('getId')->willReturn(2);
+        $groupTwo->method('setSelected')->willReturn(null);
+        $groupTwo->method('getOptions')->willReturn([
+            $optionTwo,
+            $optionTwoThree,
+            $optionTwoFour,
+        ]);
+
+        $groupThree = $this->getMockBuilder(Group::class)->disableOriginalConstructor()->getMock();
+        $groupThree->method('getId')->willReturn(3);
+
+        $groupThree->method('setSelected')->willReturn(null);
+        $groupThree->method('getOptions')->willReturn([
+            $optionThree,
+            $optionThreeFour,
+            $optionThreeFive,
+        ]);
+
+        $setMock = $this->getMockBuilder(Set::class)->disableOriginalConstructor()->getMock();
+        $setMock->method('getGroups')->willReturn([
+            $groupOne,
+            $groupTwo,
+            $groupThree,
+        ]);
+        $setMock->method('getType')->willReturn(ConfiguratorService::CONFIGURATOR_TYPE_STANDARD);
+
+        return $setMock;
+    }
+}
diff --git a/tests/Unit/Bundle/StoreFrontBundle/Service/Core/ShopContextFactoryTest.php b/tests/Unit/Bundle/StoreFrontBundle/Service/Core/ShopContextFactoryTest.php
new file mode 100644
index 00000000000..259c9fb480f
--- /dev/null
+++ b/tests/Unit/Bundle/StoreFrontBundle/Service/Core/ShopContextFactoryTest.php
@@ -0,0 +1,83 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Unit\Bundle\StoreFrontBundle\Service\Core;
+
+use PHPUnit\Framework\TestCase;
+use Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\CountryGateway;
+use Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\CurrencyGateway;
+use Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\CustomerGroupGateway;
+use Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\PriceGroupDiscountGateway;
+use Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\ShopGateway;
+use Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\TaxGateway;
+use Shopware\Bundle\StoreFrontBundle\Service\Core\ShopContextFactory;
+use Shopware\Bundle\StoreFrontBundle\Struct\Country;
+use Shopware\Bundle\StoreFrontBundle\Struct\Country\Area;
+use Shopware\Bundle\StoreFrontBundle\Struct\Currency;
+use Shopware\Bundle\StoreFrontBundle\Struct\Customer\Group;
+use Shopware\Bundle\StoreFrontBundle\Struct\Shop;
+
+class ShopContextFactoryTest extends TestCase
+{
+    public function testShouldCreateShopContextWithFallbackCountryAndArea(): void
+    {
+        $customerGroupGatewayMock = $this->getMockBuilder(CustomerGroupGateway::class)->disableOriginalConstructor()->getMock();
+        $customerGroupGatewayMock->method('getList')->willReturn(['EK' => new Group()]);
+
+        $taxGatewayMock = $this->getMockBuilder(TaxGateway::class)->disableOriginalConstructor()->getMock();
+        $taxGatewayMock->expects(static::once())->method('getRules')->willReturn([]);
+
+        $countryGatewayMock = $this->getMockBuilder(CountryGateway::class)->disableOriginalConstructor()->setMethods(['getFallbackCountry', 'getArea'])->getMock();
+        $country = new Country();
+        $country->setAreaId(1);
+
+        $countryGatewayMock->expects(static::once())->method('getFallbackCountry')->willReturn($country);
+        $countryGatewayMock->expects(static::once())->method('getArea')->willReturn(new Area());
+
+        $priceGroupDiscountGatewayMock = $this->getMockBuilder(PriceGroupDiscountGateway::class)->disableOriginalConstructor()->getMock();
+        $priceGroupDiscountGatewayMock->expects(static::once())->method('getPriceGroups')->willReturn([]);
+
+        $shop = new Shop();
+        $shop->setCurrency(new Currency());
+
+        $shopGatewayMock = $this->getMockBuilder(ShopGateway::class)->disableOriginalConstructor()->getMock();
+        $shopGatewayMock->method('get')->willReturn($shop);
+        $currencyGateway = $this->getMockBuilder(CurrencyGateway::class)->disableOriginalConstructor()->getMock();
+
+        $shopContextFactory = new ShopContextFactory(
+            $customerGroupGatewayMock,
+            $taxGatewayMock,
+            $countryGatewayMock,
+            $priceGroupDiscountGatewayMock,
+            $shopGatewayMock,
+            $currencyGateway
+        );
+
+        $shopContext = $shopContextFactory->create('', 1);
+
+        static::assertInstanceOf(Country::class, $shopContext->getCountry());
+        static::assertInstanceOf(Area::class, $shopContext->getArea());
+    }
+}
diff --git a/tests/Unit/Bundle/StoreFrontBundle/Struct/AttributeStructTest.php b/tests/Unit/Bundle/StoreFrontBundle/Struct/AttributeStructTest.php
index 6815573a3d5..199fad60bf2 100644
--- a/tests/Unit/Bundle/StoreFrontBundle/Struct/AttributeStructTest.php
+++ b/tests/Unit/Bundle/StoreFrontBundle/Struct/AttributeStructTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\StoreFrontBundle\Struct;
diff --git a/tests/Unit/Bundle/StoreFrontBundle/Struct/CloneStructTest.php b/tests/Unit/Bundle/StoreFrontBundle/Struct/CloneStructTest.php
index e3d588ba233..ca62d617904 100644
--- a/tests/Unit/Bundle/StoreFrontBundle/Struct/CloneStructTest.php
+++ b/tests/Unit/Bundle/StoreFrontBundle/Struct/CloneStructTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Bundle\StoreFrontBundle\Struct;
@@ -66,8 +66,8 @@ public function testNestedArrayCloning()
     {
         $simple = new SimpleStruct(
             [
-               new SimpleStruct('struct 1'),
-               new SimpleStruct('struct 2'),
+                new SimpleStruct('struct 1'),
+                new SimpleStruct('struct 2'),
             ]
         );
 
diff --git a/tests/Unit/Components/BasketSignature/BasketSignatureCreatorTest.php b/tests/Unit/Components/BasketSignature/BasketSignatureCreatorTest.php
index 273adcf3302..2a5101615db 100644
--- a/tests/Unit/Components/BasketSignature/BasketSignatureCreatorTest.php
+++ b/tests/Unit/Components/BasketSignature/BasketSignatureCreatorTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\BasketSignature;
diff --git a/tests/Unit/Components/Cart/CartLineCalculationTest.php b/tests/Unit/Components/Cart/CartLineCalculationTest.php
index 7a943fb459c..812c0a1f0b5 100644
--- a/tests/Unit/Components/Cart/CartLineCalculationTest.php
+++ b/tests/Unit/Components/Cart/CartLineCalculationTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Cart;
diff --git a/tests/Unit/Components/Cart/TaxAggregatorTest.php b/tests/Unit/Components/Cart/TaxAggregatorTest.php
index 368af351678..075b6d4954b 100644
--- a/tests/Unit/Components/Cart/TaxAggregatorTest.php
+++ b/tests/Unit/Components/Cart/TaxAggregatorTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Cart;
@@ -66,7 +65,7 @@ public function testPositionsTaxSum(
                     'fetchOne' => 'none',
                 ]
             ),
-            $this->createStub(ContextServiceInterface::class),
+            static::createStub(ContextServiceInterface::class),
             null,
             $discountTaxConfig,
             $taxAutoModeConfig
@@ -95,7 +94,7 @@ public function positionsTaxSumDataProvider(): Generator
 
         yield 'Item with "tax_rate" set' => [
             [
-                sprintf('%.2f', self::REGULAR_TAX_RATE) => 1.1,
+                \sprintf('%.2f', self::REGULAR_TAX_RATE) => 1.1,
             ],
             self::MAXIMUM_TAX_RATE,
             [
@@ -106,19 +105,6 @@ public function positionsTaxSumDataProvider(): Generator
             ],
         ];
 
-        yield 'Item with "taxPercent" set' => [
-            [
-                sprintf('%.2f', self::REGULAR_TAX_RATE) => 1.1,
-            ],
-            self::MAXIMUM_TAX_RATE,
-            [
-                [
-                    'taxPercent' => self::REGULAR_TAX_RATE,
-                    'tax' => 1.1,
-                ],
-            ],
-        ];
-
         yield 'Voucher item' => [
             null,
             self::MAXIMUM_TAX_RATE,
@@ -141,9 +127,9 @@ public function positionsTaxSumDataProvider(): Generator
         ];
 
         foreach ([true, false] as $taxAutoModeConfig) {
-            yield sprintf('Regular item without "tax_rate", taxAutoMode: %d', $taxAutoModeConfig) => [
+            yield \sprintf('Regular item without "tax_rate", taxAutoMode: %d', $taxAutoModeConfig) => [
                 [
-                    sprintf('%.2f', $taxAutoModeConfig ? self::MAXIMUM_TAX_RATE : self::DISCOUNT_TAX_RATE) => 1.1,
+                    \sprintf('%.2f', $taxAutoModeConfig ? self::MAXIMUM_TAX_RATE : self::DISCOUNT_TAX_RATE) => 1.1,
                 ],
                 self::MAXIMUM_TAX_RATE,
                 [
@@ -153,13 +139,13 @@ public function positionsTaxSumDataProvider(): Generator
                     ],
                 ],
                 $taxAutoModeConfig ? '1' : null,
-                sprintf('%.2f', self::DISCOUNT_TAX_RATE),
+                \sprintf('%.2f', self::DISCOUNT_TAX_RATE),
             ];
         }
 
         yield 'Multiple items with "tax_rate" set' => [
             [
-                sprintf('%.2f', self::REGULAR_TAX_RATE) => self::DISCOUNT_TAX_RATE * 4,
+                \sprintf('%.2f', self::REGULAR_TAX_RATE) => self::DISCOUNT_TAX_RATE * 4,
             ],
             self::MAXIMUM_TAX_RATE,
             [
@@ -195,8 +181,8 @@ public function testShippingCostsTaxSum(
         ?array $shippingCostsTaxProportional = null
     ): void {
         $subject = new TaxAggregator(
-            $this->createStub(Connection::class),
-            $this->createStub(ContextServiceInterface::class)
+            static::createStub(Connection::class),
+            static::createStub(ContextServiceInterface::class)
         );
 
         $basket = [
@@ -227,7 +213,7 @@ public function shippingCostsTaxSumDataProvider(): Generator
 
         yield 'Proportional tax calculation' => [
             [
-                sprintf('%.2f', self::SHIPPING_COSTS_TAX_RATE) => 1.0,
+                \sprintf('%.2f', self::SHIPPING_COSTS_TAX_RATE) => 1.0,
             ],
             self::SHIPPING_COSTS_TAX_RATE,
             [
@@ -243,16 +229,16 @@ public function shippingCostsTaxSumDataProvider(): Generator
 
         yield 'Regular tax calculation' => [
             [
-                sprintf('%.2f', self::SHIPPING_COSTS_TAX_RATE) => self::SHIPPING_COSTS_WITH_TAX - self::SHIPPING_COSTS_NET,
+                \sprintf('%.2f', self::SHIPPING_COSTS_TAX_RATE) => self::SHIPPING_COSTS_WITH_TAX - self::SHIPPING_COSTS_NET,
             ],
             self::SHIPPING_COSTS_TAX_RATE,
         ];
 
         yield 'Proportional tax calculation with multiple positions and tax rates' => [
             [
-                sprintf('%.2f', self::SHIPPING_COSTS_TAX_RATE - 1) => 1.1,
-                sprintf('%.2f', self::SHIPPING_COSTS_TAX_RATE) => 2.2,
-                sprintf('%.2f', self::SHIPPING_COSTS_TAX_RATE + 1) => 2.2,
+                \sprintf('%.2f', self::SHIPPING_COSTS_TAX_RATE - 1) => 1.1,
+                \sprintf('%.2f', self::SHIPPING_COSTS_TAX_RATE) => 2.2,
+                \sprintf('%.2f', self::SHIPPING_COSTS_TAX_RATE + 1) => 2.2,
             ],
             self::SHIPPING_COSTS_TAX_RATE,
             [
@@ -356,9 +342,9 @@ public function getVoucherTaxRateDataProvider(): Generator
     {
         // These datasets test, whether the config/fallback value is returned in case we provide the default or no tax mode
         foreach (['default', null, ''] as $voucherTaxMode) {
-            yield sprintf('Default voucher tax mode: "%s"', $voucherTaxMode ?? 'null') => [
+            yield \sprintf('Default voucher tax mode: "%s"', $voucherTaxMode ?? 'null') => [
                 [
-                    sprintf('%.2f', self::REGULAR_TAX_RATE) => 1.1,
+                    \sprintf('%.2f', self::REGULAR_TAX_RATE) => 1.1,
                 ],
                 [
                     [
@@ -368,14 +354,14 @@ public function getVoucherTaxRateDataProvider(): Generator
                     ],
                 ],
                 $voucherTaxMode,
-                sprintf('%.2f', self::REGULAR_TAX_RATE),
+                \sprintf('%.2f', self::REGULAR_TAX_RATE),
             ];
         }
 
         // This dataset tests, whether the maximum tax rate is returned, when using tax mode "auto"
         yield 'Voucher tax mode: auto' => [
             [
-                sprintf('%.2f', self::MAXIMUM_TAX_RATE) => 1.1,
+                \sprintf('%.2f', self::MAXIMUM_TAX_RATE) => 1.1,
             ],
             [
                 [
@@ -403,7 +389,7 @@ public function getVoucherTaxRateDataProvider(): Generator
         // This dataset tests, whether the method attempts to read the tax rate from context, when using any other tax mode
         yield 'Voucher tax mode: 19' => [
             [
-                sprintf('%.2f', self::REGULAR_TAX_RATE) => 1.1,
+                \sprintf('%.2f', self::REGULAR_TAX_RATE) => 1.1,
             ],
             [
                 [
@@ -412,7 +398,7 @@ public function getVoucherTaxRateDataProvider(): Generator
                     'tax' => 1.1,
                 ],
             ],
-            sprintf('%d', self::REGULAR_TAX_RATE),
+            \sprintf('%d', self::REGULAR_TAX_RATE),
         ];
     }
 
@@ -425,8 +411,8 @@ public function getVoucherTaxRateDataProvider(): Generator
     public function testTaxSum(array $expected, array $basket): void
     {
         $subject = new TaxAggregator(
-            $this->createStub(Connection::class),
-            $this->createStub(ContextServiceInterface::class)
+            static::createStub(Connection::class),
+            static::createStub(ContextServiceInterface::class)
         );
 
         static::assertSame(
@@ -447,7 +433,7 @@ public function taxSumDataProvider(): Generator
 
         yield 'Basket with a few positions' => [
             [
-                sprintf('%.2f', self::REGULAR_TAX_RATE) => 4.4,
+                \sprintf('%.2f', self::REGULAR_TAX_RATE) => 4.4,
             ],
             [
                 'content' => [
@@ -477,7 +463,7 @@ public function taxSumDataProvider(): Generator
 
         yield 'Basket with a few positions and shipping costs' => [
             [
-                sprintf('%.2f', self::REGULAR_TAX_RATE) => 10.4 + (self::SHIPPING_COSTS_WITH_TAX - self::SHIPPING_COSTS_NET),
+                \sprintf('%.2f', self::REGULAR_TAX_RATE) => 10.4 + (self::SHIPPING_COSTS_WITH_TAX - self::SHIPPING_COSTS_NET),
             ],
             [
                 'content' => [
diff --git a/tests/Unit/Components/Compatibility/LegacyStructConverterTest.php b/tests/Unit/Components/Compatibility/LegacyStructConverterTest.php
index d0ed17302ce..069b1f38c54 100644
--- a/tests/Unit/Components/Compatibility/LegacyStructConverterTest.php
+++ b/tests/Unit/Components/Compatibility/LegacyStructConverterTest.php
@@ -5,27 +5,27 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Compatibility;
 
+use DateTime;
 use Doctrine\DBAL\Connection;
 use PHPUnit\Framework\TestCase;
 use Shopware\Bundle\MediaBundle\MediaServiceInterface;
@@ -40,11 +40,14 @@
 use Shopware\Components\ContainerAwareEventManager;
 use Shopware\Components\DependencyInjection\Container;
 use Shopware\Components\Model\ModelManager;
+use Shopware\Tests\Functional\Traits\ShopContextTrait;
 use Shopware_Components_Config;
 
 class LegacyStructConverterTest extends TestCase
 {
-    public function testConvertListProductStruct(): void
+    use ShopContextTrait;
+
+    public function testConvertListProductStructWithEmptyDescription(): void
     {
         $converter = $this->createConverter();
 
@@ -60,6 +63,38 @@ public function testConvertListProductStruct(): void
         static::assertNull($convertedProduct['description']);
     }
 
+    public function testConvertPriceStructCreatesRegulationPrice(): void
+    {
+        $converter = $this->createConverter();
+
+        $price = new Price(new PriceRule());
+        $price->setCalculatedRegulationPrice(400.0);
+
+        $data = $converter->convertPriceStruct($price);
+
+        static::assertEquals(400.0, $data['regulationPrice']);
+    }
+
+    public function testConvertListProductStructWithReleaseDate(): void
+    {
+        $converter = $this->createConverter();
+
+        $product = new ListProduct(1, 1, 'SW1000');
+        $product->setTax(new Tax());
+        $tomorrow = new DateTime('tomorrow');
+        $product->setReleaseDate($tomorrow);
+
+        $priceRule = new PriceRule();
+        $priceRule->setCustomerGroup(new Group());
+        $product->setListingPrice(new Price($priceRule));
+
+        $convertedProduct = $converter->convertListProductStruct($product);
+
+        $tomorrowString = $tomorrow->format('Y-m-d');
+        static::assertSame($tomorrowString, $convertedProduct['sReleasedate']);
+        static::assertSame($tomorrowString, $convertedProduct['sReleaseDate']);
+    }
+
     private function createConverter(): LegacyStructConverter
     {
         $config = $this->createMock(Shopware_Components_Config::class);
@@ -67,12 +102,15 @@ private function createConverter(): LegacyStructConverter
             ['useShortDescriptionInListing', null, true],
         ]);
 
+        $contextService = $this->createMock(ContextServiceInterface::class);
+        $contextService->method('getShopContext')->willReturn($this->createShopContext());
+
         $eventManager = $this->createMock(ContainerAwareEventManager::class);
         $eventManager->method('filter')->willReturnArgument(1);
 
         return new LegacyStructConverter(
             $config,
-            $this->createMock(ContextServiceInterface::class),
+            $contextService,
             $eventManager,
             $this->createMock(MediaServiceInterface::class),
             $this->createMock(Connection::class),
diff --git a/tests/Unit/Components/CookieSubscriberTest.php b/tests/Unit/Components/CookieSubscriberTest.php
index 9837857497f..30046a629dc 100644
--- a/tests/Unit/Components/CookieSubscriberTest.php
+++ b/tests/Unit/Components/CookieSubscriberTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components;
diff --git a/tests/Unit/Components/CsvIteratorTest.php b/tests/Unit/Components/CsvIteratorTest.php
new file mode 100644
index 00000000000..2b318bacccf
--- /dev/null
+++ b/tests/Unit/Components/CsvIteratorTest.php
@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Unit\Components;
+
+use PHPUnit\Framework\TestCase;
+use Shopware_Components_CsvIterator as CsvIterator;
+
+class CsvIteratorTest extends TestCase
+{
+    public function testReadWithEmptyLine(): void
+    {
+        $csvIterator = new CsvIterator(__DIR__ . '/_fixtures/csv-with-empty-line-at-the-end.csv');
+
+        static::assertCount(1, $csvIterator);
+        foreach ($csvIterator as $item) {
+            static::assertSame('4911', $item['orderNumber']);
+            static::assertSame('1', $item['quantity']);
+        }
+    }
+}
diff --git a/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerCompilerPassTest.php b/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerCompilerPassTest.php
index cb80847eada..11be90eeebf 100644
--- a/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerCompilerPassTest.php
+++ b/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerCompilerPassTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\DependencyInjection\Compiler;
diff --git a/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerExamplePlugins/BackendController/BackendController.php b/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerExamplePlugins/BackendController/BackendController.php
index b30301b24dc..b9c841eddbb 100644
--- a/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerExamplePlugins/BackendController/BackendController.php
+++ b/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerExamplePlugins/BackendController/BackendController.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\DependencyInjection\Compiler\RegisterControllerExamplePlugins\BackendController;
diff --git a/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerExamplePlugins/BackendController/Controllers/Backend/BackendController.php b/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerExamplePlugins/BackendController/Controllers/Backend/BackendController.php
index 6ec499191e8..ef8cfdca288 100644
--- a/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerExamplePlugins/BackendController/Controllers/Backend/BackendController.php
+++ b/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerExamplePlugins/BackendController/Controllers/Backend/BackendController.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Shopware_Controllers_Backend_BackendController extends Enlight_Controller_Action
diff --git a/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerExamplePlugins/DifferentController/Controllers/Api/MyController.php b/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerExamplePlugins/DifferentController/Controllers/Api/MyController.php
index fe34470e3e1..650c161a858 100644
--- a/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerExamplePlugins/DifferentController/Controllers/Api/MyController.php
+++ b/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerExamplePlugins/DifferentController/Controllers/Api/MyController.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Shopware_Controllers_Api_MyController extends Enlight_Controller_Action
diff --git a/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerExamplePlugins/DifferentController/Controllers/Backend/MyController.php b/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerExamplePlugins/DifferentController/Controllers/Backend/MyController.php
index 0219b3e81d0..ae359abae0d 100644
--- a/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerExamplePlugins/DifferentController/Controllers/Backend/MyController.php
+++ b/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerExamplePlugins/DifferentController/Controllers/Backend/MyController.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Shopware_Controllers_Backend_MyController extends Enlight_Controller_Action
diff --git a/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerExamplePlugins/DifferentController/Controllers/Frontend/MyController.php b/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerExamplePlugins/DifferentController/Controllers/Frontend/MyController.php
index ea7d7996218..e1a8824c782 100644
--- a/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerExamplePlugins/DifferentController/Controllers/Frontend/MyController.php
+++ b/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerExamplePlugins/DifferentController/Controllers/Frontend/MyController.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Shopware_Controllers_Frontend_MyController extends Enlight_Controller_Action
diff --git a/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerExamplePlugins/DifferentController/Controllers/Widgets/MyController.php b/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerExamplePlugins/DifferentController/Controllers/Widgets/MyController.php
index 49654a2b9fc..449213e4550 100644
--- a/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerExamplePlugins/DifferentController/Controllers/Widgets/MyController.php
+++ b/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerExamplePlugins/DifferentController/Controllers/Widgets/MyController.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 class Shopware_Controllers_Widgets_MyController extends Enlight_Controller_Action
diff --git a/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerExamplePlugins/DifferentController/DifferentController.php b/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerExamplePlugins/DifferentController/DifferentController.php
index 389b646ff11..416feeda698 100644
--- a/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerExamplePlugins/DifferentController/DifferentController.php
+++ b/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerExamplePlugins/DifferentController/DifferentController.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\DependencyInjection\Compiler\RegisterControllerExamplePlugins\DifferentController;
diff --git a/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerExamplePlugins/NoneController/NoneController.php b/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerExamplePlugins/NoneController/NoneController.php
index 88aa366374d..3c4a545f13c 100644
--- a/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerExamplePlugins/NoneController/NoneController.php
+++ b/tests/Unit/Components/DependencyInjection/Compiler/RegisterControllerExamplePlugins/NoneController/NoneController.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\DependencyInjection\Compiler\RegisterControllerExamplePlugins\NoneController;
diff --git a/tests/Unit/Components/DependencyInjection/Compiler/TagReplaceTraitTest.php b/tests/Unit/Components/DependencyInjection/Compiler/TagReplaceTraitTest.php
index 05039b9e3dc..0fbe292583b 100644
--- a/tests/Unit/Components/DependencyInjection/Compiler/TagReplaceTraitTest.php
+++ b/tests/Unit/Components/DependencyInjection/Compiler/TagReplaceTraitTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\DependencyInjection\Compiler;
diff --git a/tests/Unit/Components/DependencyInjection/ContainerTest.php b/tests/Unit/Components/DependencyInjection/ContainerTest.php
index 566b94ae871..6327a1606ec 100644
--- a/tests/Unit/Components/DependencyInjection/ContainerTest.php
+++ b/tests/Unit/Components/DependencyInjection/ContainerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\DependencyInjection;
@@ -28,8 +28,6 @@
 use Enlight_Event_EventManager;
 use Exception;
 use PHPUnit\Framework\TestCase;
-use Prophecy\Argument;
-use Prophecy\PhpUnit\ProphecyTrait;
 use Shopware\Components\ContainerAwareEventManager;
 use Shopware\Components\DependencyInjection\Container;
 use stdClass;
@@ -38,12 +36,7 @@
 
 class ContainerTest extends TestCase
 {
-    use ProphecyTrait;
-
-    /**
-     * @var Container
-     */
-    private $container;
+    private Container $container;
 
     protected function setUp(): void
     {
@@ -96,48 +89,63 @@ public function testGetOnNonExistentWithIgnoreBehaviour(): void
         );
     }
 
-    public function testEventsAreEmitedDuringServiceInitialisation(): void
+    public function testEventsAreEmittedDuringServiceInitialisation(): void
     {
-        $service = $this->prophesize(Enlight_Event_EventManager::class);
-
-        $service->notify('Enlight_Bootstrap_AfterRegisterResource_events', Argument::any())->shouldBeCalled();
-        $service->notifyUntil('Enlight_Bootstrap_InitResource_bar', Argument::any())->shouldBeCalled();
-        $service->notify('Enlight_Bootstrap_AfterInitResource_bar', Argument::any())->shouldBeCalled();
+        $eventManager = $this->createMock(Enlight_Event_EventManager::class);
+        $eventManager->expects(static::exactly(2))
+            ->method('notify')
+            ->with(static::logicalOr(
+                'Enlight_Bootstrap_AfterRegisterResource_events',
+                'Enlight_Bootstrap_AfterInitResource_bar'
+            ));
+        $eventManager->expects(static::once())
+            ->method('notifyUntil')
+            ->with('Enlight_Bootstrap_InitResource_bar');
 
-        $service = $service->reveal();
-        $this->container->set('events', $service);
+        $this->container->set('events', $eventManager);
 
         static::assertInstanceOf('stdClass', $this->container->get('bar'));
     }
 
     public function testEventsAreEmitedDuringServiceInitialisationWhenUsingAlias(): void
     {
-        $service = $this->prophesize(Enlight_Event_EventManager::class);
-
-        $service->notify('Enlight_Bootstrap_AfterRegisterResource_events', Argument::any())->shouldBeCalled();
-        $service->notifyUntil('Enlight_Bootstrap_InitResource_bar', Argument::any())->shouldBeCalled();
-        $service->notifyUntil('Enlight_Bootstrap_InitResource_alias', Argument::any())->shouldBeCalled();
-        $service->notify('Enlight_Bootstrap_AfterInitResource_bar', Argument::any())->shouldBeCalled();
-        $service->notify('Enlight_Bootstrap_AfterInitResource_alias', Argument::any())->shouldBeCalled();
+        $eventManager = $this->createMock(Enlight_Event_EventManager::class);
+        $eventManager->expects(static::exactly(3))
+            ->method('notify')
+            ->with(static::logicalOr(
+                'Enlight_Bootstrap_AfterRegisterResource_events',
+                'Enlight_Bootstrap_AfterInitResource_bar',
+                'Enlight_Bootstrap_AfterInitResource_alias'
+            ));
+        $eventManager->expects(static::exactly(2))
+            ->method('notifyUntil')
+            ->with(static::logicalOr(
+                'Enlight_Bootstrap_InitResource_bar',
+                'Enlight_Bootstrap_InitResource_alias'
+            ));
 
-        $service = $service->reveal();
-        $this->container->set('events', $service);
+        $this->container->set('events', $eventManager);
 
         static::assertInstanceOf('stdClass', $this->container->get('alias'));
     }
 
     public function testEventsAreEmitedDuringServiceInitialisationWhenUsingUnknownServices(): void
     {
-        $service = $this->prophesize(Enlight_Event_EventManager::class);
-
-        $service->notify('Enlight_Bootstrap_AfterRegisterResource_events', Argument::any())->shouldBeCalled();
-        $service->notifyUntil('Enlight_Bootstrap_InitResource_foo', Argument::any())->shouldBeCalled();
-        $service->notify('Enlight_Bootstrap_AfterInitResource_foo', Argument::any())->shouldBeCalled();
+        $eventManager = $this->createMock(Enlight_Event_EventManager::class);
+        $eventManager->expects(static::exactly(2))
+            ->method('notify')
+            ->with(static::logicalOr(
+                'Enlight_Bootstrap_AfterRegisterResource_events',
+                'Enlight_Bootstrap_AfterInitResource_foo'
+            ));
+        $eventManager->expects(static::once())
+            ->method('notifyUntil')
+            ->with('Enlight_Bootstrap_InitResource_foo');
 
-        $service = $service->reveal();
-        $this->container->set('events', $service);
+        $this->container->set('events', $eventManager);
 
         $this->expectException(Exception::class);
+        $this->expectExceptionMessage('You have requested a non-existent service "foo".');
 
         $this->container->get('foo');
     }
@@ -154,8 +162,9 @@ public function testAfterInitEventDecorator(): void
         $this->container->get('events')->addListener(
             'Enlight_Bootstrap_AfterInitResource_bar',
             function (Enlight_Event_EventArgs $e) use ($class) {
-                /** @var ProjectServiceContainer $container */
-                $container = $e->getSubject();
+                $container = $e->get('subject');
+                self::assertInstanceOf(ProjectServiceContainer::class, $container);
+
                 $container->set('bar', $class);
             }
         );
@@ -191,8 +200,8 @@ public function testServiceCircularReferenceExceptionException(): void
         $this->container->get('events')->addListener(
             'Enlight_Bootstrap_InitResource_child',
             function (Enlight_Event_EventArgs $e) {
-                /** @var ProjectServiceContainer $container */
-                $container = $e->getSubject();
+                $container = $e->get('subject');
+                self::assertInstanceOf(ProjectServiceContainer::class, $container);
 
                 // Cause circular reference
                 $container->get('parent');
@@ -202,8 +211,8 @@ function (Enlight_Event_EventArgs $e) {
         $this->container->get('events')->addListener(
             'Enlight_Bootstrap_AfterInitResource_parent',
             function (Enlight_Event_EventArgs $e) {
-                /** @var ProjectServiceContainer $container */
-                $container = $e->getSubject();
+                $container = $e->get('subject');
+                self::assertInstanceOf(ProjectServiceContainer::class, $container);
 
                 $coreParent = $container->get('parent');
 
diff --git a/tests/Unit/Components/DependencyInjection/ProjectServiceContainer.php b/tests/Unit/Components/DependencyInjection/ProjectServiceContainer.php
index 0a4f32e24d5..09a4fbf791b 100644
--- a/tests/Unit/Components/DependencyInjection/ProjectServiceContainer.php
+++ b/tests/Unit/Components/DependencyInjection/ProjectServiceContainer.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\DependencyInjection;
diff --git a/tests/Unit/Components/DependencyInjection/Service.php b/tests/Unit/Components/DependencyInjection/Service.php
index b947d467f5c..a1264d14892 100644
--- a/tests/Unit/Components/DependencyInjection/Service.php
+++ b/tests/Unit/Components/DependencyInjection/Service.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\DependencyInjection;
diff --git a/tests/Unit/Components/DispatchFormatHelperTest.php b/tests/Unit/Components/DispatchFormatHelperTest.php
index 36532f5b8dd..c04763dbfe5 100644
--- a/tests/Unit/Components/DispatchFormatHelperTest.php
+++ b/tests/Unit/Components/DispatchFormatHelperTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components;
diff --git a/tests/Unit/Components/EmailValidatorTest.php b/tests/Unit/Components/EmailValidatorTest.php
index 9d0abfacc45..13911b24f58 100644
--- a/tests/Unit/Components/EmailValidatorTest.php
+++ b/tests/Unit/Components/EmailValidatorTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components;
@@ -29,76 +29,80 @@
 
 class EmailValidatorTest extends TestCase
 {
-    /**
-     * @var EmailValidator
-     */
-    private $SUT;
+    private EmailValidator $SUT;
 
     protected function setUp(): void
     {
         $this->SUT = new EmailValidator();
     }
 
-    public function getValidEmails()
+    /**
+     * @return array<string, array<int, string>>
+     */
+    public function getValidEmails(): array
     {
         return [
             // old domains
-            ['test@example.de'],
-            ['test@example.com'],
-            ['test@example.org'],
+            'test@example.de' => ['test@example.de'],
+            'test@example.com' => ['test@example.com'],
+            'test@example.org' => ['test@example.org'],
 
             // new released domains
-            ['test@example.berlin'],
-            ['test@example.email'],
-            ['test@example.systems'],
+            'test@example.berlin' => ['test@example.berlin'],
+            'test@example.email' => ['test@example.email'],
+            'test@example.systems' => ['test@example.systems'],
 
             // new non released domains
-            ['test@example.active'],
-            ['test@example.love'],
-            ['test@example.video'],
-            ['test@example.app'],
-            ['test@example.shop'],
-
-            ['disposable.style.email.with+symbol@example.com'],
-            ['other.email-with-dash@example.com'],
+            'test@example.active' => ['test@example.active'],
+            'test@example.love' => ['test@example.love'],
+            'test@example.video' => ['test@example.video'],
+            'test@example.app' => ['test@example.app'],
+            'test@example.shop' => ['test@example.shop'],
 
-            // We will ignore quoted string local parts
-            // this would blow up the simple regex method
-            // array('"much.more unusual"@example.com'),
+            'disposable.style.email.with+symbol@example.com' => ['disposable.style.email.with+symbol@example.com'],
+            'other.email-with-dash@example.com' => ['other.email-with-dash@example.com'],
+            '"much.more.unusual"@example.com' => ['"much.more.unusual"@example.com'],
+            '!#$%&*+-/=?^_`.{|}~@example.com' => ['!#$%&*+-/=?^_`.{|}~@example.com'],
         ];
     }
 
     /**
      * @dataProvider getValidEmails
-     *
-     * @param string $email
      */
-    public function testValidEmails($email)
+    public function testValidEmails(string $email): void
     {
         static::assertTrue($this->SUT->isValid($email));
     }
 
-    public function getinvalidEmails()
+    /**
+     * @return array<string, array<int, string>>
+     */
+    public function getInvalidEmails(): array
     {
         return [
-            ['test'],
-            ['test@.de'],
-            ['@example'],
-            ['@example.de'],
-            ['@.'],
-            [' @foo.de'],
-            ['@foo.'],
-            ['foo@ .de'],
-            ['foo@bar. '],
+            'test' => ['test'],
+            'test@.de' => ['test@.de'],
+            '@example' => ['@example'],
+            '@example.de' => ['@example.de'],
+            '@.' => ['@.'],
+            ' @foo.de' => [' @foo.de'],
+            '@foo.' => ['@foo.'],
+            'foo@ .de' => ['foo@ .de'],
+            'foo@bar. ' => ['foo@bar. '],
+            "testing@example.com'||DBMS_PIPE.RECEIVE_MESSAGE(CHR(98)||CHR(98)||CHR(" => ["testing@example.com'||DBMS_PIPE.RECEIVE_MESSAGE(CHR(98)||CHR(98)||CHR("],
+            "testing@example.com'||''||'" => ["testing@example.com'||''||'"],
+            "testing@example.com'|||'" => ["testing@example.com'|||'"],
+            "testing@example.com'||'" => ["testing@example.com'||'"],
+            'test@example.com|' => ['test@example.com|'],
+            'test@example.com(' => ['test@example.com('],
+            'test@example.com"' => ['test@example.com"'],
         ];
     }
 
     /**
      * @dataProvider getInvalidEmails
-     *
-     * @param string $email
      */
-    public function testInvalidEmails($email)
+    public function testInvalidEmails(string $email): void
     {
         static::assertFalse($this->SUT->isValid($email));
     }
diff --git a/tests/Unit/Components/Emotion/DeviceConfigurationTest.php b/tests/Unit/Components/Emotion/DeviceConfigurationTest.php
index 5bf938f65d8..e7939c4cd02 100644
--- a/tests/Unit/Components/Emotion/DeviceConfigurationTest.php
+++ b/tests/Unit/Components/Emotion/DeviceConfigurationTest.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Emotion;
@@ -32,14 +33,13 @@
 
 class DeviceConfigurationTest extends TestCase
 {
-    public function testNoneExistingEmotion()
+    public function testNoneExistingEmotion(): void
     {
-        $service = new DeviceConfiguration($this->createQueryMock([]));
-        $emotions = $service->get(1);
+        $emotions = (new DeviceConfiguration($this->createQueryMock([])))->get(1);
         static::assertEmpty($emotions);
     }
 
-    public function testEmotionsWithDifferentPositions()
+    public function testEmotionsWithDifferentPositions(): void
     {
         $service = new DeviceConfiguration($this->createQueryMock([
             ['id' => 1, 'position' => 4, 'devices' => '', 'shopIds' => ''],
@@ -59,7 +59,7 @@ public function testEmotionsWithDifferentPositions()
         );
     }
 
-    public function testEmotionsWithNullPositions()
+    public function testEmotionsWithNullPositions(): void
     {
         $service = new DeviceConfiguration($this->createQueryMock([
             ['id' => 1, 'position' => null, 'devices' => '', 'shopIds' => ''],
@@ -79,7 +79,7 @@ public function testEmotionsWithNullPositions()
         );
     }
 
-    public function testEmotionsWithSamePosition()
+    public function testEmotionsWithSamePosition(): void
     {
         $service = new DeviceConfiguration($this->createQueryMock([
             ['id' => 1, 'position' => 3, 'devices' => '', 'shopIds' => ''],
@@ -100,53 +100,44 @@ public function testEmotionsWithSamePosition()
     }
 
     /**
-     * @param array[] $expectedResult
-     *
-     * @return Connection|\PHPUnit\Framework\MockObject\MockObject
+     * @param array<array<string, mixed>> $expectedResult
      */
-    private function createQueryMock($expectedResult)
+    private function createQueryMock(array $expectedResult): Connection
     {
         $statement = $this->createMock(Statement::class);
-        $statement->expects(static::any())
-            ->method('fetchAll')
+        $statement->method('fetchAllAssociative')
             ->willReturn($expectedResult);
 
         $query = $this->createMock(QueryBuilder::class);
-        $query->expects(static::any())
-            ->method('execute')
+        $query->method('execute')
             ->willReturn($statement);
 
-        $query->expects(static::any())
-            ->method('andWhere')
+        $query->method('andWhere')
+            ->willReturn($query);
+
+        $query->method('innerJoin')
             ->willReturn($query);
 
-        $query->expects(static::any())
-            ->method('innerJoin')
+        $query->method('leftJoin')
             ->willReturn($query);
 
-        $query->expects(static::any())
-            ->method('leftJoin')
+        $query->method('select')
             ->willReturn($query);
 
-        $query->expects(static::any())
-            ->method('from')
+        $query->method('from')
             ->willReturn($query);
 
-        $query->expects(static::any())
-            ->method('addOrderBy')
+        $query->method('addOrderBy')
             ->willReturn($query);
 
-        $query->expects(static::any())
-            ->method('groupBy')
+        $query->method('groupBy')
             ->willReturn($query);
 
-        $query->expects(static::any())
-            ->method('setParameter')
+        $query->method('setParameter')
             ->willReturn($query);
 
         $connection = $this->createMock(Connection::class);
-        $connection->expects(static::any())
-            ->method('createQueryBuilder')
+        $connection->method('createQueryBuilder')
             ->willReturn($query);
 
         return $connection;
diff --git a/tests/Unit/Components/Escaper/EscaperTest.php b/tests/Unit/Components/Escaper/EscaperTest.php
index e84640fd604..4ccd29433e7 100644
--- a/tests/Unit/Components/Escaper/EscaperTest.php
+++ b/tests/Unit/Components/Escaper/EscaperTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Escaper;
diff --git a/tests/Unit/Components/Event/ContainerAwareEventManagerTest.php b/tests/Unit/Components/Event/ContainerAwareEventManagerTest.php
index 3fcadf13813..1172c14e45e 100644
--- a/tests/Unit/Components/Event/ContainerAwareEventManagerTest.php
+++ b/tests/Unit/Components/Event/ContainerAwareEventManagerTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Event;
diff --git a/tests/Unit/Components/Event/EventManagerTest.php b/tests/Unit/Components/Event/EventManagerTest.php
index 25ac867629b..0e3d753a030 100644
--- a/tests/Unit/Components/Event/EventManagerTest.php
+++ b/tests/Unit/Components/Event/EventManagerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Event;
diff --git a/tests/Unit/Components/Event/SubscriberArrayTest.php b/tests/Unit/Components/Event/SubscriberArrayTest.php
index 8d2bb831704..0d49a34a46c 100644
--- a/tests/Unit/Components/Event/SubscriberArrayTest.php
+++ b/tests/Unit/Components/Event/SubscriberArrayTest.php
@@ -1,59 +1,50 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Event;
 
 use Enlight_Event_EventArgs;
 use Enlight_Event_Handler_Default;
-use Enlight_Event_Subscriber;
 use Enlight_Event_Subscriber_Array;
 use PHPUnit\Framework\TestCase;
 
 class SubscriberArrayTest extends TestCase
 {
-    /**
-     * @var Enlight_Event_Subscriber_Array
-     */
-    protected $eventManager;
+    protected Enlight_Event_Subscriber_Array $eventManager;
 
     public function setUp(): void
     {
         $this->eventManager = new Enlight_Event_Subscriber_Array();
     }
 
-    public function testCanCreateInstance()
-    {
-        static::assertInstanceOf(Enlight_Event_Subscriber_Array::class, $this->eventManager);
-        static::assertInstanceOf(Enlight_Event_Subscriber::class, $this->eventManager);
-    }
-
-    public function testAddSubscriber()
+    public function testAddSubscriber(): void
     {
         // Add to subscribers
         $handler0 = new Enlight_Event_Handler_Default(
             'Example',
-            function ($args) {
+            function () {
                 return 'foo';
             }
         );
@@ -61,7 +52,7 @@ function ($args) {
 
         $handler1 = new Enlight_Event_Handler_Default(
             'Example',
-            function ($args) {
+            function () {
                 return 'bar';
             }
         );
@@ -74,12 +65,12 @@ function ($args) {
         static::assertEquals('bar', $result[1]->execute(new Enlight_Event_EventArgs()));
     }
 
-    public function testRemoveSubscriber()
+    public function testRemoveSubscriber(): void
     {
         // Add to subscribers
         $handler0 = new Enlight_Event_Handler_Default(
             'Example',
-            function ($args) {
+            function () {
                 return 'foo';
             }
         );
@@ -87,7 +78,7 @@ function ($args) {
 
         $handler1 = new Enlight_Event_Handler_Default(
             'Example',
-            function ($args) {
+            function () {
                 return 'bar';
             }
         );
diff --git a/tests/Unit/Components/Event/SubscriberConfigTest.php b/tests/Unit/Components/Event/SubscriberConfigTest.php
index ad9dd3a874a..f0322820039 100644
--- a/tests/Unit/Components/Event/SubscriberConfigTest.php
+++ b/tests/Unit/Components/Event/SubscriberConfigTest.php
@@ -1,41 +1,38 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Event;
 
 use Enlight_Event_EventArgs;
 use Enlight_Event_Handler_Default;
-use Enlight_Event_Subscriber;
 use Enlight_Event_Subscriber_Config;
 use PHPUnit\Framework\TestCase;
 
 class SubscriberConfigTest extends TestCase
 {
-    /**
-     * @var Enlight_Event_Subscriber_Config
-     */
-    protected $eventManager;
+    protected Enlight_Event_Subscriber_Config $eventManager;
 
     public function setUp(): void
     {
@@ -43,18 +40,12 @@ public function setUp(): void
         $this->eventManager = new Enlight_Event_Subscriber_Config('test');
     }
 
-    public function testCanCreateInstance()
-    {
-        static::assertInstanceOf(Enlight_Event_Subscriber_Config::class, $this->eventManager);
-        static::assertInstanceOf(Enlight_Event_Subscriber::class, $this->eventManager);
-    }
-
-    public function testAddSubscriber()
+    public function testAddSubscriber(): void
     {
         // Add to subscribers
         $handler0 = new Enlight_Event_Handler_Default(
             'Example',
-            function ($args) {
+            function () {
                 return 'foo';
             }
         );
@@ -62,7 +53,7 @@ function ($args) {
 
         $handler1 = new Enlight_Event_Handler_Default(
             'Example',
-            function ($args) {
+            function () {
                 return 'bar';
             }
         );
@@ -75,12 +66,12 @@ function ($args) {
         static::assertEquals('bar', $result[1]->execute(new Enlight_Event_EventArgs()));
     }
 
-    public function testRemoveSubscriber()
+    public function testRemoveSubscriber(): void
     {
         // Add to subscribers
         $handler0 = new Enlight_Event_Handler_Default(
             'Example',
-            function ($args) {
+            function () {
                 return 'foo';
             }
         );
@@ -88,7 +79,7 @@ function ($args) {
 
         $handler1 = new Enlight_Event_Handler_Default(
             'Example',
-            function ($args) {
+            function () {
                 return 'bar';
             }
         );
diff --git a/tests/Unit/Components/Filesystem/Adapter/AwsS3v3FactoryTest.php b/tests/Unit/Components/Filesystem/Adapter/AwsS3v3FactoryTest.php
index ab791ffb676..de311504f38 100644
--- a/tests/Unit/Components/Filesystem/Adapter/AwsS3v3FactoryTest.php
+++ b/tests/Unit/Components/Filesystem/Adapter/AwsS3v3FactoryTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Filesystem\Adapter;
diff --git a/tests/Unit/Components/Filesystem/Adapter/GoogleStorageFactoryTest.php b/tests/Unit/Components/Filesystem/Adapter/GoogleStorageFactoryTest.php
index fed5e772d4c..ce9545dc2c0 100644
--- a/tests/Unit/Components/Filesystem/Adapter/GoogleStorageFactoryTest.php
+++ b/tests/Unit/Components/Filesystem/Adapter/GoogleStorageFactoryTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Filesystem\Adapter;
diff --git a/tests/Unit/Components/Filesystem/Adapter/LocalFactoryTest.php b/tests/Unit/Components/Filesystem/Adapter/LocalFactoryTest.php
index 5a5186b4ea0..5c19e4a3111 100644
--- a/tests/Unit/Components/Filesystem/Adapter/LocalFactoryTest.php
+++ b/tests/Unit/Components/Filesystem/Adapter/LocalFactoryTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Filesystem\Adapter;
diff --git a/tests/Unit/Components/Filesystem/FilesystemFactoryTest.php b/tests/Unit/Components/Filesystem/FilesystemFactoryTest.php
index ec334220d12..673d4511589 100644
--- a/tests/Unit/Components/Filesystem/FilesystemFactoryTest.php
+++ b/tests/Unit/Components/Filesystem/FilesystemFactoryTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Filesystem;
diff --git a/tests/Unit/Components/Filesystem/PrefixFilesystemTest.php b/tests/Unit/Components/Filesystem/PrefixFilesystemTest.php
index 8f94f5e3797..bf465e6dbd1 100644
--- a/tests/Unit/Components/Filesystem/PrefixFilesystemTest.php
+++ b/tests/Unit/Components/Filesystem/PrefixFilesystemTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Filesystem;
diff --git a/tests/Unit/Components/Hook/EnlightHookProxyFactoryTest.php b/tests/Unit/Components/Hook/EnlightHookProxyFactoryTest.php
index efd70707b19..215cbd4357b 100644
--- a/tests/Unit/Components/Hook/EnlightHookProxyFactoryTest.php
+++ b/tests/Unit/Components/Hook/EnlightHookProxyFactoryTest.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Hook;
@@ -30,7 +31,7 @@
 
 class EnlightHookProxyFactoryTest extends TestCase
 {
-    private $proxyFactory;
+    private TestProxyFactory $proxyFactory;
 
     public function setUp(): void
     {
@@ -41,9 +42,9 @@ public function setUp(): void
         $this->proxyFactory = new TestProxyFactory($hookManager, 'ShopwareTests');
     }
 
-    public function testGenerateBasicProxyClass()
+    public function testGenerateBasicProxyClass(): void
     {
-        $generatedClass = $this->invokeMethod($this->proxyFactory, 'generateProxyClass', [MyBasicTestClass::class]);
+        $generatedClass = $this->invokeMethod($this->proxyFactory, [MyBasicTestClass::class]);
         $expectedClass = <<<'EOT'
 <?php
 class ShopwareTests_ShopwareTestsUnitComponentsHookMyBasicTestClassProxy extends \Shopware\Tests\Unit\Components\Hook\MyBasicTestClass implements Enlight_Hook_Proxy
@@ -128,7 +129,7 @@ public function __executeOriginalMethod($method, array $args = [])
     /**
      * @inheritdoc
      */
-    public function myPublic($bar, $foo = 'bar', array $barBar = [], ?\Shopware\Tests\Unit\Components\Hook\MyInterface $fooFoo = null)
+    public function myPublic(string $bar, string $foo = 'bar', array $barBar = [], ?\Shopware\Tests\Unit\Components\Hook\MyInterface $fooFoo = null) : string
     {
         return $this->__getActiveHookManager(__FUNCTION__)->executeHooks(
             $this,
@@ -166,9 +167,9 @@ protected function myProtected($bar)
         static::assertSame($expectedClass, $generatedClass);
     }
 
-    public function testGenerateProxyClassWithReferenceParameter()
+    public function testGenerateProxyClassWithReferenceParameter(): void
     {
-        $generatedClass = $this->invokeMethod($this->proxyFactory, 'generateProxyClass', [MyReferenceTestClass::class]);
+        $generatedClass = $this->invokeMethod($this->proxyFactory, [MyReferenceTestClass::class]);
         $expectedClass = <<<'EOT'
 <?php
 class ShopwareTests_ShopwareTestsUnitComponentsHookMyReferenceTestClassProxy extends \Shopware\Tests\Unit\Components\Hook\MyReferenceTestClass implements Enlight_Hook_Proxy
@@ -253,7 +254,7 @@ public function __executeOriginalMethod($method, array $args = [])
     /**
      * @inheritdoc
      */
-    public function myPublic(&$bar, $foo)
+    public function myPublic(string &$bar, string $foo) : string
     {
         return $this->__getActiveHookManager(__FUNCTION__)->executeHooks(
             $this,
@@ -267,11 +268,12 @@ public function myPublic(&$bar, $foo)
         static::assertSame($expectedClass, $generatedClass);
     }
 
-    private function invokeMethod($object, string $methodName, array $parameters = [])
+    /**
+     * @param array<class-string> $parameters
+     */
+    private function invokeMethod(TestProxyFactory $object, array $parameters = []): string
     {
-        $className = \get_class($object);
-        static::assertIsString($className);
-        $method = (new ReflectionClass($className))->getMethod($methodName);
+        $method = (new ReflectionClass($object))->getMethod('generateProxyClass');
         $method->setAccessible(true);
 
         return $method->invokeArgs($object, $parameters);
diff --git a/tests/Unit/Components/Hook/HookManagerTest.php b/tests/Unit/Components/Hook/HookManagerTest.php
index bf2a5c9a697..336a7fbcb33 100644
--- a/tests/Unit/Components/Hook/HookManagerTest.php
+++ b/tests/Unit/Components/Hook/HookManagerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Hook;
@@ -148,7 +148,7 @@ function (Enlight_Hook_HookArgs $args) use (&$hookCallCounter) {
             HookManagerTestTarget::TEST_METHOD_NAME,
             self::TEST_ARGS
         );
-        static::assertEquals((self::TEST_NAME_ARG . '_mod'), $returnValue);
+        static::assertEquals(self::TEST_NAME_ARG . '_mod', $returnValue);
         static::assertEquals(1, $hookCallCounter);
         static::assertEquals(1, $proxy->originalMethodCallCounter);
     }
@@ -180,7 +180,7 @@ function (Enlight_Hook_HookArgs $args) use (&$hookCallCounter) {
             HookManagerTestTarget::PROTECTED_TEST_METHOD_NAME,
             self::TEST_ARGS
         );
-        static::assertEquals((self::TEST_NAME_ARG . '_mod'), $returnValue);
+        static::assertEquals(self::TEST_NAME_ARG . '_mod', $returnValue);
         static::assertEquals(1, $hookCallCounter);
         static::assertEquals(1, $proxy->originalProtectedMethodCallCounter);
     }
@@ -247,7 +247,7 @@ function (Enlight_Hook_HookArgs $args) use (&$hookCallCounter) {
             HookManagerTestTarget::TEST_METHOD_NAME,
             self::TEST_ARGS
         );
-        static::assertEquals((self::TEST_NAME_ARG . '_mod'), $returnValue);
+        static::assertEquals(self::TEST_NAME_ARG . '_mod', $returnValue);
         static::assertEquals(1, $hookCallCounter);
         static::assertEquals(1, $proxy->originalMethodCallCounter);
     }
@@ -609,9 +609,9 @@ public function testExecuteHooksReplaceWithParentExectionRecursive()
             function (Enlight_Hook_HookArgs $args) use (&$hookCallCounter) {
                 ++$hookCallCounter;
                 // The limit should only be reduced after this hook is called
-                static::assertEquals((self::RECURSIVE_TEST_LIMIT_ARG - $hookCallCounter + 1), $args->limit);
+                static::assertEquals(self::RECURSIVE_TEST_LIMIT_ARG - $hookCallCounter + 1, $args->limit);
                 // The original method should have been called less often than this hook
-                static::assertEquals(($hookCallCounter - 1), $args->getSubject()->originalRecursiveMethodCallCounter);
+                static::assertEquals($hookCallCounter - 1, $args->getSubject()->originalRecursiveMethodCallCounter);
                 // The return value should not be set in any hook call, because it is recursively resovled
                 static::assertNull($args->getReturn());
 
@@ -630,8 +630,8 @@ function (Enlight_Hook_HookArgs $args) use (&$hookCallCounter) {
             self::RECURSIVE_TEST_ARGS
         );
         static::assertEquals(self::RECURSIVE_TEST_LIMIT_ARG, $returnValue);
-        static::assertEquals((self::RECURSIVE_TEST_LIMIT_ARG + 1), $hookCallCounter);
-        static::assertEquals((self::RECURSIVE_TEST_LIMIT_ARG + 1), $proxy->originalRecursiveMethodCallCounter);
+        static::assertEquals(self::RECURSIVE_TEST_LIMIT_ARG + 1, $hookCallCounter);
+        static::assertEquals(self::RECURSIVE_TEST_LIMIT_ARG + 1, $proxy->originalRecursiveMethodCallCounter);
     }
 
     /**
@@ -655,11 +655,11 @@ function (Enlight_Hook_HookArgs $args) use (
             ) {
                 ++$firstHookCallCounter;
                 // The limit should only be reduced after this hook is called
-                static::assertEquals((self::RECURSIVE_TEST_LIMIT_ARG - $firstHookCallCounter + 1), $args->limit);
+                static::assertEquals(self::RECURSIVE_TEST_LIMIT_ARG - $firstHookCallCounter + 1, $args->limit);
                 // The original method and the other hooks should have been called less often than this hook
-                static::assertEquals(($firstHookCallCounter - 1), $args->getSubject()->originalRecursiveMethodCallCounter);
-                static::assertEquals(($firstHookCallCounter - 1), $secondHookCallCounter);
-                static::assertEquals(($firstHookCallCounter - 1), $thirdHookCallCounter);
+                static::assertEquals($firstHookCallCounter - 1, $args->getSubject()->originalRecursiveMethodCallCounter);
+                static::assertEquals($firstHookCallCounter - 1, $secondHookCallCounter);
+                static::assertEquals($firstHookCallCounter - 1, $thirdHookCallCounter);
                 // The return value should not be set in any hook call, because it is recursively resovled
                 static::assertNull($args->getReturn());
 
@@ -685,10 +685,10 @@ function (Enlight_Hook_HookArgs $args) use (
             ) {
                 ++$secondHookCallCounter;
                 // The limit should only be reduced after this hook is called
-                static::assertEquals((self::RECURSIVE_TEST_LIMIT_ARG - $secondHookCallCounter + 1), $args->limit);
+                static::assertEquals(self::RECURSIVE_TEST_LIMIT_ARG - $secondHookCallCounter + 1, $args->limit);
                 // The original method and the third hook should have been called less often than this hook
-                static::assertEquals(($secondHookCallCounter - 1), $args->getSubject()->originalRecursiveMethodCallCounter);
-                static::assertEquals(($secondHookCallCounter - 1), $thirdHookCallCounter);
+                static::assertEquals($secondHookCallCounter - 1, $args->getSubject()->originalRecursiveMethodCallCounter);
+                static::assertEquals($secondHookCallCounter - 1, $thirdHookCallCounter);
                 // The first hook should have been called as many times as this hook
                 static::assertEquals($secondHookCallCounter, $firstHookCallCounter);
                 // The return value should not be set in any hook call, because it is recursively resovled
@@ -715,9 +715,9 @@ function (Enlight_Hook_HookArgs $args) use (
             ) {
                 ++$thirdHookCallCounter;
                 // The limit should only be reduced after this hook is called
-                static::assertEquals((self::RECURSIVE_TEST_LIMIT_ARG - $thirdHookCallCounter + 1), $args->limit);
+                static::assertEquals(self::RECURSIVE_TEST_LIMIT_ARG - $thirdHookCallCounter + 1, $args->limit);
                 // The original method should have been called less often than this hook
-                static::assertEquals(($thirdHookCallCounter - 1), $args->getSubject()->originalRecursiveMethodCallCounter);
+                static::assertEquals($thirdHookCallCounter - 1, $args->getSubject()->originalRecursiveMethodCallCounter);
                 // The other hooks should have been called as many times as this hook
                 static::assertEquals($thirdHookCallCounter, $firstHookCallCounter);
                 static::assertEquals($thirdHookCallCounter, $secondHookCallCounter);
@@ -739,10 +739,10 @@ function (Enlight_Hook_HookArgs $args) use (
             self::RECURSIVE_TEST_ARGS
         );
         static::assertEquals(self::RECURSIVE_TEST_LIMIT_ARG, $returnValue);
-        static::assertEquals((self::RECURSIVE_TEST_LIMIT_ARG + 1), $firstHookCallCounter);
-        static::assertEquals((self::RECURSIVE_TEST_LIMIT_ARG + 1), $secondHookCallCounter);
-        static::assertEquals((self::RECURSIVE_TEST_LIMIT_ARG + 1), $thirdHookCallCounter);
-        static::assertEquals((self::RECURSIVE_TEST_LIMIT_ARG + 1), $proxy->originalRecursiveMethodCallCounter);
+        static::assertEquals(self::RECURSIVE_TEST_LIMIT_ARG + 1, $firstHookCallCounter);
+        static::assertEquals(self::RECURSIVE_TEST_LIMIT_ARG + 1, $secondHookCallCounter);
+        static::assertEquals(self::RECURSIVE_TEST_LIMIT_ARG + 1, $thirdHookCallCounter);
+        static::assertEquals(self::RECURSIVE_TEST_LIMIT_ARG + 1, $proxy->originalRecursiveMethodCallCounter);
     }
 
     /**
@@ -808,12 +808,12 @@ function (Enlight_Hook_HookArgs $args) use (
         //      1 initial call
         //    + 3 recursive calls triggered when calling 'executeParent()' for the first time in the initial hook call
         //    + 3 recursive calls triggered when calling 'executeParent()' a second time in the initial hook call
-        static::assertEquals((1 + 2 * (self::RECURSIVE_TEST_LIMIT_ARG + 1)), $firstHookCallCounter);
+        static::assertEquals(1 + 2 * (self::RECURSIVE_TEST_LIMIT_ARG + 1), $firstHookCallCounter);
         // Since every call of the first hook calls 'executeParent()' twice, all methods following in the execution
         // chain should be called twice as often as the first hook. Hence, with a limit of 2, the second hook and the
         // original method should have been called 14 times each.
-        static::assertEquals((2 * $firstHookCallCounter), $secondHookCallCounter);
-        static::assertEquals((2 * $firstHookCallCounter), $proxy->originalRecursiveMethodCallCounter);
+        static::assertEquals(2 * $firstHookCallCounter, $secondHookCallCounter);
+        static::assertEquals(2 * $firstHookCallCounter, $proxy->originalRecursiveMethodCallCounter);
     }
 
     /**
@@ -960,17 +960,17 @@ function (Enlight_Hook_HookArgs $args) use ($classArg, $methodArg, $contextArg,
     /**
      * Uncomment with 5.8
      */
-    //public function testFalseClassThrowsException()
-    //{
+    // public function testFalseClassThrowsException()
+    // {
     //   self::expectException(\Enlight_Hook_Exception::class);
     //    $this->hookManager->getProxy(HookManagerTestNoTarget::class);
-    //}
+    // }
 
     /**
      * @param string $methodName
      * @param string $hookType
      */
-    private function addHookListener($methodName, $hookType, callable $callback = null)
+    private function addHookListener($methodName, $hookType, ?callable $callback = null)
     {
         $callback = $callback ?: function (Enlight_Hook_HookArgs $args) {
             // pass
diff --git a/tests/Unit/Components/Hook/HookManagerTestNoTarget.php b/tests/Unit/Components/Hook/HookManagerTestNoTarget.php
index 276aa662139..2c19ff59193 100644
--- a/tests/Unit/Components/Hook/HookManagerTestNoTarget.php
+++ b/tests/Unit/Components/Hook/HookManagerTestNoTarget.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Hook;
diff --git a/tests/Unit/Components/Hook/HookManagerTestTarget.php b/tests/Unit/Components/Hook/HookManagerTestTarget.php
index 72910dab0a2..c213362f952 100644
--- a/tests/Unit/Components/Hook/HookManagerTestTarget.php
+++ b/tests/Unit/Components/Hook/HookManagerTestTarget.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Hook;
diff --git a/tests/Unit/Components/Hook/MyBasicTestClass.php b/tests/Unit/Components/Hook/MyBasicTestClass.php
index 0ae043b1122..17c7c9486a7 100644
--- a/tests/Unit/Components/Hook/MyBasicTestClass.php
+++ b/tests/Unit/Components/Hook/MyBasicTestClass.php
@@ -5,30 +5,29 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Hook;
 
 class MyBasicTestClass implements MyInterface
 {
-    public function myPublic($bar, $foo = 'bar', array $barBar = [], MyInterface $fooFoo = null)
+    public function myPublic(string $bar, string $foo = 'bar', array $barBar = [], ?MyInterface $fooFoo = null): string
     {
         return $bar . $foo;
     }
diff --git a/tests/Unit/Components/Hook/MyInterface.php b/tests/Unit/Components/Hook/MyInterface.php
index f64d54dab8e..9a3dfc3c751 100644
--- a/tests/Unit/Components/Hook/MyInterface.php
+++ b/tests/Unit/Components/Hook/MyInterface.php
@@ -5,28 +5,27 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Hook;
 
 interface MyInterface
 {
-    public function myPublic($bar, $foo = 'bar', array $barBar = [], MyInterface $fooFoo = null);
+    public function myPublic(string $bar, string $foo = 'bar', array $barBar = [], ?MyInterface $fooFoo = null): string;
 }
diff --git a/tests/Unit/Components/Hook/MyReferenceInterface.php b/tests/Unit/Components/Hook/MyReferenceInterface.php
index 5b7ae1e4252..b871a019576 100644
--- a/tests/Unit/Components/Hook/MyReferenceInterface.php
+++ b/tests/Unit/Components/Hook/MyReferenceInterface.php
@@ -5,28 +5,27 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Hook;
 
 interface MyReferenceInterface
 {
-    public function myPublic(&$bar, $foo);
+    public function myPublic(string &$bar, string $foo): string;
 }
diff --git a/tests/Unit/Components/Hook/MyReferenceTestClass.php b/tests/Unit/Components/Hook/MyReferenceTestClass.php
index cfdc60112b2..f34c97c3c17 100644
--- a/tests/Unit/Components/Hook/MyReferenceTestClass.php
+++ b/tests/Unit/Components/Hook/MyReferenceTestClass.php
@@ -5,30 +5,29 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Hook;
 
 class MyReferenceTestClass implements MyReferenceInterface
 {
-    public function myPublic(&$bar, $foo)
+    public function myPublic(string &$bar, string $foo): string
     {
         return $bar . $foo;
     }
diff --git a/tests/Unit/Components/Hook/TestProxyFactory.php b/tests/Unit/Components/Hook/TestProxyFactory.php
index a5678bb1c3a..d31ebac19c5 100644
--- a/tests/Unit/Components/Hook/TestProxyFactory.php
+++ b/tests/Unit/Components/Hook/TestProxyFactory.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Hook;
diff --git a/tests/Unit/Components/HttpCache/AppCacheTest.php b/tests/Unit/Components/HttpCache/AppCacheTest.php
new file mode 100644
index 00000000000..91adba3c16b
--- /dev/null
+++ b/tests/Unit/Components/HttpCache/AppCacheTest.php
@@ -0,0 +1,69 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Unit\Components\HttpCache;
+
+use Enlight_Controller_Request_RequestTestCase;
+use Enlight_Controller_Response_ResponseTestCase;
+use PHPUnit\Framework\TestCase;
+use Shopware\Components\HttpCache\AppCache;
+use Shopware\Kernel;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+class AppCacheTest extends TestCase
+{
+    public function testCheckSltCookie(): void
+    {
+        $kernel = $this->getMockBuilder(Kernel::class)->disableOriginalConstructor()->getMock();
+        $kernel->method('getCacheDir')->willReturn('\tmp');
+        $kernel->method('getContainer')->willReturn($this->getMockBuilder(ContainerInterface::class)->disableOriginalConstructor()->getMock());
+        $kernel->method('handle')->willReturn(new Enlight_Controller_Response_ResponseTestCase());
+
+        $appCache = new AppCache(
+            $kernel,
+            [
+                'ignored_url_parameters' => [],
+                'lookup_optimization' => true,
+            ]
+        );
+
+        $request = new Enlight_Controller_Request_RequestTestCase(
+            [],
+            [],
+            [],
+            [],
+            [],
+            [
+                'REQUEST_URI' => '/backend/',
+            ],
+        );
+
+        $request->setCookie('slt', '');
+
+        $appCache->handle($request);
+
+        static::assertEquals('slt', $request->cookies->get('nocache'));
+    }
+}
diff --git a/tests/Unit/Components/HttpCache/StoreTest.php b/tests/Unit/Components/HttpCache/StoreTest.php
index 7d0856eedbc..8eaa3ee4562 100644
--- a/tests/Unit/Components/HttpCache/StoreTest.php
+++ b/tests/Unit/Components/HttpCache/StoreTest.php
@@ -1,42 +1,46 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\HttpCache;
 
 use PHPUnit\Framework\TestCase;
 use ReflectionClass;
+use Shopware\Components\HttpCache\Store;
 use Symfony\Component\HttpFoundation\Request;
 
 class StoreTest extends TestCase
 {
+    private Store $httpCacheStore;
+
     public function setUp(): void
     {
-        $this->httpCacheStore = new \Shopware\Components\HttpCache\Store(
+        $this->httpCacheStore = new Store(
             'test',
             [],
             true,
-            [          //Set of parameters that must be ignored in the url
+            [          // Set of parameters that must be ignored in the url
                 'foo',
                 '_foo',
                 '__foo',
@@ -44,7 +48,10 @@ public function setUp(): void
         );
     }
 
-    public function provideUrls()
+    /**
+     * @return array<array{original: string, compare: string}>
+     */
+    public function provideUrls(): array
     {
         return [
             [
@@ -173,16 +180,12 @@ public function provideUrls()
     /**
      * @dataProvider provideUrls
      *
-     * @param string $originalURL
-     * @param string $expectedURL
-     *
-     * @see Shopware\Components\HttpCache\Store::generateCacheKey
+     * @see Store::generateCacheKey
      */
-    public function testGenerateCacheKey($originalURL, $expectedURL)
+    public function testGenerateCacheKey(string $originalURL, string $expectedURL): void
     {
         $originalRequest = Request::create($originalURL);
-        $class = new ReflectionClass($this->httpCacheStore);
-        $method = $class->getMethod('generateCacheKey');
+        $method = (new ReflectionClass($this->httpCacheStore))->getMethod('generateCacheKey');
         $method->setAccessible(true);
 
         static::assertSame(
@@ -194,16 +197,12 @@ public function testGenerateCacheKey($originalURL, $expectedURL)
     /**
      * @dataProvider provideUrls
      *
-     * @param string $originalURL
-     * @param string $expectedURL
-     *
-     * @see Shopware\Components\HttpCache\Store::verifyIgnoredParameters
+     * @see Store::verifyIgnoredParameters
      */
-    public function testVerifyIgnoredParameters($originalURL, $expectedURL)
+    public function testVerifyIgnoredParameters(string $originalURL, string $expectedURL): void
     {
         $originalRequest = Request::create($originalURL);
-        $class = new ReflectionClass($this->httpCacheStore);
-        $method = $class->getMethod('verifyIgnoredParameters');
+        $method = (new ReflectionClass($this->httpCacheStore))->getMethod('verifyIgnoredParameters');
         $method->setAccessible(true);
 
         static::assertSame(
diff --git a/tests/Unit/Components/LegacyRequestWrapper/GetWrapperTest.php b/tests/Unit/Components/LegacyRequestWrapper/GetWrapperTest.php
index fdcf262608a..7e1b1d9096a 100644
--- a/tests/Unit/Components/LegacyRequestWrapper/GetWrapperTest.php
+++ b/tests/Unit/Components/LegacyRequestWrapper/GetWrapperTest.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\LegacyRequestWrapper;
@@ -30,15 +31,9 @@
 
 class GetWrapperTest extends TestCase
 {
-    /**
-     * @var Enlight_Controller_Request_RequestTestCase
-     */
-    private $request;
+    private Enlight_Controller_Request_RequestTestCase $request;
 
-    /**
-     * @var sSystem
-     */
-    private $system;
+    private sSystem $system;
 
     public function setUp(): void
     {
@@ -51,7 +46,7 @@ public function tearDown(): void
         $this->request->clearAll();
     }
 
-    public function testSet()
+    public function testSet(): void
     {
         $this->system->_GET->offsetSet('foo', 'bar');
         static::assertEquals('bar', $this->request->getQuery('foo'));
@@ -60,11 +55,11 @@ public function testSet()
         static::assertNull($this->request->getQuery('bar'));
 
         $this->system->_GET->offsetSet('foo', []);
-        static::assertEmpty($this->request->getQuery('bar'));
+        static::assertNull($this->request->getQuery('bar'));
         static::assertIsArray($this->request->getQuery('foo'));
     }
 
-    public function testGet()
+    public function testGet(): void
     {
         $this->request->setQuery('foo', 'bar');
         static::assertEquals('bar', $this->system->_GET->offsetGet('foo'));
@@ -73,11 +68,11 @@ public function testGet()
         static::assertNull($this->system->_GET->offsetGet('bar'));
 
         $this->request->setQuery('foo', []);
-        static::assertEmpty($this->system->_GET->offsetGet('bar'));
+        static::assertNull($this->system->_GET->offsetGet('bar'));
         static::assertIsArray($this->system->_GET->offsetGet('foo'));
     }
 
-    public function testUnset()
+    public function testUnset(): void
     {
         $this->system->_GET->offsetSet('foo', 'bar');
         static::assertEquals('bar', $this->request->getQuery('foo'));
@@ -85,7 +80,7 @@ public function testUnset()
         static::assertNull($this->request->getQuery('foo'));
     }
 
-    public function testSetAll()
+    public function testSetAll(): void
     {
         $this->system->_GET->offsetSet('foo', 'bar');
         static::assertEquals('bar', $this->request->getQuery('foo'));
@@ -95,7 +90,7 @@ public function testSetAll()
         static::assertEquals('too', $this->request->getQuery('foo'));
     }
 
-    public function testToArray()
+    public function testToArray(): void
     {
         $this->request->setQuery('foo', 'bar');
         static::assertEquals(['foo' => 'bar'], $this->system->_GET->toArray());
diff --git a/tests/Unit/Components/LegacyRequestWrapper/PostWrapperTest.php b/tests/Unit/Components/LegacyRequestWrapper/PostWrapperTest.php
index 6987016c9b0..12740f9e790 100644
--- a/tests/Unit/Components/LegacyRequestWrapper/PostWrapperTest.php
+++ b/tests/Unit/Components/LegacyRequestWrapper/PostWrapperTest.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\LegacyRequestWrapper;
@@ -30,15 +31,9 @@
 
 class PostWrapperTest extends TestCase
 {
-    /**
-     * @var Enlight_Controller_Request_RequestTestCase
-     */
-    private $request;
+    private Enlight_Controller_Request_RequestTestCase $request;
 
-    /**
-     * @var sSystem
-     */
-    private $system;
+    private sSystem $system;
 
     public function setUp(): void
     {
@@ -51,7 +46,7 @@ public function tearDown(): void
         $this->request->clearAll();
     }
 
-    public function testSet()
+    public function testSet(): void
     {
         $this->system->_POST->offsetSet('foo', 'bar');
         static::assertEquals('bar', $this->request->getPost('foo'));
@@ -60,11 +55,11 @@ public function testSet()
         static::assertNull($this->request->getPost('bar'));
 
         $this->system->_POST->offsetSet('foo', []);
-        static::assertEmpty($this->request->getPost('bar'));
+        static::assertNull($this->request->getPost('bar'));
         static::assertIsArray($this->request->getPost('foo'));
     }
 
-    public function testGet()
+    public function testGet(): void
     {
         $this->request->setPost('foo', 'bar');
         static::assertEquals('bar', $this->system->_POST->offsetGet('foo'));
@@ -73,11 +68,11 @@ public function testGet()
         static::assertNull($this->system->_POST->offsetGet('bar'));
 
         $this->request->setPost('foo', []);
-        static::assertEmpty($this->system->_POST->offsetGet('bar'));
+        static::assertNull($this->system->_POST->offsetGet('bar'));
         static::assertIsArray($this->system->_POST->offsetGet('foo'));
     }
 
-    public function testUnset()
+    public function testUnset(): void
     {
         $this->system->_POST->offsetSet('foo', 'bar');
         static::assertEquals('bar', $this->request->getPost('foo'));
@@ -85,7 +80,7 @@ public function testUnset()
         static::assertNull($this->request->getPost('foo'));
     }
 
-    public function testSetAll()
+    public function testSetAll(): void
     {
         $this->system->_POST->offsetSet('foo', 'bar');
         static::assertEquals('bar', $this->request->getPost('foo'));
@@ -95,7 +90,7 @@ public function testSetAll()
         static::assertEquals('too', $this->request->getPost('foo'));
     }
 
-    public function testToArray()
+    public function testToArray(): void
     {
         $this->request->setPost('foo', 'bar');
         static::assertEquals(['foo' => 'bar'], $this->system->_POST->toArray());
diff --git a/tests/Unit/Components/MailTest.php b/tests/Unit/Components/MailTest.php
index f9b4170865c..f24a4ed2876 100644
--- a/tests/Unit/Components/MailTest.php
+++ b/tests/Unit/Components/MailTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components;
@@ -30,7 +30,7 @@
 
 class MailTest extends TestCase
 {
-    public function testValidFromAddress()
+    public function testValidFromAddress(): void
     {
         $mail = new Enlight_Components_Mail();
         $mail->setFrom('foo@example.com', 'Sender\'s name');
@@ -38,7 +38,7 @@ public function testValidFromAddress()
         static::assertSame('foo@example.com', $mail->getFrom());
     }
 
-    public function testCodeInjectionInFromHeader()
+    public function testCodeInjectionInFromHeader(): void
     {
         $mail = new Enlight_Components_Mail();
 
diff --git a/tests/Unit/Components/MemoryLimitTest.php b/tests/Unit/Components/MemoryLimitTest.php
index e9dd71ae652..0183eceaafe 100644
--- a/tests/Unit/Components/MemoryLimitTest.php
+++ b/tests/Unit/Components/MemoryLimitTest.php
@@ -3,23 +3,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Components;
diff --git a/tests/Unit/Components/Model/CategoryDenormalizationTest.php b/tests/Unit/Components/Model/CategoryDenormalizationTest.php
index efcd5d90b32..fb1f9009a70 100644
--- a/tests/Unit/Components/Model/CategoryDenormalizationTest.php
+++ b/tests/Unit/Components/Model/CategoryDenormalizationTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Model;
diff --git a/tests/Unit/Components/Model/ModelEntityTest.php b/tests/Unit/Components/Model/ModelEntityTest.php
index 1ea53420878..99e54e54e45 100644
--- a/tests/Unit/Components/Model/ModelEntityTest.php
+++ b/tests/Unit/Components/Model/ModelEntityTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Model;
@@ -28,60 +28,55 @@
 use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 use ReflectionClass;
-use Shopware\Models\Article\Article;
+use Shopware\Components\Model\ModelEntity;
+use Shopware\Models\Article\Article as Product;
 use Shopware\Models\Article\Configurator\Template\Template;
 use Shopware\Models\Article\Link;
 use Shopware\Models\Article\Supplier;
 use Shopware\Models\Country\Area;
+use Shopware\Models\Country\Country;
 use Shopware\Models\Document\Document;
+use Shopware\Models\Document\Element;
 use Shopware\Models\Tax\Tax;
+use Shopware\Models\Voucher\Code;
 use Shopware\Models\Voucher\Voucher;
 
-/**
- * @covers \Shopware\Components\Model\ModelEntity
- *
- * @uses \Shopware\Models\Article\Article
- * @uses \Shopware\Models\Article\Link
- * @uses \Shopware\Models\Article\Supplier
- * @uses \Shopware\Models\Article\Configurator\Template\Template
- * @uses \Shopware\Models\Tax\Tax
- */
 class ModelEntityTest extends TestCase
 {
-    public function testCanAssignProperties()
+    public function testCanAssignProperties(): void
     {
-        $article = new Article();
+        $product = new Product();
 
         $data = [
             'name' => 'foo',
             'description' => 'bar',
         ];
 
-        $article->fromArray($data);
+        $product->fromArray($data);
 
-        static::assertEquals('foo', $article->getName());
-        static::assertEquals('bar', $article->getDescription());
+        static::assertSame('foo', $product->getName());
+        static::assertSame('bar', $product->getDescription());
     }
 
-    public function testCanReAssignProperties()
+    public function testCanReAssignProperties(): void
     {
-        $article = new Article();
-        $article->setName('lorem');
-        $article->setDescription('bar');
+        $product = new Product();
+        $product->setName('lorem');
+        $product->setDescription('bar');
 
         $data = [
             'name' => 'foo',
         ];
 
-        $article->fromArray($data);
+        $product->fromArray($data);
 
-        static::assertEquals('foo', $article->getName());
-        static::assertEquals('bar', $article->getDescription());
+        static::assertSame('foo', $product->getName());
+        static::assertSame('bar', $product->getDescription());
     }
 
     public function testCanAssignOneToOne(): void
     {
-        $product = new Article();
+        $product = new Product();
 
         $data = [
             'configuratorTemplate' => [
@@ -94,7 +89,7 @@ public function testCanAssignOneToOne(): void
 
         static::assertNotNull($product->getConfiguratorTemplate());
         static::assertTrue($product->getConfiguratorTemplate()->getActive());
-        static::assertEquals('baz', $product->getConfiguratorTemplate()->getEan());
+        static::assertSame('baz', $product->getConfiguratorTemplate()->getEan());
 
         // configuratorTemplate is the owning side of relation, so article has to be set
         static::assertSame($product, $product->getConfiguratorTemplate()->getArticle());
@@ -102,7 +97,7 @@ public function testCanAssignOneToOne(): void
 
     public function testLoopsArePreventedOneToOne(): void
     {
-        $product = new Article();
+        $product = new Product();
 
         $data = [
             'name' => 'foo',
@@ -122,7 +117,7 @@ public function testLoopsArePreventedOneToOne(): void
 
     public function testCanAssignOneToOneByInstance(): void
     {
-        $product = new Article();
+        $product = new Product();
 
         $tax = new Tax();
         $tax->setName('foobar');
@@ -143,7 +138,7 @@ public function testCanAssignOneToOneByInstance(): void
 
     public function testCanReAssignOneToOne(): void
     {
-        $product = new Article();
+        $product = new Product();
 
         $template = new Template();
         $template->setEan('foo');
@@ -160,12 +155,12 @@ public function testCanReAssignOneToOne(): void
 
         static::assertNotNull($product->getConfiguratorTemplate());
         static::assertTrue($product->getConfiguratorTemplate()->getActive());
-        static::assertEquals('foo', $product->getConfiguratorTemplate()->getEan());
+        static::assertSame('foo', $product->getConfiguratorTemplate()->getEan());
     }
 
     public function testCanEmptyArrayDoesNotOverrideOneToOne(): void
     {
-        $product = new Article();
+        $product = new Product();
 
         $template = new Template();
         $template->setEan('foo');
@@ -181,12 +176,12 @@ public function testCanEmptyArrayDoesNotOverrideOneToOne(): void
 
         static::assertNotNull($product->getConfiguratorTemplate());
         static::assertTrue($product->getConfiguratorTemplate()->getActive());
-        static::assertEquals('foo', $product->getConfiguratorTemplate()->getEan());
+        static::assertSame('foo', $product->getConfiguratorTemplate()->getEan());
     }
 
     public function testCanRemoveOneToOne(): void
     {
-        $product = new Article();
+        $product = new Product();
         $product->setName('Dummy');
 
         $template = new Template();
@@ -205,9 +200,9 @@ public function testCanRemoveOneToOne(): void
         static::assertNull($template->getArticle());
     }
 
-    public function testCanAssignManyToOne()
+    public function testCanAssignManyToOne(): void
     {
-        $article = new Article();
+        $product = new Product();
 
         $data = [
             'supplier' => [
@@ -215,14 +210,16 @@ public function testCanAssignManyToOne()
             ],
         ];
 
-        $article->fromArray($data);
+        $product->fromArray($data);
 
-        static::assertEquals('foo', $article->getSupplier()->getName());
+        $supplier = $product->getSupplier();
+        static::assertNotNull($supplier);
+        static::assertSame('foo', $supplier->getName());
     }
 
-    public function testCanAssignManyToOneByInstance()
+    public function testCanAssignManyToOneByInstance(): void
     {
-        $article = new Article();
+        $product = new Product();
 
         $supplier = new Supplier();
         $supplier->setName('test');
@@ -231,22 +228,22 @@ public function testCanAssignManyToOneByInstance()
             'supplier' => $supplier,
         ];
 
-        $article->fromArray($data);
+        $product->fromArray($data);
 
-        static::assertSame($supplier, $article->getSupplier());
+        static::assertSame($supplier, $product->getSupplier());
     }
 
-    public function testCanReAssignManyToOne()
+    public function testCanReAssignManyToOne(): void
     {
-        $article = new Article();
+        $product = new Product();
 
         $supplier = new Supplier();
         $supplier->setName('test');
         $supplier->setDescription('description');
 
-        $article->setSupplier($supplier);
+        $product->setSupplier($supplier);
 
-        static::assertSame($supplier, $article->getSupplier());
+        static::assertSame($supplier, $product->getSupplier());
 
         $data = [
             'supplier' => [
@@ -254,69 +251,73 @@ public function testCanReAssignManyToOne()
             ],
         ];
 
-        $article->fromArray($data);
+        $product->fromArray($data);
 
-        static::assertEquals('foo', $article->getSupplier()->getName());
+        $supplier = $product->getSupplier();
+        static::assertNotNull($supplier);
+        static::assertSame('foo', $supplier->getName());
 
-        // 19 taxrate shoud be preserved
-        static::assertEquals('description', $article->getSupplier()->getDescription());
+        // 19 tax rate should be preserved
+        static::assertSame('description', $supplier->getDescription());
     }
 
-    public function testCanEmptyArrayDoesNotOverrideManyToOne()
+    public function testCanEmptyArrayDoesNotOverrideManyToOne(): void
     {
-        $article = new Article();
+        $product = new Product();
 
         $supplier = new Supplier();
         $supplier->setName('test');
         $supplier->setDescription('description');
 
-        $article->setSupplier($supplier);
+        $product->setSupplier($supplier);
 
-        static::assertSame($supplier, $article->getSupplier());
+        static::assertSame($supplier, $product->getSupplier());
 
         $data = [
             'supplier' => [],
         ];
 
-        $article->fromArray($data);
+        $product->fromArray($data);
 
-        static::assertEquals('test', $article->getSupplier()->getName());
-        static::assertEquals('description', $article->getSupplier()->getDescription());
+        $supplier = $product->getSupplier();
+        static::assertNotNull($supplier);
+        static::assertSame('test', $supplier->getName());
+        static::assertSame('description', $supplier->getDescription());
     }
 
-    public function testCanRemoveManyToOne()
+    public function testCanRemoveManyToOne(): void
     {
-        $article = new Article();
+        $product = new Product();
 
         $supplier = new Supplier();
         $supplier->setName('test');
         $supplier->setDescription('description');
 
-        $article->setSupplier($supplier);
+        $product->setSupplier($supplier);
 
-        static::assertSame($supplier, $article->getSupplier());
+        static::assertSame($supplier, $product->getSupplier());
 
         $data = [
             'supplier' => null,
         ];
 
-        $article->fromArray($data);
+        $product->fromArray($data);
 
-        static::assertNull($article->getSupplier());
+        static::assertNull($product->getSupplier());
     }
 
-    public function testCanReAssignWithAnotherIdThrowsExceptionManyToOne()
+    public function testCanReAssignWithAnotherIdThrowsExceptionManyToOne(): void
     {
-        $article = new Article();
+        $product = new Product();
 
         $supplier = new Supplier();
         $supplier->setName('test');
         $supplier->setDescription('description');
-        $this->setProperty($supplier, 'id', 1);
+        $this->setId($supplier);
 
-        $article->setSupplier($supplier);
+        $product->setSupplier($supplier);
 
-        static::assertSame($supplier, $article->getSupplier());
+        static::assertSame($supplier, $product->getSupplier());
 
         $data = [
             'supplier' => [
@@ -326,12 +327,12 @@ public function testCanReAssignWithAnotherIdThrowsExceptionManyToOne()
         ];
 
         $this->expectException(InvalidArgumentException::class);
-        $article->fromArray($data);
+        $product->fromArray($data);
     }
 
-    public function testCanAssignOneToMany()
+    public function testCanAssignOneToMany(): void
     {
-        $article = new Article();
+        $product = new Product();
 
         $data = [
             'links' => [
@@ -345,14 +346,14 @@ public function testCanAssignOneToMany()
             ],
         ];
 
-        $article->fromArray($data);
+        $product->fromArray($data);
 
-        static::assertCount(2, $article->getLinks());
+        static::assertCount(2, $product->getLinks());
     }
 
-    public function testCanAssignOneToManyByInstance()
+    public function testCanAssignOneToManyByInstance(): void
     {
-        $article = new Article();
+        $product = new Product();
 
         $link0 = new Link();
         $link0->setName('dummy');
@@ -366,24 +367,24 @@ public function testCanAssignOneToManyByInstance()
             ],
         ];
 
-        $article->fromArray($data);
+        $product->fromArray($data);
 
-        static::assertCount(2, $article->getLinks());
+        static::assertCount(2, $product->getLinks());
 
-        static::assertContains($link0, $article->getLinks());
+        static::assertContains($link0, $product->getLinks());
     }
 
-    public function testCanOverWriteAssignOneToMany()
+    public function testCanOverWriteAssignOneToMany(): void
     {
-        $article = new Article();
+        $product = new Product();
 
         $link0 = new Link();
         $link0->setName('dummy');
         $link0->setLink('lorem');
 
-        $article->getLinks()->add($link0);
+        $product->getLinks()->add($link0);
 
-        static::assertContains($link0, $article->getLinks());
+        static::assertContains($link0, $product->getLinks());
 
         $data = [
             'links' => [
@@ -393,47 +394,47 @@ public function testCanOverWriteAssignOneToMany()
             ],
         ];
 
-        $article->fromArray($data);
+        $product->fromArray($data);
 
-        static::assertCount(1, $article->getLinks());
-        static::assertNotContains($link0, $article->getLinks());
+        static::assertCount(1, $product->getLinks());
+        static::assertNotContains($link0, $product->getLinks());
 
-        static::assertEquals('batz', $article->getLinks()->current()->getName());
+        static::assertSame('batz', $product->getLinks()->current()->getName());
     }
 
-    public function testCanRemoveOneToMany()
+    public function testCanRemoveOneToMany(): void
     {
-        $article = new Article();
+        $product = new Product();
 
         $link0 = new Link();
         $link0->setName('dummy');
         $link0->setLink('lorem');
 
-        $article->getLinks()->add($link0);
+        $product->getLinks()->add($link0);
 
-        static::assertContains($link0, $article->getLinks());
+        static::assertContains($link0, $product->getLinks());
 
         $data = [
             'links' => null,
         ];
 
-        $article->fromArray($data);
+        $product->fromArray($data);
 
-        static::assertCount(0, $article->getLinks());
+        static::assertCount(0, $product->getLinks());
     }
 
-    public function testCanUpdateOneToManyById()
+    public function testCanUpdateOneToManyById(): void
     {
-        $article = new Article();
+        $product = new Product();
 
         $link0 = new Link();
         $link0->setName('dummy');
         $link0->setLink('lorem');
-        $this->setProperty($link0, 'id', 1);
+        $this->setId($link0);
 
-        $article->getLinks()->add($link0);
+        $product->getLinks()->add($link0);
 
-        static::assertContains($link0, $article->getLinks());
+        static::assertContains($link0, $product->getLinks());
 
         $data = [
             'links' => [
@@ -447,27 +448,27 @@ public function testCanUpdateOneToManyById()
             ],
         ];
 
-        $article->fromArray($data);
+        $product->fromArray($data);
 
-        static::assertCount(2, $article->getLinks());
-        static::assertContains($link0, $article->getLinks());
+        static::assertCount(2, $product->getLinks());
+        static::assertContains($link0, $product->getLinks());
 
-        static::assertEquals('batz', $article->getLinks()->first()->getName());
-        static::assertEquals('foo', $article->getLinks()->next()->getName());
+        static::assertSame('batz', $product->getLinks()->first()->getName());
+        static::assertSame('foo', $product->getLinks()->next()->getName());
     }
 
-    public function testCanUpdateOneToMany()
+    public function testCanUpdateOneToMany(): void
     {
-        $article = new Article();
+        $product = new Product();
 
         $link0 = new Link();
         $link0->setName('dummy');
         $link0->setLink('lorem');
-        $this->setProperty($link0, 'id', 1);
+        $this->setId($link0);
 
-        $article->getLinks()->add($link0);
+        $product->getLinks()->add($link0);
 
-        static::assertContains($link0, $article->getLinks());
+        static::assertContains($link0, $product->getLinks());
 
         $data = [
             'links' => [
@@ -478,45 +479,39 @@ public function testCanUpdateOneToMany()
             ],
         ];
 
-        $article->fromArray($data);
+        $product->fromArray($data);
 
-        static::assertCount(1, $article->getLinks());
-        static::assertNotContains($link0, $article->getLinks());
+        static::assertCount(1, $product->getLinks());
+        static::assertNotContains($link0, $product->getLinks());
 
-        static::assertEquals('batz', $article->getLinks()->first()->getName());
+        static::assertSame('batz', $product->getLinks()->first()->getName());
     }
 
-    public function testCanSetElementsOnDocument()
+    public function testCanSetElementsOnDocument(): void
     {
-        $document = new Document();
+        $element = new Element();
+        $element->setName('dummy');
 
-        $data = [
-            [
-                'name' => 'dummy',
-            ],
-        ];
-        $document->setElements($data);
+        $document = new Document();
+        $document->setElements([$element]);
 
         static::assertCount(1, $document->getElements());
-        static::assertEquals('dummy', $document->getElements()->first()->getName());
+        static::assertSame('dummy', $document->getElements()->first()->getName());
     }
 
-    public function testCanSetElementsOnDocumentWithArrayCollection()
+    public function testCanSetElementsOnDocumentWithArrayCollection(): void
     {
-        $document = new Document();
+        $element = new Element();
+        $element->setName('dummy');
 
-        $data = new ArrayCollection([
-            [
-                'name' => 'dummy',
-            ],
-        ]);
-        $document->setElements($data);
+        $document = new Document();
+        $document->setElements(new ArrayCollection([$element]));
 
         static::assertCount(1, $document->getElements());
-        static::assertEquals('dummy', $document->getElements()->first()->getName());
+        static::assertSame('dummy', $document->getElements()->first()->getName());
     }
 
-    public function testCanSetCodesOnVoucher()
+    public function testCanSetCodesOnVoucher(): void
     {
         $voucher = new Voucher();
 
@@ -528,49 +523,38 @@ public function testCanSetCodesOnVoucher()
         $voucher->setCodes($data);
 
         static::assertCount(1, $voucher->getCodes());
-        static::assertEquals('dummy', $voucher->getCodes()->first()->getCode());
+        static::assertSame('dummy', $voucher->getCodes()->first()->getCode());
     }
 
-    public function testCanSetCodesOnVoucherWithArrayCollection()
+    public function testCanSetCodesOnVoucherWithArrayCollection(): void
     {
-        $voucher = new Voucher();
+        $code = new Code();
+        $code->setCode('dummy');
 
-        $data = new ArrayCollection([
-            [
-                'code' => 'dummy',
-            ],
-        ]);
-        $voucher->setCodes($data);
+        $voucher = new Voucher();
+        $voucher->setCodes(new ArrayCollection([$code]));
 
         static::assertCount(1, $voucher->getCodes());
-        static::assertEquals('dummy', $voucher->getCodes()->first()->getCode());
+        static::assertSame('dummy', $voucher->getCodes()->first()->getCode());
     }
 
-    public function testCanSetCountriesOnArea()
+    public function testCanSetCountriesOnArea(): void
     {
-        $area = new Area();
+        $country = new Country();
+        $country->setName('dummy');
 
-        $data = [
-            [
-                'name' => 'dummy',
-            ],
-        ];
-        $area->setCountries($data);
+        $area = new Area();
+        $area->setCountries([$country]);
 
         static::assertCount(1, $area->getCountries());
-        static::assertEquals('dummy', $area->getCountries()->first()->getName());
+        static::assertSame('dummy', $area->getCountries()->first()->getName());
     }
 
-    /**
-     * @param object $entity
-     * @param string $key
-     */
-    protected function setProperty($entity, $key, $value)
+    protected function setId(ModelEntity $entity): void
     {
-        $reflectionClass = new ReflectionClass($entity);
-        $property = $reflectionClass->getProperty($key);
+        $property = (new ReflectionClass($entity))->getProperty('id');
 
         $property->setAccessible(true);
-        $property->setValue($entity, $value);
+        $property->setValue($entity, 1);
     }
 }
diff --git a/tests/Unit/Components/Model/ModelManagerTest.php b/tests/Unit/Components/Model/ModelManagerTest.php
index f5480f3b687..9dd9f79cb1b 100644
--- a/tests/Unit/Components/Model/ModelManagerTest.php
+++ b/tests/Unit/Components/Model/ModelManagerTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Model;
@@ -120,7 +120,7 @@ private function convertColumnType($type): string
                 $type = TypeMappingInterface::TYPE_BOOLEAN;
                 break;
             default:
-                throw new InvalidArgumentException(sprintf('Column type "%s" cannot be converted.', $type));
+                throw new InvalidArgumentException(\sprintf('Column type "%s" cannot be converted.', $type));
         }
 
         return $type;
diff --git a/tests/Unit/Components/Model/ModelRepositoryTest.php b/tests/Unit/Components/Model/ModelRepositoryTest.php
index 5901a81e151..c10acd0f4e0 100644
--- a/tests/Unit/Components/Model/ModelRepositoryTest.php
+++ b/tests/Unit/Components/Model/ModelRepositoryTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Model;
diff --git a/tests/Unit/Components/Model/QueryBuilderTest.php b/tests/Unit/Components/Model/QueryBuilderTest.php
index 1b4cc5aeebd..57e82c1b757 100644
--- a/tests/Unit/Components/Model/QueryBuilderTest.php
+++ b/tests/Unit/Components/Model/QueryBuilderTest.php
@@ -5,33 +5,32 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Model;
 
 use Doctrine\DBAL\Connection;
-use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Query\Expr\Comparison;
 use Doctrine\ORM\Query\Parameter;
 use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
+use Shopware\Components\Model\ModelManager;
 use Shopware\Components\Model\QueryBuilder;
 use Shopware\Components\Model\QueryOperatorValidator;
 
@@ -42,7 +41,7 @@ class QueryBuilderTest extends TestCase
     protected function setUp(): void
     {
         // Create a stub for the SomeClass class.
-        $emMock = $this->createMock(EntityManager::class);
+        $emMock = $this->createMock(ModelManager::class);
 
         $queryBuilder = new QueryBuilder($emMock, new QueryOperatorValidator(['foo', 'bar']));
 
@@ -345,7 +344,7 @@ public function testInvalidOperatorsThrowException(array $filter): void
     {
         $this->querybuilder->resetDQLParts();
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage(sprintf('\'%s\' is no valid operator', $filter['expression']));
+        $this->expectExceptionMessage(\sprintf('\'%s\' is no valid operator', $filter['expression']));
         $this->querybuilder->addFilter([$filter]);
     }
 
diff --git a/tests/Unit/Components/OrderNumberValidator/RegexOrderNumberValidatorTest.php b/tests/Unit/Components/OrderNumberValidator/RegexOrderNumberValidatorTest.php
index b20730dec86..153dbcb31fe 100644
--- a/tests/Unit/Components/OrderNumberValidator/RegexOrderNumberValidatorTest.php
+++ b/tests/Unit/Components/OrderNumberValidator/RegexOrderNumberValidatorTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\OrderNumberValidator;
@@ -66,11 +66,11 @@ public function testValidOrderNumbers(): void
 
             try {
                 $this->validator->validate($ordernumber);
-            } catch (InvalidOrdernumberException $exception) {
+            } catch (InvalidOrderNumberException $exception) {
                 $catch = $ordernumber;
             }
 
-            static::assertNull($catch, sprintf('Ordernumber "%s" is not valid', $ordernumber));
+            static::assertNull($catch, \sprintf('Ordernumber "%s" is not valid', $ordernumber));
         }
     }
 
@@ -92,11 +92,11 @@ public function testInvalidOrderNumbers(): void
         foreach ($ordernumbers as $ordernumber) {
             try {
                 $this->validator->validate($ordernumber);
-            } catch (InvalidOrdernumberException $exception) {
+            } catch (InvalidOrderNumberException $exception) {
                 $ordernumber = null;
             }
 
-            static::assertNull($ordernumber, sprintf('Ordernumber "%s" should be invalid', $ordernumber));
+            static::assertNull($ordernumber, \sprintf('Ordernumber "%s" should be invalid', $ordernumber));
         }
     }
 }
diff --git a/tests/Unit/Components/Password/Encoder/Argon2iTest.php b/tests/Unit/Components/Password/Encoder/Argon2iTest.php
index 6f9c963aa42..013dc33bb54 100644
--- a/tests/Unit/Components/Password/Encoder/Argon2iTest.php
+++ b/tests/Unit/Components/Password/Encoder/Argon2iTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Password\Encoder;
@@ -57,7 +57,7 @@ protected function setUp(): void
     /**
      * Test case
      */
-    public function testIsAvailable()
+    public function testIsAvailable(): void
     {
         static::assertInstanceOf(Argon2i::class, $this->hasher);
     }
@@ -65,7 +65,7 @@ public function testIsAvailable()
     /**
      * Test case
      */
-    public function testGetNameShouldReturnName()
+    public function testGetNameShouldReturnName(): void
     {
         static::assertEquals('Argon2i', $this->hasher->getName());
     }
@@ -73,7 +73,7 @@ public function testGetNameShouldReturnName()
     /**
      * Test case
      */
-    public function testGenerateShouldReturnString()
+    public function testGenerateShouldReturnString(): void
     {
         static::assertIsString($this->hasher->encodePassword('foobar'));
     }
@@ -81,7 +81,7 @@ public function testGenerateShouldReturnString()
     /**
      * Test case
      */
-    public function testGenerateShouldReturnDifferentHashesForSamePlaintextString()
+    public function testGenerateShouldReturnDifferentHashesForSamePlaintextString(): void
     {
         static::assertNotEquals($this->hasher->encodePassword('foobar'), $this->hasher->encodePassword('foobar'));
     }
@@ -89,7 +89,7 @@ public function testGenerateShouldReturnDifferentHashesForSamePlaintextString()
     /**
      * Test case
      */
-    public function testVerifyShouldReturnTrueForMatchingHash()
+    public function testVerifyShouldReturnTrueForMatchingHash(): void
     {
         $hash = $this->hasher->encodePassword('foobar');
 
@@ -99,7 +99,7 @@ public function testVerifyShouldReturnTrueForMatchingHash()
     /**
      * Test case
      */
-    public function testVerifyShouldReturnFalseForNotMatchingHash()
+    public function testVerifyShouldReturnFalseForNotMatchingHash(): void
     {
         $hash = $this->hasher->encodePassword('foobar');
 
@@ -109,7 +109,7 @@ public function testVerifyShouldReturnFalseForNotMatchingHash()
     /**
      * Test case
      */
-    public function testRehash()
+    public function testRehash(): void
     {
         $hash = $this->hasher->encodePassword('foobar');
 
@@ -119,7 +119,7 @@ public function testRehash()
     /**
      * Test case
      */
-    public function testRehash2()
+    public function testRehash2(): void
     {
         $hash = $this->hasher->encodePassword('foobar');
         $this->hasher = new Argon2i([
diff --git a/tests/Unit/Components/Password/Encoder/Argon2idTest.php b/tests/Unit/Components/Password/Encoder/Argon2idTest.php
index ecfa4ae3923..a3418e38749 100644
--- a/tests/Unit/Components/Password/Encoder/Argon2idTest.php
+++ b/tests/Unit/Components/Password/Encoder/Argon2idTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Password\Encoder;
@@ -57,7 +57,7 @@ protected function setUp(): void
     /**
      * Test case
      */
-    public function testIsAvailable()
+    public function testIsAvailable(): void
     {
         static::assertInstanceOf(Argon2id::class, $this->hasher);
     }
@@ -65,7 +65,7 @@ public function testIsAvailable()
     /**
      * Test case
      */
-    public function testGetNameShouldReturnName()
+    public function testGetNameShouldReturnName(): void
     {
         static::assertEquals('Argon2id', $this->hasher->getName());
     }
@@ -73,7 +73,7 @@ public function testGetNameShouldReturnName()
     /**
      * Test case
      */
-    public function testGenerateShouldReturnString()
+    public function testGenerateShouldReturnString(): void
     {
         static::assertIsString($this->hasher->encodePassword('foobar'));
     }
@@ -81,7 +81,7 @@ public function testGenerateShouldReturnString()
     /**
      * Test case
      */
-    public function testGenerateShouldReturnDifferentHashesForSamePlaintextString()
+    public function testGenerateShouldReturnDifferentHashesForSamePlaintextString(): void
     {
         static::assertNotEquals($this->hasher->encodePassword('foobar'), $this->hasher->encodePassword('foobar'));
     }
@@ -89,7 +89,7 @@ public function testGenerateShouldReturnDifferentHashesForSamePlaintextString()
     /**
      * Test case
      */
-    public function testVerifyShouldReturnTrueForMatchingHash()
+    public function testVerifyShouldReturnTrueForMatchingHash(): void
     {
         $hash = $this->hasher->encodePassword('foobar');
 
@@ -99,7 +99,7 @@ public function testVerifyShouldReturnTrueForMatchingHash()
     /**
      * Test case
      */
-    public function testVerifyShouldReturnFalseForNotMatchingHash()
+    public function testVerifyShouldReturnFalseForNotMatchingHash(): void
     {
         $hash = $this->hasher->encodePassword('foobar');
 
@@ -109,7 +109,7 @@ public function testVerifyShouldReturnFalseForNotMatchingHash()
     /**
      * Test case
      */
-    public function testRehash()
+    public function testRehash(): void
     {
         $hash = $this->hasher->encodePassword('foobar');
 
@@ -119,7 +119,7 @@ public function testRehash()
     /**
      * Test case
      */
-    public function testRehash2()
+    public function testRehash2(): void
     {
         $hash = $this->hasher->encodePassword('foobar');
         $this->hasher = new Argon2id([
diff --git a/tests/Unit/Components/Password/Encoder/BcryptTest.php b/tests/Unit/Components/Password/Encoder/BcryptTest.php
index 40fc9ca7dd7..9ce67e6fbfb 100644
--- a/tests/Unit/Components/Password/Encoder/BcryptTest.php
+++ b/tests/Unit/Components/Password/Encoder/BcryptTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Password\Encoder;
@@ -57,7 +57,7 @@ protected function setUp(): void
     /**
      * Test case
      */
-    public function testIsAvailable()
+    public function testIsAvailable(): void
     {
         static::assertInstanceOf(Bcrypt::class, $this->hasher);
     }
@@ -65,7 +65,7 @@ public function testIsAvailable()
     /**
      * Test case
      */
-    public function testGetNameShouldReturnName()
+    public function testGetNameShouldReturnName(): void
     {
         static::assertEquals('Bcrypt', $this->hasher->getName());
     }
@@ -73,7 +73,7 @@ public function testGetNameShouldReturnName()
     /**
      * Test case
      */
-    public function testGenerateShouldReturnString()
+    public function testGenerateShouldReturnString(): void
     {
         static::assertIsString($this->hasher->encodePassword('foobar'));
     }
@@ -81,7 +81,7 @@ public function testGenerateShouldReturnString()
     /**
      * Test case
      */
-    public function testGenerateShouldReturnDifferentHashesForSamePlaintextString()
+    public function testGenerateShouldReturnDifferentHashesForSamePlaintextString(): void
     {
         static::assertNotEquals($this->hasher->encodePassword('foobar'), $this->hasher->encodePassword('foobar'));
     }
@@ -89,7 +89,7 @@ public function testGenerateShouldReturnDifferentHashesForSamePlaintextString()
     /**
      * Test case
      */
-    public function testVerifyShouldReturnTrueForMatchingHash()
+    public function testVerifyShouldReturnTrueForMatchingHash(): void
     {
         $hash = $this->hasher->encodePassword('foobar');
 
@@ -99,7 +99,7 @@ public function testVerifyShouldReturnTrueForMatchingHash()
     /**
      * Test case
      */
-    public function testVerifyShouldReturnFalseForNotMatchingHash()
+    public function testVerifyShouldReturnFalseForNotMatchingHash(): void
     {
         $hash = $this->hasher->encodePassword('foobar');
 
@@ -109,7 +109,7 @@ public function testVerifyShouldReturnFalseForNotMatchingHash()
     /**
      * Test case
      */
-    public function testRehash()
+    public function testRehash(): void
     {
         $hash = $this->hasher->encodePassword('foobar');
 
@@ -119,7 +119,7 @@ public function testRehash()
     /**
      * Test case
      */
-    public function testRehash2()
+    public function testRehash2(): void
     {
         $hash = $this->hasher->encodePassword('foobar');
         $this->hasher = new Bcrypt([
diff --git a/tests/Unit/Components/Password/Encoder/PreHashedTest.php b/tests/Unit/Components/Password/Encoder/PreHashedTest.php
index f6a21ef54f8..5e2ddb13085 100644
--- a/tests/Unit/Components/Password/Encoder/PreHashedTest.php
+++ b/tests/Unit/Components/Password/Encoder/PreHashedTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Password\Encoder;
@@ -42,27 +42,27 @@ public function setUp(): void
     /**
      * Test case
      */
-    public function testGetNameShouldReturnName()
+    public function testGetNameShouldReturnName(): void
     {
         static::assertEquals('PreHashed', $this->hasher->getName());
     }
 
-    public function testEncodePasswordShouldNotModifyInput()
+    public function testEncodePasswordShouldNotModifyInput(): void
     {
         static::assertEquals('example', $this->hasher->encodePassword('example'));
     }
 
-    public function testRehash()
+    public function testRehash(): void
     {
         static::assertFalse($this->hasher->isReencodeNeeded('example'));
     }
 
-    public function testValidatePasswordForSameHashes()
+    public function testValidatePasswordForSameHashes(): void
     {
         static::assertTrue($this->hasher->isPasswordValid('example', 'example'));
     }
 
-    public function testValidatePasswordForDifferentHashes()
+    public function testValidatePasswordForDifferentHashes(): void
     {
         static::assertFalse($this->hasher->isPasswordValid('example', 'alice'));
     }
diff --git a/tests/Unit/Components/Password/Encoder/Sha256Test.php b/tests/Unit/Components/Password/Encoder/Sha256Test.php
index 8b925a8d534..056fede643b 100644
--- a/tests/Unit/Components/Password/Encoder/Sha256Test.php
+++ b/tests/Unit/Components/Password/Encoder/Sha256Test.php
@@ -1,29 +1,30 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Password\Encoder;
 
+use DomainException;
 use PHPUnit\Framework\TestCase;
 use Shopware\Components\Password\Encoder\Sha256;
 
@@ -51,7 +52,7 @@ protected function setUp(): void
     /**
      * Test case
      */
-    public function testIsAvailable()
+    public function testIsAvailable(): void
     {
         static::assertInstanceOf(Sha256::class, $this->hasher);
     }
@@ -59,7 +60,7 @@ public function testIsAvailable()
     /**
      * Test case
      */
-    public function testGetNameShouldReturnName()
+    public function testGetNameShouldReturnName(): void
     {
         static::assertEquals('Sha256', $this->hasher->getName());
     }
@@ -67,7 +68,7 @@ public function testGetNameShouldReturnName()
     /**
      * Test case
      */
-    public function testGenerateShouldReturnString()
+    public function testGenerateShouldReturnString(): void
     {
         static::assertIsString($this->hasher->encodePassword('foobar'));
     }
@@ -75,7 +76,7 @@ public function testGenerateShouldReturnString()
     /**
      * Test case
      */
-    public function testGenerateShouldReturnDifferentHashesForSamePlaintextString()
+    public function testGenerateShouldReturnDifferentHashesForSamePlaintextString(): void
     {
         static::assertNotEquals($this->hasher->encodePassword('foobar'), $this->hasher->encodePassword('foobar'));
     }
@@ -83,7 +84,7 @@ public function testGenerateShouldReturnDifferentHashesForSamePlaintextString()
     /**
      * Test case
      */
-    public function testVerifyShouldReturnTrueForMatchingHash()
+    public function testVerifyShouldReturnTrueForMatchingHash(): void
     {
         $hash = $this->hasher->encodePassword('foobar');
 
@@ -93,7 +94,7 @@ public function testVerifyShouldReturnTrueForMatchingHash()
     /**
      * Test case
      */
-    public function testVerifyShouldReturnFalseForNotMatchingHash()
+    public function testVerifyShouldReturnFalseForNotMatchingHash(): void
     {
         $hash = $this->hasher->encodePassword('foobar');
 
@@ -103,7 +104,7 @@ public function testVerifyShouldReturnFalseForNotMatchingHash()
     /**
      * Test case
      */
-    public function testRehash()
+    public function testRehash(): void
     {
         $hash = $this->hasher->encodePassword('foobar');
 
@@ -113,7 +114,7 @@ public function testRehash()
     /**
      * Test case
      */
-    public function testRehash2()
+    public function testRehash2(): void
     {
         $hash = $this->hasher->encodePassword('foobar');
         $this->hasher = new Sha256([
@@ -123,4 +124,10 @@ public function testRehash2()
 
         static::assertTrue($this->hasher->isReencodeNeeded($hash));
     }
+
+    public function testIsPasswordValidWithInvalidHash(): void
+    {
+        $this->expectException(DomainException::class);
+        $this->hasher->isPasswordValid('password', 'invalid');
+    }
 }
diff --git a/tests/Unit/Components/Password/ManagerTest.php b/tests/Unit/Components/Password/ManagerTest.php
new file mode 100644
index 00000000000..09e07dd8283
--- /dev/null
+++ b/tests/Unit/Components/Password/ManagerTest.php
@@ -0,0 +1,97 @@
+<?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Unit\Components\Password;
+
+use DomainException;
+use PHPUnit\Framework\TestCase;
+use Shopware\Components\Password\Encoder\PasswordEncoderInterface;
+use Shopware\Components\Password\Manager;
+use Shopware_Components_Config;
+
+class ManagerTest extends TestCase
+{
+    public function testReencodePasswordWithInvalidPassword(): void
+    {
+        $mock = $this->getMockBuilder(Shopware_Components_Config::class)->disableOriginalConstructor()->getMock();
+
+        $manager = new Manager($mock);
+
+        $this->expectException(DomainException::class);
+        $manager->reencodePassword('', 'invalid', 'invalid');
+    }
+
+    public function testReencodePasswordWithInvalidHash(): void
+    {
+        $mock = $this->getMockBuilder(Shopware_Components_Config::class)->disableOriginalConstructor()->getMock();
+
+        $manager = new Manager($mock);
+
+        $this->expectException(DomainException::class);
+        $manager->reencodePassword('invalid', '', 'invalid');
+    }
+
+    public function testIsPasswordValidWithInvalidPassword(): void
+    {
+        $mock = $this->getMockBuilder(Shopware_Components_Config::class)->disableOriginalConstructor()->getMock();
+
+        $manager = new Manager($mock);
+
+        static::assertFalse($manager->isPasswordValid('', 'invalid', 'invalid'));
+    }
+
+    public function testIsPasswordValidWithInvalidHash(): void
+    {
+        $mock = $this->getMockBuilder(Shopware_Components_Config::class)->disableOriginalConstructor()->getMock();
+
+        $manager = new Manager($mock);
+
+        static::assertFalse($manager->isPasswordValid('invalid', '', 'invalid'));
+    }
+
+    public function testEncodePasswordWithInvalidPassword(): void
+    {
+        $mock = $this->getMockBuilder(Shopware_Components_Config::class)->disableOriginalConstructor()->getMock();
+
+        $manager = new Manager($mock);
+
+        $this->expectException(DomainException::class);
+        $manager->encodePassword('', 'invalid');
+    }
+
+    public function testManagerThorwsErrorOnInvalidPassword(): void
+    {
+        $mock = $this->getMockBuilder(Shopware_Components_Config::class)->disableOriginalConstructor()->getMock();
+        $encoder = $this->getMockBuilder(PasswordEncoderInterface::class)->getMock();
+        $encoder->method('isReencodeNeeded')->willReturn(true);
+        $encoder->method('encodePassword')->willReturn(false);
+        $encoder->method('getName')->willReturn('invalid');
+
+        $manager = new Manager($mock);
+        $manager->addEncoder($encoder);
+
+        $this->expectException(DomainException::class);
+        $manager->reencodePassword('invalid', 'invalidHash', 'invalid');
+    }
+}
diff --git a/tests/Unit/Components/Plugin/PluginContextTest.php b/tests/Unit/Components/Plugin/PluginContextTest.php
index f9ac0368667..bd94146e359 100644
--- a/tests/Unit/Components/Plugin/PluginContextTest.php
+++ b/tests/Unit/Components/Plugin/PluginContextTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Plugin;
diff --git a/tests/Unit/Components/Plugin/PluginResourceCompilerPassTest.php b/tests/Unit/Components/Plugin/PluginResourceCompilerPassTest.php
index 528f84c86c3..1c213a01fe0 100644
--- a/tests/Unit/Components/Plugin/PluginResourceCompilerPassTest.php
+++ b/tests/Unit/Components/Plugin/PluginResourceCompilerPassTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Plugin;
diff --git a/tests/Unit/Components/Plugin/RequirementValidatorTest.php b/tests/Unit/Components/Plugin/RequirementValidatorTest.php
index 9e1a7c9cede..0114e0910e1 100644
--- a/tests/Unit/Components/Plugin/RequirementValidatorTest.php
+++ b/tests/Unit/Components/Plugin/RequirementValidatorTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Plugin;
diff --git a/tests/Unit/Components/Plugin/ResourceSubscriberTest.php b/tests/Unit/Components/Plugin/ResourceSubscriberTest.php
index 221dfe0bdd2..a2b48fedfc6 100644
--- a/tests/Unit/Components/Plugin/ResourceSubscriberTest.php
+++ b/tests/Unit/Components/Plugin/ResourceSubscriberTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Plugin;
diff --git a/tests/Unit/Components/Plugin/XmlReader/StoreValueParser/StoreExtjsValueParserTest.php b/tests/Unit/Components/Plugin/XmlReader/StoreValueParser/StoreExtjsValueParserTest.php
index 458f0fbf555..92764f6d531 100644
--- a/tests/Unit/Components/Plugin/XmlReader/StoreValueParser/StoreExtjsValueParserTest.php
+++ b/tests/Unit/Components/Plugin/XmlReader/StoreValueParser/StoreExtjsValueParserTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Plugin\XmlReader\StoreValueParser;
@@ -83,7 +83,7 @@ public function testThatEmptyOptionsReturnsEmptyArray(): void
     private function getStoreElement(int $elementIndex): DOMElement
     {
         $stores = $this->xpath->query(
-            sprintf(
+            \sprintf(
                 '//config/elements/element[%s]/store',
                 $elementIndex
             )
diff --git a/tests/Unit/Components/Plugin/XmlReader/StoreValueParser/StoreValueParserFactoryTest.php b/tests/Unit/Components/Plugin/XmlReader/StoreValueParser/StoreValueParserFactoryTest.php
index e4cdc4413d3..cb6d01f71bb 100644
--- a/tests/Unit/Components/Plugin/XmlReader/StoreValueParser/StoreValueParserFactoryTest.php
+++ b/tests/Unit/Components/Plugin/XmlReader/StoreValueParser/StoreValueParserFactoryTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Plugin\XmlReader\StoreValueParser;
diff --git a/tests/Unit/Components/Plugin/XmlReader/StoreValueParser/StoreXmlValueParserTest.php b/tests/Unit/Components/Plugin/XmlReader/StoreValueParser/StoreXmlValueParserTest.php
index 7a53c1f5017..03bce46c587 100644
--- a/tests/Unit/Components/Plugin/XmlReader/StoreValueParser/StoreXmlValueParserTest.php
+++ b/tests/Unit/Components/Plugin/XmlReader/StoreValueParser/StoreXmlValueParserTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Plugin\XmlReader\StoreValueParser;
@@ -120,7 +120,7 @@ public function testThatEmptyOptionsReturnsEmptyArray(): void
     private function getStoreElement(int $elementIndex): DOMElement
     {
         $stores = $this->xpath->query(
-            sprintf(
+            \sprintf(
                 '//config/elements/element[%s]/store',
                 $elementIndex
             )
diff --git a/tests/Unit/Components/Plugin/XmlReader/XmlConfigReaderTest.php b/tests/Unit/Components/Plugin/XmlReader/XmlConfigReaderTest.php
index 5e32df83cb8..d9ed67a51a1 100644
--- a/tests/Unit/Components/Plugin/XmlReader/XmlConfigReaderTest.php
+++ b/tests/Unit/Components/Plugin/XmlReader/XmlConfigReaderTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Plugin\XmlReader;
@@ -46,7 +45,7 @@ public function testReadFile(): void
     {
         $result = $this->readFile('config.xml');
 
-        //form label
+        // form label
         static::assertArrayHasKey('label', $result);
         static::assertCount(2, $result['label']);
         static::assertArrayHasKey('en', $result['label']);
@@ -54,7 +53,7 @@ public function testReadFile(): void
         static::assertEquals('My Form Label', $result['label']['en']);
         static::assertEquals('Meine Form', $result['label']['de']);
 
-        //form description
+        // form description
         static::assertArrayHasKey('description', $result);
         static::assertCount(2, $result['description']);
         static::assertArrayHasKey('en', $result['description']);
@@ -62,10 +61,10 @@ public function testReadFile(): void
         static::assertEquals('My Form description', $result['description']['en']);
         static::assertEquals('Meine Form Beschreibung', $result['description']['de']);
 
-        //elements
+        // elements
         static::assertArrayHasKey('elements', $result);
 
-        //first element
+        // first element
         $element1 = $result['elements'][0];
 
         static::assertArrayHasKey('options', $element1);
@@ -75,10 +74,10 @@ public function testReadFile(): void
         static::assertEquals('1', $element1['options']['minValue']);
         static::assertEquals('2', $element1['options']['maxValue']);
 
-        //second element store
+        // second element store
         $element2 = $result['elements'][1];
 
-        //element label
+        // element label
         static::assertArrayHasKey('label', $element2);
         static::assertCount(2, $element2['label']);
         static::assertArrayHasKey('en', $element2['label']);
@@ -86,7 +85,7 @@ public function testReadFile(): void
         static::assertEquals('My Textfield', $element2['label']['en']);
         static::assertEquals('Mein textfeld', $element2['label']['de']);
 
-        //element description
+        // element description
         static::assertArrayHasKey('description', $element2);
         static::assertCount(2, $element2['description']);
         static::assertArrayHasKey('en', $element2['description']);
@@ -143,19 +142,19 @@ public function testParseElementNodeListEmpty(): void
 
     public function testValidateAttributeScope(): void
     {
-        //default value SCOPE_LOCALE
+        // default value SCOPE_LOCALE
         static::assertEquals(
             XmlReaderBase::SCOPE_LOCALE,
             XmlConfigReader::validateAttributeScope('')
         );
 
-        //SCOPE_LOCALE
+        // SCOPE_LOCALE
         static::assertEquals(
             XmlReaderBase::SCOPE_LOCALE,
             XmlConfigReader::validateAttributeScope('locale')
         );
 
-        //SCOPE_SHOP
+        // SCOPE_SHOP
         static::assertEquals(
             XmlReaderBase::SCOPE_SHOP,
             XmlConfigReader::validateAttributeScope('shop')
@@ -165,14 +164,14 @@ public function testValidateAttributeScope(): void
     public function testValidateAttributeScopeThrowsException(): void
     {
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('Invalid scope "invalid value"');
+        $this->expectExceptionMessageMatches('/Invalid config scope "invalid value" in file ".*\/tests\/Unit\/Components\/Plugin\/XmlReader\/examples\/config\/config_store_extjs\.xml"/');
         XmlConfigReader::validateAttributeScope('invalid value');
     }
 
     private function readFile(string $file): array
     {
         return $this->configReader->read(
-            sprintf('%s/examples/config/%s', __DIR__, $file)
+            \sprintf('%s/examples/config/%s', __DIR__, $file)
         );
     }
 }
diff --git a/tests/Unit/Components/Plugin/XmlReader/XmlCronjobReaderTest.php b/tests/Unit/Components/Plugin/XmlReader/XmlCronjobReaderTest.php
index cc66391099f..32f9b317a30 100644
--- a/tests/Unit/Components/Plugin/XmlReader/XmlCronjobReaderTest.php
+++ b/tests/Unit/Components/Plugin/XmlReader/XmlCronjobReaderTest.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Plugin\XmlReader;
@@ -31,10 +32,7 @@
 
 class XmlCronjobReaderTest extends TestCase
 {
-    /**
-     * @var XmlCronjobReader
-     */
-    private $cronjobReader;
+    private XmlCronjobReader $cronjobReader;
 
     protected function setUp(): void
     {
@@ -43,9 +41,8 @@ protected function setUp(): void
 
     public function testReadFile(): void
     {
-        $result = $this->readFile('cronjob.xml');
+        $result = $this->readFile();
 
-        static::assertIsArray($result);
         static::assertCount(2, $result);
 
         $firstCron = $result[0];
@@ -89,10 +86,10 @@ public function testReadEmptyFile(): void
         static::assertCount(0, $result);
     }
 
-    private function readFile(string $file): array
+    private function readFile(): array
     {
         return $this->cronjobReader->read(
-            sprintf('%s/examples/cronjob/%s', __DIR__, $file)
+            \sprintf('%s/examples/cronjob/%s', __DIR__, 'cronjob.xml')
         );
     }
 }
diff --git a/tests/Unit/Components/Plugin/XmlReader/XmlMenuReaderTest.php b/tests/Unit/Components/Plugin/XmlReader/XmlMenuReaderTest.php
index d1e30a90b8e..9b758943cfc 100644
--- a/tests/Unit/Components/Plugin/XmlReader/XmlMenuReaderTest.php
+++ b/tests/Unit/Components/Plugin/XmlReader/XmlMenuReaderTest.php
@@ -1,41 +1,39 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Plugin\XmlReader;
 
 use DOMDocument;
 use PHPUnit\Framework\TestCase;
-use ReflectionClass;
 use RuntimeException;
 use Shopware\Components\Plugin\XmlReader\XmlMenuReader;
+use Shopware\Tests\TestReflectionHelper;
 
 class XmlMenuReaderTest extends TestCase
 {
-    /**
-     * @var XmlMenuReader
-     */
-    private $menuReader;
+    private XmlMenuReader $menuReader;
 
     protected function setUp(): void
     {
@@ -44,16 +42,12 @@ protected function setUp(): void
 
     public function testThatEmptyEntriesThrowException(): void
     {
-        $this->expectException(RuntimeException::class);
-        $this->expectExceptionMessage('Required element "entry" is missing.');
-
         $dom = new DOMDocument();
         $dom->loadXML('<entries></entries>');
+        $method = TestReflectionHelper::getMethod(\get_class($this->menuReader), 'parseFile');
 
-        $reflection = new ReflectionClass(\get_class($this->menuReader));
-        $method = $reflection->getMethod('parseFile');
-        $method->setAccessible(true);
-
+        $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessageMatches('/Required element "entry" is missing in file ".*\/tests\/Unit\/Components\/Plugin\/XmlReader\/examples\/cronjob\/cronjob\.xml"\./');
         $method->invokeArgs($this->menuReader, [$dom]);
     }
 
@@ -61,7 +55,6 @@ public function testReadFile(): void
     {
         $result = $this->readFile('menu.xml');
 
-        static::assertIsArray($result);
         static::assertCount(2, $result);
 
         $firstMenu = $result[0];
@@ -107,7 +100,7 @@ public function testMultipleChildren(): void
     private function readFile(string $file): array
     {
         return $this->menuReader->read(
-            sprintf('%s/examples/menu/%s', __DIR__, $file)
+            \sprintf('%s/examples/menu/%s', __DIR__, $file)
         );
     }
 }
diff --git a/tests/Unit/Components/Plugin/XmlReader/XmlPluginReaderTest.php b/tests/Unit/Components/Plugin/XmlReader/XmlPluginReaderTest.php
index d0fb27a7dde..1d0547e13cb 100644
--- a/tests/Unit/Components/Plugin/XmlReader/XmlPluginReaderTest.php
+++ b/tests/Unit/Components/Plugin/XmlReader/XmlPluginReaderTest.php
@@ -1,38 +1,37 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Plugin\XmlReader;
 
+use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 use Shopware\Components\Plugin\XmlReader\XmlPluginReader;
 
 class XmlPluginReaderTest extends TestCase
 {
-    /**
-     * @var XmlPluginReader
-     */
-    private $pluginReader;
+    private XmlPluginReader $pluginReader;
 
     protected function setUp(): void
     {
@@ -41,9 +40,7 @@ protected function setUp(): void
 
     public function testReadFile(): void
     {
-        $result = $this->readFile('plugin.xml');
-
-        static::assertIsArray($result);
+        $result = $this->readFile();
 
         static::assertArrayHasKey('label', $result);
         static::assertArrayHasKey('en', $result['label']);
@@ -106,10 +103,24 @@ public function testReadFile(): void
         static::assertArrayNotHasKey('blacklist', $secondRequiredPlugin);
     }
 
-    private function readFile(string $file): array
+    public function testReadFileWithoutVersion(): void
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessageMatches('/Element with name "version" not found in file ".*\/tests\/Unit\/Components\/Plugin\/XmlReader\/examples\/plugin\/plugin_missing_version\.xml"/');
+        $this->readFile('plugin_missing_version');
+    }
+
+    public function testReadFileWithMultipleVersion(): void
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessageMatches('/Element with name "version" found multiple times in file ".*\/tests\/Unit\/Components\/Plugin\/XmlReader\/examples\/plugin\/plugin_multiple_versions\.xml", but expected to be there only once/');
+        $this->readFile('plugin_multiple_versions');
+    }
+
+    private function readFile(string $fileName = 'plugin'): array
     {
         return $this->pluginReader->read(
-            sprintf('%s/examples/plugin/%s', __DIR__, $file)
+            \sprintf('%s/examples/plugin/%s.xml', __DIR__, $fileName)
         );
     }
 }
diff --git a/tests/Unit/Components/Plugin/XmlReader/XmlReaderBaseTest.php b/tests/Unit/Components/Plugin/XmlReader/XmlReaderBaseTest.php
index 3fe79433afe..b09ad47fb3c 100644
--- a/tests/Unit/Components/Plugin/XmlReader/XmlReaderBaseTest.php
+++ b/tests/Unit/Components/Plugin/XmlReader/XmlReaderBaseTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Plugin\XmlReader;
@@ -62,7 +61,6 @@ public function testReadValidFile(): void
     {
         $data = (new XmlConfigReader())->read(__DIR__ . '/examples/base/config.xml');
 
-        static::assertIsArray($data);
         static::assertCount(3, $data);
     }
 
@@ -131,7 +129,7 @@ public function testGetFirstItemOfNodeList(): void
 
     public function testValidateBooleanAttribute(): void
     {
-        //required="true"
+        // required="true"
         $element1 = $this->xpath->query('//config/elements/element');
         static::assertInstanceOf(DOMNodeList::class, $element1);
         $element1 = $element1->item(0);
@@ -140,10 +138,9 @@ public function testValidateBooleanAttribute(): void
             $element1->getAttribute('required')
         );
 
-        static::assertIsBool($element1Result);
         static::assertTrue($element1Result);
 
-        //required not given - passed default value
+        // required not given - passed default value
         $element2 = $this->xpath->query('//config/elements/element');
         static::assertInstanceOf(DOMNodeList::class, $element2);
         $element2 = $element2->item(1);
@@ -152,13 +149,12 @@ public function testValidateBooleanAttribute(): void
             $element2->getAttribute('required')
         );
 
-        static::assertIsBool($element2Result);
         static::assertFalse($element2Result);
     }
 
     public function testParseStoreNodeList(): void
     {
-        //ExtJs Store
+        // ExtJs Store
         $store1 = $this->xpath->query('//config/elements/element[3]/store');
         static::assertInstanceOf(DOMNodeList::class, $store1);
         $store1Result = XmlReaderBase::parseStoreNodeList($store1);
@@ -166,7 +162,7 @@ public function testParseStoreNodeList(): void
         static::assertIsString($store1Result);
         static::assertEquals('EXTJS-STORE', $store1Result);
 
-        //Xml Store
+        // Xml Store
         $store2 = $this->xpath->query('//config/elements/element[4]/store');
         static::assertInstanceOf(DOMNodeList::class, $store2);
         $store2Result = XmlReaderBase::parseStoreNodeList($store2);
@@ -176,7 +172,7 @@ public function testParseStoreNodeList(): void
         static::assertEquals('value2', $store2Result[1][0]);
         static::assertEquals('label2', $store2Result[1][1]['en']);
 
-        //No store found
+        // No store found
         $store3 = $this->xpath->query('//config/elements/element[5]/store');
         static::assertInstanceOf(DOMNodeList::class, $store3);
         $store3Result = XmlReaderBase::parseStoreNodeList($store3);
@@ -200,7 +196,7 @@ public function testParseOptionsNodeList(): void
 
     public function testParseOptionsNodeListNoOptions(): void
     {
-        //cannot test with file because of the xsd validation
+        // cannot test with file because of the xsd validation
         $dom = new DOMDocument();
         $dom->loadXML('<element></element>');
 
@@ -212,7 +208,7 @@ public function testParseOptionsNodeListNoOptions(): void
 
     public function testParseOptionsNodeListEmptyOptions(): void
     {
-        //cannot test with file because of the xsd validation
+        // cannot test with file because of the xsd validation
         $dom = new DOMDocument();
         $dom->loadXML('<element><options></options></element>');
 
@@ -246,13 +242,13 @@ public function testGetElementChildValueByNameReturnsNull(): void
 
     public function testGetElementChildValueByNameThrowsException(): void
     {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('Element with invalid not found');
-
         $options = $this->xpath->query('//config/elements/element[6]/options');
         static::assertInstanceOf(DOMNodeList::class, $options);
         $option = $options->item(0);
         static::assertInstanceOf(DOMElement::class, $option);
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessageMatches('/Element with name "invalid" not found in file ".*\/tests\/Unit\/Components\/Plugin\/XmlReader\/examples\/base\/config_invalid\.xml"/');
         XmlReaderBase::getElementChildValueByName($option, 'invalid', true);
     }
 
diff --git a/tests/Unit/Components/Plugin/XmlReader/examples/menu/paypal.xml b/tests/Unit/Components/Plugin/XmlReader/examples/menu/paypal.xml
index 87467840e65..c167d868593 100644
--- a/tests/Unit/Components/Plugin/XmlReader/examples/menu/paypal.xml
+++ b/tests/Unit/Components/Plugin/XmlReader/examples/menu/paypal.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/shopware/shopware/5.2/engine/Shopware/Components/Plugin/schema/menu.xsd">
+      xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/shopware5/shopware/5.2/engine/Shopware/Components/Plugin/schema/menu.xsd">
     <entries>
         <entry>
             <name>PayPal</name>
diff --git a/tests/Unit/Components/Plugin/XmlReader/examples/plugin/plugin.xml b/tests/Unit/Components/Plugin/XmlReader/examples/plugin/plugin.xml
index c5c1dc86fd1..b06a09a0a25 100644
--- a/tests/Unit/Components/Plugin/XmlReader/examples/plugin/plugin.xml
+++ b/tests/Unit/Components/Plugin/XmlReader/examples/plugin/plugin.xml
@@ -48,10 +48,4 @@
         <blacklist>5.1.2</blacklist>
         <blacklist>5.1.3</blacklist>
     </compatibility>
-
-    <foobar>asdf</foobar>
-    <asdfasd>asdf</asdfasd>
-    <foobasdfasdfar>
-        <some>asbasdf</some>
-    </foobasdfasdfar>
 </plugin>
diff --git a/tests/Unit/Components/Plugin/XmlReader/examples/plugin/plugin_minimal.xml b/tests/Unit/Components/Plugin/XmlReader/examples/plugin/plugin_missing_version.xml
similarity index 88%
rename from tests/Unit/Components/Plugin/XmlReader/examples/plugin/plugin_minimal.xml
rename to tests/Unit/Components/Plugin/XmlReader/examples/plugin/plugin_missing_version.xml
index eca28af4e0c..171f7ccae86 100644
--- a/tests/Unit/Components/Plugin/XmlReader/examples/plugin/plugin_minimal.xml
+++ b/tests/Unit/Components/Plugin/XmlReader/examples/plugin/plugin_missing_version.xml
@@ -3,5 +3,4 @@
         xsi:noNamespaceSchemaLocation="../../../../../../../engine/Shopware/Components/Plugin/schema/plugin.xsd">
 
     <label>My plugin</label>
-    <version>0.1.0-dev</version>
 </plugin>
diff --git a/tests/Unit/Components/Plugin/XmlReader/examples/plugin/plugin_multiple_versions.xml b/tests/Unit/Components/Plugin/XmlReader/examples/plugin/plugin_multiple_versions.xml
new file mode 100644
index 00000000000..02ea932349e
--- /dev/null
+++ b/tests/Unit/Components/Plugin/XmlReader/examples/plugin/plugin_multiple_versions.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<plugin xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../engine/Shopware/Components/Plugin/schema/plugin.xsd">
+
+    <label>My plugin</label>
+    <version>1.2.3</version>
+    <version>4.5.6</version>
+</plugin>
diff --git a/tests/Unit/Components/PluginTest.php b/tests/Unit/Components/PluginTest.php
index e257ec85475..1b4b6163cf4 100644
--- a/tests/Unit/Components/PluginTest.php
+++ b/tests/Unit/Components/PluginTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components;
diff --git a/tests/Unit/Components/QueryAliasMapperTest.php b/tests/Unit/Components/QueryAliasMapperTest.php
index 0ad2e9fc85c..683fe7758ca 100644
--- a/tests/Unit/Components/QueryAliasMapperTest.php
+++ b/tests/Unit/Components/QueryAliasMapperTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components;
diff --git a/tests/Unit/Components/Template/FileCheckerTrait.php b/tests/Unit/Components/Template/FileCheckerTrait.php
new file mode 100644
index 00000000000..ffe03d93255
--- /dev/null
+++ b/tests/Unit/Components/Template/FileCheckerTrait.php
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Unit\Components\Template;
+
+use Symfony\Component\Finder\Finder;
+
+trait FileCheckerTrait
+{
+    /**
+     * @param array<string, int> $multipleOccurrencesAllowed Indexed by item names, value is amount of allowed occurrences
+     */
+    protected function checkFiles(Finder $files, string $regEx, string $itemToTest, array $multipleOccurrencesAllowed = []): void
+    {
+        $items = [];
+        foreach ($files as $file) {
+            $matchCounter = preg_match_all($regEx, $file->getContents(), $matches);
+            if ($matchCounter === false) {
+                continue;
+            }
+
+            foreach ($matches[1] as $match) {
+                if (\array_key_exists($match, $items)) {
+                    ++$items[$match];
+                } else {
+                    $items[$match] = 1;
+                }
+            }
+        }
+
+        foreach ($items as $itemName => $count) {
+            if (\array_key_exists($itemName, $multipleOccurrencesAllowed)) {
+                $expectedCount = $multipleOccurrencesAllowed[$itemName];
+            } else {
+                $expectedCount = 1;
+            }
+
+            static::assertSame(
+                $expectedCount,
+                $count,
+                \sprintf('%s "%s" expected to have %s matches. Got %s matches instead', $itemToTest, $itemName, $expectedCount, $count)
+            );
+        }
+    }
+}
diff --git a/tests/Unit/Components/Template/JavascriptEventTest.php b/tests/Unit/Components/Template/JavascriptEventTest.php
new file mode 100644
index 00000000000..d84a713eef6
--- /dev/null
+++ b/tests/Unit/Components/Template/JavascriptEventTest.php
@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Unit\Components\Template;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Finder\Finder;
+
+class JavascriptEventTest extends TestCase
+{
+    use FileCheckerTrait;
+
+    private const EVENT_REGEX = '/\.publish\(\'(.*)\'/';
+
+    public function testForDuplicateEvents(): void
+    {
+        $files = (new Finder())
+            ->in(__DIR__ . '/../../../../themes/Frontend/Responsive/frontend/_public/src/js')
+            ->name('jquery.*.js')
+            ->contains(self::EVENT_REGEX);
+
+        $multipleOccurrencesAllowed = [
+            'plugin/swAddArticle/onCloseModal' => 2,
+            'plugin/swFilterComponent/onChange' => 2,
+            'plugin/swMenuScroller/onSetOffset' => 2,
+            'plugin/swListingActions/onSetCategoryParamsFromUrlParams' => 2,
+            'onShowContent-' => 2,
+            'plugin/swProductCompareMenu/onDeleteItemSuccess' => 2,
+            'plugin/swSubCategoryNav/onLoadTemplate' => 2,
+        ];
+
+        $this->checkFiles($files, self::EVENT_REGEX, 'jQuery event', $multipleOccurrencesAllowed);
+    }
+}
diff --git a/tests/Unit/Components/Template/SmartyTaxModifierTest.php b/tests/Unit/Components/Template/SmartyTaxModifierTest.php
index bf0449d446f..07b0e74d36b 100644
--- a/tests/Unit/Components/Template/SmartyTaxModifierTest.php
+++ b/tests/Unit/Components/Template/SmartyTaxModifierTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components\Template;
@@ -35,6 +34,7 @@ class SmartyTaxModifierTest extends TestCase
 {
     /**
      * @param string|int|float $tax
+     *
      * @dataProvider taxProvider
      */
     public function testTaxModifierWithValid($tax, string $expected, string $locale): void
@@ -47,6 +47,7 @@ public function testTaxModifierWithValid($tax, string $expected, string $locale)
 
     /**
      * @param string|bool|null $tax
+     *
      * @dataProvider taxProviderInvalid
      */
     public function testTaxModifierWithInvalid($tax, string $locale): void
diff --git a/tests/Unit/Components/Template/TemplateBlockTest.php b/tests/Unit/Components/Template/TemplateBlockTest.php
new file mode 100644
index 00000000000..d7f6bb1994b
--- /dev/null
+++ b/tests/Unit/Components/Template/TemplateBlockTest.php
@@ -0,0 +1,263 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Unit\Components\Template;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Finder\Finder;
+
+class TemplateBlockTest extends TestCase
+{
+    use FileCheckerTrait;
+
+    private const BLOCK_REGEX = '/{block name=["|\'](.*?)["|\']}/';
+
+    public function testForDuplicateBlocksBackend(): void
+    {
+        $files = (new Finder())
+            ->in(__DIR__ . '/../../../../themes/Backend/ExtJs/backend')
+            ->name('*.js')
+            ->contains(self::BLOCK_REGEX);
+
+        $this->checkFiles($files, self::BLOCK_REGEX, 'Backend block');
+    }
+
+    public function testForDuplicateBlocksFrontend(): void
+    {
+        $files = (new Finder())
+            ->in(__DIR__ . '/../../../../themes/Frontend/Bare')
+            ->name('*.tpl')
+            ->contains(self::BLOCK_REGEX);
+
+        $multipleOccurrencesAllowed = [
+            'document_index_amount' => 3,
+            'document_index_head_bottom' => 4,
+            'document_index_head_right' => 3,
+            'document_index_selectAdress' => 2,
+            'document_index_table_each' => 2,
+            'document_index_table_head_price' => 2,
+            'document_index_table_head_tax' => 2,
+            'document_index_table_price' => 3,
+            'document_index_table_tax' => 2,
+
+            'frontend_account_error_messages' => 3,
+            'frontend_account_logout_info' => 2,
+            'frontend_account_logout_info_actions' => 2,
+            'frontend_account_logout_info_content' => 2,
+            'frontend_account_logout_info_headline' => 2,
+            'frontend_account_order_item_date' => 2,
+            'frontend_account_order_item_dispatch' => 2,
+            'frontend_account_orders_welcome' => 2,
+            'frontend_account_orders_welcome_headline' => 2,
+            'frontend_account_partner_statistic_item_overview_row' => 2,
+            'frontend_account_sidebar' => 2,
+
+            'frontend_address_action_button_send' => 2,
+            'frontend_address_action_buttons' => 2,
+            'frontend_address_content' => 2,
+            'frontend_address_error_messages' => 3,
+            'frontend_address_form_content' => 2,
+            'frontend_address_form_headline' => 2,
+            'frontend_address_form_input_set_default_billing' => 2,
+            'frontend_address_form_input_set_default_shipping' => 2,
+            'frontend_address_headline' => 2,
+
+            'frontend_atom_title' => 2,
+
+            'frontend_checkout_actions_checkout' => 2,
+            'frontend_checkout_actions_confirm' => 2,
+            'frontend_checkout_actions_confirm_bottom_checkout' => 2,
+            'frontend_checkout_actions_inquiry' => 2,
+            'frontend_checkout_actions_link_last' => 2,
+            'frontend_checkout_ajax_cart_prices_container_inner' => 2,
+            'frontend_checkout_ajax_cart_prices_info' => 2,
+            'frontend_checkout_cart_footer_add_product' => 3,
+            'frontend_checkout_cart_footer_add_voucher' => 3,
+            'frontend_checkout_cart_footer_add_voucher_button' => 2,
+            'frontend_checkout_cart_footer_add_voucher_field' => 2,
+            'frontend_checkout_cart_footer_add_voucher_label' => 2,
+            'frontend_checkout_cart_footer_add_voucher_trigger' => 2,
+            'frontend_checkout_cart_footer_field_labels_taxes' => 2,
+            'frontend_checkout_cart_footer_field_labels_total' => 2,
+            'frontend_checkout_cart_header_actions' => 2,
+            'frontend_checkout_cart_header_price' => 3,
+            'frontend_checkout_cart_header_tax' => 2,
+            'frontend_checkout_cart_item_additional_type' => 3,
+            'frontend_checkout_cart_item_delete_article' => 2,
+            'frontend_checkout_cart_item_delivery_informations' => 2,
+            'frontend_checkout_cart_item_details_essential_features' => 2,
+            'frontend_checkout_cart_item_image_container' => 2,
+            'frontend_checkout_cart_item_premium_delete_article' => 2,
+            'frontend_checkout_cart_item_premium_tax_price' => 2,
+            'frontend_checkout_cart_item_price' => 2,
+            'frontend_checkout_cart_item_quantity' => 2,
+            'frontend_checkout_cart_item_quantity_label' => 2,
+            'frontend_checkout_cart_item_rebate_details_inline' => 3,
+            'frontend_checkout_cart_item_rebate_tax_price' => 3,
+            'frontend_checkout_cart_item_tax_price' => 2,
+            'frontend_checkout_cart_item_voucher_delete_article' => 2,
+            'frontend_checkout_cart_item_voucher_details_inline' => 2,
+            'frontend_checkout_cart_item_voucher_tax_price' => 2,
+            'frontend_checkout_cart_tax_symbol' => 8,
+            'frontend_checkout_cart_voucher_tax_label' => 4,
+            'frontend_checkout_cart_voucher_tax_value' => 3,
+            'frontend_checkout_footer' => 2,
+            'frontend_checkout_shipping_costs_country_include' => 3,
+            'frontend_checkout_shipping_costs_country_trigger' => 2,
+            'frontend_checkout_shipping_payment_core_buttons' => 2,
+
+            'frontend_content_type_field_base_content' => 11,
+            'frontend_content_type_field_base_label' => 4,
+
+            'frontend_detail_actions_notepad' => 2,
+            'frontend_detail_configurator_noscript_action' => 2,
+            'frontend_detail_group_description' => 2,
+            'frontend_detail_group_name' => 2,
+            'frontend_detail_group_selection' => 2,
+            'frontend_detail_image_fallback' => 2,
+            'frontend_detail_index_similar_slider_content' => 2,
+            'frontend_detail_index_tabs_cross_selling' => 2,
+            'frontend_detail_tabs_rating_title' => 2,
+
+            'frontend_home_index_promotions' => 2,
+
+            'frontend_index_after_body' => 2,
+            'frontend_index_body_classes' => 5,
+            'frontend_index_body_inline' => 2,
+            'frontend_index_breadcrumb' => 9,
+            'frontend_index_breadcrumb_inner' => 2,
+            'frontend_index_checkout_actions' => 2,
+            'frontend_index_content' => 42,
+            'frontend_index_content_left' => 17,
+            'frontend_index_content_main_classes' => 3,
+            'frontend_index_content_right' => 8,
+            'frontend_index_content_top' => 5,
+            'frontend_index_content_wrapper' => 2,
+            'frontend_index_controller_url' => 2,
+            'frontend_index_footer' => 8,
+            'frontend_index_header' => 12,
+            'frontend_index_header_canonical' => 10,
+            'frontend_index_header_feeds' => 5,
+            'frontend_index_header_javascript' => 2,
+            'frontend_index_header_javascript_jquery_lib' => 2,
+            'frontend_index_header_meta_description' => 11,
+            'frontend_index_header_meta_description_og' => 5,
+            'frontend_index_header_meta_description_twitter' => 5,
+            'frontend_index_header_meta_http_tags' => 2,
+            'frontend_index_header_meta_keywords' => 9,
+            'frontend_index_header_meta_robots' => 4,
+            'frontend_index_header_meta_tags_opengraph' => 8,
+            'frontend_index_header_title' => 11,
+            'frontend_index_left_categories' => 3,
+            'frontend_index_left_last_articles' => 3,
+            'frontend_index_logo_container' => 2,
+            'frontend_index_logo_supportinfo' => 2,
+            'frontend_index_logo_trusted_shops' => 5,
+            'frontend_index_navigation' => 4,
+            'frontend_index_navigation_categories_top' => 7,
+            'frontend_index_navigation_inline' => 2,
+            'frontend_index_search' => 2,
+            'frontend_index_shop_navigation' => 8,
+            'frontend_index_sidebar' => 2,
+            'frontend_index_start' => 20,
+            'frontend_index_top_bar_container' => 8,
+
+            'frontend_listing_actions_count' => 3,
+            'frontend_listing_actions_filter_container' => 2,
+            'frontend_listing_actions_items_per_page' => 2,
+            'frontend_listing_actions_paging_first' => 2,
+            'frontend_listing_actions_paging_inner' => 2,
+            'frontend_listing_actions_paging_label' => 3,
+            'frontend_listing_actions_paging_last' => 2,
+            'frontend_listing_actions_paging_next' => 3,
+            'frontend_listing_actions_paging_numbers' => 3,
+            'frontend_listing_actions_paging_previous' => 3,
+            'frontend_listing_actions_top' => 2,
+            'frontend_listing_atom_article_name' => 2,
+            'frontend_listing_atom_article_title' => 2,
+            'frontend_listing_atom_entry' => 2,
+            'frontend_listing_atom_link' => 2,
+            'frontend_listing_atom_short_description' => 2,
+            'frontend_listing_atom_title' => 2,
+            'frontend_listing_bottom_paging' => 3,
+            'frontend_listing_box_article' => 2,
+            'frontend_listing_box_article_actions' => 4,
+            'frontend_listing_box_article_badges_container' => 2,
+            'frontend_listing_box_article_buy' => 2,
+            'frontend_listing_box_article_content' => 2,
+            'frontend_listing_box_article_description' => 6,
+            'frontend_listing_box_article_image_element' => 3,
+            'frontend_listing_box_article_image_media' => 3,
+            'frontend_listing_box_article_image_picture_element' => 2,
+            'frontend_listing_box_article_info_container' => 2,
+            'frontend_listing_box_article_name' => 2,
+            'frontend_listing_box_article_picture' => 3,
+            'frontend_listing_box_article_price' => 3,
+            'frontend_listing_box_article_price_default' => 2,
+            'frontend_listing_box_article_price_discount' => 2,
+            'frontend_listing_box_article_price_discount_after' => 2,
+            'frontend_listing_box_article_price_discount_before' => 2,
+            'frontend_listing_box_article_price_info' => 2,
+            'frontend_listing_box_article_price_regulation' => 2,
+            'frontend_listing_box_article_price_regulation_after' => 2,
+            'frontend_listing_box_article_price_regulation_before' => 2,
+            'frontend_listing_box_article_rating' => 2,
+            'frontend_listing_box_article_unit' => 2,
+            'frontend_listing_box_article_unit_label' => 2,
+            'frontend_listing_emotions' => 2,
+            'frontend_listing_emotions_emotion' => 2,
+            'frontend_listing_filter_facet_date_config' => 4,
+            'frontend_listing_filter_facet_date_content' => 3,
+            'frontend_listing_filter_facet_date_title' => 2,
+            'frontend_listing_filter_facet_multi_selection_input' => 2,
+            'frontend_listing_filter_facet_range_slider_config' => 2,
+            'frontend_listing_index_banner' => 2,
+            'frontend_listing_index_listing' => 2,
+            'frontend_listing_index_tagcloud' => 2,
+            'frontend_listing_index_text' => 2,
+            'frontend_listing_index_topseller' => 3,
+            'frontend_listing_list_inline' => 3,
+            'frontend_listing_list_promotion' => 2,
+            'frontend_listing_list_promotion_link_show_listing' => 2,
+            'frontend_listing_listing_container' => 2,
+            'frontend_listing_listing_content' => 3,
+            'frontend_listing_listing_wrapper' => 2,
+            'frontend_listing_no_filter_result' => 2,
+            'frontend_listing_text' => 2,
+            'frontend_listing_top_actions' => 2,
+
+            'frontend_note_item_actions_compare' => 2,
+
+            'frontend_register_personal_fieldset_input_title' => 2,
+
+            'frontend_widgets_captcha' => 3,
+            'frontend_widgets_captcha_input_code' => 3,
+            'frontend_widgets_captcha_input_label' => 3,
+            'frontend_widgets_captcha_input_placeholder' => 2,
+        ];
+
+        $this->checkFiles($files, self::BLOCK_REGEX, 'Frontend block', $multipleOccurrencesAllowed);
+    }
+}
diff --git a/tests/Unit/Components/Theme/PathResolverTest.php b/tests/Unit/Components/Theme/PathResolverTest.php
index 6e805911d8a..37933fea005 100644
--- a/tests/Unit/Components/Theme/PathResolverTest.php
+++ b/tests/Unit/Components/Theme/PathResolverTest.php
@@ -1,28 +1,29 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
-namespace Shopware\Components\Test\Theme;
+namespace Shopware\Tests\Unit\Components\Theme;
 
 use PHPUnit\Framework\TestCase;
 use Shopware\Components\ShopwareReleaseStruct;
@@ -33,15 +34,11 @@
 
 class PathResolverTest extends TestCase
 {
-    /**
-     * @var PathResolver
-     */
-    private $pathResolver;
+    private PathResolver $pathResolver;
 
     protected function setUp(): void
     {
-        $kernel = new Kernel('testing', true);
-        $releaseArray = $kernel->getRelease();
+        $releaseArray = (new Kernel('testing', true))->getRelease();
 
         $this->pathResolver = new PathResolver(
             '/my/root/dir',
@@ -52,13 +49,12 @@ protected function setUp(): void
         );
     }
 
-    public function testFiles()
+    public function testFiles(): void
     {
         $timestamp = '200000';
         $templateId = 5;
         $shopId = 4;
-        $kernel = new Kernel('testing', true);
-        $release = $kernel->getRelease();
+        $release = (new Kernel('testing', true))->getRelease();
 
         $templateMock = $this->createTemplateMock($templateId);
         $shopMock = $this->createShopMock($shopId, $templateMock);
@@ -66,33 +62,22 @@ public function testFiles()
         $filenameHash = $timestamp . '_' . md5($timestamp . $templateId . $shopId . $release['revision']);
 
         $expected = '/my/root/dir/web/cache/' . $filenameHash . '.css';
-        static::assertEquals($expected, $this->pathResolver->getCssFilePath($shopMock, $timestamp));
+        static::assertSame($expected, $this->pathResolver->getCssFilePath($shopMock, $timestamp));
 
         $expected = '/my/root/dir/web/cache/' . $filenameHash . '.js';
-        static::assertEquals($expected, $this->pathResolver->getJsFilePath($shopMock, $timestamp));
+        static::assertSame($expected, $this->pathResolver->getJsFilePath($shopMock, $timestamp));
     }
 
-    /**
-     * @param int $templateId
-     *
-     * @return Template
-     */
-    private function createTemplateMock($templateId)
+    private function createTemplateMock(int $templateId): Template
     {
         return $this->createConfiguredMock(Template::class, ['getId' => $templateId]);
     }
 
-    /**
-     * @param int      $shopId
-     * @param Template $templateStub
-     *
-     * @return Shop
-     */
-    private function createShopMock($shopId, $templateStub)
+    private function createShopMock(int $shopId, Template $templateStub): Shop
     {
         return $this->createConfiguredMock(Shop::class, [
             'getMain' => null,
-            'getid' => $shopId,
+            'getId' => $shopId,
             'getTemplate' => $templateStub,
         ]);
     }
diff --git a/tests/Unit/Components/UploadMaxSizeValidatorTest.php b/tests/Unit/Components/UploadMaxSizeValidatorTest.php
index b48b8b13eda..a39cbca1837 100644
--- a/tests/Unit/Components/UploadMaxSizeValidatorTest.php
+++ b/tests/Unit/Components/UploadMaxSizeValidatorTest.php
@@ -1,25 +1,26 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Components;
@@ -33,57 +34,49 @@
 
 class UploadMaxSizeValidatorTest extends TestCase
 {
-    /**
-     * @var UploadMaxSizeValidator
-     */
-    private $SUT;
+    private UploadMaxSizeValidator $uploadMaxSizeValidator;
 
     protected function setUp(): void
     {
-        $this->SUT = new UploadMaxSizeValidator();
+        $this->uploadMaxSizeValidator = new UploadMaxSizeValidator();
     }
 
-    public function testEmptyContentLength()
+    public function testEmptyContentLength(): void
     {
         $eventArgs = $this->getMockEnlightControllerEventArgs();
 
-        $this->SUT->validateContentLength($eventArgs);
+        $this->uploadMaxSizeValidator->validateContentLength($eventArgs);
 
-        static::assertTrue(true, 'Empty Content-Length should not throw an Exception');
+        $this->expectNotToPerformAssertions();
     }
 
-    public function testContentLengthInRange()
+    public function testContentLengthInRange(): void
     {
-        $testLength = $this->SUT->getPostMaxSize() / 2;
+        $testLength = $this->uploadMaxSizeValidator->getPostMaxSize() / 2;
         $eventArgs = $this->getMockEnlightControllerEventArgs($testLength);
 
-        $this->SUT->validateContentLength($eventArgs);
+        $this->uploadMaxSizeValidator->validateContentLength($eventArgs);
 
-        static::assertTrue(true, 'In range Content-Length should not throw an Exception');
+        $this->expectNotToPerformAssertions();
     }
 
-    public function testExceededContentLength()
+    public function testExceededContentLength(): void
     {
-        $testLength = $this->SUT->getPostMaxSize() * 2;
+        $testLength = $this->uploadMaxSizeValidator->getPostMaxSize() * 2;
         $eventArgs = $this->getMockEnlightControllerEventArgs($testLength);
 
         $this->expectException(UploadMaxSizeException::class);
         $this->expectExceptionCode(413);
         $this->expectExceptionMessage('The uploaded file was too large. Please try to upload a smaller file.');
 
-        $this->SUT->validateContentLength($eventArgs);
+        $this->uploadMaxSizeValidator->validateContentLength($eventArgs);
     }
 
-    /**
-     * @param int $contentLength
-     *
-     * @return Enlight_Controller_EventArgs
-     */
-    private function getMockEnlightControllerEventArgs($contentLength = 0)
+    private function getMockEnlightControllerEventArgs(int $contentLength = 0): Enlight_Controller_EventArgs
     {
         $response = new Enlight_Controller_Response_ResponseTestCase();
         $request = new Enlight_Controller_Request_RequestTestCase();
-        $request->setServer('CONTENT_LENGTH', $contentLength);
+        $request->setServer('CONTENT_LENGTH', (string) $contentLength);
         $request->setMethod('POST');
 
         return new Enlight_Controller_EventArgs([
diff --git a/tests/Unit/Components/_fixtures/csv-with-empty-line-at-the-end.csv b/tests/Unit/Components/_fixtures/csv-with-empty-line-at-the-end.csv
new file mode 100644
index 00000000000..f52c922ab62
--- /dev/null
+++ b/tests/Unit/Components/_fixtures/csv-with-empty-line-at-the-end.csv
@@ -0,0 +1,2 @@
+orderNumber;quantity
+4911;1
diff --git a/tests/Unit/Controllers/Backend/ConfigTest.php b/tests/Unit/Controllers/Backend/ConfigTest.php
new file mode 100644
index 00000000000..25ca425ec3c
--- /dev/null
+++ b/tests/Unit/Controllers/Backend/ConfigTest.php
@@ -0,0 +1,113 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Unit\Controllers\Backend;
+
+use Generator;
+use PHPUnit\Framework\TestCase;
+use Shopware\Tests\TestReflectionHelper;
+use Shopware_Controllers_Backend_Config;
+
+class ConfigTest extends TestCase
+{
+    /**
+     * @param array<string, mixed> $elementData
+     * @param mixed|null           $value
+     *
+     * @dataProvider getValidationData
+     */
+    public function testValidateConfigData(array $elementData, $value, bool $expectedResult): void
+    {
+        $validateDataMethod = TestReflectionHelper::getMethod(Shopware_Controllers_Backend_Config::class, 'validateData');
+
+        $configController = new Shopware_Controllers_Backend_Config();
+
+        static::assertSame($expectedResult, $validateDataMethod->invokeArgs($configController, [$elementData, $value]));
+    }
+
+    public function getValidationData(): Generator
+    {
+        yield 'Invalid min value' => [
+            [
+                'name' => 'foo',
+                'type' => 'number',
+                'options' => [
+                    'minValue' => 2,
+                    'maxValue' => 10,
+                ],
+            ],
+            1,
+            false,
+        ];
+        yield 'Invalid max value' => [
+            [
+                'name' => 'foo',
+                'type' => 'number',
+                'options' => [
+                    'minValue' => 2,
+                    'maxValue' => 10,
+                ],
+            ],
+            11,
+            false,
+        ];
+        yield 'Min value' => [
+            [
+                'name' => 'foo',
+                'type' => 'number',
+                'options' => [
+                    'minValue' => 2,
+                    'maxValue' => 10,
+                ],
+            ],
+            2,
+            true,
+        ];
+        yield 'Max value' => [
+            [
+                'name' => 'foo',
+                'type' => 'number',
+                'options' => [
+                    'minValue' => 2,
+                    'maxValue' => 10,
+                ],
+            ],
+            10,
+            true,
+        ];
+        yield 'Correct Value' => [
+            [
+                'name' => 'foo',
+                'type' => 'number',
+                'options' => [
+                    'minValue' => 2,
+                    'maxValue' => 10,
+                ],
+            ],
+            5,
+            true,
+        ];
+    }
+}
diff --git a/tests/Unit/Controllers/Backend/EmotionTest.php b/tests/Unit/Controllers/Backend/EmotionTest.php
index e27192f80ab..4a70f8f63d7 100644
--- a/tests/Unit/Controllers/Backend/EmotionTest.php
+++ b/tests/Unit/Controllers/Backend/EmotionTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Controllers\Backend;
@@ -48,29 +47,47 @@ public function testProcessDataFieldValue(): void
         $controller = new Shopware_Controllers_Backend_Emotion($mediaServiceMock, $eventManagerMock);
 
         $field = new Field();
-        $field->setValueType('json');
+        $field->setValueType(Field::VALUE_TYPE_JSON);
         $initialValue = [
-                [
-                    'position' => 1,
-                    'path' => 'http://localhost/path/to/media.jpg',
-                    'mediaId' => 1,
-                    'link' => '',
-                ],
-                [
-                    'position' => 2,
-                    'mediaId' => 2,
-                    'link' => '',
-                ],
-                [
-                    'position' => 3,
-                    'path' => 'http://localhost/path/to/media.jpg',
-                    'mediaId' => 3,
-                    'link' => '',
-                ],
+            [
+                'position' => 1,
+                'path' => 'http://localhost/path/to/media.jpg',
+                'mediaId' => 1,
+                'link' => '',
+            ],
+            [
+                'position' => 2,
+                'mediaId' => 2,
+                'link' => '',
+            ],
+            [
+                'position' => 3,
+                'path' => 'http://localhost/path/to/media.jpg',
+                'mediaId' => 3,
+                'link' => '',
+            ],
         ];
 
         $processedValue = $processDataFieldValueMethod->invoke($controller, $field, $initialValue);
 
         static::assertSame('[{"position":1,"path":"path\/to\/media.jpg","mediaId":1,"link":""},{"position":2,"mediaId":2,"link":""},{"position":3,"path":"path\/to\/media.jpg","mediaId":3,"link":""}]', $processedValue);
     }
+
+    public function testProcessDataFieldValueWithNullValue(): void
+    {
+        $processDataFieldValueMethod = TestReflectionHelper::getMethod(Shopware_Controllers_Backend_Emotion::class, 'processDataFieldValue');
+
+        $mediaServiceMock = $this->createMock(MediaServiceInterface::class);
+        $eventManagerMock = $this->createMock(ContainerAwareEventManager::class);
+        $eventManagerMock->expects(static::once())->method('collect')->willReturn(new ArrayCollection());
+        $controller = new Shopware_Controllers_Backend_Emotion($mediaServiceMock, $eventManagerMock);
+
+        $field = new Field();
+        $field->setValueType('');
+        $initialValue = null;
+
+        $processedValue = $processDataFieldValueMethod->invoke($controller, $field, $initialValue);
+
+        static::assertNull($processedValue);
+    }
 }
diff --git a/tests/Unit/Controllers/Backend/ExtJsTest.php b/tests/Unit/Controllers/Backend/ExtJsTest.php
deleted file mode 100644
index ada5b3ce5ff..00000000000
--- a/tests/Unit/Controllers/Backend/ExtJsTest.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-namespace Shopware\Tests\Unit\Controllers\Backend;
-
-use PHPUnit\Framework\TestCase;
-use ReflectionClass;
-use Shopware_Controllers_Backend_ExtJs;
-
-class ExtJsTest extends TestCase
-{
-    public function exampleData()
-    {
-        return [
-            [['module', 'controller', 'file'], 'module/controller/file.js'],
-            [['module', 'controller', 'file.js'], 'module/controller/file.js.js'],
-            [['module', '', 'file'], 'module//file.js'],
-            [['Module', 'Controller', 'File'], 'module/controller/file.js'],
-            [['MoDule', 'ContRoller', 'FiLe'], 'mo_dule/cont_roller/fi_le.js'],
-            [['MOdule', 'ContRoller', 'FiLe'], 'm_odule/cont_roller/fi_le.js'],
-            [['MODUle', 'ContRoller', 'FiLe'], 'mod_ule/cont_roller/fi_le.js'],
-        ];
-    }
-
-    /**
-     * @dataProvider exampleData
-     *
-     * @param array  $args
-     * @param string $expectedResult
-     */
-    public function testInflectPath($args, $expectedResult)
-    {
-        $SUT = $this->createPartialMock(Shopware_Controllers_Backend_ExtJs::class, []);
-
-        $class = new ReflectionClass($SUT);
-        $method = $class->getMethod('inflectPath');
-        $method->setAccessible(true);
-
-        static::assertSame(
-            $expectedResult,
-            $method->invokeArgs($SUT, $args)
-        );
-    }
-}
diff --git a/tests/Unit/Controllers/Backend/FirstRunWizardPluginManagerTest.php b/tests/Unit/Controllers/Backend/FirstRunWizardPluginManagerTest.php
new file mode 100644
index 00000000000..89f135aa7e3
--- /dev/null
+++ b/tests/Unit/Controllers/Backend/FirstRunWizardPluginManagerTest.php
@@ -0,0 +1,132 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Unit\Controllers\Backend;
+
+use PHPUnit\Framework\TestCase;
+use Shopware\Bundle\PluginInstallerBundle\Service\AccountManagerService;
+use Shopware\Bundle\PluginInstallerBundle\Struct\LocaleStruct;
+use Shopware\Components\DependencyInjection\Container;
+use Shopware\Tests\TestReflectionHelper;
+use Shopware_Components_Auth;
+use Shopware_Controllers_Backend_FirstRunWizardPluginManager;
+
+class FirstRunWizardPluginManagerTest extends TestCase
+{
+    public function setUp(): void
+    {
+        Shopware_Controllers_Backend_FirstRunWizardPluginManager::$locales = [];
+    }
+
+    public function testGetCurrentLocaleWIthouthContent(): void
+    {
+        $controller = new Shopware_Controllers_Backend_FirstRunWizardPluginManager();
+
+        $localeStruct = new LocaleStruct();
+        $localeStruct->setName('foo_bar');
+        $testLocale = 'bar_foo';
+
+        $mock = $this->getMockContainer($localeStruct, $testLocale);
+
+        $controller->setContainer($mock);
+
+        $currentLocaleMethode = TestReflectionHelper::getMethod(\get_class($controller), 'getCurrentLocale');
+
+        static::assertNull($currentLocaleMethode->invoke($controller));
+    }
+
+    public function testGetCurrentLocaleWithEnglish(): void
+    {
+        $controller = new Shopware_Controllers_Backend_FirstRunWizardPluginManager();
+
+        $localeStruct = new LocaleStruct();
+        $localeStruct->setName('en_GB');
+        $testLocale = 'bar_foo';
+
+        $mock = $this->getMockContainer($localeStruct, $testLocale);
+
+        $controller->setContainer($mock);
+
+        $currentLocaleMethode = TestReflectionHelper::getMethod(\get_class($controller), 'getCurrentLocale');
+
+        static::assertSame('en_GB', $currentLocaleMethode->invoke($controller)->getName());
+    }
+
+    public function testGetCurrentLocaleWithSameContent(): void
+    {
+        $controller = new Shopware_Controllers_Backend_FirstRunWizardPluginManager();
+
+        $localeStruct = new LocaleStruct();
+        $localeStruct->setName('de_DE');
+        $testLocale = 'de_DE';
+
+        $mock = $this->getMockContainer($localeStruct, $testLocale);
+
+        $controller->setContainer($mock);
+
+        $currentLocaleMethode = TestReflectionHelper::getMethod(\get_class($controller), 'getCurrentLocale');
+
+        static::assertSame('de_DE', $currentLocaleMethode->invoke($controller)->getName());
+    }
+
+    private function getMockContainer(LocaleStruct $localeStruct, string $testLocale): Container
+    {
+        $accountManagerServiceMock = $this->getMockBuilder(AccountManagerService::class)->disableOriginalConstructor()->getMock();
+        $accountManagerServiceMock->method('getLocales')->willReturn([$localeStruct]);
+
+        $auth = $this->getMockBuilder(Shopware_Components_Auth::class)->disableOriginalConstructor()->getMock();
+        $auth->method('getIdentity')->willReturn(new class($testLocale) {
+            /**
+             * @var object
+             */
+            public $locale;
+
+            public function __construct(string $testLocale)
+            {
+                $this->locale = new class($testLocale) {
+                    /**
+                     * @var string
+                     */
+                    public $locale;
+
+                    public function __construct(string $testLocale)
+                    {
+                        $this->locale = $testLocale;
+                    }
+
+                    public function getLocale(): string
+                    {
+                        return $this->locale;
+                    }
+                };
+            }
+        });
+
+        $mock = $this->getMockBuilder(Container::class)->getMock();
+        $mock->method('get')->willReturnOnConsecutiveCalls($accountManagerServiceMock, $auth);
+
+        return $mock;
+    }
+}
diff --git a/tests/Unit/Controllers/Backend/OrderTest.php b/tests/Unit/Controllers/Backend/OrderTest.php
index 95a8e4b7245..f7127210ae9 100644
--- a/tests/Unit/Controllers/Backend/OrderTest.php
+++ b/tests/Unit/Controllers/Backend/OrderTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Controllers\Backend;
diff --git a/tests/Unit/Core/sArticlesTest.php b/tests/Unit/Core/sArticlesTest.php
index 987f7188216..488dc7c4637 100644
--- a/tests/Unit/Core/sArticlesTest.php
+++ b/tests/Unit/Core/sArticlesTest.php
@@ -1,34 +1,49 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Core;
 
 use PHPUnit\Framework\TestCase;
 use sArticles;
+use Shopware\Bundle\SearchBundle\ProductNumberSearchResult;
+use Shopware\Bundle\StoreFrontBundle\Service\Core\ListProductService;
+use Shopware\Bundle\StoreFrontBundle\Struct\BaseProduct;
+use Shopware\Bundle\StoreFrontBundle\Struct\ListProduct;
+use Shopware\Bundle\StoreFrontBundle\Struct\ShopContext;
+use Shopware\Tests\TestReflectionHelper;
+use Shopware_Components_Config;
 
 class sArticlesTest extends TestCase
 {
+    private const RANDOM_CATEGORY_ID = 100;
+    private const RANDOM_PRODUCT_ID = 100;
+    private const RANDOM_PRODUCT_ID_2 = 200;
+    private const RANDOM_ORDER_NUMBER = 'existingOrderNumber';
+    private const RANDOM_ORDER_NUMBER_2 = 'notExistingOrderNumber';
+    private const RANDOM_PRODUCT_NAME = 'foobar';
+
     public function provideData()
     {
         return [
@@ -64,9 +79,99 @@ public function provideData()
      */
     public function testStrings($input, $expectedResult)
     {
-        /** @var sArticles $sArticles */
         $sArticles = $this->createPartialMock(sArticles::class, []);
 
         static::assertSame($expectedResult, $sArticles->sOptimizeText($input));
     }
+
+    public function testItHandlesNullResultsProperlyWhileBuildingTheNavigation(): void
+    {
+        $productNumberSearchResult = new ProductNumberSearchResult(
+            [
+                new BaseProduct(
+                    self::RANDOM_PRODUCT_ID,
+                    self::RANDOM_PRODUCT_ID,
+                    self::RANDOM_ORDER_NUMBER_2
+                ),
+                new BaseProduct(
+                    self::RANDOM_PRODUCT_ID_2,
+                    self::RANDOM_PRODUCT_ID_2,
+                    self::RANDOM_ORDER_NUMBER
+                ),
+            ],
+            2,
+            []
+        );
+
+        $listProductService = $this->getMockBuilder(ListProductService::class)->disableOriginalConstructor()->getMock();
+        $listProductService->expects(static::once())->method('get')->willReturn(null);
+        $shopContext = $this->getMockBuilder(ShopContext::class)->disableOriginalConstructor()->getMock();
+
+        $sArticles = $this->createPartialMock(sArticles::class, []);
+        $property = TestReflectionHelper::getProperty(sArticles::class, 'listProductService');
+        $property->setValue($sArticles, $listProductService);
+
+        $result = TestReflectionHelper::getMethod(sArticles::class, 'buildNavigation')->invokeArgs($sArticles, [
+            $productNumberSearchResult,
+            self::RANDOM_ORDER_NUMBER,
+            self::RANDOM_CATEGORY_ID,
+            $shopContext,
+        ]);
+
+        static::assertEquals(2, $result['currentListing']['position']);
+        static::assertEquals(2, $result['currentListing']['totalCount']);
+        static::assertArrayNotHasKey('previousProduct', $result);
+    }
+
+    public function testItBuildsTheNavigationProperlyWithPreviousResults(): void
+    {
+        $config = $this->getMockBuilder(Shopware_Components_Config::class)->disableOriginalConstructor()->getMock();
+        $config->expects(static::once())->method('get')->with('sBASEFILE')->willReturn('foo');
+
+        $productNumberSearchResult = new ProductNumberSearchResult(
+            [
+                new BaseProduct(
+                    self::RANDOM_PRODUCT_ID,
+                    self::RANDOM_PRODUCT_ID,
+                    self::RANDOM_ORDER_NUMBER_2
+                ),
+                new BaseProduct(
+                    self::RANDOM_PRODUCT_ID_2,
+                    self::RANDOM_PRODUCT_ID_2,
+                    self::RANDOM_ORDER_NUMBER
+                ),
+            ],
+            2,
+            []
+        );
+
+        $listProduct = new ListProduct(
+            self::RANDOM_PRODUCT_ID,
+            self::RANDOM_PRODUCT_ID,
+            self::RANDOM_ORDER_NUMBER_2
+        );
+        $listProduct->setName(self::RANDOM_PRODUCT_NAME);
+
+        $listProductService = $this->getMockBuilder(ListProductService::class)->disableOriginalConstructor()->getMock();
+        $listProductService->expects(static::once())->method('get')->willReturn($listProduct);
+        $shopContext = $this->getMockBuilder(ShopContext::class)->disableOriginalConstructor()->getMock();
+
+        $sArticles = $this->createPartialMock(sArticles::class, []);
+        $property = TestReflectionHelper::getProperty(sArticles::class, 'listProductService');
+        $property->setValue($sArticles, $listProductService);
+
+        $property = TestReflectionHelper::getProperty(sArticles::class, 'config');
+        $property->setValue($sArticles, $config);
+
+        $result = TestReflectionHelper::getMethod(sArticles::class, 'buildNavigation')->invokeArgs($sArticles, [
+            $productNumberSearchResult,
+            self::RANDOM_ORDER_NUMBER,
+            self::RANDOM_CATEGORY_ID,
+            $shopContext,
+        ]);
+
+        static::assertEquals(2, $result['currentListing']['position']);
+        static::assertEquals(2, $result['currentListing']['totalCount']);
+        static::assertEquals(self::RANDOM_PRODUCT_NAME, $result['previousProduct']['name']);
+    }
 }
diff --git a/tests/Unit/Core/sCategoriesTest.php b/tests/Unit/Core/sCategoriesTest.php
index 8eb2ab46100..c55830b6316 100644
--- a/tests/Unit/Core/sCategoriesTest.php
+++ b/tests/Unit/Core/sCategoriesTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Core;
diff --git a/tests/Unit/EnlightLoaderTest.php b/tests/Unit/EnlightLoaderTest.php
index 3df3ea0d08a..b45af02254d 100644
--- a/tests/Unit/EnlightLoaderTest.php
+++ b/tests/Unit/EnlightLoaderTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit;
diff --git a/tests/Unit/Library/Enlight/Controller/DefaultTest.php b/tests/Unit/Library/Enlight/Controller/DefaultTest.php
index 37c02357b7f..184c42b0fbb 100644
--- a/tests/Unit/Library/Enlight/Controller/DefaultTest.php
+++ b/tests/Unit/Library/Enlight/Controller/DefaultTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Library\Enlight\Controller;
diff --git a/tests/Unit/Library/RequestHttpTest.php b/tests/Unit/Library/RequestHttpTest.php
index 22829429471..2d1b45e7d5a 100644
--- a/tests/Unit/Library/RequestHttpTest.php
+++ b/tests/Unit/Library/RequestHttpTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Library;
diff --git a/tests/Unit/Library/ResponseHttpTest.php b/tests/Unit/Library/ResponseHttpTest.php
index 183a192d3d6..49195bc587d 100644
--- a/tests/Unit/Library/ResponseHttpTest.php
+++ b/tests/Unit/Library/ResponseHttpTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Library;
diff --git a/tests/Unit/Library/ZendMailProtocolTest.php b/tests/Unit/Library/ZendMailProtocolTest.php
index 800163dd710..bc901640c09 100644
--- a/tests/Unit/Library/ZendMailProtocolTest.php
+++ b/tests/Unit/Library/ZendMailProtocolTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Library;
diff --git a/tests/Unit/Model/Album/MediaTest.php b/tests/Unit/Model/Album/MediaTest.php
index 132262e5137..987b859ba1d 100644
--- a/tests/Unit/Model/Album/MediaTest.php
+++ b/tests/Unit/Model/Album/MediaTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Model\Album;
diff --git a/tests/Unit/Model/Album/SettingsTest.php b/tests/Unit/Model/Album/SettingsTest.php
index 88259689ffa..5192738627f 100644
--- a/tests/Unit/Model/Album/SettingsTest.php
+++ b/tests/Unit/Model/Album/SettingsTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Model\Album;
diff --git a/tests/Unit/Model/OrderNumberValidatorTest.php b/tests/Unit/Model/OrderNumberValidatorTest.php
index 92fe47b4c77..3ca6139db89 100644
--- a/tests/Unit/Model/OrderNumberValidatorTest.php
+++ b/tests/Unit/Model/OrderNumberValidatorTest.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Model;
@@ -62,7 +61,7 @@ function () {},
                 $catch = null;
             }
 
-            static::assertNull($catch, sprintf('Type of variable "%s" did not throw an exception', \gettype($value)));
+            static::assertNull($catch, \sprintf('Type of variable "%s" did not throw an exception', \gettype($value)));
         }
     }
 
diff --git a/tests/Unit/Plugin/Backend/Auth/BootstrapTest.php b/tests/Unit/Plugin/Backend/Auth/BootstrapTest.php
new file mode 100644
index 00000000000..43e23a861eb
--- /dev/null
+++ b/tests/Unit/Plugin/Backend/Auth/BootstrapTest.php
@@ -0,0 +1,54 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Unit\Plugin\Backend\Auth;
+
+use Enlight_Controller_Action;
+use Enlight_Controller_ActionEventArgs;
+use Enlight_Controller_Request_RequestTestCase;
+use PHPUnit\Framework\TestCase;
+use Shopware\Tests\Functional\Helper\Utils;
+use Shopware_Plugins_Backend_Auth_Bootstrap;
+
+class BootstrapTest extends TestCase
+{
+    public function testValidatesAlsoSnakeCaseControllers(): void
+    {
+        $authPlugin = $this->createPartialMock(Shopware_Plugins_Backend_Auth_Bootstrap::class, ['initLocale', 'checkAuth']);
+        $authPlugin->setNoAcl(true);
+
+        $action = $this->getMockBuilder(Enlight_Controller_Action::class)->disableOriginalConstructor()->getMock();
+        $testRequest = new Enlight_Controller_Request_RequestTestCase();
+        $testRequest->setControllerName('user_manager');
+        $testRequest->setModuleName('Backend');
+        $action->method('Request')->willReturn($testRequest);
+        $eventArgs = new Enlight_Controller_ActionEventArgs();
+        $eventArgs->set('subject', $action);
+
+        $authPlugin->onPreDispatchBackend($eventArgs);
+
+        static::assertEquals('usermanager', Utils::hijackAndReadProperty($authPlugin, 'aclResource'));
+    }
+}
diff --git a/tests/Unit/Plugin/Backend/SwagUpdate/Components/UpdateCheckTest.php b/tests/Unit/Plugin/Backend/SwagUpdate/Components/UpdateCheckTest.php
new file mode 100644
index 00000000000..2d87bc63798
--- /dev/null
+++ b/tests/Unit/Plugin/Backend/SwagUpdate/Components/UpdateCheckTest.php
@@ -0,0 +1,349 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+namespace Shopware\Tests\Unit\Plugin\Backend\SwagUpdate\Components;
+
+use PHPUnit\Framework\TestCase;
+use ShopwarePlugins\SwagUpdate\Components\Exception\ApiLimitExceededException;
+use ShopwarePlugins\SwagUpdate\Components\Struct\Version;
+use ShopwarePlugins\SwagUpdate\Components\UpdateCheck;
+use Zend_Http_Client;
+use Zend_Http_Response;
+
+class UpdateCheckTest extends TestCase
+{
+    public function testCheckUpdateReturnsNullIfShopwareVersionIsDevelopment(): void
+    {
+        $updateChecker = new UpdateCheck(
+            $this->createMock(Zend_Http_Client::class),
+            false
+        );
+
+        static::assertNull($updateChecker->checkUpdate('___VERSION___'));
+    }
+
+    public function testCheckUpdateThrowsExceptionOnApiLimit(): void
+    {
+        $response = new Zend_Http_Response(403, []);
+
+        $clientMock = $this->getMockBuilder(Zend_Http_Client::class)->disableOriginalConstructor()->getMock();
+        $clientMock->method('request')->willReturn($response);
+
+        $updateChecker = new UpdateCheck(
+            $clientMock,
+            false
+        );
+
+        $this->expectException(ApiLimitExceededException::class);
+        $updateChecker->checkUpdate('5.7.13');
+    }
+
+    public function testCheckUpdateReturnsNoVersionOnRouteNotFound(): void
+    {
+        $response = new Zend_Http_Response(404, [], 'foo');
+
+        $clientMock = $this->getMockBuilder(Zend_Http_Client::class)->disableOriginalConstructor()->getMock();
+        $clientMock->method('request')->willReturn($response);
+
+        $updateChecker = new UpdateCheck(
+            $clientMock,
+            false
+        );
+
+        static::assertNull($updateChecker->checkUpdate('5.7.13'));
+    }
+
+    public function testCheckUpdateReturnsNoVersionOnInvalidRequestBody(): void
+    {
+        $response = new Zend_Http_Response(200, [], '');
+
+        $clientMock = $this->getMockBuilder(Zend_Http_Client::class)->disableOriginalConstructor()->getMock();
+        $clientMock->method('request')->willReturn($response);
+
+        $updateChecker = new UpdateCheck(
+            $clientMock,
+            false
+        );
+
+        static::assertNull($updateChecker->checkUpdate('5.7.13'));
+    }
+
+    public function testCheckUpdateReturnsVersionNullWithoutOldRelease(): void
+    {
+        $response = new Zend_Http_Response(200, [], $this->getSingleVersionJson('v5.7.12'));
+
+        $clientMock = $this->getMockBuilder(Zend_Http_Client::class)->disableOriginalConstructor()->getMock();
+        $clientMock->method('request')->willReturn($response);
+
+        $updateChecker = new UpdateCheck(
+            $clientMock,
+            false
+        );
+
+        static::assertNull($updateChecker->checkUpdate('5.7.13'));
+    }
+
+    public function testCheckUpdateReturnsVersionNullWithoutAssets(): void
+    {
+        $response = new Zend_Http_Response(200, [], $this->getSingleVersionWithoutAssets('v5.7.14'));
+
+        $clientMock = $this->getMockBuilder(Zend_Http_Client::class)->disableOriginalConstructor()->getMock();
+        $clientMock->method('request')->willReturn($response);
+
+        $updateChecker = new UpdateCheck(
+            $clientMock,
+            false
+        );
+
+        static::assertNull($updateChecker->checkUpdate('5.7.13'));
+    }
+
+    public function testCheckUpdateReturnsVersionWithNewRelease(): void
+    {
+        $response = new Zend_Http_Response(200, [], $this->getSingleVersionJson('v5.7.14'));
+
+        $clientMock = $this->getMockBuilder(Zend_Http_Client::class)->disableOriginalConstructor()->getMock();
+        $clientMock->method('request')->willReturn($response);
+
+        $updateChecker = new UpdateCheck(
+            $clientMock,
+            false
+        );
+
+        $version = $updateChecker->checkUpdate('5.7.13');
+        static::assertInstanceOf(Version::class, $version);
+        static::assertSame('5.7.14', $version->version);
+    }
+
+    public function testCheckUpdateReturnsVersionWithNewPreRelease(): void
+    {
+        $response = new Zend_Http_Response(200, [], $this->getSingleVersionJson('v5.7.14', true));
+
+        $clientMock = $this->getMockBuilder(Zend_Http_Client::class)->disableOriginalConstructor()->getMock();
+        $clientMock->method('request')->willReturn($response);
+
+        $updateChecker = new UpdateCheck(
+            $clientMock,
+            true
+        );
+
+        $version = $updateChecker->checkUpdate('5.7.13');
+        static::assertInstanceOf(Version::class, $version);
+        static::assertSame('5.7.14', $version->version);
+    }
+
+    public function testCheckUpdateReturnsVersionOfPreReleaseWithPreRelease(): void
+    {
+        $response = new Zend_Http_Response(200, [], $this->getMultiVersionJson());
+
+        $clientMock = $this->getMockBuilder(Zend_Http_Client::class)->disableOriginalConstructor()->getMock();
+        $clientMock->method('request')->willReturn($response);
+
+        $updateChecker = new UpdateCheck(
+            $clientMock,
+            true,
+        );
+
+        $version = $updateChecker->checkUpdate('5.7.13');
+        static::assertInstanceOf(Version::class, $version);
+        static::assertSame('5.7.15', $version->version);
+    }
+
+    public function testCheckUpdateReturnsVersionOfNormalReleaseWithoutPreRelease(): void
+    {
+        $response = new Zend_Http_Response(200, [], $this->getMultiVersionJson());
+
+        $clientMock = $this->getMockBuilder(Zend_Http_Client::class)->disableOriginalConstructor()->getMock();
+        $clientMock->method('request')->willReturn($response);
+
+        $updateChecker = new UpdateCheck(
+            $clientMock,
+            false
+        );
+
+        $version = $updateChecker->checkUpdate('5.7.13');
+        static::assertInstanceOf(Version::class, $version);
+        static::assertSame('5.7.14', $version->version);
+    }
+
+    private function getSingleVersionJson(string $version, bool $prerelease = false): string
+    {
+        return json_encode([
+            [
+                'html_url' => 'https://github.com/shopware5/shopware/releases/tag/v5.7.17',
+                'body' => '',
+                'id' => 97288305,
+                'node_id' => 'RE_kwDOAFa3Gs4FzIBx',
+                'tag_name' => $version,
+                'name' => 'Release 5.7.17',
+                'draft' => false,
+                'prerelease' => $prerelease,
+                'created_at' => '2023-03-21T12:58:25Z',
+                'published_at' => '2023-03-29T09:06:24Z',
+                'assets' => [
+                    [
+                        'url' => 'https://api.github.com/repos/shopware5/shopware/releases/assets/102259279',
+                        'id' => 102259279,
+                        'node_id' => 'RA_kwDOAFa3Gs4GGFpP',
+                        'name' => 'install_31b8b37fe396c41da6dfe6c5354e968ca82d890c.zip',
+                        'label' => null,
+                        'content_type' => 'application/zip',
+                        'state' => 'uploaded',
+                        'size' => 45264378,
+                        'download_count' => 132,
+                        'created_at' => '2023-04-04T12:14:50Z',
+                        'updated_at' => '2023-05-30T07:14:09Z',
+                        'browser_download_url' => 'https://github.com/shopware5/shopware/releases/download/v5.7.17/install_31b8b37fe396c41da6dfe6c5354e968ca82d890c.zip',
+                    ],
+                    [
+                        'url' => 'https://api.github.com/repos/shopware5/shopware/releases/assets/102259331',
+                        'id' => 102259331,
+                        'node_id' => 'RA_kwDOAFa3Gs4GGFqD',
+                        'name' => 'update_e0a7813fcbae9ecf1dd566899b02e820a0c0b3e5.zip',
+                        'label' => null,
+                        'content_type' => 'application/zip',
+                        'state' => 'uploaded',
+                        'size' => 46082425,
+                        'download_count' => 12,
+                        'created_at' => '2023-04-04T12:15:18Z',
+                        'updated_at' => '2023-05-30T07:14:37Z',
+                        'browser_download_url' => 'https://github.com/shopware5/shopware/releases/download/v5.7.17/update_e0a7813fcbae9ecf1dd566899b02e820a0c0b3e5.zip',
+                    ],
+                ],
+            ],
+        ], JSON_THROW_ON_ERROR);
+    }
+
+    private function getSingleVersionWithoutAssets(string $version): string
+    {
+        return json_encode([
+            [
+                'html_url' => 'https://github.com/shopware5/shopware/releases/tag/v5.7.17',
+                'body' => '',
+                'id' => 97288305,
+                'node_id' => 'RE_kwDOAFa3Gs4FzIBx',
+                'tag_name' => $version,
+                'name' => 'Release 5.7.17',
+                'draft' => false,
+                'prerelease' => false,
+                'created_at' => '2023-03-21T12:58:25Z',
+                'published_at' => '2023-03-29T09:06:24Z',
+                'assets' => [],
+                'tarball_url' => 'https://api.github.com/repos/shopware5/shopware/tarball/v5.7.17',
+                'zipball_url' => 'https://api.github.com/repos/shopware5/shopware/zipball/v5.7.17',
+            ],
+        ], JSON_THROW_ON_ERROR);
+    }
+
+    private function getMultiVersionJson(): string
+    {
+        return json_encode([
+            [
+                'html_url' => 'https://github.com/shopware5/shopware/releases/tag/v5.7.17',
+                'body' => '',
+                'id' => 97288305,
+                'node_id' => 'RE_kwDOAFa3Gs4FzIBx',
+                'tag_name' => 'v5.7.15',
+                'name' => 'Release 5.7.17',
+                'draft' => true,
+                'prerelease' => true,
+                'created_at' => '2023-03-21T12:58:25Z',
+                'published_at' => '2023-03-29T09:06:24Z',
+                'assets' => [
+                    [
+                        'url' => 'https://api.github.com/repos/shopware5/shopware/releases/assets/102259279',
+                        'id' => 102259279,
+                        'node_id' => 'RA_kwDOAFa3Gs4GGFpP',
+                        'name' => 'install_31b8b37fe396c41da6dfe6c5354e968ca82d890c.zip',
+                        'label' => null,
+                        'content_type' => 'application/zip',
+                        'state' => 'uploaded',
+                        'size' => 45264378,
+                        'download_count' => 132,
+                        'created_at' => '2023-04-04T12:14:50Z',
+                        'updated_at' => '2023-05-30T07:14:09Z',
+                        'browser_download_url' => 'https://github.com/shopware5/shopware/releases/download/v5.7.17/install_31b8b37fe396c41da6dfe6c5354e968ca82d890c.zip',
+                    ],
+                    [
+                        'url' => 'https://api.github.com/repos/shopware5/shopware/releases/assets/102259331',
+                        'id' => 102259331,
+                        'node_id' => 'RA_kwDOAFa3Gs4GGFqD',
+                        'name' => 'update_e0a7813fcbae9ecf1dd566899b02e820a0c0b3e5.zip',
+                        'label' => null,
+                        'content_type' => 'application/zip',
+                        'state' => 'uploaded',
+                        'size' => 46082425,
+                        'download_count' => 12,
+                        'created_at' => '2023-04-04T12:15:18Z',
+                        'updated_at' => '2023-05-30T07:14:37Z',
+                        'browser_download_url' => 'https://github.com/shopware5/shopware/releases/download/v5.7.17/update_e0a7813fcbae9ecf1dd566899b02e820a0c0b3e5.zip',
+                    ],
+                ],
+            ],
+            [
+                'html_url' => 'https://github.com/shopware5/shopware/releases/tag/v5.7.17',
+                'body' => '',
+                'id' => 97288305,
+                'node_id' => 'RE_kwDOAFa3Gs4FzIBx',
+                'tag_name' => 'v5.7.14',
+                'name' => 'Release 5.7.17',
+                'draft' => false,
+                'prerelease' => false,
+                'created_at' => '2023-03-21T12:58:25Z',
+                'published_at' => '2023-03-29T09:06:24Z',
+                'assets' => [
+                    [
+                        'url' => 'https://api.github.com/repos/shopware5/shopware/releases/assets/102259279',
+                        'id' => 102259279,
+                        'node_id' => 'RA_kwDOAFa3Gs4GGFpP',
+                        'name' => 'install_31b8b37fe396c41da6dfe6c5354e968ca82d890c.zip',
+                        'label' => null,
+                        'content_type' => 'application/zip',
+                        'state' => 'uploaded',
+                        'size' => 45264378,
+                        'download_count' => 132,
+                        'created_at' => '2023-04-04T12:14:50Z',
+                        'updated_at' => '2023-05-30T07:14:09Z',
+                        'browser_download_url' => 'https://github.com/shopware5/shopware/releases/download/v5.7.17/install_31b8b37fe396c41da6dfe6c5354e968ca82d890c.zip',
+                    ],
+                    [
+                        'url' => 'https://api.github.com/repos/shopware5/shopware/releases/assets/102259331',
+                        'id' => 102259331,
+                        'node_id' => 'RA_kwDOAFa3Gs4GGFqD',
+                        'name' => 'update_e0a7813fcbae9ecf1dd566899b02e820a0c0b3e5.zip',
+                        'label' => null,
+                        'content_type' => 'application/zip',
+                        'state' => 'uploaded',
+                        'size' => 46082425,
+                        'download_count' => 12,
+                        'created_at' => '2023-04-04T12:15:18Z',
+                        'updated_at' => '2023-05-30T07:14:37Z',
+                        'browser_download_url' => 'https://github.com/shopware5/shopware/releases/download/v5.7.17/update_e0a7813fcbae9ecf1dd566899b02e820a0c0b3e5.zip',
+                    ],
+                ],
+            ],
+        ], JSON_THROW_ON_ERROR);
+    }
+}
diff --git a/tests/Unit/Plugin/Frontend/InputFilter/FilterTest.php b/tests/Unit/Plugin/Frontend/InputFilter/FilterTest.php
index 3e833b021d3..3fcb144a5f9 100644
--- a/tests/Unit/Plugin/Frontend/InputFilter/FilterTest.php
+++ b/tests/Unit/Plugin/Frontend/InputFilter/FilterTest.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Tests\Unit\Plugin\Frontend\InputFilter;
@@ -147,6 +147,21 @@ public function testXssFilter(string $input, ?string $expected): void
         );
     }
 
+    /**
+     * @dataProvider stripAntiXssDataProvider
+     *
+     * @param array<mixed> $additions
+     */
+    public function testAntiXssFilter(string $input, ?string $expected, array $additions = []): void
+    {
+        $result = Shopware_Plugins_Frontend_InputFilter_Bootstrap::filterValue($input, '/(?!x)x/', ...$additions);
+
+        static::assertEquals(
+            $expected,
+            $result
+        );
+    }
+
     /**
      * @dataProvider stripxssArrayDataProvider
      *
@@ -233,6 +248,37 @@ public function stripxssDataProvider(): array
                 'input' => '',
                 'expected' => '',
             ],
+            [
+                'input' => '"%26%2362%26%2360img/src%26%2361x%20onerror%26%2361alert()%26%2362',
+                'expected' => '"><img/>',
+            ],
+        ];
+    }
+
+    /**
+     * @return array<array<string, mixed>>
+     */
+    public function stripAntiXssDataProvider(): array
+    {
+        return [
+            [
+                'input' => '<li style="list-style-image: url(javascript:alert(0))">',
+                'expected' => '<li style="list-style-image: url((0))">',
+                'additions' => [
+                    false,
+                    [],
+                    ['style'],
+                ],
+            ],
+            [
+                'input' => '<iframe width="560" onclick="alert(\'xss\')" height="315" src="https://www.youtube.com/embed/foobar?rel=0&controls=0&showinfo=0" frameborder="0" allowfullscreen></iframe>',
+                'expected' => '<iframe width="560"  height="315" src="https://www.youtube.com/embed/foobar?rel=0&controls=0&showinfo=0" frameborder="0" allowfullscreen></iframe>',
+                'additions' => [
+                    false,
+                    ['iframe'],
+                    [],
+                ],
+            ],
         ];
     }
 
diff --git a/tests/phpstan-console-application.php b/tests/phpstan-console-application.php
index 3a8a8d3de65..977af1ab510 100644
--- a/tests/phpstan-console-application.php
+++ b/tests/phpstan-console-application.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 require __DIR__ . '/../autoload.php';
diff --git a/tests/phpstan-dba-bootstrap.php b/tests/phpstan-dba-bootstrap.php
new file mode 100644
index 00000000000..e9c74962f92
--- /dev/null
+++ b/tests/phpstan-dba-bootstrap.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+use Shopware\Components\DependencyInjection\Bridge\Db;
+use staabm\PHPStanDba\QueryReflection\PdoMysqlQueryReflector;
+use staabm\PHPStanDba\QueryReflection\QueryReflection;
+use staabm\PHPStanDba\QueryReflection\RuntimeConfiguration;
+
+$config = new RuntimeConfiguration();
+$config->stringifyTypes(true);
+$config->errorMode(RuntimeConfiguration::ERROR_MODE_BOOL);
+$config->analyzeWriteQueries(false);
+
+$shopwareConfig = include __DIR__ . '/../config.php';
+$pdo = Db::createPDO($shopwareConfig['db']);
+
+QueryReflection::setupReflector(
+    new PdoMysqlQueryReflector($pdo),
+    $config
+);
diff --git a/tests/phpstan-doctrine-model-manager.php b/tests/phpstan-doctrine-model-manager.php
index 66496ef8d1a..6c6231e6257 100644
--- a/tests/phpstan-doctrine-model-manager.php
+++ b/tests/phpstan-doctrine-model-manager.php
@@ -5,23 +5,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 use Shopware\Components\Model\ModelManager;
diff --git a/tests/phpunit.xml.dist b/tests/phpunit.xml.dist
index 7c7b852de8b..ceb9d149f25 100644
--- a/tests/phpunit.xml.dist
+++ b/tests/phpunit.xml.dist
@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
          bootstrap="./Functional/bootstrap.php"
          colors="true"
          backupGlobals="true"
          beStrictAboutOutputDuringTests="true"
          beStrictAboutResourceUsageDuringSmallTests="true"
          beStrictAboutTodoAnnotatedTests="true"
+         convertDeprecationsToExceptions="true"
          verbose="true">
     <coverage includeUncoveredFiles="false">
         <include>
             <directory suffix=".php">../engine/Shopware/</directory>
+            <directory suffix=".php">../engine/Library/Enlight/</directory>
         </include>
         <exclude>
             <directory>../engine/Shopware/Plugins/Community</directory>
-            <directory>../engine/Shopware/Components/Xml</directory>
+            <directory>../engine/Shopware/Plugins/Local</directory>
         </exclude>
     </coverage>
     <testsuites>
diff --git a/tests/phpunit_unit.xml.dist b/tests/phpunit_unit.xml.dist
index 298738258c6..ee365243e27 100644
--- a/tests/phpunit_unit.xml.dist
+++ b/tests/phpunit_unit.xml.dist
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
          bootstrap="../autoload.php"
          backupGlobals="false"
          colors="true"
@@ -8,19 +8,20 @@
          beStrictAboutResourceUsageDuringSmallTests="true"
          beStrictAboutOutputDuringTests="true"
          beStrictAboutTodoAnnotatedTests="true"
+         convertDeprecationsToExceptions="true"
          verbose="true">
-  <coverage includeUncoveredFiles="false">
-    <include>
-      <directory suffix=".php">../engine/Shopware/</directory>
-      <directory suffix=".php">../engine/Library/Enlight/</directory>
-    </include>
-  </coverage>
-  <php>
-    <ini name="error_reporting" value="-1"/>
-  </php>
-  <testsuites>
-    <testsuite name="Unit">
-      <directory>./Unit</directory>
-    </testsuite>
-  </testsuites>
+    <coverage includeUncoveredFiles="false">
+        <include>
+            <directory suffix=".php">../engine/Shopware/</directory>
+            <directory suffix=".php">../engine/Library/Enlight/</directory>
+        </include>
+    </coverage>
+    <php>
+        <ini name="error_reporting" value="-1"/>
+    </php>
+    <testsuites>
+        <testsuite name="Unit">
+            <directory>./Unit</directory>
+        </testsuite>
+    </testsuites>
 </phpunit>
diff --git a/themes/.eslintignore b/themes/.eslintignore
index c2880bc47fa..ea8fdde988a 100644
--- a/themes/.eslintignore
+++ b/themes/.eslintignore
@@ -15,7 +15,6 @@ Backend/ExtJs/backend/_resources/
 Backend/ExtJs/backend/base/bootstrap.js
 Backend/ExtJs/backend/base/component/Shopware.form.field.TinyMCE.js
 Backend/ExtJs/backend/base/component/Shopware.global.ErrorReporter.js
-Backend/ExtJs/backend/benchmark/template/local/vendor/js/chart.js
 
 # Ignored because of the Smarty syntax which is invalid JavaScript
 Backend/ExtJs/backend/article/view/detail/base.js
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/css/core-icon-set-new.css b/themes/Backend/ExtJs/backend/_resources/resources/css/core-icon-set-new.css
index 1f782340380..9c98e9fbe8f 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/css/core-icon-set-new.css
+++ b/themes/Backend/ExtJs/backend/_resources/resources/css/core-icon-set-new.css
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 .min-all,.close-all,.sprite-application--arrow,.settings--plugin-manager,.contents--blog,.contents--forms,.sprite-application-search-result,.sprite-application-text,.sprite-arrow-045-small,.sprite-arrow-225-small,.sprite-arrow-circle-315,.contents--import-export,.sprite-arrow-circle-double,.sprite-balloon--pencil,.article--ratings,.misc--help--board,.settings--performance,.sprite-block,.sprite-blue-document--minus,.sprite-blue-document--plus,.sprite-blue-document-copy,.sprite-blue-document-pdf-text,.sprite-blue-document-template,.sprite-blue-folder--exclamation,.sprite-blue-folder--minus,.sprite-blue-folder--plus,.sprite-blue-folder,.article--categories,.settings--system-info,.sprite-box,.misc--send-feedback,.sprite-btn_taskbar_cap_fenster_tooltip_ico1,.sprite-btn_taskbar_cap_fenster_tooltip_ico2,.sprite-btn_taskbar_cap_fenster_tooltip_ico3,.sprite-btn_taskbar_cap_fenster_tooltip_ico4,.sprite-calendar-month,.sprite-calendar-select-days,.sprite-calendar-select-week,.sprite-camera-lens,.settings--logfile,.sprite-category,.marketing--analyses--abort-analyses,.sprite-chart-pie-separate,.sprite-chart-up-color,.marketing--analyses,.sprite-clock--minus,.sprite-clock,.sprite-construction,.settings--payment-methods,.sprite-cross-circle,.sprite-cross-small,.sprite-cross,.sprite-disk-return-black,.sprite-disk,.sprite-document-pdf,.sprite-document-template,.sprite-documents-stack,.contents--shopsites,.sprite-drive-download,.sprite-drive-upload,.settings--performance--cache,.sprite-edit,.settings--delivery-charges,.sprite-exclamation-diamond,.sprite-exclamation,.sprite-eye,.sprite-films,.marketing--product-exports,.settings--riskmanagement,.sprite-gear--arrow,.sprite-gear,.sprite-globe--arrow,.sprite-globe-green,.sprite-globe,.sprite-grid,.sprite-hard-hat,.sprite-icon_taskbar_cap_fenster,.sprite-icon_taskbar_cap_fenster_active,.sprite-icon_taskbar_cap_logout,.sprite-icon_taskbar_cap_logout_active,.sprite-icon_taskbar_top_artikel,.sprite-icon_taskbar_top_artikel_active,.sprite-icon_taskbar_top_einstellungen,.sprite-icon_taskbar_top_einstellungen_active,.sprite-icon_taskbar_top_hilfe,.sprite-icon_taskbar_top_hilfe_active,.sprite-icon_taskbar_top_inhalte,.sprite-icon_taskbar_top_inhalte_active,.sprite-icon_taskbar_top_kunden,.sprite-icon_taskbar_top_kunden_active,.sprite-icon_taskbar_top_marketing,.sprite-icon_taskbar_top_marketing_active,.sprite-image--exclamation,.marketing--banner,.sprite-images-stack,.sprite-images,.article--add-article,.sprite-inbox-document-music,.sprite-inbox-document-text,.sprite-inbox-download,.sprite-inbox-film,.contents--media-manager,.sprite-inbox-upload,.sprite-inbox,.sprite-information,.sprite-key,.sprite-key--arrow,.sprite-key--pencil,.misc--shortcuts,.sprite-layer-select,.sprite-layout-header-3-mix,.sprite-layout-header,.sprite-layout-hf-3-mix,.sprite-leaf,.sprite-license-key,.misc--help,.sprite-lightning,.sprite-locale,.sprite-mail--minus,.settings--mail-presets,.sprite-mail--plus,.marketing--vouchers,.sprite-mail-send,.sprite-mails-stack,.sprite-megaphone,.sprite-minus-circle-frame,.sprite-minus-circle,.sprite-money--arrow,.sprite-money-coin,.sprite-moneys,.sprite-music-beam,.sprite-newspapers,.marketing--newsletters,.sprite-pencil,.sprite-photo-album--minus,.sprite-photo-album--plus,.sprite-picture--arrow,.sprite-picture--minus,.sprite-picture,.sprite-pictures,.marketing--shopping-worlds,.sprite-plus-circle-frame,.sprite-plus-circle,.sprite-property-blue,.sprite-puzzle--minus,.sprite-puzzle--plus,.marketing--analyses--overview,.sprite-sd-memory-card,.misc--about-shopware,.sprite-star-empty,.sprite-star-half,.marketing--premium-items,.sprite-sticky-note--pencil,.customers--orders,.sprite-store,.sprite-table,.sprite-target,.sprite-tick-circle,.sprite-tick-small,.sprite-tick,.sprite-ticket--pencil,.sprite-toolbox,.sprite-truck-box-label,.article--manufacturers,.customers--customer-list,.sprite-ui-scroll-pane-horizontal,.article--overview,.sprite-user--arrow,.sprite-user--pencil,.customers--add-customer,.settings--user-management,.sprite-user,.sprite-users,.settings--basic-settings,.marketing--partner-program,.marketing--analyses--email-notification,.misc--software-update,.settings--theme-manager,.article--properties,.settings--snippets,.misc--help--online-help,.marketing--analyses--stats-charts,.sprite-bin-metal-full,.sprite-inbox-image,.sprite-application-table,.sprite-application-icon-large,.sprite-star,.sprite-inbox--minus,.sprite-color--pencil,.sprite-mail,.sprite-chart,.sprite-application-home,.sprite-xfn-colleague,.sprite-magnifier,.sprite-media-player-phone,.sprite-user-silhouette-question,.sprite-inbox-document-text,.sprite-inbox--plus,.sprite-sticky-notes-pin,.sprite-imac,.sprite-ipad--portrait,.sprite-ipad--landscape,.sprite-iphone--portrait,.sprite-iphone--landscape,.sprite-document-copy,.sprite-arrow-circle-135,.sprite-application--plus,.sprite-arrow-circle-225-left,.sprite-inbox-select,.sprite-duplicate-article,.sprite-inbox-document-image,.sprite-inbox-document-folder,.sprite-user--list,.sprite-arrow-circle-double-135,.sprite-chart-impressions,.sprite-article-sales,.sprite-duplicate-grid,.sprite-duplicate-template,.sprite-partner-stats,.sprite-ui-split-panel,.sprite-application,.sprite-filter,.sprite-baggage-cart-box-label,.sprite-view-as,.sprite-multi-edit,.sprite-magnifier--arrow,.sprite-application-dock,.sprite-application-dock-180,.sprite-chain-small,.sprite-blue-document-text,.sprite-mail--pencil,.sprite-ui-check-box, .sprite-ui-check-box-uncheck,.sprite-google,.sprite-attributes,.sprite-mousepointer-click,.sprite-import,.sprite-emotion-presets,.sprite-customer-streams, .sprite-product-streams, .sprite-benchmark {
     background: url("../themes/images/icons/core-icon-set-new.png") no-repeat !important;
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/css/core-icon-set.css b/themes/Backend/ExtJs/backend/_resources/resources/css/core-icon-set.css
index 0164d6bcf88..3db9bd7a208 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/css/core-icon-set.css
+++ b/themes/Backend/ExtJs/backend/_resources/resources/css/core-icon-set.css
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 .min-all,.close-all,.sprite-application--arrow,.sprite-application-block,.sprite-application-blog,.sprite-application-form,.sprite-application-search-result,.sprite-application-text,.sprite-arrow-045-small,.sprite-arrow-225-small,.sprite-arrow-circle-315,.sprite-arrow-circle-double-135,.sprite-arrow-circle-double,.sprite-balloon--pencil,.sprite-balloon,.sprite-balloons-box,.sprite-bin-full,.sprite-block,.sprite-blue-document--minus,.sprite-blue-document--plus,.sprite-blue-document-copy,.sprite-blue-document-pdf-text,.sprite-blue-document-template,.sprite-blue-folder--exclamation,.sprite-blue-folder--minus,.sprite-blue-folder--plus,.sprite-blue-folder,.sprite-blue-folders-stack,.sprite-blueprint,.sprite-box,.sprite-briefcase--arrow,.sprite-btn_taskbar_cap_fenster_tooltip_ico1,.sprite-btn_taskbar_cap_fenster_tooltip_ico2,.sprite-btn_taskbar_cap_fenster_tooltip_ico3,.sprite-btn_taskbar_cap_fenster_tooltip_ico4,.sprite-calendar-month,.sprite-calendar-select-days,.sprite-calendar-select-week,.sprite-camera-lens,.sprite-cards-stack,.sprite-category,.sprite-chart-down-color,.sprite-chart-pie-separate,.sprite-chart-up-color,.sprite-chart,.sprite-clock--minus,.sprite-clock,.sprite-construction,.sprite-credit-cards,.sprite-cross-circle,.sprite-cross-small,.sprite-cross,.sprite-disk-return-black,.sprite-disk,.sprite-document-pdf,.sprite-document-template,.sprite-documents-stack,.sprite-documents,.sprite-drive-download,.sprite-drive-upload,.sprite-edit-shade,.sprite-edit,.sprite-envelope--arrow,.sprite-exclamation-diamond,.sprite-exclamation,.sprite-eye,.sprite-films,.sprite-folder-export,.sprite-funnel--exclamation,.sprite-gear--arrow,.sprite-gear,.sprite-globe--arrow,.sprite-globe-green,.sprite-globe,.sprite-grid,.sprite-hard-hat,.sprite-icon_taskbar_cap_fenster,.sprite-icon_taskbar_cap_fenster_active,.sprite-icon_taskbar_cap_logout,.sprite-icon_taskbar_cap_logout_active,.sprite-icon_taskbar_top_artikel,.sprite-icon_taskbar_top_artikel_active,.sprite-icon_taskbar_top_einstellungen,.sprite-icon_taskbar_top_einstellungen_active,.sprite-icon_taskbar_top_hilfe,.sprite-icon_taskbar_top_hilfe_active,.sprite-icon_taskbar_top_inhalte,.sprite-icon_taskbar_top_inhalte_active,.sprite-icon_taskbar_top_kunden,.sprite-icon_taskbar_top_kunden_active,.sprite-icon_taskbar_top_marketing,.sprite-icon_taskbar_top_marketing_active,.sprite-image--exclamation,.sprite-image-medium,.sprite-images-stack,.sprite-images,.sprite-inbox--plus,.sprite-inbox-document-music,.sprite-inbox-document-text,.sprite-inbox-download,.sprite-inbox-film,.sprite-inbox-image,.sprite-inbox-upload,.sprite-inbox,.sprite-information,.sprite-key--arrow,.sprite-key--pencil,.sprite-keyboard-command,.sprite-layer-select,.sprite-layout-header-3-mix,.sprite-layout-header,.sprite-layout-hf-3-mix,.sprite-leaf,.sprite-license-key,.sprite-lifebuoy,.sprite-lightning,.sprite-locale,.sprite-magnifier,.sprite-mail--minus,.sprite-mail--pencil,.sprite-mail--plus,.sprite-mail-open-image,.sprite-mail-send,.sprite-mails-stack,.sprite-megaphone,.sprite-minus-circle-frame,.sprite-minus-circle,.sprite-money--arrow,.sprite-money-coin,.sprite-moneys,.sprite-music-beam,.sprite-newspapers,.sprite-paper-plane,.sprite-pencil,.sprite-photo-album--minus,.sprite-photo-album--plus,.sprite-picture--arrow,.sprite-picture--minus,.sprite-picture,.sprite-pictures,.sprite-pin,.sprite-plus-circle-frame,.sprite-plus-circle,.sprite-property-blue,.sprite-puzzle--minus,.sprite-puzzle--plus,.sprite-report-paper,.sprite-sd-memory-card,.sprite-shopware-logo,.sprite-star-empty,.sprite-star-half,.sprite-star,.sprite-sticky-note--pencil,.sprite-sticky-notes-pin,.sprite-store,.sprite-table,.sprite-target,.sprite-tick-circle,.sprite-tick-small,.sprite-tick,.sprite-ticket--pencil,.sprite-toolbox,.sprite-truck-box-label,.sprite-truck,.sprite-ui-scroll-pane-detail,.sprite-ui-scroll-pane-horizontal,.sprite-ui-scroll-pane-list,.sprite-user--arrow,.sprite-user--pencil,.sprite-user--plus,.sprite-user-silhouette,.sprite-user,.sprite-users,.sprite-wrench-screwdriver,.sprite-xfn-colleague,
 .x-btn-default-toolbar-small .package_green,
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-01.css b/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-01.css
index 07b9a1ccfbb..2514d0abd38 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-01.css
+++ b/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-01.css
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 .sprite-abacus,.sprite-acorn,.sprite-address-book--arrow,.sprite-address-book--exclamation,.sprite-address-book--minus,.sprite-address-book--pencil,.sprite-address-book--plus,.sprite-address-book-blue,.sprite-address-book-open,.sprite-address-book,.sprite-alarm-clock--arrow,.sprite-alarm-clock--exclamation,.sprite-alarm-clock--minus,.sprite-alarm-clock--pencil,.sprite-alarm-clock--plus,.sprite-alarm-clock-blue,.sprite-alarm-clock-select-remain,.sprite-alarm-clock-select,.sprite-alarm-clock,.sprite-anchor,.sprite-android,.sprite-animal-dog,.sprite-animal-monkey-sulky,.sprite-animal-monkey,.sprite-animal-penguin,.sprite-animal,.sprite-application--exclamation,.sprite-application--minus,.sprite-application--pencil,.sprite-application--plus,.sprite-application-ab,.sprite-application-blue,.sprite-application-browser,.sprite-application-cloud,.sprite-application-detail,.sprite-application-dialog,.sprite-application-dock-090,.sprite-application-dock-180,.sprite-application-dock-270,.sprite-application-dock-tab,.sprite-application-dock,.sprite-application-document,.sprite-application-documents,.sprite-application-export,.sprite-application-home,.sprite-application-icon-large,.sprite-application-icon,.sprite-application-image,.sprite-application-import,.sprite-application-list,.sprite-application-medium,.sprite-application-monitor,.sprite-application-network,.sprite-application-plus-black,.sprite-application-plus-red,.sprite-application-plus,.sprite-application-rename,.sprite-application-resize-actual,.sprite-application-resize-full,.sprite-application-resize,.sprite-application-run,.sprite-application-share,.sprite-application-sidebar-collapse,.sprite-application-sidebar-expand,.sprite-application-sidebar-list,.sprite-application-sidebar,.sprite-application-small-blue,.sprite-application-small-list-blue,.sprite-application-small-list,.sprite-application-small,.sprite-application-split-tile,.sprite-application-split-vertical,.sprite-application-split,.sprite-application-sub,.sprite-application-table,.sprite-application-task,.sprite-application-terminal,.sprite-application-text-image,.sprite-application-tile-horizontal,.sprite-application-tile-vertical,.sprite-application-tile,.sprite-application-tree,.sprite-application-wave,.sprite-application,.sprite-applications-blue,.sprite-applications-stack,.sprite-applications,.sprite-arrow-000-medium,.sprite-arrow-000-small,.sprite-arrow-045-medium,.sprite-arrow-045,.sprite-arrow-090-medium,.sprite-arrow-090-small,.sprite-arrow-090,.sprite-arrow-135-medium,.sprite-arrow-135-small,.sprite-arrow-135,.sprite-arrow-180-medium,.sprite-arrow-180-small,.sprite-arrow-180,.sprite-arrow-225-medium,.sprite-arrow-225,.sprite-arrow-270-medium,.sprite-arrow-270-small,.sprite-arrow-270,.sprite-arrow-315-medium,.sprite-arrow-315-small,.sprite-arrow-315,.sprite-arrow-branch-000-left,.sprite-arrow-branch-090-left,.sprite-arrow-branch-090,.sprite-arrow-branch-180-left,.sprite-arrow-branch-180,.sprite-arrow-branch-270-left,.sprite-arrow-branch-270,.sprite-arrow-branch,.sprite-arrow-circle-045-left,.sprite-arrow-circle-135-left,.sprite-arrow-circle-135,.sprite-arrow-circle-225-left,.sprite-arrow-circle-225,.sprite-arrow-circle-315-left,.sprite-arrow-circle,.sprite-arrow-continue-000-top,.sprite-arrow-continue-090-left,.sprite-arrow-continue-090,.sprite-arrow-continue-180-top,.sprite-arrow-continue-180,.sprite-arrow-continue-270-left,.sprite-arrow-continue-270,.sprite-arrow-continue,.sprite-arrow-curve-000-double,.sprite-arrow-curve-000-left,.sprite-arrow-curve-090-left,.sprite-arrow-curve-090,.sprite-arrow-curve-180-double,.sprite-arrow-curve-180-left,.sprite-arrow-curve-180,.sprite-arrow-curve-270-left,.sprite-arrow-curve-270,.sprite-arrow-curve,.sprite-arrow-in-out,.sprite-arrow-in,.sprite-arrow-join-090,.sprite-arrow-join-180,.sprite-arrow-join-270,.sprite-arrow-join,.sprite-arrow-merge-000-left,.sprite-arrow-merge-090-left,.sprite-arrow-merge-090,.sprite-arrow-merge-180-left,.sprite-arrow-merge-180,.sprite-arrow-merge-270-left,.sprite-arrow-merge-270,.sprite-arrow-merge,.sprite-arrow-move,.sprite-arrow-out,.sprite-arrow-repeat-once,.sprite-arrow-repeat,.sprite-arrow-resize-045,.sprite-arrow-resize-090,.sprite-arrow-resize-135,.sprite-arrow-resize,.sprite-arrow-return-000-left,.sprite-arrow-return-090-left,.sprite-arrow-return-090,.sprite-arrow-return-180-left,.sprite-arrow-return-180,.sprite-arrow-return-270-left,.sprite-arrow-return-270,.sprite-arrow-return,.sprite-arrow-retweet,.sprite-arrow-skip-090,.sprite-arrow-skip-180,.sprite-arrow-skip-270,.sprite-arrow-skip,.sprite-arrow-split-090,.sprite-arrow-split-180,.sprite-arrow-split-270,.sprite-arrow-split,.sprite-arrow-step-out,.sprite-arrow-step-over,.sprite-arrow-step,.sprite-arrow-stop-090,.sprite-arrow-stop-180,.sprite-arrow-stop-270,.sprite-arrow-stop,.sprite-arrow-switch-090,.sprite-arrow-switch-180,.sprite-arrow-switch-270,.sprite-arrow-switch,.sprite-arrow-transition-090,.sprite-arrow-transition-180,.sprite-arrow-transition-270,.sprite-arrow-transition,.sprite-arrow-turn-000-left,.sprite-arrow-turn-090-left,.sprite-arrow-turn-090,.sprite-arrow-turn-180-left,.sprite-arrow-turn-180,.sprite-arrow-turn-270-left,.sprite-arrow-turn-270,.sprite-arrow-turn,.sprite-arrow,.sprite-asterisk-small-yellow,.sprite-asterisk-small,.sprite-asterisk-yellow,.sprite-asterisk,.sprite-at-sign-balloon,.sprite-at-sign-document,.sprite-at-sign-small,.sprite-at-sign,.sprite-auction-hammer--arrow,.sprite-auction-hammer--exclamation,.sprite-auction-hammer--minus,.sprite-auction-hammer--pencil,.sprite-auction-hammer--plus,.sprite-auction-hammer-gavel,.sprite-auction-hammer,.sprite-baggage-cart-box-label,.sprite-baggage-cart-box,.sprite-baggage-cart,.sprite-balance--arrow,.sprite-balance--exclamation,.sprite-balance--minus,.sprite-balance--pencil,.sprite-balance--plus,.sprite-balance-unbalance,.sprite-balance,.sprite-balloon--arrow,.sprite-balloon--exclamation,.sprite-balloon--minus,.sprite-balloon--plus,.sprite-balloon-box-left,.sprite-balloon-box,.sprite-balloon-buzz-left,.sprite-balloon-buzz,.sprite-balloon-ellipsis,.sprite-balloon-facebook-left,.sprite-balloon-facebook,.sprite-balloon-left,.sprite-balloon-prohibition,.sprite-balloon-quotation,.sprite-balloon-small-left,.sprite-balloon-small,.sprite-balloon-smiley-sad,.sprite-balloon-smiley,.sprite-balloon-sound,.sprite-balloon-twitter-left,.sprite-balloon-twitter-retweet,.sprite-balloon-twitter,.sprite-balloon-white-left,.sprite-balloon-white,.sprite-balloons-facebook-box,.sprite-balloons-facebook,.sprite-balloons-twitter-box,.sprite-balloons-twitter,.sprite-balloons-white,.sprite-balloons,.sprite-bamboo,.sprite-bamboos,.sprite-bandaid--arrow,.sprite-bandaid--exclamation,.sprite-bandaid--minus,.sprite-bandaid--pencil,.sprite-bandaid--plus,.sprite-bandaid-small,.sprite-bandaid,.sprite-bank--arrow,.sprite-bank--exclamation,.sprite-bank--minus,.sprite-bank--pencil,.sprite-bank--plus,.sprite-bank,.sprite-barcode-2d,.sprite-barcode,.sprite-battery--arrow,.sprite-battery--exclamation,.sprite-battery--minus,.sprite-battery--pencil,.sprite-battery--plus,.sprite-battery-charge,.sprite-battery-empty,.sprite-battery-full,.sprite-battery-low,.sprite-battery-plug,.sprite-battery,.sprite-bauble,.sprite-beaker--arrow,.sprite-beaker--exclamation,.sprite-beaker--minus,.sprite-beaker--pencil,.sprite-beaker--plus,.sprite-beaker-empty,.sprite-beaker,.sprite-bean--arrow,.sprite-bean--exclamation,.sprite-bean--minus,.sprite-bean--pencil,.sprite-bean--plus,.sprite-bean-green,.sprite-bean-small-green,.sprite-bean-small,.sprite-bean,.sprite-beans,.sprite-beer,.sprite-bell--arrow,.sprite-bell--exclamation,.sprite-bell--minus,.sprite-bell--pencil,.sprite-bell--plus,.sprite-bell-small,.sprite-bell,.sprite-billboard-empty,.sprite-billboard-red,.sprite-billboard,.sprite-bin--arrow,.sprite-bin--exclamation,.sprite-bin--minus,.sprite-bin--pencil,.sprite-bin--plus,.sprite-bin-metal-full,.sprite-bin-metal,.sprite-bin,.sprite-binocular--arrow,.sprite-binocular--exclamation,.sprite-binocular--minus,.sprite-binocular--pencil,.sprite-binocular--plus,.sprite-binocular-small,.sprite-binocular,.sprite-block--arrow,.sprite-block--exclamation,.sprite-block--minus,.sprite-block--pencil,.sprite-block--plus,.sprite-block-share,.sprite-block-small,.sprite-blog--arrow,.sprite-blog--exclamation,.sprite-blog--minus,.sprite-blog--pencil,.sprite-blog--plus,.sprite-blog-blue,.sprite-blog-medium,.sprite-blog-posterous,.sprite-blog-tumblr,.sprite-blog,.sprite-blogs-stack,.sprite-blogs,.sprite-blue-document--arrow,.sprite-blue-document--exclamation,.sprite-blue-document--pencil,.sprite-blue-document-access,.sprite-blue-document-attribute-b,.sprite-blue-document-attribute-c,.sprite-blue-document-attribute-d,.sprite-blue-document-attribute-e,.sprite-blue-document-attribute-f,.sprite-blue-document-attribute-g,.sprite-blue-document-attribute-h,.sprite-blue-document-attribute-i,.sprite-blue-document-attribute-j,.sprite-blue-document-attribute-k,.sprite-blue-document-attribute-l,.sprite-blue-document-attribute-m,.sprite-blue-document-attribute-n,.sprite-blue-document-attribute-o,.sprite-blue-document-attribute-p,.sprite-blue-document-attribute-q,.sprite-blue-document-attribute-r,.sprite-blue-document-attribute-s,.sprite-blue-document-attribute-t,.sprite-blue-document-attribute-u,.sprite-blue-document-attribute-v,.sprite-blue-document-attribute-w,.sprite-blue-document-attribute-x,.sprite-blue-document-attribute-y,.sprite-blue-document-attribute-z,.sprite-blue-document-attribute,.sprite-blue-document-binary,.sprite-blue-document-block,.sprite-blue-document-bookmark,.sprite-blue-document-break,.sprite-blue-document-broken,.sprite-blue-document-clock,.sprite-blue-document-code,.sprite-blue-document-convert,.sprite-blue-document-epub-text,.sprite-blue-document-epub,.sprite-blue-document-excel-csv,.sprite-blue-document-excel-table,.sprite-blue-document-excel,.sprite-blue-document-export,.sprite-blue-document-film,.sprite-blue-document-flash-movie,.sprite-blue-document-flash,.sprite-blue-document-globe,.sprite-blue-document-hf-delete-footer,.sprite-blue-document-hf-delete,.sprite-blue-document-hf-insert-footer,.sprite-blue-document-hf-insert,.sprite-blue-document-hf-select-footer,.sprite-blue-document-hf-select,.sprite-blue-document-hf,.sprite-blue-document-horizontal-text,.sprite-blue-document-horizontal,.sprite-blue-document-illustrator,.sprite-blue-document-image,.sprite-blue-document-import,.sprite-blue-document-insert,.sprite-blue-document-invoice,.sprite-blue-document-list,.sprite-blue-document-medium,.sprite-blue-document-mobi-text,.sprite-blue-document-mobi,.sprite-blue-document-music-playlist,.sprite-blue-document-music,.sprite-blue-document-node,.sprite-blue-document-number-0,.sprite-blue-document-number-1,.sprite-blue-document-number-2,.sprite-blue-document-number-3,.sprite-blue-document-number-4,.sprite-blue-document-number-5 {
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-02.css b/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-02.css
index afdf6434e55..e3e0f3c4ead 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-02.css
+++ b/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-02.css
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 .sprite-blue-document-number-6,.sprite-blue-document-number-7,.sprite-blue-document-number-8,.sprite-blue-document-number-9,.sprite-blue-document-number,.sprite-blue-document-office-text,.sprite-blue-document-office,.sprite-blue-document-outlook,.sprite-blue-document-page-last,.sprite-blue-document-page-next,.sprite-blue-document-page-previous,.sprite-blue-document-page,.sprite-blue-document-pdf,.sprite-blue-document-photoshop-image,.sprite-blue-document-photoshop,.sprite-blue-document-php,.sprite-blue-document-powerpoint,.sprite-blue-document-rename,.sprite-blue-document-resize-actual,.sprite-blue-document-resize,.sprite-blue-document-search-result,.sprite-blue-document-share,.sprite-blue-document-shred,.sprite-blue-document-small-list,.sprite-blue-document-small,.sprite-blue-document-smiley-sad,.sprite-blue-document-smiley,.sprite-blue-document-snippet,.sprite-blue-document-stamp,.sprite-blue-document-stand,.sprite-blue-document-sticky-note,.sprite-blue-document-sub,.sprite-blue-document-table,.sprite-blue-document-tag,.sprite-blue-document-task,.sprite-blue-document-tex,.sprite-blue-document-text-image,.sprite-blue-document-text,.sprite-blue-document-tree,.sprite-blue-document-view-book,.sprite-blue-document-view-thumbnail,.sprite-blue-document-view,.sprite-blue-document-visual-studio,.sprite-blue-document-word-text,.sprite-blue-document-word-tick,.sprite-blue-document-word,.sprite-blue-document-xaml,.sprite-blue-document-zipper,.sprite-blue-document,.sprite-blue-documents-stack,.sprite-blue-documents-text,.sprite-blue-documents,.sprite-blue-folder--arrow,.sprite-blue-folder--pencil,.sprite-blue-folder-bookmark,.sprite-blue-folder-broken,.sprite-blue-folder-export,.sprite-blue-folder-horizontal-open,.sprite-blue-folder-horizontal,.sprite-blue-folder-import,.sprite-blue-folder-medium,.sprite-blue-folder-network-horizontal-open,.sprite-blue-folder-network-horizontal,.sprite-blue-folder-network,.sprite-blue-folder-open-document-music-playlist,.sprite-blue-folder-open-document-music,.sprite-blue-folder-open-document-text,.sprite-blue-folder-open-document,.sprite-blue-folder-open-feed,.sprite-blue-folder-open-film,.sprite-blue-folder-open-image,.sprite-blue-folder-open-slide,.sprite-blue-folder-open-table,.sprite-blue-folder-open,.sprite-blue-folder-rename,.sprite-blue-folder-search-result,.sprite-blue-folder-share,.sprite-blue-folder-shred,.sprite-blue-folder-small-horizontal,.sprite-blue-folder-small,.sprite-blue-folder-smiley-sad,.sprite-blue-folder-smiley,.sprite-blue-folder-stamp,.sprite-blue-folder-stand,.sprite-blue-folder-sticky-note,.sprite-blue-folder-tree,.sprite-blue-folder-zipper,.sprite-blue-folders,.sprite-blueprint--arrow,.sprite-blueprint--exclamation,.sprite-blueprint--minus,.sprite-blueprint--pencil,.sprite-blueprint--plus,.sprite-blueprint-horizontal,.sprite-blueprint-medium,.sprite-blueprints,.sprite-bluetooth,.sprite-board-game-go,.sprite-board-game,.sprite-bomb,.sprite-book--arrow,.sprite-book--exclamation,.sprite-book--minus,.sprite-book--pencil,.sprite-book--plus,.sprite-book-bookmark,.sprite-book-brown,.sprite-book-open-bookmark,.sprite-book-open-list,.sprite-book-open-next,.sprite-book-open-previous,.sprite-book-open-text-image,.sprite-book-open-text,.sprite-book-open,.sprite-book-question,.sprite-book-small-brown,.sprite-book-small,.sprite-book,.sprite-bookmark--arrow,.sprite-bookmark--exclamation,.sprite-bookmark--minus,.sprite-bookmark--pencil,.sprite-bookmark--plus,.sprite-bookmark-export,.sprite-bookmark-import,.sprite-bookmark-small,.sprite-bookmark,.sprite-bookmarks,.sprite-books-brown,.sprite-books-stack,.sprite-books,.sprite-border-all,.sprite-border-bottom-double,.sprite-border-bottom-thick,.sprite-border-bottom,.sprite-border-color,.sprite-border-dash,.sprite-border-down,.sprite-border-draw,.sprite-border-horizontal-all,.sprite-border-horizontal,.sprite-border-inside,.sprite-border-left,.sprite-border-outside-thick,.sprite-border-outside,.sprite-border-right,.sprite-border-top-bottom-double,.sprite-border-top-bottom-thick,.sprite-border-top-bottom,.sprite-border-top,.sprite-border-up,.sprite-border-vertical-all,.sprite-border-vertical,.sprite-border-weight,.sprite-border,.sprite-box--arrow,.sprite-box--exclamation,.sprite-box--minus,.sprite-box--pencil,.sprite-box--plus,.sprite-box-document,.sprite-box-label,.sprite-box-medium,.sprite-box-resize-actual,.sprite-box-resize,.sprite-box-search-result,.sprite-box-share,.sprite-box-small,.sprite-box-zipper,.sprite-brain--arrow,.sprite-brain--exclamation,.sprite-brain--minus,.sprite-brain--pencil,.sprite-brain--plus,.sprite-brain-empty,.sprite-brain,.sprite-bread,.sprite-breads,.sprite-briefcase--exclamation,.sprite-briefcase--minus,.sprite-briefcase--pencil,.sprite-briefcase--plus,.sprite-briefcase-small,.sprite-briefcase,.sprite-brightness-control-up,.sprite-brightness-control,.sprite-brightness-low,.sprite-brightness-small-low,.sprite-brightness-small,.sprite-brightness,.sprite-broom--arrow,.sprite-broom--exclamation,.sprite-broom--minus,.sprite-broom--pencil,.sprite-broom--plus,.sprite-broom-code,.sprite-broom,.sprite-bug--arrow,.sprite-bug--exclamation,.sprite-bug--minus,.sprite-bug--pencil,.sprite-bug--plus,.sprite-bug,.sprite-building--arrow,.sprite-building--exclamation,.sprite-building--minus,.sprite-building--pencil,.sprite-building--plus,.sprite-building-hedge,.sprite-building-low,.sprite-building-medium,.sprite-building-network,.sprite-building-old,.sprite-building-small,.sprite-building,.sprite-burn--arrow,.sprite-burn--exclamation,.sprite-burn--minus,.sprite-burn--pencil,.sprite-burn--plus,.sprite-burn-small,.sprite-burn,.sprite-cactus,.sprite-cake--arrow,.sprite-cake--exclamation,.sprite-cake--minus,.sprite-cake--pencil,.sprite-cake--plus,.sprite-cake-plain,.sprite-cake,.sprite-calculator--arrow,.sprite-calculator--exclamation,.sprite-calculator--minus,.sprite-calculator--pencil,.sprite-calculator--plus,.sprite-calculator-gray,.sprite-calculator-scientific,.sprite-calculator,.sprite-calendar--arrow,.sprite-calendar--exclamation,.sprite-calendar--minus,.sprite-calendar--pencil,.sprite-calendar--plus,.sprite-calendar-blue,.sprite-calendar-day,.sprite-calendar-delete,.sprite-calendar-empty,.sprite-calendar-export,.sprite-calendar-import,.sprite-calendar-insert,.sprite-calendar-list,.sprite-calendar-medium,.sprite-calendar-next,.sprite-calendar-previous,.sprite-calendar-property,.sprite-calendar-relation,.sprite-calendar-search-result,.sprite-calendar-select-days-span,.sprite-calendar-select-month,.sprite-calendar-select,.sprite-calendar-share,.sprite-calendar-small-month,.sprite-calendar-small,.sprite-calendar-task,.sprite-calendar,.sprite-camcorder--arrow,.sprite-camcorder--exclamation,.sprite-camcorder--minus,.sprite-camcorder--pencil,.sprite-camcorder--plus,.sprite-camcorder-image,.sprite-camcorder,.sprite-camera--arrow,.sprite-camera--exclamation,.sprite-camera--minus,.sprite-camera--pencil,.sprite-camera--plus,.sprite-camera-black,.sprite-camera-small-black,.sprite-camera-small,.sprite-camera,.sprite-candle-white,.sprite-candle,.sprite-candy-cane,.sprite-car--arrow,.sprite-car--exclamation,.sprite-car--minus,.sprite-car--pencil,.sprite-car--plus,.sprite-car-red,.sprite-car-taxi,.sprite-car,.sprite-card--arrow,.sprite-card--exclamation,.sprite-card--minus,.sprite-card--pencil,.sprite-card--plus,.sprite-card-address,.sprite-card-export,.sprite-card-import,.sprite-card-medium,.sprite-card-small,.sprite-card,.sprite-cards-address,.sprite-cards-bind-address,.sprite-cards-bind,.sprite-cards,.sprite-cassette--arrow,.sprite-cassette--exclamation,.sprite-cassette--minus,.sprite-cassette--pencil,.sprite-cassette--plus,.sprite-cassette-label,.sprite-cassette-small,.sprite-cassette,.sprite-categories,.sprite-category-group-select,.sprite-category-group,.sprite-category-item-select,.sprite-category-item,.sprite-caution-board-prohibition,.sprite-caution-board,.sprite-certificate,.sprite-chain--arrow,.sprite-chain--exclamation,.sprite-chain--minus,.sprite-chain--pencil,.sprite-chain--plus,.sprite-chain-small,.sprite-chain-unchain,.sprite-chain,.sprite-chair--arrow,.sprite-chair--exclamation,.sprite-chair--minus,.sprite-chair--pencil,.sprite-chair--plus,.sprite-chair,.sprite-chalkboard-text,.sprite-chalkboard,.sprite-chart--arrow,.sprite-chart--exclamation,.sprite-chart--minus,.sprite-chart--pencil,.sprite-chart--plus,.sprite-chart-down,.sprite-chart-medium,.sprite-chart-pie,.sprite-chart-up,.sprite-checkerboard,.sprite-cheese-hole,.sprite-cheese,.sprite-cheque--arrow,.sprite-cheque--exclamation,.sprite-cheque--minus,.sprite-cheque--plus,.sprite-cheque-pen,.sprite-cheque-sign,.sprite-cheque,.sprite-chevron-expand,.sprite-chevron-small-expand,.sprite-chevron-small,.sprite-chevron,.sprite-chocolate-bite,.sprite-chocolate-heart-milk,.sprite-chocolate-heart,.sprite-chocolate-milk,.sprite-chocolate,.sprite-church,.sprite-cigarette-prohibition,.sprite-cigarette,.sprite-clapperboard--arrow,.sprite-clapperboard--exclamation,.sprite-clapperboard--minus,.sprite-clapperboard--pencil,.sprite-clapperboard--plus,.sprite-clapperboard,.sprite-clipboard--arrow,.sprite-clipboard--exclamation,.sprite-clipboard--minus,.sprite-clipboard--pencil,.sprite-clipboard--plus,.sprite-clipboard-block,.sprite-clipboard-empty,.sprite-clipboard-invoice,.sprite-clipboard-list,.sprite-clipboard-paste-document-text,.sprite-clipboard-paste-image,.sprite-clipboard-paste-word,.sprite-clipboard-paste,.sprite-clipboard-search-result,.sprite-clipboard-sign-out,.sprite-clipboard-sign,.sprite-clipboard-task,.sprite-clipboard-text,.sprite-clipboard,.sprite-clock--arrow,.sprite-clock--exclamation,.sprite-clock--pencil,.sprite-clock--plus,.sprite-clock-frame,.sprite-clock-history-frame,.sprite-clock-history,.sprite-clock-moon-phase,.sprite-clock-network,.sprite-clock-select-remain,.sprite-clock-select,.sprite-clock-small,.sprite-co2,.sprite-color--arrow,.sprite-color--exclamation,.sprite-color--minus,.sprite-color--pencil,.sprite-color--plus,.sprite-color-adjustment-green,.sprite-color-adjustment-red,.sprite-color-adjustment,.sprite-color-small,.sprite-color-swatch-small,.sprite-color-swatch,.sprite-color-swatches,.sprite-color,.sprite-compass--arrow,.sprite-compass--exclamation,.sprite-compass--minus,.sprite-compass--pencil {
     background: url("../themes/images/icons/extra-icon-set-02.png") no-repeat !important;
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-03.css b/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-03.css
index 6dbfcd929ea..bb53b952000 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-03.css
+++ b/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-03.css
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 .sprite-compass--plus,.sprite-compass,.sprite-compile-error,.sprite-compile-warning,.sprite-compile,.sprite-computer--arrow,.sprite-computer--exclamation,.sprite-computer--minus,.sprite-computer--pencil,.sprite-computer--plus,.sprite-computer-cloud,.sprite-computer-network,.sprite-computer-off,.sprite-computer,.sprite-contrast-control-up,.sprite-contrast-control,.sprite-contrast-low,.sprite-contrast-small-low,.sprite-contrast-small,.sprite-contrast,.sprite-control-000-small,.sprite-control-090-small,.sprite-control-090,.sprite-control-180-small,.sprite-control-180,.sprite-control-270-small,.sprite-control-270,.sprite-control-cursor,.sprite-control-double-000-small,.sprite-control-double-090-small,.sprite-control-double-090,.sprite-control-double-180-small,.sprite-control-double-180,.sprite-control-double-270-small,.sprite-control-double-270,.sprite-control-double,.sprite-control-eject-small,.sprite-control-eject,.sprite-control-pause-record-small,.sprite-control-pause-record,.sprite-control-pause-small,.sprite-control-pause,.sprite-control-power-small,.sprite-control-power,.sprite-control-record-small,.sprite-control-record,.sprite-control-skip-000-small,.sprite-control-skip-090-small,.sprite-control-skip-090,.sprite-control-skip-180-small,.sprite-control-skip-180,.sprite-control-skip-270-small,.sprite-control-skip-270,.sprite-control-skip,.sprite-control-stop-000-small,.sprite-control-stop-090-small,.sprite-control-stop-090,.sprite-control-stop-180-small,.sprite-control-stop-180,.sprite-control-stop-270-small,.sprite-control-stop-270,.sprite-control-stop-square-small,.sprite-control-stop-square,.sprite-control-stop,.sprite-control,.sprite-controller-d-pad,.sprite-controller,.sprite-cookie--arrow,.sprite-cookie--exclamation,.sprite-cookie--minus,.sprite-cookie--pencil,.sprite-cookie--plus,.sprite-cookie-bite,.sprite-cookie-chocolate-sprinkles,.sprite-cookie-chocolate,.sprite-cookie-heart-chocolate-sprinkles,.sprite-cookie-heart-chocolate,.sprite-cookie-heart,.sprite-cookie-medium,.sprite-cookie,.sprite-cookies,.sprite-counter-count-up,.sprite-counter-count,.sprite-counter-reset,.sprite-counter-stop,.sprite-counter,.sprite-creative-commons,.sprite-credit-card--arrow,.sprite-credit-card--exclamation,.sprite-credit-card--minus,.sprite-credit-card--pencil,.sprite-credit-card--plus,.sprite-credit-card-green,.sprite-credit-card-medium,.sprite-credit-card,.sprite-cross-button,.sprite-cross-circle-frame,.sprite-cross-octagon-frame,.sprite-cross-octagon,.sprite-cross-script,.sprite-cross-shield,.sprite-cross-small-circle,.sprite-cross-small-white,.sprite-cross-white,.sprite-crown--arrow,.sprite-crown--exclamation,.sprite-crown--minus,.sprite-crown--pencil,.sprite-crown--plus,.sprite-crown-bronze,.sprite-crown-silver,.sprite-crown,.sprite-cup--arrow,.sprite-cup--exclamation,.sprite-cup--minus,.sprite-cup--pencil,.sprite-cup--plus,.sprite-cup-empty,.sprite-cup-tea,.sprite-cup,.sprite-currency-dollar-aud,.sprite-currency-dollar-cad,.sprite-currency-dollar-nzd,.sprite-currency-dollar-usd,.sprite-currency-euro,.sprite-currency-pound,.sprite-currency-ruble,.sprite-currency-yen,.sprite-currency,.sprite-cursor-lifebuoy,.sprite-cursor-question,.sprite-cursor-small,.sprite-cursor,.sprite-curtain,.sprite-cushion-gray,.sprite-cushion,.sprite-cutleries,.sprite-cutlery-fork,.sprite-cutlery-knife,.sprite-cutlery-spoon,.sprite-cutlery,.sprite-cutter--arrow,.sprite-cutter--exclamation,.sprite-cutter--minus,.sprite-cutter--pencil,.sprite-cutter--plus,.sprite-cutter,.sprite-dashboard--arrow,.sprite-dashboard--exclamation,.sprite-dashboard--minus,.sprite-dashboard--pencil,.sprite-dashboard--plus,.sprite-dashboard-network,.sprite-dashboard,.sprite-database--arrow,.sprite-database--exclamation,.sprite-database--minus,.sprite-database--pencil,.sprite-database--plus,.sprite-database-cloud,.sprite-database-delete,.sprite-database-export,.sprite-database-import,.sprite-database-insert,.sprite-database-medium,.sprite-database-network,.sprite-database-property,.sprite-database-share,.sprite-database-small,.sprite-database-sql,.sprite-database,.sprite-databases-relation,.sprite-databases,.sprite-desktop-empty,.sprite-desktop-image,.sprite-desktop-network,.sprite-desktop-share,.sprite-desktop,.sprite-diamond,.sprite-direction--arrow,.sprite-direction--exclamation,.sprite-direction--minus,.sprite-direction--pencil,.sprite-direction--plus,.sprite-direction,.sprite-disc--arrow,.sprite-disc--exclamation,.sprite-disc--minus,.sprite-disc--pencil,.sprite-disc--plus,.sprite-disc-blue,.sprite-disc-case-label,.sprite-disc-case,.sprite-disc-label,.sprite-disc-rename,.sprite-disc-share,.sprite-disc-small,.sprite-disc,.sprite-discs,.sprite-disk--arrow,.sprite-disk--exclamation,.sprite-disk--minus,.sprite-disk--pencil,.sprite-disk--plus,.sprite-disk-black,.sprite-disk-rename,.sprite-disk-return,.sprite-disk-share,.sprite-disk-small-black,.sprite-disk-small,.sprite-disks-black,.sprite-disks,.sprite-do-not-disturb-sign-prohibition,.sprite-do-not-disturb-sign,.sprite-document--arrow,.sprite-document--exclamation,.sprite-document--minus,.sprite-document--pencil,.sprite-document--plus,.sprite-document-access,.sprite-document-attribute-b,.sprite-document-attribute-c,.sprite-document-attribute-d,.sprite-document-attribute-e,.sprite-document-attribute-f,.sprite-document-attribute-g,.sprite-document-attribute-h,.sprite-document-attribute-i,.sprite-document-attribute-j,.sprite-document-attribute-k,.sprite-document-attribute-l,.sprite-document-attribute-m,.sprite-document-attribute-n,.sprite-document-attribute-o,.sprite-document-attribute-p,.sprite-document-attribute-q,.sprite-document-attribute-r,.sprite-document-attribute-s,.sprite-document-attribute-t,.sprite-document-attribute-u,.sprite-document-attribute-v,.sprite-document-attribute-w,.sprite-document-attribute-x,.sprite-document-attribute-y,.sprite-document-attribute-z,.sprite-document-attribute,.sprite-document-binary,.sprite-document-block,.sprite-document-bookmark,.sprite-document-braille,.sprite-document-break,.sprite-document-broken,.sprite-document-clock,.sprite-document-code,.sprite-document-convert,.sprite-document-copy,.sprite-document-epub-text,.sprite-document-epub,.sprite-document-excel-csv,.sprite-document-excel-table,.sprite-document-excel,.sprite-document-export,.sprite-document-film,.sprite-document-flash-movie,.sprite-document-flash,.sprite-document-globe,.sprite-document-hf-delete-footer,.sprite-document-hf-delete,.sprite-document-hf-insert-footer,.sprite-document-hf-insert,.sprite-document-hf-select-footer,.sprite-document-hf-select,.sprite-document-hf,.sprite-document-horizontal-text,.sprite-document-horizontal,.sprite-document-illustrator,.sprite-document-image,.sprite-document-import,.sprite-document-insert,.sprite-document-invoice,.sprite-document-list,.sprite-document-medium,.sprite-document-mobi-text,.sprite-document-mobi,.sprite-document-music-playlist,.sprite-document-music,.sprite-document-node,.sprite-document-number-0,.sprite-document-number-1,.sprite-document-number-2,.sprite-document-number-3,.sprite-document-number-4,.sprite-document-number-5,.sprite-document-number-6,.sprite-document-number-7,.sprite-document-number-8,.sprite-document-number-9,.sprite-document-number,.sprite-document-office-text,.sprite-document-office,.sprite-document-outlook,.sprite-document-page-last,.sprite-document-page-next,.sprite-document-page-previous,.sprite-document-page,.sprite-document-pdf-text,.sprite-document-photoshop-image,.sprite-document-photoshop,.sprite-document-php,.sprite-document-powerpoint,.sprite-document-rename,.sprite-document-resize-actual,.sprite-document-resize,.sprite-document-search-result,.sprite-document-share,.sprite-document-shred,.sprite-document-small-list,.sprite-document-small,.sprite-document-smiley-sad,.sprite-document-smiley,.sprite-document-snippet,.sprite-document-stamp,.sprite-document-stand,.sprite-document-sticky-note,.sprite-document-sub,.sprite-document-table,.sprite-document-tag,.sprite-document-task,.sprite-document-tex,.sprite-document-text-image,.sprite-document-text,.sprite-document-tree,.sprite-document-view-book,.sprite-document-view-thumbnail,.sprite-document-view,.sprite-document-visual-studio,.sprite-document-word-text,.sprite-document-word-tick,.sprite-document-word,.sprite-document-xaml,.sprite-document-zipper,.sprite-document,.sprite-documents-text,.sprite-door--arrow,.sprite-door--exclamation,.sprite-door--minus,.sprite-door--pencil,.sprite-door--plus,.sprite-door-open-in,.sprite-door-open-out,.sprite-door-open,.sprite-door,.sprite-download-cloud,.sprite-download-linux,.sprite-download-mac-os,.sprite-download,.sprite-drawer--arrow,.sprite-drawer--exclamation,.sprite-drawer--minus,.sprite-drawer--pencil,.sprite-drawer--plus,.sprite-drawer-open,.sprite-drawer,.sprite-dress,.sprite-drill--arrow,.sprite-drill--exclamation,.sprite-drill--minus,.sprite-drill--pencil,.sprite-drill--plus,.sprite-drill,.sprite-drive--arrow,.sprite-drive--exclamation,.sprite-drive--minus,.sprite-drive--pencil,.sprite-drive--plus,.sprite-drive-disc-blue,.sprite-drive-disc,.sprite-drive-globe,.sprite-drive-medium,.sprite-drive-network,.sprite-drive-rename,.sprite-drive-share,.sprite-drive-small,.sprite-drive,.sprite-dummy-happy,.sprite-dummy-sad,.sprite-dummy-small,.sprite-dummy,.sprite-e-book-reader-black,.sprite-e-book-reader-white,.sprite-e-book-reader,.sprite-ear--arrow,.sprite-ear--exclamation,.sprite-ear--minus,.sprite-ear--pencil,.sprite-ear--plus,.sprite-ear-listen,.sprite-ear-right,.sprite-ear,.sprite-edit-alignment-center,.sprite-edit-alignment-justify-distribute,.sprite-edit-alignment-justify,.sprite-edit-alignment-right,.sprite-edit-alignment,.sprite-edit-all-caps,.sprite-edit-bold,.sprite-edit-code-division,.sprite-edit-code,.sprite-edit-color,.sprite-edit-column,.sprite-edit-comma,.sprite-edit-decimal-decrease,.sprite-edit-decimal,.sprite-edit-diff,.sprite-edit-direction-rtl,.sprite-edit-direction,.sprite-edit-drop-cap,.sprite-edit-family,.sprite-edit-heading-1,.sprite-edit-heading-2,.sprite-edit-heading-3,.sprite-edit-heading-4,.sprite-edit-heading-5,.sprite-edit-heading-6,.sprite-edit-heading {
     background: url("../themes/images/icons/extra-icon-set-03.png") !important;
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-04.css b/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-04.css
index 82c3c57f1d9..03631246e74 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-04.css
+++ b/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-04.css
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 .sprite-edit-hyphenation,.sprite-edit-image-center,.sprite-edit-image-right,.sprite-edit-image,.sprite-edit-indent-rtl,.sprite-edit-indent,.sprite-edit-italic,.sprite-edit-kerning,.sprite-edit-language,.sprite-edit-letter-spacing,.sprite-edit-line-spacing,.sprite-edit-lipsum,.sprite-edit-list-order-rtl,.sprite-edit-list-order,.sprite-edit-list-rtl,.sprite-edit-list,.sprite-edit-lowercase,.sprite-edit-mathematics,.sprite-edit-number,.sprite-edit-outdent-rtl,.sprite-edit-outdent,.sprite-edit-outline,.sprite-edit-overline,.sprite-edit-padding-left,.sprite-edit-padding-right,.sprite-edit-padding-top,.sprite-edit-padding,.sprite-edit-percent,.sprite-edit-pilcrow,.sprite-edit-quotation,.sprite-edit-replace,.sprite-edit-rotate,.sprite-edit-rule,.sprite-edit-scale-vertical,.sprite-edit-scale,.sprite-edit-shadow,.sprite-edit-signiture,.sprite-edit-size-down,.sprite-edit-size-up,.sprite-edit-size,.sprite-edit-small-caps,.sprite-edit-space,.sprite-edit-strike-double,.sprite-edit-strike,.sprite-edit-style,.sprite-edit-subscript,.sprite-edit-superscript,.sprite-edit-symbol,.sprite-edit-underline-double,.sprite-edit-underline,.sprite-edit-uppercase,.sprite-edit-vertical-alignment-middle,.sprite-edit-vertical-alignment-top,.sprite-edit-vertical-alignment,.sprite-edit-writing-mode-tbrl,.sprite-edit-writing-mode,.sprite-envelope--exclamation,.sprite-envelope--minus,.sprite-envelope--pencil,.sprite-envelope--plus,.sprite-envelope-at-sign,.sprite-envelope-label,.sprite-envelope-share,.sprite-envelope-string,.sprite-envelope,.sprite-equalizer--arrow,.sprite-equalizer--exclamation,.sprite-equalizer--minus,.sprite-equalizer--pencil,.sprite-equalizer--plus,.sprite-equalizer-flat,.sprite-equalizer-high,.sprite-equalizer-low,.sprite-equalizer,.sprite-eraser--arrow,.sprite-eraser--exclamation,.sprite-eraser--minus,.sprite-eraser--pencil,.sprite-eraser--plus,.sprite-eraser-small,.sprite-eraser,.sprite-exclamation--frame,.sprite-exclamation-button,.sprite-exclamation-circle-frame,.sprite-exclamation-circle,.sprite-exclamation-diamond-frame,.sprite-exclamation-octagon-frame,.sprite-exclamation-octagon,.sprite-exclamation-red-frame,.sprite-exclamation-red,.sprite-exclamation-shield-frame,.sprite-exclamation-shield,.sprite-exclamation-small-red,.sprite-exclamation-small-white,.sprite-exclamation-small,.sprite-exclamation-white,.sprite-external-small,.sprite-external,.sprite-eye--arrow,.sprite-eye--exclamation,.sprite-eye--minus,.sprite-eye--pencil,.sprite-eye--plus,.sprite-eye-close,.sprite-eye-half,.sprite-eye-red,.sprite-feed--arrow,.sprite-feed--exclamation,.sprite-feed--minus,.sprite-feed--pencil,.sprite-feed--plus,.sprite-feed-balloon,.sprite-feed-document,.sprite-feed-small,.sprite-feed,.sprite-fill-090,.sprite-fill-180,.sprite-fill-270,.sprite-fill-medium-090,.sprite-fill-medium-180,.sprite-fill-medium-270,.sprite-fill-medium,.sprite-fill,.sprite-film--arrow,.sprite-film--exclamation,.sprite-film--minus,.sprite-film--pencil,.sprite-film--plus,.sprite-film-cast,.sprite-film-medium,.sprite-film-small,.sprite-film-timeline,.sprite-film-youtube,.sprite-film,.sprite-fingerprint-recognition-fail,.sprite-fingerprint-recognition,.sprite-fingerprint,.sprite-fire--arrow,.sprite-fire--exclamation,.sprite-fire--minus,.sprite-fire--pencil,.sprite-fire--plus,.sprite-fire-big,.sprite-fire-small,.sprite-fire,.sprite-flag--arrow,.sprite-flag--exclamation,.sprite-flag--minus,.sprite-flag--pencil,.sprite-flag--plus,.sprite-flag-black,.sprite-flag-blue,.sprite-flag-checker,.sprite-flag-gray,.sprite-flag-green,.sprite-flag-pink,.sprite-flag-purple,.sprite-flag-small,.sprite-flag-white,.sprite-flag-yellow,.sprite-flag,.sprite-flashlight--arrow,.sprite-flashlight--exclamation,.sprite-flashlight--minus,.sprite-flashlight--pencil,.sprite-flashlight--plus,.sprite-flashlight-shine,.sprite-flashlight,.sprite-flask--arrow,.sprite-flask--exclamation,.sprite-flask--minus,.sprite-flask--pencil,.sprite-flask--plus,.sprite-flask-empty,.sprite-flask,.sprite-flower-face,.sprite-flower-pluck,.sprite-flower,.sprite-foaf,.sprite-folder--arrow,.sprite-folder--exclamation,.sprite-folder--minus,.sprite-folder--pencil,.sprite-folder--plus,.sprite-folder-bookmark,.sprite-folder-broken,.sprite-folder-horizontal-open,.sprite-folder-horizontal,.sprite-folder-import,.sprite-folder-medium,.sprite-folder-network-horizontal-open,.sprite-folder-network-horizontal,.sprite-folder-network,.sprite-folder-open-document-music-playlist,.sprite-folder-open-document-music,.sprite-folder-open-document-text,.sprite-folder-open-document,.sprite-folder-open-feed,.sprite-folder-open-film,.sprite-folder-open-image,.sprite-folder-open-slide,.sprite-folder-open-table,.sprite-folder-open,.sprite-folder-rename,.sprite-folder-search-result,.sprite-folder-share,.sprite-folder-shred,.sprite-folder-small-horizontal,.sprite-folder-small,.sprite-folder-smiley-sad,.sprite-folder-smiley,.sprite-folder-stamp,.sprite-folder-stand,.sprite-folder-sticky-note,.sprite-folder-tree,.sprite-folder-zipper,.sprite-folder,.sprite-folders-stack,.sprite-folders,.sprite-folding-fan,.sprite-footprint,.sprite-footprints,.sprite-fruit-apple-half,.sprite-fruit-grape,.sprite-fruit-lime,.sprite-fruit-orange,.sprite-fruit,.sprite-function,.sprite-funnel--arrow,.sprite-funnel--minus,.sprite-funnel--pencil,.sprite-funnel--plus,.sprite-funnel-small,.sprite-funnel,.sprite-futon,.sprite-game-monitor,.sprite-game,.sprite-gear--exclamation,.sprite-gear--minus,.sprite-gear--pencil,.sprite-gear--plus,.sprite-gear-small,.sprite-gender-female,.sprite-gender,.sprite-geolocation-small,.sprite-geolocation,.sprite-geotag-balloon,.sprite-geotag-document,.sprite-geotag-small,.sprite-geotag,.sprite-ghost-small,.sprite-ghost,.sprite-gingerbread-man-chocolate,.sprite-gingerbread-man,.sprite-git-small,.sprite-git,.sprite-glass--arrow,.sprite-glass--exclamation,.sprite-glass--minus,.sprite-glass--pencil,.sprite-glass--plus,.sprite-glass-empty,.sprite-glass-narrow,.sprite-glass-wide,.sprite-glass,.sprite-globe--exclamation,.sprite-globe--minus,.sprite-globe--pencil,.sprite-globe--plus,.sprite-globe-medium-green,.sprite-globe-medium,.sprite-globe-model,.sprite-globe-network-ethernet,.sprite-globe-network,.sprite-globe-place,.sprite-globe-share,.sprite-globe-small-green,.sprite-globe-small,.sprite-gradient-small,.sprite-gradient,.sprite-graduation-hat,.sprite-graphic-card,.sprite-grid-dot,.sprite-grid-small-dot,.sprite-grid-small,.sprite-grid-snap-dot,.sprite-grid-snap,.sprite-guide-snap,.sprite-guide,.sprite-guitar--arrow,.sprite-guitar--exclamation,.sprite-guitar--minus,.sprite-guitar--pencil,.sprite-guitar--plus,.sprite-guitar,.sprite-haiku-wide,.sprite-haiku,.sprite-hamburger,.sprite-hammer--arrow,.sprite-hammer--exclamation,.sprite-hammer--minus,.sprite-hammer--pencil,.sprite-hammer--plus,.sprite-hammer-left,.sprite-hammer-screwdriver,.sprite-hammer,.sprite-hand-finger,.sprite-hand-horns,.sprite-hand-ily,.sprite-hand-pinky,.sprite-hand-point-090,.sprite-hand-point-180,.sprite-hand-point-270,.sprite-hand-point,.sprite-hand-property,.sprite-hand-red-string-of-fate,.sprite-hand-shake,.sprite-hand-share,.sprite-hand,.sprite-hard-hat--arrow,.sprite-hard-hat--exclamation,.sprite-hard-hat--minus,.sprite-hard-hat--pencil,.sprite-hard-hat--plus,.sprite-hard-hat-military-camouflage,.sprite-hard-hat-military,.sprite-hard-hat-mine,.sprite-headphone--arrow,.sprite-headphone--exclamation,.sprite-headphone--minus,.sprite-headphone--pencil,.sprite-headphone--plus,.sprite-headphone-microphone,.sprite-headphone,.sprite-headstone-cross,.sprite-headstone-rip,.sprite-headstone,.sprite-heart--arrow,.sprite-heart--exclamation,.sprite-heart--minus,.sprite-heart--pencil,.sprite-heart--plus,.sprite-heart-break,.sprite-heart-empty,.sprite-heart-half,.sprite-heart-small-empty,.sprite-heart-small-half,.sprite-heart-small,.sprite-heart,.sprite-highlighter--arrow,.sprite-highlighter--exclamation,.sprite-highlighter--minus,.sprite-highlighter--plus,.sprite-highlighter-color,.sprite-highlighter-small,.sprite-highlighter-text,.sprite-highlighter,.sprite-holly,.sprite-home--arrow,.sprite-home--exclamation,.sprite-home--minus,.sprite-home--pencil,.sprite-home--plus,.sprite-home-for-sale-sign-blue,.sprite-home-for-sale-sign-red,.sprite-home-for-sale-sign,.sprite-home-medium,.sprite-home-network,.sprite-home-share,.sprite-home-small,.sprite-home,.sprite-hourglass--arrow,.sprite-hourglass--exclamation,.sprite-hourglass--minus,.sprite-hourglass--pencil,.sprite-hourglass--plus,.sprite-hourglass-select-remain,.sprite-hourglass-select,.sprite-hourglass,.sprite-ice--arrow,.sprite-ice--exclamation,.sprite-ice--minus,.sprite-ice--pencil,.sprite-ice--plus,.sprite-ice-cream-blue-moon,.sprite-ice-cream-chocolate,.sprite-ice-cream-empty,.sprite-ice-cream-sprinkles-blue-moon,.sprite-ice-cream-sprinkles-chocolate,.sprite-ice-cream-sprinkles,.sprite-ice-cream,.sprite-ice,.sprite-image--arrow,.sprite-image--minus,.sprite-image--pencil,.sprite-image--plus,.sprite-image-balloon,.sprite-image-blur,.sprite-image-cast,.sprite-image-crop,.sprite-image-empty,.sprite-image-export,.sprite-image-import,.sprite-image-instagram-frame,.sprite-image-instagram,.sprite-image-map,.sprite-image-reflection,.sprite-image-resize-actual,.sprite-image-resize,.sprite-image-saturation-up,.sprite-image-saturation,.sprite-image-select,.sprite-image-share,.sprite-image-sharpen,.sprite-image-small-sunset,.sprite-image-small,.sprite-image-sunset,.sprite-image-vertical-sunset,.sprite-image-vertical,.sprite-image,.sprite-images-flickr,.sprite-inbox--arrow,.sprite-inbox--exclamation,.sprite-inbox--minus,.sprite-inbox--pencil {
     background: url("../themes/images/icons/extra-icon-set-04.png") no-repeat !important;
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-05.css b/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-05.css
index 8fbfe460e00..070b5a195a1 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-05.css
+++ b/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-05.css
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 .sprite-inbox-document-music-playlist,.sprite-inbox-document,.sprite-inbox-slide,.sprite-inbox-table,.sprite-infocard-small,.sprite-infocard,.sprite-information-balloon,.sprite-information-button,.sprite-information-frame,.sprite-information-italic,.sprite-information-octagon-frame,.sprite-information-octagon,.sprite-information-shield,.sprite-information-small-white,.sprite-information-small,.sprite-information-white,.sprite-jar--arrow,.sprite-jar--exclamation,.sprite-jar--minus,.sprite-jar--pencil,.sprite-jar--plus,.sprite-jar-empty,.sprite-jar-label,.sprite-jar-open,.sprite-jar,.sprite-joystick,.sprite-json,.sprite-key--exclamation,.sprite-key--minus,.sprite-key--plus,.sprite-key-solid,.sprite-key,.sprite-keyboard--arrow,.sprite-keyboard--exclamation,.sprite-keyboard--minus,.sprite-keyboard--pencil,.sprite-keyboard--plus,.sprite-keyboard-enter,.sprite-keyboard-full-wireless,.sprite-keyboard-full,.sprite-keyboard-small,.sprite-keyboard-smiley,.sprite-keyboard-space,.sprite-keyboard,.sprite-keyboards-combination,.sprite-keyboards,.sprite-language-balloon,.sprite-language-document,.sprite-language-small,.sprite-language,.sprite-layer--arrow,.sprite-layer--exclamation,.sprite-layer--minus,.sprite-layer--pencil,.sprite-layer--plus,.sprite-layer-flip-vertical,.sprite-layer-flip,.sprite-layer-mask,.sprite-layer-resize-actual,.sprite-layer-resize-replicate-vertical,.sprite-layer-resize-replicate,.sprite-layer-resize,.sprite-layer-rotate-left,.sprite-layer-rotate,.sprite-layer-select-point,.sprite-layer-shade,.sprite-layer-shape-curve,.sprite-layer-shape-ellipse,.sprite-layer-shape-line,.sprite-layer-shape-polygon,.sprite-layer-shape-polyline,.sprite-layer-shape-round,.sprite-layer-shape-text,.sprite-layer-shape,.sprite-layer-shred,.sprite-layer-small,.sprite-layer-transparent,.sprite-layer-vector,.sprite-layer,.sprite-layers-alignment-bottom,.sprite-layers-alignment-center,.sprite-layers-alignment-left,.sprite-layers-alignment-middle,.sprite-layers-alignment-right,.sprite-layers-alignment,.sprite-layers-arrange-back,.sprite-layers-arrange,.sprite-layers-group,.sprite-layers-small,.sprite-layers-stack-arrange-back,.sprite-layers-stack-arrange,.sprite-layers-stack,.sprite-layers-ungroup,.sprite-layers,.sprite-layout-2-equal,.sprite-layout-2,.sprite-layout-3-mix,.sprite-layout-3,.sprite-layout-4,.sprite-layout-6,.sprite-layout-design,.sprite-layout-header-2-equal,.sprite-layout-header-2,.sprite-layout-header-3,.sprite-layout-hf-2-equal,.sprite-layout-hf-2,.sprite-layout-hf-3,.sprite-layout-hf,.sprite-layout-join-vertical,.sprite-layout-join,.sprite-layout-select-content,.sprite-layout-select-footer,.sprite-layout-select-sidebar,.sprite-layout-select,.sprite-layout-split-vertical,.sprite-layout-split,.sprite-layout,.sprite-leaf--arrow,.sprite-leaf--exclamation,.sprite-leaf--minus,.sprite-leaf--pencil,.sprite-leaf--plus,.sprite-leaf-plant,.sprite-leaf-red,.sprite-leaf-wormhole,.sprite-leaf-yellow,.sprite-lifebuoy--arrow,.sprite-lifebuoy--exclamation,.sprite-lifebuoy--minus,.sprite-lifebuoy--pencil,.sprite-lifebuoy--plus,.sprite-lifebuoy-medium,.sprite-lifebuoy-small,.sprite-light-bulb--arrow,.sprite-light-bulb--exclamation,.sprite-light-bulb--minus,.sprite-light-bulb--pencil,.sprite-light-bulb--plus,.sprite-light-bulb-code,.sprite-light-bulb-off,.sprite-light-bulb-small-off,.sprite-light-bulb-small,.sprite-light-bulb,.sprite-lighthouse-shine,.sprite-lighthouse,.sprite-lightning--arrow,.sprite-lightning--exclamation,.sprite-lightning--minus,.sprite-lightning--pencil,.sprite-lightning--plus,.sprite-lightning-small,.sprite-locale-alternate,.sprite-lock--arrow,.sprite-lock--exclamation,.sprite-lock--minus,.sprite-lock--pencil,.sprite-lock--plus,.sprite-lock-small,.sprite-lock-ssl,.sprite-lock-unlock,.sprite-lock-warning,.sprite-lock,.sprite-lollipop,.sprite-luggage--arrow,.sprite-luggage--exclamation,.sprite-luggage--minus,.sprite-luggage--pencil,.sprite-luggage--plus,.sprite-luggage-tag,.sprite-luggage,.sprite-mac-os,.sprite-magnet--arrow,.sprite-magnet--exclamation,.sprite-magnet--minus,.sprite-magnet--pencil,.sprite-magnet--plus,.sprite-magnet-blue,.sprite-magnet-small,.sprite-magnet,.sprite-magnifier--arrow,.sprite-magnifier--exclamation,.sprite-magnifier--minus,.sprite-magnifier--pencil,.sprite-magnifier--plus,.sprite-magnifier-history-left,.sprite-magnifier-history,.sprite-magnifier-left,.sprite-magnifier-medium-left,.sprite-magnifier-medium,.sprite-magnifier-small,.sprite-magnifier-zoom-actual-equal,.sprite-magnifier-zoom-actual,.sprite-magnifier-zoom-fit,.sprite-magnifier-zoom-in,.sprite-magnifier-zoom-out,.sprite-magnifier-zoom,.sprite-mahjong--arrow,.sprite-mahjong--exclamation,.sprite-mahjong--minus,.sprite-mahjong--pencil,.sprite-mahjong--plus,.sprite-mahjong-white,.sprite-mahjong,.sprite-mail--arrow,.sprite-mail--exclamation,.sprite-mail-air,.sprite-mail-at-sign,.sprite-mail-forward-all,.sprite-mail-forward,.sprite-mail-medium,.sprite-mail-open-document-music-playlist,.sprite-mail-open-document-music,.sprite-mail-open-document-text,.sprite-mail-open-document,.sprite-mail-open-film,.sprite-mail-open-table,.sprite-mail-open,.sprite-mail-receive,.sprite-mail-reply-all,.sprite-mail-reply,.sprite-mail-send-receive,.sprite-mail-share,.sprite-mail-small,.sprite-mail,.sprite-mails,.sprite-map--arrow,.sprite-map--exclamation,.sprite-map--minus,.sprite-map--pencil,.sprite-map--plus,.sprite-map-medium,.sprite-map-pin,.sprite-map-resize-actual,.sprite-map-resize,.sprite-map-share,.sprite-map,.sprite-maps-stack,.sprite-maps,.sprite-marker--arrow,.sprite-marker--exclamation,.sprite-marker--minus,.sprite-marker--pencil,.sprite-marker--plus,.sprite-marker-small,.sprite-marker,.sprite-mask,.sprite-medal--arrow,.sprite-medal--exclamation,.sprite-medal--minus,.sprite-medal--pencil,.sprite-medal--plus,.sprite-medal-bronze-premium,.sprite-medal-bronze-red-premium,.sprite-medal-bronze-red,.sprite-medal-bronze,.sprite-medal-premium,.sprite-medal-red-premium,.sprite-medal-red,.sprite-medal-silver-premium,.sprite-medal-silver-red-premium,.sprite-medal-silver-red,.sprite-medal-silver,.sprite-medal,.sprite-media-player--arrow,.sprite-media-player--exclamation,.sprite-media-player--minus,.sprite-media-player--pencil,.sprite-media-player--plus,.sprite-media-player-black,.sprite-media-player-cast,.sprite-media-player-medium-black,.sprite-media-player-medium-blue,.sprite-media-player-medium-green,.sprite-media-player-medium-orange,.sprite-media-player-medium-pink,.sprite-media-player-medium-purple,.sprite-media-player-medium-red,.sprite-media-player-medium-yellow,.sprite-media-player-medium,.sprite-media-player-phone-horizontal,.sprite-media-player-phone-protector,.sprite-media-player-phone,.sprite-media-player-protector,.sprite-media-player-small-blue,.sprite-media-player-small-green,.sprite-media-player-small-pink,.sprite-media-player-small-red,.sprite-media-player-small,.sprite-media-player-xsmall-black,.sprite-media-player-xsmall-blue,.sprite-media-player-xsmall-green,.sprite-media-player-xsmall-pink,.sprite-media-player-xsmall-polish,.sprite-media-player-xsmall,.sprite-media-player,.sprite-media-players,.sprite-megaphone--arrow,.sprite-megaphone--exclamation,.sprite-megaphone--minus,.sprite-megaphone--pencil,.sprite-megaphone--plus,.sprite-memory,.sprite-metronome--arrow,.sprite-metronome--exclamation,.sprite-metronome--minus,.sprite-metronome--pencil,.sprite-metronome--plus,.sprite-metronome,.sprite-microformats,.sprite-microphone--arrow,.sprite-microphone--exclamation,.sprite-microphone--minus,.sprite-microphone--pencil,.sprite-microphone--plus,.sprite-microphone,.sprite-milestone-calendar,.sprite-milestone,.sprite-milk-label,.sprite-milk,.sprite-minus-button,.sprite-minus-octagon-frame,.sprite-minus-octagon,.sprite-minus-shield,.sprite-minus-small-circle,.sprite-minus-small-white,.sprite-minus-small,.sprite-minus-white,.sprite-minus,.sprite-mizuhiki-paper-cord-alternate,.sprite-mizuhiki-paper-cord,.sprite-mobile-phone--arrow,.sprite-mobile-phone--exclamation,.sprite-mobile-phone--minus,.sprite-mobile-phone--pencil,.sprite-mobile-phone--plus,.sprite-mobile-phone-cast,.sprite-mobile-phone-medium,.sprite-mobile-phone-off,.sprite-mobile-phone-protector,.sprite-mobile-phone,.sprite-molecule,.sprite-money--exclamation,.sprite-money--minus,.sprite-money--pencil,.sprite-money--plus,.sprite-money-medium,.sprite-money,.sprite-monitor--arrow,.sprite-monitor--exclamation,.sprite-monitor--minus,.sprite-monitor--pencil,.sprite-monitor--plus,.sprite-monitor-blue,.sprite-monitor-cast,.sprite-monitor-cloud,.sprite-monitor-image,.sprite-monitor-medium,.sprite-monitor-network,.sprite-monitor-off,.sprite-monitor-protector,.sprite-monitor-screensaver,.sprite-monitor-sidebar,.sprite-monitor-wallpaper,.sprite-monitor-window-3d,.sprite-monitor-window-flow,.sprite-monitor-window,.sprite-monitor,.sprite-mouse--arrow,.sprite-mouse--exclamation,.sprite-mouse--minus,.sprite-mouse--pencil,.sprite-mouse--plus,.sprite-mouse-select-right,.sprite-mouse-select-wheel,.sprite-mouse-select,.sprite-mouse,.sprite-mushroom,.sprite-music--arrow,.sprite-music--exclamation,.sprite-music--minus,.sprite-music--pencil,.sprite-music--plus,.sprite-music-beam-16,.sprite-music-small,.sprite-music,.sprite-mustache,.sprite-na,.sprite-navigation-000-button-white,.sprite-navigation-000-button,.sprite-navigation-000-frame,.sprite-navigation-000-white,.sprite-navigation-090-button-white,.sprite-navigation-090-button,.sprite-navigation-090-frame,.sprite-navigation-090-white,.sprite-navigation-090,.sprite-navigation-180-button-white,.sprite-navigation-180-button,.sprite-navigation-180-frame,.sprite-navigation-180-white,.sprite-navigation-180,.sprite-navigation-270-button-white,.sprite-navigation-270-button,.sprite-navigation-270-frame,.sprite-navigation-270-white,.sprite-navigation-270,.sprite-navigation,.sprite-network-cloud,.sprite-network-clouds,.sprite-network-ethernet,.sprite-network-firewall,.sprite-network-hub,.sprite-network-ip-local,.sprite-network-ip,.sprite-network-status-away,.sprite-network-status-busy,.sprite-network-status-offline,.sprite-network-status,.sprite-network-wireless,.sprite-network,.sprite-new-text,.sprite-new,.sprite-newspaper--arrow,.sprite-newspaper--exclamation,.sprite-newspaper--minus {
     background: url("../themes/images/icons/extra-icon-set-05.png") no-repeat !important;
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-06.css b/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-06.css
index 3446e91e821..79fc494edd4 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-06.css
+++ b/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-06.css
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 .sprite-inbox-document-music-playlist,.sprite-inbox-document,.sprite-inbox-slide,.sprite-inbox-table,.sprite-infocard-small,.sprite-infocard,.sprite-information-balloon,.sprite-information-button,.sprite-information-frame,.sprite-information-italic,.sprite-information-octagon-frame,.sprite-information-octagon,.sprite-information-shield,.sprite-information-small-white,.sprite-information-small,.sprite-information-white,.sprite-jar--arrow,.sprite-jar--exclamation,.sprite-jar--minus,.sprite-jar--pencil,.sprite-jar--plus,.sprite-jar-empty,.sprite-jar-label,.sprite-jar-open,.sprite-jar,.sprite-joystick,.sprite-json,.sprite-key--exclamation,.sprite-key--minus,.sprite-key--plus,.sprite-key-solid,.sprite-key,.sprite-keyboard--arrow,.sprite-keyboard--exclamation,.sprite-keyboard--minus,.sprite-keyboard--pencil,.sprite-keyboard--plus,.sprite-keyboard-enter,.sprite-keyboard-full-wireless,.sprite-keyboard-full,.sprite-keyboard-small,.sprite-keyboard-smiley,.sprite-keyboard-space,.sprite-keyboard,.sprite-keyboards-combination,.sprite-keyboards,.sprite-language-balloon,.sprite-language-document,.sprite-language-small,.sprite-language,.sprite-layer--arrow,.sprite-layer--exclamation,.sprite-layer--minus,.sprite-layer--pencil,.sprite-layer--plus,.sprite-layer-flip-vertical,.sprite-layer-flip,.sprite-layer-mask,.sprite-layer-resize-actual,.sprite-layer-resize-replicate-vertical,.sprite-layer-resize-replicate,.sprite-layer-resize,.sprite-layer-rotate-left,.sprite-layer-rotate,.sprite-layer-select-point,.sprite-layer-shade,.sprite-layer-shape-curve,.sprite-layer-shape-ellipse,.sprite-layer-shape-line,.sprite-layer-shape-polygon,.sprite-layer-shape-polyline,.sprite-layer-shape-round,.sprite-layer-shape-text,.sprite-layer-shape,.sprite-layer-shred,.sprite-layer-small,.sprite-layer-transparent,.sprite-layer-vector,.sprite-layer,.sprite-layers-alignment-bottom,.sprite-layers-alignment-center,.sprite-layers-alignment-left,.sprite-layers-alignment-middle,.sprite-layers-alignment-right,.sprite-layers-alignment,.sprite-layers-arrange-back,.sprite-layers-arrange,.sprite-layers-group,.sprite-layers-small,.sprite-layers-stack-arrange-back,.sprite-layers-stack-arrange,.sprite-layers-stack,.sprite-layers-ungroup,.sprite-layers,.sprite-layout-2-equal,.sprite-layout-2,.sprite-layout-3-mix,.sprite-layout-3,.sprite-layout-4,.sprite-layout-6,.sprite-layout-design,.sprite-layout-header-2-equal,.sprite-layout-header-2,.sprite-layout-header-3,.sprite-layout-hf-2-equal,.sprite-layout-hf-2,.sprite-layout-hf-3,.sprite-layout-hf,.sprite-layout-join-vertical,.sprite-layout-join,.sprite-layout-select-content,.sprite-layout-select-footer,.sprite-layout-select-sidebar,.sprite-layout-select,.sprite-layout-split-vertical,.sprite-layout-split,.sprite-layout,.sprite-leaf--arrow,.sprite-leaf--exclamation,.sprite-leaf--minus,.sprite-leaf--pencil,.sprite-leaf--plus,.sprite-leaf-plant,.sprite-leaf-red,.sprite-leaf-wormhole,.sprite-leaf-yellow,.sprite-lifebuoy--arrow,.sprite-lifebuoy--exclamation,.sprite-lifebuoy--minus,.sprite-lifebuoy--pencil,.sprite-lifebuoy--plus,.sprite-lifebuoy-medium,.sprite-lifebuoy-small,.sprite-light-bulb--arrow,.sprite-light-bulb--exclamation,.sprite-light-bulb--minus,.sprite-light-bulb--pencil,.sprite-light-bulb--plus,.sprite-light-bulb-code,.sprite-light-bulb-off,.sprite-light-bulb-small-off,.sprite-light-bulb-small,.sprite-light-bulb,.sprite-lighthouse-shine,.sprite-lighthouse,.sprite-lightning--arrow,.sprite-lightning--exclamation,.sprite-lightning--minus,.sprite-lightning--pencil,.sprite-lightning--plus,.sprite-lightning-small,.sprite-locale-alternate,.sprite-lock--arrow,.sprite-lock--exclamation,.sprite-lock--minus,.sprite-lock--pencil,.sprite-lock--plus,.sprite-lock-small,.sprite-lock-ssl,.sprite-lock-unlock,.sprite-lock-warning,.sprite-lock,.sprite-lollipop,.sprite-luggage--arrow,.sprite-luggage--exclamation,.sprite-luggage--minus,.sprite-luggage--pencil,.sprite-luggage--plus,.sprite-luggage-tag,.sprite-luggage,.sprite-mac-os,.sprite-magnet--arrow,.sprite-magnet--exclamation,.sprite-magnet--minus,.sprite-magnet--pencil,.sprite-magnet--plus,.sprite-magnet-blue,.sprite-magnet-small,.sprite-magnet,.sprite-magnifier--arrow,.sprite-magnifier--exclamation,.sprite-magnifier--minus,.sprite-magnifier--pencil,.sprite-magnifier--plus,.sprite-magnifier-history-left,.sprite-magnifier-history,.sprite-magnifier-left,.sprite-magnifier-medium-left,.sprite-magnifier-medium,.sprite-magnifier-small,.sprite-magnifier-zoom-actual-equal,.sprite-magnifier-zoom-actual,.sprite-magnifier-zoom-fit,.sprite-magnifier-zoom-in,.sprite-magnifier-zoom-out,.sprite-magnifier-zoom,.sprite-mahjong--arrow,.sprite-mahjong--exclamation,.sprite-mahjong--minus,.sprite-mahjong--pencil,.sprite-mahjong--plus,.sprite-mahjong-white,.sprite-mahjong,.sprite-mail--arrow,.sprite-mail--exclamation,.sprite-mail-air,.sprite-mail-at-sign,.sprite-mail-forward-all,.sprite-mail-forward,.sprite-mail-medium,.sprite-mail-open-document-music-playlist,.sprite-mail-open-document-music,.sprite-mail-open-document-text,.sprite-mail-open-document,.sprite-mail-open-film,.sprite-mail-open-table,.sprite-mail-open,.sprite-mail-receive,.sprite-mail-reply-all,.sprite-mail-reply,.sprite-mail-send-receive,.sprite-mail-share,.sprite-mail-small,.sprite-mail,.sprite-mails,.sprite-map--arrow,.sprite-map--exclamation,.sprite-map--minus,.sprite-map--pencil,.sprite-map--plus,.sprite-map-medium,.sprite-map-pin,.sprite-map-resize-actual,.sprite-map-resize,.sprite-map-share,.sprite-map,.sprite-maps-stack,.sprite-maps,.sprite-marker--arrow,.sprite-marker--exclamation,.sprite-marker--minus,.sprite-marker--pencil,.sprite-marker--plus,.sprite-marker-small,.sprite-marker,.sprite-mask,.sprite-medal--arrow,.sprite-medal--exclamation,.sprite-medal--minus,.sprite-medal--pencil,.sprite-medal--plus,.sprite-medal-bronze-premium,.sprite-medal-bronze-red-premium,.sprite-medal-bronze-red,.sprite-medal-bronze,.sprite-medal-premium,.sprite-medal-red-premium,.sprite-medal-red,.sprite-medal-silver-premium,.sprite-medal-silver-red-premium,.sprite-medal-silver-red,.sprite-medal-silver,.sprite-medal,.sprite-media-player--arrow,.sprite-media-player--exclamation,.sprite-media-player--minus,.sprite-media-player--pencil,.sprite-media-player--plus,.sprite-media-player-black,.sprite-media-player-cast,.sprite-media-player-medium-black,.sprite-media-player-medium-blue,.sprite-media-player-medium-green,.sprite-media-player-medium-orange,.sprite-media-player-medium-pink,.sprite-media-player-medium-purple,.sprite-media-player-medium-red,.sprite-media-player-medium-yellow,.sprite-media-player-medium,.sprite-media-player-phone-horizontal,.sprite-media-player-phone-protector,.sprite-media-player-phone,.sprite-media-player-protector,.sprite-media-player-small-blue,.sprite-media-player-small-green,.sprite-media-player-small-pink,.sprite-media-player-small-red,.sprite-media-player-small,.sprite-media-player-xsmall-black,.sprite-media-player-xsmall-blue,.sprite-media-player-xsmall-green,.sprite-media-player-xsmall-pink,.sprite-media-player-xsmall-polish,.sprite-media-player-xsmall,.sprite-media-player,.sprite-media-players,.sprite-megaphone--arrow,.sprite-megaphone--exclamation,.sprite-megaphone--minus,.sprite-megaphone--pencil,.sprite-megaphone--plus,.sprite-memory,.sprite-metronome--arrow,.sprite-metronome--exclamation,.sprite-metronome--minus,.sprite-metronome--pencil,.sprite-metronome--plus,.sprite-metronome,.sprite-microformats,.sprite-microphone--arrow,.sprite-microphone--exclamation,.sprite-microphone--minus,.sprite-microphone--pencil,.sprite-microphone--plus,.sprite-microphone,.sprite-milestone-calendar,.sprite-milestone,.sprite-milk-label,.sprite-milk,.sprite-minus-button,.sprite-minus-octagon-frame,.sprite-minus-octagon,.sprite-minus-shield,.sprite-minus-small-circle,.sprite-minus-small-white,.sprite-minus-small,.sprite-minus-white,.sprite-minus,.sprite-mizuhiki-paper-cord-alternate,.sprite-mizuhiki-paper-cord,.sprite-mobile-phone--arrow,.sprite-mobile-phone--exclamation,.sprite-mobile-phone--minus,.sprite-mobile-phone--pencil,.sprite-mobile-phone--plus,.sprite-mobile-phone-cast,.sprite-mobile-phone-medium,.sprite-mobile-phone-off,.sprite-mobile-phone-protector,.sprite-mobile-phone,.sprite-molecule,.sprite-money--exclamation,.sprite-money--minus,.sprite-money--pencil,.sprite-money--plus,.sprite-money-medium,.sprite-money,.sprite-monitor--arrow,.sprite-monitor--exclamation,.sprite-monitor--minus,.sprite-monitor--pencil,.sprite-monitor--plus,.sprite-monitor-blue,.sprite-monitor-cast,.sprite-monitor-cloud,.sprite-monitor-image,.sprite-monitor-medium,.sprite-monitor-network,.sprite-monitor-off,.sprite-monitor-protector,.sprite-monitor-screensaver,.sprite-monitor-sidebar,.sprite-monitor-wallpaper,.sprite-monitor-window-3d,.sprite-monitor-window-flow,.sprite-monitor-window,.sprite-monitor,.sprite-mouse--arrow,.sprite-mouse--exclamation,.sprite-mouse--minus,.sprite-mouse--pencil,.sprite-mouse--plus,.sprite-mouse-select-right,.sprite-mouse-select-wheel,.sprite-mouse-select,.sprite-mouse,.sprite-mushroom,.sprite-music--arrow,.sprite-music--exclamation,.sprite-music--minus,.sprite-music--pencil,.sprite-music--plus,.sprite-music-beam-16,.sprite-music-small,.sprite-music,.sprite-mustache,.sprite-na,.sprite-navigation-000-button-white,.sprite-navigation-000-button,.sprite-navigation-000-frame,.sprite-navigation-000-white,.sprite-navigation-090-button-white,.sprite-navigation-090-button,.sprite-navigation-090-frame,.sprite-navigation-090-white,.sprite-navigation-090,.sprite-navigation-180-button-white,.sprite-navigation-180-button,.sprite-navigation-180-frame,.sprite-navigation-180-white,.sprite-navigation-180,.sprite-navigation-270-button-white,.sprite-navigation-270-button,.sprite-navigation-270-frame,.sprite-navigation-270-white,.sprite-navigation-270,.sprite-navigation,.sprite-network-cloud,.sprite-network-clouds,.sprite-network-ethernet,.sprite-network-firewall,.sprite-network-hub,.sprite-network-ip-local,.sprite-network-ip,.sprite-network-status-away,.sprite-network-status-busy,.sprite-network-status-offline,.sprite-network-status,.sprite-network-wireless,.sprite-network,.sprite-new-text,.sprite-new,.sprite-newspaper--arrow,.sprite-newspaper--exclamation,.sprite-newspaper--minus {
     background: url("../themes/images/icons/extra-icon-set-06.png") no-repeat !important
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-07.css b/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-07.css
index ca3c0755469..d44721739c9 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-07.css
+++ b/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-07.css
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 .sprite-script-attribute-f,.sprite-script-attribute-g,.sprite-script-attribute-h,.sprite-script-attribute-i,.sprite-script-attribute-j,.sprite-script-attribute-k,.sprite-script-attribute-l,.sprite-script-attribute-m,.sprite-script-attribute-n,.sprite-script-attribute-o,.sprite-script-attribute-p,.sprite-script-attribute-q,.sprite-script-attribute-r,.sprite-script-attribute-s,.sprite-script-attribute-t,.sprite-script-attribute-u,.sprite-script-attribute-v,.sprite-script-attribute-w,.sprite-script-attribute-x,.sprite-script-attribute-y,.sprite-script-attribute-z,.sprite-script-attribute,.sprite-script-binary,.sprite-script-block,.sprite-script-code,.sprite-script-excel,.sprite-script-export,.sprite-script-flash,.sprite-script-globe,.sprite-script-import,.sprite-script-medium,.sprite-script-office,.sprite-script-php,.sprite-script-smiley-sad,.sprite-script-smiley,.sprite-script-stamp,.sprite-script-text,.sprite-script-visual-studio,.sprite-script-word,.sprite-script,.sprite-scripts-text,.sprite-scripts,.sprite-sealing-wax,.sprite-selection-input,.sprite-selection-resize-actual,.sprite-selection-resize,.sprite-selection-select-input,.sprite-selection-select,.sprite-selection,.sprite-server--arrow,.sprite-server--exclamation,.sprite-server--minus,.sprite-server--pencil,.sprite-server--plus,.sprite-server-cast,.sprite-server-cloud,.sprite-server-medium,.sprite-server-network,.sprite-server-property,.sprite-server,.sprite-servers-network,.sprite-servers,.sprite-service-bell--arrow,.sprite-service-bell--exclamation,.sprite-service-bell--minus,.sprite-service-bell--pencil,.sprite-service-bell--plus,.sprite-service-bell,.sprite-share-balloon,.sprite-share-document,.sprite-share-small,.sprite-share,.sprite-shield--arrow,.sprite-shield--exclamation,.sprite-shield--minus,.sprite-shield--pencil,.sprite-shield--plus,.sprite-shield,.sprite-shoe--arrow,.sprite-shoe--exclamation,.sprite-shoe--minus,.sprite-shoe--pencil,.sprite-shoe--plus,.sprite-shoe-high,.sprite-shoe,.sprite-shopping-basket--arrow,.sprite-shopping-basket--exclamation,.sprite-shopping-basket--minus,.sprite-shopping-basket--pencil,.sprite-shopping-basket--plus,.sprite-shopping-basket,.sprite-shortcut-small,.sprite-shortcut,.sprite-shovel,.sprite-shuriken,.sprite-sitemap-application-blue,.sprite-sitemap-application,.sprite-sitemap-image,.sprite-sitemap,.sprite-skull-happy,.sprite-skull-mad,.sprite-skull-old,.sprite-skull-sad,.sprite-skull,.sprite-slide--arrow,.sprite-slide--exclamation,.sprite-slide--minus,.sprite-slide--pencil,.sprite-slide--plus,.sprite-slide-medium,.sprite-slide-powerpoint,.sprite-slide-resize-actual,.sprite-slide-resize,.sprite-slide,.sprite-slides-stack,.sprite-slides,.sprite-smiley-angel,.sprite-smiley-confuse,.sprite-smiley-cool,.sprite-smiley-cry,.sprite-smiley-draw,.sprite-smiley-eek-blue,.sprite-smiley-eek,.sprite-smiley-evil,.sprite-smiley-fat,.sprite-smiley-grin,.sprite-smiley-kiss,.sprite-smiley-kitty,.sprite-smiley-lol,.sprite-smiley-mad,.sprite-smiley-medium,.sprite-smiley-money,.sprite-smiley-mr-green,.sprite-smiley-nerd,.sprite-smiley-neutral,.sprite-smiley-razz,.sprite-smiley-red,.sprite-smiley-roll-blue,.sprite-smiley-roll-sweat,.sprite-smiley-roll,.sprite-smiley-sad-blue,.sprite-smiley-sad,.sprite-smiley-sleep,.sprite-smiley-slim,.sprite-smiley-small,.sprite-smiley-surprise,.sprite-smiley-sweat,.sprite-smiley-twist,.sprite-smiley-wink,.sprite-smiley-yell,.sprite-smiley-zipper,.sprite-smiley,.sprite-snowman-hat,.sprite-snowman,.sprite-soap-body,.sprite-soap-header,.sprite-soap,.sprite-socket--arrow,.sprite-socket--exclamation,.sprite-socket--minus,.sprite-socket--pencil,.sprite-socket--plus,.sprite-socket,.sprite-sockets,.sprite-sofa--arrow,.sprite-sofa--exclamation,.sprite-sofa--minus,.sprite-sofa--pencil,.sprite-sofa--plus,.sprite-sofa,.sprite-solar-panel,.sprite-sort--arrow,.sprite-sort--exclamation,.sprite-sort--minus,.sprite-sort--pencil,.sprite-sort--plus,.sprite-sort-alphabet-column,.sprite-sort-alphabet-descending,.sprite-sort-alphabet,.sprite-sort-date-descending,.sprite-sort-date,.sprite-sort-number-column,.sprite-sort-number-descending,.sprite-sort-number,.sprite-sort-price-descending,.sprite-sort-price,.sprite-sort-quantity-descending,.sprite-sort-quantity,.sprite-sort-rating-descending,.sprite-sort-rating,.sprite-sort-small,.sprite-sort,.sprite-speaker--arrow,.sprite-speaker--exclamation,.sprite-speaker--minus,.sprite-speaker--pencil,.sprite-speaker--plus,.sprite-speaker-network,.sprite-speaker-volume-control-mute,.sprite-speaker-volume-control-up,.sprite-speaker-volume-control,.sprite-speaker-volume-low,.sprite-speaker-volume-none,.sprite-speaker-volume,.sprite-speaker,.sprite-spectacle-3d,.sprite-spectacle-lorgnette,.sprite-spectacle-small,.sprite-spectacle-sunglass,.sprite-spectacle,.sprite-spectrum-absorption,.sprite-spectrum-emission,.sprite-spectrum-small,.sprite-spectrum,.sprite-spell-check-error,.sprite-spell-check,.sprite-sport-basketball,.sprite-sport-cricket,.sprite-sport-football,.sprite-sport-golf,.sprite-sport-soccer,.sprite-sport-tennis,.sprite-sport,.sprite-sports,.sprite-spray--arrow,.sprite-spray--exclamation,.sprite-spray--minus,.sprite-spray--pencil,.sprite-spray--plus,.sprite-spray-color,.sprite-spray-medium,.sprite-spray,.sprite-sql-join-inner,.sprite-sql-join-left-exclude,.sprite-sql-join-left,.sprite-sql-join-outer-exclude,.sprite-sql-join-outer,.sprite-sql-join-right-exclude,.sprite-sql-join-right,.sprite-sql-join,.sprite-sql,.sprite-stairs,.sprite-stamp--arrow,.sprite-stamp--exclamation,.sprite-stamp--minus,.sprite-stamp--pencil,.sprite-stamp--plus,.sprite-stamp-medium,.sprite-stamp-pattern,.sprite-stamp,.sprite-star--arrow,.sprite-star--exclamation,.sprite-star--minus,.sprite-star--pencil,.sprite-star--plus,.sprite-star-small-empty,.sprite-star-small-half,.sprite-star-small,.sprite-status-away,.sprite-status-busy,.sprite-status-offline,.sprite-status,.sprite-stickman-run-dash,.sprite-stickman-run,.sprite-stickman-smiley-angry,.sprite-stickman-smiley-empty,.sprite-stickman-smiley-love,.sprite-stickman-smiley-question,.sprite-stickman-smiley,.sprite-stickman,.sprite-sticky-note--arrow,.sprite-sticky-note--exclamation,.sprite-sticky-note--minus,.sprite-sticky-note--plus,.sprite-sticky-note-medium,.sprite-sticky-note-pin,.sprite-sticky-note-shred,.sprite-sticky-note-small-pin,.sprite-sticky-note-small,.sprite-sticky-note-text,.sprite-sticky-note,.sprite-sticky-notes-stack,.sprite-sticky-notes-text,.sprite-sticky-notes,.sprite-store--arrow,.sprite-store--exclamation,.sprite-store--minus,.sprite-store--pencil,.sprite-store--plus,.sprite-store-label,.sprite-store-market-stall,.sprite-store-medium,.sprite-store-network,.sprite-store-open,.sprite-store-share,.sprite-store-small,.sprite-subversion-small,.sprite-subversion,.sprite-sum,.sprite-sushi,.sprite-switch--arrow,.sprite-switch--exclamation,.sprite-switch--minus,.sprite-switch--pencil,.sprite-switch--plus,.sprite-switch-medium,.sprite-switch-network,.sprite-switch-small,.sprite-switch,.sprite-system-monitor--arrow,.sprite-system-monitor--exclamation,.sprite-system-monitor--minus,.sprite-system-monitor--pencil,.sprite-system-monitor--plus,.sprite-system-monitor-medium,.sprite-system-monitor-network,.sprite-system-monitor-protector,.sprite-system-monitor,.sprite-t-shirt-gray,.sprite-t-shirt-print-gray,.sprite-t-shirt-print,.sprite-t-shirt,.sprite-table--arrow,.sprite-table--exclamation,.sprite-table--minus,.sprite-table--pencil,.sprite-table--plus,.sprite-table-delete-column,.sprite-table-delete-row,.sprite-table-delete,.sprite-table-draw,.sprite-table-excel,.sprite-table-export,.sprite-table-heatmap,.sprite-table-import,.sprite-table-insert-column,.sprite-table-insert-row,.sprite-table-insert,.sprite-table-join-column,.sprite-table-join-row,.sprite-table-join,.sprite-table-medium,.sprite-table-money,.sprite-table-paint-can,.sprite-table-resize-actual,.sprite-table-resize,.sprite-table-rotate,.sprite-table-select-all,.sprite-table-select-cells,.sprite-table-select-column,.sprite-table-select-row,.sprite-table-select,.sprite-table-share,.sprite-table-sheet,.sprite-table-small,.sprite-table-split-column,.sprite-table-split-row,.sprite-table-split,.sprite-table-sum,.sprite-tables-relation,.sprite-tables-stacks,.sprite-tables,.sprite-tag--arrow,.sprite-tag--exclamation,.sprite-tag--minus,.sprite-tag--pencil,.sprite-tag--plus,.sprite-tag-cloud,.sprite-tag-export,.sprite-tag-hash,.sprite-tag-import,.sprite-tag-label-black,.sprite-tag-label-gray,.sprite-tag-label-green,.sprite-tag-label-pink,.sprite-tag-label-purple,.sprite-tag-label-red,.sprite-tag-label-yellow,.sprite-tag-label,.sprite-tag-medium,.sprite-tag-share,.sprite-tag-small,.sprite-tag,.sprite-tags-label,.sprite-tags,.sprite-target--arrow,.sprite-target--exclamation,.sprite-target--minus,.sprite-target--pencil,.sprite-target--plus,.sprite-task--arrow,.sprite-task--exclamation,.sprite-task--minus,.sprite-task--pencil,.sprite-task--plus,.sprite-task-select-first,.sprite-task-select-last,.sprite-task-select,.sprite-task,.sprite-telephone--arrow,.sprite-telephone--exclamation,.sprite-telephone--minus,.sprite-telephone--pencil,.sprite-telephone--plus,.sprite-telephone-fax,.sprite-telephone-handset-prohibition,.sprite-telephone-handset-wire,.sprite-telephone-handset,.sprite-telephone-medium,.sprite-telephone-network,.sprite-telephone-off,.sprite-telephone-share,.sprite-telephone,.sprite-television--arrow,.sprite-television--exclamation,.sprite-television--minus,.sprite-television--pencil,.sprite-television--plus,.sprite-television-image,.sprite-television-medium,.sprite-television-off,.sprite-television-protector,.sprite-television-test,.sprite-television,.sprite-terminal--arrow {
     background: url("../themes/images/icons/extra-icon-set-07.png") no-repeat !important;
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-08.css b/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-08.css
index cc856bf45de..6323240117b 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-08.css
+++ b/themes/Backend/ExtJs/backend/_resources/resources/css/extra-icon-set-08.css
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 .sprite-terminal--exclamation,.sprite-terminal--minus,.sprite-terminal--pencil,.sprite-terminal--plus,.sprite-terminal-medium,.sprite-terminal-network,.sprite-terminal-protector,.sprite-terminal,.sprite-thermometer--arrow,.sprite-thermometer--exclamation,.sprite-thermometer--minus,.sprite-thermometer--pencil,.sprite-thermometer--plus,.sprite-thermometer-high,.sprite-thermometer-low,.sprite-thermometer,.sprite-thumb-small-up,.sprite-thumb-small,.sprite-thumb-up,.sprite-thumb,.sprite-tick-button,.sprite-tick-circle-frame,.sprite-tick-octagon-frame,.sprite-tick-octagon,.sprite-tick-red,.sprite-tick-shield,.sprite-tick-small-circle,.sprite-tick-small-red,.sprite-tick-small-white,.sprite-tick-white,.sprite-ticket--arrow,.sprite-ticket--exclamation,.sprite-ticket--minus,.sprite-ticket--plus,.sprite-ticket-small,.sprite-ticket-stub,.sprite-ticket,.sprite-tie-warm,.sprite-tie,.sprite-toggle-expand,.sprite-toggle-small-expand,.sprite-toggle-small,.sprite-toggle,.sprite-toilet-female,.sprite-toilet-male,.sprite-toilet,.sprite-toolbox--arrow,.sprite-toolbox--exclamation,.sprite-toolbox--minus,.sprite-toolbox--pencil,.sprite-toolbox--plus,.sprite-traffic-cone--arrow,.sprite-traffic-cone--exclamation,.sprite-traffic-cone--minus,.sprite-traffic-cone--pencil,.sprite-traffic-cone--plus,.sprite-traffic-cone,.sprite-traffic-light--arrow,.sprite-traffic-light--exclamation,.sprite-traffic-light--minus,.sprite-traffic-light--pencil,.sprite-traffic-light--plus,.sprite-traffic-light-green,.sprite-traffic-light-off,.sprite-traffic-light-red,.sprite-traffic-light-single,.sprite-traffic-light-yellow,.sprite-traffic-light,.sprite-train--arrow,.sprite-train--exclamation,.sprite-train--minus,.sprite-train--pencil,.sprite-train--plus,.sprite-train-metro,.sprite-train,.sprite-transmitter,.sprite-tree--arrow,.sprite-tree--exclamation,.sprite-tree--minus,.sprite-tree--pencil,.sprite-tree--plus,.sprite-tree-red,.sprite-tree-yellow,.sprite-tree,.sprite-trophy--arrow,.sprite-trophy--exclamation,.sprite-trophy--minus,.sprite-trophy--pencil,.sprite-trophy--plus,.sprite-trophy-bronze,.sprite-trophy-silver,.sprite-trophy,.sprite-truck--arrow,.sprite-truck--exclamation,.sprite-truck--minus,.sprite-truck--pencil,.sprite-truck--plus,.sprite-truck-box,.sprite-truck-empty,.sprite-ui-accordion,.sprite-ui-address-bar-green,.sprite-ui-address-bar-lock,.sprite-ui-address-bar-red,.sprite-ui-address-bar-yellow,.sprite-ui-address-bar,.sprite-ui-breadcrumb-bread,.sprite-ui-breadcrumb-select-current,.sprite-ui-breadcrumb-select-parent,.sprite-ui-breadcrumb-select,.sprite-ui-breadcrumb,.sprite-ui-button-default,.sprite-ui-button-image,.sprite-ui-button-navigation-back,.sprite-ui-button-navigation,.sprite-ui-button-toggle,.sprite-ui-button,.sprite-ui-buttons,.sprite-ui-check-box-mix,.sprite-ui-check-box-uncheck,.sprite-ui-check-box,.sprite-ui-check-boxes-list,.sprite-ui-check-boxes-series,.sprite-ui-check-boxes,.sprite-ui-color-picker-default,.sprite-ui-color-picker-switch,.sprite-ui-color-picker-transparent,.sprite-ui-color-picker,.sprite-ui-combo-box-blue,.sprite-ui-combo-box-calendar,.sprite-ui-combo-box-edit,.sprite-ui-combo-box,.sprite-ui-combo-boxes,.sprite-ui-flow,.sprite-ui-group-box,.sprite-ui-label-link,.sprite-ui-label,.sprite-ui-labels,.sprite-ui-layered-pane,.sprite-ui-layout-panel,.sprite-ui-list-box-blue,.sprite-ui-list-box,.sprite-ui-menu-blue,.sprite-ui-menu,.sprite-ui-paginator,.sprite-ui-panel-resize-actual,.sprite-ui-panel-resize,.sprite-ui-panel,.sprite-ui-progress-bar-indeterminate,.sprite-ui-progress-bar,.sprite-ui-radio-button-uncheck,.sprite-ui-radio-button,.sprite-ui-radio-buttons-list,.sprite-ui-radio-buttons,.sprite-ui-ruler,.sprite-ui-scroll-bar-horizontal,.sprite-ui-scroll-bar,.sprite-ui-scroll-pane-block,.sprite-ui-scroll-pane-blog,.sprite-ui-scroll-pane-both,.sprite-ui-scroll-pane-form,.sprite-ui-scroll-pane-icon,.sprite-ui-scroll-pane-image,.sprite-ui-scroll-pane-table,.sprite-ui-scroll-pane-text-image,.sprite-ui-scroll-pane-text,.sprite-ui-scroll-pane-tree,.sprite-ui-scroll-pane,.sprite-ui-search-field,.sprite-ui-seek-bar-050,.sprite-ui-seek-bar-100,.sprite-ui-seek-bar,.sprite-ui-separator-label,.sprite-ui-separator,.sprite-ui-slider-050,.sprite-ui-slider-100,.sprite-ui-slider-vertical-050,.sprite-ui-slider-vertical-100,.sprite-ui-slider-vertical,.sprite-ui-slider,.sprite-ui-spacer,.sprite-ui-spin,.sprite-ui-split-panel-vertical,.sprite-ui-split-panel,.sprite-ui-splitter-horizontal,.sprite-ui-splitter,.sprite-ui-status-bar-blue,.sprite-ui-status-bar,.sprite-ui-tab--arrow,.sprite-ui-tab--exclamation,.sprite-ui-tab--minus,.sprite-ui-tab--pencil,.sprite-ui-tab--plus,.sprite-ui-tab-bottom,.sprite-ui-tab-content-vertical,.sprite-ui-tab-content,.sprite-ui-tab-side,.sprite-ui-tab,.sprite-ui-text-area,.sprite-ui-text-field-clear-button,.sprite-ui-text-field-clear,.sprite-ui-text-field-format,.sprite-ui-text-field-hidden,.sprite-ui-text-field-medium-select,.sprite-ui-text-field-medium,.sprite-ui-text-field-password-green,.sprite-ui-text-field-password-red,.sprite-ui-text-field-password-yellow,.sprite-ui-text-field-password,.sprite-ui-text-field-select,.sprite-ui-text-field-small-select,.sprite-ui-text-field-small,.sprite-ui-text-field-suggestion,.sprite-ui-text-field,.sprite-ui-toolbar--arrow,.sprite-ui-toolbar--exclamation,.sprite-ui-toolbar--minus,.sprite-ui-toolbar--pencil,.sprite-ui-toolbar--plus,.sprite-ui-toolbar-bookmark,.sprite-ui-toolbar,.sprite-ui-tooltip--arrow,.sprite-ui-tooltip--exclamation,.sprite-ui-tooltip--minus,.sprite-ui-tooltip--pencil,.sprite-ui-tooltip--plus,.sprite-ui-tooltip-balloon-bottom,.sprite-ui-tooltip-balloon,.sprite-ui-tooltip,.sprite-umbrella--arrow,.sprite-umbrella--exclamation,.sprite-umbrella--minus,.sprite-umbrella--pencil,.sprite-umbrella--plus,.sprite-umbrella,.sprite-universal,.sprite-upload-cloud,.sprite-upload-linux,.sprite-upload-mac-os,.sprite-upload,.sprite-usb-flash-drive--arrow,.sprite-usb-flash-drive--exclamation,.sprite-usb-flash-drive--minus,.sprite-usb-flash-drive--pencil,.sprite-usb-flash-drive--plus,.sprite-usb-flash-drive-logo,.sprite-usb-flash-drive,.sprite-user--exclamation,.sprite-user--minus,.sprite-user-black-female,.sprite-user-black,.sprite-user-business-boss,.sprite-user-business-gray-boss,.sprite-user-business-gray,.sprite-user-business,.sprite-user-detective-gray,.sprite-user-detective,.sprite-user-female,.sprite-user-gray-female,.sprite-user-gray,.sprite-user-green-female,.sprite-user-green,.sprite-user-medical-female,.sprite-user-medical,.sprite-user-medium-female,.sprite-user-medium-silhouette,.sprite-user-medium,.sprite-user-nude-female,.sprite-user-nude,.sprite-user-red-female,.sprite-user-red,.sprite-user-share,.sprite-user-silhouette-question,.sprite-user-small-female,.sprite-user-small,.sprite-user-thief-baldie,.sprite-user-thief-female,.sprite-user-thief,.sprite-user-white-female,.sprite-user-white,.sprite-user-worker-boss,.sprite-user-worker,.sprite-user-yellow-female,.sprite-user-yellow,.sprite-validation-document,.sprite-validation-invalid-document,.sprite-validation-invalid,.sprite-validation-label-html,.sprite-validation-label,.sprite-validation-valid-document,.sprite-validation-valid,.sprite-validation,.sprite-vase-ear-double,.sprite-vase-ear,.sprite-vase,.sprite-vise-drawer,.sprite-vise,.sprite-wafer-gold,.sprite-wafer,.sprite-wall--arrow,.sprite-wall--exclamation,.sprite-wall--minus,.sprite-wall--pencil,.sprite-wall--plus,.sprite-wall-break,.sprite-wall-brick,.sprite-wall-small-brick,.sprite-wall-small,.sprite-wall,.sprite-wallet--arrow,.sprite-wallet--exclamation,.sprite-wallet--minus,.sprite-wallet--pencil,.sprite-wallet--plus,.sprite-wallet,.sprite-wand--arrow,.sprite-wand--exclamation,.sprite-wand--minus,.sprite-wand--pencil,.sprite-wand--plus,.sprite-wand-hat,.sprite-wand-magic,.sprite-wand-small,.sprite-wand,.sprite-water--arrow,.sprite-water--exclamation,.sprite-water--minus,.sprite-water--pencil,.sprite-water--plus,.sprite-water,.sprite-weather-cloud-small,.sprite-weather-cloud,.sprite-weather-clouds,.sprite-weather-cloudy,.sprite-weather-fog,.sprite-weather-lightning,.sprite-weather-moon-clouds,.sprite-weather-moon-fog,.sprite-weather-moon-half,.sprite-weather-moon,.sprite-weather-rain-little,.sprite-weather-rain,.sprite-weather-snow-little,.sprite-weather-snow,.sprite-weather-tornado,.sprite-weather-wind,.sprite-weather,.sprite-web-slice-balloon,.sprite-web-slice-document,.sprite-web-slice-small,.sprite-web-slice,.sprite-webcam--arrow,.sprite-webcam--exclamation,.sprite-webcam--minus,.sprite-webcam--pencil,.sprite-webcam--plus,.sprite-webcam-medium,.sprite-webcam-network,.sprite-webcam-share,.sprite-webcam,.sprite-weight--arrow,.sprite-weight--exclamation,.sprite-weight--minus,.sprite-weight--pencil,.sprite-weight--plus,.sprite-weight,.sprite-wheel,.sprite-wi-fi-zone,.sprite-wi-fi,.sprite-windows,.sprite-wooden-box--arrow,.sprite-wooden-box--exclamation,.sprite-wooden-box--minus,.sprite-wooden-box--pencil,.sprite-wooden-box--plus,.sprite-wooden-box-label,.sprite-wooden-box,.sprite-wrap-behind,.sprite-wrap-between,.sprite-wrap-edit,.sprite-wrap-front,.sprite-wrap-option,.sprite-wrap-square,.sprite-wrap-through,.sprite-wrap-tight,.sprite-wrap,.sprite-wrench--arrow,.sprite-wrench--exclamation,.sprite-wrench--minus,.sprite-wrench--pencil,.sprite-wrench--plus,.sprite-wrench,.sprite-x-ray,.sprite-xfn-colleague-met,.sprite-xfn-friend-met,.sprite-xfn-friend,.sprite-xfn-sweetheart-met,.sprite-xfn-sweetheart,.sprite-xfn,.sprite-yin-yang,.sprite-zodiac-aries,.sprite-zodiac-cancer,.sprite-zodiac-capricorn,.sprite-zodiac-gemini,.sprite-zodiac-leo,.sprite-zodiac-libra,.sprite-zodiac-pisces,.sprite-zodiac-sagittarius,.sprite-zodiac-scorpio,.sprite-zodiac-taurus,.sprite-zodiac-virgo,.sprite-zodiac,.sprite-zone--arrow,.sprite-zone--exclamation,.sprite-zone--minus,.sprite-zone--pencil,.sprite-zone--plus,.sprite-zone-label,.sprite-zone-medium,.sprite-zone-money,.sprite-zone-resize-actual,.sprite-zone-resize,.sprite-zone-select,.sprite-zone-share,.sprite-zone,.sprite-zones-stack,.sprite-zones {
     background: url("../themes/images/icons/extra-icon-set-08.png") no-repeat !important;
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/sass/ext-all.scss b/themes/Backend/ExtJs/backend/_resources/resources/sass/ext-all.scss
index d51a99823e1..07e1926999d 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/sass/ext-all.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/sass/ext-all.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/images/shopware-ui/beta-feedback-thankyou-de.png b/themes/Backend/ExtJs/backend/_resources/resources/themes/images/shopware-ui/beta-feedback-thankyou-de.png
deleted file mode 100644
index e21ffd2d328..00000000000
Binary files a/themes/Backend/ExtJs/backend/_resources/resources/themes/images/shopware-ui/beta-feedback-thankyou-de.png and /dev/null differ
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/images/shopware-ui/beta-feedback-thankyou-en.png b/themes/Backend/ExtJs/backend/_resources/resources/themes/images/shopware-ui/beta-feedback-thankyou-en.png
deleted file mode 100644
index 32bed51d560..00000000000
Binary files a/themes/Backend/ExtJs/backend/_resources/resources/themes/images/shopware-ui/beta-feedback-thankyou-en.png and /dev/null differ
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/_legacy.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/_legacy.scss
index 9c6443a2f20..19f42fc745c 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/_legacy.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/_legacy.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/_mixins.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/_mixins.scss
index 6897af62356..cf59226726d 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/_mixins.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/_mixins.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/_modules.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/_modules.scss
index 481d6474c95..2497f619e3c 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/_modules.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/_modules.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
@@ -52,7 +51,6 @@
 @import 'modules/performance';
 @import 'modules/attributes';
 @import 'modules/customer';
-@import 'modules/bi';
 @import 'modules/manual_sort';
 
 @import "modules/plugin_manager/tab";
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/_widgets.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/_widgets.scss
index 96554689a13..ad00c9c705d 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/_widgets.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/_widgets.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
@@ -55,5 +54,3 @@
 /** Include global form widgets */
 @import 'widgets/form/all';
 @import 'widgets/attribute/media_multi_selection';
-
-
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_analytics.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_analytics.scss
index 388a00513dc..6236fc71c85 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_analytics.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_analytics.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_article.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_article.scss
index e4bc5a6af66..e8f8d10537b 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_article.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_article.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_banner.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_banner.scss
index 4f53b2f8957..36f57d50711 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_banner.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_banner.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_bi.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_bi.scss
deleted file mode 100644
index d8bf463ea9b..00000000000
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_bi.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-.x-widget-sidebar {
-  background: #213448 !important;
-}
-
-.x-widget-sidebar .x-widget-component .x-panel-header {
-  background: #1D2E40 !important;
-}
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_blog.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_blog.scss
index 8712170e66a..d806f55877d 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_blog.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_blog.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_customerlist.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_customerlist.scss
index 2720a8fcc89..097d4f4620d 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_customerlist.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_customerlist.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_emotions.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_emotions.scss
index 17b3cf06899..3a316416225 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_emotions.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_emotions.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
@@ -1366,4 +1365,4 @@ div[id^=emotion-detail-window] {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_login.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_login.scss
index b0d0a06291b..3a68580289f 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_login.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_login.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_mediamanager.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_mediamanager.scss
index 2f5c6df62a8..1c68d52d86c 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_mediamanager.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_mediamanager.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_orderlist.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_orderlist.scss
index a3f65dbde64..b2a56c90557 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_orderlist.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_orderlist.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_theme.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_theme.scss
index 4a9dbd39f09..398b0e79eb8 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_theme.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_theme.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_widgets.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_widgets.scss
index 52a0e0133d2..6dcab324747 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_widgets.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/modules/_widgets.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_button.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_button.scss
index 29b1f9642d8..fbf2e9082cc 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_button.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_button.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_fieldset.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_fieldset.scss
index c0d7db7486f..11404582c07 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_fieldset.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_fieldset.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_panel.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_panel.scss
index be95164d55a..c0d368aae54 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_panel.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_panel.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_toolbar.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_toolbar.scss
index 2aacda1f725..a3775c0b304 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_toolbar.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_toolbar.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_viewport.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_viewport.scss
index 6cf062b339e..592ef2ab297 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_viewport.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_viewport.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_window.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_window.scss
index 7378f072bbc..86b7f4e50d7 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_window.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/variables/_window.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_accordion.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_accordion.scss
index d92f2b75c43..9346ea497df 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_accordion.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_accordion.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_article-dd.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_article-dd.scss
index 4f5eac4eeba..4ae26d8070c 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_article-dd.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_article-dd.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_boundlist.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_boundlist.scss
index 97e632f24f0..60cfd2c14ff 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_boundlist.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_boundlist.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_button.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_button.scss
index f673ef6e91f..60205c9c37b 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_button.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_button.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
@@ -80,12 +79,11 @@
                 }
             }
         }
+    }
 
-        .icon-feedback {
-            background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABC5JREFUeNqcVWtMHFUU/u7M7s6+hikLZYGlu5TFujSl1iqhxhCraahppAXTRmmiNqnGV2LqAyvqD/GHqW0jaILGRGP6w1htS1tITCGmGmIqGqM8Skla1EB3QQssZYFl9jE7npldtrgFXyf5Zuace853zz333jNMVVUsJw++zWw8BwdvQDnPw80Y7OQ6q8QxElcwkEhguu2gGsYKwjKJ9xxh+SYB26wWPGq1ospihtlkAmgSKAkgFgPkCBaiMr6NRHDs+iy6TjaoE39LvLeF7ZIkvJbjQIXDAdjtgCAQKQ9wDNBcKVvIMhCaBaaDQCSMfjWW/+Y7+8ZP3URce4jxooiXnE405edB0EhtVsBoJAemeRFS82s6lQGULcILQJDIJ64hZmWb3n1j988Ni8Sc9iDSJ12FeKu4GIKzgEhFIjBQdtrSKcNYPPVO6XGahKfyiFmA5l/kgTHC977Y2rnnvUViflBs8hUU4rOiNbBkSWQgwoSarKcOdQmUDDu9GZVJ2wPOCDY2eWmzhbt1xJ1b3mewS3jMkQvJbCNHrc6eIEx8NgLznTgXuB+PeJN6ppwZWYOK1R9jLHwO/cFmWGk/bNkw/hbsfuVu1HdxNjuqBKqnQrWTacc1ks5ADVy27ZCMbl1vH92C1kGmQ5P20UrMxfxwWauxLutZPY6qBYGSG5+/4KTPbZzBDFuClhOhkaiSzGa7qwMRJYjR0Kiu73T3YL9vSvfRJKZw8NhewEzsF0gmL4rFB/RYLTmFu07FxG0cbdDVaDyZrRxNBp7+tQYC70ChdYuuH79yF5p7c9LE0ZiKdVI9rcir6y7rjmTWRC4KJXQYYeHmw/gyLCdJZW2CeBB1JR20pB8xNNkDWZnGw7d8h8Y7VDhMa/XxUOQanNY78eFACU5c3gmPvVqPnyce3+q6KSL+g9W2Iqe0FD8xi35toS45r9rZVZd8I/XSK53yTQ/RIwuu0IHK/j674GjSL8iB06t2MPvMKaq1mbEUQUYLSdtxY5K0kG5mkPet//piWf7WH8jSkL7Szd21T/ujZ4/MxWHD4m3LCE6nx27YtPAcozhXX3by8sbC6mGyvk648pdecXbwaN3wzFeHB6Y7vfp1z8w4k1xFojJvb6DW1+QvEEuHyHKUMLRsd5ucC7ivhi4+9f3Y5/Xd/k/cKgdOczHxUHiGBPUA1SGULGzIrZna6nl8omiVb45nhjYKPUGYWLFtLvaQjy40bu7yH2qPcijIMiDyXEXHpXx76XS2pWDBZpKoBWGM0EM4T/j9psprxMth46vw3Ps+grs+hfzN8PE+sn1BKCfkEYSV4hZhWOkPQB1tE51N6ZkNLb33eB8KkOkwYQD/Vpabzb0fYtlBfPByW20j6ecJ9/1ThplY1uh6Atm7W25fT9/PE6r+K6mGlTZP7/8EaoYYx/+QPwUYAHt2U21iFEUAAAAAAElFTkSuQmCC") no-repeat;
-            width: 22px !important;
-        }
-
+    .icon-feedback {
+        background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABC5JREFUeNqcVWtMHFUU/u7M7s6+hikLZYGlu5TFujSl1iqhxhCraahppAXTRmmiNqnGV2LqAyvqD/GHqW0jaILGRGP6w1htS1tITCGmGmIqGqM8Skla1EB3QQssZYFl9jE7npldtrgFXyf5Zuace853zz333jNMVVUsJw++zWw8BwdvQDnPw80Y7OQ6q8QxElcwkEhguu2gGsYKwjKJ9xxh+SYB26wWPGq1ospihtlkAmgSKAkgFgPkCBaiMr6NRHDs+iy6TjaoE39LvLeF7ZIkvJbjQIXDAdjtgCAQKQ9wDNBcKVvIMhCaBaaDQCSMfjWW/+Y7+8ZP3URce4jxooiXnE405edB0EhtVsBoJAemeRFS82s6lQGULcILQJDIJ64hZmWb3n1j988Ni8Sc9iDSJ12FeKu4GIKzgEhFIjBQdtrSKcNYPPVO6XGahKfyiFmA5l/kgTHC977Y2rnnvUViflBs8hUU4rOiNbBkSWQgwoSarKcOdQmUDDu9GZVJ2wPOCDY2eWmzhbt1xJ1b3mewS3jMkQvJbCNHrc6eIEx8NgLznTgXuB+PeJN6ppwZWYOK1R9jLHwO/cFmWGk/bNkw/hbsfuVu1HdxNjuqBKqnQrWTacc1ks5ADVy27ZCMbl1vH92C1kGmQ5P20UrMxfxwWauxLutZPY6qBYGSG5+/4KTPbZzBDFuClhOhkaiSzGa7qwMRJYjR0Kiu73T3YL9vSvfRJKZw8NhewEzsF0gmL4rFB/RYLTmFu07FxG0cbdDVaDyZrRxNBp7+tQYC70ChdYuuH79yF5p7c9LE0ZiKdVI9rcir6y7rjmTWRC4KJXQYYeHmw/gyLCdJZW2CeBB1JR20pB8xNNkDWZnGw7d8h8Y7VDhMa/XxUOQanNY78eFACU5c3gmPvVqPnyce3+q6KSL+g9W2Iqe0FD8xi35toS45r9rZVZd8I/XSK53yTQ/RIwuu0IHK/j674GjSL8iB06t2MPvMKaq1mbEUQUYLSdtxY5K0kG5mkPet//piWf7WH8jSkL7Szd21T/ujZ4/MxWHD4m3LCE6nx27YtPAcozhXX3by8sbC6mGyvk648pdecXbwaN3wzFeHB6Y7vfp1z8w4k1xFojJvb6DW1+QvEEuHyHKUMLRsd5ucC7ivhi4+9f3Y5/Xd/k/cKgdOczHxUHiGBPUA1SGULGzIrZna6nl8omiVb45nhjYKPUGYWLFtLvaQjy40bu7yH2qPcijIMiDyXEXHpXx76XS2pWDBZpKoBWGM0EM4T/j9psprxMth46vw3Ps+grs+hfzN8PE+sn1BKCfkEYSV4hZhWOkPQB1tE51N6ZkNLb33eB8KkOkwYQD/Vpabzb0fYtlBfPByW20j6ecJ9/1ThplY1uh6Atm7W25fT9/PE6r+K6mGlTZP7/8EaoYYx/+QPwUYAHt2U21iFEUAAAAAAElFTkSuQmCC") no-repeat;
+        width: 22px !important;
     }
 
     // Active button state
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_datepicker.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_datepicker.scss
index 0f48880c1e4..afafba6b5a7 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_datepicker.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_datepicker.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_desktopswitcher.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_desktopswitcher.scss
index 76fe798829d..44d110a2379 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_desktopswitcher.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_desktopswitcher.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_grid.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_grid.scss
index 7333dc11629..13beebd5938 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_grid.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_grid.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_headertooltip.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_headertooltip.scss
index 5c9594fd14a..704e47abcbe 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_headertooltip.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_headertooltip.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_keynav.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_keynav.scss
index 5fdf3650de2..f78fd4bfee1 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_keynav.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_keynav.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_loadmask.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_loadmask.scss
index 0c555d7c461..a1bab7033ec 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_loadmask.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_loadmask.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_login.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_login.scss
index 6d76cac2d42..3de58abd6ca 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_login.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_login.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_mediadropzone.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_mediadropzone.scss
index d93520823b8..85d0ab064af 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_mediadropzone.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_mediadropzone.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_menu.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_menu.scss
index 13640786b52..b4758a1daee 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_menu.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_menu.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_notification.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_notification.scss
index 9aac0fe56d1..5634f4ee643 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_notification.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_notification.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_panel.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_panel.scss
index 93d5c08147f..d05b280cfa9 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_panel.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_panel.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_progressbar.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_progressbar.scss
index 2b722057d2a..ff9c2f69822 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_progressbar.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_progressbar.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_rowediting.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_rowediting.scss
index e4b1d081604..4c89ed65f62 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_rowediting.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_rowediting.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_tab.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_tab.scss
index 96017e02bb3..a3f5ded5962 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_tab.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_tab.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_toolbar.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_toolbar.scss
index b2aa495c4ad..85895fde244 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_toolbar.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_toolbar.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_tooltip.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_tooltip.scss
index db934fa3a96..779a97278f2 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_tooltip.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_tooltip.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_tree.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_tree.scss
index 039efb1a994..ad2656ba393 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_tree.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_tree.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_viewport.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_viewport.scss
index 7ae8f506301..84d55f76d33 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_viewport.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_viewport.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_widgets.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_widgets.scss
index 7a005f0f98d..58aa41df71b 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_widgets.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_widgets.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_window.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_window.scss
index 5f2f8df6cf5..b8ec4b9e6cd 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_window.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/_window.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/_all.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/_all.scss
index c76317db241..70d73c51bdc 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/_all.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/_all.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/_fieldset.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/_fieldset.scss
index b2133ff8a12..5a55b88c8b5 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/_fieldset.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/_fieldset.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
@@ -69,4 +68,3 @@
 .#{$prefix}fieldset-collapsed .#{$prefix}fieldset-header .#{$prefix}tool {
     border-color: #dfe3e6
 }
-
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/_panel.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/_panel.scss
index f3ea882c135..e9c8374024b 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/_panel.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/_panel.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_all.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_all.scss
index 730ae103703..e0d48d8e7eb 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_all.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_all.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_boxselect.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_boxselect.scss
index 11727be6588..e2b28558bc2 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_boxselect.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_boxselect.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_checkbox.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_checkbox.scss
index b965bc22879..ed3f64a13b7 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_checkbox.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_checkbox.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_combobox.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_combobox.scss
index eaaa2b1000d..c3bc0a3a4b8 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_combobox.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_combobox.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_datefield.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_datefield.scss
index f40c9311af4..45c408af3fc 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_datefield.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_datefield.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_filefield.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_filefield.scss
index b1350a4467c..dea812d4884 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_filefield.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_filefield.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_itemselector.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_itemselector.scss
index 193d080d917..c904f17e3a9 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_itemselector.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_itemselector.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_livearticlesearch.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_livearticlesearch.scss
index 505c7e8cf0a..26e82a242ae 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_livearticlesearch.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_livearticlesearch.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_mediaselection.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_mediaselection.scss
index cb39232a44d..32c92285683 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_mediaselection.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_mediaselection.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_numberfield.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_numberfield.scss
index 20899a930bb..968d7eb4eac 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_numberfield.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_numberfield.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_passwordstrength.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_passwordstrength.scss
index a18fec52578..e63a3c64245 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_passwordstrength.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_passwordstrength.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_radiobox.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_radiobox.scss
index 9a9a125e28b..b2c55e6c33d 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_radiobox.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_radiobox.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_slider.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_slider.scss
index 4d7bd48c2f6..104edd678e1 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_slider.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_slider.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_textfield.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_textfield.scss
index 27d14491eb9..12db6c7b773 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_textfield.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_textfield.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_timefield.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_timefield.scss
index af0adb142f8..424a4700d7c 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_timefield.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_timefield.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_tinymce.scss b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_tinymce.scss
index a7cedd7e86b..c3bb132fb6a 100644
--- a/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_tinymce.scss
+++ b/themes/Backend/ExtJs/backend/_resources/resources/themes/stylesheets/shopware-ui/widgets/form/field/_tinymce.scss
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Styling
diff --git a/themes/Backend/ExtJs/backend/analytics/app.js b/themes/Backend/ExtJs/backend/analytics/app.js
index c5ab8a7ce15..ba46fbc6fd9 100644
--- a/themes/Backend/ExtJs/backend/analytics/app.js
+++ b/themes/Backend/ExtJs/backend/analytics/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/controller/main.js b/themes/Backend/ExtJs/backend/analytics/controller/main.js
index 7275fe5cf33..870b2cc3da2 100644
--- a/themes/Backend/ExtJs/backend/analytics/controller/main.js
+++ b/themes/Backend/ExtJs/backend/analytics/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/controller/referrer_visitors.js b/themes/Backend/ExtJs/backend/analytics/controller/referrer_visitors.js
index 2d004139599..2056279dd37 100644
--- a/themes/Backend/ExtJs/backend/analytics/controller/referrer_visitors.js
+++ b/themes/Backend/ExtJs/backend/analytics/controller/referrer_visitors.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/model/navigation.js b/themes/Backend/ExtJs/backend/analytics/model/navigation.js
index bd7993bab27..97c8f0b1052 100644
--- a/themes/Backend/ExtJs/backend/analytics/model/navigation.js
+++ b/themes/Backend/ExtJs/backend/analytics/model/navigation.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/store/data.js b/themes/Backend/ExtJs/backend/analytics/store/data.js
index a1f3c172bd4..c3d18e10246 100644
--- a/themes/Backend/ExtJs/backend/analytics/store/data.js
+++ b/themes/Backend/ExtJs/backend/analytics/store/data.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation.js b/themes/Backend/ExtJs/backend/analytics/store/navigation.js
index 7d1310ace9f..a59e2393b7a 100644
--- a/themes/Backend/ExtJs/backend/analytics/store/navigation.js
+++ b/themes/Backend/ExtJs/backend/analytics/store/navigation.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/article_impressions.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/article_impressions.js
index 41d60323411..5a2f1b76177 100644
--- a/themes/Backend/ExtJs/backend/analytics/store/navigation/article_impressions.js
+++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/article_impressions.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/article_sales.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/article_sales.js
index d0f2efe746d..c0934165437 100644
--- a/themes/Backend/ExtJs/backend/analytics/store/navigation/article_sales.js
+++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/article_sales.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/calendar_weeks.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/calendar_weeks.js
index 0fd60147929..4a58b90af20 100644
--- a/themes/Backend/ExtJs/backend/analytics/store/navigation/calendar_weeks.js
+++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/calendar_weeks.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/categories.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/categories.js
index c499459bed8..8ffc1a47b31 100644
--- a/themes/Backend/ExtJs/backend/analytics/store/navigation/categories.js
+++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/categories.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/countries.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/countries.js
index 514c005efb6..24b8c900c09 100644
--- a/themes/Backend/ExtJs/backend/analytics/store/navigation/countries.js
+++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/countries.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/customer_age.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/customer_age.js
index f928aca5799..7ef58584b1d 100644
--- a/themes/Backend/ExtJs/backend/analytics/store/navigation/customer_age.js
+++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/customer_age.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/customer_groups.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/customer_groups.js
index 7fb7cf333f2..c1d50e069c0 100644
--- a/themes/Backend/ExtJs/backend/analytics/store/navigation/customer_groups.js
+++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/customer_groups.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/customers.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/customers.js
index e0d058722fc..20a6b4d660b 100644
--- a/themes/Backend/ExtJs/backend/analytics/store/navigation/customers.js
+++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/customers.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/device_types.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/device_types.js
index 7964ef34b49..a0c5080fd55 100644
--- a/themes/Backend/ExtJs/backend/analytics/store/navigation/device_types.js
+++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/device_types.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/month.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/month.js
index ec57f86759d..6045a964e94 100644
--- a/themes/Backend/ExtJs/backend/analytics/store/navigation/month.js
+++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/month.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/overview.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/overview.js
index 207b75effd2..cec3132ed95 100644
--- a/themes/Backend/ExtJs/backend/analytics/store/navigation/overview.js
+++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/overview.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/partner_revenue.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/partner_revenue.js
index 5f5a09c1ea3..6355c3f6181 100644
--- a/themes/Backend/ExtJs/backend/analytics/store/navigation/partner_revenue.js
+++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/partner_revenue.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/payment.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/payment.js
index 674ac7b5624..32e0a09ce3d 100644
--- a/themes/Backend/ExtJs/backend/analytics/store/navigation/payment.js
+++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/payment.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/rating.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/rating.js
index dce3ad414f3..45c60099c76 100644
--- a/themes/Backend/ExtJs/backend/analytics/store/navigation/rating.js
+++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/rating.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/referrer_revenue.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/referrer_revenue.js
index 67f640af12d..aebac27214d 100644
--- a/themes/Backend/ExtJs/backend/analytics/store/navigation/referrer_revenue.js
+++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/referrer_revenue.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/referrer_visitors.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/referrer_visitors.js
index 4a71e80184a..7272ad53db3 100644
--- a/themes/Backend/ExtJs/backend/analytics/store/navigation/referrer_visitors.js
+++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/referrer_visitors.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/search.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/search.js
index fd563c3f90b..3aaabe2ebac 100644
--- a/themes/Backend/ExtJs/backend/analytics/store/navigation/search.js
+++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/search.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/search_terms.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/search_terms.js
index ec7fd773854..9f6ae92957d 100644
--- a/themes/Backend/ExtJs/backend/analytics/store/navigation/search_terms.js
+++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/search_terms.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/search_urls.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/search_urls.js
index 9ddfa5c7dca..f581aea479a 100644
--- a/themes/Backend/ExtJs/backend/analytics/store/navigation/search_urls.js
+++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/search_urls.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/shipping_methods.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/shipping_methods.js
index 0fa77b68469..d69b6545f17 100644
--- a/themes/Backend/ExtJs/backend/analytics/store/navigation/shipping_methods.js
+++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/shipping_methods.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/time.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/time.js
index 614df64ad6b..dfe27277fff 100644
--- a/themes/Backend/ExtJs/backend/analytics/store/navigation/time.js
+++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/time.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/vendors.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/vendors.js
index f3d6238c3f3..144bb142c31 100644
--- a/themes/Backend/ExtJs/backend/analytics/store/navigation/vendors.js
+++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/vendors.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/visitors.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/visitors.js
index 5939f92e9de..8c6434d55e3 100644
--- a/themes/Backend/ExtJs/backend/analytics/store/navigation/visitors.js
+++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/visitors.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/store/navigation/weekdays.js b/themes/Backend/ExtJs/backend/analytics/store/navigation/weekdays.js
index cd25232ac47..cf746f47cdf 100644
--- a/themes/Backend/ExtJs/backend/analytics/store/navigation/weekdays.js
+++ b/themes/Backend/ExtJs/backend/analytics/store/navigation/weekdays.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/store/shop.js b/themes/Backend/ExtJs/backend/analytics/store/shop.js
index 4925d8fcb01..2f8935eff7c 100644
--- a/themes/Backend/ExtJs/backend/analytics/store/shop.js
+++ b/themes/Backend/ExtJs/backend/analytics/store/shop.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/chart/category.js b/themes/Backend/ExtJs/backend/analytics/view/chart/category.js
index be0d4a51601..e6d71c1c24f 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/chart/category.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/chart/category.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/chart/country.js b/themes/Backend/ExtJs/backend/analytics/view/chart/country.js
index 168bfbaed59..42ac4bef59c 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/chart/country.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/chart/country.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/chart/customer_age.js b/themes/Backend/ExtJs/backend/analytics/view/chart/customer_age.js
index 8fa4bc92f14..a69326eb3da 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/chart/customer_age.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/chart/customer_age.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/chart/customer_group.js b/themes/Backend/ExtJs/backend/analytics/view/chart/customer_group.js
index 6f8d918319c..b19a4587d33 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/chart/customer_group.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/chart/customer_group.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/chart/customers.js b/themes/Backend/ExtJs/backend/analytics/view/chart/customers.js
index 835f9ead585..cf45e1063eb 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/chart/customers.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/chart/customers.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/chart/daytime.js b/themes/Backend/ExtJs/backend/analytics/view/chart/daytime.js
index 37a73d6e39f..8fc45550dbc 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/chart/daytime.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/chart/daytime.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/chart/device_types.js b/themes/Backend/ExtJs/backend/analytics/view/chart/device_types.js
index a369a57306c..5c4d4fe28eb 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/chart/device_types.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/chart/device_types.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/chart/dispatch.js b/themes/Backend/ExtJs/backend/analytics/view/chart/dispatch.js
index d110ccf3726..323fcddf991 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/chart/dispatch.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/chart/dispatch.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/chart/month.js b/themes/Backend/ExtJs/backend/analytics/view/chart/month.js
index 9cb7b5688c9..3341bd8a447 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/chart/month.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/chart/month.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/chart/partner_revenue.js b/themes/Backend/ExtJs/backend/analytics/view/chart/partner_revenue.js
index 1b89354f3db..301f469e99a 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/chart/partner_revenue.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/chart/partner_revenue.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/chart/payment.js b/themes/Backend/ExtJs/backend/analytics/view/chart/payment.js
index baf97585c99..b3adf0bd4f6 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/chart/payment.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/chart/payment.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/chart/supplier.js b/themes/Backend/ExtJs/backend/analytics/view/chart/supplier.js
index 3cb34866098..700005993eb 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/chart/supplier.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/chart/supplier.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/chart/visitors.js b/themes/Backend/ExtJs/backend/analytics/view/chart/visitors.js
index 11e1862e717..6aeb691b082 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/chart/visitors.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/chart/visitors.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/chart/week.js b/themes/Backend/ExtJs/backend/analytics/view/chart/week.js
index 7fca1031f98..3e80bc3349b 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/chart/week.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/chart/week.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/chart/weekday.js b/themes/Backend/ExtJs/backend/analytics/view/chart/weekday.js
index 214216b6d3a..3f1ffe7e2fc 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/chart/weekday.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/chart/weekday.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/main/chart.js b/themes/Backend/ExtJs/backend/analytics/view/main/chart.js
index 8ba5b6fa3b6..3294a4923e9 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/main/chart.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/main/chart.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/main/navigation.js b/themes/Backend/ExtJs/backend/analytics/view/main/navigation.js
index d00d3bb7a9c..16a4fe4486a 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/main/navigation.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/main/navigation.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/main/panel.js b/themes/Backend/ExtJs/backend/analytics/view/main/panel.js
index 0f60d101460..6886744eba4 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/main/panel.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/main/panel.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/main/table.js b/themes/Backend/ExtJs/backend/analytics/view/main/table.js
index d671e63831c..b1ace0c25d5 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/main/table.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/main/table.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/main/toolbar.js b/themes/Backend/ExtJs/backend/analytics/view/main/toolbar.js
index caddba1b6bf..27dae33489c 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/main/toolbar.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/main/toolbar.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/main/window.js b/themes/Backend/ExtJs/backend/analytics/view/main/window.js
index c0435e3155a..2d43047e960 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/main/window.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/main/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/article_impression.js b/themes/Backend/ExtJs/backend/analytics/view/table/article_impression.js
index 2067d7f8115..43d4bf69b2c 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/table/article_impression.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/table/article_impression.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/article_sales.js b/themes/Backend/ExtJs/backend/analytics/view/table/article_sales.js
index c23786fae84..03b9965f7ba 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/table/article_sales.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/table/article_sales.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/category.js b/themes/Backend/ExtJs/backend/analytics/view/table/category.js
index ff7d63e9748..4d7aeab20c9 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/table/category.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/table/category.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/country.js b/themes/Backend/ExtJs/backend/analytics/view/table/country.js
index 3d0966bd269..c6d144d0030 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/table/country.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/table/country.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/customer_age.js b/themes/Backend/ExtJs/backend/analytics/view/table/customer_age.js
index 769f8ba7c94..1bb3690200e 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/table/customer_age.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/table/customer_age.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/customer_group.js b/themes/Backend/ExtJs/backend/analytics/view/table/customer_group.js
index f34ff0198da..a311d0d8cda 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/table/customer_group.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/table/customer_group.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/customers.js b/themes/Backend/ExtJs/backend/analytics/view/table/customers.js
index 8a51b86d9d9..145ca2946e8 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/table/customers.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/table/customers.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/daytime.js b/themes/Backend/ExtJs/backend/analytics/view/table/daytime.js
index e6cc560b3ae..098f4f487c9 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/table/daytime.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/table/daytime.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/device_types.js b/themes/Backend/ExtJs/backend/analytics/view/table/device_types.js
index b10b50eaf85..dbb1b63cb27 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/table/device_types.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/table/device_types.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/dispatch.js b/themes/Backend/ExtJs/backend/analytics/view/table/dispatch.js
index 96c7b485bb9..798a84c7222 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/table/dispatch.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/table/dispatch.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/month.js b/themes/Backend/ExtJs/backend/analytics/view/table/month.js
index a05130d0175..9dfcafdd85d 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/table/month.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/table/month.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/overview.js b/themes/Backend/ExtJs/backend/analytics/view/table/overview.js
index fb6c8e798be..450bc5fd8cc 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/table/overview.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/table/overview.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/partner_revenue.js b/themes/Backend/ExtJs/backend/analytics/view/table/partner_revenue.js
index 42b32830500..0cab5aafefc 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/table/partner_revenue.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/table/partner_revenue.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
@@ -30,7 +29,7 @@
  *
  */
 //{namespace name="backend/analytics/view/main"}
-//{block name="backend/analytics/view/table/referrer_revenue"}
+//{block name="backend/analytics/view/table/partner_revenue"}
 Ext.define('Shopware.apps.Analytics.view.table.PartnerRevenue', {
     extend: 'Shopware.apps.Analytics.view.main.Table',
     alias: 'widget.analytics-table-partner_revenue',
diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/payment.js b/themes/Backend/ExtJs/backend/analytics/view/table/payment.js
index 9ac6833282a..7ccdcfeb17e 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/table/payment.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/table/payment.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/rating.js b/themes/Backend/ExtJs/backend/analytics/view/table/rating.js
index 4eab8050e5b..790a991ed8b 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/table/rating.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/table/rating.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/referrer_revenue.js b/themes/Backend/ExtJs/backend/analytics/view/table/referrer_revenue.js
index cfcf836bd15..7c9e546a2d5 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/table/referrer_revenue.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/table/referrer_revenue.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/referrer_visitors.js b/themes/Backend/ExtJs/backend/analytics/view/table/referrer_visitors.js
index 5a4390bf971..1f417face7b 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/table/referrer_visitors.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/table/referrer_visitors.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/search.js b/themes/Backend/ExtJs/backend/analytics/view/table/search.js
index b560c0ae60e..e8c0420d749 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/table/search.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/table/search.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/search_terms.js b/themes/Backend/ExtJs/backend/analytics/view/table/search_terms.js
index 0d9d750222c..9e5afa8758e 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/table/search_terms.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/table/search_terms.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/search_urls.js b/themes/Backend/ExtJs/backend/analytics/view/table/search_urls.js
index e627867c3ad..5f00e39ad39 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/table/search_urls.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/table/search_urls.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/supplier.js b/themes/Backend/ExtJs/backend/analytics/view/table/supplier.js
index 18a3e3df2b9..a2e328a043a 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/table/supplier.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/table/supplier.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/visitors.js b/themes/Backend/ExtJs/backend/analytics/view/table/visitors.js
index ada8c41e19c..c8150b20c40 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/table/visitors.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/table/visitors.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/week.js b/themes/Backend/ExtJs/backend/analytics/view/table/week.js
index 6ebfa9dcb51..4609a57cf1f 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/table/week.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/table/week.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/analytics/view/table/weekday.js b/themes/Backend/ExtJs/backend/analytics/view/table/weekday.js
index a66534708e6..de5c3083257 100644
--- a/themes/Backend/ExtJs/backend/analytics/view/table/weekday.js
+++ b/themes/Backend/ExtJs/backend/analytics/view/table/weekday.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/app/growl.js b/themes/Backend/ExtJs/backend/app/growl.js
index 5d3de4ce598..1fea5bacaed 100644
--- a/themes/Backend/ExtJs/backend/app/growl.js
+++ b/themes/Backend/ExtJs/backend/app/growl.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    App
diff --git a/themes/Backend/ExtJs/backend/article/app.js b/themes/Backend/ExtJs/backend/article/app.js
index 18e8b655791..27c7bea4891 100644
--- a/themes/Backend/ExtJs/backend/article/app.js
+++ b/themes/Backend/ExtJs/backend/article/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/controller/category.js b/themes/Backend/ExtJs/backend/article/controller/category.js
index 5c190b8336a..e756c21ff40 100644
--- a/themes/Backend/ExtJs/backend/article/controller/category.js
+++ b/themes/Backend/ExtJs/backend/article/controller/category.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/controller/crossselling.js b/themes/Backend/ExtJs/backend/article/controller/crossselling.js
index 6bf90c6391a..ce9d7d1b736 100644
--- a/themes/Backend/ExtJs/backend/article/controller/crossselling.js
+++ b/themes/Backend/ExtJs/backend/article/controller/crossselling.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/controller/detail.js b/themes/Backend/ExtJs/backend/article/controller/detail.js
index 8fc9c925b63..36d63baa506 100644
--- a/themes/Backend/ExtJs/backend/article/controller/detail.js
+++ b/themes/Backend/ExtJs/backend/article/controller/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/controller/esd.js b/themes/Backend/ExtJs/backend/article/controller/esd.js
index 8edd9901546..a2366994948 100644
--- a/themes/Backend/ExtJs/backend/article/controller/esd.js
+++ b/themes/Backend/ExtJs/backend/article/controller/esd.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/controller/main.js b/themes/Backend/ExtJs/backend/article/controller/main.js
index b6353e11a2a..94f88610b8e 100644
--- a/themes/Backend/ExtJs/backend/article/controller/main.js
+++ b/themes/Backend/ExtJs/backend/article/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/controller/media.js b/themes/Backend/ExtJs/backend/article/controller/media.js
index fc3b262387c..cb93f760bc9 100644
--- a/themes/Backend/ExtJs/backend/article/controller/media.js
+++ b/themes/Backend/ExtJs/backend/article/controller/media.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/controller/price_variation.js b/themes/Backend/ExtJs/backend/article/controller/price_variation.js
index 59e0460e8cd..8a3e9a88d6b 100644
--- a/themes/Backend/ExtJs/backend/article/controller/price_variation.js
+++ b/themes/Backend/ExtJs/backend/article/controller/price_variation.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/controller/statistic.js b/themes/Backend/ExtJs/backend/article/controller/statistic.js
index 630ff7bf103..2db5dc1c3b5 100644
--- a/themes/Backend/ExtJs/backend/article/controller/statistic.js
+++ b/themes/Backend/ExtJs/backend/article/controller/statistic.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/controller/variant.js b/themes/Backend/ExtJs/backend/article/controller/variant.js
index 84eb06245ac..621a8f7d14c 100644
--- a/themes/Backend/ExtJs/backend/article/controller/variant.js
+++ b/themes/Backend/ExtJs/backend/article/controller/variant.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/model/accessory.js b/themes/Backend/ExtJs/backend/article/model/accessory.js
index ba126f511f5..e84ca79a2ef 100644
--- a/themes/Backend/ExtJs/backend/article/model/accessory.js
+++ b/themes/Backend/ExtJs/backend/article/model/accessory.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/model/article.js b/themes/Backend/ExtJs/backend/article/model/article.js
index 8c7eb26b04b..105a9b24a35 100644
--- a/themes/Backend/ExtJs/backend/article/model/article.js
+++ b/themes/Backend/ExtJs/backend/article/model/article.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/model/batch.js b/themes/Backend/ExtJs/backend/article/model/batch.js
index 0e0cf4b60ae..a9519d2dbe4 100644
--- a/themes/Backend/ExtJs/backend/article/model/batch.js
+++ b/themes/Backend/ExtJs/backend/article/model/batch.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/model/category.js b/themes/Backend/ExtJs/backend/article/model/category.js
index bee330a2e0d..fcc1a30f5af 100644
--- a/themes/Backend/ExtJs/backend/article/model/category.js
+++ b/themes/Backend/ExtJs/backend/article/model/category.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/model/configurator.js b/themes/Backend/ExtJs/backend/article/model/configurator.js
index 3a65540b4eb..57b9e4bfae6 100644
--- a/themes/Backend/ExtJs/backend/article/model/configurator.js
+++ b/themes/Backend/ExtJs/backend/article/model/configurator.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/model/configurator_group.js b/themes/Backend/ExtJs/backend/article/model/configurator_group.js
index 67439efcf0c..e69917afc81 100644
--- a/themes/Backend/ExtJs/backend/article/model/configurator_group.js
+++ b/themes/Backend/ExtJs/backend/article/model/configurator_group.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/model/configurator_option.js b/themes/Backend/ExtJs/backend/article/model/configurator_option.js
index 3e167319883..19b44df1f77 100644
--- a/themes/Backend/ExtJs/backend/article/model/configurator_option.js
+++ b/themes/Backend/ExtJs/backend/article/model/configurator_option.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/model/configurator_set.js b/themes/Backend/ExtJs/backend/article/model/configurator_set.js
index 038775a096e..d25916cc11f 100644
--- a/themes/Backend/ExtJs/backend/article/model/configurator_set.js
+++ b/themes/Backend/ExtJs/backend/article/model/configurator_set.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/model/configurator_template.js b/themes/Backend/ExtJs/backend/article/model/configurator_template.js
index 2b7c4c2727e..84d5c927889 100644
--- a/themes/Backend/ExtJs/backend/article/model/configurator_template.js
+++ b/themes/Backend/ExtJs/backend/article/model/configurator_template.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/model/dependency.js b/themes/Backend/ExtJs/backend/article/model/dependency.js
index a39bf49f38a..9bab708b2d3 100644
--- a/themes/Backend/ExtJs/backend/article/model/dependency.js
+++ b/themes/Backend/ExtJs/backend/article/model/dependency.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/model/detail.js b/themes/Backend/ExtJs/backend/article/model/detail.js
index bc7c06d2b79..245eb99b702 100644
--- a/themes/Backend/ExtJs/backend/article/model/detail.js
+++ b/themes/Backend/ExtJs/backend/article/model/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/model/download.js b/themes/Backend/ExtJs/backend/article/model/download.js
index d8bbd2b5ba3..ec781e403df 100644
--- a/themes/Backend/ExtJs/backend/article/model/download.js
+++ b/themes/Backend/ExtJs/backend/article/model/download.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * Shopware Model - Article backend module.
  *
diff --git a/themes/Backend/ExtJs/backend/article/model/download_attribute.js b/themes/Backend/ExtJs/backend/article/model/download_attribute.js
index 08ba7ff84b0..f7dce983844 100644
--- a/themes/Backend/ExtJs/backend/article/model/download_attribute.js
+++ b/themes/Backend/ExtJs/backend/article/model/download_attribute.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/model/esd.js b/themes/Backend/ExtJs/backend/article/model/esd.js
index 21a170d50d9..1890a42c859 100644
--- a/themes/Backend/ExtJs/backend/article/model/esd.js
+++ b/themes/Backend/ExtJs/backend/article/model/esd.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/model/esd_attribute.js b/themes/Backend/ExtJs/backend/article/model/esd_attribute.js
index 8eb95c217e0..dc2169073d6 100644
--- a/themes/Backend/ExtJs/backend/article/model/esd_attribute.js
+++ b/themes/Backend/ExtJs/backend/article/model/esd_attribute.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/model/esd_file.js b/themes/Backend/ExtJs/backend/article/model/esd_file.js
index d0931577686..8e1a793fc25 100644
--- a/themes/Backend/ExtJs/backend/article/model/esd_file.js
+++ b/themes/Backend/ExtJs/backend/article/model/esd_file.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/model/field.js b/themes/Backend/ExtJs/backend/article/model/field.js
index bc63a49a1cc..9bb7ada29c3 100644
--- a/themes/Backend/ExtJs/backend/article/model/field.js
+++ b/themes/Backend/ExtJs/backend/article/model/field.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/model/link.js b/themes/Backend/ExtJs/backend/article/model/link.js
index 0f8a1db29c0..7d4134b693d 100644
--- a/themes/Backend/ExtJs/backend/article/model/link.js
+++ b/themes/Backend/ExtJs/backend/article/model/link.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @link http://www.shopware.de/
  * @license http://www.shopware.de/license
diff --git a/themes/Backend/ExtJs/backend/article/model/link_attribute.js b/themes/Backend/ExtJs/backend/article/model/link_attribute.js
index c32ad7cba96..d153555e42b 100644
--- a/themes/Backend/ExtJs/backend/article/model/link_attribute.js
+++ b/themes/Backend/ExtJs/backend/article/model/link_attribute.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/model/mapping.js b/themes/Backend/ExtJs/backend/article/model/mapping.js
index da70ebbdd3f..3fb83ebd347 100644
--- a/themes/Backend/ExtJs/backend/article/model/mapping.js
+++ b/themes/Backend/ExtJs/backend/article/model/mapping.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @link http://www.shopware.de/
  * @license http://www.shopware.de/license
diff --git a/themes/Backend/ExtJs/backend/article/model/media.js b/themes/Backend/ExtJs/backend/article/model/media.js
index 6574689c1c5..983c2c13675 100644
--- a/themes/Backend/ExtJs/backend/article/model/media.js
+++ b/themes/Backend/ExtJs/backend/article/model/media.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @license http://www.shopware.de/license
  * @package Article
diff --git a/themes/Backend/ExtJs/backend/article/model/media_attribute.js b/themes/Backend/ExtJs/backend/article/model/media_attribute.js
index 3882a7d22fa..b1a3a8337dc 100644
--- a/themes/Backend/ExtJs/backend/article/model/media_attribute.js
+++ b/themes/Backend/ExtJs/backend/article/model/media_attribute.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/model/media_mapping.js b/themes/Backend/ExtJs/backend/article/model/media_mapping.js
index 06da0418961..fd4d99d5f63 100644
--- a/themes/Backend/ExtJs/backend/article/model/media_mapping.js
+++ b/themes/Backend/ExtJs/backend/article/model/media_mapping.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @link http://www.shopware.de/
  * @license http://www.shopware.de/license
diff --git a/themes/Backend/ExtJs/backend/article/model/media_mapping_rule.js b/themes/Backend/ExtJs/backend/article/model/media_mapping_rule.js
index da16f743637..5aafe4f631a 100644
--- a/themes/Backend/ExtJs/backend/article/model/media_mapping_rule.js
+++ b/themes/Backend/ExtJs/backend/article/model/media_mapping_rule.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @link http://www.shopware.de/
  * @license http://www.shopware.de/license
diff --git a/themes/Backend/ExtJs/backend/article/model/price.js b/themes/Backend/ExtJs/backend/article/model/price.js
index cc7f6a56ac0..4e7bf5b92c3 100644
--- a/themes/Backend/ExtJs/backend/article/model/price.js
+++ b/themes/Backend/ExtJs/backend/article/model/price.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/model/price_attribute.js b/themes/Backend/ExtJs/backend/article/model/price_attribute.js
index d50b584813f..7f7a6a530bb 100644
--- a/themes/Backend/ExtJs/backend/article/model/price_attribute.js
+++ b/themes/Backend/ExtJs/backend/article/model/price_attribute.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/model/price_group.js b/themes/Backend/ExtJs/backend/article/model/price_group.js
index d69fc9e8960..88014296584 100644
--- a/themes/Backend/ExtJs/backend/article/model/price_group.js
+++ b/themes/Backend/ExtJs/backend/article/model/price_group.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/model/price_variation.js b/themes/Backend/ExtJs/backend/article/model/price_variation.js
index 62e8a151dbb..033f0dc81e6 100644
--- a/themes/Backend/ExtJs/backend/article/model/price_variation.js
+++ b/themes/Backend/ExtJs/backend/article/model/price_variation.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/model/property.js b/themes/Backend/ExtJs/backend/article/model/property.js
index 9ca49908469..7e13e23e432 100644
--- a/themes/Backend/ExtJs/backend/article/model/property.js
+++ b/themes/Backend/ExtJs/backend/article/model/property.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/model/property_group.js b/themes/Backend/ExtJs/backend/article/model/property_group.js
index 3ce9cd86566..811a11f5ac8 100644
--- a/themes/Backend/ExtJs/backend/article/model/property_group.js
+++ b/themes/Backend/ExtJs/backend/article/model/property_group.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/model/property_option.js b/themes/Backend/ExtJs/backend/article/model/property_option.js
index 040923e9eea..ad42b24d805 100644
--- a/themes/Backend/ExtJs/backend/article/model/property_option.js
+++ b/themes/Backend/ExtJs/backend/article/model/property_option.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/model/seo_category.js b/themes/Backend/ExtJs/backend/article/model/seo_category.js
index 8a1fd304591..ae7d1d3976f 100644
--- a/themes/Backend/ExtJs/backend/article/model/seo_category.js
+++ b/themes/Backend/ExtJs/backend/article/model/seo_category.js
@@ -3,23 +3,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/model/serial.js b/themes/Backend/ExtJs/backend/article/model/serial.js
index ddeca08a57f..ee3ebbbe134 100644
--- a/themes/Backend/ExtJs/backend/article/model/serial.js
+++ b/themes/Backend/ExtJs/backend/article/model/serial.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/model/similar.js b/themes/Backend/ExtJs/backend/article/model/similar.js
index 15c8be702fc..5fd7024f670 100644
--- a/themes/Backend/ExtJs/backend/article/model/similar.js
+++ b/themes/Backend/ExtJs/backend/article/model/similar.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/model/statistic.js b/themes/Backend/ExtJs/backend/article/model/statistic.js
index 6715bb39bde..c3dc7146aba 100644
--- a/themes/Backend/ExtJs/backend/article/model/statistic.js
+++ b/themes/Backend/ExtJs/backend/article/model/statistic.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/model/stream.js b/themes/Backend/ExtJs/backend/article/model/stream.js
index 24779ab5337..9becdaf4093 100644
--- a/themes/Backend/ExtJs/backend/article/model/stream.js
+++ b/themes/Backend/ExtJs/backend/article/model/stream.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/model/template.js b/themes/Backend/ExtJs/backend/article/model/template.js
index d2bdb75d968..f19b2b7cef1 100644
--- a/themes/Backend/ExtJs/backend/article/model/template.js
+++ b/themes/Backend/ExtJs/backend/article/model/template.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/model/unit.js b/themes/Backend/ExtJs/backend/article/model/unit.js
index 79456302b9c..665b39a37f6 100644
--- a/themes/Backend/ExtJs/backend/article/model/unit.js
+++ b/themes/Backend/ExtJs/backend/article/model/unit.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/store/batch.js b/themes/Backend/ExtJs/backend/article/store/batch.js
index 8c34fbb54a4..fc1c544770d 100644
--- a/themes/Backend/ExtJs/backend/article/store/batch.js
+++ b/themes/Backend/ExtJs/backend/article/store/batch.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/store/category_path.js b/themes/Backend/ExtJs/backend/article/store/category_path.js
index 614d59bf1f4..4db4361458f 100644
--- a/themes/Backend/ExtJs/backend/article/store/category_path.js
+++ b/themes/Backend/ExtJs/backend/article/store/category_path.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/store/category_tree.js b/themes/Backend/ExtJs/backend/article/store/category_tree.js
index 1ff5fe34e82..91816a6facb 100644
--- a/themes/Backend/ExtJs/backend/article/store/category_tree.js
+++ b/themes/Backend/ExtJs/backend/article/store/category_tree.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/store/configurator_set.js b/themes/Backend/ExtJs/backend/article/store/configurator_set.js
index 91bc972b193..42ec507b94b 100644
--- a/themes/Backend/ExtJs/backend/article/store/configurator_set.js
+++ b/themes/Backend/ExtJs/backend/article/store/configurator_set.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/store/dependency.js b/themes/Backend/ExtJs/backend/article/store/dependency.js
index 1b482f561bd..765030ea8eb 100644
--- a/themes/Backend/ExtJs/backend/article/store/dependency.js
+++ b/themes/Backend/ExtJs/backend/article/store/dependency.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/store/detail.js b/themes/Backend/ExtJs/backend/article/store/detail.js
index 2fb14e21a98..2d301b33361 100644
--- a/themes/Backend/ExtJs/backend/article/store/detail.js
+++ b/themes/Backend/ExtJs/backend/article/store/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/store/esd.js b/themes/Backend/ExtJs/backend/article/store/esd.js
index ca3e221141d..bec4975df8a 100644
--- a/themes/Backend/ExtJs/backend/article/store/esd.js
+++ b/themes/Backend/ExtJs/backend/article/store/esd.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/store/esd_file.js b/themes/Backend/ExtJs/backend/article/store/esd_file.js
index e537c768533..e392e61f9c9 100644
--- a/themes/Backend/ExtJs/backend/article/store/esd_file.js
+++ b/themes/Backend/ExtJs/backend/article/store/esd_file.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/store/group.js b/themes/Backend/ExtJs/backend/article/store/group.js
index 66710d2b92c..738f2ee6764 100644
--- a/themes/Backend/ExtJs/backend/article/store/group.js
+++ b/themes/Backend/ExtJs/backend/article/store/group.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/store/media_mapping.js b/themes/Backend/ExtJs/backend/article/store/media_mapping.js
index 87ba7702900..91e8f247eb1 100644
--- a/themes/Backend/ExtJs/backend/article/store/media_mapping.js
+++ b/themes/Backend/ExtJs/backend/article/store/media_mapping.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/store/option.js b/themes/Backend/ExtJs/backend/article/store/option.js
index c6f7eb06ba3..84bb17d8654 100644
--- a/themes/Backend/ExtJs/backend/article/store/option.js
+++ b/themes/Backend/ExtJs/backend/article/store/option.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/store/property.js b/themes/Backend/ExtJs/backend/article/store/property.js
index 36d932c6d37..0d97012e59a 100644
--- a/themes/Backend/ExtJs/backend/article/store/property.js
+++ b/themes/Backend/ExtJs/backend/article/store/property.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/store/serial.js b/themes/Backend/ExtJs/backend/article/store/serial.js
index 71cdb7c9641..53f34a2803c 100644
--- a/themes/Backend/ExtJs/backend/article/store/serial.js
+++ b/themes/Backend/ExtJs/backend/article/store/serial.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/store/statistic.js b/themes/Backend/ExtJs/backend/article/store/statistic.js
index 4d6c0b7d588..a34455ce752 100644
--- a/themes/Backend/ExtJs/backend/article/store/statistic.js
+++ b/themes/Backend/ExtJs/backend/article/store/statistic.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/store/variant.js b/themes/Backend/ExtJs/backend/article/store/variant.js
index ca6b0b03d20..db89e12e23b 100644
--- a/themes/Backend/ExtJs/backend/article/store/variant.js
+++ b/themes/Backend/ExtJs/backend/article/store/variant.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/store/variation.js b/themes/Backend/ExtJs/backend/article/store/variation.js
index 7513255bc7e..c31823c0e01 100644
--- a/themes/Backend/ExtJs/backend/article/store/variation.js
+++ b/themes/Backend/ExtJs/backend/article/store/variation.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/category/drop_zone.js b/themes/Backend/ExtJs/backend/article/view/category/drop_zone.js
index 780135fe893..e3ca2e80d5a 100644
--- a/themes/Backend/ExtJs/backend/article/view/category/drop_zone.js
+++ b/themes/Backend/ExtJs/backend/article/view/category/drop_zone.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/category/list.js b/themes/Backend/ExtJs/backend/article/view/category/list.js
index 4a46440530a..73b767a42ac 100644
--- a/themes/Backend/ExtJs/backend/article/view/category/list.js
+++ b/themes/Backend/ExtJs/backend/article/view/category/list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/category/seo.js b/themes/Backend/ExtJs/backend/article/view/category/seo.js
index d6db649cae2..a49897104d0 100644
--- a/themes/Backend/ExtJs/backend/article/view/category/seo.js
+++ b/themes/Backend/ExtJs/backend/article/view/category/seo.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/category/tree.js b/themes/Backend/ExtJs/backend/article/view/category/tree.js
index 6c812eafe03..f445c907459 100644
--- a/themes/Backend/ExtJs/backend/article/view/category/tree.js
+++ b/themes/Backend/ExtJs/backend/article/view/category/tree.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/crossselling/base.js b/themes/Backend/ExtJs/backend/article/view/crossselling/base.js
index 6819183a428..e80f84cc3e5 100644
--- a/themes/Backend/ExtJs/backend/article/view/crossselling/base.js
+++ b/themes/Backend/ExtJs/backend/article/view/crossselling/base.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/crossselling/product_streams.js b/themes/Backend/ExtJs/backend/article/view/crossselling/product_streams.js
index 3c7355cf60c..180486ac78c 100644
--- a/themes/Backend/ExtJs/backend/article/view/crossselling/product_streams.js
+++ b/themes/Backend/ExtJs/backend/article/view/crossselling/product_streams.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/crossselling/tab.js b/themes/Backend/ExtJs/backend/article/view/crossselling/tab.js
index 55c7161fb9a..f339dfbccfb 100644
--- a/themes/Backend/ExtJs/backend/article/view/crossselling/tab.js
+++ b/themes/Backend/ExtJs/backend/article/view/crossselling/tab.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/detail/base.js b/themes/Backend/ExtJs/backend/article/view/detail/base.js
index 732ff8cf146..d023f30f32b 100644
--- a/themes/Backend/ExtJs/backend/article/view/detail/base.js
+++ b/themes/Backend/ExtJs/backend/article/view/detail/base.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/detail/prices.js b/themes/Backend/ExtJs/backend/article/view/detail/prices.js
index d1b42fe849f..c5367a41eb9 100644
--- a/themes/Backend/ExtJs/backend/article/view/detail/prices.js
+++ b/themes/Backend/ExtJs/backend/article/view/detail/prices.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/detail/properties.js b/themes/Backend/ExtJs/backend/article/view/detail/properties.js
index 26bc219eb87..25b91343126 100644
--- a/themes/Backend/ExtJs/backend/article/view/detail/properties.js
+++ b/themes/Backend/ExtJs/backend/article/view/detail/properties.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/detail/settings.js b/themes/Backend/ExtJs/backend/article/view/detail/settings.js
index 57a2f2f971a..17a7b32f524 100644
--- a/themes/Backend/ExtJs/backend/article/view/detail/settings.js
+++ b/themes/Backend/ExtJs/backend/article/view/detail/settings.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/detail/toolbar.js b/themes/Backend/ExtJs/backend/article/view/detail/toolbar.js
index 2ef7ecf9ac5..a20bbeb1906 100644
--- a/themes/Backend/ExtJs/backend/article/view/detail/toolbar.js
+++ b/themes/Backend/ExtJs/backend/article/view/detail/toolbar.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/detail/window.js b/themes/Backend/ExtJs/backend/article/view/detail/window.js
index e6110010337..a18273f2054 100644
--- a/themes/Backend/ExtJs/backend/article/view/detail/window.js
+++ b/themes/Backend/ExtJs/backend/article/view/detail/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/esd/detail.js b/themes/Backend/ExtJs/backend/article/view/esd/detail.js
index 2165c5d2a7c..891c0fdc202 100644
--- a/themes/Backend/ExtJs/backend/article/view/esd/detail.js
+++ b/themes/Backend/ExtJs/backend/article/view/esd/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/esd/list.js b/themes/Backend/ExtJs/backend/article/view/esd/list.js
index c32647f3bde..26828bb8db1 100644
--- a/themes/Backend/ExtJs/backend/article/view/esd/list.js
+++ b/themes/Backend/ExtJs/backend/article/view/esd/list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/esd/serials.js b/themes/Backend/ExtJs/backend/article/view/esd/serials.js
index af604aeb737..179005d442f 100644
--- a/themes/Backend/ExtJs/backend/article/view/esd/serials.js
+++ b/themes/Backend/ExtJs/backend/article/view/esd/serials.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/image/data_view.js b/themes/Backend/ExtJs/backend/article/view/image/data_view.js
index fccccc8c25d..a15e78519cb 100644
--- a/themes/Backend/ExtJs/backend/article/view/image/data_view.js
+++ b/themes/Backend/ExtJs/backend/article/view/image/data_view.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/image/drop_zone.js b/themes/Backend/ExtJs/backend/article/view/image/drop_zone.js
index dfef188fc3f..a7e392a0e8d 100644
--- a/themes/Backend/ExtJs/backend/article/view/image/drop_zone.js
+++ b/themes/Backend/ExtJs/backend/article/view/image/drop_zone.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/image/info.js b/themes/Backend/ExtJs/backend/article/view/image/info.js
index 6b418ad6a7c..cdddaa0de4b 100644
--- a/themes/Backend/ExtJs/backend/article/view/image/info.js
+++ b/themes/Backend/ExtJs/backend/article/view/image/info.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/image/list.js b/themes/Backend/ExtJs/backend/article/view/image/list.js
index f08d106ee9f..32a6cb68908 100644
--- a/themes/Backend/ExtJs/backend/article/view/image/list.js
+++ b/themes/Backend/ExtJs/backend/article/view/image/list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/image/mapping.js b/themes/Backend/ExtJs/backend/article/view/image/mapping.js
index 271efa91796..03554c06c79 100644
--- a/themes/Backend/ExtJs/backend/article/view/image/mapping.js
+++ b/themes/Backend/ExtJs/backend/article/view/image/mapping.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/image/new_rule.js b/themes/Backend/ExtJs/backend/article/view/image/new_rule.js
index eed735a35ec..494ba559414 100644
--- a/themes/Backend/ExtJs/backend/article/view/image/new_rule.js
+++ b/themes/Backend/ExtJs/backend/article/view/image/new_rule.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/image/progress.js b/themes/Backend/ExtJs/backend/article/view/image/progress.js
index 46f3fb086dd..da3f92ef8b1 100644
--- a/themes/Backend/ExtJs/backend/article/view/image/progress.js
+++ b/themes/Backend/ExtJs/backend/article/view/image/progress.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/resources/downloads.js b/themes/Backend/ExtJs/backend/article/view/resources/downloads.js
index 8e825e82d5c..af89d5f6cf2 100644
--- a/themes/Backend/ExtJs/backend/article/view/resources/downloads.js
+++ b/themes/Backend/ExtJs/backend/article/view/resources/downloads.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/resources/links.js b/themes/Backend/ExtJs/backend/article/view/resources/links.js
index 1d1e2a4fca4..5dd688e465a 100644
--- a/themes/Backend/ExtJs/backend/article/view/resources/links.js
+++ b/themes/Backend/ExtJs/backend/article/view/resources/links.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/statistics/chart.js b/themes/Backend/ExtJs/backend/article/view/statistics/chart.js
index b980fa58f66..524dc3b7aba 100644
--- a/themes/Backend/ExtJs/backend/article/view/statistics/chart.js
+++ b/themes/Backend/ExtJs/backend/article/view/statistics/chart.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/statistics/list.js b/themes/Backend/ExtJs/backend/article/view/statistics/list.js
index 085ad15aa3a..91c7ec0cd40 100644
--- a/themes/Backend/ExtJs/backend/article/view/statistics/list.js
+++ b/themes/Backend/ExtJs/backend/article/view/statistics/list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/variant/configurator.js b/themes/Backend/ExtJs/backend/article/view/variant/configurator.js
index ffb2ce81b14..6592b94b878 100644
--- a/themes/Backend/ExtJs/backend/article/view/variant/configurator.js
+++ b/themes/Backend/ExtJs/backend/article/view/variant/configurator.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/variant/configurator/dependency.js b/themes/Backend/ExtJs/backend/article/view/variant/configurator/dependency.js
index 9a96c2c4708..7998a35f807 100644
--- a/themes/Backend/ExtJs/backend/article/view/variant/configurator/dependency.js
+++ b/themes/Backend/ExtJs/backend/article/view/variant/configurator/dependency.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/variant/configurator/group_edit.js b/themes/Backend/ExtJs/backend/article/view/variant/configurator/group_edit.js
index c9ad28615b9..a03ecf76463 100644
--- a/themes/Backend/ExtJs/backend/article/view/variant/configurator/group_edit.js
+++ b/themes/Backend/ExtJs/backend/article/view/variant/configurator/group_edit.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/variant/configurator/mapping.js b/themes/Backend/ExtJs/backend/article/view/variant/configurator/mapping.js
index 74372b08617..c89ef28139e 100644
--- a/themes/Backend/ExtJs/backend/article/view/variant/configurator/mapping.js
+++ b/themes/Backend/ExtJs/backend/article/view/variant/configurator/mapping.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/variant/configurator/option_edit.js b/themes/Backend/ExtJs/backend/article/view/variant/configurator/option_edit.js
index cd0fbcb76ee..f307ea7a772 100644
--- a/themes/Backend/ExtJs/backend/article/view/variant/configurator/option_edit.js
+++ b/themes/Backend/ExtJs/backend/article/view/variant/configurator/option_edit.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/variant/configurator/price_variation.js b/themes/Backend/ExtJs/backend/article/view/variant/configurator/price_variation.js
index 5be236a424d..ce5ac27bbb5 100644
--- a/themes/Backend/ExtJs/backend/article/view/variant/configurator/price_variation.js
+++ b/themes/Backend/ExtJs/backend/article/view/variant/configurator/price_variation.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/variant/configurator/price_variation_rule.js b/themes/Backend/ExtJs/backend/article/view/variant/configurator/price_variation_rule.js
index 7a387fb7996..fd820473e4c 100644
--- a/themes/Backend/ExtJs/backend/article/view/variant/configurator/price_variation_rule.js
+++ b/themes/Backend/ExtJs/backend/article/view/variant/configurator/price_variation_rule.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/variant/configurator/sets.js b/themes/Backend/ExtJs/backend/article/view/variant/configurator/sets.js
index 175aa20507d..297cb2d0b40 100644
--- a/themes/Backend/ExtJs/backend/article/view/variant/configurator/sets.js
+++ b/themes/Backend/ExtJs/backend/article/view/variant/configurator/sets.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/variant/configurator/template.js b/themes/Backend/ExtJs/backend/article/view/variant/configurator/template.js
index 38547747053..92606389aca 100644
--- a/themes/Backend/ExtJs/backend/article/view/variant/configurator/template.js
+++ b/themes/Backend/ExtJs/backend/article/view/variant/configurator/template.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/variant/detail.js b/themes/Backend/ExtJs/backend/article/view/variant/detail.js
index 9222481f6c2..7bcf330beea 100644
--- a/themes/Backend/ExtJs/backend/article/view/variant/detail.js
+++ b/themes/Backend/ExtJs/backend/article/view/variant/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/variant/image_relation_process.js b/themes/Backend/ExtJs/backend/article/view/variant/image_relation_process.js
index 4bba35011c7..1b401a72b82 100644
--- a/themes/Backend/ExtJs/backend/article/view/variant/image_relation_process.js
+++ b/themes/Backend/ExtJs/backend/article/view/variant/image_relation_process.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/article/view/main"}
diff --git a/themes/Backend/ExtJs/backend/article/view/variant/list.js b/themes/Backend/ExtJs/backend/article/view/variant/list.js
index ce603e3b457..b44f353f70c 100644
--- a/themes/Backend/ExtJs/backend/article/view/variant/list.js
+++ b/themes/Backend/ExtJs/backend/article/view/variant/list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article/view/variant/number_progress.js b/themes/Backend/ExtJs/backend/article/view/variant/number_progress.js
index 27753843b2b..237be83b78f 100644
--- a/themes/Backend/ExtJs/backend/article/view/variant/number_progress.js
+++ b/themes/Backend/ExtJs/backend/article/view/variant/number_progress.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/article/view/main"}
diff --git a/themes/Backend/ExtJs/backend/article/view/variant/progress.js b/themes/Backend/ExtJs/backend/article/view/variant/progress.js
index b1d0d40adc1..3e0bc602ddc 100644
--- a/themes/Backend/ExtJs/backend/article/view/variant/progress.js
+++ b/themes/Backend/ExtJs/backend/article/view/variant/progress.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/article_list/app.js b/themes/Backend/ExtJs/backend/article_list/app.js
index cb178df85f2..df5d9fa66d1 100644
--- a/themes/Backend/ExtJs/backend/article_list/app.js
+++ b/themes/Backend/ExtJs/backend/article_list/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="backend/article_list/app"}
diff --git a/themes/Backend/ExtJs/backend/article_list/controller/article_crud.js b/themes/Backend/ExtJs/backend/article_list/controller/article_crud.js
index 4286d997e27..be960618c55 100644
--- a/themes/Backend/ExtJs/backend/article_list/controller/article_crud.js
+++ b/themes/Backend/ExtJs/backend/article_list/controller/article_crud.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/article_list/controller/backup.js b/themes/Backend/ExtJs/backend/article_list/controller/backup.js
index 3a80fe441d1..99bdfa036ba 100644
--- a/themes/Backend/ExtJs/backend/article_list/controller/backup.js
+++ b/themes/Backend/ExtJs/backend/article_list/controller/backup.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/article_list/controller/batch_process.js b/themes/Backend/ExtJs/backend/article_list/controller/batch_process.js
index 40654053b44..3fcee8fad56 100644
--- a/themes/Backend/ExtJs/backend/article_list/controller/batch_process.js
+++ b/themes/Backend/ExtJs/backend/article_list/controller/batch_process.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/article_list/controller/category_filter.js b/themes/Backend/ExtJs/backend/article_list/controller/category_filter.js
index 81c6c7bddca..1366582c52e 100644
--- a/themes/Backend/ExtJs/backend/article_list/controller/category_filter.js
+++ b/themes/Backend/ExtJs/backend/article_list/controller/category_filter.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/article_list/controller/filter.js b/themes/Backend/ExtJs/backend/article_list/controller/filter.js
index 70f7fe04382..0e286a18b67 100644
--- a/themes/Backend/ExtJs/backend/article_list/controller/filter.js
+++ b/themes/Backend/ExtJs/backend/article_list/controller/filter.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/article_list/controller/list.js b/themes/Backend/ExtJs/backend/article_list/controller/list.js
index 01f9197d360..464f7dd5f82 100644
--- a/themes/Backend/ExtJs/backend/article_list/controller/list.js
+++ b/themes/Backend/ExtJs/backend/article_list/controller/list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/article_list/controller/main.js b/themes/Backend/ExtJs/backend/article_list/controller/main.js
index ff8ba264ae1..6364ff8fb15 100644
--- a/themes/Backend/ExtJs/backend/article_list/controller/main.js
+++ b/themes/Backend/ExtJs/backend/article_list/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/article_list/controller/split_view.js b/themes/Backend/ExtJs/backend/article_list/controller/split_view.js
index 5cf89a2372c..882f54ebe47 100644
--- a/themes/Backend/ExtJs/backend/article_list/controller/split_view.js
+++ b/themes/Backend/ExtJs/backend/article_list/controller/split_view.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/article_list/controller/suggest.js b/themes/Backend/ExtJs/backend/article_list/controller/suggest.js
index 784aa164793..d2e46c7289b 100644
--- a/themes/Backend/ExtJs/backend/article_list/controller/suggest.js
+++ b/themes/Backend/ExtJs/backend/article_list/controller/suggest.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/article_list/main"}
diff --git a/themes/Backend/ExtJs/backend/article_list/model/backup.js b/themes/Backend/ExtJs/backend/article_list/model/backup.js
index fd50fc4ddd8..fd8475ae60e 100644
--- a/themes/Backend/ExtJs/backend/article_list/model/backup.js
+++ b/themes/Backend/ExtJs/backend/article_list/model/backup.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/article_list/model/detail.js b/themes/Backend/ExtJs/backend/article_list/model/detail.js
index 0a9a220055f..1bb84c0ddbe 100644
--- a/themes/Backend/ExtJs/backend/article_list/model/detail.js
+++ b/themes/Backend/ExtJs/backend/article_list/model/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/article_list/model/editable_column.js b/themes/Backend/ExtJs/backend/article_list/model/editable_column.js
index a8127fceffd..12fcc835914 100644
--- a/themes/Backend/ExtJs/backend/article_list/model/editable_column.js
+++ b/themes/Backend/ExtJs/backend/article_list/model/editable_column.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/article_list/model/filter.js b/themes/Backend/ExtJs/backend/article_list/model/filter.js
index 3db7c7a13f0..b3cfd2f7c4f 100644
--- a/themes/Backend/ExtJs/backend/article_list/model/filter.js
+++ b/themes/Backend/ExtJs/backend/article_list/model/filter.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/article_list/model/operation.js b/themes/Backend/ExtJs/backend/article_list/model/operation.js
index c511958f53a..a98972148e0 100644
--- a/themes/Backend/ExtJs/backend/article_list/model/operation.js
+++ b/themes/Backend/ExtJs/backend/article_list/model/operation.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/article_list/model/operator.js b/themes/Backend/ExtJs/backend/article_list/model/operator.js
index 4b6ae228e1c..43f865f3eb1 100644
--- a/themes/Backend/ExtJs/backend/article_list/model/operator.js
+++ b/themes/Backend/ExtJs/backend/article_list/model/operator.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/article_list/resource/lexer.js b/themes/Backend/ExtJs/backend/article_list/resource/lexer.js
index e7beb595af4..b9b18976b43 100644
--- a/themes/Backend/ExtJs/backend/article_list/resource/lexer.js
+++ b/themes/Backend/ExtJs/backend/article_list/resource/lexer.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/article_list/resource/parser.js b/themes/Backend/ExtJs/backend/article_list/resource/parser.js
index b6237d8fe75..e8d6c770305 100644
--- a/themes/Backend/ExtJs/backend/article_list/resource/parser.js
+++ b/themes/Backend/ExtJs/backend/article_list/resource/parser.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/article_list/resource/tokenizer.js b/themes/Backend/ExtJs/backend/article_list/resource/tokenizer.js
index e490f59d8fa..a462352c877 100644
--- a/themes/Backend/ExtJs/backend/article_list/resource/tokenizer.js
+++ b/themes/Backend/ExtJs/backend/article_list/resource/tokenizer.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/article_list/store/backup.js b/themes/Backend/ExtJs/backend/article_list/store/backup.js
index 5990b7cb078..1d8590e518d 100644
--- a/themes/Backend/ExtJs/backend/article_list/store/backup.js
+++ b/themes/Backend/ExtJs/backend/article_list/store/backup.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/article_list/store/detail.js b/themes/Backend/ExtJs/backend/article_list/store/detail.js
index cd83c8f39a2..0c232bfae58 100644
--- a/themes/Backend/ExtJs/backend/article_list/store/detail.js
+++ b/themes/Backend/ExtJs/backend/article_list/store/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/article_list/store/editable_columns.js b/themes/Backend/ExtJs/backend/article_list/store/editable_columns.js
index c2fdd65725d..c2b3c5d2fc2 100644
--- a/themes/Backend/ExtJs/backend/article_list/store/editable_columns.js
+++ b/themes/Backend/ExtJs/backend/article_list/store/editable_columns.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/article_list/store/filter.js b/themes/Backend/ExtJs/backend/article_list/store/filter.js
index d5b489e9d13..39023b86ceb 100644
--- a/themes/Backend/ExtJs/backend/article_list/store/filter.js
+++ b/themes/Backend/ExtJs/backend/article_list/store/filter.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/article_list/store/operation.js b/themes/Backend/ExtJs/backend/article_list/store/operation.js
index 73777b3012e..bd590167a93 100644
--- a/themes/Backend/ExtJs/backend/article_list/store/operation.js
+++ b/themes/Backend/ExtJs/backend/article_list/store/operation.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/article_list/store/operator.js b/themes/Backend/ExtJs/backend/article_list/store/operator.js
index 871aa3db169..1d244f32008 100644
--- a/themes/Backend/ExtJs/backend/article_list/store/operator.js
+++ b/themes/Backend/ExtJs/backend/article_list/store/operator.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 /**
  * Shopware Store - Operator store
diff --git a/themes/Backend/ExtJs/backend/article_list/view/add_filter/grid.js b/themes/Backend/ExtJs/backend/article_list/view/add_filter/grid.js
index cdd8b339082..a30c6dbb3d2 100644
--- a/themes/Backend/ExtJs/backend/article_list/view/add_filter/grid.js
+++ b/themes/Backend/ExtJs/backend/article_list/view/add_filter/grid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/article_list/main"}
diff --git a/themes/Backend/ExtJs/backend/article_list/view/add_filter/window.js b/themes/Backend/ExtJs/backend/article_list/view/add_filter/window.js
index 54ef7647edf..323c838cd03 100644
--- a/themes/Backend/ExtJs/backend/article_list/view/add_filter/window.js
+++ b/themes/Backend/ExtJs/backend/article_list/view/add_filter/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/article_list/main"}
diff --git a/themes/Backend/ExtJs/backend/article_list/view/backup/grid.js b/themes/Backend/ExtJs/backend/article_list/view/backup/grid.js
index e553268d5c5..2ba246c0207 100644
--- a/themes/Backend/ExtJs/backend/article_list/view/backup/grid.js
+++ b/themes/Backend/ExtJs/backend/article_list/view/backup/grid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/article_list/main"}
diff --git a/themes/Backend/ExtJs/backend/article_list/view/backup/window.js b/themes/Backend/ExtJs/backend/article_list/view/backup/window.js
index 662a7918402..494cd48d210 100644
--- a/themes/Backend/ExtJs/backend/article_list/view/backup/window.js
+++ b/themes/Backend/ExtJs/backend/article_list/view/backup/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/article_list/main"}
diff --git a/themes/Backend/ExtJs/backend/article_list/view/batch_process/grid.js b/themes/Backend/ExtJs/backend/article_list/view/batch_process/grid.js
index c8b2fca4676..78d6f78db8f 100644
--- a/themes/Backend/ExtJs/backend/article_list/view/batch_process/grid.js
+++ b/themes/Backend/ExtJs/backend/article_list/view/batch_process/grid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/article_list/main"}
diff --git a/themes/Backend/ExtJs/backend/article_list/view/batch_process/window.js b/themes/Backend/ExtJs/backend/article_list/view/batch_process/window.js
index 383c42c5b65..9dbe0aa743d 100644
--- a/themes/Backend/ExtJs/backend/article_list/view/batch_process/window.js
+++ b/themes/Backend/ExtJs/backend/article_list/view/batch_process/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/article_list/main"}
diff --git a/themes/Backend/ExtJs/backend/article_list/view/filter_combo.js b/themes/Backend/ExtJs/backend/article_list/view/filter_combo.js
index f54290b08af..985e148567e 100644
--- a/themes/Backend/ExtJs/backend/article_list/view/filter_combo.js
+++ b/themes/Backend/ExtJs/backend/article_list/view/filter_combo.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/article_list/main"}
diff --git a/themes/Backend/ExtJs/backend/article_list/view/main/category_tree.js b/themes/Backend/ExtJs/backend/article_list/view/main/category_tree.js
index 0bc697557fc..7bdef6c95b4 100644
--- a/themes/Backend/ExtJs/backend/article_list/view/main/category_tree.js
+++ b/themes/Backend/ExtJs/backend/article_list/view/main/category_tree.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/article_list/main"}
diff --git a/themes/Backend/ExtJs/backend/article_list/view/main/grid.js b/themes/Backend/ExtJs/backend/article_list/view/main/grid.js
index 87fd94bf742..ba6c8ebf247 100644
--- a/themes/Backend/ExtJs/backend/article_list/view/main/grid.js
+++ b/themes/Backend/ExtJs/backend/article_list/view/main/grid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/article_list/main"}
diff --git a/themes/Backend/ExtJs/backend/article_list/view/main/multi_edit_menu.js b/themes/Backend/ExtJs/backend/article_list/view/main/multi_edit_menu.js
index e4ff130219c..a1baa138886 100644
--- a/themes/Backend/ExtJs/backend/article_list/view/main/multi_edit_menu.js
+++ b/themes/Backend/ExtJs/backend/article_list/view/main/multi_edit_menu.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/article_list/main"}
diff --git a/themes/Backend/ExtJs/backend/article_list/view/main/navigation_grid.js b/themes/Backend/ExtJs/backend/article_list/view/main/navigation_grid.js
index cc222c05b98..4393982e4ac 100644
--- a/themes/Backend/ExtJs/backend/article_list/view/main/navigation_grid.js
+++ b/themes/Backend/ExtJs/backend/article_list/view/main/navigation_grid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/article_list/view/main/sidebar.js b/themes/Backend/ExtJs/backend/article_list/view/main/sidebar.js
index 97f7a4bdeab..73ce64dcfda 100644
--- a/themes/Backend/ExtJs/backend/article_list/view/main/sidebar.js
+++ b/themes/Backend/ExtJs/backend/article_list/view/main/sidebar.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/article_list/main"}
diff --git a/themes/Backend/ExtJs/backend/article_list/view/main/window.js b/themes/Backend/ExtJs/backend/article_list/view/main/window.js
index f6561dab07e..d7428a072fc 100644
--- a/themes/Backend/ExtJs/backend/article_list/view/main/window.js
+++ b/themes/Backend/ExtJs/backend/article_list/view/main/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/article_list/main"}
diff --git a/themes/Backend/ExtJs/backend/article_list/view/query_field.js b/themes/Backend/ExtJs/backend/article_list/view/query_field.js
index ee41c3ed4c3..d55b747a506 100644
--- a/themes/Backend/ExtJs/backend/article_list/view/query_field.js
+++ b/themes/Backend/ExtJs/backend/article_list/view/query_field.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/article_list/main"}
diff --git a/themes/Backend/ExtJs/backend/attributes/app.js b/themes/Backend/ExtJs/backend/attributes/app.js
index 6a628e39f7a..70e2eb419c2 100644
--- a/themes/Backend/ExtJs/backend/attributes/app.js
+++ b/themes/Backend/ExtJs/backend/attributes/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/attributes/controller/main.js b/themes/Backend/ExtJs/backend/attributes/controller/main.js
index 6b11cfe4550..9e7bcbedf21 100644
--- a/themes/Backend/ExtJs/backend/attributes/controller/main.js
+++ b/themes/Backend/ExtJs/backend/attributes/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/attributes/model/table.js b/themes/Backend/ExtJs/backend/attributes/model/table.js
index 008674d8f6c..fa2edfa46e0 100644
--- a/themes/Backend/ExtJs/backend/attributes/model/table.js
+++ b/themes/Backend/ExtJs/backend/attributes/model/table.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/attributes/model/types.js b/themes/Backend/ExtJs/backend/attributes/model/types.js
index ae2151259ef..c10debb7e8d 100644
--- a/themes/Backend/ExtJs/backend/attributes/model/types.js
+++ b/themes/Backend/ExtJs/backend/attributes/model/types.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/attributes/store/column.js b/themes/Backend/ExtJs/backend/attributes/store/column.js
index 0884abe31a0..38a7fd89a61 100644
--- a/themes/Backend/ExtJs/backend/attributes/store/column.js
+++ b/themes/Backend/ExtJs/backend/attributes/store/column.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/attributes/store/depending_table.js b/themes/Backend/ExtJs/backend/attributes/store/depending_table.js
index 027e93f2725..a0f64db4044 100644
--- a/themes/Backend/ExtJs/backend/attributes/store/depending_table.js
+++ b/themes/Backend/ExtJs/backend/attributes/store/depending_table.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/attributes/store/entities.js b/themes/Backend/ExtJs/backend/attributes/store/entities.js
index 72f0813701c..3c13a3328ab 100644
--- a/themes/Backend/ExtJs/backend/attributes/store/entities.js
+++ b/themes/Backend/ExtJs/backend/attributes/store/entities.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/attributes/store/table.js b/themes/Backend/ExtJs/backend/attributes/store/table.js
index b4b00638476..b9bcd833746 100644
--- a/themes/Backend/ExtJs/backend/attributes/store/table.js
+++ b/themes/Backend/ExtJs/backend/attributes/store/table.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/attributes/store/types.js b/themes/Backend/ExtJs/backend/attributes/store/types.js
index 02e7577fc9a..3684e383f9d 100644
--- a/themes/Backend/ExtJs/backend/attributes/store/types.js
+++ b/themes/Backend/ExtJs/backend/attributes/store/types.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/attributes/view/array_store_field.js b/themes/Backend/ExtJs/backend/attributes/view/array_store_field.js
index 113c644a256..375f741040f 100644
--- a/themes/Backend/ExtJs/backend/attributes/view/array_store_field.js
+++ b/themes/Backend/ExtJs/backend/attributes/view/array_store_field.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/attributes/view/detail.js b/themes/Backend/ExtJs/backend/attributes/view/detail.js
index 42ef4f28b3f..7e8f87e977f 100644
--- a/themes/Backend/ExtJs/backend/attributes/view/detail.js
+++ b/themes/Backend/ExtJs/backend/attributes/view/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/attributes/view/listing.js b/themes/Backend/ExtJs/backend/attributes/view/listing.js
index 7e4c4cc1c6a..7d9b6a4d9ac 100644
--- a/themes/Backend/ExtJs/backend/attributes/view/listing.js
+++ b/themes/Backend/ExtJs/backend/attributes/view/listing.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/attributes/view/window.js b/themes/Backend/ExtJs/backend/attributes/view/window.js
index 4523816f430..5bd80ea5283 100644
--- a/themes/Backend/ExtJs/backend/attributes/view/window.js
+++ b/themes/Backend/ExtJs/backend/attributes/view/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/banner/app.js b/themes/Backend/ExtJs/backend/banner/app.js
index 8b980c37b42..e4a18d08911 100644
--- a/themes/Backend/ExtJs/backend/banner/app.js
+++ b/themes/Backend/ExtJs/backend/banner/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Banner
diff --git a/themes/Backend/ExtJs/backend/banner/controller/main.js b/themes/Backend/ExtJs/backend/banner/controller/main.js
index eca151a85ce..0b2a2f2079c 100644
--- a/themes/Backend/ExtJs/backend/banner/controller/main.js
+++ b/themes/Backend/ExtJs/backend/banner/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Banner
diff --git a/themes/Backend/ExtJs/backend/banner/model/banner_detail.js b/themes/Backend/ExtJs/backend/banner/model/banner_detail.js
index cba9a1d6458..b58fa87066f 100644
--- a/themes/Backend/ExtJs/backend/banner/model/banner_detail.js
+++ b/themes/Backend/ExtJs/backend/banner/model/banner_detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Banner
diff --git a/themes/Backend/ExtJs/backend/banner/store/banner.js b/themes/Backend/ExtJs/backend/banner/store/banner.js
index 65ef861861c..81f9c07e009 100644
--- a/themes/Backend/ExtJs/backend/banner/store/banner.js
+++ b/themes/Backend/ExtJs/backend/banner/store/banner.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Banner
diff --git a/themes/Backend/ExtJs/backend/banner/store/category.js b/themes/Backend/ExtJs/backend/banner/store/category.js
index 9203ef651cc..fc9f2e0b035 100644
--- a/themes/Backend/ExtJs/backend/banner/store/category.js
+++ b/themes/Backend/ExtJs/backend/banner/store/category.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Banner
diff --git a/themes/Backend/ExtJs/backend/banner/view/main.js b/themes/Backend/ExtJs/backend/banner/view/main.js
index 0ec5fcfec21..dc0159391f0 100644
--- a/themes/Backend/ExtJs/backend/banner/view/main.js
+++ b/themes/Backend/ExtJs/backend/banner/view/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Banner
diff --git a/themes/Backend/ExtJs/backend/banner/view/main/banner_form.js b/themes/Backend/ExtJs/backend/banner/view/main/banner_form.js
index f5499d9cf56..2f30a7ef5ec 100644
--- a/themes/Backend/ExtJs/backend/banner/view/main/banner_form.js
+++ b/themes/Backend/ExtJs/backend/banner/view/main/banner_form.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Banner
diff --git a/themes/Backend/ExtJs/backend/banner/view/main/banner_form_add.js b/themes/Backend/ExtJs/backend/banner/view/main/banner_form_add.js
index 6e267bdecdd..0c98420e1f0 100644
--- a/themes/Backend/ExtJs/backend/banner/view/main/banner_form_add.js
+++ b/themes/Backend/ExtJs/backend/banner/view/main/banner_form_add.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Banner
diff --git a/themes/Backend/ExtJs/backend/banner/view/main/panel.js b/themes/Backend/ExtJs/backend/banner/view/main/panel.js
index 76f0c3f6412..7cd63ef4a44 100644
--- a/themes/Backend/ExtJs/backend/banner/view/main/panel.js
+++ b/themes/Backend/ExtJs/backend/banner/view/main/panel.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Banner
diff --git a/themes/Backend/ExtJs/backend/base/application/Shopware.store.Search.js b/themes/Backend/ExtJs/backend/base/application/Shopware.store.Search.js
index 58c43b90a16..60455dc4d07 100644
--- a/themes/Backend/ExtJs/backend/base/application/Shopware.store.Search.js
+++ b/themes/Backend/ExtJs/backend/base/application/Shopware.store.Search.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/Shopware.attribute.Button.js b/themes/Backend/ExtJs/backend/base/attribute/Shopware.attribute.Button.js
index f69d5618874..6834962fbd7 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/Shopware.attribute.Button.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/Shopware.attribute.Button.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/Shopware.attribute.FieldHandlerInterface.js b/themes/Backend/ExtJs/backend/base/attribute/Shopware.attribute.FieldHandlerInterface.js
index 8e7edd9be76..63313d9cba5 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/Shopware.attribute.FieldHandlerInterface.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/Shopware.attribute.FieldHandlerInterface.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/Shopware.attribute.Form.js b/themes/Backend/ExtJs/backend/base/attribute/Shopware.attribute.Form.js
index 3b68c960f7d..78b37641ad2 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/Shopware.attribute.Form.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/Shopware.attribute.Form.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
@@ -404,6 +403,7 @@ Ext.define('Shopware.attribute.Form', {
             Ext.create('Shopware.attribute.HtmlFieldHandler'),
             Ext.create('Shopware.attribute.IntegerFieldHandler'),
             Ext.create('Shopware.attribute.StringFieldHandler'),
+            Ext.create('Shopware.attribute.NoUrlFieldHandler'),
             Ext.create('Shopware.attribute.TextAreaFieldHandler'),
             Ext.create('Shopware.attribute.ComboBoxFieldHandler'),
             Ext.create('Shopware.attribute.SingleSelectionFieldHandler'),
diff --git a/themes/Backend/ExtJs/backend/base/attribute/Shopware.attribute.Window.js b/themes/Backend/ExtJs/backend/base/attribute/Shopware.attribute.Window.js
index 4dd7e1bdb82..d4ab195944c 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/Shopware.attribute.Window.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/Shopware.attribute.Window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/Shopware.grid.plugin.Attribute.js b/themes/Backend/ExtJs/backend/base/attribute/Shopware.grid.plugin.Attribute.js
index 0d880745056..fd37a0d87e7 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/Shopware.grid.plugin.Attribute.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/Shopware.grid.plugin.Attribute.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.AttributeSingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.AttributeSingleSelection.js
index f757b3cab3e..f8ab311bbc2 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.AttributeSingleSelection.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.AttributeSingleSelection.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.BlogGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.BlogGrid.js
index ccffab01382..6f4198dbfeb 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.BlogGrid.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.BlogGrid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.BlogSingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.BlogSingleSelection.js
index ec8d70c9cff..d804fd9b1e6 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.BlogSingleSelection.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.BlogSingleSelection.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CategoryGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CategoryGrid.js
index dacbc594a7b..cf0c489d66a 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CategoryGrid.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CategoryGrid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CategorySingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CategorySingleSelection.js
index 974819a5b25..7e625245ef5 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CategorySingleSelection.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CategorySingleSelection.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ContentTypeSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ContentTypeSelection.js
index 3508e06764d..19ad87ad958 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ContentTypeSelection.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ContentTypeSelection.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/attributes/fields"}
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CountryGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CountryGrid.js
index 36e44f1bc35..32d90a88992 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CountryGrid.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CountryGrid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CountrySingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CountrySingleSelection.js
index 8ab3573a174..7b189be0a0f 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CountrySingleSelection.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CountrySingleSelection.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomFacetGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomFacetGrid.js
index 230cad523ab..e27d68c24ec 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomFacetGrid.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomFacetGrid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomSortingGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomSortingGrid.js
index 8c8d55c08e7..477fc9c349d 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomSortingGrid.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomSortingGrid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomerGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomerGrid.js
index 59a5ba9c9e8..661a7132cf2 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomerGrid.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomerGrid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomerSingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomerSingleSelection.js
index 1966a3386ab..70b03bafec5 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomerSingleSelection.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomerSingleSelection.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomerStreamGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomerStreamGrid.js
index a56df8e85d2..82cb5db478e 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomerStreamGrid.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomerStreamGrid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomerStreamSingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomerStreamSingleSelection.js
index 5f1d7040a70..86cb52d54c7 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomerStreamSingleSelection.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CustomerStreamSingleSelection.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.DispatchGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.DispatchGrid.js
index 5287ff8764d..ce9184f487e 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.DispatchGrid.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.DispatchGrid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.EmotionGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.EmotionGrid.js
index 5882ac5d3e8..1f6fa399dfd 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.EmotionGrid.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.EmotionGrid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.EmotionSingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.EmotionSingleSelection.js
index 897f78ac462..5326e0daf84 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.EmotionSingleSelection.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.EmotionSingleSelection.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.FormGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.FormGrid.js
index 749dbf754ce..395eff6ce81 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.FormGrid.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.FormGrid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.FormSingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.FormSingleSelection.js
index 4a652635c0a..0115d8b128b 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.FormSingleSelection.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.FormSingleSelection.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.Grid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.Grid.js
index 739758a4803..262c1303943 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.Grid.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.Grid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.GridView.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.GridView.js
index 0c42f71f133..ef3f658ee8a 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.GridView.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.GridView.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.MailGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.MailGrid.js
index e87ab1dc8bc..669f254bd81 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.MailGrid.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.MailGrid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.MailSingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.MailSingleSelection.js
index 18271c415d2..d487920a0f7 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.MailSingleSelection.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.MailSingleSelection.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.MediaGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.MediaGrid.js
index 8c09841d549..bd5f7b19bb4 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.MediaGrid.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.MediaGrid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.NewsletterGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.NewsletterGrid.js
index a6c12d45cef..71d31d82900 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.NewsletterGrid.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.NewsletterGrid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.NewsletterSingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.NewsletterSingleSelection.js
index 8926f1c2ec2..60e1bfc57b8 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.NewsletterSingleSelection.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.NewsletterSingleSelection.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.OrderDetailGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.OrderDetailGrid.js
index 9169413da89..f928b0e47a7 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.OrderDetailGrid.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.OrderDetailGrid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.OrderDetailSingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.OrderDetailSingleSelection.js
index 062021ae158..5d7a6550911 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.OrderDetailSingleSelection.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.OrderDetailSingleSelection.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PartnerGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PartnerGrid.js
index e7779d3dd8a..fd6435d6be0 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PartnerGrid.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PartnerGrid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PartnerSingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PartnerSingleSelection.js
index e5731196904..b8d8d6f86f7 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PartnerSingleSelection.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PartnerSingleSelection.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PaymentGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PaymentGrid.js
index 67501100902..8aad3d0b591 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PaymentGrid.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PaymentGrid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PaymentSingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PaymentSingleSelection.js
index 743b173c27b..d38b2108ab0 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PaymentSingleSelection.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PaymentSingleSelection.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PremiumGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PremiumGrid.js
index 4cfe1dc2305..aeda0d7eeaa 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PremiumGrid.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PremiumGrid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PremiumSingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PremiumSingleSelection.js
index 29f0c1e3fe5..80cdb13514e 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PremiumSingleSelection.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PremiumSingleSelection.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductFeedGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductFeedGrid.js
index ce32f40fa7f..a295f90a2e7 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductFeedGrid.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductFeedGrid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductFeedSingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductFeedSingleSelection.js
index dcc2617bccf..5b76b8b0dd6 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductFeedSingleSelection.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductFeedSingleSelection.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductGrid.js
index cb508e9ccfb..dd74387f909 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductGrid.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductGrid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductSingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductSingleSelection.js
index 0928d8f97be..7d1482c2c50 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductSingleSelection.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductSingleSelection.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductStreamGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductStreamGrid.js
index 203974d33c9..423726f8150 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductStreamGrid.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductStreamGrid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductStreamSingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductStreamSingleSelection.js
index b3db32e6951..454efdad165 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductStreamSingleSelection.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ProductStreamSingleSelection.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PropertyOptionGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PropertyOptionGrid.js
index bd7bbded808..2f2cd0404fe 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PropertyOptionGrid.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PropertyOptionGrid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PropertyOptionSingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PropertyOptionSingleSelection.js
index 3c163471c98..0143b467850 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PropertyOptionSingleSelection.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.PropertyOptionSingleSelection.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ShopGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ShopGrid.js
index 776f035d97c..6e1ee119355 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ShopGrid.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.ShopGrid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.SingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.SingleSelection.js
index ceb395954ba..da329fb5c41 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.SingleSelection.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.SingleSelection.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.VoucherGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.VoucherGrid.js
index aea27eec291..a4b14ca8460 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.VoucherGrid.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.VoucherGrid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.VoucherSingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.VoucherSingleSelection.js
index d355c32b84e..3fd88581ef6 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.VoucherSingleSelection.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.VoucherSingleSelection.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.AbstractEntityFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.AbstractEntityFieldHandler.js
index a0783e23f97..df4cd47f0b5 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.AbstractEntityFieldHandler.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.AbstractEntityFieldHandler.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.BlogFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.BlogFieldHandler.js
index 58e3affe0b2..739c2172e82 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.BlogFieldHandler.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.BlogFieldHandler.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.BooleanFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.BooleanFieldHandler.js
index edbd21f1972..809bd0a55f4 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.BooleanFieldHandler.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.BooleanFieldHandler.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.CategoryFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.CategoryFieldHandler.js
index a20ada70d96..4950ab2feae 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.CategoryFieldHandler.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.CategoryFieldHandler.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ComboBoxFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ComboBoxFieldHandler.js
index c1b4cd5d2fc..331d60ce7e6 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ComboBoxFieldHandler.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ComboBoxFieldHandler.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.CountryFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.CountryFieldHandler.js
index a7dddcbd1ee..710e755137f 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.CountryFieldHandler.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.CountryFieldHandler.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.CustomerFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.CustomerFieldHandler.js
index 716d8041b65..74eaeeae682 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.CustomerFieldHandler.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.CustomerFieldHandler.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.CustomerStreamFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.CustomerStreamFieldHandler.js
index d6d02ad44a5..8d4c105bcb3 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.CustomerStreamFieldHandler.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.CustomerStreamFieldHandler.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.DateFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.DateFieldHandler.js
index 5a690f8377f..137b14f1c5f 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.DateFieldHandler.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.DateFieldHandler.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.DateTimeFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.DateTimeFieldHandler.js
index b12f130d8ef..45f7bfa9c37 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.DateTimeFieldHandler.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.DateTimeFieldHandler.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.DispatchFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.DispatchFieldHandler.js
index 2b4764ad76a..936cf69fff6 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.DispatchFieldHandler.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.DispatchFieldHandler.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.EmotionFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.EmotionFieldHandler.js
index f5ec782ecd2..759339ff2ec 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.EmotionFieldHandler.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.EmotionFieldHandler.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.FloatFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.FloatFieldHandler.js
index b20fa6cca2e..f047c16ad07 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.FloatFieldHandler.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.FloatFieldHandler.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.FormFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.FormFieldHandler.js
index b89942891eb..2f0edff4eb5 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.FormFieldHandler.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.FormFieldHandler.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.HtmlFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.HtmlFieldHandler.js
index fb1ed077186..cf4db87fd9a 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.HtmlFieldHandler.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.HtmlFieldHandler.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.IntegerFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.IntegerFieldHandler.js
index cc8c2ad6b33..d7ba299c451 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.IntegerFieldHandler.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.IntegerFieldHandler.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.MailFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.MailFieldHandler.js
index 99986c95457..6e47f30b0e9 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.MailFieldHandler.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.MailFieldHandler.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.MediaFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.MediaFieldHandler.js
index e466c3e3fc0..44c9034897e 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.MediaFieldHandler.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.MediaFieldHandler.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.MultiSelectionFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.MultiSelectionFieldHandler.js
index b75bcc95ff9..3490ee29b93 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.MultiSelectionFieldHandler.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.MultiSelectionFieldHandler.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.NewsletterFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.NewsletterFieldHandler.js
index 610bfd5758e..43369396328 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.NewsletterFieldHandler.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.NewsletterFieldHandler.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.NoUrlFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.NoUrlFieldHandler.js
new file mode 100644
index 00000000000..839f4d3058a
--- /dev/null
+++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.NoUrlFieldHandler.js
@@ -0,0 +1,40 @@
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ *
+ * @category    Shopware
+ * @package     Base
+ * @subpackage  Attribute
+ * @version     $Id$
+ * @author      shopware AG
+ */
+
+Ext.define('Shopware.attribute.NoUrlFieldHandler', {
+    extend: 'Shopware.attribute.FieldHandlerInterface',
+
+    supports: function(attribute) {
+        return (attribute.get('columnType') === 'string');
+    },
+
+    create: function(field, attribute) {
+        field.xtype = 'nourl';
+        return field;
+    }
+});
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.OrderDetailFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.OrderDetailFieldHandler.js
index 14eb3e04af3..53896b3cfd5 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.OrderDetailFieldHandler.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.OrderDetailFieldHandler.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.PartnerFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.PartnerFieldHandler.js
index 670c8539377..8c1ff460ac2 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.PartnerFieldHandler.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.PartnerFieldHandler.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.PaymentFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.PaymentFieldHandler.js
index 81b8fac385b..c7cfdbac065 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.PaymentFieldHandler.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.PaymentFieldHandler.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.PremiumFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.PremiumFieldHandler.js
index d8a1d14213f..c9f23b3f70d 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.PremiumFieldHandler.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.PremiumFieldHandler.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ProductFeedFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ProductFeedFieldHandler.js
index a1a9fb50abf..313e727490b 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ProductFeedFieldHandler.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ProductFeedFieldHandler.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ProductFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ProductFieldHandler.js
index 9a69f3acbaf..a23d84ed9e3 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ProductFieldHandler.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ProductFieldHandler.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ProductStreamFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ProductStreamFieldHandler.js
index a2995650ae3..62647086b8f 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ProductStreamFieldHandler.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ProductStreamFieldHandler.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.PropertyOptionFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.PropertyOptionFieldHandler.js
index d24e66a79e7..13a946a9e86 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.PropertyOptionFieldHandler.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.PropertyOptionFieldHandler.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ShopFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ShopFieldHandler.js
index 6aae5b7998b..a8a83c6d372 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ShopFieldHandler.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.ShopFieldHandler.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.SingleSelectionFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.SingleSelectionFieldHandler.js
index 4060b4ac2ac..06474570d46 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.SingleSelectionFieldHandler.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.SingleSelectionFieldHandler.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.StringFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.StringFieldHandler.js
index 2e89ac805e5..cde20a380a9 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.StringFieldHandler.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.StringFieldHandler.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.TextAreaFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.TextAreaFieldHandler.js
index a255c69c01e..fa87fc7dd98 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.TextAreaFieldHandler.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.TextAreaFieldHandler.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.VoucherFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.VoucherFieldHandler.js
index 9d576207b5c..bf853dde959 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.VoucherFieldHandler.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.VoucherFieldHandler.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/mixins/Shopware.attribute.SelectionFactory.js b/themes/Backend/ExtJs/backend/base/attribute/mixins/Shopware.attribute.SelectionFactory.js
index 29704ba8f0b..a20a3ed8354 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/mixins/Shopware.attribute.SelectionFactory.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/mixins/Shopware.attribute.SelectionFactory.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/model/dynamic.js b/themes/Backend/ExtJs/backend/base/attribute/model/dynamic.js
index 453a4eecaa7..009a00efb9b 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/model/dynamic.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/model/dynamic.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/attribute/model/dynamic_reader.js b/themes/Backend/ExtJs/backend/base/attribute/model/dynamic_reader.js
index 79363b7ceb3..b604807cb1b 100644
--- a/themes/Backend/ExtJs/backend/base/attribute/model/dynamic_reader.js
+++ b/themes/Backend/ExtJs/backend/base/attribute/model/dynamic_reader.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Base
diff --git a/themes/Backend/ExtJs/backend/base/bootstrap.js b/themes/Backend/ExtJs/backend/base/bootstrap.js
index 55098731ae7..2464f959061 100644
--- a/themes/Backend/ExtJs/backend/base/bootstrap.js
+++ b/themes/Backend/ExtJs/backend/base/bootstrap.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 {* Include default components *}
@@ -250,6 +249,7 @@
 {include file='backend/base/attribute/field_handler/Shopware.attribute.SingleSelectionFieldHandler.js'}
 {include file='backend/base/attribute/field_handler/Shopware.attribute.MultiSelectionFieldHandler.js'}
 {include file='backend/base/attribute/field_handler/Shopware.attribute.StringFieldHandler.js'}
+{include file='backend/base/attribute/field_handler/Shopware.attribute.NoUrlFieldHandler.js'}
 {include file='backend/base/attribute/field_handler/Shopware.attribute.TextAreaFieldHandler.js'}
 
 {include file='backend/base/attribute/field/Shopware.form.field.Grid.js'}
@@ -334,4 +334,4 @@
 {include file='backend/base/model/custom_facet.js'}
 {include file='backend/base/store/custom_facet.js'}
 
-{include file='backend/base/application/Shopware.helper.BatchRequests.js'}
\ No newline at end of file
+{include file='backend/base/application/Shopware.helper.BatchRequests.js'}
diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.DataView.GooglePreview.js b/themes/Backend/ExtJs/backend/base/component/Shopware.DataView.GooglePreview.js
index 8f420ff5a05..c375132fa40 100644
--- a/themes/Backend/ExtJs/backend/base/component/Shopware.DataView.GooglePreview.js
+++ b/themes/Backend/ExtJs/backend/base/component/Shopware.DataView.GooglePreview.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.DragAndDropSelector.js b/themes/Backend/ExtJs/backend/base/component/Shopware.DragAndDropSelector.js
index ab8c8e99ade..63c46409814 100644
--- a/themes/Backend/ExtJs/backend/base/component/Shopware.DragAndDropSelector.js
+++ b/themes/Backend/ExtJs/backend/base/component/Shopware.DragAndDropSelector.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.MediaManager.MediaSelection.js b/themes/Backend/ExtJs/backend/base/component/Shopware.MediaManager.MediaSelection.js
index 7c136314c3f..131fe3dfe7b 100644
--- a/themes/Backend/ExtJs/backend/base/component/Shopware.MediaManager.MediaSelection.js
+++ b/themes/Backend/ExtJs/backend/base/component/Shopware.MediaManager.MediaSelection.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.MediaManager.MediaTextSelection.js b/themes/Backend/ExtJs/backend/base/component/Shopware.MediaManager.MediaTextSelection.js
index 4ea15d4c78c..eb2c340fb59 100644
--- a/themes/Backend/ExtJs/backend/base/component/Shopware.MediaManager.MediaTextSelection.js
+++ b/themes/Backend/ExtJs/backend/base/component/Shopware.MediaManager.MediaTextSelection.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.ModuleManager.js b/themes/Backend/ExtJs/backend/base/component/Shopware.ModuleManager.js
index bfe675aba39..75aabe40912 100644
--- a/themes/Backend/ExtJs/backend/base/component/Shopware.ModuleManager.js
+++ b/themes/Backend/ExtJs/backend/base/component/Shopware.ModuleManager.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 Ext.define('Shopware.ModuleManager', {
 
diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.Notification.js b/themes/Backend/ExtJs/backend/base/component/Shopware.Notification.js
index a188d8e5d47..54244615c9d 100644
--- a/themes/Backend/ExtJs/backend/base/component/Shopware.Notification.js
+++ b/themes/Backend/ExtJs/backend/base/component/Shopware.Notification.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.VTypes.js b/themes/Backend/ExtJs/backend/base/component/Shopware.VTypes.js
index 763d834f4cb..047e26334c8 100644
--- a/themes/Backend/ExtJs/backend/base/component/Shopware.VTypes.js
+++ b/themes/Backend/ExtJs/backend/base/component/Shopware.VTypes.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.button.HoverButton.js b/themes/Backend/ExtJs/backend/base/component/Shopware.button.HoverButton.js
index 39893e8d8b2..30f2f256417 100644
--- a/themes/Backend/ExtJs/backend/base/component/Shopware.button.HoverButton.js
+++ b/themes/Backend/ExtJs/backend/base/component/Shopware.button.HoverButton.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.component.IconPreloader.js b/themes/Backend/ExtJs/backend/base/component/Shopware.component.IconPreloader.js
index 3155926e988..73dfe68b0dc 100644
--- a/themes/Backend/ExtJs/backend/base/component/Shopware.component.IconPreloader.js
+++ b/themes/Backend/ExtJs/backend/base/component/Shopware.component.IconPreloader.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 Ext.define('Shopware.component.IconPreloader', {
 
diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.component.Preloader.js b/themes/Backend/ExtJs/backend/base/component/Shopware.component.Preloader.js
index e4fbf01167e..75d867bc939 100644
--- a/themes/Backend/ExtJs/backend/base/component/Shopware.component.Preloader.js
+++ b/themes/Backend/ExtJs/backend/base/component/Shopware.component.Preloader.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 //{block name="backend/base/component/preloader"}
 Ext.define('Shopware.component.Preloader', {
diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.component.ValidatePassword.js b/themes/Backend/ExtJs/backend/base/component/Shopware.component.ValidatePassword.js
index ad9783478f7..e6b3bd02925 100644
--- a/themes/Backend/ExtJs/backend/base/component/Shopware.component.ValidatePassword.js
+++ b/themes/Backend/ExtJs/backend/base/component/Shopware.component.ValidatePassword.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 Ext.define('Shopware.component.ValidatePassword', {
 
diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.container.Viewport.js b/themes/Backend/ExtJs/backend/base/component/Shopware.container.Viewport.js
index e1e72c259c7..4753c84dc35 100644
--- a/themes/Backend/ExtJs/backend/base/component/Shopware.container.Viewport.js
+++ b/themes/Backend/ExtJs/backend/base/component/Shopware.container.Viewport.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.data.reader.Application.js b/themes/Backend/ExtJs/backend/base/component/Shopware.data.reader.Application.js
index c0bd6726823..7ce6e8cf7c9 100644
--- a/themes/Backend/ExtJs/backend/base/component/Shopware.data.reader.Application.js
+++ b/themes/Backend/ExtJs/backend/base/component/Shopware.data.reader.Application.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.form.PasswordStrengthMeter.js b/themes/Backend/ExtJs/backend/base/component/Shopware.form.PasswordStrengthMeter.js
index 02d8e9ba531..1c196e13d35 100644
--- a/themes/Backend/ExtJs/backend/base/component/Shopware.form.PasswordStrengthMeter.js
+++ b/themes/Backend/ExtJs/backend/base/component/Shopware.form.PasswordStrengthMeter.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.form.PluginPanel.js b/themes/Backend/ExtJs/backend/base/component/Shopware.form.PluginPanel.js
index d1daffe0fc3..f64a3e6a1a1 100644
--- a/themes/Backend/ExtJs/backend/base/component/Shopware.form.PluginPanel.js
+++ b/themes/Backend/ExtJs/backend/base/component/Shopware.form.PluginPanel.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.AceEditor.js b/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.AceEditor.js
index 27cfe9a41fb..53fb74da2f7 100644
--- a/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.AceEditor.js
+++ b/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.AceEditor.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.ArticleSearch.js b/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.ArticleSearch.js
index 363d2488b7d..02d7679fb95 100644
--- a/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.ArticleSearch.js
+++ b/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.ArticleSearch.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
@@ -222,6 +221,7 @@ Ext.define('Shopware.form.field.ArticleSearch', {
      * @array
      */
     searchScope: ['articles', 'variants', 'configurator'],
+    extraParam: {},
 
     /**
      * Form field configuration
@@ -252,7 +252,6 @@ Ext.define('Shopware.form.field.ArticleSearch', {
         var me = this;
 
         me.registerEvents();
-
         //maps the article store to the store attribute
         if (!(me.store instanceof Ext.data.Store)) {
             if (!(me.articleStore instanceof Ext.data.Store)) {
@@ -281,11 +280,13 @@ Ext.define('Shopware.form.field.ArticleSearch', {
         }
 
         if (Ext.isArray(me.searchScope) && me.searchScope.length > 0) {
-            me.dropDownStore.getProxy().extraParams = {
+            var extraParams = Ext.apply(me.extraParam, {
                 articles: Ext.Array.contains(me.searchScope, 'articles'),
                 variants: Ext.Array.contains(me.searchScope, 'variants'),
-                configurator: Ext.Array.contains(me.searchScope, 'configurator')
-            };
+                configurator: Ext.Array.contains(me.searchScope, 'configurator'),
+            });
+
+            me.dropDownStore.getProxy().extraParams = extraParams;
         }
 
         me.hiddenField = me.createHiddenField();
@@ -293,7 +294,7 @@ Ext.define('Shopware.form.field.ArticleSearch', {
         me.dropDownMenu = me.createDropDownMenu();
         me.items = [ me.hiddenField, me.searchField, me.dropDownMenu ];
 
-        // Create an store and a grid for the selected articles
+        // Create a store and a grid for the selected articles
         if (!me.multiSelect) {
             delete me.multiSelectStore;
         } else {
@@ -301,7 +302,7 @@ Ext.define('Shopware.form.field.ArticleSearch', {
             me.items.push(me.multiSelectGrid);
         }
 
-        // Are we're having an store to preselect articles?
+        // Are we're having a store to preselect articles?
         if (me.articleStore && me.multiSelect) {
             me.multiSelectGrid.show();
         }
diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.ColorField.js b/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.ColorField.js
index b92345759e0..0af33d903a5 100644
--- a/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.ColorField.js
+++ b/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.ColorField.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/base/color_components"}
diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.ComboTree.js b/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.ComboTree.js
index d51ae4e7a19..d6fcafc7273 100644
--- a/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.ComboTree.js
+++ b/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.ComboTree.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.PagingComboBox.js b/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.PagingComboBox.js
index 88604a28f52..2bda97bfeb9 100644
--- a/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.PagingComboBox.js
+++ b/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.PagingComboBox.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
@@ -159,7 +158,7 @@ Ext.define('Shopware.form.field.PagingComboBox', {
         }
 
         if (!this.displayTplData.length) {
-            return this.emptyText;
+            return '';
         }
 
         if (!this.isValidRecordData(this.displayTplData[0])) {
diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.ProductStreamSelection.js b/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.ProductStreamSelection.js
index d14cec00460..bebc99b766d 100644
--- a/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.ProductStreamSelection.js
+++ b/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.ProductStreamSelection.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.TinyMCE.js b/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.TinyMCE.js
index 0f900ed43f1..2be140ea848 100644
--- a/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.TinyMCE.js
+++ b/themes/Backend/ExtJs/backend/base/component/Shopware.form.field.TinyMCE.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.form.plugin.SnippetTranslation.js b/themes/Backend/ExtJs/backend/base/component/Shopware.form.plugin.SnippetTranslation.js
index 9899ea4c299..e8196b69047 100644
--- a/themes/Backend/ExtJs/backend/base/component/Shopware.form.plugin.SnippetTranslation.js
+++ b/themes/Backend/ExtJs/backend/base/component/Shopware.form.plugin.SnippetTranslation.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
@@ -204,6 +203,7 @@ Ext.define('Shopware.form.plugin.SnippetTranslation', {
             case 'trigger':
                 return 'top: 6px; right: 26px';
             case 'textfield':
+            case 'nourl':
             default:
                 return 'top: 6px; right: 6px; z-index:1;';
         }
@@ -237,6 +237,10 @@ Ext.define('Shopware.form.plugin.SnippetTranslation', {
                 type = 'textfield';
             }
 
+            if (className === 'Ext.form.NoUrl') {
+                type = 'nourl';
+            }
+
             if (className === 'Shopware.form.TinyMCE') {
                 type = 'tinymce';
             }
diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.form.plugin.Translation.js b/themes/Backend/ExtJs/backend/base/component/Shopware.form.plugin.Translation.js
index 83c2d25c1ef..2a91244d8ca 100644
--- a/themes/Backend/ExtJs/backend/base/component/Shopware.form.plugin.Translation.js
+++ b/themes/Backend/ExtJs/backend/base/component/Shopware.form.plugin.Translation.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
@@ -224,6 +223,7 @@ Ext.define('Shopware.form.plugin.Translation', {
             case 'trigger':
                 return 'top: 6px; right: 26px';
             case 'textfield':
+            case 'alphanumeric':
             default:
                 return 'top: 6px; right: 6px; z-index:1;';
         }
@@ -335,6 +335,10 @@ Ext.define('Shopware.form.plugin.Translation', {
                 type = 'textarea';
             }
 
+            if (className === 'Ext.form.NoUrl') {
+                type = 'nourl'
+            }
+
             if (className === 'Ext.form.TriggerField' ||
                 className === 'Ext.form.ComboBox' ||
                 className === 'Ext.form.DateField' ||
diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.global.ErrorReporter.js b/themes/Backend/ExtJs/backend/base/component/Shopware.global.ErrorReporter.js
index 9752acb4a46..88524182b6c 100644
--- a/themes/Backend/ExtJs/backend/base/component/Shopware.global.ErrorReporter.js
+++ b/themes/Backend/ExtJs/backend/base/component/Shopware.global.ErrorReporter.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware.global.ErrorReporter
diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.grid.HeaderToolTip.js b/themes/Backend/ExtJs/backend/base/component/Shopware.grid.HeaderToolTip.js
index 0631a340aa9..89599145696 100644
--- a/themes/Backend/ExtJs/backend/base/component/Shopware.grid.HeaderToolTip.js
+++ b/themes/Backend/ExtJs/backend/base/component/Shopware.grid.HeaderToolTip.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.grid.Searchable.js b/themes/Backend/ExtJs/backend/base/component/Shopware.grid.Searchable.js
index ee618ec0bfc..930cce75baa 100644
--- a/themes/Backend/ExtJs/backend/base/component/Shopware.grid.Searchable.js
+++ b/themes/Backend/ExtJs/backend/base/component/Shopware.grid.Searchable.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/base/component/searchable_grid"}
@@ -522,7 +521,7 @@ Ext.define('Shopware.grid.Searchable', {
             params = {};
 
         callback = callback || function () {};
-        
+
         if (identifiers === null) {
             return;
         }
diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.grid.plugin.Translation.js b/themes/Backend/ExtJs/backend/base/component/Shopware.grid.plugin.Translation.js
index 67acfd29a6e..b8247cbe33a 100644
--- a/themes/Backend/ExtJs/backend/base/component/Shopware.grid.plugin.Translation.js
+++ b/themes/Backend/ExtJs/backend/base/component/Shopware.grid.plugin.Translation.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.notification.SubscriptionWarning.js b/themes/Backend/ExtJs/backend/base/component/Shopware.notification.SubscriptionWarning.js
index f6f171b78f1..8f7fca541d4 100644
--- a/themes/Backend/ExtJs/backend/base/component/Shopware.notification.SubscriptionWarning.js
+++ b/themes/Backend/ExtJs/backend/base/component/Shopware.notification.SubscriptionWarning.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {namespace name="backend/index/view/menu"}
diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.window.ExpiredPluginStop.js b/themes/Backend/ExtJs/backend/base/component/Shopware.window.ExpiredPluginStop.js
index daaa41d8732..34427337c96 100644
--- a/themes/Backend/ExtJs/backend/base/component/Shopware.window.ExpiredPluginStop.js
+++ b/themes/Backend/ExtJs/backend/base/component/Shopware.window.ExpiredPluginStop.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @version    $Id$
diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.window.ExpiredPluginWarning.js b/themes/Backend/ExtJs/backend/base/component/Shopware.window.ExpiredPluginWarning.js
index 58a83177895..34d0153315f 100644
--- a/themes/Backend/ExtJs/backend/base/component/Shopware.window.ExpiredPluginWarning.js
+++ b/themes/Backend/ExtJs/backend/base/component/Shopware.window.ExpiredPluginWarning.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @version    $Id$
diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.window.SimpleModule.js b/themes/Backend/ExtJs/backend/base/component/Shopware.window.SimpleModule.js
index b9bf320c389..ad6a820be15 100644
--- a/themes/Backend/ExtJs/backend/base/component/Shopware.window.SimpleModule.js
+++ b/themes/Backend/ExtJs/backend/base/component/Shopware.window.SimpleModule.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 Ext.define('Shopware.window.SimpleModule', {
     extend: 'Enlight.app.Window',
diff --git a/themes/Backend/ExtJs/backend/base/component/Shopware.window.plugin.Hub.js b/themes/Backend/ExtJs/backend/base/component/Shopware.window.plugin.Hub.js
index 93887f5f1ce..4d26eeda20b 100644
--- a/themes/Backend/ExtJs/backend/base/component/Shopware.window.plugin.Hub.js
+++ b/themes/Backend/ExtJs/backend/base/component/Shopware.window.plugin.Hub.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Window
diff --git a/themes/Backend/ExtJs/backend/base/component/element/boolean.js b/themes/Backend/ExtJs/backend/base/component/element/boolean.js
index e1b0a7aa7f3..d45d12d24a5 100644
--- a/themes/Backend/ExtJs/backend/base/component/element/boolean.js
+++ b/themes/Backend/ExtJs/backend/base/component/element/boolean.js
@@ -1,24 +1,23 @@
-/*
+/**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/component/element/boolean_select.js b/themes/Backend/ExtJs/backend/base/component/element/boolean_select.js
index 1056ad008f3..44a83bfd703 100644
--- a/themes/Backend/ExtJs/backend/base/component/element/boolean_select.js
+++ b/themes/Backend/ExtJs/backend/base/component/element/boolean_select.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/base/component/element/button.js b/themes/Backend/ExtJs/backend/base/component/element/button.js
index 4a9bccd7483..34375ab16ec 100644
--- a/themes/Backend/ExtJs/backend/base/component/element/button.js
+++ b/themes/Backend/ExtJs/backend/base/component/element/button.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/component/element/color.js b/themes/Backend/ExtJs/backend/base/component/element/color.js
index dff633c7420..c8e9f57f55f 100644
--- a/themes/Backend/ExtJs/backend/base/component/element/color.js
+++ b/themes/Backend/ExtJs/backend/base/component/element/color.js
@@ -1,24 +1,23 @@
-/*
+/**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/component/element/date.js b/themes/Backend/ExtJs/backend/base/component/element/date.js
index 43edc752f4d..4950d1ba6cf 100644
--- a/themes/Backend/ExtJs/backend/base/component/element/date.js
+++ b/themes/Backend/ExtJs/backend/base/component/element/date.js
@@ -1,24 +1,23 @@
-/*
+/**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/component/element/date_time.js b/themes/Backend/ExtJs/backend/base/component/element/date_time.js
index 7d48dd3e4d6..8994e2ae4e6 100644
--- a/themes/Backend/ExtJs/backend/base/component/element/date_time.js
+++ b/themes/Backend/ExtJs/backend/base/component/element/date_time.js
@@ -1,24 +1,23 @@
-/*
+/**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/component/element/fieldset.js b/themes/Backend/ExtJs/backend/base/component/element/fieldset.js
index 3c566d4244d..bc9d5cd38b9 100644
--- a/themes/Backend/ExtJs/backend/base/component/element/fieldset.js
+++ b/themes/Backend/ExtJs/backend/base/component/element/fieldset.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/component/element/html.js b/themes/Backend/ExtJs/backend/base/component/element/html.js
index 74910098689..aa044b6967a 100644
--- a/themes/Backend/ExtJs/backend/base/component/element/html.js
+++ b/themes/Backend/ExtJs/backend/base/component/element/html.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/component/element/interval.js b/themes/Backend/ExtJs/backend/base/component/element/interval.js
index 939a3f9c902..a7506258bc7 100644
--- a/themes/Backend/ExtJs/backend/base/component/element/interval.js
+++ b/themes/Backend/ExtJs/backend/base/component/element/interval.js
@@ -4,23 +4,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/component/element/listing_filter_mode_select.js b/themes/Backend/ExtJs/backend/base/component/element/listing_filter_mode_select.js
index 56fec67d84e..a56e2ffabc3 100644
--- a/themes/Backend/ExtJs/backend/base/component/element/listing_filter_mode_select.js
+++ b/themes/Backend/ExtJs/backend/base/component/element/listing_filter_mode_select.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/component/element/media_selection.js b/themes/Backend/ExtJs/backend/base/component/element/media_selection.js
index e76159a9450..830aef56fb7 100644
--- a/themes/Backend/ExtJs/backend/base/component/element/media_selection.js
+++ b/themes/Backend/ExtJs/backend/base/component/element/media_selection.js
@@ -1,24 +1,23 @@
-/*
+/**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/component/element/media_text_selection.js b/themes/Backend/ExtJs/backend/base/component/element/media_text_selection.js
index 3f35ced3c0c..4098c7b4611 100644
--- a/themes/Backend/ExtJs/backend/base/component/element/media_text_selection.js
+++ b/themes/Backend/ExtJs/backend/base/component/element/media_text_selection.js
@@ -1,24 +1,23 @@
-/*
+/**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/component/element/number.js b/themes/Backend/ExtJs/backend/base/component/element/number.js
index 733247da775..6300d6489cd 100644
--- a/themes/Backend/ExtJs/backend/base/component/element/number.js
+++ b/themes/Backend/ExtJs/backend/base/component/element/number.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/component/element/product_box_layout_select.js b/themes/Backend/ExtJs/backend/base/component/element/product_box_layout_select.js
index 10443726dd4..1396aebd75c 100644
--- a/themes/Backend/ExtJs/backend/base/component/element/product_box_layout_select.js
+++ b/themes/Backend/ExtJs/backend/base/component/element/product_box_layout_select.js
@@ -1,23 +1,23 @@
-/*
- * Shopware
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 //{namespace name="backend/base/product_box_layout"}
 
diff --git a/themes/Backend/ExtJs/backend/base/component/element/select.js b/themes/Backend/ExtJs/backend/base/component/element/select.js
index 4a507b32871..c19b5f78983 100644
--- a/themes/Backend/ExtJs/backend/base/component/element/select.js
+++ b/themes/Backend/ExtJs/backend/base/component/element/select.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/component/element/select_tree.js b/themes/Backend/ExtJs/backend/base/component/element/select_tree.js
index 1be3514071a..4e5966de928 100644
--- a/themes/Backend/ExtJs/backend/base/component/element/select_tree.js
+++ b/themes/Backend/ExtJs/backend/base/component/element/select_tree.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/component/element/text.js b/themes/Backend/ExtJs/backend/base/component/element/text.js
index 3179e0f7848..7cc865aa358 100644
--- a/themes/Backend/ExtJs/backend/base/component/element/text.js
+++ b/themes/Backend/ExtJs/backend/base/component/element/text.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/component/element/textarea.js b/themes/Backend/ExtJs/backend/base/component/element/textarea.js
index 2cd77527589..6fb395ee725 100644
--- a/themes/Backend/ExtJs/backend/base/component/element/textarea.js
+++ b/themes/Backend/ExtJs/backend/base/component/element/textarea.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/component/element/time.js b/themes/Backend/ExtJs/backend/base/component/element/time.js
index 85b3a70219f..4b7c3c65060 100644
--- a/themes/Backend/ExtJs/backend/base/component/element/time.js
+++ b/themes/Backend/ExtJs/backend/base/component/element/time.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/frame/postmessage-api.js b/themes/Backend/ExtJs/backend/base/frame/postmessage-api.js
index 0767c1c0110..0f172224ebb 100644
--- a/themes/Backend/ExtJs/backend/base/frame/postmessage-api.js
+++ b/themes/Backend/ExtJs/backend/base/frame/postmessage-api.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/base/model/address.js b/themes/Backend/ExtJs/backend/base/model/address.js
index 13bc935547f..b7845f5c2c5 100644
--- a/themes/Backend/ExtJs/backend/base/model/address.js
+++ b/themes/Backend/ExtJs/backend/base/model/address.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/model/article.js b/themes/Backend/ExtJs/backend/base/model/article.js
index 0fe1e2a4a42..2a4182d4e1c 100644
--- a/themes/Backend/ExtJs/backend/base/model/article.js
+++ b/themes/Backend/ExtJs/backend/base/model/article.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/model/billing_address.js b/themes/Backend/ExtJs/backend/base/model/billing_address.js
index dd3af22f597..907d49e7884 100644
--- a/themes/Backend/ExtJs/backend/base/model/billing_address.js
+++ b/themes/Backend/ExtJs/backend/base/model/billing_address.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/model/blog.js b/themes/Backend/ExtJs/backend/base/model/blog.js
index 7011e9ccbe0..fbcc65a9b18 100644
--- a/themes/Backend/ExtJs/backend/base/model/blog.js
+++ b/themes/Backend/ExtJs/backend/base/model/blog.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/model/captcha.js b/themes/Backend/ExtJs/backend/base/model/captcha.js
index d4b2c6de58f..6ccd4b7e533 100644
--- a/themes/Backend/ExtJs/backend/base/model/captcha.js
+++ b/themes/Backend/ExtJs/backend/base/model/captcha.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/model/category.js b/themes/Backend/ExtJs/backend/base/model/category.js
index 23c44231fdd..c19d8168cba 100644
--- a/themes/Backend/ExtJs/backend/base/model/category.js
+++ b/themes/Backend/ExtJs/backend/base/model/category.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/model/cookie_mode.js b/themes/Backend/ExtJs/backend/base/model/cookie_mode.js
index 62ac715cab7..4350a7d4593 100644
--- a/themes/Backend/ExtJs/backend/base/model/cookie_mode.js
+++ b/themes/Backend/ExtJs/backend/base/model/cookie_mode.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/model/corner_position.js b/themes/Backend/ExtJs/backend/base/model/corner_position.js
index b1785524257..1898b66cbb9 100644
--- a/themes/Backend/ExtJs/backend/base/model/corner_position.js
+++ b/themes/Backend/ExtJs/backend/base/model/corner_position.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/model/country.js b/themes/Backend/ExtJs/backend/base/model/country.js
index b866f36b784..c48409b39f7 100644
--- a/themes/Backend/ExtJs/backend/base/model/country.js
+++ b/themes/Backend/ExtJs/backend/base/model/country.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/model/country_area.js b/themes/Backend/ExtJs/backend/base/model/country_area.js
index 05e28e25172..d1011a9bc0b 100644
--- a/themes/Backend/ExtJs/backend/base/model/country_area.js
+++ b/themes/Backend/ExtJs/backend/base/model/country_area.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/model/country_state.js b/themes/Backend/ExtJs/backend/base/model/country_state.js
index 1eb543e4aaa..872251cb88e 100644
--- a/themes/Backend/ExtJs/backend/base/model/country_state.js
+++ b/themes/Backend/ExtJs/backend/base/model/country_state.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/model/currency.js b/themes/Backend/ExtJs/backend/base/model/currency.js
index 916975210c4..7e53937ccc9 100644
--- a/themes/Backend/ExtJs/backend/base/model/currency.js
+++ b/themes/Backend/ExtJs/backend/base/model/currency.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/model/custom_facet.js b/themes/Backend/ExtJs/backend/base/model/custom_facet.js
index 83a127ceef1..1415072fab7 100644
--- a/themes/Backend/ExtJs/backend/base/model/custom_facet.js
+++ b/themes/Backend/ExtJs/backend/base/model/custom_facet.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="backend/base/model/custom_facet"}
diff --git a/themes/Backend/ExtJs/backend/base/model/custom_sorting.js b/themes/Backend/ExtJs/backend/base/model/custom_sorting.js
index d2c37327d18..0156a612fec 100755
--- a/themes/Backend/ExtJs/backend/base/model/custom_sorting.js
+++ b/themes/Backend/ExtJs/backend/base/model/custom_sorting.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="backend/base/model/custom_sorting"}
diff --git a/themes/Backend/ExtJs/backend/base/model/customer.js b/themes/Backend/ExtJs/backend/base/model/customer.js
index 67aa94ed33b..1aee3393f68 100644
--- a/themes/Backend/ExtJs/backend/base/model/customer.js
+++ b/themes/Backend/ExtJs/backend/base/model/customer.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/model/customer_group.js b/themes/Backend/ExtJs/backend/base/model/customer_group.js
index 648514f41b3..f0b06564f46 100644
--- a/themes/Backend/ExtJs/backend/base/model/customer_group.js
+++ b/themes/Backend/ExtJs/backend/base/model/customer_group.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/model/dispatch.js b/themes/Backend/ExtJs/backend/base/model/dispatch.js
index 443d6f87709..e0d440a5340 100644
--- a/themes/Backend/ExtJs/backend/base/model/dispatch.js
+++ b/themes/Backend/ExtJs/backend/base/model/dispatch.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/model/doc_type.js b/themes/Backend/ExtJs/backend/base/model/doc_type.js
index cd145518d8b..4af760e13dc 100644
--- a/themes/Backend/ExtJs/backend/base/model/doc_type.js
+++ b/themes/Backend/ExtJs/backend/base/model/doc_type.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/base/model/element.js b/themes/Backend/ExtJs/backend/base/model/element.js
index 3def8e1c695..c1a70921454 100644
--- a/themes/Backend/ExtJs/backend/base/model/element.js
+++ b/themes/Backend/ExtJs/backend/base/model/element.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Base
diff --git a/themes/Backend/ExtJs/backend/base/model/form.js b/themes/Backend/ExtJs/backend/base/model/form.js
index 310daca3d26..fea6ab0ad59 100644
--- a/themes/Backend/ExtJs/backend/base/model/form.js
+++ b/themes/Backend/ExtJs/backend/base/model/form.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Base
diff --git a/themes/Backend/ExtJs/backend/base/model/landing_page.js b/themes/Backend/ExtJs/backend/base/model/landing_page.js
index cde9c5a2b1d..fb02d10605c 100644
--- a/themes/Backend/ExtJs/backend/base/model/landing_page.js
+++ b/themes/Backend/ExtJs/backend/base/model/landing_page.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/model/locale.js b/themes/Backend/ExtJs/backend/base/model/locale.js
index 00faaa20db4..4e9a9355eba 100644
--- a/themes/Backend/ExtJs/backend/base/model/locale.js
+++ b/themes/Backend/ExtJs/backend/base/model/locale.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/model/media.js b/themes/Backend/ExtJs/backend/base/model/media.js
index 7b7fbcdab8b..edea8ac2f0e 100644
--- a/themes/Backend/ExtJs/backend/base/model/media.js
+++ b/themes/Backend/ExtJs/backend/base/model/media.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/model/order_status.js b/themes/Backend/ExtJs/backend/base/model/order_status.js
index b67e3dc8f03..e9df61b6ecc 100644
--- a/themes/Backend/ExtJs/backend/base/model/order_status.js
+++ b/themes/Backend/ExtJs/backend/base/model/order_status.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/model/page_not_found_destination_options.js b/themes/Backend/ExtJs/backend/base/model/page_not_found_destination_options.js
index 550afd22aa5..ae78d2b10ba 100644
--- a/themes/Backend/ExtJs/backend/base/model/page_not_found_destination_options.js
+++ b/themes/Backend/ExtJs/backend/base/model/page_not_found_destination_options.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @version    $Id$
diff --git a/themes/Backend/ExtJs/backend/base/model/password_encoder.js b/themes/Backend/ExtJs/backend/base/model/password_encoder.js
index 08985c1554a..f9758f32dfa 100644
--- a/themes/Backend/ExtJs/backend/base/model/password_encoder.js
+++ b/themes/Backend/ExtJs/backend/base/model/password_encoder.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/model/payment.js b/themes/Backend/ExtJs/backend/base/model/payment.js
index 2ff882f0893..ee8250c3329 100644
--- a/themes/Backend/ExtJs/backend/base/model/payment.js
+++ b/themes/Backend/ExtJs/backend/base/model/payment.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/model/payment_status.js b/themes/Backend/ExtJs/backend/base/model/payment_status.js
index 74701422cbc..dbaf1ba9bf4 100644
--- a/themes/Backend/ExtJs/backend/base/model/payment_status.js
+++ b/themes/Backend/ExtJs/backend/base/model/payment_status.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/model/position_status.js b/themes/Backend/ExtJs/backend/base/model/position_status.js
index 2fd5fee3b3f..3d093d72e98 100644
--- a/themes/Backend/ExtJs/backend/base/model/position_status.js
+++ b/themes/Backend/ExtJs/backend/base/model/position_status.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/base/model/product_box_layout.js b/themes/Backend/ExtJs/backend/base/model/product_box_layout.js
index acbb13cdbf0..b2a289d24f9 100644
--- a/themes/Backend/ExtJs/backend/base/model/product_box_layout.js
+++ b/themes/Backend/ExtJs/backend/base/model/product_box_layout.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
@@ -51,7 +50,7 @@ Ext.define('Shopware.apps.Base.model.ProductBoxLayout', {
      * @array
      */
     fields: [
-        //{block name="backend/base/model/product_box_layout"}{/block}
+        //{block name="backend/base/model/product_box_layout/fields"}{/block}
         { name: 'key', type: 'string' },
         { name: 'label', type: 'string' },
         { name: 'description', type: 'string' },
diff --git a/themes/Backend/ExtJs/backend/base/model/shop.js b/themes/Backend/ExtJs/backend/base/model/shop.js
index 9718bc6faf2..3e75cfc2b41 100644
--- a/themes/Backend/ExtJs/backend/base/model/shop.js
+++ b/themes/Backend/ExtJs/backend/base/model/shop.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/model/static.js b/themes/Backend/ExtJs/backend/base/model/static.js
index 363dac1f170..1b35109a906 100644
--- a/themes/Backend/ExtJs/backend/base/model/static.js
+++ b/themes/Backend/ExtJs/backend/base/model/static.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/model/supplier.js b/themes/Backend/ExtJs/backend/base/model/supplier.js
index e4210584f66..745d9424dab 100644
--- a/themes/Backend/ExtJs/backend/base/model/supplier.js
+++ b/themes/Backend/ExtJs/backend/base/model/supplier.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/model/tax.js b/themes/Backend/ExtJs/backend/base/model/tax.js
index d85bccbf3b2..fb407b15e47 100644
--- a/themes/Backend/ExtJs/backend/base/model/tax.js
+++ b/themes/Backend/ExtJs/backend/base/model/tax.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/model/template.js b/themes/Backend/ExtJs/backend/base/model/template.js
index e12692b149d..f5acbb1c7d4 100644
--- a/themes/Backend/ExtJs/backend/base/model/template.js
+++ b/themes/Backend/ExtJs/backend/base/model/template.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/model/user.js b/themes/Backend/ExtJs/backend/base/model/user.js
index fc560b36f46..567fdcfb679 100644
--- a/themes/Backend/ExtJs/backend/base/model/user.js
+++ b/themes/Backend/ExtJs/backend/base/model/user.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/model/value.js b/themes/Backend/ExtJs/backend/base/model/value.js
index 8fc1e5be0b7..8db58f32983 100644
--- a/themes/Backend/ExtJs/backend/base/model/value.js
+++ b/themes/Backend/ExtJs/backend/base/model/value.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Base
diff --git a/themes/Backend/ExtJs/backend/base/model/variant.js b/themes/Backend/ExtJs/backend/base/model/variant.js
index e953b3aabae..6863f73041a 100644
--- a/themes/Backend/ExtJs/backend/base/model/variant.js
+++ b/themes/Backend/ExtJs/backend/base/model/variant.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
@@ -54,6 +53,7 @@ Ext.define('Shopware.apps.Base.model.Variant', {
         { name: 'ordernumber', type: 'string' },
         { name: 'inStock', type: 'string' },
         { name: 'active', type: 'int' },
+        { name: 'price', type: 'float' },
 
         //mapping fields for ExtJS
         { name: 'number', type: 'string', mapping: 'ordernumber' },
diff --git a/themes/Backend/ExtJs/backend/base/store/article.js b/themes/Backend/ExtJs/backend/base/store/article.js
index 92625e69eae..acee55a3b81 100644
--- a/themes/Backend/ExtJs/backend/base/store/article.js
+++ b/themes/Backend/ExtJs/backend/base/store/article.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/store/blog.js b/themes/Backend/ExtJs/backend/base/store/blog.js
index e93d39c051b..52deb25ee46 100644
--- a/themes/Backend/ExtJs/backend/base/store/blog.js
+++ b/themes/Backend/ExtJs/backend/base/store/blog.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/store/captcha.js b/themes/Backend/ExtJs/backend/base/store/captcha.js
index 601905f6813..e659f9a55d6 100644
--- a/themes/Backend/ExtJs/backend/base/store/captcha.js
+++ b/themes/Backend/ExtJs/backend/base/store/captcha.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/store/category.js b/themes/Backend/ExtJs/backend/base/store/category.js
index 340622e2900..c76b4ded2cf 100644
--- a/themes/Backend/ExtJs/backend/base/store/category.js
+++ b/themes/Backend/ExtJs/backend/base/store/category.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/store/category_tree.js b/themes/Backend/ExtJs/backend/base/store/category_tree.js
index e12513213c1..564a3db7d23 100644
--- a/themes/Backend/ExtJs/backend/base/store/category_tree.js
+++ b/themes/Backend/ExtJs/backend/base/store/category_tree.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/store/cookie_mode.js b/themes/Backend/ExtJs/backend/base/store/cookie_mode.js
index 7a0585e3851..72e6a20b99e 100644
--- a/themes/Backend/ExtJs/backend/base/store/cookie_mode.js
+++ b/themes/Backend/ExtJs/backend/base/store/cookie_mode.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/store/corner_position.js b/themes/Backend/ExtJs/backend/base/store/corner_position.js
index 09abe30225e..857b3c23399 100644
--- a/themes/Backend/ExtJs/backend/base/store/corner_position.js
+++ b/themes/Backend/ExtJs/backend/base/store/corner_position.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/store/country.js b/themes/Backend/ExtJs/backend/base/store/country.js
index 0d579d9e1aa..89c63a1841c 100644
--- a/themes/Backend/ExtJs/backend/base/store/country.js
+++ b/themes/Backend/ExtJs/backend/base/store/country.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/store/country_area.js b/themes/Backend/ExtJs/backend/base/store/country_area.js
index 8ccdfe5fd39..dd037a4b9a7 100644
--- a/themes/Backend/ExtJs/backend/base/store/country_area.js
+++ b/themes/Backend/ExtJs/backend/base/store/country_area.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/store/country_state.js b/themes/Backend/ExtJs/backend/base/store/country_state.js
index 3425ae30917..7ff0941de9d 100644
--- a/themes/Backend/ExtJs/backend/base/store/country_state.js
+++ b/themes/Backend/ExtJs/backend/base/store/country_state.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/store/currency.js b/themes/Backend/ExtJs/backend/base/store/currency.js
index 755dfa88f6f..0428c5c30a5 100644
--- a/themes/Backend/ExtJs/backend/base/store/currency.js
+++ b/themes/Backend/ExtJs/backend/base/store/currency.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/store/custom_facet.js b/themes/Backend/ExtJs/backend/base/store/custom_facet.js
index 6604c785b18..fcc991a0b18 100644
--- a/themes/Backend/ExtJs/backend/base/store/custom_facet.js
+++ b/themes/Backend/ExtJs/backend/base/store/custom_facet.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="backend/base/store/custom_facet"}
diff --git a/themes/Backend/ExtJs/backend/base/store/custom_sorting.js b/themes/Backend/ExtJs/backend/base/store/custom_sorting.js
index 5997622094e..cd58b72778e 100755
--- a/themes/Backend/ExtJs/backend/base/store/custom_sorting.js
+++ b/themes/Backend/ExtJs/backend/base/store/custom_sorting.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="backend/base/store/custom_sorting"}
diff --git a/themes/Backend/ExtJs/backend/base/store/customer_group.js b/themes/Backend/ExtJs/backend/base/store/customer_group.js
index efd251f1424..c4e357aa643 100644
--- a/themes/Backend/ExtJs/backend/base/store/customer_group.js
+++ b/themes/Backend/ExtJs/backend/base/store/customer_group.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/store/dispatch.js b/themes/Backend/ExtJs/backend/base/store/dispatch.js
index 22f3414bdac..85c89d064d6 100644
--- a/themes/Backend/ExtJs/backend/base/store/dispatch.js
+++ b/themes/Backend/ExtJs/backend/base/store/dispatch.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/store/doc_type.js b/themes/Backend/ExtJs/backend/base/store/doc_type.js
index 58a3792a060..64cf5c57656 100644
--- a/themes/Backend/ExtJs/backend/base/store/doc_type.js
+++ b/themes/Backend/ExtJs/backend/base/store/doc_type.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/store/form.js b/themes/Backend/ExtJs/backend/base/store/form.js
index f1cb8cf6b7a..d9100133987 100644
--- a/themes/Backend/ExtJs/backend/base/store/form.js
+++ b/themes/Backend/ExtJs/backend/base/store/form.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Base
diff --git a/themes/Backend/ExtJs/backend/base/store/landing_page.js b/themes/Backend/ExtJs/backend/base/store/landing_page.js
index 383acaa2953..4b8f89ff3ce 100644
--- a/themes/Backend/ExtJs/backend/base/store/landing_page.js
+++ b/themes/Backend/ExtJs/backend/base/store/landing_page.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/store/listing_filter_mode.js b/themes/Backend/ExtJs/backend/base/store/listing_filter_mode.js
index 0135c5f5d2d..17d825b518e 100644
--- a/themes/Backend/ExtJs/backend/base/store/listing_filter_mode.js
+++ b/themes/Backend/ExtJs/backend/base/store/listing_filter_mode.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/store/locale.js b/themes/Backend/ExtJs/backend/base/store/locale.js
index 94f5285b660..65be2c19cdd 100644
--- a/themes/Backend/ExtJs/backend/base/store/locale.js
+++ b/themes/Backend/ExtJs/backend/base/store/locale.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/store/order_status.js b/themes/Backend/ExtJs/backend/base/store/order_status.js
index 75bb28c7349..6d0e8a1fc0c 100644
--- a/themes/Backend/ExtJs/backend/base/store/order_status.js
+++ b/themes/Backend/ExtJs/backend/base/store/order_status.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/store/page_not_found_destination_options.js b/themes/Backend/ExtJs/backend/base/store/page_not_found_destination_options.js
index 36f25eff98a..1812aace523 100644
--- a/themes/Backend/ExtJs/backend/base/store/page_not_found_destination_options.js
+++ b/themes/Backend/ExtJs/backend/base/store/page_not_found_destination_options.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @version    $Id$
diff --git a/themes/Backend/ExtJs/backend/base/store/password_encoder.js b/themes/Backend/ExtJs/backend/base/store/password_encoder.js
index 714169a1411..440741ad38b 100644
--- a/themes/Backend/ExtJs/backend/base/store/password_encoder.js
+++ b/themes/Backend/ExtJs/backend/base/store/password_encoder.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/store/payment.js b/themes/Backend/ExtJs/backend/base/store/payment.js
index 0a2afda9481..6a39e5dc79a 100644
--- a/themes/Backend/ExtJs/backend/base/store/payment.js
+++ b/themes/Backend/ExtJs/backend/base/store/payment.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/store/payment_status.js b/themes/Backend/ExtJs/backend/base/store/payment_status.js
index cd8eadabb1b..ffb3e5d920d 100644
--- a/themes/Backend/ExtJs/backend/base/store/payment_status.js
+++ b/themes/Backend/ExtJs/backend/base/store/payment_status.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/store/position_status.js b/themes/Backend/ExtJs/backend/base/store/position_status.js
index 297ae6b65c8..5b2eb8ffcb9 100644
--- a/themes/Backend/ExtJs/backend/base/store/position_status.js
+++ b/themes/Backend/ExtJs/backend/base/store/position_status.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/base/store/product_box_layout.js b/themes/Backend/ExtJs/backend/base/store/product_box_layout.js
index a536a93b14a..b30ad4373da 100644
--- a/themes/Backend/ExtJs/backend/base/store/product_box_layout.js
+++ b/themes/Backend/ExtJs/backend/base/store/product_box_layout.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/store/salutation.js b/themes/Backend/ExtJs/backend/base/store/salutation.js
index 1e7dd1c91f5..9099c6c364b 100644
--- a/themes/Backend/ExtJs/backend/base/store/salutation.js
+++ b/themes/Backend/ExtJs/backend/base/store/salutation.js
@@ -3,23 +3,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/store/shop.js b/themes/Backend/ExtJs/backend/base/store/shop.js
index 2f2a6e909b8..4412e4bd4d4 100644
--- a/themes/Backend/ExtJs/backend/base/store/shop.js
+++ b/themes/Backend/ExtJs/backend/base/store/shop.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/store/shop_language.js b/themes/Backend/ExtJs/backend/base/store/shop_language.js
index 12536eed435..efa3e7db982 100644
--- a/themes/Backend/ExtJs/backend/base/store/shop_language.js
+++ b/themes/Backend/ExtJs/backend/base/store/shop_language.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/store/static.js b/themes/Backend/ExtJs/backend/base/store/static.js
index 6ad85d162cb..51123ca1c56 100644
--- a/themes/Backend/ExtJs/backend/base/store/static.js
+++ b/themes/Backend/ExtJs/backend/base/store/static.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/store/supplier.js b/themes/Backend/ExtJs/backend/base/store/supplier.js
index 9fc7552fde1..003e5344ad2 100644
--- a/themes/Backend/ExtJs/backend/base/store/supplier.js
+++ b/themes/Backend/ExtJs/backend/base/store/supplier.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/store/tax.js b/themes/Backend/ExtJs/backend/base/store/tax.js
index fd6c20da35e..24df19589db 100644
--- a/themes/Backend/ExtJs/backend/base/store/tax.js
+++ b/themes/Backend/ExtJs/backend/base/store/tax.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/store/template.js b/themes/Backend/ExtJs/backend/base/store/template.js
index 4c0e53df2d2..c6f8b36b0a9 100644
--- a/themes/Backend/ExtJs/backend/base/store/template.js
+++ b/themes/Backend/ExtJs/backend/base/store/template.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/store/translation.js b/themes/Backend/ExtJs/backend/base/store/translation.js
index 23f6103f6be..358c747359e 100644
--- a/themes/Backend/ExtJs/backend/base/store/translation.js
+++ b/themes/Backend/ExtJs/backend/base/store/translation.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/store/user.js b/themes/Backend/ExtJs/backend/base/store/user.js
index ddade5f6876..a3609696152 100644
--- a/themes/Backend/ExtJs/backend/base/store/user.js
+++ b/themes/Backend/ExtJs/backend/base/store/user.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/base/store/variant.js b/themes/Backend/ExtJs/backend/base/store/variant.js
index d719a0effd6..e7e5631f156 100644
--- a/themes/Backend/ExtJs/backend/base/store/variant.js
+++ b/themes/Backend/ExtJs/backend/base/store/variant.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/benchmark/app.js b/themes/Backend/ExtJs/backend/benchmark/app.js
deleted file mode 100644
index 88d4176bf79..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/app.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-//{namespace name="backend/benchmark/main"}
-//{block name="backend/benchmark/app"}
-Ext.define('Shopware.apps.Benchmark', {
-    name: 'Shopware.apps.Benchmark',
-    extend: 'Enlight.app.SubApplication',
-    bulkLoad: true,
-    loadPath: '{url action=load}',
-
-    views: ['overview.Window', 'settings.Window', 'settings.IndustryField', 'settings.IndustryWindow'],
-    models: [ 'ShopConfig' ],
-    stores: [ 'Industry', 'ShopConfigs' ],
-
-    controllers: [ 'Main', 'Settings' ],
-
-    launch: function() {
-        var me = this,
-            mainController = me.getController('Main');
-
-        return mainController.mainWindow;
-    }
-});
-//{/block}
diff --git a/themes/Backend/ExtJs/backend/benchmark/controller/main.js b/themes/Backend/ExtJs/backend/benchmark/controller/main.js
deleted file mode 100644
index a61c5f6253f..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/controller/main.js
+++ /dev/null
@@ -1,67 +0,0 @@
-
-//{block name="backend/benchmark/controller/main"}
-Ext.define('Shopware.apps.Benchmark.controller.Main', {
-    extend: 'Ext.app.Controller',
-
-    refs: [
-        { ref: 'settingsPanel', selector: 'form[name=benchmark-settings-panel]' }
-    ],
-
-    init: function () {
-        var me = this,
-            windowName = 'overview.Window',
-            params = {};
-
-        me.control({
-            'benchmark-overview-window': {
-                'beforeclose': me.onBeforeCloseOverviewWindow
-            }
-        });
-
-        if (me.subApplication.params) {
-            if (me.subApplication.params.isTeaser) {
-                params = {
-                    isTeaser: true,
-                    height: 700
-                };
-            }
-
-            if (me.subApplication.params.shopId) {
-                params = {
-                    shopId: me.subApplication.params.shopId
-                };
-            }
-        }
-
-        if (this.subApplication.action === 'Settings') {
-            windowName = 'settings.Window';
-            params = {};
-        }
-
-        me.mainWindow = me.getView(windowName).create(params).show();
-
-        window.addEventListener('message', function (msg) {
-            if (msg.data === 'closeWindow') {
-                me.mainWindow.destroy();
-            }
-        }, false);
-
-        me.callParent(arguments);
-    },
-
-    /**
-     * @param { Ext.window.Window } win
-     */
-    onBeforeCloseOverviewWindow: function (win) {
-        /*{if {acl_is_allowed privilege=manage}}*/
-        var el =  win.down('#disableBenchmarkTeaser');
-
-        if (el && el.getValue()) {
-            Ext.Ajax.request({
-                url: '{url controller=Benchmark action=disableBenchmarkTeaser}'
-            });
-        }
-        /*{/if}*/
-    }
-});
-//{/block}
diff --git a/themes/Backend/ExtJs/backend/benchmark/controller/settings.js b/themes/Backend/ExtJs/backend/benchmark/controller/settings.js
deleted file mode 100644
index 23de5005fb7..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/controller/settings.js
+++ /dev/null
@@ -1,229 +0,0 @@
-
-//{namespace name="backend/benchmark/main"}
-//{block name="backend/benchmark/controller/settings"}
-Ext.define('Shopware.apps.Benchmark.controller.Settings', {
-    extend: 'Ext.app.Controller',
-
-    refs: [
-        { ref: 'settingsPanel', selector: 'form[name=benchmark-settings-panel]' },
-        { ref: 'activationContainer', selector: 'container[name=activationContainer]' },
-        { ref: 'deActivationContainer', selector: 'container[name=deActivationContainer]' },
-        { ref: 'industryField', selector: 'industryfield[name=industry]' },
-        { ref: 'shopSelection', selector: 'combo[name=shopSelection]' },
-        { ref: 'typeRadios', selector: 'radiogroup[name=typeRadios]' },
-        { ref: 'typeFieldSet', selector: 'fieldset[name=typeFieldSet]' },
-    ],
-
-    init: function () {
-        this.control({
-            'benchmark-settings-window': {
-                shopConfigLoaded: this.onShopConfigsLoaded,
-                configSelected: this.onConfigSelect,
-                activateBenchmark: this.activateBenchmark,
-                deactivateBenchmark: this.deactivateBenchmark,
-                saveType: this.onSaveType
-            },
-            'industryfield': {
-                changeIndustry: this.onChangeIndustry
-            },
-            'benchmark-settings-industry-window': {
-                saveIndustry: this.onSaveIndustry
-            }
-        });
-
-        this.callParent(arguments);
-    },
-
-    /**
-     * @param { Shopware.apps.Benchmark.store.ShopConfigs } store
-     * @param { Ext.form.field.ComboBox } comboBox
-     */
-    onShopConfigsLoaded: function (store, comboBox) {
-        var firstRecord = store.first();
-
-        comboBox.select(firstRecord);
-        comboBox.fireEvent('select', comboBox, [firstRecord]);
-    },
-
-    /**
-     * @param { Shopware.apps.Benchmark.view.settings.Window } settingsWin
-     * @param { Ext.form.field.ComboBox } combo
-     * @param { Shopware.apps.Benchmark.model.ShopConfig } record
-     */
-    onConfigSelect: function (settingsWin, combo, record) {
-        this.getSettingsPanel().loadSettingsRecord(record);
-    },
-
-    onChangeIndustry: function () {
-        this.getView('settings.IndustryWindow').create().show();
-    },
-
-    /**
-     * @param { Shopware.apps.Benchmark.view.settings.IndustryWindow } win
-     * @param { integer } val
-     * @param { Function } callback
-     */
-    onSaveIndustry: function (win, val, callback) {
-        var me = this;
-
-        Ext.Ajax.request({
-            url: '{url controller=Benchmark action=saveIndustry}',
-            params: {
-                industry: val,
-                shopId: me.getShopSelection().getValue()
-            },
-            success: function (response) {
-                var responseData = Ext.decode(response.responseText);
-
-                win.destroy();
-                me.getIndustryField().setValue(val);
-                me.getSettingsPanel().getRecord().set('industry', val);
-
-                if (responseData.success) {
-                    Shopware.Notification.createGrowlMessage(
-                        '{s name="growlMessage/industry_window/success/title"}Save successful{/s}',
-                        '{s name="growlMessage/industry_window/success/message"}The chosen industry was saved successfully{/s}',
-                        'BenchmarkIndustryWindow'
-                    );
-
-                    callback();
-
-                    return;
-                }
-
-                Shopware.Notification.createGrowlMessage(
-                    '{s name="growlMessage/industry_window/error/title"}Error saving the industry{/s}',
-                    responseData.message,
-                    'BenchmarkIndustryWindow'
-                );
-            }
-        });
-    },
-
-    activateBenchmark: function () {
-        var me = this,
-            record = this.getSettingsPanel().getRecord();
-
-        if (record.get('industry') === 0) {
-            this.getView('settings.IndustryWindow').create({
-                additionalText: '{s name="settings/industry_window/choose_industry"}Please choose an industry first:{/s}',
-                customCallback: function () {
-                    me.sendBenchmarkActiveStatus(1, {
-                        successTitle: '{s name="growlMessage/activation/success/title"}Success{/s}',
-                        successMessage: '{s name="growlMessage/activation/success/message"}You\'re now participating{/s}',
-                        errorTitle: '{s name="growlMessage/activation/error/title"}Error{/s}',
-                        confirmationTitle: '{s name="growlMessage/activation/confirmation/title"}Participate{/s}',
-                        confirmationMessage: '{s name="growlMessage/activation/confirmation/message"}Do you really wish to participate?{/s}'
-                    })
-                }
-            }).show();
-
-            return;
-        }
-
-        this.sendBenchmarkActiveStatus(1, {
-            successTitle: '{s name="growlMessage/activation/success/title"}Success{/s}',
-            successMessage: '{s name="growlMessage/activation/success/message"}You\'re now participating{/s}',
-            errorTitle: '{s name="growlMessage/activation/error/title"}Error{/s}',
-            confirmationTitle: '{s name="growlMessage/activation/confirmation/title"}Participate{/s}',
-            confirmationMessage: '{s name="growlMessage/activation/confirmation/message"}Do you really wish to participate?{/s}'
-        });
-    },
-
-    deactivateBenchmark: function () {
-        this.sendBenchmarkActiveStatus(0, {
-            successTitle: '{s name="growlMessage/deactivation/success/title"}Success{/s}',
-            successMessage: '{s name="growlMessage/deactivation/success/message"}You\'re not participating any more{/s}',
-            errorTitle: '{s name="growlMessage/deactivation/error/title"}Error{/s}',
-            confirmationTitle: '{s name="growlMessage/deactivation/confirmation/title"}Signing off{/s}',
-            confirmationMessage: '{s name="growlMessage/deactivation/confirmation/message"}Do you really wish to stop the service?{/s}'
-        });
-    },
-
-    /**
-     * @param { integer } active
-     * @param { Object } snippets
-     */
-    sendBenchmarkActiveStatus: function (active, snippets) {
-        var me = this;
-
-        Ext.MessageBox.confirm(snippets.confirmationTitle, snippets.confirmationMessage, function (response) {
-            if (response !== 'yes') {
-                return false;
-            }
-
-            Ext.Ajax.request({
-                url: '{url controller=Benchmark action=setActive}',
-                params: {
-                    active: active,
-                    shopId: me.getShopSelection().getValue()
-                },
-                success: function (response) {
-                    var responseData = Ext.decode(response.responseText);
-
-                    if (responseData.success) {
-                        Shopware.Notification.createGrowlMessage(
-                            snippets.successTitle,
-                            snippets.successMessage,
-                            'BenchmarkSettings'
-                        );
-
-                        me.getActivationContainer()[active ? 'hide' : 'show']();
-                        me.getDeActivationContainer()[active ? 'show' : 'hide']();
-                        me.getShopSelection().getStore().load();
-
-                        return;
-                    }
-
-                    Shopware.Notification.createGrowlMessage(
-                        snippets.errorTitle,
-                        responseData.message,
-                        'BenchmarkSettings'
-                    );
-                }
-            });
-        });
-    },
-
-    onSaveType: function () {
-        var me = this,
-            radios = this.getTypeRadios(),
-            values = radios.getValue(),
-            selectedValue = values.type,
-            typeFieldSet = me.getTypeFieldSet();
-
-        typeFieldSet.setLoading(true);
-
-        Ext.Ajax.request({
-            url: '{url controller=Benchmark action=saveType}',
-            params: {
-                type: selectedValue,
-                shopId: me.getShopSelection().getValue()
-            },
-            success: function (response) {
-                var responseData = Ext.decode(response.responseText);
-
-                typeFieldSet.setLoading(false);
-
-                if (responseData.success) {
-                    Shopware.Notification.createGrowlMessage(
-                        '{s name="growlMessage/type/success/title"}Save successful{/s}',
-                        '{s name="growlMessage/type/success/message"}The business plan was successfully saved{/s}',
-                        'BenchmarkSettings'
-                    );
-
-                    me.getShopSelection().getStore().load();
-
-                    return;
-                }
-
-                Shopware.Notification.createGrowlMessage(
-                    '{s name="growlMessage/type/error/title"}Error{/s}',
-                    responseData.message,
-                    'BenchmarkSettings'
-                );
-            }
-        });
-    }
-});
-//{/block}
diff --git a/themes/Backend/ExtJs/backend/benchmark/model/shop_config.js b/themes/Backend/ExtJs/backend/benchmark/model/shop_config.js
deleted file mode 100644
index e4ca4259ef5..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/model/shop_config.js
+++ /dev/null
@@ -1,23 +0,0 @@
-//{namespace name="backend/benchmark/categories"}
-//{block name="backend/benchmark/model/shop_config"}
-Ext.define('Shopware.apps.Benchmark.model.ShopConfig', {
-    extend: 'Ext.data.Model',
-
-    fields: [
-        //{block name="backend/benchmark/model/shop_config/fields"}{/block}
-        { name: 'id', type: 'int' },
-        { name: 'shopId', type: 'int' },
-        { name: 'shopName', type: 'string' },
-        { name: 'active', type: 'boolean' },
-        { name: 'lastSent', type: 'date', dateFormat: 'd.m.Y H:i:s' },
-        { name: 'lastReceived', type: 'date', dateFormat: 'd.m.Y H:i:s' },
-        { name: 'lastOrderId', type: 'int' },
-        { name: 'lastCustomerId', type: 'int' },
-        { name: 'lastProductId', type: 'int' },
-        { name: 'batchSize', type: 'int' },
-        { name: 'industry', type: 'int' },
-        { name: 'type', type: 'string' },
-        { name: 'responseToken', type: 'string', useNull: true }
-    ],
-});
-//{/block}
diff --git a/themes/Backend/ExtJs/backend/benchmark/store/industry.js b/themes/Backend/ExtJs/backend/benchmark/store/industry.js
deleted file mode 100644
index 35f0d981982..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/store/industry.js
+++ /dev/null
@@ -1,37 +0,0 @@
-//{namespace name="backend/benchmark/categories"}
-//{block name="backend/benchmark/store/industry"}
-Ext.define('Shopware.apps.Benchmark.store.Industry', {
-    extend: 'Ext.data.Store',
-    autoLoad: false,
-
-    fields: [
-        { name: 'id', type: 'int' },
-        { name: 'name', type: 'string' }
-    ],
-
-    data: [
-        { id: 0, name: '{s name="none_selected"}None selected yet{/s}' },
-        { id: 1, name: '{s name="animals_pet_supplies"}Animals & Pet Supplies{/s}' },
-        { id: 2, name: '{s name="apparel_Accessories"}Apparel & Accessories{/s}' },
-        { id: 3, name: '{s name="arts_entertainment"}Arts & Entertainment{/s}' },
-        { id: 4, name: '{s name="baby_toddler"}Baby & Toddler{/s}' },
-        { id: 5, name: '{s name="business_industrial"}Business & Industrial{/s}' },
-        { id: 6, name: '{s name="cameras_optics"}Cameras & Optics{/s}' },
-        { id: 7, name: '{s name="electronics"}Electronics{/s}' },
-        { id: 8, name: '{s name="food_beverages_tobacco"}Food, Beverages & Tobacco{/s}' },
-        { id: 9, name: '{s name="furniture"}Furniture{/s}' },
-        { id: 10, name: '{s name="hardware"}Hardware{/s}' },
-        { id: 11, name: '{s name="health_beauty"}Health & Beauty{/s}' },
-        { id: 12, name: '{s name="home_garden"}Home & Garden{/s}' },
-        { id: 13, name: '{s name="luggage_bags"}Luggage & Bags{/s}' },
-        { id: 14, name: '{s name="mature"}Mature{/s}' },
-        { id: 15, name: '{s name="media"}Media{/s}' },
-        { id: 16, name: '{s name="office_supplies"}Office Supplies{/s}' },
-        { id: 17, name: '{s name="religious_ceremonial"}Religious & Ceremonial{/s}' },
-        { id: 18, name: '{s name="software"}Software{/s}' },
-        { id: 19, name: '{s name="sporting_goods"}Sporting Goods{/s}' },
-        { id: 20, name: '{s name="toys_games"}Toys & Games{/s}' },
-        { id: 21, name: '{s name="vehicles_parts"}Vehicles & Parts{/s}' }
-    ]
-});
-//{/block}
diff --git a/themes/Backend/ExtJs/backend/benchmark/store/shop_configs.js b/themes/Backend/ExtJs/backend/benchmark/store/shop_configs.js
deleted file mode 100644
index f7c528e0857..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/store/shop_configs.js
+++ /dev/null
@@ -1,17 +0,0 @@
-//{namespace name="backend/benchmark/categories"}
-//{block name="backend/benchmark/store/shop_configs"}
-Ext.define('Shopware.apps.Benchmark.store.ShopConfigs', {
-    extend: 'Ext.data.Store',
-    autoLoad: false,
-    model: 'Shopware.apps.Benchmark.model.ShopConfig',
-
-    proxy: {
-        type: 'ajax',
-        url: '{url action=getShopConfigs}',
-        reader: {
-            type: 'json',
-            root: 'data'
-        }
-    },
-});
-//{/block}
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/all.css b/themes/Backend/ExtJs/backend/benchmark/template/local/all.css
deleted file mode 100644
index f3b996016a5..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/all.css
+++ /dev/null
@@ -1,1658 +0,0 @@
-.loading-wrapper {
-  background-color: #213448;
-  position: fixed;
-  top: 0;
-  bottom: 0;
-  right: 0;
-  left: 0;
-  border-radius: 3px;
-  z-index: 10000;
-}
-.loading-wrapper .oval-one {
-  position: absolute;
-  left: -180px;
-  bottom: -100px;
-  background: rgba(149, 210, 255, 0.09);
-  border-radius: 100%;
-  height: 430px;
-  width: 430px;
-}
-.loading-wrapper .oval-two {
-  position: absolute;
-  right: 50px;
-  top: -130px;
-  background: rgba(149, 210, 255, 0.05);
-  border-radius: 100%;
-  height: 230px;
-  width: 230px;
-}
-.loading-wrapper .loading-text {
-  display: block;
-  position: absolute;
-  top: calc(45% - 11px);
-  left: calc(50% - 48px);
-  color: #798EA3;
-  width: 100px;
-  height: 30px;
-  text-align: center;
-  font-weight: 600;
-  font-size: 20px;
-}
-.loading-wrapper .loading-content {
-  display: block;
-  position: relative;
-  left: calc(50% - 85px);
-  top: calc(45% - 85px);
-  width: 170px;
-  height: 170px;
-  border: 5px solid transparent;
-  border-top-color: #6A63FC;
-  border-bottom-color: #6A63FC;
-  border-radius: 50%;
-  -webkit-animation: loader 2s linear infinite;
-  -moz-animation: loader 2s linear infinite;
-  -o-animation: loader 2s linear infinite;
-  animation: loader 2s linear infinite;
-}
-.loading-wrapper .loading-content::before {
-  content: "";
-  position: absolute;
-  left: 5px;
-  right: 5px;
-  top: 5px;
-  bottom: 5px;
-  border: 5px solid transparent;
-  border-top-color: #34DCDD;
-  border-bottom-color: #34DCDD;
-  border-radius: 50%;
-  -webkit-animation: loader 3s linear infinite;
-  -moz-animation: loader 2s linear infinite;
-  -o-animation: loader 2s linear infinite;
-  animation: loader 3s linear infinite;
-}
-.loading-wrapper .loading-content::after {
-  content: "";
-  position: absolute;
-  left: 15px;
-  right: 15px;
-  top: 15px;
-  bottom: 15px;
-  border: 5px solid transparent;
-  border-top-color: #189EFF;
-  border-bottom-color: #189EFF;
-  border-radius: 50%;
-  -webkit-animation: loader 1.5s linear infinite;
-  animation: loader 1.5s linear infinite;
-  -moz-animation: loader 2s linear infinite;
-  -o-animation: loader 2s linear infinite;
-}
-@-webkit-keyframes loaders {
-  0% {
-    -webkit-transform: rotate(0deg);
-    -ms-transform: rotate(0deg);
-    transform: rotate(0deg);
-  }
-  100% {
-    -webkit-transform: rotate(360deg);
-    -ms-transform: rotate(360deg);
-    transform: rotate(360deg);
-  }
-}
-@keyframes loader {
-  0% {
-    -webkit-transform: rotate(0deg);
-    -ms-transform: rotate(0deg);
-    transform: rotate(0deg);
-  }
-  100% {
-    -webkit-transform: rotate(360deg);
-    -ms-transform: rotate(360deg);
-    transform: rotate(360deg);
-  }
-}
-.tob-bar {
-  max-width: 800px;
-  margin: 25px auto 15px auto;
-}
-ul.top-benefits {
-  margin-bottom: 20px;
-}
-ul.top-benefits li {
-  float: left;
-  width: 33%;
-  color: #FFFFFF;
-  font-size: 18px;
-  text-align: center;
-  font-weight: 500;
-}
-ul.top-benefits li:before {
-  content: '';
-  display: inline-block;
-  height: 16px;
-  width: 16px;
-  background-image: url(img/check.svg);
-  background-size: contain;
-  background-repeat: no-repeat;
-  padding-left: 10px;
-}
-.info--text ul.top-benefits li {
-  float: none;
-  font-weight: 600;
-  font-size: 15px;
-  color: #213448;
-  text-align: left;
-  width: 100%;
-  margin: 10px 0 0 0;
-  list-style-position: outside;
-}
-.info--text ul.top-benefits li:before {
-  height: 11px;
-  width: 11px;
-  margin-right: 5px;
-}
-.preview-screen {
-  background: url(img/preview-screen.png) center top no-repeat;
-  background-size: contain;
-  height: 550px;
-  width: 80%;
-  margin: 0 auto;
-  margin-top: 3%;
-}
-.funny-graph {
-  position: absolute;
-  top: -200px;
-  background: url(img/funny-graph.svg) center bottom no-repeat;
-  width: 100%;
-  height: 200px;
-  background-size: 100%;
-  left: 0;
-}
-.teaser-text {
-  position: absolute;
-  bottom: 0;
-  color: #798EA3;
-  background-color: #FFF;
-  width: 100%;
-  min-height: 33%;
-  padding: 4%;
-}
-.teaser-text h1 {
-  color: #213448;
-  font-size: 33px;
-}
-.teaser-text .btn {
-  margin-top: 30px;
-  margin-bottom: 30px;
-}
-.wrapper-info {
-  background-color: #FFF;
-  width: 100%;
-}
-.info--text {
-  color: #798EA3;
-  text-align: left;
-  display: inline-block;
-  font-weight: 300;
-  font-size: 14px;
-  margin-top: 20px;
-  padding: 0 10px 0 10px;
-  width: 100%;
-}
-.info--text h1 {
-  color: #213448;
-  font-size: 33px;
-  text-align: center;
-  margin-bottom: 10px;
-}
-.info--text h2 {
-  color: #213448;
-  font-size: 18px;
-  font-weight: 600;
-  text-align: left;
-  margin: 8px 0 5px 0;
-  padding: 0;
-}
-.info--text h2 .check-color {
-  color: #50E3C2;
-  font-size: 26px;
-}
-.info--text .confirmation-label {
-  font-weight: 500;
-  font-size: 16px;
-}
-.accept-abg {
-  width: 100%;
-  display: inline-block;
-  text-align: center;
-  margin-top: 5px;
-}
-input[type=checkbox] {
-  transform: scale(1.2);
-  margin-right: 10px;
-  height: 13px;
-}
-div#select-wrapper {
-  position: relative;
-  z-index: 1;
-  padding-top: 10%;
-}
-div#select-wrapper button.btn {
-  background: none;
-}
-.bubble-one {
-  position: fixed;
-  left: -180px;
-  bottom: -100px;
-  height: 450px;
-  width: 450px;
-  border-radius: 100%;
-  background-color: rgba(121, 142, 163, 0.1);
-}
-.bubble-two {
-  position: fixed;
-  right: 70px;
-  top: -150px;
-  height: 280px;
-  width: 280px;
-  border-radius: 100%;
-  background-color: rgba(121, 142, 163, 0.1);
-}
-.wild-graph {
-  position: fixed;
-  bottom: -20px;
-  background: url(img/wild-graph.svg) center bottom no-repeat;
-  width: 100%;
-  height: 140px;
-}
-* {
-  padding: 0;
-  margin: 0;
-  box-sizing: border-box;
-}
-h2 {
-  text-align: center;
-  padding: 50px 0;
-  font-family: 'Abel', sans-serif;
-  font-size: 45px;
-}
-@media (max-width: 680px) {
-  h2 {
-    font-size: 30px;
-  }
-}
-ul {
-  padding: 0;
-  list-style: none;
-}
-ul:after {
-  content: "";
-  display: block;
-  clear: both;
-}
-#container,
-#container-industry-data,
-#container-user-data {
-  max-width: 780px;
-  height: 600px;
-  margin: 0 auto;
-}
-#slider-container {
-  padding: 30px 20px;
-  max-width: 780px;
-  height: 600px;
-  position: relative;
-  overflow: hidden;
-}
-#slider-container ul li {
-  float: left;
-  text-align: center;
-}
-.arrow {
-  display: block;
-  position: absolute;
-  z-index: 5;
-  margin-top: -300px;
-  width: 50px;
-  height: 50px;
-  transform: translateY(-50%) scale(1);
-  cursor: pointer;
-}
-.arrow:before,
-.arrow:after {
-  content: "";
-  display: block;
-  width: 34px;
-  height: 1px;
-  position: absolute;
-  background: white;
-  border-top: 1px solid #FFF;
-}
-.arrow.a-left {
-  left: 15px;
-}
-.arrow.a-left:before {
-  top: 0;
-  left: 0;
-  margin-top: 0;
-  transform: rotate(-45deg);
-  transform-origin: 100% 0;
-}
-.arrow.a-left:after {
-  bottom: 0;
-  left: 0;
-  margin-bottom: 0;
-  transform: rotate(45deg);
-  transform-origin: 100% 0;
-}
-.arrow.a-right {
-  right: 15px;
-}
-.arrow.a-right:before {
-  top: 0;
-  right: 0;
-  margin-top: 0;
-  transform: rotate(45deg);
-  transform-origin: 0 0;
-}
-.arrow.a-right:after {
-  bottom: 0;
-  right: 0;
-  margin-bottom: 0;
-  transform: rotate(-45deg);
-  transform-origin: 0 0;
-}
-.bullets-container {
-  position: absolute;
-  margin-top: -30px;
-  left: 50%;
-  transform: translateX(-50%);
-}
-.bullets-container .bullet {
-  width: 15px;
-  height: 15px;
-  display: inline-block;
-  border-radius: 50%;
-  border: 1px solid #798EA3;
-  cursor: pointer;
-  margin: 0 8px;
-}
-.bullets-container .bullet.active {
-  background: #FFF;
-  border: 1px solid #FFF;
-}
-/* The switch - the box around the slider */
-.switch {
-  position: relative;
-  display: inline-block;
-  width: 28px;
-  height: 16px;
-}
-.switch input {
-  display: none;
-}
-.slider {
-  position: absolute;
-  cursor: pointer;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: rgba(121, 142, 163, 0.5);
-  -webkit-transition: .4s;
-  transition: .4s;
-}
-.slider:before {
-  position: absolute;
-  content: "";
-  height: 16px;
-  width: 16px;
-  left: 0;
-  background-color: #798ea3;
-  -webkit-transition: .4s;
-  transition: .4s;
-}
-input:checked + .slider {
-  background-color: rgba(52, 220, 221, 0.4);
-}
-input:checked + .slider:before {
-  background-color: #34DCDD;
-  -webkit-transform: translateX(12px);
-  -ms-transform: translateX(12px);
-  transform: translateX(12px);
-}
-.slider.round {
-  border-radius: 16px;
-}
-.slider.round:before {
-  border-radius: 50%;
-}
-.switch-shop {
-  color: #34DCDD;
-}
-.switch-industry {
-  color: #6a63fc;
-}
-.switch-industry input:checked + .slider {
-  background-color: rgba(106, 99, 252, 0.4);
-}
-.switch-industry input:checked + .slider:before {
-  background-color: #6a63fc;
-}
-.switch-last-year {
-  color: #798EA3;
-}
-.switch-last-year .switch {
-  height: 12px;
-  width: 24px;
-}
-.switch-last-year .slider:before {
-  height: 12px;
-  width: 12px;
-}
-.switch-last-year input:checked + .slider {
-  background-color: rgba(255, 255, 255, 0.4);
-}
-.switch-last-year input:checked + .slider:before {
-  background-color: #ffffff;
-}
-.button-container {
-  margin-top: 10px;
-  float: right;
-  font-size: 14px;
-  width: 60px;
-}
-.button-container .button-wrapper {
-  margin-bottom: 20px;
-}
-* {
-  font-weight: 600 !important;
-  font-family: 'Source Sans Pro', sans-serif !important;
-}
-h3 {
-  padding: 0 15%;
-}
-.btn.timescale {
-  font-size: 14px;
-  padding: 12px 27px;
-  margin: 10px 15px 10px 15px;
-  background: transparent;
-  color: #798EA3;
-  border: none;
-}
-.btn.timescale:hover {
-  cursor: pointer;
-}
-.btn.timescale.is-active {
-  background-color: #189EFF;
-  color: #FFFFFF;
-}
-.btn.timescale.is-active:hover {
-  background-color: rgba(24, 158, 255, 0.8);
-  box-shadow: 0 3px 10px rgba(24, 158, 255, 0.3);
-}
-input {
-  outline: none;
-}
-/* Targetgroup */
-.targetgroup--branch .data,
-.targetgroup--shop .data {
-  text-align: left;
-  margin-left: 50%;
-}
-.like-branch-ice {
-  background: url(img/ice-branch.svg) center bottom no-repeat;
-  float: left;
-  height: 218px;
-  width: 50%;
-  margin-bottom: 10px;
-}
-.like-shop-ice {
-  background: url(img/ice-shop.svg) center bottom no-repeat;
-  float: left;
-  height: 218px;
-  width: 50%;
-  margin-bottom: 10px;
-}
-.data-wrapper {
-  clear: both;
-  width: 90%;
-  display: inline-block;
-  margin: 10px 20px;
-  text-align: left;
-}
-.data-wrapper .data-headline {
-  text-align: left;
-}
-.graph-gradient {
-  height: 14px;
-  margin: 6px 0;
-  border-radius: 100px;
-  text-align: left;
-}
-.graph-gradient .data--txt {
-  position: relative;
-  left: 100%;
-  line-height: 90%;
-  margin-left: 5px;
-  vertical-align: text-top;
-}
-.targetgroup--branch .graph-gradient {
-  background: #511cfc;
-  background: -moz-linear-gradient(left, #511cfc 0%, #3CABE5 100%);
-  background: -webkit-linear-gradient(left, #511cfc 0%, #3CABE5 100%);
-  background: linear-gradient(to right, #511cfc 0%, #3CABE5 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#511cfc', endColorstr='#34dcdd', GradientType=1);
-}
-.targetgroup--shop .graph-gradient {
-  background: #00a5ff;
-  background: -moz-linear-gradient(left, #00a5ff 1%, #34dcdd 100%);
-  background: -webkit-linear-gradient(left, #00a5ff 1%, #34dcdd 100%);
-  background: linear-gradient(to right, #00a5ff 1%, #34dcdd 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00a5ff', endColorstr='#34dcdd', GradientType=1);
-}
-.swag-chart .graph {
-  display: inline-block;
-  margin: 2px;
-  text-align: center;
-}
-.swag-chart .payment .graph {
-  border-radius: 100%;
-}
-.shipping,
-.payment {
-  margin: 0 0 20px 0;
-}
-.shipping .no-available,
-.payment .no-available {
-  position: inherit;
-  top: 0px;
-  bottom: 0px;
-  left: 0px;
-  right: 0px;
-  overflow: hidden;
-  padding: 0;
-  margin: 0;
-  background-color: #000;
-  filter: alpha(opacity=50);
-  opacity: 0.5;
-  z-index: 1000;
-}
-.shipping .wrapper,
-.payment .wrapper {
-  height: 200px;
-}
-.graph-wrapper {
-  float: left;
-  width: 740px;
-}
-.graph-container:after {
-  content: "";
-  display: table;
-  clear: both;
-}
-.disabled-notice {
-  display: none;
-}
-.industry-disabled {
-  position: relative;
-}
-.industry-disabled .disabled-notice {
-  display: grid;
-  position: absolute;
-  align-items: center;
-  top: 0;
-  bottom: 0;
-  right: 0;
-  left: 0;
-  font-size: 30px;
-  color: #B2C4D7;
-  background: rgba(33, 52, 72, 0.85);
-}
-.devices-graph-list-wrapper .devices-item {
-  margin-bottom: 8px;
-}
-.devices-graph-list-wrapper .devices-item::after {
-  content: "";
-  display: table;
-  clear: both;
-}
-.btn-liquid {
-  margin-top: 45px;
-}
-.btn-liquid .inner {
-  font-size: 20px;
-}
-.scroll {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex-direction: column;
-  left: 0;
-  top: 0;
-  z-index: 1000;
-  color: #798EA3;
-  margin-top: 35px;
-}
-.scroll .cont-mouse {
-  border-radius: 50%;
-  width: 150px;
-  height: 150px;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-}
-.scroll .mouse {
-  width: 33px;
-  height: 60px;
-  border-radius: 60px;
-  border: solid 3px #798EA3;
-  margin-bottom: 10px;
-  position: relative;
-}
-.scroll .mouse .wheelcont {
-  width: 100%;
-  text-align: center;
-  position: absolute;
-  left: 0;
-  top: 15px;
-}
-.scroll .mouse .wheelcont .wheel {
-  width: 5px;
-  height: 9px;
-  border-radius: 3px;
-  background-color: white;
-  display: block;
-  margin: 0 auto;
-  -webkit-animation-name: wheel;
-  animation-name: wheel;
-  -webkit-animation-duration: 1s;
-  animation-duration: 1s;
-  -webkit-animation-iteration-count: infinite;
-  animation-iteration-count: infinite;
-  -webkit-animation-timing-function: ease-out;
-  animation-timing-function: ease-out;
-}
-.scroll .mouse .arrows {
-  position: absolute;
-  top: 1px;
-  left: 0;
-  width: 100%;
-  height: 29px;
-  background-position: center;
-  background-size: auto 100%;
-  -webkit-animation-name: arrow-animation;
-  animation-name: arrow-animation;
-  -webkit-animation-duration: 1s;
-  animation-duration: 1s;
-  -webkit-animation-iteration-count: infinite;
-  animation-iteration-count: infinite;
-  text-align: center;
-  padding: 4px 0;
-}
-.scroll .mouse .arrows .fl,
-.scroll .mouse .arrows .flb {
-  border-left: solid 1px white;
-  border-top: solid 1px white;
-  width: 4px;
-  height: 4px;
-  -webkit-transform: rotate(45deg);
-  transform: rotate(45deg);
-  display: block;
-  margin: 0 auto;
-}
-.scroll .mouse .arrows .flb {
-  -webkit-transform: rotate(225deg);
-  transform: rotate(225deg);
-}
-.scroll .mouse .arrows .up {
-  margin-bottom: 14px;
-}
-.preview-disclaimer {
-  width: 130px;
-  height: 240px;
-  margin: 0 auto;
-  background: url(img/bg-preview.png) no-repeat;
-  background-size: 130px 205px;
-  position: absolute;
-  top: 0;
-  left: 10%;
-  color: #FFF;
-  display: grid;
-  text-align: center;
-  align-content: center;
-  line-height: 30px;
-  font-size: 25px;
-}
-.preview-disclaimer:before {
-  content: '!';
-  display: block;
-  position: absolute;
-  color: #FFF;
-  font-size: 78px;
-  left: 0;
-  right: 0;
-  top: 30px;
-}
-/*
-============================================
-            KEYFRAMES
-============================================
-*/
-@-webkit-keyframes wheel {
-  0% {
-    -webkit-transform: translateY(-2px);
-    transform: translateY(-2px);
-  }
-  50% {
-    -webkit-transform: translateY(2px);
-    transform: translateY(2px);
-  }
-  100% {
-    -webkit-transform: translateY(-2px);
-    transform: translateY(-2px);
-  }
-}
-@keyframes wheel {
-  0% {
-    -webkit-transform: translateY(-2px);
-    transform: translateY(-2px);
-  }
-  50% {
-    -webkit-transform: translateY(2px);
-    transform: translateY(2px);
-  }
-  100% {
-    -webkit-transform: translateY(-2px);
-    transform: translateY(-2px);
-  }
-}
-@-webkit-keyframes arrow-animation {
-  0% {
-    opacity: 0.4;
-  }
-  50% {
-    opacity: 0.6;
-  }
-  100% {
-    opacity: 0.4;
-  }
-}
-@keyframes arrow-animation {
-  0% {
-    opacity: 0.4;
-  }
-  50% {
-    opacity: 0.6;
-  }
-  100% {
-    opacity: 0.4;
-  }
-}
-body {
-  font-family: 'Source Sans Pro', sans-serif;
-  padding: 0;
-  margin: 0;
-  color: #798EA3;
-}
-body#swag-start {
-  background-color: #213448;
-}
-body#swag-info {
-  background-color: #FFFFFF;
-}
-body#swag-select {
-  background-color: #213448;
-}
-body#swag-benchmark {
-  background-color: #213448;
-}
-.wrapper {
-  width: 100%;
-  overflow-y: auto;
-  background: #213448;
-}
-.swag-container {
-  text-align: center;
-  height: 600px;
-  max-width: 800px;
-  margin: 0 auto;
-}
-.swag-chart,
-.swag-text-break {
-  margin: 50px 0;
-}
-.swag-onbording {
-  text-align: center;
-  width: 100%;
-  margin: 0 auto;
-}
-.konfetti {
-  width: 450px;
-  height: 106px;
-  margin: 0 auto;
-  background: url(img/konfetti.svg) no-repeat;
-  background-size: 450px 106px;
-}
-.nice-graphic {
-  margin: 0 auto;
-  width: 250px;
-  height: 200px;
-}
-.wave-left {
-  background: url(img/wave-left.svg) left center no-repeat;
-  width: 102px;
-  height: 600px;
-  position: absolute;
-  left: 0;
-}
-.wave-right {
-  background: url(img/wave-right.svg) right center no-repeat;
-  width: 102px;
-  height: 600px;
-  position: absolute;
-  right: 0;
-  margin-top: -600px;
-}
-.row {
-  clear: both;
-  width: 100%;
-  max-width: 800px;
-  margin: 0 auto;
-}
-.col-100 {
-  width: 100%;
-  float: left;
-}
-#swag-start .col-33,
-#swag-info .col-33,
-#swag-select .col-33,
-#swag-start .col-50,
-#swag-info .col-50,
-#swag-select .col-50,
-#swag-start .col-66,
-#swag-info .col-66,
-#swag-select .col-66,
-#swag-start .col-80,
-#swag-info .col-80,
-#swag-select .col-80 {
-  width: 90%;
-  float: left;
-  margin-left: 15px;
-  margin-right: 15px;
-}
-.computed-data {
-  padding-top: 20px;
-}
-.computed-data .time-container:after {
-  content: "";
-  display: table;
-  clear: both;
-}
-.computed-data .value-container {
-  float: left;
-  width: 33%;
-}
-.computed-data .value-container.total .data-value {
-  font-size: 25px;
-}
-.computed-data .value-container.total .data-value.local {
-  color: #34DCDD;
-}
-.computed-data .value-container.total .data-value.industry {
-  color: #6A63FC;
-}
-.computed-data .data-value {
-  color: #fff;
-  font-size: 22px;
-}
-@media (min-width: 800px) {
-  #swag-start .col-33,
-  #swag-info .col-33,
-  #swag-select .col-33 {
-    width: 30%;
-    float: left;
-    margin: 0 0 0 3%;
-  }
-  #swag-start .col-50,
-  #swag-info .col-50,
-  #swag-select .col-50 {
-    width: 50%;
-    float: left;
-    margin: 0;
-  }
-  #swag-start .col-66,
-  #swag-info .col-66,
-  #swag-select .col-66 {
-    width: 66%;
-    float: left;
-    margin: 0;
-  }
-  #swag-start .col-80,
-  #swag-info .col-80,
-  #swag-select .col-80 {
-    width: 80%;
-    margin: 0 0 0 20%;
-  }
-}
-#swag-benchmark {
-  margin-top: 70px;
-}
-#swag-benchmark .col-33 {
-  width: 33%;
-  float: left;
-}
-#swag-benchmark .col-50 {
-  width: 50%;
-  float: left;
-}
-#swag-benchmark .col-66 {
-  width: 66%;
-  float: left;
-}
-#swag-benchmark .col-80 {
-  width: 80%;
-  margin-left: 20%;
-}
-.special-note .swag-container {
-  padding-top: 60px;
-}
-.special-note .nice-graphic {
-  background: url(img/wait-info.svg) bottom center no-repeat;
-  background-size: 180px;
-}
-.industry-data .slide--shop .nice-graphic {
-  background: url(img/durchschnitt-shop.svg) bottom center no-repeat;
-  background-size: 180px;
-}
-.industry-data .slide--branch .nice-graphic {
-  background: url(img/durchschnitt-branch.svg) bottom center no-repeat;
-  background-size: 180px;
-}
-.user-data .slide--shop .nice-graphic {
-  background: url(img/user-shop.svg) bottom center no-repeat;
-  background-size: 150px;
-}
-.user-data .slide--branch .nice-graphic {
-  background: url(img/user-branch.svg) bottom center no-repeat;
-  background-size: 150px;
-}
-.payment-shipping-data .slide--shop .nice-graphic {
-  background: url(img/payship-shop.svg) bottom center no-repeat;
-  background-size: 180px;
-}
-.payment-shipping-data .slide--branch .nice-graphic {
-  background: url(img/payship-branch.svg) bottom center no-repeat;
-  background-size: 180px;
-}
-.btn {
-  font-size: 16px;
-  font-weight: 600;
-  text-align: center;
-  display: inline-block;
-  border-radius: 100px;
-  border: 2px solid #798EA3;
-  padding: 12px 38px;
-  margin: 10px auto 20px auto;
-  text-decoration: none;
-}
-.btn:hover {
-  cursor: pointer;
-}
-.btn.primary {
-  padding: 16px 38px;
-  background-color: #189EFF;
-  color: #FFFFFF;
-  box-shadow: 0 8px 10px rgba(24, 158, 255, 0.1);
-  transition: all 0.5s ease-out;
-  border: none;
-}
-.btn.primary:hover {
-  background-color: #50E3C2;
-  box-shadow: 0 3px 10px rgba(24, 158, 255, 0.3);
-}
-.btn.primary.select-bg {
-  width: 50%;
-}
-.btn.primary.select-bg:hover {
-  background-color: #189EFF;
-  cursor: pointer;
-}
-.btn.secondary {
-  padding: 12px 38px;
-  border: 2px solid #189EFF;
-  color: #189EFF;
-  transition: all 0.5s ease-out;
-}
-.btn.secondary:hover {
-  border: 2px solid #3adfba;
-  color: #50E3C2;
-}
-.icon-more {
-  content: '+';
-  font-size: 110%;
-  vertical-align: middle;
-}
-input.btn.primary {
-  font-family: 'Source Sans Pro';
-}
-footer {
-  font-size: 14px;
-  color: #5f758a;
-}
-textarea {
-  background-color: #1c2c3e;
-  border-color: #24394f;
-  width: 80%;
-  padding: 3% 15%;
-  max-height: 140px;
-  margin-bottom: 20px;
-  text-align: center;
-  color: #798EA3;
-  font-size: 16px;
-}
-textarea::-webkit-input-placeholder {
-  color: #4a5b6c;
-}
-textarea:-moz-placeholder {
-  /* Firefox 18- */
-  color: #4a5b6c;
-}
-textarea::-moz-placeholder {
-  /* Firefox 19+ */
-  color: #4a5b6c;
-}
-textarea:-ms-input-placeholder {
-  color: #4a5b6c;
-}
-.language-switch {
-  position: absolute;
-  top: 25px;
-  right: 5%;
-  z-index: 1000;
-  height: 50px;
-}
-.language-switch .language {
-  cursor: pointer;
-  display: inline-block;
-  text-align: center;
-}
-.language-switch .language.active,
-.language-switch .language:hover {
-  color: #189EFF;
-}
-.language-switch .language-separator {
-  margin: 0 5px 0;
-}
-/* source-sans-pro-regular - latin */
-@font-face {
-  font-family: 'Source Sans Pro';
-  font-style: normal;
-  font-weight: 400;
-  src: url('https://assets.shopware.com/bi/source-sans-pro/source-sans-pro-v11-latin-regular.eot');
-  /* IE9 Compat Modes */
-  src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'), url('https://assets.shopware.com/bi/source-sans-pro/source-sans-pro-v11-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('https://assets.shopware.com/bi/source-sans-pro/source-sans-pro-v11-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ url('https://assets.shopware.com/bi/source-sans-pro/source-sans-pro-v11-latin-regular.woff') format('woff'), /* Modern Browsers */ url('https://assets.shopware.com/bi/source-sans-pro/source-sans-pro-v11-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('https://assets.shopware.com/bi/source-sans-pro/source-sans-pro-v11-latin-regular.svg#SourceSansPro') format('svg');
-  /* Legacy iOS */
-}
-/* source-sans-pro-600 - latin */
-@font-face {
-  font-family: 'Source Sans Pro';
-  font-style: normal;
-  font-weight: 600;
-  src: url('https://assets.shopware.com/bi/source-sans-pro/source-sans-pro-v11-latin-600.eot');
-  /* IE9 Compat Modes */
-  src: local('Source Sans Pro SemiBold'), local('SourceSansPro-SemiBold'), url('https://assets.shopware.com/bi/source-sans-pro/source-sans-pro-v11-latin-600.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('https://assets.shopware.com/bi/source-sans-pro/source-sans-pro-v11-latin-600.woff2') format('woff2'), /* Super Modern Browsers */ url('https://assets.shopware.com/bi/source-sans-pro/source-sans-pro-v11-latin-600.woff') format('woff'), /* Modern Browsers */ url('https://assets.shopware.com/bi/source-sans-pro/source-sans-pro-v11-latin-600.ttf') format('truetype'), /* Safari, Android, iOS */ url('https://assets.shopware.com/bi/source-sans-pro/source-sans-pro-v11-latin-600.svg#SourceSansPro') format('svg');
-  /* Legacy iOS */
-}
-/* source-sans-pro-700 - latin */
-@font-face {
-  font-family: 'Source Sans Pro';
-  font-style: normal;
-  font-weight: 700;
-  src: url('https://assets.shopware.com/bi/source-sans-pro/source-sans-pro-v11-latin-700.eot');
-  /* IE9 Compat Modes */
-  src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url('https://assets.shopware.com/bi/source-sans-pro/source-sans-pro-v11-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('https://assets.shopware.com/bi/source-sans-pro/source-sans-pro-v11-latin-700.woff2') format('woff2'), /* Super Modern Browsers */ url('https://assets.shopware.com/bi/source-sans-pro/source-sans-pro-v11-latin-700.woff') format('woff'), /* Modern Browsers */ url('https://assets.shopware.com/bi/source-sans-pro/source-sans-pro-v11-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */ url('https://assets.shopware.com/bi/source-sans-pro/source-sans-pro-v11-latin-700.svg#SourceSansPro') format('svg');
-  /* Legacy iOS */
-}
-a {
-  text-decoration: none;
-}
-a:hover {
-  cursor: pointer;
-}
-h1,
-h2,
-h3,
-h4 {
-  font-family: 'Source Sans Pro';
-  margin: 8px 0;
-  padding: 0 3%;
-  font-weight: 600;
-  letter-spacing: 0.6px;
-  line-height: 145%;
-}
-.opener h1,
-.swag-text-break h1 {
-  font-size: 70px;
-  color: #FFFFFF;
-  margin: 20px 0;
-}
-h1 {
-  font-size: 56px;
-  color: #FFFFFF;
-}
-h2 {
-  font-size: 33px;
-  color: #FFFFFF;
-}
-h3 {
-  font-size: 30px;
-  color: #798EA3;
-}
-h4 {
-  font-size: 24px;
-  color: #798EA3;
-}
-p {
-  margin-bottom: 20px;
-}
-.clear {
-  clear: both;
-}
-.branch-color {
-  color: #6A63FC;
-  font-weight: 600;
-}
-.shop-color {
-  color: #34DCDD;
-  font-weight: 600;
-}
-.like-branch-ice,
-.like-shop-ice {
-  text-align: left;
-}
-.data {
-  color: #798EA3;
-  font-size: 14px;
-  font-weight: 500;
-}
-.data.x-axis {
-  color: #FFFFFF;
-}
-.data--txt {
-  font-size: 16px;
-  font-weight: 600;
-  text-align: left;
-}
-.data--headline {
-  font-size: 24px;
-  font-weight: 600;
-}
-.high-contrast {
-  color: #FFFFFF;
-}
-.smaller {
-  font-size: 90%;
-}
-.is-center {
-  text-align: center;
-}
-.is-bigger {
-  font-size: 200%;
-}
-.industry--shop-list {
-  height: 200px;
-  width: 800px;
-  margin-top: 30px;
-  position: relative;
-}
-.industry--shop-list .shop-list--wrapper {
-  height: 200px;
-  overflow: hidden;
-  overflow-y: scroll;
-}
-.industry--shop-list .shop-list--entry {
-  margin: 5px 0;
-  cursor: pointer;
-  height: 50px;
-  border-radius: 25px;
-  padding: 0 90px 0 50px;
-  line-height: 50px;
-}
-.industry--shop-list .shop-list--entry:hover {
-  background: #263c52;
-}
-.industry--shop-list .shop-list--entry.configured {
-  color: #189EFF;
-}
-.industry--shop-list .shop-list--entry.configured .shop-list--button {
-  border-color: #189EFF;
-}
-.industry--shop-list .shop-list--entry.configured .shop-list--button::before {
-  content: ' ';
-  display: block;
-  color: #189EFF;
-  margin-left: 1px;
-  height: 9px;
-  width: 11px;
-  background: url(img/check-branch.svg) no-repeat;
-  position: relative;
-  top: 2px;
-  left: 1px;
-}
-.industry--shop-list .shop-list--entry.configured .shop-list--info {
-  font-style: normal;
-}
-.industry--shop-list .shop-list--name,
-.industry--shop-list .shop-list--info {
-  width: 50%;
-  display: inline-block;
-  margin-right: -4px;
-}
-.industry--shop-list .shop-list--info-text {
-  font-size: 16px;
-  font-weight: 500 !important;
-}
-.industry--shop-list .shop-list--name {
-  color: #fff;
-  text-align: left;
-  font-weight: 500 !important;
-}
-.industry--shop-list .shop-list--info {
-  font-style: italic;
-  line-height: 30px;
-  text-align: right;
-  position: relative;
-}
-.industry--shop-list .shop-list--button {
-  border: 3px solid #fff;
-  color: #fff;
-  padding: 5px;
-  border-radius: 100%;
-  height: 30px;
-  width: 30px;
-  display: inline-block;
-  margin-left: 10px;
-  position: absolute;
-  top: 0;
-}
-.industry--shop-list .shop-list--button::before {
-  content: '...';
-  font-size: 14px;
-  line-height: 7px;
-  display: block;
-  cursor: pointer;
-  letter-spacing: 2px;
-  font-style: normal;
-}
-.industry--shop-list .shop-list--button:hover {
-  border-color: #189EFF;
-  color: #189EFF;
-}
-.industry--shop-list::after {
-  content: '';
-  display: block;
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  background: linear-gradient(to bottom, rgba(33, 52, 72, 0) 0%, #213448 100%);
-  pointer-events: none;
-  height: 30px;
-}
-.shop-config--overlay {
-  display: none;
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  right: 0;
-  left: 0;
-  cursor: pointer;
-  background: rgba(33, 52, 72, 0.8);
-  z-index: 10;
-}
-.shop-config--overlay .shop-list--config {
-  position: absolute;
-  padding: 30px;
-  background-color: #1c2c3e;
-  height: 370px;
-  width: 350px;
-  border-radius: 15px;
-  right: 24%;
-  top: 17%;
-  cursor: initial;
-}
-.shop-config--overlay .config-headline {
-  color: #fff;
-  text-align: center;
-  font-size: 20px;
-  word-wrap: break-word;
-}
-.shop-config--overlay .shop-config--type {
-  padding-left: 20px;
-}
-.shop-config--overlay .shop-config--type .type-label {
-  display: block;
-  margin-bottom: 10px;
-}
-.shop-config--overlay .shop-config--type span {
-  font-weight: 500 !important;
-}
-.shop-config--overlay .shop-config--type .type-label--name {
-  color: #fff;
-  margin: 0 15px 0 30px;
-}
-.shop-config--overlay .submit-button--ct {
-  text-align: center;
-}
-.shop-config--overlay .action-buttons--ct {
-  position: absolute;
-  bottom: 10px;
-  left: 30px;
-  right: 30px;
-}
-.shop-config--overlay .action-buttons--ct .reset-button--ct,
-.shop-config--overlay .action-buttons--ct .cancel-button--ct {
-  cursor: pointer;
-}
-.shop-config--overlay .action-buttons--ct .reset-button--ct:hover .action-button,
-.shop-config--overlay .action-buttons--ct .cancel-button--ct:hover .action-button {
-  color: #189EFF;
-}
-.shop-config--overlay .action-buttons--ct .reset-button--ct:hover .reset-button--icon,
-.shop-config--overlay .action-buttons--ct .cancel-button--ct:hover .reset-button--icon {
-  background-image: url('img/reset-hover.svg');
-}
-.shop-config--overlay .action-buttons--ct .reset-button--ct:hover .cancel-button--icon,
-.shop-config--overlay .action-buttons--ct .cancel-button--ct:hover .cancel-button--icon {
-  background-image: url('img/cancel-hover.svg');
-}
-.shop-config--overlay .action-buttons--ct .reset-button--icon,
-.shop-config--overlay .action-buttons--ct .cancel-button--icon {
-  display: inline-block;
-}
-.shop-config--overlay .action-buttons--ct .reset-button--icon {
-  height: 16px;
-  width: 14px;
-  background-image: url('img/reset.svg');
-}
-.shop-config--overlay .action-buttons--ct .cancel-button--icon {
-  margin-top: 3px;
-  height: 13px;
-  width: 13px;
-  background-image: url('img/cancel.svg');
-}
-.shop-config--overlay .action-buttons--ct .reset-button--ct {
-  float: left;
-}
-.shop-config--overlay .action-buttons--ct .cancel-button--ct {
-  float: right;
-}
-.shop-config--overlay .action-buttons--ct .action-button {
-  vertical-align: top;
-  cursor: pointer;
-  background: none;
-  border: 0 none;
-  color: #798EA3;
-  font-size: 14px;
-}
-.shop-config--overlay .type--header {
-  margin: 30px 0 10px;
-  text-align: center;
-}
-.type-label {
-  display: block;
-  position: relative;
-  cursor: pointer;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-.type-label input {
-  position: absolute;
-  opacity: 0;
-  cursor: pointer;
-}
-.type-label input:checked ~ .check-mark {
-  border-color: #189EFF;
-}
-.type-label input:checked ~ .check-mark:after {
-  display: block;
-}
-.type-label input:checked ~ .type-label--name,
-.type-label input:checked ~ .type-label--short {
-  color: #189EFF;
-}
-.type-label .check-mark {
-  position: absolute;
-  top: 0;
-  left: 0;
-  height: 18px;
-  width: 18px;
-  background: none;
-  border: 3px solid #798EA3;
-  border-radius: 50%;
-}
-.type-label .check-mark:after {
-  content: "";
-  position: absolute;
-  display: none;
-  top: 3px;
-  left: 3px;
-  width: 6px;
-  height: 6px;
-  border-radius: 50%;
-  background: #189EFF;
-}
-.type-label:hover input ~ .check-mark {
-  border-color: #189EFF;
-}
-.type-label:hover .type-label--name,
-.type-label:hover .type-label--short {
-  color: #189EFF;
-}
-.industry--save-button {
-  width: 400px;
-  padding: 10px 30px;
-  background-color: #189EFF;
-  color: #fff;
-  text-align: center;
-  border-radius: 40px;
-  line-height: 30px;
-  margin: 50px auto 0;
-  clear: both;
-  display: table;
-}
-.industry--save-button .save-button--shop-counter,
-.industry--save-button .save-button--text {
-  display: inline-block;
-}
-.industry--save-button .save-button--shop-counter {
-  margin-left: 10px;
-  height: 30px;
-  width: 30px;
-  background-color: #008aee;
-  border-radius: 100%;
-}
-.industry--save-button:hover {
-  background-color: #50E3C2;
-  cursor: pointer;
-}
-.industry--save-button:hover .save-button--shop-counter {
-  background-color: #20cba5;
-}
-.shop-select--wrapper {
-  top: 2%;
-  width: 100%;
-  display: block;
-  text-align: center;
-  position: absolute;
-}
-.shop-select--wrapper .shop-select {
-  width: 390px;
-  display: inline-block;
-  text-align: left;
-}
-.shop-select--wrapper .shop-select.open {
-  position: relative;
-}
-.custom-select {
-  width: 100%;
-  color: #798EA3;
-  border: 3px solid #798EA3;
-  background-color: #213448;
-  font-size: 15px;
-  border-radius: 30px;
-  height: 50px;
-  padding: 15px 30px;
-  font-style: italic;
-  position: relative;
-}
-.custom-select .select-header {
-  margin-right: 20px;
-}
-.custom-select.open {
-  height: auto;
-  max-height: 260px;
-  overflow: hidden;
-  padding: 0;
-  position: absolute;
-  z-index: 100;
-  width: 290px;
-}
-.custom-select.open .dropdown-wrapper {
-  max-height: 260px;
-  overflow-y: scroll;
-  padding: 15px 30px;
-}
-.custom-select.open .fade-out {
-  display: block;
-}
-.custom-select.open .select-options {
-  display: block;
-}
-.custom-select.open .select-header {
-  display: none;
-}
-.custom-select.open::after {
-  transform: rotate(225deg);
-  top: 20px;
-}
-.custom-select.active {
-  border-color: #189EFF;
-}
-.custom-select.active .select-header {
-  color: #189EFF;
-}
-.custom-select .fade-out {
-  display: none;
-  width: 100%;
-  height: 60px;
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  background: linear-gradient(to bottom, rgba(33, 52, 72, 0) 0%, #213448 100%);
-  pointer-events: none;
-}
-.custom-select::after {
-  border: solid #fff;
-  border-width: 0 2px 2px 0;
-  display: inline-block;
-  padding: 3px;
-  transform: rotate(45deg);
-  -webkit-transform: rotate(45deg);
-  font-style: normal;
-  content: "";
-  position: absolute;
-  right: 25px;
-  top: 16px;
-}
-.custom-select:hover {
-  color: #189EFF;
-  border-color: #189EFF;
-  cursor: pointer;
-}
-.custom-select:hover::after {
-  border-color: #189EFF;
-}
-.custom-select .select-options {
-  display: none;
-}
-.custom-select .select-option {
-  padding: 10px 0;
-  color: #798EA3;
-  text-overflow: ellipsis;
-  overflow: hidden;
-}
-.custom-select .select-option:hover {
-  color: #189EFF;
-}
-.custom-select .select-option:last-child {
-  margin-bottom: 22px;
-}
-.custom-select .select-option:first-child {
-  margin-top: 10px;
-}
-.pong-start {
-  position: absolute;
-  background-color: #50E3C2;
-  color: #fff !important;
-  border: 0 none !important;
-  left: calc(50% - 60px);
-  top: 380px;
-  width: 120px;
-}
-.pong-start:hover {
-  background-color: #41aa8d;
-  cursor: pointer;
-}
-.pong-cancel-button {
-  margin-top: 30px;
-  width: 270px;
-}
-#pong-game {
-  border-radius: 7px;
-}
-body#swag-waiting {
-  background-color: #213448;
-  overflow: hidden;
-}
-.waiting {
-  padding-top: 4rem;
-}
-.waiting h1 {
-  font-weight: 700;
-  font-size: 56px;
-}
-.waiting p {
-  margin-left: auto;
-  margin-right: auto;
-  width: 100%;
-  line-height: 1.5rem;
-  font-size: 1.15rem;
-}
-.waiting svg.circle {
-  position: absolute;
-  fill: #ffffff;
-}
-.waiting svg.circle.big {
-  top: 20rem;
-  left: -12rem;
-  width: 30rem;
-  fill-opacity: .05;
-}
-.waiting svg.circle.small {
-  top: -15rem;
-  right: 2rem;
-  width: 20rem;
-  fill-opacity: .03;
-}
-.waiting-graphic,
-.compare-no-apples-and-pears,
-.eat-fruits-while-waiting,
-.no-fruits-no-fun {
-  margin: 1rem auto;
-  height: 7rem;
-  width: 50%;
-}
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/components/average_customers.tpl b/themes/Backend/ExtJs/backend/benchmark/template/local/components/average_customers.tpl
deleted file mode 100644
index aa3a1abdb5f..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/components/average_customers.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="slide slide--shop" v-html="$t('averageCustomersText', {
-    averageAge: local.customers.averageAge,
-    womenPercentage: local.customers.women.percentage,
-    menPercentage: local.customers.men.percentage,
-    noBirthday: local.customers.noBirthday
-})">
-</div>
\ No newline at end of file
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/components/average_numbers.tpl b/themes/Backend/ExtJs/backend/benchmark/template/local/components/average_numbers.tpl
deleted file mode 100644
index eed4525015f..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/components/average_numbers.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="slide slide--shop" v-html="$t('numbersText', {
-    averagePayments: local.numbers.averagePayments,
-    averageShippingCosts: local.numbers.averageShippingCosts,
-    shippingReady: local.numbers.shippingReadyProducts
-})">
-</div>
\ No newline at end of file
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/components/average_orders.tpl b/themes/Backend/ExtJs/backend/benchmark/template/local/components/average_orders.tpl
deleted file mode 100644
index 9f2f543c429..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/components/average_orders.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="slide slide--shop" v-html="$t('shopDataText', {
-    averageOrdersPerDay: local.orders.averageOrdersPerDay,
-    averageAmount: local.orders.averageAmount,
-    averageHourRange: local.orders.averageHourRange
-})">
-</div>
\ No newline at end of file
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/components/devices_charts.tpl b/themes/Backend/ExtJs/backend/benchmark/template/local/components/devices_charts.tpl
deleted file mode 100644
index 6b5567a49fe..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/components/devices_charts.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<div class="col-50 devices--industry industry-disabled">
-    <div class="disabled-notice" v-html="$t('disabledText')"></div>
-    <div class="target-group-graph-industry" data-target-group-chart="true" data-industry="true"></div>
-
-    <div class="row">
-        <h4>[[ $t('industryTitle') ]]</h4>
-        <div class="data--txt col-80">
-            <div class="devices-graph-list-wrapper">
-                <div class="devices-item">
-                    <div class="shop-color col-66">tablet</div>
-                    <div class="high-contrast col-33">7.55%</div>
-                </div>
-                <div class="devices-item">
-                    <div class="shop-color col-66">mobile</div>
-                    <div class="high-contrast col-33">0.28%</div>
-                </div>
-                <div class="devices-item">
-                    <div class="shop-color col-66">desktop</div>
-                    <div class="high-contrast col-33">92.18%</div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-<div class="col-50 devices--shop">
-    <div class="target-group-graph-shop" data-target-group-chart="true" data-industry="false"></div>
-    <div class="row">
-        <h4>[[ $t('shopTitle') ]]</h4>
-        <div class="data--txt col-80">
-            <devices-graph-list-wrapper></devices-graph-list-wrapper>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/components/scroll_mouse.tpl b/themes/Backend/ExtJs/backend/benchmark/template/local/components/scroll_mouse.tpl
deleted file mode 100644
index 50585c03aa0..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/components/scroll_mouse.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="scroll">
-    <div class="cont-mouse">
-        <div class="mouse">
-            <div class="arrows">
-                <div class="up">
-                    <div class="fl"></div>
-                    <div class="fl"></div>
-                </div>
-                <div class="up">
-                    <div class="flb"></div>
-                    <div class="flb"></div>
-                </div>
-            </div>
-            <div class="wheelcont">
-                <div class="wheel"></div>
-            </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/components/target_groups.tpl b/themes/Backend/ExtJs/backend/benchmark/template/local/components/target_groups.tpl
deleted file mode 100644
index 42e4745c803..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/components/target_groups.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-<div class="col-50 targetgroup--shop">
-    <h4>[[ $t('shopTitle') ]]</h4>
-    <div class="like-shop-ice"></div>
-    <div class="data">
-        <span class="data--headline high-contrast">[[ $t('womenTitle') ]]</span><br>
-        <span class="data--headline shop-color">[[ local.customers.women.percentage ]]%</span><br>
-        <span class="data--txt">[[ local.customers.women.amount ]]</span><br>
-        <span class="data--txt">Ø [[ local.customers.women.averageAge ]] [[ $t('yearsOldTitle') ]]</span>
-        <br><br>
-        <span class="data--headline high-contrast">[[ $t('menTitle') ]]</span><br>
-        <span class="data--headline shop-color">[[ local.customers.men.percentage ]]%</span><br>
-        <span class="data--txt">[[ local.customers.men.amount ]]</span><br>
-        <span class="data--txt">Ø [[ local.customers.men.averageAge ]] [[ $t('yearsOldTitle') ]]</span><br>
-    </div>
-
-    <div class="data-wrapper">
-        <span class="data--headline high-contrast">[[ $t('ageTitle') ]]</span><br>
-
-        <div class="row">
-            <div class="col-33 data--txt shop-color">[[ $t('above50Text') ]]</div>
-            <div class="col-66">
-                <target-group-bar name="above50"></target-group-bar>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-33 data--txt shop-color">[[ $t('between30And50Text') ]]</div>
-            <div class="col-66">
-                <target-group-bar name="between30And50"></target-group-bar>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-33 data--txt shop-color">[[ $t('between15And30Text') ]]</div>
-            <div class="col-66">
-                <target-group-bar name="between15And30"></target-group-bar>
-            </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/components/top_payments.tpl b/themes/Backend/ExtJs/backend/benchmark/template/local/components/top_payments.tpl
deleted file mode 100644
index c71e0b9a7af..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/components/top_payments.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="wrapper">
-    <payment-graph-bubble-wrapper></payment-graph-bubble-wrapper>
-</div>
-
-<div class="row">
-    <div class="col-80 data--txt">
-        <payment-graph-list-wrapper></payment-graph-list-wrapper>
-    </div>
-</div>
\ No newline at end of file
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/components/top_shipments.tpl b/themes/Backend/ExtJs/backend/benchmark/template/local/components/top_shipments.tpl
deleted file mode 100644
index cbbb605981e..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/components/top_shipments.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="wrapper">
-    <shipment-graph-square-wrapper></shipment-graph-square-wrapper>
-</div>
-
-<div class="row">
-    <div class="col-80 data--txt">
-        <shipment-graph-list-wrapper></shipment-graph-list-wrapper>
-    </div>
-</div>
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/img/bg-preview.png b/themes/Backend/ExtJs/backend/benchmark/template/local/img/bg-preview.png
deleted file mode 100644
index a55d346f260..00000000000
Binary files a/themes/Backend/ExtJs/backend/benchmark/template/local/img/bg-preview.png and /dev/null differ
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/img/cancel-hover.svg b/themes/Backend/ExtJs/backend/benchmark/template/local/img/cancel-hover.svg
deleted file mode 100644
index f965f91fc9a..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/img/cancel-hover.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round">
-        <g id="cancel" transform="translate(1.000000, -3.000000)" stroke="#189EFF" stroke-width="3">
-            <g transform="translate(1.000000, 0.000000)" id="Group">
-                <g transform="translate(0.000000, 5.000000)">
-                    <path d="M0.27734375,0.3203125 L7.82608925,7.869058" id="Path-79"></path>
-                    <path d="M0.27734375,0.3203125 L7.82608925,7.869058" id="Path-79" transform="translate(4.051717, 4.094685) scale(-1, 1) translate(-4.051717, -4.094685) "></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/img/cancel.svg b/themes/Backend/ExtJs/backend/benchmark/template/local/img/cancel.svg
deleted file mode 100644
index fc06d06defd..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/img/cancel.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round">
-        <g id="cancel" transform="translate(2.000000, -3.000000)" stroke="#798EA3" stroke-width="3">
-            <g id="Group">
-                <g transform="translate(0.000000, 5.000000)">
-                    <path d="M0.27734375,0.3203125 L7.82608925,7.869058" id="Path-79"></path>
-                    <path d="M0.27734375,0.3203125 L7.82608925,7.869058" id="Path-79" transform="translate(4.051717, 4.094685) scale(-1, 1) translate(-4.051717, -4.094685) "></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/img/check-branch.svg b/themes/Backend/ExtJs/backend/benchmark/template/local/img/check-branch.svg
deleted file mode 100644
index 03c7e5fc96e..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/img/check-branch.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="11px" height="9px" viewBox="0 0 11 9" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="check-branch-yes" transform="translate(-7.000000, -8.000000)" stroke="#189EFF" stroke-width="3">
-            <g id="Group-18" transform="translate(3.000000, 3.000000)">
-                <polyline id="Path-2" points="6 10.5425427 7.79734561 12.5 13 7"></polyline>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/img/check.svg b/themes/Backend/ExtJs/backend/benchmark/template/local/img/check.svg
deleted file mode 100644
index abc4c05545f..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/img/check.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 18 15" xmlns="http://www.w3.org/2000/svg">
-<g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-<g transform="translate(-550 -181)" stroke="#50E3C2" stroke-width="3">
-<g transform="translate(552 175)">
-<polyline points="0 15.085 3.5947 19 14 8"/>
-</g>
-</g>
-</g>
-</svg>
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/img/durchschnitt-branch.svg b/themes/Backend/ExtJs/backend/benchmark/template/local/img/durchschnitt-branch.svg
deleted file mode 100644
index fc92dbed021..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/img/durchschnitt-branch.svg
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 200 179" xmlns="http://www.w3.org/2000/svg">
-<defs>
-<linearGradient id="d" x1="9.0735%" x2="101.5%" y1="92.842%" y2="-.5%">
-<stop stop-color="#5941F4" offset="0"/>
-<stop stop-color="#766FFF" offset="1"/>
-</linearGradient>
-<linearGradient id="c" x1="-42.144%" x2="98.826%" y1="125.01%" y2="2.2009%">
-<stop stop-color="#5941F4" offset="0"/>
-<stop stop-color="#7770FF" offset="1"/>
-</linearGradient>
-<linearGradient id="b" x1="2.4686%" x2="95.152%" y1="99.512%" y2="5.9104%">
-<stop stop-color="#501CFC" offset="0"/>
-<stop stop-color="#6A63FC" offset="1"/>
-</linearGradient>
-<linearGradient id="a" x1="4.6417%" x2="101.5%" y1="97.317%" y2="-.5%">
-<stop stop-color="#5038EF" offset="0"/>
-<stop stop-color="#746EFF" offset="1"/>
-</linearGradient>
-</defs>
-<g fill="none" fill-rule="evenodd">
-<g transform="translate(16 19)">
-<ellipse cx="74.375" cy="128.81" rx="74.375" ry="12.531" fill="#000729" fill-opacity=".23"/>
-<g transform="translate(76.25)">
-<path d="m6 3.3981h19.25c3.3137 0 6 2.6863 6 6v119.89c0 6.6274-5.3726 12-12 12h-7.25c-6.6274 0-12-5.3726-12-12l8.8818e-16 -119.89c-4.0581e-16 -3.3137 2.6863-6 6-6z" fill="url(#d)"/>
-<path d="m15.625 17.243c8.6294 0 15.625-3.8601 15.625-8.6217 0-4.7616-6.9956-8.6217-15.625-8.6217-8.6294 0-15.625 3.8601-15.625 8.6217 0 4.7616 6.9956 8.6217 15.625 8.6217z" fill="url(#c)"/>
-</g>
-<g transform="translate(10 89.864)">
-<path d="m15.192 0.067938c1.577-0.16495 3.1159 0.017275 4.5036 0.53043l87.551 31.501c5.4411 2.0121 8.9633 7.8048 8.9633 13.546 0 4.6763-2.296 9.927-7.3021 12.74-3.7239 2.0926-7.8385 2.3049-12.154 1.443l-84.53-30.781c-0.91861-0.33969-1.878-0.814-2.8223-1.4135-5.4829-1.9765-9.4022-7.2205-9.4022-13.379 0-7.853 6.3731-14.219 14.235-14.219 0.32174 0 0.64099 0.010663 0.95741 0.031654z" fill="url(#b)"/>
-<ellipse cx="101.42" cy="45.656" rx="14.828" ry="14.812" fill="url(#a)"/>
-</g>
-</g>
-</g>
-</svg>
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/img/durchschnitt-shop.svg b/themes/Backend/ExtJs/backend/benchmark/template/local/img/durchschnitt-shop.svg
deleted file mode 100644
index a5f65a9487c..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/img/durchschnitt-shop.svg
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 200 211" xmlns="http://www.w3.org/2000/svg">
-<defs>
-<linearGradient id="d" x1="50%" x2="50%" y1="125.35%" y2="2.4474%">
-<stop stop-color="#5AC5FF" offset="0"/>
-<stop stop-color="#50E3C2" offset="1"/>
-</linearGradient>
-<linearGradient id="c" x1="-61.108%" x2="127.38%" y1="100%">
-<stop stop-color="#4CD2B4" offset="0"/>
-<stop stop-color="#7CFEE1" offset="1"/>
-</linearGradient>
-<linearGradient id="b" x1="100%" x2="-42.893%" y1="100%">
-<stop stop-color="#5AC5FF" offset="0"/>
-<stop stop-color="#50E3C2" offset="1"/>
-</linearGradient>
-<linearGradient id="a" x1="187.88%" x2="-94.02%" y2="166.07%">
-<stop stop-color="#5AC5FF" offset="0"/>
-<stop stop-color="#5ECFF5" offset="0"/>
-<stop stop-color="#6BF2D4" offset="1"/>
-</linearGradient>
-</defs>
-<g fill="none" fill-rule="evenodd">
-<ellipse cx="87.5" cy="181.5" rx="74.5" ry="12.5" fill="#000729" fill-opacity=".23"/>
-<g transform="translate(57 14)">
-<path d="m5.2113 3.4228h18.486c2.4315 0 4.5505 1.656 5.1381 4.0154l-2.6e-6 155.14c0 1.4418-0.6224 2.8134-1.7075 3.7629-3.241 2.8359-7.4778 4.2539-12.71 4.2539-5.2326 0-9.4695-1.418-12.71-4.2539l2.81e-6 -3e-6c-1.0851-0.94944-1.7075-2.3211-1.7075-3.7629l8.7663e-13 -155.07h8.8818e-16c0.58703-2.4015 2.7391-4.0909 5.2113-4.0909z" fill="url(#d)"/>
-<path d="m14.418 15c7.9628 0 14.418-3.3579 14.418-7.5 0-4.1421-6.4551-7.5-14.418-7.5-7.9628 0-14.418 3.3579-14.418 7.5 0 4.1421 6.4551 7.5 14.418 7.5z" fill="url(#c)"/>
-</g>
-<g transform="translate(118.12 168.58) scale(-1 1) translate(-40 -37.5)">
-<path transform="translate(39.671 37.444) scale(-1 1) rotate(40) translate(-39.671 -37.444)" d="m20.356 19.287c0.63362 0.063655 1.2823 0.15768 1.9459 0.28033l43.292 6.3418c5.5987 2.0653 10.304 8.1728 10.304 14.066 0 4.8-2.3625 10.19-7.5135 13.077-3.8317 2.1479-5.8938 3.3091-10.334 2.4244l-43.484-7.3842c-2.6574-0.3865-5.4565-2.0815-7.4393-4.7066-2.2908-2.5757-3.6817-5.9644-3.6817-9.6767 0-8.0608 6.5576-14.595 14.647-14.595 0.77013 0 1.5264 0.059229 2.2644 0.17336z" fill="url(#b)"/>
-<ellipse transform="translate(25.272 53.611) scale(-1 1) translate(-25.272 -53.611)" cx="25.272" cy="53.611" rx="15.257" ry="15.204" fill="url(#a)"/>
-</g>
-</g>
-</svg>
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/img/funny-graph.svg b/themes/Backend/ExtJs/backend/benchmark/template/local/img/funny-graph.svg
deleted file mode 100644
index 057eecce375..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/img/funny-graph.svg
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 1024 136" xmlns="http://www.w3.org/2000/svg">
-<defs>
-<linearGradient id="a" x1="9.0735%" x2="101.5%" y1="92.842%" y2="-.5%">
-<stop stop-color="#5941F4" offset="0"/>
-<stop stop-color="#766FFF" offset="1"/>
-</linearGradient>
-<linearGradient id="b" x1="50%" x2="50%" y1="2.4474%" y2="100%">
-<stop stop-color="#5AC5FF" offset="0"/>
-<stop stop-color="#50E3C2" offset="1"/>
-</linearGradient>
-<linearGradient id="c" x1="2.4686%" x2="100.67%" y1="99.512%" y2=".34313%">
-<stop stop-color="#511CFC" offset="0"/>
-<stop stop-color="#34DCDD" offset="1"/>
-</linearGradient>
-</defs>
-<g fill="none" fill-rule="evenodd">
-<g transform="translate(-448 -439)">
-<g transform="translate(448 144)">
-<g transform="translate(-27 270)">
-<g transform="translate(771 50)" stroke-linecap="round" stroke-width="18">
-<path transform="translate(78.275 64.855) rotate(60) translate(-78.275 -64.855)" d="m93.887 109.51c0-3.0286-10.408-32.802-31.223-89.32" stroke="url(#a)"/>
-<path d="m43.56 92.421c10.728-30.916 19.596-50.619 26.606-59.109 10.318-12.496 20.243-3.8941 32.988 3.1917 20.65 11.48 32.267-5.8848 39.064-13.766" stroke="url(#b)"/>
-<path transform="translate(40.949 50.938) rotate(30) translate(-40.949 -50.938)" d="m59.801 98.873c0-3.0286-12.568-34.985-37.705-95.868" stroke="url(#a)"/>
-</g>
-<g transform="translate(185 34)" stroke-linecap="round" stroke-width="18">
-<path d="m62.653 117.17c0-3.0286-15.819-42.085-47.456-117.17" stroke="url(#a)"/>
-<path d="m40.884 24.094c-28.996 4.8445-42.568 16.623-40.717 35.335 2.7762 28.069 28.306 24.441 34.319 53.342" stroke="url(#b)"/>
-<path transform="translate(74.918 80.494) rotate(30) translate(-74.918 -80.494)" d="m86.814 114.2c0-3.0286-7.931-25.497-23.793-67.406" stroke="url(#a)"/>
-</g>
-<g fill="url(#c)">
-<path d="m0.0188 76.504c31.995 31.341 75.721 50.544 131.18 57.609 83.184 10.598 111.64-8.9883 228.43-15.613s242.63 28.059 354.28 23.613c111.64-4.4453 278.84-58.344 372.33-125.62 16.788-12.08 34.095-24.128 34.825-9.6221 1.1946 23.717 1.7919 75.089 1.7919 154.12h-1122.8v-84.482z"/>
-</g>
-</g>
-</g>
-</g>
-</g>
-</svg>
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/img/ice-branch.svg b/themes/Backend/ExtJs/backend/benchmark/template/local/img/ice-branch.svg
deleted file mode 100644
index f6a8d8981a4..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/img/ice-branch.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 116 219" xmlns="http://www.w3.org/2000/svg">
-<defs>
-<linearGradient id="b" x1="50%" x2="50%" y1="97.345%" y2="2.543%">
-<stop stop-color="#798EA3" offset="0"/>
-<stop stop-color="#798EA3" stop-opacity="0" offset="1"/>
-</linearGradient>
-<linearGradient id="a" x1="100.67%" x2="100.67%" y1=".34313%" y2="151.08%">
-<stop stop-color="#511CFC" offset="0"/>
-<stop stop-color="#34DCDD" offset="1"/>
-</linearGradient>
-</defs>
-<g fill="none" fill-rule="evenodd">
-<g transform="translate(-583 -4868)">
-<g transform="translate(446 196)">
-<g transform="translate(102 4530)">
-<g transform="translate(35 142)">
-<rect x="48.409" y="105.04" width="20.094" height="113.26" rx="10.047" fill="url(#b)" opacity=".54699"/>
-<path d="m1.5348 169.4c0.40122 0.58074 0.80358 0.94744 2.1861 1.4038 3.7207 1.2283 31.503 3.1364 54.638 3.1277 21.166-0.007986 47.366-2.3325 51.543-3.1277 2.2756-0.43317 2.7591-0.92119 3.2567-1.4038 3.6512-3.5412 13.005-169.4-53.932-169.4-66.937 0-59.821 166.32-57.692 169.4z" fill="url(#a)"/>
-<rect x="38.362" y="41.102" width="10.961" height="104.13" rx="5.4803" fill="#fff" opacity=".13632"/>
-<rect x="67.591" y="41.102" width="10.961" height="104.13" rx="5.4803" fill="#fff" opacity=".13632"/>
-<path d="m26.684 73.25c12.313 0 11.516 10.182 21.882 10.182 10.302 0 6.8439-12.488 21.087-20.372 14.243-7.884 13.248 5.7348 28.529 0 7.0107-2.631 10.899-8.5078 8.1597-15.649-10.094-26.319-22.505-47.411-45.981-47.411-33.324 0-50.973 41.469-57.449 83.432-0.37795 2.4491-0.43459 3.0472 0.6507 4.6702 1.2251 1.8321 10.807-14.853 23.12-14.853z" fill="#6A63FC"/>
-</g>
-</g>
-</g>
-</g>
-</g>
-</svg>
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/img/ice-shop.svg b/themes/Backend/ExtJs/backend/benchmark/template/local/img/ice-shop.svg
deleted file mode 100644
index ad69a437c91..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/img/ice-shop.svg
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 127 214" xmlns="http://www.w3.org/2000/svg">
-<defs>
-<linearGradient id="b" x1="50%" x2="50%" y1="97.345%" y2="2.543%">
-<stop stop-color="#798EA3" offset="0"/>
-<stop stop-color="#798EA3" stop-opacity="0" offset="1"/>
-</linearGradient>
-<linearGradient id="a" x1="55.13%" x2="55.13%" y1="138.61%" y2="-2.7862%">
-<stop stop-color="#00A5FF" offset="0"/>
-<stop stop-color="#34DCDD" offset="1"/>
-</linearGradient>
-</defs>
-<g fill="none" fill-rule="evenodd">
-<g transform="translate(-1011 -4872)">
-<g transform="translate(446 196)">
-<g transform="translate(102 4530)">
-<g transform="translate(453 115)">
-<g transform="translate(75.941 138.41) rotate(10) translate(-57 -108.5)">
-<rect x="47.952" y="104.05" width="19.905" height="112.19" rx="9.9524" fill="url(#b)" opacity=".54699"/>
-<g fill="url(#a)">
-<path d="m1.5203 167.8c0.42984 0.85963 1.1406 1.3069 1.5418 1.5405 1.9088 1.1114 29.426 3.2369 54.35 3.2211 23.34-0.01479 45.365-1.6701 51.787-2.8024 1.5464-0.27268 2.3075-0.76861 2.892-1.9592 1.1282-2.2983 12.882-167.8-53.423-167.8-66.305 0-59.017 164.06-57.147 167.8z"/>
-</g>
-<rect x="38" y="40.714" width="10.857" height="103.14" rx="5.4286" fill="#fff" opacity=".13632"/>
-<rect x="66.952" y="40.714" width="10.857" height="103.14" rx="5.4286" fill="#fff" opacity=".13632"/>
-<path d="m26.432 72.558c12.197 0 11.407 10.086 21.676 10.086 10.205 0 6.7793-12.37 20.888-20.18 14.109-7.8095 9.9311 3.2576 26.208 0.3875 3.1049-0.54748 8.6116-1.8223 11.525-3.26 3.7609-1.8559 1.7301-6.3021 0.10149-9.4917-0.93717-1.8354-2.4982-5.7329-3.0111-7.0095-9.7375-24.237-21.937-43.091-44.028-43.091-33.009 0-50.491 41.077-56.906 82.645-0.37438 2.426-0.43049 3.0184 0.64455 4.6261 1.2136 1.8148 10.705-14.712 22.902-14.712z" fill="#34DCDD"/>
-</g>
-</g>
-</g>
-</g>
-</g>
-</g>
-</svg>
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/img/konfetti.svg b/themes/Backend/ExtJs/backend/benchmark/template/local/img/konfetti.svg
deleted file mode 100644
index 63da7066837..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/img/konfetti.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 693 162" xmlns="http://www.w3.org/2000/svg">
-<g fill="none" fill-rule="evenodd">
-<g transform="translate(2)">
-<ellipse cx="15.39" cy="81.5" rx="15.39" ry="15.377" stroke="#34DCDD" stroke-width="3"/>
-<ellipse cx="312.41" cy="96.877" rx="15.39" ry="15.377" stroke="#34DCDD" stroke-width="3"/>
-<ellipse cx="564.8" cy="66.123" rx="15.39" ry="15.377" stroke="#34DCDD" stroke-width="3"/>
-<ellipse cx="464" cy="152" rx="10.003" ry="9.9953" fill="#6A63FC"/>
-<ellipse cx="245.47" cy="45.363" rx="10.003" ry="9.9953" fill="#6A63FC"/>
-<ellipse cx="642.52" cy="9.9953" rx="10.003" ry="9.9953" fill="#6A63FC"/>
-<ellipse cx="150.05" cy="139.17" rx="10.003" ry="9.9953" fill="#6A63FC"/>
-<rect transform="translate(112.35 39.212) rotate(-40) translate(-112.35 -39.212)" x="104.65" y="21.528" width="15.39" height="35.368" fill="#189EFF"/>
-<rect transform="translate(670.99 76.118) rotate(240) translate(-670.99 -76.118)" x="663.3" y="58.434" width="15.39" height="35.368" fill="#189EFF"/>
-<rect transform="translate(406.29 57.665) rotate(200) translate(-406.29 -57.665)" x="398.59" y="39.981" width="15.39" height="35.368" fill="#189EFF"/>
-</g>
-</g>
-</svg>
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/img/payship-branch.svg b/themes/Backend/ExtJs/backend/benchmark/template/local/img/payship-branch.svg
deleted file mode 100644
index 5f2cdc6d488..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/img/payship-branch.svg
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 172 141" xmlns="http://www.w3.org/2000/svg">
-<defs>
-<linearGradient id="d" x1="50%" x2="50%" y1="2.8615%" y2="98.005%">
-<stop stop-color="#37506B" offset="0"/>
-<stop stop-color="#798EA3" offset="1"/>
-</linearGradient>
-<radialGradient id="b" cx="38.059%" cy="74.312%" r="66.43%" gradientTransform="translate(.38059 .74312) scale(.81813 1) rotate(-90) scale(1 1.0171) translate(-.38059 -.74312)">
-<stop stop-color="#92A6BA" offset="0"/>
-<stop stop-color="#37506B" offset="1"/>
-</radialGradient>
-<linearGradient id="c" x1="-70.022%" x2="20.477%" y1="-22.801%" y2="166.31%">
-<stop stop-color="#6A63FC" stop-opacity=".8" offset="0"/>
-<stop stop-color="#6A63FC" offset=".51582"/>
-<stop stop-color="#3F87FE" offset="1"/>
-</linearGradient>
-<radialGradient id="a" cy="51.161%" r="58.059%" gradientTransform="translate(.5 .51161) rotate(99.623) scale(1 .43186) translate(-.5 -.51161)">
-<stop stop-color="#fff" stop-opacity=".39" offset="0"/>
-<stop stop-color="#fff" stop-opacity="0" offset="1"/>
-</radialGradient>
-</defs>
-<g fill="none" fill-rule="evenodd">
-<g transform="translate(-18 -22)">
-<g transform="translate(0 -68)">
-<ellipse cx="110" cy="222" rx="61" ry="9" fill="#000729" fill-opacity=".23"/>
-<path d="m133.72 216.29c2.1091 0 3.8188 1.7097 3.8188 3.8188s-1.7097 3.8188-3.8188 3.8188h-61.192c-2.1091 0-3.8188-1.7097-3.8188-3.8188s1.7097-3.8188 3.8188-3.8188h-1.4454c10.021-4.1133 15.032-10.648 15.032-19.606s-2.3734-17.98-7.1203-27.069h47.469c-5.2743 11.651-7.9115 20.635-7.9115 26.95s5.2743 12.89 15.823 19.724h-0.65421z" fill="url(#d)" opacity=".02"/>
-<path d="m135.01 216.67c2.1091 0 3.8188 1.7097 3.8188 3.8188 0 2.1757-1.6536 3.995-3.8194 4.2021-11.27 1.0778-21.885 1.6167-31.844 1.6167-9.7976 0-19.579-0.52158-29.343-1.5647l1.2e-6 -1.2e-5c-2.1745-0.23231-3.8238-2.0672-3.8238-4.2541 0-2.1091 1.7097-3.8188 3.8188-3.8188h-1.4454c10.021-4.1133 15.032-10.648 15.032-19.606s-2.3734-17.98-7.1203-27.069h47.469c-5.2743 11.651-7.9115 20.635-7.9115 26.95s5.2743 12.89 15.823 19.724h-0.65421z" fill="url(#b)" opacity=".48448"/>
-<g transform="translate(19 170.77)">
-<path d="m0.4832 6.0903c-0.31939-0.19382-0.4832-0.39065-0.4832-0.58995 0-3.0378 38.056-5.5003 85-5.5003 46.944 0 85 2.4626 85 5.5003 0 0.24936-0.25642 0.49484-0.75314 0.7354l0.25684-0.01796-11.515 14.196-11.91-11.088c-0.13526 0.009042-0.271 0.018054-0.40721 0.027036l-9.1695 12.599-13.754-11.522c-0.11661 0.0037463-0.23337 0.0074758-0.35028 0.011188l-11.431 13.128-12.656-12.635c-0.24374 0.0024806-0.48782 0.0048941-0.73224 0.0072403l-12.579 13.467-12.559-13.446-12.628 12.607-11.409-13.103c-0.20213-0.0062488-0.40383-0.012548-0.60508-0.018897l-12.393 11.538-10.201-12.576c-0.38266-0.024511-0.76175-0.049256-1.1372-0.07423l-13.185 11.045-10.4-14.29z" fill="#fff" stroke="#fff" stroke-linecap="round" stroke-linejoin="round"/>
-<polygon transform="translate(11.697 11.786) rotate(186) translate(-11.697 -11.786)" points="11.697 8.6434 17.156 14.929 6.2385 14.929" fill="#B2C4D7"/>
-<polygon transform="translate(35.872 13.358) rotate(183) translate(-35.872 -13.358)" points="35.872 10.215 41.33 16.501 30.413 16.501" fill="#B2C4D7"/>
-<polygon transform="translate(60.046 14.144) rotate(181) translate(-60.046 -14.144)" points="60.046 11.001 65.505 17.287 54.587 17.287" fill="#B2C4D7"/>
-<polygon transform="translate(110.73 14.144) scale(-1 1) rotate(182) translate(-110.73 -14.144)" points="110.73 11.001 116.19 17.287 105.28 17.287" fill="#B2C4D7"/>
-<polygon transform="translate(134.91 13.358) scale(-1 1) rotate(183) translate(-134.91 -13.358)" points="134.91 10.215 140.37 16.501 129.45 16.501" fill="#B2C4D7"/>
-<polygon transform="translate(157.52 12.572) scale(-1 1) rotate(183) translate(-157.52 -12.572)" points="157.52 9.4292 162.98 15.715 152.06 15.715" fill="#B2C4D7"/>
-<polygon points="85 18.185 78.761 11.001 91.239 11.001" fill="#B2C4D7"/>
-</g>
-<g transform="translate(37.459 90)" fill="url(#c)">
-<path transform="translate(35.548 42.016) scale(-1 1) translate(-35.548 -42.016)" d="m21.193 0.64486c8.2171 0.95364 15.216 6.4105 18.146 14.147l22.41 59.189c1.3689 3.6155-0.45231 7.6562-4.0678 9.0251-0.79198 0.29986-1.6318 0.45353-2.4786 0.45353h-33.929c-3.6411 0-6.6742-2.7914-6.9759-6.4199l-5.3655-64.527c-0.50469-6.0695 4.0065-11.399 10.076-11.904 0.72775-0.060514 1.4597-0.04859 2.1851 0.035595z" opacity=".5"/>
-<path d="m85.295 0.64486c8.2171 0.95364 15.216 6.4105 18.146 14.147l22.41 59.189c1.3689 3.6155-0.45231 7.6562-4.0678 9.0251-0.79198 0.29986-1.6318 0.45353-2.4786 0.45353h-33.929c-3.6411 0-6.6742-2.7914-6.9759-6.4199l-5.3655-64.527c-0.50469-6.0695 4.0065-11.399 10.076-11.904 0.72775-0.060514 1.4597-0.04859 2.1851 0.035595z" opacity=".5"/>
-<path d="m97.175 1.3421c8.1792 0.94924 15.094 6.4956 17.795 14.274l20.575 59.244c1.2683 3.652-0.66404 7.6407-4.3161 8.9091-0.7385 0.25648-1.5147 0.38743-2.2965 0.38743h-31.677c-3.6411 0-6.6742-2.7914-6.9759-6.4199l-5.3655-64.527c-0.50469-6.0695 4.0065-11.399 10.076-11.904 0.72775-0.060514 1.4597-0.04859 2.1851 0.035595z" opacity=".7"/>
-<path transform="translate(25.642 42.713) scale(-1 1) translate(-25.642 -42.713)" d="m12.412 1.3421c8.1792 0.94924 15.094 6.4956 17.795 14.274l20.575 59.244c1.2683 3.652-0.66404 7.6407-4.3161 8.9091-0.7385 0.25648-1.5147 0.38743-2.2965 0.38743h-31.677c-3.6411 0-6.6742-2.7914-6.9759-6.4199l-5.3655-64.527c-0.50469-6.0695 4.0065-11.399 10.076-11.904 0.72775-0.060514 1.4597-0.04859 2.1851 0.035595z" opacity=".7"/>
-<path d="m67.836 0.78964c8.7783 0 16.165 6.5742 17.184 15.293l7.1568 61.262c0.44859 3.8399-2.3006 7.3164-6.1405 7.765-0.2696 0.031496-0.5408 0.047283-0.81224 0.047283h-34.776c-3.866 0-7-3.134-7-7 0-0.27143 0.015788-0.54264 0.047283-0.81224l7.1568-61.262c1.0186-8.719 8.4055-15.293 17.184-15.293z" opacity=".9"/>
-</g>
-<circle cx="92.468" cy="131.43" r="35.642" fill="url(#a)" opacity=".53765"/>
-<circle transform="translate(142.78 133.37) rotate(-30) translate(-142.78 -133.37)" cx="142.78" cy="133.37" r="30.975" fill="url(#a)" opacity=".34952"/>
-</g>
-</g>
-</g>
-</svg>
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/img/payship-shop.svg b/themes/Backend/ExtJs/backend/benchmark/template/local/img/payship-shop.svg
deleted file mode 100644
index d230c3a963a..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/img/payship-shop.svg
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 172 141" xmlns="http://www.w3.org/2000/svg">
-<defs>
-<linearGradient id="g" x1="50%" x2="50%" y1="2.8615%" y2="98.005%">
-<stop stop-color="#37506B" offset="0"/>
-<stop stop-color="#798EA3" offset="1"/>
-</linearGradient>
-<radialGradient id="c" cx="38.059%" cy="74.312%" r="66.43%" gradientTransform="translate(.38059 .74312) scale(.81813 1) rotate(-90) scale(1 1.0171) translate(-.38059 -.74312)">
-<stop stop-color="#92A6BA" offset="0"/>
-<stop stop-color="#37506B" offset="1"/>
-</radialGradient>
-<linearGradient id="b" x1="12.578%" x2="-12.115%" y1="192.58%" y2="-14.323%">
-<stop stop-color="#00A5FF" offset="0"/>
-<stop stop-color="#34DCDD" stop-opacity=".6" offset="1"/>
-</linearGradient>
-<linearGradient id="f" x1="12.578%" x2="-12.115%" y1="192.58%" y2="-14.323%">
-<stop stop-color="#00A5FF" offset="0"/>
-<stop stop-color="#34DCDD" stop-opacity=".8" offset="1"/>
-</linearGradient>
-<linearGradient id="e" x1="12.578%" x2="-12.115%" y1="192.58%" y2="-14.323%">
-<stop stop-color="#00A5FF" offset="0"/>
-<stop stop-color="#34DCDD" stop-opacity=".8" offset=".97026"/>
-</linearGradient>
-<linearGradient id="d" x1="12.578%" x2="-11.204%" y1="192.58%" y2="-6.6917%">
-<stop stop-color="#00A5FF" offset="0"/>
-<stop stop-color="#34DCDD" stop-opacity=".88" offset=".98553"/>
-</linearGradient>
-<radialGradient id="a" cy="51.161%" r="58.059%" gradientTransform="translate(.5 .51161) rotate(99.623) scale(1 .43186) translate(-.5 -.51161)">
-<stop stop-color="#fff" stop-opacity=".39" offset="0"/>
-<stop stop-color="#fff" stop-opacity="0" offset="1"/>
-</radialGradient>
-</defs>
-<g fill="none" fill-rule="evenodd">
-<g transform="translate(-18 -22)">
-<g transform="translate(19 22)">
-<ellipse cx="91" cy="132" rx="61" ry="9" fill="#000729" fill-opacity=".23"/>
-<path d="m114.72 126.29c2.1091 0 3.8188 1.7097 3.8188 3.8188s-1.7097 3.8188-3.8188 3.8188h-61.192c-2.1091 0-3.8188-1.7097-3.8188-3.8188s1.7097-3.8188 3.8188-3.8188h-1.4454c10.021-4.1133 15.032-10.648 15.032-19.606 0-8.9572-2.3734-17.98-7.1203-27.069h47.469c-5.2743 11.651-7.9115 20.635-7.9115 26.95s5.2743 12.89 15.823 19.724h-0.65421z" fill="url(#g)" opacity=".02"/>
-<path d="m116.01 126.67c2.1091 0 3.8188 1.7097 3.8188 3.8188 0 2.1866-1.6503 4.0205-3.8247 4.2504-9.8882 1.0456-19.965 1.5684-30.23 1.5684-10.317 0-20.635-0.52815-30.952-1.5844l2.4e-6 -2.4e-5c-2.1716-0.22232-3.823-2.0514-3.823-4.2343 0-2.1091 1.7097-3.8188 3.8188-3.8188h-1.4454c10.021-4.1133 15.032-10.648 15.032-19.606s-2.3734-17.98-7.1203-27.069h47.469c-5.2743 11.651-7.9115 20.635-7.9115 26.95s5.2743 12.89 15.823 19.724h-0.65421z" fill="url(#c)" opacity=".48448"/>
-<g transform="translate(0 80.771)">
-<path d="m0.4832 6.0903c-0.31939-0.19382-0.4832-0.39065-0.4832-0.58995 0-3.0378 38.056-5.5003 85-5.5003 46.944 0 85 2.4626 85 5.5003 0 0.24936-0.25642 0.49484-0.75314 0.7354l0.25684-0.01796-11.515 14.196-11.91-11.088c-0.13526 0.009042-0.271 0.018054-0.40721 0.027036l-9.1695 12.599-13.754-11.522c-0.11661 0.0037463-0.23337 0.0074758-0.35028 0.011188l-11.431 13.128-12.656-12.635c-0.24374 0.0024806-0.48782 0.0048941-0.73224 0.0072403l-12.579 13.467-12.559-13.446-12.628 12.607-11.409-13.103c-0.20213-0.0062488-0.40383-0.012548-0.60508-0.018897l-12.393 11.538-10.201-12.576c-0.38266-0.024511-0.76175-0.049256-1.1372-0.07423l-13.185 11.045-10.4-14.29z" fill="#fff" stroke="#fff" stroke-linecap="round" stroke-linejoin="round"/>
-<polygon transform="translate(11.697 11.786) rotate(186) translate(-11.697 -11.786)" points="11.697 8.6434 17.156 14.929 6.2385 14.929" fill="#B2C4D7"/>
-<polygon transform="translate(35.872 13.358) rotate(183) translate(-35.872 -13.358)" points="35.872 10.215 41.33 16.501 30.413 16.501" fill="#B2C4D7"/>
-<polygon transform="translate(60.046 14.144) rotate(181) translate(-60.046 -14.144)" points="60.046 11.001 65.505 17.287 54.587 17.287" fill="#B2C4D7"/>
-<polygon transform="translate(110.73 14.144) scale(-1 1) rotate(182) translate(-110.73 -14.144)" points="110.73 11.001 116.19 17.287 105.28 17.287" fill="#B2C4D7"/>
-<polygon transform="translate(134.91 13.358) scale(-1 1) rotate(183) translate(-134.91 -13.358)" points="134.91 10.215 140.37 16.501 129.45 16.501" fill="#B2C4D7"/>
-<polygon transform="translate(157.52 12.572) scale(-1 1) rotate(183) translate(-157.52 -12.572)" points="157.52 9.4292 162.98 15.715 152.06 15.715" fill="#B2C4D7"/>
-<polygon points="85 18.185 78.761 11.001 91.239 11.001" fill="#B2C4D7"/>
-</g>
-<g transform="translate(18.459)">
-<path transform="translate(35.548 42.016) scale(-1 1) translate(-35.548 -42.016)" d="m21.193 0.64486c8.2171 0.95364 15.216 6.4105 18.146 14.147l22.41 59.189c1.3689 3.6155-0.45231 7.6562-4.0678 9.0251-0.79198 0.29986-1.6318 0.45353-2.4786 0.45353h-33.929c-3.6411 0-6.6742-2.7914-6.9759-6.4199l-5.3655-64.527c-0.50469-6.0695 4.0065-11.399 10.076-11.904 0.72775-0.060514 1.4597-0.04859 2.1851 0.035595z" fill="url(#b)" opacity=".7"/>
-<path d="m85.295 0.64486c8.2171 0.95364 15.216 6.4105 18.146 14.147l22.41 59.189c1.3689 3.6155-0.45231 7.6562-4.0678 9.0251-0.79198 0.29986-1.6318 0.45353-2.4786 0.45353h-33.929c-3.6411 0-6.6742-2.7914-6.9759-6.4199l-5.3655-64.527c-0.50469-6.0695 4.0065-11.399 10.076-11.904 0.72775-0.060514 1.4597-0.04859 2.1851 0.035595z" fill="url(#f)" opacity=".7"/>
-<path d="m97.175 1.3421c8.1792 0.94924 15.094 6.4956 17.795 14.274l20.575 59.244c1.2683 3.652-0.66404 7.6407-4.3161 8.9091-0.7385 0.25648-1.5147 0.38743-2.2965 0.38743h-31.677c-3.6411 0-6.6742-2.7914-6.9759-6.4199l-5.3655-64.527c-0.50469-6.0695 4.0065-11.399 10.076-11.904 0.72775-0.060514 1.4597-0.04859 2.1851 0.035595z" fill="url(#b)" opacity=".8"/>
-<path transform="translate(25.642 42.713) scale(-1 1) translate(-25.642 -42.713)" d="m12.412 1.3421c8.1792 0.94924 15.094 6.4956 17.795 14.274l20.575 59.244c1.2683 3.652-0.66404 7.6407-4.3161 8.9091-0.7385 0.25648-1.5147 0.38743-2.2965 0.38743h-31.677c-3.6411 0-6.6742-2.7914-6.9759-6.4199l-5.3655-64.527c-0.50469-6.0695 4.0065-11.399 10.076-11.904 0.72775-0.060514 1.4597-0.04859 2.1851 0.035595z" fill="url(#e)" opacity=".79975"/>
-<path d="m67.836 0.78964c8.7783 0 16.165 6.5742 17.184 15.293l7.1568 61.262c0.44859 3.8399-2.3006 7.3164-6.1405 7.765-0.2696 0.031496-0.5408 0.047283-0.81224 0.047283h-34.776c-3.866 0-7-3.134-7-7 0-0.27143 0.015788-0.54264 0.047283-0.81224l7.1568-61.262c1.0186-8.719 8.4055-15.293 17.184-15.293z" fill="url(#d)"/>
-</g>
-<circle cx="73.468" cy="41.431" r="35.642" fill="url(#a)" opacity=".73828"/>
-<circle transform="translate(123.78 43.369) rotate(-30) translate(-123.78 -43.369)" cx="123.78" cy="43.369" r="30.975" fill="url(#a)" opacity=".55673"/>
-</g>
-</g>
-</g>
-</svg>
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/img/preview-screen.png b/themes/Backend/ExtJs/backend/benchmark/template/local/img/preview-screen.png
deleted file mode 100644
index 1704c3fa7b2..00000000000
Binary files a/themes/Backend/ExtJs/backend/benchmark/template/local/img/preview-screen.png and /dev/null differ
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/img/reset-hover.svg b/themes/Backend/ExtJs/backend/benchmark/template/local/img/reset-hover.svg
deleted file mode 100644
index 6b7c8b9867b..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/img/reset-hover.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="13px" height="16px" viewBox="0 0 13 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round">
-        <g id="reset" transform="translate(1.000000, 0.000000)" stroke="#189EFF" stroke-width="3">
-            <g transform="translate(1.000000, 0.000000)" id="Group-23">
-                <g transform="translate(0.000000, 2.000000)">
-                    <path d="M4.65677897,11.6774495 C1.95560164,11.6434991 0.019124349,9.68597412 0.019124349,6.96065267 C0.019124349,4.23533122 2.45859782,2.50116984 4.65677897,2.50116984 C6.85496012,2.50116984 9.15649414,4.36233521 9.15649414,7.08930969" id="Path-5" transform="translate(4.587809, 7.089310) rotate(-90.000000) translate(-4.587809, -7.089310) "></path>
-                    <polyline id="Path-80" stroke-linejoin="round" points="4.73012288 0.191141764 7.35550604 2.70052299 4.9497304 5"></polyline>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/img/reset.svg b/themes/Backend/ExtJs/backend/benchmark/template/local/img/reset.svg
deleted file mode 100644
index 97907445266..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/img/reset.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="13px" height="16px" viewBox="0 0 13 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round">
-        <g id="reset" transform="translate(1.000000, 0.000000)" stroke="#798EA3" stroke-width="3">
-            <g transform="translate(1.000000, 0.000000)" id="Group-23">
-                <g transform="translate(0.000000, 2.000000)">
-                    <path d="M4.65677897,11.6774495 C1.95560164,11.6434991 0.019124349,9.68597412 0.019124349,6.96065267 C0.019124349,4.23533122 2.45859782,2.50116984 4.65677897,2.50116984 C6.85496012,2.50116984 9.15649414,4.36233521 9.15649414,7.08930969" id="Path-5" transform="translate(4.587809, 7.089310) rotate(-90.000000) translate(-4.587809, -7.089310) "></path>
-                    <polyline id="Path-80" stroke-linejoin="round" points="4.73012288 0.191141764 7.35550604 2.70052299 4.9497304 5"></polyline>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/img/user-branch.svg b/themes/Backend/ExtJs/backend/benchmark/template/local/img/user-branch.svg
deleted file mode 100644
index 7cd6556f02e..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/img/user-branch.svg
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 138 156" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<defs>
-<radialGradient id="i" cx="43.596%" cy="73.041%" r="90.362%" gradientTransform="translate(.43596 .73042) scale(1 .88313) rotate(90) scale(1 .9608) translate(-.43596 -.73042)">
-<stop stop-color="#D7D9FC" stop-opacity=".69" offset="0"/>
-<stop stop-color="#161732" stop-opacity="0" offset="1"/>
-</radialGradient>
-<radialGradient id="g" cx="48.314%" cy="42.742%" r="132.12%" gradientTransform="translate(.48314 .42742) scale(1 .88164) rotate(90) scale(1 .51984) translate(-.48314 -.42742)">
-<stop stop-color="#fff" offset="0"/>
-<stop stop-color="#1F2C36" stop-opacity="0" offset="1"/>
-</radialGradient>
-<path id="c" d="m1.1634 0.63551c20.257 3.3561 40.309 5.0341 60.156 5.0341 19.838 0 39.676-1.6765 59.514-5.0295l-6e-6 -3.8218e-5c0.54458-0.092048 1.0607 0.2748 1.1527 0.81938 0.009308 0.055068 0.013986 0.11082 0.013986 0.16667v76.374c0 33.689-27.311 61-61 61-33.689 0-61-27.311-61-61l-8.3369e-6 -76.378c2.658e-9 -0.55229 0.44772-1 1-1 0.054759 0 0.10943 0.0044978 0.16345 0.013448z"/>
-<linearGradient id="j" x1="25.762%" x2="64.564%" y1="-59.055%" y2="105.29%">
-<stop stop-color="#3F9EFE" offset="0"/>
-<stop stop-color="#6A63FC" offset="1"/>
-</linearGradient>
-<radialGradient id="f" cx="55.837%" cy="100%" r="89.875%" gradientTransform="translate(.55837 1) scale(.72298 1) rotate(-90) scale(1 1.0653) translate(-.55837 -1)">
-<stop stop-color="#2627C6" stop-opacity=".56" offset="0"/>
-<stop stop-color="#6A63FC" stop-opacity="0" offset="1"/>
-</radialGradient>
-<radialGradient id="e" cy="29.271%" r="81.195%" gradientTransform="translate(.5 .29271) scale(.13536 1) rotate(90) scale(1 6.8723) translate(-.5 -.29271)">
-<stop stop-color="#fff" offset="0"/>
-<stop stop-color="#DAE5FF" stop-opacity="0" offset="1"/>
-</radialGradient>
-<radialGradient id="d" cx="53.079%" cy="45.04%" r="70.239%" gradientTransform="translate(.53079 .4504) scale(.62629 1) rotate(90) translate(-.53079 -.4504)">
-<stop stop-color="#fff" stop-opacity=".05" offset="0"/>
-<stop stop-color="#5F668C" stop-opacity="0" offset="1"/>
-</radialGradient>
-<radialGradient id="a" cx="0%" cy="0%" r="129.6%">
-<stop stop-color="#fff" offset="0"/>
-<stop stop-color="#fff" stop-opacity="0" offset="1"/>
-</radialGradient>
-<radialGradient id="h" cx="24.426%" cy="-17.474%" r="129.6%">
-<stop stop-color="#fff" offset="0"/>
-<stop stop-color="#fff" stop-opacity="0" offset="1"/>
-</radialGradient>
-</defs>
-<g fill="none" fill-rule="evenodd">
-<g transform="translate(-1 -5)">
-<ellipse cx="67" cy="152" rx="61" ry="9" fill="#000729" fill-opacity=".23"/>
-<path transform="translate(75 84) rotate(-12) translate(-75 -84)" d="m16.776 16.117c19.282-2.0885 30.422-4.1168 58.019-4.1168 27.597 0 38.098 1.9687 57.656 4.1168 0.19682 0.021618 0.86412 0.16464 2.0019 0.42906l-4e-6 1.48e-5c0.906 0.21056 1.5473 1.0179 1.5473 1.9481v76.506c0 33.689-27.311 61-61 61-33.689 0-61-27.311-61-61l-9.9e-6 -75.79c0-1.5887 1.1969-2.9222 2.7763-3.0933z" fill="#CAD3FA" fill-opacity=".44" opacity=".14595"/>
-<path transform="translate(75 85.927) rotate(-12) translate(-75 -85.927)" d="m14 16.855c20.653 3.4754 41.092 5.213 61.32 5.213 19.839 0 39.677-1.6715 59.514-5.0146l6e-6 3.38e-5c0.54459-0.091775 1.0605 0.2753 1.1522 0.81989 0.009253 0.054908 0.013904 0.11049 0.013904 0.16617v75.961c0 33.689-27.311 61-61 61-33.689 0-61-27.311-61-61l4e-7 -77.145z" fill="url(#i)" opacity=".40049"/>
-<g transform="translate(75 87) rotate(-12) translate(-61 -70)">
-<mask id="b" fill="white">
-<use xlink:href="#c"/>
-</mask>
-<use fill="url(#g)" opacity=".18389" xlink:href="#c"/>
-<path d="m1.6135 34.334c2.0747 0.89781 3.2259 1.3737 3.4538 1.4276 5.3421 1.2639 7.1097 3.1615 22.61 3.1615 15.5 0 50.137 15.406 73.343 11.878 5.4235-0.82466 12.562 0.092767 21.416 2.7523l1e-6 -4.1e-6c0.41754 0.12542 0.70571 0.5069 0.71221 0.94283l0.62438 41.887c0.34565 23.188-18.172 42.267-41.361 42.612-0.2086 0.003109-0.41723 0.004664-0.62586 0.004664h-19.582c-34.354 0-62.204-27.85-62.204-62.204l2.1e-14 -33.965 0.21673-7.6078c0.015727-0.55206 0.47601-0.98685 1.0281-0.97112 0.12697 0.0036173 0.2521 0.031393 0.36867 0.081841z" fill="url(#j)" mask="url(#b)"/>
-<ellipse transform="translate(73.599 113.15) rotate(-20) translate(-73.599 -113.15)" cx="73.599" cy="113.15" rx="43.342" ry="31.335" fill="url(#f)" mask="url(#b)"/>
-<path transform="translate(41.795 43.312) rotate(9) translate(-41.795 -43.312)" d="m55.384 45.907c6.5886 0.54236 9.1227-1.8161 1.4195-3.0989-7.7032-1.2828-12.868-1.7735-19.005-2.0952-4.3851-0.22981-14.695 0.0026884-15.719 1.6173-1.275 2.0096 26.716 3.0344 33.305 3.5768z" fill="url(#e)" mask="url(#b)" opacity=".3014" style="mix-blend-mode:soft-light"/>
-<rect x="-23.276" y="46.601" width="156.51" height="98.023" fill="url(#d)" mask="url(#b)"/>
-</g>
-<g transform="translate(61 109) rotate(148) translate(-12 -21)" opacity=".3" stroke="#213448" stroke-width="7" style="mix-blend-mode:hard-light">
-<ellipse cx="12" cy="29.842" rx="12" ry="12.158"/>
-<path d="m12.545 17.684v-15.916" stroke-linecap="round"/>
-<path d="m18.545 7.1842h-12" stroke-linecap="round"/>
-</g>
-<g transform="translate(100.5 96) rotate(8) translate(-11.5 -19)" opacity=".3" stroke="#213448" stroke-width="6" style="mix-blend-mode:hard-light">
-<ellipse cx="11.139" cy="25.956" rx="11.139" ry="11.356"/>
-<path d="m11.139 14.6v-11.356" stroke-linecap="round"/>
-<polyline points="3.2763 7.8887 11.153 0.20041 18.653 7.8887" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<circle transform="translate(45.5 87.5) rotate(-12) translate(-45.5 -87.5)" cx="45.5" cy="87.5" r="5.5" fill="url(#a)" opacity=".41508" style="mix-blend-mode:hard-light"/>
-<circle transform="translate(89.5 113.5) rotate(-12) translate(-89.5 -113.5)" cx="89.5" cy="113.5" r="2.5" fill="url(#a)" style="mix-blend-mode:soft-light"/>
-<circle transform="translate(56 123) rotate(-12) translate(-56 -123)" cx="56" cy="123" r="3" fill="url(#a)" opacity=".4191" style="mix-blend-mode:soft-light"/>
-<circle transform="translate(88.5 91.5) rotate(-12) translate(-88.5 -91.5)" cx="88.5" cy="91.5" r="4.5" fill="url(#a)" style="mix-blend-mode:soft-light"/>
-<circle transform="translate(113 102) rotate(-12) translate(-113 -102)" cx="113" cy="102" r="3" fill="url(#a)" opacity=".53601" style="mix-blend-mode:hard-light"/>
-<circle transform="translate(68.5 89.5) scale(-1 1) rotate(-12) translate(-68.5 -89.5)" cx="68.5" cy="89.5" r="4.5" fill="url(#h)" opacity=".46382" style="mix-blend-mode:hard-light"/>
-</g>
-</g>
-</svg>
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/img/user-shop.svg b/themes/Backend/ExtJs/backend/benchmark/template/local/img/user-shop.svg
deleted file mode 100644
index 2bfa350f5a5..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/img/user-shop.svg
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 138 156" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<defs>
-<radialGradient id="i" cx="43.596%" cy="73.041%" r="90.362%" gradientTransform="translate(.43596 .73042) scale(1 .88313) rotate(90) scale(1 .9608) translate(-.43596 -.73042)">
-<stop stop-color="#D7D9FC" stop-opacity=".69" offset="0"/>
-<stop stop-color="#161732" stop-opacity="0" offset="1"/>
-</radialGradient>
-<radialGradient id="g" cx="48.314%" cy="42.742%" r="132.12%" gradientTransform="translate(.48314 .42742) scale(1 .88164) rotate(90) scale(1 .51984) translate(-.48314 -.42742)">
-<stop stop-color="#fff" offset="0"/>
-<stop stop-color="#1F2C36" stop-opacity="0" offset="1"/>
-</radialGradient>
-<path id="c" d="m1.1634 0.63551c20.257 3.3561 40.309 5.0341 60.156 5.0341 19.838 0 39.676-1.6765 59.514-5.0295l-6e-6 -3.8218e-5c0.54458-0.092048 1.0607 0.2748 1.1527 0.81938 0.009308 0.055068 0.013986 0.11082 0.013986 0.16667v76.374c0 33.689-27.311 61-61 61-33.689 0-61-27.311-61-61l-8.3369e-6 -76.378c2.658e-9 -0.55229 0.44772-1 1-1 0.054759 0 0.10943 0.0044978 0.16345 0.013448z"/>
-<linearGradient id="j" x1="65.129%" x2="29.644%" y1="115.13%" y2="-27.014%">
-<stop stop-color="#00A5FF" offset="0"/>
-<stop stop-color="#55D6DD" offset=".63466"/>
-<stop stop-color="#50E3C2" offset="1"/>
-</linearGradient>
-<radialGradient id="f" cx="43.289%" cy="104.3%" r="93.824%" gradientTransform="translate(.43289 1.043) scale(.72298 1) rotate(-90) scale(1 1.2462) translate(-.43289 -1.043)">
-<stop stop-color="#654DFF" stop-opacity=".56" offset="0"/>
-<stop stop-color="#fff" stop-opacity="0" offset="1"/>
-</radialGradient>
-<radialGradient id="e" cy="29.271%" r="81.195%" gradientTransform="translate(.5 .29271) scale(.13536 1) rotate(90) scale(1 6.8723) translate(-.5 -.29271)">
-<stop stop-color="#fff" offset="0"/>
-<stop stop-color="#DAE5FF" stop-opacity="0" offset="1"/>
-</radialGradient>
-<radialGradient id="d" cx="53.079%" cy="45.04%" r="70.239%" gradientTransform="translate(.53079 .4504) scale(.62629 1) rotate(90) translate(-.53079 -.4504)">
-<stop stop-color="#fff" stop-opacity=".05" offset="0"/>
-<stop stop-color="#5F668C" stop-opacity="0" offset="1"/>
-</radialGradient>
-<radialGradient id="a" cx="0%" cy="0%" r="129.6%">
-<stop stop-color="#fff" offset="0"/>
-<stop stop-color="#fff" stop-opacity="0" offset="1"/>
-</radialGradient>
-<radialGradient id="h" cx="24.426%" cy="-17.474%" r="129.6%">
-<stop stop-color="#fff" offset="0"/>
-<stop stop-color="#fff" stop-opacity="0" offset="1"/>
-</radialGradient>
-</defs>
-<g fill="none" fill-rule="evenodd">
-<g transform="translate(-1 -5)">
-<ellipse cx="67" cy="152" rx="61" ry="9" fill="#000729" fill-opacity=".23"/>
-<path transform="translate(75 84) rotate(-12) translate(-75 -84)" d="m16.776 16.117c19.282-2.0885 30.422-4.1168 58.019-4.1168 27.597 0 38.098 1.9687 57.656 4.1168 0.19682 0.021618 0.86412 0.16464 2.0019 0.42906l-4e-6 1.48e-5c0.906 0.21056 1.5473 1.0179 1.5473 1.9481v76.506c0 33.689-27.311 61-61 61-33.689 0-61-27.311-61-61l-9.9e-6 -75.79c0-1.5887 1.1969-2.9222 2.7763-3.0933z" fill="#CAD3FA" fill-opacity=".44" opacity=".14595"/>
-<path transform="translate(75 85.927) rotate(-12) translate(-75 -85.927)" d="m14 16.855c20.653 3.4754 41.092 5.213 61.32 5.213 19.839 0 39.677-1.6715 59.514-5.0146l6e-6 3.38e-5c0.54459-0.091775 1.0605 0.2753 1.1522 0.81989 0.009253 0.054908 0.013904 0.11049 0.013904 0.16617v75.961c0 33.689-27.311 61-61 61-33.689 0-61-27.311-61-61l4e-7 -77.145z" fill="url(#i)" opacity=".40049"/>
-<g transform="translate(75 87) rotate(-12) translate(-61 -70)">
-<mask id="b" fill="white">
-<use xlink:href="#c"/>
-</mask>
-<use fill="url(#g)" opacity=".18389" xlink:href="#c"/>
-<path d="m1.6135 34.334c2.0747 0.89781 3.2259 1.3737 3.4538 1.4276 5.3421 1.2639 7.1097 3.1615 22.61 3.1615 15.5 0 50.137 15.406 73.343 11.878 5.4235-0.82466 12.562 0.092767 21.416 2.7523l1e-6 -4.1e-6c0.41754 0.12542 0.70571 0.5069 0.71221 0.94283l0.62438 41.887c0.34565 23.188-18.172 42.267-41.361 42.612-0.2086 0.003109-0.41723 0.004664-0.62586 0.004664h-19.582c-34.354 0-62.204-27.85-62.204-62.204l2.1e-14 -33.965 0.21673-7.6078c0.015727-0.55206 0.47601-0.98685 1.0281-0.97112 0.12697 0.0036173 0.2521 0.031393 0.36867 0.081841z" fill="url(#j)" mask="url(#b)"/>
-<ellipse transform="translate(69.956 106.24) rotate(-20) translate(-69.956 -106.24)" cx="69.956" cy="106.24" rx="43.342" ry="31.335" fill="url(#f)" mask="url(#b)"/>
-<path transform="translate(41.795 43.312) rotate(9) translate(-41.795 -43.312)" d="m55.384 45.907c6.5886 0.54236 9.1227-1.8161 1.4195-3.0989-7.7032-1.2828-12.868-1.7735-19.005-2.0952-4.3851-0.22981-14.695 0.0026884-15.719 1.6173-1.275 2.0096 26.716 3.0344 33.305 3.5768z" fill="url(#e)" mask="url(#b)" style="mix-blend-mode:soft-light"/>
-<rect x="-23.276" y="46.601" width="156.51" height="98.023" fill="url(#d)" mask="url(#b)"/>
-</g>
-<g transform="translate(61 109) rotate(148) translate(-12 -21)" opacity=".87847" stroke="#213448" stroke-width="7" style="mix-blend-mode:soft-light">
-<ellipse cx="12" cy="29.842" rx="12" ry="12.158"/>
-<path d="m12.545 17.684v-15.916" stroke-linecap="round"/>
-<path d="m18.545 7.1842h-12" stroke-linecap="round"/>
-</g>
-<g transform="translate(100.5 96) rotate(8) translate(-11.5 -19)" opacity=".78636" stroke="#213448" stroke-width="6" style="mix-blend-mode:soft-light">
-<ellipse cx="11.139" cy="25.956" rx="11.139" ry="11.356"/>
-<path d="m11.139 14.6v-11.356" stroke-linecap="round"/>
-<polyline points="3.2763 7.8887 11.153 0.20041 18.653 7.8887" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<circle transform="translate(45.5 87.5) rotate(-12) translate(-45.5 -87.5)" cx="45.5" cy="87.5" r="5.5" fill="url(#a)" style="mix-blend-mode:soft-light"/>
-<circle transform="translate(89.5 113.5) rotate(-12) translate(-89.5 -113.5)" cx="89.5" cy="113.5" r="2.5" fill="url(#a)" style="mix-blend-mode:soft-light"/>
-<circle transform="translate(56 123) rotate(-12) translate(-56 -123)" cx="56" cy="123" r="3" fill="url(#a)" opacity=".4191" style="mix-blend-mode:soft-light"/>
-<circle transform="translate(88.5 91.5) rotate(-12) translate(-88.5 -91.5)" cx="88.5" cy="91.5" r="4.5" fill="url(#a)" style="mix-blend-mode:soft-light"/>
-<circle transform="translate(113 102) rotate(-12) translate(-113 -102)" cx="113" cy="102" r="3" fill="url(#a)" style="mix-blend-mode:soft-light"/>
-<circle transform="translate(68.5 89.5) scale(-1 1) rotate(-12) translate(-68.5 -89.5)" cx="68.5" cy="89.5" r="4.5" fill="url(#h)" style="mix-blend-mode:soft-light"/>
-</g>
-</g>
-</svg>
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/img/wait-info.svg b/themes/Backend/ExtJs/backend/benchmark/template/local/img/wait-info.svg
deleted file mode 100644
index 190ee6cbd6e..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/img/wait-info.svg
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 161 141" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<defs>
-<linearGradient id="ab" x1="40.281%" x2="140.08%" y1="61.737%" y2="52.429%">
-<stop stop-color="#37506B" offset="0"/>
-<stop stop-color="#798EA3" offset="1"/>
-</linearGradient>
-<linearGradient id="y" x1="40.281%" x2="139.56%" y1="61.737%" y2="52.477%">
-<stop stop-color="#37506B" offset="0"/>
-<stop stop-color="#798EA3" offset="1"/>
-</linearGradient>
-<linearGradient id="v" x1="140.08%" x2="40.281%" y1="52.429%" y2="61.737%">
-<stop stop-color="#37506B" offset="0"/>
-<stop stop-color="#798EA3" offset="1"/>
-</linearGradient>
-<linearGradient id="g" x1="2.4686%" x2="100.32%" y1="99.512%" y2=".68796%">
-<stop stop-color="#654DFF" offset="0"/>
-<stop stop-color="#6A63FC" offset="1"/>
-</linearGradient>
-<path id="d" d="m17.325 33.458c2.5836 0.42621 5.2904 0.60703 8.1203 0.54246 5.5374-0.12635 8.1022-1 15.844-1 3.9671 0 6.994 0.19692 9.0809 0.59076l8e-7 -4.4e-6c0.94486 0.17832 1.6291 1.0038 1.6291 1.9653l9.8e-6 71.303c0 2.4455-1.7689 4.5321-4.1814 4.9325-4.8556 0.80587-9.6659 1.2088-14.431 1.2088-4.739 0-9.478-0.39854-14.217-1.1956l1e-7 -1e-6c-2.4076-0.40494-4.1707-2.4894-4.1707-4.9307l-1.053e-4 -71.443c-1.3e-6 -1.1046 0.89544-2 2-2 0.10906-1e-7 0.21794 0.0089204 0.32555 0.026672z"/>
-<filter id="ac" x="-14.9%" y="-6.9%" width="129.7%" height="113.7%">
-<feGaussianBlur in="SourceAlpha" result="shadowBlurInner1" stdDeviation="3"/>
-<feOffset dx="0" dy="-5" in="shadowBlurInner1" result="shadowOffsetInner1"/>
-<feComposite in="shadowOffsetInner1" in2="SourceAlpha" k2="-1" k3="1" operator="arithmetic" result="shadowInnerInner1"/>
-<feColorMatrix in="shadowInnerInner1" values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.26 0"/>
-</filter>
-<radialGradient id="h" cx="45.095%" cy="61.473%" r="36.965%" gradientTransform="translate(.45095 .61473) scale(.48245 1) rotate(90) scale(1 2.0744) translate(-.45095 -.61473)">
-<stop stop-color="#213448" offset="0"/>
-<stop stop-color="#213448" stop-opacity="0" offset="1"/>
-</radialGradient>
-<linearGradient id="u" x1="2.4282%" x2="97.572%" y1="50.433%" y2="50.433%">
-<stop stop-color="#37506B" offset="0"/>
-<stop stop-color="#798EA3" offset="1"/>
-</linearGradient>
-<linearGradient id="f" x1="65.129%" x2="29.644%" y1="115.13%" y2="-27.014%">
-<stop stop-color="#00A5FF" offset="0"/>
-<stop stop-color="#55D6DD" offset=".63466"/>
-<stop stop-color="#50E3C2" offset="1"/>
-</linearGradient>
-<radialGradient id="a" cx="0%" cy="13.24%" r="108.88%">
-<stop stop-color="#fff" offset="0"/>
-<stop stop-color="#00F0FF" stop-opacity="0" offset="1"/>
-</radialGradient>
-<radialGradient id="t" cx="0%" cy="13.24%" r="125.63%" gradientTransform="translate(0 .1324) scale(1 .86667) rotate(90) translate(0 -.1324)">
-<stop stop-color="#fff" offset="0"/>
-<stop stop-color="#00F0FF" stop-opacity="0" offset="1"/>
-</radialGradient>
-<linearGradient id="aa" x1="50%" x2="50%" y2="98.559%">
-<stop stop-color="#fff" offset="0"/>
-<stop stop-color="#70B4D4" offset="1"/>
-</linearGradient>
-<linearGradient id="z" x1="50%" x2="57.629%" y1="31.275%" y2="100%">
-<stop stop-color="#fff" offset="0"/>
-<stop stop-color="#8AD5E1" offset="1"/>
-</linearGradient>
-<radialGradient id="s" gradientTransform="translate(.5 .5) scale(.40323 1) rotate(90) scale(1 2.0466) translate(-.5 -.5)">
-<stop stop-color="#80F6FF" offset="0"/>
-<stop stop-color="#fff" stop-opacity="0" offset="1"/>
-</radialGradient>
-<radialGradient id="r" cy="105.56%" r="121.86%" gradientTransform="translate(.5 1.0556) scale(.45917 1) rotate(90) translate(-.5 -1.0556)">
-<stop offset="0"/>
-<stop stop-color="#00A5FF" stop-opacity="0" offset="1"/>
-</radialGradient>
-<radialGradient id="q" cx="0%" cy="12.026%" r="110.1%">
-<stop stop-color="#fff" offset="0"/>
-<stop stop-color="#00F0FF" stop-opacity="0" offset="1"/>
-</radialGradient>
-<radialGradient id="c" cx="0%" cy="12.592%" r="109.53%">
-<stop stop-color="#fff" offset="0"/>
-<stop stop-color="#00F0FF" stop-opacity="0" offset="1"/>
-</radialGradient>
-<radialGradient id="b" cx="0%" cy="8.4694%" r="113.65%">
-<stop stop-color="#fff" offset="0"/>
-<stop stop-color="#00F0FF" stop-opacity="0" offset="1"/>
-</radialGradient>
-<radialGradient id="p" cx="0%" cy="16.268%" r="103.33%">
-<stop stop-color="#D3D4F6" offset="0"/>
-<stop stop-color="#fff" stop-opacity=".2" offset="1"/>
-</radialGradient>
-<radialGradient id="o" cx="-6.838%" cy="23.085%" r="105.96%">
-<stop stop-color="#fff" offset="0"/>
-<stop stop-color="#B5C1FD" stop-opacity=".2" offset="1"/>
-</radialGradient>
-<radialGradient id="n" cx="-6.838%" cy="23.085%" r="101.3%">
-<stop stop-color="#fff" offset="0"/>
-<stop stop-color="#D6D4FF" stop-opacity=".3" offset="1"/>
-</radialGradient>
-<linearGradient id="x" x1="261.84%" x2="1.3323e-13%" y1="202.54%" y2="585.35%">
-<stop stop-color="#213448" offset="0"/>
-<stop stop-color="#34495F" offset="1"/>
-</linearGradient>
-<radialGradient id="m" cy="45.862%" r="47.093%" gradientTransform="translate(.5 .45862) scale(.66755 1) rotate(90) scale(1 .94719) translate(-.5 -.45862)">
-<stop stop-color="#fff" offset="0"/>
-<stop stop-color="#fff" stop-opacity="0" offset="1"/>
-</radialGradient>
-<radialGradient id="l" cy="45.862%" r="83.211%" gradientTransform="translate(.5 .45862) scale(1 .55757) rotate(90) scale(1 .52395) translate(-.5 -.45862)">
-<stop stop-color="#fff" offset="0"/>
-<stop stop-color="#fff" stop-opacity="0" offset="1"/>
-</radialGradient>
-<radialGradient id="k" cy="45.862%" r="159.64%" gradientTransform="translate(.5 .45862) scale(1 .2448) rotate(90) scale(1 .37936) translate(-.5 -.45862)">
-<stop stop-color="#213448" offset="0"/>
-<stop stop-color="#213448" stop-opacity="0" offset="1"/>
-</radialGradient>
-<linearGradient id="w" x1="-36.255%" y2="100%">
-<stop stop-color="#24374B" offset="0"/>
-<stop stop-color="#34495F" offset="1"/>
-</linearGradient>
-<path id="e" d="m43.325 50.458c2.5836 0.42621 5.2904 0.60703 8.1203 0.54246 5.5374-0.12635 8.1022-1 15.844-1 3.9671 0 6.994 0.19692 9.0809 0.59076l8e-7 -4.4e-6c0.94486 0.17832 1.6291 1.0038 1.6291 1.9653l9.8e-6 71.303c0 2.4455-1.7689 4.5321-4.1814 4.9325-4.8556 0.80587-9.6659 1.2088-14.431 1.2088-4.739 0-9.478-0.39854-14.217-1.1956l1e-7 -1e-6c-2.4076-0.40494-4.1707-2.4894-4.1707-4.9307l-1.053e-4 -71.443c-1.3e-6 -1.1046 0.89544-2 2-2 0.10906-1e-7 0.21794 0.0089204 0.32555 0.026672z"/>
-<filter id="ae" x="-8.1%" y="-3.7%" width="116.2%" height="107.5%">
-<feGaussianBlur in="SourceGraphic" stdDeviation="1"/>
-</filter>
-<filter id="ad" x="-23%" y="-10.6%" width="145.9%" height="121.2%">
-<feGaussianBlur in="SourceAlpha" result="shadowBlurInner1" stdDeviation="3"/>
-<feOffset dx="0" dy="-5" in="shadowBlurInner1" result="shadowOffsetInner1"/>
-<feComposite in="shadowOffsetInner1" in2="SourceAlpha" k2="-1" k3="1" operator="arithmetic" result="shadowInnerInner1"/>
-<feColorMatrix in="shadowInnerInner1" values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.26 0"/>
-</filter>
-<radialGradient id="j" cy="45.862%" r="155.13%" gradientTransform="translate(.5 .45862) scale(1 .30357) rotate(90) scale(1 .19206) translate(-.5 -.45862)">
-<stop stop-color="#fff" offset="0"/>
-<stop stop-color="#fff" stop-opacity="0" offset="1"/>
-</radialGradient>
-<radialGradient id="i" cy="45.862%" r="141.28%" gradientTransform="translate(.5 .45862) scale(1 .33333) rotate(90) scale(1 .19206) translate(-.5 -.45862)">
-<stop stop-color="#fff" offset="0"/>
-<stop stop-color="#fff" stop-opacity="0" offset="1"/>
-</radialGradient>
-</defs>
-<g fill="none" fill-rule="evenodd">
-<g transform="translate(-3 -3)">
-<g transform="translate(3 1)">
-<ellipse cx="80.5" cy="133" rx="80.5" ry="10" fill="#000729" fill-opacity=".23"/>
-<g transform="translate(25 17)">
-<path d="m48.107 2.5344l10.066-1.2988c0.19203-0.024775 0.38712 0.0067304 0.56159 0.090692 0.49765 0.23949 0.70692 0.83705 0.46744 1.3347l1.81e-5 8.71e-6c-2.4636 5.1193-4.2367 8.6978-5.3194 10.736-0.27924 0.52563-0.83171 3.9265-0.83772 4.5769-0.0017521 0.18986-0.016827 0.3667-0.045224 0.53053v88.003c0 3.1432-2.4257 5.7536-5.5605 5.9839-4.6186 0.33926-9.2513 0.50889-13.898 0.50889-4.6599 0-9.3198-0.17059-13.98-0.51177-3.1353-0.22956-5.5619-2.8403-5.5619-5.984v-104.5c4.533 0.82096 10.103 1.2314 16.709 1.2314s12.199-0.20972 16.776-0.62915l0.62127-0.067857z" fill="url(#ab)" opacity=".26591"/>
-<path d="m50.594 0.43547c1.9813 0.046769 4.6007 0.3408 7.8583 0.88208 0.094218 0.015655 0.18571 0.044728 0.27168 0.086332 0.49712 0.24057 0.70509 0.83858 0.46453 1.3357l2.79e-5 1.351e-5c-2.4272 5.0157-4.1957 8.5681-5.3056 10.657-0.27924 0.52563-0.83171 2.9265-0.83772 3.5769-0.0017522 0.18986-0.016827 0.3667-0.045225 0.53053l8e-7 88.506c0 2.9604-2.1592 5.4784-5.085 5.9298-4.5823 0.70706-9.2793 1.0606-14.091 1.0606-4.9043 0-9.8087-0.3673-14.713-1.1019-2.9377-0.44002-5.1112-2.9633-5.1112-5.9338l-2.94e-5 -103.4c0-0.51631 0.39305-0.94774 0.90712-0.9957 5.9571-0.55585 11.665-0.91178 17.125-1.0678 5.736-0.16393 11.915-0.18911 18.536-0.075562l0.026196 0.0061466z" fill="url(#y)" opacity=".19622"/>
-<path d="m49.891 9.8169c0.87134 3.0457 2.9907 11.399 3.0068 9.647 0.0060025-0.65042 0.065463-4.3271 0.98499-6.067 1.1305-2.1391 2.8233-5.5352 5.0784-10.188l1.4e-6 6.4e-7c0.24087-0.49699 0.033239-1.0951-0.46375-1.336-0.17348-0.084077-0.36756-0.11622-0.55889-0.092554-3.419 0.4229-6.1015 0.63434-8.0476 0.63434-3.4208 0-0.87134 4.3569 0 7.4026z" fill="url(#v)" opacity=".14917"/>
-<use fill="url(#g)" fill-rule="evenodd" xlink:href="#d"/>
-<use fill="black" filter="url(#ac)" xlink:href="#d"/>
-<g transform="translate(23 19)" opacity=".40534" stroke="#fff" style="mix-blend-mode:soft-light">
-<path d="m0.99023 17.5h20.032"/>
-<path d="m0.99023 0.5h20.032"/>
-<path d="m0.99023 37.5h20.032"/>
-<path d="m0.99023 57.5h20.032"/>
-<path d="m0.99023 77.5h20.032"/>
-</g>
-<path d="m47.004 123.69c31.592 0 67.399-12.356 67.399-27.597 0-15.241-25.61-27.597-57.201-27.597s-57.201 12.356-57.201 27.597c0 15.241 15.412 27.597 47.004 27.597z" fill="url(#h)" opacity=".43439"/>
-</g>
-<g transform="translate(15)">
-<path d="m83.112 35.797v-25.13c4.0138 1.1834 7.9911 1.7893 11.932 1.8175 3.9408 0.028239 7.8739-0.5776 11.799-1.8175v25.13c22.456 5.3485 39.157 25.542 39.157 49.635 0 28.179-22.844 51.022-51.022 51.022-28.179 0-51.022-22.844-51.022-51.022 0-24.094 16.7-44.287 39.157-49.635z" fill="url(#u)" opacity=".41123"/>
-<path d="m94.978 136.08c27.524 0 49.836-22.312 49.836-49.836 0-27.524-33.1-7.6704-60.624-7.6704-24.915 0-34.772-23.882-38.461 0-0.38625 2.5003-0.58665 5.062-0.58665 7.6704 0 27.524 22.312 49.836 49.836 49.836z" fill="url(#f)"/>
-<g transform="translate(74 78)">
-<circle transform="translate(34.5 27.5) rotate(-12) translate(-34.5 -27.5)" cx="34.5" cy="27.5" r="5.5" fill="url(#a)"/>
-<ellipse transform="translate(15.5 36.5) rotate(-12) translate(-15.5 -36.5)" cx="15.5" cy="36.5" rx="6.5" ry="7.5" fill="url(#t)"/>
-<path transform="translate(21.5 20.5) rotate(20) translate(-21.5 -20.5)" d="m19.357 34.956c7.944 0.58073 14.954-4.6376 15.603-13.299s-6.721-17.117-16.302-15.443c-9.581 1.674-10.658 7.2211-10.658 15.191 0 7.9704 3.4128 12.97 11.357 13.551z" fill="url(#aa)"/>
-<ellipse transform="translate(19 18.5) rotate(20) translate(-19 -18.5)" cx="19" cy="18.5" rx="14" ry="14.5" fill="url(#z)"/>
-</g>
-<path d="m94.978 136.08c27.524 0 49.836-22.312 49.836-49.836 0-27.524-33.1-7.6704-60.624-7.6704-24.915 0-34.772-23.882-38.461 0-0.38625 2.5003-0.58665 5.062-0.58665 7.6704 0 27.524 22.312 49.836 49.836 49.836z" fill="url(#f)" opacity=".2744"/>
-<ellipse transform="translate(80.739 87.213) rotate(10) translate(-80.739 -87.213)" cx="80.739" cy="87.213" rx="36.784" ry="14.832" fill="url(#s)" opacity=".10598" style="mix-blend-mode:overlay"/>
-<path transform="translate(108.27 117.96) rotate(-20) translate(-108.27 -117.96)" d="m107.84 133.33c20.315 0 33.914-14.011 33.914-22.203s-11.08-8.5479-31.395-8.5479c-20.315 0-35.574 4.217-35.574 12.409s12.74 18.342 33.055 18.342z" fill="url(#r)" style="mix-blend-mode:soft-light"/>
-<g transform="translate(73.399 54.713)">
-<g transform="translate(0 5.7932)">
-<circle transform="translate(18.471 35.801) rotate(-12) translate(-18.471 -35.801)" cx="18.471" cy="35.801" r="4.3966" fill="url(#q)"/>
-<circle transform="translate(26.636 31.404) rotate(-12) translate(-26.636 -31.404)" cx="26.636" cy="31.404" r="5.0247" fill="url(#a)"/>
-<circle transform="translate(34.173 36.429) rotate(-12) translate(-34.173 -36.429)" cx="34.173" cy="36.429" r="6.2809" fill="url(#a)"/>
-<circle transform="translate(26.636 47.735) rotate(-12) translate(-26.636 -47.735)" cx="26.636" cy="47.735" r="5.0247" fill="url(#a)"/>
-<circle transform="translate(29.148 56.528) rotate(-12) translate(-29.148 -56.528)" cx="29.148" cy="56.528" r="5.0247" fill="url(#a)"/>
-<circle transform="translate(8.4213 47.107) rotate(-12) translate(-8.4213 -47.107)" cx="8.4213" cy="47.107" r="6.909" fill="url(#c)"/>
-<circle transform="translate(11.562 31.404) rotate(-12) translate(-11.562 -31.404)" cx="11.562" cy="31.404" r="5.0247" fill="url(#c)"/>
-<circle transform="translate(16.586 20.099) rotate(-12) translate(-16.586 -20.099)" cx="16.586" cy="20.099" r="5.0247" fill="url(#b)"/>
-<circle transform="translate(27.264 20.727) rotate(-12) translate(-27.264 -20.727)" cx="27.264" cy="20.727" r="3.1404" fill="url(#b)"/>
-<circle transform="translate(24.752 13.19) rotate(-12) translate(-24.752 -13.19)" cx="24.752" cy="13.19" r="3.1404" fill="url(#b)" opacity=".47277"/>
-</g>
-<g transform="translate(1.5124)" opacity=".2106">
-<circle transform="translate(30.148 13.818) rotate(-12) translate(-30.148 -13.818)" cx="30.148" cy="13.818" r="7.5371" fill="url(#p)" opacity=".88196"/>
-<circle cx="4.3966" cy="19.958" r="4.3966" fill="url(#o)" opacity=".88196"/>
-<circle cx="18.215" cy="11.934" r="11.934" fill="url(#n)" opacity=".51495"/>
-</g>
-</g>
-<path d="m83 8c4.0823 0.66667 8.0823 1 12 1 4.0673 0 8.0673-0.33333 12-1" stroke="url(#x)" stroke-linecap="round" stroke-width="7"/>
-<ellipse transform="translate(61.291 78.451) scale(-1 1) rotate(-30) translate(-61.291 -78.451)" cx="61.291" cy="78.451" rx="51.022" ry="34.06" fill="url(#m)" opacity=".2145"/>
-<ellipse cx="88.453" cy="25.5" rx="10.315" ry="18.5" fill="url(#l)" opacity=".070596"/>
-<ellipse cx="103.77" cy="27" rx="5.6305" ry="23" fill="url(#k)" opacity=".10507"/>
-<g transform="translate(79 2)" fill-rule="nonzero">
-<path transform="translate(15.867 3.7757) scale(1 -1) translate(-15.867 -3.7757)" d="m3.305 4.9907c-1.1195-0.28943-1.7924-1.4316-1.5029-2.551 0.28943-1.1195 1.4316-1.7924 2.551-1.5029 4.0225 1.04 7.8684 1.5579 11.54 1.5579 3.8145 0 7.6353-0.5167 11.467-1.552 1.1162-0.30163 2.2657 0.35875 2.5673 1.475 0.30163 1.1162-0.35875 2.2657-1.475 2.5673-4.1844 1.1307-8.3722 1.697-12.559 1.697-4.0358 0-8.2324-0.56512-12.588-1.6912z" fill="url(#w)"/>
-<path d="m3.4359 9.4542c-1.9077-0.31155-3.2017-2.1106-2.8901-4.0183 0.31155-1.9077 2.1106-3.2017 4.0183-2.8901 3.8983 0.63662 7.7098 0.95424 11.436 0.95424 3.8722 0 7.6766-0.31703 11.415-0.95077 1.9058-0.32307 3.7127 0.95999 4.0357 2.8658 0.32307 1.9058-0.95999 3.7127-2.8658 4.0357-4.1269 0.69959-8.3226 1.0492-12.585 1.0492-4.1093 0-8.2978-0.34904-12.564-1.0458z" fill="#3F546A"/>
-</g>
-</g>
-<g filter="url(#ae)" opacity=".24623">
-<use fill="url(#g)" fill-rule="evenodd" xlink:href="#e"/>
-<use fill="black" filter="url(#ad)" xlink:href="#e"/>
-</g>
-<ellipse cx="52" cy="68" rx="17" ry="56" fill="url(#j)" opacity=".13949"/>
-<ellipse cx="52" cy="73" rx="17" ry="51" fill="url(#i)" opacity=".13949"/>
-</g>
-</g>
-</g>
-</svg>
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/img/wave-left.svg b/themes/Backend/ExtJs/backend/benchmark/template/local/img/wave-left.svg
deleted file mode 100644
index 1058de474be..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/img/wave-left.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 102 600" xmlns="http://www.w3.org/2000/svg">
-<g fill="none" fill-rule="evenodd" opacity=".2">
-<g fill="#0D151D">
-<path d="m0 0c12.663 31.187 29.968 57.884 51.914 80.091 32.919 33.311-0.76719 83.231 19.711 118.82 20.478 35.593 45.776 70.233 17.797 117.95-27.979 47.715-61.668 73.006-21.816 136.23 39.852 63.224-59.14 111.64-65.653 144.07-0.24951 1.2425-0.90038 2.1904-1.9526 2.8436v-600.01z"/>
-</g>
-</g>
-</svg>
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/img/wave-right.svg b/themes/Backend/ExtJs/backend/benchmark/template/local/img/wave-right.svg
deleted file mode 100644
index 963bd75199b..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/img/wave-right.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 103 600" xmlns="http://www.w3.org/2000/svg">
-<g fill="none" fill-rule="evenodd" opacity=".2">
-<g transform="translate(-926)" fill="#0D151D">
-<g transform="translate(-2)">
-<path transform="translate(979.28 299.61) scale(-1 1) translate(-979.28 -299.61)" d="m928 0c13.159 31.187 30.712 57.884 52.658 80.091 32.919 33.31-0.76719 83.23 19.711 118.82 20.478 35.592 45.776 70.233 17.797 117.95-27.979 47.714-61.668 73.005-21.816 136.23 39.852 63.223-58.836 112.7-65.349 145.14-0.42936 2.1382-1.3332 0.81593-2.7115-3.9667l-0.28846-594.26z"/>
-</g>
-</g>
-</g>
-</svg>
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/img/wild-graph.svg b/themes/Backend/ExtJs/backend/benchmark/template/local/img/wild-graph.svg
deleted file mode 100644
index 695310cbb49..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/img/wild-graph.svg
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 204 134" xmlns="http://www.w3.org/2000/svg">
-<defs>
-<linearGradient id="a" x1="9.0735%" x2="101.5%" y1="92.842%" y2="-.5%">
-<stop stop-color="#5941F4" offset="0"/>
-<stop stop-color="#766FFF" offset="1"/>
-</linearGradient>
-<linearGradient id="b" x1="50%" x2="50%" y1="2.4474%" y2="100%">
-<stop stop-color="#5AC5FF" offset="0"/>
-<stop stop-color="#50E3C2" offset="1"/>
-</linearGradient>
-</defs>
-<g fill="none" fill-rule="evenodd" stroke-linecap="round">
-<g transform="translate(-5 -9)" stroke-width="18">
-<g transform="translate(14 18)">
-<path transform="translate(128.14 94.104) rotate(60) translate(-128.14 -94.104)" d="m132.54 125.32l-8.8105-62.424" stroke="url(#a)"/>
-<path d="m60.256 114.16l-44.116-113.84" stroke="url(#a)"/>
-<path d="m41.827 24.414c-28.996 4.8445-42.568 16.623-40.717 35.335 2.7762 28.069 28.306 24.441 34.319 53.342" stroke="url(#b)"/>
-<path d="m87.525 112.17c10.631-13.633 19.451-24.694 26.461-33.184 10.318-12.496 20.243-3.8941 32.988 3.1917 20.65 11.48 32.267-5.8848 39.064-13.766" stroke="url(#b)"/>
-<path transform="translate(86.197 80.381) rotate(30) translate(-86.197 -80.381)" d="m98.168 113.54l-23.943-66.32" stroke="url(#a)"/>
-</g>
-</g>
-</g>
-</svg>
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/include/computed_data.tpl b/themes/Backend/ExtJs/backend/benchmark/template/local/include/computed_data.tpl
deleted file mode 100644
index cf1d06ed62a..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/include/computed_data.tpl
+++ /dev/null
@@ -1,61 +0,0 @@
-<div class="computed-data">
-    <div class="time-container weeks">
-        <div class="value-container current-weeks">
-            <div class="data-value">
-                [[  local.weeks.meta.shownTime ]]
-            </div>
-            <div class="data-label">
-                [[ $t('periodTitle') ]]
-            </div>
-        </div>
-
-        <div class="value-container total">
-            <div class="data-value local">
-                [[  local.weeks.totalValues.{$key} ]]
-            </div>
-            <div class="data-label">
-                [[ $t('totalTitle') ]]
-            </div>
-        </div>
-    </div>
-
-    <div class="time-container months" style="display: none;">
-        <div class="value-container current-weeks">
-            <div class="data-value">
-                [[  local.weeks.meta.shownTime ]]
-            </div>
-            <div class="data-label">
-                [[ $t('periodTitle') ]]
-            </div>
-        </div>
-
-        <div class="value-container total">
-            <div class="data-value local">
-                [[  local.months.totalValues.{$key} ]]
-            </div>
-            <div class="data-label">
-                [[ $t('totalTitle') ]]
-            </div>
-        </div>
-    </div>
-
-    <div class="time-container years" style="display: none;">
-        <div class="value-container current-weeks">
-            <div class="data-value">
-                [[  local.weeks.meta.shownTime ]]
-            </div>
-            <div class="data-label">
-                [[ $t('periodTitle') ]]
-            </div>
-        </div>
-
-        <div class="value-container total">
-            <div class="data-value local">
-                [[  local.years.totalValues.{$key} ]]
-            </div>
-            <div class="data-label">
-                [[ $t('totalTitle') ]]
-            </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/include/config_overlay.tpl b/themes/Backend/ExtJs/backend/benchmark/template/local/include/config_overlay.tpl
deleted file mode 100644
index b23725c7768..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/include/config_overlay.tpl
+++ /dev/null
@@ -1,72 +0,0 @@
-<div class="shop-config--overlay">
-    <div class="shop-list--config">
-        <p class="config-headline"></p>
-        <div class="custom-select industry-select" data-custom-drop-down="true">
-            <input class="overlay-shop-id" type="hidden" name="shopId" />
-            <input class="industry-value" type="hidden" name="industry-value" />
-            <div class="dropdown-wrapper">
-                <div class="select-header">
-                    [[ $t('defaultIndustryText') ]]
-                </div>
-                <div class="select-options">
-                    <div class="select-option industry-option" data-translation-name="animalsPetSupplies" data-industry-value="1">[[ $t('animalsPetSupplies') ]]</div>
-                    <div class="select-option industry-option" data-translation-name="apparelAccessories" data-industry-value="2">[[ $t('apparelAccessories') ]]</div>
-                    <div class="select-option industry-option" data-translation-name="artsEntertainment" data-industry-value="3">[[ $t('artsEntertainment') ]]</div>
-                    <div class="select-option industry-option" data-translation-name="babyToddler" data-industry-value="4">[[ $t('babyToddler') ]]</div>
-                    <div class="select-option industry-option" data-translation-name="businessIndustrial" data-industry-value="5">[[ $t('businessIndustrial') ]]</div>
-                    <div class="select-option industry-option" data-translation-name="camerasOptics" data-industry-value="6">[[ $t('camerasOptics') ]]</div>
-                    <div class="select-option industry-option" data-translation-name="electronics" data-industry-value="7">[[ $t('electronics') ]]</div>
-                    <div class="select-option industry-option" data-translation-name="foodBeveragesTobacco" data-industry-value="8">[[ $t('foodBeveragesTobacco') ]]</div>
-                    <div class="select-option industry-option" data-translation-name="furniture" data-industry-value="9">[[ $t('furniture') ]]</div>
-                    <div class="select-option industry-option" data-translation-name="hardware" data-industry-value="10">[[ $t('hardware') ]]</div>
-                    <div class="select-option industry-option" data-translation-name="healthBeauty" data-industry-value="11">[[ $t('healthBeauty') ]]</div>
-                    <div class="select-option industry-option" data-translation-name="homeGarden" data-industry-value="12">[[ $t('homeGarden') ]]</div>
-                    <div class="select-option industry-option" data-translation-name="luggageBags" data-industry-value="13">[[ $t('luggageBags') ]]</div>
-                    <div class="select-option industry-option" data-translation-name="mature" data-industry-value="14">[[ $t('mature') ]]</div>
-                    <div class="select-option industry-option" data-translation-name="media" data-industry-value="15">[[ $t('media') ]]</div>
-                    <div class="select-option industry-option" data-translation-name="officeSupplies" data-industry-value="16">[[ $t('officeSupplies') ]]</div>
-                    <div class="select-option industry-option" data-translation-name="religiousCeremonial" data-industry-value="17">[[ $t('religiousCeremonial') ]]</div>
-                    <div class="select-option industry-option" data-translation-name="software" data-industry-value="18">[[ $t('software') ]]</div>
-                    <div class="select-option industry-option" data-translation-name="sportingGoods" data-industry-value="19">[[ $t('sportingGoods') ]]</div>
-                    <div class="select-option industry-option" data-translation-name="toysGames" data-industry-value="20">[[ $t('toysGames') ]]</div>
-                    <div class="select-option industry-option" data-translation-name="vehiclesParts" data-industry-value="21">[[ $t('vehiclesParts') ]]</div>
-                </div>
-            </div>
-            <div class="fade-out"></div>
-        </div>
-
-        <div class="type--header">
-            [[ $t('shopTypeTitle') ]]
-        </div>
-
-        <div class="shop-config--type">
-            <label class="type-label">
-                <input class="shop-type--b2c" name="type" type="radio" value="b2c"/>
-                <span class="check-mark"></span>
-                <span class="type-label--name">[[ $t('b2cText') ]]</span>
-                <span class="type-label--short">([[ $t('b2cShortText') ]])</span>
-            </label>
-            <label class="type-label">
-                <input class="shop-type--b2b" name="type" type="radio" value="b2b"/>
-                <span class="check-mark"></span>
-                <span class="type-label--name">[[ $t('b2bText') ]]</span>
-                <span class="type-label--short">([[ $t('b2bShortText') ]])</span>
-            </label>
-        </div>
-
-        <div class="submit-button--ct">
-            <input class="shop-config--submit-button btn primary" type="submit" :value="[[ $t('shopConfigSaveText') ]]"/>
-        </div>
-
-        <div class="action-buttons--ct">
-            <div class="reset-button--ct">
-                <div class="reset-button--icon"></div>
-                <input class="action-buttons--reset-button action-button" type="button" :value="[[ $t('shopConfigResetText') ]]"/>
-            </div>
-            <div class="cancel-button--ct">
-                <div class="cancel-button--icon"></div>
-                <input class="action-buttons--cancel-button action-button" type="button" :value="[[ $t('shopConfigCancelText') ]]"/>
-            </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/include/graph-data.tpl b/themes/Backend/ExtJs/backend/benchmark/template/local/include/graph-data.tpl
deleted file mode 100644
index 9c5cf844ff5..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/include/graph-data.tpl
+++ /dev/null
@@ -1,44 +0,0 @@
-<form>
-    <div data-time-switcher="true" data-values-key="{$dataKey}">
-        <label><input type="button" class="btn timescale is-active timescale-week" name="weeks" :value="$t('weeksText')" /></label>
-        <label><input type="button" class="btn timescale timescale-month" name="months" :value="$t('monthsText')" /></label>
-        <label><input type="button" class="btn timescale timescale-year" name="years" :value="$t('yearsText')" /></label>
-    </div>
-
-    <div class="graph-container">
-        <div class="graph-wrapper">
-            <canvas height="260"
-                data-benchmark-graph="true"
-                data-name="{$dataKey}"
-                data-include-industry="false"
-                data-time="weeks"
-                data-chart-type="line">
-            </canvas>
-        </div>
-
-        <div class="button-container">
-            <div class="button-wrapper switch-shop" data-switch-button="true" data-industry="false" data-values-key="{$dataKey}" data-time="weeks">
-                <label class="switch">
-                    <input type="checkbox" checked="checked">
-                    <span class="slider round"></span>
-                </label>
-                <div>[[ $t('shopTitle') ]]</div>
-            </div>
-
-            <div class="button-wrapper switch-last-year"
-                 data-switch-button="true"
-                 data-industry="false"
-                 data-last-year="true"
-                 data-values-key="{$dataKey}"
-                 data-time="weeks">
-                <label class="switch">
-                    <input type="checkbox" checked="checked">
-                    <span class="slider round"></span>
-                </label>
-                <div>[[ $t('previousTitle') ]]</div>
-            </div>
-        </div>
-    </div>
-
-    {include file="backend/benchmark/template/local/include/computed_data.tpl" key="{$dataKey}"}
-</form>
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/include/language_switch.tpl b/themes/Backend/ExtJs/backend/benchmark/template/local/include/language_switch.tpl
deleted file mode 100644
index 69e61241d2d..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/include/language_switch.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="language-switch" data-language-switch="true">
-    <span class="language german-language{if $benchmarkDefaultLanguage === 'de'} active{/if}" data-language-key="de">DE</span>
-    <span class="language-separator">|</span>
-    <span class="language english-language{if $benchmarkDefaultLanguage === 'en'} active{/if}" data-language-key="en">EN</span>
-</div>
\ No newline at end of file
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/include/loading_indicator.tpl b/themes/Backend/ExtJs/backend/benchmark/template/local/include/loading_indicator.tpl
deleted file mode 100644
index 430f7178ab3..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/include/loading_indicator.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="loading-wrapper">
-    <div class="loading-text">LOADING</div>
-    <div class="loading-content"></div>
-
-    <div class="oval-one"></div>
-    <div class="oval-two"></div>
-</div>
\ No newline at end of file
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/index.tpl b/themes/Backend/ExtJs/backend/benchmark/template/local/index.tpl
deleted file mode 100644
index d63743506c2..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/index.tpl
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    {block name="benchmark_index_head"}
-        <meta charset="UTF-8">
-        <title>{block name="benchmark_index_title"}{/block}</title>
-
-        <link href="{link file="backend/benchmark/template/local/all.css"}" media="all" rel="stylesheet" type="text/css" />
-        <link href="{link file="backend/benchmark/template/local/vendor/components/LiquidButton/css/style.css"}" media="all" rel="stylesheet" type="text/css" />
-
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"
-                integrity="sha384-xBuQ/xzmlsLoJpyjoggmTEz8OWUFM0/RC5BsqQBDX2v5cMvDHcMakNTNrHIW2I5f"
-                crossorigin="anonymous"></script>
-
-        <script type="text/javascript">
-            var onClickLiquidButton = function () {
-                $('html, body').animate({
-                    scrollTop: $(".special-note").offset().top
-                }, 800);
-            };
-
-            (function () {
-                {if $benchmarkData}
-                    window.benchmarkData = JSON.parse('{$benchmarkData}');
-                {/if}
-
-                {if $benchmarkTranslations}
-                    window.benchmarkTranslations = JSON.parse('{$benchmarkTranslations}');
-                {/if}
-
-                {if $benchmarkDefaultLanguage}
-                    window.benchmarkDefaultLanguage = '{$benchmarkDefaultLanguage}';
-                {/if}
-            } )();
-        </script>
-
-        {block name="benchmark_index_head_scripts"}
-            <script src="https://cdnjs.cloudflare.com/ajax/libs/vue/2.5.22/vue.min.js"
-                    integrity="sha384-/akamCRnflySW3CYATb1tG4cZUVrkVT2+s6Q150JJNJ4mv8nhvL/V7rPgmzX8scM"
-                    crossorigin="anonymous"></script>
-            <script src="https://cdnjs.cloudflare.com/ajax/libs/vue-i18n/8.10.0/vue-i18n.min.js"
-                    integrity="sha384-gobPWY9nduovPXtrtPx0f3yAWM2dnKwEOy8BSxadNjhCECNk1TZTzGJqpnWHQGIV"
-                    crossorigin="anonymous"></script>
-            <script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.min.js"
-                    integrity="sha384-EU1dURc8oJ/Ec2n9odZegm1iva+lUs6tS2kIQyRWJc5KjzRFvTBuix+qvrbLSQYj"
-                    crossorigin="anonymous"></script>
-            <script src="{link file='backend/benchmark/template/local/js/translation.js'}"></script>
-            <script src="{link file='backend/benchmark/template/local/js/vue_wrapper.js'}"></script>
-        {/block}
-    {/block}
-</head>
-
-{block name="benchmark_index_body"}{/block}
-
-</html>
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/industry_select.tpl b/themes/Backend/ExtJs/backend/benchmark/template/local/industry_select.tpl
deleted file mode 100644
index 2cb41ad750c..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/industry_select.tpl
+++ /dev/null
@@ -1,56 +0,0 @@
-{extends file="backend/benchmark/template/local/index.tpl"}
-
-{block name="benchmark_index_title"}Shopware BI - Branche wählen{/block}
-
-{block name="benchmark_index_head_scripts"}
-    {$smarty.block.parent}
-    <script src="{link file='backend/benchmark/template/local/js/industry_select.js'}"></script>
-{/block}
-
-{block name="benchmark_index_body"}
-    <body id="swag-select">
-        {include file="backend/benchmark/template/local/include/loading_indicator.tpl"}
-        {include file="backend/benchmark/template/local/include/language_switch.tpl"}
-        <div class="wrapper">
-            <div class="industry-select--ct" data-industry-select="true">
-                {include file="backend/benchmark/template/local/include/config_overlay.tpl"}
-                <div class="swag-container">
-                    <div id="select-wrapper">
-                        {if {acl_is_allowed resource=benchmark privilege=manage}}
-                            <h1>[[ $t('industrySelectionHeadline') ]]</h1>
-
-                            <div class="industry--shop-list">
-                                <div class="shop-list--wrapper">
-                                    {foreach $shops as $shop}
-                                        <div class="shop-list--entry">
-                                            <input class="entry-shop-id" type="hidden" name="shopId" value="{$shop['id']}" />
-                                            <span class="shop-list--name">{$shop['name']}</span>
-                                            <span class="shop-list--info">
-                                                <span class="shop-list--info-text">[[ $t('emptyShopConfigText') ]]</span>
-                                                <span class="shop-list--button"></span>
-                                            </span>
-                                        </div>
-                                    {/foreach}
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="industry--save-button" style="display: none;"
-                            data-success-url="{url controller=BenchmarkOverview action=index lang='placeholder'}"
-                            data-save-url="{url controller=BenchmarkOverview action=saveIndustry}">
-                            <span class="save-button--text">[[ $t('saveIndustryText') ]]</span>
-                            <span class="save-button--shop-counter">0</span>
-                        </div>
-                    {else}
-                        <h1>[[ $t('noPermissionsTitle') ]]</h1>
-                        <span class="industry--no-permissions">[[ $t('noPermissionsMessage') ]]</span>
-                    {/if}
-                </div>
-
-                <div class="wild-graph"></div>
-                <div class="bubble-two"></div>
-            </div>
-        </div>
-    </body>
-{/block}
-
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/info.tpl b/themes/Backend/ExtJs/backend/benchmark/template/local/info.tpl
deleted file mode 100644
index 27fb648720e..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/info.tpl
+++ /dev/null
@@ -1,78 +0,0 @@
-{extends file="backend/benchmark/template/local/index.tpl"}
-
-{block name="benchmark_index_title"}Shopware BI - Fragen und Antworten{/block}
-
-{block name="benchmark_index_head"}
-    {$smarty.block.parent}
-    <script type="text/javascript">
-        function enableButton() {
-            var checkBox = document.getElementById("confirmation-check"),
-                button = document.getElementById("load-industry");
-
-            button.style.display = checkBox.checked ? 'block' : 'none';
-        };
-    </script>
-{/block}
-
-{block name="benchmark_index_body"}
-    <body id="swag-info">
-        {include file="backend/benchmark/template/local/include/loading_indicator.tpl"}
-        {include file="backend/benchmark/template/local/include/language_switch.tpl"}
-        <div class="wrapper">
-            <div class="swag-onbording">
-                <div class="tob-bar">
-                    <ul class="top-benefits">
-                        <li>[[ $t('freeText') ]]</li>
-                        <li>[[ $t('anonymousText') ]]</li>
-                        <li>[[ $t('nonBindingText') ]]</li>
-                    </ul>
-                </div>
-
-                <div class="wrapper-info">
-                    <div class="info--text">
-                        <h1>[[ $t('faqHeadline') ]]</h1>
-
-                        <div class="row">
-                            <div class="col-66">
-                                <h2>[[ $t('question1Headline') ]]</h2>
-                                <p>[[ $t('question1Text') ]]</p>
-
-                                <h2>[[ $t('question2Headline') ]]</h2>
-                                <p>[[ $t('question2Text') ]]</p>
-
-                                <h2>[[ $t('question3Headline') ]]</h2>
-                                <p>[[ $t('question3Text') ]]</p>
-                            </div>
-
-                            <div class="col-33">
-                                <h2><span class="check-color">[[ $t('factsHeadline') ]]</span></h2>
-                                <ul class="top-benefits">
-                                    <li>[[ $t('fact1') ]]</li>
-                                    <li>[[ $t('fact2') ]]</li>
-                                    <li>[[ $t('fact3') ]]</li>
-                                    <li>[[ $t('fact4') ]]</li>
-                                    <li>[[ $t('fact5') ]]</li>
-                                    <li>[[ $t('fact6') ]]</li>
-                                    <li>[[ $t('fact7') ]]</li>
-                                </ul>
-                            </div>
-                        </div>
-
-                        <div class="accept-abg">
-                            <input type="checkbox" id="confirmation-check" onclick="enableButton()"/>
-                            <label for="confirmation-check" class="confirmation-label">[[ $t('participationCheck') ]]</label>
-                            <div id="load-industry" style="display: none;">
-                                <form method="get" action="{url controller="BenchmarkLocalOverview" action="render" template="industry_select"}">
-                                    <input type="hidden" value="{$benchmarkDefaultLanguage}" name="lang"/>
-                                    <button class="btn primary" type="submit">
-                                        [[ $t('nextButton') ]]
-                                    </button>
-                                </form>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </body>
-{/block}
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/js/benchmark_charts.js b/themes/Backend/ExtJs/backend/benchmark/template/local/js/benchmark_charts.js
deleted file mode 100644
index 14c5fe1fd94..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/js/benchmark_charts.js
+++ /dev/null
@@ -1,197 +0,0 @@
-(function ($) {
-    'use strict';
-
-    var globals  = {
-        gridLineColor: '#314252',
-        shopColor: '#34DCDD',
-        industryColor: '#6A63FC'
-    };
-
-    function BenchmarkChart(el) {
-        this.el = el;
-        this.name = el.getAttribute('data-name');
-        this.time = el.getAttribute('data-time');
-        this.includeIndustry = (el.getAttribute('data-include-industry') === 'true');
-        this.chartType = el.getAttribute('data-chart-type');
-        this.translations = window.benchmarkTranslations;
-
-        this.init();
-    }
-
-    BenchmarkChart.prototype.init = function() {
-        this.initDefaultConfig();
-        this.initTimeRangeLabel();
-
-        var uniqueChartString = this.name + this.time.charAt(0).toUpperCase() + this.time.slice(1) + 'Chart';
-        window[uniqueChartString] = new Chart(this.el.getContext('2d'), this.buildConfig());
-    };
-
-    BenchmarkChart.prototype.initDefaultConfig = function () {
-        Chart.defaults.global.defaultFontColor = '#798EA3';
-        Chart.defaults.global.defaultFontFamily = 'Source Sans Pro';
-    };
-
-    BenchmarkChart.prototype.initTimeRangeLabel = function () {
-        this.timeRangeLabel = '';
-
-        if (this.time === 'weeks') {
-            this.timeRangeLabel = this.translations[window.i18n.locale].timeUnitDays;
-        }
-
-        if (this.time === 'months') {
-            this.timeRangeLabel = this.translations[window.i18n.locale].timeUnitDays;
-        }
-
-        if (this.time === 'years') {
-            this.timeRangeLabel = this.translations[window.i18n.locale].timeUnitMonths;
-        }
-    };
-
-    BenchmarkChart.prototype.buildConfig = function() {
-        return {
-            type: this.chartType,
-            data: {
-                labels: this.getTranslatedLabels(),
-                datasets: this.getDatasets()
-            },
-            options: this.getOptions()
-        };
-    };
-
-    BenchmarkChart.prototype.getDatasets = function() {
-        var dataSets = [];
-
-        // Shop data
-        dataSets.push({
-            label: this.translations[window.i18n.locale].shopTitle,
-            backgroundColor: globals.shopColor,
-            borderColor: globals.shopColor,
-            borderWidth: '12',
-            borderCapStyle: 'round',
-            lineTension: 0,
-            pointRadius: 0,
-            data: window.benchmarkData['local'][this.time][this.name].values,
-            fill: false
-        });
-
-        // Last year data
-        dataSets.push({
-            label: this.translations[window.i18n.locale].previousTitleShop,
-            backgroundColor: globals.shopColor,
-            borderColor: globals.shopColor,
-            borderWidth: '3',
-            borderCapStyle: 'round',
-            lineTension: 0,
-            pointRadius: 0,
-            borderDash: [1, 8],
-            data: window.benchmarkData['local']['lastYear'][this.time][this.name].values,
-            fill: false
-        });
-
-        if (this.includeIndustry) {
-            dataSets.push({
-                label: this.translations[window.i18n.locale].industryTitle,
-                backgroundColor: globals.industryColor,
-                borderColor: globals.industryColor,
-                borderWidth: '12',
-                borderCapStyle: 'round',
-                lineTension: 0,
-                pointRadius: 0,
-                data: window.benchmarkData['industry'][this.time][this.name].values,
-                fill: false
-            });
-
-            dataSets.push({
-                label: this.translations[window.i18n.locale].previousTitleIndustry,
-                backgroundColor: globals.industryColor,
-                borderColor: globals.industryColor,
-                borderWidth: '3',
-                borderCapStyle: 'round',
-                lineTension: 0,
-                pointRadius: 0,
-                borderDash: [1, 8],
-                data: window.benchmarkData['industry']['lastYear'][this.time][this.name].values,
-                fill: false
-            });
-        }
-
-        return dataSets;
-    };
-
-    BenchmarkChart.prototype.getOptions = function() {
-        return {
-            legend: {
-                display: false
-            },
-            maintainAspectRatio: false,
-            tooltips: {
-                mode: 'index',
-                intersect: false,
-            },
-            scales: {
-                xAxes: [{
-                    offset: true,
-                    scaleLabel: {
-                        display: true,
-                        labelString: this.timeRangeLabel
-                    },
-                    gridLines: {
-                        color: globals.gridLineColor
-                    },
-                    ticks: {
-                        fontSize: 16,
-                        fontColor: '#fff',
-                    }
-                }],
-                yAxes: [{
-                    gridLines: {
-                        drawBorder: false,
-                        color: globals.gridLineColor,
-                        zeroLineColor: globals.gridLineColor,
-                    },
-                    ticks: {
-                        suggestedMin: 0,
-                        fontSize: 14,
-                        fontColor: '#798EA3',
-                        maxTicksLimit: 6
-                    }
-                }]
-            },
-        };
-    };
-
-    BenchmarkChart.prototype.getTranslatedLabels = function () {
-        var labels = window.benchmarkData['local'][this.time].labels,
-            translations = window.benchmarkTranslations[window.i18n.locale],
-            translatedLabels = [];
-
-        labels.forEach(function (val) {
-            if (!translations[val]) {
-                translatedLabels.push(val);
-                return;
-            }
-
-            translatedLabels.push(translations[val]);
-        });
-
-        return translatedLabels;
-    };
-
-    $.fn.benchmarkGraph = function() {
-        return this.each(function() {
-            var $el = $(this),
-                plugin;
-
-            if ($el.data('plugin_benchmarkGraph')) {
-                return;
-            }
-
-            plugin = new BenchmarkChart(this);
-            $el.data('plugin_benchmarkGraph', plugin);
-        });
-    };
-
-    $(function() {
-        $('*[data-benchmark-graph="true"]').benchmarkGraph();
-    });
-})(jQuery);
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/js/components.js b/themes/Backend/ExtJs/backend/benchmark/template/local/js/components.js
deleted file mode 100644
index bccd5ee4793..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/js/components.js
+++ /dev/null
@@ -1,111 +0,0 @@
-(function () {
-    $(function () {
-        Vue.component('payment-graph-list-wrapper', {
-            computed: {
-                paymentsList: function () {
-                    return this.$root.payments;
-                }
-            },
-            template: document.getElementById('paymentGraphList').innerHTML
-        });
-
-        Vue.component('payment-graph-bubble-wrapper', {
-            computed: {
-                paymentsList: function () {
-                    return this.$root.sortedPayments;
-                }
-            },
-            methods: {
-                compStyle: function (payment) {
-                    var graphSize = Math.round((180 / 100) * payment);
-                    var opacity = payment / 100;
-
-                    if (opacity < 0.2) {
-                        opacity = 0.2;
-                    }
-
-                    if (graphSize < 40) {
-                        graphSize = 40;
-                    }
-
-                    return {
-                        height: graphSize + 'px',
-                        width: graphSize + 'px',
-                        background: 'rgba(52, 220, 221, ' + opacity + ')',
-                        'line-height': graphSize / 2 + 'px',
-                        'font-size': graphSize + 'px'
-                    };
-                }
-            },
-
-            template: document.getElementById('paymentGraphBubble').innerHTML
-        });
-
-        Vue.component('shipment-graph-list-wrapper', {
-            computed: {
-                shipmentsList: function () {
-                    return this.$root.shipments;
-                }
-            },
-            template: document.getElementById('shipmentGraphList').innerHTML
-        });
-
-        Vue.component('devices-graph-list-wrapper', {
-            computed: {
-                devicesList: function () {
-                    return this.$root.devices;
-                }
-            },
-            template: document.getElementById('devicesGraphList').innerHTML
-        });
-
-        Vue.component('shipment-graph-square-wrapper', {
-            computed: {
-                shipmentsList: function () {
-                    return this.$root.sortedShipments;
-                }
-            },
-            methods: {
-                compStyle: function (shipment) {
-                    var graphSize = Math.round((180 / 100) * shipment),
-                        opacity = shipment / 100;
-
-                    if (opacity < 0.2) {
-                        opacity = 0.2;
-                    }
-
-                    if (graphSize < 40) {
-                        graphSize = 40;
-                    }
-
-                    return {
-                        height: graphSize + 'px',
-                        width: graphSize + 'px',
-                        background: 'rgba(52, 220, 221, ' + opacity + ')',
-                        'line-height': graphSize / 2 + 'px',
-                        'font-size': graphSize + 'px'
-                    };
-                }
-            },
-
-            template: document.getElementById('shipmentGraphSquares').innerHTML
-        });
-
-        Vue.component('target-group-bar', {
-            props: {
-                name: {
-                    type: String,
-                    required: true
-                }
-            },
-
-            computed: {
-                amount: function () {
-                    return this.$root.benchmarkData.local.customers.ages[this.name];
-                }
-            },
-
-            template: '<div class="graph-gradient" :style="{ width: `${amount}%` }"><span class="data--txt high-contrast">{{ amount }}%</span></div>'
-        });
-    });
-})();
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/js/industry_select.js b/themes/Backend/ExtJs/backend/benchmark/template/local/js/industry_select.js
deleted file mode 100644
index 1292ff18e3f..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/js/industry_select.js
+++ /dev/null
@@ -1,266 +0,0 @@
-(function ($) {
-    'use strict';
-
-    function IndustrySelect(el) {
-        this.$el = $(el);
-
-        this.initElements();
-        this.initEvents();
-
-        this.config = {};
-    }
-
-    IndustrySelect.prototype.initElements = function () {
-        this.$shopEntries = this.$el.find('.shop-list--entry');
-        this.$configOverlay = this.$el.find('.shop-config--overlay');
-        this.$cancelButton = this.$el.find('.cancel-button--ct');
-        this.$resetButton = this.$el.find('.reset-button--ct');
-        this.$industrySelect = this.$el.find('.industry-select');
-        this.$industryOption = this.$industrySelect.find('.industry-option');
-        this.$industrySelectHeader = this.$industrySelect.find('.select-header');
-        this.$industryValueInput = this.$industrySelect.find('.industry-value');
-        this.$typeRadios = this.$configOverlay.find('*[name=type]');
-        this.$submitButton = this.$configOverlay.find('.shop-config--submit-button');
-        this.$saveButton = this.$el.find('.industry--save-button');
-    };
-
-    IndustrySelect.prototype.initEvents = function () {
-        this.$shopEntries.on('click', $.proxy(this.onClickShopEntry, this));
-        this.$configOverlay.on('click', $.proxy(this.onClickOverlay, this));
-        this.$cancelButton.on('click', $.proxy(this.onClickCancel, this));
-        this.$resetButton.on('click', $.proxy(this.onClickReset, this));
-        this.$industrySelect.on('click', $.proxy(this.onOpenIndustrySelect, this));
-        this.$industryOption.on('click', $.proxy(this.onClickIndustryOption, this));
-        this.$submitButton.on('click', $.proxy(this.onSubmit, this));
-        this.$saveButton.on('click', $.proxy(this.onSaveIndustry, this));
-
-        $('*[data-language-switch="true"]')[0].addEventListener('languageSwitch', $.proxy(this.onLanguageSwitch, this));
-    };
-
-    IndustrySelect.prototype.onClickShopEntry = function (event) {
-        var $clickedEl = $(event.currentTarget),
-            shopName = $clickedEl.find('.shop-list--name').html(),
-            shopId = $clickedEl.find('.entry-shop-id').val();
-
-        this.fillConfigMask(shopName, this.getConfig(shopId));
-        this.$configOverlay.show();
-    };
-
-    IndustrySelect.prototype.fillConfigMask = function (shopName, config) {
-        var $headlineEl = this.$configOverlay.find('.config-headline');
-
-        $headlineEl.html(shopName);
-
-        if (config.shopId) {
-            this.$configOverlay.find('.overlay-shop-id').val(config.shopId);
-        }
-
-        if (config.industry) {
-            this.selectIndustry(config.industry);
-        }
-
-        if (config.type) {
-            this.selectType(config.type);
-        }
-    };
-
-    IndustrySelect.prototype.onClickOverlay = function (event) {
-        var $target = $(event.target);
-
-        if ($target.hasClass('shop-config--overlay')) {
-            this.closeOverlay();
-        }
-
-        if ($target.hasClass('shop-list--config')) {
-            this.$industrySelect.removeClass('open');
-        }
-    };
-
-    IndustrySelect.prototype.closeOverlay = function () {
-        this.$configOverlay.hide();
-        this.resetOverlay();
-    };
-
-    IndustrySelect.prototype.resetOverlay = function () {
-        this.$industrySelect.removeClass('open');
-        this.$industrySelect.removeClass('active');
-        this.$industrySelectHeader.html(window.i18n.t('defaultIndustryText'));
-        this.$industryValueInput.val(null);
-
-        this.$typeRadios.filter(':checked').prop('checked', false);
-    };
-
-    IndustrySelect.prototype.onClickCancel = function () {
-        this.closeOverlay();
-    };
-
-    IndustrySelect.prototype.onClickReset = function () {
-        this.resetOverlay();
-    };
-
-    IndustrySelect.prototype.onOpenIndustrySelect = function () {
-        this.$industrySelect.toggleClass('open');
-    };
-
-    IndustrySelect.prototype.onClickIndustryOption = function (event) {
-        var $currentTarget = $(event.currentTarget),
-            optionName = $currentTarget.html(),
-            optionValue = $currentTarget.attr('data-industry-value');
-
-        this.$industrySelectHeader.html(optionName);
-        this.$industrySelect.addClass('active');
-        this.$industryValueInput.val(optionValue);
-    };
-
-    IndustrySelect.prototype.onSubmit = function () {
-        var shopId = this.$configOverlay.find('.overlay-shop-id').val(),
-            industryVal = this.$industryValueInput.val(),
-            typeVal = this.$typeRadios.filter(':checked').val();
-
-        this.config[shopId] = {
-            industry: industryVal,
-            type: typeVal,
-            shopId: shopId
-        };
-
-        this.resetEntry(shopId);
-        if (industryVal && typeVal) {
-            this.updateEntry(shopId);
-        }
-
-        this.closeOverlay();
-    };
-
-    IndustrySelect.prototype.getConfig = function (shopId) {
-        if (!this.config[shopId]) {
-            return {
-                shopId: shopId
-            };
-        }
-
-        return this.config[shopId];
-    };
-
-    IndustrySelect.prototype.selectIndustry = function (industry) {
-        var $industryEntry = this.$industryOption.filter('[data-industry-value=' + industry + ']');
-        this.onOpenIndustrySelect();
-        $industryEntry.click();
-    };
-
-    IndustrySelect.prototype.selectType = function (type) {
-        var $radio = this.$typeRadios.filter('*[value=' + type + ']');
-        
-        $radio.prop('checked', true);
-    };
-
-    IndustrySelect.prototype.resetEntry = function (shopId) {
-        var $entry = this.$shopEntries.find('input[value=' +  shopId + ']').parent(),
-            $infoText = $entry.find('.shop-list--info-text');
-
-        $entry.removeClass('configured');
-        $infoText.html(window.i18n.t('emptyShopConfigText'));
-
-        this.updateSaveButton()
-    };
-
-    IndustrySelect.prototype.updateEntry = function (shopId) {
-        var $entry = this.$shopEntries.find('input[value=' +  shopId + ']').parent(),
-            $infoText = $entry.find('.shop-list--info-text'),
-            industryText = this.$industryOption.filter('*[data-industry-value=' + this.config[shopId].industry + ']').html();
-
-        $entry.addClass('configured');
-        $infoText.html(industryText + ' | ' + this.config[shopId].type.toUpperCase());
-
-        this.updateSaveButton();
-    };
-
-    IndustrySelect.prototype.updateSaveButton = function () {
-        var shopCount = this.$el.find('.configured').length;
-
-        this.$saveButton.find('.save-button--shop-counter').html(shopCount);
-
-        this.$saveButton[shopCount > 0 ? 'show' : 'hide']();
-    };
-
-    IndustrySelect.prototype.onSaveIndustry = function () {
-        var me = this;
-
-        $.ajax({
-            url: this.$saveButton.attr('data-save-url'),
-            data: { config: this.config },
-            success: function (response) {
-                if (!response.success) {
-                    return;
-                }
-
-                window.location.href = me.$saveButton.attr('data-success-url').replace('placeholder', window.i18n.locale);
-            }
-        });
-    };
-
-    IndustrySelect.prototype.onLanguageSwitch = function () {
-        this.translateShopEntries();
-        this.translateIndustryValue();
-    };
-
-    IndustrySelect.prototype.translateShopEntries = function () {
-        var me = this,
-            $shopEntry, shopId,
-            $infoText,
-            name, translation;
-
-        this.$shopEntries.each(function (index, shopEntry) {
-            $shopEntry = $(shopEntry);
-            shopId = $shopEntry.find('.entry-shop-id').val();
-            $infoText = $shopEntry.find('.shop-list--info-text');
-
-            // Is configured
-            if ($shopEntry.hasClass('configured')) {
-                translation = me.getTranslationForIndustryId(me.config[shopId].industry);
-                name = translation + ' | ' + me.config[shopId].type.toUpperCase();
-
-                $infoText.html(name);
-
-                return;
-            }
-
-            $infoText.html(window.i18n.t('emptyShopConfigText'));
-        });
-    };
-
-    IndustrySelect.prototype.translateIndustryValue = function () {
-        var industryValue = this.$configOverlay.find('.industry-value').val();
-
-        if (industryValue) {
-            this.$industrySelectHeader.html(this.getTranslationForIndustryId(industryValue));
-
-            return;
-        }
-
-        this.$industrySelectHeader.html(window.i18n.t('defaultIndustryText'));
-    };
-
-    IndustrySelect.prototype.getTranslationForIndustryId = function (industryId) {
-        var $industryOption = this.$industryOption.filter('*[data-industry-value=' + industryId + ']'),
-            translationKey = $industryOption.attr('data-translation-name');
-
-        return window.i18n.t(translationKey);
-    };
-
-    $.fn.industrySelect = function() {
-        return this.each(function() {
-            var $el = $(this);
-
-            if ($el.data('plugin_industrySelect')) {
-                return;
-            }
-
-            var plugin = new IndustrySelect(this);
-            $el.data('plugin_industrySelect', plugin);
-        });
-    };
-
-    $(function() {
-        $('*[data-industry-select="true"]').industrySelect();
-    });
-})(jQuery);
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/js/pong.js b/themes/Backend/ExtJs/backend/benchmark/template/local/js/pong.js
deleted file mode 100644
index 9b1b8a06a80..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/js/pong.js
+++ /dev/null
@@ -1,336 +0,0 @@
-(function($) {
-
-    function PongGame(el) {
-        this.$el = $(el);
-
-        this.initGlobals();
-        this.setupCanvas.call(this);
-        this.initializeStartButton();
-        this.initializeSounds();
-        this.initializeGame();
-    };
-
-    PongGame.prototype.initGlobals = function () {
-        this.states = {
-            'idle': 0,
-            'up': 1,
-            'down': 2,
-            'left': 3,
-            'right': 4
-        };
-
-        this.colors = {
-            background: '#1B2C3D',
-            paddle: '#FFFFFF',
-            ball: '#189EFF'
-        };
-    };
-
-    PongGame.prototype.initializeGame = function () {
-        this.player = this.createPaddle('left');
-        this.paddle = this.createPaddle('right');
-        this.ball = this.createBall();
-
-        this.running = false;
-        this.turn = this.paddle;
-        this.timer = this.round = 0;
-        this.color = this.colors.background;
-
-        this.draw();
-        this.listen();
-    };
-
-    PongGame.prototype.initializeSounds = function () {
-        this.sounds = {
-            beep1: new Audio("data:audio/wav;base64,//uQRAAAAWMSLwUIYAAsYkXgoQwAEaYLWfkWgAI0wWs/ItAAAGDgYtAgAyN+QWaAAihwMWm4G8QQRDiMcCBcH3Cc+CDv/7xA4Tvh9Rz/y8QADBwMWgQAZG/ILNAARQ4GLTcDeIIIhxGOBAuD7hOfBB3/94gcJ3w+o5/5eIAIAAAVwWgQAVQ2ORaIQwEMAJiDg95G4nQL7mQVWI6GwRcfsZAcsKkJvxgxEjzFUgfHoSQ9Qq7KNwqHwuB13MA4a1q/DmBrHgPcmjiGoh//EwC5nGPEmS4RcfkVKOhJf+WOgoxJclFz3kgn//dBA+ya1GhurNn8zb//9NNutNuhz31f////9vt///z+IdAEAAAK4LQIAKobHItEIYCGAExBwe8jcToF9zIKrEdDYIuP2MgOWFSE34wYiR5iqQPj0JIeoVdlG4VD4XA67mAcNa1fhzA1jwHuTRxDUQ//iYBczjHiTJcIuPyKlHQkv/LHQUYkuSi57yQT//uggfZNajQ3Vmz+Zt//+mm3Wm3Q576v////+32///5/EOgAAADVghQAAAAA//uQZAUAB1WI0PZugAAAAAoQwAAAEk3nRd2qAAAAACiDgAAAAAAABCqEEQRLCgwpBGMlJkIz8jKhGvj4k6jzRnqasNKIeoh5gI7BJaC1A1AoNBjJgbyApVS4IDlZgDU5WUAxEKDNmmALHzZp0Fkz1FMTmGFl1FMEyodIavcCAUHDWrKAIA4aa2oCgILEBupZgHvAhEBcZ6joQBxS76AgccrFlczBvKLC0QI2cBoCFvfTDAo7eoOQInqDPBtvrDEZBNYN5xwNwxQRfw8ZQ5wQVLvO8OYU+mHvFLlDh05Mdg7BT6YrRPpCBznMB2r//xKJjyyOh+cImr2/4doscwD6neZjuZR4AgAABYAAAABy1xcdQtxYBYYZdifkUDgzzXaXn98Z0oi9ILU5mBjFANmRwlVJ3/6jYDAmxaiDG3/6xjQQCCKkRb/6kg/wW+kSJ5//rLobkLSiKmqP/0ikJuDaSaSf/6JiLYLEYnW/+kXg1WRVJL/9EmQ1YZIsv/6Qzwy5qk7/+tEU0nkls3/zIUMPKNX/6yZLf+kFgAfgGyLFAUwY//uQZAUABcd5UiNPVXAAAApAAAAAE0VZQKw9ISAAACgAAAAAVQIygIElVrFkBS+Jhi+EAuu+lKAkYUEIsmEAEoMeDmCETMvfSHTGkF5RWH7kz/ESHWPAq/kcCRhqBtMdokPdM7vil7RG98A2sc7zO6ZvTdM7pmOUAZTnJW+NXxqmd41dqJ6mLTXxrPpnV8avaIf5SvL7pndPvPpndJR9Kuu8fePvuiuhorgWjp7Mf/PRjxcFCPDkW31srioCExivv9lcwKEaHsf/7ow2Fl1T/9RkXgEhYElAoCLFtMArxwivDJJ+bR1HTKJdlEoTELCIqgEwVGSQ+hIm0NbK8WXcTEI0UPoa2NbG4y2K00JEWbZavJXkYaqo9CRHS55FcZTjKEk3NKoCYUnSQ0rWxrZbFKbKIhOKPZe1cJKzZSaQrIyULHDZmV5K4xySsDRKWOruanGtjLJXFEmwaIbDLX0hIPBUQPVFVkQkDoUNfSoDgQGKPekoxeGzA4DUvnn4bxzcZrtJyipKfPNy5w+9lnXwgqsiyHNeSVpemw4bWb9psYeq//uQZBoABQt4yMVxYAIAAAkQoAAAHvYpL5m6AAgAACXDAAAAD59jblTirQe9upFsmZbpMudy7Lz1X1DYsxOOSWpfPqNX2WqktK0DMvuGwlbNj44TleLPQ+Gsfb+GOWOKJoIrWb3cIMeeON6lz2umTqMXV8Mj30yWPpjoSa9ujK8SyeJP5y5mOW1D6hvLepeveEAEDo0mgCRClOEgANv3B9a6fikgUSu/DmAMATrGx7nng5p5iimPNZsfQLYB2sDLIkzRKZOHGAaUyDcpFBSLG9MCQALgAIgQs2YunOszLSAyQYPVC2YdGGeHD2dTdJk1pAHGAWDjnkcLKFymS3RQZTInzySoBwMG0QueC3gMsCEYxUqlrcxK6k1LQQcsmyYeQPdC2YfuGPASCBkcVMQQqpVJshui1tkXQJQV0OXGAZMXSOEEBRirXbVRQW7ugq7IM7rPWSZyDlM3IuNEkxzCOJ0ny2ThNkyRai1b6ev//3dzNGzNb//4uAvHT5sURcZCFcuKLhOFs8mLAAEAt4UWAAIABAAAAAB4qbHo0tIjVkUU//uQZAwABfSFz3ZqQAAAAAngwAAAE1HjMp2qAAAAACZDgAAAD5UkTE1UgZEUExqYynN1qZvqIOREEFmBcJQkwdxiFtw0qEOkGYfRDifBui9MQg4QAHAqWtAWHoCxu1Yf4VfWLPIM2mHDFsbQEVGwyqQoQcwnfHeIkNt9YnkiaS1oizycqJrx4KOQjahZxWbcZgztj2c49nKmkId44S71j0c8eV9yDK6uPRzx5X18eDvjvQ6yKo9ZSS6l//8elePK/Lf//IInrOF/FvDoADYAGBMGb7FtErm5MXMlmPAJQVgWta7Zx2go+8xJ0UiCb8LHHdftWyLJE0QIAIsI+UbXu67dZMjmgDGCGl1H+vpF4NSDckSIkk7Vd+sxEhBQMRU8j/12UIRhzSaUdQ+rQU5kGeFxm+hb1oh6pWWmv3uvmReDl0UnvtapVaIzo1jZbf/pD6ElLqSX+rUmOQNpJFa/r+sa4e/pBlAABoAAAAA3CUgShLdGIxsY7AUABPRrgCABdDuQ5GC7DqPQCgbbJUAoRSUj+NIEig0YfyWUho1VBBBA//uQZB4ABZx5zfMakeAAAAmwAAAAF5F3P0w9GtAAACfAAAAAwLhMDmAYWMgVEG1U0FIGCBgXBXAtfMH10000EEEEEECUBYln03TTTdNBDZopopYvrTTdNa325mImNg3TTPV9q3pmY0xoO6bv3r00y+IDGid/9aaaZTGMuj9mpu9Mpio1dXrr5HERTZSmqU36A3CumzN/9Robv/Xx4v9ijkSRSNLQhAWumap82WRSBUqXStV/YcS+XVLnSS+WLDroqArFkMEsAS+eWmrUzrO0oEmE40RlMZ5+ODIkAyKAGUwZ3mVKmcamcJnMW26MRPgUw6j+LkhyHGVGYjSUUKNpuJUQoOIAyDvEyG8S5yfK6dhZc0Tx1KI/gviKL6qvvFs1+bWtaz58uUNnryq6kt5RzOCkPWlVqVX2a/EEBUdU1KrXLf40GoiiFXK///qpoiDXrOgqDR38JB0bw7SoL+ZB9o1RCkQjQ2CBYZKd/+VJxZRRZlqSkKiws0WFxUyCwsKiMy7hUVFhIaCrNQsKkTIsLivwKKigsj8XYlwt/WKi2N4d//uQRCSAAjURNIHpMZBGYiaQPSYyAAABLAAAAAAAACWAAAAApUF/Mg+0aohSIRobBAsMlO//Kk4soosy1JSFRYWaLC4qZBYWFRGZdwqKiwkNBVmoWFSJkWFxX4FFRQWR+LsS4W/rFRb/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////VEFHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU291bmRib3kuZGUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMjAwNGh0dHA6Ly93d3cuc291bmRib3kuZGUAAAAAAAAAACU="),
-            beep2: new Audio("data:audio/wav;base64,UklGRmY7AABXQVZFZm10IBAAAAABAAEARKwAAIhYAQACABAAZGF0YUI7AAAAAPMb8xvTJtMmFS0VLb4wvjB6MnoynDScNPo3+jfZOtk6SD1IPVA/UD/3QPdAQUJBQjJDMkPMQ8xDEUQRRABEAESaQ5pD3kLeQstBy0FdQF1Akz6TPmU8ZTzOOc45wzbDNjUzNTMNLw0vIyojKi4kLiSCHIIcmBCYEGftZ+1p4mniCNsI2z3VPdVz0HPQZMxkzOzI7Mj1xfXFccNxw1XBVcGbv5u/Pr4+vju9O72OvI68N7w3vDa8NryIvIi8Mb0xvTC+ML6Iv4i/PcE9wVLDUsPPxc/Fvci9yCnMKcwp0CnQ4NTg1IzajNq44bjhH+wf7NAO0A6KG4obZiNmI3IpciloLmgumDKYMis2KzY6OTo51DvUOwQ+BD7RP9E/QUFBQVdCV0IVQxVDfkN+Q5NDk0NSQ1JDvUK9QtJB0kGPQI9A8D7wPvM88zyPOo86vje+N3I0cjSYMJgwEiwSLKgmqCbqH+oflRaVFrD2sPay5rLmQd5B3uzX7NfH0sfSdM50zsTKxMqdx53H7cTtxKnCqcLJwMnARr9Gvx6+Hr5OvU690rzSvKy8rLzZvNm8W71bvTO+M75hv2G/6sDqwNHC0cIbxRvF0cfRx/7K/sqzzrPODNMM0zjYONiW3pbeGuca59z33PfbFtsWBSAFIKwmrCYELAQsfDB8MEk0STSJN4k3TzpPOqg8qDycPpw+MEAwQGtBa0FOQk5C20LbQhRDFEP5QvlCikKKQsZBxkGrQKtAOD84P2g9aD02OzY7mzibOIw1jDX6MfoxzS3NLdko2SjQItAi8xrzGgcOBw7s6+zr0OHQ4cvay9o81TzVndCd0LLMssxYyVjJe8Z7xg7EDsQGwgbCX8BfwBK/Er8dvh2+fr1+vTO9M708vTy9mL2YvUm+Sb5Pv0+/rcCtwGfCZ8KBxIHEAscCx/PJ88ljzWPNadFp0SfWJ9bj2+PbNuM24zbuNu7OEM4QPxw/HLEjsSN9KX0pRS5FLlAyUDLENcQ1uDi4ODs7OztWPVY9ED8QP29Ab0B2QXZBJ0InQoRChEKNQo1CQ0JDQqZBpkG0QLRAaj9qP8Y9xj3EO8Q7XDlcOYg2iDY4MzgzWS9ZL8wqzCpVJVUleR55Hr0UvRRt823z2uXa5eXd5d3W19bX4tLi0rbOts4myybLG8gbyIPFg8VUw1TDh8GHwRbAFsD9vv2+O747vsy9zL2wvbC9573nvXK+cr5Rv1G/hsCGwBTCFMIAxADETsZOxgfJB8k3zDfM8c/xz1DUUNSH2YfZ/t/+38voy+jeBN4E3xffF3MgcyDNJs0m8SvxK0AwQDDsM+wzDzcPN705vTn/O/874D3gPWM/Yz+OQI5AYkFiQeNB40EQQhBC60HrQXRBdEGoQKhAhz+HPw4+Dj45PDk8AzoDOmU3ZTdTNFM0vTC9MIosiiyNJ40ncCFwIVwZXBnzCvMKq+qr6kzhTOGd2p3aRtVG1dLQ0tAJzQnNzcnNyQrHCsezxLPEwMLAwirBKsHtv+2/B78Hv3W+db41vjW+SL5Ivq6+rr5mv2a/c8BzwNfB18GWw5bDtMW0xTjIOMgtyy3LoM6gzqrSqtJx13HXPd093brkuuR/8H/wbRJtEtwc3BztI+0jfCl8KRguGC7+Mf4xVDVUNS44LjiZOpk6nzyfPEc+Rz6WP5Y/jkCOQDJBMkGDQYNBgkGCQS9BL0GJQIlAkD+QP0A+QD6YPJg8kTqROiY4JjhONU41+zH7MRkuGS6FKYUpACQAJAMdAx3KEsoSHfEd8R7lHuWa3ZrdzdfN1wjTCNMCzwLPksuSy6HIocghxiHGCMQIxE3CTcLtwO3A5L/kvy6/Lr/Lvsu+u767vvu++76Ov46/dMB0wK/Br8FCw0LDMsUyxYTHhMdAykDKdM10zTHRMdGW1ZbV2NrY2mnhaeGN6o3q9gn2CcEYwRjQINAg4ibiJtMr0yv7L/svhjOGM402jTYiOSI5TztPOxw9HD2OPo4+qT+pP3BAcEDkQORAB0EHQdhA2EBYQFhAhT+FP14+Xj7gPOA8BzsHO804zTgsNiw2FzMXM34vfi9FK0UrPyY/Jg0gDSC7F7sXiwaLBpfpl+nc4Nzgfdp92lvVW9UR0RHRas1qzUvKS8qhx6HHYMVgxYDDgMP8wfzB0MDQwPi/+L9yv3K/Pr8+v1u/W7/Jv8m/iMCIwJzBnMEFwwXDyMTIxOrG6sZxyXHJacxpzN/P38/u0+7TvNi82Jremt5F5kXmGPMY88gTyBNjHWMdGyQbJHApcCnfLd8tozGjMds02zSaN5o37znvOeE74Tt3PXc9tT61Pp8/nz82QDZAe0B7QHBAcEAUQBRAZz9nP2c+Zz4SPRI9ZTtlO1s5WzntNu02EjQSNLwwvDDWLNYsOyg7KKkiqSKHG4cbtBC0EE3vTe985HzkXt1e3dDX0Nc50znTV89XzwbMBswxyTHJyMbIxsPEw8QbwxvDzMHMwdHA0cApwCnA0r/Sv8u/y78VwBXAsMCwwJzBnMHdwt3CdcR1xGnGaca+yL7Ifct9y7POs85z0nPS3dbd1ivcK9zY4tjiYuxi7M0MzQyEGYQZHCEcIeom6iaqK6orqy+rLxYzFjMCNgI2fzh/OJc6lzpRPFE8sj2yPb4+vj53P3c/3z/fP/c/9z+/P78/Nz83P10+XT4wPTA9rTutO9A50DmTN5M37zTvNNgx2DE8Ljwu/yn/Ke8k7ySnHqceDRYNFpL5kvmr6KvofuB+4Graatp81XzVWtFa0dXN1c3SytLKQMhAyBbGFsZKxErE18LXwrrBusHvwO/AdsB2wE3ATcBzwHPA6cDpwLDBsMHKwsrCOMQ4xP/F/8UkyCTIrsquyqjNqM0h0SHRM9Uz1QnaCdr53/nf2efZ50n2SfbtFO0U1R3VHTokOiRXKVcpnS2dLT4xPjFYNFg0/jb+Njw5PDkbOxs7nzyfPM09zT2oPqg+Mz8zP20/bT9YP1g/9D70PkA+QD45PTk93zvfOy46LjogOCA4sDWwNdMy0zJ7L3svkSuRK/Am8CZPIU8hBhoGGmkOaQ7T7dPt8uPy4zLdMt3f19/XddN107fPt8+FzIXMycnJyXjHeMeHxYfF8cPxw7LCssLGwcbBK8Erwd/A38DjwOPANcE1wdfB18HKwsrCEMQQxK3FrcWjx6PH+8n7ybzMvMz0z/TPt9O30yfYJ9iA3YDdTORM5FHuUe7hDuEOKxorGlchVyHkJuQmdSt1K1EvUS+cMpwybTVtNdM30zfVOdU5fTt9O808zTzKPco9dj52PtM+0z7gPuA+nz6fPg8+Dz4vPS89/Tv9O3U6dTqVOJU4VjZWNrAzsDOWMJYw+Cz4LLcotyieI54jPR09HVAUUBSV9ZX14Ofg5zLgMuBl2mXaqdWp1a7RrtFJzknOYstiy+nI6cjUxtTGG8UbxbnDucOrwqvC78HvwYHBgcFjwWPBksGSwRDCEMLewt7C/cP9w3DFcMU7xzvHYsliye7L7svpzunOZdJl0nvWe9ZY21jbW+Fb4Xfpd+lp+2n75xXnFTQeNB5KJEokMykzKU8tTy3OMM4wzDPMM1k2WTaBOIE4TDpMOr47vjvdPN08qj2qPSg+KD5YPlg+Oj46Ps09zT0SPRI9BjwGPKc6pzryOPI44jbiNm80bzSRMZExNy43LkoqSiqjJaMl9B/0H34YfhjHC8cLmOyY7H7jfuMU3RTd+9f717zTvNMh0CHQDM0MzWvKa8owyDDIU8ZTxtDE0MSgw6DDwsLCwjTCNMLzwfPBAcIBwlzCXMIFwwXD/sP+w0nFScXpxunG4sjiyDzLPMv/zf/NONE40f7U/tRy2XLZ2N7Y3sXlxeVm8GbwhRCFELkauRqCIYIh0ibSJjUrNSvsLuwuGTIZMtA00DQdNx03DDkMOaE6oTrhO+E7zzzPPG49bj2/Pb89wz3DPXk9eT3iPOI8/Dv8O8Q6xDo5OTk5VjdWNxQ1FDVsMmwyUi9SL7IrsitsJ2wnSiJKItAb0Bt/En8SFvMW8zLnMuf43/jfbdpt2uLV4tUN0g3SyM7IzvzL/MubyZvJm8ebx/XF9cWkxKTEpcOlw/bC9sKUwpTCgMKAwrjCuMI+wz7DEsQSxDbFNsWtxq3Gesh6yKTKpMoyzTLNLtAu0KvTq9PE18TXqdyp3MDiwOIh6yHrcAdwB7wWvBaAHoAeTSRNJAIpAin2LPYsVDBUMDYzNjOqNao1vTe9N3Q5dDnVOtU65TvlO6U8pTwXPRc9PD08PRQ9FD2gPKA83jveO806zTpqOWo5sjeyN581nzUrMyszSzBLMPAs8CwBKQEpVCRUJJUelR7uFu4WcAhwCI/rj+se4x7jBt0G3SPYI9gO1A7UltCW0J7Nns0WyxbL8cjxyCnHKce3xbfFl8SXxMfDx8NFw0XDD8MPwybDJsOJw4nDOcQ5xDfFN8WGxobGKsgqyCbKJsqBzIHMRc9Fz3/Sf9JH1kfWwNrA2jHgMeBD50Pns/Kz8tsR2xEwGzAbniGeIbImsibqKuoqfS59LosxizEoNCg0XzZfNjk4OTi8Obw57DrsOsw7zDtePF48pDykPJ48njxMPEw8rjuuO8I6wjqGOYY59zf3NxI2EjbPM88zJjEmMQouCi5pKmkqICYgJvQg9CBeGl4akhCSEDrxOvGg5qDmzt/O34Pag9om1ibWd9J30lHPUc+gzKDMV8pXymvIa8jYxtjGmMWYxafEp8QFxAXEr8Ovw6TDpMPlw+XDcsRyxEzFTMV1xnXG78fvx7/Jv8nry+vLec55znbRdtH01PTUENkQ2fzd/N0o5Cjk2uza7LsKuwpwF3AXuh66HkIkQiTFKMUokiySLNAv0C+WMpYy8jTyNO827zaTOJM45DnkOeQ65DqXO5c7/Tv9Oxg8GDzoO+g7bDtsO6Q6pDqOOY45JzgnOGw2bDZYNFg04zHjMQMvAy+nK6crtie2JwQjBCM0HTQdVBVUFQAAAACv6q/q0uLS4gbdBt1Y2FjYbNRs1BXRFdE6zjrOy8vLy73JvckIyAjIp8anxpbFlsXUxNTEXsRexDPEM8RSxFLEvcS9xHPFc8V3xnfGysfKx3DJcMluy27Lys3KzY7QjtDJ08nTkteS1w/cD9yN4Y3hyOjI6GD1YPX3EvcSkRuRG6ohqiGGJoYmkyqTKgMuAy7zMPMwdjN2M5Y1ljVcN1w3zTjNOO457jnAOsA6RjtGO4E7gTtyO3I7GDsYO3M6czqCOYI5QjhCOLA2sDbJNMk0hTKFMtsv2y/ALMAsHSkdKdIk0iScH5wf6BjoGIAOgA7A78DvJ+Yn5rTftN+m2qbad9Z31uzS7NLlz+XPT81PzRzLHMtGyUbJxMfEx5TGlMayxbLFHMUcxdHE0cTQxNDEGcUZxa3FrcWMxozGuce5xzfJN8kJywnLNc01zcTPxM/C0sLSQNZA1l3aXdpR31HflOWU5afup+7tDO0MBxgHGOIe4h4oJCgkfCh8KCMsIyxBL0Ev6zHrMS80LzQXNhc2qTepN+k46TjaOdo5gDqAOts62zrsOuw6szqzOjE6MTpjOWM5SDhION823zYhNSE1DDMMM5cwlzC2LbYtWypbKmkmaSaxIbEh0BvQG64TrhPi9+L38+nz6ZnimeIV3RXdmdiZ2NXU1dSg0aDR4c7hzovMi8ySypLK8MjwyKDHoMefxp/G6sXqxX/Ff8VexV7FhsWGxfjF+MW0xrTGvce9xxPJE8m8yrzKu8y7zBfPF8/b0dvRFtUW1d/Y39hg3WDd6+Lr4lXqVerq+Or45BPkE90b3RumIaYhTCZMJi8qLyp9LX0tUTBRMLoyujLENMQ0djZ2NtY31jfmOOY4qzmrOSU6JTpWOlY6Pjo+Otw53DkxOTE5Ozg7OPg2+DZkNWQ1ezN7MzYxNjGNLo0ucityK9An0CeBI4EjQh5CHm0XbRcxDDEMje6N7sTlxOWr36vf19rX2tTW1NZs02zThNCE0AfOB87sy+zLKsoqyrrIusiax5rHxsbGxjzGPMb8xfzFBMYExlXGVcbvxu/G1MfUxwTJBMmFyoXKWMxYzIXOhc4U0RTRENQQ1I7Xjtet263bqOCo4APnA+eQ8JDwlg6WDoMYgxj5HvkeACQAJCYoJiioK6grpi6mLjYxNjFiM2IzNTU1NbQ2tDbkN+Q3xzjHOGA5YDmwObA5uDm4OXc5dznuOO44GzgbOP02/TaQNZA10TPRM7sxuzFGL0YvZyxnLAwpDCkZJRklXCBcIGkaaRr5EfkRGvUa9VfpV+ly4nLiM90z3ejY6NhL1UvVNtI20pPPk89VzVXNcctxy+LJ4smjyKPIscexxwnHCcepxqnGksaSxsPGw8Y7xzvH/cf9xwrJCsljymPKDcwNzA3ODc5p0GnQLNMs02bWZtYv2i/as96z3kzkTOTr6+vrNwQ3BKkUqRQVHBUckyGTIQUmBSbAKcAp7CzsLKIvoi/zMfMx5zPnM4U1hTXUNtQ21TfVN404jTj7OPs4IjkiOQE5ATmZOJk46DfoN+427janNac1ETQRNCcyJzLjL+MvOy07LSEqISp/Jn8mLyIvIuYc5hzrFesVdwl3CZHtke155Xnlst+y3xbbFts91z3X+dP50y7RLtHLzsvOx8zHzBjLGMu6ybrJqsiqyOTH5Mdmx2bHMMcwx0HHQceZx5nHOcg5yCLJIslWylbK2MvYy63Nrc3az9rPZ9Jn0mPVY9Xg2ODY/9z/3AHiAeJ36HfooPKg8uYP5g/mGOYY/x7/HssjyyPDJ8MnICsgKwAuAC51MHUwijKKMkk0STS2NbY11jbWNqs3qzc3ODc4fDh8OHs4ezgzODM4ozejN8w2zDaqNao1OzQ7NHsyezJlMGUw8S3xLRMrEyu5J7knxyPHIwUfBR//GP8YMRAxEC3zLfPY6NjoXuJe4l/dX91E2UTZzdXN1djS2NJQ0FDQKs4qzlzMXMzfyt/Kscmxyc3IzcgxyDHI3cfdx8/Hz8cIyAjIh8iHyE3JTcldyl3Kucu5y2XNZc1kz2TPwNHA0YHUgdS517nXgtuC2wngCeCv5a/ljO2M7ZEIkQhLFUsVORw5HHEhcSGxJbElQylDKU4sTizpLukuIDEgMf8y/zKKNIo0yDXINbo2ujZlN2U3yDfIN+U35Te8N7w3TTdNN5c2lzaZNZk1TzRPNLgyuDLOMM4wiy6LLuQr5CvMKMwoLCUsJdog2iCIG4gbYhRiFJ4FngXC7MLsQuVC5cnfyd9i22LbtNe015LUktTk0eTRm8+bz63Nrc0SzBLMxcrFysTJxMkLyQvJmciZyG3IbciHyIfI5sjmyIvJi8l4ynjKr8uvyzPNM80HzwfPM9Ez0b/Tv9O51rnWNNo02lTeVN5c41zj8Onw6e/07/T2EPYQMhkyGfQe9B6GI4YjUydTJ4wqjCpOLU4tqC+oL6cxpzFRM1EzrDSsNLw1vDWENoQ2BDcENz83Pzc1NzU35TblNlA2UDZ0NXQ1TzRPNN8y3zIfMR8xCi8KL5cslyy8KbwpZCZkJnIiciKtHa0dkReRF00OTQ618bXxc+hz6FziXOKb3Zvdrtmu2VzWXNaG04bTGtEa0QvPC89RzVHN58vny8nKycrzyfPJZMlkyRvJG8kWyRbJVslWydvJ28mmyqbKucu5yxfNF83CzsLOwdDB0BvTG9Pb1dvVENkQ2dfc19xg4WDhFecV5zzvPO/xCvEKzRXNFUocShw/IT8hTiVOJbkouSikK6QrIy4jLkIwQjALMgsyhDOEM7A0sDSUNZQ1MjYyNoo2ijaeNp42bTZtNvg1+DU9NT01PDQ8NPAy8DJZMVkxby9vLy0tLS2JKokqdCd0J9Yj1iOEH4QfJxonGtAS0BKE+oT6GewZ7CDlIOXx3/Hfvtu+2zjYONg31TfVp9Kn0nfQd9Cezp7OF80XzdzL3MvpyunKPso+ytfJ18m1ybXJ1snWyTzKPMrmyubK18vXyxDNEM2UzpTOaNBo0JPSk9Ic1RzVE9gT2Ivbi9uq36rfueS55G7rbuu697r30hHSEWcZZxnYHtgeMyMzI9Um1SbrKespjyyPLM8uzy63MLcwTjJOMpczlzOYNJg0UTVRNcY1xjX3Nfc15TXlNY81jzX0NPQ0FDQUNO0y7TJ8MXwxvC+8L6gtqC04KzgrYChgKAslCyUbIRshUhxSHCAWIBZADEAMjfCN8CjoKOhr4mvi5d3l3SbaJtr41vjWQdRB1PDR8NH4z/jPU85TzvvM+8zty+3LJcsly6LKospjymPKZ8pnyq3Krco4yzjLB8wHzB3NHc18znzOJ9An0CXSJdJ81HzUONc412raatov3i/euuK64n7ofuj/8P/woAygDDMWMxZJHEkc/iD+IN0k3SQiKCIo7SrtKlAtUC1XL1cvCzELMXEycTKNM40zYzRjNPQ09DRCNUI1TDVMNRQ1FDWZNJk02zPbM9Yy1jKKMYox8i/yLwouCi7KK8orKikqKRgmGCZ9In0iKx4rHsQYxBg0ETQRLfct95LrkusS5RLlKeAp4CjcKNzJ2MnY69Xr1XbTdtNf0V/RnM+czyjOKM7+zP7MGswazHvLe8sgyyDLB8sHyzDLMMuby5vLSsxKzD7NPs14znjO/c/9z9DR0NH40/jTftZ+1nHZcdnm3ObcA+ED4RjmGObz7PPsH/wf/IMSgxKGGYYZqx6rHtAi0CJJJkkmPCk8KcIrwivqLeotuy+7Lz4xPjF2MnYyZzNnMxQ0FDR9NH00pTSlNIo0ijQuNC40jzOPM6wyrDKDMYMxETARMFIuUi5BLEEs1CnUKf8m/yavI68jwR/BH/Ua9RqpFKkU7wnvCaLvou/05/TnjOKM4kDeQN6s2qzao9ej1wrVCtXT0tPS89Dz0GLPYs8czhzOHc0dzWPMY8zry+vLtsu2y8LLwssQzBDMn8yfzHLNcs2JzonO6c/pz5PRk9GP04/T49Xj1ZvYm9jJ28nbit+K3xXkFeTr6evp3vLe8ugN6A1+Fn4WNBw0HKwgrCBdJF0kfSd9JygqKCpvLG8sXy5fLv4v/i9RMVExXjJeMiYzJjOqM6oz7jPuM/Az8DOxM7EzMTMxM24ybjJoMWgxGjAaMIMugy6dLJ0sYSphKsUnxSe4JLgkICEgIc8czxxeF14Xig+KDyf1J/Uq6yrrGOUY5XHgceCh3KHcatlq2azWrNZU1FTUVdJV0qjQqNBHz0fPLc4tzljNWM3FzMXMdMx0zGTMZMyUzJTMBc0FzbjNuM2uzq7O6s/qz27RbtE/0z/TZNVk1ebX5tfT2tPaRN5E3l/iX+J653rnge6B7jwGPAYOEw4TkBmQGWwebB5eIl4irSWtJX8ofyjoKugq9iz2LLEusS4gMCAwSDFIMSoyKjLKMsoyKDMoM0YzRjMkMyQzwjLCMh8yHzI5MTkxDzAPMJ4uni7hLOEs0irSKmooaiiaJZolTyJPImUeZR6WGZYZLhMuEw8HDwfn7ufu2OfY58DiwOKr3qveQttC21zYXNjh1eHVxNPE0/vR+9F+0H7QSc9Jz1rOWs6tza3NQc1BzRXNFc0pzSnNfc19zRHOEc7mzubO/8//z17RXtEH0wfTANUA1VDXUNcD2gPaK90r3ejg6OBz5XPlW+tb6+b05vTnDucOsBawFg0cDRxJIEkgzSPNI8gmyCZUKVQpgCuAK1gtWC3jLuMuJDAkMCExITHbMdsxVDJUMo0yjTKHMocyQjJCMr0xvTH4MPgw7y/vL6Iuoi4NLQ0tKSspK/Eo8ShaJlomUyNTI8EfwR9yG3Ib9RX1FcwNzA2z87Pz4Org6jPlM+XL4MvgK90r3RraGtp813zXQNVA1VrTWtPC0cLRc9Bz0GnPac+izqLOHM4cztbN1s3Ozc7NBc4FznvOe84xzzHPKdAp0GTRZNHn0ufSttS21NfW19ZT2VPZO9w73KXfpd+9473j3uje6BjwGPDqCOoIdxN3E4UZhRkcHhwe2yHbIQIlAiWyJ7In/yn/KfMr8yuZLZkt9S71LgswCzDfMN8wcjFyMcYxxjHbMdsxsjGyMUsxSzGkMKQwvC+8L5Iuki4hLSEtZytnK10pXSn5JvkmMCQwJOsg6yAFHQUdNBg0GK0RrREAAAAAV+5X7tPn0+cG4wbjJt8m3+fb59sk2STZyNbI1sXUxdQS0xLTqdGp0YXQhdClz6XPBc8Fz6TOpM6CzoLOnc6dzvbO9s6Oz47PZtBm0H/Rf9He0t7ShNSE1HnWedbD2MPYcNtw25Lekt5J4kni1ObU5s/sz+w49zj3rQ+tD8gWyBbSG9Ib1R/VHy0jLSMDJgMmcChwKIIqgipDLEMsuS25Leku6S7WL9YvgjCCMPAw8DAgMSAxEjESMccwxzA+MD4wdi92L20ubS4gLSAtjSuNK60prSl6J3on6STpJOkh6SFdHl0eERoRGooUihT0C/QLm/Kb8rHqseph5WHlN+E34cXdxd3a2traXNhc2DzWPNZt1G3U69Lr0q7RrtG10LXQ/M/8z4HPgc9Fz0XPRc9Fz4LPgs/9z/3PttC20K/Rr9Hq0urSatRq1DXWNdZR2FHYx9rH2qjdqN0L4QvhH+Uf5UXqReq88bzxoQqhCsETwRNkGWQZuR25HUchRyFHJEck1ibWJgUpBSnhKuEqcSxxLLotui3ALsAuhS+FLwwwDDBWMFYwYjBiMDMwMzDHL8cvHS8dLzQuNC4JLQktmyubK+Qp5CnfJ98ngiWCJcAiwCKCH4IfoxujG9AW0BYkECQQWPlY+evt6+3l5+XnYONg47TftN+e3J7c/tn+2b/Xv9fV1dXVONQ41OPS49LR0dHR/9D/0GzQbNAW0BbQ/M/8zx7QHtB90H3QGNEY0fHR8dEL0wvTZ9Rn1ArWCtb61/rXPto+2uTc5Nz93/3freOt4zfoN+hH7kfuNfo1+kQQRBDIFsgWgxuDG08fTx97InsiLiUuJXwnfCd0KXQpHSsdK38sfyydLZ0tey57LhovGi99L30vpC+kL48vjy8+Lz4vsS6xLuct5y3eLN4skyuTKwMqAyooKCgo/CX8JXIjciN6IHog9hz2HK4YrhgbExsT8QnxCcbxxvGd6p3qpeWl5bXhteFx3nHerNus207ZTtlI10jXktWS1STUJNT60vrSENIQ0mXRZdH20PbQw9DD0MrQytAN0Q3RjNGM0UfSR9JA00DTetR61PjV+NW+177X09nT2ULcQtwa3xrfdeJ14oPmg+au667rc/Nz89wL3AvtE+0TLRktGUMdQx2hIKEgeSN5I+cl5yX7J/snvim+KTgrOCtuLG4sZC1kLRsuGy6WLpYu1i7WLtsu2y6lLqUuNC40LogtiC2eLJ4sdSt1KwoqCipYKFgoWCZYJgMkAyRJIUkhFR4VHj0aPRppFWkVkg6SDiv3K/ej7aPtDegN6M3jzeNU4FTgZ91n3ena6drH2MfY99b31nHVcdUv1C/ULdMt02rSatLj0ePRmNGY0YbRhtGv0a/REdIR0q/Sr9KK04rTotSi1PzV/NWb15vXhdmF2cLbwtte3l7ebuFu4RblFuWc6Zzpxe/F72gDaAOxELEQrxavFh8bHxu2HrYetyG3IUYkRiR2JnYmUyhTKOYp5ik0KzQrQCxALA8tDy2iLaIt+S35LRcuFy78Lfwtpi2mLRctFy1LLEssQytDK/op+iluKG4omSaZJnQkdCTzIfMhBR8FH4sbixtIF0gXqBGoEZ8Hnwco8Sjxo+qj6v7l/uVI4kjiMN8w35DckNxR2lHaZ9hn2MnWydZv1W/VV9RX1H3TfdPf0t/Se9J70lHSUdJg0mDSqNKo0irTKtPn0+fT39Tf1BfWF9aR15HXUdlR2V/bX9vF3cXdlOCU4OTj5OPq5+rnG+0b7UP1Q/XDDMMM/BP8E+AY4Bi4HLgc5x/nH5kimSLmJOYk3SbdJogoiCjtKe0pESsRK/Yr9iufLJ8sDy0PLUUtRS1CLUItBy0HLZMskyzlK+Ur+yr7KtQp1CltKG0owCbAJsgkyCR7InsizB/MH6IcohzTGNMYABQAFPQM9Ay+9b71eu167U3oTehP5E/kCOEI4UPeQ97n2+fb49nj2SzYLNi71rvWjdWN1ZzUnNTo0+jTbdNt0yvTK9Mh0yHTUNNQ07bTttNW1FbUMdUx1UjWSNae157XN9k32RrbGttO3U7d4N/g3+Xi5eKD5oPmBesF60rxSvHVBtUG+BD4EH4WfhamGqYaCB4IHt8g3yBLI0sjXSVdJR8nHyebKJso1SnVKdAq0CqQK5ArFiwWLGQsZCx5LHksWCxYLP4r/itsK2wroCqgKpkpmSlUKFQozSbNJv8k/yTjIuMibSBtIIodih0aGhoa3xXfFTEQMRB2BHYEuPC48MTqxOpt5m3m7+Lv4gPgA+CI3Yjdadtp25rZmtkT2BPYztbO1sjVyNX91P3UbNRs1BPUE9Ty0/LTB9QH1FTUVNTZ1NnUltWW1Y3WjdbC18LXNtk22fDa8Nr13PXcUd9R3xTiFOJZ5VnlVelV6Yruiu4/9z/3aw1rDe4T7hN8GHwYGBwYHBgfGB+kIaQh0SPRI6wlrCU+Jz4njiiOKJ8pnyl0KnQqECsQK3QrdCuhK6ErmCuYK1grWCvgKuAqMSoxKkkpSSklKCUowibCJhwlHCUtIy0j6iDqIEceRx4pGykbZRdlF5QSlBJFC0ULvfS99HLtcu2l6KXo5+Tn5NHh0eE13zXf+tz63BPbE9t22XbZG9gb2ADXANcg1iDWedV51QrVCtXS1NLUz9TP1APVA9Vt1W3VDtYO1ujW6Nb81/zXTtlO2eHa4dq73Lvc5N7k3mvha+Fj5GPk9Of053DscOzX8tfylgiWCBwRHBEzFjMWFhoWGkQdRB3yH/IfOiI6Ii0kLSTWJdYlOyc7J2EoYShLKUsp/Sn9KXYqdiq6KroqyCrIKqAqoCpDKkMqrymvKeQo5CjfJ98nnyafJh4lHiVZI1kjRyFHIdwe3B4HHAccpRilGHMUcxS1DrUOt/u3+3LwcvAA6wDr9Ob05q3jrePt4O3glt6W3pfcl9zj2uPac9lz2UPYQ9hP10/Xk9aT1g/WD9bA1cDVp9Wn1cPVw9UT1hPWmtaa1lfXV9dM2EzYfNl82eva69qc3Jzcl96X3ufg5+Cc45zj0+bT5sTqxOr97/3vkPmQ+d4N3g3EE8QT/xf/F2EbYRszHjMemSCZIKUipSJkJGQk3SXdJRgnGCcWKBYo3CjcKGspaynEKcQp6CnoKdgp2CmUKZQpGikaKWsoayiFJ4UnZCZkJgglCCVqI2ojhSGFIU4fTh+4HLgcqhmqGfMV8xUlESURfgl+CQj0CPSI7YjtF+kX6ZjlmOWy4rLiPeA94CXeJd5b3Fvc1trW2pLZktmK2IrYute61yHXIde+1r7WjtaO1pPWk9bL1svWONc419rX2tey2LLYwtnC2Q7bDtuZ3Jncad5p3ofgh+D/4v/i6OXo5Wvpa+nf7d/tbvRu9LwJvAkeER4RzhXOFW0ZbRloHGgc7B7sHhEhESHmIuYidSR1JMMlwyXVJtUmryevJ1IoUii/KL8o+Sj5KAApACnTKNMocyhzKN8n3ycVJxUnFCYUJtgk2CRgI2AjpCGkIZ4fnh9CHUIdexp7GikXKRcDEwMTNA00DTv5O/lT8FPwWOtY65TnlOeD5IPk7+Hv4b3fvd/d3d3dRNxE3Oza7NrR2dHZ7tju2EHYQdjJ18nXhdeF13PXc9eV15XX6dfp13DYcNgs2SzZHtoe2knbSduw3LDcWN5Y3kfgR+CJ4oniLuUu5VToVOg37DfsdPF08Qr9Cv0iDiIOfBN8E2cXZxeQGpAaNR01HXQfdB9fIV8hAiMCI2MkYySIJYgldSZ1JisnKyetJ60n+yf7JxcoFygBKAEouSe5Jz4nPieQJpAmrCWsJZEkkSQ8IzwjqCGoIc4fzh+mHaYdIBsgGyIYIhh8FHwUsg+yD4wHjAeS85Lzvu2+7aXppeli5mLmrOOs42DhYOFp32nfvN283VLcUtwj2yPbLtou2m7Zbtnj2OPYi9iL2GTYZNhv2G/Yq9ir2BrZGtm72bvZkdqR2pzbnNvh3OHcYt5i3ifgJ+A24jbin+Sf5Hfnd+fn6ufqUe9R7xT2FPaBCoEK/RD9EEsVSxWqGKoYchtyG8wdzB3OH84fhSGFIfki+SIwJDAkLiUuJfcl9yWMJowm7ibuJh8nHyceJx4n7SbtJosmiyb2JfYlLyUvJTIkMiT+Iv4ijyGPId8f3x/nHecdmhuaG+YY5himFaYVjxGPEawLrAvb99v3W/Bb8M3rzetQ6FDodeV15Q3jDeP/4P/gP98/38Hdwd2B3IHcett626naqdoL2gvan9mf2WXZZdla2VrZgNmA2dfZ19lf2l/aGdsZ2wfcB9wr3SvdiN6I3iXgJeAG4gbiOOQ45Mvmy+be6d7pr+2v7e/y7/KoBKgEOQ45DhQTFBOzFrMWoxmjGRocGhwzHjMe/R/9H4QhhCHMIswi3CPcI7YktiRdJV0l0iXSJRYmFiYrJismDyYPJsQlxCVJJUklnCScJLwjvCOoIqgiWyFbIdIf0h8HHgce7xvvG3sZexmRFpEW/hL+EjwOPA49BT0FUfNR8xbuFu5P6k/qSedJ58TkxOSf4p/iy+DL4DzfPN/r3evd09zT3PDb8NtB20Hbw9rD2nXaddpX2lfaaNpo2qfap9oX2xfbt9u324jciNyO3Y7dyd7J3kDgQOD34ffh9uP240zmTOYP6Q/pa+xr7Mfwx/DR99H3/Ar8CrgQuBCrFKsUyBfIF14aXhqOHI4cbB5sHgQgBCBeIV4hfiJ+ImgjaCMgJCAkpySnJP4k/iQmJSYlHyUfJeok6iSGJIYk8yPzIy8jLyM5IjkiDSENIakfqR8GHgYeHhweHOQZ5BlFF0UXGxQbFBYQFhAbChsK//b/9orwivBj7GPsK+kr6YXmheZJ5EnkYeJh4sDgwOBf31/fN9433kTdRN2E3ITc9dv125Xbldtk22TbYdth24vbi9vj2+Pbatxq3CHdId0J3gneJd8l33jgeOAH4gfi2OPY4/fl9+V16HXocetx6y3vLe9v9G/0ewZ7BiYOJg6LEosS4BXgFZcYlxjgGuAa0RzRHHseex7kH+QfFCEUIQ4iDiLWItYibSNtI9Uj1SMQJBAkHSQdJP0j/SOwI7AjNSM1I4siiyKxIbEhpCCkIGIfYh/nHecdKxwrHCYaJhrHF8cX9RT1FHoRehHCDMIMAAAAAELzQvOQ7pDuG+sb61LoUuj85fzlAeQB5E/iT+Le4N7gp9+n36Xepd7W3dbdNt023cbcxtyC3ILcbNxs3ILcgtzE3MTcNN003dHd0d2d3p3em9+b38zgzOA24jbi3OPc48nlyeUK6Aroteq16vft9+1B8kHytvm2+TkLOQtOEE4Q5xPnE8UWxRYoGSgZLRstG+cc5xxgHmAenh+eH6cgpyB+IX4hJSIlIp0inSLpIukiCSMJI/0i/SLFIsUiYSJhIs8hzyEQIRAhISAhIAAfAB+oHagdFhwWHEEaQRodGB0YlhWWFYYShhKXDpcOfQh9CH32ffbg8ODwHO0c7SnqKeq557nnqeWp5efj5+Nn4mfiIuEi4RLgEuA03zTfht6G3gbeBt6y3bLdid2J3YzdjN263brdE94T3pjemN5K30rfK+Ar4D3hPeGD4oPiAuQC5MHlweXK58rnL+ov6hDtEO2y8LLw9fX19XsHewfnDecN3RHdEegU6BRmF2YXgBmAGUobShvRHNEcHR4dHjQfNB8YIBggzSDNIFUhVSGxIbEh4iHiIekh6SHFIcUhdiF2Ifwg/CBXIFcghB+EH4EegR5MHUwd4BvgGzcaNxpHGEcYAhYCFkwTTBPsD+wPQwtDC1z7XPtk82TzMu8y7w3sDeyA6YDpW+db54nlieX74/vjqeKp4ozhjOGh4KHg5d/l31bfVt/y3vLeud653qreqt7E3sTeCd8J33ffd98Q4BDg1uDW4MrhyuHv4u/iSeRJ5N3l3eW057Tn2+nb6WrsauyO747vwfPB8wD8APw8CzwLuw+7D/0S/RKbFZsVyRfJF6MZoxk4GzgbkRyRHLMdsx2kHqQeZx9nH/0f/R9oIGggqSCpIMAgwCCvIK8gdSB1IBIgEiCEH4Qfyx7LHuUd5R3QHNAciBuIGwkaCRpJGEkYPhY+FtQT1BPkEOQQEg0SDc0GzQZG9kb2YvFi8f7t/u1Q61DrF+kX6TXnNeeZ5ZnlO+Q75BLjEuMc4hziU+FT4bfgt+BF4EXg/N/839zf3N/l3+XfFeAV4G7gbuDw4PDgnOGc4XTidOJ643rjseSx5B3mHebG58bntem16f3r/eu+7r7uP/I/8oL3gvcFCAUIeQ15DQQRBBHFE8UTChYKFvMX8xeVGZUZ+Rr5GiccJxwjHSMd8R3xHZMekx4MHwwfXB9cH4QfhB+EH4QfXR9dHw4fDh+XHpce9x33HS0dLR02HDYcEBsQG7YZthkjGCMYThZOFiYUJhSREZERVA5UDr8JvwkY+hj6uvO68wDwAPAq7Srt2+rb6uno6ehC50Ln2OXY5abkpuSk46Tj0eLR4iniKeKq4arhU+FT4SThJOEb4RvhOuE64X7hfuHr4evhf+J/4jzjPOMk5CTkOuU65YHmgeb/5//nvem96cbrxusz7jPuM/Ez8Uf1R/VAAkACBgsGC/kO+Q7lEeURQRRBFDoWOhbnF+cXVRlVGY0ajRqTG5MbaxxrHBkdGR2eHZ4d+x37HTEeMR5BHkEeLB4sHvEd8R2PHY8dBh0GHVYcVhx8G3wbdRp1GkAZQBnWF9YXMBYwFkQURBT8EfwRMg8yD4ULhQv4BPgEU/ZT9hXyFfIQ7xDvqOyo7Kfqp+r06PTogueC50bmRuY85TzlX+Rf5KzjrOMi4yLjv+K/4oLiguJq4mrid+J34qniqeIB4wHjfuN+4yLkIuTv5O/k5uXm5QrnCudh6GHo8Onw6cHrwevm7ebtf/B/8Njz2PMZ+Rn5NAg0CNcM1wz5D/kPbxJvEngUeBQwFjAWphemF+YY5hj0GfQZ1RrVGowbjBsbHBschByEHMgcyBznHOcc4RzhHLgcuBxqHGoc+Bv4G18bXxugGqAauBm4GaQYpBhgF2AX5xXnFTAUMBQrEisSvw+/D64Mrgw1CDUIgfmB+Uf0R/QC8QLxfu5+7m7sbuyx6rHqN+k36fTn9Ofi5uLm/uX+5ULlQuWv5K/kQeRB5Pfj9+PS49Ljz+PP4/Dj8OM15DXkneSd5CrlKuXc5dzltua25rrnuufr6OvoT+pP6u3r7evT7dPtF/AX8Ony6fLU9tT2QgRCBJIKkgoADgAOlBCUEKwSrBJtFG0U6xXrFTEXMRdFGEUYLRktGewZ7BmEGoQa9xr3GkYbRhtyG3Ibext7G2IbYhsnGycbyBrIGkcaRxqhGaEZ1RjVGOEX4RfBFsEWcRVxFesT6xMiEiISBBAEEGkNaQ3sCewJvAK8Aqb2pvYD8wPzXvBe8D7uPu557Hns+Or46rDpsOmZ6Jnor+ev5+3m7eZS5lLm2uXa5YblhuVV5VXlReVF5VblVuWJ5Ynl3eXd5VTmVObu5u7mreet55Lokuig6aDp3Orc6kzsTOz47fjt8+/z71zyXPKA9YD1vfq9+g8IDwj3C/cLsA6wDtcQ1xChEqESJBQkFG0VbRWFFoUWchdyFzYYNhjVGNUYUBlQGakZqRngGeAZ9hn2GewZ7BnBGcEZdhl2GQkZCRl7GHsYyhfKF/MW8xb2FfYVzRTNFHMTcxPhEeERBxAHEMwNzA3yCvIKowajBmD5YPkX9Rf1SPJI8hjwGPBL7kvuxuzG7HzrfOti6mLqdOl06a7orugN6A3oj+eP5zLnMuf25vbm2uba5t7m3uYB5wHnQ+dD56Xnpeco6CjozejN6JXplemD6oPqmeuZ693s3exX7lfuEfAR8CLyIvK79Lv0bfht+PEE8QTWCdYJwAzADPkO+Q7JEMkQThJOEpkTmROzFLMUoRWhFWkWaRYMFwwXjReNF+0X7RctGC0YThhOGFEYURg2GDYY/Bf8F6MXoxcqFyoXkhaSFtgV2BX6FPoU9RP1E8YSxhJlEWURyQ/JD94N3g1/C38LQwhDCJn9mf1H90f3PPQ89Pvx+/Ep8Cnwo+6j7lntWe1A7EDsUetR64nqierl6eXpYuli6f/o/+i76LvoleiV6I3ojeih6KHo0+jT6CPpI+mR6ZHpHuoe6srqyuqZ65nrjOyM7Kftp+3w7vDucPBw8DfyN/Ji9GL0QPdA9338ffyRB5EHxgrGChENEQ3lDuUOaRBpELIRshHKEsoStxO3E38UfxQkFSQVqBWoFQ0WDRZUFlQWfhZ+FowWjBZ+Fn4WUxZTFgwWDBaoFagVJxUnFYcUhxTIE8gT5hLmEt4R3hGrEKsQRw9HD6MNow2mC6YLFwkXCQcFBwWs+az5PvY+9ujz6PMU8hTykfCR8ErvSu817jXuSu1K7YPsg+zf69/rWuta6/Tq9Oqq6qrqfOp86mrqaupz6nPql+qX6tXq1eov6y/rpuum6znsOezq7Orsu+277bDusO7M78zvF/EX8ZrymvJr9Gv0tva29hX6Ffr6BPoEvQi9CB4LHgvzDPMMcg5yDrUPtQ/HEMcQrxGvEXMScxIWExYTmhOaEwEUARRMFEwUfRR9FJMUkxSQFJAUchRyFDsUOxTqE+oTfxN/E/gS+BJVElUSkxGTEbEQsRCrD6sPeg56DhYNFg1uC24LXgleCX8Gfwat/K38UPhQ+OH14fUN9A30kvKS8lXxVfFJ8EnwZe9l76TupO4E7gTuge2B7RvtG+3O7M7snOyc7ILsguyC7ILsmeyZ7MnsyewR7RHtc+1z7e3t7e2D7oPuNe817wTwBPD28PbwDfIN8lPzU/PV9NX0rvau9in5Kfmc/pz+oAagBh8JHwnwCvAKZQxlDJoNmg2gDqAOfg9+DzkQORDWENYQVhFWEbsRuxEHEgcSOhI6ElYSVhJbElsSSRJJEh8SHxLfEd8RiBGIERgRGBGQEJAQ7g/uDzAPMA9TDlMOVA1UDSwMLAzPCs8KKAkoCQEHAQdcA1wDevp6+uf35/ca9hr2r/Sv9ILzgvOG8obysPGw8fvw+/Bk8GTw6e/p74bvhu887zzvCO8I7+vu6+7j7uPu8e7x7hXvFe9N703vnO+c7wDwAPB78HvwDvEO8brxuvGC8oLyafNp83T0dPSt9a31Jfcl9wP5A/nb+9v7YQRhBBEHEQfWCNYINgo2ClYLVgtHDEcMEg0SDb4Nvg1NDk0Oww7DDiEPIQ9pD2kPmw+bD7kPuQ/CD8IPtw+3D5kPmQ9nD2cPIQ8hD8gOyA5ZDlkO1Q3VDTsNOw2IDIgMuQu5C8sKywq1CbUJaghqCM4GzgaDBIME3fzd/P75/vlE+ET49fb19uX15fUD9QP1RfRF9KXzpfMg8yDzsvKy8lvyW/IY8hjy6fHp8c3xzfHE8cTxzPHM8ebx5vES8hLyUPJQ8p/yn/IB8wHzdvN28//z//Oe9J70VPVU9SX2JfYX9xf3Nfg1+JT5lPlw+3D7nwGfAe8E7wSXBpcGzwfPB8kIyQiXCZcJQwpDCtQK1ApMC0wLrguuC/sL+ws3DDcMYAxgDHgMeAyADIAMeQx5DGEMYQw6DDoMAwwDDL0LvQtnC2cLAQsBC4oKigoBCgEKZAlkCbEIsQjjB+MH8gbyBtEF0QVWBFYElgGWAS/8L/yk+qT6jPmM+bH4sfj+9/73avdq9/D28PaL9ov2OfY59vr1+vXL9cv1q/Wr9Zn1mfWW9Zb1ofWh9bj1uPXd9d31DvYO9kz2TPaW9pb27vbu9lP3U/fG98b3SfhJ+Nz43PiD+YP5QvpC+iX7JftD/EP8A/4D/qYCpgL+A/4D4gTiBJAFkAUaBhoGiQaJBuMG4wYqByoHYAdgB4gHiAeiB6IHsAewB7IHsgepB6kHlQeVB3gHeAdQB1AHHwcfB+UG5QaiBqIGVgZWBgIGAgakBaQFPgU+Bc4EzgRTBFMEzAPMAzMDMwN+An4ChgGGAbD+sP7R/dH9VP1U/QH9Af3L/Mv8q/yr/J78nvyj/KP8t/y3/Nv82/wQ/RD9WP1Y/bf9t/08/jz+Jv8m/w==")
-        };
-
-        this.sounds.beep1.volume = 0.3;
-        this.sounds.beep2.volume = 0.1;
-    };
-
-    PongGame.prototype.createBall = function () {
-        return {
-            width: 12,
-            height: 12,
-            x: (this.canvas.width / 2) - 5,
-            y: (this.canvas.height / 2) - 5,
-            moveX: this.states.idle,
-            moveY: this.states.idle,
-            speed: 9
-        }
-    };
-
-    // Creates a paddle. If side === 'left', the player is created
-    PongGame.prototype.createPaddle = function (side) {
-        return {
-            width: 18,
-            height: 100,
-            // 'Left' === Player
-            x: side === 'left' ? 30 : this.canvas.width - 30 - 18,
-            y: (this.canvas.height / 2) - 35,
-            move: this.states.idle,
-            speed: side === 'left' ? 10 : 7
-        }
-    };
-
-    PongGame.prototype.setupCanvas = function () {
-        this.canvas = this.$el[0];
-        this.context = this.canvas.getContext('2d');
-
-        this.canvas.width = 900;
-        this.canvas.height = 480;
-
-        this.canvas.style.width = (this.canvas.width / 2) + 'px';
-        this.canvas.style.height = (this.canvas.height / 2) + 'px';
-    };
-
-    PongGame.prototype.initializeStartButton = function () {
-        var me = this;
-        this.startButton = document.querySelector('.pong-start');
-        this.startButton.addEventListener('click', function () {
-            // Handle the 'Press any key to begin' function and start the game.
-            if (me.running === false) {
-                me.running = true;
-                window.requestAnimationFrame($.proxy(me.loop, me));
-                me.startButton.style.display = 'none';
-            }
-        });
-    };
-
-    // Setup necessary events
-    PongGame.prototype.listen = function () {
-        var me = this;
-
-        document.addEventListener('keydown', function (key) {
-            // Handle up arrow and w key events
-            if (key.keyCode === 38 || key.keyCode === 87) me.player.move = me.states.up;
-
-            // Handle down arrow and s key events
-            if (key.keyCode === 40 || key.keyCode === 83) me.player.move = me.states.down;
-        });
-
-        // Stop the player from moving when there are no keys being pressed.
-        document.addEventListener('keyup', function () {
-            me.player.move = me.states.idle;
-        });
-    };
-
-    PongGame.prototype.loop = function () {
-        this.update();
-        this.draw();
-
-        // If the game is not over, draw the next frame.
-        if (!this.over) requestAnimationFrame($.proxy(this.loop, this));
-    };
-
-    PongGame.prototype.update = function () {
-        var playerLeft = this.player.x,
-            playerRight = playerLeft + this.player.width,
-            ballLeft = this.ball.x,
-            ballRight = ballLeft + this.ball.width,
-            // Ball doesn't fly up and down as fast as it's flying to the sides
-            ballSpeedY = this.ball.speed / 1.5;
-
-        // Ball left the left bound limit - player failed to hit the ball
-        if (ballLeft <= 0) {
-            this.resetTurn(this.player);
-        }
-
-        // Ball left the right bound limit - paddle failed to hit the ball
-        if (ballRight >= this.canvas.width) {
-            this.resetTurn(this.paddle);
-        }
-
-        // Ball hit the upper bound limits, turn direction
-        if (this.ball.y  - this.ball.height <= 0) {
-            this.ball.moveY = this.states.down
-        }
-
-        // Ball hit the bottom bound limits, turn direction
-        if (this.ball.y + this.ball.height >= this.canvas.height) {
-            this.ball.moveY = this.states.up;
-        }
-
-        // Move player in direction
-        if (this.player.move === this.states.up) {
-            this.player.y -= this.player.speed
-        } else if (this.player.move === this.states.down) {
-            this.player.y += this.player.speed;
-        }
-
-        // On new serve (start of each turn) move the ball to the correct side and randomize the direction to add some challenge
-        if (this.turnDelayIsOver() && this.turn) {
-
-            // Depending on the last loser, the ball will start on his side
-            this.ball.moveX = this.turn === this.player ? this.states.left : this.states.right;
-
-            // Randomize flying direction
-            this.ball.moveY = [this.states.up, this.states.down][Math.round(Math.random())];
-            this.ball.y = Math.floor(Math.random() * this.canvas.height - 200) + 200;
-
-            // Reset last loser
-            this.turn = null;
-        }
-
-        // Limit the player movement to the canvas bound limits
-        if (this.player.y <= 0) {
-            this.player.y = 0;
-        } else if (this.player.y >= this.canvas.height - this.player.height) {
-            this.player.y = this.canvas.height - this.player.height;
-        }
-
-        // Handle player - ball collisions
-        // Checks if ball is inside the player on X axis
-        if (ballLeft <= playerRight + this.ball.width && ballLeft >= playerRight) {
-            // Check if player hit the ball on Y axis
-            if (this.ball.y <= this.player.y + this.player.height && this.ball.y + this.ball.height >= this.player.y) {
-                // Set the ball to the front of the player
-                this.ball.x = (this.player.x + this.player.width + this.ball.width);
-
-                this.ball.moveX = this.states.right;
-                this.sounds.beep1.play();
-            }
-        }
-
-        // Move ball
-        // Handle Y axis
-        if (this.ball.moveY === this.states.up) {
-            this.ball.y -= ballSpeedY;
-        } else if (this.ball.moveY === this.states.down) {
-            this.ball.y += ballSpeedY;
-        }
-
-        // Handle X axis
-        if (this.ball.moveX === this.states.left) {
-            this.ball.x -= this.ball.speed;
-        } else if (this.ball.moveX === this.states.right) {
-            this.ball.x += this.ball.speed
-        }
-
-        // Handle paddle UP and DOWN movement
-        // Try to have the center of the paddle to be on the same height as the ball
-        // Handle moving upwards
-        if (this.paddle.y > this.ball.y - (this.paddle.height / 2)) {
-            // Make it look like the paddle is trying harder once the ball flies into its direction
-            // Seems to chill when ball is flying to the player, not to the paddle
-            if (this.ball.moveX === this.states.right) {
-                this.paddle.y -= this.paddle.speed / 1.5
-            } else {
-                this.paddle.y -= this.paddle.speed / 4;
-            }
-        }
-
-        // Handle moving downwards
-        if (this.paddle.y < this.ball.y - (this.paddle.height / 2)) {
-            // Make it look like the paddle is trying harder once the ball flies into its direction
-            // Seems to chill when ball is flying to the player, not to the paddle
-            if (this.ball.moveX === this.states.right) {
-                this.paddle.y += this.paddle.speed / 1.5;
-            } else {
-                this.paddle.y += this.paddle.speed / 4;
-            }
-        }
-
-        // Handle paddle ball collsion
-        // Handle X axis hit
-        if (this.ball.x - this.ball.width <= this.paddle.x && this.ball.x >= this.paddle.x - this.paddle.width) {
-            // Handle Y axis hit
-            if (this.ball.y <= this.paddle.y + this.paddle.height && this.ball.y + this.ball.height >= this.paddle.y) {
-                // Place ball in front of paddle
-                this.ball.x = (this.paddle.x - this.ball.width);
-                this.ball.moveX = this.states.left;
-
-                this.sounds.beep2.play();
-            }
-        }
-
-        // Limit the paddle movement to the canvas bound limits
-        if (this.paddle.y <= 0) {
-            this.paddle.y = 0;
-        } else if (this.paddle.y >= this.canvas.height - this.paddle.height) {
-            this.paddle.y = this.canvas.height - this.paddle.height;
-        }
-    };
-
-    PongGame.prototype.draw = function () {
-        // Clear the Canvas
-        this.context.clearRect(
-            0,
-            0,
-            this.canvas.width,
-            this.canvas.height
-        );
-
-        // Set the fill style for the background
-        this.context.fillStyle = this.color;
-
-        // Draw the background
-        this.context.fillRect(
-            0,
-            0,
-            this.canvas.width,
-            this.canvas.height
-        );
-
-        // Set the fill style for the paddles
-        this.context.fillStyle = this.colors.paddle;
-
-        // Draw the Player
-        this.context.fillRect(
-            this.player.x,
-            this.player.y,
-            this.player.width,
-            this.player.height
-        );
-
-        // Draw the Paddle
-        this.context.fillRect(
-            this.paddle.x,
-            this.paddle.y,
-            this.paddle.width,
-            this.paddle.height
-        );
-
-        // Draw the Ball
-        if (this.turnDelayIsOver()) {
-            this.context.beginPath();
-            this.context.arc(this.ball.x, this.ball.y, this.ball.width, 0, 2 * Math.PI, false);
-            this.context.fillStyle = this.colors.ball;
-            this.context.fill();
-            this.context.stroke();
-        }
-
-        // Reset fill style
-        this.context.fillStyle = this.colors.paddle;
-    };
-
-    // Wait for a delay to have passed after each turn.
-    PongGame.prototype.turnDelayIsOver = function () {
-        return ((new Date()).getTime() - this.timer >= 1000);
-    };
-
-    PongGame.prototype.resetTurn = function (loser) {
-        this.ball = this.createBall();
-        this.turn = loser;
-        this.timer = (new Date()).getTime();
-    };
-
-    $.fn.pongGame = function() {
-        return this.each(function() {
-            var $el = $(this);
-
-            if ($el.data('plugin_pongGame')) {
-                return;
-            }
-
-            var plugin = new PongGame(this);
-            $el.data('plugin_pongGame', plugin);
-        });
-    };
-
-    $(function() {
-        $('*[data-pong="true"]').pongGame();
-    });
-})(jQuery);
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/js/shop_select.js b/themes/Backend/ExtJs/backend/benchmark/template/local/js/shop_select.js
deleted file mode 100644
index 30c49fd5938..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/js/shop_select.js
+++ /dev/null
@@ -1,57 +0,0 @@
-(function ($) {
-    'use strict';
-
-    function ShopSelect(el) {
-        this.$el = $(el);
-
-        this.initElements();
-        this.initEvents();
-    }
-
-    ShopSelect.prototype.initElements = function () {
-        this.$shopOption = this.$el.find('.shop-option');
-        this.$activeShopIdEl = this.$el.find('.active-shop-id');
-    };
-
-    ShopSelect.prototype.initEvents = function () {
-        this.$el.on('click', $.proxy(this.onOpenShopSelect, this));
-        this.$shopOption.on('click', $.proxy(this.onClickShopOption, this));
-    };
-
-    ShopSelect.prototype.onOpenShopSelect = function () {
-        this.$el.toggleClass('open');
-    };
-
-    /**
-     * @param { Event } event
-     */
-    ShopSelect.prototype.onClickShopOption = function (event) {
-        var $currentTarget = $(event.currentTarget),
-            selectedShopId = $currentTarget.attr('data-shop-id'),
-            newLocation = $currentTarget.attr('data-shop-switch-url');
-
-        // Already active shop has been selected, do nothing
-        if (selectedShopId === this.$activeShopIdEl.val()) {
-            return;
-        }
-
-        window.href.location = newLocation;
-    };
-
-    $.fn.shopSelect = function() {
-        return this.each(function() {
-            var $el = $(this);
-
-            if ($el.data('plugin_shopSelect')) {
-                return;
-            }
-
-            var plugin = new ShopSelect(this);
-            $el.data('plugin_shopSelect', plugin);
-        });
-    };
-
-    $(function() {
-        $('*[data-shop-select="true"]').shopSelect();
-    });
-})(jQuery);
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/js/slider.js b/themes/Backend/ExtJs/backend/benchmark/template/local/js/slider.js
deleted file mode 100644
index 2bd7562f921..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/js/slider.js
+++ /dev/null
@@ -1,117 +0,0 @@
-(function ($) {
-    'use strict';
-
-    var defaultConfig = {
-        speed: 600,
-        bullets: true,
-        auto: false,
-        time: 5000
-    };
-
-    function Slider(el) {
-        this.$el = $(el);
-        this.$imageContainer = this.$el.find('.images-container');
-        this.$bulletContainer = this.$el.find('.bullets-container');
-        this.index = 1;
-
-        this.init();
-    }
-
-    Slider.prototype.init = function () {
-        this.imgNumber = this.$imageContainer.find('li').length;
-        this.sliderContainerWidth = this.$el.width();
-
-        var imageContainerWidth = this.sliderContainerWidth * this.imgNumber;
-
-        this.$imageContainer.css({
-            'width': imageContainerWidth,
-            'margin-left': 0
-        });
-
-        this.$imageContainer.find('li').css('width', this.sliderContainerWidth);
-
-        if (defaultConfig.bullets) {
-            this.$bulletContainer.html('');
-            for (var i = 1; i <= this.imgNumber; i++) {
-                this.$bulletContainer.append('<span class="bullet"></span>');
-            }
-
-            this.$bulletContainer.find('.bullet').eq(0).addClass('active');
-        }
-
-        this.$bulletContainer.find('.bullet').on('click', $.proxy(this.onUsePager, this));
-        this.$el.find('.a-right').on('click', $.proxy(this.onSlideRight, this));
-        this.$el.find('.a-left').on('click', $.proxy(this.onSlideLeft, this));
-    };
-
-    Slider.prototype.onSlideRight = function () {
-        var marginLeft = parseInt(this.$imageContainer.css('margin-left')),
-            newMargin = marginLeft - this.sliderContainerWidth,
-            maxMargin = (this.imgNumber - 1) * this.sliderContainerWidth,
-            currentBullet;
-
-        if (newMargin < -maxMargin) {
-            return;
-        }
-
-        this.$imageContainer.animate({
-            marginLeft: newMargin
-        }, defaultConfig.speed);
-
-        currentBulvar = Math.abs(newMargin) / this.sliderContainerWidth;
-        this.$bulletContainer.find('.bullet').removeClass('active');
-        this.$bulletContainer.find('.bullet').eq(currentBullet).addClass('active');
-    };
-
-    Slider.prototype.onSlideLeft = function () {
-        var marginLeft = parseInt(this.$imageContainer.css('margin-left')),
-            newMargin = marginLeft + this.sliderContainerWidth,
-            currentBullet;
-
-        if (newMargin > 0) {
-            return;
-        }
-
-        this.$imageContainer.animate({
-            marginLeft: newMargin
-        }, defaultConfig.speed);
-
-        currentBulvar = Math.abs(newMargin) / this.sliderContainerWidth;
-        this.$bulletContainer.find('.bullet').removeClass('active');
-        this.$bulletContainer.find('.bullet').eq(currentBullet).addClass('active');
-    };
-
-    Slider.prototype.onUsePager = function (event) {
-        var $el = $(event.currentTarget),
-            bulletIndex;
-
-        if ($el.hasClass('active')) {
-            return;
-        }
-
-        bulletIndex = this.$bulletContainer.find('span').index($el);
-
-        this.$bulletContainer.find(".bullet").removeClass("active").eq(bulletIndex).addClass("active");
-        this.$imageContainer.animate({
-            marginLeft: -this.sliderContainerWidth * bulletIndex
-        }, defaultConfig.speed);
-    };
-
-    $.fn.slider = function () {
-        return this.each(function() {
-            var $el = $(this);
-
-            if ($el.data('plugin_slider')) {
-                return;
-            }
-
-            var plugin = new Slider(this);
-            $el.data('plugin_slider', plugin);
-        });
-    };
-
-    $(function () {
-        $('*[data-slider="true"]').slider();
-    });
-
-})(jQuery);
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/js/switch_button.js b/themes/Backend/ExtJs/backend/benchmark/template/local/js/switch_button.js
deleted file mode 100644
index e7eea3c3c13..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/js/switch_button.js
+++ /dev/null
@@ -1,62 +0,0 @@
-(function ($) {
-    'use strict';
-
-    function SwitchButton(el) {
-        this.$el = $(el);
-        this.input = this.$el.find('input');
-        this.industry = (el.getAttribute('data-industry') === 'true');
-        this.lastYear = (el.getAttribute('data-last-year') === 'true');
-        this.time = this.$el.attr('data-time');
-        this.valuesKey = this.$el.attr('data-values-key');
-
-        this.init();
-    }
-
-    SwitchButton.prototype.init = function () {
-        this.$el.on('change', $.proxy(this.onChangeSwitch, this));
-    };
-
-    SwitchButton.prototype.onChangeSwitch = function () {
-        var uniqueChartString = this.valuesKey + this.time.charAt(0).toUpperCase() + this.time.slice(1) + 'Chart';
-
-        // Hide / show shop graph
-        if (!this.industry && !this.lastYear) {
-            window[uniqueChartString].data.datasets[0]._meta[window[uniqueChartString].id].hidden = !this.input.is(':checked');
-        }
-
-        // Hide / show industry graph
-        if (this.industry) {
-            window[uniqueChartString].data.datasets[2]._meta[window[uniqueChartString].id].hidden = !this.input.is(':checked');
-        }
-
-        // Hide / show last years graphs
-        if (this.lastYear) {
-            window[uniqueChartString].data.datasets[1]._meta[window[uniqueChartString].id].hidden = !this.input.is(':checked');
-
-            // Industry last year also exists
-            if (window[uniqueChartString].data.datasets[3]) {
-                window[uniqueChartString].data.datasets[3]._meta[window[uniqueChartString].id].hidden = !this.input.is(':checked');
-            }
-        }
-
-        window[uniqueChartString].update();
-    };
-
-    $.fn.switchButton = function () {
-        return this.each(function() {
-            var $el = $(this),
-                plugin;
-
-            if ($el.data('plugin_switchButton')) {
-                return;
-            }
-
-            plugin = new SwitchButton(this);
-            $el.data('plugin_switchButton', plugin);
-        });
-    };
-
-    $(function() {
-        $('*[data-switch-button="true"]').switchButton();
-    });
-})(jQuery);
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/js/target_group_chart.js b/themes/Backend/ExtJs/backend/benchmark/template/local/js/target_group_chart.js
deleted file mode 100644
index da65b3fc395..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/js/target_group_chart.js
+++ /dev/null
@@ -1,158 +0,0 @@
-(function ($) {
-    'use strict';
-
-    var globals = {
-        width: 255,
-        height: 255,
-        lineThickness: 33,
-        gapBetweenLines: 4,
-        colors: {
-            local: {
-                desktop: 'rgba(52, 220, 221, 1.0)',
-                mobile: 'rgba(52, 220, 221, 0.5)',
-                tablet: 'rgba(52, 220, 221, 0.8)'
-            },
-            industry: {
-                desktop: 'rgba(106, 99, 252, 1.0)',
-                mobile: 'rgba(106, 99, 252, 0.5)',
-                tablet: 'rgba(106, 99, 252, 0.8)'
-            }
-        }
-    };
-
-    function TargetGroupGraph(el) {
-        this.$el = $(el);
-        this.isIndustry = (el.getAttribute('data-industry') === 'true');
-
-        this.init();
-    }
-
-    TargetGroupGraph.prototype.init = function () {
-        var outerRadius = (globals.width / 2),
-            innerRadius = outerRadius - 30,
-            benchmarkData = window.benchmarkData,
-            key = this.isIndustry ? 'industry' : 'local',
-            colorKey = key,
-            circles,
-            svg;
-
-        if (!benchmarkData['industry']) {
-            key = 'local';
-        }
-
-        circles = [
-            { name: 'desktop', percent: benchmarkData[key].devices.desktop, color: globals.colors[colorKey].desktop },
-            { name: 'mobile', percent: benchmarkData[key].devices.mobile, color: globals.colors[colorKey].mobile },
-            { name: 'tablet', percent: benchmarkData[key].devices.tablet, color: globals.colors[colorKey].tabvar }
-        ];
-
-        svg = d3.select('.' + this.$el.attr('class'))
-            .append("svg")
-            .attr({
-                width: globals.width,
-                height: globals.height,
-                class: 'shadow'
-            })
-            .append('g')
-            .attr({
-                transform: 'translate(' + globals.width / 2 + ',' + globals.height / 2 + ')'
-            });
-
-        for (var i = 0; i < circles.length; ++i) {
-            if (i > 0) {
-                outerRadius = innerRadius - globals.gapBetweenLines;
-            }
-            innerRadius = outerRadius - globals.lineThickness;
-
-            circles[i].chart = this.createCircle(svg, outerRadius, innerRadius, circles[i].color, circles[i].percent);
-
-            this.addText(svg, circles[i].percent, outerRadius);
-        }
-    };
-
-    TargetGroupGraph.prototype.createCircle = function (svg, outerRadius, innerRadius, color, percent) {
-        var ratio = percent / 100,
-            arcBackground,
-            arcForeground,
-            pathForeground,
-            chart;
-
-        arcBackground = d3.svg.arc()
-            .innerRadius(innerRadius)
-            .outerRadius(outerRadius)
-            .startAngle(0)
-            .endAngle(2 * Math.PI);
-
-        svg.append('path')
-            .attr({
-                d: arcBackground
-            })
-            .style({
-                fill: 'rgba(52, 220, 221, 0.4)',
-                opacity: .2
-            });
-
-        arcForeground = d3.svg.arc()
-            .innerRadius(innerRadius)
-            .outerRadius(outerRadius)
-            .cornerRadius(20)
-            .startAngle(-0.05);
-
-        pathForeground = svg.append('path')
-            .datum({ endAngle: 0 })
-            .attr({
-                d: arcForeground
-            })
-            .style({
-                fill: color
-            });
-
-        pathForeground.transition()
-            .duration(1500)
-            .ease('elastic')
-            .call(this.arcTween, ((2 * Math.PI)) * ratio, arcForeground);
-
-        chart = { path: pathForeground, arc: arcForeground };
-
-        return chart;
-    };
-
-    TargetGroupGraph.prototype.arcTween = function (transition, newAngle, arc) {
-        transition.attrTween("d", function (d) {
-            var interpolate = d3.interpolate(d.endAngle, newAngle);
-
-            return function (t) {
-                d.endAngle = interpolate(t);
-                return arc(d);
-            };
-        });
-    };
-
-    TargetGroupGraph.prototype.addText = function (svg, value, outerRadius) {
-        svg.append('text')
-            .attr({
-                'font-size': '15px',
-                transform: 'translate(5,' + (-outerRadius + 23) + ')',
-                style: 'fill: #FFFFFF;'
-            })
-            .html(value);
-    };
-
-    $.fn.targetGroupGraph = function() {
-        return this.each(function() {
-            var $el = $(this);
-
-            if ($el.data('plugin_targetGroupGraph')) {
-                return;
-            }
-
-            var plugin = new TargetGroupGraph(this);
-            $el.data('plugin_targetGroupGraph', plugin);
-
-        });
-    };
-
-    $(function() {
-        $('*[data-target-group-chart="true"]').targetGroupGraph();
-    });
-})(jQuery);
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/js/time_switcher.js b/themes/Backend/ExtJs/backend/benchmark/template/local/js/time_switcher.js
deleted file mode 100644
index 272554125e6..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/js/time_switcher.js
+++ /dev/null
@@ -1,167 +0,0 @@
-(function ($) {
-    'use strict';
-
-    function TimeSwitcher(el) {
-        this.$el = $(el);
-        this.timeScaleElements = this.$el.find('.timescale');
-        this.graphWrapper = this.$el.parent('form').find('.graph-wrapper');
-        this.valuesKey = this.$el.attr('data-values-key');
-        this.computedDataContainer = this.$el.parent('form').find('.computed-data');
-        this.buttonContainer = this.$el.parent('form').find('.button-container');
-        this.translations = window.benchmarkTranslations;
-
-        this.init();
-    }
-
-    TimeSwitcher.prototype.init = function () {
-        this.timeScaleElements.on('click', $.proxy(this.onClickEl, this));
-    };
-
-    /**
-     * @param { Event } event
-     */
-    TimeSwitcher.prototype.onClickEl = function (event) {
-        var currentTarget = $(event.currentTarget);
-
-        if (currentTarget.hasClass('is-active')) {
-            return;
-        }
-
-        this.timeScaleElements.removeClass('is-active');
-        currentTarget.addClass('is-active');
-
-        this.initCanvas(currentTarget);
-        this.initSwitchButtons(currentTarget);
-
-        this.computedDataContainer.find('.time-container').hide();
-        this.computedDataContainer.find('.time-container.' + currentTarget.attr('name')).show();
-    };
-
-    TimeSwitcher.prototype.initCanvas = function (target) {
-        var $previousCanvasEl = this.graphWrapper.find('canvas'),
-            includeIndustry = ($previousCanvasEl.attr('data-include-industry') === 'true'),
-            newCanvasTpl = this.getCanvas(this.valuesKey, target.attr('name'), $previousCanvasEl.attr('data-chart-type'), includeIndustry);
-
-        this.graphWrapper.empty();
-        this.graphWrapper.append(newCanvasTpl);
-
-        newCanvasTpl.benchmarkGraph();
-    };
-
-    TimeSwitcher.prototype.initSwitchButtons = function (target) {
-        var shopButton = this.buildButtonTemplate(this.translations[window.i18n.locale].shopTitle, false, false, this.valuesKey, target.attr('name')),
-            hasIndustry = !!(this.buttonContainer.find('.switch-industry').length),
-            industryButton,
-            lastYearButton = this.buildButtonTemplate(this.translations[window.i18n.locale].previousTitle, false, true, this.valuesKey, target.attr('name'));
-
-        this.buttonContainer.empty();
-        this.buttonContainer.append(shopButton);
-
-        if (hasIndustry) {
-            industryButton = this.buildButtonTemplate(this.translations[window.i18n.locale].industryTitle, true, false, this.valuesKey, target.attr('name'));
-            this.buttonContainer.append(industryButton);
-
-            industryButton.switchButton();
-        }
-
-        this.buttonContainer.append(lastYearButton);
-
-        shopButton.switchButton();
-        lastYearButton.switchButton();
-    };
-
-    /**
-     * @param { string } dataKey
-     * @param { string } timeSpan
-     * @param { string } chartType
-     * @param { bool } includeIndustry
-     * @returns { jQuery }
-     */
-    TimeSwitcher.prototype.getCanvas = function (dataKey, timeSpan, chartType, includeIndustry) {
-        return $('<canvas>', {
-            'height': 260,
-            'data-benchmark-graph': true,
-            'data-name': dataKey,
-            'data-include-industry': includeIndustry,
-            'data-time': timeSpan,
-            'data-chart-type': chartType
-        });
-    };
-
-    /**
-     * @param { string } label
-     * @param { bool } industry
-     * @param { bool } lastYear
-     * @param { string } valuesKey
-     * @param { string } time
-     * @returns { jQuery }
-     */
-    TimeSwitcher.prototype.buildButtonTemplate = function (label, industry, lastYear, valuesKey, time) {
-        var className = 'switch-shop',
-            $rootEl,
-            $labelEl,
-            $inputEl,
-            $sliderEl,
-            $buttonLabel;
-
-        if (industry) {
-            className = 'switch-industry';
-        }
-
-        if (lastYear) {
-            className = 'switch-last-year';
-        }
-
-        $rootEl = $('<div>', {
-            'class': 'button-wrapper ' + className,
-            'data-switch-button': 'true',
-            'data-industry': industry + '',
-            'data-values-key': valuesKey,
-            'data-last-year': lastYear + '',
-            'data-time': time
-        });
-
-        $inputEl = $('<input>', {
-            'type': 'checkbox',
-            'checked': 'checked'
-        });
-
-        $sliderEl = $('<span>', {
-            'class': 'slider round'
-        });
-
-        $labelEl = $('<label>', {
-            'class': 'switch'
-        });
-
-        $buttonLabel = $('<div>', {
-            'class': 'buttonLabel',
-            'html': label
-        });
-
-        $labelEl.append($inputEl);
-        $labelEl.append($sliderEl);
-
-        $rootEl.append($labelEl);
-        $rootEl.append($buttonLabel);
-
-        return $rootEl;
-    };
-
-    $.fn.timeSwitcher = function() {
-        return this.each(function() {
-            var $el = $(this);
-
-            if ($el.data('plugin_timeSwitcher')) {
-                return;
-            }
-
-            var plugin = new TimeSwitcher(this);
-            $el.data('plugin_timeSwitcher', plugin);
-        });
-    };
-
-    $(function() {
-        $('*[data-time-switcher="true"]').timeSwitcher();
-    });
-})(jQuery);
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/js/translation.js b/themes/Backend/ExtJs/backend/benchmark/template/local/js/translation.js
deleted file mode 100644
index 6745e81bf9d..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/js/translation.js
+++ /dev/null
@@ -1,120 +0,0 @@
-(function ($) {
-    'use strict';
-
-    function LanguageSwitch(el) {
-        this.$el = $(el);
-
-        this.init();
-    }
-
-    LanguageSwitch.prototype.init = function () {
-        this.$timeSwitchers = this.$el.find('.language');
-        this.$timeSwitchers.on('click', $.proxy(this.onClickLanguage, this));
-    };
-
-    LanguageSwitch.prototype.onClickLanguage = function (event) {
-        var $clickedEl = $(event.currentTarget);
-
-        window.i18n.locale = $clickedEl.attr('data-language-key');
-        this.$timeSwitchers.removeClass('active');
-        $clickedEl.addClass('active');
-
-        this.updateGraphs();
-        this.updateLanguageInputs();
-
-        this.createEvent();
-    };
-
-    /**
-     * Updates the graphs since those need to be "re-rendered" once the labels have changed due to language switch.
-     */
-    LanguageSwitch.prototype.updateGraphs = function () {
-        var me = this,
-            timeUnits = ['weeks', 'months', 'years'],
-            graphNames = [ 'turnOver', 'visitors', 'totalOrders', 'conversions' ],
-            uniqueChartString,
-            snippetName, translation, chart;
-
-        timeUnits.forEach(function (time) {
-            graphNames.forEach(function (name) {
-                uniqueChartString = name + time.charAt(0).toUpperCase() + time.slice(1) + 'Chart';
-                if (!window[uniqueChartString]) {
-                    return;
-                }
-                chart = window[uniqueChartString];
-
-                snippetName = 'timeUnitMonths';
-
-                if (time === 'weeks' || time === 'months') {
-                    snippetName = 'timeUnitDays'
-                }
-
-                translation = window.benchmarkTranslations[window.i18n.locale][snippetName];
-                me.translateLabels(chart, window.benchmarkData['local'][time].labels);
-
-                chart.scales['x-axis-0'].options.scaleLabel.labelString = translation;
-                chart.update();
-            });
-        });
-    };
-
-    /**
-     * @param { Chart } chart
-     * @param { Array } labels
-     */
-    LanguageSwitch.prototype.translateLabels = function (chart, labels) {
-        var translations = window.benchmarkTranslations[window.i18n.locale],
-            translatedLabels = [];
-
-        labels.forEach(function (val) {
-            if (!translations[val]) {
-                translatedLabels.push(val);
-                return;
-            }
-
-            translatedLabels.push(translations[val]);
-        });
-
-        chart.data.labels = translatedLabels;
-    };
-
-    LanguageSwitch.prototype.updateLanguageInputs = function () {
-        var $inputElements = $('input[name=lang]');
-
-        $inputElements.each(function (index, item) {
-            $(item).val(window.i18n.locale);
-        });
-    };
-
-    LanguageSwitch.prototype.createEvent = function () {
-        var event = new Event('languageSwitch');
-
-        this.$el[0].dispatchEvent(event);
-    };
-
-    $.fn.languageSwitch = function () {
-        return this.each(function() {
-            var $el = $(this);
-
-            if ($el.data('plugin_languageSwitch')) {
-                return;
-            }
-
-            var plugin = new LanguageSwitch(this);
-            $el.data('plugin_languageSwitch', plugin);
-        });
-    };
-
-    $(function () {
-        $('*[data-language-switch="true"]').languageSwitch();
-    });
-
-    var defaultLang = window.benchmarkDefaultLanguage,
-        fallBack = defaultLang === 'de' ? 'en' : 'de';
-
-    window.i18n = new VueI18n({
-        fallbackLocale: fallBack,
-        locale: defaultLang,
-        messages: window.benchmarkTranslations
-    });
-})(jQuery);
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/js/vue_wrapper.js b/themes/Backend/ExtJs/backend/benchmark/template/local/js/vue_wrapper.js
deleted file mode 100644
index b5a02b0e8f0..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/js/vue_wrapper.js
+++ /dev/null
@@ -1,105 +0,0 @@
-(function () {
-    'use strict';
-
-    $(function () {
-        window.vueInstance = new Vue({
-            el: '.wrapper',
-            i18n: window.i18n,
-            data: function () {
-                return {
-                    benchmarkData: window.benchmarkData
-                }
-            },
-            computed: {
-                local: function () {
-                    return this.benchmarkData.local;
-                },
-
-                payments: function () {
-                    return this.adjustEntrySize(this.benchmarkData.local.payments);
-                },
-
-                sortedPayments: function () {
-                    return this.sortEntries(this.payments);
-                },
-
-                shipments: function () {
-                    return this.adjustEntrySize(this.benchmarkData.local.shipments);
-                },
-
-                sortedShipments: function () {
-                    return this.sortEntries(this.shipments);
-                },
-
-                devices: function () {
-                    return this.benchmarkData.local.devices;
-                },
-            },
-
-            mounted: function() {
-                document.querySelector('.loading-wrapper').style.display = 'none';
-            },
-
-            methods: {
-                onChangeLanguage: function () {
-                    var lastLocale = this.$i18n.locale;
-                    this.$i18n.locale = (lastLocale === 'de' ? 'en' : 'de');
-                },
-
-                adjustEntrySize: function (entries) {
-                    var amountOfNecessaryKeys = 5,
-                        entryKeys = Object.keys(entries),
-                        orderedEntryList = { },
-                        entryCount = 0;
-
-                    entryKeys.forEach(function (currentEntryKey) {
-                        var currentPayment = entries[currentEntryKey];
-
-                        // Prevent more than 5 entries
-                        if (entryCount < amountOfNecessaryKeys) {
-                            orderedEntryList[currentEntryKey] = currentPayment;
-                            entryCount++;
-                        }
-                    });
-
-                    // Fill to 5 entries
-                    if (entryCount < amountOfNecessaryKeys) {
-                        var difference = amountOfNecessaryKeys - entryCount;
-
-                        for (var i = 0; i < difference; i++) {
-                            orderedEntryList[i] = -1;
-                        }
-                    }
-
-                    return orderedEntryList;
-                },
-
-                /**
-                 * @param { Array } entries
-                 * @returns { Array }
-                 */
-                sortEntries: function (entries) {
-                    var entryArray = [];
-
-                    Object.keys(entries).forEach(function (currentEntryKey) {
-                        var value = entries[currentEntryKey];
-                        if (value === -1) {
-                            return;
-                        }
-
-                        entryArray.push(entries[currentEntryKey]);
-                    });
-
-                    entryArray.sort(function (a, b) {
-                        return a - b;
-                    });
-
-                    entryArray.splice(Math.floor(entryArray.length / 2), 0, entryArray.pop());
-
-                    return entryArray;
-                }
-            },
-            delimiters: ['[[', ']]']
-        });
-    });
-})();
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/start.tpl b/themes/Backend/ExtJs/backend/benchmark/template/local/start.tpl
deleted file mode 100644
index 8fdcdc8afec..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/start.tpl
+++ /dev/null
@@ -1,44 +0,0 @@
-{extends file="backend/benchmark/template/local/index.tpl"}
-
-{block name="benchmark_index_title"}Shopware BI - Start{/block}
-
-{block name="benchmark_index_body"}
-    <body id="swag-start">
-        {include file="backend/benchmark/template/local/include/loading_indicator.tpl"}
-        {include file="backend/benchmark/template/local/include/language_switch.tpl"}
-        <div class="wrapper">
-            <div class="swag-onbording">
-
-                <div class="tob-bar">
-                    <ul class="top-benefits">
-                        <li>[[ $t('freeText') ]]</li>
-                        <li>[[ $t('anonymousText') ]]</li>
-                        <li>[[ $t('nonBindingText') ]]</li>
-                    </ul>
-                </div>
-
-                <div class="preview-screen"></div>
-
-                <div class="teaser-text">
-                    <div class="funny-graph"></div>
-                    <div class="row">
-                        <div class="col-100">
-                            <h1>[[ $t('startHeadline') ]]</h1>
-                            <p>[[ $t('startText') ]]</p>
-                        </div>
-
-                        <div class="col-100">
-                            <form method="get" action="{url controller="BenchmarkLocalOverview" action="render" template="info"}">
-                                <input type="hidden" value="{$benchmarkDefaultLanguage}" name="lang"/>
-                                <button class="btn primary" type="submit">
-                                    [[ $t('startButtonText') ]]
-                                </button>
-                            </form>
-                        </div>
-                    </div>
-                </div>
-
-            </div>
-        </div>
-    </body>
-{/block}
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/statistics.tpl b/themes/Backend/ExtJs/backend/benchmark/template/local/statistics.tpl
deleted file mode 100644
index 6c3e6b07632..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/statistics.tpl
+++ /dev/null
@@ -1,347 +0,0 @@
-{extends file="backend/benchmark/template/local/index.tpl"}
-
-{block name="benchmark_index_title"}Shopware BI{/block}
-
-{block name="benchmark_index_head_scripts"}
-    <script src="{link file='backend/benchmark/template/local/js/components.js'}"></script>
-    {$smarty.block.parent}
-    <script src="{link file='backend/benchmark/template/local/js/slider.js'}"></script>
-    <script src="{link file='backend/benchmark/template/local/js/benchmark_charts.js'}"></script>
-    <script src="{link file='backend/benchmark/template/local/js/target_group_chart.js'}"></script>
-    <script src="{link file='backend/benchmark/template/local/js/time_switcher.js'}"></script>
-    <script src="{link file='backend/benchmark/template/local/js/switch_button.js'}"></script>
-    <script src="{link file='backend/benchmark/template/local/vendor/js/chart.js'}"></script>
-    <script src="{link file='backend/benchmark/template/local/vendor/components/LiquidButton/js/index.js'}"></script>
-{/block}
-
-{block name="benchmark_index_body"}
-    <body id="swag-benchmark">
-        {include file="backend/benchmark/template/local/include/loading_indicator.tpl"}
-        {include file="backend/benchmark/template/local/include/language_switch.tpl"}
-        <div class="wrapper">
-            <div class="preview-disclaimer" v-html="$t('previewDisclaimer')">
-            </div>
-            <div class="opener">
-                <div class="swag-container">
-                    <div class="konfetti"></div>
-                    <h1>[[ $t('greeting') ]]</h1>
-                    <h2>[[ $t('headlineMain') ]]</h2>
-                    <a class="btn-liquid" onclick="onClickLiquidButton()">
-                        <span class="inner">[[ $t('getStartedBtnText') ]]</span>
-                    </a>
-                </div>
-            </div>
-
-            <div class="special-note">
-                <div class="swag-container">
-                    <h1>[[ $t('informationHeadline') ]]</h1>
-                    <h3 v-html="$t('informationText')"></h3>
-                    <div class="nice-graphic"></div>
-                    {include file="backend/benchmark/template/local/components/scroll_mouse.tpl"}
-                </div>
-            </div>
-
-            <div class="swag-text-break industry-data">
-                <div class="wave-left"></div>
-
-                <section id="container-industry-data">
-                    <div id="slider-container">
-                        <ul class="images-container">
-                            <li>
-                                {include file="backend/benchmark/template/local/components/average_orders.tpl"}
-                            </li>
-                        </ul>
-                    </div>
-                    <div class='bullets-container'></div>
-                </section>
-
-                <div class="wave-right"></div>
-            </div>
-
-            <div class="swag-chart">
-                <div class="swag-container">
-                    <h1>[[ $t('turnOverTitle') ]]</h1>
-                    <div id="swag-chart--sales" class="diagram">
-                        {include file="backend/benchmark/template/local/include/graph-data.tpl" dataKey='turnOver'}
-                    </div>
-                </div>
-            </div>
-
-            <div class="swag-chart">
-                <div class="swag-container">
-                    <h1>[[ $t('visitorsTitle') ]]</h1>
-                    <div id="swag-chart--visitor" class="diagram">
-                        {include file="backend/benchmark/template/local/include/graph-data.tpl" dataKey='visitors'}
-                    </div>
-                </div>
-            </div>
-
-            <div class="swag-chart">
-                <div class="swag-container">
-                    <h1>[[ $t('ordersTitle') ]]</h1>
-                    <div id="swag-chart--order" class="diagram">
-                        {include file="backend/benchmark/template/local/include/graph-data.tpl" dataKey='totalOrders'}
-                    </div>
-                </div>
-            </div>
-
-            <div class="swag-chart">
-                <div class="swag-container">
-                    <h1>[[ $t('conversionTitle') ]]</h1>
-                    <div id="swag-chart--conversion" class="column-graph">
-                        {include file="backend/benchmark/template/local/include/graph-data.tpl" dataKey='conversions'}
-                    </div>
-                </div>
-            </div>
-
-            <!-- start user-data -->
-            <div class="swag-text-break user-data">
-                <div class="wave-left"></div>
-
-                <div class="swag-container">
-                    <div class="slide no-slide ">
-                        <div class="benchmark-text">
-                            {include file="backend/benchmark/template/local/components/average_customers.tpl"}
-                        </div>
-                    </div>
-                </div>
-                <div class="wave-right"></div>
-            </div>
-
-            <div class="swag-chart">
-                <div class="swag-container">
-                    <h1>[[ $t('targetGroupsTitle') ]]</h1>
-                    <div id="swag-chart--targetgroup">
-                        <div class="col-50 targetgroup--branch industry-disabled">
-                            <div class="disabled-notice" v-html="$t('disabledText')"></div>
-                            <h4>[[ $t('industryTitle') ]]</h4>
-                            <div class="like-branch-ice"></div>
-                            <div class="data">
-                                <span class="data--headline high-contrast">[[ $t('womenTitle') ]]</span><br>
-                                <span class="data--headline branch-color">70%</span><br>
-                                <span class="data--txt">7.000</span><br>
-                                <span class="data--txt">Ø 30 [[ $t('yearsOldTitle') ]]</span>
-                                <br><br>
-                                <span class="data--headline high-contrast">[[ $t('menTitle') ]]</span><br>
-                                <span class="data--headline branch-color">80%</span><br>
-                                <span class="data--txt">5.000</span><br>
-                                <span class="data--txt">Ø 25 [[ $t('yearsOldTitle') ]]</span>
-                            </div>
-
-                            <div class="data-wrapper">
-                                <span class="data--headline high-contrast">[[ $t('ageTitle') ]]</span><br>
-
-                                <div class="row">
-                                    <div class="col-33 data--txt branch-color">[[ $t('above50Text') ]]</div>
-                                    <div class="col-66">
-                                        <div class="graph-gradient" style="width:15%;"><span
-                                                    class="data--txt high-contrast">15%</span></div>
-                                    </div>
-                                </div>
-                                <div class="row">
-                                    <div class="col-33 data--txt branch-color">[[ $t('between30And50Text') ]]</div>
-                                    <div class="col-66">
-                                        <div class="graph-gradient" style="width:30%;"><span
-                                                    class="data--txt high-contrast">30%</span></div>
-                                    </div>
-                                </div>
-                                <div class="row">
-                                    <div class="col-33 data--txt branch-color">[[ $t('between15And30Text') ]]</div>
-                                    <div class="col-66">
-                                        <div class="graph-gradient" style="width:55%;"><span
-                                                    class="data--txt high-contrast">55%</span></div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                        {include file="backend/benchmark/template/local/components/target_groups.tpl"}
-                    </div>
-                </div>
-            </div>
-
-            <div class="swag-chart">
-                <div class="swag-container">
-                    <h1>[[ $t('devicesTitle') ]]</h1>
-                    <div id="swag-chart--device">
-                        {include file="backend/benchmark/template/local/components/devices_charts.tpl"}
-                    </div>
-                </div>
-            </div>
-
-            <div class="swag-text-break payment-shipping-data">
-                <div class="wave-left"></div>
-                <div class="swag-container">
-                    <div class="slide no-slide ">
-                        <div class="benchmark-text">
-                            {include file="backend/benchmark/template/local/components/average_numbers.tpl"}
-                        </div>
-                    </div>
-                </div>
-                <div class="wave-right"></div>
-            </div>
-
-            <div class="swag-chart">
-                <div class="swag-container">
-                    <h1>[[ $t('top5PaymentsTitle') ]]</h1>
-                    <div id="swag-chart--payment">
-                        <div class="col-50 payment industry-disabled">
-                            <div class="disabled-notice" v-html="$t('disabledText')"></div>
-                            <h4>[[ $t('industryTitle') ]]</h4>
-                            <div class="wrapper">
-                                <div class="graph"
-                                     style="height: 66px; width: 66px; line-height: 66px; background-color: rgba(106, 99, 252, 0.8);">
-                                    <span class="data--txt high-contrast">25%</span></div>
-                                <div class="graph"
-                                     style="height: 60px; width: 60px; line-height: 60px; background-color: rgba(106, 99, 252, 0.6);">
-                                    <span class="data--txt high-contrast">20%</span></div>
-                                <div class="graph"
-                                     style="height: 90px; width: 90px; line-height: 90px; background-color: rgba(106, 99, 252, 1.0);">
-                                    <span class="data--txt high-contrast is-bigger">35%</span></div>
-                                <div class="graph"
-                                     style="height: 50px; width: 50px; line-height: 50px; background-color: rgba(106, 99, 252, 0.4);">
-                                    <span class="data--txt high-contrast">15%</span></div>
-                                <div class="graph"
-                                     style="height: 36px; width: 36px; line-height: 36px; background-color: rgba(106, 99, 252, 0.2);">
-                                    <span class="data--txt high-contrast">5%</span></div>
-                            </div>
-                            <div class="row">
-                                <div class="col-80 data--txt">
-                                    <div class="col-66 branch-color">DHL</div>
-                                    <div class="col-33 high-contrast">35%</div>
-                                    <div class="col-66 branch-color">UPS</div>
-                                    <div class="col-33 high-contrast">35%</div>
-                                    <div class="col-66 branch-color">Hermes</div>
-                                    <div class="col-33 high-contrast">35%</div>
-                                    <div class="col-66 branch-color">DPD</div>
-                                    <div class="col-33 high-contrast">35%</div>
-                                    <div class="col-66 branch-color">GLS</div>
-                                    <div class="col-33 high-contrast">35%</div>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="col-50 payment">
-                            <h4>[[ $t('shopTitle') ]]</h4>
-                            {include file="backend/benchmark/template/local/components/top_payments.tpl"}
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="swag-chart">
-                <div class="swag-container">
-                    <h1>[[ $t('top5ShipmentsTitle') ]]</h1>
-                    <div id="swag-chart--shipping">
-                        <div class="col-50 shipping industry-disabled">
-                            <div class="disabled-notice" v-html="$t('disabledText')"></div>
-                            <h4>[[ $t('industryTitle') ]]</h4>
-                            <div class="wrapper">
-                                <div class="graph" style="  background-color: rgba(106, 99, 252, 0.8);"><span
-                                            class="data--txt high-contrast">25%</span></div>
-                                <div class="graph" style="padding:20px; background-color: rgba(106, 99, 252, 0.6);"><span
-                                            class="data--txt high-contrast">20%</span></div>
-                                <div class="graph" style="padding:35px; background-color: rgba(106, 99, 252, 1.0);"><span
-                                            class="data--txt high-contrast is-bigger">35%</span></div>
-                                <div class="graph" style="padding:15px; background-color: rgba(106, 99, 252, 0.4);"><span
-                                            class="data--txt high-contrast">15%</span></div>
-                                <div class="graph" style="padding:5px; background-color: rgba(106, 99, 252, 0.2);"><span
-                                            class="data--txt high-contrast">5%</span></div>
-                            </div>
-                            <div class="row">
-                                <div class="col-80 data--txt">
-                                    <div class="col-66 branch-color">DHL</div>
-                                    <div class="col-33 high-contrast">35%</div>
-                                    <div class="col-66 branch-color">UPS</div>
-                                    <div class="col-33 high-contrast">35%</div>
-                                    <div class="col-66 branch-color">Hermes</div>
-                                    <div class="col-33 high-contrast">35%</div>
-                                    <div class="col-66 branch-color">DPD</div>
-                                    <div class="col-33 high-contrast">35%</div>
-                                    <div class="col-66 branch-color">GLS</div>
-                                    <div class="col-33 high-contrast">35%</div>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="col-50 shipping">
-                            <h4>[[ $t('shopTitle') ]]</h4>
-                            {include file="backend/benchmark/template/local/components/top_shipments.tpl"}
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <!-- Footer text-break-three -->
-            <footer class="swag-the-end">
-                <div class="swag-container">
-                    <div class="benchmark-text">
-                        <div class="konfetti"></div>
-                        <h1>[[ $t('endTitle') ]]</h1>
-                        <h3><span class="shop-color">[[ $t('endSubTitle') ]]</span></h3>
-                        <br>
-                        <h4>[[ $t('endText') ]]</h4>
-
-                        <div class="nice-message">
-                            <a :href="[[ $t('surveyLink') ]]" target="_blank" class="btn secondary">[[ $t('sendFeedbackBtn')
-                                ]]</a>
-                        </div>
-
-                        <p>[[ $t('endSignOffText') ]]</p>
-                    </div>
-                </div>
-            </footer>
-        </div>
-
-        {literal}
-            <template id="paymentGraphBubble">
-                <div class="payment-graph-bubble-wrapper">
-                    <div v-for="(payment, index) in paymentsList" v-if="payment > 0" @key="index" class="graph"
-                         :style="compStyle(payment)">
-                        <span class="data--txt high-contrast" style="font-size: 0.25em">{{ payment }}%</span>
-                    </div>
-                </div>
-            </template>
-            <template id="paymentGraphList">
-                <div class="payment-graph-list-wrapper">
-                    <div v-for="(payment, index) in paymentsList" v-if="payment > 0" @key="index">
-                        <div class="col-66 shop-color">{{ index }}</div>
-                        <div class="col-33 high-contrast">{{ payment }}%</div>
-                    </div>
-
-                    <div v-for="(payment, index) in paymentsList" v-if="payment == -1" @key="index">
-                        <div class="col-66 high-contrast">-</div>
-                    </div>
-                </div>
-            </template>
-            <template id="shipmentGraphSquares">
-                <div class="shipment-graph-square-wrapper">
-                    <div v-for="(shipment, index) in shipmentsList" v-if="shipment > 0" @key="index" class="graph"
-                         :style="compStyle(shipment)">
-                        <span style="font-size: 0.25em;" class="data--txt high-contrast">{{ shipment }}%</span>
-                    </div>
-                </div>
-            </template>
-            <template id="shipmentGraphList">
-                <div class="shipment-graph-list-wrapper">
-                    <div v-for="(shipment, index) in shipmentsList" v-if="shipment > 0" @key="index">
-                        <div class="col-66 shop-color">{{ index }}</div>
-                        <div class="col-33 high-contrast">{{ shipment }}%</div>
-                    </div>
-
-                    <div v-for="(shipment, index) in shipmentsList" v-if="shipment == -1" @key="index">
-                        <div class="col-66 high-contrast">-</div>
-                    </div>
-                </div>
-            </template>
-            <template id="devicesGraphList">
-                <div class="devices-graph-list-wrapper">
-                    <div class="devices-item" v-for="(device, index) in devicesList" v-if="device > 0" @key="index">
-                        <div class="shop-color col-66">{{ index }}</div>
-                        <div class="high-contrast col-33">{{ device }}%</div>
-                    </div>
-                </div>
-            </template>
-        {/literal}
-    </body>
-{/block}
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/vendor/components/LiquidButton/css/style.css b/themes/Backend/ExtJs/backend/benchmark/template/local/vendor/components/LiquidButton/css/style.css
deleted file mode 100644
index d04d65f7759..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/vendor/components/LiquidButton/css/style.css
+++ /dev/null
@@ -1,28 +0,0 @@
-.btn-liquid {
-	display: inline-block;
-	position: relative;
-	width: 240px;
-	height: 62px;
-	border-radius: 27px;
-
-	color: #fff;
-	font: 700 14px/62px "Source Sans Pro", sans-serif;
-	letter-spacing: 0.05em;
-	text-align: center;
-	text-decoration: none;
-}
-
-.btn-liquid .inner {
-	position: relative;
-
-	z-index: 2;
-}
-
-.btn-liquid canvas {
-	position: absolute;
-	top: -50px;
-	right: -50px;
-	bottom: -50px;
-	left: -50px;
-	z-index: 1;
-}
\ No newline at end of file
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/vendor/components/LiquidButton/js/index.js b/themes/Backend/ExtJs/backend/benchmark/template/local/vendor/components/LiquidButton/js/index.js
deleted file mode 100644
index 226dae67ed3..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/vendor/components/LiquidButton/js/index.js
+++ /dev/null
@@ -1,246 +0,0 @@
-$(function () {
-    // Vars
-    var pointsA = [],
-        pointsB = [],
-        $canvas = null,
-        canvas = null,
-        context = null,
-        vars = null,
-        points = 8,
-        viscosity = 5,
-        mouseDist = 70,
-        damping = 0.05,
-        showIndicators = false;
-    mouseX = 0,
-    mouseY = 0,
-    relMouseX = 0,
-    relMouseY = 0,
-    mouseLastX = 0,
-    mouseLastY = 0,
-    mouseDirectionX = 0,
-    mouseDirectionY = 0,
-    mouseSpeedX = 0,
-    mouseSpeedY = 0;
-
-    /**
-     * Get mouse direction
-     */
-    function mouseDirection(e) {
-        if (mouseX < e.pageX)
-            mouseDirectionX = 1;
-        else if (mouseX > e.pageX)
-            mouseDirectionX = -1;
-        else
-            mouseDirectionX = 0;
-
-        if (mouseY < e.pageY)
-            mouseDirectionY = 1;
-        else if (mouseY > e.pageY)
-            mouseDirectionY = -1;
-        else
-            mouseDirectionY = 0;
-
-        mouseX = e.pageX;
-        mouseY = e.pageY;
-
-        relMouseX = (mouseX - $canvas.offset().left);
-        relMouseY = (mouseY - $canvas.offset().top);
-    }
-
-    $(document).on('mousemove', mouseDirection);
-
-    /**
-     * Get mouse speed
-     */
-    function mouseSpeed() {
-        mouseSpeedX = mouseX - mouseLastX;
-        mouseSpeedY = mouseY - mouseLastY;
-
-        mouseLastX = mouseX;
-        mouseLastY = mouseY;
-
-        setTimeout(mouseSpeed, 50);
-    }
-
-    mouseSpeed();
-
-    /**
-     * Init button
-     */
-    function initButton() {
-        // Get button
-        var button = $('.btn-liquid');
-        var buttonWidth = button.width();
-        var buttonHeight = button.height();
-
-        // Create canvas
-        $canvas = $('<canvas></canvas>');
-        button.append($canvas);
-
-        canvas = $canvas.get(0);
-        canvas.width = buttonWidth + 100;
-        canvas.height = buttonHeight + 100;
-        context = canvas.getContext('2d');
-
-        // Add points
-
-        var x = buttonHeight / 2;
-        for (var j = 1; j < points; j++) {
-            addPoints((x + ((buttonWidth - buttonHeight) / points) * j), 0);
-        }
-        addPoints(buttonWidth - buttonHeight / 5, 0);
-        addPoints(buttonWidth + buttonHeight / 10, buttonHeight / 2);
-        addPoints(buttonWidth - buttonHeight / 5, buttonHeight);
-        for (var j = points - 1; j > 0; j--) {
-            addPoints((x + ((buttonWidth - buttonHeight) / points) * j), buttonHeight);
-        }
-        addPoints(buttonHeight / 5, buttonHeight);
-
-        addPoints(-buttonHeight / 10, buttonHeight / 2);
-        addPoints(buttonHeight / 5, 0);
-
-        // Start render
-        renderCanvas();
-    }
-
-    /**
-     * Add points
-     */
-    function addPoints(x, y) {
-        pointsA.push(new Point(x, y, 1));
-        pointsB.push(new Point(x, y, 2));
-    }
-
-    /**
-     * Point
-     */
-    function Point(x, y, level) {
-        this.x = this.ix = 50 + x;
-        this.y = this.iy = 50 + y;
-        this.vx = 0;
-        this.vy = 0;
-        this.cx1 = 0;
-        this.cy1 = 0;
-        this.cx2 = 0;
-        this.cy2 = 0;
-        this.level = level;
-    }
-
-    Point.prototype.move = function () {
-        this.vx += (this.ix - this.x) / (viscosity * this.level);
-        this.vy += (this.iy - this.y) / (viscosity * this.level);
-
-        var dx = this.ix - relMouseX,
-            dy = this.iy - relMouseY;
-        var relDist = (1 - Math.sqrt((dx * dx) + (dy * dy)) / mouseDist);
-
-        // Move x
-        if ((mouseDirectionX > 0 && relMouseX > this.x) || (mouseDirectionX < 0 && relMouseX < this.x)) {
-            if (relDist > 0 && relDist < 1) {
-                this.vx = (mouseSpeedX / 4) * relDist;
-            }
-        }
-        this.vx *= (1 - damping);
-        this.x += this.vx;
-
-        // Move y
-        if ((mouseDirectionY > 0 && relMouseY > this.y) || (mouseDirectionY < 0 && relMouseY < this.y)) {
-            if (relDist > 0 && relDist < 1) {
-                this.vy = (mouseSpeedY / 4) * relDist;
-            }
-        }
-        this.vy *= (1 - damping);
-        this.y += this.vy;
-    };
-
-    /**
-     * Render canvas
-     */
-    function renderCanvas() {
-        // rAF
-        requestAnimationFrame(renderCanvas);
-
-        // Clear scene
-        context.clearRect(0, 0, $canvas.width(), $canvas.height());
-        context.fillStyle = '#213448';
-        context.fillRect(0, 0, $canvas.width(), $canvas.height());
-
-        // Move points
-        for (var i = 0; i <= pointsA.length - 1; i++) {
-            pointsA[i].move();
-            pointsB[i].move();
-        }
-
-        // Create dynamic gradient
-        var gradientX = Math.min(Math.max(mouseX - $canvas.offset().left, 0), $canvas.width());
-        var gradientY = Math.min(Math.max(mouseY - $canvas.offset().top, 0), $canvas.height());
-        var distance = Math.sqrt(Math.pow(gradientX - $canvas.width() / 2, 2) + Math.pow(gradientY - $canvas.height() / 2, 2)) / Math.sqrt(Math.pow($canvas.width() / 2, 2) + Math.pow($canvas.height() / 2, 2));
-
-        var gradient = context.createRadialGradient(gradientX, gradientY, 300 + (300 * distance), gradientX, gradientY, 0);
-        gradient.addColorStop(0, '#511CFC');
-        gradient.addColorStop(1, '#55D3E1');
-
-        // Draw shapes
-        var groups = [pointsA, pointsB]
-
-        for (var j = 0; j <= 1; j++) {
-            var points = groups[j];
-
-            if (j == 0) {
-                // Background style
-                context.fillStyle = '#189EFF';
-            } else {
-                // Foreground style
-                context.fillStyle = gradient;
-            }
-
-            context.beginPath();
-            context.moveTo(points[0].x, points[0].y);
-
-            for (var i = 0; i < points.length; i++) {
-                var p = points[i];
-                var nextP = points[i + 1];
-                if (nextP != undefined) {
-                    p.cx1 = (p.x + nextP.x) / 2;
-                    p.cy1 = (p.y + nextP.y) / 2;
-                    p.cx2 = (p.x + nextP.x) / 2;
-                    p.cy2 = (p.y + nextP.y) / 2;
-
-                    context.bezierCurveTo(p.x, p.y, p.cx1, p.cy1, p.cx1, p.cy1);
-                } else {
-                    nextP = points[0];
-                    p.cx1 = (p.x + nextP.x) / 2;
-                    p.cy1 = (p.y + nextP.y) / 2;
-
-                    context.bezierCurveTo(p.x, p.y, p.cx1, p.cy1, p.cx1, p.cy1);
-                }
-            }
-
-            context.fill();
-        }
-
-        if (showIndicators) {
-            // Draw points
-            context.beginPath();
-            for (var i = 0; i < pointsA.length; i++) {
-                var p = pointsA[i];
-
-                context.rect(p.x - 1, p.y - 1, 2, 2);
-            }
-            context.fill();
-
-            // Draw controls
-            context.beginPath();
-            for (var i = 0; i < pointsA.length; i++) {
-                var p = pointsA[i];
-
-                context.rect(p.cx1 - 1, p.cy1 - 1, 2, 2);
-                context.rect(p.cx2 - 1, p.cy2 - 1, 2, 2);
-            }
-            context.fill();
-        }
-    }
-
-    // Init
-    initButton();
-});
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/vendor/components/LiquidButton/license.txt b/themes/Backend/ExtJs/backend/benchmark/template/local/vendor/components/LiquidButton/license.txt
deleted file mode 100644
index b9426d03bb3..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/vendor/components/LiquidButton/license.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-<!--
-Copyright (c) 2018 by Captain Anonymous (https://codepen.io/anon/pen/WJjdOy)
-
-
-Fork of an original work by Waaark (https://codepen.io/waaark/pen/VbgwEM)
-
-
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--->
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/vendor/js/chart.js b/themes/Backend/ExtJs/backend/benchmark/template/local/vendor/js/chart.js
deleted file mode 100644
index c8a1a60d016..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/vendor/js/chart.js
+++ /dev/null
@@ -1,14048 +0,0 @@
-/*!
- * Chart.js
- * http://chartjs.org/
- * Version: 2.7.0
- *
- * Copyright 2017 Nick Downie
- * Released under the MIT license
- * https://github.com/chartjs/Chart.js/blob/master/LICENSE.md
- */
-(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.Chart = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={ exports:{} };t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({ 1:[function(require,module,exports){
-
-    },{}],2:[function(require,module,exports){
-        /* MIT license */
-        var colorNames = require(6);
-
-        module.exports = {
-            getRgba: getRgba,
-            getHsla: getHsla,
-            getRgb: getRgb,
-            getHsl: getHsl,
-            getHwb: getHwb,
-            getAlpha: getAlpha,
-
-            hexString: hexString,
-            rgbString: rgbString,
-            rgbaString: rgbaString,
-            percentString: percentString,
-            percentaString: percentaString,
-            hslString: hslString,
-            hslaString: hslaString,
-            hwbString: hwbString,
-            keyword: keyword
-        }
-
-        function getRgba(string) {
-            if (!string) {
-                return;
-            }
-            var abbr =  /^#([a-fA-F0-9]{3})$/i,
-                    hex =  /^#([a-fA-F0-9]{6})$/i,
-                    rgba = /^rgba?\(\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i,
-                    per = /^rgba?\(\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i,
-                    keyword = /(\w+)/;
-
-            var rgb = [0, 0, 0],
-                    a = 1,
-                    match = string.match(abbr);
-            if (match) {
-                match = match[1];
-                for (var i = 0; i < rgb.length; i++) {
-                    rgb[i] = parseInt(match[i] + match[i], 16);
-                }
-            }
-            else if (match = string.match(hex)) {
-                match = match[1];
-                for (var i = 0; i < rgb.length; i++) {
-                    rgb[i] = parseInt(match.slice(i * 2, i * 2 + 2), 16);
-                }
-            }
-            else if (match = string.match(rgba)) {
-                for (var i = 0; i < rgb.length; i++) {
-                    rgb[i] = parseInt(match[i + 1]);
-                }
-                a = parseFloat(match[4]);
-            }
-            else if (match = string.match(per)) {
-                for (var i = 0; i < rgb.length; i++) {
-                    rgb[i] = Math.round(parseFloat(match[i + 1]) * 2.55);
-                }
-                a = parseFloat(match[4]);
-            }
-            else if (match = string.match(keyword)) {
-                if (match[1] == "transparent") {
-                    return [0, 0, 0, 0];
-                }
-                rgb = colorNames[match[1]];
-                if (!rgb) {
-                    return;
-                }
-            }
-
-            for (var i = 0; i < rgb.length; i++) {
-                rgb[i] = scale(rgb[i], 0, 255);
-            }
-            if (!a && a != 0) {
-                a = 1;
-            }
-            else {
-                a = scale(a, 0, 1);
-            }
-            rgb[3] = a;
-            return rgb;
-        }
-
-        function getHsla(string) {
-            if (!string) {
-                return;
-            }
-            var hsl = /^hsla?\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/;
-            var match = string.match(hsl);
-            if (match) {
-                var alpha = parseFloat(match[4]);
-                var h = scale(parseInt(match[1]), 0, 360),
-                        s = scale(parseFloat(match[2]), 0, 100),
-                        l = scale(parseFloat(match[3]), 0, 100),
-                        a = scale(isNaN(alpha) ? 1 : alpha, 0, 1);
-                return [h, s, l, a];
-            }
-        }
-
-        function getHwb(string) {
-            if (!string) {
-                return;
-            }
-            var hwb = /^hwb\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/;
-            var match = string.match(hwb);
-            if (match) {
-                var alpha = parseFloat(match[4]);
-                var h = scale(parseInt(match[1]), 0, 360),
-                        w = scale(parseFloat(match[2]), 0, 100),
-                        b = scale(parseFloat(match[3]), 0, 100),
-                        a = scale(isNaN(alpha) ? 1 : alpha, 0, 1);
-                return [h, w, b, a];
-            }
-        }
-
-        function getRgb(string) {
-            var rgba = getRgba(string);
-            return rgba && rgba.slice(0, 3);
-        }
-
-        function getHsl(string) {
-            var hsla = getHsla(string);
-            return hsla && hsla.slice(0, 3);
-        }
-
-        function getAlpha(string) {
-            var vals = getRgba(string);
-            if (vals) {
-                return vals[3];
-            }
-            else if (vals = getHsla(string)) {
-                return vals[3];
-            }
-            else if (vals = getHwb(string)) {
-                return vals[3];
-            }
-        }
-
-// generators
-        function hexString(rgb) {
-            return "#" + hexDouble(rgb[0]) + hexDouble(rgb[1])
-                    + hexDouble(rgb[2]);
-        }
-
-        function rgbString(rgba, alpha) {
-            if (alpha < 1 || (rgba[3] && rgba[3] < 1)) {
-                return rgbaString(rgba, alpha);
-            }
-            return "rgb(" + rgba[0] + ", " + rgba[1] + ", " + rgba[2] + ")";
-        }
-
-        function rgbaString(rgba, alpha) {
-            if (alpha === undefined) {
-                alpha = (rgba[3] !== undefined ? rgba[3] : 1);
-            }
-            return "rgba(" + rgba[0] + ", " + rgba[1] + ", " + rgba[2]
-                    + ", " + alpha + ")";
-        }
-
-        function percentString(rgba, alpha) {
-            if (alpha < 1 || (rgba[3] && rgba[3] < 1)) {
-                return percentaString(rgba, alpha);
-            }
-            var r = Math.round(rgba[0]/255 * 100),
-                    g = Math.round(rgba[1]/255 * 100),
-                    b = Math.round(rgba[2]/255 * 100);
-
-            return "rgb(" + r + "%, " + g + "%, " + b + "%)";
-        }
-
-        function percentaString(rgba, alpha) {
-            var r = Math.round(rgba[0]/255 * 100),
-                    g = Math.round(rgba[1]/255 * 100),
-                    b = Math.round(rgba[2]/255 * 100);
-            return "rgba(" + r + "%, " + g + "%, " + b + "%, " + (alpha || rgba[3] || 1) + ")";
-        }
-
-        function hslString(hsla, alpha) {
-            if (alpha < 1 || (hsla[3] && hsla[3] < 1)) {
-                return hslaString(hsla, alpha);
-            }
-            return "hsl(" + hsla[0] + ", " + hsla[1] + "%, " + hsla[2] + "%)";
-        }
-
-        function hslaString(hsla, alpha) {
-            if (alpha === undefined) {
-                alpha = (hsla[3] !== undefined ? hsla[3] : 1);
-            }
-            return "hsla(" + hsla[0] + ", " + hsla[1] + "%, " + hsla[2] + "%, "
-                    + alpha + ")";
-        }
-
-// hwb is a bit different than rgb(a) & hsl(a) since there is no alpha specific syntax
-// (hwb have alpha optional & 1 is default value)
-        function hwbString(hwb, alpha) {
-            if (alpha === undefined) {
-                alpha = (hwb[3] !== undefined ? hwb[3] : 1);
-            }
-            return "hwb(" + hwb[0] + ", " + hwb[1] + "%, " + hwb[2] + "%"
-                    + (alpha !== undefined && alpha !== 1 ? ", " + alpha : "") + ")";
-        }
-
-        function keyword(rgb) {
-            return reverseNames[rgb.slice(0, 3)];
-        }
-
-// helpers
-        function scale(num, min, max) {
-            return Math.min(Math.max(min, num), max);
-        }
-
-        function hexDouble(num) {
-            var str = num.toString(16).toUpperCase();
-            return (str.length < 2) ? "0" + str : str;
-        }
-
-
-//create a list of reverse color names
-        var reverseNames = {};
-        for (var name in colorNames) {
-            reverseNames[colorNames[name]] = name;
-        }
-
-    },{ "6":6 }],3:[function(require,module,exports){
-        /* MIT license */
-        var convert = require(5);
-        var string = require(2);
-
-        var Color = function (obj) {
-            if (obj instanceof Color) {
-                return obj;
-            }
-            if (!(this instanceof Color)) {
-                return new Color(obj);
-            }
-
-            this.valid = false;
-            this.values = {
-                rgb: [0, 0, 0],
-                hsl: [0, 0, 0],
-                hsv: [0, 0, 0],
-                hwb: [0, 0, 0],
-                cmyk: [0, 0, 0, 0],
-                alpha: 1
-            };
-
-            // parse Color() argument
-            var vals;
-            if (typeof obj === 'string') {
-                vals = string.getRgba(obj);
-                if (vals) {
-                    this.setValues('rgb', vals);
-                } else if (vals = string.getHsla(obj)) {
-                    this.setValues('hsl', vals);
-                } else if (vals = string.getHwb(obj)) {
-                    this.setValues('hwb', vals);
-                }
-            } else if (typeof obj === 'object') {
-                vals = obj;
-                if (vals.r !== undefined || vals.red !== undefined) {
-                    this.setValues('rgb', vals);
-                } else if (vals.l !== undefined || vals.lightness !== undefined) {
-                    this.setValues('hsl', vals);
-                } else if (vals.v !== undefined || vals.value !== undefined) {
-                    this.setValues('hsv', vals);
-                } else if (vals.w !== undefined || vals.whiteness !== undefined) {
-                    this.setValues('hwb', vals);
-                } else if (vals.c !== undefined || vals.cyan !== undefined) {
-                    this.setValues('cmyk', vals);
-                }
-            }
-        };
-
-        Color.prototype = {
-            isValid: function () {
-                return this.valid;
-            },
-            rgb: function () {
-                return this.setSpace('rgb', arguments);
-            },
-            hsl: function () {
-                return this.setSpace('hsl', arguments);
-            },
-            hsv: function () {
-                return this.setSpace('hsv', arguments);
-            },
-            hwb: function () {
-                return this.setSpace('hwb', arguments);
-            },
-            cmyk: function () {
-                return this.setSpace('cmyk', arguments);
-            },
-
-            rgbArray: function () {
-                return this.values.rgb;
-            },
-            hslArray: function () {
-                return this.values.hsl;
-            },
-            hsvArray: function () {
-                return this.values.hsv;
-            },
-            hwbArray: function () {
-                var values = this.values;
-                if (values.alpha !== 1) {
-                    return values.hwb.concat([values.alpha]);
-                }
-                return values.hwb;
-            },
-            cmykArray: function () {
-                return this.values.cmyk;
-            },
-            rgbaArray: function () {
-                var values = this.values;
-                return values.rgb.concat([values.alpha]);
-            },
-            hslaArray: function () {
-                var values = this.values;
-                return values.hsl.concat([values.alpha]);
-            },
-            alpha: function (val) {
-                if (val === undefined) {
-                    return this.values.alpha;
-                }
-                this.setValues('alpha', val);
-                return this;
-            },
-
-            red: function (val) {
-                return this.setChannel('rgb', 0, val);
-            },
-            green: function (val) {
-                return this.setChannel('rgb', 1, val);
-            },
-            blue: function (val) {
-                return this.setChannel('rgb', 2, val);
-            },
-            hue: function (val) {
-                if (val) {
-                    val %= 360;
-                    val = val < 0 ? 360 + val : val;
-                }
-                return this.setChannel('hsl', 0, val);
-            },
-            saturation: function (val) {
-                return this.setChannel('hsl', 1, val);
-            },
-            lightness: function (val) {
-                return this.setChannel('hsl', 2, val);
-            },
-            saturationv: function (val) {
-                return this.setChannel('hsv', 1, val);
-            },
-            whiteness: function (val) {
-                return this.setChannel('hwb', 1, val);
-            },
-            blackness: function (val) {
-                return this.setChannel('hwb', 2, val);
-            },
-            value: function (val) {
-                return this.setChannel('hsv', 2, val);
-            },
-            cyan: function (val) {
-                return this.setChannel('cmyk', 0, val);
-            },
-            magenta: function (val) {
-                return this.setChannel('cmyk', 1, val);
-            },
-            yellow: function (val) {
-                return this.setChannel('cmyk', 2, val);
-            },
-            black: function (val) {
-                return this.setChannel('cmyk', 3, val);
-            },
-
-            hexString: function () {
-                return string.hexString(this.values.rgb);
-            },
-            rgbString: function () {
-                return string.rgbString(this.values.rgb, this.values.alpha);
-            },
-            rgbaString: function () {
-                return string.rgbaString(this.values.rgb, this.values.alpha);
-            },
-            percentString: function () {
-                return string.percentString(this.values.rgb, this.values.alpha);
-            },
-            hslString: function () {
-                return string.hslString(this.values.hsl, this.values.alpha);
-            },
-            hslaString: function () {
-                return string.hslaString(this.values.hsl, this.values.alpha);
-            },
-            hwbString: function () {
-                return string.hwbString(this.values.hwb, this.values.alpha);
-            },
-            keyword: function () {
-                return string.keyword(this.values.rgb, this.values.alpha);
-            },
-
-            rgbNumber: function () {
-                var rgb = this.values.rgb;
-                return (rgb[0] << 16) | (rgb[1] << 8) | rgb[2];
-            },
-
-            luminosity: function () {
-                // http://www.w3.org/TR/WCAG20/#relativeluminancedef
-                var rgb = this.values.rgb;
-                var lum = [];
-                for (var i = 0; i < rgb.length; i++) {
-                    var chan = rgb[i] / 255;
-                    lum[i] = (chan <= 0.03928) ? chan / 12.92 : Math.pow(((chan + 0.055) / 1.055), 2.4);
-                }
-                return 0.2126 * lum[0] + 0.7152 * lum[1] + 0.0722 * lum[2];
-            },
-
-            contrast: function (color2) {
-                // http://www.w3.org/TR/WCAG20/#contrast-ratiodef
-                var lum1 = this.luminosity();
-                var lum2 = color2.luminosity();
-                if (lum1 > lum2) {
-                    return (lum1 + 0.05) / (lum2 + 0.05);
-                }
-                return (lum2 + 0.05) / (lum1 + 0.05);
-            },
-
-            level: function (color2) {
-                var contrastRatio = this.contrast(color2);
-                if (contrastRatio >= 7.1) {
-                    return 'AAA';
-                }
-
-                return (contrastRatio >= 4.5) ? 'AA' : '';
-            },
-
-            dark: function () {
-                // YIQ equation from http://24ways.org/2010/calculating-color-contrast
-                var rgb = this.values.rgb;
-                var yiq = (rgb[0] * 299 + rgb[1] * 587 + rgb[2] * 114) / 1000;
-                return yiq < 128;
-            },
-
-            light: function () {
-                return !this.dark();
-            },
-
-            negate: function () {
-                var rgb = [];
-                for (var i = 0; i < 3; i++) {
-                    rgb[i] = 255 - this.values.rgb[i];
-                }
-                this.setValues('rgb', rgb);
-                return this;
-            },
-
-            lighten: function (ratio) {
-                var hsl = this.values.hsl;
-                hsl[2] += hsl[2] * ratio;
-                this.setValues('hsl', hsl);
-                return this;
-            },
-
-            darken: function (ratio) {
-                var hsl = this.values.hsl;
-                hsl[2] -= hsl[2] * ratio;
-                this.setValues('hsl', hsl);
-                return this;
-            },
-
-            saturate: function (ratio) {
-                var hsl = this.values.hsl;
-                hsl[1] += hsl[1] * ratio;
-                this.setValues('hsl', hsl);
-                return this;
-            },
-
-            desaturate: function (ratio) {
-                var hsl = this.values.hsl;
-                hsl[1] -= hsl[1] * ratio;
-                this.setValues('hsl', hsl);
-                return this;
-            },
-
-            whiten: function (ratio) {
-                var hwb = this.values.hwb;
-                hwb[1] += hwb[1] * ratio;
-                this.setValues('hwb', hwb);
-                return this;
-            },
-
-            blacken: function (ratio) {
-                var hwb = this.values.hwb;
-                hwb[2] += hwb[2] * ratio;
-                this.setValues('hwb', hwb);
-                return this;
-            },
-
-            greyscale: function () {
-                var rgb = this.values.rgb;
-                // http://en.wikipedia.org/wiki/Grayscale#Converting_color_to_grayscale
-                var val = rgb[0] * 0.3 + rgb[1] * 0.59 + rgb[2] * 0.11;
-                this.setValues('rgb', [val, val, val]);
-                return this;
-            },
-
-            clearer: function (ratio) {
-                var alpha = this.values.alpha;
-                this.setValues('alpha', alpha - (alpha * ratio));
-                return this;
-            },
-
-            opaquer: function (ratio) {
-                var alpha = this.values.alpha;
-                this.setValues('alpha', alpha + (alpha * ratio));
-                return this;
-            },
-
-            rotate: function (degrees) {
-                var hsl = this.values.hsl;
-                var hue = (hsl[0] + degrees) % 360;
-                hsl[0] = hue < 0 ? 360 + hue : hue;
-                this.setValues('hsl', hsl);
-                return this;
-            },
-
-            /**
-             * Ported from sass implementation in C
-             * https://github.com/sass/libsass/blob/0e6b4a2850092356aa3ece07c6b249f0221caced/functions.cpp#L209
-             */
-            mix: function (mixinColor, weight) {
-                var color1 = this;
-                var color2 = mixinColor;
-                var p = weight === undefined ? 0.5 : weight;
-
-                var w = 2 * p - 1;
-                var a = color1.alpha() - color2.alpha();
-
-                var w1 = (((w * a === -1) ? w : (w + a) / (1 + w * a)) + 1) / 2.0;
-                var w2 = 1 - w1;
-
-                return this
-                        .rgb(
-                                w1 * color1.red() + w2 * color2.red(),
-                                w1 * color1.green() + w2 * color2.green(),
-                                w1 * color1.blue() + w2 * color2.blue()
-                        )
-                        .alpha(color1.alpha() * p + color2.alpha() * (1 - p));
-            },
-
-            toJSON: function () {
-                return this.rgb();
-            },
-
-            clone: function () {
-                // NOTE(SB): using node-clone creates a dependency to Buffer when using browserify,
-                // making the final build way to big to embed in Chart.js. So let's do it manually,
-                // assuming that values to clone are 1 dimension arrays containing only numbers,
-                // except 'alpha' which is a number.
-                var result = new Color();
-                var source = this.values;
-                var target = result.values;
-                var value, type;
-
-                for (var prop in source) {
-                    if (source.hasOwnProperty(prop)) {
-                        value = source[prop];
-                        type = ({}).toString.call(value);
-                        if (type === '[object Array]') {
-                            target[prop] = value.slice(0);
-                        } else if (type === '[object Number]') {
-                            target[prop] = value;
-                        } else {
-                            console.error('unexpected color value:', value);
-                        }
-                    }
-                }
-
-                return result;
-            }
-        };
-
-        Color.prototype.spaces = {
-            rgb: ['red', 'green', 'blue'],
-            hsl: ['hue', 'saturation', 'lightness'],
-            hsv: ['hue', 'saturation', 'value'],
-            hwb: ['hue', 'whiteness', 'blackness'],
-            cmyk: ['cyan', 'magenta', 'yellow', 'black']
-        };
-
-        Color.prototype.maxes = {
-            rgb: [255, 255, 255],
-            hsl: [360, 100, 100],
-            hsv: [360, 100, 100],
-            hwb: [360, 100, 100],
-            cmyk: [100, 100, 100, 100]
-        };
-
-        Color.prototype.getValues = function (space) {
-            var values = this.values;
-            var vals = {};
-
-            for (var i = 0; i < space.length; i++) {
-                vals[space.charAt(i)] = values[space][i];
-            }
-
-            if (values.alpha !== 1) {
-                vals.a = values.alpha;
-            }
-
-            // {r: 255, g: 255, b: 255, a: 0.4}
-            return vals;
-        };
-
-        Color.prototype.setValues = function (space, vals) {
-            var values = this.values;
-            var spaces = this.spaces;
-            var maxes = this.maxes;
-            var alpha = 1;
-            var i;
-
-            this.valid = true;
-
-            if (space === 'alpha') {
-                alpha = vals;
-            } else if (vals.length) {
-                // [10, 10, 10]
-                values[space] = vals.slice(0, space.length);
-                alpha = vals[space.length];
-            } else if (vals[space.charAt(0)] !== undefined) {
-                // {r: 10, g: 10, b: 10}
-                for (i = 0; i < space.length; i++) {
-                    values[space][i] = vals[space.charAt(i)];
-                }
-
-                alpha = vals.a;
-            } else if (vals[spaces[space][0]] !== undefined) {
-                // {red: 10, green: 10, blue: 10}
-                var chans = spaces[space];
-
-                for (i = 0; i < space.length; i++) {
-                    values[space][i] = vals[chans[i]];
-                }
-
-                alpha = vals.alpha;
-            }
-
-            values.alpha = Math.max(0, Math.min(1, (alpha === undefined ? values.alpha : alpha)));
-
-            if (space === 'alpha') {
-                return false;
-            }
-
-            var capped;
-
-            // cap values of the space prior converting all values
-            for (i = 0; i < space.length; i++) {
-                capped = Math.max(0, Math.min(maxes[space][i], values[space][i]));
-                values[space][i] = Math.round(capped);
-            }
-
-            // convert to all the other color spaces
-            for (var sname in spaces) {
-                if (sname !== space) {
-                    values[sname] = convert[space][sname](values[space]);
-                }
-            }
-
-            return true;
-        };
-
-        Color.prototype.setSpace = function (space, args) {
-            var vals = args[0];
-
-            if (vals === undefined) {
-                // color.rgb()
-                return this.getValues(space);
-            }
-
-            // color.rgb(10, 10, 10)
-            if (typeof vals === 'number') {
-                vals = Array.prototype.slice.call(args);
-            }
-
-            this.setValues(space, vals);
-            return this;
-        };
-
-        Color.prototype.setChannel = function (space, index, val) {
-            var svalues = this.values[space];
-            if (val === undefined) {
-                // color.red()
-                return svalues[index];
-            } else if (val === svalues[index]) {
-                // color.red(color.red())
-                return this;
-            }
-
-            // color.red(100)
-            svalues[index] = val;
-            this.setValues(space, svalues);
-
-            return this;
-        };
-
-        if (typeof window !== 'undefined') {
-            window.Color = Color;
-        }
-
-        module.exports = Color;
-
-    },{ "2":2,"5":5 }],4:[function(require,module,exports){
-        /* MIT license */
-
-        module.exports = {
-            rgb2hsl: rgb2hsl,
-            rgb2hsv: rgb2hsv,
-            rgb2hwb: rgb2hwb,
-            rgb2cmyk: rgb2cmyk,
-            rgb2keyword: rgb2keyword,
-            rgb2xyz: rgb2xyz,
-            rgb2lab: rgb2lab,
-            rgb2lch: rgb2lch,
-
-            hsl2rgb: hsl2rgb,
-            hsl2hsv: hsl2hsv,
-            hsl2hwb: hsl2hwb,
-            hsl2cmyk: hsl2cmyk,
-            hsl2keyword: hsl2keyword,
-
-            hsv2rgb: hsv2rgb,
-            hsv2hsl: hsv2hsl,
-            hsv2hwb: hsv2hwb,
-            hsv2cmyk: hsv2cmyk,
-            hsv2keyword: hsv2keyword,
-
-            hwb2rgb: hwb2rgb,
-            hwb2hsl: hwb2hsl,
-            hwb2hsv: hwb2hsv,
-            hwb2cmyk: hwb2cmyk,
-            hwb2keyword: hwb2keyword,
-
-            cmyk2rgb: cmyk2rgb,
-            cmyk2hsl: cmyk2hsl,
-            cmyk2hsv: cmyk2hsv,
-            cmyk2hwb: cmyk2hwb,
-            cmyk2keyword: cmyk2keyword,
-
-            keyword2rgb: keyword2rgb,
-            keyword2hsl: keyword2hsl,
-            keyword2hsv: keyword2hsv,
-            keyword2hwb: keyword2hwb,
-            keyword2cmyk: keyword2cmyk,
-            keyword2lab: keyword2lab,
-            keyword2xyz: keyword2xyz,
-
-            xyz2rgb: xyz2rgb,
-            xyz2lab: xyz2lab,
-            xyz2lch: xyz2lch,
-
-            lab2xyz: lab2xyz,
-            lab2rgb: lab2rgb,
-            lab2lch: lab2lch,
-
-            lch2lab: lch2lab,
-            lch2xyz: lch2xyz,
-            lch2rgb: lch2rgb
-        }
-
-
-        function rgb2hsl(rgb) {
-            var r = rgb[0]/255,
-                    g = rgb[1]/255,
-                    b = rgb[2]/255,
-                    min = Math.min(r, g, b),
-                    max = Math.max(r, g, b),
-                    delta = max - min,
-                    h, s, l;
-
-            if (max == min)
-                h = 0;
-            else if (r == max)
-                h = (g - b) / delta;
-            else if (g == max)
-                h = 2 + (b - r) / delta;
-            else if (b == max)
-                h = 4 + (r - g)/ delta;
-
-            h = Math.min(h * 60, 360);
-
-            if (h < 0)
-                h += 360;
-
-            l = (min + max) / 2;
-
-            if (max == min)
-                s = 0;
-            else if (l <= 0.5)
-                s = delta / (max + min);
-            else
-                s = delta / (2 - max - min);
-
-            return [h, s * 100, l * 100];
-        }
-
-        function rgb2hsv(rgb) {
-            var r = rgb[0],
-                    g = rgb[1],
-                    b = rgb[2],
-                    min = Math.min(r, g, b),
-                    max = Math.max(r, g, b),
-                    delta = max - min,
-                    h, s, v;
-
-            if (max == 0)
-                s = 0;
-            else
-                s = (delta/max * 1000)/10;
-
-            if (max == min)
-                h = 0;
-            else if (r == max)
-                h = (g - b) / delta;
-            else if (g == max)
-                h = 2 + (b - r) / delta;
-            else if (b == max)
-                h = 4 + (r - g) / delta;
-
-            h = Math.min(h * 60, 360);
-
-            if (h < 0)
-                h += 360;
-
-            v = ((max / 255) * 1000) / 10;
-
-            return [h, s, v];
-        }
-
-        function rgb2hwb(rgb) {
-            var r = rgb[0],
-                    g = rgb[1],
-                    b = rgb[2],
-                    h = rgb2hsl(rgb)[0],
-                    w = 1/255 * Math.min(r, Math.min(g, b)),
-                    b = 1 - 1/255 * Math.max(r, Math.max(g, b));
-
-            return [h, w * 100, b * 100];
-        }
-
-        function rgb2cmyk(rgb) {
-            var r = rgb[0] / 255,
-                    g = rgb[1] / 255,
-                    b = rgb[2] / 255,
-                    c, m, y, k;
-
-            k = Math.min(1 - r, 1 - g, 1 - b);
-            c = (1 - r - k) / (1 - k) || 0;
-            m = (1 - g - k) / (1 - k) || 0;
-            y = (1 - b - k) / (1 - k) || 0;
-            return [c * 100, m * 100, y * 100, k * 100];
-        }
-
-        function rgb2keyword(rgb) {
-            return reverseKeywords[JSON.stringify(rgb)];
-        }
-
-        function rgb2xyz(rgb) {
-            var r = rgb[0] / 255,
-                    g = rgb[1] / 255,
-                    b = rgb[2] / 255;
-
-            // assume sRGB
-            r = r > 0.04045 ? Math.pow(((r + 0.055) / 1.055), 2.4) : (r / 12.92);
-            g = g > 0.04045 ? Math.pow(((g + 0.055) / 1.055), 2.4) : (g / 12.92);
-            b = b > 0.04045 ? Math.pow(((b + 0.055) / 1.055), 2.4) : (b / 12.92);
-
-            var x = (r * 0.4124) + (g * 0.3576) + (b * 0.1805);
-            var y = (r * 0.2126) + (g * 0.7152) + (b * 0.0722);
-            var z = (r * 0.0193) + (g * 0.1192) + (b * 0.9505);
-
-            return [x * 100, y *100, z * 100];
-        }
-
-        function rgb2lab(rgb) {
-            var xyz = rgb2xyz(rgb),
-                    x = xyz[0],
-                    y = xyz[1],
-                    z = xyz[2],
-                    l, a, b;
-
-            x /= 95.047;
-            y /= 100;
-            z /= 108.883;
-
-            x = x > 0.008856 ? Math.pow(x, 1/3) : (7.787 * x) + (16 / 116);
-            y = y > 0.008856 ? Math.pow(y, 1/3) : (7.787 * y) + (16 / 116);
-            z = z > 0.008856 ? Math.pow(z, 1/3) : (7.787 * z) + (16 / 116);
-
-            l = (116 * y) - 16;
-            a = 500 * (x - y);
-            b = 200 * (y - z);
-
-            return [l, a, b];
-        }
-
-        function rgb2lch(args) {
-            return lab2lch(rgb2lab(args));
-        }
-
-        function hsl2rgb(hsl) {
-            var h = hsl[0] / 360,
-                    s = hsl[1] / 100,
-                    l = hsl[2] / 100,
-                    t1, t2, t3, rgb, val;
-
-            if (s == 0) {
-                val = l * 255;
-                return [val, val, val];
-            }
-
-            if (l < 0.5)
-                t2 = l * (1 + s);
-            else
-                t2 = l + s - l * s;
-            t1 = 2 * l - t2;
-
-            rgb = [0, 0, 0];
-            for (var i = 0; i < 3; i++) {
-                t3 = h + 1 / 3 * - (i - 1);
-                t3 < 0 && t3++;
-                t3 > 1 && t3--;
-
-                if (6 * t3 < 1)
-                    val = t1 + (t2 - t1) * 6 * t3;
-                else if (2 * t3 < 1)
-                    val = t2;
-                else if (3 * t3 < 2)
-                    val = t1 + (t2 - t1) * (2 / 3 - t3) * 6;
-                else
-                    val = t1;
-
-                rgb[i] = val * 255;
-            }
-
-            return rgb;
-        }
-
-        function hsl2hsv(hsl) {
-            var h = hsl[0],
-                    s = hsl[1] / 100,
-                    l = hsl[2] / 100,
-                    sv, v;
-
-            if(l === 0) {
-                // no need to do calc on black
-                // also avoids divide by 0 error
-                return [0, 0, 0];
-            }
-
-            l *= 2;
-            s *= (l <= 1) ? l : 2 - l;
-            v = (l + s) / 2;
-            sv = (2 * s) / (l + s);
-            return [h, sv * 100, v * 100];
-        }
-
-        function hsl2hwb(args) {
-            return rgb2hwb(hsl2rgb(args));
-        }
-
-        function hsl2cmyk(args) {
-            return rgb2cmyk(hsl2rgb(args));
-        }
-
-        function hsl2keyword(args) {
-            return rgb2keyword(hsl2rgb(args));
-        }
-
-
-        function hsv2rgb(hsv) {
-            var h = hsv[0] / 60,
-                    s = hsv[1] / 100,
-                    v = hsv[2] / 100,
-                    hi = Math.floor(h) % 6;
-
-            var f = h - Math.floor(h),
-                    p = 255 * v * (1 - s),
-                    q = 255 * v * (1 - (s * f)),
-                    t = 255 * v * (1 - (s * (1 - f))),
-                    v = 255 * v;
-
-            switch(hi) {
-                case 0:
-                    return [v, t, p];
-                case 1:
-                    return [q, v, p];
-                case 2:
-                    return [p, v, t];
-                case 3:
-                    return [p, q, v];
-                case 4:
-                    return [t, p, v];
-                case 5:
-                    return [v, p, q];
-            }
-        }
-
-        function hsv2hsl(hsv) {
-            var h = hsv[0],
-                    s = hsv[1] / 100,
-                    v = hsv[2] / 100,
-                    sl, l;
-
-            l = (2 - s) * v;
-            sl = s * v;
-            sl /= (l <= 1) ? l : 2 - l;
-            sl = sl || 0;
-            l /= 2;
-            return [h, sl * 100, l * 100];
-        }
-
-        function hsv2hwb(args) {
-            return rgb2hwb(hsv2rgb(args))
-        }
-
-        function hsv2cmyk(args) {
-            return rgb2cmyk(hsv2rgb(args));
-        }
-
-        function hsv2keyword(args) {
-            return rgb2keyword(hsv2rgb(args));
-        }
-
-// http://dev.w3.org/csswg/css-color/#hwb-to-rgb
-        function hwb2rgb(hwb) {
-            var h = hwb[0] / 360,
-                    wh = hwb[1] / 100,
-                    bl = hwb[2] / 100,
-                    ratio = wh + bl,
-                    i, v, f, n;
-
-            // wh + bl cant be > 1
-            if (ratio > 1) {
-                wh /= ratio;
-                bl /= ratio;
-            }
-
-            i = Math.floor(6 * h);
-            v = 1 - bl;
-            f = 6 * h - i;
-            if ((i & 0x01) != 0) {
-                f = 1 - f;
-            }
-            n = wh + f * (v - wh);  // linear interpolation
-
-            switch (i) {
-                default:
-                case 6:
-                case 0: r = v; g = n; b = wh; break;
-                case 1: r = n; g = v; b = wh; break;
-                case 2: r = wh; g = v; b = n; break;
-                case 3: r = wh; g = n; b = v; break;
-                case 4: r = n; g = wh; b = v; break;
-                case 5: r = v; g = wh; b = n; break;
-            }
-
-            return [r * 255, g * 255, b * 255];
-        }
-
-        function hwb2hsl(args) {
-            return rgb2hsl(hwb2rgb(args));
-        }
-
-        function hwb2hsv(args) {
-            return rgb2hsv(hwb2rgb(args));
-        }
-
-        function hwb2cmyk(args) {
-            return rgb2cmyk(hwb2rgb(args));
-        }
-
-        function hwb2keyword(args) {
-            return rgb2keyword(hwb2rgb(args));
-        }
-
-        function cmyk2rgb(cmyk) {
-            var c = cmyk[0] / 100,
-                    m = cmyk[1] / 100,
-                    y = cmyk[2] / 100,
-                    k = cmyk[3] / 100,
-                    r, g, b;
-
-            r = 1 - Math.min(1, c * (1 - k) + k);
-            g = 1 - Math.min(1, m * (1 - k) + k);
-            b = 1 - Math.min(1, y * (1 - k) + k);
-            return [r * 255, g * 255, b * 255];
-        }
-
-        function cmyk2hsl(args) {
-            return rgb2hsl(cmyk2rgb(args));
-        }
-
-        function cmyk2hsv(args) {
-            return rgb2hsv(cmyk2rgb(args));
-        }
-
-        function cmyk2hwb(args) {
-            return rgb2hwb(cmyk2rgb(args));
-        }
-
-        function cmyk2keyword(args) {
-            return rgb2keyword(cmyk2rgb(args));
-        }
-
-
-        function xyz2rgb(xyz) {
-            var x = xyz[0] / 100,
-                    y = xyz[1] / 100,
-                    z = xyz[2] / 100,
-                    r, g, b;
-
-            r = (x * 3.2406) + (y * -1.5372) + (z * -0.4986);
-            g = (x * -0.9689) + (y * 1.8758) + (z * 0.0415);
-            b = (x * 0.0557) + (y * -0.2040) + (z * 1.0570);
-
-            // assume sRGB
-            r = r > 0.0031308 ? ((1.055 * Math.pow(r, 1.0 / 2.4)) - 0.055)
-                    : r = (r * 12.92);
-
-            g = g > 0.0031308 ? ((1.055 * Math.pow(g, 1.0 / 2.4)) - 0.055)
-                    : g = (g * 12.92);
-
-            b = b > 0.0031308 ? ((1.055 * Math.pow(b, 1.0 / 2.4)) - 0.055)
-                    : b = (b * 12.92);
-
-            r = Math.min(Math.max(0, r), 1);
-            g = Math.min(Math.max(0, g), 1);
-            b = Math.min(Math.max(0, b), 1);
-
-            return [r * 255, g * 255, b * 255];
-        }
-
-        function xyz2lab(xyz) {
-            var x = xyz[0],
-                    y = xyz[1],
-                    z = xyz[2],
-                    l, a, b;
-
-            x /= 95.047;
-            y /= 100;
-            z /= 108.883;
-
-            x = x > 0.008856 ? Math.pow(x, 1/3) : (7.787 * x) + (16 / 116);
-            y = y > 0.008856 ? Math.pow(y, 1/3) : (7.787 * y) + (16 / 116);
-            z = z > 0.008856 ? Math.pow(z, 1/3) : (7.787 * z) + (16 / 116);
-
-            l = (116 * y) - 16;
-            a = 500 * (x - y);
-            b = 200 * (y - z);
-
-            return [l, a, b];
-        }
-
-        function xyz2lch(args) {
-            return lab2lch(xyz2lab(args));
-        }
-
-        function lab2xyz(lab) {
-            var l = lab[0],
-                    a = lab[1],
-                    b = lab[2],
-                    x, y, z, y2;
-
-            if (l <= 8) {
-                y = (l * 100) / 903.3;
-                y2 = (7.787 * (y / 100)) + (16 / 116);
-            } else {
-                y = 100 * Math.pow((l + 16) / 116, 3);
-                y2 = Math.pow(y / 100, 1/3);
-            }
-
-            x = x / 95.047 <= 0.008856 ? x = (95.047 * ((a / 500) + y2 - (16 / 116))) / 7.787 : 95.047 * Math.pow((a / 500) + y2, 3);
-
-            z = z / 108.883 <= 0.008859 ? z = (108.883 * (y2 - (b / 200) - (16 / 116))) / 7.787 : 108.883 * Math.pow(y2 - (b / 200), 3);
-
-            return [x, y, z];
-        }
-
-        function lab2lch(lab) {
-            var l = lab[0],
-                    a = lab[1],
-                    b = lab[2],
-                    hr, h, c;
-
-            hr = Math.atan2(b, a);
-            h = hr * 360 / 2 / Math.PI;
-            if (h < 0) {
-                h += 360;
-            }
-            c = Math.sqrt(a * a + b * b);
-            return [l, c, h];
-        }
-
-        function lab2rgb(args) {
-            return xyz2rgb(lab2xyz(args));
-        }
-
-        function lch2lab(lch) {
-            var l = lch[0],
-                    c = lch[1],
-                    h = lch[2],
-                    a, b, hr;
-
-            hr = h / 360 * 2 * Math.PI;
-            a = c * Math.cos(hr);
-            b = c * Math.sin(hr);
-            return [l, a, b];
-        }
-
-        function lch2xyz(args) {
-            return lab2xyz(lch2lab(args));
-        }
-
-        function lch2rgb(args) {
-            return lab2rgb(lch2lab(args));
-        }
-
-        function keyword2rgb(keyword) {
-            return cssKeywords[keyword];
-        }
-
-        function keyword2hsl(args) {
-            return rgb2hsl(keyword2rgb(args));
-        }
-
-        function keyword2hsv(args) {
-            return rgb2hsv(keyword2rgb(args));
-        }
-
-        function keyword2hwb(args) {
-            return rgb2hwb(keyword2rgb(args));
-        }
-
-        function keyword2cmyk(args) {
-            return rgb2cmyk(keyword2rgb(args));
-        }
-
-        function keyword2lab(args) {
-            return rgb2lab(keyword2rgb(args));
-        }
-
-        function keyword2xyz(args) {
-            return rgb2xyz(keyword2rgb(args));
-        }
-
-        var cssKeywords = {
-            aliceblue:  [240,248,255],
-            antiquewhite: [250,235,215],
-            aqua: [0,255,255],
-            aquamarine: [127,255,212],
-            azure:  [240,255,255],
-            beige:  [245,245,220],
-            bisque: [255,228,196],
-            black:  [0,0,0],
-            blanchedalmond: [255,235,205],
-            blue: [0,0,255],
-            blueviolet: [138,43,226],
-            brown:  [165,42,42],
-            burlywood:  [222,184,135],
-            cadetblue:  [95,158,160],
-            chartreuse: [127,255,0],
-            chocolate:  [210,105,30],
-            coral:  [255,127,80],
-            cornflowerblue: [100,149,237],
-            cornsilk: [255,248,220],
-            crimson:  [220,20,60],
-            cyan: [0,255,255],
-            darkblue: [0,0,139],
-            darkcyan: [0,139,139],
-            darkgoldenrod:  [184,134,11],
-            darkgray: [169,169,169],
-            darkgreen:  [0,100,0],
-            darkgrey: [169,169,169],
-            darkkhaki:  [189,183,107],
-            darkmagenta:  [139,0,139],
-            darkolivegreen: [85,107,47],
-            darkorange: [255,140,0],
-            darkorchid: [153,50,204],
-            darkred:  [139,0,0],
-            darksalmon: [233,150,122],
-            darkseagreen: [143,188,143],
-            darkslateblue:  [72,61,139],
-            darkslategray:  [47,79,79],
-            darkslategrey:  [47,79,79],
-            darkturquoise:  [0,206,209],
-            darkviolet: [148,0,211],
-            deeppink: [255,20,147],
-            deepskyblue:  [0,191,255],
-            dimgray:  [105,105,105],
-            dimgrey:  [105,105,105],
-            dodgerblue: [30,144,255],
-            firebrick:  [178,34,34],
-            floralwhite:  [255,250,240],
-            forestgreen:  [34,139,34],
-            fuchsia:  [255,0,255],
-            gainsboro:  [220,220,220],
-            ghostwhite: [248,248,255],
-            gold: [255,215,0],
-            goldenrod:  [218,165,32],
-            gray: [128,128,128],
-            green:  [0,128,0],
-            greenyellow:  [173,255,47],
-            grey: [128,128,128],
-            honeydew: [240,255,240],
-            hotpink:  [255,105,180],
-            indianred:  [205,92,92],
-            indigo: [75,0,130],
-            ivory:  [255,255,240],
-            khaki:  [240,230,140],
-            lavender: [230,230,250],
-            lavenderblush:  [255,240,245],
-            lawngreen:  [124,252,0],
-            lemonchiffon: [255,250,205],
-            lightblue:  [173,216,230],
-            lightcoral: [240,128,128],
-            lightcyan:  [224,255,255],
-            lightgoldenrodyellow: [250,250,210],
-            lightgray:  [211,211,211],
-            lightgreen: [144,238,144],
-            lightgrey:  [211,211,211],
-            lightpink:  [255,182,193],
-            lightsalmon:  [255,160,122],
-            lightseagreen:  [32,178,170],
-            lightskyblue: [135,206,250],
-            lightslategray: [119,136,153],
-            lightslategrey: [119,136,153],
-            lightsteelblue: [176,196,222],
-            lightyellow:  [255,255,224],
-            lime: [0,255,0],
-            limegreen:  [50,205,50],
-            linen:  [250,240,230],
-            magenta:  [255,0,255],
-            maroon: [128,0,0],
-            mediumaquamarine: [102,205,170],
-            mediumblue: [0,0,205],
-            mediumorchid: [186,85,211],
-            mediumpurple: [147,112,219],
-            mediumseagreen: [60,179,113],
-            mediumslateblue:  [123,104,238],
-            mediumspringgreen:  [0,250,154],
-            mediumturquoise:  [72,209,204],
-            mediumvioletred:  [199,21,133],
-            midnightblue: [25,25,112],
-            mintcream:  [245,255,250],
-            mistyrose:  [255,228,225],
-            moccasin: [255,228,181],
-            navajowhite:  [255,222,173],
-            navy: [0,0,128],
-            oldlace:  [253,245,230],
-            olive:  [128,128,0],
-            olivedrab:  [107,142,35],
-            orange: [255,165,0],
-            orangered:  [255,69,0],
-            orchid: [218,112,214],
-            palegoldenrod:  [238,232,170],
-            palegreen:  [152,251,152],
-            paleturquoise:  [175,238,238],
-            palevioletred:  [219,112,147],
-            papayawhip: [255,239,213],
-            peachpuff:  [255,218,185],
-            peru: [205,133,63],
-            pink: [255,192,203],
-            plum: [221,160,221],
-            powderblue: [176,224,230],
-            purple: [128,0,128],
-            rebeccapurple: [102, 51, 153],
-            red:  [255,0,0],
-            rosybrown:  [188,143,143],
-            royalblue:  [65,105,225],
-            saddlebrown:  [139,69,19],
-            salmon: [250,128,114],
-            sandybrown: [244,164,96],
-            seagreen: [46,139,87],
-            seashell: [255,245,238],
-            sienna: [160,82,45],
-            silver: [192,192,192],
-            skyblue:  [135,206,235],
-            slateblue:  [106,90,205],
-            slategray:  [112,128,144],
-            slategrey:  [112,128,144],
-            snow: [255,250,250],
-            springgreen:  [0,255,127],
-            steelblue:  [70,130,180],
-            tan:  [210,180,140],
-            teal: [0,128,128],
-            thistle:  [216,191,216],
-            tomato: [255,99,71],
-            turquoise:  [64,224,208],
-            violet: [238,130,238],
-            wheat:  [245,222,179],
-            white:  [255,255,255],
-            whitesmoke: [245,245,245],
-            yellow: [255,255,0],
-            yellowgreen:  [154,205,50]
-        };
-
-        var reverseKeywords = {};
-        for (var key in cssKeywords) {
-            reverseKeywords[JSON.stringify(cssKeywords[key])] = key;
-        }
-
-    },{}],5:[function(require,module,exports){
-        var conversions = require(4);
-
-        var convert = function() {
-            return new Converter();
-        }
-
-        for (var func in conversions) {
-            // export Raw versions
-            convert[func + "Raw"] =  (function(func) {
-                // accept array or plain args
-                return function(arg) {
-                    if (typeof arg == "number")
-                        arg = Array.prototype.slice.call(arguments);
-                    return conversions[func](arg);
-                }
-            })(func);
-
-            var pair = /(\w+)2(\w+)/.exec(func),
-                    from = pair[1],
-                    to = pair[2];
-
-            // export rgb2hsl and ["rgb"]["hsl"]
-            convert[from] = convert[from] || {};
-
-            convert[from][to] = convert[func] = (function(func) {
-                return function(arg) {
-                    if (typeof arg == "number")
-                        arg = Array.prototype.slice.call(arguments);
-
-                    var val = conversions[func](arg);
-                    if (typeof val == "string" || val === undefined)
-                        return val; // keyword
-
-                    for (var i = 0; i < val.length; i++)
-                        val[i] = Math.round(val[i]);
-                    return val;
-                }
-            })(func);
-        }
-
-
-        /* Converter does lazy conversion and caching */
-        var Converter = function() {
-            this.convs = {};
-        };
-
-        /* Either get the values for a space or
-  set the values for a space, depending on args */
-        Converter.prototype.routeSpace = function(space, args) {
-            var values = args[0];
-            if (values === undefined) {
-                // color.rgb()
-                return this.getValues(space);
-            }
-            // color.rgb(10, 10, 10)
-            if (typeof values == "number") {
-                values = Array.prototype.slice.call(args);
-            }
-
-            return this.setValues(space, values);
-        };
-
-        /* Set the values for a space, invalidating cache */
-        Converter.prototype.setValues = function(space, values) {
-            this.space = space;
-            this.convs = {};
-            this.convs[space] = values;
-            return this;
-        };
-
-        /* Get the values for a space. If there's already
-  a conversion for the space, fetch it, otherwise
-  compute it */
-        Converter.prototype.getValues = function(space) {
-            var vals = this.convs[space];
-            if (!vals) {
-                var fspace = this.space,
-                        from = this.convs[fspace];
-                vals = convert[fspace][space](from);
-
-                this.convs[space] = vals;
-            }
-            return vals;
-        };
-
-        ["rgb", "hsl", "hsv", "cmyk", "keyword"].forEach(function(space) {
-            Converter.prototype[space] = function(vals) {
-                return this.routeSpace(space, arguments);
-            }
-        });
-
-        module.exports = convert;
-    },{ "4":4 }],6:[function(require,module,exports){
-        'use strict'
-
-        module.exports = {
-            "aliceblue": [240, 248, 255],
-            "antiquewhite": [250, 235, 215],
-            "aqua": [0, 255, 255],
-            "aquamarine": [127, 255, 212],
-            "azure": [240, 255, 255],
-            "beige": [245, 245, 220],
-            "bisque": [255, 228, 196],
-            "black": [0, 0, 0],
-            "blanchedalmond": [255, 235, 205],
-            "blue": [0, 0, 255],
-            "blueviolet": [138, 43, 226],
-            "brown": [165, 42, 42],
-            "burlywood": [222, 184, 135],
-            "cadetblue": [95, 158, 160],
-            "chartreuse": [127, 255, 0],
-            "chocolate": [210, 105, 30],
-            "coral": [255, 127, 80],
-            "cornflowerblue": [100, 149, 237],
-            "cornsilk": [255, 248, 220],
-            "crimson": [220, 20, 60],
-            "cyan": [0, 255, 255],
-            "darkblue": [0, 0, 139],
-            "darkcyan": [0, 139, 139],
-            "darkgoldenrod": [184, 134, 11],
-            "darkgray": [169, 169, 169],
-            "darkgreen": [0, 100, 0],
-            "darkgrey": [169, 169, 169],
-            "darkkhaki": [189, 183, 107],
-            "darkmagenta": [139, 0, 139],
-            "darkolivegreen": [85, 107, 47],
-            "darkorange": [255, 140, 0],
-            "darkorchid": [153, 50, 204],
-            "darkred": [139, 0, 0],
-            "darksalmon": [233, 150, 122],
-            "darkseagreen": [143, 188, 143],
-            "darkslateblue": [72, 61, 139],
-            "darkslategray": [47, 79, 79],
-            "darkslategrey": [47, 79, 79],
-            "darkturquoise": [0, 206, 209],
-            "darkviolet": [148, 0, 211],
-            "deeppink": [255, 20, 147],
-            "deepskyblue": [0, 191, 255],
-            "dimgray": [105, 105, 105],
-            "dimgrey": [105, 105, 105],
-            "dodgerblue": [30, 144, 255],
-            "firebrick": [178, 34, 34],
-            "floralwhite": [255, 250, 240],
-            "forestgreen": [34, 139, 34],
-            "fuchsia": [255, 0, 255],
-            "gainsboro": [220, 220, 220],
-            "ghostwhite": [248, 248, 255],
-            "gold": [255, 215, 0],
-            "goldenrod": [218, 165, 32],
-            "gray": [128, 128, 128],
-            "green": [0, 128, 0],
-            "greenyellow": [173, 255, 47],
-            "grey": [128, 128, 128],
-            "honeydew": [240, 255, 240],
-            "hotpink": [255, 105, 180],
-            "indianred": [205, 92, 92],
-            "indigo": [75, 0, 130],
-            "ivory": [255, 255, 240],
-            "khaki": [240, 230, 140],
-            "lavender": [230, 230, 250],
-            "lavenderblush": [255, 240, 245],
-            "lawngreen": [124, 252, 0],
-            "lemonchiffon": [255, 250, 205],
-            "lightblue": [173, 216, 230],
-            "lightcoral": [240, 128, 128],
-            "lightcyan": [224, 255, 255],
-            "lightgoldenrodyellow": [250, 250, 210],
-            "lightgray": [211, 211, 211],
-            "lightgreen": [144, 238, 144],
-            "lightgrey": [211, 211, 211],
-            "lightpink": [255, 182, 193],
-            "lightsalmon": [255, 160, 122],
-            "lightseagreen": [32, 178, 170],
-            "lightskyblue": [135, 206, 250],
-            "lightslategray": [119, 136, 153],
-            "lightslategrey": [119, 136, 153],
-            "lightsteelblue": [176, 196, 222],
-            "lightyellow": [255, 255, 224],
-            "lime": [0, 255, 0],
-            "limegreen": [50, 205, 50],
-            "linen": [250, 240, 230],
-            "magenta": [255, 0, 255],
-            "maroon": [128, 0, 0],
-            "mediumaquamarine": [102, 205, 170],
-            "mediumblue": [0, 0, 205],
-            "mediumorchid": [186, 85, 211],
-            "mediumpurple": [147, 112, 219],
-            "mediumseagreen": [60, 179, 113],
-            "mediumslateblue": [123, 104, 238],
-            "mediumspringgreen": [0, 250, 154],
-            "mediumturquoise": [72, 209, 204],
-            "mediumvioletred": [199, 21, 133],
-            "midnightblue": [25, 25, 112],
-            "mintcream": [245, 255, 250],
-            "mistyrose": [255, 228, 225],
-            "moccasin": [255, 228, 181],
-            "navajowhite": [255, 222, 173],
-            "navy": [0, 0, 128],
-            "oldlace": [253, 245, 230],
-            "olive": [128, 128, 0],
-            "olivedrab": [107, 142, 35],
-            "orange": [255, 165, 0],
-            "orangered": [255, 69, 0],
-            "orchid": [218, 112, 214],
-            "palegoldenrod": [238, 232, 170],
-            "palegreen": [152, 251, 152],
-            "paleturquoise": [175, 238, 238],
-            "palevioletred": [219, 112, 147],
-            "papayawhip": [255, 239, 213],
-            "peachpuff": [255, 218, 185],
-            "peru": [205, 133, 63],
-            "pink": [255, 192, 203],
-            "plum": [221, 160, 221],
-            "powderblue": [176, 224, 230],
-            "purple": [128, 0, 128],
-            "rebeccapurple": [102, 51, 153],
-            "red": [255, 0, 0],
-            "rosybrown": [188, 143, 143],
-            "royalblue": [65, 105, 225],
-            "saddlebrown": [139, 69, 19],
-            "salmon": [250, 128, 114],
-            "sandybrown": [244, 164, 96],
-            "seagreen": [46, 139, 87],
-            "seashell": [255, 245, 238],
-            "sienna": [160, 82, 45],
-            "silver": [192, 192, 192],
-            "skyblue": [135, 206, 235],
-            "slateblue": [106, 90, 205],
-            "slategray": [112, 128, 144],
-            "slategrey": [112, 128, 144],
-            "snow": [255, 250, 250],
-            "springgreen": [0, 255, 127],
-            "steelblue": [70, 130, 180],
-            "tan": [210, 180, 140],
-            "teal": [0, 128, 128],
-            "thistle": [216, 191, 216],
-            "tomato": [255, 99, 71],
-            "turquoise": [64, 224, 208],
-            "violet": [238, 130, 238],
-            "wheat": [245, 222, 179],
-            "white": [255, 255, 255],
-            "whitesmoke": [245, 245, 245],
-            "yellow": [255, 255, 0],
-            "yellowgreen": [154, 205, 50]
-        };
-
-    },{}],7:[function(require,module,exports){
-        /**
-         * @namespace Chart
-         */
-        var Chart = require(29)();
-
-        Chart.helpers = require(45);
-
-// @todo dispatch these helpers into appropriated helpers/helpers.* file and write unit tests!
-        require(27)(Chart);
-
-        Chart.defaults = require(25);
-        Chart.Element = require(26);
-        Chart.elements = require(40);
-        Chart.Interaction = require(28);
-        Chart.platform = require(48);
-
-        require(31)(Chart);
-        require(22)(Chart);
-        require(23)(Chart);
-        require(24)(Chart);
-        require(30)(Chart);
-        require(33)(Chart);
-        require(32)(Chart);
-        require(35)(Chart);
-
-        require(54)(Chart);
-        require(52)(Chart);
-        require(53)(Chart);
-        require(55)(Chart);
-        require(56)(Chart);
-        require(57)(Chart);
-
-// Controllers must be loaded after elements
-// See Chart.core.datasetController.dataElementType
-        require(15)(Chart);
-        require(16)(Chart);
-        require(17)(Chart);
-        require(18)(Chart);
-        require(19)(Chart);
-        require(20)(Chart);
-        require(21)(Chart);
-
-        require(8)(Chart);
-        require(9)(Chart);
-        require(10)(Chart);
-        require(11)(Chart);
-        require(12)(Chart);
-        require(13)(Chart);
-        require(14)(Chart);
-
-// Loading built-it plugins
-        var plugins = [];
-
-        plugins.push(
-                require(49)(Chart),
-                require(50)(Chart),
-                require(51)(Chart)
-        );
-
-        Chart.plugins.register(plugins);
-
-        Chart.platform.initialize();
-
-        module.exports = Chart;
-        if (typeof window !== 'undefined') {
-            window.Chart = Chart;
-        }
-
-// DEPRECATIONS
-
-        /**
-         * Provided for backward compatibility, use Chart.helpers.canvas instead.
-         * @namespace Chart.canvasHelpers
-         * @deprecated since version 2.6.0
-         * @todo remove at version 3
-         * @private
-         */
-        Chart.canvasHelpers = Chart.helpers.canvas;
-
-    },{ "10":10,"11":11,"12":12,"13":13,"14":14,"15":15,"16":16,"17":17,"18":18,"19":19,"20":20,"21":21,"22":22,"23":23,"24":24,"25":25,"26":26,"27":27,"28":28,"29":29,"30":30,"31":31,"32":32,"33":33,"35":35,"40":40,"45":45,"48":48,"49":49,"50":50,"51":51,"52":52,"53":53,"54":54,"55":55,"56":56,"57":57,"8":8,"9":9 }],8:[function(require,module,exports){
-        'use strict';
-
-        module.exports = function(Chart) {
-
-            Chart.Bar = function(context, config) {
-                config.type = 'bar';
-
-                return new Chart(context, config);
-            };
-
-        };
-
-    },{}],9:[function(require,module,exports){
-        'use strict';
-
-        module.exports = function(Chart) {
-
-            Chart.Bubble = function(context, config) {
-                config.type = 'bubble';
-                return new Chart(context, config);
-            };
-
-        };
-
-    },{}],10:[function(require,module,exports){
-        'use strict';
-
-        module.exports = function(Chart) {
-
-            Chart.Doughnut = function(context, config) {
-                config.type = 'doughnut';
-
-                return new Chart(context, config);
-            };
-
-        };
-
-    },{}],11:[function(require,module,exports){
-        'use strict';
-
-        module.exports = function(Chart) {
-
-            Chart.Line = function(context, config) {
-                config.type = 'line';
-
-                return new Chart(context, config);
-            };
-
-        };
-
-    },{}],12:[function(require,module,exports){
-        'use strict';
-
-        module.exports = function(Chart) {
-
-            Chart.PolarArea = function(context, config) {
-                config.type = 'polarArea';
-
-                return new Chart(context, config);
-            };
-
-        };
-
-    },{}],13:[function(require,module,exports){
-        'use strict';
-
-        module.exports = function(Chart) {
-
-            Chart.Radar = function(context, config) {
-                config.type = 'radar';
-
-                return new Chart(context, config);
-            };
-
-        };
-
-    },{}],14:[function(require,module,exports){
-        'use strict';
-
-        module.exports = function(Chart) {
-            Chart.Scatter = function(context, config) {
-                config.type = 'scatter';
-                return new Chart(context, config);
-            };
-        };
-
-    },{}],15:[function(require,module,exports){
-        'use strict';
-
-        var defaults = require(25);
-        var elements = require(40);
-        var helpers = require(45);
-
-        defaults._set('bar', {
-            hover: {
-                mode: 'label'
-            },
-
-            scales: {
-                xAxes: [{
-                    type: 'category',
-
-                    // Specific to Bar Controller
-                    categoryPercentage: 0.8,
-                    barPercentage: 0.9,
-
-                    // offset settings
-                    offset: true,
-
-                    // grid line settings
-                    gridLines: {
-                        offsetGridLines: true
-                    }
-                }],
-
-                yAxes: [{
-                    type: 'linear'
-                }]
-            }
-        });
-
-        defaults._set('horizontalBar', {
-            hover: {
-                mode: 'index',
-                axis: 'y'
-            },
-
-            scales: {
-                xAxes: [{
-                    type: 'linear',
-                    position: 'bottom'
-                }],
-
-                yAxes: [{
-                    position: 'left',
-                    type: 'category',
-
-                    // Specific to Horizontal Bar Controller
-                    categoryPercentage: 0.8,
-                    barPercentage: 0.9,
-
-                    // offset settings
-                    offset: true,
-
-                    // grid line settings
-                    gridLines: {
-                        offsetGridLines: true
-                    }
-                }]
-            },
-
-            elements: {
-                rectangle: {
-                    borderSkipped: 'left'
-                }
-            },
-
-            tooltips: {
-                callbacks: {
-                    title: function(item, data) {
-                        // Pick first xLabel for now
-                        var title = '';
-
-                        if (item.length > 0) {
-                            if (item[0].yLabel) {
-                                title = item[0].yLabel;
-                            } else if (data.labels.length > 0 && item[0].index < data.labels.length) {
-                                title = data.labels[item[0].index];
-                            }
-                        }
-
-                        return title;
-                    },
-
-                    label: function(item, data) {
-                        var datasetLabel = data.datasets[item.datasetIndex].label || '';
-                        return datasetLabel + ': ' + item.xLabel;
-                    }
-                },
-                mode: 'index',
-                axis: 'y'
-            }
-        });
-
-        module.exports = function(Chart) {
-
-            Chart.controllers.bar = Chart.DatasetController.extend({
-
-                dataElementType: elements.Rectangle,
-
-                initialize: function() {
-                    var me = this;
-                    var meta;
-
-                    Chart.DatasetController.prototype.initialize.apply(me, arguments);
-
-                    meta = me.getMeta();
-                    meta.stack = me.getDataset().stack;
-                    meta.bar = true;
-                },
-
-                update: function(reset) {
-                    var me = this;
-                    var rects = me.getMeta().data;
-                    var i, ilen;
-
-                    me._ruler = me.getRuler();
-
-                    for (i = 0, ilen = rects.length; i < ilen; ++i) {
-                        me.updateElement(rects[i], i, reset);
-                    }
-                },
-
-                updateElement: function(rectangle, index, reset) {
-                    var me = this;
-                    var chart = me.chart;
-                    var meta = me.getMeta();
-                    var dataset = me.getDataset();
-                    var custom = rectangle.custom || {};
-                    var rectangleOptions = chart.options.elements.rectangle;
-
-                    rectangle._xScale = me.getScaleForId(meta.xAxisID);
-                    rectangle._yScale = me.getScaleForId(meta.yAxisID);
-                    rectangle._datasetIndex = me.index;
-                    rectangle._index = index;
-
-                    rectangle._model = {
-                        datasetLabel: dataset.label,
-                        label: chart.data.labels[index],
-                        borderSkipped: custom.borderSkipped ? custom.borderSkipped : rectangleOptions.borderSkipped,
-                        backgroundColor: custom.backgroundColor ? custom.backgroundColor : helpers.valueAtIndexOrDefault(dataset.backgroundColor, index, rectangleOptions.backgroundColor),
-                        borderColor: custom.borderColor ? custom.borderColor : helpers.valueAtIndexOrDefault(dataset.borderColor, index, rectangleOptions.borderColor),
-                        borderWidth: custom.borderWidth ? custom.borderWidth : helpers.valueAtIndexOrDefault(dataset.borderWidth, index, rectangleOptions.borderWidth)
-                    };
-
-                    me.updateElementGeometry(rectangle, index, reset);
-
-                    rectangle.pivot();
-                },
-
-                /**
-                 * @private
-                 */
-                updateElementGeometry: function(rectangle, index, reset) {
-                    var me = this;
-                    var model = rectangle._model;
-                    var vscale = me.getValueScale();
-                    var base = vscale.getBasePixel();
-                    var horizontal = vscale.isHorizontal();
-                    var ruler = me._ruler || me.getRuler();
-                    var vpixels = me.calculateBarValuePixels(me.index, index);
-                    var ipixels = me.calculateBarIndexPixels(me.index, index, ruler);
-
-                    model.horizontal = horizontal;
-                    model.base = reset ? base : vpixels.base;
-                    model.x = horizontal ? reset ? base : vpixels.head : ipixels.center;
-                    model.y = horizontal ? ipixels.center : reset ? base : vpixels.head;
-                    model.height = horizontal ? ipixels.size : undefined;
-                    model.width = horizontal ? undefined : ipixels.size;
-                },
-
-                /**
-                 * @private
-                 */
-                getValueScaleId: function() {
-                    return this.getMeta().yAxisID;
-                },
-
-                /**
-                 * @private
-                 */
-                getIndexScaleId: function() {
-                    return this.getMeta().xAxisID;
-                },
-
-                /**
-                 * @private
-                 */
-                getValueScale: function() {
-                    return this.getScaleForId(this.getValueScaleId());
-                },
-
-                /**
-                 * @private
-                 */
-                getIndexScale: function() {
-                    return this.getScaleForId(this.getIndexScaleId());
-                },
-
-                /**
-                 * Returns the effective number of stacks based on groups and bar visibility.
-                 * @private
-                 */
-                getStackCount: function(last) {
-                    var me = this;
-                    var chart = me.chart;
-                    var scale = me.getIndexScale();
-                    var stacked = scale.options.stacked;
-                    var ilen = last === undefined ? chart.data.datasets.length : last + 1;
-                    var stacks = [];
-                    var i, meta;
-
-                    for (i = 0; i < ilen; ++i) {
-                        meta = chart.getDatasetMeta(i);
-                        if (meta.bar && chart.isDatasetVisible(i) &&
-                                (stacked === false ||
-                                        (stacked === true && stacks.indexOf(meta.stack) === -1) ||
-                                        (stacked === undefined && (meta.stack === undefined || stacks.indexOf(meta.stack) === -1)))) {
-                            stacks.push(meta.stack);
-                        }
-                    }
-
-                    return stacks.length;
-                },
-
-                /**
-                 * Returns the stack index for the given dataset based on groups and bar visibility.
-                 * @private
-                 */
-                getStackIndex: function(datasetIndex) {
-                    return this.getStackCount(datasetIndex) - 1;
-                },
-
-                /**
-                 * @private
-                 */
-                getRuler: function() {
-                    var me = this;
-                    var scale = me.getIndexScale();
-                    var stackCount = me.getStackCount();
-                    var datasetIndex = me.index;
-                    var pixels = [];
-                    var isHorizontal = scale.isHorizontal();
-                    var start = isHorizontal ? scale.left : scale.top;
-                    var end = start + (isHorizontal ? scale.width : scale.height);
-                    var i, ilen;
-
-                    for (i = 0, ilen = me.getMeta().data.length; i < ilen; ++i) {
-                        pixels.push(scale.getPixelForValue(null, i, datasetIndex));
-                    }
-
-                    return {
-                        pixels: pixels,
-                        start: start,
-                        end: end,
-                        stackCount: stackCount,
-                        scale: scale
-                    };
-                },
-
-                /**
-                 * Note: pixel values are not clamped to the scale area.
-                 * @private
-                 */
-                calculateBarValuePixels: function(datasetIndex, index) {
-                    var me = this;
-                    var chart = me.chart;
-                    var meta = me.getMeta();
-                    var scale = me.getValueScale();
-                    var datasets = chart.data.datasets;
-                    var value = scale.getRightValue(datasets[datasetIndex].data[index]);
-                    var stacked = scale.options.stacked;
-                    var stack = meta.stack;
-                    var start = 0;
-                    var i, imeta, ivalue, base, head, size;
-
-                    if (stacked || (stacked === undefined && stack !== undefined)) {
-                        for (i = 0; i < datasetIndex; ++i) {
-                            imeta = chart.getDatasetMeta(i);
-
-                            if (imeta.bar &&
-                                    imeta.stack === stack &&
-                                    imeta.controller.getValueScaleId() === scale.id &&
-                                    chart.isDatasetVisible(i)) {
-
-                                ivalue = scale.getRightValue(datasets[i].data[index]);
-                                if ((value < 0 && ivalue < 0) || (value >= 0 && ivalue > 0)) {
-                                    start += ivalue;
-                                }
-                            }
-                        }
-                    }
-
-                    base = scale.getPixelForValue(start);
-                    head = scale.getPixelForValue(start + value);
-                    size = (head - base) / 2;
-
-                    return {
-                        size: size,
-                        base: base,
-                        head: head,
-                        center: head + size / 2
-                    };
-                },
-
-                /**
-                 * @private
-                 */
-                calculateBarIndexPixels: function(datasetIndex, index, ruler) {
-                    var me = this;
-                    var options = ruler.scale.options;
-                    var stackIndex = me.getStackIndex(datasetIndex);
-                    var pixels = ruler.pixels;
-                    var base = pixels[index];
-                    var length = pixels.length;
-                    var start = ruler.start;
-                    var end = ruler.end;
-                    var leftSampleSize, rightSampleSize, leftCategorySize, rightCategorySize, fullBarSize, size;
-
-                    if (length === 1) {
-                        leftSampleSize = base > start ? base - start : end - base;
-                        rightSampleSize = base < end ? end - base : base - start;
-                    } else {
-                        if (index > 0) {
-                            leftSampleSize = (base - pixels[index - 1]) / 2;
-                            if (index === length - 1) {
-                                rightSampleSize = leftSampleSize;
-                            }
-                        }
-                        if (index < length - 1) {
-                            rightSampleSize = (pixels[index + 1] - base) / 2;
-                            if (index === 0) {
-                                leftSampleSize = rightSampleSize;
-                            }
-                        }
-                    }
-
-                    leftCategorySize = leftSampleSize * options.categoryPercentage;
-                    rightCategorySize = rightSampleSize * options.categoryPercentage;
-                    fullBarSize = (leftCategorySize + rightCategorySize) / ruler.stackCount;
-                    size = fullBarSize * options.barPercentage;
-
-                    size = Math.min(
-                            helpers.valueOrDefault(options.barThickness, size),
-                            helpers.valueOrDefault(options.maxBarThickness, Infinity));
-
-                    base -= leftCategorySize;
-                    base += fullBarSize * stackIndex;
-                    base += (fullBarSize - size) / 2;
-
-                    return {
-                        size: size,
-                        base: base,
-                        head: base + size,
-                        center: base + size / 2
-                    };
-                },
-
-                draw: function() {
-                    var me = this;
-                    var chart = me.chart;
-                    var scale = me.getValueScale();
-                    var rects = me.getMeta().data;
-                    var dataset = me.getDataset();
-                    var ilen = rects.length;
-                    var i = 0;
-
-                    helpers.canvas.clipArea(chart.ctx, chart.chartArea);
-
-                    for (; i < ilen; ++i) {
-                        if (!isNaN(scale.getRightValue(dataset.data[i]))) {
-                            rects[i].draw();
-                        }
-                    }
-
-                    helpers.canvas.unclipArea(chart.ctx);
-                },
-
-                setHoverStyle: function(rectangle) {
-                    var dataset = this.chart.data.datasets[rectangle._datasetIndex];
-                    var index = rectangle._index;
-                    var custom = rectangle.custom || {};
-                    var model = rectangle._model;
-
-                    model.backgroundColor = custom.hoverBackgroundColor ? custom.hoverBackgroundColor : helpers.valueAtIndexOrDefault(dataset.hoverBackgroundColor, index, helpers.getHoverColor(model.backgroundColor));
-                    model.borderColor = custom.hoverBorderColor ? custom.hoverBorderColor : helpers.valueAtIndexOrDefault(dataset.hoverBorderColor, index, helpers.getHoverColor(model.borderColor));
-                    model.borderWidth = custom.hoverBorderWidth ? custom.hoverBorderWidth : helpers.valueAtIndexOrDefault(dataset.hoverBorderWidth, index, model.borderWidth);
-                },
-
-                removeHoverStyle: function(rectangle) {
-                    var dataset = this.chart.data.datasets[rectangle._datasetIndex];
-                    var index = rectangle._index;
-                    var custom = rectangle.custom || {};
-                    var model = rectangle._model;
-                    var rectangleElementOptions = this.chart.options.elements.rectangle;
-
-                    model.backgroundColor = custom.backgroundColor ? custom.backgroundColor : helpers.valueAtIndexOrDefault(dataset.backgroundColor, index, rectangleElementOptions.backgroundColor);
-                    model.borderColor = custom.borderColor ? custom.borderColor : helpers.valueAtIndexOrDefault(dataset.borderColor, index, rectangleElementOptions.borderColor);
-                    model.borderWidth = custom.borderWidth ? custom.borderWidth : helpers.valueAtIndexOrDefault(dataset.borderWidth, index, rectangleElementOptions.borderWidth);
-                }
-            });
-
-            Chart.controllers.horizontalBar = Chart.controllers.bar.extend({
-                /**
-                 * @private
-                 */
-                getValueScaleId: function() {
-                    return this.getMeta().xAxisID;
-                },
-
-                /**
-                 * @private
-                 */
-                getIndexScaleId: function() {
-                    return this.getMeta().yAxisID;
-                }
-            });
-        };
-
-    },{ "25":25,"40":40,"45":45 }],16:[function(require,module,exports){
-        'use strict';
-
-        var defaults = require(25);
-        var elements = require(40);
-        var helpers = require(45);
-
-        defaults._set('bubble', {
-            hover: {
-                mode: 'single'
-            },
-
-            scales: {
-                xAxes: [{
-                    type: 'linear', // bubble should probably use a linear scale by default
-                    position: 'bottom',
-                    id: 'x-axis-0' // need an ID so datasets can reference the scale
-                }],
-                yAxes: [{
-                    type: 'linear',
-                    position: 'left',
-                    id: 'y-axis-0'
-                }]
-            },
-
-            tooltips: {
-                callbacks: {
-                    title: function() {
-                        // Title doesn't make sense for scatter since we format the data as a point
-                        return '';
-                    },
-                    label: function(item, data) {
-                        var datasetLabel = data.datasets[item.datasetIndex].label || '';
-                        var dataPoint = data.datasets[item.datasetIndex].data[item.index];
-                        return datasetLabel + ': (' + item.xLabel + ', ' + item.yLabel + ', ' + dataPoint.r + ')';
-                    }
-                }
-            }
-        });
-
-
-        module.exports = function(Chart) {
-
-            Chart.controllers.bubble = Chart.DatasetController.extend({
-                /**
-                 * @protected
-                 */
-                dataElementType: elements.Point,
-
-                /**
-                 * @protected
-                 */
-                update: function(reset) {
-                    var me = this;
-                    var meta = me.getMeta();
-                    var points = meta.data;
-
-                    // Update Points
-                    helpers.each(points, function(point, index) {
-                        me.updateElement(point, index, reset);
-                    });
-                },
-
-                /**
-                 * @protected
-                 */
-                updateElement: function(point, index, reset) {
-                    var me = this;
-                    var meta = me.getMeta();
-                    var custom = point.custom || {};
-                    var xScale = me.getScaleForId(meta.xAxisID);
-                    var yScale = me.getScaleForId(meta.yAxisID);
-                    var options = me._resolveElementOptions(point, index);
-                    var data = me.getDataset().data[index];
-                    var dsIndex = me.index;
-
-                    var x = reset ? xScale.getPixelForDecimal(0.5) : xScale.getPixelForValue(typeof data === 'object' ? data : NaN, index, dsIndex);
-                    var y = reset ? yScale.getBasePixel() : yScale.getPixelForValue(data, index, dsIndex);
-
-                    point._xScale = xScale;
-                    point._yScale = yScale;
-                    point._options = options;
-                    point._datasetIndex = dsIndex;
-                    point._index = index;
-                    point._model = {
-                        backgroundColor: options.backgroundColor,
-                        borderColor: options.borderColor,
-                        borderWidth: options.borderWidth,
-                        hitRadius: options.hitRadius,
-                        pointStyle: options.pointStyle,
-                        radius: reset ? 0 : options.radius,
-                        skip: custom.skip || isNaN(x) || isNaN(y),
-                        x: x,
-                        y: y,
-                    };
-
-                    point.pivot();
-                },
-
-                /**
-                 * @protected
-                 */
-                setHoverStyle: function(point) {
-                    var model = point._model;
-                    var options = point._options;
-
-                    model.backgroundColor = helpers.valueOrDefault(options.hoverBackgroundColor, helpers.getHoverColor(options.backgroundColor));
-                    model.borderColor = helpers.valueOrDefault(options.hoverBorderColor, helpers.getHoverColor(options.borderColor));
-                    model.borderWidth = helpers.valueOrDefault(options.hoverBorderWidth, options.borderWidth);
-                    model.radius = options.radius + options.hoverRadius;
-                },
-
-                /**
-                 * @protected
-                 */
-                removeHoverStyle: function(point) {
-                    var model = point._model;
-                    var options = point._options;
-
-                    model.backgroundColor = options.backgroundColor;
-                    model.borderColor = options.borderColor;
-                    model.borderWidth = options.borderWidth;
-                    model.radius = options.radius;
-                },
-
-                /**
-                 * @private
-                 */
-                _resolveElementOptions: function(point, index) {
-                    var me = this;
-                    var chart = me.chart;
-                    var datasets = chart.data.datasets;
-                    var dataset = datasets[me.index];
-                    var custom = point.custom || {};
-                    var options = chart.options.elements.point;
-                    var resolve = helpers.options.resolve;
-                    var data = dataset.data[index];
-                    var values = {};
-                    var i, ilen, key;
-
-                    // Scriptable options
-                    var context = {
-                        chart: chart,
-                        dataIndex: index,
-                        dataset: dataset,
-                        datasetIndex: me.index
-                    };
-
-                    var keys = [
-                        'backgroundColor',
-                        'borderColor',
-                        'borderWidth',
-                        'hoverBackgroundColor',
-                        'hoverBorderColor',
-                        'hoverBorderWidth',
-                        'hoverRadius',
-                        'hitRadius',
-                        'pointStyle'
-                    ];
-
-                    for (i = 0, ilen = keys.length; i < ilen; ++i) {
-                        key = keys[i];
-                        values[key] = resolve([
-                            custom[key],
-                            dataset[key],
-                            options[key]
-                        ], context, index);
-                    }
-
-                    // Custom radius resolution
-                    values.radius = resolve([
-                        custom.radius,
-                        data ? data.r : undefined,
-                        dataset.radius,
-                        options.radius
-                    ], context, index);
-
-                    return values;
-                }
-            });
-        };
-
-    },{ "25":25,"40":40,"45":45 }],17:[function(require,module,exports){
-        'use strict';
-
-        var defaults = require(25);
-        var elements = require(40);
-        var helpers = require(45);
-
-        defaults._set('doughnut', {
-            animation: {
-                // Boolean - Whether we animate the rotation of the Doughnut
-                animateRotate: true,
-                // Boolean - Whether we animate scaling the Doughnut from the centre
-                animateScale: false
-            },
-            hover: {
-                mode: 'single'
-            },
-            legendCallback: function(chart) {
-                var text = [];
-                text.push('<ul class="' + chart.id + '-legend">');
-
-                var data = chart.data;
-                var datasets = data.datasets;
-                var labels = data.labels;
-
-                if (datasets.length) {
-                    for (var i = 0; i < datasets[0].data.length; ++i) {
-                        text.push('<li><span style="background-color:' + datasets[0].backgroundColor[i] + '"></span>');
-                        if (labels[i]) {
-                            text.push(labels[i]);
-                        }
-                        text.push('</li>');
-                    }
-                }
-
-                text.push('</ul>');
-                return text.join('');
-            },
-            legend: {
-                labels: {
-                    generateLabels: function(chart) {
-                        var data = chart.data;
-                        if (data.labels.length && data.datasets.length) {
-                            return data.labels.map(function(label, i) {
-                                var meta = chart.getDatasetMeta(0);
-                                var ds = data.datasets[0];
-                                var arc = meta.data[i];
-                                var custom = arc && arc.custom || {};
-                                var valueAtIndexOrDefault = helpers.valueAtIndexOrDefault;
-                                var arcOpts = chart.options.elements.arc;
-                                var fill = custom.backgroundColor ? custom.backgroundColor : valueAtIndexOrDefault(ds.backgroundColor, i, arcOpts.backgroundColor);
-                                var stroke = custom.borderColor ? custom.borderColor : valueAtIndexOrDefault(ds.borderColor, i, arcOpts.borderColor);
-                                var bw = custom.borderWidth ? custom.borderWidth : valueAtIndexOrDefault(ds.borderWidth, i, arcOpts.borderWidth);
-
-                                return {
-                                    text: label,
-                                    fillStyle: fill,
-                                    strokeStyle: stroke,
-                                    lineWidth: bw,
-                                    hidden: isNaN(ds.data[i]) || meta.data[i].hidden,
-
-                                    // Extra data used for toggling the correct item
-                                    index: i
-                                };
-                            });
-                        }
-                        return [];
-                    }
-                },
-
-                onClick: function(e, legendItem) {
-                    var index = legendItem.index;
-                    var chart = this.chart;
-                    var i, ilen, meta;
-
-                    for (i = 0, ilen = (chart.data.datasets || []).length; i < ilen; ++i) {
-                        meta = chart.getDatasetMeta(i);
-                        // toggle visibility of index if exists
-                        if (meta.data[index]) {
-                            meta.data[index].hidden = !meta.data[index].hidden;
-                        }
-                    }
-
-                    chart.update();
-                }
-            },
-
-            // The percentage of the chart that we cut out of the middle.
-            cutoutPercentage: 50,
-
-            // The rotation of the chart, where the first data arc begins.
-            rotation: Math.PI * -0.5,
-
-            // The total circumference of the chart.
-            circumference: Math.PI * 2.0,
-
-            // Need to override these to give a nice default
-            tooltips: {
-                callbacks: {
-                    title: function() {
-                        return '';
-                    },
-                    label: function(tooltipItem, data) {
-                        var dataLabel = data.labels[tooltipItem.index];
-                        var value = ': ' + data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index];
-
-                        if (helpers.isArray(dataLabel)) {
-                            // show value on first line of multiline label
-                            // need to clone because we are changing the value
-                            dataLabel = dataLabel.slice();
-                            dataLabel[0] += value;
-                        } else {
-                            dataLabel += value;
-                        }
-
-                        return dataLabel;
-                    }
-                }
-            }
-        });
-
-        defaults._set('pie', helpers.clone(defaults.doughnut));
-        defaults._set('pie', {
-            cutoutPercentage: 0
-        });
-
-        module.exports = function(Chart) {
-
-            Chart.controllers.doughnut = Chart.controllers.pie = Chart.DatasetController.extend({
-
-                dataElementType: elements.Arc,
-
-                linkScales: helpers.noop,
-
-                // Get index of the dataset in relation to the visible datasets. This allows determining the inner and outer radius correctly
-                getRingIndex: function(datasetIndex) {
-                    var ringIndex = 0;
-
-                    for (var j = 0; j < datasetIndex; ++j) {
-                        if (this.chart.isDatasetVisible(j)) {
-                            ++ringIndex;
-                        }
-                    }
-
-                    return ringIndex;
-                },
-
-                update: function(reset) {
-                    var me = this;
-                    var chart = me.chart;
-                    var chartArea = chart.chartArea;
-                    var opts = chart.options;
-                    var arcOpts = opts.elements.arc;
-                    var availableWidth = chartArea.right - chartArea.left - arcOpts.borderWidth;
-                    var availableHeight = chartArea.bottom - chartArea.top - arcOpts.borderWidth;
-                    var minSize = Math.min(availableWidth, availableHeight);
-                    var offset = { x: 0, y: 0 };
-                    var meta = me.getMeta();
-                    var cutoutPercentage = opts.cutoutPercentage;
-                    var circumference = opts.circumference;
-
-                    // If the chart's circumference isn't a full circle, calculate minSize as a ratio of the width/height of the arc
-                    if (circumference < Math.PI * 2.0) {
-                        var startAngle = opts.rotation % (Math.PI * 2.0);
-                        startAngle += Math.PI * 2.0 * (startAngle >= Math.PI ? -1 : startAngle < -Math.PI ? 1 : 0);
-                        var endAngle = startAngle + circumference;
-                        var start = { x: Math.cos(startAngle), y: Math.sin(startAngle) };
-                        var end = { x: Math.cos(endAngle), y: Math.sin(endAngle) };
-                        var contains0 = (startAngle <= 0 && endAngle >= 0) || (startAngle <= Math.PI * 2.0 && Math.PI * 2.0 <= endAngle);
-                        var contains90 = (startAngle <= Math.PI * 0.5 && Math.PI * 0.5 <= endAngle) || (startAngle <= Math.PI * 2.5 && Math.PI * 2.5 <= endAngle);
-                        var contains180 = (startAngle <= -Math.PI && -Math.PI <= endAngle) || (startAngle <= Math.PI && Math.PI <= endAngle);
-                        var contains270 = (startAngle <= -Math.PI * 0.5 && -Math.PI * 0.5 <= endAngle) || (startAngle <= Math.PI * 1.5 && Math.PI * 1.5 <= endAngle);
-                        var cutout = cutoutPercentage / 100.0;
-                        var min = { x: contains180 ? -1 : Math.min(start.x * (start.x < 0 ? 1 : cutout), end.x * (end.x < 0 ? 1 : cutout)), y: contains270 ? -1 : Math.min(start.y * (start.y < 0 ? 1 : cutout), end.y * (end.y < 0 ? 1 : cutout)) };
-                        var max = { x: contains0 ? 1 : Math.max(start.x * (start.x > 0 ? 1 : cutout), end.x * (end.x > 0 ? 1 : cutout)), y: contains90 ? 1 : Math.max(start.y * (start.y > 0 ? 1 : cutout), end.y * (end.y > 0 ? 1 : cutout)) };
-                        var size = { width: (max.x - min.x) * 0.5, height: (max.y - min.y) * 0.5 };
-                        minSize = Math.min(availableWidth / size.width, availableHeight / size.height);
-                        offset = { x: (max.x + min.x) * -0.5, y: (max.y + min.y) * -0.5 };
-                    }
-
-                    chart.borderWidth = me.getMaxBorderWidth(meta.data);
-                    chart.outerRadius = Math.max((minSize - chart.borderWidth) / 2, 0);
-                    chart.innerRadius = Math.max(cutoutPercentage ? (chart.outerRadius / 100) * (cutoutPercentage) : 0, 0);
-                    chart.radiusLength = (chart.outerRadius - chart.innerRadius) / chart.getVisibleDatasetCount();
-                    chart.offsetX = offset.x * chart.outerRadius;
-                    chart.offsetY = offset.y * chart.outerRadius;
-
-                    meta.total = me.calculateTotal();
-
-                    me.outerRadius = chart.outerRadius - (chart.radiusLength * me.getRingIndex(me.index));
-                    me.innerRadius = Math.max(me.outerRadius - chart.radiusLength, 0);
-
-                    helpers.each(meta.data, function(arc, index) {
-                        me.updateElement(arc, index, reset);
-                    });
-                },
-
-                updateElement: function(arc, index, reset) {
-                    var me = this;
-                    var chart = me.chart;
-                    var chartArea = chart.chartArea;
-                    var opts = chart.options;
-                    var animationOpts = opts.animation;
-                    var centerX = (chartArea.left + chartArea.right) / 2;
-                    var centerY = (chartArea.top + chartArea.bottom) / 2;
-                    var startAngle = opts.rotation; // non reset case handled later
-                    var endAngle = opts.rotation; // non reset case handled later
-                    var dataset = me.getDataset();
-                    var circumference = reset && animationOpts.animateRotate ? 0 : arc.hidden ? 0 : me.calculateCircumference(dataset.data[index]) * (opts.circumference / (2.0 * Math.PI));
-                    var innerRadius = reset && animationOpts.animateScale ? 0 : me.innerRadius;
-                    var outerRadius = reset && animationOpts.animateScale ? 0 : me.outerRadius;
-                    var valueAtIndexOrDefault = helpers.valueAtIndexOrDefault;
-
-                    helpers.extend(arc, {
-                        // Utility
-                        _datasetIndex: me.index,
-                        _index: index,
-
-                        // Desired view properties
-                        _model: {
-                            x: centerX + chart.offsetX,
-                            y: centerY + chart.offsetY,
-                            startAngle: startAngle,
-                            endAngle: endAngle,
-                            circumference: circumference,
-                            outerRadius: outerRadius,
-                            innerRadius: innerRadius,
-                            label: valueAtIndexOrDefault(dataset.label, index, chart.data.labels[index])
-                        }
-                    });
-
-                    var model = arc._model;
-                    // Resets the visual styles
-                    this.removeHoverStyle(arc);
-
-                    // Set correct angles if not resetting
-                    if (!reset || !animationOpts.animateRotate) {
-                        if (index === 0) {
-                            model.startAngle = opts.rotation;
-                        } else {
-                            model.startAngle = me.getMeta().data[index - 1]._model.endAngle;
-                        }
-
-                        model.endAngle = model.startAngle + model.circumference;
-                    }
-
-                    arc.pivot();
-                },
-
-                removeHoverStyle: function(arc) {
-                    Chart.DatasetController.prototype.removeHoverStyle.call(this, arc, this.chart.options.elements.arc);
-                },
-
-                calculateTotal: function() {
-                    var dataset = this.getDataset();
-                    var meta = this.getMeta();
-                    var total = 0;
-                    var value;
-
-                    helpers.each(meta.data, function(element, index) {
-                        value = dataset.data[index];
-                        if (!isNaN(value) && !element.hidden) {
-                            total += Math.abs(value);
-                        }
-                    });
-
-                    /* if (total === 0) {
-				total = NaN;
-			}*/
-
-                    return total;
-                },
-
-                calculateCircumference: function(value) {
-                    var total = this.getMeta().total;
-                    if (total > 0 && !isNaN(value)) {
-                        return (Math.PI * 2.0) * (value / total);
-                    }
-                    return 0;
-                },
-
-                // gets the max border or hover width to properly scale pie charts
-                getMaxBorderWidth: function(arcs) {
-                    var max = 0;
-                    var index = this.index;
-                    var length = arcs.length;
-                    var borderWidth;
-                    var hoverWidth;
-
-                    for (var i = 0; i < length; i++) {
-                        borderWidth = arcs[i]._model ? arcs[i]._model.borderWidth : 0;
-                        hoverWidth = arcs[i]._chart ? arcs[i]._chart.config.data.datasets[index].hoverBorderWidth : 0;
-
-                        max = borderWidth > max ? borderWidth : max;
-                        max = hoverWidth > max ? hoverWidth : max;
-                    }
-                    return max;
-                }
-            });
-        };
-
-    },{ "25":25,"40":40,"45":45 }],18:[function(require,module,exports){
-        'use strict';
-
-        var defaults = require(25);
-        var elements = require(40);
-        var helpers = require(45);
-
-        defaults._set('line', {
-            showLines: true,
-            spanGaps: false,
-
-            hover: {
-                mode: 'label'
-            },
-
-            scales: {
-                xAxes: [{
-                    type: 'category',
-                    id: 'x-axis-0'
-                }],
-                yAxes: [{
-                    type: 'linear',
-                    id: 'y-axis-0'
-                }]
-            }
-        });
-
-        module.exports = function(Chart) {
-
-            function lineEnabled(dataset, options) {
-                return helpers.valueOrDefault(dataset.showLine, options.showLines);
-            }
-
-            Chart.controllers.line = Chart.DatasetController.extend({
-
-                datasetElementType: elements.Line,
-
-                dataElementType: elements.Point,
-
-                update: function(reset) {
-                    var me = this;
-                    var meta = me.getMeta();
-                    var line = meta.dataset;
-                    var points = meta.data || [];
-                    var options = me.chart.options;
-                    var lineElementOptions = options.elements.line;
-                    var scale = me.getScaleForId(meta.yAxisID);
-                    var i, ilen, custom;
-                    var dataset = me.getDataset();
-                    var showLine = lineEnabled(dataset, options);
-
-                    // Update Line
-                    if (showLine) {
-                        custom = line.custom || {};
-
-                        // Compatibility: If the properties are defined with only the old name, use those values
-                        if ((dataset.tension !== undefined) && (dataset.lineTension === undefined)) {
-                            dataset.lineTension = dataset.tension;
-                        }
-
-                        // Utility
-                        line._scale = scale;
-                        line._datasetIndex = me.index;
-                        // Data
-                        line._children = points;
-                        // Model
-                        line._model = {
-                            // Appearance
-                            // The default behavior of lines is to break at null values, according
-                            // to https://github.com/chartjs/Chart.js/issues/2435#issuecomment-216718158
-                            // This option gives lines the ability to span gaps
-                            spanGaps: dataset.spanGaps ? dataset.spanGaps : options.spanGaps,
-                            tension: custom.tension ? custom.tension : helpers.valueOrDefault(dataset.lineTension, lineElementOptions.tension),
-                            backgroundColor: custom.backgroundColor ? custom.backgroundColor : (dataset.backgroundColor || lineElementOptions.backgroundColor),
-                            borderWidth: custom.borderWidth ? custom.borderWidth : (dataset.borderWidth || lineElementOptions.borderWidth),
-                            borderColor: custom.borderColor ? custom.borderColor : (dataset.borderColor || lineElementOptions.borderColor),
-                            borderCapStyle: custom.borderCapStyle ? custom.borderCapStyle : (dataset.borderCapStyle || lineElementOptions.borderCapStyle),
-                            borderDash: custom.borderDash ? custom.borderDash : (dataset.borderDash || lineElementOptions.borderDash),
-                            borderDashOffset: custom.borderDashOffset ? custom.borderDashOffset : (dataset.borderDashOffset || lineElementOptions.borderDashOffset),
-                            borderJoinStyle: custom.borderJoinStyle ? custom.borderJoinStyle : (dataset.borderJoinStyle || lineElementOptions.borderJoinStyle),
-                            fill: custom.fill ? custom.fill : (dataset.fill !== undefined ? dataset.fill : lineElementOptions.fill),
-                            steppedLine: custom.steppedLine ? custom.steppedLine : helpers.valueOrDefault(dataset.steppedLine, lineElementOptions.stepped),
-                            cubicInterpolationMode: custom.cubicInterpolationMode ? custom.cubicInterpolationMode : helpers.valueOrDefault(dataset.cubicInterpolationMode, lineElementOptions.cubicInterpolationMode),
-                        };
-
-                        line.pivot();
-                    }
-
-                    // Update Points
-                    for (i = 0, ilen = points.length; i < ilen; ++i) {
-                        me.updateElement(points[i], i, reset);
-                    }
-
-                    if (showLine && line._model.tension !== 0) {
-                        me.updateBezierControlPoints();
-                    }
-
-                    // Now pivot the point for animation
-                    for (i = 0, ilen = points.length; i < ilen; ++i) {
-                        points[i].pivot();
-                    }
-                },
-
-                getPointBackgroundColor: function(point, index) {
-                    var backgroundColor = this.chart.options.elements.point.backgroundColor;
-                    var dataset = this.getDataset();
-                    var custom = point.custom || {};
-
-                    if (custom.backgroundColor) {
-                        backgroundColor = custom.backgroundColor;
-                    } else if (dataset.pointBackgroundColor) {
-                        backgroundColor = helpers.valueAtIndexOrDefault(dataset.pointBackgroundColor, index, backgroundColor);
-                    } else if (dataset.backgroundColor) {
-                        backgroundColor = dataset.backgroundColor;
-                    }
-
-                    return backgroundColor;
-                },
-
-                getPointBorderColor: function(point, index) {
-                    var borderColor = this.chart.options.elements.point.borderColor;
-                    var dataset = this.getDataset();
-                    var custom = point.custom || {};
-
-                    if (custom.borderColor) {
-                        borderColor = custom.borderColor;
-                    } else if (dataset.pointBorderColor) {
-                        borderColor = helpers.valueAtIndexOrDefault(dataset.pointBorderColor, index, borderColor);
-                    } else if (dataset.borderColor) {
-                        borderColor = dataset.borderColor;
-                    }
-
-                    return borderColor;
-                },
-
-                getPointBorderWidth: function(point, index) {
-                    var borderWidth = this.chart.options.elements.point.borderWidth;
-                    var dataset = this.getDataset();
-                    var custom = point.custom || {};
-
-                    if (!isNaN(custom.borderWidth)) {
-                        borderWidth = custom.borderWidth;
-                    } else if (!isNaN(dataset.pointBorderWidth) || helpers.isArray(dataset.pointBorderWidth)) {
-                        borderWidth = helpers.valueAtIndexOrDefault(dataset.pointBorderWidth, index, borderWidth);
-                    } else if (!isNaN(dataset.borderWidth)) {
-                        borderWidth = dataset.borderWidth;
-                    }
-
-                    return borderWidth;
-                },
-
-                updateElement: function(point, index, reset) {
-                    var me = this;
-                    var meta = me.getMeta();
-                    var custom = point.custom || {};
-                    var dataset = me.getDataset();
-                    var datasetIndex = me.index;
-                    var value = dataset.data[index];
-                    var yScale = me.getScaleForId(meta.yAxisID);
-                    var xScale = me.getScaleForId(meta.xAxisID);
-                    var pointOptions = me.chart.options.elements.point;
-                    var x, y;
-
-                    // Compatibility: If the properties are defined with only the old name, use those values
-                    if ((dataset.radius !== undefined) && (dataset.pointRadius === undefined)) {
-                        dataset.pointRadius = dataset.radius;
-                    }
-                    if ((dataset.hitRadius !== undefined) && (dataset.pointHitRadius === undefined)) {
-                        dataset.pointHitRadius = dataset.hitRadius;
-                    }
-
-                    x = xScale.getPixelForValue(typeof value === 'object' ? value : NaN, index, datasetIndex);
-                    y = reset ? yScale.getBasePixel() : me.calculatePointY(value, index, datasetIndex);
-
-                    // Utility
-                    point._xScale = xScale;
-                    point._yScale = yScale;
-                    point._datasetIndex = datasetIndex;
-                    point._index = index;
-
-                    // Desired view properties
-                    point._model = {
-                        x: x,
-                        y: y,
-                        skip: custom.skip || isNaN(x) || isNaN(y),
-                        // Appearance
-                        radius: custom.radius || helpers.valueAtIndexOrDefault(dataset.pointRadius, index, pointOptions.radius),
-                        pointStyle: custom.pointStyle || helpers.valueAtIndexOrDefault(dataset.pointStyle, index, pointOptions.pointStyle),
-                        backgroundColor: me.getPointBackgroundColor(point, index),
-                        borderColor: me.getPointBorderColor(point, index),
-                        borderWidth: me.getPointBorderWidth(point, index),
-                        tension: meta.dataset._model ? meta.dataset._model.tension : 0,
-                        steppedLine: meta.dataset._model ? meta.dataset._model.steppedLine : false,
-                        // Tooltip
-                        hitRadius: custom.hitRadius || helpers.valueAtIndexOrDefault(dataset.pointHitRadius, index, pointOptions.hitRadius)
-                    };
-                },
-
-                calculatePointY: function(value, index, datasetIndex) {
-                    var me = this;
-                    var chart = me.chart;
-                    var meta = me.getMeta();
-                    var yScale = me.getScaleForId(meta.yAxisID);
-                    var sumPos = 0;
-                    var sumNeg = 0;
-                    var i, ds, dsMeta;
-
-                    if (yScale.options.stacked) {
-                        for (i = 0; i < datasetIndex; i++) {
-                            ds = chart.data.datasets[i];
-                            dsMeta = chart.getDatasetMeta(i);
-                            if (dsMeta.type === 'line' && dsMeta.yAxisID === yScale.id && chart.isDatasetVisible(i)) {
-                                var stackedRightValue = Number(yScale.getRightValue(ds.data[index]));
-                                if (stackedRightValue < 0) {
-                                    sumNeg += stackedRightValue || 0;
-                                } else {
-                                    sumPos += stackedRightValue || 0;
-                                }
-                            }
-                        }
-
-                        var rightValue = Number(yScale.getRightValue(value));
-                        if (rightValue < 0) {
-                            return yScale.getPixelForValue(sumNeg + rightValue);
-                        }
-                        return yScale.getPixelForValue(sumPos + rightValue);
-                    }
-
-                    return yScale.getPixelForValue(value);
-                },
-
-                updateBezierControlPoints: function() {
-                    var me = this;
-                    var meta = me.getMeta();
-                    var area = me.chart.chartArea;
-                    var points = (meta.data || []);
-                    var i, ilen, point, model, controlPoints;
-
-                    // Only consider points that are drawn in case the spanGaps option is used
-                    if (meta.dataset._model.spanGaps) {
-                        points = points.filter(function(pt) {
-                            return !pt._model.skip;
-                        });
-                    }
-
-                    function capControlPoint(pt, min, max) {
-                        return Math.max(Math.min(pt, max), min);
-                    }
-
-                    if (meta.dataset._model.cubicInterpolationMode === 'monotone') {
-                        helpers.splineCurveMonotone(points);
-                    } else {
-                        for (i = 0, ilen = points.length; i < ilen; ++i) {
-                            point = points[i];
-                            model = point._model;
-                            controlPoints = helpers.splineCurve(
-                                    helpers.previousItem(points, i)._model,
-                                    model,
-                                    helpers.nextItem(points, i)._model,
-                                    meta.dataset._model.tension
-                            );
-                            model.controlPointPreviousX = controlPoints.previous.x;
-                            model.controlPointPreviousY = controlPoints.previous.y;
-                            model.controlPointNextX = controlPoints.next.x;
-                            model.controlPointNextY = controlPoints.next.y;
-                        }
-                    }
-
-                    if (me.chart.options.elements.line.capBezierPoints) {
-                        for (i = 0, ilen = points.length; i < ilen; ++i) {
-                            model = points[i]._model;
-                            model.controlPointPreviousX = capControlPoint(model.controlPointPreviousX, area.left, area.right);
-                            model.controlPointPreviousY = capControlPoint(model.controlPointPreviousY, area.top, area.bottom);
-                            model.controlPointNextX = capControlPoint(model.controlPointNextX, area.left, area.right);
-                            model.controlPointNextY = capControlPoint(model.controlPointNextY, area.top, area.bottom);
-                        }
-                    }
-                },
-
-                draw: function() {
-                    var me = this;
-                    var chart = me.chart;
-                    var meta = me.getMeta();
-                    var points = meta.data || [];
-                    var area = chart.chartArea;
-                    var ilen = points.length;
-                    var i = 0;
-
-                    helpers.canvas.clipArea(chart.ctx, area);
-
-                    if (lineEnabled(me.getDataset(), chart.options)) {
-                        meta.dataset.draw();
-                    }
-
-                    helpers.canvas.unclipArea(chart.ctx);
-
-                    // Draw the points
-                    for (; i < ilen; ++i) {
-                        points[i].draw(area);
-                    }
-                },
-
-                setHoverStyle: function(point) {
-                    // Point
-                    var dataset = this.chart.data.datasets[point._datasetIndex];
-                    var index = point._index;
-                    var custom = point.custom || {};
-                    var model = point._model;
-
-                    model.radius = custom.hoverRadius || helpers.valueAtIndexOrDefault(dataset.pointHoverRadius, index, this.chart.options.elements.point.hoverRadius);
-                    model.backgroundColor = custom.hoverBackgroundColor || helpers.valueAtIndexOrDefault(dataset.pointHoverBackgroundColor, index, helpers.getHoverColor(model.backgroundColor));
-                    model.borderColor = custom.hoverBorderColor || helpers.valueAtIndexOrDefault(dataset.pointHoverBorderColor, index, helpers.getHoverColor(model.borderColor));
-                    model.borderWidth = custom.hoverBorderWidth || helpers.valueAtIndexOrDefault(dataset.pointHoverBorderWidth, index, model.borderWidth);
-                },
-
-                removeHoverStyle: function(point) {
-                    var me = this;
-                    var dataset = me.chart.data.datasets[point._datasetIndex];
-                    var index = point._index;
-                    var custom = point.custom || {};
-                    var model = point._model;
-
-                    // Compatibility: If the properties are defined with only the old name, use those values
-                    if ((dataset.radius !== undefined) && (dataset.pointRadius === undefined)) {
-                        dataset.pointRadius = dataset.radius;
-                    }
-
-                    model.radius = custom.radius || helpers.valueAtIndexOrDefault(dataset.pointRadius, index, me.chart.options.elements.point.radius);
-                    model.backgroundColor = me.getPointBackgroundColor(point, index);
-                    model.borderColor = me.getPointBorderColor(point, index);
-                    model.borderWidth = me.getPointBorderWidth(point, index);
-                }
-            });
-        };
-
-    },{ "25":25,"40":40,"45":45 }],19:[function(require,module,exports){
-        'use strict';
-
-        var defaults = require(25);
-        var elements = require(40);
-        var helpers = require(45);
-
-        defaults._set('polarArea', {
-            scale: {
-                type: 'radialLinear',
-                angleLines: {
-                    display: false
-                },
-                gridLines: {
-                    circular: true
-                },
-                pointLabels: {
-                    display: false
-                },
-                ticks: {
-                    beginAtZero: true
-                }
-            },
-
-            // Boolean - Whether to animate the rotation of the chart
-            animation: {
-                animateRotate: true,
-                animateScale: true
-            },
-
-            startAngle: -0.5 * Math.PI,
-            legendCallback: function(chart) {
-                var text = [];
-                text.push('<ul class="' + chart.id + '-legend">');
-
-                var data = chart.data;
-                var datasets = data.datasets;
-                var labels = data.labels;
-
-                if (datasets.length) {
-                    for (var i = 0; i < datasets[0].data.length; ++i) {
-                        text.push('<li><span style="background-color:' + datasets[0].backgroundColor[i] + '"></span>');
-                        if (labels[i]) {
-                            text.push(labels[i]);
-                        }
-                        text.push('</li>');
-                    }
-                }
-
-                text.push('</ul>');
-                return text.join('');
-            },
-            legend: {
-                labels: {
-                    generateLabels: function(chart) {
-                        var data = chart.data;
-                        if (data.labels.length && data.datasets.length) {
-                            return data.labels.map(function(label, i) {
-                                var meta = chart.getDatasetMeta(0);
-                                var ds = data.datasets[0];
-                                var arc = meta.data[i];
-                                var custom = arc.custom || {};
-                                var valueAtIndexOrDefault = helpers.valueAtIndexOrDefault;
-                                var arcOpts = chart.options.elements.arc;
-                                var fill = custom.backgroundColor ? custom.backgroundColor : valueAtIndexOrDefault(ds.backgroundColor, i, arcOpts.backgroundColor);
-                                var stroke = custom.borderColor ? custom.borderColor : valueAtIndexOrDefault(ds.borderColor, i, arcOpts.borderColor);
-                                var bw = custom.borderWidth ? custom.borderWidth : valueAtIndexOrDefault(ds.borderWidth, i, arcOpts.borderWidth);
-
-                                return {
-                                    text: label,
-                                    fillStyle: fill,
-                                    strokeStyle: stroke,
-                                    lineWidth: bw,
-                                    hidden: isNaN(ds.data[i]) || meta.data[i].hidden,
-
-                                    // Extra data used for toggling the correct item
-                                    index: i
-                                };
-                            });
-                        }
-                        return [];
-                    }
-                },
-
-                onClick: function(e, legendItem) {
-                    var index = legendItem.index;
-                    var chart = this.chart;
-                    var i, ilen, meta;
-
-                    for (i = 0, ilen = (chart.data.datasets || []).length; i < ilen; ++i) {
-                        meta = chart.getDatasetMeta(i);
-                        meta.data[index].hidden = !meta.data[index].hidden;
-                    }
-
-                    chart.update();
-                }
-            },
-
-            // Need to override these to give a nice default
-            tooltips: {
-                callbacks: {
-                    title: function() {
-                        return '';
-                    },
-                    label: function(item, data) {
-                        return data.labels[item.index] + ': ' + item.yLabel;
-                    }
-                }
-            }
-        });
-
-        module.exports = function(Chart) {
-
-            Chart.controllers.polarArea = Chart.DatasetController.extend({
-
-                dataElementType: elements.Arc,
-
-                linkScales: helpers.noop,
-
-                update: function(reset) {
-                    var me = this;
-                    var chart = me.chart;
-                    var chartArea = chart.chartArea;
-                    var meta = me.getMeta();
-                    var opts = chart.options;
-                    var arcOpts = opts.elements.arc;
-                    var minSize = Math.min(chartArea.right - chartArea.left, chartArea.bottom - chartArea.top);
-                    chart.outerRadius = Math.max((minSize - arcOpts.borderWidth / 2) / 2, 0);
-                    chart.innerRadius = Math.max(opts.cutoutPercentage ? (chart.outerRadius / 100) * (opts.cutoutPercentage) : 1, 0);
-                    chart.radiusLength = (chart.outerRadius - chart.innerRadius) / chart.getVisibleDatasetCount();
-
-                    me.outerRadius = chart.outerRadius - (chart.radiusLength * me.index);
-                    me.innerRadius = me.outerRadius - chart.radiusLength;
-
-                    meta.count = me.countVisibleElements();
-
-                    helpers.each(meta.data, function(arc, index) {
-                        me.updateElement(arc, index, reset);
-                    });
-                },
-
-                updateElement: function(arc, index, reset) {
-                    var me = this;
-                    var chart = me.chart;
-                    var dataset = me.getDataset();
-                    var opts = chart.options;
-                    var animationOpts = opts.animation;
-                    var scale = chart.scale;
-                    var labels = chart.data.labels;
-
-                    var circumference = me.calculateCircumference(dataset.data[index]);
-                    var centerX = scale.xCenter;
-                    var centerY = scale.yCenter;
-
-                    // If there is NaN data before us, we need to calculate the starting angle correctly.
-                    // We could be way more efficient here, but its unlikely that the polar area chart will have a lot of data
-                    var visibleCount = 0;
-                    var meta = me.getMeta();
-                    for (var i = 0; i < index; ++i) {
-                        if (!isNaN(dataset.data[i]) && !meta.data[i].hidden) {
-                            ++visibleCount;
-                        }
-                    }
-
-                    // var negHalfPI = -0.5 * Math.PI;
-                    var datasetStartAngle = opts.startAngle;
-                    var distance = arc.hidden ? 0 : scale.getDistanceFromCenterForValue(dataset.data[index]);
-                    var startAngle = datasetStartAngle + (circumference * visibleCount);
-                    var endAngle = startAngle + (arc.hidden ? 0 : circumference);
-
-                    var resetRadius = animationOpts.animateScale ? 0 : scale.getDistanceFromCenterForValue(dataset.data[index]);
-
-                    helpers.extend(arc, {
-                        // Utility
-                        _datasetIndex: me.index,
-                        _index: index,
-                        _scale: scale,
-
-                        // Desired view properties
-                        _model: {
-                            x: centerX,
-                            y: centerY,
-                            innerRadius: 0,
-                            outerRadius: reset ? resetRadius : distance,
-                            startAngle: reset && animationOpts.animateRotate ? datasetStartAngle : startAngle,
-                            endAngle: reset && animationOpts.animateRotate ? datasetStartAngle : endAngle,
-                            label: helpers.valueAtIndexOrDefault(labels, index, labels[index])
-                        }
-                    });
-
-                    // Apply border and fill style
-                    me.removeHoverStyle(arc);
-
-                    arc.pivot();
-                },
-
-                removeHoverStyle: function(arc) {
-                    Chart.DatasetController.prototype.removeHoverStyle.call(this, arc, this.chart.options.elements.arc);
-                },
-
-                countVisibleElements: function() {
-                    var dataset = this.getDataset();
-                    var meta = this.getMeta();
-                    var count = 0;
-
-                    helpers.each(meta.data, function(element, index) {
-                        if (!isNaN(dataset.data[index]) && !element.hidden) {
-                            count++;
-                        }
-                    });
-
-                    return count;
-                },
-
-                calculateCircumference: function(value) {
-                    var count = this.getMeta().count;
-                    if (count > 0 && !isNaN(value)) {
-                        return (2 * Math.PI) / count;
-                    }
-                    return 0;
-                }
-            });
-        };
-
-    },{ "25":25,"40":40,"45":45 }],20:[function(require,module,exports){
-        'use strict';
-
-        var defaults = require(25);
-        var elements = require(40);
-        var helpers = require(45);
-
-        defaults._set('radar', {
-            scale: {
-                type: 'radialLinear'
-            },
-            elements: {
-                line: {
-                    tension: 0 // no bezier in radar
-                }
-            }
-        });
-
-        module.exports = function(Chart) {
-
-            Chart.controllers.radar = Chart.DatasetController.extend({
-
-                datasetElementType: elements.Line,
-
-                dataElementType: elements.Point,
-
-                linkScales: helpers.noop,
-
-                update: function(reset) {
-                    var me = this;
-                    var meta = me.getMeta();
-                    var line = meta.dataset;
-                    var points = meta.data;
-                    var custom = line.custom || {};
-                    var dataset = me.getDataset();
-                    var lineElementOptions = me.chart.options.elements.line;
-                    var scale = me.chart.scale;
-
-                    // Compatibility: If the properties are defined with only the old name, use those values
-                    if ((dataset.tension !== undefined) && (dataset.lineTension === undefined)) {
-                        dataset.lineTension = dataset.tension;
-                    }
-
-                    helpers.extend(meta.dataset, {
-                        // Utility
-                        _datasetIndex: me.index,
-                        _scale: scale,
-                        // Data
-                        _children: points,
-                        _loop: true,
-                        // Model
-                        _model: {
-                            // Appearance
-                            tension: custom.tension ? custom.tension : helpers.valueOrDefault(dataset.lineTension, lineElementOptions.tension),
-                            backgroundColor: custom.backgroundColor ? custom.backgroundColor : (dataset.backgroundColor || lineElementOptions.backgroundColor),
-                            borderWidth: custom.borderWidth ? custom.borderWidth : (dataset.borderWidth || lineElementOptions.borderWidth),
-                            borderColor: custom.borderColor ? custom.borderColor : (dataset.borderColor || lineElementOptions.borderColor),
-                            fill: custom.fill ? custom.fill : (dataset.fill !== undefined ? dataset.fill : lineElementOptions.fill),
-                            borderCapStyle: custom.borderCapStyle ? custom.borderCapStyle : (dataset.borderCapStyle || lineElementOptions.borderCapStyle),
-                            borderDash: custom.borderDash ? custom.borderDash : (dataset.borderDash || lineElementOptions.borderDash),
-                            borderDashOffset: custom.borderDashOffset ? custom.borderDashOffset : (dataset.borderDashOffset || lineElementOptions.borderDashOffset),
-                            borderJoinStyle: custom.borderJoinStyle ? custom.borderJoinStyle : (dataset.borderJoinStyle || lineElementOptions.borderJoinStyle),
-                        }
-                    });
-
-                    meta.dataset.pivot();
-
-                    // Update Points
-                    helpers.each(points, function(point, index) {
-                        me.updateElement(point, index, reset);
-                    }, me);
-
-                    // Update bezier control points
-                    me.updateBezierControlPoints();
-                },
-                updateElement: function(point, index, reset) {
-                    var me = this;
-                    var custom = point.custom || {};
-                    var dataset = me.getDataset();
-                    var scale = me.chart.scale;
-                    var pointElementOptions = me.chart.options.elements.point;
-                    var pointPosition = scale.getPointPositionForValue(index, dataset.data[index]);
-
-                    // Compatibility: If the properties are defined with only the old name, use those values
-                    if ((dataset.radius !== undefined) && (dataset.pointRadius === undefined)) {
-                        dataset.pointRadius = dataset.radius;
-                    }
-                    if ((dataset.hitRadius !== undefined) && (dataset.pointHitRadius === undefined)) {
-                        dataset.pointHitRadius = dataset.hitRadius;
-                    }
-
-                    helpers.extend(point, {
-                        // Utility
-                        _datasetIndex: me.index,
-                        _index: index,
-                        _scale: scale,
-
-                        // Desired view properties
-                        _model: {
-                            x: reset ? scale.xCenter : pointPosition.x, // value not used in dataset scale, but we want a consistent API between scales
-                            y: reset ? scale.yCenter : pointPosition.y,
-
-                            // Appearance
-                            tension: custom.tension ? custom.tension : helpers.valueOrDefault(dataset.lineTension, me.chart.options.elements.line.tension),
-                            radius: custom.radius ? custom.radius : helpers.valueAtIndexOrDefault(dataset.pointRadius, index, pointElementOptions.radius),
-                            backgroundColor: custom.backgroundColor ? custom.backgroundColor : helpers.valueAtIndexOrDefault(dataset.pointBackgroundColor, index, pointElementOptions.backgroundColor),
-                            borderColor: custom.borderColor ? custom.borderColor : helpers.valueAtIndexOrDefault(dataset.pointBorderColor, index, pointElementOptions.borderColor),
-                            borderWidth: custom.borderWidth ? custom.borderWidth : helpers.valueAtIndexOrDefault(dataset.pointBorderWidth, index, pointElementOptions.borderWidth),
-                            pointStyle: custom.pointStyle ? custom.pointStyle : helpers.valueAtIndexOrDefault(dataset.pointStyle, index, pointElementOptions.pointStyle),
-
-                            // Tooltip
-                            hitRadius: custom.hitRadius ? custom.hitRadius : helpers.valueAtIndexOrDefault(dataset.pointHitRadius, index, pointElementOptions.hitRadius)
-                        }
-                    });
-
-                    point._model.skip = custom.skip ? custom.skip : (isNaN(point._model.x) || isNaN(point._model.y));
-                },
-                updateBezierControlPoints: function() {
-                    var chartArea = this.chart.chartArea;
-                    var meta = this.getMeta();
-
-                    helpers.each(meta.data, function(point, index) {
-                        var model = point._model;
-                        var controlPoints = helpers.splineCurve(
-                                helpers.previousItem(meta.data, index, true)._model,
-                                model,
-                                helpers.nextItem(meta.data, index, true)._model,
-                                model.tension
-                        );
-
-                        // Prevent the bezier going outside of the bounds of the graph
-                        model.controlPointPreviousX = Math.max(Math.min(controlPoints.previous.x, chartArea.right), chartArea.left);
-                        model.controlPointPreviousY = Math.max(Math.min(controlPoints.previous.y, chartArea.bottom), chartArea.top);
-
-                        model.controlPointNextX = Math.max(Math.min(controlPoints.next.x, chartArea.right), chartArea.left);
-                        model.controlPointNextY = Math.max(Math.min(controlPoints.next.y, chartArea.bottom), chartArea.top);
-
-                        // Now pivot the point for animation
-                        point.pivot();
-                    });
-                },
-
-                setHoverStyle: function(point) {
-                    // Point
-                    var dataset = this.chart.data.datasets[point._datasetIndex];
-                    var custom = point.custom || {};
-                    var index = point._index;
-                    var model = point._model;
-
-                    model.radius = custom.hoverRadius ? custom.hoverRadius : helpers.valueAtIndexOrDefault(dataset.pointHoverRadius, index, this.chart.options.elements.point.hoverRadius);
-                    model.backgroundColor = custom.hoverBackgroundColor ? custom.hoverBackgroundColor : helpers.valueAtIndexOrDefault(dataset.pointHoverBackgroundColor, index, helpers.getHoverColor(model.backgroundColor));
-                    model.borderColor = custom.hoverBorderColor ? custom.hoverBorderColor : helpers.valueAtIndexOrDefault(dataset.pointHoverBorderColor, index, helpers.getHoverColor(model.borderColor));
-                    model.borderWidth = custom.hoverBorderWidth ? custom.hoverBorderWidth : helpers.valueAtIndexOrDefault(dataset.pointHoverBorderWidth, index, model.borderWidth);
-                },
-
-                removeHoverStyle: function(point) {
-                    var dataset = this.chart.data.datasets[point._datasetIndex];
-                    var custom = point.custom || {};
-                    var index = point._index;
-                    var model = point._model;
-                    var pointElementOptions = this.chart.options.elements.point;
-
-                    model.radius = custom.radius ? custom.radius : helpers.valueAtIndexOrDefault(dataset.pointRadius, index, pointElementOptions.radius);
-                    model.backgroundColor = custom.backgroundColor ? custom.backgroundColor : helpers.valueAtIndexOrDefault(dataset.pointBackgroundColor, index, pointElementOptions.backgroundColor);
-                    model.borderColor = custom.borderColor ? custom.borderColor : helpers.valueAtIndexOrDefault(dataset.pointBorderColor, index, pointElementOptions.borderColor);
-                    model.borderWidth = custom.borderWidth ? custom.borderWidth : helpers.valueAtIndexOrDefault(dataset.pointBorderWidth, index, pointElementOptions.borderWidth);
-                }
-            });
-        };
-
-    },{ "25":25,"40":40,"45":45 }],21:[function(require,module,exports){
-        'use strict';
-
-        var defaults = require(25);
-
-        defaults._set('scatter', {
-            hover: {
-                mode: 'single'
-            },
-
-            scales: {
-                xAxes: [{
-                    id: 'x-axis-1',    // need an ID so datasets can reference the scale
-                    type: 'linear',    // scatter should not use a category axis
-                    position: 'bottom'
-                }],
-                yAxes: [{
-                    id: 'y-axis-1',
-                    type: 'linear',
-                    position: 'left'
-                }]
-            },
-
-            showLines: false,
-
-            tooltips: {
-                callbacks: {
-                    title: function() {
-                        return '';     // doesn't make sense for scatter since data are formatted as a point
-                    },
-                    label: function(item) {
-                        return '(' + item.xLabel + ', ' + item.yLabel + ')';
-                    }
-                }
-            }
-        });
-
-        module.exports = function(Chart) {
-
-            // Scatter charts use line controllers
-            Chart.controllers.scatter = Chart.controllers.line;
-
-        };
-
-    },{ "25":25 }],22:[function(require,module,exports){
-        /* global window: false */
-        'use strict';
-
-        var defaults = require(25);
-        var Element = require(26);
-        var helpers = require(45);
-
-        defaults._set('global', {
-            animation: {
-                duration: 1000,
-                easing: 'easeOutQuart',
-                onProgress: helpers.noop,
-                onComplete: helpers.noop
-            }
-        });
-
-        module.exports = function(Chart) {
-
-            Chart.Animation = Element.extend({
-                chart: null, // the animation associated chart instance
-                currentStep: 0, // the current animation step
-                numSteps: 60, // default number of steps
-                easing: '', // the easing to use for this animation
-                render: null, // render function used by the animation service
-
-                onAnimationProgress: null, // user specified callback to fire on each step of the animation
-                onAnimationComplete: null, // user specified callback to fire when the animation finishes
-            });
-
-            Chart.animationService = {
-                frameDuration: 17,
-                animations: [],
-                dropFrames: 0,
-                request: null,
-
-                /**
-                 * @param {Chart} chart - The chart to animate.
-                 * @param {Chart.Animation} animation - The animation that we will animate.
-                 * @param {Number} duration - The animation duration in ms.
-                 * @param {Boolean} lazy - if true, the chart is not marked as animating to enable more responsive interactions
-                 */
-                addAnimation: function(chart, animation, duration, lazy) {
-                    var animations = this.animations;
-                    var i, ilen;
-
-                    animation.chart = chart;
-
-                    if (!lazy) {
-                        chart.animating = true;
-                    }
-
-                    for (i = 0, ilen = animations.length; i < ilen; ++i) {
-                        if (animations[i].chart === chart) {
-                            animations[i] = animation;
-                            return;
-                        }
-                    }
-
-                    animations.push(animation);
-
-                    // If there are no animations queued, manually kickstart a digest, for lack of a better word
-                    if (animations.length === 1) {
-                        this.requestAnimationFrame();
-                    }
-                },
-
-                cancelAnimation: function(chart) {
-                    var index = helpers.findIndex(this.animations, function(animation) {
-                        return animation.chart === chart;
-                    });
-
-                    if (index !== -1) {
-                        this.animations.splice(index, 1);
-                        chart.animating = false;
-                    }
-                },
-
-                requestAnimationFrame: function() {
-                    var me = this;
-                    if (me.request === null) {
-                        // Skip animation frame requests until the active one is executed.
-                        // This can happen when processing mouse events, e.g. 'mousemove'
-                        // and 'mouseout' events will trigger multiple renders.
-                        me.request = helpers.requestAnimFrame.call(window, function() {
-                            me.request = null;
-                            me.startDigest();
-                        });
-                    }
-                },
-
-                /**
-                 * @private
-                 */
-                startDigest: function() {
-                    var me = this;
-                    var startTime = Date.now();
-                    var framesToDrop = 0;
-
-                    if (me.dropFrames > 1) {
-                        framesToDrop = Math.floor(me.dropFrames);
-                        me.dropFrames = me.dropFrames % 1;
-                    }
-
-                    me.advance(1 + framesToDrop);
-
-                    var endTime = Date.now();
-
-                    me.dropFrames += (endTime - startTime) / me.frameDuration;
-
-                    // Do we have more stuff to animate?
-                    if (me.animations.length > 0) {
-                        me.requestAnimationFrame();
-                    }
-                },
-
-                /**
-                 * @private
-                 */
-                advance: function(count) {
-                    var animations = this.animations;
-                    var animation, chart;
-                    var i = 0;
-
-                    while (i < animations.length) {
-                        animation = animations[i];
-                        chart = animation.chart;
-
-                        animation.currentStep = (animation.currentStep || 0) + count;
-                        animation.currentStep = Math.min(animation.currentStep, animation.numSteps);
-
-                        helpers.callback(animation.render, [chart, animation], chart);
-                        helpers.callback(animation.onAnimationProgress, [animation], chart);
-
-                        if (animation.currentStep >= animation.numSteps) {
-                            helpers.callback(animation.onAnimationComplete, [animation], chart);
-                            chart.animating = false;
-                            animations.splice(i, 1);
-                        } else {
-                            ++i;
-                        }
-                    }
-                }
-            };
-
-            /**
-             * Provided for backward compatibility, use Chart.Animation instead
-             * @prop Chart.Animation#animationObject
-             * @deprecated since version 2.6.0
-             * @todo remove at version 3
-             */
-            Object.defineProperty(Chart.Animation.prototype, 'animationObject', {
-                get: function() {
-                    return this;
-                }
-            });
-
-            /**
-             * Provided for backward compatibility, use Chart.Animation#chart instead
-             * @prop Chart.Animation#chartInstance
-             * @deprecated since version 2.6.0
-             * @todo remove at version 3
-             */
-            Object.defineProperty(Chart.Animation.prototype, 'chartInstance', {
-                get: function() {
-                    return this.chart;
-                },
-                set: function(value) {
-                    this.chart = value;
-                }
-            });
-
-        };
-
-    },{ "25":25,"26":26,"45":45 }],23:[function(require,module,exports){
-        'use strict';
-
-        var defaults = require(25);
-        var helpers = require(45);
-        var Interaction = require(28);
-        var platform = require(48);
-
-        module.exports = function(Chart) {
-            var plugins = Chart.plugins;
-
-            // Create a dictionary of chart types, to allow for extension of existing types
-            Chart.types = {};
-
-            // Store a reference to each instance - allowing us to globally resize chart instances on window resize.
-            // Destroy method on the chart will remove the instance of the chart from this reference.
-            Chart.instances = {};
-
-            // Controllers available for dataset visualization eg. bar, line, slice, etc.
-            Chart.controllers = {};
-
-            /**
-             * Initializes the given config with global and chart default values.
-             */
-            function initConfig(config) {
-                config = config || {};
-
-                // Do NOT use configMerge() for the data object because this method merges arrays
-                // and so would change references to labels and datasets, preventing data updates.
-                var data = config.data = config.data || {};
-                data.datasets = data.datasets || [];
-                data.labels = data.labels || [];
-
-                config.options = helpers.configMerge(
-                        defaults.global,
-                        defaults[config.type],
-                        config.options || {});
-
-                return config;
-            }
-
-            /**
-             * Updates the config of the chart
-             * @param chart {Chart} chart to update the options for
-             */
-            function updateConfig(chart) {
-                var newOptions = chart.options;
-
-                // Update Scale(s) with options
-                if (newOptions.scale) {
-                    chart.scale.options = newOptions.scale;
-                } else if (newOptions.scales) {
-                    newOptions.scales.xAxes.concat(newOptions.scales.yAxes).forEach(function(scaleOptions) {
-                        chart.scales[scaleOptions.id].options = scaleOptions;
-                    });
-                }
-
-                // Tooltip
-                chart.tooltip._options = newOptions.tooltips;
-            }
-
-            function positionIsHorizontal(position) {
-                return position === 'top' || position === 'bottom';
-            }
-
-            helpers.extend(Chart.prototype, /** @lends Chart */ {
-                /**
-                 * @private
-                 */
-                construct: function(item, config) {
-                    var me = this;
-
-                    config = initConfig(config);
-
-                    var context = platform.acquireContext(item, config);
-                    var canvas = context && context.canvas;
-                    var height = canvas && canvas.height;
-                    var width = canvas && canvas.width;
-
-                    me.id = helpers.uid();
-                    me.ctx = context;
-                    me.canvas = canvas;
-                    me.config = config;
-                    me.width = width;
-                    me.height = height;
-                    me.aspectRatio = height ? width / height : null;
-                    me.options = config.options;
-                    me._bufferedRender = false;
-
-                    /**
-                     * Provided for backward compatibility, Chart and Chart.Controller have been merged,
-                     * the "instance" still need to be defined since it might be called from plugins.
-                     * @prop Chart#chart
-                     * @deprecated since version 2.6.0
-                     * @todo remove at version 3
-                     * @private
-                     */
-                    me.chart = me;
-                    me.controller = me; // chart.chart.controller #inception
-
-                    // Add the chart instance to the global namespace
-                    Chart.instances[me.id] = me;
-
-                    // Define alias to the config data: `chart.data === chart.config.data`
-                    Object.defineProperty(me, 'data', {
-                        get: function() {
-                            return me.config.data;
-                        },
-                        set: function(value) {
-                            me.config.data = value;
-                        }
-                    });
-
-                    if (!context || !canvas) {
-                        // The given item is not a compatible context2d element, let's return before finalizing
-                        // the chart initialization but after setting basic chart / controller properties that
-                        // can help to figure out that the chart is not valid (e.g chart.canvas !== null);
-                        // https://github.com/chartjs/Chart.js/issues/2807
-                        console.error("Failed to create chart: can't acquire context from the given item");
-                        return;
-                    }
-
-                    me.initialize();
-                    me.update();
-                },
-
-                /**
-                 * @private
-                 */
-                initialize: function() {
-                    var me = this;
-
-                    // Before init plugin notification
-                    plugins.notify(me, 'beforeInit');
-
-                    helpers.retinaScale(me, me.options.devicePixelRatio);
-
-                    me.bindEvents();
-
-                    if (me.options.responsive) {
-                        // Initial resize before chart draws (must be silent to preserve initial animations).
-                        me.resize(true);
-                    }
-
-                    // Make sure scales have IDs and are built before we build any controllers.
-                    me.ensureScalesHaveIDs();
-                    me.buildScales();
-                    me.initToolTip();
-
-                    // After init plugin notification
-                    plugins.notify(me, 'afterInit');
-
-                    return me;
-                },
-
-                clear: function() {
-                    helpers.canvas.clear(this);
-                    return this;
-                },
-
-                stop: function() {
-                    // Stops any current animation loop occurring
-                    Chart.animationService.cancelAnimation(this);
-                    return this;
-                },
-
-                resize: function(silent) {
-                    var me = this;
-                    var options = me.options;
-                    var canvas = me.canvas;
-                    var aspectRatio = (options.maintainAspectRatio && me.aspectRatio) || null;
-
-                    // the canvas render width and height will be casted to integers so make sure that
-                    // the canvas display style uses the same integer values to avoid blurring effect.
-
-                    // Set to 0 instead of canvas.size because the size defaults to 300x150 if the element is collased
-                    var newWidth = Math.max(0, Math.floor(helpers.getMaximumWidth(canvas)));
-                    var newHeight = Math.max(0, Math.floor(aspectRatio ? newWidth / aspectRatio : helpers.getMaximumHeight(canvas)));
-
-                    if (me.width === newWidth && me.height === newHeight) {
-                        return;
-                    }
-
-                    canvas.width = me.width = newWidth;
-                    canvas.height = me.height = newHeight;
-                    canvas.style.width = newWidth + 'px';
-                    canvas.style.height = newHeight + 'px';
-
-                    helpers.retinaScale(me, options.devicePixelRatio);
-
-                    if (!silent) {
-                        // Notify any plugins about the resize
-                        var newSize = { width: newWidth, height: newHeight };
-                        plugins.notify(me, 'resize', [newSize]);
-
-                        // Notify of resize
-                        if (me.options.onResize) {
-                            me.options.onResize(me, newSize);
-                        }
-
-                        me.stop();
-                        me.update(me.options.responsiveAnimationDuration);
-                    }
-                },
-
-                ensureScalesHaveIDs: function() {
-                    var options = this.options;
-                    var scalesOptions = options.scales || {};
-                    var scaleOptions = options.scale;
-
-                    helpers.each(scalesOptions.xAxes, function(xAxisOptions, index) {
-                        xAxisOptions.id = xAxisOptions.id || ('x-axis-' + index);
-                    });
-
-                    helpers.each(scalesOptions.yAxes, function(yAxisOptions, index) {
-                        yAxisOptions.id = yAxisOptions.id || ('y-axis-' + index);
-                    });
-
-                    if (scaleOptions) {
-                        scaleOptions.id = scaleOptions.id || 'scale';
-                    }
-                },
-
-                /**
-                 * Builds a map of scale ID to scale object for future lookup.
-                 */
-                buildScales: function() {
-                    var me = this;
-                    var options = me.options;
-                    var scales = me.scales = {};
-                    var items = [];
-
-                    if (options.scales) {
-                        items = items.concat(
-                                (options.scales.xAxes || []).map(function(xAxisOptions) {
-                                    return { options: xAxisOptions, dtype: 'category', dposition: 'bottom' };
-                                }),
-                                (options.scales.yAxes || []).map(function(yAxisOptions) {
-                                    return { options: yAxisOptions, dtype: 'linear', dposition: 'left' };
-                                })
-                        );
-                    }
-
-                    if (options.scale) {
-                        items.push({
-                            options: options.scale,
-                            dtype: 'radialLinear',
-                            isDefault: true,
-                            dposition: 'chartArea'
-                        });
-                    }
-
-                    helpers.each(items, function(item) {
-                        var scaleOptions = item.options;
-                        var scaleType = helpers.valueOrDefault(scaleOptions.type, item.dtype);
-                        var scaleClass = Chart.scaleService.getScaleConstructor(scaleType);
-                        if (!scaleClass) {
-                            return;
-                        }
-
-                        if (positionIsHorizontal(scaleOptions.position) !== positionIsHorizontal(item.dposition)) {
-                            scaleOptions.position = item.dposition;
-                        }
-
-                        var scale = new scaleClass({
-                            id: scaleOptions.id,
-                            options: scaleOptions,
-                            ctx: me.ctx,
-                            chart: me
-                        });
-
-                        scales[scale.id] = scale;
-                        scale.mergeTicksOptions();
-
-                        // TODO(SB): I think we should be able to remove this custom case (options.scale)
-                        // and consider it as a regular scale part of the "scales"" map only! This would
-                        // make the logic easier and remove some useless? custom code.
-                        if (item.isDefault) {
-                            me.scale = scale;
-                        }
-                    });
-
-                    Chart.scaleService.addScalesToLayout(this);
-                },
-
-                buildOrUpdateControllers: function() {
-                    var me = this;
-                    var types = [];
-                    var newControllers = [];
-
-                    helpers.each(me.data.datasets, function(dataset, datasetIndex) {
-                        var meta = me.getDatasetMeta(datasetIndex);
-                        var type = dataset.type || me.config.type;
-
-                        if (meta.type && meta.type !== type) {
-                            me.destroyDatasetMeta(datasetIndex);
-                            meta = me.getDatasetMeta(datasetIndex);
-                        }
-                        meta.type = type;
-
-                        types.push(meta.type);
-
-                        if (meta.controller) {
-                            meta.controller.updateIndex(datasetIndex);
-                        } else {
-                            var ControllerClass = Chart.controllers[meta.type];
-                            if (ControllerClass === undefined) {
-                                throw new Error('"' + meta.type + '" is not a chart type.');
-                            }
-
-                            meta.controller = new ControllerClass(me, datasetIndex);
-                            newControllers.push(meta.controller);
-                        }
-                    }, me);
-
-                    return newControllers;
-                },
-
-                /**
-                 * Reset the elements of all datasets
-                 * @private
-                 */
-                resetElements: function() {
-                    var me = this;
-                    helpers.each(me.data.datasets, function(dataset, datasetIndex) {
-                        me.getDatasetMeta(datasetIndex).controller.reset();
-                    }, me);
-                },
-
-                /**
-                 * Resets the chart back to it's state before the initial animation
-                 */
-                reset: function() {
-                    this.resetElements();
-                    this.tooltip.initialize();
-                },
-
-                update: function(config) {
-                    var me = this;
-
-                    if (!config || typeof config !== 'object') {
-                        // backwards compatibility
-                        config = {
-                            duration: config,
-                            lazy: arguments[1]
-                        };
-                    }
-
-                    updateConfig(me);
-
-                    if (plugins.notify(me, 'beforeUpdate') === false) {
-                        return;
-                    }
-
-                    // In case the entire data object changed
-                    me.tooltip._data = me.data;
-
-                    // Make sure dataset controllers are updated and new controllers are reset
-                    var newControllers = me.buildOrUpdateControllers();
-
-                    // Make sure all dataset controllers have correct meta data counts
-                    helpers.each(me.data.datasets, function(dataset, datasetIndex) {
-                        me.getDatasetMeta(datasetIndex).controller.buildOrUpdateElements();
-                    }, me);
-
-                    me.updateLayout();
-
-                    // Can only reset the new controllers after the scales have been updated
-                    helpers.each(newControllers, function(controller) {
-                        controller.reset();
-                    });
-
-                    me.updateDatasets();
-
-                    // Do this before render so that any plugins that need final scale updates can use it
-                    plugins.notify(me, 'afterUpdate');
-
-                    if (me._bufferedRender) {
-                        me._bufferedRequest = {
-                            duration: config.duration,
-                            easing: config.easing,
-                            lazy: config.lazy
-                        };
-                    } else {
-                        me.render(config);
-                    }
-                },
-
-                /**
-                 * Updates the chart layout unless a plugin returns `false` to the `beforeLayout`
-                 * hook, in which case, plugins will not be called on `afterLayout`.
-                 * @private
-                 */
-                updateLayout: function() {
-                    var me = this;
-
-                    if (plugins.notify(me, 'beforeLayout') === false) {
-                        return;
-                    }
-
-                    Chart.layoutService.update(this, this.width, this.height);
-
-                    /**
-                     * Provided for backward compatibility, use `afterLayout` instead.
-                     * @method IPlugin#afterScaleUpdate
-                     * @deprecated since version 2.5.0
-                     * @todo remove at version 3
-                     * @private
-                     */
-                    plugins.notify(me, 'afterScaleUpdate');
-                    plugins.notify(me, 'afterLayout');
-                },
-
-                /**
-                 * Updates all datasets unless a plugin returns `false` to the `beforeDatasetsUpdate`
-                 * hook, in which case, plugins will not be called on `afterDatasetsUpdate`.
-                 * @private
-                 */
-                updateDatasets: function() {
-                    var me = this;
-
-                    if (plugins.notify(me, 'beforeDatasetsUpdate') === false) {
-                        return;
-                    }
-
-                    for (var i = 0, ilen = me.data.datasets.length; i < ilen; ++i) {
-                        me.updateDataset(i);
-                    }
-
-                    plugins.notify(me, 'afterDatasetsUpdate');
-                },
-
-                /**
-                 * Updates dataset at index unless a plugin returns `false` to the `beforeDatasetUpdate`
-                 * hook, in which case, plugins will not be called on `afterDatasetUpdate`.
-                 * @private
-                 */
-                updateDataset: function(index) {
-                    var me = this;
-                    var meta = me.getDatasetMeta(index);
-                    var args = {
-                        meta: meta,
-                        index: index
-                    };
-
-                    if (plugins.notify(me, 'beforeDatasetUpdate', [args]) === false) {
-                        return;
-                    }
-
-                    meta.controller.update();
-
-                    plugins.notify(me, 'afterDatasetUpdate', [args]);
-                },
-
-                render: function(config) {
-                    var me = this;
-
-                    if (!config || typeof config !== 'object') {
-                        // backwards compatibility
-                        config = {
-                            duration: config,
-                            lazy: arguments[1]
-                        };
-                    }
-
-                    var duration = config.duration;
-                    var lazy = config.lazy;
-
-                    if (plugins.notify(me, 'beforeRender') === false) {
-                        return;
-                    }
-
-                    var animationOptions = me.options.animation;
-                    var onComplete = function(animation) {
-                        plugins.notify(me, 'afterRender');
-                        helpers.callback(animationOptions && animationOptions.onComplete, [animation], me);
-                    };
-
-                    if (animationOptions && ((typeof duration !== 'undefined' && duration !== 0) || (typeof duration === 'undefined' && animationOptions.duration !== 0))) {
-                        var animation = new Chart.Animation({
-                            numSteps: (duration || animationOptions.duration) / 16.66, // 60 fps
-                            easing: config.easing || animationOptions.easing,
-
-                            render: function(chart, animationObject) {
-                                var easingFunction = helpers.easing.effects[animationObject.easing];
-                                var currentStep = animationObject.currentStep;
-                                var stepDecimal = currentStep / animationObject.numSteps;
-
-                                chart.draw(easingFunction(stepDecimal), stepDecimal, currentStep);
-                            },
-
-                            onAnimationProgress: animationOptions.onProgress,
-                            onAnimationComplete: onComplete
-                        });
-
-                        Chart.animationService.addAnimation(me, animation, duration, lazy);
-                    } else {
-                        me.draw();
-
-                        // See https://github.com/chartjs/Chart.js/issues/3781
-                        onComplete(new Chart.Animation({ numSteps: 0, chart: me }));
-                    }
-
-                    return me;
-                },
-
-                draw: function(easingValue) {
-                    var me = this;
-
-                    me.clear();
-
-                    if (helpers.isNullOrUndef(easingValue)) {
-                        easingValue = 1;
-                    }
-
-                    me.transition(easingValue);
-
-                    if (plugins.notify(me, 'beforeDraw', [easingValue]) === false) {
-                        return;
-                    }
-
-                    // Draw all the scales
-                    helpers.each(me.boxes, function(box) {
-                        box.draw(me.chartArea);
-                    }, me);
-
-                    if (me.scale) {
-                        me.scale.draw();
-                    }
-
-                    me.drawDatasets(easingValue);
-
-                    // Finally draw the tooltip
-                    me.tooltip.draw();
-
-                    plugins.notify(me, 'afterDraw', [easingValue]);
-                },
-
-                /**
-                 * @private
-                 */
-                transition: function(easingValue) {
-                    var me = this;
-
-                    for (var i = 0, ilen = (me.data.datasets || []).length; i < ilen; ++i) {
-                        if (me.isDatasetVisible(i)) {
-                            me.getDatasetMeta(i).controller.transition(easingValue);
-                        }
-                    }
-
-                    me.tooltip.transition(easingValue);
-                },
-
-                /**
-                 * Draws all datasets unless a plugin returns `false` to the `beforeDatasetsDraw`
-                 * hook, in which case, plugins will not be called on `afterDatasetsDraw`.
-                 * @private
-                 */
-                drawDatasets: function(easingValue) {
-                    var me = this;
-
-                    if (plugins.notify(me, 'beforeDatasetsDraw', [easingValue]) === false) {
-                        return;
-                    }
-
-                    // Draw datasets reversed to support proper line stacking
-                    for (var i = (me.data.datasets || []).length - 1; i >= 0; --i) {
-                        if (me.isDatasetVisible(i)) {
-                            me.drawDataset(i, easingValue);
-                        }
-                    }
-
-                    plugins.notify(me, 'afterDatasetsDraw', [easingValue]);
-                },
-
-                /**
-                 * Draws dataset at index unless a plugin returns `false` to the `beforeDatasetDraw`
-                 * hook, in which case, plugins will not be called on `afterDatasetDraw`.
-                 * @private
-                 */
-                drawDataset: function(index, easingValue) {
-                    var me = this;
-                    var meta = me.getDatasetMeta(index);
-                    var args = {
-                        meta: meta,
-                        index: index,
-                        easingValue: easingValue
-                    };
-
-                    if (plugins.notify(me, 'beforeDatasetDraw', [args]) === false) {
-                        return;
-                    }
-
-                    meta.controller.draw(easingValue);
-
-                    plugins.notify(me, 'afterDatasetDraw', [args]);
-                },
-
-                // Get the single element that was clicked on
-                // @return : An object containing the dataset index and element index of the matching element. Also contains the rectangle that was draw
-                getElementAtEvent: function(e) {
-                    return Interaction.modes.single(this, e);
-                },
-
-                getElementsAtEvent: function(e) {
-                    return Interaction.modes.label(this, e, { intersect: true });
-                },
-
-                getElementsAtXAxis: function(e) {
-                    return Interaction.modes['x-axis'](this, e, { intersect: true });
-                },
-
-                getElementsAtEventForMode: function(e, mode, options) {
-                    var method = Interaction.modes[mode];
-                    if (typeof method === 'function') {
-                        return method(this, e, options);
-                    }
-
-                    return [];
-                },
-
-                getDatasetAtEvent: function(e) {
-                    return Interaction.modes.dataset(this, e, { intersect: true });
-                },
-
-                getDatasetMeta: function(datasetIndex) {
-                    var me = this;
-                    var dataset = me.data.datasets[datasetIndex];
-                    if (!dataset._meta) {
-                        dataset._meta = {};
-                    }
-
-                    var meta = dataset._meta[me.id];
-                    if (!meta) {
-                        meta = dataset._meta[me.id] = {
-                            type: null,
-                            data: [],
-                            dataset: null,
-                            controller: null,
-                            hidden: null,			// See isDatasetVisible() comment
-                            xAxisID: null,
-                            yAxisID: null
-                        };
-                    }
-
-                    return meta;
-                },
-
-                getVisibleDatasetCount: function() {
-                    var count = 0;
-                    for (var i = 0, ilen = this.data.datasets.length; i < ilen; ++i) {
-                        if (this.isDatasetVisible(i)) {
-                            count++;
-                        }
-                    }
-                    return count;
-                },
-
-                isDatasetVisible: function(datasetIndex) {
-                    var meta = this.getDatasetMeta(datasetIndex);
-
-                    // meta.hidden is a per chart dataset hidden flag override with 3 states: if true or false,
-                    // the dataset.hidden value is ignored, else if null, the dataset hidden state is returned.
-                    return typeof meta.hidden === 'boolean' ? !meta.hidden : !this.data.datasets[datasetIndex].hidden;
-                },
-
-                generateLegend: function() {
-                    return this.options.legendCallback(this);
-                },
-
-                /**
-                 * @private
-                 */
-                destroyDatasetMeta: function(datasetIndex) {
-                    var id = this.id;
-                    var dataset = this.data.datasets[datasetIndex];
-                    var meta = dataset._meta && dataset._meta[id];
-
-                    if (meta) {
-                        meta.controller.destroy();
-                        delete dataset._meta[id];
-                    }
-                },
-
-                destroy: function() {
-                    var me = this;
-                    var canvas = me.canvas;
-                    var i, ilen;
-
-                    me.stop();
-
-                    // dataset controllers need to cleanup associated data
-                    for (i = 0, ilen = me.data.datasets.length; i < ilen; ++i) {
-                        me.destroyDatasetMeta(i);
-                    }
-
-                    if (canvas) {
-                        me.unbindEvents();
-                        helpers.canvas.clear(me);
-                        platform.releaseContext(me.ctx);
-                        me.canvas = null;
-                        me.ctx = null;
-                    }
-
-                    plugins.notify(me, 'destroy');
-
-                    delete Chart.instances[me.id];
-                },
-
-                toBase64Image: function() {
-                    return this.canvas.toDataURL.apply(this.canvas, arguments);
-                },
-
-                initToolTip: function() {
-                    var me = this;
-                    me.tooltip = new Chart.Tooltip({
-                        _chart: me,
-                        _chartInstance: me, // deprecated, backward compatibility
-                        _data: me.data,
-                        _options: me.options.tooltips
-                    }, me);
-                },
-
-                /**
-                 * @private
-                 */
-                bindEvents: function() {
-                    var me = this;
-                    var listeners = me._listeners = {};
-                    var listener = function() {
-                        me.eventHandler.apply(me, arguments);
-                    };
-
-                    helpers.each(me.options.events, function(type) {
-                        platform.addEventListener(me, type, listener);
-                        listeners[type] = listener;
-                    });
-
-                    // Elements used to detect size change should not be injected for non responsive charts.
-                    // See https://github.com/chartjs/Chart.js/issues/2210
-                    if (me.options.responsive) {
-                        listener = function() {
-                            me.resize();
-                        };
-
-                        platform.addEventListener(me, 'resize', listener);
-                        listeners.resize = listener;
-                    }
-                },
-
-                /**
-                 * @private
-                 */
-                unbindEvents: function() {
-                    var me = this;
-                    var listeners = me._listeners;
-                    if (!listeners) {
-                        return;
-                    }
-
-                    delete me._listeners;
-                    helpers.each(listeners, function(listener, type) {
-                        platform.removeEventListener(me, type, listener);
-                    });
-                },
-
-                updateHoverStyle: function(elements, mode, enabled) {
-                    var method = enabled ? 'setHoverStyle' : 'removeHoverStyle';
-                    var element, i, ilen;
-
-                    for (i = 0, ilen = elements.length; i < ilen; ++i) {
-                        element = elements[i];
-                        if (element) {
-                            this.getDatasetMeta(element._datasetIndex).controller[method](element);
-                        }
-                    }
-                },
-
-                /**
-                 * @private
-                 */
-                eventHandler: function(e) {
-                    var me = this;
-                    var tooltip = me.tooltip;
-
-                    if (plugins.notify(me, 'beforeEvent', [e]) === false) {
-                        return;
-                    }
-
-                    // Buffer any update calls so that renders do not occur
-                    me._bufferedRender = true;
-                    me._bufferedRequest = null;
-
-                    var changed = me.handleEvent(e);
-                    changed |= tooltip && tooltip.handleEvent(e);
-
-                    plugins.notify(me, 'afterEvent', [e]);
-
-                    var bufferedRequest = me._bufferedRequest;
-                    if (bufferedRequest) {
-                        // If we have an update that was triggered, we need to do a normal render
-                        me.render(bufferedRequest);
-                    } else if (changed && !me.animating) {
-                        // If entering, leaving, or changing elements, animate the change via pivot
-                        me.stop();
-
-                        // We only need to render at this point. Updating will cause scales to be
-                        // recomputed generating flicker & using more memory than necessary.
-                        me.render(me.options.hover.animationDuration, true);
-                    }
-
-                    me._bufferedRender = false;
-                    me._bufferedRequest = null;
-
-                    return me;
-                },
-
-                /**
-                 * Handle an event
-                 * @private
-                 * @param {IEvent} event the event to handle
-                 * @return {Boolean} true if the chart needs to re-render
-                 */
-                handleEvent: function(e) {
-                    var me = this;
-                    var options = me.options || {};
-                    var hoverOptions = options.hover;
-                    var changed = false;
-
-                    me.lastActive = me.lastActive || [];
-
-                    // Find Active Elements for hover and tooltips
-                    if (e.type === 'mouseout') {
-                        me.active = [];
-                    } else {
-                        me.active = me.getElementsAtEventForMode(e, hoverOptions.mode, hoverOptions);
-                    }
-
-                    // Invoke onHover hook
-                    // Need to call with native event here to not break backwards compatibility
-                    helpers.callback(options.onHover || options.hover.onHover, [e.native, me.active], me);
-
-                    if (e.type === 'mouseup' || e.type === 'click') {
-                        if (options.onClick) {
-                            // Use e.native here for backwards compatibility
-                            options.onClick.call(me, e.native, me.active);
-                        }
-                    }
-
-                    // Remove styling for last active (even if it may still be active)
-                    if (me.lastActive.length) {
-                        me.updateHoverStyle(me.lastActive, hoverOptions.mode, false);
-                    }
-
-                    // Built in hover styling
-                    if (me.active.length && hoverOptions.mode) {
-                        me.updateHoverStyle(me.active, hoverOptions.mode, true);
-                    }
-
-                    changed = !helpers.arrayEquals(me.active, me.lastActive);
-
-                    // Remember Last Actives
-                    me.lastActive = me.active;
-
-                    return changed;
-                }
-            });
-
-            /**
-             * Provided for backward compatibility, use Chart instead.
-             * @class Chart.Controller
-             * @deprecated since version 2.6.0
-             * @todo remove at version 3
-             * @private
-             */
-            Chart.Controller = Chart;
-        };
-
-    },{ "25":25,"28":28,"45":45,"48":48 }],24:[function(require,module,exports){
-        'use strict';
-
-        var helpers = require(45);
-
-        module.exports = function(Chart) {
-
-            var arrayEvents = ['push', 'pop', 'shift', 'splice', 'unshift'];
-
-            /**
-             * Hooks the array methods that add or remove values ('push', pop', 'shift', 'splice',
-             * 'unshift') and notify the listener AFTER the array has been altered. Listeners are
-             * called on the 'onData*' callbacks (e.g. onDataPush, etc.) with same arguments.
-             */
-            function listenArrayEvents(array, listener) {
-                if (array._chartjs) {
-                    array._chartjs.listeners.push(listener);
-                    return;
-                }
-
-                Object.defineProperty(array, '_chartjs', {
-                    configurable: true,
-                    enumerable: false,
-                    value: {
-                        listeners: [listener]
-                    }
-                });
-
-                arrayEvents.forEach(function(key) {
-                    var method = 'onData' + key.charAt(0).toUpperCase() + key.slice(1);
-                    var base = array[key];
-
-                    Object.defineProperty(array, key, {
-                        configurable: true,
-                        enumerable: false,
-                        value: function() {
-                            var args = Array.prototype.slice.call(arguments);
-                            var res = base.apply(this, args);
-
-                            helpers.each(array._chartjs.listeners, function(object) {
-                                if (typeof object[method] === 'function') {
-                                    object[method].apply(object, args);
-                                }
-                            });
-
-                            return res;
-                        }
-                    });
-                });
-            }
-
-            /**
-             * Removes the given array event listener and cleanup extra attached properties (such as
-             * the _chartjs stub and overridden methods) if array doesn't have any more listeners.
-             */
-            function unlistenArrayEvents(array, listener) {
-                var stub = array._chartjs;
-                if (!stub) {
-                    return;
-                }
-
-                var listeners = stub.listeners;
-                var index = listeners.indexOf(listener);
-                if (index !== -1) {
-                    listeners.splice(index, 1);
-                }
-
-                if (listeners.length > 0) {
-                    return;
-                }
-
-                arrayEvents.forEach(function(key) {
-                    delete array[key];
-                });
-
-                delete array._chartjs;
-            }
-
-            // Base class for all dataset controllers (line, bar, etc)
-            Chart.DatasetController = function(chart, datasetIndex) {
-                this.initialize(chart, datasetIndex);
-            };
-
-            helpers.extend(Chart.DatasetController.prototype, {
-
-                /**
-                 * Element type used to generate a meta dataset (e.g. Chart.element.Line).
-                 * @type {Chart.core.element}
-                 */
-                datasetElementType: null,
-
-                /**
-                 * Element type used to generate a meta data (e.g. Chart.element.Point).
-                 * @type {Chart.core.element}
-                 */
-                dataElementType: null,
-
-                initialize: function(chart, datasetIndex) {
-                    var me = this;
-                    me.chart = chart;
-                    me.index = datasetIndex;
-                    me.linkScales();
-                    me.addElements();
-                },
-
-                updateIndex: function(datasetIndex) {
-                    this.index = datasetIndex;
-                },
-
-                linkScales: function() {
-                    var me = this;
-                    var meta = me.getMeta();
-                    var dataset = me.getDataset();
-
-                    if (meta.xAxisID === null) {
-                        meta.xAxisID = dataset.xAxisID || me.chart.options.scales.xAxes[0].id;
-                    }
-                    if (meta.yAxisID === null) {
-                        meta.yAxisID = dataset.yAxisID || me.chart.options.scales.yAxes[0].id;
-                    }
-                },
-
-                getDataset: function() {
-                    return this.chart.data.datasets[this.index];
-                },
-
-                getMeta: function() {
-                    return this.chart.getDatasetMeta(this.index);
-                },
-
-                getScaleForId: function(scaleID) {
-                    return this.chart.scales[scaleID];
-                },
-
-                reset: function() {
-                    this.update(true);
-                },
-
-                /**
-                 * @private
-                 */
-                destroy: function() {
-                    if (this._data) {
-                        unlistenArrayEvents(this._data, this);
-                    }
-                },
-
-                createMetaDataset: function() {
-                    var me = this;
-                    var type = me.datasetElementType;
-                    return type && new type({
-                        _chart: me.chart,
-                        _datasetIndex: me.index
-                    });
-                },
-
-                createMetaData: function(index) {
-                    var me = this;
-                    var type = me.dataElementType;
-                    return type && new type({
-                        _chart: me.chart,
-                        _datasetIndex: me.index,
-                        _index: index
-                    });
-                },
-
-                addElements: function() {
-                    var me = this;
-                    var meta = me.getMeta();
-                    var data = me.getDataset().data || [];
-                    var metaData = meta.data;
-                    var i, ilen;
-
-                    for (i = 0, ilen = data.length; i < ilen; ++i) {
-                        metaData[i] = metaData[i] || me.createMetaData(i);
-                    }
-
-                    meta.dataset = meta.dataset || me.createMetaDataset();
-                },
-
-                addElementAndReset: function(index) {
-                    var element = this.createMetaData(index);
-                    this.getMeta().data.splice(index, 0, element);
-                    this.updateElement(element, index, true);
-                },
-
-                buildOrUpdateElements: function() {
-                    var me = this;
-                    var dataset = me.getDataset();
-                    var data = dataset.data || (dataset.data = []);
-
-                    // In order to correctly handle data addition/deletion animation (an thus simulate
-                    // real-time charts), we need to monitor these data modifications and synchronize
-                    // the internal meta data accordingly.
-                    if (me._data !== data) {
-                        if (me._data) {
-                            // This case happens when the user replaced the data array instance.
-                            unlistenArrayEvents(me._data, me);
-                        }
-
-                        listenArrayEvents(data, me);
-                        me._data = data;
-                    }
-
-                    // Re-sync meta data in case the user replaced the data array or if we missed
-                    // any updates and so make sure that we handle number of datapoints changing.
-                    me.resyncElements();
-                },
-
-                update: helpers.noop,
-
-                transition: function(easingValue) {
-                    var meta = this.getMeta();
-                    var elements = meta.data || [];
-                    var ilen = elements.length;
-                    var i = 0;
-
-                    for (; i < ilen; ++i) {
-                        elements[i].transition(easingValue);
-                    }
-
-                    if (meta.dataset) {
-                        meta.dataset.transition(easingValue);
-                    }
-                },
-
-                draw: function() {
-                    var meta = this.getMeta();
-                    var elements = meta.data || [];
-                    var ilen = elements.length;
-                    var i = 0;
-
-                    if (meta.dataset) {
-                        meta.dataset.draw();
-                    }
-
-                    for (; i < ilen; ++i) {
-                        elements[i].draw();
-                    }
-                },
-
-                removeHoverStyle: function(element, elementOpts) {
-                    var dataset = this.chart.data.datasets[element._datasetIndex];
-                    var index = element._index;
-                    var custom = element.custom || {};
-                    var valueOrDefault = helpers.valueAtIndexOrDefault;
-                    var model = element._model;
-
-                    model.backgroundColor = custom.backgroundColor ? custom.backgroundColor : valueOrDefault(dataset.backgroundColor, index, elementOpts.backgroundColor);
-                    model.borderColor = custom.borderColor ? custom.borderColor : valueOrDefault(dataset.borderColor, index, elementOpts.borderColor);
-                    model.borderWidth = custom.borderWidth ? custom.borderWidth : valueOrDefault(dataset.borderWidth, index, elementOpts.borderWidth);
-                },
-
-                setHoverStyle: function(element) {
-                    var dataset = this.chart.data.datasets[element._datasetIndex];
-                    var index = element._index;
-                    var custom = element.custom || {};
-                    var valueOrDefault = helpers.valueAtIndexOrDefault;
-                    var getHoverColor = helpers.getHoverColor;
-                    var model = element._model;
-
-                    model.backgroundColor = custom.hoverBackgroundColor ? custom.hoverBackgroundColor : valueOrDefault(dataset.hoverBackgroundColor, index, getHoverColor(model.backgroundColor));
-                    model.borderColor = custom.hoverBorderColor ? custom.hoverBorderColor : valueOrDefault(dataset.hoverBorderColor, index, getHoverColor(model.borderColor));
-                    model.borderWidth = custom.hoverBorderWidth ? custom.hoverBorderWidth : valueOrDefault(dataset.hoverBorderWidth, index, model.borderWidth);
-                },
-
-                /**
-                 * @private
-                 */
-                resyncElements: function() {
-                    var me = this;
-                    var meta = me.getMeta();
-                    var data = me.getDataset().data;
-                    var numMeta = meta.data.length;
-                    var numData = data.length;
-
-                    if (numData < numMeta) {
-                        meta.data.splice(numData, numMeta - numData);
-                    } else if (numData > numMeta) {
-                        me.insertElements(numMeta, numData - numMeta);
-                    }
-                },
-
-                /**
-                 * @private
-                 */
-                insertElements: function(start, count) {
-                    for (var i = 0; i < count; ++i) {
-                        this.addElementAndReset(start + i);
-                    }
-                },
-
-                /**
-                 * @private
-                 */
-                onDataPush: function() {
-                    this.insertElements(this.getDataset().data.length - 1, arguments.length);
-                },
-
-                /**
-                 * @private
-                 */
-                onDataPop: function() {
-                    this.getMeta().data.pop();
-                },
-
-                /**
-                 * @private
-                 */
-                onDataShift: function() {
-                    this.getMeta().data.shift();
-                },
-
-                /**
-                 * @private
-                 */
-                onDataSplice: function(start, count) {
-                    this.getMeta().data.splice(start, count);
-                    this.insertElements(start, arguments.length - 2);
-                },
-
-                /**
-                 * @private
-                 */
-                onDataUnshift: function() {
-                    this.insertElements(0, arguments.length);
-                }
-            });
-
-            Chart.DatasetController.extend = helpers.inherits;
-        };
-
-    },{ "45":45 }],25:[function(require,module,exports){
-        'use strict';
-
-        var helpers = require(45);
-
-        module.exports = {
-            /**
-             * @private
-             */
-            _set: function(scope, values) {
-                return helpers.merge(this[scope] || (this[scope] = {}), values);
-            }
-        };
-
-    },{ "45":45 }],26:[function(require,module,exports){
-        'use strict';
-
-        var color = require(3);
-        var helpers = require(45);
-
-        function interpolate(start, view, model, ease) {
-            var keys = Object.keys(model);
-            var i, ilen, key, actual, origin, target, type, c0, c1;
-
-            for (i = 0, ilen = keys.length; i < ilen; ++i) {
-                key = keys[i];
-
-                target = model[key];
-
-                // if a value is added to the model after pivot() has been called, the view
-                // doesn't contain it, so let's initialize the view to the target value.
-                if (!view.hasOwnProperty(key)) {
-                    view[key] = target;
-                }
-
-                actual = view[key];
-
-                if (actual === target || key[0] === '_') {
-                    continue;
-                }
-
-                if (!start.hasOwnProperty(key)) {
-                    start[key] = actual;
-                }
-
-                origin = start[key];
-
-                type = typeof target;
-
-                if (type === typeof origin) {
-                    if (type === 'string') {
-                        c0 = color(origin);
-                        if (c0.valid) {
-                            c1 = color(target);
-                            if (c1.valid) {
-                                view[key] = c1.mix(c0, ease).rgbString();
-                                continue;
-                            }
-                        }
-                    } else if (type === 'number' && isFinite(origin) && isFinite(target)) {
-                        view[key] = origin + (target - origin) * ease;
-                        continue;
-                    }
-                }
-
-                view[key] = target;
-            }
-        }
-
-        var Element = function(configuration) {
-            helpers.extend(this, configuration);
-            this.initialize.apply(this, arguments);
-        };
-
-        helpers.extend(Element.prototype, {
-
-            initialize: function() {
-                this.hidden = false;
-            },
-
-            pivot: function() {
-                var me = this;
-                if (!me._view) {
-                    me._view = helpers.clone(me._model);
-                }
-                me._start = {};
-                return me;
-            },
-
-            transition: function(ease) {
-                var me = this;
-                var model = me._model;
-                var start = me._start;
-                var view = me._view;
-
-                // No animation -> No Transition
-                if (!model || ease === 1) {
-                    me._view = model;
-                    me._start = null;
-                    return me;
-                }
-
-                if (!view) {
-                    view = me._view = {};
-                }
-
-                if (!start) {
-                    start = me._start = {};
-                }
-
-                interpolate(start, view, model, ease);
-
-                return me;
-            },
-
-            tooltipPosition: function() {
-                return {
-                    x: this._model.x,
-                    y: this._model.y
-                };
-            },
-
-            hasValue: function() {
-                return helpers.isNumber(this._model.x) && helpers.isNumber(this._model.y);
-            }
-        });
-
-        Element.extend = helpers.inherits;
-
-        module.exports = Element;
-
-    },{ "3":3,"45":45 }],27:[function(require,module,exports){
-        /* global window: false */
-        /* global document: false */
-        'use strict';
-
-        var color = require(3);
-        var defaults = require(25);
-        var helpers = require(45);
-
-        module.exports = function(Chart) {
-
-            // -- Basic js utility methods
-
-            helpers.extend = function(base) {
-                var setFn = function(value, key) {
-                    base[key] = value;
-                };
-                for (var i = 1, ilen = arguments.length; i < ilen; i++) {
-                    helpers.each(arguments[i], setFn);
-                }
-                return base;
-            };
-
-            helpers.configMerge = function(/* objects ... */) {
-                return helpers.merge(helpers.clone(arguments[0]), [].slice.call(arguments, 1), {
-                    merger: function(key, target, source, options) {
-                        var tval = target[key] || {};
-                        var sval = source[key];
-
-                        if (key === 'scales') {
-                            // scale config merging is complex. Add our own function here for that
-                            target[key] = helpers.scaleMerge(tval, sval);
-                        } else if (key === 'scale') {
-                            // used in polar area & radar charts since there is only one scale
-                            target[key] = helpers.merge(tval, [Chart.scaleService.getScaleDefaults(sval.type), sval]);
-                        } else {
-                            helpers._merger(key, target, source, options);
-                        }
-                    }
-                });
-            };
-
-            helpers.scaleMerge = function(/* objects ... */) {
-                return helpers.merge(helpers.clone(arguments[0]), [].slice.call(arguments, 1), {
-                    merger: function(key, target, source, options) {
-                        if (key === 'xAxes' || key === 'yAxes') {
-                            var slen = source[key].length;
-                            var i, type, scale;
-
-                            if (!target[key]) {
-                                target[key] = [];
-                            }
-
-                            for (i = 0; i < slen; ++i) {
-                                scale = source[key][i];
-                                type = helpers.valueOrDefault(scale.type, key === 'xAxes' ? 'category' : 'linear');
-
-                                if (i >= target[key].length) {
-                                    target[key].push({});
-                                }
-
-                                if (!target[key][i].type || (scale.type && scale.type !== target[key][i].type)) {
-                                    // new/untyped scale or type changed: let's apply the new defaults
-                                    // then merge source scale to correctly overwrite the defaults.
-                                    helpers.merge(target[key][i], [Chart.scaleService.getScaleDefaults(type), scale]);
-                                } else {
-                                    // scales type are the same
-                                    helpers.merge(target[key][i], scale);
-                                }
-                            }
-                        } else {
-                            helpers._merger(key, target, source, options);
-                        }
-                    }
-                });
-            };
-
-            helpers.where = function(collection, filterCallback) {
-                if (helpers.isArray(collection) && Array.prototype.filter) {
-                    return collection.filter(filterCallback);
-                }
-                var filtered = [];
-
-                helpers.each(collection, function(item) {
-                    if (filterCallback(item)) {
-                        filtered.push(item);
-                    }
-                });
-
-                return filtered;
-            };
-            helpers.findIndex = Array.prototype.findIndex ?
-                    function(array, callback, scope) {
-                        return array.findIndex(callback, scope);
-                    } :
-                    function(array, callback, scope) {
-                        scope = scope === undefined ? array : scope;
-                        for (var i = 0, ilen = array.length; i < ilen; ++i) {
-                            if (callback.call(scope, array[i], i, array)) {
-                                return i;
-                            }
-                        }
-                        return -1;
-                    };
-            helpers.findNextWhere = function(arrayToSearch, filterCallback, startIndex) {
-                // Default to start of the array
-                if (helpers.isNullOrUndef(startIndex)) {
-                    startIndex = -1;
-                }
-                for (var i = startIndex + 1; i < arrayToSearch.length; i++) {
-                    var currentItem = arrayToSearch[i];
-                    if (filterCallback(currentItem)) {
-                        return currentItem;
-                    }
-                }
-            };
-            helpers.findPreviousWhere = function(arrayToSearch, filterCallback, startIndex) {
-                // Default to end of the array
-                if (helpers.isNullOrUndef(startIndex)) {
-                    startIndex = arrayToSearch.length;
-                }
-                for (var i = startIndex - 1; i >= 0; i--) {
-                    var currentItem = arrayToSearch[i];
-                    if (filterCallback(currentItem)) {
-                        return currentItem;
-                    }
-                }
-            };
-            helpers.inherits = function(extensions) {
-                // Basic javascript inheritance based on the model created in Backbone.js
-                var me = this;
-                var ChartElement = (extensions && extensions.hasOwnProperty('constructor')) ? extensions.constructor : function() {
-                    return me.apply(this, arguments);
-                };
-
-                var Surrogate = function() {
-                    this.constructor = ChartElement;
-                };
-                Surrogate.prototype = me.prototype;
-                ChartElement.prototype = new Surrogate();
-
-                ChartElement.extend = helpers.inherits;
-
-                if (extensions) {
-                    helpers.extend(ChartElement.prototype, extensions);
-                }
-
-                ChartElement.__super__ = me.prototype;
-
-                return ChartElement;
-            };
-            // -- Math methods
-            helpers.isNumber = function(n) {
-                return !isNaN(parseFloat(n)) && isFinite(n);
-            };
-            helpers.almostEquals = function(x, y, epsilon) {
-                return Math.abs(x - y) < epsilon;
-            };
-            helpers.almostWhole = function(x, epsilon) {
-                var rounded = Math.round(x);
-                return (((rounded - epsilon) < x) && ((rounded + epsilon) > x));
-            };
-            helpers.max = function(array) {
-                return array.reduce(function(max, value) {
-                    if (!isNaN(value)) {
-                        return Math.max(max, value);
-                    }
-                    return max;
-                }, Number.NEGATIVE_INFINITY);
-            };
-            helpers.min = function(array) {
-                return array.reduce(function(min, value) {
-                    if (!isNaN(value)) {
-                        return Math.min(min, value);
-                    }
-                    return min;
-                }, Number.POSITIVE_INFINITY);
-            };
-            helpers.sign = Math.sign ?
-                    function(x) {
-                        return Math.sign(x);
-                    } :
-                    function(x) {
-                        x = +x; // convert to a number
-                        if (x === 0 || isNaN(x)) {
-                            return x;
-                        }
-                        return x > 0 ? 1 : -1;
-                    };
-            helpers.log10 = Math.log10 ?
-                    function(x) {
-                        return Math.log10(x);
-                    } :
-                    function(x) {
-                        return Math.log(x) / Math.LN10;
-                    };
-            helpers.toRadians = function(degrees) {
-                return degrees * (Math.PI / 180);
-            };
-            helpers.toDegrees = function(radians) {
-                return radians * (180 / Math.PI);
-            };
-            // Gets the angle from vertical upright to the point about a centre.
-            helpers.getAngleFromPoint = function(centrePoint, anglePoint) {
-                var distanceFromXCenter = anglePoint.x - centrePoint.x;
-                var distanceFromYCenter = anglePoint.y - centrePoint.y;
-                var radialDistanceFromCenter = Math.sqrt(distanceFromXCenter * distanceFromXCenter + distanceFromYCenter * distanceFromYCenter);
-
-                var angle = Math.atan2(distanceFromYCenter, distanceFromXCenter);
-
-                if (angle < (-0.5 * Math.PI)) {
-                    angle += 2.0 * Math.PI; // make sure the returned angle is in the range of (-PI/2, 3PI/2]
-                }
-
-                return {
-                    angle: angle,
-                    distance: radialDistanceFromCenter
-                };
-            };
-            helpers.distanceBetweenPoints = function(pt1, pt2) {
-                return Math.sqrt(Math.pow(pt2.x - pt1.x, 2) + Math.pow(pt2.y - pt1.y, 2));
-            };
-            helpers.aliasPixel = function(pixelWidth) {
-                return (pixelWidth % 2 === 0) ? 0 : 0.5;
-            };
-            helpers.splineCurve = function(firstPoint, middlePoint, afterPoint, t) {
-                // Props to Rob Spencer at scaled innovation for his post on splining between points
-                // http://scaledinnovation.com/analytics/splines/aboutSplines.html
-
-                // This function must also respect "skipped" points
-
-                var previous = firstPoint.skip ? middlePoint : firstPoint;
-                var current = middlePoint;
-                var next = afterPoint.skip ? middlePoint : afterPoint;
-
-                var d01 = Math.sqrt(Math.pow(current.x - previous.x, 2) + Math.pow(current.y - previous.y, 2));
-                var d12 = Math.sqrt(Math.pow(next.x - current.x, 2) + Math.pow(next.y - current.y, 2));
-
-                var s01 = d01 / (d01 + d12);
-                var s12 = d12 / (d01 + d12);
-
-                // If all points are the same, s01 & s02 will be inf
-                s01 = isNaN(s01) ? 0 : s01;
-                s12 = isNaN(s12) ? 0 : s12;
-
-                var fa = t * s01; // scaling factor for triangle Ta
-                var fb = t * s12;
-
-                return {
-                    previous: {
-                        x: current.x - fa * (next.x - previous.x),
-                        y: current.y - fa * (next.y - previous.y)
-                    },
-                    next: {
-                        x: current.x + fb * (next.x - previous.x),
-                        y: current.y + fb * (next.y - previous.y)
-                    }
-                };
-            };
-            helpers.EPSILON = Number.EPSILON || 1e-14;
-            helpers.splineCurveMonotone = function(points) {
-                // This function calculates Bézier control points in a similar way than |splineCurve|,
-                // but preserves monotonicity of the provided data and ensures no local extremums are added
-                // between the dataset discrete points due to the interpolation.
-                // See : https://en.wikipedia.org/wiki/Monotone_cubic_interpolation
-
-                var pointsWithTangents = (points || []).map(function(point) {
-                    return {
-                        model: point._model,
-                        deltaK: 0,
-                        mK: 0
-                    };
-                });
-
-                // Calculate slopes (deltaK) and initialize tangents (mK)
-                var pointsLen = pointsWithTangents.length;
-                var i, pointBefore, pointCurrent, pointAfter;
-                for (i = 0; i < pointsLen; ++i) {
-                    pointCurrent = pointsWithTangents[i];
-                    if (pointCurrent.model.skip) {
-                        continue;
-                    }
-
-                    pointBefore = i > 0 ? pointsWithTangents[i - 1] : null;
-                    pointAfter = i < pointsLen - 1 ? pointsWithTangents[i + 1] : null;
-                    if (pointAfter && !pointAfter.model.skip) {
-                        var slopeDeltaX = (pointAfter.model.x - pointCurrent.model.x);
-
-                        // In the case of two points that appear at the same x pixel, slopeDeltaX is 0
-                        pointCurrent.deltaK = slopeDeltaX !== 0 ? (pointAfter.model.y - pointCurrent.model.y) / slopeDeltaX : 0;
-                    }
-
-                    if (!pointBefore || pointBefore.model.skip) {
-                        pointCurrent.mK = pointCurrent.deltaK;
-                    } else if (!pointAfter || pointAfter.model.skip) {
-                        pointCurrent.mK = pointBefore.deltaK;
-                    } else if (this.sign(pointBefore.deltaK) !== this.sign(pointCurrent.deltaK)) {
-                        pointCurrent.mK = 0;
-                    } else {
-                        pointCurrent.mK = (pointBefore.deltaK + pointCurrent.deltaK) / 2;
-                    }
-                }
-
-                // Adjust tangents to ensure monotonic properties
-                var alphaK, betaK, tauK, squaredMagnitude;
-                for (i = 0; i < pointsLen - 1; ++i) {
-                    pointCurrent = pointsWithTangents[i];
-                    pointAfter = pointsWithTangents[i + 1];
-                    if (pointCurrent.model.skip || pointAfter.model.skip) {
-                        continue;
-                    }
-
-                    if (helpers.almostEquals(pointCurrent.deltaK, 0, this.EPSILON)) {
-                        pointCurrent.mK = pointAfter.mK = 0;
-                        continue;
-                    }
-
-                    alphaK = pointCurrent.mK / pointCurrent.deltaK;
-                    betaK = pointAfter.mK / pointCurrent.deltaK;
-                    squaredMagnitude = Math.pow(alphaK, 2) + Math.pow(betaK, 2);
-                    if (squaredMagnitude <= 9) {
-                        continue;
-                    }
-
-                    tauK = 3 / Math.sqrt(squaredMagnitude);
-                    pointCurrent.mK = alphaK * tauK * pointCurrent.deltaK;
-                    pointAfter.mK = betaK * tauK * pointCurrent.deltaK;
-                }
-
-                // Compute control points
-                var deltaX;
-                for (i = 0; i < pointsLen; ++i) {
-                    pointCurrent = pointsWithTangents[i];
-                    if (pointCurrent.model.skip) {
-                        continue;
-                    }
-
-                    pointBefore = i > 0 ? pointsWithTangents[i - 1] : null;
-                    pointAfter = i < pointsLen - 1 ? pointsWithTangents[i + 1] : null;
-                    if (pointBefore && !pointBefore.model.skip) {
-                        deltaX = (pointCurrent.model.x - pointBefore.model.x) / 3;
-                        pointCurrent.model.controlPointPreviousX = pointCurrent.model.x - deltaX;
-                        pointCurrent.model.controlPointPreviousY = pointCurrent.model.y - deltaX * pointCurrent.mK;
-                    }
-                    if (pointAfter && !pointAfter.model.skip) {
-                        deltaX = (pointAfter.model.x - pointCurrent.model.x) / 3;
-                        pointCurrent.model.controlPointNextX = pointCurrent.model.x + deltaX;
-                        pointCurrent.model.controlPointNextY = pointCurrent.model.y + deltaX * pointCurrent.mK;
-                    }
-                }
-            };
-            helpers.nextItem = function(collection, index, loop) {
-                if (loop) {
-                    return index >= collection.length - 1 ? collection[0] : collection[index + 1];
-                }
-                return index >= collection.length - 1 ? collection[collection.length - 1] : collection[index + 1];
-            };
-            helpers.previousItem = function(collection, index, loop) {
-                if (loop) {
-                    return index <= 0 ? collection[collection.length - 1] : collection[index - 1];
-                }
-                return index <= 0 ? collection[0] : collection[index - 1];
-            };
-            // Implementation of the nice number algorithm used in determining where axis labels will go
-            helpers.niceNum = function(range, round) {
-                var exponent = Math.floor(helpers.log10(range));
-                var fraction = range / Math.pow(10, exponent);
-                var niceFraction;
-
-                if (round) {
-                    if (fraction < 1.5) {
-                        niceFraction = 1;
-                    } else if (fraction < 3) {
-                        niceFraction = 2;
-                    } else if (fraction < 7) {
-                        niceFraction = 5;
-                    } else {
-                        niceFraction = 10;
-                    }
-                } else if (fraction <= 1.0) {
-                    niceFraction = 1;
-                } else if (fraction <= 2) {
-                    niceFraction = 2;
-                } else if (fraction <= 5) {
-                    niceFraction = 5;
-                } else {
-                    niceFraction = 10;
-                }
-
-                return niceFraction * Math.pow(10, exponent);
-            };
-            // Request animation polyfill - http://www.paulirish.com/2011/requestanimationframe-for-smart-animating/
-            helpers.requestAnimFrame = (function() {
-                if (typeof window === 'undefined') {
-                    return function(callback) {
-                        callback();
-                    };
-                }
-                return window.requestAnimationFrame ||
-                        window.webkitRequestAnimationFrame ||
-                        window.mozRequestAnimationFrame ||
-                        window.oRequestAnimationFrame ||
-                        window.msRequestAnimationFrame ||
-                        function(callback) {
-                            return window.setTimeout(callback, 1000 / 60);
-                        };
-            }());
-            // -- DOM methods
-            helpers.getRelativePosition = function(evt, chart) {
-                var mouseX, mouseY;
-                var e = evt.originalEvent || evt;
-                var canvas = evt.currentTarget || evt.srcElement;
-                var boundingRect = canvas.getBoundingClientRect();
-
-                var touches = e.touches;
-                if (touches && touches.length > 0) {
-                    mouseX = touches[0].clientX;
-                    mouseY = touches[0].clientY;
-
-                } else {
-                    mouseX = e.clientX;
-                    mouseY = e.clientY;
-                }
-
-                // Scale mouse coordinates into canvas coordinates
-                // by following the pattern laid out by 'jerryj' in the comments of
-                // http://www.html5canvastutorials.com/advanced/html5-canvas-mouse-coordinates/
-                var paddingLeft = parseFloat(helpers.getStyle(canvas, 'padding-left'));
-                var paddingTop = parseFloat(helpers.getStyle(canvas, 'padding-top'));
-                var paddingRight = parseFloat(helpers.getStyle(canvas, 'padding-right'));
-                var paddingBottom = parseFloat(helpers.getStyle(canvas, 'padding-bottom'));
-                var width = boundingRect.right - boundingRect.left - paddingLeft - paddingRight;
-                var height = boundingRect.bottom - boundingRect.top - paddingTop - paddingBottom;
-
-                // We divide by the current device pixel ratio, because the canvas is scaled up by that amount in each direction. However
-                // the backend model is in unscaled coordinates. Since we are going to deal with our model coordinates, we go back here
-                mouseX = Math.round((mouseX - boundingRect.left - paddingLeft) / (width) * canvas.width / chart.currentDevicePixelRatio);
-                mouseY = Math.round((mouseY - boundingRect.top - paddingTop) / (height) * canvas.height / chart.currentDevicePixelRatio);
-
-                return {
-                    x: mouseX,
-                    y: mouseY
-                };
-
-            };
-
-            // Private helper function to convert max-width/max-height values that may be percentages into a number
-            function parseMaxStyle(styleValue, node, parentProperty) {
-                var valueInPixels;
-                if (typeof styleValue === 'string') {
-                    valueInPixels = parseInt(styleValue, 10);
-
-                    if (styleValue.indexOf('%') !== -1) {
-                        // percentage * size in dimension
-                        valueInPixels = valueInPixels / 100 * node.parentNode[parentProperty];
-                    }
-                } else {
-                    valueInPixels = styleValue;
-                }
-
-                return valueInPixels;
-            }
-
-            /**
-             * Returns if the given value contains an effective constraint.
-             * @private
-             */
-            function isConstrainedValue(value) {
-                return value !== undefined && value !== null && value !== 'none';
-            }
-
-            // Private helper to get a constraint dimension
-            // @param domNode : the node to check the constraint on
-            // @param maxStyle : the style that defines the maximum for the direction we are using (maxWidth / maxHeight)
-            // @param percentageProperty : property of parent to use when calculating width as a percentage
-            // @see http://www.nathanaeljones.com/blog/2013/reading-max-width-cross-browser
-            function getConstraintDimension(domNode, maxStyle, percentageProperty) {
-                var view = document.defaultView;
-                var parentNode = domNode.parentNode;
-                var constrainedNode = view.getComputedStyle(domNode)[maxStyle];
-                var constrainedContainer = view.getComputedStyle(parentNode)[maxStyle];
-                var hasCNode = isConstrainedValue(constrainedNode);
-                var hasCContainer = isConstrainedValue(constrainedContainer);
-                var infinity = Number.POSITIVE_INFINITY;
-
-                if (hasCNode || hasCContainer) {
-                    return Math.min(
-                            hasCNode ? parseMaxStyle(constrainedNode, domNode, percentageProperty) : infinity,
-                            hasCContainer ? parseMaxStyle(constrainedContainer, parentNode, percentageProperty) : infinity);
-                }
-
-                return 'none';
-            }
-            // returns Number or undefined if no constraint
-            helpers.getConstraintWidth = function(domNode) {
-                return getConstraintDimension(domNode, 'max-width', 'clientWidth');
-            };
-            // returns Number or undefined if no constraint
-            helpers.getConstraintHeight = function(domNode) {
-                return getConstraintDimension(domNode, 'max-height', 'clientHeight');
-            };
-            helpers.getMaximumWidth = function(domNode) {
-                var container = domNode.parentNode;
-                if (!container) {
-                    return domNode.clientWidth;
-                }
-
-                var paddingLeft = parseInt(helpers.getStyle(container, 'padding-left'), 10);
-                var paddingRight = parseInt(helpers.getStyle(container, 'padding-right'), 10);
-                var w = container.clientWidth - paddingLeft - paddingRight;
-                var cw = helpers.getConstraintWidth(domNode);
-                return isNaN(cw) ? w : Math.min(w, cw);
-            };
-            helpers.getMaximumHeight = function(domNode) {
-                var container = domNode.parentNode;
-                if (!container) {
-                    return domNode.clientHeight;
-                }
-
-                var paddingTop = parseInt(helpers.getStyle(container, 'padding-top'), 10);
-                var paddingBottom = parseInt(helpers.getStyle(container, 'padding-bottom'), 10);
-                var h = container.clientHeight - paddingTop - paddingBottom;
-                var ch = helpers.getConstraintHeight(domNode);
-                return isNaN(ch) ? h : Math.min(h, ch);
-            };
-            helpers.getStyle = function(el, property) {
-                return el.currentStyle ?
-                        el.currentStyle[property] :
-                        document.defaultView.getComputedStyle(el, null).getPropertyValue(property);
-            };
-            helpers.retinaScale = function(chart, forceRatio) {
-                var pixelRatio = chart.currentDevicePixelRatio = forceRatio || window.devicePixelRatio || 1;
-                if (pixelRatio === 1) {
-                    return;
-                }
-
-                var canvas = chart.canvas;
-                var height = chart.height;
-                var width = chart.width;
-
-                canvas.height = height * pixelRatio;
-                canvas.width = width * pixelRatio;
-                chart.ctx.scale(pixelRatio, pixelRatio);
-
-                // If no style has been set on the canvas, the render size is used as display size,
-                // making the chart visually bigger, so let's enforce it to the "correct" values.
-                // See https://github.com/chartjs/Chart.js/issues/3575
-                canvas.style.height = height + 'px';
-                canvas.style.width = width + 'px';
-            };
-            // -- Canvas methods
-            helpers.fontString = function(pixelSize, fontStyle, fontFamily) {
-                return fontStyle + ' ' + pixelSize + 'px ' + fontFamily;
-            };
-            helpers.longestText = function(ctx, font, arrayOfThings, cache) {
-                cache = cache || {};
-                var data = cache.data = cache.data || {};
-                var gc = cache.garbageCollect = cache.garbageCollect || [];
-
-                if (cache.font !== font) {
-                    data = cache.data = {};
-                    gc = cache.garbageCollect = [];
-                    cache.font = font;
-                }
-
-                ctx.font = font;
-                var longest = 0;
-                helpers.each(arrayOfThings, function(thing) {
-                    // Undefined strings and arrays should not be measured
-                    if (thing !== undefined && thing !== null && helpers.isArray(thing) !== true) {
-                        longest = helpers.measureText(ctx, data, gc, longest, thing);
-                    } else if (helpers.isArray(thing)) {
-                        // if it is an array lets measure each element
-                        // to do maybe simplify this function a bit so we can do this more recursively?
-                        helpers.each(thing, function(nestedThing) {
-                            // Undefined strings and arrays should not be measured
-                            if (nestedThing !== undefined && nestedThing !== null && !helpers.isArray(nestedThing)) {
-                                longest = helpers.measureText(ctx, data, gc, longest, nestedThing);
-                            }
-                        });
-                    }
-                });
-
-                var gcLen = gc.length / 2;
-                if (gcLen > arrayOfThings.length) {
-                    for (var i = 0; i < gcLen; i++) {
-                        delete data[gc[i]];
-                    }
-                    gc.splice(0, gcLen);
-                }
-                return longest;
-            };
-            helpers.measureText = function(ctx, data, gc, longest, string) {
-                var textWidth = data[string];
-                if (!textWidth) {
-                    textWidth = data[string] = ctx.measureText(string).width;
-                    gc.push(string);
-                }
-                if (textWidth > longest) {
-                    longest = textWidth;
-                }
-                return longest;
-            };
-            helpers.numberOfLabelLines = function(arrayOfThings) {
-                var numberOfLines = 1;
-                helpers.each(arrayOfThings, function(thing) {
-                    if (helpers.isArray(thing)) {
-                        if (thing.length > numberOfLines) {
-                            numberOfLines = thing.length;
-                        }
-                    }
-                });
-                return numberOfLines;
-            };
-
-            helpers.color = !color ?
-                    function(value) {
-                        console.error('Color.js not found!');
-                        return value;
-                    } :
-                    function(value) {
-                        /* global CanvasGradient */
-                        if (value instanceof CanvasGradient) {
-                            value = defaults.global.defaultColor;
-                        }
-
-                        return color(value);
-                    };
-
-            helpers.getHoverColor = function(colorValue) {
-                /* global CanvasPattern */
-                return (colorValue instanceof CanvasPattern) ?
-                        colorValue :
-                        helpers.color(colorValue).saturate(0.5).darken(0.1).rgbString();
-            };
-        };
-
-    },{ "25":25,"3":3,"45":45 }],28:[function(require,module,exports){
-        'use strict';
-
-        var helpers = require(45);
-
-        /**
-         * Helper function to get relative position for an event
-         * @param {Event|IEvent} event - The event to get the position for
-         * @param {Chart} chart - The chart
-         * @returns {Point} the event position
-         */
-        function getRelativePosition(e, chart) {
-            if (e.native) {
-                return {
-                    x: e.x,
-                    y: e.y
-                };
-            }
-
-            return helpers.getRelativePosition(e, chart);
-        }
-
-        /**
-         * Helper function to traverse all of the visible elements in the chart
-         * @param chart {chart} the chart
-         * @param handler {Function} the callback to execute for each visible item
-         */
-        function parseVisibleItems(chart, handler) {
-            var datasets = chart.data.datasets;
-            var meta, i, j, ilen, jlen;
-
-            for (i = 0, ilen = datasets.length; i < ilen; ++i) {
-                if (!chart.isDatasetVisible(i)) {
-                    continue;
-                }
-
-                meta = chart.getDatasetMeta(i);
-                for (j = 0, jlen = meta.data.length; j < jlen; ++j) {
-                    var element = meta.data[j];
-                    if (!element._view.skip) {
-                        handler(element);
-                    }
-                }
-            }
-        }
-
-        /**
-         * Helper function to get the items that intersect the event position
-         * @param items {ChartElement[]} elements to filter
-         * @param position {Point} the point to be nearest to
-         * @return {ChartElement[]} the nearest items
-         */
-        function getIntersectItems(chart, position) {
-            var elements = [];
-
-            parseVisibleItems(chart, function(element) {
-                if (element.inRange(position.x, position.y)) {
-                    elements.push(element);
-                }
-            });
-
-            return elements;
-        }
-
-        /**
-         * Helper function to get the items nearest to the event position considering all visible items in teh chart
-         * @param chart {Chart} the chart to look at elements from
-         * @param position {Point} the point to be nearest to
-         * @param intersect {Boolean} if true, only consider items that intersect the position
-         * @param distanceMetric {Function} function to provide the distance between points
-         * @return {ChartElement[]} the nearest items
-         */
-        function getNearestItems(chart, position, intersect, distanceMetric) {
-            var minDistance = Number.POSITIVE_INFINITY;
-            var nearestItems = [];
-
-            parseVisibleItems(chart, function(element) {
-                if (intersect && !element.inRange(position.x, position.y)) {
-                    return;
-                }
-
-                var center = element.getCenterPoint();
-                var distance = distanceMetric(position, center);
-
-                if (distance < minDistance) {
-                    nearestItems = [element];
-                    minDistance = distance;
-                } else if (distance === minDistance) {
-                    // Can have multiple items at the same distance in which case we sort by size
-                    nearestItems.push(element);
-                }
-            });
-
-            return nearestItems;
-        }
-
-        /**
-         * Get a distance metric function for two points based on the
-         * axis mode setting
-         * @param {String} axis the axis mode. x|y|xy
-         */
-        function getDistanceMetricForAxis(axis) {
-            var useX = axis.indexOf('x') !== -1;
-            var useY = axis.indexOf('y') !== -1;
-
-            return function(pt1, pt2) {
-                var deltaX = useX ? Math.abs(pt1.x - pt2.x) : 0;
-                var deltaY = useY ? Math.abs(pt1.y - pt2.y) : 0;
-                return Math.sqrt(Math.pow(deltaX, 2) + Math.pow(deltaY, 2));
-            };
-        }
-
-        function indexMode(chart, e, options) {
-            var position = getRelativePosition(e, chart);
-            // Default axis for index mode is 'x' to match old behaviour
-            options.axis = options.axis || 'x';
-            var distanceMetric = getDistanceMetricForAxis(options.axis);
-            var items = options.intersect ? getIntersectItems(chart, position) : getNearestItems(chart, position, false, distanceMetric);
-            var elements = [];
-
-            if (!items.length) {
-                return [];
-            }
-
-            chart.data.datasets.forEach(function(dataset, datasetIndex) {
-                if (chart.isDatasetVisible(datasetIndex)) {
-                    var meta = chart.getDatasetMeta(datasetIndex);
-                    var element = meta.data[items[0]._index];
-
-                    // don't count items that are skipped (null data)
-                    if (element && !element._view.skip) {
-                        elements.push(element);
-                    }
-                }
-            });
-
-            return elements;
-        }
-
-        /**
-         * @interface IInteractionOptions
-         */
-        /**
-         * If true, only consider items that intersect the point
-         * @name IInterfaceOptions#boolean
-         * @type Boolean
-         */
-
-        /**
-         * Contains interaction related functions
-         * @namespace Chart.Interaction
-         */
-        module.exports = {
-            // Helper function for different modes
-            modes: {
-                single: function(chart, e) {
-                    var position = getRelativePosition(e, chart);
-                    var elements = [];
-
-                    parseVisibleItems(chart, function(element) {
-                        if (element.inRange(position.x, position.y)) {
-                            elements.push(element);
-                            return elements;
-                        }
-                    });
-
-                    return elements.slice(0, 1);
-                },
-
-                /**
-                 * @function Chart.Interaction.modes.label
-                 * @deprecated since version 2.4.0
-                 * @todo remove at version 3
-                 * @private
-                 */
-                label: indexMode,
-
-                /**
-                 * Returns items at the same index. If the options.intersect parameter is true, we only return items if we intersect something
-                 * If the options.intersect mode is false, we find the nearest item and return the items at the same index as that item
-                 * @function Chart.Interaction.modes.index
-                 * @since v2.4.0
-                 * @param chart {chart} the chart we are returning items from
-                 * @param e {Event} the event we are find things at
-                 * @param options {IInteractionOptions} options to use during interaction
-                 * @return {Chart.Element[]} Array of elements that are under the point. If none are found, an empty array is returned
-                 */
-                index: indexMode,
-
-                /**
-                 * Returns items in the same dataset. If the options.intersect parameter is true, we only return items if we intersect something
-                 * If the options.intersect is false, we find the nearest item and return the items in that dataset
-                 * @function Chart.Interaction.modes.dataset
-                 * @param chart {chart} the chart we are returning items from
-                 * @param e {Event} the event we are find things at
-                 * @param options {IInteractionOptions} options to use during interaction
-                 * @return {Chart.Element[]} Array of elements that are under the point. If none are found, an empty array is returned
-                 */
-                dataset: function(chart, e, options) {
-                    var position = getRelativePosition(e, chart);
-                    options.axis = options.axis || 'xy';
-                    var distanceMetric = getDistanceMetricForAxis(options.axis);
-                    var items = options.intersect ? getIntersectItems(chart, position) : getNearestItems(chart, position, false, distanceMetric);
-
-                    if (items.length > 0) {
-                        items = chart.getDatasetMeta(items[0]._datasetIndex).data;
-                    }
-
-                    return items;
-                },
-
-                /**
-                 * @function Chart.Interaction.modes.x-axis
-                 * @deprecated since version 2.4.0. Use index mode and intersect == true
-                 * @todo remove at version 3
-                 * @private
-                 */
-                'x-axis': function(chart, e) {
-                    return indexMode(chart, e, { intersect: true });
-                },
-
-                /**
-                 * Point mode returns all elements that hit test based on the event position
-                 * of the event
-                 * @function Chart.Interaction.modes.intersect
-                 * @param chart {chart} the chart we are returning items from
-                 * @param e {Event} the event we are find things at
-                 * @return {Chart.Element[]} Array of elements that are under the point. If none are found, an empty array is returned
-                 */
-                point: function(chart, e) {
-                    var position = getRelativePosition(e, chart);
-                    return getIntersectItems(chart, position);
-                },
-
-                /**
-                 * nearest mode returns the element closest to the point
-                 * @function Chart.Interaction.modes.intersect
-                 * @param chart {chart} the chart we are returning items from
-                 * @param e {Event} the event we are find things at
-                 * @param options {IInteractionOptions} options to use
-                 * @return {Chart.Element[]} Array of elements that are under the point. If none are found, an empty array is returned
-                 */
-                nearest: function(chart, e, options) {
-                    var position = getRelativePosition(e, chart);
-                    options.axis = options.axis || 'xy';
-                    var distanceMetric = getDistanceMetricForAxis(options.axis);
-                    var nearestItems = getNearestItems(chart, position, options.intersect, distanceMetric);
-
-                    // We have multiple items at the same distance from the event. Now sort by smallest
-                    if (nearestItems.length > 1) {
-                        nearestItems.sort(function(a, b) {
-                            var sizeA = a.getArea();
-                            var sizeB = b.getArea();
-                            var ret = sizeA - sizeB;
-
-                            if (ret === 0) {
-                                // if equal sort by dataset index
-                                ret = a._datasetIndex - b._datasetIndex;
-                            }
-
-                            return ret;
-                        });
-                    }
-
-                    // Return only 1 item
-                    return nearestItems.slice(0, 1);
-                },
-
-                /**
-                 * x mode returns the elements that hit-test at the current x coordinate
-                 * @function Chart.Interaction.modes.x
-                 * @param chart {chart} the chart we are returning items from
-                 * @param e {Event} the event we are find things at
-                 * @param options {IInteractionOptions} options to use
-                 * @return {Chart.Element[]} Array of elements that are under the point. If none are found, an empty array is returned
-                 */
-                x: function(chart, e, options) {
-                    var position = getRelativePosition(e, chart);
-                    var items = [];
-                    var intersectsItem = false;
-
-                    parseVisibleItems(chart, function(element) {
-                        if (element.inXRange(position.x)) {
-                            items.push(element);
-                        }
-
-                        if (element.inRange(position.x, position.y)) {
-                            intersectsItem = true;
-                        }
-                    });
-
-                    // If we want to trigger on an intersect and we don't have any items
-                    // that intersect the position, return nothing
-                    if (options.intersect && !intersectsItem) {
-                        items = [];
-                    }
-                    return items;
-                },
-
-                /**
-                 * y mode returns the elements that hit-test at the current y coordinate
-                 * @function Chart.Interaction.modes.y
-                 * @param chart {chart} the chart we are returning items from
-                 * @param e {Event} the event we are find things at
-                 * @param options {IInteractionOptions} options to use
-                 * @return {Chart.Element[]} Array of elements that are under the point. If none are found, an empty array is returned
-                 */
-                y: function(chart, e, options) {
-                    var position = getRelativePosition(e, chart);
-                    var items = [];
-                    var intersectsItem = false;
-
-                    parseVisibleItems(chart, function(element) {
-                        if (element.inYRange(position.y)) {
-                            items.push(element);
-                        }
-
-                        if (element.inRange(position.x, position.y)) {
-                            intersectsItem = true;
-                        }
-                    });
-
-                    // If we want to trigger on an intersect and we don't have any items
-                    // that intersect the position, return nothing
-                    if (options.intersect && !intersectsItem) {
-                        items = [];
-                    }
-                    return items;
-                }
-            }
-        };
-
-    },{ "45":45 }],29:[function(require,module,exports){
-        'use strict';
-
-        var defaults = require(25);
-
-        defaults._set('global', {
-            responsive: true,
-            responsiveAnimationDuration: 0,
-            maintainAspectRatio: true,
-            events: ['mousemove', 'mouseout', 'click', 'touchstart', 'touchmove'],
-            hover: {
-                onHover: null,
-                mode: 'nearest',
-                intersect: true,
-                animationDuration: 400
-            },
-            onClick: null,
-            defaultColor: 'rgba(0,0,0,0.1)',
-            defaultFontColor: '#666',
-            defaultFontFamily: "'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",
-            defaultFontSize: 12,
-            defaultFontStyle: 'normal',
-            showLines: true,
-
-            // Element defaults defined in element extensions
-            elements: {},
-
-            // Layout options such as padding
-            layout: {
-                padding: {
-                    top: 0,
-                    right: 0,
-                    bottom: 0,
-                    left: 0
-                }
-            }
-        });
-
-        module.exports = function() {
-
-            // Occupy the global variable of Chart, and create a simple base class
-            var Chart = function(item, config) {
-                this.construct(item, config);
-                return this;
-            };
-
-            Chart.Chart = Chart;
-
-            return Chart;
-        };
-
-    },{ "25":25 }],30:[function(require,module,exports){
-        'use strict';
-
-        var helpers = require(45);
-
-        module.exports = function(Chart) {
-
-            function filterByPosition(array, position) {
-                return helpers.where(array, function(v) {
-                    return v.position === position;
-                });
-            }
-
-            function sortByWeight(array, reverse) {
-                array.forEach(function(v, i) {
-                    v._tmpIndex_ = i;
-                    return v;
-                });
-                array.sort(function(a, b) {
-                    var v0 = reverse ? b : a;
-                    var v1 = reverse ? a : b;
-                    return v0.weight === v1.weight ?
-                            v0._tmpIndex_ - v1._tmpIndex_ :
-                            v0.weight - v1.weight;
-                });
-                array.forEach(function(v) {
-                    delete v._tmpIndex_;
-                });
-            }
-
-            /**
-             * @interface ILayoutItem
-             * @prop {String} position - The position of the item in the chart layout. Possible values are
-             * 'left', 'top', 'right', 'bottom', and 'chartArea'
-             * @prop {Number} weight - The weight used to sort the item. Higher weights are further away from the chart area
-             * @prop {Boolean} fullWidth - if true, and the item is horizontal, then push vertical boxes down
-             * @prop {Function} isHorizontal - returns true if the layout item is horizontal (ie. top or bottom)
-             * @prop {Function} update - Takes two parameters: width and height. Returns size of item
-             * @prop {Function} getPadding -  Returns an object with padding on the edges
-             * @prop {Number} width - Width of item. Must be valid after update()
-             * @prop {Number} height - Height of item. Must be valid after update()
-             * @prop {Number} left - Left edge of the item. Set by layout system and cannot be used in update
-             * @prop {Number} top - Top edge of the item. Set by layout system and cannot be used in update
-             * @prop {Number} right - Right edge of the item. Set by layout system and cannot be used in update
-             * @prop {Number} bottom - Bottom edge of the item. Set by layout system and cannot be used in update
-             */
-
-            // The layout service is very self explanatory.  It's responsible for the layout within a chart.
-            // Scales, Legends and Plugins all rely on the layout service and can easily register to be placed anywhere they need
-            // It is this service's responsibility of carrying out that layout.
-            Chart.layoutService = {
-                defaults: {},
-
-                /**
-                 * Register a box to a chart.
-                 * A box is simply a reference to an object that requires layout. eg. Scales, Legend, Title.
-                 * @param {Chart} chart - the chart to use
-                 * @param {ILayoutItem} item - the item to add to be layed out
-                 */
-                addBox: function(chart, item) {
-                    if (!chart.boxes) {
-                        chart.boxes = [];
-                    }
-
-                    // initialize item with default values
-                    item.fullWidth = item.fullWidth || false;
-                    item.position = item.position || 'top';
-                    item.weight = item.weight || 0;
-
-                    chart.boxes.push(item);
-                },
-
-                /**
-                 * Remove a layoutItem from a chart
-                 * @param {Chart} chart - the chart to remove the box from
-                 * @param {Object} layoutItem - the item to remove from the layout
-                 */
-                removeBox: function(chart, layoutItem) {
-                    var index = chart.boxes ? chart.boxes.indexOf(layoutItem) : -1;
-                    if (index !== -1) {
-                        chart.boxes.splice(index, 1);
-                    }
-                },
-
-                /**
-                 * Sets (or updates) options on the given `item`.
-                 * @param {Chart} chart - the chart in which the item lives (or will be added to)
-                 * @param {Object} item - the item to configure with the given options
-                 * @param {Object} options - the new item options.
-                 */
-                configure: function(chart, item, options) {
-                    var props = ['fullWidth', 'position', 'weight'];
-                    var ilen = props.length;
-                    var i = 0;
-                    var prop;
-
-                    for (; i < ilen; ++i) {
-                        prop = props[i];
-                        if (options.hasOwnProperty(prop)) {
-                            item[prop] = options[prop];
-                        }
-                    }
-                },
-
-                /**
-                 * Fits boxes of the given chart into the given size by having each box measure itself
-                 * then running a fitting algorithm
-                 * @param {Chart} chart - the chart
-                 * @param {Number} width - the width to fit into
-                 * @param {Number} height - the height to fit into
-                 */
-                update: function(chart, width, height) {
-                    if (!chart) {
-                        return;
-                    }
-
-                    var layoutOptions = chart.options.layout || {};
-                    var padding = helpers.options.toPadding(layoutOptions.padding);
-                    var leftPadding = padding.left;
-                    var rightPadding = padding.right;
-                    var topPadding = padding.top;
-                    var bottomPadding = padding.bottom;
-
-                    var leftBoxes = filterByPosition(chart.boxes, 'left');
-                    var rightBoxes = filterByPosition(chart.boxes, 'right');
-                    var topBoxes = filterByPosition(chart.boxes, 'top');
-                    var bottomBoxes = filterByPosition(chart.boxes, 'bottom');
-                    var chartAreaBoxes = filterByPosition(chart.boxes, 'chartArea');
-
-                    // Sort boxes by weight. A higher weight is further away from the chart area
-                    sortByWeight(leftBoxes, true);
-                    sortByWeight(rightBoxes, false);
-                    sortByWeight(topBoxes, true);
-                    sortByWeight(bottomBoxes, false);
-
-                    // Essentially we now have any number of boxes on each of the 4 sides.
-                    // Our canvas looks like the following.
-                    // The areas L1 and L2 are the left axes. R1 is the right axis, T1 is the top axis and
-                    // B1 is the bottom axis
-                    // There are also 4 quadrant-like locations (left to right instead of clockwise) reserved for chart overlays
-                    // These locations are single-box locations only, when trying to register a chartArea location that is already taken,
-                    // an error will be thrown.
-                    //
-                    // |----------------------------------------------------|
-                    // |                  T1 (Full Width)                   |
-                    // |----------------------------------------------------|
-                    // |    |    |                 T2                  |    |
-                    // |    |----|-------------------------------------|----|
-                    // |    |    | C1 |                           | C2 |    |
-                    // |    |    |----|                           |----|    |
-                    // |    |    |                                     |    |
-                    // | L1 | L2 |           ChartArea (C0)            | R1 |
-                    // |    |    |                                     |    |
-                    // |    |    |----|                           |----|    |
-                    // |    |    | C3 |                           | C4 |    |
-                    // |    |----|-------------------------------------|----|
-                    // |    |    |                 B1                  |    |
-                    // |----------------------------------------------------|
-                    // |                  B2 (Full Width)                   |
-                    // |----------------------------------------------------|
-                    //
-                    // What we do to find the best sizing, we do the following
-                    // 1. Determine the minimum size of the chart area.
-                    // 2. Split the remaining width equally between each vertical axis
-                    // 3. Split the remaining height equally between each horizontal axis
-                    // 4. Give each layout the maximum size it can be. The layout will return it's minimum size
-                    // 5. Adjust the sizes of each axis based on it's minimum reported size.
-                    // 6. Refit each axis
-                    // 7. Position each axis in the final location
-                    // 8. Tell the chart the final location of the chart area
-                    // 9. Tell any axes that overlay the chart area the positions of the chart area
-
-                    // Step 1
-                    var chartWidth = width - leftPadding - rightPadding;
-                    var chartHeight = height - topPadding - bottomPadding;
-                    var chartAreaWidth = chartWidth / 2; // min 50%
-                    var chartAreaHeight = chartHeight / 2; // min 50%
-
-                    // Step 2
-                    var verticalBoxWidth = (width - chartAreaWidth) / (leftBoxes.length + rightBoxes.length);
-
-                    // Step 3
-                    var horizontalBoxHeight = (height - chartAreaHeight) / (topBoxes.length + bottomBoxes.length);
-
-                    // Step 4
-                    var maxChartAreaWidth = chartWidth;
-                    var maxChartAreaHeight = chartHeight;
-                    var minBoxSizes = [];
-
-                    function getMinimumBoxSize(box) {
-                        var minSize;
-                        var isHorizontal = box.isHorizontal();
-
-                        if (isHorizontal) {
-                            minSize = box.update(box.fullWidth ? chartWidth : maxChartAreaWidth, horizontalBoxHeight);
-                            maxChartAreaHeight -= minSize.height;
-                        } else {
-                            minSize = box.update(verticalBoxWidth, chartAreaHeight);
-                            maxChartAreaWidth -= minSize.width;
-                        }
-
-                        minBoxSizes.push({
-                            horizontal: isHorizontal,
-                            minSize: minSize,
-                            box: box,
-                        });
-                    }
-
-                    helpers.each(leftBoxes.concat(rightBoxes, topBoxes, bottomBoxes), getMinimumBoxSize);
-
-                    // If a horizontal box has padding, we move the left boxes over to avoid ugly charts (see issue #2478)
-                    var maxHorizontalLeftPadding = 0;
-                    var maxHorizontalRightPadding = 0;
-                    var maxVerticalTopPadding = 0;
-                    var maxVerticalBottomPadding = 0;
-
-                    helpers.each(topBoxes.concat(bottomBoxes), function(horizontalBox) {
-                        if (horizontalBox.getPadding) {
-                            var boxPadding = horizontalBox.getPadding();
-                            maxHorizontalLeftPadding = Math.max(maxHorizontalLeftPadding, boxPadding.left);
-                            maxHorizontalRightPadding = Math.max(maxHorizontalRightPadding, boxPadding.right);
-                        }
-                    });
-
-                    helpers.each(leftBoxes.concat(rightBoxes), function(verticalBox) {
-                        if (verticalBox.getPadding) {
-                            var boxPadding = verticalBox.getPadding();
-                            maxVerticalTopPadding = Math.max(maxVerticalTopPadding, boxPadding.top);
-                            maxVerticalBottomPadding = Math.max(maxVerticalBottomPadding, boxPadding.bottom);
-                        }
-                    });
-
-                    // At this point, maxChartAreaHeight and maxChartAreaWidth are the size the chart area could
-                    // be if the axes are drawn at their minimum sizes.
-                    // Steps 5 & 6
-                    var totalLeftBoxesWidth = leftPadding;
-                    var totalRightBoxesWidth = rightPadding;
-                    var totalTopBoxesHeight = topPadding;
-                    var totalBottomBoxesHeight = bottomPadding;
-
-                    // Function to fit a box
-                    function fitBox(box) {
-                        var minBoxSize = helpers.findNextWhere(minBoxSizes, function(minBox) {
-                            return minBox.box === box;
-                        });
-
-                        if (minBoxSize) {
-                            if (box.isHorizontal()) {
-                                var scaleMargin = {
-                                    left: Math.max(totalLeftBoxesWidth, maxHorizontalLeftPadding),
-                                    right: Math.max(totalRightBoxesWidth, maxHorizontalRightPadding),
-                                    top: 0,
-                                    bottom: 0
-                                };
-
-                                // Don't use min size here because of label rotation. When the labels are rotated, their rotation highly depends
-                                // on the margin. Sometimes they need to increase in size slightly
-                                box.update(box.fullWidth ? chartWidth : maxChartAreaWidth, chartHeight / 2, scaleMargin);
-                            } else {
-                                box.update(minBoxSize.minSize.width, maxChartAreaHeight);
-                            }
-                        }
-                    }
-
-                    // Update, and calculate the left and right margins for the horizontal boxes
-                    helpers.each(leftBoxes.concat(rightBoxes), fitBox);
-
-                    helpers.each(leftBoxes, function(box) {
-                        totalLeftBoxesWidth += box.width;
-                    });
-
-                    helpers.each(rightBoxes, function(box) {
-                        totalRightBoxesWidth += box.width;
-                    });
-
-                    // Set the Left and Right margins for the horizontal boxes
-                    helpers.each(topBoxes.concat(bottomBoxes), fitBox);
-
-                    // Figure out how much margin is on the top and bottom of the vertical boxes
-                    helpers.each(topBoxes, function(box) {
-                        totalTopBoxesHeight += box.height;
-                    });
-
-                    helpers.each(bottomBoxes, function(box) {
-                        totalBottomBoxesHeight += box.height;
-                    });
-
-                    function finalFitVerticalBox(box) {
-                        var minBoxSize = helpers.findNextWhere(minBoxSizes, function(minSize) {
-                            return minSize.box === box;
-                        });
-
-                        var scaleMargin = {
-                            left: 0,
-                            right: 0,
-                            top: totalTopBoxesHeight,
-                            bottom: totalBottomBoxesHeight
-                        };
-
-                        if (minBoxSize) {
-                            box.update(minBoxSize.minSize.width, maxChartAreaHeight, scaleMargin);
-                        }
-                    }
-
-                    // Let the left layout know the final margin
-                    helpers.each(leftBoxes.concat(rightBoxes), finalFitVerticalBox);
-
-                    // Recalculate because the size of each layout might have changed slightly due to the margins (label rotation for instance)
-                    totalLeftBoxesWidth = leftPadding;
-                    totalRightBoxesWidth = rightPadding;
-                    totalTopBoxesHeight = topPadding;
-                    totalBottomBoxesHeight = bottomPadding;
-
-                    helpers.each(leftBoxes, function(box) {
-                        totalLeftBoxesWidth += box.width;
-                    });
-
-                    helpers.each(rightBoxes, function(box) {
-                        totalRightBoxesWidth += box.width;
-                    });
-
-                    helpers.each(topBoxes, function(box) {
-                        totalTopBoxesHeight += box.height;
-                    });
-                    helpers.each(bottomBoxes, function(box) {
-                        totalBottomBoxesHeight += box.height;
-                    });
-
-                    // We may be adding some padding to account for rotated x axis labels
-                    var leftPaddingAddition = Math.max(maxHorizontalLeftPadding - totalLeftBoxesWidth, 0);
-                    totalLeftBoxesWidth += leftPaddingAddition;
-                    totalRightBoxesWidth += Math.max(maxHorizontalRightPadding - totalRightBoxesWidth, 0);
-
-                    var topPaddingAddition = Math.max(maxVerticalTopPadding - totalTopBoxesHeight, 0);
-                    totalTopBoxesHeight += topPaddingAddition;
-                    totalBottomBoxesHeight += Math.max(maxVerticalBottomPadding - totalBottomBoxesHeight, 0);
-
-                    // Figure out if our chart area changed. This would occur if the dataset layout label rotation
-                    // changed due to the application of the margins in step 6. Since we can only get bigger, this is safe to do
-                    // without calling `fit` again
-                    var newMaxChartAreaHeight = height - totalTopBoxesHeight - totalBottomBoxesHeight;
-                    var newMaxChartAreaWidth = width - totalLeftBoxesWidth - totalRightBoxesWidth;
-
-                    if (newMaxChartAreaWidth !== maxChartAreaWidth || newMaxChartAreaHeight !== maxChartAreaHeight) {
-                        helpers.each(leftBoxes, function(box) {
-                            box.height = newMaxChartAreaHeight;
-                        });
-
-                        helpers.each(rightBoxes, function(box) {
-                            box.height = newMaxChartAreaHeight;
-                        });
-
-                        helpers.each(topBoxes, function(box) {
-                            if (!box.fullWidth) {
-                                box.width = newMaxChartAreaWidth;
-                            }
-                        });
-
-                        helpers.each(bottomBoxes, function(box) {
-                            if (!box.fullWidth) {
-                                box.width = newMaxChartAreaWidth;
-                            }
-                        });
-
-                        maxChartAreaHeight = newMaxChartAreaHeight;
-                        maxChartAreaWidth = newMaxChartAreaWidth;
-                    }
-
-                    // Step 7 - Position the boxes
-                    var left = leftPadding + leftPaddingAddition;
-                    var top = topPadding + topPaddingAddition;
-
-                    function placeBox(box) {
-                        if (box.isHorizontal()) {
-                            box.left = box.fullWidth ? leftPadding : totalLeftBoxesWidth;
-                            box.right = box.fullWidth ? width - rightPadding : totalLeftBoxesWidth + maxChartAreaWidth;
-                            box.top = top;
-                            box.bottom = top + box.height;
-
-                            // Move to next point
-                            top = box.bottom;
-
-                        } else {
-
-                            box.left = left;
-                            box.right = left + box.width;
-                            box.top = totalTopBoxesHeight;
-                            box.bottom = totalTopBoxesHeight + maxChartAreaHeight;
-
-                            // Move to next point
-                            left = box.right;
-                        }
-                    }
-
-                    helpers.each(leftBoxes.concat(topBoxes), placeBox);
-
-                    // Account for chart width and height
-                    left += maxChartAreaWidth;
-                    top += maxChartAreaHeight;
-
-                    helpers.each(rightBoxes, placeBox);
-                    helpers.each(bottomBoxes, placeBox);
-
-                    // Step 8
-                    chart.chartArea = {
-                        left: totalLeftBoxesWidth,
-                        top: totalTopBoxesHeight,
-                        right: totalLeftBoxesWidth + maxChartAreaWidth,
-                        bottom: totalTopBoxesHeight + maxChartAreaHeight
-                    };
-
-                    // Step 9
-                    helpers.each(chartAreaBoxes, function(box) {
-                        box.left = chart.chartArea.left;
-                        box.top = chart.chartArea.top;
-                        box.right = chart.chartArea.right;
-                        box.bottom = chart.chartArea.bottom;
-
-                        box.update(maxChartAreaWidth, maxChartAreaHeight);
-                    });
-                }
-            };
-        };
-
-    },{ "45":45 }],31:[function(require,module,exports){
-        'use strict';
-
-        var defaults = require(25);
-        var Element = require(26);
-        var helpers = require(45);
-
-        defaults._set('global', {
-            plugins: {}
-        });
-
-        module.exports = function(Chart) {
-
-            /**
-             * The plugin service singleton
-             * @namespace Chart.plugins
-             * @since 2.1.0
-             */
-            Chart.plugins = {
-                /**
-                 * Globally registered plugins.
-                 * @private
-                 */
-                _plugins: [],
-
-                /**
-                 * This identifier is used to invalidate the descriptors cache attached to each chart
-                 * when a global plugin is registered or unregistered. In this case, the cache ID is
-                 * incremented and descriptors are regenerated during following API calls.
-                 * @private
-                 */
-                _cacheId: 0,
-
-                /**
-                 * Registers the given plugin(s) if not already registered.
-                 * @param {Array|Object} plugins plugin instance(s).
-                 */
-                register: function(plugins) {
-                    var p = this._plugins;
-                    ([]).concat(plugins).forEach(function(plugin) {
-                        if (p.indexOf(plugin) === -1) {
-                            p.push(plugin);
-                        }
-                    });
-
-                    this._cacheId++;
-                },
-
-                /**
-                 * Unregisters the given plugin(s) only if registered.
-                 * @param {Array|Object} plugins plugin instance(s).
-                 */
-                unregister: function(plugins) {
-                    var p = this._plugins;
-                    ([]).concat(plugins).forEach(function(plugin) {
-                        var idx = p.indexOf(plugin);
-                        if (idx !== -1) {
-                            p.splice(idx, 1);
-                        }
-                    });
-
-                    this._cacheId++;
-                },
-
-                /**
-                 * Remove all registered plugins.
-                 * @since 2.1.5
-                 */
-                clear: function() {
-                    this._plugins = [];
-                    this._cacheId++;
-                },
-
-                /**
-                 * Returns the number of registered plugins?
-                 * @returns {Number}
-                 * @since 2.1.5
-                 */
-                count: function() {
-                    return this._plugins.length;
-                },
-
-                /**
-                 * Returns all registered plugin instances.
-                 * @returns {Array} array of plugin objects.
-                 * @since 2.1.5
-                 */
-                getAll: function() {
-                    return this._plugins;
-                },
-
-                /**
-                 * Calls enabled plugins for `chart` on the specified hook and with the given args.
-                 * This method immediately returns as soon as a plugin explicitly returns false. The
-                 * returned value can be used, for instance, to interrupt the current action.
-                 * @param {Object} chart - The chart instance for which plugins should be called.
-                 * @param {String} hook - The name of the plugin method to call (e.g. 'beforeUpdate').
-                 * @param {Array} [args] - Extra arguments to apply to the hook call.
-                 * @returns {Boolean} false if any of the plugins return false, else returns true.
-                 */
-                notify: function(chart, hook, args) {
-                    var descriptors = this.descriptors(chart);
-                    var ilen = descriptors.length;
-                    var i, descriptor, plugin, params, method;
-
-                    for (i = 0; i < ilen; ++i) {
-                        descriptor = descriptors[i];
-                        plugin = descriptor.plugin;
-                        method = plugin[hook];
-                        if (typeof method === 'function') {
-                            params = [chart].concat(args || []);
-                            params.push(descriptor.options);
-                            if (method.apply(plugin, params) === false) {
-                                return false;
-                            }
-                        }
-                    }
-
-                    return true;
-                },
-
-                /**
-                 * Returns descriptors of enabled plugins for the given chart.
-                 * @returns {Array} [{ plugin, options }]
-                 * @private
-                 */
-                descriptors: function(chart) {
-                    var cache = chart._plugins || (chart._plugins = {});
-                    if (cache.id === this._cacheId) {
-                        return cache.descriptors;
-                    }
-
-                    var plugins = [];
-                    var descriptors = [];
-                    var config = (chart && chart.config) || {};
-                    var options = (config.options && config.options.plugins) || {};
-
-                    this._plugins.concat(config.plugins || []).forEach(function(plugin) {
-                        var idx = plugins.indexOf(plugin);
-                        if (idx !== -1) {
-                            return;
-                        }
-
-                        var id = plugin.id;
-                        var opts = options[id];
-                        if (opts === false) {
-                            return;
-                        }
-
-                        if (opts === true) {
-                            opts = helpers.clone(defaults.global.plugins[id]);
-                        }
-
-                        plugins.push(plugin);
-                        descriptors.push({
-                            plugin: plugin,
-                            options: opts || {}
-                        });
-                    });
-
-                    cache.descriptors = descriptors;
-                    cache.id = this._cacheId;
-                    return descriptors;
-                }
-            };
-
-            /**
-             * Plugin extension hooks.
-             * @interface IPlugin
-             * @since 2.1.0
-             */
-            /**
-             * @method IPlugin#beforeInit
-             * @desc Called before initializing `chart`.
-             * @param {Chart.Controller} chart - The chart instance.
-             * @param {Object} options - The plugin options.
-             */
-            /**
-             * @method IPlugin#afterInit
-             * @desc Called after `chart` has been initialized and before the first update.
-             * @param {Chart.Controller} chart - The chart instance.
-             * @param {Object} options - The plugin options.
-             */
-            /**
-             * @method IPlugin#beforeUpdate
-             * @desc Called before updating `chart`. If any plugin returns `false`, the update
-             * is cancelled (and thus subsequent render(s)) until another `update` is triggered.
-             * @param {Chart.Controller} chart - The chart instance.
-             * @param {Object} options - The plugin options.
-             * @returns {Boolean} `false` to cancel the chart update.
-             */
-            /**
-             * @method IPlugin#afterUpdate
-             * @desc Called after `chart` has been updated and before rendering. Note that this
-             * hook will not be called if the chart update has been previously cancelled.
-             * @param {Chart.Controller} chart - The chart instance.
-             * @param {Object} options - The plugin options.
-             */
-            /**
-             * @method IPlugin#beforeDatasetsUpdate
-             * @desc Called before updating the `chart` datasets. If any plugin returns `false`,
-             * the datasets update is cancelled until another `update` is triggered.
-             * @param {Chart.Controller} chart - The chart instance.
-             * @param {Object} options - The plugin options.
-             * @returns {Boolean} false to cancel the datasets update.
-             * @since version 2.1.5
-             */
-            /**
-             * @method IPlugin#afterDatasetsUpdate
-             * @desc Called after the `chart` datasets have been updated. Note that this hook
-             * will not be called if the datasets update has been previously cancelled.
-             * @param {Chart.Controller} chart - The chart instance.
-             * @param {Object} options - The plugin options.
-             * @since version 2.1.5
-             */
-            /**
-             * @method IPlugin#beforeDatasetUpdate
-             * @desc Called before updating the `chart` dataset at the given `args.index`. If any plugin
-             * returns `false`, the datasets update is cancelled until another `update` is triggered.
-             * @param {Chart} chart - The chart instance.
-             * @param {Object} args - The call arguments.
-             * @param {Number} args.index - The dataset index.
-             * @param {Object} args.meta - The dataset metadata.
-             * @param {Object} options - The plugin options.
-             * @returns {Boolean} `false` to cancel the chart datasets drawing.
-             */
-            /**
-             * @method IPlugin#afterDatasetUpdate
-             * @desc Called after the `chart` datasets at the given `args.index` has been updated. Note
-             * that this hook will not be called if the datasets update has been previously cancelled.
-             * @param {Chart} chart - The chart instance.
-             * @param {Object} args - The call arguments.
-             * @param {Number} args.index - The dataset index.
-             * @param {Object} args.meta - The dataset metadata.
-             * @param {Object} options - The plugin options.
-             */
-            /**
-             * @method IPlugin#beforeLayout
-             * @desc Called before laying out `chart`. If any plugin returns `false`,
-             * the layout update is cancelled until another `update` is triggered.
-             * @param {Chart.Controller} chart - The chart instance.
-             * @param {Object} options - The plugin options.
-             * @returns {Boolean} `false` to cancel the chart layout.
-             */
-            /**
-             * @method IPlugin#afterLayout
-             * @desc Called after the `chart` has been layed out. Note that this hook will not
-             * be called if the layout update has been previously cancelled.
-             * @param {Chart.Controller} chart - The chart instance.
-             * @param {Object} options - The plugin options.
-             */
-            /**
-             * @method IPlugin#beforeRender
-             * @desc Called before rendering `chart`. If any plugin returns `false`,
-             * the rendering is cancelled until another `render` is triggered.
-             * @param {Chart.Controller} chart - The chart instance.
-             * @param {Object} options - The plugin options.
-             * @returns {Boolean} `false` to cancel the chart rendering.
-             */
-            /**
-             * @method IPlugin#afterRender
-             * @desc Called after the `chart` has been fully rendered (and animation completed). Note
-             * that this hook will not be called if the rendering has been previously cancelled.
-             * @param {Chart.Controller} chart - The chart instance.
-             * @param {Object} options - The plugin options.
-             */
-            /**
-             * @method IPlugin#beforeDraw
-             * @desc Called before drawing `chart` at every animation frame specified by the given
-             * easing value. If any plugin returns `false`, the frame drawing is cancelled until
-             * another `render` is triggered.
-             * @param {Chart.Controller} chart - The chart instance.
-             * @param {Number} easingValue - The current animation value, between 0.0 and 1.0.
-             * @param {Object} options - The plugin options.
-             * @returns {Boolean} `false` to cancel the chart drawing.
-             */
-            /**
-             * @method IPlugin#afterDraw
-             * @desc Called after the `chart` has been drawn for the specific easing value. Note
-             * that this hook will not be called if the drawing has been previously cancelled.
-             * @param {Chart.Controller} chart - The chart instance.
-             * @param {Number} easingValue - The current animation value, between 0.0 and 1.0.
-             * @param {Object} options - The plugin options.
-             */
-            /**
-             * @method IPlugin#beforeDatasetsDraw
-             * @desc Called before drawing the `chart` datasets. If any plugin returns `false`,
-             * the datasets drawing is cancelled until another `render` is triggered.
-             * @param {Chart.Controller} chart - The chart instance.
-             * @param {Number} easingValue - The current animation value, between 0.0 and 1.0.
-             * @param {Object} options - The plugin options.
-             * @returns {Boolean} `false` to cancel the chart datasets drawing.
-             */
-            /**
-             * @method IPlugin#afterDatasetsDraw
-             * @desc Called after the `chart` datasets have been drawn. Note that this hook
-             * will not be called if the datasets drawing has been previously cancelled.
-             * @param {Chart.Controller} chart - The chart instance.
-             * @param {Number} easingValue - The current animation value, between 0.0 and 1.0.
-             * @param {Object} options - The plugin options.
-             */
-            /**
-             * @method IPlugin#beforeDatasetDraw
-             * @desc Called before drawing the `chart` dataset at the given `args.index` (datasets
-             * are drawn in the reverse order). If any plugin returns `false`, the datasets drawing
-             * is cancelled until another `render` is triggered.
-             * @param {Chart} chart - The chart instance.
-             * @param {Object} args - The call arguments.
-             * @param {Number} args.index - The dataset index.
-             * @param {Object} args.meta - The dataset metadata.
-             * @param {Number} args.easingValue - The current animation value, between 0.0 and 1.0.
-             * @param {Object} options - The plugin options.
-             * @returns {Boolean} `false` to cancel the chart datasets drawing.
-             */
-            /**
-             * @method IPlugin#afterDatasetDraw
-             * @desc Called after the `chart` datasets at the given `args.index` have been drawn
-             * (datasets are drawn in the reverse order). Note that this hook will not be called
-             * if the datasets drawing has been previously cancelled.
-             * @param {Chart} chart - The chart instance.
-             * @param {Object} args - The call arguments.
-             * @param {Number} args.index - The dataset index.
-             * @param {Object} args.meta - The dataset metadata.
-             * @param {Number} args.easingValue - The current animation value, between 0.0 and 1.0.
-             * @param {Object} options - The plugin options.
-             */
-            /**
-             * @method IPlugin#beforeEvent
-             * @desc Called before processing the specified `event`. If any plugin returns `false`,
-             * the event will be discarded.
-             * @param {Chart.Controller} chart - The chart instance.
-             * @param {IEvent} event - The event object.
-             * @param {Object} options - The plugin options.
-             */
-            /**
-             * @method IPlugin#afterEvent
-             * @desc Called after the `event` has been consumed. Note that this hook
-             * will not be called if the `event` has been previously discarded.
-             * @param {Chart.Controller} chart - The chart instance.
-             * @param {IEvent} event - The event object.
-             * @param {Object} options - The plugin options.
-             */
-            /**
-             * @method IPlugin#resize
-             * @desc Called after the chart as been resized.
-             * @param {Chart.Controller} chart - The chart instance.
-             * @param {Number} size - The new canvas display size (eq. canvas.style width & height).
-             * @param {Object} options - The plugin options.
-             */
-            /**
-             * @method IPlugin#destroy
-             * @desc Called after the chart as been destroyed.
-             * @param {Chart.Controller} chart - The chart instance.
-             * @param {Object} options - The plugin options.
-             */
-
-            /**
-             * Provided for backward compatibility, use Chart.plugins instead
-             * @namespace Chart.pluginService
-             * @deprecated since version 2.1.5
-             * @todo remove at version 3
-             * @private
-             */
-            Chart.pluginService = Chart.plugins;
-
-            /**
-             * Provided for backward compatibility, inheriting from Chart.PlugingBase has no
-             * effect, instead simply create/register plugins via plain JavaScript objects.
-             * @interface Chart.PluginBase
-             * @deprecated since version 2.5.0
-             * @todo remove at version 3
-             * @private
-             */
-            Chart.PluginBase = Element.extend({});
-        };
-
-    },{ "25":25,"26":26,"45":45 }],32:[function(require,module,exports){
-        'use strict';
-
-        var defaults = require(25);
-        var Element = require(26);
-        var helpers = require(45);
-        var Ticks = require(34);
-
-        defaults._set('scale', {
-            display: true,
-            position: 'left',
-            offset: false,
-
-            // grid line settings
-            gridLines: {
-                display: true,
-                color: 'rgba(0, 0, 0, 0.1)',
-                lineWidth: 1,
-                drawBorder: true,
-                drawOnChartArea: true,
-                drawTicks: true,
-                tickMarkLength: 10,
-                zeroLineWidth: 1,
-                zeroLineColor: 'rgba(0,0,0,0.25)',
-                zeroLineBorderDash: [],
-                zeroLineBorderDashOffset: 0.0,
-                offsetGridLines: false,
-                borderDash: [],
-                borderDashOffset: 0.0
-            },
-
-            // scale label
-            scaleLabel: {
-                // display property
-                display: false,
-
-                // actual label
-                labelString: '',
-
-                // line height
-                lineHeight: 1.2,
-
-                // top/bottom padding
-                padding: {
-                    top: 4,
-                    bottom: 4
-                }
-            },
-
-            // label settings
-            ticks: {
-                beginAtZero: false,
-                minRotation: 0,
-                maxRotation: 50,
-                mirror: false,
-                padding: 0,
-                reverse: false,
-                display: true,
-                autoSkip: true,
-                autoSkipPadding: 0,
-                labelOffset: 0,
-                // We pass through arrays to be rendered as multiline labels, we convert Others to strings here.
-                callback: Ticks.formatters.values,
-                minor: {},
-                major: {}
-            }
-        });
-
-        function labelsFromTicks(ticks) {
-            var labels = [];
-            var i, ilen;
-
-            for (i = 0, ilen = ticks.length; i < ilen; ++i) {
-                labels.push(ticks[i].label);
-            }
-
-            return labels;
-        }
-
-        function getLineValue(scale, index, offsetGridLines) {
-            var lineValue = scale.getPixelForTick(index);
-
-            if (offsetGridLines) {
-                if (index === 0) {
-                    lineValue -= (scale.getPixelForTick(1) - lineValue) / 2;
-                } else {
-                    lineValue -= (lineValue - scale.getPixelForTick(index - 1)) / 2;
-                }
-            }
-            return lineValue;
-        }
-
-        module.exports = function(Chart) {
-
-            function computeTextSize(context, tick, font) {
-                return helpers.isArray(tick) ?
-                        helpers.longestText(context, font, tick) :
-                        context.measureText(tick).width;
-            }
-
-            function parseFontOptions(options) {
-                var valueOrDefault = helpers.valueOrDefault;
-                var globalDefaults = defaults.global;
-                var size = valueOrDefault(options.fontSize, globalDefaults.defaultFontSize);
-                var style = valueOrDefault(options.fontStyle, globalDefaults.defaultFontStyle);
-                var family = valueOrDefault(options.fontFamily, globalDefaults.defaultFontFamily);
-
-                return {
-                    size: size,
-                    style: style,
-                    family: family,
-                    font: helpers.fontString(size, style, family)
-                };
-            }
-
-            function parseLineHeight(options) {
-                return helpers.options.toLineHeight(
-                        helpers.valueOrDefault(options.lineHeight, 1.2),
-                        helpers.valueOrDefault(options.fontSize, defaults.global.defaultFontSize));
-            }
-
-            Chart.Scale = Element.extend({
-                /**
-                 * Get the padding needed for the scale
-                 * @method getPadding
-                 * @private
-                 * @returns {Padding} the necessary padding
-                 */
-                getPadding: function() {
-                    var me = this;
-                    return {
-                        left: me.paddingLeft || 0,
-                        top: me.paddingTop || 0,
-                        right: me.paddingRight || 0,
-                        bottom: me.paddingBottom || 0
-                    };
-                },
-
-                /**
-                 * Returns the scale tick objects ({label, major})
-                 * @since 2.7
-                 */
-                getTicks: function() {
-                    return this._ticks;
-                },
-
-                // These methods are ordered by lifecyle. Utilities then follow.
-                // Any function defined here is inherited by all scale types.
-                // Any function can be extended by the scale type
-
-                mergeTicksOptions: function() {
-                    var ticks = this.options.ticks;
-                    if (ticks.minor === false) {
-                        ticks.minor = {
-                            display: false
-                        };
-                    }
-                    if (ticks.major === false) {
-                        ticks.major = {
-                            display: false
-                        };
-                    }
-                    for (var key in ticks) {
-                        if (key !== 'major' && key !== 'minor') {
-                            if (typeof ticks.minor[key] === 'undefined') {
-                                ticks.minor[key] = ticks[key];
-                            }
-                            if (typeof ticks.major[key] === 'undefined') {
-                                ticks.major[key] = ticks[key];
-                            }
-                        }
-                    }
-                },
-                beforeUpdate: function() {
-                    helpers.callback(this.options.beforeUpdate, [this]);
-                },
-                update: function(maxWidth, maxHeight, margins) {
-                    var me = this;
-                    var i, ilen, labels, label, ticks, tick;
-
-                    // Update Lifecycle - Probably don't want to ever extend or overwrite this function ;)
-                    me.beforeUpdate();
-
-                    // Absorb the master measurements
-                    me.maxWidth = maxWidth;
-                    me.maxHeight = maxHeight;
-                    me.margins = helpers.extend({
-                        left: 0,
-                        right: 0,
-                        top: 0,
-                        bottom: 0
-                    }, margins);
-                    me.longestTextCache = me.longestTextCache || {};
-
-                    // Dimensions
-                    me.beforeSetDimensions();
-                    me.setDimensions();
-                    me.afterSetDimensions();
-
-                    // Data min/max
-                    me.beforeDataLimits();
-                    me.determineDataLimits();
-                    me.afterDataLimits();
-
-                    // Ticks - `this.ticks` is now DEPRECATED!
-                    // Internal ticks are now stored as objects in the PRIVATE `this._ticks` member
-                    // and must not be accessed directly from outside this class. `this.ticks` being
-                    // around for long time and not marked as private, we can't change its structure
-                    // without unexpected breaking changes. If you need to access the scale ticks,
-                    // use scale.getTicks() instead.
-
-                    me.beforeBuildTicks();
-
-                    // New implementations should return an array of objects but for BACKWARD COMPAT,
-                    // we still support no return (`this.ticks` internally set by calling this method).
-                    ticks = me.buildTicks() || [];
-
-                    me.afterBuildTicks();
-
-                    me.beforeTickToLabelConversion();
-
-                    // New implementations should return the formatted tick labels but for BACKWARD
-                    // COMPAT, we still support no return (`this.ticks` internally changed by calling
-                    // this method and supposed to contain only string values).
-                    labels = me.convertTicksToLabels(ticks) || me.ticks;
-
-                    me.afterTickToLabelConversion();
-
-                    me.ticks = labels;   // BACKWARD COMPATIBILITY
-
-                    // IMPORTANT: from this point, we consider that `this.ticks` will NEVER change!
-
-                    // BACKWARD COMPAT: synchronize `_ticks` with labels (so potentially `this.ticks`)
-                    for (i = 0, ilen = labels.length; i < ilen; ++i) {
-                        label = labels[i];
-                        tick = ticks[i];
-                        if (!tick) {
-                            ticks.push(tick = {
-                                label: label,
-                                major: false
-                            });
-                        } else {
-                            tick.label = label;
-                        }
-                    }
-
-                    me._ticks = ticks;
-
-                    // Tick Rotation
-                    me.beforeCalculateTickRotation();
-                    me.calculateTickRotation();
-                    me.afterCalculateTickRotation();
-                    // Fit
-                    me.beforeFit();
-                    me.fit();
-                    me.afterFit();
-                    //
-                    me.afterUpdate();
-
-                    return me.minSize;
-
-                },
-                afterUpdate: function() {
-                    helpers.callback(this.options.afterUpdate, [this]);
-                },
-
-                //
-
-                beforeSetDimensions: function() {
-                    helpers.callback(this.options.beforeSetDimensions, [this]);
-                },
-                setDimensions: function() {
-                    var me = this;
-                    // Set the unconstrained dimension before label rotation
-                    if (me.isHorizontal()) {
-                        // Reset position before calculating rotation
-                        me.width = me.maxWidth;
-                        me.left = 0;
-                        me.right = me.width;
-                    } else {
-                        me.height = me.maxHeight;
-
-                        // Reset position before calculating rotation
-                        me.top = 0;
-                        me.bottom = me.height;
-                    }
-
-                    // Reset padding
-                    me.paddingLeft = 0;
-                    me.paddingTop = 0;
-                    me.paddingRight = 0;
-                    me.paddingBottom = 0;
-                },
-                afterSetDimensions: function() {
-                    helpers.callback(this.options.afterSetDimensions, [this]);
-                },
-
-                // Data limits
-                beforeDataLimits: function() {
-                    helpers.callback(this.options.beforeDataLimits, [this]);
-                },
-                determineDataLimits: helpers.noop,
-                afterDataLimits: function() {
-                    helpers.callback(this.options.afterDataLimits, [this]);
-                },
-
-                //
-                beforeBuildTicks: function() {
-                    helpers.callback(this.options.beforeBuildTicks, [this]);
-                },
-                buildTicks: helpers.noop,
-                afterBuildTicks: function() {
-                    helpers.callback(this.options.afterBuildTicks, [this]);
-                },
-
-                beforeTickToLabelConversion: function() {
-                    helpers.callback(this.options.beforeTickToLabelConversion, [this]);
-                },
-                convertTicksToLabels: function() {
-                    var me = this;
-                    // Convert ticks to strings
-                    var tickOpts = me.options.ticks;
-                    me.ticks = me.ticks.map(tickOpts.userCallback || tickOpts.callback, this);
-                },
-                afterTickToLabelConversion: function() {
-                    helpers.callback(this.options.afterTickToLabelConversion, [this]);
-                },
-
-                //
-
-                beforeCalculateTickRotation: function() {
-                    helpers.callback(this.options.beforeCalculateTickRotation, [this]);
-                },
-                calculateTickRotation: function() {
-                    var me = this;
-                    var context = me.ctx;
-                    var tickOpts = me.options.ticks;
-                    var labels = labelsFromTicks(me._ticks);
-
-                    // Get the width of each grid by calculating the difference
-                    // between x offsets between 0 and 1.
-                    var tickFont = parseFontOptions(tickOpts);
-                    context.font = tickFont.font;
-
-                    var labelRotation = tickOpts.minRotation || 0;
-
-                    if (labels.length && me.options.display && me.isHorizontal()) {
-                        var originalLabelWidth = helpers.longestText(context, tickFont.font, labels, me.longestTextCache);
-                        var labelWidth = originalLabelWidth;
-                        var cosRotation, sinRotation;
-
-                        // Allow 3 pixels x2 padding either side for label readability
-                        var tickWidth = me.getPixelForTick(1) - me.getPixelForTick(0) - 6;
-
-                        // Max label rotation can be set or default to 90 - also act as a loop counter
-                        while (labelWidth > tickWidth && labelRotation < tickOpts.maxRotation) {
-                            var angleRadians = helpers.toRadians(labelRotation);
-                            cosRotation = Math.cos(angleRadians);
-                            sinRotation = Math.sin(angleRadians);
-
-                            if (sinRotation * originalLabelWidth > me.maxHeight) {
-                                // go back one step
-                                labelRotation--;
-                                break;
-                            }
-
-                            labelRotation++;
-                            labelWidth = cosRotation * originalLabelWidth;
-                        }
-                    }
-
-                    me.labelRotation = labelRotation;
-                },
-                afterCalculateTickRotation: function() {
-                    helpers.callback(this.options.afterCalculateTickRotation, [this]);
-                },
-
-                //
-
-                beforeFit: function() {
-                    helpers.callback(this.options.beforeFit, [this]);
-                },
-                fit: function() {
-                    var me = this;
-                    // Reset
-                    var minSize = me.minSize = {
-                        width: 0,
-                        height: 0
-                    };
-
-                    var labels = labelsFromTicks(me._ticks);
-
-                    var opts = me.options;
-                    var tickOpts = opts.ticks;
-                    var scaleLabelOpts = opts.scaleLabel;
-                    var gridLineOpts = opts.gridLines;
-                    var display = opts.display;
-                    var isHorizontal = me.isHorizontal();
-
-                    var tickFont = parseFontOptions(tickOpts);
-                    var tickMarkLength = opts.gridLines.tickMarkLength;
-
-                    // Width
-                    if (isHorizontal) {
-                        // subtract the margins to line up with the chartArea if we are a full width scale
-                        minSize.width = me.isFullWidth() ? me.maxWidth - me.margins.left - me.margins.right : me.maxWidth;
-                    } else {
-                        minSize.width = display && gridLineOpts.drawTicks ? tickMarkLength : 0;
-                    }
-
-                    // height
-                    if (isHorizontal) {
-                        minSize.height = display && gridLineOpts.drawTicks ? tickMarkLength : 0;
-                    } else {
-                        minSize.height = me.maxHeight; // fill all the height
-                    }
-
-                    // Are we showing a title for the scale?
-                    if (scaleLabelOpts.display && display) {
-                        var scaleLabelLineHeight = parseLineHeight(scaleLabelOpts);
-                        var scaleLabelPadding = helpers.options.toPadding(scaleLabelOpts.padding);
-                        var deltaHeight = scaleLabelLineHeight + scaleLabelPadding.height;
-
-                        if (isHorizontal) {
-                            minSize.height += deltaHeight;
-                        } else {
-                            minSize.width += deltaHeight;
-                        }
-                    }
-
-                    // Don't bother fitting the ticks if we are not showing them
-                    if (tickOpts.display && display) {
-                        var largestTextWidth = helpers.longestText(me.ctx, tickFont.font, labels, me.longestTextCache);
-                        var tallestLabelHeightInLines = helpers.numberOfLabelLines(labels);
-                        var lineSpace = tickFont.size * 0.5;
-                        var tickPadding = me.options.ticks.padding;
-
-                        if (isHorizontal) {
-                            // A horizontal axis is more constrained by the height.
-                            me.longestLabelWidth = largestTextWidth;
-
-                            var angleRadians = helpers.toRadians(me.labelRotation);
-                            var cosRotation = Math.cos(angleRadians);
-                            var sinRotation = Math.sin(angleRadians);
-
-                            // TODO - improve this calculation
-                            var labelHeight = (sinRotation * largestTextWidth)
-                                    + (tickFont.size * tallestLabelHeightInLines)
-                                    + (lineSpace * (tallestLabelHeightInLines - 1))
-                                    + lineSpace; // padding
-
-                            minSize.height = Math.min(me.maxHeight, minSize.height + labelHeight + tickPadding);
-
-                            me.ctx.font = tickFont.font;
-                            var firstLabelWidth = computeTextSize(me.ctx, labels[0], tickFont.font);
-                            var lastLabelWidth = computeTextSize(me.ctx, labels[labels.length - 1], tickFont.font);
-
-                            // Ensure that our ticks are always inside the canvas. When rotated, ticks are right aligned
-                            // which means that the right padding is dominated by the font height
-                            if (me.labelRotation !== 0) {
-                                me.paddingLeft = opts.position === 'bottom' ? (cosRotation * firstLabelWidth) + 3 : (cosRotation * lineSpace) + 3; // add 3 px to move away from canvas edges
-                                me.paddingRight = opts.position === 'bottom' ? (cosRotation * lineSpace) + 3 : (cosRotation * lastLabelWidth) + 3;
-                            } else {
-                                me.paddingLeft = firstLabelWidth / 2 + 3; // add 3 px to move away from canvas edges
-                                me.paddingRight = lastLabelWidth / 2 + 3;
-                            }
-                        } else {
-                            // A vertical axis is more constrained by the width. Labels are the
-                            // dominant factor here, so get that length first and account for padding
-                            if (tickOpts.mirror) {
-                                largestTextWidth = 0;
-                            } else {
-                                // use lineSpace for consistency with horizontal axis
-                                // tickPadding is not implemented for horizontal
-                                largestTextWidth += tickPadding + lineSpace;
-                            }
-
-                            minSize.width = Math.min(me.maxWidth, minSize.width + largestTextWidth);
-
-                            me.paddingTop = tickFont.size / 2;
-                            me.paddingBottom = tickFont.size / 2;
-                        }
-                    }
-
-                    me.handleMargins();
-
-                    me.width = minSize.width;
-                    me.height = minSize.height;
-                },
-
-                /**
-                 * Handle margins and padding interactions
-                 * @private
-                 */
-                handleMargins: function() {
-                    var me = this;
-                    if (me.margins) {
-                        me.paddingLeft = Math.max(me.paddingLeft - me.margins.left, 0);
-                        me.paddingTop = Math.max(me.paddingTop - me.margins.top, 0);
-                        me.paddingRight = Math.max(me.paddingRight - me.margins.right, 0);
-                        me.paddingBottom = Math.max(me.paddingBottom - me.margins.bottom, 0);
-                    }
-                },
-
-                afterFit: function() {
-                    helpers.callback(this.options.afterFit, [this]);
-                },
-
-                // Shared Methods
-                isHorizontal: function() {
-                    return this.options.position === 'top' || this.options.position === 'bottom';
-                },
-                isFullWidth: function() {
-                    return (this.options.fullWidth);
-                },
-
-                // Get the correct value. NaN bad inputs, If the value type is object get the x or y based on whether we are horizontal or not
-                getRightValue: function(rawValue) {
-                    // Null and undefined values first
-                    if (helpers.isNullOrUndef(rawValue)) {
-                        return NaN;
-                    }
-                    // isNaN(object) returns true, so make sure NaN is checking for a number; Discard Infinite values
-                    if (typeof rawValue === 'number' && !isFinite(rawValue)) {
-                        return NaN;
-                    }
-                    // If it is in fact an object, dive in one more level
-                    if (rawValue) {
-                        if (this.isHorizontal()) {
-                            if (rawValue.x !== undefined) {
-                                return this.getRightValue(rawValue.x);
-                            }
-                        } else if (rawValue.y !== undefined) {
-                            return this.getRightValue(rawValue.y);
-                        }
-                    }
-
-                    // Value is good, return it
-                    return rawValue;
-                },
-
-                // Used to get the value to display in the tooltip for the data at the given index
-                // function getLabelForIndex(index, datasetIndex)
-                getLabelForIndex: helpers.noop,
-
-                // Used to get data value locations.  Value can either be an index or a numerical value
-                getPixelForValue: helpers.noop,
-
-                // Used to get the data value from a given pixel. This is the inverse of getPixelForValue
-                getValueForPixel: helpers.noop,
-
-                // Used for tick location, should
-                getPixelForTick: function(index) {
-                    var me = this;
-                    var offset = me.options.offset;
-                    if (me.isHorizontal()) {
-                        var innerWidth = me.width - (me.paddingLeft + me.paddingRight);
-                        var tickWidth = innerWidth / Math.max((me._ticks.length - (offset ? 0 : 1)), 1);
-                        var pixel = (tickWidth * index) + me.paddingLeft;
-
-                        if (offset) {
-                            pixel += tickWidth / 2;
-                        }
-
-                        var finalVal = me.left + Math.round(pixel);
-                        finalVal += me.isFullWidth() ? me.margins.left : 0;
-                        return finalVal;
-                    }
-                    var innerHeight = me.height - (me.paddingTop + me.paddingBottom);
-                    return me.top + (index * (innerHeight / (me._ticks.length - 1)));
-                },
-
-                // Utility for getting the pixel location of a percentage of scale
-                getPixelForDecimal: function(decimal) {
-                    var me = this;
-                    if (me.isHorizontal()) {
-                        var innerWidth = me.width - (me.paddingLeft + me.paddingRight);
-                        var valueOffset = (innerWidth * decimal) + me.paddingLeft;
-
-                        var finalVal = me.left + Math.round(valueOffset);
-                        finalVal += me.isFullWidth() ? me.margins.left : 0;
-                        return finalVal;
-                    }
-                    return me.top + (decimal * me.height);
-                },
-
-                getBasePixel: function() {
-                    return this.getPixelForValue(this.getBaseValue());
-                },
-
-                getBaseValue: function() {
-                    var me = this;
-                    var min = me.min;
-                    var max = me.max;
-
-                    return me.beginAtZero ? 0 :
-                            min < 0 && max < 0 ? max :
-                                    min > 0 && max > 0 ? min :
-                                            0;
-                },
-
-                /**
-                 * Returns a subset of ticks to be plotted to avoid overlapping labels.
-                 * @private
-                 */
-                _autoSkip: function(ticks) {
-                    var skipRatio;
-                    var me = this;
-                    var isHorizontal = me.isHorizontal();
-                    var optionTicks = me.options.ticks.minor;
-                    var tickCount = ticks.length;
-                    var labelRotationRadians = helpers.toRadians(me.labelRotation);
-                    var cosRotation = Math.cos(labelRotationRadians);
-                    var longestRotatedLabel = me.longestLabelWidth * cosRotation;
-                    var result = [];
-                    var i, tick, shouldSkip;
-
-                    // figure out the maximum number of gridlines to show
-                    var maxTicks;
-                    if (optionTicks.maxTicksLimit) {
-                        maxTicks = optionTicks.maxTicksLimit;
-                    }
-
-                    if (isHorizontal) {
-                        skipRatio = false;
-
-                        if ((longestRotatedLabel + optionTicks.autoSkipPadding) * tickCount > (me.width - (me.paddingLeft + me.paddingRight))) {
-                            skipRatio = 1 + Math.floor(((longestRotatedLabel + optionTicks.autoSkipPadding) * tickCount) / (me.width - (me.paddingLeft + me.paddingRight)));
-                        }
-
-                        // if they defined a max number of optionTicks,
-                        // increase skipRatio until that number is met
-                        if (maxTicks && tickCount > maxTicks) {
-                            skipRatio = Math.max(skipRatio, Math.floor(tickCount / maxTicks));
-                        }
-                    }
-
-                    for (i = 0; i < tickCount; i++) {
-                        tick = ticks[i];
-
-                        // Since we always show the last tick,we need may need to hide the last shown one before
-                        shouldSkip = (skipRatio > 1 && i % skipRatio > 0) || (i % skipRatio === 0 && i + skipRatio >= tickCount);
-                        if (shouldSkip && i !== tickCount - 1 || helpers.isNullOrUndef(tick.label)) {
-                            // leave tick in place but make sure it's not displayed (#4635)
-                            delete tick.label;
-                        }
-                        result.push(tick);
-                    }
-                    return result;
-                },
-
-                // Actually draw the scale on the canvas
-                // @param {rectangle} chartArea : the area of the chart to draw full grid lines on
-                draw: function(chartArea) {
-                    var me = this;
-                    var options = me.options;
-                    if (!options.display) {
-                        return;
-                    }
-
-                    var context = me.ctx;
-                    var globalDefaults = defaults.global;
-                    var optionTicks = options.ticks.minor;
-                    var optionMajorTicks = options.ticks.major || optionTicks;
-                    var gridLines = options.gridLines;
-                    var scaleLabel = options.scaleLabel;
-
-                    var isRotated = me.labelRotation !== 0;
-                    var isHorizontal = me.isHorizontal();
-
-                    var ticks = optionTicks.autoSkip ? me._autoSkip(me.getTicks()) : me.getTicks();
-                    var tickFontColor = helpers.valueOrDefault(optionTicks.fontColor, globalDefaults.defaultFontColor);
-                    var tickFont = parseFontOptions(optionTicks);
-                    var majorTickFontColor = helpers.valueOrDefault(optionMajorTicks.fontColor, globalDefaults.defaultFontColor);
-                    var majorTickFont = parseFontOptions(optionMajorTicks);
-
-                    var tl = gridLines.drawTicks ? gridLines.tickMarkLength : 0;
-
-                    var scaleLabelFontColor = helpers.valueOrDefault(scaleLabel.fontColor, globalDefaults.defaultFontColor);
-                    var scaleLabelFont = parseFontOptions(scaleLabel);
-                    var scaleLabelPadding = helpers.options.toPadding(scaleLabel.padding);
-                    var labelRotationRadians = helpers.toRadians(me.labelRotation);
-
-                    var itemsToDraw = [];
-
-                    var xTickStart = options.position === 'right' ? me.left : me.right - tl;
-                    var xTickEnd = options.position === 'right' ? me.left + tl : me.right;
-                    var yTickStart = options.position === 'bottom' ? me.top : me.bottom - tl;
-                    var yTickEnd = options.position === 'bottom' ? me.top + tl : me.bottom;
-
-                    helpers.each(ticks, function(tick, index) {
-                        // autoskipper skipped this tick (#4635)
-                        if (tick.label === undefined) {
-                            return;
-                        }
-
-                        var label = tick.label;
-                        var lineWidth, lineColor, borderDash, borderDashOffset;
-                        if (index === me.zeroLineIndex && options.offset === gridLines.offsetGridLines) {
-                            // Draw the first index specially
-                            lineWidth = gridLines.zeroLineWidth;
-                            lineColor = gridLines.zeroLineColor;
-                            borderDash = gridLines.zeroLineBorderDash;
-                            borderDashOffset = gridLines.zeroLineBorderDashOffset;
-                        } else {
-                            lineWidth = helpers.valueAtIndexOrDefault(gridLines.lineWidth, index);
-                            lineColor = helpers.valueAtIndexOrDefault(gridLines.color, index);
-                            borderDash = helpers.valueOrDefault(gridLines.borderDash, globalDefaults.borderDash);
-                            borderDashOffset = helpers.valueOrDefault(gridLines.borderDashOffset, globalDefaults.borderDashOffset);
-                        }
-
-                        // Common properties
-                        var tx1, ty1, tx2, ty2, x1, y1, x2, y2, labelX, labelY;
-                        var textAlign = 'middle';
-                        var textBaseline = 'middle';
-                        var tickPadding = optionTicks.padding;
-
-                        if (isHorizontal) {
-                            var labelYOffset = tl + tickPadding;
-
-                            if (options.position === 'bottom') {
-                                // bottom
-                                textBaseline = !isRotated ? 'top' : 'middle';
-                                textAlign = !isRotated ? 'center' : 'right';
-                                labelY = me.top + labelYOffset;
-                            } else {
-                                // top
-                                textBaseline = !isRotated ? 'bottom' : 'middle';
-                                textAlign = !isRotated ? 'center' : 'left';
-                                labelY = me.bottom - labelYOffset;
-                            }
-
-                            var xLineValue = getLineValue(me, index, gridLines.offsetGridLines && ticks.length > 1);
-                            if (xLineValue < me.left) {
-                                lineColor = 'rgba(0,0,0,0)';
-                            }
-                            xLineValue += helpers.aliasPixel(lineWidth);
-
-                            labelX = me.getPixelForTick(index) + optionTicks.labelOffset; // x values for optionTicks (need to consider offsetLabel option)
-
-                            tx1 = tx2 = x1 = x2 = xLineValue;
-                            ty1 = yTickStart;
-                            ty2 = yTickEnd;
-                            y1 = chartArea.top;
-                            y2 = chartArea.bottom;
-                        } else {
-                            var isLeft = options.position === 'left';
-                            var labelXOffset;
-
-                            if (optionTicks.mirror) {
-                                textAlign = isLeft ? 'left' : 'right';
-                                labelXOffset = tickPadding;
-                            } else {
-                                textAlign = isLeft ? 'right' : 'left';
-                                labelXOffset = tl + tickPadding;
-                            }
-
-                            labelX = isLeft ? me.right - labelXOffset : me.left + labelXOffset;
-
-                            var yLineValue = getLineValue(me, index, gridLines.offsetGridLines && ticks.length > 1);
-                            if (yLineValue < me.top) {
-                                lineColor = 'rgba(0,0,0,0)';
-                            }
-                            yLineValue += helpers.aliasPixel(lineWidth);
-
-                            labelY = me.getPixelForTick(index) + optionTicks.labelOffset;
-
-                            tx1 = xTickStart;
-                            tx2 = xTickEnd;
-                            x1 = chartArea.left;
-                            x2 = chartArea.right;
-                            ty1 = ty2 = y1 = y2 = yLineValue;
-                        }
-
-                        itemsToDraw.push({
-                            tx1: tx1,
-                            ty1: ty1,
-                            tx2: tx2,
-                            ty2: ty2,
-                            x1: x1,
-                            y1: y1,
-                            x2: x2,
-                            y2: y2,
-                            labelX: labelX,
-                            labelY: labelY,
-                            glWidth: lineWidth,
-                            glColor: lineColor,
-                            glBorderDash: borderDash,
-                            glBorderDashOffset: borderDashOffset,
-                            rotation: -1 * labelRotationRadians,
-                            label: label,
-                            major: tick.major,
-                            textBaseline: textBaseline,
-                            textAlign: textAlign
-                        });
-                    });
-
-                    // Draw all of the tick labels, tick marks, and grid lines at the correct places
-                    helpers.each(itemsToDraw, function(itemToDraw, index) {
-                        // CUSTOM
-                        if (isHorizontal && index % 2 === 0) {
-                            var startLineValue = getLineValue(me, index, gridLines.offsetGridLines && ticks.length > 1);
-                            var endLineValue = getLineValue(me, index +1, gridLines.offsetGridLines && ticks.length > 1);
-                            var totalWidth = endLineValue - startLineValue;
-
-
-                            if (itemToDraw.x1 + (totalWidth) > chartArea.right) {
-                                totalWidth = chartArea.right - startLineValue;
-                            }
-
-                            context.fillStyle = '#1B2C3D';
-                            context.fillRect(itemToDraw.x1, itemToDraw.y1, totalWidth, itemToDraw.y2 - itemToDraw.y1);
-                            context.restore();
-                        }
-                        // END CUSTOM
-
-                        if (gridLines.display) {
-                            context.save();
-                            context.lineWidth = itemToDraw.glWidth;
-                            context.strokeStyle = itemToDraw.glColor;
-                            if (context.setLineDash) {
-                                context.setLineDash(itemToDraw.glBorderDash);
-                                context.lineDashOffset = itemToDraw.glBorderDashOffset;
-                            }
-
-                            context.beginPath();
-
-                            if (gridLines.drawTicks) {
-                                context.moveTo(itemToDraw.tx1, itemToDraw.ty1);
-                                context.lineTo(itemToDraw.tx2, itemToDraw.ty2);
-                            }
-
-                            if (gridLines.drawOnChartArea) {
-                                context.moveTo(itemToDraw.x1, itemToDraw.y1);
-                                context.lineTo(itemToDraw.x2, itemToDraw.y2);
-                            }
-
-                            context.stroke();
-                            context.restore();
-                        }
-
-                        if (optionTicks.display) {
-                            // Make sure we draw text in the correct color and font
-                            context.save();
-                            context.translate(itemToDraw.labelX, itemToDraw.labelY);
-                            context.rotate(itemToDraw.rotation);
-                            context.font = itemToDraw.major ? majorTickFont.font : tickFont.font;
-                            context.fillStyle = itemToDraw.major ? majorTickFontColor : tickFontColor;
-                            context.textBaseline = itemToDraw.textBaseline;
-                            context.textAlign = itemToDraw.textAlign;
-
-                            var label = itemToDraw.label;
-                            if (helpers.isArray(label)) {
-                                for (var i = 0, y = 0; i < label.length; ++i) {
-                                    // We just make sure the multiline element is a string here..
-                                    context.fillText('' + label[i], 0, y);
-                                    // apply same lineSpacing as calculated @ L#320
-                                    y += (tickFont.size * 1.5);
-                                }
-                            } else {
-                                context.fillText(label, 0, 0);
-                            }
-                            context.restore();
-                        }
-                    });
-
-                    if (scaleLabel.display) {
-                        // Draw the scale label
-                        var scaleLabelX;
-                        var scaleLabelY;
-                        var rotation = 0;
-                        var halfLineHeight = parseLineHeight(scaleLabel) / 2;
-
-                        if (isHorizontal) {
-                            scaleLabelX = me.left + ((me.right - me.left) / 2); // midpoint of the width
-                            scaleLabelY = options.position === 'bottom'
-                                    ? me.bottom - halfLineHeight - scaleLabelPadding.bottom
-                                    : me.top + halfLineHeight + scaleLabelPadding.top;
-                        } else {
-                            var isLeft = options.position === 'left';
-                            scaleLabelX = isLeft
-                                    ? me.left + halfLineHeight + scaleLabelPadding.top
-                                    : me.right - halfLineHeight - scaleLabelPadding.top;
-                            scaleLabelY = me.top + ((me.bottom - me.top) / 2);
-                            rotation = isLeft ? -0.5 * Math.PI : 0.5 * Math.PI;
-                        }
-
-                        context.save();
-                        context.translate(scaleLabelX, scaleLabelY);
-                        context.rotate(rotation);
-                        context.textAlign = 'center';
-                        context.textBaseline = 'middle';
-                        context.fillStyle = scaleLabelFontColor; // render in correct colour
-                        context.font = scaleLabelFont.font;
-                        context.fillText(scaleLabel.labelString, 0, 0);
-                        context.restore();
-                    }
-
-                    if (gridLines.drawBorder) {
-                        // Draw the line at the edge of the axis
-                        context.lineWidth = helpers.valueAtIndexOrDefault(gridLines.lineWidth, 0);
-                        context.strokeStyle = helpers.valueAtIndexOrDefault(gridLines.color, 0);
-                        var x1 = me.left;
-                        var x2 = me.right;
-                        var y1 = me.top;
-                        var y2 = me.bottom;
-
-                        var aliasPixel = helpers.aliasPixel(context.lineWidth);
-                        if (isHorizontal) {
-                            y1 = y2 = options.position === 'top' ? me.bottom : me.top;
-                            y1 += aliasPixel;
-                            y2 += aliasPixel;
-                        } else {
-                            x1 = x2 = options.position === 'left' ? me.right : me.left;
-                            x1 += aliasPixel;
-                            x2 += aliasPixel;
-                        }
-
-                        context.beginPath();
-                        context.moveTo(x1, y1);
-                        context.lineTo(x2, y2);
-                        context.stroke();
-                    }
-                }
-            });
-        };
-
-    },{ "25":25,"26":26,"34":34,"45":45 }],33:[function(require,module,exports){
-        'use strict';
-
-        var defaults = require(25);
-        var helpers = require(45);
-
-        module.exports = function(Chart) {
-
-            Chart.scaleService = {
-                // Scale registration object. Extensions can register new scale types (such as log or DB scales) and then
-                // use the new chart options to grab the correct scale
-                constructors: {},
-                // Use a registration function so that we can move to an ES6 map when we no longer need to support
-                // old browsers
-
-                // Scale config defaults
-                defaults: {},
-                registerScaleType: function(type, scaleConstructor, scaleDefaults) {
-                    this.constructors[type] = scaleConstructor;
-                    this.defaults[type] = helpers.clone(scaleDefaults);
-                },
-                getScaleConstructor: function(type) {
-                    return this.constructors.hasOwnProperty(type) ? this.constructors[type] : undefined;
-                },
-                getScaleDefaults: function(type) {
-                    // Return the scale defaults merged with the global settings so that we always use the latest ones
-                    return this.defaults.hasOwnProperty(type) ? helpers.merge({}, [defaults.scale, this.defaults[type]]) : {};
-                },
-                updateScaleDefaults: function(type, additions) {
-                    var me = this;
-                    if (me.defaults.hasOwnProperty(type)) {
-                        me.defaults[type] = helpers.extend(me.defaults[type], additions);
-                    }
-                },
-                addScalesToLayout: function(chart) {
-                    // Adds each scale to the chart.boxes array to be sized accordingly
-                    helpers.each(chart.scales, function(scale) {
-                        // Set ILayoutItem parameters for backwards compatibility
-                        scale.fullWidth = scale.options.fullWidth;
-                        scale.position = scale.options.position;
-                        scale.weight = scale.options.weight;
-                        Chart.layoutService.addBox(chart, scale);
-                    });
-                }
-            };
-        };
-
-    },{ "25":25,"45":45 }],34:[function(require,module,exports){
-        'use strict';
-
-        var helpers = require(45);
-
-        /**
-         * Namespace to hold static tick generation functions
-         * @namespace Chart.Ticks
-         */
-        module.exports = {
-            /**
-             * Namespace to hold generators for different types of ticks
-             * @namespace Chart.Ticks.generators
-             */
-            generators: {
-                /**
-                 * Interface for the options provided to the numeric tick generator
-                 * @interface INumericTickGenerationOptions
-                 */
-                /**
-                 * The maximum number of ticks to display
-                 * @name INumericTickGenerationOptions#maxTicks
-                 * @type Number
-                 */
-                /**
-                 * The distance between each tick.
-                 * @name INumericTickGenerationOptions#stepSize
-                 * @type Number
-                 * @optional
-                 */
-                /**
-                 * Forced minimum for the ticks. If not specified, the minimum of the data range is used to calculate the tick minimum
-                 * @name INumericTickGenerationOptions#min
-                 * @type Number
-                 * @optional
-                 */
-                /**
-                 * The maximum value of the ticks. If not specified, the maximum of the data range is used to calculate the tick maximum
-                 * @name INumericTickGenerationOptions#max
-                 * @type Number
-                 * @optional
-                 */
-
-                /**
-                 * Generate a set of linear ticks
-                 * @method Chart.Ticks.generators.linear
-                 * @param generationOptions {INumericTickGenerationOptions} the options used to generate the ticks
-                 * @param dataRange {IRange} the range of the data
-                 * @returns {Array<Number>} array of tick values
-                 */
-                linear: function(generationOptions, dataRange) {
-                    var ticks = [];
-                    // To get a "nice" value for the tick spacing, we will use the appropriately named
-                    // "nice number" algorithm. See http://stackoverflow.com/questions/8506881/nice-label-algorithm-for-charts-with-minimum-ticks
-                    // for details.
-
-                    var spacing;
-                    if (generationOptions.stepSize && generationOptions.stepSize > 0) {
-                        spacing = generationOptions.stepSize;
-                    } else {
-                        var niceRange = helpers.niceNum(dataRange.max - dataRange.min, false);
-                        spacing = helpers.niceNum(niceRange / (generationOptions.maxTicks - 1), true);
-                    }
-                    var niceMin = Math.floor(dataRange.min / spacing) * spacing;
-                    var niceMax = Math.ceil(dataRange.max / spacing) * spacing;
-
-                    // If min, max and stepSize is set and they make an evenly spaced scale use it.
-                    if (generationOptions.min && generationOptions.max && generationOptions.stepSize) {
-                        // If very close to our whole number, use it.
-                        if (helpers.almostWhole((generationOptions.max - generationOptions.min) / generationOptions.stepSize, spacing / 1000)) {
-                            niceMin = generationOptions.min;
-                            niceMax = generationOptions.max;
-                        }
-                    }
-
-                    var numSpaces = (niceMax - niceMin) / spacing;
-                    // If very close to our rounded value, use it.
-                    if (helpers.almostEquals(numSpaces, Math.round(numSpaces), spacing / 1000)) {
-                        numSpaces = Math.round(numSpaces);
-                    } else {
-                        numSpaces = Math.ceil(numSpaces);
-                    }
-
-                    // Put the values into the ticks array
-                    ticks.push(generationOptions.min !== undefined ? generationOptions.min : niceMin);
-                    for (var j = 1; j < numSpaces; ++j) {
-                        ticks.push(niceMin + (j * spacing));
-                    }
-                    ticks.push(generationOptions.max !== undefined ? generationOptions.max : niceMax);
-
-                    return ticks;
-                },
-
-                /**
-                 * Generate a set of logarithmic ticks
-                 * @method Chart.Ticks.generators.logarithmic
-                 * @param generationOptions {INumericTickGenerationOptions} the options used to generate the ticks
-                 * @param dataRange {IRange} the range of the data
-                 * @returns {Array<Number>} array of tick values
-                 */
-                logarithmic: function(generationOptions, dataRange) {
-                    var ticks = [];
-                    var valueOrDefault = helpers.valueOrDefault;
-
-                    // Figure out what the max number of ticks we can support it is based on the size of
-                    // the axis area. For now, we say that the minimum tick spacing in pixels must be 50
-                    // We also limit the maximum number of ticks to 11 which gives a nice 10 squares on
-                    // the graph
-                    var tickVal = valueOrDefault(generationOptions.min, Math.pow(10, Math.floor(helpers.log10(dataRange.min))));
-
-                    var endExp = Math.floor(helpers.log10(dataRange.max));
-                    var endSignificand = Math.ceil(dataRange.max / Math.pow(10, endExp));
-                    var exp, significand;
-
-                    if (tickVal === 0) {
-                        exp = Math.floor(helpers.log10(dataRange.minNotZero));
-                        significand = Math.floor(dataRange.minNotZero / Math.pow(10, exp));
-
-                        ticks.push(tickVal);
-                        tickVal = significand * Math.pow(10, exp);
-                    } else {
-                        exp = Math.floor(helpers.log10(tickVal));
-                        significand = Math.floor(tickVal / Math.pow(10, exp));
-                    }
-
-                    do {
-                        ticks.push(tickVal);
-
-                        ++significand;
-                        if (significand === 10) {
-                            significand = 1;
-                            ++exp;
-                        }
-
-                        tickVal = significand * Math.pow(10, exp);
-                    } while (exp < endExp || (exp === endExp && significand < endSignificand));
-
-                    var lastTick = valueOrDefault(generationOptions.max, tickVal);
-                    ticks.push(lastTick);
-
-                    return ticks;
-                }
-            },
-
-            /**
-             * Namespace to hold formatters for different types of ticks
-             * @namespace Chart.Ticks.formatters
-             */
-            formatters: {
-                /**
-                 * Formatter for value labels
-                 * @method Chart.Ticks.formatters.values
-                 * @param value the value to display
-                 * @return {String|Array} the label to display
-                 */
-                values: function(value) {
-                    return helpers.isArray(value) ? value : '' + value;
-                },
-
-                /**
-                 * Formatter for linear numeric ticks
-                 * @method Chart.Ticks.formatters.linear
-                 * @param tickValue {Number} the value to be formatted
-                 * @param index {Number} the position of the tickValue parameter in the ticks array
-                 * @param ticks {Array<Number>} the list of ticks being converted
-                 * @return {String} string representation of the tickValue parameter
-                 */
-                linear: function(tickValue, index, ticks) {
-                    // If we have lots of ticks, don't use the ones
-                    var delta = ticks.length > 3 ? ticks[2] - ticks[1] : ticks[1] - ticks[0];
-
-                    // If we have a number like 2.5 as the delta, figure out how many decimal places we need
-                    if (Math.abs(delta) > 1) {
-                        if (tickValue !== Math.floor(tickValue)) {
-                            // not an integer
-                            delta = tickValue - Math.floor(tickValue);
-                        }
-                    }
-
-                    var logDelta = helpers.log10(Math.abs(delta));
-                    var tickString = '';
-
-                    if (tickValue !== 0) {
-                        var numDecimal = -1 * Math.floor(logDelta);
-                        numDecimal = Math.max(Math.min(numDecimal, 20), 0); // toFixed has a max of 20 decimal places
-                        tickString = tickValue.toFixed(numDecimal);
-                    } else {
-                        tickString = '0'; // never show decimal places for 0
-                    }
-
-                    return tickString;
-                },
-
-                logarithmic: function(tickValue, index, ticks) {
-                    var remain = tickValue / (Math.pow(10, Math.floor(helpers.log10(tickValue))));
-
-                    if (tickValue === 0) {
-                        return '0';
-                    } else if (remain === 1 || remain === 2 || remain === 5 || index === 0 || index === ticks.length - 1) {
-                        return tickValue.toExponential();
-                    }
-                    return '';
-                }
-            }
-        };
-
-    },{ "45":45 }],35:[function(require,module,exports){
-        'use strict';
-
-        var defaults = require(25);
-        var Element = require(26);
-        var helpers = require(45);
-
-        defaults._set('global', {
-            tooltips: {
-                enabled: true,
-                custom: null,
-                mode: 'nearest',
-                position: 'average',
-                intersect: true,
-                backgroundColor: 'rgba(0,0,0,0.8)',
-                titleFontStyle: 'bold',
-                titleSpacing: 2,
-                titleMarginBottom: 6,
-                titleFontColor: '#fff',
-                titleAlign: 'left',
-                bodySpacing: 2,
-                bodyFontColor: '#fff',
-                bodyAlign: 'left',
-                footerFontStyle: 'bold',
-                footerSpacing: 2,
-                footerMarginTop: 6,
-                footerFontColor: '#fff',
-                footerAlign: 'left',
-                yPadding: 6,
-                xPadding: 6,
-                caretPadding: 2,
-                caretSize: 5,
-                cornerRadius: 6,
-                multiKeyBackground: '#fff',
-                displayColors: true,
-                borderColor: 'rgba(0,0,0,0)',
-                borderWidth: 0,
-                callbacks: {
-                    // Args are: (tooltipItems, data)
-                    beforeTitle: helpers.noop,
-                    title: function(tooltipItems, data) {
-                        // Pick first xLabel for now
-                        var title = '';
-                        var labels = data.labels;
-                        var labelCount = labels ? labels.length : 0;
-
-                        if (tooltipItems.length > 0) {
-                            var item = tooltipItems[0];
-
-                            if (item.xLabel) {
-                                title = item.xLabel;
-                            } else if (labelCount > 0 && item.index < labelCount) {
-                                title = labels[item.index];
-                            }
-                        }
-
-                        return title;
-                    },
-                    afterTitle: helpers.noop,
-
-                    // Args are: (tooltipItems, data)
-                    beforeBody: helpers.noop,
-
-                    // Args are: (tooltipItem, data)
-                    beforeLabel: helpers.noop,
-                    label: function(tooltipItem, data) {
-                        var label = data.datasets[tooltipItem.datasetIndex].label || '';
-
-                        if (label) {
-                            label += ': ';
-                        }
-                        label += tooltipItem.yLabel;
-                        return label;
-                    },
-                    labelColor: function(tooltipItem, chart) {
-                        var meta = chart.getDatasetMeta(tooltipItem.datasetIndex);
-                        var activeElement = meta.data[tooltipItem.index];
-                        var view = activeElement._view;
-                        return {
-                            borderColor: view.borderColor,
-                            backgroundColor: view.backgroundColor
-                        };
-                    },
-                    labelTextColor: function() {
-                        return this._options.bodyFontColor;
-                    },
-                    afterLabel: helpers.noop,
-
-                    // Args are: (tooltipItems, data)
-                    afterBody: helpers.noop,
-
-                    // Args are: (tooltipItems, data)
-                    beforeFooter: helpers.noop,
-                    footer: helpers.noop,
-                    afterFooter: helpers.noop
-                }
-            }
-        });
-
-        module.exports = function(Chart) {
-
-            /**
-             * Helper method to merge the opacity into a color
-             */
-            function mergeOpacity(colorString, opacity) {
-                var color = helpers.color(colorString);
-                return color.alpha(opacity * color.alpha()).rgbaString();
-            }
-
-            // Helper to push or concat based on if the 2nd parameter is an array or not
-            function pushOrConcat(base, toPush) {
-                if (toPush) {
-                    if (helpers.isArray(toPush)) {
-                        // base = base.concat(toPush);
-                        Array.prototype.push.apply(base, toPush);
-                    } else {
-                        base.push(toPush);
-                    }
-                }
-
-                return base;
-            }
-
-            // Private helper to create a tooltip item model
-            // @param element : the chart element (point, arc, bar) to create the tooltip item for
-            // @return : new tooltip item
-            function createTooltipItem(element) {
-                var xScale = element._xScale;
-                var yScale = element._yScale || element._scale; // handle radar || polarArea charts
-                var index = element._index;
-                var datasetIndex = element._datasetIndex;
-
-                return {
-                    xLabel: xScale ? xScale.getLabelForIndex(index, datasetIndex) : '',
-                    yLabel: yScale ? yScale.getLabelForIndex(index, datasetIndex) : '',
-                    index: index,
-                    datasetIndex: datasetIndex,
-                    x: element._model.x,
-                    y: element._model.y
-                };
-            }
-
-            /**
-             * Helper to get the reset model for the tooltip
-             * @param tooltipOpts {Object} the tooltip options
-             */
-            function getBaseModel(tooltipOpts) {
-                var globalDefaults = defaults.global;
-                var valueOrDefault = helpers.valueOrDefault;
-
-                return {
-                    // Positioning
-                    xPadding: tooltipOpts.xPadding,
-                    yPadding: tooltipOpts.yPadding,
-                    xAlign: tooltipOpts.xAlign,
-                    yAlign: tooltipOpts.yAlign,
-
-                    // Body
-                    bodyFontColor: tooltipOpts.bodyFontColor,
-                    _bodyFontFamily: valueOrDefault(tooltipOpts.bodyFontFamily, globalDefaults.defaultFontFamily),
-                    _bodyFontStyle: valueOrDefault(tooltipOpts.bodyFontStyle, globalDefaults.defaultFontStyle),
-                    _bodyAlign: tooltipOpts.bodyAlign,
-                    bodyFontSize: valueOrDefault(tooltipOpts.bodyFontSize, globalDefaults.defaultFontSize),
-                    bodySpacing: tooltipOpts.bodySpacing,
-
-                    // Title
-                    titleFontColor: tooltipOpts.titleFontColor,
-                    _titleFontFamily: valueOrDefault(tooltipOpts.titleFontFamily, globalDefaults.defaultFontFamily),
-                    _titleFontStyle: valueOrDefault(tooltipOpts.titleFontStyle, globalDefaults.defaultFontStyle),
-                    titleFontSize: valueOrDefault(tooltipOpts.titleFontSize, globalDefaults.defaultFontSize),
-                    _titleAlign: tooltipOpts.titleAlign,
-                    titleSpacing: tooltipOpts.titleSpacing,
-                    titleMarginBottom: tooltipOpts.titleMarginBottom,
-
-                    // Footer
-                    footerFontColor: tooltipOpts.footerFontColor,
-                    _footerFontFamily: valueOrDefault(tooltipOpts.footerFontFamily, globalDefaults.defaultFontFamily),
-                    _footerFontStyle: valueOrDefault(tooltipOpts.footerFontStyle, globalDefaults.defaultFontStyle),
-                    footerFontSize: valueOrDefault(tooltipOpts.footerFontSize, globalDefaults.defaultFontSize),
-                    _footerAlign: tooltipOpts.footerAlign,
-                    footerSpacing: tooltipOpts.footerSpacing,
-                    footerMarginTop: tooltipOpts.footerMarginTop,
-
-                    // Appearance
-                    caretSize: tooltipOpts.caretSize,
-                    cornerRadius: tooltipOpts.cornerRadius,
-                    backgroundColor: tooltipOpts.backgroundColor,
-                    opacity: 0,
-                    legendColorBackground: tooltipOpts.multiKeyBackground,
-                    displayColors: tooltipOpts.displayColors,
-                    borderColor: tooltipOpts.borderColor,
-                    borderWidth: tooltipOpts.borderWidth
-                };
-            }
-
-            /**
-             * Get the size of the tooltip
-             */
-            function getTooltipSize(tooltip, model) {
-                var ctx = tooltip._chart.ctx;
-
-                var height = model.yPadding * 2; // Tooltip Padding
-                var width = 0;
-
-                // Count of all lines in the body
-                var body = model.body;
-                var combinedBodyLength = body.reduce(function(count, bodyItem) {
-                    return count + bodyItem.before.length + bodyItem.lines.length + bodyItem.after.length;
-                }, 0);
-                combinedBodyLength += model.beforeBody.length + model.afterBody.length;
-
-                var titleLineCount = model.title.length;
-                var footerLineCount = model.footer.length;
-                var titleFontSize = model.titleFontSize;
-                var bodyFontSize = model.bodyFontSize;
-                var footerFontSize = model.footerFontSize;
-
-                height += titleLineCount * titleFontSize; // Title Lines
-                height += titleLineCount ? (titleLineCount - 1) * model.titleSpacing : 0; // Title Line Spacing
-                height += titleLineCount ? model.titleMarginBottom : 0; // Title's bottom Margin
-                height += combinedBodyLength * bodyFontSize; // Body Lines
-                height += combinedBodyLength ? (combinedBodyLength - 1) * model.bodySpacing : 0; // Body Line Spacing
-                height += footerLineCount ? model.footerMarginTop : 0; // Footer Margin
-                height += footerLineCount * (footerFontSize); // Footer Lines
-                height += footerLineCount ? (footerLineCount - 1) * model.footerSpacing : 0; // Footer Line Spacing
-
-                // Title width
-                var widthPadding = 0;
-                var maxLineWidth = function(line) {
-                    width = Math.max(width, ctx.measureText(line).width + widthPadding);
-                };
-
-                ctx.font = helpers.fontString(titleFontSize, model._titleFontStyle, model._titleFontFamily);
-                helpers.each(model.title, maxLineWidth);
-
-                // Body width
-                ctx.font = helpers.fontString(bodyFontSize, model._bodyFontStyle, model._bodyFontFamily);
-                helpers.each(model.beforeBody.concat(model.afterBody), maxLineWidth);
-
-                // Body lines may include some extra width due to the color box
-                widthPadding = model.displayColors ? (bodyFontSize + 2) : 0;
-                helpers.each(body, function(bodyItem) {
-                    helpers.each(bodyItem.before, maxLineWidth);
-                    helpers.each(bodyItem.lines, maxLineWidth);
-                    helpers.each(bodyItem.after, maxLineWidth);
-                });
-
-                // Reset back to 0
-                widthPadding = 0;
-
-                // Footer width
-                ctx.font = helpers.fontString(footerFontSize, model._footerFontStyle, model._footerFontFamily);
-                helpers.each(model.footer, maxLineWidth);
-
-                // Add padding
-                width += 2 * model.xPadding;
-
-                return {
-                    width: width,
-                    height: height
-                };
-            }
-
-            /**
-             * Helper to get the alignment of a tooltip given the size
-             */
-            function determineAlignment(tooltip, size) {
-                var model = tooltip._model;
-                var chart = tooltip._chart;
-                var chartArea = tooltip._chart.chartArea;
-                var xAlign = 'center';
-                var yAlign = 'center';
-
-                if (model.y < size.height) {
-                    yAlign = 'top';
-                } else if (model.y > (chart.height - size.height)) {
-                    yAlign = 'bottom';
-                }
-
-                var lf, rf; // functions to determine left, right alignment
-                var olf, orf; // functions to determine if left/right alignment causes tooltip to go outside chart
-                var yf; // function to get the y alignment if the tooltip goes outside of the left or right edges
-                var midX = (chartArea.left + chartArea.right) / 2;
-                var midY = (chartArea.top + chartArea.bottom) / 2;
-
-                if (yAlign === 'center') {
-                    lf = function(x) {
-                        return x <= midX;
-                    };
-                    rf = function(x) {
-                        return x > midX;
-                    };
-                } else {
-                    lf = function(x) {
-                        return x <= (size.width / 2);
-                    };
-                    rf = function(x) {
-                        return x >= (chart.width - (size.width / 2));
-                    };
-                }
-
-                olf = function(x) {
-                    return x + size.width > chart.width;
-                };
-                orf = function(x) {
-                    return x - size.width < 0;
-                };
-                yf = function(y) {
-                    return y <= midY ? 'top' : 'bottom';
-                };
-
-                if (lf(model.x)) {
-                    xAlign = 'left';
-
-                    // Is tooltip too wide and goes over the right side of the chart.?
-                    if (olf(model.x)) {
-                        xAlign = 'center';
-                        yAlign = yf(model.y);
-                    }
-                } else if (rf(model.x)) {
-                    xAlign = 'right';
-
-                    // Is tooltip too wide and goes outside left edge of canvas?
-                    if (orf(model.x)) {
-                        xAlign = 'center';
-                        yAlign = yf(model.y);
-                    }
-                }
-
-                var opts = tooltip._options;
-                return {
-                    xAlign: opts.xAlign ? opts.xAlign : xAlign,
-                    yAlign: opts.yAlign ? opts.yAlign : yAlign
-                };
-            }
-
-            /**
-             * @Helper to get the location a tooltip needs to be placed at given the initial position (via the vm) and the size and alignment
-             */
-            function getBackgroundPoint(vm, size, alignment) {
-                // Background Position
-                var x = vm.x;
-                var y = vm.y;
-
-                var caretSize = vm.caretSize;
-                var caretPadding = vm.caretPadding;
-                var cornerRadius = vm.cornerRadius;
-                var xAlign = alignment.xAlign;
-                var yAlign = alignment.yAlign;
-                var paddingAndSize = caretSize + caretPadding;
-                var radiusAndPadding = cornerRadius + caretPadding;
-
-                if (xAlign === 'right') {
-                    x -= size.width;
-                } else if (xAlign === 'center') {
-                    x -= (size.width / 2);
-                }
-
-                if (yAlign === 'top') {
-                    y += paddingAndSize;
-                } else if (yAlign === 'bottom') {
-                    y -= size.height + paddingAndSize;
-                } else {
-                    y -= (size.height / 2);
-                }
-
-                if (yAlign === 'center') {
-                    if (xAlign === 'left') {
-                        x += paddingAndSize;
-                    } else if (xAlign === 'right') {
-                        x -= paddingAndSize;
-                    }
-                } else if (xAlign === 'left') {
-                    x -= radiusAndPadding;
-                } else if (xAlign === 'right') {
-                    x += radiusAndPadding;
-                }
-
-                return {
-                    x: x,
-                    y: y
-                };
-            }
-
-            Chart.Tooltip = Element.extend({
-                initialize: function() {
-                    this._model = getBaseModel(this._options);
-                },
-
-                // Get the title
-                // Args are: (tooltipItem, data)
-                getTitle: function() {
-                    var me = this;
-                    var opts = me._options;
-                    var callbacks = opts.callbacks;
-
-                    var beforeTitle = callbacks.beforeTitle.apply(me, arguments);
-                    var title = callbacks.title.apply(me, arguments);
-                    var afterTitle = callbacks.afterTitle.apply(me, arguments);
-
-                    var lines = [];
-                    lines = pushOrConcat(lines, beforeTitle);
-                    lines = pushOrConcat(lines, title);
-                    lines = pushOrConcat(lines, afterTitle);
-
-                    return lines;
-                },
-
-                // Args are: (tooltipItem, data)
-                getBeforeBody: function() {
-                    var lines = this._options.callbacks.beforeBody.apply(this, arguments);
-                    return helpers.isArray(lines) ? lines : lines !== undefined ? [lines] : [];
-                },
-
-                // Args are: (tooltipItem, data)
-                getBody: function(tooltipItems, data) {
-                    var me = this;
-                    var callbacks = me._options.callbacks;
-                    var bodyItems = [];
-
-                    helpers.each(tooltipItems, function(tooltipItem) {
-                        var bodyItem = {
-                            before: [],
-                            lines: [],
-                            after: []
-                        };
-                        pushOrConcat(bodyItem.before, callbacks.beforeLabel.call(me, tooltipItem, data));
-                        pushOrConcat(bodyItem.lines, callbacks.label.call(me, tooltipItem, data));
-                        pushOrConcat(bodyItem.after, callbacks.afterLabel.call(me, tooltipItem, data));
-
-                        bodyItems.push(bodyItem);
-                    });
-
-                    return bodyItems;
-                },
-
-                // Args are: (tooltipItem, data)
-                getAfterBody: function() {
-                    var lines = this._options.callbacks.afterBody.apply(this, arguments);
-                    return helpers.isArray(lines) ? lines : lines !== undefined ? [lines] : [];
-                },
-
-                // Get the footer and beforeFooter and afterFooter lines
-                // Args are: (tooltipItem, data)
-                getFooter: function() {
-                    var me = this;
-                    var callbacks = me._options.callbacks;
-
-                    var beforeFooter = callbacks.beforeFooter.apply(me, arguments);
-                    var footer = callbacks.footer.apply(me, arguments);
-                    var afterFooter = callbacks.afterFooter.apply(me, arguments);
-
-                    var lines = [];
-                    lines = pushOrConcat(lines, beforeFooter);
-                    lines = pushOrConcat(lines, footer);
-                    lines = pushOrConcat(lines, afterFooter);
-
-                    return lines;
-                },
-
-                update: function(changed) {
-                    var me = this;
-                    var opts = me._options;
-
-                    // Need to regenerate the model because its faster than using extend and it is necessary due to the optimization in Chart.Element.transition
-                    // that does _view = _model if ease === 1. This causes the 2nd tooltip update to set properties in both the view and model at the same time
-                    // which breaks any animations.
-                    var existingModel = me._model;
-                    var model = me._model = getBaseModel(opts);
-                    var active = me._active;
-
-                    var data = me._data;
-
-                    // In the case where active.length === 0 we need to keep these at existing values for good animations
-                    var alignment = {
-                        xAlign: existingModel.xAlign,
-                        yAlign: existingModel.yAlign
-                    };
-                    var backgroundPoint = {
-                        x: existingModel.x,
-                        y: existingModel.y
-                    };
-                    var tooltipSize = {
-                        width: existingModel.width,
-                        height: existingModel.height
-                    };
-                    var tooltipPosition = {
-                        x: existingModel.caretX,
-                        y: existingModel.caretY
-                    };
-
-                    var i, len;
-
-                    if (active.length) {
-                        model.opacity = 1;
-
-                        var labelColors = [];
-                        var labelTextColors = [];
-                        tooltipPosition = Chart.Tooltip.positioners[opts.position](active, me._eventPosition);
-
-                        var tooltipItems = [];
-                        for (i = 0, len = active.length; i < len; ++i) {
-                            tooltipItems.push(createTooltipItem(active[i]));
-                        }
-
-                        // If the user provided a filter function, use it to modify the tooltip items
-                        if (opts.filter) {
-                            tooltipItems = tooltipItems.filter(function(a) {
-                                return opts.filter(a, data);
-                            });
-                        }
-
-                        // If the user provided a sorting function, use it to modify the tooltip items
-                        if (opts.itemSort) {
-                            tooltipItems = tooltipItems.sort(function(a, b) {
-                                return opts.itemSort(a, b, data);
-                            });
-                        }
-
-                        // Determine colors for boxes
-                        helpers.each(tooltipItems, function(tooltipItem) {
-                            labelColors.push(opts.callbacks.labelColor.call(me, tooltipItem, me._chart));
-                            labelTextColors.push(opts.callbacks.labelTextColor.call(me, tooltipItem, me._chart));
-                        });
-
-
-                        // Build the Text Lines
-                        model.title = me.getTitle(tooltipItems, data);
-                        model.beforeBody = me.getBeforeBody(tooltipItems, data);
-                        model.body = me.getBody(tooltipItems, data);
-                        model.afterBody = me.getAfterBody(tooltipItems, data);
-                        model.footer = me.getFooter(tooltipItems, data);
-
-                        // Initial positioning and colors
-                        model.x = Math.round(tooltipPosition.x);
-                        model.y = Math.round(tooltipPosition.y);
-                        model.caretPadding = opts.caretPadding;
-                        model.labelColors = labelColors;
-                        model.labelTextColors = labelTextColors;
-
-                        // data points
-                        model.dataPoints = tooltipItems;
-
-                        // We need to determine alignment of the tooltip
-                        tooltipSize = getTooltipSize(this, model);
-                        alignment = determineAlignment(this, tooltipSize);
-                        // Final Size and Position
-                        backgroundPoint = getBackgroundPoint(model, tooltipSize, alignment);
-                    } else {
-                        model.opacity = 0;
-                    }
-
-                    model.xAlign = alignment.xAlign;
-                    model.yAlign = alignment.yAlign;
-                    model.x = backgroundPoint.x;
-                    model.y = backgroundPoint.y;
-                    model.width = tooltipSize.width;
-                    model.height = tooltipSize.height;
-
-                    // Point where the caret on the tooltip points to
-                    model.caretX = tooltipPosition.x;
-                    model.caretY = tooltipPosition.y;
-
-                    me._model = model;
-
-                    if (changed && opts.custom) {
-                        opts.custom.call(me, model);
-                    }
-
-                    return me;
-                },
-                drawCaret: function(tooltipPoint, size) {
-                    var ctx = this._chart.ctx;
-                    var vm = this._view;
-                    var caretPosition = this.getCaretPosition(tooltipPoint, size, vm);
-
-                    ctx.lineTo(caretPosition.x1, caretPosition.y1);
-                    ctx.lineTo(caretPosition.x2, caretPosition.y2);
-                    ctx.lineTo(caretPosition.x3, caretPosition.y3);
-                },
-                getCaretPosition: function(tooltipPoint, size, vm) {
-                    var x1, x2, x3, y1, y2, y3;
-                    var caretSize = vm.caretSize;
-                    var cornerRadius = vm.cornerRadius;
-                    var xAlign = vm.xAlign;
-                    var yAlign = vm.yAlign;
-                    var ptX = tooltipPoint.x;
-                    var ptY = tooltipPoint.y;
-                    var width = size.width;
-                    var height = size.height;
-
-                    if (yAlign === 'center') {
-                        y2 = ptY + (height / 2);
-
-                        if (xAlign === 'left') {
-                            x1 = ptX;
-                            x2 = x1 - caretSize;
-                            x3 = x1;
-
-                            y1 = y2 + caretSize;
-                            y3 = y2 - caretSize;
-                        } else {
-                            x1 = ptX + width;
-                            x2 = x1 + caretSize;
-                            x3 = x1;
-
-                            y1 = y2 - caretSize;
-                            y3 = y2 + caretSize;
-                        }
-                    } else {
-                        if (xAlign === 'left') {
-                            x2 = ptX + cornerRadius + (caretSize);
-                            x1 = x2 - caretSize;
-                            x3 = x2 + caretSize;
-                        } else if (xAlign === 'right') {
-                            x2 = ptX + width - cornerRadius - caretSize;
-                            x1 = x2 - caretSize;
-                            x3 = x2 + caretSize;
-                        } else {
-                            x2 = ptX + (width / 2);
-                            x1 = x2 - caretSize;
-                            x3 = x2 + caretSize;
-                        }
-                        if (yAlign === 'top') {
-                            y1 = ptY;
-                            y2 = y1 - caretSize;
-                            y3 = y1;
-                        } else {
-                            y1 = ptY + height;
-                            y2 = y1 + caretSize;
-                            y3 = y1;
-                            // invert drawing order
-                            var tmp = x3;
-                            x3 = x1;
-                            x1 = tmp;
-                        }
-                    }
-                    return { x1: x1, x2: x2, x3: x3, y1: y1, y2: y2, y3: y3 };
-                },
-                drawTitle: function(pt, vm, ctx, opacity) {
-                    var title = vm.title;
-
-                    if (title.length) {
-                        ctx.textAlign = vm._titleAlign;
-                        ctx.textBaseline = 'top';
-
-                        var titleFontSize = vm.titleFontSize;
-                        var titleSpacing = vm.titleSpacing;
-
-                        ctx.fillStyle = mergeOpacity(vm.titleFontColor, opacity);
-                        ctx.font = helpers.fontString(titleFontSize, vm._titleFontStyle, vm._titleFontFamily);
-
-                        var i, len;
-                        for (i = 0, len = title.length; i < len; ++i) {
-                            ctx.fillText(title[i], pt.x, pt.y);
-                            pt.y += titleFontSize + titleSpacing; // Line Height and spacing
-
-                            if (i + 1 === title.length) {
-                                pt.y += vm.titleMarginBottom - titleSpacing; // If Last, add margin, remove spacing
-                            }
-                        }
-                    }
-                },
-                drawBody: function(pt, vm, ctx, opacity) {
-                    var bodyFontSize = vm.bodyFontSize;
-                    var bodySpacing = vm.bodySpacing;
-                    var body = vm.body;
-
-                    ctx.textAlign = vm._bodyAlign;
-                    ctx.textBaseline = 'top';
-                    ctx.font = helpers.fontString(bodyFontSize, vm._bodyFontStyle, vm._bodyFontFamily);
-
-                    // Before Body
-                    var xLinePadding = 0;
-                    var fillLineOfText = function(line) {
-                        ctx.fillText(line, pt.x + xLinePadding, pt.y);
-                        pt.y += bodyFontSize + bodySpacing;
-                    };
-
-                    // Before body lines
-                    helpers.each(vm.beforeBody, fillLineOfText);
-
-                    var drawColorBoxes = vm.displayColors;
-                    xLinePadding = drawColorBoxes ? (bodyFontSize + 2) : 0;
-
-                    // Draw body lines now
-                    helpers.each(body, function(bodyItem, i) {
-                        helpers.each(bodyItem.before, fillLineOfText);
-
-                        helpers.each(bodyItem.lines, function(line) {
-                            // Draw Legend-like boxes if needed
-                            if (drawColorBoxes) {
-                                // Fill a white rect so that colours merge nicely if the opacity is < 1
-                                ctx.fillStyle = mergeOpacity(vm.legendColorBackground, opacity);
-                                ctx.fillRect(pt.x, pt.y, bodyFontSize, bodyFontSize);
-
-                                // Border
-                                ctx.lineWidth = 1;
-                                ctx.strokeStyle = mergeOpacity(vm.labelColors[i].borderColor, opacity);
-                                ctx.strokeRect(pt.x, pt.y, bodyFontSize, bodyFontSize);
-
-                                // Inner square
-                                ctx.fillStyle = mergeOpacity(vm.labelColors[i].backgroundColor, opacity);
-                                ctx.fillRect(pt.x + 1, pt.y + 1, bodyFontSize - 2, bodyFontSize - 2);
-                                var textColor = mergeOpacity(vm.labelTextColors[i], opacity);
-                                ctx.fillStyle = textColor;
-                            }
-
-                            fillLineOfText(line);
-                        });
-
-                        helpers.each(bodyItem.after, fillLineOfText);
-                    });
-
-                    // Reset back to 0 for after body
-                    xLinePadding = 0;
-
-                    // After body lines
-                    helpers.each(vm.afterBody, fillLineOfText);
-                    pt.y -= bodySpacing; // Remove last body spacing
-                },
-                drawFooter: function(pt, vm, ctx, opacity) {
-                    var footer = vm.footer;
-
-                    if (footer.length) {
-                        pt.y += vm.footerMarginTop;
-
-                        ctx.textAlign = vm._footerAlign;
-                        ctx.textBaseline = 'top';
-
-                        ctx.fillStyle = mergeOpacity(vm.footerFontColor, opacity);
-                        ctx.font = helpers.fontString(vm.footerFontSize, vm._footerFontStyle, vm._footerFontFamily);
-
-                        helpers.each(footer, function(line) {
-                            ctx.fillText(line, pt.x, pt.y);
-                            pt.y += vm.footerFontSize + vm.footerSpacing;
-                        });
-                    }
-                },
-                drawBackground: function(pt, vm, ctx, tooltipSize, opacity) {
-                    ctx.fillStyle = mergeOpacity(vm.backgroundColor, opacity);
-                    ctx.strokeStyle = mergeOpacity(vm.borderColor, opacity);
-                    ctx.lineWidth = vm.borderWidth;
-                    var xAlign = vm.xAlign;
-                    var yAlign = vm.yAlign;
-                    var x = pt.x;
-                    var y = pt.y;
-                    var width = tooltipSize.width;
-                    var height = tooltipSize.height;
-                    var radius = vm.cornerRadius;
-
-                    ctx.beginPath();
-                    ctx.moveTo(x + radius, y);
-                    if (yAlign === 'top') {
-                        this.drawCaret(pt, tooltipSize);
-                    }
-                    ctx.lineTo(x + width - radius, y);
-                    ctx.quadraticCurveTo(x + width, y, x + width, y + radius);
-                    if (yAlign === 'center' && xAlign === 'right') {
-                        this.drawCaret(pt, tooltipSize);
-                    }
-                    ctx.lineTo(x + width, y + height - radius);
-                    ctx.quadraticCurveTo(x + width, y + height, x + width - radius, y + height);
-                    if (yAlign === 'bottom') {
-                        this.drawCaret(pt, tooltipSize);
-                    }
-                    ctx.lineTo(x + radius, y + height);
-                    ctx.quadraticCurveTo(x, y + height, x, y + height - radius);
-                    if (yAlign === 'center' && xAlign === 'left') {
-                        this.drawCaret(pt, tooltipSize);
-                    }
-                    ctx.lineTo(x, y + radius);
-                    ctx.quadraticCurveTo(x, y, x + radius, y);
-                    ctx.closePath();
-
-                    ctx.fill();
-
-                    if (vm.borderWidth > 0) {
-                        ctx.stroke();
-                    }
-                },
-                draw: function() {
-                    var ctx = this._chart.ctx;
-                    var vm = this._view;
-
-                    if (vm.opacity === 0) {
-                        return;
-                    }
-
-                    var tooltipSize = {
-                        width: vm.width,
-                        height: vm.height
-                    };
-                    var pt = {
-                        x: vm.x,
-                        y: vm.y
-                    };
-
-                    // IE11/Edge does not like very small opacities, so snap to 0
-                    var opacity = Math.abs(vm.opacity < 1e-3) ? 0 : vm.opacity;
-
-                    // Truthy/falsey value for empty tooltip
-                    var hasTooltipContent = vm.title.length || vm.beforeBody.length || vm.body.length || vm.afterBody.length || vm.footer.length;
-
-                    if (this._options.enabled && hasTooltipContent) {
-                        // Draw Background
-                        this.drawBackground(pt, vm, ctx, tooltipSize, opacity);
-
-                        // Draw Title, Body, and Footer
-                        pt.x += vm.xPadding;
-                        pt.y += vm.yPadding;
-
-                        // Titles
-                        this.drawTitle(pt, vm, ctx, opacity);
-
-                        // Body
-                        this.drawBody(pt, vm, ctx, opacity);
-
-                        // Footer
-                        this.drawFooter(pt, vm, ctx, opacity);
-                    }
-                },
-
-                /**
-                 * Handle an event
-                 * @private
-                 * @param {IEvent} event - The event to handle
-                 * @returns {Boolean} true if the tooltip changed
-                 */
-                handleEvent: function(e) {
-                    var me = this;
-                    var options = me._options;
-                    var changed = false;
-
-                    me._lastActive = me._lastActive || [];
-
-                    // Find Active Elements for tooltips
-                    if (e.type === 'mouseout') {
-                        me._active = [];
-                    } else {
-                        me._active = me._chart.getElementsAtEventForMode(e, options.mode, options);
-                    }
-
-                    // Remember Last Actives
-                    changed = !helpers.arrayEquals(me._active, me._lastActive);
-
-                    // If tooltip didn't change, do not handle the target event
-                    if (!changed) {
-                        return false;
-                    }
-
-                    me._lastActive = me._active;
-
-                    if (options.enabled || options.custom) {
-                        me._eventPosition = {
-                            x: e.x,
-                            y: e.y
-                        };
-
-                        var model = me._model;
-                        me.update(true);
-                        me.pivot();
-
-                        // See if our tooltip position changed
-                        changed |= (model.x !== me._model.x) || (model.y !== me._model.y);
-                    }
-
-                    return changed;
-                }
-            });
-
-            /**
-             * @namespace Chart.Tooltip.positioners
-             */
-            Chart.Tooltip.positioners = {
-                /**
-                 * Average mode places the tooltip at the average position of the elements shown
-                 * @function Chart.Tooltip.positioners.average
-                 * @param elements {ChartElement[]} the elements being displayed in the tooltip
-                 * @returns {Point} tooltip position
-                 */
-                average: function(elements) {
-                    if (!elements.length) {
-                        return false;
-                    }
-
-                    var i, len;
-                    var x = 0;
-                    var y = 0;
-                    var count = 0;
-
-                    for (i = 0, len = elements.length; i < len; ++i) {
-                        var el = elements[i];
-                        if (el && el.hasValue()) {
-                            var pos = el.tooltipPosition();
-                            x += pos.x;
-                            y += pos.y;
-                            ++count;
-                        }
-                    }
-
-                    return {
-                        x: Math.round(x / count),
-                        y: Math.round(y / count)
-                    };
-                },
-
-                /**
-                 * Gets the tooltip position nearest of the item nearest to the event position
-                 * @function Chart.Tooltip.positioners.nearest
-                 * @param elements {Chart.Element[]} the tooltip elements
-                 * @param eventPosition {Point} the position of the event in canvas coordinates
-                 * @returns {Point} the tooltip position
-                 */
-                nearest: function(elements, eventPosition) {
-                    var x = eventPosition.x;
-                    var y = eventPosition.y;
-                    var minDistance = Number.POSITIVE_INFINITY;
-                    var i, len, nearestElement;
-
-                    for (i = 0, len = elements.length; i < len; ++i) {
-                        var el = elements[i];
-                        if (el && el.hasValue()) {
-                            var center = el.getCenterPoint();
-                            var d = helpers.distanceBetweenPoints(eventPosition, center);
-
-                            if (d < minDistance) {
-                                minDistance = d;
-                                nearestElement = el;
-                            }
-                        }
-                    }
-
-                    if (nearestElement) {
-                        var tp = nearestElement.tooltipPosition();
-                        x = tp.x;
-                        y = tp.y;
-                    }
-
-                    return {
-                        x: x,
-                        y: y
-                    };
-                }
-            };
-        };
-
-    },{ "25":25,"26":26,"45":45 }],36:[function(require,module,exports){
-        'use strict';
-
-        var defaults = require(25);
-        var Element = require(26);
-        var helpers = require(45);
-
-        defaults._set('global', {
-            elements: {
-                arc: {
-                    backgroundColor: defaults.global.defaultColor,
-                    borderColor: '#fff',
-                    borderWidth: 2
-                }
-            }
-        });
-
-        module.exports = Element.extend({
-            inLabelRange: function(mouseX) {
-                var vm = this._view;
-
-                if (vm) {
-                    return (Math.pow(mouseX - vm.x, 2) < Math.pow(vm.radius + vm.hoverRadius, 2));
-                }
-                return false;
-            },
-
-            inRange: function(chartX, chartY) {
-                var vm = this._view;
-
-                if (vm) {
-                    var pointRelativePosition = helpers.getAngleFromPoint(vm, { x: chartX, y: chartY });
-                    var	angle = pointRelativePosition.angle;
-                    var distance = pointRelativePosition.distance;
-
-                    // Sanitise angle range
-                    var startAngle = vm.startAngle;
-                    var endAngle = vm.endAngle;
-                    while (endAngle < startAngle) {
-                        endAngle += 2.0 * Math.PI;
-                    }
-                    while (angle > endAngle) {
-                        angle -= 2.0 * Math.PI;
-                    }
-                    while (angle < startAngle) {
-                        angle += 2.0 * Math.PI;
-                    }
-
-                    // Check if within the range of the open/close angle
-                    var betweenAngles = (angle >= startAngle && angle <= endAngle);
-                    var withinRadius = (distance >= vm.innerRadius && distance <= vm.outerRadius);
-
-                    return (betweenAngles && withinRadius);
-                }
-                return false;
-            },
-
-            getCenterPoint: function() {
-                var vm = this._view;
-                var halfAngle = (vm.startAngle + vm.endAngle) / 2;
-                var halfRadius = (vm.innerRadius + vm.outerRadius) / 2;
-                return {
-                    x: vm.x + Math.cos(halfAngle) * halfRadius,
-                    y: vm.y + Math.sin(halfAngle) * halfRadius
-                };
-            },
-
-            getArea: function() {
-                var vm = this._view;
-                return Math.PI * ((vm.endAngle - vm.startAngle) / (2 * Math.PI)) * (Math.pow(vm.outerRadius, 2) - Math.pow(vm.innerRadius, 2));
-            },
-
-            tooltipPosition: function() {
-                var vm = this._view;
-                var centreAngle = vm.startAngle + ((vm.endAngle - vm.startAngle) / 2);
-                var rangeFromCentre = (vm.outerRadius - vm.innerRadius) / 2 + vm.innerRadius;
-
-                return {
-                    x: vm.x + (Math.cos(centreAngle) * rangeFromCentre),
-                    y: vm.y + (Math.sin(centreAngle) * rangeFromCentre)
-                };
-            },
-
-            draw: function() {
-                var ctx = this._chart.ctx;
-                var vm = this._view;
-                var sA = vm.startAngle;
-                var eA = vm.endAngle;
-
-                ctx.beginPath();
-
-                ctx.arc(vm.x, vm.y, vm.outerRadius, sA, eA);
-                ctx.arc(vm.x, vm.y, vm.innerRadius, eA, sA, true);
-
-                ctx.closePath();
-                ctx.strokeStyle = vm.borderColor;
-                ctx.lineWidth = vm.borderWidth;
-
-                ctx.fillStyle = vm.backgroundColor;
-
-                ctx.fill();
-                ctx.lineJoin = 'bevel';
-
-                if (vm.borderWidth) {
-                    ctx.stroke();
-                }
-            }
-        });
-
-    },{ "25":25,"26":26,"45":45 }],37:[function(require,module,exports){
-        'use strict';
-
-        var defaults = require(25);
-        var Element = require(26);
-        var helpers = require(45);
-
-        var globalDefaults = defaults.global;
-
-        defaults._set('global', {
-            elements: {
-                line: {
-                    tension: 0.4,
-                    backgroundColor: globalDefaults.defaultColor,
-                    borderWidth: 3,
-                    borderColor: globalDefaults.defaultColor,
-                    borderCapStyle: 'butt',
-                    borderDash: [],
-                    borderDashOffset: 0.0,
-                    borderJoinStyle: 'miter',
-                    capBezierPoints: true,
-                    fill: true, // do we fill in the area between the line and its base axis
-                }
-            }
-        });
-
-        module.exports = Element.extend({
-            draw: function() {
-                var me = this;
-                var vm = me._view;
-                var ctx = me._chart.ctx;
-                var spanGaps = vm.spanGaps;
-                var points = me._children.slice(); // clone array
-                var globalOptionLineElements = globalDefaults.elements.line;
-                var lastDrawnIndex = -1;
-                var index, current, previous, currentVM;
-
-                // If we are looping, adding the first point again
-                if (me._loop && points.length) {
-                    points.push(points[0]);
-                }
-
-                ctx.save();
-
-                // Stroke Line Options
-                ctx.lineCap = vm.borderCapStyle || globalOptionLineElements.borderCapStyle;
-
-                // IE 9 and 10 do not support line dash
-                if (ctx.setLineDash) {
-                    ctx.setLineDash(vm.borderDash || globalOptionLineElements.borderDash);
-                }
-
-                ctx.lineDashOffset = vm.borderDashOffset || globalOptionLineElements.borderDashOffset;
-                ctx.lineJoin = vm.borderJoinStyle || globalOptionLineElements.borderJoinStyle;
-                ctx.lineWidth = vm.borderWidth || globalOptionLineElements.borderWidth;
-                ctx.strokeStyle = vm.borderColor || globalDefaults.defaultColor;
-
-                // Stroke Line
-                ctx.beginPath();
-                lastDrawnIndex = -1;
-
-                for (index = 0; index < points.length; ++index) {
-                    current = points[index];
-                    previous = helpers.previousItem(points, index);
-                    currentVM = current._view;
-
-                    // First point moves to it's starting position no matter what
-                    if (index === 0) {
-                        if (!currentVM.skip) {
-                            ctx.moveTo(currentVM.x, currentVM.y);
-                            lastDrawnIndex = index;
-                        }
-                    } else {
-                        previous = lastDrawnIndex === -1 ? previous : points[lastDrawnIndex];
-
-                        if (!currentVM.skip) {
-                            if ((lastDrawnIndex !== (index - 1) && !spanGaps) || lastDrawnIndex === -1) {
-                                // There was a gap and this is the first point after the gap
-                                ctx.moveTo(currentVM.x, currentVM.y);
-                            } else {
-                                // Line to next point
-                                helpers.canvas.lineTo(ctx, previous._view, current._view);
-                            }
-                            lastDrawnIndex = index;
-                        }
-                    }
-                }
-
-                ctx.stroke();
-                ctx.restore();
-            }
-        });
-
-    },{ "25":25,"26":26,"45":45 }],38:[function(require,module,exports){
-        'use strict';
-
-        var defaults = require(25);
-        var Element = require(26);
-        var helpers = require(45);
-
-        var defaultColor = defaults.global.defaultColor;
-
-        defaults._set('global', {
-            elements: {
-                point: {
-                    radius: 3,
-                    pointStyle: 'circle',
-                    backgroundColor: defaultColor,
-                    borderColor: defaultColor,
-                    borderWidth: 1,
-                    // Hover
-                    hitRadius: 1,
-                    hoverRadius: 4,
-                    hoverBorderWidth: 1
-                }
-            }
-        });
-
-        function xRange(mouseX) {
-            var vm = this._view;
-            return vm ? (Math.pow(mouseX - vm.x, 2) < Math.pow(vm.radius + vm.hitRadius, 2)) : false;
-        }
-
-        function yRange(mouseY) {
-            var vm = this._view;
-            return vm ? (Math.pow(mouseY - vm.y, 2) < Math.pow(vm.radius + vm.hitRadius, 2)) : false;
-        }
-
-        module.exports = Element.extend({
-            inRange: function(mouseX, mouseY) {
-                var vm = this._view;
-                return vm ? ((Math.pow(mouseX - vm.x, 2) + Math.pow(mouseY - vm.y, 2)) < Math.pow(vm.hitRadius + vm.radius, 2)) : false;
-            },
-
-            inLabelRange: xRange,
-            inXRange: xRange,
-            inYRange: yRange,
-
-            getCenterPoint: function() {
-                var vm = this._view;
-                return {
-                    x: vm.x,
-                    y: vm.y
-                };
-            },
-
-            getArea: function() {
-                return Math.PI * Math.pow(this._view.radius, 2);
-            },
-
-            tooltipPosition: function() {
-                var vm = this._view;
-                return {
-                    x: vm.x,
-                    y: vm.y,
-                    padding: vm.radius + vm.borderWidth
-                };
-            },
-
-            draw: function(chartArea) {
-                var vm = this._view;
-                var model = this._model;
-                var ctx = this._chart.ctx;
-                var pointStyle = vm.pointStyle;
-                var radius = vm.radius;
-                var x = vm.x;
-                var y = vm.y;
-                var color = helpers.color;
-                var errMargin = 1.01; // 1.01 is margin for Accumulated error. (Especially Edge, IE.)
-                var ratio = 0;
-
-                if (vm.skip) {
-                    return;
-                }
-
-                ctx.strokeStyle = vm.borderColor || defaultColor;
-                ctx.lineWidth = helpers.valueOrDefault(vm.borderWidth, defaults.global.elements.point.borderWidth);
-                ctx.fillStyle = vm.backgroundColor || defaultColor;
-
-                // Cliping for Points.
-                // going out from inner charArea?
-                if ((chartArea !== undefined) && ((model.x < chartArea.left) || (chartArea.right * errMargin < model.x) || (model.y < chartArea.top) || (chartArea.bottom * errMargin < model.y))) {
-                    // Point fade out
-                    if (model.x < chartArea.left) {
-                        ratio = (x - model.x) / (chartArea.left - model.x);
-                    } else if (chartArea.right * errMargin < model.x) {
-                        ratio = (model.x - x) / (model.x - chartArea.right);
-                    } else if (model.y < chartArea.top) {
-                        ratio = (y - model.y) / (chartArea.top - model.y);
-                    } else if (chartArea.bottom * errMargin < model.y) {
-                        ratio = (model.y - y) / (model.y - chartArea.bottom);
-                    }
-                    ratio = Math.round(ratio * 100) / 100;
-                    ctx.strokeStyle = color(ctx.strokeStyle).alpha(ratio).rgbString();
-                    ctx.fillStyle = color(ctx.fillStyle).alpha(ratio).rgbString();
-                }
-
-                helpers.canvas.drawPoint(ctx, pointStyle, radius, x, y);
-            }
-        });
-
-    },{ "25":25,"26":26,"45":45 }],39:[function(require,module,exports){
-        'use strict';
-
-        var defaults = require(25);
-        var Element = require(26);
-
-        defaults._set('global', {
-            elements: {
-                rectangle: {
-                    backgroundColor: defaults.global.defaultColor,
-                    borderColor: defaults.global.defaultColor,
-                    borderSkipped: 'bottom',
-                    borderWidth: 0
-                }
-            }
-        });
-
-        function isVertical(bar) {
-            return bar._view.width !== undefined;
-        }
-
-        /**
-         * Helper function to get the bounds of the bar regardless of the orientation
-         * @param bar {Chart.Element.Rectangle} the bar
-         * @return {Bounds} bounds of the bar
-         * @private
-         */
-        function getBarBounds(bar) {
-            var vm = bar._view;
-            var x1, x2, y1, y2;
-
-            if (isVertical(bar)) {
-                // vertical
-                var halfWidth = vm.width / 2;
-                x1 = vm.x - halfWidth;
-                x2 = vm.x + halfWidth;
-                y1 = Math.min(vm.y, vm.base);
-                y2 = Math.max(vm.y, vm.base);
-            } else {
-                // horizontal bar
-                var halfHeight = vm.height / 2;
-                x1 = Math.min(vm.x, vm.base);
-                x2 = Math.max(vm.x, vm.base);
-                y1 = vm.y - halfHeight;
-                y2 = vm.y + halfHeight;
-            }
-
-            return {
-                left: x1,
-                top: y1,
-                right: x2,
-                bottom: y2
-            };
-        }
-
-        module.exports = Element.extend({
-            draw: function() {
-                var ctx = this._chart.ctx;
-                var vm = this._view;
-                var left, right, top, bottom, signX, signY, borderSkipped;
-                var borderWidth = vm.borderWidth;
-
-                if (!vm.horizontal) {
-                    // bar
-                    left = vm.x - vm.width / 2;
-                    right = vm.x + vm.width / 2;
-                    top = vm.y;
-                    bottom = vm.base;
-                    signX = 1;
-                    signY = bottom > top ? 1 : -1;
-                    borderSkipped = vm.borderSkipped || 'bottom';
-                } else {
-                    // horizontal bar
-                    left = vm.base;
-                    right = vm.x;
-                    top = vm.y - vm.height / 2;
-                    bottom = vm.y + vm.height / 2;
-                    signX = right > left ? 1 : -1;
-                    signY = 1;
-                    borderSkipped = vm.borderSkipped || 'left';
-                }
-
-                // Canvas doesn't allow us to stroke inside the width so we can
-                // adjust the sizes to fit if we're setting a stroke on the line
-                if (borderWidth) {
-                    // borderWidth shold be less than bar width and bar height.
-                    var barSize = Math.min(Math.abs(left - right), Math.abs(top - bottom));
-                    borderWidth = borderWidth > barSize ? barSize : borderWidth;
-                    var halfStroke = borderWidth / 2;
-                    // Adjust borderWidth when bar top position is near vm.base(zero).
-                    var borderLeft = left + (borderSkipped !== 'left' ? halfStroke * signX : 0);
-                    var borderRight = right + (borderSkipped !== 'right' ? -halfStroke * signX : 0);
-                    var borderTop = top + (borderSkipped !== 'top' ? halfStroke * signY : 0);
-                    var borderBottom = bottom + (borderSkipped !== 'bottom' ? -halfStroke * signY : 0);
-                    // not become a vertical line?
-                    if (borderLeft !== borderRight) {
-                        top = borderTop;
-                        bottom = borderBottom;
-                    }
-                    // not become a horizontal line?
-                    if (borderTop !== borderBottom) {
-                        left = borderLeft;
-                        right = borderRight;
-                    }
-                }
-
-                ctx.beginPath();
-                ctx.fillStyle = vm.backgroundColor;
-                ctx.strokeStyle = vm.borderColor;
-                ctx.lineWidth = borderWidth;
-
-                // Corner points, from bottom-left to bottom-right clockwise
-                // | 1 2 |
-                // | 0 3 |
-                var corners = [
-                    [left, bottom],
-                    [left, top],
-                    [right, top],
-                    [right, bottom]
-                ];
-
-                // Find first (starting) corner with fallback to 'bottom'
-                var borders = ['bottom', 'left', 'top', 'right'];
-                var startCorner = borders.indexOf(borderSkipped, 0);
-                if (startCorner === -1) {
-                    startCorner = 0;
-                }
-
-                function cornerAt(index) {
-                    return corners[(startCorner + index) % 4];
-                }
-
-                // Draw rectangle from 'startCorner'
-                var corner = cornerAt(0);
-                ctx.moveTo(corner[0], corner[1]);
-
-                for (var i = 1; i < 4; i++) {
-                    corner = cornerAt(i);
-                    ctx.lineTo(corner[0], corner[1]);
-                }
-
-                ctx.fill();
-                if (borderWidth) {
-                    ctx.stroke();
-                }
-            },
-
-            height: function() {
-                var vm = this._view;
-                return vm.base - vm.y;
-            },
-
-            inRange: function(mouseX, mouseY) {
-                var inRange = false;
-
-                if (this._view) {
-                    var bounds = getBarBounds(this);
-                    inRange = mouseX >= bounds.left && mouseX <= bounds.right && mouseY >= bounds.top && mouseY <= bounds.bottom;
-                }
-
-                return inRange;
-            },
-
-            inLabelRange: function(mouseX, mouseY) {
-                var me = this;
-                if (!me._view) {
-                    return false;
-                }
-
-                var inRange = false;
-                var bounds = getBarBounds(me);
-
-                if (isVertical(me)) {
-                    inRange = mouseX >= bounds.left && mouseX <= bounds.right;
-                } else {
-                    inRange = mouseY >= bounds.top && mouseY <= bounds.bottom;
-                }
-
-                return inRange;
-            },
-
-            inXRange: function(mouseX) {
-                var bounds = getBarBounds(this);
-                return mouseX >= bounds.left && mouseX <= bounds.right;
-            },
-
-            inYRange: function(mouseY) {
-                var bounds = getBarBounds(this);
-                return mouseY >= bounds.top && mouseY <= bounds.bottom;
-            },
-
-            getCenterPoint: function() {
-                var vm = this._view;
-                var x, y;
-                if (isVertical(this)) {
-                    x = vm.x;
-                    y = (vm.y + vm.base) / 2;
-                } else {
-                    x = (vm.x + vm.base) / 2;
-                    y = vm.y;
-                }
-
-                return { x: x, y: y };
-            },
-
-            getArea: function() {
-                var vm = this._view;
-                return vm.width * Math.abs(vm.y - vm.base);
-            },
-
-            tooltipPosition: function() {
-                var vm = this._view;
-                return {
-                    x: vm.x,
-                    y: vm.y
-                };
-            }
-        });
-
-    },{ "25":25,"26":26 }],40:[function(require,module,exports){
-        'use strict';
-
-        module.exports = {};
-        module.exports.Arc = require(36);
-        module.exports.Line = require(37);
-        module.exports.Point = require(38);
-        module.exports.Rectangle = require(39);
-
-    },{ "36":36,"37":37,"38":38,"39":39 }],41:[function(require,module,exports){
-        'use strict';
-
-        var helpers = require(42);
-
-        /**
-         * @namespace Chart.helpers.canvas
-         */
-        var exports = module.exports = {
-            /**
-             * Clears the entire canvas associated to the given `chart`.
-             * @param {Chart} chart - The chart for which to clear the canvas.
-             */
-            clear: function(chart) {
-                chart.ctx.clearRect(0, 0, chart.width, chart.height);
-            },
-
-            /**
-             * Creates a "path" for a rectangle with rounded corners at position (x, y) with a
-             * given size (width, height) and the same `radius` for all corners.
-             * @param {CanvasRenderingContext2D} ctx - The canvas 2D Context.
-             * @param {Number} x - The x axis of the coordinate for the rectangle starting point.
-             * @param {Number} y - The y axis of the coordinate for the rectangle starting point.
-             * @param {Number} width - The rectangle's width.
-             * @param {Number} height - The rectangle's height.
-             * @param {Number} radius - The rounded amount (in pixels) for the four corners.
-             * @todo handle `radius` as top-left, top-right, bottom-right, bottom-left array/object?
-             */
-            roundedRect: function(ctx, x, y, width, height, radius) {
-                if (radius) {
-                    var rx = Math.min(radius, width / 2);
-                    var ry = Math.min(radius, height / 2);
-
-                    ctx.moveTo(x + rx, y);
-                    ctx.lineTo(x + width - rx, y);
-                    ctx.quadraticCurveTo(x + width, y, x + width, y + ry);
-                    ctx.lineTo(x + width, y + height - ry);
-                    ctx.quadraticCurveTo(x + width, y + height, x + width - rx, y + height);
-                    ctx.lineTo(x + rx, y + height);
-                    ctx.quadraticCurveTo(x, y + height, x, y + height - ry);
-                    ctx.lineTo(x, y + ry);
-                    ctx.quadraticCurveTo(x, y, x + rx, y);
-                } else {
-                    ctx.rect(x, y, width, height);
-                }
-            },
-
-            drawPoint: function(ctx, style, radius, x, y) {
-                var type, edgeLength, xOffset, yOffset, height, size;
-
-                if (typeof style === 'object') {
-                    type = style.toString();
-                    if (type === '[object HTMLImageElement]' || type === '[object HTMLCanvasElement]') {
-                        ctx.drawImage(style, x - style.width / 2, y - style.height / 2, style.width, style.height);
-                        return;
-                    }
-                }
-
-                if (isNaN(radius) || radius <= 0) {
-                    return;
-                }
-
-                switch (style) {
-                        // Default includes circle
-                    default:
-                        ctx.beginPath();
-                        ctx.arc(x, y, radius, 0, Math.PI * 2);
-                        ctx.closePath();
-                        ctx.fill();
-                        break;
-                    case 'triangle':
-                        ctx.beginPath();
-                        edgeLength = 3 * radius / Math.sqrt(3);
-                        height = edgeLength * Math.sqrt(3) / 2;
-                        ctx.moveTo(x - edgeLength / 2, y + height / 3);
-                        ctx.lineTo(x + edgeLength / 2, y + height / 3);
-                        ctx.lineTo(x, y - 2 * height / 3);
-                        ctx.closePath();
-                        ctx.fill();
-                        break;
-                    case 'rect':
-                        size = 1 / Math.SQRT2 * radius;
-                        ctx.beginPath();
-                        ctx.fillRect(x - size, y - size, 2 * size, 2 * size);
-                        ctx.strokeRect(x - size, y - size, 2 * size, 2 * size);
-                        break;
-                    case 'rectRounded':
-                        var offset = radius / Math.SQRT2;
-                        var leftX = x - offset;
-                        var topY = y - offset;
-                        var sideSize = Math.SQRT2 * radius;
-                        ctx.beginPath();
-                        this.roundedRect(ctx, leftX, topY, sideSize, sideSize, radius / 2);
-                        ctx.closePath();
-                        ctx.fill();
-                        break;
-                    case 'rectRot':
-                        size = 1 / Math.SQRT2 * radius;
-                        ctx.beginPath();
-                        ctx.moveTo(x - size, y);
-                        ctx.lineTo(x, y + size);
-                        ctx.lineTo(x + size, y);
-                        ctx.lineTo(x, y - size);
-                        ctx.closePath();
-                        ctx.fill();
-                        break;
-                    case 'cross':
-                        ctx.beginPath();
-                        ctx.moveTo(x, y + radius);
-                        ctx.lineTo(x, y - radius);
-                        ctx.moveTo(x - radius, y);
-                        ctx.lineTo(x + radius, y);
-                        ctx.closePath();
-                        break;
-                    case 'crossRot':
-                        ctx.beginPath();
-                        xOffset = Math.cos(Math.PI / 4) * radius;
-                        yOffset = Math.sin(Math.PI / 4) * radius;
-                        ctx.moveTo(x - xOffset, y - yOffset);
-                        ctx.lineTo(x + xOffset, y + yOffset);
-                        ctx.moveTo(x - xOffset, y + yOffset);
-                        ctx.lineTo(x + xOffset, y - yOffset);
-                        ctx.closePath();
-                        break;
-                    case 'star':
-                        ctx.beginPath();
-                        ctx.moveTo(x, y + radius);
-                        ctx.lineTo(x, y - radius);
-                        ctx.moveTo(x - radius, y);
-                        ctx.lineTo(x + radius, y);
-                        xOffset = Math.cos(Math.PI / 4) * radius;
-                        yOffset = Math.sin(Math.PI / 4) * radius;
-                        ctx.moveTo(x - xOffset, y - yOffset);
-                        ctx.lineTo(x + xOffset, y + yOffset);
-                        ctx.moveTo(x - xOffset, y + yOffset);
-                        ctx.lineTo(x + xOffset, y - yOffset);
-                        ctx.closePath();
-                        break;
-                    case 'line':
-                        ctx.beginPath();
-                        ctx.moveTo(x - radius, y);
-                        ctx.lineTo(x + radius, y);
-                        ctx.closePath();
-                        break;
-                    case 'dash':
-                        ctx.beginPath();
-                        ctx.moveTo(x, y);
-                        ctx.lineTo(x + radius, y);
-                        ctx.closePath();
-                        break;
-                }
-
-                ctx.stroke();
-            },
-
-            clipArea: function(ctx, area) {
-                ctx.save();
-                ctx.beginPath();
-                ctx.rect(area.left, area.top, area.right - area.left, area.bottom - area.top);
-                ctx.clip();
-            },
-
-            unclipArea: function(ctx) {
-                ctx.restore();
-            },
-
-            lineTo: function(ctx, previous, target, flip) {
-                if (target.steppedLine) {
-                    if ((target.steppedLine === 'after' && !flip) || (target.steppedLine !== 'after' && flip)) {
-                        ctx.lineTo(previous.x, target.y);
-                    } else {
-                        ctx.lineTo(target.x, previous.y);
-                    }
-                    ctx.lineTo(target.x, target.y);
-                    return;
-                }
-
-                if (!target.tension) {
-                    ctx.lineTo(target.x, target.y);
-                    return;
-                }
-
-                ctx.bezierCurveTo(
-                        flip ? previous.controlPointPreviousX : previous.controlPointNextX,
-                        flip ? previous.controlPointPreviousY : previous.controlPointNextY,
-                        flip ? target.controlPointNextX : target.controlPointPreviousX,
-                        flip ? target.controlPointNextY : target.controlPointPreviousY,
-                        target.x,
-                        target.y);
-            }
-        };
-
-// DEPRECATIONS
-
-        /**
-         * Provided for backward compatibility, use Chart.helpers.canvas.clear instead.
-         * @namespace Chart.helpers.clear
-         * @deprecated since version 2.7.0
-         * @todo remove at version 3
-         * @private
-         */
-        helpers.clear = exports.clear;
-
-        /**
-         * Provided for backward compatibility, use Chart.helpers.canvas.roundedRect instead.
-         * @namespace Chart.helpers.drawRoundedRectangle
-         * @deprecated since version 2.7.0
-         * @todo remove at version 3
-         * @private
-         */
-        helpers.drawRoundedRectangle = function(ctx) {
-            ctx.beginPath();
-            exports.roundedRect.apply(exports, arguments);
-            ctx.closePath();
-        };
-
-    },{ "42":42 }],42:[function(require,module,exports){
-        'use strict';
-
-        /**
-         * @namespace Chart.helpers
-         */
-        var helpers = {
-            /**
-             * An empty function that can be used, for example, for optional callback.
-             */
-            noop: function() {},
-
-            /**
-             * Returns a unique id, sequentially generated from a global variable.
-             * @returns {Number}
-             * @function
-             */
-            uid: (function() {
-                var id = 0;
-                return function() {
-                    return id++;
-                };
-            }()),
-
-            /**
-             * Returns true if `value` is neither null nor undefined, else returns false.
-             * @param {*} value - The value to test.
-             * @returns {Boolean}
-             * @since 2.7.0
-             */
-            isNullOrUndef: function(value) {
-                return value === null || typeof value === 'undefined';
-            },
-
-            /**
-             * Returns true if `value` is an array, else returns false.
-             * @param {*} value - The value to test.
-             * @returns {Boolean}
-             * @function
-             */
-            isArray: Array.isArray ? Array.isArray : function(value) {
-                return Object.prototype.toString.call(value) === '[object Array]';
-            },
-
-            /**
-             * Returns true if `value` is an object (excluding null), else returns false.
-             * @param {*} value - The value to test.
-             * @returns {Boolean}
-             * @since 2.7.0
-             */
-            isObject: function(value) {
-                return value !== null && Object.prototype.toString.call(value) === '[object Object]';
-            },
-
-            /**
-             * Returns `value` if defined, else returns `defaultValue`.
-             * @param {*} value - The value to return if defined.
-             * @param {*} defaultValue - The value to return if `value` is undefined.
-             * @returns {*}
-             */
-            valueOrDefault: function(value, defaultValue) {
-                return typeof value === 'undefined' ? defaultValue : value;
-            },
-
-            /**
-             * Returns value at the given `index` in array if defined, else returns `defaultValue`.
-             * @param {Array} value - The array to lookup for value at `index`.
-             * @param {Number} index - The index in `value` to lookup for value.
-             * @param {*} defaultValue - The value to return if `value[index]` is undefined.
-             * @returns {*}
-             */
-            valueAtIndexOrDefault: function(value, index, defaultValue) {
-                return helpers.valueOrDefault(helpers.isArray(value) ? value[index] : value, defaultValue);
-            },
-
-            /**
-             * Calls `fn` with the given `args` in the scope defined by `thisArg` and returns the
-             * value returned by `fn`. If `fn` is not a function, this method returns undefined.
-             * @param {Function} fn - The function to call.
-             * @param {Array|undefined|null} args - The arguments with which `fn` should be called.
-             * @param {Object} [thisArg] - The value of `this` provided for the call to `fn`.
-             * @returns {*}
-             */
-            callback: function(fn, args, thisArg) {
-                if (fn && typeof fn.call === 'function') {
-                    return fn.apply(thisArg, args);
-                }
-            },
-
-            /**
-             * Note(SB) for performance sake, this method should only be used when loopable type
-             * is unknown or in none intensive code (not called often and small loopable). Else
-             * it's preferable to use a regular for() loop and save extra function calls.
-             * @param {Object|Array} loopable - The object or array to be iterated.
-             * @param {Function} fn - The function to call for each item.
-             * @param {Object} [thisArg] - The value of `this` provided for the call to `fn`.
-             * @param {Boolean} [reverse] - If true, iterates backward on the loopable.
-             */
-            each: function(loopable, fn, thisArg, reverse) {
-                var i, len, keys;
-                if (helpers.isArray(loopable)) {
-                    len = loopable.length;
-                    if (reverse) {
-                        for (i = len - 1; i >= 0; i--) {
-                            fn.call(thisArg, loopable[i], i);
-                        }
-                    } else {
-                        for (i = 0; i < len; i++) {
-                            fn.call(thisArg, loopable[i], i);
-                        }
-                    }
-                } else if (helpers.isObject(loopable)) {
-                    keys = Object.keys(loopable);
-                    len = keys.length;
-                    for (i = 0; i < len; i++) {
-                        fn.call(thisArg, loopable[keys[i]], keys[i]);
-                    }
-                }
-            },
-
-            /**
-             * Returns true if the `a0` and `a1` arrays have the same content, else returns false.
-             * @see http://stackoverflow.com/a/14853974
-             * @param {Array} a0 - The array to compare
-             * @param {Array} a1 - The array to compare
-             * @returns {Boolean}
-             */
-            arrayEquals: function(a0, a1) {
-                var i, ilen, v0, v1;
-
-                if (!a0 || !a1 || a0.length !== a1.length) {
-                    return false;
-                }
-
-                for (i = 0, ilen = a0.length; i < ilen; ++i) {
-                    v0 = a0[i];
-                    v1 = a1[i];
-
-                    if (v0 instanceof Array && v1 instanceof Array) {
-                        if (!helpers.arrayEquals(v0, v1)) {
-                            return false;
-                        }
-                    } else if (v0 !== v1) {
-                        // NOTE: two different object instances will never be equal: {x:20} != {x:20}
-                        return false;
-                    }
-                }
-
-                return true;
-            },
-
-            /**
-             * Returns a deep copy of `source` without keeping references on objects and arrays.
-             * @param {*} source - The value to clone.
-             * @returns {*}
-             */
-            clone: function(source) {
-                if (helpers.isArray(source)) {
-                    return source.map(helpers.clone);
-                }
-
-                if (helpers.isObject(source)) {
-                    var target = {};
-                    var keys = Object.keys(source);
-                    var klen = keys.length;
-                    var k = 0;
-
-                    for (; k < klen; ++k) {
-                        target[keys[k]] = helpers.clone(source[keys[k]]);
-                    }
-
-                    return target;
-                }
-
-                return source;
-            },
-
-            /**
-             * The default merger when Chart.helpers.merge is called without merger option.
-             * Note(SB): this method is also used by configMerge and scaleMerge as fallback.
-             * @private
-             */
-            _merger: function(key, target, source, options) {
-                var tval = target[key];
-                var sval = source[key];
-
-                if (helpers.isObject(tval) && helpers.isObject(sval)) {
-                    helpers.merge(tval, sval, options);
-                } else {
-                    target[key] = helpers.clone(sval);
-                }
-            },
-
-            /**
-             * Merges source[key] in target[key] only if target[key] is undefined.
-             * @private
-             */
-            _mergerIf: function(key, target, source) {
-                var tval = target[key];
-                var sval = source[key];
-
-                if (helpers.isObject(tval) && helpers.isObject(sval)) {
-                    helpers.mergeIf(tval, sval);
-                } else if (!target.hasOwnProperty(key)) {
-                    target[key] = helpers.clone(sval);
-                }
-            },
-
-            /**
-             * Recursively deep copies `source` properties into `target` with the given `options`.
-             * IMPORTANT: `target` is not cloned and will be updated with `source` properties.
-             * @param {Object} target - The target object in which all sources are merged into.
-             * @param {Object|Array(Object)} source - Object(s) to merge into `target`.
-             * @param {Object} [options] - Merging options:
-             * @param {Function} [options.merger] - The merge method (key, target, source, options)
-             * @returns {Object} The `target` object.
-             */
-            merge: function(target, source, options) {
-                var sources = helpers.isArray(source) ? source : [source];
-                var ilen = sources.length;
-                var merge, i, keys, klen, k;
-
-                if (!helpers.isObject(target)) {
-                    return target;
-                }
-
-                options = options || {};
-                merge = options.merger || helpers._merger;
-
-                for (i = 0; i < ilen; ++i) {
-                    source = sources[i];
-                    if (!helpers.isObject(source)) {
-                        continue;
-                    }
-
-                    keys = Object.keys(source);
-                    for (k = 0, klen = keys.length; k < klen; ++k) {
-                        merge(keys[k], target, source, options);
-                    }
-                }
-
-                return target;
-            },
-
-            /**
-             * Recursively deep copies `source` properties into `target` *only* if not defined in target.
-             * IMPORTANT: `target` is not cloned and will be updated with `source` properties.
-             * @param {Object} target - The target object in which all sources are merged into.
-             * @param {Object|Array(Object)} source - Object(s) to merge into `target`.
-             * @returns {Object} The `target` object.
-             */
-            mergeIf: function(target, source) {
-                return helpers.merge(target, source, { merger: helpers._mergerIf });
-            }
-        };
-
-        module.exports = helpers;
-
-// DEPRECATIONS
-
-        /**
-         * Provided for backward compatibility, use Chart.helpers.callback instead.
-         * @function Chart.helpers.callCallback
-         * @deprecated since version 2.6.0
-         * @todo remove at version 3
-         * @private
-         */
-        helpers.callCallback = helpers.callback;
-
-        /**
-         * Provided for backward compatibility, use Array.prototype.indexOf instead.
-         * Array.prototype.indexOf compatibility: Chrome, Opera, Safari, FF1.5+, IE9+
-         * @function Chart.helpers.indexOf
-         * @deprecated since version 2.7.0
-         * @todo remove at version 3
-         * @private
-         */
-        helpers.indexOf = function(array, item, fromIndex) {
-            return Array.prototype.indexOf.call(array, item, fromIndex);
-        };
-
-        /**
-         * Provided for backward compatibility, use Chart.helpers.valueOrDefault instead.
-         * @function Chart.helpers.getValueOrDefault
-         * @deprecated since version 2.7.0
-         * @todo remove at version 3
-         * @private
-         */
-        helpers.getValueOrDefault = helpers.valueOrDefault;
-
-        /**
-         * Provided for backward compatibility, use Chart.helpers.valueAtIndexOrDefault instead.
-         * @function Chart.helpers.getValueAtIndexOrDefault
-         * @deprecated since version 2.7.0
-         * @todo remove at version 3
-         * @private
-         */
-        helpers.getValueAtIndexOrDefault = helpers.valueAtIndexOrDefault;
-
-    },{}],43:[function(require,module,exports){
-        'use strict';
-
-        var helpers = require(42);
-
-        /**
-         * Easing functions adapted from Robert Penner's easing equations.
-         * @namespace Chart.helpers.easingEffects
-         * @see http://www.robertpenner.com/easing/
-         */
-        var effects = {
-            linear: function(t) {
-                return t;
-            },
-
-            easeInQuad: function(t) {
-                return t * t;
-            },
-
-            easeOutQuad: function(t) {
-                return -t * (t - 2);
-            },
-
-            easeInOutQuad: function(t) {
-                if ((t /= 0.5) < 1) {
-                    return 0.5 * t * t;
-                }
-                return -0.5 * ((--t) * (t - 2) - 1);
-            },
-
-            easeInCubic: function(t) {
-                return t * t * t;
-            },
-
-            easeOutCubic: function(t) {
-                return (t = t - 1) * t * t + 1;
-            },
-
-            easeInOutCubic: function(t) {
-                if ((t /= 0.5) < 1) {
-                    return 0.5 * t * t * t;
-                }
-                return 0.5 * ((t -= 2) * t * t + 2);
-            },
-
-            easeInQuart: function(t) {
-                return t * t * t * t;
-            },
-
-            easeOutQuart: function(t) {
-                return -((t = t - 1) * t * t * t - 1);
-            },
-
-            easeInOutQuart: function(t) {
-                if ((t /= 0.5) < 1) {
-                    return 0.5 * t * t * t * t;
-                }
-                return -0.5 * ((t -= 2) * t * t * t - 2);
-            },
-
-            easeInQuint: function(t) {
-                return t * t * t * t * t;
-            },
-
-            easeOutQuint: function(t) {
-                return (t = t - 1) * t * t * t * t + 1;
-            },
-
-            easeInOutQuint: function(t) {
-                if ((t /= 0.5) < 1) {
-                    return 0.5 * t * t * t * t * t;
-                }
-                return 0.5 * ((t -= 2) * t * t * t * t + 2);
-            },
-
-            easeInSine: function(t) {
-                return -Math.cos(t * (Math.PI / 2)) + 1;
-            },
-
-            easeOutSine: function(t) {
-                return Math.sin(t * (Math.PI / 2));
-            },
-
-            easeInOutSine: function(t) {
-                return -0.5 * (Math.cos(Math.PI * t) - 1);
-            },
-
-            easeInExpo: function(t) {
-                return (t === 0) ? 0 : Math.pow(2, 10 * (t - 1));
-            },
-
-            easeOutExpo: function(t) {
-                return (t === 1) ? 1 : -Math.pow(2, -10 * t) + 1;
-            },
-
-            easeInOutExpo: function(t) {
-                if (t === 0) {
-                    return 0;
-                }
-                if (t === 1) {
-                    return 1;
-                }
-                if ((t /= 0.5) < 1) {
-                    return 0.5 * Math.pow(2, 10 * (t - 1));
-                }
-                return 0.5 * (-Math.pow(2, -10 * --t) + 2);
-            },
-
-            easeInCirc: function(t) {
-                if (t >= 1) {
-                    return t;
-                }
-                return -(Math.sqrt(1 - t * t) - 1);
-            },
-
-            easeOutCirc: function(t) {
-                return Math.sqrt(1 - (t = t - 1) * t);
-            },
-
-            easeInOutCirc: function(t) {
-                if ((t /= 0.5) < 1) {
-                    return -0.5 * (Math.sqrt(1 - t * t) - 1);
-                }
-                return 0.5 * (Math.sqrt(1 - (t -= 2) * t) + 1);
-            },
-
-            easeInElastic: function(t) {
-                var s = 1.70158;
-                var p = 0;
-                var a = 1;
-                if (t === 0) {
-                    return 0;
-                }
-                if (t === 1) {
-                    return 1;
-                }
-                if (!p) {
-                    p = 0.3;
-                }
-                if (a < 1) {
-                    a = 1;
-                    s = p / 4;
-                } else {
-                    s = p / (2 * Math.PI) * Math.asin(1 / a);
-                }
-                return -(a * Math.pow(2, 10 * (t -= 1)) * Math.sin((t - s) * (2 * Math.PI) / p));
-            },
-
-            easeOutElastic: function(t) {
-                var s = 1.70158;
-                var p = 0;
-                var a = 1;
-                if (t === 0) {
-                    return 0;
-                }
-                if (t === 1) {
-                    return 1;
-                }
-                if (!p) {
-                    p = 0.3;
-                }
-                if (a < 1) {
-                    a = 1;
-                    s = p / 4;
-                } else {
-                    s = p / (2 * Math.PI) * Math.asin(1 / a);
-                }
-                return a * Math.pow(2, -10 * t) * Math.sin((t - s) * (2 * Math.PI) / p) + 1;
-            },
-
-            easeInOutElastic: function(t) {
-                var s = 1.70158;
-                var p = 0;
-                var a = 1;
-                if (t === 0) {
-                    return 0;
-                }
-                if ((t /= 0.5) === 2) {
-                    return 1;
-                }
-                if (!p) {
-                    p = 0.45;
-                }
-                if (a < 1) {
-                    a = 1;
-                    s = p / 4;
-                } else {
-                    s = p / (2 * Math.PI) * Math.asin(1 / a);
-                }
-                if (t < 1) {
-                    return -0.5 * (a * Math.pow(2, 10 * (t -= 1)) * Math.sin((t - s) * (2 * Math.PI) / p));
-                }
-                return a * Math.pow(2, -10 * (t -= 1)) * Math.sin((t - s) * (2 * Math.PI) / p) * 0.5 + 1;
-            },
-            easeInBack: function(t) {
-                var s = 1.70158;
-                return t * t * ((s + 1) * t - s);
-            },
-
-            easeOutBack: function(t) {
-                var s = 1.70158;
-                return (t = t - 1) * t * ((s + 1) * t + s) + 1;
-            },
-
-            easeInOutBack: function(t) {
-                var s = 1.70158;
-                if ((t /= 0.5) < 1) {
-                    return 0.5 * (t * t * (((s *= (1.525)) + 1) * t - s));
-                }
-                return 0.5 * ((t -= 2) * t * (((s *= (1.525)) + 1) * t + s) + 2);
-            },
-
-            easeInBounce: function(t) {
-                return 1 - effects.easeOutBounce(1 - t);
-            },
-
-            easeOutBounce: function(t) {
-                if (t < (1 / 2.75)) {
-                    return 7.5625 * t * t;
-                }
-                if (t < (2 / 2.75)) {
-                    return 7.5625 * (t -= (1.5 / 2.75)) * t + 0.75;
-                }
-                if (t < (2.5 / 2.75)) {
-                    return 7.5625 * (t -= (2.25 / 2.75)) * t + 0.9375;
-                }
-                return 7.5625 * (t -= (2.625 / 2.75)) * t + 0.984375;
-            },
-
-            easeInOutBounce: function(t) {
-                if (t < 0.5) {
-                    return effects.easeInBounce(t * 2) * 0.5;
-                }
-                return effects.easeOutBounce(t * 2 - 1) * 0.5 + 0.5;
-            }
-        };
-
-        module.exports = {
-            effects: effects
-        };
-
-// DEPRECATIONS
-
-        /**
-         * Provided for backward compatibility, use Chart.helpers.easing.effects instead.
-         * @function Chart.helpers.easingEffects
-         * @deprecated since version 2.7.0
-         * @todo remove at version 3
-         * @private
-         */
-        helpers.easingEffects = effects;
-
-    },{ "42":42 }],44:[function(require,module,exports){
-        'use strict';
-
-        var helpers = require(42);
-
-        /**
-         * @alias Chart.helpers.options
-         * @namespace
-         */
-        module.exports = {
-            /**
-             * Converts the given line height `value` in pixels for a specific font `size`.
-             * @param {Number|String} value - The lineHeight to parse (eg. 1.6, '14px', '75%', '1.6em').
-             * @param {Number} size - The font size (in pixels) used to resolve relative `value`.
-             * @returns {Number} The effective line height in pixels (size * 1.2 if value is invalid).
-             * @see https://developer.mozilla.org/en-US/docs/Web/CSS/line-height
-             * @since 2.7.0
-             */
-            toLineHeight: function(value, size) {
-                var matches = ('' + value).match(/^(normal|(\d+(?:\.\d+)?)(px|em|%)?)$/);
-                if (!matches || matches[1] === 'normal') {
-                    return size * 1.2;
-                }
-
-                value = +matches[2];
-
-                switch (matches[3]) {
-                    case 'px':
-                        return value;
-                    case '%':
-                        value /= 100;
-                        break;
-                    default:
-                        break;
-                }
-
-                return size * value;
-            },
-
-            /**
-             * Converts the given value into a padding object with pre-computed width/height.
-             * @param {Number|Object} value - If a number, set the value to all TRBL component,
-             *  else, if and object, use defined properties and sets undefined ones to 0.
-             * @returns {Object} The padding values (top, right, bottom, left, width, height)
-             * @since 2.7.0
-             */
-            toPadding: function(value) {
-                var t, r, b, l;
-
-                if (helpers.isObject(value)) {
-                    t = +value.top || 0;
-                    r = +value.right || 0;
-                    b = +value.bottom || 0;
-                    l = +value.left || 0;
-                } else {
-                    t = r = b = l = +value || 0;
-                }
-
-                return {
-                    top: t,
-                    right: r,
-                    bottom: b,
-                    left: l,
-                    height: t + b,
-                    width: l + r
-                };
-            },
-
-            /**
-             * Evaluates the given `inputs` sequentially and returns the first defined value.
-             * @param {Array[]} inputs - An array of values, falling back to the last value.
-             * @param {Object} [context] - If defined and the current value is a function, the value
-             * is called with `context` as first argument and the result becomes the new input.
-             * @param {Number} [index] - If defined and the current value is an array, the value
-             * at `index` become the new input.
-             * @since 2.7.0
-             */
-            resolve: function(inputs, context, index) {
-                var i, ilen, value;
-
-                for (i = 0, ilen = inputs.length; i < ilen; ++i) {
-                    value = inputs[i];
-                    if (value === undefined) {
-                        continue;
-                    }
-                    if (context !== undefined && typeof value === 'function') {
-                        value = value(context);
-                    }
-                    if (index !== undefined && helpers.isArray(value)) {
-                        value = value[index];
-                    }
-                    if (value !== undefined) {
-                        return value;
-                    }
-                }
-            }
-        };
-
-    },{ "42":42 }],45:[function(require,module,exports){
-        'use strict';
-
-        module.exports = require(42);
-        module.exports.easing = require(43);
-        module.exports.canvas = require(41);
-        module.exports.options = require(44);
-
-    },{ "41":41,"42":42,"43":43,"44":44 }],46:[function(require,module,exports){
-        /**
-         * Platform fallback implementation (minimal).
-         * @see https://github.com/chartjs/Chart.js/pull/4591#issuecomment-319575939
-         */
-
-        module.exports = {
-            acquireContext: function(item) {
-                if (item && item.canvas) {
-                    // Support for any object associated to a canvas (including a context2d)
-                    item = item.canvas;
-                }
-
-                return item && item.getContext('2d') || null;
-            }
-        };
-
-    },{}],47:[function(require,module,exports){
-        /**
-         * Chart.Platform implementation for targeting a web browser
-         */
-
-        'use strict';
-
-        var helpers = require(45);
-
-        var EXPANDO_KEY = '$chartjs';
-        var CSS_PREFIX = 'chartjs-';
-        var CSS_RENDER_MONITOR = CSS_PREFIX + 'render-monitor';
-        var CSS_RENDER_ANIMATION = CSS_PREFIX + 'render-animation';
-        var ANIMATION_START_EVENTS = ['animationstart', 'webkitAnimationStart'];
-
-        /**
-         * DOM event types -> Chart.js event types.
-         * Note: only events with different types are mapped.
-         * @see https://developer.mozilla.org/en-US/docs/Web/Events
-         */
-        var EVENT_TYPES = {
-            touchstart: 'mousedown',
-            touchmove: 'mousemove',
-            touchend: 'mouseup',
-            pointerenter: 'mouseenter',
-            pointerdown: 'mousedown',
-            pointermove: 'mousemove',
-            pointerup: 'mouseup',
-            pointerleave: 'mouseout',
-            pointerout: 'mouseout'
-        };
-
-        /**
-         * The "used" size is the final value of a dimension property after all calculations have
-         * been performed. This method uses the computed style of `element` but returns undefined
-         * if the computed style is not expressed in pixels. That can happen in some cases where
-         * `element` has a size relative to its parent and this last one is not yet displayed,
-         * for example because of `display: none` on a parent node.
-         * @see https://developer.mozilla.org/en-US/docs/Web/CSS/used_value
-         * @returns {Number} Size in pixels or undefined if unknown.
-         */
-        function readUsedSize(element, property) {
-            var value = helpers.getStyle(element, property);
-            var matches = value && value.match(/^(\d+)(\.\d+)?px$/);
-            return matches ? Number(matches[1]) : undefined;
-        }
-
-        /**
-         * Initializes the canvas style and render size without modifying the canvas display size,
-         * since responsiveness is handled by the controller.resize() method. The config is used
-         * to determine the aspect ratio to apply in case no explicit height has been specified.
-         */
-        function initCanvas(canvas, config) {
-            var style = canvas.style;
-
-            // NOTE(SB) canvas.getAttribute('width') !== canvas.width: in the first case it
-            // returns null or '' if no explicit value has been set to the canvas attribute.
-            var renderHeight = canvas.getAttribute('height');
-            var renderWidth = canvas.getAttribute('width');
-
-            // Chart.js modifies some canvas values that we want to restore on destroy
-            canvas[EXPANDO_KEY] = {
-                initial: {
-                    height: renderHeight,
-                    width: renderWidth,
-                    style: {
-                        display: style.display,
-                        height: style.height,
-                        width: style.width
-                    }
-                }
-            };
-
-            // Force canvas to display as block to avoid extra space caused by inline
-            // elements, which would interfere with the responsive resize process.
-            // https://github.com/chartjs/Chart.js/issues/2538
-            style.display = style.display || 'block';
-
-            if (renderWidth === null || renderWidth === '') {
-                var displayWidth = readUsedSize(canvas, 'width');
-                if (displayWidth !== undefined) {
-                    canvas.width = displayWidth;
-                }
-            }
-
-            if (renderHeight === null || renderHeight === '') {
-                if (canvas.style.height === '') {
-                    // If no explicit render height and style height, let's apply the aspect ratio,
-                    // which one can be specified by the user but also by charts as default option
-                    // (i.e. options.aspectRatio). If not specified, use canvas aspect ratio of 2.
-                    canvas.height = canvas.width / (config.options.aspectRatio || 2);
-                } else {
-                    var displayHeight = readUsedSize(canvas, 'height');
-                    if (displayWidth !== undefined) {
-                        canvas.height = displayHeight;
-                    }
-                }
-            }
-
-            return canvas;
-        }
-
-        /**
-         * Detects support for options object argument in addEventListener.
-         * https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/addEventListener#Safely_detecting_option_support
-         * @private
-         */
-        var supportsEventListenerOptions = (function() {
-            var supports = false;
-            try {
-                var options = Object.defineProperty({}, 'passive', {
-                    get: function() {
-                        supports = true;
-                    }
-                });
-                window.addEventListener('e', null, options);
-            } catch (e) {
-                // continue regardless of error
-            }
-            return supports;
-        }());
-
-// Default passive to true as expected by Chrome for 'touchstart' and 'touchend' events.
-// https://github.com/chartjs/Chart.js/issues/4287
-        var eventListenerOptions = supportsEventListenerOptions ? { passive: true } : false;
-
-        function addEventListener(node, type, listener) {
-            node.addEventListener(type, listener, eventListenerOptions);
-        }
-
-        function removeEventListener(node, type, listener) {
-            node.removeEventListener(type, listener, eventListenerOptions);
-        }
-
-        function createEvent(type, chart, x, y, nativeEvent) {
-            return {
-                type: type,
-                chart: chart,
-                native: nativeEvent || null,
-                x: x !== undefined ? x : null,
-                y: y !== undefined ? y : null,
-            };
-        }
-
-        function fromNativeEvent(event, chart) {
-            var type = EVENT_TYPES[event.type] || event.type;
-            var pos = helpers.getRelativePosition(event, chart);
-            return createEvent(type, chart, pos.x, pos.y, event);
-        }
-
-        function throttled(fn, thisArg) {
-            var ticking = false;
-            var args = [];
-
-            return function() {
-                args = Array.prototype.slice.call(arguments);
-                thisArg = thisArg || this;
-
-                if (!ticking) {
-                    ticking = true;
-                    helpers.requestAnimFrame.call(window, function() {
-                        ticking = false;
-                        fn.apply(thisArg, args);
-                    });
-                }
-            };
-        }
-
-// Implementation based on https://github.com/marcj/css-element-queries
-        function createResizer(handler) {
-            var resizer = document.createElement('div');
-            var cls = CSS_PREFIX + 'size-monitor';
-            var maxSize = 1000000;
-            var style =
-                    'position:absolute;' +
-                    'left:0;' +
-                    'top:0;' +
-                    'right:0;' +
-                    'bottom:0;' +
-                    'overflow:hidden;' +
-                    'pointer-events:none;' +
-                    'visibility:hidden;' +
-                    'z-index:-1;';
-
-            resizer.style.cssText = style;
-            resizer.className = cls;
-            resizer.innerHTML =
-                    '<div class="' + cls + '-expand" style="' + style + '">' +
-                    '<div style="' +
-                    'position:absolute;' +
-                    'width:' + maxSize + 'px;' +
-                    'height:' + maxSize + 'px;' +
-                    'left:0;' +
-                    'top:0">' +
-                    '</div>' +
-                    '</div>' +
-                    '<div class="' + cls + '-shrink" style="' + style + '">' +
-                    '<div style="' +
-                    'position:absolute;' +
-                    'width:200%;' +
-                    'height:200%;' +
-                    'left:0; ' +
-                    'top:0">' +
-                    '</div>' +
-                    '</div>';
-
-            var expand = resizer.childNodes[0];
-            var shrink = resizer.childNodes[1];
-
-            resizer._reset = function() {
-                expand.scrollLeft = maxSize;
-                expand.scrollTop = maxSize;
-                shrink.scrollLeft = maxSize;
-                shrink.scrollTop = maxSize;
-            };
-            var onScroll = function() {
-                resizer._reset();
-                handler();
-            };
-
-            addEventListener(expand, 'scroll', onScroll.bind(expand, 'expand'));
-            addEventListener(shrink, 'scroll', onScroll.bind(shrink, 'shrink'));
-
-            return resizer;
-        }
-
-// https://davidwalsh.name/detect-node-insertion
-        function watchForRender(node, handler) {
-            var expando = node[EXPANDO_KEY] || (node[EXPANDO_KEY] = {});
-            var proxy = expando.renderProxy = function(e) {
-                if (e.animationName === CSS_RENDER_ANIMATION) {
-                    handler();
-                }
-            };
-
-            helpers.each(ANIMATION_START_EVENTS, function(type) {
-                addEventListener(node, type, proxy);
-            });
-
-            node.classList.add(CSS_RENDER_MONITOR);
-        }
-
-        function unwatchForRender(node) {
-            var expando = node[EXPANDO_KEY] || {};
-            var proxy = expando.renderProxy;
-
-            if (proxy) {
-                helpers.each(ANIMATION_START_EVENTS, function(type) {
-                    removeEventListener(node, type, proxy);
-                });
-
-                delete expando.renderProxy;
-            }
-
-            node.classList.remove(CSS_RENDER_MONITOR);
-        }
-
-        function addResizeListener(node, listener, chart) {
-            var expando = node[EXPANDO_KEY] || (node[EXPANDO_KEY] = {});
-
-            // Let's keep track of this added resizer and thus avoid DOM query when removing it.
-            var resizer = expando.resizer = createResizer(throttled(function() {
-                if (expando.resizer) {
-                    return listener(createEvent('resize', chart));
-                }
-            }));
-
-            // The resizer needs to be attached to the node parent, so we first need to be
-            // sure that `node` is attached to the DOM before injecting the resizer element.
-            watchForRender(node, function() {
-                if (expando.resizer) {
-                    var container = node.parentNode;
-                    if (container && container !== resizer.parentNode) {
-                        container.insertBefore(resizer, container.firstChild);
-                    }
-
-                    // The container size might have changed, let's reset the resizer state.
-                    resizer._reset();
-                }
-            });
-        }
-
-        function removeResizeListener(node) {
-            var expando = node[EXPANDO_KEY] || {};
-            var resizer = expando.resizer;
-
-            delete expando.resizer;
-            unwatchForRender(node);
-
-            if (resizer && resizer.parentNode) {
-                resizer.parentNode.removeChild(resizer);
-            }
-        }
-
-        function injectCSS(platform, css) {
-            // http://stackoverflow.com/q/3922139
-            var style = platform._style || document.createElement('style');
-            if (!platform._style) {
-                platform._style = style;
-                css = '/* Chart.js */\n' + css;
-                style.setAttribute('type', 'text/css');
-                document.getElementsByTagName('head')[0].appendChild(style);
-            }
-
-            style.appendChild(document.createTextNode(css));
-        }
-
-        module.exports = {
-            /**
-             * This property holds whether this platform is enabled for the current environment.
-             * Currently used by platform.js to select the proper implementation.
-             * @private
-             */
-            _enabled: typeof window !== 'undefined' && typeof document !== 'undefined',
-
-            initialize: function() {
-                var keyframes = 'from{opacity:0.99}to{opacity:1}';
-
-                injectCSS(this,
-                        // DOM rendering detection
-                        // https://davidwalsh.name/detect-node-insertion
-                        '@-webkit-keyframes ' + CSS_RENDER_ANIMATION + '{' + keyframes + '}' +
-                        '@keyframes ' + CSS_RENDER_ANIMATION + '{' + keyframes + '}' +
-                        '.' + CSS_RENDER_MONITOR + '{' +
-                        '-webkit-animation:' + CSS_RENDER_ANIMATION + ' 0.001s;' +
-                        'animation:' + CSS_RENDER_ANIMATION + ' 0.001s;' +
-                        '}'
-                );
-            },
-
-            acquireContext: function(item, config) {
-                if (typeof item === 'string') {
-                    item = document.getElementById(item);
-                } else if (item.length) {
-                    // Support for array based queries (such as jQuery)
-                    item = item[0];
-                }
-
-                if (item && item.canvas) {
-                    // Support for any object associated to a canvas (including a context2d)
-                    item = item.canvas;
-                }
-
-                // To prevent canvas fingerprinting, some add-ons undefine the getContext
-                // method, for example: https://github.com/kkapsner/CanvasBlocker
-                // https://github.com/chartjs/Chart.js/issues/2807
-                var context = item && item.getContext && item.getContext('2d');
-
-                // `instanceof HTMLCanvasElement/CanvasRenderingContext2D` fails when the item is
-                // inside an iframe or when running in a protected environment. We could guess the
-                // types from their toString() value but let's keep things flexible and assume it's
-                // a sufficient condition if the item has a context2D which has item as `canvas`.
-                // https://github.com/chartjs/Chart.js/issues/3887
-                // https://github.com/chartjs/Chart.js/issues/4102
-                // https://github.com/chartjs/Chart.js/issues/4152
-                if (context && context.canvas === item) {
-                    initCanvas(item, config);
-                    return context;
-                }
-
-                return null;
-            },
-
-            releaseContext: function(context) {
-                var canvas = context.canvas;
-                if (!canvas[EXPANDO_KEY]) {
-                    return;
-                }
-
-                var initial = canvas[EXPANDO_KEY].initial;
-                ['height', 'width'].forEach(function(prop) {
-                    var value = initial[prop];
-                    if (helpers.isNullOrUndef(value)) {
-                        canvas.removeAttribute(prop);
-                    } else {
-                        canvas.setAttribute(prop, value);
-                    }
-                });
-
-                helpers.each(initial.style || {}, function(value, key) {
-                    canvas.style[key] = value;
-                });
-
-                // The canvas render size might have been changed (and thus the state stack discarded),
-                // we can't use save() and restore() to restore the initial state. So make sure that at
-                // least the canvas context is reset to the default state by setting the canvas width.
-                // https://www.w3.org/TR/2011/WD-html5-20110525/the-canvas-element.html
-                canvas.width = canvas.width;
-
-                delete canvas[EXPANDO_KEY];
-            },
-
-            addEventListener: function(chart, type, listener) {
-                var canvas = chart.canvas;
-                if (type === 'resize') {
-                    // Note: the resize event is not supported on all browsers.
-                    addResizeListener(canvas, listener, chart);
-                    return;
-                }
-
-                var expando = listener[EXPANDO_KEY] || (listener[EXPANDO_KEY] = {});
-                var proxies = expando.proxies || (expando.proxies = {});
-                var proxy = proxies[chart.id + '_' + type] = function(event) {
-                    listener(fromNativeEvent(event, chart));
-                };
-
-                addEventListener(canvas, type, proxy);
-            },
-
-            removeEventListener: function(chart, type, listener) {
-                var canvas = chart.canvas;
-                if (type === 'resize') {
-                    // Note: the resize event is not supported on all browsers.
-                    removeResizeListener(canvas, listener);
-                    return;
-                }
-
-                var expando = listener[EXPANDO_KEY] || {};
-                var proxies = expando.proxies || {};
-                var proxy = proxies[chart.id + '_' + type];
-                if (!proxy) {
-                    return;
-                }
-
-                removeEventListener(canvas, type, proxy);
-            }
-        };
-
-// DEPRECATIONS
-
-        /**
-         * Provided for backward compatibility, use EventTarget.addEventListener instead.
-         * EventTarget.addEventListener compatibility: Chrome, Opera 7, Safari, FF1.5+, IE9+
-         * @see https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/addEventListener
-         * @function Chart.helpers.addEvent
-         * @deprecated since version 2.7.0
-         * @todo remove at version 3
-         * @private
-         */
-        helpers.addEvent = addEventListener;
-
-        /**
-         * Provided for backward compatibility, use EventTarget.removeEventListener instead.
-         * EventTarget.removeEventListener compatibility: Chrome, Opera 7, Safari, FF1.5+, IE9+
-         * @see https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/removeEventListener
-         * @function Chart.helpers.removeEvent
-         * @deprecated since version 2.7.0
-         * @todo remove at version 3
-         * @private
-         */
-        helpers.removeEvent = removeEventListener;
-
-    },{ "45":45 }],48:[function(require,module,exports){
-        'use strict';
-
-        var helpers = require(45);
-        var basic = require(46);
-        var dom = require(47);
-
-// @TODO Make possible to select another platform at build time.
-        var implementation = dom._enabled ? dom : basic;
-
-        /**
-         * @namespace Chart.platform
-         * @see https://chartjs.gitbooks.io/proposals/content/Platform.html
-         * @since 2.4.0
-         */
-        module.exports = helpers.extend({
-            /**
-             * @since 2.7.0
-             */
-            initialize: function() {},
-
-            /**
-             * Called at chart construction time, returns a context2d instance implementing
-             * the [W3C Canvas 2D Context API standard]{@link https://www.w3.org/TR/2dcontext/}.
-             * @param {*} item - The native item from which to acquire context (platform specific)
-             * @param {Object} options - The chart options
-             * @returns {CanvasRenderingContext2D} context2d instance
-             */
-            acquireContext: function() {},
-
-            /**
-             * Called at chart destruction time, releases any resources associated to the context
-             * previously returned by the acquireContext() method.
-             * @param {CanvasRenderingContext2D} context - The context2d instance
-             * @returns {Boolean} true if the method succeeded, else false
-             */
-            releaseContext: function() {},
-
-            /**
-             * Registers the specified listener on the given chart.
-             * @param {Chart} chart - Chart from which to listen for event
-             * @param {String} type - The ({@link IEvent}) type to listen for
-             * @param {Function} listener - Receives a notification (an object that implements
-             * the {@link IEvent} interface) when an event of the specified type occurs.
-             */
-            addEventListener: function() {},
-
-            /**
-             * Removes the specified listener previously registered with addEventListener.
-             * @param {Chart} chart -Chart from which to remove the listener
-             * @param {String} type - The ({@link IEvent}) type to remove
-             * @param {Function} listener - The listener function to remove from the event target.
-             */
-            removeEventListener: function() {}
-
-        }, implementation);
-
-        /**
-         * @interface IPlatform
-         * Allows abstracting platform dependencies away from the chart
-         * @borrows Chart.platform.acquireContext as acquireContext
-         * @borrows Chart.platform.releaseContext as releaseContext
-         * @borrows Chart.platform.addEventListener as addEventListener
-         * @borrows Chart.platform.removeEventListener as removeEventListener
-         */
-
-        /**
-         * @interface IEvent
-         * @prop {String} type - The event type name, possible values are:
-         * 'contextmenu', 'mouseenter', 'mousedown', 'mousemove', 'mouseup', 'mouseout',
-         * 'click', 'dblclick', 'keydown', 'keypress', 'keyup' and 'resize'
-         * @prop {*} native - The original native event (null for emulated events, e.g. 'resize')
-         * @prop {Number} x - The mouse x position, relative to the canvas (null for incompatible events)
-         * @prop {Number} y - The mouse y position, relative to the canvas (null for incompatible events)
-         */
-
-    },{ "45":45,"46":46,"47":47 }],49:[function(require,module,exports){
-        /**
-         * Plugin based on discussion from the following Chart.js issues:
-         * @see https://github.com/chartjs/Chart.js/issues/2380#issuecomment-279961569
-         * @see https://github.com/chartjs/Chart.js/issues/2440#issuecomment-256461897
-         */
-
-        'use strict';
-
-        var defaults = require(25);
-        var elements = require(40);
-        var helpers = require(45);
-
-        defaults._set('global', {
-            plugins: {
-                filler: {
-                    propagate: true
-                }
-            }
-        });
-
-        module.exports = function() {
-
-            var mappers = {
-                dataset: function(source) {
-                    var index = source.fill;
-                    var chart = source.chart;
-                    var meta = chart.getDatasetMeta(index);
-                    var visible = meta && chart.isDatasetVisible(index);
-                    var points = (visible && meta.dataset._children) || [];
-                    var length = points.length || 0;
-
-                    return !length ? null : function(point, i) {
-                        return (i < length && points[i]._view) || null;
-                    };
-                },
-
-                boundary: function(source) {
-                    var boundary = source.boundary;
-                    var x = boundary ? boundary.x : null;
-                    var y = boundary ? boundary.y : null;
-
-                    return function(point) {
-                        return {
-                            x: x === null ? point.x : x,
-                            y: y === null ? point.y : y,
-                        };
-                    };
-                }
-            };
-
-            // @todo if (fill[0] === '#')
-            function decodeFill(el, index, count) {
-                var model = el._model || {};
-                var fill = model.fill;
-                var target;
-
-                if (fill === undefined) {
-                    fill = !!model.backgroundColor;
-                }
-
-                if (fill === false || fill === null) {
-                    return false;
-                }
-
-                if (fill === true) {
-                    return 'origin';
-                }
-
-                target = parseFloat(fill, 10);
-                if (isFinite(target) && Math.floor(target) === target) {
-                    if (fill[0] === '-' || fill[0] === '+') {
-                        target = index + target;
-                    }
-
-                    if (target === index || target < 0 || target >= count) {
-                        return false;
-                    }
-
-                    return target;
-                }
-
-                switch (fill) {
-                        // compatibility
-                    case 'bottom':
-                        return 'start';
-                    case 'top':
-                        return 'end';
-                    case 'zero':
-                        return 'origin';
-                        // supported boundaries
-                    case 'origin':
-                    case 'start':
-                    case 'end':
-                        return fill;
-                        // invalid fill values
-                    default:
-                        return false;
-                }
-            }
-
-            function computeBoundary(source) {
-                var model = source.el._model || {};
-                var scale = source.el._scale || {};
-                var fill = source.fill;
-                var target = null;
-                var horizontal;
-
-                if (isFinite(fill)) {
-                    return null;
-                }
-
-                // Backward compatibility: until v3, we still need to support boundary values set on
-                // the model (scaleTop, scaleBottom and scaleZero) because some external plugins and
-                // controllers might still use it (e.g. the Smith chart).
-
-                if (fill === 'start') {
-                    target = model.scaleBottom === undefined ? scale.bottom : model.scaleBottom;
-                } else if (fill === 'end') {
-                    target = model.scaleTop === undefined ? scale.top : model.scaleTop;
-                } else if (model.scaleZero !== undefined) {
-                    target = model.scaleZero;
-                } else if (scale.getBasePosition) {
-                    target = scale.getBasePosition();
-                } else if (scale.getBasePixel) {
-                    target = scale.getBasePixel();
-                }
-
-                if (target !== undefined && target !== null) {
-                    if (target.x !== undefined && target.y !== undefined) {
-                        return target;
-                    }
-
-                    if (typeof target === 'number' && isFinite(target)) {
-                        horizontal = scale.isHorizontal();
-                        return {
-                            x: horizontal ? target : null,
-                            y: horizontal ? null : target
-                        };
-                    }
-                }
-
-                return null;
-            }
-
-            function resolveTarget(sources, index, propagate) {
-                var source = sources[index];
-                var fill = source.fill;
-                var visited = [index];
-                var target;
-
-                if (!propagate) {
-                    return fill;
-                }
-
-                while (fill !== false && visited.indexOf(fill) === -1) {
-                    if (!isFinite(fill)) {
-                        return fill;
-                    }
-
-                    target = sources[fill];
-                    if (!target) {
-                        return false;
-                    }
-
-                    if (target.visible) {
-                        return fill;
-                    }
-
-                    visited.push(fill);
-                    fill = target.fill;
-                }
-
-                return false;
-            }
-
-            function createMapper(source) {
-                var fill = source.fill;
-                var type = 'dataset';
-
-                if (fill === false) {
-                    return null;
-                }
-
-                if (!isFinite(fill)) {
-                    type = 'boundary';
-                }
-
-                return mappers[type](source);
-            }
-
-            function isDrawable(point) {
-                return point && !point.skip;
-            }
-
-            function drawArea(ctx, curve0, curve1, len0, len1) {
-                var i;
-
-                if (!len0 || !len1) {
-                    return;
-                }
-
-                // building first area curve (normal)
-                ctx.moveTo(curve0[0].x, curve0[0].y);
-                for (i = 1; i < len0; ++i) {
-                    helpers.canvas.lineTo(ctx, curve0[i - 1], curve0[i]);
-                }
-
-                // joining the two area curves
-                ctx.lineTo(curve1[len1 - 1].x, curve1[len1 - 1].y);
-
-                // building opposite area curve (reverse)
-                for (i = len1 - 1; i > 0; --i) {
-                    helpers.canvas.lineTo(ctx, curve1[i], curve1[i - 1], true);
-                }
-            }
-
-            function doFill(ctx, points, mapper, view, color, loop) {
-                var count = points.length;
-                var span = view.spanGaps;
-                var curve0 = [];
-                var curve1 = [];
-                var len0 = 0;
-                var len1 = 0;
-                var i, ilen, index, p0, p1, d0, d1;
-
-                ctx.beginPath();
-
-                for (i = 0, ilen = (count + !!loop); i < ilen; ++i) {
-                    index = i % count;
-                    p0 = points[index]._view;
-                    p1 = mapper(p0, index, view);
-                    d0 = isDrawable(p0);
-                    d1 = isDrawable(p1);
-
-                    if (d0 && d1) {
-                        len0 = curve0.push(p0);
-                        len1 = curve1.push(p1);
-                    } else if (len0 && len1) {
-                        if (!span) {
-                            drawArea(ctx, curve0, curve1, len0, len1);
-                            len0 = len1 = 0;
-                            curve0 = [];
-                            curve1 = [];
-                        } else {
-                            if (d0) {
-                                curve0.push(p0);
-                            }
-                            if (d1) {
-                                curve1.push(p1);
-                            }
-                        }
-                    }
-                }
-
-                drawArea(ctx, curve0, curve1, len0, len1);
-
-                ctx.closePath();
-                ctx.fillStyle = color;
-                ctx.fill();
-            }
-
-            return {
-                id: 'filler',
-
-                afterDatasetsUpdate: function(chart, options) {
-                    var count = (chart.data.datasets || []).length;
-                    var propagate = options.propagate;
-                    var sources = [];
-                    var meta, i, el, source;
-
-                    for (i = 0; i < count; ++i) {
-                        meta = chart.getDatasetMeta(i);
-                        el = meta.dataset;
-                        source = null;
-
-                        if (el && el._model && el instanceof elements.Line) {
-                            source = {
-                                visible: chart.isDatasetVisible(i),
-                                fill: decodeFill(el, i, count),
-                                chart: chart,
-                                el: el
-                            };
-                        }
-
-                        meta.$filler = source;
-                        sources.push(source);
-                    }
-
-                    for (i = 0; i < count; ++i) {
-                        source = sources[i];
-                        if (!source) {
-                            continue;
-                        }
-
-                        source.fill = resolveTarget(sources, i, propagate);
-                        source.boundary = computeBoundary(source);
-                        source.mapper = createMapper(source);
-                    }
-                },
-
-                beforeDatasetDraw: function(chart, args) {
-                    var meta = args.meta.$filler;
-                    if (!meta) {
-                        return;
-                    }
-
-                    var ctx = chart.ctx;
-                    var el = meta.el;
-                    var view = el._view;
-                    var points = el._children || [];
-                    var mapper = meta.mapper;
-                    var color = view.backgroundColor || defaults.global.defaultColor;
-
-                    if (mapper && color && points.length) {
-                        helpers.canvas.clipArea(ctx, chart.chartArea);
-                        doFill(ctx, points, mapper, view, color, el._loop);
-                        helpers.canvas.unclipArea(ctx);
-                    }
-                }
-            };
-        };
-
-    },{ "25":25,"40":40,"45":45 }],50:[function(require,module,exports){
-        'use strict';
-
-        var defaults = require(25);
-        var Element = require(26);
-        var helpers = require(45);
-
-        defaults._set('global', {
-            legend: {
-                display: true,
-                position: 'top',
-                fullWidth: true,
-                reverse: false,
-                weight: 1000,
-
-                // a callback that will handle
-                onClick: function(e, legendItem) {
-                    var index = legendItem.datasetIndex;
-                    var ci = this.chart;
-                    var meta = ci.getDatasetMeta(index);
-
-                    // See controller.isDatasetVisible comment
-                    meta.hidden = meta.hidden === null ? !ci.data.datasets[index].hidden : null;
-
-                    // We hid a dataset ... rerender the chart
-                    ci.update();
-                },
-
-                onHover: null,
-
-                labels: {
-                    boxWidth: 40,
-                    padding: 10,
-                    // Generates labels shown in the legend
-                    // Valid properties to return:
-                    // text : text to display
-                    // fillStyle : fill of coloured box
-                    // strokeStyle: stroke of coloured box
-                    // hidden : if this legend item refers to a hidden item
-                    // lineCap : cap style for line
-                    // lineDash
-                    // lineDashOffset :
-                    // lineJoin :
-                    // lineWidth :
-                    generateLabels: function(chart) {
-                        var data = chart.data;
-                        return helpers.isArray(data.datasets) ? data.datasets.map(function(dataset, i) {
-                            return {
-                                text: dataset.label,
-                                fillStyle: (!helpers.isArray(dataset.backgroundColor) ? dataset.backgroundColor : dataset.backgroundColor[0]),
-                                hidden: !chart.isDatasetVisible(i),
-                                lineCap: dataset.borderCapStyle,
-                                lineDash: dataset.borderDash,
-                                lineDashOffset: dataset.borderDashOffset,
-                                lineJoin: dataset.borderJoinStyle,
-                                lineWidth: dataset.borderWidth,
-                                strokeStyle: dataset.borderColor,
-                                pointStyle: dataset.pointStyle,
-
-                                // Below is extra data used for toggling the datasets
-                                datasetIndex: i
-                            };
-                        }, this) : [];
-                    }
-                }
-            },
-
-            legendCallback: function(chart) {
-                var text = [];
-                text.push('<ul class="' + chart.id + '-legend">');
-                for (var i = 0; i < chart.data.datasets.length; i++) {
-                    text.push('<li><span style="background-color:' + chart.data.datasets[i].backgroundColor + '"></span>');
-                    if (chart.data.datasets[i].label) {
-                        text.push(chart.data.datasets[i].label);
-                    }
-                    text.push('</li>');
-                }
-                text.push('</ul>');
-                return text.join('');
-            }
-        });
-
-        module.exports = function(Chart) {
-
-            var layout = Chart.layoutService;
-            var noop = helpers.noop;
-
-            /**
-             * Helper function to get the box width based on the usePointStyle option
-             * @param labelopts {Object} the label options on the legend
-             * @param fontSize {Number} the label font size
-             * @return {Number} width of the color box area
-             */
-            function getBoxWidth(labelOpts, fontSize) {
-                return labelOpts.usePointStyle ?
-                        fontSize * Math.SQRT2 :
-                        labelOpts.boxWidth;
-            }
-
-            Chart.Legend = Element.extend({
-
-                initialize: function(config) {
-                    helpers.extend(this, config);
-
-                    // Contains hit boxes for each dataset (in dataset order)
-                    this.legendHitBoxes = [];
-
-                    // Are we in doughnut mode which has a different data type
-                    this.doughnutMode = false;
-                },
-
-                // These methods are ordered by lifecycle. Utilities then follow.
-                // Any function defined here is inherited by all legend types.
-                // Any function can be extended by the legend type
-
-                beforeUpdate: noop,
-                update: function(maxWidth, maxHeight, margins) {
-                    var me = this;
-
-                    // Update Lifecycle - Probably don't want to ever extend or overwrite this function ;)
-                    me.beforeUpdate();
-
-                    // Absorb the master measurements
-                    me.maxWidth = maxWidth;
-                    me.maxHeight = maxHeight;
-                    me.margins = margins;
-
-                    // Dimensions
-                    me.beforeSetDimensions();
-                    me.setDimensions();
-                    me.afterSetDimensions();
-                    // Labels
-                    me.beforeBuildLabels();
-                    me.buildLabels();
-                    me.afterBuildLabels();
-
-                    // Fit
-                    me.beforeFit();
-                    me.fit();
-                    me.afterFit();
-                    //
-                    me.afterUpdate();
-
-                    return me.minSize;
-                },
-                afterUpdate: noop,
-
-                //
-
-                beforeSetDimensions: noop,
-                setDimensions: function() {
-                    var me = this;
-                    // Set the unconstrained dimension before label rotation
-                    if (me.isHorizontal()) {
-                        // Reset position before calculating rotation
-                        me.width = me.maxWidth;
-                        me.left = 0;
-                        me.right = me.width;
-                    } else {
-                        me.height = me.maxHeight;
-
-                        // Reset position before calculating rotation
-                        me.top = 0;
-                        me.bottom = me.height;
-                    }
-
-                    // Reset padding
-                    me.paddingLeft = 0;
-                    me.paddingTop = 0;
-                    me.paddingRight = 0;
-                    me.paddingBottom = 0;
-
-                    // Reset minSize
-                    me.minSize = {
-                        width: 0,
-                        height: 0
-                    };
-                },
-                afterSetDimensions: noop,
-
-                //
-
-                beforeBuildLabels: noop,
-                buildLabels: function() {
-                    var me = this;
-                    var labelOpts = me.options.labels || {};
-                    var legendItems = helpers.callback(labelOpts.generateLabels, [me.chart], me) || [];
-
-                    if (labelOpts.filter) {
-                        legendItems = legendItems.filter(function(item) {
-                            return labelOpts.filter(item, me.chart.data);
-                        });
-                    }
-
-                    if (me.options.reverse) {
-                        legendItems.reverse();
-                    }
-
-                    me.legendItems = legendItems;
-                },
-                afterBuildLabels: noop,
-
-                //
-
-                beforeFit: noop,
-                fit: function() {
-                    var me = this;
-                    var opts = me.options;
-                    var labelOpts = opts.labels;
-                    var display = opts.display;
-
-                    var ctx = me.ctx;
-
-                    var globalDefault = defaults.global;
-                    var valueOrDefault = helpers.valueOrDefault;
-                    var fontSize = valueOrDefault(labelOpts.fontSize, globalDefault.defaultFontSize);
-                    var fontStyle = valueOrDefault(labelOpts.fontStyle, globalDefault.defaultFontStyle);
-                    var fontFamily = valueOrDefault(labelOpts.fontFamily, globalDefault.defaultFontFamily);
-                    var labelFont = helpers.fontString(fontSize, fontStyle, fontFamily);
-
-                    // Reset hit boxes
-                    var hitboxes = me.legendHitBoxes = [];
-
-                    var minSize = me.minSize;
-                    var isHorizontal = me.isHorizontal();
-
-                    if (isHorizontal) {
-                        minSize.width = me.maxWidth; // fill all the width
-                        minSize.height = display ? 10 : 0;
-                    } else {
-                        minSize.width = display ? 10 : 0;
-                        minSize.height = me.maxHeight; // fill all the height
-                    }
-
-                    // Increase sizes here
-                    if (display) {
-                        ctx.font = labelFont;
-
-                        if (isHorizontal) {
-                            // Labels
-
-                            // Width of each line of legend boxes. Labels wrap onto multiple lines when there are too many to fit on one
-                            var lineWidths = me.lineWidths = [0];
-                            var totalHeight = me.legendItems.length ? fontSize + (labelOpts.padding) : 0;
-
-                            ctx.textAlign = 'left';
-                            ctx.textBaseline = 'top';
-
-                            helpers.each(me.legendItems, function(legendItem, i) {
-                                var boxWidth = getBoxWidth(labelOpts, fontSize);
-                                var width = boxWidth + (fontSize / 2) + ctx.measureText(legendItem.text).width;
-
-                                if (lineWidths[lineWidths.length - 1] + width + labelOpts.padding >= me.width) {
-                                    totalHeight += fontSize + (labelOpts.padding);
-                                    lineWidths[lineWidths.length] = me.left;
-                                }
-
-                                // Store the hitbox width and height here. Final position will be updated in `draw`
-                                hitboxes[i] = {
-                                    left: 0,
-                                    top: 0,
-                                    width: width,
-                                    height: fontSize
-                                };
-
-                                lineWidths[lineWidths.length - 1] += width + labelOpts.padding;
-                            });
-
-                            minSize.height += totalHeight;
-
-                        } else {
-                            var vPadding = labelOpts.padding;
-                            var columnWidths = me.columnWidths = [];
-                            var totalWidth = labelOpts.padding;
-                            var currentColWidth = 0;
-                            var currentColHeight = 0;
-                            var itemHeight = fontSize + vPadding;
-
-                            helpers.each(me.legendItems, function(legendItem, i) {
-                                var boxWidth = getBoxWidth(labelOpts, fontSize);
-                                var itemWidth = boxWidth + (fontSize / 2) + ctx.measureText(legendItem.text).width;
-
-                                // If too tall, go to new column
-                                if (currentColHeight + itemHeight > minSize.height) {
-                                    totalWidth += currentColWidth + labelOpts.padding;
-                                    columnWidths.push(currentColWidth); // previous column width
-
-                                    currentColWidth = 0;
-                                    currentColHeight = 0;
-                                }
-
-                                // Get max width
-                                currentColWidth = Math.max(currentColWidth, itemWidth);
-                                currentColHeight += itemHeight;
-
-                                // Store the hitbox width and height here. Final position will be updated in `draw`
-                                hitboxes[i] = {
-                                    left: 0,
-                                    top: 0,
-                                    width: itemWidth,
-                                    height: fontSize
-                                };
-                            });
-
-                            totalWidth += currentColWidth;
-                            columnWidths.push(currentColWidth);
-                            minSize.width += totalWidth;
-                        }
-                    }
-
-                    me.width = minSize.width;
-                    me.height = minSize.height;
-                },
-                afterFit: noop,
-
-                // Shared Methods
-                isHorizontal: function() {
-                    return this.options.position === 'top' || this.options.position === 'bottom';
-                },
-
-                // Actually draw the legend on the canvas
-                draw: function() {
-                    var me = this;
-                    var opts = me.options;
-                    var labelOpts = opts.labels;
-                    var globalDefault = defaults.global;
-                    var lineDefault = globalDefault.elements.line;
-                    var legendWidth = me.width;
-                    var lineWidths = me.lineWidths;
-
-                    if (opts.display) {
-                        var ctx = me.ctx;
-                        var valueOrDefault = helpers.valueOrDefault;
-                        var fontColor = valueOrDefault(labelOpts.fontColor, globalDefault.defaultFontColor);
-                        var fontSize = valueOrDefault(labelOpts.fontSize, globalDefault.defaultFontSize);
-                        var fontStyle = valueOrDefault(labelOpts.fontStyle, globalDefault.defaultFontStyle);
-                        var fontFamily = valueOrDefault(labelOpts.fontFamily, globalDefault.defaultFontFamily);
-                        var labelFont = helpers.fontString(fontSize, fontStyle, fontFamily);
-                        var cursor;
-
-                        // Canvas setup
-                        ctx.textAlign = 'left';
-                        ctx.textBaseline = 'middle';
-                        ctx.lineWidth = 0.5;
-                        ctx.strokeStyle = fontColor; // for strikethrough effect
-                        ctx.fillStyle = fontColor; // render in correct colour
-                        ctx.font = labelFont;
-
-                        var boxWidth = getBoxWidth(labelOpts, fontSize);
-                        var hitboxes = me.legendHitBoxes;
-
-                        // current position
-                        var drawLegendBox = function(x, y, legendItem) {
-                            if (isNaN(boxWidth) || boxWidth <= 0) {
-                                return;
-                            }
-
-                            // Set the ctx for the box
-                            ctx.save();
-
-                            ctx.fillStyle = valueOrDefault(legendItem.fillStyle, globalDefault.defaultColor);
-                            ctx.lineCap = valueOrDefault(legendItem.lineCap, lineDefault.borderCapStyle);
-                            ctx.lineDashOffset = valueOrDefault(legendItem.lineDashOffset, lineDefault.borderDashOffset);
-                            ctx.lineJoin = valueOrDefault(legendItem.lineJoin, lineDefault.borderJoinStyle);
-                            ctx.lineWidth = valueOrDefault(legendItem.lineWidth, lineDefault.borderWidth);
-                            ctx.strokeStyle = valueOrDefault(legendItem.strokeStyle, globalDefault.defaultColor);
-                            var isLineWidthZero = (valueOrDefault(legendItem.lineWidth, lineDefault.borderWidth) === 0);
-
-                            if (ctx.setLineDash) {
-                                // IE 9 and 10 do not support line dash
-                                ctx.setLineDash(valueOrDefault(legendItem.lineDash, lineDefault.borderDash));
-                            }
-
-                            if (opts.labels && opts.labels.usePointStyle) {
-                                // Recalculate x and y for drawPoint() because its expecting
-                                // x and y to be center of figure (instead of top left)
-                                var radius = fontSize * Math.SQRT2 / 2;
-                                var offSet = radius / Math.SQRT2;
-                                var centerX = x + offSet;
-                                var centerY = y + offSet;
-
-                                // Draw pointStyle as legend symbol
-                                helpers.canvas.drawPoint(ctx, legendItem.pointStyle, radius, centerX, centerY);
-                            } else {
-                                // Draw box as legend symbol
-                                if (!isLineWidthZero) {
-                                    ctx.strokeRect(x, y, boxWidth, fontSize);
-                                }
-                                ctx.fillRect(x, y, boxWidth, fontSize);
-                            }
-
-                            ctx.restore();
-                        };
-                        var fillText = function(x, y, legendItem, textWidth) {
-                            var halfFontSize = fontSize / 2;
-                            var xLeft = boxWidth + halfFontSize + x;
-                            var yMiddle = y + halfFontSize;
-
-                            ctx.fillText(legendItem.text, xLeft, yMiddle);
-
-                            if (legendItem.hidden) {
-                                // Strikethrough the text if hidden
-                                ctx.beginPath();
-                                ctx.lineWidth = 2;
-                                ctx.moveTo(xLeft, yMiddle);
-                                ctx.lineTo(xLeft + textWidth, yMiddle);
-                                ctx.stroke();
-                            }
-                        };
-
-                        // Horizontal
-                        var isHorizontal = me.isHorizontal();
-                        if (isHorizontal) {
-                            cursor = {
-                                x: me.left + ((legendWidth - lineWidths[0]) / 2),
-                                y: me.top + labelOpts.padding,
-                                line: 0
-                            };
-                        } else {
-                            cursor = {
-                                x: me.left + labelOpts.padding,
-                                y: me.top + labelOpts.padding,
-                                line: 0
-                            };
-                        }
-
-                        var itemHeight = fontSize + labelOpts.padding;
-                        helpers.each(me.legendItems, function(legendItem, i) {
-                            var textWidth = ctx.measureText(legendItem.text).width;
-                            var width = boxWidth + (fontSize / 2) + textWidth;
-                            var x = cursor.x;
-                            var y = cursor.y;
-
-                            if (isHorizontal) {
-                                if (x + width >= legendWidth) {
-                                    y = cursor.y += itemHeight;
-                                    cursor.line++;
-                                    x = cursor.x = me.left + ((legendWidth - lineWidths[cursor.line]) / 2);
-                                }
-                            } else if (y + itemHeight > me.bottom) {
-                                x = cursor.x = x + me.columnWidths[cursor.line] + labelOpts.padding;
-                                y = cursor.y = me.top + labelOpts.padding;
-                                cursor.line++;
-                            }
-
-                            drawLegendBox(x, y, legendItem);
-
-                            hitboxes[i].left = x;
-                            hitboxes[i].top = y;
-
-                            // Fill the actual label
-                            fillText(x, y, legendItem, textWidth);
-
-                            if (isHorizontal) {
-                                cursor.x += width + (labelOpts.padding);
-                            } else {
-                                cursor.y += itemHeight;
-                            }
-
-                        });
-                    }
-                },
-
-                /**
-                 * Handle an event
-                 * @private
-                 * @param {IEvent} event - The event to handle
-                 * @return {Boolean} true if a change occured
-                 */
-                handleEvent: function(e) {
-                    var me = this;
-                    var opts = me.options;
-                    var type = e.type === 'mouseup' ? 'click' : e.type;
-                    var changed = false;
-
-                    if (type === 'mousemove') {
-                        if (!opts.onHover) {
-                            return;
-                        }
-                    } else if (type === 'click') {
-                        if (!opts.onClick) {
-                            return;
-                        }
-                    } else {
-                        return;
-                    }
-
-                    // Chart event already has relative position in it
-                    var x = e.x;
-                    var y = e.y;
-
-                    if (x >= me.left && x <= me.right && y >= me.top && y <= me.bottom) {
-                        // See if we are touching one of the dataset boxes
-                        var lh = me.legendHitBoxes;
-                        for (var i = 0; i < lh.length; ++i) {
-                            var hitBox = lh[i];
-
-                            if (x >= hitBox.left && x <= hitBox.left + hitBox.width && y >= hitBox.top && y <= hitBox.top + hitBox.height) {
-                                // Touching an element
-                                if (type === 'click') {
-                                    // use e.native for backwards compatibility
-                                    opts.onClick.call(me, e.native, me.legendItems[i]);
-                                    changed = true;
-                                    break;
-                                } else if (type === 'mousemove') {
-                                    // use e.native for backwards compatibility
-                                    opts.onHover.call(me, e.native, me.legendItems[i]);
-                                    changed = true;
-                                    break;
-                                }
-                            }
-                        }
-                    }
-
-                    return changed;
-                }
-            });
-
-            function createNewLegendAndAttach(chart, legendOpts) {
-                var legend = new Chart.Legend({
-                    ctx: chart.ctx,
-                    options: legendOpts,
-                    chart: chart
-                });
-
-                layout.configure(chart, legend, legendOpts);
-                layout.addBox(chart, legend);
-                chart.legend = legend;
-            }
-
-            return {
-                id: 'legend',
-
-                beforeInit: function(chart) {
-                    var legendOpts = chart.options.legend;
-
-                    if (legendOpts) {
-                        createNewLegendAndAttach(chart, legendOpts);
-                    }
-                },
-
-                beforeUpdate: function(chart) {
-                    var legendOpts = chart.options.legend;
-                    var legend = chart.legend;
-
-                    if (legendOpts) {
-                        helpers.mergeIf(legendOpts, defaults.global.legend);
-
-                        if (legend) {
-                            layout.configure(chart, legend, legendOpts);
-                            legend.options = legendOpts;
-                        } else {
-                            createNewLegendAndAttach(chart, legendOpts);
-                        }
-                    } else if (legend) {
-                        layout.removeBox(chart, legend);
-                        delete chart.legend;
-                    }
-                },
-
-                afterEvent: function(chart, e) {
-                    var legend = chart.legend;
-                    if (legend) {
-                        legend.handleEvent(e);
-                    }
-                }
-            };
-        };
-
-    },{ "25":25,"26":26,"45":45 }],51:[function(require,module,exports){
-        'use strict';
-
-        var defaults = require(25);
-        var Element = require(26);
-        var helpers = require(45);
-
-        defaults._set('global', {
-            title: {
-                display: false,
-                fontStyle: 'bold',
-                fullWidth: true,
-                lineHeight: 1.2,
-                padding: 10,
-                position: 'top',
-                text: '',
-                weight: 2000         // by default greater than legend (1000) to be above
-            }
-        });
-
-        module.exports = function(Chart) {
-
-            var layout = Chart.layoutService;
-            var noop = helpers.noop;
-
-            Chart.Title = Element.extend({
-                initialize: function(config) {
-                    var me = this;
-                    helpers.extend(me, config);
-
-                    // Contains hit boxes for each dataset (in dataset order)
-                    me.legendHitBoxes = [];
-                },
-
-                // These methods are ordered by lifecycle. Utilities then follow.
-
-                beforeUpdate: noop,
-                update: function(maxWidth, maxHeight, margins) {
-                    var me = this;
-
-                    // Update Lifecycle - Probably don't want to ever extend or overwrite this function ;)
-                    me.beforeUpdate();
-
-                    // Absorb the master measurements
-                    me.maxWidth = maxWidth;
-                    me.maxHeight = maxHeight;
-                    me.margins = margins;
-
-                    // Dimensions
-                    me.beforeSetDimensions();
-                    me.setDimensions();
-                    me.afterSetDimensions();
-                    // Labels
-                    me.beforeBuildLabels();
-                    me.buildLabels();
-                    me.afterBuildLabels();
-
-                    // Fit
-                    me.beforeFit();
-                    me.fit();
-                    me.afterFit();
-                    //
-                    me.afterUpdate();
-
-                    return me.minSize;
-
-                },
-                afterUpdate: noop,
-
-                //
-
-                beforeSetDimensions: noop,
-                setDimensions: function() {
-                    var me = this;
-                    // Set the unconstrained dimension before label rotation
-                    if (me.isHorizontal()) {
-                        // Reset position before calculating rotation
-                        me.width = me.maxWidth;
-                        me.left = 0;
-                        me.right = me.width;
-                    } else {
-                        me.height = me.maxHeight;
-
-                        // Reset position before calculating rotation
-                        me.top = 0;
-                        me.bottom = me.height;
-                    }
-
-                    // Reset padding
-                    me.paddingLeft = 0;
-                    me.paddingTop = 0;
-                    me.paddingRight = 0;
-                    me.paddingBottom = 0;
-
-                    // Reset minSize
-                    me.minSize = {
-                        width: 0,
-                        height: 0
-                    };
-                },
-                afterSetDimensions: noop,
-
-                //
-
-                beforeBuildLabels: noop,
-                buildLabels: noop,
-                afterBuildLabels: noop,
-
-                //
-
-                beforeFit: noop,
-                fit: function() {
-                    var me = this;
-                    var valueOrDefault = helpers.valueOrDefault;
-                    var opts = me.options;
-                    var display = opts.display;
-                    var fontSize = valueOrDefault(opts.fontSize, defaults.global.defaultFontSize);
-                    var minSize = me.minSize;
-                    var lineCount = helpers.isArray(opts.text) ? opts.text.length : 1;
-                    var lineHeight = helpers.options.toLineHeight(opts.lineHeight, fontSize);
-                    var textSize = display ? (lineCount * lineHeight) + (opts.padding * 2) : 0;
-
-                    if (me.isHorizontal()) {
-                        minSize.width = me.maxWidth; // fill all the width
-                        minSize.height = textSize;
-                    } else {
-                        minSize.width = textSize;
-                        minSize.height = me.maxHeight; // fill all the height
-                    }
-
-                    me.width = minSize.width;
-                    me.height = minSize.height;
-
-                },
-                afterFit: noop,
-
-                // Shared Methods
-                isHorizontal: function() {
-                    var pos = this.options.position;
-                    return pos === 'top' || pos === 'bottom';
-                },
-
-                // Actually draw the title block on the canvas
-                draw: function() {
-                    var me = this;
-                    var ctx = me.ctx;
-                    var valueOrDefault = helpers.valueOrDefault;
-                    var opts = me.options;
-                    var globalDefaults = defaults.global;
-
-                    if (opts.display) {
-                        var fontSize = valueOrDefault(opts.fontSize, globalDefaults.defaultFontSize);
-                        var fontStyle = valueOrDefault(opts.fontStyle, globalDefaults.defaultFontStyle);
-                        var fontFamily = valueOrDefault(opts.fontFamily, globalDefaults.defaultFontFamily);
-                        var titleFont = helpers.fontString(fontSize, fontStyle, fontFamily);
-                        var lineHeight = helpers.options.toLineHeight(opts.lineHeight, fontSize);
-                        var offset = lineHeight / 2 + opts.padding;
-                        var rotation = 0;
-                        var top = me.top;
-                        var left = me.left;
-                        var bottom = me.bottom;
-                        var right = me.right;
-                        var maxWidth, titleX, titleY;
-
-                        ctx.fillStyle = valueOrDefault(opts.fontColor, globalDefaults.defaultFontColor); // render in correct colour
-                        ctx.font = titleFont;
-
-                        // Horizontal
-                        if (me.isHorizontal()) {
-                            titleX = left + ((right - left) / 2); // midpoint of the width
-                            titleY = top + offset;
-                            maxWidth = right - left;
-                        } else {
-                            titleX = opts.position === 'left' ? left + offset : right - offset;
-                            titleY = top + ((bottom - top) / 2);
-                            maxWidth = bottom - top;
-                            rotation = Math.PI * (opts.position === 'left' ? -0.5 : 0.5);
-                        }
-
-                        ctx.save();
-                        ctx.translate(titleX, titleY);
-                        ctx.rotate(rotation);
-                        ctx.textAlign = 'center';
-                        ctx.textBaseline = 'middle';
-
-                        var text = opts.text;
-                        if (helpers.isArray(text)) {
-                            var y = 0;
-                            for (var i = 0; i < text.length; ++i) {
-                                ctx.fillText(text[i], 0, y, maxWidth);
-                                y += lineHeight;
-                            }
-                        } else {
-                            ctx.fillText(text, 0, 0, maxWidth);
-                        }
-
-                        ctx.restore();
-                    }
-                }
-            });
-
-            function createNewTitleBlockAndAttach(chart, titleOpts) {
-                var title = new Chart.Title({
-                    ctx: chart.ctx,
-                    options: titleOpts,
-                    chart: chart
-                });
-
-                layout.configure(chart, title, titleOpts);
-                layout.addBox(chart, title);
-                chart.titleBlock = title;
-            }
-
-            return {
-                id: 'title',
-
-                beforeInit: function(chart) {
-                    var titleOpts = chart.options.title;
-
-                    if (titleOpts) {
-                        createNewTitleBlockAndAttach(chart, titleOpts);
-                    }
-                },
-
-                beforeUpdate: function(chart) {
-                    var titleOpts = chart.options.title;
-                    var titleBlock = chart.titleBlock;
-
-                    if (titleOpts) {
-                        helpers.mergeIf(titleOpts, defaults.global.title);
-
-                        if (titleBlock) {
-                            layout.configure(chart, titleBlock, titleOpts);
-                            titleBlock.options = titleOpts;
-                        } else {
-                            createNewTitleBlockAndAttach(chart, titleOpts);
-                        }
-                    } else if (titleBlock) {
-                        Chart.layoutService.removeBox(chart, titleBlock);
-                        delete chart.titleBlock;
-                    }
-                }
-            };
-        };
-
-    },{ "25":25,"26":26,"45":45 }],52:[function(require,module,exports){
-        'use strict';
-
-        module.exports = function(Chart) {
-
-            // Default config for a category scale
-            var defaultConfig = {
-                position: 'bottom'
-            };
-
-            var DatasetScale = Chart.Scale.extend({
-                /**
-                 * Internal function to get the correct labels. If data.xLabels or data.yLabels are defined, use those
-                 * else fall back to data.labels
-                 * @private
-                 */
-                getLabels: function() {
-                    var data = this.chart.data;
-                    return this.options.labels || (this.isHorizontal() ? data.xLabels : data.yLabels) || data.labels;
-                },
-
-                determineDataLimits: function() {
-                    var me = this;
-                    var labels = me.getLabels();
-                    me.minIndex = 0;
-                    me.maxIndex = labels.length - 1;
-                    var findIndex;
-
-                    if (me.options.ticks.min !== undefined) {
-                        // user specified min value
-                        findIndex = labels.indexOf(me.options.ticks.min);
-                        me.minIndex = findIndex !== -1 ? findIndex : me.minIndex;
-                    }
-
-                    if (me.options.ticks.max !== undefined) {
-                        // user specified max value
-                        findIndex = labels.indexOf(me.options.ticks.max);
-                        me.maxIndex = findIndex !== -1 ? findIndex : me.maxIndex;
-                    }
-
-                    me.min = labels[me.minIndex];
-                    me.max = labels[me.maxIndex];
-                },
-
-                buildTicks: function() {
-                    var me = this;
-                    var labels = me.getLabels();
-                    // If we are viewing some subset of labels, slice the original array
-                    me.ticks = (me.minIndex === 0 && me.maxIndex === labels.length - 1) ? labels : labels.slice(me.minIndex, me.maxIndex + 1);
-                },
-
-                getLabelForIndex: function(index, datasetIndex) {
-                    var me = this;
-                    var data = me.chart.data;
-                    var isHorizontal = me.isHorizontal();
-
-                    if (data.yLabels && !isHorizontal) {
-                        return me.getRightValue(data.datasets[datasetIndex].data[index]);
-                    }
-                    return me.ticks[index - me.minIndex];
-                },
-
-                // Used to get data value locations.  Value can either be an index or a numerical value
-                getPixelForValue: function(value, index) {
-                    var me = this;
-                    var offset = me.options.offset;
-                    // 1 is added because we need the length but we have the indexes
-                    var offsetAmt = Math.max((me.maxIndex + 1 - me.minIndex - (offset ? 0 : 1)), 1);
-
-                    // If value is a data object, then index is the index in the data array,
-                    // not the index of the scale. We need to change that.
-                    var valueCategory;
-                    if (value !== undefined && value !== null) {
-                        valueCategory = me.isHorizontal() ? value.x : value.y;
-                    }
-                    if (valueCategory !== undefined || (value !== undefined && isNaN(index))) {
-                        var labels = me.getLabels();
-                        value = valueCategory || value;
-                        var idx = labels.indexOf(value);
-                        index = idx !== -1 ? idx : index;
-                    }
-
-                    if (me.isHorizontal()) {
-                        var valueWidth = me.width / offsetAmt;
-                        var widthOffset = (valueWidth * (index - me.minIndex));
-
-                        if (offset) {
-                            widthOffset += (valueWidth / 2);
-                        }
-
-                        return me.left + Math.round(widthOffset);
-                    }
-                    var valueHeight = me.height / offsetAmt;
-                    var heightOffset = (valueHeight * (index - me.minIndex));
-
-                    if (offset) {
-                        heightOffset += (valueHeight / 2);
-                    }
-
-                    return me.top + Math.round(heightOffset);
-                },
-                getPixelForTick: function(index) {
-                    return this.getPixelForValue(this.ticks[index], index + this.minIndex, null);
-                },
-                getValueForPixel: function(pixel) {
-                    var me = this;
-                    var offset = me.options.offset;
-                    var value;
-                    var offsetAmt = Math.max((me._ticks.length - (offset ? 0 : 1)), 1);
-                    var horz = me.isHorizontal();
-                    var valueDimension = (horz ? me.width : me.height) / offsetAmt;
-
-                    pixel -= horz ? me.left : me.top;
-
-                    if (offset) {
-                        pixel -= (valueDimension / 2);
-                    }
-
-                    if (pixel <= 0) {
-                        value = 0;
-                    } else {
-                        value = Math.round(pixel / valueDimension);
-                    }
-
-                    return value + me.minIndex;
-                },
-                getBasePixel: function() {
-                    return this.bottom;
-                }
-            });
-
-            Chart.scaleService.registerScaleType('category', DatasetScale, defaultConfig);
-
-        };
-
-    },{}],53:[function(require,module,exports){
-        'use strict';
-
-        var defaults = require(25);
-        var helpers = require(45);
-        var Ticks = require(34);
-
-        module.exports = function(Chart) {
-
-            var defaultConfig = {
-                position: 'left',
-                ticks: {
-                    callback: Ticks.formatters.linear
-                }
-            };
-
-            var LinearScale = Chart.LinearScaleBase.extend({
-
-                determineDataLimits: function() {
-                    var me = this;
-                    var opts = me.options;
-                    var chart = me.chart;
-                    var data = chart.data;
-                    var datasets = data.datasets;
-                    var isHorizontal = me.isHorizontal();
-                    var DEFAULT_MIN = 0;
-                    var DEFAULT_MAX = 1;
-
-                    function IDMatches(meta) {
-                        return isHorizontal ? meta.xAxisID === me.id : meta.yAxisID === me.id;
-                    }
-
-                    // First Calculate the range
-                    me.min = null;
-                    me.max = null;
-
-                    var hasStacks = opts.stacked;
-                    if (hasStacks === undefined) {
-                        helpers.each(datasets, function(dataset, datasetIndex) {
-                            if (hasStacks) {
-                                return;
-                            }
-
-                            var meta = chart.getDatasetMeta(datasetIndex);
-                            if (chart.isDatasetVisible(datasetIndex) && IDMatches(meta) &&
-                                    meta.stack !== undefined) {
-                                hasStacks = true;
-                            }
-                        });
-                    }
-
-                    if (opts.stacked || hasStacks) {
-                        var valuesPerStack = {};
-
-                        helpers.each(datasets, function(dataset, datasetIndex) {
-                            var meta = chart.getDatasetMeta(datasetIndex);
-                            var key = [
-                                meta.type,
-                                // we have a separate stack for stack=undefined datasets when the opts.stacked is undefined
-                                ((opts.stacked === undefined && meta.stack === undefined) ? datasetIndex : ''),
-                                meta.stack
-                            ].join('.');
-
-                            if (valuesPerStack[key] === undefined) {
-                                valuesPerStack[key] = {
-                                    positiveValues: [],
-                                    negativeValues: []
-                                };
-                            }
-
-                            // Store these per type
-                            var positiveValues = valuesPerStack[key].positiveValues;
-                            var negativeValues = valuesPerStack[key].negativeValues;
-
-                            if (chart.isDatasetVisible(datasetIndex) && IDMatches(meta)) {
-                                helpers.each(dataset.data, function(rawValue, index) {
-                                    var value = +me.getRightValue(rawValue);
-                                    if (isNaN(value) || meta.data[index].hidden) {
-                                        return;
-                                    }
-
-                                    positiveValues[index] = positiveValues[index] || 0;
-                                    negativeValues[index] = negativeValues[index] || 0;
-
-                                    if (opts.relativePoints) {
-                                        positiveValues[index] = 100;
-                                    } else if (value < 0) {
-                                        negativeValues[index] += value;
-                                    } else {
-                                        positiveValues[index] += value;
-                                    }
-                                });
-                            }
-                        });
-
-                        helpers.each(valuesPerStack, function(valuesForType) {
-                            var values = valuesForType.positiveValues.concat(valuesForType.negativeValues);
-                            var minVal = helpers.min(values);
-                            var maxVal = helpers.max(values);
-                            me.min = me.min === null ? minVal : Math.min(me.min, minVal);
-                            me.max = me.max === null ? maxVal : Math.max(me.max, maxVal);
-                        });
-
-                    } else {
-                        helpers.each(datasets, function(dataset, datasetIndex) {
-                            var meta = chart.getDatasetMeta(datasetIndex);
-                            if (chart.isDatasetVisible(datasetIndex) && IDMatches(meta)) {
-                                helpers.each(dataset.data, function(rawValue, index) {
-                                    var value = +me.getRightValue(rawValue);
-                                    if (isNaN(value) || meta.data[index].hidden) {
-                                        return;
-                                    }
-
-                                    if (me.min === null) {
-                                        me.min = value;
-                                    } else if (value < me.min) {
-                                        me.min = value;
-                                    }
-
-                                    if (me.max === null) {
-                                        me.max = value;
-                                    } else if (value > me.max) {
-                                        me.max = value;
-                                    }
-                                });
-                            }
-                        });
-                    }
-
-                    me.min = isFinite(me.min) && !isNaN(me.min) ? me.min : DEFAULT_MIN;
-                    me.max = isFinite(me.max) && !isNaN(me.max) ? me.max : DEFAULT_MAX;
-
-                    // Common base implementation to handle ticks.min, ticks.max, ticks.beginAtZero
-                    this.handleTickRangeOptions();
-                },
-                getTickLimit: function() {
-                    var maxTicks;
-                    var me = this;
-                    var tickOpts = me.options.ticks;
-
-                    if (me.isHorizontal()) {
-                        maxTicks = Math.min(tickOpts.maxTicksLimit ? tickOpts.maxTicksLimit : 11, Math.ceil(me.width / 50));
-                    } else {
-                        // The factor of 2 used to scale the font size has been experimentally determined.
-                        var tickFontSize = helpers.valueOrDefault(tickOpts.fontSize, defaults.global.defaultFontSize);
-                        maxTicks = Math.min(tickOpts.maxTicksLimit ? tickOpts.maxTicksLimit : 11, Math.ceil(me.height / (2 * tickFontSize)));
-                    }
-
-                    return maxTicks;
-                },
-                // Called after the ticks are built. We need
-                handleDirectionalChanges: function() {
-                    if (!this.isHorizontal()) {
-                        // We are in a vertical orientation. The top value is the highest. So reverse the array
-                        this.ticks.reverse();
-                    }
-                },
-                getLabelForIndex: function(index, datasetIndex) {
-                    return +this.getRightValue(this.chart.data.datasets[datasetIndex].data[index]);
-                },
-                // Utils
-                getPixelForValue: function(value) {
-                    // This must be called after fit has been run so that
-                    // this.left, this.top, this.right, and this.bottom have been defined
-                    var me = this;
-                    var start = me.start;
-
-                    var rightValue = +me.getRightValue(value);
-                    var pixel;
-                    var range = me.end - start;
-
-                    if (me.isHorizontal()) {
-                        pixel = me.left + (me.width / range * (rightValue - start));
-                        return Math.round(pixel);
-                    }
-
-                    pixel = me.bottom - (me.height / range * (rightValue - start));
-                    return Math.round(pixel);
-                },
-                getValueForPixel: function(pixel) {
-                    var me = this;
-                    var isHorizontal = me.isHorizontal();
-                    var innerDimension = isHorizontal ? me.width : me.height;
-                    var offset = (isHorizontal ? pixel - me.left : me.bottom - pixel) / innerDimension;
-                    return me.start + ((me.end - me.start) * offset);
-                },
-                getPixelForTick: function(index) {
-                    return this.getPixelForValue(this.ticksAsNumbers[index]);
-                }
-            });
-            Chart.scaleService.registerScaleType('linear', LinearScale, defaultConfig);
-
-        };
-
-    },{ "25":25,"34":34,"45":45 }],54:[function(require,module,exports){
-        'use strict';
-
-        var helpers = require(45);
-        var Ticks = require(34);
-
-        module.exports = function(Chart) {
-
-            var noop = helpers.noop;
-
-            Chart.LinearScaleBase = Chart.Scale.extend({
-                getRightValue: function(value) {
-                    if (typeof value === 'string') {
-                        return +value;
-                    }
-                    return Chart.Scale.prototype.getRightValue.call(this, value);
-                },
-
-                handleTickRangeOptions: function() {
-                    var me = this;
-                    var opts = me.options;
-                    var tickOpts = opts.ticks;
-
-                    // If we are forcing it to begin at 0, but 0 will already be rendered on the chart,
-                    // do nothing since that would make the chart weird. If the user really wants a weird chart
-                    // axis, they can manually override it
-                    if (tickOpts.beginAtZero) {
-                        var minSign = helpers.sign(me.min);
-                        var maxSign = helpers.sign(me.max);
-
-                        if (minSign < 0 && maxSign < 0) {
-                            // move the top up to 0
-                            me.max = 0;
-                        } else if (minSign > 0 && maxSign > 0) {
-                            // move the bottom down to 0
-                            me.min = 0;
-                        }
-                    }
-
-                    var setMin = tickOpts.min !== undefined || tickOpts.suggestedMin !== undefined;
-                    var setMax = tickOpts.max !== undefined || tickOpts.suggestedMax !== undefined;
-
-                    if (tickOpts.min !== undefined) {
-                        me.min = tickOpts.min;
-                    } else if (tickOpts.suggestedMin !== undefined) {
-                        if (me.min === null) {
-                            me.min = tickOpts.suggestedMin;
-                        } else {
-                            me.min = Math.min(me.min, tickOpts.suggestedMin);
-                        }
-                    }
-
-                    if (tickOpts.max !== undefined) {
-                        me.max = tickOpts.max;
-                    } else if (tickOpts.suggestedMax !== undefined) {
-                        if (me.max === null) {
-                            me.max = tickOpts.suggestedMax;
-                        } else {
-                            me.max = Math.max(me.max, tickOpts.suggestedMax);
-                        }
-                    }
-
-                    if (setMin !== setMax) {
-                        // We set the min or the max but not both.
-                        // So ensure that our range is good
-                        // Inverted or 0 length range can happen when
-                        // ticks.min is set, and no datasets are visible
-                        if (me.min >= me.max) {
-                            if (setMin) {
-                                me.max = me.min + 1;
-                            } else {
-                                me.min = me.max - 1;
-                            }
-                        }
-                    }
-
-                    if (me.min === me.max) {
-                        me.max++;
-
-                        if (!tickOpts.beginAtZero) {
-                            me.min--;
-                        }
-                    }
-                },
-                getTickLimit: noop,
-                handleDirectionalChanges: noop,
-
-                buildTicks: function() {
-                    var me = this;
-                    var opts = me.options;
-                    var tickOpts = opts.ticks;
-
-                    // Figure out what the max number of ticks we can support it is based on the size of
-                    // the axis area. For now, we say that the minimum tick spacing in pixels must be 50
-                    // We also limit the maximum number of ticks to 11 which gives a nice 10 squares on
-                    // the graph. Make sure we always have at least 2 ticks
-                    var maxTicks = me.getTickLimit();
-                    maxTicks = Math.max(2, maxTicks);
-
-                    var numericGeneratorOptions = {
-                        maxTicks: maxTicks,
-                        min: tickOpts.min,
-                        max: tickOpts.max,
-                        stepSize: helpers.valueOrDefault(tickOpts.fixedStepSize, tickOpts.stepSize)
-                    };
-                    var ticks = me.ticks = Ticks.generators.linear(numericGeneratorOptions, me);
-
-                    me.handleDirectionalChanges();
-
-                    // At this point, we need to update our max and min given the tick values since we have expanded the
-                    // range of the scale
-                    me.max = helpers.max(ticks);
-                    me.min = helpers.min(ticks);
-
-                    if (tickOpts.reverse) {
-                        ticks.reverse();
-
-                        me.start = me.max;
-                        me.end = me.min;
-                    } else {
-                        me.start = me.min;
-                        me.end = me.max;
-                    }
-                },
-                convertTicksToLabels: function() {
-                    var me = this;
-                    me.ticksAsNumbers = me.ticks.slice();
-                    me.zeroLineIndex = me.ticks.indexOf(0);
-
-                    Chart.Scale.prototype.convertTicksToLabels.call(me);
-                }
-            });
-        };
-
-    },{ "34":34,"45":45 }],55:[function(require,module,exports){
-        'use strict';
-
-        var helpers = require(45);
-        var Ticks = require(34);
-
-        module.exports = function(Chart) {
-
-            var defaultConfig = {
-                position: 'left',
-
-                // label settings
-                ticks: {
-                    callback: Ticks.formatters.logarithmic
-                }
-            };
-
-            var LogarithmicScale = Chart.Scale.extend({
-                determineDataLimits: function() {
-                    var me = this;
-                    var opts = me.options;
-                    var tickOpts = opts.ticks;
-                    var chart = me.chart;
-                    var data = chart.data;
-                    var datasets = data.datasets;
-                    var valueOrDefault = helpers.valueOrDefault;
-                    var isHorizontal = me.isHorizontal();
-                    function IDMatches(meta) {
-                        return isHorizontal ? meta.xAxisID === me.id : meta.yAxisID === me.id;
-                    }
-
-                    // Calculate Range
-                    me.min = null;
-                    me.max = null;
-                    me.minNotZero = null;
-
-                    var hasStacks = opts.stacked;
-                    if (hasStacks === undefined) {
-                        helpers.each(datasets, function(dataset, datasetIndex) {
-                            if (hasStacks) {
-                                return;
-                            }
-
-                            var meta = chart.getDatasetMeta(datasetIndex);
-                            if (chart.isDatasetVisible(datasetIndex) && IDMatches(meta) &&
-                                    meta.stack !== undefined) {
-                                hasStacks = true;
-                            }
-                        });
-                    }
-
-                    if (opts.stacked || hasStacks) {
-                        var valuesPerStack = {};
-
-                        helpers.each(datasets, function(dataset, datasetIndex) {
-                            var meta = chart.getDatasetMeta(datasetIndex);
-                            var key = [
-                                meta.type,
-                                // we have a separate stack for stack=undefined datasets when the opts.stacked is undefined
-                                ((opts.stacked === undefined && meta.stack === undefined) ? datasetIndex : ''),
-                                meta.stack
-                            ].join('.');
-
-                            if (chart.isDatasetVisible(datasetIndex) && IDMatches(meta)) {
-                                if (valuesPerStack[key] === undefined) {
-                                    valuesPerStack[key] = [];
-                                }
-
-                                helpers.each(dataset.data, function(rawValue, index) {
-                                    var values = valuesPerStack[key];
-                                    var value = +me.getRightValue(rawValue);
-                                    if (isNaN(value) || meta.data[index].hidden) {
-                                        return;
-                                    }
-
-                                    values[index] = values[index] || 0;
-
-                                    if (opts.relativePoints) {
-                                        values[index] = 100;
-                                    } else {
-                                        // Don't need to split positive and negative since the log scale can't handle a 0 crossing
-                                        values[index] += value;
-                                    }
-                                });
-                            }
-                        });
-
-                        helpers.each(valuesPerStack, function(valuesForType) {
-                            var minVal = helpers.min(valuesForType);
-                            var maxVal = helpers.max(valuesForType);
-                            me.min = me.min === null ? minVal : Math.min(me.min, minVal);
-                            me.max = me.max === null ? maxVal : Math.max(me.max, maxVal);
-                        });
-
-                    } else {
-                        helpers.each(datasets, function(dataset, datasetIndex) {
-                            var meta = chart.getDatasetMeta(datasetIndex);
-                            if (chart.isDatasetVisible(datasetIndex) && IDMatches(meta)) {
-                                helpers.each(dataset.data, function(rawValue, index) {
-                                    var value = +me.getRightValue(rawValue);
-                                    if (isNaN(value) || meta.data[index].hidden) {
-                                        return;
-                                    }
-
-                                    if (me.min === null) {
-                                        me.min = value;
-                                    } else if (value < me.min) {
-                                        me.min = value;
-                                    }
-
-                                    if (me.max === null) {
-                                        me.max = value;
-                                    } else if (value > me.max) {
-                                        me.max = value;
-                                    }
-
-                                    if (value !== 0 && (me.minNotZero === null || value < me.minNotZero)) {
-                                        me.minNotZero = value;
-                                    }
-                                });
-                            }
-                        });
-                    }
-
-                    me.min = valueOrDefault(tickOpts.min, me.min);
-                    me.max = valueOrDefault(tickOpts.max, me.max);
-
-                    if (me.min === me.max) {
-                        if (me.min !== 0 && me.min !== null) {
-                            me.min = Math.pow(10, Math.floor(helpers.log10(me.min)) - 1);
-                            me.max = Math.pow(10, Math.floor(helpers.log10(me.max)) + 1);
-                        } else {
-                            me.min = 1;
-                            me.max = 10;
-                        }
-                    }
-                },
-                buildTicks: function() {
-                    var me = this;
-                    var opts = me.options;
-                    var tickOpts = opts.ticks;
-
-                    var generationOptions = {
-                        min: tickOpts.min,
-                        max: tickOpts.max
-                    };
-                    var ticks = me.ticks = Ticks.generators.logarithmic(generationOptions, me);
-
-                    if (!me.isHorizontal()) {
-                        // We are in a vertical orientation. The top value is the highest. So reverse the array
-                        ticks.reverse();
-                    }
-
-                    // At this point, we need to update our max and min given the tick values since we have expanded the
-                    // range of the scale
-                    me.max = helpers.max(ticks);
-                    me.min = helpers.min(ticks);
-
-                    if (tickOpts.reverse) {
-                        ticks.reverse();
-
-                        me.start = me.max;
-                        me.end = me.min;
-                    } else {
-                        me.start = me.min;
-                        me.end = me.max;
-                    }
-                },
-                convertTicksToLabels: function() {
-                    this.tickValues = this.ticks.slice();
-
-                    Chart.Scale.prototype.convertTicksToLabels.call(this);
-                },
-                // Get the correct tooltip label
-                getLabelForIndex: function(index, datasetIndex) {
-                    return +this.getRightValue(this.chart.data.datasets[datasetIndex].data[index]);
-                },
-                getPixelForTick: function(index) {
-                    return this.getPixelForValue(this.tickValues[index]);
-                },
-                getPixelForValue: function(value) {
-                    var me = this;
-                    var start = me.start;
-                    var newVal = +me.getRightValue(value);
-                    var opts = me.options;
-                    var tickOpts = opts.ticks;
-                    var innerDimension, pixel, range;
-
-                    if (me.isHorizontal()) {
-                        range = helpers.log10(me.end) - helpers.log10(start); // todo: if start === 0
-                        if (newVal === 0) {
-                            pixel = me.left;
-                        } else {
-                            innerDimension = me.width;
-                            pixel = me.left + (innerDimension / range * (helpers.log10(newVal) - helpers.log10(start)));
-                        }
-                    } else {
-                        // Bottom - top since pixels increase downward on a screen
-                        innerDimension = me.height;
-                        if (start === 0 && !tickOpts.reverse) {
-                            range = helpers.log10(me.end) - helpers.log10(me.minNotZero);
-                            if (newVal === start) {
-                                pixel = me.bottom;
-                            } else if (newVal === me.minNotZero) {
-                                pixel = me.bottom - innerDimension * 0.02;
-                            } else {
-                                pixel = me.bottom - innerDimension * 0.02 - (innerDimension * 0.98 / range * (helpers.log10(newVal) - helpers.log10(me.minNotZero)));
-                            }
-                        } else if (me.end === 0 && tickOpts.reverse) {
-                            range = helpers.log10(me.start) - helpers.log10(me.minNotZero);
-                            if (newVal === me.end) {
-                                pixel = me.top;
-                            } else if (newVal === me.minNotZero) {
-                                pixel = me.top + innerDimension * 0.02;
-                            } else {
-                                pixel = me.top + innerDimension * 0.02 + (innerDimension * 0.98 / range * (helpers.log10(newVal) - helpers.log10(me.minNotZero)));
-                            }
-                        } else if (newVal === 0) {
-                            pixel = tickOpts.reverse ? me.top : me.bottom;
-                        } else {
-                            range = helpers.log10(me.end) - helpers.log10(start);
-                            innerDimension = me.height;
-                            pixel = me.bottom - (innerDimension / range * (helpers.log10(newVal) - helpers.log10(start)));
-                        }
-                    }
-                    return pixel;
-                },
-                getValueForPixel: function(pixel) {
-                    var me = this;
-                    var range = helpers.log10(me.end) - helpers.log10(me.start);
-                    var value, innerDimension;
-
-                    if (me.isHorizontal()) {
-                        innerDimension = me.width;
-                        value = me.start * Math.pow(10, (pixel - me.left) * range / innerDimension);
-                    } else { // todo: if start === 0
-                        innerDimension = me.height;
-                        value = Math.pow(10, (me.bottom - pixel) * range / innerDimension) / me.start;
-                    }
-                    return value;
-                }
-            });
-            Chart.scaleService.registerScaleType('logarithmic', LogarithmicScale, defaultConfig);
-
-        };
-
-    },{ "34":34,"45":45 }],56:[function(require,module,exports){
-        'use strict';
-
-        var defaults = require(25);
-        var helpers = require(45);
-        var Ticks = require(34);
-
-        module.exports = function(Chart) {
-
-            var globalDefaults = defaults.global;
-
-            var defaultConfig = {
-                display: true,
-
-                // Boolean - Whether to animate scaling the chart from the centre
-                animate: true,
-                position: 'chartArea',
-
-                angleLines: {
-                    display: true,
-                    color: 'rgba(0, 0, 0, 0.1)',
-                    lineWidth: 1
-                },
-
-                gridLines: {
-                    circular: false
-                },
-
-                // label settings
-                ticks: {
-                    // Boolean - Show a backdrop to the scale label
-                    showLabelBackdrop: true,
-
-                    // String - The colour of the label backdrop
-                    backdropColor: 'rgba(255,255,255,0.75)',
-
-                    // Number - The backdrop padding above & below the label in pixels
-                    backdropPaddingY: 2,
-
-                    // Number - The backdrop padding to the side of the label in pixels
-                    backdropPaddingX: 2,
-
-                    callback: Ticks.formatters.linear
-                },
-
-                pointLabels: {
-                    // Boolean - if true, show point labels
-                    display: true,
-
-                    // Number - Point label font size in pixels
-                    fontSize: 10,
-
-                    // Function - Used to convert point labels
-                    callback: function(label) {
-                        return label;
-                    }
-                }
-            };
-
-            function getValueCount(scale) {
-                var opts = scale.options;
-                return opts.angleLines.display || opts.pointLabels.display ? scale.chart.data.labels.length : 0;
-            }
-
-            function getPointLabelFontOptions(scale) {
-                var pointLabelOptions = scale.options.pointLabels;
-                var fontSize = helpers.valueOrDefault(pointLabelOptions.fontSize, globalDefaults.defaultFontSize);
-                var fontStyle = helpers.valueOrDefault(pointLabelOptions.fontStyle, globalDefaults.defaultFontStyle);
-                var fontFamily = helpers.valueOrDefault(pointLabelOptions.fontFamily, globalDefaults.defaultFontFamily);
-                var font = helpers.fontString(fontSize, fontStyle, fontFamily);
-
-                return {
-                    size: fontSize,
-                    style: fontStyle,
-                    family: fontFamily,
-                    font: font
-                };
-            }
-
-            function measureLabelSize(ctx, fontSize, label) {
-                if (helpers.isArray(label)) {
-                    return {
-                        w: helpers.longestText(ctx, ctx.font, label),
-                        h: (label.length * fontSize) + ((label.length - 1) * 1.5 * fontSize)
-                    };
-                }
-
-                return {
-                    w: ctx.measureText(label).width,
-                    h: fontSize
-                };
-            }
-
-            function determineLimits(angle, pos, size, min, max) {
-                if (angle === min || angle === max) {
-                    return {
-                        start: pos - (size / 2),
-                        end: pos + (size / 2)
-                    };
-                } else if (angle < min || angle > max) {
-                    return {
-                        start: pos - size - 5,
-                        end: pos
-                    };
-                }
-
-                return {
-                    start: pos,
-                    end: pos + size + 5
-                };
-            }
-
-            /**
-             * Helper function to fit a radial linear scale with point labels
-             */
-            function fitWithPointLabels(scale) {
-                /*
-		 * Right, this is really confusing and there is a lot of maths going on here
-		 * The gist of the problem is here: https://gist.github.com/nnnick/696cc9c55f4b0beb8fe9
-		 *
-		 * Reaction: https://dl.dropboxusercontent.com/u/34601363/toomuchscience.gif
-		 *
-		 * Solution:
-		 *
-		 * We assume the radius of the polygon is half the size of the canvas at first
-		 * at each index we check if the text overlaps.
-		 *
-		 * Where it does, we store that angle and that index.
-		 *
-		 * After finding the largest index and angle we calculate how much we need to remove
-		 * from the shape radius to move the point inwards by that x.
-		 *
-		 * We average the left and right distances to get the maximum shape radius that can fit in the box
-		 * along with labels.
-		 *
-		 * Once we have that, we can find the centre point for the chart, by taking the x text protrusion
-		 * on each side, removing that from the size, halving it and adding the left x protrusion width.
-		 *
-		 * This will mean we have a shape fitted to the canvas, as large as it can be with the labels
-		 * and position it in the most space efficient manner
-		 *
-		 * https://dl.dropboxusercontent.com/u/34601363/yeahscience.gif
-		 */
-
-                var plFont = getPointLabelFontOptions(scale);
-
-                // Get maximum radius of the polygon. Either half the height (minus the text width) or half the width.
-                // Use this to calculate the offset + change. - Make sure L/R protrusion is at least 0 to stop issues with centre points
-                var largestPossibleRadius = Math.min(scale.height / 2, scale.width / 2);
-                var furthestLimits = {
-                    r: scale.width,
-                    l: 0,
-                    t: scale.height,
-                    b: 0
-                };
-                var furthestAngles = {};
-                var i, textSize, pointPosition;
-
-                scale.ctx.font = plFont.font;
-                scale._pointLabelSizes = [];
-
-                var valueCount = getValueCount(scale);
-                for (i = 0; i < valueCount; i++) {
-                    pointPosition = scale.getPointPosition(i, largestPossibleRadius);
-                    textSize = measureLabelSize(scale.ctx, plFont.size, scale.pointLabels[i] || '');
-                    scale._pointLabelSizes[i] = textSize;
-
-                    // Add quarter circle to make degree 0 mean top of circle
-                    var angleRadians = scale.getIndexAngle(i);
-                    var angle = helpers.toDegrees(angleRadians) % 360;
-                    var hLimits = determineLimits(angle, pointPosition.x, textSize.w, 0, 180);
-                    var vLimits = determineLimits(angle, pointPosition.y, textSize.h, 90, 270);
-
-                    if (hLimits.start < furthestLimits.l) {
-                        furthestLimits.l = hLimits.start;
-                        furthestAngles.l = angleRadians;
-                    }
-
-                    if (hLimits.end > furthestLimits.r) {
-                        furthestLimits.r = hLimits.end;
-                        furthestAngles.r = angleRadians;
-                    }
-
-                    if (vLimits.start < furthestLimits.t) {
-                        furthestLimits.t = vLimits.start;
-                        furthestAngles.t = angleRadians;
-                    }
-
-                    if (vLimits.end > furthestLimits.b) {
-                        furthestLimits.b = vLimits.end;
-                        furthestAngles.b = angleRadians;
-                    }
-                }
-
-                scale.setReductions(largestPossibleRadius, furthestLimits, furthestAngles);
-            }
-
-            /**
-             * Helper function to fit a radial linear scale with no point labels
-             */
-            function fit(scale) {
-                var largestPossibleRadius = Math.min(scale.height / 2, scale.width / 2);
-                scale.drawingArea = Math.round(largestPossibleRadius);
-                scale.setCenterPoint(0, 0, 0, 0);
-            }
-
-            function getTextAlignForAngle(angle) {
-                if (angle === 0 || angle === 180) {
-                    return 'center';
-                } else if (angle < 180) {
-                    return 'left';
-                }
-
-                return 'right';
-            }
-
-            function fillText(ctx, text, position, fontSize) {
-                if (helpers.isArray(text)) {
-                    var y = position.y;
-                    var spacing = 1.5 * fontSize;
-
-                    for (var i = 0; i < text.length; ++i) {
-                        ctx.fillText(text[i], position.x, y);
-                        y += spacing;
-                    }
-                } else {
-                    ctx.fillText(text, position.x, position.y);
-                }
-            }
-
-            function adjustPointPositionForLabelHeight(angle, textSize, position) {
-                if (angle === 90 || angle === 270) {
-                    position.y -= (textSize.h / 2);
-                } else if (angle > 270 || angle < 90) {
-                    position.y -= textSize.h;
-                }
-            }
-
-            function drawPointLabels(scale) {
-                var ctx = scale.ctx;
-                var valueOrDefault = helpers.valueOrDefault;
-                var opts = scale.options;
-                var angleLineOpts = opts.angleLines;
-                var pointLabelOpts = opts.pointLabels;
-
-                ctx.lineWidth = angleLineOpts.lineWidth;
-                ctx.strokeStyle = angleLineOpts.color;
-
-                var outerDistance = scale.getDistanceFromCenterForValue(opts.ticks.reverse ? scale.min : scale.max);
-
-                // Point Label Font
-                var plFont = getPointLabelFontOptions(scale);
-
-                ctx.textBaseline = 'top';
-
-                for (var i = getValueCount(scale) - 1; i >= 0; i--) {
-                    if (angleLineOpts.display) {
-                        var outerPosition = scale.getPointPosition(i, outerDistance);
-                        ctx.beginPath();
-                        ctx.moveTo(scale.xCenter, scale.yCenter);
-                        ctx.lineTo(outerPosition.x, outerPosition.y);
-                        ctx.stroke();
-                        ctx.closePath();
-                    }
-
-                    if (pointLabelOpts.display) {
-                        // Extra 3px out for some label spacing
-                        var pointLabelPosition = scale.getPointPosition(i, outerDistance + 5);
-
-                        // Keep this in loop since we may support array properties here
-                        var pointLabelFontColor = valueOrDefault(pointLabelOpts.fontColor, globalDefaults.defaultFontColor);
-                        ctx.font = plFont.font;
-                        ctx.fillStyle = pointLabelFontColor;
-
-                        var angleRadians = scale.getIndexAngle(i);
-                        var angle = helpers.toDegrees(angleRadians);
-                        ctx.textAlign = getTextAlignForAngle(angle);
-                        adjustPointPositionForLabelHeight(angle, scale._pointLabelSizes[i], pointLabelPosition);
-                        fillText(ctx, scale.pointLabels[i] || '', pointLabelPosition, plFont.size);
-                    }
-                }
-            }
-
-            function drawRadiusLine(scale, gridLineOpts, radius, index) {
-                var ctx = scale.ctx;
-                ctx.strokeStyle = helpers.valueAtIndexOrDefault(gridLineOpts.color, index - 1);
-                ctx.lineWidth = helpers.valueAtIndexOrDefault(gridLineOpts.lineWidth, index - 1);
-
-                if (scale.options.gridLines.circular) {
-                    // Draw circular arcs between the points
-                    ctx.beginPath();
-                    ctx.arc(scale.xCenter, scale.yCenter, radius, 0, Math.PI * 2);
-                    ctx.closePath();
-                    ctx.stroke();
-                } else {
-                    // Draw straight lines connecting each index
-                    var valueCount = getValueCount(scale);
-
-                    if (valueCount === 0) {
-                        return;
-                    }
-
-                    ctx.beginPath();
-                    var pointPosition = scale.getPointPosition(0, radius);
-                    ctx.moveTo(pointPosition.x, pointPosition.y);
-
-                    for (var i = 1; i < valueCount; i++) {
-                        pointPosition = scale.getPointPosition(i, radius);
-                        ctx.lineTo(pointPosition.x, pointPosition.y);
-                    }
-
-                    ctx.closePath();
-                    ctx.stroke();
-                }
-            }
-
-            function numberOrZero(param) {
-                return helpers.isNumber(param) ? param : 0;
-            }
-
-            var LinearRadialScale = Chart.LinearScaleBase.extend({
-                setDimensions: function() {
-                    var me = this;
-                    var opts = me.options;
-                    var tickOpts = opts.ticks;
-                    // Set the unconstrained dimension before label rotation
-                    me.width = me.maxWidth;
-                    me.height = me.maxHeight;
-                    me.xCenter = Math.round(me.width / 2);
-                    me.yCenter = Math.round(me.height / 2);
-
-                    var minSize = helpers.min([me.height, me.width]);
-                    var tickFontSize = helpers.valueOrDefault(tickOpts.fontSize, globalDefaults.defaultFontSize);
-                    me.drawingArea = opts.display ? (minSize / 2) - (tickFontSize / 2 + tickOpts.backdropPaddingY) : (minSize / 2);
-                },
-                determineDataLimits: function() {
-                    var me = this;
-                    var chart = me.chart;
-                    var min = Number.POSITIVE_INFINITY;
-                    var max = Number.NEGATIVE_INFINITY;
-
-                    helpers.each(chart.data.datasets, function(dataset, datasetIndex) {
-                        if (chart.isDatasetVisible(datasetIndex)) {
-                            var meta = chart.getDatasetMeta(datasetIndex);
-
-                            helpers.each(dataset.data, function(rawValue, index) {
-                                var value = +me.getRightValue(rawValue);
-                                if (isNaN(value) || meta.data[index].hidden) {
-                                    return;
-                                }
-
-                                min = Math.min(value, min);
-                                max = Math.max(value, max);
-                            });
-                        }
-                    });
-
-                    me.min = (min === Number.POSITIVE_INFINITY ? 0 : min);
-                    me.max = (max === Number.NEGATIVE_INFINITY ? 0 : max);
-
-                    // Common base implementation to handle ticks.min, ticks.max, ticks.beginAtZero
-                    me.handleTickRangeOptions();
-                },
-                getTickLimit: function() {
-                    var tickOpts = this.options.ticks;
-                    var tickFontSize = helpers.valueOrDefault(tickOpts.fontSize, globalDefaults.defaultFontSize);
-                    return Math.min(tickOpts.maxTicksLimit ? tickOpts.maxTicksLimit : 11, Math.ceil(this.drawingArea / (1.5 * tickFontSize)));
-                },
-                convertTicksToLabels: function() {
-                    var me = this;
-
-                    Chart.LinearScaleBase.prototype.convertTicksToLabels.call(me);
-
-                    // Point labels
-                    me.pointLabels = me.chart.data.labels.map(me.options.pointLabels.callback, me);
-                },
-                getLabelForIndex: function(index, datasetIndex) {
-                    return +this.getRightValue(this.chart.data.datasets[datasetIndex].data[index]);
-                },
-                fit: function() {
-                    if (this.options.pointLabels.display) {
-                        fitWithPointLabels(this);
-                    } else {
-                        fit(this);
-                    }
-                },
-                /**
-                 * Set radius reductions and determine new radius and center point
-                 * @private
-                 */
-                setReductions: function(largestPossibleRadius, furthestLimits, furthestAngles) {
-                    var me = this;
-                    var radiusReductionLeft = furthestLimits.l / Math.sin(furthestAngles.l);
-                    var radiusReductionRight = Math.max(furthestLimits.r - me.width, 0) / Math.sin(furthestAngles.r);
-                    var radiusReductionTop = -furthestLimits.t / Math.cos(furthestAngles.t);
-                    var radiusReductionBottom = -Math.max(furthestLimits.b - me.height, 0) / Math.cos(furthestAngles.b);
-
-                    radiusReductionLeft = numberOrZero(radiusReductionLeft);
-                    radiusReductionRight = numberOrZero(radiusReductionRight);
-                    radiusReductionTop = numberOrZero(radiusReductionTop);
-                    radiusReductionBottom = numberOrZero(radiusReductionBottom);
-
-                    me.drawingArea = Math.min(
-                            Math.round(largestPossibleRadius - (radiusReductionLeft + radiusReductionRight) / 2),
-                            Math.round(largestPossibleRadius - (radiusReductionTop + radiusReductionBottom) / 2));
-                    me.setCenterPoint(radiusReductionLeft, radiusReductionRight, radiusReductionTop, radiusReductionBottom);
-                },
-                setCenterPoint: function(leftMovement, rightMovement, topMovement, bottomMovement) {
-                    var me = this;
-                    var maxRight = me.width - rightMovement - me.drawingArea;
-                    var maxLeft = leftMovement + me.drawingArea;
-                    var maxTop = topMovement + me.drawingArea;
-                    var maxBottom = me.height - bottomMovement - me.drawingArea;
-
-                    me.xCenter = Math.round(((maxLeft + maxRight) / 2) + me.left);
-                    me.yCenter = Math.round(((maxTop + maxBottom) / 2) + me.top);
-                },
-
-                getIndexAngle: function(index) {
-                    var angleMultiplier = (Math.PI * 2) / getValueCount(this);
-                    var startAngle = this.chart.options && this.chart.options.startAngle ?
-                            this.chart.options.startAngle :
-                            0;
-
-                    var startAngleRadians = startAngle * Math.PI * 2 / 360;
-
-                    // Start from the top instead of right, so remove a quarter of the circle
-                    return index * angleMultiplier + startAngleRadians;
-                },
-                getDistanceFromCenterForValue: function(value) {
-                    var me = this;
-
-                    if (value === null) {
-                        return 0; // null always in center
-                    }
-
-                    // Take into account half font size + the yPadding of the top value
-                    var scalingFactor = me.drawingArea / (me.max - me.min);
-                    if (me.options.ticks.reverse) {
-                        return (me.max - value) * scalingFactor;
-                    }
-                    return (value - me.min) * scalingFactor;
-                },
-                getPointPosition: function(index, distanceFromCenter) {
-                    var me = this;
-                    var thisAngle = me.getIndexAngle(index) - (Math.PI / 2);
-                    return {
-                        x: Math.round(Math.cos(thisAngle) * distanceFromCenter) + me.xCenter,
-                        y: Math.round(Math.sin(thisAngle) * distanceFromCenter) + me.yCenter
-                    };
-                },
-                getPointPositionForValue: function(index, value) {
-                    return this.getPointPosition(index, this.getDistanceFromCenterForValue(value));
-                },
-
-                getBasePosition: function() {
-                    var me = this;
-                    var min = me.min;
-                    var max = me.max;
-
-                    return me.getPointPositionForValue(0,
-                            me.beginAtZero ? 0 :
-                                    min < 0 && max < 0 ? max :
-                                            min > 0 && max > 0 ? min :
-                                                    0);
-                },
-
-                draw: function() {
-                    var me = this;
-                    var opts = me.options;
-                    var gridLineOpts = opts.gridLines;
-                    var tickOpts = opts.ticks;
-                    var valueOrDefault = helpers.valueOrDefault;
-
-                    if (opts.display) {
-                        var ctx = me.ctx;
-                        var startAngle = this.getIndexAngle(0);
-
-                        // Tick Font
-                        var tickFontSize = valueOrDefault(tickOpts.fontSize, globalDefaults.defaultFontSize);
-                        var tickFontStyle = valueOrDefault(tickOpts.fontStyle, globalDefaults.defaultFontStyle);
-                        var tickFontFamily = valueOrDefault(tickOpts.fontFamily, globalDefaults.defaultFontFamily);
-                        var tickLabelFont = helpers.fontString(tickFontSize, tickFontStyle, tickFontFamily);
-
-                        helpers.each(me.ticks, function(label, index) {
-                            // Don't draw a centre value (if it is minimum)
-                            if (index > 0 || tickOpts.reverse) {
-                                var yCenterOffset = me.getDistanceFromCenterForValue(me.ticksAsNumbers[index]);
-
-                                // Draw circular lines around the scale
-                                if (gridLineOpts.display && index !== 0) {
-                                    drawRadiusLine(me, gridLineOpts, yCenterOffset, index);
-                                }
-
-                                if (tickOpts.display) {
-                                    var tickFontColor = valueOrDefault(tickOpts.fontColor, globalDefaults.defaultFontColor);
-                                    ctx.font = tickLabelFont;
-
-                                    ctx.save();
-                                    ctx.translate(me.xCenter, me.yCenter);
-                                    ctx.rotate(startAngle);
-
-                                    if (tickOpts.showLabelBackdrop) {
-                                        var labelWidth = ctx.measureText(label).width;
-                                        ctx.fillStyle = tickOpts.backdropColor;
-                                        ctx.fillRect(
-                                                -labelWidth / 2 - tickOpts.backdropPaddingX,
-                                                -yCenterOffset - tickFontSize / 2 - tickOpts.backdropPaddingY,
-                                                labelWidth + tickOpts.backdropPaddingX * 2,
-                                                tickFontSize + tickOpts.backdropPaddingY * 2
-                                        );
-                                    }
-
-                                    ctx.textAlign = 'center';
-                                    ctx.textBaseline = 'middle';
-                                    ctx.fillStyle = tickFontColor;
-                                    ctx.fillText(label, 0, -yCenterOffset);
-                                    ctx.restore();
-                                }
-                            }
-                        });
-
-                        if (opts.angleLines.display || opts.pointLabels.display) {
-                            drawPointLabels(me);
-                        }
-                    }
-                }
-            });
-            Chart.scaleService.registerScaleType('radialLinear', LinearRadialScale, defaultConfig);
-
-        };
-
-    },{ "25":25,"34":34,"45":45 }],57:[function(require,module,exports){
-        /* global window: false */
-        'use strict';
-
-        var moment = require(1);
-        moment = typeof moment === 'function' ? moment : window.moment;
-
-        var defaults = require(25);
-        var helpers = require(45);
-
-// Integer constants are from the ES6 spec.
-        var MIN_INTEGER = Number.MIN_SAFE_INTEGER || -9007199254740991;
-        var MAX_INTEGER = Number.MAX_SAFE_INTEGER || 9007199254740991;
-
-        var INTERVALS = {
-            millisecond: {
-                major: true,
-                size: 1,
-                steps: [1, 2, 5, 10, 20, 50, 100, 250, 500]
-            },
-            second: {
-                major: true,
-                size: 1000,
-                steps: [1, 2, 5, 10, 30]
-            },
-            minute: {
-                major: true,
-                size: 60000,
-                steps: [1, 2, 5, 10, 30]
-            },
-            hour: {
-                major: true,
-                size: 3600000,
-                steps: [1, 2, 3, 6, 12]
-            },
-            day: {
-                major: true,
-                size: 86400000,
-                steps: [1, 2, 5]
-            },
-            week: {
-                major: false,
-                size: 604800000,
-                steps: [1, 2, 3, 4]
-            },
-            month: {
-                major: true,
-                size: 2.628e9,
-                steps: [1, 2, 3]
-            },
-            quarter: {
-                major: false,
-                size: 7.884e9,
-                steps: [1, 2, 3, 4]
-            },
-            year: {
-                major: true,
-                size: 3.154e10
-            }
-        };
-
-        var UNITS = Object.keys(INTERVALS);
-
-        function sorter(a, b) {
-            return a - b;
-        }
-
-        function arrayUnique(items) {
-            var hash = {};
-            var out = [];
-            var i, ilen, item;
-
-            for (i = 0, ilen = items.length; i < ilen; ++i) {
-                item = items[i];
-                if (!hash[item]) {
-                    hash[item] = true;
-                    out.push(item);
-                }
-            }
-
-            return out;
-        }
-
-        /**
-         * Returns an array of {time, pos} objects used to interpolate a specific `time` or position
-         * (`pos`) on the scale, by searching entries before and after the requested value. `pos` is
-         * a decimal between 0 and 1: 0 being the start of the scale (left or top) and 1 the other
-         * extremity (left + width or top + height). Note that it would be more optimized to directly
-         * store pre-computed pixels, but the scale dimensions are not guaranteed at the time we need
-         * to create the lookup table. The table ALWAYS contains at least two items: min and max.
-         *
-         * @param {Number[]} timestamps - timestamps sorted from lowest to highest.
-         * @param {String} distribution - If 'linear', timestamps will be spread linearly along the min
-         * and max range, so basically, the table will contains only two items: {min, 0} and {max, 1}.
-         * If 'series', timestamps will be positioned at the same distance from each other. In this
-         * case, only timestamps that break the time linearity are registered, meaning that in the
-         * best case, all timestamps are linear, the table contains only min and max.
-         */
-        function buildLookupTable(timestamps, min, max, distribution) {
-            if (distribution === 'linear' || !timestamps.length) {
-                return [
-                    { time: min, pos: 0 },
-                    { time: max, pos: 1 }
-                ];
-            }
-
-            var table = [];
-            var items = [min];
-            var i, ilen, prev, curr, next;
-
-            for (i = 0, ilen = timestamps.length; i < ilen; ++i) {
-                curr = timestamps[i];
-                if (curr > min && curr < max) {
-                    items.push(curr);
-                }
-            }
-
-            items.push(max);
-
-            for (i = 0, ilen = items.length; i < ilen; ++i) {
-                next = items[i + 1];
-                prev = items[i - 1];
-                curr = items[i];
-
-                // only add points that breaks the scale linearity
-                if (prev === undefined || next === undefined || Math.round((next + prev) / 2) !== curr) {
-                    table.push({ time: curr, pos: i / (ilen - 1) });
-                }
-            }
-
-            return table;
-        }
-
-// @see adapted from http://www.anujgakhar.com/2014/03/01/binary-search-in-javascript/
-        function lookup(table, key, value) {
-            var lo = 0;
-            var hi = table.length - 1;
-            var mid, i0, i1;
-
-            while (lo >= 0 && lo <= hi) {
-                mid = (lo + hi) >> 1;
-                i0 = table[mid - 1] || null;
-                i1 = table[mid];
-
-                if (!i0) {
-                    // given value is outside table (before first item)
-                    return { lo: null, hi: i1 };
-                } else if (i1[key] < value) {
-                    lo = mid + 1;
-                } else if (i0[key] > value) {
-                    hi = mid - 1;
-                } else {
-                    return { lo: i0, hi: i1 };
-                }
-            }
-
-            // given value is outside table (after last item)
-            return { lo: i1, hi: null };
-        }
-
-        /**
-         * Linearly interpolates the given source `value` using the table items `skey` values and
-         * returns the associated `tkey` value. For example, interpolate(table, 'time', 42, 'pos')
-         * returns the position for a timestamp equal to 42. If value is out of bounds, values at
-         * index [0, 1] or [n - 1, n] are used for the interpolation.
-         */
-        function interpolate(table, skey, sval, tkey) {
-            var range = lookup(table, skey, sval);
-
-            // Note: the lookup table ALWAYS contains at least 2 items (min and max)
-            var prev = !range.lo ? table[0] : !range.hi ? table[table.length - 2] : range.lo;
-            var next = !range.lo ? table[1] : !range.hi ? table[table.length - 1] : range.hi;
-
-            var span = next[skey] - prev[skey];
-            var ratio = span ? (sval - prev[skey]) / span : 0;
-            var offset = (next[tkey] - prev[tkey]) * ratio;
-
-            return prev[tkey] + offset;
-        }
-
-        /**
-         * Convert the given value to a moment object using the given time options.
-         * @see http://momentjs.com/docs/#/parsing/
-         */
-        function momentify(value, options) {
-            var parser = options.parser;
-            var format = options.parser || options.format;
-
-            if (typeof parser === 'function') {
-                return parser(value);
-            }
-
-            if (typeof value === 'string' && typeof format === 'string') {
-                return moment(value, format);
-            }
-
-            if (!(value instanceof moment)) {
-                value = moment(value);
-            }
-
-            if (value.isValid()) {
-                return value;
-            }
-
-            // Labels are in an incompatible moment format and no `parser` has been provided.
-            // The user might still use the deprecated `format` option to convert his inputs.
-            if (typeof format === 'function') {
-                return format(value);
-            }
-
-            return value;
-        }
-
-        function parse(input, scale) {
-            if (helpers.isNullOrUndef(input)) {
-                return null;
-            }
-
-            var options = scale.options.time;
-            var value = momentify(scale.getRightValue(input), options);
-            if (!value.isValid()) {
-                return null;
-            }
-
-            if (options.round) {
-                value.startOf(options.round);
-            }
-
-            return value.valueOf();
-        }
-
-        /**
-         * Returns the number of unit to skip to be able to display up to `capacity` number of ticks
-         * in `unit` for the given `min` / `max` range and respecting the interval steps constraints.
-         */
-        function determineStepSize(min, max, unit, capacity) {
-            var range = max - min;
-            var interval = INTERVALS[unit];
-            var milliseconds = interval.size;
-            var steps = interval.steps;
-            var i, ilen, factor;
-
-            if (!steps) {
-                return Math.ceil(range / ((capacity || 1) * milliseconds));
-            }
-
-            for (i = 0, ilen = steps.length; i < ilen; ++i) {
-                factor = steps[i];
-                if (Math.ceil(range / (milliseconds * factor)) <= capacity) {
-                    break;
-                }
-            }
-
-            return factor;
-        }
-
-        function determineUnit(minUnit, min, max, capacity) {
-            var ilen = UNITS.length;
-            var i, interval, factor;
-
-            for (i = UNITS.indexOf(minUnit); i < ilen - 1; ++i) {
-                interval = INTERVALS[UNITS[i]];
-                factor = interval.steps ? interval.steps[interval.steps.length - 1] : MAX_INTEGER;
-
-                if (Math.ceil((max - min) / (factor * interval.size)) <= capacity) {
-                    return UNITS[i];
-                }
-            }
-
-            return UNITS[ilen - 1];
-        }
-
-        function determineMajorUnit(unit) {
-            for (var i = UNITS.indexOf(unit) + 1, ilen = UNITS.length; i < ilen; ++i) {
-                if (INTERVALS[UNITS[i]].major) {
-                    return UNITS[i];
-                }
-            }
-        }
-
-        /**
-         * Generates a maximum of `capacity` timestamps between min and max, rounded to the
-         * `minor` unit, aligned on the `major` unit and using the given scale time `options`.
-         * Important: this method can return ticks outside the min and max range, it's the
-         * responsibility of the calling code to clamp values if needed.
-         */
-        function generate(min, max, minor, major, capacity, options) {
-            var timeOpts = options.time;
-            var stepSize = helpers.valueOrDefault(timeOpts.stepSize, timeOpts.unitStepSize);
-            var weekday = minor === 'week' ? timeOpts.isoWeekday : false;
-            var majorTicksEnabled = options.ticks.major.enabled;
-            var interval = INTERVALS[minor];
-            var first = moment(min);
-            var last = moment(max);
-            var ticks = [];
-            var time;
-
-            if (!stepSize) {
-                stepSize = determineStepSize(min, max, minor, capacity);
-            }
-
-            // For 'week' unit, handle the first day of week option
-            if (weekday) {
-                first = first.isoWeekday(weekday);
-                last = last.isoWeekday(weekday);
-            }
-
-            // Align first/last ticks on unit
-            first = first.startOf(weekday ? 'day' : minor);
-            last = last.startOf(weekday ? 'day' : minor);
-
-            // Make sure that the last tick include max
-            if (last < max) {
-                last.add(1, minor);
-            }
-
-            time = moment(first);
-
-            if (majorTicksEnabled && major && !weekday && !timeOpts.round) {
-                // Align the first tick on the previous `minor` unit aligned on the `major` unit:
-                // we first aligned time on the previous `major` unit then add the number of full
-                // stepSize there is between first and the previous major time.
-                time.startOf(major);
-                time.add(~~((first - time) / (interval.size * stepSize)) * stepSize, minor);
-            }
-
-            for (; time < last; time.add(stepSize, minor)) {
-                ticks.push(+time);
-            }
-
-            ticks.push(+time);
-
-            return ticks;
-        }
-
-        /**
-         * Returns the right and left offsets from edges in the form of {left, right}.
-         * Offsets are added when the `offset` option is true.
-         */
-        function computeOffsets(table, ticks, min, max, options) {
-            var left = 0;
-            var right = 0;
-            var upper, lower;
-
-            if (options.offset && ticks.length) {
-                if (!options.time.min) {
-                    upper = ticks.length > 1 ? ticks[1] : max;
-                    lower = ticks[0];
-                    left = (
-                            interpolate(table, 'time', upper, 'pos') -
-                            interpolate(table, 'time', lower, 'pos')
-                    ) / 2;
-                }
-                if (!options.time.max) {
-                    upper = ticks[ticks.length - 1];
-                    lower = ticks.length > 1 ? ticks[ticks.length - 2] : min;
-                    right = (
-                            interpolate(table, 'time', upper, 'pos') -
-                            interpolate(table, 'time', lower, 'pos')
-                    ) / 2;
-                }
-            }
-
-            return { left: left, right: right };
-        }
-
-        function ticksFromTimestamps(values, majorUnit) {
-            var ticks = [];
-            var i, ilen, value, major;
-
-            for (i = 0, ilen = values.length; i < ilen; ++i) {
-                value = values[i];
-                major = majorUnit ? value === +moment(value).startOf(majorUnit) : false;
-
-                ticks.push({
-                    value: value,
-                    major: major
-                });
-            }
-
-            return ticks;
-        }
-
-        module.exports = function(Chart) {
-
-            var defaultConfig = {
-                position: 'bottom',
-
-                /**
-                 * Data distribution along the scale:
-                 * - 'linear': data are spread according to their time (distances can vary),
-                 * - 'series': data are spread at the same distance from each other.
-                 * @see https://github.com/chartjs/Chart.js/pull/4507
-                 * @since 2.7.0
-                 */
-                distribution: 'linear',
-
-                /**
-                 * Scale boundary strategy (bypassed by min/max time options)
-                 * - `data`: make sure data are fully visible, ticks outside are removed
-                 * - `ticks`: make sure ticks are fully visible, data outside are truncated
-                 * @see https://github.com/chartjs/Chart.js/pull/4556
-                 * @since 2.7.0
-                 */
-                bounds: 'data',
-
-                time: {
-                    parser: false, // false == a pattern string from http://momentjs.com/docs/#/parsing/string-format/ or a custom callback that converts its argument to a moment
-                    format: false, // DEPRECATED false == date objects, moment object, callback or a pattern string from http://momentjs.com/docs/#/parsing/string-format/
-                    unit: false, // false == automatic or override with week, month, year, etc.
-                    round: false, // none, or override with week, month, year, etc.
-                    displayFormat: false, // DEPRECATED
-                    isoWeekday: false, // override week start day - see http://momentjs.com/docs/#/get-set/iso-weekday/
-                    minUnit: 'millisecond',
-
-                    // defaults to unit's corresponding unitFormat below or override using pattern string from http://momentjs.com/docs/#/displaying/format/
-                    displayFormats: {
-                        millisecond: 'h:mm:ss.SSS a', // 11:20:01.123 AM,
-                        second: 'h:mm:ss a', // 11:20:01 AM
-                        minute: 'h:mm a', // 11:20 AM
-                        hour: 'hA', // 5PM
-                        day: 'MMM D', // Sep 4
-                        week: 'll', // Week 46, or maybe "[W]WW - YYYY" ?
-                        month: 'MMM YYYY', // Sept 2015
-                        quarter: '[Q]Q - YYYY', // Q3
-                        year: 'YYYY' // 2015
-                    },
-                },
-                ticks: {
-                    autoSkip: false,
-
-                    /**
-                     * Ticks generation input values:
-                     * - 'auto': generates "optimal" ticks based on scale size and time options.
-                     * - 'data': generates ticks from data (including labels from data {t|x|y} objects).
-                     * - 'labels': generates ticks from user given `data.labels` values ONLY.
-                     * @see https://github.com/chartjs/Chart.js/pull/4507
-                     * @since 2.7.0
-                     */
-                    source: 'auto',
-
-                    major: {
-                        enabled: false
-                    }
-                }
-            };
-
-            var TimeScale = Chart.Scale.extend({
-                initialize: function() {
-                    if (!moment) {
-                        throw new Error('Chart.js - Moment.js could not be found! You must include it before Chart.js to use the time scale. Download at https://momentjs.com');
-                    }
-
-                    this.mergeTicksOptions();
-
-                    Chart.Scale.prototype.initialize.call(this);
-                },
-
-                update: function() {
-                    var me = this;
-                    var options = me.options;
-
-                    // DEPRECATIONS: output a message only one time per update
-                    if (options.time && options.time.format) {
-                        console.warn('options.time.format is deprecated and replaced by options.time.parser.');
-                    }
-
-                    return Chart.Scale.prototype.update.apply(me, arguments);
-                },
-
-                /**
-                 * Allows data to be referenced via 't' attribute
-                 */
-                getRightValue: function(rawValue) {
-                    if (rawValue && rawValue.t !== undefined) {
-                        rawValue = rawValue.t;
-                    }
-                    return Chart.Scale.prototype.getRightValue.call(this, rawValue);
-                },
-
-                determineDataLimits: function() {
-                    var me = this;
-                    var chart = me.chart;
-                    var timeOpts = me.options.time;
-                    var min = parse(timeOpts.min, me) || MAX_INTEGER;
-                    var max = parse(timeOpts.max, me) || MIN_INTEGER;
-                    var timestamps = [];
-                    var datasets = [];
-                    var labels = [];
-                    var i, j, ilen, jlen, data, timestamp;
-
-                    // Convert labels to timestamps
-                    for (i = 0, ilen = chart.data.labels.length; i < ilen; ++i) {
-                        labels.push(parse(chart.data.labels[i], me));
-                    }
-
-                    // Convert data to timestamps
-                    for (i = 0, ilen = (chart.data.datasets || []).length; i < ilen; ++i) {
-                        if (chart.isDatasetVisible(i)) {
-                            data = chart.data.datasets[i].data;
-
-                            // Let's consider that all data have the same format.
-                            if (helpers.isObject(data[0])) {
-                                datasets[i] = [];
-
-                                for (j = 0, jlen = data.length; j < jlen; ++j) {
-                                    timestamp = parse(data[j], me);
-                                    timestamps.push(timestamp);
-                                    datasets[i][j] = timestamp;
-                                }
-                            } else {
-                                timestamps.push.apply(timestamps, labels);
-                                datasets[i] = labels.slice(0);
-                            }
-                        } else {
-                            datasets[i] = [];
-                        }
-                    }
-
-                    if (labels.length) {
-                        // Sort labels **after** data have been converted
-                        labels = arrayUnique(labels).sort(sorter);
-                        min = Math.min(min, labels[0]);
-                        max = Math.max(max, labels[labels.length - 1]);
-                    }
-
-                    if (timestamps.length) {
-                        timestamps = arrayUnique(timestamps).sort(sorter);
-                        min = Math.min(min, timestamps[0]);
-                        max = Math.max(max, timestamps[timestamps.length - 1]);
-                    }
-
-                    // In case there is no valid min/max, let's use today limits
-                    min = min === MAX_INTEGER ? +moment().startOf('day') : min;
-                    max = max === MIN_INTEGER ? +moment().endOf('day') + 1 : max;
-
-                    // Make sure that max is strictly higher than min (required by the lookup table)
-                    me.min = Math.min(min, max);
-                    me.max = Math.max(min + 1, max);
-
-                    // PRIVATE
-                    me._horizontal = me.isHorizontal();
-                    me._table = [];
-                    me._timestamps = {
-                        data: timestamps,
-                        datasets: datasets,
-                        labels: labels
-                    };
-                },
-
-                buildTicks: function() {
-                    var me = this;
-                    var min = me.min;
-                    var max = me.max;
-                    var options = me.options;
-                    var timeOpts = options.time;
-                    var formats = timeOpts.displayFormats;
-                    var capacity = me.getLabelCapacity(min);
-                    var unit = timeOpts.unit || determineUnit(timeOpts.minUnit, min, max, capacity);
-                    var majorUnit = determineMajorUnit(unit);
-                    var timestamps = [];
-                    var ticks = [];
-                    var i, ilen, timestamp;
-
-                    switch (options.ticks.source) {
-                        case 'data':
-                            timestamps = me._timestamps.data;
-                            break;
-                        case 'labels':
-                            timestamps = me._timestamps.labels;
-                            break;
-                        case 'auto':
-                        default:
-                            timestamps = generate(min, max, unit, majorUnit, capacity, options);
-                    }
-
-                    if (options.bounds === 'ticks' && timestamps.length) {
-                        min = timestamps[0];
-                        max = timestamps[timestamps.length - 1];
-                    }
-
-                    // Enforce limits with user min/max options
-                    min = parse(timeOpts.min, me) || min;
-                    max = parse(timeOpts.max, me) || max;
-
-                    // Remove ticks outside the min/max range
-                    for (i = 0, ilen = timestamps.length; i < ilen; ++i) {
-                        timestamp = timestamps[i];
-                        if (timestamp >= min && timestamp <= max) {
-                            ticks.push(timestamp);
-                        }
-                    }
-
-                    me.min = min;
-                    me.max = max;
-
-                    // PRIVATE
-                    me._unit = unit;
-                    me._majorUnit = majorUnit;
-                    me._minorFormat = formats[unit];
-                    me._majorFormat = formats[majorUnit];
-                    me._table = buildLookupTable(me._timestamps.data, min, max, options.distribution);
-                    me._offsets = computeOffsets(me._table, ticks, min, max, options);
-
-                    return ticksFromTimestamps(ticks, majorUnit);
-                },
-
-                getLabelForIndex: function(index, datasetIndex) {
-                    var me = this;
-                    var data = me.chart.data;
-                    var timeOpts = me.options.time;
-                    var label = data.labels && index < data.labels.length ? data.labels[index] : '';
-                    var value = data.datasets[datasetIndex].data[index];
-
-                    if (helpers.isObject(value)) {
-                        label = me.getRightValue(value);
-                    }
-                    if (timeOpts.tooltipFormat) {
-                        label = momentify(label, timeOpts).format(timeOpts.tooltipFormat);
-                    }
-
-                    return label;
-                },
-
-                /**
-                 * Function to format an individual tick mark
-                 * @private
-                 */
-                tickFormatFunction: function(tick, index, ticks) {
-                    var me = this;
-                    var options = me.options;
-                    var time = tick.valueOf();
-                    var majorUnit = me._majorUnit;
-                    var majorFormat = me._majorFormat;
-                    var majorTime = tick.clone().startOf(me._majorUnit).valueOf();
-                    var majorTickOpts = options.ticks.major;
-                    var major = majorTickOpts.enabled && majorUnit && majorFormat && time === majorTime;
-                    var label = tick.format(major ? majorFormat : me._minorFormat);
-                    var tickOpts = major ? majorTickOpts : options.ticks.minor;
-                    var formatter = helpers.valueOrDefault(tickOpts.callback, tickOpts.userCallback);
-
-                    return formatter ? formatter(label, index, ticks) : label;
-                },
-
-                convertTicksToLabels: function(ticks) {
-                    var labels = [];
-                    var i, ilen;
-
-                    for (i = 0, ilen = ticks.length; i < ilen; ++i) {
-                        labels.push(this.tickFormatFunction(moment(ticks[i].value), i, ticks));
-                    }
-
-                    return labels;
-                },
-
-                /**
-                 * @private
-                 */
-                getPixelForOffset: function(time) {
-                    var me = this;
-                    var size = me._horizontal ? me.width : me.height;
-                    var start = me._horizontal ? me.left : me.top;
-                    var pos = interpolate(me._table, 'time', time, 'pos');
-
-                    return start + size * (me._offsets.left + pos) / (me._offsets.left + 1 + me._offsets.right);
-                },
-
-                getPixelForValue: function(value, index, datasetIndex) {
-                    var me = this;
-                    var time = null;
-
-                    if (index !== undefined && datasetIndex !== undefined) {
-                        time = me._timestamps.datasets[datasetIndex][index];
-                    }
-
-                    if (time === null) {
-                        time = parse(value, me);
-                    }
-
-                    if (time !== null) {
-                        return me.getPixelForOffset(time);
-                    }
-                },
-
-                getPixelForTick: function(index) {
-                    var ticks = this.getTicks();
-                    return index >= 0 && index < ticks.length ?
-                            this.getPixelForOffset(ticks[index].value) :
-                            null;
-                },
-
-                getValueForPixel: function(pixel) {
-                    var me = this;
-                    var size = me._horizontal ? me.width : me.height;
-                    var start = me._horizontal ? me.left : me.top;
-                    var pos = (size ? (pixel - start) / size : 0) * (me._offsets.left + 1 + me._offsets.left) - me._offsets.right;
-                    var time = interpolate(me._table, 'pos', pos, 'time');
-
-                    return moment(time);
-                },
-
-                /**
-                 * Crude approximation of what the label width might be
-                 * @private
-                 */
-                getLabelWidth: function(label) {
-                    var me = this;
-                    var ticksOpts = me.options.ticks;
-                    var tickLabelWidth = me.ctx.measureText(label).width;
-                    var angle = helpers.toRadians(ticksOpts.maxRotation);
-                    var cosRotation = Math.cos(angle);
-                    var sinRotation = Math.sin(angle);
-                    var tickFontSize = helpers.valueOrDefault(ticksOpts.fontSize, defaults.global.defaultFontSize);
-
-                    return (tickLabelWidth * cosRotation) + (tickFontSize * sinRotation);
-                },
-
-                /**
-                 * @private
-                 */
-                getLabelCapacity: function(exampleTime) {
-                    var me = this;
-
-                    me._minorFormat = me.options.time.displayFormats.millisecond;	// Pick the longest format for guestimation
-
-                    var exampleLabel = me.tickFormatFunction(moment(exampleTime), 0, []);
-                    var tickLabelWidth = me.getLabelWidth(exampleLabel);
-                    var innerWidth = me.isHorizontal() ? me.width : me.height;
-
-                    return Math.floor(innerWidth / tickLabelWidth);
-                }
-            });
-
-            Chart.scaleService.registerScaleType('time', TimeScale, defaultConfig);
-        };
-
-    },{ "1":1,"25":25,"45":45 }] },{},[7])(7)
-});
diff --git a/themes/Backend/ExtJs/backend/benchmark/template/local/waiting.tpl b/themes/Backend/ExtJs/backend/benchmark/template/local/waiting.tpl
deleted file mode 100644
index 7223c816ede..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/template/local/waiting.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-{extends file="backend/benchmark/template/local/index.tpl"}
-
-{block name="benchmark_index_head_scripts"}
-    {$smarty.block.parent}
-    <script type="text/javascript" src="{link file="backend/base/frame/postmessage-api.js"}"></script>
-{/block}
-
-{block name="benchmark_index_title"}Shopware BI - Waiting{/block}
-
-{block name="benchmark_index_head_scripts"}
-    {$smarty.block.parent}
-    <script src="{link file='backend/benchmark/template/local/js/pong.js'}"></script>
-{/block}
-
-{block name="benchmark_index_body"}
-    <body id="swag-waiting">
-        {include file="backend/benchmark/template/local/include/loading_indicator.tpl"}
-        {include file="backend/benchmark/template/local/include/language_switch.tpl"}
-        <div class="wrapper swag-onbording waiting">
-            <div class="row">
-                <div class="col-100">
-                    <div class="opener">
-                        <h1>[[ $t('waitingHeadline') ]]</h1>
-                    </div>
-                    {if $waitingSinceHours >= 2}
-                        <p>[[  $t('waitingTextSince6Hours') ]]</p>
-                    {else}
-                        <p>[[ $t('waitingText') ]]</p>
-                    {/if}
-                </div>
-
-                <div class="col-100">
-                    <canvas id="pong-game" data-pong="true"></canvas>
-                    <input class="btn secondary pong-start" type="button" value="Start" />
-                </div>
-
-                <div class="col-100">
-                    <button class="btn primary pong-cancel-button" onclick="window.parent.postMessage('closeWindow', window.location.origin)">
-                        [[ $t('waitingButton') ]]
-                    </button>
-                </div>
-            </div>
-            <svg viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg" class="circle big">
-                <circle cx="50" cy="50" r="50">
-            </svg>
-            <svg viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg" class="circle small">
-                <circle cx="50" cy="50" r="50">
-            </svg>
-        </div>
-    </body>
-{/block}
diff --git a/themes/Backend/ExtJs/backend/benchmark/view/overview/window.js b/themes/Backend/ExtJs/backend/benchmark/view/overview/window.js
deleted file mode 100644
index 47c02832970..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/view/overview/window.js
+++ /dev/null
@@ -1,55 +0,0 @@
-
-//{namespace name="backend/benchmark/main"}
-//{block name="backend/benchmark/view/overview/window"}
-Ext.define('Shopware.apps.Benchmark.view.overview.Window', {
-    extend: 'Enlight.app.Window',
-    layout: 'fit',
-    width: 1050,
-    height: 670,
-
-    alias: 'widget.benchmark-overview-window',
-
-    title: '{s name="overview/title"}Benchmark Overview{/s}',
-
-    initComponent: function () {
-        var me = this;
-
-        me.items = me.getItems();
-
-        if (me.isTeaser) {
-            me.checkbox = Ext.create('Ext.form.field.Checkbox', {
-                padding: '0 0 0 5px',
-                itemId: 'disableBenchmarkTeaser',
-                width: 150,
-                boxLabel: '{s name="window/do_not_show_again"}{/s}'
-            });
-
-            me.dockedItems = [{
-                xtype: 'toolbar',
-                dock: 'bottom',
-                items: [me.checkbox, '->', me.cancelButton]
-            }];
-        }
-
-        me.callParent(arguments);
-    },
-
-    /**
-     * @returns { Ext.container.Container[] }
-     */
-    getItems: function () {
-        var url = '{url controller=BenchmarkOverview}';
-
-        if (this.shopId) {
-            url = '{url controller=BenchmarkOverview shopId=replaceShopId}';
-            url = url.replace('replaceShopId', this.shopId);
-        }
-
-        return [
-            Ext.create('Ext.container.Container', {
-                html: '<iframe src="' + url + '" width="100%" height="100%"></iframe>'
-            })
-        ];
-    }
-});
-//{/block}
diff --git a/themes/Backend/ExtJs/backend/benchmark/view/settings/industry_field.js b/themes/Backend/ExtJs/backend/benchmark/view/settings/industry_field.js
deleted file mode 100644
index b846cd2dedc..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/view/settings/industry_field.js
+++ /dev/null
@@ -1,70 +0,0 @@
-
-//{namespace name="backend/benchmark/main"}
-//{block name="backend/benchmark/view/settings/industry_field"}
-Ext.define('Shopware.apps.Benchmark.view.settings.IndustryField', {
-    extend: 'Ext.form.FieldContainer',
-    alias: 'widget.industryfield',
-
-    mixins: {
-        field: 'Ext.form.field.Field'
-    },
-
-    /**
-     * @type Ext.data.Store
-     */
-    store: null,
-
-    initComponent: function () {
-        var me = this;
-
-        if (!me.store || !me.store instanceof Ext.data.Store) {
-            throw new Error('The industry field requires a store');
-        }
-
-        me.tpl = me.createFieldTemplate();
-        me.data = {};
-        /*{if {acl_is_allowed privilege=manage}}*/
-        me.listeners = {
-            click: function() {
-                me.fireEvent('changeIndustry');
-            },
-            element: 'el',
-            delegate: 'span#other-action'
-        };
-        /*{/if}*/
-
-        me.callParent(arguments);
-    },
-
-    /**
-     * @param { integer } value
-     */
-    setValue: function (value) {
-        var foundIndex = this.store.findExact('id', value);
-        if (foundIndex === -1) {
-            this.update({ value: value });
-            return;
-        }
-
-        this.update({ value: this.store.getAt(foundIndex).get('name') });
-    },
-
-    /**
-     * @returns { Ext.XTemplate }
-     */
-    createFieldTemplate: function () {
-        return new Ext.XTemplate(
-            '<div>',
-            '<div class="value"><b>{ value }</b></div>',
-            '<div>',
-            /*{if {acl_is_allowed privilege=manage}}*/
-            '<span id="other-action" style="text-decoration: underline; font-style: italic; cursor: pointer; display: block; margin-top: 8px; font-size: 10px;">',
-            '{s name="settings/industry_window/wrong"}Wrong industry?{/s}',
-            '</span>',
-            /*{/if}*/
-            '</div>',
-            '</div>'
-        );
-    }
-});
-//{/block}
diff --git a/themes/Backend/ExtJs/backend/benchmark/view/settings/industry_window.js b/themes/Backend/ExtJs/backend/benchmark/view/settings/industry_window.js
deleted file mode 100644
index 6b52faeb2d0..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/view/settings/industry_window.js
+++ /dev/null
@@ -1,107 +0,0 @@
-
-//{namespace name="backend/benchmark/main"}
-//{block name="backend/benchmark/view/settings/industry_window"}
-Ext.define('Shopware.apps.Benchmark.view.settings.IndustryWindow', {
-    extend: 'Enlight.app.Window',
-    alias: 'widget.benchmark-settings-industry-window',
-
-    height: 140,
-    width: 320,
-
-    title: '{s name="settings/industry_window/title"}Change industry{/s}',
-
-    /**
-     * Used by settings.js controller to display an additional text above the industry combo
-     */
-    additionalText: '',
-
-    /**
-     * Used by settings.js controller to call a custom callback after industry is saved
-     */
-    customCallback: Ext.emptyFn,
-
-    initComponent: function () {
-        var items = [];
-
-        if (this.additionalText) {
-            items.push(Ext.create('Ext.form.field.Display', {
-                fieldStyle: 'color: #61677f; font-weight: bold; margin-bottom: 5px;',
-                value: this.additionalText
-            }));
-        }
-
-        items.push(this.createIndustryCombo());
-
-        this.items = Ext.create('Ext.panel.Panel', {
-            layout: 'anchor',
-            bodyPadding: 10,
-            border: 0,
-            items: items
-        });
-
-        this.dockedItems = this.createBottomBar();
-
-        this.callParent(arguments);
-    },
-
-    /**
-     * @returns { Ext.form.field.ComboBox }
-     */
-    createIndustryCombo: function () {
-        var me = this,
-            industryStore = Ext.create('Shopware.apps.Benchmark.store.Industry');
-
-        me.industryCombo = Ext.create('Ext.form.field.ComboBox', {
-            store: industryStore,
-            queryMode: 'local',
-            fieldLabel: '{s name="settings/industry_window/label"}Choose industry{/s}',
-            emptyText: '{s name="settings/industry_window/empty"}Please choose your industry{/s}',
-            anchor: '100%',
-            displayField: 'name',
-            valueField: 'id',
-            editable: false,
-            listeners: {
-                change: function (el, value) {
-                    if (value === null || value === '') {
-                        me.saveButton.disable();
-                        return;
-                    }
-
-                    me.saveButton.enable();
-                }
-            }
-        });
-
-        if (this.additionalText) {
-            industryStore.removeAt(0);
-        }
-
-        return me.industryCombo;
-    },
-
-    /**
-     * @returns { Ext.toolbar.Toolbar }
-     */
-    createBottomBar: function () {
-        var me = this;
-
-        me.saveButton = Ext.create('Ext.button.Button', {
-            xtype: 'button',
-            disabled: true,
-            cls: 'primary',
-            action: 'save',
-            text: '{s name="settings/industry_window/save"}Save industry{/s}',
-            handler: function () {
-                me.fireEvent('saveIndustry', me, me.industryCombo.getValue(), me.customCallback);
-            }
-        });
-
-        return Ext.create('Ext.toolbar.Toolbar', {
-            dock: 'bottom',
-            items: [{
-                xtype: 'tbfill'
-            }, me.saveButton]
-        });
-    }
-});
-//{/block}
diff --git a/themes/Backend/ExtJs/backend/benchmark/view/settings/window.js b/themes/Backend/ExtJs/backend/benchmark/view/settings/window.js
deleted file mode 100644
index 81926de1436..00000000000
--- a/themes/Backend/ExtJs/backend/benchmark/view/settings/window.js
+++ /dev/null
@@ -1,244 +0,0 @@
-
-//{namespace name="backend/benchmark/main"}
-//{block name="backend/benchmark/view/settings/window"}
-Ext.define('Shopware.apps.Benchmark.view.settings.Window', {
-    extend: 'Enlight.app.Window',
-    alias: 'widget.benchmark-settings-window',
-    height: 450,
-    width: 440,
-    layout: {
-        type: 'vbox',
-        pack: 'start',
-        align: 'stretch'
-    },
-
-    title: '{s name="settings/title"}Shopware BI Settings{/s}',
-
-    initComponent: function () {
-        this.items = this.createItems();
-
-        this.callParent(arguments);
-    },
-
-    loadRecord: function (record) {
-        this.down('form[name=benchmark-settings-panel]').loadRecord(record);
-    },
-
-    /**
-     * @returns { Ext.form.Panel[] }
-     */
-    createItems: function () {
-        var me = this,
-            shopFieldSet = this.createShopFieldSet();
-
-        return [
-            Ext.create('Ext.form.Panel', {
-                flex: 1,
-                name: 'benchmark-settings-panel',
-                bodyPadding: 10,
-                items: [
-                    shopFieldSet,
-                    this.createIndustryFieldSet(),
-                    /*{if {acl_is_allowed privilege=manage}}*/
-                    this.createBusinessPlanFieldSet()
-                    /*{/if}*/
-                ],
-
-                /**
-                 * @param { Object } settingsData
-                 */
-                loadSettingsRecord: function (settingsData) {
-                    var active = settingsData.data.active;
-
-                    me.deActivationContainer[~~(active) === 1 ? 'show' : 'hide']();
-                    me.activationContainer[~~(active) === 0 ? 'show' : 'hide']();
-
-                    this.loadRecord(settingsData);
-                }
-            })];
-    },
-
-    /**
-     * @returns { Ext.form.FieldSet }
-     */
-    createShopFieldSet: function () {
-        this.activationContainer = this.createActivationContainer();
-        this.deActivationContainer = this.createDeactivationContainer();
-
-        return Ext.create('Ext.form.FieldSet', {
-            title: '{s name="settings/fieldsets/shop/title"}Shop selection{/s}',
-            name: 'shopFieldSet',
-            items: [
-                this.createShopSelection(),
-                this.activationContainer,
-                this.deActivationContainer
-            ]
-        });
-    },
-
-    /**
-     * @returns { Ext.form.field.ComboBox }
-     */
-    createShopSelection: function () {
-        var me = this;
-
-        me.comboBox = Ext.create('Ext.form.field.ComboBox', {
-            anchor: '100%',
-            name: 'shopSelection',
-            displayField: 'shopName',
-            valueField: 'shopId',
-            editable: false,
-            store: Ext.create('Shopware.apps.Benchmark.store.ShopConfigs').load(function () {
-                me.fireEvent('shopConfigLoaded', this, me.comboBox);
-            }),
-            fieldLabel: 'Shop',
-            listeners: {
-                select: function (combo, records) {
-                    me.fireEvent('configSelected', me, combo, records[0]);
-                }
-            }
-        });
-
-        return me.comboBox;
-    },
-
-    /**
-     * @returns { Ext.container.Container }
-     */
-    createActivationContainer: function () {
-        var me = this;
-
-        return Ext.create('Ext.container.Container', {
-            layout: 'hbox',
-            name: 'activationContainer',
-            style: {
-                margin: '20px 0'
-            },
-            hidden: true,
-            items: [
-                /*{if {acl_is_allowed privilege=manage}}*/
-                {
-                    xtype: 'container',
-                    html: '{s name="settings/fieldsets/shop/activation_text"}I would like to participate.{/s}',
-                    style: {
-                        fontWeight: 'bold',
-                        fontSize: '11px',
-                        color: '#475c6a'
-                    },
-                    flex: 1
-                },
-                {
-                    xtype: 'button',
-                    text: '{s name="settings/fieldsets/shop/activation_button"}Participate now{/s}',
-                    cls: 'primary',
-                    flex: 1,
-                    handler: function () {
-                        me.fireEvent('activateBenchmark');
-                    }
-                }
-                /*{/if}*/
-            ]
-        });
-    },
-
-    /**
-     * @returns { Ext.form.FieldSet }
-     */
-    createDeactivationContainer: function () {
-        var me = this;
-
-        return Ext.create('Ext.container.Container', {
-            layout: 'hbox',
-            name: 'deActivationContainer',
-            style: {
-                margin: '20px 0'
-            },
-            hidden: true,
-            items: [
-                /*{if {acl_is_allowed privilege=manage}}*/
-                {
-                    xtype: 'container',
-                    html: '{s name="settings/fieldsets/shop/deactivation_text"}I want to stop the service.{/s}',
-                    style: {
-                        fontWeight: 'bold',
-                        fontSize: '11px',
-                        color: '#475c6a'
-                    },
-                    flex: 1
-                }, {
-                    xtype: 'button',
-                    text: '{s name="settings/fieldsets/shop/deactivation_button"}Stop the service{/s}',
-                    cls: 'primary',
-                    flex: 1,
-                    handler: function () {
-                        me.fireEvent('deactivateBenchmark');
-                    }
-                }
-                /*{/if}*/
-            ]
-        });
-    },
-
-    /**
-     * @returns { Ext.form.FieldSet }
-     */
-    createIndustryFieldSet: function () {
-        return Ext.create('Ext.form.FieldSet', {
-            title: '{s name="settings/fieldsets/industry/title"}Industry{/s}',
-            name: 'industryFieldSet',
-            items: [{
-                xtype: 'industryfield',
-                name: 'industry',
-                fieldLabel: '{s name="settings/industry_window/label"}Choose industry{/s}',
-                labelWidth: 200,
-                store: Ext.create('Shopware.apps.Benchmark.store.Industry')
-            }]
-        });
-    },
-
-    /**
-     * @returns { Ext.form.FieldSet }
-     */
-    createBusinessPlanFieldSet: function () {
-        var me = this,
-            b2bText = '<b>{s name="settings/fieldsets/business_plan/b2bText"}Business to Business{/s} ({s name="settings/fieldsets/business_plan/b2bShortText"}B2B{/s})</b>',
-            b2cText = '<b>{s name="settings/fieldsets/business_plan/b2cText"}Business to Consumer{/s} ({s name="settings/fieldsets/business_plan/b2cShortText"}(B2C){/s})</b>';
-
-        return Ext.create('Ext.form.FieldSet', {
-            title: '{s name="settings/fieldsets/business_plan/title"}Business plan{/s}',
-            name: 'typeFieldSet',
-            items: [
-                Ext.create('Ext.form.RadioGroup', {
-                    columns: 1,
-                    name: 'typeRadios',
-                    items: [
-                        {
-                            name: 'type',
-                            inputValue: 'b2c',
-                            boxLabel: b2cText
-                        },
-                        {
-                            name: 'type',
-                            inputValue: 'b2b',
-                            boxLabel: b2bText
-                        },
-                    ]
-                }),
-                /*{if {acl_is_allowed privilege=manage}}*/
-                {
-                    xtype: 'button',
-                    text: '{s name="settings/fieldsets/business_plan/save_button"}Save{/s}',
-                    cls: 'primary',
-                    style: {
-                        float: 'right'
-                    },
-                    handler: function () {
-                        me.fireEvent('saveType');
-                    }
-                }
-                /* {/if}*/
-            ]
-        });
-    }
-});
-//{/block}
diff --git a/themes/Backend/ExtJs/backend/blog/app.js b/themes/Backend/ExtJs/backend/blog/app.js
index 5079e88ff86..41f76732167 100644
--- a/themes/Backend/ExtJs/backend/blog/app.js
+++ b/themes/Backend/ExtJs/backend/blog/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Blog
diff --git a/themes/Backend/ExtJs/backend/blog/controller/blog.js b/themes/Backend/ExtJs/backend/blog/controller/blog.js
index 4810c890ee5..c1c27f168d1 100644
--- a/themes/Backend/ExtJs/backend/blog/controller/blog.js
+++ b/themes/Backend/ExtJs/backend/blog/controller/blog.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Blog
diff --git a/themes/Backend/ExtJs/backend/blog/controller/comment.js b/themes/Backend/ExtJs/backend/blog/controller/comment.js
index 8b31eb6d661..1e87c359d28 100644
--- a/themes/Backend/ExtJs/backend/blog/controller/comment.js
+++ b/themes/Backend/ExtJs/backend/blog/controller/comment.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Blog
diff --git a/themes/Backend/ExtJs/backend/blog/controller/main.js b/themes/Backend/ExtJs/backend/blog/controller/main.js
index 9c782a0d67f..ccb390467a8 100644
--- a/themes/Backend/ExtJs/backend/blog/controller/main.js
+++ b/themes/Backend/ExtJs/backend/blog/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Blog
diff --git a/themes/Backend/ExtJs/backend/blog/controller/media.js b/themes/Backend/ExtJs/backend/blog/controller/media.js
index f73f0adfea8..b953dda0d8f 100644
--- a/themes/Backend/ExtJs/backend/blog/controller/media.js
+++ b/themes/Backend/ExtJs/backend/blog/controller/media.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Blog
diff --git a/themes/Backend/ExtJs/backend/blog/model/assigned_articles.js b/themes/Backend/ExtJs/backend/blog/model/assigned_articles.js
index 7d918aff22f..6d973a39289 100644
--- a/themes/Backend/ExtJs/backend/blog/model/assigned_articles.js
+++ b/themes/Backend/ExtJs/backend/blog/model/assigned_articles.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Blog
diff --git a/themes/Backend/ExtJs/backend/blog/model/comment.js b/themes/Backend/ExtJs/backend/blog/model/comment.js
index aec4996a29e..d5d5fcb69db 100644
--- a/themes/Backend/ExtJs/backend/blog/model/comment.js
+++ b/themes/Backend/ExtJs/backend/blog/model/comment.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Blog
diff --git a/themes/Backend/ExtJs/backend/blog/model/detail.js b/themes/Backend/ExtJs/backend/blog/model/detail.js
index dfed38d84e1..1e0fd3b82de 100644
--- a/themes/Backend/ExtJs/backend/blog/model/detail.js
+++ b/themes/Backend/ExtJs/backend/blog/model/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Blog
diff --git a/themes/Backend/ExtJs/backend/blog/model/main.js b/themes/Backend/ExtJs/backend/blog/model/main.js
index 30d85b51289..7be8b45a953 100644
--- a/themes/Backend/ExtJs/backend/blog/model/main.js
+++ b/themes/Backend/ExtJs/backend/blog/model/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Blog
diff --git a/themes/Backend/ExtJs/backend/blog/model/media.js b/themes/Backend/ExtJs/backend/blog/model/media.js
index 8fc1286d765..76052c7050b 100644
--- a/themes/Backend/ExtJs/backend/blog/model/media.js
+++ b/themes/Backend/ExtJs/backend/blog/model/media.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * Shopware Model - Blog backend module.
  *
diff --git a/themes/Backend/ExtJs/backend/blog/model/template.js b/themes/Backend/ExtJs/backend/blog/model/template.js
index 5ddfc658e32..9d7dbb01693 100644
--- a/themes/Backend/ExtJs/backend/blog/model/template.js
+++ b/themes/Backend/ExtJs/backend/blog/model/template.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Blog
diff --git a/themes/Backend/ExtJs/backend/blog/model/tree.js b/themes/Backend/ExtJs/backend/blog/model/tree.js
index 0e2f2e850f5..8ce2bff0aeb 100644
--- a/themes/Backend/ExtJs/backend/blog/model/tree.js
+++ b/themes/Backend/ExtJs/backend/blog/model/tree.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Blog
diff --git a/themes/Backend/ExtJs/backend/blog/store/category_path.js b/themes/Backend/ExtJs/backend/blog/store/category_path.js
index 2e102b24774..7fd85878082 100644
--- a/themes/Backend/ExtJs/backend/blog/store/category_path.js
+++ b/themes/Backend/ExtJs/backend/blog/store/category_path.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Blog
diff --git a/themes/Backend/ExtJs/backend/blog/store/comment.js b/themes/Backend/ExtJs/backend/blog/store/comment.js
index 056c6718f07..f574e6b6926 100644
--- a/themes/Backend/ExtJs/backend/blog/store/comment.js
+++ b/themes/Backend/ExtJs/backend/blog/store/comment.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Blog
diff --git a/themes/Backend/ExtJs/backend/blog/store/detail.js b/themes/Backend/ExtJs/backend/blog/store/detail.js
index d71d8f9d01a..561dc1bd289 100644
--- a/themes/Backend/ExtJs/backend/blog/store/detail.js
+++ b/themes/Backend/ExtJs/backend/blog/store/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Blog
diff --git a/themes/Backend/ExtJs/backend/blog/store/list.js b/themes/Backend/ExtJs/backend/blog/store/list.js
index 60c2e6359ec..4a557d6385e 100644
--- a/themes/Backend/ExtJs/backend/blog/store/list.js
+++ b/themes/Backend/ExtJs/backend/blog/store/list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Blog
diff --git a/themes/Backend/ExtJs/backend/blog/store/template.js b/themes/Backend/ExtJs/backend/blog/store/template.js
index 51d1b230eb7..8195ff91e9e 100644
--- a/themes/Backend/ExtJs/backend/blog/store/template.js
+++ b/themes/Backend/ExtJs/backend/blog/store/template.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Blog
diff --git a/themes/Backend/ExtJs/backend/blog/store/tree.js b/themes/Backend/ExtJs/backend/blog/store/tree.js
index 2789e715cab..036506e7190 100644
--- a/themes/Backend/ExtJs/backend/blog/store/tree.js
+++ b/themes/Backend/ExtJs/backend/blog/store/tree.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Blog
diff --git a/themes/Backend/ExtJs/backend/blog/view/blog/detail/comments.js b/themes/Backend/ExtJs/backend/blog/view/blog/detail/comments.js
index 22c5ecfb888..58a6f661eba 100644
--- a/themes/Backend/ExtJs/backend/blog/view/blog/detail/comments.js
+++ b/themes/Backend/ExtJs/backend/blog/view/blog/detail/comments.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Blog
diff --git a/themes/Backend/ExtJs/backend/blog/view/blog/detail/comments/grid.js b/themes/Backend/ExtJs/backend/blog/view/blog/detail/comments/grid.js
index b0082d23eda..3f4fe30804b 100644
--- a/themes/Backend/ExtJs/backend/blog/view/blog/detail/comments/grid.js
+++ b/themes/Backend/ExtJs/backend/blog/view/blog/detail/comments/grid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Blog
diff --git a/themes/Backend/ExtJs/backend/blog/view/blog/detail/comments/info_panel.js b/themes/Backend/ExtJs/backend/blog/view/blog/detail/comments/info_panel.js
index 0a9f13c8cd3..a1d4021763a 100644
--- a/themes/Backend/ExtJs/backend/blog/view/blog/detail/comments/info_panel.js
+++ b/themes/Backend/ExtJs/backend/blog/view/blog/detail/comments/info_panel.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Blog
diff --git a/themes/Backend/ExtJs/backend/blog/view/blog/detail/main.js b/themes/Backend/ExtJs/backend/blog/view/blog/detail/main.js
index 71d00e36ea1..10f4540fe8f 100644
--- a/themes/Backend/ExtJs/backend/blog/view/blog/detail/main.js
+++ b/themes/Backend/ExtJs/backend/blog/view/blog/detail/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Blog
diff --git a/themes/Backend/ExtJs/backend/blog/view/blog/detail/sidebar/assigned_articles.js b/themes/Backend/ExtJs/backend/blog/view/blog/detail/sidebar/assigned_articles.js
index 7dff73f905e..5a22e325d4d 100644
--- a/themes/Backend/ExtJs/backend/blog/view/blog/detail/sidebar/assigned_articles.js
+++ b/themes/Backend/ExtJs/backend/blog/view/blog/detail/sidebar/assigned_articles.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Blog
diff --git a/themes/Backend/ExtJs/backend/blog/view/blog/detail/sidebar/options.js b/themes/Backend/ExtJs/backend/blog/view/blog/detail/sidebar/options.js
index 33556c0c23b..1cfb1f739e7 100644
--- a/themes/Backend/ExtJs/backend/blog/view/blog/detail/sidebar/options.js
+++ b/themes/Backend/ExtJs/backend/blog/view/blog/detail/sidebar/options.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Blog
diff --git a/themes/Backend/ExtJs/backend/blog/view/blog/detail/sidebar/seo.js b/themes/Backend/ExtJs/backend/blog/view/blog/detail/sidebar/seo.js
index bdf8acb6ad4..1cfdc400af8 100644
--- a/themes/Backend/ExtJs/backend/blog/view/blog/detail/sidebar/seo.js
+++ b/themes/Backend/ExtJs/backend/blog/view/blog/detail/sidebar/seo.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Blog
diff --git a/themes/Backend/ExtJs/backend/blog/view/blog/list.js b/themes/Backend/ExtJs/backend/blog/view/blog/list.js
index b22e5e73a1f..bfec0ce5a9b 100644
--- a/themes/Backend/ExtJs/backend/blog/view/blog/list.js
+++ b/themes/Backend/ExtJs/backend/blog/view/blog/list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Blog
diff --git a/themes/Backend/ExtJs/backend/blog/view/blog/tree.js b/themes/Backend/ExtJs/backend/blog/view/blog/tree.js
index b4810129f35..adec2c9cb46 100644
--- a/themes/Backend/ExtJs/backend/blog/view/blog/tree.js
+++ b/themes/Backend/ExtJs/backend/blog/view/blog/tree.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Blog
diff --git a/themes/Backend/ExtJs/backend/blog/view/blog/window.js b/themes/Backend/ExtJs/backend/blog/view/blog/window.js
index e82a9f24167..70b842021e0 100644
--- a/themes/Backend/ExtJs/backend/blog/view/blog/window.js
+++ b/themes/Backend/ExtJs/backend/blog/view/blog/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Blog
diff --git a/themes/Backend/ExtJs/backend/blog/view/main/window.js b/themes/Backend/ExtJs/backend/blog/view/main/window.js
index a6775886e20..d850936c41b 100644
--- a/themes/Backend/ExtJs/backend/blog/view/main/window.js
+++ b/themes/Backend/ExtJs/backend/blog/view/main/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Blog
diff --git a/themes/Backend/ExtJs/backend/canceled_order/app.js b/themes/Backend/ExtJs/backend/canceled_order/app.js
index 13481bcf781..b18b7a85790 100644
--- a/themes/Backend/ExtJs/backend/canceled_order/app.js
+++ b/themes/Backend/ExtJs/backend/canceled_order/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    CanceledOrder
diff --git a/themes/Backend/ExtJs/backend/canceled_order/controller/basket.js b/themes/Backend/ExtJs/backend/canceled_order/controller/basket.js
index 5c0dd0ce136..f6e603a6402 100644
--- a/themes/Backend/ExtJs/backend/canceled_order/controller/basket.js
+++ b/themes/Backend/ExtJs/backend/canceled_order/controller/basket.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    CanceledOrder
diff --git a/themes/Backend/ExtJs/backend/canceled_order/controller/main.js b/themes/Backend/ExtJs/backend/canceled_order/controller/main.js
index 2977700a13e..f6c4c62f008 100644
--- a/themes/Backend/ExtJs/backend/canceled_order/controller/main.js
+++ b/themes/Backend/ExtJs/backend/canceled_order/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    CanceledOrder
diff --git a/themes/Backend/ExtJs/backend/canceled_order/controller/order.js b/themes/Backend/ExtJs/backend/canceled_order/controller/order.js
index 4f6e6911f00..8476e242f12 100644
--- a/themes/Backend/ExtJs/backend/canceled_order/controller/order.js
+++ b/themes/Backend/ExtJs/backend/canceled_order/controller/order.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    CanceledOrder
diff --git a/themes/Backend/ExtJs/backend/canceled_order/model/articles.js b/themes/Backend/ExtJs/backend/canceled_order/model/articles.js
index 8dc64456804..1e1ede5848f 100644
--- a/themes/Backend/ExtJs/backend/canceled_order/model/articles.js
+++ b/themes/Backend/ExtJs/backend/canceled_order/model/articles.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    CanceledOrder
diff --git a/themes/Backend/ExtJs/backend/canceled_order/model/basket.js b/themes/Backend/ExtJs/backend/canceled_order/model/basket.js
index 840488752b0..e08a2a886dc 100644
--- a/themes/Backend/ExtJs/backend/canceled_order/model/basket.js
+++ b/themes/Backend/ExtJs/backend/canceled_order/model/basket.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    CanceledOrder
diff --git a/themes/Backend/ExtJs/backend/canceled_order/model/order.js b/themes/Backend/ExtJs/backend/canceled_order/model/order.js
index b1d22d398c5..c3813f89ade 100644
--- a/themes/Backend/ExtJs/backend/canceled_order/model/order.js
+++ b/themes/Backend/ExtJs/backend/canceled_order/model/order.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    CanceledOrder
diff --git a/themes/Backend/ExtJs/backend/canceled_order/model/position.js b/themes/Backend/ExtJs/backend/canceled_order/model/position.js
index 9e6b2431873..3f541d0ba44 100644
--- a/themes/Backend/ExtJs/backend/canceled_order/model/position.js
+++ b/themes/Backend/ExtJs/backend/canceled_order/model/position.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/canceled_order/model/statistic.js b/themes/Backend/ExtJs/backend/canceled_order/model/statistic.js
index d3f819e9897..6ccd57fefa2 100644
--- a/themes/Backend/ExtJs/backend/canceled_order/model/statistic.js
+++ b/themes/Backend/ExtJs/backend/canceled_order/model/statistic.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    CanceledOrder
diff --git a/themes/Backend/ExtJs/backend/canceled_order/model/viewports.js b/themes/Backend/ExtJs/backend/canceled_order/model/viewports.js
index d5ea22b4928..f47d5453061 100644
--- a/themes/Backend/ExtJs/backend/canceled_order/model/viewports.js
+++ b/themes/Backend/ExtJs/backend/canceled_order/model/viewports.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    CanceledOrder
diff --git a/themes/Backend/ExtJs/backend/canceled_order/model/voucher.js b/themes/Backend/ExtJs/backend/canceled_order/model/voucher.js
index 820c691f776..1fcf3fa7f95 100644
--- a/themes/Backend/ExtJs/backend/canceled_order/model/voucher.js
+++ b/themes/Backend/ExtJs/backend/canceled_order/model/voucher.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    CanceledOrder
diff --git a/themes/Backend/ExtJs/backend/canceled_order/store/articles.js b/themes/Backend/ExtJs/backend/canceled_order/store/articles.js
index 923a9a1151a..82a421b6682 100644
--- a/themes/Backend/ExtJs/backend/canceled_order/store/articles.js
+++ b/themes/Backend/ExtJs/backend/canceled_order/store/articles.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    CanceledOrder
diff --git a/themes/Backend/ExtJs/backend/canceled_order/store/basket.js b/themes/Backend/ExtJs/backend/canceled_order/store/basket.js
index 39ca9bd6920..77dc246f169 100644
--- a/themes/Backend/ExtJs/backend/canceled_order/store/basket.js
+++ b/themes/Backend/ExtJs/backend/canceled_order/store/basket.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    CanceledOrder
diff --git a/themes/Backend/ExtJs/backend/canceled_order/store/order.js b/themes/Backend/ExtJs/backend/canceled_order/store/order.js
index ad51b62a5b3..d2fd2c02aa3 100644
--- a/themes/Backend/ExtJs/backend/canceled_order/store/order.js
+++ b/themes/Backend/ExtJs/backend/canceled_order/store/order.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    CanceledOrder
diff --git a/themes/Backend/ExtJs/backend/canceled_order/store/statistic.js b/themes/Backend/ExtJs/backend/canceled_order/store/statistic.js
index dcf6ebe2380..2d7e1e2a11b 100644
--- a/themes/Backend/ExtJs/backend/canceled_order/store/statistic.js
+++ b/themes/Backend/ExtJs/backend/canceled_order/store/statistic.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    CanceledOrder
diff --git a/themes/Backend/ExtJs/backend/canceled_order/store/viewports.js b/themes/Backend/ExtJs/backend/canceled_order/store/viewports.js
index 443a31db2b2..382875079fa 100644
--- a/themes/Backend/ExtJs/backend/canceled_order/store/viewports.js
+++ b/themes/Backend/ExtJs/backend/canceled_order/store/viewports.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    CanceledOrder
diff --git a/themes/Backend/ExtJs/backend/canceled_order/store/voucher.js b/themes/Backend/ExtJs/backend/canceled_order/store/voucher.js
index 3027ed26879..f8b990a58cf 100644
--- a/themes/Backend/ExtJs/backend/canceled_order/store/voucher.js
+++ b/themes/Backend/ExtJs/backend/canceled_order/store/voucher.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    CanceledOrder
diff --git a/themes/Backend/ExtJs/backend/canceled_order/view/main/window.js b/themes/Backend/ExtJs/backend/canceled_order/view/main/window.js
index 48ecfab815a..e2f6c61c4b0 100644
--- a/themes/Backend/ExtJs/backend/canceled_order/view/main/window.js
+++ b/themes/Backend/ExtJs/backend/canceled_order/view/main/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    CanceledOrder
diff --git a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/baskets/articles.js b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/baskets/articles.js
index a21f63aa506..03089c84b36 100644
--- a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/baskets/articles.js
+++ b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/baskets/articles.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    CanceledOrder
diff --git a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/baskets/main.js b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/baskets/main.js
index e148ef75f07..55a48c4a725 100644
--- a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/baskets/main.js
+++ b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/baskets/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    CanceledOrder
diff --git a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/baskets/overview.js b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/baskets/overview.js
index e1e277397e2..db47eafb5b2 100644
--- a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/baskets/overview.js
+++ b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/baskets/overview.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    CanceledOrder
diff --git a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/baskets/viewports.js b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/baskets/viewports.js
index d37a3a93ef2..f92314fc02c 100644
--- a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/baskets/viewports.js
+++ b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/baskets/viewports.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    CanceledOrder
diff --git a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/order/detail.js b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/order/detail.js
index cfb94547f35..c224e9632ff 100644
--- a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/order/detail.js
+++ b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/order/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    CanceledOrder
diff --git a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/order/main.js b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/order/main.js
index 324cf5d6fa4..1ff49b11d26 100644
--- a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/order/main.js
+++ b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/order/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    CanceledOrder
diff --git a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/order/orders.js b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/order/orders.js
index cdc96164a11..ea4de0f2069 100644
--- a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/order/orders.js
+++ b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/order/orders.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    CanceledOrder
diff --git a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/order/position.js b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/order/position.js
index 14bfaa34038..e43679844e6 100644
--- a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/order/position.js
+++ b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/order/position.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/canceled_order/view/main"}
diff --git a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/statistics.js b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/statistics.js
index b3b6294c93f..7cd4127ccab 100644
--- a/themes/Backend/ExtJs/backend/canceled_order/view/tabs/statistics.js
+++ b/themes/Backend/ExtJs/backend/canceled_order/view/tabs/statistics.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    CanceledOrder
diff --git a/themes/Backend/ExtJs/backend/canceled_order/view/toolbar.js b/themes/Backend/ExtJs/backend/canceled_order/view/toolbar.js
index cd32c1f2429..0ae6e8c55b7 100644
--- a/themes/Backend/ExtJs/backend/canceled_order/view/toolbar.js
+++ b/themes/Backend/ExtJs/backend/canceled_order/view/toolbar.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    CanceledOrder
diff --git a/themes/Backend/ExtJs/backend/category/app.js b/themes/Backend/ExtJs/backend/category/app.js
index e6ef0997594..8d52c259eff 100644
--- a/themes/Backend/ExtJs/backend/category/app.js
+++ b/themes/Backend/ExtJs/backend/category/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Category
diff --git a/themes/Backend/ExtJs/backend/category/controller/article_mapping.js b/themes/Backend/ExtJs/backend/category/controller/article_mapping.js
index c65e144ae47..ede19592492 100644
--- a/themes/Backend/ExtJs/backend/category/controller/article_mapping.js
+++ b/themes/Backend/ExtJs/backend/category/controller/article_mapping.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does +not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Category
diff --git a/themes/Backend/ExtJs/backend/category/controller/duplicate_tasks.js b/themes/Backend/ExtJs/backend/category/controller/duplicate_tasks.js
index d502dd8d2ce..aedc449ad7b 100644
--- a/themes/Backend/ExtJs/backend/category/controller/duplicate_tasks.js
+++ b/themes/Backend/ExtJs/backend/category/controller/duplicate_tasks.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Category
diff --git a/themes/Backend/ExtJs/backend/category/controller/main.js b/themes/Backend/ExtJs/backend/category/controller/main.js
index 5afe29eb48c..29482e78955 100644
--- a/themes/Backend/ExtJs/backend/category/controller/main.js
+++ b/themes/Backend/ExtJs/backend/category/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Category
diff --git a/themes/Backend/ExtJs/backend/category/controller/manual_sorting.js b/themes/Backend/ExtJs/backend/category/controller/manual_sorting.js
index 0d80c90ca20..9530fc3012f 100644
--- a/themes/Backend/ExtJs/backend/category/controller/manual_sorting.js
+++ b/themes/Backend/ExtJs/backend/category/controller/manual_sorting.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Category
diff --git a/themes/Backend/ExtJs/backend/category/controller/multi_request.js b/themes/Backend/ExtJs/backend/category/controller/multi_request.js
index be1b17dfce5..32feda8f4ca 100644
--- a/themes/Backend/ExtJs/backend/category/controller/multi_request.js
+++ b/themes/Backend/ExtJs/backend/category/controller/multi_request.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Category
diff --git a/themes/Backend/ExtJs/backend/category/controller/settings.js b/themes/Backend/ExtJs/backend/category/controller/settings.js
index 263961e5427..aa10c34fa4c 100644
--- a/themes/Backend/ExtJs/backend/category/controller/settings.js
+++ b/themes/Backend/ExtJs/backend/category/controller/settings.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Category
diff --git a/themes/Backend/ExtJs/backend/category/controller/tree.js b/themes/Backend/ExtJs/backend/category/controller/tree.js
index 789f39ee6ec..8cbea2ebf61 100644
--- a/themes/Backend/ExtJs/backend/category/controller/tree.js
+++ b/themes/Backend/ExtJs/backend/category/controller/tree.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Category
diff --git a/themes/Backend/ExtJs/backend/category/model/detail.js b/themes/Backend/ExtJs/backend/category/model/detail.js
index 4cc078d3774..0e10065977b 100644
--- a/themes/Backend/ExtJs/backend/category/model/detail.js
+++ b/themes/Backend/ExtJs/backend/category/model/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/category/model/emotion.js b/themes/Backend/ExtJs/backend/category/model/emotion.js
index 0dcd4fa5891..a19c2fd6047 100644
--- a/themes/Backend/ExtJs/backend/category/model/emotion.js
+++ b/themes/Backend/ExtJs/backend/category/model/emotion.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/category/model/manual_sorting.js b/themes/Backend/ExtJs/backend/category/model/manual_sorting.js
index e205c86262e..37956046c2b 100644
--- a/themes/Backend/ExtJs/backend/category/model/manual_sorting.js
+++ b/themes/Backend/ExtJs/backend/category/model/manual_sorting.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/category/model/product_assignment.js b/themes/Backend/ExtJs/backend/category/model/product_assignment.js
index a10bbb3f197..52afb0cf668 100644
--- a/themes/Backend/ExtJs/backend/category/model/product_assignment.js
+++ b/themes/Backend/ExtJs/backend/category/model/product_assignment.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 //{block name="backend/category/model/product_assignment"}
 Ext.define('Shopware.apps.Category.model.ProductAssignment', {
diff --git a/themes/Backend/ExtJs/backend/category/model/template.js b/themes/Backend/ExtJs/backend/category/model/template.js
index 78bf21a066a..b4a71d23a0a 100644
--- a/themes/Backend/ExtJs/backend/category/model/template.js
+++ b/themes/Backend/ExtJs/backend/category/model/template.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Category
diff --git a/themes/Backend/ExtJs/backend/category/model/tree.js b/themes/Backend/ExtJs/backend/category/model/tree.js
index 5f51801ab85..953b5efa102 100644
--- a/themes/Backend/ExtJs/backend/category/model/tree.js
+++ b/themes/Backend/ExtJs/backend/category/model/tree.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/category/store/assigned_products.js b/themes/Backend/ExtJs/backend/category/store/assigned_products.js
index 042ee818d5e..3c0a2573f1e 100644
--- a/themes/Backend/ExtJs/backend/category/store/assigned_products.js
+++ b/themes/Backend/ExtJs/backend/category/store/assigned_products.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/category/store/available_products.js b/themes/Backend/ExtJs/backend/category/store/available_products.js
index fb336b612d5..6902188212b 100644
--- a/themes/Backend/ExtJs/backend/category/store/available_products.js
+++ b/themes/Backend/ExtJs/backend/category/store/available_products.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/category/store/category_path.js b/themes/Backend/ExtJs/backend/category/store/category_path.js
index 6837f5c724f..711ae4a6c6d 100644
--- a/themes/Backend/ExtJs/backend/category/store/category_path.js
+++ b/themes/Backend/ExtJs/backend/category/store/category_path.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 Ext.define('Shopware.apps.Category.store.CategoryPath', {
diff --git a/themes/Backend/ExtJs/backend/category/store/customer_groups.js b/themes/Backend/ExtJs/backend/category/store/customer_groups.js
index f39d5bf7427..efd48cd6ea1 100644
--- a/themes/Backend/ExtJs/backend/category/store/customer_groups.js
+++ b/themes/Backend/ExtJs/backend/category/store/customer_groups.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Category
diff --git a/themes/Backend/ExtJs/backend/category/store/detail.js b/themes/Backend/ExtJs/backend/category/store/detail.js
index 07138922c13..8265e36d062 100644
--- a/themes/Backend/ExtJs/backend/category/store/detail.js
+++ b/themes/Backend/ExtJs/backend/category/store/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/category/store/manual_sorting.js b/themes/Backend/ExtJs/backend/category/store/manual_sorting.js
index c742d67284b..51462427a19 100644
--- a/themes/Backend/ExtJs/backend/category/store/manual_sorting.js
+++ b/themes/Backend/ExtJs/backend/category/store/manual_sorting.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="backend/category/store/manual_sort"}
diff --git a/themes/Backend/ExtJs/backend/category/store/template.js b/themes/Backend/ExtJs/backend/category/store/template.js
index 63c606883ae..f17b7bd4921 100644
--- a/themes/Backend/ExtJs/backend/category/store/template.js
+++ b/themes/Backend/ExtJs/backend/category/store/template.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Category
diff --git a/themes/Backend/ExtJs/backend/category/store/tree.js b/themes/Backend/ExtJs/backend/category/store/tree.js
index a022e111e42..b22106fd5a9 100644
--- a/themes/Backend/ExtJs/backend/category/store/tree.js
+++ b/themes/Backend/ExtJs/backend/category/store/tree.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Base
diff --git a/themes/Backend/ExtJs/backend/category/view/category/tabs/article_mapping.js b/themes/Backend/ExtJs/backend/category/view/category/tabs/article_mapping.js
index dd0949b63e8..a8c90e645d3 100644
--- a/themes/Backend/ExtJs/backend/category/view/category/tabs/article_mapping.js
+++ b/themes/Backend/ExtJs/backend/category/view/category/tabs/article_mapping.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Category
diff --git a/themes/Backend/ExtJs/backend/category/view/category/tabs/custom_listing.js b/themes/Backend/ExtJs/backend/category/view/category/tabs/custom_listing.js
index 1230eb74ab4..9b50bc5f18f 100644
--- a/themes/Backend/ExtJs/backend/category/view/category/tabs/custom_listing.js
+++ b/themes/Backend/ExtJs/backend/category/view/category/tabs/custom_listing.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Category
diff --git a/themes/Backend/ExtJs/backend/category/view/category/tabs/restriction.js b/themes/Backend/ExtJs/backend/category/view/category/tabs/restriction.js
index 091eda57f9b..b8a650cb9ef 100644
--- a/themes/Backend/ExtJs/backend/category/view/category/tabs/restriction.js
+++ b/themes/Backend/ExtJs/backend/category/view/category/tabs/restriction.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Category
diff --git a/themes/Backend/ExtJs/backend/category/view/category/tabs/settings.js b/themes/Backend/ExtJs/backend/category/view/category/tabs/settings.js
index 65761c18e29..c18cfd850c6 100644
--- a/themes/Backend/ExtJs/backend/category/view/category/tabs/settings.js
+++ b/themes/Backend/ExtJs/backend/category/view/category/tabs/settings.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Category
diff --git a/themes/Backend/ExtJs/backend/category/view/category/tree.js b/themes/Backend/ExtJs/backend/category/view/category/tree.js
index 103127d8eb1..b78417fa890 100644
--- a/themes/Backend/ExtJs/backend/category/view/category/tree.js
+++ b/themes/Backend/ExtJs/backend/category/view/category/tree.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Category
diff --git a/themes/Backend/ExtJs/backend/category/view/fields/shop_grid.js b/themes/Backend/ExtJs/backend/category/view/fields/shop_grid.js
index e0b71fab137..eebb91082a2 100644
--- a/themes/Backend/ExtJs/backend/category/view/fields/shop_grid.js
+++ b/themes/Backend/ExtJs/backend/category/view/fields/shop_grid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Category
diff --git a/themes/Backend/ExtJs/backend/category/view/main/duplicate_settings.js b/themes/Backend/ExtJs/backend/category/view/main/duplicate_settings.js
index dddb4b82948..40e96da2946 100644
--- a/themes/Backend/ExtJs/backend/category/view/main/duplicate_settings.js
+++ b/themes/Backend/ExtJs/backend/category/view/main/duplicate_settings.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /* {namespace name="backend/category/main"} */
diff --git a/themes/Backend/ExtJs/backend/category/view/main/duplicate_tasks.js b/themes/Backend/ExtJs/backend/category/view/main/duplicate_tasks.js
index f132a05e352..daaf21a27e7 100644
--- a/themes/Backend/ExtJs/backend/category/view/main/duplicate_tasks.js
+++ b/themes/Backend/ExtJs/backend/category/view/main/duplicate_tasks.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /* {namespace name="backend/category/main"} */
diff --git a/themes/Backend/ExtJs/backend/category/view/main/multi_request_tasks.js b/themes/Backend/ExtJs/backend/category/view/main/multi_request_tasks.js
index a37b3714865..f5270cede5b 100644
--- a/themes/Backend/ExtJs/backend/category/view/main/multi_request_tasks.js
+++ b/themes/Backend/ExtJs/backend/category/view/main/multi_request_tasks.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /* {namespace name="backend/category/main"} */
diff --git a/themes/Backend/ExtJs/backend/category/view/main/window.js b/themes/Backend/ExtJs/backend/category/view/main/window.js
index 1ac46009c60..a79318428d4 100644
--- a/themes/Backend/ExtJs/backend/category/view/main/window.js
+++ b/themes/Backend/ExtJs/backend/category/view/main/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Category
diff --git a/themes/Backend/ExtJs/backend/category/view/sorting/grid.js b/themes/Backend/ExtJs/backend/category/view/sorting/grid.js
index acbea15a17d..ac7fc8d394b 100644
--- a/themes/Backend/ExtJs/backend/category/view/sorting/grid.js
+++ b/themes/Backend/ExtJs/backend/category/view/sorting/grid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Category
diff --git a/themes/Backend/ExtJs/backend/category/view/sorting/tab.js b/themes/Backend/ExtJs/backend/category/view/sorting/tab.js
index 3f75820a4b8..2abf66f1863 100644
--- a/themes/Backend/ExtJs/backend/category/view/sorting/tab.js
+++ b/themes/Backend/ExtJs/backend/category/view/sorting/tab.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Category
diff --git a/themes/Backend/ExtJs/backend/category/view/sorting/table.js b/themes/Backend/ExtJs/backend/category/view/sorting/table.js
index 05571858274..332ca110bbf 100644
--- a/themes/Backend/ExtJs/backend/category/view/sorting/table.js
+++ b/themes/Backend/ExtJs/backend/category/view/sorting/table.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Category
diff --git a/themes/Backend/ExtJs/backend/config/app.js b/themes/Backend/ExtJs/backend/config/app.js
index a404c4002b4..7ca39c8b207 100644
--- a/themes/Backend/ExtJs/backend/config/app.js
+++ b/themes/Backend/ExtJs/backend/config/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Cache
diff --git a/themes/Backend/ExtJs/backend/config/controller/document.js b/themes/Backend/ExtJs/backend/config/controller/document.js
index 684558d5803..b81c840d3eb 100644
--- a/themes/Backend/ExtJs/backend/config/controller/document.js
+++ b/themes/Backend/ExtJs/backend/config/controller/document.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Config
diff --git a/themes/Backend/ExtJs/backend/config/controller/form.js b/themes/Backend/ExtJs/backend/config/controller/form.js
index 871df5eb500..51b18f6bb97 100644
--- a/themes/Backend/ExtJs/backend/config/controller/form.js
+++ b/themes/Backend/ExtJs/backend/config/controller/form.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Config
diff --git a/themes/Backend/ExtJs/backend/config/controller/main.js b/themes/Backend/ExtJs/backend/config/controller/main.js
index acef430e709..c36d39d9b2c 100644
--- a/themes/Backend/ExtJs/backend/config/controller/main.js
+++ b/themes/Backend/ExtJs/backend/config/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Config
@@ -70,6 +69,10 @@ Ext.define('Shopware.apps.Config.controller.Main', {
         { ref: 'form', selector: 'config-main-form' }
     ],
 
+    messages: {
+        configCouldNotBeSavedMassage: '{s name="form/message/config_could_not_be_saved"}{/s}',
+    },
+
     /**
      * The main window instance
      * @object
@@ -196,6 +199,12 @@ Ext.define('Shopware.apps.Config.controller.Main', {
             values = basicForm.getFieldValues(),
             fieldName, fieldValue, valueStore;
 
+        if (!basicForm.isValid()) {
+            var messageTitle = '{s name="form/message/save_form_title"}Save form{/s}';
+            Shopware.Notification.createGrowlMessage(messageTitle, this.messages.configCouldNotBeSavedMassage);
+            return;
+        }
+
         form.getElements().each(function(element) {
             valueStore = element.getValues();
             valueStore.removeAll();
diff --git a/themes/Backend/ExtJs/backend/config/model/form/country.js b/themes/Backend/ExtJs/backend/config/model/form/country.js
index ebc2a29cf15..ffee601c11f 100644
--- a/themes/Backend/ExtJs/backend/config/model/form/country.js
+++ b/themes/Backend/ExtJs/backend/config/model/form/country.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Config
diff --git a/themes/Backend/ExtJs/backend/config/model/form/country_area.js b/themes/Backend/ExtJs/backend/config/model/form/country_area.js
index 93936cf94fa..6e3849e9600 100644
--- a/themes/Backend/ExtJs/backend/config/model/form/country_area.js
+++ b/themes/Backend/ExtJs/backend/config/model/form/country_area.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Config
diff --git a/themes/Backend/ExtJs/backend/config/model/form/cron_job.js b/themes/Backend/ExtJs/backend/config/model/form/cron_job.js
index dd359efc061..85b2b8e3bcf 100644
--- a/themes/Backend/ExtJs/backend/config/model/form/cron_job.js
+++ b/themes/Backend/ExtJs/backend/config/model/form/cron_job.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Config
diff --git a/themes/Backend/ExtJs/backend/config/model/form/currency.js b/themes/Backend/ExtJs/backend/config/model/form/currency.js
index 1a4d8f874fc..26bfe45e988 100644
--- a/themes/Backend/ExtJs/backend/config/model/form/currency.js
+++ b/themes/Backend/ExtJs/backend/config/model/form/currency.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Config
diff --git a/themes/Backend/ExtJs/backend/config/model/form/customer_group.js b/themes/Backend/ExtJs/backend/config/model/form/customer_group.js
index 49290625fc0..69a5af879ef 100644
--- a/themes/Backend/ExtJs/backend/config/model/form/customer_group.js
+++ b/themes/Backend/ExtJs/backend/config/model/form/customer_group.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Config
diff --git a/themes/Backend/ExtJs/backend/config/model/form/document.js b/themes/Backend/ExtJs/backend/config/model/form/document.js
index d2215805c6f..66e138d7f8b 100644
--- a/themes/Backend/ExtJs/backend/config/model/form/document.js
+++ b/themes/Backend/ExtJs/backend/config/model/form/document.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Config
diff --git a/themes/Backend/ExtJs/backend/config/model/form/document_element.js b/themes/Backend/ExtJs/backend/config/model/form/document_element.js
index bae361860ac..9e76d126491 100644
--- a/themes/Backend/ExtJs/backend/config/model/form/document_element.js
+++ b/themes/Backend/ExtJs/backend/config/model/form/document_element.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Config
diff --git a/themes/Backend/ExtJs/backend/config/model/form/locale.js b/themes/Backend/ExtJs/backend/config/model/form/locale.js
index b5d35d7cfb6..979d818413c 100644
--- a/themes/Backend/ExtJs/backend/config/model/form/locale.js
+++ b/themes/Backend/ExtJs/backend/config/model/form/locale.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Config
diff --git a/themes/Backend/ExtJs/backend/config/model/form/number.js b/themes/Backend/ExtJs/backend/config/model/form/number.js
index 49eed3368cb..ffc739c4893 100644
--- a/themes/Backend/ExtJs/backend/config/model/form/number.js
+++ b/themes/Backend/ExtJs/backend/config/model/form/number.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Config
diff --git a/themes/Backend/ExtJs/backend/config/model/form/page_group.js b/themes/Backend/ExtJs/backend/config/model/form/page_group.js
index c81eae0e4c6..f857db2627b 100644
--- a/themes/Backend/ExtJs/backend/config/model/form/page_group.js
+++ b/themes/Backend/ExtJs/backend/config/model/form/page_group.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Config
diff --git a/themes/Backend/ExtJs/backend/config/model/form/price_group.js b/themes/Backend/ExtJs/backend/config/model/form/price_group.js
index 461da249da0..0cd12616e0e 100644
--- a/themes/Backend/ExtJs/backend/config/model/form/price_group.js
+++ b/themes/Backend/ExtJs/backend/config/model/form/price_group.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Config
diff --git a/themes/Backend/ExtJs/backend/config/model/form/search_field.js b/themes/Backend/ExtJs/backend/config/model/form/search_field.js
index 84ac3ea099d..21b0a47d0d2 100644
--- a/themes/Backend/ExtJs/backend/config/model/form/search_field.js
+++ b/themes/Backend/ExtJs/backend/config/model/form/search_field.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Config
diff --git a/themes/Backend/ExtJs/backend/config/model/form/search_table.js b/themes/Backend/ExtJs/backend/config/model/form/search_table.js
index c599c991c25..081e517685a 100644
--- a/themes/Backend/ExtJs/backend/config/model/form/search_table.js
+++ b/themes/Backend/ExtJs/backend/config/model/form/search_table.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Config
diff --git a/themes/Backend/ExtJs/backend/config/model/form/shop.js b/themes/Backend/ExtJs/backend/config/model/form/shop.js
index cb0d7844cd5..0284e958015 100644
--- a/themes/Backend/ExtJs/backend/config/model/form/shop.js
+++ b/themes/Backend/ExtJs/backend/config/model/form/shop.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Config
diff --git a/themes/Backend/ExtJs/backend/config/model/form/tax.js b/themes/Backend/ExtJs/backend/config/model/form/tax.js
index 8265b336aaf..394b702dc02 100644
--- a/themes/Backend/ExtJs/backend/config/model/form/tax.js
+++ b/themes/Backend/ExtJs/backend/config/model/form/tax.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Config
diff --git a/themes/Backend/ExtJs/backend/config/model/form/unit.js b/themes/Backend/ExtJs/backend/config/model/form/unit.js
index b95486a2868..0d5972df5ea 100644
--- a/themes/Backend/ExtJs/backend/config/model/form/unit.js
+++ b/themes/Backend/ExtJs/backend/config/model/form/unit.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Config
diff --git a/themes/Backend/ExtJs/backend/config/model/form/widget.js b/themes/Backend/ExtJs/backend/config/model/form/widget.js
index b2c1e2ecfad..bc70786bb68 100644
--- a/themes/Backend/ExtJs/backend/config/model/form/widget.js
+++ b/themes/Backend/ExtJs/backend/config/model/form/widget.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Config
diff --git a/themes/Backend/ExtJs/backend/config/model/form/widget_view.js b/themes/Backend/ExtJs/backend/config/model/form/widget_view.js
index 106f6be7f31..1d2ccd408ba 100644
--- a/themes/Backend/ExtJs/backend/config/model/form/widget_view.js
+++ b/themes/Backend/ExtJs/backend/config/model/form/widget_view.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Config
diff --git a/themes/Backend/ExtJs/backend/config/model/main/element.js b/themes/Backend/ExtJs/backend/config/model/main/element.js
index fc6aa23ffc2..ba0f8113f59 100644
--- a/themes/Backend/ExtJs/backend/config/model/main/element.js
+++ b/themes/Backend/ExtJs/backend/config/model/main/element.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Config
diff --git a/themes/Backend/ExtJs/backend/config/model/main/element_translation.js b/themes/Backend/ExtJs/backend/config/model/main/element_translation.js
index cd391f6f062..e14ba9846b0 100644
--- a/themes/Backend/ExtJs/backend/config/model/main/element_translation.js
+++ b/themes/Backend/ExtJs/backend/config/model/main/element_translation.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Config
diff --git a/themes/Backend/ExtJs/backend/config/model/main/form.js b/themes/Backend/ExtJs/backend/config/model/main/form.js
index 9c6aeab0dc6..8010baf0206 100644
--- a/themes/Backend/ExtJs/backend/config/model/main/form.js
+++ b/themes/Backend/ExtJs/backend/config/model/main/form.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Config
diff --git a/themes/Backend/ExtJs/backend/config/model/main/form_translation.js b/themes/Backend/ExtJs/backend/config/model/main/form_translation.js
index cc5262cf34d..f02d8f6cb37 100644
--- a/themes/Backend/ExtJs/backend/config/model/main/form_translation.js
+++ b/themes/Backend/ExtJs/backend/config/model/main/form_translation.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Config
diff --git a/themes/Backend/ExtJs/backend/config/model/main/navigation.js b/themes/Backend/ExtJs/backend/config/model/main/navigation.js
index 2669061983e..cf5d27b15ac 100644
--- a/themes/Backend/ExtJs/backend/config/model/main/navigation.js
+++ b/themes/Backend/ExtJs/backend/config/model/main/navigation.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Config
diff --git a/themes/Backend/ExtJs/backend/config/model/main/value.js b/themes/Backend/ExtJs/backend/config/model/main/value.js
index f18cd601405..72e61aeac62 100644
--- a/themes/Backend/ExtJs/backend/config/model/main/value.js
+++ b/themes/Backend/ExtJs/backend/config/model/main/value.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Config
@@ -26,16 +25,12 @@
  * @version    $Id$
  * @author shopware AG
  */
-
-/**
- * todo@all: Documentation
- */
 //{block name="backend/config/model/main/value"}
 Ext.define('Shopware.apps.Config.model.main.Value', {
     extend: 'Ext.data.Model',
 
     fields: [
-        //{block name="backend/config/model/main/navigation/fields"}{/block}
+        //{block name="backend/config/model/main/value/fields"}{/block}
         { name: 'id', type: 'int', useNull: true },
         { name: 'shopId', type: 'int' },
         { name: 'value', defaultValue: null, useNull: true }
diff --git a/themes/Backend/ExtJs/backend/config/store/base/page_group.js b/themes/Backend/ExtJs/backend/config/store/base/page_group.js
index 2a6693a6429..73c2bc5428b 100644
--- a/themes/Backend/ExtJs/backend/config/store/base/page_group.js
+++ b/themes/Backend/ExtJs/backend/config/store/base/page_group.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/store/base/search_table.js b/themes/Backend/ExtJs/backend/config/store/base/search_table.js
index ef78846d2c9..9e47a18f166 100644
--- a/themes/Backend/ExtJs/backend/config/store/base/search_table.js
+++ b/themes/Backend/ExtJs/backend/config/store/base/search_table.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/store/detail/country.js b/themes/Backend/ExtJs/backend/config/store/detail/country.js
index 107d527c995..1dea8180a4d 100644
--- a/themes/Backend/ExtJs/backend/config/store/detail/country.js
+++ b/themes/Backend/ExtJs/backend/config/store/detail/country.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/store/detail/customer_group.js b/themes/Backend/ExtJs/backend/config/store/detail/customer_group.js
index 950077200a6..ed0ab4b081a 100644
--- a/themes/Backend/ExtJs/backend/config/store/detail/customer_group.js
+++ b/themes/Backend/ExtJs/backend/config/store/detail/customer_group.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/store/detail/document.js b/themes/Backend/ExtJs/backend/config/store/detail/document.js
index 08c794364eb..ca3353bc511 100644
--- a/themes/Backend/ExtJs/backend/config/store/detail/document.js
+++ b/themes/Backend/ExtJs/backend/config/store/detail/document.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/store/detail/page_group.js b/themes/Backend/ExtJs/backend/config/store/detail/page_group.js
index b9f08d25ec0..b3f071d02dd 100644
--- a/themes/Backend/ExtJs/backend/config/store/detail/page_group.js
+++ b/themes/Backend/ExtJs/backend/config/store/detail/page_group.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/store/detail/price_group.js b/themes/Backend/ExtJs/backend/config/store/detail/price_group.js
index ad30050bc54..49b7c76134c 100644
--- a/themes/Backend/ExtJs/backend/config/store/detail/price_group.js
+++ b/themes/Backend/ExtJs/backend/config/store/detail/price_group.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/store/detail/shop.js b/themes/Backend/ExtJs/backend/config/store/detail/shop.js
index 491ffed1297..c0190af7d9c 100644
--- a/themes/Backend/ExtJs/backend/config/store/detail/shop.js
+++ b/themes/Backend/ExtJs/backend/config/store/detail/shop.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/store/detail/tax.js b/themes/Backend/ExtJs/backend/config/store/detail/tax.js
index 47c9c8b8390..2576c9892c9 100644
--- a/themes/Backend/ExtJs/backend/config/store/detail/tax.js
+++ b/themes/Backend/ExtJs/backend/config/store/detail/tax.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/store/form/attribute.js b/themes/Backend/ExtJs/backend/config/store/form/attribute.js
index fbedee2e5bf..e777fe298d7 100644
--- a/themes/Backend/ExtJs/backend/config/store/form/attribute.js
+++ b/themes/Backend/ExtJs/backend/config/store/form/attribute.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/store/form/country.js b/themes/Backend/ExtJs/backend/config/store/form/country.js
index 9a1e588c31b..48e976c3a95 100644
--- a/themes/Backend/ExtJs/backend/config/store/form/country.js
+++ b/themes/Backend/ExtJs/backend/config/store/form/country.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/store/form/country_area.js b/themes/Backend/ExtJs/backend/config/store/form/country_area.js
index 5c4d3ab7c8f..4f55fb69d32 100644
--- a/themes/Backend/ExtJs/backend/config/store/form/country_area.js
+++ b/themes/Backend/ExtJs/backend/config/store/form/country_area.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/store/form/cron_job.js b/themes/Backend/ExtJs/backend/config/store/form/cron_job.js
index 279eda806b0..530b35c5c2b 100644
--- a/themes/Backend/ExtJs/backend/config/store/form/cron_job.js
+++ b/themes/Backend/ExtJs/backend/config/store/form/cron_job.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/store/form/currency.js b/themes/Backend/ExtJs/backend/config/store/form/currency.js
index 6ca5d7baec6..4483a5caf99 100644
--- a/themes/Backend/ExtJs/backend/config/store/form/currency.js
+++ b/themes/Backend/ExtJs/backend/config/store/form/currency.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/store/form/customer_group.js b/themes/Backend/ExtJs/backend/config/store/form/customer_group.js
index fe01a3913c5..ab4b7f6be7c 100644
--- a/themes/Backend/ExtJs/backend/config/store/form/customer_group.js
+++ b/themes/Backend/ExtJs/backend/config/store/form/customer_group.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/store/form/document.js b/themes/Backend/ExtJs/backend/config/store/form/document.js
index 37f7c2cdd70..53c8de9e1ae 100644
--- a/themes/Backend/ExtJs/backend/config/store/form/document.js
+++ b/themes/Backend/ExtJs/backend/config/store/form/document.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/store/form/locale.js b/themes/Backend/ExtJs/backend/config/store/form/locale.js
index 4db7ffeebab..63e18045582 100644
--- a/themes/Backend/ExtJs/backend/config/store/form/locale.js
+++ b/themes/Backend/ExtJs/backend/config/store/form/locale.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/store/form/number.js b/themes/Backend/ExtJs/backend/config/store/form/number.js
index 125833ea7eb..cfb51ae18a4 100644
--- a/themes/Backend/ExtJs/backend/config/store/form/number.js
+++ b/themes/Backend/ExtJs/backend/config/store/form/number.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/store/form/page_group.js b/themes/Backend/ExtJs/backend/config/store/form/page_group.js
index 04bcee31ceb..cfae8a1cd1c 100644
--- a/themes/Backend/ExtJs/backend/config/store/form/page_group.js
+++ b/themes/Backend/ExtJs/backend/config/store/form/page_group.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/store/form/price_group.js b/themes/Backend/ExtJs/backend/config/store/form/price_group.js
index 2bcf7a932f1..baee6d45bd7 100644
--- a/themes/Backend/ExtJs/backend/config/store/form/price_group.js
+++ b/themes/Backend/ExtJs/backend/config/store/form/price_group.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/store/form/search_field.js b/themes/Backend/ExtJs/backend/config/store/form/search_field.js
index a58d7b4f8ea..3020ed6723c 100644
--- a/themes/Backend/ExtJs/backend/config/store/form/search_field.js
+++ b/themes/Backend/ExtJs/backend/config/store/form/search_field.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/store/form/shop.js b/themes/Backend/ExtJs/backend/config/store/form/shop.js
index ea628392a2c..e4098b7680d 100644
--- a/themes/Backend/ExtJs/backend/config/store/form/shop.js
+++ b/themes/Backend/ExtJs/backend/config/store/form/shop.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/store/form/tax.js b/themes/Backend/ExtJs/backend/config/store/form/tax.js
index 96189de5270..a94b3aecd17 100644
--- a/themes/Backend/ExtJs/backend/config/store/form/tax.js
+++ b/themes/Backend/ExtJs/backend/config/store/form/tax.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/store/form/unit.js b/themes/Backend/ExtJs/backend/config/store/form/unit.js
index 2c7f164065f..45d0c419f54 100644
--- a/themes/Backend/ExtJs/backend/config/store/form/unit.js
+++ b/themes/Backend/ExtJs/backend/config/store/form/unit.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/store/form/widget.js b/themes/Backend/ExtJs/backend/config/store/form/widget.js
index 2177bf15b12..515df76e09b 100644
--- a/themes/Backend/ExtJs/backend/config/store/form/widget.js
+++ b/themes/Backend/ExtJs/backend/config/store/form/widget.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/store/form/widget_view.js b/themes/Backend/ExtJs/backend/config/store/form/widget_view.js
index 24f247907de..142b05f2416 100644
--- a/themes/Backend/ExtJs/backend/config/store/form/widget_view.js
+++ b/themes/Backend/ExtJs/backend/config/store/form/widget_view.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/store/main/form.js b/themes/Backend/ExtJs/backend/config/store/main/form.js
index 02f306183a6..9aec2d99d86 100644
--- a/themes/Backend/ExtJs/backend/config/store/main/form.js
+++ b/themes/Backend/ExtJs/backend/config/store/main/form.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Config
diff --git a/themes/Backend/ExtJs/backend/config/store/main/navigation.js b/themes/Backend/ExtJs/backend/config/store/main/navigation.js
index f639c0bfb59..d69ffb9c58b 100644
--- a/themes/Backend/ExtJs/backend/config/store/main/navigation.js
+++ b/themes/Backend/ExtJs/backend/config/store/main/navigation.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Config
diff --git a/themes/Backend/ExtJs/backend/config/view/base/detail.js b/themes/Backend/ExtJs/backend/config/view/base/detail.js
index dbb2d2e6673..3893b4772fa 100644
--- a/themes/Backend/ExtJs/backend/config/view/base/detail.js
+++ b/themes/Backend/ExtJs/backend/config/view/base/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/view/base/form.js b/themes/Backend/ExtJs/backend/config/view/base/form.js
index 6f8c55fe631..38c91d451cc 100644
--- a/themes/Backend/ExtJs/backend/config/view/base/form.js
+++ b/themes/Backend/ExtJs/backend/config/view/base/form.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/view/base/property.js b/themes/Backend/ExtJs/backend/config/view/base/property.js
index 2cb7a7222ad..a0585176832 100644
--- a/themes/Backend/ExtJs/backend/config/view/base/property.js
+++ b/themes/Backend/ExtJs/backend/config/view/base/property.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/view/base/search.js b/themes/Backend/ExtJs/backend/config/view/base/search.js
index e9cb50d7c64..a69c76dd5e6 100644
--- a/themes/Backend/ExtJs/backend/config/view/base/search.js
+++ b/themes/Backend/ExtJs/backend/config/view/base/search.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/view/base/table.js b/themes/Backend/ExtJs/backend/config/view/base/table.js
index 9bc2d8deece..053db1be294 100644
--- a/themes/Backend/ExtJs/backend/config/view/base/table.js
+++ b/themes/Backend/ExtJs/backend/config/view/base/table.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/common/listing.js b/themes/Backend/ExtJs/backend/config/view/custom_search/common/listing.js
index 48025c86ca1..e33f3b94a2f 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/common/listing.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/common/listing.js
@@ -3,23 +3,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/custom_search/common"}
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/category_facet.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/category_facet.js
index 72e4870d8d5..f14d656ef86 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/category_facet.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/category_facet.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/custom_search/translation"}
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/combined_condition_facet.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/combined_condition_facet.js
index 86d4c1a372b..f1b01a8e0ba 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/combined_condition_facet.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/combined_condition_facet.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/custom_search/translation"}
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/condition_selection.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/condition_selection.js
index e10ce085d62..8a0e20dee55 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/condition_selection.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/condition_selection.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/custom_search/translation"}
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/facet_interface.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/facet_interface.js
index c73c6cf6b51..769f4f6ba9e 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/facet_interface.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/facet_interface.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/custom_search/translation"}
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/height_facet.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/height_facet.js
index e5c020765d9..729d30fcbeb 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/height_facet.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/height_facet.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/custom_search/translation"}
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/immediate_delivery_facet.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/immediate_delivery_facet.js
index 5315be82ee6..9e900c373cb 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/immediate_delivery_facet.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/immediate_delivery_facet.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/custom_search/translation"}
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/length_facet.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/length_facet.js
index fe837d01c4b..c78920fad15 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/length_facet.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/length_facet.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/custom_search/translation"}
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/manufacturer_facet.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/manufacturer_facet.js
index 9425bbebf54..632506b9178 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/manufacturer_facet.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/manufacturer_facet.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/custom_search/translation"}
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/price_facet.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/price_facet.js
index 0086f1e0558..82f7307e5a0 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/price_facet.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/price_facet.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/custom_search/translation"}
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/product_attribute_facet.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/product_attribute_facet.js
index 1fcf5928a23..4d6e79bc9ae 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/product_attribute_facet.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/product_attribute_facet.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/custom_search/translation"}
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/property_facet.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/property_facet.js
index 4460448ac86..7b2c8b73cfd 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/property_facet.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/property_facet.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/custom_search/translation"}
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/shipping_free_facet.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/shipping_free_facet.js
index 869e84042db..c619c3816d4 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/shipping_free_facet.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/shipping_free_facet.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/custom_search/translation"}
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/variant_facet.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/variant_facet.js
index 2b5c27c6484..11ad03971af 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/variant_facet.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/variant_facet.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/config/view/variant_filter"}
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/vote_average_facet.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/vote_average_facet.js
index c3f758fa96d..0bc3c078fd6 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/vote_average_facet.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/vote_average_facet.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/custom_search/translation"}
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/weight_facet.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/weight_facet.js
index c910d72a33f..ff9310616a2 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/weight_facet.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/weight_facet.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/custom_search/translation"}
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/width_facet.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/width_facet.js
index 2310e17b73e..b9ab511f129 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/width_facet.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/classes/width_facet.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/custom_search/translation"}
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/detail.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/detail.js
index 60b169cb99b..3e082b1d8b0 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/detail.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/custom_search/translation"}
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/facet.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/facet.js
index 93cb4c450b4..ff223f7855e 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/facet.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/facet.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/custom_search/translation"}
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/listing.js b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/listing.js
index 9176db82ff6..5c86e0a36cc 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/facet/listing.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/facet/listing.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/custom_search/translation"}
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/overview.js b/themes/Backend/ExtJs/backend/config/view/custom_search/overview.js
index e0ba696ebdd..af0b7c7ed26 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/overview.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/overview.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/custom_search/translation"}
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/manual_sorting.js b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/manual_sorting.js
index 262efa3e347..24f5198097e 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/manual_sorting.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/manual_sorting.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/custom_search/translation"}
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/popularity_sorting.js b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/popularity_sorting.js
index cbabaab65dd..a7d53a64a31 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/popularity_sorting.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/popularity_sorting.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/custom_search/translation"}
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/price_sorting.js b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/price_sorting.js
index c3af5f4f208..078be5cce6c 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/price_sorting.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/price_sorting.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/custom_search/translation"}
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/product_attribute_sorting.js b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/product_attribute_sorting.js
index 7f0498d3781..4d1d9b63174 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/product_attribute_sorting.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/product_attribute_sorting.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/custom_search/translation"}
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/product_name_sorting.js b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/product_name_sorting.js
index 989a51bff0f..432828f3088 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/product_name_sorting.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/product_name_sorting.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/custom_search/translation"}
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/product_number_sorting.js b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/product_number_sorting.js
index 45de65fab8b..e295dc36f9a 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/product_number_sorting.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/product_number_sorting.js
@@ -2,28 +2,27 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/custom_search/translation"}
 
-//{block name="backend/config/view/custom_search/sorting/classes/product_name_sorting"}
+//{block name="backend/config/view/custom_search/sorting/classes/product_number_sorting"}
 
 Ext.define('Shopware.apps.Config.view.custom_search.sorting.classes.ProductNumberSorting', {
     extend: 'Shopware.apps.Config.view.custom_search.sorting.classes.SortingInterface',
@@ -33,7 +32,7 @@ Ext.define('Shopware.apps.Config.view.custom_search.sorting.classes.ProductNumbe
     },
 
     supports: function(sortingClass) {
-        return (sortingClass == 'Shopware\\Bundle\\SearchBundle\\Sorting\\ProductNumberSorting');
+        return (sortingClass === 'Shopware\\Bundle\\SearchBundle\\Sorting\\ProductNumberSorting');
     },
 
     load: function(sortingClass, parameters, callback) {
@@ -70,7 +69,7 @@ Ext.define('Shopware.apps.Config.view.custom_search.sorting.classes.ProductNumbe
     _createRecord: function(parameters) {
         var label = '{s name="product_number_sorting_asc"}{/s}';
 
-        if (parameters.direction == 'DESC') {
+        if (parameters.direction === 'DESC') {
             label = '{s name="product_number_sorting_desc"}{/s}';
         }
 
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/product_stock_sorting.js b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/product_stock_sorting.js
index ed50c8c6fa3..2b14ef769f9 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/product_stock_sorting.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/product_stock_sorting.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/custom_search/translation"}
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/release_date_sorting.js b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/release_date_sorting.js
index 56a80fb85e0..aab5f8e91c8 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/release_date_sorting.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/release_date_sorting.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/custom_search/translation"}
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/search_ranking_sorting.js b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/search_ranking_sorting.js
index fac746aeaef..5a36f89fd42 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/search_ranking_sorting.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/search_ranking_sorting.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/custom_search/translation"}
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/sorting_interface.js b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/sorting_interface.js
index 8823849fb5e..49da84acc3e 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/sorting_interface.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/classes/sorting_interface.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 Ext.define('Shopware.apps.Config.view.custom_search.sorting.classes.SortingInterface', {
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/detail.js b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/detail.js
index 39717f864fe..249ed490592 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/detail.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/custom_search/translation"}
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/includes/create_window.js b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/includes/create_window.js
index 21fab7cc754..5c0c7e41b03 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/includes/create_window.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/includes/create_window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/custom_search/translation"}
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/includes/direction_combo.js b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/includes/direction_combo.js
index f0421ade34b..5b2fd20a93e 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/includes/direction_combo.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/includes/direction_combo.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/custom_search/translation"}
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/listing.js b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/listing.js
index fb2345fbebe..e74638b021b 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/listing.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/listing.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/custom_search/translation"}
diff --git a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/sorting_selection.js b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/sorting_selection.js
index df8c0ae19df..27993e3c0ae 100644
--- a/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/sorting_selection.js
+++ b/themes/Backend/ExtJs/backend/config/view/custom_search/sorting/sorting_selection.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 ///{namespace name="backend/custom_search/translation"}
diff --git a/themes/Backend/ExtJs/backend/config/view/customer_group/detail.js b/themes/Backend/ExtJs/backend/config/view/customer_group/detail.js
index 817df054f73..cda0723e701 100644
--- a/themes/Backend/ExtJs/backend/config/view/customer_group/detail.js
+++ b/themes/Backend/ExtJs/backend/config/view/customer_group/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/view/customer_group/discount.js b/themes/Backend/ExtJs/backend/config/view/customer_group/discount.js
index d1b8cbd673a..af68d9323fb 100644
--- a/themes/Backend/ExtJs/backend/config/view/customer_group/discount.js
+++ b/themes/Backend/ExtJs/backend/config/view/customer_group/discount.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/view/element/custom_facet_grid.js b/themes/Backend/ExtJs/backend/config/view/element/custom_facet_grid.js
index e8bc0c10275..3333253c2ce 100644
--- a/themes/Backend/ExtJs/backend/config/view/element/custom_facet_grid.js
+++ b/themes/Backend/ExtJs/backend/config/view/element/custom_facet_grid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 Ext.define('Shopware.apps.Config.view.element.CustomFacetGrid', {
diff --git a/themes/Backend/ExtJs/backend/config/view/element/custom_sorting_grid.js b/themes/Backend/ExtJs/backend/config/view/element/custom_sorting_grid.js
index abeaf142f8a..0ed27dfaace 100644
--- a/themes/Backend/ExtJs/backend/config/view/element/custom_sorting_grid.js
+++ b/themes/Backend/ExtJs/backend/config/view/element/custom_sorting_grid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 Ext.define('Shopware.apps.Config.view.element.CustomSortingGrid', {
diff --git a/themes/Backend/ExtJs/backend/config/view/element/custom_sorting_selection.js b/themes/Backend/ExtJs/backend/config/view/element/custom_sorting_selection.js
index 6125dc853a2..bd01fa90311 100644
--- a/themes/Backend/ExtJs/backend/config/view/element/custom_sorting_selection.js
+++ b/themes/Backend/ExtJs/backend/config/view/element/custom_sorting_selection.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 Ext.define('Shopware.apps.Config.view.element.CustomSortingSelection', {
diff --git a/themes/Backend/ExtJs/backend/config/view/form/core_license.js b/themes/Backend/ExtJs/backend/config/view/form/core_license.js
index 96e4888165c..5ca19b747f1 100644
--- a/themes/Backend/ExtJs/backend/config/view/form/core_license.js
+++ b/themes/Backend/ExtJs/backend/config/view/form/core_license.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/config/view/core_license"}
diff --git a/themes/Backend/ExtJs/backend/config/view/form/country.js b/themes/Backend/ExtJs/backend/config/view/form/country.js
index c43f2fdb5e2..6639165d8b2 100644
--- a/themes/Backend/ExtJs/backend/config/view/form/country.js
+++ b/themes/Backend/ExtJs/backend/config/view/form/country.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/view/form/country_area.js b/themes/Backend/ExtJs/backend/config/view/form/country_area.js
index 1fe5dd36f76..b78f12f751a 100644
--- a/themes/Backend/ExtJs/backend/config/view/form/country_area.js
+++ b/themes/Backend/ExtJs/backend/config/view/form/country_area.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/view/form/cron_job.js b/themes/Backend/ExtJs/backend/config/view/form/cron_job.js
index 064fccbee8a..0441eb948d4 100644
--- a/themes/Backend/ExtJs/backend/config/view/form/cron_job.js
+++ b/themes/Backend/ExtJs/backend/config/view/form/cron_job.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/view/form/currency.js b/themes/Backend/ExtJs/backend/config/view/form/currency.js
index 0636db49db1..1aea7571bc7 100644
--- a/themes/Backend/ExtJs/backend/config/view/form/currency.js
+++ b/themes/Backend/ExtJs/backend/config/view/form/currency.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/view/form/customer_group.js b/themes/Backend/ExtJs/backend/config/view/form/customer_group.js
index 8d5fe814953..dc999e68085 100644
--- a/themes/Backend/ExtJs/backend/config/view/form/customer_group.js
+++ b/themes/Backend/ExtJs/backend/config/view/form/customer_group.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/view/form/document.js b/themes/Backend/ExtJs/backend/config/view/form/document.js
index a163e835c89..87ef12775ba 100644
--- a/themes/Backend/ExtJs/backend/config/view/form/document.js
+++ b/themes/Backend/ExtJs/backend/config/view/form/document.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/view/form/locale.js b/themes/Backend/ExtJs/backend/config/view/form/locale.js
index 5670e6e5c4d..77a1ccbf37d 100644
--- a/themes/Backend/ExtJs/backend/config/view/form/locale.js
+++ b/themes/Backend/ExtJs/backend/config/view/form/locale.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/view/form/number.js b/themes/Backend/ExtJs/backend/config/view/form/number.js
index 36110838a6c..d26ae8a9b61 100644
--- a/themes/Backend/ExtJs/backend/config/view/form/number.js
+++ b/themes/Backend/ExtJs/backend/config/view/form/number.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/view/form/page_group.js b/themes/Backend/ExtJs/backend/config/view/form/page_group.js
index c94d18b05d8..1615c5487e3 100644
--- a/themes/Backend/ExtJs/backend/config/view/form/page_group.js
+++ b/themes/Backend/ExtJs/backend/config/view/form/page_group.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/view/form/price_group.js b/themes/Backend/ExtJs/backend/config/view/form/price_group.js
index 9a7ca96dcdd..7721548ed92 100644
--- a/themes/Backend/ExtJs/backend/config/view/form/price_group.js
+++ b/themes/Backend/ExtJs/backend/config/view/form/price_group.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/view/form/search.js b/themes/Backend/ExtJs/backend/config/view/form/search.js
index beee31164e3..ae521c8f151 100644
--- a/themes/Backend/ExtJs/backend/config/view/form/search.js
+++ b/themes/Backend/ExtJs/backend/config/view/form/search.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/config/view/search"}
diff --git a/themes/Backend/ExtJs/backend/config/view/form/shop.js b/themes/Backend/ExtJs/backend/config/view/form/shop.js
index 2b534517240..c5cf2973529 100644
--- a/themes/Backend/ExtJs/backend/config/view/form/shop.js
+++ b/themes/Backend/ExtJs/backend/config/view/form/shop.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/view/form/tax.js b/themes/Backend/ExtJs/backend/config/view/form/tax.js
index 5e456f50c3f..cf299fc4842 100644
--- a/themes/Backend/ExtJs/backend/config/view/form/tax.js
+++ b/themes/Backend/ExtJs/backend/config/view/form/tax.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/view/form/unit.js b/themes/Backend/ExtJs/backend/config/view/form/unit.js
index 7b21e3364b5..ef18457fa2f 100644
--- a/themes/Backend/ExtJs/backend/config/view/form/unit.js
+++ b/themes/Backend/ExtJs/backend/config/view/form/unit.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/view/form/widget.js b/themes/Backend/ExtJs/backend/config/view/form/widget.js
index 74d256d2f6d..bef9c27bd11 100644
--- a/themes/Backend/ExtJs/backend/config/view/form/widget.js
+++ b/themes/Backend/ExtJs/backend/config/view/form/widget.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/view/main/fieldset.js b/themes/Backend/ExtJs/backend/config/view/main/fieldset.js
index b4d2e22308a..045dd109e33 100644
--- a/themes/Backend/ExtJs/backend/config/view/main/fieldset.js
+++ b/themes/Backend/ExtJs/backend/config/view/main/fieldset.js
@@ -2,32 +2,27 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-/**
- * todo@all: Documentation
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/config/view/main"}
 
-//{block name="backend/config/view/main/form"}
+//{block name="backend/config/view/main/fields_set"}
 Ext.define('Shopware.apps.Config.view.main.Fieldset', {
     extend: 'Ext.panel.Panel',
     alias: 'widget.config-fieldset',
@@ -42,9 +37,6 @@ Ext.define('Shopware.apps.Config.view.main.Fieldset', {
         hideEmptyLabel: false
     },
 
-    /**
-     *
-     */
     initComponent: function () {
         var me = this;
 
diff --git a/themes/Backend/ExtJs/backend/config/view/main/form.js b/themes/Backend/ExtJs/backend/config/view/main/form.js
index 3aef0fee9df..54759506d35 100644
--- a/themes/Backend/ExtJs/backend/config/view/main/form.js
+++ b/themes/Backend/ExtJs/backend/config/view/main/form.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/view/main/navigation.js b/themes/Backend/ExtJs/backend/config/view/main/navigation.js
index 42e6c63979c..93f820e0831 100644
--- a/themes/Backend/ExtJs/backend/config/view/main/navigation.js
+++ b/themes/Backend/ExtJs/backend/config/view/main/navigation.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Config
diff --git a/themes/Backend/ExtJs/backend/config/view/main/panel.js b/themes/Backend/ExtJs/backend/config/view/main/panel.js
index a932c13195b..4769346a23e 100644
--- a/themes/Backend/ExtJs/backend/config/view/main/panel.js
+++ b/themes/Backend/ExtJs/backend/config/view/main/panel.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Config
diff --git a/themes/Backend/ExtJs/backend/config/view/main/window.js b/themes/Backend/ExtJs/backend/config/view/main/window.js
index 20f3f283a9c..ab5a64c219c 100644
--- a/themes/Backend/ExtJs/backend/config/view/main/window.js
+++ b/themes/Backend/ExtJs/backend/config/view/main/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Config
diff --git a/themes/Backend/ExtJs/backend/config/view/shop/currency.js b/themes/Backend/ExtJs/backend/config/view/shop/currency.js
index 684e4138db4..35bc96a80f4 100644
--- a/themes/Backend/ExtJs/backend/config/view/shop/currency.js
+++ b/themes/Backend/ExtJs/backend/config/view/shop/currency.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/view/shop/detail.js b/themes/Backend/ExtJs/backend/config/view/shop/detail.js
index 4e04e30e6fd..915f95a80ff 100644
--- a/themes/Backend/ExtJs/backend/config/view/shop/detail.js
+++ b/themes/Backend/ExtJs/backend/config/view/shop/detail.js
@@ -2,31 +2,25 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-/**
- * todo@all: Documentation
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/config/view/form"}
-
 //{block name="backend/config/view/shop/detail"}
 Ext.define('Shopware.apps.Config.view.shop.Detail', {
     extend: 'Shopware.apps.Config.view.base.Detail',
@@ -53,19 +47,21 @@ Ext.define('Shopware.apps.Config.view.shop.Detail', {
             listeners: {
                 scope: me,
                 change: function (hidden, value) {
-                    var form = hidden.up('form'),
-                        typeSwitchField = form.down('[name=typeSwitch]'),
+                    var panel = hidden.up('form'),
+                        typeSwitchField = panel.down('[name=typeSwitch]'),
                         mainIdField,
+                        form = panel.getForm(),
                         type;
 
                     if (Ext.isEmpty(value)) {
-                        form.getForm().reset();
+                        form.reset();
                         typeSwitchField.setDisabled(false);
                         return;
                     }
 
-                    mainIdField = form.down('[name=mainId]');
+                    mainIdField = panel.down('[name=mainId]');
                     type = mainIdField.getValue() ? 'lang' : 'sub';
+
                     typeSwitchField.setValue(type);
                     typeSwitchField.setDisabled(value == 1);
                 }
@@ -128,7 +124,6 @@ Ext.define('Shopware.apps.Config.view.shop.Detail', {
     },
 
     getMainField: function() {
-        var me = this;
         return {
             xtype: 'base-element-select',
             name: 'mainId',
@@ -141,7 +136,6 @@ Ext.define('Shopware.apps.Config.view.shop.Detail', {
     },
 
     getDefaultField: function() {
-        var me = this;
         return {
             xtype: 'base-element-boolean',
             name: 'default',
diff --git a/themes/Backend/ExtJs/backend/config/view/shop/page.js b/themes/Backend/ExtJs/backend/config/view/shop/page.js
index 2252fe243ac..f9b769ec94b 100644
--- a/themes/Backend/ExtJs/backend/config/view/shop/page.js
+++ b/themes/Backend/ExtJs/backend/config/view/shop/page.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/view/tax/detail.js b/themes/Backend/ExtJs/backend/config/view/tax/detail.js
index 445bff25d2f..71da7f7f9ee 100644
--- a/themes/Backend/ExtJs/backend/config/view/tax/detail.js
+++ b/themes/Backend/ExtJs/backend/config/view/tax/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/view/tax/rule.js b/themes/Backend/ExtJs/backend/config/view/tax/rule.js
index 10e9da7e91f..b49bee50ae4 100644
--- a/themes/Backend/ExtJs/backend/config/view/tax/rule.js
+++ b/themes/Backend/ExtJs/backend/config/view/tax/rule.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/config/view/variant_filter/dynamic_variant_reader.js b/themes/Backend/ExtJs/backend/config/view/variant_filter/dynamic_variant_reader.js
index 947d1ef7724..da158b0fa72 100644
--- a/themes/Backend/ExtJs/backend/config/view/variant_filter/dynamic_variant_reader.js
+++ b/themes/Backend/ExtJs/backend/config/view/variant_filter/dynamic_variant_reader.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="backend/config/view/variant_filter/dynamic_variant_reader"}
diff --git a/themes/Backend/ExtJs/backend/config/view/variant_filter/expand_groups_grid.js b/themes/Backend/ExtJs/backend/config/view/variant_filter/expand_groups_grid.js
index d2d3ad6b085..95e9e6a3312 100644
--- a/themes/Backend/ExtJs/backend/config/view/variant_filter/expand_groups_grid.js
+++ b/themes/Backend/ExtJs/backend/config/view/variant_filter/expand_groups_grid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/config/view/variant_filter"}
diff --git a/themes/Backend/ExtJs/backend/config/view/variant_filter/expand_groups_hidden_field.js b/themes/Backend/ExtJs/backend/config/view/variant_filter/expand_groups_hidden_field.js
index 2f3e96dd960..b9e435bcfb2 100644
--- a/themes/Backend/ExtJs/backend/config/view/variant_filter/expand_groups_hidden_field.js
+++ b/themes/Backend/ExtJs/backend/config/view/variant_filter/expand_groups_hidden_field.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="backend/config/view/variant_filter/expand_groups_hidden_field"}
diff --git a/themes/Backend/ExtJs/backend/content_type/app.js b/themes/Backend/ExtJs/backend/content_type/app.js
index fd5d8d606eb..4ced72e474b 100644
--- a/themes/Backend/ExtJs/backend/content_type/app.js
+++ b/themes/Backend/ExtJs/backend/content_type/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {block name="backend/content_type/app"}
diff --git a/themes/Backend/ExtJs/backend/content_type/controller/main.js b/themes/Backend/ExtJs/backend/content_type/controller/main.js
index 2700d285afd..f1f44707d79 100644
--- a/themes/Backend/ExtJs/backend/content_type/controller/main.js
+++ b/themes/Backend/ExtJs/backend/content_type/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {block name="backend/content_type/controller/main"}
diff --git a/themes/Backend/ExtJs/backend/content_type/model/content.js b/themes/Backend/ExtJs/backend/content_type/model/content.js
index 1861bc939d0..b7359f5a225 100644
--- a/themes/Backend/ExtJs/backend/content_type/model/content.js
+++ b/themes/Backend/ExtJs/backend/content_type/model/content.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {block name="backend/content_type/model/content"}
diff --git a/themes/Backend/ExtJs/backend/content_type/store/content.js b/themes/Backend/ExtJs/backend/content_type/store/content.js
index 61afadb4e00..b1a9af1fe15 100644
--- a/themes/Backend/ExtJs/backend/content_type/store/content.js
+++ b/themes/Backend/ExtJs/backend/content_type/store/content.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {block name="backend/content_type/store/content"}
diff --git a/themes/Backend/ExtJs/backend/content_type/view/detail/content.js b/themes/Backend/ExtJs/backend/content_type/view/detail/content.js
index e7b76fc7f1d..b0bd1572609 100644
--- a/themes/Backend/ExtJs/backend/content_type/view/detail/content.js
+++ b/themes/Backend/ExtJs/backend/content_type/view/detail/content.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {block name="backend/content_type/view/detail/content"}
diff --git a/themes/Backend/ExtJs/backend/content_type/view/detail/window.js b/themes/Backend/ExtJs/backend/content_type/view/detail/window.js
index 3eed9212326..5271f660d46 100644
--- a/themes/Backend/ExtJs/backend/content_type/view/detail/window.js
+++ b/themes/Backend/ExtJs/backend/content_type/view/detail/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {block name="backend/content_type/view/detail/window"}
diff --git a/themes/Backend/ExtJs/backend/content_type/view/fields/single_selection.js b/themes/Backend/ExtJs/backend/content_type/view/fields/single_selection.js
index 3329420890e..fa9ffdc90e1 100644
--- a/themes/Backend/ExtJs/backend/content_type/view/fields/single_selection.js
+++ b/themes/Backend/ExtJs/backend/content_type/view/fields/single_selection.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {block name="backend/content_type/view/fields/single_selection"}
diff --git a/themes/Backend/ExtJs/backend/content_type/view/fields/static_combobox.js b/themes/Backend/ExtJs/backend/content_type/view/fields/static_combobox.js
index aa8bb4854a9..7a7d288ce4f 100644
--- a/themes/Backend/ExtJs/backend/content_type/view/fields/static_combobox.js
+++ b/themes/Backend/ExtJs/backend/content_type/view/fields/static_combobox.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {block name="backend/content_type/view/fields/static_combobox"}
diff --git a/themes/Backend/ExtJs/backend/content_type/view/list/content.js b/themes/Backend/ExtJs/backend/content_type/view/list/content.js
index 77b335cbf10..3bc61cde1da 100644
--- a/themes/Backend/ExtJs/backend/content_type/view/list/content.js
+++ b/themes/Backend/ExtJs/backend/content_type/view/list/content.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {block name="backend/content_type/view/list/content"}
diff --git a/themes/Backend/ExtJs/backend/content_type/view/list/window.js b/themes/Backend/ExtJs/backend/content_type/view/list/window.js
index c19eeca815b..63dba53903e 100644
--- a/themes/Backend/ExtJs/backend/content_type/view/list/window.js
+++ b/themes/Backend/ExtJs/backend/content_type/view/list/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {block name="backend/content_type/view/list/window"}
diff --git a/themes/Backend/ExtJs/backend/content_type_manager/app.js b/themes/Backend/ExtJs/backend/content_type_manager/app.js
index 7b8a7f505ca..cee883df7a5 100644
--- a/themes/Backend/ExtJs/backend/content_type_manager/app.js
+++ b/themes/Backend/ExtJs/backend/content_type_manager/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {block name="backend/content_type_manager/app"}
diff --git a/themes/Backend/ExtJs/backend/content_type_manager/controller/detail.js b/themes/Backend/ExtJs/backend/content_type_manager/controller/detail.js
index 1f50e9fb420..7a0fcd5ce90 100644
--- a/themes/Backend/ExtJs/backend/content_type_manager/controller/detail.js
+++ b/themes/Backend/ExtJs/backend/content_type_manager/controller/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {block name="backend/content_type_manager/controller/detail"}
diff --git a/themes/Backend/ExtJs/backend/content_type_manager/controller/field.js b/themes/Backend/ExtJs/backend/content_type_manager/controller/field.js
index 2245e0476cd..2917ae64844 100644
--- a/themes/Backend/ExtJs/backend/content_type_manager/controller/field.js
+++ b/themes/Backend/ExtJs/backend/content_type_manager/controller/field.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {block name="backend/content_type_manager/controller/field"}
diff --git a/themes/Backend/ExtJs/backend/content_type_manager/controller/main.js b/themes/Backend/ExtJs/backend/content_type_manager/controller/main.js
index 9d62c96d1e1..b3fac7f4920 100644
--- a/themes/Backend/ExtJs/backend/content_type_manager/controller/main.js
+++ b/themes/Backend/ExtJs/backend/content_type_manager/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {block name="backend/content_type_manager/controller/main"}
diff --git a/themes/Backend/ExtJs/backend/content_type_manager/model/field.js b/themes/Backend/ExtJs/backend/content_type_manager/model/field.js
index 491cf183573..c536af154d7 100644
--- a/themes/Backend/ExtJs/backend/content_type_manager/model/field.js
+++ b/themes/Backend/ExtJs/backend/content_type_manager/model/field.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {block name="backend/content_type_manager/model/field"}
diff --git a/themes/Backend/ExtJs/backend/content_type_manager/model/type.js b/themes/Backend/ExtJs/backend/content_type_manager/model/type.js
index 1548bf30b20..78ca752203b 100644
--- a/themes/Backend/ExtJs/backend/content_type_manager/model/type.js
+++ b/themes/Backend/ExtJs/backend/content_type_manager/model/type.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {block name="backend/content_type_manager/model/type"}
diff --git a/themes/Backend/ExtJs/backend/content_type_manager/model/url.js b/themes/Backend/ExtJs/backend/content_type_manager/model/url.js
index 104b6b3f1c9..0ea33c66dfc 100644
--- a/themes/Backend/ExtJs/backend/content_type_manager/model/url.js
+++ b/themes/Backend/ExtJs/backend/content_type_manager/model/url.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {block name="backend/content_type_manager/model/url"}
diff --git a/themes/Backend/ExtJs/backend/content_type_manager/store/fields.js b/themes/Backend/ExtJs/backend/content_type_manager/store/fields.js
index 86165fb8d10..3d0c65f9bee 100644
--- a/themes/Backend/ExtJs/backend/content_type_manager/store/fields.js
+++ b/themes/Backend/ExtJs/backend/content_type_manager/store/fields.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {block name="backend/content_type_manager/store/fields"}
diff --git a/themes/Backend/ExtJs/backend/content_type_manager/store/robots.js b/themes/Backend/ExtJs/backend/content_type_manager/store/robots.js
index e332b699cc1..7e1dc14f82b 100644
--- a/themes/Backend/ExtJs/backend/content_type_manager/store/robots.js
+++ b/themes/Backend/ExtJs/backend/content_type_manager/store/robots.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {namespace name="backend/content_type_manager/main"}
diff --git a/themes/Backend/ExtJs/backend/content_type_manager/store/type.js b/themes/Backend/ExtJs/backend/content_type_manager/store/type.js
index ca6b8692999..197aabba486 100644
--- a/themes/Backend/ExtJs/backend/content_type_manager/store/type.js
+++ b/themes/Backend/ExtJs/backend/content_type_manager/store/type.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {block name="backend/content_type_manager/store/type"}
diff --git a/themes/Backend/ExtJs/backend/content_type_manager/view/detail/fields.js b/themes/Backend/ExtJs/backend/content_type_manager/view/detail/fields.js
index eafcf19c0c6..99f84d746d0 100644
--- a/themes/Backend/ExtJs/backend/content_type_manager/view/detail/fields.js
+++ b/themes/Backend/ExtJs/backend/content_type_manager/view/detail/fields.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {namespace name="backend/content_type_manager/main"}
diff --git a/themes/Backend/ExtJs/backend/content_type_manager/view/detail/type.js b/themes/Backend/ExtJs/backend/content_type_manager/view/detail/type.js
index 4aef2ff27f0..3376a0ef3f1 100644
--- a/themes/Backend/ExtJs/backend/content_type_manager/view/detail/type.js
+++ b/themes/Backend/ExtJs/backend/content_type_manager/view/detail/type.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {namespace name="backend/content_type_manager/main"}
diff --git a/themes/Backend/ExtJs/backend/content_type_manager/view/detail/window.js b/themes/Backend/ExtJs/backend/content_type_manager/view/detail/window.js
index 97c97194e3a..dc3aee6a459 100644
--- a/themes/Backend/ExtJs/backend/content_type_manager/view/detail/window.js
+++ b/themes/Backend/ExtJs/backend/content_type_manager/view/detail/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {namespace name="backend/content_type_manager/main"}
diff --git a/themes/Backend/ExtJs/backend/content_type_manager/view/field/fieldset.js b/themes/Backend/ExtJs/backend/content_type_manager/view/field/fieldset.js
index 0b31a0ad5a3..5aa902fe07b 100644
--- a/themes/Backend/ExtJs/backend/content_type_manager/view/field/fieldset.js
+++ b/themes/Backend/ExtJs/backend/content_type_manager/view/field/fieldset.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {namespace name="backend/content_type_manager/main"}
diff --git a/themes/Backend/ExtJs/backend/content_type_manager/view/field/form.js b/themes/Backend/ExtJs/backend/content_type_manager/view/field/form.js
index d6176cedacb..7dcb0b0ede4 100644
--- a/themes/Backend/ExtJs/backend/content_type_manager/view/field/form.js
+++ b/themes/Backend/ExtJs/backend/content_type_manager/view/field/form.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {namespace name="backend/content_type_manager/main"}
@@ -152,25 +151,25 @@ Ext.define('Shopware.apps.ContentTypeManager.view.field.Form', {
 
         if (value) {
             var record = combobox.store.getById(value);
-
-            var disableFields = [
-                me.down('[name="showListing"]'),
-                me.down('[name="searchAble"]')
-            ];
-
-            if (record.get('hasResolver')) {
-                disableFields.forEach(function (item) {
-                    me.record.set(item.getName(), false);
-                    item.setValue(false);
-                    item.setDisabled(true);
-                });
-            } else {
-                disableFields.forEach(function (item) {
-                    item.setDisabled(false);
-                });
+            if (record) {
+                var disableFields = [
+                    me.down('[name="showListing"]'),
+                    me.down('[name="searchAble"]')
+                ];
+
+                if (record.get('hasResolver')) {
+                    disableFields.forEach(function (item) {
+                        me.record.set(item.getName(), false);
+                        item.setValue(false);
+                        item.setDisabled(true);
+                    });
+                } else {
+                    disableFields.forEach(function (item) {
+                        item.setDisabled(false);
+                    });
+                }
             }
-
-        };
+        }
 
         this.handlers.forEach(function (handler) {
             if (handler.is(value)) {
diff --git a/themes/Backend/ExtJs/backend/content_type_manager/view/field/window.js b/themes/Backend/ExtJs/backend/content_type_manager/view/field/window.js
index 043c7bfa14e..0d4b6071377 100644
--- a/themes/Backend/ExtJs/backend/content_type_manager/view/field/window.js
+++ b/themes/Backend/ExtJs/backend/content_type_manager/view/field/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {namespace name="backend/content_type_manager/main"}
diff --git a/themes/Backend/ExtJs/backend/content_type_manager/view/field_handler/combobox_handler.js b/themes/Backend/ExtJs/backend/content_type_manager/view/field_handler/combobox_handler.js
index 9c9153a528e..1f60143993d 100644
--- a/themes/Backend/ExtJs/backend/content_type_manager/view/field_handler/combobox_handler.js
+++ b/themes/Backend/ExtJs/backend/content_type_manager/view/field_handler/combobox_handler.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {namespace name="backend/content_type_manager/main"}
diff --git a/themes/Backend/ExtJs/backend/content_type_manager/view/field_handler/integer_handler.js b/themes/Backend/ExtJs/backend/content_type_manager/view/field_handler/integer_handler.js
index d4755209e7e..67337d48d97 100644
--- a/themes/Backend/ExtJs/backend/content_type_manager/view/field_handler/integer_handler.js
+++ b/themes/Backend/ExtJs/backend/content_type_manager/view/field_handler/integer_handler.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {namespace name="backend/content_type_manager/main"}
diff --git a/themes/Backend/ExtJs/backend/content_type_manager/view/list/grid.js b/themes/Backend/ExtJs/backend/content_type_manager/view/list/grid.js
index 75425701def..cb97f3a77c8 100644
--- a/themes/Backend/ExtJs/backend/content_type_manager/view/list/grid.js
+++ b/themes/Backend/ExtJs/backend/content_type_manager/view/list/grid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {namespace name="backend/content_type_manager/main"}
diff --git a/themes/Backend/ExtJs/backend/content_type_manager/view/list/window.js b/themes/Backend/ExtJs/backend/content_type_manager/view/list/window.js
index 7c966d780f6..2b4b720e6f9 100644
--- a/themes/Backend/ExtJs/backend/content_type_manager/view/list/window.js
+++ b/themes/Backend/ExtJs/backend/content_type_manager/view/list/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 // {namespace name="backend/content_type_manager/main"}
diff --git a/themes/Backend/ExtJs/backend/customer/app.js b/themes/Backend/ExtJs/backend/customer/app.js
index 58d0035b2e8..64332690649 100644
--- a/themes/Backend/ExtJs/backend/customer/app.js
+++ b/themes/Backend/ExtJs/backend/customer/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
@@ -81,7 +80,6 @@ Ext.define('Shopware.apps.Customer', {
         'main.CustomerList',
         'main.CustomerListFilter',
         'main.Window',
-        'main.Wizard',
 
         'detail.Window',
         'detail.Base',
diff --git a/themes/Backend/ExtJs/backend/customer/controller/detail.js b/themes/Backend/ExtJs/backend/customer/controller/detail.js
index 6942d5ea7d6..b1e5cb1829f 100644
--- a/themes/Backend/ExtJs/backend/customer/controller/detail.js
+++ b/themes/Backend/ExtJs/backend/customer/controller/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/controller/main.js b/themes/Backend/ExtJs/backend/customer/controller/main.js
index 147beb1d44a..2cdb840325d 100644
--- a/themes/Backend/ExtJs/backend/customer/controller/main.js
+++ b/themes/Backend/ExtJs/backend/customer/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
@@ -89,35 +88,11 @@ Ext.define('Shopware.apps.Customer.controller.Main', {
                 var config = Ext.JSON.decode(response.responseText);
 
                 if (!config || config.length <= 0) {
-                    config = { showWizard: true, autoIndex: false };
+                    config = { autoIndex: false };
                 }
 
                 me.subApplication.userConfig = config;
 
-                if (!config.showWizard) {
-                    me.mainWindow = me.getView('main.Window').create();
-                    return;
-                }
-
-                var wizard = me.getView('main.Wizard').create();
-                wizard.on('finish', Ext.bind(me.switchWizardConfig, me));
-                wizard.show();
-            }
-        });
-    },
-
-    switchWizardConfig: function() {
-        var me = this, config = me.subApplication.userConfig;
-
-        config.showWizard = false;
-
-        Ext.Ajax.request({
-            url: '{url controller=UserConfig action=save}',
-            params: {
-                config: Ext.JSON.encode(config),
-                name: 'customer_module'
-            },
-            callback: function() {
                 me.mainWindow = me.getView('main.Window').create();
             }
         });
@@ -170,6 +145,5 @@ Ext.define('Shopware.apps.Customer.controller.Main', {
             }
         });
     }
-
 });
 // {/block}
diff --git a/themes/Backend/ExtJs/backend/customer/controller/order.js b/themes/Backend/ExtJs/backend/customer/controller/order.js
index 31c7d7f27cf..fc7e2aff79b 100644
--- a/themes/Backend/ExtJs/backend/customer/controller/order.js
+++ b/themes/Backend/ExtJs/backend/customer/controller/order.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/controller/stream.js b/themes/Backend/ExtJs/backend/customer/controller/stream.js
index f6ed8b854f7..7f33a37bcef 100644
--- a/themes/Backend/ExtJs/backend/customer/controller/stream.js
+++ b/themes/Backend/ExtJs/backend/customer/controller/stream.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/model/address.js b/themes/Backend/ExtJs/backend/customer/model/address.js
index c58c819df53..9d4eced722a 100644
--- a/themes/Backend/ExtJs/backend/customer/model/address.js
+++ b/themes/Backend/ExtJs/backend/customer/model/address.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/model/batch.js b/themes/Backend/ExtJs/backend/customer/model/batch.js
index db26966a772..d6f976604a1 100644
--- a/themes/Backend/ExtJs/backend/customer/model/batch.js
+++ b/themes/Backend/ExtJs/backend/customer/model/batch.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
@@ -35,7 +34,7 @@
  * The customer model of the customer module represent a data row of the s_user or the
  * Shopware\Models\Customer\Customer doctrine model, with some additional data for the additional information panel.
  */
-// {block name="backend/customer/model/customer"}
+// {block name="backend/customer/model/batch"}
 Ext.define('Shopware.apps.Customer.model.Batch', {
 
     /**
@@ -48,7 +47,7 @@ Ext.define('Shopware.apps.Customer.model.Batch', {
      * @array
      */
     fields: [
-        // {block name="backend/customer/model/customer/fields"}{/block}
+        // {block name="backend/customer/model/batch/fields"}{/block}
         { name: 'id', type: 'int' }
     ],
 
diff --git a/themes/Backend/ExtJs/backend/customer/model/chart.js b/themes/Backend/ExtJs/backend/customer/model/chart.js
index 17c0697dce5..c08907fe83c 100644
--- a/themes/Backend/ExtJs/backend/customer/model/chart.js
+++ b/themes/Backend/ExtJs/backend/customer/model/chart.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/model/customer.js b/themes/Backend/ExtJs/backend/customer/model/customer.js
index b9e3d9a8399..438256fe050 100644
--- a/themes/Backend/ExtJs/backend/customer/model/customer.js
+++ b/themes/Backend/ExtJs/backend/customer/model/customer.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/model/customer_stream.js b/themes/Backend/ExtJs/backend/customer/model/customer_stream.js
index e76f997b665..8fb48d25b98 100755
--- a/themes/Backend/ExtJs/backend/customer/model/customer_stream.js
+++ b/themes/Backend/ExtJs/backend/customer/model/customer_stream.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/model/debit.js b/themes/Backend/ExtJs/backend/customer/model/debit.js
index 1d777c6d97c..cbd9e5447d1 100644
--- a/themes/Backend/ExtJs/backend/customer/model/debit.js
+++ b/themes/Backend/ExtJs/backend/customer/model/debit.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/model/order.js b/themes/Backend/ExtJs/backend/customer/model/order.js
index eb7884b25d7..82346362322 100644
--- a/themes/Backend/ExtJs/backend/customer/model/order.js
+++ b/themes/Backend/ExtJs/backend/customer/model/order.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/model/payment_data.js b/themes/Backend/ExtJs/backend/customer/model/payment_data.js
index 2000df6bfb7..96f7d2522d3 100644
--- a/themes/Backend/ExtJs/backend/customer/model/payment_data.js
+++ b/themes/Backend/ExtJs/backend/customer/model/payment_data.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/model/quick_view.js b/themes/Backend/ExtJs/backend/customer/model/quick_view.js
index 5602d12c6a3..f00255c20d3 100644
--- a/themes/Backend/ExtJs/backend/customer/model/quick_view.js
+++ b/themes/Backend/ExtJs/backend/customer/model/quick_view.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/store/address.js b/themes/Backend/ExtJs/backend/customer/store/address.js
index c23b4304798..1b303807981 100644
--- a/themes/Backend/ExtJs/backend/customer/store/address.js
+++ b/themes/Backend/ExtJs/backend/customer/store/address.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/store/batch.js b/themes/Backend/ExtJs/backend/customer/store/batch.js
index ca428e0fb75..778603c9700 100644
--- a/themes/Backend/ExtJs/backend/customer/store/batch.js
+++ b/themes/Backend/ExtJs/backend/customer/store/batch.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/store/chart.js b/themes/Backend/ExtJs/backend/customer/store/chart.js
index 4a8bb45e35e..7d39b02b6ce 100644
--- a/themes/Backend/ExtJs/backend/customer/store/chart.js
+++ b/themes/Backend/ExtJs/backend/customer/store/chart.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/store/customer_stream.js b/themes/Backend/ExtJs/backend/customer/store/customer_stream.js
index 4524beed34e..84dbff32d22 100755
--- a/themes/Backend/ExtJs/backend/customer/store/customer_stream.js
+++ b/themes/Backend/ExtJs/backend/customer/store/customer_stream.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/store/detail.js b/themes/Backend/ExtJs/backend/customer/store/detail.js
index 514810f114e..b8809b5f6b5 100644
--- a/themes/Backend/ExtJs/backend/customer/store/detail.js
+++ b/themes/Backend/ExtJs/backend/customer/store/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/store/orders.js b/themes/Backend/ExtJs/backend/customer/store/orders.js
index 2a70f659387..27a31483798 100644
--- a/themes/Backend/ExtJs/backend/customer/store/orders.js
+++ b/themes/Backend/ExtJs/backend/customer/store/orders.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/store/preview.js b/themes/Backend/ExtJs/backend/customer/store/preview.js
index 43d94fd4d60..1c45ae5a2f0 100755
--- a/themes/Backend/ExtJs/backend/customer/store/preview.js
+++ b/themes/Backend/ExtJs/backend/customer/store/preview.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/store/quick_view.js b/themes/Backend/ExtJs/backend/customer/store/quick_view.js
index bad626d37d7..c209faf2bfc 100644
--- a/themes/Backend/ExtJs/backend/customer/store/quick_view.js
+++ b/themes/Backend/ExtJs/backend/customer/store/quick_view.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/address/detail/address.js b/themes/Backend/ExtJs/backend/customer/view/address/detail/address.js
index 7f6ec6e2f52..e1af08ab9f8 100644
--- a/themes/Backend/ExtJs/backend/customer/view/address/detail/address.js
+++ b/themes/Backend/ExtJs/backend/customer/view/address/detail/address.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/address/detail/window.js b/themes/Backend/ExtJs/backend/customer/view/address/detail/window.js
index 4fb3c102c05..62e48336650 100644
--- a/themes/Backend/ExtJs/backend/customer/view/address/detail/window.js
+++ b/themes/Backend/ExtJs/backend/customer/view/address/detail/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/address/list.js b/themes/Backend/ExtJs/backend/customer/view/address/list.js
index f3c6e5cd04e..e81db531fbc 100644
--- a/themes/Backend/ExtJs/backend/customer/view/address/list.js
+++ b/themes/Backend/ExtJs/backend/customer/view/address/list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/chart/amount_chart_factory.js b/themes/Backend/ExtJs/backend/customer/view/chart/amount_chart_factory.js
index ae25f00485c..2e026e0d6c0 100644
--- a/themes/Backend/ExtJs/backend/customer/view/chart/amount_chart_factory.js
+++ b/themes/Backend/ExtJs/backend/customer/view/chart/amount_chart_factory.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/chart/chart.js b/themes/Backend/ExtJs/backend/customer/view/chart/chart.js
index cfa030eb5c4..26442e13be0 100644
--- a/themes/Backend/ExtJs/backend/customer/view/chart/chart.js
+++ b/themes/Backend/ExtJs/backend/customer/view/chart/chart.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/chart/meta_chart.js b/themes/Backend/ExtJs/backend/customer/view/chart/meta_chart.js
index b556054cd54..ed914adac8a 100644
--- a/themes/Backend/ExtJs/backend/customer/view/chart/meta_chart.js
+++ b/themes/Backend/ExtJs/backend/customer/view/chart/meta_chart.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/condition_field.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/condition_field.js
index b17f89b613f..ade0741c636 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/condition_field.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/condition_field.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/condition_panel.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/condition_panel.js
index 713125e4af5..6b54b218722 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/condition_panel.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/condition_panel.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/account_mode_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/account_mode_condition.js
index d0432f61327..418e1728111 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/account_mode_condition.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/account_mode_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/age_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/age_condition.js
index bfc0f598d89..8a5f6c8e658 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/age_condition.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/age_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/customer_attribute_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/customer_attribute_condition.js
index 498d07d2653..79e15d32103 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/customer_attribute_condition.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/customer_attribute_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/field/attribute_value.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/field/attribute_value.js
index d0e97d461a7..0d9be2c881a 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/field/attribute_value.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/field/attribute_value.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/field/attribute_window.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/field/attribute_window.js
index a13a70b22bd..596ce253f39 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/field/attribute_window.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/field/attribute_window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/field/operator_field.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/field/operator_field.js
index 672374af9a0..80382671ca0 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/field/operator_field.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/field/operator_field.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_address_with_country_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_address_with_country_condition.js
index 0b17d859c7a..41248a7dc46 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_address_with_country_condition.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_address_with_country_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_canceled_orders_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_canceled_orders_condition.js
index 09577182c6c..68188cf8b74 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_canceled_orders_condition.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_canceled_orders_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_newsletter_registration_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_newsletter_registration_condition.js
index 1486eb307ff..64b196d8217 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_newsletter_registration_condition.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_newsletter_registration_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_no_address_with_country_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_no_address_with_country_condition.js
index b0a0f2e69f3..02b9558c4aa 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_no_address_with_country_condition.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_no_address_with_country_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_no_canceled_orders_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_no_canceled_orders_condition.js
index cf781bd733c..e7c9c8c6ba9 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_no_canceled_orders_condition.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_no_canceled_orders_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_no_newsletter_registration_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_no_newsletter_registration_condition.js
index 368d8a1dd77..62c029025e7 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_no_newsletter_registration_condition.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_no_newsletter_registration_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_order_count_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_order_count_condition.js
index 0434dd592d8..f105c35a46e 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_order_count_condition.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_order_count_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_total_order_amount_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_total_order_amount_condition.js
index c4e3b49a9eb..186434529db 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_total_order_amount_condition.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_total_order_amount_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/is_customer_since_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/is_customer_since_condition.js
index d7288c16e5e..088dbe9fb28 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/is_customer_since_condition.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/is_customer_since_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/is_in_customer_group_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/is_in_customer_group_condition.js
index e3b17bfd39d..7c840501aa6 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/is_in_customer_group_condition.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/is_in_customer_group_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/is_not_in_customer_group_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/is_not_in_customer_group_condition.js
index f2b92fe2af0..29ba28d0008 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/is_not_in_customer_group_condition.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/is_not_in_customer_group_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_in_last_days_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_in_last_days_condition.js
index 2e2340c79b2..adbce8084b6 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_in_last_days_condition.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_in_last_days_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_in_shop_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_in_shop_condition.js
index 50346b75a64..0da59a2145f 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_in_shop_condition.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_in_shop_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_product_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_product_condition.js
index 56909926732..57fb761b2ac 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_product_condition.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_product_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_product_of_category_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_product_of_category_condition.js
index 54543649b1a..9a5231aa7cf 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_product_of_category_condition.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_product_of_category_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_product_of_manufacturer_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_product_of_manufacturer_condition.js
index 5861c9cd86b..4cecd9fdf33 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_product_of_manufacturer_condition.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_product_of_manufacturer_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_with_delivery_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_with_delivery_condition.js
index 58d674aea3c..dd92ed71a22 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_with_delivery_condition.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_with_delivery_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_with_payment_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_with_payment_condition.js
index d7e1906ca4b..aebd7297c51 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_with_payment_condition.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_ordered_with_payment_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_registered_in_shop_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_registered_in_shop_condition.js
index 7d1a2e5ea3f..d670be1e029 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_registered_in_shop_condition.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_registered_in_shop_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
@@ -28,7 +27,7 @@
  */
 
 // {namespace name="backend/customer/view/main"}
-// {block name="backend/customer/view/customer_stream/conditions/registered_in_shop_condition"}
+// {block name="backend/customer/view/customer_stream/conditions/not_registered_in_shop_condition"}
 Ext.define('Shopware.apps.Customer.view.customer_stream.conditions.NotRegisteredInShopCondition', {
 
     getLabel: function() {
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_salutation_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_salutation_condition.js
index 499fcf0997a..c62874c6ddc 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_salutation_condition.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/not_salutation_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_at_weekday_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_at_weekday_condition.js
index fcb45b7e3eb..a4639e53e50 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_at_weekday_condition.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_at_weekday_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_in_last_days_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_in_last_days_condition.js
index 84b03bd695b..045a582d5cf 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_in_last_days_condition.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_in_last_days_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_in_shop_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_in_shop_condition.js
index 14a27253126..c53e66738b6 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_in_shop_condition.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_in_shop_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_on_device_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_on_device_condition.js
index f310b42bedc..b5bc5881667 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_on_device_condition.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_on_device_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_product_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_product_condition.js
index 390b72c6dc5..5c9233610b2 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_product_condition.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_product_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_product_of_category_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_product_of_category_condition.js
index 5e3242ef4bc..34d753e1a20 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_product_of_category_condition.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_product_of_category_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_product_of_manufacturer_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_product_of_manufacturer_condition.js
index 89e6da84b47..8db69d49ed3 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_product_of_manufacturer_condition.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_product_of_manufacturer_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_with_delivery_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_with_delivery_condition.js
index 8b1955490d1..0bbc52056b2 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_with_delivery_condition.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_with_delivery_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_with_payment_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_with_payment_condition.js
index fb22582b6ba..67d5e0827d0 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_with_payment_condition.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/ordered_with_payment_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/registered_in_shop_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/registered_in_shop_condition.js
index be1e14d5ed0..6f1bd6b597a 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/registered_in_shop_condition.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/registered_in_shop_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/salutation_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/salutation_condition.js
index 3422575fa0b..95c2ac20636 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/salutation_condition.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/salutation_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/search_term_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/search_term_condition.js
index 82280abe4d5..d1781ba6120 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/search_term_condition.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/search_term_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/detail.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/detail.js
index 1af8871b355..dfd711990ab 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/detail.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/listing.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/listing.js
index 54c80424d42..cf00454f182 100755
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/listing.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/listing.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/preview.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/preview.js
index 7cd4278efb9..b964bbbb313 100644
--- a/themes/Backend/ExtJs/backend/customer/view/customer_stream/preview.js
+++ b/themes/Backend/ExtJs/backend/customer/view/customer_stream/preview.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
@@ -225,7 +224,7 @@ Ext.define('Shopware.apps.Customer.view.customer_stream.Preview', {
                     company = '<br>' + record.get('company') + '';
                 }
 
-                var mail = Ext.String.format('<a href="mailto:[0]" data-qtip="[0]">[0]</a>', record.get('email'));
+                var mail = Ext.String.format('<a href="mailto:[0]" data-qtip="[0]">[0]</a>', Ext.util.Format.htmlEncode(record.get('email')));
 
                 return name + age + company + '<br>' + mail;
             }
diff --git a/themes/Backend/ExtJs/backend/customer/view/detail/additional.js b/themes/Backend/ExtJs/backend/customer/view/detail/additional.js
index 599c9cea982..810d70f527c 100644
--- a/themes/Backend/ExtJs/backend/customer/view/detail/additional.js
+++ b/themes/Backend/ExtJs/backend/customer/view/detail/additional.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/detail/base.js b/themes/Backend/ExtJs/backend/customer/view/detail/base.js
index 6e844851a47..6d24f39bbf6 100644
--- a/themes/Backend/ExtJs/backend/customer/view/detail/base.js
+++ b/themes/Backend/ExtJs/backend/customer/view/detail/base.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/detail/comment.js b/themes/Backend/ExtJs/backend/customer/view/detail/comment.js
index 11e3a7759fe..8bac897d437 100644
--- a/themes/Backend/ExtJs/backend/customer/view/detail/comment.js
+++ b/themes/Backend/ExtJs/backend/customer/view/detail/comment.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/detail/debit.js b/themes/Backend/ExtJs/backend/customer/view/detail/debit.js
index 039cd7a0922..386b3978cc3 100644
--- a/themes/Backend/ExtJs/backend/customer/view/detail/debit.js
+++ b/themes/Backend/ExtJs/backend/customer/view/detail/debit.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/detail/window.js b/themes/Backend/ExtJs/backend/customer/view/detail/window.js
index caa00c959fd..5c13773c334 100644
--- a/themes/Backend/ExtJs/backend/customer/view/detail/window.js
+++ b/themes/Backend/ExtJs/backend/customer/view/detail/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/main/customer_list.js b/themes/Backend/ExtJs/backend/customer/view/main/customer_list.js
index 09ea50904c8..52a68e4acdf 100644
--- a/themes/Backend/ExtJs/backend/customer/view/main/customer_list.js
+++ b/themes/Backend/ExtJs/backend/customer/view/main/customer_list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
@@ -113,6 +112,7 @@ Ext.define('Shopware.apps.Customer.view.main.CustomerList', {
     },
 
     mailRenderer: function(value) {
+        value = Ext.util.Format.htmlEncode(value);
         return Ext.String.format('<a href="mailto:[0]" data-qtip="[0]">[0]</a>', value);
     },
 
diff --git a/themes/Backend/ExtJs/backend/customer/view/main/customer_list_filter.js b/themes/Backend/ExtJs/backend/customer/view/main/customer_list_filter.js
index 7f99c49d79c..66bda41e07e 100644
--- a/themes/Backend/ExtJs/backend/customer/view/main/customer_list_filter.js
+++ b/themes/Backend/ExtJs/backend/customer/view/main/customer_list_filter.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/main/quick_view.js b/themes/Backend/ExtJs/backend/customer/view/main/quick_view.js
index c880ba71942..74a1abf7f25 100644
--- a/themes/Backend/ExtJs/backend/customer/view/main/quick_view.js
+++ b/themes/Backend/ExtJs/backend/customer/view/main/quick_view.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/main/stream_view.js b/themes/Backend/ExtJs/backend/customer/view/main/stream_view.js
index 2999b4ac0dc..a3ea640336f 100644
--- a/themes/Backend/ExtJs/backend/customer/view/main/stream_view.js
+++ b/themes/Backend/ExtJs/backend/customer/view/main/stream_view.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/main/window.js b/themes/Backend/ExtJs/backend/customer/view/main/window.js
index 28018245416..d0e10800a77 100644
--- a/themes/Backend/ExtJs/backend/customer/view/main/window.js
+++ b/themes/Backend/ExtJs/backend/customer/view/main/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/main/wizard.js b/themes/Backend/ExtJs/backend/customer/view/main/wizard.js
deleted file mode 100644
index f2d33c0f8c3..00000000000
--- a/themes/Backend/ExtJs/backend/customer/view/main/wizard.js
+++ /dev/null
@@ -1,197 +0,0 @@
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- *
- * @category   Shopware
- * @package    Customer
- * @subpackage Main
- * @version    $Id$
- * @author shopware AG
- */
-
-// {namespace name="backend/customer/view/main"}
-// {block name="backend/customer/view/main/wizard"}
-Ext.define('Shopware.apps.Customer.view.main.Wizard', {
-    extend: 'Ext.window.Window',
-    layout: 'fit',
-    autoShow: false,
-    modal: true,
-    cls: 'plugin-manager-loading-mask customer-wizard',
-    bodyPadding: 20,
-    header: false,
-    width: 1250,
-    height: 540,
-
-    initComponent: function() {
-        var me = this;
-
-        me.dockedItems = me.createDockedItems();
-
-        me.items = me.createItems();
-
-        me.callParent(arguments);
-    },
-
-    nextPage: function() {
-        var me = this;
-        var layout = me.cardContainer.getLayout();
-
-        me.nextButton.setText('{s name="next"}{/s}');
-        me.previousButton.show();
-
-        if (layout.getNext()) {
-            layout.next();
-
-            if (!layout.getNext()) {
-                me.nextButton.setText('{s name="finish"}{/s}');
-            }
-        } else {
-            me.finish();
-        }
-    },
-
-    previousPage: function() {
-        var me = this;
-        var layout = me.cardContainer.getLayout();
-
-        me.nextButton.setText('{s name="next"}{/s}');
-
-        if (layout.getPrev()) {
-            layout.prev();
-        }
-        me.previousButton.show();
-        if (!layout.getPrev()) {
-            me.previousButton.hide();
-        }
-    },
-
-    finish: function() {
-        var me = this;
-        me.fireEvent('finish');
-        me.destroy();
-    },
-
-    createItems: function() {
-        var me = this;
-
-        me.cardContainer = Ext.create('Ext.container.Container', {
-            region: 'center',
-            layout: 'card',
-            items: [
-                me.createFirstPage(),
-                me.createSecondPage(),
-                me.createFinishPage()
-            ]
-        });
-        return [me.cardContainer];
-    },
-
-    createFirstPage: function() {
-        var image = '{link file="backend/_resources/images/customer_stream/quick_view.jpg"}';
-        if (Ext.userLanguage === 'de') {
-            image = '{link file="backend/_resources/images/customer_stream/quick_view_de.jpg"}';
-        }
-
-        return Ext.create('Ext.container.Container', {
-            html: '' +
-            '<h1 class="headline">' +
-                '{s name="wizard_customer_quick_view_headline"}{/s}' +
-            '</h1>' +
-            '<div class="description">' +
-                '{s name="wizard_customer_quick_view_text"}{/s}' +
-            '</div>' +
-            '<div class="image">' +
-                '<img src="' + image + '" />' +
-            '</div>'
-        });
-    },
-
-    createSecondPage: function() {
-        var image = '{link file="backend/_resources/images/customer_stream/stream_view.jpg"}';
-        if (Ext.userLanguage === 'de') {
-            image = '{link file="backend/_resources/images/customer_stream/stream_view_de.jpg"}';
-        }
-
-        return Ext.create('Ext.container.Container', {
-            html: '' +
-            '<h1 class="headline">' +
-                '{s name="wizard_stream_view_headline"}{/s}' +
-            '</h1>' +
-            '<div class="description">' +
-                '{s name="wizard_stream_view_text"}{/s}' +
-            '</div>' +
-            '<div class="image">' +
-                '<img src="' + image + '" />' +
-            '</div>'
-        });
-    },
-
-    createFinishPage: function() {
-        var image = '{link file="backend/_resources/images/customer_stream/ekw_usage.jpg"}';
-        if (Ext.userLanguage === 'de') {
-            image = '{link file="backend/_resources/images/customer_stream/ekw_usage_de.jpg"}';
-        }
-
-        return Ext.create('Ext.container.Container', {
-            html: '' +
-            '<h1 class="headline">' +
-                '{s name="wizard_usage_headline"}{/s}' +
-            '</h1>' +
-            '<div class="description">' +
-                '{s name="wizard_usage_text"}{/s}' +
-            '</div>' +
-            '<div class="image">' +
-                '<img src="' + image + '" />' +
-            '</div>'
-        });
-    },
-
-    createDockedItems: function() {
-        var me = this;
-
-        me.nextButton = Ext.create('Ext.button.Button', {
-            text: '{s name="next"}{/s}',
-            cls: 'primary',
-            handler: Ext.bind(me.nextPage, me)
-        });
-
-        me.previousButton = Ext.create('Ext.button.Button', {
-            text: '{s name="back"}{/s}',
-            cls: 'secondary',
-            hidden: true,
-            handler: Ext.bind(me.previousPage, me)
-        });
-
-        me.skipButton = Ext.create('Ext.button.Button', {
-            text: '{s name="skip"}{/s}',
-            cls: 'secondary',
-            handler: Ext.bind(me.finish, me)
-        });
-
-        return [{
-            xtype: 'toolbar',
-            dock: 'bottom',
-            ui: 'shopware-ui',
-            items: [me.skipButton, '->', me.previousButton, me.nextButton]
-        }];
-    }
-});
-// {/block}
diff --git a/themes/Backend/ExtJs/backend/customer/view/order/chart.js b/themes/Backend/ExtJs/backend/customer/view/order/chart.js
index c4422bd478f..e9597e4ee45 100644
--- a/themes/Backend/ExtJs/backend/customer/view/order/chart.js
+++ b/themes/Backend/ExtJs/backend/customer/view/order/chart.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/customer/view/order/list.js b/themes/Backend/ExtJs/backend/customer/view/order/list.js
index 89efe14e6f6..43f1509faa3 100644
--- a/themes/Backend/ExtJs/backend/customer/view/order/list.js
+++ b/themes/Backend/ExtJs/backend/customer/view/order/list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/emotion/app.js b/themes/Backend/ExtJs/backend/emotion/app.js
index 4be6ce6b17a..2afa9b3b1a2 100644
--- a/themes/Backend/ExtJs/backend/emotion/app.js
+++ b/themes/Backend/ExtJs/backend/emotion/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/controller/detail.js b/themes/Backend/ExtJs/backend/emotion/controller/detail.js
index e63dc17908f..5b3177e3c39 100644
--- a/themes/Backend/ExtJs/backend/emotion/controller/detail.js
+++ b/themes/Backend/ExtJs/backend/emotion/controller/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/controller/main.js b/themes/Backend/ExtJs/backend/emotion/controller/main.js
index 3e4f76270a3..ec5c092d18b 100644
--- a/themes/Backend/ExtJs/backend/emotion/controller/main.js
+++ b/themes/Backend/ExtJs/backend/emotion/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    UserManager
diff --git a/themes/Backend/ExtJs/backend/emotion/controller/templates.js b/themes/Backend/ExtJs/backend/emotion/controller/templates.js
index 5f26433594b..050e1c636a9 100644
--- a/themes/Backend/ExtJs/backend/emotion/controller/templates.js
+++ b/themes/Backend/ExtJs/backend/emotion/controller/templates.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/model/article_slider.js b/themes/Backend/ExtJs/backend/emotion/model/article_slider.js
index cc2a6013302..e49dadad017 100644
--- a/themes/Backend/ExtJs/backend/emotion/model/article_slider.js
+++ b/themes/Backend/ExtJs/backend/emotion/model/article_slider.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/model/banner_slider.js b/themes/Backend/ExtJs/backend/emotion/model/banner_slider.js
index 832e785d280..d5f88803dec 100644
--- a/themes/Backend/ExtJs/backend/emotion/model/banner_slider.js
+++ b/themes/Backend/ExtJs/backend/emotion/model/banner_slider.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/model/component.js b/themes/Backend/ExtJs/backend/emotion/model/component.js
index b484b21fab2..009863d7840 100644
--- a/themes/Backend/ExtJs/backend/emotion/model/component.js
+++ b/themes/Backend/ExtJs/backend/emotion/model/component.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/model/emotion.js b/themes/Backend/ExtJs/backend/emotion/model/emotion.js
index f9a44b93090..ed482a60c05 100644
--- a/themes/Backend/ExtJs/backend/emotion/model/emotion.js
+++ b/themes/Backend/ExtJs/backend/emotion/model/emotion.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/model/emotion_element.js b/themes/Backend/ExtJs/backend/emotion/model/emotion_element.js
index facbff4f793..4e0b0fb8e31 100644
--- a/themes/Backend/ExtJs/backend/emotion/model/emotion_element.js
+++ b/themes/Backend/ExtJs/backend/emotion/model/emotion_element.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/model/emotion_shop.js b/themes/Backend/ExtJs/backend/emotion/model/emotion_shop.js
index 05c7e1934b1..196d4e21afb 100644
--- a/themes/Backend/ExtJs/backend/emotion/model/emotion_shop.js
+++ b/themes/Backend/ExtJs/backend/emotion/model/emotion_shop.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/model/field.js b/themes/Backend/ExtJs/backend/emotion/model/field.js
index 08d2ed55e9c..ec6b5ed5efc 100644
--- a/themes/Backend/ExtJs/backend/emotion/model/field.js
+++ b/themes/Backend/ExtJs/backend/emotion/model/field.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/model/manufacturer_slider.js b/themes/Backend/ExtJs/backend/emotion/model/manufacturer_slider.js
index dbc874d8ac3..0b562b0bcba 100644
--- a/themes/Backend/ExtJs/backend/emotion/model/manufacturer_slider.js
+++ b/themes/Backend/ExtJs/backend/emotion/model/manufacturer_slider.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/model/preset.js b/themes/Backend/ExtJs/backend/emotion/model/preset.js
index ac881f439f1..e5cff76c30a 100644
--- a/themes/Backend/ExtJs/backend/emotion/model/preset.js
+++ b/themes/Backend/ExtJs/backend/emotion/model/preset.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/model/presetdata.js b/themes/Backend/ExtJs/backend/emotion/model/presetdata.js
index 5ce7509014a..0e79af2575a 100644
--- a/themes/Backend/ExtJs/backend/emotion/model/presetdata.js
+++ b/themes/Backend/ExtJs/backend/emotion/model/presetdata.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/model/template.js b/themes/Backend/ExtJs/backend/emotion/model/template.js
index 283d2c15454..26e9176e14b 100644
--- a/themes/Backend/ExtJs/backend/emotion/model/template.js
+++ b/themes/Backend/ExtJs/backend/emotion/model/template.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/model/viewport.js b/themes/Backend/ExtJs/backend/emotion/model/viewport.js
index b1c9c158222..5e7c7bf4733 100644
--- a/themes/Backend/ExtJs/backend/emotion/model/viewport.js
+++ b/themes/Backend/ExtJs/backend/emotion/model/viewport.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/store/category_path.js b/themes/Backend/ExtJs/backend/emotion/store/category_path.js
index 6ed80f464b3..8519d2ed7a9 100644
--- a/themes/Backend/ExtJs/backend/emotion/store/category_path.js
+++ b/themes/Backend/ExtJs/backend/emotion/store/category_path.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 Ext.define('Shopware.apps.Emotion.store.CategoryPath', {
diff --git a/themes/Backend/ExtJs/backend/emotion/store/content_type_mode.js b/themes/Backend/ExtJs/backend/emotion/store/content_type_mode.js
index 4d75ecc8a71..8c3ab493ff3 100644
--- a/themes/Backend/ExtJs/backend/emotion/store/content_type_mode.js
+++ b/themes/Backend/ExtJs/backend/emotion/store/content_type_mode.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/emotion/view/components/content_type"}
diff --git a/themes/Backend/ExtJs/backend/emotion/store/detail.js b/themes/Backend/ExtJs/backend/emotion/store/detail.js
index 88a4deef10f..b7271bea8d1 100644
--- a/themes/Backend/ExtJs/backend/emotion/store/detail.js
+++ b/themes/Backend/ExtJs/backend/emotion/store/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/emotion/store/landing_page.js b/themes/Backend/ExtJs/backend/emotion/store/landing_page.js
index bc7ace2a676..ec63c45d969 100644
--- a/themes/Backend/ExtJs/backend/emotion/store/landing_page.js
+++ b/themes/Backend/ExtJs/backend/emotion/store/landing_page.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/emotion/store/library.js b/themes/Backend/ExtJs/backend/emotion/store/library.js
index adcb59481e9..95dd19e6f51 100644
--- a/themes/Backend/ExtJs/backend/emotion/store/library.js
+++ b/themes/Backend/ExtJs/backend/emotion/store/library.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/emotion/store/list.js b/themes/Backend/ExtJs/backend/emotion/store/list.js
index 46e4a5251a4..68b88bd8192 100644
--- a/themes/Backend/ExtJs/backend/emotion/store/list.js
+++ b/themes/Backend/ExtJs/backend/emotion/store/list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Article
diff --git a/themes/Backend/ExtJs/backend/emotion/store/presets.js b/themes/Backend/ExtJs/backend/emotion/store/presets.js
index 8afef20c2a8..233f10a5adf 100644
--- a/themes/Backend/ExtJs/backend/emotion/store/presets.js
+++ b/themes/Backend/ExtJs/backend/emotion/store/presets.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/store/templates.js b/themes/Backend/ExtJs/backend/emotion/store/templates.js
index 542d86c5fe7..d6fa6518b70 100644
--- a/themes/Backend/ExtJs/backend/emotion/store/templates.js
+++ b/themes/Backend/ExtJs/backend/emotion/store/templates.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/store/visibility.js b/themes/Backend/ExtJs/backend/emotion/store/visibility.js
index 5db85c0bfdb..6bf368ec6f8 100644
--- a/themes/Backend/ExtJs/backend/emotion/store/visibility.js
+++ b/themes/Backend/ExtJs/backend/emotion/store/visibility.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/article.js b/themes/Backend/ExtJs/backend/emotion/view/components/article.js
index 38a8c5db55d..9f4660518cb 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/components/article.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/components/article.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 //{block name="backend/emotion/view/components/article"}
 //{namespace name="backend/emotion/view/components/article"}
diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/article_slider.js b/themes/Backend/ExtJs/backend/emotion/view/components/article_slider.js
index 1cc77765b2d..568f72bcc8c 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/components/article_slider.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/components/article_slider.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/banner.js b/themes/Backend/ExtJs/backend/emotion/view/components/banner.js
index 0641df26362..dd583589438 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/components/banner.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/components/banner.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/banner_mapping.js b/themes/Backend/ExtJs/backend/emotion/view/components/banner_mapping.js
index 54defe5bb53..7ddcbecc1d5 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/components/banner_mapping.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/components/banner_mapping.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/emotion/view/detail"}
diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/banner_slider.js b/themes/Backend/ExtJs/backend/emotion/view/components/banner_slider.js
index a2ae4015514..6d2ebbf9eeb 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/components/banner_slider.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/components/banner_slider.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/base.js b/themes/Backend/ExtJs/backend/emotion/view/components/base.js
index 8c3786e3e61..fd9d863176e 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/components/base.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/components/base.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/emotion/view/detail"}
diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/blog.js b/themes/Backend/ExtJs/backend/emotion/view/components/blog.js
index 079d4986aa9..ced372edd7d 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/components/blog.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/components/blog.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/category_teaser.js b/themes/Backend/ExtJs/backend/emotion/view/components/category_teaser.js
index 555e73a103a..487cbe67b32 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/components/category_teaser.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/components/category_teaser.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/content_type.js b/themes/Backend/ExtJs/backend/emotion/view/components/content_type.js
index 4e51f32b4dc..c83b31c4599 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/components/content_type.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/components/content_type.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="backend/emotion/view/components/content_type"}
diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/fields/article.js b/themes/Backend/ExtJs/backend/emotion/view/components/fields/article.js
index e44f9e9a6eb..97949738ad7 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/components/fields/article.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/components/fields/article.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 Ext.define('Shopware.apps.Emotion.view.components.fields.Article', {
     extend: 'Shopware.form.field.ProductSingleSelection',
diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/fields/article_slider_type.js b/themes/Backend/ExtJs/backend/emotion/view/components/fields/article_slider_type.js
index 1577f9511cb..7e91e29c25e 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/components/fields/article_slider_type.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/components/fields/article_slider_type.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/emotion/view/components/article_slider_type"}
diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/fields/article_type.js b/themes/Backend/ExtJs/backend/emotion/view/components/fields/article_type.js
index a29f0eda2fd..f74cb7b83e4 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/components/fields/article_type.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/components/fields/article_type.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 //{namespace name="backend/emotion/view/components/article"}
 Ext.define('Shopware.apps.Emotion.view.components.fields.ArticleType', {
diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/fields/category_image_type.js b/themes/Backend/ExtJs/backend/emotion/view/components/fields/category_image_type.js
index 9651901eeda..eb3e637b974 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/components/fields/category_image_type.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/components/fields/category_image_type.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    UserManager
diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/fields/category_selection.js b/themes/Backend/ExtJs/backend/emotion/view/components/fields/category_selection.js
index e23d3737c20..db1413e03c7 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/components/fields/category_selection.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/components/fields/category_selection.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/fields/link_target.js b/themes/Backend/ExtJs/backend/emotion/view/components/fields/link_target.js
index 230e85eb1ad..8e3cc73eb03 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/components/fields/link_target.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/components/fields/link_target.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/fields/manufacturer_type.js b/themes/Backend/ExtJs/backend/emotion/view/components/fields/manufacturer_type.js
index e559488a485..20020c5f94a 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/components/fields/manufacturer_type.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/components/fields/manufacturer_type.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    UserManager
diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/fields/slider_select.js b/themes/Backend/ExtJs/backend/emotion/view/components/fields/slider_select.js
index d38ba1e2079..331d2941e41 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/components/fields/slider_select.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/components/fields/slider_select.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    UserManager
diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/fields/variant.js b/themes/Backend/ExtJs/backend/emotion/view/components/fields/variant.js
index c91aadcde3b..dc2b279e264 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/components/fields/variant.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/components/fields/variant.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 Ext.define('Shopware.apps.Emotion.view.components.fields.Variant', {
     extend: 'Shopware.form.field.ProductSingleSelection',
diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/fields/video_mode.js b/themes/Backend/ExtJs/backend/emotion/view/components/fields/video_mode.js
index 7f175855f12..820b3e6ac8f 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/components/fields/video_mode.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/components/fields/video_mode.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    UserManager
diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/html_code.js b/themes/Backend/ExtJs/backend/emotion/view/components/html_code.js
index 75fbc57a323..961aff1e471 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/components/html_code.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/components/html_code.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="backend/emotion/view/components/html_code"}
diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/html_element.js b/themes/Backend/ExtJs/backend/emotion/view/components/html_element.js
index 8a9545de94c..6aa5cc9ed43 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/components/html_element.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/components/html_element.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/html_video.js b/themes/Backend/ExtJs/backend/emotion/view/components/html_video.js
index 3d89cfd2184..cc799a00166 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/components/html_video.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/components/html_video.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/iframe.js b/themes/Backend/ExtJs/backend/emotion/view/components/iframe.js
index 39496fec338..0c807fd1615 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/components/iframe.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/components/iframe.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/manufacturer_slider.js b/themes/Backend/ExtJs/backend/emotion/view/components/manufacturer_slider.js
index 6d634dc7a78..8ee82e194ad 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/components/manufacturer_slider.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/components/manufacturer_slider.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/settings_window.js b/themes/Backend/ExtJs/backend/emotion/view/components/settings_window.js
index 1081daea346..871a2d74caa 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/components/settings_window.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/components/settings_window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/components/youtube.js b/themes/Backend/ExtJs/backend/emotion/view/components/youtube.js
index 1e0b3360999..3972327531c 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/components/youtube.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/components/youtube.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Emotion
@@ -46,7 +45,9 @@ Ext.define('Shopware.apps.Emotion.view.components.Youtube', {
         video_loop: {
             fieldLabel: '{s name="video_loop"}Loop video{/s}',
             helpText: '{s name="video_loop_help"}{/s}'
-        }
+        },
+        loadVideoOnConfirmation: '{s name="load_video_on_confirmation"}{/s}',
+        previewImage: '{s name="preview_image"}{/s}'
     },
 
     initComponent: function() {
diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/designer.js b/themes/Backend/ExtJs/backend/emotion/view/detail/designer.js
index 51c1dcdd759..b339bf8b22a 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/detail/designer.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/detail/designer.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/article.js b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/article.js
index 3e93c2c60e7..1f8a6d4465d 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/article.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/article.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/article_slider.js b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/article_slider.js
index 452e2c84da7..46a15763381 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/article_slider.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/article_slider.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/banner.js b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/banner.js
index abb61cd0481..95d3aef3c54 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/banner.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/banner.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/banner_slider.js b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/banner_slider.js
index 5aaf45bd4ee..0c7679c4710 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/banner_slider.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/banner_slider.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/base.js b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/base.js
index 8aa122633a5..734e031cee8 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/base.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/base.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/blog.js b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/blog.js
index bd069158ce2..9ee6f87b330 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/blog.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/blog.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/category_teaser.js b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/category_teaser.js
index aa690bb8629..eba169213b9 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/category_teaser.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/category_teaser.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/content_type.js b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/content_type.js
index 808c32bb4aa..62a0ba90746 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/content_type.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/content_type.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/html.js b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/html.js
index bb7b80ba01d..7649076e15f 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/html.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/html.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/html_code.js b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/html_code.js
index 522fba0c591..d9f70692682 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/html_code.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/html_code.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/html_video.js b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/html_video.js
index f795eb1cfde..fe011ea4c19 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/html_video.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/html_video.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/iframe.js b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/iframe.js
index 188010b478b..617e293cbd2 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/iframe.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/iframe.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/manufacturer_slider.js b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/manufacturer_slider.js
index f452879582f..bdcbd379cf3 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/manufacturer_slider.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/manufacturer_slider.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/youtube.js b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/youtube.js
index 0db4d2b1f2a..f1829b925b3 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/detail/elements/youtube.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/detail/elements/youtube.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Emotion
@@ -47,6 +46,7 @@ Ext.define('Shopware.apps.Emotion.view.detail.elements.Youtube', {
             videoID = me.getConfigValue('video_id');
 
         if (Ext.isDefined(videoID)) {
+            videoID = Ext.util.Format.htmlEncode(videoID);
             teaserImage = Ext.String.format('https://img.youtube.com/vi/[0]/0.jpg', videoID);
             style = Ext.String.format('background-image: url([0]);', teaserImage);
 
diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/grid.js b/themes/Backend/ExtJs/backend/emotion/view/detail/grid.js
index c9d52b8d9d4..36fb4feacb6 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/detail/grid.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/detail/grid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/layout.js b/themes/Backend/ExtJs/backend/emotion/view/detail/layout.js
index 58e70dc6853..0e43c4a3fbd 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/detail/layout.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/detail/layout.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/preview.js b/themes/Backend/ExtJs/backend/emotion/view/detail/preview.js
index 0f2ba4451f1..efe1df900d0 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/detail/preview.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/detail/preview.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/settings.js b/themes/Backend/ExtJs/backend/emotion/view/detail/settings.js
index af1a39891c4..4bd9fd80f36 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/detail/settings.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/detail/settings.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/widgets.js b/themes/Backend/ExtJs/backend/emotion/view/detail/widgets.js
index 5ea26cf6be9..4c5b392ce37 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/detail/widgets.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/detail/widgets.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/window.js b/themes/Backend/ExtJs/backend/emotion/view/detail/window.js
index 96d94db86ef..4c4826999ce 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/detail/window.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/detail/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/list/grid.js b/themes/Backend/ExtJs/backend/emotion/view/list/grid.js
index 012b6e26014..a1d7f9bcee3 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/list/grid.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/list/grid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/list/toolbar.js b/themes/Backend/ExtJs/backend/emotion/view/list/toolbar.js
index 30c192135b1..82059cd8dba 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/list/toolbar.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/list/toolbar.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    UserManager
diff --git a/themes/Backend/ExtJs/backend/emotion/view/main/window.js b/themes/Backend/ExtJs/backend/emotion/view/main/window.js
index 012ff1581fd..29a80da371b 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/main/window.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/main/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/presets/form.js b/themes/Backend/ExtJs/backend/emotion/view/presets/form.js
index 0cf2735afa8..2d6b716788e 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/presets/form.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/presets/form.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/emotion/view/presets/info.js b/themes/Backend/ExtJs/backend/emotion/view/presets/info.js
index 6dcc9421125..9e1ffc58d59 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/presets/info.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/presets/info.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/emotion/presets/presets"}
diff --git a/themes/Backend/ExtJs/backend/emotion/view/presets/list.js b/themes/Backend/ExtJs/backend/emotion/view/presets/list.js
index 1849dd4916c..e59b7934b14 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/presets/list.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/presets/list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/emotion/view/presets/window.js b/themes/Backend/ExtJs/backend/emotion/view/presets/window.js
index 6ab8d67b66c..9a8f523a530 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/presets/window.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/presets/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/templates/list.js b/themes/Backend/ExtJs/backend/emotion/view/templates/list.js
index ecbee6bc5e0..5f582579e06 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/templates/list.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/templates/list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/templates/settings.js b/themes/Backend/ExtJs/backend/emotion/view/templates/settings.js
index 33a98f9975d..a1bcc3064cd 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/templates/settings.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/templates/settings.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/templates/toolbar.js b/themes/Backend/ExtJs/backend/emotion/view/templates/toolbar.js
index d6a0dba1092..0c82f695870 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/templates/toolbar.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/templates/toolbar.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Emotion
diff --git a/themes/Backend/ExtJs/backend/emotion/view/translation/window.js b/themes/Backend/ExtJs/backend/emotion/view/translation/window.js
index 36b7eba5e80..465c04e68c7 100644
--- a/themes/Backend/ExtJs/backend/emotion/view/translation/window.js
+++ b/themes/Backend/ExtJs/backend/emotion/view/translation/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category    Shopware
  * @package     Emotion
diff --git a/themes/Backend/ExtJs/backend/feedback/app.js b/themes/Backend/ExtJs/backend/feedback/app.js
deleted file mode 100644
index 5cd656800f6..00000000000
--- a/themes/Backend/ExtJs/backend/feedback/app.js
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- *
- * Shopware UI - Feedback Bootstrapper
- *
- * This file bootstrapps the Feedback module.
- */
-//{block name="backend/feedback/app"}
-Ext.define('Shopware.apps.Feedback', {
-
-    /**
-     * Extends from our special controller, which handles the
-     * sub-application behavior and the event bus
-     * @string
-     */
-    extend: 'Enlight.app.SubApplication',
-
-    /**
-     * Sets the loading path for the sub-application.
-     *
-     * Note that you'll need a "loadAction" in your
-     * controller (server-side)
-     * @string
-     */
-    loadPath: '{url action=load}',
-
-    /**
-     * Enables our bulk loading technique.
-     * @booelan
-     */
-    bulkLoad: true,
-
-    /**
-     * The name of the module. Used for internal purpose
-     * @string
-     */
-    name: 'Shopware.apps.Feedback',
-
-    /**
-     * Required controllers for module (subapplication)
-     * @array
-     */
-    controllers: [ 'Main' ],
-
-    /**
-     * Required views for the module (subapplication)
-     */
-    views: [
-        'survey.Window',
-        'preview.Window'
-    ],
-
-    /**
-     * Returns the main application window for this is expected
-     * by the Enlight.app.SubApplication class.
-     * The class sets a new event listener on the "destroy" event of
-     * the main application window to perform the destroying of the
-     * whole sub application when the user closes the main application window.
-     *
-     * This method will be called when all dependencies are solved and
-     * all member controllers, models, views and stores are initialized.
-     *
-     * @private
-     * @return [object] mainWindow - the main application window based on Enlight.app.Window
-     */
-    launch: function() {
-        var me = this,
-            mainController = me.getController('Main');
-
-        return mainController.mainWindow;
-    }
-});
-//{/block}
diff --git a/themes/Backend/ExtJs/backend/feedback/controller/main.js b/themes/Backend/ExtJs/backend/feedback/controller/main.js
deleted file mode 100644
index fdf39fd42e6..00000000000
--- a/themes/Backend/ExtJs/backend/feedback/controller/main.js
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-//{namespace name="backend/feedback/view/main"}
-
-/**
- * Shopware UI - Feedback Main Controller
- *
- * This file contains the business logic for the Feedback module.
- */
-//{block name="backend/feedback/controller/main"}
-Ext.define('Shopware.apps.Feedback.controller.Main', {
-
-    /**
-     * Extend from the standard ExtJS 4 controller
-     * @string
-     */
-    extend: 'Ext.app.Controller',
-
-    /**
-     * Creates the necessary event listener for this
-     * specific controller and opens a new Ext.window.Window
-     * to display the subapplication
-     *
-     * @return void
-     */
-    init: function() {
-        var me = this;
-
-        me.control({
-            'installation-survey-window': {
-                'beforeclose': me.onBeforeInstallationFeedbackClose
-            },
-            'feedback-preview-window': {
-                'beforeclose': me.onBeforePreviewFeedbackClose,
-                'feedback-show-issue-tracker': me.onPreviewWindowShowIssueTracker
-            }
-        });
-
-        if (me.subApplication.params && me.subApplication.params.installationFeedback) {
-            me.mainWindow = me.getView('survey.Window').create();
-            return;
-        }
-
-        if (me.subApplication.params && me.subApplication.params.previewFeedback) {
-            me.mainWindow = me.getView('preview.Window').create();
-            return;
-        }
-
-        me.mainWindow = me.getView('main.Window').create();
-
-    },
-
-    onBeforeInstallationFeedbackClose: function(win) {
-        var checked = win.down('#disableInstallationSurvey').getValue();
-        if (checked) {
-            Ext.Ajax.request({
-                url: '{url controller=feedback action=disableInstallationSurvey}'
-            });
-        }
-    },
-
-    onBeforePreviewFeedbackClose: function(win) {
-        var checked = win.down('#disablePreviewFeedback').getValue();
-        if (checked) {
-            window.localStorage.setItem("hideBetaFeedback", true);
-        }
-    },
-
-    onPreviewWindowShowIssueTracker: function() {
-        window.open('https://issues.shopware.com/');
-    }
-});
-//{/block}
diff --git a/themes/Backend/ExtJs/backend/feedback/view/preview/window.js b/themes/Backend/ExtJs/backend/feedback/view/preview/window.js
deleted file mode 100644
index 78dcf945a59..00000000000
--- a/themes/Backend/ExtJs/backend/feedback/view/preview/window.js
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-//{namespace name="backend/feedback/view/preview"}
-
-/**
- * Shopware UI - Feedback preview Window
- *
- * This file contains the business logic for the User Manager module. The module
- * handles the whole administration of the backend users.
- */
-//{block name="backend/feedback/view/preview/window"}
-Ext.define('Shopware.apps.Feedback.view.preview.Window', {
-    extend: 'Enlight.app.Window',
-    title: '{s name="window/title"}{/s}',
-    alias: 'widget.feedback-preview-window',
-    border: false,
-    layout: {
-        type: 'vbox',
-        align: 'stretch'
-    },
-    autoShow: true,
-    height: 550,
-    width: 500,
-    resizable: false,
-    maximizable: false,
-    stateful: true,
-    stateId: 'feedback-preview-window',
-
-    /**
-     * Initializes the component and builds up the main interface
-     *
-     * @return void
-     */
-    initComponent: function() {
-        var me = this;
-
-        me.addEvents(
-            'feedback-show-issue-tracker'
-        );
-
-        me.imageComponent = Ext.create('Ext.Img', {
-            height: 177,
-            src: Ext.String.format(
-                '{link file="themes/Backend/ExtJs/backend/_resources/resources/themes/images/shopware-ui/beta-feedback-thankyou-[0].png"}',
-                Ext.userLanguage !== 'de' ? 'en' : Ext.userLanguage
-            )
-        });
-
-        me.textComponent = Ext.create('Ext.container.Container', {
-            padding: 20,
-            flex: 1,
-            autoScroll: true,
-            style: 'background-color: #ffffff;',
-            html: Ext.String.format('{s name="window/info_text"}{/s}', '{$SHOPWARE_VERSION}'),
-            styleHtmlContent: true
-        });
-
-        me.items = [me.imageComponent, me.textComponent];
-
-        me.checkbox = Ext.create('Ext.form.field.Checkbox', {
-            padding: '0 0 0 5px',
-            itemId: 'disablePreviewFeedback',
-            width: 150,
-            boxLabel: '{s name="window/do_not_show_again"}{/s}'
-        });
-
-        me.cancelButton = Ext.create('Ext.button.Button', {
-            cls: 'secondary',
-            text: '{s name="window/cancel"}{/s}',
-            handler: function() {
-                me.close();
-            }
-        });
-
-        me.issueTrackerButton = Ext.create('Ext.button.Button', {
-            cls: 'primary',
-            text: '{s name="window/open_issuetracker"}{/s}',
-            handler: function() {
-                me.fireEvent('feedback-show-issue-tracker', me);
-            }
-        });
-
-        me.dockedItems = [{
-            xtype: 'toolbar',
-            dock: 'bottom',
-            items: [me.checkbox, '->', me.cancelButton, me.issueTrackerButton]
-        }];
-
-        me.callParent(arguments);
-    }
-});
-//{/block}
diff --git a/themes/Backend/ExtJs/backend/feedback/view/survey/window.js b/themes/Backend/ExtJs/backend/feedback/view/survey/window.js
deleted file mode 100644
index d78f7db5c36..00000000000
--- a/themes/Backend/ExtJs/backend/feedback/view/survey/window.js
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-
-//{namespace name="backend/feedback/view/survey"}
-
-/**
- * Shopware UI - Feedback preview Window
- *
- * This file contains the business logic for the User Manager module. The module
- * handles the whole administration of the backend users.
- */
-//{block name="backend/feedback/view/survey/window"}
-Ext.define('Shopware.apps.Feedback.view.survey.Window', {
-    extend: 'Enlight.app.Window',
-    title: '{s name="window/title"}{/s}',
-    alias: 'widget.installation-survey-window',
-    border: false,
-    layout: 'fit',
-    autoShow: true,
-    height: 650,
-    width: 550,
-    maximizable: false,
-    resizable: false,
-    stateful: true,
-    stateId: 'installation-survey-window',
-
-    /**
-     * Initializes the component and builds up the main interface
-     *
-     * @return void
-     */
-    initComponent: function() {
-        var me = this;
-
-        me.items = [{
-            xtype: "component",
-            autoEl: {
-                tag: "iframe",
-                src: Ext.String.format('https://api.shopware.com/survey/[0]/firstinstallation', Ext.userLanguage !== 'de' ? 'en' : Ext.userLanguage)
-            }
-        }];
-
-        me.checkbox = Ext.create('Ext.form.field.Checkbox', {
-            padding: '0 0 0 5px',
-            itemId: 'disableInstallationSurvey',
-            width: 150,
-            boxLabel: '{s name="window/do_not_show_again"}{/s}'
-        });
-
-        me.cancelButton = Ext.create('Ext.button.Button', {
-            cls: 'primary',
-            text: '{s name="window/close"}{/s}',
-            handler: function() {
-                me.close();
-            }
-        });
-
-        me.dockedItems = [{
-            xtype: 'toolbar',
-            dock: 'bottom',
-            items: [me.checkbox, '->', me.cancelButton]
-        }];
-
-        me.callParent(arguments);
-    }
-});
-//{/block}
diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/controller/config.js b/themes/Backend/ExtJs/backend/first_run_wizard/controller/config.js
index 3a1e7443eb7..dab28b2cd9f 100644
--- a/themes/Backend/ExtJs/backend/first_run_wizard/controller/config.js
+++ b/themes/Backend/ExtJs/backend/first_run_wizard/controller/config.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/controller/localization.js b/themes/Backend/ExtJs/backend/first_run_wizard/controller/localization.js
index adb0b98755f..b4f6f42deeb 100644
--- a/themes/Backend/ExtJs/backend/first_run_wizard/controller/localization.js
+++ b/themes/Backend/ExtJs/backend/first_run_wizard/controller/localization.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/controller/main.js b/themes/Backend/ExtJs/backend/first_run_wizard/controller/main.js
index 1101ad92f9f..1131872e1b3 100644
--- a/themes/Backend/ExtJs/backend/first_run_wizard/controller/main.js
+++ b/themes/Backend/ExtJs/backend/first_run_wizard/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/controller/pay_pal.js b/themes/Backend/ExtJs/backend/first_run_wizard/controller/pay_pal.js
index f6d1b30f280..fdc6bad8a4f 100644
--- a/themes/Backend/ExtJs/backend/first_run_wizard/controller/pay_pal.js
+++ b/themes/Backend/ExtJs/backend/first_run_wizard/controller/pay_pal.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/controller/recommendation.js b/themes/Backend/ExtJs/backend/first_run_wizard/controller/recommendation.js
index a036f2fd095..4a997ec91d5 100644
--- a/themes/Backend/ExtJs/backend/first_run_wizard/controller/recommendation.js
+++ b/themes/Backend/ExtJs/backend/first_run_wizard/controller/recommendation.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/model/integrated_plugins_countries.js b/themes/Backend/ExtJs/backend/first_run_wizard/model/integrated_plugins_countries.js
index 8dcd7547ff4..a47a23e0bf1 100644
--- a/themes/Backend/ExtJs/backend/first_run_wizard/model/integrated_plugins_countries.js
+++ b/themes/Backend/ExtJs/backend/first_run_wizard/model/integrated_plugins_countries.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/model/locale.js b/themes/Backend/ExtJs/backend/first_run_wizard/model/locale.js
index e5e838b59ef..722a5bdd83f 100644
--- a/themes/Backend/ExtJs/backend/first_run_wizard/model/locale.js
+++ b/themes/Backend/ExtJs/backend/first_run_wizard/model/locale.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/model/localization.js b/themes/Backend/ExtJs/backend/first_run_wizard/model/localization.js
index 427e0201e0c..c4e9a2f5fb3 100644
--- a/themes/Backend/ExtJs/backend/first_run_wizard/model/localization.js
+++ b/themes/Backend/ExtJs/backend/first_run_wizard/model/localization.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/store/available_localization_plugin.js b/themes/Backend/ExtJs/backend/first_run_wizard/store/available_localization_plugin.js
index f9354ba4f64..3a17a5e5d1c 100644
--- a/themes/Backend/ExtJs/backend/first_run_wizard/store/available_localization_plugin.js
+++ b/themes/Backend/ExtJs/backend/first_run_wizard/store/available_localization_plugin.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/store/demo_plugin.js b/themes/Backend/ExtJs/backend/first_run_wizard/store/demo_plugin.js
index a9864661a01..3b29cbf36cd 100644
--- a/themes/Backend/ExtJs/backend/first_run_wizard/store/demo_plugin.js
+++ b/themes/Backend/ExtJs/backend/first_run_wizard/store/demo_plugin.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/store/integrated_plugin.js b/themes/Backend/ExtJs/backend/first_run_wizard/store/integrated_plugin.js
index 9c654c26fa5..959b4a9588e 100644
--- a/themes/Backend/ExtJs/backend/first_run_wizard/store/integrated_plugin.js
+++ b/themes/Backend/ExtJs/backend/first_run_wizard/store/integrated_plugin.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/store/integrated_plugins_countries.js b/themes/Backend/ExtJs/backend/first_run_wizard/store/integrated_plugins_countries.js
index 6d6a0dceee4..c7500291dac 100644
--- a/themes/Backend/ExtJs/backend/first_run_wizard/store/integrated_plugins_countries.js
+++ b/themes/Backend/ExtJs/backend/first_run_wizard/store/integrated_plugins_countries.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/store/license_plugin.js b/themes/Backend/ExtJs/backend/first_run_wizard/store/license_plugin.js
index b7424e45aea..c95229e4d1f 100644
--- a/themes/Backend/ExtJs/backend/first_run_wizard/store/license_plugin.js
+++ b/themes/Backend/ExtJs/backend/first_run_wizard/store/license_plugin.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/store/locale.js b/themes/Backend/ExtJs/backend/first_run_wizard/store/locale.js
index c1c46c22dfe..ace1086ed43 100644
--- a/themes/Backend/ExtJs/backend/first_run_wizard/store/locale.js
+++ b/themes/Backend/ExtJs/backend/first_run_wizard/store/locale.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/store/localization.js b/themes/Backend/ExtJs/backend/first_run_wizard/store/localization.js
index b1101d112b2..6e4b66b8e6a 100644
--- a/themes/Backend/ExtJs/backend/first_run_wizard/store/localization.js
+++ b/themes/Backend/ExtJs/backend/first_run_wizard/store/localization.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/store/localization_plugin.js b/themes/Backend/ExtJs/backend/first_run_wizard/store/localization_plugin.js
index 2aeb89a1d4a..bc1113612ab 100644
--- a/themes/Backend/ExtJs/backend/first_run_wizard/store/localization_plugin.js
+++ b/themes/Backend/ExtJs/backend/first_run_wizard/store/localization_plugin.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/store/recommended_plugin.js b/themes/Backend/ExtJs/backend/first_run_wizard/store/recommended_plugin.js
index a9284b7cc1d..b0b01e43ea9 100644
--- a/themes/Backend/ExtJs/backend/first_run_wizard/store/recommended_plugin.js
+++ b/themes/Backend/ExtJs/backend/first_run_wizard/store/recommended_plugin.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/config.js b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/config.js
index b9402bc5497..4773b08c292 100644
--- a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/config.js
+++ b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/config.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/demo_data.js b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/demo_data.js
index f9877c8ee81..ced3c0b681a 100644
--- a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/demo_data.js
+++ b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/demo_data.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/finish.js b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/finish.js
index d313490daf8..3f62eecb5a3 100644
--- a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/finish.js
+++ b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/finish.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/localization.js b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/localization.js
index e7a47c1f06e..f23cd84a023 100644
--- a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/localization.js
+++ b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/localization.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/localization_installer.js b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/localization_installer.js
index cc11b7fea11..8c256b95562 100644
--- a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/localization_installer.js
+++ b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/localization_installer.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/localization_switcher.js b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/localization_switcher.js
index 87b5635ac91..155a93bc366 100644
--- a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/localization_switcher.js
+++ b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/localization_switcher.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/pay_pal.js b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/pay_pal.js
index b1ae116e999..62b9cb41b84 100644
--- a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/pay_pal.js
+++ b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/pay_pal.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/recommendation.js b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/recommendation.js
index ffe2fe52f65..91cb6321a8c 100644
--- a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/recommendation.js
+++ b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/recommendation.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/window.js b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/window.js
index fb4d97397b4..f17ca811eaf 100644
--- a/themes/Backend/ExtJs/backend/first_run_wizard/view/main/window.js
+++ b/themes/Backend/ExtJs/backend/first_run_wizard/view/main/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/form/app.js b/themes/Backend/ExtJs/backend/form/app.js
index 68110bcef74..b516bdf7fdd 100644
--- a/themes/Backend/ExtJs/backend/form/app.js
+++ b/themes/Backend/ExtJs/backend/form/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Form
diff --git a/themes/Backend/ExtJs/backend/form/controller/fields.js b/themes/Backend/ExtJs/backend/form/controller/fields.js
index 12fef26d263..32315ba8f05 100644
--- a/themes/Backend/ExtJs/backend/form/controller/fields.js
+++ b/themes/Backend/ExtJs/backend/form/controller/fields.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Form
diff --git a/themes/Backend/ExtJs/backend/form/controller/main.js b/themes/Backend/ExtJs/backend/form/controller/main.js
index 8db45d26efb..691113a54ad 100644
--- a/themes/Backend/ExtJs/backend/form/controller/main.js
+++ b/themes/Backend/ExtJs/backend/form/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Form
diff --git a/themes/Backend/ExtJs/backend/form/model/field.js b/themes/Backend/ExtJs/backend/form/model/field.js
index 370795a7f1b..db830d880ec 100644
--- a/themes/Backend/ExtJs/backend/form/model/field.js
+++ b/themes/Backend/ExtJs/backend/form/model/field.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Form
diff --git a/themes/Backend/ExtJs/backend/form/model/form.js b/themes/Backend/ExtJs/backend/form/model/form.js
index c08e3abb6a7..90b5466104f 100644
--- a/themes/Backend/ExtJs/backend/form/model/form.js
+++ b/themes/Backend/ExtJs/backend/form/model/form.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Form
@@ -74,6 +73,7 @@ Ext.define('Shopware.apps.Form.model.Form', {
         { name: 'emailTemplate', type: 'string' },
         { name: 'text', type: 'string' },
         { name: 'text2', type: 'string' },
+        { name: 'nourl', type: 'string' },
         { name: 'shopIds' },
         { name: 'metaTitle', type: 'string' },
         { name: 'metaKeywords', type: 'string' },
diff --git a/themes/Backend/ExtJs/backend/form/store/field.js b/themes/Backend/ExtJs/backend/form/store/field.js
index 944f3233684..a4a2225f1df 100644
--- a/themes/Backend/ExtJs/backend/form/store/field.js
+++ b/themes/Backend/ExtJs/backend/form/store/field.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Form
diff --git a/themes/Backend/ExtJs/backend/form/store/form.js b/themes/Backend/ExtJs/backend/form/store/form.js
index 00387f8b3da..4fb3b4e7e8d 100644
--- a/themes/Backend/ExtJs/backend/form/store/form.js
+++ b/themes/Backend/ExtJs/backend/form/store/form.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Form
diff --git a/themes/Backend/ExtJs/backend/form/store/shop.js b/themes/Backend/ExtJs/backend/form/store/shop.js
index ff1ec20c0e9..d835b5be4c9 100644
--- a/themes/Backend/ExtJs/backend/form/store/shop.js
+++ b/themes/Backend/ExtJs/backend/form/store/shop.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="backend/form/store/shop"}
diff --git a/themes/Backend/ExtJs/backend/form/view/main/editwindow.js b/themes/Backend/ExtJs/backend/form/view/main/editwindow.js
index 384bb06cba9..8506aaa3ddb 100644
--- a/themes/Backend/ExtJs/backend/form/view/main/editwindow.js
+++ b/themes/Backend/ExtJs/backend/form/view/main/editwindow.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Form
diff --git a/themes/Backend/ExtJs/backend/form/view/main/fieldgrid.js b/themes/Backend/ExtJs/backend/form/view/main/fieldgrid.js
index cbbc2d560e7..11e0e046e2c 100644
--- a/themes/Backend/ExtJs/backend/form/view/main/fieldgrid.js
+++ b/themes/Backend/ExtJs/backend/form/view/main/fieldgrid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Form
@@ -309,7 +308,8 @@ Ext.define('Shopware.apps.Form.view.main.Fieldgrid', {
                 ['email', 'Email'],
                 ['select', 'select'],
                 ['textarea', 'textarea'],
-                ['hidden', 'hidden']
+                ['hidden', 'hidden'],
+                ['nourl', 'nourl']
             ]
         });
     },
diff --git a/themes/Backend/ExtJs/backend/form/view/main/formpanel.js b/themes/Backend/ExtJs/backend/form/view/main/formpanel.js
index 82eade81f71..dc3dd97e099 100644
--- a/themes/Backend/ExtJs/backend/form/view/main/formpanel.js
+++ b/themes/Backend/ExtJs/backend/form/view/main/formpanel.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Form
diff --git a/themes/Backend/ExtJs/backend/form/view/main/list.js b/themes/Backend/ExtJs/backend/form/view/main/list.js
index 0a16f373ea4..4949fbc0fa5 100644
--- a/themes/Backend/ExtJs/backend/form/view/main/list.js
+++ b/themes/Backend/ExtJs/backend/form/view/main/list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Form
diff --git a/themes/Backend/ExtJs/backend/form/view/main/mainwindow.js b/themes/Backend/ExtJs/backend/form/view/main/mainwindow.js
index 96cbde9ffe9..4958f5e0233 100644
--- a/themes/Backend/ExtJs/backend/form/view/main/mainwindow.js
+++ b/themes/Backend/ExtJs/backend/form/view/main/mainwindow.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Form
diff --git a/themes/Backend/ExtJs/backend/index/app.js b/themes/Backend/ExtJs/backend/index/app.js
index 2780bb9f3e6..559ae565619 100644
--- a/themes/Backend/ExtJs/backend/index/app.js
+++ b/themes/Backend/ExtJs/backend/index/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
@@ -91,7 +90,6 @@ Ext.define('Shopware.apps.Index', {
         'widgets.Base',
         'merchant.Window',
         'themeCache.ThemeCacheWarmUp',
-        'widgets.bi.Base'
     ],
 
     /**
diff --git a/themes/Backend/ExtJs/backend/index/controller/error_reporter.js b/themes/Backend/ExtJs/backend/index/controller/error_reporter.js
index 859bc3e6359..bfe1890f28b 100644
--- a/themes/Backend/ExtJs/backend/index/controller/error_reporter.js
+++ b/themes/Backend/ExtJs/backend/index/controller/error_reporter.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/index/controller/main.js b/themes/Backend/ExtJs/backend/index/controller/main.js
index fc3c011c502..964205208f4 100644
--- a/themes/Backend/ExtJs/backend/index/controller/main.js
+++ b/themes/Backend/ExtJs/backend/index/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
@@ -45,8 +44,6 @@ Ext.define('Shopware.apps.Index.controller.Main', {
         var me = this,
             firstRunWizardStep = Ext.util.Cookies.get('firstRunWizardStep'),
             firstRunWizardEnabled = me.subApplication.firstRunWizardEnabled,
-            enableInstallationFeedback = me.subApplication.enableInstallationFeedback,
-            enableBetaFeedback = me.subApplication.enableBetaFeedback,
             biOverviewEnabled = me.subApplication.biOverviewEnabled,
             paypalSettingsEnabled = Ext.util.Cookies.get('paypalConfigurationPostponed');
 
@@ -76,31 +73,6 @@ Ext.define('Shopware.apps.Index.controller.Main', {
         } else {
             me.initBackendDesktop();
 
-            if (enableInstallationFeedback) {
-                Ext.Function.defer(function() {
-                    Shopware.app.Application.addSubApplication({
-                        name: 'Shopware.apps.Feedback',
-                        params: {
-                            installationFeedback: true
-                        }
-                    });
-                }, 2000);
-            }
-
-            if (enableBetaFeedback && (typeof Storage !== "undefined")) {
-                var item = window.localStorage.getItem("hideBetaFeedback");
-                if (!item) {
-                    Ext.Function.defer(function() {
-                        Shopware.app.Application.addSubApplication({
-                            name: 'Shopware.apps.Feedback',
-                            params: {
-                                previewFeedback: true
-                            }
-                        });
-                    }, 2000);
-                }
-            }
-
             if (paypalSettingsEnabled) {
                 try {
                     Ext.create('Shopware.apps.PaypalUnifiedSettings');
@@ -119,19 +91,6 @@ Ext.define('Shopware.apps.Index.controller.Main', {
                     });
                 }, 2000);
             }
-
-            /*{if {acl_is_allowed privilege=manage resource=benchmark}}*/
-            if (biOverviewEnabled) {
-                Ext.Function.defer(function() {
-                    Shopware.app.Application.addSubApplication({
-                        name: 'Shopware.apps.Benchmark',
-                        params: {
-                            isTeaser: true
-                        }
-                    });
-                }, 2000);
-            }
-            /* {/if} */
         }
     },
 
@@ -149,11 +108,6 @@ Ext.define('Shopware.apps.Index.controller.Main', {
 
         me.addKeyboardEvents();
         me.checkLoginStatus();
-        /*{if {acl_is_allowed privilege=submit resource=benchmark}}*/
-        if (me.subApplication.biIsActive) {
-            me.checkBenchmarksStatus();
-        }
-        /*{/if}*/
     },
 
     /**
@@ -297,71 +251,6 @@ Ext.define('Shopware.apps.Index.controller.Main', {
                 });
             }
         });
-    },
-
-    /**
-     * Helper method which checks for new Benchmark data periodically (every 10 seconds).
-     *
-     * @private
-     * @return void
-     */
-    checkBenchmarksStatus: function () {
-        var interval = 10000,
-            checkBenchmarksFn = function () {
-                Ext.Ajax.request({
-                    url: '{url controller=benchmark action=checkBenchmarks}',
-                    success: function(response) {
-                        var res = Ext.decode(response.responseText);
-
-                        interval = 10000;
-
-                        // Set interval to 5 minutes if all data was sent
-                        if (!res.statistics && res.bi) {
-                            interval = 300000;
-                        }
-
-                        // If we received new BI statistics, we print a growl message
-                        if (res.bi) {
-                            Shopware.Notification.createStickyGrowlMessage({
-                                title: '{s name="title/new_benchmark"}{/s}',
-                                text: '{s name="content/new_benchmark"}{/s}',
-                                btnDetail: {
-                                    text: '{s name="open"}{/s}',
-                                    callback: function () {
-                                        Shopware.app.Application.addSubApplication({
-                                            name: 'Shopware.apps.Benchmark',
-                                            params: {
-                                                shopId: res.shopId
-                                            }
-                                        });
-                                    }
-                                }
-                            });
-                        }
-
-                        // If neither sending nor receiving is necessary, set interval to 12 hours
-                        if (!res.statistics && !res.bi && !res.message) {
-                            interval = 43200000;
-                        }
-
-                        if (!res.success) {
-                            interval = 43200000;
-                            var cur = new Date();
-                            cur.setSeconds(cur.getSeconds() + 900);
-
-                            Ext.util.Cookies.set('benchmarkWait', '1', cur);
-                        }
-
-                        window.setTimeout(checkBenchmarksFn, interval);
-                    }
-                });
-            };
-
-        if (Ext.util.Cookies.get('benchmarkWait')) {
-            return;
-        }
-
-        window.setTimeout(checkBenchmarksFn, interval);
     }
 });
 
@@ -595,7 +484,7 @@ createShopwareVersionMessage = function() {
             autoScroll: true,
             cls: Ext.baseCSSPrefix + 'about-shopware-content',
             html: '<p>' +
-                    '<strong>Shopware {$SHOPWARE_VERSION} {$SHOPWARE_VERSION_TEXT}</strong>' +
+                    '<strong>Unofficial Shopware {$SHOPWARE_VERSION} {$SHOPWARE_VERSION_TEXT}</strong>' +
                     '<span>Build Rev {$SHOPWARE_REVISION}</span></p>' +
                     '{if $product == "CE"}<p><strong>Community Edition under <a href="http://www.gnu.org/licenses/agpl.html" target="_blank">AGPL license</a></strong><span>No support included in this shopware package.</span></p>{else}' +
                     '<p><strong>{if $product == "PE"}Professional Edition{elseif $product == "PP"}Professional Plus Edition{elseif $product == "EE"}Enterprise Edition{elseif $product == "EB"}Enterprise Business Edition{elseif $product == "EC"}Enterprise Cluster Edition{/if} under commercial / proprietary license</strong><span>See <a href="https://api.shopware.com/gtc/en_GB.html" target="_blank">TOS</a> for details</span></p>{/if}' +
diff --git a/themes/Backend/ExtJs/backend/index/controller/theme_cache_warm_up.js b/themes/Backend/ExtJs/backend/index/controller/theme_cache_warm_up.js
index f8e33b3b8f8..ed013fc9bfa 100644
--- a/themes/Backend/ExtJs/backend/index/controller/theme_cache_warm_up.js
+++ b/themes/Backend/ExtJs/backend/index/controller/theme_cache_warm_up.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/index/controller/widgets.js b/themes/Backend/ExtJs/backend/index/controller/widgets.js
index 7fbd1f14177..c5c5df78830 100644
--- a/themes/Backend/ExtJs/backend/index/controller/widgets.js
+++ b/themes/Backend/ExtJs/backend/index/controller/widgets.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/index/header.tpl b/themes/Backend/ExtJs/backend/index/header.tpl
index fd93a7661e9..af38b010be4 100644
--- a/themes/Backend/ExtJs/backend/index/header.tpl
+++ b/themes/Backend/ExtJs/backend/index/header.tpl
@@ -1,7 +1,7 @@
 {extends file="backend/base/header.tpl"}
 
 {* Page title *}
-{block name='backend/base/header/title'}Shopware {$SHOPWARE_VERSION} {$SHOPWARE_VERSION_TEXT} (Rev. {$SHOPWARE_REVISION}) - Backend (c) shopware AG{/block}
+{block name='backend/base/header/title'}Unofficial Shopware {$SHOPWARE_VERSION} {$SHOPWARE_VERSION_TEXT} (Rev. {$SHOPWARE_REVISION}) - Backend{/block}
 
 {block name="backend/base/header/css" append}
 <link rel="stylesheet" type="text/css" href="{link file="backend/_resources/styles/growl.css"}" />
@@ -70,8 +70,6 @@ iframe { border: 0 none !important; width: 100%; height: 100%; }
                 firstRunWizardEnabled: {$firstRunWizardEnabled|intval},
                 sbpLogin: {$sbpLogin},
                 updateWizardStarted: {$updateWizardStarted|intval},
-                enableInstallationFeedback: {$installationSurvey|intval},
-                enableBetaFeedback: {$feedbackRequired|intval},
                 biOverviewEnabled: {$biOverviewEnabled|intval},
                 biIsActive: {$biIsActive|intval},
             });
diff --git a/themes/Backend/ExtJs/backend/index/model/batch.js b/themes/Backend/ExtJs/backend/index/model/batch.js
index 4b10eba00b9..aa9b77019c2 100644
--- a/themes/Backend/ExtJs/backend/index/model/batch.js
+++ b/themes/Backend/ExtJs/backend/index/model/batch.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/index/model/customers.js b/themes/Backend/ExtJs/backend/index/model/customers.js
index 19eb443824f..a75c4c5cb8f 100644
--- a/themes/Backend/ExtJs/backend/index/model/customers.js
+++ b/themes/Backend/ExtJs/backend/index/model/customers.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/index/model/error_reporter.js b/themes/Backend/ExtJs/backend/index/model/error_reporter.js
index fb0afcf9e90..b7e93d1fe0e 100644
--- a/themes/Backend/ExtJs/backend/index/model/error_reporter.js
+++ b/themes/Backend/ExtJs/backend/index/model/error_reporter.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/index/model/merchant.js b/themes/Backend/ExtJs/backend/index/model/merchant.js
index 7b1fc958329..4b694cf3550 100644
--- a/themes/Backend/ExtJs/backend/index/model/merchant.js
+++ b/themes/Backend/ExtJs/backend/index/model/merchant.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/index/model/merchant_mail.js b/themes/Backend/ExtJs/backend/index/model/merchant_mail.js
index bbf2444d74a..d73e1400e19 100644
--- a/themes/Backend/ExtJs/backend/index/model/merchant_mail.js
+++ b/themes/Backend/ExtJs/backend/index/model/merchant_mail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/index/model/news.js b/themes/Backend/ExtJs/backend/index/model/news.js
index 2bb4d881c0c..60fda0c0fcb 100644
--- a/themes/Backend/ExtJs/backend/index/model/news.js
+++ b/themes/Backend/ExtJs/backend/index/model/news.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="backend/index/model/news"}
diff --git a/themes/Backend/ExtJs/backend/index/model/orders.js b/themes/Backend/ExtJs/backend/index/model/orders.js
index 92739b6518a..ef52414314a 100644
--- a/themes/Backend/ExtJs/backend/index/model/orders.js
+++ b/themes/Backend/ExtJs/backend/index/model/orders.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/index/model/rating.js b/themes/Backend/ExtJs/backend/index/model/rating.js
index cfa6bf81e59..b04f389fc7b 100644
--- a/themes/Backend/ExtJs/backend/index/model/rating.js
+++ b/themes/Backend/ExtJs/backend/index/model/rating.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="backend/index/model/rating"}
diff --git a/themes/Backend/ExtJs/backend/index/model/theme_cache_warm_up.js b/themes/Backend/ExtJs/backend/index/model/theme_cache_warm_up.js
index f41e3e02840..7d76bb853d6 100644
--- a/themes/Backend/ExtJs/backend/index/model/theme_cache_warm_up.js
+++ b/themes/Backend/ExtJs/backend/index/model/theme_cache_warm_up.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/index/model/turnover.js b/themes/Backend/ExtJs/backend/index/model/turnover.js
index 9474846d2ef..073a6d05a9a 100644
--- a/themes/Backend/ExtJs/backend/index/model/turnover.js
+++ b/themes/Backend/ExtJs/backend/index/model/turnover.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/index/model/visitors.js b/themes/Backend/ExtJs/backend/index/model/visitors.js
index 190e09cd7c0..b64822f56a5 100644
--- a/themes/Backend/ExtJs/backend/index/model/visitors.js
+++ b/themes/Backend/ExtJs/backend/index/model/visitors.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/index/model/widget.js b/themes/Backend/ExtJs/backend/index/model/widget.js
index b46fd88977a..338c0eee1b8 100644
--- a/themes/Backend/ExtJs/backend/index/model/widget.js
+++ b/themes/Backend/ExtJs/backend/index/model/widget.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="backend/index/model/widget"}
diff --git a/themes/Backend/ExtJs/backend/index/model/widget_settings.js b/themes/Backend/ExtJs/backend/index/model/widget_settings.js
index 81340b859e1..27521c7813a 100644
--- a/themes/Backend/ExtJs/backend/index/model/widget_settings.js
+++ b/themes/Backend/ExtJs/backend/index/model/widget_settings.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="backend/index/model/widget_settings"}
diff --git a/themes/Backend/ExtJs/backend/index/store/error_reporter.js b/themes/Backend/ExtJs/backend/index/store/error_reporter.js
index 327fc4c8faa..da76605fbdb 100644
--- a/themes/Backend/ExtJs/backend/index/store/error_reporter.js
+++ b/themes/Backend/ExtJs/backend/index/store/error_reporter.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/index/store/merchant.js b/themes/Backend/ExtJs/backend/index/store/merchant.js
index d5850cc438a..06a3c4c74a4 100644
--- a/themes/Backend/ExtJs/backend/index/store/merchant.js
+++ b/themes/Backend/ExtJs/backend/index/store/merchant.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/index/store/news.js b/themes/Backend/ExtJs/backend/index/store/news.js
index 083f2d677b8..a615d11383e 100644
--- a/themes/Backend/ExtJs/backend/index/store/news.js
+++ b/themes/Backend/ExtJs/backend/index/store/news.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="backend/index/store/news"}
diff --git a/themes/Backend/ExtJs/backend/index/store/news_local.js b/themes/Backend/ExtJs/backend/index/store/news_local.js
index b1c7ea92073..d66cc6ecbbd 100644
--- a/themes/Backend/ExtJs/backend/index/store/news_local.js
+++ b/themes/Backend/ExtJs/backend/index/store/news_local.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="backend/index/store/news_local"}
diff --git a/themes/Backend/ExtJs/backend/index/store/orders.js b/themes/Backend/ExtJs/backend/index/store/orders.js
index 17a6812cffd..57c051d979f 100644
--- a/themes/Backend/ExtJs/backend/index/store/orders.js
+++ b/themes/Backend/ExtJs/backend/index/store/orders.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/index/store/theme_cache_warm_up.js b/themes/Backend/ExtJs/backend/index/store/theme_cache_warm_up.js
index 7f8e05978ec..d3d84f6b512 100644
--- a/themes/Backend/ExtJs/backend/index/store/theme_cache_warm_up.js
+++ b/themes/Backend/ExtJs/backend/index/store/theme_cache_warm_up.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/index/store/turnover.js b/themes/Backend/ExtJs/backend/index/store/turnover.js
index 534734d5756..5972169f070 100644
--- a/themes/Backend/ExtJs/backend/index/store/turnover.js
+++ b/themes/Backend/ExtJs/backend/index/store/turnover.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/index/store/visitors.js b/themes/Backend/ExtJs/backend/index/store/visitors.js
index a94f9342aee..c414df123d9 100644
--- a/themes/Backend/ExtJs/backend/index/store/visitors.js
+++ b/themes/Backend/ExtJs/backend/index/store/visitors.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/index/store/widget.js b/themes/Backend/ExtJs/backend/index/store/widget.js
index c31a37adcce..9f76c909336 100644
--- a/themes/Backend/ExtJs/backend/index/store/widget.js
+++ b/themes/Backend/ExtJs/backend/index/store/widget.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="backend/index/store/widget"}
diff --git a/themes/Backend/ExtJs/backend/index/store/widget_settings.js b/themes/Backend/ExtJs/backend/index/store/widget_settings.js
index 436ba86bbdf..ccdcfbe5ce1 100644
--- a/themes/Backend/ExtJs/backend/index/store/widget_settings.js
+++ b/themes/Backend/ExtJs/backend/index/store/widget_settings.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="backend/index/store/widget_settings"}
diff --git a/themes/Backend/ExtJs/backend/index/view/error_reporter/list.js b/themes/Backend/ExtJs/backend/index/view/error_reporter/list.js
index 654c7f1b432..e39edc0003e 100644
--- a/themes/Backend/ExtJs/backend/index/view/error_reporter/list.js
+++ b/themes/Backend/ExtJs/backend/index/view/error_reporter/list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/index/view/footer.js b/themes/Backend/ExtJs/backend/index/view/footer.js
index 3288f19751c..67aadb54230 100644
--- a/themes/Backend/ExtJs/backend/index/view/footer.js
+++ b/themes/Backend/ExtJs/backend/index/view/footer.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/index/view/detail"}
diff --git a/themes/Backend/ExtJs/backend/index/view/main.js b/themes/Backend/ExtJs/backend/index/view/main.js
index 2d8d9337520..64c3a8870b7 100644
--- a/themes/Backend/ExtJs/backend/index/view/main.js
+++ b/themes/Backend/ExtJs/backend/index/view/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/index/view/menu.js b/themes/Backend/ExtJs/backend/index/view/menu.js
index 77d2e769a2f..de2035a36ad 100644
--- a/themes/Backend/ExtJs/backend/index/view/menu.js
+++ b/themes/Backend/ExtJs/backend/index/view/menu.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/index/view/menu"}
diff --git a/themes/Backend/ExtJs/backend/index/view/merchant/window.js b/themes/Backend/ExtJs/backend/index/view/merchant/window.js
index 19e11081023..9aef2413a26 100644
--- a/themes/Backend/ExtJs/backend/index/view/merchant/window.js
+++ b/themes/Backend/ExtJs/backend/index/view/merchant/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/index/view/widgets"}
diff --git a/themes/Backend/ExtJs/backend/index/view/search.js b/themes/Backend/ExtJs/backend/index/view/search.js
index d8bb62f41a8..67db32d6fbe 100644
--- a/themes/Backend/ExtJs/backend/index/view/search.js
+++ b/themes/Backend/ExtJs/backend/index/view/search.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/index/view/theme_cache/theme_cache_warm_up.js b/themes/Backend/ExtJs/backend/index/view/theme_cache/theme_cache_warm_up.js
index f634eccc39d..572f4acbb97 100644
--- a/themes/Backend/ExtJs/backend/index/view/theme_cache/theme_cache_warm_up.js
+++ b/themes/Backend/ExtJs/backend/index/view/theme_cache/theme_cache_warm_up.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Window
diff --git a/themes/Backend/ExtJs/backend/index/view/widgets/base.js b/themes/Backend/ExtJs/backend/index/view/widgets/base.js
index 657a82fa8b0..bec01babd8f 100644
--- a/themes/Backend/ExtJs/backend/index/view/widgets/base.js
+++ b/themes/Backend/ExtJs/backend/index/view/widgets/base.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/index/view/widgets/bi/base.js b/themes/Backend/ExtJs/backend/index/view/widgets/bi/base.js
deleted file mode 100644
index 20a52f30b54..00000000000
--- a/themes/Backend/ExtJs/backend/index/view/widgets/bi/base.js
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * Shopware 5
- * Copyright (c) shopware AG
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * "Shopware" is a registered trademark of shopware AG.
- * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
- */
-Ext.define('Shopware.apps.Index.view.widgets.bi.Base', {
-    extend: 'Shopware.apps.Index.view.widgets.Base',
-    alias: 'widget.swag-bi-base',
-    layout: 'fit',
-    height: 480,
-    bodyPadding: '1 0 0 0',
-    minWidth: 450,
-
-    /**
-     * Initializes the widget.
-     *
-     * @public
-     * @return void
-     */
-    initComponent: function() {
-        var me = this,
-            store = me.subApp.getStore('Shopware.apps.Base.store.ShopLanguage'),
-            record;
-
-        if (!me.widgetRecord.data || !me.widgetRecord.data.shopId) {
-            me.callParent();
-            return;
-        }
-
-        me.widgetRecord.data.shopId = parseInt(me.widgetRecord.data.shopId);
-        me.widgetRecord.data.title = me.widgetRecord.data.title || '';
-
-        me.items = [
-            {
-                xtype: 'container',
-                html: '<iframe frameborder="0" scrolling="no" src="{url controller=BenchmarkOverview action=render fullPath}?shopId=' + me.widgetRecord.data.shopId + '&name=' + me.widgetRecord.data.name + '&mode=widget"></iframe>'
-            }
-        ];
-
-        record = store.getById(me.widgetRecord.data.shopId);
-
-        if (record === null) {
-            store.load({
-                callback: function () {
-                    store.each(function (storeRecord) {
-                        if (storeRecord.get('id') === me.widgetRecord.data.shopId) {
-                            me.updateTitle(storeRecord.get('name'));
-                        }
-                    });
-                }
-            })
-        } else {
-            me.title = record.get('name') + ' - ' + me.widgetRecord.data.title;
-        }
-
-        me.callParent();
-    },
-
-    /**
-     * Update the title
-     * @param { string } name
-     */
-    updateTitle: function (name) {
-        this.setTitle(name + ' - ' + this.widgetRecord.data.title);
-    }
-});
diff --git a/themes/Backend/ExtJs/backend/index/view/widgets/merchant.js b/themes/Backend/ExtJs/backend/index/view/widgets/merchant.js
index 82bd93100b2..004af6c2c07 100644
--- a/themes/Backend/ExtJs/backend/index/view/widgets/merchant.js
+++ b/themes/Backend/ExtJs/backend/index/view/widgets/merchant.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/index/view/widgets"}
diff --git a/themes/Backend/ExtJs/backend/index/view/widgets/news.js b/themes/Backend/ExtJs/backend/index/view/widgets/news.js
index 5962a9a47f1..a7e9f352559 100644
--- a/themes/Backend/ExtJs/backend/index/view/widgets/news.js
+++ b/themes/Backend/ExtJs/backend/index/view/widgets/news.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/index/view/widgets"}
diff --git a/themes/Backend/ExtJs/backend/index/view/widgets/notice.js b/themes/Backend/ExtJs/backend/index/view/widgets/notice.js
index e6d0d862a6f..6fc9c4c5955 100644
--- a/themes/Backend/ExtJs/backend/index/view/widgets/notice.js
+++ b/themes/Backend/ExtJs/backend/index/view/widgets/notice.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/index/view/widgets"}
diff --git a/themes/Backend/ExtJs/backend/index/view/widgets/orders.js b/themes/Backend/ExtJs/backend/index/view/widgets/orders.js
index a85a4fc9b00..8fdb74ca516 100644
--- a/themes/Backend/ExtJs/backend/index/view/widgets/orders.js
+++ b/themes/Backend/ExtJs/backend/index/view/widgets/orders.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/index/view/widgets"}
diff --git a/themes/Backend/ExtJs/backend/index/view/widgets/rating.js b/themes/Backend/ExtJs/backend/index/view/widgets/rating.js
index 8b18464508f..beecda60448 100644
--- a/themes/Backend/ExtJs/backend/index/view/widgets/rating.js
+++ b/themes/Backend/ExtJs/backend/index/view/widgets/rating.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/index/view/widgets"}
diff --git a/themes/Backend/ExtJs/backend/index/view/widgets/sales.js b/themes/Backend/ExtJs/backend/index/view/widgets/sales.js
index 2f86b3ff157..a8d2cb22509 100644
--- a/themes/Backend/ExtJs/backend/index/view/widgets/sales.js
+++ b/themes/Backend/ExtJs/backend/index/view/widgets/sales.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/index/view/widgets"}
@@ -181,7 +180,7 @@ Ext.define('Shopware.apps.Index.view.widgets.Sales', {
             ]
         });
     },
-    
+
     /**
      * Helper method for load and format of the conversion rate
      *
@@ -300,7 +299,7 @@ Ext.define('Shopware.apps.Index.view.widgets.Sales', {
                         display: 'insideEnd',
                         orientation: 'horizontal',
                         field: 'turnover',
-                        renderer: function (value) { 
+                        renderer: function (value) {
                             return Ext.util.Format.currency(value);
                         },
                         fill: '#FFFFFF',
diff --git a/themes/Backend/ExtJs/backend/index/view/widgets/upload.js b/themes/Backend/ExtJs/backend/index/view/widgets/upload.js
index 808488fcbe3..15dc2078899 100644
--- a/themes/Backend/ExtJs/backend/index/view/widgets/upload.js
+++ b/themes/Backend/ExtJs/backend/index/view/widgets/upload.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/index/view/widgets"}
diff --git a/themes/Backend/ExtJs/backend/index/view/widgets/visitors.js b/themes/Backend/ExtJs/backend/index/view/widgets/visitors.js
index f875d887910..2504c9503ec 100644
--- a/themes/Backend/ExtJs/backend/index/view/widgets/visitors.js
+++ b/themes/Backend/ExtJs/backend/index/view/widgets/visitors.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/index/view/widgets"}
diff --git a/themes/Backend/ExtJs/backend/index/view/widgets/window.js b/themes/Backend/ExtJs/backend/index/view/widgets/window.js
index 0b9233eac7d..d60709706e2 100644
--- a/themes/Backend/ExtJs/backend/index/view/widgets/window.js
+++ b/themes/Backend/ExtJs/backend/index/view/widgets/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
@@ -171,8 +170,6 @@ Ext.define('Shopware.apps.Index.view.widgets.Window', {
         me.widgetStore.each(me.createWidgets.bind(me));
 
         me.onDesktopResize(me.desktop, me.desktop.getWidth(), me.desktop.getHeight());
-
-        window.addEventListener('message', Ext.bind(me.onPostMessage, me), false);
     },
 
     /**
@@ -861,31 +858,16 @@ Ext.define('Shopware.apps.Index.view.widgets.Window', {
             items = [];
 
         me.widgetStore.each(function (widget) {
-            if (widget.get('name').indexOf('swag-bi') === -1) {
-                items.push({
-                    text: widget.get('label'),
-                    widgetId: widget.get('id'),
-                    iconCls: 'sprite-plus-circle-frame',
-                    listeners: {
-                        click: function (menuItem) {
-                            me.fireEvent('addWidget', me, widget.get('name'), menuItem);
-                        }
+            items.push({
+                text: widget.get('label'),
+                widgetId: widget.get('id'),
+                iconCls: 'sprite-plus-circle-frame',
+                listeners: {
+                    click: function (menuItem) {
+                        me.fireEvent('addWidget', me, widget.get('name'), menuItem);
                     }
-                });
-            }
-        });
-
-        items.push({
-            text: '{s name=shopware_bi namespace=backend/index/view/widgets}{/s}',
-            widgetId: null,
-            iconCls: 'sprite-plus-circle-frame',
-            listeners: {
-                click: function () {
-                    Shopware.app.Application.addSubApplication({
-                        name: 'Shopware.apps.Benchmark'
-                    });
                 }
-            }
+            });
         });
 
         return items;
@@ -1022,47 +1004,6 @@ Ext.define('Shopware.apps.Index.view.widgets.Window', {
             resizer[pos].show();
         }
     },
-
-    /**
-     * Adds a widget by name
-     *
-     * @param { object } configuration
-     */
-    addWidgetByName: function (configuration) {
-        this.fireEvent('addWidget', this, configuration.name, null, configuration.data);
-    },
-
-    /**
-     * Custom post message receiver
-     *
-     * @param { MessageEvent } message
-     */
-    onPostMessage: function (message) {
-        var me = this,
-            data = message.data;
-
-        if (typeof data === 'string' && (data.indexOf('swag-bi') >= 0) || data.indexOf('openBenchmarkModule') >= 0) {
-            var widgetInfo = data.split('|');
-
-            if (widgetInfo[0] === 'openBenchmarkModule') {
-                Shopware.app.Application.addSubApplication({
-                    name: 'Shopware.apps.Benchmark',
-                    params: {
-                        shopId: widgetInfo[1]
-                    }
-                });
-            } else {
-                me.addWidgetByName({
-                    name: widgetInfo[0],
-                    data: {
-                        shopId: widgetInfo[1],
-                        name: widgetInfo[2],
-                        title: widgetInfo[3]
-                    }
-                })
-            }
-        }
-    }
 });
 
 //{/block}
diff --git a/themes/Backend/ExtJs/backend/log/app.js b/themes/Backend/ExtJs/backend/log/app.js
index cdec0191602..a7ad97ca8b0 100644
--- a/themes/Backend/ExtJs/backend/log/app.js
+++ b/themes/Backend/ExtJs/backend/log/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Log
diff --git a/themes/Backend/ExtJs/backend/log/controller/log.js b/themes/Backend/ExtJs/backend/log/controller/log.js
index a158e4b7e82..58fa44eec89 100644
--- a/themes/Backend/ExtJs/backend/log/controller/log.js
+++ b/themes/Backend/ExtJs/backend/log/controller/log.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Log
diff --git a/themes/Backend/ExtJs/backend/log/controller/main.js b/themes/Backend/ExtJs/backend/log/controller/main.js
index 3135fa32bb0..683f0d80879 100644
--- a/themes/Backend/ExtJs/backend/log/controller/main.js
+++ b/themes/Backend/ExtJs/backend/log/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Log
diff --git a/themes/Backend/ExtJs/backend/log/controller/system.js b/themes/Backend/ExtJs/backend/log/controller/system.js
index d857e047526..ff186c8eb6a 100644
--- a/themes/Backend/ExtJs/backend/log/controller/system.js
+++ b/themes/Backend/ExtJs/backend/log/controller/system.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="backend/log/controller/system"}
diff --git a/themes/Backend/ExtJs/backend/log/model/log.js b/themes/Backend/ExtJs/backend/log/model/log.js
index 2434ea19fff..76f16b61786 100644
--- a/themes/Backend/ExtJs/backend/log/model/log.js
+++ b/themes/Backend/ExtJs/backend/log/model/log.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Log
diff --git a/themes/Backend/ExtJs/backend/log/model/log_file.js b/themes/Backend/ExtJs/backend/log/model/log_file.js
index a81c86c4251..7c3c447dfe0 100644
--- a/themes/Backend/ExtJs/backend/log/model/log_file.js
+++ b/themes/Backend/ExtJs/backend/log/model/log_file.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Systeminfo
diff --git a/themes/Backend/ExtJs/backend/log/model/system_log.js b/themes/Backend/ExtJs/backend/log/model/system_log.js
index 25bba6e28c1..a9c947f66ff 100644
--- a/themes/Backend/ExtJs/backend/log/model/system_log.js
+++ b/themes/Backend/ExtJs/backend/log/model/system_log.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Systeminfo
diff --git a/themes/Backend/ExtJs/backend/log/store/log_files.js b/themes/Backend/ExtJs/backend/log/store/log_files.js
index edb83f20376..aae9fb372ad 100644
--- a/themes/Backend/ExtJs/backend/log/store/log_files.js
+++ b/themes/Backend/ExtJs/backend/log/store/log_files.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Systeminfo
diff --git a/themes/Backend/ExtJs/backend/log/store/logs.js b/themes/Backend/ExtJs/backend/log/store/logs.js
index 9f998a2cefc..cd6ac43a2c4 100644
--- a/themes/Backend/ExtJs/backend/log/store/logs.js
+++ b/themes/Backend/ExtJs/backend/log/store/logs.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Log
diff --git a/themes/Backend/ExtJs/backend/log/store/system_logs.js b/themes/Backend/ExtJs/backend/log/store/system_logs.js
index 4731a75f506..2b3fb13c628 100644
--- a/themes/Backend/ExtJs/backend/log/store/system_logs.js
+++ b/themes/Backend/ExtJs/backend/log/store/system_logs.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Systeminfo
diff --git a/themes/Backend/ExtJs/backend/log/view/log/detail.js b/themes/Backend/ExtJs/backend/log/view/log/detail.js
index 314f7af4e6c..845d07ac138 100644
--- a/themes/Backend/ExtJs/backend/log/view/log/detail.js
+++ b/themes/Backend/ExtJs/backend/log/view/log/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Log
diff --git a/themes/Backend/ExtJs/backend/log/view/log/list.js b/themes/Backend/ExtJs/backend/log/view/log/list.js
index caf978e92a2..ebd81ca8673 100644
--- a/themes/Backend/ExtJs/backend/log/view/log/list.js
+++ b/themes/Backend/ExtJs/backend/log/view/log/list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Log
diff --git a/themes/Backend/ExtJs/backend/log/view/main/window.js b/themes/Backend/ExtJs/backend/log/view/main/window.js
index 1e9542a0f2a..420fac87cb2 100644
--- a/themes/Backend/ExtJs/backend/log/view/main/window.js
+++ b/themes/Backend/ExtJs/backend/log/view/main/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/log/main"}
diff --git a/themes/Backend/ExtJs/backend/log/view/system/detail.js b/themes/Backend/ExtJs/backend/log/view/system/detail.js
index e80a1d3476d..e0ae551b22c 100644
--- a/themes/Backend/ExtJs/backend/log/view/system/detail.js
+++ b/themes/Backend/ExtJs/backend/log/view/system/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Log
diff --git a/themes/Backend/ExtJs/backend/log/view/system/list.js b/themes/Backend/ExtJs/backend/log/view/system/list.js
index faefca697f5..4b7c123dc9e 100644
--- a/themes/Backend/ExtJs/backend/log/view/system/list.js
+++ b/themes/Backend/ExtJs/backend/log/view/system/list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Systeminfo
@@ -155,13 +154,12 @@ Ext.define('Shopware.apps.Log.view.system.List', {
             var record = store.findRecord('default', true);
             if (record) {
                 combo.setValue(record.get('name'));
+                combo.fireEvent('select');
             }
         }, this, {
             single: true
         });
 
-        combo.store.load();
-
         combo.on('select', function () {
             var value = combo.getValue();
             if (value) {
@@ -175,6 +173,8 @@ Ext.define('Shopware.apps.Log.view.system.List', {
             }
         }, this);
 
+        combo.store.load();
+
         return combo;
     }
 });
diff --git a/themes/Backend/ExtJs/backend/login/app.js b/themes/Backend/ExtJs/backend/login/app.js
index 9de4640c5b2..39480e5427a 100644
--- a/themes/Backend/ExtJs/backend/login/app.js
+++ b/themes/Backend/ExtJs/backend/login/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Login
diff --git a/themes/Backend/ExtJs/backend/login/controller/main.js b/themes/Backend/ExtJs/backend/login/controller/main.js
index 546ad62141f..7a726e053e0 100644
--- a/themes/Backend/ExtJs/backend/login/controller/main.js
+++ b/themes/Backend/ExtJs/backend/login/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Login
diff --git a/themes/Backend/ExtJs/backend/login/model/locale.js b/themes/Backend/ExtJs/backend/login/model/locale.js
index 4493209f4b1..59d66980fb9 100644
--- a/themes/Backend/ExtJs/backend/login/model/locale.js
+++ b/themes/Backend/ExtJs/backend/login/model/locale.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Login
diff --git a/themes/Backend/ExtJs/backend/login/store/locale.js b/themes/Backend/ExtJs/backend/login/store/locale.js
index e6da1a0b3f8..9cf47560151 100644
--- a/themes/Backend/ExtJs/backend/login/store/locale.js
+++ b/themes/Backend/ExtJs/backend/login/store/locale.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Login
diff --git a/themes/Backend/ExtJs/backend/login/view/main.js b/themes/Backend/ExtJs/backend/login/view/main.js
index 4cc5b6ed434..c4a3989dbbd 100644
--- a/themes/Backend/ExtJs/backend/login/view/main.js
+++ b/themes/Backend/ExtJs/backend/login/view/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Login
diff --git a/themes/Backend/ExtJs/backend/login/view/main/form.js b/themes/Backend/ExtJs/backend/login/view/main/form.js
index 10937d728b4..9237cb3b0f8 100644
--- a/themes/Backend/ExtJs/backend/login/view/main/form.js
+++ b/themes/Backend/ExtJs/backend/login/view/main/form.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Login
diff --git a/themes/Backend/ExtJs/backend/mail/app.js b/themes/Backend/ExtJs/backend/mail/app.js
index 20f2eb109d2..3dbbda6d887 100644
--- a/themes/Backend/ExtJs/backend/mail/app.js
+++ b/themes/Backend/ExtJs/backend/mail/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Mail
diff --git a/themes/Backend/ExtJs/backend/mail/controller/attachment.js b/themes/Backend/ExtJs/backend/mail/controller/attachment.js
index 34998f287d0..6adbbb597c4 100644
--- a/themes/Backend/ExtJs/backend/mail/controller/attachment.js
+++ b/themes/Backend/ExtJs/backend/mail/controller/attachment.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Mail
diff --git a/themes/Backend/ExtJs/backend/mail/controller/main.js b/themes/Backend/ExtJs/backend/mail/controller/main.js
index 7503cef0792..aa324e01dee 100644
--- a/themes/Backend/ExtJs/backend/mail/controller/main.js
+++ b/themes/Backend/ExtJs/backend/mail/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Mail
diff --git a/themes/Backend/ExtJs/backend/mail/model/attachment.js b/themes/Backend/ExtJs/backend/mail/model/attachment.js
index 9c778cf0cf2..d8da56f85b2 100644
--- a/themes/Backend/ExtJs/backend/mail/model/attachment.js
+++ b/themes/Backend/ExtJs/backend/mail/model/attachment.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Mail
diff --git a/themes/Backend/ExtJs/backend/mail/model/mail.js b/themes/Backend/ExtJs/backend/mail/model/mail.js
index 3f313974876..e9bae5fbcf9 100644
--- a/themes/Backend/ExtJs/backend/mail/model/mail.js
+++ b/themes/Backend/ExtJs/backend/mail/model/mail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Mail
diff --git a/themes/Backend/ExtJs/backend/mail/store/attachment.js b/themes/Backend/ExtJs/backend/mail/store/attachment.js
index 2aa9f06b61e..fbc914ae621 100644
--- a/themes/Backend/ExtJs/backend/mail/store/attachment.js
+++ b/themes/Backend/ExtJs/backend/mail/store/attachment.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Mail
diff --git a/themes/Backend/ExtJs/backend/mail/store/mail.js b/themes/Backend/ExtJs/backend/mail/store/mail.js
index 0cd9467e788..ad1c92511c6 100644
--- a/themes/Backend/ExtJs/backend/mail/store/mail.js
+++ b/themes/Backend/ExtJs/backend/mail/store/mail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Mail
diff --git a/themes/Backend/ExtJs/backend/mail/store/tree.js b/themes/Backend/ExtJs/backend/mail/store/tree.js
index c16e009cd9a..37ce7e49d93 100644
--- a/themes/Backend/ExtJs/backend/mail/store/tree.js
+++ b/themes/Backend/ExtJs/backend/mail/store/tree.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Mail
diff --git a/themes/Backend/ExtJs/backend/mail/view/main/attachments.js b/themes/Backend/ExtJs/backend/mail/view/main/attachments.js
index ad627acb849..bb83fef9c98 100644
--- a/themes/Backend/ExtJs/backend/mail/view/main/attachments.js
+++ b/themes/Backend/ExtJs/backend/mail/view/main/attachments.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Mail
diff --git a/themes/Backend/ExtJs/backend/mail/view/main/content_editor.js b/themes/Backend/ExtJs/backend/mail/view/main/content_editor.js
index 272f7ab369c..4e1ca5f7801 100644
--- a/themes/Backend/ExtJs/backend/mail/view/main/content_editor.js
+++ b/themes/Backend/ExtJs/backend/mail/view/main/content_editor.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Mail
diff --git a/themes/Backend/ExtJs/backend/mail/view/main/form.js b/themes/Backend/ExtJs/backend/mail/view/main/form.js
index e66eab5e9f2..c7d43dc3e20 100644
--- a/themes/Backend/ExtJs/backend/mail/view/main/form.js
+++ b/themes/Backend/ExtJs/backend/mail/view/main/form.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Mail
diff --git a/themes/Backend/ExtJs/backend/mail/view/main/info.js b/themes/Backend/ExtJs/backend/mail/view/main/info.js
index 40a270595a2..4adaef150a7 100644
--- a/themes/Backend/ExtJs/backend/mail/view/main/info.js
+++ b/themes/Backend/ExtJs/backend/mail/view/main/info.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Mail
diff --git a/themes/Backend/ExtJs/backend/mail/view/main/navigation.js b/themes/Backend/ExtJs/backend/mail/view/main/navigation.js
index 4fc4e7081f8..9f1e56c08a0 100644
--- a/themes/Backend/ExtJs/backend/mail/view/main/navigation.js
+++ b/themes/Backend/ExtJs/backend/mail/view/main/navigation.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Mail
diff --git a/themes/Backend/ExtJs/backend/mail/view/main/window.js b/themes/Backend/ExtJs/backend/mail/view/main/window.js
index b8eb4415dfc..9acdd6c5f39 100644
--- a/themes/Backend/ExtJs/backend/mail/view/main/window.js
+++ b/themes/Backend/ExtJs/backend/mail/view/main/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Mail
diff --git a/themes/Backend/ExtJs/backend/mail_log/model/filter.js b/themes/Backend/ExtJs/backend/mail_log/model/filter.js
index ab3e178d6d5..7a218d1f8ae 100644
--- a/themes/Backend/ExtJs/backend/mail_log/model/filter.js
+++ b/themes/Backend/ExtJs/backend/mail_log/model/filter.js
@@ -1,10 +1,11 @@
 // {namespace name="backend/mail_log/model"}
-//{block name="backend/performance/model/filter"}
+//{block name="backend/mail_log/model/filter"}
 Ext.define('Shopware.apps.MailLog.model.Filter', {
 
     extend: 'Ext.data.Model',
 
     fields: [
+        //{block name="backend/mail_log/model/filter/fields"}{/block}
         { name: 'label', type: 'string' },
         { name: 'name', type: 'string' },
     ],
diff --git a/themes/Backend/ExtJs/backend/media_manager/app.js b/themes/Backend/ExtJs/backend/media_manager/app.js
index 682703496d1..6aa5a3ca478 100644
--- a/themes/Backend/ExtJs/backend/media_manager/app.js
+++ b/themes/Backend/ExtJs/backend/media_manager/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    MediaManager
diff --git a/themes/Backend/ExtJs/backend/media_manager/controller/album.js b/themes/Backend/ExtJs/backend/media_manager/controller/album.js
index f886286b346..447ab705d31 100644
--- a/themes/Backend/ExtJs/backend/media_manager/controller/album.js
+++ b/themes/Backend/ExtJs/backend/media_manager/controller/album.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    MediaManager
diff --git a/themes/Backend/ExtJs/backend/media_manager/controller/main.js b/themes/Backend/ExtJs/backend/media_manager/controller/main.js
index 51cd0c412ba..1870e7120f1 100644
--- a/themes/Backend/ExtJs/backend/media_manager/controller/main.js
+++ b/themes/Backend/ExtJs/backend/media_manager/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    MediaManager
diff --git a/themes/Backend/ExtJs/backend/media_manager/controller/media.js b/themes/Backend/ExtJs/backend/media_manager/controller/media.js
index 4596a1552f2..b4e265ba216 100644
--- a/themes/Backend/ExtJs/backend/media_manager/controller/media.js
+++ b/themes/Backend/ExtJs/backend/media_manager/controller/media.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    MediaManager
diff --git a/themes/Backend/ExtJs/backend/media_manager/controller/thumbnail.js b/themes/Backend/ExtJs/backend/media_manager/controller/thumbnail.js
index fc3f4078737..8dffd886920 100644
--- a/themes/Backend/ExtJs/backend/media_manager/controller/thumbnail.js
+++ b/themes/Backend/ExtJs/backend/media_manager/controller/thumbnail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/media_manager/model/album.js b/themes/Backend/ExtJs/backend/media_manager/model/album.js
index df5845d2f51..e3b2ce203ee 100644
--- a/themes/Backend/ExtJs/backend/media_manager/model/album.js
+++ b/themes/Backend/ExtJs/backend/media_manager/model/album.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    MediaManager
diff --git a/themes/Backend/ExtJs/backend/media_manager/model/media.js b/themes/Backend/ExtJs/backend/media_manager/model/media.js
index ece0509291a..2fff53db5f8 100644
--- a/themes/Backend/ExtJs/backend/media_manager/model/media.js
+++ b/themes/Backend/ExtJs/backend/media_manager/model/media.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    MediaManager
diff --git a/themes/Backend/ExtJs/backend/media_manager/model/setting.js b/themes/Backend/ExtJs/backend/media_manager/model/setting.js
index fad28388619..78b2091e65d 100644
--- a/themes/Backend/ExtJs/backend/media_manager/model/setting.js
+++ b/themes/Backend/ExtJs/backend/media_manager/model/setting.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    MediaManager
diff --git a/themes/Backend/ExtJs/backend/media_manager/store/album.js b/themes/Backend/ExtJs/backend/media_manager/store/album.js
index a7e79c778c3..fddeb236ddd 100644
--- a/themes/Backend/ExtJs/backend/media_manager/store/album.js
+++ b/themes/Backend/ExtJs/backend/media_manager/store/album.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    MediaManager
diff --git a/themes/Backend/ExtJs/backend/media_manager/store/media.js b/themes/Backend/ExtJs/backend/media_manager/store/media.js
index 32308c4977b..8fe920bd2ae 100644
--- a/themes/Backend/ExtJs/backend/media_manager/store/media.js
+++ b/themes/Backend/ExtJs/backend/media_manager/store/media.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    MediaManager
diff --git a/themes/Backend/ExtJs/backend/media_manager/view/album/add.js b/themes/Backend/ExtJs/backend/media_manager/view/album/add.js
index 335b899fd65..2d696607995 100644
--- a/themes/Backend/ExtJs/backend/media_manager/view/album/add.js
+++ b/themes/Backend/ExtJs/backend/media_manager/view/album/add.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    MediaManager
diff --git a/themes/Backend/ExtJs/backend/media_manager/view/album/setting.js b/themes/Backend/ExtJs/backend/media_manager/view/album/setting.js
index c81e7061491..373ab034653 100644
--- a/themes/Backend/ExtJs/backend/media_manager/view/album/setting.js
+++ b/themes/Backend/ExtJs/backend/media_manager/view/album/setting.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    MediaManager
diff --git a/themes/Backend/ExtJs/backend/media_manager/view/album/tree.js b/themes/Backend/ExtJs/backend/media_manager/view/album/tree.js
index 0b19b06f6b5..abbc48ba99e 100644
--- a/themes/Backend/ExtJs/backend/media_manager/view/album/tree.js
+++ b/themes/Backend/ExtJs/backend/media_manager/view/album/tree.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    MediaManager
diff --git a/themes/Backend/ExtJs/backend/media_manager/view/batch_move/batch_move.js b/themes/Backend/ExtJs/backend/media_manager/view/batch_move/batch_move.js
index 20ae492f495..2817a2f265b 100644
--- a/themes/Backend/ExtJs/backend/media_manager/view/batch_move/batch_move.js
+++ b/themes/Backend/ExtJs/backend/media_manager/view/batch_move/batch_move.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/media_manager/view/main"}
diff --git a/themes/Backend/ExtJs/backend/media_manager/view/main/selection.js b/themes/Backend/ExtJs/backend/media_manager/view/main/selection.js
index e45503c1ea6..4b7692e9b24 100644
--- a/themes/Backend/ExtJs/backend/media_manager/view/main/selection.js
+++ b/themes/Backend/ExtJs/backend/media_manager/view/main/selection.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    MediaManager
diff --git a/themes/Backend/ExtJs/backend/media_manager/view/main/window.js b/themes/Backend/ExtJs/backend/media_manager/view/main/window.js
index 2e725d7e0e2..5e654b2a504 100644
--- a/themes/Backend/ExtJs/backend/media_manager/view/main/window.js
+++ b/themes/Backend/ExtJs/backend/media_manager/view/main/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    MediaManager
diff --git a/themes/Backend/ExtJs/backend/media_manager/view/media/grid.js b/themes/Backend/ExtJs/backend/media_manager/view/media/grid.js
index 91265f1ef0c..73c2459a28e 100644
--- a/themes/Backend/ExtJs/backend/media_manager/view/media/grid.js
+++ b/themes/Backend/ExtJs/backend/media_manager/view/media/grid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    MediaManager
diff --git a/themes/Backend/ExtJs/backend/media_manager/view/media/view.js b/themes/Backend/ExtJs/backend/media_manager/view/media/view.js
index 7699c1d7219..851e9305634 100644
--- a/themes/Backend/ExtJs/backend/media_manager/view/media/view.js
+++ b/themes/Backend/ExtJs/backend/media_manager/view/media/view.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    MediaManager
diff --git a/themes/Backend/ExtJs/backend/media_manager/view/replace/file_select.js b/themes/Backend/ExtJs/backend/media_manager/view/replace/file_select.js
index b0123a93119..33eb286d31d 100644
--- a/themes/Backend/ExtJs/backend/media_manager/view/replace/file_select.js
+++ b/themes/Backend/ExtJs/backend/media_manager/view/replace/file_select.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  */
 
diff --git a/themes/Backend/ExtJs/backend/media_manager/view/replace/grid.js b/themes/Backend/ExtJs/backend/media_manager/view/replace/grid.js
index 93648dc3a21..c859001205a 100644
--- a/themes/Backend/ExtJs/backend/media_manager/view/replace/grid.js
+++ b/themes/Backend/ExtJs/backend/media_manager/view/replace/grid.js
@@ -2,28 +2,27 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  */
 
 //{namespace name="backend/media_manager/view/replace"}
-//{block name="backend/media_manager/view/replace/window"}
+//{block name="backend/media_manager/view/replace/grid"}
 Ext.define('Shopware.apps.MediaManager.view.replace.Grid', {
     extend: 'Ext.panel.Panel',
     layout: 'vbox',
diff --git a/themes/Backend/ExtJs/backend/media_manager/view/replace/row.js b/themes/Backend/ExtJs/backend/media_manager/view/replace/row.js
index 09881409505..311b327764b 100644
--- a/themes/Backend/ExtJs/backend/media_manager/view/replace/row.js
+++ b/themes/Backend/ExtJs/backend/media_manager/view/replace/row.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  */
 
diff --git a/themes/Backend/ExtJs/backend/media_manager/view/replace/upload.js b/themes/Backend/ExtJs/backend/media_manager/view/replace/upload.js
index 389bf51dc71..ea63eac4a29 100644
--- a/themes/Backend/ExtJs/backend/media_manager/view/replace/upload.js
+++ b/themes/Backend/ExtJs/backend/media_manager/view/replace/upload.js
@@ -2,28 +2,27 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  */
 
 //{namespace name="backend/media_manager/view/replace"}
-//{block name="backend/media_manager/view/replace/row"}
+//{block name="backend/media_manager/view/replace/upload"}
 Ext.define('Shopware.apps.MediaManager.view.replace.Upload', {
     extend: 'Ext.container.Container',
     uploadUrl: '{url action=singleReplace controller=MediaManager}',
diff --git a/themes/Backend/ExtJs/backend/media_manager/view/replace/window.js b/themes/Backend/ExtJs/backend/media_manager/view/replace/window.js
index 0cb04e618e7..bed15305583 100644
--- a/themes/Backend/ExtJs/backend/media_manager/view/replace/window.js
+++ b/themes/Backend/ExtJs/backend/media_manager/view/replace/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  */
 
diff --git a/themes/Backend/ExtJs/backend/media_manager/view/thumbnail/main.js b/themes/Backend/ExtJs/backend/media_manager/view/thumbnail/main.js
index ef840aebd34..66316ec1743 100644
--- a/themes/Backend/ExtJs/backend/media_manager/view/thumbnail/main.js
+++ b/themes/Backend/ExtJs/backend/media_manager/view/thumbnail/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/app.js b/themes/Backend/ExtJs/backend/newsletter_manager/app.js
index b268e27c89a..7c6073b21a4 100644
--- a/themes/Backend/ExtJs/backend/newsletter_manager/app.js
+++ b/themes/Backend/ExtJs/backend/newsletter_manager/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    NewsletterManager
diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/controller/admin.js b/themes/Backend/ExtJs/backend/newsletter_manager/controller/admin.js
index a2620ab8726..c785aacbc35 100644
--- a/themes/Backend/ExtJs/backend/newsletter_manager/controller/admin.js
+++ b/themes/Backend/ExtJs/backend/newsletter_manager/controller/admin.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    NewsletterManager
diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/controller/editor.js b/themes/Backend/ExtJs/backend/newsletter_manager/controller/editor.js
index 67d2c87c87e..40bcfa0216a 100644
--- a/themes/Backend/ExtJs/backend/newsletter_manager/controller/editor.js
+++ b/themes/Backend/ExtJs/backend/newsletter_manager/controller/editor.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    NewsletterManager
@@ -400,7 +399,8 @@ Ext.define('Shopware.apps.NewsletterManager.controller.Editor', {
                                 id: 'iframe-win',  // Add id
                                 autoEl: {
                                     tag: 'iframe',
-                                    src: url
+                                    src: url,
+                                    sandbox: ''
                                 }
                             }]
                         }).show();
diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/controller/main.js b/themes/Backend/ExtJs/backend/newsletter_manager/controller/main.js
index 3129393d336..d4329d9d2a8 100644
--- a/themes/Backend/ExtJs/backend/newsletter_manager/controller/main.js
+++ b/themes/Backend/ExtJs/backend/newsletter_manager/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    NewsletterManager
diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/controller/overview.js b/themes/Backend/ExtJs/backend/newsletter_manager/controller/overview.js
index 48d2c12d5c2..7b6b798483f 100644
--- a/themes/Backend/ExtJs/backend/newsletter_manager/controller/overview.js
+++ b/themes/Backend/ExtJs/backend/newsletter_manager/controller/overview.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    NewsletterManager
diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/model/container.js b/themes/Backend/ExtJs/backend/newsletter_manager/model/container.js
index 7c8af1f7f66..62d4d78b071 100644
--- a/themes/Backend/ExtJs/backend/newsletter_manager/model/container.js
+++ b/themes/Backend/ExtJs/backend/newsletter_manager/model/container.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    NewsletterManager
@@ -44,7 +43,7 @@ Ext.define('Shopware.apps.NewsletterManager.model.Container', {
      * @array
      */
     fields: [
-        //{block name="backend/newsletter_manager/model/sender/fields"}{/block}
+        //{block name="backend/newsletter_manager/model/container/fields"}{/block}
         { name: 'id', type: 'int', useNull: true },
         { name: 'newsletterId', type: 'int' },
         { name: 'value', type: 'string' },
diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/model/container_type_text.js b/themes/Backend/ExtJs/backend/newsletter_manager/model/container_type_text.js
index bbbf75a1104..ae25cd2d6c1 100644
--- a/themes/Backend/ExtJs/backend/newsletter_manager/model/container_type_text.js
+++ b/themes/Backend/ExtJs/backend/newsletter_manager/model/container_type_text.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    NewsletterManager
diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/model/mail_dispatch.js b/themes/Backend/ExtJs/backend/newsletter_manager/model/mail_dispatch.js
index 8235b75dedd..b78b30e2922 100644
--- a/themes/Backend/ExtJs/backend/newsletter_manager/model/mail_dispatch.js
+++ b/themes/Backend/ExtJs/backend/newsletter_manager/model/mail_dispatch.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    NewsletterManager
diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/model/mailing.js b/themes/Backend/ExtJs/backend/newsletter_manager/model/mailing.js
index b40ff072128..5409ba7c0f0 100644
--- a/themes/Backend/ExtJs/backend/newsletter_manager/model/mailing.js
+++ b/themes/Backend/ExtJs/backend/newsletter_manager/model/mailing.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    NewsletterManager
diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/model/newsletter_group.js b/themes/Backend/ExtJs/backend/newsletter_manager/model/newsletter_group.js
index a79b32c857a..f40b66aa264 100644
--- a/themes/Backend/ExtJs/backend/newsletter_manager/model/newsletter_group.js
+++ b/themes/Backend/ExtJs/backend/newsletter_manager/model/newsletter_group.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    NewsletterManager
diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/model/recipient.js b/themes/Backend/ExtJs/backend/newsletter_manager/model/recipient.js
index 3b1b7d59859..574e95ec6ca 100644
--- a/themes/Backend/ExtJs/backend/newsletter_manager/model/recipient.js
+++ b/themes/Backend/ExtJs/backend/newsletter_manager/model/recipient.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    NewsletterManager
diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/model/recipient_group.js b/themes/Backend/ExtJs/backend/newsletter_manager/model/recipient_group.js
index 4c97b92ca13..4dbcb8eac61 100644
--- a/themes/Backend/ExtJs/backend/newsletter_manager/model/recipient_group.js
+++ b/themes/Backend/ExtJs/backend/newsletter_manager/model/recipient_group.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    NewsletterManager
diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/model/sender.js b/themes/Backend/ExtJs/backend/newsletter_manager/model/sender.js
index 88bcfc26ef2..65231ab19dc 100644
--- a/themes/Backend/ExtJs/backend/newsletter_manager/model/sender.js
+++ b/themes/Backend/ExtJs/backend/newsletter_manager/model/sender.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    NewsletterManager
diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/model/settings.js b/themes/Backend/ExtJs/backend/newsletter_manager/model/settings.js
index da0c4afbf2b..03cd24ae139 100644
--- a/themes/Backend/ExtJs/backend/newsletter_manager/model/settings.js
+++ b/themes/Backend/ExtJs/backend/newsletter_manager/model/settings.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    NewsletterManager
diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/store/mail_dispatch.js b/themes/Backend/ExtJs/backend/newsletter_manager/store/mail_dispatch.js
index acc95e84f56..8875e2f4036 100644
--- a/themes/Backend/ExtJs/backend/newsletter_manager/store/mail_dispatch.js
+++ b/themes/Backend/ExtJs/backend/newsletter_manager/store/mail_dispatch.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    NewsletterManager
diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/store/mailing.js b/themes/Backend/ExtJs/backend/newsletter_manager/store/mailing.js
index b456d1e73a7..1b623fa0d59 100644
--- a/themes/Backend/ExtJs/backend/newsletter_manager/store/mailing.js
+++ b/themes/Backend/ExtJs/backend/newsletter_manager/store/mailing.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    NewsletterManager
diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/store/newsletter_group.js b/themes/Backend/ExtJs/backend/newsletter_manager/store/newsletter_group.js
index 500e6df2aeb..28d4f6c012e 100644
--- a/themes/Backend/ExtJs/backend/newsletter_manager/store/newsletter_group.js
+++ b/themes/Backend/ExtJs/backend/newsletter_manager/store/newsletter_group.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    NewsletterManager
diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/store/recipient.js b/themes/Backend/ExtJs/backend/newsletter_manager/store/recipient.js
index 26f784f219c..a2df7f568ea 100644
--- a/themes/Backend/ExtJs/backend/newsletter_manager/store/recipient.js
+++ b/themes/Backend/ExtJs/backend/newsletter_manager/store/recipient.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    NewsletterManager
diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/store/recipient_group.js b/themes/Backend/ExtJs/backend/newsletter_manager/store/recipient_group.js
index 318740021fc..e9b2b8d518a 100644
--- a/themes/Backend/ExtJs/backend/newsletter_manager/store/recipient_group.js
+++ b/themes/Backend/ExtJs/backend/newsletter_manager/store/recipient_group.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    NewsletterManager
diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/store/sender.js b/themes/Backend/ExtJs/backend/newsletter_manager/store/sender.js
index ed66e9c3e81..f336103e535 100644
--- a/themes/Backend/ExtJs/backend/newsletter_manager/store/sender.js
+++ b/themes/Backend/ExtJs/backend/newsletter_manager/store/sender.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    NewsletterManager
diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/view/main/window.js b/themes/Backend/ExtJs/backend/newsletter_manager/view/main/window.js
index e6db549e91b..a9c290b7223 100644
--- a/themes/Backend/ExtJs/backend/newsletter_manager/view/main/window.js
+++ b/themes/Backend/ExtJs/backend/newsletter_manager/view/main/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    NewsletterManager
diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/view/newsletter/bottom_toolbar.js b/themes/Backend/ExtJs/backend/newsletter_manager/view/newsletter/bottom_toolbar.js
index e4d51b9a920..e94dcf13c6a 100644
--- a/themes/Backend/ExtJs/backend/newsletter_manager/view/newsletter/bottom_toolbar.js
+++ b/themes/Backend/ExtJs/backend/newsletter_manager/view/newsletter/bottom_toolbar.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    NewsletterManager
diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/view/newsletter/editor.js b/themes/Backend/ExtJs/backend/newsletter_manager/view/newsletter/editor.js
index b0458d623ec..e92d979f0cc 100644
--- a/themes/Backend/ExtJs/backend/newsletter_manager/view/newsletter/editor.js
+++ b/themes/Backend/ExtJs/backend/newsletter_manager/view/newsletter/editor.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    NewsletterManager
diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/view/newsletter/settings.js b/themes/Backend/ExtJs/backend/newsletter_manager/view/newsletter/settings.js
index de2fd5a8f33..0edead52add 100644
--- a/themes/Backend/ExtJs/backend/newsletter_manager/view/newsletter/settings.js
+++ b/themes/Backend/ExtJs/backend/newsletter_manager/view/newsletter/settings.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    NewsletterManager
diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/view/newsletter/window.js b/themes/Backend/ExtJs/backend/newsletter_manager/view/newsletter/window.js
index 420fac93ac4..0beed83d785 100644
--- a/themes/Backend/ExtJs/backend/newsletter_manager/view/newsletter/window.js
+++ b/themes/Backend/ExtJs/backend/newsletter_manager/view/newsletter/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    NewsletterManager
diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/view/sender_dialog.js b/themes/Backend/ExtJs/backend/newsletter_manager/view/sender_dialog.js
index 5b2e14ba7cb..5ec470bc0c7 100644
--- a/themes/Backend/ExtJs/backend/newsletter_manager/view/sender_dialog.js
+++ b/themes/Backend/ExtJs/backend/newsletter_manager/view/sender_dialog.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    NewsletterManager
diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/admin.js b/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/admin.js
index 318e3eb8fcf..2e33833c4b8 100644
--- a/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/admin.js
+++ b/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/admin.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    NewsletterManager
diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/overview.js b/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/overview.js
index 98272f47f06..6b1ec5b681b 100644
--- a/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/overview.js
+++ b/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/overview.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    NewsletterManager
diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/recipient_groups.js b/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/recipient_groups.js
index 818d65a26dc..1d979eeaa69 100644
--- a/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/recipient_groups.js
+++ b/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/recipient_groups.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    NewsletterManager
diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/recipients.js b/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/recipients.js
index 3fcbd2bbd05..dafaaf042ab 100644
--- a/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/recipients.js
+++ b/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/recipients.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    NewsletterManager
diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/sender.js b/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/sender.js
index ba5de172738..7224e162d07 100644
--- a/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/sender.js
+++ b/themes/Backend/ExtJs/backend/newsletter_manager/view/tabs/sender.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    NewsletterManager
diff --git a/themes/Backend/ExtJs/backend/notification/app.js b/themes/Backend/ExtJs/backend/notification/app.js
index 2104c9918d6..c54bcce0556 100644
--- a/themes/Backend/ExtJs/backend/notification/app.js
+++ b/themes/Backend/ExtJs/backend/notification/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Notification
diff --git a/themes/Backend/ExtJs/backend/notification/controller/main.js b/themes/Backend/ExtJs/backend/notification/controller/main.js
index f7346271620..4740893fa6e 100644
--- a/themes/Backend/ExtJs/backend/notification/controller/main.js
+++ b/themes/Backend/ExtJs/backend/notification/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Notification
diff --git a/themes/Backend/ExtJs/backend/notification/controller/notification.js b/themes/Backend/ExtJs/backend/notification/controller/notification.js
index 7430c222bd8..7128e23f87d 100644
--- a/themes/Backend/ExtJs/backend/notification/controller/notification.js
+++ b/themes/Backend/ExtJs/backend/notification/controller/notification.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Notification
@@ -80,6 +79,7 @@ Ext.define('Shopware.apps.Notification.controller.Notification', {
         customerStore.getProxy().extraParams = {
             orderNumber: record.get("number")
         };
+        customerStore.currentPage = 1;
         customerStore.load();
     },
 
diff --git a/themes/Backend/ExtJs/backend/notification/model/article.js b/themes/Backend/ExtJs/backend/notification/model/article.js
index 2db50b95bdd..bb1f20e0e99 100644
--- a/themes/Backend/ExtJs/backend/notification/model/article.js
+++ b/themes/Backend/ExtJs/backend/notification/model/article.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Notification
diff --git a/themes/Backend/ExtJs/backend/notification/model/customer.js b/themes/Backend/ExtJs/backend/notification/model/customer.js
index 4fe051d87ed..d2a5f80742a 100644
--- a/themes/Backend/ExtJs/backend/notification/model/customer.js
+++ b/themes/Backend/ExtJs/backend/notification/model/customer.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Notification
diff --git a/themes/Backend/ExtJs/backend/notification/store/article.js b/themes/Backend/ExtJs/backend/notification/store/article.js
index 9f068f56245..c5735497bbb 100644
--- a/themes/Backend/ExtJs/backend/notification/store/article.js
+++ b/themes/Backend/ExtJs/backend/notification/store/article.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Notification
diff --git a/themes/Backend/ExtJs/backend/notification/store/customer.js b/themes/Backend/ExtJs/backend/notification/store/customer.js
index 39966a03d94..ba33fc45484 100644
--- a/themes/Backend/ExtJs/backend/notification/store/customer.js
+++ b/themes/Backend/ExtJs/backend/notification/store/customer.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Notification
diff --git a/themes/Backend/ExtJs/backend/notification/view/main/window.js b/themes/Backend/ExtJs/backend/notification/view/main/window.js
index 3e8328e0091..20fbf8d343b 100644
--- a/themes/Backend/ExtJs/backend/notification/view/main/window.js
+++ b/themes/Backend/ExtJs/backend/notification/view/main/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Notification
diff --git a/themes/Backend/ExtJs/backend/notification/view/notification/article.js b/themes/Backend/ExtJs/backend/notification/view/notification/article.js
index 8d74d9e67ca..033e6b9a0b4 100644
--- a/themes/Backend/ExtJs/backend/notification/view/notification/article.js
+++ b/themes/Backend/ExtJs/backend/notification/view/notification/article.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Notification
diff --git a/themes/Backend/ExtJs/backend/notification/view/notification/customer.js b/themes/Backend/ExtJs/backend/notification/view/notification/customer.js
index 48538693105..0e4fe7ff277 100644
--- a/themes/Backend/ExtJs/backend/notification/view/notification/customer.js
+++ b/themes/Backend/ExtJs/backend/notification/view/notification/customer.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Notification
diff --git a/themes/Backend/ExtJs/backend/order/app.js b/themes/Backend/ExtJs/backend/order/app.js
index b89de1d9acc..28704c1e26a 100644
--- a/themes/Backend/ExtJs/backend/order/app.js
+++ b/themes/Backend/ExtJs/backend/order/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/controller/attachment.js b/themes/Backend/ExtJs/backend/order/controller/attachment.js
index 6ac4c7d6881..3d46faf334f 100644
--- a/themes/Backend/ExtJs/backend/order/controller/attachment.js
+++ b/themes/Backend/ExtJs/backend/order/controller/attachment.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @author shopware AG
diff --git a/themes/Backend/ExtJs/backend/order/controller/batch.js b/themes/Backend/ExtJs/backend/order/controller/batch.js
index 8bb03f1ff0c..0b5f5cb42c2 100644
--- a/themes/Backend/ExtJs/backend/order/controller/batch.js
+++ b/themes/Backend/ExtJs/backend/order/controller/batch.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/controller/detail.js b/themes/Backend/ExtJs/backend/order/controller/detail.js
index df1b3dac2ed..ced79853f2c 100644
--- a/themes/Backend/ExtJs/backend/order/controller/detail.js
+++ b/themes/Backend/ExtJs/backend/order/controller/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
@@ -370,8 +369,18 @@ Ext.define('Shopware.apps.Order.controller.Detail', {
             updateButton = editor.editor.floatingButtons.items.items[0];
 
         updateButton.setDisabled(false);
-        columns[1].setValue(record.get('number'));
-        columns[2].setValue(record.get('name'));
+
+        columns.forEach(function(column){
+            if (column.name === 'articleNumber'){
+                column.setValue(record.get('number'));
+            } else if (column.name === 'articleName'){
+                column.setValue(record.get('name'));
+            } else if (column.name === 'price'){
+                column.setValue(record.get('price'));
+            } else if (column.name === 'taxId'){
+                column.setValue(record.get('taxId'));
+            }
+        });
 
         // Update articleId for row
         editor.context.record.set('articleId', record.get('articleId'));
diff --git a/themes/Backend/ExtJs/backend/order/controller/document.js b/themes/Backend/ExtJs/backend/order/controller/document.js
index 2163f33f97a..860955d5db5 100644
--- a/themes/Backend/ExtJs/backend/order/controller/document.js
+++ b/themes/Backend/ExtJs/backend/order/controller/document.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @subpackage Controller
diff --git a/themes/Backend/ExtJs/backend/order/controller/filter.js b/themes/Backend/ExtJs/backend/order/controller/filter.js
index c3e12c645b2..1ea71c7ab45 100644
--- a/themes/Backend/ExtJs/backend/order/controller/filter.js
+++ b/themes/Backend/ExtJs/backend/order/controller/filter.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/controller/list.js b/themes/Backend/ExtJs/backend/order/controller/list.js
index 41f91d468f9..e66660f6612 100644
--- a/themes/Backend/ExtJs/backend/order/controller/list.js
+++ b/themes/Backend/ExtJs/backend/order/controller/list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/controller/mail.js b/themes/Backend/ExtJs/backend/order/controller/mail.js
index 17ed5fdd686..6c23e5cdc84 100644
--- a/themes/Backend/ExtJs/backend/order/controller/mail.js
+++ b/themes/Backend/ExtJs/backend/order/controller/mail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/controller/main.js b/themes/Backend/ExtJs/backend/order/controller/main.js
index 5f6850f5b5e..ced33a3b643 100644
--- a/themes/Backend/ExtJs/backend/order/controller/main.js
+++ b/themes/Backend/ExtJs/backend/order/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/model/batch.js b/themes/Backend/ExtJs/backend/order/model/batch.js
index 050e565f43f..62e722ffa9f 100644
--- a/themes/Backend/ExtJs/backend/order/model/batch.js
+++ b/themes/Backend/ExtJs/backend/order/model/batch.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/model/billing.js b/themes/Backend/ExtJs/backend/order/model/billing.js
index ecd18c207b6..b56f819fe42 100644
--- a/themes/Backend/ExtJs/backend/order/model/billing.js
+++ b/themes/Backend/ExtJs/backend/order/model/billing.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/model/configuration.js b/themes/Backend/ExtJs/backend/order/model/configuration.js
index 856ed8a3b2b..7e7ce6fb9db 100644
--- a/themes/Backend/ExtJs/backend/order/model/configuration.js
+++ b/themes/Backend/ExtJs/backend/order/model/configuration.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/model/debit.js b/themes/Backend/ExtJs/backend/order/model/debit.js
index 1ffd339d680..664e485c153 100644
--- a/themes/Backend/ExtJs/backend/order/model/debit.js
+++ b/themes/Backend/ExtJs/backend/order/model/debit.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/model/detail_batch.js b/themes/Backend/ExtJs/backend/order/model/detail_batch.js
index f1c61d5e877..f1b8db8f9e2 100644
--- a/themes/Backend/ExtJs/backend/order/model/detail_batch.js
+++ b/themes/Backend/ExtJs/backend/order/model/detail_batch.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
@@ -33,7 +32,7 @@
  * The detail_batch model ist responsible to load all other stores needed for the detail page.
  *
  */
-//{block name="backend/order/model/batch"}
+//{block name="backend/order/model/detail_batch"}
 Ext.define('Shopware.apps.Order.model.DetailBatch', {
 
     /**
diff --git a/themes/Backend/ExtJs/backend/order/model/dispatch.js b/themes/Backend/ExtJs/backend/order/model/dispatch.js
index 8c578516a47..9c8ed254f81 100644
--- a/themes/Backend/ExtJs/backend/order/model/dispatch.js
+++ b/themes/Backend/ExtJs/backend/order/model/dispatch.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/model/list_batch.js b/themes/Backend/ExtJs/backend/order/model/list_batch.js
index e8ca42fe1c0..53e86995077 100644
--- a/themes/Backend/ExtJs/backend/order/model/list_batch.js
+++ b/themes/Backend/ExtJs/backend/order/model/list_batch.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/model/mail.js b/themes/Backend/ExtJs/backend/order/model/mail.js
index 0febf5e810e..b82f391a4a7 100644
--- a/themes/Backend/ExtJs/backend/order/model/mail.js
+++ b/themes/Backend/ExtJs/backend/order/model/mail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/model/mail_template.js b/themes/Backend/ExtJs/backend/order/model/mail_template.js
index cb985e5a600..aca1259b297 100644
--- a/themes/Backend/ExtJs/backend/order/model/mail_template.js
+++ b/themes/Backend/ExtJs/backend/order/model/mail_template.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/model/order.js b/themes/Backend/ExtJs/backend/order/model/order.js
index 3503e0db9e8..d3eede53fce 100644
--- a/themes/Backend/ExtJs/backend/order/model/order.js
+++ b/themes/Backend/ExtJs/backend/order/model/order.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/model/order_history.js b/themes/Backend/ExtJs/backend/order/model/order_history.js
index 5c9a8edd668..c6985799d87 100644
--- a/themes/Backend/ExtJs/backend/order/model/order_history.js
+++ b/themes/Backend/ExtJs/backend/order/model/order_history.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/model/payment.js b/themes/Backend/ExtJs/backend/order/model/payment.js
index 42f0ea8779a..a648a26f702 100644
--- a/themes/Backend/ExtJs/backend/order/model/payment.js
+++ b/themes/Backend/ExtJs/backend/order/model/payment.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/model/payment_instance.js b/themes/Backend/ExtJs/backend/order/model/payment_instance.js
index c1d56df3ccd..fe604a01bee 100644
--- a/themes/Backend/ExtJs/backend/order/model/payment_instance.js
+++ b/themes/Backend/ExtJs/backend/order/model/payment_instance.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/model/position.js b/themes/Backend/ExtJs/backend/order/model/position.js
index 44ae912bfda..dc635dd1ebf 100644
--- a/themes/Backend/ExtJs/backend/order/model/position.js
+++ b/themes/Backend/ExtJs/backend/order/model/position.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/model/position_product_search.js b/themes/Backend/ExtJs/backend/order/model/position_product_search.js
new file mode 100644
index 00000000000..876affc8870
--- /dev/null
+++ b/themes/Backend/ExtJs/backend/order/model/position_product_search.js
@@ -0,0 +1,94 @@
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ *
+ * @category   Shopware
+ * @package    Base
+ * @subpackage Model
+ * @version    $Id$
+ * @author shopware AG
+ */
+
+/**
+ * Shopware Model - Global Stores and Models
+ *
+ * The article_with_variants model is based on the article model. This model is able to hold article variants.
+ */
+//{block name="backend/order/model/position_product_search"}
+Ext.define('Shopware.apps.Order.model.PositionProductSearch', {
+    /**
+     * Extends the standard Ext Model
+     * @string
+     */
+    extend: 'Shopware.data.Model',
+
+    /**
+     * The fields used for this model
+     * @array
+     */
+    fields: [
+        { name: 'id', type: 'int' },
+        { name: 'name', type: 'string' },
+        { name: 'articleId', type: 'int' },
+        { name: 'additionalText', type: 'string' },
+        { name: 'supplierName', type: 'string' },
+        { name: 'supplierId', type: 'int' },
+        { name: 'ordernumber', type: 'string' },
+        { name: 'inStock', type: 'string' },
+        { name: 'active', type: 'int' },
+        { name: 'price', type: 'float' },
+        { name: 'tax', type: 'float' },
+        { name: 'taxId', type: 'int' },
+
+        //mapping fields for ExtJS
+        { name: 'number', type: 'string', mapping: 'ordernumber' },
+    ],
+
+    /**
+     * Configure the data communication
+     * @object
+     */
+    proxy: {
+        /**
+         * Set proxy type to ajax
+         * @string
+         */
+        type: 'ajax',
+
+        /**
+         * Specific urls to call on CRUD action methods "create", "read", "update" and "destroy".
+         * @object
+         */
+        url: '{url controller="OrderProductSearch" action="getProductVariants"}',
+
+        /**
+         * The Ext.data.reader.Reader to use to decode the server's
+         * response or data read from client. This can either be a Reader instance,
+         * a config object or just a valid Reader type name (e.g. 'json', 'xml').
+         * @object
+         */
+        reader: {
+            type: 'json',
+            root: 'data',
+            totalProperty: 'total'
+        }
+    }
+});
+//{/block}
diff --git a/themes/Backend/ExtJs/backend/order/model/receipt.js b/themes/Backend/ExtJs/backend/order/model/receipt.js
index 7fc2fd6b8e7..7000de6649c 100644
--- a/themes/Backend/ExtJs/backend/order/model/receipt.js
+++ b/themes/Backend/ExtJs/backend/order/model/receipt.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/model/receipt_attribute.js b/themes/Backend/ExtJs/backend/order/model/receipt_attribute.js
index caf919f36e5..f6478dfc43a 100644
--- a/themes/Backend/ExtJs/backend/order/model/receipt_attribute.js
+++ b/themes/Backend/ExtJs/backend/order/model/receipt_attribute.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/model/shipping.js b/themes/Backend/ExtJs/backend/order/model/shipping.js
index d5201659440..a7424a3c5c7 100644
--- a/themes/Backend/ExtJs/backend/order/model/shipping.js
+++ b/themes/Backend/ExtJs/backend/order/model/shipping.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/model/tax.js b/themes/Backend/ExtJs/backend/order/model/tax.js
index 62479f01b31..a882dc6e94b 100644
--- a/themes/Backend/ExtJs/backend/order/model/tax.js
+++ b/themes/Backend/ExtJs/backend/order/model/tax.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/model/voucher.js b/themes/Backend/ExtJs/backend/order/model/voucher.js
index faa17180804..b152bc1d0c7 100644
--- a/themes/Backend/ExtJs/backend/order/model/voucher.js
+++ b/themes/Backend/ExtJs/backend/order/model/voucher.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/store/batch.js b/themes/Backend/ExtJs/backend/order/store/batch.js
index 12f1a96941c..48b619189d6 100644
--- a/themes/Backend/ExtJs/backend/order/store/batch.js
+++ b/themes/Backend/ExtJs/backend/order/store/batch.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/store/configuration.js b/themes/Backend/ExtJs/backend/order/store/configuration.js
index e869d12feb9..7c9d561c0b7 100644
--- a/themes/Backend/ExtJs/backend/order/store/configuration.js
+++ b/themes/Backend/ExtJs/backend/order/store/configuration.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/store/detail_batch.js b/themes/Backend/ExtJs/backend/order/store/detail_batch.js
index d703ff8271a..cae4bb7d0d4 100644
--- a/themes/Backend/ExtJs/backend/order/store/detail_batch.js
+++ b/themes/Backend/ExtJs/backend/order/store/detail_batch.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/store/doc_type.js b/themes/Backend/ExtJs/backend/order/store/doc_type.js
index 6367bf3a567..2b3340db11b 100644
--- a/themes/Backend/ExtJs/backend/order/store/doc_type.js
+++ b/themes/Backend/ExtJs/backend/order/store/doc_type.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/store/document_registry.js b/themes/Backend/ExtJs/backend/order/store/document_registry.js
index 46b30a3d974..ecb0c4be502 100644
--- a/themes/Backend/ExtJs/backend/order/store/document_registry.js
+++ b/themes/Backend/ExtJs/backend/order/store/document_registry.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @author shopware AG
diff --git a/themes/Backend/ExtJs/backend/order/store/list_batch.js b/themes/Backend/ExtJs/backend/order/store/list_batch.js
index 13c734e9c1f..c6b83b36992 100644
--- a/themes/Backend/ExtJs/backend/order/store/list_batch.js
+++ b/themes/Backend/ExtJs/backend/order/store/list_batch.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/store/mail_template.js b/themes/Backend/ExtJs/backend/order/store/mail_template.js
index 605c4af430a..89e1acc8cbc 100644
--- a/themes/Backend/ExtJs/backend/order/store/mail_template.js
+++ b/themes/Backend/ExtJs/backend/order/store/mail_template.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/store/order.js b/themes/Backend/ExtJs/backend/order/store/order.js
index 10f36401e16..261cca9b51d 100644
--- a/themes/Backend/ExtJs/backend/order/store/order.js
+++ b/themes/Backend/ExtJs/backend/order/store/order.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/store/order_history.js b/themes/Backend/ExtJs/backend/order/store/order_history.js
index 9559506a4dd..8db34a2664d 100644
--- a/themes/Backend/ExtJs/backend/order/store/order_history.js
+++ b/themes/Backend/ExtJs/backend/order/store/order_history.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/store/position_product_search.js b/themes/Backend/ExtJs/backend/order/store/position_product_search.js
new file mode 100644
index 00000000000..ece9e405f82
--- /dev/null
+++ b/themes/Backend/ExtJs/backend/order/store/position_product_search.js
@@ -0,0 +1,92 @@
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ *
+ * @category   Shopware
+ * @package    Order
+ * @subpackage Store
+ * @version    $Id$
+ * @author shopware AG
+ */
+
+/**
+ * Shopware Store - Global Stores and Models
+ *
+ * The article store contains all defined shop articles.
+ */
+Ext.define('Shopware.apps.Order.store.PositionProductSearch', {
+    /**
+     * Define that this component is an extension of the Ext.data.Store
+     */
+    extend: 'Ext.data.Store',
+
+    /**
+     * Define the used model for this store
+     * @string
+     */
+    model: 'Shopware.apps.Order.model.PositionProductSearch',
+
+    /**
+     * Define how much rows loaded with one request
+     */
+    pageSize: 10,
+
+    /**
+     * autoload the store after the component
+     * is initialized
+     * @boolean
+     */
+    autoLoad: false,
+
+    /**
+     * Enable remote sorting
+     */
+    remoteSort: true,
+
+    /**
+     * Enable remote filtering
+     */
+    remoteFilter: true,
+
+    /**
+     * Configure the data communication
+     * @object
+     */
+    proxy: {
+        type: 'ajax',
+
+        /**
+         * Configure the url mapping for the different
+         * store operations based on
+         * @object
+         */
+        url: '{url controller="OrderProductSearch" action="getProductVariants"}',
+
+        /**
+         * Configure the data reader
+         * @object
+         */
+        reader: {
+            type: 'json',
+            root: 'data',
+            totalProperty: 'total'
+        }
+    }
+});
diff --git a/themes/Backend/ExtJs/backend/order/store/tax.js b/themes/Backend/ExtJs/backend/order/store/tax.js
index 273ad603657..f80aff2ed41 100644
--- a/themes/Backend/ExtJs/backend/order/store/tax.js
+++ b/themes/Backend/ExtJs/backend/order/store/tax.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/store/voucher.js b/themes/Backend/ExtJs/backend/order/store/voucher.js
index 508e96ea198..79faaddadd6 100644
--- a/themes/Backend/ExtJs/backend/order/store/voucher.js
+++ b/themes/Backend/ExtJs/backend/order/store/voucher.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/view/batch/form.js b/themes/Backend/ExtJs/backend/order/view/batch/form.js
index f4e7ab73138..3fe6a4e6d89 100644
--- a/themes/Backend/ExtJs/backend/order/view/batch/form.js
+++ b/themes/Backend/ExtJs/backend/order/view/batch/form.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/view/batch/list.js b/themes/Backend/ExtJs/backend/order/view/batch/list.js
index ec38867f067..6cc2613d64d 100644
--- a/themes/Backend/ExtJs/backend/order/view/batch/list.js
+++ b/themes/Backend/ExtJs/backend/order/view/batch/list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/view/batch/progress.js b/themes/Backend/ExtJs/backend/order/view/batch/progress.js
index df9aa92cfc3..2bd6e54b8df 100644
--- a/themes/Backend/ExtJs/backend/order/view/batch/progress.js
+++ b/themes/Backend/ExtJs/backend/order/view/batch/progress.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/view/batch/window.js b/themes/Backend/ExtJs/backend/order/view/batch/window.js
index fc78fa1cd1c..3957330bbae 100644
--- a/themes/Backend/ExtJs/backend/order/view/batch/window.js
+++ b/themes/Backend/ExtJs/backend/order/view/batch/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/view/detail/billing.js b/themes/Backend/ExtJs/backend/order/view/detail/billing.js
index 3c30a3f0692..ccd0f54f0f4 100644
--- a/themes/Backend/ExtJs/backend/order/view/detail/billing.js
+++ b/themes/Backend/ExtJs/backend/order/view/detail/billing.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/view/detail/communication.js b/themes/Backend/ExtJs/backend/order/view/detail/communication.js
index 79cf922ad8c..cbfa2b481b6 100644
--- a/themes/Backend/ExtJs/backend/order/view/detail/communication.js
+++ b/themes/Backend/ExtJs/backend/order/view/detail/communication.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/view/detail/configuration.js b/themes/Backend/ExtJs/backend/order/view/detail/configuration.js
index ffdb63d2986..a0c218592b4 100644
--- a/themes/Backend/ExtJs/backend/order/view/detail/configuration.js
+++ b/themes/Backend/ExtJs/backend/order/view/detail/configuration.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/view/detail/debit.js b/themes/Backend/ExtJs/backend/order/view/detail/debit.js
index d7bebf41cf1..0692ee77bf1 100644
--- a/themes/Backend/ExtJs/backend/order/view/detail/debit.js
+++ b/themes/Backend/ExtJs/backend/order/view/detail/debit.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/view/detail/detail.js b/themes/Backend/ExtJs/backend/order/view/detail/detail.js
index bcf3a3c6f6d..7c493fa360c 100644
--- a/themes/Backend/ExtJs/backend/order/view/detail/detail.js
+++ b/themes/Backend/ExtJs/backend/order/view/detail/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/view/detail/dispatch.js b/themes/Backend/ExtJs/backend/order/view/detail/dispatch.js
index 3abd2862353..2fdc926ef05 100644
--- a/themes/Backend/ExtJs/backend/order/view/detail/dispatch.js
+++ b/themes/Backend/ExtJs/backend/order/view/detail/dispatch.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/view/detail/document.js b/themes/Backend/ExtJs/backend/order/view/detail/document.js
index feefcb9782f..7e991477dbe 100644
--- a/themes/Backend/ExtJs/backend/order/view/detail/document.js
+++ b/themes/Backend/ExtJs/backend/order/view/detail/document.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/view/detail/order_history.js b/themes/Backend/ExtJs/backend/order/view/detail/order_history.js
index 7dacf93406b..1999348fa3e 100644
--- a/themes/Backend/ExtJs/backend/order/view/detail/order_history.js
+++ b/themes/Backend/ExtJs/backend/order/view/detail/order_history.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/view/detail/overview.js b/themes/Backend/ExtJs/backend/order/view/detail/overview.js
index cb1254e52f1..8b8c814f100 100644
--- a/themes/Backend/ExtJs/backend/order/view/detail/overview.js
+++ b/themes/Backend/ExtJs/backend/order/view/detail/overview.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/view/detail/position.js b/themes/Backend/ExtJs/backend/order/view/detail/position.js
index 59872f11141..94006ea04f5 100644
--- a/themes/Backend/ExtJs/backend/order/view/detail/position.js
+++ b/themes/Backend/ExtJs/backend/order/view/detail/position.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
@@ -475,7 +474,8 @@ Ext.define('Shopware.apps.Order.view.detail.Position', {
             name: name,
             returnValue: returnValue,
             hiddenReturnValue: hiddenReturnValue,
-            articleStore: Ext.create('Shopware.apps.Base.store.Variant'),
+            articleStore: Ext.create('Shopware.apps.Order.store.PositionProductSearch'),
+            extraParam: { 'orderId': this.record.data.id },
             allowBlank: false,
             getValue: function() {
                 return this.getSearchField().getValue();
diff --git a/themes/Backend/ExtJs/backend/order/view/detail/shipping.js b/themes/Backend/ExtJs/backend/order/view/detail/shipping.js
index c2aab0dd096..4d9ea161a68 100644
--- a/themes/Backend/ExtJs/backend/order/view/detail/shipping.js
+++ b/themes/Backend/ExtJs/backend/order/view/detail/shipping.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/view/detail/window.js b/themes/Backend/ExtJs/backend/order/view/detail/window.js
index d8633b8727d..17d24c3299f 100644
--- a/themes/Backend/ExtJs/backend/order/view/detail/window.js
+++ b/themes/Backend/ExtJs/backend/order/view/detail/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/view/list/document.js b/themes/Backend/ExtJs/backend/order/view/list/document.js
index 796651addad..8eff1ba4588 100644
--- a/themes/Backend/ExtJs/backend/order/view/list/document.js
+++ b/themes/Backend/ExtJs/backend/order/view/list/document.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/view/list/filter.js b/themes/Backend/ExtJs/backend/order/view/list/filter.js
index c64316a2e50..4c2855e8f25 100644
--- a/themes/Backend/ExtJs/backend/order/view/list/filter.js
+++ b/themes/Backend/ExtJs/backend/order/view/list/filter.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/view/list/list.js b/themes/Backend/ExtJs/backend/order/view/list/list.js
index 0b730978d6a..8a6883b3658 100644
--- a/themes/Backend/ExtJs/backend/order/view/list/list.js
+++ b/themes/Backend/ExtJs/backend/order/view/list/list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/view/list/navigation.js b/themes/Backend/ExtJs/backend/order/view/list/navigation.js
index 4949ce29c91..e3fa6e040ae 100644
--- a/themes/Backend/ExtJs/backend/order/view/list/navigation.js
+++ b/themes/Backend/ExtJs/backend/order/view/list/navigation.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/view/list/position.js b/themes/Backend/ExtJs/backend/order/view/list/position.js
index b27d08e488c..0474e9de4b4 100644
--- a/themes/Backend/ExtJs/backend/order/view/list/position.js
+++ b/themes/Backend/ExtJs/backend/order/view/list/position.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/view/mail/attachment.js b/themes/Backend/ExtJs/backend/order/view/mail/attachment.js
index 8cc47595fa9..c6eadce23ba 100644
--- a/themes/Backend/ExtJs/backend/order/view/mail/attachment.js
+++ b/themes/Backend/ExtJs/backend/order/view/mail/attachment.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @author shopware AG
diff --git a/themes/Backend/ExtJs/backend/order/view/mail/form.js b/themes/Backend/ExtJs/backend/order/view/mail/form.js
index 3a171c22242..1145b616367 100644
--- a/themes/Backend/ExtJs/backend/order/view/mail/form.js
+++ b/themes/Backend/ExtJs/backend/order/view/mail/form.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/view/mail/window.js b/themes/Backend/ExtJs/backend/order/view/mail/window.js
index 3e8fd801c8a..f6924d026da 100644
--- a/themes/Backend/ExtJs/backend/order/view/mail/window.js
+++ b/themes/Backend/ExtJs/backend/order/view/mail/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/order/view/main/window.js b/themes/Backend/ExtJs/backend/order/view/main/window.js
index b4d7ff95d02..f95f2005dfd 100644
--- a/themes/Backend/ExtJs/backend/order/view/main/window.js
+++ b/themes/Backend/ExtJs/backend/order/view/main/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/overview/app.js b/themes/Backend/ExtJs/backend/overview/app.js
index b84e0afd5dd..f7fcd85cf58 100644
--- a/themes/Backend/ExtJs/backend/overview/app.js
+++ b/themes/Backend/ExtJs/backend/overview/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Overview
diff --git a/themes/Backend/ExtJs/backend/overview/controller/main.js b/themes/Backend/ExtJs/backend/overview/controller/main.js
index e733adc6b2f..1e3e9dcda74 100644
--- a/themes/Backend/ExtJs/backend/overview/controller/main.js
+++ b/themes/Backend/ExtJs/backend/overview/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Overview
diff --git a/themes/Backend/ExtJs/backend/overview/model/overview.js b/themes/Backend/ExtJs/backend/overview/model/overview.js
index 5c14ba83f0c..f85c7ed03c4 100644
--- a/themes/Backend/ExtJs/backend/overview/model/overview.js
+++ b/themes/Backend/ExtJs/backend/overview/model/overview.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Overview
diff --git a/themes/Backend/ExtJs/backend/overview/store/overview.js b/themes/Backend/ExtJs/backend/overview/store/overview.js
index 1f565036d6a..8f08dbe9e00 100644
--- a/themes/Backend/ExtJs/backend/overview/store/overview.js
+++ b/themes/Backend/ExtJs/backend/overview/store/overview.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Overview
diff --git a/themes/Backend/ExtJs/backend/overview/view/main/grid.js b/themes/Backend/ExtJs/backend/overview/view/main/grid.js
index 738c0e5d995..63aad5355d5 100644
--- a/themes/Backend/ExtJs/backend/overview/view/main/grid.js
+++ b/themes/Backend/ExtJs/backend/overview/view/main/grid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Overview
diff --git a/themes/Backend/ExtJs/backend/overview/view/main/window.js b/themes/Backend/ExtJs/backend/overview/view/main/window.js
index 53d60edd483..40b4e5cae70 100644
--- a/themes/Backend/ExtJs/backend/overview/view/main/window.js
+++ b/themes/Backend/ExtJs/backend/overview/view/main/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Overview
diff --git a/themes/Backend/ExtJs/backend/partner/app.js b/themes/Backend/ExtJs/backend/partner/app.js
index 6d4d970316c..8d8f53dbf9a 100644
--- a/themes/Backend/ExtJs/backend/partner/app.js
+++ b/themes/Backend/ExtJs/backend/partner/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Partner
diff --git a/themes/Backend/ExtJs/backend/partner/controller/main.js b/themes/Backend/ExtJs/backend/partner/controller/main.js
index cbe053b05a4..35048c83e61 100644
--- a/themes/Backend/ExtJs/backend/partner/controller/main.js
+++ b/themes/Backend/ExtJs/backend/partner/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Partner
diff --git a/themes/Backend/ExtJs/backend/partner/controller/partner.js b/themes/Backend/ExtJs/backend/partner/controller/partner.js
index 20ed0af88b1..76f8844381c 100644
--- a/themes/Backend/ExtJs/backend/partner/controller/partner.js
+++ b/themes/Backend/ExtJs/backend/partner/controller/partner.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Partner
diff --git a/themes/Backend/ExtJs/backend/partner/controller/statistic.js b/themes/Backend/ExtJs/backend/partner/controller/statistic.js
index 3b4b4652cf0..52fbfa1d53b 100644
--- a/themes/Backend/ExtJs/backend/partner/controller/statistic.js
+++ b/themes/Backend/ExtJs/backend/partner/controller/statistic.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Partner
diff --git a/themes/Backend/ExtJs/backend/partner/model/detail.js b/themes/Backend/ExtJs/backend/partner/model/detail.js
index 04af7b8a7b8..16cc3e67c02 100644
--- a/themes/Backend/ExtJs/backend/partner/model/detail.js
+++ b/themes/Backend/ExtJs/backend/partner/model/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Partner
diff --git a/themes/Backend/ExtJs/backend/partner/model/main.js b/themes/Backend/ExtJs/backend/partner/model/main.js
index 23cee3295fb..58652834f05 100644
--- a/themes/Backend/ExtJs/backend/partner/model/main.js
+++ b/themes/Backend/ExtJs/backend/partner/model/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Partner
diff --git a/themes/Backend/ExtJs/backend/partner/model/statistic_chart.js b/themes/Backend/ExtJs/backend/partner/model/statistic_chart.js
index dfe518a9f6e..8ad1fc3099c 100644
--- a/themes/Backend/ExtJs/backend/partner/model/statistic_chart.js
+++ b/themes/Backend/ExtJs/backend/partner/model/statistic_chart.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Partner
diff --git a/themes/Backend/ExtJs/backend/partner/model/statistic_list.js b/themes/Backend/ExtJs/backend/partner/model/statistic_list.js
index 68905763b1c..38125e910bb 100644
--- a/themes/Backend/ExtJs/backend/partner/model/statistic_list.js
+++ b/themes/Backend/ExtJs/backend/partner/model/statistic_list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Partner
diff --git a/themes/Backend/ExtJs/backend/partner/store/detail.js b/themes/Backend/ExtJs/backend/partner/store/detail.js
index 3b79c27f51a..42067e7a605 100644
--- a/themes/Backend/ExtJs/backend/partner/store/detail.js
+++ b/themes/Backend/ExtJs/backend/partner/store/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Partner
diff --git a/themes/Backend/ExtJs/backend/partner/store/list.js b/themes/Backend/ExtJs/backend/partner/store/list.js
index a1287864703..d849b31803e 100644
--- a/themes/Backend/ExtJs/backend/partner/store/list.js
+++ b/themes/Backend/ExtJs/backend/partner/store/list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Partner
diff --git a/themes/Backend/ExtJs/backend/partner/store/statistic_chart.js b/themes/Backend/ExtJs/backend/partner/store/statistic_chart.js
index d0f115ea498..78a3c162758 100644
--- a/themes/Backend/ExtJs/backend/partner/store/statistic_chart.js
+++ b/themes/Backend/ExtJs/backend/partner/store/statistic_chart.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Partner
diff --git a/themes/Backend/ExtJs/backend/partner/store/statistic_list.js b/themes/Backend/ExtJs/backend/partner/store/statistic_list.js
index 48e3c30113f..2dd7e2423c6 100644
--- a/themes/Backend/ExtJs/backend/partner/store/statistic_list.js
+++ b/themes/Backend/ExtJs/backend/partner/store/statistic_list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Partner
diff --git a/themes/Backend/ExtJs/backend/partner/view/main/window.js b/themes/Backend/ExtJs/backend/partner/view/main/window.js
index bbd088d5b27..d13b84748b2 100644
--- a/themes/Backend/ExtJs/backend/partner/view/main/window.js
+++ b/themes/Backend/ExtJs/backend/partner/view/main/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Partner
diff --git a/themes/Backend/ExtJs/backend/partner/view/partner/detail.js b/themes/Backend/ExtJs/backend/partner/view/partner/detail.js
index d2825d8d011..fd086a3b55c 100644
--- a/themes/Backend/ExtJs/backend/partner/view/partner/detail.js
+++ b/themes/Backend/ExtJs/backend/partner/view/partner/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Partner
diff --git a/themes/Backend/ExtJs/backend/partner/view/partner/list.js b/themes/Backend/ExtJs/backend/partner/view/partner/list.js
index ba0a0e487b6..ef3e7233370 100644
--- a/themes/Backend/ExtJs/backend/partner/view/partner/list.js
+++ b/themes/Backend/ExtJs/backend/partner/view/partner/list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Partner
diff --git a/themes/Backend/ExtJs/backend/partner/view/partner/window.js b/themes/Backend/ExtJs/backend/partner/view/partner/window.js
index d473baa1014..f28b16e3087 100644
--- a/themes/Backend/ExtJs/backend/partner/view/partner/window.js
+++ b/themes/Backend/ExtJs/backend/partner/view/partner/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Partner
diff --git a/themes/Backend/ExtJs/backend/partner/view/statistic/chart.js b/themes/Backend/ExtJs/backend/partner/view/statistic/chart.js
index da4305ba177..efe31f34998 100644
--- a/themes/Backend/ExtJs/backend/partner/view/statistic/chart.js
+++ b/themes/Backend/ExtJs/backend/partner/view/statistic/chart.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/partner/view/statistic/list.js b/themes/Backend/ExtJs/backend/partner/view/statistic/list.js
index 6e6136cd159..453bb51f169 100644
--- a/themes/Backend/ExtJs/backend/partner/view/statistic/list.js
+++ b/themes/Backend/ExtJs/backend/partner/view/statistic/list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Partner
diff --git a/themes/Backend/ExtJs/backend/partner/view/statistic/window.js b/themes/Backend/ExtJs/backend/partner/view/statistic/window.js
index 08820484a8e..31d449f0c21 100644
--- a/themes/Backend/ExtJs/backend/partner/view/statistic/window.js
+++ b/themes/Backend/ExtJs/backend/partner/view/statistic/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Partner
diff --git a/themes/Backend/ExtJs/backend/payment/app.js b/themes/Backend/ExtJs/backend/payment/app.js
index 70d6a1a1522..a95c1a2e95e 100644
--- a/themes/Backend/ExtJs/backend/payment/app.js
+++ b/themes/Backend/ExtJs/backend/payment/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Payment
diff --git a/themes/Backend/ExtJs/backend/payment/controller/main.js b/themes/Backend/ExtJs/backend/payment/controller/main.js
index a848b4157db..0e839a325a8 100644
--- a/themes/Backend/ExtJs/backend/payment/controller/main.js
+++ b/themes/Backend/ExtJs/backend/payment/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Payment
diff --git a/themes/Backend/ExtJs/backend/payment/controller/payment.js b/themes/Backend/ExtJs/backend/payment/controller/payment.js
index eb1b5d236a7..35df3f391fb 100644
--- a/themes/Backend/ExtJs/backend/payment/controller/payment.js
+++ b/themes/Backend/ExtJs/backend/payment/controller/payment.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Payment
diff --git a/themes/Backend/ExtJs/backend/payment/model/country.js b/themes/Backend/ExtJs/backend/payment/model/country.js
index c1482c059c0..3956acd26b1 100644
--- a/themes/Backend/ExtJs/backend/payment/model/country.js
+++ b/themes/Backend/ExtJs/backend/payment/model/country.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Payment
diff --git a/themes/Backend/ExtJs/backend/payment/model/payment.js b/themes/Backend/ExtJs/backend/payment/model/payment.js
index f5e5eaaa2c0..c6bcf4da663 100644
--- a/themes/Backend/ExtJs/backend/payment/model/payment.js
+++ b/themes/Backend/ExtJs/backend/payment/model/payment.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Payment
diff --git a/themes/Backend/ExtJs/backend/payment/store/countries.js b/themes/Backend/ExtJs/backend/payment/store/countries.js
index 31bb0aa9763..4e0d0686d15 100644
--- a/themes/Backend/ExtJs/backend/payment/store/countries.js
+++ b/themes/Backend/ExtJs/backend/payment/store/countries.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Payment
diff --git a/themes/Backend/ExtJs/backend/payment/store/payments.js b/themes/Backend/ExtJs/backend/payment/store/payments.js
index 093dd5cf7d2..41938576d92 100644
--- a/themes/Backend/ExtJs/backend/payment/store/payments.js
+++ b/themes/Backend/ExtJs/backend/payment/store/payments.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Payment
diff --git a/themes/Backend/ExtJs/backend/payment/view/main/window.js b/themes/Backend/ExtJs/backend/payment/view/main/window.js
index 3a27f7dcbe8..b0d5fed5808 100644
--- a/themes/Backend/ExtJs/backend/payment/view/main/window.js
+++ b/themes/Backend/ExtJs/backend/payment/view/main/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Payment
diff --git a/themes/Backend/ExtJs/backend/payment/view/payment/country_list.js b/themes/Backend/ExtJs/backend/payment/view/payment/country_list.js
index fbf6d1ab224..a63346d07c6 100644
--- a/themes/Backend/ExtJs/backend/payment/view/payment/country_list.js
+++ b/themes/Backend/ExtJs/backend/payment/view/payment/country_list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Payment
diff --git a/themes/Backend/ExtJs/backend/payment/view/payment/form_panel.js b/themes/Backend/ExtJs/backend/payment/view/payment/form_panel.js
index 86eee09ed89..c8fea6384f5 100644
--- a/themes/Backend/ExtJs/backend/payment/view/payment/form_panel.js
+++ b/themes/Backend/ExtJs/backend/payment/view/payment/form_panel.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Payment
diff --git a/themes/Backend/ExtJs/backend/payment/view/payment/subshop_list.js b/themes/Backend/ExtJs/backend/payment/view/payment/subshop_list.js
index 76dbce90489..fba8d038383 100644
--- a/themes/Backend/ExtJs/backend/payment/view/payment/subshop_list.js
+++ b/themes/Backend/ExtJs/backend/payment/view/payment/subshop_list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Payment
diff --git a/themes/Backend/ExtJs/backend/payment/view/payment/surcharge.js b/themes/Backend/ExtJs/backend/payment/view/payment/surcharge.js
index d4c0c607f05..8e87f1cc4e8 100644
--- a/themes/Backend/ExtJs/backend/payment/view/payment/surcharge.js
+++ b/themes/Backend/ExtJs/backend/payment/view/payment/surcharge.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Payment
diff --git a/themes/Backend/ExtJs/backend/payment/view/payment/tree.js b/themes/Backend/ExtJs/backend/payment/view/payment/tree.js
index aea6c237eb2..45c2bca4f51 100644
--- a/themes/Backend/ExtJs/backend/payment/view/payment/tree.js
+++ b/themes/Backend/ExtJs/backend/payment/view/payment/tree.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Payment
diff --git a/themes/Backend/ExtJs/backend/performance/app.js b/themes/Backend/ExtJs/backend/performance/app.js
index 7d7be591d9e..ec274504f17 100644
--- a/themes/Backend/ExtJs/backend/performance/app.js
+++ b/themes/Backend/ExtJs/backend/performance/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Cache
diff --git a/themes/Backend/ExtJs/backend/performance/controller/cache.js b/themes/Backend/ExtJs/backend/performance/controller/cache.js
index 7828e981e48..276d9b5e374 100644
--- a/themes/Backend/ExtJs/backend/performance/controller/cache.js
+++ b/themes/Backend/ExtJs/backend/performance/controller/cache.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Performance
diff --git a/themes/Backend/ExtJs/backend/performance/controller/direct.js b/themes/Backend/ExtJs/backend/performance/controller/direct.js
index bae2950658a..63bafa180a1 100644
--- a/themes/Backend/ExtJs/backend/performance/controller/direct.js
+++ b/themes/Backend/ExtJs/backend/performance/controller/direct.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Cache
@@ -30,7 +29,7 @@
 
 //{namespace name="backend/performance/main"}
 
-//{block name="backend/performance/controller/main"}
+//{block name="backend/performance/controller/direct"}
 Ext.define('Shopware.apps.Performance.controller.Direct', {
 
     extend: 'Enlight.app.Controller',
diff --git a/themes/Backend/ExtJs/backend/performance/controller/main.js b/themes/Backend/ExtJs/backend/performance/controller/main.js
index 3d1e3ab9949..dc015a6ec8a 100644
--- a/themes/Backend/ExtJs/backend/performance/controller/main.js
+++ b/themes/Backend/ExtJs/backend/performance/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Config
diff --git a/themes/Backend/ExtJs/backend/performance/controller/multi_request.js b/themes/Backend/ExtJs/backend/performance/controller/multi_request.js
index 7de3a76f5ec..7e3d924d11c 100644
--- a/themes/Backend/ExtJs/backend/performance/controller/multi_request.js
+++ b/themes/Backend/ExtJs/backend/performance/controller/multi_request.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Performance
diff --git a/themes/Backend/ExtJs/backend/performance/controller/settings.js b/themes/Backend/ExtJs/backend/performance/controller/settings.js
index e5ca0bac75a..0c257db73fb 100644
--- a/themes/Backend/ExtJs/backend/performance/controller/settings.js
+++ b/themes/Backend/ExtJs/backend/performance/controller/settings.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shopware_Config
diff --git a/themes/Backend/ExtJs/backend/performance/controller/start.js b/themes/Backend/ExtJs/backend/performance/controller/start.js
index bc4b58be0e7..0d724c799e4 100644
--- a/themes/Backend/ExtJs/backend/performance/controller/start.js
+++ b/themes/Backend/ExtJs/backend/performance/controller/start.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/performance/model/categories.js b/themes/Backend/ExtJs/backend/performance/model/categories.js
index 51f94226ae7..aaa842e0a2d 100644
--- a/themes/Backend/ExtJs/backend/performance/model/categories.js
+++ b/themes/Backend/ExtJs/backend/performance/model/categories.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Performance
diff --git a/themes/Backend/ExtJs/backend/performance/model/check.js b/themes/Backend/ExtJs/backend/performance/model/check.js
index 03e795f77ad..fa6e24cec2b 100644
--- a/themes/Backend/ExtJs/backend/performance/model/check.js
+++ b/themes/Backend/ExtJs/backend/performance/model/check.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Performance
diff --git a/themes/Backend/ExtJs/backend/performance/model/config.js b/themes/Backend/ExtJs/backend/performance/model/config.js
index f11c52fee8f..af755705afd 100644
--- a/themes/Backend/ExtJs/backend/performance/model/config.js
+++ b/themes/Backend/ExtJs/backend/performance/model/config.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Performance
diff --git a/themes/Backend/ExtJs/backend/performance/model/customer.js b/themes/Backend/ExtJs/backend/performance/model/customer.js
index b627a452348..ddb1ef01035 100644
--- a/themes/Backend/ExtJs/backend/performance/model/customer.js
+++ b/themes/Backend/ExtJs/backend/performance/model/customer.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Performance
diff --git a/themes/Backend/ExtJs/backend/performance/model/filter.js b/themes/Backend/ExtJs/backend/performance/model/filter.js
index 983802090eb..b162a033770 100644
--- a/themes/Backend/ExtJs/backend/performance/model/filter.js
+++ b/themes/Backend/ExtJs/backend/performance/model/filter.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Performance
diff --git a/themes/Backend/ExtJs/backend/performance/model/http_cache.js b/themes/Backend/ExtJs/backend/performance/model/http_cache.js
index 1342369638e..072a414204b 100644
--- a/themes/Backend/ExtJs/backend/performance/model/http_cache.js
+++ b/themes/Backend/ExtJs/backend/performance/model/http_cache.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Performance
diff --git a/themes/Backend/ExtJs/backend/performance/model/key_value.js b/themes/Backend/ExtJs/backend/performance/model/key_value.js
index 7019d5622db..c760700f1cf 100644
--- a/themes/Backend/ExtJs/backend/performance/model/key_value.js
+++ b/themes/Backend/ExtJs/backend/performance/model/key_value.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Performance
diff --git a/themes/Backend/ExtJs/backend/performance/model/search.js b/themes/Backend/ExtJs/backend/performance/model/search.js
index 86df85f01a3..4a65772557f 100644
--- a/themes/Backend/ExtJs/backend/performance/model/search.js
+++ b/themes/Backend/ExtJs/backend/performance/model/search.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Performance
diff --git a/themes/Backend/ExtJs/backend/performance/model/seo.js b/themes/Backend/ExtJs/backend/performance/model/seo.js
index 3a23d2a3ec1..2d66d567857 100644
--- a/themes/Backend/ExtJs/backend/performance/model/seo.js
+++ b/themes/Backend/ExtJs/backend/performance/model/seo.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Performance
@@ -44,7 +43,7 @@ Ext.define('Shopware.apps.Performance.model.Seo', {
      * @array
      */
     fields: [
-        //{block name="backend/performance/model/top_seller/fields"}{/block}
+        //{block name="backend/performance/model/seo/fields"}{/block}
         { name: 'id', type: 'int' },
         { name: 'routercache', type: 'int' },
         { name: 'routerlastupdateDate', type: 'date', dateFormat: 'd.m.Y' },
diff --git a/themes/Backend/ExtJs/backend/performance/model/sitemap.js b/themes/Backend/ExtJs/backend/performance/model/sitemap.js
index 7c45aa832cd..43656cf7ae1 100644
--- a/themes/Backend/ExtJs/backend/performance/model/sitemap.js
+++ b/themes/Backend/ExtJs/backend/performance/model/sitemap.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Performance
diff --git a/themes/Backend/ExtJs/backend/performance/model/sitemap/custom_urls.js b/themes/Backend/ExtJs/backend/performance/model/sitemap/custom_urls.js
index 2fef944a0af..6d615db164e 100644
--- a/themes/Backend/ExtJs/backend/performance/model/sitemap/custom_urls.js
+++ b/themes/Backend/ExtJs/backend/performance/model/sitemap/custom_urls.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="backend/performance/model/sitemap/custom_urls"}
diff --git a/themes/Backend/ExtJs/backend/performance/model/sitemap/excluded_urls.js b/themes/Backend/ExtJs/backend/performance/model/sitemap/excluded_urls.js
index 23383d8a54c..2012e8611b2 100644
--- a/themes/Backend/ExtJs/backend/performance/model/sitemap/excluded_urls.js
+++ b/themes/Backend/ExtJs/backend/performance/model/sitemap/excluded_urls.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="backend/performance/model/sitemap/excluded_urls"}
diff --git a/themes/Backend/ExtJs/backend/performance/model/top_seller.js b/themes/Backend/ExtJs/backend/performance/model/top_seller.js
index 529688aa053..bdabb18e480 100644
--- a/themes/Backend/ExtJs/backend/performance/model/top_seller.js
+++ b/themes/Backend/ExtJs/backend/performance/model/top_seller.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Performance
diff --git a/themes/Backend/ExtJs/backend/performance/model/various.js b/themes/Backend/ExtJs/backend/performance/model/various.js
index 0d6dd66e41b..d7333e9bfc2 100644
--- a/themes/Backend/ExtJs/backend/performance/model/various.js
+++ b/themes/Backend/ExtJs/backend/performance/model/various.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Performance
diff --git a/themes/Backend/ExtJs/backend/performance/store/config.js b/themes/Backend/ExtJs/backend/performance/store/config.js
index 4d60cf3707f..1ed7f763599 100644
--- a/themes/Backend/ExtJs/backend/performance/store/config.js
+++ b/themes/Backend/ExtJs/backend/performance/store/config.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/performance/store/info.js b/themes/Backend/ExtJs/backend/performance/store/info.js
index e6cdb042b27..7e8ca4b3dc0 100644
--- a/themes/Backend/ExtJs/backend/performance/store/info.js
+++ b/themes/Backend/ExtJs/backend/performance/store/info.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="backend/performance/store/info"}
diff --git a/themes/Backend/ExtJs/backend/performance/store/shop.js b/themes/Backend/ExtJs/backend/performance/store/shop.js
index 6cc264d0b03..f455bec9f5b 100644
--- a/themes/Backend/ExtJs/backend/performance/store/shop.js
+++ b/themes/Backend/ExtJs/backend/performance/store/shop.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="backend/performance/store/shop"}
diff --git a/themes/Backend/ExtJs/backend/performance/view/main/categories.js b/themes/Backend/ExtJs/backend/performance/view/main/categories.js
index 2b7b6efc2c8..41deb18d8a9 100644
--- a/themes/Backend/ExtJs/backend/performance/view/main/categories.js
+++ b/themes/Backend/ExtJs/backend/performance/view/main/categories.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/performance/main"}
diff --git a/themes/Backend/ExtJs/backend/performance/view/main/multi_request_dialog.js b/themes/Backend/ExtJs/backend/performance/view/main/multi_request_dialog.js
index 86ad290604b..d697deea93f 100644
--- a/themes/Backend/ExtJs/backend/performance/view/main/multi_request_dialog.js
+++ b/themes/Backend/ExtJs/backend/performance/view/main/multi_request_dialog.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/performance/main"}
diff --git a/themes/Backend/ExtJs/backend/performance/view/main/multi_request_tasks.js b/themes/Backend/ExtJs/backend/performance/view/main/multi_request_tasks.js
index cf0e6a0e76d..96b17b1314e 100644
--- a/themes/Backend/ExtJs/backend/performance/view/main/multi_request_tasks.js
+++ b/themes/Backend/ExtJs/backend/performance/view/main/multi_request_tasks.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/performance/main"}
diff --git a/themes/Backend/ExtJs/backend/performance/view/main/window.js b/themes/Backend/ExtJs/backend/performance/view/main/window.js
index 113c7581127..4bf672fe54d 100644
--- a/themes/Backend/ExtJs/backend/performance/view/main/window.js
+++ b/themes/Backend/ExtJs/backend/performance/view/main/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/cache/form.js b/themes/Backend/ExtJs/backend/performance/view/tabs/cache/form.js
index 01d2a46fff7..ef262869e71 100644
--- a/themes/Backend/ExtJs/backend/performance/view/tabs/cache/form.js
+++ b/themes/Backend/ExtJs/backend/performance/view/tabs/cache/form.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/performance/main"}
diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/cache/info.js b/themes/Backend/ExtJs/backend/performance/view/tabs/cache/info.js
index f375ffce078..5577607e822 100644
--- a/themes/Backend/ExtJs/backend/performance/view/tabs/cache/info.js
+++ b/themes/Backend/ExtJs/backend/performance/view/tabs/cache/info.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/performance/main"}
diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/cache/main.js b/themes/Backend/ExtJs/backend/performance/view/tabs/cache/main.js
index 3852989313e..3027562a64e 100644
--- a/themes/Backend/ExtJs/backend/performance/view/tabs/cache/main.js
+++ b/themes/Backend/ExtJs/backend/performance/view/tabs/cache/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    CanceledOrder
diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/base_grid.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/base_grid.js
index d6944bf8727..79d954f311e 100644
--- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/base_grid.js
+++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/base_grid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/performance/main"}
diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/cache_time.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/cache_time.js
index 80ca6d5308f..fdf4f844cea 100644
--- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/cache_time.js
+++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/cache_time.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/performance/main"}
diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/multi_request_button.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/multi_request_button.js
index 9309d799833..b1ca8ed9c2a 100644
--- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/multi_request_button.js
+++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/multi_request_button.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/no_cache.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/no_cache.js
index 1efff521f99..b90b588f604 100644
--- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/no_cache.js
+++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/no_cache.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/sitemap_custom_urls.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/sitemap_custom_urls.js
index 62ed5969ccc..324f17adc97 100644
--- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/sitemap_custom_urls.js
+++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/sitemap_custom_urls.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/performance/sitemap"}
diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/sitemap_excluded_urls.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/sitemap_excluded_urls.js
index a2955deebf6..7ff5c3a98b6 100644
--- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/sitemap_excluded_urls.js
+++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/sitemap_excluded_urls.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/performance/sitemap"}
diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/tree.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/tree.js
index b49e7e2c384..e742185cf2d 100644
--- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/tree.js
+++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/elements/tree.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Category
diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/base.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/base.js
index 05a89cf4245..bdc095021c3 100644
--- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/base.js
+++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/base.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/categories.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/categories.js
index 90491222db3..ac78ed53e9a 100644
--- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/categories.js
+++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/categories.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/customers.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/customers.js
index e182cd2da26..bcbfd044fc3 100644
--- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/customers.js
+++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/customers.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/filter.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/filter.js
index dd4560fcaf8..533e1e84257 100644
--- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/filter.js
+++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/filter.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/home.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/home.js
index 28f1dd8bc0c..88a466043d0 100644
--- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/home.js
+++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/home.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/http_cache.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/http_cache.js
index c00914dd7a8..7e5269b26c1 100644
--- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/http_cache.js
+++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/http_cache.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/performance/main"}
diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/search.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/search.js
index 867ec599bf6..c24698ef07b 100644
--- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/search.js
+++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/search.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/seo.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/seo.js
index 1abf7aba5d8..59247457e3f 100644
--- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/seo.js
+++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/seo.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/sitemap.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/sitemap.js
index 3e55e598b23..22eb3c12f2d 100644
--- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/sitemap.js
+++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/sitemap.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @package    Performance
  * @subpackage Sitemap
diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/theme_cache.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/theme_cache.js
index 51128ee91f1..6152e7094e1 100644
--- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/theme_cache.js
+++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/theme_cache.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/topseller.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/topseller.js
index 97d29289d97..034ef676866 100644
--- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/topseller.js
+++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/topseller.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
- * ""Shopware" is a registered trademark of shopware AG.
+ * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/various.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/various.js
index 16a3f1d4e55..605c023bad8 100644
--- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/various.js
+++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/fields/various.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/main.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/main.js
index 5f7279c5640..bb2f753c7ed 100644
--- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/main.js
+++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/navigation.js b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/navigation.js
index 4668607e0e4..52768b77169 100644
--- a/themes/Backend/ExtJs/backend/performance/view/tabs/settings/navigation.js
+++ b/themes/Backend/ExtJs/backend/performance/view/tabs/settings/navigation.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Performance
diff --git a/themes/Backend/ExtJs/backend/performance/view/tabs/start/main.js b/themes/Backend/ExtJs/backend/performance/view/tabs/start/main.js
index e064d4b8412..5e64887a713 100644
--- a/themes/Backend/ExtJs/backend/performance/view/tabs/start/main.js
+++ b/themes/Backend/ExtJs/backend/performance/view/tabs/start/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/performance/main"}
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/app.js b/themes/Backend/ExtJs/backend/plugin_manager/app.js
index b9b5fb24b33..21e7e0e6a38 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/app.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/controller/main.js b/themes/Backend/ExtJs/backend/plugin_manager/controller/main.js
index 77cf07a5fcb..1a90429198a 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/controller/main.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/controller/main.js
@@ -3,23 +3,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/controller/navigation.js b/themes/Backend/ExtJs/backend/plugin_manager/controller/navigation.js
index 53679e2bf2d..216c3fe0301 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/controller/navigation.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/controller/navigation.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/controller/plugin.js b/themes/Backend/ExtJs/backend/plugin_manager/controller/plugin.js
index 54c92f85f83..872ba6a7d35 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/controller/plugin.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/controller/plugin.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/model/address.js b/themes/Backend/ExtJs/backend/plugin_manager/model/address.js
index 94ae18c2251..ae006ed4b1b 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/model/address.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/model/address.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/model/basket.js b/themes/Backend/ExtJs/backend/plugin_manager/model/basket.js
index 0a4a62fec3a..696f4f649cd 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/model/basket.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/model/basket.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/model/basket_position.js b/themes/Backend/ExtJs/backend/plugin_manager/model/basket_position.js
index e9a4c06c937..2e347900433 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/model/basket_position.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/model/basket_position.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/model/category.js b/themes/Backend/ExtJs/backend/plugin_manager/model/category.js
index 2146f4ce37c..765f0515249 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/model/category.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/model/category.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/model/comment.js b/themes/Backend/ExtJs/backend/plugin_manager/model/comment.js
index 8648a524279..d8fbafff5fa 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/model/comment.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/model/comment.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/model/domain.js b/themes/Backend/ExtJs/backend/plugin_manager/model/domain.js
index 0c6e2bfc66c..7f4216db5e1 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/model/domain.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/model/domain.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/model/licence.js b/themes/Backend/ExtJs/backend/plugin_manager/model/licence.js
index 70b43e4e4ff..4b2bcd5d2ad 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/model/licence.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/model/licence.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/model/picture.js b/themes/Backend/ExtJs/backend/plugin_manager/model/picture.js
index 0a7682e7891..77726f6745b 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/model/picture.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/model/picture.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/model/plugin.js b/themes/Backend/ExtJs/backend/plugin_manager/model/plugin.js
index 42dbe8e631f..571a3ff5eb5 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/model/plugin.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/model/plugin.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/model/price.js b/themes/Backend/ExtJs/backend/plugin_manager/model/price.js
index 860c238e36b..1e95516e34e 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/model/price.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/model/price.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/model/producer.js b/themes/Backend/ExtJs/backend/plugin_manager/model/producer.js
index 0c3d2616dea..1789d91d47a 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/model/producer.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/model/producer.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/store/basket.js b/themes/Backend/ExtJs/backend/plugin_manager/store/basket.js
index 7ae13cd3b37..fa3fe5b84ac 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/store/basket.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/store/basket.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/store/category.js b/themes/Backend/ExtJs/backend/plugin_manager/store/category.js
index cfd865dd5f1..f03edaf76be 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/store/category.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/store/category.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/store/expired_plugins.js b/themes/Backend/ExtJs/backend/plugin_manager/store/expired_plugins.js
index e326c14b861..d8fcfffdea5 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/store/expired_plugins.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/store/expired_plugins.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/store/licence.js b/themes/Backend/ExtJs/backend/plugin_manager/store/licence.js
index 29990f7282f..f1b76a7be06 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/store/licence.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/store/licence.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/store/local_plugin.js b/themes/Backend/ExtJs/backend/plugin_manager/store/local_plugin.js
index fd1c8e59a67..290abfb39ea 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/store/local_plugin.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/store/local_plugin.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/store/store_plugin.js b/themes/Backend/ExtJs/backend/plugin_manager/store/store_plugin.js
index e901688f680..7c044738b62 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/store/store_plugin.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/store/store_plugin.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/store/update_plugins.js b/themes/Backend/ExtJs/backend/plugin_manager/store/update_plugins.js
index efb98dc752d..5864243e11d 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/store/update_plugins.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/store/update_plugins.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/account/checkout.js b/themes/Backend/ExtJs/backend/plugin_manager/view/account/checkout.js
index 5e3affc0e18..fae4c46fe45 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/view/account/checkout.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/view/account/checkout.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/account/login.js b/themes/Backend/ExtJs/backend/plugin_manager/view/account/login.js
index 091f11a75a1..c5f6cc3fae9 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/view/account/login.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/view/account/login.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/account/login_window.js b/themes/Backend/ExtJs/backend/plugin_manager/view/account/login_window.js
index 46abf7f3e4e..3663c60b657 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/view/account/login_window.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/view/account/login_window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/account/upload.js b/themes/Backend/ExtJs/backend/plugin_manager/view/account/upload.js
index 51dda60f760..c0051ddd9b1 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/view/account/upload.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/view/account/upload.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/components/container.js b/themes/Backend/ExtJs/backend/plugin_manager/view/components/container.js
index 35ad4f187dc..d67dfa9968b 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/view/components/container.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/view/components/container.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/components/download_window.js b/themes/Backend/ExtJs/backend/plugin_manager/view/components/download_window.js
index 6075bffeaf7..33ce36aa8d9 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/view/components/download_window.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/view/components/download_window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/components/expired_plugin.js b/themes/Backend/ExtJs/backend/plugin_manager/view/components/expired_plugin.js
index 8eb2dfe4617..9b2ff371745 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/view/components/expired_plugin.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/view/components/expired_plugin.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/components/image_slider.js b/themes/Backend/ExtJs/backend/plugin_manager/view/components/image_slider.js
index 15ee1704fd3..e35f220992a 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/view/components/image_slider.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/view/components/image_slider.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/components/listing.js b/themes/Backend/ExtJs/backend/plugin_manager/view/components/listing.js
index 99a1dc130cd..4ec9216ca37 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/view/components/listing.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/view/components/listing.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/components/slider.js b/themes/Backend/ExtJs/backend/plugin_manager/view/components/slider.js
index 3ae92e19d27..22494e29910 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/view/components/slider.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/view/components/slider.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/components/store_plugin.js b/themes/Backend/ExtJs/backend/plugin_manager/view/components/store_plugin.js
index ff545150ce2..dde861124c8 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/view/components/store_plugin.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/view/components/store_plugin.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/components/tab.js b/themes/Backend/ExtJs/backend/plugin_manager/view/components/tab.js
index ccf5108e9b8..132255b552d 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/view/components/tab.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/view/components/tab.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/components/tree.js b/themes/Backend/ExtJs/backend/plugin_manager/view/components/tree.js
index c4b3ee1cb85..51249e6bee4 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/view/components/tree.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/view/components/tree.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/detail/actions.js b/themes/Backend/ExtJs/backend/plugin_manager/view/detail/actions.js
index cac1be4f4f7..003db7d0b9b 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/view/detail/actions.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/view/detail/actions.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/detail/comments.js b/themes/Backend/ExtJs/backend/plugin_manager/view/detail/comments.js
index 0737698208f..abacdbf0e3e 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/view/detail/comments.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/view/detail/comments.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/detail/container.js b/themes/Backend/ExtJs/backend/plugin_manager/view/detail/container.js
index 4099837c93a..0b44c43ad1f 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/view/detail/container.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/view/detail/container.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/detail/header.js b/themes/Backend/ExtJs/backend/plugin_manager/view/detail/header.js
index 928e08aeadb..565b43d4c35 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/view/detail/header.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/view/detail/header.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/detail/meta.js b/themes/Backend/ExtJs/backend/plugin_manager/view/detail/meta.js
index a87f64ee851..2eba6f16da4 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/view/detail/meta.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/view/detail/meta.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/detail/prices.js b/themes/Backend/ExtJs/backend/plugin_manager/view/detail/prices.js
index 16de4b798d0..123371e8c44 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/view/detail/prices.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/view/detail/prices.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/detail/window.js b/themes/Backend/ExtJs/backend/plugin_manager/view/detail/window.js
index aa6d7bcde4a..fec453bb219 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/view/detail/window.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/view/detail/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/list/expired_plugins_page.js b/themes/Backend/ExtJs/backend/plugin_manager/view/list/expired_plugins_page.js
index 857c66a2fe2..3183b5bab69 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/view/list/expired_plugins_page.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/view/list/expired_plugins_page.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/list/home_page.js b/themes/Backend/ExtJs/backend/plugin_manager/view/list/home_page.js
index 7ce59f4dbeb..2233024b420 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/view/list/home_page.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/view/list/home_page.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/list/import_export_teaser_page.js b/themes/Backend/ExtJs/backend/plugin_manager/view/list/import_export_teaser_page.js
index c37aeeb36d3..294f0b26d3f 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/view/list/import_export_teaser_page.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/view/list/import_export_teaser_page.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/list/licence_page.js b/themes/Backend/ExtJs/backend/plugin_manager/view/list/licence_page.js
index bc7410c3da3..fd8e1773303 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/view/list/licence_page.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/view/list/licence_page.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/list/local_plugin_listing_page.js b/themes/Backend/ExtJs/backend/plugin_manager/view/list/local_plugin_listing_page.js
index 9280171b241..293426a8d4f 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/view/list/local_plugin_listing_page.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/view/list/local_plugin_listing_page.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
@@ -46,6 +45,11 @@ Ext.define('Shopware.apps.PluginManager.view.list.LocalPluginListingPage', {
      */
     hasTriedLogin: false,
 
+    safeModeState: {
+        inSafeMode: false,
+        hasActiveThirdPartyPlugins: false
+    },
+
     configure: function() {
         return {
             addButton: false,
@@ -388,29 +392,31 @@ Ext.define('Shopware.apps.PluginManager.view.list.LocalPluginListingPage', {
     },
 
     updateSafeModeCheckbox: function() {
-        var me = this,
-            state = me.checkInSafeMode();
+        var me = this;
 
-        me.suspendSafeModeToggle = true;
-        me.safeModeCheckbox.setDisabled(!state.inSafeMode && !state.hasActiveThirdPartyPlugins);
-        me.safeModeCheckbox.setValue(state.inSafeMode);
-        me.suspendSafeModeToggle = false;
+        me.checkInSafeMode(function() {
+            me.suspendSafeModeToggle = true;
+            me.safeModeCheckbox.setDisabled(!me.safeModeState.inSafeMode && !me.safeModeState.hasActiveThirdPartyPlugins);
+            me.safeModeCheckbox.setValue(me.safeModeState.inSafeMode);
+            me.suspendSafeModeToggle = false;
+        });
     },
 
     createSafeModeCheckbox: function () {
         var me = this,
-            state = me.checkInSafeMode(),
             label = '{s name="safe_mode"}Safe Mode{/s}';
 
         me.safeModeCheckbox = Ext.create('Ext.form.field.Checkbox', {
             fieldLabel: label,
             labelStyle: 'width:65px; margin-top: 2px;',
-            checked: state.inSafeMode,
-            disabled: !state.inSafeMode && !state.hasActiveThirdPartyPlugins,
+            checked: me.safeModeState.inSafeMode,
+            disabled: !me.safeModeState.inSafeMode && !me.safeModeState.hasActiveThirdPartyPlugins,
             dock: 'bottom',
             handler: Ext.bind(me.onToggleSafeMode, me)
         });
 
+        this.updateSafeModeCheckbox();
+
         Shopware.app.Application.on('plugin-state-changed', Ext.bind(me.updateSafeModeCheckbox, me));
 
         return me.safeModeCheckbox;
@@ -423,60 +429,70 @@ Ext.define('Shopware.apps.PluginManager.view.list.LocalPluginListingPage', {
         if (me.suspendSafeModeToggle) {
             return;
         }
-        state = me.checkInSafeMode();
 
-        if (state.inSafeMode) {
-            me.toggleSafeMode();
-            return;
-        }
+        me.checkInSafeMode(function () {
+            if (me.safeModeState.inSafeMode) {
+                me.toggleSafeMode();
+                return;
+            }
 
-        Ext.Msg.confirm(
-            '{s name="safemodepopup/title"}{/s}',
-            '{s name="safemodepopup/warning"}{/s}',
-            function (button) {
-                if (button == 'yes') {
-                    me.toggleSafeMode();
-                } else {
-                    me.safeModeCheckbox.setRawValue(false);
-                    me.safeModeCheckbox.lastValue = false;
+            Ext.Msg.confirm(
+                '{s name="safemodepopup/title"}{/s}',
+                '{s name="safemodepopup/warning"}{/s}',
+                function (button) {
+                    if (button == 'yes') {
+                        me.toggleSafeMode();
+                    } else {
+                        me.safeModeCheckbox.setRawValue(false);
+                        me.safeModeCheckbox.lastValue = false;
+                    }
                 }
-            }
-        );
+            );
+        });
     },
 
     toggleSafeMode: function () {
         var content,
             msg = Shopware.Notification;
 
-        var toggleSafeMode = Ext.Ajax.request({
-            async: false,
+        Ext.Ajax.request({
             url: '{url controller=PluginManager action=toggleSafeMode}',
             method: 'GET',
-            params: { }
-        });
-
-        var response = Ext.decode(toggleSafeMode.responseText);
+            params: { },
+            success: function (response) {
+                var responseContent = Ext.decode(response.responseText);
 
-        var title = '{s name="title/safe_mode"}{/s}';
-        if (response.inSafeMode) {
-            content = '{s name="content/safe_mode_on"}{/s}';
-        } else {
-            content = '{s name="content/safe_mode_off"}{/s}';
-        }
-        Shopware.app.Application.fireEvent('clear-all-cache');
-        msg.createGrowlMessage(title, content);
-        Shopware.app.Application.fireEvent('reload-local-listing');
+                var title = '{s name="title/safe_mode"}{/s}';
+                if (responseContent.inSafeMode) {
+                    content = '{s name="content/safe_mode_on"}{/s}';
+                } else {
+                    content = '{s name="content/safe_mode_off"}{/s}';
+                }
+                Shopware.app.Application.fireEvent('clear-all-cache');
+                msg.createGrowlMessage(title, content);
+                Shopware.app.Application.fireEvent('reload-local-listing');
+            }
+        });
     },
 
-    checkInSafeMode: function () {
-        var checkInSafeMode = Ext.Ajax.request({
-            async: false,
+    checkInSafeMode: function (callback) {
+        var me = this;
+
+        Ext.Ajax.request({
             url: '{url controller=PluginManager action=isInSafeMode}',
             method: 'GET',
-            params: { }
+            params: {},
+            success: function (response) {
+                // Update tree-node text
+                me.safeModeState = Ext.decode(response.responseText)
+                if (callback) {
+                    callback()
+                }
+            },
+            failure: function () {
+                Shopware.Msg.createGrowlMessage('', '{s name="groupList/renameError"}Error while creating group{/s}', '{s name="window_title"}{/s}');
+            },
         });
-
-        return Ext.decode(checkInSafeMode.responseText);
     },
 
     createActionColumnItems: function() {
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/list/navigation.js b/themes/Backend/ExtJs/backend/plugin_manager/view/list/navigation.js
index 7bd3661cdab..e97ddc86bfb 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/view/list/navigation.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/view/list/navigation.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/list/premium_plugins_page.js b/themes/Backend/ExtJs/backend/plugin_manager/view/list/premium_plugins_page.js
index 96032e1825c..e084ad2f95d 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/view/list/premium_plugins_page.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/view/list/premium_plugins_page.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/list/store_listing_page.js b/themes/Backend/ExtJs/backend/plugin_manager/view/list/store_listing_page.js
index 1e74969699b..90cf2388284 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/view/list/store_listing_page.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/view/list/store_listing_page.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/list/update_page.js b/themes/Backend/ExtJs/backend/plugin_manager/view/list/update_page.js
index 842abf3b099..b402aa49cbe 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/view/list/update_page.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/view/list/update_page.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/list/window.js b/themes/Backend/ExtJs/backend/plugin_manager/view/list/window.js
index a456c8d0a6c..822f6c4069e 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/view/list/window.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/view/list/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/loading/mask.js b/themes/Backend/ExtJs/backend/plugin_manager/view/loading/mask.js
index 206a8bc1b02..ddd27da6fdf 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/view/loading/mask.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/view/loading/mask.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/plugin_manager/view/plugin_helper.js b/themes/Backend/ExtJs/backend/plugin_manager/view/plugin_helper.js
index d610cd13d12..197cad07fb1 100644
--- a/themes/Backend/ExtJs/backend/plugin_manager/view/plugin_helper.js
+++ b/themes/Backend/ExtJs/backend/plugin_manager/view/plugin_helper.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    PluginManager
diff --git a/themes/Backend/ExtJs/backend/premium/app.js b/themes/Backend/ExtJs/backend/premium/app.js
index 2160b23fd76..560d4a0cb86 100644
--- a/themes/Backend/ExtJs/backend/premium/app.js
+++ b/themes/Backend/ExtJs/backend/premium/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Premium
diff --git a/themes/Backend/ExtJs/backend/premium/controller/main.js b/themes/Backend/ExtJs/backend/premium/controller/main.js
index 57cafe60600..330e008b00f 100644
--- a/themes/Backend/ExtJs/backend/premium/controller/main.js
+++ b/themes/Backend/ExtJs/backend/premium/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Premium
diff --git a/themes/Backend/ExtJs/backend/premium/controller/premium.js b/themes/Backend/ExtJs/backend/premium/controller/premium.js
index 39f18576b8f..ad8495c6486 100644
--- a/themes/Backend/ExtJs/backend/premium/controller/premium.js
+++ b/themes/Backend/ExtJs/backend/premium/controller/premium.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Premium
diff --git a/themes/Backend/ExtJs/backend/premium/model/premium.js b/themes/Backend/ExtJs/backend/premium/model/premium.js
index 85ced9a2406..d64d7f7fa8f 100644
--- a/themes/Backend/ExtJs/backend/premium/model/premium.js
+++ b/themes/Backend/ExtJs/backend/premium/model/premium.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Premium
diff --git a/themes/Backend/ExtJs/backend/premium/model/subshop.js b/themes/Backend/ExtJs/backend/premium/model/subshop.js
index 22909c15d70..32cd25c7b80 100644
--- a/themes/Backend/ExtJs/backend/premium/model/subshop.js
+++ b/themes/Backend/ExtJs/backend/premium/model/subshop.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Premium
diff --git a/themes/Backend/ExtJs/backend/premium/store/premiums.js b/themes/Backend/ExtJs/backend/premium/store/premiums.js
index 07d7ae14445..db204d49d4d 100644
--- a/themes/Backend/ExtJs/backend/premium/store/premiums.js
+++ b/themes/Backend/ExtJs/backend/premium/store/premiums.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Premium
diff --git a/themes/Backend/ExtJs/backend/premium/store/subshops.js b/themes/Backend/ExtJs/backend/premium/store/subshops.js
index 2a5c284c4d9..cd1a2dee196 100644
--- a/themes/Backend/ExtJs/backend/premium/store/subshops.js
+++ b/themes/Backend/ExtJs/backend/premium/store/subshops.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Premium
diff --git a/themes/Backend/ExtJs/backend/premium/view/main/window.js b/themes/Backend/ExtJs/backend/premium/view/main/window.js
index 071ab5a79ab..525761e188e 100644
--- a/themes/Backend/ExtJs/backend/premium/view/main/window.js
+++ b/themes/Backend/ExtJs/backend/premium/view/main/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Premium
diff --git a/themes/Backend/ExtJs/backend/premium/view/premium/detail.js b/themes/Backend/ExtJs/backend/premium/view/premium/detail.js
index 0cb652a77e8..1d5271ad1a2 100644
--- a/themes/Backend/ExtJs/backend/premium/view/premium/detail.js
+++ b/themes/Backend/ExtJs/backend/premium/view/premium/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Premium
diff --git a/themes/Backend/ExtJs/backend/premium/view/premium/list.js b/themes/Backend/ExtJs/backend/premium/view/premium/list.js
index 239d9bc317e..3e4b51681f9 100644
--- a/themes/Backend/ExtJs/backend/premium/view/premium/list.js
+++ b/themes/Backend/ExtJs/backend/premium/view/premium/list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Premium
diff --git a/themes/Backend/ExtJs/backend/product_feed/app.js b/themes/Backend/ExtJs/backend/product_feed/app.js
index 9ae1516c452..73328b4dbb8 100644
--- a/themes/Backend/ExtJs/backend/product_feed/app.js
+++ b/themes/Backend/ExtJs/backend/product_feed/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductFeed
diff --git a/themes/Backend/ExtJs/backend/product_feed/controller/feed.js b/themes/Backend/ExtJs/backend/product_feed/controller/feed.js
index 315f4cac9ef..a1395221116 100644
--- a/themes/Backend/ExtJs/backend/product_feed/controller/feed.js
+++ b/themes/Backend/ExtJs/backend/product_feed/controller/feed.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductFeed
diff --git a/themes/Backend/ExtJs/backend/product_feed/controller/main.js b/themes/Backend/ExtJs/backend/product_feed/controller/main.js
index 15cf9b12443..484ee54e664 100644
--- a/themes/Backend/ExtJs/backend/product_feed/controller/main.js
+++ b/themes/Backend/ExtJs/backend/product_feed/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductFeed
diff --git a/themes/Backend/ExtJs/backend/product_feed/model/category.js b/themes/Backend/ExtJs/backend/product_feed/model/category.js
index fb70cddaaa4..df7354cf5aa 100644
--- a/themes/Backend/ExtJs/backend/product_feed/model/category.js
+++ b/themes/Backend/ExtJs/backend/product_feed/model/category.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductFeed
diff --git a/themes/Backend/ExtJs/backend/product_feed/model/category_for_combo_tree.js b/themes/Backend/ExtJs/backend/product_feed/model/category_for_combo_tree.js
index 8391ab5b124..35c5cc9e478 100644
--- a/themes/Backend/ExtJs/backend/product_feed/model/category_for_combo_tree.js
+++ b/themes/Backend/ExtJs/backend/product_feed/model/category_for_combo_tree.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductFeed
diff --git a/themes/Backend/ExtJs/backend/product_feed/model/detail.js b/themes/Backend/ExtJs/backend/product_feed/model/detail.js
index d2ba6901f16..a01827537f7 100644
--- a/themes/Backend/ExtJs/backend/product_feed/model/detail.js
+++ b/themes/Backend/ExtJs/backend/product_feed/model/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductFeed
diff --git a/themes/Backend/ExtJs/backend/product_feed/model/main.js b/themes/Backend/ExtJs/backend/product_feed/model/main.js
index cb299d9fbbb..549092629fe 100644
--- a/themes/Backend/ExtJs/backend/product_feed/model/main.js
+++ b/themes/Backend/ExtJs/backend/product_feed/model/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductFeed
diff --git a/themes/Backend/ExtJs/backend/product_feed/model/shop.js b/themes/Backend/ExtJs/backend/product_feed/model/shop.js
index 599815f01bf..4251545af92 100644
--- a/themes/Backend/ExtJs/backend/product_feed/model/shop.js
+++ b/themes/Backend/ExtJs/backend/product_feed/model/shop.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductFeed
@@ -34,7 +33,7 @@
  * Shopware\Models\Shop\Shop doctrine model, with some additional data for the additional information panel.
  * We can't use the base store because we need all shops and the children
  */
-//{block name="backend/product_feed/model/main"}
+//{block name="backend/product_feed/model/shop"}
 Ext.define('Shopware.apps.ProductFeed.model.Shop', {
     /**
      * Extends the standard Ext Model
diff --git a/themes/Backend/ExtJs/backend/product_feed/store/article.js b/themes/Backend/ExtJs/backend/product_feed/store/article.js
index 39a8e0b9c2f..71a49535d8a 100644
--- a/themes/Backend/ExtJs/backend/product_feed/store/article.js
+++ b/themes/Backend/ExtJs/backend/product_feed/store/article.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductFeed
diff --git a/themes/Backend/ExtJs/backend/product_feed/store/category.js b/themes/Backend/ExtJs/backend/product_feed/store/category.js
index 615c58bcd63..564f02f4536 100644
--- a/themes/Backend/ExtJs/backend/product_feed/store/category.js
+++ b/themes/Backend/ExtJs/backend/product_feed/store/category.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductFeed
diff --git a/themes/Backend/ExtJs/backend/product_feed/store/category_for_combo_tree.js b/themes/Backend/ExtJs/backend/product_feed/store/category_for_combo_tree.js
index 0f9a24419de..02dae2b0f6d 100644
--- a/themes/Backend/ExtJs/backend/product_feed/store/category_for_combo_tree.js
+++ b/themes/Backend/ExtJs/backend/product_feed/store/category_for_combo_tree.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductFeed
diff --git a/themes/Backend/ExtJs/backend/product_feed/store/detail.js b/themes/Backend/ExtJs/backend/product_feed/store/detail.js
index e6b41442717..4d0cc79b36b 100644
--- a/themes/Backend/ExtJs/backend/product_feed/store/detail.js
+++ b/themes/Backend/ExtJs/backend/product_feed/store/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductFeed
diff --git a/themes/Backend/ExtJs/backend/product_feed/store/list.js b/themes/Backend/ExtJs/backend/product_feed/store/list.js
index 489a0ab3eab..ee1b6c07692 100644
--- a/themes/Backend/ExtJs/backend/product_feed/store/list.js
+++ b/themes/Backend/ExtJs/backend/product_feed/store/list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductFeed
diff --git a/themes/Backend/ExtJs/backend/product_feed/store/shop.js b/themes/Backend/ExtJs/backend/product_feed/store/shop.js
index bea9978a103..e71f433f15a 100644
--- a/themes/Backend/ExtJs/backend/product_feed/store/shop.js
+++ b/themes/Backend/ExtJs/backend/product_feed/store/shop.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductFeed
diff --git a/themes/Backend/ExtJs/backend/product_feed/store/supplier.js b/themes/Backend/ExtJs/backend/product_feed/store/supplier.js
index 28255d48476..05896df6aaf 100644
--- a/themes/Backend/ExtJs/backend/product_feed/store/supplier.js
+++ b/themes/Backend/ExtJs/backend/product_feed/store/supplier.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductFeed
diff --git a/themes/Backend/ExtJs/backend/product_feed/view/feed/detail.js b/themes/Backend/ExtJs/backend/product_feed/view/feed/detail.js
index 0920af6e342..f09990016d8 100644
--- a/themes/Backend/ExtJs/backend/product_feed/view/feed/detail.js
+++ b/themes/Backend/ExtJs/backend/product_feed/view/feed/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductFeed
diff --git a/themes/Backend/ExtJs/backend/product_feed/view/feed/list.js b/themes/Backend/ExtJs/backend/product_feed/view/feed/list.js
index 0b753fcae6a..86773e40be4 100644
--- a/themes/Backend/ExtJs/backend/product_feed/view/feed/list.js
+++ b/themes/Backend/ExtJs/backend/product_feed/view/feed/list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductFeed
diff --git a/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/article.js b/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/article.js
index bd90e034854..899db43f23b 100644
--- a/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/article.js
+++ b/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/article.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductFeed
diff --git a/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/body.js b/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/body.js
index 159cd753145..47a3ce567c0 100644
--- a/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/body.js
+++ b/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/body.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductFeed
diff --git a/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/category.js b/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/category.js
index 54b724a7ffd..e86cbce5751 100644
--- a/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/category.js
+++ b/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/category.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductFeed
diff --git a/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/filter.js b/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/filter.js
index b6d87fe9a4e..6ca018c6e87 100644
--- a/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/filter.js
+++ b/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/filter.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductFeed
diff --git a/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/footer.js b/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/footer.js
index edc41b8cca8..fc8bcc4a9ac 100644
--- a/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/footer.js
+++ b/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/footer.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductFeed
diff --git a/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/format.js b/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/format.js
index 7feffbe4270..a491c4bef04 100644
--- a/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/format.js
+++ b/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/format.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductFeed
diff --git a/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/header.js b/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/header.js
index 32c018e76b4..e2900c00012 100644
--- a/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/header.js
+++ b/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/header.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductFeed
diff --git a/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/supplier.js b/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/supplier.js
index 2a07e39c164..c7bf92ad297 100644
--- a/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/supplier.js
+++ b/themes/Backend/ExtJs/backend/product_feed/view/feed/tab/supplier.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductFeed
diff --git a/themes/Backend/ExtJs/backend/product_feed/view/feed/window.js b/themes/Backend/ExtJs/backend/product_feed/view/feed/window.js
index e23c295e1af..667eaec11d8 100644
--- a/themes/Backend/ExtJs/backend/product_feed/view/feed/window.js
+++ b/themes/Backend/ExtJs/backend/product_feed/view/feed/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductFeed
diff --git a/themes/Backend/ExtJs/backend/product_feed/view/main/window.js b/themes/Backend/ExtJs/backend/product_feed/view/main/window.js
index 187040d29a9..7b4fc8fa6c6 100644
--- a/themes/Backend/ExtJs/backend/product_feed/view/main/window.js
+++ b/themes/Backend/ExtJs/backend/product_feed/view/main/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductFeed
diff --git a/themes/Backend/ExtJs/backend/product_stream/app.js b/themes/Backend/ExtJs/backend/product_stream/app.js
index 0343433582c..267e10309ae 100644
--- a/themes/Backend/ExtJs/backend/product_stream/app.js
+++ b/themes/Backend/ExtJs/backend/product_stream/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/controller/main.js b/themes/Backend/ExtJs/backend/product_stream/controller/main.js
index 5050b9230c2..5a10b0c45ea 100644
--- a/themes/Backend/ExtJs/backend/product_stream/controller/main.js
+++ b/themes/Backend/ExtJs/backend/product_stream/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/model/product.js b/themes/Backend/ExtJs/backend/product_stream/model/product.js
index f9cdabb1462..887e5a3d4c5 100644
--- a/themes/Backend/ExtJs/backend/product_stream/model/product.js
+++ b/themes/Backend/ExtJs/backend/product_stream/model/product.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/model/stream.js b/themes/Backend/ExtJs/backend/product_stream/model/stream.js
index cff1967569c..37fa706650c 100644
--- a/themes/Backend/ExtJs/backend/product_stream/model/stream.js
+++ b/themes/Backend/ExtJs/backend/product_stream/model/stream.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/store/attribute.js b/themes/Backend/ExtJs/backend/product_stream/store/attribute.js
index 4338a4ed5a1..cc74ec6cf86 100644
--- a/themes/Backend/ExtJs/backend/product_stream/store/attribute.js
+++ b/themes/Backend/ExtJs/backend/product_stream/store/attribute.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/store/preview.js b/themes/Backend/ExtJs/backend/product_stream/store/preview.js
index b11e62b6fa2..a2fd6c76c20 100644
--- a/themes/Backend/ExtJs/backend/product_stream/store/preview.js
+++ b/themes/Backend/ExtJs/backend/product_stream/store/preview.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/store/selected_products.js b/themes/Backend/ExtJs/backend/product_stream/store/selected_products.js
index ed3096ac470..630c1cc502f 100644
--- a/themes/Backend/ExtJs/backend/product_stream/store/selected_products.js
+++ b/themes/Backend/ExtJs/backend/product_stream/store/selected_products.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/store/stream.js b/themes/Backend/ExtJs/backend/product_stream/store/stream.js
index 50a197b5d79..d451c0d42ad 100644
--- a/themes/Backend/ExtJs/backend/product_stream/store/stream.js
+++ b/themes/Backend/ExtJs/backend/product_stream/store/stream.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/common/attributes.js b/themes/Backend/ExtJs/backend/product_stream/view/common/attributes.js
index 53c8805bc37..70cb1b9d30c 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/common/attributes.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/common/attributes.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/common/settings.js b/themes/Backend/ExtJs/backend/product_stream/view/common/settings.js
index 819072389b8..e8853e39eb5 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/common/settings.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/common/settings.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/abstract_condition.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/abstract_condition.js
index c901ed22cb4..409af634783 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/abstract_condition.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/abstract_condition.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/attribute.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/attribute.js
index 5b23d577544..e17df558d2d 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/attribute.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/attribute.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/category.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/category.js
index d809a09130d..2cb9a8618d7 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/category.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/category.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/closeout.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/closeout.js
index 0d7d3bc6deb..524ae81f680 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/closeout.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/closeout.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/create_date.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/create_date.js
index c9e4baa4868..9885f7b7a9d 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/create_date.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/create_date.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/has_pseudo_price.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/has_pseudo_price.js
index 1158abe501e..40ec0461c0c 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/has_pseudo_price.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/has_pseudo_price.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/height.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/height.js
index b35f06200e3..25cc1a849fd 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/height.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/height.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/immediate_delivery.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/immediate_delivery.js
index 3cb299419d0..cf7e3bc2c19 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/immediate_delivery.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/immediate_delivery.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/is_new.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/is_new.js
index 429908986e9..101e4f9a033 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/is_new.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/is_new.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/length.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/length.js
index c7c1f06ece8..0e5053eae3b 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/length.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/length.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/manufacturer.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/manufacturer.js
index 440ec73034b..fdeb98c818a 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/manufacturer.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/manufacturer.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/price.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/price.js
index 928a1cb0777..d505a363fb2 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/price.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/price.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/property.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/property.js
index e0facb826dc..828cd4cfaca 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/property.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/property.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/release_date.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/release_date.js
index cb83d032a5d..aa37a4a1bc0 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/release_date.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/release_date.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/sales.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/sales.js
index bf4159a32c0..810009ce5a0 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/sales.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/sales.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/search_term.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/search_term.js
index e1d94856a69..2f727738b9a 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/search_term.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/search_term.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/vote_average.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/vote_average.js
index cbc52f02fd3..e52c5d86977 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/vote_average.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/vote_average.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/weight.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/weight.js
index 3d3f8a9ef69..b303777dddd 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/weight.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/weight.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/width.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/width.js
index f6edc2d291e..7fc306dec5b 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/width.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition/width.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition_panel.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition_panel.js
index dd7368ae819..7b3e54d4fff 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition_panel.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/condition_panel.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/attribute.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/attribute.js
index 3b3b16296c5..a366cc62cd0 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/attribute.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/attribute.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/attribute_date.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/attribute_date.js
index 866cde7a4f2..f1c65d2640a 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/attribute_date.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/attribute_date.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/attribute_date_time.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/attribute_date_time.js
index 41f4ce53925..4e124485ae2 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/attribute_date_time.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/attribute_date_time.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
@@ -27,7 +26,7 @@
  * @author shopware AG
  */
 //{namespace name="backend/product_stream/main"}
-//{block name="backend/product_stream/view/condition_list/condition/attribute_date"}
+//{block name="backend/product_stream/view/condition_list/condition/attribute_date_time"}
 Ext.define('Shopware.apps.ProductStream.view.condition_list.field.AttributeDateTime', {
     extend: 'Shopware.apps.ProductStream.view.condition_list.field.Attribute',
 
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/attribute_window.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/attribute_window.js
index 85ce5d72640..4e93346b760 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/attribute_window.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/attribute_window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/create_date.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/create_date.js
index 30bcd4c575c..6bb9e342bec 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/create_date.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/create_date.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/grid.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/grid.js
index d873e14a3bb..9ae87ab84a4 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/grid.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/grid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/property.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/property.js
index fffa1034390..cd4af4572f7 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/property.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/property.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/property_window.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/property_window.js
index a966e4251ee..1fcd1f72c49 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/property_window.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/property_window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/range.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/range.js
index d96131e755a..886f740b04f 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/range.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/range.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/release_date.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/release_date.js
index 96b1d7c8cfa..92bb50b700f 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/release_date.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/release_date.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/sales.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/sales.js
index 75a6cd95d99..debb18b4dca 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/sales.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/sales.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/search_term.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/search_term.js
index 34e132ff5ba..c498fd98dac 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/search_term.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/search_term.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/vote_average.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/vote_average.js
index 21aeaf24322..23b934f419a 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/vote_average.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/field/vote_average.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/preview_grid.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/preview_grid.js
index 4719748ce65..6d2a8ab782b 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/preview_grid.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/preview_grid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/window.js b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/window.js
index 62cc9d51212..2e9e60e783a 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/condition_list/window.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/condition_list/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/list/list.js b/themes/Backend/ExtJs/backend/product_stream/view/list/list.js
index 0578fd315e6..1aefd65bab7 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/list/list.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/list/list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/list/window.js b/themes/Backend/ExtJs/backend/product_stream/view/list/window.js
index 2e5bddb3dd6..cf4ad71c8f4 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/list/window.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/list/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/search_grid.js b/themes/Backend/ExtJs/backend/product_stream/view/search_grid.js
index 460cfffcb92..7f21ec618c9 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/search_grid.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/search_grid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/selected_list/product.js b/themes/Backend/ExtJs/backend/product_stream/view/selected_list/product.js
index 97056785fe6..442f79d41e4 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/selected_list/product.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/selected_list/product.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/product_stream/view/selected_list/window.js b/themes/Backend/ExtJs/backend/product_stream/view/selected_list/window.js
index b4f6b306821..35f8d1f0afd 100644
--- a/themes/Backend/ExtJs/backend/product_stream/view/selected_list/window.js
+++ b/themes/Backend/ExtJs/backend/product_stream/view/selected_list/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    ProductStream
diff --git a/themes/Backend/ExtJs/backend/property/app.js b/themes/Backend/ExtJs/backend/property/app.js
index fc699aaee87..6ddcc2424e5 100644
--- a/themes/Backend/ExtJs/backend/property/app.js
+++ b/themes/Backend/ExtJs/backend/property/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Property
diff --git a/themes/Backend/ExtJs/backend/property/controller/main.js b/themes/Backend/ExtJs/backend/property/controller/main.js
index 5c7d877cab3..21ff91b98a2 100644
--- a/themes/Backend/ExtJs/backend/property/controller/main.js
+++ b/themes/Backend/ExtJs/backend/property/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Property
diff --git a/themes/Backend/ExtJs/backend/property/model/group.js b/themes/Backend/ExtJs/backend/property/model/group.js
index ecef66b95e7..4e64761bf7a 100644
--- a/themes/Backend/ExtJs/backend/property/model/group.js
+++ b/themes/Backend/ExtJs/backend/property/model/group.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Property
diff --git a/themes/Backend/ExtJs/backend/property/model/option.js b/themes/Backend/ExtJs/backend/property/model/option.js
index 82447138d6f..30755b22cfc 100644
--- a/themes/Backend/ExtJs/backend/property/model/option.js
+++ b/themes/Backend/ExtJs/backend/property/model/option.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Property
diff --git a/themes/Backend/ExtJs/backend/property/model/set.js b/themes/Backend/ExtJs/backend/property/model/set.js
index 90502a9760e..03348227768 100644
--- a/themes/Backend/ExtJs/backend/property/model/set.js
+++ b/themes/Backend/ExtJs/backend/property/model/set.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Property
diff --git a/themes/Backend/ExtJs/backend/property/model/set_assign.js b/themes/Backend/ExtJs/backend/property/model/set_assign.js
index 66903fd4e2e..7761824fef0 100644
--- a/themes/Backend/ExtJs/backend/property/model/set_assign.js
+++ b/themes/Backend/ExtJs/backend/property/model/set_assign.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Property
diff --git a/themes/Backend/ExtJs/backend/property/store/group.js b/themes/Backend/ExtJs/backend/property/store/group.js
index 1692ead5948..74dfba173de 100644
--- a/themes/Backend/ExtJs/backend/property/store/group.js
+++ b/themes/Backend/ExtJs/backend/property/store/group.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Property
diff --git a/themes/Backend/ExtJs/backend/property/store/option.js b/themes/Backend/ExtJs/backend/property/store/option.js
index 7ba23d3811c..11d61a217c3 100644
--- a/themes/Backend/ExtJs/backend/property/store/option.js
+++ b/themes/Backend/ExtJs/backend/property/store/option.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Property
diff --git a/themes/Backend/ExtJs/backend/property/store/set.js b/themes/Backend/ExtJs/backend/property/store/set.js
index 3af74c78038..b85aaea46e9 100644
--- a/themes/Backend/ExtJs/backend/property/store/set.js
+++ b/themes/Backend/ExtJs/backend/property/store/set.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Property
diff --git a/themes/Backend/ExtJs/backend/property/store/set_assign.js b/themes/Backend/ExtJs/backend/property/store/set_assign.js
index 7ecabb080fb..ae6397100b7 100644
--- a/themes/Backend/ExtJs/backend/property/store/set_assign.js
+++ b/themes/Backend/ExtJs/backend/property/store/set_assign.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Property
diff --git a/themes/Backend/ExtJs/backend/property/view/main/group_grid.js b/themes/Backend/ExtJs/backend/property/view/main/group_grid.js
index f6006f3bfd3..3b34f3e4d9a 100644
--- a/themes/Backend/ExtJs/backend/property/view/main/group_grid.js
+++ b/themes/Backend/ExtJs/backend/property/view/main/group_grid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Property
diff --git a/themes/Backend/ExtJs/backend/property/view/main/option_grid.js b/themes/Backend/ExtJs/backend/property/view/main/option_grid.js
index 652e2065917..5e9783a22dd 100644
--- a/themes/Backend/ExtJs/backend/property/view/main/option_grid.js
+++ b/themes/Backend/ExtJs/backend/property/view/main/option_grid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Property
diff --git a/themes/Backend/ExtJs/backend/property/view/main/set_assign_grid.js b/themes/Backend/ExtJs/backend/property/view/main/set_assign_grid.js
index 0b2d49dc56e..a54e6e383a4 100644
--- a/themes/Backend/ExtJs/backend/property/view/main/set_assign_grid.js
+++ b/themes/Backend/ExtJs/backend/property/view/main/set_assign_grid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Property
diff --git a/themes/Backend/ExtJs/backend/property/view/main/set_grid.js b/themes/Backend/ExtJs/backend/property/view/main/set_grid.js
index 1260bbc40b9..0be7ef451c3 100644
--- a/themes/Backend/ExtJs/backend/property/view/main/set_grid.js
+++ b/themes/Backend/ExtJs/backend/property/view/main/set_grid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Snippet
diff --git a/themes/Backend/ExtJs/backend/property/view/main/window.js b/themes/Backend/ExtJs/backend/property/view/main/window.js
index fa3aac06da8..e2bd93cf767 100644
--- a/themes/Backend/ExtJs/backend/property/view/main/window.js
+++ b/themes/Backend/ExtJs/backend/property/view/main/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Property
diff --git a/themes/Backend/ExtJs/backend/risk_management/app.js b/themes/Backend/ExtJs/backend/risk_management/app.js
index 7c5aaa33b5d..567c4dd9106 100644
--- a/themes/Backend/ExtJs/backend/risk_management/app.js
+++ b/themes/Backend/ExtJs/backend/risk_management/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    RiskManagement
diff --git a/themes/Backend/ExtJs/backend/risk_management/controller/main.js b/themes/Backend/ExtJs/backend/risk_management/controller/main.js
index 0224dcb775e..0811504bffd 100644
--- a/themes/Backend/ExtJs/backend/risk_management/controller/main.js
+++ b/themes/Backend/ExtJs/backend/risk_management/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    RiskManagement
diff --git a/themes/Backend/ExtJs/backend/risk_management/controller/risk_management.js b/themes/Backend/ExtJs/backend/risk_management/controller/risk_management.js
index f4f0a23bef0..436023884dc 100644
--- a/themes/Backend/ExtJs/backend/risk_management/controller/risk_management.js
+++ b/themes/Backend/ExtJs/backend/risk_management/controller/risk_management.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    RiskManagement
diff --git a/themes/Backend/ExtJs/backend/risk_management/model/areas.js b/themes/Backend/ExtJs/backend/risk_management/model/areas.js
index cb3681619f2..a45d01ca75c 100644
--- a/themes/Backend/ExtJs/backend/risk_management/model/areas.js
+++ b/themes/Backend/ExtJs/backend/risk_management/model/areas.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Countries
diff --git a/themes/Backend/ExtJs/backend/risk_management/model/payment.js b/themes/Backend/ExtJs/backend/risk_management/model/payment.js
index ab1c8bc4c24..eb400c04fd0 100644
--- a/themes/Backend/ExtJs/backend/risk_management/model/payment.js
+++ b/themes/Backend/ExtJs/backend/risk_management/model/payment.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    RiskManagement
diff --git a/themes/Backend/ExtJs/backend/risk_management/model/risk.js b/themes/Backend/ExtJs/backend/risk_management/model/risk.js
index 64dd41c2d6a..f7df4e15f74 100644
--- a/themes/Backend/ExtJs/backend/risk_management/model/risk.js
+++ b/themes/Backend/ExtJs/backend/risk_management/model/risk.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    RiskManagement
diff --git a/themes/Backend/ExtJs/backend/risk_management/model/rule.js b/themes/Backend/ExtJs/backend/risk_management/model/rule.js
index 79eb97e5291..412d7dcab73 100644
--- a/themes/Backend/ExtJs/backend/risk_management/model/rule.js
+++ b/themes/Backend/ExtJs/backend/risk_management/model/rule.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    RiskManagement
diff --git a/themes/Backend/ExtJs/backend/risk_management/model/subshop.js b/themes/Backend/ExtJs/backend/risk_management/model/subshop.js
index 6f595abcda2..a6ff11c7600 100644
--- a/themes/Backend/ExtJs/backend/risk_management/model/subshop.js
+++ b/themes/Backend/ExtJs/backend/risk_management/model/subshop.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Premium
diff --git a/themes/Backend/ExtJs/backend/risk_management/store/areas.js b/themes/Backend/ExtJs/backend/risk_management/store/areas.js
index e7949da40eb..76e159cc136 100644
--- a/themes/Backend/ExtJs/backend/risk_management/store/areas.js
+++ b/themes/Backend/ExtJs/backend/risk_management/store/areas.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Countries
diff --git a/themes/Backend/ExtJs/backend/risk_management/store/payments.js b/themes/Backend/ExtJs/backend/risk_management/store/payments.js
index cbf77c7b9bc..5709e718eb2 100644
--- a/themes/Backend/ExtJs/backend/risk_management/store/payments.js
+++ b/themes/Backend/ExtJs/backend/risk_management/store/payments.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    RiskManagement
diff --git a/themes/Backend/ExtJs/backend/risk_management/store/risks.js b/themes/Backend/ExtJs/backend/risk_management/store/risks.js
index 79cdb992293..c586abb03ce 100644
--- a/themes/Backend/ExtJs/backend/risk_management/store/risks.js
+++ b/themes/Backend/ExtJs/backend/risk_management/store/risks.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    RiskManagement
diff --git a/themes/Backend/ExtJs/backend/risk_management/store/rules.js b/themes/Backend/ExtJs/backend/risk_management/store/rules.js
index 8f02a729c4c..63982d577f3 100644
--- a/themes/Backend/ExtJs/backend/risk_management/store/rules.js
+++ b/themes/Backend/ExtJs/backend/risk_management/store/rules.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    RiskManagement
diff --git a/themes/Backend/ExtJs/backend/risk_management/store/subshops.js b/themes/Backend/ExtJs/backend/risk_management/store/subshops.js
index a374286af9f..c63045ae791 100644
--- a/themes/Backend/ExtJs/backend/risk_management/store/subshops.js
+++ b/themes/Backend/ExtJs/backend/risk_management/store/subshops.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Premium
diff --git a/themes/Backend/ExtJs/backend/risk_management/view/main/window.js b/themes/Backend/ExtJs/backend/risk_management/view/main/window.js
index c48ff50ca47..193690ef5fb 100644
--- a/themes/Backend/ExtJs/backend/risk_management/view/main/window.js
+++ b/themes/Backend/ExtJs/backend/risk_management/view/main/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    RiskManagement
diff --git a/themes/Backend/ExtJs/backend/risk_management/view/risk_management/container.js b/themes/Backend/ExtJs/backend/risk_management/view/risk_management/container.js
index e62790d59de..30507148a47 100644
--- a/themes/Backend/ExtJs/backend/risk_management/view/risk_management/container.js
+++ b/themes/Backend/ExtJs/backend/risk_management/view/risk_management/container.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    RiskManagement
diff --git a/themes/Backend/ExtJs/backend/risk_management/view/risk_management/panel.js b/themes/Backend/ExtJs/backend/risk_management/view/risk_management/panel.js
index f294247939f..684a6eaed73 100644
--- a/themes/Backend/ExtJs/backend/risk_management/view/risk_management/panel.js
+++ b/themes/Backend/ExtJs/backend/risk_management/view/risk_management/panel.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    RiskManagement
diff --git a/themes/Backend/ExtJs/backend/search/articles.tpl b/themes/Backend/ExtJs/backend/search/articles.tpl
index 6ca5bc1c64e..dfe360069cf 100644
--- a/themes/Backend/ExtJs/backend/search/articles.tpl
+++ b/themes/Backend/ExtJs/backend/search/articles.tpl
@@ -14,7 +14,7 @@
         {block name="backend/search/index/result_content"}
             <div class="result-container">
                 {foreach $searchResult.articles as $item}
-                    <a onclick="openSearchResult('articles', {$item.articleId});return false;" href="#"{if $item@iteration is odd by 2} class="odd"{/if}>
+                    <a onclick="openSearchResult('articles', {$item.articleId});return false;" href="#">
                         <span class="name" style="display:inline-block;width: 155px">{$item.name|truncate:60}</span>
 
                         {if $item.description}
diff --git a/themes/Backend/ExtJs/backend/search/customers.tpl b/themes/Backend/ExtJs/backend/search/customers.tpl
index 3224a83b291..1a3a676ac5d 100644
--- a/themes/Backend/ExtJs/backend/search/customers.tpl
+++ b/themes/Backend/ExtJs/backend/search/customers.tpl
@@ -14,7 +14,7 @@
         {block name="backend/search/index/result_content"}
             <div class="result-container">
                 {foreach $searchResult.customers as $item}
-                    <a onclick="openSearchResult('customers', {$item.id});return false;" href="#"{if $item@iteration is odd by 2} class="odd"{/if}>
+                    <a onclick="openSearchResult('customers', {$item.id});return false;" href="#">
                         <span class="name">
                             {if $item.company}{$item.company} {/if}{$item.firstname} {$item.lastname}
                         </span>
diff --git a/themes/Backend/ExtJs/backend/search/orders.tpl b/themes/Backend/ExtJs/backend/search/orders.tpl
index bbfea5680f6..ed2cda5eb5a 100644
--- a/themes/Backend/ExtJs/backend/search/orders.tpl
+++ b/themes/Backend/ExtJs/backend/search/orders.tpl
@@ -14,7 +14,7 @@
         {block name="backend/search/index/result_content"}
             <div class="result-container">
                 {foreach $searchResult.orders as $item}
-                    <a onclick="openSearchResult('orders', {$item.id});return false;" href="#"{if $item@iteration is odd by 2} class="odd"{/if}>
+                    <a onclick="openSearchResult('orders', {$item.id});return false;" href="#">
                         <span class="name">{$item.number}: {$item.orderStateName|truncate:30} </span>
                         <span class="desc">{if $item.company}{$item.company} {/if}{$item.firstname} {$item.lastname} {$item.street} {$item.zipcode} {$item.city}</span>
                         <span class="desc">{$item.shopName} / {$item.dispatchName} / {$item.paymentName}</span>
diff --git a/themes/Backend/ExtJs/backend/shipping/app.js b/themes/Backend/ExtJs/backend/shipping/app.js
index 25b9dfbdd80..d9d323ebcdd 100644
--- a/themes/Backend/ExtJs/backend/shipping/app.js
+++ b/themes/Backend/ExtJs/backend/shipping/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shipping
@@ -76,6 +75,7 @@ Ext.define('Shopware.apps.Shipping', {
     stores: [
         'Costsmatrix',
         'Dispatch',
+        'DispatchList',
         'Holiday',
         'Country',
         'Payment',
diff --git a/themes/Backend/ExtJs/backend/shipping/controller/categories_tree.js b/themes/Backend/ExtJs/backend/shipping/controller/categories_tree.js
index 12e346041be..9d008167254 100644
--- a/themes/Backend/ExtJs/backend/shipping/controller/categories_tree.js
+++ b/themes/Backend/ExtJs/backend/shipping/controller/categories_tree.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shipping
diff --git a/themes/Backend/ExtJs/backend/shipping/controller/costs_matrix.js b/themes/Backend/ExtJs/backend/shipping/controller/costs_matrix.js
index d1e7a88ac71..514f4bbd13d 100644
--- a/themes/Backend/ExtJs/backend/shipping/controller/costs_matrix.js
+++ b/themes/Backend/ExtJs/backend/shipping/controller/costs_matrix.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shipping
diff --git a/themes/Backend/ExtJs/backend/shipping/controller/default_form.js b/themes/Backend/ExtJs/backend/shipping/controller/default_form.js
index 6fabec06179..4706f9d6902 100644
--- a/themes/Backend/ExtJs/backend/shipping/controller/default_form.js
+++ b/themes/Backend/ExtJs/backend/shipping/controller/default_form.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shipping
@@ -93,8 +92,7 @@ Ext.define('Shopware.apps.Shipping.controller.DefaultForm', {
             holidayComponent = me.getAdvancedForm().down('boxselect'),
             categoryComponent = me.getCategoryData();
 
-        var mainStore = me.getStore('Dispatch'),
-            advancedForm = me.getAdvancedFormData(),
+        var advancedForm = me.getAdvancedFormData(),
             attributeForm = me.getAttributeForm(),
             record = form.getRecord();
 
@@ -142,7 +140,7 @@ Ext.define('Shopware.apps.Shipping.controller.DefaultForm', {
                     attributeForm.saveAttribute(rawData.data.id);
                     me.onCostsMatrixSave(button, rawData.data.id);
                 }
-                me.getStore('Dispatch').load();
+                me.getStore('DispatchList').load();
                 Shopware.Notification.createGrowlMessage('', '{s name="growl_save_success"}The settings have been saved successfully.{/s}', '{s name="title"}{/s}');
             }
         });
diff --git a/themes/Backend/ExtJs/backend/shipping/controller/main.js b/themes/Backend/ExtJs/backend/shipping/controller/main.js
index 0af7dd1ec1f..91dcd5e3239 100644
--- a/themes/Backend/ExtJs/backend/shipping/controller/main.js
+++ b/themes/Backend/ExtJs/backend/shipping/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shipping
@@ -119,7 +118,7 @@ Ext.define('Shopware.apps.Shipping.controller.Main', {
                 me.mainWindow = me.getView('Main').create({
                     customerGroupStore: me.customerGroupStore,
                     shopStore: me.shopStore,
-                    dispatchStore: me.getStore('Dispatch').load()
+                    dispatchStore: me.getStore('DispatchList').load()
                 });
                 me.subApplication.setAppWindow(me.mainWindow);
                 me.mainWindow.show();
@@ -171,7 +170,7 @@ Ext.define('Shopware.apps.Shipping.controller.Main', {
         var me                  = this,
             grid                = me.getGrid(),
             selection           = grid.getSelectionModel().getSelection(),
-            store               = me.getStore('Dispatch'),
+            store               = me.getStore('DispatchList'),
             listOfDispatchNames = [],
             noOfElements        = selection.length;
 
@@ -236,12 +235,12 @@ Ext.define('Shopware.apps.Shipping.controller.Main', {
     onAddShipping: function() {
         var me = this,
             costsmatrix = this.getStore('Costsmatrix'),
-            // create a empty dispatch model
+            // create an empty dispatch model
             record = me.getModel('Dispatch').create(),
             // create an inital empty costs matrix entry
             emptyCostsMatrix = me.getModel('Costsmatrix').create();
 
-        // Make shure that an empty dispatch id will be send, so that a new data entry will be generated.
+        // Make sure that an empty dispatch id will be send, so that a new data entry will be generated.
         costsmatrix.getProxy().extraParams = {
             dispatchId: ''
         };
@@ -277,7 +276,10 @@ Ext.define('Shopware.apps.Shipping.controller.Main', {
             // current dispatch id
             dispatchId: record.get('id'),
             // store for the dispatch
-            mainStore: Ext.create('Shopware.apps.Shipping.store.Dispatch').load()
+            mainStore: Ext.create('Shopware.apps.Shipping.store.Dispatch').load(
+                {
+                    params: { id: record.get('id') },
+                })
         });
     },
 
@@ -320,7 +322,7 @@ Ext.define('Shopware.apps.Shipping.controller.Main', {
         var store       = view.getStore(),
             me          = this,
             costsmatrix = Ext.create('Shopware.apps.Shipping.store.Costsmatrix'),
-            record      = store.load().getAt(rowIndex);
+            record      = store.getAt(rowIndex);
 
         record.data.clone = false;
 
diff --git a/themes/Backend/ExtJs/backend/shipping/model/category_tree.js b/themes/Backend/ExtJs/backend/shipping/model/category_tree.js
index c116d224cee..13cd1f80f0c 100644
--- a/themes/Backend/ExtJs/backend/shipping/model/category_tree.js
+++ b/themes/Backend/ExtJs/backend/shipping/model/category_tree.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shipping
diff --git a/themes/Backend/ExtJs/backend/shipping/model/costsmatrix.js b/themes/Backend/ExtJs/backend/shipping/model/costsmatrix.js
index 92ebd02a2f3..869d4d0e17c 100644
--- a/themes/Backend/ExtJs/backend/shipping/model/costsmatrix.js
+++ b/themes/Backend/ExtJs/backend/shipping/model/costsmatrix.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shipping
diff --git a/themes/Backend/ExtJs/backend/shipping/model/dispatch.js b/themes/Backend/ExtJs/backend/shipping/model/dispatch.js
index 3222cbb7920..517905d3c81 100644
--- a/themes/Backend/ExtJs/backend/shipping/model/dispatch.js
+++ b/themes/Backend/ExtJs/backend/shipping/model/dispatch.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shipping
diff --git a/themes/Backend/ExtJs/backend/shipping/model/dispatch_list.js b/themes/Backend/ExtJs/backend/shipping/model/dispatch_list.js
index 133a21673ca..ce62981fc9e 100644
--- a/themes/Backend/ExtJs/backend/shipping/model/dispatch_list.js
+++ b/themes/Backend/ExtJs/backend/shipping/model/dispatch_list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shipping
@@ -102,7 +101,8 @@ Ext.define('Shopware.apps.Shipping.model.DispatchList', {
     proxy: {
         type: 'ajax',
         api: {
-            read: '{url controller="shipping" action="getList"}'
+            read: '{url controller="shipping" action="getList"}',
+            destroy: '{url controller="shipping" action="delete" targetField=dispatches}'
         },
 
         reader: {
diff --git a/themes/Backend/ExtJs/backend/shipping/model/holiday.js b/themes/Backend/ExtJs/backend/shipping/model/holiday.js
index b7901dc61fe..73950fe4135 100644
--- a/themes/Backend/ExtJs/backend/shipping/model/holiday.js
+++ b/themes/Backend/ExtJs/backend/shipping/model/holiday.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shipping
diff --git a/themes/Backend/ExtJs/backend/shipping/model/tax.js b/themes/Backend/ExtJs/backend/shipping/model/tax.js
index 2211879e801..d2ea7f2af2d 100644
--- a/themes/Backend/ExtJs/backend/shipping/model/tax.js
+++ b/themes/Backend/ExtJs/backend/shipping/model/tax.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shipping
diff --git a/themes/Backend/ExtJs/backend/shipping/store/category_tree.js b/themes/Backend/ExtJs/backend/shipping/store/category_tree.js
index 1dd8bc44c12..677f7a6551c 100644
--- a/themes/Backend/ExtJs/backend/shipping/store/category_tree.js
+++ b/themes/Backend/ExtJs/backend/shipping/store/category_tree.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shipping
diff --git a/themes/Backend/ExtJs/backend/shipping/store/costsmatrix.js b/themes/Backend/ExtJs/backend/shipping/store/costsmatrix.js
index 8bac41f22a5..b84dec615f5 100644
--- a/themes/Backend/ExtJs/backend/shipping/store/costsmatrix.js
+++ b/themes/Backend/ExtJs/backend/shipping/store/costsmatrix.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shipping
diff --git a/themes/Backend/ExtJs/backend/shipping/store/country.js b/themes/Backend/ExtJs/backend/shipping/store/country.js
index 35c65371f57..ac8da613ed1 100644
--- a/themes/Backend/ExtJs/backend/shipping/store/country.js
+++ b/themes/Backend/ExtJs/backend/shipping/store/country.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shipping
@@ -29,8 +28,6 @@
 
 /**
  * Shopware Store - Shipping
- *
- * todo@all: Documentation
  */
 //{block name="backend/shipping/store/country"}
 Ext.define('Shopware.apps.Shipping.store.Country', {
diff --git a/themes/Backend/ExtJs/backend/shipping/store/dispatch.js b/themes/Backend/ExtJs/backend/shipping/store/dispatch.js
index 22748a601e0..d8dff48cb80 100644
--- a/themes/Backend/ExtJs/backend/shipping/store/dispatch.js
+++ b/themes/Backend/ExtJs/backend/shipping/store/dispatch.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shipping
diff --git a/themes/Backend/ExtJs/backend/shipping/store/dispatch_list.js b/themes/Backend/ExtJs/backend/shipping/store/dispatch_list.js
new file mode 100644
index 00000000000..70634e9fc93
--- /dev/null
+++ b/themes/Backend/ExtJs/backend/shipping/store/dispatch_list.js
@@ -0,0 +1,68 @@
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ *
+ * @category   Shopware
+ * @package    Shipping
+ * @subpackage Store
+ * @version    $Id$
+ * @author shopware AG
+ */
+
+/**
+ * Shopware Store - Shipping
+ *
+ * todo@all: Documentation
+ */
+//{block name="backend/shipping/store/dispatch_list"}
+Ext.define('Shopware.apps.Shipping.store.DispatchList', {
+    /**
+     * Extend for the standard ExtJS 4
+     * @string
+     */
+    extend: 'Ext.data.Store',
+    /**
+     * Auto load the store after the component
+     * is initialized
+     * @boolean
+     */
+    autoLoad: false,
+    /**
+     * enables the remote filter system
+     * @boolen
+     */
+    remoteFilter: true,
+    /**
+     * enables the remote sorting system
+     * @boolean
+     */
+    remoteSort: true,
+    /**
+     * Amount of data loaded at once
+     * @integer
+     */
+    pageSize: 30,
+    /**
+     * Define the used model for this store
+     * @string
+     */
+    model: 'Shopware.apps.Shipping.model.DispatchList'
+});
+//{/block}
diff --git a/themes/Backend/ExtJs/backend/shipping/store/holiday.js b/themes/Backend/ExtJs/backend/shipping/store/holiday.js
index 11b527a974a..bee5ea2a061 100644
--- a/themes/Backend/ExtJs/backend/shipping/store/holiday.js
+++ b/themes/Backend/ExtJs/backend/shipping/store/holiday.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shipping
diff --git a/themes/Backend/ExtJs/backend/shipping/store/payment.js b/themes/Backend/ExtJs/backend/shipping/store/payment.js
index 2cc71f6b144..6bbc09ad728 100644
--- a/themes/Backend/ExtJs/backend/shipping/store/payment.js
+++ b/themes/Backend/ExtJs/backend/shipping/store/payment.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shipping
diff --git a/themes/Backend/ExtJs/backend/shipping/store/tax.js b/themes/Backend/ExtJs/backend/shipping/store/tax.js
index ec74034d474..7488717e355 100644
--- a/themes/Backend/ExtJs/backend/shipping/store/tax.js
+++ b/themes/Backend/ExtJs/backend/shipping/store/tax.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shipping
@@ -31,10 +30,8 @@
 
 /**
  * Shopware Store - Shipping
- *
- * todo@all: Documentation
  */
-//{block name="backend/shipping/store/country"}
+//{block name="backend/shipping/store/tax"}
 Ext.define('Shopware.apps.Shipping.store.Tax', {
     /**
      * Extend for the standard ExtJS 4
diff --git a/themes/Backend/ExtJs/backend/shipping/view/edit/advanced.js b/themes/Backend/ExtJs/backend/shipping/view/edit/advanced.js
index 14e5fa73393..3456c46665e 100644
--- a/themes/Backend/ExtJs/backend/shipping/view/edit/advanced.js
+++ b/themes/Backend/ExtJs/backend/shipping/view/edit/advanced.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shipping
diff --git a/themes/Backend/ExtJs/backend/shipping/view/edit/categories_tree.js b/themes/Backend/ExtJs/backend/shipping/view/edit/categories_tree.js
index 5045a6730ef..9d7f11f6035 100644
--- a/themes/Backend/ExtJs/backend/shipping/view/edit/categories_tree.js
+++ b/themes/Backend/ExtJs/backend/shipping/view/edit/categories_tree.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shipping
diff --git a/themes/Backend/ExtJs/backend/shipping/view/edit/country.js b/themes/Backend/ExtJs/backend/shipping/view/edit/country.js
index 156978fb3ad..07fa1ed0d1a 100644
--- a/themes/Backend/ExtJs/backend/shipping/view/edit/country.js
+++ b/themes/Backend/ExtJs/backend/shipping/view/edit/country.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shipping
diff --git a/themes/Backend/ExtJs/backend/shipping/view/edit/default/form_left.js b/themes/Backend/ExtJs/backend/shipping/view/edit/default/form_left.js
index 2416a1c033f..1fe88a0fbf6 100644
--- a/themes/Backend/ExtJs/backend/shipping/view/edit/default/form_left.js
+++ b/themes/Backend/ExtJs/backend/shipping/view/edit/default/form_left.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shipping
diff --git a/themes/Backend/ExtJs/backend/shipping/view/edit/default/form_right.js b/themes/Backend/ExtJs/backend/shipping/view/edit/default/form_right.js
index f6bdfedbda5..db424eaab66 100644
--- a/themes/Backend/ExtJs/backend/shipping/view/edit/default/form_right.js
+++ b/themes/Backend/ExtJs/backend/shipping/view/edit/default/form_right.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shipping
diff --git a/themes/Backend/ExtJs/backend/shipping/view/edit/dispatch_costs_matrix.js b/themes/Backend/ExtJs/backend/shipping/view/edit/dispatch_costs_matrix.js
index 424705a5ceb..eefed114165 100644
--- a/themes/Backend/ExtJs/backend/shipping/view/edit/dispatch_costs_matrix.js
+++ b/themes/Backend/ExtJs/backend/shipping/view/edit/dispatch_costs_matrix.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shipping
diff --git a/themes/Backend/ExtJs/backend/shipping/view/edit/panel.js b/themes/Backend/ExtJs/backend/shipping/view/edit/panel.js
index c41cc81c60f..9ee35373354 100644
--- a/themes/Backend/ExtJs/backend/shipping/view/edit/panel.js
+++ b/themes/Backend/ExtJs/backend/shipping/view/edit/panel.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shipping
diff --git a/themes/Backend/ExtJs/backend/shipping/view/edit/payment_means.js b/themes/Backend/ExtJs/backend/shipping/view/edit/payment_means.js
index a9a66a002ec..da8292f62ff 100644
--- a/themes/Backend/ExtJs/backend/shipping/view/edit/payment_means.js
+++ b/themes/Backend/ExtJs/backend/shipping/view/edit/payment_means.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shipping
diff --git a/themes/Backend/ExtJs/backend/shipping/view/main.js b/themes/Backend/ExtJs/backend/shipping/view/main.js
index 924323937dd..02fb983f6e0 100644
--- a/themes/Backend/ExtJs/backend/shipping/view/main.js
+++ b/themes/Backend/ExtJs/backend/shipping/view/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shipping
diff --git a/themes/Backend/ExtJs/backend/shipping/view/main/list.js b/themes/Backend/ExtJs/backend/shipping/view/main/list.js
index d2732a614bd..71aae5b3367 100644
--- a/themes/Backend/ExtJs/backend/shipping/view/main/list.js
+++ b/themes/Backend/ExtJs/backend/shipping/view/main/list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Shipping
diff --git a/themes/Backend/ExtJs/backend/site/app.js b/themes/Backend/ExtJs/backend/site/app.js
index 39224651202..9b99fbe0e45 100644
--- a/themes/Backend/ExtJs/backend/site/app.js
+++ b/themes/Backend/ExtJs/backend/site/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Site
diff --git a/themes/Backend/ExtJs/backend/site/controller/form.js b/themes/Backend/ExtJs/backend/site/controller/form.js
index d79210e0d9f..72309f03e0f 100644
--- a/themes/Backend/ExtJs/backend/site/controller/form.js
+++ b/themes/Backend/ExtJs/backend/site/controller/form.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Site
diff --git a/themes/Backend/ExtJs/backend/site/controller/main.js b/themes/Backend/ExtJs/backend/site/controller/main.js
index 5466b781a63..32331379157 100644
--- a/themes/Backend/ExtJs/backend/site/controller/main.js
+++ b/themes/Backend/ExtJs/backend/site/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Site
diff --git a/themes/Backend/ExtJs/backend/site/controller/tree.js b/themes/Backend/ExtJs/backend/site/controller/tree.js
index b528e84eebf..e171e344f2d 100644
--- a/themes/Backend/ExtJs/backend/site/controller/tree.js
+++ b/themes/Backend/ExtJs/backend/site/controller/tree.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Site
diff --git a/themes/Backend/ExtJs/backend/site/model/groups.js b/themes/Backend/ExtJs/backend/site/model/groups.js
index f2dc3635c0d..fc71cba89fd 100644
--- a/themes/Backend/ExtJs/backend/site/model/groups.js
+++ b/themes/Backend/ExtJs/backend/site/model/groups.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Site
diff --git a/themes/Backend/ExtJs/backend/site/model/nodes.js b/themes/Backend/ExtJs/backend/site/model/nodes.js
index 97f914d2838..1d52d84f099 100644
--- a/themes/Backend/ExtJs/backend/site/model/nodes.js
+++ b/themes/Backend/ExtJs/backend/site/model/nodes.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Site
diff --git a/themes/Backend/ExtJs/backend/site/model/selected.js b/themes/Backend/ExtJs/backend/site/model/selected.js
index c1c4b596219..f1c300da9ec 100644
--- a/themes/Backend/ExtJs/backend/site/model/selected.js
+++ b/themes/Backend/ExtJs/backend/site/model/selected.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Site
diff --git a/themes/Backend/ExtJs/backend/site/store/groups.js b/themes/Backend/ExtJs/backend/site/store/groups.js
index 5e0c2a25411..adbb5a64cbd 100644
--- a/themes/Backend/ExtJs/backend/site/store/groups.js
+++ b/themes/Backend/ExtJs/backend/site/store/groups.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Site
diff --git a/themes/Backend/ExtJs/backend/site/store/nodes.js b/themes/Backend/ExtJs/backend/site/store/nodes.js
index 34603435210..15cc2275354 100644
--- a/themes/Backend/ExtJs/backend/site/store/nodes.js
+++ b/themes/Backend/ExtJs/backend/site/store/nodes.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Site
diff --git a/themes/Backend/ExtJs/backend/site/store/selected.js b/themes/Backend/ExtJs/backend/site/store/selected.js
index 1bba59f5fbd..04076e5ea69 100644
--- a/themes/Backend/ExtJs/backend/site/store/selected.js
+++ b/themes/Backend/ExtJs/backend/site/store/selected.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Site
@@ -27,7 +26,7 @@
  * @author shopware AG
  */
 
-//{block name="backend/site/store/groups"}
+//{block name="backend/site/store/selected"}
 Ext.define('Shopware.apps.Site.store.Selected', {
     extend: 'Ext.data.Store',
     model: 'Shopware.apps.Site.model.Selected',
diff --git a/themes/Backend/ExtJs/backend/site/store/shop.js b/themes/Backend/ExtJs/backend/site/store/shop.js
index 35179165117..75b247aabaf 100644
--- a/themes/Backend/ExtJs/backend/site/store/shop.js
+++ b/themes/Backend/ExtJs/backend/site/store/shop.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="backend/site/store/shop"}
diff --git a/themes/Backend/ExtJs/backend/site/view/main/window.js b/themes/Backend/ExtJs/backend/site/view/main/window.js
index 9267dbc9fd9..365c36ae47f 100644
--- a/themes/Backend/ExtJs/backend/site/view/main/window.js
+++ b/themes/Backend/ExtJs/backend/site/view/main/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Site
diff --git a/themes/Backend/ExtJs/backend/site/view/site/form.js b/themes/Backend/ExtJs/backend/site/view/site/form.js
index 3430dbe05f1..c0d171af70a 100644
--- a/themes/Backend/ExtJs/backend/site/view/site/form.js
+++ b/themes/Backend/ExtJs/backend/site/view/site/form.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Site
diff --git a/themes/Backend/ExtJs/backend/site/view/site/group_dialog.js b/themes/Backend/ExtJs/backend/site/view/site/group_dialog.js
index 97da05be3a1..e4eb61d9362 100644
--- a/themes/Backend/ExtJs/backend/site/view/site/group_dialog.js
+++ b/themes/Backend/ExtJs/backend/site/view/site/group_dialog.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Site
diff --git a/themes/Backend/ExtJs/backend/site/view/site/tree.js b/themes/Backend/ExtJs/backend/site/view/site/tree.js
index 1a40e25ecc5..83487b114e2 100644
--- a/themes/Backend/ExtJs/backend/site/view/site/tree.js
+++ b/themes/Backend/ExtJs/backend/site/view/site/tree.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Site
diff --git a/themes/Backend/ExtJs/backend/snippet/app.js b/themes/Backend/ExtJs/backend/snippet/app.js
index 0cb82a39158..9c68e1e7502 100644
--- a/themes/Backend/ExtJs/backend/snippet/app.js
+++ b/themes/Backend/ExtJs/backend/snippet/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{block name="backend/snippet/app"}
diff --git a/themes/Backend/ExtJs/backend/snippet/controller/main.js b/themes/Backend/ExtJs/backend/snippet/controller/main.js
index 5366db7258f..2742cb81e4f 100644
--- a/themes/Backend/ExtJs/backend/snippet/controller/main.js
+++ b/themes/Backend/ExtJs/backend/snippet/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/snippet/controller/main"}
diff --git a/themes/Backend/ExtJs/backend/snippet/model/n_space.js b/themes/Backend/ExtJs/backend/snippet/model/n_space.js
index 654cbb8bdcf..15444943ed7 100644
--- a/themes/Backend/ExtJs/backend/snippet/model/n_space.js
+++ b/themes/Backend/ExtJs/backend/snippet/model/n_space.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/snippet/model/shoplocale.js b/themes/Backend/ExtJs/backend/snippet/model/shoplocale.js
index 3c1f777b25d..d13a3506aa1 100644
--- a/themes/Backend/ExtJs/backend/snippet/model/shoplocale.js
+++ b/themes/Backend/ExtJs/backend/snippet/model/shoplocale.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/snippet/model/snippet.js b/themes/Backend/ExtJs/backend/snippet/model/snippet.js
index 9c8470596c8..74c23471f37 100644
--- a/themes/Backend/ExtJs/backend/snippet/model/snippet.js
+++ b/themes/Backend/ExtJs/backend/snippet/model/snippet.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/snippet/store/n_space.js b/themes/Backend/ExtJs/backend/snippet/store/n_space.js
index 1fabac23d86..ea3d39492d0 100644
--- a/themes/Backend/ExtJs/backend/snippet/store/n_space.js
+++ b/themes/Backend/ExtJs/backend/snippet/store/n_space.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/snippet/store/shoplocale.js b/themes/Backend/ExtJs/backend/snippet/store/shoplocale.js
index 54291e3b986..888cf08b220 100644
--- a/themes/Backend/ExtJs/backend/snippet/store/shoplocale.js
+++ b/themes/Backend/ExtJs/backend/snippet/store/shoplocale.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/snippet/store/snippet.js b/themes/Backend/ExtJs/backend/snippet/store/snippet.js
index d0ec7720385..08e0e1d604b 100644
--- a/themes/Backend/ExtJs/backend/snippet/store/snippet.js
+++ b/themes/Backend/ExtJs/backend/snippet/store/snippet.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/snippet/view/main/create_form.js b/themes/Backend/ExtJs/backend/snippet/view/main/create_form.js
index bc60d8babf3..20a6fab9a37 100644
--- a/themes/Backend/ExtJs/backend/snippet/view/main/create_form.js
+++ b/themes/Backend/ExtJs/backend/snippet/view/main/create_form.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/snippet/view/main"}
diff --git a/themes/Backend/ExtJs/backend/snippet/view/main/edit_form.js b/themes/Backend/ExtJs/backend/snippet/view/main/edit_form.js
index 9b3151e7019..57d54b037a7 100644
--- a/themes/Backend/ExtJs/backend/snippet/view/main/edit_form.js
+++ b/themes/Backend/ExtJs/backend/snippet/view/main/edit_form.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/snippet/view/main"}
diff --git a/themes/Backend/ExtJs/backend/snippet/view/main/form.js b/themes/Backend/ExtJs/backend/snippet/view/main/form.js
index aed5547ca99..541a36a82c3 100644
--- a/themes/Backend/ExtJs/backend/snippet/view/main/form.js
+++ b/themes/Backend/ExtJs/backend/snippet/view/main/form.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/snippet/view/main"}
diff --git a/themes/Backend/ExtJs/backend/snippet/view/main/grid.js b/themes/Backend/ExtJs/backend/snippet/view/main/grid.js
index fe24e1b721d..48eb3bca47e 100644
--- a/themes/Backend/ExtJs/backend/snippet/view/main/grid.js
+++ b/themes/Backend/ExtJs/backend/snippet/view/main/grid.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/snippet/view/main"}
diff --git a/themes/Backend/ExtJs/backend/snippet/view/main/import_export.js b/themes/Backend/ExtJs/backend/snippet/view/main/import_export.js
index 4de2f395f26..4417ce08b69 100644
--- a/themes/Backend/ExtJs/backend/snippet/view/main/import_export.js
+++ b/themes/Backend/ExtJs/backend/snippet/view/main/import_export.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/snippet/view/main"}
diff --git a/themes/Backend/ExtJs/backend/snippet/view/main/navigation.js b/themes/Backend/ExtJs/backend/snippet/view/main/navigation.js
index b56b466405b..49af9222fb9 100644
--- a/themes/Backend/ExtJs/backend/snippet/view/main/navigation.js
+++ b/themes/Backend/ExtJs/backend/snippet/view/main/navigation.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/snippet/view/main"}
diff --git a/themes/Backend/ExtJs/backend/snippet/view/main/snippet_panel.js b/themes/Backend/ExtJs/backend/snippet/view/main/snippet_panel.js
index 0a612527906..52679fcea3c 100644
--- a/themes/Backend/ExtJs/backend/snippet/view/main/snippet_panel.js
+++ b/themes/Backend/ExtJs/backend/snippet/view/main/snippet_panel.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/snippet/view/main"}
diff --git a/themes/Backend/ExtJs/backend/snippet/view/main/translate_form.js b/themes/Backend/ExtJs/backend/snippet/view/main/translate_form.js
index 01de071bc07..c897511439a 100644
--- a/themes/Backend/ExtJs/backend/snippet/view/main/translate_form.js
+++ b/themes/Backend/ExtJs/backend/snippet/view/main/translate_form.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/snippet/view/main"}
diff --git a/themes/Backend/ExtJs/backend/snippet/view/main/translate_window.js b/themes/Backend/ExtJs/backend/snippet/view/main/translate_window.js
index 118a3f52e12..f2b053d520a 100644
--- a/themes/Backend/ExtJs/backend/snippet/view/main/translate_window.js
+++ b/themes/Backend/ExtJs/backend/snippet/view/main/translate_window.js
@@ -2,31 +2,27 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/snippet/view/main"}
 
-/**
- * todo@all: Documentation
- */
-//{block name="backend/snippet/view/main/edit_form"}
+//{block name="backend/snippet/view/main/translate_window"}
 Ext.define('Shopware.apps.Snippet.view.main.TranslateWindow', {
     extend: 'Enlight.app.Window',
     alias: 'widget.snippet-main-translateWindow',
diff --git a/themes/Backend/ExtJs/backend/snippet/view/main/window.js b/themes/Backend/ExtJs/backend/snippet/view/main/window.js
index 9b98cef70eb..84dd9898933 100644
--- a/themes/Backend/ExtJs/backend/snippet/view/main/window.js
+++ b/themes/Backend/ExtJs/backend/snippet/view/main/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/snippet/view/main"}
diff --git a/themes/Backend/ExtJs/backend/supplier/app.js b/themes/Backend/ExtJs/backend/supplier/app.js
index 50a170f3c3e..e08e1502e91 100644
--- a/themes/Backend/ExtJs/backend/supplier/app.js
+++ b/themes/Backend/ExtJs/backend/supplier/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Supplier
diff --git a/themes/Backend/ExtJs/backend/supplier/controller/main.js b/themes/Backend/ExtJs/backend/supplier/controller/main.js
index c78b7f7fcad..461eade7b20 100644
--- a/themes/Backend/ExtJs/backend/supplier/controller/main.js
+++ b/themes/Backend/ExtJs/backend/supplier/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Supplier
diff --git a/themes/Backend/ExtJs/backend/supplier/model/supplier.js b/themes/Backend/ExtJs/backend/supplier/model/supplier.js
index 14d2f10db9e..313f57b5f26 100644
--- a/themes/Backend/ExtJs/backend/supplier/model/supplier.js
+++ b/themes/Backend/ExtJs/backend/supplier/model/supplier.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Supplier
diff --git a/themes/Backend/ExtJs/backend/supplier/store/supplier.js b/themes/Backend/ExtJs/backend/supplier/store/supplier.js
index 71d98203262..1debb8341ed 100644
--- a/themes/Backend/ExtJs/backend/supplier/store/supplier.js
+++ b/themes/Backend/ExtJs/backend/supplier/store/supplier.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Supplier
diff --git a/themes/Backend/ExtJs/backend/supplier/view/main.js b/themes/Backend/ExtJs/backend/supplier/view/main.js
index 074f6b11ba6..7b261a3ad76 100644
--- a/themes/Backend/ExtJs/backend/supplier/view/main.js
+++ b/themes/Backend/ExtJs/backend/supplier/view/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Supplier
diff --git a/themes/Backend/ExtJs/backend/supplier/view/main/create.js b/themes/Backend/ExtJs/backend/supplier/view/main/create.js
index f169075cf6c..c57437f91bb 100644
--- a/themes/Backend/ExtJs/backend/supplier/view/main/create.js
+++ b/themes/Backend/ExtJs/backend/supplier/view/main/create.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Supplier
diff --git a/themes/Backend/ExtJs/backend/supplier/view/main/detail.js b/themes/Backend/ExtJs/backend/supplier/view/main/detail.js
index 30d7a3b0dcc..53a7ac210bd 100644
--- a/themes/Backend/ExtJs/backend/supplier/view/main/detail.js
+++ b/themes/Backend/ExtJs/backend/supplier/view/main/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Supplier
diff --git a/themes/Backend/ExtJs/backend/supplier/view/main/edit.js b/themes/Backend/ExtJs/backend/supplier/view/main/edit.js
index b49a8ccd2e3..335487518f6 100644
--- a/themes/Backend/ExtJs/backend/supplier/view/main/edit.js
+++ b/themes/Backend/ExtJs/backend/supplier/view/main/edit.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Supplier
diff --git a/themes/Backend/ExtJs/backend/supplier/view/main/list.js b/themes/Backend/ExtJs/backend/supplier/view/main/list.js
index 636df4a286c..72963ad26f4 100644
--- a/themes/Backend/ExtJs/backend/supplier/view/main/list.js
+++ b/themes/Backend/ExtJs/backend/supplier/view/main/list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Supplier
diff --git a/themes/Backend/ExtJs/backend/supplier/view/main/toolbar.js b/themes/Backend/ExtJs/backend/supplier/view/main/toolbar.js
index 6f22a2c973e..af6eee17679 100644
--- a/themes/Backend/ExtJs/backend/supplier/view/main/toolbar.js
+++ b/themes/Backend/ExtJs/backend/supplier/view/main/toolbar.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Supplier
diff --git a/themes/Backend/ExtJs/backend/systeminfo/app.js b/themes/Backend/ExtJs/backend/systeminfo/app.js
index cef58f37c38..d94653efa85 100644
--- a/themes/Backend/ExtJs/backend/systeminfo/app.js
+++ b/themes/Backend/ExtJs/backend/systeminfo/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Systeminfo
diff --git a/themes/Backend/ExtJs/backend/systeminfo/controller/main.js b/themes/Backend/ExtJs/backend/systeminfo/controller/main.js
index edc7c703eee..f7ce78bc4a9 100644
--- a/themes/Backend/ExtJs/backend/systeminfo/controller/main.js
+++ b/themes/Backend/ExtJs/backend/systeminfo/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Systeminfo
diff --git a/themes/Backend/ExtJs/backend/systeminfo/controller/systeminfo.js b/themes/Backend/ExtJs/backend/systeminfo/controller/systeminfo.js
index c4627dcf576..76dd89e7ef3 100644
--- a/themes/Backend/ExtJs/backend/systeminfo/controller/systeminfo.js
+++ b/themes/Backend/ExtJs/backend/systeminfo/controller/systeminfo.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Systeminfo
@@ -35,7 +34,7 @@
  * Systeminfo Controller of the systeminfo module.
  * It handles all actions made in the module.
  */
-// {block name="backend/systeminfo/controller/main"}
+// {block name="backend/systeminfo/controller/systeminfo"}
 Ext.define('Shopware.apps.Systeminfo.controller.Systeminfo', {
 
     /**
diff --git a/themes/Backend/ExtJs/backend/systeminfo/model/config.js b/themes/Backend/ExtJs/backend/systeminfo/model/config.js
index e428732a175..af08daabe07 100644
--- a/themes/Backend/ExtJs/backend/systeminfo/model/config.js
+++ b/themes/Backend/ExtJs/backend/systeminfo/model/config.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Systeminfo
diff --git a/themes/Backend/ExtJs/backend/systeminfo/model/file.js b/themes/Backend/ExtJs/backend/systeminfo/model/file.js
index 6985d3de776..2cd7bcacc90 100644
--- a/themes/Backend/ExtJs/backend/systeminfo/model/file.js
+++ b/themes/Backend/ExtJs/backend/systeminfo/model/file.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Systeminfo
diff --git a/themes/Backend/ExtJs/backend/systeminfo/model/optimizer.js b/themes/Backend/ExtJs/backend/systeminfo/model/optimizer.js
index 1130ca7a7cd..6eded94332a 100644
--- a/themes/Backend/ExtJs/backend/systeminfo/model/optimizer.js
+++ b/themes/Backend/ExtJs/backend/systeminfo/model/optimizer.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * Shopware Model - Version list systeminfo backend module.
  * This model represents a single shopware-config
diff --git a/themes/Backend/ExtJs/backend/systeminfo/model/path.js b/themes/Backend/ExtJs/backend/systeminfo/model/path.js
index 6b8f9f13354..637f3bd346c 100644
--- a/themes/Backend/ExtJs/backend/systeminfo/model/path.js
+++ b/themes/Backend/ExtJs/backend/systeminfo/model/path.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * Shopware Model - Path list systeminfo backend module.
  * This model represents a single shopware-path
diff --git a/themes/Backend/ExtJs/backend/systeminfo/model/version.js b/themes/Backend/ExtJs/backend/systeminfo/model/version.js
index 9edc825e26b..c472be80180 100644
--- a/themes/Backend/ExtJs/backend/systeminfo/model/version.js
+++ b/themes/Backend/ExtJs/backend/systeminfo/model/version.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * Shopware Model - Version list systeminfo backend module.
  * This model represents a single shopware-config
diff --git a/themes/Backend/ExtJs/backend/systeminfo/store/configs.js b/themes/Backend/ExtJs/backend/systeminfo/store/configs.js
index e3ba44cab01..f2ea42a3df3 100644
--- a/themes/Backend/ExtJs/backend/systeminfo/store/configs.js
+++ b/themes/Backend/ExtJs/backend/systeminfo/store/configs.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Systeminfo
diff --git a/themes/Backend/ExtJs/backend/systeminfo/store/files.js b/themes/Backend/ExtJs/backend/systeminfo/store/files.js
index 922eab40d6c..512bb7e425e 100644
--- a/themes/Backend/ExtJs/backend/systeminfo/store/files.js
+++ b/themes/Backend/ExtJs/backend/systeminfo/store/files.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Systeminfo
diff --git a/themes/Backend/ExtJs/backend/systeminfo/store/optimizers.js b/themes/Backend/ExtJs/backend/systeminfo/store/optimizers.js
index 6518554e8de..567fdc1d43c 100644
--- a/themes/Backend/ExtJs/backend/systeminfo/store/optimizers.js
+++ b/themes/Backend/ExtJs/backend/systeminfo/store/optimizers.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Systeminfo
diff --git a/themes/Backend/ExtJs/backend/systeminfo/store/paths.js b/themes/Backend/ExtJs/backend/systeminfo/store/paths.js
index c0e775789cd..91a118ef6ff 100644
--- a/themes/Backend/ExtJs/backend/systeminfo/store/paths.js
+++ b/themes/Backend/ExtJs/backend/systeminfo/store/paths.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Systeminfo
diff --git a/themes/Backend/ExtJs/backend/systeminfo/store/versions.js b/themes/Backend/ExtJs/backend/systeminfo/store/versions.js
index cf6d8ddad1e..1f126ec7f83 100644
--- a/themes/Backend/ExtJs/backend/systeminfo/store/versions.js
+++ b/themes/Backend/ExtJs/backend/systeminfo/store/versions.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Systeminfo
diff --git a/themes/Backend/ExtJs/backend/systeminfo/view/main/window.js b/themes/Backend/ExtJs/backend/systeminfo/view/main/window.js
index f20e66b59d4..1fc925ed5c6 100644
--- a/themes/Backend/ExtJs/backend/systeminfo/view/main/window.js
+++ b/themes/Backend/ExtJs/backend/systeminfo/view/main/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Systeminfo
diff --git a/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/configlist.js b/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/configlist.js
index c582fe5ab5b..6ca71fa8700 100644
--- a/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/configlist.js
+++ b/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/configlist.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Systeminfo
diff --git a/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/filelist.js b/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/filelist.js
index ee84ebb76f1..a30e6d947a7 100644
--- a/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/filelist.js
+++ b/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/filelist.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Systeminfo
diff --git a/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/optimizerlist.js b/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/optimizerlist.js
index 8f47fcb4e2b..97fa698f66d 100644
--- a/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/optimizerlist.js
+++ b/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/optimizerlist.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Systeminfo
diff --git a/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/pathlist.js b/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/pathlist.js
index a7cb0fd3d09..336361d98b5 100644
--- a/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/pathlist.js
+++ b/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/pathlist.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Systeminfo
diff --git a/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/phpinfo.js b/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/phpinfo.js
index 18872274757..5414b26b8f6 100644
--- a/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/phpinfo.js
+++ b/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/phpinfo.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Systeminfo
diff --git a/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/timezone.js b/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/timezone.js
index d7df2b9839b..fe26734420f 100644
--- a/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/timezone.js
+++ b/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/timezone.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Systeminfo
diff --git a/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/versionlist.js b/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/versionlist.js
index 6da0cdcea1c..3d4838f181d 100644
--- a/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/versionlist.js
+++ b/themes/Backend/ExtJs/backend/systeminfo/view/systeminfo/versionlist.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Systeminfo
diff --git a/themes/Backend/ExtJs/backend/tax/app.js b/themes/Backend/ExtJs/backend/tax/app.js
index 97ef43c0f5e..adae69c57a9 100644
--- a/themes/Backend/ExtJs/backend/tax/app.js
+++ b/themes/Backend/ExtJs/backend/tax/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * Shopware UI - Country Manager bootstrapper
  *
diff --git a/themes/Backend/ExtJs/backend/tax/controller/main.js b/themes/Backend/ExtJs/backend/tax/controller/main.js
index da745a3b2d6..ae7e40f6a21 100644
--- a/themes/Backend/ExtJs/backend/tax/controller/main.js
+++ b/themes/Backend/ExtJs/backend/tax/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * Shopware UI - User Manager Main Controller
  *
diff --git a/themes/Backend/ExtJs/backend/tax/model/areas.js b/themes/Backend/ExtJs/backend/tax/model/areas.js
index 0f4e8af7dfc..2c32715f663 100644
--- a/themes/Backend/ExtJs/backend/tax/model/areas.js
+++ b/themes/Backend/ExtJs/backend/tax/model/areas.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Tax
diff --git a/themes/Backend/ExtJs/backend/tax/model/countries.js b/themes/Backend/ExtJs/backend/tax/model/countries.js
index 2c5d830b037..c45e0edc47a 100644
--- a/themes/Backend/ExtJs/backend/tax/model/countries.js
+++ b/themes/Backend/ExtJs/backend/tax/model/countries.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Tax
diff --git a/themes/Backend/ExtJs/backend/tax/model/groups.js b/themes/Backend/ExtJs/backend/tax/model/groups.js
index 8691c5eacc7..b2e7195d64e 100644
--- a/themes/Backend/ExtJs/backend/tax/model/groups.js
+++ b/themes/Backend/ExtJs/backend/tax/model/groups.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Tax
diff --git a/themes/Backend/ExtJs/backend/tax/model/rules.js b/themes/Backend/ExtJs/backend/tax/model/rules.js
index 01cf9d6e0d5..d337dc00222 100644
--- a/themes/Backend/ExtJs/backend/tax/model/rules.js
+++ b/themes/Backend/ExtJs/backend/tax/model/rules.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Tax
diff --git a/themes/Backend/ExtJs/backend/tax/model/states.js b/themes/Backend/ExtJs/backend/tax/model/states.js
index e5f7e4f7de6..14183a00d5e 100644
--- a/themes/Backend/ExtJs/backend/tax/model/states.js
+++ b/themes/Backend/ExtJs/backend/tax/model/states.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Tax
diff --git a/themes/Backend/ExtJs/backend/tax/store/areas.js b/themes/Backend/ExtJs/backend/tax/store/areas.js
index d0b14715778..59219cf741a 100644
--- a/themes/Backend/ExtJs/backend/tax/store/areas.js
+++ b/themes/Backend/ExtJs/backend/tax/store/areas.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Tax
diff --git a/themes/Backend/ExtJs/backend/tax/store/countries.js b/themes/Backend/ExtJs/backend/tax/store/countries.js
index a4ef3752772..77249fdf5a8 100644
--- a/themes/Backend/ExtJs/backend/tax/store/countries.js
+++ b/themes/Backend/ExtJs/backend/tax/store/countries.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Tax
diff --git a/themes/Backend/ExtJs/backend/tax/store/groups.js b/themes/Backend/ExtJs/backend/tax/store/groups.js
index 318a217317c..810f6cda890 100644
--- a/themes/Backend/ExtJs/backend/tax/store/groups.js
+++ b/themes/Backend/ExtJs/backend/tax/store/groups.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Tax
diff --git a/themes/Backend/ExtJs/backend/tax/store/rules.js b/themes/Backend/ExtJs/backend/tax/store/rules.js
index 827a224f863..a6573a6833d 100644
--- a/themes/Backend/ExtJs/backend/tax/store/rules.js
+++ b/themes/Backend/ExtJs/backend/tax/store/rules.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Tax
diff --git a/themes/Backend/ExtJs/backend/tax/store/states.js b/themes/Backend/ExtJs/backend/tax/store/states.js
index c510c945c11..9be8b108012 100644
--- a/themes/Backend/ExtJs/backend/tax/store/states.js
+++ b/themes/Backend/ExtJs/backend/tax/store/states.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Tax
diff --git a/themes/Backend/ExtJs/backend/tax/view/main/rules.js b/themes/Backend/ExtJs/backend/tax/view/main/rules.js
index bbfbdac6385..1da4d24576d 100644
--- a/themes/Backend/ExtJs/backend/tax/view/main/rules.js
+++ b/themes/Backend/ExtJs/backend/tax/view/main/rules.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Tax
diff --git a/themes/Backend/ExtJs/backend/tax/view/main/tree.js b/themes/Backend/ExtJs/backend/tax/view/main/tree.js
index a93f00947ee..b5d73177801 100644
--- a/themes/Backend/ExtJs/backend/tax/view/main/tree.js
+++ b/themes/Backend/ExtJs/backend/tax/view/main/tree.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Site
diff --git a/themes/Backend/ExtJs/backend/tax/view/main/window.js b/themes/Backend/ExtJs/backend/tax/view/main/window.js
index 55589031948..fd31f906bc8 100644
--- a/themes/Backend/ExtJs/backend/tax/view/main/window.js
+++ b/themes/Backend/ExtJs/backend/tax/view/main/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Customer
diff --git a/themes/Backend/ExtJs/backend/theme/app.js b/themes/Backend/ExtJs/backend/theme/app.js
index 9070e939a6e..db1b8648e81 100644
--- a/themes/Backend/ExtJs/backend/theme/app.js
+++ b/themes/Backend/ExtJs/backend/theme/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/theme/controller/detail.js b/themes/Backend/ExtJs/backend/theme/controller/detail.js
index 0c973ca3fa7..02c8b977ba8 100644
--- a/themes/Backend/ExtJs/backend/theme/controller/detail.js
+++ b/themes/Backend/ExtJs/backend/theme/controller/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/theme/controller/list.js b/themes/Backend/ExtJs/backend/theme/controller/list.js
index 18af29a7a02..96631686784 100644
--- a/themes/Backend/ExtJs/backend/theme/controller/list.js
+++ b/themes/Backend/ExtJs/backend/theme/controller/list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/theme/controller/settings.js b/themes/Backend/ExtJs/backend/theme/controller/settings.js
index 2bcf8ffcfff..5f55c9d429a 100644
--- a/themes/Backend/ExtJs/backend/theme/controller/settings.js
+++ b/themes/Backend/ExtJs/backend/theme/controller/settings.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/theme/model/config_set.js b/themes/Backend/ExtJs/backend/theme/model/config_set.js
index da68768b9b3..869eb00f154 100644
--- a/themes/Backend/ExtJs/backend/theme/model/config_set.js
+++ b/themes/Backend/ExtJs/backend/theme/model/config_set.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/theme/model/config_value.js b/themes/Backend/ExtJs/backend/theme/model/config_value.js
index 634559207ab..79469e549bd 100644
--- a/themes/Backend/ExtJs/backend/theme/model/config_value.js
+++ b/themes/Backend/ExtJs/backend/theme/model/config_value.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/theme/model/element.js b/themes/Backend/ExtJs/backend/theme/model/element.js
index 8fd12b04754..c033273aff2 100644
--- a/themes/Backend/ExtJs/backend/theme/model/element.js
+++ b/themes/Backend/ExtJs/backend/theme/model/element.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/theme/model/layout.js b/themes/Backend/ExtJs/backend/theme/model/layout.js
index a0bad3864ba..fa2b1605b7a 100644
--- a/themes/Backend/ExtJs/backend/theme/model/layout.js
+++ b/themes/Backend/ExtJs/backend/theme/model/layout.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/theme/model/settings.js b/themes/Backend/ExtJs/backend/theme/model/settings.js
index 7b40668745b..449f1518db6 100644
--- a/themes/Backend/ExtJs/backend/theme/model/settings.js
+++ b/themes/Backend/ExtJs/backend/theme/model/settings.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/theme/model/theme.js b/themes/Backend/ExtJs/backend/theme/model/theme.js
index 31e61831444..993526ab1ab 100644
--- a/themes/Backend/ExtJs/backend/theme/model/theme.js
+++ b/themes/Backend/ExtJs/backend/theme/model/theme.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/theme/store/config_sets.js b/themes/Backend/ExtJs/backend/theme/store/config_sets.js
index 2cc4cdb1743..e41fdf9c5d7 100644
--- a/themes/Backend/ExtJs/backend/theme/store/config_sets.js
+++ b/themes/Backend/ExtJs/backend/theme/store/config_sets.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/theme/store/theme.js b/themes/Backend/ExtJs/backend/theme/store/theme.js
index c48ea661994..6ddcba154db 100644
--- a/themes/Backend/ExtJs/backend/theme/store/theme.js
+++ b/themes/Backend/ExtJs/backend/theme/store/theme.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/theme/view/config_sets/window.js b/themes/Backend/ExtJs/backend/theme/view/config_sets/window.js
index eb37e3377b2..842ea209513 100644
--- a/themes/Backend/ExtJs/backend/theme/view/config_sets/window.js
+++ b/themes/Backend/ExtJs/backend/theme/view/config_sets/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/theme/main"}
diff --git a/themes/Backend/ExtJs/backend/theme/view/create/theme.js b/themes/Backend/ExtJs/backend/theme/view/create/theme.js
index 4273c51a323..30560316d67 100644
--- a/themes/Backend/ExtJs/backend/theme/view/create/theme.js
+++ b/themes/Backend/ExtJs/backend/theme/view/create/theme.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/theme/view/create/window.js b/themes/Backend/ExtJs/backend/theme/view/create/window.js
index 37cc8eeba8b..e69db032ec8 100644
--- a/themes/Backend/ExtJs/backend/theme/view/create/window.js
+++ b/themes/Backend/ExtJs/backend/theme/view/create/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/theme/view/detail/containers/field_set.js b/themes/Backend/ExtJs/backend/theme/view/detail/containers/field_set.js
index 16d8f5925b4..64d0dd7a4b7 100644
--- a/themes/Backend/ExtJs/backend/theme/view/detail/containers/field_set.js
+++ b/themes/Backend/ExtJs/backend/theme/view/detail/containers/field_set.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 Ext.define('Shopware.apps.Theme.view.detail.containers.FieldSet', {
diff --git a/themes/Backend/ExtJs/backend/theme/view/detail/containers/tab.js b/themes/Backend/ExtJs/backend/theme/view/detail/containers/tab.js
index da4e9776b5f..f5c09067e51 100644
--- a/themes/Backend/ExtJs/backend/theme/view/detail/containers/tab.js
+++ b/themes/Backend/ExtJs/backend/theme/view/detail/containers/tab.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 Ext.define('Shopware.apps.Theme.view.detail.containers.Tab', {
diff --git a/themes/Backend/ExtJs/backend/theme/view/detail/containers/tab_panel.js b/themes/Backend/ExtJs/backend/theme/view/detail/containers/tab_panel.js
index 830af518624..507064fcb21 100644
--- a/themes/Backend/ExtJs/backend/theme/view/detail/containers/tab_panel.js
+++ b/themes/Backend/ExtJs/backend/theme/view/detail/containers/tab_panel.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 Ext.define('Shopware.apps.Theme.view.detail.containers.TabPanel', {
diff --git a/themes/Backend/ExtJs/backend/theme/view/detail/fields/checkbox_field.js b/themes/Backend/ExtJs/backend/theme/view/detail/fields/checkbox_field.js
index 2f11c4f3fe3..6aa48abc03e 100644
--- a/themes/Backend/ExtJs/backend/theme/view/detail/fields/checkbox_field.js
+++ b/themes/Backend/ExtJs/backend/theme/view/detail/fields/checkbox_field.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/theme/view/detail/fields/color_picker.js b/themes/Backend/ExtJs/backend/theme/view/detail/fields/color_picker.js
index 7f79448d6d3..06234115523 100644
--- a/themes/Backend/ExtJs/backend/theme/view/detail/fields/color_picker.js
+++ b/themes/Backend/ExtJs/backend/theme/view/detail/fields/color_picker.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/theme/main"}
diff --git a/themes/Backend/ExtJs/backend/theme/view/detail/fields/date_field.js b/themes/Backend/ExtJs/backend/theme/view/detail/fields/date_field.js
index d144dd063c9..9627b6cbf26 100644
--- a/themes/Backend/ExtJs/backend/theme/view/detail/fields/date_field.js
+++ b/themes/Backend/ExtJs/backend/theme/view/detail/fields/date_field.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/theme/view/detail/fields/em_field.js b/themes/Backend/ExtJs/backend/theme/view/detail/fields/em_field.js
index ad4fbe6f496..56847c2dfec 100644
--- a/themes/Backend/ExtJs/backend/theme/view/detail/fields/em_field.js
+++ b/themes/Backend/ExtJs/backend/theme/view/detail/fields/em_field.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/theme/view/detail/fields/media_selection.js b/themes/Backend/ExtJs/backend/theme/view/detail/fields/media_selection.js
index ec203d7fc7c..46f5ee23356 100644
--- a/themes/Backend/ExtJs/backend/theme/view/detail/fields/media_selection.js
+++ b/themes/Backend/ExtJs/backend/theme/view/detail/fields/media_selection.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/theme/view/detail/fields/no_url_field.js b/themes/Backend/ExtJs/backend/theme/view/detail/fields/no_url_field.js
new file mode 100644
index 00000000000..c93314d7dbb
--- /dev/null
+++ b/themes/Backend/ExtJs/backend/theme/view/detail/fields/no_url_field.js
@@ -0,0 +1,42 @@
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
+ */
+
+/**
+ * Shopware Application
+ *
+ * @category  Shopware
+ * @package   Shopware
+ * @copyright Copyright (c) shopware AG (http://www.shopware.de)
+ */
+
+//{namespace name="backend/theme/main"}
+
+//{block name="backend/theme/view/detail/fields/nourl"}
+
+Ext.define('Shopware.apps.Theme.view.detail.NoUrlField', {
+    extend: 'Ext.form.field.Text',
+
+    alias: 'widget.theme-nourl-field'
+
+});
+
+//{/block}
diff --git a/themes/Backend/ExtJs/backend/theme/view/detail/fields/percent_field.js b/themes/Backend/ExtJs/backend/theme/view/detail/fields/percent_field.js
index c1c1e6d6404..b8a373ec0cc 100644
--- a/themes/Backend/ExtJs/backend/theme/view/detail/fields/percent_field.js
+++ b/themes/Backend/ExtJs/backend/theme/view/detail/fields/percent_field.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/theme/view/detail/fields/pixel_field.js b/themes/Backend/ExtJs/backend/theme/view/detail/fields/pixel_field.js
index 29afb97bfd2..e529c1e738f 100644
--- a/themes/Backend/ExtJs/backend/theme/view/detail/fields/pixel_field.js
+++ b/themes/Backend/ExtJs/backend/theme/view/detail/fields/pixel_field.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/theme/view/detail/fields/select_field.js b/themes/Backend/ExtJs/backend/theme/view/detail/fields/select_field.js
index 6c77f6cb7bb..bf1db1e3582 100644
--- a/themes/Backend/ExtJs/backend/theme/view/detail/fields/select_field.js
+++ b/themes/Backend/ExtJs/backend/theme/view/detail/fields/select_field.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/theme/view/detail/fields/suffix.js b/themes/Backend/ExtJs/backend/theme/view/detail/fields/suffix.js
index da106fa7ee2..94d4daa279d 100644
--- a/themes/Backend/ExtJs/backend/theme/view/detail/fields/suffix.js
+++ b/themes/Backend/ExtJs/backend/theme/view/detail/fields/suffix.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/theme/view/detail/fields/text_area_field.js b/themes/Backend/ExtJs/backend/theme/view/detail/fields/text_area_field.js
index b3114b044e4..3369eae3a26 100644
--- a/themes/Backend/ExtJs/backend/theme/view/detail/fields/text_area_field.js
+++ b/themes/Backend/ExtJs/backend/theme/view/detail/fields/text_area_field.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/theme/view/detail/fields/text_field.js b/themes/Backend/ExtJs/backend/theme/view/detail/fields/text_field.js
index 9cb7c83b45c..c89d470ab09 100644
--- a/themes/Backend/ExtJs/backend/theme/view/detail/fields/text_field.js
+++ b/themes/Backend/ExtJs/backend/theme/view/detail/fields/text_field.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/theme/view/detail/theme.js b/themes/Backend/ExtJs/backend/theme/view/detail/theme.js
index e1e38b1032a..23774e1a54b 100644
--- a/themes/Backend/ExtJs/backend/theme/view/detail/theme.js
+++ b/themes/Backend/ExtJs/backend/theme/view/detail/theme.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/theme/view/detail/window.js b/themes/Backend/ExtJs/backend/theme/view/detail/window.js
index bcb90f1b161..ec9e760283a 100644
--- a/themes/Backend/ExtJs/backend/theme/view/detail/window.js
+++ b/themes/Backend/ExtJs/backend/theme/view/detail/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/theme/view/list/extensions/info.js b/themes/Backend/ExtJs/backend/theme/view/list/extensions/info.js
index 4b9267ab260..be43813ec8e 100644
--- a/themes/Backend/ExtJs/backend/theme/view/list/extensions/info.js
+++ b/themes/Backend/ExtJs/backend/theme/view/list/extensions/info.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/theme/view/list/theme.js b/themes/Backend/ExtJs/backend/theme/view/list/theme.js
index d3e1c877be5..15f78af245d 100644
--- a/themes/Backend/ExtJs/backend/theme/view/list/theme.js
+++ b/themes/Backend/ExtJs/backend/theme/view/list/theme.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/theme/view/list/window.js b/themes/Backend/ExtJs/backend/theme/view/list/window.js
index 837ebce22f2..3d824dde393 100644
--- a/themes/Backend/ExtJs/backend/theme/view/list/window.js
+++ b/themes/Backend/ExtJs/backend/theme/view/list/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/theme/view/settings/settings.js b/themes/Backend/ExtJs/backend/theme/view/settings/settings.js
index 5fb7105cfb2..3d10fb30c15 100644
--- a/themes/Backend/ExtJs/backend/theme/view/settings/settings.js
+++ b/themes/Backend/ExtJs/backend/theme/view/settings/settings.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 /**
diff --git a/themes/Backend/ExtJs/backend/theme/view/settings/window.js b/themes/Backend/ExtJs/backend/theme/view/settings/window.js
index bff220b1c0c..87e87ab7c62 100644
--- a/themes/Backend/ExtJs/backend/theme/view/settings/window.js
+++ b/themes/Backend/ExtJs/backend/theme/view/settings/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 //{namespace name="backend/theme/main"}
diff --git a/themes/Backend/ExtJs/backend/translation/app.js b/themes/Backend/ExtJs/backend/translation/app.js
index 3a31ae398d9..422f307aa84 100644
--- a/themes/Backend/ExtJs/backend/translation/app.js
+++ b/themes/Backend/ExtJs/backend/translation/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Translation
diff --git a/themes/Backend/ExtJs/backend/translation/controller/main.js b/themes/Backend/ExtJs/backend/translation/controller/main.js
index 9f8cc1b7a34..db17d85e141 100644
--- a/themes/Backend/ExtJs/backend/translation/controller/main.js
+++ b/themes/Backend/ExtJs/backend/translation/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Translation
diff --git a/themes/Backend/ExtJs/backend/translation/model/language.js b/themes/Backend/ExtJs/backend/translation/model/language.js
index 6ea354a6afd..b5a51acf620 100644
--- a/themes/Backend/ExtJs/backend/translation/model/language.js
+++ b/themes/Backend/ExtJs/backend/translation/model/language.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Translation
diff --git a/themes/Backend/ExtJs/backend/translation/store/language.js b/themes/Backend/ExtJs/backend/translation/store/language.js
index 85d7aa3825b..3bdf1050f72 100644
--- a/themes/Backend/ExtJs/backend/translation/store/language.js
+++ b/themes/Backend/ExtJs/backend/translation/store/language.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Translation
diff --git a/themes/Backend/ExtJs/backend/translation/view/main/form.js b/themes/Backend/ExtJs/backend/translation/view/main/form.js
index 9c64646da69..85084a6077c 100644
--- a/themes/Backend/ExtJs/backend/translation/view/main/form.js
+++ b/themes/Backend/ExtJs/backend/translation/view/main/form.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Translation
diff --git a/themes/Backend/ExtJs/backend/translation/view/main/navigation.js b/themes/Backend/ExtJs/backend/translation/view/main/navigation.js
index e954606b3e5..c11a0bf760e 100644
--- a/themes/Backend/ExtJs/backend/translation/view/main/navigation.js
+++ b/themes/Backend/ExtJs/backend/translation/view/main/navigation.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Translation
diff --git a/themes/Backend/ExtJs/backend/translation/view/main/services.js b/themes/Backend/ExtJs/backend/translation/view/main/services.js
index 18bdd094083..3a7098de5d4 100644
--- a/themes/Backend/ExtJs/backend/translation/view/main/services.js
+++ b/themes/Backend/ExtJs/backend/translation/view/main/services.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Translation
@@ -31,10 +30,8 @@
 
 /**
  * Shopware UI - Translation Manager Services Window
- *
- * todo@all: Documentation
  */
-//{block name="backend/translation/view/main/window"}
+//{block name="backend/translation/view/main/services"}
 Ext.define('Shopware.apps.Translation.view.main.Services', {
     /** @lends Ext.window.Window# */
 
diff --git a/themes/Backend/ExtJs/backend/translation/view/main/toolbar.js b/themes/Backend/ExtJs/backend/translation/view/main/toolbar.js
index d4511f3a37b..2ebcfc60e1e 100644
--- a/themes/Backend/ExtJs/backend/translation/view/main/toolbar.js
+++ b/themes/Backend/ExtJs/backend/translation/view/main/toolbar.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Translation
diff --git a/themes/Backend/ExtJs/backend/translation/view/main/window.js b/themes/Backend/ExtJs/backend/translation/view/main/window.js
index 7033463badd..166a6076665 100644
--- a/themes/Backend/ExtJs/backend/translation/view/main/window.js
+++ b/themes/Backend/ExtJs/backend/translation/view/main/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Translation
diff --git a/themes/Backend/ExtJs/backend/user_manager/app.js b/themes/Backend/ExtJs/backend/user_manager/app.js
index f2374256fe2..45a58f737cd 100644
--- a/themes/Backend/ExtJs/backend/user_manager/app.js
+++ b/themes/Backend/ExtJs/backend/user_manager/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    UserManager
diff --git a/themes/Backend/ExtJs/backend/user_manager/controller/main.js b/themes/Backend/ExtJs/backend/user_manager/controller/main.js
index 1e02269e3db..4879de67bcb 100644
--- a/themes/Backend/ExtJs/backend/user_manager/controller/main.js
+++ b/themes/Backend/ExtJs/backend/user_manager/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    UserManager
diff --git a/themes/Backend/ExtJs/backend/user_manager/controller/roles.js b/themes/Backend/ExtJs/backend/user_manager/controller/roles.js
index af45780e127..4ead14413ee 100644
--- a/themes/Backend/ExtJs/backend/user_manager/controller/roles.js
+++ b/themes/Backend/ExtJs/backend/user_manager/controller/roles.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    UserManager
diff --git a/themes/Backend/ExtJs/backend/user_manager/controller/rules.js b/themes/Backend/ExtJs/backend/user_manager/controller/rules.js
index 32d4a0dd5c0..9dbe4b5de55 100644
--- a/themes/Backend/ExtJs/backend/user_manager/controller/rules.js
+++ b/themes/Backend/ExtJs/backend/user_manager/controller/rules.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    UserManager
diff --git a/themes/Backend/ExtJs/backend/user_manager/controller/user.js b/themes/Backend/ExtJs/backend/user_manager/controller/user.js
index 8c86f4516ee..5bbe81b4a54 100644
--- a/themes/Backend/ExtJs/backend/user_manager/controller/user.js
+++ b/themes/Backend/ExtJs/backend/user_manager/controller/user.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    UserManager
diff --git a/themes/Backend/ExtJs/backend/user_manager/model/detail.js b/themes/Backend/ExtJs/backend/user_manager/model/detail.js
index eae256fc4bb..0ac9155abd1 100644
--- a/themes/Backend/ExtJs/backend/user_manager/model/detail.js
+++ b/themes/Backend/ExtJs/backend/user_manager/model/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    UserManager
diff --git a/themes/Backend/ExtJs/backend/user_manager/model/locale.js b/themes/Backend/ExtJs/backend/user_manager/model/locale.js
index df3e4a2c5b0..34f37313ca9 100644
--- a/themes/Backend/ExtJs/backend/user_manager/model/locale.js
+++ b/themes/Backend/ExtJs/backend/user_manager/model/locale.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Login
diff --git a/themes/Backend/ExtJs/backend/user_manager/model/privilege.js b/themes/Backend/ExtJs/backend/user_manager/model/privilege.js
index 7d0f3bdb06d..98e8876fc92 100644
--- a/themes/Backend/ExtJs/backend/user_manager/model/privilege.js
+++ b/themes/Backend/ExtJs/backend/user_manager/model/privilege.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    UserManager
diff --git a/themes/Backend/ExtJs/backend/user_manager/model/resource.js b/themes/Backend/ExtJs/backend/user_manager/model/resource.js
index 87e6ce58cde..b7015e79f71 100644
--- a/themes/Backend/ExtJs/backend/user_manager/model/resource.js
+++ b/themes/Backend/ExtJs/backend/user_manager/model/resource.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    UserManager
diff --git a/themes/Backend/ExtJs/backend/user_manager/model/roles.js b/themes/Backend/ExtJs/backend/user_manager/model/roles.js
index f8db47e9a95..6f1138dbf02 100644
--- a/themes/Backend/ExtJs/backend/user_manager/model/roles.js
+++ b/themes/Backend/ExtJs/backend/user_manager/model/roles.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    UserManager
diff --git a/themes/Backend/ExtJs/backend/user_manager/model/rules.js b/themes/Backend/ExtJs/backend/user_manager/model/rules.js
index f0d94202a28..18b5376ac26 100644
--- a/themes/Backend/ExtJs/backend/user_manager/model/rules.js
+++ b/themes/Backend/ExtJs/backend/user_manager/model/rules.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    UserManager
diff --git a/themes/Backend/ExtJs/backend/user_manager/model/user.js b/themes/Backend/ExtJs/backend/user_manager/model/user.js
index 65457d18325..1324f00a164 100644
--- a/themes/Backend/ExtJs/backend/user_manager/model/user.js
+++ b/themes/Backend/ExtJs/backend/user_manager/model/user.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    UserManager
diff --git a/themes/Backend/ExtJs/backend/user_manager/model/user_detail.js b/themes/Backend/ExtJs/backend/user_manager/model/user_detail.js
index 7c3dc3239f2..d750c12f13c 100644
--- a/themes/Backend/ExtJs/backend/user_manager/model/user_detail.js
+++ b/themes/Backend/ExtJs/backend/user_manager/model/user_detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    UserManager
@@ -29,14 +28,12 @@
 
 /**
  * Shopware User-Manager - User details model
- *
- * todo@all: Documentation
  */
-//{block name="backend/user_manager/model/detail"}
+//{block name="backend/user_manager/model/user_detail"}
 Ext.define('Shopware.apps.UserManager.model.UserDetail', {
     extend: 'Ext.data.Model',
     fields: [
-        //{block name="backend/user_manager/model/detail/fields"}{/block}
+        //{block name="backend/user_manager/model/user_detail/fields"}{/block}
         'id',
         'username',
         'localeId',
diff --git a/themes/Backend/ExtJs/backend/user_manager/store/detail.js b/themes/Backend/ExtJs/backend/user_manager/store/detail.js
index c3032eed2a6..4d2e242a9cf 100644
--- a/themes/Backend/ExtJs/backend/user_manager/store/detail.js
+++ b/themes/Backend/ExtJs/backend/user_manager/store/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    UserManager
diff --git a/themes/Backend/ExtJs/backend/user_manager/store/locale.js b/themes/Backend/ExtJs/backend/user_manager/store/locale.js
index 41282f047bf..8b7730d5251 100644
--- a/themes/Backend/ExtJs/backend/user_manager/store/locale.js
+++ b/themes/Backend/ExtJs/backend/user_manager/store/locale.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Login
diff --git a/themes/Backend/ExtJs/backend/user_manager/store/roles.js b/themes/Backend/ExtJs/backend/user_manager/store/roles.js
index efeb7e938f8..42007e821d9 100644
--- a/themes/Backend/ExtJs/backend/user_manager/store/roles.js
+++ b/themes/Backend/ExtJs/backend/user_manager/store/roles.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    UserManager
diff --git a/themes/Backend/ExtJs/backend/user_manager/store/rules.js b/themes/Backend/ExtJs/backend/user_manager/store/rules.js
index 65aa5a7b9f8..f809617d249 100644
--- a/themes/Backend/ExtJs/backend/user_manager/store/rules.js
+++ b/themes/Backend/ExtJs/backend/user_manager/store/rules.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    UserManager
diff --git a/themes/Backend/ExtJs/backend/user_manager/store/user.js b/themes/Backend/ExtJs/backend/user_manager/store/user.js
index 42238e79bc0..7671c8b346f 100644
--- a/themes/Backend/ExtJs/backend/user_manager/store/user.js
+++ b/themes/Backend/ExtJs/backend/user_manager/store/user.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    UserManager
diff --git a/themes/Backend/ExtJs/backend/user_manager/store/user_detail.js b/themes/Backend/ExtJs/backend/user_manager/store/user_detail.js
index 6eed165aa9d..a725f3c64b1 100644
--- a/themes/Backend/ExtJs/backend/user_manager/store/user_detail.js
+++ b/themes/Backend/ExtJs/backend/user_manager/store/user_detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    UserManager
diff --git a/themes/Backend/ExtJs/backend/user_manager/view/main/window.js b/themes/Backend/ExtJs/backend/user_manager/view/main/window.js
index ecb0e064f94..37bfcf17d89 100644
--- a/themes/Backend/ExtJs/backend/user_manager/view/main/window.js
+++ b/themes/Backend/ExtJs/backend/user_manager/view/main/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    UserManager
diff --git a/themes/Backend/ExtJs/backend/user_manager/view/roles/form.js b/themes/Backend/ExtJs/backend/user_manager/view/roles/form.js
index d2b674aacfd..89a8789a466 100644
--- a/themes/Backend/ExtJs/backend/user_manager/view/roles/form.js
+++ b/themes/Backend/ExtJs/backend/user_manager/view/roles/form.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    UserManager
diff --git a/themes/Backend/ExtJs/backend/user_manager/view/roles/list.js b/themes/Backend/ExtJs/backend/user_manager/view/roles/list.js
index 2883770cfec..78832f04237 100644
--- a/themes/Backend/ExtJs/backend/user_manager/view/roles/list.js
+++ b/themes/Backend/ExtJs/backend/user_manager/view/roles/list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    UserManager
diff --git a/themes/Backend/ExtJs/backend/user_manager/view/rules/add.js b/themes/Backend/ExtJs/backend/user_manager/view/rules/add.js
index 49f28baa319..88184c572a8 100644
--- a/themes/Backend/ExtJs/backend/user_manager/view/rules/add.js
+++ b/themes/Backend/ExtJs/backend/user_manager/view/rules/add.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    UserManager
diff --git a/themes/Backend/ExtJs/backend/user_manager/view/rules/tree.js b/themes/Backend/ExtJs/backend/user_manager/view/rules/tree.js
index 08b4db3e731..e8e2a3d5ac4 100644
--- a/themes/Backend/ExtJs/backend/user_manager/view/rules/tree.js
+++ b/themes/Backend/ExtJs/backend/user_manager/view/rules/tree.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    UserManager
diff --git a/themes/Backend/ExtJs/backend/user_manager/view/user/create.js b/themes/Backend/ExtJs/backend/user_manager/view/user/create.js
index 7c3843c39ad..63941c29ab2 100644
--- a/themes/Backend/ExtJs/backend/user_manager/view/user/create.js
+++ b/themes/Backend/ExtJs/backend/user_manager/view/user/create.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    UserManager
diff --git a/themes/Backend/ExtJs/backend/user_manager/view/user/list.js b/themes/Backend/ExtJs/backend/user_manager/view/user/list.js
index 404d7d5fb7b..d0a8bb819de 100644
--- a/themes/Backend/ExtJs/backend/user_manager/view/user/list.js
+++ b/themes/Backend/ExtJs/backend/user_manager/view/user/list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    UserManager
diff --git a/themes/Backend/ExtJs/backend/vote/app.js b/themes/Backend/ExtJs/backend/vote/app.js
index f414a11ee25..7229da86730 100755
--- a/themes/Backend/ExtJs/backend/vote/app.js
+++ b/themes/Backend/ExtJs/backend/vote/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Vote
diff --git a/themes/Backend/ExtJs/backend/vote/controller/main.js b/themes/Backend/ExtJs/backend/vote/controller/main.js
index a971d042951..7300961cad9 100755
--- a/themes/Backend/ExtJs/backend/vote/controller/main.js
+++ b/themes/Backend/ExtJs/backend/vote/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Vote
diff --git a/themes/Backend/ExtJs/backend/vote/model/accept_response.js b/themes/Backend/ExtJs/backend/vote/model/accept_response.js
index 6e3c204f54b..c9bef12eafa 100644
--- a/themes/Backend/ExtJs/backend/vote/model/accept_response.js
+++ b/themes/Backend/ExtJs/backend/vote/model/accept_response.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Vote
diff --git a/themes/Backend/ExtJs/backend/vote/model/vote.js b/themes/Backend/ExtJs/backend/vote/model/vote.js
index 235cbb9c1de..2282355da03 100755
--- a/themes/Backend/ExtJs/backend/vote/model/vote.js
+++ b/themes/Backend/ExtJs/backend/vote/model/vote.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Vote
diff --git a/themes/Backend/ExtJs/backend/vote/store/vote.js b/themes/Backend/ExtJs/backend/vote/store/vote.js
index 222b2f5fb38..0dda8a406e5 100755
--- a/themes/Backend/ExtJs/backend/vote/store/vote.js
+++ b/themes/Backend/ExtJs/backend/vote/store/vote.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Vote
diff --git a/themes/Backend/ExtJs/backend/vote/view/detail/vote.js b/themes/Backend/ExtJs/backend/vote/view/detail/vote.js
index 69bc5a369b6..6e409d6beaa 100755
--- a/themes/Backend/ExtJs/backend/vote/view/detail/vote.js
+++ b/themes/Backend/ExtJs/backend/vote/view/detail/vote.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Vote
diff --git a/themes/Backend/ExtJs/backend/vote/view/detail/window.js b/themes/Backend/ExtJs/backend/vote/view/detail/window.js
index ba2360326a1..081e20d2bbf 100755
--- a/themes/Backend/ExtJs/backend/vote/view/detail/window.js
+++ b/themes/Backend/ExtJs/backend/vote/view/detail/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Vote
diff --git a/themes/Backend/ExtJs/backend/vote/view/list/extensions/filter.js b/themes/Backend/ExtJs/backend/vote/view/list/extensions/filter.js
index 72e350f4126..66449140bbc 100644
--- a/themes/Backend/ExtJs/backend/vote/view/list/extensions/filter.js
+++ b/themes/Backend/ExtJs/backend/vote/view/list/extensions/filter.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Vote
diff --git a/themes/Backend/ExtJs/backend/vote/view/list/extensions/info.js b/themes/Backend/ExtJs/backend/vote/view/list/extensions/info.js
index 389e6f712b3..5c3af3e401c 100644
--- a/themes/Backend/ExtJs/backend/vote/view/list/extensions/info.js
+++ b/themes/Backend/ExtJs/backend/vote/view/list/extensions/info.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Vote
diff --git a/themes/Backend/ExtJs/backend/vote/view/list/progress.js b/themes/Backend/ExtJs/backend/vote/view/list/progress.js
index 5d6407176be..3fda9b615fa 100644
--- a/themes/Backend/ExtJs/backend/vote/view/list/progress.js
+++ b/themes/Backend/ExtJs/backend/vote/view/list/progress.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Vote
diff --git a/themes/Backend/ExtJs/backend/vote/view/list/vote.js b/themes/Backend/ExtJs/backend/vote/view/list/vote.js
index 0a023f804a8..0a8e28c616c 100755
--- a/themes/Backend/ExtJs/backend/vote/view/list/vote.js
+++ b/themes/Backend/ExtJs/backend/vote/view/list/vote.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Vote
diff --git a/themes/Backend/ExtJs/backend/vote/view/list/window.js b/themes/Backend/ExtJs/backend/vote/view/list/window.js
index 2683c6e872b..af27a688ff1 100755
--- a/themes/Backend/ExtJs/backend/vote/view/list/window.js
+++ b/themes/Backend/ExtJs/backend/vote/view/list/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Vote
diff --git a/themes/Backend/ExtJs/backend/vote/view/point_helper.js b/themes/Backend/ExtJs/backend/vote/view/point_helper.js
index 1725ed389df..733b4410c65 100644
--- a/themes/Backend/ExtJs/backend/vote/view/point_helper.js
+++ b/themes/Backend/ExtJs/backend/vote/view/point_helper.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Vote
diff --git a/themes/Backend/ExtJs/backend/voucher/app.js b/themes/Backend/ExtJs/backend/voucher/app.js
index e8e2cf0d23a..1ead7f3063d 100644
--- a/themes/Backend/ExtJs/backend/voucher/app.js
+++ b/themes/Backend/ExtJs/backend/voucher/app.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Voucher
diff --git a/themes/Backend/ExtJs/backend/voucher/controller/code.js b/themes/Backend/ExtJs/backend/voucher/controller/code.js
index dccda460cd0..f09f4c9f7b2 100644
--- a/themes/Backend/ExtJs/backend/voucher/controller/code.js
+++ b/themes/Backend/ExtJs/backend/voucher/controller/code.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Voucher
@@ -265,8 +264,15 @@ Ext.define('Shopware.apps.Voucher.controller.Code', {
         var me = this,
             searchString = Ext.String.trim(value),
             store = me.subApplication.getStore('Code');
-        store.filter('filter', searchString);
+
         store.filters.clear();
+
+        if (searchString.length <= 0) {
+            store.load();
+            return;
+        }
+
+        store.filter('filter', searchString);
     },
 
     /**
diff --git a/themes/Backend/ExtJs/backend/voucher/controller/main.js b/themes/Backend/ExtJs/backend/voucher/controller/main.js
index ba69d6ae99a..a463dd054f2 100644
--- a/themes/Backend/ExtJs/backend/voucher/controller/main.js
+++ b/themes/Backend/ExtJs/backend/voucher/controller/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Voucher
diff --git a/themes/Backend/ExtJs/backend/voucher/controller/voucher.js b/themes/Backend/ExtJs/backend/voucher/controller/voucher.js
index bee5270254a..ea26cc8befa 100644
--- a/themes/Backend/ExtJs/backend/voucher/controller/voucher.js
+++ b/themes/Backend/ExtJs/backend/voucher/controller/voucher.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Voucher
@@ -167,11 +166,16 @@ Ext.define('Shopware.apps.Voucher.controller.Voucher', {
             scope: this,
             callback: function (records, operation, success) {
                 var record = records[0],
-                    mode = record.data.modus;
+                    mode = record.data.modus,
+                    codeStore = me.getStore('Code');
+
+                codeStore.filters.clear();
+                codeStore.clearData();
+                codeStore.currentPage = 1;
 
                 me.getView('voucher.Window').create({
                     record: record,
-                    codeStore: me.getStore('Code'),
+                    codeStore: codeStore,
                     taxStore: me.getStore('Tax')
                 });
 
diff --git a/themes/Backend/ExtJs/backend/voucher/model/code.js b/themes/Backend/ExtJs/backend/voucher/model/code.js
index 6b61e14a1d7..7bb8471712a 100644
--- a/themes/Backend/ExtJs/backend/voucher/model/code.js
+++ b/themes/Backend/ExtJs/backend/voucher/model/code.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Voucher
diff --git a/themes/Backend/ExtJs/backend/voucher/model/detail.js b/themes/Backend/ExtJs/backend/voucher/model/detail.js
index bb6d4b3f74d..00f997a56ef 100644
--- a/themes/Backend/ExtJs/backend/voucher/model/detail.js
+++ b/themes/Backend/ExtJs/backend/voucher/model/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Voucher
diff --git a/themes/Backend/ExtJs/backend/voucher/model/main.js b/themes/Backend/ExtJs/backend/voucher/model/main.js
index ee944ba719d..6f1ea3edc1a 100644
--- a/themes/Backend/ExtJs/backend/voucher/model/main.js
+++ b/themes/Backend/ExtJs/backend/voucher/model/main.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Voucher
diff --git a/themes/Backend/ExtJs/backend/voucher/model/tax.js b/themes/Backend/ExtJs/backend/voucher/model/tax.js
index 9be4e139e5b..de7c7900614 100644
--- a/themes/Backend/ExtJs/backend/voucher/model/tax.js
+++ b/themes/Backend/ExtJs/backend/voucher/model/tax.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Voucher
diff --git a/themes/Backend/ExtJs/backend/voucher/store/code.js b/themes/Backend/ExtJs/backend/voucher/store/code.js
index 74a728c49a4..c355b7e2b73 100644
--- a/themes/Backend/ExtJs/backend/voucher/store/code.js
+++ b/themes/Backend/ExtJs/backend/voucher/store/code.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Voucher
diff --git a/themes/Backend/ExtJs/backend/voucher/store/detail.js b/themes/Backend/ExtJs/backend/voucher/store/detail.js
index 3f3a5d3ed08..27b1b3a4820 100644
--- a/themes/Backend/ExtJs/backend/voucher/store/detail.js
+++ b/themes/Backend/ExtJs/backend/voucher/store/detail.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Voucher
diff --git a/themes/Backend/ExtJs/backend/voucher/store/list.js b/themes/Backend/ExtJs/backend/voucher/store/list.js
index 43880e3b00c..c8aa266815a 100644
--- a/themes/Backend/ExtJs/backend/voucher/store/list.js
+++ b/themes/Backend/ExtJs/backend/voucher/store/list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Voucher
diff --git a/themes/Backend/ExtJs/backend/voucher/store/tax.js b/themes/Backend/ExtJs/backend/voucher/store/tax.js
index 3e5e36a475c..ae4e6ef2d8c 100644
--- a/themes/Backend/ExtJs/backend/voucher/store/tax.js
+++ b/themes/Backend/ExtJs/backend/voucher/store/tax.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Voucher
diff --git a/themes/Backend/ExtJs/backend/voucher/view/code/list.js b/themes/Backend/ExtJs/backend/voucher/view/code/list.js
index 80a7cf33583..7153d445e64 100644
--- a/themes/Backend/ExtJs/backend/voucher/view/code/list.js
+++ b/themes/Backend/ExtJs/backend/voucher/view/code/list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Voucher
diff --git a/themes/Backend/ExtJs/backend/voucher/view/code/progress.js b/themes/Backend/ExtJs/backend/voucher/view/code/progress.js
index 0f05515314f..8e361cff714 100644
--- a/themes/Backend/ExtJs/backend/voucher/view/code/progress.js
+++ b/themes/Backend/ExtJs/backend/voucher/view/code/progress.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Order
diff --git a/themes/Backend/ExtJs/backend/voucher/view/main/window.js b/themes/Backend/ExtJs/backend/voucher/view/main/window.js
index f8ccc56dffc..f06b096bf08 100644
--- a/themes/Backend/ExtJs/backend/voucher/view/main/window.js
+++ b/themes/Backend/ExtJs/backend/voucher/view/main/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Voucher
diff --git a/themes/Backend/ExtJs/backend/voucher/view/voucher/base_configuration.js b/themes/Backend/ExtJs/backend/voucher/view/voucher/base_configuration.js
index fee4761c085..25581bc5c09 100644
--- a/themes/Backend/ExtJs/backend/voucher/view/voucher/base_configuration.js
+++ b/themes/Backend/ExtJs/backend/voucher/view/voucher/base_configuration.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Voucher
diff --git a/themes/Backend/ExtJs/backend/voucher/view/voucher/list.js b/themes/Backend/ExtJs/backend/voucher/view/voucher/list.js
index 0e61cf9bb57..fd4e8927bd1 100644
--- a/themes/Backend/ExtJs/backend/voucher/view/voucher/list.js
+++ b/themes/Backend/ExtJs/backend/voucher/view/voucher/list.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Voucher
@@ -327,6 +326,7 @@ Ext.define('Shopware.apps.Voucher.view.voucher.List', {
      * @param value
      */
     valueRenderer: function (value, p, r) {
+        value = String(value);
         if (r.data.percental == 1){
             return value.replace(/[.,]/, Ext.util.Format.decimalSeparator) + " %";
         }
diff --git a/themes/Backend/ExtJs/backend/voucher/view/voucher/window.js b/themes/Backend/ExtJs/backend/voucher/view/voucher/window.js
index d62c5b8f9df..89ccdba2c20 100644
--- a/themes/Backend/ExtJs/backend/voucher/view/voucher/window.js
+++ b/themes/Backend/ExtJs/backend/voucher/view/voucher/window.js
@@ -2,23 +2,22 @@
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  *
  * @category   Shopware
  * @package    Voucher
diff --git a/themes/Frontend/Bare/Theme.php b/themes/Frontend/Bare/Theme.php
index e6ffc542c37..8ecceecfe72 100644
--- a/themes/Frontend/Bare/Theme.php
+++ b/themes/Frontend/Bare/Theme.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Themes\Bare;
diff --git a/themes/Frontend/Bare/documents/index.tpl b/themes/Frontend/Bare/documents/index.tpl
index a800f64f699..54915096a41 100644
--- a/themes/Frontend/Bare/documents/index.tpl
+++ b/themes/Frontend/Bare/documents/index.tpl
@@ -103,7 +103,7 @@ td.head  {
                             {block name="document_index_address_base"}
                                 {if $User.$address.company}{$User.$address.company}<br />{/if}
                                 {if $User.$address.department}{$User.$address.department}<br />{/if}
-                                {$User.$address.salutation|salutation}
+                                {if {config name="shopSalutationRequired"} && $User.$address.salutation !== 'not_defined'}{$User.$address.salutation|salutation}{/if}
                                 {if {config name="displayprofiletitle"}}
                                     {$User.$address.title}<br/>
                                 {/if}
diff --git a/themes/Frontend/Bare/frontend/account/index.tpl b/themes/Frontend/Bare/frontend/account/index.tpl
index cd191dc7801..7c6b82818ec 100644
--- a/themes/Frontend/Bare/frontend/account/index.tpl
+++ b/themes/Frontend/Bare/frontend/account/index.tpl
@@ -81,7 +81,10 @@
                     {block name="frontend_account_index_info_content"}
                         <div class="panel--body is--wide">
                             <p>
-                                {$sUserData.additional.user.salutation|salutation}
+
+                                {if {config name="shopSalutationRequired"} && {$sUserData.additional.user.salutation !== 'not_defined'}}
+                                    {$sUserData.additional.user.salutation|salutation}
+                                {/if}
                                 {if {config name="displayprofiletitle"}}
                                     {$sUserData.additional.user.title|escapeHtml}<br/>
                                 {/if}
@@ -157,7 +160,9 @@
                                     </p>
                                 {/if}
                                 <p>
-                                    <span class="address--salutation">{$sUserData.billingaddress.salutation|salutation|escapeHtml}</span>
+                                    {if {config name="shopSalutationRequired"} && {$sUserData.billingaddress.salutation !== 'not_defined'}}
+                                        <span class="address--salutation">{$sUserData.billingaddress.salutation|salutation|escapeHtml}</span>
+                                    {/if}
                                     {if {config name="displayprofiletitle"}}
                                         <span class="address--title">{$sUserData.billingaddress.title|escapeHtml}</span><br/>
                                     {/if}
@@ -220,7 +225,9 @@
                                             </p>
                                         {/if}
                                         <p>
-                                            <span class="address--salutation">{$sUserData.shippingaddress.salutation|salutation}</span>
+                                            {if {config name="shopSalutationRequired"} && {$sUserData.shippingaddress.salutation !== 'not_defined'}}
+                                                <span class="address--salutation">{$sUserData.shippingaddress.salutation|salutation}</span>
+                                            {/if}
                                             {if {config name="displayprofiletitle"}}
                                                 <span class="address--title">{$sUserData.shippingaddress.title|escapeHtml}</span><br/>
                                             {/if}
diff --git a/themes/Frontend/Bare/frontend/account/profile.tpl b/themes/Frontend/Bare/frontend/account/profile.tpl
index 18909fae889..d76784fd05f 100644
--- a/themes/Frontend/Bare/frontend/account/profile.tpl
+++ b/themes/Frontend/Bare/frontend/account/profile.tpl
@@ -41,21 +41,23 @@
 
                                 {* Salutation *}
                                 {block name='frontend_account_profile_profile_input_salutation'}
-                                    {getSalutations variable="salutations"}
+                                    {if {config name="shopSalutationRequired"}}
+                                        {getSalutations variable="salutations"}
 
-                                    <div class="profile--salutation field--select select-field">
-                                        <select name="profile[salutation]"
-                                                required="required"
-                                                aria-required="true"
-                                                class="is--required{if $errorFlags.salutation} has--error{/if}">
+                                        <div class="profile--salutation field--select select-field">
+                                            <select name="profile[salutation]"
+                                                    required="required"
+                                                    aria-required="true"
+                                                    class="is--required{if $errorFlags.salutation} has--error{/if}">
 
-                                            <option value="" disabled="disabled"{if $form_data.profile.salutation eq ""} selected="selected"{/if}>{s name='RegisterPlaceholderSalutation' namespace="frontend/register/personal_fieldset"}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}</option>
+                                                <option value="" disabled="disabled"{if $form_data.profile.salutation eq ""} selected="selected"{/if}>{s name='RegisterPlaceholderSalutation' namespace="frontend/register/personal_fieldset"}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}</option>
 
-                                            {foreach $salutations as $key => $label}
-                                                <option value="{$key}"{if $form_data.profile.salutation eq $key} selected="selected"{/if}>{$label}</option>
-                                            {/foreach}
-                                        </select>
-                                    </div>
+                                                {foreach $salutations as $key => $label}
+                                                    <option value="{$key}"{if $form_data.profile.salutation eq $key} selected="selected"{/if}>{$label}</option>
+                                                {/foreach}
+                                            </select>
+                                        </div>
+                                    {/if}
                                 {/block}
 
                                 {* Title *}
diff --git a/themes/Frontend/Bare/frontend/address/delete.tpl b/themes/Frontend/Bare/frontend/address/delete.tpl
index 96bc7a0b3dc..78acd2593cc 100644
--- a/themes/Frontend/Bare/frontend/address/delete.tpl
+++ b/themes/Frontend/Bare/frontend/address/delete.tpl
@@ -37,7 +37,10 @@
                             {if $address.company}
                                 <p><span class="address--company">{$address.company|escapeHtml}</span>{if $address.department} - <span class="address--department">{$address.department|escapeHtml}</span>{/if}</p>
                             {/if}
-                            <span class="address--salutation">{$address.salutation|salutation}</span>
+
+                            {if {config name="shopSalutationRequired"} && {$address.salutation !== 'not_defined'}}
+                                <span class="address--salutation">{$address.salutation|salutation}</span>
+                            {/if}
                             {if {config name="displayprofiletitle"}}
                                 <span class="address--title">{$address.title|escapeHtml}</span><br/>
                             {/if}
diff --git a/themes/Frontend/Bare/frontend/address/form.tpl b/themes/Frontend/Bare/frontend/address/form.tpl
index ef9d6f3aa20..85f0c4b2337 100644
--- a/themes/Frontend/Bare/frontend/address/form.tpl
+++ b/themes/Frontend/Bare/frontend/address/form.tpl
@@ -47,7 +47,7 @@
                                    aria-required="true"
                                    placeholder="{s name='RegisterPlaceholderCompany' namespace="frontend/register/billing_fieldset"}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}"
                                    id="register_billing_company"
-                                   value="{$formData.company|escape}"
+                                   value="{$formData.company|escapeHtml}"
                                    class="address--field {if $error_flags.company} has--error{/if} is--required"/>
                         </div>
                     {/block}
@@ -60,7 +60,7 @@
                                    type="text"
                                    placeholder="{s name='RegisterLabelDepartment' namespace="frontend/register/billing_fieldset"}{/s}"
                                    id="register_billing_department"
-                                   value="{$formData.department|escape}"
+                                   value="{$formData.department|escapeHtml}"
                                    class="address--field{if $error_flags.department} has--error{/if}"/>
                         </div>
                     {/block}
@@ -72,7 +72,7 @@
                                    type="text"
                                    placeholder="{s name='RegisterLabelTaxId' namespace="frontend/register/billing_fieldset"}{/s}{if {config name="vatcheckrequired"}}{s name="RequiredField" namespace="frontend/register/index"}{/s}{/if}"
                                    id="register_billing_vatid"
-                                   value="{$formData.vatId|escape}"
+                                   value="{$formData.vatId|escapeHtml}"
                                    {if {config name="vatcheckrequired"}} required="required" aria-required="true"{/if}
                                    class="address--field{if $error_flags.vatId} has--error{/if}{if {config name="vatcheckrequired"}} is--required{/if}"/>
                         </div>
@@ -83,22 +83,24 @@
             {block name="frontend_address_form_fieldset_address"}
                 {* Salutation *}
                 {block name='frontend_address_form_input_salutation'}
-                    <div class="address--salutation field--select select-field">
+                    {if {config name="shopSalutationRequired"}}
+                        <div class="address--salutation field--select select-field">
 
-                        {getSalutations variable="salutations"}
+                            {getSalutations variable="salutations"}
 
-                        <select name="{$inputPrefix}[salutation]"
-                                id="salutation"
-                                required="required"
-                                aria-required="true"
-                                class="is--required{if $error_flags.salutation} has--error{/if}">
-                            <option value="" disabled="disabled"{if $formData.salutation eq ""} selected="selected"{/if}>{s name='RegisterPlaceholderSalutation' namespace="frontend/register/personal_fieldset"}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}</option>
+                            <select name="{$inputPrefix}[salutation]"
+                                    id="salutation"
+                                    required="required"
+                                    aria-required="true"
+                                    class="is--required{if $error_flags.salutation} has--error{/if}">
+                                <option value="" disabled="disabled"{if $formData.salutation eq ""} selected="selected"{/if}>{s name='RegisterPlaceholderSalutation' namespace="frontend/register/personal_fieldset"}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}</option>
 
-                            {foreach $salutations as $key => $label}
-                                <option value="{$key}"{if $formData.salutation eq $key} selected="selected"{/if}>{$label}</option>
-                            {/foreach}
-                        </select>
-                    </div>
+                                {foreach $salutations as $key => $label}
+                                    <option value="{$key}"{if $formData.salutation eq $key} selected="selected"{/if}>{$label}</option>
+                                {/foreach}
+                            </select>
+                        </div>
+                    {/if}
                 {/block}
 
                 {* Title *}
@@ -110,7 +112,7 @@
                                    type="text"
                                    placeholder="{s name='RegisterPlaceholderTitle' namespace="frontend/register/personal_fieldset"}{/s}"
                                    id="title"
-                                   value="{$formData.title|escape}"
+                                   value="{$formData.title|escapeHtml}"
                                    class="address--field{if $error_flags.title} has--error{/if}" />
                         </div>
                     {/if}
@@ -126,7 +128,7 @@
                                aria-required="true"
                                placeholder="{s name='RegisterShippingPlaceholderFirstname' namespace="frontend/register/shipping_fieldset"}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}"
                                id="firstname2"
-                               value="{$formData.firstname|escape}"
+                               value="{$formData.firstname|escapeHtml}"
                                class="address--field is--required{if $error_flags.firstname} has--error{/if}"/>
                     </div>
                 {/block}
@@ -141,7 +143,7 @@
                                aria-required="true"
                                placeholder="{s name='RegisterShippingPlaceholderLastname' namespace="frontend/register/shipping_fieldset"}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}"
                                id="lastname2"
-                               value="{$formData.lastname|escape}"
+                               value="{$formData.lastname|escapeHtml}"
                                class="address--field is--required{if $error_flags.lastname} has--error{/if}"/>
                     </div>
                 {/block}
@@ -156,7 +158,7 @@
                                aria-required="true"
                                placeholder="{s name='RegisterBillingPlaceholderStreet' namespace="frontend/register/billing_fieldset"}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}"
                                id="street"
-                               value="{$formData.street|escape}"
+                               value="{$formData.street|escapeHtml}"
                                class="address--field address--field-street is--required{if $error_flags.street} has--error{/if}"/>
                     </div>
                 {/block}
@@ -171,7 +173,7 @@
                                    {if {config name="requireAdditionAddressLine1"}} required="required" aria-required="true"{/if}
                                    placeholder="{s name='RegisterLabelAdditionalAddressLine1'  namespace="frontend/register/shipping_fieldset"}{/s}{if {config name="requireAdditionAddressLine1"}}{s name="RequiredField" namespace="frontend/register/index"}{/s}{/if}"
                                    id="additionalAddressLine1"
-                                   value="{$formData.additionalAddressLine1|escape}"
+                                   value="{$formData.additionalAddressLine1|escapeHtml}"
                                    class="address--field{if {config name="requireAdditionAddressLine1"}} is--required{/if}{if $error_flags.additionalAddressLine1 && {config name="requireAdditionAddressLine1"}} has--error{/if}"/>
                         </div>
                     {/if}
@@ -187,7 +189,7 @@
                                    {if {config name="requireAdditionAddressLine2"}} required="required" aria-required="true"{/if}
                                    placeholder="{s name='RegisterLabelAdditionalAddressLine2'  namespace="frontend/register/shipping_fieldset"}{/s}{if {config name="requireAdditionAddressLine2"}}{s name="RequiredField" namespace="frontend/register/index"}{/s}{/if}"
                                    id="additionalAddressLine2"
-                                   value="{$formData.additionalAddressLine2|escape}"
+                                   value="{$formData.additionalAddressLine2|escapeHtml}"
                                    class="address--field{if {config name="requireAdditionAddressLine2"}} is--required{/if}{if $error_flags.additionalAddressLine2 && {config name="requireAdditionAddressLine2"}} has--error{/if}"/>
                         </div>
                     {/if}
@@ -204,7 +206,7 @@
                                    aria-required="true"
                                    placeholder="{s name='RegisterBillingPlaceholderZipcode' namespace="frontend/register/billing_fieldset"}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}"
                                    id="zipcode"
-                                   value="{$formData.zipcode|escape}"
+                                   value="{$formData.zipcode|escapeHtml}"
                                    class="address--field address--spacer address--field-zipcode is--required{if $error_flags.zipcode} has--error{/if}"/>
                             <input autocomplete="section-billing billing address-level2"
                                    name="{$inputPrefix}[city]"
@@ -213,7 +215,7 @@
                                    aria-required="true"
                                    placeholder="{s name='RegisterBillingPlaceholderCity' namespace="frontend/register/billing_fieldset"}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}"
                                    id="city"
-                                   value="{$formData.city|escape}"
+                                   value="{$formData.city|escapeHtml}"
                                    size="25"
                                    class="address--field address--field-city is--required{if $error_flags.city} has--error{/if}"/>
                         {else}
@@ -224,7 +226,7 @@
                                    aria-required="true"
                                    placeholder="{s name='RegisterBillingPlaceholderCity' namespace="frontend/register/billing_fieldset"}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}"
                                    id="city"
-                                   value="{$formData.city|escape}"
+                                   value="{$formData.city|escapeHtml}"
                                    size="25"
                                    class="address--field address--spacer address--field-city is--required{if $error_flags.city} has--error{/if}"/>
                             <input autocomplete="section-billing billing postal-code"
@@ -234,7 +236,7 @@
                                    aria-required="true"
                                    placeholder="{s name='RegisterBillingPlaceholderZipcode' namespace="frontend/register/billing_fieldset"}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}"
                                    id="zipcode"
-                                   value="{$formData.zipcode|escape}"
+                                   value="{$formData.zipcode|escapeHtml}"
                                    class="address--field address--field-zipcode is--required{if $error_flags.zipcode} has--error{/if}"/>
                         {/if}
                     </div>
@@ -303,7 +305,7 @@
                                    {if {config name="requirePhoneField"}} required="required" aria-required="true"{/if}
                                    placeholder="{s name='RegisterPlaceholderPhone' namespace="frontend/register/personal_fieldset"}{/s}{if {config name="requirePhoneField"}}{s name="RequiredField" namespace="frontend/register/index"}{/s}{/if}"
                                    id="phone"
-                                   value="{$formData.phone|escape}"
+                                   value="{$formData.phone|escapeHtml}"
                                    class="address--field{if {config name="requirePhoneField"}} is--required{/if}{if $error_flags.phone && {config name="requirePhoneField"}} has--error{/if}"/>
                         </div>
                     {/if}
diff --git a/themes/Frontend/Bare/frontend/address/index.tpl b/themes/Frontend/Bare/frontend/address/index.tpl
index 7359b0b00f4..88f64a64269 100644
--- a/themes/Frontend/Bare/frontend/address/index.tpl
+++ b/themes/Frontend/Bare/frontend/address/index.tpl
@@ -58,7 +58,10 @@
                                                 {if $address.company}
                                                     <p><span class="address--company">{$address.company|escapeHtml}</span>{if $address.department} - <span class="address--department">{$address.department|escapeHtml}</span>{/if}</p>
                                                 {/if}
-                                                <span class="address--salutation">{$address.salutation|salutation}</span>
+
+                                                {if {config name="shopSalutationRequired"} && {$address.salutation !== 'not_defined'}}
+                                                    <span class="address--salutation">{$address.salutation|salutation}</span>
+                                                {/if}
                                                 {if {config name="displayprofiletitle"}}
                                                     <span class="address--title">{$address.title|escapeHtml}</span><br/>
                                                 {/if}
diff --git a/themes/Frontend/Bare/frontend/blog/comment/form.tpl b/themes/Frontend/Bare/frontend/blog/comment/form.tpl
index 796364cf011..dab4a793ec9 100644
--- a/themes/Frontend/Bare/frontend/blog/comment/form.tpl
+++ b/themes/Frontend/Bare/frontend/blog/comment/form.tpl
@@ -41,7 +41,7 @@
             </div>
         {/block}
 
-        <form method="post" class="comment--collapse-target{if $sErrorFlag} collapse--soft-show{/if}" action="{url controller=blog action=rating blogArticle=$sArticle.id}#blog--comments-start">
+        <form method="post" class="comment--collapse-target{if $sErrorFlag} collapse--soft-show{/if}" action="{url controller=blog action=rating blogArticle=$sArticleId}#blog--comments-start">
 
             <div class="form--comment-add">
 
@@ -122,7 +122,7 @@
                                 <div class="captcha--placeholder" data-autoLoad="true"{if $sErrorFlag.sCaptcha} data-hasError="true"{/if} data-src="{url module=widgets controller=Captcha action=refreshCaptcha}"></div>
                             {/block}
 
-                            {block name='frontend_blog_comments_input_captcha_placeholder'}
+                            {block name='frontend_blog_comments_input_captcha_notice'}
                                 <strong class="captcha--notice">{s name="BlogLabelCaptcha"}{/s}</strong>
                             {/block}
 
diff --git a/themes/Frontend/Bare/frontend/blog/comments.tpl b/themes/Frontend/Bare/frontend/blog/comments.tpl
index 8cfbce0c21d..d1994726b0e 100644
--- a/themes/Frontend/Bare/frontend/blog/comments.tpl
+++ b/themes/Frontend/Bare/frontend/blog/comments.tpl
@@ -2,8 +2,8 @@
     <div class="blog--comments panel has--border is--rounded">
 
     {* Detail Comment Form *}
-    {block name='frontend_blog_comments_form'}
-        {action module=widgets controller=blog action=form formData=$sFormData errorFlags=$sErrorFlag}
+    {block name='frontend_blog_comments_form_action'}
+        {action module=widgets controller=blog action=form formData=$sFormData errorFlags=$sErrorFlag sArticleId=$sArticle.id}
     {/block}
 
     {* List comments *}
diff --git a/themes/Frontend/Bare/frontend/checkout/ajax_add_article.tpl b/themes/Frontend/Bare/frontend/checkout/ajax_add_article.tpl
index 1b4d0f5ade5..433a330fc80 100644
--- a/themes/Frontend/Bare/frontend/checkout/ajax_add_article.tpl
+++ b/themes/Frontend/Bare/frontend/checkout/ajax_add_article.tpl
@@ -11,6 +11,11 @@
                 {include file="frontend/_includes/messages.tpl" type="info" content="{$sBasketInfo}"}
             </div>
         {/if}
+        {if $paymentBlocked}
+            <div class="modal--error">
+                {include file="frontend/_includes/messages.tpl" type="error" content="{s name="ConfirmInfoPaymentBlocked" namespace="frontend/checkout/error_messages"}{/s}"}
+            </div>
+        {/if}
     {/block}
 
     {block name='checkout_ajax_add_information'}
diff --git a/themes/Frontend/Bare/frontend/checkout/ajax_cart.tpl b/themes/Frontend/Bare/frontend/checkout/ajax_cart.tpl
index 525f0b91fed..8962fac74ff 100644
--- a/themes/Frontend/Bare/frontend/checkout/ajax_cart.tpl
+++ b/themes/Frontend/Bare/frontend/checkout/ajax_cart.tpl
@@ -54,6 +54,12 @@
             {/if}
         {/block}
 
+        {block name='frontend_checkout_ajax_cart_error_payment_blocked'}
+            {if $paymentBlocked}
+                {include file="frontend/_includes/messages.tpl" type="error" content="{s name="ConfirmInfoPaymentBlocked" namespace="frontend/checkout/error_messages"}{/s}"}
+            {/if}
+        {/block}
+
         {block name='frontend_checkout_ajax_cart_item_container'}
             <div class="item--container">
                 {block name='frontend_checkout_ajax_cart_item_container_inner'}
diff --git a/themes/Frontend/Bare/frontend/checkout/confirm.tpl b/themes/Frontend/Bare/frontend/checkout/confirm.tpl
index 489badf4bee..8e3e8b6b8f7 100644
--- a/themes/Frontend/Bare/frontend/checkout/confirm.tpl
+++ b/themes/Frontend/Bare/frontend/checkout/confirm.tpl
@@ -92,7 +92,7 @@
                         {/block}
 
                         {* Hidden field for the user comment *}
-                        <textarea class="is--hidden user-comment--hidden" rows="1" cols="1" name="sComment">{$sComment|escape}</textarea>
+                        <textarea class="is--hidden user-comment--hidden" rows="1" cols="1" name="sComment">{$sComment|escapeHtml}</textarea>
 
                         <ul class="list--checkbox list--unstyled">
 
@@ -250,7 +250,10 @@
                                                                 <br />
                                                             {/if}
 
-                                                            <span class="address--salutation">{$sUserData.billingaddress.salutation|salutation}</span>
+
+                                                            {if {config name="shopSalutationRequired"} && {$sUserData.billingaddress.salutation !== 'not_defined'}}
+                                                                <span class="address--salutation">{$sUserData.billingaddress.salutation|salutation}</span>
+                                                            {/if}
                                                             {if {config name="displayprofiletitle"}}
                                                                 <span class="address--title">{$sUserData.billingaddress.title|escapeHtml}</span><br/>
                                                             {/if}
@@ -372,7 +375,10 @@
                                                     <span class="address--company is--bold">{$sUserData.billingaddress.company|escapeHtml}</span>{if $sUserData.billingaddress.department}<br /><span class="address--department is--bold">{$sUserData.billingaddress.department|escapeHtml}</span>{/if}
                                                         <br />
                                                     {/if}
+
+                                                    {if {config name="shopSalutationRequired"} && {$sUserData.billingaddress.salutation !== 'not_defined'}}
                                                     <span class="address--salutation">{$sUserData.billingaddress.salutation|salutation}</span>
+                                                    {/if}
                                                     {if {config name="displayprofiletitle"}}
                                                         <span class="address--title">{$sUserData.billingaddress.title|escapeHtml}</span><br/>
                                                     {/if}
@@ -459,7 +465,9 @@
                                                         <br />
                                                     {/if}
 
-                                                    <span class="address--salutation">{$sUserData.shippingaddress.salutation|salutation}</span>
+                                                    {if {config name="shopSalutationRequired"} && {$sUserData.shippingaddress.salutation !== 'not_defined'}}
+                                                        <span class="address--salutation">{$sUserData.shippingaddress.salutation|salutation}</span>
+                                                    {/if}
                                                     {if {config name="displayprofiletitle"}}
                                                         <span class="address--title">{$sUserData.shippingaddress.title|escapeHtml}</span><br/>
                                                     {/if}
diff --git a/themes/Frontend/Bare/frontend/checkout/finish.tpl b/themes/Frontend/Bare/frontend/checkout/finish.tpl
index 3185f172b46..27d04339d9d 100644
--- a/themes/Frontend/Bare/frontend/checkout/finish.tpl
+++ b/themes/Frontend/Bare/frontend/checkout/finish.tpl
@@ -144,7 +144,9 @@
                                                             <br />
                                                         {/if}
 
-                                                        <span class="address--salutation">{$sAddresses.billing.salutation|salutation}</span>
+                                                        {if {config name="shopSalutationRequired"} && {$sAddresses.billing.salutation !== 'not_defined'}}
+                                                            <span class="address--salutation">{$sAddresses.billing.salutation|salutation}</span>
+                                                        {/if}
                                                         {if {config name="displayprofiletitle"}}
                                                             <span class="address--title">{$sAddresses.billing.title|escapeHtml}</span><br/>
                                                         {/if}
@@ -178,7 +180,7 @@
                                     <div class="panel has--border block information--panel billing--panel finish--billing">
 
                                         {* Headline *}
-                                        {block name='frontend_checkout_confirm_information_addresses_billing_panel_title'}
+                                        {block name='frontend_checkout_finish_information_addresses_billing_panel_title'}
                                             <div class="panel--title is--underline">
                                                 {s name="ConfirmHeaderBilling" namespace="frontend/checkout/confirm"}{/s}
                                             </div>
@@ -192,7 +194,10 @@
                                                     <br />
                                                 {/if}
 
-                                                <span class="address--salutation">{$sAddresses.billing.salutation|salutation}</span>
+                                                {if {config name="shopSalutationRequired"} && {$sAddresses.billing.salutation !== 'not_defined'}}
+                                                    <span class="address--salutation">{$sAddresses.billing.salutation|salutation}</span>
+                                                {/if}
+
                                                 {if {config name="displayprofiletitle"}}
                                                     <span class="address--title">{$sAddresses.billing.title|escapeHtml}</span><br/>
                                                 {/if}
@@ -234,7 +239,11 @@
                                                     <br />
                                                 {/if}
 
-                                                <span class="address--salutation">{$sAddresses.shipping.salutation|salutation}</span>
+
+                                                {if {config name="shopSalutationRequired"} && {$sAddresses.shipping.salutation !== 'not_defined'}}
+                                                    <span class="address--salutation">{$sAddresses.shipping.salutation|salutation}</span>
+                                                {/if}
+
                                                 {if {config name="displayprofiletitle"}}
                                                     <span class="address--title">{$sAddresses.shipping.title|escapeHtml}</span><br/>
                                                 {/if}
diff --git a/themes/Frontend/Bare/frontend/checkout/header.tpl b/themes/Frontend/Bare/frontend/checkout/header.tpl
index a9ac47f83d1..86323ed64e3 100644
--- a/themes/Frontend/Bare/frontend/checkout/header.tpl
+++ b/themes/Frontend/Bare/frontend/checkout/header.tpl
@@ -7,35 +7,7 @@
 
         {* Logo container *}
         {block name='frontend_index_logo_container'}
-            <div class="logo-main block-group" role="banner">
-
-                {* Main shop logo *}
-                {block name='frontend_index_logo'}
-                    <div class="logo--shop block">
-                        {s name="IndexLinkDefault" namespace="frontend/index/index" assign="snippetIndexLinkDefault"}{/s}
-                        <a class="logo--link" href="{url controller='index'}" title="{"{config name="shopName"}"|escapeHtml} - {$snippetIndexLinkDefault|escape}">
-                            <picture>
-                                <source srcset="{link file=$theme.desktopLogo}" media="(min-width: 78.75em)">
-                                <source srcset="{link file=$theme.tabletLandscapeLogo}" media="(min-width: 64em)">
-                                <source srcset="{link file=$theme.tabletLogo}" media="(min-width: 48em)">
-                                <img srcset="{link file=$theme.mobileLogo}" alt="{"{config name="shopName"}"|escapeHtml} - {$snippetIndexLinkDefault|escape}" />
-                            </picture>
-                        </a>
-                    </div>
-                {/block}
-
-                {* Support Info *}
-                {block name='frontend_index_logo_supportinfo'}
-                    <div class="logo--supportinfo block">
-                        {s name='RegisterSupportInfo' namespace='frontend/register/index'}{/s}
-                    </div>
-                {/block}
-
-                {* Trusted Shops *}
-                {block name='frontend_index_logo_trusted_shops'}
-
-                {/block}
-            </div>
+            {include file="frontend/index/logo-container.tpl"}
         {/block}
 
         {* Hide Shop navigation *}
diff --git a/themes/Frontend/Bare/frontend/checkout/items/product.tpl b/themes/Frontend/Bare/frontend/checkout/items/product.tpl
index 09f66d572a8..722e0673cec 100644
--- a/themes/Frontend/Bare/frontend/checkout/items/product.tpl
+++ b/themes/Frontend/Bare/frontend/checkout/items/product.tpl
@@ -171,7 +171,7 @@
         <div class="panel--td column--actions">
             <form action="{url action='deleteArticle' sDelete=$sBasketItem.id sTargetAction=$sTargetAction}"
                   method="post">
-                {block name='frontend_checkout_cart_item_delete_article_form_submit'}   
+                {block name='frontend_checkout_cart_item_delete_article_form_submit'}
                     {s name="CartItemLinkDelete" assign="snippetCartItemLinkDelete"}{/s}
                     <button type="submit" class="btn is--small column--actions-link"
                             title="{$snippetCartItemLinkDelete|escape}">
diff --git a/themes/Frontend/Bare/frontend/compare/add_article.tpl b/themes/Frontend/Bare/frontend/compare/add_article.tpl
index 742b3c8e1d1..76e5ef09d8c 100644
--- a/themes/Frontend/Bare/frontend/compare/add_article.tpl
+++ b/themes/Frontend/Bare/frontend/compare/add_article.tpl
@@ -11,7 +11,7 @@
             {/block}
 
             {* Compare modal error message *}
-            {block name="product_compare_error_title"}
+            {block name="product_compare_error_message"}
                 <div class="modal--error">
                     {s name="CompareInfoMaxReached" namespace="frontend/compare/added" assign="snippetCompareInfoMaxReached"}{/s}
                     {include file="frontend/_includes/messages.tpl" type="info" content=$snippetCompareInfoMaxReached}
@@ -19,4 +19,4 @@
             {/block}
         </div>
     </div>
-{/if}
\ No newline at end of file
+{/if}
diff --git a/themes/Frontend/Bare/frontend/compare/col.tpl b/themes/Frontend/Bare/frontend/compare/col.tpl
index f03a29a9a31..375b955d2c7 100644
--- a/themes/Frontend/Bare/frontend/compare/col.tpl
+++ b/themes/Frontend/Bare/frontend/compare/col.tpl
@@ -119,17 +119,17 @@
                         {/block}
 
                         {* Regulation price *}
-                        {block name='frontend_listing_box_article_price_regulation'}
+                        {block name='frontend_compare_price_regulation'}
                             {if $sArticle.regulationPrice}
                                 <div class="price--regulation">
 
-                                    {block name='frontend_listing_box_article_price_discount_before'}
+                                    {block name='frontend_compare_price_regulation_before'}
                                         {s name="priceRegulationLabel" namespace="frontend/detail/data"}{/s}
                                     {/block}
 
                                     {$sArticle.regulationPrice|currency}{s name="Star" namespace="frontend/listing/box_article"}{/s}
 
-                                    {block name='frontend_listing_box_article_price_discount_after'}
+                                    {block name='frontend_compare_price_regulation_after'}
                                         {s name="priceRegulationInfo" namespace="frontend/detail/data"}{/s}
                                     {/block}
                                 </div>
diff --git a/themes/Frontend/Bare/frontend/compare/col_description.tpl b/themes/Frontend/Bare/frontend/compare/col_description.tpl
index 94c3bc7c78c..cd524c6d523 100644
--- a/themes/Frontend/Bare/frontend/compare/col_description.tpl
+++ b/themes/Frontend/Bare/frontend/compare/col_description.tpl
@@ -7,30 +7,30 @@
                     {s name="CompareColumnPicture"}{/s}
                 </li>
             {/block}
-            {block name='frontend_compare_article_name'}
+            {block name='frontend_compare_article_name_header'}
                 <li class="list--entry entry--name">
                     {s name="CompareColumnName"}{/s}
                 </li>
             {/block}
-            {block name='frontend_compare_votings'}
+            {block name='frontend_compare_votings_header'}
                 {if !{config name="VoteDisable"}}
                     <li class="list--entry entry--voting">
                         {s name="CompareColumnRating"}{/s}
                     </li>
                 {/if}
             {/block}
-            {block name='frontend_compare_description'}
+            {block name='frontend_compare_description_header'}
                 <li class="list--entry entry--description">
                     {s name="CompareColumnDescription"}{/s}
                 </li>
             {/block}
-            {block name='frontend_compare_price'}
+            {block name='frontend_compare_price_header'}
                 <li class="list--entry entry--price">
                     {s name="CompareColumnPrice"}{/s}
                 </li>
             {/block}
             {foreach $sComparisonsList.properties as $property}
-                {block name='frontend_compare_properties'}
+                {block name='frontend_compare_properties_header'}
                     {if $property}
                         <li class="list--entry entry--colored entry--property" data-property-row="{$property@iteration}">
                             {$property}:
diff --git a/themes/Frontend/Bare/frontend/detail/block_price.tpl b/themes/Frontend/Bare/frontend/detail/block_price.tpl
index 493bf790cdf..208918c78d1 100644
--- a/themes/Frontend/Bare/frontend/detail/block_price.tpl
+++ b/themes/Frontend/Bare/frontend/detail/block_price.tpl
@@ -60,6 +60,22 @@
                                                 {block name="frontend_detail_data_block_prices_table_body_cell_price"}
                                                     <td class="block-prices--cell">
                                                         {$blockPrice.price|currency} {s name="Star" namespace="frontend/listing/box_article"}{/s}
+
+                                                        {$hasRegulationPrice = ($blockPrice.regulationPrice > 0 )}
+                                                        {if $hasRegulationPrice}
+                                                            {block name='frontend_detail_data_block_prices_table_body_cell_regulation_price_block'}
+                                                                <div class="content--regulation">
+                                                                    {block name='frontend_detail_data_block_prices_table_body_cell_regulation_price_before'}
+                                                                        {s name="priceRegulationLabel" namespace="frontend/detail/data"}{/s}
+                                                                    {/block}
+                                                                    <span>{$blockPrice.regulationPrice|currency}{s name="Star" namespace="frontend/listing/box_article"}{/s}</span>
+
+                                                                    {block name='frontend_detail_data_block_prices_table_body_cell_regulation_price_after'}
+                                                                        {s name="priceRegulationInfo" namespace="frontend/detail/data"}{/s}
+                                                                    {/block}
+                                                                </div>
+                                                            {/block}
+                                                        {/if}
                                                     </td>
                                                 {/block}
                                                 {if $hasReferencePrice}
diff --git a/themes/Frontend/Bare/frontend/detail/comment/form.tpl b/themes/Frontend/Bare/frontend/detail/comment/form.tpl
index f6621516a92..ba1970f05b8 100644
--- a/themes/Frontend/Bare/frontend/detail/comment/form.tpl
+++ b/themes/Frontend/Bare/frontend/detail/comment/form.tpl
@@ -21,19 +21,19 @@
 
         {* Review author name *}
         {block name='frontend_detail_comment_input_name'}
-            <input name="sVoteName" type="text" value="{$sFormData.sVoteName|escape}" class="review--field{if $sErrorFlag.sVoteName} has--error{/if}" aria-label="{s name="DetailCommentLabelName"}{/s}" placeholder="{s name="DetailCommentLabelName"}{/s}" />
+            <input name="sVoteName" type="text" value="{$sFormData.sVoteName|escapeHtml}" class="review--field{if $sErrorFlag.sVoteName} has--error{/if}" aria-label="{s name="DetailCommentLabelName"}{/s}" placeholder="{s name="DetailCommentLabelName"}{/s}" />
         {/block}
 
         {* Reviewer email address *}
         {block name='frontend_detail_comment_input_mail'}
             {if {config name="OptinVote"} == true}
-                <input name="sVoteMail" type="email" value="{$sFormData.sVoteMail|escape}" class="review--field{if $sErrorFlag.sVoteMail} has--error{/if}" aria-label="{s name="DetailCommentLabelMail"}{/s}" placeholder="{s name="DetailCommentLabelMail"}{/s}*" required="required" aria-required="true" />
+                <input name="sVoteMail" type="email" value="{$sFormData.sVoteMail|escapeHtml}" class="review--field{if $sErrorFlag.sVoteMail} has--error{/if}" aria-label="{s name="DetailCommentLabelMail"}{/s}" placeholder="{s name="DetailCommentLabelMail"}{/s}*" required="required" aria-required="true" />
             {/if}
         {/block}
 
         {* Review summary *}
         {block name='frontend_detail_comment_input_summary'}
-            <input name="sVoteSummary" type="text" value="{$sFormData.sVoteSummary|escape}" id="sVoteSummary" class="review--field{if $sErrorFlag.sVoteSummary} has--error{/if}" aria-label="{s name="DetailCommentLabelSummary"}{/s}" placeholder="{s name="DetailCommentLabelSummary"}{/s}*" required="required" aria-required="true" />
+            <input name="sVoteSummary" type="text" value="{$sFormData.sVoteSummary|escapeHtml}" id="sVoteSummary" class="review--field{if $sErrorFlag.sVoteSummary} has--error{/if}" aria-label="{s name="DetailCommentLabelSummary"}{/s}" placeholder="{s name="DetailCommentLabelSummary"}{/s}*" required="required" aria-required="true" />
         {/block}
 
         {* Review Rating *}
@@ -56,7 +56,7 @@
 
         {* Review text *}
         {block name='frontend_detail_comment_input_text'}
-            <textarea name="sVoteComment" placeholder="{s name="DetailCommentPlaceholderText"}{/s}" cols="3" rows="2" class="review--field{if $sErrorFlag.sVoteComment} has--error{/if}" aria-label="{s name="DetailCommentPlaceholderText"}{/s}">{$sFormData.sVoteComment|escape}</textarea>
+            <textarea name="sVoteComment" placeholder="{s name="DetailCommentPlaceholderText"}{/s}" cols="3" rows="2" class="review--field{if $sErrorFlag.sVoteComment} has--error{/if}" aria-label="{s name="DetailCommentPlaceholderText"}{/s}">{$sFormData.sVoteComment|escapeHtml}</textarea>
         {/block}
 
         {* Captcha *}
diff --git a/themes/Frontend/Bare/frontend/detail/data.tpl b/themes/Frontend/Bare/frontend/detail/data.tpl
index b8716bc0da9..5be5c06fc2b 100644
--- a/themes/Frontend/Bare/frontend/detail/data.tpl
+++ b/themes/Frontend/Bare/frontend/detail/data.tpl
@@ -66,7 +66,7 @@
                 {if $sArticle.regulationPrice}
 
                     {* Discount price content *}
-                    {block name='frontend_detail_data_pseudo_price_discount_content'}
+                    {block name='frontend_detail_data_regulation_price_content'}
                         <div class="content--regulation">
                             {block name='frontend_detail_data_regulation_price_before'}
                                 {s name="priceRegulationLabel"}{/s}
diff --git a/themes/Frontend/Bare/frontend/detail/product_quick_view.tpl b/themes/Frontend/Bare/frontend/detail/product_quick_view.tpl
index a726ebd9e0b..ef065779001 100644
--- a/themes/Frontend/Bare/frontend/detail/product_quick_view.tpl
+++ b/themes/Frontend/Bare/frontend/detail/product_quick_view.tpl
@@ -3,13 +3,13 @@
         {block name='frontend_detail_product_quick_view_inner'}
 
             {block name='frontend_detail_product_quick_view_image_link'}
-                <a class="quick-view--image-link" href="{$sArticle.linkDetails}" title="{if $sArticle.image.res.description}{$sArticle.image.res.description|escape}{else}{$sArticle.articlename|escape}{/if}">
+                <a class="quick-view--image-link" href="{$sArticle.linkDetails}" title="{if $sArticle.image.res.description}{$sArticle.image.res.description|escapeHtml}{else}{$sArticle.articlename|escapeHtml}{/if}">
                     {block name='frontend_detail_product_quick_view_image'}
 
-                        {$alt = $sArticle.articlename|escape}
+                        {$alt = $sArticle.articlename|escapeHtml}
 
                         {if $sArticle.image.description}
-                            {$alt = $sArticle.image.description|escape}
+                            {$alt = $sArticle.image.description|escapeHtml}
                         {/if}
 
                         <span class="quick-view--image">
@@ -31,9 +31,9 @@
                 <div class="quick-view--header">
                     {block name='frontend_detail_product_quick_view_header_inner'}
                         {block name='frontend_detail_product_quick_view_title'}
-                            <a href="{$sArticle.linkDetails}" class="quick-view--title" title="{$sArticle.articleName|escape}">
+                            <a href="{$sArticle.linkDetails}" class="quick-view--title" title="{$sArticle.articleName|escapeHtml}">
                                 {block name='frontend_detail_product_quick_view_title_inner'}
-                                    {$sArticle.articleName|escape}
+                                    {$sArticle.articleName|escapeHtml}
                                 {/block}
                             </a>
                         {/block}
@@ -41,7 +41,7 @@
                         {block name='frontend_detail_product_quick_view_supplier'}
                             <div class="quick-view--supplier">
                                 {block name='frontend_detail_product_quick_view_supplier_inner'}
-                                    {$sArticle.supplierName|escape}
+                                    {$sArticle.supplierName|escapeHtml}
                                 {/block}
                             </div>
                         {/block}
diff --git a/themes/Frontend/Bare/frontend/index/header.tpl b/themes/Frontend/Bare/frontend/index/header.tpl
index 59343dd2089..255f7feb0b6 100644
--- a/themes/Frontend/Bare/frontend/index/header.tpl
+++ b/themes/Frontend/Bare/frontend/index/header.tpl
@@ -106,7 +106,7 @@
 {* Add Modernizr in the "<head>"-element to have all the classes before the page was rendered *}
 {block name="frontend_index_header_javascript_modernizr_lib"}
     {if !$theme.asyncJavascriptLoading}
-        <script src="{preload file={link file='frontend/_public/src/js/vendors/modernizr/modernizr.custom.35977.js'} as="script"}"></script>
+        <script src="{preload file={link file='frontend/_public/vendors/js/modernizr/modernizr-custom.js'} as="script"}"></script>
     {/if}
 {/block}
 
diff --git a/themes/Frontend/Bare/frontend/listing/actions/action-filter-panel.tpl b/themes/Frontend/Bare/frontend/listing/actions/action-filter-panel.tpl
index 281e71ca5d3..b0ad832201b 100644
--- a/themes/Frontend/Bare/frontend/listing/actions/action-filter-panel.tpl
+++ b/themes/Frontend/Bare/frontend/listing/actions/action-filter-panel.tpl
@@ -35,25 +35,25 @@
 
                         {block name="frontend_listing_actions_filter_form_search"}
                             {if $term !== null}
-                                <input type="hidden" name="{$shortParameters['sSearch']}" value="{$term|escape}"/>
+                                <input type="hidden" name="{$shortParameters['sSearch']}" value="{$term|escapeHtml}"/>
                             {/if}
                         {/block}
 
                         {block name="frontend_listing_actions_filter_form_sort"}
                             {if $sSort}
-                                <input type="hidden" name="{$shortParameters['sSort']}" value="{$sSort|escape}"/>
+                                <input type="hidden" name="{$shortParameters['sSort']}" value="{$sSort|escapeHtml}"/>
                             {/if}
                         {/block}
 
                         {block name="frontend_listing_actions_filter_form_perpage"}
                             {if $criteria && $criteria->getLimit()}
-                                <input type="hidden" name="{$shortParameters['sPerPage']}" value="{$criteria->getLimit()|escape}"/>
+                                <input type="hidden" name="{$shortParameters['sPerPage']}" value="{$criteria->getLimit()|escapeHtml}"/>
                             {/if}
                         {/block}
 
                             {block name="frontend_listing_actions_filter_form_category"}
                                 {if !$sCategoryContent && $sCategoryCurrent != $sCategoryStart && {controllerName} != 'search'}
-                                    <input type="hidden" name="{$shortParameters['sCategory']}" value="{$sCategoryCurrent|escape}" />
+                                    <input type="hidden" name="{$shortParameters['sCategory']}" value="{$sCategoryCurrent|escapeHtml}" />
                                 {/if}
                             {/block}
 
diff --git a/themes/Frontend/Bare/frontend/listing/actions/action-pagination.tpl b/themes/Frontend/Bare/frontend/listing/actions/action-pagination.tpl
index b100191b888..40968db16fc 100644
--- a/themes/Frontend/Bare/frontend/listing/actions/action-pagination.tpl
+++ b/themes/Frontend/Bare/frontend/listing/actions/action-pagination.tpl
@@ -11,7 +11,7 @@
         {block name="frontend_listing_actions_paging_first"}
             {if $sPage > 1}
                 {s name="ListingLinkFirst" assign="snippetListingLinkFirst"}{/s}
-                <a href="{$baseUrl}?{$shortParameters.sPage}=1" title="{$snippetListingLinkFirst|escape}" aria-label="{$snippetListingLinkFirst|escape}" class="paging--link paging--prev" data-action-link="true">
+                <a href="{$baseUrl}?{$shortParameters.sPage}=1" title="{$snippetListingLinkFirst|escapeHtml}" aria-label="{$snippetListingLinkFirst|escapeHtml}" class="paging--link paging--prev" data-action-link="true">
                     <i class="icon--arrow-left"></i>
                     <i class="icon--arrow-left"></i>
                 </a>
@@ -22,7 +22,7 @@
         {block name='frontend_listing_actions_paging_previous'}
             {if $sPage > 1}
                 {s name="ListingLinkPrevious" assign="snippetListingLinkPrevious"}{/s}
-                <a href="{$baseUrl}?{$shortParameters.sPage}={$sPage-1}" title="{$snippetListingLinkPrevious|escape}" aria-label="{$snippetListingLinkPrevious|escape}" class="paging--link paging--prev" data-action-link="true">
+                <a href="{$baseUrl}?{$shortParameters.sPage}={$sPage-1}" title="{$snippetListingLinkPrevious|escapeHtml}" aria-label="{$snippetListingLinkPrevious|escapeHtml}" class="paging--link paging--prev" data-action-link="true">
                     <i class="icon--arrow-left"></i>
                 </a>
             {/if}
@@ -31,7 +31,7 @@
         {* Pagination - current page *}
         {block name='frontend_listing_actions_paging_numbers'}
             {if $pages > 1}
-                <a title="{$sCategoryContent.name|escape}" aria-label="{$sCategoryContent.name|escape}" class="paging--link is--active">{$sPage}</a>
+                <a title="{$sCategoryContent.name|escapeHtml}" aria-label="{$sCategoryContent.name|escapeHtml}" class="paging--link is--active">{$sPage}</a>
             {/if}
         {/block}
 
@@ -39,7 +39,7 @@
         {block name='frontend_listing_actions_paging_next'}
             {if $sPage < $pages}
                 {s name="ListingLinkNext" assign="snippetListingLinkNext"}{/s}
-                <a href="{$baseUrl}?{$shortParameters.sPage}={$sPage+1}" title="{$snippetListingLinkNext|escape}" aria-label="{$snippetListingLinkNext|escape}" class="paging--link paging--next" data-action-link="true">
+                <a href="{$baseUrl}?{$shortParameters.sPage}={$sPage+1}" title="{$snippetListingLinkNext|escapeHtml}" aria-label="{$snippetListingLinkNext|escapeHtml}" class="paging--link paging--next" data-action-link="true">
                     <i class="icon--arrow-right"></i>
                 </a>
             {/if}
@@ -49,7 +49,7 @@
         {block name="frontend_listing_actions_paging_last"}
             {if $sPage < $pages}
                 {s name="ListingLinkLast" assign="snippetListingLinkLast"}{/s}
-                <a href="{$baseUrl}?{$shortParameters.sPage}={$pages}" title="{$snippetListingLinkLast|escape}" aria-label="{$snippetListingLinkLast|escape}" class="paging--link paging--next" data-action-link="true">
+                <a href="{$baseUrl}?{$shortParameters.sPage}={$pages}" title="{$snippetListingLinkLast|escapeHtml}" aria-label="{$snippetListingLinkLast|escapeHtml}" class="paging--link paging--next" data-action-link="true">
                     <i class="icon--arrow-right"></i>
                     <i class="icon--arrow-right"></i>
                 </a>
diff --git a/themes/Frontend/Bare/frontend/listing/atom.tpl b/themes/Frontend/Bare/frontend/listing/atom.tpl
index a029b85d143..612a7375195 100644
--- a/themes/Frontend/Bare/frontend/listing/atom.tpl
+++ b/themes/Frontend/Bare/frontend/listing/atom.tpl
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="{encoding}" ?>
 <feed xmlns="http://www.w3.org/2005/Atom">
-<link href="{$sCategoryContent.atomFeed|escape}" rel="self" type="application/atom+xml" />
+<link href="{$sCategoryContent.atomFeed|escapeHtml}" rel="self" type="application/atom+xml" />
 <author>
     <name>{$sShopname|escapeHtml}</name>
 </author>
-<title>{block name='frontend_listing_atom_title'}{$sCategoryContent.description|escape:'hexentity'}{/block}</title>
-<id>{$sCategoryContent.rssFeed|escape:'hexentity'}</id>
+<title>{block name='frontend_listing_atom_title'}{$sCategoryContent.description|escapeHtml:'hexentity'}{/block}</title>
+<id>{$sCategoryContent.rssFeed|escapeHtml:'hexentity'}</id>
 <updated>{time()|date:atom}</updated>
 {foreach $sArticles as $sArticle}
     {block name='frontend_listing_atom_entry'}
         <entry>
-            <title type="text">{block name='frontend_listing_atom_article_title'}{$sArticle.articleName|strip_tags|strip|truncate:80:"...":true|escape}{/block}</title>
-            <id>{block name='frontend_listing_atom_article_name'}{$sArticle.linkDetails|escape}{/block}</id>
-            <link href="{block name='frontend_listing_atom_link'}{$sArticle.linkDetails|escape}{/block}"/>
+            <title type="text">{block name='frontend_listing_atom_article_title'}{$sArticle.articleName|strip_tags|strip|truncate:80:"...":true|escapeHtml}{/block}</title>
+            <id>{block name='frontend_listing_atom_article_name'}{$sArticle.linkDetails|escapeHtml}{/block}</id>
+            <link href="{block name='frontend_listing_atom_link'}{$sArticle.linkDetails|escapeHtml}{/block}"/>
             <summary type="html">
             <![CDATA[
                 {block name='frontend_listing_atom_short_description'}
                 {if $sArticle.description}
-                    {$sArticle.description|strip_tags|strip|truncate:280:"...":true|escape}
+                    {$sArticle.description|strip_tags|strip|truncate:280:"...":true|escapeHtml}
                 {else}
-                    {$sArticle.description_long|strip_tags|strip|truncate:280:"...":true|escape}
+                    {$sArticle.description_long|strip_tags|strip|truncate:280:"...":true|escapeHtml}
                 {/if}{/block}
             ]]>
             </summary>
             <content type="html">
             <![CDATA[
-                {$sArticle.description_long|strip_tags|escape}
+                {$sArticle.description_long|strip_tags|escapeHtml}
             ]]>
             </content>
             <updated>{if $sArticle.changetime}{$sArticle.changetime|date:atom}{else}{$sArticle.datum|date:atom}{/if}</updated>
diff --git a/themes/Frontend/Bare/frontend/listing/banner.tpl b/themes/Frontend/Bare/frontend/listing/banner.tpl
index bbc3d23f54b..80db9c40689 100644
--- a/themes/Frontend/Bare/frontend/listing/banner.tpl
+++ b/themes/Frontend/Bare/frontend/listing/banner.tpl
@@ -10,18 +10,18 @@
                         <picture>
                             <source srcset="{$sBanner.media.thumbnails[1].sourceSet}" media="(min-width: 48em)">
 
-                            <img srcset="{$sBanner.media.thumbnails[0].sourceSet}" alt="{$sBanner.description|escape}" class="banner--img" />
+                            <img srcset="{$sBanner.media.thumbnails[0].sourceSet}" alt="{$sBanner.description|escapeHtml}" class="banner--img" />
                         </picture>
                     {/block}
                 {else}
 
                     {* Normal banner *}
                     {block name='frontend_listing_normal_banner'}
-                        <a href="{$sBanner.link}" class="banner--link" {if $sBanner.link_target}target="{$sBanner.link_target}"{/if} title="{$sBanner.description|escape}">
+                        <a href="{$sBanner.link}" class="banner--link" {if $sBanner.link_target}target="{$sBanner.link_target}"{/if} title="{$sBanner.description|escapeHtml}">
                             <picture>
                                 <source srcset="{$sBanner.media.thumbnails[1].sourceSet}" media="(min-width: 48em)">
 
-                                <img srcset="{$sBanner.media.thumbnails[0].sourceSet}" alt="{$sBanner.description|escape}" class="banner--img" />
+                                <img srcset="{$sBanner.media.thumbnails[0].sourceSet}" alt="{$sBanner.description|escapeHtml}" class="banner--img" />
                             </picture>
                         </a>
                     {/block}
diff --git a/themes/Frontend/Bare/frontend/listing/customer_stream/layout.tpl b/themes/Frontend/Bare/frontend/listing/customer_stream/layout.tpl
index 7d07c0b7207..62b603a9e0c 100644
--- a/themes/Frontend/Bare/frontend/listing/customer_stream/layout.tpl
+++ b/themes/Frontend/Bare/frontend/listing/customer_stream/layout.tpl
@@ -56,7 +56,7 @@
 
                             {if $showListingButton}
                                 <div class="{$showListingCls}{if $fullscreen} is--align-center{/if}">
-                                    <a href="{url controller='cat' sPage=1 sCategory=$sCategoryContent.id}" title="{$sCategoryContent.name|escape}" class="link--show-listing{if $fullscreen} btn is--primary{/if}">
+                                    <a href="{url controller='cat' sPage=1 sCategory=$sCategoryContent.id}" title="{$sCategoryContent.name|escapeHtml}" class="link--show-listing{if $fullscreen} btn is--primary{/if}">
                                         {s name="ListingActionsOffersLink"}Weitere Artikel in dieser Kategorie &raquo;{/s}
                                     </a>
                                 </div>
diff --git a/themes/Frontend/Bare/frontend/listing/filter/_includes/filter-multi-media-selection.tpl b/themes/Frontend/Bare/frontend/listing/filter/_includes/filter-multi-media-selection.tpl
index d0f2bd712d0..61f8f33d039 100644
--- a/themes/Frontend/Bare/frontend/listing/filter/_includes/filter-multi-media-selection.tpl
+++ b/themes/Frontend/Bare/frontend/listing/filter/_includes/filter-multi-media-selection.tpl
@@ -1,15 +1,15 @@
 {extends file="parent:frontend/listing/filter/_includes/filter-multi-selection.tpl"}
 
 {block name="frontend_listing_filter_facet_multi_selection_input"}
-    {$name = "__{$facet->getFieldName()|escape:'htmlall'}__{$option->getId()|escape:'htmlall'}"}
+    {$name = "__{$facet->getFieldName()|escapeHtmlAttr}__{$option->getId()|escapeHtmlAttr}"}
     {if $singleSelection}
-        {$name = {$facet->getFieldName()|escape:'htmlall'} }
+        {$name = {$facet->getFieldName()|escapeHtmlAttr} }
     {/if}
 
     <input type="{$inputType}"
-       id="__{$facet->getFieldName()|escape:'htmlall'}__{$option->getId()|escape:'htmlall'}"
+       id="__{$facet->getFieldName()|escapeHtmlAttr}__{$option->getId()|escapeHtmlAttr}"
        name="{$name}"
-       title="{$option->getLabel()|escape:'htmlall'}"
-       value="{$option->getId()|escape:'htmlall'}"
+       title="{$option->getLabel()|escapeHtmlAttr}"
+       value="{$option->getId()|escapeHtmlAttr}"
        {if $option->isActive()}checked="checked" {/if}/>
-{/block}
\ No newline at end of file
+{/block}
diff --git a/themes/Frontend/Bare/frontend/listing/filter/_includes/filter-multi-selection.tpl b/themes/Frontend/Bare/frontend/listing/filter/_includes/filter-multi-selection.tpl
index d0cf3102de7..ccf4a8a4d61 100644
--- a/themes/Frontend/Bare/frontend/listing/filter/_includes/filter-multi-selection.tpl
+++ b/themes/Frontend/Bare/frontend/listing/filter/_includes/filter-multi-selection.tpl
@@ -1,17 +1,17 @@
 {namespace name="frontend/listing/listing_actions"}
 
 {block name="frontend_listing_filter_facet_multi_selection"}
-    <div class="filter-panel filter--multi-selection filter-facet--{$filterType} facet--{$facet->getFacetName()|escape:'htmlall'}"
+    <div class="filter-panel filter--multi-selection filter-facet--{$filterType} facet--{$facet->getFacetName()|escapeHtmlAttr}"
          data-filter-type="{$filterType}"
-         data-facet-name="{$facet->getFacetName()}"
-         data-field-name="{$facet->getFieldName()|escape:'htmlall'}">
+         data-facet-name="{$facet->getFacetName()|escapeHtmlAttr}"
+         data-field-name="{$facet->getFieldName()|escapeHtmlAttr}">
 
         {block name="frontend_listing_filter_facet_multi_selection_flyout"}
             <div class="filter-panel--flyout">
 
                 {block name="frontend_listing_filter_facet_multi_selection_title"}
-                    <label class="filter-panel--title" for="{$facet->getFieldName()|escape:'htmlall'}" title="{$facet->getLabel()|escape:'htmlall'}">
-                        {$facet->getLabel()|escape}
+                    <label class="filter-panel--title" for="{$facet->getFieldName()|escapeHtmlAttr}" title="{$facet->getLabel()|escapeHtmlAttr}">
+                        {$facet->getLabel()|escapeHtml}
                     </label>
                 {/block}
 
@@ -50,15 +50,15 @@
 
                                                     {block name="frontend_listing_filter_facet_multi_selection_input"}
                                                         <span class="filter-panel--input filter-panel--{$inputType}">
-                                                            {$name = "__{$facet->getFieldName()|escape:'htmlall'}__{$option->getId()|escape:'htmlall'}"}
+                                                            {$name = "__{$facet->getFieldName()|escapeHtmlAttr}__{$option->getId()|escapeHtmlAttr}"}
                                                             {if $filterType == 'radio'}
-                                                                {$name = {$facet->getFieldName()|escape:'htmlall'} }
+                                                                {$name = {$facet->getFieldName()|escapeHtmlAttr} }
                                                             {/if}
 
                                                             <input type="{$inputType}"
-                                                                   id="__{$facet->getFieldName()|escape:'htmlall'}__{$option->getId()|escape:'htmlall'}"
+                                                                   id="__{$facet->getFieldName()|escapeHtmlAttr}__{$option->getId()|escapeHtmlAttr}"
                                                                    name="{$name}"
-                                                                   value="{$option->getId()|escape:'htmlall'}"
+                                                                   value="{$option->getId()|escapeHtmlAttr}"
                                                                    {if $option->isActive()}checked="checked" {/if}/>
 
                                                             <span class="input--state {$inputType}--state">&nbsp;</span>
@@ -67,7 +67,7 @@
 
                                                     {block name="frontend_listing_filter_facet_multi_selection_label"}
                                                         <label class="filter-panel--label"
-                                                               for="__{$facet->getFieldName()|escape:'htmlall'}__{$option->getId()|escape:'htmlall'}">
+                                                               for="__{$facet->getFieldName()|escapeHtmlAttr}__{$option->getId()|escapeHtmlAttr}">
 
                                                             {if $facet|is_a:'\Shopware\Bundle\SearchBundle\FacetResult\MediaListFacetResult'}
                                                                 {$mediaFile = {link file='frontend/_public/src/img/no-picture.jpg'}}
@@ -75,9 +75,9 @@
                                                                     {$mediaFile = $option->getMedia()->getFile()}
                                                                 {/if}
 
-                                                                <img class="filter-panel--media-image" src="{$mediaFile}" alt="{$option->getLabel()|escape:'htmlall'}" />
+                                                                <img class="filter-panel--media-image" src="{$mediaFile}" alt="{$option->getLabel()|escapeHtmlAttr}" />
                                                             {else}
-                                                                {$option->getLabel()|escape}
+                                                                {$option->getLabel()|escapeHtml}
                                                             {/if}
                                                         </label>
                                                     {/block}
diff --git a/themes/Frontend/Bare/frontend/listing/filter/facet-boolean.tpl b/themes/Frontend/Bare/frontend/listing/filter/facet-boolean.tpl
index 70ac2c99870..ee8998ff6cf 100644
--- a/themes/Frontend/Bare/frontend/listing/filter/facet-boolean.tpl
+++ b/themes/Frontend/Bare/frontend/listing/filter/facet-boolean.tpl
@@ -1,25 +1,25 @@
 {namespace name="frontend/listing/listing_actions"}
 
 {block name="frontend_listing_filter_facet_boolean"}
-    <div class="filter-panel filter--value facet--{$facet->getFacetName()|escape:'htmlall'}"
+    <div class="filter-panel filter--value facet--{$facet->getFacetName()|escapeHtmlAttr}"
          data-filter-type="value"
-         data-facet-name="{$facet->getFacetName()}"
-         data-field-name="{$facet->getFieldName()|escape:'htmlall'}">
+         data-facet-name="{$facet->getFacetName()|escapeHtmlAttr}"
+         data-field-name="{$facet->getFieldName()|escapeHtmlAttr}">
 
         {block name="frontend_listing_filter_facet_boolean_flyout"}
             <div class="filter-panel--flyout">
 
                 {block name="frontend_listing_filter_facet_boolean_title"}
-                    <label class="filter-panel--title" for="{$facet->getFieldName()|escape:'htmlall'}" title="{$facet->getLabel()|escape:'htmlall'}">
-                        {$facet->getLabel()|escape}
+                    <label class="filter-panel--title" for="{$facet->getFieldName()|escapeHtmlAttr}" title="{$facet->getLabel()|escapeHtmlAttr}">
+                        {$facet->getLabel()|escapeHtml}
                     </label>
                 {/block}
 
                 {block name="frontend_listing_filter_facet_boolean_checkbox"}
                     <span class="filter-panel--input filter-panel--checkbox">
                         <input type="checkbox"
-                               id="{$facet->getFieldName()|escape:'htmlall'}"
-                               name="{$facet->getFieldName()|escape:'htmlall'}"
+                               id="{$facet->getFieldName()|escapeHtmlAttr}"
+                               name="{$facet->getFieldName()|escapeHtmlAttr}"
                                value="1"
                                {if $facet->isActive()}checked="checked" {/if}/>
 
diff --git a/themes/Frontend/Bare/frontend/listing/filter/facet-date-multi.tpl b/themes/Frontend/Bare/frontend/listing/filter/facet-date-multi.tpl
index 90c9fedf699..36eb1cec5ba 100644
--- a/themes/Frontend/Bare/frontend/listing/filter/facet-date-multi.tpl
+++ b/themes/Frontend/Bare/frontend/listing/filter/facet-date-multi.tpl
@@ -23,8 +23,8 @@
         {block name="frontend_listing_filter_facet_date_multi_input"}
             <input type="text"
                    class="filter-panel--input"
-                   name="{$facet->getFieldName()|escape:'htmlall'}"
-                   id="{$facet->getFieldName()|escape:'htmlall'}"
+                   name="{$facet->getFieldName()|escapeHtmlAttr}"
+                   id="{$facet->getFieldName()|escapeHtmlAttr}"
                    placeholder="{s name="datePickerInputPlaceholder" namespace="frontend/index/datepicker"}{/s}"
                    data-datepicker="true"
                    data-mode="{$mode}"
@@ -36,4 +36,4 @@
                    value="{$value}" />
         {/block}
     </div>
-{/block}
\ No newline at end of file
+{/block}
diff --git a/themes/Frontend/Bare/frontend/listing/filter/facet-date-range.tpl b/themes/Frontend/Bare/frontend/listing/filter/facet-date-range.tpl
index 180979a1681..2b63775d850 100644
--- a/themes/Frontend/Bare/frontend/listing/filter/facet-date-range.tpl
+++ b/themes/Frontend/Bare/frontend/listing/filter/facet-date-range.tpl
@@ -3,8 +3,8 @@
 {namespace name="frontend/listing/listing_actions"}
 
 {block name="frontend_listing_filter_facet_date_title"}
-    <label class="filter-panel--title" for="{$facet->getFacetName()|escape:'htmlall'}" title="{$facet->getLabel()|escape:'htmlall'}">
-        {$facet->getLabel()|escape}
+    <label class="filter-panel--title" for="{$facet->getFacetName()|escapeHtmlAttr}" title="{$facet->getLabel()|escapeHtmlAttr}">
+        {$facet->getLabel()|escapeHtml}
     </label>
 {/block}
 
@@ -20,21 +20,21 @@
             {s name="datePickerInputPlaceholder" namespace="frontend/index/datepicker" assign="snippetDatePickerInputPlaceholder"}{/s}
             <input type="text"
                    class="filter-panel--input"
-                   id="{$facet->getFacetName()|escape:'htmlall'}"
-                   placeholder="{$snippetDatePickerInputPlaceholder|escape:'htmlall'}"
+                   id="{$facet->getFacetName()|escapeHtmlAttr}"
+                   placeholder="{$snippetDatePickerInputPlaceholder|escapeHtmlAttr}"
                    data-datepicker="true"
                    data-mode="range"
                    data-enableTime="{$enableTime}"
                    data-minDate="{$rangeMin}"
                    data-maxDate="{$rangeMax}"
-                   data-rangeStartInput="{$facet->getMinFieldName()|escape:'htmlall'}"
-                   data-rangeEndInput="{$facet->getMaxFieldName()|escape:'htmlall'}"
+                   data-rangeStartInput="{$facet->getMinFieldName()|escapeHtmlAttr}"
+                   data-rangeEndInput="{$facet->getMaxFieldName()|escapeHtmlAttr}"
                    data-static="true"
                    readonly="readonly" />
         {/block}
 
         {block name="frontend_listing_filter_facet_date_range_min_label"}
-            <label for="{$facet->getMinFieldName()|escape:'htmlall'}"
+            <label for="{$facet->getMinFieldName()|escapeHtmlAttr}"
                    data-date-range-label="min"
                    class="is--hidden">{s name="ListingFilterRangeFrom"}{/s}</label>
         {/block}
@@ -42,13 +42,13 @@
         {block name="frontend_listing_filter_facet_date_range_min_input"}
             <input type="hidden"
                    data-date-range-input="min"
-                   id="{$facet->getMinFieldName()|escape:'htmlall'}"
-                   name="{$facet->getMinFieldName()|escape:'htmlall'}"
+                   id="{$facet->getMinFieldName()|escapeHtmlAttr}"
+                   name="{$facet->getMinFieldName()|escapeHtmlAttr}"
                    value="{if $facet->isActive()}{$startMin}{/if}" />
         {/block}
 
         {block name="frontend_listing_filter_facet_date_range_max_label"}
-            <label for="{$facet->getMaxFieldName()|escape:'htmlall'}"
+            <label for="{$facet->getMaxFieldName()|escapeHtmlAttr}"
                    data-date-range-label="max"
                    class="is--hidden">{s name="ListingFilterRangeTo"}{/s}</label>
         {/block}
@@ -56,9 +56,9 @@
         {block name="frontend_listing_filter_facet_date_range_max_input"}
             <input type="hidden"
                    data-date-range-input="max"
-                   id="{$facet->getMaxFieldName()|escape:'htmlall'}"
-                   name="{$facet->getMaxFieldName()|escape:'htmlall'}"
+                   id="{$facet->getMaxFieldName()|escapeHtmlAttr}"
+                   name="{$facet->getMaxFieldName()|escapeHtmlAttr}"
                    value="{if $facet->isActive()}{$startMax}{/if}" />
         {/block}
     </div>
-{/block}
\ No newline at end of file
+{/block}
diff --git a/themes/Frontend/Bare/frontend/listing/filter/facet-date.tpl b/themes/Frontend/Bare/frontend/listing/filter/facet-date.tpl
index 54e63023f73..5bb1c3debf3 100644
--- a/themes/Frontend/Bare/frontend/listing/filter/facet-date.tpl
+++ b/themes/Frontend/Bare/frontend/listing/filter/facet-date.tpl
@@ -5,17 +5,17 @@
 {/block}
 
 {block name="frontend_listing_filter_facet_date"}
-    <div class="filter-panel filter--date filter-facet--date facet--{$facet->getFacetName()|escape:'htmlall'}"
+    <div class="filter-panel filter--date filter-facet--date facet--{$facet->getFacetName()|escapeHtmlAttr}"
          data-filter-type="date"
-         data-facet-name="{$facet->getFacetName()}"
-         data-field-name="{$facet->getFacetName()|escape:'htmlall'}">
+         data-facet-name="{$facet->getFacetName()|escapeHtmlAttr}"
+         data-field-name="{$facet->getFacetName()|escapeHtmlAttr}">
 
         {block name="frontend_listing_filter_facet_date_flyout"}
             <div class="filter-panel--flyout">
 
                 {block name="frontend_listing_filter_facet_date_title"}
-                    <label class="filter-panel--title" for="{$facet->getFieldName()|escape:'htmlall'}" title="{$facet->getLabel()|escape:'htmlall'}">
-                        {$facet->getLabel()|escape}
+                    <label class="filter-panel--title" for="{$facet->getFieldName()|escapeHtmlAttr}" title="{$facet->getLabel()|escapeHtmlAttr}">
+                        {$facet->getLabel()|escapeHtml}
                     </label>
                 {/block}
 
@@ -39,8 +39,8 @@
                         {block name="frontend_listing_filter_facet_date_input"}
                             <input type="text"
                                    class="filter-panel--input"
-                                   name="{$facet->getFieldName()|escape:'htmlall'}"
-                                   id="{$facet->getFieldName()|escape:'htmlall'}"
+                                   name="{$facet->getFieldName()|escapeHtmlAttr}"
+                                   id="{$facet->getFieldName()|escapeHtmlAttr}"
                                    placeholder="{s name="datePickerInputPlaceholder" namespace="frontend/index/datepicker"}{/s}"
                                    data-datepicker="true"
                                    data-mode="single"
@@ -55,4 +55,4 @@
             </div>
         {/block}
     </div>
-{/block}
\ No newline at end of file
+{/block}
diff --git a/themes/Frontend/Bare/frontend/listing/filter/facet-group.tpl b/themes/Frontend/Bare/frontend/listing/filter/facet-group.tpl
index e915a8cb2ff..bb0370ab1e7 100644
--- a/themes/Frontend/Bare/frontend/listing/filter/facet-group.tpl
+++ b/themes/Frontend/Bare/frontend/listing/filter/facet-group.tpl
@@ -1,4 +1,4 @@
 {if $facet->getLabel()}
-    <h3 class="filter--set-title">{$facet->getLabel()|escape}</h3>
+    <h3 class="filter--set-title">{$facet->getLabel()|escapeHtml}</h3>
 {/if}
 {include file="frontend/listing/actions/action-filter-facets.tpl" facets=$facet->getFacetResults()}
diff --git a/themes/Frontend/Bare/frontend/listing/filter/facet-range.tpl b/themes/Frontend/Bare/frontend/listing/filter/facet-range.tpl
index f13af7b9cc9..8d315f47d67 100644
--- a/themes/Frontend/Bare/frontend/listing/filter/facet-range.tpl
+++ b/themes/Frontend/Bare/frontend/listing/filter/facet-range.tpl
@@ -1,17 +1,17 @@
 {namespace name="frontend/listing/listing_actions"}
 
 {block name="frontend_listing_filter_facet_range"}
-    <div class="filter-panel filter--range facet--{$facet->getFacetName()|escape:'htmlall'}"
+    <div class="filter-panel filter--range facet--{$facet->getFacetName()|escapeHtmlAttr}"
          data-filter-type="range"
-         data-facet-name="{$facet->getFacetName()}"
-         data-field-name="{$facet->getFacetName()|escape:'htmlall'}">
+         data-facet-name="{$facet->getFacetName()|escapeHtmlAttr}"
+         data-field-name="{$facet->getFacetName()|escapeHtmlAttr}">
 
         {block name="frontend_listing_filter_facet_range_flyout"}
             <div class="filter-panel--flyout">
 
                 {block name="frontend_listing_filter_facet_range_title"}
-                    <label class="filter-panel--title" title="{$facet->getLabel()|escape:'htmlall'}">
-                        {$facet->getLabel()|escape}
+                    <label class="filter-panel--title" title="{$facet->getLabel()|escapeHtmlAttr}">
+                        {$facet->getLabel()|escapeHtml}
                     </label>
                 {/block}
 
@@ -54,16 +54,16 @@
 
                                 {block name="frontend_listing_filter_facet_range_input_min"}
                                     <input type="hidden"
-                                           id="{$facet->getMinFieldName()|escape:'htmlall'}"
-                                           name="{$facet->getMinFieldName()|escape:'htmlall'}"
+                                           id="{$facet->getMinFieldName()|escapeHtmlAttr}"
+                                           name="{$facet->getMinFieldName()|escapeHtmlAttr}"
                                            data-range-input="min"
                                            value="{$startMin}" {if !$facet->isActive() || $startMin == 0}disabled="disabled" {/if}/>
                                 {/block}
 
                                 {block name="frontend_listing_filter_facet_range_input_max"}
                                     <input type="hidden"
-                                           id="{$facet->getMaxFieldName()|escape:'htmlall'}"
-                                           name="{$facet->getMaxFieldName()|escape:'htmlall'}"
+                                           id="{$facet->getMaxFieldName()|escapeHtmlAttr}"
+                                           name="{$facet->getMaxFieldName()|escapeHtmlAttr}"
                                            data-range-input="max"
                                            value="{$startMax}" {if !$facet->isActive() || $startMax == 0}disabled="disabled" {/if}/>
                                 {/block}
@@ -79,7 +79,7 @@
 
                                         {block name="frontend_listing_filter_facet_range_label_min"}
                                             <label class="range-info--label"
-                                                   for="{$facet->getMinFieldName()|escape:'htmlall'}"
+                                                   for="{$facet->getMinFieldName()|escapeHtmlAttr}"
                                                    data-range-label="min">
                                                 {$startMin}
                                             </label>
@@ -93,7 +93,7 @@
 
                                         {block name="frontend_listing_filter_facet_range_label_max"}
                                             <label class="range-info--label"
-                                                   for="{$facet->getMaxFieldName()|escape:'htmlall'}"
+                                                   for="{$facet->getMaxFieldName()|escapeHtmlAttr}"
                                                    data-range-label="max">
                                                 {$startMax}
                                             </label>
diff --git a/themes/Frontend/Bare/frontend/listing/filter/facet-rating.tpl b/themes/Frontend/Bare/frontend/listing/filter/facet-rating.tpl
index fd72a67af76..64b307f3730 100644
--- a/themes/Frontend/Bare/frontend/listing/filter/facet-rating.tpl
+++ b/themes/Frontend/Bare/frontend/listing/filter/facet-rating.tpl
@@ -1,17 +1,17 @@
 {namespace name="frontend/listing/listing_actions"}
 
 {block name="frontend_listing_filter_facet_rating"}
-    <div class="filter-panel filter--rating facet--{$facet->getFacetName()|escape:'htmlall'}"
+    <div class="filter-panel filter--rating facet--{$facet->getFacetName()|escapeHtmlAttr}"
          data-filter-type="rating"
-         data-facet-name="{$facet->getFacetName()}"
-         data-field-name="{$facet->getFieldName()|escape:'htmlall'}">
+         data-facet-name="{$facet->getFacetName()|escapeHtmlAttr}"
+         data-field-name="{$facet->getFieldName()|escapeHtmlAttr}">
 
         {block name="frontend_listing_filter_facet_rating_flyout"}
             <div class="filter-panel--flyout">
 
                 {block name="frontend_listing_filter_facet_rating_title"}
-                    <label class="filter-panel--title" title="{$facet->getLabel()|escape:'htmlall'}">
-                        {$facet->getLabel()|escape}
+                    <label class="filter-panel--title" title="{$facet->getLabel()|escapeHtmlAttr}">
+                        {$facet->getLabel()|escapeHtml}
                     </label>
                 {/block}
 
diff --git a/themes/Frontend/Bare/frontend/listing/filter/facet-value-tree.tpl b/themes/Frontend/Bare/frontend/listing/filter/facet-value-tree.tpl
index 50e24fafc4e..7569d5a89ec 100644
--- a/themes/Frontend/Bare/frontend/listing/filter/facet-value-tree.tpl
+++ b/themes/Frontend/Bare/frontend/listing/filter/facet-value-tree.tpl
@@ -7,17 +7,17 @@
         {$type = 'value-tree-single'}
     {/if}
 
-    <div class="filter-panel filter--value-tree facet--{$facet->getFacetName()|escape:'htmlall'}"
+    <div class="filter-panel filter--value-tree facet--{$facet->getFacetName()|escapeHtmlAttr}"
          data-filter-type="{$type}"
-         data-facet-name="{$facet->getFacetName()}"
-         data-field-name="{$facet->getFieldName()|escape:'htmlall'}">
+         data-facet-name="{$facet->getFacetName()|escapeHtmlAttr}"
+         data-field-name="{$facet->getFieldName()|escapeHtmlAttr}">
 
         {block name="frontend_listing_filter_facet_value_tree_flyout"}
             <div class="filter-panel--flyout">
 
                 {block name="frontend_listing_filter_facet_value_tree_title"}
-                    <label class="filter-panel--title" title="{$facet->getLabel()|escape:'htmlall'}">
-                        {$facet->getLabel()|escape}
+                    <label class="filter-panel--title" title="{$facet->getLabel()|escapeHtmlAttr}">
+                        {$facet->getLabel()|escapeHtml}
                     </label>
                 {/block}
 
@@ -45,9 +45,9 @@
                                                             <span class="filter-panel--input filter-panel--checkbox{if $disabled} is--disabled{/if}">
                                                                 <input type="checkbox"
                                                                        data-parent-id="{$parent}"
-                                                                       id="__{$facet->getFieldName()|escape:'htmlall'}__{$option->getId()|escape:'htmlall'}"
-                                                                       name="__{$facet->getFieldName()|escape:'htmlall'}__{$option->getId()|escape:'htmlall'}"
-                                                                       value="{$option->getId()|escape:'htmlall'}"
+                                                                       id="__{$facet->getFieldName()|escapeHtmlAttr}__{$option->getId()|escapeHtmlAttr}"
+                                                                       name="__{$facet->getFieldName()|escapeHtmlAttr}__{$option->getId()|escapeHtmlAttr}"
+                                                                       value="{$option->getId()|escapeHtmlAttr}"
                                                                        {if $option->isActive()}checked="checked"{elseif $disabled}disabled="disabled"{/if}/>
 
                                                                 <span class="input--state checkbox--state">&nbsp;</span>
@@ -56,8 +56,8 @@
 
                                                         {block name="frontend_listing_filter_facet_value_tree_label"}
                                                             <label class="filter-panel--label value-tree--label"
-                                                                   for="__{$facet->getFieldName()|escape:'htmlall'}__{$option->getId()|escape:'htmlall'}">
-                                                                {$option->getLabel()|escape}
+                                                                   for="__{$facet->getFieldName()|escapeHtmlAttr}__{$option->getId()|escapeHtmlAttr}">
+                                                                {$option->getLabel()|escapeHtml}
                                                             </label>
                                                         {/block}
                                                     </div>
diff --git a/themes/Frontend/Bare/frontend/listing/header.tpl b/themes/Frontend/Bare/frontend/listing/header.tpl
index 697b21aeb2e..2e2ca57559f 100644
--- a/themes/Frontend/Bare/frontend/listing/header.tpl
+++ b/themes/Frontend/Bare/frontend/listing/header.tpl
@@ -36,7 +36,7 @@
 {/block}
 
 {* Description *}
-{block name="frontend_index_header_meta_description"}{if $sCategoryContent.metaDescription}{$sCategoryContent.metaDescription|strip_tags|escape}{else}{s name="IndexMetaDescriptionStandard"}{/s}{/if}{/block}
+{block name="frontend_index_header_meta_description"}{if $sCategoryContent.metaDescription}{$sCategoryContent.metaDescription|strip_tags|escapeHtml}{else}{s name="IndexMetaDescriptionStandard"}{/s}{/if}{/block}
 
 {* Canonical link *}
 {block name='frontend_index_header_canonical'}
@@ -47,7 +47,7 @@
         {$pages = ceil($sNumberArticles / $criteria->getLimit())}
     {/if}
 
-    {if $SeoMetaRobots|strpos:'noindex' === false}
+    {if !$SeoMetaRobots || $SeoMetaRobots|strpos:'noindex' === false}
         <link rel="canonical" href="{url params = $sCategoryContent.canonicalParams}"/>
     {/if}
 
diff --git a/themes/Frontend/Bare/frontend/listing/listing.tpl b/themes/Frontend/Bare/frontend/listing/listing.tpl
index f846e7a9a8c..5c394cae027 100644
--- a/themes/Frontend/Bare/frontend/listing/listing.tpl
+++ b/themes/Frontend/Bare/frontend/listing/listing.tpl
@@ -26,7 +26,7 @@
 
                     {if $showListingButton}
                         <div class="{$showListingCls}{if $fullscreen} is--align-center{/if}">
-                            <a href="{url controller='cat' sPage=1 sCategory=$sCategoryContent.id}" title="{$sCategoryContent.name|escape}" class="link--show-listing{if $fullscreen} btn is--primary{/if}">
+                            <a href="{url controller='cat' sPage=1 sCategory=$sCategoryContent.id}" title="{$sCategoryContent.name|escapeHtml}" class="link--show-listing{if $fullscreen} btn is--primary{/if}">
                                 {s name="ListingActionsOffersLink"}Weitere Artikel in dieser Kategorie &raquo;{/s}
                             </a>
                         </div>
diff --git a/themes/Frontend/Bare/frontend/listing/manufacturer.tpl b/themes/Frontend/Bare/frontend/listing/manufacturer.tpl
index f8168136ce8..a0a4c1cf726 100644
--- a/themes/Frontend/Bare/frontend/listing/manufacturer.tpl
+++ b/themes/Frontend/Bare/frontend/listing/manufacturer.tpl
@@ -74,7 +74,7 @@
                     {/if}
                     {if $thumbnail}
                         <div class="vendor--image-wrapper">
-                            <img class="vendor--image" src="{$thumbnail}" alt="{$manufacturer->getName()|escape}">
+                            <img class="vendor--image" src="{$thumbnail}" alt="{$manufacturer->getName()|escapeHtml}">
                         </div>
                     {/if}
                 {/if}
diff --git a/themes/Frontend/Bare/frontend/listing/product-box/box-big-image.tpl b/themes/Frontend/Bare/frontend/listing/product-box/box-big-image.tpl
index d56b1efff9e..1002d3b27e0 100644
--- a/themes/Frontend/Bare/frontend/listing/product-box/box-big-image.tpl
+++ b/themes/Frontend/Bare/frontend/listing/product-box/box-big-image.tpl
@@ -6,19 +6,19 @@
 
 {block name='frontend_listing_box_article_picture'}
     <a href="{$sArticle.linkDetails}"
-       title="{$sArticle.articleName|escape}"
+       title="{$sArticle.articleName|escapeHtml}"
        class="product--image">
         {block name='frontend_listing_box_article_image_element'}
             <span class="image--element">
             {block name='frontend_listing_box_article_image_media'}
                 <span class="image--media">
 
-                    {$desc = $sArticle.articleName|escape}
+                    {$desc = $sArticle.articleName|escapeHtml}
 
                     {if isset($sArticle.image.thumbnails)}
 
                         {if $sArticle.image.description}
-                            {$desc = $sArticle.image.description|escape}
+                            {$desc = $sArticle.image.description|escapeHtml}
                         {/if}
 
                         {block name='frontend_listing_box_article_image_picture_element'}
diff --git a/themes/Frontend/Bare/frontend/listing/product-box/box-emotion.tpl b/themes/Frontend/Bare/frontend/listing/product-box/box-emotion.tpl
index e08df1eb763..926a7abd4d2 100644
--- a/themes/Frontend/Bare/frontend/listing/product-box/box-emotion.tpl
+++ b/themes/Frontend/Bare/frontend/listing/product-box/box-emotion.tpl
@@ -1,134 +1,134 @@
-{namespace name="frontend/listing/box_article"}
-
-{block name="frontend_listing_box_article"}
-    <div class="product--box box--{$productBoxLayout}" data-ordernumber="{$sArticle.ordernumber}">
-
-        {block name="frontend_listing_box_article_product_name"}
-            {$productName = $sArticle.articleName}
-            {if $sArticle.additionaltext}
-                {$productName = $productName|cat:' '|cat:$sArticle.additionaltext}
-            {/if}
-        {/block}
-
-        {block name="frontend_listing_box_article_content"}
-            <div class="box--content">
-
-                {* Product badges *}
-                {block name='frontend_listing_box_article_badges_container'}
-                    {if !$imageOnly}
-                        {include file="frontend/listing/product-box/product-badges.tpl"}
-                    {/if}
-                {/block}
-
-                {block name='frontend_listing_box_article_info_container'}
-                    <div class="product--info">
-
-                        {* Product image *}
-                        {block name='frontend_listing_box_article_picture'}
-                            <a href="{$sArticle.linkDetails}"
-                               title="{$productName|escape}"
-                               class="product--image{if $imageOnly} is--large{/if}">
-
-                                {block name='frontend_listing_box_article_image_element'}
-                                    <span class="image--element">
-
-                                        {block name='frontend_listing_box_article_image_media'}
-                                            <span class="image--media">
-
-                                                {block name='frontend_listing_box_article_image_picture'}
-
-                                                    {$desc = $productName|escape}
-
-                                                    {if $sArticle.image.description}
-                                                        {$desc = $sArticle.image.description|escape}
-                                                    {/if}
-
-                                                    {if $sArticle.image.thumbnails}
-
-                                                        {if $element.viewports && !$fixedImageSize}
-                                                            {foreach $element.viewports as $viewport}
-                                                                {$cols = ($viewport.endCol - $viewport.startCol) + 1}
-                                                                {$elementSize = $cols * $cellWidth}
-                                                                {$size = "{$elementSize}vw"}
-
-                                                                {if $breakpoints[$viewport.alias]}
-
-                                                                    {if $viewport.alias === 'xl' && !$emotionFullscreen}
-                                                                        {$size = "calc({$elementSize / 100} * {$baseWidth}px)"}
-                                                                        {$size = "(min-width: {$baseWidth}px) {$size}"}
-                                                                    {else}
-                                                                        {$size = "(min-width: {$breakpoints[$viewport.alias]}) {$size}"}
-                                                                    {/if}
-                                                                {/if}
-
-                                                                {$itemSize = "{$size}{if $itemSize}, {$itemSize}{/if}"}
-                                                            {/foreach}
-                                                        {else}
-                                                            {$itemSize = "200px"}
-                                                        {/if}
-
-                                                        {$srcSet = ''}
-                                                        {$srcSetRetina = ''}
-
-                                                        {foreach $sArticle.image.thumbnails as $image}
-                                                            {$srcSet = "{if $srcSet}{$srcSet}, {/if}{$image.source} {$image.maxWidth}w"}
-
-                                                            {if $image.retinaSource}
-                                                                {$srcSetRetina = "{if $srcSetRetina}{$srcSetRetina}, {/if}{$image.retinaSource} {$image.maxWidth * 2}w"}
-                                                            {/if}
-                                                        {/foreach}
-
-                                                        <picture>
-                                                            <source sizes="{$itemSize}" srcset="{$srcSetRetina}" media="(min-resolution: 192dpi)" />
-                                                            <source sizes="{$itemSize}" srcset="{$srcSet}" />
-
-                                                            <img src="{$sArticle.image.thumbnails[0].source}" alt="{$desc|strip_tags|truncate:160}" />
-                                                        </picture>
-
-                                                    {elseif $sArticle.image.source}
-                                                        <img src="{$sArticle.image.source}" alt="{$desc|strip_tags|truncate:160}" />
-                                                    {else}
-                                                        <img src="{link file='frontend/_public/src/img/no-picture.jpg'}" alt="{$desc|strip_tags|truncate:160}" />
-                                                    {/if}
-                                                {/block}
-                                            </span>
-                                        {/block}
-                                    </span>
-                                {/block}
-                            </a>
-                        {/block}
-
-                        {if !$imageOnly}
-                            <div class="product--details">
-
-                                {* Product name *}
-                                {block name='frontend_listing_box_article_name'}
-                                    <a href="{$sArticle.linkDetails}"
-                                       class="product--title"
-                                       title="{$productName|escapeHtml}">
-                                        {$productName|truncate:50|escapeHtml}
-                                    </a>
-                                {/block}
-
-                                {block name='frontend_listing_box_article_price_info'}
-                                    <div class="product--price-info">
-
-                                        {* Product price - Unit price *}
-                                        {block name='frontend_listing_box_article_unit'}
-                                            {include file="frontend/listing/product-box/product-price-unit.tpl"}
-                                        {/block}
-
-                                        {* Product price - Default and discount price *}
-                                        {block name='frontend_listing_box_article_price'}
-                                            {include file="frontend/listing/product-box/product-price.tpl"}
-                                        {/block}
-                                    </div>
-                                {/block}
-                            </div>
-                        {/if}
-                    </div>
-                {/block}
-            </div>
-        {/block}
-    </div>
-{/block}
+{namespace name="frontend/listing/box_article"}
+
+{block name="frontend_listing_box_article"}
+    <div class="product--box box--{$productBoxLayout}" data-ordernumber="{$sArticle.ordernumber}">
+
+        {block name="frontend_listing_box_article_product_name"}
+            {$productName = $sArticle.articleName}
+            {if $sArticle.additionaltext}
+                {$productName = $productName|cat:' '|cat:$sArticle.additionaltext}
+            {/if}
+        {/block}
+
+        {block name="frontend_listing_box_article_content"}
+            <div class="box--content">
+
+                {* Product badges *}
+                {block name='frontend_listing_box_article_badges_container'}
+                    {if !$imageOnly}
+                        {include file="frontend/listing/product-box/product-badges.tpl"}
+                    {/if}
+                {/block}
+
+                {block name='frontend_listing_box_article_info_container'}
+                    <div class="product--info">
+
+                        {* Product image *}
+                        {block name='frontend_listing_box_article_picture'}
+                            <a href="{$sArticle.linkDetails}"
+                               title="{$productName|escapeHtml}"
+                               class="product--image{if $imageOnly} is--large{/if}">
+
+                                {block name='frontend_listing_box_article_image_element'}
+                                    <span class="image--element">
+
+                                        {block name='frontend_listing_box_article_image_media'}
+                                            <span class="image--media">
+
+                                                {block name='frontend_listing_box_article_image_picture'}
+
+                                                    {$desc = $productName|escapeHtml}
+
+                                                    {if $sArticle.image.description}
+                                                        {$desc = $sArticle.image.description|escapeHtml}
+                                                    {/if}
+
+                                                    {if $sArticle.image.thumbnails}
+
+                                                        {if $element.viewports && !$fixedImageSize}
+                                                            {foreach $element.viewports as $viewport}
+                                                                {$cols = ($viewport.endCol - $viewport.startCol) + 1}
+                                                                {$elementSize = $cols * $cellWidth}
+                                                                {$size = "{$elementSize}vw"}
+
+                                                                {if $breakpoints[$viewport.alias]}
+
+                                                                    {if $viewport.alias === 'xl' && !$emotionFullscreen}
+                                                                        {$size = "calc({$elementSize / 100} * {$baseWidth}px)"}
+                                                                        {$size = "(min-width: {$baseWidth}px) {$size}"}
+                                                                    {else}
+                                                                        {$size = "(min-width: {$breakpoints[$viewport.alias]}) {$size}"}
+                                                                    {/if}
+                                                                {/if}
+
+                                                                {$itemSize = "{$size}{if $itemSize}, {$itemSize}{/if}"}
+                                                            {/foreach}
+                                                        {else}
+                                                            {$itemSize = "200px"}
+                                                        {/if}
+
+                                                        {$srcSet = ''}
+                                                        {$srcSetRetina = ''}
+
+                                                        {foreach $sArticle.image.thumbnails as $image}
+                                                            {$srcSet = "{if $srcSet}{$srcSet}, {/if}{$image.source} {$image.maxWidth}w"}
+
+                                                            {if $image.retinaSource}
+                                                                {$srcSetRetina = "{if $srcSetRetina}{$srcSetRetina}, {/if}{$image.retinaSource} {$image.maxWidth * 2}w"}
+                                                            {/if}
+                                                        {/foreach}
+
+                                                        <picture>
+                                                            <source sizes="{$itemSize}" srcset="{$srcSetRetina}" media="(min-resolution: 192dpi)" />
+                                                            <source sizes="{$itemSize}" srcset="{$srcSet}" />
+
+                                                            <img src="{$sArticle.image.thumbnails[0].source}" alt="{$desc|strip_tags|truncate:160}" />
+                                                        </picture>
+
+                                                    {elseif $sArticle.image.source}
+                                                        <img src="{$sArticle.image.source}" alt="{$desc|strip_tags|truncate:160}" />
+                                                    {else}
+                                                        <img src="{link file='frontend/_public/src/img/no-picture.jpg'}" alt="{$desc|strip_tags|truncate:160}" />
+                                                    {/if}
+                                                {/block}
+                                            </span>
+                                        {/block}
+                                    </span>
+                                {/block}
+                            </a>
+                        {/block}
+
+                        {if !$imageOnly}
+                            <div class="product--details">
+
+                                {* Product name *}
+                                {block name='frontend_listing_box_article_name'}
+                                    <a href="{$sArticle.linkDetails}"
+                                       class="product--title"
+                                       title="{$productName|escapeHtml}">
+                                        {$productName|truncate:50|escapeHtml}
+                                    </a>
+                                {/block}
+
+                                {block name='frontend_listing_box_article_price_info'}
+                                    <div class="product--price-info">
+
+                                        {* Product price - Unit price *}
+                                        {block name='frontend_listing_box_article_unit'}
+                                            {include file="frontend/listing/product-box/product-price-unit.tpl"}
+                                        {/block}
+
+                                        {* Product price - Default and discount price *}
+                                        {block name='frontend_listing_box_article_price'}
+                                            {include file="frontend/listing/product-box/product-price.tpl"}
+                                        {/block}
+                                    </div>
+                                {/block}
+                            </div>
+                        {/if}
+                    </div>
+                {/block}
+            </div>
+        {/block}
+    </div>
+{/block}
diff --git a/themes/Frontend/Bare/frontend/listing/product-box/box-minimal.tpl b/themes/Frontend/Bare/frontend/listing/product-box/box-minimal.tpl
index 39b1f15c5ad..23cb56b5582 100644
--- a/themes/Frontend/Bare/frontend/listing/product-box/box-minimal.tpl
+++ b/themes/Frontend/Bare/frontend/listing/product-box/box-minimal.tpl
@@ -45,13 +45,13 @@
                 {if $sArticle.regulationPrice}
                     <div class="price--regulation">
 
-                        {block name='frontend_listing_box_article_price_discount_before'}
+                        {block name='frontend_listing_box_article_price_regulation_before'}
                             {s name="priceRegulationLabel" namespace="frontend/detail/data"}{/s}
                         {/block}
 
                         {$sArticle.regulationPrice|currency}{s name="Star" namespace="frontend/listing/box_article"}{/s}
 
-                        {block name='frontend_listing_box_article_price_discount_after'}
+                        {block name='frontend_listing_box_article_price_regulation_after'}
                             {s name="priceRegulationInfo" namespace="frontend/detail/data"}{/s}
                         {/block}
                     </div>
@@ -60,4 +60,3 @@
         </div>
     </div>
 {/block}
-
diff --git a/themes/Frontend/Bare/frontend/listing/product-box/product-actions.tpl b/themes/Frontend/Bare/frontend/listing/product-box/product-actions.tpl
index 360ca8d6b7b..00d6c62cb47 100644
--- a/themes/Frontend/Bare/frontend/listing/product-box/product-actions.tpl
+++ b/themes/Frontend/Bare/frontend/listing/product-box/product-actions.tpl
@@ -24,8 +24,8 @@
             <form action="{url controller='note' action='add' ordernumber=$sArticle.ordernumber _seo=false}" method="post">
                 {s name="DetailLinkNotepad" namespace="frontend/detail/actions" assign="snippetDetailLinkNotepad"}{/s}
                 <button type="submit"
-                   title="{$snippetDetailLinkNotepad|escape}"
-                   aria-label="{$snippetDetailLinkNotepad|escape}"
+                   title="{$snippetDetailLinkNotepad|escapeHtml}"
+                   aria-label="{$snippetDetailLinkNotepad|escapeHtml}"
                    class="product--action action--note"
                    data-ajaxUrl="{url controller='note' action='ajaxAdd' ordernumber=$sArticle.ordernumber _seo=false}"
                    data-text="{s name="DetailNotepadMarked"}{/s}">
diff --git a/themes/Frontend/Bare/frontend/listing/product-box/product-image.tpl b/themes/Frontend/Bare/frontend/listing/product-box/product-image.tpl
index 5640b111e1c..b9a0da445c4 100644
--- a/themes/Frontend/Bare/frontend/listing/product-box/product-image.tpl
+++ b/themes/Frontend/Bare/frontend/listing/product-box/product-image.tpl
@@ -1,6 +1,6 @@
 {* Product image - uses the picture element for responsive retina images. *}
 <a href="{$sArticle.linkDetails}"
-   title="{$sArticle.articleName|escape}"
+   title="{$sArticle.articleName|escapeHtml}"
    class="product--image"
    {block name='frontend_listing_box_article_image_attributes'}{/block}
    >
@@ -9,12 +9,12 @@
             {block name='frontend_listing_box_article_image_media'}
                 <span class="image--media">
 
-                    {$desc = $sArticle.articleName|escape}
+                    {$desc = $sArticle.articleName|escapeHtml}
 
                     {if isset($sArticle.image.thumbnails)}
 
                         {if $sArticle.image.description}
-                            {$desc = $sArticle.image.description|escape}
+                            {$desc = $sArticle.image.description|escapeHtml}
                         {/if}
 
                         {block name='frontend_listing_box_article_image_picture_element'}
diff --git a/themes/Frontend/Bare/frontend/listing/product-box/product-price-unit.tpl b/themes/Frontend/Bare/frontend/listing/product-box/product-price-unit.tpl
index 516a84fe6bf..a9aa12aab48 100644
--- a/themes/Frontend/Bare/frontend/listing/product-box/product-price-unit.tpl
+++ b/themes/Frontend/Bare/frontend/listing/product-box/product-price-unit.tpl
@@ -1,18 +1,18 @@
 {namespace name="frontend/listing/box_article"}
 
-{$tooltip = "{s name='ListingBoxArticleContent'}{/s}"|escape:'html'}
+{$tooltip = "{s name='ListingBoxArticleContent'}{/s}"|escapeHtml:'html'}
 {$hasPurchaseUnit = $sArticle.purchaseunit && $sArticle.purchaseunit != 0}
 {$hasReferenceUnit = $sArticle.purchaseunit && $sArticle.referenceunit && $sArticle.purchaseunit != $sArticle.referenceunit}
 
 {if $hasPurchaseUnit}
     {$purchaseUnit = "{$sArticle.purchaseunit} {$sArticle.sUnit.description}"}
-    {$tooltip = "{$tooltip} {$purchaseUnit|escape:'html'}"}
+    {$tooltip = "{$tooltip} {$purchaseUnit|escapeHtml:'html'}"}
 {/if}
 
 {if $hasReferenceUnit}
     {$price = "{$sArticle.referenceprice|currency}"}
     {$unit = "{s name='Star'}{/s} / {$sArticle.referenceunit} {$sArticle.sUnit.description}"}
-    {$referenceUnit = "({$price} {$unit|escape:'html'})"}
+    {$referenceUnit = "({$price} {$unit|escapeHtml:'html'})"}
     {$tooltip = "{$tooltip} {$referenceUnit}"}
 {/if}
 
diff --git a/themes/Frontend/Bare/frontend/listing/product-box/product-price.tpl b/themes/Frontend/Bare/frontend/listing/product-box/product-price.tpl
index ab44dc34bde..d5a8a09df54 100644
--- a/themes/Frontend/Bare/frontend/listing/product-box/product-price.tpl
+++ b/themes/Frontend/Bare/frontend/listing/product-box/product-price.tpl
@@ -37,13 +37,13 @@
         {if $sArticle.regulationPrice}
             <div class="price--regulation">
 
-                {block name='frontend_listing_box_article_price_discount_before'}
+                {block name='frontend_listing_box_article_price_regulation_before'}
                     {s name="priceRegulationLabel" namespace="frontend/detail/data"}{/s}
                 {/block}
 
                 {$sArticle.regulationPrice|currency}{s name="Star" namespace="frontend/listing/box_article"}{/s}
 
-                {block name='frontend_listing_box_article_price_discount_after'}
+                {block name='frontend_listing_box_article_price_regulation_after'}
                     {s name="priceRegulationInfo" namespace="frontend/detail/data"}{/s}
                 {/block}
             </div>
diff --git a/themes/Frontend/Bare/frontend/listing/rss.tpl b/themes/Frontend/Bare/frontend/listing/rss.tpl
index 4f4d7f043b0..e423493988b 100644
--- a/themes/Frontend/Bare/frontend/listing/rss.tpl
+++ b/themes/Frontend/Bare/frontend/listing/rss.tpl
@@ -2,19 +2,19 @@
 {s name='IndexXmlLang' namespace='frontend/index/index' assign='rssChannelLanguage'}{/s}
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
     <channel>
-        <atom:link href="{$sCategoryContent.rssFeed|escape}" rel="self" type="application/rss+xml"/>
-        <title>{block name='frontend_atom_title'}{$sCategoryContent.description|escape:'hexentity'}{/block}</title>
+        <atom:link href="{$sCategoryContent.rssFeed|escapeHtml}" rel="self" type="application/rss+xml"/>
+        <title>{block name='frontend_atom_title'}{$sCategoryContent.description|escapeHtml:'hexentity'}{/block}</title>
         <link>{url controller='index'}</link>
-        <description>{$sShopname|escapeHtml} - {$sCategoryContent.description|escape:'hexentity'}</description>
+        <description>{$sShopname|escapeHtml} - {$sCategoryContent.description|escapeHtml:'hexentity'}</description>
         <language>{$rssChannelLanguage|strtolower}</language>
         <lastBuildDate>{time()|date:rss}</lastBuildDate>
         {foreach from=$sArticles item=sArticle key=key name="counter"}
             <item>
-                <title>{block name='frontend_listing_rss_article_name'}{$sArticle.articleName|escape}{/block}</title>
-                <guid>{block name='frontend_listing_rss_guid'}{$sArticle.linkDetails|escape}{/block}</guid>
-                <link>{block name='frontend_listing_rss_link'}{$sArticle.linkDetails|escape}{/block}</link>
-                <description>{block name='frontend_listing_rss_description'}{$sArticle.description_long|strip_tags|strip|truncate:280:"...":true|escape}{/block}</description>
-                <category>{block name='frontend_listing_rss_category'}{$sArticle.supplierName|escape}{/block}</category>
+                <title>{block name='frontend_listing_rss_article_name'}{$sArticle.articleName|escapeHtml}{/block}</title>
+                <guid>{block name='frontend_listing_rss_guid'}{$sArticle.linkDetails|escapeHtml}{/block}</guid>
+                <link>{block name='frontend_listing_rss_link'}{$sArticle.linkDetails|escapeHtml}{/block}</link>
+                <description>{block name='frontend_listing_rss_description'}{$sArticle.description_long|strip_tags|strip|truncate:280:"...":true|escapeHtml}{/block}</description>
+                <category>{block name='frontend_listing_rss_category'}{$sArticle.supplierName|escapeHtml}{/block}</category>
                 {if $sArticle.changetime}
                     <pubDate>{block name='frontend_listing_rss_date'}{$sArticle.changetime|date:rss}{/block}</pubDate>
                 {/if}
diff --git a/themes/Frontend/Bare/frontend/listing/text.tpl b/themes/Frontend/Bare/frontend/listing/text.tpl
index 1d3d81c7a0a..4c1947e42ea 100644
--- a/themes/Frontend/Bare/frontend/listing/text.tpl
+++ b/themes/Frontend/Bare/frontend/listing/text.tpl
@@ -29,7 +29,7 @@
                             <div class="teaser--text-short is--hidden">
                                 {$sCategoryContent.cmstext|strip_tags|truncate:200}
                                 {s namespace="frontend/listing/listing" name="ListingActionsOpenOffCanvas" assign="snippetListingActionsOpenOffCanvas"}{/s}
-                                <a href="#" title="{$snippetListingActionsOpenOffCanvas|escape}" class="text--offcanvas-link">
+                                <a href="#" title="{$snippetListingActionsOpenOffCanvas|escapeHtml}" class="text--offcanvas-link">
                                     {s namespace="frontend/listing/listing" name="ListingActionsOpenOffCanvas"}{/s} &raquo;
                                 </a>
                             </div>
@@ -42,7 +42,7 @@
                                 {* Close Button *}
                                 {block name="frontend_listing_text_content_offcanvas_close"}
                                     {s namespace="frontend/listing/listing" name="ListingActionsCloseOffCanvas" assign="snippetListingActionsCloseOffCanvas"}{/s}
-                                    <a href="#" title="{$snippetListingActionsCloseOffCanvas|escape}" class="close--off-canvas">
+                                    <a href="#" title="{$snippetListingActionsCloseOffCanvas|escapeHtml}" class="close--off-canvas">
                                         <i class="icon--arrow-left"></i> {s namespace="frontend/listing/listing" name="ListingActionsCloseOffCanvas"}{/s}
                                     </a>
                                 {/block}
diff --git a/themes/Frontend/Bare/frontend/newsletter/detail.tpl b/themes/Frontend/Bare/frontend/newsletter/detail.tpl
index 56692103430..5e515b7a0b0 100644
--- a/themes/Frontend/Bare/frontend/newsletter/detail.tpl
+++ b/themes/Frontend/Bare/frontend/newsletter/detail.tpl
@@ -21,7 +21,7 @@
                 {else}
 
                     {* Error message *}
-                    {block name='frontend_newsletter_listing_error_message'}
+                    {block name='frontend_newsletter_detail_error_message'}
                         {s name="NewsletterDetailInfoEmpty" assign="snippetNewsletterDetailInfoEmpty"}{/s}
                         {include file="frontend/_includes/messages.tpl" type="warning" content=$snippetNewsletterDetailInfoEmpty}
                     {/block}
@@ -45,4 +45,4 @@
         {/block}
 
     </div>
-{/block}
\ No newline at end of file
+{/block}
diff --git a/themes/Frontend/Bare/frontend/newsletter/index.tpl b/themes/Frontend/Bare/frontend/newsletter/index.tpl
index 47b5c880125..17ad7856588 100644
--- a/themes/Frontend/Bare/frontend/newsletter/index.tpl
+++ b/themes/Frontend/Bare/frontend/newsletter/index.tpl
@@ -108,19 +108,21 @@
                                 {if {config name="NewsletterExtendedFields"}}
                                     <div class="newsletter--additional-form">
 
-                                        {getSalutations variable="salutations"}
-
-                                        {* Salutation *}
-                                        {block name="frontend_newsletter_form_input_salutation"}
-                                            <div class="newsletter--salutation select-field">
-                                                <select name="salutation" class="field--select">
-                                                    <option value=""{if $smarty.post.salutation eq ""} selected="selected"{/if}>{s name='NewsletterRegisterPlaceholderSalutation'}{/s}</option>
-                                                    {foreach $salutations as $key => $label}
-                                                        <option value="{$key}"{if $smarty.post.salutation eq $key} selected="selected"{/if}>{$label}</option>
-                                                    {/foreach}
-                                                </select>
-                                            </div>
-                                        {/block}
+                                        {if {config name="shopSalutationRequired"}}
+                                            {getSalutations variable="salutations"}
+
+                                            {* Salutation *}
+                                            {block name="frontend_newsletter_form_input_salutation"}
+                                                <div class="newsletter--salutation select-field">
+                                                    <select name="salutation" class="field--select">
+                                                        <option value=""{if $smarty.post.salutation eq ""} selected="selected"{/if}>{s name='NewsletterRegisterPlaceholderSalutation'}{/s}</option>
+                                                        {foreach $salutations as $key => $label}
+                                                            <option value="{$key}"{if $smarty.post.salutation eq $key} selected="selected"{/if}>{$label}</option>
+                                                        {/foreach}
+                                                    </select>
+                                                </div>
+                                            {/block}
+                                        {/if}
 
                                         {* Firstname *}
                                         {block name="frontend_newsletter_form_input_firstname"}
diff --git a/themes/Frontend/Bare/frontend/plugins/notification/index.tpl b/themes/Frontend/Bare/frontend/plugins/notification/index.tpl
index c58dc223b8f..dd794674cfd 100644
--- a/themes/Frontend/Bare/frontend/plugins/notification/index.tpl
+++ b/themes/Frontend/Bare/frontend/plugins/notification/index.tpl
@@ -4,6 +4,9 @@
     {if $NotifyValid == true}
         {$messageType="success"}
         {s name="DetailNotifyInfoValid" assign="messageContent"}{/s}
+    {elseif $NotifyCaptchaError == true}
+        {$messageType="error"}
+        {s name='DetailNotifyCaptchaInvalid' assign="messageContent"}{/s}
     {elseif $NotifyInvalid == true && $NotifyAlreadyRegistered != true}
         {$messageType="warning"}
         {s name="DetailNotifyInfoInvalid" assign="messageContent"}{/s}
@@ -40,6 +43,15 @@
                     </button>
                 {/block}
 
+                {* Captcha *}
+                {block name='frontend_detail_index_notification_captcha'}
+                    <div class="is--align-center notification--captcha">
+                        {$captchaName = {config name="notificationCaptchaConfig"}}
+                        {$captchaHasError = $NotifyCaptchaError}
+                        {include file="widgets/captcha/custom_captcha.tpl" captchaName=$captchaName captchaHasError=$captchaHasError}
+                    </div>
+                {/block}
+
                 {* Data protection information *}
                 {block name="frontend_detail_index_notification_privacy"}
                     {if {config name="ACTDPRTEXT"} || {config name="ACTDPRCHECK"}}
diff --git a/themes/Frontend/Bare/frontend/register/billing_fieldset.tpl b/themes/Frontend/Bare/frontend/register/billing_fieldset.tpl
index 974915cf6c8..2446ea329b8 100644
--- a/themes/Frontend/Bare/frontend/register/billing_fieldset.tpl
+++ b/themes/Frontend/Bare/frontend/register/billing_fieldset.tpl
@@ -19,7 +19,7 @@
                                aria-required="true"
                                placeholder="{s name='RegisterPlaceholderCompany'}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}"
                                id="register_billing_company"
-                               value="{$form_data.company|escape}"
+                               value="{$form_data.company|escapeHtml}"
                                class="register--field is--required{if isset($error_flags.company)} has--error{/if}" />
                     </div>
                 {/block}
@@ -32,7 +32,7 @@
                                type="text"
                                placeholder="{s name='RegisterLabelDepartment'}{/s}"
                                id="register_billing_department"
-                               value="{$form_data.department|escape}"
+                               value="{$form_data.department|escapeHtml}"
                                class="register--field{if isset($error_flags.department)} has--error{/if}" />
                     </div>
                 {/block}
@@ -44,7 +44,7 @@
                                type="text" {if {config name="vatCheckRequired"}} required="required" aria-required="true"{/if}
                                placeholder="{s name='RegisterLabelTaxId'}{/s}{if {config name="vatcheckrequired"}}{s name="RequiredField" namespace="frontend/register/index"}{/s}{/if}"
                                id="register_billing_vatid"
-                               value="{$form_data.vatId|escape}"
+                               value="{$form_data.vatId|escapeHtml}"
                                 {if {config name="vatcheckrequired"}} required="required" aria-required="true"{/if}
                                class="register--field{if isset($error_flags.vatId)} has--error{/if}{if {config name="vatcheckrequired"}} is--required{/if}"/>
                     </div>
@@ -75,7 +75,7 @@
                                aria-required="true"
                                placeholder="{s name='RegisterBillingPlaceholderStreet'}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}"
                                id="street"
-                               value="{$form_data.street|escape}"
+                               value="{$form_data.street|escapeHtml}"
                                class="register--field register--field-street is--required{if isset($error_flags.street)} has--error{/if}" />
                     </div>
                 {/block}
@@ -89,7 +89,7 @@
                                    type="text"{if {config name="requireAdditionAddressLine1"}} required="required" aria-required="true"{/if}
                                    placeholder="{s name='RegisterLabelAdditionalAddressLine1'}{/s}{if {config name="requireAdditionAddressLine1"}}{s name="RequiredField" namespace="frontend/register/index"}{/s}{/if}"
                                    id="additionalAddressLine1"
-                                   value="{$form_data.additionalAddressLine1|escape}"
+                                   value="{$form_data.additionalAddressLine1|escapeHtml}"
                                    class="register--field{if {config name="requireAdditionAddressLine1"}} is--required{/if}{if isset($error_flags.additionalAddressLine1) && {config name="requireAdditionAddressLine1"}} has--error{/if}" />
                         </div>
                     {/if}
@@ -104,7 +104,7 @@
                                    type="text"{if {config name="requireAdditionAddressLine2"}} required="required" aria-required="true"{/if}
                                    placeholder="{s name='RegisterLabelAdditionalAddressLine2'}{/s}{if {config name="requireAdditionAddressLine2"}}{s name="RequiredField" namespace="frontend/register/index"}{/s}{/if}"
                                    id="additionalAddressLine2"
-                                   value="{$form_data.additionalAddressLine2|escape}"
+                                   value="{$form_data.additionalAddressLine2|escapeHtml}"
                                    class="register--field{if {config name="requireAdditionAddressLine2"}} is--required{/if}{if isset($error_flags.additionalAddressLine2) && {config name="requireAdditionAddressLine2"}} has--error{/if}" />
                         </div>
                     {/if}
@@ -121,7 +121,7 @@
                                    aria-required="true"
                                    placeholder="{s name='RegisterBillingPlaceholderZipcode'}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}"
                                    id="zipcode"
-                                   value="{$form_data.zipcode|escape}"
+                                   value="{$form_data.zipcode|escapeHtml}"
                                    class="register--field register--spacer register--field-zipcode is--required{if isset($error_flags.zipcode)} has--error{/if}" />
 
                             <input autocomplete="section-billing billing address-level2"
@@ -131,7 +131,7 @@
                                    aria-required="true"
                                    placeholder="{s name='RegisterBillingPlaceholderCity'}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}"
                                    id="city"
-                                   value="{$form_data.city|escape}"
+                                   value="{$form_data.city|escapeHtml}"
                                    size="25"
                                    class="register--field register--field-city is--required{if isset($error_flags.city)} has--error{/if}" />
                         {else}
@@ -142,7 +142,7 @@
                                    aria-required="true"
                                    placeholder="{s name='RegisterBillingPlaceholderCity'}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}"
                                    id="city"
-                                   value="{$form_data.city|escape}"
+                                   value="{$form_data.city|escapeHtml}"
                                    size="25"
                                    class="register--field register--spacer register--field-city is--required{if isset($error_flags.city)} has--error{/if}" />
 
@@ -153,7 +153,7 @@
                                    aria-required="true"
                                    placeholder="{s name='RegisterBillingPlaceholderZipcode'}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}"
                                    id="zipcode"
-                                   value="{$form_data.zipcode|escape}"
+                                   value="{$form_data.zipcode|escapeHtml}"
                                    class="register--field register--field-zipcode is--required{if isset($error_flags.zipcode)} has--error{/if}" />
                         {/if}
                     </div>
diff --git a/themes/Frontend/Bare/frontend/register/index.tpl b/themes/Frontend/Bare/frontend/register/index.tpl
index 3f8a75e1981..96762535c93 100644
--- a/themes/Frontend/Bare/frontend/register/index.tpl
+++ b/themes/Frontend/Bare/frontend/register/index.tpl
@@ -18,7 +18,7 @@
             {s name="FinishButtonBackToShop" namespace="frontend/checkout/finish" assign="snippetFinishButtonBackToShop"}{/s}
             <a href="{url controller='index'}"
                class="btn is--small btn--back-top-shop is--icon-left"
-               title="{$snippetFinishButtonBackToShop|escape}">
+               title="{$snippetFinishButtonBackToShop|escapeHtml}">
                 <i class="icon--arrow-left"></i>
                 {s name="FinishButtonBackToShop" namespace="frontend/checkout/finish"}{/s}
             </a>
@@ -101,7 +101,9 @@
         </div>
     {/block}
     {block name='frontend_register_index_registration'}
-        <div class="register--content panel content block has--border is--rounded{if $errors.occurred} is--collapsed{/if}" id="registration" data-register="true">
+        <div class="register--content panel content block has--border is--rounded{if $errors.occurred} is--collapsed{/if}"
+             id="registration" data-register="true"
+        >
 
             {block name='frontend_register_index_dealer_register'}
                 {* Included for compatibility reasons *}
@@ -131,7 +133,10 @@
             {/block}
 
             {block name='frontend_register_index_form'}
-                <form method="post" action="{url action=saveRegister sTarget=$sTarget sTargetAction=$sTargetAction}" class="panel register--form" id="register--form">
+                <form method="post"
+                      action="{url action=saveRegister sTarget=$sTarget sTargetAction=$sTargetAction}"
+                      class="panel register--form" id="register--form"
+                >
 
                     {* Invalid hash while option verification process *}
                     {block name='frontend_register_index_form_optin_invalid_hash'}
@@ -195,7 +200,15 @@
                                             {if {config name="ACTDPRCHECK"}}
                                                 {* Privacy checkbox *}
                                                 {block name="frontend_register_index_form_privacy_content_checkbox"}
-                                                    <input name="register[personal][dpacheckbox]" type="checkbox" id="dpacheckbox"{if $form_data.dpacheckbox} checked="checked"{/if} required="required" aria-required="true" value="1" class="is--required" />
+                                                    <input name="register[personal][dpacheckbox]"
+                                                           type="checkbox"
+                                                           id="dpacheckbox"
+                                                           {if $form_data.dpacheckbox} checked="checked"{/if}
+                                                           required="required"
+                                                           aria-required="true"
+                                                           value="1"
+                                                           class="is--required"
+                                                    />
                                                     <label for="dpacheckbox">
                                                         {s name="PrivacyText" namespace="frontend/index/privacy"}{/s}
                                                     </label>
@@ -215,7 +228,13 @@
                     {block name='frontend_register_index_form_submit'}
                         {* Submit button *}
                         <div class="register--action">
-                            <button type="submit" class="register--submit btn is--primary is--large is--icon-right" name="Submit" data-preloader-button="true">{s name="RegisterIndexNewActionSubmit"}{/s} <i class="icon--arrow-right"></i></button>
+                            <button type="submit"
+                                    class="register--submit btn is--primary is--large is--icon-right"
+                                    name="Submit"
+                                    data-preloader-button="true"
+                            >
+                                {s name="RegisterIndexNewActionSubmit"}{/s} <i class="icon--arrow-right"></i>
+                            </button>
                         </div>
                     {/block}
                 </form>
@@ -263,5 +282,4 @@
             {/block}
         </div>
     {/block}
-
 {/block}
diff --git a/themes/Frontend/Bare/frontend/register/login.tpl b/themes/Frontend/Bare/frontend/register/login.tpl
index 57906acc139..83003fcdcf3 100644
--- a/themes/Frontend/Bare/frontend/register/login.tpl
+++ b/themes/Frontend/Bare/frontend/register/login.tpl
@@ -40,8 +40,8 @@
 
                     <form name="sLogin" method="post" action="{$url}" id="login--form">
                         {block name='frontend_register_login_form_additional_inputs'}
-                            {if $sTarget}<input name="sTarget" type="hidden" value="{$sTarget|escape}" />{/if}
-                            {if $showNoAccount}<input name="showNoAccount" type="hidden" value="true" />{/if}
+                            {if $sTarget}<input name="sTarget" type="hidden" value="{$sTarget|escapeHtml}" />{/if}
+                            {if $showNoAccount}<input name="showNoAccount" type="hidden" value="true"/>{/if}
                         {/block}
 
                         {block name='frontend_register_login_description'}
@@ -50,20 +50,36 @@
 
                         {block name='frontend_register_login_input_email'}
                             <div class="register--login-email">
-                                <input name="email" placeholder="{s name="LoginPlaceholderMail"}{/s}" type="email" autocomplete="email" tabindex="1" value="{$sFormData.email|escape}" id="email" class="register--login-field{if $sErrorFlag.email} has--error{/if}" />
+                                <input name="email"
+                                       placeholder="{s name="LoginPlaceholderMail"}{/s}"
+                                       type="email"
+                                       autocomplete="email"
+                                       tabindex="1"
+                                       value="{$sFormData.email|escapeHtml}"
+                                       id="email"
+                                       class="register--login-field{if $sErrorFlag.email} has--error{/if}"
+                                />
                             </div>
                         {/block}
 
                         {block name='frontend_register_login_input_password'}
                             <div class="register--login-password">
-                                <input name="password" placeholder="{s name="LoginPlaceholderPassword"}{/s}" type="password" autocomplete="current-password" tabindex="2" id="passwort" class="register--login-field{if $sErrorFlag.password} has--error{/if}" />
+                                <input name="password"
+                                       placeholder="{s name="LoginPlaceholderPassword"}{/s}"
+                                       type="password"
+                                       autocomplete="current-password"
+                                       tabindex="2" id="passwort"
+                                       class="register--login-field{if $sErrorFlag.password} has--error{/if}"
+                                />
                             </div>
                         {/block}
 
                         {block name='frontend_register_login_input_lostpassword'}
                             <div class="register--login-lostpassword">
                                 {s name="LoginLinkLostPassword" assign="snippetLoginLinkLostPassword"}{/s}
-                                <a href="{url controller=account action=password}" title="{$snippetLoginLinkLostPassword|escape}">
+                                <a href="{url controller=account action=password}"
+                                   title="{$snippetLoginLinkLostPassword|escapeHtml}"
+                                >
                                     {s name="LoginLinkLostPassword"}{/s}
                                 </a>
                             </div>
@@ -71,7 +87,13 @@
 
                         {block name='frontend_register_login_input_form_submit'}
                             <div class="register--login-action">
-                                <button type="submit" class="register--login-btn btn is--primary is--large is--icon-right" name="Submit">{s name="LoginLinkLogon"}{/s} <i class="icon--arrow-right"></i></button>
+                                <button type="submit"
+                                        class="register--login-btn btn is--primary is--large is--icon-right"
+                                        name="Submit"
+                                        data-preloader-button="true"
+                                >
+                                    {s name="LoginLinkLogon"}{/s} <i class="icon--arrow-right"></i>
+                                </button>
                             </div>
                         {/block}
                     </form>
diff --git a/themes/Frontend/Bare/frontend/register/personal_fieldset.tpl b/themes/Frontend/Bare/frontend/register/personal_fieldset.tpl
index 1fb33d797b6..495ddca340d 100644
--- a/themes/Frontend/Bare/frontend/register/personal_fieldset.tpl
+++ b/themes/Frontend/Bare/frontend/register/personal_fieldset.tpl
@@ -15,7 +15,7 @@
                 {* Customer type *}
                 {block name='frontend_register_personal_fieldset_customer_type'}
                     {if $form_data.sValidation}
-                        <input type="hidden" name="register[personal][sValidation]" value="{$form_data.sValidation|escape}" />
+                        <input type="hidden" name="register[personal][sValidation]" value="{$form_data.sValidation|escapeHtml}" />
                     {else}
                         <div class="register--customertype">
                             {if {config name="showCompanySelectField"} == 0}
@@ -60,27 +60,28 @@
 
                 {* Salutation *}
                 {block name='frontend_register_personal_fieldset_salutation'}
+                    {if {config name="shopSalutationRequired"}}
+                        {getSalutations variable="salutations"}
 
-                    {getSalutations variable="salutations"}
+                        <div class="register--salutation field--select select-field">
+                            <select name="register[personal][salutation]"
+                                    id="salutation"
+                                    required="required"
+                                    aria-required="true"
+                                    class="is--required{if isset($error_flags.salutation)} has--error{/if}">
 
-                    <div class="register--salutation field--select select-field">
-                        <select name="register[personal][salutation]"
-                                id="salutation"
-                                required="required"
-                                aria-required="true"
-                                class="is--required{if isset($error_flags.salutation)} has--error{/if}">
+                                <option value=""
+                                        disabled="disabled"
+                                        {if $form_data.salutation eq ""} selected="selected"{/if}>
+                                    {s name='RegisterPlaceholderSalutation'}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}
+                                </option>
 
-                            <option value=""
-                                    disabled="disabled"
-                                    {if $form_data.salutation eq ""} selected="selected"{/if}>
-                                {s name='RegisterPlaceholderSalutation'}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}
-                            </option>
-
-                            {foreach $salutations as $key => $label}
-                                <option value="{$key}"{if $form_data.salutation eq $key} selected="selected"{/if}>{$label}</option>
-                            {/foreach}
-                        </select>
-                    </div>
+                                {foreach $salutations as $key => $label}
+                                    <option value="{$key}"{if $form_data.salutation eq $key} selected="selected"{/if}>{$label}</option>
+                                {/foreach}
+                            </select>
+                        </div>
+                    {/if}
                 {/block}
 
                 {* Title *}
@@ -92,7 +93,7 @@
                                    type="text"
                                    placeholder="{s name='RegisterPlaceholderTitle'}{/s}"
                                    id="title"
-                                   value="{$form_data.title|escape}"
+                                   value="{$form_data.title|escapeHtml}"
                                    class="register--field{if isset($error_flags.title)} has--error{/if}" />
                         </div>
                     {/if}
@@ -108,7 +109,7 @@
                                aria-required="true"
                                placeholder="{s name='RegisterPlaceholderFirstname'}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}"
                                id="firstname"
-                               value="{$form_data.firstname|escape}"
+                               value="{$form_data.firstname|escapeHtml}"
                                class="register--field is--required{if isset($error_flags.firstname)} has--error{/if}" />
                     </div>
                 {/block}
@@ -122,7 +123,7 @@
                                required="required"
                                aria-required="true"
                                placeholder="{s name='RegisterPlaceholderLastname'}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}"
-                               id="lastname" value="{$form_data.lastname|escape}"
+                               id="lastname" value="{$form_data.lastname|escapeHtml}"
                                class="register--field is--required{if isset($error_flags.lastname)} has--error{/if}" />
                     </div>
                 {/block}
@@ -161,7 +162,7 @@
                                    aria-required="true"
                                    placeholder="{s name='RegisterPlaceholderMail'}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}"
                                    id="register_personal_email"
-                                   value="{$form_data.email|escape}"
+                                   value="{$form_data.email|escapeHtml}"
                                    class="register--field email is--required{if isset($error_flags.email)} has--error{/if}" />
                         </div>
 
@@ -174,7 +175,7 @@
                                        aria-required="true"
                                        placeholder="{s name='RegisterPlaceholderMailConfirmation'}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}"
                                        id="register_personal_emailConfirmation"
-                                       value="{$form_data.emailConfirmation|escape}"
+                                       value="{$form_data.emailConfirmation|escapeHtml}"
                                        class="register--field emailConfirmation is--required{if isset($error_flags.emailConfirmation)} has--error{/if}" />
                             </div>
                         {/if}
@@ -230,7 +231,7 @@
                                    type="tel"{if {config name="requirePhoneField"}} required="required" aria-required="true"{/if}
                                    placeholder="{s name='RegisterPlaceholderPhone'}{/s}{if {config name="requirePhoneField"}}{s name="RequiredField" namespace="frontend/register/index"}{/s}{/if}"
                                    id="phone"
-                                   value="{$form_data.phone|escape}"
+                                   value="{$form_data.phone|escapeHtml}"
                                    class="register--field{if {config name="requirePhoneField"}} is--required{/if}{if isset($error_flags.phone) && {config name="requirePhoneField"}} has--error{/if}" />
                         </div>
                     {/if}
diff --git a/themes/Frontend/Bare/frontend/register/shipping_fieldset.tpl b/themes/Frontend/Bare/frontend/register/shipping_fieldset.tpl
index dff21425540..0abba6a2348 100644
--- a/themes/Frontend/Bare/frontend/register/shipping_fieldset.tpl
+++ b/themes/Frontend/Bare/frontend/register/shipping_fieldset.tpl
@@ -8,19 +8,22 @@
 
         {block name='frontend_register_shipping_fieldset_body'}
             <div class="panel--body is--wide">
-                {* Salutation *}
-                {getSalutations variable="salutations"}
-
-                {block name='frontend_register_shipping_fieldset_input_salutation'}
-                    <div class="register--salutation field--select select-field">
-                        <select name="register[shipping][salutation]" id="salutation2" class="normal is--required{if isset($error_flags.salutation)} has--error{/if}">
-                            <option value="" disabled="disabled"{if $form_data.salutation eq ""} selected="selected"{/if}>{s name='RegisterShippingPlaceholderSalutation'}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}</option>
-                            {foreach $salutations as $key => $label}
-                                <option value="{$key}"{if $form_data.salutation eq $key} selected="selected"{/if}>{$label}</option>
-                            {/foreach}
-                        </select>
-                    </div>
-                {/block}
+
+                {if {config name="shopSalutationRequired"}}
+                    {* Salutation *}
+                    {getSalutations variable="salutations"}
+
+                    {block name='frontend_register_shipping_fieldset_input_salutation'}
+                        <div class="register--salutation field--select select-field">
+                            <select name="register[shipping][salutation]" id="salutation2" class="normal is--required{if isset($error_flags.salutation)} has--error{/if}">
+                                <option value="" disabled="disabled"{if $form_data.salutation eq ""} selected="selected"{/if}>{s name='RegisterShippingPlaceholderSalutation'}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}</option>
+                                {foreach $salutations as $key => $label}
+                                    <option value="{$key}"{if $form_data.salutation eq $key} selected="selected"{/if}>{$label}</option>
+                                {/foreach}
+                            </select>
+                        </div>
+                    {/block}
+                {/if}
 
                 {* Company *}
                 {block name="frontend_register_shipping_fieldset_input_company"}
@@ -29,7 +32,7 @@
                                name="register[shipping][company]"
                                type="text"
                                placeholder="{s name='RegisterShippingPlaceholderCompany'}{/s}"
-                               id="company2" value="{$form_data.company|escape}"
+                               id="company2" value="{$form_data.company|escapeHtml}"
                                class="register--field{if isset($error_flags.company)} has--error{/if}" />
                     </div>
                 {/block}
@@ -41,7 +44,7 @@
                                name="register[shipping][department]"
                                type="text"
                                placeholder="{s name='RegisterShippingPlaceholderDepartment'}{/s}"
-                               id="department2" value="{$form_data.department|escape}"
+                               id="department2" value="{$form_data.department|escapeHtml}"
                                class="register--field {if isset($error_flags.department)} has--error{/if}" />
                     </div>
                 {/block}
@@ -56,7 +59,7 @@
                                aria-required="true"
                                placeholder="{s name='RegisterShippingPlaceholderFirstname'}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}"
                                id="firstname2"
-                               value="{$form_data.firstname|escape}"
+                               value="{$form_data.firstname|escapeHtml}"
                                class="register--field is--required{if isset($error_flags.firstname)} has--error{/if}" />
                     </div>
                 {/block}
@@ -71,7 +74,7 @@
                                aria-required="true"
                                placeholder="{s name='RegisterShippingPlaceholderLastname'}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}"
                                id="lastname2"
-                               value="{$form_data.lastname|escape}"
+                               value="{$form_data.lastname|escapeHtml}"
                                class="register--field is--required{if isset($error_flags.lastname)} has--error{/if}" />
                     </div>
                 {/block}
@@ -86,7 +89,7 @@
                                aria-required="true"
                                placeholder="{s name='RegisterShippingPlaceholderStreet'}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}"
                                id="street2"
-                               value="{$form_data.street|escape}"
+                               value="{$form_data.street|escapeHtml}"
                                class="register--field register--field-street is--required{if isset($error_flags.street)} has--error{/if}" />
                     </div>
                 {/block}
@@ -100,7 +103,7 @@
                                    type="text"{if {config name="requireAdditionAddressLine1"}} required="required" aria-required="true"{/if}
                                    placeholder="{s name='RegisterLabelAdditionalAddressLine1'}{/s}{if {config name="requireAdditionAddressLine1"}}{s name="RequiredField" namespace="frontend/register/index"}{/s}{/if}"
                                    id="additionalAddressLine21"
-                                   value="{$form_data.additionalAddressLine1|escape}"
+                                   value="{$form_data.additionalAddressLine1|escapeHtml}"
                                    class="register--field{if {config name="requireAdditionAddressLine1"}} is--required{/if}{if isset($error_flags.additionalAddressLine1) && {config name="requireAdditionAddressLine1"}} has--error{/if}" />
                         </div>
                     {/if}
@@ -115,7 +118,7 @@
                                    type="text"{if {config name="requireAdditionAddressLine2"}} required="required" aria-required="true"{/if}
                                    placeholder="{s name='RegisterLabelAdditionalAddressLine2'}{/s}{if {config name="requireAdditionAddressLine2"}}{s name="RequiredField" namespace="frontend/register/index"}{/s}{/if}"
                                    id="additionalAddressLine22"
-                                   value="{$form_data.additionalAddressLine2|escape}"
+                                   value="{$form_data.additionalAddressLine2|escapeHtml}"
                                    class="register--field{if {config name="requireAdditionAddressLine2"}} is--required{/if}{if isset($error_flags.additionalAddressLine2) && {config name="requireAdditionAddressLine2"}} has--error{/if}" />
                         </div>
                     {/if}
@@ -132,7 +135,7 @@
                                    aria-required="true"
                                    placeholder="{s name='RegisterShippingPlaceholderZipcode'}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}"
                                    id="zipcode2"
-                                   value="{$form_data.zipcode|escape}"
+                                   value="{$form_data.zipcode|escapeHtml}"
                                    class="register--field register--spacer register--field-zipcode is--required{if isset($error_flags.zipcode)} has--error{/if}" />
 
                             <input autocomplete="section-shipping shipping address-level2"
@@ -142,7 +145,7 @@
                                    aria-required="true"
                                    placeholder="{s name='RegisterShippingPlaceholderCity'}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}"
                                    id="city2"
-                                   value="{$form_data.city|escape}"
+                                   value="{$form_data.city|escapeHtml}"
                                    size="25"
                                    class="register--field register--field-city is--required{if isset($error_flags.city)} has--error{/if}" />
                         {else}
@@ -153,7 +156,7 @@
                                    aria-required="true"
                                    placeholder="{s name='RegisterShippingPlaceholderCity'}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}"
                                    id="city2"
-                                   value="{$form_data.city|escape}"
+                                   value="{$form_data.city|escapeHtml}"
                                    size="25"
                                    class="register--field register--spacer register--field-city is--required{if isset($error_flags.city)} has--error{/if}" />
 
@@ -164,7 +167,7 @@
                                    aria-required="true"
                                    placeholder="{s name='RegisterShippingPlaceholderZipcode'}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}"
                                    id="zipcode2"
-                                   value="{$form_data.zipcode|escape}"
+                                   value="{$form_data.zipcode|escapeHtml}"
                                    class="register--field register--field-zipcode is--required{if isset($error_flags.zipcode)} has--error{/if}" />
                         {/if}
                     </div>
diff --git a/themes/Frontend/Bare/widgets/captcha/custom_captcha.tpl b/themes/Frontend/Bare/widgets/captcha/custom_captcha.tpl
index dd9bfe3adca..43d495c18d6 100644
--- a/themes/Frontend/Bare/widgets/captcha/custom_captcha.tpl
+++ b/themes/Frontend/Bare/widgets/captcha/custom_captcha.tpl
@@ -7,7 +7,7 @@
     {/block}
 
     {if !$isNoCaptcha}
-        <div class="{if !$isHoneypot }panel--body is--wide{/if}">
+        <div>
             {block name="frontend_widgets_captcha_custom_captcha_placeholder"}
                 <div class="captcha--placeholder"
                     data-captcha="true"
diff --git a/themes/Frontend/Bare/widgets/emotion/components/component_banner.tpl b/themes/Frontend/Bare/widgets/emotion/components/component_banner.tpl
index e9866f2f229..9372bf1e837 100644
--- a/themes/Frontend/Bare/widgets/emotion/components/component_banner.tpl
+++ b/themes/Frontend/Bare/widgets/emotion/components/component_banner.tpl
@@ -85,7 +85,7 @@
                             {/foreach}
                         </div>
                     {elseif $Data.link}
-                        <a href="{$Data.link}" class="banner--link"
+                        <a href="{$Data.link|escape}" class="banner--link"
                            {if $Data.banner_link_target} target="{$Data.banner_link_target}"{/if}
                            {if $Data.title} title="{$Data.title|escape}"{/if}>
                         </a>
diff --git a/themes/Frontend/Bare/widgets/emotion/components/component_iframe.tpl b/themes/Frontend/Bare/widgets/emotion/components/component_iframe.tpl
index 387793a4dff..a4cf8ea27c6 100644
--- a/themes/Frontend/Bare/widgets/emotion/components/component_iframe.tpl
+++ b/themes/Frontend/Bare/widgets/emotion/components/component_iframe.tpl
@@ -4,8 +4,8 @@
             <iframe class="external--content content--iframe"
                     width="100%"
                     height="100%"
-                    src="{$Data.iframe_url}" frameborder="0">
+                    src="{$Data.iframe_url|escape}" frameborder="0">
             </iframe>
         {/if}
     </div>
-{/block}
\ No newline at end of file
+{/block}
diff --git a/themes/Frontend/Bare/widgets/emotion/components/component_youtube.tpl b/themes/Frontend/Bare/widgets/emotion/components/component_youtube.tpl
index 798ba7cb0ae..ea85eaf52e0 100644
--- a/themes/Frontend/Bare/widgets/emotion/components/component_youtube.tpl
+++ b/themes/Frontend/Bare/widgets/emotion/components/component_youtube.tpl
@@ -19,13 +19,24 @@
                     {/if}
                 {/foreach}
             {/if}
-            <iframe class="external--content content--youtube"
-                    width="100%"
-                    height="100%"
-                    src="https://www.youtube-nocookie.com/embed/{$Data.video_id}{if $params}{$params}{/if}"
-                    frameborder="0"
-                    allowfullscreen>
-            </iframe>
+            {if $Data.load_video_on_confirmation}
+                <div
+                    class="emotion--youtube--gdpr"
+                    data-videoUrl="https://www.youtube-nocookie.com/embed/{$Data.video_id|escape}{if $params}{$params}{/if}" style="background-image: url({$Data.preview_image});">
+                    <div class="emotion--youtube--gdpr--inner center">
+                        <p>{s name="PrivacyNotice" namespace="widgets/emotion/components/component_youtube"}By viewing the video you agree that your data will be transferred to YouTube and that you have read the Privacy policy.{/s}</p>
+                        <a class="gdpr--view--button btn is--secondary">{s name="AcceptButtonLabel" namespace="widgets/emotion/components/component_youtube"}Accept{/s}</a>
+                    </div>
+                </div>
+            {else}
+                <iframe class="external--content content--youtube"
+                        width="100%"
+                        height="100%"
+                        src="https://www.youtube-nocookie.com/embed/{$Data.video_id|escape}{if $params}{$params}{/if}"
+                        frameborder="0"
+                        allowfullscreen>
+                </iframe>
+            {/if}
         {/if}
     </div>
-{/block}
\ No newline at end of file
+{/block}
diff --git a/themes/Frontend/Bare/widgets/listing/listing_count.tpl b/themes/Frontend/Bare/widgets/listing/listing_count.tpl
index 77cc6f9d827..c90a7216d95 100644
--- a/themes/Frontend/Bare/widgets/listing/listing_count.tpl
+++ b/themes/Frontend/Bare/widgets/listing/listing_count.tpl
@@ -1,19 +1,35 @@
-<div id="result">
-    {if $listing}
-        <div id="listing">
-            {$listing}
-        </div>
-    {/if}
+{block name="widgets_listing_listing_count"}
+    <div id="result">
+        {block name="widgets_listing_listing_count_result"}
+            {block name="widgets_listing_listing_count_result_listing"}
+                {if $listing}
+                    <div id="listing">
+                        {block name="widgets_listing_listing_count_include_listing"}
+                            {include file="frontend/listing/listing_ajax.tpl"}
+                        {/block}
+                    </div>
+                {/if}
+            {/block}
 
-    {if $pagination}
-        <div id="pagination">
-            {$pagination}
-        </div>
-    {/if}
+            {block name="widgets_listing_listing_count_result_pagination"}
+                {if $pagination}
+                    <div id="pagination">
+                        {block name="widgets_listing_listing_count_include_pagination"}
+                            {include file="frontend/listing/actions/action-pagination.tpl"}
+                        {/block}
+                    </div>
+                {/if}
+            {/block}
 
-    {if $facets}
-        <div id="facets">
-            {$facets|@json_encode|escape}
-        </div>
-    {/if}
-</div>
+            {block name="widgets_listing_listing_count_result_facets"}
+                {if $facets}
+                    <div id="facets">
+                        {block name="widgets_listing_listing_count_include_facets"}
+                            {$facets|@json_encode|escape}
+                        {/block}
+                    </div>
+                {/if}
+            {/block}
+        {/block}
+    </div>
+{/block}
diff --git a/themes/Frontend/Responsive/Gruntfile.js b/themes/Frontend/Responsive/Gruntfile.js
index 5f525c89b4f..87eb52f2898 100644
--- a/themes/Frontend/Responsive/Gruntfile.js
+++ b/themes/Frontend/Responsive/Gruntfile.js
@@ -8,6 +8,30 @@ module.exports = function (grunt) {
         clean: {
             vendors: [ vendorDir ]
         },
+        modernizr: {
+            dist: {
+                crawl: false,
+                customTests: [],
+                dest: vendorDir + "/js/modernizr/modernizr-custom.js",
+                tests: [
+                    "history",
+                    "cssanimations",
+                    "localstorage",
+                    "sessionstorage"
+                ],
+                options: [
+                    "domPrefixes",
+                    "hasEvent",
+                    "mq",
+                    "testAllProps",
+                    "testProp",
+                    "testStyles",
+                    "setClasses"
+                ],
+                uglify: true,
+                classPrefix: "has--",
+            },
+        },
         copy: {
             'jquery.event.move': {
                 files: [{
@@ -122,7 +146,7 @@ module.exports = function (grunt) {
                     dest: vendorDir + '/fonts/open-sans-fontface',
                     flatten: true
                 }]
-            }
+            },
         }
     });
 
@@ -170,4 +194,5 @@ module.exports = function (grunt) {
     grunt.registerTask('default', [ 'clean', 'createVendorDir', 'copy', 'createFontHtaccess' ]);
     grunt.loadNpmTasks('grunt-contrib-clean');
     grunt.loadNpmTasks('grunt-contrib-copy');
+    grunt.loadNpmTasks("grunt-modernizr");
 };
diff --git a/themes/Frontend/Responsive/Theme.php b/themes/Frontend/Responsive/Theme.php
index eded7730d02..f452785bdee 100644
--- a/themes/Frontend/Responsive/Theme.php
+++ b/themes/Frontend/Responsive/Theme.php
@@ -1,25 +1,25 @@
 <?php
+
 /**
  * Shopware 5
  * Copyright (c) shopware AG
  *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
+ * According to our licensing model, this program can be used
+ * under the terms of the GNU Affero General Public License, version 3.
  *
  * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
+ * permission can be found at and in the LICENSE file you have received
+ * along with this program.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
  *
  * "Shopware" is a registered trademark of shopware AG.
  * The licensing of the program under the AGPLv3 does not imply a
- * trademark license. Therefore any rights, title and interest in
- * our trademarks remain entirely with us.
+ * trademark license. Therefore, any rights, title and interest in
+ * our trademarks remain entirely with the shopware AG.
  */
 
 namespace Shopware\Themes\Responsive;
@@ -80,7 +80,7 @@ class Theme extends BaseTheme
      */
     protected $javascript = [
         // Third party plugins / libraries
-        'src/js/vendors/modernizr/modernizr-custom.js',
+        'vendors/js/modernizr/modernizr-custom.js',
         'vendors/js/jquery/jquery.min.js',
         'src/js/jquery.symbol-polyfill.js',
         'vendors/js/picturefill/picturefill.min.js',
diff --git a/themes/Frontend/Responsive/frontend/_public/src/fonts/captcha.ttf b/themes/Frontend/Responsive/frontend/_public/src/fonts/captcha.ttf
index f1d77c785f2..2d4b47093aa 100644
Binary files a/themes/Frontend/Responsive/frontend/_public/src/fonts/captcha.ttf and b/themes/Frontend/Responsive/frontend/_public/src/fonts/captcha.ttf differ
diff --git a/themes/Frontend/Responsive/frontend/_public/src/js/jquery.add-article.js b/themes/Frontend/Responsive/frontend/_public/src/js/jquery.add-article.js
index 9926c259855..46641f6611d 100644
--- a/themes/Frontend/Responsive/frontend/_public/src/js/jquery.add-article.js
+++ b/themes/Frontend/Responsive/frontend/_public/src/js/jquery.add-article.js
@@ -170,7 +170,7 @@
 
         /**
          * Gets called when the modal box is closing.
-         * Destroys the product slider when its available.
+         * Destroys the product slider when it's available.
          *
          * @public
          * @event onCloseModal
diff --git a/themes/Frontend/Responsive/frontend/_public/src/js/jquery.captcha.js b/themes/Frontend/Responsive/frontend/_public/src/js/jquery.captcha.js
index 378406747f0..421dcdf7e2a 100644
--- a/themes/Frontend/Responsive/frontend/_public/src/js/jquery.captcha.js
+++ b/themes/Frontend/Responsive/frontend/_public/src/js/jquery.captcha.js
@@ -109,6 +109,8 @@
                 cache: false,
                 success: function (response) {
                     $el.html(response);
+                    $el.parent('div').addClass('panel--body is--wide');
+                    $el.parent('div').css('display', 'inline-block');
                     $.publish('plugin/swCaptcha/onSendRequestSuccess', [me]);
                 }
             });
diff --git a/themes/Frontend/Responsive/frontend/_public/src/js/jquery.emotion.js b/themes/Frontend/Responsive/frontend/_public/src/js/jquery.emotion.js
index 4963385f2ca..86f249897e6 100644
--- a/themes/Frontend/Responsive/frontend/_public/src/js/jquery.emotion.js
+++ b/themes/Frontend/Responsive/frontend/_public/src/js/jquery.emotion.js
@@ -364,6 +364,8 @@
              */
             wrapperSelector: '.emotion--wrapper',
 
+            youtubeElSelector: '.emotion--youtube--gdpr',
+
             /**
              * flag to prevent `is--no-sidebar` for fullscreen emotions with listing below
              * @type {boolean}
@@ -390,6 +392,8 @@
 
             me.$bannerElements = me.$elements.find(me.opts.bannerElSelector);
             me.$videoElements = me.$elements.find(me.opts.videoElSelector);
+            me.$youtubeVideos = me.$elements.find(me.opts.youtubeElSelector);
+
             me.$productSliderElements = me.$elements.find('*[data-product-slider="true"]');
 
             me.remSpacing = ~~me.opts.cellSpacing / 16;
@@ -467,6 +471,10 @@
                 $(item).swEmotionVideo();
             });
 
+            $.each(me.$youtubeVideos, function(index, item) {
+                $(item).swYoutubeVideo();
+            });
+
             StateManager.updatePlugin('*[data-product-slider="true"]', 'swProductSlider');
             StateManager.updatePlugin('*[data-image-slider="true"]', 'swImageSlider');
             StateManager.updatePlugin('*[data-modalbox="true"]', 'swModalbox');
@@ -865,6 +873,36 @@
         }
     });
 
+    $.plugin('swYoutubeVideo', {
+        defaults: {
+            loadYoutubeVideoCls: '.gdpr--view--button',
+
+            videoUrl: null
+        },
+
+        init: function () {
+            var me = this;
+            me.applyDataAttributes();
+            me.loadYoutubeVideoButton = me.$el.find(me.opts.loadYoutubeVideoCls);
+
+            me._on(me.loadYoutubeVideoButton, 'click', $.proxy(me.onLoadYoutubeButton, me));
+        },
+
+        onLoadYoutubeButton: function (event) {
+            var me = this;
+            event.preventDefault();
+
+            var videoElement = document.createElement('iframe');
+            videoElement.setAttribute('src', me.opts.videoUrl);
+            videoElement.setAttribute('width', '100%');
+            videoElement.setAttribute('height', '100%');
+            videoElement.setAttribute('frameborder', '0%');
+            videoElement.setAttribute('allowfullscreen', '');
+
+            me.$el.replaceWith(videoElement);
+        }
+    });
+
     /**
      * Emotion Video Element
      *
diff --git a/themes/Frontend/Responsive/frontend/_public/src/js/jquery.image-slider.js b/themes/Frontend/Responsive/frontend/_public/src/js/jquery.image-slider.js
index 6b89686d255..b5ec186ff50 100644
--- a/themes/Frontend/Responsive/frontend/_public/src/js/jquery.image-slider.js
+++ b/themes/Frontend/Responsive/frontend/_public/src/js/jquery.image-slider.js
@@ -1113,7 +1113,7 @@
 
             me.trackThumbnailControls();
 
-            $.publish('plugin/swImageSlider/onThumbnailSlideTouch', [me, event, pointerA.clientX, pointerA.clientY]);
+            $.publish('plugin/swImageSlider/onThumbnailSlideMove', [me, event, pointerA.clientX, pointerA.clientY]);
         },
 
         /**
diff --git a/themes/Frontend/Responsive/frontend/_public/src/js/jquery.infinite-scrolling.js b/themes/Frontend/Responsive/frontend/_public/src/js/jquery.infinite-scrolling.js
index 9957093b7ea..642df1a691f 100644
--- a/themes/Frontend/Responsive/frontend/_public/src/js/jquery.infinite-scrolling.js
+++ b/themes/Frontend/Responsive/frontend/_public/src/js/jquery.infinite-scrolling.js
@@ -366,7 +366,7 @@
                     html: snippet + ' <i class="icon--cw is--large"></i>'
                 });
 
-            $.publish('plugin/swInfiniteScrolling/onLoadMore', [me, $button, buttonType]);
+            $.publish('plugin/swInfiniteScrolling/onGenerateButton', [me, $button, buttonType]);
 
             return $button;
         },
diff --git a/themes/Frontend/Responsive/frontend/_public/src/js/jquery.listing-actions.js b/themes/Frontend/Responsive/frontend/_public/src/js/jquery.listing-actions.js
index 474a02e7951..32cbbf110f1 100644
--- a/themes/Frontend/Responsive/frontend/_public/src/js/jquery.listing-actions.js
+++ b/themes/Frontend/Responsive/frontend/_public/src/js/jquery.listing-actions.js
@@ -770,7 +770,7 @@
             var urlParams = window.location.search.substr(1),
                 categoryParams = this.setCategoryParamsFromUrlParams(urlParams);
 
-            $.publish('plugin/swListingActions/onSetCategoryParamsFromData', [this, categoryParams]);
+            $.publish('plugin/swListingActions/onSetCategoryParamsFromTopLocation', [this, categoryParams]);
 
             return categoryParams;
         },
@@ -1514,7 +1514,7 @@
         getLabelIcon: function () {
             var icon = '<span class="' + this.opts.activeFilterIconCls + '"></span>';
 
-            $.publish('plugin/swListingActions/onCreateStarLabel', [this, icon]);
+            $.publish('plugin/swListingActions/onGetLabelIcon', [this, icon]);
 
             return icon;
         },
diff --git a/themes/Frontend/Responsive/frontend/_public/src/js/vendors/modernizr/modernizr-custom.js b/themes/Frontend/Responsive/frontend/_public/src/js/vendors/modernizr/modernizr-custom.js
deleted file mode 100644
index d8a467667bd..00000000000
--- a/themes/Frontend/Responsive/frontend/_public/src/js/vendors/modernizr/modernizr-custom.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! modernizr 3.6.0 (Custom Build) | MIT *
- * https://modernizr.com/download/?-cssanimations-history-localstorage-sessionstorage-domprefixes-hasevent-mq-prefixes-setclasses-testallprops-testprop-teststyles-cssclassprefix:has-- !*/
-!function(e,t,n){function r(e,t){return typeof e===t}function o(){var e,t,n,o,i,s,a;for(var l in C)if(C.hasOwnProperty(l)){if(e=[],t=C[l],t.name&&(e.push(t.name.toLowerCase()),t.options&&t.options.aliases&&t.options.aliases.length))for(n=0;n<t.options.aliases.length;n++)e.push(t.options.aliases[n].toLowerCase());for(o=r(t.fn,"function")?t.fn():t.fn,i=0;i<e.length;i++)s=e[i],a=s.split("."),1===a.length?Modernizr[a[0]]=o:(!Modernizr[a[0]]||Modernizr[a[0]]instanceof Boolean||(Modernizr[a[0]]=new Boolean(Modernizr[a[0]])),Modernizr[a[0]][a[1]]=o),S.push((o?"":"no-")+a.join("-"))}}function i(e){var t=x.className,n=Modernizr._config.classPrefix||"";if(_&&(t=t.baseVal),Modernizr._config.enableJSClass){var r=new RegExp("(^|\\s)"+n+"no-js(\\s|$)");t=t.replace(r,"$1"+n+"js$2")}Modernizr._config.enableClasses&&(t+=" "+n+e.join(" "+n),_?x.className.baseVal=t:x.className=t)}function s(){return"function"!=typeof t.createElement?t.createElement(arguments[0]):_?t.createElementNS.call(t,"http://www.w3.org/2000/svg",arguments[0]):t.createElement.apply(t,arguments)}function a(){var e=t.body;return e||(e=s(_?"svg":"body"),e.fake=!0),e}function l(e,n,r,o){var i,l,u,f,c="modernizr",d=s("div"),p=a();if(parseInt(r,10))for(;r--;)u=s("div"),u.id=o?o[r]:c+(r+1),d.appendChild(u);return i=s("style"),i.type="text/css",i.id="s"+c,(p.fake?p:d).appendChild(i),p.appendChild(d),i.styleSheet?i.styleSheet.cssText=e:i.appendChild(t.createTextNode(e)),d.id=c,p.fake&&(p.style.background="",p.style.overflow="hidden",f=x.style.overflow,x.style.overflow="hidden",x.appendChild(p)),l=n(d,e),p.fake?(p.parentNode.removeChild(p),x.style.overflow=f,x.offsetHeight):d.parentNode.removeChild(d),!!l}function u(e,t){return!!~(""+e).indexOf(t)}function f(e){return e.replace(/([a-z])-([a-z])/g,function(e,t,n){return t+n.toUpperCase()}).replace(/^-/,"")}function c(e,t){return function(){return e.apply(t,arguments)}}function d(e,t,n){var o;for(var i in e)if(e[i]in t)return n===!1?e[i]:(o=t[e[i]],r(o,"function")?c(o,n||t):o);return!1}function p(e){return e.replace(/([A-Z])/g,function(e,t){return"-"+t.toLowerCase()}).replace(/^ms-/,"-ms-")}function m(t,n,r){var o;if("getComputedStyle"in e){o=getComputedStyle.call(e,t,n);var i=e.console;if(null!==o)r&&(o=o.getPropertyValue(r));else if(i){var s=i.error?"error":"log";i[s].call(i,"getComputedStyle returning null, its possible modernizr test results are inaccurate")}}else o=!n&&t.currentStyle&&t.currentStyle[r];return o}function v(t,r){var o=t.length;if("CSS"in e&&"supports"in e.CSS){for(;o--;)if(e.CSS.supports(p(t[o]),r))return!0;return!1}if("CSSSupportsRule"in e){for(var i=[];o--;)i.push("("+p(t[o])+":"+r+")");return i=i.join(" or "),l("@supports ("+i+") { #modernizr { position: absolute; } }",function(e){return"absolute"==m(e,null,"position")})}return n}function y(e,t,o,i){function a(){c&&(delete O.style,delete O.modElem)}if(i=r(i,"undefined")?!1:i,!r(o,"undefined")){var l=v(e,o);if(!r(l,"undefined"))return l}for(var c,d,p,m,y,g=["modernizr","tspan","samp"];!O.style&&g.length;)c=!0,O.modElem=s(g.shift()),O.style=O.modElem.style;for(p=e.length,d=0;p>d;d++)if(m=e[d],y=O.style[m],u(m,"-")&&(m=f(m)),O.style[m]!==n){if(i||r(o,"undefined"))return a(),"pfx"==t?m:!0;try{O.style[m]=o}catch(h){}if(O.style[m]!=y)return a(),"pfx"==t?m:!0}return a(),!1}function g(e,t,n,o,i){var s=e.charAt(0).toUpperCase()+e.slice(1),a=(e+" "+T.join(s+" ")+s).split(" ");return r(t,"string")||r(t,"undefined")?y(a,t,o,i):(a=(e+" "+P.join(s+" ")+s).split(" "),d(a,t,n))}function h(e,t,r){return g(e,n,n,t,r)}var S=[],C=[],b={_version:"3.6.0",_config:{classPrefix:"has--",enableClasses:!0,enableJSClass:!0,usePrefixes:!0},_q:[],on:function(e,t){var n=this;setTimeout(function(){t(n[e])},0)},addTest:function(e,t,n){C.push({name:e,fn:t,options:n})},addAsyncTest:function(e){C.push({name:null,fn:e})}},Modernizr=function(){};Modernizr.prototype=b,Modernizr=new Modernizr,Modernizr.addTest("sessionstorage",function(){var e="modernizr";try{return sessionStorage.setItem(e,e),sessionStorage.removeItem(e),!0}catch(t){return!1}}),Modernizr.addTest("history",function(){var t=navigator.userAgent;return-1===t.indexOf("Android 2.")&&-1===t.indexOf("Android 4.0")||-1===t.indexOf("Mobile Safari")||-1!==t.indexOf("Chrome")||-1!==t.indexOf("Windows Phone")||"file:"===location.protocol?e.history&&"pushState"in e.history:!1}),Modernizr.addTest("localstorage",function(){var e="modernizr";try{return localStorage.setItem(e,e),localStorage.removeItem(e),!0}catch(t){return!1}});var w=b._config.usePrefixes?" -webkit- -moz- -o- -ms- ".split(" "):["",""];b._prefixes=w;var x=t.documentElement,_="svg"===x.nodeName.toLowerCase(),z="Moz O ms Webkit",P=b._config.usePrefixes?z.toLowerCase().split(" "):[];b._domPrefixes=P;var A=function(){function e(e,t){var o;return e?(t&&"string"!=typeof t||(t=s(t||"div")),e="on"+e,o=e in t,!o&&r&&(t.setAttribute||(t=s("div")),t.setAttribute(e,""),o="function"==typeof t[e],t[e]!==n&&(t[e]=n),t.removeAttribute(e)),o):!1}var r=!("onblur"in t.documentElement);return e}();b.hasEvent=A;var E=function(){var t=e.matchMedia||e.msMatchMedia;return t?function(e){var n=t(e);return n&&n.matches||!1}:function(t){var n=!1;return l("@media "+t+" { #modernizr { position: absolute; } }",function(t){n="absolute"==(e.getComputedStyle?e.getComputedStyle(t,null):t.currentStyle).position}),n}}();b.mq=E;var T=(b.testStyles=l,b._config.usePrefixes?z.split(" "):[]);b._cssomPrefixes=T;var N={elem:s("modernizr")};Modernizr._q.push(function(){delete N.elem});var O={style:N.elem.style};Modernizr._q.unshift(function(){delete O.style});b.testProp=function(e,t,r){return y([e],n,t,r)};b.testAllProps=g,b.testAllProps=h,Modernizr.addTest("cssanimations",h("animationName","a",!0)),o(),i(S),delete b.addTest,delete b.addAsyncTest;for(var j=0;j<Modernizr._q.length;j++)Modernizr._q[j]();e.Modernizr=Modernizr}(window,document);
\ No newline at end of file
diff --git a/themes/Frontend/Responsive/frontend/_public/src/less/_components/captcha-honeypot.less b/themes/Frontend/Responsive/frontend/_public/src/less/_components/captcha-honeypot.less
index 002ada5153f..91dcc4e1bee 100644
--- a/themes/Frontend/Responsive/frontend/_public/src/less/_components/captcha-honeypot.less
+++ b/themes/Frontend/Responsive/frontend/_public/src/less/_components/captcha-honeypot.less
@@ -8,10 +8,5 @@ Is used to hide the label as well.
 */
 
 .c-firstname-confirmation {
-  position: absolute;
-  left: -10000px;
-  top: auto;
-  width: 1px;
-  height: 1px;
-  overflow: hidden;
-}
\ No newline at end of file
+  display: none;
+}
diff --git a/themes/Frontend/Responsive/frontend/_public/src/less/_components/emotions.less b/themes/Frontend/Responsive/frontend/_public/src/less/_components/emotions.less
index 128870491cc..12b7fc9deb6 100644
--- a/themes/Frontend/Responsive/frontend/_public/src/less/_components/emotions.less
+++ b/themes/Frontend/Responsive/frontend/_public/src/less/_components/emotions.less
@@ -953,6 +953,26 @@ body.emotion--preview {
     }
 }
 
+.emotion--youtube--gdpr {
+    text-align: center;
+    min-width: 100%;
+    min-height: 100%;
+    position: relative;
+    background-repeat: no-repeat;
+    background-position: center;
+    background-size: cover;
+
+    .emotion--youtube--gdpr--inner {
+        background: rgba(255, 255, 255, .5);
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        width: 100%;
+        .transform(translate(-50%, -50%));
+        border: 0 none;
+    }
+}
+
     // HTML element
 .emotion--html {
     width: 100%;
diff --git a/themes/Frontend/Responsive/frontend/_public/src/less/_components/fonts.less b/themes/Frontend/Responsive/frontend/_public/src/less/_components/fonts.less
index 719a83ed8de..7240c0e0bfb 100644
--- a/themes/Frontend/Responsive/frontend/_public/src/less/_components/fonts.less
+++ b/themes/Frontend/Responsive/frontend/_public/src/less/_components/fonts.less
@@ -1,91 +1,169 @@
 @OpenSansPath: "./fonts";
 
-/* BEGIN Light */
-@font-face {
-    @hash-open-sans-light-woff2: swhash('@{OpenSansPath}/Light/OpenSans-Light.woff2');
-    @hash-open-sans-light-woff: swhash('@{OpenSansPath}/Light/OpenSans-Light.woff');
-    @hash-open-sans-light-ttf: swhash('@{OpenSansPath}/Light/OpenSans-Light.ttf');
-
-    font-family: 'Open Sans';
-    font-display: swap;
-    src: local('Open Sans Light'),
-    local('OpenSans-Light'),
-    url('@{OpenSansPath}/Light/OpenSans-Light.woff2?@{hash-open-sans-light-woff2}') format('woff2'),
-    url('@{OpenSansPath}/Light/OpenSans-Light.woff?@{hash-open-sans-light-woff}') format('woff'),
-    url('@{OpenSansPath}/Light/OpenSans-Light.ttf?@{hash-open-sans-light-ttf}') format('truetype');
-    font-weight: 300;
-    font-style: normal;
-}
-/* END Light */
-
-/* BEGIN Regular */
-@font-face {
-    @hash-open-sans-regular-woff-2: swhash('@{OpenSansPath}/Regular/OpenSans-Regular.woff2');
-    @hash-open-sans-regular-woff: swhash('@{OpenSansPath}/Regular/OpenSans-Regular.woff');
-    @hash-open-sans-regular-ttf: swhash('@{OpenSansPath}/Regular/OpenSans-Regular.ttf');
-
-    font-family: 'Open Sans';
-    font-display: swap;
-    src: local('Open Sans Regular'),
-    local('Open Sans'),
-    url('@{OpenSansPath}/Regular/OpenSans-Regular.woff2?@{hash-open-sans-regular-woff-2}') format('woff2'),
-    url('@{OpenSansPath}/Regular/OpenSans-Regular.woff?@{hash-open-sans-regular-woff}') format('woff'),
-    url('@{OpenSansPath}/Regular/OpenSans-Regular.ttf?@{hash-open-sans-regular-ttf}') format('truetype');
-    font-weight: normal;
-    font-style: normal;
-}
-/* END Regular */
-
-/* BEGIN Semibold */
-@font-face {
-    @hash-open-sans-semibold-woff-2: swhash('@{OpenSansPath}/Semibold/OpenSans-Semibold.woff2');
-    @hash-open-sans-semibold-woff: swhash('@{OpenSansPath}/Semibold/OpenSans-Semibold.woff');
-    @hash-open-sans-semibold-ttf: swhash('@{OpenSansPath}/Semibold/OpenSans-Semibold.ttf');
-
-    font-family: 'Open Sans';
-    font-display: swap;
-    src: local('Open Sans Semibold'),
-    local('OpenSans-SemiBold'),
-    url('@{OpenSansPath}/Semibold/OpenSans-Semibold.woff2?@{hash-open-sans-semibold-woff-2}') format('woff2'),
-    url('@{OpenSansPath}/Semibold/OpenSans-Semibold.woff?@{hash-open-sans-semibold-woff}') format('woff'),
-    url('@{OpenSansPath}/Semibold/OpenSans-Semibold.ttf?@{hash-open-sans-semibold-ttf}') format('truetype');
-    font-weight: 600;
-    font-style: normal;
-}
-/* END Semibold */
-
-/* BEGIN Bold */
-@font-face {
-    @hash-open-sans-bold-woff-2: swhash('@{OpenSansPath}/Bold/OpenSans-Bold.woff2');
-    @hash-open-sans-bold-woff: swhash('@{OpenSansPath}/Bold/OpenSans-Bold.woff');
-    @hash-open-sans-bold-ttf: swhash('@{OpenSansPath}/Bold/OpenSans-Bold.ttf');
-
-    font-family: 'Open Sans';
-    font-display: swap;
-    src: local('Open Sans Bold'),
-    local('OpenSans-Bold'),
-    url('@{OpenSansPath}/Bold/OpenSans-Bold.woff2?@{hash-open-sans-bold-woff-2}') format('woff2'),
-    url('@{OpenSansPath}/Bold/OpenSans-Bold.woff?@{hash-open-sans-bold-woff}') format('woff'),
-    url('@{OpenSansPath}/Bold/OpenSans-Bold.ttf?@{hash-open-sans-bold-ttf}') format('truetype');
-    font-weight: bold;
-    font-style: normal;
+@supports not (font-variation-settings: normal) {
+    @font-face {
+        @hash-open-sans-light-woff2: swhash('@{OpenSansPath}/Light/OpenSans-Light.woff2');
+        @hash-open-sans-light-woff: swhash('@{OpenSansPath}/Light/OpenSans-Light.woff');
+        @hash-open-sans-light-ttf: swhash('@{OpenSansPath}/Light/OpenSans-Light.ttf');
+
+        font-family: 'Open Sans';
+        font-display: swap;
+        src: local('Open Sans Light'),
+            local('OpenSans-Light'),
+            url('@{OpenSansPath}/Light/OpenSans-Light.woff2?@{hash-open-sans-light-woff2}') format('woff2'),
+            url('@{OpenSansPath}/Light/OpenSans-Light.woff?@{hash-open-sans-light-woff}') format('woff'),
+            url('@{OpenSansPath}/Light/OpenSans-Light.ttf?@{hash-open-sans-light-ttf}') format('truetype');
+        font-weight: 300;
+        font-style: normal;
+    }
+
+    @font-face {
+        @hash-open-sans-regular-woff-2: swhash('@{OpenSansPath}/Regular/OpenSans-Regular.woff2');
+        @hash-open-sans-regular-woff: swhash('@{OpenSansPath}/Regular/OpenSans-Regular.woff');
+        @hash-open-sans-regular-ttf: swhash('@{OpenSansPath}/Regular/OpenSans-Regular.ttf');
+
+        font-family: 'Open Sans';
+        font-display: swap;
+        src: local('Open Sans Regular'),
+            local('Open Sans'),
+            url('@{OpenSansPath}/Regular/OpenSans-Regular.woff2?@{hash-open-sans-regular-woff-2}') format('woff2'),
+            url('@{OpenSansPath}/Regular/OpenSans-Regular.woff?@{hash-open-sans-regular-woff}') format('woff'),
+            url('@{OpenSansPath}/Regular/OpenSans-Regular.ttf?@{hash-open-sans-regular-ttf}') format('truetype');
+        font-weight: normal;
+        font-style: normal;
+    }
+
+    @font-face {
+        @hash-open-sans-semibold-woff-2: swhash('@{OpenSansPath}/Semibold/OpenSans-Semibold.woff2');
+        @hash-open-sans-semibold-woff: swhash('@{OpenSansPath}/Semibold/OpenSans-Semibold.woff');
+        @hash-open-sans-semibold-ttf: swhash('@{OpenSansPath}/Semibold/OpenSans-Semibold.ttf');
+
+        font-family: 'Open Sans';
+        font-display: swap;
+        src: local('Open Sans Semibold'),
+            local('OpenSans-SemiBold'),
+            url('@{OpenSansPath}/Semibold/OpenSans-Semibold.woff2?@{hash-open-sans-semibold-woff-2}') format('woff2'),
+            url('@{OpenSansPath}/Semibold/OpenSans-Semibold.woff?@{hash-open-sans-semibold-woff}') format('woff'),
+            url('@{OpenSansPath}/Semibold/OpenSans-Semibold.ttf?@{hash-open-sans-semibold-ttf}') format('truetype');
+        font-weight: 600;
+        font-style: normal;
+    }
+
+    @font-face {
+        @hash-open-sans-bold-woff-2: swhash('@{OpenSansPath}/Bold/OpenSans-Bold.woff2');
+        @hash-open-sans-bold-woff: swhash('@{OpenSansPath}/Bold/OpenSans-Bold.woff');
+        @hash-open-sans-bold-ttf: swhash('@{OpenSansPath}/Bold/OpenSans-Bold.ttf');
+
+        font-family: 'Open Sans';
+        font-display: swap;
+        src: local('Open Sans Bold'),
+            local('OpenSans-Bold'),
+            url('@{OpenSansPath}/Bold/OpenSans-Bold.woff2?@{hash-open-sans-bold-woff-2}') format('woff2'),
+            url('@{OpenSansPath}/Bold/OpenSans-Bold.woff?@{hash-open-sans-bold-woff}') format('woff'),
+            url('@{OpenSansPath}/Bold/OpenSans-Bold.ttf?@{hash-open-sans-bold-ttf}') format('truetype');
+        font-weight: bold;
+        font-style: normal;
+    }
+
+    @font-face {
+        @hash-open-sans-extrabold-woff-2: swhash('@{OpenSansPath}/ExtraBold/OpenSans-ExtraBold.woff2');
+        @hash-open-sans-extrabold-woff: swhash('@{OpenSansPath}/ExtraBold/OpenSans-ExtraBold.woff');
+        @hash-open-sans-extrabold-ttf: swhash('@{OpenSansPath}/ExtraBold/OpenSans-ExtraBold.ttf');
+
+        font-family: 'Open Sans';
+        font-display: swap;
+        src: local('Open Sans ExtraBold'),
+            local('OpenSans-ExtraBold'),
+            url('@{OpenSansPath}/ExtraBold/OpenSans-ExtraBold.woff2?@{hash-open-sans-extrabold-woff-2}') format('woff2'),
+            url('@{OpenSansPath}/ExtraBold/OpenSans-ExtraBold.woff?@{hash-open-sans-extrabold-woff}') format('woff'),
+            url('@{OpenSansPath}/ExtraBold/OpenSans-ExtraBold.ttf?@{hash-open-sans-extrabold-ttf}') format('truetype');
+        font-weight: 800;
+        font-style: normal;
+    }
 }
-/* END Bold */
-
-/* BEGIN Extrabold */
-@font-face {
-    @hash-open-sans-extrabold-woff-2: swhash('@{OpenSansPath}/ExtraBold/OpenSans-ExtraBold.woff2');
-    @hash-open-sans-extrabold-woff: swhash('@{OpenSansPath}/ExtraBold/OpenSans-ExtraBold.woff');
-    @hash-open-sans-extrabold-ttf: swhash('@{OpenSansPath}/ExtraBold/OpenSans-ExtraBold.ttf');
-
-    font-family: 'Open Sans';
-    font-display: swap;
-    src: local('Open Sans ExtraBold'),
-    local('OpenSans-ExtraBold'),
-    url('@{OpenSansPath}/ExtraBold/OpenSans-ExtraBold.woff2?@{hash-open-sans-extrabold-woff-2}') format('woff2'),
-    url('@{OpenSansPath}/ExtraBold/OpenSans-ExtraBold.woff?@{hash-open-sans-extrabold-woff}') format('woff'),
-    url('@{OpenSansPath}/ExtraBold/OpenSans-ExtraBold.ttf?@{hash-open-sans-extrabold-ttf}') format('truetype');
-    font-weight: 800;
-    font-style: normal;
+
+@supports (font-variation-settings: normal) {
+    @font-face {
+        @hash-open-sans-variable-cyrillic-ext-woff-2: swhash('@{OpenSansPath}/Variable/OpenSans.cyrillic-ext.woff2');
+
+        font-family: 'Open Sans';
+        font-style: normal;
+        font-weight: 300 800;
+        font-display: fallback;
+        src: url('@{OpenSansPath}/Variable/OpenSans.cyrillic-ext.woff2?@{hash-open-sans-variable-cyrillic-ext-woff-2}') format('woff2 supports variations'),
+            url('@{OpenSansPath}/Variable/OpenSans.cyrillic-ext.woff2?@{hash-open-sans-variable-cyrillic-ext-woff-2}');
+        unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+    }
+
+    @font-face {
+        @hash-open-sans-variable-cyrillic-woff-2: swhash('@{OpenSansPath}/Variable/OpenSans.cyrillic.woff2');
+
+        font-family: 'Open Sans';
+        font-style: normal;
+        font-weight: 300 800;
+        font-display: fallback;
+        src: url('@{OpenSansPath}/Variable/OpenSans.cyrillic.woff2?@{hash-open-sans-variable-cyrillic-woff-2}') format('woff2 supports variations'),
+            url('@{OpenSansPath}/Variable/OpenSans.cyrillic.woff2?@{hash-open-sans-variable-cyrillic-woff-2}') format('woff2-variations');
+        unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+    }
+
+    @font-face {
+        @hash-open-sans-variable-greek-ext-woff-2: swhash('@{OpenSansPath}/Variable/OpenSans.greek-ext.woff2');
+
+        font-family: 'Open Sans';
+        font-style: normal;
+        font-weight: 300 800;
+        font-display: fallback;
+        src: url('@{OpenSansPath}/Variable/OpenSans.greek-ext.woff2?@{hash-open-sans-variable-greek-ext-woff-2}') format('woff2 supports variations'),
+            url('@{OpenSansPath}/Variable/OpenSans.greek-ext.woff2?@{hash-open-sans-variable-greek-ext-woff-2}') format('woff2-variations');
+        unicode-range: U+1F00-1FFF;
+    }
+
+    @font-face {
+        @hash-open-sans-variable-greek-woff-2: swhash('@{OpenSansPath}/Variable/OpenSans.greek.woff2');
+
+        font-family: 'Open Sans';
+        font-style: normal;
+        font-weight: 300 800;
+        font-display: fallback;
+        src: url('@{OpenSansPath}/Variable/OpenSans.greek.woff2?@{hash-open-sans-variable-greek-woff-2}') format('woff2 supports variations'),
+            url('@{OpenSansPath}/Variable/OpenSans.greek.woff2?@{hash-open-sans-variable-greek-woff-2}') format('woff2-variations');
+        unicode-range: U+0370-03FF;
+    }
+
+    @font-face {
+        @hash-open-sans-variable-vietnamese-woff-2: swhash('@{OpenSansPath}/Variable/OpenSans.vietnamese.woff2');
+
+        font-family: 'Open Sans';
+        font-style: normal;
+        font-weight: 300 800;
+        font-display: fallback;
+        src: url('@{OpenSansPath}/Variable/OpenSans.vietnamese.woff2?@{hash-open-sans-variable-vietnamese-woff-2}') format('woff2 supports variations'),
+            url('@{OpenSansPath}/Variable/OpenSans.vietnamese.woff2?@{hash-open-sans-variable-vietnamese-woff-2}') format('woff2-variations');
+        unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+    }
+
+    @font-face {
+        @hash-open-sans-variable-latin-ext-woff-2: swhash('@{OpenSansPath}/Variable/OpenSans.latin-ext.woff2');
+
+        font-family: 'Open Sans';
+        font-style: normal;
+        font-weight: 300 800;
+        font-display: fallback;
+        src: url('@{OpenSansPath}/Variable/OpenSans.latin-ext.woff2?@{hash-open-sans-variable-latin-ext-woff-2}') format('woff2 supports variations'),
+            url('@{OpenSansPath}/Variable/OpenSans.latin-ext.woff2?@{hash-open-sans-variable-latin-ext-woff-2}') format('woff2-variations');
+        unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+    }
+
+    @font-face {
+        @hash-open-sans-variable-latin-woff-2: swhash('@{OpenSansPath}/Variable/OpenSans.latin.woff2');
+
+        font-family: 'Open Sans';
+        font-style: normal;
+        font-weight: 300 800;
+        font-display: fallback;
+        src: url('@{OpenSansPath}/Variable/OpenSans.latin.woff2?@{hash-open-sans-variable-latin-woff-2}') format('woff2 supports variations'),
+            url('@{OpenSansPath}/Variable/OpenSans.latin.woff2?@{hash-open-sans-variable-latin-woff-2}') format('woff2-variations');
+        unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+    }
 }
-/* END Extrabold */
diff --git a/themes/Frontend/Responsive/frontend/_public/src/less/_modules/detail.less b/themes/Frontend/Responsive/frontend/_public/src/less/_modules/detail.less
index 43a6d441916..b4ee41d9c7a 100644
--- a/themes/Frontend/Responsive/frontend/_public/src/less/_modules/detail.less
+++ b/themes/Frontend/Responsive/frontend/_public/src/less/_modules/detail.less
@@ -507,6 +507,11 @@ It contains the product actions, the product information such as pictures and de
             .unitize(font-size, 12);
         }
     }
+    .notification--captcha {
+        img {
+            display: inline;
+        }
+    }
     .privacy-information {
         .unitize-margin(0);
     }
diff --git a/themes/Frontend/Responsive/frontend/_public/vendors/fonts/open-sans-fontface/Variable/OpenSans.cyrillic-ext.woff2 b/themes/Frontend/Responsive/frontend/_public/vendors/fonts/open-sans-fontface/Variable/OpenSans.cyrillic-ext.woff2
new file mode 100644
index 00000000000..647d6c4b274
Binary files /dev/null and b/themes/Frontend/Responsive/frontend/_public/vendors/fonts/open-sans-fontface/Variable/OpenSans.cyrillic-ext.woff2 differ
diff --git a/themes/Frontend/Responsive/frontend/_public/vendors/fonts/open-sans-fontface/Variable/OpenSans.cyrillic.woff2 b/themes/Frontend/Responsive/frontend/_public/vendors/fonts/open-sans-fontface/Variable/OpenSans.cyrillic.woff2
new file mode 100644
index 00000000000..0e1ed408e6b
Binary files /dev/null and b/themes/Frontend/Responsive/frontend/_public/vendors/fonts/open-sans-fontface/Variable/OpenSans.cyrillic.woff2 differ
diff --git a/themes/Frontend/Responsive/frontend/_public/vendors/fonts/open-sans-fontface/Variable/OpenSans.greek-ext.woff2 b/themes/Frontend/Responsive/frontend/_public/vendors/fonts/open-sans-fontface/Variable/OpenSans.greek-ext.woff2
new file mode 100644
index 00000000000..6852383717f
Binary files /dev/null and b/themes/Frontend/Responsive/frontend/_public/vendors/fonts/open-sans-fontface/Variable/OpenSans.greek-ext.woff2 differ
diff --git a/themes/Frontend/Responsive/frontend/_public/vendors/fonts/open-sans-fontface/Variable/OpenSans.greek.woff2 b/themes/Frontend/Responsive/frontend/_public/vendors/fonts/open-sans-fontface/Variable/OpenSans.greek.woff2
new file mode 100644
index 00000000000..5d31762b481
Binary files /dev/null and b/themes/Frontend/Responsive/frontend/_public/vendors/fonts/open-sans-fontface/Variable/OpenSans.greek.woff2 differ
diff --git a/themes/Frontend/Responsive/frontend/_public/vendors/fonts/open-sans-fontface/Variable/OpenSans.latin-ext.woff2 b/themes/Frontend/Responsive/frontend/_public/vendors/fonts/open-sans-fontface/Variable/OpenSans.latin-ext.woff2
new file mode 100644
index 00000000000..a99c24de566
Binary files /dev/null and b/themes/Frontend/Responsive/frontend/_public/vendors/fonts/open-sans-fontface/Variable/OpenSans.latin-ext.woff2 differ
diff --git a/themes/Frontend/Responsive/frontend/_public/vendors/fonts/open-sans-fontface/Variable/OpenSans.latin.woff2 b/themes/Frontend/Responsive/frontend/_public/vendors/fonts/open-sans-fontface/Variable/OpenSans.latin.woff2
new file mode 100644
index 00000000000..f6c543fa6e3
Binary files /dev/null and b/themes/Frontend/Responsive/frontend/_public/vendors/fonts/open-sans-fontface/Variable/OpenSans.latin.woff2 differ
diff --git a/themes/Frontend/Responsive/frontend/_public/vendors/fonts/open-sans-fontface/Variable/OpenSans.vietnamese.woff2 b/themes/Frontend/Responsive/frontend/_public/vendors/fonts/open-sans-fontface/Variable/OpenSans.vietnamese.woff2
new file mode 100644
index 00000000000..0a11da0da30
Binary files /dev/null and b/themes/Frontend/Responsive/frontend/_public/vendors/fonts/open-sans-fontface/Variable/OpenSans.vietnamese.woff2 differ
diff --git a/themes/Frontend/Responsive/frontend/_public/vendors/js/jquery.event.move/jquery.event.move.js b/themes/Frontend/Responsive/frontend/_public/vendors/js/jquery.event.move/jquery.event.move.js
index 3ac47002dec..014d96f3feb 100644
--- a/themes/Frontend/Responsive/frontend/_public/vendors/js/jquery.event.move/jquery.event.move.js
+++ b/themes/Frontend/Responsive/frontend/_public/vendors/js/jquery.event.move/jquery.event.move.js
@@ -195,7 +195,7 @@
 	}
 
 	function isIgnoreTag(e) {
-		return !!ignoreTags[e.target.tagName.toLowerCase()];
+	    return !!e.target.tagName && !!ignoreTags[e.target.tagName.toLowerCase()];
 	}
 
 	function isPrimaryButton(e) {
diff --git a/themes/Frontend/Responsive/frontend/_public/vendors/js/jquery/LICENSE.txt b/themes/Frontend/Responsive/frontend/_public/vendors/js/jquery/LICENSE.txt
index e3dbacb999c..f642c3f7a77 100644
--- a/themes/Frontend/Responsive/frontend/_public/vendors/js/jquery/LICENSE.txt
+++ b/themes/Frontend/Responsive/frontend/_public/vendors/js/jquery/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright JS Foundation and other contributors, https://js.foundation/
+Copyright OpenJS Foundation and other contributors, https://openjsf.org/
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/themes/Frontend/Responsive/frontend/_public/vendors/js/jquery/README.md b/themes/Frontend/Responsive/frontend/_public/vendors/js/jquery/README.md
index 71f2dad2fe8..fcc11f3ba55 100644
--- a/themes/Frontend/Responsive/frontend/_public/vendors/js/jquery/README.md
+++ b/themes/Frontend/Responsive/frontend/_public/vendors/js/jquery/README.md
@@ -5,7 +5,7 @@
 For information on how to get started and how to use jQuery, please see [jQuery's documentation](https://api.jquery.com/).
 For source files and issues, please visit the [jQuery repo](https://github.com/jquery/jquery).
 
-If upgrading, please see the [blog post for 3.5.1](https://blog.jquery.com/2020/05/04/jquery-3-5-1-released-fixing-a-regression/). This includes notable differences from the previous version and a more readable changelog.
+If upgrading, please see the [blog post for 3.7.1](https://blog.jquery.com/2023/08/28/jquery-3-7-1-released-reliable-table-row-dimensions/). This includes notable differences from the previous version and a more readable changelog.
 
 ## Including jQuery
 
@@ -16,20 +16,18 @@ Below are some of the most common ways to include jQuery.
 #### Script tag
 
 ```html
-<script src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
+<script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
 ```
 
-#### Babel
+#### Webpack / Browserify / Babel
 
-[Babel](https://babeljs.io/) is a next generation JavaScript compiler. One of the features is the ability to use ES6/ES2015 modules now, even though browsers do not yet support this feature natively.
+There are several ways to use [Webpack](https://webpack.js.org/), [Browserify](http://browserify.org/) or [Babel](https://babeljs.io/). For more information on using these tools, please refer to the corresponding project's documentation. In the script, including jQuery will usually look like this:
 
 ```js
 import $ from "jquery";
 ```
 
-#### Browserify/Webpack
-
-There are several ways to use [Browserify](http://browserify.org/) and [Webpack](https://webpack.github.io/). For more information on using these tools, please refer to the corresponding project's documentation. In the script, including jQuery will usually look like this...
+If you need to use jQuery in a file that's not an ECMAScript module, you can use the CommonJS syntax:
 
 ```js
 var $ = require( "jquery" );
diff --git a/themes/Frontend/Responsive/frontend/_public/vendors/js/jquery/jquery.min.js b/themes/Frontend/Responsive/frontend/_public/vendors/js/jquery/jquery.min.js
index b0614034ad3..7f37b5d9912 100644
--- a/themes/Frontend/Responsive/frontend/_public/vendors/js/jquery/jquery.min.js
+++ b/themes/Frontend/Responsive/frontend/_public/vendors/js/jquery/jquery.min.js
@@ -1,2 +1,2 @@
-/*! jQuery v3.5.1 | (c) JS Foundation and other contributors | jquery.org/license */
-!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.5.1",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}S.fn=S.prototype={jquery:f,constructor:S,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=S.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return S.each(this,e)},map:function(n){return this.pushStack(S.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},even:function(){return this.pushStack(S.grep(this,function(e,t){return(t+1)%2}))},odd:function(){return this.pushStack(S.grep(this,function(e,t){return t%2}))},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:u,sort:t.sort,splice:t.splice},S.extend=S.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(S.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||S.isPlainObject(n)?n:{},i=!1,a[t]=S.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},S.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=v.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t,n){b(e,{nonce:t&&t.nonce},n)},each:function(e,t){var n,r=0;if(p(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},makeArray:function(e,t){var n=t||[];return null!=e&&(p(Object(e))?S.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(p(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g(a)},guid:1,support:y}),"function"==typeof Symbol&&(S.fn[Symbol.iterator]=t[Symbol.iterator]),S.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var d=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,v,s,c,y,S="sizzle"+1*new Date,p=n.document,k=0,r=0,m=ue(),x=ue(),A=ue(),N=ue(),D=function(e,t){return e===t&&(l=!0),0},j={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",F=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",B=new RegExp(M+"+","g"),$=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="<a id='"+S+"'></a><select id='"+S+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||v.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&y(p,e)?-1:t==C||t.ownerDocument==p&&y(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0<se(t,C,null,[e]).length},se.contains=function(e,t){return(e.ownerDocument||e)!=C&&T(e),y(e,t)},se.attr=function(e,t){(e.ownerDocument||e)!=C&&T(e);var n=b.attrHandle[t.toLowerCase()],r=n&&j.call(b.attrHandle,t.toLowerCase())?n(e,t,!E):void 0;return void 0!==r?r:d.attributes||!E?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},se.escape=function(e){return(e+"").replace(re,ie)},se.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},se.uniqueSort=function(e){var t,n=[],r=0,i=0;if(l=!d.detectDuplicates,u=!d.sortStable&&e.slice(0),e.sort(D),l){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)e.splice(n[r],1)}return u=null,e},o=se.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else while(t=e[r++])n+=o(t);return n},(b=se.selectors={cacheLength:50,createPseudo:le,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(B," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(h,e,t,g,v){var y="nth"!==h.slice(0,3),m="last"!==h.slice(-4),x="of-type"===e;return 1===g&&0===v?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u,l=y!==m?"nextSibling":"previousSibling",c=e.parentNode,f=x&&e.nodeName.toLowerCase(),p=!n&&!x,d=!1;if(c){if(y){while(l){a=e;while(a=a[l])if(x?a.nodeName.toLowerCase()===f:1===a.nodeType)return!1;u=l="only"===h&&!u&&"nextSibling"}return!0}if(u=[m?c.firstChild:c.lastChild],m&&p){d=(s=(r=(i=(o=(a=c)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1])&&r[2],a=s&&c.childNodes[s];while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if(1===a.nodeType&&++d&&a===e){i[h]=[k,s,d];break}}else if(p&&(d=s=(r=(i=(o=(a=e)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1]),!1===d)while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if((x?a.nodeName.toLowerCase()===f:1===a.nodeType)&&++d&&(p&&((i=(o=a[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]=[k,d]),a===e))break;return(d-=v)===g||d%g==0&&0<=d/g}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||se.error("unsupported pseudo: "+e);return a[S]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?le(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=P(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:le(function(e){var r=[],i=[],s=f(e.replace($,"$1"));return s[S]?le(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:le(function(t){return function(e){return 0<se(t,e).length}}),contains:le(function(t){return t=t.replace(te,ne),function(e){return-1<(e.textContent||o(e)).indexOf(t)}}),lang:le(function(n){return V.test(n||"")||se.error("unsupported lang: "+n),n=n.replace(te,ne).toLowerCase(),function(e){var t;do{if(t=E?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=n.location&&n.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===a},focus:function(e){return e===C.activeElement&&(!C.hasFocus||C.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ge(!1),disabled:ge(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return J.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:ve(function(){return[0]}),last:ve(function(e,t){return[t-1]}),eq:ve(function(e,t,n){return[n<0?n+t:n]}),even:ve(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:ve(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:ve(function(e,t,n){for(var r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:ve(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=de(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=he(e);function me(){}function xe(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function be(s,e,t){var u=e.dir,l=e.next,c=l||u,f=t&&"parentNode"===c,p=r++;return e.first?function(e,t,n){while(e=e[u])if(1===e.nodeType||f)return s(e,t,n);return!1}:function(e,t,n){var r,i,o,a=[k,p];if(n){while(e=e[u])if((1===e.nodeType||f)&&s(e,t,n))return!0}else while(e=e[u])if(1===e.nodeType||f)if(i=(o=e[S]||(e[S]={}))[e.uniqueID]||(o[e.uniqueID]={}),l&&l===e.nodeName.toLowerCase())e=e[u]||e;else{if((r=i[c])&&r[0]===k&&r[1]===p)return a[2]=r[2];if((i[c]=a)[2]=s(e,t,n))return!0}return!1}}function we(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Te(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Ce(d,h,g,v,y,e){return v&&!v[S]&&(v=Ce(v)),y&&!y[S]&&(y=Ce(y,e)),le(function(e,t,n,r){var i,o,a,s=[],u=[],l=t.length,c=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)se(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),f=!d||!e&&h?c:Te(c,s,d,n,r),p=g?y||(e?d:l||v)?[]:t:f;if(g&&g(f,p,n,r),v){i=Te(p,u),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(p[u[o]]=!(f[u[o]]=a))}if(e){if(y||d){if(y){i=[],o=p.length;while(o--)(a=p[o])&&i.push(f[o]=a);y(null,p=[],i,r)}o=p.length;while(o--)(a=p[o])&&-1<(i=y?P(e,a):s[o])&&(e[i]=!(t[i]=a))}}else p=Te(p===t?p.splice(l,p.length):p),y?y(null,t,p,r):H.apply(t,p)})}function Ee(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=be(function(e){return e===i},a,!0),l=be(function(e){return-1<P(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!==w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[be(we(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[S]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return Ce(1<s&&we(c),1<s&&xe(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace($,"$1"),t,s<n&&Ee(e.slice(s,n)),n<r&&Ee(e=e.slice(n)),n<r&&xe(e))}c.push(t)}return we(c)}return me.prototype=b.filters=b.pseudos,b.setFilters=new me,h=se.tokenize=function(e,t){var n,r,i,o,a,s,u,l=x[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=_.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=z.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace($," ")}),a=a.slice(n.length)),b.filter)!(r=G[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?se.error(e):x(e,s).slice(0)},f=se.compile=function(e,t){var n,v,y,m,x,r,i=[],o=[],a=A[e+" "];if(!a){t||(t=h(e)),n=t.length;while(n--)(a=Ee(t[n]))[S]?i.push(a):o.push(a);(a=A(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=k+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t==C||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument==C||(T(o),n=!E);while(s=v[a++])if(s(o,t||C,n)){r.push(o);break}i&&(k=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=q.call(r));f=Te(f)}H.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&se.uniqueSort(r)}return i&&(k=h,w=p),c},m?le(r):r))).selector=e}return a},g=se.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&h(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&E&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(te,ne),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=G.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(te,ne),ee.test(o[0].type)&&ye(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&xe(o)))return H.apply(n,r),n;break}}}return(l||f(e,c))(r,t,!E,n,!t||ee.test(e)&&ye(t.parentNode)||t),n},d.sortStable=S.split("").sort(D).join("")===S,d.detectDuplicates=!!l,T(),d.sortDetached=ce(function(e){return 1&e.compareDocumentPosition(C.createElement("fieldset"))}),ce(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||fe("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),d.attributes&&ce(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||fe("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ce(function(e){return null==e.getAttribute("disabled")})||fe(R,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),se}(C);S.find=d,S.expr=d.selectors,S.expr[":"]=S.expr.pseudos,S.uniqueSort=S.unique=d.uniqueSort,S.text=d.getText,S.isXMLDoc=d.isXML,S.contains=d.contains,S.escapeSelector=d.escape;var h=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&S(e).is(n))break;r.push(e)}return r},T=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},k=S.expr.match.needsContext;function A(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var N=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function D(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1<i.call(n,e)!==r}):S.filter(n,e,r)}S.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?S.find.matchesSelector(r,e)?[r]:[]:S.find.matches(e,S.grep(t,function(e){return 1===e.nodeType}))},S.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(S(e).filter(function(){for(t=0;t<r;t++)if(S.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)S.find(e,i[t],n);return 1<r?S.uniqueSort(n):n},filter:function(e){return this.pushStack(D(this,e||[],!1))},not:function(e){return this.pushStack(D(this,e||[],!0))},is:function(e){return!!D(this,"string"==typeof e&&k.test(e)?S(e):e||[],!1).length}});var j,q=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||j,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,j=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(S.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&S(e);if(!k.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&S.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?S.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?i.call(S(e),this[0]):i.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(S.uniqueSort(S.merge(this.get(),S(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),S.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return h(e,"parentNode")},parentsUntil:function(e,t,n){return h(e,"parentNode",n)},next:function(e){return O(e,"nextSibling")},prev:function(e){return O(e,"previousSibling")},nextAll:function(e){return h(e,"nextSibling")},prevAll:function(e){return h(e,"previousSibling")},nextUntil:function(e,t,n){return h(e,"nextSibling",n)},prevUntil:function(e,t,n){return h(e,"previousSibling",n)},siblings:function(e){return T((e.parentNode||{}).firstChild,e)},children:function(e){return T(e.firstChild)},contents:function(e){return null!=e.contentDocument&&r(e.contentDocument)?e.contentDocument:(A(e,"template")&&(e=e.content||e),S.merge([],e.childNodes))}},function(r,i){S.fn[r]=function(e,t){var n=S.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=S.filter(t,n)),1<this.length&&(H[r]||S.uniqueSort(n),L.test(r)&&n.reverse()),this.pushStack(n)}});var P=/[^\x20\t\r\n\f]+/g;function R(e){return e}function M(e){throw e}function I(e,t,n,r){var i;try{e&&m(i=e.promise)?i.call(e).done(t).fail(n):e&&m(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}S.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},S.each(e.match(P)||[],function(e,t){n[t]=!0}),n):S.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){S.each(e,function(e,t){m(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==w(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return S.each(arguments,function(e,t){var n;while(-1<(n=S.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<S.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},S.extend({Deferred:function(e){var o=[["notify","progress",S.Callbacks("memory"),S.Callbacks("memory"),2],["resolve","done",S.Callbacks("once memory"),S.Callbacks("once memory"),0,"resolved"],["reject","fail",S.Callbacks("once memory"),S.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return S.Deferred(function(r){S.each(o,function(e,t){var n=m(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&m(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,m(t)?s?t.call(e,l(u,o,R,s),l(u,o,M,s)):(u++,t.call(e,l(u,o,R,s),l(u,o,M,s),l(u,o,R,o.notifyWith))):(a!==R&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){S.Deferred.exceptionHook&&S.Deferred.exceptionHook(e,t.stackTrace),u<=i+1&&(a!==M&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(S.Deferred.getStackHook&&(t.stackTrace=S.Deferred.getStackHook()),C.setTimeout(t))}}return S.Deferred(function(e){o[0][3].add(l(0,e,m(r)?r:R,e.notifyWith)),o[1][3].add(l(0,e,m(t)?t:R)),o[2][3].add(l(0,e,m(n)?n:M))}).promise()},promise:function(e){return null!=e?S.extend(e,a):a}},s={};return S.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=s.call(arguments),o=S.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?s.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(I(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||m(i[t]&&i[t].then)))return o.then();while(t--)I(i[t],a(t),o.reject);return o.promise()}});var W=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;S.Deferred.exceptionHook=function(e,t){C.console&&C.console.warn&&e&&W.test(e.name)&&C.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},S.readyException=function(e){C.setTimeout(function(){throw e})};var F=S.Deferred();function B(){E.removeEventListener("DOMContentLoaded",B),C.removeEventListener("load",B),S.ready()}S.fn.ready=function(e){return F.then(e)["catch"](function(e){S.readyException(e)}),this},S.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--S.readyWait:S.isReady)||(S.isReady=!0)!==e&&0<--S.readyWait||F.resolveWith(E,[S])}}),S.ready.then=F.then,"complete"===E.readyState||"loading"!==E.readyState&&!E.documentElement.doScroll?C.setTimeout(S.ready):(E.addEventListener("DOMContentLoaded",B),C.addEventListener("load",B));var $=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===w(n))for(s in i=!0,n)$(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,m(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(S(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},_=/^-ms-/,z=/-([a-z])/g;function U(e,t){return t.toUpperCase()}function X(e){return e.replace(_,"ms-").replace(z,U)}var V=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function G(){this.expando=S.expando+G.uid++}G.uid=1,G.prototype={cache:function(e){var t=e[this.expando];return t||(t={},V(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[X(t)]=n;else for(r in t)i[X(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][X(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(X):(t=X(t))in r?[t]:t.match(P)||[]).length;while(n--)delete r[t[n]]}(void 0===t||S.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!S.isEmptyObject(t)}};var Y=new G,Q=new G,J=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,K=/[A-Z]/g;function Z(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(K,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:J.test(i)?JSON.parse(i):i)}catch(e){}Q.set(e,t,n)}else n=void 0;return n}S.extend({hasData:function(e){return Q.hasData(e)||Y.hasData(e)},data:function(e,t,n){return Q.access(e,t,n)},removeData:function(e,t){Q.remove(e,t)},_data:function(e,t,n){return Y.access(e,t,n)},_removeData:function(e,t){Y.remove(e,t)}}),S.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=Q.get(o),1===o.nodeType&&!Y.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=X(r.slice(5)),Z(o,r,i[r]));Y.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){Q.set(this,n)}):$(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=Q.get(o,n))?t:void 0!==(t=Z(o,n))?t:void 0;this.each(function(){Q.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){Q.remove(this,e)})}}),S.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Y.get(e,t),n&&(!r||Array.isArray(n)?r=Y.access(e,t,S.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=S.queue(e,t),r=n.length,i=n.shift(),o=S._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){S.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Y.get(e,n)||Y.access(e,n,{empty:S.Callbacks("once memory").add(function(){Y.remove(e,[t+"queue",n])})})}}),S.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?S.queue(this[0],t):void 0===n?this:this.each(function(){var e=S.queue(this,t,n);S._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&S.dequeue(this,t)})},dequeue:function(e){return this.each(function(){S.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=S.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=Y.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var ee=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,te=new RegExp("^(?:([+-])=|)("+ee+")([a-z%]*)$","i"),ne=["Top","Right","Bottom","Left"],re=E.documentElement,ie=function(e){return S.contains(e.ownerDocument,e)},oe={composed:!0};re.getRootNode&&(ie=function(e){return S.contains(e.ownerDocument,e)||e.getRootNode(oe)===e.ownerDocument});var ae=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&ie(e)&&"none"===S.css(e,"display")};function se(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return S.css(e,t,"")},u=s(),l=n&&n[3]||(S.cssNumber[t]?"":"px"),c=e.nodeType&&(S.cssNumber[t]||"px"!==l&&+u)&&te.exec(S.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)S.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,S.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ue={};function le(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=Y.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&ae(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ue[s])||(o=a.body.appendChild(a.createElement(s)),u=S.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ue[s]=u)))):"none"!==n&&(l[c]="none",Y.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}S.fn.extend({show:function(){return le(this,!0)},hide:function(){return le(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){ae(this)?S(this).show():S(this).hide()})}});var ce,fe,pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),y.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="<textarea>x</textarea>",y.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="<option></option>",y.option=!!ce.lastChild;var ge={thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n<r;n++)Y.set(e[n],"globalEval",!t||Y.get(t[n],"globalEval"))}ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td,y.option||(ge.optgroup=ge.option=[1,"<select multiple='multiple'>","</select>"]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===w(o))S.merge(p,o.nodeType?[o]:o);else if(me.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+S.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;S.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<S.inArray(o,r))i&&i.push(o);else if(l=ie(o),a=ve(f.appendChild(o),"script"),l&&ye(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}var be=/^key/,we=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Te=/^([^.]*)(?:\.(.+)|)/;function Ce(){return!0}function Ee(){return!1}function Se(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function ke(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)ke(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Ee;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return S().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=S.guid++)),e.each(function(){S.event.add(this,t,i,r,n)})}function Ae(e,i,o){o?(Y.set(e,i,!1),S.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Y.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(S.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Y.set(this,i,r),t=o(this,i),this[i](),r!==(n=Y.get(this,i))||t?Y.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n.value}else r.length&&(Y.set(this,i,{value:S.event.trigger(S.extend(r[0],S.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Y.get(e,i)&&S.event.add(e,i,Ce)}S.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.get(t);if(V(t)){n.handler&&(n=(o=n).handler,i=o.selector),i&&S.find.matchesSelector(re,i),n.guid||(n.guid=S.guid++),(u=v.events)||(u=v.events=Object.create(null)),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof S&&S.event.triggered!==e.type?S.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(P)||[""]).length;while(l--)d=g=(s=Te.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=S.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=S.event.special[d]||{},c=S.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&S.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),S.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.hasData(e)&&Y.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(P)||[""]).length;while(l--)if(d=g=(s=Te.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=S.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||S.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)S.event.remove(e,d+t[l],n,r,!0);S.isEmptyObject(u)&&Y.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=new Array(arguments.length),u=S.event.fix(e),l=(Y.get(this,"events")||Object.create(null))[u.type]||[],c=S.event.special[u.type]||{};for(s[0]=u,t=1;t<arguments.length;t++)s[t]=arguments[t];if(u.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,u)){a=S.event.handlers.call(this,u,l),t=0;while((i=a[t++])&&!u.isPropagationStopped()){u.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!u.isImmediatePropagationStopped())u.rnamespace&&!1!==o.namespace&&!u.rnamespace.test(o.namespace)||(u.handleObj=o,u.data=o.data,void 0!==(r=((S.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s))&&!1===(u.result=r)&&(u.preventDefault(),u.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,u),u.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<S(i,this).index(l):S.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(S.Event.prototype,t,{enumerable:!0,configurable:!0,get:m(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[S.expando]?e:new S.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Ae(t,"click",Ce),!1},trigger:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Ae(t,"click"),!0},_default:function(e){var t=e.target;return pe.test(t.type)&&t.click&&A(t,"input")&&Y.get(t,"click")||A(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},S.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},S.Event=function(e,t){if(!(this instanceof S.Event))return new S.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?Ce:Ee,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&S.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[S.expando]=!0},S.Event.prototype={constructor:S.Event,isDefaultPrevented:Ee,isPropagationStopped:Ee,isImmediatePropagationStopped:Ee,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=Ce,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=Ce,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=Ce,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},S.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(e){var t=e.button;return null==e.which&&be.test(e.type)?null!=e.charCode?e.charCode:e.keyCode:!e.which&&void 0!==t&&we.test(e.type)?1&t?1:2&t?3:4&t?2:0:e.which}},S.event.addProp),S.each({focus:"focusin",blur:"focusout"},function(e,t){S.event.special[e]={setup:function(){return Ae(this,e,Se),!1},trigger:function(){return Ae(this,e),!0},delegateType:t}}),S.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){S.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||S.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),S.fn.extend({on:function(e,t,n,r){return ke(this,e,t,n,r)},one:function(e,t,n,r){return ke(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,S(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=Ee),this.each(function(){S.event.remove(this,e,n,t)})}});var Ne=/<script|<style|<link/i,De=/checked\s*(?:[^=]|=\s*.checked.)/i,je=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function qe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function Le(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function He(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Oe(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n<r;n++)S.event.add(t,i,s[i][n]);Q.hasData(e)&&(o=Q.access(e),a=S.extend({},o),Q.set(t,a))}}function Pe(n,r,i,o){r=g(r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=m(d);if(h||1<f&&"string"==typeof d&&!y.checkClone&&De.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),Pe(t,r,i,o)});if(f&&(t=(e=xe(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=S.map(ve(e,"script"),Le)).length;c<f;c++)u=e,c!==p&&(u=S.clone(u,!0,!0),s&&S.merge(a,ve(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,S.map(a,He),c=0;c<s;c++)u=a[c],he.test(u.type||"")&&!Y.access(u,"globalEval")&&S.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?S._evalUrl&&!u.noModule&&S._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")},l):b(u.textContent.replace(je,""),u,l))}return n}function Re(e,t,n){for(var r,i=t?S.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||S.cleanData(ve(r)),r.parentNode&&(n&&ie(r)&&ye(ve(r,"script")),r.parentNode.removeChild(r));return e}S.extend({htmlPrefilter:function(e){return e},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=ie(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||S.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&pe.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||ve(e),a=a||ve(c),r=0,i=o.length;r<i;r++)Oe(o[r],a[r]);else Oe(e,c);return 0<(a=ve(c,"script")).length&&ye(a,!f&&ve(e,"script")),c},cleanData:function(e){for(var t,n,r,i=S.event.special,o=0;void 0!==(n=e[o]);o++)if(V(n)){if(t=n[Y.expando]){if(t.events)for(r in t.events)i[r]?S.event.remove(n,r):S.removeEvent(n,r,t.handle);n[Y.expando]=void 0}n[Q.expando]&&(n[Q.expando]=void 0)}}}),S.fn.extend({detach:function(e){return Re(this,e,!0)},remove:function(e){return Re(this,e)},text:function(e){return $(this,function(e){return void 0===e?S.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Pe(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||qe(this,e).appendChild(e)})},prepend:function(){return Pe(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=qe(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Pe(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Pe(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(S.cleanData(ve(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return S.clone(this,e,t)})},html:function(e){return $(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!Ne.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=S.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(S.cleanData(ve(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return Pe(this,arguments,function(e){var t=this.parentNode;S.inArray(this,n)<0&&(S.cleanData(ve(this)),t&&t.replaceChild(e,this))},n)}}),S.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){S.fn[e]=function(e){for(var t,n=[],r=S(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),S(r[o])[a](t),u.apply(n,t.get());return this.pushStack(n)}});var Me=new RegExp("^("+ee+")(?!px)[a-z%]+$","i"),Ie=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=C),t.getComputedStyle(e)},We=function(e,t,n){var r,i,o={};for(i in t)o[i]=e.style[i],e.style[i]=t[i];for(i in r=n.call(e),t)e.style[i]=o[i];return r},Fe=new RegExp(ne.join("|"),"i");function Be(e,t,n){var r,i,o,a,s=e.style;return(n=n||Ie(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||ie(e)||(a=S.style(e,t)),!y.pixelBoxStyles()&&Me.test(a)&&Fe.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function $e(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(l){u.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",l.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",re.appendChild(u).appendChild(l);var e=C.getComputedStyle(l);n="1%"!==e.top,s=12===t(e.marginLeft),l.style.right="60%",o=36===t(e.right),r=36===t(e.width),l.style.position="absolute",i=12===t(l.offsetWidth/3),re.removeChild(u),l=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s,u=E.createElement("div"),l=E.createElement("div");l.style&&(l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",y.clearCloneStyle="content-box"===l.style.backgroundClip,S.extend(y,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),s},scrollboxSize:function(){return e(),i},reliableTrDimensions:function(){var e,t,n,r;return null==a&&(e=E.createElement("table"),t=E.createElement("tr"),n=E.createElement("div"),e.style.cssText="position:absolute;left:-11111px",t.style.height="1px",n.style.height="9px",re.appendChild(e).appendChild(t).appendChild(n),r=C.getComputedStyle(t),a=3<parseInt(r.height),re.removeChild(e)),a}}))}();var _e=["Webkit","Moz","ms"],ze=E.createElement("div").style,Ue={};function Xe(e){var t=S.cssProps[e]||Ue[e];return t||(e in ze?e:Ue[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=_e.length;while(n--)if((e=_e[n]+t)in ze)return e}(e)||e)}var Ve=/^(none|table(?!-c[ea]).+)/,Ge=/^--/,Ye={position:"absolute",visibility:"hidden",display:"block"},Qe={letterSpacing:"0",fontWeight:"400"};function Je(e,t,n){var r=te.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function Ke(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=S.css(e,n+ne[a],!0,i)),r?("content"===n&&(u-=S.css(e,"padding"+ne[a],!0,i)),"margin"!==n&&(u-=S.css(e,"border"+ne[a]+"Width",!0,i))):(u+=S.css(e,"padding"+ne[a],!0,i),"padding"!==n?u+=S.css(e,"border"+ne[a]+"Width",!0,i):s+=S.css(e,"border"+ne[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function Ze(e,t,n){var r=Ie(e),i=(!y.boxSizingReliable()||n)&&"border-box"===S.css(e,"boxSizing",!1,r),o=i,a=Be(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if(Me.test(a)){if(!n)return a;a="auto"}return(!y.boxSizingReliable()&&i||!y.reliableTrDimensions()&&A(e,"tr")||"auto"===a||!parseFloat(a)&&"inline"===S.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===S.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+Ke(e,t,n||(i?"border":"content"),o,r,a)+"px"}function et(e,t,n,r,i){return new et.prototype.init(e,t,n,r,i)}S.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Be(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=X(t),u=Ge.test(t),l=e.style;if(u||(t=Xe(s)),a=S.cssHooks[t]||S.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=te.exec(n))&&i[1]&&(n=se(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(S.cssNumber[s]?"":"px")),y.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=X(t);return Ge.test(t)||(t=Xe(s)),(a=S.cssHooks[t]||S.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=Be(e,t,r)),"normal"===i&&t in Qe&&(i=Qe[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),S.each(["height","width"],function(e,u){S.cssHooks[u]={get:function(e,t,n){if(t)return!Ve.test(S.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?Ze(e,u,n):We(e,Ye,function(){return Ze(e,u,n)})},set:function(e,t,n){var r,i=Ie(e),o=!y.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===S.css(e,"boxSizing",!1,i),s=n?Ke(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-Ke(e,u,"border",!1,i)-.5)),s&&(r=te.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=S.css(e,u)),Je(0,t,s)}}}),S.cssHooks.marginLeft=$e(y.reliableMarginLeft,function(e,t){if(t)return(parseFloat(Be(e,"marginLeft"))||e.getBoundingClientRect().left-We(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),S.each({margin:"",padding:"",border:"Width"},function(i,o){S.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+ne[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(S.cssHooks[i+o].set=Je)}),S.fn.extend({css:function(e,t){return $(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Ie(e),i=t.length;a<i;a++)o[t[a]]=S.css(e,t[a],!1,r);return o}return void 0!==n?S.style(e,t,n):S.css(e,t)},e,t,1<arguments.length)}}),((S.Tween=et).prototype={constructor:et,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||S.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(S.cssNumber[n]?"":"px")},cur:function(){var e=et.propHooks[this.prop];return e&&e.get?e.get(this):et.propHooks._default.get(this)},run:function(e){var t,n=et.propHooks[this.prop];return this.options.duration?this.pos=t=S.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):et.propHooks._default.set(this),this}}).init.prototype=et.prototype,(et.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=S.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){S.fx.step[e.prop]?S.fx.step[e.prop](e):1!==e.elem.nodeType||!S.cssHooks[e.prop]&&null==e.elem.style[Xe(e.prop)]?e.elem[e.prop]=e.now:S.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=et.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},S.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},S.fx=et.prototype.init,S.fx.step={};var tt,nt,rt,it,ot=/^(?:toggle|show|hide)$/,at=/queueHooks$/;function st(){nt&&(!1===E.hidden&&C.requestAnimationFrame?C.requestAnimationFrame(st):C.setTimeout(st,S.fx.interval),S.fx.tick())}function ut(){return C.setTimeout(function(){tt=void 0}),tt=Date.now()}function lt(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=ne[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function ct(e,t,n){for(var r,i=(ft.tweeners[t]||[]).concat(ft.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function ft(o,e,t){var n,a,r=0,i=ft.prefilters.length,s=S.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=tt||ut(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:S.extend({},e),opts:S.extend(!0,{specialEasing:{},easing:S.easing._default},t),originalProperties:e,originalOptions:t,startTime:tt||ut(),duration:t.duration,tweens:[],createTween:function(e,t){var n=S.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=X(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=S.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=ft.prefilters[r].call(l,o,c,l.opts))return m(n.stop)&&(S._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return S.map(c,ct,l),m(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),S.fx.timer(S.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}S.Animation=S.extend(ft,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return se(n.elem,e,te.exec(t),n),n}]},tweener:function(e,t){m(e)?(t=e,e=["*"]):e=e.match(P);for(var n,r=0,i=e.length;r<i;r++)n=e[r],ft.tweeners[n]=ft.tweeners[n]||[],ft.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&ae(e),v=Y.get(e,"fxshow");for(r in n.queue||(null==(a=S._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,S.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],ot.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||S.style(e,r)}if((u=!S.isEmptyObject(t))||!S.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=Y.get(e,"display")),"none"===(c=S.css(e,"display"))&&(l?c=l:(le([e],!0),l=e.style.display||l,c=S.css(e,"display"),le([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===S.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=Y.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&le([e],!0),p.done(function(){for(r in g||le([e]),Y.remove(e,"fxshow"),d)S.style(e,r,d[r])})),u=ct(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?ft.prefilters.unshift(e):ft.prefilters.push(e)}}),S.speed=function(e,t,n){var r=e&&"object"==typeof e?S.extend({},e):{complete:n||!n&&t||m(e)&&e,duration:e,easing:n&&t||t&&!m(t)&&t};return S.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in S.fx.speeds?r.duration=S.fx.speeds[r.duration]:r.duration=S.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){m(r.old)&&r.old.call(this),r.queue&&S.dequeue(this,r.queue)},r},S.fn.extend({fadeTo:function(e,t,n,r){return this.filter(ae).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=S.isEmptyObject(t),o=S.speed(e,n,r),a=function(){var e=ft(this,S.extend({},t),o);(i||Y.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=S.timers,r=Y.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&at.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||S.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=Y.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=S.timers,o=n?n.length:0;for(t.finish=!0,S.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),S.each(["toggle","show","hide"],function(e,r){var i=S.fn[r];S.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(lt(r,!0),e,t,n)}}),S.each({slideDown:lt("show"),slideUp:lt("hide"),slideToggle:lt("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){S.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),S.timers=[],S.fx.tick=function(){var e,t=0,n=S.timers;for(tt=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||S.fx.stop(),tt=void 0},S.fx.timer=function(e){S.timers.push(e),S.fx.start()},S.fx.interval=13,S.fx.start=function(){nt||(nt=!0,st())},S.fx.stop=function(){nt=null},S.fx.speeds={slow:600,fast:200,_default:400},S.fn.delay=function(r,e){return r=S.fx&&S.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=C.setTimeout(e,r);t.stop=function(){C.clearTimeout(n)}})},rt=E.createElement("input"),it=E.createElement("select").appendChild(E.createElement("option")),rt.type="checkbox",y.checkOn=""!==rt.value,y.optSelected=it.selected,(rt=E.createElement("input")).value="t",rt.type="radio",y.radioValue="t"===rt.value;var pt,dt=S.expr.attrHandle;S.fn.extend({attr:function(e,t){return $(this,S.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){S.removeAttr(this,e)})}}),S.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?S.prop(e,t,n):(1===o&&S.isXMLDoc(e)||(i=S.attrHooks[t.toLowerCase()]||(S.expr.match.bool.test(t)?pt:void 0)),void 0!==n?null===n?void S.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=S.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!y.radioValue&&"radio"===t&&A(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(P);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),pt={set:function(e,t,n){return!1===t?S.removeAttr(e,n):e.setAttribute(n,n),n}},S.each(S.expr.match.bool.source.match(/\w+/g),function(e,t){var a=dt[t]||S.find.attr;dt[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=dt[o],dt[o]=r,r=null!=a(e,t,n)?o:null,dt[o]=i),r}});var ht=/^(?:input|select|textarea|button)$/i,gt=/^(?:a|area)$/i;function vt(e){return(e.match(P)||[]).join(" ")}function yt(e){return e.getAttribute&&e.getAttribute("class")||""}function mt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(P)||[]}S.fn.extend({prop:function(e,t){return $(this,S.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[S.propFix[e]||e]})}}),S.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&S.isXMLDoc(e)||(t=S.propFix[t]||t,i=S.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=S.find.attr(e,"tabindex");return t?parseInt(t,10):ht.test(e.nodeName)||gt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),y.optSelected||(S.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),S.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){S.propFix[this.toLowerCase()]=this}),S.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).addClass(t.call(this,e,yt(this)))});if((e=mt(t)).length)while(n=this[u++])if(i=yt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=e[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},removeClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).removeClass(t.call(this,e,yt(this)))});if(!arguments.length)return this.attr("class","");if((e=mt(t)).length)while(n=this[u++])if(i=yt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=e[a++])while(-1<r.indexOf(" "+o+" "))r=r.replace(" "+o+" "," ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(i,t){var o=typeof i,a="string"===o||Array.isArray(i);return"boolean"==typeof t&&a?t?this.addClass(i):this.removeClass(i):m(i)?this.each(function(e){S(this).toggleClass(i.call(this,e,yt(this),t),t)}):this.each(function(){var e,t,n,r;if(a){t=0,n=S(this),r=mt(i);while(e=r[t++])n.hasClass(e)?n.removeClass(e):n.addClass(e)}else void 0!==i&&"boolean"!==o||((e=yt(this))&&Y.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===i?"":Y.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+vt(yt(n))+" ").indexOf(t))return!0;return!1}});var xt=/\r/g;S.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=m(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,S(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=S.map(t,function(e){return null==e?"":e+""})),(r=S.valHooks[this.type]||S.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=S.valHooks[t.type]||S.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(xt,""):null==e?"":e:void 0}}),S.extend({valHooks:{option:{get:function(e){var t=S.find.attr(e,"value");return null!=t?t:vt(S.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!A(n.parentNode,"optgroup"))){if(t=S(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=S.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<S.inArray(S.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),S.each(["radio","checkbox"],function(){S.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<S.inArray(S(e).val(),t)}},y.checkOn||(S.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),y.focusin="onfocusin"in C;var bt=/^(?:focusinfocus|focusoutblur)$/,wt=function(e){e.stopPropagation()};S.extend(S.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||E],d=v.call(e,"type")?e.type:e,h=v.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||E,3!==n.nodeType&&8!==n.nodeType&&!bt.test(d+S.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[S.expando]?e:new S.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:S.makeArray(t,[e]),c=S.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!x(n)){for(s=c.delegateType||d,bt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||E)&&p.push(a.defaultView||a.parentWindow||C)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(Y.get(o,"events")||Object.create(null))[e.type]&&Y.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&V(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!V(n)||u&&m(n[d])&&!x(n)&&((a=n[u])&&(n[u]=null),S.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,wt),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,wt),S.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=S.extend(new S.Event,n,{type:e,isSimulated:!0});S.event.trigger(r,null,t)}}),S.fn.extend({trigger:function(e,t){return this.each(function(){S.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return S.event.trigger(e,t,n,!0)}}),y.focusin||S.each({focus:"focusin",blur:"focusout"},function(n,r){var i=function(e){S.event.simulate(r,e.target,S.event.fix(e))};S.event.special[r]={setup:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r);t||e.addEventListener(n,i,!0),Y.access(e,r,(t||0)+1)},teardown:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r)-1;t?Y.access(e,r,t):(e.removeEventListener(n,i,!0),Y.remove(e,r))}}});var Tt=C.location,Ct={guid:Date.now()},Et=/\?/;S.parseXML=function(e){var t;if(!e||"string"!=typeof e)return null;try{t=(new C.DOMParser).parseFromString(e,"text/xml")}catch(e){t=void 0}return t&&!t.getElementsByTagName("parsererror").length||S.error("Invalid XML: "+e),t};var St=/\[\]$/,kt=/\r?\n/g,At=/^(?:submit|button|image|reset|file)$/i,Nt=/^(?:input|select|textarea|keygen)/i;function Dt(n,e,r,i){var t;if(Array.isArray(e))S.each(e,function(e,t){r||St.test(n)?i(n,t):Dt(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==w(e))i(n,e);else for(t in e)Dt(n+"["+t+"]",e[t],r,i)}S.param=function(e,t){var n,r=[],i=function(e,t){var n=m(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!S.isPlainObject(e))S.each(e,function(){i(this.name,this.value)});else for(n in e)Dt(n,e[n],t,i);return r.join("&")},S.fn.extend({serialize:function(){return S.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=S.prop(this,"elements");return e?S.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!S(this).is(":disabled")&&Nt.test(this.nodeName)&&!At.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=S(this).val();return null==n?null:Array.isArray(n)?S.map(n,function(e){return{name:t.name,value:e.replace(kt,"\r\n")}}):{name:t.name,value:n.replace(kt,"\r\n")}}).get()}});var jt=/%20/g,qt=/#.*$/,Lt=/([?&])_=[^&]*/,Ht=/^(.*?):[ \t]*([^\r\n]*)$/gm,Ot=/^(?:GET|HEAD)$/,Pt=/^\/\//,Rt={},Mt={},It="*/".concat("*"),Wt=E.createElement("a");function Ft(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(P)||[];if(m(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function Bt(t,i,o,a){var s={},u=t===Mt;function l(e){var r;return s[e]=!0,S.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function $t(e,t){var n,r,i=S.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&S.extend(!0,e,r),e}Wt.href=Tt.href,S.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Tt.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(Tt.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":It,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":S.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?$t($t(e,S.ajaxSettings),t):$t(S.ajaxSettings,e)},ajaxPrefilter:Ft(Rt),ajaxTransport:Ft(Mt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=S.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?S(y):S.event,x=S.Deferred(),b=S.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=Ht.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||Tt.href)+"").replace(Pt,Tt.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(P)||[""],null==v.crossDomain){r=E.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Wt.protocol+"//"+Wt.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=S.param(v.data,v.traditional)),Bt(Rt,v,t,T),h)return T;for(i in(g=S.event&&v.global)&&0==S.active++&&S.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Ot.test(v.type),f=v.url.replace(qt,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(jt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(Et.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(Lt,"$1"),o=(Et.test(f)?"&":"?")+"_="+Ct.guid+++o),v.url=f+o),v.ifModified&&(S.lastModified[f]&&T.setRequestHeader("If-Modified-Since",S.lastModified[f]),S.etag[f]&&T.setRequestHeader("If-None-Match",S.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+It+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(v.complete),T.done(v.success),T.fail(v.error),c=Bt(Mt,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=C.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&C.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),!i&&-1<S.inArray("script",v.dataTypes)&&(v.converters["text script"]=function(){}),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(S.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(S.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--S.active||S.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return S.get(e,t,n,"json")},getScript:function(e,t){return S.get(e,void 0,t,"script")}}),S.each(["get","post"],function(e,i){S[i]=function(e,t,n,r){return m(t)&&(r=r||n,n=t,t=void 0),S.ajax(S.extend({url:e,type:i,dataType:r,data:t,success:n},S.isPlainObject(e)&&e))}}),S.ajaxPrefilter(function(e){var t;for(t in e.headers)"content-type"===t.toLowerCase()&&(e.contentType=e.headers[t]||"")}),S._evalUrl=function(e,t,n){return S.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){S.globalEval(e,t,n)}})},S.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=S(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return m(n)?this.each(function(e){S(this).wrapInner(n.call(this,e))}):this.each(function(){var e=S(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=m(t);return this.each(function(e){S(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){S(this).replaceWith(this.childNodes)}),this}}),S.expr.pseudos.hidden=function(e){return!S.expr.pseudos.visible(e)},S.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},S.ajaxSettings.xhr=function(){try{return new C.XMLHttpRequest}catch(e){}};var _t={0:200,1223:204},zt=S.ajaxSettings.xhr();y.cors=!!zt&&"withCredentials"in zt,y.ajax=zt=!!zt,S.ajaxTransport(function(i){var o,a;if(y.cors||zt&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(_t[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&C.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),S.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),S.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return S.globalEval(e),e}}}),S.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),S.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=S("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Ut,Xt=[],Vt=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Xt.pop()||S.expando+"_"+Ct.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Vt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Vt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Vt,"$1"+r):!1!==e.jsonp&&(e.url+=(Et.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Xt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Ut=E.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===Ut.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=vt(e.slice(s)),e=e.slice(0,s)),m(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&S.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?S("<div>").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):("number"==typeof f.top&&(f.top+="px"),"number"==typeof f.left&&(f.left+="px"),c.css(f))}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=$e(y.pixelPosition,function(e,t){if(t)return t=Be(e,n),Me.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}});var Gt=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;S.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),m(e))return r=s.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(s.call(arguments)))}).guid=e.guid=e.guid||S.guid++,i},S.holdReady=function(e){e?S.readyWait++:S.ready(!0)},S.isArray=Array.isArray,S.parseJSON=JSON.parse,S.nodeName=A,S.isFunction=m,S.isWindow=x,S.camelCase=X,S.type=w,S.now=Date.now,S.isNumeric=function(e){var t=S.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},S.trim=function(e){return null==e?"":(e+"").replace(Gt,"")},"function"==typeof define&&define.amd&&define("jquery",[],function(){return S});var Yt=C.jQuery,Qt=C.$;return S.noConflict=function(e){return C.$===S&&(C.$=Qt),e&&C.jQuery===S&&(C.jQuery=Yt),S},"undefined"==typeof e&&(C.jQuery=C.$=S),S});
+/*! jQuery v3.7.1 | (c) OpenJS Foundation and other contributors | jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(ie,e){"use strict";var oe=[],r=Object.getPrototypeOf,ae=oe.slice,g=oe.flat?function(e){return oe.flat.call(e)}:function(e){return oe.concat.apply([],e)},s=oe.push,se=oe.indexOf,n={},i=n.toString,ue=n.hasOwnProperty,o=ue.toString,a=o.call(Object),le={},v=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType&&"function"!=typeof e.item},y=function(e){return null!=e&&e===e.window},C=ie.document,u={type:!0,src:!0,nonce:!0,noModule:!0};function m(e,t,n){var r,i,o=(n=n||C).createElement("script");if(o.text=e,t)for(r in u)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function x(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[i.call(e)]||"object":typeof e}var t="3.7.1",l=/HTML$/i,ce=function(e,t){return new ce.fn.init(e,t)};function c(e){var t=!!e&&"length"in e&&e.length,n=x(e);return!v(e)&&!y(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}function fe(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}ce.fn=ce.prototype={jquery:t,constructor:ce,length:0,toArray:function(){return ae.call(this)},get:function(e){return null==e?ae.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=ce.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return ce.each(this,e)},map:function(n){return this.pushStack(ce.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(ae.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},even:function(){return this.pushStack(ce.grep(this,function(e,t){return(t+1)%2}))},odd:function(){return this.pushStack(ce.grep(this,function(e,t){return t%2}))},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:s,sort:oe.sort,splice:oe.splice},ce.extend=ce.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||v(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(ce.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||ce.isPlainObject(n)?n:{},i=!1,a[t]=ce.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},ce.extend({expando:"jQuery"+(t+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==i.call(e))&&(!(t=r(e))||"function"==typeof(n=ue.call(t,"constructor")&&t.constructor)&&o.call(n)===a)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t,n){m(e,{nonce:t&&t.nonce},n)},each:function(e,t){var n,r=0;if(c(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},text:function(e){var t,n="",r=0,i=e.nodeType;if(!i)while(t=e[r++])n+=ce.text(t);return 1===i||11===i?e.textContent:9===i?e.documentElement.textContent:3===i||4===i?e.nodeValue:n},makeArray:function(e,t){var n=t||[];return null!=e&&(c(Object(e))?ce.merge(n,"string"==typeof e?[e]:e):s.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:se.call(t,e,n)},isXMLDoc:function(e){var t=e&&e.namespaceURI,n=e&&(e.ownerDocument||e).documentElement;return!l.test(t||n&&n.nodeName||"HTML")},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(c(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g(a)},guid:1,support:le}),"function"==typeof Symbol&&(ce.fn[Symbol.iterator]=oe[Symbol.iterator]),ce.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var pe=oe.pop,de=oe.sort,he=oe.splice,ge="[\\x20\\t\\r\\n\\f]",ve=new RegExp("^"+ge+"+|((?:^|[^\\\\])(?:\\\\.)*)"+ge+"+$","g");ce.contains=function(e,t){var n=t&&t.parentNode;return e===n||!(!n||1!==n.nodeType||!(e.contains?e.contains(n):e.compareDocumentPosition&&16&e.compareDocumentPosition(n)))};var f=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\x80-\uFFFF\w-]/g;function p(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e}ce.escapeSelector=function(e){return(e+"").replace(f,p)};var ye=C,me=s;!function(){var e,b,w,o,a,T,r,C,d,i,k=me,S=ce.expando,E=0,n=0,s=W(),c=W(),u=W(),h=W(),l=function(e,t){return e===t&&(a=!0),0},f="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",t="(?:\\\\[\\da-fA-F]{1,6}"+ge+"?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",p="\\["+ge+"*("+t+")(?:"+ge+"*([*^$|!~]?=)"+ge+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+t+"))|)"+ge+"*\\]",g=":("+t+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+p+")*)|.*)\\)|)",v=new RegExp(ge+"+","g"),y=new RegExp("^"+ge+"*,"+ge+"*"),m=new RegExp("^"+ge+"*([>+~]|"+ge+")"+ge+"*"),x=new RegExp(ge+"|>"),j=new RegExp(g),A=new RegExp("^"+t+"$"),D={ID:new RegExp("^#("+t+")"),CLASS:new RegExp("^\\.("+t+")"),TAG:new RegExp("^("+t+"|[*])"),ATTR:new RegExp("^"+p),PSEUDO:new RegExp("^"+g),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+ge+"*(even|odd|(([+-]|)(\\d*)n|)"+ge+"*(?:([+-]|)"+ge+"*(\\d+)|))"+ge+"*\\)|)","i"),bool:new RegExp("^(?:"+f+")$","i"),needsContext:new RegExp("^"+ge+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+ge+"*((?:-\\d)?\\d*)"+ge+"*\\)|)(?=[^-]|$)","i")},N=/^(?:input|select|textarea|button)$/i,q=/^h\d$/i,L=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,H=/[+~]/,O=new RegExp("\\\\[\\da-fA-F]{1,6}"+ge+"?|\\\\([^\\r\\n\\f])","g"),P=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},M=function(){V()},R=J(function(e){return!0===e.disabled&&fe(e,"fieldset")},{dir:"parentNode",next:"legend"});try{k.apply(oe=ae.call(ye.childNodes),ye.childNodes),oe[ye.childNodes.length].nodeType}catch(e){k={apply:function(e,t){me.apply(e,ae.call(t))},call:function(e){me.apply(e,ae.call(arguments,1))}}}function I(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(V(e),e=e||T,C)){if(11!==p&&(u=L.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return k.call(n,a),n}else if(f&&(a=f.getElementById(i))&&I.contains(e,a)&&a.id===i)return k.call(n,a),n}else{if(u[2])return k.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&e.getElementsByClassName)return k.apply(n,e.getElementsByClassName(i)),n}if(!(h[t+" "]||d&&d.test(t))){if(c=t,f=e,1===p&&(x.test(t)||m.test(t))){(f=H.test(t)&&U(e.parentNode)||e)==e&&le.scope||((s=e.getAttribute("id"))?s=ce.escapeSelector(s):e.setAttribute("id",s=S)),o=(l=Y(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+Q(l[o]);c=l.join(",")}try{return k.apply(n,f.querySelectorAll(c)),n}catch(e){h(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return re(t.replace(ve,"$1"),e,n,r)}function W(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function F(e){return e[S]=!0,e}function $(e){var t=T.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function B(t){return function(e){return fe(e,"input")&&e.type===t}}function _(t){return function(e){return(fe(e,"input")||fe(e,"button"))&&e.type===t}}function z(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&R(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function X(a){return F(function(o){return o=+o,F(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function U(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}function V(e){var t,n=e?e.ownerDocument||e:ye;return n!=T&&9===n.nodeType&&n.documentElement&&(r=(T=n).documentElement,C=!ce.isXMLDoc(T),i=r.matches||r.webkitMatchesSelector||r.msMatchesSelector,r.msMatchesSelector&&ye!=T&&(t=T.defaultView)&&t.top!==t&&t.addEventListener("unload",M),le.getById=$(function(e){return r.appendChild(e).id=ce.expando,!T.getElementsByName||!T.getElementsByName(ce.expando).length}),le.disconnectedMatch=$(function(e){return i.call(e,"*")}),le.scope=$(function(){return T.querySelectorAll(":scope")}),le.cssHas=$(function(){try{return T.querySelector(":has(*,:jqfake)"),!1}catch(e){return!0}}),le.getById?(b.filter.ID=function(e){var t=e.replace(O,P);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&C){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(O,P);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&C){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):t.querySelectorAll(e)},b.find.CLASS=function(e,t){if("undefined"!=typeof t.getElementsByClassName&&C)return t.getElementsByClassName(e)},d=[],$(function(e){var t;r.appendChild(e).innerHTML="<a id='"+S+"' href='' disabled='disabled'></a><select id='"+S+"-\r\\' disabled='disabled'><option selected=''></option></select>",e.querySelectorAll("[selected]").length||d.push("\\["+ge+"*(?:value|"+f+")"),e.querySelectorAll("[id~="+S+"-]").length||d.push("~="),e.querySelectorAll("a#"+S+"+*").length||d.push(".#.+[+~]"),e.querySelectorAll(":checked").length||d.push(":checked"),(t=T.createElement("input")).setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),r.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&d.push(":enabled",":disabled"),(t=T.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||d.push("\\["+ge+"*name"+ge+"*="+ge+"*(?:''|\"\")")}),le.cssHas||d.push(":has"),d=d.length&&new RegExp(d.join("|")),l=function(e,t){if(e===t)return a=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!le.sortDetached&&t.compareDocumentPosition(e)===n?e===T||e.ownerDocument==ye&&I.contains(ye,e)?-1:t===T||t.ownerDocument==ye&&I.contains(ye,t)?1:o?se.call(o,e)-se.call(o,t):0:4&n?-1:1)}),T}for(e in I.matches=function(e,t){return I(e,null,null,t)},I.matchesSelector=function(e,t){if(V(e),C&&!h[t+" "]&&(!d||!d.test(t)))try{var n=i.call(e,t);if(n||le.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){h(t,!0)}return 0<I(t,T,null,[e]).length},I.contains=function(e,t){return(e.ownerDocument||e)!=T&&V(e),ce.contains(e,t)},I.attr=function(e,t){(e.ownerDocument||e)!=T&&V(e);var n=b.attrHandle[t.toLowerCase()],r=n&&ue.call(b.attrHandle,t.toLowerCase())?n(e,t,!C):void 0;return void 0!==r?r:e.getAttribute(t)},I.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},ce.uniqueSort=function(e){var t,n=[],r=0,i=0;if(a=!le.sortStable,o=!le.sortStable&&ae.call(e,0),de.call(e,l),a){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)he.call(e,n[r],1)}return o=null,e},ce.fn.uniqueSort=function(){return this.pushStack(ce.uniqueSort(ae.apply(this)))},(b=ce.expr={cacheLength:50,createPseudo:F,match:D,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(O,P),e[3]=(e[3]||e[4]||e[5]||"").replace(O,P),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||I.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&I.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return D.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&j.test(n)&&(t=Y(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(O,P).toLowerCase();return"*"===e?function(){return!0}:function(e){return fe(e,t)}},CLASS:function(e){var t=s[e+" "];return t||(t=new RegExp("(^|"+ge+")"+e+"("+ge+"|$)"))&&s(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=I.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(v," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(d,e,t,h,g){var v="nth"!==d.slice(0,3),y="last"!==d.slice(-4),m="of-type"===e;return 1===h&&0===g?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u=v!==y?"nextSibling":"previousSibling",l=e.parentNode,c=m&&e.nodeName.toLowerCase(),f=!n&&!m,p=!1;if(l){if(v){while(u){o=e;while(o=o[u])if(m?fe(o,c):1===o.nodeType)return!1;s=u="only"===d&&!s&&"nextSibling"}return!0}if(s=[y?l.firstChild:l.lastChild],y&&f){p=(a=(r=(i=l[S]||(l[S]={}))[d]||[])[0]===E&&r[1])&&r[2],o=a&&l.childNodes[a];while(o=++a&&o&&o[u]||(p=a=0)||s.pop())if(1===o.nodeType&&++p&&o===e){i[d]=[E,a,p];break}}else if(f&&(p=a=(r=(i=e[S]||(e[S]={}))[d]||[])[0]===E&&r[1]),!1===p)while(o=++a&&o&&o[u]||(p=a=0)||s.pop())if((m?fe(o,c):1===o.nodeType)&&++p&&(f&&((i=o[S]||(o[S]={}))[d]=[E,p]),o===e))break;return(p-=g)===h||p%h==0&&0<=p/h}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||I.error("unsupported pseudo: "+e);return a[S]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?F(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=se.call(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:F(function(e){var r=[],i=[],s=ne(e.replace(ve,"$1"));return s[S]?F(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:F(function(t){return function(e){return 0<I(t,e).length}}),contains:F(function(t){return t=t.replace(O,P),function(e){return-1<(e.textContent||ce.text(e)).indexOf(t)}}),lang:F(function(n){return A.test(n||"")||I.error("unsupported lang: "+n),n=n.replace(O,P).toLowerCase(),function(e){var t;do{if(t=C?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=ie.location&&ie.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===r},focus:function(e){return e===function(){try{return T.activeElement}catch(e){}}()&&T.hasFocus()&&!!(e.type||e.href||~e.tabIndex)},enabled:z(!1),disabled:z(!0),checked:function(e){return fe(e,"input")&&!!e.checked||fe(e,"option")&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return q.test(e.nodeName)},input:function(e){return N.test(e.nodeName)},button:function(e){return fe(e,"input")&&"button"===e.type||fe(e,"button")},text:function(e){var t;return fe(e,"input")&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:X(function(){return[0]}),last:X(function(e,t){return[t-1]}),eq:X(function(e,t,n){return[n<0?n+t:n]}),even:X(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:X(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:X(function(e,t,n){var r;for(r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:X(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=B(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=_(e);function G(){}function Y(e,t){var n,r,i,o,a,s,u,l=c[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=y.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=m.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace(ve," ")}),a=a.slice(n.length)),b.filter)!(r=D[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?I.error(e):c(e,s).slice(0)}function Q(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function J(a,e,t){var s=e.dir,u=e.next,l=u||s,c=t&&"parentNode"===l,f=n++;return e.first?function(e,t,n){while(e=e[s])if(1===e.nodeType||c)return a(e,t,n);return!1}:function(e,t,n){var r,i,o=[E,f];if(n){while(e=e[s])if((1===e.nodeType||c)&&a(e,t,n))return!0}else while(e=e[s])if(1===e.nodeType||c)if(i=e[S]||(e[S]={}),u&&fe(e,u))e=e[s]||e;else{if((r=i[l])&&r[0]===E&&r[1]===f)return o[2]=r[2];if((i[l]=o)[2]=a(e,t,n))return!0}return!1}}function K(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Z(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function ee(d,h,g,v,y,e){return v&&!v[S]&&(v=ee(v)),y&&!y[S]&&(y=ee(y,e)),F(function(e,t,n,r){var i,o,a,s,u=[],l=[],c=t.length,f=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)I(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),p=!d||!e&&h?f:Z(f,u,d,n,r);if(g?g(p,s=y||(e?d:c||v)?[]:t,n,r):s=p,v){i=Z(s,l),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(s[l[o]]=!(p[l[o]]=a))}if(e){if(y||d){if(y){i=[],o=s.length;while(o--)(a=s[o])&&i.push(p[o]=a);y(null,s=[],i,r)}o=s.length;while(o--)(a=s[o])&&-1<(i=y?se.call(e,a):u[o])&&(e[i]=!(t[i]=a))}}else s=Z(s===t?s.splice(c,s.length):s),y?y(null,t,s,r):k.apply(t,s)})}function te(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=J(function(e){return e===i},a,!0),l=J(function(e){return-1<se.call(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!=w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[J(K(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[S]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return ee(1<s&&K(c),1<s&&Q(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace(ve,"$1"),t,s<n&&te(e.slice(s,n)),n<r&&te(e=e.slice(n)),n<r&&Q(e))}c.push(t)}return K(c)}function ne(e,t){var n,v,y,m,x,r,i=[],o=[],a=u[e+" "];if(!a){t||(t=Y(e)),n=t.length;while(n--)(a=te(t[n]))[S]?i.push(a):o.push(a);(a=u(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=E+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t==T||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument==T||(V(o),n=!C);while(s=v[a++])if(s(o,t||T,n)){k.call(r,o);break}i&&(E=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=pe.call(r));f=Z(f)}k.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&ce.uniqueSort(r)}return i&&(E=h,w=p),c},m?F(r):r))).selector=e}return a}function re(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&Y(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&C&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(O,P),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=D.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(O,P),H.test(o[0].type)&&U(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&Q(o)))return k.apply(n,r),n;break}}}return(l||ne(e,c))(r,t,!C,n,!t||H.test(e)&&U(t.parentNode)||t),n}G.prototype=b.filters=b.pseudos,b.setFilters=new G,le.sortStable=S.split("").sort(l).join("")===S,V(),le.sortDetached=$(function(e){return 1&e.compareDocumentPosition(T.createElement("fieldset"))}),ce.find=I,ce.expr[":"]=ce.expr.pseudos,ce.unique=ce.uniqueSort,I.compile=ne,I.select=re,I.setDocument=V,I.tokenize=Y,I.escape=ce.escapeSelector,I.getText=ce.text,I.isXML=ce.isXMLDoc,I.selectors=ce.expr,I.support=ce.support,I.uniqueSort=ce.uniqueSort}();var d=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&ce(e).is(n))break;r.push(e)}return r},h=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},b=ce.expr.match.needsContext,w=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function T(e,n,r){return v(n)?ce.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?ce.grep(e,function(e){return e===n!==r}):"string"!=typeof n?ce.grep(e,function(e){return-1<se.call(n,e)!==r}):ce.filter(n,e,r)}ce.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?ce.find.matchesSelector(r,e)?[r]:[]:ce.find.matches(e,ce.grep(t,function(e){return 1===e.nodeType}))},ce.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(ce(e).filter(function(){for(t=0;t<r;t++)if(ce.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)ce.find(e,i[t],n);return 1<r?ce.uniqueSort(n):n},filter:function(e){return this.pushStack(T(this,e||[],!1))},not:function(e){return this.pushStack(T(this,e||[],!0))},is:function(e){return!!T(this,"string"==typeof e&&b.test(e)?ce(e):e||[],!1).length}});var k,S=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(ce.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||k,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:S.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof ce?t[0]:t,ce.merge(this,ce.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:C,!0)),w.test(r[1])&&ce.isPlainObject(t))for(r in t)v(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=C.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):v(e)?void 0!==n.ready?n.ready(e):e(ce):ce.makeArray(e,this)}).prototype=ce.fn,k=ce(C);var E=/^(?:parents|prev(?:Until|All))/,j={children:!0,contents:!0,next:!0,prev:!0};function A(e,t){while((e=e[t])&&1!==e.nodeType);return e}ce.fn.extend({has:function(e){var t=ce(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(ce.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&ce(e);if(!b.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&ce.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?ce.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?se.call(ce(e),this[0]):se.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(ce.uniqueSort(ce.merge(this.get(),ce(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),ce.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return d(e,"parentNode")},parentsUntil:function(e,t,n){return d(e,"parentNode",n)},next:function(e){return A(e,"nextSibling")},prev:function(e){return A(e,"previousSibling")},nextAll:function(e){return d(e,"nextSibling")},prevAll:function(e){return d(e,"previousSibling")},nextUntil:function(e,t,n){return d(e,"nextSibling",n)},prevUntil:function(e,t,n){return d(e,"previousSibling",n)},siblings:function(e){return h((e.parentNode||{}).firstChild,e)},children:function(e){return h(e.firstChild)},contents:function(e){return null!=e.contentDocument&&r(e.contentDocument)?e.contentDocument:(fe(e,"template")&&(e=e.content||e),ce.merge([],e.childNodes))}},function(r,i){ce.fn[r]=function(e,t){var n=ce.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=ce.filter(t,n)),1<this.length&&(j[r]||ce.uniqueSort(n),E.test(r)&&n.reverse()),this.pushStack(n)}});var D=/[^\x20\t\r\n\f]+/g;function N(e){return e}function q(e){throw e}function L(e,t,n,r){var i;try{e&&v(i=e.promise)?i.call(e).done(t).fail(n):e&&v(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}ce.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},ce.each(e.match(D)||[],function(e,t){n[t]=!0}),n):ce.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){ce.each(e,function(e,t){v(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==x(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return ce.each(arguments,function(e,t){var n;while(-1<(n=ce.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<ce.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},ce.extend({Deferred:function(e){var o=[["notify","progress",ce.Callbacks("memory"),ce.Callbacks("memory"),2],["resolve","done",ce.Callbacks("once memory"),ce.Callbacks("once memory"),0,"resolved"],["reject","fail",ce.Callbacks("once memory"),ce.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return ce.Deferred(function(r){ce.each(o,function(e,t){var n=v(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&v(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,v(t)?s?t.call(e,l(u,o,N,s),l(u,o,q,s)):(u++,t.call(e,l(u,o,N,s),l(u,o,q,s),l(u,o,N,o.notifyWith))):(a!==N&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){ce.Deferred.exceptionHook&&ce.Deferred.exceptionHook(e,t.error),u<=i+1&&(a!==q&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(ce.Deferred.getErrorHook?t.error=ce.Deferred.getErrorHook():ce.Deferred.getStackHook&&(t.error=ce.Deferred.getStackHook()),ie.setTimeout(t))}}return ce.Deferred(function(e){o[0][3].add(l(0,e,v(r)?r:N,e.notifyWith)),o[1][3].add(l(0,e,v(t)?t:N)),o[2][3].add(l(0,e,v(n)?n:q))}).promise()},promise:function(e){return null!=e?ce.extend(e,a):a}},s={};return ce.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=ae.call(arguments),o=ce.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?ae.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(L(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||v(i[t]&&i[t].then)))return o.then();while(t--)L(i[t],a(t),o.reject);return o.promise()}});var H=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;ce.Deferred.exceptionHook=function(e,t){ie.console&&ie.console.warn&&e&&H.test(e.name)&&ie.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},ce.readyException=function(e){ie.setTimeout(function(){throw e})};var O=ce.Deferred();function P(){C.removeEventListener("DOMContentLoaded",P),ie.removeEventListener("load",P),ce.ready()}ce.fn.ready=function(e){return O.then(e)["catch"](function(e){ce.readyException(e)}),this},ce.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--ce.readyWait:ce.isReady)||(ce.isReady=!0)!==e&&0<--ce.readyWait||O.resolveWith(C,[ce])}}),ce.ready.then=O.then,"complete"===C.readyState||"loading"!==C.readyState&&!C.documentElement.doScroll?ie.setTimeout(ce.ready):(C.addEventListener("DOMContentLoaded",P),ie.addEventListener("load",P));var M=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===x(n))for(s in i=!0,n)M(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,v(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(ce(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},R=/^-ms-/,I=/-([a-z])/g;function W(e,t){return t.toUpperCase()}function F(e){return e.replace(R,"ms-").replace(I,W)}var $=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function B(){this.expando=ce.expando+B.uid++}B.uid=1,B.prototype={cache:function(e){var t=e[this.expando];return t||(t={},$(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[F(t)]=n;else for(r in t)i[F(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][F(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(F):(t=F(t))in r?[t]:t.match(D)||[]).length;while(n--)delete r[t[n]]}(void 0===t||ce.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!ce.isEmptyObject(t)}};var _=new B,z=new B,X=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,U=/[A-Z]/g;function V(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(U,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:X.test(i)?JSON.parse(i):i)}catch(e){}z.set(e,t,n)}else n=void 0;return n}ce.extend({hasData:function(e){return z.hasData(e)||_.hasData(e)},data:function(e,t,n){return z.access(e,t,n)},removeData:function(e,t){z.remove(e,t)},_data:function(e,t,n){return _.access(e,t,n)},_removeData:function(e,t){_.remove(e,t)}}),ce.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=z.get(o),1===o.nodeType&&!_.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=F(r.slice(5)),V(o,r,i[r]));_.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){z.set(this,n)}):M(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=z.get(o,n))?t:void 0!==(t=V(o,n))?t:void 0;this.each(function(){z.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){z.remove(this,e)})}}),ce.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=_.get(e,t),n&&(!r||Array.isArray(n)?r=_.access(e,t,ce.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=ce.queue(e,t),r=n.length,i=n.shift(),o=ce._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){ce.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return _.get(e,n)||_.access(e,n,{empty:ce.Callbacks("once memory").add(function(){_.remove(e,[t+"queue",n])})})}}),ce.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?ce.queue(this[0],t):void 0===n?this:this.each(function(){var e=ce.queue(this,t,n);ce._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&ce.dequeue(this,t)})},dequeue:function(e){return this.each(function(){ce.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=ce.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=_.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var G=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,Y=new RegExp("^(?:([+-])=|)("+G+")([a-z%]*)$","i"),Q=["Top","Right","Bottom","Left"],J=C.documentElement,K=function(e){return ce.contains(e.ownerDocument,e)},Z={composed:!0};J.getRootNode&&(K=function(e){return ce.contains(e.ownerDocument,e)||e.getRootNode(Z)===e.ownerDocument});var ee=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&K(e)&&"none"===ce.css(e,"display")};function te(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return ce.css(e,t,"")},u=s(),l=n&&n[3]||(ce.cssNumber[t]?"":"px"),c=e.nodeType&&(ce.cssNumber[t]||"px"!==l&&+u)&&Y.exec(ce.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)ce.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,ce.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ne={};function re(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=_.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&ee(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ne[s])||(o=a.body.appendChild(a.createElement(s)),u=ce.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ne[s]=u)))):"none"!==n&&(l[c]="none",_.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}ce.fn.extend({show:function(){return re(this,!0)},hide:function(){return re(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){ee(this)?ce(this).show():ce(this).hide()})}});var xe,be,we=/^(?:checkbox|radio)$/i,Te=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,Ce=/^$|^module$|\/(?:java|ecma)script/i;xe=C.createDocumentFragment().appendChild(C.createElement("div")),(be=C.createElement("input")).setAttribute("type","radio"),be.setAttribute("checked","checked"),be.setAttribute("name","t"),xe.appendChild(be),le.checkClone=xe.cloneNode(!0).cloneNode(!0).lastChild.checked,xe.innerHTML="<textarea>x</textarea>",le.noCloneChecked=!!xe.cloneNode(!0).lastChild.defaultValue,xe.innerHTML="<option></option>",le.option=!!xe.lastChild;var ke={thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function Se(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&fe(e,t)?ce.merge([e],n):n}function Ee(e,t){for(var n=0,r=e.length;n<r;n++)_.set(e[n],"globalEval",!t||_.get(t[n],"globalEval"))}ke.tbody=ke.tfoot=ke.colgroup=ke.caption=ke.thead,ke.th=ke.td,le.option||(ke.optgroup=ke.option=[1,"<select multiple='multiple'>","</select>"]);var je=/<|&#?\w+;/;function Ae(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===x(o))ce.merge(p,o.nodeType?[o]:o);else if(je.test(o)){a=a||f.appendChild(t.createElement("div")),s=(Te.exec(o)||["",""])[1].toLowerCase(),u=ke[s]||ke._default,a.innerHTML=u[1]+ce.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;ce.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<ce.inArray(o,r))i&&i.push(o);else if(l=K(o),a=Se(f.appendChild(o),"script"),l&&Ee(a),n){c=0;while(o=a[c++])Ce.test(o.type||"")&&n.push(o)}return f}var De=/^([^.]*)(?:\.(.+)|)/;function Ne(){return!0}function qe(){return!1}function Le(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Le(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=qe;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return ce().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=ce.guid++)),e.each(function(){ce.event.add(this,t,i,r,n)})}function He(e,r,t){t?(_.set(e,r,!1),ce.event.add(e,r,{namespace:!1,handler:function(e){var t,n=_.get(this,r);if(1&e.isTrigger&&this[r]){if(n)(ce.event.special[r]||{}).delegateType&&e.stopPropagation();else if(n=ae.call(arguments),_.set(this,r,n),this[r](),t=_.get(this,r),_.set(this,r,!1),n!==t)return e.stopImmediatePropagation(),e.preventDefault(),t}else n&&(_.set(this,r,ce.event.trigger(n[0],n.slice(1),this)),e.stopPropagation(),e.isImmediatePropagationStopped=Ne)}})):void 0===_.get(e,r)&&ce.event.add(e,r,Ne)}ce.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=_.get(t);if($(t)){n.handler&&(n=(o=n).handler,i=o.selector),i&&ce.find.matchesSelector(J,i),n.guid||(n.guid=ce.guid++),(u=v.events)||(u=v.events=Object.create(null)),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof ce&&ce.event.triggered!==e.type?ce.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(D)||[""]).length;while(l--)d=g=(s=De.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=ce.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=ce.event.special[d]||{},c=ce.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&ce.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),ce.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=_.hasData(e)&&_.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(D)||[""]).length;while(l--)if(d=g=(s=De.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=ce.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||ce.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)ce.event.remove(e,d+t[l],n,r,!0);ce.isEmptyObject(u)&&_.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=new Array(arguments.length),u=ce.event.fix(e),l=(_.get(this,"events")||Object.create(null))[u.type]||[],c=ce.event.special[u.type]||{};for(s[0]=u,t=1;t<arguments.length;t++)s[t]=arguments[t];if(u.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,u)){a=ce.event.handlers.call(this,u,l),t=0;while((i=a[t++])&&!u.isPropagationStopped()){u.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!u.isImmediatePropagationStopped())u.rnamespace&&!1!==o.namespace&&!u.rnamespace.test(o.namespace)||(u.handleObj=o,u.data=o.data,void 0!==(r=((ce.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s))&&!1===(u.result=r)&&(u.preventDefault(),u.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,u),u.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<ce(i,this).index(l):ce.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(ce.Event.prototype,t,{enumerable:!0,configurable:!0,get:v(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[ce.expando]?e:new ce.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return we.test(t.type)&&t.click&&fe(t,"input")&&He(t,"click",!0),!1},trigger:function(e){var t=this||e;return we.test(t.type)&&t.click&&fe(t,"input")&&He(t,"click"),!0},_default:function(e){var t=e.target;return we.test(t.type)&&t.click&&fe(t,"input")&&_.get(t,"click")||fe(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},ce.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},ce.Event=function(e,t){if(!(this instanceof ce.Event))return new ce.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?Ne:qe,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&ce.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[ce.expando]=!0},ce.Event.prototype={constructor:ce.Event,isDefaultPrevented:qe,isPropagationStopped:qe,isImmediatePropagationStopped:qe,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=Ne,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=Ne,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=Ne,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},ce.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:!0},ce.event.addProp),ce.each({focus:"focusin",blur:"focusout"},function(r,i){function o(e){if(C.documentMode){var t=_.get(this,"handle"),n=ce.event.fix(e);n.type="focusin"===e.type?"focus":"blur",n.isSimulated=!0,t(e),n.target===n.currentTarget&&t(n)}else ce.event.simulate(i,e.target,ce.event.fix(e))}ce.event.special[r]={setup:function(){var e;if(He(this,r,!0),!C.documentMode)return!1;(e=_.get(this,i))||this.addEventListener(i,o),_.set(this,i,(e||0)+1)},trigger:function(){return He(this,r),!0},teardown:function(){var e;if(!C.documentMode)return!1;(e=_.get(this,i)-1)?_.set(this,i,e):(this.removeEventListener(i,o),_.remove(this,i))},_default:function(e){return _.get(e.target,r)},delegateType:i},ce.event.special[i]={setup:function(){var e=this.ownerDocument||this.document||this,t=C.documentMode?this:e,n=_.get(t,i);n||(C.documentMode?this.addEventListener(i,o):e.addEventListener(r,o,!0)),_.set(t,i,(n||0)+1)},teardown:function(){var e=this.ownerDocument||this.document||this,t=C.documentMode?this:e,n=_.get(t,i)-1;n?_.set(t,i,n):(C.documentMode?this.removeEventListener(i,o):e.removeEventListener(r,o,!0),_.remove(t,i))}}}),ce.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){ce.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||ce.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),ce.fn.extend({on:function(e,t,n,r){return Le(this,e,t,n,r)},one:function(e,t,n,r){return Le(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,ce(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=qe),this.each(function(){ce.event.remove(this,e,n,t)})}});var Oe=/<script|<style|<link/i,Pe=/checked\s*(?:[^=]|=\s*.checked.)/i,Me=/^\s*<!\[CDATA\[|\]\]>\s*$/g;function Re(e,t){return fe(e,"table")&&fe(11!==t.nodeType?t:t.firstChild,"tr")&&ce(e).children("tbody")[0]||e}function Ie(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function We(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Fe(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(_.hasData(e)&&(s=_.get(e).events))for(i in _.remove(t,"handle events"),s)for(n=0,r=s[i].length;n<r;n++)ce.event.add(t,i,s[i][n]);z.hasData(e)&&(o=z.access(e),a=ce.extend({},o),z.set(t,a))}}function $e(n,r,i,o){r=g(r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=v(d);if(h||1<f&&"string"==typeof d&&!le.checkClone&&Pe.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),$e(t,r,i,o)});if(f&&(t=(e=Ae(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=ce.map(Se(e,"script"),Ie)).length;c<f;c++)u=e,c!==p&&(u=ce.clone(u,!0,!0),s&&ce.merge(a,Se(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,ce.map(a,We),c=0;c<s;c++)u=a[c],Ce.test(u.type||"")&&!_.access(u,"globalEval")&&ce.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?ce._evalUrl&&!u.noModule&&ce._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")},l):m(u.textContent.replace(Me,""),u,l))}return n}function Be(e,t,n){for(var r,i=t?ce.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||ce.cleanData(Se(r)),r.parentNode&&(n&&K(r)&&Ee(Se(r,"script")),r.parentNode.removeChild(r));return e}ce.extend({htmlPrefilter:function(e){return e},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=K(e);if(!(le.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||ce.isXMLDoc(e)))for(a=Se(c),r=0,i=(o=Se(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&we.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||Se(e),a=a||Se(c),r=0,i=o.length;r<i;r++)Fe(o[r],a[r]);else Fe(e,c);return 0<(a=Se(c,"script")).length&&Ee(a,!f&&Se(e,"script")),c},cleanData:function(e){for(var t,n,r,i=ce.event.special,o=0;void 0!==(n=e[o]);o++)if($(n)){if(t=n[_.expando]){if(t.events)for(r in t.events)i[r]?ce.event.remove(n,r):ce.removeEvent(n,r,t.handle);n[_.expando]=void 0}n[z.expando]&&(n[z.expando]=void 0)}}}),ce.fn.extend({detach:function(e){return Be(this,e,!0)},remove:function(e){return Be(this,e)},text:function(e){return M(this,function(e){return void 0===e?ce.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return $e(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||Re(this,e).appendChild(e)})},prepend:function(){return $e(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Re(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return $e(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return $e(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(ce.cleanData(Se(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return ce.clone(this,e,t)})},html:function(e){return M(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!Oe.test(e)&&!ke[(Te.exec(e)||["",""])[1].toLowerCase()]){e=ce.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(ce.cleanData(Se(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return $e(this,arguments,function(e){var t=this.parentNode;ce.inArray(this,n)<0&&(ce.cleanData(Se(this)),t&&t.replaceChild(e,this))},n)}}),ce.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){ce.fn[e]=function(e){for(var t,n=[],r=ce(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),ce(r[o])[a](t),s.apply(n,t.get());return this.pushStack(n)}});var _e=new RegExp("^("+G+")(?!px)[a-z%]+$","i"),ze=/^--/,Xe=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=ie),t.getComputedStyle(e)},Ue=function(e,t,n){var r,i,o={};for(i in t)o[i]=e.style[i],e.style[i]=t[i];for(i in r=n.call(e),t)e.style[i]=o[i];return r},Ve=new RegExp(Q.join("|"),"i");function Ge(e,t,n){var r,i,o,a,s=ze.test(t),u=e.style;return(n=n||Xe(e))&&(a=n.getPropertyValue(t)||n[t],s&&a&&(a=a.replace(ve,"$1")||void 0),""!==a||K(e)||(a=ce.style(e,t)),!le.pixelBoxStyles()&&_e.test(a)&&Ve.test(t)&&(r=u.width,i=u.minWidth,o=u.maxWidth,u.minWidth=u.maxWidth=u.width=a,a=n.width,u.width=r,u.minWidth=i,u.maxWidth=o)),void 0!==a?a+"":a}function Ye(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(l){u.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",l.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",J.appendChild(u).appendChild(l);var e=ie.getComputedStyle(l);n="1%"!==e.top,s=12===t(e.marginLeft),l.style.right="60%",o=36===t(e.right),r=36===t(e.width),l.style.position="absolute",i=12===t(l.offsetWidth/3),J.removeChild(u),l=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s,u=C.createElement("div"),l=C.createElement("div");l.style&&(l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",le.clearCloneStyle="content-box"===l.style.backgroundClip,ce.extend(le,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),s},scrollboxSize:function(){return e(),i},reliableTrDimensions:function(){var e,t,n,r;return null==a&&(e=C.createElement("table"),t=C.createElement("tr"),n=C.createElement("div"),e.style.cssText="position:absolute;left:-11111px;border-collapse:separate",t.style.cssText="box-sizing:content-box;border:1px solid",t.style.height="1px",n.style.height="9px",n.style.display="block",J.appendChild(e).appendChild(t).appendChild(n),r=ie.getComputedStyle(t),a=parseInt(r.height,10)+parseInt(r.borderTopWidth,10)+parseInt(r.borderBottomWidth,10)===t.offsetHeight,J.removeChild(e)),a}}))}();var Qe=["Webkit","Moz","ms"],Je=C.createElement("div").style,Ke={};function Ze(e){var t=ce.cssProps[e]||Ke[e];return t||(e in Je?e:Ke[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=Qe.length;while(n--)if((e=Qe[n]+t)in Je)return e}(e)||e)}var et=/^(none|table(?!-c[ea]).+)/,tt={position:"absolute",visibility:"hidden",display:"block"},nt={letterSpacing:"0",fontWeight:"400"};function rt(e,t,n){var r=Y.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function it(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0,l=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(l+=ce.css(e,n+Q[a],!0,i)),r?("content"===n&&(u-=ce.css(e,"padding"+Q[a],!0,i)),"margin"!==n&&(u-=ce.css(e,"border"+Q[a]+"Width",!0,i))):(u+=ce.css(e,"padding"+Q[a],!0,i),"padding"!==n?u+=ce.css(e,"border"+Q[a]+"Width",!0,i):s+=ce.css(e,"border"+Q[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u+l}function ot(e,t,n){var r=Xe(e),i=(!le.boxSizingReliable()||n)&&"border-box"===ce.css(e,"boxSizing",!1,r),o=i,a=Ge(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if(_e.test(a)){if(!n)return a;a="auto"}return(!le.boxSizingReliable()&&i||!le.reliableTrDimensions()&&fe(e,"tr")||"auto"===a||!parseFloat(a)&&"inline"===ce.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===ce.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+it(e,t,n||(i?"border":"content"),o,r,a)+"px"}function at(e,t,n,r,i){return new at.prototype.init(e,t,n,r,i)}ce.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Ge(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,aspectRatio:!0,borderImageSlice:!0,columnCount:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,scale:!0,widows:!0,zIndex:!0,zoom:!0,fillOpacity:!0,floodOpacity:!0,stopOpacity:!0,strokeMiterlimit:!0,strokeOpacity:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=F(t),u=ze.test(t),l=e.style;if(u||(t=Ze(s)),a=ce.cssHooks[t]||ce.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=Y.exec(n))&&i[1]&&(n=te(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(ce.cssNumber[s]?"":"px")),le.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=F(t);return ze.test(t)||(t=Ze(s)),(a=ce.cssHooks[t]||ce.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=Ge(e,t,r)),"normal"===i&&t in nt&&(i=nt[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),ce.each(["height","width"],function(e,u){ce.cssHooks[u]={get:function(e,t,n){if(t)return!et.test(ce.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?ot(e,u,n):Ue(e,tt,function(){return ot(e,u,n)})},set:function(e,t,n){var r,i=Xe(e),o=!le.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===ce.css(e,"boxSizing",!1,i),s=n?it(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-it(e,u,"border",!1,i)-.5)),s&&(r=Y.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=ce.css(e,u)),rt(0,t,s)}}}),ce.cssHooks.marginLeft=Ye(le.reliableMarginLeft,function(e,t){if(t)return(parseFloat(Ge(e,"marginLeft"))||e.getBoundingClientRect().left-Ue(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),ce.each({margin:"",padding:"",border:"Width"},function(i,o){ce.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+Q[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(ce.cssHooks[i+o].set=rt)}),ce.fn.extend({css:function(e,t){return M(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Xe(e),i=t.length;a<i;a++)o[t[a]]=ce.css(e,t[a],!1,r);return o}return void 0!==n?ce.style(e,t,n):ce.css(e,t)},e,t,1<arguments.length)}}),((ce.Tween=at).prototype={constructor:at,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||ce.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(ce.cssNumber[n]?"":"px")},cur:function(){var e=at.propHooks[this.prop];return e&&e.get?e.get(this):at.propHooks._default.get(this)},run:function(e){var t,n=at.propHooks[this.prop];return this.options.duration?this.pos=t=ce.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):at.propHooks._default.set(this),this}}).init.prototype=at.prototype,(at.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=ce.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){ce.fx.step[e.prop]?ce.fx.step[e.prop](e):1!==e.elem.nodeType||!ce.cssHooks[e.prop]&&null==e.elem.style[Ze(e.prop)]?e.elem[e.prop]=e.now:ce.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=at.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},ce.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},ce.fx=at.prototype.init,ce.fx.step={};var st,ut,lt,ct,ft=/^(?:toggle|show|hide)$/,pt=/queueHooks$/;function dt(){ut&&(!1===C.hidden&&ie.requestAnimationFrame?ie.requestAnimationFrame(dt):ie.setTimeout(dt,ce.fx.interval),ce.fx.tick())}function ht(){return ie.setTimeout(function(){st=void 0}),st=Date.now()}function gt(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=Q[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function vt(e,t,n){for(var r,i=(yt.tweeners[t]||[]).concat(yt.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function yt(o,e,t){var n,a,r=0,i=yt.prefilters.length,s=ce.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=st||ht(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:ce.extend({},e),opts:ce.extend(!0,{specialEasing:{},easing:ce.easing._default},t),originalProperties:e,originalOptions:t,startTime:st||ht(),duration:t.duration,tweens:[],createTween:function(e,t){var n=ce.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=F(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=ce.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=yt.prefilters[r].call(l,o,c,l.opts))return v(n.stop)&&(ce._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return ce.map(c,vt,l),v(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),ce.fx.timer(ce.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}ce.Animation=ce.extend(yt,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return te(n.elem,e,Y.exec(t),n),n}]},tweener:function(e,t){v(e)?(t=e,e=["*"]):e=e.match(D);for(var n,r=0,i=e.length;r<i;r++)n=e[r],yt.tweeners[n]=yt.tweeners[n]||[],yt.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&ee(e),v=_.get(e,"fxshow");for(r in n.queue||(null==(a=ce._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,ce.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],ft.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||ce.style(e,r)}if((u=!ce.isEmptyObject(t))||!ce.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=_.get(e,"display")),"none"===(c=ce.css(e,"display"))&&(l?c=l:(re([e],!0),l=e.style.display||l,c=ce.css(e,"display"),re([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===ce.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=_.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&re([e],!0),p.done(function(){for(r in g||re([e]),_.remove(e,"fxshow"),d)ce.style(e,r,d[r])})),u=vt(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?yt.prefilters.unshift(e):yt.prefilters.push(e)}}),ce.speed=function(e,t,n){var r=e&&"object"==typeof e?ce.extend({},e):{complete:n||!n&&t||v(e)&&e,duration:e,easing:n&&t||t&&!v(t)&&t};return ce.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in ce.fx.speeds?r.duration=ce.fx.speeds[r.duration]:r.duration=ce.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){v(r.old)&&r.old.call(this),r.queue&&ce.dequeue(this,r.queue)},r},ce.fn.extend({fadeTo:function(e,t,n,r){return this.filter(ee).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=ce.isEmptyObject(t),o=ce.speed(e,n,r),a=function(){var e=yt(this,ce.extend({},t),o);(i||_.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=ce.timers,r=_.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&pt.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||ce.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=_.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=ce.timers,o=n?n.length:0;for(t.finish=!0,ce.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),ce.each(["toggle","show","hide"],function(e,r){var i=ce.fn[r];ce.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(gt(r,!0),e,t,n)}}),ce.each({slideDown:gt("show"),slideUp:gt("hide"),slideToggle:gt("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){ce.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),ce.timers=[],ce.fx.tick=function(){var e,t=0,n=ce.timers;for(st=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||ce.fx.stop(),st=void 0},ce.fx.timer=function(e){ce.timers.push(e),ce.fx.start()},ce.fx.interval=13,ce.fx.start=function(){ut||(ut=!0,dt())},ce.fx.stop=function(){ut=null},ce.fx.speeds={slow:600,fast:200,_default:400},ce.fn.delay=function(r,e){return r=ce.fx&&ce.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=ie.setTimeout(e,r);t.stop=function(){ie.clearTimeout(n)}})},lt=C.createElement("input"),ct=C.createElement("select").appendChild(C.createElement("option")),lt.type="checkbox",le.checkOn=""!==lt.value,le.optSelected=ct.selected,(lt=C.createElement("input")).value="t",lt.type="radio",le.radioValue="t"===lt.value;var mt,xt=ce.expr.attrHandle;ce.fn.extend({attr:function(e,t){return M(this,ce.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){ce.removeAttr(this,e)})}}),ce.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?ce.prop(e,t,n):(1===o&&ce.isXMLDoc(e)||(i=ce.attrHooks[t.toLowerCase()]||(ce.expr.match.bool.test(t)?mt:void 0)),void 0!==n?null===n?void ce.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=ce.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!le.radioValue&&"radio"===t&&fe(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(D);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),mt={set:function(e,t,n){return!1===t?ce.removeAttr(e,n):e.setAttribute(n,n),n}},ce.each(ce.expr.match.bool.source.match(/\w+/g),function(e,t){var a=xt[t]||ce.find.attr;xt[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=xt[o],xt[o]=r,r=null!=a(e,t,n)?o:null,xt[o]=i),r}});var bt=/^(?:input|select|textarea|button)$/i,wt=/^(?:a|area)$/i;function Tt(e){return(e.match(D)||[]).join(" ")}function Ct(e){return e.getAttribute&&e.getAttribute("class")||""}function kt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(D)||[]}ce.fn.extend({prop:function(e,t){return M(this,ce.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[ce.propFix[e]||e]})}}),ce.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&ce.isXMLDoc(e)||(t=ce.propFix[t]||t,i=ce.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=ce.find.attr(e,"tabindex");return t?parseInt(t,10):bt.test(e.nodeName)||wt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),le.optSelected||(ce.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),ce.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){ce.propFix[this.toLowerCase()]=this}),ce.fn.extend({addClass:function(t){var e,n,r,i,o,a;return v(t)?this.each(function(e){ce(this).addClass(t.call(this,e,Ct(this)))}):(e=kt(t)).length?this.each(function(){if(r=Ct(this),n=1===this.nodeType&&" "+Tt(r)+" "){for(o=0;o<e.length;o++)i=e[o],n.indexOf(" "+i+" ")<0&&(n+=i+" ");a=Tt(n),r!==a&&this.setAttribute("class",a)}}):this},removeClass:function(t){var e,n,r,i,o,a;return v(t)?this.each(function(e){ce(this).removeClass(t.call(this,e,Ct(this)))}):arguments.length?(e=kt(t)).length?this.each(function(){if(r=Ct(this),n=1===this.nodeType&&" "+Tt(r)+" "){for(o=0;o<e.length;o++){i=e[o];while(-1<n.indexOf(" "+i+" "))n=n.replace(" "+i+" "," ")}a=Tt(n),r!==a&&this.setAttribute("class",a)}}):this:this.attr("class","")},toggleClass:function(t,n){var e,r,i,o,a=typeof t,s="string"===a||Array.isArray(t);return v(t)?this.each(function(e){ce(this).toggleClass(t.call(this,e,Ct(this),n),n)}):"boolean"==typeof n&&s?n?this.addClass(t):this.removeClass(t):(e=kt(t),this.each(function(){if(s)for(o=ce(this),i=0;i<e.length;i++)r=e[i],o.hasClass(r)?o.removeClass(r):o.addClass(r);else void 0!==t&&"boolean"!==a||((r=Ct(this))&&_.set(this,"__className__",r),this.setAttribute&&this.setAttribute("class",r||!1===t?"":_.get(this,"__className__")||""))}))},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+Tt(Ct(n))+" ").indexOf(t))return!0;return!1}});var St=/\r/g;ce.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=v(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,ce(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=ce.map(t,function(e){return null==e?"":e+""})),(r=ce.valHooks[this.type]||ce.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=ce.valHooks[t.type]||ce.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(St,""):null==e?"":e:void 0}}),ce.extend({valHooks:{option:{get:function(e){var t=ce.find.attr(e,"value");return null!=t?t:Tt(ce.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!fe(n.parentNode,"optgroup"))){if(t=ce(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=ce.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<ce.inArray(ce.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),ce.each(["radio","checkbox"],function(){ce.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<ce.inArray(ce(e).val(),t)}},le.checkOn||(ce.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Et=ie.location,jt={guid:Date.now()},At=/\?/;ce.parseXML=function(e){var t,n;if(!e||"string"!=typeof e)return null;try{t=(new ie.DOMParser).parseFromString(e,"text/xml")}catch(e){}return n=t&&t.getElementsByTagName("parsererror")[0],t&&!n||ce.error("Invalid XML: "+(n?ce.map(n.childNodes,function(e){return e.textContent}).join("\n"):e)),t};var Dt=/^(?:focusinfocus|focusoutblur)$/,Nt=function(e){e.stopPropagation()};ce.extend(ce.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||C],d=ue.call(e,"type")?e.type:e,h=ue.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||C,3!==n.nodeType&&8!==n.nodeType&&!Dt.test(d+ce.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[ce.expando]?e:new ce.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:ce.makeArray(t,[e]),c=ce.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!y(n)){for(s=c.delegateType||d,Dt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||C)&&p.push(a.defaultView||a.parentWindow||ie)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(_.get(o,"events")||Object.create(null))[e.type]&&_.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&$(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!$(n)||u&&v(n[d])&&!y(n)&&((a=n[u])&&(n[u]=null),ce.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,Nt),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,Nt),ce.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=ce.extend(new ce.Event,n,{type:e,isSimulated:!0});ce.event.trigger(r,null,t)}}),ce.fn.extend({trigger:function(e,t){return this.each(function(){ce.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return ce.event.trigger(e,t,n,!0)}});var qt=/\[\]$/,Lt=/\r?\n/g,Ht=/^(?:submit|button|image|reset|file)$/i,Ot=/^(?:input|select|textarea|keygen)/i;function Pt(n,e,r,i){var t;if(Array.isArray(e))ce.each(e,function(e,t){r||qt.test(n)?i(n,t):Pt(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==x(e))i(n,e);else for(t in e)Pt(n+"["+t+"]",e[t],r,i)}ce.param=function(e,t){var n,r=[],i=function(e,t){var n=v(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!ce.isPlainObject(e))ce.each(e,function(){i(this.name,this.value)});else for(n in e)Pt(n,e[n],t,i);return r.join("&")},ce.fn.extend({serialize:function(){return ce.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=ce.prop(this,"elements");return e?ce.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!ce(this).is(":disabled")&&Ot.test(this.nodeName)&&!Ht.test(e)&&(this.checked||!we.test(e))}).map(function(e,t){var n=ce(this).val();return null==n?null:Array.isArray(n)?ce.map(n,function(e){return{name:t.name,value:e.replace(Lt,"\r\n")}}):{name:t.name,value:n.replace(Lt,"\r\n")}}).get()}});var Mt=/%20/g,Rt=/#.*$/,It=/([?&])_=[^&]*/,Wt=/^(.*?):[ \t]*([^\r\n]*)$/gm,Ft=/^(?:GET|HEAD)$/,$t=/^\/\//,Bt={},_t={},zt="*/".concat("*"),Xt=C.createElement("a");function Ut(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(D)||[];if(v(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function Vt(t,i,o,a){var s={},u=t===_t;function l(e){var r;return s[e]=!0,ce.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function Gt(e,t){var n,r,i=ce.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&ce.extend(!0,e,r),e}Xt.href=Et.href,ce.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Et.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(Et.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":zt,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":ce.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?Gt(Gt(e,ce.ajaxSettings),t):Gt(ce.ajaxSettings,e)},ajaxPrefilter:Ut(Bt),ajaxTransport:Ut(_t),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=ce.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?ce(y):ce.event,x=ce.Deferred(),b=ce.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=Wt.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||Et.href)+"").replace($t,Et.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(D)||[""],null==v.crossDomain){r=C.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Xt.protocol+"//"+Xt.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=ce.param(v.data,v.traditional)),Vt(Bt,v,t,T),h)return T;for(i in(g=ce.event&&v.global)&&0==ce.active++&&ce.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Ft.test(v.type),f=v.url.replace(Rt,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(Mt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(At.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(It,"$1"),o=(At.test(f)?"&":"?")+"_="+jt.guid+++o),v.url=f+o),v.ifModified&&(ce.lastModified[f]&&T.setRequestHeader("If-Modified-Since",ce.lastModified[f]),ce.etag[f]&&T.setRequestHeader("If-None-Match",ce.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+zt+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(v.complete),T.done(v.success),T.fail(v.error),c=Vt(_t,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=ie.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&ie.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),!i&&-1<ce.inArray("script",v.dataTypes)&&ce.inArray("json",v.dataTypes)<0&&(v.converters["text script"]=function(){}),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(ce.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(ce.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--ce.active||ce.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return ce.get(e,t,n,"json")},getScript:function(e,t){return ce.get(e,void 0,t,"script")}}),ce.each(["get","post"],function(e,i){ce[i]=function(e,t,n,r){return v(t)&&(r=r||n,n=t,t=void 0),ce.ajax(ce.extend({url:e,type:i,dataType:r,data:t,success:n},ce.isPlainObject(e)&&e))}}),ce.ajaxPrefilter(function(e){var t;for(t in e.headers)"content-type"===t.toLowerCase()&&(e.contentType=e.headers[t]||"")}),ce._evalUrl=function(e,t,n){return ce.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){ce.globalEval(e,t,n)}})},ce.fn.extend({wrapAll:function(e){var t;return this[0]&&(v(e)&&(e=e.call(this[0])),t=ce(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return v(n)?this.each(function(e){ce(this).wrapInner(n.call(this,e))}):this.each(function(){var e=ce(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=v(t);return this.each(function(e){ce(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){ce(this).replaceWith(this.childNodes)}),this}}),ce.expr.pseudos.hidden=function(e){return!ce.expr.pseudos.visible(e)},ce.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},ce.ajaxSettings.xhr=function(){try{return new ie.XMLHttpRequest}catch(e){}};var Yt={0:200,1223:204},Qt=ce.ajaxSettings.xhr();le.cors=!!Qt&&"withCredentials"in Qt,le.ajax=Qt=!!Qt,ce.ajaxTransport(function(i){var o,a;if(le.cors||Qt&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(Yt[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&ie.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),ce.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),ce.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return ce.globalEval(e),e}}}),ce.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),ce.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=ce("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),C.head.appendChild(r[0])},abort:function(){i&&i()}}});var Jt,Kt=[],Zt=/(=)\?(?=&|$)|\?\?/;ce.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Kt.pop()||ce.expando+"_"+jt.guid++;return this[e]=!0,e}}),ce.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Zt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Zt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=v(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Zt,"$1"+r):!1!==e.jsonp&&(e.url+=(At.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||ce.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=ie[r],ie[r]=function(){o=arguments},n.always(function(){void 0===i?ce(ie).removeProp(r):ie[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Kt.push(r)),o&&v(i)&&i(o[0]),o=i=void 0}),"script"}),le.createHTMLDocument=((Jt=C.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===Jt.childNodes.length),ce.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(le.createHTMLDocument?((r=(t=C.implementation.createHTMLDocument("")).createElement("base")).href=C.location.href,t.head.appendChild(r)):t=C),o=!n&&[],(i=w.exec(e))?[t.createElement(i[1])]:(i=Ae([e],t,o),o&&o.length&&ce(o).remove(),ce.merge([],i.childNodes)));var r,i,o},ce.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=Tt(e.slice(s)),e=e.slice(0,s)),v(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&ce.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?ce("<div>").append(ce.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},ce.expr.pseudos.animated=function(t){return ce.grep(ce.timers,function(e){return t===e.elem}).length},ce.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=ce.css(e,"position"),c=ce(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=ce.css(e,"top"),u=ce.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),v(t)&&(t=t.call(e,n,ce.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},ce.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){ce.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===ce.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===ce.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=ce(e).offset()).top+=ce.css(e,"borderTopWidth",!0),i.left+=ce.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-ce.css(r,"marginTop",!0),left:t.left-i.left-ce.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===ce.css(e,"position"))e=e.offsetParent;return e||J})}}),ce.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;ce.fn[t]=function(e){return M(this,function(e,t,n){var r;if(y(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),ce.each(["top","left"],function(e,n){ce.cssHooks[n]=Ye(le.pixelPosition,function(e,t){if(t)return t=Ge(e,n),_e.test(t)?ce(e).position()[n]+"px":t})}),ce.each({Height:"height",Width:"width"},function(a,s){ce.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){ce.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return M(this,function(e,t,n){var r;return y(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?ce.css(e,t,i):ce.style(e,t,n,i)},s,n?e:void 0,n)}})}),ce.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){ce.fn[t]=function(e){return this.on(t,e)}}),ce.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.on("mouseenter",e).on("mouseleave",t||e)}}),ce.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){ce.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}});var en=/^[\s\uFEFF\xA0]+|([^\s\uFEFF\xA0])[\s\uFEFF\xA0]+$/g;ce.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),v(e))return r=ae.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(ae.call(arguments)))}).guid=e.guid=e.guid||ce.guid++,i},ce.holdReady=function(e){e?ce.readyWait++:ce.ready(!0)},ce.isArray=Array.isArray,ce.parseJSON=JSON.parse,ce.nodeName=fe,ce.isFunction=v,ce.isWindow=y,ce.camelCase=F,ce.type=x,ce.now=Date.now,ce.isNumeric=function(e){var t=ce.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},ce.trim=function(e){return null==e?"":(e+"").replace(en,"$1")},"function"==typeof define&&define.amd&&define("jquery",[],function(){return ce});var tn=ie.jQuery,nn=ie.$;return ce.noConflict=function(e){return ie.$===ce&&(ie.$=nn),e&&ie.jQuery===ce&&(ie.jQuery=tn),ce},"undefined"==typeof e&&(ie.jQuery=ie.$=ce),ce});
diff --git a/themes/Frontend/Responsive/frontend/_public/vendors/js/jquery/jquery.min.map b/themes/Frontend/Responsive/frontend/_public/vendors/js/jquery/jquery.min.map
index cbe1012155c..0ec72722de3 100644
--- a/themes/Frontend/Responsive/frontend/_public/vendors/js/jquery/jquery.min.map
+++ b/themes/Frontend/Responsive/frontend/_public/vendors/js/jquery/jquery.min.map
@@ -1 +1 @@
-{"version":3,"sources":["jquery.js"],"names":["global","factory","module","exports","document","w","Error","window","this","noGlobal","arr","getProto","Object","getPrototypeOf","slice","flat","array","call","concat","apply","push","indexOf","class2type","toString","hasOwn","hasOwnProperty","fnToString","ObjectFunctionString","support","isFunction","obj","nodeType","isWindow","preservedScriptAttributes","type","src","nonce","noModule","DOMEval","code","node","doc","i","val","script","createElement","text","getAttribute","setAttribute","head","appendChild","parentNode","removeChild","toType","version","jQuery","selector","context","fn","init","isArrayLike","length","prototype","jquery","constructor","toArray","get","num","pushStack","elems","ret","merge","prevObject","each","callback","map","elem","arguments","first","eq","last","even","grep","_elem","odd","len","j","end","sort","splice","extend","options","name","copy","copyIsArray","clone","target","deep","isPlainObject","Array","isArray","undefined","expando","Math","random","replace","isReady","error","msg","noop","proto","Ctor","isEmptyObject","globalEval","makeArray","results","inArray","second","invert","matches","callbackExpect","arg","value","guid","Symbol","iterator","split","_i","toLowerCase","Sizzle","Expr","getText","isXML","tokenize","compile","select","outermostContext","sortInput","hasDuplicate","setDocument","docElem","documentIsHTML","rbuggyQSA","rbuggyMatches","contains","Date","preferredDoc","dirruns","done","classCache","createCache","tokenCache","compilerCache","nonnativeSelectorCache","sortOrder","a","b","pop","pushNative","list","booleans","whitespace","identifier","attributes","pseudos","rwhitespace","RegExp","rtrim","rcomma","rcombinators","rdescend","rpseudo","ridentifier","matchExpr","ID","CLASS","TAG","ATTR","PSEUDO","CHILD","bool","needsContext","rhtml","rinputs","rheader","rnative","rquickExpr","rsibling","runescape","funescape","escape","nonHex","high","String","fromCharCode","rcssescape","fcssescape","ch","asCodePoint","charCodeAt","unloadHandler","inDisabledFieldset","addCombinator","disabled","nodeName","dir","next","childNodes","e","els","seed","m","nid","match","groups","newSelector","newContext","ownerDocument","exec","getElementById","id","getElementsByTagName","getElementsByClassName","qsa","test","testContext","scope","toSelector","join","querySelectorAll","qsaError","removeAttribute","keys","cache","key","cacheLength","shift","markFunction","assert","el","addHandle","attrs","handler","attrHandle","siblingCheck","cur","diff","sourceIndex","nextSibling","createInputPseudo","createButtonPseudo","createDisabledPseudo","isDisabled","createPositionalPseudo","argument","matchIndexes","namespace","namespaceURI","documentElement","hasCompare","subWindow","defaultView","top","addEventListener","attachEvent","className","createComment","getById","getElementsByName","filter","attrId","find","getAttributeNode","tag","tmp","input","innerHTML","matchesSelector","webkitMatchesSelector","mozMatchesSelector","oMatchesSelector","msMatchesSelector","disconnectedMatch","compareDocumentPosition","adown","bup","compare","sortDetached","aup","ap","bp","unshift","expr","elements","attr","specified","sel","uniqueSort","duplicates","detectDuplicates","sortStable","textContent","firstChild","nodeValue","selectors","createPseudo","relative",">"," ","+","~","preFilter","excess","unquoted","nodeNameSelector","pattern","operator","check","result","what","_argument","simple","forward","ofType","_context","xml","uniqueCache","outerCache","nodeIndex","start","parent","useCache","lastChild","uniqueID","pseudo","args","setFilters","idx","matched","not","matcher","unmatched","has","lang","elemLang","hash","location","root","focus","activeElement","hasFocus","href","tabIndex","enabled","checked","selected","selectedIndex","empty","header","button","_matchIndexes","lt","gt","radio","checkbox","file","password","image","submit","reset","tokens","combinator","base","skip","checkNonElements","doneName","oldCache","newCache","elementMatcher","matchers","condense","newUnmatched","mapped","setMatcher","postFilter","postFinder","postSelector","temp","preMap","postMap","preexisting","contexts","multipleContexts","matcherIn","matcherOut","matcherFromTokens","checkContext","leadingRelative","implicitRelative","matchContext","matchAnyContext","filters","parseOnly","soFar","preFilters","cached","elementMatchers","setMatchers","bySet","byElement","superMatcher","outermost","matchedCount","setMatched","contextBackup","dirrunsUnique","token","compiled","_name","defaultValue","unique","isXMLDoc","escapeSelector","until","truncate","is","siblings","n","rneedsContext","rsingleTag","winnow","qualifier","self","rootjQuery","parseHTML","ready","rparentsprev","guaranteedUnique","children","contents","prev","sibling","targets","l","closest","index","prevAll","add","addBack","parents","parentsUntil","nextAll","nextUntil","prevUntil","contentDocument","content","reverse","rnothtmlwhite","Identity","v","Thrower","ex","adoptValue","resolve","reject","noValue","method","promise","fail","then","Callbacks","object","_","flag","firing","memory","fired","locked","queue","firingIndex","fire","once","stopOnFalse","remove","disable","lock","fireWith","Deferred","func","tuples","state","always","deferred","catch","pipe","fns","newDefer","tuple","returned","progress","notify","onFulfilled","onRejected","onProgress","maxDepth","depth","special","that","mightThrow","TypeError","notifyWith","resolveWith","process","exceptionHook","stackTrace","rejectWith","getStackHook","setTimeout","stateString","when","singleValue","remaining","resolveContexts","resolveValues","master","updateFunc","rerrorNames","stack","console","warn","message","readyException","readyList","completed","removeEventListener","readyWait","wait","readyState","doScroll","access","chainable","emptyGet","raw","bulk","_key","rmsPrefix","rdashAlpha","fcamelCase","_all","letter","toUpperCase","camelCase","string","acceptData","owner","Data","uid","defineProperty","configurable","set","data","prop","hasData","dataPriv","dataUser","rbrace","rmultiDash","dataAttr","JSON","parse","removeData","_data","_removeData","dequeue","startLength","hooks","_queueHooks","stop","setter","clearQueue","count","defer","pnum","source","rcssNum","cssExpand","isAttached","composed","getRootNode","isHiddenWithinTree","style","display","css","adjustCSS","valueParts","tween","adjusted","scale","maxIterations","currentValue","initial","unit","cssNumber","initialInUnit","defaultDisplayMap","showHide","show","values","body","hide","toggle","div","rcheckableType","rtagName","rscriptType","createDocumentFragment","checkClone","cloneNode","noCloneChecked","option","wrapMap","thead","col","tr","td","_default","getAll","setGlobalEval","refElements","tbody","tfoot","colgroup","caption","th","optgroup","buildFragment","scripts","selection","ignored","wrap","attached","fragment","nodes","htmlPrefilter","createTextNode","rkeyEvent","rmouseEvent","rtypenamespace","returnTrue","returnFalse","expectSync","err","safeActiveElement","on","types","one","origFn","event","off","leverageNative","notAsync","saved","isTrigger","delegateType","stopPropagation","stopImmediatePropagation","preventDefault","trigger","Event","handleObjIn","eventHandle","events","t","handleObj","handlers","namespaces","origType","elemData","create","handle","triggered","dispatch","bindType","delegateCount","setup","mappedTypes","origCount","teardown","removeEvent","nativeEvent","handlerQueue","fix","delegateTarget","preDispatch","isPropagationStopped","currentTarget","isImmediatePropagationStopped","rnamespace","postDispatch","matchedHandlers","matchedSelectors","addProp","hook","enumerable","originalEvent","writable","load","noBubble","click","beforeunload","returnValue","props","isDefaultPrevented","defaultPrevented","relatedTarget","timeStamp","now","isSimulated","altKey","bubbles","cancelable","changedTouches","ctrlKey","detail","eventPhase","metaKey","pageX","pageY","shiftKey","view","char","charCode","keyCode","buttons","clientX","clientY","offsetX","offsetY","pointerId","pointerType","screenX","screenY","targetTouches","toElement","touches","which","blur","mouseenter","mouseleave","pointerenter","pointerleave","orig","related","rnoInnerhtml","rchecked","rcleanScript","manipulationTarget","disableScript","restoreScript","cloneCopyEvent","dest","udataOld","udataCur","domManip","collection","hasScripts","iNoClone","valueIsFunction","html","_evalUrl","keepData","cleanData","dataAndEvents","deepDataAndEvents","srcElements","destElements","inPage","detach","append","prepend","insertBefore","before","after","replaceWith","replaceChild","appendTo","prependTo","insertAfter","replaceAll","original","insert","rnumnonpx","getStyles","opener","getComputedStyle","swap","old","rboxStyle","curCSS","computed","width","minWidth","maxWidth","getPropertyValue","pixelBoxStyles","addGetHookIf","conditionFn","hookFn","computeStyleTests","container","cssText","divStyle","pixelPositionVal","reliableMarginLeftVal","roundPixelMeasures","marginLeft","right","pixelBoxStylesVal","boxSizingReliableVal","position","scrollboxSizeVal","offsetWidth","measure","round","parseFloat","reliableTrDimensionsVal","backgroundClip","clearCloneStyle","boxSizingReliable","pixelPosition","reliableMarginLeft","scrollboxSize","reliableTrDimensions","table","trChild","trStyle","height","parseInt","cssPrefixes","emptyStyle","vendorProps","finalPropName","final","cssProps","capName","vendorPropName","rdisplayswap","rcustomProp","cssShow","visibility","cssNormalTransform","letterSpacing","fontWeight","setPositiveNumber","subtract","max","boxModelAdjustment","dimension","box","isBorderBox","styles","computedVal","extra","delta","ceil","getWidthOrHeight","valueIsBorderBox","offsetProp","getClientRects","Tween","easing","cssHooks","opacity","animationIterationCount","columnCount","fillOpacity","flexGrow","flexShrink","gridArea","gridColumn","gridColumnEnd","gridColumnStart","gridRow","gridRowEnd","gridRowStart","lineHeight","order","orphans","widows","zIndex","zoom","origName","isCustomProp","setProperty","isFinite","getBoundingClientRect","scrollboxSizeBuggy","left","margin","padding","border","prefix","suffix","expand","expanded","parts","propHooks","run","percent","eased","duration","pos","step","fx","scrollTop","scrollLeft","linear","p","swing","cos","PI","fxNow","inProgress","opt","rfxtypes","rrun","schedule","hidden","requestAnimationFrame","interval","tick","createFxNow","genFx","includeWidth","createTween","animation","Animation","tweeners","properties","stopped","prefilters","currentTime","startTime","tweens","opts","specialEasing","originalProperties","originalOptions","gotoEnd","propFilter","bind","complete","timer","anim","*","tweener","oldfire","propTween","restoreDisplay","isBox","dataShow","unqueued","overflow","overflowX","overflowY","prefilter","speed","speeds","fadeTo","to","animate","optall","doAnimation","finish","stopQueue","timers","cssFn","slideDown","slideUp","slideToggle","fadeIn","fadeOut","fadeToggle","slow","fast","delay","time","timeout","clearTimeout","checkOn","optSelected","radioValue","boolHook","removeAttr","nType","attrHooks","attrNames","getter","lowercaseName","rfocusable","rclickable","stripAndCollapse","getClass","classesToArray","removeProp","propFix","tabindex","for","class","addClass","classes","curValue","clazz","finalValue","removeClass","toggleClass","stateVal","isValidValue","classNames","hasClass","rreturn","valHooks","optionSet","focusin","rfocusMorph","stopPropagationCallback","onlyHandlers","bubbleType","ontype","lastElement","eventPath","parentWindow","simulate","triggerHandler","attaches","rquery","parseXML","DOMParser","parseFromString","rbracket","rCRLF","rsubmitterTypes","rsubmittable","buildParams","traditional","param","s","valueOrFunction","encodeURIComponent","serialize","serializeArray","r20","rhash","rantiCache","rheaders","rnoContent","rprotocol","transports","allTypes","originAnchor","addToPrefiltersOrTransports","structure","dataTypeExpression","dataType","dataTypes","inspectPrefiltersOrTransports","jqXHR","inspected","seekingTransport","inspect","prefilterOrFactory","dataTypeOrTransport","ajaxExtend","flatOptions","ajaxSettings","active","lastModified","etag","url","isLocal","protocol","processData","async","contentType","accepts","json","responseFields","converters","* text","text html","text json","text xml","ajaxSetup","settings","ajaxPrefilter","ajaxTransport","ajax","transport","cacheURL","responseHeadersString","responseHeaders","timeoutTimer","urlAnchor","fireGlobals","uncached","callbackContext","globalEventContext","completeDeferred","statusCode","requestHeaders","requestHeadersNames","strAbort","getResponseHeader","getAllResponseHeaders","setRequestHeader","overrideMimeType","mimeType","status","abort","statusText","finalText","crossDomain","host","hasContent","ifModified","headers","beforeSend","success","send","nativeStatusText","responses","isSuccess","response","modified","ct","finalDataType","firstDataType","ajaxHandleResponses","conv2","current","conv","dataFilter","throws","ajaxConvert","getJSON","getScript","text script","wrapAll","firstElementChild","wrapInner","htmlIsFunction","unwrap","visible","offsetHeight","xhr","XMLHttpRequest","xhrSuccessStatus","0","1223","xhrSupported","cors","errorCallback","open","username","xhrFields","onload","onerror","onabort","ontimeout","onreadystatechange","responseType","responseText","binary","scriptAttrs","charset","scriptCharset","evt","oldCallbacks","rjsonp","jsonp","jsonpCallback","originalSettings","callbackName","overwritten","responseContainer","jsonProp","createHTMLDocument","implementation","keepScripts","parsed","params","animated","offset","setOffset","curPosition","curLeft","curCSSTop","curTop","curOffset","curCSSLeft","curElem","using","rect","win","pageYOffset","pageXOffset","offsetParent","parentOffset","scrollTo","Height","Width","","defaultExtra","funcName","unbind","delegate","undelegate","hover","fnOver","fnOut","proxy","holdReady","hold","parseJSON","isNumeric","isNaN","trim","define","amd","_jQuery","_$","$","noConflict"],"mappings":";CAaA,SAAYA,EAAQC,GAEnB,aAEuB,iBAAXC,QAAiD,iBAAnBA,OAAOC,QAShDD,OAAOC,QAAUH,EAAOI,SACvBH,EAASD,GAAQ,GACjB,SAAUK,GACT,IAAMA,EAAED,SACP,MAAM,IAAIE,MAAO,4CAElB,OAAOL,EAASI,IAGlBJ,EAASD,GAtBX,CA0BuB,oBAAXO,OAAyBA,OAASC,KAAM,SAAUD,EAAQE,GAMtE,aAEA,IAAIC,EAAM,GAENC,EAAWC,OAAOC,eAElBC,EAAQJ,EAAII,MAEZC,EAAOL,EAAIK,KAAO,SAAUC,GAC/B,OAAON,EAAIK,KAAKE,KAAMD,IACnB,SAAUA,GACb,OAAON,EAAIQ,OAAOC,MAAO,GAAIH,IAI1BI,EAAOV,EAAIU,KAEXC,EAAUX,EAAIW,QAEdC,EAAa,GAEbC,EAAWD,EAAWC,SAEtBC,EAASF,EAAWG,eAEpBC,EAAaF,EAAOD,SAEpBI,EAAuBD,EAAWT,KAAML,QAExCgB,EAAU,GAEVC,EAAa,SAAqBC,GAMhC,MAAsB,mBAARA,GAA8C,iBAAjBA,EAAIC,UAIjDC,EAAW,SAAmBF,GAChC,OAAc,MAAPA,GAAeA,IAAQA,EAAIvB,QAIhCH,EAAWG,EAAOH,SAIjB6B,EAA4B,CAC/BC,MAAM,EACNC,KAAK,EACLC,OAAO,EACPC,UAAU,GAGX,SAASC,EAASC,EAAMC,EAAMC,GAG7B,IAAIC,EAAGC,EACNC,GAHDH,EAAMA,GAAOrC,GAGCyC,cAAe,UAG7B,GADAD,EAAOE,KAAOP,EACTC,EACJ,IAAME,KAAKT,GAYVU,EAAMH,EAAME,IAAOF,EAAKO,cAAgBP,EAAKO,aAAcL,KAE1DE,EAAOI,aAAcN,EAAGC,GAI3BF,EAAIQ,KAAKC,YAAaN,GAASO,WAAWC,YAAaR,GAIzD,SAASS,EAAQvB,GAChB,OAAY,MAAPA,EACGA,EAAM,GAIQ,iBAARA,GAAmC,mBAARA,EACxCR,EAAYC,EAASN,KAAMa,KAAW,gBAC/BA,EAQT,IACCwB,EAAU,QAGVC,EAAS,SAAUC,EAAUC,GAI5B,OAAO,IAAIF,EAAOG,GAAGC,KAAMH,EAAUC,IA0VvC,SAASG,EAAa9B,GAMrB,IAAI+B,IAAW/B,GAAO,WAAYA,GAAOA,EAAI+B,OAC5C3B,EAAOmB,EAAQvB,GAEhB,OAAKD,EAAYC,KAASE,EAAUF,KAIpB,UAATI,GAA+B,IAAX2B,GACR,iBAAXA,GAAgC,EAATA,GAAgBA,EAAS,KAAO/B,GArWhEyB,EAAOG,GAAKH,EAAOO,UAAY,CAG9BC,OAAQT,EAERU,YAAaT,EAGbM,OAAQ,EAERI,QAAS,WACR,OAAOnD,EAAMG,KAAMT,OAKpB0D,IAAK,SAAUC,GAGd,OAAY,MAAPA,EACGrD,EAAMG,KAAMT,MAIb2D,EAAM,EAAI3D,KAAM2D,EAAM3D,KAAKqD,QAAWrD,KAAM2D,IAKpDC,UAAW,SAAUC,GAGpB,IAAIC,EAAMf,EAAOgB,MAAO/D,KAAKwD,cAAeK,GAM5C,OAHAC,EAAIE,WAAahE,KAGV8D,GAIRG,KAAM,SAAUC,GACf,OAAOnB,EAAOkB,KAAMjE,KAAMkE,IAG3BC,IAAK,SAAUD,GACd,OAAOlE,KAAK4D,UAAWb,EAAOoB,IAAKnE,KAAM,SAAUoE,EAAMlC,GACxD,OAAOgC,EAASzD,KAAM2D,EAAMlC,EAAGkC,OAIjC9D,MAAO,WACN,OAAON,KAAK4D,UAAWtD,EAAMK,MAAOX,KAAMqE,aAG3CC,MAAO,WACN,OAAOtE,KAAKuE,GAAI,IAGjBC,KAAM,WACL,OAAOxE,KAAKuE,IAAK,IAGlBE,KAAM,WACL,OAAOzE,KAAK4D,UAAWb,EAAO2B,KAAM1E,KAAM,SAAU2E,EAAOzC,GAC1D,OAASA,EAAI,GAAM,MAIrB0C,IAAK,WACJ,OAAO5E,KAAK4D,UAAWb,EAAO2B,KAAM1E,KAAM,SAAU2E,EAAOzC,GAC1D,OAAOA,EAAI,MAIbqC,GAAI,SAAUrC,GACb,IAAI2C,EAAM7E,KAAKqD,OACdyB,GAAK5C,GAAMA,EAAI,EAAI2C,EAAM,GAC1B,OAAO7E,KAAK4D,UAAgB,GAALkB,GAAUA,EAAID,EAAM,CAAE7E,KAAM8E,IAAQ,KAG5DC,IAAK,WACJ,OAAO/E,KAAKgE,YAAchE,KAAKwD,eAKhC5C,KAAMA,EACNoE,KAAM9E,EAAI8E,KACVC,OAAQ/E,EAAI+E,QAGblC,EAAOmC,OAASnC,EAAOG,GAAGgC,OAAS,WAClC,IAAIC,EAASC,EAAMzD,EAAK0D,EAAMC,EAAaC,EAC1CC,EAASnB,UAAW,IAAO,GAC3BnC,EAAI,EACJmB,EAASgB,UAAUhB,OACnBoC,GAAO,EAsBR,IAnBuB,kBAAXD,IACXC,EAAOD,EAGPA,EAASnB,UAAWnC,IAAO,GAC3BA,KAIsB,iBAAXsD,GAAwBnE,EAAYmE,KAC/CA,EAAS,IAILtD,IAAMmB,IACVmC,EAASxF,KACTkC,KAGOA,EAAImB,EAAQnB,IAGnB,GAAqC,OAA9BiD,EAAUd,UAAWnC,IAG3B,IAAMkD,KAAQD,EACbE,EAAOF,EAASC,GAIF,cAATA,GAAwBI,IAAWH,IAKnCI,GAAQJ,IAAUtC,EAAO2C,cAAeL,KAC1CC,EAAcK,MAAMC,QAASP,MAC/B1D,EAAM6D,EAAQJ,GAIbG,EADID,IAAgBK,MAAMC,QAASjE,GAC3B,GACI2D,GAAgBvC,EAAO2C,cAAe/D,GAG1CA,EAFA,GAIT2D,GAAc,EAGdE,EAAQJ,GAASrC,EAAOmC,OAAQO,EAAMF,EAAOF,SAGzBQ,IAATR,IACXG,EAAQJ,GAASC,IAOrB,OAAOG,GAGRzC,EAAOmC,OAAQ,CAGdY,QAAS,UAAahD,EAAUiD,KAAKC,UAAWC,QAAS,MAAO,IAGhEC,SAAS,EAETC,MAAO,SAAUC,GAChB,MAAM,IAAItG,MAAOsG,IAGlBC,KAAM,aAENX,cAAe,SAAUpE,GACxB,IAAIgF,EAAOC,EAIX,SAAMjF,GAAgC,oBAAzBP,EAASN,KAAMa,QAI5BgF,EAAQnG,EAAUmB,KASK,mBADvBiF,EAAOvF,EAAOP,KAAM6F,EAAO,gBAAmBA,EAAM9C,cACftC,EAAWT,KAAM8F,KAAWpF,IAGlEqF,cAAe,SAAUlF,GACxB,IAAI8D,EAEJ,IAAMA,KAAQ9D,EACb,OAAO,EAER,OAAO,GAKRmF,WAAY,SAAU1E,EAAMoD,EAASlD,GACpCH,EAASC,EAAM,CAAEH,MAAOuD,GAAWA,EAAQvD,OAASK,IAGrDgC,KAAM,SAAU3C,EAAK4C,GACpB,IAAIb,EAAQnB,EAAI,EAEhB,GAAKkB,EAAa9B,IAEjB,IADA+B,EAAS/B,EAAI+B,OACLnB,EAAImB,EAAQnB,IACnB,IAAgD,IAA3CgC,EAASzD,KAAMa,EAAKY,GAAKA,EAAGZ,EAAKY,IACrC,WAIF,IAAMA,KAAKZ,EACV,IAAgD,IAA3C4C,EAASzD,KAAMa,EAAKY,GAAKA,EAAGZ,EAAKY,IACrC,MAKH,OAAOZ,GAIRoF,UAAW,SAAUxG,EAAKyG,GACzB,IAAI7C,EAAM6C,GAAW,GAarB,OAXY,MAAPzG,IACCkD,EAAahD,OAAQF,IACzB6C,EAAOgB,MAAOD,EACE,iBAAR5D,EACP,CAAEA,GAAQA,GAGXU,EAAKH,KAAMqD,EAAK5D,IAIX4D,GAGR8C,QAAS,SAAUxC,EAAMlE,EAAKgC,GAC7B,OAAc,MAAPhC,GAAe,EAAIW,EAAQJ,KAAMP,EAAKkE,EAAMlC,IAKpD6B,MAAO,SAAUO,EAAOuC,GAKvB,IAJA,IAAIhC,GAAOgC,EAAOxD,OACjByB,EAAI,EACJ5C,EAAIoC,EAAMjB,OAEHyB,EAAID,EAAKC,IAChBR,EAAOpC,KAAQ2E,EAAQ/B,GAKxB,OAFAR,EAAMjB,OAASnB,EAERoC,GAGRI,KAAM,SAAUb,EAAOK,EAAU4C,GAShC,IARA,IACCC,EAAU,GACV7E,EAAI,EACJmB,EAASQ,EAAMR,OACf2D,GAAkBF,EAIX5E,EAAImB,EAAQnB,KACAgC,EAAUL,EAAO3B,GAAKA,KAChB8E,GACxBD,EAAQnG,KAAMiD,EAAO3B,IAIvB,OAAO6E,GAIR5C,IAAK,SAAUN,EAAOK,EAAU+C,GAC/B,IAAI5D,EAAQ6D,EACXhF,EAAI,EACJ4B,EAAM,GAGP,GAAKV,EAAaS,GAEjB,IADAR,EAASQ,EAAMR,OACPnB,EAAImB,EAAQnB,IAGL,OAFdgF,EAAQhD,EAAUL,EAAO3B,GAAKA,EAAG+E,KAGhCnD,EAAIlD,KAAMsG,QAMZ,IAAMhF,KAAK2B,EAGI,OAFdqD,EAAQhD,EAAUL,EAAO3B,GAAKA,EAAG+E,KAGhCnD,EAAIlD,KAAMsG,GAMb,OAAO3G,EAAMuD,IAIdqD,KAAM,EAIN/F,QAASA,IAGa,mBAAXgG,SACXrE,EAAOG,GAAIkE,OAAOC,UAAanH,EAAKkH,OAAOC,WAI5CtE,EAAOkB,KAAM,uEAAuEqD,MAAO,KAC3F,SAAUC,EAAInC,GACbtE,EAAY,WAAasE,EAAO,KAAQA,EAAKoC,gBAmB9C,IAAIC,EAWJ,SAAY1H,GACZ,IAAImC,EACHd,EACAsG,EACAC,EACAC,EACAC,EACAC,EACAC,EACAC,EACAC,EACAC,EAGAC,EACAvI,EACAwI,EACAC,EACAC,EACAC,EACAxB,EACAyB,EAGA1C,EAAU,SAAW,EAAI,IAAI2C,KAC7BC,EAAe3I,EAAOH,SACtB+I,EAAU,EACVC,EAAO,EACPC,EAAaC,KACbC,EAAaD,KACbE,EAAgBF,KAChBG,EAAyBH,KACzBI,EAAY,SAAUC,EAAGC,GAIxB,OAHKD,IAAMC,IACVlB,GAAe,GAET,GAIRlH,EAAS,GAAOC,eAChBf,EAAM,GACNmJ,EAAMnJ,EAAImJ,IACVC,EAAapJ,EAAIU,KACjBA,EAAOV,EAAIU,KACXN,EAAQJ,EAAII,MAIZO,EAAU,SAAU0I,EAAMnF,GAGzB,IAFA,IAAIlC,EAAI,EACP2C,EAAM0E,EAAKlG,OACJnB,EAAI2C,EAAK3C,IAChB,GAAKqH,EAAMrH,KAAQkC,EAClB,OAAOlC,EAGT,OAAQ,GAGTsH,EAAW,6HAMXC,EAAa,sBAGbC,EAAa,0BAA4BD,EACxC,0CAGDE,EAAa,MAAQF,EAAa,KAAOC,EAAa,OAASD,EAG9D,gBAAkBA,EAIlB,2DAA6DC,EAAa,OAC1ED,EAAa,OAEdG,EAAU,KAAOF,EAAa,wFAOAC,EAAa,eAO3CE,EAAc,IAAIC,OAAQL,EAAa,IAAK,KAC5CM,EAAQ,IAAID,OAAQ,IAAML,EAAa,8BACtCA,EAAa,KAAM,KAEpBO,EAAS,IAAIF,OAAQ,IAAML,EAAa,KAAOA,EAAa,KAC5DQ,EAAe,IAAIH,OAAQ,IAAML,EAAa,WAAaA,EAAa,IAAMA,EAC7E,KACDS,EAAW,IAAIJ,OAAQL,EAAa,MAEpCU,EAAU,IAAIL,OAAQF,GACtBQ,EAAc,IAAIN,OAAQ,IAAMJ,EAAa,KAE7CW,EAAY,CACXC,GAAM,IAAIR,OAAQ,MAAQJ,EAAa,KACvCa,MAAS,IAAIT,OAAQ,QAAUJ,EAAa,KAC5Cc,IAAO,IAAIV,OAAQ,KAAOJ,EAAa,SACvCe,KAAQ,IAAIX,OAAQ,IAAMH,GAC1Be,OAAU,IAAIZ,OAAQ,IAAMF,GAC5Be,MAAS,IAAIb,OAAQ,yDACpBL,EAAa,+BAAiCA,EAAa,cAC3DA,EAAa,aAAeA,EAAa,SAAU,KACpDmB,KAAQ,IAAId,OAAQ,OAASN,EAAW,KAAM,KAI9CqB,aAAgB,IAAIf,OAAQ,IAAML,EACjC,mDAAqDA,EACrD,mBAAqBA,EAAa,mBAAoB,MAGxDqB,EAAQ,SACRC,EAAU,sCACVC,EAAU,SAEVC,EAAU,yBAGVC,EAAa,mCAEbC,GAAW,OAIXC,GAAY,IAAItB,OAAQ,uBAAyBL,EAAa,uBAAwB,KACtF4B,GAAY,SAAUC,EAAQC,GAC7B,IAAIC,EAAO,KAAOF,EAAOhL,MAAO,GAAM,MAEtC,OAAOiL,IASNC,EAAO,EACNC,OAAOC,aAAcF,EAAO,OAC5BC,OAAOC,aAAcF,GAAQ,GAAK,MAAe,KAAPA,EAAe,SAK5DG,GAAa,sDACbC,GAAa,SAAUC,EAAIC,GAC1B,OAAKA,EAGQ,OAAPD,EACG,SAIDA,EAAGvL,MAAO,GAAI,GAAM,KAC1BuL,EAAGE,WAAYF,EAAGxI,OAAS,GAAItC,SAAU,IAAO,IAI3C,KAAO8K,GAOfG,GAAgB,WACf7D,KAGD8D,GAAqBC,GACpB,SAAU9H,GACT,OAAyB,IAAlBA,EAAK+H,UAAqD,aAAhC/H,EAAKgI,SAAS5E,eAEhD,CAAE6E,IAAK,aAAcC,KAAM,WAI7B,IACC1L,EAAKD,MACFT,EAAMI,EAAMG,KAAMiI,EAAa6D,YACjC7D,EAAa6D,YAMdrM,EAAKwI,EAAa6D,WAAWlJ,QAAS9B,SACrC,MAAQiL,GACT5L,EAAO,CAAED,MAAOT,EAAImD,OAGnB,SAAUmC,EAAQiH,GACjBnD,EAAW3I,MAAO6E,EAAQlF,EAAMG,KAAMgM,KAKvC,SAAUjH,EAAQiH,GACjB,IAAI3H,EAAIU,EAAOnC,OACdnB,EAAI,EAGL,MAAUsD,EAAQV,KAAQ2H,EAAKvK,MAC/BsD,EAAOnC,OAASyB,EAAI,IAKvB,SAAS2C,GAAQzE,EAAUC,EAAS0D,EAAS+F,GAC5C,IAAIC,EAAGzK,EAAGkC,EAAMwI,EAAKC,EAAOC,EAAQC,EACnCC,EAAa/J,GAAWA,EAAQgK,cAGhC1L,EAAW0B,EAAUA,EAAQ1B,SAAW,EAKzC,GAHAoF,EAAUA,GAAW,GAGI,iBAAb3D,IAA0BA,GACxB,IAAbzB,GAA+B,IAAbA,GAA+B,KAAbA,EAEpC,OAAOoF,EAIR,IAAM+F,IACLvE,EAAalF,GACbA,EAAUA,GAAWrD,EAEhByI,GAAiB,CAIrB,GAAkB,KAAb9G,IAAqBsL,EAAQ3B,EAAWgC,KAAMlK,IAGlD,GAAO2J,EAAIE,EAAO,IAGjB,GAAkB,IAAbtL,EAAiB,CACrB,KAAO6C,EAAOnB,EAAQkK,eAAgBR,IAUrC,OAAOhG,EALP,GAAKvC,EAAKgJ,KAAOT,EAEhB,OADAhG,EAAQ/F,KAAMwD,GACPuC,OAYT,GAAKqG,IAAgB5I,EAAO4I,EAAWG,eAAgBR,KACtDnE,EAAUvF,EAASmB,IACnBA,EAAKgJ,KAAOT,EAGZ,OADAhG,EAAQ/F,KAAMwD,GACPuC,MAKH,CAAA,GAAKkG,EAAO,GAElB,OADAjM,EAAKD,MAAOgG,EAAS1D,EAAQoK,qBAAsBrK,IAC5C2D,EAGD,IAAOgG,EAAIE,EAAO,KAASzL,EAAQkM,wBACzCrK,EAAQqK,uBAGR,OADA1M,EAAKD,MAAOgG,EAAS1D,EAAQqK,uBAAwBX,IAC9ChG,EAKT,GAAKvF,EAAQmM,MACXtE,EAAwBjG,EAAW,QACjCsF,IAAcA,EAAUkF,KAAMxK,MAIlB,IAAbzB,GAAqD,WAAnC0B,EAAQmJ,SAAS5E,eAA+B,CAYpE,GAVAuF,EAAc/J,EACdgK,EAAa/J,EASK,IAAb1B,IACF2I,EAASsD,KAAMxK,IAAciH,EAAauD,KAAMxK,IAAe,EAGjEgK,EAAa7B,GAASqC,KAAMxK,IAAcyK,GAAaxK,EAAQN,aAC9DM,KAImBA,GAAY7B,EAAQsM,SAGhCd,EAAM3J,EAAQV,aAAc,OAClCqK,EAAMA,EAAI3G,QAAS0F,GAAYC,IAE/B3I,EAAQT,aAAc,KAAQoK,EAAM9G,IAMtC5D,GADA4K,EAASjF,EAAU7E,IACRK,OACX,MAAQnB,IACP4K,EAAQ5K,IAAQ0K,EAAM,IAAMA,EAAM,UAAa,IAC9Ce,GAAYb,EAAQ5K,IAEtB6K,EAAcD,EAAOc,KAAM,KAG5B,IAIC,OAHAhN,EAAKD,MAAOgG,EACXqG,EAAWa,iBAAkBd,IAEvBpG,EACN,MAAQmH,GACT7E,EAAwBjG,GAAU,GACjC,QACI4J,IAAQ9G,GACZ7C,EAAQ8K,gBAAiB,QAQ9B,OAAOhG,EAAQ/E,EAASiD,QAAS8D,EAAO,MAAQ9G,EAAS0D,EAAS+F,GASnE,SAAS5D,KACR,IAAIkF,EAAO,GAYX,OAVA,SAASC,EAAOC,EAAKhH,GAQpB,OALK8G,EAAKpN,KAAMsN,EAAM,KAAQxG,EAAKyG,oBAG3BF,EAAOD,EAAKI,SAEXH,EAAOC,EAAM,KAAQhH,GAShC,SAASmH,GAAcnL,GAEtB,OADAA,EAAI4C,IAAY,EACT5C,EAOR,SAASoL,GAAQpL,GAChB,IAAIqL,EAAK3O,EAASyC,cAAe,YAEjC,IACC,QAASa,EAAIqL,GACZ,MAAQ/B,GACT,OAAO,EACN,QAGI+B,EAAG5L,YACP4L,EAAG5L,WAAWC,YAAa2L,GAI5BA,EAAK,MASP,SAASC,GAAWC,EAAOC,GAC1B,IAAIxO,EAAMuO,EAAMnH,MAAO,KACtBpF,EAAIhC,EAAImD,OAET,MAAQnB,IACPwF,EAAKiH,WAAYzO,EAAKgC,IAAQwM,EAUhC,SAASE,GAAczF,EAAGC,GACzB,IAAIyF,EAAMzF,GAAKD,EACd2F,EAAOD,GAAsB,IAAf1F,EAAE5H,UAAiC,IAAf6H,EAAE7H,UACnC4H,EAAE4F,YAAc3F,EAAE2F,YAGpB,GAAKD,EACJ,OAAOA,EAIR,GAAKD,EACJ,MAAUA,EAAMA,EAAIG,YACnB,GAAKH,IAAQzF,EACZ,OAAQ,EAKX,OAAOD,EAAI,GAAK,EAOjB,SAAS8F,GAAmBvN,GAC3B,OAAO,SAAU0C,GAEhB,MAAgB,UADLA,EAAKgI,SAAS5E,eACEpD,EAAK1C,OAASA,GAQ3C,SAASwN,GAAoBxN,GAC5B,OAAO,SAAU0C,GAChB,IAAIgB,EAAOhB,EAAKgI,SAAS5E,cACzB,OAAkB,UAATpC,GAA6B,WAATA,IAAuBhB,EAAK1C,OAASA,GAQpE,SAASyN,GAAsBhD,GAG9B,OAAO,SAAU/H,GAKhB,MAAK,SAAUA,EASTA,EAAKzB,aAAgC,IAAlByB,EAAK+H,SAGvB,UAAW/H,EACV,UAAWA,EAAKzB,WACbyB,EAAKzB,WAAWwJ,WAAaA,EAE7B/H,EAAK+H,WAAaA,EAMpB/H,EAAKgL,aAAejD,GAI1B/H,EAAKgL,cAAgBjD,GACrBF,GAAoB7H,KAAW+H,EAG1B/H,EAAK+H,WAAaA,EAKd,UAAW/H,GACfA,EAAK+H,WAAaA,GAY5B,SAASkD,GAAwBnM,GAChC,OAAOmL,GAAc,SAAUiB,GAE9B,OADAA,GAAYA,EACLjB,GAAc,SAAU3B,EAAM3F,GACpC,IAAIjC,EACHyK,EAAerM,EAAI,GAAIwJ,EAAKrJ,OAAQiM,GACpCpN,EAAIqN,EAAalM,OAGlB,MAAQnB,IACFwK,EAAQ5H,EAAIyK,EAAcrN,MAC9BwK,EAAM5H,KAASiC,EAASjC,GAAM4H,EAAM5H,SAYzC,SAAS2I,GAAaxK,GACrB,OAAOA,GAAmD,oBAAjCA,EAAQoK,sBAAwCpK,EAkrC1E,IAAMf,KA9qCNd,EAAUqG,GAAOrG,QAAU,GAO3BwG,EAAQH,GAAOG,MAAQ,SAAUxD,GAChC,IAAIoL,EAAYpL,EAAKqL,aACpBrH,GAAYhE,EAAK6I,eAAiB7I,GAAOsL,gBAK1C,OAAQ5E,EAAM0C,KAAMgC,GAAapH,GAAWA,EAAQgE,UAAY,SAQjEjE,EAAcV,GAAOU,YAAc,SAAUnG,GAC5C,IAAI2N,EAAYC,EACf3N,EAAMD,EAAOA,EAAKiL,eAAiBjL,EAAO0G,EAO3C,OAAKzG,GAAOrC,GAA6B,IAAjBqC,EAAIV,UAAmBU,EAAIyN,kBAMnDtH,GADAxI,EAAWqC,GACQyN,gBACnBrH,GAAkBT,EAAOhI,GAQpB8I,GAAgB9I,IAClBgQ,EAAYhQ,EAASiQ,cAAiBD,EAAUE,MAAQF,IAGrDA,EAAUG,iBACdH,EAAUG,iBAAkB,SAAU/D,IAAe,GAG1C4D,EAAUI,aACrBJ,EAAUI,YAAa,WAAYhE,KASrC5K,EAAQsM,MAAQY,GAAQ,SAAUC,GAEjC,OADAnG,EAAQ1F,YAAa6L,GAAK7L,YAAa9C,EAASyC,cAAe,QACzB,oBAAxBkM,EAAGV,mBACfU,EAAGV,iBAAkB,uBAAwBxK,SAShDjC,EAAQuI,WAAa2E,GAAQ,SAAUC,GAEtC,OADAA,EAAG0B,UAAY,KACP1B,EAAGhM,aAAc,eAO1BnB,EAAQiM,qBAAuBiB,GAAQ,SAAUC,GAEhD,OADAA,EAAG7L,YAAa9C,EAASsQ,cAAe,MAChC3B,EAAGlB,qBAAsB,KAAMhK,SAIxCjC,EAAQkM,uBAAyBrC,EAAQuC,KAAM5N,EAAS0N,wBAMxDlM,EAAQ+O,QAAU7B,GAAQ,SAAUC,GAEnC,OADAnG,EAAQ1F,YAAa6L,GAAKnB,GAAKtH,GACvBlG,EAASwQ,oBAAsBxQ,EAASwQ,kBAAmBtK,GAAUzC,SAIzEjC,EAAQ+O,SACZzI,EAAK2I,OAAa,GAAI,SAAUjD,GAC/B,IAAIkD,EAASlD,EAAGnH,QAASmF,GAAWC,IACpC,OAAO,SAAUjH,GAChB,OAAOA,EAAK7B,aAAc,QAAW+N,IAGvC5I,EAAK6I,KAAW,GAAI,SAAUnD,EAAInK,GACjC,GAAuC,oBAA3BA,EAAQkK,gBAAkC9E,EAAiB,CACtE,IAAIjE,EAAOnB,EAAQkK,eAAgBC,GACnC,OAAOhJ,EAAO,CAAEA,GAAS,OAI3BsD,EAAK2I,OAAa,GAAK,SAAUjD,GAChC,IAAIkD,EAASlD,EAAGnH,QAASmF,GAAWC,IACpC,OAAO,SAAUjH,GAChB,IAAIpC,EAAwC,oBAA1BoC,EAAKoM,kBACtBpM,EAAKoM,iBAAkB,MACxB,OAAOxO,GAAQA,EAAKkF,QAAUoJ,IAMhC5I,EAAK6I,KAAW,GAAI,SAAUnD,EAAInK,GACjC,GAAuC,oBAA3BA,EAAQkK,gBAAkC9E,EAAiB,CACtE,IAAIrG,EAAME,EAAG2B,EACZO,EAAOnB,EAAQkK,eAAgBC,GAEhC,GAAKhJ,EAAO,CAIX,IADApC,EAAOoC,EAAKoM,iBAAkB,QACjBxO,EAAKkF,QAAUkG,EAC3B,MAAO,CAAEhJ,GAIVP,EAAQZ,EAAQmN,kBAAmBhD,GACnClL,EAAI,EACJ,MAAUkC,EAAOP,EAAO3B,KAEvB,IADAF,EAAOoC,EAAKoM,iBAAkB,QACjBxO,EAAKkF,QAAUkG,EAC3B,MAAO,CAAEhJ,GAKZ,MAAO,MAMVsD,EAAK6I,KAAY,IAAInP,EAAQiM,qBAC5B,SAAUoD,EAAKxN,GACd,MAA6C,oBAAjCA,EAAQoK,qBACZpK,EAAQoK,qBAAsBoD,GAG1BrP,EAAQmM,IACZtK,EAAQ4K,iBAAkB4C,QAD3B,GAKR,SAAUA,EAAKxN,GACd,IAAImB,EACHsM,EAAM,GACNxO,EAAI,EAGJyE,EAAU1D,EAAQoK,qBAAsBoD,GAGzC,GAAa,MAARA,EAAc,CAClB,MAAUrM,EAAOuC,EAASzE,KACF,IAAlBkC,EAAK7C,UACTmP,EAAI9P,KAAMwD,GAIZ,OAAOsM,EAER,OAAO/J,GAITe,EAAK6I,KAAc,MAAInP,EAAQkM,wBAA0B,SAAU2C,EAAWhN,GAC7E,GAA+C,oBAAnCA,EAAQqK,wBAA0CjF,EAC7D,OAAOpF,EAAQqK,uBAAwB2C,IAUzC1H,EAAgB,GAOhBD,EAAY,IAELlH,EAAQmM,IAAMtC,EAAQuC,KAAM5N,EAASiO,qBAI3CS,GAAQ,SAAUC,GAEjB,IAAIoC,EAOJvI,EAAQ1F,YAAa6L,GAAKqC,UAAY,UAAY9K,EAAU,qBAC1CA,EAAU,kEAOvByI,EAAGV,iBAAkB,wBAAyBxK,QAClDiF,EAAU1H,KAAM,SAAW6I,EAAa,gBAKnC8E,EAAGV,iBAAkB,cAAexK,QACzCiF,EAAU1H,KAAM,MAAQ6I,EAAa,aAAeD,EAAW,KAI1D+E,EAAGV,iBAAkB,QAAU/H,EAAU,MAAOzC,QACrDiF,EAAU1H,KAAM,OAQjB+P,EAAQ/Q,EAASyC,cAAe,UAC1BG,aAAc,OAAQ,IAC5B+L,EAAG7L,YAAaiO,GACVpC,EAAGV,iBAAkB,aAAcxK,QACxCiF,EAAU1H,KAAM,MAAQ6I,EAAa,QAAUA,EAAa,KAC3DA,EAAa,gBAMT8E,EAAGV,iBAAkB,YAAaxK,QACvCiF,EAAU1H,KAAM,YAMX2N,EAAGV,iBAAkB,KAAO/H,EAAU,MAAOzC,QAClDiF,EAAU1H,KAAM,YAKjB2N,EAAGV,iBAAkB,QACrBvF,EAAU1H,KAAM,iBAGjB0N,GAAQ,SAAUC,GACjBA,EAAGqC,UAAY,oFAKf,IAAID,EAAQ/Q,EAASyC,cAAe,SACpCsO,EAAMnO,aAAc,OAAQ,UAC5B+L,EAAG7L,YAAaiO,GAAQnO,aAAc,OAAQ,KAIzC+L,EAAGV,iBAAkB,YAAaxK,QACtCiF,EAAU1H,KAAM,OAAS6I,EAAa,eAKW,IAA7C8E,EAAGV,iBAAkB,YAAaxK,QACtCiF,EAAU1H,KAAM,WAAY,aAK7BwH,EAAQ1F,YAAa6L,GAAKpC,UAAW,EACc,IAA9CoC,EAAGV,iBAAkB,aAAcxK,QACvCiF,EAAU1H,KAAM,WAAY,aAK7B2N,EAAGV,iBAAkB,QACrBvF,EAAU1H,KAAM,YAIXQ,EAAQyP,gBAAkB5F,EAAQuC,KAAQzG,EAAUqB,EAAQrB,SAClEqB,EAAQ0I,uBACR1I,EAAQ2I,oBACR3I,EAAQ4I,kBACR5I,EAAQ6I,qBAER3C,GAAQ,SAAUC,GAIjBnN,EAAQ8P,kBAAoBnK,EAAQtG,KAAM8N,EAAI,KAI9CxH,EAAQtG,KAAM8N,EAAI,aAClBhG,EAAc3H,KAAM,KAAMgJ,KAI5BtB,EAAYA,EAAUjF,QAAU,IAAIyG,OAAQxB,EAAUsF,KAAM,MAC5DrF,EAAgBA,EAAclF,QAAU,IAAIyG,OAAQvB,EAAcqF,KAAM,MAIxE+B,EAAa1E,EAAQuC,KAAMpF,EAAQ+I,yBAKnC3I,EAAWmH,GAAc1E,EAAQuC,KAAMpF,EAAQI,UAC9C,SAAUW,EAAGC,GACZ,IAAIgI,EAAuB,IAAfjI,EAAE5H,SAAiB4H,EAAEuG,gBAAkBvG,EAClDkI,EAAMjI,GAAKA,EAAEzG,WACd,OAAOwG,IAAMkI,MAAWA,GAAwB,IAAjBA,EAAI9P,YAClC6P,EAAM5I,SACL4I,EAAM5I,SAAU6I,GAChBlI,EAAEgI,yBAA8D,GAAnChI,EAAEgI,wBAAyBE,MAG3D,SAAUlI,EAAGC,GACZ,GAAKA,EACJ,MAAUA,EAAIA,EAAEzG,WACf,GAAKyG,IAAMD,EACV,OAAO,EAIV,OAAO,GAOTD,EAAYyG,EACZ,SAAUxG,EAAGC,GAGZ,GAAKD,IAAMC,EAEV,OADAlB,GAAe,EACR,EAIR,IAAIoJ,GAAWnI,EAAEgI,yBAA2B/H,EAAE+H,wBAC9C,OAAKG,IAgBU,GAPfA,GAAYnI,EAAE8D,eAAiB9D,KAASC,EAAE6D,eAAiB7D,GAC1DD,EAAEgI,wBAAyB/H,GAG3B,KAIGhI,EAAQmQ,cAAgBnI,EAAE+H,wBAAyBhI,KAAQmI,EAOzDnI,GAAKvJ,GAAYuJ,EAAE8D,eAAiBvE,GACxCF,EAAUE,EAAcS,IAChB,EAOJC,GAAKxJ,GAAYwJ,EAAE6D,eAAiBvE,GACxCF,EAAUE,EAAcU,GACjB,EAIDnB,EACJpH,EAASoH,EAAWkB,GAAMtI,EAASoH,EAAWmB,GAChD,EAGe,EAAVkI,GAAe,EAAI,IAE3B,SAAUnI,EAAGC,GAGZ,GAAKD,IAAMC,EAEV,OADAlB,GAAe,EACR,EAGR,IAAI2G,EACH3M,EAAI,EACJsP,EAAMrI,EAAExG,WACR0O,EAAMjI,EAAEzG,WACR8O,EAAK,CAAEtI,GACPuI,EAAK,CAAEtI,GAGR,IAAMoI,IAAQH,EAMb,OAAOlI,GAAKvJ,GAAY,EACvBwJ,GAAKxJ,EAAW,EAEhB4R,GAAO,EACPH,EAAM,EACNpJ,EACEpH,EAASoH,EAAWkB,GAAMtI,EAASoH,EAAWmB,GAChD,EAGK,GAAKoI,IAAQH,EACnB,OAAOzC,GAAczF,EAAGC,GAIzByF,EAAM1F,EACN,MAAU0F,EAAMA,EAAIlM,WACnB8O,EAAGE,QAAS9C,GAEbA,EAAMzF,EACN,MAAUyF,EAAMA,EAAIlM,WACnB+O,EAAGC,QAAS9C,GAIb,MAAQ4C,EAAIvP,KAAQwP,EAAIxP,GACvBA,IAGD,OAAOA,EAGN0M,GAAc6C,EAAIvP,GAAKwP,EAAIxP,IAO3BuP,EAAIvP,IAAOwG,GAAgB,EAC3BgJ,EAAIxP,IAAOwG,EAAe,EAE1B,IAGK9I,GAGR6H,GAAOV,QAAU,SAAU6K,EAAMC,GAChC,OAAOpK,GAAQmK,EAAM,KAAM,KAAMC,IAGlCpK,GAAOoJ,gBAAkB,SAAUzM,EAAMwN,GAGxC,GAFAzJ,EAAa/D,GAERhD,EAAQyP,iBAAmBxI,IAC9BY,EAAwB2I,EAAO,QAC7BrJ,IAAkBA,EAAciF,KAAMoE,OACtCtJ,IAAkBA,EAAUkF,KAAMoE,IAErC,IACC,IAAI9N,EAAMiD,EAAQtG,KAAM2D,EAAMwN,GAG9B,GAAK9N,GAAO1C,EAAQ8P,mBAInB9M,EAAKxE,UAAuC,KAA3BwE,EAAKxE,SAAS2B,SAC/B,OAAOuC,EAEP,MAAQ0I,GACTvD,EAAwB2I,GAAM,GAIhC,OAAyD,EAAlDnK,GAAQmK,EAAMhS,EAAU,KAAM,CAAEwE,IAASf,QAGjDoE,GAAOe,SAAW,SAAUvF,EAASmB,GAUpC,OAHOnB,EAAQgK,eAAiBhK,IAAarD,GAC5CuI,EAAalF,GAEPuF,EAAUvF,EAASmB,IAG3BqD,GAAOqK,KAAO,SAAU1N,EAAMgB,IAOtBhB,EAAK6I,eAAiB7I,IAAUxE,GACtCuI,EAAa/D,GAGd,IAAIlB,EAAKwE,EAAKiH,WAAYvJ,EAAKoC,eAG9BrF,EAAMe,GAAMlC,EAAOP,KAAMiH,EAAKiH,WAAYvJ,EAAKoC,eAC9CtE,EAAIkB,EAAMgB,GAAOiD,QACjBxC,EAEF,YAAeA,IAAR1D,EACNA,EACAf,EAAQuI,aAAetB,EACtBjE,EAAK7B,aAAc6C,IACjBjD,EAAMiC,EAAKoM,iBAAkBpL,KAAYjD,EAAI4P,UAC9C5P,EAAI+E,MACJ,MAGJO,GAAO6D,OAAS,SAAU0G,GACzB,OAASA,EAAM,IAAK/L,QAAS0F,GAAYC,KAG1CnE,GAAOtB,MAAQ,SAAUC,GACxB,MAAM,IAAItG,MAAO,0CAA4CsG,IAO9DqB,GAAOwK,WAAa,SAAUtL,GAC7B,IAAIvC,EACH8N,EAAa,GACbpN,EAAI,EACJ5C,EAAI,EAOL,GAJAgG,GAAgB9G,EAAQ+Q,iBACxBlK,GAAa7G,EAAQgR,YAAczL,EAAQrG,MAAO,GAClDqG,EAAQ3B,KAAMkE,GAEThB,EAAe,CACnB,MAAU9D,EAAOuC,EAASzE,KACpBkC,IAASuC,EAASzE,KACtB4C,EAAIoN,EAAWtR,KAAMsB,IAGvB,MAAQ4C,IACP6B,EAAQ1B,OAAQiN,EAAYpN,GAAK,GAQnC,OAFAmD,EAAY,KAELtB,GAORgB,EAAUF,GAAOE,QAAU,SAAUvD,GACpC,IAAIpC,EACH8B,EAAM,GACN5B,EAAI,EACJX,EAAW6C,EAAK7C,SAEjB,GAAMA,GAQC,GAAkB,IAAbA,GAA+B,IAAbA,GAA+B,KAAbA,EAAkB,CAIjE,GAAiC,iBAArB6C,EAAKiO,YAChB,OAAOjO,EAAKiO,YAIZ,IAAMjO,EAAOA,EAAKkO,WAAYlO,EAAMA,EAAOA,EAAK4K,YAC/ClL,GAAO6D,EAASvD,QAGZ,GAAkB,IAAb7C,GAA+B,IAAbA,EAC7B,OAAO6C,EAAKmO,eAnBZ,MAAUvQ,EAAOoC,EAAMlC,KAGtB4B,GAAO6D,EAAS3F,GAqBlB,OAAO8B,IAGR4D,EAAOD,GAAO+K,UAAY,CAGzBrE,YAAa,GAEbsE,aAAcpE,GAEdxB,MAAOxC,EAEPsE,WAAY,GAEZ4B,KAAM,GAENmC,SAAU,CACTC,IAAK,CAAEtG,IAAK,aAAc/H,OAAO,GACjCsO,IAAK,CAAEvG,IAAK,cACZwG,IAAK,CAAExG,IAAK,kBAAmB/H,OAAO,GACtCwO,IAAK,CAAEzG,IAAK,oBAGb0G,UAAW,CACVtI,KAAQ,SAAUoC,GAWjB,OAVAA,EAAO,GAAMA,EAAO,GAAI5G,QAASmF,GAAWC,IAG5CwB,EAAO,IAAQA,EAAO,IAAOA,EAAO,IACnCA,EAAO,IAAO,IAAK5G,QAASmF,GAAWC,IAEpB,OAAfwB,EAAO,KACXA,EAAO,GAAM,IAAMA,EAAO,GAAM,KAG1BA,EAAMvM,MAAO,EAAG,IAGxBqK,MAAS,SAAUkC,GAiClB,OArBAA,EAAO,GAAMA,EAAO,GAAIrF,cAEU,QAA7BqF,EAAO,GAAIvM,MAAO,EAAG,IAGnBuM,EAAO,IACZpF,GAAOtB,MAAO0G,EAAO,IAKtBA,EAAO,KAASA,EAAO,GACtBA,EAAO,IAAQA,EAAO,IAAO,GAC7B,GAAqB,SAAfA,EAAO,IAAiC,QAAfA,EAAO,KACvCA,EAAO,KAAWA,EAAO,GAAMA,EAAO,IAAwB,QAAfA,EAAO,KAG3CA,EAAO,IAClBpF,GAAOtB,MAAO0G,EAAO,IAGfA,GAGRnC,OAAU,SAAUmC,GACnB,IAAImG,EACHC,GAAYpG,EAAO,IAAOA,EAAO,GAElC,OAAKxC,EAAmB,MAAEmD,KAAMX,EAAO,IAC/B,MAIHA,EAAO,GACXA,EAAO,GAAMA,EAAO,IAAOA,EAAO,IAAO,GAG9BoG,GAAY9I,EAAQqD,KAAMyF,KAGnCD,EAASnL,EAAUoL,GAAU,MAG7BD,EAASC,EAASpS,QAAS,IAAKoS,EAAS5P,OAAS2P,GAAWC,EAAS5P,UAGxEwJ,EAAO,GAAMA,EAAO,GAAIvM,MAAO,EAAG0S,GAClCnG,EAAO,GAAMoG,EAAS3S,MAAO,EAAG0S,IAI1BnG,EAAMvM,MAAO,EAAG,MAIzB+P,OAAQ,CAEP7F,IAAO,SAAU0I,GAChB,IAAI9G,EAAW8G,EAAiBjN,QAASmF,GAAWC,IAAY7D,cAChE,MAA4B,MAArB0L,EACN,WACC,OAAO,GAER,SAAU9O,GACT,OAAOA,EAAKgI,UAAYhI,EAAKgI,SAAS5E,gBAAkB4E,IAI3D7B,MAAS,SAAU0F,GAClB,IAAIkD,EAAUtK,EAAYoH,EAAY,KAEtC,OAAOkD,IACJA,EAAU,IAAIrJ,OAAQ,MAAQL,EAC/B,IAAMwG,EAAY,IAAMxG,EAAa,SAAaZ,EACjDoH,EAAW,SAAU7L,GACpB,OAAO+O,EAAQ3F,KACY,iBAAnBpJ,EAAK6L,WAA0B7L,EAAK6L,WACd,oBAAtB7L,EAAK7B,cACX6B,EAAK7B,aAAc,UACpB,OAKNkI,KAAQ,SAAUrF,EAAMgO,EAAUC,GACjC,OAAO,SAAUjP,GAChB,IAAIkP,EAAS7L,GAAOqK,KAAM1N,EAAMgB,GAEhC,OAAe,MAAVkO,EACgB,OAAbF,GAEFA,IAINE,GAAU,GAIU,MAAbF,EAAmBE,IAAWD,EACvB,OAAbD,EAAoBE,IAAWD,EAClB,OAAbD,EAAoBC,GAAqC,IAA5BC,EAAOzS,QAASwS,GAChC,OAAbD,EAAoBC,IAAoC,EAA3BC,EAAOzS,QAASwS,GAChC,OAAbD,EAAoBC,GAASC,EAAOhT,OAAQ+S,EAAMhQ,UAAagQ,EAClD,OAAbD,GAA2F,GAArE,IAAME,EAAOrN,QAAS4D,EAAa,KAAQ,KAAMhJ,QAASwS,GACnE,OAAbD,IAAoBE,IAAWD,GAASC,EAAOhT,MAAO,EAAG+S,EAAMhQ,OAAS,KAAQgQ,EAAQ,QAO3F1I,MAAS,SAAUjJ,EAAM6R,EAAMC,EAAWlP,EAAOE,GAChD,IAAIiP,EAAgC,QAAvB/R,EAAKpB,MAAO,EAAG,GAC3BoT,EAA+B,SAArBhS,EAAKpB,OAAQ,GACvBqT,EAAkB,YAATJ,EAEV,OAAiB,IAAVjP,GAAwB,IAATE,EAGrB,SAAUJ,GACT,QAASA,EAAKzB,YAGf,SAAUyB,EAAMwP,EAAUC,GACzB,IAAI5F,EAAO6F,EAAaC,EAAY/R,EAAMgS,EAAWC,EACpD5H,EAAMoH,IAAWC,EAAU,cAAgB,kBAC3CQ,EAAS9P,EAAKzB,WACdyC,EAAOuO,GAAUvP,EAAKgI,SAAS5E,cAC/B2M,GAAYN,IAAQF,EACpB7E,GAAO,EAER,GAAKoF,EAAS,CAGb,GAAKT,EAAS,CACb,MAAQpH,EAAM,CACbrK,EAAOoC,EACP,MAAUpC,EAAOA,EAAMqK,GACtB,GAAKsH,EACJ3R,EAAKoK,SAAS5E,gBAAkBpC,EACd,IAAlBpD,EAAKT,SAEL,OAAO,EAKT0S,EAAQ5H,EAAe,SAAT3K,IAAoBuS,GAAS,cAE5C,OAAO,EAMR,GAHAA,EAAQ,CAAEP,EAAUQ,EAAO5B,WAAa4B,EAAOE,WAG1CV,GAAWS,EAAW,CAe1BrF,GADAkF,GADA/F,GAHA6F,GAJAC,GADA/R,EAAOkS,GACYpO,KAAe9D,EAAM8D,GAAY,KAI1B9D,EAAKqS,YAC5BN,EAAY/R,EAAKqS,UAAa,KAEZ3S,IAAU,IACZ,KAAQiH,GAAWsF,EAAO,KACzBA,EAAO,GAC3BjM,EAAOgS,GAAaE,EAAO3H,WAAYyH,GAEvC,MAAUhS,IAASgS,GAAahS,GAAQA,EAAMqK,KAG3CyC,EAAOkF,EAAY,IAAOC,EAAM5K,MAGlC,GAAuB,IAAlBrH,EAAKT,YAAoBuN,GAAQ9M,IAASoC,EAAO,CACrD0P,EAAapS,GAAS,CAAEiH,EAASqL,EAAWlF,GAC5C,YAyBF,GAlBKqF,IAaJrF,EADAkF,GADA/F,GAHA6F,GAJAC,GADA/R,EAAOoC,GACY0B,KAAe9D,EAAM8D,GAAY,KAI1B9D,EAAKqS,YAC5BN,EAAY/R,EAAKqS,UAAa,KAEZ3S,IAAU,IACZ,KAAQiH,GAAWsF,EAAO,KAMhC,IAATa,EAGJ,MAAU9M,IAASgS,GAAahS,GAAQA,EAAMqK,KAC3CyC,EAAOkF,EAAY,IAAOC,EAAM5K,MAElC,IAAOsK,EACN3R,EAAKoK,SAAS5E,gBAAkBpC,EACd,IAAlBpD,EAAKT,aACHuN,IAGGqF,KAMJL,GALAC,EAAa/R,EAAM8D,KAChB9D,EAAM8D,GAAY,KAIK9D,EAAKqS,YAC5BN,EAAY/R,EAAKqS,UAAa,KAEpB3S,GAAS,CAAEiH,EAASmG,IAG7B9M,IAASoC,GACb,MASL,OADA0K,GAAQtK,KACQF,GAAWwK,EAAOxK,GAAU,GAAqB,GAAhBwK,EAAOxK,KAK5DoG,OAAU,SAAU4J,EAAQhF,GAM3B,IAAIiF,EACHrR,EAAKwE,EAAKkC,QAAS0K,IAAY5M,EAAK8M,WAAYF,EAAO9M,gBACtDC,GAAOtB,MAAO,uBAAyBmO,GAKzC,OAAKpR,EAAI4C,GACD5C,EAAIoM,GAIK,EAAZpM,EAAGG,QACPkR,EAAO,CAAED,EAAQA,EAAQ,GAAIhF,GACtB5H,EAAK8M,WAAWvT,eAAgBqT,EAAO9M,eAC7C6G,GAAc,SAAU3B,EAAM3F,GAC7B,IAAI0N,EACHC,EAAUxR,EAAIwJ,EAAM4C,GACpBpN,EAAIwS,EAAQrR,OACb,MAAQnB,IAEPwK,EADA+H,EAAM5T,EAAS6L,EAAMgI,EAASxS,OACb6E,EAAS0N,GAAQC,EAASxS,MAG7C,SAAUkC,GACT,OAAOlB,EAAIkB,EAAM,EAAGmQ,KAIhBrR,IAIT0G,QAAS,CAGR+K,IAAOtG,GAAc,SAAUrL,GAK9B,IAAI2N,EAAQ,GACXhK,EAAU,GACViO,EAAU9M,EAAS9E,EAASiD,QAAS8D,EAAO,OAE7C,OAAO6K,EAAS9O,GACfuI,GAAc,SAAU3B,EAAM3F,EAAS6M,EAAUC,GAChD,IAAIzP,EACHyQ,EAAYD,EAASlI,EAAM,KAAMmH,EAAK,IACtC3R,EAAIwK,EAAKrJ,OAGV,MAAQnB,KACAkC,EAAOyQ,EAAW3S,MACxBwK,EAAMxK,KAAS6E,EAAS7E,GAAMkC,MAIjC,SAAUA,EAAMwP,EAAUC,GAMzB,OALAlD,EAAO,GAAMvM,EACbwQ,EAASjE,EAAO,KAAMkD,EAAKlN,GAG3BgK,EAAO,GAAM,MACLhK,EAAQ0C,SAInByL,IAAOzG,GAAc,SAAUrL,GAC9B,OAAO,SAAUoB,GAChB,OAAyC,EAAlCqD,GAAQzE,EAAUoB,GAAOf,UAIlCmF,SAAY6F,GAAc,SAAU/L,GAEnC,OADAA,EAAOA,EAAK2D,QAASmF,GAAWC,IACzB,SAAUjH,GAChB,OAAkE,GAAzDA,EAAKiO,aAAe1K,EAASvD,IAASvD,QAASyB,MAW1DyS,KAAQ1G,GAAc,SAAU0G,GAO/B,OAJM3K,EAAYoD,KAAMuH,GAAQ,KAC/BtN,GAAOtB,MAAO,qBAAuB4O,GAEtCA,EAAOA,EAAK9O,QAASmF,GAAWC,IAAY7D,cACrC,SAAUpD,GAChB,IAAI4Q,EACJ,GACC,GAAOA,EAAW3M,EACjBjE,EAAK2Q,KACL3Q,EAAK7B,aAAc,aAAgB6B,EAAK7B,aAAc,QAGtD,OADAyS,EAAWA,EAASxN,iBACAuN,GAA2C,IAAnCC,EAASnU,QAASkU,EAAO,YAE3C3Q,EAAOA,EAAKzB,aAAkC,IAAlByB,EAAK7C,UAC7C,OAAO,KAKTiE,OAAU,SAAUpB,GACnB,IAAI6Q,EAAOlV,EAAOmV,UAAYnV,EAAOmV,SAASD,KAC9C,OAAOA,GAAQA,EAAK3U,MAAO,KAAQ8D,EAAKgJ,IAGzC+H,KAAQ,SAAU/Q,GACjB,OAAOA,IAASgE,GAGjBgN,MAAS,SAAUhR,GAClB,OAAOA,IAASxE,EAASyV,iBACrBzV,EAAS0V,UAAY1V,EAAS0V,gBAC7BlR,EAAK1C,MAAQ0C,EAAKmR,OAASnR,EAAKoR,WAItCC,QAAWtG,IAAsB,GACjChD,SAAYgD,IAAsB,GAElCuG,QAAW,SAAUtR,GAIpB,IAAIgI,EAAWhI,EAAKgI,SAAS5E,cAC7B,MAAsB,UAAb4E,KAA0BhI,EAAKsR,SACxB,WAAbtJ,KAA2BhI,EAAKuR,UAGpCA,SAAY,SAAUvR,GASrB,OALKA,EAAKzB,YAETyB,EAAKzB,WAAWiT,eAGQ,IAAlBxR,EAAKuR,UAIbE,MAAS,SAAUzR,GAMlB,IAAMA,EAAOA,EAAKkO,WAAYlO,EAAMA,EAAOA,EAAK4K,YAC/C,GAAK5K,EAAK7C,SAAW,EACpB,OAAO,EAGT,OAAO,GAGR2S,OAAU,SAAU9P,GACnB,OAAQsD,EAAKkC,QAAiB,MAAGxF,IAIlC0R,OAAU,SAAU1R,GACnB,OAAO4G,EAAQwC,KAAMpJ,EAAKgI,WAG3BuE,MAAS,SAAUvM,GAClB,OAAO2G,EAAQyC,KAAMpJ,EAAKgI,WAG3B2J,OAAU,SAAU3R,GACnB,IAAIgB,EAAOhB,EAAKgI,SAAS5E,cACzB,MAAgB,UAATpC,GAAkC,WAAdhB,EAAK1C,MAA8B,WAAT0D,GAGtD9C,KAAQ,SAAU8B,GACjB,IAAI0N,EACJ,MAAuC,UAAhC1N,EAAKgI,SAAS5E,eACN,SAAdpD,EAAK1C,OAIuC,OAAxCoQ,EAAO1N,EAAK7B,aAAc,UACN,SAAvBuP,EAAKtK,gBAIRlD,MAAS+K,GAAwB,WAChC,MAAO,CAAE,KAGV7K,KAAQ6K,GAAwB,SAAU2G,EAAe3S,GACxD,MAAO,CAAEA,EAAS,KAGnBkB,GAAM8K,GAAwB,SAAU2G,EAAe3S,EAAQiM,GAC9D,MAAO,CAAEA,EAAW,EAAIA,EAAWjM,EAASiM,KAG7C7K,KAAQ4K,GAAwB,SAAUE,EAAclM,GAEvD,IADA,IAAInB,EAAI,EACAA,EAAImB,EAAQnB,GAAK,EACxBqN,EAAa3O,KAAMsB,GAEpB,OAAOqN,IAGR3K,IAAOyK,GAAwB,SAAUE,EAAclM,GAEtD,IADA,IAAInB,EAAI,EACAA,EAAImB,EAAQnB,GAAK,EACxBqN,EAAa3O,KAAMsB,GAEpB,OAAOqN,IAGR0G,GAAM5G,GAAwB,SAAUE,EAAclM,EAAQiM,GAM7D,IALA,IAAIpN,EAAIoN,EAAW,EAClBA,EAAWjM,EACAA,EAAXiM,EACCjM,EACAiM,EACa,KAALpN,GACTqN,EAAa3O,KAAMsB,GAEpB,OAAOqN,IAGR2G,GAAM7G,GAAwB,SAAUE,EAAclM,EAAQiM,GAE7D,IADA,IAAIpN,EAAIoN,EAAW,EAAIA,EAAWjM,EAASiM,IACjCpN,EAAImB,GACbkM,EAAa3O,KAAMsB,GAEpB,OAAOqN,OAKL3F,QAAe,IAAIlC,EAAKkC,QAAc,GAGhC,CAAEuM,OAAO,EAAMC,UAAU,EAAMC,MAAM,EAAMC,UAAU,EAAMC,OAAO,GAC5E7O,EAAKkC,QAAS1H,GAAM+M,GAAmB/M,GAExC,IAAMA,IAAK,CAAEsU,QAAQ,EAAMC,OAAO,GACjC/O,EAAKkC,QAAS1H,GAAMgN,GAAoBhN,GAIzC,SAASsS,MA0ET,SAAS7G,GAAY+I,GAIpB,IAHA,IAAIxU,EAAI,EACP2C,EAAM6R,EAAOrT,OACbL,EAAW,GACJd,EAAI2C,EAAK3C,IAChBc,GAAY0T,EAAQxU,GAAIgF,MAEzB,OAAOlE,EAGR,SAASkJ,GAAe0I,EAAS+B,EAAYC,GAC5C,IAAIvK,EAAMsK,EAAWtK,IACpBwK,EAAOF,EAAWrK,KAClB4B,EAAM2I,GAAQxK,EACdyK,EAAmBF,GAAgB,eAAR1I,EAC3B6I,EAAWnO,IAEZ,OAAO+N,EAAWrS,MAGjB,SAAUF,EAAMnB,EAAS4Q,GACxB,MAAUzP,EAAOA,EAAMiI,GACtB,GAAuB,IAAlBjI,EAAK7C,UAAkBuV,EAC3B,OAAOlC,EAASxQ,EAAMnB,EAAS4Q,GAGjC,OAAO,GAIR,SAAUzP,EAAMnB,EAAS4Q,GACxB,IAAImD,EAAUlD,EAAaC,EAC1BkD,EAAW,CAAEtO,EAASoO,GAGvB,GAAKlD,GACJ,MAAUzP,EAAOA,EAAMiI,GACtB,IAAuB,IAAlBjI,EAAK7C,UAAkBuV,IACtBlC,EAASxQ,EAAMnB,EAAS4Q,GAC5B,OAAO,OAKV,MAAUzP,EAAOA,EAAMiI,GACtB,GAAuB,IAAlBjI,EAAK7C,UAAkBuV,EAQ3B,GAHAhD,GAJAC,EAAa3P,EAAM0B,KAAe1B,EAAM0B,GAAY,KAI1B1B,EAAKiQ,YAC5BN,EAAY3P,EAAKiQ,UAAa,IAE5BwC,GAAQA,IAASzS,EAAKgI,SAAS5E,cACnCpD,EAAOA,EAAMiI,IAASjI,MAChB,CAAA,IAAO4S,EAAWlD,EAAa5F,KACrC8I,EAAU,KAAQrO,GAAWqO,EAAU,KAAQD,EAG/C,OAASE,EAAU,GAAMD,EAAU,GAOnC,IAHAlD,EAAa5F,GAAQ+I,GAGJ,GAAMrC,EAASxQ,EAAMnB,EAAS4Q,GAC9C,OAAO,EAMZ,OAAO,GAIV,SAASqD,GAAgBC,GACxB,OAAyB,EAAlBA,EAAS9T,OACf,SAAUe,EAAMnB,EAAS4Q,GACxB,IAAI3R,EAAIiV,EAAS9T,OACjB,MAAQnB,IACP,IAAMiV,EAAUjV,GAAKkC,EAAMnB,EAAS4Q,GACnC,OAAO,EAGT,OAAO,GAERsD,EAAU,GAYZ,SAASC,GAAUvC,EAAW1Q,EAAKkM,EAAQpN,EAAS4Q,GAOnD,IANA,IAAIzP,EACHiT,EAAe,GACfnV,EAAI,EACJ2C,EAAMgQ,EAAUxR,OAChBiU,EAAgB,MAAPnT,EAEFjC,EAAI2C,EAAK3C,KACTkC,EAAOyQ,EAAW3S,MAClBmO,IAAUA,EAAQjM,EAAMnB,EAAS4Q,KACtCwD,EAAazW,KAAMwD,GACdkT,GACJnT,EAAIvD,KAAMsB,KAMd,OAAOmV,EAGR,SAASE,GAAYxE,EAAW/P,EAAU4R,EAAS4C,EAAYC,EAAYC,GAO1E,OANKF,IAAeA,EAAY1R,KAC/B0R,EAAaD,GAAYC,IAErBC,IAAeA,EAAY3R,KAC/B2R,EAAaF,GAAYE,EAAYC,IAE/BrJ,GAAc,SAAU3B,EAAM/F,EAAS1D,EAAS4Q,GACtD,IAAI8D,EAAMzV,EAAGkC,EACZwT,EAAS,GACTC,EAAU,GACVC,EAAcnR,EAAQtD,OAGtBQ,EAAQ6I,GA5CX,SAA2B1J,EAAU+U,EAAUpR,GAG9C,IAFA,IAAIzE,EAAI,EACP2C,EAAMkT,EAAS1U,OACRnB,EAAI2C,EAAK3C,IAChBuF,GAAQzE,EAAU+U,EAAU7V,GAAKyE,GAElC,OAAOA,EAsCWqR,CACfhV,GAAY,IACZC,EAAQ1B,SAAW,CAAE0B,GAAYA,EACjC,IAIDgV,GAAYlF,IAAerG,GAAS1J,EAEnCa,EADAuT,GAAUvT,EAAO+T,EAAQ7E,EAAW9P,EAAS4Q,GAG9CqE,EAAatD,EAGZ6C,IAAgB/K,EAAOqG,EAAY+E,GAAeN,GAGjD,GAGA7Q,EACDsR,EAQF,GALKrD,GACJA,EAASqD,EAAWC,EAAYjV,EAAS4Q,GAIrC2D,EAAa,CACjBG,EAAOP,GAAUc,EAAYL,GAC7BL,EAAYG,EAAM,GAAI1U,EAAS4Q,GAG/B3R,EAAIyV,EAAKtU,OACT,MAAQnB,KACAkC,EAAOuT,EAAMzV,MACnBgW,EAAYL,EAAS3V,MAAW+V,EAAWJ,EAAS3V,IAAQkC,IAK/D,GAAKsI,GACJ,GAAK+K,GAAc1E,EAAY,CAC9B,GAAK0E,EAAa,CAGjBE,EAAO,GACPzV,EAAIgW,EAAW7U,OACf,MAAQnB,KACAkC,EAAO8T,EAAYhW,KAGzByV,EAAK/W,KAAQqX,EAAW/V,GAAMkC,GAGhCqT,EAAY,KAAQS,EAAa,GAAMP,EAAM9D,GAI9C3R,EAAIgW,EAAW7U,OACf,MAAQnB,KACAkC,EAAO8T,EAAYhW,MACsC,GAA7DyV,EAAOF,EAAa5W,EAAS6L,EAAMtI,GAASwT,EAAQ1V,MAEtDwK,EAAMiL,KAAYhR,EAASgR,GAASvT,UAOvC8T,EAAad,GACZc,IAAevR,EACduR,EAAWjT,OAAQ6S,EAAaI,EAAW7U,QAC3C6U,GAEGT,EACJA,EAAY,KAAM9Q,EAASuR,EAAYrE,GAEvCjT,EAAKD,MAAOgG,EAASuR,KAMzB,SAASC,GAAmBzB,GAyB3B,IAxBA,IAAI0B,EAAcxD,EAAS9P,EAC1BD,EAAM6R,EAAOrT,OACbgV,EAAkB3Q,EAAKgL,SAAUgE,EAAQ,GAAIhV,MAC7C4W,EAAmBD,GAAmB3Q,EAAKgL,SAAU,KACrDxQ,EAAImW,EAAkB,EAAI,EAG1BE,EAAerM,GAAe,SAAU9H,GACvC,OAAOA,IAASgU,GACdE,GAAkB,GACrBE,EAAkBtM,GAAe,SAAU9H,GAC1C,OAAwC,EAAjCvD,EAASuX,EAAchU,IAC5BkU,GAAkB,GACrBnB,EAAW,CAAE,SAAU/S,EAAMnB,EAAS4Q,GACrC,IAAI/P,GAASuU,IAAqBxE,GAAO5Q,IAAY+E,MAClDoQ,EAAenV,GAAU1B,SAC1BgX,EAAcnU,EAAMnB,EAAS4Q,GAC7B2E,EAAiBpU,EAAMnB,EAAS4Q,IAIlC,OADAuE,EAAe,KACRtU,IAGD5B,EAAI2C,EAAK3C,IAChB,GAAO0S,EAAUlN,EAAKgL,SAAUgE,EAAQxU,GAAIR,MAC3CyV,EAAW,CAAEjL,GAAegL,GAAgBC,GAAYvC,QAClD,CAIN,IAHAA,EAAUlN,EAAK2I,OAAQqG,EAAQxU,GAAIR,MAAOf,MAAO,KAAM+V,EAAQxU,GAAI6E,UAGrDjB,GAAY,CAIzB,IADAhB,IAAM5C,EACE4C,EAAID,EAAKC,IAChB,GAAK4C,EAAKgL,SAAUgE,EAAQ5R,GAAIpD,MAC/B,MAGF,OAAO6V,GACF,EAAJrV,GAASgV,GAAgBC,GACrB,EAAJjV,GAASyL,GAGT+I,EACEpW,MAAO,EAAG4B,EAAI,GACdxB,OAAQ,CAAEwG,MAAgC,MAAzBwP,EAAQxU,EAAI,GAAIR,KAAe,IAAM,MACtDuE,QAAS8D,EAAO,MAClB6K,EACA1S,EAAI4C,GAAKqT,GAAmBzB,EAAOpW,MAAO4B,EAAG4C,IAC7CA,EAAID,GAAOsT,GAAqBzB,EAASA,EAAOpW,MAAOwE,IACvDA,EAAID,GAAO8I,GAAY+I,IAGzBS,EAASvW,KAAMgU,GAIjB,OAAOsC,GAAgBC,GAoTxB,OAtpBA3C,GAAWlR,UAAYoE,EAAK+Q,QAAU/Q,EAAKkC,QAC3ClC,EAAK8M,WAAa,IAAIA,GAEtB3M,EAAWJ,GAAOI,SAAW,SAAU7E,EAAU0V,GAChD,IAAIhE,EAAS7H,EAAO6J,EAAQhV,EAC3BiX,EAAO7L,EAAQ8L,EACfC,EAAS9P,EAAY/F,EAAW,KAEjC,GAAK6V,EACJ,OAAOH,EAAY,EAAIG,EAAOvY,MAAO,GAGtCqY,EAAQ3V,EACR8J,EAAS,GACT8L,EAAalR,EAAKqL,UAElB,MAAQ4F,EAAQ,CA2Bf,IAAMjX,KAxBAgT,KAAa7H,EAAQ7C,EAAOkD,KAAMyL,MAClC9L,IAGJ8L,EAAQA,EAAMrY,MAAOuM,EAAO,GAAIxJ,SAAYsV,GAE7C7L,EAAOlM,KAAQ8V,EAAS,KAGzBhC,GAAU,GAGH7H,EAAQ5C,EAAaiD,KAAMyL,MACjCjE,EAAU7H,EAAMuB,QAChBsI,EAAO9V,KAAM,CACZsG,MAAOwN,EAGPhT,KAAMmL,EAAO,GAAI5G,QAAS8D,EAAO,OAElC4O,EAAQA,EAAMrY,MAAOoU,EAAQrR,SAIhBqE,EAAK2I,SACXxD,EAAQxC,EAAW3I,GAAOwL,KAAMyL,KAAgBC,EAAYlX,MAChEmL,EAAQ+L,EAAYlX,GAAQmL,MAC9B6H,EAAU7H,EAAMuB,QAChBsI,EAAO9V,KAAM,CACZsG,MAAOwN,EACPhT,KAAMA,EACNqF,QAAS8F,IAEV8L,EAAQA,EAAMrY,MAAOoU,EAAQrR,SAI/B,IAAMqR,EACL,MAOF,OAAOgE,EACNC,EAAMtV,OACNsV,EACClR,GAAOtB,MAAOnD,GAGd+F,EAAY/F,EAAU8J,GAASxM,MAAO,IA4ZzCwH,EAAUL,GAAOK,QAAU,SAAU9E,EAAU6J,GAC9C,IAAI3K,EA9H8B4W,EAAiBC,EAC/CC,EACHC,EACAC,EA4HAH,EAAc,GACdD,EAAkB,GAClBD,EAAS7P,EAAehG,EAAW,KAEpC,IAAM6V,EAAS,CAGRhM,IACLA,EAAQhF,EAAU7E,IAEnBd,EAAI2K,EAAMxJ,OACV,MAAQnB,KACP2W,EAASV,GAAmBtL,EAAO3K,KACtB4D,GACZiT,EAAYnY,KAAMiY,GAElBC,EAAgBlY,KAAMiY,IAKxBA,EAAS7P,EACRhG,GArJgC8V,EAsJNA,EArJxBE,EAA6B,GADkBD,EAsJNA,GArJrB1V,OACvB4V,EAAqC,EAAzBH,EAAgBzV,OAC5B6V,EAAe,SAAUxM,EAAMzJ,EAAS4Q,EAAKlN,EAASwS,GACrD,IAAI/U,EAAMU,EAAG8P,EACZwE,EAAe,EACflX,EAAI,IACJ2S,EAAYnI,GAAQ,GACpB2M,EAAa,GACbC,EAAgBtR,EAGhBnE,EAAQ6I,GAAQuM,GAAavR,EAAK6I,KAAY,IAAG,IAAK4I,GAGtDI,EAAkB5Q,GAA4B,MAAjB2Q,EAAwB,EAAIvT,KAAKC,UAAY,GAC1EnB,EAAMhB,EAAMR,OAcb,IAZK8V,IAMJnR,EAAmB/E,GAAWrD,GAAYqD,GAAWkW,GAM9CjX,IAAM2C,GAAgC,OAAvBT,EAAOP,EAAO3B,IAAeA,IAAM,CACzD,GAAK+W,GAAa7U,EAAO,CACxBU,EAAI,EAME7B,GAAWmB,EAAK6I,eAAiBrN,IACtCuI,EAAa/D,GACbyP,GAAOxL,GAER,MAAUuM,EAAUkE,EAAiBhU,KACpC,GAAK8P,EAASxQ,EAAMnB,GAAWrD,EAAUiU,GAAQ,CAChDlN,EAAQ/F,KAAMwD,GACd,MAGG+U,IACJxQ,EAAU4Q,GAKPP,KAGG5U,GAAQwQ,GAAWxQ,IACzBgV,IAII1M,GACJmI,EAAUjU,KAAMwD,IAgBnB,GATAgV,GAAgBlX,EASX8W,GAAS9W,IAAMkX,EAAe,CAClCtU,EAAI,EACJ,MAAU8P,EAAUmE,EAAajU,KAChC8P,EAASC,EAAWwE,EAAYpW,EAAS4Q,GAG1C,GAAKnH,EAAO,CAGX,GAAoB,EAAf0M,EACJ,MAAQlX,IACC2S,EAAW3S,IAAOmX,EAAYnX,KACrCmX,EAAYnX,GAAMmH,EAAI5I,KAAMkG,IAM/B0S,EAAajC,GAAUiC,GAIxBzY,EAAKD,MAAOgG,EAAS0S,GAGhBF,IAAczM,GAA4B,EAApB2M,EAAWhW,QACG,EAAtC+V,EAAeL,EAAY1V,QAE7BoE,GAAOwK,WAAYtL,GAUrB,OALKwS,IACJxQ,EAAU4Q,EACVvR,EAAmBsR,GAGbzE,GAGFmE,EACN3K,GAAc6K,GACdA,KAgCOlW,SAAWA,EAEnB,OAAO6V,GAYR9Q,EAASN,GAAOM,OAAS,SAAU/E,EAAUC,EAAS0D,EAAS+F,GAC9D,IAAIxK,EAAGwU,EAAQ8C,EAAO9X,EAAM6O,EAC3BkJ,EAA+B,mBAAbzW,GAA2BA,EAC7C6J,GAASH,GAAQ7E,EAAY7E,EAAWyW,EAASzW,UAAYA,GAM9D,GAJA2D,EAAUA,GAAW,GAIC,IAAjBkG,EAAMxJ,OAAe,CAIzB,GAAqB,GADrBqT,EAAS7J,EAAO,GAAMA,EAAO,GAAIvM,MAAO,IAC5B+C,QAA+C,QAA/BmW,EAAQ9C,EAAQ,IAAMhV,MAC5B,IAArBuB,EAAQ1B,UAAkB8G,GAAkBX,EAAKgL,SAAUgE,EAAQ,GAAIhV,MAAS,CAIhF,KAFAuB,GAAYyE,EAAK6I,KAAW,GAAGiJ,EAAMzS,QAAS,GAC5Cd,QAASmF,GAAWC,IAAapI,IAAa,IAAM,IAErD,OAAO0D,EAGI8S,IACXxW,EAAUA,EAAQN,YAGnBK,EAAWA,EAAS1C,MAAOoW,EAAOtI,QAAQlH,MAAM7D,QAIjDnB,EAAImI,EAA0B,aAAEmD,KAAMxK,GAAa,EAAI0T,EAAOrT,OAC9D,MAAQnB,IAAM,CAIb,GAHAsX,EAAQ9C,EAAQxU,GAGXwF,EAAKgL,SAAYhR,EAAO8X,EAAM9X,MAClC,MAED,IAAO6O,EAAO7I,EAAK6I,KAAM7O,MAGjBgL,EAAO6D,EACbiJ,EAAMzS,QAAS,GAAId,QAASmF,GAAWC,IACvCF,GAASqC,KAAMkJ,EAAQ,GAAIhV,OAAU+L,GAAaxK,EAAQN,aACzDM,IACI,CAKL,GAFAyT,EAAOzR,OAAQ/C,EAAG,KAClBc,EAAW0J,EAAKrJ,QAAUsK,GAAY+I,IAGrC,OADA9V,EAAKD,MAAOgG,EAAS+F,GACd/F,EAGR,QAeJ,OAPE8S,GAAY3R,EAAS9E,EAAU6J,IAChCH,EACAzJ,GACCoF,EACD1B,GACC1D,GAAWkI,GAASqC,KAAMxK,IAAcyK,GAAaxK,EAAQN,aAAgBM,GAExE0D,GAMRvF,EAAQgR,WAAatM,EAAQwB,MAAO,IAAKtC,KAAMkE,GAAY0E,KAAM,MAAS9H,EAI1E1E,EAAQ+Q,mBAAqBjK,EAG7BC,IAIA/G,EAAQmQ,aAAejD,GAAQ,SAAUC,GAGxC,OAA4E,EAArEA,EAAG4C,wBAAyBvR,EAASyC,cAAe,eAMtDiM,GAAQ,SAAUC,GAEvB,OADAA,EAAGqC,UAAY,mBACiC,MAAzCrC,EAAG+D,WAAW/P,aAAc,WAEnCiM,GAAW,yBAA0B,SAAUpK,EAAMgB,EAAMwC,GAC1D,IAAMA,EACL,OAAOxD,EAAK7B,aAAc6C,EAA6B,SAAvBA,EAAKoC,cAA2B,EAAI,KAOjEpG,EAAQuI,YAAe2E,GAAQ,SAAUC,GAG9C,OAFAA,EAAGqC,UAAY,WACfrC,EAAG+D,WAAW9P,aAAc,QAAS,IACY,KAA1C+L,EAAG+D,WAAW/P,aAAc,YAEnCiM,GAAW,QAAS,SAAUpK,EAAMsV,EAAO9R,GAC1C,IAAMA,GAAyC,UAAhCxD,EAAKgI,SAAS5E,cAC5B,OAAOpD,EAAKuV,eAOTrL,GAAQ,SAAUC,GACvB,OAAwC,MAAjCA,EAAGhM,aAAc,eAExBiM,GAAWhF,EAAU,SAAUpF,EAAMgB,EAAMwC,GAC1C,IAAIzF,EACJ,IAAMyF,EACL,OAAwB,IAAjBxD,EAAMgB,GAAkBA,EAAKoC,eACjCrF,EAAMiC,EAAKoM,iBAAkBpL,KAAYjD,EAAI4P,UAC9C5P,EAAI+E,MACJ,OAKEO,GA14EP,CA44EK1H,GAILgD,EAAOwN,KAAO9I,EACd1E,EAAO6O,KAAOnK,EAAO+K,UAGrBzP,EAAO6O,KAAM,KAAQ7O,EAAO6O,KAAKhI,QACjC7G,EAAOkP,WAAalP,EAAO6W,OAASnS,EAAOwK,WAC3ClP,EAAOT,KAAOmF,EAAOE,QACrB5E,EAAO8W,SAAWpS,EAAOG,MACzB7E,EAAOyF,SAAWf,EAAOe,SACzBzF,EAAO+W,eAAiBrS,EAAO6D,OAK/B,IAAIe,EAAM,SAAUjI,EAAMiI,EAAK0N,GAC9B,IAAIrF,EAAU,GACbsF,OAAqBnU,IAAVkU,EAEZ,OAAU3V,EAAOA,EAAMiI,KAA6B,IAAlBjI,EAAK7C,SACtC,GAAuB,IAAlB6C,EAAK7C,SAAiB,CAC1B,GAAKyY,GAAYjX,EAAQqB,GAAO6V,GAAIF,GACnC,MAEDrF,EAAQ9T,KAAMwD,GAGhB,OAAOsQ,GAIJwF,EAAW,SAAUC,EAAG/V,GAG3B,IAFA,IAAIsQ,EAAU,GAENyF,EAAGA,EAAIA,EAAEnL,YACI,IAAfmL,EAAE5Y,UAAkB4Y,IAAM/V,GAC9BsQ,EAAQ9T,KAAMuZ,GAIhB,OAAOzF,GAIJ0F,EAAgBrX,EAAO6O,KAAK/E,MAAMhC,aAItC,SAASuB,EAAUhI,EAAMgB,GAEvB,OAAOhB,EAAKgI,UAAYhI,EAAKgI,SAAS5E,gBAAkBpC,EAAKoC,cAG/D,IAAI6S,EAAa,kEAKjB,SAASC,EAAQzI,EAAU0I,EAAW5F,GACrC,OAAKtT,EAAYkZ,GACTxX,EAAO2B,KAAMmN,EAAU,SAAUzN,EAAMlC,GAC7C,QAASqY,EAAU9Z,KAAM2D,EAAMlC,EAAGkC,KAAWuQ,IAK1C4F,EAAUhZ,SACPwB,EAAO2B,KAAMmN,EAAU,SAAUzN,GACvC,OAASA,IAASmW,IAAgB5F,IAKV,iBAAd4F,EACJxX,EAAO2B,KAAMmN,EAAU,SAAUzN,GACvC,OAA4C,EAAnCvD,EAAQJ,KAAM8Z,EAAWnW,KAAkBuQ,IAK/C5R,EAAOsN,OAAQkK,EAAW1I,EAAU8C,GAG5C5R,EAAOsN,OAAS,SAAUuB,EAAM/N,EAAO8Q,GACtC,IAAIvQ,EAAOP,EAAO,GAMlB,OAJK8Q,IACJ/C,EAAO,QAAUA,EAAO,KAGH,IAAjB/N,EAAMR,QAAkC,IAAlBe,EAAK7C,SACxBwB,EAAOwN,KAAKM,gBAAiBzM,EAAMwN,GAAS,CAAExN,GAAS,GAGxDrB,EAAOwN,KAAKxJ,QAAS6K,EAAM7O,EAAO2B,KAAMb,EAAO,SAAUO,GAC/D,OAAyB,IAAlBA,EAAK7C,aAIdwB,EAAOG,GAAGgC,OAAQ,CACjBqL,KAAM,SAAUvN,GACf,IAAId,EAAG4B,EACNe,EAAM7E,KAAKqD,OACXmX,EAAOxa,KAER,GAAyB,iBAAbgD,EACX,OAAOhD,KAAK4D,UAAWb,EAAQC,GAAWqN,OAAQ,WACjD,IAAMnO,EAAI,EAAGA,EAAI2C,EAAK3C,IACrB,GAAKa,EAAOyF,SAAUgS,EAAMtY,GAAKlC,MAChC,OAAO,KAQX,IAFA8D,EAAM9D,KAAK4D,UAAW,IAEhB1B,EAAI,EAAGA,EAAI2C,EAAK3C,IACrBa,EAAOwN,KAAMvN,EAAUwX,EAAMtY,GAAK4B,GAGnC,OAAa,EAANe,EAAU9B,EAAOkP,WAAYnO,GAAQA,GAE7CuM,OAAQ,SAAUrN,GACjB,OAAOhD,KAAK4D,UAAW0W,EAAQta,KAAMgD,GAAY,IAAI,KAEtD2R,IAAK,SAAU3R,GACd,OAAOhD,KAAK4D,UAAW0W,EAAQta,KAAMgD,GAAY,IAAI,KAEtDiX,GAAI,SAAUjX,GACb,QAASsX,EACRta,KAIoB,iBAAbgD,GAAyBoX,EAAc5M,KAAMxK,GACnDD,EAAQC,GACRA,GAAY,IACb,GACCK,UASJ,IAAIoX,EAMHvP,EAAa,uCAENnI,EAAOG,GAAGC,KAAO,SAAUH,EAAUC,EAASkS,GACpD,IAAItI,EAAOzI,EAGX,IAAMpB,EACL,OAAOhD,KAQR,GAHAmV,EAAOA,GAAQsF,EAGU,iBAAbzX,EAAwB,CAanC,KAPC6J,EALsB,MAAlB7J,EAAU,IACsB,MAApCA,EAAUA,EAASK,OAAS,IACT,GAAnBL,EAASK,OAGD,CAAE,KAAML,EAAU,MAGlBkI,EAAWgC,KAAMlK,MAIV6J,EAAO,IAAQ5J,EA6CxB,OAAMA,GAAWA,EAAQM,QACtBN,GAAWkS,GAAO5E,KAAMvN,GAK1BhD,KAAKwD,YAAaP,GAAUsN,KAAMvN,GAhDzC,GAAK6J,EAAO,GAAM,CAYjB,GAXA5J,EAAUA,aAAmBF,EAASE,EAAS,GAAMA,EAIrDF,EAAOgB,MAAO/D,KAAM+C,EAAO2X,UAC1B7N,EAAO,GACP5J,GAAWA,EAAQ1B,SAAW0B,EAAQgK,eAAiBhK,EAAUrD,GACjE,IAIIya,EAAW7M,KAAMX,EAAO,KAAS9J,EAAO2C,cAAezC,GAC3D,IAAM4J,KAAS5J,EAGT5B,EAAYrB,KAAM6M,IACtB7M,KAAM6M,GAAS5J,EAAS4J,IAIxB7M,KAAK8R,KAAMjF,EAAO5J,EAAS4J,IAK9B,OAAO7M,KAYP,OARAoE,EAAOxE,EAASuN,eAAgBN,EAAO,OAKtC7M,KAAM,GAAMoE,EACZpE,KAAKqD,OAAS,GAERrD,KAcH,OAAKgD,EAASzB,UACpBvB,KAAM,GAAMgD,EACZhD,KAAKqD,OAAS,EACPrD,MAIIqB,EAAY2B,QACD6C,IAAfsP,EAAKwF,MACXxF,EAAKwF,MAAO3X,GAGZA,EAAUD,GAGLA,EAAO2D,UAAW1D,EAAUhD,QAIhCsD,UAAYP,EAAOG,GAGxBuX,EAAa1X,EAAQnD,GAGrB,IAAIgb,EAAe,iCAGlBC,EAAmB,CAClBC,UAAU,EACVC,UAAU,EACVzO,MAAM,EACN0O,MAAM,GAoFR,SAASC,EAASpM,EAAKxC,GACtB,OAAUwC,EAAMA,EAAKxC,KAA4B,IAAjBwC,EAAItN,UACpC,OAAOsN,EAnFR9L,EAAOG,GAAGgC,OAAQ,CACjB4P,IAAK,SAAUtP,GACd,IAAI0V,EAAUnY,EAAQyC,EAAQxF,MAC7Bmb,EAAID,EAAQ7X,OAEb,OAAOrD,KAAKqQ,OAAQ,WAEnB,IADA,IAAInO,EAAI,EACAA,EAAIiZ,EAAGjZ,IACd,GAAKa,EAAOyF,SAAUxI,KAAMkb,EAAShZ,IACpC,OAAO,KAMXkZ,QAAS,SAAU5I,EAAWvP,GAC7B,IAAI4L,EACH3M,EAAI,EACJiZ,EAAInb,KAAKqD,OACTqR,EAAU,GACVwG,EAA+B,iBAAd1I,GAA0BzP,EAAQyP,GAGpD,IAAM4H,EAAc5M,KAAMgF,GACzB,KAAQtQ,EAAIiZ,EAAGjZ,IACd,IAAM2M,EAAM7O,KAAMkC,GAAK2M,GAAOA,IAAQ5L,EAAS4L,EAAMA,EAAIlM,WAGxD,GAAKkM,EAAItN,SAAW,KAAQ2Z,GACH,EAAxBA,EAAQG,MAAOxM,GAGE,IAAjBA,EAAItN,UACHwB,EAAOwN,KAAKM,gBAAiBhC,EAAK2D,IAAgB,CAEnDkC,EAAQ9T,KAAMiO,GACd,MAMJ,OAAO7O,KAAK4D,UAA4B,EAAjB8Q,EAAQrR,OAAaN,EAAOkP,WAAYyC,GAAYA,IAI5E2G,MAAO,SAAUjX,GAGhB,OAAMA,EAKe,iBAATA,EACJvD,EAAQJ,KAAMsC,EAAQqB,GAAQpE,KAAM,IAIrCa,EAAQJ,KAAMT,KAGpBoE,EAAKb,OAASa,EAAM,GAAMA,GAZjBpE,KAAM,IAAOA,KAAM,GAAI2C,WAAe3C,KAAKsE,QAAQgX,UAAUjY,QAAU,GAgBlFkY,IAAK,SAAUvY,EAAUC,GACxB,OAAOjD,KAAK4D,UACXb,EAAOkP,WACNlP,EAAOgB,MAAO/D,KAAK0D,MAAOX,EAAQC,EAAUC,OAK/CuY,QAAS,SAAUxY,GAClB,OAAOhD,KAAKub,IAAiB,MAAZvY,EAChBhD,KAAKgE,WAAahE,KAAKgE,WAAWqM,OAAQrN,OAU7CD,EAAOkB,KAAM,CACZiQ,OAAQ,SAAU9P,GACjB,IAAI8P,EAAS9P,EAAKzB,WAClB,OAAOuR,GAA8B,KAApBA,EAAO3S,SAAkB2S,EAAS,MAEpDuH,QAAS,SAAUrX,GAClB,OAAOiI,EAAKjI,EAAM,eAEnBsX,aAAc,SAAUtX,EAAMmD,EAAIwS,GACjC,OAAO1N,EAAKjI,EAAM,aAAc2V,IAEjCzN,KAAM,SAAUlI,GACf,OAAO6W,EAAS7W,EAAM,gBAEvB4W,KAAM,SAAU5W,GACf,OAAO6W,EAAS7W,EAAM,oBAEvBuX,QAAS,SAAUvX,GAClB,OAAOiI,EAAKjI,EAAM,gBAEnBkX,QAAS,SAAUlX,GAClB,OAAOiI,EAAKjI,EAAM,oBAEnBwX,UAAW,SAAUxX,EAAMmD,EAAIwS,GAC9B,OAAO1N,EAAKjI,EAAM,cAAe2V,IAElC8B,UAAW,SAAUzX,EAAMmD,EAAIwS,GAC9B,OAAO1N,EAAKjI,EAAM,kBAAmB2V,IAEtCG,SAAU,SAAU9V,GACnB,OAAO8V,GAAY9V,EAAKzB,YAAc,IAAK2P,WAAYlO,IAExD0W,SAAU,SAAU1W,GACnB,OAAO8V,EAAU9V,EAAKkO,aAEvByI,SAAU,SAAU3W,GACnB,OAA6B,MAAxBA,EAAK0X,iBAKT3b,EAAUiE,EAAK0X,iBAER1X,EAAK0X,iBAMR1P,EAAUhI,EAAM,cACpBA,EAAOA,EAAK2X,SAAW3X,GAGjBrB,EAAOgB,MAAO,GAAIK,EAAKmI,eAE7B,SAAUnH,EAAMlC,GAClBH,EAAOG,GAAIkC,GAAS,SAAU2U,EAAO/W,GACpC,IAAI0R,EAAU3R,EAAOoB,IAAKnE,KAAMkD,EAAI6W,GAuBpC,MArB0B,UAArB3U,EAAK9E,OAAQ,KACjB0C,EAAW+W,GAGP/W,GAAgC,iBAAbA,IACvB0R,EAAU3R,EAAOsN,OAAQrN,EAAU0R,IAGjB,EAAd1U,KAAKqD,SAGHwX,EAAkBzV,IACvBrC,EAAOkP,WAAYyC,GAIfkG,EAAapN,KAAMpI,IACvBsP,EAAQsH,WAIHhc,KAAK4D,UAAW8Q,MAGzB,IAAIuH,EAAgB,oBAsOpB,SAASC,EAAUC,GAClB,OAAOA,EAER,SAASC,EAASC,GACjB,MAAMA,EAGP,SAASC,EAAYpV,EAAOqV,EAASC,EAAQC,GAC5C,IAAIC,EAEJ,IAGMxV,GAAS7F,EAAcqb,EAASxV,EAAMyV,SAC1CD,EAAOjc,KAAMyG,GAAQ0B,KAAM2T,GAAUK,KAAMJ,GAGhCtV,GAAS7F,EAAcqb,EAASxV,EAAM2V,MACjDH,EAAOjc,KAAMyG,EAAOqV,EAASC,GAQ7BD,EAAQ5b,WAAOkF,EAAW,CAAEqB,GAAQ5G,MAAOmc,IAM3C,MAAQvV,GAITsV,EAAO7b,WAAOkF,EAAW,CAAEqB,KAvO7BnE,EAAO+Z,UAAY,SAAU3X,GA9B7B,IAAwBA,EACnB4X,EAiCJ5X,EAA6B,iBAAZA,GAlCMA,EAmCPA,EAlCZ4X,EAAS,GACbha,EAAOkB,KAAMkB,EAAQ0H,MAAOoP,IAAmB,GAAI,SAAUe,EAAGC,GAC/DF,EAAQE,IAAS,IAEXF,GA+BNha,EAAOmC,OAAQ,GAAIC,GAEpB,IACC+X,EAGAC,EAGAC,EAGAC,EAGA9T,EAAO,GAGP+T,EAAQ,GAGRC,GAAe,EAGfC,EAAO,WAQN,IALAH,EAASA,GAAUlY,EAAQsY,KAI3BL,EAAQF,GAAS,EACTI,EAAMja,OAAQka,GAAe,EAAI,CACxCJ,EAASG,EAAMlP,QACf,QAAUmP,EAAchU,EAAKlG,QAGmC,IAA1DkG,EAAMgU,GAAc5c,MAAOwc,EAAQ,GAAKA,EAAQ,KACpDhY,EAAQuY,cAGRH,EAAchU,EAAKlG,OACnB8Z,GAAS,GAMNhY,EAAQgY,SACbA,GAAS,GAGVD,GAAS,EAGJG,IAIH9T,EADI4T,EACG,GAIA,KAMV3C,EAAO,CAGNe,IAAK,WA2BJ,OA1BKhS,IAGC4T,IAAWD,IACfK,EAAchU,EAAKlG,OAAS,EAC5Bia,EAAM1c,KAAMuc,IAGb,SAAW5B,EAAKhH,GACfxR,EAAOkB,KAAMsQ,EAAM,SAAUyI,EAAG/V,GAC1B5F,EAAY4F,GACV9B,EAAQyU,QAAWY,EAAK1F,IAAK7N,IAClCsC,EAAK3I,KAAMqG,GAEDA,GAAOA,EAAI5D,QAA4B,WAAlBR,EAAQoE,IAGxCsU,EAAKtU,KATR,CAYK5C,WAEA8Y,IAAWD,GACfM,KAGKxd,MAIR2d,OAAQ,WAYP,OAXA5a,EAAOkB,KAAMI,UAAW,SAAU2Y,EAAG/V,GACpC,IAAIoU,EACJ,OAA0D,GAAhDA,EAAQtY,EAAO6D,QAASK,EAAKsC,EAAM8R,IAC5C9R,EAAKtE,OAAQoW,EAAO,GAGfA,GAASkC,GACbA,MAIIvd,MAKR8U,IAAK,SAAU5R,GACd,OAAOA,GACwB,EAA9BH,EAAO6D,QAAS1D,EAAIqG,GACN,EAAdA,EAAKlG,QAIPwS,MAAO,WAIN,OAHKtM,IACJA,EAAO,IAEDvJ,MAMR4d,QAAS,WAGR,OAFAP,EAASC,EAAQ,GACjB/T,EAAO4T,EAAS,GACTnd,MAERmM,SAAU,WACT,OAAQ5C,GAMTsU,KAAM,WAKL,OAJAR,EAASC,EAAQ,GACXH,GAAWD,IAChB3T,EAAO4T,EAAS,IAEVnd,MAERqd,OAAQ,WACP,QAASA,GAIVS,SAAU,SAAU7a,EAASsR,GAS5B,OARM8I,IAEL9I,EAAO,CAAEtR,GADTsR,EAAOA,GAAQ,IACQjU,MAAQiU,EAAKjU,QAAUiU,GAC9C+I,EAAM1c,KAAM2T,GACN2I,GACLM,KAGKxd,MAIRwd,KAAM,WAEL,OADAhD,EAAKsD,SAAU9d,KAAMqE,WACdrE,MAIRod,MAAO,WACN,QAASA,IAIZ,OAAO5C,GA4CRzX,EAAOmC,OAAQ,CAEd6Y,SAAU,SAAUC,GACnB,IAAIC,EAAS,CAIX,CAAE,SAAU,WAAYlb,EAAO+Z,UAAW,UACzC/Z,EAAO+Z,UAAW,UAAY,GAC/B,CAAE,UAAW,OAAQ/Z,EAAO+Z,UAAW,eACtC/Z,EAAO+Z,UAAW,eAAiB,EAAG,YACvC,CAAE,SAAU,OAAQ/Z,EAAO+Z,UAAW,eACrC/Z,EAAO+Z,UAAW,eAAiB,EAAG,aAExCoB,EAAQ,UACRvB,EAAU,CACTuB,MAAO,WACN,OAAOA,GAERC,OAAQ,WAEP,OADAC,EAASxV,KAAMvE,WAAYuY,KAAMvY,WAC1BrE,MAERqe,QAAS,SAAUnb,GAClB,OAAOyZ,EAAQE,KAAM,KAAM3Z,IAI5Bob,KAAM,WACL,IAAIC,EAAMla,UAEV,OAAOtB,EAAOgb,SAAU,SAAUS,GACjCzb,EAAOkB,KAAMga,EAAQ,SAAU1W,EAAIkX,GAGlC,IAAIvb,EAAK7B,EAAYkd,EAAKE,EAAO,MAAWF,EAAKE,EAAO,IAKxDL,EAAUK,EAAO,IAAO,WACvB,IAAIC,EAAWxb,GAAMA,EAAGvC,MAAOX,KAAMqE,WAChCqa,GAAYrd,EAAYqd,EAAS/B,SACrC+B,EAAS/B,UACPgC,SAAUH,EAASI,QACnBhW,KAAM4V,EAASjC,SACfK,KAAM4B,EAAShC,QAEjBgC,EAAUC,EAAO,GAAM,QACtBze,KACAkD,EAAK,CAAEwb,GAAara,eAKxBka,EAAM,OACH5B,WAELE,KAAM,SAAUgC,EAAaC,EAAYC,GACxC,IAAIC,EAAW,EACf,SAASzC,EAAS0C,EAAOb,EAAU1P,EAASwQ,GAC3C,OAAO,WACN,IAAIC,EAAOnf,KACVuU,EAAOlQ,UACP+a,EAAa,WACZ,IAAIV,EAAU7B,EAKd,KAAKoC,EAAQD,GAAb,CAQA,IAJAN,EAAWhQ,EAAQ/N,MAAOwe,EAAM5K,MAId6J,EAASzB,UAC1B,MAAM,IAAI0C,UAAW,4BAOtBxC,EAAO6B,IAKgB,iBAAbA,GACY,mBAAbA,IACRA,EAAS7B,KAGLxb,EAAYwb,GAGXqC,EACJrC,EAAKpc,KACJie,EACAnC,EAASyC,EAAUZ,EAAUlC,EAAUgD,GACvC3C,EAASyC,EAAUZ,EAAUhC,EAAS8C,KAOvCF,IAEAnC,EAAKpc,KACJie,EACAnC,EAASyC,EAAUZ,EAAUlC,EAAUgD,GACvC3C,EAASyC,EAAUZ,EAAUhC,EAAS8C,GACtC3C,EAASyC,EAAUZ,EAAUlC,EAC5BkC,EAASkB,eASP5Q,IAAYwN,IAChBiD,OAAOtZ,EACP0O,EAAO,CAAEmK,KAKRQ,GAAWd,EAASmB,aAAeJ,EAAM5K,MAK7CiL,EAAUN,EACTE,EACA,WACC,IACCA,IACC,MAAQ5S,GAEJzJ,EAAOgb,SAAS0B,eACpB1c,EAAOgb,SAAS0B,cAAejT,EAC9BgT,EAAQE,YAMQV,GAAbC,EAAQ,IAIPvQ,IAAY0N,IAChB+C,OAAOtZ,EACP0O,EAAO,CAAE/H,IAGV4R,EAASuB,WAAYR,EAAM5K,MAS3B0K,EACJO,KAKKzc,EAAOgb,SAAS6B,eACpBJ,EAAQE,WAAa3c,EAAOgb,SAAS6B,gBAEtC7f,EAAO8f,WAAYL,KAKtB,OAAOzc,EAAOgb,SAAU,SAAUS,GAGjCP,EAAQ,GAAK,GAAI1C,IAChBgB,EACC,EACAiC,EACAnd,EAAY0d,GACXA,EACA7C,EACDsC,EAASc,aAKXrB,EAAQ,GAAK,GAAI1C,IAChBgB,EACC,EACAiC,EACAnd,EAAYwd,GACXA,EACA3C,IAKH+B,EAAQ,GAAK,GAAI1C,IAChBgB,EACC,EACAiC,EACAnd,EAAYyd,GACXA,EACA1C,MAGAO,WAKLA,QAAS,SAAUrb,GAClB,OAAc,MAAPA,EAAcyB,EAAOmC,OAAQ5D,EAAKqb,GAAYA,IAGvDyB,EAAW,GAkEZ,OA/DArb,EAAOkB,KAAMga,EAAQ,SAAU/b,EAAGuc,GACjC,IAAIlV,EAAOkV,EAAO,GACjBqB,EAAcrB,EAAO,GAKtB9B,EAAS8B,EAAO,IAAQlV,EAAKgS,IAGxBuE,GACJvW,EAAKgS,IACJ,WAIC2C,EAAQ4B,GAKT7B,EAAQ,EAAI/b,GAAK,GAAI0b,QAIrBK,EAAQ,EAAI/b,GAAK,GAAI0b,QAGrBK,EAAQ,GAAK,GAAIJ,KAGjBI,EAAQ,GAAK,GAAIJ,MAOnBtU,EAAKgS,IAAKkD,EAAO,GAAIjB,MAKrBY,EAAUK,EAAO,IAAQ,WAExB,OADAL,EAAUK,EAAO,GAAM,QAAUze,OAASoe,OAAWvY,EAAY7F,KAAMqE,WAChErE,MAMRoe,EAAUK,EAAO,GAAM,QAAWlV,EAAKuU,WAIxCnB,EAAQA,QAASyB,GAGZJ,GACJA,EAAKvd,KAAM2d,EAAUA,GAIfA,GAIR2B,KAAM,SAAUC,GACf,IAGCC,EAAY5b,UAAUhB,OAGtBnB,EAAI+d,EAGJC,EAAkBva,MAAOzD,GACzBie,EAAgB7f,EAAMG,KAAM4D,WAG5B+b,EAASrd,EAAOgb,WAGhBsC,EAAa,SAAUne,GACtB,OAAO,SAAUgF,GAChBgZ,EAAiBhe,GAAMlC,KACvBmgB,EAAeje,GAAyB,EAAnBmC,UAAUhB,OAAa/C,EAAMG,KAAM4D,WAAc6C,IAC5D+Y,GACTG,EAAOb,YAAaW,EAAiBC,KAMzC,GAAKF,GAAa,IACjB3D,EAAY0D,EAAaI,EAAOxX,KAAMyX,EAAYne,IAAMqa,QAAS6D,EAAO5D,QACtEyD,GAGsB,YAAnBG,EAAOlC,SACX7c,EAAY8e,EAAeje,IAAOie,EAAeje,GAAI2a,OAErD,OAAOuD,EAAOvD,OAKhB,MAAQ3a,IACPoa,EAAY6D,EAAeje,GAAKme,EAAYne,GAAKke,EAAO5D,QAGzD,OAAO4D,EAAOzD,aAOhB,IAAI2D,EAAc,yDAElBvd,EAAOgb,SAAS0B,cAAgB,SAAUtZ,EAAOoa,GAI3CxgB,EAAOygB,SAAWzgB,EAAOygB,QAAQC,MAAQta,GAASma,EAAY9S,KAAMrH,EAAMf,OAC9ErF,EAAOygB,QAAQC,KAAM,8BAAgCta,EAAMua,QAASva,EAAMoa,MAAOA,IAOnFxd,EAAO4d,eAAiB,SAAUxa,GACjCpG,EAAO8f,WAAY,WAClB,MAAM1Z,KAQR,IAAIya,EAAY7d,EAAOgb,WAkDvB,SAAS8C,IACRjhB,EAASkhB,oBAAqB,mBAAoBD,GAClD9gB,EAAO+gB,oBAAqB,OAAQD,GACpC9d,EAAO4X,QAnDR5X,EAAOG,GAAGyX,MAAQ,SAAUzX,GAY3B,OAVA0d,EACE/D,KAAM3Z,GAKNmb,SAAO,SAAUlY,GACjBpD,EAAO4d,eAAgBxa,KAGlBnG,MAGR+C,EAAOmC,OAAQ,CAGdgB,SAAS,EAIT6a,UAAW,EAGXpG,MAAO,SAAUqG,KAGF,IAATA,IAAkBje,EAAOge,UAAYhe,EAAOmD,WAKjDnD,EAAOmD,SAAU,KAGZ8a,GAAsC,IAAnBje,EAAOge,WAK/BH,EAAUrB,YAAa3f,EAAU,CAAEmD,OAIrCA,EAAO4X,MAAMkC,KAAO+D,EAAU/D,KAaD,aAAxBjd,EAASqhB,YACa,YAAxBrhB,EAASqhB,aAA6BrhB,EAAS8P,gBAAgBwR,SAGjEnhB,EAAO8f,WAAY9c,EAAO4X,QAK1B/a,EAASmQ,iBAAkB,mBAAoB8Q,GAG/C9gB,EAAOgQ,iBAAkB,OAAQ8Q,IAQlC,IAAIM,EAAS,SAAUtd,EAAOX,EAAIgL,EAAKhH,EAAOka,EAAWC,EAAUC,GAClE,IAAIpf,EAAI,EACP2C,EAAMhB,EAAMR,OACZke,EAAc,MAAPrT,EAGR,GAAuB,WAAlBrL,EAAQqL,GAEZ,IAAMhM,KADNkf,GAAY,EACDlT,EACViT,EAAQtd,EAAOX,EAAIhB,EAAGgM,EAAKhM,IAAK,EAAMmf,EAAUC,QAI3C,QAAezb,IAAVqB,IACXka,GAAY,EAEN/f,EAAY6F,KACjBoa,GAAM,GAGFC,IAGCD,GACJpe,EAAGzC,KAAMoD,EAAOqD,GAChBhE,EAAK,OAILqe,EAAOre,EACPA,EAAK,SAAUkB,EAAMod,EAAMta,GAC1B,OAAOqa,EAAK9gB,KAAMsC,EAAQqB,GAAQ8C,MAKhChE,GACJ,KAAQhB,EAAI2C,EAAK3C,IAChBgB,EACCW,EAAO3B,GAAKgM,EAAKoT,EACjBpa,EACAA,EAAMzG,KAAMoD,EAAO3B,GAAKA,EAAGgB,EAAIW,EAAO3B,GAAKgM,KAM/C,OAAKkT,EACGvd,EAIH0d,EACGre,EAAGzC,KAAMoD,GAGVgB,EAAM3B,EAAIW,EAAO,GAAKqK,GAAQmT,GAKlCI,EAAY,QACfC,EAAa,YAGd,SAASC,EAAYC,EAAMC,GAC1B,OAAOA,EAAOC,cAMf,SAASC,EAAWC,GACnB,OAAOA,EAAO/b,QAASwb,EAAW,OAAQxb,QAASyb,EAAYC,GAEhE,IAAIM,EAAa,SAAUC,GAQ1B,OAA0B,IAAnBA,EAAM3gB,UAAqC,IAAnB2gB,EAAM3gB,YAAsB2gB,EAAM3gB,UAMlE,SAAS4gB,IACRniB,KAAK8F,QAAU/C,EAAO+C,QAAUqc,EAAKC,MAGtCD,EAAKC,IAAM,EAEXD,EAAK7e,UAAY,CAEhB2K,MAAO,SAAUiU,GAGhB,IAAIhb,EAAQgb,EAAOliB,KAAK8F,SA4BxB,OAzBMoB,IACLA,EAAQ,GAKH+a,EAAYC,KAIXA,EAAM3gB,SACV2gB,EAAOliB,KAAK8F,SAAYoB,EAMxB9G,OAAOiiB,eAAgBH,EAAOliB,KAAK8F,QAAS,CAC3CoB,MAAOA,EACPob,cAAc,MAMXpb,GAERqb,IAAK,SAAUL,EAAOM,EAAMtb,GAC3B,IAAIub,EACHxU,EAAQjO,KAAKiO,MAAOiU,GAIrB,GAAqB,iBAATM,EACXvU,EAAO8T,EAAWS,IAAWtb,OAM7B,IAAMub,KAAQD,EACbvU,EAAO8T,EAAWU,IAAWD,EAAMC,GAGrC,OAAOxU,GAERvK,IAAK,SAAUwe,EAAOhU,GACrB,YAAerI,IAARqI,EACNlO,KAAKiO,MAAOiU,GAGZA,EAAOliB,KAAK8F,UAAaoc,EAAOliB,KAAK8F,SAAWic,EAAW7T,KAE7DiT,OAAQ,SAAUe,EAAOhU,EAAKhH,GAa7B,YAAarB,IAARqI,GACCA,GAAsB,iBAARA,QAAgCrI,IAAVqB,EAElClH,KAAK0D,IAAKwe,EAAOhU,IASzBlO,KAAKuiB,IAAKL,EAAOhU,EAAKhH,QAILrB,IAAVqB,EAAsBA,EAAQgH,IAEtCyP,OAAQ,SAAUuE,EAAOhU,GACxB,IAAIhM,EACH+L,EAAQiU,EAAOliB,KAAK8F,SAErB,QAAeD,IAAVoI,EAAL,CAIA,QAAapI,IAARqI,EAAoB,CAkBxBhM,GAXCgM,EAJIvI,MAAMC,QAASsI,GAIbA,EAAI/J,IAAK4d,IAEf7T,EAAM6T,EAAW7T,MAIJD,EACZ,CAAEC,GACAA,EAAIrB,MAAOoP,IAAmB,IAG1B5Y,OAER,MAAQnB,WACA+L,EAAOC,EAAKhM,UAKR2D,IAARqI,GAAqBnL,EAAOyD,cAAeyH,MAM1CiU,EAAM3gB,SACV2gB,EAAOliB,KAAK8F,cAAYD,SAEjBqc,EAAOliB,KAAK8F,YAItB4c,QAAS,SAAUR,GAClB,IAAIjU,EAAQiU,EAAOliB,KAAK8F,SACxB,YAAiBD,IAAVoI,IAAwBlL,EAAOyD,cAAeyH,KAGvD,IAAI0U,EAAW,IAAIR,EAEfS,EAAW,IAAIT,EAcfU,EAAS,gCACZC,EAAa,SA2Bd,SAASC,EAAU3e,EAAM8J,EAAKsU,GAC7B,IAAIpd,EA1Baod,EA8BjB,QAAc3c,IAAT2c,GAAwC,IAAlBpe,EAAK7C,SAI/B,GAHA6D,EAAO,QAAU8I,EAAIjI,QAAS6c,EAAY,OAAQtb,cAG7B,iBAFrBgb,EAAOpe,EAAK7B,aAAc6C,IAEM,CAC/B,IACCod,EAnCW,UADGA,EAoCEA,IA/BL,UAATA,IAIS,SAATA,EACG,KAIHA,KAAUA,EAAO,IACbA,EAGJK,EAAOrV,KAAMgV,GACVQ,KAAKC,MAAOT,GAGbA,GAeH,MAAQhW,IAGVoW,EAASL,IAAKne,EAAM8J,EAAKsU,QAEzBA,OAAO3c,EAGT,OAAO2c,EAGRzf,EAAOmC,OAAQ,CACdwd,QAAS,SAAUte,GAClB,OAAOwe,EAASF,QAASte,IAAUue,EAASD,QAASte,IAGtDoe,KAAM,SAAUpe,EAAMgB,EAAMod,GAC3B,OAAOI,EAASzB,OAAQ/c,EAAMgB,EAAMod,IAGrCU,WAAY,SAAU9e,EAAMgB,GAC3Bwd,EAASjF,OAAQvZ,EAAMgB,IAKxB+d,MAAO,SAAU/e,EAAMgB,EAAMod,GAC5B,OAAOG,EAASxB,OAAQ/c,EAAMgB,EAAMod,IAGrCY,YAAa,SAAUhf,EAAMgB,GAC5Bud,EAAShF,OAAQvZ,EAAMgB,MAIzBrC,EAAOG,GAAGgC,OAAQ,CACjBsd,KAAM,SAAUtU,EAAKhH,GACpB,IAAIhF,EAAGkD,EAAMod,EACZpe,EAAOpE,KAAM,GACbyO,EAAQrK,GAAQA,EAAKuF,WAGtB,QAAa9D,IAARqI,EAAoB,CACxB,GAAKlO,KAAKqD,SACTmf,EAAOI,EAASlf,IAAKU,GAEE,IAAlBA,EAAK7C,WAAmBohB,EAASjf,IAAKU,EAAM,iBAAmB,CACnElC,EAAIuM,EAAMpL,OACV,MAAQnB,IAIFuM,EAAOvM,IAEsB,KADjCkD,EAAOqJ,EAAOvM,GAAIkD,MACRvE,QAAS,WAClBuE,EAAO2c,EAAW3c,EAAK9E,MAAO,IAC9ByiB,EAAU3e,EAAMgB,EAAMod,EAAMpd,KAI/Bud,EAASJ,IAAKne,EAAM,gBAAgB,GAItC,OAAOoe,EAIR,MAAoB,iBAARtU,EACJlO,KAAKiE,KAAM,WACjB2e,EAASL,IAAKviB,KAAMkO,KAIfiT,EAAQnhB,KAAM,SAAUkH,GAC9B,IAAIsb,EAOJ,GAAKpe,QAAkByB,IAAVqB,EAKZ,YAAcrB,KADd2c,EAAOI,EAASlf,IAAKU,EAAM8J,IAEnBsU,OAMM3c,KADd2c,EAAOO,EAAU3e,EAAM8J,IAEfsU,OAIR,EAIDxiB,KAAKiE,KAAM,WAGV2e,EAASL,IAAKviB,KAAMkO,EAAKhH,MAExB,KAAMA,EAA0B,EAAnB7C,UAAUhB,OAAY,MAAM,IAG7C6f,WAAY,SAAUhV,GACrB,OAAOlO,KAAKiE,KAAM,WACjB2e,EAASjF,OAAQ3d,KAAMkO,QAM1BnL,EAAOmC,OAAQ,CACdoY,MAAO,SAAUlZ,EAAM1C,EAAM8gB,GAC5B,IAAIlF,EAEJ,GAAKlZ,EAYJ,OAXA1C,GAASA,GAAQ,MAAS,QAC1B4b,EAAQqF,EAASjf,IAAKU,EAAM1C,GAGvB8gB,KACElF,GAAS3X,MAAMC,QAAS4c,GAC7BlF,EAAQqF,EAASxB,OAAQ/c,EAAM1C,EAAMqB,EAAO2D,UAAW8b,IAEvDlF,EAAM1c,KAAM4hB,IAGPlF,GAAS,IAIlB+F,QAAS,SAAUjf,EAAM1C,GACxBA,EAAOA,GAAQ,KAEf,IAAI4b,EAAQva,EAAOua,MAAOlZ,EAAM1C,GAC/B4hB,EAAchG,EAAMja,OACpBH,EAAKoa,EAAMlP,QACXmV,EAAQxgB,EAAOygB,YAAapf,EAAM1C,GAMvB,eAAPwB,IACJA,EAAKoa,EAAMlP,QACXkV,KAGIpgB,IAIU,OAATxB,GACJ4b,EAAM3L,QAAS,qBAIT4R,EAAME,KACbvgB,EAAGzC,KAAM2D,EApBF,WACNrB,EAAOsgB,QAASjf,EAAM1C,IAmBF6hB,KAGhBD,GAAeC,GACpBA,EAAM1N,MAAM2H,QAKdgG,YAAa,SAAUpf,EAAM1C,GAC5B,IAAIwM,EAAMxM,EAAO,aACjB,OAAOihB,EAASjf,IAAKU,EAAM8J,IAASyU,EAASxB,OAAQ/c,EAAM8J,EAAK,CAC/D2H,MAAO9S,EAAO+Z,UAAW,eAAgBvB,IAAK,WAC7CoH,EAAShF,OAAQvZ,EAAM,CAAE1C,EAAO,QAASwM,WAM7CnL,EAAOG,GAAGgC,OAAQ,CACjBoY,MAAO,SAAU5b,EAAM8gB,GACtB,IAAIkB,EAAS,EAQb,MANqB,iBAAThiB,IACX8gB,EAAO9gB,EACPA,EAAO,KACPgiB,KAGIrf,UAAUhB,OAASqgB,EAChB3gB,EAAOua,MAAOtd,KAAM,GAAK0B,QAGjBmE,IAAT2c,EACNxiB,KACAA,KAAKiE,KAAM,WACV,IAAIqZ,EAAQva,EAAOua,MAAOtd,KAAM0B,EAAM8gB,GAGtCzf,EAAOygB,YAAaxjB,KAAM0B,GAEZ,OAATA,GAAgC,eAAf4b,EAAO,IAC5Bva,EAAOsgB,QAASrjB,KAAM0B,MAI1B2hB,QAAS,SAAU3hB,GAClB,OAAO1B,KAAKiE,KAAM,WACjBlB,EAAOsgB,QAASrjB,KAAM0B,MAGxBiiB,WAAY,SAAUjiB,GACrB,OAAO1B,KAAKsd,MAAO5b,GAAQ,KAAM,KAKlCib,QAAS,SAAUjb,EAAMJ,GACxB,IAAIoP,EACHkT,EAAQ,EACRC,EAAQ9gB,EAAOgb,WACflM,EAAW7R,KACXkC,EAAIlC,KAAKqD,OACTkZ,EAAU,aACCqH,GACTC,EAAMtE,YAAa1N,EAAU,CAAEA,KAIb,iBAATnQ,IACXJ,EAAMI,EACNA,OAAOmE,GAERnE,EAAOA,GAAQ,KAEf,MAAQQ,KACPwO,EAAMiS,EAASjf,IAAKmO,EAAU3P,GAAKR,EAAO,gBAC9BgP,EAAImF,QACf+N,IACAlT,EAAImF,MAAM0F,IAAKgB,IAIjB,OADAA,IACOsH,EAAMlH,QAASrb,MAGxB,IAAIwiB,GAAO,sCAA0CC,OAEjDC,GAAU,IAAIla,OAAQ,iBAAmBga,GAAO,cAAe,KAG/DG,GAAY,CAAE,MAAO,QAAS,SAAU,QAExCvU,GAAkB9P,EAAS8P,gBAI1BwU,GAAa,SAAU9f,GACzB,OAAOrB,EAAOyF,SAAUpE,EAAK6I,cAAe7I,IAE7C+f,GAAW,CAAEA,UAAU,GAOnBzU,GAAgB0U,cACpBF,GAAa,SAAU9f,GACtB,OAAOrB,EAAOyF,SAAUpE,EAAK6I,cAAe7I,IAC3CA,EAAKggB,YAAaD,MAAe/f,EAAK6I,gBAG1C,IAAIoX,GAAqB,SAAUjgB,EAAMmK,GAOvC,MAA8B,UAH9BnK,EAAOmK,GAAMnK,GAGDkgB,MAAMC,SACM,KAAvBngB,EAAKkgB,MAAMC,SAMXL,GAAY9f,IAEsB,SAAlCrB,EAAOyhB,IAAKpgB,EAAM,YAKrB,SAASqgB,GAAWrgB,EAAMqe,EAAMiC,EAAYC,GAC3C,IAAIC,EAAUC,EACbC,EAAgB,GAChBC,EAAeJ,EACd,WACC,OAAOA,EAAM9V,OAEd,WACC,OAAO9L,EAAOyhB,IAAKpgB,EAAMqe,EAAM,KAEjCuC,EAAUD,IACVE,EAAOP,GAAcA,EAAY,KAAS3hB,EAAOmiB,UAAWzC,GAAS,GAAK,MAG1E0C,EAAgB/gB,EAAK7C,WAClBwB,EAAOmiB,UAAWzC,IAAmB,OAATwC,IAAkBD,IAChDhB,GAAQ9W,KAAMnK,EAAOyhB,IAAKpgB,EAAMqe,IAElC,GAAK0C,GAAiBA,EAAe,KAAQF,EAAO,CAInDD,GAAoB,EAGpBC,EAAOA,GAAQE,EAAe,GAG9BA,GAAiBH,GAAW,EAE5B,MAAQF,IAIP/hB,EAAOuhB,MAAOlgB,EAAMqe,EAAM0C,EAAgBF,IACnC,EAAIJ,IAAY,GAAMA,EAAQE,IAAiBC,GAAW,MAAW,IAC3EF,EAAgB,GAEjBK,GAAgCN,EAIjCM,GAAgC,EAChCpiB,EAAOuhB,MAAOlgB,EAAMqe,EAAM0C,EAAgBF,GAG1CP,EAAaA,GAAc,GAgB5B,OAbKA,IACJS,GAAiBA,IAAkBH,GAAW,EAG9CJ,EAAWF,EAAY,GACtBS,GAAkBT,EAAY,GAAM,GAAMA,EAAY,IACrDA,EAAY,GACTC,IACJA,EAAMM,KAAOA,EACbN,EAAM1Q,MAAQkR,EACdR,EAAM5f,IAAM6f,IAGPA,EAIR,IAAIQ,GAAoB,GAyBxB,SAASC,GAAUxT,EAAUyT,GAO5B,IANA,IAAIf,EAASngB,EAxBcA,EACvBuT,EACH1V,EACAmK,EACAmY,EAqBAgB,EAAS,GACTlK,EAAQ,EACRhY,EAASwO,EAASxO,OAGXgY,EAAQhY,EAAQgY,KACvBjX,EAAOyN,EAAUwJ,IACNiJ,QAIXC,EAAUngB,EAAKkgB,MAAMC,QAChBe,GAKa,SAAZf,IACJgB,EAAQlK,GAAUsH,EAASjf,IAAKU,EAAM,YAAe,KAC/CmhB,EAAQlK,KACbjX,EAAKkgB,MAAMC,QAAU,KAGK,KAAvBngB,EAAKkgB,MAAMC,SAAkBF,GAAoBjgB,KACrDmhB,EAAQlK,IA7CVkJ,EAFAtiB,EADG0V,OAAAA,EACH1V,GAF0BmC,EAiDaA,GA/C5B6I,cACXb,EAAWhI,EAAKgI,UAChBmY,EAAUa,GAAmBhZ,MAM9BuL,EAAO1V,EAAIujB,KAAK9iB,YAAaT,EAAII,cAAe+J,IAChDmY,EAAUxhB,EAAOyhB,IAAK7M,EAAM,WAE5BA,EAAKhV,WAAWC,YAAa+U,GAEZ,SAAZ4M,IACJA,EAAU,SAEXa,GAAmBhZ,GAAamY,MAkCb,SAAZA,IACJgB,EAAQlK,GAAU,OAGlBsH,EAASJ,IAAKne,EAAM,UAAWmgB,KAMlC,IAAMlJ,EAAQ,EAAGA,EAAQhY,EAAQgY,IACR,MAAnBkK,EAAQlK,KACZxJ,EAAUwJ,GAAQiJ,MAAMC,QAAUgB,EAAQlK,IAI5C,OAAOxJ,EAGR9O,EAAOG,GAAGgC,OAAQ,CACjBogB,KAAM,WACL,OAAOD,GAAUrlB,MAAM,IAExBylB,KAAM,WACL,OAAOJ,GAAUrlB,OAElB0lB,OAAQ,SAAUxH,GACjB,MAAsB,kBAAVA,EACJA,EAAQle,KAAKslB,OAAStlB,KAAKylB,OAG5BzlB,KAAKiE,KAAM,WACZogB,GAAoBrkB,MACxB+C,EAAQ/C,MAAOslB,OAEfviB,EAAQ/C,MAAOylB,YAKnB,IAUEE,GACAhV,GAXEiV,GAAiB,wBAEjBC,GAAW,iCAEXC,GAAc,qCAMhBH,GADc/lB,EAASmmB,yBACRrjB,YAAa9C,EAASyC,cAAe,SACpDsO,GAAQ/Q,EAASyC,cAAe,UAM3BG,aAAc,OAAQ,SAC5BmO,GAAMnO,aAAc,UAAW,WAC/BmO,GAAMnO,aAAc,OAAQ,KAE5BmjB,GAAIjjB,YAAaiO,IAIjBvP,EAAQ4kB,WAAaL,GAAIM,WAAW,GAAOA,WAAW,GAAO7R,UAAUsB,QAIvEiQ,GAAI/U,UAAY,yBAChBxP,EAAQ8kB,iBAAmBP,GAAIM,WAAW,GAAO7R,UAAUuF,aAK3DgM,GAAI/U,UAAY,oBAChBxP,EAAQ+kB,SAAWR,GAAIvR,UAKxB,IAAIgS,GAAU,CAKbC,MAAO,CAAE,EAAG,UAAW,YACvBC,IAAK,CAAE,EAAG,oBAAqB,uBAC/BC,GAAI,CAAE,EAAG,iBAAkB,oBAC3BC,GAAI,CAAE,EAAG,qBAAsB,yBAE/BC,SAAU,CAAE,EAAG,GAAI,KAYpB,SAASC,GAAQzjB,EAASwN,GAIzB,IAAI3M,EAYJ,OATCA,EAD4C,oBAAjCb,EAAQoK,qBACbpK,EAAQoK,qBAAsBoD,GAAO,KAEI,oBAA7BxN,EAAQ4K,iBACpB5K,EAAQ4K,iBAAkB4C,GAAO,KAGjC,QAGM5K,IAAR4K,GAAqBA,GAAOrE,EAAUnJ,EAASwN,GAC5C1N,EAAOgB,MAAO,CAAEd,GAAWa,GAG5BA,EAKR,SAAS6iB,GAAe9iB,EAAO+iB,GAI9B,IAHA,IAAI1kB,EAAI,EACPiZ,EAAItX,EAAMR,OAEHnB,EAAIiZ,EAAGjZ,IACdygB,EAASJ,IACR1e,EAAO3B,GACP,cACC0kB,GAAejE,EAASjf,IAAKkjB,EAAa1kB,GAAK,eA1CnDkkB,GAAQS,MAAQT,GAAQU,MAAQV,GAAQW,SAAWX,GAAQY,QAAUZ,GAAQC,MAC7ED,GAAQa,GAAKb,GAAQI,GAGfplB,EAAQ+kB,SACbC,GAAQc,SAAWd,GAAQD,OAAS,CAAE,EAAG,+BAAgC,cA2C1E,IAAIrb,GAAQ,YAEZ,SAASqc,GAAetjB,EAAOZ,EAASmkB,EAASC,EAAWC,GAO3D,IANA,IAAIljB,EAAMsM,EAAKD,EAAK8W,EAAMC,EAAU1iB,EACnC2iB,EAAWxkB,EAAQ8iB,yBACnB2B,EAAQ,GACRxlB,EAAI,EACJiZ,EAAItX,EAAMR,OAEHnB,EAAIiZ,EAAGjZ,IAGd,IAFAkC,EAAOP,EAAO3B,KAEQ,IAATkC,EAGZ,GAAwB,WAAnBvB,EAAQuB,GAIZrB,EAAOgB,MAAO2jB,EAAOtjB,EAAK7C,SAAW,CAAE6C,GAASA,QAG1C,GAAM0G,GAAM0C,KAAMpJ,GAIlB,CACNsM,EAAMA,GAAO+W,EAAS/kB,YAAaO,EAAQZ,cAAe,QAG1DoO,GAAQoV,GAAS3Y,KAAM9I,IAAU,CAAE,GAAI,KAAQ,GAAIoD,cACnD+f,EAAOnB,GAAS3V,IAAS2V,GAAQK,SACjC/V,EAAIE,UAAY2W,EAAM,GAAMxkB,EAAO4kB,cAAevjB,GAASmjB,EAAM,GAGjEziB,EAAIyiB,EAAM,GACV,MAAQziB,IACP4L,EAAMA,EAAI0D,UAKXrR,EAAOgB,MAAO2jB,EAAOhX,EAAInE,aAGzBmE,EAAM+W,EAASnV,YAGXD,YAAc,QAzBlBqV,EAAM9mB,KAAMqC,EAAQ2kB,eAAgBxjB,IA+BvCqjB,EAASpV,YAAc,GAEvBnQ,EAAI,EACJ,MAAUkC,EAAOsjB,EAAOxlB,KAGvB,GAAKmlB,IAAkD,EAArCtkB,EAAO6D,QAASxC,EAAMijB,GAClCC,GACJA,EAAQ1mB,KAAMwD,QAgBhB,GAXAojB,EAAWtD,GAAY9f,GAGvBsM,EAAMgW,GAAQe,EAAS/kB,YAAa0B,GAAQ,UAGvCojB,GACJb,GAAejW,GAIX0W,EAAU,CACdtiB,EAAI,EACJ,MAAUV,EAAOsM,EAAK5L,KAChBghB,GAAYtY,KAAMpJ,EAAK1C,MAAQ,KACnC0lB,EAAQxmB,KAAMwD,GAMlB,OAAOqjB,EAIR,IACCI,GAAY,OACZC,GAAc,iDACdC,GAAiB,sBAElB,SAASC,KACR,OAAO,EAGR,SAASC,KACR,OAAO,EASR,SAASC,GAAY9jB,EAAM1C,GAC1B,OAAS0C,IAMV,WACC,IACC,OAAOxE,EAASyV,cACf,MAAQ8S,KATQC,KAAqC,UAAT1mB,GAY/C,SAAS2mB,GAAIjkB,EAAMkkB,EAAOtlB,EAAUwf,EAAMtf,EAAIqlB,GAC7C,IAAIC,EAAQ9mB,EAGZ,GAAsB,iBAAV4mB,EAAqB,CAShC,IAAM5mB,IANmB,iBAAbsB,IAGXwf,EAAOA,GAAQxf,EACfA,OAAW6C,GAEEyiB,EACbD,GAAIjkB,EAAM1C,EAAMsB,EAAUwf,EAAM8F,EAAO5mB,GAAQ6mB,GAEhD,OAAOnkB,EAsBR,GAnBa,MAARoe,GAAsB,MAANtf,GAGpBA,EAAKF,EACLwf,EAAOxf,OAAW6C,GACD,MAAN3C,IACc,iBAAbF,GAGXE,EAAKsf,EACLA,OAAO3c,IAIP3C,EAAKsf,EACLA,EAAOxf,EACPA,OAAW6C,KAGD,IAAP3C,EACJA,EAAK+kB,QACC,IAAM/kB,EACZ,OAAOkB,EAeR,OAZa,IAARmkB,IACJC,EAAStlB,GACTA,EAAK,SAAUulB,GAId,OADA1lB,IAAS2lB,IAAKD,GACPD,EAAO7nB,MAAOX,KAAMqE,aAIzB8C,KAAOqhB,EAAOrhB,OAAUqhB,EAAOrhB,KAAOpE,EAAOoE,SAE1C/C,EAAKH,KAAM,WACjBlB,EAAO0lB,MAAMlN,IAAKvb,KAAMsoB,EAAOplB,EAAIsf,EAAMxf,KA+a3C,SAAS2lB,GAAgBpa,EAAI7M,EAAMwmB,GAG5BA,GAQNvF,EAASJ,IAAKhU,EAAI7M,GAAM,GACxBqB,EAAO0lB,MAAMlN,IAAKhN,EAAI7M,EAAM,CAC3B8N,WAAW,EACXd,QAAS,SAAU+Z,GAClB,IAAIG,EAAUtV,EACbuV,EAAQlG,EAASjf,IAAK1D,KAAM0B,GAE7B,GAAyB,EAAlB+mB,EAAMK,WAAmB9oB,KAAM0B,IAKrC,GAAMmnB,EAAMxlB,QAiCEN,EAAO0lB,MAAMvJ,QAASxd,IAAU,IAAKqnB,cAClDN,EAAMO,uBAfN,GAdAH,EAAQvoB,EAAMG,KAAM4D,WACpBse,EAASJ,IAAKviB,KAAM0B,EAAMmnB,GAK1BD,EAAWV,EAAYloB,KAAM0B,GAC7B1B,KAAM0B,KAEDmnB,KADLvV,EAASqP,EAASjf,IAAK1D,KAAM0B,KACJknB,EACxBjG,EAASJ,IAAKviB,KAAM0B,GAAM,GAE1B4R,EAAS,GAELuV,IAAUvV,EAKd,OAFAmV,EAAMQ,2BACNR,EAAMS,iBACC5V,EAAOpM,WAeL2hB,EAAMxlB,SAGjBsf,EAASJ,IAAKviB,KAAM0B,EAAM,CACzBwF,MAAOnE,EAAO0lB,MAAMU,QAInBpmB,EAAOmC,OAAQ2jB,EAAO,GAAK9lB,EAAOqmB,MAAM9lB,WACxCulB,EAAMvoB,MAAO,GACbN,QAKFyoB,EAAMQ,qCAzE0BpjB,IAA7B8c,EAASjf,IAAK6K,EAAI7M,IACtBqB,EAAO0lB,MAAMlN,IAAKhN,EAAI7M,EAAMsmB,IA5a/BjlB,EAAO0lB,MAAQ,CAEdjpB,OAAQ,GAER+b,IAAK,SAAUnX,EAAMkkB,EAAO5Z,EAAS8T,EAAMxf,GAE1C,IAAIqmB,EAAaC,EAAa5Y,EAC7B6Y,EAAQC,EAAGC,EACXvK,EAASwK,EAAUhoB,EAAMioB,EAAYC,EACrCC,EAAWlH,EAASjf,IAAKU,GAG1B,GAAM6d,EAAY7d,GAAlB,CAKKsK,EAAQA,UAEZA,GADA2a,EAAc3a,GACQA,QACtB1L,EAAWqmB,EAAYrmB,UAKnBA,GACJD,EAAOwN,KAAKM,gBAAiBnB,GAAiB1M,GAIzC0L,EAAQvH,OACbuH,EAAQvH,KAAOpE,EAAOoE,SAIfoiB,EAASM,EAASN,UACzBA,EAASM,EAASN,OAASnpB,OAAO0pB,OAAQ,QAEnCR,EAAcO,EAASE,UAC9BT,EAAcO,EAASE,OAAS,SAAUvd,GAIzC,MAAyB,oBAAXzJ,GAA0BA,EAAO0lB,MAAMuB,YAAcxd,EAAE9K,KACpEqB,EAAO0lB,MAAMwB,SAAStpB,MAAOyD,EAAMC,gBAAcwB,IAMpD2jB,GADAlB,GAAUA,GAAS,IAAKzb,MAAOoP,IAAmB,CAAE,KAC1C5Y,OACV,MAAQmmB,IAEP9nB,EAAOkoB,GADPlZ,EAAMqX,GAAe7a,KAAMob,EAAOkB,KAAS,IACpB,GACvBG,GAAejZ,EAAK,IAAO,IAAKpJ,MAAO,KAAMtC,OAGvCtD,IAKNwd,EAAUnc,EAAO0lB,MAAMvJ,QAASxd,IAAU,GAG1CA,GAASsB,EAAWkc,EAAQ6J,aAAe7J,EAAQgL,WAAcxoB,EAGjEwd,EAAUnc,EAAO0lB,MAAMvJ,QAASxd,IAAU,GAG1C+nB,EAAY1mB,EAAOmC,OAAQ,CAC1BxD,KAAMA,EACNkoB,SAAUA,EACVpH,KAAMA,EACN9T,QAASA,EACTvH,KAAMuH,EAAQvH,KACdnE,SAAUA,EACV6H,aAAc7H,GAAYD,EAAO6O,KAAK/E,MAAMhC,aAAa2C,KAAMxK,GAC/DwM,UAAWma,EAAW/b,KAAM,MAC1Byb,IAGKK,EAAWH,EAAQ7nB,OAC1BgoB,EAAWH,EAAQ7nB,GAAS,IACnByoB,cAAgB,EAGnBjL,EAAQkL,QACiD,IAA9DlL,EAAQkL,MAAM3pB,KAAM2D,EAAMoe,EAAMmH,EAAYL,IAEvCllB,EAAK2L,kBACT3L,EAAK2L,iBAAkBrO,EAAM4nB,IAK3BpK,EAAQ3D,MACZ2D,EAAQ3D,IAAI9a,KAAM2D,EAAMqlB,GAElBA,EAAU/a,QAAQvH,OACvBsiB,EAAU/a,QAAQvH,KAAOuH,EAAQvH,OAK9BnE,EACJ0mB,EAASzkB,OAAQykB,EAASS,gBAAiB,EAAGV,GAE9CC,EAAS9oB,KAAM6oB,GAIhB1mB,EAAO0lB,MAAMjpB,OAAQkC,IAAS,KAMhCic,OAAQ,SAAUvZ,EAAMkkB,EAAO5Z,EAAS1L,EAAUqnB,GAEjD,IAAIvlB,EAAGwlB,EAAW5Z,EACjB6Y,EAAQC,EAAGC,EACXvK,EAASwK,EAAUhoB,EAAMioB,EAAYC,EACrCC,EAAWlH,EAASD,QAASte,IAAUue,EAASjf,IAAKU,GAEtD,GAAMylB,IAAeN,EAASM,EAASN,QAAvC,CAMAC,GADAlB,GAAUA,GAAS,IAAKzb,MAAOoP,IAAmB,CAAE,KAC1C5Y,OACV,MAAQmmB,IAMP,GAJA9nB,EAAOkoB,GADPlZ,EAAMqX,GAAe7a,KAAMob,EAAOkB,KAAS,IACpB,GACvBG,GAAejZ,EAAK,IAAO,IAAKpJ,MAAO,KAAMtC,OAGvCtD,EAAN,CAOAwd,EAAUnc,EAAO0lB,MAAMvJ,QAASxd,IAAU,GAE1CgoB,EAAWH,EADX7nB,GAASsB,EAAWkc,EAAQ6J,aAAe7J,EAAQgL,WAAcxoB,IACpC,GAC7BgP,EAAMA,EAAK,IACV,IAAI5G,OAAQ,UAAY6f,EAAW/b,KAAM,iBAAoB,WAG9D0c,EAAYxlB,EAAI4kB,EAASrmB,OACzB,MAAQyB,IACP2kB,EAAYC,EAAU5kB,IAEfulB,GAAeT,IAAaH,EAAUG,UACzClb,GAAWA,EAAQvH,OAASsiB,EAAUtiB,MACtCuJ,IAAOA,EAAIlD,KAAMic,EAAUja,YAC3BxM,GAAYA,IAAaymB,EAAUzmB,WACxB,OAAbA,IAAqBymB,EAAUzmB,YAChC0mB,EAASzkB,OAAQH,EAAG,GAEf2kB,EAAUzmB,UACd0mB,EAASS,gBAELjL,EAAQvB,QACZuB,EAAQvB,OAAOld,KAAM2D,EAAMqlB,IAOzBa,IAAcZ,EAASrmB,SACrB6b,EAAQqL,WACkD,IAA/DrL,EAAQqL,SAAS9pB,KAAM2D,EAAMulB,EAAYE,EAASE,SAElDhnB,EAAOynB,YAAapmB,EAAM1C,EAAMmoB,EAASE,eAGnCR,EAAQ7nB,SA1Cf,IAAMA,KAAQ6nB,EACbxmB,EAAO0lB,MAAM9K,OAAQvZ,EAAM1C,EAAO4mB,EAAOkB,GAAK9a,EAAS1L,GAAU,GA8C/DD,EAAOyD,cAAe+iB,IAC1B5G,EAAShF,OAAQvZ,EAAM,mBAIzB6lB,SAAU,SAAUQ,GAEnB,IAAIvoB,EAAG4C,EAAGhB,EAAK4Q,EAAS+U,EAAWiB,EAClCnW,EAAO,IAAI5O,MAAOtB,UAAUhB,QAG5BolB,EAAQ1lB,EAAO0lB,MAAMkC,IAAKF,GAE1Bf,GACE/G,EAASjf,IAAK1D,KAAM,WAAcI,OAAO0pB,OAAQ,OAC/CrB,EAAM/mB,OAAU,GACpBwd,EAAUnc,EAAO0lB,MAAMvJ,QAASuJ,EAAM/mB,OAAU,GAKjD,IAFA6S,EAAM,GAAMkU,EAENvmB,EAAI,EAAGA,EAAImC,UAAUhB,OAAQnB,IAClCqS,EAAMrS,GAAMmC,UAAWnC,GAMxB,GAHAumB,EAAMmC,eAAiB5qB,MAGlBkf,EAAQ2L,cAA2D,IAA5C3L,EAAQ2L,YAAYpqB,KAAMT,KAAMyoB,GAA5D,CAKAiC,EAAe3nB,EAAO0lB,MAAMiB,SAASjpB,KAAMT,KAAMyoB,EAAOiB,GAGxDxnB,EAAI,EACJ,OAAUwS,EAAUgW,EAAcxoB,QAAYumB,EAAMqC,uBAAyB,CAC5ErC,EAAMsC,cAAgBrW,EAAQtQ,KAE9BU,EAAI,EACJ,OAAU2kB,EAAY/U,EAAQgV,SAAU5kB,QACtC2jB,EAAMuC,gCAIDvC,EAAMwC,aAAsC,IAAxBxB,EAAUja,YACnCiZ,EAAMwC,WAAWzd,KAAMic,EAAUja,aAEjCiZ,EAAMgB,UAAYA,EAClBhB,EAAMjG,KAAOiH,EAAUjH,UAKV3c,KAHb/B,IAAUf,EAAO0lB,MAAMvJ,QAASuK,EAAUG,WAAc,IAAKG,QAC5DN,EAAU/a,SAAU/N,MAAO+T,EAAQtQ,KAAMmQ,MAGT,KAAzBkU,EAAMnV,OAASxP,KACrB2kB,EAAMS,iBACNT,EAAMO,oBAYX,OAJK9J,EAAQgM,cACZhM,EAAQgM,aAAazqB,KAAMT,KAAMyoB,GAG3BA,EAAMnV,SAGdoW,SAAU,SAAUjB,EAAOiB,GAC1B,IAAIxnB,EAAGunB,EAAWzX,EAAKmZ,EAAiBC,EACvCV,EAAe,GACfP,EAAgBT,EAASS,cACzBtb,EAAM4Z,EAAMjjB,OAGb,GAAK2kB,GAIJtb,EAAItN,YAOc,UAAfknB,EAAM/mB,MAAoC,GAAhB+mB,EAAM1S,QAEnC,KAAQlH,IAAQ7O,KAAM6O,EAAMA,EAAIlM,YAAc3C,KAI7C,GAAsB,IAAjB6O,EAAItN,WAAoC,UAAfknB,EAAM/mB,OAAqC,IAAjBmN,EAAI1C,UAAsB,CAGjF,IAFAgf,EAAkB,GAClBC,EAAmB,GACblpB,EAAI,EAAGA,EAAIioB,EAAejoB,SAME2D,IAA5BulB,EAFLpZ,GAHAyX,EAAYC,EAAUxnB,IAGNc,SAAW,OAG1BooB,EAAkBpZ,GAAQyX,EAAU5e,cACC,EAApC9H,EAAQiP,EAAKhS,MAAOqb,MAAOxM,GAC3B9L,EAAOwN,KAAMyB,EAAKhS,KAAM,KAAM,CAAE6O,IAAQxL,QAErC+nB,EAAkBpZ,IACtBmZ,EAAgBvqB,KAAM6oB,GAGnB0B,EAAgB9nB,QACpBqnB,EAAa9pB,KAAM,CAAEwD,KAAMyK,EAAK6a,SAAUyB,IAY9C,OALAtc,EAAM7O,KACDmqB,EAAgBT,EAASrmB,QAC7BqnB,EAAa9pB,KAAM,CAAEwD,KAAMyK,EAAK6a,SAAUA,EAASppB,MAAO6pB,KAGpDO,GAGRW,QAAS,SAAUjmB,EAAMkmB,GACxBlrB,OAAOiiB,eAAgBtf,EAAOqmB,MAAM9lB,UAAW8B,EAAM,CACpDmmB,YAAY,EACZjJ,cAAc,EAEd5e,IAAKrC,EAAYiqB,GAChB,WACC,GAAKtrB,KAAKwrB,cACR,OAAOF,EAAMtrB,KAAKwrB,gBAGrB,WACC,GAAKxrB,KAAKwrB,cACR,OAAOxrB,KAAKwrB,cAAepmB,IAI/Bmd,IAAK,SAAUrb,GACd9G,OAAOiiB,eAAgBriB,KAAMoF,EAAM,CAClCmmB,YAAY,EACZjJ,cAAc,EACdmJ,UAAU,EACVvkB,MAAOA,QAMXyjB,IAAK,SAAUa,GACd,OAAOA,EAAezoB,EAAO+C,SAC5B0lB,EACA,IAAIzoB,EAAOqmB,MAAOoC,IAGpBtM,QAAS,CACRwM,KAAM,CAGLC,UAAU,GAEXC,MAAO,CAGNxB,MAAO,SAAU5H,GAIhB,IAAIjU,EAAKvO,MAAQwiB,EAWjB,OARKoD,GAAepY,KAAMe,EAAG7M,OAC5B6M,EAAGqd,OAASxf,EAAUmC,EAAI,UAG1Boa,GAAgBpa,EAAI,QAASyZ,KAIvB,GAERmB,QAAS,SAAU3G,GAIlB,IAAIjU,EAAKvO,MAAQwiB,EAUjB,OAPKoD,GAAepY,KAAMe,EAAG7M,OAC5B6M,EAAGqd,OAASxf,EAAUmC,EAAI,UAE1Boa,GAAgBpa,EAAI,UAId,GAKRkY,SAAU,SAAUgC,GACnB,IAAIjjB,EAASijB,EAAMjjB,OACnB,OAAOogB,GAAepY,KAAMhI,EAAO9D,OAClC8D,EAAOomB,OAASxf,EAAU5G,EAAQ,UAClCmd,EAASjf,IAAK8B,EAAQ,UACtB4G,EAAU5G,EAAQ,OAIrBqmB,aAAc,CACbX,aAAc,SAAUzC,QAID5iB,IAAjB4iB,EAAMnV,QAAwBmV,EAAM+C,gBACxC/C,EAAM+C,cAAcM,YAAcrD,EAAMnV,YA8F7CvQ,EAAOynB,YAAc,SAAUpmB,EAAM1C,EAAMqoB,GAGrC3lB,EAAK0c,qBACT1c,EAAK0c,oBAAqBpf,EAAMqoB,IAIlChnB,EAAOqmB,MAAQ,SAAUznB,EAAKoqB,GAG7B,KAAQ/rB,gBAAgB+C,EAAOqmB,OAC9B,OAAO,IAAIrmB,EAAOqmB,MAAOznB,EAAKoqB,GAI1BpqB,GAAOA,EAAID,MACf1B,KAAKwrB,cAAgB7pB,EACrB3B,KAAK0B,KAAOC,EAAID,KAIhB1B,KAAKgsB,mBAAqBrqB,EAAIsqB,uBACHpmB,IAAzBlE,EAAIsqB,mBAGgB,IAApBtqB,EAAImqB,YACL9D,GACAC,GAKDjoB,KAAKwF,OAAW7D,EAAI6D,QAAkC,IAAxB7D,EAAI6D,OAAOjE,SACxCI,EAAI6D,OAAO7C,WACXhB,EAAI6D,OAELxF,KAAK+qB,cAAgBppB,EAAIopB,cACzB/qB,KAAKksB,cAAgBvqB,EAAIuqB,eAIzBlsB,KAAK0B,KAAOC,EAIRoqB,GACJhpB,EAAOmC,OAAQlF,KAAM+rB,GAItB/rB,KAAKmsB,UAAYxqB,GAAOA,EAAIwqB,WAAa1jB,KAAK2jB,MAG9CpsB,KAAM+C,EAAO+C,UAAY,GAK1B/C,EAAOqmB,MAAM9lB,UAAY,CACxBE,YAAaT,EAAOqmB,MACpB4C,mBAAoB/D,GACpB6C,qBAAsB7C,GACtB+C,8BAA+B/C,GAC/BoE,aAAa,EAEbnD,eAAgB,WACf,IAAI1c,EAAIxM,KAAKwrB,cAEbxrB,KAAKgsB,mBAAqBhE,GAErBxb,IAAMxM,KAAKqsB,aACf7f,EAAE0c,kBAGJF,gBAAiB,WAChB,IAAIxc,EAAIxM,KAAKwrB,cAEbxrB,KAAK8qB,qBAAuB9C,GAEvBxb,IAAMxM,KAAKqsB,aACf7f,EAAEwc,mBAGJC,yBAA0B,WACzB,IAAIzc,EAAIxM,KAAKwrB,cAEbxrB,KAAKgrB,8BAAgChD,GAEhCxb,IAAMxM,KAAKqsB,aACf7f,EAAEyc,2BAGHjpB,KAAKgpB,oBAKPjmB,EAAOkB,KAAM,CACZqoB,QAAQ,EACRC,SAAS,EACTC,YAAY,EACZC,gBAAgB,EAChBC,SAAS,EACTC,QAAQ,EACRC,YAAY,EACZC,SAAS,EACTC,OAAO,EACPC,OAAO,EACPC,UAAU,EACVC,MAAM,EACNC,QAAQ,EACRnrB,MAAM,EACNorB,UAAU,EACVjf,KAAK,EACLkf,SAAS,EACTrX,QAAQ,EACRsX,SAAS,EACTC,SAAS,EACTC,SAAS,EACTC,SAAS,EACTC,SAAS,EACTC,WAAW,EACXC,aAAa,EACbC,SAAS,EACTC,SAAS,EACTC,eAAe,EACfC,WAAW,EACXC,SAAS,EAETC,MAAO,SAAUxF,GAChB,IAAI1S,EAAS0S,EAAM1S,OAGnB,OAAoB,MAAf0S,EAAMwF,OAAiBpG,GAAUra,KAAMib,EAAM/mB,MACxB,MAAlB+mB,EAAM0E,SAAmB1E,EAAM0E,SAAW1E,EAAM2E,SAIlD3E,EAAMwF,YAAoBpoB,IAAXkQ,GAAwB+R,GAAYta,KAAMib,EAAM/mB,MACtD,EAATqU,EACG,EAGM,EAATA,EACG,EAGM,EAATA,EACG,EAGD,EAGD0S,EAAMwF,QAEZlrB,EAAO0lB,MAAM4C,SAEhBtoB,EAAOkB,KAAM,CAAEmR,MAAO,UAAW8Y,KAAM,YAAc,SAAUxsB,EAAMqnB,GACpEhmB,EAAO0lB,MAAMvJ,QAASxd,GAAS,CAG9B0oB,MAAO,WAQN,OAHAzB,GAAgB3oB,KAAM0B,EAAMwmB,KAGrB,GAERiB,QAAS,WAMR,OAHAR,GAAgB3oB,KAAM0B,IAGf,GAGRqnB,aAAcA,KAYhBhmB,EAAOkB,KAAM,CACZkqB,WAAY,YACZC,WAAY,WACZC,aAAc,cACdC,aAAc,cACZ,SAAUC,EAAM5D,GAClB5nB,EAAO0lB,MAAMvJ,QAASqP,GAAS,CAC9BxF,aAAc4B,EACdT,SAAUS,EAEVZ,OAAQ,SAAUtB,GACjB,IAAI3kB,EAEH0qB,EAAU/F,EAAMyD,cAChBzC,EAAYhB,EAAMgB,UASnB,OALM+E,IAAaA,IANTxuB,MAMgC+C,EAAOyF,SANvCxI,KAMyDwuB,MAClE/F,EAAM/mB,KAAO+nB,EAAUG,SACvB9lB,EAAM2lB,EAAU/a,QAAQ/N,MAAOX,KAAMqE,WACrCokB,EAAM/mB,KAAOipB,GAEP7mB,MAKVf,EAAOG,GAAGgC,OAAQ,CAEjBmjB,GAAI,SAAUC,EAAOtlB,EAAUwf,EAAMtf,GACpC,OAAOmlB,GAAIroB,KAAMsoB,EAAOtlB,EAAUwf,EAAMtf,IAEzCqlB,IAAK,SAAUD,EAAOtlB,EAAUwf,EAAMtf,GACrC,OAAOmlB,GAAIroB,KAAMsoB,EAAOtlB,EAAUwf,EAAMtf,EAAI,IAE7CwlB,IAAK,SAAUJ,EAAOtlB,EAAUE,GAC/B,IAAIumB,EAAW/nB,EACf,GAAK4mB,GAASA,EAAMY,gBAAkBZ,EAAMmB,UAW3C,OARAA,EAAYnB,EAAMmB,UAClB1mB,EAAQulB,EAAMsC,gBAAiBlC,IAC9Be,EAAUja,UACTia,EAAUG,SAAW,IAAMH,EAAUja,UACrCia,EAAUG,SACXH,EAAUzmB,SACVymB,EAAU/a,SAEJ1O,KAER,GAAsB,iBAAVsoB,EAAqB,CAGhC,IAAM5mB,KAAQ4mB,EACbtoB,KAAK0oB,IAAKhnB,EAAMsB,EAAUslB,EAAO5mB,IAElC,OAAO1B,KAWR,OATkB,IAAbgD,GAA0C,mBAAbA,IAGjCE,EAAKF,EACLA,OAAW6C,IAEA,IAAP3C,IACJA,EAAK+kB,IAECjoB,KAAKiE,KAAM,WACjBlB,EAAO0lB,MAAM9K,OAAQ3d,KAAMsoB,EAAOplB,EAAIF,QAMzC,IAKCyrB,GAAe,wBAGfC,GAAW,oCACXC,GAAe,2CAGhB,SAASC,GAAoBxqB,EAAM2X,GAClC,OAAK3P,EAAUhI,EAAM,UACpBgI,EAA+B,KAArB2P,EAAQxa,SAAkBwa,EAAUA,EAAQzJ,WAAY,OAE3DvP,EAAQqB,GAAO0W,SAAU,SAAW,IAGrC1W,EAIR,SAASyqB,GAAezqB,GAEvB,OADAA,EAAK1C,MAAyC,OAAhC0C,EAAK7B,aAAc,SAAsB,IAAM6B,EAAK1C,KAC3D0C,EAER,SAAS0qB,GAAe1qB,GAOvB,MAN2C,WAApCA,EAAK1C,MAAQ,IAAKpB,MAAO,EAAG,GAClC8D,EAAK1C,KAAO0C,EAAK1C,KAAKpB,MAAO,GAE7B8D,EAAK2J,gBAAiB,QAGhB3J,EAGR,SAAS2qB,GAAgBptB,EAAKqtB,GAC7B,IAAI9sB,EAAGiZ,EAAGzZ,EAAgButB,EAAUC,EAAU3F,EAE9C,GAAuB,IAAlByF,EAAKztB,SAAV,CAKA,GAAKohB,EAASD,QAAS/gB,KAEtB4nB,EADW5G,EAASjf,IAAK/B,GACP4nB,QAKjB,IAAM7nB,KAFNihB,EAAShF,OAAQqR,EAAM,iBAETzF,EACb,IAAMrnB,EAAI,EAAGiZ,EAAIoO,EAAQ7nB,GAAO2B,OAAQnB,EAAIiZ,EAAGjZ,IAC9Ca,EAAO0lB,MAAMlN,IAAKyT,EAAMttB,EAAM6nB,EAAQ7nB,GAAQQ,IAO7C0gB,EAASF,QAAS/gB,KACtBstB,EAAWrM,EAASzB,OAAQxf,GAC5ButB,EAAWnsB,EAAOmC,OAAQ,GAAI+pB,GAE9BrM,EAASL,IAAKyM,EAAME,KAkBtB,SAASC,GAAUC,EAAY7a,EAAMrQ,EAAUojB,GAG9C/S,EAAOhU,EAAMgU,GAEb,IAAIkT,EAAUnjB,EAAO8iB,EAASiI,EAAYrtB,EAAMC,EAC/CC,EAAI,EACJiZ,EAAIiU,EAAW/rB,OACfisB,EAAWnU,EAAI,EACfjU,EAAQqN,EAAM,GACdgb,EAAkBluB,EAAY6F,GAG/B,GAAKqoB,GACG,EAAJpU,GAA0B,iBAAVjU,IAChB9F,EAAQ4kB,YAAc0I,GAASlhB,KAAMtG,GACxC,OAAOkoB,EAAWnrB,KAAM,SAAUoX,GACjC,IAAIb,EAAO4U,EAAW7qB,GAAI8W,GACrBkU,IACJhb,EAAM,GAAMrN,EAAMzG,KAAMT,KAAMqb,EAAOb,EAAKgV,SAE3CL,GAAU3U,EAAMjG,EAAMrQ,EAAUojB,KAIlC,GAAKnM,IAEJ7W,GADAmjB,EAAWN,GAAe5S,EAAM6a,EAAY,GAAIniB,eAAe,EAAOmiB,EAAY9H,IACjEhV,WAEmB,IAA/BmV,EAASlb,WAAWlJ,SACxBokB,EAAWnjB,GAIPA,GAASgjB,GAAU,CAOvB,IALA+H,GADAjI,EAAUrkB,EAAOoB,IAAKuiB,GAAQe,EAAU,UAAYoH,KAC/BxrB,OAKbnB,EAAIiZ,EAAGjZ,IACdF,EAAOylB,EAEFvlB,IAAMotB,IACVttB,EAAOe,EAAOwC,MAAOvD,GAAM,GAAM,GAG5BqtB,GAIJtsB,EAAOgB,MAAOqjB,EAASV,GAAQ1kB,EAAM,YAIvCkC,EAASzD,KAAM2uB,EAAYltB,GAAKF,EAAME,GAGvC,GAAKmtB,EAOJ,IANAptB,EAAMmlB,EAASA,EAAQ/jB,OAAS,GAAI4J,cAGpClK,EAAOoB,IAAKijB,EAAS0H,IAGf5sB,EAAI,EAAGA,EAAImtB,EAAYntB,IAC5BF,EAAOolB,EAASllB,GACX4jB,GAAYtY,KAAMxL,EAAKN,MAAQ,MAClCihB,EAASxB,OAAQnf,EAAM,eACxBe,EAAOyF,SAAUvG,EAAKD,KAEjBA,EAAKL,KAA8C,YAArCK,EAAKN,MAAQ,IAAK8F,cAG/BzE,EAAO0sB,WAAaztB,EAAKH,UAC7BkB,EAAO0sB,SAAUztB,EAAKL,IAAK,CAC1BC,MAAOI,EAAKJ,OAASI,EAAKO,aAAc,UACtCN,GAGJH,EAASE,EAAKqQ,YAAYpM,QAAS0oB,GAAc,IAAM3sB,EAAMC,IAQnE,OAAOmtB,EAGR,SAASzR,GAAQvZ,EAAMpB,EAAU0sB,GAKhC,IAJA,IAAI1tB,EACH0lB,EAAQ1kB,EAAWD,EAAOsN,OAAQrN,EAAUoB,GAASA,EACrDlC,EAAI,EAE4B,OAAvBF,EAAO0lB,EAAOxlB,IAAeA,IAChCwtB,GAA8B,IAAlB1tB,EAAKT,UACtBwB,EAAO4sB,UAAWjJ,GAAQ1kB,IAGtBA,EAAKW,aACJ+sB,GAAYxL,GAAYliB,IAC5B2kB,GAAeD,GAAQ1kB,EAAM,WAE9BA,EAAKW,WAAWC,YAAaZ,IAI/B,OAAOoC,EAGRrB,EAAOmC,OAAQ,CACdyiB,cAAe,SAAU6H,GACxB,OAAOA,GAGRjqB,MAAO,SAAUnB,EAAMwrB,EAAeC,GACrC,IAAI3tB,EAAGiZ,EAAG2U,EAAaC,EApINpuB,EAAKqtB,EACnB5iB,EAoIF7G,EAAQnB,EAAK6hB,WAAW,GACxB+J,EAAS9L,GAAY9f,GAGtB,KAAMhD,EAAQ8kB,gBAAsC,IAAlB9hB,EAAK7C,UAAoC,KAAlB6C,EAAK7C,UAC3DwB,EAAO8W,SAAUzV,IAMnB,IAHA2rB,EAAerJ,GAAQnhB,GAGjBrD,EAAI,EAAGiZ,GAFb2U,EAAcpJ,GAAQtiB,IAEOf,OAAQnB,EAAIiZ,EAAGjZ,IAhJ5BP,EAiJLmuB,EAAa5tB,GAjJH8sB,EAiJQe,EAAc7tB,QAhJzCkK,EAGc,WAHdA,EAAW4iB,EAAK5iB,SAAS5E,gBAGAoe,GAAepY,KAAM7L,EAAID,MACrDstB,EAAKtZ,QAAU/T,EAAI+T,QAGK,UAAbtJ,GAAqC,aAAbA,IACnC4iB,EAAKrV,aAAehY,EAAIgY,cA6IxB,GAAKiW,EACJ,GAAKC,EAIJ,IAHAC,EAAcA,GAAepJ,GAAQtiB,GACrC2rB,EAAeA,GAAgBrJ,GAAQnhB,GAEjCrD,EAAI,EAAGiZ,EAAI2U,EAAYzsB,OAAQnB,EAAIiZ,EAAGjZ,IAC3C6sB,GAAgBe,EAAa5tB,GAAK6tB,EAAc7tB,SAGjD6sB,GAAgB3qB,EAAMmB,GAWxB,OAL2B,GAD3BwqB,EAAerJ,GAAQnhB,EAAO,WACZlC,QACjBsjB,GAAeoJ,GAAeC,GAAUtJ,GAAQtiB,EAAM,WAIhDmB,GAGRoqB,UAAW,SAAU9rB,GAKpB,IAJA,IAAI2e,EAAMpe,EAAM1C,EACfwd,EAAUnc,EAAO0lB,MAAMvJ,QACvBhd,EAAI,OAE6B2D,KAAxBzB,EAAOP,EAAO3B,IAAqBA,IAC5C,GAAK+f,EAAY7d,GAAS,CACzB,GAAOoe,EAAOpe,EAAMue,EAAS7c,SAAc,CAC1C,GAAK0c,EAAK+G,OACT,IAAM7nB,KAAQ8gB,EAAK+G,OACbrK,EAASxd,GACbqB,EAAO0lB,MAAM9K,OAAQvZ,EAAM1C,GAI3BqB,EAAOynB,YAAapmB,EAAM1C,EAAM8gB,EAAKuH,QAOxC3lB,EAAMue,EAAS7c,cAAYD,EAEvBzB,EAAMwe,EAAS9c,WAInB1B,EAAMwe,EAAS9c,cAAYD,OAOhC9C,EAAOG,GAAGgC,OAAQ,CACjB+qB,OAAQ,SAAUjtB,GACjB,OAAO2a,GAAQ3d,KAAMgD,GAAU,IAGhC2a,OAAQ,SAAU3a,GACjB,OAAO2a,GAAQ3d,KAAMgD,IAGtBV,KAAM,SAAU4E,GACf,OAAOia,EAAQnhB,KAAM,SAAUkH,GAC9B,YAAiBrB,IAAVqB,EACNnE,EAAOT,KAAMtC,MACbA,KAAK6V,QAAQ5R,KAAM,WACK,IAAlBjE,KAAKuB,UAAoC,KAAlBvB,KAAKuB,UAAqC,IAAlBvB,KAAKuB,WACxDvB,KAAKqS,YAAcnL,MAGpB,KAAMA,EAAO7C,UAAUhB,SAG3B6sB,OAAQ,WACP,OAAOf,GAAUnvB,KAAMqE,UAAW,SAAUD,GACpB,IAAlBpE,KAAKuB,UAAoC,KAAlBvB,KAAKuB,UAAqC,IAAlBvB,KAAKuB,UAC3CqtB,GAAoB5uB,KAAMoE,GAChC1B,YAAa0B,MAKvB+rB,QAAS,WACR,OAAOhB,GAAUnvB,KAAMqE,UAAW,SAAUD,GAC3C,GAAuB,IAAlBpE,KAAKuB,UAAoC,KAAlBvB,KAAKuB,UAAqC,IAAlBvB,KAAKuB,SAAiB,CACzE,IAAIiE,EAASopB,GAAoB5uB,KAAMoE,GACvCoB,EAAO4qB,aAAchsB,EAAMoB,EAAO8M,gBAKrC+d,OAAQ,WACP,OAAOlB,GAAUnvB,KAAMqE,UAAW,SAAUD,GACtCpE,KAAK2C,YACT3C,KAAK2C,WAAWytB,aAAchsB,EAAMpE,SAKvCswB,MAAO,WACN,OAAOnB,GAAUnvB,KAAMqE,UAAW,SAAUD,GACtCpE,KAAK2C,YACT3C,KAAK2C,WAAWytB,aAAchsB,EAAMpE,KAAKgP,gBAK5C6G,MAAO,WAIN,IAHA,IAAIzR,EACHlC,EAAI,EAE2B,OAAtBkC,EAAOpE,KAAMkC,IAAeA,IACd,IAAlBkC,EAAK7C,WAGTwB,EAAO4sB,UAAWjJ,GAAQtiB,GAAM,IAGhCA,EAAKiO,YAAc,IAIrB,OAAOrS,MAGRuF,MAAO,SAAUqqB,EAAeC,GAI/B,OAHAD,EAAiC,MAAjBA,GAAgCA,EAChDC,EAAyC,MAArBA,EAA4BD,EAAgBC,EAEzD7vB,KAAKmE,IAAK,WAChB,OAAOpB,EAAOwC,MAAOvF,KAAM4vB,EAAeC,MAI5CL,KAAM,SAAUtoB,GACf,OAAOia,EAAQnhB,KAAM,SAAUkH,GAC9B,IAAI9C,EAAOpE,KAAM,IAAO,GACvBkC,EAAI,EACJiZ,EAAInb,KAAKqD,OAEV,QAAewC,IAAVqB,GAAyC,IAAlB9C,EAAK7C,SAChC,OAAO6C,EAAKwM,UAIb,GAAsB,iBAAV1J,IAAuBunB,GAAajhB,KAAMtG,KACpDkf,IAAWP,GAAS3Y,KAAMhG,IAAW,CAAE,GAAI,KAAQ,GAAIM,eAAkB,CAE1EN,EAAQnE,EAAO4kB,cAAezgB,GAE9B,IACC,KAAQhF,EAAIiZ,EAAGjZ,IAIS,KAHvBkC,EAAOpE,KAAMkC,IAAO,IAGVX,WACTwB,EAAO4sB,UAAWjJ,GAAQtiB,GAAM,IAChCA,EAAKwM,UAAY1J,GAInB9C,EAAO,EAGN,MAAQoI,KAGNpI,GACJpE,KAAK6V,QAAQqa,OAAQhpB,IAEpB,KAAMA,EAAO7C,UAAUhB,SAG3BktB,YAAa,WACZ,IAAIjJ,EAAU,GAGd,OAAO6H,GAAUnvB,KAAMqE,UAAW,SAAUD,GAC3C,IAAI8P,EAASlU,KAAK2C,WAEbI,EAAO6D,QAAS5G,KAAMsnB,GAAY,IACtCvkB,EAAO4sB,UAAWjJ,GAAQ1mB,OACrBkU,GACJA,EAAOsc,aAAcpsB,EAAMpE,QAK3BsnB,MAILvkB,EAAOkB,KAAM,CACZwsB,SAAU,SACVC,UAAW,UACXN,aAAc,SACdO,YAAa,QACbC,WAAY,eACV,SAAUxrB,EAAMyrB,GAClB9tB,EAAOG,GAAIkC,GAAS,SAAUpC,GAO7B,IANA,IAAIa,EACHC,EAAM,GACNgtB,EAAS/tB,EAAQC,GACjBwB,EAAOssB,EAAOztB,OAAS,EACvBnB,EAAI,EAEGA,GAAKsC,EAAMtC,IAClB2B,EAAQ3B,IAAMsC,EAAOxE,KAAOA,KAAKuF,OAAO,GACxCxC,EAAQ+tB,EAAQ5uB,IAAO2uB,GAAYhtB,GAInCjD,EAAKD,MAAOmD,EAAKD,EAAMH,OAGxB,OAAO1D,KAAK4D,UAAWE,MAGzB,IAAIitB,GAAY,IAAIjnB,OAAQ,KAAOga,GAAO,kBAAmB,KAEzDkN,GAAY,SAAU5sB,GAKxB,IAAI6oB,EAAO7oB,EAAK6I,cAAc4C,YAM9B,OAJMod,GAASA,EAAKgE,SACnBhE,EAAOltB,GAGDktB,EAAKiE,iBAAkB9sB,IAG5B+sB,GAAO,SAAU/sB,EAAMe,EAASjB,GACnC,IAAIJ,EAAKsB,EACRgsB,EAAM,GAGP,IAAMhsB,KAAQD,EACbisB,EAAKhsB,GAAShB,EAAKkgB,MAAOlf,GAC1BhB,EAAKkgB,MAAOlf,GAASD,EAASC,GAM/B,IAAMA,KAHNtB,EAAMI,EAASzD,KAAM2D,GAGPe,EACbf,EAAKkgB,MAAOlf,GAASgsB,EAAKhsB,GAG3B,OAAOtB,GAIJutB,GAAY,IAAIvnB,OAAQma,GAAUrW,KAAM,KAAO,KA8HnD,SAAS0jB,GAAQltB,EAAMgB,EAAMmsB,GAC5B,IAAIC,EAAOC,EAAUC,EAAU5tB,EAM9BwgB,EAAQlgB,EAAKkgB,MAqCd,OAnCAiN,EAAWA,GAAYP,GAAW5sB,MAQpB,MAFbN,EAAMytB,EAASI,iBAAkBvsB,IAAUmsB,EAAUnsB,KAEjC8e,GAAY9f,KAC/BN,EAAMf,EAAOuhB,MAAOlgB,EAAMgB,KAQrBhE,EAAQwwB,kBAAoBb,GAAUvjB,KAAM1J,IAASutB,GAAU7jB,KAAMpI,KAG1EosB,EAAQlN,EAAMkN,MACdC,EAAWnN,EAAMmN,SACjBC,EAAWpN,EAAMoN,SAGjBpN,EAAMmN,SAAWnN,EAAMoN,SAAWpN,EAAMkN,MAAQ1tB,EAChDA,EAAMytB,EAASC,MAGflN,EAAMkN,MAAQA,EACdlN,EAAMmN,SAAWA,EACjBnN,EAAMoN,SAAWA,SAIJ7rB,IAAR/B,EAINA,EAAM,GACNA,EAIF,SAAS+tB,GAAcC,EAAaC,GAGnC,MAAO,CACNruB,IAAK,WACJ,IAAKouB,IASL,OAAS9xB,KAAK0D,IAAMquB,GAASpxB,MAAOX,KAAMqE,kBALlCrE,KAAK0D,OAxLhB,WAIC,SAASsuB,IAGR,GAAMrM,EAAN,CAIAsM,EAAU3N,MAAM4N,QAAU,+EAE1BvM,EAAIrB,MAAM4N,QACT,4HAGDxiB,GAAgBhN,YAAauvB,GAAYvvB,YAAaijB,GAEtD,IAAIwM,EAAWpyB,EAAOmxB,iBAAkBvL,GACxCyM,EAAoC,OAAjBD,EAASriB,IAG5BuiB,EAAsE,KAA9CC,EAAoBH,EAASI,YAIrD5M,EAAIrB,MAAMkO,MAAQ,MAClBC,EAA6D,KAAzCH,EAAoBH,EAASK,OAIjDE,EAAgE,KAAzCJ,EAAoBH,EAASX,OAMpD7L,EAAIrB,MAAMqO,SAAW,WACrBC,EAAiE,KAA9CN,EAAoB3M,EAAIkN,YAAc,GAEzDnjB,GAAgB9M,YAAaqvB,GAI7BtM,EAAM,MAGP,SAAS2M,EAAoBQ,GAC5B,OAAO/sB,KAAKgtB,MAAOC,WAAYF,IAGhC,IAAIV,EAAkBM,EAAsBE,EAAkBH,EAC7DQ,EAAyBZ,EACzBJ,EAAYryB,EAASyC,cAAe,OACpCsjB,EAAM/lB,EAASyC,cAAe,OAGzBsjB,EAAIrB,QAMVqB,EAAIrB,MAAM4O,eAAiB,cAC3BvN,EAAIM,WAAW,GAAO3B,MAAM4O,eAAiB,GAC7C9xB,EAAQ+xB,gBAA+C,gBAA7BxN,EAAIrB,MAAM4O,eAEpCnwB,EAAOmC,OAAQ9D,EAAS,CACvBgyB,kBAAmB,WAElB,OADApB,IACOU,GAERd,eAAgB,WAEf,OADAI,IACOS,GAERY,cAAe,WAEd,OADArB,IACOI,GAERkB,mBAAoB,WAEnB,OADAtB,IACOK,GAERkB,cAAe,WAEd,OADAvB,IACOY,GAQRY,qBAAsB,WACrB,IAAIC,EAAOlN,EAAImN,EAASC,EAoBxB,OAnBgC,MAA3BV,IACJQ,EAAQ7zB,EAASyC,cAAe,SAChCkkB,EAAK3mB,EAASyC,cAAe,MAC7BqxB,EAAU9zB,EAASyC,cAAe,OAElCoxB,EAAMnP,MAAM4N,QAAU,kCACtB3L,EAAGjC,MAAMsP,OAAS,MAClBF,EAAQpP,MAAMsP,OAAS,MAEvBlkB,GACEhN,YAAa+wB,GACb/wB,YAAa6jB,GACb7jB,YAAagxB,GAEfC,EAAU5zB,EAAOmxB,iBAAkB3K,GACnC0M,EAAuD,EAA7BY,SAAUF,EAAQC,QAE5ClkB,GAAgB9M,YAAa6wB,IAEvBR,MApHV,GAmMA,IAAIa,GAAc,CAAE,SAAU,MAAO,MACpCC,GAAan0B,EAASyC,cAAe,OAAQiiB,MAC7C0P,GAAc,GAkBf,SAASC,GAAe7uB,GACvB,IAAI8uB,EAAQnxB,EAAOoxB,SAAU/uB,IAAU4uB,GAAa5uB,GAEpD,OAAK8uB,IAGA9uB,KAAQ2uB,GACL3uB,EAED4uB,GAAa5uB,GAxBrB,SAAyBA,GAGxB,IAAIgvB,EAAUhvB,EAAM,GAAI0c,cAAgB1c,EAAK9E,MAAO,GACnD4B,EAAI4xB,GAAYzwB,OAEjB,MAAQnB,IAEP,IADAkD,EAAO0uB,GAAa5xB,GAAMkyB,KACbL,GACZ,OAAO3uB,EAeoBivB,CAAgBjvB,IAAUA,GAIxD,IAKCkvB,GAAe,4BACfC,GAAc,MACdC,GAAU,CAAE7B,SAAU,WAAY8B,WAAY,SAAUlQ,QAAS,SACjEmQ,GAAqB,CACpBC,cAAe,IACfC,WAAY,OAGd,SAASC,GAAmBlwB,EAAOuC,EAAO4tB,GAIzC,IAAI/tB,EAAUid,GAAQ9W,KAAMhG,GAC5B,OAAOH,EAGNhB,KAAKgvB,IAAK,EAAGhuB,EAAS,IAAQ+tB,GAAY,KAAU/tB,EAAS,IAAO,MACpEG,EAGF,SAAS8tB,GAAoB5wB,EAAM6wB,EAAWC,EAAKC,EAAaC,EAAQC,GACvE,IAAInzB,EAAkB,UAAd+yB,EAAwB,EAAI,EACnCK,EAAQ,EACRC,EAAQ,EAGT,GAAKL,KAAUC,EAAc,SAAW,WACvC,OAAO,EAGR,KAAQjzB,EAAI,EAAGA,GAAK,EAGN,WAARgzB,IACJK,GAASxyB,EAAOyhB,IAAKpgB,EAAM8wB,EAAMjR,GAAW/hB,IAAK,EAAMkzB,IAIlDD,GAmBQ,YAARD,IACJK,GAASxyB,EAAOyhB,IAAKpgB,EAAM,UAAY6f,GAAW/hB,IAAK,EAAMkzB,IAIjD,WAARF,IACJK,GAASxyB,EAAOyhB,IAAKpgB,EAAM,SAAW6f,GAAW/hB,GAAM,SAAS,EAAMkzB,MAtBvEG,GAASxyB,EAAOyhB,IAAKpgB,EAAM,UAAY6f,GAAW/hB,IAAK,EAAMkzB,GAGhD,YAARF,EACJK,GAASxyB,EAAOyhB,IAAKpgB,EAAM,SAAW6f,GAAW/hB,GAAM,SAAS,EAAMkzB,GAItEE,GAASvyB,EAAOyhB,IAAKpgB,EAAM,SAAW6f,GAAW/hB,GAAM,SAAS,EAAMkzB,IAoCzE,OAhBMD,GAA8B,GAAfE,IAIpBE,GAASxvB,KAAKgvB,IAAK,EAAGhvB,KAAKyvB,KAC1BpxB,EAAM,SAAW6wB,EAAW,GAAInT,cAAgBmT,EAAU30B,MAAO,IACjE+0B,EACAE,EACAD,EACA,MAIM,GAGDC,EAGR,SAASE,GAAkBrxB,EAAM6wB,EAAWK,GAG3C,IAAIF,EAASpE,GAAW5sB,GAKvB+wB,IADmB/zB,EAAQgyB,qBAAuBkC,IAEE,eAAnDvyB,EAAOyhB,IAAKpgB,EAAM,aAAa,EAAOgxB,GACvCM,EAAmBP,EAEnBhzB,EAAMmvB,GAAQltB,EAAM6wB,EAAWG,GAC/BO,EAAa,SAAWV,EAAW,GAAInT,cAAgBmT,EAAU30B,MAAO,GAIzE,GAAKywB,GAAUvjB,KAAMrL,GAAQ,CAC5B,IAAMmzB,EACL,OAAOnzB,EAERA,EAAM,OAyCP,QAlCQf,EAAQgyB,qBAAuB+B,IAMrC/zB,EAAQoyB,wBAA0BpnB,EAAUhI,EAAM,OAI3C,SAARjC,IAIC6wB,WAAY7wB,IAA0D,WAAjDY,EAAOyhB,IAAKpgB,EAAM,WAAW,EAAOgxB,KAG1DhxB,EAAKwxB,iBAAiBvyB,SAEtB8xB,EAAiE,eAAnDpyB,EAAOyhB,IAAKpgB,EAAM,aAAa,EAAOgxB,IAKpDM,EAAmBC,KAAcvxB,KAEhCjC,EAAMiC,EAAMuxB,MAKdxzB,EAAM6wB,WAAY7wB,IAAS,GAI1B6yB,GACC5wB,EACA6wB,EACAK,IAAWH,EAAc,SAAW,WACpCO,EACAN,EAGAjzB,GAEE,KA+SL,SAAS0zB,GAAOzxB,EAAMe,EAASsd,EAAM1d,EAAK+wB,GACzC,OAAO,IAAID,GAAMvyB,UAAUH,KAAMiB,EAAMe,EAASsd,EAAM1d,EAAK+wB,GA7S5D/yB,EAAOmC,OAAQ,CAId6wB,SAAU,CACTC,QAAS,CACRtyB,IAAK,SAAUU,EAAMmtB,GACpB,GAAKA,EAAW,CAGf,IAAIztB,EAAMwtB,GAAQltB,EAAM,WACxB,MAAe,KAARN,EAAa,IAAMA,MAO9BohB,UAAW,CACV+Q,yBAA2B,EAC3BC,aAAe,EACfC,aAAe,EACfC,UAAY,EACZC,YAAc,EACdzB,YAAc,EACd0B,UAAY,EACZC,YAAc,EACdC,eAAiB,EACjBC,iBAAmB,EACnBC,SAAW,EACXC,YAAc,EACdC,cAAgB,EAChBC,YAAc,EACdb,SAAW,EACXc,OAAS,EACTC,SAAW,EACXC,QAAU,EACVC,QAAU,EACVC,MAAQ,GAKT/C,SAAU,GAGV7P,MAAO,SAAUlgB,EAAMgB,EAAM8B,EAAOouB,GAGnC,GAAMlxB,GAA0B,IAAlBA,EAAK7C,UAAoC,IAAlB6C,EAAK7C,UAAmB6C,EAAKkgB,MAAlE,CAKA,IAAIxgB,EAAKpC,EAAM6hB,EACd4T,EAAWpV,EAAW3c,GACtBgyB,EAAe7C,GAAY/mB,KAAMpI,GACjCkf,EAAQlgB,EAAKkgB,MAad,GARM8S,IACLhyB,EAAO6uB,GAAekD,IAIvB5T,EAAQxgB,EAAOgzB,SAAU3wB,IAAUrC,EAAOgzB,SAAUoB,QAGrCtxB,IAAVqB,EA0CJ,OAAKqc,GAAS,QAASA,QACwB1d,KAA5C/B,EAAMyf,EAAM7f,IAAKU,GAAM,EAAOkxB,IAEzBxxB,EAIDwgB,EAAOlf,GA7CA,YAHd1D,SAAcwF,KAGcpD,EAAMkgB,GAAQ9W,KAAMhG,KAAapD,EAAK,KACjEoD,EAAQud,GAAWrgB,EAAMgB,EAAMtB,GAG/BpC,EAAO,UAIM,MAATwF,GAAiBA,GAAUA,IAOlB,WAATxF,GAAsB01B,IAC1BlwB,GAASpD,GAAOA,EAAK,KAASf,EAAOmiB,UAAWiS,GAAa,GAAK,OAI7D/1B,EAAQ+xB,iBAA6B,KAAVjsB,GAAiD,IAAjC9B,EAAKvE,QAAS,gBAC9DyjB,EAAOlf,GAAS,WAIXme,GAAY,QAASA,QACsB1d,KAA9CqB,EAAQqc,EAAMhB,IAAKne,EAAM8C,EAAOouB,MAE7B8B,EACJ9S,EAAM+S,YAAajyB,EAAM8B,GAEzBod,EAAOlf,GAAS8B,MAkBpBsd,IAAK,SAAUpgB,EAAMgB,EAAMkwB,EAAOF,GACjC,IAAIjzB,EAAKwB,EAAK4f,EACb4T,EAAWpV,EAAW3c,GA6BvB,OA5BgBmvB,GAAY/mB,KAAMpI,KAMjCA,EAAO6uB,GAAekD,KAIvB5T,EAAQxgB,EAAOgzB,SAAU3wB,IAAUrC,EAAOgzB,SAAUoB,KAGtC,QAAS5T,IACtBphB,EAAMohB,EAAM7f,IAAKU,GAAM,EAAMkxB,SAIjBzvB,IAAR1D,IACJA,EAAMmvB,GAAQltB,EAAMgB,EAAMgwB,IAId,WAARjzB,GAAoBiD,KAAQsvB,KAChCvyB,EAAMuyB,GAAoBtvB,IAIZ,KAAVkwB,GAAgBA,GACpB3xB,EAAMqvB,WAAY7wB,IACD,IAAVmzB,GAAkBgC,SAAU3zB,GAAQA,GAAO,EAAIxB,GAGhDA,KAITY,EAAOkB,KAAM,CAAE,SAAU,SAAW,SAAUsD,EAAI0tB,GACjDlyB,EAAOgzB,SAAUd,GAAc,CAC9BvxB,IAAK,SAAUU,EAAMmtB,EAAU+D,GAC9B,GAAK/D,EAIJ,OAAO+C,GAAa9mB,KAAMzK,EAAOyhB,IAAKpgB,EAAM,aAQxCA,EAAKwxB,iBAAiBvyB,QAAWe,EAAKmzB,wBAAwB/F,MAIhEiE,GAAkBrxB,EAAM6wB,EAAWK,GAHnCnE,GAAM/sB,EAAMowB,GAAS,WACpB,OAAOiB,GAAkBrxB,EAAM6wB,EAAWK,MAM/C/S,IAAK,SAAUne,EAAM8C,EAAOouB,GAC3B,IAAIvuB,EACHquB,EAASpE,GAAW5sB,GAIpBozB,GAAsBp2B,EAAQmyB,iBACT,aAApB6B,EAAOzC,SAIRwC,GADkBqC,GAAsBlC,IAEY,eAAnDvyB,EAAOyhB,IAAKpgB,EAAM,aAAa,EAAOgxB,GACvCN,EAAWQ,EACVN,GACC5wB,EACA6wB,EACAK,EACAH,EACAC,GAED,EAqBF,OAjBKD,GAAeqC,IACnB1C,GAAY/uB,KAAKyvB,KAChBpxB,EAAM,SAAW6wB,EAAW,GAAInT,cAAgBmT,EAAU30B,MAAO,IACjE0yB,WAAYoC,EAAQH,IACpBD,GAAoB5wB,EAAM6wB,EAAW,UAAU,EAAOG,GACtD,KAKGN,IAAc/tB,EAAUid,GAAQ9W,KAAMhG,KACb,QAA3BH,EAAS,IAAO,QAElB3C,EAAKkgB,MAAO2Q,GAAc/tB,EAC1BA,EAAQnE,EAAOyhB,IAAKpgB,EAAM6wB,IAGpBJ,GAAmBzwB,EAAM8C,EAAO4tB,OAK1C/xB,EAAOgzB,SAASxD,WAAaV,GAAczwB,EAAQkyB,mBAClD,SAAUlvB,EAAMmtB,GACf,GAAKA,EACJ,OAASyB,WAAY1B,GAAQltB,EAAM,gBAClCA,EAAKmzB,wBAAwBE,KAC5BtG,GAAM/sB,EAAM,CAAEmuB,WAAY,GAAK,WAC9B,OAAOnuB,EAAKmzB,wBAAwBE,QAElC,OAMR10B,EAAOkB,KAAM,CACZyzB,OAAQ,GACRC,QAAS,GACTC,OAAQ,SACN,SAAUC,EAAQC,GACpB/0B,EAAOgzB,SAAU8B,EAASC,GAAW,CACpCC,OAAQ,SAAU7wB,GAOjB,IANA,IAAIhF,EAAI,EACP81B,EAAW,GAGXC,EAAyB,iBAAV/wB,EAAqBA,EAAMI,MAAO,KAAQ,CAAEJ,GAEpDhF,EAAI,EAAGA,IACd81B,EAAUH,EAAS5T,GAAW/hB,GAAM41B,GACnCG,EAAO/1B,IAAO+1B,EAAO/1B,EAAI,IAAO+1B,EAAO,GAGzC,OAAOD,IAIO,WAAXH,IACJ90B,EAAOgzB,SAAU8B,EAASC,GAASvV,IAAMsS,MAI3C9xB,EAAOG,GAAGgC,OAAQ,CACjBsf,IAAK,SAAUpf,EAAM8B,GACpB,OAAOia,EAAQnhB,KAAM,SAAUoE,EAAMgB,EAAM8B,GAC1C,IAAIkuB,EAAQvwB,EACXV,EAAM,GACNjC,EAAI,EAEL,GAAKyD,MAAMC,QAASR,GAAS,CAI5B,IAHAgwB,EAASpE,GAAW5sB,GACpBS,EAAMO,EAAK/B,OAEHnB,EAAI2C,EAAK3C,IAChBiC,EAAKiB,EAAMlD,IAAQa,EAAOyhB,IAAKpgB,EAAMgB,EAAMlD,IAAK,EAAOkzB,GAGxD,OAAOjxB,EAGR,YAAiB0B,IAAVqB,EACNnE,EAAOuhB,MAAOlgB,EAAMgB,EAAM8B,GAC1BnE,EAAOyhB,IAAKpgB,EAAMgB,IACjBA,EAAM8B,EAA0B,EAAnB7C,UAAUhB,aAQ5BN,EAAO8yB,MAAQA,IAETvyB,UAAY,CACjBE,YAAaqyB,GACb1yB,KAAM,SAAUiB,EAAMe,EAASsd,EAAM1d,EAAK+wB,EAAQ7Q,GACjDjlB,KAAKoE,KAAOA,EACZpE,KAAKyiB,KAAOA,EACZziB,KAAK81B,OAASA,GAAU/yB,EAAO+yB,OAAOrP,SACtCzmB,KAAKmF,QAAUA,EACfnF,KAAKiU,MAAQjU,KAAKosB,IAAMpsB,KAAK6O,MAC7B7O,KAAK+E,IAAMA,EACX/E,KAAKilB,KAAOA,IAAUliB,EAAOmiB,UAAWzC,GAAS,GAAK,OAEvD5T,IAAK,WACJ,IAAI0U,EAAQsS,GAAMqC,UAAWl4B,KAAKyiB,MAElC,OAAOc,GAASA,EAAM7f,IACrB6f,EAAM7f,IAAK1D,MACX61B,GAAMqC,UAAUzR,SAAS/iB,IAAK1D,OAEhCm4B,IAAK,SAAUC,GACd,IAAIC,EACH9U,EAAQsS,GAAMqC,UAAWl4B,KAAKyiB,MAoB/B,OAlBKziB,KAAKmF,QAAQmzB,SACjBt4B,KAAKu4B,IAAMF,EAAQt1B,EAAO+yB,OAAQ91B,KAAK81B,QACtCsC,EAASp4B,KAAKmF,QAAQmzB,SAAWF,EAAS,EAAG,EAAGp4B,KAAKmF,QAAQmzB,UAG9Dt4B,KAAKu4B,IAAMF,EAAQD,EAEpBp4B,KAAKosB,KAAQpsB,KAAK+E,IAAM/E,KAAKiU,OAAUokB,EAAQr4B,KAAKiU,MAE/CjU,KAAKmF,QAAQqzB,MACjBx4B,KAAKmF,QAAQqzB,KAAK/3B,KAAMT,KAAKoE,KAAMpE,KAAKosB,IAAKpsB,MAGzCujB,GAASA,EAAMhB,IACnBgB,EAAMhB,IAAKviB,MAEX61B,GAAMqC,UAAUzR,SAASlE,IAAKviB,MAExBA,QAIOmD,KAAKG,UAAYuyB,GAAMvyB,WAEvCuyB,GAAMqC,UAAY,CACjBzR,SAAU,CACT/iB,IAAK,SAAUihB,GACd,IAAIrR,EAIJ,OAA6B,IAAxBqR,EAAMvgB,KAAK7C,UACa,MAA5BojB,EAAMvgB,KAAMugB,EAAMlC,OAAoD,MAAlCkC,EAAMvgB,KAAKkgB,MAAOK,EAAMlC,MACrDkC,EAAMvgB,KAAMugB,EAAMlC,OAO1BnP,EAASvQ,EAAOyhB,IAAKG,EAAMvgB,KAAMugB,EAAMlC,KAAM,MAGhB,SAAXnP,EAAwBA,EAAJ,GAEvCiP,IAAK,SAAUoC,GAKT5hB,EAAO01B,GAAGD,KAAM7T,EAAMlC,MAC1B1f,EAAO01B,GAAGD,KAAM7T,EAAMlC,MAAQkC,GACK,IAAxBA,EAAMvgB,KAAK7C,WACrBwB,EAAOgzB,SAAUpR,EAAMlC,OAC4B,MAAnDkC,EAAMvgB,KAAKkgB,MAAO2P,GAAetP,EAAMlC,OAGxCkC,EAAMvgB,KAAMugB,EAAMlC,MAASkC,EAAMyH,IAFjCrpB,EAAOuhB,MAAOK,EAAMvgB,KAAMugB,EAAMlC,KAAMkC,EAAMyH,IAAMzH,EAAMM,UAU5CyT,UAAY7C,GAAMqC,UAAUS,WAAa,CACxDpW,IAAK,SAAUoC,GACTA,EAAMvgB,KAAK7C,UAAYojB,EAAMvgB,KAAKzB,aACtCgiB,EAAMvgB,KAAMugB,EAAMlC,MAASkC,EAAMyH,OAKpCrpB,EAAO+yB,OAAS,CACf8C,OAAQ,SAAUC,GACjB,OAAOA,GAERC,MAAO,SAAUD,GAChB,MAAO,GAAM9yB,KAAKgzB,IAAKF,EAAI9yB,KAAKizB,IAAO,GAExCvS,SAAU,SAGX1jB,EAAO01B,GAAK5C,GAAMvyB,UAAUH,KAG5BJ,EAAO01B,GAAGD,KAAO,GAKjB,IACCS,GAAOC,GAkrBHvoB,GAEHwoB,GAnrBDC,GAAW,yBACXC,GAAO,cAER,SAASC,KACHJ,MACqB,IAApBt5B,EAAS25B,QAAoBx5B,EAAOy5B,sBACxCz5B,EAAOy5B,sBAAuBF,IAE9Bv5B,EAAO8f,WAAYyZ,GAAUv2B,EAAO01B,GAAGgB,UAGxC12B,EAAO01B,GAAGiB,QAKZ,SAASC,KAIR,OAHA55B,EAAO8f,WAAY,WAClBoZ,QAAQpzB,IAEAozB,GAAQxwB,KAAK2jB,MAIvB,SAASwN,GAAOl4B,EAAMm4B,GACrB,IAAI5L,EACH/rB,EAAI,EACJuM,EAAQ,CAAEmlB,OAAQlyB,GAKnB,IADAm4B,EAAeA,EAAe,EAAI,EAC1B33B,EAAI,EAAGA,GAAK,EAAI23B,EAEvBprB,EAAO,UADPwf,EAAQhK,GAAW/hB,KACSuM,EAAO,UAAYwf,GAAUvsB,EAO1D,OAJKm4B,IACJprB,EAAMunB,QAAUvnB,EAAM+iB,MAAQ9vB,GAGxB+M,EAGR,SAASqrB,GAAa5yB,EAAOub,EAAMsX,GAKlC,IAJA,IAAIpV,EACHyK,GAAe4K,GAAUC,SAAUxX,IAAU,IAAK/hB,OAAQs5B,GAAUC,SAAU,MAC9E5e,EAAQ,EACRhY,EAAS+rB,EAAW/rB,OACbgY,EAAQhY,EAAQgY,IACvB,GAAOsJ,EAAQyK,EAAY/T,GAAQ5a,KAAMs5B,EAAWtX,EAAMvb,GAGzD,OAAOyd,EAsNV,SAASqV,GAAW51B,EAAM81B,EAAY/0B,GACrC,IAAImO,EACH6mB,EACA9e,EAAQ,EACRhY,EAAS22B,GAAUI,WAAW/2B,OAC9B+a,EAAWrb,EAAOgb,WAAWI,OAAQ,kBAG7Bub,EAAKt1B,OAEbs1B,EAAO,WACN,GAAKS,EACJ,OAAO,EAYR,IAVA,IAAIE,EAAcpB,IAASU,KAC1B1Z,EAAYla,KAAKgvB,IAAK,EAAGgF,EAAUO,UAAYP,EAAUzB,SAAW+B,GAKpEjC,EAAU,GADHnY,EAAY8Z,EAAUzB,UAAY,GAEzCjd,EAAQ,EACRhY,EAAS02B,EAAUQ,OAAOl3B,OAEnBgY,EAAQhY,EAAQgY,IACvB0e,EAAUQ,OAAQlf,GAAQ8c,IAAKC,GAMhC,OAHAha,EAASkB,WAAYlb,EAAM,CAAE21B,EAAW3B,EAASnY,IAG5CmY,EAAU,GAAK/0B,EACZ4c,GAIF5c,GACL+a,EAASkB,WAAYlb,EAAM,CAAE21B,EAAW,EAAG,IAI5C3b,EAASmB,YAAanb,EAAM,CAAE21B,KACvB,IAERA,EAAY3b,EAASzB,QAAS,CAC7BvY,KAAMA,EACN2nB,MAAOhpB,EAAOmC,OAAQ,GAAIg1B,GAC1BM,KAAMz3B,EAAOmC,QAAQ,EAAM,CAC1Bu1B,cAAe,GACf3E,OAAQ/yB,EAAO+yB,OAAOrP,UACpBthB,GACHu1B,mBAAoBR,EACpBS,gBAAiBx1B,EACjBm1B,UAAWrB,IAASU,KACpBrB,SAAUnzB,EAAQmzB,SAClBiC,OAAQ,GACRT,YAAa,SAAUrX,EAAM1d,GAC5B,IAAI4f,EAAQ5hB,EAAO8yB,MAAOzxB,EAAM21B,EAAUS,KAAM/X,EAAM1d,EACpDg1B,EAAUS,KAAKC,cAAehY,IAAUsX,EAAUS,KAAK1E,QAEzD,OADAiE,EAAUQ,OAAO35B,KAAM+jB,GAChBA,GAERlB,KAAM,SAAUmX,GACf,IAAIvf,EAAQ,EAIXhY,EAASu3B,EAAUb,EAAUQ,OAAOl3B,OAAS,EAC9C,GAAK82B,EACJ,OAAOn6B,KAGR,IADAm6B,GAAU,EACF9e,EAAQhY,EAAQgY,IACvB0e,EAAUQ,OAAQlf,GAAQ8c,IAAK,GAUhC,OANKyC,GACJxc,EAASkB,WAAYlb,EAAM,CAAE21B,EAAW,EAAG,IAC3C3b,EAASmB,YAAanb,EAAM,CAAE21B,EAAWa,KAEzCxc,EAASuB,WAAYvb,EAAM,CAAE21B,EAAWa,IAElC56B,QAGT+rB,EAAQgO,EAAUhO,MAInB,KA/HD,SAAqBA,EAAO0O,GAC3B,IAAIpf,EAAOjW,EAAM0wB,EAAQ5uB,EAAOqc,EAGhC,IAAMlI,KAAS0Q,EAed,GAbA+J,EAAS2E,EADTr1B,EAAO2c,EAAW1G,IAElBnU,EAAQ6kB,EAAO1Q,GACV1V,MAAMC,QAASsB,KACnB4uB,EAAS5uB,EAAO,GAChBA,EAAQ6kB,EAAO1Q,GAAUnU,EAAO,IAG5BmU,IAAUjW,IACd2mB,EAAO3mB,GAAS8B,SACT6kB,EAAO1Q,KAGfkI,EAAQxgB,EAAOgzB,SAAU3wB,KACX,WAAYme,EAMzB,IAAMlI,KALNnU,EAAQqc,EAAMwU,OAAQ7wB,UACf6kB,EAAO3mB,GAIC8B,EACNmU,KAAS0Q,IAChBA,EAAO1Q,GAAUnU,EAAOmU,GACxBof,EAAepf,GAAUya,QAI3B2E,EAAer1B,GAAS0wB,EA6F1B+E,CAAY9O,EAAOgO,EAAUS,KAAKC,eAE1Bpf,EAAQhY,EAAQgY,IAEvB,GADA/H,EAAS0mB,GAAUI,WAAY/e,GAAQ5a,KAAMs5B,EAAW31B,EAAM2nB,EAAOgO,EAAUS,MAM9E,OAJKn5B,EAAYiS,EAAOmQ,QACvB1gB,EAAOygB,YAAauW,EAAU31B,KAAM21B,EAAUS,KAAKld,OAAQmG,KAC1DnQ,EAAOmQ,KAAKqX,KAAMxnB,IAEbA,EAyBT,OArBAvQ,EAAOoB,IAAK4nB,EAAO+N,GAAaC,GAE3B14B,EAAY04B,EAAUS,KAAKvmB,QAC/B8lB,EAAUS,KAAKvmB,MAAMxT,KAAM2D,EAAM21B,GAIlCA,EACEpb,SAAUob,EAAUS,KAAK7b,UACzB/V,KAAMmxB,EAAUS,KAAK5xB,KAAMmxB,EAAUS,KAAKO,UAC1Cne,KAAMmd,EAAUS,KAAK5d,MACrBuB,OAAQ4b,EAAUS,KAAKrc,QAEzBpb,EAAO01B,GAAGuC,MACTj4B,EAAOmC,OAAQw0B,EAAM,CACpBt1B,KAAMA,EACN62B,KAAMlB,EACNzc,MAAOyc,EAAUS,KAAKld,SAIjByc,EAGRh3B,EAAOi3B,UAAYj3B,EAAOmC,OAAQ80B,GAAW,CAE5CC,SAAU,CACTiB,IAAK,CAAE,SAAUzY,EAAMvb,GACtB,IAAIyd,EAAQ3kB,KAAK85B,YAAarX,EAAMvb,GAEpC,OADAud,GAAWE,EAAMvgB,KAAMqe,EAAMuB,GAAQ9W,KAAMhG,GAASyd,GAC7CA,KAITwW,QAAS,SAAUpP,EAAO7nB,GACpB7C,EAAY0qB,IAChB7nB,EAAW6nB,EACXA,EAAQ,CAAE,MAEVA,EAAQA,EAAMlf,MAAOoP,GAOtB,IAJA,IAAIwG,EACHpH,EAAQ,EACRhY,EAAS0oB,EAAM1oB,OAERgY,EAAQhY,EAAQgY,IACvBoH,EAAOsJ,EAAO1Q,GACd2e,GAAUC,SAAUxX,GAASuX,GAAUC,SAAUxX,IAAU,GAC3DuX,GAAUC,SAAUxX,GAAO9Q,QAASzN,IAItCk2B,WAAY,CA3Wb,SAA2Bh2B,EAAM2nB,EAAOyO,GACvC,IAAI/X,EAAMvb,EAAOwe,EAAQnC,EAAO6X,EAASC,EAAWC,EAAgB/W,EACnEgX,EAAQ,UAAWxP,GAAS,WAAYA,EACxCkP,EAAOj7B,KACPuuB,EAAO,GACPjK,EAAQlgB,EAAKkgB,MACbiV,EAASn1B,EAAK7C,UAAY8iB,GAAoBjgB,GAC9Co3B,EAAW7Y,EAASjf,IAAKU,EAAM,UA6BhC,IAAMqe,KA1BA+X,EAAKld,QAEa,OADvBiG,EAAQxgB,EAAOygB,YAAapf,EAAM,OACvBq3B,WACVlY,EAAMkY,SAAW,EACjBL,EAAU7X,EAAM1N,MAAM2H,KACtB+F,EAAM1N,MAAM2H,KAAO,WACZ+F,EAAMkY,UACXL,MAIH7X,EAAMkY,WAENR,EAAK9c,OAAQ,WAGZ8c,EAAK9c,OAAQ,WACZoF,EAAMkY,WACA14B,EAAOua,MAAOlZ,EAAM,MAAOf,QAChCkgB,EAAM1N,MAAM2H,YAOFuO,EAEb,GADA7kB,EAAQ6kB,EAAOtJ,GACV2W,GAAS5rB,KAAMtG,GAAU,CAG7B,UAFO6kB,EAAOtJ,GACdiD,EAASA,GAAoB,WAAVxe,EACdA,KAAYqyB,EAAS,OAAS,QAAW,CAI7C,GAAe,SAAVryB,IAAoBs0B,QAAiC31B,IAArB21B,EAAU/Y,GAK9C,SAJA8W,GAAS,EAOXhL,EAAM9L,GAAS+Y,GAAYA,EAAU/Y,IAAU1f,EAAOuhB,MAAOlgB,EAAMqe,GAMrE,IADA4Y,GAAat4B,EAAOyD,cAAeulB,MAChBhpB,EAAOyD,cAAe+nB,GA8DzC,IAAM9L,KAzDD8Y,GAA2B,IAAlBn3B,EAAK7C,WAMlBi5B,EAAKkB,SAAW,CAAEpX,EAAMoX,SAAUpX,EAAMqX,UAAWrX,EAAMsX,WAIlC,OADvBN,EAAiBE,GAAYA,EAASjX,WAErC+W,EAAiB3Y,EAASjf,IAAKU,EAAM,YAGrB,UADjBmgB,EAAUxhB,EAAOyhB,IAAKpgB,EAAM,cAEtBk3B,EACJ/W,EAAU+W,GAIVjW,GAAU,CAAEjhB,IAAQ,GACpBk3B,EAAiBl3B,EAAKkgB,MAAMC,SAAW+W,EACvC/W,EAAUxhB,EAAOyhB,IAAKpgB,EAAM,WAC5BihB,GAAU,CAAEjhB,OAKG,WAAZmgB,GAAoC,iBAAZA,GAAgD,MAAlB+W,IACrB,SAAhCv4B,EAAOyhB,IAAKpgB,EAAM,WAGhBi3B,IACLJ,EAAKryB,KAAM,WACV0b,EAAMC,QAAU+W,IAEM,MAAlBA,IACJ/W,EAAUD,EAAMC,QAChB+W,EAA6B,SAAZ/W,EAAqB,GAAKA,IAG7CD,EAAMC,QAAU,iBAKdiW,EAAKkB,WACTpX,EAAMoX,SAAW,SACjBT,EAAK9c,OAAQ,WACZmG,EAAMoX,SAAWlB,EAAKkB,SAAU,GAChCpX,EAAMqX,UAAYnB,EAAKkB,SAAU,GACjCpX,EAAMsX,UAAYpB,EAAKkB,SAAU,MAKnCL,GAAY,EACE9M,EAGP8M,IACAG,EACC,WAAYA,IAChBjC,EAASiC,EAASjC,QAGnBiC,EAAW7Y,EAASxB,OAAQ/c,EAAM,SAAU,CAAEmgB,QAAS+W,IAInD5V,IACJ8V,EAASjC,QAAUA,GAIfA,GACJlU,GAAU,CAAEjhB,IAAQ,GAKrB62B,EAAKryB,KAAM,WASV,IAAM6Z,KAJA8W,GACLlU,GAAU,CAAEjhB,IAEbue,EAAShF,OAAQvZ,EAAM,UACTmqB,EACbxrB,EAAOuhB,MAAOlgB,EAAMqe,EAAM8L,EAAM9L,OAMnC4Y,EAAYvB,GAAaP,EAASiC,EAAU/Y,GAAS,EAAGA,EAAMwY,GACtDxY,KAAQ+Y,IACfA,EAAU/Y,GAAS4Y,EAAUpnB,MACxBslB,IACJ8B,EAAUt2B,IAAMs2B,EAAUpnB,MAC1BonB,EAAUpnB,MAAQ,MAuMrB4nB,UAAW,SAAU33B,EAAUisB,GACzBA,EACJ6J,GAAUI,WAAWzoB,QAASzN,GAE9B81B,GAAUI,WAAWx5B,KAAMsD,MAK9BnB,EAAO+4B,MAAQ,SAAUA,EAAOhG,EAAQ5yB,GACvC,IAAIi2B,EAAM2C,GAA0B,iBAAVA,EAAqB/4B,EAAOmC,OAAQ,GAAI42B,GAAU,CAC3Ef,SAAU73B,IAAOA,GAAM4yB,GACtBz0B,EAAYy6B,IAAWA,EACxBxD,SAAUwD,EACVhG,OAAQ5yB,GAAM4yB,GAAUA,IAAWz0B,EAAYy0B,IAAYA,GAoC5D,OAhCK/yB,EAAO01B,GAAG/P,IACdyQ,EAAIb,SAAW,EAGc,iBAAjBa,EAAIb,WACVa,EAAIb,YAAYv1B,EAAO01B,GAAGsD,OAC9B5C,EAAIb,SAAWv1B,EAAO01B,GAAGsD,OAAQ5C,EAAIb,UAGrCa,EAAIb,SAAWv1B,EAAO01B,GAAGsD,OAAOtV,UAMjB,MAAb0S,EAAI7b,QAA+B,IAAd6b,EAAI7b,QAC7B6b,EAAI7b,MAAQ,MAIb6b,EAAI/H,IAAM+H,EAAI4B,SAEd5B,EAAI4B,SAAW,WACT15B,EAAY83B,EAAI/H,MACpB+H,EAAI/H,IAAI3wB,KAAMT,MAGVm5B,EAAI7b,OACRva,EAAOsgB,QAASrjB,KAAMm5B,EAAI7b,QAIrB6b,GAGRp2B,EAAOG,GAAGgC,OAAQ,CACjB82B,OAAQ,SAAUF,EAAOG,EAAInG,EAAQ5xB,GAGpC,OAAOlE,KAAKqQ,OAAQgU,IAAqBG,IAAK,UAAW,GAAIc,OAG3DvgB,MAAMm3B,QAAS,CAAElG,QAASiG,GAAMH,EAAOhG,EAAQ5xB,IAElDg4B,QAAS,SAAUzZ,EAAMqZ,EAAOhG,EAAQ5xB,GACvC,IAAI2R,EAAQ9S,EAAOyD,cAAeic,GACjC0Z,EAASp5B,EAAO+4B,MAAOA,EAAOhG,EAAQ5xB,GACtCk4B,EAAc,WAGb,IAAInB,EAAOjB,GAAWh6B,KAAM+C,EAAOmC,OAAQ,GAAIud,GAAQ0Z,IAGlDtmB,GAAS8M,EAASjf,IAAK1D,KAAM,YACjCi7B,EAAKxX,MAAM,IAKd,OAFC2Y,EAAYC,OAASD,EAEfvmB,IAA0B,IAAjBsmB,EAAO7e,MACtBtd,KAAKiE,KAAMm4B,GACXp8B,KAAKsd,MAAO6e,EAAO7e,MAAO8e,IAE5B3Y,KAAM,SAAU/hB,EAAMiiB,EAAYiX,GACjC,IAAI0B,EAAY,SAAU/Y,GACzB,IAAIE,EAAOF,EAAME,YACVF,EAAME,KACbA,EAAMmX,IAYP,MATqB,iBAATl5B,IACXk5B,EAAUjX,EACVA,EAAajiB,EACbA,OAAOmE,GAEH8d,GACJ3jB,KAAKsd,MAAO5b,GAAQ,KAAM,IAGpB1B,KAAKiE,KAAM,WACjB,IAAIof,GAAU,EACbhI,EAAgB,MAAR3Z,GAAgBA,EAAO,aAC/B66B,EAASx5B,EAAOw5B,OAChB/Z,EAAOG,EAASjf,IAAK1D,MAEtB,GAAKqb,EACCmH,EAAMnH,IAAWmH,EAAMnH,GAAQoI,MACnC6Y,EAAW9Z,EAAMnH,SAGlB,IAAMA,KAASmH,EACTA,EAAMnH,IAAWmH,EAAMnH,GAAQoI,MAAQ4V,GAAK7rB,KAAM6N,IACtDihB,EAAW9Z,EAAMnH,IAKpB,IAAMA,EAAQkhB,EAAOl5B,OAAQgY,KACvBkhB,EAAQlhB,GAAQjX,OAASpE,MACnB,MAAR0B,GAAgB66B,EAAQlhB,GAAQiC,QAAU5b,IAE5C66B,EAAQlhB,GAAQ4f,KAAKxX,KAAMmX,GAC3BvX,GAAU,EACVkZ,EAAOt3B,OAAQoW,EAAO,KAOnBgI,GAAYuX,GAChB73B,EAAOsgB,QAASrjB,KAAM0B,MAIzB26B,OAAQ,SAAU36B,GAIjB,OAHc,IAATA,IACJA,EAAOA,GAAQ,MAET1B,KAAKiE,KAAM,WACjB,IAAIoX,EACHmH,EAAOG,EAASjf,IAAK1D,MACrBsd,EAAQkF,EAAM9gB,EAAO,SACrB6hB,EAAQf,EAAM9gB,EAAO,cACrB66B,EAASx5B,EAAOw5B,OAChBl5B,EAASia,EAAQA,EAAMja,OAAS,EAajC,IAVAmf,EAAK6Z,QAAS,EAGdt5B,EAAOua,MAAOtd,KAAM0B,EAAM,IAErB6hB,GAASA,EAAME,MACnBF,EAAME,KAAKhjB,KAAMT,MAAM,GAIlBqb,EAAQkhB,EAAOl5B,OAAQgY,KACvBkhB,EAAQlhB,GAAQjX,OAASpE,MAAQu8B,EAAQlhB,GAAQiC,QAAU5b,IAC/D66B,EAAQlhB,GAAQ4f,KAAKxX,MAAM,GAC3B8Y,EAAOt3B,OAAQoW,EAAO,IAKxB,IAAMA,EAAQ,EAAGA,EAAQhY,EAAQgY,IAC3BiC,EAAOjC,IAAWiC,EAAOjC,GAAQghB,QACrC/e,EAAOjC,GAAQghB,OAAO57B,KAAMT,aAKvBwiB,EAAK6Z,YAKft5B,EAAOkB,KAAM,CAAE,SAAU,OAAQ,QAAU,SAAUsD,EAAInC,GACxD,IAAIo3B,EAAQz5B,EAAOG,GAAIkC,GACvBrC,EAAOG,GAAIkC,GAAS,SAAU02B,EAAOhG,EAAQ5xB,GAC5C,OAAgB,MAAT43B,GAAkC,kBAAVA,EAC9BU,EAAM77B,MAAOX,KAAMqE,WACnBrE,KAAKk8B,QAAStC,GAAOx0B,GAAM,GAAQ02B,EAAOhG,EAAQ5xB,MAKrDnB,EAAOkB,KAAM,CACZw4B,UAAW7C,GAAO,QAClB8C,QAAS9C,GAAO,QAChB+C,YAAa/C,GAAO,UACpBgD,OAAQ,CAAE5G,QAAS,QACnB6G,QAAS,CAAE7G,QAAS,QACpB8G,WAAY,CAAE9G,QAAS,WACrB,SAAU5wB,EAAM2mB,GAClBhpB,EAAOG,GAAIkC,GAAS,SAAU02B,EAAOhG,EAAQ5xB,GAC5C,OAAOlE,KAAKk8B,QAASnQ,EAAO+P,EAAOhG,EAAQ5xB,MAI7CnB,EAAOw5B,OAAS,GAChBx5B,EAAO01B,GAAGiB,KAAO,WAChB,IAAIsB,EACH94B,EAAI,EACJq6B,EAASx5B,EAAOw5B,OAIjB,IAFAtD,GAAQxwB,KAAK2jB,MAELlqB,EAAIq6B,EAAOl5B,OAAQnB,KAC1B84B,EAAQuB,EAAQr6B,OAGCq6B,EAAQr6B,KAAQ84B,GAChCuB,EAAOt3B,OAAQ/C,IAAK,GAIhBq6B,EAAOl5B,QACZN,EAAO01B,GAAGhV,OAEXwV,QAAQpzB,GAGT9C,EAAO01B,GAAGuC,MAAQ,SAAUA,GAC3Bj4B,EAAOw5B,OAAO37B,KAAMo6B,GACpBj4B,EAAO01B,GAAGxkB,SAGXlR,EAAO01B,GAAGgB,SAAW,GACrB12B,EAAO01B,GAAGxkB,MAAQ,WACZilB,KAILA,IAAa,EACbI,OAGDv2B,EAAO01B,GAAGhV,KAAO,WAChByV,GAAa,MAGdn2B,EAAO01B,GAAGsD,OAAS,CAClBgB,KAAM,IACNC,KAAM,IAGNvW,SAAU,KAMX1jB,EAAOG,GAAG+5B,MAAQ,SAAUC,EAAMx7B,GAIjC,OAHAw7B,EAAOn6B,EAAO01B,IAAK11B,EAAO01B,GAAGsD,OAAQmB,IAAiBA,EACtDx7B,EAAOA,GAAQ,KAER1B,KAAKsd,MAAO5b,EAAM,SAAU4K,EAAMiX,GACxC,IAAI4Z,EAAUp9B,EAAO8f,WAAYvT,EAAM4wB,GACvC3Z,EAAME,KAAO,WACZ1jB,EAAOq9B,aAAcD,OAOnBxsB,GAAQ/Q,EAASyC,cAAe,SAEnC82B,GADSv5B,EAASyC,cAAe,UACpBK,YAAa9C,EAASyC,cAAe,WAEnDsO,GAAMjP,KAAO,WAIbN,EAAQi8B,QAA0B,KAAhB1sB,GAAMzJ,MAIxB9F,EAAQk8B,YAAcnE,GAAIxjB,UAI1BhF,GAAQ/Q,EAASyC,cAAe,UAC1B6E,MAAQ,IACdyJ,GAAMjP,KAAO,QACbN,EAAQm8B,WAA6B,MAAhB5sB,GAAMzJ,MAI5B,IAAIs2B,GACH7uB,GAAa5L,EAAO6O,KAAKjD,WAE1B5L,EAAOG,GAAGgC,OAAQ,CACjB4M,KAAM,SAAU1M,EAAM8B,GACrB,OAAOia,EAAQnhB,KAAM+C,EAAO+O,KAAM1M,EAAM8B,EAA0B,EAAnB7C,UAAUhB,SAG1Do6B,WAAY,SAAUr4B,GACrB,OAAOpF,KAAKiE,KAAM,WACjBlB,EAAO06B,WAAYz9B,KAAMoF,QAK5BrC,EAAOmC,OAAQ,CACd4M,KAAM,SAAU1N,EAAMgB,EAAM8B,GAC3B,IAAIpD,EAAKyf,EACRma,EAAQt5B,EAAK7C,SAGd,GAAe,IAAVm8B,GAAyB,IAAVA,GAAyB,IAAVA,EAKnC,MAAkC,oBAAtBt5B,EAAK7B,aACTQ,EAAO0f,KAAMre,EAAMgB,EAAM8B,IAKlB,IAAVw2B,GAAgB36B,EAAO8W,SAAUzV,KACrCmf,EAAQxgB,EAAO46B,UAAWv4B,EAAKoC,iBAC5BzE,EAAO6O,KAAK/E,MAAMjC,KAAK4C,KAAMpI,GAASo4B,QAAW33B,SAGtCA,IAAVqB,EACW,OAAVA,OACJnE,EAAO06B,WAAYr5B,EAAMgB,GAIrBme,GAAS,QAASA,QACuB1d,KAA3C/B,EAAMyf,EAAMhB,IAAKne,EAAM8C,EAAO9B,IACzBtB,GAGRM,EAAK5B,aAAc4C,EAAM8B,EAAQ,IAC1BA,GAGHqc,GAAS,QAASA,GAA+C,QAApCzf,EAAMyf,EAAM7f,IAAKU,EAAMgB,IACjDtB,EAMM,OAHdA,EAAMf,EAAOwN,KAAKuB,KAAM1N,EAAMgB,SAGTS,EAAY/B,IAGlC65B,UAAW,CACVj8B,KAAM,CACL6gB,IAAK,SAAUne,EAAM8C,GACpB,IAAM9F,EAAQm8B,YAAwB,UAAVr2B,GAC3BkF,EAAUhI,EAAM,SAAY,CAC5B,IAAIjC,EAAMiC,EAAK8C,MAKf,OAJA9C,EAAK5B,aAAc,OAAQ0E,GACtB/E,IACJiC,EAAK8C,MAAQ/E,GAEP+E,MAMXu2B,WAAY,SAAUr5B,EAAM8C,GAC3B,IAAI9B,EACHlD,EAAI,EAIJ07B,EAAY12B,GAASA,EAAM2F,MAAOoP,GAEnC,GAAK2hB,GAA+B,IAAlBx5B,EAAK7C,SACtB,MAAU6D,EAAOw4B,EAAW17B,KAC3BkC,EAAK2J,gBAAiB3I,MAO1Bo4B,GAAW,CACVjb,IAAK,SAAUne,EAAM8C,EAAO9B,GAQ3B,OAPe,IAAV8B,EAGJnE,EAAO06B,WAAYr5B,EAAMgB,GAEzBhB,EAAK5B,aAAc4C,EAAMA,GAEnBA,IAITrC,EAAOkB,KAAMlB,EAAO6O,KAAK/E,MAAMjC,KAAKmZ,OAAOlX,MAAO,QAAU,SAAUtF,EAAInC,GACzE,IAAIy4B,EAASlvB,GAAYvJ,IAAUrC,EAAOwN,KAAKuB,KAE/CnD,GAAYvJ,GAAS,SAAUhB,EAAMgB,EAAMwC,GAC1C,IAAI9D,EAAKimB,EACR+T,EAAgB14B,EAAKoC,cAYtB,OAVMI,IAGLmiB,EAASpb,GAAYmvB,GACrBnvB,GAAYmvB,GAAkBh6B,EAC9BA,EAAqC,MAA/B+5B,EAAQz5B,EAAMgB,EAAMwC,GACzBk2B,EACA,KACDnvB,GAAYmvB,GAAkB/T,GAExBjmB,KAOT,IAAIi6B,GAAa,sCAChBC,GAAa,gBAyIb,SAASC,GAAkB/2B,GAE1B,OADaA,EAAM2F,MAAOoP,IAAmB,IAC/BrO,KAAM,KAItB,SAASswB,GAAU95B,GAClB,OAAOA,EAAK7B,cAAgB6B,EAAK7B,aAAc,UAAa,GAG7D,SAAS47B,GAAgBj3B,GACxB,OAAKvB,MAAMC,QAASsB,GACZA,EAEc,iBAAVA,GACJA,EAAM2F,MAAOoP,IAEd,GAxJRlZ,EAAOG,GAAGgC,OAAQ,CACjBud,KAAM,SAAUrd,EAAM8B,GACrB,OAAOia,EAAQnhB,KAAM+C,EAAO0f,KAAMrd,EAAM8B,EAA0B,EAAnB7C,UAAUhB,SAG1D+6B,WAAY,SAAUh5B,GACrB,OAAOpF,KAAKiE,KAAM,kBACVjE,KAAM+C,EAAOs7B,QAASj5B,IAAUA,QAK1CrC,EAAOmC,OAAQ,CACdud,KAAM,SAAUre,EAAMgB,EAAM8B,GAC3B,IAAIpD,EAAKyf,EACRma,EAAQt5B,EAAK7C,SAGd,GAAe,IAAVm8B,GAAyB,IAAVA,GAAyB,IAAVA,EAWnC,OAPe,IAAVA,GAAgB36B,EAAO8W,SAAUzV,KAGrCgB,EAAOrC,EAAOs7B,QAASj5B,IAAUA,EACjCme,EAAQxgB,EAAOm1B,UAAW9yB,SAGZS,IAAVqB,EACCqc,GAAS,QAASA,QACuB1d,KAA3C/B,EAAMyf,EAAMhB,IAAKne,EAAM8C,EAAO9B,IACzBtB,EAGCM,EAAMgB,GAAS8B,EAGpBqc,GAAS,QAASA,GAA+C,QAApCzf,EAAMyf,EAAM7f,IAAKU,EAAMgB,IACjDtB,EAGDM,EAAMgB,IAGd8yB,UAAW,CACV1iB,SAAU,CACT9R,IAAK,SAAUU,GAOd,IAAIk6B,EAAWv7B,EAAOwN,KAAKuB,KAAM1N,EAAM,YAEvC,OAAKk6B,EACGzK,SAAUyK,EAAU,IAI3BP,GAAWvwB,KAAMpJ,EAAKgI,WACtB4xB,GAAWxwB,KAAMpJ,EAAKgI,WACtBhI,EAAKmR,KAEE,GAGA,KAKX8oB,QAAS,CACRE,MAAO,UACPC,QAAS,eAYLp9B,EAAQk8B,cACbv6B,EAAOm1B,UAAUviB,SAAW,CAC3BjS,IAAK,SAAUU,GAId,IAAI8P,EAAS9P,EAAKzB,WAIlB,OAHKuR,GAAUA,EAAOvR,YACrBuR,EAAOvR,WAAWiT,cAEZ,MAER2M,IAAK,SAAUne,GAId,IAAI8P,EAAS9P,EAAKzB,WACbuR,IACJA,EAAO0B,cAEF1B,EAAOvR,YACXuR,EAAOvR,WAAWiT,kBAOvB7S,EAAOkB,KAAM,CACZ,WACA,WACA,YACA,cACA,cACA,UACA,UACA,SACA,cACA,mBACE,WACFlB,EAAOs7B,QAASr+B,KAAKwH,eAAkBxH,OA4BxC+C,EAAOG,GAAGgC,OAAQ,CACjBu5B,SAAU,SAAUv3B,GACnB,IAAIw3B,EAASt6B,EAAMyK,EAAK8vB,EAAUC,EAAO95B,EAAG+5B,EAC3C38B,EAAI,EAEL,GAAKb,EAAY6F,GAChB,OAAOlH,KAAKiE,KAAM,SAAUa,GAC3B/B,EAAQ/C,MAAOy+B,SAAUv3B,EAAMzG,KAAMT,KAAM8E,EAAGo5B,GAAUl+B,UAM1D,IAFA0+B,EAAUP,GAAgBj3B,IAEb7D,OACZ,MAAUe,EAAOpE,KAAMkC,KAItB,GAHAy8B,EAAWT,GAAU95B,GACrByK,EAAwB,IAAlBzK,EAAK7C,UAAoB,IAAM08B,GAAkBU,GAAa,IAEzD,CACV75B,EAAI,EACJ,MAAU85B,EAAQF,EAAS55B,KACrB+J,EAAIhO,QAAS,IAAM+9B,EAAQ,KAAQ,IACvC/vB,GAAO+vB,EAAQ,KAMZD,KADLE,EAAaZ,GAAkBpvB,KAE9BzK,EAAK5B,aAAc,QAASq8B,GAMhC,OAAO7+B,MAGR8+B,YAAa,SAAU53B,GACtB,IAAIw3B,EAASt6B,EAAMyK,EAAK8vB,EAAUC,EAAO95B,EAAG+5B,EAC3C38B,EAAI,EAEL,GAAKb,EAAY6F,GAChB,OAAOlH,KAAKiE,KAAM,SAAUa,GAC3B/B,EAAQ/C,MAAO8+B,YAAa53B,EAAMzG,KAAMT,KAAM8E,EAAGo5B,GAAUl+B,UAI7D,IAAMqE,UAAUhB,OACf,OAAOrD,KAAK8R,KAAM,QAAS,IAK5B,IAFA4sB,EAAUP,GAAgBj3B,IAEb7D,OACZ,MAAUe,EAAOpE,KAAMkC,KAMtB,GALAy8B,EAAWT,GAAU95B,GAGrByK,EAAwB,IAAlBzK,EAAK7C,UAAoB,IAAM08B,GAAkBU,GAAa,IAEzD,CACV75B,EAAI,EACJ,MAAU85B,EAAQF,EAAS55B,KAG1B,OAA4C,EAApC+J,EAAIhO,QAAS,IAAM+9B,EAAQ,KAClC/vB,EAAMA,EAAI5I,QAAS,IAAM24B,EAAQ,IAAK,KAMnCD,KADLE,EAAaZ,GAAkBpvB,KAE9BzK,EAAK5B,aAAc,QAASq8B,GAMhC,OAAO7+B,MAGR++B,YAAa,SAAU73B,EAAO83B,GAC7B,IAAIt9B,SAAcwF,EACjB+3B,EAAwB,WAATv9B,GAAqBiE,MAAMC,QAASsB,GAEpD,MAAyB,kBAAb83B,GAA0BC,EAC9BD,EAAWh/B,KAAKy+B,SAAUv3B,GAAUlH,KAAK8+B,YAAa53B,GAGzD7F,EAAY6F,GACTlH,KAAKiE,KAAM,SAAU/B,GAC3Ba,EAAQ/C,MAAO++B,YACd73B,EAAMzG,KAAMT,KAAMkC,EAAGg8B,GAAUl+B,MAAQg/B,GACvCA,KAKIh/B,KAAKiE,KAAM,WACjB,IAAIgM,EAAW/N,EAAGsY,EAAM0kB,EAExB,GAAKD,EAAe,CAGnB/8B,EAAI,EACJsY,EAAOzX,EAAQ/C,MACfk/B,EAAaf,GAAgBj3B,GAE7B,MAAU+I,EAAYivB,EAAYh9B,KAG5BsY,EAAK2kB,SAAUlvB,GACnBuK,EAAKskB,YAAa7uB,GAElBuK,EAAKikB,SAAUxuB,aAKIpK,IAAVqB,GAAgC,YAATxF,KAClCuO,EAAYiuB,GAAUl+B,QAIrB2iB,EAASJ,IAAKviB,KAAM,gBAAiBiQ,GAOjCjQ,KAAKwC,cACTxC,KAAKwC,aAAc,QAClByN,IAAuB,IAAV/I,EACb,GACAyb,EAASjf,IAAK1D,KAAM,kBAAqB,QAO9Cm/B,SAAU,SAAUn8B,GACnB,IAAIiN,EAAW7L,EACdlC,EAAI,EAEL+N,EAAY,IAAMjN,EAAW,IAC7B,MAAUoB,EAAOpE,KAAMkC,KACtB,GAAuB,IAAlBkC,EAAK7C,WACoE,GAA3E,IAAM08B,GAAkBC,GAAU95B,IAAW,KAAMvD,QAASoP,GAC7D,OAAO,EAIV,OAAO,KAOT,IAAImvB,GAAU,MAEdr8B,EAAOG,GAAGgC,OAAQ,CACjB/C,IAAK,SAAU+E,GACd,IAAIqc,EAAOzf,EAAKyrB,EACfnrB,EAAOpE,KAAM,GAEd,OAAMqE,UAAUhB,QA0BhBksB,EAAkBluB,EAAY6F,GAEvBlH,KAAKiE,KAAM,SAAU/B,GAC3B,IAAIC,EAEmB,IAAlBnC,KAAKuB,WAWE,OANXY,EADIotB,EACEroB,EAAMzG,KAAMT,KAAMkC,EAAGa,EAAQ/C,MAAOmC,OAEpC+E,GAKN/E,EAAM,GAEoB,iBAARA,EAClBA,GAAO,GAEIwD,MAAMC,QAASzD,KAC1BA,EAAMY,EAAOoB,IAAKhC,EAAK,SAAU+E,GAChC,OAAgB,MAATA,EAAgB,GAAKA,EAAQ,OAItCqc,EAAQxgB,EAAOs8B,SAAUr/B,KAAK0B,OAAUqB,EAAOs8B,SAAUr/B,KAAKoM,SAAS5E,iBAGrD,QAAS+b,QAA+C1d,IAApC0d,EAAMhB,IAAKviB,KAAMmC,EAAK,WAC3DnC,KAAKkH,MAAQ/E,OAzDTiC,GACJmf,EAAQxgB,EAAOs8B,SAAUj7B,EAAK1C,OAC7BqB,EAAOs8B,SAAUj7B,EAAKgI,SAAS5E,iBAG/B,QAAS+b,QACgC1d,KAAvC/B,EAAMyf,EAAM7f,IAAKU,EAAM,UAElBN,EAMY,iBAHpBA,EAAMM,EAAK8C,OAIHpD,EAAImC,QAASm5B,GAAS,IAIhB,MAAPt7B,EAAc,GAAKA,OAG3B,KAyCHf,EAAOmC,OAAQ,CACdm6B,SAAU,CACTlZ,OAAQ,CACPziB,IAAK,SAAUU,GAEd,IAAIjC,EAAMY,EAAOwN,KAAKuB,KAAM1N,EAAM,SAClC,OAAc,MAAPjC,EACNA,EAMA87B,GAAkBl7B,EAAOT,KAAM8B,MAGlC2D,OAAQ,CACPrE,IAAK,SAAUU,GACd,IAAI8C,EAAOif,EAAQjkB,EAClBiD,EAAUf,EAAKe,QACfkW,EAAQjX,EAAKwR,cACb2S,EAAoB,eAAdnkB,EAAK1C,KACX6jB,EAASgD,EAAM,KAAO,GACtBwM,EAAMxM,EAAMlN,EAAQ,EAAIlW,EAAQ9B,OAUjC,IAPCnB,EADImZ,EAAQ,EACR0Z,EAGAxM,EAAMlN,EAAQ,EAIXnZ,EAAI6yB,EAAK7yB,IAKhB,KAJAikB,EAAShhB,EAASjD,IAIJyT,UAAYzT,IAAMmZ,KAG7B8K,EAAOha,YACLga,EAAOxjB,WAAWwJ,WACnBC,EAAU+Z,EAAOxjB,WAAY,aAAiB,CAMjD,GAHAuE,EAAQnE,EAAQojB,GAAShkB,MAGpBomB,EACJ,OAAOrhB,EAIRqe,EAAO3kB,KAAMsG,GAIf,OAAOqe,GAGRhD,IAAK,SAAUne,EAAM8C,GACpB,IAAIo4B,EAAWnZ,EACdhhB,EAAUf,EAAKe,QACfogB,EAASxiB,EAAO2D,UAAWQ,GAC3BhF,EAAIiD,EAAQ9B,OAEb,MAAQnB,MACPikB,EAAShhB,EAASjD,IAINyT,UACuD,EAAlE5S,EAAO6D,QAAS7D,EAAOs8B,SAASlZ,OAAOziB,IAAKyiB,GAAUZ,MAEtD+Z,GAAY,GAUd,OAHMA,IACLl7B,EAAKwR,eAAiB,GAEhB2P,OAOXxiB,EAAOkB,KAAM,CAAE,QAAS,YAAc,WACrClB,EAAOs8B,SAAUr/B,MAAS,CACzBuiB,IAAK,SAAUne,EAAM8C,GACpB,GAAKvB,MAAMC,QAASsB,GACnB,OAAS9C,EAAKsR,SAA2D,EAAjD3S,EAAO6D,QAAS7D,EAAQqB,GAAOjC,MAAO+E,KAI3D9F,EAAQi8B,UACbt6B,EAAOs8B,SAAUr/B,MAAO0D,IAAM,SAAUU,GACvC,OAAwC,OAAjCA,EAAK7B,aAAc,SAAqB,KAAO6B,EAAK8C,UAW9D9F,EAAQm+B,QAAU,cAAex/B,EAGjC,IAAIy/B,GAAc,kCACjBC,GAA0B,SAAUjzB,GACnCA,EAAEwc,mBAGJjmB,EAAOmC,OAAQnC,EAAO0lB,MAAO,CAE5BU,QAAS,SAAUV,EAAOjG,EAAMpe,EAAMs7B,GAErC,IAAIx9B,EAAG2M,EAAK6B,EAAKivB,EAAYC,EAAQ7V,EAAQ7K,EAAS2gB,EACrDC,EAAY,CAAE17B,GAAQxE,GACtB8B,EAAOV,EAAOP,KAAMgoB,EAAO,QAAWA,EAAM/mB,KAAO+mB,EACnDkB,EAAa3oB,EAAOP,KAAMgoB,EAAO,aAAgBA,EAAMjZ,UAAUlI,MAAO,KAAQ,GAKjF,GAHAuH,EAAMgxB,EAAcnvB,EAAMtM,EAAOA,GAAQxE,EAGlB,IAAlBwE,EAAK7C,UAAoC,IAAlB6C,EAAK7C,WAK5Bi+B,GAAYhyB,KAAM9L,EAAOqB,EAAO0lB,MAAMuB,cAIf,EAAvBtoB,EAAKb,QAAS,OAIlBa,GADAioB,EAAajoB,EAAK4F,MAAO,MACP8G,QAClBub,EAAW3kB,QAEZ46B,EAASl+B,EAAKb,QAAS,KAAQ,GAAK,KAAOa,GAG3C+mB,EAAQA,EAAO1lB,EAAO+C,SACrB2iB,EACA,IAAI1lB,EAAOqmB,MAAO1nB,EAAuB,iBAAV+mB,GAAsBA,IAGhDK,UAAY4W,EAAe,EAAI,EACrCjX,EAAMjZ,UAAYma,EAAW/b,KAAM,KACnC6a,EAAMwC,WAAaxC,EAAMjZ,UACxB,IAAI1F,OAAQ,UAAY6f,EAAW/b,KAAM,iBAAoB,WAC7D,KAGD6a,EAAMnV,YAASzN,EACT4iB,EAAMjjB,SACXijB,EAAMjjB,OAASpB,GAIhBoe,EAAe,MAARA,EACN,CAAEiG,GACF1lB,EAAO2D,UAAW8b,EAAM,CAAEiG,IAG3BvJ,EAAUnc,EAAO0lB,MAAMvJ,QAASxd,IAAU,GACpCg+B,IAAgBxgB,EAAQiK,UAAmD,IAAxCjK,EAAQiK,QAAQxoB,MAAOyD,EAAMoe,IAAtE,CAMA,IAAMkd,IAAiBxgB,EAAQyM,WAAanqB,EAAU4C,GAAS,CAM9D,IAJAu7B,EAAazgB,EAAQ6J,cAAgBrnB,EAC/B89B,GAAYhyB,KAAMmyB,EAAaj+B,KACpCmN,EAAMA,EAAIlM,YAEHkM,EAAKA,EAAMA,EAAIlM,WACtBm9B,EAAUl/B,KAAMiO,GAChB6B,EAAM7B,EAIF6B,KAAUtM,EAAK6I,eAAiBrN,IACpCkgC,EAAUl/B,KAAM8P,EAAIb,aAAea,EAAIqvB,cAAgBhgC,GAKzDmC,EAAI,EACJ,OAAU2M,EAAMixB,EAAW59B,QAAYumB,EAAMqC,uBAC5C+U,EAAchxB,EACd4Z,EAAM/mB,KAAW,EAAJQ,EACZy9B,EACAzgB,EAAQgL,UAAYxoB,GAGrBqoB,GACEpH,EAASjf,IAAKmL,EAAK,WAAczO,OAAO0pB,OAAQ,OAC9CrB,EAAM/mB,OACTihB,EAASjf,IAAKmL,EAAK,YAEnBkb,EAAOppB,MAAOkO,EAAK2T,IAIpBuH,EAAS6V,GAAU/wB,EAAK+wB,KACT7V,EAAOppB,OAASshB,EAAYpT,KAC1C4Z,EAAMnV,OAASyW,EAAOppB,MAAOkO,EAAK2T,IACZ,IAAjBiG,EAAMnV,QACVmV,EAAMS,kBA8CT,OA1CAT,EAAM/mB,KAAOA,EAGPg+B,GAAiBjX,EAAMuD,sBAEpB9M,EAAQuH,WACqC,IAApDvH,EAAQuH,SAAS9lB,MAAOm/B,EAAUz2B,MAAOmZ,KACzCP,EAAY7d,IAIPw7B,GAAUv+B,EAAY+C,EAAM1C,MAAaF,EAAU4C,MAGvDsM,EAAMtM,EAAMw7B,MAGXx7B,EAAMw7B,GAAW,MAIlB78B,EAAO0lB,MAAMuB,UAAYtoB,EAEpB+mB,EAAMqC,wBACV+U,EAAY9vB,iBAAkBrO,EAAM+9B,IAGrCr7B,EAAM1C,KAED+mB,EAAMqC,wBACV+U,EAAY/e,oBAAqBpf,EAAM+9B,IAGxC18B,EAAO0lB,MAAMuB,eAAYnkB,EAEpB6K,IACJtM,EAAMw7B,GAAWlvB,IAMd+X,EAAMnV,SAKd0sB,SAAU,SAAUt+B,EAAM0C,EAAMqkB,GAC/B,IAAIjc,EAAIzJ,EAAOmC,OACd,IAAInC,EAAOqmB,MACXX,EACA,CACC/mB,KAAMA,EACN2qB,aAAa,IAIftpB,EAAO0lB,MAAMU,QAAS3c,EAAG,KAAMpI,MAKjCrB,EAAOG,GAAGgC,OAAQ,CAEjBikB,QAAS,SAAUznB,EAAM8gB,GACxB,OAAOxiB,KAAKiE,KAAM,WACjBlB,EAAO0lB,MAAMU,QAASznB,EAAM8gB,EAAMxiB,SAGpCigC,eAAgB,SAAUv+B,EAAM8gB,GAC/B,IAAIpe,EAAOpE,KAAM,GACjB,GAAKoE,EACJ,OAAOrB,EAAO0lB,MAAMU,QAASznB,EAAM8gB,EAAMpe,GAAM,MAc5ChD,EAAQm+B,SACbx8B,EAAOkB,KAAM,CAAEmR,MAAO,UAAW8Y,KAAM,YAAc,SAAUK,EAAM5D,GAGpE,IAAIjc,EAAU,SAAU+Z,GACvB1lB,EAAO0lB,MAAMuX,SAAUrV,EAAKlC,EAAMjjB,OAAQzC,EAAO0lB,MAAMkC,IAAKlC,KAG7D1lB,EAAO0lB,MAAMvJ,QAASyL,GAAQ,CAC7BP,MAAO,WAIN,IAAInoB,EAAMjC,KAAKiN,eAAiBjN,KAAKJ,UAAYI,KAChDkgC,EAAWvd,EAASxB,OAAQlf,EAAK0oB,GAE5BuV,GACLj+B,EAAI8N,iBAAkBwe,EAAM7f,GAAS,GAEtCiU,EAASxB,OAAQlf,EAAK0oB,GAAOuV,GAAY,GAAM,IAEhD3V,SAAU,WACT,IAAItoB,EAAMjC,KAAKiN,eAAiBjN,KAAKJ,UAAYI,KAChDkgC,EAAWvd,EAASxB,OAAQlf,EAAK0oB,GAAQ,EAEpCuV,EAKLvd,EAASxB,OAAQlf,EAAK0oB,EAAKuV,IAJ3Bj+B,EAAI6e,oBAAqByN,EAAM7f,GAAS,GACxCiU,EAAShF,OAAQ1b,EAAK0oB,QAS3B,IAAIzV,GAAWnV,EAAOmV,SAElBtT,GAAQ,CAAEuF,KAAMsB,KAAK2jB,OAErB+T,GAAS,KAKbp9B,EAAOq9B,SAAW,SAAU5d,GAC3B,IAAI3O,EACJ,IAAM2O,GAAwB,iBAATA,EACpB,OAAO,KAKR,IACC3O,GAAM,IAAM9T,EAAOsgC,WAAcC,gBAAiB9d,EAAM,YACvD,MAAQhW,GACTqH,OAAMhO,EAMP,OAHMgO,IAAOA,EAAIxG,qBAAsB,eAAgBhK,QACtDN,EAAOoD,MAAO,gBAAkBqc,GAE1B3O,GAIR,IACC0sB,GAAW,QACXC,GAAQ,SACRC,GAAkB,wCAClBC,GAAe,qCAEhB,SAASC,GAAa9I,EAAQv2B,EAAKs/B,EAAarlB,GAC/C,IAAInW,EAEJ,GAAKO,MAAMC,QAAStE,GAGnByB,EAAOkB,KAAM3C,EAAK,SAAUY,EAAGia,GACzBykB,GAAeL,GAAS/yB,KAAMqqB,GAGlCtc,EAAKsc,EAAQ1b,GAKbwkB,GACC9I,EAAS,KAAqB,iBAAN1b,GAAuB,MAALA,EAAYja,EAAI,IAAO,IACjEia,EACAykB,EACArlB,UAKG,GAAMqlB,GAAiC,WAAlB/9B,EAAQvB,GAUnCia,EAAKsc,EAAQv2B,QAPb,IAAM8D,KAAQ9D,EACbq/B,GAAa9I,EAAS,IAAMzyB,EAAO,IAAK9D,EAAK8D,GAAQw7B,EAAarlB,GAYrExY,EAAO89B,MAAQ,SAAU13B,EAAGy3B,GAC3B,IAAI/I,EACHiJ,EAAI,GACJvlB,EAAM,SAAUrN,EAAK6yB,GAGpB,IAAI75B,EAAQ7F,EAAY0/B,GACvBA,IACAA,EAEDD,EAAGA,EAAEz9B,QAAW29B,mBAAoB9yB,GAAQ,IAC3C8yB,mBAA6B,MAAT95B,EAAgB,GAAKA,IAG5C,GAAU,MAALiC,EACJ,MAAO,GAIR,GAAKxD,MAAMC,QAASuD,IAASA,EAAE5F,SAAWR,EAAO2C,cAAeyD,GAG/DpG,EAAOkB,KAAMkF,EAAG,WACfoS,EAAKvb,KAAKoF,KAAMpF,KAAKkH,cAOtB,IAAM2wB,KAAU1uB,EACfw3B,GAAa9I,EAAQ1uB,EAAG0uB,GAAU+I,EAAarlB,GAKjD,OAAOulB,EAAElzB,KAAM,MAGhB7K,EAAOG,GAAGgC,OAAQ,CACjB+7B,UAAW,WACV,OAAOl+B,EAAO89B,MAAO7gC,KAAKkhC,mBAE3BA,eAAgB,WACf,OAAOlhC,KAAKmE,IAAK,WAGhB,IAAI0N,EAAW9O,EAAO0f,KAAMziB,KAAM,YAClC,OAAO6R,EAAW9O,EAAO2D,UAAWmL,GAAa7R,OAEjDqQ,OAAQ,WACR,IAAI3O,EAAO1B,KAAK0B,KAGhB,OAAO1B,KAAKoF,OAASrC,EAAQ/C,MAAOia,GAAI,cACvCymB,GAAalzB,KAAMxN,KAAKoM,YAAeq0B,GAAgBjzB,KAAM9L,KAC3D1B,KAAK0V,UAAYkQ,GAAepY,KAAM9L,MAEzCyC,IAAK,SAAUoD,EAAInD,GACnB,IAAIjC,EAAMY,EAAQ/C,MAAOmC,MAEzB,OAAY,MAAPA,EACG,KAGHwD,MAAMC,QAASzD,GACZY,EAAOoB,IAAKhC,EAAK,SAAUA,GACjC,MAAO,CAAEiD,KAAMhB,EAAKgB,KAAM8B,MAAO/E,EAAI8D,QAASu6B,GAAO,WAIhD,CAAEp7B,KAAMhB,EAAKgB,KAAM8B,MAAO/E,EAAI8D,QAASu6B,GAAO,WAClD98B,SAKN,IACCy9B,GAAM,OACNC,GAAQ,OACRC,GAAa,gBACbC,GAAW,6BAIXC,GAAa,iBACbC,GAAY,QAWZpH,GAAa,GAObqH,GAAa,GAGbC,GAAW,KAAKhhC,OAAQ,KAGxBihC,GAAe/hC,EAASyC,cAAe,KAIxC,SAASu/B,GAA6BC,GAGrC,OAAO,SAAUC,EAAoB9jB,GAED,iBAAvB8jB,IACX9jB,EAAO8jB,EACPA,EAAqB,KAGtB,IAAIC,EACH7/B,EAAI,EACJ8/B,EAAYF,EAAmBt6B,cAAcqF,MAAOoP,IAAmB,GAExE,GAAK5a,EAAY2c,GAGhB,MAAU+jB,EAAWC,EAAW9/B,KAGR,MAAlB6/B,EAAU,IACdA,EAAWA,EAASzhC,MAAO,IAAO,KAChCuhC,EAAWE,GAAaF,EAAWE,IAAc,IAAKpwB,QAASqM,KAI/D6jB,EAAWE,GAAaF,EAAWE,IAAc,IAAKnhC,KAAMod,IAQnE,SAASikB,GAA+BJ,EAAW18B,EAASw1B,EAAiBuH,GAE5E,IAAIC,EAAY,GACfC,EAAqBP,IAAcJ,GAEpC,SAASY,EAASN,GACjB,IAAIpsB,EAcJ,OAbAwsB,EAAWJ,IAAa,EACxBh/B,EAAOkB,KAAM49B,EAAWE,IAAc,GAAI,SAAU/kB,EAAGslB,GACtD,IAAIC,EAAsBD,EAAoBn9B,EAASw1B,EAAiBuH,GACxE,MAAoC,iBAAxBK,GACVH,GAAqBD,EAAWI,GAKtBH,IACDzsB,EAAW4sB,QADf,GAHNp9B,EAAQ68B,UAAUrwB,QAAS4wB,GAC3BF,EAASE,IACF,KAKF5sB,EAGR,OAAO0sB,EAASl9B,EAAQ68B,UAAW,MAAUG,EAAW,MAASE,EAAS,KAM3E,SAASG,GAAYh9B,EAAQ7D,GAC5B,IAAIuM,EAAKzI,EACRg9B,EAAc1/B,EAAO2/B,aAAaD,aAAe,GAElD,IAAMv0B,KAAOvM,OACQkE,IAAflE,EAAKuM,MACPu0B,EAAav0B,GAAQ1I,EAAWC,IAAUA,EAAO,KAAUyI,GAAQvM,EAAKuM,IAO5E,OAJKzI,GACJ1C,EAAOmC,QAAQ,EAAMM,EAAQC,GAGvBD,EA/EPm8B,GAAapsB,KAAOL,GAASK,KAgP9BxS,EAAOmC,OAAQ,CAGdy9B,OAAQ,EAGRC,aAAc,GACdC,KAAM,GAENH,aAAc,CACbI,IAAK5tB,GAASK,KACd7T,KAAM,MACNqhC,QAvRgB,4DAuRQv1B,KAAM0H,GAAS8tB,UACvCxjC,QAAQ,EACRyjC,aAAa,EACbC,OAAO,EACPC,YAAa,mDAcbC,QAAS,CACRlI,IAAKwG,GACLp/B,KAAM,aACNktB,KAAM,YACN3b,IAAK,4BACLwvB,KAAM,qCAGPtoB,SAAU,CACTlH,IAAK,UACL2b,KAAM,SACN6T,KAAM,YAGPC,eAAgB,CACfzvB,IAAK,cACLvR,KAAM,eACN+gC,KAAM,gBAKPE,WAAY,CAGXC,SAAU/3B,OAGVg4B,aAAa,EAGbC,YAAa1gB,KAAKC,MAGlB0gB,WAAY5gC,EAAOq9B,UAOpBqC,YAAa,CACZK,KAAK,EACL7/B,SAAS,IAOX2gC,UAAW,SAAUp+B,EAAQq+B,GAC5B,OAAOA,EAGNrB,GAAYA,GAAYh9B,EAAQzC,EAAO2/B,cAAgBmB,GAGvDrB,GAAYz/B,EAAO2/B,aAAcl9B,IAGnCs+B,cAAelC,GAA6BxH,IAC5C2J,cAAenC,GAA6BH,IAG5CuC,KAAM,SAAUlB,EAAK39B,GAGA,iBAAR29B,IACX39B,EAAU29B,EACVA,OAAMj9B,GAIPV,EAAUA,GAAW,GAErB,IAAI8+B,EAGHC,EAGAC,EACAC,EAGAC,EAGAC,EAGAzjB,EAGA0jB,EAGAriC,EAGAsiC,EAGA1D,EAAI/9B,EAAO6gC,UAAW,GAAIz+B,GAG1Bs/B,EAAkB3D,EAAE79B,SAAW69B,EAG/B4D,EAAqB5D,EAAE79B,UACpBwhC,EAAgBljC,UAAYkjC,EAAgBlhC,QAC7CR,EAAQ0hC,GACR1hC,EAAO0lB,MAGTrK,EAAWrb,EAAOgb,WAClB4mB,EAAmB5hC,EAAO+Z,UAAW,eAGrC8nB,EAAa9D,EAAE8D,YAAc,GAG7BC,EAAiB,GACjBC,EAAsB,GAGtBC,EAAW,WAGX7C,EAAQ,CACPjhB,WAAY,EAGZ+jB,kBAAmB,SAAU92B,GAC5B,IAAIrB,EACJ,GAAKgU,EAAY,CAChB,IAAMujB,EAAkB,CACvBA,EAAkB,GAClB,MAAUv3B,EAAQy0B,GAASp0B,KAAMi3B,GAChCC,EAAiBv3B,EAAO,GAAIrF,cAAgB,MACzC48B,EAAiBv3B,EAAO,GAAIrF,cAAgB,MAAS,IACrD9G,OAAQmM,EAAO,IAGpBA,EAAQu3B,EAAiBl2B,EAAI1G,cAAgB,KAE9C,OAAgB,MAATqF,EAAgB,KAAOA,EAAMe,KAAM,OAI3Cq3B,sBAAuB,WACtB,OAAOpkB,EAAYsjB,EAAwB,MAI5Ce,iBAAkB,SAAU9/B,EAAM8B,GAMjC,OALkB,MAAb2Z,IACJzb,EAAO0/B,EAAqB1/B,EAAKoC,eAChCs9B,EAAqB1/B,EAAKoC,gBAAmBpC,EAC9Cy/B,EAAgBz/B,GAAS8B,GAEnBlH,MAIRmlC,iBAAkB,SAAUzjC,GAI3B,OAHkB,MAAbmf,IACJigB,EAAEsE,SAAW1jC,GAEP1B,MAIR4kC,WAAY,SAAUzgC,GACrB,IAAIpC,EACJ,GAAKoC,EACJ,GAAK0c,EAGJqhB,EAAM/jB,OAAQha,EAAK+9B,EAAMmD,cAIzB,IAAMtjC,KAAQoC,EACbygC,EAAY7iC,GAAS,CAAE6iC,EAAY7iC,GAAQoC,EAAKpC,IAInD,OAAO/B,MAIRslC,MAAO,SAAUC,GAChB,IAAIC,EAAYD,GAAcR,EAK9B,OAJKd,GACJA,EAAUqB,MAAOE,GAElB58B,EAAM,EAAG48B,GACFxlC,OAoBV,GAfAoe,EAASzB,QAASulB,GAKlBpB,EAAEgC,MAAUA,GAAOhC,EAAEgC,KAAO5tB,GAASK,MAAS,IAC5CtP,QAASu7B,GAAWtsB,GAAS8tB,SAAW,MAG1ClC,EAAEp/B,KAAOyD,EAAQuX,QAAUvX,EAAQzD,MAAQo/B,EAAEpkB,QAAUokB,EAAEp/B,KAGzDo/B,EAAEkB,WAAclB,EAAEiB,UAAY,KAAMv6B,cAAcqF,MAAOoP,IAAmB,CAAE,IAGxD,MAAjB6kB,EAAE2E,YAAsB,CAC5BnB,EAAY1kC,EAASyC,cAAe,KAKpC,IACCiiC,EAAU/uB,KAAOurB,EAAEgC,IAInBwB,EAAU/uB,KAAO+uB,EAAU/uB,KAC3BurB,EAAE2E,YAAc9D,GAAaqB,SAAW,KAAOrB,GAAa+D,MAC3DpB,EAAUtB,SAAW,KAAOsB,EAAUoB,KACtC,MAAQl5B,GAITs0B,EAAE2E,aAAc,GAalB,GARK3E,EAAEte,MAAQse,EAAEmC,aAAiC,iBAAXnC,EAAEte,OACxCse,EAAEte,KAAOzf,EAAO89B,MAAOC,EAAEte,KAAMse,EAAEF,cAIlCqB,GAA+B7H,GAAY0G,EAAG37B,EAAS+8B,GAGlDrhB,EACJ,OAAOqhB,EA8ER,IAAMhgC,KAzENqiC,EAAcxhC,EAAO0lB,OAASqY,EAAEthC,SAGQ,GAApBuD,EAAO4/B,UAC1B5/B,EAAO0lB,MAAMU,QAAS,aAIvB2X,EAAEp/B,KAAOo/B,EAAEp/B,KAAKogB,cAGhBgf,EAAE6E,YAAcpE,GAAW/zB,KAAMszB,EAAEp/B,MAKnCwiC,EAAWpD,EAAEgC,IAAI78B,QAASm7B,GAAO,IAG3BN,EAAE6E,WAwBI7E,EAAEte,MAAQse,EAAEmC,aACoD,KAAzEnC,EAAEqC,aAAe,IAAKtiC,QAAS,uCACjCigC,EAAEte,KAAOse,EAAEte,KAAKvc,QAASk7B,GAAK,OAvB9BqD,EAAW1D,EAAEgC,IAAIxiC,MAAO4jC,EAAS7gC,QAG5By9B,EAAEte,OAAUse,EAAEmC,aAAiC,iBAAXnC,EAAEte,QAC1C0hB,IAAc/D,GAAO3yB,KAAM02B,GAAa,IAAM,KAAQpD,EAAEte,YAGjDse,EAAEte,OAIO,IAAZse,EAAE7yB,QACNi2B,EAAWA,EAASj+B,QAASo7B,GAAY,MACzCmD,GAAarE,GAAO3yB,KAAM02B,GAAa,IAAM,KAAQ,KAAStiC,GAAMuF,OACnEq9B,GAIF1D,EAAEgC,IAAMoB,EAAWM,GASf1D,EAAE8E,aACD7iC,EAAO6/B,aAAcsB,IACzBhC,EAAMgD,iBAAkB,oBAAqBniC,EAAO6/B,aAAcsB,IAE9DnhC,EAAO8/B,KAAMqB,IACjBhC,EAAMgD,iBAAkB,gBAAiBniC,EAAO8/B,KAAMqB,MAKnDpD,EAAEte,MAAQse,EAAE6E,aAAgC,IAAlB7E,EAAEqC,aAAyBh+B,EAAQg+B,cACjEjB,EAAMgD,iBAAkB,eAAgBpE,EAAEqC,aAI3CjB,EAAMgD,iBACL,SACApE,EAAEkB,UAAW,IAAOlB,EAAEsC,QAAStC,EAAEkB,UAAW,IAC3ClB,EAAEsC,QAAStC,EAAEkB,UAAW,KACA,MAArBlB,EAAEkB,UAAW,GAAc,KAAON,GAAW,WAAa,IAC7DZ,EAAEsC,QAAS,MAIFtC,EAAE+E,QACZ3D,EAAMgD,iBAAkBhjC,EAAG4+B,EAAE+E,QAAS3jC,IAIvC,GAAK4+B,EAAEgF,cAC+C,IAAnDhF,EAAEgF,WAAWrlC,KAAMgkC,EAAiBvC,EAAOpB,IAAiBjgB,GAG9D,OAAOqhB,EAAMoD,QAed,GAXAP,EAAW,QAGXJ,EAAiBppB,IAAKulB,EAAE/F,UACxBmH,EAAMt5B,KAAMk4B,EAAEiF,SACd7D,EAAMtlB,KAAMkkB,EAAE36B,OAGd89B,EAAYhC,GAA+BR,GAAYX,EAAG37B,EAAS+8B,GAK5D,CASN,GARAA,EAAMjhB,WAAa,EAGdsjB,GACJG,EAAmBvb,QAAS,WAAY,CAAE+Y,EAAOpB,IAI7CjgB,EACJ,OAAOqhB,EAIHpB,EAAEoC,OAAqB,EAAZpC,EAAE3D,UACjBkH,EAAetkC,EAAO8f,WAAY,WACjCqiB,EAAMoD,MAAO,YACXxE,EAAE3D,UAGN,IACCtc,GAAY,EACZojB,EAAU+B,KAAMnB,EAAgBj8B,GAC/B,MAAQ4D,GAGT,GAAKqU,EACJ,MAAMrU,EAIP5D,GAAO,EAAG4D,SAhCX5D,GAAO,EAAG,gBAqCX,SAASA,EAAMy8B,EAAQY,EAAkBC,EAAWL,GACnD,IAAIM,EAAWJ,EAAS5/B,EAAOigC,EAAUC,EACxCd,EAAaU,EAGTplB,IAILA,GAAY,EAGPwjB,GACJtkC,EAAOq9B,aAAciH,GAKtBJ,OAAYp+B,EAGZs+B,EAAwB0B,GAAW,GAGnC3D,EAAMjhB,WAAsB,EAATokB,EAAa,EAAI,EAGpCc,EAAsB,KAAVd,GAAiBA,EAAS,KAAkB,MAAXA,EAGxCa,IACJE,EA7lBJ,SAA8BtF,EAAGoB,EAAOgE,GAEvC,IAAII,EAAI5kC,EAAM6kC,EAAeC,EAC5BzrB,EAAW+lB,EAAE/lB,SACbinB,EAAYlB,EAAEkB,UAGf,MAA2B,MAAnBA,EAAW,GAClBA,EAAU5zB,aACEvI,IAAPygC,IACJA,EAAKxF,EAAEsE,UAAYlD,EAAM8C,kBAAmB,iBAK9C,GAAKsB,EACJ,IAAM5kC,KAAQqZ,EACb,GAAKA,EAAUrZ,IAAUqZ,EAAUrZ,GAAO8L,KAAM84B,GAAO,CACtDtE,EAAUrwB,QAASjQ,GACnB,MAMH,GAAKsgC,EAAW,KAAOkE,EACtBK,EAAgBvE,EAAW,OACrB,CAGN,IAAMtgC,KAAQwkC,EAAY,CACzB,IAAMlE,EAAW,IAAOlB,EAAEyC,WAAY7hC,EAAO,IAAMsgC,EAAW,IAAQ,CACrEuE,EAAgB7kC,EAChB,MAEK8kC,IACLA,EAAgB9kC,GAKlB6kC,EAAgBA,GAAiBC,EAMlC,GAAKD,EAIJ,OAHKA,IAAkBvE,EAAW,IACjCA,EAAUrwB,QAAS40B,GAEbL,EAAWK,GA0iBLE,CAAqB3F,EAAGoB,EAAOgE,KAIrCC,IAAwD,EAA3CpjC,EAAO6D,QAAS,SAAUk6B,EAAEkB,aAC9ClB,EAAEyC,WAAY,eAAkB,cAIjC6C,EA5iBH,SAAsBtF,EAAGsF,EAAUlE,EAAOiE,GACzC,IAAIO,EAAOC,EAASC,EAAMl2B,EAAKsK,EAC9BuoB,EAAa,GAGbvB,EAAYlB,EAAEkB,UAAU1hC,QAGzB,GAAK0hC,EAAW,GACf,IAAM4E,KAAQ9F,EAAEyC,WACfA,EAAYqD,EAAKp/B,eAAkBs5B,EAAEyC,WAAYqD,GAInDD,EAAU3E,EAAU5zB,QAGpB,MAAQu4B,EAcP,GAZK7F,EAAEwC,eAAgBqD,KACtBzE,EAAOpB,EAAEwC,eAAgBqD,IAAcP,IAIlCprB,GAAQmrB,GAAarF,EAAE+F,aAC5BT,EAAWtF,EAAE+F,WAAYT,EAAUtF,EAAEiB,WAGtC/mB,EAAO2rB,EACPA,EAAU3E,EAAU5zB,QAKnB,GAAiB,MAAZu4B,EAEJA,EAAU3rB,OAGJ,GAAc,MAATA,GAAgBA,IAAS2rB,EAAU,CAM9C,KAHAC,EAAOrD,EAAYvoB,EAAO,IAAM2rB,IAAapD,EAAY,KAAOoD,IAI/D,IAAMD,KAASnD,EAId,IADA7yB,EAAMg2B,EAAMp/B,MAAO,MACT,KAAQq/B,IAGjBC,EAAOrD,EAAYvoB,EAAO,IAAMtK,EAAK,KACpC6yB,EAAY,KAAO7yB,EAAK,KACb,EAGG,IAATk2B,EACJA,EAAOrD,EAAYmD,IAGgB,IAAxBnD,EAAYmD,KACvBC,EAAUj2B,EAAK,GACfsxB,EAAUrwB,QAASjB,EAAK,KAEzB,MAOJ,IAAc,IAATk2B,EAGJ,GAAKA,GAAQ9F,EAAEgG,UACdV,EAAWQ,EAAMR,QAEjB,IACCA,EAAWQ,EAAMR,GAChB,MAAQ55B,GACT,MAAO,CACN0R,MAAO,cACP/X,MAAOygC,EAAOp6B,EAAI,sBAAwBwO,EAAO,OAAS2rB,IASjE,MAAO,CAAEzoB,MAAO,UAAWsE,KAAM4jB,GA+cpBW,CAAajG,EAAGsF,EAAUlE,EAAOiE,GAGvCA,GAGCrF,EAAE8E,cACNS,EAAWnE,EAAM8C,kBAAmB,oBAEnCjiC,EAAO6/B,aAAcsB,GAAamC,IAEnCA,EAAWnE,EAAM8C,kBAAmB,WAEnCjiC,EAAO8/B,KAAMqB,GAAamC,IAKZ,MAAXhB,GAA6B,SAAXvE,EAAEp/B,KACxB6jC,EAAa,YAGS,MAAXF,EACXE,EAAa,eAIbA,EAAaa,EAASloB,MACtB6nB,EAAUK,EAAS5jB,KAEnB2jB,IADAhgC,EAAQigC,EAASjgC,UAMlBA,EAAQo/B,GACHF,GAAWE,IACfA,EAAa,QACRF,EAAS,IACbA,EAAS,KAMZnD,EAAMmD,OAASA,EACfnD,EAAMqD,YAAeU,GAAoBV,GAAe,GAGnDY,EACJ/nB,EAASmB,YAAaklB,EAAiB,CAAEsB,EAASR,EAAYrD,IAE9D9jB,EAASuB,WAAY8kB,EAAiB,CAAEvC,EAAOqD,EAAYp/B,IAI5D+7B,EAAM0C,WAAYA,GAClBA,OAAa/+B,EAER0+B,GACJG,EAAmBvb,QAASgd,EAAY,cAAgB,YACvD,CAAEjE,EAAOpB,EAAGqF,EAAYJ,EAAU5/B,IAIpCw+B,EAAiB7mB,SAAU2mB,EAAiB,CAAEvC,EAAOqD,IAEhDhB,IACJG,EAAmBvb,QAAS,eAAgB,CAAE+Y,EAAOpB,MAG3C/9B,EAAO4/B,QAChB5/B,EAAO0lB,MAAMU,QAAS,cAKzB,OAAO+Y,GAGR8E,QAAS,SAAUlE,EAAKtgB,EAAMte,GAC7B,OAAOnB,EAAOW,IAAKo/B,EAAKtgB,EAAMte,EAAU,SAGzC+iC,UAAW,SAAUnE,EAAK5+B,GACzB,OAAOnB,EAAOW,IAAKo/B,OAAKj9B,EAAW3B,EAAU,aAI/CnB,EAAOkB,KAAM,CAAE,MAAO,QAAU,SAAUsD,EAAImV,GAC7C3Z,EAAQ2Z,GAAW,SAAUomB,EAAKtgB,EAAMte,EAAUxC,GAUjD,OAPKL,EAAYmhB,KAChB9gB,EAAOA,GAAQwC,EACfA,EAAWse,EACXA,OAAO3c,GAID9C,EAAOihC,KAAMjhC,EAAOmC,OAAQ,CAClC49B,IAAKA,EACLphC,KAAMgb,EACNqlB,SAAUrgC,EACV8gB,KAAMA,EACNujB,QAAS7hC,GACPnB,EAAO2C,cAAeo9B,IAASA,OAIpC//B,EAAO+gC,cAAe,SAAUhD,GAC/B,IAAI5+B,EACJ,IAAMA,KAAK4+B,EAAE+E,QACa,iBAApB3jC,EAAEsF,gBACNs5B,EAAEqC,YAAcrC,EAAE+E,QAAS3jC,IAAO,MAMrCa,EAAO0sB,SAAW,SAAUqT,EAAK39B,EAASlD,GACzC,OAAOc,EAAOihC,KAAM,CACnBlB,IAAKA,EAGLphC,KAAM,MACNqgC,SAAU,SACV9zB,OAAO,EACPi1B,OAAO,EACP1jC,QAAQ,EAKR+jC,WAAY,CACX2D,cAAe,cAEhBL,WAAY,SAAUT,GACrBrjC,EAAO0D,WAAY2/B,EAAUjhC,EAASlD,OAMzCc,EAAOG,GAAGgC,OAAQ,CACjBiiC,QAAS,SAAU3X,GAClB,IAAIjI,EAyBJ,OAvBKvnB,KAAM,KACLqB,EAAYmuB,KAChBA,EAAOA,EAAK/uB,KAAMT,KAAM,KAIzBunB,EAAOxkB,EAAQysB,EAAMxvB,KAAM,GAAIiN,eAAgB1I,GAAI,GAAIgB,OAAO,GAEzDvF,KAAM,GAAI2C,YACd4kB,EAAK6I,aAAcpwB,KAAM,IAG1BunB,EAAKpjB,IAAK,WACT,IAAIC,EAAOpE,KAEX,MAAQoE,EAAKgjC,kBACZhjC,EAAOA,EAAKgjC,kBAGb,OAAOhjC,IACJ8rB,OAAQlwB,OAGNA,MAGRqnC,UAAW,SAAU7X,GACpB,OAAKnuB,EAAYmuB,GACTxvB,KAAKiE,KAAM,SAAU/B,GAC3Ba,EAAQ/C,MAAOqnC,UAAW7X,EAAK/uB,KAAMT,KAAMkC,MAItClC,KAAKiE,KAAM,WACjB,IAAIuW,EAAOzX,EAAQ/C,MAClB+a,EAAWP,EAAKO,WAEZA,EAAS1X,OACb0X,EAASosB,QAAS3X,GAGlBhV,EAAK0V,OAAQV,MAKhBjI,KAAM,SAAUiI,GACf,IAAI8X,EAAiBjmC,EAAYmuB,GAEjC,OAAOxvB,KAAKiE,KAAM,SAAU/B,GAC3Ba,EAAQ/C,MAAOmnC,QAASG,EAAiB9X,EAAK/uB,KAAMT,KAAMkC,GAAMstB,MAIlE+X,OAAQ,SAAUvkC,GAIjB,OAHAhD,KAAKkU,OAAQlR,GAAW2R,IAAK,QAAS1Q,KAAM,WAC3ClB,EAAQ/C,MAAOuwB,YAAavwB,KAAKuM,cAE3BvM,QAKT+C,EAAO6O,KAAKhI,QAAQ2vB,OAAS,SAAUn1B,GACtC,OAAQrB,EAAO6O,KAAKhI,QAAQ49B,QAASpjC,IAEtCrB,EAAO6O,KAAKhI,QAAQ49B,QAAU,SAAUpjC,GACvC,SAAWA,EAAKyuB,aAAezuB,EAAKqjC,cAAgBrjC,EAAKwxB,iBAAiBvyB,SAM3EN,EAAO2/B,aAAagF,IAAM,WACzB,IACC,OAAO,IAAI3nC,EAAO4nC,eACjB,MAAQn7B,MAGX,IAAIo7B,GAAmB,CAGrBC,EAAG,IAIHC,KAAM,KAEPC,GAAehlC,EAAO2/B,aAAagF,MAEpCtmC,EAAQ4mC,OAASD,IAAkB,oBAAqBA,GACxD3mC,EAAQ4iC,KAAO+D,KAAiBA,GAEhChlC,EAAOghC,cAAe,SAAU5+B,GAC/B,IAAIjB,EAAU+jC,EAGd,GAAK7mC,EAAQ4mC,MAAQD,KAAiB5iC,EAAQsgC,YAC7C,MAAO,CACNO,KAAM,SAAUH,EAAS9K,GACxB,IAAI74B,EACHwlC,EAAMviC,EAAQuiC,MAWf,GATAA,EAAIQ,KACH/iC,EAAQzD,KACRyD,EAAQ29B,IACR39B,EAAQ+9B,MACR/9B,EAAQgjC,SACRhjC,EAAQmR,UAIJnR,EAAQijC,UACZ,IAAMlmC,KAAKiD,EAAQijC,UAClBV,EAAKxlC,GAAMiD,EAAQijC,UAAWlmC,GAmBhC,IAAMA,KAdDiD,EAAQigC,UAAYsC,EAAIvC,kBAC5BuC,EAAIvC,iBAAkBhgC,EAAQigC,UAQzBjgC,EAAQsgC,aAAgBI,EAAS,sBACtCA,EAAS,oBAAuB,kBAItBA,EACV6B,EAAIxC,iBAAkBhjC,EAAG2jC,EAAS3jC,IAInCgC,EAAW,SAAUxC,GACpB,OAAO,WACDwC,IACJA,EAAW+jC,EAAgBP,EAAIW,OAC9BX,EAAIY,QAAUZ,EAAIa,QAAUb,EAAIc,UAC/Bd,EAAIe,mBAAqB,KAEb,UAAT/mC,EACJgmC,EAAIpC,QACgB,UAAT5jC,EAKgB,iBAAfgmC,EAAIrC,OACftK,EAAU,EAAG,SAEbA,EAGC2M,EAAIrC,OACJqC,EAAInC,YAINxK,EACC6M,GAAkBF,EAAIrC,SAAYqC,EAAIrC,OACtCqC,EAAInC,WAK+B,UAAjCmC,EAAIgB,cAAgB,SACM,iBAArBhB,EAAIiB,aACV,CAAEC,OAAQlB,EAAItB,UACd,CAAE9jC,KAAMolC,EAAIiB,cACbjB,EAAIzC,4BAQTyC,EAAIW,OAASnkC,IACb+jC,EAAgBP,EAAIY,QAAUZ,EAAIc,UAAYtkC,EAAU,cAKnC2B,IAAhB6hC,EAAIa,QACRb,EAAIa,QAAUN,EAEdP,EAAIe,mBAAqB,WAGA,IAAnBf,EAAIzmB,YAMRlhB,EAAO8f,WAAY,WACb3b,GACJ+jC,OAQL/jC,EAAWA,EAAU,SAErB,IAGCwjC,EAAI1B,KAAM7gC,EAAQwgC,YAAcxgC,EAAQqd,MAAQ,MAC/C,MAAQhW,GAGT,GAAKtI,EACJ,MAAMsI,IAKT84B,MAAO,WACDphC,GACJA,QAWLnB,EAAO+gC,cAAe,SAAUhD,GAC1BA,EAAE2E,cACN3E,EAAE/lB,SAAS3Y,QAAS,KAKtBW,EAAO6gC,UAAW,CACjBR,QAAS,CACRhhC,OAAQ,6FAGT2Y,SAAU,CACT3Y,OAAQ,2BAETmhC,WAAY,CACX2D,cAAe,SAAU5kC,GAExB,OADAS,EAAO0D,WAAYnE,GACZA,MAMVS,EAAO+gC,cAAe,SAAU,SAAUhD,QACxBj7B,IAAZi7B,EAAE7yB,QACN6yB,EAAE7yB,OAAQ,GAEN6yB,EAAE2E,cACN3E,EAAEp/B,KAAO,SAKXqB,EAAOghC,cAAe,SAAU,SAAUjD,GAIxC,IAAI1+B,EAAQ8B,EADb,GAAK48B,EAAE2E,aAAe3E,EAAE+H,YAEvB,MAAO,CACN7C,KAAM,SAAUhpB,EAAG+d,GAClB34B,EAASW,EAAQ,YACf+O,KAAMgvB,EAAE+H,aAAe,IACvBpmB,KAAM,CAAEqmB,QAAShI,EAAEiI,cAAepnC,IAAKm/B,EAAEgC,MACzCza,GAAI,aAAcnkB,EAAW,SAAU8kC,GACvC5mC,EAAOub,SACPzZ,EAAW,KACN8kC,GACJjO,EAAuB,UAAbiO,EAAItnC,KAAmB,IAAM,IAAKsnC,EAAItnC,QAKnD9B,EAAS6C,KAAKC,YAAaN,EAAQ,KAEpCkjC,MAAO,WACDphC,GACJA,QAUL,IAqGKshB,GArGDyjB,GAAe,GAClBC,GAAS,oBAGVnmC,EAAO6gC,UAAW,CACjBuF,MAAO,WACPC,cAAe,WACd,IAAIllC,EAAW+kC,GAAa5/B,OAAWtG,EAAO+C,QAAU,IAAQlE,GAAMuF,OAEtE,OADAnH,KAAMkE,IAAa,EACZA,KAKTnB,EAAO+gC,cAAe,aAAc,SAAUhD,EAAGuI,EAAkBnH,GAElE,IAAIoH,EAAcC,EAAaC,EAC9BC,GAAuB,IAAZ3I,EAAEqI,QAAqBD,GAAO17B,KAAMszB,EAAEgC,KAChD,MACkB,iBAAXhC,EAAEte,MAE6C,KADnDse,EAAEqC,aAAe,IACjBtiC,QAAS,sCACXqoC,GAAO17B,KAAMszB,EAAEte,OAAU,QAI5B,GAAKinB,GAAiC,UAArB3I,EAAEkB,UAAW,GA8D7B,OA3DAsH,EAAexI,EAAEsI,cAAgB/nC,EAAYy/B,EAAEsI,eAC9CtI,EAAEsI,gBACFtI,EAAEsI,cAGEK,EACJ3I,EAAG2I,GAAa3I,EAAG2I,GAAWxjC,QAASijC,GAAQ,KAAOI,IAC/B,IAAZxI,EAAEqI,QACbrI,EAAEgC,MAAS3C,GAAO3yB,KAAMszB,EAAEgC,KAAQ,IAAM,KAAQhC,EAAEqI,MAAQ,IAAMG,GAIjExI,EAAEyC,WAAY,eAAkB,WAI/B,OAHMiG,GACLzmC,EAAOoD,MAAOmjC,EAAe,mBAEvBE,EAAmB,IAI3B1I,EAAEkB,UAAW,GAAM,OAGnBuH,EAAcxpC,EAAQupC,GACtBvpC,EAAQupC,GAAiB,WACxBE,EAAoBnlC,WAIrB69B,EAAM/jB,OAAQ,gBAGQtY,IAAhB0jC,EACJxmC,EAAQhD,GAASq+B,WAAYkL,GAI7BvpC,EAAQupC,GAAiBC,EAIrBzI,EAAGwI,KAGPxI,EAAEsI,cAAgBC,EAAiBD,cAGnCH,GAAaroC,KAAM0oC,IAIfE,GAAqBnoC,EAAYkoC,IACrCA,EAAaC,EAAmB,IAGjCA,EAAoBD,OAAc1jC,IAI5B,WAYTzE,EAAQsoC,qBACHlkB,GAAO5lB,EAAS+pC,eAAeD,mBAAoB,IAAKlkB,MACvD5U,UAAY,6BACiB,IAA3B4U,GAAKjZ,WAAWlJ,QAQxBN,EAAO2X,UAAY,SAAU8H,EAAMvf,EAAS2mC,GAC3C,MAAqB,iBAATpnB,EACJ,IAEgB,kBAAZvf,IACX2mC,EAAc3mC,EACdA,GAAU,GAKLA,IAIA7B,EAAQsoC,qBAMZ9yB,GALA3T,EAAUrD,EAAS+pC,eAAeD,mBAAoB,KAKvCrnC,cAAe,SACzBkT,KAAO3V,EAASsV,SAASK,KAC9BtS,EAAQR,KAAKC,YAAakU,IAE1B3T,EAAUrD,GAKZwnB,GAAWwiB,GAAe,IAD1BC,EAASxvB,EAAWnN,KAAMsV,IAKlB,CAAEvf,EAAQZ,cAAewnC,EAAQ,MAGzCA,EAAS1iB,GAAe,CAAE3E,GAAQvf,EAASmkB,GAEtCA,GAAWA,EAAQ/jB,QACvBN,EAAQqkB,GAAUzJ,SAGZ5a,EAAOgB,MAAO,GAAI8lC,EAAOt9B,cAlChC,IAAIqK,EAAMizB,EAAQziB,GAyCnBrkB,EAAOG,GAAGwoB,KAAO,SAAUoX,EAAKgH,EAAQ5lC,GACvC,IAAIlB,EAAUtB,EAAM0kC,EACnB5rB,EAAOxa,KACP0oB,EAAMoa,EAAIjiC,QAAS,KAsDpB,OApDY,EAAP6nB,IACJ1lB,EAAWi7B,GAAkB6E,EAAIxiC,MAAOooB,IACxCoa,EAAMA,EAAIxiC,MAAO,EAAGooB,IAIhBrnB,EAAYyoC,IAGhB5lC,EAAW4lC,EACXA,OAASjkC,GAGEikC,GAA4B,iBAAXA,IAC5BpoC,EAAO,QAIW,EAAd8Y,EAAKnX,QACTN,EAAOihC,KAAM,CACZlB,IAAKA,EAKLphC,KAAMA,GAAQ,MACdqgC,SAAU,OACVvf,KAAMsnB,IACHlhC,KAAM,SAAU+/B,GAGnBvC,EAAW/hC,UAEXmW,EAAKgV,KAAMxsB,EAIVD,EAAQ,SAAUmtB,OAAQntB,EAAO2X,UAAWiuB,IAAiBp4B,KAAMvN,GAGnE2lC,KAKExqB,OAAQja,GAAY,SAAUg+B,EAAOmD,GACxC7qB,EAAKvW,KAAM,WACVC,EAASvD,MAAOX,KAAMomC,GAAY,CAAElE,EAAMyG,aAActD,EAAQnD,QAK5DliC,MAMR+C,EAAO6O,KAAKhI,QAAQmgC,SAAW,SAAU3lC,GACxC,OAAOrB,EAAO2B,KAAM3B,EAAOw5B,OAAQ,SAAUr5B,GAC5C,OAAOkB,IAASlB,EAAGkB,OAChBf,QAMLN,EAAOinC,OAAS,CACfC,UAAW,SAAU7lC,EAAMe,EAASjD,GACnC,IAAIgoC,EAAaC,EAASC,EAAWC,EAAQC,EAAWC,EACvD5X,EAAW5vB,EAAOyhB,IAAKpgB,EAAM,YAC7BomC,EAAUznC,EAAQqB,GAClB2nB,EAAQ,GAGS,WAAb4G,IACJvuB,EAAKkgB,MAAMqO,SAAW,YAGvB2X,EAAYE,EAAQR,SACpBI,EAAYrnC,EAAOyhB,IAAKpgB,EAAM,OAC9BmmC,EAAaxnC,EAAOyhB,IAAKpgB,EAAM,SACI,aAAbuuB,GAAwC,UAAbA,KACA,GAA9CyX,EAAYG,GAAa1pC,QAAS,SAMpCwpC,GADAH,EAAcM,EAAQ7X,YACD7iB,IACrBq6B,EAAUD,EAAYzS,OAGtB4S,EAASrX,WAAYoX,IAAe,EACpCD,EAAUnX,WAAYuX,IAAgB,GAGlClpC,EAAY8D,KAGhBA,EAAUA,EAAQ1E,KAAM2D,EAAMlC,EAAGa,EAAOmC,OAAQ,GAAIolC,KAGjC,MAAfnlC,EAAQ2K,MACZic,EAAMjc,IAAQ3K,EAAQ2K,IAAMw6B,EAAUx6B,IAAQu6B,GAE1B,MAAhBllC,EAAQsyB,OACZ1L,EAAM0L,KAAStyB,EAAQsyB,KAAO6S,EAAU7S,KAAS0S,GAG7C,UAAWhlC,EACfA,EAAQslC,MAAMhqC,KAAM2D,EAAM2nB,IAGA,iBAAdA,EAAMjc,MACjBic,EAAMjc,KAAO,MAEa,iBAAfic,EAAM0L,OACjB1L,EAAM0L,MAAQ,MAEf+S,EAAQhmB,IAAKuH,MAKhBhpB,EAAOG,GAAGgC,OAAQ,CAGjB8kC,OAAQ,SAAU7kC,GAGjB,GAAKd,UAAUhB,OACd,YAAmBwC,IAAZV,EACNnF,KACAA,KAAKiE,KAAM,SAAU/B,GACpBa,EAAOinC,OAAOC,UAAWjqC,KAAMmF,EAASjD,KAI3C,IAAIwoC,EAAMC,EACTvmC,EAAOpE,KAAM,GAEd,OAAMoE,EAQAA,EAAKwxB,iBAAiBvyB,QAK5BqnC,EAAOtmC,EAAKmzB,wBACZoT,EAAMvmC,EAAK6I,cAAc4C,YAClB,CACNC,IAAK46B,EAAK56B,IAAM66B,EAAIC,YACpBnT,KAAMiT,EAAKjT,KAAOkT,EAAIE,cARf,CAAE/6B,IAAK,EAAG2nB,KAAM,QATxB,GAuBD9E,SAAU,WACT,GAAM3yB,KAAM,GAAZ,CAIA,IAAI8qC,EAAcd,EAAQ/nC,EACzBmC,EAAOpE,KAAM,GACb+qC,EAAe,CAAEj7B,IAAK,EAAG2nB,KAAM,GAGhC,GAAwC,UAAnC10B,EAAOyhB,IAAKpgB,EAAM,YAGtB4lC,EAAS5lC,EAAKmzB,4BAER,CACNyS,EAAShqC,KAAKgqC,SAId/nC,EAAMmC,EAAK6I,cACX69B,EAAe1mC,EAAK0mC,cAAgB7oC,EAAIyN,gBACxC,MAAQo7B,IACLA,IAAiB7oC,EAAIujB,MAAQslB,IAAiB7oC,EAAIyN,kBACT,WAA3C3M,EAAOyhB,IAAKsmB,EAAc,YAE1BA,EAAeA,EAAanoC,WAExBmoC,GAAgBA,IAAiB1mC,GAAkC,IAA1B0mC,EAAavpC,YAG1DwpC,EAAehoC,EAAQ+nC,GAAed,UACzBl6B,KAAO/M,EAAOyhB,IAAKsmB,EAAc,kBAAkB,GAChEC,EAAatT,MAAQ10B,EAAOyhB,IAAKsmB,EAAc,mBAAmB,IAKpE,MAAO,CACNh7B,IAAKk6B,EAAOl6B,IAAMi7B,EAAaj7B,IAAM/M,EAAOyhB,IAAKpgB,EAAM,aAAa,GACpEqzB,KAAMuS,EAAOvS,KAAOsT,EAAatT,KAAO10B,EAAOyhB,IAAKpgB,EAAM,cAAc,MAc1E0mC,aAAc,WACb,OAAO9qC,KAAKmE,IAAK,WAChB,IAAI2mC,EAAe9qC,KAAK8qC,aAExB,MAAQA,GAA2D,WAA3C/nC,EAAOyhB,IAAKsmB,EAAc,YACjDA,EAAeA,EAAaA,aAG7B,OAAOA,GAAgBp7B,QAM1B3M,EAAOkB,KAAM,CAAE00B,WAAY,cAAeD,UAAW,eAAiB,SAAUhc,EAAQ+F,GACvF,IAAI3S,EAAM,gBAAkB2S,EAE5B1f,EAAOG,GAAIwZ,GAAW,SAAUva,GAC/B,OAAOgf,EAAQnhB,KAAM,SAAUoE,EAAMsY,EAAQva,GAG5C,IAAIwoC,EAOJ,GANKnpC,EAAU4C,GACdumC,EAAMvmC,EACuB,IAAlBA,EAAK7C,WAChBopC,EAAMvmC,EAAKyL,kBAGChK,IAAR1D,EACJ,OAAOwoC,EAAMA,EAAKloB,GAASre,EAAMsY,GAG7BiuB,EACJA,EAAIK,SACFl7B,EAAY66B,EAAIE,YAAV1oC,EACP2N,EAAM3N,EAAMwoC,EAAIC,aAIjBxmC,EAAMsY,GAAWva,GAEhBua,EAAQva,EAAKkC,UAAUhB,WAU5BN,EAAOkB,KAAM,CAAE,MAAO,QAAU,SAAUsD,EAAIkb,GAC7C1f,EAAOgzB,SAAUtT,GAASoP,GAAczwB,EAAQiyB,cAC/C,SAAUjvB,EAAMmtB,GACf,GAAKA,EAIJ,OAHAA,EAAWD,GAAQltB,EAAMqe,GAGlBsO,GAAUvjB,KAAM+jB,GACtBxuB,EAAQqB,GAAOuuB,WAAYlQ,GAAS,KACpC8O,MAQLxuB,EAAOkB,KAAM,CAAEgnC,OAAQ,SAAUC,MAAO,SAAW,SAAU9lC,EAAM1D,GAClEqB,EAAOkB,KAAM,CAAE0zB,QAAS,QAAUvyB,EAAM2W,QAASra,EAAMypC,GAAI,QAAU/lC,GACpE,SAAUgmC,EAAcC,GAGxBtoC,EAAOG,GAAImoC,GAAa,SAAU3T,EAAQxwB,GACzC,IAAIka,EAAY/c,UAAUhB,SAAY+nC,GAAkC,kBAAX1T,GAC5DpC,EAAQ8V,KAA6B,IAAX1T,IAA6B,IAAVxwB,EAAiB,SAAW,UAE1E,OAAOia,EAAQnhB,KAAM,SAAUoE,EAAM1C,EAAMwF,GAC1C,IAAIjF,EAEJ,OAAKT,EAAU4C,GAGyB,IAAhCinC,EAASxqC,QAAS,SACxBuD,EAAM,QAAUgB,GAChBhB,EAAKxE,SAAS8P,gBAAiB,SAAWtK,GAIrB,IAAlBhB,EAAK7C,UACTU,EAAMmC,EAAKsL,gBAIJ3J,KAAKgvB,IACX3wB,EAAKohB,KAAM,SAAWpgB,GAAQnD,EAAK,SAAWmD,GAC9ChB,EAAKohB,KAAM,SAAWpgB,GAAQnD,EAAK,SAAWmD,GAC9CnD,EAAK,SAAWmD,UAIDS,IAAVqB,EAGNnE,EAAOyhB,IAAKpgB,EAAM1C,EAAM4zB,GAGxBvyB,EAAOuhB,MAAOlgB,EAAM1C,EAAMwF,EAAOouB,IAChC5zB,EAAM0f,EAAYsW,OAAS7xB,EAAWub,QAM5Cre,EAAOkB,KAAM,CACZ,YACA,WACA,eACA,YACA,cACA,YACE,SAAUsD,EAAI7F,GAChBqB,EAAOG,GAAIxB,GAAS,SAAUwB,GAC7B,OAAOlD,KAAKqoB,GAAI3mB,EAAMwB,MAOxBH,EAAOG,GAAGgC,OAAQ,CAEjB41B,KAAM,SAAUxS,EAAO9F,EAAMtf,GAC5B,OAAOlD,KAAKqoB,GAAIC,EAAO,KAAM9F,EAAMtf,IAEpCooC,OAAQ,SAAUhjB,EAAOplB,GACxB,OAAOlD,KAAK0oB,IAAKJ,EAAO,KAAMplB,IAG/BqoC,SAAU,SAAUvoC,EAAUslB,EAAO9F,EAAMtf,GAC1C,OAAOlD,KAAKqoB,GAAIC,EAAOtlB,EAAUwf,EAAMtf,IAExCsoC,WAAY,SAAUxoC,EAAUslB,EAAOplB,GAGtC,OAA4B,IAArBmB,UAAUhB,OAChBrD,KAAK0oB,IAAK1lB,EAAU,MACpBhD,KAAK0oB,IAAKJ,EAAOtlB,GAAY,KAAME,IAGrCuoC,MAAO,SAAUC,EAAQC,GACxB,OAAO3rC,KAAKmuB,WAAYud,GAAStd,WAAYud,GAASD,MAIxD3oC,EAAOkB,KAAM,wLAEgDqD,MAAO,KACnE,SAAUC,EAAInC,GAGbrC,EAAOG,GAAIkC,GAAS,SAAUod,EAAMtf,GACnC,OAA0B,EAAnBmB,UAAUhB,OAChBrD,KAAKqoB,GAAIjjB,EAAM,KAAMod,EAAMtf,GAC3BlD,KAAKmpB,QAAS/jB,MASlB,IAAI2E,GAAQ,qCAMZhH,EAAO6oC,MAAQ,SAAU1oC,EAAID,GAC5B,IAAIyN,EAAK6D,EAAMq3B,EAUf,GARwB,iBAAZ3oC,IACXyN,EAAMxN,EAAID,GACVA,EAAUC,EACVA,EAAKwN,GAKArP,EAAY6B,GAalB,OARAqR,EAAOjU,EAAMG,KAAM4D,UAAW,IAC9BunC,EAAQ,WACP,OAAO1oC,EAAGvC,MAAOsC,GAAWjD,KAAMuU,EAAK7T,OAAQJ,EAAMG,KAAM4D,eAItD8C,KAAOjE,EAAGiE,KAAOjE,EAAGiE,MAAQpE,EAAOoE,OAElCykC,GAGR7oC,EAAO8oC,UAAY,SAAUC,GACvBA,EACJ/oC,EAAOge,YAEPhe,EAAO4X,OAAO,IAGhB5X,EAAO6C,QAAUD,MAAMC,QACvB7C,EAAOgpC,UAAY/oB,KAAKC,MACxBlgB,EAAOqJ,SAAWA,EAClBrJ,EAAO1B,WAAaA,EACpB0B,EAAOvB,SAAWA,EAClBuB,EAAOgf,UAAYA,EACnBhf,EAAOrB,KAAOmB,EAEdE,EAAOqpB,IAAM3jB,KAAK2jB,IAElBrpB,EAAOipC,UAAY,SAAU1qC,GAK5B,IAAII,EAAOqB,EAAOrB,KAAMJ,GACxB,OAAkB,WAATI,GAA8B,WAATA,KAK5BuqC,MAAO3qC,EAAM0xB,WAAY1xB,KAG5ByB,EAAOmpC,KAAO,SAAU5pC,GACvB,OAAe,MAARA,EACN,IACEA,EAAO,IAAK2D,QAAS8D,GAAO,KAkBT,mBAAXoiC,QAAyBA,OAAOC,KAC3CD,OAAQ,SAAU,GAAI,WACrB,OAAOppC,IAOT,IAGCspC,GAAUtsC,EAAOgD,OAGjBupC,GAAKvsC,EAAOwsC,EAwBb,OAtBAxpC,EAAOypC,WAAa,SAAU/mC,GAS7B,OARK1F,EAAOwsC,IAAMxpC,IACjBhD,EAAOwsC,EAAID,IAGP7mC,GAAQ1F,EAAOgD,SAAWA,IAC9BhD,EAAOgD,OAASspC,IAGVtpC,GAMiB,oBAAb9C,IACXF,EAAOgD,OAAShD,EAAOwsC,EAAIxpC,GAMrBA","file":"jquery.min.js"}
\ No newline at end of file
+{"version":3,"sources":["jquery.js"],"names":["global","factory","module","exports","document","w","Error","window","this","noGlobal","arr","getProto","Object","getPrototypeOf","slice","flat","array","call","concat","apply","push","indexOf","class2type","toString","hasOwn","hasOwnProperty","fnToString","ObjectFunctionString","support","isFunction","obj","nodeType","item","isWindow","preservedScriptAttributes","type","src","nonce","noModule","DOMEval","code","node","doc","i","val","script","createElement","text","getAttribute","setAttribute","head","appendChild","parentNode","removeChild","toType","version","rhtmlSuffix","jQuery","selector","context","fn","init","isArrayLike","length","nodeName","elem","name","toLowerCase","prototype","jquery","constructor","toArray","get","num","pushStack","elems","ret","merge","prevObject","each","callback","map","arguments","first","eq","last","even","grep","_elem","odd","len","j","end","sort","splice","extend","options","copy","copyIsArray","clone","target","deep","isPlainObject","Array","isArray","undefined","expando","Math","random","replace","isReady","error","msg","noop","proto","Ctor","isEmptyObject","globalEval","textContent","documentElement","nodeValue","makeArray","results","inArray","isXMLDoc","namespace","namespaceURI","docElem","ownerDocument","test","second","invert","matches","callbackExpect","arg","value","guid","Symbol","iterator","split","_i","pop","whitespace","rtrimCSS","RegExp","contains","a","b","bup","compareDocumentPosition","rcssescape","fcssescape","ch","asCodePoint","charCodeAt","escapeSelector","sel","preferredDoc","pushNative","Expr","outermostContext","sortInput","hasDuplicate","documentIsHTML","rbuggyQSA","dirruns","done","classCache","createCache","tokenCache","compilerCache","nonnativeSelectorCache","sortOrder","booleans","identifier","attributes","pseudos","rwhitespace","rcomma","rleadingCombinator","rdescend","rpseudo","ridentifier","matchExpr","ID","CLASS","TAG","ATTR","PSEUDO","CHILD","bool","needsContext","rinputs","rheader","rquickExpr","rsibling","runescape","funescape","escape","nonHex","high","String","fromCharCode","unloadHandler","setDocument","inDisabledFieldset","addCombinator","disabled","dir","next","childNodes","e","els","find","seed","m","nid","match","groups","newSelector","newContext","exec","getElementById","id","getElementsByTagName","getElementsByClassName","testContext","scope","tokenize","toSelector","join","querySelectorAll","qsaError","removeAttribute","select","keys","cache","key","cacheLength","shift","markFunction","assert","el","createInputPseudo","createButtonPseudo","createDisabledPseudo","isDisabled","createPositionalPseudo","argument","matchIndexes","subWindow","webkitMatchesSelector","msMatchesSelector","defaultView","top","addEventListener","getById","getElementsByName","disconnectedMatch","cssHas","querySelector","filter","attrId","getAttributeNode","tag","className","input","innerHTML","compare","sortDetached","expr","elements","matchesSelector","attr","attrHandle","uniqueSort","duplicates","sortStable","createPseudo","relative",">"," ","+","~","preFilter","excess","unquoted","nodeNameSelector","expectedNodeName","pattern","operator","check","result","what","_argument","simple","forward","ofType","_context","xml","outerCache","nodeIndex","start","parent","useCache","diff","firstChild","lastChild","pseudo","args","setFilters","idx","matched","not","matcher","compile","unmatched","has","lang","elemLang","hash","location","root","focus","activeElement","err","safeActiveElement","hasFocus","href","tabIndex","enabled","checked","selected","selectedIndex","empty","nextSibling","header","button","_matchIndexes","lt","gt","nth","radio","checkbox","file","password","image","submit","reset","parseOnly","tokens","soFar","preFilters","cached","combinator","base","skip","checkNonElements","doneName","oldCache","newCache","elementMatcher","matchers","condense","newUnmatched","mapped","setMatcher","postFilter","postFinder","postSelector","temp","matcherOut","preMap","postMap","preexisting","contexts","multipleContexts","matcherIn","matcherFromTokens","checkContext","leadingRelative","implicitRelative","matchContext","matchAnyContext","elementMatchers","setMatchers","bySet","byElement","superMatcher","outermost","matchedCount","setMatched","contextBackup","dirrunsUnique","token","compiled","filters","unique","getText","isXML","selectors","until","truncate","is","siblings","n","rneedsContext","rsingleTag","winnow","qualifier","self","rootjQuery","parseHTML","ready","rparentsprev","guaranteedUnique","children","contents","prev","sibling","cur","targets","l","closest","index","prevAll","add","addBack","parents","parentsUntil","nextAll","nextUntil","prevUntil","contentDocument","content","reverse","rnothtmlwhite","Identity","v","Thrower","ex","adoptValue","resolve","reject","noValue","method","promise","fail","then","Callbacks","object","_","flag","firing","memory","fired","locked","list","queue","firingIndex","fire","once","stopOnFalse","remove","disable","lock","fireWith","Deferred","func","tuples","state","always","deferred","catch","pipe","fns","newDefer","tuple","returned","progress","notify","onFulfilled","onRejected","onProgress","maxDepth","depth","handler","special","that","mightThrow","TypeError","notifyWith","resolveWith","process","exceptionHook","rejectWith","getErrorHook","getStackHook","setTimeout","stateString","when","singleValue","remaining","resolveContexts","resolveValues","primary","updateFunc","rerrorNames","asyncError","console","warn","message","stack","readyException","readyList","completed","removeEventListener","readyWait","wait","readyState","doScroll","access","chainable","emptyGet","raw","bulk","_key","rmsPrefix","rdashAlpha","fcamelCase","_all","letter","toUpperCase","camelCase","string","acceptData","owner","Data","uid","defineProperty","configurable","set","data","prop","hasData","dataPriv","dataUser","rbrace","rmultiDash","dataAttr","JSON","parse","removeData","_data","_removeData","attrs","dequeue","startLength","hooks","_queueHooks","unshift","stop","setter","clearQueue","tmp","count","defer","pnum","source","rcssNum","cssExpand","isAttached","composed","getRootNode","isHiddenWithinTree","style","display","css","adjustCSS","valueParts","tween","adjusted","scale","maxIterations","currentValue","initial","unit","cssNumber","initialInUnit","defaultDisplayMap","showHide","show","values","body","hide","toggle","div","rcheckableType","rtagName","rscriptType","createDocumentFragment","checkClone","cloneNode","noCloneChecked","defaultValue","option","wrapMap","thead","col","tr","td","_default","getAll","setGlobalEval","refElements","tbody","tfoot","colgroup","caption","th","optgroup","rhtml","buildFragment","scripts","selection","ignored","wrap","attached","fragment","nodes","htmlPrefilter","createTextNode","rtypenamespace","returnTrue","returnFalse","on","types","one","origFn","event","off","leverageNative","isSetup","saved","isTrigger","delegateType","stopPropagation","stopImmediatePropagation","preventDefault","trigger","isImmediatePropagationStopped","handleObjIn","eventHandle","events","t","handleObj","handlers","namespaces","origType","elemData","create","handle","triggered","dispatch","bindType","delegateCount","setup","mappedTypes","origCount","teardown","removeEvent","nativeEvent","handlerQueue","fix","delegateTarget","preDispatch","isPropagationStopped","currentTarget","rnamespace","postDispatch","matchedHandlers","matchedSelectors","addProp","hook","Event","enumerable","originalEvent","writable","load","noBubble","click","beforeunload","returnValue","props","isDefaultPrevented","defaultPrevented","relatedTarget","timeStamp","Date","now","isSimulated","altKey","bubbles","cancelable","changedTouches","ctrlKey","detail","eventPhase","metaKey","pageX","pageY","shiftKey","view","char","charCode","keyCode","buttons","clientX","clientY","offsetX","offsetY","pointerId","pointerType","screenX","screenY","targetTouches","toElement","touches","which","blur","focusMappedHandler","documentMode","simulate","attaches","dataHolder","mouseenter","mouseleave","pointerenter","pointerleave","orig","related","rnoInnerhtml","rchecked","rcleanScript","manipulationTarget","disableScript","restoreScript","cloneCopyEvent","dest","udataOld","udataCur","domManip","collection","hasScripts","iNoClone","valueIsFunction","html","_evalUrl","keepData","cleanData","dataAndEvents","deepDataAndEvents","srcElements","destElements","inPage","detach","append","prepend","insertBefore","before","after","replaceWith","replaceChild","appendTo","prependTo","insertAfter","replaceAll","original","insert","rnumnonpx","rcustomProp","getStyles","opener","getComputedStyle","swap","old","rboxStyle","curCSS","computed","width","minWidth","maxWidth","isCustomProp","getPropertyValue","pixelBoxStyles","addGetHookIf","conditionFn","hookFn","computeStyleTests","container","cssText","divStyle","pixelPositionVal","reliableMarginLeftVal","roundPixelMeasures","marginLeft","right","pixelBoxStylesVal","boxSizingReliableVal","position","scrollboxSizeVal","offsetWidth","measure","round","parseFloat","reliableTrDimensionsVal","backgroundClip","clearCloneStyle","boxSizingReliable","pixelPosition","reliableMarginLeft","scrollboxSize","reliableTrDimensions","table","trChild","trStyle","height","parseInt","borderTopWidth","borderBottomWidth","offsetHeight","cssPrefixes","emptyStyle","vendorProps","finalPropName","final","cssProps","capName","vendorPropName","rdisplayswap","cssShow","visibility","cssNormalTransform","letterSpacing","fontWeight","setPositiveNumber","subtract","max","boxModelAdjustment","dimension","box","isBorderBox","styles","computedVal","extra","delta","marginDelta","ceil","getWidthOrHeight","valueIsBorderBox","offsetProp","getClientRects","Tween","easing","cssHooks","opacity","animationIterationCount","aspectRatio","borderImageSlice","columnCount","flexGrow","flexShrink","gridArea","gridColumn","gridColumnEnd","gridColumnStart","gridRow","gridRowEnd","gridRowStart","lineHeight","order","orphans","widows","zIndex","zoom","fillOpacity","floodOpacity","stopOpacity","strokeMiterlimit","strokeOpacity","origName","setProperty","isFinite","getBoundingClientRect","scrollboxSizeBuggy","left","margin","padding","border","prefix","suffix","expand","expanded","parts","propHooks","run","percent","eased","duration","pos","step","fx","scrollTop","scrollLeft","linear","p","swing","cos","PI","fxNow","inProgress","opt","rfxtypes","rrun","schedule","hidden","requestAnimationFrame","interval","tick","createFxNow","genFx","includeWidth","createTween","animation","Animation","tweeners","properties","stopped","prefilters","currentTime","startTime","tweens","opts","specialEasing","originalProperties","originalOptions","gotoEnd","propFilter","bind","complete","timer","anim","*","tweener","oldfire","propTween","restoreDisplay","isBox","dataShow","unqueued","overflow","overflowX","overflowY","prefilter","speed","speeds","fadeTo","to","animate","optall","doAnimation","finish","stopQueue","timers","cssFn","slideDown","slideUp","slideToggle","fadeIn","fadeOut","fadeToggle","slow","fast","delay","time","timeout","clearTimeout","checkOn","optSelected","radioValue","boolHook","removeAttr","nType","attrHooks","attrNames","getter","lowercaseName","rfocusable","rclickable","stripAndCollapse","getClass","classesToArray","removeProp","propFix","tabindex","for","class","addClass","classNames","curValue","finalValue","removeClass","toggleClass","stateVal","isValidValue","hasClass","rreturn","valHooks","optionSet","rquery","parseXML","parserErrorElem","DOMParser","parseFromString","rfocusMorph","stopPropagationCallback","onlyHandlers","bubbleType","ontype","lastElement","eventPath","parentWindow","triggerHandler","rbracket","rCRLF","rsubmitterTypes","rsubmittable","buildParams","traditional","param","s","valueOrFunction","encodeURIComponent","serialize","serializeArray","r20","rhash","rantiCache","rheaders","rnoContent","rprotocol","transports","allTypes","originAnchor","addToPrefiltersOrTransports","structure","dataTypeExpression","dataType","dataTypes","inspectPrefiltersOrTransports","jqXHR","inspected","seekingTransport","inspect","prefilterOrFactory","dataTypeOrTransport","ajaxExtend","flatOptions","ajaxSettings","active","lastModified","etag","url","isLocal","protocol","processData","async","contentType","accepts","json","responseFields","converters","* text","text html","text json","text xml","ajaxSetup","settings","ajaxPrefilter","ajaxTransport","ajax","transport","cacheURL","responseHeadersString","responseHeaders","timeoutTimer","urlAnchor","fireGlobals","uncached","callbackContext","globalEventContext","completeDeferred","statusCode","requestHeaders","requestHeadersNames","strAbort","getResponseHeader","getAllResponseHeaders","setRequestHeader","overrideMimeType","mimeType","status","abort","statusText","finalText","crossDomain","host","hasContent","ifModified","headers","beforeSend","success","send","nativeStatusText","responses","isSuccess","response","modified","ct","finalDataType","firstDataType","ajaxHandleResponses","conv2","current","conv","dataFilter","throws","ajaxConvert","getJSON","getScript","text script","wrapAll","firstElementChild","wrapInner","htmlIsFunction","unwrap","visible","xhr","XMLHttpRequest","xhrSuccessStatus","0","1223","xhrSupported","cors","errorCallback","open","username","xhrFields","onload","onerror","onabort","ontimeout","onreadystatechange","responseType","responseText","binary","scriptAttrs","charset","scriptCharset","evt","oldCallbacks","rjsonp","jsonp","jsonpCallback","originalSettings","callbackName","overwritten","responseContainer","jsonProp","createHTMLDocument","implementation","keepScripts","parsed","params","animated","offset","setOffset","curPosition","curLeft","curCSSTop","curTop","curOffset","curCSSLeft","curElem","using","rect","win","pageYOffset","pageXOffset","offsetParent","parentOffset","scrollTo","Height","Width","","defaultExtra","funcName","unbind","delegate","undelegate","hover","fnOver","fnOut","rtrim","proxy","holdReady","hold","parseJSON","isNumeric","isNaN","trim","define","amd","_jQuery","_$","$","noConflict"],"mappings":";CAUA,SAAYA,EAAQC,GAEnB,aAEuB,iBAAXC,QAAiD,iBAAnBA,OAAOC,QAShDD,OAAOC,QAAUH,EAAOI,SACvBH,EAASD,GAAQ,GACjB,SAAUK,GACT,IAAMA,EAAED,SACP,MAAM,IAAIE,MAAO,4CAElB,OAAOL,EAASI,IAGlBJ,EAASD,GAtBX,CA0BuB,oBAAXO,OAAyBA,OAASC,KAAM,SAAUD,GAAQE,GAMtE,aAEA,IAAIC,GAAM,GAENC,EAAWC,OAAOC,eAElBC,GAAQJ,GAAII,MAEZC,EAAOL,GAAIK,KAAO,SAAUC,GAC/B,OAAON,GAAIK,KAAKE,KAAMD,IACnB,SAAUA,GACb,OAAON,GAAIQ,OAAOC,MAAO,GAAIH,IAI1BI,EAAOV,GAAIU,KAEXC,GAAUX,GAAIW,QAEdC,EAAa,GAEbC,EAAWD,EAAWC,SAEtBC,GAASF,EAAWG,eAEpBC,EAAaF,GAAOD,SAEpBI,EAAuBD,EAAWT,KAAML,QAExCgB,GAAU,GAEVC,EAAa,SAAqBC,GASpC,MAAsB,mBAARA,GAA8C,iBAAjBA,EAAIC,UAC1B,mBAAbD,EAAIE,MAIVC,EAAW,SAAmBH,GAChC,OAAc,MAAPA,GAAeA,IAAQA,EAAIvB,QAIhCH,EAAWG,GAAOH,SAIjB8B,EAA4B,CAC/BC,MAAM,EACNC,KAAK,EACLC,OAAO,EACPC,UAAU,GAGX,SAASC,EAASC,EAAMC,EAAMC,GAG7B,IAAIC,EAAGC,EACNC,GAHDH,EAAMA,GAAOtC,GAGC0C,cAAe,UAG7B,GADAD,EAAOE,KAAOP,EACTC,EACJ,IAAME,KAAKT,GAYVU,EAAMH,EAAME,IAAOF,EAAKO,cAAgBP,EAAKO,aAAcL,KAE1DE,EAAOI,aAAcN,EAAGC,GAI3BF,EAAIQ,KAAKC,YAAaN,GAASO,WAAWC,YAAaR,GAIzD,SAASS,EAAQxB,GAChB,OAAY,MAAPA,EACGA,EAAM,GAIQ,iBAARA,GAAmC,mBAARA,EACxCR,EAAYC,EAASN,KAAMa,KAAW,gBAC/BA,EAQT,IAAIyB,EAAU,QAEbC,EAAc,SAGdC,GAAS,SAAUC,EAAUC,GAI5B,OAAO,IAAIF,GAAOG,GAAGC,KAAMH,EAAUC,IAmYvC,SAASG,EAAahC,GAMrB,IAAIiC,IAAWjC,GAAO,WAAYA,GAAOA,EAAIiC,OAC5C5B,EAAOmB,EAAQxB,GAEhB,OAAKD,EAAYC,KAASG,EAAUH,KAIpB,UAATK,GAA+B,IAAX4B,GACR,iBAAXA,GAAgC,EAATA,GAAgBA,EAAS,KAAOjC,GAIhE,SAASkC,GAAUC,EAAMC,GAExB,OAAOD,EAAKD,UAAYC,EAAKD,SAASG,gBAAkBD,EAAKC,cApZ9DV,GAAOG,GAAKH,GAAOW,UAAY,CAG9BC,OAAQd,EAERe,YAAab,GAGbM,OAAQ,EAERQ,QAAS,WACR,OAAOzD,GAAMG,KAAMT,OAKpBgE,IAAK,SAAUC,GAGd,OAAY,MAAPA,EACG3D,GAAMG,KAAMT,MAIbiE,EAAM,EAAIjE,KAAMiE,EAAMjE,KAAKuD,QAAWvD,KAAMiE,IAKpDC,UAAW,SAAUC,GAGpB,IAAIC,EAAMnB,GAAOoB,MAAOrE,KAAK8D,cAAeK,GAM5C,OAHAC,EAAIE,WAAatE,KAGVoE,GAIRG,KAAM,SAAUC,GACf,OAAOvB,GAAOsB,KAAMvE,KAAMwE,IAG3BC,IAAK,SAAUD,GACd,OAAOxE,KAAKkE,UAAWjB,GAAOwB,IAAKzE,KAAM,SAAUyD,EAAMtB,GACxD,OAAOqC,EAAS/D,KAAMgD,EAAMtB,EAAGsB,OAIjCnD,MAAO,WACN,OAAON,KAAKkE,UAAW5D,GAAMK,MAAOX,KAAM0E,aAG3CC,MAAO,WACN,OAAO3E,KAAK4E,GAAI,IAGjBC,KAAM,WACL,OAAO7E,KAAK4E,IAAK,IAGlBE,KAAM,WACL,OAAO9E,KAAKkE,UAAWjB,GAAO8B,KAAM/E,KAAM,SAAUgF,EAAO7C,GAC1D,OAASA,EAAI,GAAM,MAIrB8C,IAAK,WACJ,OAAOjF,KAAKkE,UAAWjB,GAAO8B,KAAM/E,KAAM,SAAUgF,EAAO7C,GAC1D,OAAOA,EAAI,MAIbyC,GAAI,SAAUzC,GACb,IAAI+C,EAAMlF,KAAKuD,OACd4B,GAAKhD,GAAMA,EAAI,EAAI+C,EAAM,GAC1B,OAAOlF,KAAKkE,UAAgB,GAALiB,GAAUA,EAAID,EAAM,CAAElF,KAAMmF,IAAQ,KAG5DC,IAAK,WACJ,OAAOpF,KAAKsE,YAActE,KAAK8D,eAKhClD,KAAMA,EACNyE,KAAMnF,GAAImF,KACVC,OAAQpF,GAAIoF,QAGbrC,GAAOsC,OAAStC,GAAOG,GAAGmC,OAAS,WAClC,IAAIC,EAAS9B,EAAM9B,EAAK6D,EAAMC,EAAaC,EAC1CC,EAASlB,UAAW,IAAO,GAC3BvC,EAAI,EACJoB,EAASmB,UAAUnB,OACnBsC,GAAO,EAsBR,IAnBuB,kBAAXD,IACXC,EAAOD,EAGPA,EAASlB,UAAWvC,IAAO,GAC3BA,KAIsB,iBAAXyD,GAAwBvE,EAAYuE,KAC/CA,EAAS,IAILzD,IAAMoB,IACVqC,EAAS5F,KACTmC,KAGOA,EAAIoB,EAAQpB,IAGnB,GAAqC,OAA9BqD,EAAUd,UAAWvC,IAG3B,IAAMuB,KAAQ8B,EACbC,EAAOD,EAAS9B,GAIF,cAATA,GAAwBkC,IAAWH,IAKnCI,GAAQJ,IAAUxC,GAAO6C,cAAeL,KAC1CC,EAAcK,MAAMC,QAASP,MAC/B7D,EAAMgE,EAAQlC,GAIbiC,EADID,IAAgBK,MAAMC,QAASpE,GAC3B,GACI8D,GAAgBzC,GAAO6C,cAAelE,GAG1CA,EAFA,GAIT8D,GAAc,EAGdE,EAAQlC,GAAST,GAAOsC,OAAQM,EAAMF,EAAOF,SAGzBQ,IAATR,IACXG,EAAQlC,GAAS+B,IAOrB,OAAOG,GAGR3C,GAAOsC,OAAQ,CAGdW,QAAS,UAAanD,EAAUoD,KAAKC,UAAWC,QAAS,MAAO,IAGhEC,SAAS,EAETC,MAAO,SAAUC,GAChB,MAAM,IAAI1G,MAAO0G,IAGlBC,KAAM,aAENX,cAAe,SAAUxE,GACxB,IAAIoF,EAAOC,EAIX,SAAMrF,GAAgC,oBAAzBP,EAASN,KAAMa,QAI5BoF,EAAQvG,EAAUmB,KASK,mBADvBqF,EAAO3F,GAAOP,KAAMiG,EAAO,gBAAmBA,EAAM5C,cACf5C,EAAWT,KAAMkG,KAAWxF,IAGlEyF,cAAe,SAAUtF,GACxB,IAAIoC,EAEJ,IAAMA,KAAQpC,EACb,OAAO,EAER,OAAO,GAKRuF,WAAY,SAAU7E,EAAMwD,EAAStD,GACpCH,EAASC,EAAM,CAAEH,MAAO2D,GAAWA,EAAQ3D,OAASK,IAGrDqC,KAAM,SAAUjD,EAAKkD,GACpB,IAAIjB,EAAQpB,EAAI,EAEhB,GAAKmB,EAAahC,IAEjB,IADAiC,EAASjC,EAAIiC,OACLpB,EAAIoB,EAAQpB,IACnB,IAAgD,IAA3CqC,EAAS/D,KAAMa,EAAKa,GAAKA,EAAGb,EAAKa,IACrC,WAIF,IAAMA,KAAKb,EACV,IAAgD,IAA3CkD,EAAS/D,KAAMa,EAAKa,GAAKA,EAAGb,EAAKa,IACrC,MAKH,OAAOb,GAKRiB,KAAM,SAAUkB,GACf,IAAIxB,EACHmC,EAAM,GACNjC,EAAI,EACJZ,EAAWkC,EAAKlC,SAEjB,IAAMA,EAGL,MAAUU,EAAOwB,EAAMtB,KAGtBiC,GAAOnB,GAAOV,KAAMN,GAGtB,OAAkB,IAAbV,GAA+B,KAAbA,EACfkC,EAAKqD,YAEK,IAAbvF,EACGkC,EAAKsD,gBAAgBD,YAEX,IAAbvF,GAA+B,IAAbA,EACfkC,EAAKuD,UAKN5C,GAIR6C,UAAW,SAAU/G,EAAKgH,GACzB,IAAI9C,EAAM8C,GAAW,GAarB,OAXY,MAAPhH,IACCoD,EAAalD,OAAQF,IACzB+C,GAAOoB,MAAOD,EACE,iBAARlE,EACN,CAAEA,GAAQA,GAGZU,EAAKH,KAAM2D,EAAKlE,IAIXkE,GAGR+C,QAAS,SAAU1D,EAAMvD,EAAKiC,GAC7B,OAAc,MAAPjC,GAAe,EAAIW,GAAQJ,KAAMP,EAAKuD,EAAMtB,IAGpDiF,SAAU,SAAU3D,GACnB,IAAI4D,EAAY5D,GAAQA,EAAK6D,aAC5BC,EAAU9D,IAAUA,EAAK+D,eAAiB/D,GAAOsD,gBAIlD,OAAQ/D,EAAYyE,KAAMJ,GAAaE,GAAWA,EAAQ/D,UAAY,SAKvEa,MAAO,SAAUM,EAAO+C,GAKvB,IAJA,IAAIxC,GAAOwC,EAAOnE,OACjB4B,EAAI,EACJhD,EAAIwC,EAAMpB,OAEH4B,EAAID,EAAKC,IAChBR,EAAOxC,KAAQuF,EAAQvC,GAKxB,OAFAR,EAAMpB,OAASpB,EAERwC,GAGRI,KAAM,SAAUZ,EAAOK,EAAUmD,GAShC,IARA,IACCC,EAAU,GACVzF,EAAI,EACJoB,EAASY,EAAMZ,OACfsE,GAAkBF,EAIXxF,EAAIoB,EAAQpB,KACAqC,EAAUL,EAAOhC,GAAKA,KAChB0F,GACxBD,EAAQhH,KAAMuD,EAAOhC,IAIvB,OAAOyF,GAIRnD,IAAK,SAAUN,EAAOK,EAAUsD,GAC/B,IAAIvE,EAAQwE,EACX5F,EAAI,EACJiC,EAAM,GAGP,GAAKd,EAAaa,GAEjB,IADAZ,EAASY,EAAMZ,OACPpB,EAAIoB,EAAQpB,IAGL,OAFd4F,EAAQvD,EAAUL,EAAOhC,GAAKA,EAAG2F,KAGhC1D,EAAIxD,KAAMmH,QAMZ,IAAM5F,KAAKgC,EAGI,OAFd4D,EAAQvD,EAAUL,EAAOhC,GAAKA,EAAG2F,KAGhC1D,EAAIxD,KAAMmH,GAMb,OAAOxH,EAAM6D,IAId4D,KAAM,EAIN5G,QAASA,KAGa,mBAAX6G,SACXhF,GAAOG,GAAI6E,OAAOC,UAAahI,GAAK+H,OAAOC,WAI5CjF,GAAOsB,KAAM,uEAAuE4D,MAAO,KAC1F,SAAUC,EAAI1E,GACb5C,EAAY,WAAa4C,EAAO,KAAQA,EAAKC,gBA0B/C,IAAI0E,GAAMnI,GAAImI,IAGVhD,GAAOnF,GAAImF,KAGXC,GAASpF,GAAIoF,OAGbgD,GAAa,sBAGbC,GAAW,IAAIC,OAClB,IAAMF,GAAa,8BAAgCA,GAAa,KAChE,KAODrF,GAAOwF,SAAW,SAAUC,EAAGC,GAC9B,IAAIC,EAAMD,GAAKA,EAAE/F,WAEjB,OAAO8F,IAAME,MAAWA,GAAwB,IAAjBA,EAAIrH,YAIlCmH,EAAED,SACDC,EAAED,SAAUG,GACZF,EAAEG,yBAA8D,GAAnCH,EAAEG,wBAAyBD,MAS3D,IAAIE,EAAa,+CAEjB,SAASC,EAAYC,EAAIC,GACxB,OAAKA,EAGQ,OAAPD,EACG,SAIDA,EAAG1I,MAAO,GAAI,GAAM,KAAO0I,EAAGE,WAAYF,EAAGzF,OAAS,GAAIxC,SAAU,IAAO,IAI5E,KAAOiI,EAGf/F,GAAOkG,eAAiB,SAAUC,GACjC,OAASA,EAAM,IAAK/C,QAASyC,EAAYC,IAM1C,IAAIM,GAAezJ,EAClB0J,GAAa1I,GAEd,WAEA,IAAIuB,EACHoH,EACAC,EACAC,EACAC,EAIA9J,EACAmH,EACA4C,EACAC,EACAhC,EAPAhH,EAAO0I,GAUPpD,EAAUjD,GAAOiD,QACjB2D,EAAU,EACVC,EAAO,EACPC,EAAaC,IACbC,EAAaD,IACbE,EAAgBF,IAChBG,EAAyBH,IACzBI,EAAY,SAAU1B,EAAGC,GAIxB,OAHKD,IAAMC,IACVe,GAAe,GAET,GAGRW,EAAW,6HAMXC,EAAa,0BAA4BhC,GACxC,0CAGDiC,EAAa,MAAQjC,GAAa,KAAOgC,EAAa,OAAShC,GAG9D,gBAAkBA,GAGlB,2DAA6DgC,EAAa,OAC1EhC,GAAa,OAEdkC,EAAU,KAAOF,EAAa,wFAOAC,EAAa,eAO3CE,EAAc,IAAIjC,OAAQF,GAAa,IAAK,KAE5CoC,EAAS,IAAIlC,OAAQ,IAAMF,GAAa,KAAOA,GAAa,KAC5DqC,EAAqB,IAAInC,OAAQ,IAAMF,GAAa,WAAaA,GAAa,IAC7EA,GAAa,KACdsC,EAAW,IAAIpC,OAAQF,GAAa,MAEpCuC,EAAU,IAAIrC,OAAQgC,GACtBM,EAAc,IAAItC,OAAQ,IAAM8B,EAAa,KAE7CS,EAAY,CACXC,GAAI,IAAIxC,OAAQ,MAAQ8B,EAAa,KACrCW,MAAO,IAAIzC,OAAQ,QAAU8B,EAAa,KAC1CY,IAAK,IAAI1C,OAAQ,KAAO8B,EAAa,SACrCa,KAAM,IAAI3C,OAAQ,IAAM+B,GACxBa,OAAQ,IAAI5C,OAAQ,IAAMgC,GAC1Ba,MAAO,IAAI7C,OACV,yDACCF,GAAa,+BAAiCA,GAAa,cAC3DA,GAAa,aAAeA,GAAa,SAAU,KACrDgD,KAAM,IAAI9C,OAAQ,OAAS6B,EAAW,KAAM,KAI5CkB,aAAc,IAAI/C,OAAQ,IAAMF,GAC/B,mDAAqDA,GACrD,mBAAqBA,GAAa,mBAAoB,MAGxDkD,EAAU,sCACVC,EAAU,SAGVC,EAAa,mCAEbC,EAAW,OAIXC,EAAY,IAAIpD,OAAQ,uBAAyBF,GAChD,uBAAwB,KACzBuD,EAAY,SAAUC,EAAQC,GAC7B,IAAIC,EAAO,KAAOF,EAAOxL,MAAO,GAAM,MAEtC,OAAKyL,IAUEC,EAAO,EACbC,OAAOC,aAAcF,EAAO,OAC5BC,OAAOC,aAAcF,GAAQ,GAAK,MAAe,KAAPA,EAAe,SAO3DG,EAAgB,WACfC,KAGDC,EAAqBC,EACpB,SAAU7I,GACT,OAAyB,IAAlBA,EAAK8I,UAAqB/I,GAAUC,EAAM,aAElD,CAAE+I,IAAK,aAAcC,KAAM,WAa7B,IACC7L,EAAKD,MACFT,GAAMI,GAAMG,KAAM4I,GAAaqD,YACjCrD,GAAaqD,YAMdxM,GAAKmJ,GAAaqD,WAAWnJ,QAAShC,SACrC,MAAQoL,GACT/L,EAAO,CACND,MAAO,SAAUiF,EAAQgH,GACxBtD,GAAW3I,MAAOiF,EAAQtF,GAAMG,KAAMmM,KAEvCnM,KAAM,SAAUmF,GACf0D,GAAW3I,MAAOiF,EAAQtF,GAAMG,KAAMiE,UAAW,MAKpD,SAASmI,EAAM3J,EAAUC,EAAS+D,EAAS4F,GAC1C,IAAIC,EAAG5K,EAAGsB,EAAMuJ,EAAKC,EAAOC,EAAQC,EACnCC,EAAajK,GAAWA,EAAQqE,cAGhCjG,EAAW4B,EAAUA,EAAQ5B,SAAW,EAKzC,GAHA2F,EAAUA,GAAW,GAGI,iBAAbhE,IAA0BA,GACxB,IAAb3B,GAA+B,IAAbA,GAA+B,KAAbA,EAEpC,OAAO2F,EAIR,IAAM4F,IACLV,EAAajJ,GACbA,EAAUA,GAAWvD,EAEhB+J,GAAiB,CAIrB,GAAkB,KAAbpI,IAAqB0L,EAAQvB,EAAW2B,KAAMnK,IAGlD,GAAO6J,EAAIE,EAAO,IAGjB,GAAkB,IAAb1L,EAAiB,CACrB,KAAOkC,EAAON,EAAQmK,eAAgBP,IASrC,OAAO7F,EALP,GAAKzD,EAAK8J,KAAOR,EAEhB,OADAnM,EAAKH,KAAMyG,EAASzD,GACbyD,OAWT,GAAKkG,IAAgB3J,EAAO2J,EAAWE,eAAgBP,KACtDF,EAAKpE,SAAUtF,EAASM,IACxBA,EAAK8J,KAAOR,EAGZ,OADAnM,EAAKH,KAAMyG,EAASzD,GACbyD,MAKH,CAAA,GAAK+F,EAAO,GAElB,OADArM,EAAKD,MAAOuG,EAAS/D,EAAQqK,qBAAsBtK,IAC5CgE,EAGD,IAAO6F,EAAIE,EAAO,KAAS9J,EAAQsK,uBAEzC,OADA7M,EAAKD,MAAOuG,EAAS/D,EAAQsK,uBAAwBV,IAC9C7F,EAKT,KAAMiD,EAAwBjH,EAAW,MACrC0G,GAAcA,EAAUnC,KAAMvE,IAAe,CAYhD,GAVAiK,EAAcjK,EACdkK,EAAajK,EASK,IAAb5B,IACFqJ,EAASnD,KAAMvE,IAAcyH,EAAmBlD,KAAMvE,IAAe,EAGvEkK,EAAazB,EAASlE,KAAMvE,IAAcwK,EAAavK,EAAQP,aAC9DO,IAQkBA,GAAY/B,GAAQuM,SAG/BX,EAAM7J,EAAQX,aAAc,OAClCwK,EAAM/J,GAAOkG,eAAgB6D,GAE7B7J,EAAQV,aAAc,KAAQuK,EAAM9G,IAMtC/D,GADA+K,EAASU,EAAU1K,IACRK,OACX,MAAQpB,IACP+K,EAAQ/K,IAAQ6K,EAAM,IAAMA,EAAM,UAAa,IAC9Ca,EAAYX,EAAQ/K,IAEtBgL,EAAcD,EAAOY,KAAM,KAG5B,IAIC,OAHAlN,EAAKD,MAAOuG,EACXkG,EAAWW,iBAAkBZ,IAEvBjG,EACN,MAAQ8G,GACT7D,EAAwBjH,GAAU,GACjC,QACI8J,IAAQ9G,GACZ/C,EAAQ8K,gBAAiB,QAQ9B,OAAOC,GAAQhL,EAASmD,QAASkC,GAAU,MAAQpF,EAAS+D,EAAS4F,GAStE,SAAS9C,IACR,IAAImE,EAAO,GAaX,OAXA,SAASC,EAAOC,EAAKtG,GASpB,OALKoG,EAAKvN,KAAMyN,EAAM,KAAQ9E,EAAK+E,oBAG3BF,EAAOD,EAAKI,SAEXH,EAAOC,EAAM,KAAQtG,GAShC,SAASyG,EAAcpL,GAEtB,OADAA,EAAI8C,IAAY,EACT9C,EAOR,SAASqL,EAAQrL,GAChB,IAAIsL,EAAK9O,EAAS0C,cAAe,YAEjC,IACC,QAASc,EAAIsL,GACZ,MAAQ/B,GACT,OAAO,EACN,QAGI+B,EAAG9L,YACP8L,EAAG9L,WAAWC,YAAa6L,GAI5BA,EAAK,MAQP,SAASC,EAAmBhN,GAC3B,OAAO,SAAU8B,GAChB,OAAOD,GAAUC,EAAM,UAAaA,EAAK9B,OAASA,GAQpD,SAASiN,EAAoBjN,GAC5B,OAAO,SAAU8B,GAChB,OAASD,GAAUC,EAAM,UAAaD,GAAUC,EAAM,YACrDA,EAAK9B,OAASA,GAQjB,SAASkN,EAAsBtC,GAG9B,OAAO,SAAU9I,GAKhB,MAAK,SAAUA,EASTA,EAAKb,aAAgC,IAAlBa,EAAK8I,SAGvB,UAAW9I,EACV,UAAWA,EAAKb,WACba,EAAKb,WAAW2J,WAAaA,EAE7B9I,EAAK8I,WAAaA,EAMpB9I,EAAKqL,aAAevC,GAG1B9I,EAAKqL,cAAgBvC,GACpBF,EAAoB5I,KAAW8I,EAG3B9I,EAAK8I,WAAaA,EAKd,UAAW9I,GACfA,EAAK8I,WAAaA,GAY5B,SAASwC,EAAwB3L,GAChC,OAAOoL,EAAc,SAAUQ,GAE9B,OADAA,GAAYA,EACLR,EAAc,SAAU1B,EAAMlF,GACpC,IAAIzC,EACH8J,EAAe7L,EAAI,GAAI0J,EAAKvJ,OAAQyL,GACpC7M,EAAI8M,EAAa1L,OAGlB,MAAQpB,IACF2K,EAAQ3H,EAAI8J,EAAc9M,MAC9B2K,EAAM3H,KAASyC,EAASzC,GAAM2H,EAAM3H,SAYzC,SAASuI,EAAavK,GACrB,OAAOA,GAAmD,oBAAjCA,EAAQqK,sBAAwCrK,EAQ1E,SAASiJ,EAAanK,GACrB,IAAIiN,EACHhN,EAAMD,EAAOA,EAAKuF,eAAiBvF,EAAOoH,GAO3C,OAAKnH,GAAOtC,GAA6B,IAAjBsC,EAAIX,UAAmBW,EAAI6E,kBAMnDA,GADAnH,EAAWsC,GACgB6E,gBAC3B4C,GAAkB1G,GAAOmE,SAAUxH,GAInCgI,EAAUb,EAAgBa,SACzBb,EAAgBoI,uBAChBpI,EAAgBqI,kBAOZrI,EAAgBqI,mBAMpB/F,IAAgBzJ,IACdsP,EAAYtP,EAASyP,cAAiBH,EAAUI,MAAQJ,GAG1DA,EAAUK,iBAAkB,SAAUpD,GAOvC/K,GAAQoO,QAAUf,EAAQ,SAAUC,GAEnC,OADA3H,EAAgBpE,YAAa+L,GAAKnB,GAAKtK,GAAOiD,SACtCtG,EAAS6P,oBACf7P,EAAS6P,kBAAmBxM,GAAOiD,SAAU3C,SAMhDnC,GAAQsO,kBAAoBjB,EAAQ,SAAUC,GAC7C,OAAO9G,EAAQnH,KAAMiO,EAAI,OAK1BtN,GAAQuM,MAAQc,EAAQ,WACvB,OAAO7O,EAASmO,iBAAkB,YAYnC3M,GAAQuO,OAASlB,EAAQ,WACxB,IAEC,OADA7O,EAASgQ,cAAe,oBACjB,EACN,MAAQjD,GACT,OAAO,KAKJvL,GAAQoO,SACZjG,EAAKsG,OAAO7E,GAAK,SAAUuC,GAC1B,IAAIuC,EAASvC,EAAGlH,QAASuF,EAAWC,GACpC,OAAO,SAAUpI,GAChB,OAAOA,EAAKjB,aAAc,QAAWsN,IAGvCvG,EAAKsD,KAAK7B,GAAK,SAAUuC,EAAIpK,GAC5B,GAAuC,oBAA3BA,EAAQmK,gBAAkC3D,EAAiB,CACtE,IAAIlG,EAAON,EAAQmK,eAAgBC,GACnC,OAAO9J,EAAO,CAAEA,GAAS,OAI3B8F,EAAKsG,OAAO7E,GAAM,SAAUuC,GAC3B,IAAIuC,EAASvC,EAAGlH,QAASuF,EAAWC,GACpC,OAAO,SAAUpI,GAChB,IAAIxB,EAAwC,oBAA1BwB,EAAKsM,kBACtBtM,EAAKsM,iBAAkB,MACxB,OAAO9N,GAAQA,EAAK8F,QAAU+H,IAMhCvG,EAAKsD,KAAK7B,GAAK,SAAUuC,EAAIpK,GAC5B,GAAuC,oBAA3BA,EAAQmK,gBAAkC3D,EAAiB,CACtE,IAAI1H,EAAME,EAAGgC,EACZV,EAAON,EAAQmK,eAAgBC,GAEhC,GAAK9J,EAAO,CAIX,IADAxB,EAAOwB,EAAKsM,iBAAkB,QACjB9N,EAAK8F,QAAUwF,EAC3B,MAAO,CAAE9J,GAIVU,EAAQhB,EAAQsM,kBAAmBlC,GACnCpL,EAAI,EACJ,MAAUsB,EAAOU,EAAOhC,KAEvB,IADAF,EAAOwB,EAAKsM,iBAAkB,QACjB9N,EAAK8F,QAAUwF,EAC3B,MAAO,CAAE9J,GAKZ,MAAO,MAMV8F,EAAKsD,KAAK3B,IAAM,SAAU8E,EAAK7M,GAC9B,MAA6C,oBAAjCA,EAAQqK,qBACZrK,EAAQqK,qBAAsBwC,GAI9B7M,EAAQ4K,iBAAkBiC,IAKnCzG,EAAKsD,KAAK5B,MAAQ,SAAUgF,EAAW9M,GACtC,GAA+C,oBAAnCA,EAAQsK,wBAA0C9D,EAC7D,OAAOxG,EAAQsK,uBAAwBwC,IASzCrG,EAAY,GAIZ6E,EAAQ,SAAUC,GAEjB,IAAIwB,EAEJnJ,EAAgBpE,YAAa+L,GAAKyB,UACjC,UAAYjK,EAAU,iDACLA,EAAU,oEAKtBwI,EAAGX,iBAAkB,cAAexK,QACzCqG,EAAUhJ,KAAM,MAAQ0H,GAAa,aAAe+B,EAAW,KAI1DqE,EAAGX,iBAAkB,QAAU7H,EAAU,MAAO3C,QACrDqG,EAAUhJ,KAAM,MAMX8N,EAAGX,iBAAkB,KAAO7H,EAAU,MAAO3C,QAClDqG,EAAUhJ,KAAM,YAOX8N,EAAGX,iBAAkB,YAAaxK,QACvCqG,EAAUhJ,KAAM,aAKjBsP,EAAQtQ,EAAS0C,cAAe,UAC1BG,aAAc,OAAQ,UAC5BiM,EAAG/L,YAAauN,GAAQzN,aAAc,OAAQ,KAQ9CsE,EAAgBpE,YAAa+L,GAAKnC,UAAW,EACM,IAA9CmC,EAAGX,iBAAkB,aAAcxK,QACvCqG,EAAUhJ,KAAM,WAAY,cAQ7BsP,EAAQtQ,EAAS0C,cAAe,UAC1BG,aAAc,OAAQ,IAC5BiM,EAAG/L,YAAauN,GACVxB,EAAGX,iBAAkB,aAAcxK,QACxCqG,EAAUhJ,KAAM,MAAQ0H,GAAa,QAAUA,GAAa,KAC3DA,GAAa,kBAIVlH,GAAQuO,QAQb/F,EAAUhJ,KAAM,QAGjBgJ,EAAYA,EAAUrG,QAAU,IAAIiF,OAAQoB,EAAUkE,KAAM,MAM5D1D,EAAY,SAAU1B,EAAGC,GAGxB,GAAKD,IAAMC,EAEV,OADAe,GAAe,EACR,EAIR,IAAI0G,GAAW1H,EAAEG,yBAA2BF,EAAEE,wBAC9C,OAAKuH,IAgBU,GAPfA,GAAY1H,EAAElB,eAAiBkB,KAASC,EAAEnB,eAAiBmB,GAC1DD,EAAEG,wBAAyBF,GAG3B,KAIGvH,GAAQiP,cAAgB1H,EAAEE,wBAAyBH,KAAQ0H,EAOzD1H,IAAM9I,GAAY8I,EAAElB,eAAiB6B,IACzCwD,EAAKpE,SAAUY,GAAcX,IACrB,EAOJC,IAAM/I,GAAY+I,EAAEnB,eAAiB6B,IACzCwD,EAAKpE,SAAUY,GAAcV,GACtB,EAIDc,EACJ5I,GAAQJ,KAAMgJ,EAAWf,GAAM7H,GAAQJ,KAAMgJ,EAAWd,GAC1D,EAGe,EAAVyH,GAAe,EAAI,KAGpBxQ,EAqpBR,IAAMuC,KAlpBN0K,EAAKjF,QAAU,SAAU0I,EAAMC,GAC9B,OAAO1D,EAAMyD,EAAM,KAAM,KAAMC,IAGhC1D,EAAK2D,gBAAkB,SAAU/M,EAAM6M,GAGtC,GAFAlE,EAAa3I,GAERkG,IACHQ,EAAwBmG,EAAO,QAC7B1G,IAAcA,EAAUnC,KAAM6I,IAEjC,IACC,IAAIlM,EAAMwD,EAAQnH,KAAMgD,EAAM6M,GAG9B,GAAKlM,GAAOhD,GAAQsO,mBAIlBjM,EAAK7D,UAAuC,KAA3B6D,EAAK7D,SAAS2B,SAChC,OAAO6C,EAEP,MAAQuI,GACTxC,EAAwBmG,GAAM,GAIhC,OAAuD,EAAhDzD,EAAMyD,EAAM1Q,EAAU,KAAM,CAAE6D,IAASF,QAG/CsJ,EAAKpE,SAAW,SAAUtF,EAASM,GAUlC,OAHON,EAAQqE,eAAiBrE,IAAavD,GAC5CwM,EAAajJ,GAEPF,GAAOwF,SAAUtF,EAASM,IAIlCoJ,EAAK4D,KAAO,SAAUhN,EAAMC,IAOpBD,EAAK+D,eAAiB/D,IAAU7D,GACtCwM,EAAa3I,GAGd,IAAIL,EAAKmG,EAAKmH,WAAYhN,EAAKC,eAG9BvB,EAAMgB,GAAMpC,GAAOP,KAAM8I,EAAKmH,WAAYhN,EAAKC,eAC9CP,EAAIK,EAAMC,GAAOiG,QACjB1D,EAEF,YAAaA,IAAR7D,EACGA,EAGDqB,EAAKjB,aAAckB,IAG3BmJ,EAAKtG,MAAQ,SAAUC,GACtB,MAAM,IAAI1G,MAAO,0CAA4C0G,IAO9DvD,GAAO0N,WAAa,SAAUzJ,GAC7B,IAAIzD,EACHmN,EAAa,GACbzL,EAAI,EACJhD,EAAI,EAWL,GAJAuH,GAAgBtI,GAAQyP,WACxBpH,GAAarI,GAAQyP,YAAcvQ,GAAMG,KAAMyG,EAAS,GACxD7B,GAAK5E,KAAMyG,EAASkD,GAEfV,EAAe,CACnB,MAAUjG,EAAOyD,EAAS/E,KACpBsB,IAASyD,EAAS/E,KACtBgD,EAAIyL,EAAWhQ,KAAMuB,IAGvB,MAAQgD,IACPG,GAAO7E,KAAMyG,EAAS0J,EAAYzL,GAAK,GAQzC,OAFAsE,EAAY,KAELvC,GAGRjE,GAAOG,GAAGuN,WAAa,WACtB,OAAO3Q,KAAKkE,UAAWjB,GAAO0N,WAAYrQ,GAAMK,MAAOX,UAGxDuJ,EAAOtG,GAAOqN,KAAO,CAGpBhC,YAAa,GAEbwC,aAActC,EAEdvB,MAAOlC,EAEP2F,WAAY,GAEZ7D,KAAM,GAENkE,SAAU,CACTC,IAAK,CAAExE,IAAK,aAAc7H,OAAO,GACjCsM,IAAK,CAAEzE,IAAK,cACZ0E,IAAK,CAAE1E,IAAK,kBAAmB7H,OAAO,GACtCwM,IAAK,CAAE3E,IAAK,oBAGb4E,UAAW,CACVjG,KAAM,SAAU8B,GAWf,OAVAA,EAAO,GAAMA,EAAO,GAAI5G,QAASuF,EAAWC,GAG5CoB,EAAO,IAAQA,EAAO,IAAOA,EAAO,IAAOA,EAAO,IAAO,IACvD5G,QAASuF,EAAWC,GAEF,OAAfoB,EAAO,KACXA,EAAO,GAAM,IAAMA,EAAO,GAAM,KAG1BA,EAAM3M,MAAO,EAAG,IAGxB+K,MAAO,SAAU4B,GAkChB,OAtBAA,EAAO,GAAMA,EAAO,GAAItJ,cAEU,QAA7BsJ,EAAO,GAAI3M,MAAO,EAAG,IAGnB2M,EAAO,IACZJ,EAAKtG,MAAO0G,EAAO,IAKpBA,EAAO,KAASA,EAAO,GACtBA,EAAO,IAAQA,EAAO,IAAO,GAC7B,GAAqB,SAAfA,EAAO,IAAiC,QAAfA,EAAO,KAEvCA,EAAO,KAAWA,EAAO,GAAMA,EAAO,IAAwB,QAAfA,EAAO,KAG3CA,EAAO,IAClBJ,EAAKtG,MAAO0G,EAAO,IAGbA,GAGR7B,OAAQ,SAAU6B,GACjB,IAAIoE,EACHC,GAAYrE,EAAO,IAAOA,EAAO,GAElC,OAAKlC,EAAUM,MAAM5D,KAAMwF,EAAO,IAC1B,MAIHA,EAAO,GACXA,EAAO,GAAMA,EAAO,IAAOA,EAAO,IAAO,GAG9BqE,GAAYzG,EAAQpD,KAAM6J,KAGnCD,EAASzD,EAAU0D,GAAU,MAG7BD,EAASC,EAASzQ,QAAS,IAAKyQ,EAAS/N,OAAS8N,GAAWC,EAAS/N,UAGxE0J,EAAO,GAAMA,EAAO,GAAI3M,MAAO,EAAG+Q,GAClCpE,EAAO,GAAMqE,EAAShR,MAAO,EAAG+Q,IAI1BpE,EAAM3M,MAAO,EAAG,MAIzBuP,OAAQ,CAEP3E,IAAK,SAAUqG,GACd,IAAIC,EAAmBD,EAAiBlL,QAASuF,EAAWC,GAAYlI,cACxE,MAA4B,MAArB4N,EACN,WACC,OAAO,GAER,SAAU9N,GACT,OAAOD,GAAUC,EAAM+N,KAI1BvG,MAAO,SAAUgF,GAChB,IAAIwB,EAAU1H,EAAYkG,EAAY,KAEtC,OAAOwB,IACJA,EAAU,IAAIjJ,OAAQ,MAAQF,GAAa,IAAM2H,EAClD,IAAM3H,GAAa,SACpByB,EAAYkG,EAAW,SAAUxM,GAChC,OAAOgO,EAAQhK,KACY,iBAAnBhE,EAAKwM,WAA0BxM,EAAKwM,WACb,oBAAtBxM,EAAKjB,cACXiB,EAAKjB,aAAc,UACpB,OAKL2I,KAAM,SAAUzH,EAAMgO,EAAUC,GAC/B,OAAO,SAAUlO,GAChB,IAAImO,EAAS/E,EAAK4D,KAAMhN,EAAMC,GAE9B,OAAe,MAAVkO,EACgB,OAAbF,GAEFA,IAINE,GAAU,GAEQ,MAAbF,EACGE,IAAWD,EAED,OAAbD,EACGE,IAAWD,EAED,OAAbD,EACGC,GAAqC,IAA5BC,EAAO/Q,QAAS8Q,GAEf,OAAbD,EACGC,IAAoC,EAA3BC,EAAO/Q,QAAS8Q,GAEf,OAAbD,EACGC,GAASC,EAAOtR,OAAQqR,EAAMpO,UAAaoO,EAEjC,OAAbD,GAEkB,GADb,IAAME,EAAOvL,QAASoE,EAAa,KAAQ,KAClD5J,QAAS8Q,GAEM,OAAbD,IACGE,IAAWD,GAASC,EAAOtR,MAAO,EAAGqR,EAAMpO,OAAS,KAAQoO,EAAQ,QAO9EtG,MAAO,SAAU1J,EAAMkQ,EAAMC,EAAWnN,EAAOE,GAC9C,IAAIkN,EAAgC,QAAvBpQ,EAAKrB,MAAO,EAAG,GAC3B0R,EAA+B,SAArBrQ,EAAKrB,OAAQ,GACvB2R,EAAkB,YAATJ,EAEV,OAAiB,IAAVlN,GAAwB,IAATE,EAGrB,SAAUpB,GACT,QAASA,EAAKb,YAGf,SAAUa,EAAMyO,EAAUC,GACzB,IAAI/D,EAAOgE,EAAYnQ,EAAMoQ,EAAWC,EACvC9F,EAAMuF,IAAWC,EAAU,cAAgB,kBAC3CO,EAAS9O,EAAKb,WACdc,EAAOuO,GAAUxO,EAAKD,SAASG,cAC/B6O,GAAYL,IAAQF,EACpBQ,GAAO,EAER,GAAKF,EAAS,CAGb,GAAKR,EAAS,CACb,MAAQvF,EAAM,CACbvK,EAAOwB,EACP,MAAUxB,EAAOA,EAAMuK,GACtB,GAAKyF,EACJzO,GAAUvB,EAAMyB,GACE,IAAlBzB,EAAKV,SAEL,OAAO,EAKT+Q,EAAQ9F,EAAe,SAAT7K,IAAoB2Q,GAAS,cAE5C,OAAO,EAMR,GAHAA,EAAQ,CAAEN,EAAUO,EAAOG,WAAaH,EAAOI,WAG1CX,GAAWQ,EAAW,CAM1BC,GADAJ,GADAjE,GADAgE,EAAaG,EAAQrM,KAAeqM,EAAQrM,GAAY,KACpCvE,IAAU,IACX,KAAQkI,GAAWuE,EAAO,KACzBA,EAAO,GAC3BnM,EAAOoQ,GAAaE,EAAO7F,WAAY2F,GAEvC,MAAUpQ,IAASoQ,GAAapQ,GAAQA,EAAMuK,KAG3CiG,EAAOJ,EAAY,IAAOC,EAAMjK,MAGlC,GAAuB,IAAlBpG,EAAKV,YAAoBkR,GAAQxQ,IAASwB,EAAO,CACrD2O,EAAYzQ,GAAS,CAAEkI,EAASwI,EAAWI,GAC3C,YAgBF,GATKD,IAIJC,EADAJ,GADAjE,GADAgE,EAAa3O,EAAMyC,KAAezC,EAAMyC,GAAY,KAChCvE,IAAU,IACX,KAAQkI,GAAWuE,EAAO,KAMhC,IAATqE,EAGJ,MAAUxQ,IAASoQ,GAAapQ,GAAQA,EAAMuK,KAC3CiG,EAAOJ,EAAY,IAAOC,EAAMjK,MAElC,IAAO4J,EACNzO,GAAUvB,EAAMyB,GACE,IAAlBzB,EAAKV,aACHkR,IAGGD,KACJJ,EAAanQ,EAAMiE,KAChBjE,EAAMiE,GAAY,KACTvE,GAAS,CAAEkI,EAAS4I,IAG5BxQ,IAASwB,GACb,MASL,OADAgP,GAAQ5N,KACQF,GAAW8N,EAAO9N,GAAU,GAAqB,GAAhB8N,EAAO9N,KAK5DyG,OAAQ,SAAUwH,EAAQ5D,GAMzB,IAAI6D,EACHzP,EAAKmG,EAAKiB,QAASoI,IAAYrJ,EAAKuJ,WAAYF,EAAOjP,gBACtDkJ,EAAKtG,MAAO,uBAAyBqM,GAKvC,OAAKxP,EAAI8C,GACD9C,EAAI4L,GAIK,EAAZ5L,EAAGG,QACPsP,EAAO,CAAED,EAAQA,EAAQ,GAAI5D,GACtBzF,EAAKuJ,WAAW7R,eAAgB2R,EAAOjP,eAC7C6K,EAAc,SAAU1B,EAAMlF,GAC7B,IAAImL,EACHC,EAAU5P,EAAI0J,EAAMkC,GACpB7M,EAAI6Q,EAAQzP,OACb,MAAQpB,IAEP2K,EADAiG,EAAMlS,GAAQJ,KAAMqM,EAAMkG,EAAS7Q,OAClByF,EAASmL,GAAQC,EAAS7Q,MAG7C,SAAUsB,GACT,OAAOL,EAAIK,EAAM,EAAGoP,KAIhBzP,IAIToH,QAAS,CAGRyI,IAAKzE,EAAc,SAAUtL,GAK5B,IAAIgN,EAAQ,GACXhJ,EAAU,GACVgM,EAAUC,GAASjQ,EAASmD,QAASkC,GAAU,OAEhD,OAAO2K,EAAShN,GACfsI,EAAc,SAAU1B,EAAMlF,EAASsK,EAAUC,GAChD,IAAI1O,EACH2P,EAAYF,EAASpG,EAAM,KAAMqF,EAAK,IACtChQ,EAAI2K,EAAKvJ,OAGV,MAAQpB,KACAsB,EAAO2P,EAAWjR,MACxB2K,EAAM3K,KAASyF,EAASzF,GAAMsB,MAIjC,SAAUA,EAAMyO,EAAUC,GAOzB,OANAjC,EAAO,GAAMzM,EACbyP,EAAShD,EAAO,KAAMiC,EAAKjL,GAI3BgJ,EAAO,GAAM,MACLhJ,EAAQmB,SAInBgL,IAAK7E,EAAc,SAAUtL,GAC5B,OAAO,SAAUO,GAChB,OAAuC,EAAhCoJ,EAAM3J,EAAUO,GAAOF,UAIhCkF,SAAU+F,EAAc,SAAUjM,GAEjC,OADAA,EAAOA,EAAK8D,QAASuF,EAAWC,GACzB,SAAUpI,GAChB,OAAsE,GAA7DA,EAAKqD,aAAe7D,GAAOV,KAAMkB,IAAS5C,QAAS0B,MAW9D+Q,KAAM9E,EAAc,SAAU8E,GAO7B,OAJMxI,EAAYrD,KAAM6L,GAAQ,KAC/BzG,EAAKtG,MAAO,qBAAuB+M,GAEpCA,EAAOA,EAAKjN,QAASuF,EAAWC,GAAYlI,cACrC,SAAUF,GAChB,IAAI8P,EACJ,GACC,GAAOA,EAAW5J,EACjBlG,EAAK6P,KACL7P,EAAKjB,aAAc,aAAgBiB,EAAKjB,aAAc,QAGtD,OADA+Q,EAAWA,EAAS5P,iBACA2P,GAA2C,IAAnCC,EAAS1S,QAASyS,EAAO,YAE3C7P,EAAOA,EAAKb,aAAkC,IAAlBa,EAAKlC,UAC7C,OAAO,KAKTqE,OAAQ,SAAUnC,GACjB,IAAI+P,EAAOzT,GAAO0T,UAAY1T,GAAO0T,SAASD,KAC9C,OAAOA,GAAQA,EAAKlT,MAAO,KAAQmD,EAAK8J,IAGzCmG,KAAM,SAAUjQ,GACf,OAAOA,IAASsD,GAGjB4M,MAAO,SAAUlQ,GAChB,OAAOA,IA5oCV,WACC,IACC,OAAO7D,EAASgU,cACf,MAAQC,KAyoCQC,IACflU,EAASmU,eACLtQ,EAAK9B,MAAQ8B,EAAKuQ,OAASvQ,EAAKwQ,WAItCC,QAASrF,GAAsB,GAC/BtC,SAAUsC,GAAsB,GAEhCsF,QAAS,SAAU1Q,GAIlB,OAASD,GAAUC,EAAM,YAAeA,EAAK0Q,SAC1C3Q,GAAUC,EAAM,aAAgBA,EAAK2Q,UAGzCA,SAAU,SAAU3Q,GAWnB,OALKA,EAAKb,YAETa,EAAKb,WAAWyR,eAGQ,IAAlB5Q,EAAK2Q,UAIbE,MAAO,SAAU7Q,GAMhB,IAAMA,EAAOA,EAAKiP,WAAYjP,EAAMA,EAAOA,EAAK8Q,YAC/C,GAAK9Q,EAAKlC,SAAW,EACpB,OAAO,EAGT,OAAO,GAGRgR,OAAQ,SAAU9O,GACjB,OAAQ8F,EAAKiB,QAAQ8J,MAAO7Q,IAI7B+Q,OAAQ,SAAU/Q,GACjB,OAAOgI,EAAQhE,KAAMhE,EAAKD,WAG3B0M,MAAO,SAAUzM,GAChB,OAAO+H,EAAQ/D,KAAMhE,EAAKD,WAG3BiR,OAAQ,SAAUhR,GACjB,OAAOD,GAAUC,EAAM,UAA2B,WAAdA,EAAK9B,MACxC6B,GAAUC,EAAM,WAGlBlB,KAAM,SAAUkB,GACf,IAAIgN,EACJ,OAAOjN,GAAUC,EAAM,UAA2B,SAAdA,EAAK9B,OAKI,OAAxC8O,EAAOhN,EAAKjB,aAAc,UACN,SAAvBiO,EAAK9M,gBAIRgB,MAAOoK,EAAwB,WAC9B,MAAO,CAAE,KAGVlK,KAAMkK,EAAwB,SAAU2F,EAAenR,GACtD,MAAO,CAAEA,EAAS,KAGnBqB,GAAImK,EAAwB,SAAU2F,EAAenR,EAAQyL,GAC5D,MAAO,CAAEA,EAAW,EAAIA,EAAWzL,EAASyL,KAG7ClK,KAAMiK,EAAwB,SAAUE,EAAc1L,GAErD,IADA,IAAIpB,EAAI,EACAA,EAAIoB,EAAQpB,GAAK,EACxB8M,EAAarO,KAAMuB,GAEpB,OAAO8M,IAGRhK,IAAK8J,EAAwB,SAAUE,EAAc1L,GAEpD,IADA,IAAIpB,EAAI,EACAA,EAAIoB,EAAQpB,GAAK,EACxB8M,EAAarO,KAAMuB,GAEpB,OAAO8M,IAGR0F,GAAI5F,EAAwB,SAAUE,EAAc1L,EAAQyL,GAC3D,IAAI7M,EAUJ,IAPCA,EADI6M,EAAW,EACXA,EAAWzL,EACOA,EAAXyL,EACPzL,EAEAyL,EAGU,KAAL7M,GACT8M,EAAarO,KAAMuB,GAEpB,OAAO8M,IAGR2F,GAAI7F,EAAwB,SAAUE,EAAc1L,EAAQyL,GAE3D,IADA,IAAI7M,EAAI6M,EAAW,EAAIA,EAAWzL,EAASyL,IACjC7M,EAAIoB,GACb0L,EAAarO,KAAMuB,GAEpB,OAAO8M,OAKLzE,QAAQqK,IAAMtL,EAAKiB,QAAQ5F,GAGrB,CAAEkQ,OAAO,EAAMC,UAAU,EAAMC,MAAM,EAAMC,UAAU,EAAMC,OAAO,GAC5E3L,EAAKiB,QAASrI,GAAMwM,EAAmBxM,GAExC,IAAMA,IAAK,CAAEgT,QAAQ,EAAMC,OAAO,GACjC7L,EAAKiB,QAASrI,GAAMyM,EAAoBzM,GAIzC,SAAS2Q,KAIT,SAASlF,EAAU1K,EAAUmS,GAC5B,IAAIrC,EAAS/F,EAAOqI,EAAQ3T,EAC3B4T,EAAOrI,EAAQsI,EACfC,EAASxL,EAAY/G,EAAW,KAEjC,GAAKuS,EACJ,OAAOJ,EAAY,EAAII,EAAOnV,MAAO,GAGtCiV,EAAQrS,EACRgK,EAAS,GACTsI,EAAajM,EAAK6H,UAElB,MAAQmE,EAAQ,CA2Bf,IAAM5T,KAxBAqR,KAAa/F,EAAQvC,EAAO2C,KAAMkI,MAClCtI,IAGJsI,EAAQA,EAAMjV,MAAO2M,EAAO,GAAI1J,SAAYgS,GAE7CrI,EAAOtM,KAAQ0U,EAAS,KAGzBtC,GAAU,GAGH/F,EAAQtC,EAAmB0C,KAAMkI,MACvCvC,EAAU/F,EAAMsB,QAChB+G,EAAO1U,KAAM,CACZmH,MAAOiL,EAGPrR,KAAMsL,EAAO,GAAI5G,QAASkC,GAAU,OAErCgN,EAAQA,EAAMjV,MAAO0S,EAAQzP,SAIhBgG,EAAKsG,SACX5C,EAAQlC,EAAWpJ,GAAO0L,KAAMkI,KAAgBC,EAAY7T,MAChEsL,EAAQuI,EAAY7T,GAAQsL,MAC9B+F,EAAU/F,EAAMsB,QAChB+G,EAAO1U,KAAM,CACZmH,MAAOiL,EACPrR,KAAMA,EACNiG,QAASqF,IAEVsI,EAAQA,EAAMjV,MAAO0S,EAAQzP,SAI/B,IAAMyP,EACL,MAOF,OAAKqC,EACGE,EAAMhS,OAGPgS,EACN1I,EAAKtG,MAAOrD,GAGZ+G,EAAY/G,EAAUgK,GAAS5M,MAAO,GAGxC,SAASuN,EAAYyH,GAIpB,IAHA,IAAInT,EAAI,EACP+C,EAAMoQ,EAAO/R,OACbL,EAAW,GACJf,EAAI+C,EAAK/C,IAChBe,GAAYoS,EAAQnT,GAAI4F,MAEzB,OAAO7E,EAGR,SAASoJ,EAAe4G,EAASwC,EAAYC,GAC5C,IAAInJ,EAAMkJ,EAAWlJ,IACpBoJ,EAAOF,EAAWjJ,KAClB4B,EAAMuH,GAAQpJ,EACdqJ,EAAmBF,GAAgB,eAARtH,EAC3ByH,EAAWhM,IAEZ,OAAO4L,EAAW/Q,MAGjB,SAAUlB,EAAMN,EAASgP,GACxB,MAAU1O,EAAOA,EAAM+I,GACtB,GAAuB,IAAlB/I,EAAKlC,UAAkBsU,EAC3B,OAAO3C,EAASzP,EAAMN,EAASgP,GAGjC,OAAO,GAIR,SAAU1O,EAAMN,EAASgP,GACxB,IAAI4D,EAAU3D,EACb4D,EAAW,CAAEnM,EAASiM,GAGvB,GAAK3D,GACJ,MAAU1O,EAAOA,EAAM+I,GACtB,IAAuB,IAAlB/I,EAAKlC,UAAkBsU,IACtB3C,EAASzP,EAAMN,EAASgP,GAC5B,OAAO,OAKV,MAAU1O,EAAOA,EAAM+I,GACtB,GAAuB,IAAlB/I,EAAKlC,UAAkBsU,EAG3B,GAFAzD,EAAa3O,EAAMyC,KAAezC,EAAMyC,GAAY,IAE/C0P,GAAQpS,GAAUC,EAAMmS,GAC5BnS,EAAOA,EAAM+I,IAAS/I,MAChB,CAAA,IAAOsS,EAAW3D,EAAY/D,KACpC0H,EAAU,KAAQlM,GAAWkM,EAAU,KAAQD,EAG/C,OAASE,EAAU,GAAMD,EAAU,GAOnC,IAHA3D,EAAY/D,GAAQ2H,GAGH,GAAM9C,EAASzP,EAAMN,EAASgP,GAC9C,OAAO,EAMZ,OAAO,GAIV,SAAS8D,EAAgBC,GACxB,OAAyB,EAAlBA,EAAS3S,OACf,SAAUE,EAAMN,EAASgP,GACxB,IAAIhQ,EAAI+T,EAAS3S,OACjB,MAAQpB,IACP,IAAM+T,EAAU/T,GAAKsB,EAAMN,EAASgP,GACnC,OAAO,EAGT,OAAO,GAER+D,EAAU,GAYZ,SAASC,EAAU/C,EAAW3O,EAAKoL,EAAQ1M,EAASgP,GAOnD,IANA,IAAI1O,EACH2S,EAAe,GACfjU,EAAI,EACJ+C,EAAMkO,EAAU7P,OAChB8S,EAAgB,MAAP5R,EAEFtC,EAAI+C,EAAK/C,KACTsB,EAAO2P,EAAWjR,MAClB0N,IAAUA,EAAQpM,EAAMN,EAASgP,KACtCiE,EAAaxV,KAAM6C,GACd4S,GACJ5R,EAAI7D,KAAMuB,KAMd,OAAOiU,EAGR,SAASE,GAAYlF,EAAWlO,EAAUgQ,EAASqD,EAAYC,EAAYC,GAO1E,OANKF,IAAeA,EAAYrQ,KAC/BqQ,EAAaD,GAAYC,IAErBC,IAAeA,EAAYtQ,KAC/BsQ,EAAaF,GAAYE,EAAYC,IAE/BjI,EAAc,SAAU1B,EAAM5F,EAAS/D,EAASgP,GACtD,IAAIuE,EAAMvU,EAAGsB,EAAMkT,EAClBC,EAAS,GACTC,EAAU,GACVC,EAAc5P,EAAQ3D,OAGtBY,EAAQ2I,GA5CX,SAA2B5J,EAAU6T,EAAU7P,GAG9C,IAFA,IAAI/E,EAAI,EACP+C,EAAM6R,EAASxT,OACRpB,EAAI+C,EAAK/C,IAChB0K,EAAM3J,EAAU6T,EAAU5U,GAAK+E,GAEhC,OAAOA,EAuCJ8P,CAAkB9T,GAAY,IAC7BC,EAAQ5B,SAAW,CAAE4B,GAAYA,EAAS,IAG5C8T,GAAY7F,IAAetE,GAAS5J,EAEnCiB,EADAgS,EAAUhS,EAAOyS,EAAQxF,EAAWjO,EAASgP,GAsB/C,GAnBKe,EAaJA,EAAS+D,EATTN,EAAaH,IAAgB1J,EAAOsE,EAAY0F,GAAeP,GAG9D,GAGArP,EAG+B/D,EAASgP,GAEzCwE,EAAaM,EAITV,EAAa,CACjBG,EAAOP,EAAUQ,EAAYE,GAC7BN,EAAYG,EAAM,GAAIvT,EAASgP,GAG/BhQ,EAAIuU,EAAKnT,OACT,MAAQpB,KACAsB,EAAOiT,EAAMvU,MACnBwU,EAAYE,EAAS1U,MAAW8U,EAAWJ,EAAS1U,IAAQsB,IAK/D,GAAKqJ,GACJ,GAAK0J,GAAcpF,EAAY,CAC9B,GAAKoF,EAAa,CAGjBE,EAAO,GACPvU,EAAIwU,EAAWpT,OACf,MAAQpB,KACAsB,EAAOkT,EAAYxU,KAGzBuU,EAAK9V,KAAQqW,EAAW9U,GAAMsB,GAGhC+S,EAAY,KAAQG,EAAa,GAAMD,EAAMvE,GAI9ChQ,EAAIwU,EAAWpT,OACf,MAAQpB,KACAsB,EAAOkT,EAAYxU,MAC2C,GAAlEuU,EAAOF,EAAa3V,GAAQJ,KAAMqM,EAAMrJ,GAASmT,EAAQzU,MAE3D2K,EAAM4J,KAAYxP,EAASwP,GAASjT,UAOvCkT,EAAaR,EACZQ,IAAezP,EACdyP,EAAWrR,OAAQwR,EAAaH,EAAWpT,QAC3CoT,GAEGH,EACJA,EAAY,KAAMtP,EAASyP,EAAYxE,GAEvCvR,EAAKD,MAAOuG,EAASyP,KAMzB,SAASO,GAAmB5B,GA+B3B,IA9BA,IAAI6B,EAAcjE,EAAS/N,EAC1BD,EAAMoQ,EAAO/R,OACb6T,EAAkB7N,EAAKwH,SAAUuE,EAAQ,GAAI3T,MAC7C0V,EAAmBD,GAAmB7N,EAAKwH,SAAU,KACrD5O,EAAIiV,EAAkB,EAAI,EAG1BE,EAAehL,EAAe,SAAU7I,GACvC,OAAOA,IAAS0T,GACdE,GAAkB,GACrBE,EAAkBjL,EAAe,SAAU7I,GAC1C,OAA6C,EAAtC5C,GAAQJ,KAAM0W,EAAc1T,IACjC4T,GAAkB,GACrBnB,EAAW,CAAE,SAAUzS,EAAMN,EAASgP,GAMrC,IAAI/N,GAASgT,IAAqBjF,GAAOhP,GAAWqG,MACjD2N,EAAehU,GAAU5B,SAC1B+V,EAAc7T,EAAMN,EAASgP,GAC7BoF,EAAiB9T,EAAMN,EAASgP,IAKlC,OADAgF,EAAe,KACR/S,IAGDjC,EAAI+C,EAAK/C,IAChB,GAAO+Q,EAAU3J,EAAKwH,SAAUuE,EAAQnT,GAAIR,MAC3CuU,EAAW,CAAE5J,EAAe2J,EAAgBC,GAAYhD,QAClD,CAIN,IAHAA,EAAU3J,EAAKsG,OAAQyF,EAAQnT,GAAIR,MAAOhB,MAAO,KAAM2U,EAAQnT,GAAIyF,UAGrD1B,GAAY,CAIzB,IADAf,IAAMhD,EACEgD,EAAID,EAAKC,IAChB,GAAKoE,EAAKwH,SAAUuE,EAAQnQ,GAAIxD,MAC/B,MAGF,OAAO2U,GACF,EAAJnU,GAAS8T,EAAgBC,GACrB,EAAJ/T,GAAS0L,EAGRyH,EAAOhV,MAAO,EAAG6B,EAAI,GACnBzB,OAAQ,CAAEqH,MAAgC,MAAzBuN,EAAQnT,EAAI,GAAIR,KAAe,IAAM,MACvD0E,QAASkC,GAAU,MACrB2K,EACA/Q,EAAIgD,GAAK+R,GAAmB5B,EAAOhV,MAAO6B,EAAGgD,IAC7CA,EAAID,GAAOgS,GAAqB5B,EAASA,EAAOhV,MAAO6E,IACvDA,EAAID,GAAO2I,EAAYyH,IAGzBY,EAAStV,KAAMsS,GAIjB,OAAO+C,EAAgBC,GAiIxB,SAAS/C,GAASjQ,EAAU+J,GAC3B,IAAI9K,EA/H8BqV,EAAiBC,EAC/CC,EACHC,EACAC,EA6HAH,EAAc,GACdD,EAAkB,GAClB/B,EAASvL,EAAehH,EAAW,KAEpC,IAAMuS,EAAS,CAGRxI,IACLA,EAAQW,EAAU1K,IAEnBf,EAAI8K,EAAM1J,OACV,MAAQpB,KACPsT,EAASyB,GAAmBjK,EAAO9K,KACtB+D,GACZuR,EAAY7W,KAAM6U,GAElB+B,EAAgB5W,KAAM6U,IAKxBA,EAASvL,EAAehH,GArJSsU,EAsJNA,EArJxBE,EAA6B,GADkBD,EAsJNA,GArJrBlU,OACvBoU,EAAqC,EAAzBH,EAAgBjU,OAC5BqU,EAAe,SAAU9K,EAAM3J,EAASgP,EAAKjL,EAAS2Q,GACrD,IAAIpU,EAAM0B,EAAG+N,EACZ4E,EAAe,EACf3V,EAAI,IACJiR,EAAYtG,GAAQ,GACpBiL,EAAa,GACbC,EAAgBxO,EAGhBrF,EAAQ2I,GAAQ6K,GAAapO,EAAKsD,KAAK3B,IAAK,IAAK2M,GAGjDI,EAAkBpO,GAA4B,MAAjBmO,EAAwB,EAAI7R,KAAKC,UAAY,GAC1ElB,EAAMf,EAAMZ,OAeb,IAbKsU,IAMJrO,EAAmBrG,GAAWvD,GAAYuD,GAAW0U,GAO9C1V,IAAM+C,GAAgC,OAAvBzB,EAAOU,EAAOhC,IAAeA,IAAM,CACzD,GAAKwV,GAAalU,EAAO,CACxB0B,EAAI,EAMEhC,GAAWM,EAAK+D,eAAiB5H,IACtCwM,EAAa3I,GACb0O,GAAOxI,GAER,MAAUuJ,EAAUsE,EAAiBrS,KACpC,GAAK+N,EAASzP,EAAMN,GAAWvD,EAAUuS,GAAQ,CAChDvR,EAAKH,KAAMyG,EAASzD,GACpB,MAGGoU,IACJhO,EAAUoO,GAKPP,KAGGjU,GAAQyP,GAAWzP,IACzBqU,IAIIhL,GACJsG,EAAUxS,KAAM6C,IAgBnB,GATAqU,GAAgB3V,EASXuV,GAASvV,IAAM2V,EAAe,CAClC3S,EAAI,EACJ,MAAU+N,EAAUuE,EAAatS,KAChC+N,EAASE,EAAW2E,EAAY5U,EAASgP,GAG1C,GAAKrF,EAAO,CAGX,GAAoB,EAAfgL,EACJ,MAAQ3V,IACCiR,EAAWjR,IAAO4V,EAAY5V,KACrC4V,EAAY5V,GAAMkG,GAAI5H,KAAMyG,IAM/B6Q,EAAa5B,EAAU4B,GAIxBnX,EAAKD,MAAOuG,EAAS6Q,GAGhBF,IAAc/K,GAA4B,EAApBiL,EAAWxU,QACG,EAAtCuU,EAAeL,EAAYlU,QAE7BN,GAAO0N,WAAYzJ,GAUrB,OALK2Q,IACJhO,EAAUoO,EACVzO,EAAmBwO,GAGb5E,GAGFsE,EACNlJ,EAAcoJ,GACdA,KA8BO1U,SAAWA,EAEnB,OAAOuS,EAYR,SAASvH,GAAQhL,EAAUC,EAAS+D,EAAS4F,GAC5C,IAAI3K,EAAGmT,EAAQ4C,EAAOvW,EAAMkL,EAC3BsL,EAA+B,mBAAbjV,GAA2BA,EAC7C+J,GAASH,GAAQc,EAAY1K,EAAWiV,EAASjV,UAAYA,GAM9D,GAJAgE,EAAUA,GAAW,GAIC,IAAjB+F,EAAM1J,OAAe,CAIzB,GAAqB,GADrB+R,EAASrI,EAAO,GAAMA,EAAO,GAAI3M,MAAO,IAC5BiD,QAA+C,QAA/B2U,EAAQ5C,EAAQ,IAAM3T,MAC3B,IAArBwB,EAAQ5B,UAAkBoI,GAAkBJ,EAAKwH,SAAUuE,EAAQ,GAAI3T,MAAS,CAMjF,KAJAwB,GAAYoG,EAAKsD,KAAK7B,GACrBkN,EAAMtQ,QAAS,GAAIvB,QAASuF,EAAWC,GACvC1I,IACI,IAAM,IAEV,OAAO+D,EAGIiR,IACXhV,EAAUA,EAAQP,YAGnBM,EAAWA,EAAS5C,MAAOgV,EAAO/G,QAAQxG,MAAMxE,QAIjDpB,EAAI4I,EAAUQ,aAAa9D,KAAMvE,GAAa,EAAIoS,EAAO/R,OACzD,MAAQpB,IAAM,CAIb,GAHA+V,EAAQ5C,EAAQnT,GAGXoH,EAAKwH,SAAYpP,EAAOuW,EAAMvW,MAClC,MAED,IAAOkL,EAAOtD,EAAKsD,KAAMlL,MAGjBmL,EAAOD,EACbqL,EAAMtQ,QAAS,GAAIvB,QAASuF,EAAWC,GACvCF,EAASlE,KAAM6N,EAAQ,GAAI3T,OAC1B+L,EAAavK,EAAQP,aAAgBO,IACjC,CAKL,GAFAmS,EAAOhQ,OAAQnD,EAAG,KAClBe,EAAW4J,EAAKvJ,QAAUsK,EAAYyH,IAGrC,OADA1U,EAAKD,MAAOuG,EAAS4F,GACd5F,EAGR,QAeJ,OAPEiR,GAAYhF,GAASjQ,EAAU+J,IAChCH,EACA3J,GACCwG,EACDzC,GACC/D,GAAWwI,EAASlE,KAAMvE,IAAcwK,EAAavK,EAAQP,aAAgBO,GAExE+D,EArlBR4L,EAAWlP,UAAY2F,EAAK6O,QAAU7O,EAAKiB,QAC3CjB,EAAKuJ,WAAa,IAAIA,EA2lBtB1R,GAAQyP,WAAa3K,EAAQiC,MAAO,IAAK9C,KAAM+E,GAAY0D,KAAM,MAAS5H,EAG1EkG,IAIAhL,GAAQiP,aAAe5B,EAAQ,SAAUC,GAGxC,OAA4E,EAArEA,EAAG7F,wBAAyBjJ,EAAS0C,cAAe,eAG5DW,GAAO4J,KAAOA,EAGd5J,GAAOqN,KAAM,KAAQrN,GAAOqN,KAAK9F,QACjCvH,GAAOoV,OAASpV,GAAO0N,WAIvB9D,EAAKsG,QAAUA,GACftG,EAAKqB,OAASA,GACdrB,EAAKT,YAAcA,EACnBS,EAAKe,SAAWA,EAEhBf,EAAKf,OAAS7I,GAAOkG,eACrB0D,EAAKyL,QAAUrV,GAAOV,KACtBsK,EAAK0L,MAAQtV,GAAOmE,SACpByF,EAAK2L,UAAYvV,GAAOqN,KACxBzD,EAAKzL,QAAU6B,GAAO7B,QACtByL,EAAK8D,WAAa1N,GAAO0N,WAniEzB,GA0iEA,IAAInE,EAAM,SAAU/I,EAAM+I,EAAKiM,GAC9B,IAAIzF,EAAU,GACb0F,OAAqBzS,IAAVwS,EAEZ,OAAUhV,EAAOA,EAAM+I,KAA6B,IAAlB/I,EAAKlC,SACtC,GAAuB,IAAlBkC,EAAKlC,SAAiB,CAC1B,GAAKmX,GAAYzV,GAAQQ,GAAOkV,GAAIF,GACnC,MAEDzF,EAAQpS,KAAM6C,GAGhB,OAAOuP,GAIJ4F,EAAW,SAAUC,EAAGpV,GAG3B,IAFA,IAAIuP,EAAU,GAEN6F,EAAGA,EAAIA,EAAEtE,YACI,IAAfsE,EAAEtX,UAAkBsX,IAAMpV,GAC9BuP,EAAQpS,KAAMiY,GAIhB,OAAO7F,GAIJ8F,EAAgB7V,GAAOqN,KAAKrD,MAAM1B,aAElCwN,EAAa,kEAKjB,SAASC,EAAQzI,EAAU0I,EAAWhG,GACrC,OAAK5R,EAAY4X,GACThW,GAAO8B,KAAMwL,EAAU,SAAU9M,EAAMtB,GAC7C,QAAS8W,EAAUxY,KAAMgD,EAAMtB,EAAGsB,KAAWwP,IAK1CgG,EAAU1X,SACP0B,GAAO8B,KAAMwL,EAAU,SAAU9M,GACvC,OAASA,IAASwV,IAAgBhG,IAKV,iBAAdgG,EACJhW,GAAO8B,KAAMwL,EAAU,SAAU9M,GACvC,OAA4C,EAAnC5C,GAAQJ,KAAMwY,EAAWxV,KAAkBwP,IAK/ChQ,GAAO4M,OAAQoJ,EAAW1I,EAAU0C,GAG5ChQ,GAAO4M,OAAS,SAAUS,EAAMnM,EAAO8O,GACtC,IAAIxP,EAAOU,EAAO,GAMlB,OAJK8O,IACJ3C,EAAO,QAAUA,EAAO,KAGH,IAAjBnM,EAAMZ,QAAkC,IAAlBE,EAAKlC,SACxB0B,GAAO4J,KAAK2D,gBAAiB/M,EAAM6M,GAAS,CAAE7M,GAAS,GAGxDR,GAAO4J,KAAKjF,QAAS0I,EAAMrN,GAAO8B,KAAMZ,EAAO,SAAUV,GAC/D,OAAyB,IAAlBA,EAAKlC,aAId0B,GAAOG,GAAGmC,OAAQ,CACjBsH,KAAM,SAAU3J,GACf,IAAIf,EAAGiC,EACNc,EAAMlF,KAAKuD,OACX2V,EAAOlZ,KAER,GAAyB,iBAAbkD,EACX,OAAOlD,KAAKkE,UAAWjB,GAAQC,GAAW2M,OAAQ,WACjD,IAAM1N,EAAI,EAAGA,EAAI+C,EAAK/C,IACrB,GAAKc,GAAOwF,SAAUyQ,EAAM/W,GAAKnC,MAChC,OAAO,KAQX,IAFAoE,EAAMpE,KAAKkE,UAAW,IAEhB/B,EAAI,EAAGA,EAAI+C,EAAK/C,IACrBc,GAAO4J,KAAM3J,EAAUgW,EAAM/W,GAAKiC,GAGnC,OAAa,EAANc,EAAUjC,GAAO0N,WAAYvM,GAAQA,GAE7CyL,OAAQ,SAAU3M,GACjB,OAAOlD,KAAKkE,UAAW8U,EAAQhZ,KAAMkD,GAAY,IAAI,KAEtD+P,IAAK,SAAU/P,GACd,OAAOlD,KAAKkE,UAAW8U,EAAQhZ,KAAMkD,GAAY,IAAI,KAEtDyV,GAAI,SAAUzV,GACb,QAAS8V,EACRhZ,KAIoB,iBAAbkD,GAAyB4V,EAAcrR,KAAMvE,GACnDD,GAAQC,GACRA,GAAY,IACb,GACCK,UASJ,IAAI4V,EAMHzN,EAAa,uCAENzI,GAAOG,GAAGC,KAAO,SAAUH,EAAUC,EAASuQ,GACpD,IAAIzG,EAAOxJ,EAGX,IAAMP,EACL,OAAOlD,KAQR,GAHA0T,EAAOA,GAAQyF,EAGU,iBAAbjW,EAAwB,CAanC,KAPC+J,EALsB,MAAlB/J,EAAU,IACsB,MAApCA,EAAUA,EAASK,OAAS,IACT,GAAnBL,EAASK,OAGD,CAAE,KAAML,EAAU,MAGlBwI,EAAW2B,KAAMnK,MAIV+J,EAAO,IAAQ9J,EA6CxB,OAAMA,GAAWA,EAAQU,QACtBV,GAAWuQ,GAAO7G,KAAM3J,GAK1BlD,KAAK8D,YAAaX,GAAU0J,KAAM3J,GAhDzC,GAAK+J,EAAO,GAAM,CAYjB,GAXA9J,EAAUA,aAAmBF,GAASE,EAAS,GAAMA,EAIrDF,GAAOoB,MAAOrE,KAAMiD,GAAOmW,UAC1BnM,EAAO,GACP9J,GAAWA,EAAQ5B,SAAW4B,EAAQqE,eAAiBrE,EAAUvD,GACjE,IAIImZ,EAAWtR,KAAMwF,EAAO,KAAShK,GAAO6C,cAAe3C,GAC3D,IAAM8J,KAAS9J,EAGT9B,EAAYrB,KAAMiN,IACtBjN,KAAMiN,GAAS9J,EAAS8J,IAIxBjN,KAAKyQ,KAAMxD,EAAO9J,EAAS8J,IAK9B,OAAOjN,KAYP,OARAyD,EAAO7D,EAAS0N,eAAgBL,EAAO,OAKtCjN,KAAM,GAAMyD,EACZzD,KAAKuD,OAAS,GAERvD,KAcH,OAAKkD,EAAS3B,UACpBvB,KAAM,GAAMkD,EACZlD,KAAKuD,OAAS,EACPvD,MAIIqB,EAAY6B,QACD+C,IAAfyN,EAAK2F,MACX3F,EAAK2F,MAAOnW,GAGZA,EAAUD,IAGLA,GAAOgE,UAAW/D,EAAUlD,QAIhC4D,UAAYX,GAAOG,GAGxB+V,EAAalW,GAAQrD,GAGrB,IAAI0Z,EAAe,iCAGlBC,EAAmB,CAClBC,UAAU,EACVC,UAAU,EACVhN,MAAM,EACNiN,MAAM,GAoFR,SAASC,EAASC,EAAKpN,GACtB,OAAUoN,EAAMA,EAAKpN,KAA4B,IAAjBoN,EAAIrY,UACpC,OAAOqY,EAnFR3W,GAAOG,GAAGmC,OAAQ,CACjB8N,IAAK,SAAUzN,GACd,IAAIiU,EAAU5W,GAAQ2C,EAAQ5F,MAC7B8Z,EAAID,EAAQtW,OAEb,OAAOvD,KAAK6P,OAAQ,WAEnB,IADA,IAAI1N,EAAI,EACAA,EAAI2X,EAAG3X,IACd,GAAKc,GAAOwF,SAAUzI,KAAM6Z,EAAS1X,IACpC,OAAO,KAMX4X,QAAS,SAAUvB,EAAWrV,GAC7B,IAAIyW,EACHzX,EAAI,EACJ2X,EAAI9Z,KAAKuD,OACTyP,EAAU,GACV6G,EAA+B,iBAAdrB,GAA0BvV,GAAQuV,GAGpD,IAAMM,EAAcrR,KAAM+Q,GACzB,KAAQrW,EAAI2X,EAAG3X,IACd,IAAMyX,EAAM5Z,KAAMmC,GAAKyX,GAAOA,IAAQzW,EAASyW,EAAMA,EAAIhX,WAGxD,GAAKgX,EAAIrY,SAAW,KAAQsY,GACH,EAAxBA,EAAQG,MAAOJ,GAGE,IAAjBA,EAAIrY,UACH0B,GAAO4J,KAAK2D,gBAAiBoJ,EAAKpB,IAAgB,CAEnDxF,EAAQpS,KAAMgZ,GACd,MAMJ,OAAO5Z,KAAKkE,UAA4B,EAAjB8O,EAAQzP,OAAaN,GAAO0N,WAAYqC,GAAYA,IAI5EgH,MAAO,SAAUvW,GAGhB,OAAMA,EAKe,iBAATA,EACJ5C,GAAQJ,KAAMwC,GAAQQ,GAAQzD,KAAM,IAIrCa,GAAQJ,KAAMT,KAGpByD,EAAKI,OAASJ,EAAM,GAAMA,GAZjBzD,KAAM,IAAOA,KAAM,GAAI4C,WAAe5C,KAAK2E,QAAQsV,UAAU1W,QAAU,GAgBlF2W,IAAK,SAAUhX,EAAUC,GACxB,OAAOnD,KAAKkE,UACXjB,GAAO0N,WACN1N,GAAOoB,MAAOrE,KAAKgE,MAAOf,GAAQC,EAAUC,OAK/CgX,QAAS,SAAUjX,GAClB,OAAOlD,KAAKka,IAAiB,MAAZhX,EAChBlD,KAAKsE,WAAatE,KAAKsE,WAAWuL,OAAQ3M,OAU7CD,GAAOsB,KAAM,CACZgO,OAAQ,SAAU9O,GACjB,IAAI8O,EAAS9O,EAAKb,WAClB,OAAO2P,GAA8B,KAApBA,EAAOhR,SAAkBgR,EAAS,MAEpD6H,QAAS,SAAU3W,GAClB,OAAO+I,EAAK/I,EAAM,eAEnB4W,aAAc,SAAU5W,EAAM2E,EAAIqQ,GACjC,OAAOjM,EAAK/I,EAAM,aAAcgV,IAEjChM,KAAM,SAAUhJ,GACf,OAAOkW,EAASlW,EAAM,gBAEvBiW,KAAM,SAAUjW,GACf,OAAOkW,EAASlW,EAAM,oBAEvB6W,QAAS,SAAU7W,GAClB,OAAO+I,EAAK/I,EAAM,gBAEnBwW,QAAS,SAAUxW,GAClB,OAAO+I,EAAK/I,EAAM,oBAEnB8W,UAAW,SAAU9W,EAAM2E,EAAIqQ,GAC9B,OAAOjM,EAAK/I,EAAM,cAAegV,IAElC+B,UAAW,SAAU/W,EAAM2E,EAAIqQ,GAC9B,OAAOjM,EAAK/I,EAAM,kBAAmBgV,IAEtCG,SAAU,SAAUnV,GACnB,OAAOmV,GAAYnV,EAAKb,YAAc,IAAK8P,WAAYjP,IAExD+V,SAAU,SAAU/V,GACnB,OAAOmV,EAAUnV,EAAKiP,aAEvB+G,SAAU,SAAUhW,GACnB,OAA6B,MAAxBA,EAAKgX,iBAKTta,EAAUsD,EAAKgX,iBAERhX,EAAKgX,iBAMRjX,GAAUC,EAAM,cACpBA,EAAOA,EAAKiX,SAAWjX,GAGjBR,GAAOoB,MAAO,GAAIZ,EAAKiJ,eAE7B,SAAUhJ,EAAMN,GAClBH,GAAOG,GAAIM,GAAS,SAAU+U,EAAOvV,GACpC,IAAI8P,EAAU/P,GAAOwB,IAAKzE,KAAMoD,EAAIqV,GAuBpC,MArB0B,UAArB/U,EAAKpD,OAAQ,KACjB4C,EAAWuV,GAGPvV,GAAgC,iBAAbA,IACvB8P,EAAU/P,GAAO4M,OAAQ3M,EAAU8P,IAGjB,EAAdhT,KAAKuD,SAGHgW,EAAkB7V,IACvBT,GAAO0N,WAAYqC,GAIfsG,EAAa7R,KAAM/D,IACvBsP,EAAQ2H,WAIH3a,KAAKkE,UAAW8O,MAGzB,IAAI4H,EAAgB,oBAsOpB,SAASC,EAAUC,GAClB,OAAOA,EAER,SAASC,EAASC,GACjB,MAAMA,EAGP,SAASC,EAAYlT,EAAOmT,EAASC,EAAQC,GAC5C,IAAIC,EAEJ,IAGMtT,GAAS1G,EAAcga,EAAStT,EAAMuT,SAC1CD,EAAO5a,KAAMsH,GAAQ+B,KAAMoR,GAAUK,KAAMJ,GAGhCpT,GAAS1G,EAAcga,EAAStT,EAAMyT,MACjDH,EAAO5a,KAAMsH,EAAOmT,EAASC,GAQ7BD,EAAQva,WAAOsF,EAAW,CAAE8B,GAAQzH,MAAO8a,IAM3C,MAAQrT,GAIToT,EAAOxa,WAAOsF,EAAW,CAAE8B,KAvO7B9E,GAAOwY,UAAY,SAAUjW,GA9B7B,IAAwBA,EACnBkW,EAiCJlW,EAA6B,iBAAZA,GAlCMA,EAmCPA,EAlCZkW,EAAS,GACbzY,GAAOsB,KAAMiB,EAAQyH,MAAO2N,IAAmB,GAAI,SAAUe,EAAGC,GAC/DF,EAAQE,IAAS,IAEXF,GA+BNzY,GAAOsC,OAAQ,GAAIC,GAEpB,IACCqW,EAGAC,EAGAC,EAGAC,EAGAC,EAAO,GAGPC,EAAQ,GAGRC,GAAe,EAGfC,EAAO,WAQN,IALAJ,EAASA,GAAUxW,EAAQ6W,KAI3BN,EAAQF,GAAS,EACTK,EAAM3Y,OAAQ4Y,GAAe,EAAI,CACxCL,EAASI,EAAM3N,QACf,QAAU4N,EAAcF,EAAK1Y,QAGmC,IAA1D0Y,EAAME,GAAcxb,MAAOmb,EAAQ,GAAKA,EAAQ,KACpDtW,EAAQ8W,cAGRH,EAAcF,EAAK1Y,OACnBuY,GAAS,GAMNtW,EAAQsW,SACbA,GAAS,GAGVD,GAAS,EAGJG,IAIHC,EADIH,EACG,GAIA,KAMV5C,EAAO,CAGNgB,IAAK,WA2BJ,OA1BK+B,IAGCH,IAAWD,IACfM,EAAcF,EAAK1Y,OAAS,EAC5B2Y,EAAMtb,KAAMkb,IAGb,SAAW5B,EAAKrH,GACf5P,GAAOsB,KAAMsO,EAAM,SAAU8I,EAAG7T,GAC1BzG,EAAYyG,GACVtC,EAAQ6S,QAAWa,EAAK7F,IAAKvL,IAClCmU,EAAKrb,KAAMkH,GAEDA,GAAOA,EAAIvE,QAA4B,WAAlBT,EAAQgF,IAGxCoS,EAAKpS,KATR,CAYKpD,WAEAoX,IAAWD,GACfO,KAGKpc,MAIRuc,OAAQ,WAYP,OAXAtZ,GAAOsB,KAAMG,UAAW,SAAUiX,EAAG7T,GACpC,IAAIkS,EACJ,OAA0D,GAAhDA,EAAQ/W,GAAOkE,QAASW,EAAKmU,EAAMjC,IAC5CiC,EAAK3W,OAAQ0U,EAAO,GAGfA,GAASmC,GACbA,MAIInc,MAKRqT,IAAK,SAAUjQ,GACd,OAAOA,GACwB,EAA9BH,GAAOkE,QAAS/D,EAAI6Y,GACN,EAAdA,EAAK1Y,QAIP+Q,MAAO,WAIN,OAHK2H,IACJA,EAAO,IAEDjc,MAMRwc,QAAS,WAGR,OAFAR,EAASE,EAAQ,GACjBD,EAAOH,EAAS,GACT9b,MAERuM,SAAU,WACT,OAAQ0P,GAMTQ,KAAM,WAKL,OAJAT,EAASE,EAAQ,GACXJ,GAAWD,IAChBI,EAAOH,EAAS,IAEV9b,MAERgc,OAAQ,WACP,QAASA,GAIVU,SAAU,SAAUvZ,EAAS0P,GAS5B,OARMmJ,IAELnJ,EAAO,CAAE1P,GADT0P,EAAOA,GAAQ,IACQvS,MAAQuS,EAAKvS,QAAUuS,GAC9CqJ,EAAMtb,KAAMiS,GACNgJ,GACLO,KAGKpc,MAIRoc,KAAM,WAEL,OADAlD,EAAKwD,SAAU1c,KAAM0E,WACd1E,MAIR+b,MAAO,WACN,QAASA,IAIZ,OAAO7C,GA4CRjW,GAAOsC,OAAQ,CAEdoX,SAAU,SAAUC,GACnB,IAAIC,EAAS,CAIX,CAAE,SAAU,WAAY5Z,GAAOwY,UAAW,UACzCxY,GAAOwY,UAAW,UAAY,GAC/B,CAAE,UAAW,OAAQxY,GAAOwY,UAAW,eACtCxY,GAAOwY,UAAW,eAAiB,EAAG,YACvC,CAAE,SAAU,OAAQxY,GAAOwY,UAAW,eACrCxY,GAAOwY,UAAW,eAAiB,EAAG,aAExCqB,EAAQ,UACRxB,EAAU,CACTwB,MAAO,WACN,OAAOA,GAERC,OAAQ,WAEP,OADAC,EAASlT,KAAMpF,WAAY6W,KAAM7W,WAC1B1E,MAERid,QAAS,SAAU7Z,GAClB,OAAOkY,EAAQE,KAAM,KAAMpY,IAI5B8Z,KAAM,WACL,IAAIC,EAAMzY,UAEV,OAAOzB,GAAO0Z,SAAU,SAAUS,GACjCna,GAAOsB,KAAMsY,EAAQ,SAAUzU,EAAIiV,GAGlC,IAAIja,EAAK/B,EAAY8b,EAAKE,EAAO,MAAWF,EAAKE,EAAO,IAKxDL,EAAUK,EAAO,IAAO,WACvB,IAAIC,EAAWla,GAAMA,EAAGzC,MAAOX,KAAM0E,WAChC4Y,GAAYjc,EAAYic,EAAShC,SACrCgC,EAAShC,UACPiC,SAAUH,EAASI,QACnB1T,KAAMsT,EAASlC,SACfK,KAAM6B,EAASjC,QAEjBiC,EAAUC,EAAO,GAAM,QACtBrd,KACAoD,EAAK,CAAEka,GAAa5Y,eAKxByY,EAAM,OACH7B,WAELE,KAAM,SAAUiC,EAAaC,EAAYC,GACxC,IAAIC,EAAW,EACf,SAAS1C,EAAS2C,EAAOb,EAAUc,EAASC,GAC3C,OAAO,WACN,IAAIC,EAAOhe,KACV6S,EAAOnO,UACPuZ,EAAa,WACZ,IAAIX,EAAU9B,EAKd,KAAKqC,EAAQD,GAAb,CAQA,IAJAN,EAAWQ,EAAQnd,MAAOqd,EAAMnL,MAIdmK,EAAS1B,UAC1B,MAAM,IAAI4C,UAAW,4BAOtB1C,EAAO8B,IAKgB,iBAAbA,GACY,mBAAbA,IACRA,EAAS9B,KAGLna,EAAYma,GAGXuC,EACJvC,EAAK/a,KACJ6c,EACApC,EAAS0C,EAAUZ,EAAUnC,EAAUkD,GACvC7C,EAAS0C,EAAUZ,EAAUjC,EAASgD,KAOvCH,IAEApC,EAAK/a,KACJ6c,EACApC,EAAS0C,EAAUZ,EAAUnC,EAAUkD,GACvC7C,EAAS0C,EAAUZ,EAAUjC,EAASgD,GACtC7C,EAAS0C,EAAUZ,EAAUnC,EAC5BmC,EAASmB,eASPL,IAAYjD,IAChBmD,OAAO/X,EACP4M,EAAO,CAAEyK,KAKRS,GAAWf,EAASoB,aAAeJ,EAAMnL,MAK7CwL,EAAUN,EACTE,EACA,WACC,IACCA,IACC,MAAQtR,GAEJ1J,GAAO0Z,SAAS2B,eACpBrb,GAAO0Z,SAAS2B,cAAe3R,EAC9B0R,EAAQ9X,OAMQqX,GAAbC,EAAQ,IAIPC,IAAY/C,IAChBiD,OAAO/X,EACP4M,EAAO,CAAElG,IAGVqQ,EAASuB,WAAYP,EAAMnL,MAS3BgL,EACJQ,KAKKpb,GAAO0Z,SAAS6B,aACpBH,EAAQ9X,MAAQtD,GAAO0Z,SAAS6B,eAMrBvb,GAAO0Z,SAAS8B,eAC3BJ,EAAQ9X,MAAQtD,GAAO0Z,SAAS8B,gBAEjC1e,GAAO2e,WAAYL,KAKtB,OAAOpb,GAAO0Z,SAAU,SAAUS,GAGjCP,EAAQ,GAAK,GAAI3C,IAChBgB,EACC,EACAkC,EACA/b,EAAYsc,GACXA,EACA9C,EACDuC,EAASe,aAKXtB,EAAQ,GAAK,GAAI3C,IAChBgB,EACC,EACAkC,EACA/b,EAAYoc,GACXA,EACA5C,IAKHgC,EAAQ,GAAK,GAAI3C,IAChBgB,EACC,EACAkC,EACA/b,EAAYqc,GACXA,EACA3C,MAGAO,WAKLA,QAAS,SAAUha,GAClB,OAAc,MAAPA,EAAc2B,GAAOsC,OAAQjE,EAAKga,GAAYA,IAGvD0B,EAAW,GAkEZ,OA/DA/Z,GAAOsB,KAAMsY,EAAQ,SAAU1a,EAAGkb,GACjC,IAAIpB,EAAOoB,EAAO,GACjBsB,EAActB,EAAO,GAKtB/B,EAAS+B,EAAO,IAAQpB,EAAK/B,IAGxByE,GACJ1C,EAAK/B,IACJ,WAIC4C,EAAQ6B,GAKT9B,EAAQ,EAAI1a,GAAK,GAAIqa,QAIrBK,EAAQ,EAAI1a,GAAK,GAAIqa,QAGrBK,EAAQ,GAAK,GAAIJ,KAGjBI,EAAQ,GAAK,GAAIJ,MAOnBR,EAAK/B,IAAKmD,EAAO,GAAIjB,MAKrBY,EAAUK,EAAO,IAAQ,WAExB,OADAL,EAAUK,EAAO,GAAM,QAAUrd,OAASgd,OAAW/W,EAAYjG,KAAM0E,WAChE1E,MAMRgd,EAAUK,EAAO,GAAM,QAAWpB,EAAKS,WAIxCpB,EAAQA,QAAS0B,GAGZJ,GACJA,EAAKnc,KAAMuc,EAAUA,GAIfA,GAIR4B,KAAM,SAAUC,GACf,IAGCC,EAAYpa,UAAUnB,OAGtBpB,EAAI2c,EAGJC,EAAkBhZ,MAAO5D,GACzB6c,EAAgB1e,GAAMG,KAAMiE,WAG5Bua,EAAUhc,GAAO0Z,WAGjBuC,EAAa,SAAU/c,GACtB,OAAO,SAAU4F,GAChBgX,EAAiB5c,GAAMnC,KACvBgf,EAAe7c,GAAyB,EAAnBuC,UAAUnB,OAAajD,GAAMG,KAAMiE,WAAcqD,IAC5D+W,GACTG,EAAQb,YAAaW,EAAiBC,KAM1C,GAAKF,GAAa,IACjB7D,EAAY4D,EAAaI,EAAQnV,KAAMoV,EAAY/c,IAAM+Y,QAAS+D,EAAQ9D,QACxE2D,GAGuB,YAApBG,EAAQnC,SACZzb,EAAY2d,EAAe7c,IAAO6c,EAAe7c,GAAIqZ,OAErD,OAAOyD,EAAQzD,OAKjB,MAAQrZ,IACP8Y,EAAY+D,EAAe7c,GAAK+c,EAAY/c,GAAK8c,EAAQ9D,QAG1D,OAAO8D,EAAQ3D,aAOjB,IAAI6D,EAAc,yDAKlBlc,GAAO0Z,SAAS2B,cAAgB,SAAU/X,EAAO6Y,GAI3Crf,GAAOsf,SAAWtf,GAAOsf,QAAQC,MAAQ/Y,GAAS4Y,EAAY1X,KAAMlB,EAAM7C,OAC9E3D,GAAOsf,QAAQC,KAAM,8BAAgC/Y,EAAMgZ,QAC1DhZ,EAAMiZ,MAAOJ,IAOhBnc,GAAOwc,eAAiB,SAAUlZ,GACjCxG,GAAO2e,WAAY,WAClB,MAAMnY,KAQR,IAAImZ,EAAYzc,GAAO0Z,WAkDvB,SAASgD,IACR/f,EAASggB,oBAAqB,mBAAoBD,GAClD5f,GAAO6f,oBAAqB,OAAQD,GACpC1c,GAAOoW,QAnDRpW,GAAOG,GAAGiW,MAAQ,SAAUjW,GAY3B,OAVAsc,EACElE,KAAMpY,GAKN6Z,SAAO,SAAU1W,GACjBtD,GAAOwc,eAAgBlZ,KAGlBvG,MAGRiD,GAAOsC,OAAQ,CAGde,SAAS,EAITuZ,UAAW,EAGXxG,MAAO,SAAUyG,KAGF,IAATA,IAAkB7c,GAAO4c,UAAY5c,GAAOqD,WAKjDrD,GAAOqD,SAAU,KAGZwZ,GAAsC,IAAnB7c,GAAO4c,WAK/BH,EAAUtB,YAAaxe,EAAU,CAAEqD,QAIrCA,GAAOoW,MAAMmC,KAAOkE,EAAUlE,KAaD,aAAxB5b,EAASmgB,YACa,YAAxBngB,EAASmgB,aAA6BngB,EAASmH,gBAAgBiZ,SAGjEjgB,GAAO2e,WAAYzb,GAAOoW,QAK1BzZ,EAAS2P,iBAAkB,mBAAoBoQ,GAG/C5f,GAAOwP,iBAAkB,OAAQoQ,IAQlC,IAAIM,EAAS,SAAU9b,EAAOf,EAAIiL,EAAKtG,EAAOmY,EAAWC,EAAUC,GAClE,IAAIje,EAAI,EACP+C,EAAMf,EAAMZ,OACZ8c,EAAc,MAAPhS,EAGR,GAAuB,WAAlBvL,EAAQuL,GAEZ,IAAMlM,KADN+d,GAAY,EACD7R,EACV4R,EAAQ9b,EAAOf,EAAIjB,EAAGkM,EAAKlM,IAAK,EAAMge,EAAUC,QAI3C,QAAena,IAAV8B,IACXmY,GAAY,EAEN7e,EAAY0G,KACjBqY,GAAM,GAGFC,IAGCD,GACJhd,EAAG3C,KAAM0D,EAAO4D,GAChB3E,EAAK,OAILid,EAAOjd,EACPA,EAAK,SAAUK,EAAM6c,EAAMvY,GAC1B,OAAOsY,EAAK5f,KAAMwC,GAAQQ,GAAQsE,MAKhC3E,GACJ,KAAQjB,EAAI+C,EAAK/C,IAChBiB,EACCe,EAAOhC,GAAKkM,EAAK+R,EAChBrY,EACAA,EAAMtH,KAAM0D,EAAOhC,GAAKA,EAAGiB,EAAIe,EAAOhC,GAAKkM,KAMhD,OAAK6R,EACG/b,EAIHkc,EACGjd,EAAG3C,KAAM0D,GAGVe,EAAM9B,EAAIe,EAAO,GAAKkK,GAAQ8R,GAKlCI,EAAY,QACfC,EAAa,YAGd,SAASC,EAAYC,EAAMC,GAC1B,OAAOA,EAAOC,cAMf,SAASC,EAAWC,GACnB,OAAOA,EAAOza,QAASka,EAAW,OAAQla,QAASma,EAAYC,GAEhE,IAAIM,EAAa,SAAUC,GAQ1B,OAA0B,IAAnBA,EAAMzf,UAAqC,IAAnByf,EAAMzf,YAAsByf,EAAMzf,UAMlE,SAAS0f,IACRjhB,KAAKkG,QAAUjD,GAAOiD,QAAU+a,EAAKC,MAGtCD,EAAKC,IAAM,EAEXD,EAAKrd,UAAY,CAEhBwK,MAAO,SAAU4S,GAGhB,IAAIjZ,EAAQiZ,EAAOhhB,KAAKkG,SA4BxB,OAzBM6B,IACLA,EAAQ,GAKHgZ,EAAYC,KAIXA,EAAMzf,SACVyf,EAAOhhB,KAAKkG,SAAY6B,EAMxB3H,OAAO+gB,eAAgBH,EAAOhhB,KAAKkG,QAAS,CAC3C6B,MAAOA,EACPqZ,cAAc,MAMXrZ,GAERsZ,IAAK,SAAUL,EAAOM,EAAMvZ,GAC3B,IAAIwZ,EACHnT,EAAQpO,KAAKoO,MAAO4S,GAIrB,GAAqB,iBAATM,EACXlT,EAAOyS,EAAWS,IAAWvZ,OAM7B,IAAMwZ,KAAQD,EACblT,EAAOyS,EAAWU,IAAWD,EAAMC,GAGrC,OAAOnT,GAERpK,IAAK,SAAUgd,EAAO3S,GACrB,YAAepI,IAARoI,EACNrO,KAAKoO,MAAO4S,GAGZA,EAAOhhB,KAAKkG,UAAa8a,EAAOhhB,KAAKkG,SAAW2a,EAAWxS,KAE7D4R,OAAQ,SAAUe,EAAO3S,EAAKtG,GAa7B,YAAa9B,IAARoI,GACCA,GAAsB,iBAARA,QAAgCpI,IAAV8B,EAElC/H,KAAKgE,IAAKgd,EAAO3S,IASzBrO,KAAKqhB,IAAKL,EAAO3S,EAAKtG,QAIL9B,IAAV8B,EAAsBA,EAAQsG,IAEtCkO,OAAQ,SAAUyE,EAAO3S,GACxB,IAAIlM,EACHiM,EAAQ4S,EAAOhhB,KAAKkG,SAErB,QAAeD,IAAVmI,EAAL,CAIA,QAAanI,IAARoI,EAAoB,CAkBxBlM,GAXCkM,EAJItI,MAAMC,QAASqI,GAIbA,EAAI5J,IAAKoc,IAEfxS,EAAMwS,EAAWxS,MAIJD,EACZ,CAAEC,GACAA,EAAIpB,MAAO2N,IAAmB,IAG1BrX,OAER,MAAQpB,WACAiM,EAAOC,EAAKlM,UAKR8D,IAARoI,GAAqBpL,GAAO2D,cAAewH,MAM1C4S,EAAMzf,SACVyf,EAAOhhB,KAAKkG,cAAYD,SAEjB+a,EAAOhhB,KAAKkG,YAItBsb,QAAS,SAAUR,GAClB,IAAI5S,EAAQ4S,EAAOhhB,KAAKkG,SACxB,YAAiBD,IAAVmI,IAAwBnL,GAAO2D,cAAewH,KAGvD,IAAIqT,EAAW,IAAIR,EAEfS,EAAW,IAAIT,EAcfU,EAAS,gCACZC,EAAa,SA2Bd,SAASC,EAAUpe,EAAM4K,EAAKiT,GAC7B,IAAI5d,EA1Ba4d,EA8BjB,QAAcrb,IAATqb,GAAwC,IAAlB7d,EAAKlC,SAI/B,GAHAmC,EAAO,QAAU2K,EAAIhI,QAASub,EAAY,OAAQje,cAG7B,iBAFrB2d,EAAO7d,EAAKjB,aAAckB,IAEM,CAC/B,IACC4d,EAnCW,UADGA,EAoCEA,IA/BL,UAATA,IAIS,SAATA,EACG,KAIHA,KAAUA,EAAO,IACbA,EAGJK,EAAOla,KAAM6Z,GACVQ,KAAKC,MAAOT,GAGbA,GAeH,MAAQ3U,IAGV+U,EAASL,IAAK5d,EAAM4K,EAAKiT,QAEzBA,OAAOrb,EAGT,OAAOqb,EAGRre,GAAOsC,OAAQ,CACdic,QAAS,SAAU/d,GAClB,OAAOie,EAASF,QAAS/d,IAAUge,EAASD,QAAS/d,IAGtD6d,KAAM,SAAU7d,EAAMC,EAAM4d,GAC3B,OAAOI,EAASzB,OAAQxc,EAAMC,EAAM4d,IAGrCU,WAAY,SAAUve,EAAMC,GAC3Bge,EAASnF,OAAQ9Y,EAAMC,IAKxBue,MAAO,SAAUxe,EAAMC,EAAM4d,GAC5B,OAAOG,EAASxB,OAAQxc,EAAMC,EAAM4d,IAGrCY,YAAa,SAAUze,EAAMC,GAC5B+d,EAASlF,OAAQ9Y,EAAMC,MAIzBT,GAAOG,GAAGmC,OAAQ,CACjB+b,KAAM,SAAUjT,EAAKtG,GACpB,IAAI5F,EAAGuB,EAAM4d,EACZ7d,EAAOzD,KAAM,GACbmiB,EAAQ1e,GAAQA,EAAK8G,WAGtB,QAAatE,IAARoI,EAAoB,CACxB,GAAKrO,KAAKuD,SACT+d,EAAOI,EAAS1d,IAAKP,GAEE,IAAlBA,EAAKlC,WAAmBkgB,EAASzd,IAAKP,EAAM,iBAAmB,CACnEtB,EAAIggB,EAAM5e,OACV,MAAQpB,IAIFggB,EAAOhgB,IAEsB,KADjCuB,EAAOye,EAAOhgB,GAAIuB,MACR7C,QAAS,WAClB6C,EAAOmd,EAAWnd,EAAKpD,MAAO,IAC9BuhB,EAAUpe,EAAMC,EAAM4d,EAAM5d,KAI/B+d,EAASJ,IAAK5d,EAAM,gBAAgB,GAItC,OAAO6d,EAIR,MAAoB,iBAARjT,EACJrO,KAAKuE,KAAM,WACjBmd,EAASL,IAAKrhB,KAAMqO,KAIf4R,EAAQjgB,KAAM,SAAU+H,GAC9B,IAAIuZ,EAOJ,GAAK7d,QAAkBwC,IAAV8B,EAKZ,YAAc9B,KADdqb,EAAOI,EAAS1d,IAAKP,EAAM4K,IAEnBiT,OAMMrb,KADdqb,EAAOO,EAAUpe,EAAM4K,IAEfiT,OAIR,EAIDthB,KAAKuE,KAAM,WAGVmd,EAASL,IAAKrhB,KAAMqO,EAAKtG,MAExB,KAAMA,EAA0B,EAAnBrD,UAAUnB,OAAY,MAAM,IAG7Cye,WAAY,SAAU3T,GACrB,OAAOrO,KAAKuE,KAAM,WACjBmd,EAASnF,OAAQvc,KAAMqO,QAM1BpL,GAAOsC,OAAQ,CACd2W,MAAO,SAAUzY,EAAM9B,EAAM2f,GAC5B,IAAIpF,EAEJ,GAAKzY,EAYJ,OAXA9B,GAASA,GAAQ,MAAS,QAC1Bua,EAAQuF,EAASzd,IAAKP,EAAM9B,GAGvB2f,KACEpF,GAASnW,MAAMC,QAASsb,GAC7BpF,EAAQuF,EAASxB,OAAQxc,EAAM9B,EAAMsB,GAAOgE,UAAWqa,IAEvDpF,EAAMtb,KAAM0gB,IAGPpF,GAAS,IAIlBkG,QAAS,SAAU3e,EAAM9B,GACxBA,EAAOA,GAAQ,KAEf,IAAIua,EAAQjZ,GAAOiZ,MAAOzY,EAAM9B,GAC/B0gB,EAAcnG,EAAM3Y,OACpBH,EAAK8Y,EAAM3N,QACX+T,EAAQrf,GAAOsf,YAAa9e,EAAM9B,GAMvB,eAAPyB,IACJA,EAAK8Y,EAAM3N,QACX8T,KAGIjf,IAIU,OAATzB,GACJua,EAAMsG,QAAS,qBAITF,EAAMG,KACbrf,EAAG3C,KAAMgD,EApBF,WACNR,GAAOmf,QAAS3e,EAAM9B,IAmBF2gB,KAGhBD,GAAeC,GACpBA,EAAMhO,MAAM8H,QAKdmG,YAAa,SAAU9e,EAAM9B,GAC5B,IAAI0M,EAAM1M,EAAO,aACjB,OAAO8f,EAASzd,IAAKP,EAAM4K,IAASoT,EAASxB,OAAQxc,EAAM4K,EAAK,CAC/DiG,MAAOrR,GAAOwY,UAAW,eAAgBvB,IAAK,WAC7CuH,EAASlF,OAAQ9Y,EAAM,CAAE9B,EAAO,QAAS0M,WAM7CpL,GAAOG,GAAGmC,OAAQ,CACjB2W,MAAO,SAAUva,EAAM2f,GACtB,IAAIoB,EAAS,EAQb,MANqB,iBAAT/gB,IACX2f,EAAO3f,EACPA,EAAO,KACP+gB,KAGIhe,UAAUnB,OAASmf,EAChBzf,GAAOiZ,MAAOlc,KAAM,GAAK2B,QAGjBsE,IAATqb,EACNthB,KACAA,KAAKuE,KAAM,WACV,IAAI2X,EAAQjZ,GAAOiZ,MAAOlc,KAAM2B,EAAM2f,GAGtCre,GAAOsf,YAAaviB,KAAM2B,GAEZ,OAATA,GAAgC,eAAfua,EAAO,IAC5BjZ,GAAOmf,QAASpiB,KAAM2B,MAI1BygB,QAAS,SAAUzgB,GAClB,OAAO3B,KAAKuE,KAAM,WACjBtB,GAAOmf,QAASpiB,KAAM2B,MAGxBghB,WAAY,SAAUhhB,GACrB,OAAO3B,KAAKkc,MAAOva,GAAQ,KAAM,KAKlC2Z,QAAS,SAAU3Z,EAAML,GACxB,IAAIshB,EACHC,EAAQ,EACRC,EAAQ7f,GAAO0Z,WACfpM,EAAWvQ,KACXmC,EAAInC,KAAKuD,OACT2X,EAAU,aACC2H,GACTC,EAAM1E,YAAa7N,EAAU,CAAEA,KAIb,iBAAT5O,IACXL,EAAMK,EACNA,OAAOsE,GAERtE,EAAOA,GAAQ,KAEf,MAAQQ,KACPygB,EAAMnB,EAASzd,IAAKuM,EAAUpO,GAAKR,EAAO,gBAC9BihB,EAAItO,QACfuO,IACAD,EAAItO,MAAM4F,IAAKgB,IAIjB,OADAA,IACO4H,EAAMxH,QAASha,MAGxB,IAAIyhB,EAAO,sCAA0CC,OAEjDC,EAAU,IAAIza,OAAQ,iBAAmBua,EAAO,cAAe,KAG/DG,EAAY,CAAE,MAAO,QAAS,SAAU,QAExCnc,EAAkBnH,EAASmH,gBAI1Boc,EAAa,SAAU1f,GACzB,OAAOR,GAAOwF,SAAUhF,EAAK+D,cAAe/D,IAE7C2f,EAAW,CAAEA,UAAU,GAOnBrc,EAAgBsc,cACpBF,EAAa,SAAU1f,GACtB,OAAOR,GAAOwF,SAAUhF,EAAK+D,cAAe/D,IAC3CA,EAAK4f,YAAaD,KAAe3f,EAAK+D,gBAG1C,IAAI8b,GAAqB,SAAU7f,EAAMiL,GAOvC,MAA8B,UAH9BjL,EAAOiL,GAAMjL,GAGD8f,MAAMC,SACM,KAAvB/f,EAAK8f,MAAMC,SAMXL,EAAY1f,IAEsB,SAAlCR,GAAOwgB,IAAKhgB,EAAM,YAKrB,SAASigB,GAAWjgB,EAAM8d,EAAMoC,EAAYC,GAC3C,IAAIC,EAAUC,EACbC,EAAgB,GAChBC,EAAeJ,EACd,WACC,OAAOA,EAAMhK,OAEd,WACC,OAAO3W,GAAOwgB,IAAKhgB,EAAM8d,EAAM,KAEjC0C,EAAUD,IACVE,EAAOP,GAAcA,EAAY,KAAS1gB,GAAOkhB,UAAW5C,GAAS,GAAK,MAG1E6C,EAAgB3gB,EAAKlC,WAClB0B,GAAOkhB,UAAW5C,IAAmB,OAAT2C,IAAkBD,IAChDhB,EAAQ5V,KAAMpK,GAAOwgB,IAAKhgB,EAAM8d,IAElC,GAAK6C,GAAiBA,EAAe,KAAQF,EAAO,CAInDD,GAAoB,EAGpBC,EAAOA,GAAQE,EAAe,GAG9BA,GAAiBH,GAAW,EAE5B,MAAQF,IAIP9gB,GAAOsgB,MAAO9f,EAAM8d,EAAM6C,EAAgBF,IACnC,EAAIJ,IAAY,GAAMA,EAAQE,IAAiBC,GAAW,MAAW,IAC3EF,EAAgB,GAEjBK,GAAgCN,EAIjCM,GAAgC,EAChCnhB,GAAOsgB,MAAO9f,EAAM8d,EAAM6C,EAAgBF,GAG1CP,EAAaA,GAAc,GAgB5B,OAbKA,IACJS,GAAiBA,IAAkBH,GAAW,EAG9CJ,EAAWF,EAAY,GACtBS,GAAkBT,EAAY,GAAM,GAAMA,EAAY,IACrDA,EAAY,GACTC,IACJA,EAAMM,KAAOA,EACbN,EAAMtR,MAAQ8R,EACdR,EAAMxe,IAAMye,IAGPA,EAIR,IAAIQ,GAAoB,GAyBxB,SAASC,GAAU/T,EAAUgU,GAO5B,IANA,IAAIf,EAAS/f,EAxBcA,EACvBiT,EACHxU,EACAsB,EACAggB,EAqBAgB,EAAS,GACTxK,EAAQ,EACRzW,EAASgN,EAAShN,OAGXyW,EAAQzW,EAAQyW,KACvBvW,EAAO8M,EAAUyJ,IACNuJ,QAIXC,EAAU/f,EAAK8f,MAAMC,QAChBe,GAKa,SAAZf,IACJgB,EAAQxK,GAAUyH,EAASzd,IAAKP,EAAM,YAAe,KAC/C+gB,EAAQxK,KACbvW,EAAK8f,MAAMC,QAAU,KAGK,KAAvB/f,EAAK8f,MAAMC,SAAkBF,GAAoB7f,KACrD+gB,EAAQxK,IA7CVwJ,EAFAthB,EADGwU,OAAAA,EACHxU,GAF0BuB,EAiDaA,GA/C5B+D,cACXhE,EAAWC,EAAKD,UAChBggB,EAAUa,GAAmB7gB,MAM9BkT,EAAOxU,EAAIuiB,KAAK9hB,YAAaT,EAAII,cAAekB,IAChDggB,EAAUvgB,GAAOwgB,IAAK/M,EAAM,WAE5BA,EAAK9T,WAAWC,YAAa6T,GAEZ,SAAZ8M,IACJA,EAAU,SAEXa,GAAmB7gB,GAAaggB,MAkCb,SAAZA,IACJgB,EAAQxK,GAAU,OAGlByH,EAASJ,IAAK5d,EAAM,UAAW+f,KAMlC,IAAMxJ,EAAQ,EAAGA,EAAQzW,EAAQyW,IACR,MAAnBwK,EAAQxK,KACZzJ,EAAUyJ,GAAQuJ,MAAMC,QAAUgB,EAAQxK,IAI5C,OAAOzJ,EAGRtN,GAAOG,GAAGmC,OAAQ,CACjBgf,KAAM,WACL,OAAOD,GAAUtkB,MAAM,IAExB0kB,KAAM,WACL,OAAOJ,GAAUtkB,OAElB2kB,OAAQ,SAAU7H,GACjB,MAAsB,kBAAVA,EACJA,EAAQ9c,KAAKukB,OAASvkB,KAAK0kB,OAG5B1kB,KAAKuE,KAAM,WACZ+e,GAAoBtjB,MACxBiD,GAAQjD,MAAOukB,OAEfthB,GAAQjD,MAAO0kB,YAKnB,IAUEE,GACA1U,GAXE2U,GAAiB,wBAEjBC,GAAW,iCAEXC,GAAc,qCAMhBH,GADchlB,EAASolB,yBACRriB,YAAa/C,EAAS0C,cAAe,SACpD4N,GAAQtQ,EAAS0C,cAAe,UAM3BG,aAAc,OAAQ,SAC5ByN,GAAMzN,aAAc,UAAW,WAC/ByN,GAAMzN,aAAc,OAAQ,KAE5BmiB,GAAIjiB,YAAauN,IAIjB9O,GAAQ6jB,WAAaL,GAAIM,WAAW,GAAOA,WAAW,GAAOvS,UAAUwB,QAIvEyQ,GAAIzU,UAAY,yBAChB/O,GAAQ+jB,iBAAmBP,GAAIM,WAAW,GAAOvS,UAAUyS,aAK3DR,GAAIzU,UAAY,oBAChB/O,GAAQikB,SAAWT,GAAIjS,UAKxB,IAAI2S,GAAU,CAKbC,MAAO,CAAE,EAAG,UAAW,YACvBC,IAAK,CAAE,EAAG,oBAAqB,uBAC/BC,GAAI,CAAE,EAAG,iBAAkB,oBAC3BC,GAAI,CAAE,EAAG,qBAAsB,yBAE/BC,SAAU,CAAE,EAAG,GAAI,KAYpB,SAASC,GAAQziB,EAAS6M,GAIzB,IAAI5L,EAYJ,OATCA,EAD4C,oBAAjCjB,EAAQqK,qBACbrK,EAAQqK,qBAAsBwC,GAAO,KAEI,oBAA7B7M,EAAQ4K,iBACpB5K,EAAQ4K,iBAAkBiC,GAAO,KAGjC,QAGM/J,IAAR+J,GAAqBA,GAAOxM,GAAUL,EAAS6M,GAC5C/M,GAAOoB,MAAO,CAAElB,GAAWiB,GAG5BA,EAKR,SAASyhB,GAAe1hB,EAAO2hB,GAI9B,IAHA,IAAI3jB,EAAI,EACP2X,EAAI3V,EAAMZ,OAEHpB,EAAI2X,EAAG3X,IACdsf,EAASJ,IACRld,EAAOhC,GACP,cACC2jB,GAAerE,EAASzd,IAAK8hB,EAAa3jB,GAAK,eA1CnDmjB,GAAQS,MAAQT,GAAQU,MAAQV,GAAQW,SAAWX,GAAQY,QAAUZ,GAAQC,MAC7ED,GAAQa,GAAKb,GAAQI,GAGftkB,GAAQikB,SACbC,GAAQc,SAAWd,GAAQD,OAAS,CAAE,EAAG,+BAAgC,cA2C1E,IAAIgB,GAAQ,YAEZ,SAASC,GAAeniB,EAAOhB,EAASojB,EAASC,EAAWC,GAO3D,IANA,IAAIhjB,EAAMmf,EAAK5S,EAAK0W,EAAMC,EAAUxhB,EACnCyhB,EAAWzjB,EAAQ6hB,yBACnB6B,EAAQ,GACR1kB,EAAI,EACJ2X,EAAI3V,EAAMZ,OAEHpB,EAAI2X,EAAG3X,IAGd,IAFAsB,EAAOU,EAAOhC,KAEQ,IAATsB,EAGZ,GAAwB,WAAnBX,EAAQW,GAIZR,GAAOoB,MAAOwiB,EAAOpjB,EAAKlC,SAAW,CAAEkC,GAASA,QAG1C,GAAM4iB,GAAM5e,KAAMhE,GAIlB,CACNmf,EAAMA,GAAOgE,EAASjkB,YAAaQ,EAAQb,cAAe,QAG1D0N,GAAQ8U,GAASzX,KAAM5J,IAAU,CAAE,GAAI,KAAQ,GAAIE,cACnD+iB,EAAOpB,GAAStV,IAASsV,GAAQK,SACjC/C,EAAIzS,UAAYuW,EAAM,GAAMzjB,GAAO6jB,cAAerjB,GAASijB,EAAM,GAGjEvhB,EAAIuhB,EAAM,GACV,MAAQvhB,IACPyd,EAAMA,EAAIjQ,UAKX1P,GAAOoB,MAAOwiB,EAAOjE,EAAIlW,aAGzBkW,EAAMgE,EAASlU,YAGX5L,YAAc,QAzBlB+f,EAAMjmB,KAAMuC,EAAQ4jB,eAAgBtjB,IA+BvCmjB,EAAS9f,YAAc,GAEvB3E,EAAI,EACJ,MAAUsB,EAAOojB,EAAO1kB,KAGvB,GAAKqkB,IAAkD,EAArCvjB,GAAOkE,QAAS1D,EAAM+iB,GAClCC,GACJA,EAAQ7lB,KAAM6C,QAgBhB,GAXAkjB,EAAWxD,EAAY1f,GAGvBmf,EAAMgD,GAAQgB,EAASjkB,YAAac,GAAQ,UAGvCkjB,GACJd,GAAejD,GAIX2D,EAAU,CACdphB,EAAI,EACJ,MAAU1B,EAAOmf,EAAKzd,KAChB4f,GAAYtd,KAAMhE,EAAK9B,MAAQ,KACnC4kB,EAAQ3lB,KAAM6C,GAMlB,OAAOmjB,EAIR,IAAII,GAAiB,sBAErB,SAASC,KACR,OAAO,EAGR,SAASC,KACR,OAAO,EAGR,SAASC,GAAI1jB,EAAM2jB,EAAOlkB,EAAUoe,EAAMle,EAAIikB,GAC7C,IAAIC,EAAQ3lB,EAGZ,GAAsB,iBAAVylB,EAAqB,CAShC,IAAMzlB,IANmB,iBAAbuB,IAGXoe,EAAOA,GAAQpe,EACfA,OAAW+C,GAEEmhB,EACbD,GAAI1jB,EAAM9B,EAAMuB,EAAUoe,EAAM8F,EAAOzlB,GAAQ0lB,GAEhD,OAAO5jB,EAsBR,GAnBa,MAAR6d,GAAsB,MAANle,GAGpBA,EAAKF,EACLoe,EAAOpe,OAAW+C,GACD,MAAN7C,IACc,iBAAbF,GAGXE,EAAKke,EACLA,OAAOrb,IAIP7C,EAAKke,EACLA,EAAOpe,EACPA,OAAW+C,KAGD,IAAP7C,EACJA,EAAK8jB,QACC,IAAM9jB,EACZ,OAAOK,EAeR,OAZa,IAAR4jB,IACJC,EAASlkB,GACTA,EAAK,SAAUmkB,GAId,OADAtkB,KAASukB,IAAKD,GACPD,EAAO3mB,MAAOX,KAAM0E,aAIzBsD,KAAOsf,EAAOtf,OAAUsf,EAAOtf,KAAO/E,GAAO+E,SAE1CvE,EAAKc,KAAM,WACjBtB,GAAOskB,MAAMrN,IAAKla,KAAMonB,EAAOhkB,EAAIke,EAAMpe,KA+a3C,SAASukB,GAAgB/Y,EAAI/M,EAAM+lB,GAG5BA,GAQNjG,EAASJ,IAAK3S,EAAI/M,GAAM,GACxBsB,GAAOskB,MAAMrN,IAAKxL,EAAI/M,EAAM,CAC3B0F,WAAW,EACXyW,QAAS,SAAUyJ,GAClB,IAAI3V,EACH+V,EAAQlG,EAASzd,IAAKhE,KAAM2B,GAE7B,GAAyB,EAAlB4lB,EAAMK,WAAmB5nB,KAAM2B,IAGrC,GAAMgmB,GA4BQ1kB,GAAOskB,MAAMxJ,QAASpc,IAAU,IAAKkmB,cAClDN,EAAMO,uBAhBN,GARAH,EAAQrnB,GAAMG,KAAMiE,WACpB+c,EAASJ,IAAKrhB,KAAM2B,EAAMgmB,GAG1B3nB,KAAM2B,KACNiQ,EAAS6P,EAASzd,IAAKhE,KAAM2B,GAC7B8f,EAASJ,IAAKrhB,KAAM2B,GAAM,GAErBgmB,IAAU/V,EAMd,OAHA2V,EAAMQ,2BACNR,EAAMS,iBAECpW,OAeE+V,IAGXlG,EAASJ,IAAKrhB,KAAM2B,EAAMsB,GAAOskB,MAAMU,QACtCN,EAAO,GACPA,EAAMrnB,MAAO,GACbN,OAWDunB,EAAMO,kBACNP,EAAMW,8BAAgCjB,aArENhhB,IAA7Bwb,EAASzd,IAAK0K,EAAI/M,IACtBsB,GAAOskB,MAAMrN,IAAKxL,EAAI/M,EAAMslB,IA5a/BhkB,GAAOskB,MAAQ,CAEd/nB,OAAQ,GAER0a,IAAK,SAAUzW,EAAM2jB,EAAOtJ,EAASwD,EAAMpe,GAE1C,IAAIilB,EAAaC,EAAaxF,EAC7ByF,EAAQC,EAAGC,EACXxK,EAASyK,EAAU7mB,EAAM8mB,EAAYC,EACrCC,EAAWlH,EAASzd,IAAKP,GAG1B,GAAMsd,EAAYtd,GAAlB,CAKKqa,EAAQA,UAEZA,GADAqK,EAAcrK,GACQA,QACtB5a,EAAWilB,EAAYjlB,UAKnBA,GACJD,GAAO4J,KAAK2D,gBAAiBzJ,EAAiB7D,GAIzC4a,EAAQ9V,OACb8V,EAAQ9V,KAAO/E,GAAO+E,SAIfqgB,EAASM,EAASN,UACzBA,EAASM,EAASN,OAASjoB,OAAOwoB,OAAQ,QAEnCR,EAAcO,EAASE,UAC9BT,EAAcO,EAASE,OAAS,SAAUlc,GAIzC,MAAyB,oBAAX1J,IAA0BA,GAAOskB,MAAMuB,YAAcnc,EAAEhL,KACpEsB,GAAOskB,MAAMwB,SAASpoB,MAAO8C,EAAMiB,gBAAcuB,IAMpDqiB,GADAlB,GAAUA,GAAS,IAAKna,MAAO2N,IAAmB,CAAE,KAC1CrX,OACV,MAAQ+kB,IAEP3mB,EAAO+mB,GADP9F,EAAMoE,GAAe3Z,KAAM+Z,EAAOkB,KAAS,IACpB,GACvBG,GAAe7F,EAAK,IAAO,IAAKza,MAAO,KAAM9C,OAGvC1D,IAKNoc,EAAU9a,GAAOskB,MAAMxJ,QAASpc,IAAU,GAG1CA,GAASuB,EAAW6a,EAAQ8J,aAAe9J,EAAQiL,WAAcrnB,EAGjEoc,EAAU9a,GAAOskB,MAAMxJ,QAASpc,IAAU,GAG1C4mB,EAAYtlB,GAAOsC,OAAQ,CAC1B5D,KAAMA,EACN+mB,SAAUA,EACVpH,KAAMA,EACNxD,QAASA,EACT9V,KAAM8V,EAAQ9V,KACd9E,SAAUA,EACVqI,aAAcrI,GAAYD,GAAOqN,KAAKrD,MAAM1B,aAAa9D,KAAMvE,GAC/DmE,UAAWohB,EAAW3a,KAAM,MAC1Bqa,IAGKK,EAAWH,EAAQ1mB,OAC1B6mB,EAAWH,EAAQ1mB,GAAS,IACnBsnB,cAAgB,EAGnBlL,EAAQmL,QACiD,IAA9DnL,EAAQmL,MAAMzoB,KAAMgD,EAAM6d,EAAMmH,EAAYL,IAEvC3kB,EAAK8L,kBACT9L,EAAK8L,iBAAkB5N,EAAMymB,IAK3BrK,EAAQ7D,MACZ6D,EAAQ7D,IAAIzZ,KAAMgD,EAAM8kB,GAElBA,EAAUzK,QAAQ9V,OACvBugB,EAAUzK,QAAQ9V,KAAO8V,EAAQ9V,OAK9B9E,EACJslB,EAASljB,OAAQkjB,EAASS,gBAAiB,EAAGV,GAE9CC,EAAS5nB,KAAM2nB,GAIhBtlB,GAAOskB,MAAM/nB,OAAQmC,IAAS,KAMhC4a,OAAQ,SAAU9Y,EAAM2jB,EAAOtJ,EAAS5a,EAAUimB,GAEjD,IAAIhkB,EAAGikB,EAAWxG,EACjByF,EAAQC,EAAGC,EACXxK,EAASyK,EAAU7mB,EAAM8mB,EAAYC,EACrCC,EAAWlH,EAASD,QAAS/d,IAAUge,EAASzd,IAAKP,GAEtD,GAAMklB,IAAeN,EAASM,EAASN,QAAvC,CAMAC,GADAlB,GAAUA,GAAS,IAAKna,MAAO2N,IAAmB,CAAE,KAC1CrX,OACV,MAAQ+kB,IAMP,GAJA3mB,EAAO+mB,GADP9F,EAAMoE,GAAe3Z,KAAM+Z,EAAOkB,KAAS,IACpB,GACvBG,GAAe7F,EAAK,IAAO,IAAKza,MAAO,KAAM9C,OAGvC1D,EAAN,CAOAoc,EAAU9a,GAAOskB,MAAMxJ,QAASpc,IAAU,GAE1C6mB,EAAWH,EADX1mB,GAASuB,EAAW6a,EAAQ8J,aAAe9J,EAAQiL,WAAcrnB,IACpC,GAC7BihB,EAAMA,EAAK,IACV,IAAIpa,OAAQ,UAAYigB,EAAW3a,KAAM,iBAAoB,WAG9Dsb,EAAYjkB,EAAIqjB,EAASjlB,OACzB,MAAQ4B,IACPojB,EAAYC,EAAUrjB,IAEfgkB,GAAeT,IAAaH,EAAUG,UACzC5K,GAAWA,EAAQ9V,OAASugB,EAAUvgB,MACtC4a,IAAOA,EAAInb,KAAM8gB,EAAUlhB,YAC3BnE,GAAYA,IAAaqlB,EAAUrlB,WACxB,OAAbA,IAAqBqlB,EAAUrlB,YAChCslB,EAASljB,OAAQH,EAAG,GAEfojB,EAAUrlB,UACdslB,EAASS,gBAELlL,EAAQxB,QACZwB,EAAQxB,OAAO9b,KAAMgD,EAAM8kB,IAOzBa,IAAcZ,EAASjlB,SACrBwa,EAAQsL,WACkD,IAA/DtL,EAAQsL,SAAS5oB,KAAMgD,EAAMglB,EAAYE,EAASE,SAElD5lB,GAAOqmB,YAAa7lB,EAAM9B,EAAMgnB,EAASE,eAGnCR,EAAQ1mB,SA1Cf,IAAMA,KAAQ0mB,EACbplB,GAAOskB,MAAMhL,OAAQ9Y,EAAM9B,EAAOylB,EAAOkB,GAAKxK,EAAS5a,GAAU,GA8C/DD,GAAO2D,cAAeyhB,IAC1B5G,EAASlF,OAAQ9Y,EAAM,mBAIzBslB,SAAU,SAAUQ,GAEnB,IAAIpnB,EAAGgD,EAAGf,EAAK4O,EAASuV,EAAWiB,EAClC3W,EAAO,IAAI9M,MAAOrB,UAAUnB,QAG5BgkB,EAAQtkB,GAAOskB,MAAMkC,IAAKF,GAE1Bf,GACC/G,EAASzd,IAAKhE,KAAM,WAAcI,OAAOwoB,OAAQ,OAC/CrB,EAAM5lB,OAAU,GACnBoc,EAAU9a,GAAOskB,MAAMxJ,QAASwJ,EAAM5lB,OAAU,GAKjD,IAFAkR,EAAM,GAAM0U,EAENplB,EAAI,EAAGA,EAAIuC,UAAUnB,OAAQpB,IAClC0Q,EAAM1Q,GAAMuC,UAAWvC,GAMxB,GAHAolB,EAAMmC,eAAiB1pB,MAGlB+d,EAAQ4L,cAA2D,IAA5C5L,EAAQ4L,YAAYlpB,KAAMT,KAAMunB,GAA5D,CAKAiC,EAAevmB,GAAOskB,MAAMiB,SAAS/nB,KAAMT,KAAMunB,EAAOiB,GAGxDrmB,EAAI,EACJ,OAAU6Q,EAAUwW,EAAcrnB,QAAYolB,EAAMqC,uBAAyB,CAC5ErC,EAAMsC,cAAgB7W,EAAQvP,KAE9B0B,EAAI,EACJ,OAAUojB,EAAYvV,EAAQwV,SAAUrjB,QACtCoiB,EAAMW,gCAIDX,EAAMuC,aAAsC,IAAxBvB,EAAUlhB,YACnCkgB,EAAMuC,WAAWriB,KAAM8gB,EAAUlhB,aAEjCkgB,EAAMgB,UAAYA,EAClBhB,EAAMjG,KAAOiH,EAAUjH,UAKVrb,KAHb7B,IAAUnB,GAAOskB,MAAMxJ,QAASwK,EAAUG,WAAc,IAAKG,QAC5DN,EAAUzK,SAAUnd,MAAOqS,EAAQvP,KAAMoP,MAGT,KAAzB0U,EAAM3V,OAASxN,KACrBmjB,EAAMS,iBACNT,EAAMO,oBAYX,OAJK/J,EAAQgM,cACZhM,EAAQgM,aAAatpB,KAAMT,KAAMunB,GAG3BA,EAAM3V,SAGd4W,SAAU,SAAUjB,EAAOiB,GAC1B,IAAIrmB,EAAGomB,EAAWnf,EAAK4gB,EAAiBC,EACvCT,EAAe,GACfP,EAAgBT,EAASS,cACzBrP,EAAM2N,EAAM3hB,OAGb,GAAKqjB,GAIJrP,EAAIrY,YAOc,UAAfgmB,EAAM5lB,MAAoC,GAAhB4lB,EAAM9S,QAEnC,KAAQmF,IAAQ5Z,KAAM4Z,EAAMA,EAAIhX,YAAc5C,KAI7C,GAAsB,IAAjB4Z,EAAIrY,WAAoC,UAAfgmB,EAAM5lB,OAAqC,IAAjBiY,EAAIrN,UAAsB,CAGjF,IAFAyd,EAAkB,GAClBC,EAAmB,GACb9nB,EAAI,EAAGA,EAAI8mB,EAAe9mB,SAME8D,IAA5BgkB,EAFL7gB,GAHAmf,EAAYC,EAAUrmB,IAGNe,SAAW,OAG1B+mB,EAAkB7gB,GAAQmf,EAAUhd,cACC,EAApCtI,GAAQmG,EAAKpJ,MAAOga,MAAOJ,GAC3B3W,GAAO4J,KAAMzD,EAAKpJ,KAAM,KAAM,CAAE4Z,IAAQrW,QAErC0mB,EAAkB7gB,IACtB4gB,EAAgBppB,KAAM2nB,GAGnByB,EAAgBzmB,QACpBimB,EAAa5oB,KAAM,CAAE6C,KAAMmW,EAAK4O,SAAUwB,IAY9C,OALApQ,EAAM5Z,KACDipB,EAAgBT,EAASjlB,QAC7BimB,EAAa5oB,KAAM,CAAE6C,KAAMmW,EAAK4O,SAAUA,EAASloB,MAAO2oB,KAGpDO,GAGRU,QAAS,SAAUxmB,EAAMymB,GACxB/pB,OAAO+gB,eAAgBle,GAAOmnB,MAAMxmB,UAAWF,EAAM,CACpD2mB,YAAY,EACZjJ,cAAc,EAEdpd,IAAK3C,EAAY8oB,GAChB,WACC,GAAKnqB,KAAKsqB,cACT,OAAOH,EAAMnqB,KAAKsqB,gBAGpB,WACC,GAAKtqB,KAAKsqB,cACT,OAAOtqB,KAAKsqB,cAAe5mB,IAI9B2d,IAAK,SAAUtZ,GACd3H,OAAO+gB,eAAgBnhB,KAAM0D,EAAM,CAClC2mB,YAAY,EACZjJ,cAAc,EACdmJ,UAAU,EACVxiB,MAAOA,QAMX0hB,IAAK,SAAUa,GACd,OAAOA,EAAernB,GAAOiD,SAC5BokB,EACA,IAAIrnB,GAAOmnB,MAAOE,IAGpBvM,QAAS,CACRyM,KAAM,CAGLC,UAAU,GAEXC,MAAO,CAGNxB,MAAO,SAAU5H,GAIhB,IAAI5S,EAAK1O,MAAQshB,EAWjB,OARKuD,GAAepd,KAAMiH,EAAG/M,OAC5B+M,EAAGgc,OAASlnB,GAAUkL,EAAI,UAG1B+Y,GAAgB/Y,EAAI,SAAS,IAIvB,GAERuZ,QAAS,SAAU3G,GAIlB,IAAI5S,EAAK1O,MAAQshB,EAUjB,OAPKuD,GAAepd,KAAMiH,EAAG/M,OAC5B+M,EAAGgc,OAASlnB,GAAUkL,EAAI,UAE1B+Y,GAAgB/Y,EAAI,UAId,GAKRiX,SAAU,SAAU4B,GACnB,IAAI3hB,EAAS2hB,EAAM3hB,OACnB,OAAOif,GAAepd,KAAM7B,EAAOjE,OAClCiE,EAAO8kB,OAASlnB,GAAUoC,EAAQ,UAClC6b,EAASzd,IAAK4B,EAAQ,UACtBpC,GAAUoC,EAAQ,OAIrB+kB,aAAc,CACbZ,aAAc,SAAUxC,QAIDthB,IAAjBshB,EAAM3V,QAAwB2V,EAAM+C,gBACxC/C,EAAM+C,cAAcM,YAAcrD,EAAM3V,YA0F7C3O,GAAOqmB,YAAc,SAAU7lB,EAAM9B,EAAMknB,GAGrCplB,EAAKmc,qBACTnc,EAAKmc,oBAAqBje,EAAMknB,IAIlC5lB,GAAOmnB,MAAQ,SAAUxoB,EAAKipB,GAG7B,KAAQ7qB,gBAAgBiD,GAAOmnB,OAC9B,OAAO,IAAInnB,GAAOmnB,MAAOxoB,EAAKipB,GAI1BjpB,GAAOA,EAAID,MACf3B,KAAKsqB,cAAgB1oB,EACrB5B,KAAK2B,KAAOC,EAAID,KAIhB3B,KAAK8qB,mBAAqBlpB,EAAImpB,uBACH9kB,IAAzBrE,EAAImpB,mBAGgB,IAApBnpB,EAAIgpB,YACL3D,GACAC,GAKDlnB,KAAK4F,OAAWhE,EAAIgE,QAAkC,IAAxBhE,EAAIgE,OAAOrE,SACxCK,EAAIgE,OAAOhD,WACXhB,EAAIgE,OAEL5F,KAAK6pB,cAAgBjoB,EAAIioB,cACzB7pB,KAAKgrB,cAAgBppB,EAAIopB,eAIzBhrB,KAAK2B,KAAOC,EAIRipB,GACJ5nB,GAAOsC,OAAQvF,KAAM6qB,GAItB7qB,KAAKirB,UAAYrpB,GAAOA,EAAIqpB,WAAaC,KAAKC,MAG9CnrB,KAAMiD,GAAOiD,UAAY,GAK1BjD,GAAOmnB,MAAMxmB,UAAY,CACxBE,YAAab,GAAOmnB,MACpBU,mBAAoB5D,GACpB0C,qBAAsB1C,GACtBgB,8BAA+BhB,GAC/BkE,aAAa,EAEbpD,eAAgB,WACf,IAAIrb,EAAI3M,KAAKsqB,cAEbtqB,KAAK8qB,mBAAqB7D,GAErBta,IAAM3M,KAAKorB,aACfze,EAAEqb,kBAGJF,gBAAiB,WAChB,IAAInb,EAAI3M,KAAKsqB,cAEbtqB,KAAK4pB,qBAAuB3C,GAEvBta,IAAM3M,KAAKorB,aACfze,EAAEmb,mBAGJC,yBAA0B,WACzB,IAAIpb,EAAI3M,KAAKsqB,cAEbtqB,KAAKkoB,8BAAgCjB,GAEhCta,IAAM3M,KAAKorB,aACfze,EAAEob,2BAGH/nB,KAAK8nB,oBAKP7kB,GAAOsB,KAAM,CACZ8mB,QAAQ,EACRC,SAAS,EACTC,YAAY,EACZC,gBAAgB,EAChBC,SAAS,EACTC,QAAQ,EACRC,YAAY,EACZC,SAAS,EACTC,OAAO,EACPC,OAAO,EACPC,UAAU,EACVC,MAAM,EACNC,QAAQ,EACRjqB,MAAM,EACNkqB,UAAU,EACV7d,KAAK,EACL8d,SAAS,EACT1X,QAAQ,EACR2X,SAAS,EACTC,SAAS,EACTC,SAAS,EACTC,SAAS,EACTC,SAAS,EACTC,WAAW,EACXC,aAAa,EACbC,SAAS,EACTC,SAAS,EACTC,eAAe,EACfC,WAAW,EACXC,SAAS,EACTC,OAAO,GACL/pB,GAAOskB,MAAM2C,SAEhBjnB,GAAOsB,KAAM,CAAEoP,MAAO,UAAWsZ,KAAM,YAAc,SAAUtrB,EAAMkmB,GAEpE,SAASqF,EAAoB3D,GAC5B,GAAK3pB,EAASutB,aAAe,CAS5B,IAAItE,EAASpH,EAASzd,IAAKhE,KAAM,UAChCunB,EAAQtkB,GAAOskB,MAAMkC,IAAKF,GAC3BhC,EAAM5lB,KAA4B,YAArB4nB,EAAY5nB,KAAqB,QAAU,OACxD4lB,EAAM6D,aAAc,EAGpBvC,EAAQU,GAMHhC,EAAM3hB,SAAW2hB,EAAMsC,eAK3BhB,EAAQtB,QAMTtkB,GAAOskB,MAAM6F,SAAUvF,EAAc0B,EAAY3jB,OAChD3C,GAAOskB,MAAMkC,IAAKF,IAIrBtmB,GAAOskB,MAAMxJ,QAASpc,GAAS,CAG9BunB,MAAO,WAEN,IAAImE,EAOJ,GAFA5F,GAAgBznB,KAAM2B,GAAM,IAEvB/B,EAASutB,aAcb,OAAO,GARPE,EAAW5L,EAASzd,IAAKhE,KAAM6nB,KAE9B7nB,KAAKuP,iBAAkBsY,EAAcqF,GAEtCzL,EAASJ,IAAKrhB,KAAM6nB,GAAgBwF,GAAY,GAAM,IAOxDpF,QAAS,WAMR,OAHAR,GAAgBznB,KAAM2B,IAGf,GAGR0nB,SAAU,WACT,IAAIgE,EAEJ,IAAKztB,EAASutB,aAWb,OAAO,GAVPE,EAAW5L,EAASzd,IAAKhE,KAAM6nB,GAAiB,GAK/CpG,EAASJ,IAAKrhB,KAAM6nB,EAAcwF,IAHlCrtB,KAAK4f,oBAAqBiI,EAAcqF,GACxCzL,EAASlF,OAAQvc,KAAM6nB,KAa1BlC,SAAU,SAAU4B,GACnB,OAAO9F,EAASzd,IAAKujB,EAAM3hB,OAAQjE,IAGpCkmB,aAAcA,GAef5kB,GAAOskB,MAAMxJ,QAAS8J,GAAiB,CACtCqB,MAAO,WAIN,IAAIhnB,EAAMlC,KAAKwH,eAAiBxH,KAAKJ,UAAYI,KAChDstB,EAAa1tB,EAASutB,aAAentB,KAAOkC,EAC5CmrB,EAAW5L,EAASzd,IAAKspB,EAAYzF,GAMhCwF,IACAztB,EAASutB,aACbntB,KAAKuP,iBAAkBsY,EAAcqF,GAErChrB,EAAIqN,iBAAkB5N,EAAMurB,GAAoB,IAGlDzL,EAASJ,IAAKiM,EAAYzF,GAAgBwF,GAAY,GAAM,IAE7DhE,SAAU,WACT,IAAInnB,EAAMlC,KAAKwH,eAAiBxH,KAAKJ,UAAYI,KAChDstB,EAAa1tB,EAASutB,aAAentB,KAAOkC,EAC5CmrB,EAAW5L,EAASzd,IAAKspB,EAAYzF,GAAiB,EAEjDwF,EAQL5L,EAASJ,IAAKiM,EAAYzF,EAAcwF,IAPnCztB,EAASutB,aACbntB,KAAK4f,oBAAqBiI,EAAcqF,GAExChrB,EAAI0d,oBAAqBje,EAAMurB,GAAoB,GAEpDzL,EAASlF,OAAQ+Q,EAAYzF,QAgBjC5kB,GAAOsB,KAAM,CACZgpB,WAAY,YACZC,WAAY,WACZC,aAAc,cACdC,aAAc,cACZ,SAAUC,EAAMlE,GAClBxmB,GAAOskB,MAAMxJ,QAAS4P,GAAS,CAC9B9F,aAAc4B,EACdT,SAAUS,EAEVZ,OAAQ,SAAUtB,GACjB,IAAInjB,EAEHwpB,EAAUrG,EAAMyD,cAChBzC,EAAYhB,EAAMgB,UASnB,OALMqF,IAAaA,IANT5tB,MAMgCiD,GAAOwF,SANvCzI,KAMyD4tB,MAClErG,EAAM5lB,KAAO4mB,EAAUG,SACvBtkB,EAAMmkB,EAAUzK,QAAQnd,MAAOX,KAAM0E,WACrC6iB,EAAM5lB,KAAO8nB,GAEPrlB,MAKVnB,GAAOG,GAAGmC,OAAQ,CAEjB4hB,GAAI,SAAUC,EAAOlkB,EAAUoe,EAAMle,GACpC,OAAO+jB,GAAInnB,KAAMonB,EAAOlkB,EAAUoe,EAAMle,IAEzCikB,IAAK,SAAUD,EAAOlkB,EAAUoe,EAAMle,GACrC,OAAO+jB,GAAInnB,KAAMonB,EAAOlkB,EAAUoe,EAAMle,EAAI,IAE7CokB,IAAK,SAAUJ,EAAOlkB,EAAUE,GAC/B,IAAImlB,EAAW5mB,EACf,GAAKylB,GAASA,EAAMY,gBAAkBZ,EAAMmB,UAW3C,OARAA,EAAYnB,EAAMmB,UAClBtlB,GAAQmkB,EAAMsC,gBAAiBlC,IAC9Be,EAAUlhB,UACTkhB,EAAUG,SAAW,IAAMH,EAAUlhB,UACrCkhB,EAAUG,SACXH,EAAUrlB,SACVqlB,EAAUzK,SAEJ9d,KAER,GAAsB,iBAAVonB,EAAqB,CAGhC,IAAMzlB,KAAQylB,EACbpnB,KAAKwnB,IAAK7lB,EAAMuB,EAAUkkB,EAAOzlB,IAElC,OAAO3B,KAWR,OATkB,IAAbkD,GAA0C,mBAAbA,IAGjCE,EAAKF,EACLA,OAAW+C,IAEA,IAAP7C,IACJA,EAAK8jB,IAEClnB,KAAKuE,KAAM,WACjBtB,GAAOskB,MAAMhL,OAAQvc,KAAMonB,EAAOhkB,EAAIF,QAMzC,IAKC2qB,GAAe,wBAGfC,GAAW,oCAEXC,GAAe,6BAGhB,SAASC,GAAoBvqB,EAAMiX,GAClC,OAAKlX,GAAUC,EAAM,UACpBD,GAA+B,KAArBkX,EAAQnZ,SAAkBmZ,EAAUA,EAAQhI,WAAY,OAE3DzP,GAAQQ,GAAO+V,SAAU,SAAW,IAGrC/V,EAIR,SAASwqB,GAAexqB,GAEvB,OADAA,EAAK9B,MAAyC,OAAhC8B,EAAKjB,aAAc,SAAsB,IAAMiB,EAAK9B,KAC3D8B,EAER,SAASyqB,GAAezqB,GAOvB,MAN2C,WAApCA,EAAK9B,MAAQ,IAAKrB,MAAO,EAAG,GAClCmD,EAAK9B,KAAO8B,EAAK9B,KAAKrB,MAAO,GAE7BmD,EAAKwK,gBAAiB,QAGhBxK,EAGR,SAAS0qB,GAAgBvsB,EAAKwsB,GAC7B,IAAIjsB,EAAG2X,EAAGnY,EAAgB0sB,EAAUC,EAAUjG,EAE9C,GAAuB,IAAlB+F,EAAK7sB,SAAV,CAKA,GAAKkgB,EAASD,QAAS5f,KAEtBymB,EADW5G,EAASzd,IAAKpC,GACPymB,QAKjB,IAAM1mB,KAFN8f,EAASlF,OAAQ6R,EAAM,iBAET/F,EACb,IAAMlmB,EAAI,EAAG2X,EAAIuO,EAAQ1mB,GAAO4B,OAAQpB,EAAI2X,EAAG3X,IAC9Cc,GAAOskB,MAAMrN,IAAKkU,EAAMzsB,EAAM0mB,EAAQ1mB,GAAQQ,IAO7Cuf,EAASF,QAAS5f,KACtBysB,EAAW3M,EAASzB,OAAQre,GAC5B0sB,EAAWrrB,GAAOsC,OAAQ,GAAI8oB,GAE9B3M,EAASL,IAAK+M,EAAME,KAkBtB,SAASC,GAAUC,EAAY3b,EAAMrO,EAAUiiB,GAG9C5T,EAAOtS,EAAMsS,GAEb,IAAI+T,EAAUjiB,EAAO4hB,EAASkI,EAAYxsB,EAAMC,EAC/CC,EAAI,EACJ2X,EAAI0U,EAAWjrB,OACfmrB,EAAW5U,EAAI,EACf/R,EAAQ8K,EAAM,GACd8b,EAAkBttB,EAAY0G,GAG/B,GAAK4mB,GACG,EAAJ7U,GAA0B,iBAAV/R,IAChB3G,GAAQ6jB,YAAc6I,GAASrmB,KAAMM,GACxC,OAAOymB,EAAWjqB,KAAM,SAAUyV,GACjC,IAAId,EAAOsV,EAAW5pB,GAAIoV,GACrB2U,IACJ9b,EAAM,GAAM9K,EAAMtH,KAAMT,KAAMga,EAAOd,EAAK0V,SAE3CL,GAAUrV,EAAMrG,EAAMrO,EAAUiiB,KAIlC,GAAK3M,IAEJnV,GADAiiB,EAAWN,GAAezT,EAAM2b,EAAY,GAAIhnB,eAAe,EAAOgnB,EAAY/H,IACjE/T,WAEmB,IAA/BkU,EAASla,WAAWnJ,SACxBqjB,EAAWjiB,GAIPA,GAAS8hB,GAAU,CAOvB,IALAgI,GADAlI,EAAUtjB,GAAOwB,IAAKmhB,GAAQgB,EAAU,UAAYqH,KAC/B1qB,OAKbpB,EAAI2X,EAAG3X,IACdF,EAAO2kB,EAEFzkB,IAAMusB,IACVzsB,EAAOgB,GAAO0C,MAAO1D,GAAM,GAAM,GAG5BwsB,GAIJxrB,GAAOoB,MAAOkiB,EAASX,GAAQ3jB,EAAM,YAIvCuC,EAAS/D,KAAM+tB,EAAYrsB,GAAKF,EAAME,GAGvC,GAAKssB,EAOJ,IANAvsB,EAAMqkB,EAASA,EAAQhjB,OAAS,GAAIiE,cAGpCvE,GAAOwB,IAAK8hB,EAAS2H,IAGf/rB,EAAI,EAAGA,EAAIssB,EAAYtsB,IAC5BF,EAAOskB,EAASpkB,GACX4iB,GAAYtd,KAAMxF,EAAKN,MAAQ,MAClC8f,EAASxB,OAAQhe,EAAM,eACxBgB,GAAOwF,SAAUvG,EAAKD,KAEjBA,EAAKL,KAA8C,YAArCK,EAAKN,MAAQ,IAAKgC,cAG/BV,GAAO4rB,WAAa5sB,EAAKH,UAC7BmB,GAAO4rB,SAAU5sB,EAAKL,IAAK,CAC1BC,MAAOI,EAAKJ,OAASI,EAAKO,aAAc,UACtCN,GASJH,EAASE,EAAK6E,YAAYT,QAAS0nB,GAAc,IAAM9rB,EAAMC,IAQnE,OAAOssB,EAGR,SAASjS,GAAQ9Y,EAAMP,EAAU4rB,GAKhC,IAJA,IAAI7sB,EACH4kB,EAAQ3jB,EAAWD,GAAO4M,OAAQ3M,EAAUO,GAASA,EACrDtB,EAAI,EAE4B,OAAvBF,EAAO4kB,EAAO1kB,IAAeA,IAChC2sB,GAA8B,IAAlB7sB,EAAKV,UACtB0B,GAAO8rB,UAAWnJ,GAAQ3jB,IAGtBA,EAAKW,aACJksB,GAAY3L,EAAYlhB,IAC5B4jB,GAAeD,GAAQ3jB,EAAM,WAE9BA,EAAKW,WAAWC,YAAaZ,IAI/B,OAAOwB,EAGRR,GAAOsC,OAAQ,CACduhB,cAAe,SAAU8H,GACxB,OAAOA,GAGRjpB,MAAO,SAAUlC,EAAMurB,EAAeC,GACrC,IAAI9sB,EAAG2X,EAAGoV,EAAaC,EA1INvtB,EAAKwsB,EACnB5qB,EA0IFmC,EAAQlC,EAAKyhB,WAAW,GACxBkK,EAASjM,EAAY1f,GAGtB,KAAMrC,GAAQ+jB,gBAAsC,IAAlB1hB,EAAKlC,UAAoC,KAAlBkC,EAAKlC,UAC3D0B,GAAOmE,SAAU3D,IAOnB,IAHA0rB,EAAevJ,GAAQjgB,GAGjBxD,EAAI,EAAG2X,GAFboV,EAActJ,GAAQniB,IAEOF,OAAQpB,EAAI2X,EAAG3X,IAvJ5BP,EAwJLstB,EAAa/sB,GAxJHisB,EAwJQe,EAAchtB,QAvJzCqB,EAGc,WAHdA,EAAW4qB,EAAK5qB,SAASG,gBAGAkhB,GAAepd,KAAM7F,EAAID,MACrDysB,EAAKja,QAAUvS,EAAIuS,QAGK,UAAb3Q,GAAqC,aAAbA,IACnC4qB,EAAKhJ,aAAexjB,EAAIwjB,cAoJxB,GAAK4J,EACJ,GAAKC,EAIJ,IAHAC,EAAcA,GAAetJ,GAAQniB,GACrC0rB,EAAeA,GAAgBvJ,GAAQjgB,GAEjCxD,EAAI,EAAG2X,EAAIoV,EAAY3rB,OAAQpB,EAAI2X,EAAG3X,IAC3CgsB,GAAgBe,EAAa/sB,GAAKgtB,EAAchtB,SAGjDgsB,GAAgB1qB,EAAMkC,GAWxB,OAL2B,GAD3BwpB,EAAevJ,GAAQjgB,EAAO,WACZpC,QACjBsiB,GAAesJ,GAAeC,GAAUxJ,GAAQniB,EAAM,WAIhDkC,GAGRopB,UAAW,SAAU5qB,GAKpB,IAJA,IAAImd,EAAM7d,EAAM9B,EACfoc,EAAU9a,GAAOskB,MAAMxJ,QACvB5b,EAAI,OAE6B8D,KAAxBxC,EAAOU,EAAOhC,IAAqBA,IAC5C,GAAK4e,EAAYtd,GAAS,CACzB,GAAO6d,EAAO7d,EAAMge,EAASvb,SAAc,CAC1C,GAAKob,EAAK+G,OACT,IAAM1mB,KAAQ2f,EAAK+G,OACbtK,EAASpc,GACbsB,GAAOskB,MAAMhL,OAAQ9Y,EAAM9B,GAI3BsB,GAAOqmB,YAAa7lB,EAAM9B,EAAM2f,EAAKuH,QAOxCplB,EAAMge,EAASvb,cAAYD,EAEvBxC,EAAMie,EAASxb,WAInBzC,EAAMie,EAASxb,cAAYD,OAOhChD,GAAOG,GAAGmC,OAAQ,CACjB8pB,OAAQ,SAAUnsB,GACjB,OAAOqZ,GAAQvc,KAAMkD,GAAU,IAGhCqZ,OAAQ,SAAUrZ,GACjB,OAAOqZ,GAAQvc,KAAMkD,IAGtBX,KAAM,SAAUwF,GACf,OAAOkY,EAAQjgB,KAAM,SAAU+H,GAC9B,YAAiB9B,IAAV8B,EACN9E,GAAOV,KAAMvC,MACbA,KAAKsU,QAAQ/P,KAAM,WACK,IAAlBvE,KAAKuB,UAAoC,KAAlBvB,KAAKuB,UAAqC,IAAlBvB,KAAKuB,WACxDvB,KAAK8G,YAAciB,MAGpB,KAAMA,EAAOrD,UAAUnB,SAG3B+rB,OAAQ,WACP,OAAOf,GAAUvuB,KAAM0E,UAAW,SAAUjB,GACpB,IAAlBzD,KAAKuB,UAAoC,KAAlBvB,KAAKuB,UAAqC,IAAlBvB,KAAKuB,UAC3CysB,GAAoBhuB,KAAMyD,GAChCd,YAAac,MAKvB8rB,QAAS,WACR,OAAOhB,GAAUvuB,KAAM0E,UAAW,SAAUjB,GAC3C,GAAuB,IAAlBzD,KAAKuB,UAAoC,KAAlBvB,KAAKuB,UAAqC,IAAlBvB,KAAKuB,SAAiB,CACzE,IAAIqE,EAASooB,GAAoBhuB,KAAMyD,GACvCmC,EAAO4pB,aAAc/rB,EAAMmC,EAAO8M,gBAKrC+c,OAAQ,WACP,OAAOlB,GAAUvuB,KAAM0E,UAAW,SAAUjB,GACtCzD,KAAK4C,YACT5C,KAAK4C,WAAW4sB,aAAc/rB,EAAMzD,SAKvC0vB,MAAO,WACN,OAAOnB,GAAUvuB,KAAM0E,UAAW,SAAUjB,GACtCzD,KAAK4C,YACT5C,KAAK4C,WAAW4sB,aAAc/rB,EAAMzD,KAAKuU,gBAK5CD,MAAO,WAIN,IAHA,IAAI7Q,EACHtB,EAAI,EAE2B,OAAtBsB,EAAOzD,KAAMmC,IAAeA,IACd,IAAlBsB,EAAKlC,WAGT0B,GAAO8rB,UAAWnJ,GAAQniB,GAAM,IAGhCA,EAAKqD,YAAc,IAIrB,OAAO9G,MAGR2F,MAAO,SAAUqpB,EAAeC,GAI/B,OAHAD,EAAiC,MAAjBA,GAAgCA,EAChDC,EAAyC,MAArBA,EAA4BD,EAAgBC,EAEzDjvB,KAAKyE,IAAK,WAChB,OAAOxB,GAAO0C,MAAO3F,KAAMgvB,EAAeC,MAI5CL,KAAM,SAAU7mB,GACf,OAAOkY,EAAQjgB,KAAM,SAAU+H,GAC9B,IAAItE,EAAOzD,KAAM,IAAO,GACvBmC,EAAI,EACJ2X,EAAI9Z,KAAKuD,OAEV,QAAe0C,IAAV8B,GAAyC,IAAlBtE,EAAKlC,SAChC,OAAOkC,EAAK0M,UAIb,GAAsB,iBAAVpI,IAAuB8lB,GAAapmB,KAAMM,KACpDud,IAAWR,GAASzX,KAAMtF,IAAW,CAAE,GAAI,KAAQ,GAAIpE,eAAkB,CAE1EoE,EAAQ9E,GAAO6jB,cAAe/e,GAE9B,IACC,KAAQ5F,EAAI2X,EAAG3X,IAIS,KAHvBsB,EAAOzD,KAAMmC,IAAO,IAGVZ,WACT0B,GAAO8rB,UAAWnJ,GAAQniB,GAAM,IAChCA,EAAK0M,UAAYpI,GAInBtE,EAAO,EAGN,MAAQkJ,KAGNlJ,GACJzD,KAAKsU,QAAQgb,OAAQvnB,IAEpB,KAAMA,EAAOrD,UAAUnB,SAG3BosB,YAAa,WACZ,IAAIlJ,EAAU,GAGd,OAAO8H,GAAUvuB,KAAM0E,UAAW,SAAUjB,GAC3C,IAAI8O,EAASvS,KAAK4C,WAEbK,GAAOkE,QAASnH,KAAMymB,GAAY,IACtCxjB,GAAO8rB,UAAWnJ,GAAQ5lB,OACrBuS,GACJA,EAAOqd,aAAcnsB,EAAMzD,QAK3BymB,MAILxjB,GAAOsB,KAAM,CACZsrB,SAAU,SACVC,UAAW,UACXN,aAAc,SACdO,YAAa,QACbC,WAAY,eACV,SAAUtsB,EAAMusB,GAClBhtB,GAAOG,GAAIM,GAAS,SAAUR,GAO7B,IANA,IAAIiB,EACHC,EAAM,GACN8rB,EAASjtB,GAAQC,GACjB2B,EAAOqrB,EAAO3sB,OAAS,EACvBpB,EAAI,EAEGA,GAAK0C,EAAM1C,IAClBgC,EAAQhC,IAAM0C,EAAO7E,KAAOA,KAAK2F,OAAO,GACxC1C,GAAQitB,EAAQ/tB,IAAO8tB,GAAY9rB,GAInCvD,EAAKD,MAAOyD,EAAKD,EAAMH,OAGxB,OAAOhE,KAAKkE,UAAWE,MAGzB,IAAI+rB,GAAY,IAAI3nB,OAAQ,KAAOua,EAAO,kBAAmB,KAEzDqN,GAAc,MAGdC,GAAY,SAAU5sB,GAKxB,IAAIuoB,EAAOvoB,EAAK+D,cAAc6H,YAM9B,OAJM2c,GAASA,EAAKsE,SACnBtE,EAAOjsB,IAGDisB,EAAKuE,iBAAkB9sB,IAG5B+sB,GAAO,SAAU/sB,EAAM+B,EAAShB,GACnC,IAAIJ,EAAKV,EACR+sB,EAAM,GAGP,IAAM/sB,KAAQ8B,EACbirB,EAAK/sB,GAASD,EAAK8f,MAAO7f,GAC1BD,EAAK8f,MAAO7f,GAAS8B,EAAS9B,GAM/B,IAAMA,KAHNU,EAAMI,EAAS/D,KAAMgD,GAGP+B,EACb/B,EAAK8f,MAAO7f,GAAS+sB,EAAK/sB,GAG3B,OAAOU,GAIJssB,GAAY,IAAIloB,OAAQ0a,EAAUpV,KAAM,KAAO,KAiJnD,SAAS6iB,GAAQltB,EAAMC,EAAMktB,GAC5B,IAAIC,EAAOC,EAAUC,EAAU3sB,EAC9B4sB,EAAeZ,GAAY3oB,KAAM/D,GAMjC6f,EAAQ9f,EAAK8f,MAoEd,OAlEAqN,EAAWA,GAAYP,GAAW5sB,MAgBjCW,EAAMwsB,EAASK,iBAAkBvtB,IAAUktB,EAAUltB,GAEhDstB,GAAgB5sB,IAkBpBA,EAAMA,EAAIiC,QAASkC,GAAU,YAAUtC,GAG3B,KAAR7B,GAAe+e,EAAY1f,KAC/BW,EAAMnB,GAAOsgB,MAAO9f,EAAMC,KAQrBtC,GAAQ8vB,kBAAoBf,GAAU1oB,KAAMrD,IAASssB,GAAUjpB,KAAM/D,KAG1EmtB,EAAQtN,EAAMsN,MACdC,EAAWvN,EAAMuN,SACjBC,EAAWxN,EAAMwN,SAGjBxN,EAAMuN,SAAWvN,EAAMwN,SAAWxN,EAAMsN,MAAQzsB,EAChDA,EAAMwsB,EAASC,MAGftN,EAAMsN,MAAQA,EACdtN,EAAMuN,SAAWA,EACjBvN,EAAMwN,SAAWA,SAIJ9qB,IAAR7B,EAINA,EAAM,GACNA,EAIF,SAAS+sB,GAAcC,EAAaC,GAGnC,MAAO,CACNrtB,IAAK,WACJ,IAAKotB,IASL,OAASpxB,KAAKgE,IAAMqtB,GAAS1wB,MAAOX,KAAM0E,kBALlC1E,KAAKgE,OA3OhB,WAIC,SAASstB,IAGR,GAAM1M,EAAN,CAIA2M,EAAUhO,MAAMiO,QAAU,+EAE1B5M,EAAIrB,MAAMiO,QACT,4HAGDzqB,EAAgBpE,YAAa4uB,GAAY5uB,YAAaiiB,GAEtD,IAAI6M,EAAW1xB,GAAOwwB,iBAAkB3L,GACxC8M,EAAoC,OAAjBD,EAASniB,IAG5BqiB,EAAsE,KAA9CC,EAAoBH,EAASI,YAIrDjN,EAAIrB,MAAMuO,MAAQ,MAClBC,EAA6D,KAAzCH,EAAoBH,EAASK,OAIjDE,EAAgE,KAAzCJ,EAAoBH,EAASZ,OAMpDjM,EAAIrB,MAAM0O,SAAW,WACrBC,EAAiE,KAA9CN,EAAoBhN,EAAIuN,YAAc,GAEzDprB,EAAgBlE,YAAa0uB,GAI7B3M,EAAM,MAGP,SAASgN,EAAoBQ,GAC5B,OAAOjsB,KAAKksB,MAAOC,WAAYF,IAGhC,IAAIV,EAAkBM,EAAsBE,EAAkBH,EAC7DQ,EAAyBZ,EACzBJ,EAAY3xB,EAAS0C,cAAe,OACpCsiB,EAAMhlB,EAAS0C,cAAe,OAGzBsiB,EAAIrB,QAMVqB,EAAIrB,MAAMiP,eAAiB,cAC3B5N,EAAIM,WAAW,GAAO3B,MAAMiP,eAAiB,GAC7CpxB,GAAQqxB,gBAA+C,gBAA7B7N,EAAIrB,MAAMiP,eAEpCvvB,GAAOsC,OAAQnE,GAAS,CACvBsxB,kBAAmB,WAElB,OADApB,IACOU,GAERd,eAAgB,WAEf,OADAI,IACOS,GAERY,cAAe,WAEd,OADArB,IACOI,GAERkB,mBAAoB,WAEnB,OADAtB,IACOK,GAERkB,cAAe,WAEd,OADAvB,IACOY,GAYRY,qBAAsB,WACrB,IAAIC,EAAOtN,EAAIuN,EAASC,EAmCxB,OAlCgC,MAA3BV,IACJQ,EAAQnzB,EAAS0C,cAAe,SAChCmjB,EAAK7lB,EAAS0C,cAAe,MAC7B0wB,EAAUpzB,EAAS0C,cAAe,OAElCywB,EAAMxP,MAAMiO,QAAU,2DACtB/L,EAAGlC,MAAMiO,QAAU,0CAKnB/L,EAAGlC,MAAM2P,OAAS,MAClBF,EAAQzP,MAAM2P,OAAS,MAQvBF,EAAQzP,MAAMC,QAAU,QAExBzc,EACEpE,YAAaowB,GACbpwB,YAAa8iB,GACb9iB,YAAaqwB,GAEfC,EAAUlzB,GAAOwwB,iBAAkB9K,GACnC8M,EAA4BY,SAAUF,EAAQC,OAAQ,IACrDC,SAAUF,EAAQG,eAAgB,IAClCD,SAAUF,EAAQI,kBAAmB,MAAW5N,EAAG6N,aAEpDvsB,EAAgBlE,YAAakwB,IAEvBR,MAvIV,GAsPA,IAAIgB,GAAc,CAAE,SAAU,MAAO,MACpCC,GAAa5zB,EAAS0C,cAAe,OAAQihB,MAC7CkQ,GAAc,GAkBf,SAASC,GAAehwB,GACvB,IAAIiwB,EAAQ1wB,GAAO2wB,SAAUlwB,IAAU+vB,GAAa/vB,GAEpD,OAAKiwB,IAGAjwB,KAAQ8vB,GACL9vB,EAED+vB,GAAa/vB,GAxBrB,SAAyBA,GAGxB,IAAImwB,EAAUnwB,EAAM,GAAIkd,cAAgBld,EAAKpD,MAAO,GACnD6B,EAAIoxB,GAAYhwB,OAEjB,MAAQpB,IAEP,IADAuB,EAAO6vB,GAAapxB,GAAM0xB,KACbL,GACZ,OAAO9vB,EAeoBowB,CAAgBpwB,IAAUA,GAIxD,IAKCqwB,GAAe,4BACfC,GAAU,CAAE/B,SAAU,WAAYgC,WAAY,SAAUzQ,QAAS,SACjE0Q,GAAqB,CACpBC,cAAe,IACfC,WAAY,OAGd,SAASC,GAAmBrvB,EAAO+C,EAAOusB,GAIzC,IAAI1sB,EAAUqb,EAAQ5V,KAAMtF,GAC5B,OAAOH,EAGNzB,KAAKouB,IAAK,EAAG3sB,EAAS,IAAQ0sB,GAAY,KAAU1sB,EAAS,IAAO,MACpEG,EAGF,SAASysB,GAAoB/wB,EAAMgxB,EAAWC,EAAKC,EAAaC,EAAQC,GACvE,IAAI1yB,EAAkB,UAAdsyB,EAAwB,EAAI,EACnCK,EAAQ,EACRC,EAAQ,EACRC,EAAc,EAGf,GAAKN,KAAUC,EAAc,SAAW,WACvC,OAAO,EAGR,KAAQxyB,EAAI,EAAGA,GAAK,EAKN,WAARuyB,IACJM,GAAe/xB,GAAOwgB,IAAKhgB,EAAMixB,EAAMxR,EAAW/gB,IAAK,EAAMyyB,IAIxDD,GAmBQ,YAARD,IACJK,GAAS9xB,GAAOwgB,IAAKhgB,EAAM,UAAYyf,EAAW/gB,IAAK,EAAMyyB,IAIjD,WAARF,IACJK,GAAS9xB,GAAOwgB,IAAKhgB,EAAM,SAAWyf,EAAW/gB,GAAM,SAAS,EAAMyyB,MAtBvEG,GAAS9xB,GAAOwgB,IAAKhgB,EAAM,UAAYyf,EAAW/gB,IAAK,EAAMyyB,GAGhD,YAARF,EACJK,GAAS9xB,GAAOwgB,IAAKhgB,EAAM,SAAWyf,EAAW/gB,GAAM,SAAS,EAAMyyB,GAItEE,GAAS7xB,GAAOwgB,IAAKhgB,EAAM,SAAWyf,EAAW/gB,GAAM,SAAS,EAAMyyB,IAoCzE,OAhBMD,GAA8B,GAAfE,IAIpBE,GAAS5uB,KAAKouB,IAAK,EAAGpuB,KAAK8uB,KAC1BxxB,EAAM,SAAWgxB,EAAW,GAAI7T,cAAgB6T,EAAUn0B,MAAO,IACjEu0B,EACAE,EACAD,EACA,MAIM,GAGDC,EAAQC,EAGhB,SAASE,GAAkBzxB,EAAMgxB,EAAWK,GAG3C,IAAIF,EAASvE,GAAW5sB,GAKvBkxB,IADmBvzB,GAAQsxB,qBAAuBoC,IAEE,eAAnD7xB,GAAOwgB,IAAKhgB,EAAM,aAAa,EAAOmxB,GACvCO,EAAmBR,EAEnBvyB,EAAMuuB,GAAQltB,EAAMgxB,EAAWG,GAC/BQ,EAAa,SAAWX,EAAW,GAAI7T,cAAgB6T,EAAUn0B,MAAO,GAIzE,GAAK6vB,GAAU1oB,KAAMrF,GAAQ,CAC5B,IAAM0yB,EACL,OAAO1yB,EAERA,EAAM,OAyCP,QAlCQhB,GAAQsxB,qBAAuBiC,IAMrCvzB,GAAQ0xB,wBAA0BtvB,GAAUC,EAAM,OAI3C,SAARrB,IAICkwB,WAAYlwB,IAA0D,WAAjDa,GAAOwgB,IAAKhgB,EAAM,WAAW,EAAOmxB,KAG1DnxB,EAAK4xB,iBAAiB9xB,SAEtBoxB,EAAiE,eAAnD1xB,GAAOwgB,IAAKhgB,EAAM,aAAa,EAAOmxB,IAKpDO,EAAmBC,KAAc3xB,KAEhCrB,EAAMqB,EAAM2xB,MAKdhzB,EAAMkwB,WAAYlwB,IAAS,GAI1BoyB,GACC/wB,EACAgxB,EACAK,IAAWH,EAAc,SAAW,WACpCQ,EACAP,EAGAxyB,GAEE,KAwTL,SAASkzB,GAAO7xB,EAAM+B,EAAS+b,EAAMnc,EAAKmwB,GACzC,OAAO,IAAID,GAAM1xB,UAAUP,KAAMI,EAAM+B,EAAS+b,EAAMnc,EAAKmwB,GAtT5DtyB,GAAOsC,OAAQ,CAIdiwB,SAAU,CACTC,QAAS,CACRzxB,IAAK,SAAUP,EAAMmtB,GACpB,GAAKA,EAAW,CAGf,IAAIxsB,EAAMusB,GAAQltB,EAAM,WACxB,MAAe,KAARW,EAAa,IAAMA,MAO9B+f,UAAW,CACVuR,yBAAyB,EACzBC,aAAa,EACbC,kBAAkB,EAClBC,aAAa,EACbC,UAAU,EACVC,YAAY,EACZ3B,YAAY,EACZ4B,UAAU,EACVC,YAAY,EACZC,eAAe,EACfC,iBAAiB,EACjBC,SAAS,EACTC,YAAY,EACZC,cAAc,EACdC,YAAY,EACZd,SAAS,EACTe,OAAO,EACPC,SAAS,EACT3S,OAAO,EACP4S,QAAQ,EACRC,QAAQ,EACRC,MAAM,EAGNC,aAAa,EACbC,cAAc,EACdC,aAAa,EACbC,kBAAkB,EAClBC,eAAe,GAKhBrD,SAAU,GAGVrQ,MAAO,SAAU9f,EAAMC,EAAMqE,EAAO+sB,GAGnC,GAAMrxB,GAA0B,IAAlBA,EAAKlC,UAAoC,IAAlBkC,EAAKlC,UAAmBkC,EAAK8f,MAAlE,CAKA,IAAInf,EAAKzC,EAAM2gB,EACd4U,EAAWrW,EAAWnd,GACtBstB,EAAeZ,GAAY3oB,KAAM/D,GACjC6f,EAAQ9f,EAAK8f,MAad,GARMyN,IACLttB,EAAOgwB,GAAewD,IAIvB5U,EAAQrf,GAAOuyB,SAAU9xB,IAAUT,GAAOuyB,SAAU0B,QAGrCjxB,IAAV8B,EA0CJ,OAAKua,GAAS,QAASA,QACwBrc,KAA5C7B,EAAMke,EAAMte,IAAKP,GAAM,EAAOqxB,IAEzB1wB,EAIDmf,EAAO7f,GA7CA,YAHd/B,SAAcoG,KAGc3D,EAAM6e,EAAQ5V,KAAMtF,KAAa3D,EAAK,KACjE2D,EAAQ2b,GAAWjgB,EAAMC,EAAMU,GAG/BzC,EAAO,UAIM,MAAToG,GAAiBA,GAAUA,IAOlB,WAATpG,GAAsBqvB,IAC1BjpB,GAAS3D,GAAOA,EAAK,KAASnB,GAAOkhB,UAAW+S,GAAa,GAAK,OAI7D91B,GAAQqxB,iBAA6B,KAAV1qB,GAAiD,IAAjCrE,EAAK7C,QAAS,gBAC9D0iB,EAAO7f,GAAS,WAIX4e,GAAY,QAASA,QACsBrc,KAA9C8B,EAAQua,EAAMjB,IAAK5d,EAAMsE,EAAO+sB,MAE7B9D,EACJzN,EAAM4T,YAAazzB,EAAMqE,GAEzBwb,EAAO7f,GAASqE,MAkBpB0b,IAAK,SAAUhgB,EAAMC,EAAMoxB,EAAOF,GACjC,IAAIxyB,EAAK6B,EAAKqe,EACb4U,EAAWrW,EAAWnd,GA6BvB,OA5BgB0sB,GAAY3oB,KAAM/D,KAMjCA,EAAOgwB,GAAewD,KAIvB5U,EAAQrf,GAAOuyB,SAAU9xB,IAAUT,GAAOuyB,SAAU0B,KAGtC,QAAS5U,IACtBlgB,EAAMkgB,EAAMte,IAAKP,GAAM,EAAMqxB,SAIjB7uB,IAAR7D,IACJA,EAAMuuB,GAAQltB,EAAMC,EAAMkxB,IAId,WAARxyB,GAAoBsB,KAAQwwB,KAChC9xB,EAAM8xB,GAAoBxwB,IAIZ,KAAVoxB,GAAgBA,GACpB7wB,EAAMquB,WAAYlwB,IACD,IAAV0yB,GAAkBsC,SAAUnzB,GAAQA,GAAO,EAAI7B,GAGhDA,KAITa,GAAOsB,KAAM,CAAE,SAAU,SAAW,SAAU6D,EAAIqsB,GACjDxxB,GAAOuyB,SAAUf,GAAc,CAC9BzwB,IAAK,SAAUP,EAAMmtB,EAAUkE,GAC9B,GAAKlE,EAIJ,OAAOmD,GAAatsB,KAAMxE,GAAOwgB,IAAKhgB,EAAM,aAQxCA,EAAK4xB,iBAAiB9xB,QAAWE,EAAK4zB,wBAAwBxG,MAIjEqE,GAAkBzxB,EAAMgxB,EAAWK,GAHnCtE,GAAM/sB,EAAMuwB,GAAS,WACpB,OAAOkB,GAAkBzxB,EAAMgxB,EAAWK,MAM9CzT,IAAK,SAAU5d,EAAMsE,EAAO+sB,GAC3B,IAAIltB,EACHgtB,EAASvE,GAAW5sB,GAIpB6zB,GAAsBl2B,GAAQyxB,iBACT,aAApB+B,EAAO3C,SAIR0C,GADkB2C,GAAsBxC,IAEY,eAAnD7xB,GAAOwgB,IAAKhgB,EAAM,aAAa,EAAOmxB,GACvCN,EAAWQ,EACVN,GACC/wB,EACAgxB,EACAK,EACAH,EACAC,GAED,EAqBF,OAjBKD,GAAe2C,IACnBhD,GAAYnuB,KAAK8uB,KAChBxxB,EAAM,SAAWgxB,EAAW,GAAI7T,cAAgB6T,EAAUn0B,MAAO,IACjEgyB,WAAYsC,EAAQH,IACpBD,GAAoB/wB,EAAMgxB,EAAW,UAAU,EAAOG,GACtD,KAKGN,IAAc1sB,EAAUqb,EAAQ5V,KAAMtF,KACb,QAA3BH,EAAS,IAAO,QAElBnE,EAAK8f,MAAOkR,GAAc1sB,EAC1BA,EAAQ9E,GAAOwgB,IAAKhgB,EAAMgxB,IAGpBJ,GAAmB5wB,EAAMsE,EAAOusB,OAK1CrxB,GAAOuyB,SAAS3D,WAAaV,GAAc/vB,GAAQwxB,mBAClD,SAAUnvB,EAAMmtB,GACf,GAAKA,EACJ,OAAS0B,WAAY3B,GAAQltB,EAAM,gBAClCA,EAAK4zB,wBAAwBE,KAC5B/G,GAAM/sB,EAAM,CAAEouB,WAAY,GAAK,WAC9B,OAAOpuB,EAAK4zB,wBAAwBE,QAEnC,OAMPt0B,GAAOsB,KAAM,CACZizB,OAAQ,GACRC,QAAS,GACTC,OAAQ,SACN,SAAUC,EAAQC,GACpB30B,GAAOuyB,SAAUmC,EAASC,GAAW,CACpCC,OAAQ,SAAU9vB,GAOjB,IANA,IAAI5F,EAAI,EACP21B,EAAW,GAGXC,EAAyB,iBAAVhwB,EAAqBA,EAAMI,MAAO,KAAQ,CAAEJ,GAEpD5F,EAAI,EAAGA,IACd21B,EAAUH,EAASzU,EAAW/gB,GAAMy1B,GACnCG,EAAO51B,IAAO41B,EAAO51B,EAAI,IAAO41B,EAAO,GAGzC,OAAOD,IAIO,WAAXH,IACJ10B,GAAOuyB,SAAUmC,EAASC,GAASvW,IAAMgT,MAI3CpxB,GAAOG,GAAGmC,OAAQ,CACjBke,IAAK,SAAU/f,EAAMqE,GACpB,OAAOkY,EAAQjgB,KAAM,SAAUyD,EAAMC,EAAMqE,GAC1C,IAAI6sB,EAAQ1vB,EACXT,EAAM,GACNtC,EAAI,EAEL,GAAK4D,MAAMC,QAAStC,GAAS,CAI5B,IAHAkxB,EAASvE,GAAW5sB,GACpByB,EAAMxB,EAAKH,OAEHpB,EAAI+C,EAAK/C,IAChBsC,EAAKf,EAAMvB,IAAQc,GAAOwgB,IAAKhgB,EAAMC,EAAMvB,IAAK,EAAOyyB,GAGxD,OAAOnwB,EAGR,YAAiBwB,IAAV8B,EACN9E,GAAOsgB,MAAO9f,EAAMC,EAAMqE,GAC1B9E,GAAOwgB,IAAKhgB,EAAMC,IACjBA,EAAMqE,EAA0B,EAAnBrD,UAAUnB,aAQ5BN,GAAOqyB,MAAQA,IAET1xB,UAAY,CACjBE,YAAawxB,GACbjyB,KAAM,SAAUI,EAAM+B,EAAS+b,EAAMnc,EAAKmwB,EAAQrR,GACjDlkB,KAAKyD,KAAOA,EACZzD,KAAKuhB,KAAOA,EACZvhB,KAAKu1B,OAASA,GAAUtyB,GAAOsyB,OAAO5P,SACtC3lB,KAAKwF,QAAUA,EACfxF,KAAKsS,MAAQtS,KAAKmrB,IAAMnrB,KAAK4Z,MAC7B5Z,KAAKoF,IAAMA,EACXpF,KAAKkkB,KAAOA,IAAUjhB,GAAOkhB,UAAW5C,GAAS,GAAK,OAEvD3H,IAAK,WACJ,IAAI0I,EAAQgT,GAAM0C,UAAWh4B,KAAKuhB,MAElC,OAAOe,GAASA,EAAMte,IACrBse,EAAMte,IAAKhE,MACXs1B,GAAM0C,UAAUrS,SAAS3hB,IAAKhE,OAEhCi4B,IAAK,SAAUC,GACd,IAAIC,EACH7V,EAAQgT,GAAM0C,UAAWh4B,KAAKuhB,MAoB/B,OAlBKvhB,KAAKwF,QAAQ4yB,SACjBp4B,KAAKq4B,IAAMF,EAAQl1B,GAAOsyB,OAAQv1B,KAAKu1B,QACtC2C,EAASl4B,KAAKwF,QAAQ4yB,SAAWF,EAAS,EAAG,EAAGl4B,KAAKwF,QAAQ4yB,UAG9Dp4B,KAAKq4B,IAAMF,EAAQD,EAEpBl4B,KAAKmrB,KAAQnrB,KAAKoF,IAAMpF,KAAKsS,OAAU6lB,EAAQn4B,KAAKsS,MAE/CtS,KAAKwF,QAAQ8yB,MACjBt4B,KAAKwF,QAAQ8yB,KAAK73B,KAAMT,KAAKyD,KAAMzD,KAAKmrB,IAAKnrB,MAGzCsiB,GAASA,EAAMjB,IACnBiB,EAAMjB,IAAKrhB,MAEXs1B,GAAM0C,UAAUrS,SAAStE,IAAKrhB,MAExBA,QAIOqD,KAAKO,UAAY0xB,GAAM1xB,WAEvC0xB,GAAM0C,UAAY,CACjBrS,SAAU,CACT3hB,IAAK,SAAU4f,GACd,IAAIhS,EAIJ,OAA6B,IAAxBgS,EAAMngB,KAAKlC,UACa,MAA5BqiB,EAAMngB,KAAMmgB,EAAMrC,OAAoD,MAAlCqC,EAAMngB,KAAK8f,MAAOK,EAAMrC,MACrDqC,EAAMngB,KAAMmgB,EAAMrC,OAO1B3P,EAAS3O,GAAOwgB,IAAKG,EAAMngB,KAAMmgB,EAAMrC,KAAM,MAGhB,SAAX3P,EAAwBA,EAAJ,GAEvCyP,IAAK,SAAUuC,GAKT3gB,GAAOs1B,GAAGD,KAAM1U,EAAMrC,MAC1Bte,GAAOs1B,GAAGD,KAAM1U,EAAMrC,MAAQqC,GACK,IAAxBA,EAAMngB,KAAKlC,WACtB0B,GAAOuyB,SAAU5R,EAAMrC,OAC6B,MAAnDqC,EAAMngB,KAAK8f,MAAOmQ,GAAe9P,EAAMrC,OAGxCqC,EAAMngB,KAAMmgB,EAAMrC,MAASqC,EAAMuH,IAFjCloB,GAAOsgB,MAAOK,EAAMngB,KAAMmgB,EAAMrC,KAAMqC,EAAMuH,IAAMvH,EAAMM,UAU5CsU,UAAYlD,GAAM0C,UAAUS,WAAa,CACxDpX,IAAK,SAAUuC,GACTA,EAAMngB,KAAKlC,UAAYqiB,EAAMngB,KAAKb,aACtCghB,EAAMngB,KAAMmgB,EAAMrC,MAASqC,EAAMuH,OAKpCloB,GAAOsyB,OAAS,CACfmD,OAAQ,SAAUC,GACjB,OAAOA,GAERC,MAAO,SAAUD,GAChB,MAAO,GAAMxyB,KAAK0yB,IAAKF,EAAIxyB,KAAK2yB,IAAO,GAExCnT,SAAU,SAGX1iB,GAAOs1B,GAAKjD,GAAM1xB,UAAUP,KAG5BJ,GAAOs1B,GAAGD,KAAO,GAKjB,IACCS,GAAOC,GAkrBH9oB,GAEH+oB,GAnrBDC,GAAW,yBACXC,GAAO,cAER,SAASC,KACHJ,MACqB,IAApBp5B,EAASy5B,QAAoBt5B,GAAOu5B,sBACxCv5B,GAAOu5B,sBAAuBF,IAE9Br5B,GAAO2e,WAAY0a,GAAUn2B,GAAOs1B,GAAGgB,UAGxCt2B,GAAOs1B,GAAGiB,QAKZ,SAASC,KAIR,OAHA15B,GAAO2e,WAAY,WAClBqa,QAAQ9yB,IAEA8yB,GAAQ7N,KAAKC,MAIvB,SAASuO,GAAO/3B,EAAMg4B,GACrB,IAAI3M,EACH7qB,EAAI,EACJggB,EAAQ,CAAE+Q,OAAQvxB,GAKnB,IADAg4B,EAAeA,EAAe,EAAI,EAC1Bx3B,EAAI,EAAGA,GAAK,EAAIw3B,EAEvBxX,EAAO,UADP6K,EAAQ9J,EAAW/gB,KACSggB,EAAO,UAAY6K,GAAUrrB,EAO1D,OAJKg4B,IACJxX,EAAMsT,QAAUtT,EAAM0O,MAAQlvB,GAGxBwgB,EAGR,SAASyX,GAAa7xB,EAAOwZ,EAAMsY,GAKlC,IAJA,IAAIjW,EACH4K,GAAesL,GAAUC,SAAUxY,IAAU,IAAK7gB,OAAQo5B,GAAUC,SAAU,MAC9E/f,EAAQ,EACRzW,EAASirB,EAAWjrB,OACbyW,EAAQzW,EAAQyW,IACvB,GAAO4J,EAAQ4K,EAAYxU,GAAQvZ,KAAMo5B,EAAWtY,EAAMxZ,GAGzD,OAAO6b,EAsNV,SAASkW,GAAWr2B,EAAMu2B,EAAYx0B,GACrC,IAAIoM,EACHqoB,EACAjgB,EAAQ,EACRzW,EAASu2B,GAAUI,WAAW32B,OAC9ByZ,EAAW/Z,GAAO0Z,WAAWI,OAAQ,kBAG7Byc,EAAK/1B,OAEb+1B,EAAO,WACN,GAAKS,EACJ,OAAO,EAYR,IAVA,IAAIE,EAAcpB,IAASU,KAC1B3a,EAAY3Y,KAAKouB,IAAK,EAAGsF,EAAUO,UAAYP,EAAUzB,SAAW+B,GAKpEjC,EAAU,GADHpZ,EAAY+a,EAAUzB,UAAY,GAEzCpe,EAAQ,EACRzW,EAASs2B,EAAUQ,OAAO92B,OAEnByW,EAAQzW,EAAQyW,IACvB6f,EAAUQ,OAAQrgB,GAAQie,IAAKC,GAMhC,OAHAlb,EAASmB,WAAY1a,EAAM,CAAEo2B,EAAW3B,EAASpZ,IAG5CoZ,EAAU,GAAK30B,EACZub,GAIFvb,GACLyZ,EAASmB,WAAY1a,EAAM,CAAEo2B,EAAW,EAAG,IAI5C7c,EAASoB,YAAa3a,EAAM,CAAEo2B,KACvB,IAERA,EAAY7c,EAAS1B,QAAS,CAC7B7X,KAAMA,EACNonB,MAAO5nB,GAAOsC,OAAQ,GAAIy0B,GAC1BM,KAAMr3B,GAAOsC,QAAQ,EAAM,CAC1Bg1B,cAAe,GACfhF,OAAQtyB,GAAOsyB,OAAO5P,UACpBngB,GACHg1B,mBAAoBR,EACpBS,gBAAiBj1B,EACjB40B,UAAWrB,IAASU,KACpBrB,SAAU5yB,EAAQ4yB,SAClBiC,OAAQ,GACRT,YAAa,SAAUrY,EAAMnc,GAC5B,IAAIwe,EAAQ3gB,GAAOqyB,MAAO7xB,EAAMo2B,EAAUS,KAAM/Y,EAAMnc,EACrDy0B,EAAUS,KAAKC,cAAehZ,IAAUsY,EAAUS,KAAK/E,QAExD,OADAsE,EAAUQ,OAAOz5B,KAAMgjB,GAChBA,GAERnB,KAAM,SAAUiY,GACf,IAAI1gB,EAAQ,EAIXzW,EAASm3B,EAAUb,EAAUQ,OAAO92B,OAAS,EAC9C,GAAK02B,EACJ,OAAOj6B,KAGR,IADAi6B,GAAU,EACFjgB,EAAQzW,EAAQyW,IACvB6f,EAAUQ,OAAQrgB,GAAQie,IAAK,GAUhC,OANKyC,GACJ1d,EAASmB,WAAY1a,EAAM,CAAEo2B,EAAW,EAAG,IAC3C7c,EAASoB,YAAa3a,EAAM,CAAEo2B,EAAWa,KAEzC1d,EAASuB,WAAY9a,EAAM,CAAEo2B,EAAWa,IAElC16B,QAGT6qB,EAAQgP,EAAUhP,MAInB,KA/HD,SAAqBA,EAAO0P,GAC3B,IAAIvgB,EAAOtW,EAAM6xB,EAAQxtB,EAAOua,EAGhC,IAAMtI,KAAS6Q,EAed,GAbA0K,EAASgF,EADT72B,EAAOmd,EAAW7G,IAElBjS,EAAQ8iB,EAAO7Q,GACVjU,MAAMC,QAAS+B,KACnBwtB,EAASxtB,EAAO,GAChBA,EAAQ8iB,EAAO7Q,GAAUjS,EAAO,IAG5BiS,IAAUtW,IACdmnB,EAAOnnB,GAASqE,SACT8iB,EAAO7Q,KAGfsI,EAAQrf,GAAOuyB,SAAU9xB,KACX,WAAY4e,EAMzB,IAAMtI,KALNjS,EAAQua,EAAMuV,OAAQ9vB,UACf8iB,EAAOnnB,GAICqE,EACNiS,KAAS6Q,IAChBA,EAAO7Q,GAAUjS,EAAOiS,GACxBugB,EAAevgB,GAAUub,QAI3BgF,EAAe72B,GAAS6xB,EA6F1BoF,CAAY9P,EAAOgP,EAAUS,KAAKC,eAE1BvgB,EAAQzW,EAAQyW,IAEvB,GADApI,EAASkoB,GAAUI,WAAYlgB,GAAQvZ,KAAMo5B,EAAWp2B,EAAMonB,EAAOgP,EAAUS,MAM9E,OAJKj5B,EAAYuQ,EAAO6Q,QACvBxf,GAAOsf,YAAasX,EAAUp2B,KAAMo2B,EAAUS,KAAKpe,OAAQuG,KAC1D7Q,EAAO6Q,KAAKmY,KAAMhpB,IAEbA,EAyBT,OArBA3O,GAAOwB,IAAKomB,EAAO+O,GAAaC,GAE3Bx4B,EAAYw4B,EAAUS,KAAKhoB,QAC/BunB,EAAUS,KAAKhoB,MAAM7R,KAAMgD,EAAMo2B,GAIlCA,EACEtc,SAAUsc,EAAUS,KAAK/c,UACzBzT,KAAM+vB,EAAUS,KAAKxwB,KAAM+vB,EAAUS,KAAKO,UAC1Ctf,KAAMse,EAAUS,KAAK/e,MACrBwB,OAAQ8c,EAAUS,KAAKvd,QAEzB9Z,GAAOs1B,GAAGuC,MACT73B,GAAOsC,OAAQi0B,EAAM,CACpB/1B,KAAMA,EACNs3B,KAAMlB,EACN3d,MAAO2d,EAAUS,KAAKpe,SAIjB2d,EAGR52B,GAAO62B,UAAY72B,GAAOsC,OAAQu0B,GAAW,CAE5CC,SAAU,CACTiB,IAAK,CAAE,SAAUzZ,EAAMxZ,GACtB,IAAI6b,EAAQ5jB,KAAK45B,YAAarY,EAAMxZ,GAEpC,OADA2b,GAAWE,EAAMngB,KAAM8d,EAAM0B,EAAQ5V,KAAMtF,GAAS6b,GAC7CA,KAITqX,QAAS,SAAUpQ,EAAOrmB,GACpBnD,EAAYwpB,IAChBrmB,EAAWqmB,EACXA,EAAQ,CAAE,MAEVA,EAAQA,EAAM5d,MAAO2N,GAOtB,IAJA,IAAI2G,EACHvH,EAAQ,EACRzW,EAASsnB,EAAMtnB,OAERyW,EAAQzW,EAAQyW,IACvBuH,EAAOsJ,EAAO7Q,GACd8f,GAAUC,SAAUxY,GAASuY,GAAUC,SAAUxY,IAAU,GAC3DuY,GAAUC,SAAUxY,GAAOiB,QAAShe,IAItC01B,WAAY,CA3Wb,SAA2Bz2B,EAAMonB,EAAOyP,GACvC,IAAI/Y,EAAMxZ,EAAO4c,EAAQrC,EAAO4Y,EAASC,EAAWC,EAAgB5X,EACnE6X,EAAQ,UAAWxQ,GAAS,WAAYA,EACxCkQ,EAAO/6B,KACP2tB,EAAO,GACPpK,EAAQ9f,EAAK8f,MACb8V,EAAS51B,EAAKlC,UAAY+hB,GAAoB7f,GAC9C63B,EAAW7Z,EAASzd,IAAKP,EAAM,UA6BhC,IAAM8d,KA1BA+Y,EAAKpe,QAEa,OADvBoG,EAAQrf,GAAOsf,YAAa9e,EAAM,OACvB83B,WACVjZ,EAAMiZ,SAAW,EACjBL,EAAU5Y,EAAMhO,MAAM8H,KACtBkG,EAAMhO,MAAM8H,KAAO,WACZkG,EAAMiZ,UACXL,MAIH5Y,EAAMiZ,WAENR,EAAKhe,OAAQ,WAGZge,EAAKhe,OAAQ,WACZuF,EAAMiZ,WACAt4B,GAAOiZ,MAAOzY,EAAM,MAAOF,QAChC+e,EAAMhO,MAAM8H,YAOFyO,EAEb,GADA9iB,EAAQ8iB,EAAOtJ,GACV2X,GAASzxB,KAAMM,GAAU,CAG7B,UAFO8iB,EAAOtJ,GACdoD,EAASA,GAAoB,WAAV5c,EACdA,KAAYsxB,EAAS,OAAS,QAAW,CAI7C,GAAe,SAAVtxB,IAAoBuzB,QAAiCr1B,IAArBq1B,EAAU/Z,GAK9C,SAJA8X,GAAS,EAOX1L,EAAMpM,GAAS+Z,GAAYA,EAAU/Z,IAAUte,GAAOsgB,MAAO9f,EAAM8d,GAMrE,IADA4Z,GAAal4B,GAAO2D,cAAeikB,MAChB5nB,GAAO2D,cAAe+mB,GA8DzC,IAAMpM,KAzDD8Z,GAA2B,IAAlB53B,EAAKlC,WAMlB+4B,EAAKkB,SAAW,CAAEjY,EAAMiY,SAAUjY,EAAMkY,UAAWlY,EAAMmY,WAIlC,OADvBN,EAAiBE,GAAYA,EAAS9X,WAErC4X,EAAiB3Z,EAASzd,IAAKP,EAAM,YAGrB,UADjB+f,EAAUvgB,GAAOwgB,IAAKhgB,EAAM,cAEtB23B,EACJ5X,EAAU4X,GAIV9W,GAAU,CAAE7gB,IAAQ,GACpB23B,EAAiB33B,EAAK8f,MAAMC,SAAW4X,EACvC5X,EAAUvgB,GAAOwgB,IAAKhgB,EAAM,WAC5B6gB,GAAU,CAAE7gB,OAKG,WAAZ+f,GAAoC,iBAAZA,GAAgD,MAAlB4X,IACrB,SAAhCn4B,GAAOwgB,IAAKhgB,EAAM,WAGhB03B,IACLJ,EAAKjxB,KAAM,WACVyZ,EAAMC,QAAU4X,IAEM,MAAlBA,IACJ5X,EAAUD,EAAMC,QAChB4X,EAA6B,SAAZ5X,EAAqB,GAAKA,IAG7CD,EAAMC,QAAU,iBAKd8W,EAAKkB,WACTjY,EAAMiY,SAAW,SACjBT,EAAKhe,OAAQ,WACZwG,EAAMiY,SAAWlB,EAAKkB,SAAU,GAChCjY,EAAMkY,UAAYnB,EAAKkB,SAAU,GACjCjY,EAAMmY,UAAYpB,EAAKkB,SAAU,MAKnCL,GAAY,EACExN,EAGPwN,IACAG,EACC,WAAYA,IAChBjC,EAASiC,EAASjC,QAGnBiC,EAAW7Z,EAASxB,OAAQxc,EAAM,SAAU,CAAE+f,QAAS4X,IAInDzW,IACJ2W,EAASjC,QAAUA,GAIfA,GACJ/U,GAAU,CAAE7gB,IAAQ,GAKrBs3B,EAAKjxB,KAAM,WASV,IAAMyX,KAJA8X,GACL/U,GAAU,CAAE7gB,IAEbge,EAASlF,OAAQ9Y,EAAM,UACTkqB,EACb1qB,GAAOsgB,MAAO9f,EAAM8d,EAAMoM,EAAMpM,OAMnC4Z,EAAYvB,GAAaP,EAASiC,EAAU/Z,GAAS,EAAGA,EAAMwZ,GACtDxZ,KAAQ+Z,IACfA,EAAU/Z,GAAS4Z,EAAU7oB,MACxB+mB,IACJ8B,EAAU/1B,IAAM+1B,EAAU7oB,MAC1B6oB,EAAU7oB,MAAQ,MAuMrBqpB,UAAW,SAAUn3B,EAAU+qB,GACzBA,EACJuK,GAAUI,WAAW1X,QAAShe,GAE9Bs1B,GAAUI,WAAWt5B,KAAM4D,MAK9BvB,GAAO24B,MAAQ,SAAUA,EAAOrG,EAAQnyB,GACvC,IAAI61B,EAAM2C,GAA0B,iBAAVA,EAAqB34B,GAAOsC,OAAQ,GAAIq2B,GAAU,CAC3Ef,SAAUz3B,IAAOA,GAAMmyB,GACtBl0B,EAAYu6B,IAAWA,EACxBxD,SAAUwD,EACVrG,OAAQnyB,GAAMmyB,GAAUA,IAAWl0B,EAAYk0B,IAAYA,GAoC5D,OAhCKtyB,GAAOs1B,GAAG/Q,IACdyR,EAAIb,SAAW,EAGc,iBAAjBa,EAAIb,WACVa,EAAIb,YAAYn1B,GAAOs1B,GAAGsD,OAC9B5C,EAAIb,SAAWn1B,GAAOs1B,GAAGsD,OAAQ5C,EAAIb,UAGrCa,EAAIb,SAAWn1B,GAAOs1B,GAAGsD,OAAOlW,UAMjB,MAAbsT,EAAI/c,QAA+B,IAAd+c,EAAI/c,QAC7B+c,EAAI/c,MAAQ,MAIb+c,EAAIxI,IAAMwI,EAAI4B,SAEd5B,EAAI4B,SAAW,WACTx5B,EAAY43B,EAAIxI,MACpBwI,EAAIxI,IAAIhwB,KAAMT,MAGVi5B,EAAI/c,OACRjZ,GAAOmf,QAASpiB,KAAMi5B,EAAI/c,QAIrB+c,GAGRh2B,GAAOG,GAAGmC,OAAQ,CACjBu2B,OAAQ,SAAUF,EAAOG,EAAIxG,EAAQ/wB,GAGpC,OAAOxE,KAAK6P,OAAQyT,IAAqBG,IAAK,UAAW,GAAIc,OAG3Dnf,MAAM42B,QAAS,CAAEvG,QAASsG,GAAMH,EAAOrG,EAAQ/wB,IAElDw3B,QAAS,SAAUza,EAAMqa,EAAOrG,EAAQ/wB,GACvC,IAAI8P,EAAQrR,GAAO2D,cAAe2a,GACjC0a,EAASh5B,GAAO24B,MAAOA,EAAOrG,EAAQ/wB,GACtC03B,EAAc,WAGb,IAAInB,EAAOjB,GAAW95B,KAAMiD,GAAOsC,OAAQ,GAAIgc,GAAQ0a,IAGlD3nB,GAASmN,EAASzd,IAAKhE,KAAM,YACjC+6B,EAAKtY,MAAM,IAMd,OAFAyZ,EAAYC,OAASD,EAEd5nB,IAA0B,IAAjB2nB,EAAO/f,MACtBlc,KAAKuE,KAAM23B,GACXl8B,KAAKkc,MAAO+f,EAAO/f,MAAOggB,IAE5BzZ,KAAM,SAAU9gB,EAAMghB,EAAY+X,GACjC,IAAI0B,EAAY,SAAU9Z,GACzB,IAAIG,EAAOH,EAAMG,YACVH,EAAMG,KACbA,EAAMiY,IAYP,MATqB,iBAAT/4B,IACX+4B,EAAU/X,EACVA,EAAahhB,EACbA,OAAOsE,GAEH0c,GACJ3iB,KAAKkc,MAAOva,GAAQ,KAAM,IAGpB3B,KAAKuE,KAAM,WACjB,IAAI6d,GAAU,EACbpI,EAAgB,MAARrY,GAAgBA,EAAO,aAC/B06B,EAASp5B,GAAOo5B,OAChB/a,EAAOG,EAASzd,IAAKhE,MAEtB,GAAKga,EACCsH,EAAMtH,IAAWsH,EAAMtH,GAAQyI,MACnC2Z,EAAW9a,EAAMtH,SAGlB,IAAMA,KAASsH,EACTA,EAAMtH,IAAWsH,EAAMtH,GAAQyI,MAAQ0W,GAAK1xB,KAAMuS,IACtDoiB,EAAW9a,EAAMtH,IAKpB,IAAMA,EAAQqiB,EAAO94B,OAAQyW,KACvBqiB,EAAQriB,GAAQvW,OAASzD,MACnB,MAAR2B,GAAgB06B,EAAQriB,GAAQkC,QAAUva,IAE5C06B,EAAQriB,GAAQ+gB,KAAKtY,KAAMiY,GAC3BtY,GAAU,EACVia,EAAO/2B,OAAQ0U,EAAO,KAOnBoI,GAAYsY,GAChBz3B,GAAOmf,QAASpiB,KAAM2B,MAIzBw6B,OAAQ,SAAUx6B,GAIjB,OAHc,IAATA,IACJA,EAAOA,GAAQ,MAET3B,KAAKuE,KAAM,WACjB,IAAIyV,EACHsH,EAAOG,EAASzd,IAAKhE,MACrBkc,EAAQoF,EAAM3f,EAAO,SACrB2gB,EAAQhB,EAAM3f,EAAO,cACrB06B,EAASp5B,GAAOo5B,OAChB94B,EAAS2Y,EAAQA,EAAM3Y,OAAS,EAajC,IAVA+d,EAAK6a,QAAS,EAGdl5B,GAAOiZ,MAAOlc,KAAM2B,EAAM,IAErB2gB,GAASA,EAAMG,MACnBH,EAAMG,KAAKhiB,KAAMT,MAAM,GAIlBga,EAAQqiB,EAAO94B,OAAQyW,KACvBqiB,EAAQriB,GAAQvW,OAASzD,MAAQq8B,EAAQriB,GAAQkC,QAAUva,IAC/D06B,EAAQriB,GAAQ+gB,KAAKtY,MAAM,GAC3B4Z,EAAO/2B,OAAQ0U,EAAO,IAKxB,IAAMA,EAAQ,EAAGA,EAAQzW,EAAQyW,IAC3BkC,EAAOlC,IAAWkC,EAAOlC,GAAQmiB,QACrCjgB,EAAOlC,GAAQmiB,OAAO17B,KAAMT,aAKvBshB,EAAK6a,YAKfl5B,GAAOsB,KAAM,CAAE,SAAU,OAAQ,QAAU,SAAU6D,EAAI1E,GACxD,IAAI44B,EAAQr5B,GAAOG,GAAIM,GACvBT,GAAOG,GAAIM,GAAS,SAAUk4B,EAAOrG,EAAQ/wB,GAC5C,OAAgB,MAATo3B,GAAkC,kBAAVA,EAC9BU,EAAM37B,MAAOX,KAAM0E,WACnB1E,KAAKg8B,QAAStC,GAAOh2B,GAAM,GAAQk4B,EAAOrG,EAAQ/wB,MAKrDvB,GAAOsB,KAAM,CACZg4B,UAAW7C,GAAO,QAClB8C,QAAS9C,GAAO,QAChB+C,YAAa/C,GAAO,UACpBgD,OAAQ,CAAEjH,QAAS,QACnBkH,QAAS,CAAElH,QAAS,QACpBmH,WAAY,CAAEnH,QAAS,WACrB,SAAU/xB,EAAMmnB,GAClB5nB,GAAOG,GAAIM,GAAS,SAAUk4B,EAAOrG,EAAQ/wB,GAC5C,OAAOxE,KAAKg8B,QAASnR,EAAO+Q,EAAOrG,EAAQ/wB,MAI7CvB,GAAOo5B,OAAS,GAChBp5B,GAAOs1B,GAAGiB,KAAO,WAChB,IAAIsB,EACH34B,EAAI,EACJk6B,EAASp5B,GAAOo5B,OAIjB,IAFAtD,GAAQ7N,KAAKC,MAELhpB,EAAIk6B,EAAO94B,OAAQpB,KAC1B24B,EAAQuB,EAAQl6B,OAGCk6B,EAAQl6B,KAAQ24B,GAChCuB,EAAO/2B,OAAQnD,IAAK,GAIhBk6B,EAAO94B,QACZN,GAAOs1B,GAAG9V,OAEXsW,QAAQ9yB,GAGThD,GAAOs1B,GAAGuC,MAAQ,SAAUA,GAC3B73B,GAAOo5B,OAAOz7B,KAAMk6B,GACpB73B,GAAOs1B,GAAGjmB,SAGXrP,GAAOs1B,GAAGgB,SAAW,GACrBt2B,GAAOs1B,GAAGjmB,MAAQ,WACZ0mB,KAILA,IAAa,EACbI,OAGDn2B,GAAOs1B,GAAG9V,KAAO,WAChBuW,GAAa,MAGd/1B,GAAOs1B,GAAGsD,OAAS,CAClBgB,KAAM,IACNC,KAAM,IAGNnX,SAAU,KAKX1iB,GAAOG,GAAG25B,MAAQ,SAAUC,EAAMr7B,GAIjC,OAHAq7B,EAAO/5B,GAAOs1B,IAAKt1B,GAAOs1B,GAAGsD,OAAQmB,IAAiBA,EACtDr7B,EAAOA,GAAQ,KAER3B,KAAKkc,MAAOva,EAAM,SAAU8K,EAAM6V,GACxC,IAAI2a,EAAUl9B,GAAO2e,WAAYjS,EAAMuwB,GACvC1a,EAAMG,KAAO,WACZ1iB,GAAOm9B,aAAcD,OAOnB/sB,GAAQtQ,EAAS0C,cAAe,SAEnC22B,GADSr5B,EAAS0C,cAAe,UACpBK,YAAa/C,EAAS0C,cAAe,WAEnD4N,GAAMvO,KAAO,WAIbP,GAAQ+7B,QAA0B,KAAhBjtB,GAAMnI,MAIxB3G,GAAQg8B,YAAcnE,GAAI7kB,UAI1BlE,GAAQtQ,EAAS0C,cAAe,UAC1ByF,MAAQ,IACdmI,GAAMvO,KAAO,QACbP,GAAQi8B,WAA6B,MAAhBntB,GAAMnI,MAI5B,IAAIu1B,GACH5sB,GAAazN,GAAOqN,KAAKI,WAE1BzN,GAAOG,GAAGmC,OAAQ,CACjBkL,KAAM,SAAU/M,EAAMqE,GACrB,OAAOkY,EAAQjgB,KAAMiD,GAAOwN,KAAM/M,EAAMqE,EAA0B,EAAnBrD,UAAUnB,SAG1Dg6B,WAAY,SAAU75B,GACrB,OAAO1D,KAAKuE,KAAM,WACjBtB,GAAOs6B,WAAYv9B,KAAM0D,QAK5BT,GAAOsC,OAAQ,CACdkL,KAAM,SAAUhN,EAAMC,EAAMqE,GAC3B,IAAI3D,EAAKke,EACRkb,EAAQ/5B,EAAKlC,SAGd,GAAe,IAAVi8B,GAAyB,IAAVA,GAAyB,IAAVA,EAKnC,MAAkC,oBAAtB/5B,EAAKjB,aACTS,GAAOse,KAAM9d,EAAMC,EAAMqE,IAKlB,IAAVy1B,GAAgBv6B,GAAOmE,SAAU3D,KACrC6e,EAAQrf,GAAOw6B,UAAW/5B,EAAKC,iBAC5BV,GAAOqN,KAAKrD,MAAM3B,KAAK7D,KAAM/D,GAAS45B,QAAWr3B,SAGtCA,IAAV8B,EACW,OAAVA,OACJ9E,GAAOs6B,WAAY95B,EAAMC,GAIrB4e,GAAS,QAASA,QACuBrc,KAA3C7B,EAAMke,EAAMjB,IAAK5d,EAAMsE,EAAOrE,IACzBU,GAGRX,EAAKhB,aAAciB,EAAMqE,EAAQ,IAC1BA,GAGHua,GAAS,QAASA,GAA+C,QAApCle,EAAMke,EAAMte,IAAKP,EAAMC,IACjDU,EAMM,OAHdA,EAAMnB,GAAO4J,KAAK4D,KAAMhN,EAAMC,SAGTuC,EAAY7B,IAGlCq5B,UAAW,CACV97B,KAAM,CACL0f,IAAK,SAAU5d,EAAMsE,GACpB,IAAM3G,GAAQi8B,YAAwB,UAAVt1B,GAC3BvE,GAAUC,EAAM,SAAY,CAC5B,IAAIrB,EAAMqB,EAAKsE,MAKf,OAJAtE,EAAKhB,aAAc,OAAQsF,GACtB3F,IACJqB,EAAKsE,MAAQ3F,GAEP2F,MAMXw1B,WAAY,SAAU95B,EAAMsE,GAC3B,IAAIrE,EACHvB,EAAI,EAIJu7B,EAAY31B,GAASA,EAAMkF,MAAO2N,GAEnC,GAAK8iB,GAA+B,IAAlBj6B,EAAKlC,SACtB,MAAUmC,EAAOg6B,EAAWv7B,KAC3BsB,EAAKwK,gBAAiBvK,MAO1B45B,GAAW,CACVjc,IAAK,SAAU5d,EAAMsE,EAAOrE,GAQ3B,OAPe,IAAVqE,EAGJ9E,GAAOs6B,WAAY95B,EAAMC,GAEzBD,EAAKhB,aAAciB,EAAMA,GAEnBA,IAITT,GAAOsB,KAAMtB,GAAOqN,KAAKrD,MAAM3B,KAAK0X,OAAO/V,MAAO,QAAU,SAAU7E,EAAI1E,GACzE,IAAIi6B,EAASjtB,GAAYhN,IAAUT,GAAO4J,KAAK4D,KAE/CC,GAAYhN,GAAS,SAAUD,EAAMC,EAAM6U,GAC1C,IAAInU,EAAKykB,EACR+U,EAAgBl6B,EAAKC,cAYtB,OAVM4U,IAGLsQ,EAASnY,GAAYktB,GACrBltB,GAAYktB,GAAkBx5B,EAC9BA,EAAqC,MAA/Bu5B,EAAQl6B,EAAMC,EAAM6U,GACzBqlB,EACA,KACDltB,GAAYktB,GAAkB/U,GAExBzkB,KAOT,IAAIy5B,GAAa,sCAChBC,GAAa,gBAwIb,SAASC,GAAkBh2B,GAE1B,OADaA,EAAMkF,MAAO2N,IAAmB,IAC/B9M,KAAM,KAItB,SAASkwB,GAAUv6B,GAClB,OAAOA,EAAKjB,cAAgBiB,EAAKjB,aAAc,UAAa,GAG7D,SAASy7B,GAAgBl2B,GACxB,OAAKhC,MAAMC,QAAS+B,GACZA,EAEc,iBAAVA,GACJA,EAAMkF,MAAO2N,IAEd,GAvJR3X,GAAOG,GAAGmC,OAAQ,CACjBgc,KAAM,SAAU7d,EAAMqE,GACrB,OAAOkY,EAAQjgB,KAAMiD,GAAOse,KAAM7d,EAAMqE,EAA0B,EAAnBrD,UAAUnB,SAG1D26B,WAAY,SAAUx6B,GACrB,OAAO1D,KAAKuE,KAAM,kBACVvE,KAAMiD,GAAOk7B,QAASz6B,IAAUA,QAK1CT,GAAOsC,OAAQ,CACdgc,KAAM,SAAU9d,EAAMC,EAAMqE,GAC3B,IAAI3D,EAAKke,EACRkb,EAAQ/5B,EAAKlC,SAGd,GAAe,IAAVi8B,GAAyB,IAAVA,GAAyB,IAAVA,EAWnC,OAPe,IAAVA,GAAgBv6B,GAAOmE,SAAU3D,KAGrCC,EAAOT,GAAOk7B,QAASz6B,IAAUA,EACjC4e,EAAQrf,GAAO+0B,UAAWt0B,SAGZuC,IAAV8B,EACCua,GAAS,QAASA,QACuBrc,KAA3C7B,EAAMke,EAAMjB,IAAK5d,EAAMsE,EAAOrE,IACzBU,EAGCX,EAAMC,GAASqE,EAGpBua,GAAS,QAASA,GAA+C,QAApCle,EAAMke,EAAMte,IAAKP,EAAMC,IACjDU,EAGDX,EAAMC,IAGds0B,UAAW,CACV/jB,SAAU,CACTjQ,IAAK,SAAUP,GAMd,IAAI26B,EAAWn7B,GAAO4J,KAAK4D,KAAMhN,EAAM,YAEvC,OAAK26B,EACGjL,SAAUiL,EAAU,IAI3BP,GAAWp2B,KAAMhE,EAAKD,WACtBs6B,GAAWr2B,KAAMhE,EAAKD,WACtBC,EAAKuQ,KAEE,GAGA,KAKXmqB,QAAS,CACRE,MAAO,UACPC,QAAS,eAYLl9B,GAAQg8B,cACbn6B,GAAO+0B,UAAU5jB,SAAW,CAC3BpQ,IAAK,SAAUP,GAId,IAAI8O,EAAS9O,EAAKb,WAIlB,OAHK2P,GAAUA,EAAO3P,YACrB2P,EAAO3P,WAAWyR,cAEZ,MAERgN,IAAK,SAAU5d,GAId,IAAI8O,EAAS9O,EAAKb,WACb2P,IACJA,EAAO8B,cAEF9B,EAAO3P,YACX2P,EAAO3P,WAAWyR,kBAOvBpR,GAAOsB,KAAM,CACZ,WACA,WACA,YACA,cACA,cACA,UACA,UACA,SACA,cACA,mBACE,WACFtB,GAAOk7B,QAASn+B,KAAK2D,eAAkB3D,OA4BxCiD,GAAOG,GAAGmC,OAAQ,CACjBg5B,SAAU,SAAUx2B,GACnB,IAAIy2B,EAAY5kB,EAAK6kB,EAAUxuB,EAAW9N,EAAGu8B,EAE7C,OAAKr9B,EAAY0G,GACT/H,KAAKuE,KAAM,SAAUY,GAC3BlC,GAAQjD,MAAOu+B,SAAUx2B,EAAMtH,KAAMT,KAAMmF,EAAG64B,GAAUh+B,WAI1Dw+B,EAAaP,GAAgBl2B,IAEbxE,OACRvD,KAAKuE,KAAM,WAIjB,GAHAk6B,EAAWT,GAAUh+B,MACrB4Z,EAAwB,IAAlB5Z,KAAKuB,UAAoB,IAAMw8B,GAAkBU,GAAa,IAEzD,CACV,IAAMt8B,EAAI,EAAGA,EAAIq8B,EAAWj7B,OAAQpB,IACnC8N,EAAYuuB,EAAYr8B,GACnByX,EAAI/Y,QAAS,IAAMoP,EAAY,KAAQ,IAC3C2J,GAAO3J,EAAY,KAKrByuB,EAAaX,GAAkBnkB,GAC1B6kB,IAAaC,GACjB1+B,KAAKyC,aAAc,QAASi8B,MAMzB1+B,MAGR2+B,YAAa,SAAU52B,GACtB,IAAIy2B,EAAY5kB,EAAK6kB,EAAUxuB,EAAW9N,EAAGu8B,EAE7C,OAAKr9B,EAAY0G,GACT/H,KAAKuE,KAAM,SAAUY,GAC3BlC,GAAQjD,MAAO2+B,YAAa52B,EAAMtH,KAAMT,KAAMmF,EAAG64B,GAAUh+B,UAIvD0E,UAAUnB,QAIhBi7B,EAAaP,GAAgBl2B,IAEbxE,OACRvD,KAAKuE,KAAM,WAMjB,GALAk6B,EAAWT,GAAUh+B,MAGrB4Z,EAAwB,IAAlB5Z,KAAKuB,UAAoB,IAAMw8B,GAAkBU,GAAa,IAEzD,CACV,IAAMt8B,EAAI,EAAGA,EAAIq8B,EAAWj7B,OAAQpB,IAAM,CACzC8N,EAAYuuB,EAAYr8B,GAGxB,OAAgD,EAAxCyX,EAAI/Y,QAAS,IAAMoP,EAAY,KACtC2J,EAAMA,EAAIvT,QAAS,IAAM4J,EAAY,IAAK,KAK5CyuB,EAAaX,GAAkBnkB,GAC1B6kB,IAAaC,GACjB1+B,KAAKyC,aAAc,QAASi8B,MAMzB1+B,KA/BCA,KAAKyQ,KAAM,QAAS,KAkC7BmuB,YAAa,SAAU72B,EAAO82B,GAC7B,IAAIL,EAAYvuB,EAAW9N,EAAG+W,EAC7BvX,SAAcoG,EACd+2B,EAAwB,WAATn9B,GAAqBoE,MAAMC,QAAS+B,GAEpD,OAAK1G,EAAY0G,GACT/H,KAAKuE,KAAM,SAAUpC,GAC3Bc,GAAQjD,MAAO4+B,YACd72B,EAAMtH,KAAMT,KAAMmC,EAAG67B,GAAUh+B,MAAQ6+B,GACvCA,KAKsB,kBAAbA,GAA0BC,EAC9BD,EAAW7+B,KAAKu+B,SAAUx2B,GAAU/H,KAAK2+B,YAAa52B,IAG9Dy2B,EAAaP,GAAgBl2B,GAEtB/H,KAAKuE,KAAM,WACjB,GAAKu6B,EAKJ,IAFA5lB,EAAOjW,GAAQjD,MAETmC,EAAI,EAAGA,EAAIq8B,EAAWj7B,OAAQpB,IACnC8N,EAAYuuB,EAAYr8B,GAGnB+W,EAAK6lB,SAAU9uB,GACnBiJ,EAAKylB,YAAa1uB,GAElBiJ,EAAKqlB,SAAUtuB,aAKIhK,IAAV8B,GAAgC,YAATpG,KAClCsO,EAAY+tB,GAAUh+B,QAIrByhB,EAASJ,IAAKrhB,KAAM,gBAAiBiQ,GAOjCjQ,KAAKyC,cACTzC,KAAKyC,aAAc,QAClBwN,IAAuB,IAAVlI,EACZ,GACA0Z,EAASzd,IAAKhE,KAAM,kBAAqB,SAO/C++B,SAAU,SAAU77B,GACnB,IAAI+M,EAAWxM,EACdtB,EAAI,EAEL8N,EAAY,IAAM/M,EAAW,IAC7B,MAAUO,EAAOzD,KAAMmC,KACtB,GAAuB,IAAlBsB,EAAKlC,WACoE,GAA3E,IAAMw8B,GAAkBC,GAAUv6B,IAAW,KAAM5C,QAASoP,GAC9D,OAAO,EAIT,OAAO,KAOT,IAAI+uB,GAAU,MAEd/7B,GAAOG,GAAGmC,OAAQ,CACjBnD,IAAK,SAAU2F,GACd,IAAIua,EAAOle,EAAKuqB,EACflrB,EAAOzD,KAAM,GAEd,OAAM0E,UAAUnB,QA0BhBorB,EAAkBttB,EAAY0G,GAEvB/H,KAAKuE,KAAM,SAAUpC,GAC3B,IAAIC,EAEmB,IAAlBpC,KAAKuB,WAWE,OANXa,EADIusB,EACE5mB,EAAMtH,KAAMT,KAAMmC,EAAGc,GAAQjD,MAAOoC,OAEpC2F,GAKN3F,EAAM,GAEoB,iBAARA,EAClBA,GAAO,GAEI2D,MAAMC,QAAS5D,KAC1BA,EAAMa,GAAOwB,IAAKrC,EAAK,SAAU2F,GAChC,OAAgB,MAATA,EAAgB,GAAKA,EAAQ,OAItCua,EAAQrf,GAAOg8B,SAAUj/B,KAAK2B,OAAUsB,GAAOg8B,SAAUj/B,KAAKwD,SAASG,iBAGrD,QAAS2e,QAA+Crc,IAApCqc,EAAMjB,IAAKrhB,KAAMoC,EAAK,WAC3DpC,KAAK+H,MAAQ3F,OAzDTqB,GACJ6e,EAAQrf,GAAOg8B,SAAUx7B,EAAK9B,OAC7BsB,GAAOg8B,SAAUx7B,EAAKD,SAASG,iBAG/B,QAAS2e,QACgCrc,KAAvC7B,EAAMke,EAAMte,IAAKP,EAAM,UAElBW,EAMY,iBAHpBA,EAAMX,EAAKsE,OAIH3D,EAAIiC,QAAS24B,GAAS,IAIhB,MAAP56B,EAAc,GAAKA,OAG3B,KAyCHnB,GAAOsC,OAAQ,CACd05B,SAAU,CACT5Z,OAAQ,CACPrhB,IAAK,SAAUP,GAEd,IAAIrB,EAAMa,GAAO4J,KAAK4D,KAAMhN,EAAM,SAClC,OAAc,MAAPrB,EACNA,EAMA27B,GAAkB96B,GAAOV,KAAMkB,MAGlCyK,OAAQ,CACPlK,IAAK,SAAUP,GACd,IAAIsE,EAAOsd,EAAQljB,EAClBqD,EAAU/B,EAAK+B,QACfwU,EAAQvW,EAAK4Q,cACbgT,EAAoB,eAAd5jB,EAAK9B,KACX6iB,EAAS6C,EAAM,KAAO,GACtBkN,EAAMlN,EAAMrN,EAAQ,EAAIxU,EAAQjC,OAUjC,IAPCpB,EADI6X,EAAQ,EACRua,EAGAlN,EAAMrN,EAAQ,EAIX7X,EAAIoyB,EAAKpyB,IAKhB,KAJAkjB,EAAS7f,EAASrD,IAIJiS,UAAYjS,IAAM6X,KAG7BqL,EAAO9Y,YACL8Y,EAAOziB,WAAW2J,WACnB/I,GAAU6hB,EAAOziB,WAAY,aAAiB,CAMjD,GAHAmF,EAAQ9E,GAAQoiB,GAASjjB,MAGpBilB,EACJ,OAAOtf,EAIRyc,EAAO5jB,KAAMmH,GAIf,OAAOyc,GAGRnD,IAAK,SAAU5d,EAAMsE,GACpB,IAAIm3B,EAAW7Z,EACd7f,EAAU/B,EAAK+B,QACfgf,EAASvhB,GAAOgE,UAAWc,GAC3B5F,EAAIqD,EAAQjC,OAEb,MAAQpB,MACPkjB,EAAS7f,EAASrD,IAINiS,UACuD,EAAlEnR,GAAOkE,QAASlE,GAAOg8B,SAAS5Z,OAAOrhB,IAAKqhB,GAAUb,MAEtD0a,GAAY,GAUd,OAHMA,IACLz7B,EAAK4Q,eAAiB,GAEhBmQ,OAOXvhB,GAAOsB,KAAM,CAAE,QAAS,YAAc,WACrCtB,GAAOg8B,SAAUj/B,MAAS,CACzBqhB,IAAK,SAAU5d,EAAMsE,GACpB,GAAKhC,MAAMC,QAAS+B,GACnB,OAAStE,EAAK0Q,SAA2D,EAAjDlR,GAAOkE,QAASlE,GAAQQ,GAAOrB,MAAO2F,KAI3D3G,GAAQ+7B,UACbl6B,GAAOg8B,SAAUj/B,MAAOgE,IAAM,SAAUP,GACvC,OAAwC,OAAjCA,EAAKjB,aAAc,SAAqB,KAAOiB,EAAKsE,UAS9D,IAAI0L,GAAW1T,GAAO0T,SAElB5R,GAAQ,CAAEmG,KAAMkjB,KAAKC,OAErBgU,GAAS,KAKbl8B,GAAOm8B,SAAW,SAAU9d,GAC3B,IAAInP,EAAKktB,EACT,IAAM/d,GAAwB,iBAATA,EACpB,OAAO,KAKR,IACCnP,GAAM,IAAMpS,GAAOu/B,WAAcC,gBAAiBje,EAAM,YACvD,MAAQ3U,IAYV,OAVA0yB,EAAkBltB,GAAOA,EAAI3E,qBAAsB,eAAiB,GAC9D2E,IAAOktB,GACZp8B,GAAOsD,MAAO,iBACb84B,EACCp8B,GAAOwB,IAAK46B,EAAgB3yB,WAAY,SAAUgC,GACjD,OAAOA,EAAG5H,cACPgH,KAAM,MACVwT,IAGInP,GAIR,IAAIqtB,GAAc,kCACjBC,GAA0B,SAAU9yB,GACnCA,EAAEmb,mBAGJ7kB,GAAOsC,OAAQtC,GAAOskB,MAAO,CAE5BU,QAAS,SAAUV,EAAOjG,EAAM7d,EAAMi8B,GAErC,IAAIv9B,EAAGyX,EAAKgJ,EAAK+c,EAAYC,EAAQ/W,EAAQ9K,EAAS8hB,EACrDC,EAAY,CAAEr8B,GAAQ7D,GACtB+B,EAAOX,GAAOP,KAAM8mB,EAAO,QAAWA,EAAM5lB,KAAO4lB,EACnDkB,EAAaznB,GAAOP,KAAM8mB,EAAO,aAAgBA,EAAMlgB,UAAUc,MAAO,KAAQ,GAKjF,GAHAyR,EAAMimB,EAAcjd,EAAMnf,EAAOA,GAAQ7D,EAGlB,IAAlB6D,EAAKlC,UAAoC,IAAlBkC,EAAKlC,WAK5Bi+B,GAAY/3B,KAAM9F,EAAOsB,GAAOskB,MAAMuB,cAIf,EAAvBnnB,EAAKd,QAAS,OAIlBc,GADA8mB,EAAa9mB,EAAKwG,MAAO,MACPoG,QAClBka,EAAWpjB,QAEZu6B,EAASj+B,EAAKd,QAAS,KAAQ,GAAK,KAAOc,GAG3C4lB,EAAQA,EAAOtkB,GAAOiD,SACrBqhB,EACA,IAAItkB,GAAOmnB,MAAOzoB,EAAuB,iBAAV4lB,GAAsBA,IAGhDK,UAAY8X,EAAe,EAAI,EACrCnY,EAAMlgB,UAAYohB,EAAW3a,KAAM,KACnCyZ,EAAMuC,WAAavC,EAAMlgB,UACxB,IAAImB,OAAQ,UAAYigB,EAAW3a,KAAM,iBAAoB,WAC7D,KAGDyZ,EAAM3V,YAAS3L,EACTshB,EAAM3hB,SACX2hB,EAAM3hB,OAASnC,GAIhB6d,EAAe,MAARA,EACN,CAAEiG,GACFtkB,GAAOgE,UAAWqa,EAAM,CAAEiG,IAG3BxJ,EAAU9a,GAAOskB,MAAMxJ,QAASpc,IAAU,GACpC+9B,IAAgB3hB,EAAQkK,UAAmD,IAAxClK,EAAQkK,QAAQtnB,MAAO8C,EAAM6d,IAAtE,CAMA,IAAMoe,IAAiB3hB,EAAQ0M,WAAahpB,EAAUgC,GAAS,CAM9D,IAJAk8B,EAAa5hB,EAAQ8J,cAAgBlmB,EAC/B69B,GAAY/3B,KAAMk4B,EAAah+B,KACpCiY,EAAMA,EAAIhX,YAEHgX,EAAKA,EAAMA,EAAIhX,WACtBk9B,EAAUl/B,KAAMgZ,GAChBgJ,EAAMhJ,EAIFgJ,KAAUnf,EAAK+D,eAAiB5H,IACpCkgC,EAAUl/B,KAAMgiB,EAAIvT,aAAeuT,EAAImd,cAAgBhgC,IAKzDoC,EAAI,EACJ,OAAUyX,EAAMkmB,EAAW39B,QAAYolB,EAAMqC,uBAC5CiW,EAAcjmB,EACd2N,EAAM5lB,KAAW,EAAJQ,EACZw9B,EACA5hB,EAAQiL,UAAYrnB,GAGrBknB,GAAWpH,EAASzd,IAAK4V,EAAK,WAAcxZ,OAAOwoB,OAAQ,OAAUrB,EAAM5lB,OAC1E8f,EAASzd,IAAK4V,EAAK,YAEnBiP,EAAOloB,MAAOiZ,EAAK0H,IAIpBuH,EAAS+W,GAAUhmB,EAAKgmB,KACT/W,EAAOloB,OAASogB,EAAYnH,KAC1C2N,EAAM3V,OAASiX,EAAOloB,MAAOiZ,EAAK0H,IACZ,IAAjBiG,EAAM3V,QACV2V,EAAMS,kBA8CT,OA1CAT,EAAM5lB,KAAOA,EAGP+9B,GAAiBnY,EAAMuD,sBAEpB/M,EAAQ4H,WACqC,IAApD5H,EAAQ4H,SAAShlB,MAAOm/B,EAAUz3B,MAAOiZ,KACzCP,EAAYtd,IAIPm8B,GAAUv+B,EAAYoC,EAAM9B,MAAaF,EAAUgC,MAGvDmf,EAAMnf,EAAMm8B,MAGXn8B,EAAMm8B,GAAW,MAIlB38B,GAAOskB,MAAMuB,UAAYnnB,EAEpB4lB,EAAMqC,wBACViW,EAAYtwB,iBAAkB5N,EAAM89B,IAGrCh8B,EAAM9B,KAED4lB,EAAMqC,wBACViW,EAAYjgB,oBAAqBje,EAAM89B,IAGxCx8B,GAAOskB,MAAMuB,eAAY7iB,EAEpB2c,IACJnf,EAAMm8B,GAAWhd,IAMd2E,EAAM3V,SAKdwb,SAAU,SAAUzrB,EAAM8B,EAAM8jB,GAC/B,IAAI5a,EAAI1J,GAAOsC,OACd,IAAItC,GAAOmnB,MACX7C,EACA,CACC5lB,KAAMA,EACNypB,aAAa,IAIfnoB,GAAOskB,MAAMU,QAAStb,EAAG,KAAMlJ,MAKjCR,GAAOG,GAAGmC,OAAQ,CAEjB0iB,QAAS,SAAUtmB,EAAM2f,GACxB,OAAOthB,KAAKuE,KAAM,WACjBtB,GAAOskB,MAAMU,QAAStmB,EAAM2f,EAAMthB,SAGpCggC,eAAgB,SAAUr+B,EAAM2f,GAC/B,IAAI7d,EAAOzD,KAAM,GACjB,GAAKyD,EACJ,OAAOR,GAAOskB,MAAMU,QAAStmB,EAAM2f,EAAM7d,GAAM,MAMlD,IACCw8B,GAAW,QACXC,GAAQ,SACRC,GAAkB,wCAClBC,GAAe,qCAEhB,SAASC,GAAa1I,EAAQr2B,EAAKg/B,EAAapmB,GAC/C,IAAIxW,EAEJ,GAAKqC,MAAMC,QAAS1E,GAGnB2B,GAAOsB,KAAMjD,EAAK,SAAUa,EAAG2Y,GACzBwlB,GAAeL,GAASx4B,KAAMkwB,GAGlCzd,EAAKyd,EAAQ7c,GAKbulB,GACC1I,EAAS,KAAqB,iBAAN7c,GAAuB,MAALA,EAAY3Y,EAAI,IAAO,IACjE2Y,EACAwlB,EACApmB,UAKG,GAAMomB,GAAiC,WAAlBx9B,EAAQxB,GAUnC4Y,EAAKyd,EAAQr2B,QAPb,IAAMoC,KAAQpC,EACb++B,GAAa1I,EAAS,IAAMj0B,EAAO,IAAKpC,EAAKoC,GAAQ48B,EAAapmB,GAYrEjX,GAAOs9B,MAAQ,SAAU73B,EAAG43B,GAC3B,IAAI3I,EACH6I,EAAI,GACJtmB,EAAM,SAAU7L,EAAKoyB,GAGpB,IAAI14B,EAAQ1G,EAAYo/B,GACvBA,IACAA,EAEDD,EAAGA,EAAEj9B,QAAWm9B,mBAAoBryB,GAAQ,IAC3CqyB,mBAA6B,MAAT34B,EAAgB,GAAKA,IAG5C,GAAU,MAALW,EACJ,MAAO,GAIR,GAAK3C,MAAMC,QAAS0C,IAASA,EAAE7E,SAAWZ,GAAO6C,cAAe4C,GAG/DzF,GAAOsB,KAAMmE,EAAG,WACfwR,EAAKla,KAAK0D,KAAM1D,KAAK+H,cAOtB,IAAM4vB,KAAUjvB,EACf23B,GAAa1I,EAAQjvB,EAAGivB,GAAU2I,EAAapmB,GAKjD,OAAOsmB,EAAE1yB,KAAM,MAGhB7K,GAAOG,GAAGmC,OAAQ,CACjBo7B,UAAW,WACV,OAAO19B,GAAOs9B,MAAOvgC,KAAK4gC,mBAE3BA,eAAgB,WACf,OAAO5gC,KAAKyE,IAAK,WAGhB,IAAI8L,EAAWtN,GAAOse,KAAMvhB,KAAM,YAClC,OAAOuQ,EAAWtN,GAAOgE,UAAWsJ,GAAavQ,OAC9C6P,OAAQ,WACX,IAAIlO,EAAO3B,KAAK2B,KAGhB,OAAO3B,KAAK0D,OAAST,GAAQjD,MAAO2Y,GAAI,cACvCynB,GAAa34B,KAAMzH,KAAKwD,YAAe28B,GAAgB14B,KAAM9F,KAC3D3B,KAAKmU,UAAY0Q,GAAepd,KAAM9F,MACtC8C,IAAK,SAAU2D,EAAI3E,GACtB,IAAIrB,EAAMa,GAAQjD,MAAOoC,MAEzB,OAAY,MAAPA,EACG,KAGH2D,MAAMC,QAAS5D,GACZa,GAAOwB,IAAKrC,EAAK,SAAUA,GACjC,MAAO,CAAEsB,KAAMD,EAAKC,KAAMqE,MAAO3F,EAAIiE,QAAS65B,GAAO,WAIhD,CAAEx8B,KAAMD,EAAKC,KAAMqE,MAAO3F,EAAIiE,QAAS65B,GAAO,WAClDl8B,SAKN,IACC68B,GAAM,OACNC,GAAQ,OACRC,GAAa,gBACbC,GAAW,6BAIXC,GAAa,iBACbC,GAAY,QAWZhH,GAAa,GAObiH,GAAa,GAGbC,GAAW,KAAK1gC,OAAQ,KAGxB2gC,GAAezhC,EAAS0C,cAAe,KAKxC,SAASg/B,GAA6BC,GAGrC,OAAO,SAAUC,EAAoB5kB,GAED,iBAAvB4kB,IACX5kB,EAAO4kB,EACPA,EAAqB,KAGtB,IAAIC,EACHt/B,EAAI,EACJu/B,EAAYF,EAAmB79B,cAAcsJ,MAAO2N,IAAmB,GAExE,GAAKvZ,EAAYub,GAGhB,MAAU6kB,EAAWC,EAAWv/B,KAGR,MAAlBs/B,EAAU,IACdA,EAAWA,EAASnhC,MAAO,IAAO,KAChCihC,EAAWE,GAAaF,EAAWE,IAAc,IAAKjf,QAAS5F,KAI/D2kB,EAAWE,GAAaF,EAAWE,IAAc,IAAK7gC,KAAMgc,IAQnE,SAAS+kB,GAA+BJ,EAAW/7B,EAASi1B,EAAiBmH,GAE5E,IAAIC,EAAY,GACfC,EAAqBP,IAAcJ,GAEpC,SAASY,EAASN,GACjB,IAAIrtB,EAcJ,OAbAytB,EAAWJ,IAAa,EACxBx+B,GAAOsB,KAAMg9B,EAAWE,IAAc,GAAI,SAAU9lB,EAAGqmB,GACtD,IAAIC,EAAsBD,EAAoBx8B,EAASi1B,EAAiBmH,GACxE,MAAoC,iBAAxBK,GACVH,GAAqBD,EAAWI,GAKtBH,IACD1tB,EAAW6tB,QADf,GAHNz8B,EAAQk8B,UAAUlf,QAASyf,GAC3BF,EAASE,IACF,KAKF7tB,EAGR,OAAO2tB,EAASv8B,EAAQk8B,UAAW,MAAUG,EAAW,MAASE,EAAS,KAM3E,SAASG,GAAYt8B,EAAQhE,GAC5B,IAAIyM,EAAKxI,EACRs8B,EAAcl/B,GAAOm/B,aAAaD,aAAe,GAElD,IAAM9zB,KAAOzM,OACQqE,IAAfrE,EAAKyM,MACP8zB,EAAa9zB,GAAQzI,EAAWC,IAAUA,EAAO,KAAUwI,GAAQzM,EAAKyM,IAO5E,OAJKxI,GACJ5C,GAAOsC,QAAQ,EAAMK,EAAQC,GAGvBD,EA/ERy7B,GAAartB,KAAOP,GAASO,KAgP7B/Q,GAAOsC,OAAQ,CAGd88B,OAAQ,EAGRC,aAAc,GACdC,KAAM,GAENH,aAAc,CACbI,IAAK/uB,GAASO,KACdrS,KAAM,MACN8gC,QAxRgB,4DAwRQh7B,KAAMgM,GAASivB,UACvCljC,QAAQ,EACRmjC,aAAa,EACbC,OAAO,EACPC,YAAa,mDAcbC,QAAS,CACR9H,IAAKoG,GACL7+B,KAAM,aACNqsB,KAAM,YACNzc,IAAK,4BACL4wB,KAAM,qCAGPtpB,SAAU,CACTtH,IAAK,UACLyc,KAAM,SACNmU,KAAM,YAGPC,eAAgB,CACf7wB,IAAK,cACL5P,KAAM,eACNwgC,KAAM,gBAKPE,WAAY,CAGXC,SAAUj3B,OAGVk3B,aAAa,EAGbC,YAAathB,KAAKC,MAGlBshB,WAAYpgC,GAAOm8B,UAOpB+C,YAAa,CACZK,KAAK,EACLr/B,SAAS,IAOXmgC,UAAW,SAAU19B,EAAQ29B,GAC5B,OAAOA,EAGNrB,GAAYA,GAAYt8B,EAAQ3C,GAAOm/B,cAAgBmB,GAGvDrB,GAAYj/B,GAAOm/B,aAAcx8B,IAGnC49B,cAAelC,GAA6BpH,IAC5CuJ,cAAenC,GAA6BH,IAG5CuC,KAAM,SAAUlB,EAAKh9B,GAGA,iBAARg9B,IACXh9B,EAAUg9B,EACVA,OAAMv8B,GAIPT,EAAUA,GAAW,GAErB,IAAIm+B,EAGHC,EAGAC,EACAC,EAGAC,EAGAC,EAGArkB,EAGAskB,EAGA9hC,EAGA+hC,EAGA1D,EAAIv9B,GAAOqgC,UAAW,GAAI99B,GAG1B2+B,EAAkB3D,EAAEr9B,SAAWq9B,EAG/B4D,EAAqB5D,EAAEr9B,UACpBghC,EAAgB5iC,UAAY4iC,EAAgBtgC,QAC9CZ,GAAQkhC,GACRlhC,GAAOskB,MAGRvK,EAAW/Z,GAAO0Z,WAClB0nB,EAAmBphC,GAAOwY,UAAW,eAGrC6oB,EAAa9D,EAAE8D,YAAc,GAG7BC,EAAiB,GACjBC,EAAsB,GAGtBC,EAAW,WAGX7C,EAAQ,CACP7hB,WAAY,EAGZ2kB,kBAAmB,SAAUr2B,GAC5B,IAAIpB,EACJ,GAAK0S,EAAY,CAChB,IAAMmkB,EAAkB,CACvBA,EAAkB,GAClB,MAAU72B,EAAQ+zB,GAAS3zB,KAAMw2B,GAChCC,EAAiB72B,EAAO,GAAItJ,cAAgB,MACzCmgC,EAAiB72B,EAAO,GAAItJ,cAAgB,MAAS,IACrDjD,OAAQuM,EAAO,IAGpBA,EAAQ62B,EAAiBz1B,EAAI1K,cAAgB,KAE9C,OAAgB,MAATsJ,EAAgB,KAAOA,EAAMa,KAAM,OAI3C62B,sBAAuB,WACtB,OAAOhlB,EAAYkkB,EAAwB,MAI5Ce,iBAAkB,SAAUlhC,EAAMqE,GAMjC,OALkB,MAAb4X,IACJjc,EAAO8gC,EAAqB9gC,EAAKC,eAChC6gC,EAAqB9gC,EAAKC,gBAAmBD,EAC9C6gC,EAAgB7gC,GAASqE,GAEnB/H,MAIR6kC,iBAAkB,SAAUljC,GAI3B,OAHkB,MAAbge,IACJ6gB,EAAEsE,SAAWnjC,GAEP3B,MAIRskC,WAAY,SAAU7/B,GACrB,IAAIzC,EACJ,GAAKyC,EACJ,GAAKkb,EAGJiiB,EAAM7kB,OAAQtY,EAAKm9B,EAAMmD,cAIzB,IAAM/iC,KAAQyC,EACb6/B,EAAYtiC,GAAS,CAAEsiC,EAAYtiC,GAAQyC,EAAKzC,IAInD,OAAOhC,MAIRglC,MAAO,SAAUC,GAChB,IAAIC,EAAYD,GAAcR,EAK9B,OAJKd,GACJA,EAAUqB,MAAOE,GAElBp7B,EAAM,EAAGo7B,GACFllC,OAoBV,GAfAgd,EAAS1B,QAASsmB,GAKlBpB,EAAEgC,MAAUA,GAAOhC,EAAEgC,KAAO/uB,GAASO,MAAS,IAC5C3N,QAAS66B,GAAWztB,GAASivB,SAAW,MAG1ClC,EAAE7+B,KAAO6D,EAAQ6V,QAAU7V,EAAQ7D,MAAQ6+B,EAAEnlB,QAAUmlB,EAAE7+B,KAGzD6+B,EAAEkB,WAAclB,EAAEiB,UAAY,KAAM99B,cAAcsJ,MAAO2N,IAAmB,CAAE,IAGxD,MAAjB4lB,EAAE2E,YAAsB,CAC5BnB,EAAYpkC,EAAS0C,cAAe,KAKpC,IACC0hC,EAAUhwB,KAAOwsB,EAAEgC,IAInBwB,EAAUhwB,KAAOgwB,EAAUhwB,KAC3BwsB,EAAE2E,YAAc9D,GAAaqB,SAAW,KAAOrB,GAAa+D,MAC3DpB,EAAUtB,SAAW,KAAOsB,EAAUoB,KACtC,MAAQz4B,GAIT6zB,EAAE2E,aAAc,GAalB,GARK3E,EAAElf,MAAQkf,EAAEmC,aAAiC,iBAAXnC,EAAElf,OACxCkf,EAAElf,KAAOre,GAAOs9B,MAAOC,EAAElf,KAAMkf,EAAEF,cAIlCqB,GAA+BzH,GAAYsG,EAAGh7B,EAASo8B,GAGlDjiB,EACJ,OAAOiiB,EA8ER,IAAMz/B,KAzEN8hC,EAAchhC,GAAOskB,OAASiZ,EAAEhhC,SAGQ,GAApByD,GAAOo/B,UAC1Bp/B,GAAOskB,MAAMU,QAAS,aAIvBuY,EAAE7+B,KAAO6+B,EAAE7+B,KAAKif,cAGhB4f,EAAE6E,YAAcpE,GAAWx5B,KAAM+4B,EAAE7+B,MAKnCiiC,EAAWpD,EAAEgC,IAAIn8B,QAASy6B,GAAO,IAG3BN,EAAE6E,WAwBI7E,EAAElf,MAAQkf,EAAEmC,aACoD,KAAzEnC,EAAEqC,aAAe,IAAKhiC,QAAS,uCACjC2/B,EAAElf,KAAOkf,EAAElf,KAAKjb,QAASw6B,GAAK,OAvB9BqD,EAAW1D,EAAEgC,IAAIliC,MAAOsjC,EAASrgC,QAG5Bi9B,EAAElf,OAAUkf,EAAEmC,aAAiC,iBAAXnC,EAAElf,QAC1CsiB,IAAczE,GAAO13B,KAAMm8B,GAAa,IAAM,KAAQpD,EAAElf,YAGjDkf,EAAElf,OAIO,IAAZkf,EAAEpyB,QACNw1B,EAAWA,EAASv9B,QAAS06B,GAAY,MACzCmD,GAAa/E,GAAO13B,KAAMm8B,GAAa,IAAM,KAAQ,KAAS/hC,GAAMmG,OACnEk8B,GAIF1D,EAAEgC,IAAMoB,EAAWM,GASf1D,EAAE8E,aACDriC,GAAOq/B,aAAcsB,IACzBhC,EAAMgD,iBAAkB,oBAAqB3hC,GAAOq/B,aAAcsB,IAE9D3gC,GAAOs/B,KAAMqB,IACjBhC,EAAMgD,iBAAkB,gBAAiB3hC,GAAOs/B,KAAMqB,MAKnDpD,EAAElf,MAAQkf,EAAE6E,aAAgC,IAAlB7E,EAAEqC,aAAyBr9B,EAAQq9B,cACjEjB,EAAMgD,iBAAkB,eAAgBpE,EAAEqC,aAI3CjB,EAAMgD,iBACL,SACApE,EAAEkB,UAAW,IAAOlB,EAAEsC,QAAStC,EAAEkB,UAAW,IAC3ClB,EAAEsC,QAAStC,EAAEkB,UAAW,KACA,MAArBlB,EAAEkB,UAAW,GAAc,KAAON,GAAW,WAAa,IAC7DZ,EAAEsC,QAAS,MAIFtC,EAAE+E,QACZ3D,EAAMgD,iBAAkBziC,EAAGq+B,EAAE+E,QAASpjC,IAIvC,GAAKq+B,EAAEgF,cAC+C,IAAnDhF,EAAEgF,WAAW/kC,KAAM0jC,EAAiBvC,EAAOpB,IAAiB7gB,GAG9D,OAAOiiB,EAAMoD,QAed,GAXAP,EAAW,QAGXJ,EAAiBnqB,IAAKsmB,EAAE3F,UACxB+G,EAAM93B,KAAM02B,EAAEiF,SACd7D,EAAMrmB,KAAMilB,EAAEj6B,OAGdo9B,EAAYhC,GAA+BR,GAAYX,EAAGh7B,EAASo8B,GAK5D,CASN,GARAA,EAAM7hB,WAAa,EAGdkkB,GACJG,EAAmBnc,QAAS,WAAY,CAAE2Z,EAAOpB,IAI7C7gB,EACJ,OAAOiiB,EAIHpB,EAAEoC,OAAqB,EAAZpC,EAAEvD,UACjB8G,EAAehkC,GAAO2e,WAAY,WACjCkjB,EAAMoD,MAAO,YACXxE,EAAEvD,UAGN,IACCtd,GAAY,EACZgkB,EAAU+B,KAAMnB,EAAgBz6B,GAC/B,MAAQ6C,GAGT,GAAKgT,EACJ,MAAMhT,EAIP7C,GAAO,EAAG6C,SAhCX7C,GAAO,EAAG,gBAqCX,SAASA,EAAMi7B,EAAQY,EAAkBC,EAAWL,GACnD,IAAIM,EAAWJ,EAASl/B,EAAOu/B,EAAUC,EACxCd,EAAaU,EAGThmB,IAILA,GAAY,EAGPokB,GACJhkC,GAAOm9B,aAAc6G,GAKtBJ,OAAY19B,EAGZ49B,EAAwB0B,GAAW,GAGnC3D,EAAM7hB,WAAsB,EAATglB,EAAa,EAAI,EAGpCc,EAAsB,KAAVd,GAAiBA,EAAS,KAAkB,MAAXA,EAGxCa,IACJE,EA7lBJ,SAA8BtF,EAAGoB,EAAOgE,GAEvC,IAAII,EAAIrkC,EAAMskC,EAAeC,EAC5BzsB,EAAW+mB,EAAE/mB,SACbioB,EAAYlB,EAAEkB,UAGf,MAA2B,MAAnBA,EAAW,GAClBA,EAAUnzB,aACEtI,IAAP+/B,IACJA,EAAKxF,EAAEsE,UAAYlD,EAAM8C,kBAAmB,iBAK9C,GAAKsB,EACJ,IAAMrkC,KAAQ8X,EACb,GAAKA,EAAU9X,IAAU8X,EAAU9X,GAAO8F,KAAMu+B,GAAO,CACtDtE,EAAUlf,QAAS7gB,GACnB,MAMH,GAAK+/B,EAAW,KAAOkE,EACtBK,EAAgBvE,EAAW,OACrB,CAGN,IAAM//B,KAAQikC,EAAY,CACzB,IAAMlE,EAAW,IAAOlB,EAAEyC,WAAYthC,EAAO,IAAM+/B,EAAW,IAAQ,CACrEuE,EAAgBtkC,EAChB,MAEKukC,IACLA,EAAgBvkC,GAKlBskC,EAAgBA,GAAiBC,EAMlC,GAAKD,EAIJ,OAHKA,IAAkBvE,EAAW,IACjCA,EAAUlf,QAASyjB,GAEbL,EAAWK,GA0iBLE,CAAqB3F,EAAGoB,EAAOgE,KAIrCC,IACsC,EAA3C5iC,GAAOkE,QAAS,SAAUq5B,EAAEkB,YAC5Bz+B,GAAOkE,QAAS,OAAQq5B,EAAEkB,WAAc,IACxClB,EAAEyC,WAAY,eAAkB,cAIjC6C,EA9iBH,SAAsBtF,EAAGsF,EAAUlE,EAAOiE,GACzC,IAAIO,EAAOC,EAASC,EAAM1jB,EAAKlJ,EAC9BupB,EAAa,GAGbvB,EAAYlB,EAAEkB,UAAUphC,QAGzB,GAAKohC,EAAW,GACf,IAAM4E,KAAQ9F,EAAEyC,WACfA,EAAYqD,EAAK3iC,eAAkB68B,EAAEyC,WAAYqD,GAInDD,EAAU3E,EAAUnzB,QAGpB,MAAQ83B,EAcP,GAZK7F,EAAEwC,eAAgBqD,KACtBzE,EAAOpB,EAAEwC,eAAgBqD,IAAcP,IAIlCpsB,GAAQmsB,GAAarF,EAAE+F,aAC5BT,EAAWtF,EAAE+F,WAAYT,EAAUtF,EAAEiB,WAGtC/nB,EAAO2sB,EACPA,EAAU3E,EAAUnzB,QAKnB,GAAiB,MAAZ83B,EAEJA,EAAU3sB,OAGJ,GAAc,MAATA,GAAgBA,IAAS2sB,EAAU,CAM9C,KAHAC,EAAOrD,EAAYvpB,EAAO,IAAM2sB,IAAapD,EAAY,KAAOoD,IAI/D,IAAMD,KAASnD,EAId,IADArgB,EAAMwjB,EAAMj+B,MAAO,MACT,KAAQk+B,IAGjBC,EAAOrD,EAAYvpB,EAAO,IAAMkJ,EAAK,KACpCqgB,EAAY,KAAOrgB,EAAK,KACb,EAGG,IAAT0jB,EACJA,EAAOrD,EAAYmD,IAGgB,IAAxBnD,EAAYmD,KACvBC,EAAUzjB,EAAK,GACf8e,EAAUlf,QAASI,EAAK,KAEzB,MAOJ,IAAc,IAAT0jB,EAGJ,GAAKA,GAAQ9F,EAAEgG,UACdV,EAAWQ,EAAMR,QAEjB,IACCA,EAAWQ,EAAMR,GAChB,MAAQn5B,GACT,MAAO,CACNmQ,MAAO,cACPvW,MAAO+/B,EAAO35B,EAAI,sBAAwB+M,EAAO,OAAS2sB,IASjE,MAAO,CAAEvpB,MAAO,UAAWwE,KAAMwkB,GAidpBW,CAAajG,EAAGsF,EAAUlE,EAAOiE,GAGvCA,GAGCrF,EAAE8E,cACNS,EAAWnE,EAAM8C,kBAAmB,oBAEnCzhC,GAAOq/B,aAAcsB,GAAamC,IAEnCA,EAAWnE,EAAM8C,kBAAmB,WAEnCzhC,GAAOs/B,KAAMqB,GAAamC,IAKZ,MAAXhB,GAA6B,SAAXvE,EAAE7+B,KACxBsjC,EAAa,YAGS,MAAXF,EACXE,EAAa,eAIbA,EAAaa,EAAShpB,MACtB2oB,EAAUK,EAASxkB,KAEnBukB,IADAt/B,EAAQu/B,EAASv/B,UAMlBA,EAAQ0+B,GACHF,GAAWE,IACfA,EAAa,QACRF,EAAS,IACbA,EAAS,KAMZnD,EAAMmD,OAASA,EACfnD,EAAMqD,YAAeU,GAAoBV,GAAe,GAGnDY,EACJ7oB,EAASoB,YAAa+lB,EAAiB,CAAEsB,EAASR,EAAYrD,IAE9D5kB,EAASuB,WAAY4lB,EAAiB,CAAEvC,EAAOqD,EAAY1+B,IAI5Dq7B,EAAM0C,WAAYA,GAClBA,OAAar+B,EAERg+B,GACJG,EAAmBnc,QAAS4d,EAAY,cAAgB,YACvD,CAAEjE,EAAOpB,EAAGqF,EAAYJ,EAAUl/B,IAIpC89B,EAAiB3nB,SAAUynB,EAAiB,CAAEvC,EAAOqD,IAEhDhB,IACJG,EAAmBnc,QAAS,eAAgB,CAAE2Z,EAAOpB,MAG3Cv9B,GAAOo/B,QAChBp/B,GAAOskB,MAAMU,QAAS,cAKzB,OAAO2Z,GAGR8E,QAAS,SAAUlE,EAAKlhB,EAAM9c,GAC7B,OAAOvB,GAAOe,IAAKw+B,EAAKlhB,EAAM9c,EAAU,SAGzCmiC,UAAW,SAAUnE,EAAKh+B,GACzB,OAAOvB,GAAOe,IAAKw+B,OAAKv8B,EAAWzB,EAAU,aAI/CvB,GAAOsB,KAAM,CAAE,MAAO,QAAU,SAAU6D,EAAIiT,GAC7CpY,GAAQoY,GAAW,SAAUmnB,EAAKlhB,EAAM9c,EAAU7C,GAUjD,OAPKN,EAAYigB,KAChB3f,EAAOA,GAAQ6C,EACfA,EAAW8c,EACXA,OAAOrb,GAIDhD,GAAOygC,KAAMzgC,GAAOsC,OAAQ,CAClCi9B,IAAKA,EACL7gC,KAAM0Z,EACNomB,SAAU9/B,EACV2f,KAAMA,EACNmkB,QAASjhC,GACPvB,GAAO6C,cAAe08B,IAASA,OAIpCv/B,GAAOugC,cAAe,SAAUhD,GAC/B,IAAIr+B,EACJ,IAAMA,KAAKq+B,EAAE+E,QACa,iBAApBpjC,EAAEwB,gBACN68B,EAAEqC,YAAcrC,EAAE+E,QAASpjC,IAAO,MAMrCc,GAAO4rB,SAAW,SAAU2T,EAAKh9B,EAAStD,GACzC,OAAOe,GAAOygC,KAAM,CACnBlB,IAAKA,EAGL7gC,KAAM,MACN8/B,SAAU,SACVrzB,OAAO,EACPw0B,OAAO,EACPpjC,QAAQ,EAKRyjC,WAAY,CACX2D,cAAe,cAEhBL,WAAY,SAAUT,GACrB7iC,GAAO4D,WAAYi/B,EAAUtgC,EAAStD,OAMzCe,GAAOG,GAAGmC,OAAQ,CACjBshC,QAAS,SAAUjY,GAClB,IAAIlI,EAyBJ,OAvBK1mB,KAAM,KACLqB,EAAYutB,KAChBA,EAAOA,EAAKnuB,KAAMT,KAAM,KAIzB0mB,EAAOzjB,GAAQ2rB,EAAM5uB,KAAM,GAAIwH,eAAgB5C,GAAI,GAAIe,OAAO,GAEzD3F,KAAM,GAAI4C,YACd8jB,EAAK8I,aAAcxvB,KAAM,IAG1B0mB,EAAKjiB,IAAK,WACT,IAAIhB,EAAOzD,KAEX,MAAQyD,EAAKqjC,kBACZrjC,EAAOA,EAAKqjC,kBAGb,OAAOrjC,IACJ6rB,OAAQtvB,OAGNA,MAGR+mC,UAAW,SAAUnY,GACpB,OAAKvtB,EAAYutB,GACT5uB,KAAKuE,KAAM,SAAUpC,GAC3Bc,GAAQjD,MAAO+mC,UAAWnY,EAAKnuB,KAAMT,KAAMmC,MAItCnC,KAAKuE,KAAM,WACjB,IAAI2U,EAAOjW,GAAQjD,MAClByZ,EAAWP,EAAKO,WAEZA,EAASlW,OACbkW,EAASotB,QAASjY,GAGlB1V,EAAKoW,OAAQV,MAKhBlI,KAAM,SAAUkI,GACf,IAAIoY,EAAiB3lC,EAAYutB,GAEjC,OAAO5uB,KAAKuE,KAAM,SAAUpC,GAC3Bc,GAAQjD,MAAO6mC,QAASG,EAAiBpY,EAAKnuB,KAAMT,KAAMmC,GAAMysB,MAIlEqY,OAAQ,SAAU/jC,GAIjB,OAHAlD,KAAKuS,OAAQrP,GAAW+P,IAAK,QAAS1O,KAAM,WAC3CtB,GAAQjD,MAAO2vB,YAAa3vB,KAAK0M,cAE3B1M,QAKTiD,GAAOqN,KAAK9F,QAAQ6uB,OAAS,SAAU51B,GACtC,OAAQR,GAAOqN,KAAK9F,QAAQ08B,QAASzjC,IAEtCR,GAAOqN,KAAK9F,QAAQ08B,QAAU,SAAUzjC,GACvC,SAAWA,EAAK0uB,aAAe1uB,EAAK6vB,cAAgB7vB,EAAK4xB,iBAAiB9xB,SAM3EN,GAAOm/B,aAAa+E,IAAM,WACzB,IACC,OAAO,IAAIpnC,GAAOqnC,eACjB,MAAQz6B,MAGX,IAAI06B,GAAmB,CAGrBC,EAAG,IAIHC,KAAM,KAEPC,GAAevkC,GAAOm/B,aAAa+E,MAEpC/lC,GAAQqmC,OAASD,IAAkB,oBAAqBA,GACxDpmC,GAAQsiC,KAAO8D,KAAiBA,GAEhCvkC,GAAOwgC,cAAe,SAAUj+B,GAC/B,IAAIhB,EAAUkjC,EAGd,GAAKtmC,GAAQqmC,MAAQD,KAAiBhiC,EAAQ2/B,YAC7C,MAAO,CACNO,KAAM,SAAUH,EAAS1K,GACxB,IAAI14B,EACHglC,EAAM3hC,EAAQ2hC,MAWf,GATAA,EAAIQ,KACHniC,EAAQ7D,KACR6D,EAAQg9B,IACRh9B,EAAQo9B,MACRp9B,EAAQoiC,SACRpiC,EAAQyP,UAIJzP,EAAQqiC,UACZ,IAAM1lC,KAAKqD,EAAQqiC,UAClBV,EAAKhlC,GAAMqD,EAAQqiC,UAAW1lC,GAmBhC,IAAMA,KAdDqD,EAAQs/B,UAAYqC,EAAItC,kBAC5BsC,EAAItC,iBAAkBr/B,EAAQs/B,UAQzBt/B,EAAQ2/B,aAAgBI,EAAS,sBACtCA,EAAS,oBAAuB,kBAItBA,EACV4B,EAAIvC,iBAAkBziC,EAAGojC,EAASpjC,IAInCqC,EAAW,SAAU7C,GACpB,OAAO,WACD6C,IACJA,EAAWkjC,EAAgBP,EAAIW,OAC9BX,EAAIY,QAAUZ,EAAIa,QAAUb,EAAIc,UAC/Bd,EAAIe,mBAAqB,KAEb,UAATvmC,EACJwlC,EAAInC,QACgB,UAATrjC,EAKgB,iBAAfwlC,EAAIpC,OACflK,EAAU,EAAG,SAEbA,EAGCsM,EAAIpC,OACJoC,EAAIlC,YAINpK,EACCwM,GAAkBF,EAAIpC,SAAYoC,EAAIpC,OACtCoC,EAAIlC,WAK+B,UAAjCkC,EAAIgB,cAAgB,SACM,iBAArBhB,EAAIiB,aACV,CAAEC,OAAQlB,EAAIrB,UACd,CAAEvjC,KAAM4kC,EAAIiB,cACbjB,EAAIxC,4BAQTwC,EAAIW,OAAStjC,IACbkjC,EAAgBP,EAAIY,QAAUZ,EAAIc,UAAYzjC,EAAU,cAKnCyB,IAAhBkhC,EAAIa,QACRb,EAAIa,QAAUN,EAEdP,EAAIe,mBAAqB,WAGA,IAAnBf,EAAIpnB,YAMRhgB,GAAO2e,WAAY,WACbla,GACJkjC,OAQLljC,EAAWA,EAAU,SAErB,IAGC2iC,EAAIzB,KAAMlgC,EAAQ6/B,YAAc7/B,EAAQ8b,MAAQ,MAC/C,MAAQ3U,GAGT,GAAKnI,EACJ,MAAMmI,IAKTq4B,MAAO,WACDxgC,GACJA,QAWLvB,GAAOugC,cAAe,SAAUhD,GAC1BA,EAAE2E,cACN3E,EAAE/mB,SAASpX,QAAS,KAKtBY,GAAOqgC,UAAW,CACjBR,QAAS,CACRzgC,OAAQ,6FAGToX,SAAU,CACTpX,OAAQ,2BAET4gC,WAAY,CACX2D,cAAe,SAAUrkC,GAExB,OADAU,GAAO4D,WAAYtE,GACZA,MAMVU,GAAOugC,cAAe,SAAU,SAAUhD,QACxBv6B,IAAZu6B,EAAEpyB,QACNoyB,EAAEpyB,OAAQ,GAENoyB,EAAE2E,cACN3E,EAAE7+B,KAAO,SAKXsB,GAAOwgC,cAAe,SAAU,SAAUjD,GAIxC,IAAIn+B,EAAQmC,EADb,GAAKg8B,EAAE2E,aAAe3E,EAAE8H,YAEvB,MAAO,CACN5C,KAAM,SAAU/pB,EAAGkf,GAClBx4B,EAASY,GAAQ,YACfwN,KAAM+vB,EAAE8H,aAAe,IACvB/mB,KAAM,CAAEgnB,QAAS/H,EAAEgI,cAAe5mC,IAAK4+B,EAAEgC,MACzCrb,GAAI,aAAc3iB,EAAW,SAAUikC,GACvCpmC,EAAOka,SACP/X,EAAW,KACNikC,GACJ5N,EAAuB,UAAb4N,EAAI9mC,KAAmB,IAAM,IAAK8mC,EAAI9mC,QAKnD/B,EAAS8C,KAAKC,YAAaN,EAAQ,KAEpC2iC,MAAO,WACDxgC,GACJA,QAUL,IAqGKigB,GArGDikB,GAAe,GAClBC,GAAS,oBAGV1lC,GAAOqgC,UAAW,CACjBsF,MAAO,WACPC,cAAe,WACd,IAAIrkC,EAAWkkC,GAAargC,OAAWpF,GAAOiD,QAAU,IAAQrE,GAAMmG,OAEtE,OADAhI,KAAMwE,IAAa,EACZA,KAKTvB,GAAOugC,cAAe,aAAc,SAAUhD,EAAGsI,EAAkBlH,GAElE,IAAImH,EAAcC,EAAaC,EAC9BC,GAAuB,IAAZ1I,EAAEoI,QAAqBD,GAAOlhC,KAAM+4B,EAAEgC,KAChD,MACkB,iBAAXhC,EAAElf,MAE6C,KADnDkf,EAAEqC,aAAe,IACjBhiC,QAAS,sCACX8nC,GAAOlhC,KAAM+4B,EAAElf,OAAU,QAI5B,GAAK4nB,GAAiC,UAArB1I,EAAEkB,UAAW,GA8D7B,OA3DAqH,EAAevI,EAAEqI,cAAgBxnC,EAAYm/B,EAAEqI,eAC9CrI,EAAEqI,gBACFrI,EAAEqI,cAGEK,EACJ1I,EAAG0I,GAAa1I,EAAG0I,GAAW7iC,QAASsiC,GAAQ,KAAOI,IAC/B,IAAZvI,EAAEoI,QACbpI,EAAEgC,MAASrD,GAAO13B,KAAM+4B,EAAEgC,KAAQ,IAAM,KAAQhC,EAAEoI,MAAQ,IAAMG,GAIjEvI,EAAEyC,WAAY,eAAkB,WAI/B,OAHMgG,GACLhmC,GAAOsD,MAAOwiC,EAAe,mBAEvBE,EAAmB,IAI3BzI,EAAEkB,UAAW,GAAM,OAGnBsH,EAAcjpC,GAAQgpC,GACtBhpC,GAAQgpC,GAAiB,WACxBE,EAAoBvkC,WAIrBk9B,EAAM7kB,OAAQ,gBAGQ9W,IAAhB+iC,EACJ/lC,GAAQlD,IAASm+B,WAAY6K,GAI7BhpC,GAAQgpC,GAAiBC,EAIrBxI,EAAGuI,KAGPvI,EAAEqI,cAAgBC,EAAiBD,cAGnCH,GAAa9nC,KAAMmoC,IAIfE,GAAqB5nC,EAAY2nC,IACrCA,EAAaC,EAAmB,IAGjCA,EAAoBD,OAAc/iC,IAI5B,WAYT7E,GAAQ+nC,qBACH1kB,GAAO7kB,EAASwpC,eAAeD,mBAAoB,IAAK1kB,MACvDtU,UAAY,6BACiB,IAA3BsU,GAAK/X,WAAWnJ,QAQxBN,GAAOmW,UAAY,SAAUkI,EAAMne,EAASkmC,GAC3C,MAAqB,iBAAT/nB,EACJ,IAEgB,kBAAZne,IACXkmC,EAAclmC,EACdA,GAAU,GAKLA,IAIA/B,GAAQ+nC,qBAMZxzB,GALAxS,EAAUvD,EAASwpC,eAAeD,mBAAoB,KAKvC7mC,cAAe,SACzB0R,KAAOpU,EAAS6T,SAASO,KAC9B7Q,EAAQT,KAAKC,YAAagT,IAE1BxS,EAAUvD,GAKZ2mB,GAAW8iB,GAAe,IAD1BC,EAASvwB,EAAW1L,KAAMiU,IAKlB,CAAEne,EAAQb,cAAegnC,EAAQ,MAGzCA,EAAShjB,GAAe,CAAEhF,GAAQne,EAASojB,GAEtCA,GAAWA,EAAQhjB,QACvBN,GAAQsjB,GAAUhK,SAGZtZ,GAAOoB,MAAO,GAAIilC,EAAO58B,cAlChC,IAAIiJ,EAAM2zB,EAAQ/iB,GAyCnBtjB,GAAOG,GAAGonB,KAAO,SAAUgY,EAAK+G,EAAQ/kC,GACvC,IAAItB,EAAUvB,EAAMmkC,EACnB5sB,EAAOlZ,KACPwnB,EAAMgb,EAAI3hC,QAAS,KAsDpB,OApDY,EAAP2mB,IACJtkB,EAAW66B,GAAkByE,EAAIliC,MAAOknB,IACxCgb,EAAMA,EAAIliC,MAAO,EAAGknB,IAIhBnmB,EAAYkoC,IAGhB/kC,EAAW+kC,EACXA,OAAStjC,GAGEsjC,GAA4B,iBAAXA,IAC5B5nC,EAAO,QAIW,EAAduX,EAAK3V,QACTN,GAAOygC,KAAM,CACZlB,IAAKA,EAKL7gC,KAAMA,GAAQ,MACd8/B,SAAU,OACVngB,KAAMioB,IACHz/B,KAAM,SAAUs+B,GAGnBtC,EAAWphC,UAEXwU,EAAK0V,KAAM1rB,EAIVD,GAAQ,SAAUqsB,OAAQrsB,GAAOmW,UAAWgvB,IAAiBv7B,KAAM3J,GAGnEklC,KAKErrB,OAAQvY,GAAY,SAAUo9B,EAAOmD,GACxC7rB,EAAK3U,KAAM,WACVC,EAAS7D,MAAOX,KAAM8lC,GAAY,CAAElE,EAAMwG,aAAcrD,EAAQnD,QAK5D5hC,MAMRiD,GAAOqN,KAAK9F,QAAQg/B,SAAW,SAAU/lC,GACxC,OAAOR,GAAO8B,KAAM9B,GAAOo5B,OAAQ,SAAUj5B,GAC5C,OAAOK,IAASL,EAAGK,OAChBF,QAMLN,GAAOwmC,OAAS,CACfC,UAAW,SAAUjmC,EAAM+B,EAASrD,GACnC,IAAIwnC,EAAaC,EAASC,EAAWC,EAAQC,EAAWC,EACvD/X,EAAWhvB,GAAOwgB,IAAKhgB,EAAM,YAC7BwmC,EAAUhnC,GAAQQ,GAClBonB,EAAQ,GAGS,WAAboH,IACJxuB,EAAK8f,MAAM0O,SAAW,YAGvB8X,EAAYE,EAAQR,SACpBI,EAAY5mC,GAAOwgB,IAAKhgB,EAAM,OAC9BumC,EAAa/mC,GAAOwgB,IAAKhgB,EAAM,SACI,aAAbwuB,GAAwC,UAAbA,KACA,GAA9C4X,EAAYG,GAAanpC,QAAS,SAMpCipC,GADAH,EAAcM,EAAQhY,YACD3iB,IACrBs6B,EAAUD,EAAYpS,OAGtBuS,EAASxX,WAAYuX,IAAe,EACpCD,EAAUtX,WAAY0X,IAAgB,GAGlC3oC,EAAYmE,KAGhBA,EAAUA,EAAQ/E,KAAMgD,EAAMtB,EAAGc,GAAOsC,OAAQ,GAAIwkC,KAGjC,MAAfvkC,EAAQ8J,MACZub,EAAMvb,IAAQ9J,EAAQ8J,IAAMy6B,EAAUz6B,IAAQw6B,GAE1B,MAAhBtkC,EAAQ+xB,OACZ1M,EAAM0M,KAAS/xB,EAAQ+xB,KAAOwS,EAAUxS,KAASqS,GAG7C,UAAWpkC,EACfA,EAAQ0kC,MAAMzpC,KAAMgD,EAAMonB,GAG1Bof,EAAQxmB,IAAKoH,KAKhB5nB,GAAOG,GAAGmC,OAAQ,CAGjBkkC,OAAQ,SAAUjkC,GAGjB,GAAKd,UAAUnB,OACd,YAAmB0C,IAAZT,EACNxF,KACAA,KAAKuE,KAAM,SAAUpC,GACpBc,GAAOwmC,OAAOC,UAAW1pC,KAAMwF,EAASrD,KAI3C,IAAIgoC,EAAMC,EACT3mC,EAAOzD,KAAM,GAEd,OAAMyD,EAQAA,EAAK4xB,iBAAiB9xB,QAK5B4mC,EAAO1mC,EAAK4zB,wBACZ+S,EAAM3mC,EAAK+D,cAAc6H,YAClB,CACNC,IAAK66B,EAAK76B,IAAM86B,EAAIC,YACpB9S,KAAM4S,EAAK5S,KAAO6S,EAAIE,cARf,CAAEh7B,IAAK,EAAGioB,KAAM,QATxB,GAuBDtF,SAAU,WACT,GAAMjyB,KAAM,GAAZ,CAIA,IAAIuqC,EAAcd,EAAQvnC,EACzBuB,EAAOzD,KAAM,GACbwqC,EAAe,CAAEl7B,IAAK,EAAGioB,KAAM,GAGhC,GAAwC,UAAnCt0B,GAAOwgB,IAAKhgB,EAAM,YAGtBgmC,EAAShmC,EAAK4zB,4BAER,CACNoS,EAASzpC,KAAKypC,SAIdvnC,EAAMuB,EAAK+D,cACX+iC,EAAe9mC,EAAK8mC,cAAgBroC,EAAI6E,gBACxC,MAAQwjC,IACLA,IAAiBroC,EAAIuiB,MAAQ8lB,IAAiBroC,EAAI6E,kBACT,WAA3C9D,GAAOwgB,IAAK8mB,EAAc,YAE1BA,EAAeA,EAAa3nC,WAExB2nC,GAAgBA,IAAiB9mC,GAAkC,IAA1B8mC,EAAahpC,YAG1DipC,EAAevnC,GAAQsnC,GAAed,UACzBn6B,KAAOrM,GAAOwgB,IAAK8mB,EAAc,kBAAkB,GAChEC,EAAajT,MAAQt0B,GAAOwgB,IAAK8mB,EAAc,mBAAmB,IAKpE,MAAO,CACNj7B,IAAKm6B,EAAOn6B,IAAMk7B,EAAal7B,IAAMrM,GAAOwgB,IAAKhgB,EAAM,aAAa,GACpE8zB,KAAMkS,EAAOlS,KAAOiT,EAAajT,KAAOt0B,GAAOwgB,IAAKhgB,EAAM,cAAc,MAc1E8mC,aAAc,WACb,OAAOvqC,KAAKyE,IAAK,WAChB,IAAI8lC,EAAevqC,KAAKuqC,aAExB,MAAQA,GAA2D,WAA3CtnC,GAAOwgB,IAAK8mB,EAAc,YACjDA,EAAeA,EAAaA,aAG7B,OAAOA,GAAgBxjC,OAM1B9D,GAAOsB,KAAM,CAAEk0B,WAAY,cAAeD,UAAW,eAAiB,SAAUnd,EAAQkG,GACvF,IAAIjS,EAAM,gBAAkBiS,EAE5Bte,GAAOG,GAAIiY,GAAW,SAAUjZ,GAC/B,OAAO6d,EAAQjgB,KAAM,SAAUyD,EAAM4X,EAAQjZ,GAG5C,IAAIgoC,EAOJ,GANK3oC,EAAUgC,GACd2mC,EAAM3mC,EACuB,IAAlBA,EAAKlC,WAChB6oC,EAAM3mC,EAAK4L,kBAGCpJ,IAAR7D,EACJ,OAAOgoC,EAAMA,EAAK7oB,GAAS9d,EAAM4X,GAG7B+uB,EACJA,EAAIK,SACFn7B,EAAY86B,EAAIE,YAAVloC,EACPkN,EAAMlN,EAAMgoC,EAAIC,aAIjB5mC,EAAM4X,GAAWjZ,GAEhBiZ,EAAQjZ,EAAKsC,UAAUnB,WAU5BN,GAAOsB,KAAM,CAAE,MAAO,QAAU,SAAU6D,EAAImZ,GAC7Cte,GAAOuyB,SAAUjU,GAAS4P,GAAc/vB,GAAQuxB,cAC/C,SAAUlvB,EAAMmtB,GACf,GAAKA,EAIJ,OAHAA,EAAWD,GAAQltB,EAAM8d,GAGlB4O,GAAU1oB,KAAMmpB,GACtB3tB,GAAQQ,GAAOwuB,WAAY1Q,GAAS,KACpCqP,MAQL3tB,GAAOsB,KAAM,CAAEmmC,OAAQ,SAAUC,MAAO,SAAW,SAAUjnC,EAAM/B,GAClEsB,GAAOsB,KAAM,CACZkzB,QAAS,QAAU/zB,EACnBgX,QAAS/Y,EACTipC,GAAI,QAAUlnC,GACZ,SAAUmnC,EAAcC,GAG1B7nC,GAAOG,GAAI0nC,GAAa,SAAUtT,EAAQzvB,GACzC,IAAImY,EAAYxb,UAAUnB,SAAYsnC,GAAkC,kBAAXrT,GAC5D1C,EAAQ+V,KAA6B,IAAXrT,IAA6B,IAAVzvB,EAAiB,SAAW,UAE1E,OAAOkY,EAAQjgB,KAAM,SAAUyD,EAAM9B,EAAMoG,GAC1C,IAAI7F,EAEJ,OAAKT,EAAUgC,GAGyB,IAAhCqnC,EAASjqC,QAAS,SACxB4C,EAAM,QAAUC,GAChBD,EAAK7D,SAASmH,gBAAiB,SAAWrD,GAIrB,IAAlBD,EAAKlC,UACTW,EAAMuB,EAAKsD,gBAIJZ,KAAKouB,IACX9wB,EAAKghB,KAAM,SAAW/gB,GAAQxB,EAAK,SAAWwB,GAC9CD,EAAKghB,KAAM,SAAW/gB,GAAQxB,EAAK,SAAWwB,GAC9CxB,EAAK,SAAWwB,UAIDuC,IAAV8B,EAGN9E,GAAOwgB,IAAKhgB,EAAM9B,EAAMmzB,GAGxB7xB,GAAOsgB,MAAO9f,EAAM9B,EAAMoG,EAAO+sB,IAChCnzB,EAAMue,EAAYsX,OAASvxB,EAAWia,QAM5Cjd,GAAOsB,KAAM,CACZ,YACA,WACA,eACA,YACA,cACA,YACE,SAAU6D,EAAIzG,GAChBsB,GAAOG,GAAIzB,GAAS,SAAUyB,GAC7B,OAAOpD,KAAKmnB,GAAIxlB,EAAMyB,MAOxBH,GAAOG,GAAGmC,OAAQ,CAEjBq1B,KAAM,SAAUxT,EAAO9F,EAAMle,GAC5B,OAAOpD,KAAKmnB,GAAIC,EAAO,KAAM9F,EAAMle,IAEpC2nC,OAAQ,SAAU3jB,EAAOhkB,GACxB,OAAOpD,KAAKwnB,IAAKJ,EAAO,KAAMhkB,IAG/B4nC,SAAU,SAAU9nC,EAAUkkB,EAAO9F,EAAMle,GAC1C,OAAOpD,KAAKmnB,GAAIC,EAAOlkB,EAAUoe,EAAMle,IAExC6nC,WAAY,SAAU/nC,EAAUkkB,EAAOhkB,GAGtC,OAA4B,IAArBsB,UAAUnB,OAChBvD,KAAKwnB,IAAKtkB,EAAU,MACpBlD,KAAKwnB,IAAKJ,EAAOlkB,GAAY,KAAME,IAGrC8nC,MAAO,SAAUC,EAAQC,GACxB,OAAOprC,KACLmnB,GAAI,aAAcgkB,GAClBhkB,GAAI,aAAcikB,GAASD,MAI/BloC,GAAOsB,KACN,wLAE4D4D,MAAO,KACnE,SAAUC,EAAI1E,GAGbT,GAAOG,GAAIM,GAAS,SAAU4d,EAAMle,GACnC,OAA0B,EAAnBsB,UAAUnB,OAChBvD,KAAKmnB,GAAIzjB,EAAM,KAAM4d,EAAMle,GAC3BpD,KAAKioB,QAASvkB,MAYlB,IAAI2nC,GAAQ,sDAMZpoC,GAAOqoC,MAAQ,SAAUloC,EAAID,GAC5B,IAAIyf,EAAK/P,EAAMy4B,EAUf,GARwB,iBAAZnoC,IACXyf,EAAMxf,EAAID,GACVA,EAAUC,EACVA,EAAKwf,GAKAvhB,EAAY+B,GAalB,OARAyP,EAAOvS,GAAMG,KAAMiE,UAAW,IAC9B4mC,EAAQ,WACP,OAAOloC,EAAGzC,MAAOwC,GAAWnD,KAAM6S,EAAKnS,OAAQJ,GAAMG,KAAMiE,eAItDsD,KAAO5E,EAAG4E,KAAO5E,EAAG4E,MAAQ/E,GAAO+E,OAElCsjC,GAGRroC,GAAOsoC,UAAY,SAAUC,GACvBA,EACJvoC,GAAO4c,YAEP5c,GAAOoW,OAAO,IAGhBpW,GAAO+C,QAAUD,MAAMC,QACvB/C,GAAOwoC,UAAY3pB,KAAKC,MACxB9e,GAAOO,SAAWA,GAClBP,GAAO5B,WAAaA,EACpB4B,GAAOxB,SAAWA,EAClBwB,GAAO4d,UAAYA,EACnB5d,GAAOtB,KAAOmB,EAEdG,GAAOkoB,IAAMD,KAAKC,IAElBloB,GAAOyoC,UAAY,SAAUpqC,GAK5B,IAAIK,EAAOsB,GAAOtB,KAAML,GACxB,OAAkB,WAATK,GAA8B,WAATA,KAK5BgqC,MAAOrqC,EAAMgxB,WAAYhxB,KAG5B2B,GAAO2oC,KAAO,SAAUrpC,GACvB,OAAe,MAARA,EACN,IACEA,EAAO,IAAK8D,QAASglC,GAAO,OAkBT,mBAAXQ,QAAyBA,OAAOC,KAC3CD,OAAQ,SAAU,GAAI,WACrB,OAAO5oC,KAOT,IAGC8oC,GAAUhsC,GAAOkD,OAGjB+oC,GAAKjsC,GAAOksC,EAwBb,OAtBAhpC,GAAOipC,WAAa,SAAUrmC,GAS7B,OARK9F,GAAOksC,IAAMhpC,KACjBlD,GAAOksC,EAAID,IAGPnmC,GAAQ9F,GAAOkD,SAAWA,KAC9BlD,GAAOkD,OAAS8oC,IAGV9oC,IAMiB,oBAAbhD,IACXF,GAAOkD,OAASlD,GAAOksC,EAAIhpC,IAMrBA","file":"jquery.min.js"}
\ No newline at end of file
diff --git a/themes/Frontend/Responsive/frontend/_public/vendors/js/modernizr/modernizr-custom.js b/themes/Frontend/Responsive/frontend/_public/vendors/js/modernizr/modernizr-custom.js
new file mode 100644
index 00000000000..1590d258e40
--- /dev/null
+++ b/themes/Frontend/Responsive/frontend/_public/vendors/js/modernizr/modernizr-custom.js
@@ -0,0 +1,3 @@
+/*! modernizr 3.13.0 (Custom Build) | MIT *
+ * https://modernizr.com/download/?-cssanimations-history-localstorage-sessionstorage-domprefixes-hasevent-mq-setclasses-testallprops-testprop-teststyles-cssclassprefix:has-- !*/
+!function(e,n,t,r){function o(e,n){return typeof e===n}function i(){return"function"!=typeof t.createElement?t.createElement(arguments[0]):b?t.createElementNS.call(t,"http://www.w3.org/2000/svg",arguments[0]):t.createElement.apply(t,arguments)}function s(){var e=t.body;return e||(e=i(b?"svg":"body"),e.fake=!0),e}function a(e,n,r,o){var a,l,u,f,c="modernizr",d=i("div"),p=s();if(parseInt(r,10))for(;r--;)u=i("div"),u.id=o?o[r]:c+(r+1),d.appendChild(u);return a=i("style"),a.type="text/css",a.id="s"+c,(p.fake?p:d).appendChild(a),p.appendChild(d),a.styleSheet?a.styleSheet.cssText=e:a.appendChild(t.createTextNode(e)),d.id=c,p.fake&&(p.style.background="",p.style.overflow="hidden",f=w.style.overflow,w.style.overflow="hidden",w.appendChild(p)),l=n(d,e),p.fake&&p.parentNode?(p.parentNode.removeChild(p),w.style.overflow=f,w.offsetHeight):d.parentNode.removeChild(d),!!l}function l(e,t,r){var o;if("getComputedStyle"in n){o=getComputedStyle.call(n,e,t);var i=n.console;if(null!==o)r&&(o=o.getPropertyValue(r));else if(i){var s=i.error?"error":"log";i[s].call(i,"getComputedStyle returning null, its possible modernizr test results are inaccurate")}}else o=!t&&e.currentStyle&&e.currentStyle[r];return o}function u(e,n){return!!~(""+e).indexOf(n)}function f(e){return e.replace(/([A-Z])/g,function(e,n){return"-"+n.toLowerCase()}).replace(/^ms-/,"-ms-")}function c(e,t){var o=e.length;if("CSS"in n&&"supports"in n.CSS){for(;o--;)if(n.CSS.supports(f(e[o]),t))return!0;return!1}if("CSSSupportsRule"in n){for(var i=[];o--;)i.push("("+f(e[o])+":"+t+")");return i=i.join(" or "),a("@supports ("+i+") { #modernizr { position: absolute; } }",function(e){return"absolute"===l(e,null,"position")})}return r}function d(e){return e.replace(/([a-z])-([a-z])/g,function(e,n,t){return n+t.toUpperCase()}).replace(/^-/,"")}function p(e,n,t,s){function a(){f&&(delete N.style,delete N.modElem)}if(s=!o(s,"undefined")&&s,!o(t,"undefined")){var l=c(e,t);if(!o(l,"undefined"))return l}for(var f,p,m,v,h,y=["modernizr","tspan","samp"];!N.style&&y.length;)f=!0,N.modElem=i(y.shift()),N.style=N.modElem.style;for(m=e.length,p=0;p<m;p++)if(v=e[p],h=N.style[v],u(v,"-")&&(v=d(v)),N.style[v]!==r){if(s||o(t,"undefined"))return a(),"pfx"!==n||v;try{N.style[v]=t}catch(e){}if(N.style[v]!==h)return a(),"pfx"!==n||v}return a(),!1}function m(e,n){return function(){return e.apply(n,arguments)}}function v(e,n,t){var r;for(var i in e)if(e[i]in n)return!1===t?e[i]:(r=n[e[i]],o(r,"function")?m(r,t||n):r);return!1}function h(e,n,t,r,i){var s=e.charAt(0).toUpperCase()+e.slice(1),a=(e+" "+A.join(s+" ")+s).split(" ");return o(n,"string")||o(n,"undefined")?p(a,n,r,i):(a=(e+" "+_.join(s+" ")+s).split(" "),v(a,n,t))}function y(e,n,t){return h(e,r,r,n,t)}var g=[],S={_version:"3.13.0",_config:{classPrefix:'has--',enableClasses:!0,enableJSClass:!0,usePrefixes:!0},_q:[],on:function(e,n){var t=this;setTimeout(function(){n(t[e])},0)},addTest:function(e,n,t){g.push({name:e,fn:n,options:t})},addAsyncTest:function(e){g.push({name:null,fn:e})}},Modernizr=function(){};Modernizr.prototype=S,Modernizr=new Modernizr;var C=[],w=t.documentElement,b="svg"===w.nodeName.toLowerCase(),x="Moz O ms Webkit",_=S._config.usePrefixes?x.toLowerCase().split(" "):[];S._domPrefixes=_;var z=function(){function e(e,t){var o;return!!e&&(t&&"string"!=typeof t||(t=i(t||"div")),e="on"+e,o=e in t,!o&&n&&(t.setAttribute||(t=i("div")),t.setAttribute(e,""),o="function"==typeof t[e],t[e]!==r&&(t[e]=r),t.removeAttribute(e)),o)}var n=!("onblur"in w);return e}();S.hasEvent=z;var P=function(){var e=n.matchMedia||n.msMatchMedia;return e?function(n){var t=e(n);return t&&t.matches||!1}:function(e){var n=!1;return a("@media "+e+" { #modernizr { position: absolute; } }",function(e){n="absolute"===l(e,null,"position")}),n}}();S.mq=P;var A=S._config.usePrefixes?x.split(" "):[];S._cssomPrefixes=A;var E={elem:i("modernizr")};Modernizr._q.push(function(){delete E.elem});var N={style:E.elem.style};Modernizr._q.unshift(function(){delete N.style}),S.testAllProps=h,S.testAllProps=y;S.testProp=function(e,n,t){return p([e],r,n,t)},S.testStyles=a;Modernizr.addTest("history",function(){var e=navigator.userAgent;return!!e&&((-1===e.indexOf("Android 2.")&&-1===e.indexOf("Android 4.0")||-1===e.indexOf("Mobile Safari")||-1!==e.indexOf("Chrome")||-1!==e.indexOf("Windows Phone")||"file:"===location.protocol)&&(n.history&&"pushState"in n.history))}),Modernizr.addTest("cssanimations",y("animationName","a",!0)),Modernizr.addTest("localstorage",function(){var e="modernizr";try{return localStorage.setItem(e,e),localStorage.removeItem(e),!0}catch(e){return!1}}),Modernizr.addTest("sessionstorage",function(){var e="modernizr";try{return sessionStorage.setItem(e,e),sessionStorage.removeItem(e),!0}catch(e){return!1}}),function(){var e,n,t,r,i,s,a;for(var l in g)if(g.hasOwnProperty(l)){if(e=[],n=g[l],n.name&&(e.push(n.name.toLowerCase()),n.options&&n.options.aliases&&n.options.aliases.length))for(t=0;t<n.options.aliases.length;t++)e.push(n.options.aliases[t].toLowerCase());for(r=o(n.fn,"function")?n.fn():n.fn,i=0;i<e.length;i++)s=e[i],a=s.split("."),1===a.length?Modernizr[a[0]]=r:(Modernizr[a[0]]&&(!Modernizr[a[0]]||Modernizr[a[0]]instanceof Boolean)||(Modernizr[a[0]]=new Boolean(Modernizr[a[0]])),Modernizr[a[0]][a[1]]=r),C.push((r?"":"no-")+a.join("-"))}}(),function(e){var n=w.className,t=Modernizr._config.classPrefix||"";if(b&&(n=n.baseVal),Modernizr._config.enableJSClass){var r=new RegExp("(^|\\s)"+t+"no-js(\\s|$)");n=n.replace(r,"$1"+t+"js$2")}Modernizr._config.enableClasses&&(e.length>0&&(n+=" "+t+e.join(" "+t)),b?w.className.baseVal=n:w.className=n)}(C),delete S.addTest,delete S.addAsyncTest;for(var T=0;T<Modernizr._q.length;T++)Modernizr._q[T]();e.Modernizr=Modernizr}(window,window,document);
\ No newline at end of file
diff --git a/themes/Frontend/Responsive/frontend/_public/vendors/less/pocketgrid/pocketgrid.less b/themes/Frontend/Responsive/frontend/_public/vendors/less/pocketgrid/pocketgrid.less
index a302deef249..f5bbc453604 100644
--- a/themes/Frontend/Responsive/frontend/_public/vendors/less/pocketgrid/pocketgrid.less
+++ b/themes/Frontend/Responsive/frontend/_public/vendors/less/pocketgrid/pocketgrid.less
@@ -16,22 +16,22 @@
     list-style-type: none;
     padding: 0;
     margin: 0;
-
+    
     &:before, &:after {
-        display: table;
-        content: "";
-        line-height: 0;
+		display: table;
+		content: "";
+		line-height: 0;
     }
-
+    
     &:after {
-        clear: both;
+	    clear: both;
     }
-
+    
     /** Nested grid */
     & > .block-group {
-        clear: none;
-        float: left;
-        margin: 0 !important;
+		clear: none;
+		float: left;
+		margin: 0 !important;
     }
 }
 
diff --git a/themes/Frontend/Responsive/package-lock.json b/themes/Frontend/Responsive/package-lock.json
index 6b1a1d1ce14..722985e1a01 100644
--- a/themes/Frontend/Responsive/package-lock.json
+++ b/themes/Frontend/Responsive/package-lock.json
@@ -1,7 +1,7 @@
 {
     "name": "shopwareresponsivetheme",
     "version": "1.0.0",
-    "lockfileVersion": 2,
+    "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
@@ -10,7 +10,7 @@
             "license": "MIT",
             "dependencies": {
                 "flatpickr": "2.6.3",
-                "jquery": "3.5.1",
+                "jquery": "3.7.1",
                 "jquery.event.move": "git+https://github.com/stephband/jquery.event.move.git",
                 "jquery.event.swipe": "0.5.4",
                 "jquery.transit": "0.9.12",
@@ -20,66 +20,96 @@
                 "pocketgrid-less": "1.0.1"
             },
             "devDependencies": {
-                "grunt": "^1.4.0",
+                "grunt": "^1.6.1",
                 "grunt-contrib-clean": "^2.0.1",
                 "grunt-contrib-copy": "1.0.0",
-                "jest": "^27.5.1"
+                "grunt-modernizr": "^4.0.1",
+                "jest": "^29.7.0",
+                "jest-environment-jsdom": "^30.3.0"
             }
         },
         "node_modules/@ampproject/remapping": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.1.2.tgz",
-            "integrity": "sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==",
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+            "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
             "dev": true,
+            "license": "Apache-2.0",
             "dependencies": {
-                "@jridgewell/trace-mapping": "^0.3.0"
+                "@jridgewell/gen-mapping": "^0.3.5",
+                "@jridgewell/trace-mapping": "^0.3.24"
             },
             "engines": {
                 "node": ">=6.0.0"
             }
         },
+        "node_modules/@asamuzakjp/css-color": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-3.2.0.tgz",
+            "integrity": "sha512-K1A6z8tS3XsmCMM86xoWdn7Fkdn9m6RSVtocUrJYIwZnFVkng/PvkEoWtOWmP+Scc6saYWHWZYbndEEXxl24jw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@csstools/css-calc": "^2.1.3",
+                "@csstools/css-color-parser": "^3.0.9",
+                "@csstools/css-parser-algorithms": "^3.0.4",
+                "@csstools/css-tokenizer": "^3.0.3",
+                "lru-cache": "^10.4.3"
+            }
+        },
+        "node_modules/@asamuzakjp/css-color/node_modules/lru-cache": {
+            "version": "10.4.3",
+            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+            "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+            "dev": true,
+            "license": "ISC"
+        },
         "node_modules/@babel/code-frame": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-            "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
+            "version": "7.29.0",
+            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz",
+            "integrity": "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@babel/highlight": "^7.16.7"
+                "@babel/helper-validator-identifier": "^7.28.5",
+                "js-tokens": "^4.0.0",
+                "picocolors": "^1.1.1"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/compat-data": {
-            "version": "7.17.7",
-            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.7.tgz",
-            "integrity": "sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ==",
+            "version": "7.24.7",
+            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.7.tgz",
+            "integrity": "sha512-qJzAIcv03PyaWqxRgO4mSU3lihncDT296vnyuE2O8uA4w3UHWI4S3hgeZd1L8W1Bft40w9JxJ2b412iDUFFRhw==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/core": {
-            "version": "7.17.9",
-            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.9.tgz",
-            "integrity": "sha512-5ug+SfZCpDAkVp9SFIZAzlW18rlzsOcJGaetCjkySnrXXDUw9AR8cDUm1iByTmdWM6yxX6/zycaV76w3YTF2gw==",
-            "dev": true,
-            "dependencies": {
-                "@ampproject/remapping": "^2.1.0",
-                "@babel/code-frame": "^7.16.7",
-                "@babel/generator": "^7.17.9",
-                "@babel/helper-compilation-targets": "^7.17.7",
-                "@babel/helper-module-transforms": "^7.17.7",
-                "@babel/helpers": "^7.17.9",
-                "@babel/parser": "^7.17.9",
-                "@babel/template": "^7.16.7",
-                "@babel/traverse": "^7.17.9",
-                "@babel/types": "^7.17.0",
-                "convert-source-map": "^1.7.0",
+            "version": "7.24.7",
+            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.7.tgz",
+            "integrity": "sha512-nykK+LEK86ahTkX/3TgauT0ikKoNCfKHEaZYTUVupJdTLzGNvrblu4u6fa7DhZONAltdf8e662t/abY8idrd/g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@ampproject/remapping": "^2.2.0",
+                "@babel/code-frame": "^7.24.7",
+                "@babel/generator": "^7.24.7",
+                "@babel/helper-compilation-targets": "^7.24.7",
+                "@babel/helper-module-transforms": "^7.24.7",
+                "@babel/helpers": "^7.24.7",
+                "@babel/parser": "^7.24.7",
+                "@babel/template": "^7.24.7",
+                "@babel/traverse": "^7.24.7",
+                "@babel/types": "^7.24.7",
+                "convert-source-map": "^2.0.0",
                 "debug": "^4.1.0",
                 "gensync": "^1.0.0-beta.2",
-                "json5": "^2.2.1",
-                "semver": "^6.3.0"
+                "json5": "^2.2.3",
+                "semver": "^6.3.1"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -90,245 +120,199 @@
             }
         },
         "node_modules/@babel/generator": {
-            "version": "7.17.9",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.9.tgz",
-            "integrity": "sha512-rAdDousTwxbIxbz5I7GEQ3lUip+xVCXooZNbsydCWs3xA7ZsYOv+CFRdzGxRX78BmQHu9B1Eso59AOZQOJDEdQ==",
+            "version": "7.24.7",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.7.tgz",
+            "integrity": "sha512-oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@babel/types": "^7.17.0",
-                "jsesc": "^2.5.1",
-                "source-map": "^0.5.0"
+                "@babel/types": "^7.24.7",
+                "@jridgewell/gen-mapping": "^0.3.5",
+                "@jridgewell/trace-mapping": "^0.3.25",
+                "jsesc": "^2.5.1"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
-        "node_modules/@babel/generator/node_modules/source-map": {
-            "version": "0.5.7",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-            "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/@babel/helper-compilation-targets": {
-            "version": "7.17.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz",
-            "integrity": "sha512-UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w==",
+            "version": "7.24.7",
+            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.7.tgz",
+            "integrity": "sha512-ctSdRHBi20qWOfy27RUb4Fhp07KSJ3sXcuSvTrXrc4aG8NSYDo1ici3Vhg9bg69y5bj0Mr1lh0aeEgTvc12rMg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@babel/compat-data": "^7.17.7",
-                "@babel/helper-validator-option": "^7.16.7",
-                "browserslist": "^4.17.5",
-                "semver": "^6.3.0"
+                "@babel/compat-data": "^7.24.7",
+                "@babel/helper-validator-option": "^7.24.7",
+                "browserslist": "^4.22.2",
+                "lru-cache": "^5.1.1",
+                "semver": "^6.3.1"
             },
             "engines": {
                 "node": ">=6.9.0"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.0.0"
             }
         },
         "node_modules/@babel/helper-environment-visitor": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz",
-            "integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==",
+            "version": "7.24.7",
+            "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz",
+            "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@babel/types": "^7.16.7"
+                "@babel/types": "^7.24.7"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-function-name": {
-            "version": "7.17.9",
-            "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
-            "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
+            "version": "7.24.7",
+            "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz",
+            "integrity": "sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@babel/template": "^7.16.7",
-                "@babel/types": "^7.17.0"
+                "@babel/template": "^7.24.7",
+                "@babel/types": "^7.24.7"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-hoist-variables": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-            "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
+            "version": "7.24.7",
+            "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz",
+            "integrity": "sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@babel/types": "^7.16.7"
+                "@babel/types": "^7.24.7"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-module-imports": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-            "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
+            "version": "7.24.7",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
+            "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@babel/types": "^7.16.7"
+                "@babel/traverse": "^7.24.7",
+                "@babel/types": "^7.24.7"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-module-transforms": {
-            "version": "7.17.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz",
-            "integrity": "sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==",
+            "version": "7.24.7",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.7.tgz",
+            "integrity": "sha512-1fuJEwIrp+97rM4RWdO+qrRsZlAeL1lQJoPqtCYWv0NL115XM93hIH4CSRln2w52SqvmY5hqdtauB6QFCDiZNQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@babel/helper-environment-visitor": "^7.16.7",
-                "@babel/helper-module-imports": "^7.16.7",
-                "@babel/helper-simple-access": "^7.17.7",
-                "@babel/helper-split-export-declaration": "^7.16.7",
-                "@babel/helper-validator-identifier": "^7.16.7",
-                "@babel/template": "^7.16.7",
-                "@babel/traverse": "^7.17.3",
-                "@babel/types": "^7.17.0"
+                "@babel/helper-environment-visitor": "^7.24.7",
+                "@babel/helper-module-imports": "^7.24.7",
+                "@babel/helper-simple-access": "^7.24.7",
+                "@babel/helper-split-export-declaration": "^7.24.7",
+                "@babel/helper-validator-identifier": "^7.24.7"
             },
             "engines": {
                 "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0"
             }
         },
         "node_modules/@babel/helper-plugin-utils": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz",
-            "integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==",
+            "version": "7.24.7",
+            "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.7.tgz",
+            "integrity": "sha512-Rq76wjt7yz9AAc1KnlRKNAi/dMSVWgDRx43FHoJEbcYU6xOWaE2dVPwcdTukJrjxS65GITyfbvEYHvkirZ6uEg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-simple-access": {
-            "version": "7.17.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz",
-            "integrity": "sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==",
+            "version": "7.24.7",
+            "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
+            "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@babel/types": "^7.17.0"
+                "@babel/traverse": "^7.24.7",
+                "@babel/types": "^7.24.7"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-split-export-declaration": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-            "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
+            "version": "7.24.7",
+            "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz",
+            "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@babel/types": "^7.16.7"
+                "@babel/types": "^7.24.7"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
-        "node_modules/@babel/helper-validator-identifier": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-            "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
+        "node_modules/@babel/helper-string-parser": {
+            "version": "7.24.7",
+            "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.7.tgz",
+            "integrity": "sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=6.9.0"
             }
         },
-        "node_modules/@babel/helper-validator-option": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
-            "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
+        "node_modules/@babel/helper-validator-identifier": {
+            "version": "7.28.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
+            "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=6.9.0"
             }
         },
-        "node_modules/@babel/helpers": {
-            "version": "7.17.9",
-            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.9.tgz",
-            "integrity": "sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q==",
+        "node_modules/@babel/helper-validator-option": {
+            "version": "7.24.7",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.7.tgz",
+            "integrity": "sha512-yy1/KvjhV/ZCL+SM7hBrvnZJ3ZuT9OuZgIJAGpPEToANvc3iM6iDvBnRjtElWibHU6n8/LPR/EjX9EtIEYO3pw==",
             "dev": true,
-            "dependencies": {
-                "@babel/template": "^7.16.7",
-                "@babel/traverse": "^7.17.9",
-                "@babel/types": "^7.17.0"
-            },
+            "license": "MIT",
             "engines": {
                 "node": ">=6.9.0"
             }
         },
-        "node_modules/@babel/highlight": {
-            "version": "7.17.9",
-            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
-            "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
+        "node_modules/@babel/helpers": {
+            "version": "7.24.7",
+            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.7.tgz",
+            "integrity": "sha512-NlmJJtvcw72yRJRcnCmGvSi+3jDEg8qFu3z0AFoymmzLx5ERVWyzd9kVXr7Th9/8yIJi2Zc6av4Tqz3wFs8QWg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@babel/helper-validator-identifier": "^7.16.7",
-                "chalk": "^2.0.0",
-                "js-tokens": "^4.0.0"
+                "@babel/template": "^7.24.7",
+                "@babel/types": "^7.24.7"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
-        "node_modules/@babel/highlight/node_modules/ansi-styles": {
-            "version": "3.2.1",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-            "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-            "dev": true,
-            "dependencies": {
-                "color-convert": "^1.9.0"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/@babel/highlight/node_modules/chalk": {
-            "version": "2.4.2",
-            "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-            "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-            "dev": true,
-            "dependencies": {
-                "ansi-styles": "^3.2.1",
-                "escape-string-regexp": "^1.0.5",
-                "supports-color": "^5.3.0"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/@babel/highlight/node_modules/has-flag": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-            "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-            "dev": true,
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/@babel/highlight/node_modules/supports-color": {
-            "version": "5.5.0",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-            "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-            "dev": true,
-            "dependencies": {
-                "has-flag": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
         "node_modules/@babel/parser": {
-            "version": "7.17.9",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.9.tgz",
-            "integrity": "sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg==",
+            "version": "7.24.7",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.7.tgz",
+            "integrity": "sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==",
             "dev": true,
+            "license": "MIT",
             "bin": {
                 "parser": "bin/babel-parser.js"
             },
@@ -341,6 +325,7 @@
             "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
             "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.8.0"
             },
@@ -353,6 +338,7 @@
             "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
             "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.8.0"
             },
@@ -365,6 +351,7 @@
             "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
             "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.12.13"
             },
@@ -377,6 +364,7 @@
             "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
             "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             },
@@ -389,6 +377,7 @@
             "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
             "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.8.0"
             },
@@ -396,11 +385,28 @@
                 "@babel/core": "^7.0.0-0"
             }
         },
+        "node_modules/@babel/plugin-syntax-jsx": {
+            "version": "7.24.7",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz",
+            "integrity": "sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.7"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
         "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
             "version": "7.10.4",
             "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
             "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             },
@@ -413,6 +419,7 @@
             "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
             "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.8.0"
             },
@@ -425,6 +432,7 @@
             "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
             "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             },
@@ -437,6 +445,7 @@
             "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
             "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.8.0"
             },
@@ -449,6 +458,7 @@
             "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
             "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.8.0"
             },
@@ -461,6 +471,7 @@
             "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
             "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.8.0"
             },
@@ -473,6 +484,7 @@
             "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
             "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.14.5"
             },
@@ -484,12 +496,13 @@
             }
         },
         "node_modules/@babel/plugin-syntax-typescript": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.7.tgz",
-            "integrity": "sha512-YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A==",
+            "version": "7.24.7",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.7.tgz",
+            "integrity": "sha512-c/+fVeJBB0FeKsFvwytYiUD+LBvhHjGSI0g446PRGdSVGZLRNArBUno2PETbAly3tpiNAQR5XaZ+JslxkotsbA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@babel/helper-plugin-utils": "^7.16.7"
+                "@babel/helper-plugin-utils": "^7.24.7"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -499,34 +512,36 @@
             }
         },
         "node_modules/@babel/template": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-            "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
+            "version": "7.24.7",
+            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz",
+            "integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@babel/code-frame": "^7.16.7",
-                "@babel/parser": "^7.16.7",
-                "@babel/types": "^7.16.7"
+                "@babel/code-frame": "^7.24.7",
+                "@babel/parser": "^7.24.7",
+                "@babel/types": "^7.24.7"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/traverse": {
-            "version": "7.17.9",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.9.tgz",
-            "integrity": "sha512-PQO8sDIJ8SIwipTPiR71kJQCKQYB5NGImbOviK8K+kg5xkNSYXLBupuX9QhatFowrsvo9Hj8WgArg3W7ijNAQw==",
-            "dev": true,
-            "dependencies": {
-                "@babel/code-frame": "^7.16.7",
-                "@babel/generator": "^7.17.9",
-                "@babel/helper-environment-visitor": "^7.16.7",
-                "@babel/helper-function-name": "^7.17.9",
-                "@babel/helper-hoist-variables": "^7.16.7",
-                "@babel/helper-split-export-declaration": "^7.16.7",
-                "@babel/parser": "^7.17.9",
-                "@babel/types": "^7.17.0",
-                "debug": "^4.1.0",
+            "version": "7.24.7",
+            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.7.tgz",
+            "integrity": "sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/code-frame": "^7.24.7",
+                "@babel/generator": "^7.24.7",
+                "@babel/helper-environment-visitor": "^7.24.7",
+                "@babel/helper-function-name": "^7.24.7",
+                "@babel/helper-hoist-variables": "^7.24.7",
+                "@babel/helper-split-export-declaration": "^7.24.7",
+                "@babel/parser": "^7.24.7",
+                "@babel/types": "^7.24.7",
+                "debug": "^4.3.1",
                 "globals": "^11.1.0"
             },
             "engines": {
@@ -534,12 +549,14 @@
             }
         },
         "node_modules/@babel/types": {
-            "version": "7.17.0",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz",
-            "integrity": "sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==",
+            "version": "7.24.7",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.7.tgz",
+            "integrity": "sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@babel/helper-validator-identifier": "^7.16.7",
+                "@babel/helper-string-parser": "^7.24.7",
+                "@babel/helper-validator-identifier": "^7.24.7",
                 "to-fast-properties": "^2.0.0"
             },
             "engines": {
@@ -550,13 +567,130 @@
             "version": "0.2.3",
             "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
             "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@csstools/color-helpers": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.1.0.tgz",
+            "integrity": "sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/csstools"
+                },
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/csstools"
+                }
+            ],
+            "license": "MIT-0",
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@csstools/css-calc": {
+            "version": "2.1.4",
+            "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.4.tgz",
+            "integrity": "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/csstools"
+                },
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/csstools"
+                }
+            ],
+            "license": "MIT",
+            "engines": {
+                "node": ">=18"
+            },
+            "peerDependencies": {
+                "@csstools/css-parser-algorithms": "^3.0.5",
+                "@csstools/css-tokenizer": "^3.0.4"
+            }
+        },
+        "node_modules/@csstools/css-color-parser": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.1.0.tgz",
+            "integrity": "sha512-nbtKwh3a6xNVIp/VRuXV64yTKnb1IjTAEEh3irzS+HkKjAOYLTGNb9pmVNntZ8iVBHcWDA2Dof0QtPgFI1BaTA==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/csstools"
+                },
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/csstools"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "@csstools/color-helpers": "^5.1.0",
+                "@csstools/css-calc": "^2.1.4"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "peerDependencies": {
+                "@csstools/css-parser-algorithms": "^3.0.5",
+                "@csstools/css-tokenizer": "^3.0.4"
+            }
+        },
+        "node_modules/@csstools/css-parser-algorithms": {
+            "version": "3.0.5",
+            "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.5.tgz",
+            "integrity": "sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/csstools"
+                },
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/csstools"
+                }
+            ],
+            "license": "MIT",
+            "engines": {
+                "node": ">=18"
+            },
+            "peerDependencies": {
+                "@csstools/css-tokenizer": "^3.0.4"
+            }
+        },
+        "node_modules/@csstools/css-tokenizer": {
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.4.tgz",
+            "integrity": "sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/csstools"
+                },
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/csstools"
+                }
+            ],
+            "license": "MIT",
+            "engines": {
+                "node": ">=18"
+            }
         },
         "node_modules/@istanbuljs/load-nyc-config": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
             "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "camelcase": "^5.3.1",
                 "find-up": "^4.1.0",
@@ -573,25 +707,27 @@
             "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
             "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
         },
         "node_modules/@jest/console": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
-            "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
+            "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@jest/types": "^27.5.1",
+                "@jest/types": "^29.6.3",
                 "@types/node": "*",
                 "chalk": "^4.0.0",
-                "jest-message-util": "^27.5.1",
-                "jest-util": "^27.5.1",
+                "jest-message-util": "^29.7.0",
+                "jest-util": "^29.7.0",
                 "slash": "^3.0.0"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             }
         },
         "node_modules/@jest/console/node_modules/ansi-styles": {
@@ -599,6 +735,7 @@
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
             "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-convert": "^2.0.1"
             },
@@ -614,6 +751,7 @@
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
             "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^4.1.0",
                 "supports-color": "^7.1.0"
@@ -625,29 +763,12 @@
                 "url": "https://github.com/chalk/chalk?sponsor=1"
             }
         },
-        "node_modules/@jest/console/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/@jest/console/node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true
-        },
         "node_modules/@jest/console/node_modules/supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
             "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-flag": "^4.0.0"
             },
@@ -656,42 +777,43 @@
             }
         },
         "node_modules/@jest/core": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.5.1.tgz",
-            "integrity": "sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==",
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz",
+            "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@jest/console": "^27.5.1",
-                "@jest/reporters": "^27.5.1",
-                "@jest/test-result": "^27.5.1",
-                "@jest/transform": "^27.5.1",
-                "@jest/types": "^27.5.1",
+                "@jest/console": "^29.7.0",
+                "@jest/reporters": "^29.7.0",
+                "@jest/test-result": "^29.7.0",
+                "@jest/transform": "^29.7.0",
+                "@jest/types": "^29.6.3",
                 "@types/node": "*",
                 "ansi-escapes": "^4.2.1",
                 "chalk": "^4.0.0",
-                "emittery": "^0.8.1",
+                "ci-info": "^3.2.0",
                 "exit": "^0.1.2",
                 "graceful-fs": "^4.2.9",
-                "jest-changed-files": "^27.5.1",
-                "jest-config": "^27.5.1",
-                "jest-haste-map": "^27.5.1",
-                "jest-message-util": "^27.5.1",
-                "jest-regex-util": "^27.5.1",
-                "jest-resolve": "^27.5.1",
-                "jest-resolve-dependencies": "^27.5.1",
-                "jest-runner": "^27.5.1",
-                "jest-runtime": "^27.5.1",
-                "jest-snapshot": "^27.5.1",
-                "jest-util": "^27.5.1",
-                "jest-validate": "^27.5.1",
-                "jest-watcher": "^27.5.1",
+                "jest-changed-files": "^29.7.0",
+                "jest-config": "^29.7.0",
+                "jest-haste-map": "^29.7.0",
+                "jest-message-util": "^29.7.0",
+                "jest-regex-util": "^29.6.3",
+                "jest-resolve": "^29.7.0",
+                "jest-resolve-dependencies": "^29.7.0",
+                "jest-runner": "^29.7.0",
+                "jest-runtime": "^29.7.0",
+                "jest-snapshot": "^29.7.0",
+                "jest-util": "^29.7.0",
+                "jest-validate": "^29.7.0",
+                "jest-watcher": "^29.7.0",
                 "micromatch": "^4.0.4",
-                "rimraf": "^3.0.0",
+                "pretty-format": "^29.7.0",
                 "slash": "^3.0.0",
                 "strip-ansi": "^6.0.0"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             },
             "peerDependencies": {
                 "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
@@ -707,6 +829,7 @@
             "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
             "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
@@ -716,6 +839,7 @@
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
             "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-convert": "^2.0.1"
             },
@@ -731,6 +855,7 @@
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
             "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^4.1.0",
                 "supports-color": "^7.1.0"
@@ -742,29 +867,12 @@
                 "url": "https://github.com/chalk/chalk?sponsor=1"
             }
         },
-        "node_modules/@jest/core/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/@jest/core/node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true
-        },
         "node_modules/@jest/core/node_modules/strip-ansi": {
             "version": "6.0.1",
             "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
             "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-regex": "^5.0.1"
             },
@@ -777,6 +885,7 @@
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
             "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-flag": "^4.0.0"
             },
@@ -785,85 +894,408 @@
             }
         },
         "node_modules/@jest/environment": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz",
-            "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz",
+            "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@jest/fake-timers": "^27.5.1",
-                "@jest/types": "^27.5.1",
+                "@jest/fake-timers": "^29.7.0",
+                "@jest/types": "^29.6.3",
                 "@types/node": "*",
-                "jest-mock": "^27.5.1"
+                "jest-mock": "^29.7.0"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             }
         },
-        "node_modules/@jest/fake-timers": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz",
-            "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
+        "node_modules/@jest/environment-jsdom-abstract": {
+            "version": "30.3.0",
+            "resolved": "https://registry.npmjs.org/@jest/environment-jsdom-abstract/-/environment-jsdom-abstract-30.3.0.tgz",
+            "integrity": "sha512-0hNFs5N6We3DMCwobzI0ydhkY10sT1tZSC0AAiy+0g2Dt/qEWgrcV5BrMxPczhe41cxW4qm6X+jqZaUdpZIajA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@jest/types": "^27.5.1",
-                "@sinonjs/fake-timers": "^8.0.1",
+                "@jest/environment": "30.3.0",
+                "@jest/fake-timers": "30.3.0",
+                "@jest/types": "30.3.0",
+                "@types/jsdom": "^21.1.7",
                 "@types/node": "*",
-                "jest-message-util": "^27.5.1",
-                "jest-mock": "^27.5.1",
-                "jest-util": "^27.5.1"
+                "jest-mock": "30.3.0",
+                "jest-util": "30.3.0"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+            },
+            "peerDependencies": {
+                "canvas": "^3.0.0",
+                "jsdom": "*"
+            },
+            "peerDependenciesMeta": {
+                "canvas": {
+                    "optional": true
+                }
             }
         },
-        "node_modules/@jest/globals": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.5.1.tgz",
-            "integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==",
+        "node_modules/@jest/environment-jsdom-abstract/node_modules/@jest/environment": {
+            "version": "30.3.0",
+            "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-30.3.0.tgz",
+            "integrity": "sha512-SlLSF4Be735yQXyh2+mctBOzNDx5s5uLv88/j8Qn1wH679PDcwy67+YdADn8NJnGjzlXtN62asGH/T4vWOkfaw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@jest/environment": "^27.5.1",
-                "@jest/types": "^27.5.1",
-                "expect": "^27.5.1"
+                "@jest/fake-timers": "30.3.0",
+                "@jest/types": "30.3.0",
+                "@types/node": "*",
+                "jest-mock": "30.3.0"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
             }
         },
-        "node_modules/@jest/reporters": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.5.1.tgz",
-            "integrity": "sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==",
+        "node_modules/@jest/environment-jsdom-abstract/node_modules/@jest/fake-timers": {
+            "version": "30.3.0",
+            "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-30.3.0.tgz",
+            "integrity": "sha512-WUQDs8SOP9URStX1DzhD425CqbN/HxUYCTwVrT8sTVBfMvFqYt/s61EK5T05qnHu0po6RitXIvP9otZxYDzTGQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@bcoe/v8-coverage": "^0.2.3",
-                "@jest/console": "^27.5.1",
-                "@jest/test-result": "^27.5.1",
-                "@jest/transform": "^27.5.1",
-                "@jest/types": "^27.5.1",
+                "@jest/types": "30.3.0",
+                "@sinonjs/fake-timers": "^15.0.0",
                 "@types/node": "*",
-                "chalk": "^4.0.0",
-                "collect-v8-coverage": "^1.0.0",
-                "exit": "^0.1.2",
-                "glob": "^7.1.2",
-                "graceful-fs": "^4.2.9",
-                "istanbul-lib-coverage": "^3.0.0",
-                "istanbul-lib-instrument": "^5.1.0",
-                "istanbul-lib-report": "^3.0.0",
-                "istanbul-lib-source-maps": "^4.0.0",
-                "istanbul-reports": "^3.1.3",
-                "jest-haste-map": "^27.5.1",
-                "jest-resolve": "^27.5.1",
-                "jest-util": "^27.5.1",
-                "jest-worker": "^27.5.1",
-                "slash": "^3.0.0",
-                "source-map": "^0.6.0",
-                "string-length": "^4.0.1",
-                "terminal-link": "^2.0.0",
-                "v8-to-istanbul": "^8.1.0"
+                "jest-message-util": "30.3.0",
+                "jest-mock": "30.3.0",
+                "jest-util": "30.3.0"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+            }
+        },
+        "node_modules/@jest/environment-jsdom-abstract/node_modules/@jest/schemas": {
+            "version": "30.0.5",
+            "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
+            "integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@sinclair/typebox": "^0.34.0"
+            },
+            "engines": {
+                "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+            }
+        },
+        "node_modules/@jest/environment-jsdom-abstract/node_modules/@jest/types": {
+            "version": "30.3.0",
+            "resolved": "https://registry.npmjs.org/@jest/types/-/types-30.3.0.tgz",
+            "integrity": "sha512-JHm87k7bA33hpBngtU8h6UBub/fqqA9uXfw+21j5Hmk7ooPHlboRNxHq0JcMtC+n8VJGP1mcfnD3Mk+XKe1oSw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/pattern": "30.0.1",
+                "@jest/schemas": "30.0.5",
+                "@types/istanbul-lib-coverage": "^2.0.6",
+                "@types/istanbul-reports": "^3.0.4",
+                "@types/node": "*",
+                "@types/yargs": "^17.0.33",
+                "chalk": "^4.1.2"
+            },
+            "engines": {
+                "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+            }
+        },
+        "node_modules/@jest/environment-jsdom-abstract/node_modules/@sinclair/typebox": {
+            "version": "0.34.48",
+            "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.48.tgz",
+            "integrity": "sha512-kKJTNuK3AQOrgjjotVxMrCn1sUJwM76wMszfq1kdU4uYVJjvEWuFQ6HgvLt4Xz3fSmZlTOxJ/Ie13KnIcWQXFA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@jest/environment-jsdom-abstract/node_modules/@sinonjs/fake-timers": {
+            "version": "15.1.1",
+            "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-15.1.1.tgz",
+            "integrity": "sha512-cO5W33JgAPbOh07tvZjUOJ7oWhtaqGHiZw+11DPbyqh2kHTBc3eF/CjJDeQ4205RLQsX6rxCuYOroFQwl7JDRw==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "@sinonjs/commons": "^3.0.1"
+            }
+        },
+        "node_modules/@jest/environment-jsdom-abstract/node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+            }
+        },
+        "node_modules/@jest/environment-jsdom-abstract/node_modules/chalk": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/chalk?sponsor=1"
+            }
+        },
+        "node_modules/@jest/environment-jsdom-abstract/node_modules/ci-info": {
+            "version": "4.4.0",
+            "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.4.0.tgz",
+            "integrity": "sha512-77PSwercCZU2Fc4sX94eF8k8Pxte6JAwL4/ICZLFjJLqegs7kCuAsqqj/70NQF6TvDpgFjkubQB2FW2ZZddvQg==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/sibiraj-s"
+                }
+            ],
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/@jest/environment-jsdom-abstract/node_modules/jest-message-util": {
+            "version": "30.3.0",
+            "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-30.3.0.tgz",
+            "integrity": "sha512-Z/j4Bo+4ySJ+JPJN3b2Qbl9hDq3VrXmnjjGEWD/x0BCXeOXPTV1iZYYzl2X8c1MaCOL+ewMyNBcm88sboE6YWw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/code-frame": "^7.27.1",
+                "@jest/types": "30.3.0",
+                "@types/stack-utils": "^2.0.3",
+                "chalk": "^4.1.2",
+                "graceful-fs": "^4.2.11",
+                "picomatch": "^4.0.3",
+                "pretty-format": "30.3.0",
+                "slash": "^3.0.0",
+                "stack-utils": "^2.0.6"
+            },
+            "engines": {
+                "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+            }
+        },
+        "node_modules/@jest/environment-jsdom-abstract/node_modules/jest-mock": {
+            "version": "30.3.0",
+            "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-30.3.0.tgz",
+            "integrity": "sha512-OTzICK8CpE+t4ndhKrwlIdbM6Pn8j00lvmSmq5ejiO+KxukbLjgOflKWMn3KE34EZdQm5RqTuKj+5RIEniYhog==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/types": "30.3.0",
+                "@types/node": "*",
+                "jest-util": "30.3.0"
+            },
+            "engines": {
+                "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+            }
+        },
+        "node_modules/@jest/environment-jsdom-abstract/node_modules/jest-util": {
+            "version": "30.3.0",
+            "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.3.0.tgz",
+            "integrity": "sha512-/jZDa00a3Sz7rdyu55NLrQCIrbyIkbBxareejQI315f/i8HjYN+ZWsDLLpoQSiUIEIyZF/R8fDg3BmB8AtHttg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/types": "30.3.0",
+                "@types/node": "*",
+                "chalk": "^4.1.2",
+                "ci-info": "^4.2.0",
+                "graceful-fs": "^4.2.11",
+                "picomatch": "^4.0.3"
+            },
+            "engines": {
+                "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+            }
+        },
+        "node_modules/@jest/environment-jsdom-abstract/node_modules/picomatch": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+            "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/jonschlinkert"
+            }
+        },
+        "node_modules/@jest/environment-jsdom-abstract/node_modules/pretty-format": {
+            "version": "30.3.0",
+            "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-30.3.0.tgz",
+            "integrity": "sha512-oG4T3wCbfeuvljnyAzhBvpN45E8iOTXCU/TD3zXW80HA3dQ4ahdqMkWGiPWZvjpQwlbyHrPTWUAqUzGzv4l1JQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/schemas": "30.0.5",
+                "ansi-styles": "^5.2.0",
+                "react-is": "^18.3.1"
+            },
+            "engines": {
+                "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+            }
+        },
+        "node_modules/@jest/environment-jsdom-abstract/node_modules/pretty-format/node_modules/ansi-styles": {
+            "version": "5.2.0",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+            "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+            }
+        },
+        "node_modules/@jest/environment-jsdom-abstract/node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/@jest/expect": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz",
+            "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "expect": "^29.7.0",
+                "jest-snapshot": "^29.7.0"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/@jest/expect-utils": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
+            "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "jest-get-type": "^29.6.3"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/@jest/fake-timers": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz",
+            "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/types": "^29.6.3",
+                "@sinonjs/fake-timers": "^10.0.2",
+                "@types/node": "*",
+                "jest-message-util": "^29.7.0",
+                "jest-mock": "^29.7.0",
+                "jest-util": "^29.7.0"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/@jest/globals": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",
+            "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/environment": "^29.7.0",
+                "@jest/expect": "^29.7.0",
+                "@jest/types": "^29.6.3",
+                "jest-mock": "^29.7.0"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/@jest/pattern": {
+            "version": "30.0.1",
+            "resolved": "https://registry.npmjs.org/@jest/pattern/-/pattern-30.0.1.tgz",
+            "integrity": "sha512-gWp7NfQW27LaBQz3TITS8L7ZCQ0TLvtmI//4OwlQRx4rnWxcPNIYjxZpDcN4+UlGxgm3jS5QPz8IPTCkb59wZA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/node": "*",
+                "jest-regex-util": "30.0.1"
+            },
+            "engines": {
+                "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+            }
+        },
+        "node_modules/@jest/pattern/node_modules/jest-regex-util": {
+            "version": "30.0.1",
+            "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.0.1.tgz",
+            "integrity": "sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+            }
+        },
+        "node_modules/@jest/reporters": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",
+            "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@bcoe/v8-coverage": "^0.2.3",
+                "@jest/console": "^29.7.0",
+                "@jest/test-result": "^29.7.0",
+                "@jest/transform": "^29.7.0",
+                "@jest/types": "^29.6.3",
+                "@jridgewell/trace-mapping": "^0.3.18",
+                "@types/node": "*",
+                "chalk": "^4.0.0",
+                "collect-v8-coverage": "^1.0.0",
+                "exit": "^0.1.2",
+                "glob": "^7.1.3",
+                "graceful-fs": "^4.2.9",
+                "istanbul-lib-coverage": "^3.0.0",
+                "istanbul-lib-instrument": "^6.0.0",
+                "istanbul-lib-report": "^3.0.0",
+                "istanbul-lib-source-maps": "^4.0.0",
+                "istanbul-reports": "^3.1.3",
+                "jest-message-util": "^29.7.0",
+                "jest-util": "^29.7.0",
+                "jest-worker": "^29.7.0",
+                "slash": "^3.0.0",
+                "string-length": "^4.0.1",
+                "strip-ansi": "^6.0.0",
+                "v8-to-istanbul": "^9.0.1"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             },
             "peerDependencies": {
                 "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
@@ -874,11 +1306,22 @@
                 }
             }
         },
+        "node_modules/@jest/reporters/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/@jest/reporters/node_modules/ansi-styles": {
             "version": "4.3.0",
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
             "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-convert": "^2.0.1"
             },
@@ -894,6 +1337,7 @@
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
             "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^4.1.0",
                 "supports-color": "^7.1.0"
@@ -905,29 +1349,25 @@
                 "url": "https://github.com/chalk/chalk?sponsor=1"
             }
         },
-        "node_modules/@jest/reporters/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+        "node_modules/@jest/reporters/node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "color-name": "~1.1.4"
+                "ansi-regex": "^5.0.1"
             },
             "engines": {
-                "node": ">=7.0.0"
+                "node": ">=8"
             }
         },
-        "node_modules/@jest/reporters/node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true
-        },
         "node_modules/@jest/reporters/node_modules/supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
             "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-flag": "^4.0.0"
             },
@@ -935,74 +1375,91 @@
                 "node": ">=8"
             }
         },
+        "node_modules/@jest/schemas": {
+            "version": "29.6.3",
+            "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
+            "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@sinclair/typebox": "^0.27.8"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
         "node_modules/@jest/source-map": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.5.1.tgz",
-            "integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==",
+            "version": "29.6.3",
+            "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz",
+            "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
+                "@jridgewell/trace-mapping": "^0.3.18",
                 "callsites": "^3.0.0",
-                "graceful-fs": "^4.2.9",
-                "source-map": "^0.6.0"
+                "graceful-fs": "^4.2.9"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             }
         },
         "node_modules/@jest/test-result": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
-            "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",
+            "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@jest/console": "^27.5.1",
-                "@jest/types": "^27.5.1",
+                "@jest/console": "^29.7.0",
+                "@jest/types": "^29.6.3",
                 "@types/istanbul-lib-coverage": "^2.0.0",
                 "collect-v8-coverage": "^1.0.0"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             }
         },
         "node_modules/@jest/test-sequencer": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz",
-            "integrity": "sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==",
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",
+            "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@jest/test-result": "^27.5.1",
+                "@jest/test-result": "^29.7.0",
                 "graceful-fs": "^4.2.9",
-                "jest-haste-map": "^27.5.1",
-                "jest-runtime": "^27.5.1"
+                "jest-haste-map": "^29.7.0",
+                "slash": "^3.0.0"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             }
         },
         "node_modules/@jest/transform": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.5.1.tgz",
-            "integrity": "sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==",
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",
+            "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@babel/core": "^7.1.0",
-                "@jest/types": "^27.5.1",
+                "@babel/core": "^7.11.6",
+                "@jest/types": "^29.6.3",
+                "@jridgewell/trace-mapping": "^0.3.18",
                 "babel-plugin-istanbul": "^6.1.1",
                 "chalk": "^4.0.0",
-                "convert-source-map": "^1.4.0",
-                "fast-json-stable-stringify": "^2.0.0",
+                "convert-source-map": "^2.0.0",
+                "fast-json-stable-stringify": "^2.1.0",
                 "graceful-fs": "^4.2.9",
-                "jest-haste-map": "^27.5.1",
-                "jest-regex-util": "^27.5.1",
-                "jest-util": "^27.5.1",
+                "jest-haste-map": "^29.7.0",
+                "jest-regex-util": "^29.6.3",
+                "jest-util": "^29.7.0",
                 "micromatch": "^4.0.4",
                 "pirates": "^4.0.4",
                 "slash": "^3.0.0",
-                "source-map": "^0.6.1",
-                "write-file-atomic": "^3.0.0"
+                "write-file-atomic": "^4.0.2"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             }
         },
         "node_modules/@jest/transform/node_modules/ansi-styles": {
@@ -1010,6 +1467,7 @@
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
             "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-convert": "^2.0.1"
             },
@@ -1025,6 +1483,7 @@
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
             "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^4.1.0",
                 "supports-color": "^7.1.0"
@@ -1036,29 +1495,12 @@
                 "url": "https://github.com/chalk/chalk?sponsor=1"
             }
         },
-        "node_modules/@jest/transform/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/@jest/transform/node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true
-        },
         "node_modules/@jest/transform/node_modules/supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
             "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-flag": "^4.0.0"
             },
@@ -1067,19 +1509,21 @@
             }
         },
         "node_modules/@jest/types": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-            "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+            "version": "29.6.3",
+            "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+            "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
+                "@jest/schemas": "^29.6.3",
                 "@types/istanbul-lib-coverage": "^2.0.0",
                 "@types/istanbul-reports": "^3.0.0",
                 "@types/node": "*",
-                "@types/yargs": "^16.0.0",
+                "@types/yargs": "^17.0.8",
                 "chalk": "^4.0.0"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             }
         },
         "node_modules/@jest/types/node_modules/ansi-styles": {
@@ -1087,6 +1531,7 @@
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
             "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-convert": "^2.0.1"
             },
@@ -1102,6 +1547,7 @@
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
             "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^4.1.0",
                 "supports-color": "^7.1.0"
@@ -1113,29 +1559,12 @@
                 "url": "https://github.com/chalk/chalk?sponsor=1"
             }
         },
-        "node_modules/@jest/types/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/@jest/types/node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true
-        },
         "node_modules/@jest/types/node_modules/supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
             "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-flag": "^4.0.0"
             },
@@ -1143,230 +1572,236 @@
                 "node": ">=8"
             }
         },
+        "node_modules/@jridgewell/gen-mapping": {
+            "version": "0.3.5",
+            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+            "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jridgewell/set-array": "^1.2.1",
+                "@jridgewell/sourcemap-codec": "^1.4.10",
+                "@jridgewell/trace-mapping": "^0.3.24"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
         "node_modules/@jridgewell/resolve-uri": {
-            "version": "3.0.5",
-            "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz",
-            "integrity": "sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==",
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+            "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@jridgewell/set-array": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+            "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=6.0.0"
             }
         },
         "node_modules/@jridgewell/sourcemap-codec": {
-            "version": "1.4.11",
-            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz",
-            "integrity": "sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==",
-            "dev": true
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+            "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/@jridgewell/trace-mapping": {
-            "version": "0.3.4",
-            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz",
-            "integrity": "sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==",
+            "version": "0.3.25",
+            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+            "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@jridgewell/resolve-uri": "^3.0.3",
-                "@jridgewell/sourcemap-codec": "^1.4.10"
+                "@jridgewell/resolve-uri": "^3.1.0",
+                "@jridgewell/sourcemap-codec": "^1.4.14"
             }
         },
+        "node_modules/@sinclair/typebox": {
+            "version": "0.27.8",
+            "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
+            "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/@sinonjs/commons": {
-            "version": "1.8.3",
-            "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
-            "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
+            "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
             "dev": true,
+            "license": "BSD-3-Clause",
             "dependencies": {
                 "type-detect": "4.0.8"
             }
         },
         "node_modules/@sinonjs/fake-timers": {
-            "version": "8.1.0",
-            "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
-            "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
+            "version": "10.3.0",
+            "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
+            "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
             "dev": true,
+            "license": "BSD-3-Clause",
             "dependencies": {
-                "@sinonjs/commons": "^1.7.0"
-            }
-        },
-        "node_modules/@tootallnate/once": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
-            "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
-            "dev": true,
-            "engines": {
-                "node": ">= 6"
+                "@sinonjs/commons": "^3.0.0"
             }
         },
         "node_modules/@types/babel__core": {
-            "version": "7.1.19",
-            "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.19.tgz",
-            "integrity": "sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==",
+            "version": "7.20.5",
+            "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
+            "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@babel/parser": "^7.1.0",
-                "@babel/types": "^7.0.0",
+                "@babel/parser": "^7.20.7",
+                "@babel/types": "^7.20.7",
                 "@types/babel__generator": "*",
                 "@types/babel__template": "*",
                 "@types/babel__traverse": "*"
             }
         },
         "node_modules/@types/babel__generator": {
-            "version": "7.6.4",
-            "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz",
-            "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
+            "version": "7.6.8",
+            "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
+            "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "@babel/types": "^7.0.0"
             }
         },
         "node_modules/@types/babel__template": {
-            "version": "7.4.1",
-            "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
-            "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
+            "version": "7.4.4",
+            "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
+            "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "@babel/parser": "^7.1.0",
                 "@babel/types": "^7.0.0"
             }
         },
         "node_modules/@types/babel__traverse": {
-            "version": "7.17.0",
-            "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.17.0.tgz",
-            "integrity": "sha512-r8aveDbd+rzGP+ykSdF3oPuTVRWRfbBiHl0rVDM2yNEmSMXfkObQLV46b4RnCv3Lra51OlfnZhkkFaDl2MIRaA==",
+            "version": "7.20.6",
+            "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz",
+            "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@babel/types": "^7.3.0"
+                "@babel/types": "^7.20.7"
             }
         },
         "node_modules/@types/graceful-fs": {
-            "version": "4.1.5",
-            "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
-            "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
+            "version": "4.1.9",
+            "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
+            "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "@types/node": "*"
             }
         },
         "node_modules/@types/istanbul-lib-coverage": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
-            "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==",
-            "dev": true
+            "version": "2.0.6",
+            "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
+            "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/@types/istanbul-lib-report": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-            "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
+            "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "@types/istanbul-lib-coverage": "*"
             }
         },
         "node_modules/@types/istanbul-reports": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
-            "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
+            "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "@types/istanbul-lib-report": "*"
             }
         },
-        "node_modules/@types/node": {
-            "version": "17.0.25",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.25.tgz",
-            "integrity": "sha512-wANk6fBrUwdpY4isjWrKTufkrXdu1D2YHCot2fD/DfWxF5sMrVSA+KN7ydckvaTCh0HiqX9IVl0L5/ZoXg5M7w==",
-            "dev": true
+        "node_modules/@types/jsdom": {
+            "version": "21.1.7",
+            "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-21.1.7.tgz",
+            "integrity": "sha512-yOriVnggzrnQ3a9OKOCxaVuSug3w3/SbOj5i7VwXWZEyUNl3bLF9V3MfxGbZKuwqJOQyRfqXyROBB1CoZLFWzA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/node": "*",
+                "@types/tough-cookie": "*",
+                "parse5": "^7.0.0"
+            }
         },
-        "node_modules/@types/prettier": {
-            "version": "2.6.0",
-            "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.6.0.tgz",
-            "integrity": "sha512-G/AdOadiZhnJp0jXCaBQU449W2h716OW/EoXeYkCytxKL06X1WCXB4DZpp8TpZ8eyIJVS1cw4lrlkkSYU21cDw==",
-            "dev": true
+        "node_modules/@types/node": {
+            "version": "20.14.10",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.10.tgz",
+            "integrity": "sha512-MdiXf+nDuMvY0gJKxyfZ7/6UFsETO7mGKF54MVD/ekJS6HdFtpZFBgrh6Pseu64XTb2MLyFPlbW6hj8HYRQNOQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "undici-types": "~5.26.4"
+            }
         },
         "node_modules/@types/stack-utils": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
-            "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
-            "dev": true
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
+            "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@types/tough-cookie": {
+            "version": "4.0.5",
+            "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz",
+            "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/@types/yargs": {
-            "version": "16.0.4",
-            "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-            "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+            "version": "17.0.35",
+            "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.35.tgz",
+            "integrity": "sha512-qUHkeCyQFxMXg79wQfTtfndEC+N9ZZg76HJftDJp+qH2tV7Gj4OJi7l+PiWwJ+pWtW8GwSmqsDj/oymhrTWXjg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "@types/yargs-parser": "*"
             }
         },
         "node_modules/@types/yargs-parser": {
-            "version": "21.0.0",
-            "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz",
-            "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==",
-            "dev": true
-        },
-        "node_modules/abab": {
-            "version": "2.0.6",
-            "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
-            "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
-            "dev": true
+            "version": "21.0.3",
+            "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
+            "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/abbrev": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
             "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-            "dev": true
-        },
-        "node_modules/acorn": {
-            "version": "8.7.0",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
-            "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
-            "dev": true,
-            "bin": {
-                "acorn": "bin/acorn"
-            },
-            "engines": {
-                "node": ">=0.4.0"
-            }
-        },
-        "node_modules/acorn-globals": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
-            "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
-            "dev": true,
-            "dependencies": {
-                "acorn": "^7.1.1",
-                "acorn-walk": "^7.1.1"
-            }
-        },
-        "node_modules/acorn-globals/node_modules/acorn": {
-            "version": "7.4.1",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-            "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-            "dev": true,
-            "bin": {
-                "acorn": "bin/acorn"
-            },
-            "engines": {
-                "node": ">=0.4.0"
-            }
-        },
-        "node_modules/acorn-walk": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-            "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
             "dev": true,
-            "engines": {
-                "node": ">=0.4.0"
-            }
+            "license": "ISC"
         },
         "node_modules/agent-base": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-            "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+            "version": "7.1.4",
+            "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
+            "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
             "dev": true,
-            "dependencies": {
-                "debug": "4"
-            },
+            "license": "MIT",
             "engines": {
-                "node": ">= 6.0.0"
+                "node": ">= 14"
             }
         },
         "node_modules/ansi-escapes": {
@@ -1374,6 +1809,7 @@
             "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
             "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "type-fest": "^0.21.3"
             },
@@ -1387,8 +1823,9 @@
         "node_modules/ansi-regex": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-            "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+            "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -1396,17 +1833,19 @@
         "node_modules/ansi-styles": {
             "version": "2.2.1",
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-            "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+            "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
         },
         "node_modules/anymatch": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-            "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+            "version": "3.1.3",
+            "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+            "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "normalize-path": "^3.0.0",
                 "picomatch": "^2.0.4"
@@ -1420,6 +1859,7 @@
             "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
             "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "sprintf-js": "~1.0.2"
             }
@@ -1427,8 +1867,9 @@
         "node_modules/array-each": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
-            "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
+            "integrity": "sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -1438,39 +1879,35 @@
             "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
             "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
         },
         "node_modules/async": {
-            "version": "3.2.3",
-            "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
-            "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==",
-            "dev": true
-        },
-        "node_modules/asynckit": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-            "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-            "dev": true
+            "version": "3.2.5",
+            "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz",
+            "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/babel-jest": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.1.tgz",
-            "integrity": "sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==",
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
+            "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@jest/transform": "^27.5.1",
-                "@jest/types": "^27.5.1",
+                "@jest/transform": "^29.7.0",
                 "@types/babel__core": "^7.1.14",
                 "babel-plugin-istanbul": "^6.1.1",
-                "babel-preset-jest": "^27.5.1",
+                "babel-preset-jest": "^29.6.3",
                 "chalk": "^4.0.0",
                 "graceful-fs": "^4.2.9",
                 "slash": "^3.0.0"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             },
             "peerDependencies": {
                 "@babel/core": "^7.8.0"
@@ -1481,6 +1918,7 @@
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
             "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-convert": "^2.0.1"
             },
@@ -1496,6 +1934,7 @@
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
             "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^4.1.0",
                 "supports-color": "^7.1.0"
@@ -1507,29 +1946,12 @@
                 "url": "https://github.com/chalk/chalk?sponsor=1"
             }
         },
-        "node_modules/babel-jest/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/babel-jest/node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true
-        },
         "node_modules/babel-jest/node_modules/supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
             "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-flag": "^4.0.0"
             },
@@ -1542,6 +1964,7 @@
             "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
             "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
             "dev": true,
+            "license": "BSD-3-Clause",
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.0.0",
                 "@istanbuljs/load-nyc-config": "^1.0.0",
@@ -1553,19 +1976,37 @@
                 "node": ">=8"
             }
         },
+        "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": {
+            "version": "5.2.1",
+            "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+            "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "@babel/core": "^7.12.3",
+                "@babel/parser": "^7.14.7",
+                "@istanbuljs/schema": "^0.1.2",
+                "istanbul-lib-coverage": "^3.2.0",
+                "semver": "^6.3.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/babel-plugin-jest-hoist": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz",
-            "integrity": "sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==",
+            "version": "29.6.3",
+            "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz",
+            "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "@babel/template": "^7.3.3",
                 "@babel/types": "^7.3.3",
-                "@types/babel__core": "^7.0.0",
+                "@types/babel__core": "^7.1.14",
                 "@types/babel__traverse": "^7.0.6"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             }
         },
         "node_modules/babel-preset-current-node-syntax": {
@@ -1573,6 +2014,7 @@
             "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
             "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "@babel/plugin-syntax-async-generators": "^7.8.4",
                 "@babel/plugin-syntax-bigint": "^7.8.3",
@@ -1592,16 +2034,17 @@
             }
         },
         "node_modules/babel-preset-jest": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz",
-            "integrity": "sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==",
+            "version": "29.6.3",
+            "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz",
+            "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "babel-plugin-jest-hoist": "^27.5.1",
+                "babel-plugin-jest-hoist": "^29.6.3",
                 "babel-preset-current-node-syntax": "^1.0.0"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             },
             "peerDependencies": {
                 "@babel/core": "^7.0.0"
@@ -1611,40 +2054,37 @@
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
             "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/brace-expansion": {
             "version": "1.1.11",
             "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
             "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
             }
         },
         "node_modules/braces": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-            "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+            "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "fill-range": "^7.0.1"
+                "fill-range": "^7.1.1"
             },
             "engines": {
                 "node": ">=8"
             }
         },
-        "node_modules/browser-process-hrtime": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
-            "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
-            "dev": true
-        },
         "node_modules/browserslist": {
-            "version": "4.20.2",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.2.tgz",
-            "integrity": "sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA==",
+            "version": "4.23.2",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.2.tgz",
+            "integrity": "sha512-qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA==",
             "dev": true,
             "funding": [
                 {
@@ -1654,14 +2094,18 @@
                 {
                     "type": "tidelift",
                     "url": "https://tidelift.com/funding/github/npm/browserslist"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
                 }
             ],
+            "license": "MIT",
             "dependencies": {
-                "caniuse-lite": "^1.0.30001317",
-                "electron-to-chromium": "^1.4.84",
-                "escalade": "^3.1.1",
-                "node-releases": "^2.0.2",
-                "picocolors": "^1.0.0"
+                "caniuse-lite": "^1.0.30001640",
+                "electron-to-chromium": "^1.4.820",
+                "node-releases": "^2.0.14",
+                "update-browserslist-db": "^1.1.0"
             },
             "bin": {
                 "browserslist": "cli.js"
@@ -1675,6 +2119,7 @@
             "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
             "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
             "dev": true,
+            "license": "Apache-2.0",
             "dependencies": {
                 "node-int64": "^0.4.0"
             }
@@ -1683,13 +2128,15 @@
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
             "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/callsites": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
             "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=6"
             }
@@ -1699,14 +2146,15 @@
             "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
             "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=6"
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001332",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001332.tgz",
-            "integrity": "sha512-10T30NYOEQtN6C11YGg411yebhvpnC6Z102+B95eAsN0oB6KUs01ivE8u+G6FMIRtIrVlYXhL+LUwQ3/hXwDWw==",
+            "version": "1.0.30001641",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001641.tgz",
+            "integrity": "sha512-Phv5thgl67bHYo1TtMY/MurjkHhV4EDaCosezRXgZ8jzA/Ub+wjxAvbGvjoFENStinwi5kCyOYV3mi5tOGykwA==",
             "dev": true,
             "funding": [
                 {
@@ -1716,14 +2164,20 @@
                 {
                     "type": "tidelift",
                     "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
                 }
-            ]
+            ],
+            "license": "CC-BY-4.0"
         },
         "node_modules/chalk": {
             "version": "1.1.3",
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-            "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+            "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^2.2.1",
                 "escape-string-regexp": "^1.0.2",
@@ -1740,31 +2194,47 @@
             "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
             "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=10"
             }
         },
         "node_modules/ci-info": {
-            "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.0.tgz",
-            "integrity": "sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==",
-            "dev": true
+            "version": "3.9.0",
+            "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+            "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/sibiraj-s"
+                }
+            ],
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
         },
         "node_modules/cjs-module-lexer": {
-            "version": "1.2.2",
-            "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz",
-            "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==",
-            "dev": true
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.3.1.tgz",
+            "integrity": "sha512-a3KdPAANPbNE4ZUv9h6LckSl9zLsYOP4MBmhIPkRaeyybt+r4UghLvq+xw/YwUcC1gqylCkL4rdVs3Lwupjm4Q==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/cliui": {
-            "version": "7.0.4",
-            "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-            "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+            "version": "8.0.1",
+            "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+            "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "string-width": "^4.2.0",
-                "strip-ansi": "^6.0.0",
+                "strip-ansi": "^6.0.1",
                 "wrap-ansi": "^7.0.0"
+            },
+            "engines": {
+                "node": ">=12"
             }
         },
         "node_modules/cliui/node_modules/ansi-regex": {
@@ -1772,6 +2242,7 @@
             "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
             "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
@@ -1781,6 +2252,7 @@
             "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
             "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-regex": "^5.0.1"
             },
@@ -1791,136 +2263,281 @@
         "node_modules/co": {
             "version": "4.6.0",
             "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-            "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+            "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "iojs": ">= 1.0.0",
                 "node": ">= 0.12.0"
             }
         },
         "node_modules/collect-v8-coverage": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
-            "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
-            "dev": true
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
+            "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/color-convert": {
-            "version": "1.9.3",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-            "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "color-name": "1.1.3"
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
             }
         },
         "node_modules/color-name": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-            "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-            "dev": true
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/colors": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-            "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
+            "integrity": "sha512-ENwblkFQpqqia6b++zLD/KUWafYlVY/UNnAp7oz7LY7E924wmpye416wBOmvv/HMWzl8gL1kJlfvId/1Dg176w==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.1.90"
             }
         },
-        "node_modules/combined-stream": {
-            "version": "1.0.8",
-            "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-            "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-            "dev": true,
-            "dependencies": {
-                "delayed-stream": "~1.0.0"
-            },
-            "engines": {
-                "node": ">= 0.8"
-            }
-        },
         "node_modules/concat-map": {
             "version": "0.0.1",
             "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-            "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-            "dev": true
+            "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/convert-source-map": {
-            "version": "1.8.0",
-            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
-            "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+            "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
             "dev": true,
-            "dependencies": {
-                "safe-buffer": "~5.1.1"
-            }
+            "license": "MIT"
         },
-        "node_modules/cross-spawn": {
-            "version": "7.0.3",
-            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-            "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+        "node_modules/create-jest": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
+            "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "path-key": "^3.1.0",
-                "shebang-command": "^2.0.0",
-                "which": "^2.0.1"
+                "@jest/types": "^29.6.3",
+                "chalk": "^4.0.0",
+                "exit": "^0.1.2",
+                "graceful-fs": "^4.2.9",
+                "jest-config": "^29.7.0",
+                "jest-util": "^29.7.0",
+                "prompts": "^2.0.1"
+            },
+            "bin": {
+                "create-jest": "bin/create-jest.js"
             },
             "engines": {
-                "node": ">= 8"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             }
         },
-        "node_modules/cssom": {
-            "version": "0.4.4",
-            "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
-            "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
-            "dev": true
-        },
-        "node_modules/cssstyle": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
-            "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+        "node_modules/create-jest/node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "cssom": "~0.3.6"
+                "color-convert": "^2.0.1"
             },
             "engines": {
                 "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
             }
         },
-        "node_modules/cssstyle/node_modules/cssom": {
-            "version": "0.3.8",
-            "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-            "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
-            "dev": true
+        "node_modules/create-jest/node_modules/chalk": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/chalk?sponsor=1"
+            }
+        },
+        "node_modules/create-jest/node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/cross-spawn": {
+            "version": "7.0.3",
+            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+            "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "path-key": "^3.1.0",
+                "shebang-command": "^2.0.0",
+                "which": "^2.0.1"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/cssstyle": {
+            "version": "4.6.0",
+            "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.6.0.tgz",
+            "integrity": "sha512-2z+rWdzbbSZv6/rhtvzvqeZQHrBaqgogqt85sqFNbabZOuFbCVFb8kPeEtZjiKkbrm395irpNKiYeFeLiQnFPg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@asamuzakjp/css-color": "^3.2.0",
+                "rrweb-cssom": "^0.8.0"
+            },
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/customizr": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/customizr/-/customizr-3.0.1.tgz",
+            "integrity": "sha512-uyTSYpPN0E8i08oArwiPn6Zh2/YoFyrneqYBl4vjASz42ze+yA5j9O3rkKXLAShfcucsan/YUYHmdX9plmQ9aA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "colors": "^1.4.0",
+                "cross-spawn": "^7.0.3",
+                "fast-deep-equal": "^3.1.3",
+                "glob": "^7.2.0",
+                "lodash": "^4.17.21",
+                "mkdirp": "^1.0.4",
+                "modernizr": "^3",
+                "nopt": "^5.0.0",
+                "promised-io": "^0.3.6",
+                "yargs": "^17.7.2"
+            },
+            "bin": {
+                "customizr": "bin/customizr"
+            },
+            "engines": {
+                "node": ">=16"
+            },
+            "optionalDependencies": {
+                "fsevents": "^2.3.2"
+            }
+        },
+        "node_modules/customizr/node_modules/colors": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+            "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.1.90"
+            }
+        },
+        "node_modules/customizr/node_modules/glob": {
+            "version": "7.2.3",
+            "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+            "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+            "deprecated": "Glob versions prior to v9 are no longer supported",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.1.1",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+            },
+            "engines": {
+                "node": "*"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/customizr/node_modules/minimatch": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/customizr/node_modules/nopt": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
+            "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "abbrev": "1"
+            },
+            "bin": {
+                "nopt": "bin/nopt.js"
+            },
+            "engines": {
+                "node": ">=6"
+            }
         },
         "node_modules/data-urls": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
-            "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz",
+            "integrity": "sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "abab": "^2.0.3",
-                "whatwg-mimetype": "^2.3.0",
-                "whatwg-url": "^8.0.0"
+                "whatwg-mimetype": "^4.0.0",
+                "whatwg-url": "^14.0.0"
             },
             "engines": {
-                "node": ">=10"
+                "node": ">=18"
             }
         },
         "node_modules/dateformat": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
-            "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
+            "version": "4.6.3",
+            "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-4.6.3.tgz",
+            "integrity": "sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": "*"
             }
         },
         "node_modules/debug": {
-            "version": "4.3.4",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-            "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+            "version": "4.3.5",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
+            "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ms": "2.1.2"
             },
@@ -1933,47 +2550,54 @@
                 }
             }
         },
+        "node_modules/decamelize": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+            "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
         "node_modules/decimal.js": {
-            "version": "10.3.1",
-            "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
-            "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==",
-            "dev": true
+            "version": "10.6.0",
+            "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.6.0.tgz",
+            "integrity": "sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/dedent": {
-            "version": "0.7.0",
-            "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
-            "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=",
-            "dev": true
-        },
-        "node_modules/deep-is": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-            "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-            "dev": true
-        },
-        "node_modules/deepmerge": {
-            "version": "4.2.2",
-            "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-            "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+            "version": "1.5.3",
+            "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz",
+            "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==",
             "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
+            "license": "MIT",
+            "peerDependencies": {
+                "babel-plugin-macros": "^3.1.0"
+            },
+            "peerDependenciesMeta": {
+                "babel-plugin-macros": {
+                    "optional": true
+                }
             }
         },
-        "node_modules/delayed-stream": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-            "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+        "node_modules/deepmerge": {
+            "version": "4.3.1",
+            "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+            "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
             "dev": true,
+            "license": "MIT",
             "engines": {
-                "node": ">=0.4.0"
+                "node": ">=0.10.0"
             }
         },
         "node_modules/detect-file": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
-            "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
+            "integrity": "sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -1983,53 +2607,49 @@
             "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
             "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
         },
         "node_modules/diff-sequences": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
-            "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
+            "version": "29.6.3",
+            "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
+            "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
             "dev": true,
+            "license": "MIT",
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             }
         },
-        "node_modules/domexception": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
-            "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
+        "node_modules/doctrine": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+            "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
             "dev": true,
+            "license": "Apache-2.0",
             "dependencies": {
-                "webidl-conversions": "^5.0.0"
+                "esutils": "^2.0.2"
             },
             "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/domexception/node_modules/webidl-conversions": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
-            "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
+                "node": ">=6.0.0"
             }
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.4.113",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.113.tgz",
-            "integrity": "sha512-s30WKxp27F3bBH6fA07FYL2Xm/FYnYrKpMjHr3XVCTUb9anAyZn/BeZfPWgTZGAbJeT4NxNwISSbLcYZvggPMA==",
-            "dev": true
+            "version": "1.4.825",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.825.tgz",
+            "integrity": "sha512-OCcF+LwdgFGcsYPYC5keEEFC2XT0gBhrYbeGzHCx7i9qRFbzO/AqTmc/C/1xNhJj+JA7rzlN7mpBuStshh96Cg==",
+            "dev": true,
+            "license": "ISC"
         },
         "node_modules/emittery": {
-            "version": "0.8.1",
-            "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz",
-            "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==",
+            "version": "0.13.1",
+            "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
+            "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
-                "node": ">=10"
+                "node": ">=12"
             },
             "funding": {
                 "url": "https://github.com/sindresorhus/emittery?sponsor=1"
@@ -2039,22 +2659,38 @@
             "version": "8.0.0",
             "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
             "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/entities": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",
+            "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "engines": {
+                "node": ">=0.12"
+            },
+            "funding": {
+                "url": "https://github.com/fb55/entities?sponsor=1"
+            }
         },
         "node_modules/error-ex": {
             "version": "1.3.2",
             "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
             "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "is-arrayish": "^0.2.1"
             }
         },
         "node_modules/escalade": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-            "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
+            "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=6"
             }
@@ -2062,39 +2698,19 @@
         "node_modules/escape-string-regexp": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-            "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+            "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.8.0"
             }
         },
-        "node_modules/escodegen": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
-            "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
-            "dev": true,
-            "dependencies": {
-                "esprima": "^4.0.1",
-                "estraverse": "^5.2.0",
-                "esutils": "^2.0.2",
-                "optionator": "^0.8.1"
-            },
-            "bin": {
-                "escodegen": "bin/escodegen.js",
-                "esgenerate": "bin/esgenerate.js"
-            },
-            "engines": {
-                "node": ">=6.0"
-            },
-            "optionalDependencies": {
-                "source-map": "~0.6.1"
-            }
-        },
         "node_modules/esprima": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
             "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
             "dev": true,
+            "license": "BSD-2-Clause",
             "bin": {
                 "esparse": "bin/esparse.js",
                 "esvalidate": "bin/esvalidate.js"
@@ -2103,20 +2719,12 @@
                 "node": ">=4"
             }
         },
-        "node_modules/estraverse": {
-            "version": "5.3.0",
-            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-            "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-            "dev": true,
-            "engines": {
-                "node": ">=4.0"
-            }
-        },
         "node_modules/esutils": {
             "version": "2.0.3",
             "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
             "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
             "dev": true,
+            "license": "BSD-2-Clause",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -2124,14 +2732,16 @@
         "node_modules/eventemitter2": {
             "version": "0.4.14",
             "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz",
-            "integrity": "sha1-j2G3XN4BKy6esoTUVFWDtWQ7Yas=",
-            "dev": true
+            "integrity": "sha512-K7J4xq5xAD5jHsGM5ReWXRTFa3JRGofHiMcVgQ8PRwgWxzjHpMWCIzsmyf60+mh8KLsqYPcjUMa0AC4hd6lPyQ==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/execa": {
             "version": "5.1.1",
             "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
             "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "cross-spawn": "^7.0.3",
                 "get-stream": "^6.0.0",
@@ -2153,7 +2763,7 @@
         "node_modules/exit": {
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-            "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+            "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
             "dev": true,
             "engines": {
                 "node": ">= 0.8.0"
@@ -2162,8 +2772,9 @@
         "node_modules/expand-tilde": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-            "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
+            "integrity": "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "homedir-polyfill": "^1.0.1"
             },
@@ -2172,58 +2783,73 @@
             }
         },
         "node_modules/expect": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
-            "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
+            "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@jest/types": "^27.5.1",
-                "jest-get-type": "^27.5.1",
-                "jest-matcher-utils": "^27.5.1",
-                "jest-message-util": "^27.5.1"
+                "@jest/expect-utils": "^29.7.0",
+                "jest-get-type": "^29.6.3",
+                "jest-matcher-utils": "^29.7.0",
+                "jest-message-util": "^29.7.0",
+                "jest-util": "^29.7.0"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             }
         },
         "node_modules/extend": {
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
             "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/fast-deep-equal": {
+            "version": "3.1.3",
+            "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+            "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/fast-json-stable-stringify": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
             "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-            "dev": true
-        },
-        "node_modules/fast-levenshtein": {
-            "version": "2.0.6",
-            "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-            "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/fb-watchman": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
-            "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
+            "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
             "dev": true,
+            "license": "Apache-2.0",
             "dependencies": {
                 "bser": "2.1.1"
             }
         },
+        "node_modules/file": {
+            "version": "0.2.2",
+            "resolved": "https://registry.npmjs.org/file/-/file-0.2.2.tgz",
+            "integrity": "sha512-gwabMtChzdnpDJdPEpz8Vr/PX0pU85KailuPV71Zw/un5yJVKvzukhB3qf6O3lnTwIe5CxlMYLh3jOK3w5xrLA==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/file-sync-cmp": {
             "version": "0.1.1",
             "resolved": "https://registry.npmjs.org/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz",
-            "integrity": "sha1-peeo/7+kk7Q7kju9TKiaU7Y7YSs=",
-            "dev": true
+            "integrity": "sha512-0k45oWBokCqh2MOexeYKpyqmGKG+8mQ2Wd8iawx+uWd/weWJQAZ6SoPybagdCI4xFisag8iAR77WPm4h3pTfxA==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/fill-range": {
-            "version": "7.0.1",
-            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-            "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+            "version": "7.1.1",
+            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+            "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "to-regex-range": "^5.0.1"
             },
@@ -2236,6 +2862,7 @@
             "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
             "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "locate-path": "^5.0.0",
                 "path-exists": "^4.0.0"
@@ -2245,31 +2872,19 @@
             }
         },
         "node_modules/findup-sync": {
-            "version": "0.3.0",
-            "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz",
-            "integrity": "sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY=",
-            "dev": true,
-            "dependencies": {
-                "glob": "~5.0.0"
-            },
-            "engines": {
-                "node": ">= 0.6.0"
-            }
-        },
-        "node_modules/findup-sync/node_modules/glob": {
-            "version": "5.0.15",
-            "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-            "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-5.0.0.tgz",
+            "integrity": "sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "2 || 3",
-                "once": "^1.3.0",
-                "path-is-absolute": "^1.0.0"
+                "detect-file": "^1.0.0",
+                "is-glob": "^4.0.3",
+                "micromatch": "^4.0.4",
+                "resolve-dir": "^1.0.1"
             },
             "engines": {
-                "node": "*"
+                "node": ">= 10.13.0"
             }
         },
         "node_modules/fined": {
@@ -2277,6 +2892,7 @@
             "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
             "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "expand-tilde": "^2.0.2",
                 "is-plain-object": "^2.0.3",
@@ -2293,6 +2909,7 @@
             "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
             "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">= 0.10"
             }
@@ -2300,13 +2917,15 @@
         "node_modules/flatpickr": {
             "version": "2.6.3",
             "resolved": "https://registry.npmjs.org/flatpickr/-/flatpickr-2.6.3.tgz",
-            "integrity": "sha1-RXNXUy3rE189pktCW/RDVzeWFWQ="
+            "integrity": "sha512-+Mm/LJPFoAGwjZ+Ash4+IMIYMGelEJnspSu1+USuPV9stv51F+/C8wo3SKE7CRco+jKgZe3rsI7/87msCh/QkQ==",
+            "license": "MIT"
         },
         "node_modules/for-in": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-            "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+            "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -2314,8 +2933,9 @@
         "node_modules/for-own": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
-            "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
+            "integrity": "sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "for-in": "^1.0.1"
             },
@@ -2323,32 +2943,20 @@
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/form-data": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
-            "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
-            "dev": true,
-            "dependencies": {
-                "asynckit": "^0.4.0",
-                "combined-stream": "^1.0.8",
-                "mime-types": "^2.1.12"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
         "node_modules/fs.realpath": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-            "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-            "dev": true
+            "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+            "dev": true,
+            "license": "ISC"
         },
         "node_modules/fsevents": {
-            "version": "2.3.2",
-            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-            "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+            "version": "2.3.3",
+            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+            "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
             "dev": true,
             "hasInstallScript": true,
+            "license": "MIT",
             "optional": true,
             "os": [
                 "darwin"
@@ -2358,16 +2966,21 @@
             }
         },
         "node_modules/function-bind": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-            "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-            "dev": true
-        },
-        "node_modules/gensync": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+            "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/gensync": {
             "version": "1.0.0-beta.2",
             "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
             "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=6.9.0"
             }
@@ -2377,6 +2990,7 @@
             "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
             "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
             "dev": true,
+            "license": "ISC",
             "engines": {
                 "node": "6.* || 8.* || >= 10.*"
             }
@@ -2386,6 +3000,7 @@
             "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
             "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8.0.0"
             }
@@ -2395,6 +3010,7 @@
             "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
             "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=10"
             },
@@ -2415,7 +3031,9 @@
             "version": "7.1.7",
             "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
             "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+            "deprecated": "Glob versions prior to v9 are no longer supported",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "fs.realpath": "^1.0.0",
                 "inflight": "^1.0.4",
@@ -2436,6 +3054,7 @@
             "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
             "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "global-prefix": "^1.0.1",
                 "is-windows": "^1.0.1",
@@ -2448,8 +3067,9 @@
         "node_modules/global-prefix": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
-            "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
+            "integrity": "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "expand-tilde": "^2.0.2",
                 "homedir-polyfill": "^1.0.1",
@@ -2466,6 +3086,7 @@
             "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
             "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "isexe": "^2.0.0"
             },
@@ -2478,43 +3099,44 @@
             "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
             "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=4"
             }
         },
         "node_modules/graceful-fs": {
-            "version": "4.2.10",
-            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-            "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-            "dev": true
+            "version": "4.2.11",
+            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+            "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+            "dev": true,
+            "license": "ISC"
         },
         "node_modules/grunt": {
-            "version": "1.5.3",
-            "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.5.3.tgz",
-            "integrity": "sha512-mKwmo4X2d8/4c/BmcOETHek675uOqw0RuA/zy12jaspWqvTp4+ZeQF1W+OTpcbncnaBsfbQJ6l0l4j+Sn/GmaQ==",
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.6.1.tgz",
+            "integrity": "sha512-/ABUy3gYWu5iBmrUSRBP97JLpQUm0GgVveDCp6t3yRNIoltIYw7rEj3g5y1o2PGPR2vfTRGa7WC/LZHLTXnEzA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "dateformat": "~3.0.3",
+                "dateformat": "~4.6.2",
                 "eventemitter2": "~0.4.13",
                 "exit": "~0.1.2",
-                "findup-sync": "~0.3.0",
+                "findup-sync": "~5.0.0",
                 "glob": "~7.1.6",
                 "grunt-cli": "~1.4.3",
                 "grunt-known-options": "~2.0.0",
                 "grunt-legacy-log": "~3.0.0",
                 "grunt-legacy-util": "~2.0.1",
-                "iconv-lite": "~0.4.13",
+                "iconv-lite": "~0.6.3",
                 "js-yaml": "~3.14.0",
                 "minimatch": "~3.0.4",
-                "mkdirp": "~1.0.4",
-                "nopt": "~3.0.6",
-                "rimraf": "~3.0.2"
+                "nopt": "~3.0.6"
             },
             "bin": {
                 "grunt": "bin/grunt"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16"
             }
         },
         "node_modules/grunt-cli": {
@@ -2522,6 +3144,7 @@
             "resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.4.3.tgz",
             "integrity": "sha512-9Dtx/AhVeB4LYzsViCjUQkd0Kw0McN2gYpdmGYKtE2a5Yt7v1Q+HYZVWhqXc/kGnxlMtqKDxSwotiGeFmkrCoQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "grunt-known-options": "~2.0.0",
                 "interpret": "~1.1.0",
@@ -2541,6 +3164,7 @@
             "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
             "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "abbrev": "1",
                 "osenv": "^0.1.4"
@@ -2554,6 +3178,7 @@
             "resolved": "https://registry.npmjs.org/grunt-contrib-clean/-/grunt-contrib-clean-2.0.1.tgz",
             "integrity": "sha512-uRvnXfhiZt8akb/ZRDHJpQQtkkVkqc/opWO4Po/9ehC2hPxgptB9S6JHDC/Nxswo4CJSM0iFPT/Iym3cEMWzKA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "async": "^3.2.3",
                 "rimraf": "^2.6.2"
@@ -2565,23 +3190,12 @@
                 "grunt": ">=0.4.5"
             }
         },
-        "node_modules/grunt-contrib-clean/node_modules/rimraf": {
-            "version": "2.7.1",
-            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-            "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-            "dev": true,
-            "dependencies": {
-                "glob": "^7.1.3"
-            },
-            "bin": {
-                "rimraf": "bin.js"
-            }
-        },
         "node_modules/grunt-contrib-copy": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/grunt-contrib-copy/-/grunt-contrib-copy-1.0.0.tgz",
-            "integrity": "sha1-cGDGWB6QS4qw0A8HbgqPbj58NXM=",
+            "integrity": "sha512-gFRFUB0ZbLcjKb67Magz1yOHGBkyU6uL29hiEW1tdQ9gQt72NuMKIy/kS6dsCbV0cZ0maNCb0s6y+uT1FKU7jA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "chalk": "^1.1.1",
                 "file-sync-cmp": "^0.1.0"
@@ -2595,6 +3209,7 @@
             "resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-2.0.0.tgz",
             "integrity": "sha512-GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -2604,6 +3219,7 @@
             "resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-3.0.0.tgz",
             "integrity": "sha512-GHZQzZmhyq0u3hr7aHW4qUH0xDzwp2YXldLPZTCjlOeGscAOWWPftZG3XioW8MasGp+OBRIu39LFx14SLjXRcA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "colors": "~1.1.2",
                 "grunt-legacy-log-utils": "~2.1.0",
@@ -2619,6 +3235,7 @@
             "resolved": "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-2.1.0.tgz",
             "integrity": "sha512-lwquaPXJtKQk0rUM1IQAop5noEpwFqOXasVoedLeNzaibf/OPWjKYvvdqnEHNmU+0T0CaReAXIbGo747ZD+Aaw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "chalk": "~4.1.0",
                 "lodash": "~4.17.19"
@@ -2632,6 +3249,7 @@
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
             "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-convert": "^2.0.1"
             },
@@ -2647,6 +3265,7 @@
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
             "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^4.1.0",
                 "supports-color": "^7.1.0"
@@ -2658,29 +3277,12 @@
                 "url": "https://github.com/chalk/chalk?sponsor=1"
             }
         },
-        "node_modules/grunt-legacy-log-utils/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/grunt-legacy-log-utils/node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true
-        },
         "node_modules/grunt-legacy-log-utils/node_modules/supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
             "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-flag": "^4.0.0"
             },
@@ -2693,6 +3295,7 @@
             "resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-2.0.1.tgz",
             "integrity": "sha512-2bQiD4fzXqX8rhNdXkAywCadeqiPiay0oQny77wA2F3WF4grPJXCvAcyoWUJV+po/b15glGkxuSiQCK299UC2w==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "async": "~3.2.0",
                 "exit": "~0.1.2",
@@ -2706,23 +3309,29 @@
                 "node": ">=10"
             }
         },
-        "node_modules/has": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-            "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+        "node_modules/grunt-modernizr": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/grunt-modernizr/-/grunt-modernizr-4.0.1.tgz",
+            "integrity": "sha512-YqcmXjC9KMr8qdfmxq4nOh/eMpaSOTvsa9TZxI9ZzS9Z188+SNMDVpVGar1QWHYEOutFfbLJHSxqLjbCc8W4kA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "function-bind": "^1.1.1"
+                "customizr": "^3.0.1",
+                "lodash.merge": "^4.6.2"
+            },
+            "bin": {
+                "grunt-modernizr": "bin/grunt-modernizr"
             },
             "engines": {
-                "node": ">= 0.4.0"
+                "node": ">=18"
             }
         },
         "node_modules/has-ansi": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-            "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+            "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-regex": "^2.0.0"
             },
@@ -2735,15 +3344,30 @@
             "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
             "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
         },
+        "node_modules/hasown": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+            "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "function-bind": "^1.1.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
         "node_modules/homedir-polyfill": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
             "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "parse-passwd": "^1.0.0"
             },
@@ -2754,55 +3378,58 @@
         "node_modules/hooker": {
             "version": "0.2.3",
             "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz",
-            "integrity": "sha1-uDT3I8xKJCqmWWNFnfbZhMXT2Vk=",
+            "integrity": "sha512-t+UerCsQviSymAInD01Pw+Dn/usmz1sRO+3Zk1+lx8eg+WKpD2ulcwWqHHL0+aseRBr+3+vIhiG1K1JTwaIcTA==",
             "dev": true,
             "engines": {
                 "node": "*"
             }
         },
         "node_modules/html-encoding-sniffer": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
-            "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz",
+            "integrity": "sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "whatwg-encoding": "^1.0.5"
+                "whatwg-encoding": "^3.1.1"
             },
             "engines": {
-                "node": ">=10"
+                "node": ">=18"
             }
         },
         "node_modules/html-escaper": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
             "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/http-proxy-agent": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
-            "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+            "version": "7.0.2",
+            "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+            "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@tootallnate/once": "1",
-                "agent-base": "6",
-                "debug": "4"
+                "agent-base": "^7.1.0",
+                "debug": "^4.3.4"
             },
             "engines": {
-                "node": ">= 6"
+                "node": ">= 14"
             }
         },
         "node_modules/https-proxy-agent": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-            "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+            "version": "7.0.6",
+            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+            "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "agent-base": "6",
+                "agent-base": "^7.1.2",
                 "debug": "4"
             },
             "engines": {
-                "node": ">= 6"
+                "node": ">= 14"
             }
         },
         "node_modules/human-signals": {
@@ -2810,17 +3437,19 @@
             "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
             "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
             "dev": true,
+            "license": "Apache-2.0",
             "engines": {
                 "node": ">=10.17.0"
             }
         },
         "node_modules/iconv-lite": {
-            "version": "0.4.24",
-            "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-            "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+            "version": "0.6.3",
+            "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+            "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "safer-buffer": ">= 2.1.2 < 3"
+                "safer-buffer": ">= 2.1.2 < 3.0.0"
             },
             "engines": {
                 "node": ">=0.10.0"
@@ -2831,6 +3460,7 @@
             "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
             "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "pkg-dir": "^4.2.0",
                 "resolve-cwd": "^3.0.0"
@@ -2848,8 +3478,9 @@
         "node_modules/imurmurhash": {
             "version": "0.1.4",
             "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-            "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+            "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.8.19"
             }
@@ -2857,8 +3488,10 @@
         "node_modules/inflight": {
             "version": "1.0.6",
             "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-            "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+            "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+            "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "once": "^1.3.0",
                 "wrappy": "1"
@@ -2868,25 +3501,29 @@
             "version": "2.0.4",
             "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
             "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-            "dev": true
+            "dev": true,
+            "license": "ISC"
         },
         "node_modules/ini": {
             "version": "1.3.8",
             "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
             "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-            "dev": true
+            "dev": true,
+            "license": "ISC"
         },
         "node_modules/interpret": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
-            "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=",
-            "dev": true
+            "integrity": "sha512-CLM8SNMDu7C5psFCn6Wg/tgpj/bKAg7hc2gWqcuR9OD5Ft9PhBpIu8PLicPeis+xDd6YX2ncI8MCA64I9tftIA==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/is-absolute": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
             "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "is-relative": "^1.0.0",
                 "is-windows": "^1.0.1"
@@ -2898,16 +3535,21 @@
         "node_modules/is-arrayish": {
             "version": "0.2.1",
             "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-            "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-            "dev": true
+            "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/is-core-module": {
-            "version": "2.8.1",
-            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz",
-            "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==",
+            "version": "2.14.0",
+            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.14.0.tgz",
+            "integrity": "sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "has": "^1.0.3"
+                "hasown": "^2.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
             },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
@@ -2916,8 +3558,9 @@
         "node_modules/is-extglob": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-            "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+            "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -2927,6 +3570,7 @@
             "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
             "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
@@ -2936,6 +3580,7 @@
             "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
             "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=6"
             }
@@ -2945,6 +3590,7 @@
             "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
             "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "is-extglob": "^2.1.1"
             },
@@ -2957,6 +3603,7 @@
             "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
             "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.12.0"
             }
@@ -2966,6 +3613,7 @@
             "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
             "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "isobject": "^3.0.1"
             },
@@ -2977,13 +3625,15 @@
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
             "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/is-relative": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
             "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "is-unc-path": "^1.0.0"
             },
@@ -2996,6 +3646,7 @@
             "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
             "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             },
@@ -3003,17 +3654,12 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/is-typedarray": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-            "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-            "dev": true
-        },
         "node_modules/is-unc-path": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
             "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "unc-path-regex": "^0.1.2"
             },
@@ -3026,6 +3672,7 @@
             "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
             "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -3033,55 +3680,73 @@
         "node_modules/isexe": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-            "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-            "dev": true
+            "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+            "dev": true,
+            "license": "ISC"
         },
         "node_modules/isobject": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-            "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+            "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
         },
         "node_modules/istanbul-lib-coverage": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
-            "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
+            "version": "3.2.2",
+            "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+            "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
             "dev": true,
+            "license": "BSD-3-Clause",
             "engines": {
                 "node": ">=8"
             }
         },
         "node_modules/istanbul-lib-instrument": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz",
-            "integrity": "sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==",
+            "version": "6.0.3",
+            "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
+            "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
             "dev": true,
+            "license": "BSD-3-Clause",
             "dependencies": {
-                "@babel/core": "^7.12.3",
-                "@babel/parser": "^7.14.7",
-                "@istanbuljs/schema": "^0.1.2",
+                "@babel/core": "^7.23.9",
+                "@babel/parser": "^7.23.9",
+                "@istanbuljs/schema": "^0.1.3",
                 "istanbul-lib-coverage": "^3.2.0",
-                "semver": "^6.3.0"
+                "semver": "^7.5.4"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=10"
+            }
+        },
+        "node_modules/istanbul-lib-instrument/node_modules/semver": {
+            "version": "7.6.2",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
+            "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
+            "dev": true,
+            "license": "ISC",
+            "bin": {
+                "semver": "bin/semver.js"
+            },
+            "engines": {
+                "node": ">=10"
             }
         },
         "node_modules/istanbul-lib-report": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-            "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+            "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
             "dev": true,
+            "license": "BSD-3-Clause",
             "dependencies": {
                 "istanbul-lib-coverage": "^3.0.0",
-                "make-dir": "^3.0.0",
+                "make-dir": "^4.0.0",
                 "supports-color": "^7.1.0"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=10"
             }
         },
         "node_modules/istanbul-lib-report/node_modules/supports-color": {
@@ -3089,6 +3754,7 @@
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
             "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-flag": "^4.0.0"
             },
@@ -3101,6 +3767,7 @@
             "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
             "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
             "dev": true,
+            "license": "BSD-3-Clause",
             "dependencies": {
                 "debug": "^4.1.1",
                 "istanbul-lib-coverage": "^3.0.0",
@@ -3111,10 +3778,11 @@
             }
         },
         "node_modules/istanbul-reports": {
-            "version": "3.1.4",
-            "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.4.tgz",
-            "integrity": "sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw==",
+            "version": "3.1.7",
+            "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
+            "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
             "dev": true,
+            "license": "BSD-3-Clause",
             "dependencies": {
                 "html-escaper": "^2.0.0",
                 "istanbul-lib-report": "^3.0.0"
@@ -3124,20 +3792,22 @@
             }
         },
         "node_modules/jest": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz",
-            "integrity": "sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==",
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
+            "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@jest/core": "^27.5.1",
+                "@jest/core": "^29.7.0",
+                "@jest/types": "^29.6.3",
                 "import-local": "^3.0.2",
-                "jest-cli": "^27.5.1"
+                "jest-cli": "^29.7.0"
             },
             "bin": {
                 "jest": "bin/jest.js"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             },
             "peerDependencies": {
                 "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
@@ -3149,47 +3819,50 @@
             }
         },
         "node_modules/jest-changed-files": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.5.1.tgz",
-            "integrity": "sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==",
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
+            "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@jest/types": "^27.5.1",
                 "execa": "^5.0.0",
-                "throat": "^6.0.1"
+                "jest-util": "^29.7.0",
+                "p-limit": "^3.1.0"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             }
         },
         "node_modules/jest-circus": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.5.1.tgz",
-            "integrity": "sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==",
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
+            "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@jest/environment": "^27.5.1",
-                "@jest/test-result": "^27.5.1",
-                "@jest/types": "^27.5.1",
+                "@jest/environment": "^29.7.0",
+                "@jest/expect": "^29.7.0",
+                "@jest/test-result": "^29.7.0",
+                "@jest/types": "^29.6.3",
                 "@types/node": "*",
                 "chalk": "^4.0.0",
                 "co": "^4.6.0",
-                "dedent": "^0.7.0",
-                "expect": "^27.5.1",
+                "dedent": "^1.0.0",
                 "is-generator-fn": "^2.0.0",
-                "jest-each": "^27.5.1",
-                "jest-matcher-utils": "^27.5.1",
-                "jest-message-util": "^27.5.1",
-                "jest-runtime": "^27.5.1",
-                "jest-snapshot": "^27.5.1",
-                "jest-util": "^27.5.1",
-                "pretty-format": "^27.5.1",
+                "jest-each": "^29.7.0",
+                "jest-matcher-utils": "^29.7.0",
+                "jest-message-util": "^29.7.0",
+                "jest-runtime": "^29.7.0",
+                "jest-snapshot": "^29.7.0",
+                "jest-util": "^29.7.0",
+                "p-limit": "^3.1.0",
+                "pretty-format": "^29.7.0",
+                "pure-rand": "^6.0.0",
                 "slash": "^3.0.0",
-                "stack-utils": "^2.0.3",
-                "throat": "^6.0.1"
+                "stack-utils": "^2.0.3"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             }
         },
         "node_modules/jest-circus/node_modules/ansi-styles": {
@@ -3197,6 +3870,7 @@
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
             "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-convert": "^2.0.1"
             },
@@ -3212,6 +3886,7 @@
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
             "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^4.1.0",
                 "supports-color": "^7.1.0"
@@ -3223,29 +3898,12 @@
                 "url": "https://github.com/chalk/chalk?sponsor=1"
             }
         },
-        "node_modules/jest-circus/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/jest-circus/node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true
-        },
         "node_modules/jest-circus/node_modules/supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
             "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-flag": "^4.0.0"
             },
@@ -3254,29 +3912,29 @@
             }
         },
         "node_modules/jest-cli": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.5.1.tgz",
-            "integrity": "sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==",
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",
+            "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@jest/core": "^27.5.1",
-                "@jest/test-result": "^27.5.1",
-                "@jest/types": "^27.5.1",
+                "@jest/core": "^29.7.0",
+                "@jest/test-result": "^29.7.0",
+                "@jest/types": "^29.6.3",
                 "chalk": "^4.0.0",
+                "create-jest": "^29.7.0",
                 "exit": "^0.1.2",
-                "graceful-fs": "^4.2.9",
                 "import-local": "^3.0.2",
-                "jest-config": "^27.5.1",
-                "jest-util": "^27.5.1",
-                "jest-validate": "^27.5.1",
-                "prompts": "^2.0.1",
-                "yargs": "^16.2.0"
+                "jest-config": "^29.7.0",
+                "jest-util": "^29.7.0",
+                "jest-validate": "^29.7.0",
+                "yargs": "^17.3.1"
             },
             "bin": {
                 "jest": "bin/jest.js"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             },
             "peerDependencies": {
                 "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
@@ -3292,6 +3950,7 @@
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
             "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-convert": "^2.0.1"
             },
@@ -3307,6 +3966,7 @@
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
             "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^4.1.0",
                 "supports-color": "^7.1.0"
@@ -3318,29 +3978,12 @@
                 "url": "https://github.com/chalk/chalk?sponsor=1"
             }
         },
-        "node_modules/jest-cli/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/jest-cli/node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true
-        },
         "node_modules/jest-cli/node_modules/supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
             "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-flag": "^4.0.0"
             },
@@ -3349,43 +3992,46 @@
             }
         },
         "node_modules/jest-config": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.5.1.tgz",
-            "integrity": "sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==",
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
+            "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@babel/core": "^7.8.0",
-                "@jest/test-sequencer": "^27.5.1",
-                "@jest/types": "^27.5.1",
-                "babel-jest": "^27.5.1",
+                "@babel/core": "^7.11.6",
+                "@jest/test-sequencer": "^29.7.0",
+                "@jest/types": "^29.6.3",
+                "babel-jest": "^29.7.0",
                 "chalk": "^4.0.0",
                 "ci-info": "^3.2.0",
                 "deepmerge": "^4.2.2",
-                "glob": "^7.1.1",
+                "glob": "^7.1.3",
                 "graceful-fs": "^4.2.9",
-                "jest-circus": "^27.5.1",
-                "jest-environment-jsdom": "^27.5.1",
-                "jest-environment-node": "^27.5.1",
-                "jest-get-type": "^27.5.1",
-                "jest-jasmine2": "^27.5.1",
-                "jest-regex-util": "^27.5.1",
-                "jest-resolve": "^27.5.1",
-                "jest-runner": "^27.5.1",
-                "jest-util": "^27.5.1",
-                "jest-validate": "^27.5.1",
+                "jest-circus": "^29.7.0",
+                "jest-environment-node": "^29.7.0",
+                "jest-get-type": "^29.6.3",
+                "jest-regex-util": "^29.6.3",
+                "jest-resolve": "^29.7.0",
+                "jest-runner": "^29.7.0",
+                "jest-util": "^29.7.0",
+                "jest-validate": "^29.7.0",
                 "micromatch": "^4.0.4",
                 "parse-json": "^5.2.0",
-                "pretty-format": "^27.5.1",
+                "pretty-format": "^29.7.0",
                 "slash": "^3.0.0",
                 "strip-json-comments": "^3.1.1"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             },
             "peerDependencies": {
+                "@types/node": "*",
                 "ts-node": ">=9.0.0"
             },
             "peerDependenciesMeta": {
+                "@types/node": {
+                    "optional": true
+                },
                 "ts-node": {
                     "optional": true
                 }
@@ -3396,6 +4042,7 @@
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
             "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-convert": "^2.0.1"
             },
@@ -3411,6 +4058,7 @@
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
             "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^4.1.0",
                 "supports-color": "^7.1.0"
@@ -3422,29 +4070,12 @@
                 "url": "https://github.com/chalk/chalk?sponsor=1"
             }
         },
-        "node_modules/jest-config/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/jest-config/node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true
-        },
         "node_modules/jest-config/node_modules/supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
             "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-flag": "^4.0.0"
             },
@@ -3453,18 +4084,19 @@
             }
         },
         "node_modules/jest-diff": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
-            "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
+            "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "chalk": "^4.0.0",
-                "diff-sequences": "^27.5.1",
-                "jest-get-type": "^27.5.1",
-                "pretty-format": "^27.5.1"
+                "diff-sequences": "^29.6.3",
+                "jest-get-type": "^29.6.3",
+                "pretty-format": "^29.7.0"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             }
         },
         "node_modules/jest-diff/node_modules/ansi-styles": {
@@ -3472,6 +4104,7 @@
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
             "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-convert": "^2.0.1"
             },
@@ -3487,6 +4120,7 @@
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
             "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^4.1.0",
                 "supports-color": "^7.1.0"
@@ -3498,29 +4132,12 @@
                 "url": "https://github.com/chalk/chalk?sponsor=1"
             }
         },
-        "node_modules/jest-diff/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/jest-diff/node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true
-        },
         "node_modules/jest-diff/node_modules/supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
             "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-flag": "^4.0.0"
             },
@@ -3529,31 +4146,33 @@
             }
         },
         "node_modules/jest-docblock": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.5.1.tgz",
-            "integrity": "sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==",
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
+            "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "detect-newline": "^3.0.0"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             }
         },
         "node_modules/jest-each": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.5.1.tgz",
-            "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
+            "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@jest/types": "^27.5.1",
+                "@jest/types": "^29.6.3",
                 "chalk": "^4.0.0",
-                "jest-get-type": "^27.5.1",
-                "jest-util": "^27.5.1",
-                "pretty-format": "^27.5.1"
+                "jest-get-type": "^29.6.3",
+                "jest-util": "^29.7.0",
+                "pretty-format": "^29.7.0"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             }
         },
         "node_modules/jest-each/node_modules/ansi-styles": {
@@ -3561,6 +4180,7 @@
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
             "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-convert": "^2.0.1"
             },
@@ -3576,6 +4196,7 @@
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
             "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^4.1.0",
                 "supports-color": "^7.1.0"
@@ -3587,29 +4208,12 @@
                 "url": "https://github.com/chalk/chalk?sponsor=1"
             }
         },
-        "node_modules/jest-each/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/jest-each/node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true
-        },
         "node_modules/jest-each/node_modules/supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
             "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-flag": "^4.0.0"
             },
@@ -3618,108 +4222,117 @@
             }
         },
         "node_modules/jest-environment-jsdom": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz",
-            "integrity": "sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw==",
+            "version": "30.3.0",
+            "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-30.3.0.tgz",
+            "integrity": "sha512-RLEOJy6ip1lpw0yqJ8tB3i88FC7VBz7i00Zvl2qF71IdxjS98gC9/0SPWYIBVXHm5hgCYK0PAlSlnHGGy9RoMg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@jest/environment": "^27.5.1",
-                "@jest/fake-timers": "^27.5.1",
-                "@jest/types": "^27.5.1",
-                "@types/node": "*",
-                "jest-mock": "^27.5.1",
-                "jest-util": "^27.5.1",
-                "jsdom": "^16.6.0"
+                "@jest/environment": "30.3.0",
+                "@jest/environment-jsdom-abstract": "30.3.0",
+                "jsdom": "^26.1.0"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-            }
-        },
-        "node_modules/jest-environment-node": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.5.1.tgz",
-            "integrity": "sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==",
+                "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+            },
+            "peerDependencies": {
+                "canvas": "^3.0.0"
+            },
+            "peerDependenciesMeta": {
+                "canvas": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/jest-environment-jsdom/node_modules/@jest/environment": {
+            "version": "30.3.0",
+            "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-30.3.0.tgz",
+            "integrity": "sha512-SlLSF4Be735yQXyh2+mctBOzNDx5s5uLv88/j8Qn1wH679PDcwy67+YdADn8NJnGjzlXtN62asGH/T4vWOkfaw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@jest/environment": "^27.5.1",
-                "@jest/fake-timers": "^27.5.1",
-                "@jest/types": "^27.5.1",
+                "@jest/fake-timers": "30.3.0",
+                "@jest/types": "30.3.0",
                 "@types/node": "*",
-                "jest-mock": "^27.5.1",
-                "jest-util": "^27.5.1"
+                "jest-mock": "30.3.0"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
             }
         },
-        "node_modules/jest-get-type": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
-            "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
+        "node_modules/jest-environment-jsdom/node_modules/@jest/fake-timers": {
+            "version": "30.3.0",
+            "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-30.3.0.tgz",
+            "integrity": "sha512-WUQDs8SOP9URStX1DzhD425CqbN/HxUYCTwVrT8sTVBfMvFqYt/s61EK5T05qnHu0po6RitXIvP9otZxYDzTGQ==",
             "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/types": "30.3.0",
+                "@sinonjs/fake-timers": "^15.0.0",
+                "@types/node": "*",
+                "jest-message-util": "30.3.0",
+                "jest-mock": "30.3.0",
+                "jest-util": "30.3.0"
+            },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
             }
         },
-        "node_modules/jest-haste-map": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.5.1.tgz",
-            "integrity": "sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==",
+        "node_modules/jest-environment-jsdom/node_modules/@jest/schemas": {
+            "version": "30.0.5",
+            "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
+            "integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@jest/types": "^27.5.1",
-                "@types/graceful-fs": "^4.1.2",
-                "@types/node": "*",
-                "anymatch": "^3.0.3",
-                "fb-watchman": "^2.0.0",
-                "graceful-fs": "^4.2.9",
-                "jest-regex-util": "^27.5.1",
-                "jest-serializer": "^27.5.1",
-                "jest-util": "^27.5.1",
-                "jest-worker": "^27.5.1",
-                "micromatch": "^4.0.4",
-                "walker": "^1.0.7"
+                "@sinclair/typebox": "^0.34.0"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-            },
-            "optionalDependencies": {
-                "fsevents": "^2.3.2"
+                "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
             }
         },
-        "node_modules/jest-jasmine2": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz",
-            "integrity": "sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ==",
+        "node_modules/jest-environment-jsdom/node_modules/@jest/types": {
+            "version": "30.3.0",
+            "resolved": "https://registry.npmjs.org/@jest/types/-/types-30.3.0.tgz",
+            "integrity": "sha512-JHm87k7bA33hpBngtU8h6UBub/fqqA9uXfw+21j5Hmk7ooPHlboRNxHq0JcMtC+n8VJGP1mcfnD3Mk+XKe1oSw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@jest/environment": "^27.5.1",
-                "@jest/source-map": "^27.5.1",
-                "@jest/test-result": "^27.5.1",
-                "@jest/types": "^27.5.1",
+                "@jest/pattern": "30.0.1",
+                "@jest/schemas": "30.0.5",
+                "@types/istanbul-lib-coverage": "^2.0.6",
+                "@types/istanbul-reports": "^3.0.4",
                 "@types/node": "*",
-                "chalk": "^4.0.0",
-                "co": "^4.6.0",
-                "expect": "^27.5.1",
-                "is-generator-fn": "^2.0.0",
-                "jest-each": "^27.5.1",
-                "jest-matcher-utils": "^27.5.1",
-                "jest-message-util": "^27.5.1",
-                "jest-runtime": "^27.5.1",
-                "jest-snapshot": "^27.5.1",
-                "jest-util": "^27.5.1",
-                "pretty-format": "^27.5.1",
-                "throat": "^6.0.1"
+                "@types/yargs": "^17.0.33",
+                "chalk": "^4.1.2"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+            }
+        },
+        "node_modules/jest-environment-jsdom/node_modules/@sinclair/typebox": {
+            "version": "0.34.48",
+            "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.48.tgz",
+            "integrity": "sha512-kKJTNuK3AQOrgjjotVxMrCn1sUJwM76wMszfq1kdU4uYVJjvEWuFQ6HgvLt4Xz3fSmZlTOxJ/Ie13KnIcWQXFA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/jest-environment-jsdom/node_modules/@sinonjs/fake-timers": {
+            "version": "15.1.1",
+            "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-15.1.1.tgz",
+            "integrity": "sha512-cO5W33JgAPbOh07tvZjUOJ7oWhtaqGHiZw+11DPbyqh2kHTBc3eF/CjJDeQ4205RLQsX6rxCuYOroFQwl7JDRw==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "@sinonjs/commons": "^3.0.1"
             }
         },
-        "node_modules/jest-jasmine2/node_modules/ansi-styles": {
+        "node_modules/jest-environment-jsdom/node_modules/ansi-styles": {
             "version": "4.3.0",
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
             "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-convert": "^2.0.1"
             },
@@ -3730,11 +4343,12 @@
                 "url": "https://github.com/chalk/ansi-styles?sponsor=1"
             }
         },
-        "node_modules/jest-jasmine2/node_modules/chalk": {
+        "node_modules/jest-environment-jsdom/node_modules/chalk": {
             "version": "4.1.2",
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
             "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^4.1.0",
                 "supports-color": "^7.1.0"
@@ -3746,29 +4360,123 @@
                 "url": "https://github.com/chalk/chalk?sponsor=1"
             }
         },
-        "node_modules/jest-jasmine2/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+        "node_modules/jest-environment-jsdom/node_modules/ci-info": {
+            "version": "4.4.0",
+            "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.4.0.tgz",
+            "integrity": "sha512-77PSwercCZU2Fc4sX94eF8k8Pxte6JAwL4/ICZLFjJLqegs7kCuAsqqj/70NQF6TvDpgFjkubQB2FW2ZZddvQg==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/sibiraj-s"
+                }
+            ],
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-environment-jsdom/node_modules/jest-message-util": {
+            "version": "30.3.0",
+            "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-30.3.0.tgz",
+            "integrity": "sha512-Z/j4Bo+4ySJ+JPJN3b2Qbl9hDq3VrXmnjjGEWD/x0BCXeOXPTV1iZYYzl2X8c1MaCOL+ewMyNBcm88sboE6YWw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "color-name": "~1.1.4"
+                "@babel/code-frame": "^7.27.1",
+                "@jest/types": "30.3.0",
+                "@types/stack-utils": "^2.0.3",
+                "chalk": "^4.1.2",
+                "graceful-fs": "^4.2.11",
+                "picomatch": "^4.0.3",
+                "pretty-format": "30.3.0",
+                "slash": "^3.0.0",
+                "stack-utils": "^2.0.6"
             },
             "engines": {
-                "node": ">=7.0.0"
+                "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
             }
         },
-        "node_modules/jest-jasmine2/node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true
+        "node_modules/jest-environment-jsdom/node_modules/jest-mock": {
+            "version": "30.3.0",
+            "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-30.3.0.tgz",
+            "integrity": "sha512-OTzICK8CpE+t4ndhKrwlIdbM6Pn8j00lvmSmq5ejiO+KxukbLjgOflKWMn3KE34EZdQm5RqTuKj+5RIEniYhog==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/types": "30.3.0",
+                "@types/node": "*",
+                "jest-util": "30.3.0"
+            },
+            "engines": {
+                "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+            }
+        },
+        "node_modules/jest-environment-jsdom/node_modules/jest-util": {
+            "version": "30.3.0",
+            "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.3.0.tgz",
+            "integrity": "sha512-/jZDa00a3Sz7rdyu55NLrQCIrbyIkbBxareejQI315f/i8HjYN+ZWsDLLpoQSiUIEIyZF/R8fDg3BmB8AtHttg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/types": "30.3.0",
+                "@types/node": "*",
+                "chalk": "^4.1.2",
+                "ci-info": "^4.2.0",
+                "graceful-fs": "^4.2.11",
+                "picomatch": "^4.0.3"
+            },
+            "engines": {
+                "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+            }
+        },
+        "node_modules/jest-environment-jsdom/node_modules/picomatch": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+            "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/jonschlinkert"
+            }
+        },
+        "node_modules/jest-environment-jsdom/node_modules/pretty-format": {
+            "version": "30.3.0",
+            "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-30.3.0.tgz",
+            "integrity": "sha512-oG4T3wCbfeuvljnyAzhBvpN45E8iOTXCU/TD3zXW80HA3dQ4ahdqMkWGiPWZvjpQwlbyHrPTWUAqUzGzv4l1JQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/schemas": "30.0.5",
+                "ansi-styles": "^5.2.0",
+                "react-is": "^18.3.1"
+            },
+            "engines": {
+                "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+            }
+        },
+        "node_modules/jest-environment-jsdom/node_modules/pretty-format/node_modules/ansi-styles": {
+            "version": "5.2.0",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+            "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+            }
         },
-        "node_modules/jest-jasmine2/node_modules/supports-color": {
+        "node_modules/jest-environment-jsdom/node_modules/supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
             "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-flag": "^4.0.0"
             },
@@ -3776,32 +4484,88 @@
                 "node": ">=8"
             }
         },
+        "node_modules/jest-environment-node": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
+            "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/environment": "^29.7.0",
+                "@jest/fake-timers": "^29.7.0",
+                "@jest/types": "^29.6.3",
+                "@types/node": "*",
+                "jest-mock": "^29.7.0",
+                "jest-util": "^29.7.0"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/jest-get-type": {
+            "version": "29.6.3",
+            "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
+            "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/jest-haste-map": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
+            "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/types": "^29.6.3",
+                "@types/graceful-fs": "^4.1.3",
+                "@types/node": "*",
+                "anymatch": "^3.0.3",
+                "fb-watchman": "^2.0.0",
+                "graceful-fs": "^4.2.9",
+                "jest-regex-util": "^29.6.3",
+                "jest-util": "^29.7.0",
+                "jest-worker": "^29.7.0",
+                "micromatch": "^4.0.4",
+                "walker": "^1.0.8"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            },
+            "optionalDependencies": {
+                "fsevents": "^2.3.2"
+            }
+        },
         "node_modules/jest-leak-detector": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz",
-            "integrity": "sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ==",
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
+            "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "jest-get-type": "^27.5.1",
-                "pretty-format": "^27.5.1"
+                "jest-get-type": "^29.6.3",
+                "pretty-format": "^29.7.0"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             }
         },
         "node_modules/jest-matcher-utils": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
-            "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
+            "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "chalk": "^4.0.0",
-                "jest-diff": "^27.5.1",
-                "jest-get-type": "^27.5.1",
-                "pretty-format": "^27.5.1"
+                "jest-diff": "^29.7.0",
+                "jest-get-type": "^29.6.3",
+                "pretty-format": "^29.7.0"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             }
         },
         "node_modules/jest-matcher-utils/node_modules/ansi-styles": {
@@ -3809,6 +4573,7 @@
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
             "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-convert": "^2.0.1"
             },
@@ -3824,6 +4589,7 @@
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
             "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^4.1.0",
                 "supports-color": "^7.1.0"
@@ -3835,29 +4601,12 @@
                 "url": "https://github.com/chalk/chalk?sponsor=1"
             }
         },
-        "node_modules/jest-matcher-utils/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/jest-matcher-utils/node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true
-        },
         "node_modules/jest-matcher-utils/node_modules/supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
             "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-flag": "^4.0.0"
             },
@@ -3866,23 +4615,24 @@
             }
         },
         "node_modules/jest-message-util": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-            "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
+            "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "@babel/code-frame": "^7.12.13",
-                "@jest/types": "^27.5.1",
+                "@jest/types": "^29.6.3",
                 "@types/stack-utils": "^2.0.0",
                 "chalk": "^4.0.0",
                 "graceful-fs": "^4.2.9",
                 "micromatch": "^4.0.4",
-                "pretty-format": "^27.5.1",
+                "pretty-format": "^29.7.0",
                 "slash": "^3.0.0",
                 "stack-utils": "^2.0.3"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             }
         },
         "node_modules/jest-message-util/node_modules/ansi-styles": {
@@ -3890,6 +4640,7 @@
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
             "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-convert": "^2.0.1"
             },
@@ -3905,6 +4656,7 @@
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
             "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^4.1.0",
                 "supports-color": "^7.1.0"
@@ -3916,29 +4668,12 @@
                 "url": "https://github.com/chalk/chalk?sponsor=1"
             }
         },
-        "node_modules/jest-message-util/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/jest-message-util/node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true
-        },
         "node_modules/jest-message-util/node_modules/supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
             "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-flag": "^4.0.0"
             },
@@ -3947,23 +4682,26 @@
             }
         },
         "node_modules/jest-mock": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz",
-            "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
+            "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@jest/types": "^27.5.1",
-                "@types/node": "*"
+                "@jest/types": "^29.6.3",
+                "@types/node": "*",
+                "jest-util": "^29.7.0"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             }
         },
         "node_modules/jest-pnp-resolver": {
-            "version": "1.2.2",
-            "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
-            "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
+            "version": "1.2.3",
+            "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
+            "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=6"
             },
@@ -3977,47 +4715,48 @@
             }
         },
         "node_modules/jest-regex-util": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.5.1.tgz",
-            "integrity": "sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==",
+            "version": "29.6.3",
+            "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
+            "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             }
         },
         "node_modules/jest-resolve": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.5.1.tgz",
-            "integrity": "sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==",
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
+            "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@jest/types": "^27.5.1",
                 "chalk": "^4.0.0",
                 "graceful-fs": "^4.2.9",
-                "jest-haste-map": "^27.5.1",
+                "jest-haste-map": "^29.7.0",
                 "jest-pnp-resolver": "^1.2.2",
-                "jest-util": "^27.5.1",
-                "jest-validate": "^27.5.1",
+                "jest-util": "^29.7.0",
+                "jest-validate": "^29.7.0",
                 "resolve": "^1.20.0",
-                "resolve.exports": "^1.1.0",
+                "resolve.exports": "^2.0.0",
                 "slash": "^3.0.0"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             }
         },
         "node_modules/jest-resolve-dependencies": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz",
-            "integrity": "sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==",
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
+            "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@jest/types": "^27.5.1",
-                "jest-regex-util": "^27.5.1",
-                "jest-snapshot": "^27.5.1"
+                "jest-regex-util": "^29.6.3",
+                "jest-snapshot": "^29.7.0"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             }
         },
         "node_modules/jest-resolve/node_modules/ansi-styles": {
@@ -4025,6 +4764,7 @@
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
             "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-convert": "^2.0.1"
             },
@@ -4040,6 +4780,7 @@
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
             "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^4.1.0",
                 "supports-color": "^7.1.0"
@@ -4051,29 +4792,12 @@
                 "url": "https://github.com/chalk/chalk?sponsor=1"
             }
         },
-        "node_modules/jest-resolve/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/jest-resolve/node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true
-        },
         "node_modules/jest-resolve/node_modules/supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
             "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-flag": "^4.0.0"
             },
@@ -4082,35 +4806,36 @@
             }
         },
         "node_modules/jest-runner": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.5.1.tgz",
-            "integrity": "sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==",
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
+            "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@jest/console": "^27.5.1",
-                "@jest/environment": "^27.5.1",
-                "@jest/test-result": "^27.5.1",
-                "@jest/transform": "^27.5.1",
-                "@jest/types": "^27.5.1",
+                "@jest/console": "^29.7.0",
+                "@jest/environment": "^29.7.0",
+                "@jest/test-result": "^29.7.0",
+                "@jest/transform": "^29.7.0",
+                "@jest/types": "^29.6.3",
                 "@types/node": "*",
                 "chalk": "^4.0.0",
-                "emittery": "^0.8.1",
+                "emittery": "^0.13.1",
                 "graceful-fs": "^4.2.9",
-                "jest-docblock": "^27.5.1",
-                "jest-environment-jsdom": "^27.5.1",
-                "jest-environment-node": "^27.5.1",
-                "jest-haste-map": "^27.5.1",
-                "jest-leak-detector": "^27.5.1",
-                "jest-message-util": "^27.5.1",
-                "jest-resolve": "^27.5.1",
-                "jest-runtime": "^27.5.1",
-                "jest-util": "^27.5.1",
-                "jest-worker": "^27.5.1",
-                "source-map-support": "^0.5.6",
-                "throat": "^6.0.1"
+                "jest-docblock": "^29.7.0",
+                "jest-environment-node": "^29.7.0",
+                "jest-haste-map": "^29.7.0",
+                "jest-leak-detector": "^29.7.0",
+                "jest-message-util": "^29.7.0",
+                "jest-resolve": "^29.7.0",
+                "jest-runtime": "^29.7.0",
+                "jest-util": "^29.7.0",
+                "jest-watcher": "^29.7.0",
+                "jest-worker": "^29.7.0",
+                "p-limit": "^3.1.0",
+                "source-map-support": "0.5.13"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             }
         },
         "node_modules/jest-runner/node_modules/ansi-styles": {
@@ -4118,6 +4843,7 @@
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
             "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-convert": "^2.0.1"
             },
@@ -4133,6 +4859,7 @@
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
             "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^4.1.0",
                 "supports-color": "^7.1.0"
@@ -4144,29 +4871,12 @@
                 "url": "https://github.com/chalk/chalk?sponsor=1"
             }
         },
-        "node_modules/jest-runner/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/jest-runner/node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true
-        },
         "node_modules/jest-runner/node_modules/supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
             "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-flag": "^4.0.0"
             },
@@ -4175,36 +4885,37 @@
             }
         },
         "node_modules/jest-runtime": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.5.1.tgz",
-            "integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==",
-            "dev": true,
-            "dependencies": {
-                "@jest/environment": "^27.5.1",
-                "@jest/fake-timers": "^27.5.1",
-                "@jest/globals": "^27.5.1",
-                "@jest/source-map": "^27.5.1",
-                "@jest/test-result": "^27.5.1",
-                "@jest/transform": "^27.5.1",
-                "@jest/types": "^27.5.1",
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
+            "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/environment": "^29.7.0",
+                "@jest/fake-timers": "^29.7.0",
+                "@jest/globals": "^29.7.0",
+                "@jest/source-map": "^29.6.3",
+                "@jest/test-result": "^29.7.0",
+                "@jest/transform": "^29.7.0",
+                "@jest/types": "^29.6.3",
+                "@types/node": "*",
                 "chalk": "^4.0.0",
                 "cjs-module-lexer": "^1.0.0",
                 "collect-v8-coverage": "^1.0.0",
-                "execa": "^5.0.0",
                 "glob": "^7.1.3",
                 "graceful-fs": "^4.2.9",
-                "jest-haste-map": "^27.5.1",
-                "jest-message-util": "^27.5.1",
-                "jest-mock": "^27.5.1",
-                "jest-regex-util": "^27.5.1",
-                "jest-resolve": "^27.5.1",
-                "jest-snapshot": "^27.5.1",
-                "jest-util": "^27.5.1",
+                "jest-haste-map": "^29.7.0",
+                "jest-message-util": "^29.7.0",
+                "jest-mock": "^29.7.0",
+                "jest-regex-util": "^29.6.3",
+                "jest-resolve": "^29.7.0",
+                "jest-snapshot": "^29.7.0",
+                "jest-util": "^29.7.0",
                 "slash": "^3.0.0",
                 "strip-bom": "^4.0.0"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             }
         },
         "node_modules/jest-runtime/node_modules/ansi-styles": {
@@ -4212,6 +4923,7 @@
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
             "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-convert": "^2.0.1"
             },
@@ -4227,6 +4939,7 @@
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
             "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^4.1.0",
                 "supports-color": "^7.1.0"
@@ -4238,29 +4951,12 @@
                 "url": "https://github.com/chalk/chalk?sponsor=1"
             }
         },
-        "node_modules/jest-runtime/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/jest-runtime/node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true
-        },
         "node_modules/jest-runtime/node_modules/supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
             "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-flag": "^4.0.0"
             },
@@ -4268,50 +4964,36 @@
                 "node": ">=8"
             }
         },
-        "node_modules/jest-serializer": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.5.1.tgz",
-            "integrity": "sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==",
-            "dev": true,
-            "dependencies": {
-                "@types/node": "*",
-                "graceful-fs": "^4.2.9"
-            },
-            "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-            }
-        },
         "node_modules/jest-snapshot": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.5.1.tgz",
-            "integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==",
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
+            "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@babel/core": "^7.7.2",
+                "@babel/core": "^7.11.6",
                 "@babel/generator": "^7.7.2",
+                "@babel/plugin-syntax-jsx": "^7.7.2",
                 "@babel/plugin-syntax-typescript": "^7.7.2",
-                "@babel/traverse": "^7.7.2",
-                "@babel/types": "^7.0.0",
-                "@jest/transform": "^27.5.1",
-                "@jest/types": "^27.5.1",
-                "@types/babel__traverse": "^7.0.4",
-                "@types/prettier": "^2.1.5",
+                "@babel/types": "^7.3.3",
+                "@jest/expect-utils": "^29.7.0",
+                "@jest/transform": "^29.7.0",
+                "@jest/types": "^29.6.3",
                 "babel-preset-current-node-syntax": "^1.0.0",
                 "chalk": "^4.0.0",
-                "expect": "^27.5.1",
+                "expect": "^29.7.0",
                 "graceful-fs": "^4.2.9",
-                "jest-diff": "^27.5.1",
-                "jest-get-type": "^27.5.1",
-                "jest-haste-map": "^27.5.1",
-                "jest-matcher-utils": "^27.5.1",
-                "jest-message-util": "^27.5.1",
-                "jest-util": "^27.5.1",
+                "jest-diff": "^29.7.0",
+                "jest-get-type": "^29.6.3",
+                "jest-matcher-utils": "^29.7.0",
+                "jest-message-util": "^29.7.0",
+                "jest-util": "^29.7.0",
                 "natural-compare": "^1.4.0",
-                "pretty-format": "^27.5.1",
-                "semver": "^7.3.2"
+                "pretty-format": "^29.7.0",
+                "semver": "^7.5.3"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             }
         },
         "node_modules/jest-snapshot/node_modules/ansi-styles": {
@@ -4319,6 +5001,7 @@
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
             "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-convert": "^2.0.1"
             },
@@ -4334,6 +5017,7 @@
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
             "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^4.1.0",
                 "supports-color": "^7.1.0"
@@ -4345,32 +5029,12 @@
                 "url": "https://github.com/chalk/chalk?sponsor=1"
             }
         },
-        "node_modules/jest-snapshot/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/jest-snapshot/node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true
-        },
         "node_modules/jest-snapshot/node_modules/semver": {
-            "version": "7.3.7",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-            "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+            "version": "7.6.2",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
+            "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
             "dev": true,
-            "dependencies": {
-                "lru-cache": "^6.0.0"
-            },
+            "license": "ISC",
             "bin": {
                 "semver": "bin/semver.js"
             },
@@ -4383,6 +5047,7 @@
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
             "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-flag": "^4.0.0"
             },
@@ -4391,12 +5056,13 @@
             }
         },
         "node_modules/jest-util": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-            "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+            "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@jest/types": "^27.5.1",
+                "@jest/types": "^29.6.3",
                 "@types/node": "*",
                 "chalk": "^4.0.0",
                 "ci-info": "^3.2.0",
@@ -4404,7 +5070,7 @@
                 "picomatch": "^2.2.3"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             }
         },
         "node_modules/jest-util/node_modules/ansi-styles": {
@@ -4412,6 +5078,7 @@
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
             "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-convert": "^2.0.1"
             },
@@ -4427,6 +5094,7 @@
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
             "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^4.1.0",
                 "supports-color": "^7.1.0"
@@ -4438,29 +5106,12 @@
                 "url": "https://github.com/chalk/chalk?sponsor=1"
             }
         },
-        "node_modules/jest-util/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/jest-util/node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true
-        },
         "node_modules/jest-util/node_modules/supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
             "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-flag": "^4.0.0"
             },
@@ -4469,20 +5120,21 @@
             }
         },
         "node_modules/jest-validate": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.5.1.tgz",
-            "integrity": "sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==",
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
+            "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@jest/types": "^27.5.1",
+                "@jest/types": "^29.6.3",
                 "camelcase": "^6.2.0",
                 "chalk": "^4.0.0",
-                "jest-get-type": "^27.5.1",
+                "jest-get-type": "^29.6.3",
                 "leven": "^3.1.0",
-                "pretty-format": "^27.5.1"
+                "pretty-format": "^29.7.0"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             }
         },
         "node_modules/jest-validate/node_modules/ansi-styles": {
@@ -4490,6 +5142,7 @@
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
             "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-convert": "^2.0.1"
             },
@@ -4505,6 +5158,7 @@
             "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
             "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=10"
             },
@@ -4517,6 +5171,7 @@
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
             "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^4.1.0",
                 "supports-color": "^7.1.0"
@@ -4528,29 +5183,12 @@
                 "url": "https://github.com/chalk/chalk?sponsor=1"
             }
         },
-        "node_modules/jest-validate/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/jest-validate/node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true
-        },
         "node_modules/jest-validate/node_modules/supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
             "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-flag": "^4.0.0"
             },
@@ -4559,21 +5197,23 @@
             }
         },
         "node_modules/jest-watcher": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.5.1.tgz",
-            "integrity": "sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==",
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
+            "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@jest/test-result": "^27.5.1",
-                "@jest/types": "^27.5.1",
+                "@jest/test-result": "^29.7.0",
+                "@jest/types": "^29.6.3",
                 "@types/node": "*",
                 "ansi-escapes": "^4.2.1",
                 "chalk": "^4.0.0",
-                "jest-util": "^27.5.1",
+                "emittery": "^0.13.1",
+                "jest-util": "^29.7.0",
                 "string-length": "^4.0.1"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             }
         },
         "node_modules/jest-watcher/node_modules/ansi-styles": {
@@ -4581,6 +5221,7 @@
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
             "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-convert": "^2.0.1"
             },
@@ -4596,6 +5237,7 @@
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
             "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^4.1.0",
                 "supports-color": "^7.1.0"
@@ -4607,29 +5249,12 @@
                 "url": "https://github.com/chalk/chalk?sponsor=1"
             }
         },
-        "node_modules/jest-watcher/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/jest-watcher/node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true
-        },
         "node_modules/jest-watcher/node_modules/supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
             "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-flag": "^4.0.0"
             },
@@ -4638,17 +5263,19 @@
             }
         },
         "node_modules/jest-worker": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
-            "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
+            "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "@types/node": "*",
+                "jest-util": "^29.7.0",
                 "merge-stream": "^2.0.0",
                 "supports-color": "^8.0.0"
             },
             "engines": {
-                "node": ">= 10.13.0"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             }
         },
         "node_modules/jest-worker/node_modules/supports-color": {
@@ -4656,6 +5283,7 @@
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
             "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-flag": "^4.0.0"
             },
@@ -4667,9 +5295,10 @@
             }
         },
         "node_modules/jquery": {
-            "version": "3.5.1",
-            "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
-            "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
+            "version": "3.7.1",
+            "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",
+            "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==",
+            "license": "MIT"
         },
         "node_modules/jquery.event.move": {
             "version": "2.0.1",
@@ -4681,7 +5310,7 @@
         "node_modules/jquery.event.swipe": {
             "version": "0.5.4",
             "resolved": "https://registry.npmjs.org/jquery.event.swipe/-/jquery.event.swipe-0.5.4.tgz",
-            "integrity": "sha1-Cda+W93NbUuJZQlOA1eCJQ/9LZg=",
+            "integrity": "sha512-A/h+3c/ByYGEaDShb0/I2D9EJKzK4RqrLLbMJjnwrx88fTK4Q2kx8dsMTtiiBQ/5CfsSPf9h5LNa597pwvlvNw==",
             "dependencies": {
                 "jquery": ">=1.7.0",
                 "jquery.event.move": "1.x"
@@ -4690,7 +5319,7 @@
         "node_modules/jquery.event.swipe/node_modules/jquery.event.move": {
             "version": "1.3.6",
             "resolved": "https://registry.npmjs.org/jquery.event.move/-/jquery.event.move-1.3.6.tgz",
-            "integrity": "sha1-rooDN28zKJWXG0YEQuFmiG0Hiew=",
+            "integrity": "sha512-3wRpftn86GuShjpPCNJ+xAjGikLV7HoPXBXSvD3JjmQHKhIGItslhZ02swHDdZxtz1vat2/wa26dBdSF1a3Uig==",
             "dependencies": {
                 "jquery": ">=1.7.0"
             }
@@ -4698,7 +5327,8 @@
         "node_modules/jquery.transit": {
             "version": "0.9.12",
             "resolved": "https://registry.npmjs.org/jquery.transit/-/jquery.transit-0.9.12.tgz",
-            "integrity": "sha1-W0h6N3QdmdSEadd6DWgAGWMmPDc=",
+            "integrity": "sha512-wn2kHOZWBOJOc8ozEPvBPTNF6tCJTAQfRFLfm0H2p3cM7pdbzkKZYGzqmGeYka7yLmQ27ckiddyVzq+/jfbwcA==",
+            "license": "MIT",
             "peerDependencies": {
                 "jquery": "*"
             }
@@ -4707,13 +5337,15 @@
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
             "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/js-yaml": {
-            "version": "3.14.1",
-            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-            "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+            "version": "3.14.2",
+            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
+            "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "argparse": "^1.0.7",
                 "esprima": "^4.0.0"
@@ -4723,44 +5355,38 @@
             }
         },
         "node_modules/jsdom": {
-            "version": "16.7.0",
-            "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
-            "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
-            "dev": true,
-            "dependencies": {
-                "abab": "^2.0.5",
-                "acorn": "^8.2.4",
-                "acorn-globals": "^6.0.0",
-                "cssom": "^0.4.4",
-                "cssstyle": "^2.3.0",
-                "data-urls": "^2.0.0",
-                "decimal.js": "^10.2.1",
-                "domexception": "^2.0.1",
-                "escodegen": "^2.0.0",
-                "form-data": "^3.0.0",
-                "html-encoding-sniffer": "^2.0.1",
-                "http-proxy-agent": "^4.0.1",
-                "https-proxy-agent": "^5.0.0",
+            "version": "26.1.0",
+            "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-26.1.0.tgz",
+            "integrity": "sha512-Cvc9WUhxSMEo4McES3P7oK3QaXldCfNWp7pl2NNeiIFlCoLr3kfq9kb1fxftiwk1FLV7CvpvDfonxtzUDeSOPg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "cssstyle": "^4.2.1",
+                "data-urls": "^5.0.0",
+                "decimal.js": "^10.5.0",
+                "html-encoding-sniffer": "^4.0.0",
+                "http-proxy-agent": "^7.0.2",
+                "https-proxy-agent": "^7.0.6",
                 "is-potential-custom-element-name": "^1.0.1",
-                "nwsapi": "^2.2.0",
-                "parse5": "6.0.1",
-                "saxes": "^5.0.1",
+                "nwsapi": "^2.2.16",
+                "parse5": "^7.2.1",
+                "rrweb-cssom": "^0.8.0",
+                "saxes": "^6.0.0",
                 "symbol-tree": "^3.2.4",
-                "tough-cookie": "^4.0.0",
-                "w3c-hr-time": "^1.0.2",
-                "w3c-xmlserializer": "^2.0.0",
-                "webidl-conversions": "^6.1.0",
-                "whatwg-encoding": "^1.0.5",
-                "whatwg-mimetype": "^2.3.0",
-                "whatwg-url": "^8.5.0",
-                "ws": "^7.4.6",
-                "xml-name-validator": "^3.0.0"
+                "tough-cookie": "^5.1.1",
+                "w3c-xmlserializer": "^5.0.0",
+                "webidl-conversions": "^7.0.0",
+                "whatwg-encoding": "^3.1.1",
+                "whatwg-mimetype": "^4.0.0",
+                "whatwg-url": "^14.1.1",
+                "ws": "^8.18.0",
+                "xml-name-validator": "^5.0.0"
             },
             "engines": {
-                "node": ">=10"
+                "node": ">=18"
             },
             "peerDependencies": {
-                "canvas": "^2.5.0"
+                "canvas": "^3.0.0"
             },
             "peerDependenciesMeta": {
                 "canvas": {
@@ -4773,6 +5399,7 @@
             "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
             "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
             "dev": true,
+            "license": "MIT",
             "bin": {
                 "jsesc": "bin/jsesc"
             },
@@ -4784,13 +5411,15 @@
             "version": "2.3.1",
             "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
             "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/json5": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-            "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
+            "version": "2.2.3",
+            "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+            "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
             "dev": true,
+            "license": "MIT",
             "bin": {
                 "json5": "lib/cli.js"
             },
@@ -4803,6 +5432,7 @@
             "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
             "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -4812,6 +5442,7 @@
             "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
             "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=6"
             }
@@ -4821,28 +5452,17 @@
             "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
             "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=6"
             }
         },
-        "node_modules/levn": {
-            "version": "0.3.0",
-            "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-            "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-            "dev": true,
-            "dependencies": {
-                "prelude-ls": "~1.1.2",
-                "type-check": "~0.3.2"
-            },
-            "engines": {
-                "node": ">= 0.8.0"
-            }
-        },
         "node_modules/liftup": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/liftup/-/liftup-3.0.1.tgz",
             "integrity": "sha512-yRHaiQDizWSzoXk3APcA71eOI/UuhEkNN9DiW2Tt44mhYzX4joFoCZlxsSOF7RyeLlfqzFLQI1ngFq3ggMPhOw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "extend": "^3.0.2",
                 "findup-sync": "^4.0.0",
@@ -4862,6 +5482,7 @@
             "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-4.0.0.tgz",
             "integrity": "sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "detect-file": "^1.0.0",
                 "is-glob": "^4.0.0",
@@ -4876,13 +5497,25 @@
             "version": "1.2.4",
             "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
             "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/linkify-it": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz",
+            "integrity": "sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "uc.micro": "^1.0.1"
+            }
         },
         "node_modules/locate-path": {
             "version": "5.0.0",
             "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
             "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "p-locate": "^4.1.0"
             },
@@ -4891,43 +5524,64 @@
             }
         },
         "node_modules/lodash": {
-            "version": "4.17.21",
-            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-            "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-            "dev": true
+            "version": "4.17.23",
+            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
+            "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/lodash.merge": {
+            "version": "4.6.2",
+            "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+            "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/lru-cache": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-            "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+            "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
-                "yallist": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=10"
+                "yallist": "^3.0.2"
             }
         },
         "node_modules/make-dir": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-            "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+            "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "semver": "^6.0.0"
+                "semver": "^7.5.3"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=10"
             },
             "funding": {
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "node_modules/make-dir/node_modules/semver": {
+            "version": "7.6.2",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
+            "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
+            "dev": true,
+            "license": "ISC",
+            "bin": {
+                "semver": "bin/semver.js"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
         "node_modules/make-iterator": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
             "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "kind-of": "^6.0.2"
             },
@@ -4940,6 +5594,7 @@
             "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
             "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
             "dev": true,
+            "license": "BSD-3-Clause",
             "dependencies": {
                 "tmpl": "1.0.5"
             }
@@ -4947,57 +5602,71 @@
         "node_modules/map-cache": {
             "version": "0.2.2",
             "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-            "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+            "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/markdown-it": {
+            "version": "13.0.2",
+            "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-13.0.2.tgz",
+            "integrity": "sha512-FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "argparse": "^2.0.1",
+                "entities": "~3.0.1",
+                "linkify-it": "^4.0.1",
+                "mdurl": "^1.0.1",
+                "uc.micro": "^1.0.5"
+            },
+            "bin": {
+                "markdown-it": "bin/markdown-it.js"
+            }
+        },
+        "node_modules/markdown-it/node_modules/argparse": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+            "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+            "dev": true,
+            "license": "Python-2.0"
+        },
+        "node_modules/mdurl": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
+            "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/merge-stream": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
             "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/micromatch": {
-            "version": "4.0.5",
-            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-            "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+            "version": "4.0.7",
+            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz",
+            "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "braces": "^3.0.2",
+                "braces": "^3.0.3",
                 "picomatch": "^2.3.1"
             },
             "engines": {
                 "node": ">=8.6"
             }
         },
-        "node_modules/mime-db": {
-            "version": "1.52.0",
-            "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-            "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-            "dev": true,
-            "engines": {
-                "node": ">= 0.6"
-            }
-        },
-        "node_modules/mime-types": {
-            "version": "2.1.35",
-            "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-            "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-            "dev": true,
-            "dependencies": {
-                "mime-db": "1.52.0"
-            },
-            "engines": {
-                "node": ">= 0.6"
-            }
-        },
         "node_modules/mimic-fn": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
             "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=6"
             }
@@ -5007,6 +5676,7 @@
             "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz",
             "integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "brace-expansion": "^1.1.7"
             },
@@ -5014,11 +5684,22 @@
                 "node": "*"
             }
         },
+        "node_modules/minimist": {
+            "version": "1.2.8",
+            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+            "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/mkdirp": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
             "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
             "dev": true,
+            "license": "MIT",
             "bin": {
                 "mkdirp": "bin/cmd.js"
             },
@@ -5026,97 +5707,253 @@
                 "node": ">=10"
             }
         },
-        "node_modules/ms": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-            "dev": true
-        },
-        "node_modules/natural-compare": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-            "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-            "dev": true
-        },
-        "node_modules/node-int64": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-            "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
-            "dev": true
-        },
-        "node_modules/node-releases": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.3.tgz",
-            "integrity": "sha512-maHFz6OLqYxz+VQyCAtA3PTX4UP/53pa05fyDNc9CwjvJ0yEh6+xBwKsgCxMNhS8taUKBFYxfuiaD9U/55iFaw==",
-            "dev": true
-        },
-        "node_modules/nopt": {
-            "version": "3.0.6",
-            "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-            "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+        "node_modules/modernizr": {
+            "version": "3.13.0",
+            "resolved": "https://registry.npmjs.org/modernizr/-/modernizr-3.13.0.tgz",
+            "integrity": "sha512-dV0tCbZ/XN4m+NPfHw9O/zGT/uyrBlFkPW7q8k1Bx669j9kGcPnhi3UFG/c0zaRWbfOWtqgOCHu0VLpHa/WSSQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "abbrev": "1"
+                "doctrine": "^3.0.0",
+                "file": "^0.2.2",
+                "lodash": "^4.17.21",
+                "markdown-it": "^13.0.1",
+                "mkdirp": "0.5.6",
+                "requirejs": "^2.3.6",
+                "yargs": "^15.4.1"
             },
             "bin": {
-                "nopt": "bin/nopt.js"
+                "modernizr": "bin/modernizr"
+            },
+            "engines": {
+                "node": ">=8"
             }
         },
-        "node_modules/normalize-path": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-            "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+        "node_modules/modernizr/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=8"
             }
         },
-        "node_modules/normalize.css.less": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/normalize.css.less/-/normalize.css.less-3.0.3.tgz",
-            "integrity": "sha1-4wnup5Ah0W5vPR0fXZiPqs5eCPI="
-        },
-        "node_modules/npm-run-path": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-            "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+        "node_modules/modernizr/node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "path-key": "^3.0.0"
+                "color-convert": "^2.0.1"
             },
             "engines": {
                 "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
             }
         },
-        "node_modules/nwsapi": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
-            "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
-            "dev": true
-        },
-        "node_modules/object.defaults": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
-            "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
+        "node_modules/modernizr/node_modules/cliui": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+            "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
-                "array-each": "^1.0.1",
-                "array-slice": "^1.0.0",
-                "for-own": "^1.0.0",
-                "isobject": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=0.10.0"
+                "string-width": "^4.2.0",
+                "strip-ansi": "^6.0.0",
+                "wrap-ansi": "^6.2.0"
             }
         },
-        "node_modules/object.map": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
-            "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
+        "node_modules/modernizr/node_modules/mkdirp": {
+            "version": "0.5.6",
+            "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+            "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "for-own": "^1.0.0",
-                "make-iterator": "^1.0.0"
+                "minimist": "^1.2.6"
+            },
+            "bin": {
+                "mkdirp": "bin/cmd.js"
+            }
+        },
+        "node_modules/modernizr/node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/modernizr/node_modules/wrap-ansi": {
+            "version": "6.2.0",
+            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+            "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^4.0.0",
+                "string-width": "^4.1.0",
+                "strip-ansi": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/modernizr/node_modules/y18n": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+            "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/modernizr/node_modules/yargs": {
+            "version": "15.4.1",
+            "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+            "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "cliui": "^6.0.0",
+                "decamelize": "^1.2.0",
+                "find-up": "^4.1.0",
+                "get-caller-file": "^2.0.1",
+                "require-directory": "^2.1.1",
+                "require-main-filename": "^2.0.0",
+                "set-blocking": "^2.0.0",
+                "string-width": "^4.2.0",
+                "which-module": "^2.0.0",
+                "y18n": "^4.0.0",
+                "yargs-parser": "^18.1.2"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/modernizr/node_modules/yargs-parser": {
+            "version": "18.1.3",
+            "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+            "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "camelcase": "^5.0.0",
+                "decamelize": "^1.2.0"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/ms": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/natural-compare": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+            "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/node-int64": {
+            "version": "0.4.0",
+            "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+            "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/node-releases": {
+            "version": "2.0.14",
+            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
+            "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/nopt": {
+            "version": "3.0.6",
+            "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+            "integrity": "sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "abbrev": "1"
+            },
+            "bin": {
+                "nopt": "bin/nopt.js"
+            }
+        },
+        "node_modules/normalize-path": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+            "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/normalize.css.less": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/normalize.css.less/-/normalize.css.less-3.0.3.tgz",
+            "integrity": "sha512-il3czlF4CXiZZIUi7ny3eCwy6YFhBkqNq8be68bxEhBbR7h4wBaWwkEmUVGIyYsO5DrghNVy+5zv8qyZ0TwR7w==",
+            "license": "MIT"
+        },
+        "node_modules/npm-run-path": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+            "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "path-key": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/nwsapi": {
+            "version": "2.2.23",
+            "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.23.tgz",
+            "integrity": "sha512-7wfH4sLbt4M0gCDzGE6vzQBo0bfTKjU7Sfpqy/7gs1qBfYz2vEJH6vXcBKpO3+6Yu1telwd0t9HpyOoLEQQbIQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/object.defaults": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
+            "integrity": "sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "array-each": "^1.0.1",
+                "array-slice": "^1.0.0",
+                "for-own": "^1.0.0",
+                "isobject": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/object.map": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
+            "integrity": "sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "for-own": "^1.0.0",
+                "make-iterator": "^1.0.0"
             },
             "engines": {
                 "node": ">=0.10.0"
@@ -5125,8 +5962,9 @@
         "node_modules/object.pick": {
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-            "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+            "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "isobject": "^3.0.1"
             },
@@ -5137,8 +5975,9 @@
         "node_modules/once": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-            "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+            "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "wrappy": "1"
             }
@@ -5148,6 +5987,7 @@
             "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
             "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "mimic-fn": "^2.1.0"
             },
@@ -5163,28 +6003,12 @@
             "resolved": "git+ssh://git@github.com/FontFaceKit/open-sans.git#59493162b016dae6ef0d06693ccf3c93c1e96091",
             "license": "Apache-2.0"
         },
-        "node_modules/optionator": {
-            "version": "0.8.3",
-            "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-            "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-            "dev": true,
-            "dependencies": {
-                "deep-is": "~0.1.3",
-                "fast-levenshtein": "~2.0.6",
-                "levn": "~0.3.0",
-                "prelude-ls": "~1.1.2",
-                "type-check": "~0.3.2",
-                "word-wrap": "~1.2.3"
-            },
-            "engines": {
-                "node": ">= 0.8.0"
-            }
-        },
         "node_modules/os-homedir": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-            "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+            "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -5192,8 +6016,9 @@
         "node_modules/os-tmpdir": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-            "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+            "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -5202,22 +6027,25 @@
             "version": "0.1.5",
             "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
             "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+            "deprecated": "This package is no longer supported.",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "os-homedir": "^1.0.0",
                 "os-tmpdir": "^1.0.0"
             }
         },
         "node_modules/p-limit": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-            "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+            "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "p-try": "^2.0.0"
+                "yocto-queue": "^0.1.0"
             },
             "engines": {
-                "node": ">=6"
+                "node": ">=10"
             },
             "funding": {
                 "url": "https://github.com/sponsors/sindresorhus"
@@ -5228,6 +6056,7 @@
             "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
             "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "p-limit": "^2.2.0"
             },
@@ -5235,11 +6064,28 @@
                 "node": ">=8"
             }
         },
+        "node_modules/p-locate/node_modules/p-limit": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+            "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "p-try": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
         "node_modules/p-try": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
             "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=6"
             }
@@ -5247,8 +6093,9 @@
         "node_modules/parse-filepath": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
-            "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
+            "integrity": "sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "is-absolute": "^1.0.0",
                 "map-cache": "^0.2.0",
@@ -5263,6 +6110,7 @@
             "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
             "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "@babel/code-frame": "^7.0.0",
                 "error-ex": "^1.3.1",
@@ -5279,23 +6127,45 @@
         "node_modules/parse-passwd": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-            "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
+            "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
         },
         "node_modules/parse5": {
+            "version": "7.3.0",
+            "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.3.0.tgz",
+            "integrity": "sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "entities": "^6.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/inikulin/parse5?sponsor=1"
+            }
+        },
+        "node_modules/parse5/node_modules/entities": {
             "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-            "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
-            "dev": true
+            "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz",
+            "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "engines": {
+                "node": ">=0.12"
+            },
+            "funding": {
+                "url": "https://github.com/fb55/entities?sponsor=1"
+            }
         },
         "node_modules/path-exists": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
             "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
@@ -5303,8 +6173,9 @@
         "node_modules/path-is-absolute": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-            "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+            "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -5314,6 +6185,7 @@
             "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
             "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
@@ -5322,13 +6194,15 @@
             "version": "1.0.7",
             "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
             "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/path-root": {
             "version": "0.1.1",
             "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
-            "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
+            "integrity": "sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "path-root-regex": "^0.1.0"
             },
@@ -5339,23 +6213,26 @@
         "node_modules/path-root-regex": {
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
-            "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
+            "integrity": "sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
         },
         "node_modules/picocolors": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-            "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-            "dev": true
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+            "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+            "dev": true,
+            "license": "ISC"
         },
         "node_modules/picomatch": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-            "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+            "version": "2.3.2",
+            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
+            "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8.6"
             },
@@ -5367,15 +6244,18 @@
             "version": "3.0.3",
             "resolved": "https://registry.npmjs.org/picturefill/-/picturefill-3.0.3.tgz",
             "integrity": "sha512-JDdx+3i4fs2pkqwWZJgGEM2vFWsq+01YsQFT9CKPGuv2Q0xSdrQZoxi9XwyNARTgxiOdgoAwWQRluLRe/JQX2g==",
+            "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
+            "license": "MIT",
             "engines": {
                 "node": ">= 0.8.0"
             }
         },
         "node_modules/pirates": {
-            "version": "4.0.5",
-            "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
-            "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==",
+            "version": "4.0.6",
+            "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
+            "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">= 6"
             }
@@ -5385,6 +6265,7 @@
             "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
             "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "find-up": "^4.0.0"
             },
@@ -5395,38 +6276,22 @@
         "node_modules/pocketgrid-less": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/pocketgrid-less/-/pocketgrid-less-1.0.1.tgz",
-            "integrity": "sha1-xwfCy59BXzd4Zrhn472HdcK1/3k="
-        },
-        "node_modules/prelude-ls": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-            "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-            "dev": true,
-            "engines": {
-                "node": ">= 0.8.0"
-            }
+            "integrity": "sha512-89F9g6RuIfc7fWO5fuBkf8gb1LqxwCuukCDojBpjbgbHA6utnX+UEwGUn92rXciCFQTtkIzewYjtRzLLg2adpQ==",
+            "license": "MIT"
         },
         "node_modules/pretty-format": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
-            "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+            "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "ansi-regex": "^5.0.1",
+                "@jest/schemas": "^29.6.3",
                 "ansi-styles": "^5.0.0",
-                "react-is": "^17.0.1"
+                "react-is": "^18.0.0"
             },
             "engines": {
-                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-            }
-        },
-        "node_modules/pretty-format/node_modules/ansi-regex": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             }
         },
         "node_modules/pretty-format/node_modules/ansi-styles": {
@@ -5434,6 +6299,7 @@
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
             "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=10"
             },
@@ -5441,11 +6307,18 @@
                 "url": "https://github.com/chalk/ansi-styles?sponsor=1"
             }
         },
+        "node_modules/promised-io": {
+            "version": "0.3.6",
+            "resolved": "https://registry.npmjs.org/promised-io/-/promised-io-0.3.6.tgz",
+            "integrity": "sha512-bNwZusuNIW4m0SPR8jooSyndD35ggirHlxVl/UhIaZD/F0OBv9ebfc6tNmbpZts3QXHggkjIBH8lvtnzhtcz0A==",
+            "dev": true
+        },
         "node_modules/prompts": {
             "version": "2.4.2",
             "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
             "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "kleur": "^3.0.3",
                 "sisteransi": "^1.0.5"
@@ -5454,32 +6327,46 @@
                 "node": ">= 6"
             }
         },
-        "node_modules/psl": {
-            "version": "1.8.0",
-            "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-            "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
-            "dev": true
-        },
         "node_modules/punycode": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-            "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+            "version": "2.3.1",
+            "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+            "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=6"
             }
         },
+        "node_modules/pure-rand": {
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz",
+            "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "individual",
+                    "url": "https://github.com/sponsors/dubzzz"
+                },
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/fast-check"
+                }
+            ],
+            "license": "MIT"
+        },
         "node_modules/react-is": {
-            "version": "17.0.2",
-            "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-            "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
-            "dev": true
+            "version": "18.3.1",
+            "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+            "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/rechoir": {
             "version": "0.7.1",
             "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz",
             "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "resolve": "^1.9.0"
             },
@@ -5490,19 +6377,41 @@
         "node_modules/require-directory": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-            "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+            "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/require-main-filename": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+            "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/requirejs": {
+            "version": "2.3.7",
+            "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.7.tgz",
+            "integrity": "sha512-DouTG8T1WanGok6Qjg2SXuCMzszOo0eHeH9hDZ5Y4x8Je+9JB38HdTLT4/VA8OaUhBa0JPVHJ0pyBkM1z+pDsw==",
+            "dev": true,
+            "bin": {
+                "r_js": "bin/r.js",
+                "r.js": "bin/r.js"
+            },
+            "engines": {
+                "node": ">=0.4.0"
+            }
+        },
         "node_modules/resolve": {
-            "version": "1.22.0",
-            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
-            "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
+            "version": "1.22.8",
+            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+            "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "is-core-module": "^2.8.1",
+                "is-core-module": "^2.13.0",
                 "path-parse": "^1.0.7",
                 "supports-preserve-symlinks-flag": "^1.0.0"
             },
@@ -5518,6 +6427,7 @@
             "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
             "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "resolve-from": "^5.0.0"
             },
@@ -5528,8 +6438,9 @@
         "node_modules/resolve-dir": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
-            "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
+            "integrity": "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "expand-tilde": "^2.0.0",
                 "global-modules": "^1.0.0"
@@ -5543,72 +6454,85 @@
             "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
             "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
         },
         "node_modules/resolve.exports": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz",
-            "integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==",
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
+            "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=10"
             }
         },
         "node_modules/rimraf": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-            "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+            "version": "2.7.1",
+            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+            "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+            "deprecated": "Rimraf versions prior to v4 are no longer supported",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "glob": "^7.1.3"
             },
             "bin": {
                 "rimraf": "bin.js"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
             }
         },
-        "node_modules/safe-buffer": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-            "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-            "dev": true
+        "node_modules/rrweb-cssom": {
+            "version": "0.8.0",
+            "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz",
+            "integrity": "sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/safer-buffer": {
             "version": "2.1.2",
             "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
             "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/saxes": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
-            "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
+            "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "xmlchars": "^2.2.0"
             },
             "engines": {
-                "node": ">=10"
+                "node": ">=v12.22.7"
             }
         },
         "node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
             "dev": true,
+            "license": "ISC",
             "bin": {
                 "semver": "bin/semver.js"
             }
         },
+        "node_modules/set-blocking": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+            "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+            "dev": true,
+            "license": "ISC"
+        },
         "node_modules/shebang-command": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
             "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "shebang-regex": "^3.0.0"
             },
@@ -5621,6 +6545,7 @@
             "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
             "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
@@ -5629,19 +6554,22 @@
             "version": "3.0.7",
             "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
             "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-            "dev": true
+            "dev": true,
+            "license": "ISC"
         },
         "node_modules/sisteransi": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
             "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/slash": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
             "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
@@ -5651,15 +6579,17 @@
             "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
             "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
             "dev": true,
+            "license": "BSD-3-Clause",
             "engines": {
                 "node": ">=0.10.0"
             }
         },
         "node_modules/source-map-support": {
-            "version": "0.5.21",
-            "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-            "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+            "version": "0.5.13",
+            "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
+            "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "buffer-from": "^1.0.0",
                 "source-map": "^0.6.0"
@@ -5668,14 +6598,16 @@
         "node_modules/sprintf-js": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-            "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-            "dev": true
+            "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+            "dev": true,
+            "license": "BSD-3-Clause"
         },
         "node_modules/stack-utils": {
-            "version": "2.0.5",
-            "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz",
-            "integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==",
+            "version": "2.0.6",
+            "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
+            "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "escape-string-regexp": "^2.0.0"
             },
@@ -5688,6 +6620,7 @@
             "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
             "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
@@ -5697,6 +6630,7 @@
             "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
             "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "char-regex": "^1.0.2",
                 "strip-ansi": "^6.0.0"
@@ -5710,6 +6644,7 @@
             "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
             "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
@@ -5719,6 +6654,7 @@
             "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
             "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-regex": "^5.0.1"
             },
@@ -5731,6 +6667,7 @@
             "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
             "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "emoji-regex": "^8.0.0",
                 "is-fullwidth-code-point": "^3.0.0",
@@ -5745,6 +6682,7 @@
             "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
             "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
@@ -5754,6 +6692,7 @@
             "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
             "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-regex": "^5.0.1"
             },
@@ -5764,8 +6703,9 @@
         "node_modules/strip-ansi": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-            "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+            "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-regex": "^2.0.0"
             },
@@ -5778,6 +6718,7 @@
             "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
             "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
@@ -5787,6 +6728,7 @@
             "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
             "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=6"
             }
@@ -5796,6 +6738,7 @@
             "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
             "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             },
@@ -5806,42 +6749,19 @@
         "node_modules/supports-color": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-            "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+            "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.8.0"
             }
         },
-        "node_modules/supports-hyperlinks": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
-            "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
-            "dev": true,
-            "dependencies": {
-                "has-flag": "^4.0.0",
-                "supports-color": "^7.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/supports-hyperlinks/node_modules/supports-color": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-            "dev": true,
-            "dependencies": {
-                "has-flag": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
         "node_modules/supports-preserve-symlinks-flag": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
             "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">= 0.4"
             },
@@ -5853,29 +6773,15 @@
             "version": "3.2.4",
             "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
             "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
-            "dev": true
-        },
-        "node_modules/terminal-link": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
-            "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
             "dev": true,
-            "dependencies": {
-                "ansi-escapes": "^4.2.1",
-                "supports-hyperlinks": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
+            "license": "MIT"
         },
         "node_modules/test-exclude": {
             "version": "6.0.0",
             "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
             "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "@istanbuljs/schema": "^0.1.2",
                 "glob": "^7.1.4",
@@ -5885,23 +6791,39 @@
                 "node": ">=8"
             }
         },
-        "node_modules/throat": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz",
-            "integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==",
-            "dev": true
+        "node_modules/tldts": {
+            "version": "6.1.86",
+            "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.86.tgz",
+            "integrity": "sha512-WMi/OQ2axVTf/ykqCQgXiIct+mSQDFdH2fkwhPwgEwvJ1kSzZRiinb0zF2Xb8u4+OqPChmyI6MEu4EezNJz+FQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "tldts-core": "^6.1.86"
+            },
+            "bin": {
+                "tldts": "bin/cli.js"
+            }
+        },
+        "node_modules/tldts-core": {
+            "version": "6.1.86",
+            "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.86.tgz",
+            "integrity": "sha512-Je6p7pkk+KMzMv2XXKmAE3McmolOQFdxkKw0R8EYNr7sELW46JqnNeTX8ybPiQgvg1ymCoF8LXs5fzFaZvJPTA==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/tmpl": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
             "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
-            "dev": true
+            "dev": true,
+            "license": "BSD-3-Clause"
         },
         "node_modules/to-fast-properties": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-            "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+            "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=4"
             }
@@ -5911,6 +6833,7 @@
             "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
             "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "is-number": "^7.0.0"
             },
@@ -5919,41 +6842,29 @@
             }
         },
         "node_modules/tough-cookie": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
-            "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.2.tgz",
+            "integrity": "sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==",
             "dev": true,
+            "license": "BSD-3-Clause",
             "dependencies": {
-                "psl": "^1.1.33",
-                "punycode": "^2.1.1",
-                "universalify": "^0.1.2"
+                "tldts": "^6.1.32"
             },
             "engines": {
-                "node": ">=6"
+                "node": ">=16"
             }
         },
         "node_modules/tr46": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
-            "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
-            "dev": true,
-            "dependencies": {
-                "punycode": "^2.1.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/type-check": {
-            "version": "0.3.2",
-            "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-            "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.1.tgz",
+            "integrity": "sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "prelude-ls": "~1.1.2"
+                "punycode": "^2.3.1"
             },
             "engines": {
-                "node": ">= 0.8.0"
+                "node": ">=18"
             }
         },
         "node_modules/type-detect": {
@@ -5961,6 +6872,7 @@
             "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
             "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=4"
             }
@@ -5970,6 +6882,7 @@
             "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
             "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
             "dev": true,
+            "license": "(MIT OR CC0-1.0)",
             "engines": {
                 "node": ">=10"
             },
@@ -5977,20 +6890,19 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/typedarray-to-buffer": {
-            "version": "3.1.5",
-            "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-            "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+        "node_modules/uc.micro": {
+            "version": "1.0.6",
+            "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
+            "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
             "dev": true,
-            "dependencies": {
-                "is-typedarray": "^1.0.0"
-            }
+            "license": "MIT"
         },
         "node_modules/unc-path-regex": {
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
-            "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
+            "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -6000,6 +6912,7 @@
             "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.6.tgz",
             "integrity": "sha512-VoC83HWXmCrF6rgkyxS9GHv8W9Q5nhMKho+OadDJGzL2oDYbYEppBaCMH6pFlwLeqj2QS+hhkw2kpXkSdD1JxQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "sprintf-js": "^1.1.1",
                 "util-deprecate": "^1.0.2"
@@ -6009,54 +6922,78 @@
             }
         },
         "node_modules/underscore.string/node_modules/sprintf-js": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
-            "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
-            "dev": true
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+            "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
+            "dev": true,
+            "license": "BSD-3-Clause"
         },
-        "node_modules/universalify": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-            "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+        "node_modules/undici-types": {
+            "version": "5.26.5",
+            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+            "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
             "dev": true,
-            "engines": {
-                "node": ">= 4.0.0"
+            "license": "MIT"
+        },
+        "node_modules/update-browserslist-db": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
+            "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/browserslist"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/browserslist"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "escalade": "^3.1.2",
+                "picocolors": "^1.0.1"
+            },
+            "bin": {
+                "update-browserslist-db": "cli.js"
+            },
+            "peerDependencies": {
+                "browserslist": ">= 4.21.0"
             }
         },
         "node_modules/util-deprecate": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-            "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-            "dev": true
+            "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/v8-to-istanbul": {
-            "version": "8.1.1",
-            "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz",
-            "integrity": "sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==",
+            "version": "9.3.0",
+            "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
+            "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
+                "@jridgewell/trace-mapping": "^0.3.12",
                 "@types/istanbul-lib-coverage": "^2.0.1",
-                "convert-source-map": "^1.6.0",
-                "source-map": "^0.7.3"
+                "convert-source-map": "^2.0.0"
             },
             "engines": {
                 "node": ">=10.12.0"
             }
         },
-        "node_modules/v8-to-istanbul/node_modules/source-map": {
-            "version": "0.7.3",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-            "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-            "dev": true,
-            "engines": {
-                "node": ">= 8"
-            }
-        },
         "node_modules/v8flags": {
             "version": "3.2.0",
             "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
             "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "homedir-polyfill": "^1.0.1"
             },
@@ -6064,25 +7001,17 @@
                 "node": ">= 0.10"
             }
         },
-        "node_modules/w3c-hr-time": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
-            "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
-            "dev": true,
-            "dependencies": {
-                "browser-process-hrtime": "^1.0.0"
-            }
-        },
         "node_modules/w3c-xmlserializer": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
-            "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz",
+            "integrity": "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "xml-name-validator": "^3.0.0"
+                "xml-name-validator": "^5.0.0"
             },
             "engines": {
-                "node": ">=10"
+                "node": ">=18"
             }
         },
         "node_modules/walker": {
@@ -6090,46 +7019,57 @@
             "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
             "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
             "dev": true,
+            "license": "Apache-2.0",
             "dependencies": {
                 "makeerror": "1.0.12"
             }
         },
         "node_modules/webidl-conversions": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
-            "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
+            "version": "7.0.0",
+            "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+            "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
             "dev": true,
+            "license": "BSD-2-Clause",
             "engines": {
-                "node": ">=10.4"
+                "node": ">=12"
             }
         },
         "node_modules/whatwg-encoding": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
-            "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz",
+            "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==",
+            "deprecated": "Use @exodus/bytes instead for a more spec-conformant and faster implementation",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "iconv-lite": "0.4.24"
+                "iconv-lite": "0.6.3"
+            },
+            "engines": {
+                "node": ">=18"
             }
         },
         "node_modules/whatwg-mimetype": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
-            "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
-            "dev": true
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz",
+            "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18"
+            }
         },
         "node_modules/whatwg-url": {
-            "version": "8.7.0",
-            "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
-            "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
+            "version": "14.2.0",
+            "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz",
+            "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "lodash": "^4.7.0",
-                "tr46": "^2.1.0",
-                "webidl-conversions": "^6.1.0"
+                "tr46": "^5.1.0",
+                "webidl-conversions": "^7.0.0"
             },
             "engines": {
-                "node": ">=10"
+                "node": ">=18"
             }
         },
         "node_modules/which": {
@@ -6137,6 +7077,7 @@
             "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
             "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "isexe": "^2.0.0"
             },
@@ -6147,20 +7088,19 @@
                 "node": ">= 8"
             }
         },
-        "node_modules/word-wrap": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-            "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+        "node_modules/which-module": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
+            "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==",
             "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
+            "license": "ISC"
         },
         "node_modules/wrap-ansi": {
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
             "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^4.0.0",
                 "string-width": "^4.1.0",
@@ -6178,6 +7118,7 @@
             "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
             "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
@@ -6187,6 +7128,7 @@
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
             "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-convert": "^2.0.1"
             },
@@ -6197,29 +7139,12 @@
                 "url": "https://github.com/chalk/ansi-styles?sponsor=1"
             }
         },
-        "node_modules/wrap-ansi/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/wrap-ansi/node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true
-        },
         "node_modules/wrap-ansi/node_modules/strip-ansi": {
             "version": "6.0.1",
             "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
             "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-regex": "^5.0.1"
             },
@@ -6230,32 +7155,36 @@
         "node_modules/wrappy": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-            "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-            "dev": true
+            "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+            "dev": true,
+            "license": "ISC"
         },
         "node_modules/write-file-atomic": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-            "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+            "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "imurmurhash": "^0.1.4",
-                "is-typedarray": "^1.0.0",
-                "signal-exit": "^3.0.2",
-                "typedarray-to-buffer": "^3.1.5"
+                "signal-exit": "^3.0.7"
+            },
+            "engines": {
+                "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
             }
         },
         "node_modules/ws": {
-            "version": "7.5.7",
-            "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz",
-            "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==",
+            "version": "8.19.0",
+            "resolved": "https://registry.npmjs.org/ws/-/ws-8.19.0.tgz",
+            "integrity": "sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
-                "node": ">=8.3.0"
+                "node": ">=10.0.0"
             },
             "peerDependencies": {
                 "bufferutil": "^4.0.1",
-                "utf-8-validate": "^5.0.2"
+                "utf-8-validate": ">=5.0.2"
             },
             "peerDependenciesMeta": {
                 "bufferutil": {
@@ -6267,4872 +7196,80 @@
             }
         },
         "node_modules/xml-name-validator": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
-            "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
-            "dev": true
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz",
+            "integrity": "sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=18"
+            }
         },
         "node_modules/xmlchars": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
             "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/y18n": {
             "version": "5.0.8",
             "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
             "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
             "dev": true,
+            "license": "ISC",
             "engines": {
                 "node": ">=10"
             }
         },
         "node_modules/yallist": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-            "dev": true
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+            "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+            "dev": true,
+            "license": "ISC"
         },
         "node_modules/yargs": {
-            "version": "16.2.0",
-            "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-            "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+            "version": "17.7.2",
+            "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+            "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "cliui": "^7.0.2",
+                "cliui": "^8.0.1",
                 "escalade": "^3.1.1",
                 "get-caller-file": "^2.0.5",
                 "require-directory": "^2.1.1",
-                "string-width": "^4.2.0",
+                "string-width": "^4.2.3",
                 "y18n": "^5.0.5",
-                "yargs-parser": "^20.2.2"
+                "yargs-parser": "^21.1.1"
             },
             "engines": {
-                "node": ">=10"
+                "node": ">=12"
             }
         },
         "node_modules/yargs-parser": {
-            "version": "20.2.9",
-            "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-            "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+            "version": "21.1.1",
+            "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+            "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
             "dev": true,
+            "license": "ISC",
             "engines": {
-                "node": ">=10"
-            }
-        }
-    },
-    "dependencies": {
-        "@ampproject/remapping": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.1.2.tgz",
-            "integrity": "sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==",
-            "dev": true,
-            "requires": {
-                "@jridgewell/trace-mapping": "^0.3.0"
-            }
-        },
-        "@babel/code-frame": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-            "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-            "dev": true,
-            "requires": {
-                "@babel/highlight": "^7.16.7"
-            }
-        },
-        "@babel/compat-data": {
-            "version": "7.17.7",
-            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.7.tgz",
-            "integrity": "sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ==",
-            "dev": true
-        },
-        "@babel/core": {
-            "version": "7.17.9",
-            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.9.tgz",
-            "integrity": "sha512-5ug+SfZCpDAkVp9SFIZAzlW18rlzsOcJGaetCjkySnrXXDUw9AR8cDUm1iByTmdWM6yxX6/zycaV76w3YTF2gw==",
-            "dev": true,
-            "requires": {
-                "@ampproject/remapping": "^2.1.0",
-                "@babel/code-frame": "^7.16.7",
-                "@babel/generator": "^7.17.9",
-                "@babel/helper-compilation-targets": "^7.17.7",
-                "@babel/helper-module-transforms": "^7.17.7",
-                "@babel/helpers": "^7.17.9",
-                "@babel/parser": "^7.17.9",
-                "@babel/template": "^7.16.7",
-                "@babel/traverse": "^7.17.9",
-                "@babel/types": "^7.17.0",
-                "convert-source-map": "^1.7.0",
-                "debug": "^4.1.0",
-                "gensync": "^1.0.0-beta.2",
-                "json5": "^2.2.1",
-                "semver": "^6.3.0"
+                "node": ">=12"
             }
         },
-        "@babel/generator": {
-            "version": "7.17.9",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.9.tgz",
-            "integrity": "sha512-rAdDousTwxbIxbz5I7GEQ3lUip+xVCXooZNbsydCWs3xA7ZsYOv+CFRdzGxRX78BmQHu9B1Eso59AOZQOJDEdQ==",
+        "node_modules/yocto-queue": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+            "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
             "dev": true,
-            "requires": {
-                "@babel/types": "^7.17.0",
-                "jsesc": "^2.5.1",
-                "source-map": "^0.5.0"
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
             },
-            "dependencies": {
-                "source-map": {
-                    "version": "0.5.7",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-                    "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/helper-compilation-targets": {
-            "version": "7.17.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz",
-            "integrity": "sha512-UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w==",
-            "dev": true,
-            "requires": {
-                "@babel/compat-data": "^7.17.7",
-                "@babel/helper-validator-option": "^7.16.7",
-                "browserslist": "^4.17.5",
-                "semver": "^6.3.0"
-            }
-        },
-        "@babel/helper-environment-visitor": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz",
-            "integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.16.7"
-            }
-        },
-        "@babel/helper-function-name": {
-            "version": "7.17.9",
-            "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
-            "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
-            "dev": true,
-            "requires": {
-                "@babel/template": "^7.16.7",
-                "@babel/types": "^7.17.0"
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
             }
-        },
-        "@babel/helper-hoist-variables": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-            "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.16.7"
-            }
-        },
-        "@babel/helper-module-imports": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-            "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.16.7"
-            }
-        },
-        "@babel/helper-module-transforms": {
-            "version": "7.17.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz",
-            "integrity": "sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-environment-visitor": "^7.16.7",
-                "@babel/helper-module-imports": "^7.16.7",
-                "@babel/helper-simple-access": "^7.17.7",
-                "@babel/helper-split-export-declaration": "^7.16.7",
-                "@babel/helper-validator-identifier": "^7.16.7",
-                "@babel/template": "^7.16.7",
-                "@babel/traverse": "^7.17.3",
-                "@babel/types": "^7.17.0"
-            }
-        },
-        "@babel/helper-plugin-utils": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz",
-            "integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==",
-            "dev": true
-        },
-        "@babel/helper-simple-access": {
-            "version": "7.17.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz",
-            "integrity": "sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.17.0"
-            }
-        },
-        "@babel/helper-split-export-declaration": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-            "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.16.7"
-            }
-        },
-        "@babel/helper-validator-identifier": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-            "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-            "dev": true
-        },
-        "@babel/helper-validator-option": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
-            "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
-            "dev": true
-        },
-        "@babel/helpers": {
-            "version": "7.17.9",
-            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.9.tgz",
-            "integrity": "sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q==",
-            "dev": true,
-            "requires": {
-                "@babel/template": "^7.16.7",
-                "@babel/traverse": "^7.17.9",
-                "@babel/types": "^7.17.0"
-            }
-        },
-        "@babel/highlight": {
-            "version": "7.17.9",
-            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
-            "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-validator-identifier": "^7.16.7",
-                "chalk": "^2.0.0",
-                "js-tokens": "^4.0.0"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "3.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-                    "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^1.9.0"
-                    }
-                },
-                "chalk": {
-                    "version": "2.4.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-                    "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^3.2.1",
-                        "escape-string-regexp": "^1.0.5",
-                        "supports-color": "^5.3.0"
-                    }
-                },
-                "has-flag": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-                    "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "5.5.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-                    "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^3.0.0"
-                    }
-                }
-            }
-        },
-        "@babel/parser": {
-            "version": "7.17.9",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.9.tgz",
-            "integrity": "sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg==",
-            "dev": true
-        },
-        "@babel/plugin-syntax-async-generators": {
-            "version": "7.8.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-            "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.8.0"
-            }
-        },
-        "@babel/plugin-syntax-bigint": {
-            "version": "7.8.3",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
-            "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.8.0"
-            }
-        },
-        "@babel/plugin-syntax-class-properties": {
-            "version": "7.12.13",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-            "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.12.13"
-            }
-        },
-        "@babel/plugin-syntax-import-meta": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
-            "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4"
-            }
-        },
-        "@babel/plugin-syntax-json-strings": {
-            "version": "7.8.3",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-            "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.8.0"
-            }
-        },
-        "@babel/plugin-syntax-logical-assignment-operators": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-            "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4"
-            }
-        },
-        "@babel/plugin-syntax-nullish-coalescing-operator": {
-            "version": "7.8.3",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-            "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.8.0"
-            }
-        },
-        "@babel/plugin-syntax-numeric-separator": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-            "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4"
-            }
-        },
-        "@babel/plugin-syntax-object-rest-spread": {
-            "version": "7.8.3",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-            "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.8.0"
-            }
-        },
-        "@babel/plugin-syntax-optional-catch-binding": {
-            "version": "7.8.3",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-            "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.8.0"
-            }
-        },
-        "@babel/plugin-syntax-optional-chaining": {
-            "version": "7.8.3",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-            "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.8.0"
-            }
-        },
-        "@babel/plugin-syntax-top-level-await": {
-            "version": "7.14.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-            "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.14.5"
-            }
-        },
-        "@babel/plugin-syntax-typescript": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.7.tgz",
-            "integrity": "sha512-YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.16.7"
-            }
-        },
-        "@babel/template": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-            "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
-            "dev": true,
-            "requires": {
-                "@babel/code-frame": "^7.16.7",
-                "@babel/parser": "^7.16.7",
-                "@babel/types": "^7.16.7"
-            }
-        },
-        "@babel/traverse": {
-            "version": "7.17.9",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.9.tgz",
-            "integrity": "sha512-PQO8sDIJ8SIwipTPiR71kJQCKQYB5NGImbOviK8K+kg5xkNSYXLBupuX9QhatFowrsvo9Hj8WgArg3W7ijNAQw==",
-            "dev": true,
-            "requires": {
-                "@babel/code-frame": "^7.16.7",
-                "@babel/generator": "^7.17.9",
-                "@babel/helper-environment-visitor": "^7.16.7",
-                "@babel/helper-function-name": "^7.17.9",
-                "@babel/helper-hoist-variables": "^7.16.7",
-                "@babel/helper-split-export-declaration": "^7.16.7",
-                "@babel/parser": "^7.17.9",
-                "@babel/types": "^7.17.0",
-                "debug": "^4.1.0",
-                "globals": "^11.1.0"
-            }
-        },
-        "@babel/types": {
-            "version": "7.17.0",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz",
-            "integrity": "sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-validator-identifier": "^7.16.7",
-                "to-fast-properties": "^2.0.0"
-            }
-        },
-        "@bcoe/v8-coverage": {
-            "version": "0.2.3",
-            "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-            "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
-            "dev": true
-        },
-        "@istanbuljs/load-nyc-config": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
-            "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
-            "dev": true,
-            "requires": {
-                "camelcase": "^5.3.1",
-                "find-up": "^4.1.0",
-                "get-package-type": "^0.1.0",
-                "js-yaml": "^3.13.1",
-                "resolve-from": "^5.0.0"
-            }
-        },
-        "@istanbuljs/schema": {
-            "version": "0.1.3",
-            "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-            "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
-            "dev": true
-        },
-        "@jest/console": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
-            "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
-            "dev": true,
-            "requires": {
-                "@jest/types": "^27.5.1",
-                "@types/node": "*",
-                "chalk": "^4.0.0",
-                "jest-message-util": "^27.5.1",
-                "jest-util": "^27.5.1",
-                "slash": "^3.0.0"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "@jest/core": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.5.1.tgz",
-            "integrity": "sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==",
-            "dev": true,
-            "requires": {
-                "@jest/console": "^27.5.1",
-                "@jest/reporters": "^27.5.1",
-                "@jest/test-result": "^27.5.1",
-                "@jest/transform": "^27.5.1",
-                "@jest/types": "^27.5.1",
-                "@types/node": "*",
-                "ansi-escapes": "^4.2.1",
-                "chalk": "^4.0.0",
-                "emittery": "^0.8.1",
-                "exit": "^0.1.2",
-                "graceful-fs": "^4.2.9",
-                "jest-changed-files": "^27.5.1",
-                "jest-config": "^27.5.1",
-                "jest-haste-map": "^27.5.1",
-                "jest-message-util": "^27.5.1",
-                "jest-regex-util": "^27.5.1",
-                "jest-resolve": "^27.5.1",
-                "jest-resolve-dependencies": "^27.5.1",
-                "jest-runner": "^27.5.1",
-                "jest-runtime": "^27.5.1",
-                "jest-snapshot": "^27.5.1",
-                "jest-util": "^27.5.1",
-                "jest-validate": "^27.5.1",
-                "jest-watcher": "^27.5.1",
-                "micromatch": "^4.0.4",
-                "rimraf": "^3.0.0",
-                "slash": "^3.0.0",
-                "strip-ansi": "^6.0.0"
-            },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-                    "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-                    "dev": true
-                },
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "strip-ansi": {
-                    "version": "6.0.1",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-                    "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^5.0.1"
-                    }
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "@jest/environment": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz",
-            "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
-            "dev": true,
-            "requires": {
-                "@jest/fake-timers": "^27.5.1",
-                "@jest/types": "^27.5.1",
-                "@types/node": "*",
-                "jest-mock": "^27.5.1"
-            }
-        },
-        "@jest/fake-timers": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz",
-            "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
-            "dev": true,
-            "requires": {
-                "@jest/types": "^27.5.1",
-                "@sinonjs/fake-timers": "^8.0.1",
-                "@types/node": "*",
-                "jest-message-util": "^27.5.1",
-                "jest-mock": "^27.5.1",
-                "jest-util": "^27.5.1"
-            }
-        },
-        "@jest/globals": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.5.1.tgz",
-            "integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==",
-            "dev": true,
-            "requires": {
-                "@jest/environment": "^27.5.1",
-                "@jest/types": "^27.5.1",
-                "expect": "^27.5.1"
-            }
-        },
-        "@jest/reporters": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.5.1.tgz",
-            "integrity": "sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==",
-            "dev": true,
-            "requires": {
-                "@bcoe/v8-coverage": "^0.2.3",
-                "@jest/console": "^27.5.1",
-                "@jest/test-result": "^27.5.1",
-                "@jest/transform": "^27.5.1",
-                "@jest/types": "^27.5.1",
-                "@types/node": "*",
-                "chalk": "^4.0.0",
-                "collect-v8-coverage": "^1.0.0",
-                "exit": "^0.1.2",
-                "glob": "^7.1.2",
-                "graceful-fs": "^4.2.9",
-                "istanbul-lib-coverage": "^3.0.0",
-                "istanbul-lib-instrument": "^5.1.0",
-                "istanbul-lib-report": "^3.0.0",
-                "istanbul-lib-source-maps": "^4.0.0",
-                "istanbul-reports": "^3.1.3",
-                "jest-haste-map": "^27.5.1",
-                "jest-resolve": "^27.5.1",
-                "jest-util": "^27.5.1",
-                "jest-worker": "^27.5.1",
-                "slash": "^3.0.0",
-                "source-map": "^0.6.0",
-                "string-length": "^4.0.1",
-                "terminal-link": "^2.0.0",
-                "v8-to-istanbul": "^8.1.0"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "@jest/source-map": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.5.1.tgz",
-            "integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==",
-            "dev": true,
-            "requires": {
-                "callsites": "^3.0.0",
-                "graceful-fs": "^4.2.9",
-                "source-map": "^0.6.0"
-            }
-        },
-        "@jest/test-result": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
-            "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
-            "dev": true,
-            "requires": {
-                "@jest/console": "^27.5.1",
-                "@jest/types": "^27.5.1",
-                "@types/istanbul-lib-coverage": "^2.0.0",
-                "collect-v8-coverage": "^1.0.0"
-            }
-        },
-        "@jest/test-sequencer": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz",
-            "integrity": "sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==",
-            "dev": true,
-            "requires": {
-                "@jest/test-result": "^27.5.1",
-                "graceful-fs": "^4.2.9",
-                "jest-haste-map": "^27.5.1",
-                "jest-runtime": "^27.5.1"
-            }
-        },
-        "@jest/transform": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.5.1.tgz",
-            "integrity": "sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==",
-            "dev": true,
-            "requires": {
-                "@babel/core": "^7.1.0",
-                "@jest/types": "^27.5.1",
-                "babel-plugin-istanbul": "^6.1.1",
-                "chalk": "^4.0.0",
-                "convert-source-map": "^1.4.0",
-                "fast-json-stable-stringify": "^2.0.0",
-                "graceful-fs": "^4.2.9",
-                "jest-haste-map": "^27.5.1",
-                "jest-regex-util": "^27.5.1",
-                "jest-util": "^27.5.1",
-                "micromatch": "^4.0.4",
-                "pirates": "^4.0.4",
-                "slash": "^3.0.0",
-                "source-map": "^0.6.1",
-                "write-file-atomic": "^3.0.0"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "@jest/types": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-            "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-            "dev": true,
-            "requires": {
-                "@types/istanbul-lib-coverage": "^2.0.0",
-                "@types/istanbul-reports": "^3.0.0",
-                "@types/node": "*",
-                "@types/yargs": "^16.0.0",
-                "chalk": "^4.0.0"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "@jridgewell/resolve-uri": {
-            "version": "3.0.5",
-            "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz",
-            "integrity": "sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==",
-            "dev": true
-        },
-        "@jridgewell/sourcemap-codec": {
-            "version": "1.4.11",
-            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz",
-            "integrity": "sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==",
-            "dev": true
-        },
-        "@jridgewell/trace-mapping": {
-            "version": "0.3.4",
-            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz",
-            "integrity": "sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==",
-            "dev": true,
-            "requires": {
-                "@jridgewell/resolve-uri": "^3.0.3",
-                "@jridgewell/sourcemap-codec": "^1.4.10"
-            }
-        },
-        "@sinonjs/commons": {
-            "version": "1.8.3",
-            "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
-            "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
-            "dev": true,
-            "requires": {
-                "type-detect": "4.0.8"
-            }
-        },
-        "@sinonjs/fake-timers": {
-            "version": "8.1.0",
-            "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
-            "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
-            "dev": true,
-            "requires": {
-                "@sinonjs/commons": "^1.7.0"
-            }
-        },
-        "@tootallnate/once": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
-            "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
-            "dev": true
-        },
-        "@types/babel__core": {
-            "version": "7.1.19",
-            "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.19.tgz",
-            "integrity": "sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==",
-            "dev": true,
-            "requires": {
-                "@babel/parser": "^7.1.0",
-                "@babel/types": "^7.0.0",
-                "@types/babel__generator": "*",
-                "@types/babel__template": "*",
-                "@types/babel__traverse": "*"
-            }
-        },
-        "@types/babel__generator": {
-            "version": "7.6.4",
-            "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz",
-            "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.0.0"
-            }
-        },
-        "@types/babel__template": {
-            "version": "7.4.1",
-            "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
-            "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
-            "dev": true,
-            "requires": {
-                "@babel/parser": "^7.1.0",
-                "@babel/types": "^7.0.0"
-            }
-        },
-        "@types/babel__traverse": {
-            "version": "7.17.0",
-            "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.17.0.tgz",
-            "integrity": "sha512-r8aveDbd+rzGP+ykSdF3oPuTVRWRfbBiHl0rVDM2yNEmSMXfkObQLV46b4RnCv3Lra51OlfnZhkkFaDl2MIRaA==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.3.0"
-            }
-        },
-        "@types/graceful-fs": {
-            "version": "4.1.5",
-            "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
-            "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
-            "dev": true,
-            "requires": {
-                "@types/node": "*"
-            }
-        },
-        "@types/istanbul-lib-coverage": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
-            "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==",
-            "dev": true
-        },
-        "@types/istanbul-lib-report": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-            "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
-            "dev": true,
-            "requires": {
-                "@types/istanbul-lib-coverage": "*"
-            }
-        },
-        "@types/istanbul-reports": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
-            "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
-            "dev": true,
-            "requires": {
-                "@types/istanbul-lib-report": "*"
-            }
-        },
-        "@types/node": {
-            "version": "17.0.25",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.25.tgz",
-            "integrity": "sha512-wANk6fBrUwdpY4isjWrKTufkrXdu1D2YHCot2fD/DfWxF5sMrVSA+KN7ydckvaTCh0HiqX9IVl0L5/ZoXg5M7w==",
-            "dev": true
-        },
-        "@types/prettier": {
-            "version": "2.6.0",
-            "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.6.0.tgz",
-            "integrity": "sha512-G/AdOadiZhnJp0jXCaBQU449W2h716OW/EoXeYkCytxKL06X1WCXB4DZpp8TpZ8eyIJVS1cw4lrlkkSYU21cDw==",
-            "dev": true
-        },
-        "@types/stack-utils": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
-            "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
-            "dev": true
-        },
-        "@types/yargs": {
-            "version": "16.0.4",
-            "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-            "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-            "dev": true,
-            "requires": {
-                "@types/yargs-parser": "*"
-            }
-        },
-        "@types/yargs-parser": {
-            "version": "21.0.0",
-            "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz",
-            "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==",
-            "dev": true
-        },
-        "abab": {
-            "version": "2.0.6",
-            "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
-            "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
-            "dev": true
-        },
-        "abbrev": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-            "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-            "dev": true
-        },
-        "acorn": {
-            "version": "8.7.0",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
-            "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
-            "dev": true
-        },
-        "acorn-globals": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
-            "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
-            "dev": true,
-            "requires": {
-                "acorn": "^7.1.1",
-                "acorn-walk": "^7.1.1"
-            },
-            "dependencies": {
-                "acorn": {
-                    "version": "7.4.1",
-                    "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-                    "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-                    "dev": true
-                }
-            }
-        },
-        "acorn-walk": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-            "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
-            "dev": true
-        },
-        "agent-base": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-            "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-            "dev": true,
-            "requires": {
-                "debug": "4"
-            }
-        },
-        "ansi-escapes": {
-            "version": "4.3.2",
-            "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-            "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-            "dev": true,
-            "requires": {
-                "type-fest": "^0.21.3"
-            }
-        },
-        "ansi-regex": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-            "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-            "dev": true
-        },
-        "ansi-styles": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-            "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-            "dev": true
-        },
-        "anymatch": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-            "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-            "dev": true,
-            "requires": {
-                "normalize-path": "^3.0.0",
-                "picomatch": "^2.0.4"
-            }
-        },
-        "argparse": {
-            "version": "1.0.10",
-            "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-            "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-            "dev": true,
-            "requires": {
-                "sprintf-js": "~1.0.2"
-            }
-        },
-        "array-each": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
-            "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
-            "dev": true
-        },
-        "array-slice": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
-            "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
-            "dev": true
-        },
-        "async": {
-            "version": "3.2.3",
-            "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
-            "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==",
-            "dev": true
-        },
-        "asynckit": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-            "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-            "dev": true
-        },
-        "babel-jest": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.1.tgz",
-            "integrity": "sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==",
-            "dev": true,
-            "requires": {
-                "@jest/transform": "^27.5.1",
-                "@jest/types": "^27.5.1",
-                "@types/babel__core": "^7.1.14",
-                "babel-plugin-istanbul": "^6.1.1",
-                "babel-preset-jest": "^27.5.1",
-                "chalk": "^4.0.0",
-                "graceful-fs": "^4.2.9",
-                "slash": "^3.0.0"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "babel-plugin-istanbul": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
-            "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.0.0",
-                "@istanbuljs/load-nyc-config": "^1.0.0",
-                "@istanbuljs/schema": "^0.1.2",
-                "istanbul-lib-instrument": "^5.0.4",
-                "test-exclude": "^6.0.0"
-            }
-        },
-        "babel-plugin-jest-hoist": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz",
-            "integrity": "sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==",
-            "dev": true,
-            "requires": {
-                "@babel/template": "^7.3.3",
-                "@babel/types": "^7.3.3",
-                "@types/babel__core": "^7.0.0",
-                "@types/babel__traverse": "^7.0.6"
-            }
-        },
-        "babel-preset-current-node-syntax": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
-            "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
-            "dev": true,
-            "requires": {
-                "@babel/plugin-syntax-async-generators": "^7.8.4",
-                "@babel/plugin-syntax-bigint": "^7.8.3",
-                "@babel/plugin-syntax-class-properties": "^7.8.3",
-                "@babel/plugin-syntax-import-meta": "^7.8.3",
-                "@babel/plugin-syntax-json-strings": "^7.8.3",
-                "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
-                "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-                "@babel/plugin-syntax-numeric-separator": "^7.8.3",
-                "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-                "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-                "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-                "@babel/plugin-syntax-top-level-await": "^7.8.3"
-            }
-        },
-        "babel-preset-jest": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz",
-            "integrity": "sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==",
-            "dev": true,
-            "requires": {
-                "babel-plugin-jest-hoist": "^27.5.1",
-                "babel-preset-current-node-syntax": "^1.0.0"
-            }
-        },
-        "balanced-match": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-            "dev": true
-        },
-        "brace-expansion": {
-            "version": "1.1.11",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-            "dev": true,
-            "requires": {
-                "balanced-match": "^1.0.0",
-                "concat-map": "0.0.1"
-            }
-        },
-        "braces": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-            "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-            "dev": true,
-            "requires": {
-                "fill-range": "^7.0.1"
-            }
-        },
-        "browser-process-hrtime": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
-            "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
-            "dev": true
-        },
-        "browserslist": {
-            "version": "4.20.2",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.2.tgz",
-            "integrity": "sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA==",
-            "dev": true,
-            "requires": {
-                "caniuse-lite": "^1.0.30001317",
-                "electron-to-chromium": "^1.4.84",
-                "escalade": "^3.1.1",
-                "node-releases": "^2.0.2",
-                "picocolors": "^1.0.0"
-            }
-        },
-        "bser": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
-            "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
-            "dev": true,
-            "requires": {
-                "node-int64": "^0.4.0"
-            }
-        },
-        "buffer-from": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-            "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-            "dev": true
-        },
-        "callsites": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-            "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-            "dev": true
-        },
-        "camelcase": {
-            "version": "5.3.1",
-            "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-            "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-            "dev": true
-        },
-        "caniuse-lite": {
-            "version": "1.0.30001332",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001332.tgz",
-            "integrity": "sha512-10T30NYOEQtN6C11YGg411yebhvpnC6Z102+B95eAsN0oB6KUs01ivE8u+G6FMIRtIrVlYXhL+LUwQ3/hXwDWw==",
-            "dev": true
-        },
-        "chalk": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-            "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-            "dev": true,
-            "requires": {
-                "ansi-styles": "^2.2.1",
-                "escape-string-regexp": "^1.0.2",
-                "has-ansi": "^2.0.0",
-                "strip-ansi": "^3.0.0",
-                "supports-color": "^2.0.0"
-            }
-        },
-        "char-regex": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
-            "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
-            "dev": true
-        },
-        "ci-info": {
-            "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.0.tgz",
-            "integrity": "sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==",
-            "dev": true
-        },
-        "cjs-module-lexer": {
-            "version": "1.2.2",
-            "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz",
-            "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==",
-            "dev": true
-        },
-        "cliui": {
-            "version": "7.0.4",
-            "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-            "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-            "dev": true,
-            "requires": {
-                "string-width": "^4.2.0",
-                "strip-ansi": "^6.0.0",
-                "wrap-ansi": "^7.0.0"
-            },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-                    "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-                    "dev": true
-                },
-                "strip-ansi": {
-                    "version": "6.0.1",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-                    "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^5.0.1"
-                    }
-                }
-            }
-        },
-        "co": {
-            "version": "4.6.0",
-            "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-            "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-            "dev": true
-        },
-        "collect-v8-coverage": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
-            "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
-            "dev": true
-        },
-        "color-convert": {
-            "version": "1.9.3",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-            "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-            "dev": true,
-            "requires": {
-                "color-name": "1.1.3"
-            }
-        },
-        "color-name": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-            "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-            "dev": true
-        },
-        "colors": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-            "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
-            "dev": true
-        },
-        "combined-stream": {
-            "version": "1.0.8",
-            "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-            "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-            "dev": true,
-            "requires": {
-                "delayed-stream": "~1.0.0"
-            }
-        },
-        "concat-map": {
-            "version": "0.0.1",
-            "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-            "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-            "dev": true
-        },
-        "convert-source-map": {
-            "version": "1.8.0",
-            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
-            "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
-            "dev": true,
-            "requires": {
-                "safe-buffer": "~5.1.1"
-            }
-        },
-        "cross-spawn": {
-            "version": "7.0.3",
-            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-            "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-            "dev": true,
-            "requires": {
-                "path-key": "^3.1.0",
-                "shebang-command": "^2.0.0",
-                "which": "^2.0.1"
-            }
-        },
-        "cssom": {
-            "version": "0.4.4",
-            "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
-            "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
-            "dev": true
-        },
-        "cssstyle": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
-            "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
-            "dev": true,
-            "requires": {
-                "cssom": "~0.3.6"
-            },
-            "dependencies": {
-                "cssom": {
-                    "version": "0.3.8",
-                    "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-                    "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
-                    "dev": true
-                }
-            }
-        },
-        "data-urls": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
-            "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
-            "dev": true,
-            "requires": {
-                "abab": "^2.0.3",
-                "whatwg-mimetype": "^2.3.0",
-                "whatwg-url": "^8.0.0"
-            }
-        },
-        "dateformat": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
-            "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
-            "dev": true
-        },
-        "debug": {
-            "version": "4.3.4",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-            "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-            "dev": true,
-            "requires": {
-                "ms": "2.1.2"
-            }
-        },
-        "decimal.js": {
-            "version": "10.3.1",
-            "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
-            "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==",
-            "dev": true
-        },
-        "dedent": {
-            "version": "0.7.0",
-            "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
-            "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=",
-            "dev": true
-        },
-        "deep-is": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-            "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-            "dev": true
-        },
-        "deepmerge": {
-            "version": "4.2.2",
-            "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-            "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
-            "dev": true
-        },
-        "delayed-stream": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-            "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-            "dev": true
-        },
-        "detect-file": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
-            "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
-            "dev": true
-        },
-        "detect-newline": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
-            "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
-            "dev": true
-        },
-        "diff-sequences": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
-            "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
-            "dev": true
-        },
-        "domexception": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
-            "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
-            "dev": true,
-            "requires": {
-                "webidl-conversions": "^5.0.0"
-            },
-            "dependencies": {
-                "webidl-conversions": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
-                    "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
-                    "dev": true
-                }
-            }
-        },
-        "electron-to-chromium": {
-            "version": "1.4.113",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.113.tgz",
-            "integrity": "sha512-s30WKxp27F3bBH6fA07FYL2Xm/FYnYrKpMjHr3XVCTUb9anAyZn/BeZfPWgTZGAbJeT4NxNwISSbLcYZvggPMA==",
-            "dev": true
-        },
-        "emittery": {
-            "version": "0.8.1",
-            "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz",
-            "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==",
-            "dev": true
-        },
-        "emoji-regex": {
-            "version": "8.0.0",
-            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-            "dev": true
-        },
-        "error-ex": {
-            "version": "1.3.2",
-            "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-            "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-            "dev": true,
-            "requires": {
-                "is-arrayish": "^0.2.1"
-            }
-        },
-        "escalade": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-            "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-            "dev": true
-        },
-        "escape-string-regexp": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-            "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-            "dev": true
-        },
-        "escodegen": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
-            "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
-            "dev": true,
-            "requires": {
-                "esprima": "^4.0.1",
-                "estraverse": "^5.2.0",
-                "esutils": "^2.0.2",
-                "optionator": "^0.8.1",
-                "source-map": "~0.6.1"
-            }
-        },
-        "esprima": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-            "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-            "dev": true
-        },
-        "estraverse": {
-            "version": "5.3.0",
-            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-            "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-            "dev": true
-        },
-        "esutils": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-            "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-            "dev": true
-        },
-        "eventemitter2": {
-            "version": "0.4.14",
-            "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz",
-            "integrity": "sha1-j2G3XN4BKy6esoTUVFWDtWQ7Yas=",
-            "dev": true
-        },
-        "execa": {
-            "version": "5.1.1",
-            "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-            "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-            "dev": true,
-            "requires": {
-                "cross-spawn": "^7.0.3",
-                "get-stream": "^6.0.0",
-                "human-signals": "^2.1.0",
-                "is-stream": "^2.0.0",
-                "merge-stream": "^2.0.0",
-                "npm-run-path": "^4.0.1",
-                "onetime": "^5.1.2",
-                "signal-exit": "^3.0.3",
-                "strip-final-newline": "^2.0.0"
-            }
-        },
-        "exit": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-            "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
-            "dev": true
-        },
-        "expand-tilde": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-            "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
-            "dev": true,
-            "requires": {
-                "homedir-polyfill": "^1.0.1"
-            }
-        },
-        "expect": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
-            "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
-            "dev": true,
-            "requires": {
-                "@jest/types": "^27.5.1",
-                "jest-get-type": "^27.5.1",
-                "jest-matcher-utils": "^27.5.1",
-                "jest-message-util": "^27.5.1"
-            }
-        },
-        "extend": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-            "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-            "dev": true
-        },
-        "fast-json-stable-stringify": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-            "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-            "dev": true
-        },
-        "fast-levenshtein": {
-            "version": "2.0.6",
-            "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-            "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-            "dev": true
-        },
-        "fb-watchman": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
-            "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
-            "dev": true,
-            "requires": {
-                "bser": "2.1.1"
-            }
-        },
-        "file-sync-cmp": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz",
-            "integrity": "sha1-peeo/7+kk7Q7kju9TKiaU7Y7YSs=",
-            "dev": true
-        },
-        "fill-range": {
-            "version": "7.0.1",
-            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-            "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-            "dev": true,
-            "requires": {
-                "to-regex-range": "^5.0.1"
-            }
-        },
-        "find-up": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-            "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-            "dev": true,
-            "requires": {
-                "locate-path": "^5.0.0",
-                "path-exists": "^4.0.0"
-            }
-        },
-        "findup-sync": {
-            "version": "0.3.0",
-            "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz",
-            "integrity": "sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY=",
-            "dev": true,
-            "requires": {
-                "glob": "~5.0.0"
-            },
-            "dependencies": {
-                "glob": {
-                    "version": "5.0.15",
-                    "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-                    "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-                    "dev": true,
-                    "requires": {
-                        "inflight": "^1.0.4",
-                        "inherits": "2",
-                        "minimatch": "2 || 3",
-                        "once": "^1.3.0",
-                        "path-is-absolute": "^1.0.0"
-                    }
-                }
-            }
-        },
-        "fined": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
-            "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
-            "dev": true,
-            "requires": {
-                "expand-tilde": "^2.0.2",
-                "is-plain-object": "^2.0.3",
-                "object.defaults": "^1.1.0",
-                "object.pick": "^1.2.0",
-                "parse-filepath": "^1.0.1"
-            }
-        },
-        "flagged-respawn": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
-            "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
-            "dev": true
-        },
-        "flatpickr": {
-            "version": "2.6.3",
-            "resolved": "https://registry.npmjs.org/flatpickr/-/flatpickr-2.6.3.tgz",
-            "integrity": "sha1-RXNXUy3rE189pktCW/RDVzeWFWQ="
-        },
-        "for-in": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-            "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-            "dev": true
-        },
-        "for-own": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
-            "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
-            "dev": true,
-            "requires": {
-                "for-in": "^1.0.1"
-            }
-        },
-        "form-data": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
-            "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
-            "dev": true,
-            "requires": {
-                "asynckit": "^0.4.0",
-                "combined-stream": "^1.0.8",
-                "mime-types": "^2.1.12"
-            }
-        },
-        "fs.realpath": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-            "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-            "dev": true
-        },
-        "fsevents": {
-            "version": "2.3.2",
-            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-            "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-            "dev": true,
-            "optional": true
-        },
-        "function-bind": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-            "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-            "dev": true
-        },
-        "gensync": {
-            "version": "1.0.0-beta.2",
-            "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-            "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-            "dev": true
-        },
-        "get-caller-file": {
-            "version": "2.0.5",
-            "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-            "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-            "dev": true
-        },
-        "get-package-type": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-            "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
-            "dev": true
-        },
-        "get-stream": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-            "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-            "dev": true
-        },
-        "getobject": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/getobject/-/getobject-1.0.2.tgz",
-            "integrity": "sha512-2zblDBaFcb3rB4rF77XVnuINOE2h2k/OnqXAiy0IrTxUfV1iFp3la33oAQVY9pCpWU268WFYVt2t71hlMuLsOg==",
-            "dev": true
-        },
-        "glob": {
-            "version": "7.1.7",
-            "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
-            "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
-            "dev": true,
-            "requires": {
-                "fs.realpath": "^1.0.0",
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "^3.0.4",
-                "once": "^1.3.0",
-                "path-is-absolute": "^1.0.0"
-            }
-        },
-        "global-modules": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-            "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
-            "dev": true,
-            "requires": {
-                "global-prefix": "^1.0.1",
-                "is-windows": "^1.0.1",
-                "resolve-dir": "^1.0.0"
-            }
-        },
-        "global-prefix": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
-            "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
-            "dev": true,
-            "requires": {
-                "expand-tilde": "^2.0.2",
-                "homedir-polyfill": "^1.0.1",
-                "ini": "^1.3.4",
-                "is-windows": "^1.0.1",
-                "which": "^1.2.14"
-            },
-            "dependencies": {
-                "which": {
-                    "version": "1.3.1",
-                    "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-                    "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-                    "dev": true,
-                    "requires": {
-                        "isexe": "^2.0.0"
-                    }
-                }
-            }
-        },
-        "globals": {
-            "version": "11.12.0",
-            "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-            "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-            "dev": true
-        },
-        "graceful-fs": {
-            "version": "4.2.10",
-            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-            "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-            "dev": true
-        },
-        "grunt": {
-            "version": "1.5.3",
-            "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.5.3.tgz",
-            "integrity": "sha512-mKwmo4X2d8/4c/BmcOETHek675uOqw0RuA/zy12jaspWqvTp4+ZeQF1W+OTpcbncnaBsfbQJ6l0l4j+Sn/GmaQ==",
-            "dev": true,
-            "requires": {
-                "dateformat": "~3.0.3",
-                "eventemitter2": "~0.4.13",
-                "exit": "~0.1.2",
-                "findup-sync": "~0.3.0",
-                "glob": "~7.1.6",
-                "grunt-cli": "~1.4.3",
-                "grunt-known-options": "~2.0.0",
-                "grunt-legacy-log": "~3.0.0",
-                "grunt-legacy-util": "~2.0.1",
-                "iconv-lite": "~0.4.13",
-                "js-yaml": "~3.14.0",
-                "minimatch": "~3.0.4",
-                "mkdirp": "~1.0.4",
-                "nopt": "~3.0.6",
-                "rimraf": "~3.0.2"
-            }
-        },
-        "grunt-cli": {
-            "version": "1.4.3",
-            "resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.4.3.tgz",
-            "integrity": "sha512-9Dtx/AhVeB4LYzsViCjUQkd0Kw0McN2gYpdmGYKtE2a5Yt7v1Q+HYZVWhqXc/kGnxlMtqKDxSwotiGeFmkrCoQ==",
-            "dev": true,
-            "requires": {
-                "grunt-known-options": "~2.0.0",
-                "interpret": "~1.1.0",
-                "liftup": "~3.0.1",
-                "nopt": "~4.0.1",
-                "v8flags": "~3.2.0"
-            },
-            "dependencies": {
-                "nopt": {
-                    "version": "4.0.3",
-                    "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
-                    "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
-                    "dev": true,
-                    "requires": {
-                        "abbrev": "1",
-                        "osenv": "^0.1.4"
-                    }
-                }
-            }
-        },
-        "grunt-contrib-clean": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/grunt-contrib-clean/-/grunt-contrib-clean-2.0.1.tgz",
-            "integrity": "sha512-uRvnXfhiZt8akb/ZRDHJpQQtkkVkqc/opWO4Po/9ehC2hPxgptB9S6JHDC/Nxswo4CJSM0iFPT/Iym3cEMWzKA==",
-            "dev": true,
-            "requires": {
-                "async": "^3.2.3",
-                "rimraf": "^2.6.2"
-            },
-            "dependencies": {
-                "rimraf": {
-                    "version": "2.7.1",
-                    "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-                    "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-                    "dev": true,
-                    "requires": {
-                        "glob": "^7.1.3"
-                    }
-                }
-            }
-        },
-        "grunt-contrib-copy": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/grunt-contrib-copy/-/grunt-contrib-copy-1.0.0.tgz",
-            "integrity": "sha1-cGDGWB6QS4qw0A8HbgqPbj58NXM=",
-            "dev": true,
-            "requires": {
-                "chalk": "^1.1.1",
-                "file-sync-cmp": "^0.1.0"
-            }
-        },
-        "grunt-known-options": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-2.0.0.tgz",
-            "integrity": "sha512-GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA==",
-            "dev": true
-        },
-        "grunt-legacy-log": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-3.0.0.tgz",
-            "integrity": "sha512-GHZQzZmhyq0u3hr7aHW4qUH0xDzwp2YXldLPZTCjlOeGscAOWWPftZG3XioW8MasGp+OBRIu39LFx14SLjXRcA==",
-            "dev": true,
-            "requires": {
-                "colors": "~1.1.2",
-                "grunt-legacy-log-utils": "~2.1.0",
-                "hooker": "~0.2.3",
-                "lodash": "~4.17.19"
-            }
-        },
-        "grunt-legacy-log-utils": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-2.1.0.tgz",
-            "integrity": "sha512-lwquaPXJtKQk0rUM1IQAop5noEpwFqOXasVoedLeNzaibf/OPWjKYvvdqnEHNmU+0T0CaReAXIbGo747ZD+Aaw==",
-            "dev": true,
-            "requires": {
-                "chalk": "~4.1.0",
-                "lodash": "~4.17.19"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "grunt-legacy-util": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-2.0.1.tgz",
-            "integrity": "sha512-2bQiD4fzXqX8rhNdXkAywCadeqiPiay0oQny77wA2F3WF4grPJXCvAcyoWUJV+po/b15glGkxuSiQCK299UC2w==",
-            "dev": true,
-            "requires": {
-                "async": "~3.2.0",
-                "exit": "~0.1.2",
-                "getobject": "~1.0.0",
-                "hooker": "~0.2.3",
-                "lodash": "~4.17.21",
-                "underscore.string": "~3.3.5",
-                "which": "~2.0.2"
-            }
-        },
-        "has": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-            "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-            "dev": true,
-            "requires": {
-                "function-bind": "^1.1.1"
-            }
-        },
-        "has-ansi": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-            "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-            "dev": true,
-            "requires": {
-                "ansi-regex": "^2.0.0"
-            }
-        },
-        "has-flag": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-            "dev": true
-        },
-        "homedir-polyfill": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
-            "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
-            "dev": true,
-            "requires": {
-                "parse-passwd": "^1.0.0"
-            }
-        },
-        "hooker": {
-            "version": "0.2.3",
-            "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz",
-            "integrity": "sha1-uDT3I8xKJCqmWWNFnfbZhMXT2Vk=",
-            "dev": true
-        },
-        "html-encoding-sniffer": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
-            "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
-            "dev": true,
-            "requires": {
-                "whatwg-encoding": "^1.0.5"
-            }
-        },
-        "html-escaper": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-            "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-            "dev": true
-        },
-        "http-proxy-agent": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
-            "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
-            "dev": true,
-            "requires": {
-                "@tootallnate/once": "1",
-                "agent-base": "6",
-                "debug": "4"
-            }
-        },
-        "https-proxy-agent": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-            "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
-            "dev": true,
-            "requires": {
-                "agent-base": "6",
-                "debug": "4"
-            }
-        },
-        "human-signals": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-            "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-            "dev": true
-        },
-        "iconv-lite": {
-            "version": "0.4.24",
-            "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-            "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-            "dev": true,
-            "requires": {
-                "safer-buffer": ">= 2.1.2 < 3"
-            }
-        },
-        "import-local": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
-            "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
-            "dev": true,
-            "requires": {
-                "pkg-dir": "^4.2.0",
-                "resolve-cwd": "^3.0.0"
-            }
-        },
-        "imurmurhash": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-            "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-            "dev": true
-        },
-        "inflight": {
-            "version": "1.0.6",
-            "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-            "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-            "dev": true,
-            "requires": {
-                "once": "^1.3.0",
-                "wrappy": "1"
-            }
-        },
-        "inherits": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-            "dev": true
-        },
-        "ini": {
-            "version": "1.3.8",
-            "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-            "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-            "dev": true
-        },
-        "interpret": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
-            "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=",
-            "dev": true
-        },
-        "is-absolute": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
-            "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
-            "dev": true,
-            "requires": {
-                "is-relative": "^1.0.0",
-                "is-windows": "^1.0.1"
-            }
-        },
-        "is-arrayish": {
-            "version": "0.2.1",
-            "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-            "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-            "dev": true
-        },
-        "is-core-module": {
-            "version": "2.8.1",
-            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz",
-            "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==",
-            "dev": true,
-            "requires": {
-                "has": "^1.0.3"
-            }
-        },
-        "is-extglob": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-            "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-            "dev": true
-        },
-        "is-fullwidth-code-point": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-            "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-            "dev": true
-        },
-        "is-generator-fn": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
-            "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
-            "dev": true
-        },
-        "is-glob": {
-            "version": "4.0.3",
-            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-            "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-            "dev": true,
-            "requires": {
-                "is-extglob": "^2.1.1"
-            }
-        },
-        "is-number": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-            "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-            "dev": true
-        },
-        "is-plain-object": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-            "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-            "dev": true,
-            "requires": {
-                "isobject": "^3.0.1"
-            }
-        },
-        "is-potential-custom-element-name": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
-            "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
-            "dev": true
-        },
-        "is-relative": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-            "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
-            "dev": true,
-            "requires": {
-                "is-unc-path": "^1.0.0"
-            }
-        },
-        "is-stream": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-            "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-            "dev": true
-        },
-        "is-typedarray": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-            "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-            "dev": true
-        },
-        "is-unc-path": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-            "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
-            "dev": true,
-            "requires": {
-                "unc-path-regex": "^0.1.2"
-            }
-        },
-        "is-windows": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-            "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-            "dev": true
-        },
-        "isexe": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-            "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-            "dev": true
-        },
-        "isobject": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-            "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-            "dev": true
-        },
-        "istanbul-lib-coverage": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
-            "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
-            "dev": true
-        },
-        "istanbul-lib-instrument": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz",
-            "integrity": "sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==",
-            "dev": true,
-            "requires": {
-                "@babel/core": "^7.12.3",
-                "@babel/parser": "^7.14.7",
-                "@istanbuljs/schema": "^0.1.2",
-                "istanbul-lib-coverage": "^3.2.0",
-                "semver": "^6.3.0"
-            }
-        },
-        "istanbul-lib-report": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-            "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
-            "dev": true,
-            "requires": {
-                "istanbul-lib-coverage": "^3.0.0",
-                "make-dir": "^3.0.0",
-                "supports-color": "^7.1.0"
-            },
-            "dependencies": {
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "istanbul-lib-source-maps": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
-            "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
-            "dev": true,
-            "requires": {
-                "debug": "^4.1.1",
-                "istanbul-lib-coverage": "^3.0.0",
-                "source-map": "^0.6.1"
-            }
-        },
-        "istanbul-reports": {
-            "version": "3.1.4",
-            "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.4.tgz",
-            "integrity": "sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw==",
-            "dev": true,
-            "requires": {
-                "html-escaper": "^2.0.0",
-                "istanbul-lib-report": "^3.0.0"
-            }
-        },
-        "jest": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz",
-            "integrity": "sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==",
-            "dev": true,
-            "requires": {
-                "@jest/core": "^27.5.1",
-                "import-local": "^3.0.2",
-                "jest-cli": "^27.5.1"
-            }
-        },
-        "jest-changed-files": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.5.1.tgz",
-            "integrity": "sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==",
-            "dev": true,
-            "requires": {
-                "@jest/types": "^27.5.1",
-                "execa": "^5.0.0",
-                "throat": "^6.0.1"
-            }
-        },
-        "jest-circus": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.5.1.tgz",
-            "integrity": "sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==",
-            "dev": true,
-            "requires": {
-                "@jest/environment": "^27.5.1",
-                "@jest/test-result": "^27.5.1",
-                "@jest/types": "^27.5.1",
-                "@types/node": "*",
-                "chalk": "^4.0.0",
-                "co": "^4.6.0",
-                "dedent": "^0.7.0",
-                "expect": "^27.5.1",
-                "is-generator-fn": "^2.0.0",
-                "jest-each": "^27.5.1",
-                "jest-matcher-utils": "^27.5.1",
-                "jest-message-util": "^27.5.1",
-                "jest-runtime": "^27.5.1",
-                "jest-snapshot": "^27.5.1",
-                "jest-util": "^27.5.1",
-                "pretty-format": "^27.5.1",
-                "slash": "^3.0.0",
-                "stack-utils": "^2.0.3",
-                "throat": "^6.0.1"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "jest-cli": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.5.1.tgz",
-            "integrity": "sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==",
-            "dev": true,
-            "requires": {
-                "@jest/core": "^27.5.1",
-                "@jest/test-result": "^27.5.1",
-                "@jest/types": "^27.5.1",
-                "chalk": "^4.0.0",
-                "exit": "^0.1.2",
-                "graceful-fs": "^4.2.9",
-                "import-local": "^3.0.2",
-                "jest-config": "^27.5.1",
-                "jest-util": "^27.5.1",
-                "jest-validate": "^27.5.1",
-                "prompts": "^2.0.1",
-                "yargs": "^16.2.0"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "jest-config": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.5.1.tgz",
-            "integrity": "sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==",
-            "dev": true,
-            "requires": {
-                "@babel/core": "^7.8.0",
-                "@jest/test-sequencer": "^27.5.1",
-                "@jest/types": "^27.5.1",
-                "babel-jest": "^27.5.1",
-                "chalk": "^4.0.0",
-                "ci-info": "^3.2.0",
-                "deepmerge": "^4.2.2",
-                "glob": "^7.1.1",
-                "graceful-fs": "^4.2.9",
-                "jest-circus": "^27.5.1",
-                "jest-environment-jsdom": "^27.5.1",
-                "jest-environment-node": "^27.5.1",
-                "jest-get-type": "^27.5.1",
-                "jest-jasmine2": "^27.5.1",
-                "jest-regex-util": "^27.5.1",
-                "jest-resolve": "^27.5.1",
-                "jest-runner": "^27.5.1",
-                "jest-util": "^27.5.1",
-                "jest-validate": "^27.5.1",
-                "micromatch": "^4.0.4",
-                "parse-json": "^5.2.0",
-                "pretty-format": "^27.5.1",
-                "slash": "^3.0.0",
-                "strip-json-comments": "^3.1.1"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "jest-diff": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
-            "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
-            "dev": true,
-            "requires": {
-                "chalk": "^4.0.0",
-                "diff-sequences": "^27.5.1",
-                "jest-get-type": "^27.5.1",
-                "pretty-format": "^27.5.1"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "jest-docblock": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.5.1.tgz",
-            "integrity": "sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==",
-            "dev": true,
-            "requires": {
-                "detect-newline": "^3.0.0"
-            }
-        },
-        "jest-each": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.5.1.tgz",
-            "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
-            "dev": true,
-            "requires": {
-                "@jest/types": "^27.5.1",
-                "chalk": "^4.0.0",
-                "jest-get-type": "^27.5.1",
-                "jest-util": "^27.5.1",
-                "pretty-format": "^27.5.1"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "jest-environment-jsdom": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz",
-            "integrity": "sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw==",
-            "dev": true,
-            "requires": {
-                "@jest/environment": "^27.5.1",
-                "@jest/fake-timers": "^27.5.1",
-                "@jest/types": "^27.5.1",
-                "@types/node": "*",
-                "jest-mock": "^27.5.1",
-                "jest-util": "^27.5.1",
-                "jsdom": "^16.6.0"
-            }
-        },
-        "jest-environment-node": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.5.1.tgz",
-            "integrity": "sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==",
-            "dev": true,
-            "requires": {
-                "@jest/environment": "^27.5.1",
-                "@jest/fake-timers": "^27.5.1",
-                "@jest/types": "^27.5.1",
-                "@types/node": "*",
-                "jest-mock": "^27.5.1",
-                "jest-util": "^27.5.1"
-            }
-        },
-        "jest-get-type": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
-            "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
-            "dev": true
-        },
-        "jest-haste-map": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.5.1.tgz",
-            "integrity": "sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==",
-            "dev": true,
-            "requires": {
-                "@jest/types": "^27.5.1",
-                "@types/graceful-fs": "^4.1.2",
-                "@types/node": "*",
-                "anymatch": "^3.0.3",
-                "fb-watchman": "^2.0.0",
-                "fsevents": "^2.3.2",
-                "graceful-fs": "^4.2.9",
-                "jest-regex-util": "^27.5.1",
-                "jest-serializer": "^27.5.1",
-                "jest-util": "^27.5.1",
-                "jest-worker": "^27.5.1",
-                "micromatch": "^4.0.4",
-                "walker": "^1.0.7"
-            }
-        },
-        "jest-jasmine2": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz",
-            "integrity": "sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ==",
-            "dev": true,
-            "requires": {
-                "@jest/environment": "^27.5.1",
-                "@jest/source-map": "^27.5.1",
-                "@jest/test-result": "^27.5.1",
-                "@jest/types": "^27.5.1",
-                "@types/node": "*",
-                "chalk": "^4.0.0",
-                "co": "^4.6.0",
-                "expect": "^27.5.1",
-                "is-generator-fn": "^2.0.0",
-                "jest-each": "^27.5.1",
-                "jest-matcher-utils": "^27.5.1",
-                "jest-message-util": "^27.5.1",
-                "jest-runtime": "^27.5.1",
-                "jest-snapshot": "^27.5.1",
-                "jest-util": "^27.5.1",
-                "pretty-format": "^27.5.1",
-                "throat": "^6.0.1"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "jest-leak-detector": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz",
-            "integrity": "sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ==",
-            "dev": true,
-            "requires": {
-                "jest-get-type": "^27.5.1",
-                "pretty-format": "^27.5.1"
-            }
-        },
-        "jest-matcher-utils": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
-            "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
-            "dev": true,
-            "requires": {
-                "chalk": "^4.0.0",
-                "jest-diff": "^27.5.1",
-                "jest-get-type": "^27.5.1",
-                "pretty-format": "^27.5.1"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "jest-message-util": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-            "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-            "dev": true,
-            "requires": {
-                "@babel/code-frame": "^7.12.13",
-                "@jest/types": "^27.5.1",
-                "@types/stack-utils": "^2.0.0",
-                "chalk": "^4.0.0",
-                "graceful-fs": "^4.2.9",
-                "micromatch": "^4.0.4",
-                "pretty-format": "^27.5.1",
-                "slash": "^3.0.0",
-                "stack-utils": "^2.0.3"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "jest-mock": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz",
-            "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
-            "dev": true,
-            "requires": {
-                "@jest/types": "^27.5.1",
-                "@types/node": "*"
-            }
-        },
-        "jest-pnp-resolver": {
-            "version": "1.2.2",
-            "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
-            "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
-            "dev": true,
-            "requires": {}
-        },
-        "jest-regex-util": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.5.1.tgz",
-            "integrity": "sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==",
-            "dev": true
-        },
-        "jest-resolve": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.5.1.tgz",
-            "integrity": "sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==",
-            "dev": true,
-            "requires": {
-                "@jest/types": "^27.5.1",
-                "chalk": "^4.0.0",
-                "graceful-fs": "^4.2.9",
-                "jest-haste-map": "^27.5.1",
-                "jest-pnp-resolver": "^1.2.2",
-                "jest-util": "^27.5.1",
-                "jest-validate": "^27.5.1",
-                "resolve": "^1.20.0",
-                "resolve.exports": "^1.1.0",
-                "slash": "^3.0.0"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "jest-resolve-dependencies": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz",
-            "integrity": "sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==",
-            "dev": true,
-            "requires": {
-                "@jest/types": "^27.5.1",
-                "jest-regex-util": "^27.5.1",
-                "jest-snapshot": "^27.5.1"
-            }
-        },
-        "jest-runner": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.5.1.tgz",
-            "integrity": "sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==",
-            "dev": true,
-            "requires": {
-                "@jest/console": "^27.5.1",
-                "@jest/environment": "^27.5.1",
-                "@jest/test-result": "^27.5.1",
-                "@jest/transform": "^27.5.1",
-                "@jest/types": "^27.5.1",
-                "@types/node": "*",
-                "chalk": "^4.0.0",
-                "emittery": "^0.8.1",
-                "graceful-fs": "^4.2.9",
-                "jest-docblock": "^27.5.1",
-                "jest-environment-jsdom": "^27.5.1",
-                "jest-environment-node": "^27.5.1",
-                "jest-haste-map": "^27.5.1",
-                "jest-leak-detector": "^27.5.1",
-                "jest-message-util": "^27.5.1",
-                "jest-resolve": "^27.5.1",
-                "jest-runtime": "^27.5.1",
-                "jest-util": "^27.5.1",
-                "jest-worker": "^27.5.1",
-                "source-map-support": "^0.5.6",
-                "throat": "^6.0.1"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "jest-runtime": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.5.1.tgz",
-            "integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==",
-            "dev": true,
-            "requires": {
-                "@jest/environment": "^27.5.1",
-                "@jest/fake-timers": "^27.5.1",
-                "@jest/globals": "^27.5.1",
-                "@jest/source-map": "^27.5.1",
-                "@jest/test-result": "^27.5.1",
-                "@jest/transform": "^27.5.1",
-                "@jest/types": "^27.5.1",
-                "chalk": "^4.0.0",
-                "cjs-module-lexer": "^1.0.0",
-                "collect-v8-coverage": "^1.0.0",
-                "execa": "^5.0.0",
-                "glob": "^7.1.3",
-                "graceful-fs": "^4.2.9",
-                "jest-haste-map": "^27.5.1",
-                "jest-message-util": "^27.5.1",
-                "jest-mock": "^27.5.1",
-                "jest-regex-util": "^27.5.1",
-                "jest-resolve": "^27.5.1",
-                "jest-snapshot": "^27.5.1",
-                "jest-util": "^27.5.1",
-                "slash": "^3.0.0",
-                "strip-bom": "^4.0.0"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "jest-serializer": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.5.1.tgz",
-            "integrity": "sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==",
-            "dev": true,
-            "requires": {
-                "@types/node": "*",
-                "graceful-fs": "^4.2.9"
-            }
-        },
-        "jest-snapshot": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.5.1.tgz",
-            "integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==",
-            "dev": true,
-            "requires": {
-                "@babel/core": "^7.7.2",
-                "@babel/generator": "^7.7.2",
-                "@babel/plugin-syntax-typescript": "^7.7.2",
-                "@babel/traverse": "^7.7.2",
-                "@babel/types": "^7.0.0",
-                "@jest/transform": "^27.5.1",
-                "@jest/types": "^27.5.1",
-                "@types/babel__traverse": "^7.0.4",
-                "@types/prettier": "^2.1.5",
-                "babel-preset-current-node-syntax": "^1.0.0",
-                "chalk": "^4.0.0",
-                "expect": "^27.5.1",
-                "graceful-fs": "^4.2.9",
-                "jest-diff": "^27.5.1",
-                "jest-get-type": "^27.5.1",
-                "jest-haste-map": "^27.5.1",
-                "jest-matcher-utils": "^27.5.1",
-                "jest-message-util": "^27.5.1",
-                "jest-util": "^27.5.1",
-                "natural-compare": "^1.4.0",
-                "pretty-format": "^27.5.1",
-                "semver": "^7.3.2"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "semver": {
-                    "version": "7.3.7",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-                    "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-                    "dev": true,
-                    "requires": {
-                        "lru-cache": "^6.0.0"
-                    }
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "jest-util": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-            "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-            "dev": true,
-            "requires": {
-                "@jest/types": "^27.5.1",
-                "@types/node": "*",
-                "chalk": "^4.0.0",
-                "ci-info": "^3.2.0",
-                "graceful-fs": "^4.2.9",
-                "picomatch": "^2.2.3"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "jest-validate": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.5.1.tgz",
-            "integrity": "sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==",
-            "dev": true,
-            "requires": {
-                "@jest/types": "^27.5.1",
-                "camelcase": "^6.2.0",
-                "chalk": "^4.0.0",
-                "jest-get-type": "^27.5.1",
-                "leven": "^3.1.0",
-                "pretty-format": "^27.5.1"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "camelcase": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
-                    "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
-                    "dev": true
-                },
-                "chalk": {
-                    "version": "4.1.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "jest-watcher": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.5.1.tgz",
-            "integrity": "sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==",
-            "dev": true,
-            "requires": {
-                "@jest/test-result": "^27.5.1",
-                "@jest/types": "^27.5.1",
-                "@types/node": "*",
-                "ansi-escapes": "^4.2.1",
-                "chalk": "^4.0.0",
-                "jest-util": "^27.5.1",
-                "string-length": "^4.0.1"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "jest-worker": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
-            "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
-            "dev": true,
-            "requires": {
-                "@types/node": "*",
-                "merge-stream": "^2.0.0",
-                "supports-color": "^8.0.0"
-            },
-            "dependencies": {
-                "supports-color": {
-                    "version": "8.1.1",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-                    "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "jquery": {
-            "version": "3.5.1",
-            "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
-            "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
-        },
-        "jquery.event.move": {
-            "version": "git+ssh://git@github.com/stephband/jquery.event.move.git#e91477e2e6a880116f179e124dbb50a92ee4d667",
-            "from": "jquery.event.move@git+https://github.com/stephband/jquery.event.move.git",
-            "requires": {
-                "jquery": ">=1.7.0"
-            }
-        },
-        "jquery.event.swipe": {
-            "version": "0.5.4",
-            "resolved": "https://registry.npmjs.org/jquery.event.swipe/-/jquery.event.swipe-0.5.4.tgz",
-            "integrity": "sha1-Cda+W93NbUuJZQlOA1eCJQ/9LZg=",
-            "requires": {
-                "jquery": ">=1.7.0",
-                "jquery.event.move": "1.x"
-            },
-            "dependencies": {
-                "jquery.event.move": {
-                    "version": "1.3.6",
-                    "resolved": "https://registry.npmjs.org/jquery.event.move/-/jquery.event.move-1.3.6.tgz",
-                    "integrity": "sha1-rooDN28zKJWXG0YEQuFmiG0Hiew=",
-                    "requires": {
-                        "jquery": ">=1.7.0"
-                    }
-                }
-            }
-        },
-        "jquery.transit": {
-            "version": "0.9.12",
-            "resolved": "https://registry.npmjs.org/jquery.transit/-/jquery.transit-0.9.12.tgz",
-            "integrity": "sha1-W0h6N3QdmdSEadd6DWgAGWMmPDc=",
-            "requires": {}
-        },
-        "js-tokens": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-            "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-            "dev": true
-        },
-        "js-yaml": {
-            "version": "3.14.1",
-            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-            "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-            "dev": true,
-            "requires": {
-                "argparse": "^1.0.7",
-                "esprima": "^4.0.0"
-            }
-        },
-        "jsdom": {
-            "version": "16.7.0",
-            "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
-            "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
-            "dev": true,
-            "requires": {
-                "abab": "^2.0.5",
-                "acorn": "^8.2.4",
-                "acorn-globals": "^6.0.0",
-                "cssom": "^0.4.4",
-                "cssstyle": "^2.3.0",
-                "data-urls": "^2.0.0",
-                "decimal.js": "^10.2.1",
-                "domexception": "^2.0.1",
-                "escodegen": "^2.0.0",
-                "form-data": "^3.0.0",
-                "html-encoding-sniffer": "^2.0.1",
-                "http-proxy-agent": "^4.0.1",
-                "https-proxy-agent": "^5.0.0",
-                "is-potential-custom-element-name": "^1.0.1",
-                "nwsapi": "^2.2.0",
-                "parse5": "6.0.1",
-                "saxes": "^5.0.1",
-                "symbol-tree": "^3.2.4",
-                "tough-cookie": "^4.0.0",
-                "w3c-hr-time": "^1.0.2",
-                "w3c-xmlserializer": "^2.0.0",
-                "webidl-conversions": "^6.1.0",
-                "whatwg-encoding": "^1.0.5",
-                "whatwg-mimetype": "^2.3.0",
-                "whatwg-url": "^8.5.0",
-                "ws": "^7.4.6",
-                "xml-name-validator": "^3.0.0"
-            }
-        },
-        "jsesc": {
-            "version": "2.5.2",
-            "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-            "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-            "dev": true
-        },
-        "json-parse-even-better-errors": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-            "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-            "dev": true
-        },
-        "json5": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-            "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
-            "dev": true
-        },
-        "kind-of": {
-            "version": "6.0.3",
-            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-            "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-            "dev": true
-        },
-        "kleur": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-            "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
-            "dev": true
-        },
-        "leven": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-            "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-            "dev": true
-        },
-        "levn": {
-            "version": "0.3.0",
-            "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-            "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-            "dev": true,
-            "requires": {
-                "prelude-ls": "~1.1.2",
-                "type-check": "~0.3.2"
-            }
-        },
-        "liftup": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/liftup/-/liftup-3.0.1.tgz",
-            "integrity": "sha512-yRHaiQDizWSzoXk3APcA71eOI/UuhEkNN9DiW2Tt44mhYzX4joFoCZlxsSOF7RyeLlfqzFLQI1ngFq3ggMPhOw==",
-            "dev": true,
-            "requires": {
-                "extend": "^3.0.2",
-                "findup-sync": "^4.0.0",
-                "fined": "^1.2.0",
-                "flagged-respawn": "^1.0.1",
-                "is-plain-object": "^2.0.4",
-                "object.map": "^1.0.1",
-                "rechoir": "^0.7.0",
-                "resolve": "^1.19.0"
-            },
-            "dependencies": {
-                "findup-sync": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-4.0.0.tgz",
-                    "integrity": "sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ==",
-                    "dev": true,
-                    "requires": {
-                        "detect-file": "^1.0.0",
-                        "is-glob": "^4.0.0",
-                        "micromatch": "^4.0.2",
-                        "resolve-dir": "^1.0.1"
-                    }
-                }
-            }
-        },
-        "lines-and-columns": {
-            "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-            "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-            "dev": true
-        },
-        "locate-path": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-            "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-            "dev": true,
-            "requires": {
-                "p-locate": "^4.1.0"
-            }
-        },
-        "lodash": {
-            "version": "4.17.21",
-            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-            "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-            "dev": true
-        },
-        "lru-cache": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-            "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-            "dev": true,
-            "requires": {
-                "yallist": "^4.0.0"
-            }
-        },
-        "make-dir": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-            "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-            "dev": true,
-            "requires": {
-                "semver": "^6.0.0"
-            }
-        },
-        "make-iterator": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
-            "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
-            "dev": true,
-            "requires": {
-                "kind-of": "^6.0.2"
-            }
-        },
-        "makeerror": {
-            "version": "1.0.12",
-            "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
-            "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
-            "dev": true,
-            "requires": {
-                "tmpl": "1.0.5"
-            }
-        },
-        "map-cache": {
-            "version": "0.2.2",
-            "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-            "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
-            "dev": true
-        },
-        "merge-stream": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-            "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-            "dev": true
-        },
-        "micromatch": {
-            "version": "4.0.5",
-            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-            "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-            "dev": true,
-            "requires": {
-                "braces": "^3.0.2",
-                "picomatch": "^2.3.1"
-            }
-        },
-        "mime-db": {
-            "version": "1.52.0",
-            "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-            "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-            "dev": true
-        },
-        "mime-types": {
-            "version": "2.1.35",
-            "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-            "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-            "dev": true,
-            "requires": {
-                "mime-db": "1.52.0"
-            }
-        },
-        "mimic-fn": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-            "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-            "dev": true
-        },
-        "minimatch": {
-            "version": "3.0.8",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz",
-            "integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
-            "dev": true,
-            "requires": {
-                "brace-expansion": "^1.1.7"
-            }
-        },
-        "mkdirp": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-            "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-            "dev": true
-        },
-        "ms": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-            "dev": true
-        },
-        "natural-compare": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-            "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-            "dev": true
-        },
-        "node-int64": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-            "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
-            "dev": true
-        },
-        "node-releases": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.3.tgz",
-            "integrity": "sha512-maHFz6OLqYxz+VQyCAtA3PTX4UP/53pa05fyDNc9CwjvJ0yEh6+xBwKsgCxMNhS8taUKBFYxfuiaD9U/55iFaw==",
-            "dev": true
-        },
-        "nopt": {
-            "version": "3.0.6",
-            "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-            "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-            "dev": true,
-            "requires": {
-                "abbrev": "1"
-            }
-        },
-        "normalize-path": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-            "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-            "dev": true
-        },
-        "normalize.css.less": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/normalize.css.less/-/normalize.css.less-3.0.3.tgz",
-            "integrity": "sha1-4wnup5Ah0W5vPR0fXZiPqs5eCPI="
-        },
-        "npm-run-path": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-            "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-            "dev": true,
-            "requires": {
-                "path-key": "^3.0.0"
-            }
-        },
-        "nwsapi": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
-            "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
-            "dev": true
-        },
-        "object.defaults": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
-            "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
-            "dev": true,
-            "requires": {
-                "array-each": "^1.0.1",
-                "array-slice": "^1.0.0",
-                "for-own": "^1.0.0",
-                "isobject": "^3.0.0"
-            }
-        },
-        "object.map": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
-            "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
-            "dev": true,
-            "requires": {
-                "for-own": "^1.0.0",
-                "make-iterator": "^1.0.0"
-            }
-        },
-        "object.pick": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-            "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
-            "dev": true,
-            "requires": {
-                "isobject": "^3.0.1"
-            }
-        },
-        "once": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-            "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-            "dev": true,
-            "requires": {
-                "wrappy": "1"
-            }
-        },
-        "onetime": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-            "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-            "dev": true,
-            "requires": {
-                "mimic-fn": "^2.1.0"
-            }
-        },
-        "open-sans-fontface": {
-            "version": "git+ssh://git@github.com/FontFaceKit/open-sans.git#59493162b016dae6ef0d06693ccf3c93c1e96091",
-            "from": "open-sans-fontface@git+https://github.com/FontFaceKit/open-sans.git#gh-pages"
-        },
-        "optionator": {
-            "version": "0.8.3",
-            "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-            "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-            "dev": true,
-            "requires": {
-                "deep-is": "~0.1.3",
-                "fast-levenshtein": "~2.0.6",
-                "levn": "~0.3.0",
-                "prelude-ls": "~1.1.2",
-                "type-check": "~0.3.2",
-                "word-wrap": "~1.2.3"
-            }
-        },
-        "os-homedir": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-            "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-            "dev": true
-        },
-        "os-tmpdir": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-            "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-            "dev": true
-        },
-        "osenv": {
-            "version": "0.1.5",
-            "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-            "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-            "dev": true,
-            "requires": {
-                "os-homedir": "^1.0.0",
-                "os-tmpdir": "^1.0.0"
-            }
-        },
-        "p-limit": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-            "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-            "dev": true,
-            "requires": {
-                "p-try": "^2.0.0"
-            }
-        },
-        "p-locate": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-            "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-            "dev": true,
-            "requires": {
-                "p-limit": "^2.2.0"
-            }
-        },
-        "p-try": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-            "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-            "dev": true
-        },
-        "parse-filepath": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
-            "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
-            "dev": true,
-            "requires": {
-                "is-absolute": "^1.0.0",
-                "map-cache": "^0.2.0",
-                "path-root": "^0.1.1"
-            }
-        },
-        "parse-json": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-            "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-            "dev": true,
-            "requires": {
-                "@babel/code-frame": "^7.0.0",
-                "error-ex": "^1.3.1",
-                "json-parse-even-better-errors": "^2.3.0",
-                "lines-and-columns": "^1.1.6"
-            }
-        },
-        "parse-passwd": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-            "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
-            "dev": true
-        },
-        "parse5": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-            "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
-            "dev": true
-        },
-        "path-exists": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-            "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-            "dev": true
-        },
-        "path-is-absolute": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-            "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-            "dev": true
-        },
-        "path-key": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-            "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-            "dev": true
-        },
-        "path-parse": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-            "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-            "dev": true
-        },
-        "path-root": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
-            "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
-            "dev": true,
-            "requires": {
-                "path-root-regex": "^0.1.0"
-            }
-        },
-        "path-root-regex": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
-            "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
-            "dev": true
-        },
-        "picocolors": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-            "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-            "dev": true
-        },
-        "picomatch": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-            "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-            "dev": true
-        },
-        "picturefill": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/picturefill/-/picturefill-3.0.3.tgz",
-            "integrity": "sha512-JDdx+3i4fs2pkqwWZJgGEM2vFWsq+01YsQFT9CKPGuv2Q0xSdrQZoxi9XwyNARTgxiOdgoAwWQRluLRe/JQX2g=="
-        },
-        "pirates": {
-            "version": "4.0.5",
-            "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
-            "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==",
-            "dev": true
-        },
-        "pkg-dir": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-            "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-            "dev": true,
-            "requires": {
-                "find-up": "^4.0.0"
-            }
-        },
-        "pocketgrid-less": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/pocketgrid-less/-/pocketgrid-less-1.0.1.tgz",
-            "integrity": "sha1-xwfCy59BXzd4Zrhn472HdcK1/3k="
-        },
-        "prelude-ls": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-            "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-            "dev": true
-        },
-        "pretty-format": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
-            "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
-            "dev": true,
-            "requires": {
-                "ansi-regex": "^5.0.1",
-                "ansi-styles": "^5.0.0",
-                "react-is": "^17.0.1"
-            },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-                    "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-                    "dev": true
-                },
-                "ansi-styles": {
-                    "version": "5.2.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-                    "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-                    "dev": true
-                }
-            }
-        },
-        "prompts": {
-            "version": "2.4.2",
-            "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
-            "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
-            "dev": true,
-            "requires": {
-                "kleur": "^3.0.3",
-                "sisteransi": "^1.0.5"
-            }
-        },
-        "psl": {
-            "version": "1.8.0",
-            "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-            "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
-            "dev": true
-        },
-        "punycode": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-            "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-            "dev": true
-        },
-        "react-is": {
-            "version": "17.0.2",
-            "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-            "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
-            "dev": true
-        },
-        "rechoir": {
-            "version": "0.7.1",
-            "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz",
-            "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==",
-            "dev": true,
-            "requires": {
-                "resolve": "^1.9.0"
-            }
-        },
-        "require-directory": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-            "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-            "dev": true
-        },
-        "resolve": {
-            "version": "1.22.0",
-            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
-            "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
-            "dev": true,
-            "requires": {
-                "is-core-module": "^2.8.1",
-                "path-parse": "^1.0.7",
-                "supports-preserve-symlinks-flag": "^1.0.0"
-            }
-        },
-        "resolve-cwd": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-            "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-            "dev": true,
-            "requires": {
-                "resolve-from": "^5.0.0"
-            }
-        },
-        "resolve-dir": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
-            "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
-            "dev": true,
-            "requires": {
-                "expand-tilde": "^2.0.0",
-                "global-modules": "^1.0.0"
-            }
-        },
-        "resolve-from": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-            "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-            "dev": true
-        },
-        "resolve.exports": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz",
-            "integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==",
-            "dev": true
-        },
-        "rimraf": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-            "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-            "dev": true,
-            "requires": {
-                "glob": "^7.1.3"
-            }
-        },
-        "safe-buffer": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-            "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-            "dev": true
-        },
-        "safer-buffer": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-            "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-            "dev": true
-        },
-        "saxes": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
-            "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
-            "dev": true,
-            "requires": {
-                "xmlchars": "^2.2.0"
-            }
-        },
-        "semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-            "dev": true
-        },
-        "shebang-command": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-            "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-            "dev": true,
-            "requires": {
-                "shebang-regex": "^3.0.0"
-            }
-        },
-        "shebang-regex": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-            "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-            "dev": true
-        },
-        "signal-exit": {
-            "version": "3.0.7",
-            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-            "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-            "dev": true
-        },
-        "sisteransi": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-            "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
-            "dev": true
-        },
-        "slash": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-            "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-            "dev": true
-        },
-        "source-map": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-            "dev": true
-        },
-        "source-map-support": {
-            "version": "0.5.21",
-            "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-            "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-            "dev": true,
-            "requires": {
-                "buffer-from": "^1.0.0",
-                "source-map": "^0.6.0"
-            }
-        },
-        "sprintf-js": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-            "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-            "dev": true
-        },
-        "stack-utils": {
-            "version": "2.0.5",
-            "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz",
-            "integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==",
-            "dev": true,
-            "requires": {
-                "escape-string-regexp": "^2.0.0"
-            },
-            "dependencies": {
-                "escape-string-regexp": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-                    "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-                    "dev": true
-                }
-            }
-        },
-        "string-length": {
-            "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
-            "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
-            "dev": true,
-            "requires": {
-                "char-regex": "^1.0.2",
-                "strip-ansi": "^6.0.0"
-            },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-                    "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-                    "dev": true
-                },
-                "strip-ansi": {
-                    "version": "6.0.1",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-                    "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^5.0.1"
-                    }
-                }
-            }
-        },
-        "string-width": {
-            "version": "4.2.3",
-            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-            "dev": true,
-            "requires": {
-                "emoji-regex": "^8.0.0",
-                "is-fullwidth-code-point": "^3.0.0",
-                "strip-ansi": "^6.0.1"
-            },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-                    "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-                    "dev": true
-                },
-                "strip-ansi": {
-                    "version": "6.0.1",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-                    "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^5.0.1"
-                    }
-                }
-            }
-        },
-        "strip-ansi": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-            "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-            "dev": true,
-            "requires": {
-                "ansi-regex": "^2.0.0"
-            }
-        },
-        "strip-bom": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-            "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-            "dev": true
-        },
-        "strip-final-newline": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-            "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-            "dev": true
-        },
-        "strip-json-comments": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-            "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-            "dev": true
-        },
-        "supports-color": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-            "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-            "dev": true
-        },
-        "supports-hyperlinks": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
-            "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
-            "dev": true,
-            "requires": {
-                "has-flag": "^4.0.0",
-                "supports-color": "^7.0.0"
-            },
-            "dependencies": {
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "supports-preserve-symlinks-flag": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-            "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-            "dev": true
-        },
-        "symbol-tree": {
-            "version": "3.2.4",
-            "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-            "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
-            "dev": true
-        },
-        "terminal-link": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
-            "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
-            "dev": true,
-            "requires": {
-                "ansi-escapes": "^4.2.1",
-                "supports-hyperlinks": "^2.0.0"
-            }
-        },
-        "test-exclude": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-            "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-            "dev": true,
-            "requires": {
-                "@istanbuljs/schema": "^0.1.2",
-                "glob": "^7.1.4",
-                "minimatch": "^3.0.4"
-            }
-        },
-        "throat": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz",
-            "integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==",
-            "dev": true
-        },
-        "tmpl": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
-            "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
-            "dev": true
-        },
-        "to-fast-properties": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-            "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-            "dev": true
-        },
-        "to-regex-range": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-            "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-            "dev": true,
-            "requires": {
-                "is-number": "^7.0.0"
-            }
-        },
-        "tough-cookie": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
-            "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
-            "dev": true,
-            "requires": {
-                "psl": "^1.1.33",
-                "punycode": "^2.1.1",
-                "universalify": "^0.1.2"
-            }
-        },
-        "tr46": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
-            "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
-            "dev": true,
-            "requires": {
-                "punycode": "^2.1.1"
-            }
-        },
-        "type-check": {
-            "version": "0.3.2",
-            "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-            "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-            "dev": true,
-            "requires": {
-                "prelude-ls": "~1.1.2"
-            }
-        },
-        "type-detect": {
-            "version": "4.0.8",
-            "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-            "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-            "dev": true
-        },
-        "type-fest": {
-            "version": "0.21.3",
-            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-            "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-            "dev": true
-        },
-        "typedarray-to-buffer": {
-            "version": "3.1.5",
-            "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-            "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-            "dev": true,
-            "requires": {
-                "is-typedarray": "^1.0.0"
-            }
-        },
-        "unc-path-regex": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
-            "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
-            "dev": true
-        },
-        "underscore.string": {
-            "version": "3.3.6",
-            "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.6.tgz",
-            "integrity": "sha512-VoC83HWXmCrF6rgkyxS9GHv8W9Q5nhMKho+OadDJGzL2oDYbYEppBaCMH6pFlwLeqj2QS+hhkw2kpXkSdD1JxQ==",
-            "dev": true,
-            "requires": {
-                "sprintf-js": "^1.1.1",
-                "util-deprecate": "^1.0.2"
-            },
-            "dependencies": {
-                "sprintf-js": {
-                    "version": "1.1.2",
-                    "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
-                    "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
-                    "dev": true
-                }
-            }
-        },
-        "universalify": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-            "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-            "dev": true
-        },
-        "util-deprecate": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-            "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-            "dev": true
-        },
-        "v8-to-istanbul": {
-            "version": "8.1.1",
-            "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz",
-            "integrity": "sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==",
-            "dev": true,
-            "requires": {
-                "@types/istanbul-lib-coverage": "^2.0.1",
-                "convert-source-map": "^1.6.0",
-                "source-map": "^0.7.3"
-            },
-            "dependencies": {
-                "source-map": {
-                    "version": "0.7.3",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-                    "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-                    "dev": true
-                }
-            }
-        },
-        "v8flags": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
-            "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==",
-            "dev": true,
-            "requires": {
-                "homedir-polyfill": "^1.0.1"
-            }
-        },
-        "w3c-hr-time": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
-            "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
-            "dev": true,
-            "requires": {
-                "browser-process-hrtime": "^1.0.0"
-            }
-        },
-        "w3c-xmlserializer": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
-            "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
-            "dev": true,
-            "requires": {
-                "xml-name-validator": "^3.0.0"
-            }
-        },
-        "walker": {
-            "version": "1.0.8",
-            "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
-            "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
-            "dev": true,
-            "requires": {
-                "makeerror": "1.0.12"
-            }
-        },
-        "webidl-conversions": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
-            "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
-            "dev": true
-        },
-        "whatwg-encoding": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
-            "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
-            "dev": true,
-            "requires": {
-                "iconv-lite": "0.4.24"
-            }
-        },
-        "whatwg-mimetype": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
-            "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
-            "dev": true
-        },
-        "whatwg-url": {
-            "version": "8.7.0",
-            "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
-            "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
-            "dev": true,
-            "requires": {
-                "lodash": "^4.7.0",
-                "tr46": "^2.1.0",
-                "webidl-conversions": "^6.1.0"
-            }
-        },
-        "which": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-            "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-            "dev": true,
-            "requires": {
-                "isexe": "^2.0.0"
-            }
-        },
-        "word-wrap": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-            "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-            "dev": true
-        },
-        "wrap-ansi": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-            "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-            "dev": true,
-            "requires": {
-                "ansi-styles": "^4.0.0",
-                "string-width": "^4.1.0",
-                "strip-ansi": "^6.0.0"
-            },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-                    "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-                    "dev": true
-                },
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "strip-ansi": {
-                    "version": "6.0.1",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-                    "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^5.0.1"
-                    }
-                }
-            }
-        },
-        "wrappy": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-            "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-            "dev": true
-        },
-        "write-file-atomic": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-            "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-            "dev": true,
-            "requires": {
-                "imurmurhash": "^0.1.4",
-                "is-typedarray": "^1.0.0",
-                "signal-exit": "^3.0.2",
-                "typedarray-to-buffer": "^3.1.5"
-            }
-        },
-        "ws": {
-            "version": "7.5.7",
-            "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz",
-            "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==",
-            "dev": true,
-            "requires": {}
-        },
-        "xml-name-validator": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
-            "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
-            "dev": true
-        },
-        "xmlchars": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
-            "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
-            "dev": true
-        },
-        "y18n": {
-            "version": "5.0.8",
-            "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-            "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-            "dev": true
-        },
-        "yallist": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-            "dev": true
-        },
-        "yargs": {
-            "version": "16.2.0",
-            "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-            "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-            "dev": true,
-            "requires": {
-                "cliui": "^7.0.2",
-                "escalade": "^3.1.1",
-                "get-caller-file": "^2.0.5",
-                "require-directory": "^2.1.1",
-                "string-width": "^4.2.0",
-                "y18n": "^5.0.5",
-                "yargs-parser": "^20.2.2"
-            }
-        },
-        "yargs-parser": {
-            "version": "20.2.9",
-            "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-            "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-            "dev": true
         }
     }
 }
diff --git a/themes/Frontend/Responsive/package.json b/themes/Frontend/Responsive/package.json
index fdeb2d2db0d..11ce26deaa6 100644
--- a/themes/Frontend/Responsive/package.json
+++ b/themes/Frontend/Responsive/package.json
@@ -12,7 +12,7 @@
     },
     "repository": {
         "type": "git",
-        "url": "git+https://github.com/shopware/shopware.git"
+        "url": "git+https://github.com/shopware5/shopware.git"
     },
     "keywords": [
         "shopware",
@@ -26,10 +26,10 @@
     "bugs": {
         "url": "https://issues.shopware.com"
     },
-    "homepage": "https://github.com/shopware/shopware#readme",
+    "homepage": "https://github.com/shopware5/shopware#readme",
     "dependencies": {
         "flatpickr": "2.6.3",
-        "jquery": "3.5.1",
+        "jquery": "3.7.1",
         "jquery.event.move": "git+https://github.com/stephband/jquery.event.move.git",
         "jquery.event.swipe": "0.5.4",
         "jquery.transit": "0.9.12",
@@ -39,9 +39,11 @@
         "pocketgrid-less": "1.0.1"
     },
     "devDependencies": {
-        "grunt": "^1.4.0",
+        "grunt": "^1.6.1",
         "grunt-contrib-clean": "^2.0.1",
         "grunt-contrib-copy": "1.0.0",
-        "jest": "^27.5.1"
+        "grunt-modernizr": "^4.0.1",
+        "jest": "^29.7.0",
+        "jest-environment-jsdom": "^30.3.0"
     }
 }
diff --git a/themes/package-lock.json b/themes/package-lock.json
index 2d1cf051710..199c65eb8fa 100644
--- a/themes/package-lock.json
+++ b/themes/package-lock.json
@@ -1,10 +1,9 @@
 {
     "name": "themes",
-    "lockfileVersion": 2,
+    "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
-            "name": "themes",
             "devDependencies": {
                 "eslint": "^7.0.0",
                 "eslint-config-standard": "^16.0.3",
@@ -31,28 +30,32 @@
             "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
             "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "@babel/highlight": "^7.10.4"
             }
         },
         "node_modules/@babel/helper-validator-identifier": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-            "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
+            "version": "7.24.7",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
+            "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/highlight": {
-            "version": "7.17.9",
-            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
-            "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
+            "version": "7.24.7",
+            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
+            "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@babel/helper-validator-identifier": "^7.16.7",
-                "chalk": "^2.0.0",
-                "js-tokens": "^4.0.0"
+                "@babel/helper-validator-identifier": "^7.24.7",
+                "chalk": "^2.4.2",
+                "js-tokens": "^4.0.0",
+                "picocolors": "^1.0.0"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -63,6 +66,7 @@
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
             "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-convert": "^1.9.0"
             },
@@ -75,6 +79,7 @@
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
             "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^3.2.1",
                 "escape-string-regexp": "^1.0.5",
@@ -89,6 +94,7 @@
             "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
             "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-name": "1.1.3"
             }
@@ -96,14 +102,16 @@
         "node_modules/@babel/highlight/node_modules/color-name": {
             "version": "1.1.3",
             "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-            "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-            "dev": true
+            "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-            "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+            "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.8.0"
             }
@@ -111,8 +119,9 @@
         "node_modules/@babel/highlight/node_modules/has-flag": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-            "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+            "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=4"
             }
@@ -122,6 +131,7 @@
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
             "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-flag": "^3.0.0"
             },
@@ -129,11 +139,41 @@
                 "node": ">=4"
             }
         },
+        "node_modules/@eslint-community/eslint-utils": {
+            "version": "4.4.0",
+            "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+            "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "eslint-visitor-keys": "^3.3.0"
+            },
+            "engines": {
+                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+            },
+            "peerDependencies": {
+                "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+            }
+        },
+        "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": {
+            "version": "3.4.3",
+            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+            "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
         "node_modules/@eslint/eslintrc": {
             "version": "0.4.3",
             "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
             "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ajv": "^6.12.4",
                 "debug": "^4.1.1",
@@ -153,7 +193,9 @@
             "version": "0.5.0",
             "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
             "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
+            "deprecated": "Use @eslint/config-array instead",
             "dev": true,
+            "license": "Apache-2.0",
             "dependencies": {
                 "@humanwhocodes/object-schema": "^1.2.0",
                 "debug": "^4.1.1",
@@ -167,13 +209,16 @@
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
             "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
-            "dev": true
+            "deprecated": "Use @eslint/object-schema instead",
+            "dev": true,
+            "license": "BSD-3-Clause"
         },
         "node_modules/@nodelib/fs.scandir": {
             "version": "2.1.5",
             "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
             "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "@nodelib/fs.stat": "2.0.5",
                 "run-parallel": "^1.1.9"
@@ -187,6 +232,7 @@
             "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
             "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">= 8"
             }
@@ -196,6 +242,7 @@
             "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
             "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "@nodelib/fs.scandir": "2.1.5",
                 "fastq": "^1.6.0"
@@ -205,31 +252,42 @@
             }
         },
         "node_modules/@types/json-schema": {
-            "version": "7.0.11",
-            "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
-            "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
-            "dev": true
+            "version": "7.0.15",
+            "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+            "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/@types/json5": {
             "version": "0.0.29",
             "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-            "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
-            "dev": true
+            "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/@types/minimatch": {
             "version": "3.0.5",
             "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
             "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@types/semver": {
+            "version": "7.5.8",
+            "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz",
+            "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/@typescript-eslint/scope-manager": {
-            "version": "5.20.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.20.0.tgz",
-            "integrity": "sha512-h9KtuPZ4D/JuX7rpp1iKg3zOH0WNEa+ZIXwpW/KWmEFDxlA/HSfCMhiyF1HS/drTICjIbpA6OqkAhrP/zkCStg==",
+            "version": "5.62.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
+            "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "5.20.0",
-                "@typescript-eslint/visitor-keys": "5.20.0"
+                "@typescript-eslint/types": "5.62.0",
+                "@typescript-eslint/visitor-keys": "5.62.0"
             },
             "engines": {
                 "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -240,10 +298,11 @@
             }
         },
         "node_modules/@typescript-eslint/types": {
-            "version": "5.20.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.20.0.tgz",
-            "integrity": "sha512-+d8wprF9GyvPwtoB4CxBAR/s0rpP25XKgnOvMf/gMXYDvlUC3rPFHupdTQ/ow9vn7UDe5rX02ovGYQbv/IUCbg==",
+            "version": "5.62.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
+            "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
             },
@@ -253,17 +312,18 @@
             }
         },
         "node_modules/@typescript-eslint/typescript-estree": {
-            "version": "5.20.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.20.0.tgz",
-            "integrity": "sha512-36xLjP/+bXusLMrT9fMMYy1KJAGgHhlER2TqpUVDYUQg4w0q/NW/sg4UGAgVwAqb8V4zYg43KMUpM8vV2lve6w==",
+            "version": "5.62.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
+            "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
             "dev": true,
+            "license": "BSD-2-Clause",
             "dependencies": {
-                "@typescript-eslint/types": "5.20.0",
-                "@typescript-eslint/visitor-keys": "5.20.0",
-                "debug": "^4.3.2",
-                "globby": "^11.0.4",
+                "@typescript-eslint/types": "5.62.0",
+                "@typescript-eslint/visitor-keys": "5.62.0",
+                "debug": "^4.3.4",
+                "globby": "^11.1.0",
                 "is-glob": "^4.0.3",
-                "semver": "^7.3.5",
+                "semver": "^7.3.7",
                 "tsutils": "^3.21.0"
             },
             "engines": {
@@ -280,17 +340,20 @@
             }
         },
         "node_modules/@typescript-eslint/utils": {
-            "version": "5.20.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.20.0.tgz",
-            "integrity": "sha512-lHONGJL1LIO12Ujyx8L8xKbwWSkoUKFSO+0wDAqGXiudWB2EO7WEUT+YZLtVbmOmSllAjLb9tpoIPwpRe5Tn6w==",
+            "version": "5.62.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
+            "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
+                "@eslint-community/eslint-utils": "^4.2.0",
                 "@types/json-schema": "^7.0.9",
-                "@typescript-eslint/scope-manager": "5.20.0",
-                "@typescript-eslint/types": "5.20.0",
-                "@typescript-eslint/typescript-estree": "5.20.0",
+                "@types/semver": "^7.3.12",
+                "@typescript-eslint/scope-manager": "5.62.0",
+                "@typescript-eslint/types": "5.62.0",
+                "@typescript-eslint/typescript-estree": "5.62.0",
                 "eslint-scope": "^5.1.1",
-                "eslint-utils": "^3.0.0"
+                "semver": "^7.3.7"
             },
             "engines": {
                 "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -303,32 +366,15 @@
                 "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
             }
         },
-        "node_modules/@typescript-eslint/utils/node_modules/eslint-utils": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-            "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-            "dev": true,
-            "dependencies": {
-                "eslint-visitor-keys": "^2.0.0"
-            },
-            "engines": {
-                "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/mysticatea"
-            },
-            "peerDependencies": {
-                "eslint": ">=5"
-            }
-        },
         "node_modules/@typescript-eslint/visitor-keys": {
-            "version": "5.20.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.20.0.tgz",
-            "integrity": "sha512-1flRpNF+0CAQkMNlTJ6L/Z5jiODG/e5+7mk6XwtPOUS3UrTz3UOiAg9jG2VtKsWI6rZQfy4C6a232QNRZTRGlg==",
+            "version": "5.62.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
+            "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "5.20.0",
-                "eslint-visitor-keys": "^3.0.0"
+                "@typescript-eslint/types": "5.62.0",
+                "eslint-visitor-keys": "^3.3.0"
             },
             "engines": {
                 "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -339,25 +385,31 @@
             }
         },
         "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
-            "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-            "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+            "version": "3.4.3",
+            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+            "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
             "dev": true,
+            "license": "Apache-2.0",
             "engines": {
                 "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
             }
         },
         "node_modules/abbrev": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
             "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-            "dev": true
+            "dev": true,
+            "license": "ISC"
         },
         "node_modules/acorn": {
             "version": "7.4.1",
             "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
             "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
             "dev": true,
+            "license": "MIT",
             "bin": {
                 "acorn": "bin/acorn"
             },
@@ -370,6 +422,7 @@
             "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
             "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
             "dev": true,
+            "license": "MIT",
             "peerDependencies": {
                 "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
             }
@@ -379,6 +432,7 @@
             "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
             "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "fast-deep-equal": "^3.1.1",
                 "fast-json-stable-stringify": "^2.0.0",
@@ -391,10 +445,11 @@
             }
         },
         "node_modules/ansi-colors": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-            "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+            "version": "4.1.3",
+            "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
+            "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=6"
             }
@@ -404,6 +459,7 @@
             "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
             "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=4"
             }
@@ -413,6 +469,7 @@
             "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
             "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
@@ -422,6 +479,7 @@
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
             "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-convert": "^2.0.1"
             },
@@ -433,10 +491,11 @@
             }
         },
         "node_modules/anymatch": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-            "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+            "version": "3.1.3",
+            "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+            "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "normalize-path": "^3.0.0",
                 "picomatch": "^2.0.4"
@@ -450,15 +509,34 @@
             "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
             "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "sprintf-js": "~1.0.2"
             }
         },
+        "node_modules/array-buffer-byte-length": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
+            "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.5",
+                "is-array-buffer": "^3.0.4"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/array-differ": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz",
             "integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
@@ -466,22 +544,25 @@
         "node_modules/array-each": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
-            "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
+            "integrity": "sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
         },
         "node_modules/array-includes": {
-            "version": "3.1.4",
-            "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.4.tgz",
-            "integrity": "sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==",
+            "version": "3.1.8",
+            "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz",
+            "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "call-bind": "^1.0.2",
-                "define-properties": "^1.1.3",
-                "es-abstract": "^1.19.1",
-                "get-intrinsic": "^1.1.1",
+                "call-bind": "^1.0.7",
+                "define-properties": "^1.2.1",
+                "es-abstract": "^1.23.2",
+                "es-object-atoms": "^1.0.0",
+                "get-intrinsic": "^1.2.4",
                 "is-string": "^1.0.7"
             },
             "engines": {
@@ -496,6 +577,7 @@
             "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
             "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -505,19 +587,61 @@
             "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
             "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
         },
+        "node_modules/array.prototype.findlastindex": {
+            "version": "1.2.5",
+            "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz",
+            "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.7",
+                "define-properties": "^1.2.1",
+                "es-abstract": "^1.23.2",
+                "es-errors": "^1.3.0",
+                "es-object-atoms": "^1.0.0",
+                "es-shim-unscopables": "^1.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/array.prototype.flat": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
-            "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
+            "version": "1.3.2",
+            "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
+            "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.2",
+                "define-properties": "^1.2.0",
+                "es-abstract": "^1.22.1",
+                "es-shim-unscopables": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/array.prototype.flatmap": {
+            "version": "1.3.2",
+            "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
+            "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "call-bind": "^1.0.2",
-                "define-properties": "^1.1.3",
-                "es-abstract": "^1.19.2",
+                "define-properties": "^1.2.0",
+                "es-abstract": "^1.22.1",
                 "es-shim-unscopables": "^1.0.0"
             },
             "engines": {
@@ -527,11 +651,35 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
+        "node_modules/arraybuffer.prototype.slice": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
+            "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "array-buffer-byte-length": "^1.0.1",
+                "call-bind": "^1.0.5",
+                "define-properties": "^1.2.1",
+                "es-abstract": "^1.22.3",
+                "es-errors": "^1.2.1",
+                "get-intrinsic": "^1.2.3",
+                "is-array-buffer": "^3.0.4",
+                "is-shared-array-buffer": "^1.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/arrify": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
             "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
@@ -541,35 +689,58 @@
             "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
             "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
         },
         "node_modules/async": {
-            "version": "3.2.3",
-            "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
-            "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==",
-            "dev": true
+            "version": "3.2.5",
+            "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz",
+            "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/available-typed-arrays": {
+            "version": "1.0.7",
+            "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
+            "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "possible-typed-array-names": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
         },
         "node_modules/balanced-match": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
             "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/binary-extensions": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-            "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+            "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
             }
         },
         "node_modules/body": {
             "version": "5.1.0",
             "resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
-            "integrity": "sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=",
+            "integrity": "sha512-chUsBxGRtuElD6fmw1gHLpvnKdVLK302peeFa9ZqAEk8TyzZ3fygLyUEDDPTJvL9+Bor0dIwn6ePOsRM2y0zQQ==",
             "dev": true,
             "dependencies": {
                 "continuable-cache": "^0.3.1",
@@ -583,18 +754,20 @@
             "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
             "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
             }
         },
         "node_modules/braces": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-            "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+            "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "fill-range": "^7.0.1"
+                "fill-range": "^7.1.1"
             },
             "engines": {
                 "node": ">=8"
@@ -603,17 +776,55 @@
         "node_modules/bytes": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz",
-            "integrity": "sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=",
+            "integrity": "sha512-/x68VkHLeTl3/Ll8IvxdwzhrT+IyKc52e/oyHhA2RwqPqswSnjVbSddfPRwAsJtbilMAPSRWwAlpxdYsSWOTKQ==",
             "dev": true
         },
         "node_modules/call-bind": {
+            "version": "1.0.7",
+            "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+            "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "es-define-property": "^1.0.0",
+                "es-errors": "^1.3.0",
+                "function-bind": "^1.1.2",
+                "get-intrinsic": "^1.2.4",
+                "set-function-length": "^1.2.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/call-bind-apply-helpers": {
             "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-            "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+            "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+            "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "es-errors": "^1.3.0",
+                "function-bind": "^1.1.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/call-bound": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
+            "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "function-bind": "^1.1.1",
-                "get-intrinsic": "^1.0.2"
+                "call-bind-apply-helpers": "^1.0.2",
+                "get-intrinsic": "^1.3.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
             },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
@@ -624,6 +835,7 @@
             "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
             "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=6"
             }
@@ -633,6 +845,7 @@
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
             "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^4.1.0",
                 "supports-color": "^7.1.0"
@@ -648,19 +861,15 @@
             "version": "0.7.0",
             "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
             "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/chokidar": {
-            "version": "3.5.3",
-            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-            "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+            "version": "3.6.0",
+            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+            "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
             "dev": true,
-            "funding": [
-                {
-                    "type": "individual",
-                    "url": "https://paulmillr.com/funding/"
-                }
-            ],
+            "license": "MIT",
             "dependencies": {
                 "anymatch": "~3.1.2",
                 "braces": "~3.0.2",
@@ -673,6 +882,9 @@
             "engines": {
                 "node": ">= 8.10.0"
             },
+            "funding": {
+                "url": "https://paulmillr.com/funding/"
+            },
             "optionalDependencies": {
                 "fsevents": "~2.3.2"
             }
@@ -680,8 +892,9 @@
         "node_modules/cli-cursor": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-            "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+            "integrity": "sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "restore-cursor": "^2.0.0"
             },
@@ -693,13 +906,15 @@
             "version": "2.2.1",
             "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
             "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==",
-            "dev": true
+            "dev": true,
+            "license": "ISC"
         },
         "node_modules/coffeescript": {
             "version": "1.12.7",
             "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-1.12.7.tgz",
             "integrity": "sha512-pLXHFxQMPklVoEekowk8b3erNynC+DVJzChxS/LCBBgR6/8AJkHivkm//zbowcfc7BTCAjryuhx6gPqPRfsFoA==",
             "dev": true,
+            "license": "MIT",
             "bin": {
                 "cake": "bin/cake",
                 "coffee": "bin/coffee"
@@ -713,6 +928,7 @@
             "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
             "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-name": "~1.1.4"
             },
@@ -724,13 +940,15 @@
             "version": "1.1.4",
             "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
             "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/colors": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-            "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
+            "integrity": "sha512-ENwblkFQpqqia6b++zLD/KUWafYlVY/UNnAp7oz7LY7E924wmpye416wBOmvv/HMWzl8gL1kJlfvId/1Dg176w==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.1.90"
             }
@@ -738,13 +956,14 @@
         "node_modules/concat-map": {
             "version": "0.0.1",
             "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-            "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-            "dev": true
+            "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/continuable-cache": {
             "version": "0.3.1",
             "resolved": "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz",
-            "integrity": "sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=",
+            "integrity": "sha512-TF30kpKhTH8AGCG3dut0rdd/19B7Z+qCnrMoBLpyQu/2drZdNrrpcjPEoJeSVsQM+8KmWG5O56oPDjSSUsuTyA==",
             "dev": true
         },
         "node_modules/copy-anything": {
@@ -752,6 +971,7 @@
             "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz",
             "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "is-what": "^3.14.1"
             },
@@ -764,6 +984,7 @@
             "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
             "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "path-key": "^3.1.0",
                 "shebang-command": "^2.0.0",
@@ -778,6 +999,7 @@
             "resolved": "https://registry.npmjs.org/cson/-/cson-7.20.0.tgz",
             "integrity": "sha512-K7g/86vC77mJqi6PRFhd3p8U/y0R6SsCeTJb5RpOAaQdApHxCoK5JwfZ8WeJjpOZ6lyyi8tNvh3UuC184H3GWg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "cson-parser": "^4.0.5",
                 "extract-opts": "^4.3.0",
@@ -800,6 +1022,7 @@
             "resolved": "https://registry.npmjs.org/cson-parser/-/cson-parser-4.0.9.tgz",
             "integrity": "sha512-I79SAcCYquWnEfXYj8hBqOOWKj6eH6zX1hhX3yqmS4K3bYp7jME3UFpHPzu3rUew0oyfc0s8T6IlWGXRAheHag==",
             "dev": true,
+            "license": "BSD-3-Clause",
             "dependencies": {
                 "coffeescript": "1.12.7"
             },
@@ -807,20 +1030,76 @@
                 "node": ">=10.13"
             }
         },
+        "node_modules/data-view-buffer": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz",
+            "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.6",
+                "es-errors": "^1.3.0",
+                "is-data-view": "^1.0.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/data-view-byte-length": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz",
+            "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.7",
+                "es-errors": "^1.3.0",
+                "is-data-view": "^1.0.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/data-view-byte-offset": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz",
+            "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.6",
+                "es-errors": "^1.3.0",
+                "is-data-view": "^1.0.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/dateformat": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
-            "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
+            "version": "4.6.3",
+            "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-4.6.3.tgz",
+            "integrity": "sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": "*"
             }
         },
         "node_modules/debug": {
-            "version": "4.3.4",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-            "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+            "version": "4.3.5",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
+            "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ms": "2.1.2"
             },
@@ -837,14 +1116,35 @@
             "version": "0.1.4",
             "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
             "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
-        "node_modules/define-properties": {
+        "node_modules/define-data-property": {
             "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-            "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+            "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+            "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
+                "es-define-property": "^1.0.0",
+                "es-errors": "^1.3.0",
+                "gopd": "^1.0.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/define-properties": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+            "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "define-data-property": "^1.0.1",
                 "has-property-descriptors": "^1.0.0",
                 "object-keys": "^1.1.1"
             },
@@ -858,8 +1158,9 @@
         "node_modules/detect-file": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
-            "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
+            "integrity": "sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -869,6 +1170,7 @@
             "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
             "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "path-type": "^4.0.0"
             },
@@ -881,6 +1183,7 @@
             "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
             "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
             "dev": true,
+            "license": "Apache-2.0",
             "dependencies": {
                 "esutils": "^2.0.2"
             },
@@ -888,17 +1191,34 @@
                 "node": ">=6.0.0"
             }
         },
+        "node_modules/dunder-proto": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+            "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bind-apply-helpers": "^1.0.1",
+                "es-errors": "^1.3.0",
+                "gopd": "^1.2.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
         "node_modules/duplexer": {
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
             "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/eachr": {
             "version": "4.5.0",
             "resolved": "https://registry.npmjs.org/eachr/-/eachr-4.5.0.tgz",
             "integrity": "sha512-9I664RWp6p8jvcHZIwo7bWaiSaUmA1wNSLKwNZEiaYjqiTARq3cGjyRiIunsopZv4QMmX3T5Hs17QoPAzdYxfg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "typechecker": "^6.2.0"
             },
@@ -913,15 +1233,18 @@
             "version": "8.0.0",
             "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
             "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/enquirer": {
-            "version": "2.3.6",
-            "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-            "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+            "version": "2.4.1",
+            "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz",
+            "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "ansi-colors": "^4.1.1"
+                "ansi-colors": "^4.1.1",
+                "strip-ansi": "^6.0.1"
             },
             "engines": {
                 "node": ">=8.6"
@@ -932,6 +1255,7 @@
             "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
             "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
             "dev": true,
+            "license": "MIT",
             "optional": true,
             "dependencies": {
                 "prr": "~1.0.1"
@@ -950,31 +1274,58 @@
             }
         },
         "node_modules/es-abstract": {
-            "version": "1.19.5",
-            "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.5.tgz",
-            "integrity": "sha512-Aa2G2+Rd3b6kxEUKTF4TaW67czBLyAv3z7VOhYRU50YBx+bbsYZ9xQP4lMNazePuFlybXI0V4MruPos7qUo5fA==",
+            "version": "1.23.3",
+            "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz",
+            "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "call-bind": "^1.0.2",
+                "array-buffer-byte-length": "^1.0.1",
+                "arraybuffer.prototype.slice": "^1.0.3",
+                "available-typed-arrays": "^1.0.7",
+                "call-bind": "^1.0.7",
+                "data-view-buffer": "^1.0.1",
+                "data-view-byte-length": "^1.0.1",
+                "data-view-byte-offset": "^1.0.0",
+                "es-define-property": "^1.0.0",
+                "es-errors": "^1.3.0",
+                "es-object-atoms": "^1.0.0",
+                "es-set-tostringtag": "^2.0.3",
                 "es-to-primitive": "^1.2.1",
-                "function-bind": "^1.1.1",
-                "get-intrinsic": "^1.1.1",
-                "get-symbol-description": "^1.0.0",
-                "has": "^1.0.3",
+                "function.prototype.name": "^1.1.6",
+                "get-intrinsic": "^1.2.4",
+                "get-symbol-description": "^1.0.2",
+                "globalthis": "^1.0.3",
+                "gopd": "^1.0.1",
+                "has-property-descriptors": "^1.0.2",
+                "has-proto": "^1.0.3",
                 "has-symbols": "^1.0.3",
-                "internal-slot": "^1.0.3",
-                "is-callable": "^1.2.4",
-                "is-negative-zero": "^2.0.2",
+                "hasown": "^2.0.2",
+                "internal-slot": "^1.0.7",
+                "is-array-buffer": "^3.0.4",
+                "is-callable": "^1.2.7",
+                "is-data-view": "^1.0.1",
+                "is-negative-zero": "^2.0.3",
                 "is-regex": "^1.1.4",
-                "is-shared-array-buffer": "^1.0.2",
+                "is-shared-array-buffer": "^1.0.3",
                 "is-string": "^1.0.7",
+                "is-typed-array": "^1.1.13",
                 "is-weakref": "^1.0.2",
-                "object-inspect": "^1.12.0",
+                "object-inspect": "^1.13.1",
                 "object-keys": "^1.1.1",
-                "object.assign": "^4.1.2",
-                "string.prototype.trimend": "^1.0.4",
-                "string.prototype.trimstart": "^1.0.4",
-                "unbox-primitive": "^1.0.1"
+                "object.assign": "^4.1.5",
+                "regexp.prototype.flags": "^1.5.2",
+                "safe-array-concat": "^1.1.2",
+                "safe-regex-test": "^1.0.3",
+                "string.prototype.trim": "^1.2.9",
+                "string.prototype.trimend": "^1.0.8",
+                "string.prototype.trimstart": "^1.0.8",
+                "typed-array-buffer": "^1.0.2",
+                "typed-array-byte-length": "^1.0.1",
+                "typed-array-byte-offset": "^1.0.2",
+                "typed-array-length": "^1.0.6",
+                "unbox-primitive": "^1.0.2",
+                "which-typed-array": "^1.1.15"
             },
             "engines": {
                 "node": ">= 0.4"
@@ -983,13 +1334,62 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
+        "node_modules/es-define-property": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+            "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/es-errors": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+            "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/es-object-atoms": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+            "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "es-errors": "^1.3.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/es-set-tostringtag": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz",
+            "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "get-intrinsic": "^1.2.4",
+                "has-tostringtag": "^1.0.2",
+                "hasown": "^2.0.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
         "node_modules/es-shim-unscopables": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-            "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
+            "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "has": "^1.0.3"
+                "hasown": "^2.0.0"
             }
         },
         "node_modules/es-to-primitive": {
@@ -997,6 +1397,7 @@
             "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
             "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "is-callable": "^1.1.4",
                 "is-date-object": "^1.0.1",
@@ -1014,6 +1415,7 @@
             "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
             "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=10"
             },
@@ -1026,6 +1428,7 @@
             "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
             "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "@babel/code-frame": "7.12.11",
                 "@eslint/eslintrc": "^0.4.3",
@@ -1097,6 +1500,7 @@
                     "url": "https://feross.org/support"
                 }
             ],
+            "license": "MIT",
             "peerDependencies": {
                 "eslint": "^7.12.1",
                 "eslint-plugin-import": "^2.22.1",
@@ -1105,13 +1509,15 @@
             }
         },
         "node_modules/eslint-import-resolver-node": {
-            "version": "0.3.6",
-            "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
-            "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
+            "version": "0.3.9",
+            "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
+            "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "debug": "^3.2.7",
-                "resolve": "^1.20.0"
+                "is-core-module": "^2.13.0",
+                "resolve": "^1.22.4"
             }
         },
         "node_modules/eslint-import-resolver-node/node_modules/debug": {
@@ -1119,21 +1525,27 @@
             "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
             "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ms": "^2.1.1"
             }
         },
         "node_modules/eslint-module-utils": {
-            "version": "2.7.3",
-            "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz",
-            "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
+            "version": "2.8.1",
+            "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz",
+            "integrity": "sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "debug": "^3.2.7",
-                "find-up": "^2.1.0"
+                "debug": "^3.2.7"
             },
             "engines": {
                 "node": ">=4"
+            },
+            "peerDependenciesMeta": {
+                "eslint": {
+                    "optional": true
+                }
             }
         },
         "node_modules/eslint-module-utils/node_modules/debug": {
@@ -1141,6 +1553,7 @@
             "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
             "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ms": "^2.1.1"
             }
@@ -1150,6 +1563,7 @@
             "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz",
             "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "eslint-utils": "^2.0.0",
                 "regexpp": "^3.0.0"
@@ -1165,24 +1579,29 @@
             }
         },
         "node_modules/eslint-plugin-import": {
-            "version": "2.26.0",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
-            "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
+            "version": "2.29.1",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz",
+            "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "array-includes": "^3.1.4",
-                "array.prototype.flat": "^1.2.5",
-                "debug": "^2.6.9",
+                "array-includes": "^3.1.7",
+                "array.prototype.findlastindex": "^1.2.3",
+                "array.prototype.flat": "^1.3.2",
+                "array.prototype.flatmap": "^1.3.2",
+                "debug": "^3.2.7",
                 "doctrine": "^2.1.0",
-                "eslint-import-resolver-node": "^0.3.6",
-                "eslint-module-utils": "^2.7.3",
-                "has": "^1.0.3",
-                "is-core-module": "^2.8.1",
+                "eslint-import-resolver-node": "^0.3.9",
+                "eslint-module-utils": "^2.8.0",
+                "hasown": "^2.0.0",
+                "is-core-module": "^2.13.1",
                 "is-glob": "^4.0.3",
                 "minimatch": "^3.1.2",
-                "object.values": "^1.1.5",
-                "resolve": "^1.22.0",
-                "tsconfig-paths": "^3.14.1"
+                "object.fromentries": "^2.0.7",
+                "object.groupby": "^1.0.1",
+                "object.values": "^1.1.7",
+                "semver": "^6.3.1",
+                "tsconfig-paths": "^3.15.0"
             },
             "engines": {
                 "node": ">=4"
@@ -1192,12 +1611,13 @@
             }
         },
         "node_modules/eslint-plugin-import/node_modules/debug": {
-            "version": "2.6.9",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+            "version": "3.2.7",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+            "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "ms": "2.0.0"
+                "ms": "^2.1.1"
             }
         },
         "node_modules/eslint-plugin-import/node_modules/doctrine": {
@@ -1205,6 +1625,7 @@
             "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
             "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
             "dev": true,
+            "license": "Apache-2.0",
             "dependencies": {
                 "esutils": "^2.0.2"
             },
@@ -1212,17 +1633,22 @@
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/eslint-plugin-import/node_modules/ms": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-            "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-            "dev": true
+        "node_modules/eslint-plugin-import/node_modules/semver": {
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+            "dev": true,
+            "license": "ISC",
+            "bin": {
+                "semver": "bin/semver.js"
+            }
         },
         "node_modules/eslint-plugin-jest": {
-            "version": "26.1.4",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-26.1.4.tgz",
-            "integrity": "sha512-wgqxujmqc2qpvZqMFWCh6Cniqc8lWpapvXt9j/19DmBDqeDaYhJrSRezYR1SKyemvjx+9e9kny/dgRahraHImA==",
+            "version": "26.9.0",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-26.9.0.tgz",
+            "integrity": "sha512-TWJxWGp1J628gxh2KhaH1H1paEdgE2J61BBF1I59c6xWeL5+D1BzMxGDN/nXAfX+aSkR5u80K+XhskK6Gwq9ng==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "@typescript-eslint/utils": "^5.10.0"
             },
@@ -1247,6 +1673,7 @@
             "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz",
             "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "eslint-plugin-es": "^3.0.0",
                 "eslint-utils": "^2.0.0",
@@ -1263,19 +1690,21 @@
             }
         },
         "node_modules/eslint-plugin-node/node_modules/ignore": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-            "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+            "version": "5.3.1",
+            "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
+            "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">= 4"
             }
         },
         "node_modules/eslint-plugin-node/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
             "dev": true,
+            "license": "ISC",
             "bin": {
                 "semver": "bin/semver.js"
             }
@@ -1285,6 +1714,7 @@
             "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-5.2.0.tgz",
             "integrity": "sha512-SftLb1pUG01QYq2A/hGAWfDRXqYD82zE7j7TopDOyNdU+7SvvoXREls/+PRTY17vUXzXnZA/zfnyKgRH6x4JJw==",
             "dev": true,
+            "license": "ISC",
             "engines": {
                 "node": "^10.12.0 || >=12.0.0"
             },
@@ -1312,6 +1742,7 @@
                     "url": "https://feross.org/support"
                 }
             ],
+            "license": "MIT",
             "peerDependencies": {
                 "eslint": ">=5.0.0"
             }
@@ -1321,6 +1752,7 @@
             "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
             "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
             "dev": true,
+            "license": "BSD-2-Clause",
             "dependencies": {
                 "esrecurse": "^4.3.0",
                 "estraverse": "^4.1.1"
@@ -1334,6 +1766,7 @@
             "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
             "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "eslint-visitor-keys": "^1.1.0"
             },
@@ -1349,6 +1782,7 @@
             "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
             "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
             "dev": true,
+            "license": "Apache-2.0",
             "engines": {
                 "node": ">=4"
             }
@@ -1358,6 +1792,7 @@
             "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
             "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
             "dev": true,
+            "license": "Apache-2.0",
             "engines": {
                 "node": ">=10"
             }
@@ -1367,6 +1802,7 @@
             "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
             "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
             "dev": true,
+            "license": "BSD-2-Clause",
             "dependencies": {
                 "acorn": "^7.4.0",
                 "acorn-jsx": "^5.3.1",
@@ -1381,6 +1817,7 @@
             "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
             "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
             "dev": true,
+            "license": "Apache-2.0",
             "engines": {
                 "node": ">=4"
             }
@@ -1390,6 +1827,7 @@
             "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
             "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
             "dev": true,
+            "license": "BSD-2-Clause",
             "bin": {
                 "esparse": "bin/esparse.js",
                 "esvalidate": "bin/esvalidate.js"
@@ -1399,10 +1837,11 @@
             }
         },
         "node_modules/esquery": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-            "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+            "version": "1.6.0",
+            "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
+            "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
             "dev": true,
+            "license": "BSD-3-Clause",
             "dependencies": {
                 "estraverse": "^5.1.0"
             },
@@ -1415,6 +1854,7 @@
             "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
             "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
             "dev": true,
+            "license": "BSD-2-Clause",
             "engines": {
                 "node": ">=4.0"
             }
@@ -1424,6 +1864,7 @@
             "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
             "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
             "dev": true,
+            "license": "BSD-2-Clause",
             "dependencies": {
                 "estraverse": "^5.2.0"
             },
@@ -1436,6 +1877,7 @@
             "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
             "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
             "dev": true,
+            "license": "BSD-2-Clause",
             "engines": {
                 "node": ">=4.0"
             }
@@ -1445,6 +1887,7 @@
             "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
             "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
             "dev": true,
+            "license": "BSD-2-Clause",
             "engines": {
                 "node": ">=4.0"
             }
@@ -1454,6 +1897,7 @@
             "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
             "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
             "dev": true,
+            "license": "BSD-2-Clause",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -1461,13 +1905,14 @@
         "node_modules/eventemitter2": {
             "version": "0.4.14",
             "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz",
-            "integrity": "sha1-j2G3XN4BKy6esoTUVFWDtWQ7Yas=",
-            "dev": true
+            "integrity": "sha512-K7J4xq5xAD5jHsGM5ReWXRTFa3JRGofHiMcVgQ8PRwgWxzjHpMWCIzsmyf60+mh8KLsqYPcjUMa0AC4hd6lPyQ==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/exit": {
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-            "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+            "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
             "dev": true,
             "engines": {
                 "node": ">= 0.8.0"
@@ -1476,8 +1921,9 @@
         "node_modules/expand-tilde": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-            "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
+            "integrity": "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "homedir-polyfill": "^1.0.1"
             },
@@ -1489,13 +1935,15 @@
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
             "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/external-editor": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
             "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "chardet": "^0.7.0",
                 "iconv-lite": "^0.4.24",
@@ -1505,11 +1953,25 @@
                 "node": ">=4"
             }
         },
+        "node_modules/external-editor/node_modules/iconv-lite": {
+            "version": "0.4.24",
+            "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+            "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "safer-buffer": ">= 2.1.2 < 3"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
         "node_modules/extract-opts": {
             "version": "4.3.0",
             "resolved": "https://registry.npmjs.org/extract-opts/-/extract-opts-4.3.0.tgz",
             "integrity": "sha512-Dmssi1tgKJkQsVmbP7TgW/kbdc42SAsNf6h9ClweP+dS7O24YYMTXsNwPelxhx0LF15npiWwY5ahKtyQiNgxWA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "eachr": "^4.5.0",
                 "typechecker": "^6.2.0"
@@ -1525,13 +1987,15 @@
             "version": "3.1.3",
             "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
             "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/fast-glob": {
-            "version": "3.2.11",
-            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
-            "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
+            "version": "3.3.2",
+            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+            "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "@nodelib/fs.stat": "^2.0.2",
                 "@nodelib/fs.walk": "^1.2.3",
@@ -1547,19 +2011,22 @@
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
             "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/fast-levenshtein": {
             "version": "2.0.6",
             "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-            "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-            "dev": true
+            "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/fastq": {
-            "version": "1.13.0",
-            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-            "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+            "version": "1.17.1",
+            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
+            "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "reusify": "^1.0.4"
             }
@@ -1567,8 +2034,9 @@
         "node_modules/faye-websocket": {
             "version": "0.10.0",
             "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
-            "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
+            "integrity": "sha512-Xhj93RXbMSq8urNCUq4p9l0P6hnySJ/7YNRhYNug0bLOuii7pKO7xQFb5mx9xZXWCar88pLPb805PvUkwrLZpQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "websocket-driver": ">=0.5.1"
             },
@@ -1579,8 +2047,9 @@
         "node_modules/figures": {
             "version": "1.7.0",
             "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
-            "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
+            "integrity": "sha512-UxKlfCRuCBxSXU4C6t9scbDyWZ4VlaFFdojKtzJuSkuOBQ5CNFum+zZXFwHjo+CxBC1t6zlYPgHIgFjL8ggoEQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "escape-string-regexp": "^1.0.5",
                 "object-assign": "^4.1.0"
@@ -1592,8 +2061,9 @@
         "node_modules/figures/node_modules/escape-string-regexp": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-            "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+            "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.8.0"
             }
@@ -1603,6 +2073,7 @@
             "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
             "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "flat-cache": "^3.0.4"
             },
@@ -1611,10 +2082,11 @@
             }
         },
         "node_modules/fill-range": {
-            "version": "7.0.1",
-            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-            "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+            "version": "7.1.1",
+            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+            "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "to-regex-range": "^5.0.1"
             },
@@ -1623,43 +2095,32 @@
             }
         },
         "node_modules/find-up": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-            "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+            "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "locate-path": "^2.0.0"
+                "locate-path": "^3.0.0"
             },
             "engines": {
-                "node": ">=4"
+                "node": ">=6"
             }
         },
         "node_modules/findup-sync": {
-            "version": "0.3.0",
-            "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz",
-            "integrity": "sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY=",
-            "dev": true,
-            "dependencies": {
-                "glob": "~5.0.0"
-            },
-            "engines": {
-                "node": ">= 0.6.0"
-            }
-        },
-        "node_modules/findup-sync/node_modules/glob": {
-            "version": "5.0.15",
-            "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-            "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-5.0.0.tgz",
+            "integrity": "sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "2 || 3",
-                "once": "^1.3.0",
-                "path-is-absolute": "^1.0.0"
+                "detect-file": "^1.0.0",
+                "is-glob": "^4.0.3",
+                "micromatch": "^4.0.4",
+                "resolve-dir": "^1.0.1"
             },
             "engines": {
-                "node": "*"
+                "node": ">= 10.13.0"
             }
         },
         "node_modules/fined": {
@@ -1667,6 +2128,7 @@
             "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
             "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "expand-tilde": "^2.0.2",
                 "is-plain-object": "^2.0.3",
@@ -1683,17 +2145,20 @@
             "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
             "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">= 0.10"
             }
         },
         "node_modules/flat-cache": {
-            "version": "3.0.4",
-            "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-            "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
+            "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "flatted": "^3.1.0",
+                "flatted": "^3.2.9",
+                "keyv": "^4.5.3",
                 "rimraf": "^3.0.2"
             },
             "engines": {
@@ -1701,16 +2166,28 @@
             }
         },
         "node_modules/flatted": {
-            "version": "3.2.5",
-            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz",
-            "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==",
-            "dev": true
+            "version": "3.4.2",
+            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
+            "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/for-each": {
+            "version": "0.3.3",
+            "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+            "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "is-callable": "^1.1.3"
+            }
         },
         "node_modules/for-in": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-            "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+            "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -1718,8 +2195,9 @@
         "node_modules/for-own": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
-            "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
+            "integrity": "sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "for-in": "^1.0.1"
             },
@@ -1730,15 +2208,17 @@
         "node_modules/fs.realpath": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-            "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-            "dev": true
+            "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+            "dev": true,
+            "license": "ISC"
         },
         "node_modules/fsevents": {
-            "version": "2.3.2",
-            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-            "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+            "version": "2.3.3",
+            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+            "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
             "dev": true,
             "hasInstallScript": true,
+            "license": "MIT",
             "optional": true,
             "os": [
                 "darwin"
@@ -1748,39 +2228,100 @@
             }
         },
         "node_modules/function-bind": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-            "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-            "dev": true
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+            "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/function.prototype.name": {
+            "version": "1.1.6",
+            "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
+            "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.2",
+                "define-properties": "^1.2.0",
+                "es-abstract": "^1.22.1",
+                "functions-have-names": "^1.2.3"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
         },
         "node_modules/functional-red-black-tree": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-            "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-            "dev": true
+            "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/functions-have-names": {
+            "version": "1.2.3",
+            "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+            "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
         },
         "node_modules/get-intrinsic": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
-            "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+            "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "function-bind": "^1.1.1",
-                "has": "^1.0.3",
-                "has-symbols": "^1.0.1"
+                "call-bind-apply-helpers": "^1.0.2",
+                "es-define-property": "^1.0.1",
+                "es-errors": "^1.3.0",
+                "es-object-atoms": "^1.1.1",
+                "function-bind": "^1.1.2",
+                "get-proto": "^1.0.1",
+                "gopd": "^1.2.0",
+                "has-symbols": "^1.1.0",
+                "hasown": "^2.0.2",
+                "math-intrinsics": "^1.1.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
             },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
+        "node_modules/get-proto": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+            "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "dunder-proto": "^1.0.1",
+                "es-object-atoms": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
         "node_modules/get-symbol-description": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-            "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
+            "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "call-bind": "^1.0.2",
-                "get-intrinsic": "^1.1.1"
+                "call-bind": "^1.0.5",
+                "es-errors": "^1.3.0",
+                "get-intrinsic": "^1.2.4"
             },
             "engines": {
                 "node": ">= 0.4"
@@ -1802,7 +2343,9 @@
             "version": "7.1.7",
             "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
             "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+            "deprecated": "Glob versions prior to v9 are no longer supported",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "fs.realpath": "^1.0.0",
                 "inflight": "^1.0.4",
@@ -1823,6 +2366,7 @@
             "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
             "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "is-glob": "^4.0.1"
             },
@@ -1835,6 +2379,7 @@
             "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
             "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "global-prefix": "^1.0.1",
                 "is-windows": "^1.0.1",
@@ -1847,8 +2392,9 @@
         "node_modules/global-prefix": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
-            "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
+            "integrity": "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "expand-tilde": "^2.0.2",
                 "homedir-polyfill": "^1.0.1",
@@ -1865,6 +2411,7 @@
             "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
             "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "isexe": "^2.0.0"
             },
@@ -1873,10 +2420,11 @@
             }
         },
         "node_modules/globals": {
-            "version": "13.13.0",
-            "resolved": "https://registry.npmjs.org/globals/-/globals-13.13.0.tgz",
-            "integrity": "sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==",
+            "version": "13.24.0",
+            "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+            "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "type-fest": "^0.20.2"
             },
@@ -1887,11 +2435,29 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "node_modules/globalthis": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
+            "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "define-properties": "^1.2.1",
+                "gopd": "^1.0.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/globby": {
             "version": "11.1.0",
             "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
             "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "array-union": "^2.1.0",
                 "dir-glob": "^3.0.1",
@@ -1908,54 +2474,75 @@
             }
         },
         "node_modules/globby/node_modules/ignore": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-            "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+            "version": "5.3.1",
+            "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
+            "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">= 4"
             }
         },
-        "node_modules/graceful-fs": {
-            "version": "4.2.10",
-            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-            "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-            "dev": true
-        },
-        "node_modules/grunt": {
-            "version": "1.5.3",
-            "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.5.3.tgz",
-            "integrity": "sha512-mKwmo4X2d8/4c/BmcOETHek675uOqw0RuA/zy12jaspWqvTp4+ZeQF1W+OTpcbncnaBsfbQJ6l0l4j+Sn/GmaQ==",
+        "node_modules/gopd": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+            "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
             "dev": true,
-            "dependencies": {
-                "dateformat": "~3.0.3",
-                "eventemitter2": "~0.4.13",
-                "exit": "~0.1.2",
-                "findup-sync": "~0.3.0",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/graceful-fs": {
+            "version": "4.2.11",
+            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+            "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/grunt": {
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.6.1.tgz",
+            "integrity": "sha512-/ABUy3gYWu5iBmrUSRBP97JLpQUm0GgVveDCp6t3yRNIoltIYw7rEj3g5y1o2PGPR2vfTRGa7WC/LZHLTXnEzA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "dateformat": "~4.6.2",
+                "eventemitter2": "~0.4.13",
+                "exit": "~0.1.2",
+                "findup-sync": "~5.0.0",
                 "glob": "~7.1.6",
                 "grunt-cli": "~1.4.3",
                 "grunt-known-options": "~2.0.0",
                 "grunt-legacy-log": "~3.0.0",
                 "grunt-legacy-util": "~2.0.1",
-                "iconv-lite": "~0.4.13",
+                "iconv-lite": "~0.6.3",
                 "js-yaml": "~3.14.0",
                 "minimatch": "~3.0.4",
-                "mkdirp": "~1.0.4",
-                "nopt": "~3.0.6",
-                "rimraf": "~3.0.2"
+                "nopt": "~3.0.6"
             },
             "bin": {
                 "grunt": "bin/grunt"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16"
             }
         },
         "node_modules/grunt-chokidar": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/grunt-chokidar/-/grunt-chokidar-1.0.2.tgz",
             "integrity": "sha512-sU2QPx3nkJHhfp+yTORXLpNS8Oyq7ZoGoU6SaF/GCA4634aQvi0ZOXV6Uvm8QtjisVI+nWR4LNRxjW95LRRRVg==",
+            "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
             "dev": true,
+            "license": [
+                {
+                    "type": "MIT",
+                    "url": "https://github.com/JimmyRobz/grunt-chokidar/blob/master/LICENSE-MIT"
+                }
+            ],
             "dependencies": {
                 "async": "^3.1.0",
                 "chokidar": "^3.0.2",
@@ -1974,6 +2561,7 @@
             "resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.4.3.tgz",
             "integrity": "sha512-9Dtx/AhVeB4LYzsViCjUQkd0Kw0McN2gYpdmGYKtE2a5Yt7v1Q+HYZVWhqXc/kGnxlMtqKDxSwotiGeFmkrCoQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "grunt-known-options": "~2.0.0",
                 "interpret": "~1.1.0",
@@ -1993,6 +2581,7 @@
             "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
             "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "abbrev": "1",
                 "osenv": "^0.1.4"
@@ -2004,9 +2593,10 @@
         "node_modules/grunt-contrib-eslint": {
             "version": "0.0.5",
             "resolved": "https://registry.npmjs.org/grunt-contrib-eslint/-/grunt-contrib-eslint-0.0.5.tgz",
-            "integrity": "sha1-byCW5DJitJ1erxOxUy38oArJybA=",
+            "integrity": "sha512-WUPRAqCB2bWwIehrg2OrNkLIAFDrUNAJzver0vfpy/teBsfuMHOyiyOvZ4R/L/PWO+U3zd7ronpt+JNRPr6/iA==",
             "deprecated": "Please use gruntify-eslint",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "eslint": ">0.7.3"
             },
@@ -2022,6 +2612,7 @@
             "resolved": "https://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-2.1.0.tgz",
             "integrity": "sha512-+GNKFKpZfiopgUd5cDYNuzsVHZ7WFHM7MOUPKtmMDhfKQ4ZSFuVpNP5PoTFs669TARE6Rvgtv1izILKCpuhFZw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "async": "^3.2.0",
                 "chalk": "^4.1.0",
@@ -2037,6 +2628,7 @@
             "resolved": "https://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-5.0.0.tgz",
             "integrity": "sha512-rIFFPJMWKnh6oxDe2b810Ysg5SKoiI0u/FvuvAVpvJ7VHILkKtGqA4jgJ1JWruWQ+1m5FtB1lVSK81YyzIgDUw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "chalk": "^2.4.1",
                 "maxmin": "^2.1.0",
@@ -2052,6 +2644,7 @@
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
             "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-convert": "^1.9.0"
             },
@@ -2064,6 +2657,7 @@
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
             "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^3.2.1",
                 "escape-string-regexp": "^1.0.5",
@@ -2078,6 +2672,7 @@
             "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
             "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-name": "1.1.3"
             }
@@ -2085,14 +2680,16 @@
         "node_modules/grunt-contrib-uglify/node_modules/color-name": {
             "version": "1.1.3",
             "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-            "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-            "dev": true
+            "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/grunt-contrib-uglify/node_modules/escape-string-regexp": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-            "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+            "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.8.0"
             }
@@ -2100,8 +2697,9 @@
         "node_modules/grunt-contrib-uglify/node_modules/has-flag": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-            "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+            "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=4"
             }
@@ -2111,6 +2709,7 @@
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
             "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-flag": "^3.0.0"
             },
@@ -2121,7 +2720,7 @@
         "node_modules/grunt-file-exists": {
             "version": "0.1.4",
             "resolved": "https://registry.npmjs.org/grunt-file-exists/-/grunt-file-exists-0.1.4.tgz",
-            "integrity": "sha1-Q2Er8418dlRwiUcIdgpuw/sQrrI=",
+            "integrity": "sha512-AKs+2aKdMtCfUYIhPMfj3trgr0ZJX9316Z8Hsno7xoZQ4sF6KdTgeTeYy8rV7zKjuob3+qAETTQEr1TFcvEZUg==",
             "dev": true,
             "engines": {
                 "node": ">= 0.8.0"
@@ -2135,6 +2734,7 @@
             "resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-2.0.0.tgz",
             "integrity": "sha512-GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -2144,6 +2744,7 @@
             "resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-3.0.0.tgz",
             "integrity": "sha512-GHZQzZmhyq0u3hr7aHW4qUH0xDzwp2YXldLPZTCjlOeGscAOWWPftZG3XioW8MasGp+OBRIu39LFx14SLjXRcA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "colors": "~1.1.2",
                 "grunt-legacy-log-utils": "~2.1.0",
@@ -2159,6 +2760,7 @@
             "resolved": "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-2.1.0.tgz",
             "integrity": "sha512-lwquaPXJtKQk0rUM1IQAop5noEpwFqOXasVoedLeNzaibf/OPWjKYvvdqnEHNmU+0T0CaReAXIbGo747ZD+Aaw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "chalk": "~4.1.0",
                 "lodash": "~4.17.19"
@@ -2172,6 +2774,7 @@
             "resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-2.0.1.tgz",
             "integrity": "sha512-2bQiD4fzXqX8rhNdXkAywCadeqiPiay0oQny77wA2F3WF4grPJXCvAcyoWUJV+po/b15glGkxuSiQCK299UC2w==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "async": "~3.2.0",
                 "exit": "~0.1.2",
@@ -2206,6 +2809,7 @@
             "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz",
             "integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "brace-expansion": "^1.1.7"
             },
@@ -2218,6 +2822,7 @@
             "resolved": "https://registry.npmjs.org/gruntify-eslint/-/gruntify-eslint-5.0.0.tgz",
             "integrity": "sha512-pa2sXHK9+U4dCGdGSIMkpJARNwRStdLBsddNxmSHSSWROUdhWMrXvFWm6pj48zJhyV3Qy068VIuF1seYIvc0cw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "eslint": "^5.0.0"
             },
@@ -2233,6 +2838,7 @@
             "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
             "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
             "dev": true,
+            "license": "MIT",
             "bin": {
                 "acorn": "bin/acorn"
             },
@@ -2245,6 +2851,7 @@
             "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
             "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=4"
             }
@@ -2254,6 +2861,7 @@
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
             "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-convert": "^1.9.0"
             },
@@ -2266,6 +2874,7 @@
             "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
             "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=4"
             }
@@ -2275,6 +2884,7 @@
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
             "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^3.2.1",
                 "escape-string-regexp": "^1.0.5",
@@ -2289,6 +2899,7 @@
             "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
             "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-name": "1.1.3"
             }
@@ -2296,14 +2907,16 @@
         "node_modules/gruntify-eslint/node_modules/color-name": {
             "version": "1.1.3",
             "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-            "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-            "dev": true
+            "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/gruntify-eslint/node_modules/cross-spawn": {
             "version": "6.0.5",
             "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
             "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "nice-try": "^1.0.4",
                 "path-key": "^2.0.1",
@@ -2319,13 +2932,15 @@
             "version": "7.0.3",
             "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
             "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/gruntify-eslint/node_modules/escape-string-regexp": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-            "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+            "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.8.0"
             }
@@ -2335,6 +2950,7 @@
             "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz",
             "integrity": "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "@babel/code-frame": "^7.0.0",
                 "ajv": "^6.9.1",
@@ -2385,6 +3001,7 @@
             "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
             "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
             "dev": true,
+            "license": "BSD-2-Clause",
             "dependencies": {
                 "esrecurse": "^4.1.0",
                 "estraverse": "^4.1.1"
@@ -2398,6 +3015,7 @@
             "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
             "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "eslint-visitor-keys": "^1.1.0"
             },
@@ -2410,6 +3028,7 @@
             "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
             "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
             "dev": true,
+            "license": "Apache-2.0",
             "engines": {
                 "node": ">=4"
             }
@@ -2419,6 +3038,7 @@
             "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz",
             "integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==",
             "dev": true,
+            "license": "BSD-2-Clause",
             "dependencies": {
                 "acorn": "^6.0.7",
                 "acorn-jsx": "^5.0.0",
@@ -2433,6 +3053,7 @@
             "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
             "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "flat-cache": "^2.0.1"
             },
@@ -2445,6 +3066,7 @@
             "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
             "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "flatted": "^2.0.0",
                 "rimraf": "2.6.3",
@@ -2458,13 +3080,15 @@
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
             "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
-            "dev": true
+            "dev": true,
+            "license": "ISC"
         },
         "node_modules/gruntify-eslint/node_modules/globals": {
             "version": "11.12.0",
             "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
             "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=4"
             }
@@ -2472,8 +3096,9 @@
         "node_modules/gruntify-eslint/node_modules/has-flag": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-            "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+            "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=4"
             }
@@ -2481,8 +3106,9 @@
         "node_modules/gruntify-eslint/node_modules/is-fullwidth-code-point": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-            "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+            "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=4"
             }
@@ -2490,8 +3116,9 @@
         "node_modules/gruntify-eslint/node_modules/levn": {
             "version": "0.3.0",
             "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-            "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+            "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "prelude-ls": "~1.1.2",
                 "type-check": "~0.3.2"
@@ -2500,23 +3127,12 @@
                 "node": ">= 0.8.0"
             }
         },
-        "node_modules/gruntify-eslint/node_modules/mkdirp": {
-            "version": "0.5.6",
-            "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-            "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-            "dev": true,
-            "dependencies": {
-                "minimist": "^1.2.6"
-            },
-            "bin": {
-                "mkdirp": "bin/cmd.js"
-            }
-        },
         "node_modules/gruntify-eslint/node_modules/optionator": {
             "version": "0.8.3",
             "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
             "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "deep-is": "~0.1.3",
                 "fast-levenshtein": "~2.0.6",
@@ -2532,8 +3148,9 @@
         "node_modules/gruntify-eslint/node_modules/path-key": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-            "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+            "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=4"
             }
@@ -2541,7 +3158,7 @@
         "node_modules/gruntify-eslint/node_modules/prelude-ls": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-            "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+            "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
             "dev": true,
             "engines": {
                 "node": ">= 0.8.0"
@@ -2552,6 +3169,7 @@
             "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
             "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=6.5.0"
             }
@@ -2560,7 +3178,9 @@
             "version": "2.6.3",
             "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
             "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+            "deprecated": "Rimraf versions prior to v4 are no longer supported",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "glob": "^7.1.3"
             },
@@ -2569,10 +3189,11 @@
             }
         },
         "node_modules/gruntify-eslint/node_modules/semver": {
-            "version": "5.7.1",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-            "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+            "version": "5.7.2",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+            "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
             "dev": true,
+            "license": "ISC",
             "bin": {
                 "semver": "bin/semver"
             }
@@ -2580,8 +3201,9 @@
         "node_modules/gruntify-eslint/node_modules/shebang-command": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-            "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+            "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "shebang-regex": "^1.0.0"
             },
@@ -2592,8 +3214,9 @@
         "node_modules/gruntify-eslint/node_modules/shebang-regex": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-            "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+            "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -2603,6 +3226,7 @@
             "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
             "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^3.2.0",
                 "astral-regex": "^1.0.0",
@@ -2617,6 +3241,7 @@
             "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
             "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "emoji-regex": "^7.0.1",
                 "is-fullwidth-code-point": "^2.0.0",
@@ -2631,6 +3256,7 @@
             "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
             "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=6"
             }
@@ -2640,6 +3266,7 @@
             "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
             "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-regex": "^4.1.0"
             },
@@ -2650,8 +3277,9 @@
         "node_modules/gruntify-eslint/node_modules/strip-ansi": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-            "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+            "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-regex": "^3.0.0"
             },
@@ -2662,8 +3290,9 @@
         "node_modules/gruntify-eslint/node_modules/strip-json-comments": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-            "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+            "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -2673,6 +3302,7 @@
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
             "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-flag": "^3.0.0"
             },
@@ -2685,6 +3315,7 @@
             "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
             "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
             "dev": true,
+            "license": "BSD-3-Clause",
             "dependencies": {
                 "ajv": "^6.10.2",
                 "lodash": "^4.17.14",
@@ -2698,8 +3329,9 @@
         "node_modules/gruntify-eslint/node_modules/type-check": {
             "version": "0.3.2",
             "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-            "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+            "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "prelude-ls": "~1.1.2"
             },
@@ -2712,6 +3344,7 @@
             "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
             "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "isexe": "^2.0.0"
             },
@@ -2722,8 +3355,9 @@
         "node_modules/gzip-size": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-3.0.0.tgz",
-            "integrity": "sha1-VGGI6b3DN/Zzdy+BZgRks4nc5SA=",
+            "integrity": "sha512-6s8trQiK+OMzSaCSVXX+iqIcLV9tC+E73jrJrJTyS4h/AJhlxHvzFKqM1YLDJWRGgHX8uLkBeXkA0njNj39L4w==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "duplexer": "^0.1.1"
             },
@@ -2731,23 +3365,12 @@
                 "node": ">=0.12.0"
             }
         },
-        "node_modules/has": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-            "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-            "dev": true,
-            "dependencies": {
-                "function-bind": "^1.1.1"
-            },
-            "engines": {
-                "node": ">= 0.4.0"
-            }
-        },
         "node_modules/has-ansi": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-            "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+            "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-regex": "^2.0.0"
             },
@@ -2758,17 +3381,19 @@
         "node_modules/has-ansi/node_modules/ansi-regex": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-            "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+            "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
         },
         "node_modules/has-bigints": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
-            "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+            "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
             "dev": true,
+            "license": "MIT",
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
             }
@@ -2778,27 +3403,43 @@
             "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
             "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
         },
         "node_modules/has-property-descriptors": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-            "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+            "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "get-intrinsic": "^1.1.1"
+                "es-define-property": "^1.0.0"
             },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "node_modules/has-symbols": {
+        "node_modules/has-proto": {
             "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-            "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+            "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+            "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/has-symbols": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+            "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">= 0.4"
             },
@@ -2807,12 +3448,13 @@
             }
         },
         "node_modules/has-tostringtag": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-            "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+            "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "has-symbols": "^1.0.2"
+                "has-symbols": "^1.0.3"
             },
             "engines": {
                 "node": ">= 0.4"
@@ -2821,11 +3463,25 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
+        "node_modules/hasown": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+            "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "function-bind": "^1.1.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
         "node_modules/homedir-polyfill": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
             "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "parse-passwd": "^1.0.0"
             },
@@ -2836,25 +3492,27 @@
         "node_modules/hooker": {
             "version": "0.2.3",
             "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz",
-            "integrity": "sha1-uDT3I8xKJCqmWWNFnfbZhMXT2Vk=",
+            "integrity": "sha512-t+UerCsQviSymAInD01Pw+Dn/usmz1sRO+3Zk1+lx8eg+WKpD2ulcwWqHHL0+aseRBr+3+vIhiG1K1JTwaIcTA==",
             "dev": true,
             "engines": {
                 "node": "*"
             }
         },
         "node_modules/http-parser-js": {
-            "version": "0.5.6",
-            "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.6.tgz",
-            "integrity": "sha512-vDlkRPDJn93swjcjqMSaGSPABbIarsr1TLAui/gLDXzV5VsJNdXNzMYDyNBLQkjWQCJ1uizu8T2oDMhmGt0PRA==",
-            "dev": true
+            "version": "0.5.8",
+            "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
+            "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/iconv-lite": {
-            "version": "0.4.24",
-            "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-            "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+            "version": "0.6.3",
+            "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+            "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "safer-buffer": ">= 2.1.2 < 3"
+                "safer-buffer": ">= 2.1.2 < 3.0.0"
             },
             "engines": {
                 "node": ">=0.10.0"
@@ -2865,6 +3523,7 @@
             "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
             "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">= 4"
             }
@@ -2872,8 +3531,9 @@
         "node_modules/image-size": {
             "version": "0.5.5",
             "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
-            "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
+            "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==",
             "dev": true,
+            "license": "MIT",
             "optional": true,
             "bin": {
                 "image-size": "bin/image-size.js"
@@ -2887,6 +3547,7 @@
             "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
             "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "parent-module": "^1.0.0",
                 "resolve-from": "^4.0.0"
@@ -2901,8 +3562,9 @@
         "node_modules/imurmurhash": {
             "version": "0.1.4",
             "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-            "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+            "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.8.19"
             }
@@ -2910,8 +3572,10 @@
         "node_modules/inflight": {
             "version": "1.0.6",
             "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-            "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+            "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+            "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "once": "^1.3.0",
                 "wrappy": "1"
@@ -2921,19 +3585,22 @@
             "version": "2.0.4",
             "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
             "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-            "dev": true
+            "dev": true,
+            "license": "ISC"
         },
         "node_modules/ini": {
             "version": "1.3.8",
             "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
             "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-            "dev": true
+            "dev": true,
+            "license": "ISC"
         },
         "node_modules/inquirer": {
             "version": "6.5.2",
             "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz",
             "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-escapes": "^3.2.0",
                 "chalk": "^2.4.2",
@@ -2958,6 +3625,7 @@
             "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
             "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=6"
             }
@@ -2967,6 +3635,7 @@
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
             "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-convert": "^1.9.0"
             },
@@ -2979,6 +3648,7 @@
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
             "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^3.2.1",
                 "escape-string-regexp": "^1.0.5",
@@ -2993,6 +3663,7 @@
             "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
             "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "color-name": "1.1.3"
             }
@@ -3000,14 +3671,16 @@
         "node_modules/inquirer/node_modules/color-name": {
             "version": "1.1.3",
             "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-            "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-            "dev": true
+            "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/inquirer/node_modules/escape-string-regexp": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-            "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+            "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.8.0"
             }
@@ -3015,8 +3688,9 @@
         "node_modules/inquirer/node_modules/figures": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-            "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+            "integrity": "sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "escape-string-regexp": "^1.0.5"
             },
@@ -3027,8 +3701,9 @@
         "node_modules/inquirer/node_modules/has-flag": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-            "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+            "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=4"
             }
@@ -3036,8 +3711,9 @@
         "node_modules/inquirer/node_modules/is-fullwidth-code-point": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-            "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+            "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=4"
             }
@@ -3047,6 +3723,7 @@
             "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
             "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "is-fullwidth-code-point": "^2.0.0",
                 "strip-ansi": "^4.0.0"
@@ -3060,6 +3737,7 @@
             "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
             "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=4"
             }
@@ -3067,8 +3745,9 @@
         "node_modules/inquirer/node_modules/string-width/node_modules/strip-ansi": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-            "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+            "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-regex": "^3.0.0"
             },
@@ -3081,6 +3760,7 @@
             "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
             "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-regex": "^4.1.0"
             },
@@ -3093,6 +3773,7 @@
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
             "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-flag": "^3.0.0"
             },
@@ -3101,13 +3782,14 @@
             }
         },
         "node_modules/internal-slot": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-            "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+            "version": "1.0.7",
+            "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
+            "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "get-intrinsic": "^1.1.0",
-                "has": "^1.0.3",
+                "es-errors": "^1.3.0",
+                "hasown": "^2.0.0",
                 "side-channel": "^1.0.4"
             },
             "engines": {
@@ -3117,14 +3799,16 @@
         "node_modules/interpret": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
-            "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=",
-            "dev": true
+            "integrity": "sha512-CLM8SNMDu7C5psFCn6Wg/tgpj/bKAg7hc2gWqcuR9OD5Ft9PhBpIu8PLicPeis+xDd6YX2ncI8MCA64I9tftIA==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/is-absolute": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
             "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "is-relative": "^1.0.0",
                 "is-windows": "^1.0.1"
@@ -3133,11 +3817,29 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/is-array-buffer": {
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
+            "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.2",
+                "get-intrinsic": "^1.2.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/is-bigint": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
             "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-bigints": "^1.0.1"
             },
@@ -3150,6 +3852,7 @@
             "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
             "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "binary-extensions": "^2.0.0"
             },
@@ -3162,6 +3865,7 @@
             "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
             "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "call-bind": "^1.0.2",
                 "has-tostringtag": "^1.0.0"
@@ -3174,10 +3878,11 @@
             }
         },
         "node_modules/is-callable": {
-            "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-            "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
+            "version": "1.2.7",
+            "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+            "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">= 0.4"
             },
@@ -3186,12 +3891,32 @@
             }
         },
         "node_modules/is-core-module": {
-            "version": "2.8.1",
-            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz",
-            "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==",
+            "version": "2.14.0",
+            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.14.0.tgz",
+            "integrity": "sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "hasown": "^2.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/is-data-view": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz",
+            "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "has": "^1.0.3"
+                "is-typed-array": "^1.1.13"
+            },
+            "engines": {
+                "node": ">= 0.4"
             },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
@@ -3202,6 +3927,7 @@
             "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
             "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-tostringtag": "^1.0.0"
             },
@@ -3215,8 +3941,9 @@
         "node_modules/is-extglob": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-            "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+            "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -3226,6 +3953,7 @@
             "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
             "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
@@ -3235,6 +3963,7 @@
             "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
             "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "is-extglob": "^2.1.1"
             },
@@ -3243,10 +3972,11 @@
             }
         },
         "node_modules/is-negative-zero": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-            "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
+            "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">= 0.4"
             },
@@ -3259,6 +3989,7 @@
             "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
             "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.12.0"
             }
@@ -3268,6 +3999,7 @@
             "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
             "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-tostringtag": "^1.0.0"
             },
@@ -3283,6 +4015,7 @@
             "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
             "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "isobject": "^3.0.1"
             },
@@ -3295,6 +4028,7 @@
             "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
             "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "call-bind": "^1.0.2",
                 "has-tostringtag": "^1.0.0"
@@ -3311,6 +4045,7 @@
             "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
             "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "is-unc-path": "^1.0.0"
             },
@@ -3319,12 +4054,16 @@
             }
         },
         "node_modules/is-shared-array-buffer": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-            "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz",
+            "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "call-bind": "^1.0.2"
+                "call-bind": "^1.0.7"
+            },
+            "engines": {
+                "node": ">= 0.4"
             },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
@@ -3335,6 +4074,7 @@
             "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
             "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-tostringtag": "^1.0.0"
             },
@@ -3350,6 +4090,7 @@
             "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
             "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-symbols": "^1.0.2"
             },
@@ -3360,11 +4101,28 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
+        "node_modules/is-typed-array": {
+            "version": "1.1.13",
+            "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
+            "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "which-typed-array": "^1.1.14"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/is-unc-path": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
             "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "unc-path-regex": "^0.1.2"
             },
@@ -3377,6 +4135,7 @@
             "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
             "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "call-bind": "^1.0.2"
             },
@@ -3388,28 +4147,39 @@
             "version": "3.14.1",
             "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz",
             "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/is-windows": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
             "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/isarray": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+            "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/isexe": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-            "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-            "dev": true
+            "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+            "dev": true,
+            "license": "ISC"
         },
         "node_modules/isobject": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-            "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+            "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -3417,8 +4187,9 @@
         "node_modules/jit-grunt": {
             "version": "0.10.0",
             "resolved": "https://registry.npmjs.org/jit-grunt/-/jit-grunt-0.10.0.tgz",
-            "integrity": "sha1-AIw6f+Hpa9DYTiYOofoXg0V/ecI=",
+            "integrity": "sha512-eT/f4c9wgZ3buXB7X1JY1w6uNtAV0bhrbOGf/mFmBb0CDNLUETJ/VRoydayWOI54tOoam0cz9RooVCn3QY1WoA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             },
@@ -3430,13 +4201,15 @@
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
             "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/js-yaml": {
             "version": "3.14.1",
             "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
             "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "argparse": "^1.0.7",
                 "esprima": "^4.0.0"
@@ -3450,27 +4223,38 @@
             "resolved": "https://registry.npmjs.org/js-yaml-js-types/-/js-yaml-js-types-1.0.0.tgz",
             "integrity": "sha512-UNjPwuoaj4mcHkJCJSF6l4MgkzoFjG+JJkBXMYNvjgO3yE9gTeRt+E6PN022vduz/daZZ7HmlEiSEE36NrGE4w==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "esprima": "^4.0.1"
             }
         },
+        "node_modules/json-buffer": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+            "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/json-schema-traverse": {
             "version": "0.4.1",
             "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
             "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/json-stable-stringify-without-jsonify": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-            "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-            "dev": true
+            "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/json5": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-            "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+            "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "minimist": "^1.2.0"
             },
@@ -3478,11 +4262,22 @@
                 "json5": "lib/cli.js"
             }
         },
+        "node_modules/keyv": {
+            "version": "4.5.4",
+            "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+            "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "json-buffer": "3.0.1"
+            }
+        },
         "node_modules/kind-of": {
             "version": "6.0.3",
             "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
             "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -3492,6 +4287,7 @@
             "resolved": "https://registry.npmjs.org/less/-/less-3.13.1.tgz",
             "integrity": "sha512-SwA1aQXGUvp+P5XdZslUOhhLnClSLIjWvJhmd+Vgib5BFIr9lMNlQwmwUNOjXThF/A0x+MCYYPeWEfeWiLRnTw==",
             "dev": true,
+            "license": "Apache-2.0",
             "dependencies": {
                 "copy-anything": "^2.0.1",
                 "tslib": "^1.10.0"
@@ -3517,6 +4313,7 @@
             "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
             "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "prelude-ls": "^1.2.1",
                 "type-check": "~0.4.0"
@@ -3530,6 +4327,7 @@
             "resolved": "https://registry.npmjs.org/liftup/-/liftup-3.0.1.tgz",
             "integrity": "sha512-yRHaiQDizWSzoXk3APcA71eOI/UuhEkNN9DiW2Tt44mhYzX4joFoCZlxsSOF7RyeLlfqzFLQI1ngFq3ggMPhOw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "extend": "^3.0.2",
                 "findup-sync": "^4.0.0",
@@ -3549,6 +4347,7 @@
             "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-4.0.0.tgz",
             "integrity": "sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "detect-file": "^1.0.0",
                 "is-glob": "^4.0.0",
@@ -3563,13 +4362,15 @@
             "version": "2.4.0",
             "resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-2.4.0.tgz",
             "integrity": "sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/load-grunt-config": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/load-grunt-config/-/load-grunt-config-4.0.1.tgz",
             "integrity": "sha512-F3CD28C1WFocVvdTRSKnV73q7JvGY2OrqoeUeflbOQg58AhkFROIFc2BQXOU2xdrYJqWZx53glT5PZp1vrr9qA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "cson": "7.20.0",
                 "glob": "7.1.7",
@@ -3587,13 +4388,15 @@
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
             "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-            "dev": true
+            "dev": true,
+            "license": "Python-2.0"
         },
         "node_modules/load-grunt-config/node_modules/js-yaml": {
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
             "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "argparse": "^2.0.1"
             },
@@ -3606,6 +4409,7 @@
             "resolved": "https://registry.npmjs.org/load-grunt-tasks/-/load-grunt-tasks-5.1.0.tgz",
             "integrity": "sha512-oNj0Jlka1TsfDe+9He0kcA1cRln+TMoTsEByW7ij6kyktNLxBKJtslCFEvFrLC2Dj0S19IWJh3fOCIjLby2Xrg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "arrify": "^2.0.1",
                 "multimatch": "^4.0.0",
@@ -3620,53 +4424,46 @@
             }
         },
         "node_modules/locate-path": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-            "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+            "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "p-locate": "^2.0.0",
+                "p-locate": "^3.0.0",
                 "path-exists": "^3.0.0"
             },
             "engines": {
-                "node": ">=4"
+                "node": ">=6"
             }
         },
         "node_modules/lodash": {
             "version": "4.17.21",
             "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
             "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/lodash.merge": {
             "version": "4.6.2",
             "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
             "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/lodash.truncate": {
             "version": "4.4.2",
             "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-            "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
-            "dev": true
-        },
-        "node_modules/lru-cache": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-            "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+            "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
             "dev": true,
-            "dependencies": {
-                "yallist": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            }
+            "license": "MIT"
         },
         "node_modules/make-dir": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
             "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
             "dev": true,
+            "license": "MIT",
             "optional": true,
             "dependencies": {
                 "pify": "^4.0.1",
@@ -3677,10 +4474,11 @@
             }
         },
         "node_modules/make-dir/node_modules/semver": {
-            "version": "5.7.1",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-            "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+            "version": "5.7.2",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+            "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
             "dev": true,
+            "license": "ISC",
             "optional": true,
             "bin": {
                 "semver": "bin/semver"
@@ -3691,6 +4489,7 @@
             "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
             "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "kind-of": "^6.0.2"
             },
@@ -3701,17 +4500,29 @@
         "node_modules/map-cache": {
             "version": "0.2.2",
             "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-            "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+            "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/math-intrinsics": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+            "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
         "node_modules/maxmin": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/maxmin/-/maxmin-2.1.0.tgz",
-            "integrity": "sha1-TTsiCQPZXu5+t6x/qGTnLcCaMWY=",
+            "integrity": "sha512-NWlApBjW9az9qRPaeg7CX4sQBWwytqz32bIEo1PW9pRW+kBP9KLRfJO3UC+TV31EcQZEUq7eMzikC7zt3zPJcw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "chalk": "^1.0.0",
                 "figures": "^1.0.1",
@@ -3725,8 +4536,9 @@
         "node_modules/maxmin/node_modules/ansi-regex": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-            "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+            "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -3734,8 +4546,9 @@
         "node_modules/maxmin/node_modules/ansi-styles": {
             "version": "2.2.1",
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-            "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+            "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -3743,8 +4556,9 @@
         "node_modules/maxmin/node_modules/chalk": {
             "version": "1.1.3",
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-            "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+            "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^2.2.1",
                 "escape-string-regexp": "^1.0.2",
@@ -3759,8 +4573,9 @@
         "node_modules/maxmin/node_modules/escape-string-regexp": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-            "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+            "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.8.0"
             }
@@ -3768,8 +4583,9 @@
         "node_modules/maxmin/node_modules/strip-ansi": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-            "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+            "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-regex": "^2.0.0"
             },
@@ -3780,8 +4596,9 @@
         "node_modules/maxmin/node_modules/supports-color": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-            "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+            "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.8.0"
             }
@@ -3791,6 +4608,7 @@
             "resolved": "https://registry.npmjs.org/md5-file/-/md5-file-4.0.0.tgz",
             "integrity": "sha512-UC0qFwyAjn4YdPpKaDNw6gNxRf7Mcx7jC1UGCY4boCzgvU2Aoc1mOGzTtrjjLKhM5ivsnhoKpQVxKPp+1j1qwg==",
             "dev": true,
+            "license": "MIT",
             "bin": {
                 "md5-file": "cli.js"
             },
@@ -3803,17 +4621,19 @@
             "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
             "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">= 8"
             }
         },
         "node_modules/micromatch": {
-            "version": "4.0.5",
-            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-            "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+            "version": "4.0.7",
+            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz",
+            "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "braces": "^3.0.2",
+                "braces": "^3.0.3",
                 "picomatch": "^2.3.1"
             },
             "engines": {
@@ -3825,6 +4645,7 @@
             "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
             "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
             "dev": true,
+            "license": "MIT",
             "optional": true,
             "bin": {
                 "mime": "cli.js"
@@ -3838,6 +4659,7 @@
             "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
             "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=4"
             }
@@ -3847,6 +4669,7 @@
             "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
             "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "brace-expansion": "^1.1.7"
             },
@@ -3855,34 +4678,41 @@
             }
         },
         "node_modules/minimist": {
-            "version": "1.2.6",
-            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-            "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
-            "dev": true
+            "version": "1.2.8",
+            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+            "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
         },
         "node_modules/mkdirp": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-            "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+            "version": "0.5.6",
+            "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+            "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
             "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "minimist": "^1.2.6"
+            },
             "bin": {
                 "mkdirp": "bin/cmd.js"
-            },
-            "engines": {
-                "node": ">=10"
             }
         },
         "node_modules/ms": {
             "version": "2.1.2",
             "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
             "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/multimatch": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-4.0.0.tgz",
             "integrity": "sha512-lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "@types/minimatch": "^3.0.3",
                 "array-differ": "^3.0.0",
@@ -3897,33 +4727,38 @@
         "node_modules/mute-stream": {
             "version": "0.0.7",
             "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-            "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
-            "dev": true
+            "integrity": "sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ==",
+            "dev": true,
+            "license": "ISC"
         },
         "node_modules/native-request": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/native-request/-/native-request-1.1.0.tgz",
             "integrity": "sha512-uZ5rQaeRn15XmpgE0xoPL8YWqcX90VtCFglYwAgkvKM5e8fog+vePLAhHxuuv/gRkrQxIeh5U3q9sMNUrENqWw==",
             "dev": true,
+            "license": "MIT",
             "optional": true
         },
         "node_modules/natural-compare": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-            "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-            "dev": true
+            "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/nice-try": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
             "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/nopt": {
             "version": "3.0.6",
             "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-            "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+            "integrity": "sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg==",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "abbrev": "1"
             },
@@ -3936,6 +4771,7 @@
             "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
             "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -3943,8 +4779,9 @@
         "node_modules/number-is-nan": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-            "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+            "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -3952,17 +4789,22 @@
         "node_modules/object-assign": {
             "version": "4.1.1",
             "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-            "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+            "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
         },
         "node_modules/object-inspect": {
-            "version": "1.12.0",
-            "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-            "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
+            "version": "1.13.4",
+            "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
+            "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
             "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
             }
@@ -3972,19 +4814,21 @@
             "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
             "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">= 0.4"
             }
         },
         "node_modules/object.assign": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-            "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+            "version": "4.1.5",
+            "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
+            "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "call-bind": "^1.0.0",
-                "define-properties": "^1.1.3",
-                "has-symbols": "^1.0.1",
+                "call-bind": "^1.0.5",
+                "define-properties": "^1.2.1",
+                "has-symbols": "^1.0.3",
                 "object-keys": "^1.1.1"
             },
             "engines": {
@@ -3997,8 +4841,9 @@
         "node_modules/object.defaults": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
-            "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
+            "integrity": "sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "array-each": "^1.0.1",
                 "array-slice": "^1.0.0",
@@ -4009,11 +4854,46 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/object.fromentries": {
+            "version": "2.0.8",
+            "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz",
+            "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.7",
+                "define-properties": "^1.2.1",
+                "es-abstract": "^1.23.2",
+                "es-object-atoms": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/object.groupby": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz",
+            "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.7",
+                "define-properties": "^1.2.1",
+                "es-abstract": "^1.23.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
         "node_modules/object.map": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
-            "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
+            "integrity": "sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "for-own": "^1.0.0",
                 "make-iterator": "^1.0.0"
@@ -4025,8 +4905,9 @@
         "node_modules/object.pick": {
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-            "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+            "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "isobject": "^3.0.1"
             },
@@ -4035,14 +4916,15 @@
             }
         },
         "node_modules/object.values": {
-            "version": "1.1.5",
-            "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
-            "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz",
+            "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "call-bind": "^1.0.2",
-                "define-properties": "^1.1.3",
-                "es-abstract": "^1.19.1"
+                "call-bind": "^1.0.7",
+                "define-properties": "^1.2.1",
+                "es-object-atoms": "^1.0.0"
             },
             "engines": {
                 "node": ">= 0.4"
@@ -4054,8 +4936,9 @@
         "node_modules/once": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-            "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+            "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "wrappy": "1"
             }
@@ -4063,8 +4946,9 @@
         "node_modules/onetime": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-            "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+            "integrity": "sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "mimic-fn": "^1.0.0"
             },
@@ -4073,17 +4957,18 @@
             }
         },
         "node_modules/optionator": {
-            "version": "0.9.1",
-            "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-            "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+            "version": "0.9.4",
+            "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+            "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "deep-is": "^0.1.3",
                 "fast-levenshtein": "^2.0.6",
                 "levn": "^0.4.1",
                 "prelude-ls": "^1.2.1",
                 "type-check": "^0.4.0",
-                "word-wrap": "^1.2.3"
+                "word-wrap": "^1.2.5"
             },
             "engines": {
                 "node": ">= 0.8.0"
@@ -4092,8 +4977,9 @@
         "node_modules/os-homedir": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-            "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+            "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -4101,8 +4987,9 @@
         "node_modules/os-tmpdir": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-            "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+            "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -4111,43 +4998,51 @@
             "version": "0.1.5",
             "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
             "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+            "deprecated": "This package is no longer supported.",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "os-homedir": "^1.0.0",
                 "os-tmpdir": "^1.0.0"
             }
         },
         "node_modules/p-limit": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-            "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+            "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "p-try": "^1.0.0"
+                "p-try": "^2.0.0"
             },
             "engines": {
-                "node": ">=4"
+                "node": ">=6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
             }
         },
         "node_modules/p-locate": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-            "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+            "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "p-limit": "^1.1.0"
+                "p-limit": "^2.0.0"
             },
             "engines": {
-                "node": ">=4"
+                "node": ">=6"
             }
         },
         "node_modules/p-try": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-            "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+            "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
-                "node": ">=4"
+                "node": ">=6"
             }
         },
         "node_modules/parent-module": {
@@ -4155,6 +5050,7 @@
             "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
             "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "callsites": "^3.0.0"
             },
@@ -4165,8 +5061,9 @@
         "node_modules/parse-filepath": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
-            "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
+            "integrity": "sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "is-absolute": "^1.0.0",
                 "map-cache": "^0.2.0",
@@ -4179,8 +5076,9 @@
         "node_modules/parse-passwd": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-            "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
+            "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -4188,8 +5086,9 @@
         "node_modules/path-exists": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-            "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+            "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=4"
             }
@@ -4197,8 +5096,9 @@
         "node_modules/path-is-absolute": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-            "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+            "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -4206,14 +5106,16 @@
         "node_modules/path-is-inside": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-            "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
-            "dev": true
+            "integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==",
+            "dev": true,
+            "license": "(WTFPL OR MIT)"
         },
         "node_modules/path-key": {
             "version": "3.1.1",
             "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
             "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
@@ -4222,13 +5124,15 @@
             "version": "1.0.7",
             "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
             "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/path-root": {
             "version": "0.1.1",
             "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
-            "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
+            "integrity": "sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "path-root-regex": "^0.1.0"
             },
@@ -4239,8 +5143,9 @@
         "node_modules/path-root-regex": {
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
-            "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
+            "integrity": "sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -4250,15 +5155,24 @@
             "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
             "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
         },
+        "node_modules/picocolors": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
+            "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
+            "dev": true,
+            "license": "ISC"
+        },
         "node_modules/picomatch": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-            "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+            "version": "2.3.2",
+            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
+            "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8.6"
             },
@@ -4271,6 +5185,7 @@
             "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
             "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
             "dev": true,
+            "license": "MIT",
             "optional": true,
             "engines": {
                 "node": ">=6"
@@ -4281,6 +5196,7 @@
             "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
             "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "find-up": "^3.0.0"
             },
@@ -4288,65 +5204,14 @@
                 "node": ">=8"
             }
         },
-        "node_modules/pkg-up/node_modules/find-up": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-            "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-            "dev": true,
-            "dependencies": {
-                "locate-path": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/pkg-up/node_modules/locate-path": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-            "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-            "dev": true,
-            "dependencies": {
-                "p-locate": "^3.0.0",
-                "path-exists": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/pkg-up/node_modules/p-limit": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-            "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-            "dev": true,
-            "dependencies": {
-                "p-try": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/pkg-up/node_modules/p-locate": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-            "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-            "dev": true,
-            "dependencies": {
-                "p-limit": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/pkg-up/node_modules/p-try": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-            "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+        "node_modules/possible-typed-array-names": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
+            "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
             "dev": true,
+            "license": "MIT",
             "engines": {
-                "node": ">=6"
+                "node": ">= 0.4"
             }
         },
         "node_modules/prelude-ls": {
@@ -4354,6 +5219,7 @@
             "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
             "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">= 0.8.0"
             }
@@ -4361,8 +5227,9 @@
         "node_modules/pretty-bytes": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-3.0.1.tgz",
-            "integrity": "sha1-J9AAjXeAY6C0gRuzXHnxvV1fvM8=",
+            "integrity": "sha512-eb7ZAeUTgfh294cElcu51w+OTRp/6ItW758LjwJSK72LDevcuJn0P4eD71PLMDGPwwatXmAmYHTkzvpKlJE3ow==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "number-is-nan": "^1.0.0"
             },
@@ -4375,6 +5242,7 @@
             "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
             "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.4.0"
             }
@@ -4382,26 +5250,29 @@
         "node_modules/prr": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-            "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
+            "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==",
             "dev": true,
+            "license": "MIT",
             "optional": true
         },
         "node_modules/punycode": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-            "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+            "version": "2.3.1",
+            "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+            "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=6"
             }
         },
         "node_modules/qs": {
-            "version": "6.10.3",
-            "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
-            "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
+            "version": "6.14.2",
+            "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.2.tgz",
+            "integrity": "sha512-V/yCWTTF7VJ9hIh18Ugr2zhJMP01MY7c5kh4J870L7imm6/DIzBsNLTXzMwUA3yZ5b/KBqLx8Kp3uRvd7xSe3Q==",
             "dev": true,
+            "license": "BSD-3-Clause",
             "dependencies": {
-                "side-channel": "^1.0.4"
+                "side-channel": "^1.1.0"
             },
             "engines": {
                 "node": ">=0.6"
@@ -4428,13 +5299,15 @@
                     "type": "consulting",
                     "url": "https://feross.org/support"
                 }
-            ]
+            ],
+            "license": "MIT"
         },
         "node_modules/raw-body": {
             "version": "1.1.7",
             "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz",
-            "integrity": "sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=",
+            "integrity": "sha512-WmJJU2e9Y6M5UzTOkHaM7xJGAPQD8PNzx3bAd2+uhZAim6wDk6dAZxPVYLF67XhbR4hmKGh33Lpmh4XWrCH5Mg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "bytes": "1",
                 "string_decoder": "0.10"
@@ -4448,6 +5321,7 @@
             "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
             "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "picomatch": "^2.2.1"
             },
@@ -4460,6 +5334,7 @@
             "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz",
             "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "resolve": "^1.9.0"
             },
@@ -4467,11 +5342,31 @@
                 "node": ">= 0.10"
             }
         },
+        "node_modules/regexp.prototype.flags": {
+            "version": "1.5.2",
+            "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
+            "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.6",
+                "define-properties": "^1.2.1",
+                "es-errors": "^1.3.0",
+                "set-function-name": "^2.0.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/regexpp": {
             "version": "3.2.0",
             "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
             "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             },
@@ -4484,6 +5379,7 @@
             "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
             "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -4493,6 +5389,7 @@
             "resolved": "https://registry.npmjs.org/requirefresh/-/requirefresh-4.13.0.tgz",
             "integrity": "sha512-APrzWWxqnwE2Bz3ysFepAU0Dc0aYjn8jsDLFIegedn+KVCS9LykAclkf+6YaJXk3ON9l6QAm04rN+bEA89cGIg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=10"
             },
@@ -4501,12 +5398,13 @@
             }
         },
         "node_modules/resolve": {
-            "version": "1.22.0",
-            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
-            "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
+            "version": "1.22.8",
+            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+            "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "is-core-module": "^2.8.1",
+                "is-core-module": "^2.13.0",
                 "path-parse": "^1.0.7",
                 "supports-preserve-symlinks-flag": "^1.0.0"
             },
@@ -4520,8 +5418,9 @@
         "node_modules/resolve-dir": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
-            "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
+            "integrity": "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "expand-tilde": "^2.0.0",
                 "global-modules": "^1.0.0"
@@ -4535,6 +5434,7 @@
             "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
             "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=4"
             }
@@ -4544,6 +5444,7 @@
             "resolved": "https://registry.npmjs.org/resolve-pkg/-/resolve-pkg-2.0.0.tgz",
             "integrity": "sha512-+1lzwXehGCXSeryaISr6WujZzowloigEofRB+dj75y9RRa/obVcYgbHJd53tdYw8pvZj8GojXaaENws8Ktw/hQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "resolve-from": "^5.0.0"
             },
@@ -4556,6 +5457,7 @@
             "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
             "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
@@ -4563,8 +5465,9 @@
         "node_modules/restore-cursor": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-            "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+            "integrity": "sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "onetime": "^2.0.0",
                 "signal-exit": "^3.0.2"
@@ -4578,6 +5481,7 @@
             "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
             "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "iojs": ">=1.0.0",
                 "node": ">=0.10.0"
@@ -4587,7 +5491,9 @@
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
             "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+            "deprecated": "Rimraf versions prior to v4 are no longer supported",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "glob": "^7.1.3"
             },
@@ -4603,6 +5509,7 @@
             "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
             "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.12.0"
             }
@@ -4626,6 +5533,7 @@
                     "url": "https://feross.org/support"
                 }
             ],
+            "license": "MIT",
             "dependencies": {
                 "queue-microtask": "^1.2.2"
             }
@@ -4635,6 +5543,7 @@
             "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
             "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
             "dev": true,
+            "license": "Apache-2.0",
             "dependencies": {
                 "tslib": "^1.9.0"
             },
@@ -4642,6 +5551,25 @@
                 "npm": ">=2.0.0"
             }
         },
+        "node_modules/safe-array-concat": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz",
+            "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.7",
+                "get-intrinsic": "^1.2.4",
+                "has-symbols": "^1.0.3",
+                "isarray": "^2.0.5"
+            },
+            "engines": {
+                "node": ">=0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/safe-buffer": {
             "version": "5.2.1",
             "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -4660,19 +5588,39 @@
                     "type": "consulting",
                     "url": "https://feross.org/support"
                 }
-            ]
+            ],
+            "license": "MIT"
         },
         "node_modules/safe-json-parse": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-1.0.1.tgz",
-            "integrity": "sha1-PnZyPjjf3aE8mx0poeB//uSzC1c=",
+            "integrity": "sha512-o0JmTu17WGUaUOHa1l0FPGXKBfijbxK6qoHzlkihsDXxzBHvJcA7zgviKR92Xs841rX9pK16unfphLq0/KqX7A==",
             "dev": true
         },
+        "node_modules/safe-regex-test": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz",
+            "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.6",
+                "es-errors": "^1.3.0",
+                "is-regex": "^1.1.4"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/safefs": {
             "version": "6.16.0",
             "resolved": "https://registry.npmjs.org/safefs/-/safefs-6.16.0.tgz",
             "integrity": "sha512-IUIN5h+r2acNVkbsM5VoBUsRnaSFwQFZnzyvQsiLlgFsncLi7rrtmM4FsEgwv+xDTJzsrp79rd+/GJu2zWcR9w==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "graceful-fs": "^4.2.6"
             },
@@ -4687,16 +5635,15 @@
             "version": "2.1.2",
             "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
             "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/semver": {
-            "version": "7.3.7",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-            "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+            "version": "7.6.2",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
+            "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
             "dev": true,
-            "dependencies": {
-                "lru-cache": "^6.0.0"
-            },
+            "license": "ISC",
             "bin": {
                 "semver": "bin/semver.js"
             },
@@ -4704,11 +5651,46 @@
                 "node": ">=10"
             }
         },
+        "node_modules/set-function-length": {
+            "version": "1.2.2",
+            "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+            "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "define-data-property": "^1.1.4",
+                "es-errors": "^1.3.0",
+                "function-bind": "^1.1.2",
+                "get-intrinsic": "^1.2.4",
+                "gopd": "^1.0.1",
+                "has-property-descriptors": "^1.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/set-function-name": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
+            "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "define-data-property": "^1.1.4",
+                "es-errors": "^1.3.0",
+                "functions-have-names": "^1.2.3",
+                "has-property-descriptors": "^1.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
         "node_modules/shebang-command": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
             "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "shebang-regex": "^3.0.0"
             },
@@ -4721,19 +5703,82 @@
             "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
             "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
         },
         "node_modules/side-channel": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-            "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
+            "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "es-errors": "^1.3.0",
+                "object-inspect": "^1.13.3",
+                "side-channel-list": "^1.0.0",
+                "side-channel-map": "^1.0.1",
+                "side-channel-weakmap": "^1.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/side-channel-list": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
+            "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "es-errors": "^1.3.0",
+                "object-inspect": "^1.13.3"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/side-channel-map": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
+            "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bound": "^1.0.2",
+                "es-errors": "^1.3.0",
+                "get-intrinsic": "^1.2.5",
+                "object-inspect": "^1.13.3"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/side-channel-weakmap": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
+            "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "call-bind": "^1.0.0",
-                "get-intrinsic": "^1.0.2",
-                "object-inspect": "^1.9.0"
+                "call-bound": "^1.0.2",
+                "es-errors": "^1.3.0",
+                "get-intrinsic": "^1.2.5",
+                "object-inspect": "^1.13.3",
+                "side-channel-map": "^1.0.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
             },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
@@ -4743,13 +5788,15 @@
             "version": "3.0.7",
             "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
             "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-            "dev": true
+            "dev": true,
+            "license": "ISC"
         },
         "node_modules/slash": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
             "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
@@ -4759,6 +5806,7 @@
             "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
             "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^4.0.0",
                 "astral-regex": "^2.0.0",
@@ -4776,6 +5824,7 @@
             "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
             "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
             "dev": true,
+            "license": "BSD-3-Clause",
             "optional": true,
             "engines": {
                 "node": ">=0.10.0"
@@ -4784,19 +5833,21 @@
         "node_modules/sprintf-js": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-            "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-            "dev": true
+            "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+            "dev": true,
+            "license": "BSD-3-Clause"
         },
         "node_modules/string_decoder": {
             "version": "0.10.31",
             "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-            "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-            "dev": true
+            "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/string-template": {
             "version": "0.2.1",
             "resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz",
-            "integrity": "sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=",
+            "integrity": "sha512-Yptehjogou2xm4UJbxJ4CxgZx12HBfeystp0y3x7s4Dj32ltVVG1Gg8YhKjHZkHicuKpZX/ffilA8505VbUbpw==",
             "dev": true
         },
         "node_modules/string-width": {
@@ -4804,6 +5855,7 @@
             "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
             "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "emoji-regex": "^8.0.0",
                 "is-fullwidth-code-point": "^3.0.0",
@@ -4813,27 +5865,53 @@
                 "node": ">=8"
             }
         },
+        "node_modules/string.prototype.trim": {
+            "version": "1.2.9",
+            "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz",
+            "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.7",
+                "define-properties": "^1.2.1",
+                "es-abstract": "^1.23.0",
+                "es-object-atoms": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/string.prototype.trimend": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
-            "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
+            "version": "1.0.8",
+            "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz",
+            "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "call-bind": "^1.0.2",
-                "define-properties": "^1.1.3"
+                "call-bind": "^1.0.7",
+                "define-properties": "^1.2.1",
+                "es-object-atoms": "^1.0.0"
             },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
         "node_modules/string.prototype.trimstart": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
-            "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
+            "version": "1.0.8",
+            "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
+            "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "call-bind": "^1.0.2",
-                "define-properties": "^1.1.3"
+                "call-bind": "^1.0.7",
+                "define-properties": "^1.2.1",
+                "es-object-atoms": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
             },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
@@ -4844,6 +5922,7 @@
             "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
             "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ansi-regex": "^5.0.1"
             },
@@ -4854,8 +5933,9 @@
         "node_modules/strip-bom": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-            "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+            "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=4"
             }
@@ -4865,6 +5945,7 @@
             "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
             "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             },
@@ -4877,6 +5958,7 @@
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
             "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-flag": "^4.0.0"
             },
@@ -4889,6 +5971,7 @@
             "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
             "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">= 0.4"
             },
@@ -4897,10 +5980,11 @@
             }
         },
         "node_modules/table": {
-            "version": "6.8.0",
-            "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
-            "integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
+            "version": "6.8.2",
+            "resolved": "https://registry.npmjs.org/table/-/table-6.8.2.tgz",
+            "integrity": "sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA==",
             "dev": true,
+            "license": "BSD-3-Clause",
             "dependencies": {
                 "ajv": "^8.0.1",
                 "lodash.truncate": "^4.4.2",
@@ -4913,15 +5997,16 @@
             }
         },
         "node_modules/table/node_modules/ajv": {
-            "version": "8.11.0",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-            "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+            "version": "8.16.0",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.16.0.tgz",
+            "integrity": "sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "fast-deep-equal": "^3.1.1",
+                "fast-deep-equal": "^3.1.3",
                 "json-schema-traverse": "^1.0.0",
                 "require-from-string": "^2.0.2",
-                "uri-js": "^4.2.2"
+                "uri-js": "^4.4.1"
             },
             "funding": {
                 "type": "github",
@@ -4932,25 +6017,29 @@
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
             "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/text-table": {
             "version": "0.2.0",
             "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-            "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-            "dev": true
+            "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/through": {
             "version": "2.3.8",
             "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-            "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-            "dev": true
+            "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/tiny-lr": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz",
             "integrity": "sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "body": "^5.1.0",
                 "debug": "^3.1.0",
@@ -4965,6 +6054,7 @@
             "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
             "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "ms": "^2.1.1"
             }
@@ -4974,6 +6064,7 @@
             "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
             "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "os-tmpdir": "~1.0.2"
             },
@@ -4986,6 +6077,7 @@
             "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
             "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "is-number": "^7.0.0"
             },
@@ -4994,13 +6086,14 @@
             }
         },
         "node_modules/tsconfig-paths": {
-            "version": "3.14.1",
-            "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-            "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
+            "version": "3.15.0",
+            "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
+            "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "@types/json5": "^0.0.29",
-                "json5": "^1.0.1",
+                "json5": "^1.0.2",
                 "minimist": "^1.2.6",
                 "strip-bom": "^3.0.0"
             }
@@ -5009,13 +6102,15 @@
             "version": "1.14.1",
             "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
             "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-            "dev": true
+            "dev": true,
+            "license": "0BSD"
         },
         "node_modules/tsutils": {
             "version": "3.21.0",
             "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
             "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "tslib": "^1.8.1"
             },
@@ -5031,6 +6126,7 @@
             "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
             "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "prelude-ls": "^1.2.1"
             },
@@ -5043,6 +6139,7 @@
             "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
             "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
             "dev": true,
+            "license": "(MIT OR CC0-1.0)",
             "engines": {
                 "node": ">=10"
             },
@@ -5055,6 +6152,7 @@
             "resolved": "https://registry.npmjs.org/typechecker/-/typechecker-6.4.0.tgz",
             "integrity": "sha512-EbOu+9szY13mhl0EsvLXnR+pTCa3gTHQQPLdce72ujcC9fRHXlVFBNXtHeRhgzLxLlKUh4zA9C0tezLDgshf+A==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             },
@@ -5062,25 +6160,104 @@
                 "url": "https://bevry.me/fund"
             }
         },
+        "node_modules/typed-array-buffer": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz",
+            "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.7",
+                "es-errors": "^1.3.0",
+                "is-typed-array": "^1.1.13"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/typed-array-byte-length": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz",
+            "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.7",
+                "for-each": "^0.3.3",
+                "gopd": "^1.0.1",
+                "has-proto": "^1.0.3",
+                "is-typed-array": "^1.1.13"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/typed-array-byte-offset": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz",
+            "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "available-typed-arrays": "^1.0.7",
+                "call-bind": "^1.0.7",
+                "for-each": "^0.3.3",
+                "gopd": "^1.0.1",
+                "has-proto": "^1.0.3",
+                "is-typed-array": "^1.1.13"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/typed-array-length": {
+            "version": "1.0.6",
+            "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz",
+            "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.7",
+                "for-each": "^0.3.3",
+                "gopd": "^1.0.1",
+                "has-proto": "^1.0.3",
+                "is-typed-array": "^1.1.13",
+                "possible-typed-array-names": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/typescript": {
-            "version": "4.6.3",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz",
-            "integrity": "sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==",
+            "version": "5.5.3",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz",
+            "integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==",
             "dev": true,
+            "license": "Apache-2.0",
             "peer": true,
             "bin": {
                 "tsc": "bin/tsc",
                 "tsserver": "bin/tsserver"
             },
             "engines": {
-                "node": ">=4.2.0"
+                "node": ">=14.17"
             }
         },
         "node_modules/uglify-js": {
-            "version": "3.15.4",
-            "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.4.tgz",
-            "integrity": "sha512-vMOPGDuvXecPs34V74qDKk4iJ/SN4vL3Ow/23ixafENYvtrNvtbcgUeugTcUGRGsOF/5fU8/NYSL5Hyb3l1OJA==",
+            "version": "3.18.0",
+            "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.18.0.tgz",
+            "integrity": "sha512-SyVVbcNBCk0dzr9XL/R/ySrmYf0s372K6/hFklzgcp2lBFyXtw4I7BOdDjlLhE1aVqaI/SHWXWmYdlZxuyF38A==",
             "dev": true,
+            "license": "BSD-2-Clause",
             "bin": {
                 "uglifyjs": "bin/uglifyjs"
             },
@@ -5089,14 +6266,15 @@
             }
         },
         "node_modules/unbox-primitive": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
-            "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+            "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "function-bind": "^1.1.1",
-                "has-bigints": "^1.0.1",
-                "has-symbols": "^1.0.2",
+                "call-bind": "^1.0.2",
+                "has-bigints": "^1.0.2",
+                "has-symbols": "^1.0.3",
                 "which-boxed-primitive": "^1.0.2"
             },
             "funding": {
@@ -5106,8 +6284,9 @@
         "node_modules/unc-path-regex": {
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
-            "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
+            "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -5117,6 +6296,7 @@
             "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.6.tgz",
             "integrity": "sha512-VoC83HWXmCrF6rgkyxS9GHv8W9Q5nhMKho+OadDJGzL2oDYbYEppBaCMH6pFlwLeqj2QS+hhkw2kpXkSdD1JxQ==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "sprintf-js": "^1.1.1",
                 "util-deprecate": "^1.0.2"
@@ -5126,16 +6306,18 @@
             }
         },
         "node_modules/underscore.string/node_modules/sprintf-js": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
-            "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
-            "dev": true
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+            "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
+            "dev": true,
+            "license": "BSD-3-Clause"
         },
         "node_modules/uri-js": {
             "version": "4.4.1",
             "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
             "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
             "dev": true,
+            "license": "BSD-2-Clause",
             "dependencies": {
                 "punycode": "^2.1.0"
             }
@@ -5143,8 +6325,9 @@
         "node_modules/uri-path": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/uri-path/-/uri-path-1.0.0.tgz",
-            "integrity": "sha1-l0fwGDWJM8Md4PzP2C0TjmcmLjI=",
+            "integrity": "sha512-8pMuAn4KacYdGMkFaoQARicp4HSw24/DHOVKWqVRJ8LhhAwPPFpdGvdL9184JVmUwe7vz7Z9n6IqI6t5n2ELdg==",
             "dev": true,
+            "license": "WTFPL OR MIT",
             "engines": {
                 "node": ">= 0.10"
             }
@@ -5152,20 +6335,23 @@
         "node_modules/util-deprecate": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-            "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-            "dev": true
+            "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/v8-compile-cache": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-            "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-            "dev": true
+            "version": "2.4.0",
+            "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz",
+            "integrity": "sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/v8flags": {
             "version": "3.2.0",
             "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
             "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "homedir-polyfill": "^1.0.1"
             },
@@ -5178,6 +6364,7 @@
             "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
             "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
             "dev": true,
+            "license": "Apache-2.0",
             "dependencies": {
                 "http-parser-js": ">=0.5.1",
                 "safe-buffer": ">=5.1.0",
@@ -5192,6 +6379,7 @@
             "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
             "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
             "dev": true,
+            "license": "Apache-2.0",
             "engines": {
                 "node": ">=0.8.0"
             }
@@ -5201,6 +6389,7 @@
             "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
             "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
             "dev": true,
+            "license": "ISC",
             "dependencies": {
                 "isexe": "^2.0.0"
             },
@@ -5216,6 +6405,7 @@
             "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
             "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "is-bigint": "^1.0.1",
                 "is-boolean-object": "^1.1.0",
@@ -5227,11 +6417,32 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
+        "node_modules/which-typed-array": {
+            "version": "1.1.15",
+            "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz",
+            "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "available-typed-arrays": "^1.0.7",
+                "call-bind": "^1.0.7",
+                "for-each": "^0.3.3",
+                "gopd": "^1.0.1",
+                "has-tostringtag": "^1.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/word-wrap": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-            "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+            "version": "1.2.5",
+            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+            "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -5239,3932 +6450,22 @@
         "node_modules/wrappy": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-            "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-            "dev": true
+            "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+            "dev": true,
+            "license": "ISC"
         },
         "node_modules/write": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
             "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "mkdirp": "^0.5.1"
             },
             "engines": {
                 "node": ">=4"
             }
-        },
-        "node_modules/write/node_modules/mkdirp": {
-            "version": "0.5.6",
-            "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-            "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-            "dev": true,
-            "dependencies": {
-                "minimist": "^1.2.6"
-            },
-            "bin": {
-                "mkdirp": "bin/cmd.js"
-            }
-        },
-        "node_modules/yallist": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-            "dev": true
-        }
-    },
-    "dependencies": {
-        "@babel/code-frame": {
-            "version": "7.12.11",
-            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
-            "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
-            "dev": true,
-            "requires": {
-                "@babel/highlight": "^7.10.4"
-            }
-        },
-        "@babel/helper-validator-identifier": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-            "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-            "dev": true
-        },
-        "@babel/highlight": {
-            "version": "7.17.9",
-            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
-            "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-validator-identifier": "^7.16.7",
-                "chalk": "^2.0.0",
-                "js-tokens": "^4.0.0"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "3.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-                    "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^1.9.0"
-                    }
-                },
-                "chalk": {
-                    "version": "2.4.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-                    "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^3.2.1",
-                        "escape-string-regexp": "^1.0.5",
-                        "supports-color": "^5.3.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "1.9.3",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-                    "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "1.1.3"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.3",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-                    "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-                    "dev": true
-                },
-                "escape-string-regexp": {
-                    "version": "1.0.5",
-                    "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-                    "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-                    "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "5.5.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-                    "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^3.0.0"
-                    }
-                }
-            }
-        },
-        "@eslint/eslintrc": {
-            "version": "0.4.3",
-            "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
-            "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
-            "dev": true,
-            "requires": {
-                "ajv": "^6.12.4",
-                "debug": "^4.1.1",
-                "espree": "^7.3.0",
-                "globals": "^13.9.0",
-                "ignore": "^4.0.6",
-                "import-fresh": "^3.2.1",
-                "js-yaml": "^3.13.1",
-                "minimatch": "^3.0.4",
-                "strip-json-comments": "^3.1.1"
-            }
-        },
-        "@humanwhocodes/config-array": {
-            "version": "0.5.0",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
-            "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
-            "dev": true,
-            "requires": {
-                "@humanwhocodes/object-schema": "^1.2.0",
-                "debug": "^4.1.1",
-                "minimatch": "^3.0.4"
-            }
-        },
-        "@humanwhocodes/object-schema": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-            "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
-            "dev": true
-        },
-        "@nodelib/fs.scandir": {
-            "version": "2.1.5",
-            "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-            "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-            "dev": true,
-            "requires": {
-                "@nodelib/fs.stat": "2.0.5",
-                "run-parallel": "^1.1.9"
-            }
-        },
-        "@nodelib/fs.stat": {
-            "version": "2.0.5",
-            "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-            "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-            "dev": true
-        },
-        "@nodelib/fs.walk": {
-            "version": "1.2.8",
-            "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-            "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-            "dev": true,
-            "requires": {
-                "@nodelib/fs.scandir": "2.1.5",
-                "fastq": "^1.6.0"
-            }
-        },
-        "@types/json-schema": {
-            "version": "7.0.11",
-            "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
-            "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
-            "dev": true
-        },
-        "@types/json5": {
-            "version": "0.0.29",
-            "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-            "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
-            "dev": true
-        },
-        "@types/minimatch": {
-            "version": "3.0.5",
-            "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
-            "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
-            "dev": true
-        },
-        "@typescript-eslint/scope-manager": {
-            "version": "5.20.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.20.0.tgz",
-            "integrity": "sha512-h9KtuPZ4D/JuX7rpp1iKg3zOH0WNEa+ZIXwpW/KWmEFDxlA/HSfCMhiyF1HS/drTICjIbpA6OqkAhrP/zkCStg==",
-            "dev": true,
-            "requires": {
-                "@typescript-eslint/types": "5.20.0",
-                "@typescript-eslint/visitor-keys": "5.20.0"
-            }
-        },
-        "@typescript-eslint/types": {
-            "version": "5.20.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.20.0.tgz",
-            "integrity": "sha512-+d8wprF9GyvPwtoB4CxBAR/s0rpP25XKgnOvMf/gMXYDvlUC3rPFHupdTQ/ow9vn7UDe5rX02ovGYQbv/IUCbg==",
-            "dev": true
-        },
-        "@typescript-eslint/typescript-estree": {
-            "version": "5.20.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.20.0.tgz",
-            "integrity": "sha512-36xLjP/+bXusLMrT9fMMYy1KJAGgHhlER2TqpUVDYUQg4w0q/NW/sg4UGAgVwAqb8V4zYg43KMUpM8vV2lve6w==",
-            "dev": true,
-            "requires": {
-                "@typescript-eslint/types": "5.20.0",
-                "@typescript-eslint/visitor-keys": "5.20.0",
-                "debug": "^4.3.2",
-                "globby": "^11.0.4",
-                "is-glob": "^4.0.3",
-                "semver": "^7.3.5",
-                "tsutils": "^3.21.0"
-            }
-        },
-        "@typescript-eslint/utils": {
-            "version": "5.20.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.20.0.tgz",
-            "integrity": "sha512-lHONGJL1LIO12Ujyx8L8xKbwWSkoUKFSO+0wDAqGXiudWB2EO7WEUT+YZLtVbmOmSllAjLb9tpoIPwpRe5Tn6w==",
-            "dev": true,
-            "requires": {
-                "@types/json-schema": "^7.0.9",
-                "@typescript-eslint/scope-manager": "5.20.0",
-                "@typescript-eslint/types": "5.20.0",
-                "@typescript-eslint/typescript-estree": "5.20.0",
-                "eslint-scope": "^5.1.1",
-                "eslint-utils": "^3.0.0"
-            },
-            "dependencies": {
-                "eslint-utils": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-                    "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-                    "dev": true,
-                    "requires": {
-                        "eslint-visitor-keys": "^2.0.0"
-                    }
-                }
-            }
-        },
-        "@typescript-eslint/visitor-keys": {
-            "version": "5.20.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.20.0.tgz",
-            "integrity": "sha512-1flRpNF+0CAQkMNlTJ6L/Z5jiODG/e5+7mk6XwtPOUS3UrTz3UOiAg9jG2VtKsWI6rZQfy4C6a232QNRZTRGlg==",
-            "dev": true,
-            "requires": {
-                "@typescript-eslint/types": "5.20.0",
-                "eslint-visitor-keys": "^3.0.0"
-            },
-            "dependencies": {
-                "eslint-visitor-keys": {
-                    "version": "3.3.0",
-                    "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-                    "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-                    "dev": true
-                }
-            }
-        },
-        "abbrev": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-            "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-            "dev": true
-        },
-        "acorn": {
-            "version": "7.4.1",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-            "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-            "dev": true
-        },
-        "acorn-jsx": {
-            "version": "5.3.2",
-            "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-            "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-            "dev": true,
-            "requires": {}
-        },
-        "ajv": {
-            "version": "6.12.6",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-            "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-            "dev": true,
-            "requires": {
-                "fast-deep-equal": "^3.1.1",
-                "fast-json-stable-stringify": "^2.0.0",
-                "json-schema-traverse": "^0.4.1",
-                "uri-js": "^4.2.2"
-            }
-        },
-        "ansi-colors": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-            "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-            "dev": true
-        },
-        "ansi-escapes": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
-            "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
-            "dev": true
-        },
-        "ansi-regex": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-            "dev": true
-        },
-        "ansi-styles": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-            "dev": true,
-            "requires": {
-                "color-convert": "^2.0.1"
-            }
-        },
-        "anymatch": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-            "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-            "dev": true,
-            "requires": {
-                "normalize-path": "^3.0.0",
-                "picomatch": "^2.0.4"
-            }
-        },
-        "argparse": {
-            "version": "1.0.10",
-            "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-            "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-            "dev": true,
-            "requires": {
-                "sprintf-js": "~1.0.2"
-            }
-        },
-        "array-differ": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz",
-            "integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==",
-            "dev": true
-        },
-        "array-each": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
-            "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
-            "dev": true
-        },
-        "array-includes": {
-            "version": "3.1.4",
-            "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.4.tgz",
-            "integrity": "sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==",
-            "dev": true,
-            "requires": {
-                "call-bind": "^1.0.2",
-                "define-properties": "^1.1.3",
-                "es-abstract": "^1.19.1",
-                "get-intrinsic": "^1.1.1",
-                "is-string": "^1.0.7"
-            }
-        },
-        "array-slice": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
-            "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
-            "dev": true
-        },
-        "array-union": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-            "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-            "dev": true
-        },
-        "array.prototype.flat": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
-            "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
-            "dev": true,
-            "requires": {
-                "call-bind": "^1.0.2",
-                "define-properties": "^1.1.3",
-                "es-abstract": "^1.19.2",
-                "es-shim-unscopables": "^1.0.0"
-            }
-        },
-        "arrify": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
-            "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
-            "dev": true
-        },
-        "astral-regex": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-            "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-            "dev": true
-        },
-        "async": {
-            "version": "3.2.3",
-            "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
-            "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==",
-            "dev": true
-        },
-        "balanced-match": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-            "dev": true
-        },
-        "binary-extensions": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-            "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-            "dev": true
-        },
-        "body": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
-            "integrity": "sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=",
-            "dev": true,
-            "requires": {
-                "continuable-cache": "^0.3.1",
-                "error": "^7.0.0",
-                "raw-body": "~1.1.0",
-                "safe-json-parse": "~1.0.1"
-            }
-        },
-        "brace-expansion": {
-            "version": "1.1.11",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-            "dev": true,
-            "requires": {
-                "balanced-match": "^1.0.0",
-                "concat-map": "0.0.1"
-            }
-        },
-        "braces": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-            "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-            "dev": true,
-            "requires": {
-                "fill-range": "^7.0.1"
-            }
-        },
-        "bytes": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz",
-            "integrity": "sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=",
-            "dev": true
-        },
-        "call-bind": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-            "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-            "dev": true,
-            "requires": {
-                "function-bind": "^1.1.1",
-                "get-intrinsic": "^1.0.2"
-            }
-        },
-        "callsites": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-            "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-            "dev": true
-        },
-        "chalk": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-            "dev": true,
-            "requires": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-            }
-        },
-        "chardet": {
-            "version": "0.7.0",
-            "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-            "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
-            "dev": true
-        },
-        "chokidar": {
-            "version": "3.5.3",
-            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-            "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-            "dev": true,
-            "requires": {
-                "anymatch": "~3.1.2",
-                "braces": "~3.0.2",
-                "fsevents": "~2.3.2",
-                "glob-parent": "~5.1.2",
-                "is-binary-path": "~2.1.0",
-                "is-glob": "~4.0.1",
-                "normalize-path": "~3.0.0",
-                "readdirp": "~3.6.0"
-            }
-        },
-        "cli-cursor": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-            "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
-            "dev": true,
-            "requires": {
-                "restore-cursor": "^2.0.0"
-            }
-        },
-        "cli-width": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
-            "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==",
-            "dev": true
-        },
-        "coffeescript": {
-            "version": "1.12.7",
-            "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-1.12.7.tgz",
-            "integrity": "sha512-pLXHFxQMPklVoEekowk8b3erNynC+DVJzChxS/LCBBgR6/8AJkHivkm//zbowcfc7BTCAjryuhx6gPqPRfsFoA==",
-            "dev": true
-        },
-        "color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "requires": {
-                "color-name": "~1.1.4"
-            }
-        },
-        "color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true
-        },
-        "colors": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-            "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
-            "dev": true
-        },
-        "concat-map": {
-            "version": "0.0.1",
-            "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-            "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-            "dev": true
-        },
-        "continuable-cache": {
-            "version": "0.3.1",
-            "resolved": "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz",
-            "integrity": "sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=",
-            "dev": true
-        },
-        "copy-anything": {
-            "version": "2.0.6",
-            "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz",
-            "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==",
-            "dev": true,
-            "requires": {
-                "is-what": "^3.14.1"
-            }
-        },
-        "cross-spawn": {
-            "version": "7.0.3",
-            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-            "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-            "dev": true,
-            "requires": {
-                "path-key": "^3.1.0",
-                "shebang-command": "^2.0.0",
-                "which": "^2.0.1"
-            }
-        },
-        "cson": {
-            "version": "7.20.0",
-            "resolved": "https://registry.npmjs.org/cson/-/cson-7.20.0.tgz",
-            "integrity": "sha512-K7g/86vC77mJqi6PRFhd3p8U/y0R6SsCeTJb5RpOAaQdApHxCoK5JwfZ8WeJjpOZ6lyyi8tNvh3UuC184H3GWg==",
-            "dev": true,
-            "requires": {
-                "cson-parser": "^4.0.5",
-                "extract-opts": "^4.3.0",
-                "requirefresh": "^4.12.0",
-                "safefs": "^6.12.0"
-            }
-        },
-        "cson-parser": {
-            "version": "4.0.9",
-            "resolved": "https://registry.npmjs.org/cson-parser/-/cson-parser-4.0.9.tgz",
-            "integrity": "sha512-I79SAcCYquWnEfXYj8hBqOOWKj6eH6zX1hhX3yqmS4K3bYp7jME3UFpHPzu3rUew0oyfc0s8T6IlWGXRAheHag==",
-            "dev": true,
-            "requires": {
-                "coffeescript": "1.12.7"
-            }
-        },
-        "dateformat": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
-            "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
-            "dev": true
-        },
-        "debug": {
-            "version": "4.3.4",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-            "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-            "dev": true,
-            "requires": {
-                "ms": "2.1.2"
-            }
-        },
-        "deep-is": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-            "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-            "dev": true
-        },
-        "define-properties": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-            "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-            "dev": true,
-            "requires": {
-                "has-property-descriptors": "^1.0.0",
-                "object-keys": "^1.1.1"
-            }
-        },
-        "detect-file": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
-            "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
-            "dev": true
-        },
-        "dir-glob": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-            "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-            "dev": true,
-            "requires": {
-                "path-type": "^4.0.0"
-            }
-        },
-        "doctrine": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-            "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-            "dev": true,
-            "requires": {
-                "esutils": "^2.0.2"
-            }
-        },
-        "duplexer": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
-            "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
-            "dev": true
-        },
-        "eachr": {
-            "version": "4.5.0",
-            "resolved": "https://registry.npmjs.org/eachr/-/eachr-4.5.0.tgz",
-            "integrity": "sha512-9I664RWp6p8jvcHZIwo7bWaiSaUmA1wNSLKwNZEiaYjqiTARq3cGjyRiIunsopZv4QMmX3T5Hs17QoPAzdYxfg==",
-            "dev": true,
-            "requires": {
-                "typechecker": "^6.2.0"
-            }
-        },
-        "emoji-regex": {
-            "version": "8.0.0",
-            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-            "dev": true
-        },
-        "enquirer": {
-            "version": "2.3.6",
-            "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-            "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-            "dev": true,
-            "requires": {
-                "ansi-colors": "^4.1.1"
-            }
-        },
-        "errno": {
-            "version": "0.1.8",
-            "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
-            "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
-            "dev": true,
-            "optional": true,
-            "requires": {
-                "prr": "~1.0.1"
-            }
-        },
-        "error": {
-            "version": "7.2.1",
-            "resolved": "https://registry.npmjs.org/error/-/error-7.2.1.tgz",
-            "integrity": "sha512-fo9HBvWnx3NGUKMvMwB/CBCMMrfEJgbDTVDEkPygA3Bdd3lM1OyCd+rbQ8BwnpF6GdVeOLDNmyL4N5Bg80ZvdA==",
-            "dev": true,
-            "requires": {
-                "string-template": "~0.2.1"
-            }
-        },
-        "es-abstract": {
-            "version": "1.19.5",
-            "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.5.tgz",
-            "integrity": "sha512-Aa2G2+Rd3b6kxEUKTF4TaW67czBLyAv3z7VOhYRU50YBx+bbsYZ9xQP4lMNazePuFlybXI0V4MruPos7qUo5fA==",
-            "dev": true,
-            "requires": {
-                "call-bind": "^1.0.2",
-                "es-to-primitive": "^1.2.1",
-                "function-bind": "^1.1.1",
-                "get-intrinsic": "^1.1.1",
-                "get-symbol-description": "^1.0.0",
-                "has": "^1.0.3",
-                "has-symbols": "^1.0.3",
-                "internal-slot": "^1.0.3",
-                "is-callable": "^1.2.4",
-                "is-negative-zero": "^2.0.2",
-                "is-regex": "^1.1.4",
-                "is-shared-array-buffer": "^1.0.2",
-                "is-string": "^1.0.7",
-                "is-weakref": "^1.0.2",
-                "object-inspect": "^1.12.0",
-                "object-keys": "^1.1.1",
-                "object.assign": "^4.1.2",
-                "string.prototype.trimend": "^1.0.4",
-                "string.prototype.trimstart": "^1.0.4",
-                "unbox-primitive": "^1.0.1"
-            }
-        },
-        "es-shim-unscopables": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-            "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
-            "dev": true,
-            "requires": {
-                "has": "^1.0.3"
-            }
-        },
-        "es-to-primitive": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-            "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-            "dev": true,
-            "requires": {
-                "is-callable": "^1.1.4",
-                "is-date-object": "^1.0.1",
-                "is-symbol": "^1.0.2"
-            }
-        },
-        "escape-string-regexp": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-            "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-            "dev": true
-        },
-        "eslint": {
-            "version": "7.32.0",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
-            "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
-            "dev": true,
-            "requires": {
-                "@babel/code-frame": "7.12.11",
-                "@eslint/eslintrc": "^0.4.3",
-                "@humanwhocodes/config-array": "^0.5.0",
-                "ajv": "^6.10.0",
-                "chalk": "^4.0.0",
-                "cross-spawn": "^7.0.2",
-                "debug": "^4.0.1",
-                "doctrine": "^3.0.0",
-                "enquirer": "^2.3.5",
-                "escape-string-regexp": "^4.0.0",
-                "eslint-scope": "^5.1.1",
-                "eslint-utils": "^2.1.0",
-                "eslint-visitor-keys": "^2.0.0",
-                "espree": "^7.3.1",
-                "esquery": "^1.4.0",
-                "esutils": "^2.0.2",
-                "fast-deep-equal": "^3.1.3",
-                "file-entry-cache": "^6.0.1",
-                "functional-red-black-tree": "^1.0.1",
-                "glob-parent": "^5.1.2",
-                "globals": "^13.6.0",
-                "ignore": "^4.0.6",
-                "import-fresh": "^3.0.0",
-                "imurmurhash": "^0.1.4",
-                "is-glob": "^4.0.0",
-                "js-yaml": "^3.13.1",
-                "json-stable-stringify-without-jsonify": "^1.0.1",
-                "levn": "^0.4.1",
-                "lodash.merge": "^4.6.2",
-                "minimatch": "^3.0.4",
-                "natural-compare": "^1.4.0",
-                "optionator": "^0.9.1",
-                "progress": "^2.0.0",
-                "regexpp": "^3.1.0",
-                "semver": "^7.2.1",
-                "strip-ansi": "^6.0.0",
-                "strip-json-comments": "^3.1.0",
-                "table": "^6.0.9",
-                "text-table": "^0.2.0",
-                "v8-compile-cache": "^2.0.3"
-            }
-        },
-        "eslint-config-standard": {
-            "version": "16.0.3",
-            "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-16.0.3.tgz",
-            "integrity": "sha512-x4fmJL5hGqNJKGHSjnLdgA6U6h1YW/G2dW9fA+cyVur4SK6lyue8+UgNKWlZtUDTXvgKDD/Oa3GQjmB5kjtVvg==",
-            "dev": true,
-            "requires": {}
-        },
-        "eslint-import-resolver-node": {
-            "version": "0.3.6",
-            "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
-            "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
-            "dev": true,
-            "requires": {
-                "debug": "^3.2.7",
-                "resolve": "^1.20.0"
-            },
-            "dependencies": {
-                "debug": {
-                    "version": "3.2.7",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-                    "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                }
-            }
-        },
-        "eslint-module-utils": {
-            "version": "2.7.3",
-            "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz",
-            "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
-            "dev": true,
-            "requires": {
-                "debug": "^3.2.7",
-                "find-up": "^2.1.0"
-            },
-            "dependencies": {
-                "debug": {
-                    "version": "3.2.7",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-                    "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                }
-            }
-        },
-        "eslint-plugin-es": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz",
-            "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==",
-            "dev": true,
-            "requires": {
-                "eslint-utils": "^2.0.0",
-                "regexpp": "^3.0.0"
-            }
-        },
-        "eslint-plugin-import": {
-            "version": "2.26.0",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
-            "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
-            "dev": true,
-            "requires": {
-                "array-includes": "^3.1.4",
-                "array.prototype.flat": "^1.2.5",
-                "debug": "^2.6.9",
-                "doctrine": "^2.1.0",
-                "eslint-import-resolver-node": "^0.3.6",
-                "eslint-module-utils": "^2.7.3",
-                "has": "^1.0.3",
-                "is-core-module": "^2.8.1",
-                "is-glob": "^4.0.3",
-                "minimatch": "^3.1.2",
-                "object.values": "^1.1.5",
-                "resolve": "^1.22.0",
-                "tsconfig-paths": "^3.14.1"
-            },
-            "dependencies": {
-                "debug": {
-                    "version": "2.6.9",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-                    "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "2.0.0"
-                    }
-                },
-                "doctrine": {
-                    "version": "2.1.0",
-                    "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-                    "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-                    "dev": true,
-                    "requires": {
-                        "esutils": "^2.0.2"
-                    }
-                },
-                "ms": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-                    "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-                    "dev": true
-                }
-            }
-        },
-        "eslint-plugin-jest": {
-            "version": "26.1.4",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-26.1.4.tgz",
-            "integrity": "sha512-wgqxujmqc2qpvZqMFWCh6Cniqc8lWpapvXt9j/19DmBDqeDaYhJrSRezYR1SKyemvjx+9e9kny/dgRahraHImA==",
-            "dev": true,
-            "requires": {
-                "@typescript-eslint/utils": "^5.10.0"
-            }
-        },
-        "eslint-plugin-node": {
-            "version": "11.1.0",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz",
-            "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==",
-            "dev": true,
-            "requires": {
-                "eslint-plugin-es": "^3.0.0",
-                "eslint-utils": "^2.0.0",
-                "ignore": "^5.1.1",
-                "minimatch": "^3.0.4",
-                "resolve": "^1.10.1",
-                "semver": "^6.1.0"
-            },
-            "dependencies": {
-                "ignore": {
-                    "version": "5.2.0",
-                    "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-                    "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-                    "dev": true
-                },
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                    "dev": true
-                }
-            }
-        },
-        "eslint-plugin-promise": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-5.2.0.tgz",
-            "integrity": "sha512-SftLb1pUG01QYq2A/hGAWfDRXqYD82zE7j7TopDOyNdU+7SvvoXREls/+PRTY17vUXzXnZA/zfnyKgRH6x4JJw==",
-            "dev": true,
-            "requires": {}
-        },
-        "eslint-plugin-standard": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-5.0.0.tgz",
-            "integrity": "sha512-eSIXPc9wBM4BrniMzJRBm2uoVuXz2EPa+NXPk2+itrVt+r5SbKFERx/IgrK/HmfjddyKVz2f+j+7gBRvu19xLg==",
-            "dev": true,
-            "requires": {}
-        },
-        "eslint-scope": {
-            "version": "5.1.1",
-            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-            "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-            "dev": true,
-            "requires": {
-                "esrecurse": "^4.3.0",
-                "estraverse": "^4.1.1"
-            }
-        },
-        "eslint-utils": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-            "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
-            "dev": true,
-            "requires": {
-                "eslint-visitor-keys": "^1.1.0"
-            },
-            "dependencies": {
-                "eslint-visitor-keys": {
-                    "version": "1.3.0",
-                    "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-                    "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-                    "dev": true
-                }
-            }
-        },
-        "eslint-visitor-keys": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-            "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-            "dev": true
-        },
-        "espree": {
-            "version": "7.3.1",
-            "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
-            "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
-            "dev": true,
-            "requires": {
-                "acorn": "^7.4.0",
-                "acorn-jsx": "^5.3.1",
-                "eslint-visitor-keys": "^1.3.0"
-            },
-            "dependencies": {
-                "eslint-visitor-keys": {
-                    "version": "1.3.0",
-                    "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-                    "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-                    "dev": true
-                }
-            }
-        },
-        "esprima": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-            "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-            "dev": true
-        },
-        "esquery": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-            "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
-            "dev": true,
-            "requires": {
-                "estraverse": "^5.1.0"
-            },
-            "dependencies": {
-                "estraverse": {
-                    "version": "5.3.0",
-                    "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-                    "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-                    "dev": true
-                }
-            }
-        },
-        "esrecurse": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-            "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-            "dev": true,
-            "requires": {
-                "estraverse": "^5.2.0"
-            },
-            "dependencies": {
-                "estraverse": {
-                    "version": "5.3.0",
-                    "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-                    "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-                    "dev": true
-                }
-            }
-        },
-        "estraverse": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-            "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-            "dev": true
-        },
-        "esutils": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-            "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-            "dev": true
-        },
-        "eventemitter2": {
-            "version": "0.4.14",
-            "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz",
-            "integrity": "sha1-j2G3XN4BKy6esoTUVFWDtWQ7Yas=",
-            "dev": true
-        },
-        "exit": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-            "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
-            "dev": true
-        },
-        "expand-tilde": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-            "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
-            "dev": true,
-            "requires": {
-                "homedir-polyfill": "^1.0.1"
-            }
-        },
-        "extend": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-            "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-            "dev": true
-        },
-        "external-editor": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-            "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
-            "dev": true,
-            "requires": {
-                "chardet": "^0.7.0",
-                "iconv-lite": "^0.4.24",
-                "tmp": "^0.0.33"
-            }
-        },
-        "extract-opts": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/extract-opts/-/extract-opts-4.3.0.tgz",
-            "integrity": "sha512-Dmssi1tgKJkQsVmbP7TgW/kbdc42SAsNf6h9ClweP+dS7O24YYMTXsNwPelxhx0LF15npiWwY5ahKtyQiNgxWA==",
-            "dev": true,
-            "requires": {
-                "eachr": "^4.5.0",
-                "typechecker": "^6.2.0"
-            }
-        },
-        "fast-deep-equal": {
-            "version": "3.1.3",
-            "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-            "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-            "dev": true
-        },
-        "fast-glob": {
-            "version": "3.2.11",
-            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
-            "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
-            "dev": true,
-            "requires": {
-                "@nodelib/fs.stat": "^2.0.2",
-                "@nodelib/fs.walk": "^1.2.3",
-                "glob-parent": "^5.1.2",
-                "merge2": "^1.3.0",
-                "micromatch": "^4.0.4"
-            }
-        },
-        "fast-json-stable-stringify": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-            "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-            "dev": true
-        },
-        "fast-levenshtein": {
-            "version": "2.0.6",
-            "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-            "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-            "dev": true
-        },
-        "fastq": {
-            "version": "1.13.0",
-            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-            "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
-            "dev": true,
-            "requires": {
-                "reusify": "^1.0.4"
-            }
-        },
-        "faye-websocket": {
-            "version": "0.10.0",
-            "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
-            "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
-            "dev": true,
-            "requires": {
-                "websocket-driver": ">=0.5.1"
-            }
-        },
-        "figures": {
-            "version": "1.7.0",
-            "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
-            "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
-            "dev": true,
-            "requires": {
-                "escape-string-regexp": "^1.0.5",
-                "object-assign": "^4.1.0"
-            },
-            "dependencies": {
-                "escape-string-regexp": {
-                    "version": "1.0.5",
-                    "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-                    "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-                    "dev": true
-                }
-            }
-        },
-        "file-entry-cache": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-            "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-            "dev": true,
-            "requires": {
-                "flat-cache": "^3.0.4"
-            }
-        },
-        "fill-range": {
-            "version": "7.0.1",
-            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-            "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-            "dev": true,
-            "requires": {
-                "to-regex-range": "^5.0.1"
-            }
-        },
-        "find-up": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-            "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-            "dev": true,
-            "requires": {
-                "locate-path": "^2.0.0"
-            }
-        },
-        "findup-sync": {
-            "version": "0.3.0",
-            "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz",
-            "integrity": "sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY=",
-            "dev": true,
-            "requires": {
-                "glob": "~5.0.0"
-            },
-            "dependencies": {
-                "glob": {
-                    "version": "5.0.15",
-                    "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-                    "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-                    "dev": true,
-                    "requires": {
-                        "inflight": "^1.0.4",
-                        "inherits": "2",
-                        "minimatch": "2 || 3",
-                        "once": "^1.3.0",
-                        "path-is-absolute": "^1.0.0"
-                    }
-                }
-            }
-        },
-        "fined": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
-            "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
-            "dev": true,
-            "requires": {
-                "expand-tilde": "^2.0.2",
-                "is-plain-object": "^2.0.3",
-                "object.defaults": "^1.1.0",
-                "object.pick": "^1.2.0",
-                "parse-filepath": "^1.0.1"
-            }
-        },
-        "flagged-respawn": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
-            "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
-            "dev": true
-        },
-        "flat-cache": {
-            "version": "3.0.4",
-            "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-            "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-            "dev": true,
-            "requires": {
-                "flatted": "^3.1.0",
-                "rimraf": "^3.0.2"
-            }
-        },
-        "flatted": {
-            "version": "3.2.5",
-            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz",
-            "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==",
-            "dev": true
-        },
-        "for-in": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-            "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-            "dev": true
-        },
-        "for-own": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
-            "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
-            "dev": true,
-            "requires": {
-                "for-in": "^1.0.1"
-            }
-        },
-        "fs.realpath": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-            "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-            "dev": true
-        },
-        "fsevents": {
-            "version": "2.3.2",
-            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-            "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-            "dev": true,
-            "optional": true
-        },
-        "function-bind": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-            "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-            "dev": true
-        },
-        "functional-red-black-tree": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-            "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-            "dev": true
-        },
-        "get-intrinsic": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
-            "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
-            "dev": true,
-            "requires": {
-                "function-bind": "^1.1.1",
-                "has": "^1.0.3",
-                "has-symbols": "^1.0.1"
-            }
-        },
-        "get-symbol-description": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-            "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-            "dev": true,
-            "requires": {
-                "call-bind": "^1.0.2",
-                "get-intrinsic": "^1.1.1"
-            }
-        },
-        "getobject": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/getobject/-/getobject-1.0.2.tgz",
-            "integrity": "sha512-2zblDBaFcb3rB4rF77XVnuINOE2h2k/OnqXAiy0IrTxUfV1iFp3la33oAQVY9pCpWU268WFYVt2t71hlMuLsOg==",
-            "dev": true
-        },
-        "glob": {
-            "version": "7.1.7",
-            "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
-            "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
-            "dev": true,
-            "requires": {
-                "fs.realpath": "^1.0.0",
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "^3.0.4",
-                "once": "^1.3.0",
-                "path-is-absolute": "^1.0.0"
-            }
-        },
-        "glob-parent": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-            "dev": true,
-            "requires": {
-                "is-glob": "^4.0.1"
-            }
-        },
-        "global-modules": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-            "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
-            "dev": true,
-            "requires": {
-                "global-prefix": "^1.0.1",
-                "is-windows": "^1.0.1",
-                "resolve-dir": "^1.0.0"
-            }
-        },
-        "global-prefix": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
-            "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
-            "dev": true,
-            "requires": {
-                "expand-tilde": "^2.0.2",
-                "homedir-polyfill": "^1.0.1",
-                "ini": "^1.3.4",
-                "is-windows": "^1.0.1",
-                "which": "^1.2.14"
-            },
-            "dependencies": {
-                "which": {
-                    "version": "1.3.1",
-                    "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-                    "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-                    "dev": true,
-                    "requires": {
-                        "isexe": "^2.0.0"
-                    }
-                }
-            }
-        },
-        "globals": {
-            "version": "13.13.0",
-            "resolved": "https://registry.npmjs.org/globals/-/globals-13.13.0.tgz",
-            "integrity": "sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==",
-            "dev": true,
-            "requires": {
-                "type-fest": "^0.20.2"
-            }
-        },
-        "globby": {
-            "version": "11.1.0",
-            "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-            "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-            "dev": true,
-            "requires": {
-                "array-union": "^2.1.0",
-                "dir-glob": "^3.0.1",
-                "fast-glob": "^3.2.9",
-                "ignore": "^5.2.0",
-                "merge2": "^1.4.1",
-                "slash": "^3.0.0"
-            },
-            "dependencies": {
-                "ignore": {
-                    "version": "5.2.0",
-                    "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-                    "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-                    "dev": true
-                }
-            }
-        },
-        "graceful-fs": {
-            "version": "4.2.10",
-            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-            "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-            "dev": true
-        },
-        "grunt": {
-            "version": "1.5.3",
-            "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.5.3.tgz",
-            "integrity": "sha512-mKwmo4X2d8/4c/BmcOETHek675uOqw0RuA/zy12jaspWqvTp4+ZeQF1W+OTpcbncnaBsfbQJ6l0l4j+Sn/GmaQ==",
-            "dev": true,
-            "requires": {
-                "dateformat": "~3.0.3",
-                "eventemitter2": "~0.4.13",
-                "exit": "~0.1.2",
-                "findup-sync": "~0.3.0",
-                "glob": "~7.1.6",
-                "grunt-cli": "~1.4.3",
-                "grunt-known-options": "~2.0.0",
-                "grunt-legacy-log": "~3.0.0",
-                "grunt-legacy-util": "~2.0.1",
-                "iconv-lite": "~0.4.13",
-                "js-yaml": "~3.14.0",
-                "minimatch": "~3.0.4",
-                "mkdirp": "~1.0.4",
-                "nopt": "~3.0.6",
-                "rimraf": "~3.0.2"
-            },
-            "dependencies": {
-                "minimatch": {
-                    "version": "3.0.8",
-                    "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz",
-                    "integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
-                    "dev": true,
-                    "requires": {
-                        "brace-expansion": "^1.1.7"
-                    }
-                }
-            }
-        },
-        "grunt-chokidar": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/grunt-chokidar/-/grunt-chokidar-1.0.2.tgz",
-            "integrity": "sha512-sU2QPx3nkJHhfp+yTORXLpNS8Oyq7ZoGoU6SaF/GCA4634aQvi0ZOXV6Uvm8QtjisVI+nWR4LNRxjW95LRRRVg==",
-            "dev": true,
-            "requires": {
-                "async": "^3.1.0",
-                "chokidar": "^3.0.2",
-                "lodash": "^4.17.15",
-                "tiny-lr": "^1.1.1"
-            }
-        },
-        "grunt-cli": {
-            "version": "1.4.3",
-            "resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.4.3.tgz",
-            "integrity": "sha512-9Dtx/AhVeB4LYzsViCjUQkd0Kw0McN2gYpdmGYKtE2a5Yt7v1Q+HYZVWhqXc/kGnxlMtqKDxSwotiGeFmkrCoQ==",
-            "dev": true,
-            "requires": {
-                "grunt-known-options": "~2.0.0",
-                "interpret": "~1.1.0",
-                "liftup": "~3.0.1",
-                "nopt": "~4.0.1",
-                "v8flags": "~3.2.0"
-            },
-            "dependencies": {
-                "nopt": {
-                    "version": "4.0.3",
-                    "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
-                    "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
-                    "dev": true,
-                    "requires": {
-                        "abbrev": "1",
-                        "osenv": "^0.1.4"
-                    }
-                }
-            }
-        },
-        "grunt-contrib-eslint": {
-            "version": "0.0.5",
-            "resolved": "https://registry.npmjs.org/grunt-contrib-eslint/-/grunt-contrib-eslint-0.0.5.tgz",
-            "integrity": "sha1-byCW5DJitJ1erxOxUy38oArJybA=",
-            "dev": true,
-            "requires": {
-                "eslint": ">0.7.3"
-            }
-        },
-        "grunt-contrib-less": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-2.1.0.tgz",
-            "integrity": "sha512-+GNKFKpZfiopgUd5cDYNuzsVHZ7WFHM7MOUPKtmMDhfKQ4ZSFuVpNP5PoTFs669TARE6Rvgtv1izILKCpuhFZw==",
-            "dev": true,
-            "requires": {
-                "async": "^3.2.0",
-                "chalk": "^4.1.0",
-                "less": "^3.0.4",
-                "lodash": "^4.17.20"
-            }
-        },
-        "grunt-contrib-uglify": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-5.0.0.tgz",
-            "integrity": "sha512-rIFFPJMWKnh6oxDe2b810Ysg5SKoiI0u/FvuvAVpvJ7VHILkKtGqA4jgJ1JWruWQ+1m5FtB1lVSK81YyzIgDUw==",
-            "dev": true,
-            "requires": {
-                "chalk": "^2.4.1",
-                "maxmin": "^2.1.0",
-                "uglify-js": "^3.5.0",
-                "uri-path": "^1.0.0"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "3.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-                    "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^1.9.0"
-                    }
-                },
-                "chalk": {
-                    "version": "2.4.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-                    "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^3.2.1",
-                        "escape-string-regexp": "^1.0.5",
-                        "supports-color": "^5.3.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "1.9.3",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-                    "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "1.1.3"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.3",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-                    "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-                    "dev": true
-                },
-                "escape-string-regexp": {
-                    "version": "1.0.5",
-                    "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-                    "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-                    "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "5.5.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-                    "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^3.0.0"
-                    }
-                }
-            }
-        },
-        "grunt-file-exists": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/grunt-file-exists/-/grunt-file-exists-0.1.4.tgz",
-            "integrity": "sha1-Q2Er8418dlRwiUcIdgpuw/sQrrI=",
-            "dev": true,
-            "requires": {}
-        },
-        "grunt-known-options": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-2.0.0.tgz",
-            "integrity": "sha512-GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA==",
-            "dev": true
-        },
-        "grunt-legacy-log": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-3.0.0.tgz",
-            "integrity": "sha512-GHZQzZmhyq0u3hr7aHW4qUH0xDzwp2YXldLPZTCjlOeGscAOWWPftZG3XioW8MasGp+OBRIu39LFx14SLjXRcA==",
-            "dev": true,
-            "requires": {
-                "colors": "~1.1.2",
-                "grunt-legacy-log-utils": "~2.1.0",
-                "hooker": "~0.2.3",
-                "lodash": "~4.17.19"
-            }
-        },
-        "grunt-legacy-log-utils": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-2.1.0.tgz",
-            "integrity": "sha512-lwquaPXJtKQk0rUM1IQAop5noEpwFqOXasVoedLeNzaibf/OPWjKYvvdqnEHNmU+0T0CaReAXIbGo747ZD+Aaw==",
-            "dev": true,
-            "requires": {
-                "chalk": "~4.1.0",
-                "lodash": "~4.17.19"
-            }
-        },
-        "grunt-legacy-util": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-2.0.1.tgz",
-            "integrity": "sha512-2bQiD4fzXqX8rhNdXkAywCadeqiPiay0oQny77wA2F3WF4grPJXCvAcyoWUJV+po/b15glGkxuSiQCK299UC2w==",
-            "dev": true,
-            "requires": {
-                "async": "~3.2.0",
-                "exit": "~0.1.2",
-                "getobject": "~1.0.0",
-                "hooker": "~0.2.3",
-                "lodash": "~4.17.21",
-                "underscore.string": "~3.3.5",
-                "which": "~2.0.2"
-            }
-        },
-        "grunt-subgrunt": {
-            "version": "git+ssh://git@github.com/tusbar/grunt-subgrunt.git#c52da809fe78b1437ef3b194483c56c934b5fee1",
-            "dev": true,
-            "from": "grunt-subgrunt@github:tusbar/grunt-subgrunt#master",
-            "requires": {
-                "async": "^3.2.0",
-                "glob": "^7.0.0"
-            }
-        },
-        "gruntify-eslint": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/gruntify-eslint/-/gruntify-eslint-5.0.0.tgz",
-            "integrity": "sha512-pa2sXHK9+U4dCGdGSIMkpJARNwRStdLBsddNxmSHSSWROUdhWMrXvFWm6pj48zJhyV3Qy068VIuF1seYIvc0cw==",
-            "dev": true,
-            "requires": {
-                "eslint": "^5.0.0"
-            },
-            "dependencies": {
-                "acorn": {
-                    "version": "6.4.2",
-                    "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
-                    "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
-                    "dev": true
-                },
-                "ansi-regex": {
-                    "version": "3.0.1",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-                    "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-                    "dev": true
-                },
-                "ansi-styles": {
-                    "version": "3.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-                    "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^1.9.0"
-                    }
-                },
-                "astral-regex": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
-                    "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
-                    "dev": true
-                },
-                "chalk": {
-                    "version": "2.4.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-                    "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^3.2.1",
-                        "escape-string-regexp": "^1.0.5",
-                        "supports-color": "^5.3.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "1.9.3",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-                    "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "1.1.3"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.3",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-                    "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-                    "dev": true
-                },
-                "cross-spawn": {
-                    "version": "6.0.5",
-                    "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-                    "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-                    "dev": true,
-                    "requires": {
-                        "nice-try": "^1.0.4",
-                        "path-key": "^2.0.1",
-                        "semver": "^5.5.0",
-                        "shebang-command": "^1.2.0",
-                        "which": "^1.2.9"
-                    }
-                },
-                "emoji-regex": {
-                    "version": "7.0.3",
-                    "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-                    "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-                    "dev": true
-                },
-                "escape-string-regexp": {
-                    "version": "1.0.5",
-                    "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-                    "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-                    "dev": true
-                },
-                "eslint": {
-                    "version": "5.16.0",
-                    "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz",
-                    "integrity": "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/code-frame": "^7.0.0",
-                        "ajv": "^6.9.1",
-                        "chalk": "^2.1.0",
-                        "cross-spawn": "^6.0.5",
-                        "debug": "^4.0.1",
-                        "doctrine": "^3.0.0",
-                        "eslint-scope": "^4.0.3",
-                        "eslint-utils": "^1.3.1",
-                        "eslint-visitor-keys": "^1.0.0",
-                        "espree": "^5.0.1",
-                        "esquery": "^1.0.1",
-                        "esutils": "^2.0.2",
-                        "file-entry-cache": "^5.0.1",
-                        "functional-red-black-tree": "^1.0.1",
-                        "glob": "^7.1.2",
-                        "globals": "^11.7.0",
-                        "ignore": "^4.0.6",
-                        "import-fresh": "^3.0.0",
-                        "imurmurhash": "^0.1.4",
-                        "inquirer": "^6.2.2",
-                        "js-yaml": "^3.13.0",
-                        "json-stable-stringify-without-jsonify": "^1.0.1",
-                        "levn": "^0.3.0",
-                        "lodash": "^4.17.11",
-                        "minimatch": "^3.0.4",
-                        "mkdirp": "^0.5.1",
-                        "natural-compare": "^1.4.0",
-                        "optionator": "^0.8.2",
-                        "path-is-inside": "^1.0.2",
-                        "progress": "^2.0.0",
-                        "regexpp": "^2.0.1",
-                        "semver": "^5.5.1",
-                        "strip-ansi": "^4.0.0",
-                        "strip-json-comments": "^2.0.1",
-                        "table": "^5.2.3",
-                        "text-table": "^0.2.0"
-                    }
-                },
-                "eslint-scope": {
-                    "version": "4.0.3",
-                    "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
-                    "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
-                    "dev": true,
-                    "requires": {
-                        "esrecurse": "^4.1.0",
-                        "estraverse": "^4.1.1"
-                    }
-                },
-                "eslint-utils": {
-                    "version": "1.4.3",
-                    "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
-                    "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
-                    "dev": true,
-                    "requires": {
-                        "eslint-visitor-keys": "^1.1.0"
-                    }
-                },
-                "eslint-visitor-keys": {
-                    "version": "1.3.0",
-                    "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-                    "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-                    "dev": true
-                },
-                "espree": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz",
-                    "integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==",
-                    "dev": true,
-                    "requires": {
-                        "acorn": "^6.0.7",
-                        "acorn-jsx": "^5.0.0",
-                        "eslint-visitor-keys": "^1.0.0"
-                    }
-                },
-                "file-entry-cache": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
-                    "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
-                    "dev": true,
-                    "requires": {
-                        "flat-cache": "^2.0.1"
-                    }
-                },
-                "flat-cache": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
-                    "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
-                    "dev": true,
-                    "requires": {
-                        "flatted": "^2.0.0",
-                        "rimraf": "2.6.3",
-                        "write": "1.0.3"
-                    }
-                },
-                "flatted": {
-                    "version": "2.0.2",
-                    "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
-                    "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
-                    "dev": true
-                },
-                "globals": {
-                    "version": "11.12.0",
-                    "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-                    "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-                    "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-                    "dev": true
-                },
-                "is-fullwidth-code-point": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-                    "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-                    "dev": true
-                },
-                "levn": {
-                    "version": "0.3.0",
-                    "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-                    "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-                    "dev": true,
-                    "requires": {
-                        "prelude-ls": "~1.1.2",
-                        "type-check": "~0.3.2"
-                    }
-                },
-                "mkdirp": {
-                    "version": "0.5.6",
-                    "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-                    "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-                    "dev": true,
-                    "requires": {
-                        "minimist": "^1.2.6"
-                    }
-                },
-                "optionator": {
-                    "version": "0.8.3",
-                    "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-                    "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-                    "dev": true,
-                    "requires": {
-                        "deep-is": "~0.1.3",
-                        "fast-levenshtein": "~2.0.6",
-                        "levn": "~0.3.0",
-                        "prelude-ls": "~1.1.2",
-                        "type-check": "~0.3.2",
-                        "word-wrap": "~1.2.3"
-                    }
-                },
-                "path-key": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-                    "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-                    "dev": true
-                },
-                "prelude-ls": {
-                    "version": "1.1.2",
-                    "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-                    "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-                    "dev": true
-                },
-                "regexpp": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
-                    "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
-                    "dev": true
-                },
-                "rimraf": {
-                    "version": "2.6.3",
-                    "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-                    "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-                    "dev": true,
-                    "requires": {
-                        "glob": "^7.1.3"
-                    }
-                },
-                "semver": {
-                    "version": "5.7.1",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-                    "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-                    "dev": true
-                },
-                "shebang-command": {
-                    "version": "1.2.0",
-                    "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-                    "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-                    "dev": true,
-                    "requires": {
-                        "shebang-regex": "^1.0.0"
-                    }
-                },
-                "shebang-regex": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-                    "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-                    "dev": true
-                },
-                "slice-ansi": {
-                    "version": "2.1.0",
-                    "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
-                    "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^3.2.0",
-                        "astral-regex": "^1.0.0",
-                        "is-fullwidth-code-point": "^2.0.0"
-                    }
-                },
-                "string-width": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-                    "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-                    "dev": true,
-                    "requires": {
-                        "emoji-regex": "^7.0.1",
-                        "is-fullwidth-code-point": "^2.0.0",
-                        "strip-ansi": "^5.1.0"
-                    },
-                    "dependencies": {
-                        "ansi-regex": {
-                            "version": "4.1.1",
-                            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-                            "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-                            "dev": true
-                        },
-                        "strip-ansi": {
-                            "version": "5.2.0",
-                            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-                            "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-                            "dev": true,
-                            "requires": {
-                                "ansi-regex": "^4.1.0"
-                            }
-                        }
-                    }
-                },
-                "strip-ansi": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-                    "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^3.0.0"
-                    }
-                },
-                "strip-json-comments": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-                    "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "5.5.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-                    "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^3.0.0"
-                    }
-                },
-                "table": {
-                    "version": "5.4.6",
-                    "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
-                    "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
-                    "dev": true,
-                    "requires": {
-                        "ajv": "^6.10.2",
-                        "lodash": "^4.17.14",
-                        "slice-ansi": "^2.1.0",
-                        "string-width": "^3.0.0"
-                    }
-                },
-                "type-check": {
-                    "version": "0.3.2",
-                    "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-                    "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-                    "dev": true,
-                    "requires": {
-                        "prelude-ls": "~1.1.2"
-                    }
-                },
-                "which": {
-                    "version": "1.3.1",
-                    "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-                    "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-                    "dev": true,
-                    "requires": {
-                        "isexe": "^2.0.0"
-                    }
-                }
-            }
-        },
-        "gzip-size": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-3.0.0.tgz",
-            "integrity": "sha1-VGGI6b3DN/Zzdy+BZgRks4nc5SA=",
-            "dev": true,
-            "requires": {
-                "duplexer": "^0.1.1"
-            }
-        },
-        "has": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-            "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-            "dev": true,
-            "requires": {
-                "function-bind": "^1.1.1"
-            }
-        },
-        "has-ansi": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-            "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-            "dev": true,
-            "requires": {
-                "ansi-regex": "^2.0.0"
-            },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "2.1.1",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-                    "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-                    "dev": true
-                }
-            }
-        },
-        "has-bigints": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
-            "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
-            "dev": true
-        },
-        "has-flag": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-            "dev": true
-        },
-        "has-property-descriptors": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-            "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
-            "dev": true,
-            "requires": {
-                "get-intrinsic": "^1.1.1"
-            }
-        },
-        "has-symbols": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-            "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-            "dev": true
-        },
-        "has-tostringtag": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-            "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-            "dev": true,
-            "requires": {
-                "has-symbols": "^1.0.2"
-            }
-        },
-        "homedir-polyfill": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
-            "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
-            "dev": true,
-            "requires": {
-                "parse-passwd": "^1.0.0"
-            }
-        },
-        "hooker": {
-            "version": "0.2.3",
-            "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz",
-            "integrity": "sha1-uDT3I8xKJCqmWWNFnfbZhMXT2Vk=",
-            "dev": true
-        },
-        "http-parser-js": {
-            "version": "0.5.6",
-            "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.6.tgz",
-            "integrity": "sha512-vDlkRPDJn93swjcjqMSaGSPABbIarsr1TLAui/gLDXzV5VsJNdXNzMYDyNBLQkjWQCJ1uizu8T2oDMhmGt0PRA==",
-            "dev": true
-        },
-        "iconv-lite": {
-            "version": "0.4.24",
-            "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-            "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-            "dev": true,
-            "requires": {
-                "safer-buffer": ">= 2.1.2 < 3"
-            }
-        },
-        "ignore": {
-            "version": "4.0.6",
-            "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-            "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-            "dev": true
-        },
-        "image-size": {
-            "version": "0.5.5",
-            "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
-            "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
-            "dev": true,
-            "optional": true
-        },
-        "import-fresh": {
-            "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-            "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-            "dev": true,
-            "requires": {
-                "parent-module": "^1.0.0",
-                "resolve-from": "^4.0.0"
-            }
-        },
-        "imurmurhash": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-            "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-            "dev": true
-        },
-        "inflight": {
-            "version": "1.0.6",
-            "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-            "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-            "dev": true,
-            "requires": {
-                "once": "^1.3.0",
-                "wrappy": "1"
-            }
-        },
-        "inherits": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-            "dev": true
-        },
-        "ini": {
-            "version": "1.3.8",
-            "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-            "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-            "dev": true
-        },
-        "inquirer": {
-            "version": "6.5.2",
-            "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz",
-            "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==",
-            "dev": true,
-            "requires": {
-                "ansi-escapes": "^3.2.0",
-                "chalk": "^2.4.2",
-                "cli-cursor": "^2.1.0",
-                "cli-width": "^2.0.0",
-                "external-editor": "^3.0.3",
-                "figures": "^2.0.0",
-                "lodash": "^4.17.12",
-                "mute-stream": "0.0.7",
-                "run-async": "^2.2.0",
-                "rxjs": "^6.4.0",
-                "string-width": "^2.1.0",
-                "strip-ansi": "^5.1.0",
-                "through": "^2.3.6"
-            },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "4.1.1",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-                    "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-                    "dev": true
-                },
-                "ansi-styles": {
-                    "version": "3.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-                    "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^1.9.0"
-                    }
-                },
-                "chalk": {
-                    "version": "2.4.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-                    "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^3.2.1",
-                        "escape-string-regexp": "^1.0.5",
-                        "supports-color": "^5.3.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "1.9.3",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-                    "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "1.1.3"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.3",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-                    "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-                    "dev": true
-                },
-                "escape-string-regexp": {
-                    "version": "1.0.5",
-                    "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-                    "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-                    "dev": true
-                },
-                "figures": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-                    "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
-                    "dev": true,
-                    "requires": {
-                        "escape-string-regexp": "^1.0.5"
-                    }
-                },
-                "has-flag": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-                    "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-                    "dev": true
-                },
-                "is-fullwidth-code-point": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-                    "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-                    "dev": true
-                },
-                "string-width": {
-                    "version": "2.1.1",
-                    "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-                    "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-                    "dev": true,
-                    "requires": {
-                        "is-fullwidth-code-point": "^2.0.0",
-                        "strip-ansi": "^4.0.0"
-                    },
-                    "dependencies": {
-                        "ansi-regex": {
-                            "version": "3.0.1",
-                            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-                            "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-                            "dev": true
-                        },
-                        "strip-ansi": {
-                            "version": "4.0.0",
-                            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-                            "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-                            "dev": true,
-                            "requires": {
-                                "ansi-regex": "^3.0.0"
-                            }
-                        }
-                    }
-                },
-                "strip-ansi": {
-                    "version": "5.2.0",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-                    "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^4.1.0"
-                    }
-                },
-                "supports-color": {
-                    "version": "5.5.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-                    "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^3.0.0"
-                    }
-                }
-            }
-        },
-        "internal-slot": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-            "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
-            "dev": true,
-            "requires": {
-                "get-intrinsic": "^1.1.0",
-                "has": "^1.0.3",
-                "side-channel": "^1.0.4"
-            }
-        },
-        "interpret": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
-            "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=",
-            "dev": true
-        },
-        "is-absolute": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
-            "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
-            "dev": true,
-            "requires": {
-                "is-relative": "^1.0.0",
-                "is-windows": "^1.0.1"
-            }
-        },
-        "is-bigint": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-            "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-            "dev": true,
-            "requires": {
-                "has-bigints": "^1.0.1"
-            }
-        },
-        "is-binary-path": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-            "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-            "dev": true,
-            "requires": {
-                "binary-extensions": "^2.0.0"
-            }
-        },
-        "is-boolean-object": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-            "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-            "dev": true,
-            "requires": {
-                "call-bind": "^1.0.2",
-                "has-tostringtag": "^1.0.0"
-            }
-        },
-        "is-callable": {
-            "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-            "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-            "dev": true
-        },
-        "is-core-module": {
-            "version": "2.8.1",
-            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz",
-            "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==",
-            "dev": true,
-            "requires": {
-                "has": "^1.0.3"
-            }
-        },
-        "is-date-object": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-            "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-            "dev": true,
-            "requires": {
-                "has-tostringtag": "^1.0.0"
-            }
-        },
-        "is-extglob": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-            "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-            "dev": true
-        },
-        "is-fullwidth-code-point": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-            "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-            "dev": true
-        },
-        "is-glob": {
-            "version": "4.0.3",
-            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-            "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-            "dev": true,
-            "requires": {
-                "is-extglob": "^2.1.1"
-            }
-        },
-        "is-negative-zero": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-            "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-            "dev": true
-        },
-        "is-number": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-            "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-            "dev": true
-        },
-        "is-number-object": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-            "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
-            "dev": true,
-            "requires": {
-                "has-tostringtag": "^1.0.0"
-            }
-        },
-        "is-plain-object": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-            "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-            "dev": true,
-            "requires": {
-                "isobject": "^3.0.1"
-            }
-        },
-        "is-regex": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-            "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-            "dev": true,
-            "requires": {
-                "call-bind": "^1.0.2",
-                "has-tostringtag": "^1.0.0"
-            }
-        },
-        "is-relative": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-            "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
-            "dev": true,
-            "requires": {
-                "is-unc-path": "^1.0.0"
-            }
-        },
-        "is-shared-array-buffer": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-            "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-            "dev": true,
-            "requires": {
-                "call-bind": "^1.0.2"
-            }
-        },
-        "is-string": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-            "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-            "dev": true,
-            "requires": {
-                "has-tostringtag": "^1.0.0"
-            }
-        },
-        "is-symbol": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-            "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-            "dev": true,
-            "requires": {
-                "has-symbols": "^1.0.2"
-            }
-        },
-        "is-unc-path": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-            "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
-            "dev": true,
-            "requires": {
-                "unc-path-regex": "^0.1.2"
-            }
-        },
-        "is-weakref": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-            "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-            "dev": true,
-            "requires": {
-                "call-bind": "^1.0.2"
-            }
-        },
-        "is-what": {
-            "version": "3.14.1",
-            "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz",
-            "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==",
-            "dev": true
-        },
-        "is-windows": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-            "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-            "dev": true
-        },
-        "isexe": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-            "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-            "dev": true
-        },
-        "isobject": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-            "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-            "dev": true
-        },
-        "jit-grunt": {
-            "version": "0.10.0",
-            "resolved": "https://registry.npmjs.org/jit-grunt/-/jit-grunt-0.10.0.tgz",
-            "integrity": "sha1-AIw6f+Hpa9DYTiYOofoXg0V/ecI=",
-            "dev": true,
-            "requires": {}
-        },
-        "js-tokens": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-            "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-            "dev": true
-        },
-        "js-yaml": {
-            "version": "3.14.1",
-            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-            "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-            "dev": true,
-            "requires": {
-                "argparse": "^1.0.7",
-                "esprima": "^4.0.0"
-            }
-        },
-        "js-yaml-js-types": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/js-yaml-js-types/-/js-yaml-js-types-1.0.0.tgz",
-            "integrity": "sha512-UNjPwuoaj4mcHkJCJSF6l4MgkzoFjG+JJkBXMYNvjgO3yE9gTeRt+E6PN022vduz/daZZ7HmlEiSEE36NrGE4w==",
-            "dev": true,
-            "requires": {
-                "esprima": "^4.0.1"
-            }
-        },
-        "json-schema-traverse": {
-            "version": "0.4.1",
-            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-            "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-            "dev": true
-        },
-        "json-stable-stringify-without-jsonify": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-            "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-            "dev": true
-        },
-        "json5": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-            "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-            "dev": true,
-            "requires": {
-                "minimist": "^1.2.0"
-            }
-        },
-        "kind-of": {
-            "version": "6.0.3",
-            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-            "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-            "dev": true
-        },
-        "less": {
-            "version": "3.13.1",
-            "resolved": "https://registry.npmjs.org/less/-/less-3.13.1.tgz",
-            "integrity": "sha512-SwA1aQXGUvp+P5XdZslUOhhLnClSLIjWvJhmd+Vgib5BFIr9lMNlQwmwUNOjXThF/A0x+MCYYPeWEfeWiLRnTw==",
-            "dev": true,
-            "requires": {
-                "copy-anything": "^2.0.1",
-                "errno": "^0.1.1",
-                "graceful-fs": "^4.1.2",
-                "image-size": "~0.5.0",
-                "make-dir": "^2.1.0",
-                "mime": "^1.4.1",
-                "native-request": "^1.0.5",
-                "source-map": "~0.6.0",
-                "tslib": "^1.10.0"
-            }
-        },
-        "levn": {
-            "version": "0.4.1",
-            "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-            "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-            "dev": true,
-            "requires": {
-                "prelude-ls": "^1.2.1",
-                "type-check": "~0.4.0"
-            }
-        },
-        "liftup": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/liftup/-/liftup-3.0.1.tgz",
-            "integrity": "sha512-yRHaiQDizWSzoXk3APcA71eOI/UuhEkNN9DiW2Tt44mhYzX4joFoCZlxsSOF7RyeLlfqzFLQI1ngFq3ggMPhOw==",
-            "dev": true,
-            "requires": {
-                "extend": "^3.0.2",
-                "findup-sync": "^4.0.0",
-                "fined": "^1.2.0",
-                "flagged-respawn": "^1.0.1",
-                "is-plain-object": "^2.0.4",
-                "object.map": "^1.0.1",
-                "rechoir": "^0.7.0",
-                "resolve": "^1.19.0"
-            },
-            "dependencies": {
-                "findup-sync": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-4.0.0.tgz",
-                    "integrity": "sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ==",
-                    "dev": true,
-                    "requires": {
-                        "detect-file": "^1.0.0",
-                        "is-glob": "^4.0.0",
-                        "micromatch": "^4.0.2",
-                        "resolve-dir": "^1.0.1"
-                    }
-                }
-            }
-        },
-        "livereload-js": {
-            "version": "2.4.0",
-            "resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-2.4.0.tgz",
-            "integrity": "sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw==",
-            "dev": true
-        },
-        "load-grunt-config": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/load-grunt-config/-/load-grunt-config-4.0.1.tgz",
-            "integrity": "sha512-F3CD28C1WFocVvdTRSKnV73q7JvGY2OrqoeUeflbOQg58AhkFROIFc2BQXOU2xdrYJqWZx53glT5PZp1vrr9qA==",
-            "dev": true,
-            "requires": {
-                "cson": "7.20.0",
-                "glob": "7.1.7",
-                "jit-grunt": "0.10.0",
-                "js-yaml": "4.1.0",
-                "js-yaml-js-types": "1.0.0",
-                "load-grunt-tasks": "5.1.0",
-                "lodash": "4.17.21"
-            },
-            "dependencies": {
-                "argparse": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-                    "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-                    "dev": true
-                },
-                "js-yaml": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-                    "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-                    "dev": true,
-                    "requires": {
-                        "argparse": "^2.0.1"
-                    }
-                }
-            }
-        },
-        "load-grunt-tasks": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/load-grunt-tasks/-/load-grunt-tasks-5.1.0.tgz",
-            "integrity": "sha512-oNj0Jlka1TsfDe+9He0kcA1cRln+TMoTsEByW7ij6kyktNLxBKJtslCFEvFrLC2Dj0S19IWJh3fOCIjLby2Xrg==",
-            "dev": true,
-            "requires": {
-                "arrify": "^2.0.1",
-                "multimatch": "^4.0.0",
-                "pkg-up": "^3.1.0",
-                "resolve-pkg": "^2.0.0"
-            }
-        },
-        "locate-path": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-            "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-            "dev": true,
-            "requires": {
-                "p-locate": "^2.0.0",
-                "path-exists": "^3.0.0"
-            }
-        },
-        "lodash": {
-            "version": "4.17.21",
-            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-            "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-            "dev": true
-        },
-        "lodash.merge": {
-            "version": "4.6.2",
-            "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-            "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-            "dev": true
-        },
-        "lodash.truncate": {
-            "version": "4.4.2",
-            "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-            "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
-            "dev": true
-        },
-        "lru-cache": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-            "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-            "dev": true,
-            "requires": {
-                "yallist": "^4.0.0"
-            }
-        },
-        "make-dir": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-            "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-            "dev": true,
-            "optional": true,
-            "requires": {
-                "pify": "^4.0.1",
-                "semver": "^5.6.0"
-            },
-            "dependencies": {
-                "semver": {
-                    "version": "5.7.1",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-                    "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-                    "dev": true,
-                    "optional": true
-                }
-            }
-        },
-        "make-iterator": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
-            "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
-            "dev": true,
-            "requires": {
-                "kind-of": "^6.0.2"
-            }
-        },
-        "map-cache": {
-            "version": "0.2.2",
-            "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-            "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
-            "dev": true
-        },
-        "maxmin": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/maxmin/-/maxmin-2.1.0.tgz",
-            "integrity": "sha1-TTsiCQPZXu5+t6x/qGTnLcCaMWY=",
-            "dev": true,
-            "requires": {
-                "chalk": "^1.0.0",
-                "figures": "^1.0.1",
-                "gzip-size": "^3.0.0",
-                "pretty-bytes": "^3.0.0"
-            },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "2.1.1",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-                    "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-                    "dev": true
-                },
-                "ansi-styles": {
-                    "version": "2.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-                    "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-                    "dev": true
-                },
-                "chalk": {
-                    "version": "1.1.3",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-                    "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^2.2.1",
-                        "escape-string-regexp": "^1.0.2",
-                        "has-ansi": "^2.0.0",
-                        "strip-ansi": "^3.0.0",
-                        "supports-color": "^2.0.0"
-                    }
-                },
-                "escape-string-regexp": {
-                    "version": "1.0.5",
-                    "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-                    "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-                    "dev": true
-                },
-                "strip-ansi": {
-                    "version": "3.0.1",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-                    "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^2.0.0"
-                    }
-                },
-                "supports-color": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-                    "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-                    "dev": true
-                }
-            }
-        },
-        "md5-file": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/md5-file/-/md5-file-4.0.0.tgz",
-            "integrity": "sha512-UC0qFwyAjn4YdPpKaDNw6gNxRf7Mcx7jC1UGCY4boCzgvU2Aoc1mOGzTtrjjLKhM5ivsnhoKpQVxKPp+1j1qwg==",
-            "dev": true
-        },
-        "merge2": {
-            "version": "1.4.1",
-            "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-            "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-            "dev": true
-        },
-        "micromatch": {
-            "version": "4.0.5",
-            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-            "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-            "dev": true,
-            "requires": {
-                "braces": "^3.0.2",
-                "picomatch": "^2.3.1"
-            }
-        },
-        "mime": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-            "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-            "dev": true,
-            "optional": true
-        },
-        "mimic-fn": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-            "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
-            "dev": true
-        },
-        "minimatch": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-            "dev": true,
-            "requires": {
-                "brace-expansion": "^1.1.7"
-            }
-        },
-        "minimist": {
-            "version": "1.2.6",
-            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-            "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
-            "dev": true
-        },
-        "mkdirp": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-            "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-            "dev": true
-        },
-        "ms": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-            "dev": true
-        },
-        "multimatch": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-4.0.0.tgz",
-            "integrity": "sha512-lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ==",
-            "dev": true,
-            "requires": {
-                "@types/minimatch": "^3.0.3",
-                "array-differ": "^3.0.0",
-                "array-union": "^2.1.0",
-                "arrify": "^2.0.1",
-                "minimatch": "^3.0.4"
-            }
-        },
-        "mute-stream": {
-            "version": "0.0.7",
-            "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-            "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
-            "dev": true
-        },
-        "native-request": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/native-request/-/native-request-1.1.0.tgz",
-            "integrity": "sha512-uZ5rQaeRn15XmpgE0xoPL8YWqcX90VtCFglYwAgkvKM5e8fog+vePLAhHxuuv/gRkrQxIeh5U3q9sMNUrENqWw==",
-            "dev": true,
-            "optional": true
-        },
-        "natural-compare": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-            "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-            "dev": true
-        },
-        "nice-try": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-            "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
-            "dev": true
-        },
-        "nopt": {
-            "version": "3.0.6",
-            "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-            "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-            "dev": true,
-            "requires": {
-                "abbrev": "1"
-            }
-        },
-        "normalize-path": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-            "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-            "dev": true
-        },
-        "number-is-nan": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-            "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-            "dev": true
-        },
-        "object-assign": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-            "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-            "dev": true
-        },
-        "object-inspect": {
-            "version": "1.12.0",
-            "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-            "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-            "dev": true
-        },
-        "object-keys": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-            "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-            "dev": true
-        },
-        "object.assign": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-            "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
-            "dev": true,
-            "requires": {
-                "call-bind": "^1.0.0",
-                "define-properties": "^1.1.3",
-                "has-symbols": "^1.0.1",
-                "object-keys": "^1.1.1"
-            }
-        },
-        "object.defaults": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
-            "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
-            "dev": true,
-            "requires": {
-                "array-each": "^1.0.1",
-                "array-slice": "^1.0.0",
-                "for-own": "^1.0.0",
-                "isobject": "^3.0.0"
-            }
-        },
-        "object.map": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
-            "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
-            "dev": true,
-            "requires": {
-                "for-own": "^1.0.0",
-                "make-iterator": "^1.0.0"
-            }
-        },
-        "object.pick": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-            "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
-            "dev": true,
-            "requires": {
-                "isobject": "^3.0.1"
-            }
-        },
-        "object.values": {
-            "version": "1.1.5",
-            "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
-            "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
-            "dev": true,
-            "requires": {
-                "call-bind": "^1.0.2",
-                "define-properties": "^1.1.3",
-                "es-abstract": "^1.19.1"
-            }
-        },
-        "once": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-            "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-            "dev": true,
-            "requires": {
-                "wrappy": "1"
-            }
-        },
-        "onetime": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-            "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
-            "dev": true,
-            "requires": {
-                "mimic-fn": "^1.0.0"
-            }
-        },
-        "optionator": {
-            "version": "0.9.1",
-            "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-            "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-            "dev": true,
-            "requires": {
-                "deep-is": "^0.1.3",
-                "fast-levenshtein": "^2.0.6",
-                "levn": "^0.4.1",
-                "prelude-ls": "^1.2.1",
-                "type-check": "^0.4.0",
-                "word-wrap": "^1.2.3"
-            }
-        },
-        "os-homedir": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-            "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-            "dev": true
-        },
-        "os-tmpdir": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-            "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-            "dev": true
-        },
-        "osenv": {
-            "version": "0.1.5",
-            "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-            "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-            "dev": true,
-            "requires": {
-                "os-homedir": "^1.0.0",
-                "os-tmpdir": "^1.0.0"
-            }
-        },
-        "p-limit": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-            "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-            "dev": true,
-            "requires": {
-                "p-try": "^1.0.0"
-            }
-        },
-        "p-locate": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-            "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-            "dev": true,
-            "requires": {
-                "p-limit": "^1.1.0"
-            }
-        },
-        "p-try": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-            "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-            "dev": true
-        },
-        "parent-module": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-            "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-            "dev": true,
-            "requires": {
-                "callsites": "^3.0.0"
-            }
-        },
-        "parse-filepath": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
-            "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
-            "dev": true,
-            "requires": {
-                "is-absolute": "^1.0.0",
-                "map-cache": "^0.2.0",
-                "path-root": "^0.1.1"
-            }
-        },
-        "parse-passwd": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-            "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
-            "dev": true
-        },
-        "path-exists": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-            "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-            "dev": true
-        },
-        "path-is-absolute": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-            "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-            "dev": true
-        },
-        "path-is-inside": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-            "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
-            "dev": true
-        },
-        "path-key": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-            "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-            "dev": true
-        },
-        "path-parse": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-            "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-            "dev": true
-        },
-        "path-root": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
-            "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
-            "dev": true,
-            "requires": {
-                "path-root-regex": "^0.1.0"
-            }
-        },
-        "path-root-regex": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
-            "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
-            "dev": true
-        },
-        "path-type": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-            "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-            "dev": true
-        },
-        "picomatch": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-            "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-            "dev": true
-        },
-        "pify": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-            "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-            "dev": true,
-            "optional": true
-        },
-        "pkg-up": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
-            "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
-            "dev": true,
-            "requires": {
-                "find-up": "^3.0.0"
-            },
-            "dependencies": {
-                "find-up": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-                    "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-                    "dev": true,
-                    "requires": {
-                        "locate-path": "^3.0.0"
-                    }
-                },
-                "locate-path": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-                    "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-                    "dev": true,
-                    "requires": {
-                        "p-locate": "^3.0.0",
-                        "path-exists": "^3.0.0"
-                    }
-                },
-                "p-limit": {
-                    "version": "2.3.0",
-                    "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-                    "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-                    "dev": true,
-                    "requires": {
-                        "p-try": "^2.0.0"
-                    }
-                },
-                "p-locate": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-                    "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-                    "dev": true,
-                    "requires": {
-                        "p-limit": "^2.0.0"
-                    }
-                },
-                "p-try": {
-                    "version": "2.2.0",
-                    "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-                    "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-                    "dev": true
-                }
-            }
-        },
-        "prelude-ls": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-            "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-            "dev": true
-        },
-        "pretty-bytes": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-3.0.1.tgz",
-            "integrity": "sha1-J9AAjXeAY6C0gRuzXHnxvV1fvM8=",
-            "dev": true,
-            "requires": {
-                "number-is-nan": "^1.0.0"
-            }
-        },
-        "progress": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-            "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-            "dev": true
-        },
-        "prr": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-            "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
-            "dev": true,
-            "optional": true
-        },
-        "punycode": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-            "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-            "dev": true
-        },
-        "qs": {
-            "version": "6.10.3",
-            "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
-            "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
-            "dev": true,
-            "requires": {
-                "side-channel": "^1.0.4"
-            }
-        },
-        "queue-microtask": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-            "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-            "dev": true
-        },
-        "raw-body": {
-            "version": "1.1.7",
-            "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz",
-            "integrity": "sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=",
-            "dev": true,
-            "requires": {
-                "bytes": "1",
-                "string_decoder": "0.10"
-            }
-        },
-        "readdirp": {
-            "version": "3.6.0",
-            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-            "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-            "dev": true,
-            "requires": {
-                "picomatch": "^2.2.1"
-            }
-        },
-        "rechoir": {
-            "version": "0.7.1",
-            "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz",
-            "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==",
-            "dev": true,
-            "requires": {
-                "resolve": "^1.9.0"
-            }
-        },
-        "regexpp": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-            "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-            "dev": true
-        },
-        "require-from-string": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-            "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-            "dev": true
-        },
-        "requirefresh": {
-            "version": "4.13.0",
-            "resolved": "https://registry.npmjs.org/requirefresh/-/requirefresh-4.13.0.tgz",
-            "integrity": "sha512-APrzWWxqnwE2Bz3ysFepAU0Dc0aYjn8jsDLFIegedn+KVCS9LykAclkf+6YaJXk3ON9l6QAm04rN+bEA89cGIg==",
-            "dev": true
-        },
-        "resolve": {
-            "version": "1.22.0",
-            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
-            "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
-            "dev": true,
-            "requires": {
-                "is-core-module": "^2.8.1",
-                "path-parse": "^1.0.7",
-                "supports-preserve-symlinks-flag": "^1.0.0"
-            }
-        },
-        "resolve-dir": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
-            "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
-            "dev": true,
-            "requires": {
-                "expand-tilde": "^2.0.0",
-                "global-modules": "^1.0.0"
-            }
-        },
-        "resolve-from": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-            "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-            "dev": true
-        },
-        "resolve-pkg": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/resolve-pkg/-/resolve-pkg-2.0.0.tgz",
-            "integrity": "sha512-+1lzwXehGCXSeryaISr6WujZzowloigEofRB+dj75y9RRa/obVcYgbHJd53tdYw8pvZj8GojXaaENws8Ktw/hQ==",
-            "dev": true,
-            "requires": {
-                "resolve-from": "^5.0.0"
-            },
-            "dependencies": {
-                "resolve-from": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-                    "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-                    "dev": true
-                }
-            }
-        },
-        "restore-cursor": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-            "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
-            "dev": true,
-            "requires": {
-                "onetime": "^2.0.0",
-                "signal-exit": "^3.0.2"
-            }
-        },
-        "reusify": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-            "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-            "dev": true
-        },
-        "rimraf": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-            "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-            "dev": true,
-            "requires": {
-                "glob": "^7.1.3"
-            }
-        },
-        "run-async": {
-            "version": "2.4.1",
-            "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
-            "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
-            "dev": true
-        },
-        "run-parallel": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-            "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-            "dev": true,
-            "requires": {
-                "queue-microtask": "^1.2.2"
-            }
-        },
-        "rxjs": {
-            "version": "6.6.7",
-            "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-            "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
-            "dev": true,
-            "requires": {
-                "tslib": "^1.9.0"
-            }
-        },
-        "safe-buffer": {
-            "version": "5.2.1",
-            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-            "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-            "dev": true
-        },
-        "safe-json-parse": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-1.0.1.tgz",
-            "integrity": "sha1-PnZyPjjf3aE8mx0poeB//uSzC1c=",
-            "dev": true
-        },
-        "safefs": {
-            "version": "6.16.0",
-            "resolved": "https://registry.npmjs.org/safefs/-/safefs-6.16.0.tgz",
-            "integrity": "sha512-IUIN5h+r2acNVkbsM5VoBUsRnaSFwQFZnzyvQsiLlgFsncLi7rrtmM4FsEgwv+xDTJzsrp79rd+/GJu2zWcR9w==",
-            "dev": true,
-            "requires": {
-                "graceful-fs": "^4.2.6"
-            }
-        },
-        "safer-buffer": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-            "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-            "dev": true
-        },
-        "semver": {
-            "version": "7.3.7",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-            "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-            "dev": true,
-            "requires": {
-                "lru-cache": "^6.0.0"
-            }
-        },
-        "shebang-command": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-            "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-            "dev": true,
-            "requires": {
-                "shebang-regex": "^3.0.0"
-            }
-        },
-        "shebang-regex": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-            "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-            "dev": true
-        },
-        "side-channel": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-            "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-            "dev": true,
-            "requires": {
-                "call-bind": "^1.0.0",
-                "get-intrinsic": "^1.0.2",
-                "object-inspect": "^1.9.0"
-            }
-        },
-        "signal-exit": {
-            "version": "3.0.7",
-            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-            "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-            "dev": true
-        },
-        "slash": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-            "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-            "dev": true
-        },
-        "slice-ansi": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-            "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-            "dev": true,
-            "requires": {
-                "ansi-styles": "^4.0.0",
-                "astral-regex": "^2.0.0",
-                "is-fullwidth-code-point": "^3.0.0"
-            }
-        },
-        "source-map": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-            "dev": true,
-            "optional": true
-        },
-        "sprintf-js": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-            "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-            "dev": true
-        },
-        "string_decoder": {
-            "version": "0.10.31",
-            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-            "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-            "dev": true
-        },
-        "string-template": {
-            "version": "0.2.1",
-            "resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz",
-            "integrity": "sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=",
-            "dev": true
-        },
-        "string-width": {
-            "version": "4.2.3",
-            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-            "dev": true,
-            "requires": {
-                "emoji-regex": "^8.0.0",
-                "is-fullwidth-code-point": "^3.0.0",
-                "strip-ansi": "^6.0.1"
-            }
-        },
-        "string.prototype.trimend": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
-            "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
-            "dev": true,
-            "requires": {
-                "call-bind": "^1.0.2",
-                "define-properties": "^1.1.3"
-            }
-        },
-        "string.prototype.trimstart": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
-            "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
-            "dev": true,
-            "requires": {
-                "call-bind": "^1.0.2",
-                "define-properties": "^1.1.3"
-            }
-        },
-        "strip-ansi": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-            "dev": true,
-            "requires": {
-                "ansi-regex": "^5.0.1"
-            }
-        },
-        "strip-bom": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-            "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-            "dev": true
-        },
-        "strip-json-comments": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-            "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-            "dev": true
-        },
-        "supports-color": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-            "dev": true,
-            "requires": {
-                "has-flag": "^4.0.0"
-            }
-        },
-        "supports-preserve-symlinks-flag": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-            "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-            "dev": true
-        },
-        "table": {
-            "version": "6.8.0",
-            "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
-            "integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
-            "dev": true,
-            "requires": {
-                "ajv": "^8.0.1",
-                "lodash.truncate": "^4.4.2",
-                "slice-ansi": "^4.0.0",
-                "string-width": "^4.2.3",
-                "strip-ansi": "^6.0.1"
-            },
-            "dependencies": {
-                "ajv": {
-                    "version": "8.11.0",
-                    "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-                    "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-                    "dev": true,
-                    "requires": {
-                        "fast-deep-equal": "^3.1.1",
-                        "json-schema-traverse": "^1.0.0",
-                        "require-from-string": "^2.0.2",
-                        "uri-js": "^4.2.2"
-                    }
-                },
-                "json-schema-traverse": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-                    "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-                    "dev": true
-                }
-            }
-        },
-        "text-table": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-            "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-            "dev": true
-        },
-        "through": {
-            "version": "2.3.8",
-            "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-            "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-            "dev": true
-        },
-        "tiny-lr": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz",
-            "integrity": "sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==",
-            "dev": true,
-            "requires": {
-                "body": "^5.1.0",
-                "debug": "^3.1.0",
-                "faye-websocket": "~0.10.0",
-                "livereload-js": "^2.3.0",
-                "object-assign": "^4.1.0",
-                "qs": "^6.4.0"
-            },
-            "dependencies": {
-                "debug": {
-                    "version": "3.2.7",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-                    "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                }
-            }
-        },
-        "tmp": {
-            "version": "0.0.33",
-            "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-            "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-            "dev": true,
-            "requires": {
-                "os-tmpdir": "~1.0.2"
-            }
-        },
-        "to-regex-range": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-            "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-            "dev": true,
-            "requires": {
-                "is-number": "^7.0.0"
-            }
-        },
-        "tsconfig-paths": {
-            "version": "3.14.1",
-            "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-            "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
-            "dev": true,
-            "requires": {
-                "@types/json5": "^0.0.29",
-                "json5": "^1.0.1",
-                "minimist": "^1.2.6",
-                "strip-bom": "^3.0.0"
-            }
-        },
-        "tslib": {
-            "version": "1.14.1",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-            "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-            "dev": true
-        },
-        "tsutils": {
-            "version": "3.21.0",
-            "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
-            "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
-            "dev": true,
-            "requires": {
-                "tslib": "^1.8.1"
-            }
-        },
-        "type-check": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-            "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-            "dev": true,
-            "requires": {
-                "prelude-ls": "^1.2.1"
-            }
-        },
-        "type-fest": {
-            "version": "0.20.2",
-            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-            "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-            "dev": true
-        },
-        "typechecker": {
-            "version": "6.4.0",
-            "resolved": "https://registry.npmjs.org/typechecker/-/typechecker-6.4.0.tgz",
-            "integrity": "sha512-EbOu+9szY13mhl0EsvLXnR+pTCa3gTHQQPLdce72ujcC9fRHXlVFBNXtHeRhgzLxLlKUh4zA9C0tezLDgshf+A==",
-            "dev": true
-        },
-        "typescript": {
-            "version": "4.6.3",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz",
-            "integrity": "sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==",
-            "dev": true,
-            "peer": true
-        },
-        "uglify-js": {
-            "version": "3.15.4",
-            "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.4.tgz",
-            "integrity": "sha512-vMOPGDuvXecPs34V74qDKk4iJ/SN4vL3Ow/23ixafENYvtrNvtbcgUeugTcUGRGsOF/5fU8/NYSL5Hyb3l1OJA==",
-            "dev": true
-        },
-        "unbox-primitive": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
-            "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
-            "dev": true,
-            "requires": {
-                "function-bind": "^1.1.1",
-                "has-bigints": "^1.0.1",
-                "has-symbols": "^1.0.2",
-                "which-boxed-primitive": "^1.0.2"
-            }
-        },
-        "unc-path-regex": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
-            "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
-            "dev": true
-        },
-        "underscore.string": {
-            "version": "3.3.6",
-            "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.6.tgz",
-            "integrity": "sha512-VoC83HWXmCrF6rgkyxS9GHv8W9Q5nhMKho+OadDJGzL2oDYbYEppBaCMH6pFlwLeqj2QS+hhkw2kpXkSdD1JxQ==",
-            "dev": true,
-            "requires": {
-                "sprintf-js": "^1.1.1",
-                "util-deprecate": "^1.0.2"
-            },
-            "dependencies": {
-                "sprintf-js": {
-                    "version": "1.1.2",
-                    "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
-                    "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
-                    "dev": true
-                }
-            }
-        },
-        "uri-js": {
-            "version": "4.4.1",
-            "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-            "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-            "dev": true,
-            "requires": {
-                "punycode": "^2.1.0"
-            }
-        },
-        "uri-path": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/uri-path/-/uri-path-1.0.0.tgz",
-            "integrity": "sha1-l0fwGDWJM8Md4PzP2C0TjmcmLjI=",
-            "dev": true
-        },
-        "util-deprecate": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-            "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-            "dev": true
-        },
-        "v8-compile-cache": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-            "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-            "dev": true
-        },
-        "v8flags": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
-            "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==",
-            "dev": true,
-            "requires": {
-                "homedir-polyfill": "^1.0.1"
-            }
-        },
-        "websocket-driver": {
-            "version": "0.7.4",
-            "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
-            "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
-            "dev": true,
-            "requires": {
-                "http-parser-js": ">=0.5.1",
-                "safe-buffer": ">=5.1.0",
-                "websocket-extensions": ">=0.1.1"
-            }
-        },
-        "websocket-extensions": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-            "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
-            "dev": true
-        },
-        "which": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-            "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-            "dev": true,
-            "requires": {
-                "isexe": "^2.0.0"
-            }
-        },
-        "which-boxed-primitive": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-            "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-            "dev": true,
-            "requires": {
-                "is-bigint": "^1.0.1",
-                "is-boolean-object": "^1.1.0",
-                "is-number-object": "^1.0.4",
-                "is-string": "^1.0.5",
-                "is-symbol": "^1.0.3"
-            }
-        },
-        "word-wrap": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-            "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-            "dev": true
-        },
-        "wrappy": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-            "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-            "dev": true
-        },
-        "write": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
-            "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
-            "dev": true,
-            "requires": {
-                "mkdirp": "^0.5.1"
-            },
-            "dependencies": {
-                "mkdirp": {
-                    "version": "0.5.6",
-                    "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-                    "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-                    "dev": true,
-                    "requires": {
-                        "minimist": "^1.2.6"
-                    }
-                }
-            }
-        },
-        "yallist": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-            "dev": true
         }
     }
 }
diff --git a/var/cache/clear_cache.sh b/var/cache/clear_cache.sh
index 330c421d921..3ce6cdca682 100755
--- a/var/cache/clear_cache.sh
+++ b/var/cache/clear_cache.sh
@@ -9,7 +9,7 @@ fi
 
 echo "Clearing caches"
 mkdir $DIR/delete
-find $DIR -mindepth 1 -maxdepth 1 -type d ! -name delete -print0 | xargs -I{} -0 mv {} $DIR/delete/
+find $DIR -mindepth 1 -maxdepth 1 -type d ! -name delete ! -name phpstan -print0 | xargs -I{} -0 mv {} $DIR/delete/
 
 rm -f $DIR/../../web/cache/*.js > /dev/null
 rm -f $DIR/../../web/cache/*.css
diff --git a/vendor-bin/cs-fixer/composer.json b/vendor-bin/cs-fixer/composer.json
index 65b33fecad7..d4704f229e2 100644
--- a/vendor-bin/cs-fixer/composer.json
+++ b/vendor-bin/cs-fixer/composer.json
@@ -1,7 +1,15 @@
 {
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "3.5.0",
-        "kubawerlos/php-cs-fixer-custom-fixers": "3.6.3"
+        "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
+        "ext-ctype": "*",
+        "ext-mbstring": "*",
+        "friendsofphp/php-cs-fixer": "v3.72.0",
+        "kubawerlos/php-cs-fixer-custom-fixers": "v3.23.0"
+    },
+    "replace": {
+        "symfony/polyfill-php73": "*",
+        "symfony/polyfill-ctype": "*",
+        "symfony/polyfill-mbstring": "*"
     },
     "sort-packages": true
 }
diff --git a/vendor-bin/cs-fixer/composer.lock b/vendor-bin/cs-fixer/composer.lock
index 00469c9c625..1c10a361529 100644
--- a/vendor-bin/cs-fixer/composer.lock
+++ b/vendor-bin/cs-fixer/composer.lock
@@ -4,35 +4,107 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "1cccc6de4c31c5406389f2d8b56ee452",
+    "content-hash": "65f34a3e66fe162692929dce483302ab",
     "packages": [],
     "packages-dev": [
+        {
+            "name": "clue/ndjson-react",
+            "version": "v1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/clue/reactphp-ndjson.git",
+                "reference": "392dc165fce93b5bb5c637b67e59619223c931b0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/clue/reactphp-ndjson/zipball/392dc165fce93b5bb5c637b67e59619223c931b0",
+                "reference": "392dc165fce93b5bb5c637b67e59619223c931b0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3",
+                "react/stream": "^1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35",
+                "react/event-loop": "^1.2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Clue\\React\\NDJson\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering"
+                }
+            ],
+            "description": "Streaming newline-delimited JSON (NDJSON) parser and encoder for ReactPHP.",
+            "homepage": "https://github.com/clue/reactphp-ndjson",
+            "keywords": [
+                "NDJSON",
+                "json",
+                "jsonlines",
+                "newline",
+                "reactphp",
+                "streaming"
+            ],
+            "support": {
+                "issues": "https://github.com/clue/reactphp-ndjson/issues",
+                "source": "https://github.com/clue/reactphp-ndjson/tree/v1.3.0"
+            },
+            "funding": [
+                {
+                    "url": "https://clue.engineering/support",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/clue",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-12-23T10:58:28+00:00"
+        },
         {
             "name": "composer/pcre",
-            "version": "1.0.0",
+            "version": "3.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/pcre.git",
-                "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2"
+                "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/3d322d715c43a1ac36c7fe215fa59336265500f2",
-                "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/b2bed4734f0cc156ee1fe9c0da2550420d99a21e",
+                "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.2 || ^7.0 || ^8.0"
+                "php": "^7.4 || ^8.0"
+            },
+            "conflict": {
+                "phpstan/phpstan": "<1.11.10"
             },
             "require-dev": {
-                "phpstan/phpstan": "^1",
-                "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/phpunit-bridge": "^4.2 || ^5"
+                "phpstan/phpstan": "^1.12 || ^2",
+                "phpstan/phpstan-strict-rules": "^1 || ^2",
+                "phpunit/phpunit": "^8 || ^9"
             },
             "type": "library",
             "extra": {
+                "phpstan": {
+                    "includes": [
+                        "extension.neon"
+                    ]
+                },
                 "branch-alias": {
-                    "dev-main": "1.x-dev"
+                    "dev-main": "3.x-dev"
                 }
             },
             "autoload": {
@@ -60,7 +132,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/1.0.0"
+                "source": "https://github.com/composer/pcre/tree/3.3.2"
             },
             "funding": [
                 {
@@ -76,28 +148,28 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-06T15:17:27+00:00"
+            "time": "2024-11-12T16:29:46+00:00"
         },
         {
             "name": "composer/semver",
-            "version": "3.2.7",
+            "version": "3.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/semver.git",
-                "reference": "deac27056b57e46faf136fae7b449eeaa71661ee"
+                "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/deac27056b57e46faf136fae7b449eeaa71661ee",
-                "reference": "deac27056b57e46faf136fae7b449eeaa71661ee",
+                "url": "https://api.github.com/repos/composer/semver/zipball/4313d26ada5e0c4edfbd1dc481a92ff7bff91f12",
+                "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.3.2 || ^7.0 || ^8.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "^0.12.54",
-                "symfony/phpunit-bridge": "^4.2 || ^5"
+                "phpstan/phpstan": "^1.11",
+                "symfony/phpunit-bridge": "^3 || ^7"
             },
             "type": "library",
             "extra": {
@@ -139,9 +211,9 @@
                 "versioning"
             ],
             "support": {
-                "irc": "irc://irc.freenode.org/composer",
+                "irc": "ircs://irc.libera.chat:6697/composer",
                 "issues": "https://github.com/composer/semver/issues",
-                "source": "https://github.com/composer/semver/tree/3.2.7"
+                "source": "https://github.com/composer/semver/tree/3.4.3"
             },
             "funding": [
                 {
@@ -157,31 +229,31 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-04T09:57:54+00:00"
+            "time": "2024-09-19T14:15:21+00:00"
         },
         {
             "name": "composer/xdebug-handler",
-            "version": "3.0.1",
+            "version": "3.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "12f1b79476638a5615ed00ea6adbb269cec96fd8"
+                "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/12f1b79476638a5615ed00ea6adbb269cec96fd8",
-                "reference": "12f1b79476638a5615ed00ea6adbb269cec96fd8",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6c1925561632e83d60a44492e0b344cf48ab85ef",
+                "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef",
                 "shasum": ""
             },
             "require": {
-                "composer/pcre": "^1",
+                "composer/pcre": "^1 || ^2 || ^3",
                 "php": "^7.2.5 || ^8.0",
                 "psr/log": "^1 || ^2 || ^3"
             },
             "require-dev": {
                 "phpstan/phpstan": "^1.0",
                 "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/phpunit-bridge": "^6.0"
+                "phpunit/phpunit": "^8.5 || ^9.6 || ^10.5"
             },
             "type": "library",
             "autoload": {
@@ -205,9 +277,9 @@
                 "performance"
             ],
             "support": {
-                "irc": "irc://irc.freenode.org/composer",
+                "irc": "ircs://irc.libera.chat:6697/composer",
                 "issues": "https://github.com/composer/xdebug-handler/issues",
-                "source": "https://github.com/composer/xdebug-handler/tree/3.0.1"
+                "source": "https://github.com/composer/xdebug-handler/tree/3.0.5"
             },
             "funding": [
                 {
@@ -223,39 +295,32 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-04T18:29:42+00:00"
+            "time": "2024-05-06T16:37:16+00:00"
         },
         {
-            "name": "doctrine/annotations",
-            "version": "1.13.2",
+            "name": "evenement/evenement",
+            "version": "v3.0.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/doctrine/annotations.git",
-                "reference": "5b668aef16090008790395c02c893b1ba13f7e08"
+                "url": "https://github.com/igorw/evenement.git",
+                "reference": "0a16b0d71ab13284339abb99d9d2bd813640efbc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/5b668aef16090008790395c02c893b1ba13f7e08",
-                "reference": "5b668aef16090008790395c02c893b1ba13f7e08",
+                "url": "https://api.github.com/repos/igorw/evenement/zipball/0a16b0d71ab13284339abb99d9d2bd813640efbc",
+                "reference": "0a16b0d71ab13284339abb99d9d2bd813640efbc",
                 "shasum": ""
             },
             "require": {
-                "doctrine/lexer": "1.*",
-                "ext-tokenizer": "*",
-                "php": "^7.1 || ^8.0",
-                "psr/cache": "^1 || ^2 || ^3"
+                "php": ">=7.0"
             },
             "require-dev": {
-                "doctrine/cache": "^1.11 || ^2.0",
-                "doctrine/coding-standard": "^6.0 || ^8.1",
-                "phpstan/phpstan": "^0.12.20",
-                "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5",
-                "symfony/cache": "^4.4 || ^5.2"
+                "phpunit/phpunit": "^9 || ^6"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
+                    "Evenement\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -264,66 +329,53 @@
             ],
             "authors": [
                 {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
+                    "name": "Igor Wiedler",
+                    "email": "igor@wiedler.ch"
                 }
             ],
-            "description": "Docblock Annotations Parser",
-            "homepage": "https://www.doctrine-project.org/projects/annotations.html",
+            "description": "Événement is a very simple event dispatching library for PHP",
             "keywords": [
-                "annotations",
-                "docblock",
-                "parser"
+                "event-dispatcher",
+                "event-emitter"
             ],
             "support": {
-                "issues": "https://github.com/doctrine/annotations/issues",
-                "source": "https://github.com/doctrine/annotations/tree/1.13.2"
+                "issues": "https://github.com/igorw/evenement/issues",
+                "source": "https://github.com/igorw/evenement/tree/v3.0.2"
             },
-            "time": "2021-08-05T19:00:23+00:00"
+            "time": "2023-08-08T05:53:35+00:00"
         },
         {
-            "name": "doctrine/lexer",
-            "version": "1.2.2",
+            "name": "fidry/cpu-core-counter",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/doctrine/lexer.git",
-                "reference": "9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c"
+                "url": "https://github.com/theofidry/cpu-core-counter.git",
+                "reference": "8520451a140d3f46ac33042715115e290cf5785f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c",
-                "reference": "9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c",
+                "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/8520451a140d3f46ac33042715115e290cf5785f",
+                "reference": "8520451a140d3f46ac33042715115e290cf5785f",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1 || ^8.0"
+                "php": "^7.2 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^9.0",
-                "phpstan/phpstan": "1.3",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "vimeo/psalm": "^4.11"
+                "fidry/makefile": "^0.2.0",
+                "fidry/php-cs-fixer-config": "^1.1.2",
+                "phpstan/extension-installer": "^1.2.0",
+                "phpstan/phpstan": "^1.9.2",
+                "phpstan/phpstan-deprecation-rules": "^1.0.0",
+                "phpstan/phpstan-phpunit": "^1.2.2",
+                "phpstan/phpstan-strict-rules": "^1.4.4",
+                "phpunit/phpunit": "^8.5.31 || ^9.5.26",
+                "webmozarts/strict-phpunit": "^7.5"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer"
+                    "Fidry\\CpuCoreCounter\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -332,95 +384,80 @@
             ],
             "authors": [
                 {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
+                    "name": "Théo FIDRY",
+                    "email": "theo.fidry@gmail.com"
                 }
             ],
-            "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.",
-            "homepage": "https://www.doctrine-project.org/projects/lexer.html",
+            "description": "Tiny utility to get the number of CPU cores.",
             "keywords": [
-                "annotations",
-                "docblock",
-                "lexer",
-                "parser",
-                "php"
+                "CPU",
+                "core"
             ],
             "support": {
-                "issues": "https://github.com/doctrine/lexer/issues",
-                "source": "https://github.com/doctrine/lexer/tree/1.2.2"
+                "issues": "https://github.com/theofidry/cpu-core-counter/issues",
+                "source": "https://github.com/theofidry/cpu-core-counter/tree/1.2.0"
             },
             "funding": [
                 {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer",
-                    "type": "tidelift"
+                    "url": "https://github.com/theofidry",
+                    "type": "github"
                 }
             ],
-            "time": "2022-01-12T08:27:12+00:00"
+            "time": "2024-08-06T10:04:20+00:00"
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.5.0",
+            "version": "v3.72.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
-                "reference": "333f15e07c866e33e2765e84ba1e0b88e6a3af3b"
+                "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
+                "reference": "900389362c43d116fee1ffc51f7878145fa61b57"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/333f15e07c866e33e2765e84ba1e0b88e6a3af3b",
-                "reference": "333f15e07c866e33e2765e84ba1e0b88e6a3af3b",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/900389362c43d116fee1ffc51f7878145fa61b57",
+                "reference": "900389362c43d116fee1ffc51f7878145fa61b57",
                 "shasum": ""
             },
             "require": {
-                "composer/semver": "^3.2",
-                "composer/xdebug-handler": "^3.0",
-                "doctrine/annotations": "^1.13",
+                "clue/ndjson-react": "^1.0",
+                "composer/semver": "^3.4",
+                "composer/xdebug-handler": "^3.0.3",
+                "ext-filter": "*",
                 "ext-json": "*",
                 "ext-tokenizer": "*",
+                "fidry/cpu-core-counter": "^1.2",
                 "php": "^7.4 || ^8.0",
-                "php-cs-fixer/diff": "^2.0",
-                "symfony/console": "^5.4 || ^6.0",
-                "symfony/event-dispatcher": "^5.4 || ^6.0",
-                "symfony/filesystem": "^5.4 || ^6.0",
-                "symfony/finder": "^5.4 || ^6.0",
-                "symfony/options-resolver": "^5.4 || ^6.0",
-                "symfony/polyfill-mbstring": "^1.23",
-                "symfony/polyfill-php80": "^1.23",
-                "symfony/polyfill-php81": "^1.23",
-                "symfony/process": "^5.4 || ^6.0",
-                "symfony/stopwatch": "^5.4 || ^6.0"
+                "react/child-process": "^0.6.5",
+                "react/event-loop": "^1.0",
+                "react/promise": "^2.0 || ^3.0",
+                "react/socket": "^1.0",
+                "react/stream": "^1.0",
+                "sebastian/diff": "^4.0 || ^5.1 || ^6.0 || ^7.0",
+                "symfony/console": "^5.4 || ^6.4 || ^7.0",
+                "symfony/event-dispatcher": "^5.4 || ^6.4 || ^7.0",
+                "symfony/filesystem": "^5.4 || ^6.4 || ^7.0",
+                "symfony/finder": "^5.4 || ^6.4 || ^7.0",
+                "symfony/options-resolver": "^5.4 || ^6.4 || ^7.0",
+                "symfony/polyfill-mbstring": "^1.31",
+                "symfony/polyfill-php80": "^1.31",
+                "symfony/polyfill-php81": "^1.31",
+                "symfony/process": "^5.4 || ^6.4 || ^7.2",
+                "symfony/stopwatch": "^5.4 || ^6.4 || ^7.0"
             },
             "require-dev": {
-                "justinrainbow/json-schema": "^5.2",
-                "keradus/cli-executor": "^1.5",
-                "mikey179/vfsstream": "^1.6.10",
-                "php-coveralls/php-coveralls": "^2.5.2",
+                "facile-it/paraunit": "^1.3.1 || ^2.6",
+                "infection/infection": "^0.29.14",
+                "justinrainbow/json-schema": "^5.3 || ^6.2",
+                "keradus/cli-executor": "^2.1",
+                "mikey179/vfsstream": "^1.6.12",
+                "php-coveralls/php-coveralls": "^2.7",
                 "php-cs-fixer/accessible-object": "^1.1",
-                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2",
-                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1",
-                "phpspec/prophecy": "^1.15",
-                "phpspec/prophecy-phpunit": "^2.0",
-                "phpunit/phpunit": "^9.5",
-                "phpunitgoodpractices/polyfill": "^1.5",
-                "phpunitgoodpractices/traits": "^1.9.1",
-                "symfony/phpunit-bridge": "^6.0",
-                "symfony/yaml": "^5.4 || ^6.0"
+                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.6",
+                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.6",
+                "phpunit/phpunit": "^9.6.22 || ^10.5.45 || ^11.5.12",
+                "symfony/var-dumper": "^5.4.48 || ^6.4.18 || ^7.2.3",
+                "symfony/yaml": "^5.4.45 || ^6.4.18 || ^7.2.3"
             },
             "suggest": {
                 "ext-dom": "For handling output formats in XML",
@@ -433,7 +470,10 @@
             "autoload": {
                 "psr-4": {
                     "PhpCsFixer\\": "src/"
-                }
+                },
+                "exclude-from-classmap": [
+                    "src/Fixer/Internal/*"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -450,9 +490,15 @@
                 }
             ],
             "description": "A tool to automatically fix PHP code style",
+            "keywords": [
+                "Static code analysis",
+                "fixer",
+                "standards",
+                "static analysis"
+            ],
             "support": {
-                "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues",
-                "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.5.0"
+                "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.72.0"
             },
             "funding": [
                 {
@@ -460,31 +506,30 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-01-14T00:29:20+00:00"
+            "time": "2025-03-13T11:25:37+00:00"
         },
         {
             "name": "kubawerlos/php-cs-fixer-custom-fixers",
-            "version": "v3.6.3",
+            "version": "v3.23.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers.git",
-                "reference": "0d3367ac5f3576c18726ff5bb153fa2e9c1c67be"
+                "reference": "b3210c6e546bdfc95664297a8971ae3b6b1f4a5a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/kubawerlos/php-cs-fixer-custom-fixers/zipball/0d3367ac5f3576c18726ff5bb153fa2e9c1c67be",
-                "reference": "0d3367ac5f3576c18726ff5bb153fa2e9c1c67be",
+                "url": "https://api.github.com/repos/kubawerlos/php-cs-fixer-custom-fixers/zipball/b3210c6e546bdfc95664297a8971ae3b6b1f4a5a",
+                "reference": "b3210c6e546bdfc95664297a8971ae3b6b1f4a5a",
                 "shasum": ""
             },
             "require": {
                 "ext-filter": "*",
                 "ext-tokenizer": "*",
-                "friendsofphp/php-cs-fixer": "^3.1.0",
-                "php": "^7.2 || ^8.0",
-                "symfony/finder": "^4.0 || ^5.0 || ^6.0"
+                "friendsofphp/php-cs-fixer": "^3.61.1",
+                "php": "^7.4 || ^8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5.3 || ^9.1.1"
+                "phpunit/phpunit": "^9.6.4 || ^10.5.29"
             },
             "type": "library",
             "autoload": {
@@ -505,78 +550,74 @@
             "description": "A set of custom fixers for PHP CS Fixer",
             "support": {
                 "issues": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers/issues",
-                "source": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers/tree/v3.6.3"
+                "source": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers/tree/v3.23.0"
             },
-            "time": "2022-01-16T18:56:13+00:00"
+            "time": "2025-02-15T09:15:56+00:00"
         },
         {
-            "name": "php-cs-fixer/diff",
-            "version": "v2.0.2",
+            "name": "psr/container",
+            "version": "1.1.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/PHP-CS-Fixer/diff.git",
-                "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3"
+                "url": "https://github.com/php-fig/container.git",
+                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/29dc0d507e838c4580d018bd8b5cb412474f7ec3",
-                "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea",
+                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0 || ^8.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0",
-                "symfony/process": "^3.3"
+                "php": ">=7.4.0"
             },
             "type": "library",
             "autoload": {
-                "classmap": [
-                    "src/"
-                ]
+                "psr-4": {
+                    "Psr\\Container\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
             "authors": [
                 {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
-            "description": "sebastian/diff v3 backport support for PHP 5.6+",
-            "homepage": "https://github.com/PHP-CS-Fixer",
+            "description": "Common Container Interface (PHP FIG PSR-11)",
+            "homepage": "https://github.com/php-fig/container",
             "keywords": [
-                "diff"
+                "PSR-11",
+                "container",
+                "container-interface",
+                "container-interop",
+                "psr"
             ],
             "support": {
-                "issues": "https://github.com/PHP-CS-Fixer/diff/issues",
-                "source": "https://github.com/PHP-CS-Fixer/diff/tree/v2.0.2"
+                "issues": "https://github.com/php-fig/container/issues",
+                "source": "https://github.com/php-fig/container/tree/1.1.2"
             },
-            "time": "2020-10-14T08:32:19+00:00"
+            "time": "2021-11-05T16:50:12+00:00"
         },
         {
-            "name": "psr/cache",
-            "version": "1.0.1",
+            "name": "psr/event-dispatcher",
+            "version": "1.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/php-fig/cache.git",
-                "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8"
+                "url": "https://github.com/php-fig/event-dispatcher.git",
+                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8",
-                "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8",
+                "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0",
+                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=7.2.0"
             },
             "type": "library",
             "extra": {
@@ -586,7 +627,7 @@
             },
             "autoload": {
                 "psr-4": {
-                    "Psr\\Cache\\": "src/"
+                    "Psr\\EventDispatcher\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -599,38 +640,44 @@
                     "homepage": "http://www.php-fig.org/"
                 }
             ],
-            "description": "Common interface for caching libraries",
+            "description": "Standard interfaces for event handling.",
             "keywords": [
-                "cache",
+                "events",
                 "psr",
-                "psr-6"
+                "psr-14"
             ],
             "support": {
-                "source": "https://github.com/php-fig/cache/tree/master"
+                "issues": "https://github.com/php-fig/event-dispatcher/issues",
+                "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0"
             },
-            "time": "2016-08-06T20:24:11+00:00"
+            "time": "2019-01-08T18:20:26+00:00"
         },
         {
-            "name": "psr/container",
-            "version": "1.1.2",
+            "name": "psr/log",
+            "version": "1.1.4",
             "source": {
                 "type": "git",
-                "url": "https://github.com/php-fig/container.git",
-                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea"
+                "url": "https://github.com/php-fig/log.git",
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea",
-                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.4.0"
+                "php": ">=5.3.0"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
-                    "Psr\\Container\\": "src/"
+                    "Psr\\Log\\": "Psr/Log/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -643,47 +690,119 @@
                     "homepage": "https://www.php-fig.org/"
                 }
             ],
-            "description": "Common Container Interface (PHP FIG PSR-11)",
-            "homepage": "https://github.com/php-fig/container",
+            "description": "Common interface for logging libraries",
+            "homepage": "https://github.com/php-fig/log",
             "keywords": [
-                "PSR-11",
-                "container",
-                "container-interface",
-                "container-interop",
-                "psr"
+                "log",
+                "psr",
+                "psr-3"
             ],
             "support": {
-                "issues": "https://github.com/php-fig/container/issues",
-                "source": "https://github.com/php-fig/container/tree/1.1.2"
+                "source": "https://github.com/php-fig/log/tree/1.1.4"
             },
-            "time": "2021-11-05T16:50:12+00:00"
+            "time": "2021-05-03T11:20:27+00:00"
         },
         {
-            "name": "psr/event-dispatcher",
-            "version": "1.0.0",
+            "name": "react/cache",
+            "version": "v1.2.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/php-fig/event-dispatcher.git",
-                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0"
+                "url": "https://github.com/reactphp/cache.git",
+                "reference": "d47c472b64aa5608225f47965a484b75c7817d5b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0",
-                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0",
+                "url": "https://api.github.com/repos/reactphp/cache/zipball/d47c472b64aa5608225f47965a484b75c7817d5b",
+                "reference": "d47c472b64aa5608225f47965a484b75c7817d5b",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.0"
+                "php": ">=5.3.0",
+                "react/promise": "^3.0 || ^2.0 || ^1.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+            "autoload": {
+                "psr-4": {
+                    "React\\Cache\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
+                }
+            ],
+            "description": "Async, Promise-based cache interface for ReactPHP",
+            "keywords": [
+                "cache",
+                "caching",
+                "promise",
+                "reactphp"
+            ],
+            "support": {
+                "issues": "https://github.com/reactphp/cache/issues",
+                "source": "https://github.com/reactphp/cache/tree/v1.2.0"
+            },
+            "funding": [
+                {
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
                 }
+            ],
+            "time": "2022-11-30T15:59:55+00:00"
+        },
+        {
+            "name": "react/child-process",
+            "version": "v0.6.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/child-process.git",
+                "reference": "1721e2b93d89b745664353b9cfc8f155ba8a6159"
             },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/child-process/zipball/1721e2b93d89b745664353b9cfc8f155ba8a6159",
+                "reference": "1721e2b93d89b745664353b9cfc8f155ba8a6159",
+                "shasum": ""
+            },
+            "require": {
+                "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
+                "php": ">=5.3.0",
+                "react/event-loop": "^1.2",
+                "react/stream": "^1.4"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
+                "react/socket": "^1.16",
+                "sebastian/environment": "^5.0 || ^3.0 || ^2.0 || ^1.0"
+            },
+            "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Psr\\EventDispatcher\\": "src/"
+                    "React\\ChildProcess\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -692,48 +811,220 @@
             ],
             "authors": [
                 {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
                 }
             ],
-            "description": "Standard interfaces for event handling.",
+            "description": "Event-driven library for executing child processes with ReactPHP.",
             "keywords": [
-                "events",
-                "psr",
-                "psr-14"
+                "event-driven",
+                "process",
+                "reactphp"
             ],
             "support": {
-                "issues": "https://github.com/php-fig/event-dispatcher/issues",
-                "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0"
+                "issues": "https://github.com/reactphp/child-process/issues",
+                "source": "https://github.com/reactphp/child-process/tree/v0.6.6"
             },
-            "time": "2019-01-08T18:20:26+00:00"
+            "funding": [
+                {
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2025-01-01T16:37:48+00:00"
         },
         {
-            "name": "psr/log",
-            "version": "1.1.4",
+            "name": "react/dns",
+            "version": "v1.13.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/php-fig/log.git",
-                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
+                "url": "https://github.com/reactphp/dns.git",
+                "reference": "eb8ae001b5a455665c89c1df97f6fb682f8fb0f5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
-                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
+                "url": "https://api.github.com/repos/reactphp/dns/zipball/eb8ae001b5a455665c89c1df97f6fb682f8fb0f5",
+                "reference": "eb8ae001b5a455665c89c1df97f6fb682f8fb0f5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0",
+                "react/cache": "^1.0 || ^0.6 || ^0.5",
+                "react/event-loop": "^1.2",
+                "react/promise": "^3.2 || ^2.7 || ^1.2.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
+                "react/async": "^4.3 || ^3 || ^2",
+                "react/promise-timer": "^1.11"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "React\\Dns\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
+                }
+            ],
+            "description": "Async DNS resolver for ReactPHP",
+            "keywords": [
+                "async",
+                "dns",
+                "dns-resolver",
+                "reactphp"
+            ],
+            "support": {
+                "issues": "https://github.com/reactphp/dns/issues",
+                "source": "https://github.com/reactphp/dns/tree/v1.13.0"
+            },
+            "funding": [
+                {
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2024-06-13T14:18:03+00:00"
+        },
+        {
+            "name": "react/event-loop",
+            "version": "v1.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/event-loop.git",
+                "reference": "bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/event-loop/zipball/bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354",
+                "reference": "bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.0"
             },
+            "require-dev": {
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"
+            },
+            "suggest": {
+                "ext-pcntl": "For signal handling support when using the StreamSelectLoop"
+            },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1.x-dev"
+            "autoload": {
+                "psr-4": {
+                    "React\\EventLoop\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
                 }
+            ],
+            "description": "ReactPHP's core reactor event loop that libraries can use for evented I/O.",
+            "keywords": [
+                "asynchronous",
+                "event-loop"
+            ],
+            "support": {
+                "issues": "https://github.com/reactphp/event-loop/issues",
+                "source": "https://github.com/reactphp/event-loop/tree/v1.5.0"
+            },
+            "funding": [
+                {
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2023-11-13T13:48:05+00:00"
+        },
+        {
+            "name": "react/promise",
+            "version": "v3.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/promise.git",
+                "reference": "8a164643313c71354582dc850b42b33fa12a4b63"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/promise/zipball/8a164643313c71354582dc850b42b33fa12a4b63",
+                "reference": "8a164643313c71354582dc850b42b33fa12a4b63",
+                "shasum": ""
             },
+            "require": {
+                "php": ">=7.1.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "1.10.39 || 1.4.10",
+                "phpunit/phpunit": "^9.6 || ^7.5"
+            },
+            "type": "library",
             "autoload": {
+                "files": [
+                    "src/functions_include.php"
+                ],
                 "psr-4": {
-                    "Psr\\Log\\": "Psr/Log/"
+                    "React\\Promise\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -742,34 +1033,279 @@
             ],
             "authors": [
                 {
-                    "name": "PHP-FIG",
-                    "homepage": "https://www.php-fig.org/"
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
                 }
             ],
-            "description": "Common interface for logging libraries",
-            "homepage": "https://github.com/php-fig/log",
+            "description": "A lightweight implementation of CommonJS Promises/A for PHP",
             "keywords": [
-                "log",
-                "psr",
-                "psr-3"
+                "promise",
+                "promises"
             ],
             "support": {
-                "source": "https://github.com/php-fig/log/tree/1.1.4"
+                "issues": "https://github.com/reactphp/promise/issues",
+                "source": "https://github.com/reactphp/promise/tree/v3.2.0"
             },
-            "time": "2021-05-03T11:20:27+00:00"
+            "funding": [
+                {
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2024-05-24T10:39:05+00:00"
+        },
+        {
+            "name": "react/socket",
+            "version": "v1.16.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/socket.git",
+                "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/socket/zipball/23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1",
+                "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1",
+                "shasum": ""
+            },
+            "require": {
+                "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
+                "php": ">=5.3.0",
+                "react/dns": "^1.13",
+                "react/event-loop": "^1.2",
+                "react/promise": "^3.2 || ^2.6 || ^1.2.1",
+                "react/stream": "^1.4"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
+                "react/async": "^4.3 || ^3.3 || ^2",
+                "react/promise-stream": "^1.4",
+                "react/promise-timer": "^1.11"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "React\\Socket\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
+                }
+            ],
+            "description": "Async, streaming plaintext TCP/IP and secure TLS socket server and client connections for ReactPHP",
+            "keywords": [
+                "Connection",
+                "Socket",
+                "async",
+                "reactphp",
+                "stream"
+            ],
+            "support": {
+                "issues": "https://github.com/reactphp/socket/issues",
+                "source": "https://github.com/reactphp/socket/tree/v1.16.0"
+            },
+            "funding": [
+                {
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2024-07-26T10:38:09+00:00"
+        },
+        {
+            "name": "react/stream",
+            "version": "v1.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/stream.git",
+                "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/stream/zipball/1e5b0acb8fe55143b5b426817155190eb6f5b18d",
+                "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d",
+                "shasum": ""
+            },
+            "require": {
+                "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
+                "php": ">=5.3.8",
+                "react/event-loop": "^1.2"
+            },
+            "require-dev": {
+                "clue/stream-filter": "~1.2",
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "React\\Stream\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
+                }
+            ],
+            "description": "Event-driven readable and writable streams for non-blocking I/O in ReactPHP",
+            "keywords": [
+                "event-driven",
+                "io",
+                "non-blocking",
+                "pipe",
+                "reactphp",
+                "readable",
+                "stream",
+                "writable"
+            ],
+            "support": {
+                "issues": "https://github.com/reactphp/stream/issues",
+                "source": "https://github.com/reactphp/stream/tree/v1.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2024-06-11T12:45:25+00:00"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "4.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ba01945089c3a293b01ba9badc29ad55b106b0bc",
+                "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3",
+                "symfony/process": "^4.2 || ^5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "https://github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff",
+                "udiff",
+                "unidiff",
+                "unified diff"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/diff/issues",
+                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.6"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-03-02T06:30:58+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v5.4.2",
+            "version": "v5.4.47",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "a2c6b7ced2eb7799a35375fb9022519282b5405e"
+                "reference": "c4ba980ca61a9eb18ee6bcc73f28e475852bb1ed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/a2c6b7ced2eb7799a35375fb9022519282b5405e",
-                "reference": "a2c6b7ced2eb7799a35375fb9022519282b5405e",
+                "url": "https://api.github.com/repos/symfony/console/zipball/c4ba980ca61a9eb18ee6bcc73f28e475852bb1ed",
+                "reference": "c4ba980ca61a9eb18ee6bcc73f28e475852bb1ed",
                 "shasum": ""
             },
             "require": {
@@ -834,12 +1370,12 @@
             "homepage": "https://symfony.com",
             "keywords": [
                 "cli",
-                "command line",
+                "command-line",
                 "console",
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v5.4.2"
+                "source": "https://github.com/symfony/console/tree/v5.4.47"
             },
             "funding": [
                 {
@@ -855,20 +1391,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-20T16:11:12+00:00"
+            "time": "2024-11-06T11:30:55+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v2.5.0",
+            "version": "v2.5.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8"
+                "reference": "605389f2a7e5625f273b53960dc46aeaf9c62918"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8",
-                "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/605389f2a7e5625f273b53960dc46aeaf9c62918",
+                "reference": "605389f2a7e5625f273b53960dc46aeaf9c62918",
                 "shasum": ""
             },
             "require": {
@@ -876,12 +1412,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "2.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -906,7 +1442,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.0"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.4"
             },
             "funding": [
                 {
@@ -922,20 +1458,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-12T14:48:14+00:00"
+            "time": "2024-09-25T14:11:13+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v5.4.0",
+            "version": "v5.4.45",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "27d39ae126352b9fa3be5e196ccf4617897be3eb"
+                "reference": "72982eb416f61003e9bb6e91f8b3213600dcf9e9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/27d39ae126352b9fa3be5e196ccf4617897be3eb",
-                "reference": "27d39ae126352b9fa3be5e196ccf4617897be3eb",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/72982eb416f61003e9bb6e91f8b3213600dcf9e9",
+                "reference": "72982eb416f61003e9bb6e91f8b3213600dcf9e9",
                 "shasum": ""
             },
             "require": {
@@ -991,7 +1527,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.0"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.45"
             },
             "funding": [
                 {
@@ -1007,20 +1543,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-23T10:19:22+00:00"
+            "time": "2024-09-25T14:11:13+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v2.5.0",
+            "version": "v2.5.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "66bea3b09be61613cd3b4043a65a8ec48cfa6d2a"
+                "reference": "e0fe3d79b516eb75126ac6fa4cbf19b79b08c99f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/66bea3b09be61613cd3b4043a65a8ec48cfa6d2a",
-                "reference": "66bea3b09be61613cd3b4043a65a8ec48cfa6d2a",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/e0fe3d79b516eb75126ac6fa4cbf19b79b08c99f",
+                "reference": "e0fe3d79b516eb75126ac6fa4cbf19b79b08c99f",
                 "shasum": ""
             },
             "require": {
@@ -1032,12 +1568,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "2.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -1070,7 +1606,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.0"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.4"
             },
             "funding": [
                 {
@@ -1086,20 +1622,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-12T14:48:14+00:00"
+            "time": "2024-09-25T14:11:13+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v5.4.0",
+            "version": "v5.4.45",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "731f917dc31edcffec2c6a777f3698c33bea8f01"
+                "reference": "57c8294ed37d4a055b77057827c67f9558c95c54"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/731f917dc31edcffec2c6a777f3698c33bea8f01",
-                "reference": "731f917dc31edcffec2c6a777f3698c33bea8f01",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/57c8294ed37d4a055b77057827c67f9558c95c54",
+                "reference": "57c8294ed37d4a055b77057827c67f9558c95c54",
                 "shasum": ""
             },
             "require": {
@@ -1108,6 +1644,9 @@
                 "symfony/polyfill-mbstring": "~1.8",
                 "symfony/polyfill-php80": "^1.16"
             },
+            "require-dev": {
+                "symfony/process": "^5.4|^6.4"
+            },
             "type": "library",
             "autoload": {
                 "psr-4": {
@@ -1134,7 +1673,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v5.4.0"
+                "source": "https://github.com/symfony/filesystem/tree/v5.4.45"
             },
             "funding": [
                 {
@@ -1150,20 +1689,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-10-28T13:39:27+00:00"
+            "time": "2024-10-22T13:05:35+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v5.4.2",
+            "version": "v5.4.45",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "e77046c252be48c48a40816187ed527703c8f76c"
+                "reference": "63741784cd7b9967975eec610b256eed3ede022b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/e77046c252be48c48a40816187ed527703c8f76c",
-                "reference": "e77046c252be48c48a40816187ed527703c8f76c",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/63741784cd7b9967975eec610b256eed3ede022b",
+                "reference": "63741784cd7b9967975eec610b256eed3ede022b",
                 "shasum": ""
             },
             "require": {
@@ -1197,7 +1736,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v5.4.2"
+                "source": "https://github.com/symfony/finder/tree/v5.4.45"
             },
             "funding": [
                 {
@@ -1213,20 +1752,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-15T11:06:13+00:00"
+            "time": "2024-09-28T13:32:08+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v5.4.0",
+            "version": "v5.4.45",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "b0fb78576487af19c500aaddb269fd36701d4847"
+                "reference": "74e5b6f0db3e8589e6cfd5efb317a1fc2bb52fb6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/b0fb78576487af19c500aaddb269fd36701d4847",
-                "reference": "b0fb78576487af19c500aaddb269fd36701d4847",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/74e5b6f0db3e8589e6cfd5efb317a1fc2bb52fb6",
+                "reference": "74e5b6f0db3e8589e6cfd5efb317a1fc2bb52fb6",
                 "shasum": ""
             },
             "require": {
@@ -1266,89 +1805,7 @@
                 "options"
             ],
             "support": {
-                "source": "https://github.com/symfony/options-resolver/tree/v5.4.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-11-23T10:19:22+00:00"
-        },
-        {
-            "name": "symfony/polyfill-ctype",
-            "version": "v1.24.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "30885182c981ab175d4d034db0f6f469898070ab"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab",
-                "reference": "30885182c981ab175d4d034db0f6f469898070ab",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "provide": {
-                "ext-ctype": "*"
-            },
-            "suggest": {
-                "ext-ctype": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Gert de Pagter",
-                    "email": "BackEndTea@gmail.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for ctype functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "ctype",
-                "polyfill",
-                "portable"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.24.0"
+                "source": "https://github.com/symfony/options-resolver/tree/v5.4.45"
             },
             "funding": [
                 {
@@ -1364,45 +1821,42 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-10-20T20:35:02+00:00"
+            "time": "2024-09-25T14:11:13+00:00"
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.24.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "81b86b50cf841a64252b439e738e97f4a34e2783"
+                "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/81b86b50cf841a64252b439e738e97f4a34e2783",
-                "reference": "81b86b50cf841a64252b439e738e97f4a34e2783",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
+                "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "suggest": {
                 "ext-intl": "For best performance"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1429,7 +1883,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -1445,45 +1899,42 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-23T21:10:46+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.24.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8"
+                "reference": "3833d7255cc303546435cb650316bff708a1c75c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8",
-                "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c",
+                "reference": "3833d7255cc303546435cb650316bff708a1c75c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "suggest": {
                 "ext-intl": "For best performance"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -1513,90 +1964,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.24.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-02-19T12:13:01+00:00"
-        },
-        {
-            "name": "symfony/polyfill-mbstring",
-            "version": "v1.24.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825",
-                "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "provide": {
-                "ext-mbstring": "*"
-            },
-            "suggest": {
-                "ext-mbstring": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for the Mbstring extension",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "mbstring",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -1612,121 +1980,39 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-30T18:21:41+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
-            "name": "symfony/polyfill-php73",
-            "version": "v1.24.0",
+            "name": "symfony/polyfill-php80",
+            "version": "v1.33.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5"
+                "url": "https://github.com/symfony/polyfill-php80.git",
+                "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/cc5db0e22b3cb4111010e48785a97f670b350ca5",
-                "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
+                "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php73\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-php73/tree/v1.24.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-06-05T21:20:04+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php80",
-            "version": "v1.24.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/57b712b08eddb97c762a8caa32c84e037892d2e9",
-                "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
                 "psr-4": {
                     "Symfony\\Polyfill\\Php80\\": ""
                 },
-                "files": [
-                    "bootstrap.php"
-                ],
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -1758,7 +2044,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -1769,47 +2055,48 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-09-13T13:58:33+00:00"
+            "time": "2025-01-02T08:10:11+00:00"
         },
         {
             "name": "symfony/polyfill-php81",
-            "version": "v1.24.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php81.git",
-                "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f"
+                "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/5de4ba2d41b15f9bd0e19b2ab9674135813ec98f",
-                "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f",
+                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
+                "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php81\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php81\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -1837,7 +2124,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php81/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-php81/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -1853,20 +2140,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-09-13T13:58:11+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v5.4.2",
+            "version": "v5.4.51",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "2b3ba8722c4aaf3e88011be5e7f48710088fb5e4"
+                "reference": "467bfc56f18f5ef6d5ccb09324d7e988c1c0a98f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/2b3ba8722c4aaf3e88011be5e7f48710088fb5e4",
-                "reference": "2b3ba8722c4aaf3e88011be5e7f48710088fb5e4",
+                "url": "https://api.github.com/repos/symfony/process/zipball/467bfc56f18f5ef6d5ccb09324d7e988c1c0a98f",
+                "reference": "467bfc56f18f5ef6d5ccb09324d7e988c1c0a98f",
                 "shasum": ""
             },
             "require": {
@@ -1899,7 +2186,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v5.4.2"
+                "source": "https://github.com/symfony/process/tree/v5.4.51"
             },
             "funding": [
                 {
@@ -1910,31 +2197,35 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-27T21:01:00+00:00"
+            "time": "2026-01-26T15:53:37+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v2.5.0",
+            "version": "v2.5.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc"
+                "reference": "f37b419f7aea2e9abf10abd261832cace12e3300"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc",
-                "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f37b419f7aea2e9abf10abd261832cace12e3300",
+                "reference": "f37b419f7aea2e9abf10abd261832cace12e3300",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
                 "psr/container": "^1.1",
-                "symfony/deprecation-contracts": "^2.1"
+                "symfony/deprecation-contracts": "^2.1|^3"
             },
             "conflict": {
                 "ext-psr": "<1.1|>=2"
@@ -1944,12 +2235,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "2.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -1982,7 +2273,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v2.5.0"
+                "source": "https://github.com/symfony/service-contracts/tree/v2.5.4"
             },
             "funding": [
                 {
@@ -1998,20 +2289,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-04T16:48:04+00:00"
+            "time": "2024-09-25T14:11:13+00:00"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v5.4.0",
+            "version": "v5.4.45",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "208ef96122bfed82a8f3a61458a07113a08bdcfe"
+                "reference": "fb2c199cf302eb207f8c23e7ee174c1c31a5c004"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/208ef96122bfed82a8f3a61458a07113a08bdcfe",
-                "reference": "208ef96122bfed82a8f3a61458a07113a08bdcfe",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/fb2c199cf302eb207f8c23e7ee174c1c31a5c004",
+                "reference": "fb2c199cf302eb207f8c23e7ee174c1c31a5c004",
                 "shasum": ""
             },
             "require": {
@@ -2044,7 +2335,7 @@
             "description": "Provides a way to profile code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/stopwatch/tree/v5.4.0"
+                "source": "https://github.com/symfony/stopwatch/tree/v5.4.45"
             },
             "funding": [
                 {
@@ -2060,20 +2351,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-23T10:19:22+00:00"
+            "time": "2024-09-25T14:11:13+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v5.4.2",
+            "version": "v5.4.47",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "e6a5d5ecf6589c5247d18e0e74e30b11dfd51a3d"
+                "reference": "136ca7d72f72b599f2631aca474a4f8e26719799"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/e6a5d5ecf6589c5247d18e0e74e30b11dfd51a3d",
-                "reference": "e6a5d5ecf6589c5247d18e0e74e30b11dfd51a3d",
+                "url": "https://api.github.com/repos/symfony/string/zipball/136ca7d72f72b599f2631aca474a4f8e26719799",
+                "reference": "136ca7d72f72b599f2631aca474a4f8e26719799",
                 "shasum": ""
             },
             "require": {
@@ -2095,12 +2386,12 @@
             },
             "type": "library",
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\String\\": ""
-                },
                 "files": [
                     "Resources/functions.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Component\\String\\": ""
+                },
                 "exclude-from-classmap": [
                     "/Tests/"
                 ]
@@ -2130,7 +2421,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v5.4.2"
+                "source": "https://github.com/symfony/string/tree/v5.4.47"
             },
             "funding": [
                 {
@@ -2146,15 +2437,19 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-16T21:52:00+00:00"
+            "time": "2024-11-10T20:33:58+00:00"
         }
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": false,
     "prefer-lowest": false,
-    "platform": [],
-    "platform-dev": [],
-    "plugin-api-version": "2.2.0"
+    "platform": {},
+    "platform-dev": {
+        "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
+        "ext-ctype": "*",
+        "ext-mbstring": "*"
+    },
+    "plugin-api-version": "2.6.0"
 }